diff --git a/GNUmakefile.in b/GNUmakefile.in
index af2f119ef7ac..24486f858089 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -119,7 +119,7 @@ distdir	= postgresql-$(VERSION)
 dummy	= =install=
 garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-dist: $(distdir).tar.gz 
+dist: $(distdir).tar.gz $(distdir).tar.bz2
 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
@@ -129,6 +129,8 @@ dist:
 $(distdir).tar: distdir
 	$(TAR) chf $@ $(distdir)
 
+.INTERMEDIATE: $(distdir).tar
+
 opt_files = \
 	src/tools src/tutorial \
 	$(addprefix src/pl/, plperl plpython tcl)
@@ -150,7 +152,7 @@ postgresql-test-$(VERSION).tar: distdir
 
 distdir:
 	-rm -rf $(distdir)* $(dummy)
-	for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
+	for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
 	  file=`expr X$$x : 'X\./\(.*\)'`; \
 	  if test -d "$(top_srcdir)/$$file" ; then \
 	    mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file";	\
@@ -165,12 +167,12 @@ distdir:
 	#cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
 	#cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README
 	$(MAKE) -C $(distdir) distclean
-	-rm -f $(distdir)/README.CVS
+	#rm -f $(distdir)/README.git
 
-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"
diff --git a/config/c-library.m4 b/config/c-library.m4
index 337629b97f6c..cddeafaec232 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 $
+# config/c-library.m4
 
 
 # PGAC_VAR_INT_TIMEZONE
@@ -298,6 +298,7 @@ int main()
 AC_MSG_RESULT([$pgac_cv_printf_arg_control])
 ])# PGAC_FUNC_PRINTF_ARG_CONTROL
 
+
 # PGAC_TYPE_LOCALE_T
 # ------------------
 # Check for the locale_t type and find the right header file.  Mac OS
diff --git a/config/docbook.m4 b/config/docbook.m4
index 0ed08343107e..54498ee91b71 100644
--- a/config/docbook.m4
+++ b/config/docbook.m4
@@ -1,4 +1,4 @@
-# config/docbook.m4
+# $PostgreSQL: pgsql/config/docbook.m4,v 1.8 2007/08/09 02:33:58 tgl Exp $
 
 # PGAC_PROG_JADE
 # --------------
@@ -55,7 +55,7 @@ AC_CACHE_VAL([pgac_cv_path_stylesheets],
 [if test -n "$DOCBOOKSTYLE"; then
   pgac_cv_path_stylesheets=$DOCBOOKSTYLE
 else
-  for pgac_prefix in /usr /usr/local /opt /sw; do
+  for pgac_prefix in /usr /usr/local /opt; do
     for pgac_infix in share lib; do
       for pgac_postfix in \
         sgml/stylesheets/nwalsh-modular \
@@ -64,8 +64,7 @@ else
         sgml/docbook-dsssl \
         sgml/docbook/dsssl/modular \
         sgml/docbook/stylesheet/dsssl/modular \
-        sgml/docbook/dsssl-stylesheets \
-        sgml/dsssl/docbook-dsssl-nwalsh
+        sgml/docbook/dsssl-stylesheets
       do
         pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
         if test -r "$pgac_candidate/html/docbook.dsl" \
@@ -97,32 +96,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/mkinstalldirs b/config/mkinstalldirs
index 070b418022b7..d7b533bccefa 100755
--- a/config/mkinstalldirs
+++ b/config/mkinstalldirs
@@ -105,13 +105,15 @@ esac
 
 for file
 do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  # pathcomp starts with leading slash if present, else empty
+  pathcomp=`echo "$file" | sed -ne 's|^\(.\).*$|\1|;s|[^/]||;p'`
+  # swap spaces and slashes, then split on spaces
+  set fnord `echo "$file" | tr ' /' '/ '`
   shift
 
-  pathcomp=
   for d
   do
-    pathcomp="$pathcomp$d"
+    pathcomp="$pathcomp"`echo "$d" | tr '/' ' '`
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
diff --git a/config/programs.m4 b/config/programs.m4
index 8a85bde21249..504062bbeddd 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -1,4 +1,4 @@
-# config/programs.m4
+# $PostgreSQL: pgsql/config/programs.m4,v 1.24 2008/08/29 13:02:32 petere 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_PATH_PROGS(BISON, bison)
+  AC_CHECK_PROGS(BISON, bison)
 fi
 
 if test "$BISON"; then
@@ -19,15 +19,15 @@ 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, $BISON, is too old to use with PostgreSQL.
-*** Bison version 1.875 or later is required, but this is $pgac_bison_version.])
+*** The installed version of Bison is too old to use with PostgreSQL.
+*** Bison version 1.875 or later is required.])
     BISON=""
   fi
 fi
 
 if test -z "$BISON"; then
   AC_MSG_WARN([
-*** Without Bison you will not be able to build PostgreSQL from Git nor
+*** 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
@@ -42,11 +42,8 @@ AC_SUBST(BISONFLAGS)
 # PGAC_PATH_FLEX
 # --------------
 # Look for Flex, set the output variable FLEX to its path if found.
-# 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.
+# Avoid the buggy version 2.5.3. 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,
@@ -78,6 +75,9 @@ else
 *** The installed version of Flex, $pgac_candidate, is too old to use with Greenplum DB.
 *** Flex version 2.5.4 or later is required, but this is $pgac_flex_version.])
           fi
+
+          pgac_cv_path_flex=$pgac_candidate
+          break 2
         fi
       fi
     done
@@ -88,8 +88,14 @@ 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 Git nor
+*** Without Flex you will not be able to build PostgreSQL from CVS or
 *** 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 +104,7 @@ if test x"$pgac_cv_path_flex" = x"no"; then
   FLEX=
 else
   FLEX=$pgac_cv_path_flex
-  pgac_flex_version=`$FLEX --version 2>/dev/null`
+  pgac_flex_version=`$FLEX -V 2>/dev/null`
   AC_MSG_NOTICE([using $pgac_flex_version])
 fi
 
@@ -117,7 +123,7 @@ AC_SUBST(FLEXFLAGS)
 AC_DEFUN([PGAC_CHECK_READLINE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
 
-AC_CACHE_CHECK([for library containing readline], [pgac_cv_check_readline],
+AC_CACHE_VAL([pgac_cv_check_readline],
 [pgac_cv_check_readline=no
 pgac_save_LIBS=$LIBS
 if test x"$with_libedit_preferred" != x"yes"
@@ -125,6 +131,7 @@ then	READLINE_ORDER="-lreadline -ledit"
 else	READLINE_ORDER="-ledit -lreadline"
 fi
 for pgac_rllib in $READLINE_ORDER ; do
+  AC_MSG_CHECKING([for ${pgac_rllib}])
   for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
     LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
     AC_TRY_LINK_FUNC([readline], [[
@@ -143,11 +150,14 @@ for pgac_rllib in $READLINE_ORDER ; do
     ]])
   done
   if test "$pgac_cv_check_readline" != no ; then
+    AC_MSG_RESULT([yes ($pgac_cv_check_readline)])
     break
+  else
+    AC_MSG_RESULT(no)
   fi
 done
 LIBS=$pgac_save_LIBS
-])[]dnl AC_CACHE_CHECK
+])[]dnl AC_CACHE_VAL
 
 if test "$pgac_cv_check_readline" != no ; then
   LIBS="$pgac_cv_check_readline $LIBS"
@@ -163,8 +173,8 @@ fi
 # Readline versions < 2.1 don't have rl_completion_append_character
 
 AC_DEFUN([PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER],
-[AC_CACHE_CHECK([for rl_completion_append_character], pgac_cv_var_rl_completion_append_character,
-[AC_TRY_LINK([#include <stdio.h>
+[AC_MSG_CHECKING([for rl_completion_append_character])
+AC_TRY_LINK([#include <stdio.h>
 #ifdef HAVE_READLINE_READLINE_H
 # include <readline/readline.h>
 #elif defined(HAVE_READLINE_H)
@@ -172,12 +182,10 @@ AC_DEFUN([PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER],
 #endif
 ],
 [rl_completion_append_character = 'x';],
-[pgac_cv_var_rl_completion_append_character=yes],
-[pgac_cv_var_rl_completion_append_character=no])])
-if test x"$pgac_cv_var_rl_completion_append_character" = x"yes"; then
+[AC_MSG_RESULT(yes)
 AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
-          [Define to 1 if you have the global variable 'rl_completion_append_character'.])
-fi])# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
+          [Define to 1 if you have the global variable 'rl_completion_append_character'.])],
+[AC_MSG_RESULT(no)])])# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
 
 
 
diff --git a/config/python.m4 b/config/python.m4
index cd3acec64fbb..3eeb4d3f76c8 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -85,13 +85,13 @@ AC_SUBST(python_libdir)[]dnl
 AC_SUBST(python_libspec)[]dnl
 AC_SUBST(python_additional_libs)[]dnl
 
-# threaded python is not supported on bsd's
+# threaded python is not supported on OpenBSD
 AC_MSG_CHECKING(whether Python is compiled with thread support)
 pythreads=`${PYTHON} -c "import sys; print(int('thread' in sys.builtin_module_names))"`
 if test "$pythreads" = "1"; then
   AC_MSG_RESULT(yes)
   case $host_os in
-  openbsd*|freebsd*)
+  openbsd*)
     AC_MSG_ERROR([threaded Python not supported on this platform])
     ;;
   esac
diff --git a/configure b/configure
index eb85eaea0ea9..9f4cf286e073 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Greenplum Database 8.3devel.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 8.3.23.
 #
-# Report bugs to <support@greenplum.com>.
+# Report bugs to <pgsql-bugs@postgresql.org>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -269,10 +269,10 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: support@greenplum.com about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: pgsql-bugs@postgresql.org about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -580,11 +580,11 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='Greenplum Database'
-PACKAGE_TARNAME='greenplum-database'
-PACKAGE_VERSION='8.3devel'
-PACKAGE_STRING='Greenplum Database 8.3devel'
-PACKAGE_BUGREPORT='support@greenplum.com'
+PACKAGE_NAME='PostgreSQL'
+PACKAGE_TARNAME='postgresql'
+PACKAGE_VERSION='8.3.23'
+PACKAGE_STRING='PostgreSQL 8.3.23'
+PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 PACKAGE_URL=''
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -654,6 +654,7 @@ PTHREAD_CC
 acx_pthread_config
 LIBOBJS
 HAVE_IPV6
+OSSP_UUID_LIBS
 CURL_LIBS
 CURL_CFLAGS
 CURL_CONFIG
@@ -707,8 +708,10 @@ with_libcurl
 with_rt
 with_zlib
 with_system_tzdata
+with_libxslt
 with_libxml
 XML2_CONFIG
+with_ossp_uuid
 with_openssl
 with_bonjour
 with_ldap
@@ -737,7 +740,6 @@ GCC
 CPP
 PG_CRC32C_OBJS
 CFLAGS_SSE42
-SUN_STUDIO_CC
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -855,7 +857,9 @@ with_bonjour
 with_openssl
 with_readline
 with_libedit_preferred
+with_ossp_uuid
 with_libxml
+with_libxslt
 with_system_tzdata
 with_zlib
 with_rt
@@ -1416,7 +1420,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 Greenplum Database 8.3devel to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 8.3.23 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1464,8 +1468,7 @@ Fine tuning of the installation directories:
   --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/greenplum-database]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/postgresql]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1482,7 +1485,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Greenplum Database 8.3devel:";;
+     short | recursive ) echo "Configuration of PostgreSQL 8.3.23:";;
    esac
   cat <<\_ACEOF
 
@@ -1540,7 +1543,9 @@ Optional Packages:
   --with-openssl          build with OpenSSL support
   --without-readline      do not use GNU Readline nor BSD Libedit for editing
   --without-libedit-preferred  Don't prefer BSD Libedit over GNU Readline
+  --with-ossp-uuid        use OSSP UUID library when building contrib/uuid-ossp
   --with-libxml           build with XML support
+  --with-libxslt          use XSLT support when building contrib/xml2
   --with-system-tzdata=DIR  use system time zone data in DIR
   --without-zlib          do not use Zlib
   --without-rt            do not use Realtime Library
@@ -1565,7 +1570,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <support@greenplum.com>.
+Report bugs to <pgsql-bugs@postgresql.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1628,7 +1633,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Greenplum Database configure 8.3devel
+PostgreSQL configure 8.3.23
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1881,9 +1886,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------ ##
-## Report this to support@greenplum.com ##
-## ------------------------------------ ##"
+( $as_echo "## ---------------------------------------- ##
+## Report this to pgsql-bugs@postgresql.org ##
+## ---------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -2339,7 +2344,7 @@ 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 Greenplum Database $as_me 8.3devel, which was
+It was created by PostgreSQL $as_me 8.3.23, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2690,7 +2695,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
   if test -f "$ac_dir/install-sh"; then
@@ -4220,30 +4224,6 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-# Check if it's Sun Studio compiler. We assume that
-# __SUNPRO_C will be defined for Sun Studio compilers
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __SUNPRO_C
-choke me
-#endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  SUN_STUDIO_CC=yes
-else
-  SUN_STUDIO_CC=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
 unset CFLAGS
 
 #
@@ -4520,12 +4500,13 @@ fi
 
 # Some versions of GCC support some additional useful warning flags.
 # Check whether they are supported, and add them to CFLAGS if so.
-# ICC pretends to be GCC but it's lying; it doesn't support these flags,
-# but has its own.  Also check other compiler-specific flags here.
+# ICC pretends to be GCC but it's lying; it doesn't support these options.
 
 if test "$GCC" = yes -a "$ICC" = no; then
-  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith"
+  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
   # These work in some but not all gcc versions
+  # GPDB code is full of declarations after statement.
+  #PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wendif-labels" >&5
 $as_echo_n "checking if $CC supports -Wendif-labels... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
@@ -4554,7 +4535,6 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
 
-  #PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-format-attribute])
   # This was included in -Wall/-Wformat in older GCC versions
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat-security" >&5
 $as_echo_n "checking if $CC supports -Wformat-security... " >&6; }
@@ -4825,8 +4805,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
 
-elif test "$PORTNAME" = "aix"; then
-  # AIX's xlc has to have strict aliasing turned off too
+elif test x"${CC}" = x"xlc"; then
+  # AIX xlc has to have strict aliasing turned off too
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -qnoansialias" >&5
 $as_echo_n "checking if $CC supports -qnoansialias... " >&6; }
 pgac_save_CFLAGS=$CFLAGS
@@ -6193,6 +6173,37 @@ fi
 
 
 
+#
+# OSSP UUID library
+#
+
+pgac_args="$pgac_args with_ossp_uuid"
+
+
+# Check whether --with-ossp-uuid was given.
+if test "${with_ossp_uuid+set}" = set; then :
+  withval=$with_ossp_uuid;
+  case $withval in
+    yes)
+      :
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --with-ossp-uuid option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  with_ossp_uuid=no
+
+fi
+
+
+
+
+
 #
 # XML
 #
@@ -6283,6 +6294,39 @@ fi
 
 
 
+#
+# XSLT
+#
+
+pgac_args="$pgac_args with_libxslt"
+
+
+# Check whether --with-libxslt was given.
+if test "${with_libxslt+set}" = set; then :
+  withval=$with_libxslt;
+  case $withval in
+    yes)
+
+$as_echo "#define USE_LIBXSLT 1" >>confdefs.h
+
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --with-libxslt option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  with_libxslt=no
+
+fi
+
+
+
+
+
 
 #
 # tzdata
@@ -6607,6 +6651,8 @@ $as_echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;}
 $as_echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
 
 
+
+
 # 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
@@ -7463,22 +7509,20 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BISON+:} false; then :
+if ${ac_cv_prog_BISON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $BISON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  if test -n "$BISON"; then
+  ac_cv_prog_BISON="$BISON" # 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_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_prog_BISON="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7486,10 +7530,9 @@ done
   done
 IFS=$as_save_IFS
 
-  ;;
-esac
 fi
-BISON=$ac_cv_path_BISON
+fi
+BISON=$ac_cv_prog_BISON
 if test -n "$BISON"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
 $as_echo "$BISON" >&6; }
@@ -7511,24 +7554,24 @@ $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
     { $as_echo "$as_me:${as_lineno-$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
+*** The installed version of Bison is too old to use with PostgreSQL.
+*** Bison version 1.875 or later is required." >&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;}
+*** The installed version of Bison is too old to use with PostgreSQL.
+*** Bison version 1.875 or later is required." >&2;}
     BISON=""
   fi
 fi
 
 if test -z "$BISON"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from Git nor
+*** 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
 $as_echo "$as_me: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from Git nor
+*** 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
@@ -7573,6 +7616,9 @@ $as_echo "$as_me: WARNING:
 *** The installed version of Flex, $pgac_candidate, is too old to use with Greenplum DB.
 *** Flex version 2.5.4 or later is required, but this is $pgac_flex_version." >&2;}
           fi
+
+          pgac_cv_path_flex=$pgac_candidate
+          break 2
         fi
       fi
     done
@@ -7585,14 +7631,23 @@ fi
 { $as_echo "$as_me:${as_lineno-$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
+    { $as_echo "$as_me:${as_lineno-$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
+$as_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
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from Git nor
+*** Without Flex you will not be able to build PostgreSQL from CVS or
 *** 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
 $as_echo "$as_me: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from Git nor
+*** Without Flex you will not be able to build PostgreSQL from CVS or
 *** 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
@@ -7601,7 +7656,7 @@ $as_echo "$as_me: WARNING:
   FLEX=
 else
   FLEX=$pgac_cv_path_flex
-  pgac_flex_version=`$FLEX --version 2>/dev/null`
+  pgac_flex_version=`$FLEX -V 2>/dev/null`
   { $as_echo "$as_me:${as_lineno-$LINENO}: using $pgac_flex_version" >&5
 $as_echo "$as_me: using $pgac_flex_version" >&6;}
 fi
@@ -7822,7 +7877,7 @@ python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print('
 $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
 
 
-# threaded python is not supported on bsd's
+# threaded python is not supported on OpenBSD
 { $as_echo "$as_me:${as_lineno-$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))"`
@@ -7830,7 +7885,7 @@ if test "$pythreads" = "1"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   case $host_os in
-  openbsd*|freebsd*)
+  openbsd*)
     as_fn_error $? "threaded Python not supported on this platform" "$LINENO" 5
     ;;
   esac
@@ -8536,8 +8591,6 @@ fi
 if test "$with_readline" = yes; then
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5
-$as_echo_n "checking for library containing readline... " >&6; }
 if ${pgac_cv_check_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8548,6 +8601,8 @@ then	READLINE_ORDER="-lreadline -ledit"
 else	READLINE_ORDER="-ledit -lreadline"
 fi
 for pgac_rllib in $READLINE_ORDER ; do
+  { $as_echo "$as_me:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8588,14 +8643,18 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   done
   if test "$pgac_cv_check_readline" != no ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($pgac_cv_check_readline)" >&5
+$as_echo "yes ($pgac_cv_check_readline)" >&6; }
     break
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 done
 LIBS=$pgac_save_LIBS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_check_readline" >&5
-$as_echo "$pgac_cv_check_readline" >&6; }
+
 if test "$pgac_cv_check_readline" != no ; then
   LIBS="$pgac_cv_check_readline $LIBS"
 
@@ -9756,6 +9815,144 @@ fi
 
 fi
 
+if test "$with_libxslt" = yes ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsltCleanupGlobals in -lxslt" >&5
+$as_echo_n "checking for xsltCleanupGlobals in -lxslt... " >&6; }
+if ${ac_cv_lib_xslt_xsltCleanupGlobals+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxslt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* 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 xsltCleanupGlobals ();
+int
+main ()
+{
+return xsltCleanupGlobals ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_xslt_xsltCleanupGlobals=yes
+else
+  ac_cv_lib_xslt_xsltCleanupGlobals=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
+$as_echo "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
+if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXSLT 1
+_ACEOF
+
+  LIBS="-lxslt $LIBS"
+
+else
+  as_fn_error $? "library 'xslt' is required for XSLT support" "$LINENO" 5
+fi
+
+fi
+
+# for contrib/uuid-ossp
+if test "$with_ossp_uuid" = yes ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -lossp-uuid" >&5
+$as_echo_n "checking for uuid_export in -lossp-uuid... " >&6; }
+if ${ac_cv_lib_ossp_uuid_uuid_export+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lossp-uuid  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* 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 uuid_export ();
+int
+main ()
+{
+return uuid_export ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ossp_uuid_uuid_export=yes
+else
+  ac_cv_lib_ossp_uuid_uuid_export=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$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" = xyes; then :
+  OSSP_UUID_LIBS="-lossp-uuid"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_export in -luuid" >&5
+$as_echo_n "checking for uuid_export in -luuid... " >&6; }
+if ${ac_cv_lib_uuid_uuid_export+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luuid  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* 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 uuid_export ();
+int
+main ()
+{
+return uuid_export ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_uuid_uuid_export=yes
+else
+  ac_cv_lib_uuid_uuid_export=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$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" = xyes; then :
+  OSSP_UUID_LIBS="-luuid"
+else
+  as_fn_error $? "library 'ossp-uuid' or 'uuid' is required for OSSP-UUID" "$LINENO" 5
+fi
+
+fi
+
+fi
+
+
 # Check for EMC Connect
 if test "$enable_connectemc" = yes ; then
   _LIBS="$LIBS"
@@ -10441,6 +10638,17 @@ else
 fi
 
 
+fi
+
+if test "$with_libxslt" = yes ; then
+  ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xslt.h" "ac_cv_header_libxslt_xslt_h" "$ac_includes_default"
+if test "x$ac_cv_header_libxslt_xslt_h" = xyes; then :
+
+else
+  as_fn_error $? "header file <libxslt/xslt.h> is required for XSLT support" "$LINENO" 5
+fi
+
+
 fi
 
 if test "$with_ldap" = yes ; then
@@ -10622,7 +10830,6 @@ done
 
 fi
 
-
 ##
 ## Types, structures, compiler characteristics
 ##
@@ -11884,6 +12091,13 @@ $as_echo "#define GETTIMEOFDAY_1ARG /**/" >>confdefs.h
 fi
 
 
+# Some versions of libedit contain strlcpy(), setproctitle(), and other
+# symbols that that library has no business exposing to the world.  Pending
+# acquisition of a clue by those developers, ignore libedit (including its
+# possible alias of libreadline) while checking for everything else.
+LIBS_including_readline="$LIBS"
+LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
+
 for ac_func in cbrt dlopen fcvt fdatasync getifaddrs getpeereid getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -12413,8 +12627,6 @@ fi
 		;;
 esac
 
-LIBS="$pgac_save_LIBS"
-
 # System's version of getaddrinfo(), if any, may be used only if we found
 # a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
 # (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available
@@ -12445,7 +12657,22 @@ esac
 fi
 
 # Similarly, use system's getopt_long() only if system provides struct option.
-if test x"$ac_cv_type_struct_option" = xyes ; then
+# Solaris' getopt() doesn't do what we want for long options, so always use
+# our versions on that platform.
+if test "$PORTNAME" = "solaris"; then
+  case " $LIBOBJS " in
+  *" getopt.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
+ ;;
+esac
+
+  case " $LIBOBJS " in
+  *" getopt_long.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
+ ;;
+esac
+
+elif test x"$ac_cv_type_struct_option" = xyes ; then
   ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
 if test "x$ac_cv_func_getopt_long" = xyes; then :
   $as_echo "#define HAVE_GETOPT_LONG 1" >>confdefs.h
@@ -12480,6 +12707,23 @@ esac
 
 fi
 
+# mingw has adopted a GNU-centric interpretation of optind/optreset,
+# so always use our version on Windows.
+if test "$PORTNAME" = "win32"; then
+  case " $LIBOBJS " in
+  *" getopt.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
+ ;;
+esac
+
+  case " $LIBOBJS " in
+  *" getopt_long.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
+ ;;
+esac
+
+fi
+
 # Win32 support
 if test "$PORTNAME" = "win32"; then
 ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
@@ -12531,70 +12775,6 @@ $as_echo "#define HAVE_SYMLINK 1" >>confdefs.h
 
 fi
 
-if test "$with_readline" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_append_character" >&5
-$as_echo_n "checking for rl_completion_append_character... " >&6; }
-if ${pgac_cv_var_rl_completion_append_character+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-#ifdef HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#elif defined(HAVE_READLINE_H)
-# include <readline.h>
-#endif
-
-int
-main ()
-{
-rl_completion_append_character = 'x';
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  pgac_cv_var_rl_completion_append_character=yes
-else
-  pgac_cv_var_rl_completion_append_character=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_var_rl_completion_append_character" >&5
-$as_echo "$pgac_cv_var_rl_completion_append_character" >&6; }
-if test x"$pgac_cv_var_rl_completion_append_character" = x"yes"; then
-
-$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
-
-fi
-  for ac_func in rl_completion_matches rl_filename_completion_function
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-  for ac_func in replace_history_entry
-do :
-  ac_fn_c_check_func "$LINENO" "replace_history_entry" "ac_cv_func_replace_history_entry"
-if test "x$ac_cv_func_replace_history_entry" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_REPLACE_HISTORY_ENTRY 1
-_ACEOF
-
-fi
-done
-
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5
 $as_echo_n "checking for sigsetjmp... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12863,6 +13043,101 @@ fi
 esac
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin locking functions" >&5
+$as_echo_n "checking for builtin locking functions... " >&6; }
+if ${pgac_cv_gcc_int_atomics+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+int lock = 0;
+   __sync_lock_test_and_set(&lock, 1);
+   __sync_lock_release(&lock);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pgac_cv_gcc_int_atomics="yes"
+else
+  pgac_cv_gcc_int_atomics="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_gcc_int_atomics" >&5
+$as_echo "$pgac_cv_gcc_int_atomics" >&6; }
+if test x"$pgac_cv_gcc_int_atomics" = x"yes"; then
+
+$as_echo "#define HAVE_GCC_INT_ATOMICS 1" >>confdefs.h
+
+fi
+
+# Lastly, restore full LIBS list and check for readline/libedit symbols
+LIBS="$LIBS_including_readline"
+
+if test "$with_readline" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_append_character" >&5
+$as_echo_n "checking for rl_completion_append_character... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+#ifdef HAVE_READLINE_READLINE_H
+# include <readline/readline.h>
+#elif defined(HAVE_READLINE_H)
+# include <readline.h>
+#endif
+
+int
+main ()
+{
+rl_completion_append_character = 'x';
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  for ac_func in rl_completion_matches rl_filename_completion_function
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in replace_history_entry
+do :
+  ac_fn_c_check_func "$LINENO" "replace_history_entry" "ac_cv_func_replace_history_entry"
+if test "x$ac_cv_func_replace_history_entry" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_REPLACE_HISTORY_ENTRY 1
+_ACEOF
+
+fi
+done
+
+fi
+
+
 #
 # Pthreads
 #
@@ -14900,7 +15175,7 @@ if test "$PORTNAME" != "win32"; then
 
 $as_echo "#define USE_SYSV_SHARED_MEMORY 1" >>confdefs.h
 
-SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
+  SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
 else
 
 $as_echo "#define USE_WIN32_SHARED_MEMORY 1" >>confdefs.h
@@ -15361,7 +15636,7 @@ else
   if test -n "$DOCBOOKSTYLE"; then
   pgac_cv_path_stylesheets=$DOCBOOKSTYLE
 else
-  for pgac_prefix in /usr /usr/local /opt /sw; do
+  for pgac_prefix in /usr /usr/local /opt; do
     for pgac_infix in share lib; do
       for pgac_postfix in \
         sgml/stylesheets/nwalsh-modular \
@@ -15370,8 +15645,7 @@ else
         sgml/docbook-dsssl \
         sgml/docbook/dsssl/modular \
         sgml/docbook/stylesheet/dsssl/modular \
-        sgml/docbook/dsssl-stylesheets \
-        sgml/dsssl/docbook-dsssl-nwalsh
+        sgml/docbook/dsssl-stylesheets
       do
         pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
         if test -r "$pgac_candidate/html/docbook.dsl" \
@@ -16245,7 +16519,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Greenplum Database $as_me 8.3devel, which was
+This file was extended by PostgreSQL $as_me 8.3.23, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16309,13 +16583,13 @@ $config_links
 Configuration commands:
 $config_commands
 
-Report bugs to <support@greenplum.com>."
+Report bugs to <pgsql-bugs@postgresql.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Greenplum Database config.status 8.3devel
+PostgreSQL config.status 8.3.23
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 2abc9d22e1a9..a2c7d9dffe2a 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.501 2007/02/07 00:28:54 petere Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.546.2.16 2010/05/14 03:27:07 scrappy Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -17,9 +17,8 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([Greenplum Database], [8.3devel], [support@greenplum.com])
+AC_INIT([PostgreSQL], [8.3.23], [pgsql-bugs@postgresql.org])
 
-AC_PREREQ(2.63)
 dnl m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 dnl Untested combinations of 'autoconf' and PostgreSQL versions are not
 dnl recommended.  You can remove the check from 'configure.in' but it is then
@@ -298,14 +297,6 @@ AC_TRY_COMPILE([], [@%:@ifndef __INTEL_COMPILER
 choke me
 @%:@endif], [ICC=[yes]], [ICC=[no]])
 
-# Check if it's Sun Studio compiler. We assume that
-# __SUNPRO_C will be defined for Sun Studio compilers
-AC_TRY_COMPILE([], [@%:@ifndef __SUNPRO_C
-choke me
-@%:@endif], [SUN_STUDIO_CC=yes], [SUN_STUDIO_CC=no])
-
-AC_SUBST(SUN_STUDIO_CC)
-
 unset CFLAGS
 
 #
@@ -438,14 +429,14 @@ AC_SUBST(PG_CRC32C_OBJS)
 
 # Some versions of GCC support some additional useful warning flags.
 # Check whether they are supported, and add them to CFLAGS if so.
-# ICC pretends to be GCC but it's lying; it doesn't support these flags,
-# but has its own.  Also check other compiler-specific flags here.
+# ICC pretends to be GCC but it's lying; it doesn't support these options.
 
 if test "$GCC" = yes -a "$ICC" = no; then
-  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith"
+  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
   # These work in some but not all gcc versions
+  # GPDB code is full of declarations after statement.
+  #PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
   PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
-  #PGAC_PROG_CC_CFLAGS_OPT([-Wmissing-format-attribute])
   # This was included in -Wall/-Wformat in older GCC versions
   PGAC_PROG_CC_CFLAGS_OPT([-Wformat-security])
   # Disable strict-aliasing rules; needed for gcc 3.3+
@@ -473,8 +464,8 @@ elif test "$ICC" = yes; then
   PGAC_PROG_CC_CFLAGS_OPT([-mp1])
   # Make sure strict aliasing is off (though this is said to be the default)
   PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])
-elif test "$PORTNAME" = "aix"; then
-  # AIX's xlc has to have strict aliasing turned off too
+elif test x"${CC}" = x"xlc"; then
+  # AIX xlc has to have strict aliasing turned off too
   PGAC_PROG_CC_CFLAGS_OPT([-qnoansialias])
 fi
 
@@ -499,7 +490,7 @@ fi
 # enable profiling if --enable-profiling
 if test "$enable_profiling" = yes && test "$ac_cv_prog_cc_g" = yes; then
   if test "$GCC" = yes; then
-    AC_DEFINE([PROFILE_PID_DIR], 1,
+    AC_DEFINE([PROFILE_PID_DIR], 1, 
            [Define to 1 to allow profiling output to be saved separately for each process.])
     CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS"
   else
@@ -884,6 +875,13 @@ PGAC_ARG_BOOL(with, libedit-preferred, yes,
               [  --without-libedit-preferred  Don't prefer BSD Libedit over GNU Readline])
 
 
+#
+# OSSP UUID library
+#
+PGAC_ARG_BOOL(with, ossp-uuid, no, [  --with-ossp-uuid        use OSSP UUID library when building contrib/uuid-ossp])
+AC_SUBST(with_ossp_uuid)
+
+
 #
 # XML
 #
@@ -908,6 +906,14 @@ fi
 
 AC_SUBST(with_libxml)
 
+#
+# XSLT
+#
+PGAC_ARG_BOOL(with, libxslt, no, [  --with-libxslt          use XSLT support when building contrib/xml2],
+              [AC_DEFINE([USE_LIBXSLT], 1, [Define to 1 to use XSLT support when building contrib/xml2. (--with-libxslt)])])
+
+
+AC_SUBST(with_libxslt)
 
 #
 # tzdata
@@ -981,6 +987,8 @@ AC_ARG_VAR(LDFLAGS_SL, [extra linker flags for linking shared libraries only])
 AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
 AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])
 
+AC_ARG_VAR(LDFLAGS_SL)
+
 PGAC_PROG_LD
 AC_SUBST(LD)
 AC_SUBST(with_gnu_ld)
@@ -1199,6 +1207,20 @@ if test "$enable_snmp" = yes ; then
 	AC_CHECK_LIB(netsnmp,  netsnmp_ds_set_string,  [], [AC_MSG_ERROR([library 'netsnmp' is required for snmp support])])
 fi
 
+if test "$with_libxslt" = yes ; then
+  AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
+fi
+
+# for contrib/uuid-ossp
+if test "$with_ossp_uuid" = yes ; then
+  AC_CHECK_LIB(ossp-uuid, uuid_export,
+    [OSSP_UUID_LIBS="-lossp-uuid"],
+    [AC_CHECK_LIB(uuid, uuid_export,
+      [OSSP_UUID_LIBS="-luuid"],
+      [AC_MSG_ERROR([library 'ossp-uuid' or 'uuid' is required for OSSP-UUID])])])
+fi
+AC_SUBST(OSSP_UUID_LIBS)
+
 # Check for EMC Connect
 if test "$enable_connectemc" = yes ; then
   _LIBS="$LIBS"
@@ -1334,6 +1356,10 @@ if test "$with_libxml" = yes ; then
   AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file <libxml/parser.h> is required for XML support])])
 fi
 
+if test "$with_libxslt" = yes ; then
+  AC_CHECK_HEADER(libxslt/xslt.h, [], [AC_MSG_ERROR([header file <libxslt/xslt.h> is required for XSLT support])])
+fi
+
 if test "$with_ldap" = yes ; then
   if test "$PORTNAME" != "win32"; then
      AC_CHECK_HEADERS(ldap.h, [],
@@ -1383,7 +1409,6 @@ if test "$enable_mapreduce" = yes; then
   AC_CHECK_HEADERS(yaml.h, [], [AC_MSG_ERROR([YAML includes required for Greenplum Mapreduce])])
 fi
 
-
 ##
 ## Types, structures, compiler characteristics
 ##
@@ -1444,7 +1469,7 @@ if test "$with_krb5" = yes; then
   AC_MSG_CHECKING(for krb5_free_unparsed_name)
   AC_TRY_LINK([#include <krb5.h>],
               [krb5_free_unparsed_name(NULL,NULL);],
-              [AC_DEFINE(HAVE_KRB5_FREE_UNPARSED_NAME, 1, [Define to 1 if you have krb5_free_unparsed_name])
+              [AC_DEFINE(HAVE_KRB5_FREE_UNPARSED_NAME, 1, [Define to 1 if you have krb5_free_unparsed_name]) 
 AC_MSG_RESULT(yes)],
               [AC_MSG_RESULT(no)])
 fi
@@ -1458,6 +1483,13 @@ PGAC_VAR_INT_TIMEZONE
 AC_FUNC_ACCEPT_ARGTYPES
 PGAC_FUNC_GETTIMEOFDAY_1ARG
 
+# Some versions of libedit contain strlcpy(), setproctitle(), and other
+# symbols that that library has no business exposing to the world.  Pending
+# acquisition of a clue by those developers, ignore libedit (including its
+# possible alias of libreadline) while checking for everything else.
+LIBS_including_readline="$LIBS"
+LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
+
 AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getifaddrs getpeereid getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs])
 
 # posix_fadvise() is a no-op on Solaris, so don't incur function overhead
@@ -1582,8 +1614,6 @@ case $host_os in
 		;;
 esac
 
-LIBS="$pgac_save_LIBS"
-
 # System's version of getaddrinfo(), if any, may be used only if we found
 # a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
 # (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available
@@ -1596,7 +1626,12 @@ else
 fi
 
 # Similarly, use system's getopt_long() only if system provides struct option.
-if test x"$ac_cv_type_struct_option" = xyes ; then
+# Solaris' getopt() doesn't do what we want for long options, so always use
+# our versions on that platform.
+if test "$PORTNAME" = "solaris"; then
+  AC_LIBOBJ(getopt)
+  AC_LIBOBJ(getopt_long)
+elif test x"$ac_cv_type_struct_option" = xyes ; then
   AC_REPLACE_FUNCS([getopt_long])
 else
   AC_LIBOBJ(getopt_long)
@@ -1608,6 +1643,13 @@ if test "$PORTNAME" = "solaris"; then
   AC_LIBOBJ(getopt)
 fi
 
+# mingw has adopted a GNU-centric interpretation of optind/optreset,
+# so always use our version on Windows.
+if test "$PORTNAME" = "win32"; then
+  AC_LIBOBJ(getopt)
+  AC_LIBOBJ(getopt_long)
+fi
+
 # Win32 support
 if test "$PORTNAME" = "win32"; then
 AC_REPLACE_FUNCS(gettimeofday)
@@ -1620,13 +1662,6 @@ AC_DEFINE([HAVE_SYMLINK], 1,
           [Define to 1 if you have the `symlink' function.])
 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])
-fi
-
-
 dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro
 dnl (especially on GNU libc)
 dnl See also comments in c.h.
@@ -1681,6 +1716,27 @@ case $host_os in
 esac
 
 
+AC_CACHE_CHECK([for builtin locking functions], pgac_cv_gcc_int_atomics,
+[AC_TRY_LINK([],
+  [int lock = 0;
+   __sync_lock_test_and_set(&lock, 1);
+   __sync_lock_release(&lock);],
+  [pgac_cv_gcc_int_atomics="yes"],
+  [pgac_cv_gcc_int_atomics="no"])])
+if test x"$pgac_cv_gcc_int_atomics" = x"yes"; then
+  AC_DEFINE(HAVE_GCC_INT_ATOMICS, 1, [Define to 1 if you have __sync_lock_test_and_set(int *) and friends.])
+fi
+
+# Lastly, restore full LIBS list and check for readline/libedit symbols
+LIBS="$LIBS_including_readline"
+
+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])
+fi
+
+
 #
 # Pthreads
 #
@@ -2001,8 +2057,8 @@ fi
 
 # Select shared-memory implementation type.
 if test "$PORTNAME" != "win32"; then
-AC_DEFINE(USE_SYSV_SHARED_MEMORY, 1, [Define to select SysV-style shared memory.])
-SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
+  AC_DEFINE(USE_SYSV_SHARED_MEMORY, 1, [Define to select SysV-style shared memory.])
+  SHMEM_IMPLEMENTATION="src/backend/port/sysv_shmem.c"
 else
   AC_DEFINE(USE_WIN32_SHARED_MEMORY, 1, [Define to select Win32-style shared memory.])
   SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c"
diff --git a/contrib/Makefile b/contrib/Makefile
index 16a90d0d5c0e..15296c9bd3f0 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/Makefile,v 1.71 2007/02/08 15:09:47 momjian Exp $
+# $PostgreSQL: pgsql/contrib/Makefile,v 1.82.2.1 2008/05/08 16:49:47 tgl Exp $
 
 subdir = contrib
 top_builddir = ..
@@ -15,8 +15,11 @@ WANTED_DIRS = \
 		gp_internal_tools \
 		gp_cancel_query \
 		indexscan \
-		intarray
-
+		dict_int \
+		dict_xsyn \
+		intarray \
+		pageinspect \
+		test_parser
 
 ifeq ($(with_openssl),yes)
 WANTED_DIRS += sslinfo
@@ -32,7 +35,6 @@ endif
 
 # Missing:
 #		start-scripts	\ (does not have a makefile)
-#		xml2		\ (requires libxml installed)
 
 
 all install installdirs uninstall distprep clean distclean maintainer-clean:
diff --git a/contrib/README b/contrib/README
index 1ae49adc7045..fd6d7ff92b8f 100644
--- a/contrib/README
+++ b/contrib/README
@@ -116,10 +116,6 @@ pg_standby -
 	Sample archive_command for warm standby operation
 	by Simon Riggs <simon@2ndquadrant.com>
 
-pg_stat_statements -
-	Track statement execution times across a whole database cluster
-	by Takahiro Itagaki <itagaki.takahiro@oss.ntt.co.jp>
-
 pg_trgm -
 	Functions for determining the similarity of text based on trigram
 	matching.
diff --git a/contrib/adminpack/.gitignore b/contrib/adminpack/.gitignore
new file mode 100644
index 000000000000..ea9a442f3a15
--- /dev/null
+++ b/contrib/adminpack/.gitignore
@@ -0,0 +1 @@
+/adminpack.sql
diff --git a/contrib/btree_gist/.gitignore b/contrib/btree_gist/.gitignore
new file mode 100644
index 000000000000..46318eaa7b06
--- /dev/null
+++ b/contrib/btree_gist/.gitignore
@@ -0,0 +1,3 @@
+/btree_gist.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/chkpass/.gitignore b/contrib/chkpass/.gitignore
new file mode 100644
index 000000000000..9029d666aa5e
--- /dev/null
+++ b/contrib/chkpass/.gitignore
@@ -0,0 +1 @@
+/chkpass.sql
diff --git a/contrib/chkpass/uninstall_chkpass.sql b/contrib/chkpass/uninstall_chkpass.sql
index 2e0878bacb96..386fc95c5fa2 100644
--- a/contrib/chkpass/uninstall_chkpass.sql
+++ b/contrib/chkpass/uninstall_chkpass.sql
@@ -7,8 +7,6 @@ DROP OPERATOR <>(chkpass, text);
 
 DROP OPERATOR =(chkpass, text);
 
-DROP OPERATOR =(text, chkpass);
-
 DROP FUNCTION ne(chkpass, text);
 
 DROP FUNCTION eq(chkpass, text);
diff --git a/contrib/cube/.gitignore b/contrib/cube/.gitignore
new file mode 100644
index 000000000000..862c18f653c6
--- /dev/null
+++ b/contrib/cube/.gitignore
@@ -0,0 +1,6 @@
+/cubeparse.c
+/cubeparse.h
+/cubescan.c
+/cube.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/cube/uninstall_cube.sql b/contrib/cube/uninstall_cube.sql
index fb4880bab53b..ddbbaec4201e 100644
--- a/contrib/cube/uninstall_cube.sql
+++ b/contrib/cube/uninstall_cube.sql
@@ -95,8 +95,4 @@ DROP FUNCTION cube_ne(cube, cube);
 
 DROP FUNCTION cube_eq(cube, cube);
 
-DROP CAST (text AS cube);
-
-DROP FUNCTION cube(text);
-
 DROP TYPE cube CASCADE;
diff --git a/contrib/dblink/.gitignore b/contrib/dblink/.gitignore
index c5f67742afc4..fb7e8728bcff 100644
--- a/contrib/dblink/.gitignore
+++ b/contrib/dblink/.gitignore
@@ -1 +1,3 @@
-dblink.sql
+/dblink.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/dblink/README.dblink b/contrib/dblink/README.dblink
deleted file mode 100755
index 5b6ffa8ae789..000000000000
--- a/contrib/dblink/README.dblink
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * dblink
- *
- * Functions returning results from a remote database
- *
- * Joe Conway <mail@joeconway.com>
- * And contributors:
- * Darko Prenosil <Darko.Prenosil@finteh.hr>
- * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
- * Kai Londenberg (K.Londenberg@librics.de)
- *
- * Copyright (c) 2001-2007, PostgreSQL Global Development Group
- * ALL RIGHTS RESERVED;
- * 
- * 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 AUTHOR OR DISTRIBUTORS 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 AUTHOR OR DISTRIBUTORS HAVE BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE AUTHOR AND DISTRIBUTORS 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 AUTHOR AND DISTRIBUTORS HAS NO OBLIGATIONS TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-Release Notes:
-  27 August 2006
-    - Added async query capability. Original patch by
-      Kai Londenberg (K.Londenberg@librics.de), modified by Joe Conway
-  Version 0.7 (as of 25 Feb, 2004)
-    - Added new version of dblink, dblink_exec, dblink_open, dblink_close,
-      and, dblink_fetch -- allows ERROR on remote side of connection to
-      throw NOTICE locally instead of ERROR
-  Version 0.6
-    - functions deprecated in 0.5 have been removed
-    - added ability to create "named" persistent connections
-  Version 0.5
-    - dblink now supports use directly as a table function; this is the new
-      preferred usage going forward
-    - Use of dblink_tok is now deprecated; original form of dblink is also
-      deprecated. They _will_ be removed in the next version.
-    - dblink_last_oid is also deprecated; use dblink_exec() which returns
-      the command status as a single row, single column result.
-    - Original dblink, dblink_tok, and dblink_last_oid are commented out in
-      dblink.sql; remove the comments to use the deprecated functions.
-    - dblink_strtok() and dblink_replace() functions were removed. Use
-      split() and replace() respectively (new backend functions in
-      PostgreSQL 7.3) instead.
-    - New functions: dblink_exec() for non-SELECT queries; dblink_connect()
-      opens connection that persists for duration of a backend;
-      dblink_disconnect() closes a persistent connection; dblink_open()
-      opens a cursor; dblink_fetch() fetches results from an open cursor.
-      dblink_close() closes a cursor.
-    - New test suite: dblink_check.sh, dblink.test.sql,
-      dblink.test.expected.out. Execute dblink_check.sh from the same
-      directory as the other two files. Output is dblink.test.out and
-      dblink.test.diff. Note that dblink.test.sql is a good source
-      of example usage.
-
-  Version 0.4
-    - removed cursor wrap around input sql to allow for remote
-      execution of INSERT/UPDATE/DELETE
-	- dblink now returns a resource id instead of a real pointer
-    - added several utility functions -- see below
-
-  Version 0.3
-    - fixed dblink invalid pointer causing corrupt elog message
-    - fixed dblink_tok improper handling of null results
-    - fixed examples in README.dblink
-
-  Version 0.2
-    - initial release    
-
-Installation:
-  Place these files in a directory called 'dblink' under 'contrib' in the PostgreSQL source tree. Then run:
-
-    make
-    make install
-
-  You can use dblink.sql to create the functions in your database of choice, e.g.
-
-    psql template1 < dblink.sql
-
-  installs dblink functions into database template1
-
-Documentation:
-
-  Note: Parameters representing relation names must include double
-     quotes if the names are mixed-case or contain special characters. They
-     must also be appropriately qualified with schema name if applicable.
-
-  See the following files:
-     doc/connection
-     doc/cursor
-     doc/query
-     doc/execute
-     doc/misc
-
-==================================================================
--- Joe Conway
-
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 840de268bf48..983f7d6f0b7c 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -8,7 +8,7 @@
  * Darko Prenosil <Darko.Prenosil@finteh.hr>
  * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.69.2.2 2009/01/03 19:57:54 joe Exp $
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.69.2.8 2010/06/15 19:04:28 tgl Exp $
  * Copyright (c) 2001-2008, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -37,6 +37,7 @@
 #include "libpq-fe.h"
 #include "fmgr.h"
 #include "funcapi.h"
+#include "miscadmin.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/tupdesc.h"
@@ -47,11 +48,11 @@
 #include "executor/executor.h"
 #include "executor/spi.h"
 #include "lib/stringinfo.h"
-#include "miscadmin.h"
 #include "nodes/execnodes.h"
 #include "nodes/nodes.h"
 #include "nodes/pg_list.h"
 #include "parser/parse_type.h"
+#include "parser/scansup.h"
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
 #include "utils/array.h"
@@ -82,20 +83,24 @@ 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 void dblink_security_check(PGconn *conn, remoteConn *rconn);
+static void validate_pkattnums(Relation rel,
+				   int2vector *pkattnums_arg, int32 pknumatts_arg,
+				   int **pkattnums, int *pknumatts);
 
 /* Global */
 static remoteConn *pconn = NULL;
@@ -129,6 +134,14 @@ typedef struct remoteConnHashEnt
 		} \
 	} while (0)
 
+#define xpstrdup(tgtvar_, srcvar_) \
+    do { \
+        if (srcvar_) \
+            tgtvar_ = pstrdup(srcvar_); \
+        else \
+            tgtvar_ = NULL; \
+    } while (0)
+
 #define DBLINK_RES_INTERNALERROR(p2) \
 	do { \
 			msg = pstrdup(PQerrorMessage(conn)); \
@@ -863,7 +876,6 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async, bool do_get)
 						PQfinish(conn);
 					MemoryContextSwitchTo(oldcontext);
 					SRF_RETURN_DONE(funcctx);
-				}
 			}
 
 			if (PQresultStatus(res) == PGRES_COMMAND_OK)
@@ -1136,20 +1148,23 @@ PG_FUNCTION_INFO_V1(dblink_exec);
 Datum
 dblink_exec(PG_FUNCTION_ARGS)
 {
+	text	   *volatile sql_cmd_status = NULL;
+	PGconn	   *volatile conn = NULL;
+	volatile bool freeconn = false;
+
+	DBLINK_INIT;
+
+	PG_TRY();
+	{
 	char	   *msg;
 	PGresult   *res = NULL;
-	text	   *sql_cmd_status = NULL;
 	TupleDesc	tupdesc = NULL;
-	PGconn	   *conn = NULL;
 	char	   *connstr = NULL;
 	char	   *sql = NULL;
 	char	   *conname = NULL;
 	remoteConn *rconn = NULL;
-	bool		freeconn = false;
 	bool		fail = true;	/* default to backward compatible behavior */
 
-	DBLINK_INIT;
-
 	if (PG_NARGS() == 3)
 	{
 		/* must be text,text,bool */
@@ -1228,8 +1243,17 @@ dblink_exec(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED),
 				 errmsg("statement returning results not allowed")));
 	}
+	}
+	PG_CATCH();
+	{
+		/* if needed, close the connection to the database */
+		if (freeconn)
+			PQfinish(conn);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
 
-	/* if needed, close the connection to the database and cleanup */
+	/* if needed, close the connection to the database */
 	if (freeconn)
 		PQfinish(conn);
 
@@ -1248,7 +1272,6 @@ Datum
 dblink_get_pkey(PG_FUNCTION_ARGS)
 {
 	int16		numatts;
-	Oid			relid;
 	char	  **results;
 	FuncCallContext *funcctx;
 	int32		call_cntr;
@@ -1259,7 +1282,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();
@@ -1269,13 +1293,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",
-							GET_STR(PG_GETARG_TEXT_P(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
@@ -1293,9 +1317,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;
@@ -1378,12 +1399,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;
@@ -1391,30 +1413,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",
-						GET_STR(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
@@ -1449,7 +1456,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
@@ -1478,40 +1490,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",
-						GET_STR(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
@@ -1531,7 +1529,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
@@ -1564,12 +1567,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;
@@ -1577,30 +1581,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",
-						GET_STR(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
@@ -1635,7 +1624,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
@@ -1655,7 +1649,7 @@ dblink_build_sql_update(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;
@@ -1663,22 +1657,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. */
@@ -1686,7 +1669,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);
@@ -1712,7 +1695,6 @@ get_pkey_attnames(Oid relid, int16 *numatts)
 
 	systable_endscan(scan);
 	heap_close(indexRelation, AccessShareLock);
-	relation_close(rel, AccessShareLock);
 
 	return result;
 }
@@ -1779,32 +1761,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),
@@ -1829,7 +1806,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++)
@@ -1840,12 +1817,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);
@@ -1861,46 +1835,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",
@@ -1909,37 +1871,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),
@@ -1947,6 +1903,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++)
 	{
@@ -1959,12 +1918,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);
@@ -1983,29 +1939,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);
 }
 
@@ -2045,8 +1994,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;
 
@@ -2054,35 +2003,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
 	 */
@@ -2090,21 +2027,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",
@@ -2152,52 +2114,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);
-
-	result = quote_qualified_identifier(nspname, NameStr(reltup->relname));
+		nspname = get_namespace_name(rel->rd_rel->relnamespace);
 
-	ReleaseSysCache(tp);
+	result = quote_qualified_identifier(nspname, RelationGetRelationName(rel));
 
 	return result;
 }
@@ -2207,13 +2166,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), false);
 	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
 											   key, HASH_FIND, NULL);
 
@@ -2239,20 +2198,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));
@@ -2263,14 +2227,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), false);
 	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
 											   key, HASH_REMOVE, &found);
 
@@ -2300,6 +2263,7 @@ dblink_security_check(PGconn *conn, remoteConn *rconn)
 		}
 	}
 }
+
 /*
  * For non-superusers, insist that the connstr specify a password.  This
  * prevents a password from being picked up from .pgpass, a service file,
@@ -2390,3 +2354,52 @@ dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_
 		 errcontext("Error occurred on dblink connection named \"%s\": %s.",
 					dblink_context_conname, dblink_context_msg)));
 }
+
+/*
+ * 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 physical 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.
+ *
+ * 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];
+
+		if (pkattnum <= 0 || pkattnum > natts ||
+			tupdesc->attrs[pkattnum - 1]->attisdropped)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("invalid attribute number %d", pkattnum)));
+		(*pkattnums)[i] = pkattnum - 1;
+	}
+}
diff --git a/contrib/dblink/doc/connection b/contrib/dblink/doc/connection
deleted file mode 100755
index ba70ecd9f1b6..000000000000
--- a/contrib/dblink/doc/connection
+++ /dev/null
@@ -1,122 +0,0 @@
-$PostgreSQL: pgsql/contrib/dblink/doc/connection,v 1.4.2.1 2007/07/09 01:32:30 joe Exp $
-==================================================================
-Name
-
-dblink_connect -- Opens a persistent connection to a remote database
-
-Synopsis
-
-dblink_connect(text connstr)
-dblink_connect(text connname, text connstr)
-
-Inputs
-
-  connname
-    if 2 arguments are given, the first is used as a name for a persistent
-    connection
-
-  connstr
-
-    standard libpq format connection string, 
-    e.g. "hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres password=mypasswd"
-
-    if only one argument is given, the connection is unnamed; only one unnamed
-    connection can exist at a time
-
-Outputs
-
-  Returns status = "OK"
-
-Notes
-
-  Only superusers may use dblink_connect to create non-password
-  authenticated connections. If non-superusers need this capability,
-  use dblink_connect_u instead.
-
-Example usage
-
-select dblink_connect('dbname=postgres');
- dblink_connect
-----------------
- OK
-(1 row)
-
-select dblink_connect('myconn','dbname=postgres');
- dblink_connect
-----------------
- OK
-(1 row)
-
-==================================================================
-Name
-
-dblink_connect_u -- Opens a persistent connection to a remote database
-
-Synopsis
-
-dblink_connect_u(text connstr)
-dblink_connect_u(text connname, text connstr)
-
-Inputs
-
-  connname
-    if 2 arguments are given, the first is used as a name for a persistent
-    connection
-
-  connstr
-
-    standard libpq format connection string, 
-    e.g. "hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres password=mypasswd"
-
-    if only one argument is given, the connection is unnamed; only one unnamed
-    connection can exist at a time
-
-Outputs
-
-  Returns status = "OK"
-
-Notes
-
-  With dblink_connect_u, a non-superuser may connect to any database server
-  using any authentication method. If the authentication method specified
-  for a particular user does not require a password, impersonation and
-  therefore escalation of privileges may occur. For this reason,
-  dblink_connect_u is initially installed with all privileges revoked from
-  public. Privilege to these functions should be granted with care.
-
-Example usage
-
-
-==================================================================
-Name
-
-dblink_disconnect -- Closes a persistent connection to a remote database
-
-Synopsis
-
-dblink_disconnect()
-dblink_disconnect(text connname)
-
-Inputs
-
-  connname
-    if an argument is given, it is used as a name for a persistent
-    connection to close; otherwiase the unnamed connection is closed
-
-Outputs
-
-  Returns status = "OK"
-
-Example usage
-
-test=# select dblink_disconnect();
- dblink_disconnect
--------------------
- OK
-(1 row)
-
-select dblink_disconnect('myconn');
- dblink_disconnect
--------------------
- OK
-(1 row)
diff --git a/contrib/dblink/doc/cursor b/contrib/dblink/doc/cursor
deleted file mode 100755
index 874599582885..000000000000
--- a/contrib/dblink/doc/cursor
+++ /dev/null
@@ -1,220 +0,0 @@
-$PostgreSQL: pgsql/contrib/dblink/doc/cursor,v 1.6 2006/03/11 04:38:29 momjian Exp $
-==================================================================
-Name
-
-dblink_open -- Opens a cursor on a remote database
-
-Synopsis
-
-dblink_open(text cursorname, text sql [, bool fail_on_error])
-dblink_open(text connname, text cursorname, text sql [, bool fail_on_error])
-
-Inputs
-
-  connname
-    if three arguments are present, the first is taken as the specific
-    connection name to use; otherwise the unnamed connection is assumed
-
-  cursorname
-
-    a reference name for the cursor
-
-  sql
-
-    sql statement that you wish to execute on the remote host
-    e.g. "select * from pg_class"
-
-  fail_on_error
-
-    If true (default when not present) then an ERROR thrown on the remote side
-    of the connection causes an ERROR to also be thrown locally. If false, the
-    remote ERROR is locally treated as a NOTICE, and the return value is set
-    to 'ERROR'.
-
-Outputs
-
-  Returns status = "OK"
-
-Note
-  1) dblink_connect(text connstr) must be executed first
-  2) dblink_open starts an explicit transaction. If, after using dblink_open,
-     you use dblink_exec to change data, and then an error occurs or you use
-     dblink_disconnect without a dblink_close first, your change *will* be
-     lost. Also, using dblink_close explicitly ends the transaction and thus
-     effectively closes *all* open cursors.
-
-Example usage
-
-test=# select dblink_connect('dbname=postgres');
- dblink_connect
-----------------
- OK
-(1 row)
-
-test=# select dblink_open('foo','select proname, prosrc from pg_proc');
- dblink_open
--------------
- OK
-(1 row)
-
-==================================================================
-Name
-
-dblink_fetch -- Returns a set from an open cursor on a remote database
-
-Synopsis
-
-dblink_fetch(text cursorname, int32 howmany [, bool fail_on_error])
-dblink_fetch(text connname, text cursorname, int32 howmany [, bool fail_on_error])
-
-Inputs
-
-  connname
-    if three arguments are present, the first is taken as the specific
-    connection name to use; otherwise the unnamed connection is assumed
-
-  cursorname
-
-    The reference name for the cursor
-
-  howmany
-
-    Maximum number of rows to retrieve. The next howmany rows are fetched,
-    starting at the current cursor position, moving forward. Once the cursor
-    has positioned to the end, no more rows are produced.
-
-  fail_on_error
-
-    If true (default when not present) then an ERROR thrown on the remote side
-    of the connection causes an ERROR to also be thrown locally. If false, the
-    remote ERROR is locally treated as a NOTICE, and no rows are returned.
-
-Outputs
-
-  Returns setof record
-
-Note
-
-  On a mismatch between the number of return fields as specified in the FROM
-  clause, and the actual number of fields returned by the remote cursor, an
-  ERROR will be thrown. In this event, the remote cursor is still advanced
-  by as many rows as it would have been if the ERROR had not occurred.
-
-Example usage
-
-test=# select dblink_connect('dbname=postgres');
- dblink_connect
-----------------
- OK
-(1 row)
-
-test=# select dblink_open('foo','select proname, prosrc from pg_proc where proname like ''bytea%''');
- dblink_open
--------------
- OK
-(1 row)
-
-test=# select * from dblink_fetch('foo',5) as (funcname name, source text);
- funcname |  source
-----------+----------
- byteacat | byteacat
- byteacmp | byteacmp
- byteaeq  | byteaeq
- byteage  | byteage
- byteagt  | byteagt
-(5 rows)
-
-test=# select * from dblink_fetch('foo',5) as (funcname name, source text);
- funcname  |  source
------------+-----------
- byteain   | byteain
- byteale   | byteale
- bytealike | bytealike
- bytealt   | bytealt
- byteane   | byteane
-(5 rows)
-
-test=# select * from dblink_fetch('foo',5) as (funcname name, source text);
-  funcname  |   source
-------------+------------
- byteanlike | byteanlike
- byteaout   | byteaout
-(2 rows)
-
-test=# select * from dblink_fetch('foo',5) as (funcname name, source text);
- funcname | source
-----------+--------
-(0 rows)
-
-==================================================================
-Name
-
-dblink_close -- Closes a cursor on a remote database
-
-Synopsis
-
-dblink_close(text cursorname [, bool fail_on_error])
-dblink_close(text connname, text cursorname [, bool fail_on_error])
-
-Inputs
-
-  connname
-    if two arguments are present, the first is taken as the specific
-    connection name to use; otherwise the unnamed connection is assumed
-
-  cursorname
-
-    a reference name for the cursor
-
-  fail_on_error
-
-    If true (default when not present) then an ERROR thrown on the remote side
-    of the connection causes an ERROR to also be thrown locally. If false, the
-    remote ERROR is locally treated as a NOTICE, and the return value is set
-    to 'ERROR'.
-
-Outputs
-
-  Returns status = "OK"
-
-Note
-  dblink_connect(text connstr) or dblink_connect(text connname, text connstr)
-  must be executed first.
-
-Example usage
-
-test=# select dblink_connect('dbname=postgres');
- dblink_connect
-----------------
- OK
-(1 row)
-
-test=# select dblink_open('foo','select proname, prosrc from pg_proc');
- dblink_open
--------------
- OK
-(1 row)
-
-test=# select dblink_close('foo');
- dblink_close
---------------
- OK
-(1 row)
-
-select dblink_connect('myconn','dbname=regression');
- dblink_connect
-----------------
- OK
-(1 row)
-
-select dblink_open('myconn','foo','select proname, prosrc from pg_proc');
- dblink_open
--------------
- OK
-(1 row)
-
-select dblink_close('myconn','foo');
- dblink_close
---------------
- OK
-(1 row)
diff --git a/contrib/dblink/doc/execute b/contrib/dblink/doc/execute
deleted file mode 100755
index 021e01ef85a1..000000000000
--- a/contrib/dblink/doc/execute
+++ /dev/null
@@ -1,80 +0,0 @@
-$PostgreSQL: pgsql/contrib/dblink/doc/execute,v 1.4 2006/03/11 04:38:29 momjian Exp $
-==================================================================
-Name
-
-dblink_exec -- Executes an UPDATE/INSERT/DELETE on a remote database
-
-Synopsis
-
-dblink_exec(text connstr, text sql [, bool fail_on_error])
-dblink_exec(text connname, text sql [, bool fail_on_error])
-dblink_exec(text sql [, bool fail_on_error])
-
-Inputs
-
-  connname
-  connstr
-
-    If two arguments are present, the first is first assumed to be a specific
-    connection name to use. If the name is not found, the argument is then
-    assumed to be a valid connection string, of standard libpq format,
-    e.g.: "hostaddr=127.0.0.1 dbname=mydb user=postgres password=mypasswd"
-
-    If only one argument is used, then the unnamed connection is used.
-
-  sql
-
-    sql statement that you wish to execute on the remote host, e.g.:
-       insert into foo values(0,'a','{"a0","b0","c0"}');
-
-  fail_on_error
-
-    If true (default when not present) then an ERROR thrown on the remote side
-    of the connection causes an ERROR to also be thrown locally. If false, the
-    remote ERROR is locally treated as a NOTICE, and the return value is set
-    to 'ERROR'.
-
-Outputs
-
-  Returns status of the command, or 'ERROR' if the command failed.
-
-Notes
-  1) dblink_open starts an explicit transaction. If, after using dblink_open,
-     you use dblink_exec to change data, and then an error occurs or you use
-     dblink_disconnect without a dblink_close first, your change *will* be
-     lost.
-
-Example usage
-
-select dblink_connect('dbname=dblink_test_slave');
- dblink_connect
-----------------
- OK
-(1 row)
-
-select dblink_exec('insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
-   dblink_exec
------------------
- INSERT 943366 1
-(1 row)
-
-select dblink_connect('myconn','dbname=regression');
- dblink_connect
-----------------
- OK
-(1 row)
-
-select dblink_exec('myconn','insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
-   dblink_exec
-------------------
- INSERT 6432584 1
-(1 row)
-
-select dblink_exec('myconn','insert into pg_class values (''foo'')',false);
-NOTICE:  sql error
-DETAIL:  ERROR:  null value in column "relnamespace" violates not-null constraint
-
- dblink_exec
--------------
- ERROR
-(1 row)
diff --git a/contrib/dblink/doc/misc b/contrib/dblink/doc/misc
deleted file mode 100755
index 3834afd8724b..000000000000
--- a/contrib/dblink/doc/misc
+++ /dev/null
@@ -1,232 +0,0 @@
-$PostgreSQL: pgsql/contrib/dblink/doc/misc,v 1.4 2006/09/02 21:11:15 joe Exp $
-==================================================================
-Name
-
-dblink_current_query -- returns the current query string
-
-Synopsis
-
-dblink_current_query () RETURNS text
-
-Inputs
-
-  None
-
-Outputs
-
-  Returns text -- a copy of the currently executing query
-
-Example usage
-
-test=# select dblink_current_query() from (select dblink('dbname=postgres','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
-                                                                dblink_current_query
------------------------------------------------------------------------------------------------------------------------------------------------------
- select dblink_current_query() from (select dblink('dbname=postgres','select oid, proname from pg_proc where proname = ''byteacat''') as f1) as t1;
-(1 row)
-
-==================================================================
-Name
-
-dblink_get_pkey -- returns the position and field names of a relation's
-                   primary key fields
-
-Synopsis
-
-dblink_get_pkey(text relname) RETURNS setof dblink_pkey_results
-
-Inputs
-
-  relname
-
-    any relation name;
-    e.g. 'foobar'
-
-Outputs
-
-  Returns setof dblink_pkey_results -- one row for each primary key field,
-    in order of position in the key. dblink_pkey_results is defined as follows:
-       CREATE TYPE dblink_pkey_results AS (position int4, colname text);
-
-Example usage
-
-test=# select * from dblink_get_pkey('foobar');
- position | colname
-----------+---------
-        1 | f1
-        2 | f2
-        3 | f3
-        4 | f4
-        5 | f5
-
-==================================================================
-Name
-
-dblink_build_sql_insert -- builds an insert statement using a local
-                           tuple, replacing the selection key field
-                           values with alternate supplied values
-dblink_build_sql_delete -- builds a delete statement using supplied
-                           values for selection key field values
-dblink_build_sql_update -- builds an update statement using a local
-                           tuple, replacing the selection key field
-                           values with alternate supplied values
-
-
-Synopsis
-
-dblink_build_sql_insert(text relname
-                         ,int2vector primary_key_attnums
-                         ,int2 num_primary_key_atts
-                         ,_text src_pk_att_vals_array
-                         ,_text tgt_pk_att_vals_array) RETURNS text
-dblink_build_sql_delete(text relname
-                         ,int2vector primary_key_attnums
-                         ,int2 num_primary_key_atts
-                         ,_text tgt_pk_att_vals_array) RETURNS text
-dblink_build_sql_update(text relname
-                         ,int2vector primary_key_attnums
-                         ,int2 num_primary_key_atts
-                         ,_text src_pk_att_vals_array
-                         ,_text tgt_pk_att_vals_array) RETURNS text
-
-Inputs
-
-  relname
-
-    any relation name;
-    e.g. 'foobar'
-
-  primary_key_attnums
-
-    vector of primary key attnums (1 based, see pg_index.indkey);
-    e.g. '1 2'
-
-  num_primary_key_atts
-
-    number of primary key attnums in the vector; e.g. 2
-
-  src_pk_att_vals_array
-
-    array of primary key values, used to look up the local matching
-    tuple, the values of which are then used to construct the SQL
-    statement
-
-  tgt_pk_att_vals_array
-
-    array of primary key values, used to replace the local tuple
-    values in the SQL statement
-
-Outputs
-
-  Returns text -- requested SQL statement
-
-Example usage
-
-test=# select dblink_build_sql_insert('foo','1 2',2,'{"1", "a"}','{"1", "b''a"}');
-             dblink_build_sql_insert
---------------------------------------------------
- INSERT INTO foo(f1,f2,f3) VALUES('1','b''a','1')
-(1 row)
-
-test=# select dblink_build_sql_delete('MyFoo','1 2',2,'{"1", "b"}');
-           dblink_build_sql_delete
----------------------------------------------
- DELETE FROM "MyFoo" WHERE f1='1' AND f2='b'
-(1 row)
-
-test=# select dblink_build_sql_update('foo','1 2',2,'{"1", "a"}','{"1", "b"}');
-                   dblink_build_sql_update
--------------------------------------------------------------
- UPDATE foo SET f1='1',f2='b',f3='1' WHERE f1='1' AND f2='b'
-(1 row)
-
-
-==================================================================
-Name
-
-dblink_get_connections -- returns a text array of all active named
-                          dblink connections
-
-Synopsis
-
-dblink_get_connections() RETURNS text[]
-
-Inputs
-
-  none
-
-Outputs
-
-  Returns text array of all active named dblink connections
-
-Example usage
-
-  SELECT dblink_get_connections();
-
-==================================================================
-Name
-
-dblink_is_busy -- checks to see if named connection is busy
-                  with an async query
-
-Synopsis
-
-dblink_is_busy(text connname) RETURNS int
-
-Inputs
-
-  connname
-    The specific connection name to use.
-
-Outputs
-
-  Returns 1 if connection is busy, 0 if it is not busy.
-  If this function returns 0, it is guaranteed that dblink_get_result
-  will not block.
-
-Example usage
-
-  SELECT dblink_is_busy('dtest1');
-
-==================================================================
-Name
-
-dblink_cancel_query -- cancels any active query on the named connection
-
-Synopsis
-
-dblink_cancel_query(text connname) RETURNS text
-
-Inputs
-
-  connname
-    The specific connection name to use.
-
-Outputs
-
-  Returns "OK" on success, or an error message on failure.
-
-Example usage
-
-  SELECT dblink_cancel_query('dtest1');
-
-==================================================================
-Name
-
-dblink_error_message -- gets last error message on the named connection
-
-Synopsis
-
-dblink_error_message(text connname) RETURNS text
-
-Inputs
-
-  connname
-    The specific connection name to use.
-
-Outputs
-
-  Returns last error message.
-
-Example usage
-
-  SELECT dblink_error_message('dtest1');
diff --git a/contrib/dblink/doc/query b/contrib/dblink/doc/query
deleted file mode 100755
index 42427b5d5c36..000000000000
--- a/contrib/dblink/doc/query
+++ /dev/null
@@ -1,242 +0,0 @@
-==================================================================
-Name
-
-dblink -- Returns a set from a remote database
-
-Synopsis
-
-dblink(text connstr, text sql [, bool fail_on_error])
-dblink(text connname, text sql [, bool fail_on_error])
-dblink(text sql [, bool fail_on_error])
-
-Inputs
-
-  connname
-  connstr
-    If two arguments are present, the first is first assumed to be a specific
-    connection name to use. If the name is not found, the argument is then
-    assumed to be a valid connection string, of standard libpq format,
-    e.g.: "hostaddr=127.0.0.1 dbname=mydb user=postgres password=mypasswd"
-
-    If only one argument is used, then the unnamed connection is used.
-
-  sql
-
-    sql statement that you wish to execute on the remote host
-    e.g. "select * from pg_class"
-
-  fail_on_error
-
-    If true (default when not present) then an ERROR thrown on the remote side
-    of the connection causes an ERROR to also be thrown locally. If false, the
-    remote ERROR is locally treated as a NOTICE, and no rows are returned.
-
-Outputs
-
-  Returns setof record
-
-Example usage
-
-select * from dblink('dbname=postgres','select proname, prosrc from pg_proc')
- as t1(proname name, prosrc text) where proname like 'bytea%';
-  proname   |   prosrc
-------------+------------
- byteacat   | byteacat
- byteaeq    | byteaeq
- bytealt    | bytealt
- byteale    | byteale
- byteagt    | byteagt
- byteage    | byteage
- byteane    | byteane
- byteacmp   | byteacmp
- bytealike  | bytealike
- byteanlike | byteanlike
- byteain    | byteain
- byteaout   | byteaout
-(12 rows)
-
-select dblink_connect('dbname=postgres');
- dblink_connect
-----------------
- OK
-(1 row)
-
-select * from dblink('select proname, prosrc from pg_proc')
- as t1(proname name, prosrc text) where proname like 'bytea%';
-  proname   |   prosrc
-------------+------------
- byteacat   | byteacat
- byteaeq    | byteaeq
- bytealt    | bytealt
- byteale    | byteale
- byteagt    | byteagt
- byteage    | byteage
- byteane    | byteane
- byteacmp   | byteacmp
- bytealike  | bytealike
- byteanlike | byteanlike
- byteain    | byteain
- byteaout   | byteaout
-(12 rows)
-
-select dblink_connect('myconn','dbname=regression');
- dblink_connect
-----------------
- OK
-(1 row)
-
-select * from dblink('myconn','select proname, prosrc from pg_proc')
- as t1(proname name, prosrc text) where proname like 'bytea%';
-  proname   |   prosrc
-------------+------------
- bytearecv  | bytearecv
- byteasend  | byteasend
- byteale    | byteale
- byteagt    | byteagt
- byteage    | byteage
- byteane    | byteane
- byteacmp   | byteacmp
- bytealike  | bytealike
- byteanlike | byteanlike
- byteacat   | byteacat
- byteaeq    | byteaeq
- bytealt    | bytealt
- byteain    | byteain
- byteaout   | byteaout
-(14 rows)
-
-
-==================================================================
-A more convenient way to use dblink may be to create a view:
-
- create view myremote_pg_proc as
- select *
- from dblink('dbname=postgres','select proname, prosrc from pg_proc')
- as t1(proname name, prosrc text);
-
-Then you can simply write:
-
-   select * from myremote_pg_proc where proname like 'bytea%';
-
-
-==================================================================
-Name
-
-dblink_send_query -- Sends an async query to a remote database
-
-Synopsis
-
-dblink_send_query(text connname, text sql)
-
-Inputs
-
-  connname
-    The specific connection name to use.
-
-  sql
-
-    sql statement that you wish to execute on the remote host
-    e.g. "select * from pg_class"
-
-Outputs
-
-  Returns int. A return value of 1 if the query was successfully dispatched,
-  0 otherwise. If 1, results must be fetched by dblink_get_result(connname).
-  A running query may be cancelled by dblink_cancel_query(connname).
-
-Example usage
-
-  SELECT dblink_connect('dtest1', 'dbname=contrib_regression');
-  SELECT * from 
-   dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1;
-
-==================================================================
-Name
-
-dblink_get_result -- Gets an async query result
-
-Synopsis
-
-dblink_get_result(text connname [, bool fail_on_error])
-
-Inputs
-
-  connname
-    The specific connection name to use. An asynchronous query must
-    have already been sent using dblink_send_query()
-
-  fail_on_error
-
-    If true (default when not present) then an ERROR thrown on the remote side
-    of the connection causes an ERROR to also be thrown locally. If false, the
-    remote ERROR is locally treated as a NOTICE, and no rows are returned.
-
-Outputs
-
-  Returns setof record
-
-Notes
-  Blocks until a result gets available.
-
-  This function *must* be called if dblink_send_query returned
-  a 1, even on cancelled queries - otherwise the connection
-  can't be used anymore. It must be called once for each query
-  sent, and one additional time to obtain an empty set result,
-  prior to using the connection again.
-
-Example usage
-
-contrib_regression=#   SELECT dblink_connect('dtest1', 'dbname=contrib_regression');
- dblink_connect
-----------------
- OK
-(1 row)
-
-contrib_regression=#   SELECT * from
-contrib_regression-#    dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1;
- t1
-----
-  1
-(1 row)
-
-contrib_regression=#   SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
- f1 | f2 |     f3
-----+----+------------
-  0 | a  | {a0,b0,c0}
-  1 | b  | {a1,b1,c1}
-  2 | c  | {a2,b2,c2}
-(3 rows)
-
-contrib_regression=#   SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
- f1 | f2 | f3
-----+----+----
-(0 rows)
-
-contrib_regression=#   SELECT * from
-   dblink_send_query('dtest1', 'select * from foo where f1 < 3; select * from foo where f1 > 6') as t1;
- t1
-----
-  1
-(1 row)
-
-contrib_regression=#   SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
- f1 | f2 |     f3
-----+----+------------
-  0 | a  | {a0,b0,c0}
-  1 | b  | {a1,b1,c1}
-  2 | c  | {a2,b2,c2}
-(3 rows)
-
-contrib_regression=#   SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
- f1 | f2 |      f3
-----+----+---------------
-  7 | h  | {a7,b7,c7}
-  8 | i  | {a8,b8,c8}
-  9 | j  | {a9,b9,c9}
- 10 | k  | {a10,b10,c10}
-(4 rows)
-
-contrib_regression=#   SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
- f1 | f2 | f3
-----+----+----
-(0 rows)
diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index fd35d76af967..f5503ce692c3 100755
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -46,6 +46,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"}');
@@ -54,6 +57,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           
@@ -61,6 +67,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));
@@ -795,3 +804,40 @@ SELECT dblink_disconnect('dtest1');
  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', '2', 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', '2', 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', '2', 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 7e91e9c6db4e..5aa0c33202e6 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";
@@ -364,3 +370,29 @@ SELECT * from
 SELECT dblink_cancel_query('dtest1');
 SELECT dblink_error_message('dtest1');
 SELECT dblink_disconnect('dtest1');
+
+-- 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', '2', 1,
+                               ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
+
+SELECT dblink_build_sql_update('test_dropped', '2', 1,
+                               ARRAY['1'::TEXT], ARRAY['2'::TEXT]);
+
+SELECT dblink_build_sql_delete('test_dropped', '2', 1,
+                               ARRAY['2'::TEXT]);
diff --git a/contrib/dblink/uninstall_dblink.sql b/contrib/dblink/uninstall_dblink.sql
index da5116e7f184..41b0373ec23f 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.5 2007/11/13 04:24:27 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/dblink/uninstall_dblink.sql,v 1.5.2.1 2010/06/07 15:15:03 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);
diff --git a/contrib/dict_int/.gitignore b/contrib/dict_int/.gitignore
new file mode 100644
index 000000000000..932dda6d8419
--- /dev/null
+++ b/contrib/dict_int/.gitignore
@@ -0,0 +1,3 @@
+/dict_int.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/dict_int/Makefile b/contrib/dict_int/Makefile
new file mode 100644
index 000000000000..adf7b685b571
--- /dev/null
+++ b/contrib/dict_int/Makefile
@@ -0,0 +1,18 @@
+# $PostgreSQL: pgsql/contrib/dict_int/Makefile,v 1.2 2007/12/02 21:15:38 tgl Exp $
+
+MODULE_big = dict_int
+OBJS = dict_int.o
+DATA_built = dict_int.sql
+DATA = uninstall_dict_int.sql
+REGRESS = dict_int
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/dict_int
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
new file mode 100644
index 000000000000..d0941c66ad92
--- /dev/null
+++ b/contrib/dict_int/dict_int.c
@@ -0,0 +1,100 @@
+/*-------------------------------------------------------------------------
+ *
+ * dict_int.c
+ *	  Text search dictionary for integers
+ *
+ * Copyright (c) 2007-2008, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/dict_int/dict_int.c,v 1.3 2008/01/01 20:31:21 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "commands/defrem.h"
+#include "fmgr.h"
+#include "tsearch/ts_public.h"
+
+PG_MODULE_MAGIC;
+
+
+typedef struct
+{
+	int			maxlen;
+	bool		rejectlong;
+}	DictInt;
+
+
+PG_FUNCTION_INFO_V1(dintdict_init);
+Datum		dintdict_init(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(dintdict_lexize);
+Datum		dintdict_lexize(PG_FUNCTION_ARGS);
+
+Datum
+dintdict_init(PG_FUNCTION_ARGS)
+{
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
+	DictInt    *d;
+	ListCell   *l;
+
+	d = (DictInt *) palloc0(sizeof(DictInt));
+	d->maxlen = 6;
+	d->rejectlong = false;
+
+	foreach(l, dictoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp(defel->defname, "MAXLEN") == 0)
+		{
+			d->maxlen = atoi(defGetString(defel));
+		}
+		else if (pg_strcasecmp(defel->defname, "REJECTLONG") == 0)
+		{
+			d->rejectlong = defGetBoolean(defel);
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized intdict parameter: \"%s\"",
+							defel->defname)));
+		}
+	}
+
+	PG_RETURN_POINTER(d);
+}
+
+Datum
+dintdict_lexize(PG_FUNCTION_ARGS)
+{
+	DictInt    *d = (DictInt *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
+	char	   *txt = pnstrdup(in, PG_GETARG_INT32(2));
+	TSLexeme   *res = palloc0(sizeof(TSLexeme) * 2);
+
+	res[1].lexeme = NULL;
+	if (PG_GETARG_INT32(2) > d->maxlen)
+	{
+		if (d->rejectlong)
+		{
+			/* reject by returning void array */
+			pfree(txt);
+			res[0].lexeme = NULL;
+		}
+		else
+		{
+			/* trim integer */
+			txt[d->maxlen] = '\0';
+			res[0].lexeme = txt;
+		}
+	}
+	else
+	{
+		res[0].lexeme = txt;
+	}
+
+	PG_RETURN_POINTER(res);
+}
diff --git a/contrib/dict_int/dict_int.sql.in b/contrib/dict_int/dict_int.sql.in
new file mode 100644
index 000000000000..5245349ae18d
--- /dev/null
+++ b/contrib/dict_int/dict_int.sql.in
@@ -0,0 +1,25 @@
+/* $PostgreSQL: pgsql/contrib/dict_int/dict_int.sql.in,v 1.3 2007/11/13 04:24:27 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+CREATE OR REPLACE FUNCTION dintdict_init(internal)
+        RETURNS internal
+        AS 'MODULE_PATHNAME'
+        LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION dintdict_lexize(internal, internal, internal, internal)
+        RETURNS internal
+        AS 'MODULE_PATHNAME'
+        LANGUAGE C STRICT;
+
+CREATE TEXT SEARCH TEMPLATE intdict_template (
+        LEXIZE = dintdict_lexize,
+	INIT   = dintdict_init
+);
+
+CREATE TEXT SEARCH DICTIONARY intdict (
+	TEMPLATE = intdict_template
+);
+
+COMMENT ON TEXT SEARCH DICTIONARY intdict IS 'dictionary for integers';
diff --git a/contrib/dict_int/expected/dict_int.out b/contrib/dict_int/expected/dict_int.out
new file mode 100644
index 000000000000..7feb493e153f
--- /dev/null
+++ b/contrib/dict_int/expected/dict_int.out
@@ -0,0 +1,308 @@
+--
+-- first, define the datatype.  Turn off echoing so that expected file
+-- does not depend on contents of this file.
+--
+SET client_min_messages = warning;
+\set ECHO none
+RESET client_min_messages;
+--lexize
+select ts_lexize('intdict', '511673');
+ ts_lexize 
+-----------
+ {511673}
+(1 row)
+
+select ts_lexize('intdict', '129');
+ ts_lexize 
+-----------
+ {129}
+(1 row)
+
+select ts_lexize('intdict', '40865854');
+ ts_lexize 
+-----------
+ {408658}
+(1 row)
+
+select ts_lexize('intdict', '952');
+ ts_lexize 
+-----------
+ {952}
+(1 row)
+
+select ts_lexize('intdict', '654980341');
+ ts_lexize 
+-----------
+ {654980}
+(1 row)
+
+select ts_lexize('intdict', '09810106');
+ ts_lexize 
+-----------
+ {098101}
+(1 row)
+
+select ts_lexize('intdict', '14262713');
+ ts_lexize 
+-----------
+ {142627}
+(1 row)
+
+select ts_lexize('intdict', '6532082986');
+ ts_lexize 
+-----------
+ {653208}
+(1 row)
+
+select ts_lexize('intdict', '0150061');
+ ts_lexize 
+-----------
+ {015006}
+(1 row)
+
+select ts_lexize('intdict', '7778');
+ ts_lexize 
+-----------
+ {7778}
+(1 row)
+
+select ts_lexize('intdict', '9547');
+ ts_lexize 
+-----------
+ {9547}
+(1 row)
+
+select ts_lexize('intdict', '753395478');
+ ts_lexize 
+-----------
+ {753395}
+(1 row)
+
+select ts_lexize('intdict', '647652');
+ ts_lexize 
+-----------
+ {647652}
+(1 row)
+
+select ts_lexize('intdict', '6988655574');
+ ts_lexize 
+-----------
+ {698865}
+(1 row)
+
+select ts_lexize('intdict', '1279');
+ ts_lexize 
+-----------
+ {1279}
+(1 row)
+
+select ts_lexize('intdict', '1266645909');
+ ts_lexize 
+-----------
+ {126664}
+(1 row)
+
+select ts_lexize('intdict', '7594193969');
+ ts_lexize 
+-----------
+ {759419}
+(1 row)
+
+select ts_lexize('intdict', '16928207');
+ ts_lexize 
+-----------
+ {169282}
+(1 row)
+
+select ts_lexize('intdict', '196850350328');
+ ts_lexize 
+-----------
+ {196850}
+(1 row)
+
+select ts_lexize('intdict', '22026985592');
+ ts_lexize 
+-----------
+ {220269}
+(1 row)
+
+select ts_lexize('intdict', '2063765');
+ ts_lexize 
+-----------
+ {206376}
+(1 row)
+
+select ts_lexize('intdict', '242387310');
+ ts_lexize 
+-----------
+ {242387}
+(1 row)
+
+select ts_lexize('intdict', '93595');
+ ts_lexize 
+-----------
+ {93595}
+(1 row)
+
+select ts_lexize('intdict', '9374');
+ ts_lexize 
+-----------
+ {9374}
+(1 row)
+
+select ts_lexize('intdict', '996969');
+ ts_lexize 
+-----------
+ {996969}
+(1 row)
+
+select ts_lexize('intdict', '353595982');
+ ts_lexize 
+-----------
+ {353595}
+(1 row)
+
+select ts_lexize('intdict', '925860');
+ ts_lexize 
+-----------
+ {925860}
+(1 row)
+
+select ts_lexize('intdict', '11848378337');
+ ts_lexize 
+-----------
+ {118483}
+(1 row)
+
+select ts_lexize('intdict', '333');
+ ts_lexize 
+-----------
+ {333}
+(1 row)
+
+select ts_lexize('intdict', '799287416765');
+ ts_lexize 
+-----------
+ {799287}
+(1 row)
+
+select ts_lexize('intdict', '745939');
+ ts_lexize 
+-----------
+ {745939}
+(1 row)
+
+select ts_lexize('intdict', '67601305734');
+ ts_lexize 
+-----------
+ {676013}
+(1 row)
+
+select ts_lexize('intdict', '3361113');
+ ts_lexize 
+-----------
+ {336111}
+(1 row)
+
+select ts_lexize('intdict', '9033778607');
+ ts_lexize 
+-----------
+ {903377}
+(1 row)
+
+select ts_lexize('intdict', '7507648');
+ ts_lexize 
+-----------
+ {750764}
+(1 row)
+
+select ts_lexize('intdict', '1166');
+ ts_lexize 
+-----------
+ {1166}
+(1 row)
+
+select ts_lexize('intdict', '9360498');
+ ts_lexize 
+-----------
+ {936049}
+(1 row)
+
+select ts_lexize('intdict', '917795');
+ ts_lexize 
+-----------
+ {917795}
+(1 row)
+
+select ts_lexize('intdict', '9387894');
+ ts_lexize 
+-----------
+ {938789}
+(1 row)
+
+select ts_lexize('intdict', '42764329');
+ ts_lexize 
+-----------
+ {427643}
+(1 row)
+
+select ts_lexize('intdict', '564062');
+ ts_lexize 
+-----------
+ {564062}
+(1 row)
+
+select ts_lexize('intdict', '5413377');
+ ts_lexize 
+-----------
+ {541337}
+(1 row)
+
+select ts_lexize('intdict', '060965');
+ ts_lexize 
+-----------
+ {060965}
+(1 row)
+
+select ts_lexize('intdict', '08273593');
+ ts_lexize 
+-----------
+ {082735}
+(1 row)
+
+select ts_lexize('intdict', '593556010144');
+ ts_lexize 
+-----------
+ {593556}
+(1 row)
+
+select ts_lexize('intdict', '17988843352');
+ ts_lexize 
+-----------
+ {179888}
+(1 row)
+
+select ts_lexize('intdict', '252281774');
+ ts_lexize 
+-----------
+ {252281}
+(1 row)
+
+select ts_lexize('intdict', '313425');
+ ts_lexize 
+-----------
+ {313425}
+(1 row)
+
+select ts_lexize('intdict', '641439323669');
+ ts_lexize 
+-----------
+ {641439}
+(1 row)
+
+select ts_lexize('intdict', '314532610153');
+ ts_lexize 
+-----------
+ {314532}
+(1 row)
+
diff --git a/contrib/dict_int/sql/dict_int.sql b/contrib/dict_int/sql/dict_int.sql
new file mode 100644
index 000000000000..3a335f8f3d03
--- /dev/null
+++ b/contrib/dict_int/sql/dict_int.sql
@@ -0,0 +1,61 @@
+--
+-- first, define the datatype.  Turn off echoing so that expected file
+-- does not depend on contents of this file.
+--
+SET client_min_messages = warning;
+\set ECHO none
+\i dict_int.sql
+\set ECHO all
+RESET client_min_messages;
+
+--lexize
+select ts_lexize('intdict', '511673');
+select ts_lexize('intdict', '129');
+select ts_lexize('intdict', '40865854');
+select ts_lexize('intdict', '952');
+select ts_lexize('intdict', '654980341');
+select ts_lexize('intdict', '09810106');
+select ts_lexize('intdict', '14262713');
+select ts_lexize('intdict', '6532082986');
+select ts_lexize('intdict', '0150061');
+select ts_lexize('intdict', '7778');
+select ts_lexize('intdict', '9547');
+select ts_lexize('intdict', '753395478');
+select ts_lexize('intdict', '647652');
+select ts_lexize('intdict', '6988655574');
+select ts_lexize('intdict', '1279');
+select ts_lexize('intdict', '1266645909');
+select ts_lexize('intdict', '7594193969');
+select ts_lexize('intdict', '16928207');
+select ts_lexize('intdict', '196850350328');
+select ts_lexize('intdict', '22026985592');
+select ts_lexize('intdict', '2063765');
+select ts_lexize('intdict', '242387310');
+select ts_lexize('intdict', '93595');
+select ts_lexize('intdict', '9374');
+select ts_lexize('intdict', '996969');
+select ts_lexize('intdict', '353595982');
+select ts_lexize('intdict', '925860');
+select ts_lexize('intdict', '11848378337');
+select ts_lexize('intdict', '333');
+select ts_lexize('intdict', '799287416765');
+select ts_lexize('intdict', '745939');
+select ts_lexize('intdict', '67601305734');
+select ts_lexize('intdict', '3361113');
+select ts_lexize('intdict', '9033778607');
+select ts_lexize('intdict', '7507648');
+select ts_lexize('intdict', '1166');
+select ts_lexize('intdict', '9360498');
+select ts_lexize('intdict', '917795');
+select ts_lexize('intdict', '9387894');
+select ts_lexize('intdict', '42764329');
+select ts_lexize('intdict', '564062');
+select ts_lexize('intdict', '5413377');
+select ts_lexize('intdict', '060965');
+select ts_lexize('intdict', '08273593');
+select ts_lexize('intdict', '593556010144');
+select ts_lexize('intdict', '17988843352');
+select ts_lexize('intdict', '252281774');
+select ts_lexize('intdict', '313425');
+select ts_lexize('intdict', '641439323669');
+select ts_lexize('intdict', '314532610153');
diff --git a/contrib/dict_int/uninstall_dict_int.sql b/contrib/dict_int/uninstall_dict_int.sql
new file mode 100644
index 000000000000..d94343fd36d2
--- /dev/null
+++ b/contrib/dict_int/uninstall_dict_int.sql
@@ -0,0 +1,12 @@
+/* $PostgreSQL: pgsql/contrib/dict_int/uninstall_dict_int.sql,v 1.3 2007/11/13 04:24:27 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public;
+
+DROP TEXT SEARCH DICTIONARY intdict;
+
+DROP TEXT SEARCH TEMPLATE intdict_template;
+
+DROP FUNCTION dintdict_init(internal);
+
+DROP FUNCTION dintdict_lexize(internal,internal,internal,internal);
diff --git a/contrib/dict_xsyn/.gitignore b/contrib/dict_xsyn/.gitignore
new file mode 100644
index 000000000000..0ebd61caaff9
--- /dev/null
+++ b/contrib/dict_xsyn/.gitignore
@@ -0,0 +1,3 @@
+/dict_xsyn.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/dict_xsyn/Makefile b/contrib/dict_xsyn/Makefile
new file mode 100644
index 000000000000..2a879b7eff78
--- /dev/null
+++ b/contrib/dict_xsyn/Makefile
@@ -0,0 +1,19 @@
+# $PostgreSQL: pgsql/contrib/dict_xsyn/Makefile,v 1.3 2007/12/02 21:15:38 tgl Exp $
+
+MODULE_big = dict_xsyn
+OBJS = dict_xsyn.o
+DATA_built = dict_xsyn.sql
+DATA = uninstall_dict_xsyn.sql
+DATA_TSEARCH = xsyn_sample.rules
+REGRESS = dict_xsyn
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/dict_xsyn
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c
new file mode 100644
index 000000000000..892983c48b17
--- /dev/null
+++ b/contrib/dict_xsyn/dict_xsyn.c
@@ -0,0 +1,237 @@
+/*-------------------------------------------------------------------------
+ *
+ * dict_xsyn.c
+ *	  Extended synonym dictionary
+ *
+ * Copyright (c) 2007-2008, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.4.2.1 2008/06/18 20:55:49 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <ctype.h>
+
+#include "commands/defrem.h"
+#include "fmgr.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_utils.h"
+
+PG_MODULE_MAGIC;
+
+typedef struct
+{
+	char	   *key;			/* Word */
+	char	   *value;			/* Unparsed list of synonyms, including the
+								 * word itself */
+} Syn;
+
+typedef struct
+{
+	int			len;
+	Syn		   *syn;
+
+	bool		keeporig;
+} DictSyn;
+
+
+PG_FUNCTION_INFO_V1(dxsyn_init);
+Datum		dxsyn_init(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(dxsyn_lexize);
+Datum		dxsyn_lexize(PG_FUNCTION_ARGS);
+
+static char *
+find_word(char *in, char **end)
+{
+	char	   *start;
+
+	*end = NULL;
+	while (*in && t_isspace(in))
+		in += pg_mblen(in);
+
+	if (!*in || *in == '#')
+		return NULL;
+	start = in;
+
+	while (*in && !t_isspace(in))
+		in += pg_mblen(in);
+
+	*end = in;
+
+	return start;
+}
+
+static int
+compare_syn(const void *a, const void *b)
+{
+	return strcmp(((Syn *) a)->key, ((Syn *) b)->key);
+}
+
+static void
+read_dictionary(DictSyn *d, char *filename)
+{
+	char	   *real_filename = get_tsearch_config_filename(filename, "rules");
+	tsearch_readline_state trst;
+	char	   *line;
+	int			cur = 0;
+
+	if (!tsearch_readline_begin(&trst, real_filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open synonym file \"%s\": %m",
+						real_filename)));
+
+	while ((line = tsearch_readline(&trst)) != NULL)
+	{
+		char	   *value;
+		char	   *key;
+		char	   *end = NULL;
+
+		if (*line == '\0')
+			continue;
+
+		value = lowerstr(line);
+		pfree(line);
+
+		key = find_word(value, &end);
+		if (!key)
+		{
+			pfree(value);
+			continue;
+		}
+
+		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);
+		}
+
+		d->syn[cur].key = pnstrdup(key, end - key);
+		d->syn[cur].value = value;
+
+		cur++;
+	}
+
+	tsearch_readline_end(&trst);
+
+	d->len = cur;
+	if (cur > 1)
+		qsort(d->syn, d->len, sizeof(Syn), compare_syn);
+
+	pfree(real_filename);
+}
+
+Datum
+dxsyn_init(PG_FUNCTION_ARGS)
+{
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
+	DictSyn    *d;
+	ListCell   *l;
+
+	d = (DictSyn *) palloc0(sizeof(DictSyn));
+	d->len = 0;
+	d->syn = NULL;
+	d->keeporig = true;
+
+	foreach(l, dictoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp(defel->defname, "KEEPORIG") == 0)
+		{
+			d->keeporig = defGetBoolean(defel);
+		}
+		else if (pg_strcasecmp(defel->defname, "RULES") == 0)
+		{
+			read_dictionary(d, defGetString(defel));
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized xsyn parameter: \"%s\"",
+							defel->defname)));
+		}
+	}
+
+	PG_RETURN_POINTER(d);
+}
+
+Datum
+dxsyn_lexize(PG_FUNCTION_ARGS)
+{
+	DictSyn    *d = (DictSyn *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
+	int			length = PG_GETARG_INT32(2);
+	Syn			word;
+	Syn		   *found;
+	TSLexeme   *res = NULL;
+
+	if (!length || d->len == 0)
+		PG_RETURN_POINTER(NULL);
+
+	/* Create search pattern */
+	{
+		char	   *temp = pnstrdup(in, length);
+
+		word.key = lowerstr(temp);
+		pfree(temp);
+		word.value = NULL;
+	}
+
+	/* Look for matching syn */
+	found = (Syn *) bsearch(&word, d->syn, d->len, sizeof(Syn), compare_syn);
+	pfree(word.key);
+
+	if (!found)
+		PG_RETURN_POINTER(NULL);
+
+	/* Parse string of synonyms and return array of words */
+	{
+		char	   *value = pstrdup(found->value);
+		int			value_length = strlen(value);
+		char	   *pos = value;
+		int			nsyns = 0;
+		bool		is_first = true;
+
+		res = palloc(sizeof(TSLexeme));
+
+		while (pos < value + value_length)
+		{
+			char	   *end;
+			char	   *syn = find_word(pos, &end);
+
+			if (!syn)
+				break;
+			*end = '\0';
+
+			res = repalloc(res, sizeof(TSLexeme) * (nsyns + 2));
+
+			/* first word is added to result only if KEEPORIG flag is set */
+			if (d->keeporig || !is_first)
+			{
+				res[nsyns].lexeme = pstrdup(syn);
+				res[nsyns].nvariant = 0;
+				res[nsyns].flags = 0;
+
+				nsyns++;
+			}
+
+			is_first = false;
+
+			pos = end + 1;
+		}
+
+		res[nsyns].lexeme = NULL;
+
+		pfree(value);
+	}
+
+	PG_RETURN_POINTER(res);
+}
diff --git a/contrib/dict_xsyn/dict_xsyn.sql.in b/contrib/dict_xsyn/dict_xsyn.sql.in
new file mode 100644
index 000000000000..ac014a757d1c
--- /dev/null
+++ b/contrib/dict_xsyn/dict_xsyn.sql.in
@@ -0,0 +1,25 @@
+/* $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.sql.in,v 1.3 2007/11/13 04:24:27 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+CREATE OR REPLACE FUNCTION dxsyn_init(internal)
+        RETURNS internal
+        AS 'MODULE_PATHNAME'
+        LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION dxsyn_lexize(internal, internal, internal, internal)
+        RETURNS internal
+        AS 'MODULE_PATHNAME'
+        LANGUAGE C STRICT;
+
+CREATE TEXT SEARCH TEMPLATE xsyn_template (
+        LEXIZE = dxsyn_lexize,
+	INIT   = dxsyn_init
+);
+
+CREATE TEXT SEARCH DICTIONARY xsyn (
+	TEMPLATE = xsyn_template
+);
+
+COMMENT ON TEXT SEARCH DICTIONARY xsyn IS 'eXtended synonym dictionary';
diff --git a/contrib/dict_xsyn/expected/dict_xsyn.out b/contrib/dict_xsyn/expected/dict_xsyn.out
new file mode 100644
index 000000000000..99071ea8c747
--- /dev/null
+++ b/contrib/dict_xsyn/expected/dict_xsyn.out
@@ -0,0 +1,22 @@
+--
+-- first, define the datatype.  Turn off echoing so that expected file
+-- does not depend on contents of this file.
+--
+SET client_min_messages = warning;
+\set ECHO none
+RESET client_min_messages;
+--configuration
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false);
+--lexize
+SELECT ts_lexize('xsyn', 'supernova');
+   ts_lexize    
+----------------
+ {sn,sne,1987a}
+(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
new file mode 100644
index 000000000000..17f6df9cf3d2
--- /dev/null
+++ b/contrib/dict_xsyn/sql/dict_xsyn.sql
@@ -0,0 +1,16 @@
+--
+-- first, define the datatype.  Turn off echoing so that expected file
+-- does not depend on contents of this file.
+--
+SET client_min_messages = warning;
+\set ECHO none
+\i dict_xsyn.sql
+\set ECHO all
+RESET client_min_messages;
+
+--configuration
+ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=false);
+
+--lexize
+SELECT ts_lexize('xsyn', 'supernova');
+SELECT ts_lexize('xsyn', 'grb');
diff --git a/contrib/dict_xsyn/uninstall_dict_xsyn.sql b/contrib/dict_xsyn/uninstall_dict_xsyn.sql
new file mode 100644
index 000000000000..844d2e999740
--- /dev/null
+++ b/contrib/dict_xsyn/uninstall_dict_xsyn.sql
@@ -0,0 +1,12 @@
+/* $PostgreSQL: pgsql/contrib/dict_xsyn/uninstall_dict_xsyn.sql,v 1.3 2007/11/13 04:24:27 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public;
+
+DROP TEXT SEARCH DICTIONARY xsyn;
+
+DROP TEXT SEARCH TEMPLATE xsyn_template;
+
+DROP FUNCTION dxsyn_init(internal);
+
+DROP FUNCTION dxsyn_lexize(internal,internal,internal,internal);
diff --git a/contrib/dict_xsyn/xsyn_sample.rules b/contrib/dict_xsyn/xsyn_sample.rules
new file mode 100644
index 000000000000..203bec793a18
--- /dev/null
+++ b/contrib/dict_xsyn/xsyn_sample.rules
@@ -0,0 +1,6 @@
+# Sample rules file for eXtended Synonym (xsyn) dictionary
+# format is as follows:
+#
+# word synonym1 synonym2 ...
+#
+supernova sn sne 1987a
diff --git a/contrib/earthdistance/.gitignore b/contrib/earthdistance/.gitignore
new file mode 100644
index 000000000000..366a0a399e7c
--- /dev/null
+++ b/contrib/earthdistance/.gitignore
@@ -0,0 +1,3 @@
+/earthdistance.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/extprotocol/Makefile b/contrib/extprotocol/Makefile
index 9d6e115111b6..8ac73895a436 100644
--- a/contrib/extprotocol/Makefile
+++ b/contrib/extprotocol/Makefile
@@ -5,7 +5,8 @@ PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport)
 
 ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
 subdir = contrib/extprotocol
diff --git a/contrib/formatter/Makefile b/contrib/formatter/Makefile
index 3cffcf7dd2f0..24e74f5e77de 100644
--- a/contrib/formatter/Makefile
+++ b/contrib/formatter/Makefile
@@ -5,7 +5,8 @@ PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport)
 
 ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
 subdir = contrib/formatter
diff --git a/contrib/fuzzystrmatch/.gitignore b/contrib/fuzzystrmatch/.gitignore
index 8006defef4e0..f4962c630bac 100644
--- a/contrib/fuzzystrmatch/.gitignore
+++ b/contrib/fuzzystrmatch/.gitignore
@@ -1 +1 @@
-fuzzystrmatch.sql
+/fuzzystrmatch.sql
diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile
index 53a2b4fdfc6a..61538ffb5e7f 100644
--- a/contrib/fuzzystrmatch/Makefile
+++ b/contrib/fuzzystrmatch/Makefile
@@ -2,9 +2,8 @@
 
 MODULE_big = fuzzystrmatch
 OBJS = fuzzystrmatch.o dmetaphone.o
-
 DATA_built = fuzzystrmatch.sql
-DATA =  uninstall_fuzzystrmatch.sql
+DATA = uninstall_fuzzystrmatch.sql
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in
index 218274b2d91a..269d4e6737c8 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in
@@ -1,7 +1,7 @@
 /* contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql */
 SET search_path = public;
 
-CREATE FUNCTION levenshtein (text,text) RETURNS int
+CREATE OR REPLACE FUNCTION levenshtein (text,text) RETURNS int
 AS 'MODULE_PATHNAME','levenshtein'
 LANGUAGE C IMMUTABLE STRICT;
 
@@ -17,26 +17,26 @@ CREATE FUNCTION levenshtein_less_equal (text,text,int,int,int,int) RETURNS int
 AS 'MODULE_PATHNAME','levenshtein_less_equal_with_costs'
 LANGUAGE C IMMUTABLE STRICT;
 
-CREATE FUNCTION metaphone (text,int) RETURNS text
+CREATE OR REPLACE FUNCTION metaphone (text,int) RETURNS text
 AS 'MODULE_PATHNAME','metaphone'
 LANGUAGE C IMMUTABLE STRICT;
 
-CREATE FUNCTION soundex(text) RETURNS text
+CREATE OR REPLACE FUNCTION soundex(text) RETURNS text
 AS 'MODULE_PATHNAME', 'soundex'
 LANGUAGE C IMMUTABLE STRICT;
 
-CREATE FUNCTION text_soundex(text) RETURNS text
+CREATE OR REPLACE FUNCTION text_soundex(text) RETURNS text
 AS 'MODULE_PATHNAME', 'soundex'
 LANGUAGE C IMMUTABLE STRICT;
 
-CREATE FUNCTION difference(text,text) RETURNS int
+CREATE OR REPLACE FUNCTION difference(text,text) RETURNS int
 AS 'MODULE_PATHNAME', 'difference'
 LANGUAGE C IMMUTABLE STRICT;
 
-CREATE FUNCTION dmetaphone (text) RETURNS text
+CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text 
 AS 'MODULE_PATHNAME', 'dmetaphone'
 LANGUAGE C IMMUTABLE STRICT;
 
-CREATE FUNCTION dmetaphone_alt (text) RETURNS text
+CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text 
 AS 'MODULE_PATHNAME', 'dmetaphone_alt'
 LANGUAGE C IMMUTABLE STRICT;
diff --git a/contrib/gp_internal_tools/Makefile b/contrib/gp_internal_tools/Makefile
index 2f6f1506d40f..bee0baa8167d 100755
--- a/contrib/gp_internal_tools/Makefile
+++ b/contrib/gp_internal_tools/Makefile
@@ -3,7 +3,8 @@ MODULES    = gp_persistent_util gp_ao_co_diagnostics
 PG_CPPFLAGS = -I$(libpq_srcdir)
 
 ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
 subdir = contrib/gp_diagnostic_libraries
diff --git a/contrib/hstore/.gitignore b/contrib/hstore/.gitignore
index acaeaa166cae..d7af95330c38 100644
--- a/contrib/hstore/.gitignore
+++ b/contrib/hstore/.gitignore
@@ -1 +1,3 @@
-hstore.sql
+/hstore.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/hstore/README.hstore b/contrib/hstore/README.hstore
deleted file mode 100755
index d1b9d44d1c2a..000000000000
--- a/contrib/hstore/README.hstore
+++ /dev/null
@@ -1,190 +0,0 @@
-Hstore - contrib module for storing (key,value) pairs
-
-[Online version] (http://www.sai.msu.su/~megera/oddmuse/index.cgi?Hstore)
-
-Motivation
-
-Many attributes rarely searched, semistructural data, lazy DBA
-
-Authors
-
-    * Oleg Bartunov <oleg@sai.msu.su>, Moscow, Moscow University, Russia
-    * Teodor Sigaev <teodor@sigaev.ru>, Moscow, Delta-Soft Ltd.,Russia
-
-LEGAL NOTICES: This module is released under BSD license (as PostgreSQL
-itself)
-
-Operations
-
-    * hstore -> text - get value , perl analogy $h{key} 
-
-select 'a=>q, b=>g'->'a';
-  ?
-------
-  q
-
-    * hstore || hstore - concatenation, perl analogy %a=( %b, %c ); 
-
-regression=# select 'a=>b'::hstore || 'c=>d'::hstore;
-      ?column?      
---------------------
- "a"=>"b", "c"=>"d"
-(1 row)
-
-but, notice
-
-regression=# select 'a=>b'::hstore || 'a=>d'::hstore;
- ?column? 
-----------
- "a"=>"d"
-(1 row)
-
-    * text => text - creates hstore type from two text strings 
-
-select 'a'=>'b';
-  ?column?
-----------
-  "a"=>"b"
-
-    * hstore @> hstore - contains operation, check if left operand contains right. 
-
-regression=# select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>c';
- ?column? 
-----------
- f
-(1 row)
-
-regression=# select 'a=>b, b=>1, c=>NULL'::hstore @> 'b=>1';
- ?column? 
-----------
- t
-(1 row)
-
-    * hstore <@ hstore - contained operation, check if left operand is contained 
-	 in right
-
-(Before PostgreSQL 8.2, the containment operators @> and <@ were
-respectively called @ and ~.  These names are still available, but are
-deprecated and will eventually be retired.  Notice that the old names
-are reversed from the convention formerly followed by the core geometric
-datatypes!)
-
-Functions
-
-    * akeys(hstore) - returns all keys from hstore as array 
-
-regression=# select akeys('a=>1,b=>2');
- akeys 
--------
- {a,b}
-
-    * skeys(hstore) - returns all keys from hstore as strings 
-
-regression=# select skeys('a=>1,b=>2');
- skeys 
--------
- a
- b
-
-    * avals(hstore) - returns all values from hstore as array 
-
-regression=# select avals('a=>1,b=>2');
- avals 
--------
- {1,2}
-
-    * svals(hstore) - returns all values from hstore as strings 
-
-regression=# select svals('a=>1,b=>2');
- svals 
--------
- 1
- 2
-
-    * delete (hstore,text) - delete (key,value) from hstore if key matches 
-	  argument. 
-
-regression=# select delete('a=>1,b=>2','b');
-  delete  
-----------
- "a"=>"1"
-
-    * each(hstore) return (key, value) pairs 
-
-regression=# select * from each('a=>1,b=>2');
- key | value 
------+-------
- a   | 1
- b   | 2
-
-    * exist (hstore,text) - returns 'true if key is exists in hstore and 
-	false otherwise. 
-
-regression=# select exist('a=>1','a');
- exist 
-----------
- t
-
-    * defined (hstore,text) - returns true if key is exists in hstore and 
-	  its value is not NULL. 
-
-regression=# select defined('a=>NULL','a');
- defined 
----------
- f
-
-Indices
-
-Module provides index support for '@>' and '<@' operations.
-
-create index hidx on testhstore using gist(h);
-
-Note
-
-Use parenthesis in select below, because priority of 'is' is higher than that of '->'
-
-select id from entrants where (info->'education_period') is not null;
-
-Examples
-
-    * add key 
-
-update tt set h=h||'c=>3';
-
-    * delete key 
-
-update tt set h=delete(h,'k1');
-
-    * Statistics
-
-hstore type, because of its intrinsic liberality, could contain a lot of 
-different keys. Checking for valid keys is the task of application. 
-Examples below demonstrate several techniques how to check keys statistics.
-
-          o simple example 
-
-select * from each('aaa=>bq, b=>NULL, ""=>1 ');
-
-          o using table 
-
-select (each(h)).key, (each(h)).value into stat from testhstore ;
-
-          o online stat 
-
-select key, count(*) from (select (each(h)).key from testhstore) as stat group by key order by count desc, key;
-    key    | count 
------------+-------
- line      |   883
- query     |   207
- pos       |   203
- node      |   202
- space     |   197
- status    |   195
- public    |   194
- title     |   190
- org       |   189
-...................
-
-In the current implementation, neither the key nor the value
-string can exceed 65535 bytes in length; an error will be thrown if this
-limit is exceeded. These maximum lengths may change in future releases.
diff --git a/contrib/hstore/hstore.h b/contrib/hstore/hstore.h
index e8ea58b56727..bad65728eb77 100644
--- a/contrib/hstore/hstore.h
+++ b/contrib/hstore/hstore.h
@@ -5,6 +5,15 @@
 #define __HSTORE_H__
 
 #include "fmgr.h"
+#include "postgres.h"
+
+#include "funcapi.h"
+#include "access/gist.h"
+#include "access/itup.h"
+#include "utils/elog.h"
+#include "utils/palloc.h"
+#include "utils/builtins.h"
+#include "storage/bufpage.h"
 
 
 typedef struct
@@ -21,6 +30,11 @@ typedef struct
 #define HSTORE_MAX_KEY_LEN 65535
 #define HSTORE_MAX_VALUE_LEN 65535
 
+/* 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
+
 
 typedef struct
 {
diff --git a/contrib/hstore/hstore.sql.in b/contrib/hstore/hstore.sql.in
index 3fa8ad01841f..0a7be0b5bfc2 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.8 2007/11/13 04:24:28 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/hstore/hstore.sql.in,v 1.8.2.1 2010/06/22 11:36:36 rhaas Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -127,6 +127,12 @@ CREATE OPERATOR ~ (
 CREATE OR REPLACE FUNCTION tconvert(text,text)
 RETURNS hstore
 AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE;
+
+-- For forward compatibility with PostgreSQL >= 9.0
+CREATE OR REPLACE FUNCTION hstore(text,text)
+RETURNS hstore
+AS 'MODULE_PATHNAME', 'tconvert'
 LANGUAGE C IMMUTABLE; -- not STRICT
 
 CREATE OPERATOR => (
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 0f6eac347c76..cfb70a7c106b 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -5,7 +5,6 @@
 
 #include "access/gist.h"
 #include "access/itup.h"
-#include "access/skey.h"
 #include "crc32.h"
 
 #include "hstore.h"
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index 40e22f37dd65..0f994c49b01e 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -74,13 +74,15 @@ exists(PG_FUNCTION_ARGS)
 	HStore	   *hs = PG_GETARG_HS(0);
 	text	   *key = PG_GETARG_TEXT_P(1);
 	HEntry	   *entry;
+	bool		res;
 
 	entry = findkey(hs, VARDATA(key), VARSIZE(key) - VARHDRSZ);
+	res = (entry != NULL) ? true : false;
 
 	PG_FREE_IF_COPY(hs, 0);
 	PG_FREE_IF_COPY(key, 1);
 
-	PG_RETURN_BOOL(entry);
+	PG_RETURN_BOOL(res);
 }
 
 PG_FUNCTION_INFO_V1(defined);
diff --git a/contrib/hstore/uninstall_hstore.sql b/contrib/hstore/uninstall_hstore.sql
index d9e08927a5ef..ae2676a1b057 100644
--- a/contrib/hstore/uninstall_hstore.sql
+++ b/contrib/hstore/uninstall_hstore.sql
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/hstore/uninstall_hstore.sql,v 1.6 2007/11/13 04:24:28 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/hstore/uninstall_hstore.sql,v 1.6.2.1 2010/06/22 11:36:36 rhaas Exp $ */
 
 -- Adjust this setting to control where the objects get dropped.
 SET search_path = public;
@@ -26,6 +26,7 @@ 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 akeys(hstore);
 DROP FUNCTION avals(hstore);
 DROP FUNCTION skeys(hstore);
diff --git a/contrib/indexscan/indexscan.c b/contrib/indexscan/indexscan.c
index d4f3d49fe34f..7cc6b69f0e95 100644
--- a/contrib/indexscan/indexscan.c
+++ b/contrib/indexscan/indexscan.c
@@ -44,8 +44,6 @@ istatus_text(ItemId itemid)
 
 	initStringInfo(&buf);
 
-	if (ItemIdDeleted(itemid))
-		appendStringInfoString(&buf, "DELETED ");
 	if (ItemIdIsNormal(itemid))
 		appendStringInfoString(&buf, "USED ");
 	if (ItemIdIsDead(itemid))
diff --git a/contrib/intagg/.gitignore b/contrib/intagg/.gitignore
new file mode 100644
index 000000000000..d8e2c4043111
--- /dev/null
+++ b/contrib/intagg/.gitignore
@@ -0,0 +1 @@
+/int_aggregate.sql
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 5bbff5922b29..ecc10389201a 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -65,7 +65,7 @@ ginint4_queryextract(PG_FUNCTION_ARGS)
 		}
 	}
 
-	if (nentries == 0)
+	if (*nentries == 0)
 	{
 		switch (strategy)
 		{
diff --git a/contrib/isn/.gitignore b/contrib/isn/.gitignore
new file mode 100644
index 000000000000..1df12e3b7534
--- /dev/null
+++ b/contrib/isn/.gitignore
@@ -0,0 +1 @@
+/isn.sql
diff --git a/contrib/isn/Makefile b/contrib/isn/Makefile
index bfc3a37de12e..8431921d83ee 100644
--- a/contrib/isn/Makefile
+++ b/contrib/isn/Makefile
@@ -1,12 +1,12 @@
-# $PostgreSQL: pgsql/contrib/isn/Makefile,v 1.1 2006/09/09 04:07:52 tgl Exp $
+# $PostgreSQL: pgsql/contrib/isn/Makefile,v 1.3 2007/11/10 23:59:51 momjian Exp $
 
 MODULES = isn
 DATA_built = isn.sql
 DATA = uninstall_isn.sql
-DOCS = README.isn
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
 subdir = contrib/isn
diff --git a/contrib/isn/README.isn b/contrib/isn/README.isn
deleted file mode 100755
index 22154266f0ea..000000000000
--- a/contrib/isn/README.isn
+++ /dev/null
@@ -1,220 +0,0 @@
-
--- EAN13 - UPC - ISBN (books) - ISMN (music) - ISSN (serials)
--------------------------------------------------------------
-
-Copyright Germán Méndez Bravo (Kronuz), 2004 - 2006
-This module is released under the same BSD license as the rest of PostgreSQL.
-
-The information to implement this module was collected through
-several sites, including:
-   http://www.isbn-international.org/
-   http://www.issn.org/
-   http://www.ismn-international.org/
-   http://www.wikipedia.org/
-the prefixes used for hyphenation where also compiled from:
-   http://www.gs1.org/productssolutions/idkeys/support/prefix_list.html
-   http://www.isbn-international.org/en/identifiers.html
-   http://www.ismn-international.org/ranges.html
-Care was taken during the creation of the algorithms and they
-were meticulously verified against the suggested algorithms
-in the official ISBN, ISMN, ISSN User Manuals.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-THIS MODULE IS PROVIDED "AS IS" AND WITHOUT ANY WARRANTY
-        OF ANY KIND, EXPRESS OR IMPLIED.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
--- Content of the Module
--------------------------------------------------
-
-This directory contains definitions for a few PostgreSQL
-data types, for the following international-standard namespaces:
-EAN13, UPC, ISBN (books), ISMN (music), and ISSN (serials). This module
-is inspired by Garrett A. Wollman's isbn_issn code.
-
-I wanted the database to fully validate numbers and also to use the
-upcoming ISBN-13 and the EAN13 standards, as well as to have it 
-automatically doing hyphenations for ISBN numbers.
-
-This new module validates, and automatically adds the correct 
-hyphenations to the numbers. Also, it supports the new ISBN-13 
-numbers to be used starting in January 2007.
-
-Premises:
-1. ISBN13, ISMN13, ISSN13 numbers are all EAN13 numbers
-2. EAN13 numbers aren't always ISBN13, ISMN13 or ISSN13 (some are)
-3. some ISBN13 numbers can be displayed as ISBN
-4. some ISMN13 numbers can be displayed as ISMN
-5. some ISSN13 numbers can be displayed as ISSN
-6. all UPC, ISBN, ISMN and ISSN can be represented as EAN13 numbers
-
-Note: All types are internally represented as 64 bit integers, 
-      and internally all are consistently interchangeable.
-
-We have the following data types:
-
-+ EAN13 for European Article Numbers.
-    This type will always show the EAN13-display format.
-    Te output function for this is -> ean13_out()
-
-+ ISBN13 for International Standard Book Numbers to be displayed in 
-  the new EAN13-display format.
-+ ISMN13 for International Standard Music Numbers to be displayed in
-  the new EAN13-display format.
-+ ISSN13 for International Standard Serial Numbers to be displayed
-  in the new EAN13-display format.
-    These types will always display the long version of the ISxN (EAN13)
-    The output function to do this is -> ean13_out()
-    * The need for these types is just for displaying in different
-      ways the same data:
-      ISBN13 is actually the same as ISBN, ISMN13=ISMN and ISSN13=ISSN.
-  
-+ ISBN for International Standard Book Numbers to be displayed in
-  the current short-display format.
-+ ISMN for International Standard Music Numbers to be displayed in
-  the current short-display format.
-+ ISSN for International Standard Serial Numbers to be displayed
-  in the current short-display format.
-    These types will display the short version of the ISxN (ISxN 10)
-    whenever it's possible, and it will show ISxN 13 when it's
-    impossible to show the short version.
-    The output function to do this is -> isn_out()
-
-+ UPC for Universal Product Codes.
-    UPC numbers are a subset of the EAN13 numbers (they are basically
-    EAN13 without the first '0' digit.)
-    The output function to do this is also -> isn_out()
-
-We have the following input functions:
-+ To take a string and return an EAN13 -> ean13_in()
-+ To take a string and return valid ISBN or ISBN13 numbers -> isbn_in()
-+ To take a string and return valid ISMN or ISMN13 numbers -> ismn_in()
-+ To take a string and return valid ISSN or ISSN13 numbers -> issn_in()
-+ To take a string and return an UPC codes -> upc_in()
-
-We are able to cast from:
-+ ISBN13 -> EAN13
-+ ISMN13 -> EAN13
-+ ISSN13 -> EAN13
-
-+ ISBN -> EAN13
-+ ISMN -> EAN13
-+ ISSN -> EAN13
-+ UPC  -> EAN13
-
-+ ISBN <-> ISBN13
-+ ISMN <-> ISMN13
-+ ISSN <-> ISSN13
-
-We have two operator classes (for btree and for hash) so each data type
-can be indexed for faster access.
-
-The C API is implemented as:
-extern Datum isn_out(PG_FUNCTION_ARGS);
-extern Datum ean13_out(PG_FUNCTION_ARGS);
-extern Datum ean13_in(PG_FUNCTION_ARGS);
-extern Datum isbn_in(PG_FUNCTION_ARGS);
-extern Datum ismn_in(PG_FUNCTION_ARGS);
-extern Datum issn_in(PG_FUNCTION_ARGS);
-extern Datum upc_in(PG_FUNCTION_ARGS);
-
-On success:
-+ isn_out() takes any of our types and returns a string containing 
-  the shortes possible representation of the number.
-
-+ ean13_out() takes any of our types and returns the 
-  EAN13 (long) representation of the number.
-
-+ ean13_in() takes a string and return a EAN13. Which, as stated in (2) 
-  could or could not be any of our types, but it certainly is an EAN13 
-  number. Only if the string is a valid EAN13 number, otherwise it fails.
-
-+ isbn_in() takes a string and return an ISBN/ISBN13. Only if the string
-  is really a ISBN/ISBN13, otherwise it fails.
-
-+ ismn_in() takes a string and return an ISMN/ISMN13. Only if the string
-  is really a ISMN/ISMN13, otherwise it fails.
-
-+ issn_in() takes a string and return an ISSN/ISSN13. Only if the string
-  is really a ISSN/ISSN13, otherwise it fails.
-
-+ upc_in() takes a string and return an UPC. Only if the string is
-  really a UPC, otherwise it fails.
-
-(on failure, the functions 'ereport' the error)
-
--- Testing/Playing Functions
--------------------------------------------------
-isn_weak(boolean) - Sets the weak input mode. 
-This function is intended for testing use only!
-isn_weak() gets the current status of the weak mode.
-
-"Weak" mode is used to be able to insert "invalid" data to a table. 
-"Invalid" as in the check digit being wrong, not missing numbers.
-
-Why would you want to use the weak mode? well, it could be that
-you have a huge collection of ISBN numbers, and that there are so many of
-them that for weird reasons some have the wrong check digit (perhaps the
-numbers where scanned from a printed list and the OCR got the numbers wrong,
-perhaps the numbers were manually captured... who knows.) Anyway, the thing
-is you might want to clean the mess up, but you still want to be able to have
-all the numbers in your database and maybe use an external tool to access
-the invalid numbers in the database so you can verify the information and
-validate it more easily; as selecting all the invalid numbers in the table.
-
-When you insert invalid numbers in a table using the weak mode, the number
-will be inserted with the corrected check digit, but it will be flagged 
-with an exclamation mark ('!') at the end (i.e. 0-11-000322-5!)
-
-You can also force the insertion of invalid numbers even not in the weak mode,
-appending the '!' character at the end of the number.
-
-To work with invalid numbers, you can use two functions:
-  + make_valid(), which validates an invalid number (deleting the invalid flag)
-  + is_valid(), which checks for the invalid flag presence.
-
--- Examples of Use
--------------------------------------------------
---Using the types directly:
-	select isbn('978-0-393-04002-9');
-	select isbn13('0901690546');
-	select issn('1436-4522');
-
---Casting types:
--- note that you can only cast from ean13 to other type when the casted 
--- number would be valid in the realm of the casted type; 
--- thus, the following will NOT work: select isbn(ean13('0220356483481')); 
--- but these will: 
-    select upc(ean13('0220356483481')); 
-    select ean13(upc('220356483481')); 
-
---Create a table with a single column to hold ISBN numbers:
-	create table test ( id isbn );
-	insert into test values('9780393040029');
-
---Automatically calculating check digits (observe the '?'):
-	insert into test values('220500896?');
-	insert into test values('978055215372?');
-
-	select issn('3251231?');
-  select ismn('979047213542?');	
-
---Using the weak mode:
-  select isn_weak(true);
-  insert into test values('978-0-11-000533-4');
-  insert into test values('9780141219307');
-  insert into test values('2-205-00876-X');
-  select isn_weak(false);
-  
-  select id from test where not is_valid(id);
-  update test set id=make_valid(id) where id = '2-205-00876-X!';
-  
-  select * from test;
-
-  select isbn13(id) from test;
-
--- Contact
--------------------------------------------------
-Please suggestions or bug reports to kronuz at users.sourceforge.net
-
-Last reviewed on August 23, 2006 by Kronuz.
diff --git a/contrib/lo/.gitignore b/contrib/lo/.gitignore
new file mode 100644
index 000000000000..979347bd008b
--- /dev/null
+++ b/contrib/lo/.gitignore
@@ -0,0 +1 @@
+/lo.sql
diff --git a/contrib/lo/uninstall_lo.sql b/contrib/lo/uninstall_lo.sql
index de0281fabd18..7cbc796a3dec 100644
--- a/contrib/lo/uninstall_lo.sql
+++ b/contrib/lo/uninstall_lo.sql
@@ -1,11 +1,13 @@
+/* $PostgreSQL: pgsql/contrib/lo/uninstall_lo.sql,v 1.3 2007/11/13 04:24:28 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public;
+
 --
 -- This removes the LO type
 -- It's used just for development
 --
 
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
-
 -- drop the type and associated functions
 DROP TYPE lo CASCADE;
 
diff --git a/contrib/ltree/.gitignore b/contrib/ltree/.gitignore
new file mode 100644
index 000000000000..49883e82a3ac
--- /dev/null
+++ b/contrib/ltree/.gitignore
@@ -0,0 +1,3 @@
+/ltree.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/ltree/uninstall_ltree.sql b/contrib/ltree/uninstall_ltree.sql
index a409ea4fef8d..4d976839a4a5 100644
--- a/contrib/ltree/uninstall_ltree.sql
+++ b/contrib/ltree/uninstall_ltree.sql
@@ -1,3 +1,6 @@
+/* $PostgreSQL: pgsql/contrib/ltree/uninstall_ltree.sql,v 1.5 2007/11/13 04:24:28 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
 SET search_path = public;
 
 DROP OPERATOR CLASS gist__ltree_ops USING gist;
diff --git a/contrib/oid2name/.gitignore b/contrib/oid2name/.gitignore
new file mode 100644
index 000000000000..fdefde108ddd
--- /dev/null
+++ b/contrib/oid2name/.gitignore
@@ -0,0 +1 @@
+/oid2name
diff --git a/contrib/pageinspect/.gitignore b/contrib/pageinspect/.gitignore
new file mode 100644
index 000000000000..fad166aaee87
--- /dev/null
+++ b/contrib/pageinspect/.gitignore
@@ -0,0 +1 @@
+/pageinspect.sql
diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile
new file mode 100644
index 000000000000..63da705215d5
--- /dev/null
+++ b/contrib/pageinspect/Makefile
@@ -0,0 +1,24 @@
+#-------------------------------------------------------------------------
+#
+# pageinspect Makefile
+#
+# $PostgreSQL: pgsql/contrib/pageinspect/Makefile,v 1.3 2007/11/10 23:59:51 momjian Exp $
+#
+#-------------------------------------------------------------------------
+
+MODULE_big	= pageinspect
+OBJS		= rawpage.o heapfuncs.o btreefuncs.o
+DATA_built	= pageinspect.sql
+DATA      	= uninstall_pageinspect.sql
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/pageinspect
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
new file mode 100644
index 000000000000..81cfbf1c0f24
--- /dev/null
+++ b/contrib/pageinspect/btreefuncs.c
@@ -0,0 +1,500 @@
+/*
+ * btreefuncs.c
+ *
+ * Copyright (c) 2006 Satoshi Nagayasu <nagayasus@nttdata.co.jp>
+ *
+ * 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 AUTHOR 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 AUTHOR 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 AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
+ * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/nbtree.h"
+#include "catalog/namespace.h"
+#include "catalog/pg_type.h"
+#include "funcapi.h"
+#include "miscadmin.h"
+#include "utils/builtins.h"
+
+
+extern Datum bt_metap(PG_FUNCTION_ARGS);
+extern Datum bt_page_items(PG_FUNCTION_ARGS);
+extern Datum bt_page_stats(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(bt_metap);
+PG_FUNCTION_INFO_V1(bt_page_items);
+PG_FUNCTION_INFO_V1(bt_page_stats);
+
+#define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX)
+#define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
+
+#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \
+		if ( !(FirstOffsetNumber <= (offnum) && \
+						(offnum) <= PageGetMaxOffsetNumber(pg)) ) \
+			 elog(ERROR, "page offset number out of range"); }
+
+/* note: BlockNumber is unsigned, hence can't be negative */
+#define CHECK_RELATION_BLOCK_RANGE(rel, blkno) { \
+		if ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \
+			 elog(ERROR, "block number out of range"); }
+
+/* ------------------------------------------------
+ * structure for single btree page statistics
+ * ------------------------------------------------
+ */
+typedef struct BTPageStat
+{
+	uint32		blkno;
+	uint32		live_items;
+	uint32		dead_items;
+	uint32		page_size;
+	uint32		max_avail;
+	uint32		free_size;
+	uint32		avg_item_size;
+	char		type;
+
+	/* opaque data */
+	BlockNumber btpo_prev;
+	BlockNumber btpo_next;
+	union
+	{
+		uint32		level;
+		TransactionId xact;
+	}			btpo;
+	uint16		btpo_flags;
+	BTCycleId	btpo_cycleid;
+}	BTPageStat;
+
+
+/* -------------------------------------------------
+ * GetBTPageStatistics()
+ *
+ * Collect statistics of single b-tree page
+ * -------------------------------------------------
+ */
+static void
+GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
+{
+	Page		page = BufferGetPage(buffer);
+	PageHeader	phdr = (PageHeader) page;
+	OffsetNumber maxoff = PageGetMaxOffsetNumber(page);
+	BTPageOpaque opaque = (BTPageOpaque) PageGetSpecialPointer(page);
+	int			item_size = 0;
+	int			off;
+
+	stat->blkno = blkno;
+
+	stat->max_avail = BLCKSZ - (BLCKSZ - phdr->pd_special + SizeOfPageHeaderData);
+
+	stat->dead_items = stat->live_items = 0;
+
+	stat->page_size = PageGetPageSize(page);
+
+	/* page type (flags) */
+	if (P_ISDELETED(opaque))
+	{
+		stat->type = 'd';
+		stat->btpo.xact = opaque->btpo.xact;
+		return;
+	}
+	else if (P_IGNORE(opaque))
+		stat->type = 'e';
+	else if (P_ISLEAF(opaque))
+		stat->type = 'l';
+	else if (P_ISROOT(opaque))
+		stat->type = 'r';
+	else
+		stat->type = 'i';
+
+	/* btpage opaque data */
+	stat->btpo_prev = opaque->btpo_prev;
+	stat->btpo_next = opaque->btpo_next;
+	stat->btpo.level = opaque->btpo.level;
+	stat->btpo_flags = opaque->btpo_flags;
+	stat->btpo_cycleid = opaque->btpo_cycleid;
+
+	/* count live and dead tuples, and free space */
+	for (off = FirstOffsetNumber; off <= maxoff; off++)
+	{
+		IndexTuple	itup;
+
+		ItemId		id = PageGetItemId(page, off);
+
+		itup = (IndexTuple) PageGetItem(page, id);
+
+		item_size += IndexTupleSize(itup);
+
+		if (!ItemIdIsDead(id))
+			stat->live_items++;
+		else
+			stat->dead_items++;
+	}
+	stat->free_size = PageGetFreeSpace(page);
+
+	if ((stat->live_items + stat->dead_items) > 0)
+		stat->avg_item_size = item_size / (stat->live_items + stat->dead_items);
+	else
+		stat->avg_item_size = 0;
+}
+
+/* -----------------------------------------------
+ * bt_page_stats()
+ *
+ * Usage: SELECT * FROM bt_page_stats('t1_pkey', 1);
+ * -----------------------------------------------
+ */
+Datum
+bt_page_stats(PG_FUNCTION_ARGS)
+{
+	text	   *relname = PG_GETARG_TEXT_P(0);
+	uint32		blkno = PG_GETARG_UINT32(1);
+	Buffer		buffer;
+	Relation	rel;
+	RangeVar   *relrv;
+	Datum		result;
+	HeapTuple	tuple;
+	TupleDesc	tupleDesc;
+	int			j;
+	char	   *values[11];
+	BTPageStat	stat;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 (errmsg("must be superuser to use pageinspect functions"))));
+
+	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
+	rel = relation_openrv(relrv, AccessShareLock);
+
+	if (!IS_INDEX(rel) || !IS_BTREE(rel))
+		elog(ERROR, "relation \"%s\" is not a btree index",
+			 RelationGetRelationName(rel));
+
+	/*
+	 * Reject attempts to read non-local temporary relations; we would
+	 * be likely to get wrong data since we have no visibility into the
+	 * owning session's local buffers.
+	 */
+	if (isOtherTempNamespace(RelationGetNamespace(rel)))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot access temporary tables of other sessions")));
+
+	if (blkno == 0)
+		elog(ERROR, "block 0 is a meta page");
+
+	CHECK_RELATION_BLOCK_RANGE(rel, blkno);
+
+	buffer = ReadBuffer(rel, blkno);
+	LockBuffer(buffer, BUFFER_LOCK_SHARE);
+
+	/* keep compiler quiet */
+	stat.btpo_prev = stat.btpo_next = InvalidBlockNumber;
+	stat.btpo_flags = stat.free_size = stat.avg_item_size = 0;
+
+	GetBTPageStatistics(blkno, buffer, &stat);
+
+	UnlockReleaseBuffer(buffer);
+	relation_close(rel, AccessShareLock);
+
+	/* Build a tuple descriptor for our result type */
+	if (get_call_result_type(fcinfo, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
+	j = 0;
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.blkno);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%c", stat.type);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.live_items);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.dead_items);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.avg_item_size);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.page_size);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.free_size);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.btpo_prev);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.btpo_next);
+	values[j] = palloc(32);
+	if (stat.type == 'd')
+		snprintf(values[j++], 32, "%d", stat.btpo.xact);
+	else
+		snprintf(values[j++], 32, "%d", stat.btpo.level);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", stat.btpo_flags);
+
+	tuple = BuildTupleFromCStrings(TupleDescGetAttInMetadata(tupleDesc),
+								   values);
+
+	result = HeapTupleGetDatum(tuple);
+
+	PG_RETURN_DATUM(result);
+}
+
+/*-------------------------------------------------------
+ * bt_page_items()
+ *
+ * Get IndexTupleData set in a btree page
+ *
+ * Usage: SELECT * FROM bt_page_items('t1_pkey', 1);
+ *-------------------------------------------------------
+ */
+
+/*
+ * cross-call data structure for SRF
+ */
+struct user_args
+{
+	Page		page;
+	OffsetNumber offset;
+};
+
+Datum
+bt_page_items(PG_FUNCTION_ARGS)
+{
+	text	   *relname = PG_GETARG_TEXT_P(0);
+	uint32		blkno = PG_GETARG_UINT32(1);
+	Datum		result;
+	char	   *values[6];
+	HeapTuple	tuple;
+	FuncCallContext *fctx;
+	MemoryContext mctx;
+	struct user_args *uargs;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 (errmsg("must be superuser to use pageinspect functions"))));
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		RangeVar   *relrv;
+		Relation	rel;
+		Buffer		buffer;
+		BTPageOpaque opaque;
+		TupleDesc	tupleDesc;
+
+		fctx = SRF_FIRSTCALL_INIT();
+
+		relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
+		rel = relation_openrv(relrv, AccessShareLock);
+
+		if (!IS_INDEX(rel) || !IS_BTREE(rel))
+			elog(ERROR, "relation \"%s\" is not a btree index",
+				 RelationGetRelationName(rel));
+
+		/*
+		 * Reject attempts to read non-local temporary relations; we would
+		 * be likely to get wrong data since we have no visibility into the
+		 * owning session's local buffers.
+		 */
+		if (isOtherTempNamespace(RelationGetNamespace(rel)))
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("cannot access temporary tables of other sessions")));
+
+		if (blkno == 0)
+			elog(ERROR, "block 0 is a meta page");
+
+		CHECK_RELATION_BLOCK_RANGE(rel, blkno);
+
+		buffer = ReadBuffer(rel, blkno);
+		LockBuffer(buffer, BUFFER_LOCK_SHARE);
+
+		/*
+		 * We copy the page into local storage to avoid holding pin on the
+		 * buffer longer than we must, and possibly failing to release it at
+		 * all if the calling query doesn't fetch all rows.
+		 */
+		mctx = MemoryContextSwitchTo(fctx->multi_call_memory_ctx);
+
+		uargs = palloc(sizeof(struct user_args));
+
+		uargs->page = palloc(BLCKSZ);
+		memcpy(uargs->page, BufferGetPage(buffer), BLCKSZ);
+
+		UnlockReleaseBuffer(buffer);
+		relation_close(rel, AccessShareLock);
+
+		uargs->offset = FirstOffsetNumber;
+
+		opaque = (BTPageOpaque) PageGetSpecialPointer(uargs->page);
+
+		if (P_ISDELETED(opaque))
+			elog(NOTICE, "page is deleted");
+
+		fctx->max_calls = PageGetMaxOffsetNumber(uargs->page);
+
+		/* Build a tuple descriptor for our result type */
+		if (get_call_result_type(fcinfo, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
+			elog(ERROR, "return type must be a row type");
+
+		fctx->attinmeta = TupleDescGetAttInMetadata(tupleDesc);
+
+		fctx->user_fctx = uargs;
+
+		MemoryContextSwitchTo(mctx);
+	}
+
+	fctx = SRF_PERCALL_SETUP();
+	uargs = fctx->user_fctx;
+
+	if (fctx->call_cntr < fctx->max_calls)
+	{
+		ItemId		id;
+		IndexTuple	itup;
+		int			j;
+		int			off;
+		int			dlen;
+		char	   *dump;
+		char	   *ptr;
+
+		id = PageGetItemId(uargs->page, uargs->offset);
+
+		if (!ItemIdIsValid(id))
+			elog(ERROR, "invalid ItemId");
+
+		itup = (IndexTuple) PageGetItem(uargs->page, id);
+
+		j = 0;
+		values[j] = palloc(32);
+		snprintf(values[j++], 32, "%d", uargs->offset);
+		values[j] = palloc(32);
+		snprintf(values[j++], 32, "(%u,%u)",
+				 BlockIdGetBlockNumber(&(itup->t_tid.ip_blkid)),
+				 itup->t_tid.ip_posid);
+		values[j] = palloc(32);
+		snprintf(values[j++], 32, "%d", (int) IndexTupleSize(itup));
+		values[j] = palloc(32);
+		snprintf(values[j++], 32, "%c", IndexTupleHasNulls(itup) ? 't' : 'f');
+		values[j] = palloc(32);
+		snprintf(values[j++], 32, "%c", IndexTupleHasVarwidths(itup) ? 't' : 'f');
+
+		ptr = (char *) itup + IndexInfoFindDataOffset(itup->t_info);
+		dlen = IndexTupleSize(itup) - IndexInfoFindDataOffset(itup->t_info);
+		dump = palloc0(dlen * 3 + 1);
+		values[j] = dump;
+		for (off = 0; off < dlen; off++)
+		{
+			if (off > 0)
+				*dump++ = ' ';
+			sprintf(dump, "%02x", *(ptr + off) & 0xff);
+			dump += 2;
+		}
+
+		tuple = BuildTupleFromCStrings(fctx->attinmeta, values);
+		result = HeapTupleGetDatum(tuple);
+
+		uargs->offset = uargs->offset + 1;
+
+		SRF_RETURN_NEXT(fctx, result);
+	}
+	else
+	{
+		pfree(uargs->page);
+		pfree(uargs);
+		SRF_RETURN_DONE(fctx);
+	}
+}
+
+
+/* ------------------------------------------------
+ * bt_metap()
+ *
+ * Get a btree's meta-page information
+ *
+ * Usage: SELECT * FROM bt_metap('t1_pkey')
+ * ------------------------------------------------
+ */
+Datum
+bt_metap(PG_FUNCTION_ARGS)
+{
+	text	   *relname = PG_GETARG_TEXT_P(0);
+	Datum		result;
+	Relation	rel;
+	RangeVar   *relrv;
+	BTMetaPageData *metad;
+	TupleDesc	tupleDesc;
+	int			j;
+	char	   *values[6];
+	Buffer		buffer;
+	Page		page;
+	HeapTuple	tuple;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 (errmsg("must be superuser to use pageinspect functions"))));
+
+	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
+	rel = relation_openrv(relrv, AccessShareLock);
+
+	if (!IS_INDEX(rel) || !IS_BTREE(rel))
+		elog(ERROR, "relation \"%s\" is not a btree index",
+			 RelationGetRelationName(rel));
+
+	/*
+	 * Reject attempts to read non-local temporary relations; we would
+	 * be likely to get wrong data since we have no visibility into the
+	 * owning session's local buffers.
+	 */
+	if (isOtherTempNamespace(RelationGetNamespace(rel)))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot access temporary tables of other sessions")));
+
+	buffer = ReadBuffer(rel, 0);
+	LockBuffer(buffer, BUFFER_LOCK_SHARE);
+
+	page = BufferGetPage(buffer);
+	metad = BTPageGetMeta(page);
+
+	/* Build a tuple descriptor for our result type */
+	if (get_call_result_type(fcinfo, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
+	j = 0;
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", metad->btm_magic);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", metad->btm_version);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", metad->btm_root);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", metad->btm_level);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", metad->btm_fastroot);
+	values[j] = palloc(32);
+	snprintf(values[j++], 32, "%d", metad->btm_fastlevel);
+
+	tuple = BuildTupleFromCStrings(TupleDescGetAttInMetadata(tupleDesc),
+								   values);
+
+	result = HeapTupleGetDatum(tuple);
+
+	UnlockReleaseBuffer(buffer);
+	relation_close(rel, AccessShareLock);
+
+	PG_RETURN_DATUM(result);
+}
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
new file mode 100644
index 000000000000..3b82389729be
--- /dev/null
+++ b/contrib/pageinspect/heapfuncs.c
@@ -0,0 +1,232 @@
+/*-------------------------------------------------------------------------
+ *
+ * heapfuncs.c
+ *	  Functions to investigate heap pages
+ *
+ * We check the input to these functions for corrupt pointers etc. that
+ * 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.
+ *
+ * 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.
+ * 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-2008, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/pageinspect/heapfuncs.c,v 1.4 2008/01/01 20:31:21 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+#include "funcapi.h"
+#include "access/heapam.h"
+#include "access/transam.h"
+#include "catalog/namespace.h"
+#include "catalog/pg_type.h"
+#include "utils/builtins.h"
+#include "miscadmin.h"
+
+Datum		heap_page_items(PG_FUNCTION_ARGS);
+
+#define GET_TEXT(str_) \
+		DirectFunctionCall1(textin, CStringGetDatum(str_))
+
+/*
+ * bits_to_text
+ *
+ * Converts a bits8-array of 'len' bits to a human-readable
+ * c-string representation.
+ */
+static char *
+bits_to_text(bits8 *bits, int len)
+{
+	int			i;
+	char	   *str;
+
+	str = palloc(len + 1);
+
+	for (i = 0; i < len; i++)
+		str[i] = (bits[(i / 8)] & (1 << (i % 8))) ? '1' : '0';
+
+	str[i] = '\0';
+
+	return str;
+}
+
+
+/*
+ * heap_page_items
+ *
+ * Allows inspection of line pointers and tuple headers of a heap page.
+ */
+PG_FUNCTION_INFO_V1(heap_page_items);
+
+typedef struct heap_page_items_state
+{
+	TupleDesc	tupd;
+	Page		page;
+	uint16		offset;
+}	heap_page_items_state;
+
+Datum
+heap_page_items(PG_FUNCTION_ARGS)
+{
+	bytea	   *raw_page = PG_GETARG_BYTEA_P(0);
+	heap_page_items_state *inter_call_data = NULL;
+	FuncCallContext *fctx;
+	int			raw_page_size;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 (errmsg("must be superuser to use raw page functions"))));
+
+	raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		TupleDesc	tupdesc;
+		MemoryContext mctx;
+
+		if (raw_page_size < SizeOfPageHeaderData)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				  errmsg("input page too small (%d bytes)", raw_page_size)));
+
+		fctx = SRF_FIRSTCALL_INIT();
+		mctx = MemoryContextSwitchTo(fctx->multi_call_memory_ctx);
+
+		inter_call_data = palloc(sizeof(heap_page_items_state));
+
+		/* 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");
+
+		inter_call_data->tupd = tupdesc;
+
+		inter_call_data->offset = FirstOffsetNumber;
+		inter_call_data->page = VARDATA(raw_page);
+
+		fctx->max_calls = PageGetMaxOffsetNumber(inter_call_data->page);
+		fctx->user_fctx = inter_call_data;
+
+		MemoryContextSwitchTo(mctx);
+	}
+
+	fctx = SRF_PERCALL_SETUP();
+	inter_call_data = fctx->user_fctx;
+
+	if (fctx->call_cntr < fctx->max_calls)
+	{
+		Page		page = inter_call_data->page;
+		HeapTuple	resultTuple;
+		Datum		result;
+		ItemId		id;
+		Datum		values[13];
+		bool		nulls[13];
+		uint16		lp_offset;
+		uint16		lp_flags;
+		uint16		lp_len;
+
+		memset(nulls, 0, sizeof(nulls));
+
+		/* Extract information from the line pointer */
+
+		id = PageGetItemId(page, inter_call_data->offset);
+
+		lp_offset = ItemIdGetOffset(id);
+		lp_flags = ItemIdGetFlags(id);
+		lp_len = ItemIdGetLength(id);
+
+		values[0] = UInt16GetDatum(inter_call_data->offset);
+		values[1] = UInt16GetDatum(lp_offset);
+		values[2] = UInt16GetDatum(lp_flags);
+		values[3] = UInt16GetDatum(lp_len);
+
+		/*
+		 * We do just enough validity checking to make sure we don't reference
+		 * data outside the page passed to us. The page could be corrupt in
+		 * many other ways, but at least we won't crash.
+		 */
+		if (ItemIdHasStorage(id) &&
+			lp_len >= sizeof(HeapTupleHeader) &&
+			lp_offset == MAXALIGN(lp_offset) &&
+			lp_offset + lp_len <= raw_page_size)
+		{
+			HeapTupleHeader tuphdr;
+			int			bits_len;
+
+			/* Extract information from the tuple header */
+
+			tuphdr = (HeapTupleHeader) PageGetItem(page, id);
+
+			values[4] = UInt32GetDatum(HeapTupleHeaderGetXmin(tuphdr));
+			values[5] = UInt32GetDatum(HeapTupleHeaderGetXmax(tuphdr));
+			values[6] = UInt32GetDatum(HeapTupleHeaderGetRawCommandId(tuphdr)); /* shared with xvac */
+			values[7] = PointerGetDatum(&tuphdr->t_ctid);
+			values[8] = UInt16GetDatum(tuphdr->t_infomask2);
+			values[9] = UInt16GetDatum(tuphdr->t_infomask);
+			values[10] = UInt8GetDatum(tuphdr->t_hoff);
+
+			/*
+			 * We already checked that the item as is completely within the
+			 * raw page passed to us, with the length given in the line
+			 * pointer.. Let's check that t_hoff doesn't point over lp_len,
+			 * before using it to access t_bits and oid.
+			 */
+			if (tuphdr->t_hoff >= sizeof(HeapTupleHeader) &&
+				tuphdr->t_hoff <= lp_len)
+			{
+				if (tuphdr->t_infomask & HEAP_HASNULL)
+				{
+					bits_len = tuphdr->t_hoff -
+						(((char *) tuphdr->t_bits) -((char *) tuphdr));
+
+					values[11] = GET_TEXT(
+								 bits_to_text(tuphdr->t_bits, bits_len * 8));
+				}
+				else
+					nulls[11] = true;
+
+				if (tuphdr->t_infomask & HEAP_HASOID)
+					values[12] = HeapTupleHeaderGetOid(tuphdr);
+				else
+					nulls[12] = true;
+			}
+			else
+			{
+				nulls[11] = true;
+				nulls[12] = true;
+			}
+		}
+		else
+		{
+			/*
+			 * The line pointer is not used, or it's invalid. Set the rest of
+			 * the fields to NULL
+			 */
+			int			i;
+
+			for (i = 4; i <= 12; i++)
+				nulls[i] = true;
+		}
+
+		/* Build and return the result tuple. */
+		resultTuple = heap_form_tuple(inter_call_data->tupd, values, nulls);
+		result = HeapTupleGetDatum(resultTuple);
+
+		inter_call_data->offset++;
+
+		SRF_RETURN_NEXT(fctx, result);
+	}
+	else
+		SRF_RETURN_DONE(fctx);
+}
diff --git a/contrib/pageinspect/pageinspect.sql.in b/contrib/pageinspect/pageinspect.sql.in
new file mode 100644
index 000000000000..1af59f70f46a
--- /dev/null
+++ b/contrib/pageinspect/pageinspect.sql.in
@@ -0,0 +1,94 @@
+/* $PostgreSQL: pgsql/contrib/pageinspect/pageinspect.sql.in,v 1.4 2007/11/13 04:24:28 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+--
+-- get_raw_page()
+--
+CREATE OR REPLACE FUNCTION get_raw_page(text, int4)
+RETURNS bytea
+AS 'MODULE_PATHNAME', 'get_raw_page'
+LANGUAGE C STRICT;
+
+--
+-- page_header()
+--
+CREATE OR REPLACE FUNCTION page_header(IN page bytea,
+    OUT lsn text,
+    OUT tli smallint,
+    OUT flags smallint,
+    OUT lower smallint,
+    OUT upper smallint,
+    OUT special smallint,
+    OUT pagesize smallint,
+    OUT version smallint,
+    OUT prune_xid xid)
+AS 'MODULE_PATHNAME', 'page_header'
+LANGUAGE C STRICT;
+
+--
+-- heap_page_items()
+--
+CREATE OR REPLACE FUNCTION heap_page_items(IN page bytea,
+    OUT lp smallint,
+    OUT lp_off smallint,
+    OUT lp_flags smallint,
+    OUT lp_len smallint,
+    OUT t_xmin xid,
+    OUT t_xmax xid,
+    OUT t_field3 int4,
+    OUT t_ctid tid,
+    OUT t_infomask2 smallint,
+    OUT t_infomask smallint,
+    OUT t_hoff smallint,
+    OUT t_bits text,
+    OUT t_oid oid)
+RETURNS SETOF record
+AS 'MODULE_PATHNAME', 'heap_page_items'
+LANGUAGE C STRICT;
+
+--
+-- bt_metap()
+--
+CREATE OR REPLACE FUNCTION bt_metap(IN relname text,
+    OUT magic int4,
+    OUT version int4,
+    OUT root int4,
+    OUT level int4,
+    OUT fastroot int4,
+    OUT fastlevel int4)
+AS 'MODULE_PATHNAME', 'bt_metap'
+LANGUAGE C STRICT;
+
+--
+-- bt_page_stats()
+--
+CREATE OR REPLACE FUNCTION bt_page_stats(IN relname text, IN blkno int4,
+    OUT blkno int4,
+    OUT type "char",
+    OUT live_items int4,
+    OUT dead_items int4,
+    OUT avg_item_size int4,
+    OUT page_size int4,
+    OUT free_size int4,
+    OUT btpo_prev int4,
+    OUT btpo_next int4,
+    OUT btpo int4,
+    OUT btpo_flags int4)
+AS 'MODULE_PATHNAME', 'bt_page_stats'
+LANGUAGE C STRICT;
+
+--
+-- bt_page_items()
+--
+CREATE OR REPLACE FUNCTION bt_page_items(IN relname text, IN blkno int4,
+    OUT itemoffset smallint,
+    OUT ctid tid,
+    OUT itemlen smallint,
+    OUT nulls bool,
+    OUT vars bool,
+    OUT data text)
+RETURNS SETOF record
+AS 'MODULE_PATHNAME', 'bt_page_items'
+LANGUAGE C STRICT;
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
new file mode 100644
index 000000000000..75ab6fbfa32e
--- /dev/null
+++ b/contrib/pageinspect/rawpage.c
@@ -0,0 +1,175 @@
+/*-------------------------------------------------------------------------
+ *
+ * rawpage.c
+ *	  Functions to extract a raw page as bytea and inspect it
+ *
+ * Access-method specific inspection functions are in separate files.
+ *
+ * Copyright (c) 2007-2008, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/pageinspect/rawpage.c,v 1.4.2.1 2009/03/31 22:54:52 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+#include "funcapi.h"
+#include "access/heapam.h"
+#include "access/transam.h"
+#include "catalog/namespace.h"
+#include "catalog/pg_type.h"
+#include "utils/builtins.h"
+#include "miscadmin.h"
+
+PG_MODULE_MAGIC;
+
+Datum		get_raw_page(PG_FUNCTION_ARGS);
+Datum		page_header(PG_FUNCTION_ARGS);
+
+/*
+ * get_raw_page
+ *
+ * Returns a copy of a page from shared buffers as a bytea
+ */
+PG_FUNCTION_INFO_V1(get_raw_page);
+
+Datum
+get_raw_page(PG_FUNCTION_ARGS)
+{
+	text	   *relname = PG_GETARG_TEXT_P(0);
+	uint32		blkno = PG_GETARG_UINT32(1);
+
+	Relation	rel;
+	RangeVar   *relrv;
+	bytea	   *raw_page;
+	char	   *raw_page_data;
+	Buffer		buf;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 (errmsg("must be superuser to use raw functions"))));
+
+	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
+	rel = relation_openrv(relrv, AccessShareLock);
+
+	/* Check that this relation has storage */
+	if (rel->rd_rel->relkind == RELKIND_VIEW)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("cannot get raw page from view \"%s\"",
+						RelationGetRelationName(rel))));
+	if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("cannot get raw page from composite type \"%s\"",
+						RelationGetRelationName(rel))));
+
+	/*
+	 * Reject attempts to read non-local temporary relations; we would
+	 * be likely to get wrong data since we have no visibility into the
+	 * owning session's local buffers.
+	 */
+	if (isOtherTempNamespace(RelationGetNamespace(rel)))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot access temporary tables of other sessions")));
+
+	if (blkno >= RelationGetNumberOfBlocks(rel))
+		elog(ERROR, "block number %u is out of range for relation \"%s\"",
+			 blkno, RelationGetRelationName(rel));
+
+	/* Initialize buffer to copy to */
+	raw_page = (bytea *) palloc(BLCKSZ + VARHDRSZ);
+	SET_VARSIZE(raw_page, BLCKSZ + VARHDRSZ);
+	raw_page_data = VARDATA(raw_page);
+
+	/* Take a verbatim copy of the page */
+
+	buf = ReadBuffer(rel, blkno);
+	LockBuffer(buf, BUFFER_LOCK_SHARE);
+
+	memcpy(raw_page_data, BufferGetPage(buf), BLCKSZ);
+
+	LockBuffer(buf, BUFFER_LOCK_UNLOCK);
+	ReleaseBuffer(buf);
+
+	relation_close(rel, AccessShareLock);
+
+	PG_RETURN_BYTEA_P(raw_page);
+}
+
+/*
+ * page_header
+ *
+ * Allows inspection of page header fields of a raw page
+ */
+
+PG_FUNCTION_INFO_V1(page_header);
+
+Datum
+page_header(PG_FUNCTION_ARGS)
+{
+	bytea	   *raw_page = PG_GETARG_BYTEA_P(0);
+	int			raw_page_size;
+
+	TupleDesc	tupdesc;
+
+	Datum		result;
+	HeapTuple	tuple;
+	Datum		values[9];
+	bool		nulls[9];
+
+	PageHeader	page;
+	XLogRecPtr	lsn;
+	char		lsnchar[64];
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 (errmsg("must be superuser to use raw page functions"))));
+
+	raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
+
+	/*
+	 * Check that enough data was supplied, so that we don't try to access
+	 * fields outside the supplied buffer.
+	 */
+	if (raw_page_size < sizeof(PageHeaderData))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("input page too small (%d bytes)", raw_page_size)));
+
+	page = (PageHeader) VARDATA(raw_page);
+
+	/* 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");
+
+	/* Extract information from the page header */
+
+	lsn = PageGetLSN(page);
+	snprintf(lsnchar, sizeof(lsnchar), "%X/%X", lsn.xlogid, lsn.xrecoff);
+
+	values[0] = DirectFunctionCall1(textin, CStringGetDatum(lsnchar));
+	values[1] = UInt16GetDatum(PageGetTLI(page));
+	values[2] = UInt16GetDatum(page->pd_flags);
+	values[3] = UInt16GetDatum(page->pd_lower);
+	values[4] = UInt16GetDatum(page->pd_upper);
+	values[5] = UInt16GetDatum(page->pd_special);
+	values[6] = UInt16GetDatum(PageGetPageSize(page));
+	values[7] = UInt16GetDatum(PageGetPageLayoutVersion(page));
+	values[8] = TransactionIdGetDatum(page->pd_prune_xid);
+
+	/* Build and return the tuple. */
+
+	memset(nulls, 0, sizeof(nulls));
+
+	tuple = heap_form_tuple(tupdesc, values, nulls);
+	result = HeapTupleGetDatum(tuple);
+
+	PG_RETURN_DATUM(result);
+}
diff --git a/contrib/pageinspect/uninstall_pageinspect.sql b/contrib/pageinspect/uninstall_pageinspect.sql
new file mode 100644
index 000000000000..161393d5a9ba
--- /dev/null
+++ b/contrib/pageinspect/uninstall_pageinspect.sql
@@ -0,0 +1,11 @@
+/* $PostgreSQL: pgsql/contrib/pageinspect/uninstall_pageinspect.sql,v 1.4 2007/11/13 04:24:28 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public;
+
+DROP FUNCTION get_raw_page(text, int4);
+DROP FUNCTION page_header(bytea);
+DROP FUNCTION heap_page_items(bytea);
+DROP FUNCTION bt_metap(text);
+DROP FUNCTION bt_page_stats(text, int4);
+DROP FUNCTION bt_page_items(text, int4);
diff --git a/contrib/pg_buffercache/.gitignore b/contrib/pg_buffercache/.gitignore
new file mode 100644
index 000000000000..fea8b0b3d40b
--- /dev/null
+++ b/contrib/pg_buffercache/.gitignore
@@ -0,0 +1 @@
+/pg_buffercache.sql
diff --git a/contrib/pg_freespacemap/.gitignore b/contrib/pg_freespacemap/.gitignore
new file mode 100644
index 000000000000..645433a39fa2
--- /dev/null
+++ b/contrib/pg_freespacemap/.gitignore
@@ -0,0 +1 @@
+/pg_freespacemap.sql
diff --git a/contrib/pg_freespacemap/README.pg_freespacemap b/contrib/pg_freespacemap/README.pg_freespacemap
deleted file mode 100755
index 9210419cb8c4..000000000000
--- a/contrib/pg_freespacemap/README.pg_freespacemap
+++ /dev/null
@@ -1,173 +0,0 @@
-Pg_freespacemap - Real time queries on the free space map (FSM).
----------------
-
-  This module consists of two C functions: 'pg_freespacemap_relations()' and
-  'pg_freespacemap_pages()' that return a set of records, plus two views 
-  'pg_freespacemap_relations' and 'pg_freespacemap_pages' for more
-  user-friendly access to the functions.
-
-  The module provides the ability to examine the contents of the free space
-  map, without having to restart or rebuild the server with additional
-  debugging code.
-
-  By default public access is REVOKED from the functions and views, just in 
-  case there are security issues present in the code.
-
-
-Installation
-------------
-
-  Build and install the main Postgresql source, then this contrib module:
-
-  $ cd contrib/pg_freespacemap
-  $ gmake
-  $ gmake install
-
-
-  To register the functions and views:
-
-  $ psql -d <database> -f pg_freespacemap.sql
-
-
-Notes
------
-
-  The definitions for the columns exposed in the views are:
-
-   pg_freespacemap_relations
-
-       Column       |  references          | Description
-  ------------------+----------------------+----------------------------------
-   reltablespace    | pg_tablespace.oid    | Tablespace oid of the relation.
-   reldatabase      | pg_database.oid      | Database oid of the relation.
-   relfilenode      | pg_class.relfilenode | Relfilenode of the relation.
-   avgrequest       |                      | Moving average of free space 
-                    |                      | requests (NULL for indexes)
-   interestingpages |                      | Count of pages last reported as
-                    |                      | containing useful free space.
-   storedpages      |                      | Count of pages actually stored
-                    |                      | in free space map.
-   nextpage         |                      | Page index (from 0) to start next 
-                    |                      | search at.
-
-
-   pg_freespacemap_pages
-
-       Column     |  references          | Description
-  ----------------+----------------------+------------------------------------
-   reltablespace  | pg_tablespace.oid    | Tablespace oid of the relation.
-   reldatabase    | pg_database.oid      | Database oid of the relation.
-   relfilenode    | pg_class.relfilenode | Relfilenode of the relation.
-   relblocknumber |                      | Page number in the relation.
-   bytes          |                      | Free bytes in the page, or NULL
-                  |                      | for an index page (see below).
-
-
-  For pg_freespacemap_relations, there is one row for each relation in the free
-  space map.  storedpages is the number of pages actually stored in the map,
-  while interestingpages is the number of pages the last VACUUM thought had
-  useful amounts of free space.
-
-  If storedpages is consistently less than interestingpages then it'd be a
-  good idea to increase max_fsm_pages.  Also, if the number of rows in
-  pg_freespacemap_relations is close to max_fsm_relations, then you should
-  consider increasing max_fsm_relations.
-
-  For pg_freespacemap_pages, there is one row for each page in the free space 
-  map.  The number of rows for a relation will match the storedpages column
-  in pg_freespacemap_relations.
-
-  For indexes, what is tracked is entirely-unused pages, rather than free
-  space within pages.  Therefore, the average request size and free bytes
-  within a page are not meaningful, and are shown as NULL.
-
-  Because the map is shared by all the databases, it will include relations
-  not belonging to the current database.
-
-  When either of the views are accessed, internal free space map locks are
-  taken, and a copy of the map data is made for them to display. 
-  This ensures that the views produce a consistent set of results, while not 
-  blocking normal activity longer than necessary.  Nonetheless there 
-  could be some impact on database performance if they are read often.
-
-
-Sample output - pg_freespacemap_relations
--------------
-
-regression=# \d pg_freespacemap_relations
-View "public.pg_freespacemap_relations"
-    Column        |  Type   | Modifiers
-------------------+---------+-----------
- reltablespace    | oid     |
- reldatabase      | oid     |
- relfilenode      | oid     |
- avgrequest       | integer |
- interestingpages | integer |
- storedpages      | integer |
- nextpage         | integer |
-View definition:
- SELECT p.reltablespace, p.reldatabase, p.relfilenode, p.avgrequest, p.interestingpages, p.storedpages, p.nextpage
-   FROM pg_freespacemap_relations() p(reltablespace oid, reldatabase oid, relfilenode oid, avgrequest integer, interestingpages integer, storedpages integer, nextpage integer);
-
-regression=# SELECT c.relname, r.avgrequest, r.interestingpages, r.storedpages
-             FROM pg_freespacemap_relations r INNER JOIN pg_class c
-             ON c.relfilenode = r.relfilenode INNER JOIN pg_database d
-             ON r.reldatabase = d.oid AND (d.datname = current_database()) 
-             ORDER BY r.storedpages DESC LIMIT 10;
-             relname             | avgrequest | interestingpages | storedpages
----------------------------------+------------+------------------+-------------
- onek                            |        256 |              109 |         109
- pg_attribute                    |        167 |               93 |          93
- pg_class                        |        191 |               49 |          49
- pg_attribute_relid_attnam_index |            |               48 |          48
- onek2                           |        256 |               37 |          37
- pg_depend                       |         95 |               26 |          26
- pg_type                         |        199 |               16 |          16
- pg_rewrite                      |       1011 |               13 |          13
- pg_class_relname_nsp_index      |            |               10 |          10
- pg_proc                         |        302 |                8 |           8
-(10 rows)
-
-
-Sample output - pg_freespacemap_pages
--------------
-
-regression=# \d pg_freespacemap_pages
- View "public.pg_freespacemap_pages"
-     Column     |  Type   | Modifiers 
-----------------+---------+-----------
- reltablespace  | oid     | 
- reldatabase    | oid     | 
- relfilenode    | oid     | 
- relblocknumber | bigint  | 
- bytes          | integer | 
-View definition:
- SELECT p.reltablespace, p.reldatabase, p.relfilenode, p.relblocknumber, p.bytes
-   FROM pg_freespacemap_pages() p(reltablespace oid, reldatabase oid, relfilenode oid, relblocknumber bigint, bytes integer);
-
-regression=# SELECT c.relname, p.relblocknumber, p.bytes
-             FROM pg_freespacemap_pages p INNER JOIN pg_class c
-             ON c.relfilenode = p.relfilenode INNER JOIN pg_database d
-             ON (p.reldatabase = d.oid AND d.datname = current_database()) 
-             ORDER BY c.relname LIMIT 10;
-   relname    | relblocknumber | bytes 
---------------+----------------+-------
- a_star       |              0 |  8040
- abstime_tbl  |              0 |  7908
- aggtest      |              0 |  8008
- altinhoid    |              0 |  8128
- altstartwith |              0 |  8128
- arrtest      |              0 |  7172
- b_star       |              0 |  7976
- box_tbl      |              0 |  7912
- bt_f8_heap   |             54 |  7728
- bt_i4_heap   |             49 |  8008
-(10 rows)
-
-
-
-Author
-------
-
-  * Mark Kirkwood <markir@paradise.net.nz>
-
diff --git a/contrib/pg_standby/.gitignore b/contrib/pg_standby/.gitignore
new file mode 100644
index 000000000000..a401b085a895
--- /dev/null
+++ b/contrib/pg_standby/.gitignore
@@ -0,0 +1 @@
+/pg_standby
diff --git a/contrib/pg_standby/Makefile b/contrib/pg_standby/Makefile
index e66b1b5c118e..3e0ccb00fa53 100644
--- a/contrib/pg_standby/Makefile
+++ b/contrib/pg_standby/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.2 2007/02/09 17:04:00 petere Exp $
+# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.4 2007/11/10 23:59:51 momjian Exp $
 
 PROGRAM = pg_standby
 OBJS	= pg_standby.o
@@ -6,10 +6,9 @@ OBJS	= pg_standby.o
 PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport)
 
-DOCS = README.pg_standby
-
 ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
 subdir = contrib/pg_standby
diff --git a/contrib/pg_standby/README.pg_standby b/contrib/pg_standby/README.pg_standby
deleted file mode 100644
index 9c4ef8ecb6f8..000000000000
--- a/contrib/pg_standby/README.pg_standby
+++ /dev/null
@@ -1,164 +0,0 @@
-pg_standby README		2006/12/08 Simon Riggs
-
-o What is pg_standby?
-
-  pg_standby is a production-ready program that can be used to
-  create a Warm Standby server. Other configuration is required
-  as well, all of which is described in the main server manual.
-
-  The program is designed to be a wait-for restore_command, 
-  required to turn a normal archive recovery into a Warm Standby.
-  Within the restore_command of the recovery.conf you could
-  configure pg_standby in the following way:
-
-    restore_command = 'pg_standby archiveDir %f %p'
-
-  which would be sufficient to define that files will be restored
-  from archiveDir. 
-
-o features of pg_standby
-
-  - pg_standby is written in C. So it is very portable
-    and easy to install.
-
-  - supports copy or link from a directory (only)
-
-  - source easy to modify, with specifically designated
-    sections to modify for your own needs, allowing 
-    interfaces to be written for additional Backup Archive Restore
-    (BAR) systems
-
-  - portable: tested on Linux and Windows 
-
-o How to install pg_standby
-
- $make
- $make install
-
-o How to use pg_standby?
-
-  pg_standby should be used within the restore_command of the
-  recovery.conf file. See the main PostgreSQL manual for details.
-
-  The basic usage should be like this:
-
-    restore_command = 'pg_standby archiveDir %f %p'
-
-  with the pg_standby command usage as
-
-    pg_standby [OPTION]... [ARCHIVELOCATION] [NEXTWALFILE] [XLOGFILEPATH]
-
-  When used within the restore_command the %f and %p macros
-  will provide the actual file and path required for the restore/recovery.
-  
-o options
-
-  pg_standby has number of options.
-
-	-c
-		use copy/cp command to restore WAL files from archive
-
-	-d
-		debug/logging option.
-
-	-k numfiles
-		Cleanup files in the archive so that we maintain no more
-		than this many files in the archive. 
-
-		You should be wary against setting this number too low,
-		since this may mean you cannot restart the standby. This
-		is because the last restartpoint marked in the WAL files
-		may be many files in the past and can vary considerably.
-		This should be set to a value exceeding the number of WAL
-		files that can be recovered in 2*checkpoint_timeout seconds,
-		according to the value in the warm standby postgresql.conf.
-		It is wholly unrelated to the setting of checkpoint_segments
-		on either primary or standby.
-
-		If in doubt, use a large value or do not set a value at all.
-
-	-l 
-		use ln command to restore WAL files from archive
-		WAL files will remain in archive
-
-		Link is more efficient, but the default is copy to 
-		allow you to maintain the WAL archive for recovery
-		purposes as well as high-availability.
-
-		This option uses the Windows Vista command mklink
-		to provide a file-to-file symbolic link. -l will
-		not work on versions of Windows prior to Vista.
-		Use the -c option instead.
-		see http://en.wikipedia.org/wiki/NTFS_symbolic_link
-
-	-r maxretries
-		the maximum number of times to retry the restore command if it
-		fails. After each failure, we wait for sleeptime * num_retries
-		so that the wait time increases progressively, so by default
-		we will wait 5 secs, 10 secs then 15 secs before reporting
-		the failure back to the database server. This will be
-		interpreted as and end of recovery and the Standby will come
-		up fully as a result.
-		Default=3
-
-	-s sleeptime
-		the number of seconds to sleep between testing to see
-		if the file to be restored is available in the archive yet.
-		The default setting is not necessarily recommended,
-		consult the main database server manual for discussion.
-		Default=5
-
-	-t triggerfile
-		the presence of the triggerfile will cause recovery to end
-		whether or not the next file is available
-		It is recommended that you use a structured filename to 
-		avoid confusion as to which server is being triggered
-		when multiple servers exist on same system.
-		e.g. /tmp/pgsql.trigger.5432
-
-	-w maxwaittime
-		the maximum number of seconds to wait for the next file,
-		after which recovery will end and the Standby will come up.
-		The default setting is not necessarily recommended,
-		consult the main database server manual for discussion.
-		Default=0
-
-	Note: --help is not supported since pg_standby is not intended
-		for interactive use, except during dev/test
-
-o examples
-
-	Linux
-
-	archive_command = 'cp %p ../archive/%f'
-
-    	restore_command = 'pg_standby -l -d -k 255 -r 2 -s 2 -w 0 -t /tmp/pgsql.trigger.5442 $PWD/../archive %f %p 2>> standby.log' 
-
-  	which will
-	- use a ln command to restore WAL files from archive
-	- produce logfile output in standby.log
-	- keep the last 255 full WAL files, plus the current one
-	- sleep for 2 seconds between checks for next WAL file is full
-	- never timeout if file not found
-	- stop waiting when a trigger file called /tmp.pgsql.trigger.5442 appears
-
-	Windows
-	
-	archive_command = 'copy %p ..\\archive\\%f'
-	Note that backslashes need to be doubled in the archive_command, but
-	*not* in the restore_command, in 8.2, 8.1, 8.0 on Windows.
-
-	restore_command = 'pg_standby -c -d -s 5 -w 0 -t C:\pgsql.trigger.5442
-..\archive %f %p 2>> standby.log'
-
-  	which will
-	- use a copy command to restore WAL files from archive
-	- produce logfile output in standby.log
-	- sleep for 5 seconds between checks for next WAL file is full
-	- never timeout if file not found
-	- stop waiting when a trigger file called C:\pgsql.trigger.5442 appears
-
-o reported test success
-
-	SUSE Linux 10.2
-	Windows XP Pro
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index 98d04c26f071..93139ed57c36 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -1,12 +1,12 @@
 /*
  * pg_standby.c
- * 
+ *
  * Production-ready example of how to create a Warm Standby
- * database server using continuous archiving as a 
+ * database server using continuous archiving as a
  * replication mechanism
  *
  * We separate the parameters for archive and nextWALfile
- * so that we can check the archive exists, even if the 
+ * so that we can check the archive exists, even if the
  * WAL file doesn't (yet).
  *
  * This program will be executed once in full for each file
@@ -14,12 +14,11 @@
  *
  * It is designed to cater to a variety of needs, as well
  * providing a customizable section.
- * 
- * Original author:	 	Simon Riggs	 simon@2ndquadrant.com
- * Current maintainer: 	Simon Riggs
+ *
+ * Original author:		Simon Riggs  simon@2ndquadrant.com
+ * Current maintainer:	Simon Riggs
  */
 #include "postgres_fe.h"
-#include "pg_config_manual.h"
 
 #include <ctype.h>
 #include <dirent.h>
@@ -27,7 +26,7 @@
 #include <signal.h>
 
 #ifdef WIN32
-int getopt(int argc, char * const argv[], const char *optstring);
+int			getopt(int argc, char *const argv[], const char *optstring);
 #else
 #include <sys/time.h>
 #include <unistd.h>
@@ -35,42 +34,49 @@ int getopt(int argc, char * const argv[], const char *optstring);
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-
 #endif   /* ! WIN32 */
 
 extern char *optarg;
 extern int	optind;
 
 /* Options and defaults */
-int sleeptime = 5;				/* amount of time to sleep between file checks */
-int waittime = -1;				/* how long we have been waiting, -1 no wait yet */
-int maxwaittime = 0;		  	/* how long are we prepared to wait for? */
-int keepfiles = 0;				/* number of WAL files to keep, 0 keep all */
-int maxretries = 3;				/* number of retries on restore command */
-bool debug = false;			 	/* are we debugging? */
-bool triggered = false;
-bool signaled = false;
-
-char *archiveLocation;		  /* where to find the archive? */
-char *triggerPath;			  /* where to find the trigger file? */
-char *xlogFilePath;			 /* where we are going to restore to */
-char *nextWALFileName;		  /* the file we need to get from archive */
-char *priorWALFileName;		  /* the file we need to get from archive */
-char WALFilePath[MAXPGPATH];/* the file path including archive */
-char restoreCommand[MAXPGPATH]; /* run this to restore */
-char inclusiveCleanupFileName[MAXPGPATH];		  /* the file we need to get from archive */
+int			sleeptime = 5;		/* amount of time to sleep between file checks */
+int			waittime = -1;		/* how long we have been waiting, -1 no wait
+								 * yet */
+int			maxwaittime = 0;	/* how long are we prepared to wait for? */
+int			keepfiles = 0;		/* number of WAL files to keep, 0 keep all */
+int			maxretries = 3;		/* number of retries on restore command */
+bool		debug = false;		/* are we debugging? */
+bool		triggered = false;	/* have we been triggered? */
+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? */
+char	   *xlogFilePath;		/* where we are going to restore to */
+char	   *nextWALFileName;	/* the file we need to get from archive */
+char	   *restartWALFileName; /* the file from which we can restart restore */
+char	   *priorWALFileName;	/* the file we need to get from archive */
+char		WALFilePath[MAXPGPATH];		/* the file path including archive */
+char		restoreCommand[MAXPGPATH];	/* run this to restore */
+char		exclusiveCleanupFileName[MAXPGPATH];		/* the file we need to
+														 * get from archive */
 
 #define RESTORE_COMMAND_COPY 0
 #define RESTORE_COMMAND_LINK 1
-int restoreCommandType;		 
+int			restoreCommandType;
 
 #define XLOG_DATA			 0
 #define XLOG_HISTORY		 1
 #define XLOG_BACKUP_LABEL	 2
-int nextWALFileType;
+int			nextWALFileType;
 
 #define SET_RESTORE_COMMAND(cmd, arg1, arg2) \
-	snprintf(restoreCommand, MAXPGPATH, cmd " %s %s", arg1, arg2)
+	snprintf(restoreCommand, MAXPGPATH, cmd " \"%s\" \"%s\"", arg1, arg2)
 
 struct stat stat_buf;
 
@@ -84,21 +90,21 @@ struct stat stat_buf;
  *	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 pgsql-patches@postgresql.org
- * 	or personally to the current maintainer. Those changes may be 
+ *	enouraged to submit any changes to pgsql-hackers@postgresql.org
+ *	or personally to the current maintainer. Those changes may be
  *	folded in to later versions of this program.
  */
 
-#define XLOG_DATA_FNAME_LEN 	24
+#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)
 
 /*
- *  Initialize allows customized commands into the warm standby program.
+ *	Initialize allows customized commands into the warm standby program.
  *
- *  As an example, and probably the common case, we use either
- *  cp/ln commands on *nix, or copy/move command on Windows.
+ *	As an example, and probably the common case, we use either
+ *	cp/ln commands on *nix, or copy/move command on Windows.
  *
  */
 static void
@@ -109,79 +115,79 @@ CustomizableInitialize(void)
 	switch (restoreCommandType)
 	{
 		case RESTORE_COMMAND_LINK:
-			SET_RESTORE_COMMAND("mklink",WALFilePath, xlogFilePath);
+			SET_RESTORE_COMMAND("mklink", WALFilePath, xlogFilePath);
 		case RESTORE_COMMAND_COPY:
 		default:
-			SET_RESTORE_COMMAND("copy",WALFilePath, xlogFilePath);
+			SET_RESTORE_COMMAND("copy", WALFilePath, xlogFilePath);
 			break;
-	 }   
+	}
 #else
 	snprintf(WALFilePath, MAXPGPATH, "%s/%s", archiveLocation, nextWALFileName);
 	switch (restoreCommandType)
 	{
 		case RESTORE_COMMAND_LINK:
 #if HAVE_WORKING_LINK
-			SET_RESTORE_COMMAND("ln -s -f",WALFilePath, xlogFilePath);
+			SET_RESTORE_COMMAND("ln -s -f", WALFilePath, xlogFilePath);
 			break;
 #endif
 		case RESTORE_COMMAND_COPY:
 		default:
-			SET_RESTORE_COMMAND("cp",WALFilePath, xlogFilePath);
+			SET_RESTORE_COMMAND("cp", WALFilePath, xlogFilePath);
 			break;
-	 }   
+	}
 #endif
 
 	/*
-	 * 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
+	 * 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 it's accessible
 	 */
 	if (stat(archiveLocation, &stat_buf) != 0)
 	{
-	   	fprintf(stderr, "pg_standby: archiveLocation \"%s\" does not exist\n", archiveLocation);
+		fprintf(stderr, "pg_standby: archiveLocation \"%s\" does not exist\n", archiveLocation);
 		fflush(stderr);
-		exit(2);			
+		exit(2);
 	}
 }
 
 /*
  * CustomizableNextWALFileReady()
- * 
+ *
  *	  Is the requested file ready yet?
  */
-static bool 
+static bool
 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 &&
-			strcmp(nextWALFileName + strlen(nextWALFileName) - strlen(".backup"),
-				   ".backup") == 0)
+		strcmp(nextWALFileName + strlen(nextWALFileName) - strlen(".backup"),
+			   ".backup") == 0)
 		{
 			nextWALFileType = XLOG_BACKUP_LABEL;
-   			return true;
+			return true;
 		}
-		else
-			if (stat_buf.st_size == XLOG_SEG_SIZE)
-			{
+		else if (stat_buf.st_size == XLOG_SEG_SIZE)
+		{
 #ifdef WIN32
-				/*
-				 * Windows reports that the file has the right number of bytes
-				 * even though the file is still being copied and cannot be
-				 * opened by pg_standby yet. So we wait for sleeptime secs
-				 * before attempting to restore. If that is not enough, we
-				 * will rely on the retry/holdoff mechanism.
-				 */
-			    pg_usleep(sleeptime * 1000000L);
+
+			/*
+			 * Windows reports that the file has the right number of bytes
+			 * even though the file is still being copied and cannot be opened
+			 * by pg_standby yet. So we wait for sleeptime secs before
+			 * attempting to restore. If that is not enough, we will rely on
+			 * the retry/holdoff mechanism.
+			 */
+			pg_usleep(sleeptime * 1000000L);
 #endif
-				nextWALFileType = XLOG_DATA;
-				return true;
-			}
+			nextWALFileType = XLOG_DATA;
+			return true;
+		}
 
 		/*
 		 * If still too small, wait until it is the correct size
@@ -190,10 +196,10 @@ CustomizableNextWALFileReady()
 		{
 			if (debug)
 			{
-			  	fprintf(stderr, "file size greater than expected\n");
+				fprintf(stderr, "file size greater than expected\n");
 				fflush(stderr);
 			}
-			exit(3); 
+			exit(3);
 		}
 	}
 
@@ -205,78 +211,69 @@ CustomizableNextWALFileReady()
 static void
 CustomizableCleanupPriorWALFiles(void)
 {
-	uint32			tli,
-					log,
-					seg;
-	int				signed_log = 0;
-
-	if (keepfiles > 0)
-	{
-		sscanf(nextWALFileName, "%08X%08X%08X", &tli, &log, &seg);
-		signed_log = log - (keepfiles / MaxSegmentsPerLogFile);
-		if (keepfiles <= seg)
-			seg -= keepfiles;
-		else
-		{
-			seg = MaxSegmentsPerLogFile - (keepfiles % MaxSegmentsPerLogFile);			
-			signed_log--;	
-		}
-		log = (uint32) signed_log;
-	}
-
 	/*
 	 * Work out name of prior file from current filename
 	 */
-	if (keepfiles > 0 && signed_log >= 0 && nextWALFileType == XLOG_DATA)
+	if (nextWALFileType == XLOG_DATA)
 	{
-		int 			rc;
-		DIR				*xldir;
-		struct dirent	*xlde;
-
-		XLogFileName(inclusiveCleanupFileName, tli, log, seg);
+		int			rc;
+		DIR		   *xldir;
+		struct dirent *xlde;
 
 		/*
-		 * Assume its 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.
+		 * 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.
 		 */
 		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 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 inclusiveCleanupFileName file.
+				 * 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, inclusiveCleanupFileName + 8) <= 0)
+				  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
-					rc = unlink(WALFilePath);
 
 					if (debug)
-					   	fprintf(stderr, "\npg_standby: removed \"%s\"\n", WALFilePath);
+						fprintf(stderr, "\nremoving \"%s\"", WALFilePath);
+
+					rc = unlink(WALFilePath);
+					if (rc != 0)
+					{
+						fprintf(stderr, "\npg_standby: ERROR failed to remove \"%s\": %s",
+								WALFilePath, strerror(errno));
+						break;
+					}
 				}
 			}
+			if (debug)
+				fprintf(stderr, "\n");
 		}
 		else
-		   	fprintf(stderr, "pg_standby: archiveLocation \"%s\" open error\n", archiveLocation);
+			fprintf(stderr, "pg_standby: archiveLocation \"%s\" open error\n", archiveLocation);
 
 		closedir(xldir);
+		fflush(stderr);
 	}
-	fflush(stderr);
 }
 
 /* =====================================================================
@@ -284,40 +281,106 @@ CustomizableCleanupPriorWALFiles(void)
  * =====================================================================
  */
 
+/*
+ * SetWALFileNameForCleanup()
+ *
+ *	  Set the earliest WAL filename that we want to keep on the archive
+ *	  and decide whether we need_cleanup
+ */
+static bool
+SetWALFileNameForCleanup(void)
+{
+	uint32		tli = 1,
+				log = 0,
+				seg = 0;
+	uint32		log_diff = 0,
+				seg_diff = 0;
+	bool		cleanup = false;
+
+	if (restartWALFileName)
+	{
+		/*
+		 * Don't do cleanup if the restartWALFileName provided
+		 * is later than the xlog file requested. This is an error
+		 * and we must not remove these files from archive.
+		 * This shouldn't happen, but better safe than sorry.
+		 */
+		if (strcmp(restartWALFileName, nextWALFileName) > 0)
+			return false;
+
+		strcpy(exclusiveCleanupFileName, restartWALFileName);
+		return true;
+	}
+
+	if (keepfiles > 0)
+	{
+		sscanf(nextWALFileName, "%08X%08X%08X", &tli, &log, &seg);
+		if (tli > 0 && log >= 0 && seg > 0)
+		{
+			log_diff = keepfiles / MaxSegmentsPerLogFile;
+			seg_diff = keepfiles % MaxSegmentsPerLogFile;
+			if (seg_diff > seg)
+			{
+				log_diff++;
+				seg = MaxSegmentsPerLogFile - (seg_diff - seg);
+			}
+			else
+				seg -= seg_diff;
+
+			if (log >= log_diff)
+			{
+				log -= log_diff;
+				cleanup = true;
+			}
+			else
+			{
+				log = 0;
+				seg = 0;
+			}
+		}
+	}
+
+	XLogFileName(exclusiveCleanupFileName, tli, log, seg);
+
+	return cleanup;
+}
+
 /*
  * CheckForExternalTrigger()
- * 
+ *
  *	  Is there a trigger file?
  */
-static bool 
+static bool
 CheckForExternalTrigger(void)
 {
-	int rc;
+	int			rc;
 
 	/*
-	 *  Look for a trigger file, if that option has been selected
+	 * Look for a trigger file, if that option has been selected
 	 *
-	 *  We use stat() here because triggerPath is always a file
-	 *  rather than potentially being in an archive
+	 * We use stat() here because triggerPath is always a file rather than
+	 * potentially being in an archive
 	 */
 	if (triggerPath && stat(triggerPath, &stat_buf) == 0)
 	{
-	   	fprintf(stderr, "trigger file found\n");
+		fprintf(stderr, "trigger file found\n");
 		fflush(stderr);
 
 		/*
-		 * If trigger file found, we *must* delete it. Here's why:
-		 * When recovery completes, we will be asked again
-		 * for the same file from the archive using pg_standby
-		 * so must remove trigger file so we can reload file again
-		 * and come up correctly.
+		 * If trigger file found, we *must* delete it. Here's why: When
+		 * recovery completes, we will be asked again for the same file from
+		 * the archive using pg_standby so must remove trigger file so we can
+		 * reload file again and come up correctly.
+		 *
+		 * If it fails, return with an exit code that the server will treat
+		 * as a FATAL error.
 		 */
 		rc = unlink(triggerPath);
 		if (rc != 0)
 		{
-			fprintf(stderr, "\n ERROR: unable to remove \"%s\", rc=%d", triggerPath, rc);
+			fprintf(stderr, "\n ERROR: could not remove \"%s\": %s", triggerPath, strerror(errno));
 			fflush(stderr);
-			exit(rc);
+			exit(200);
 		}
 		return true;
 	}
@@ -327,14 +390,14 @@ CheckForExternalTrigger(void)
 
 /*
  * RestoreWALFileForRecovery()
- * 
+ *
  *	  Perform the action required to restore the file from archive
  */
 static bool
 RestoreWALFileForRecovery(void)
 {
-	int rc = 0;
-	int numretries = 0;
+	int			rc = 0;
+	int			numretries = 0;
 
 	if (debug)
 	{
@@ -342,19 +405,19 @@ RestoreWALFileForRecovery(void)
 		fflush(stderr);
 	}
 
-	while (numretries < maxretries)
+	while (numretries <= maxretries)
 	{
 		rc = system(restoreCommand);
 		if (rc == 0)
 		{
 			if (debug)
 			{
-				fprintf(stderr, " success\n");
+				fprintf(stderr, " OK");
 				fflush(stderr);
 			}
 			return true;
 		}
-        pg_usleep(numretries++ * sleeptime * 1000000L);
+		pg_usleep(numretries++ * sleeptime * 1000000L);
 	}
 
 	/*
@@ -366,42 +429,68 @@ RestoreWALFileForRecovery(void)
 }
 
 static void
-usage()
+usage(void)
 {
 	fprintf(stderr, "\npg_standby allows Warm Standby servers to be configured\n");
 	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "  pg_standby [OPTION]... [ARCHIVELOCATION] [NEXTWALFILE] [XLOGFILEPATH]\n");
-	fprintf(stderr, "						  note space between [ARCHIVELOCATION] and [NEXTWALFILE]\n");
-	fprintf(stderr, "with main intended use via restore_command in the recovery.conf\n");
-	fprintf(stderr, "	 restore_command = 'pg_standby [OPTION]... [ARCHIVELOCATION] %%f %%p'\n");
-	fprintf(stderr, "e.g. restore_command = 'pg_standby -l -u /mnt/server/archiverdir %%f %%p'\n");
+	fprintf(stderr, "  pg_standby [OPTION]... ARCHIVELOCATION NEXTWALFILE XLOGFILEPATH [RESTARTWALFILE]\n");
+	fprintf(stderr, "				note space between ARCHIVELOCATION and NEXTWALFILE\n");
+	fprintf(stderr, "with main intended use as a restore_command in the recovery.conf\n");
+	fprintf(stderr, "	 restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n");
+	fprintf(stderr, "e.g. restore_command = 'pg_standby -l /mnt/server/archiverdir %%f %%p %%r'\n");
 	fprintf(stderr, "\nOptions:\n");
 	fprintf(stderr, "  -c			copies file from archive (default)\n");
 	fprintf(stderr, "  -d			generate lots of debugging output (testing only)\n");
-	fprintf(stderr, "  -k [NUMFILESTOKEEP]	keeps history of # files in archives; unlinks/removes files beyond that\n");
+	fprintf(stderr, "  -k NUMFILESTOKEEP	if RESTARTWALFILE not used, removes files prior to limit (0 keeps all)\n");
 	fprintf(stderr, "  -l			links into archive (leaves file in archive)\n");
-	fprintf(stderr, "  -t [TRIGGERFILE]	defines a trigger file to initiate failover (no default)\n");
-	fprintf(stderr, "  -r [MAXRETRIES]	maximum number of times to retry, with progressive wait (default=3)\n");
-	fprintf(stderr, "  -s [SLEEPTIME]	number of seconds to wait between file checks (default=5)\n");
-	fprintf(stderr, "  -w [MAXWAITTIME]	max number of seconds to wait for a file (0 disables)(default=0)\n");
+	fprintf(stderr, "  -r MAXRETRIES		max number of times to retry, with progressive wait (default=3)\n");
+	fprintf(stderr, "  -s SLEEPTIME		seconds to wait between file checks (min=1, max=60, default=5)\n");
+	fprintf(stderr, "  -t TRIGGERFILE	defines a trigger file to initiate failover (no default)\n");
+	fprintf(stderr, "  -w MAXWAITTIME	max seconds to wait for a file (0=no limit)(default=0)\n");
 	fflush(stderr);
 }
 
+#ifndef WIN32
 static void
 sighandler(int sig)
 {
-	triggered = true;
 	signaled = true;
 }
 
+/* We don't want SIGQUIT to core dump */
+static void
+sigquit_handler(int sig)
+{
+	signal(SIGINT, SIG_DFL);
+	kill(getpid(), SIGINT);
+}
+#endif
+
 /*------------ MAIN ----------------------------------------*/
-int 
+int
 main(int argc, char **argv)
 {
 	int			c;
 
-	(void) signal(SIGINT,   sighandler);
-	(void) signal(SIGQUIT,  sighandler);
+#ifndef WIN32
+	/*
+	 * You can send SIGUSR1 to trigger failover.
+	 *
+	 * Postmaster uses SIGQUIT to request immediate shutdown. The default
+	 * action is to core dump, but we don't want that, so trap it and
+	 * commit suicide without core dump.
+	 *
+	 * We used to use SIGINT and SIGQUIT to trigger failover, but that
+	 * turned 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 */
+	(void) signal(SIGQUIT, sigquit_handler);
+#endif
 
 	while ((c = getopt(argc, argv, "cdk:lr:s:t:w:")) != -1)
 	{
@@ -415,9 +504,9 @@ main(int argc, char **argv)
 				break;
 			case 'k':			/* keepfiles */
 				keepfiles = atoi(optarg);
-				if (keepfiles <= 0)
+				if (keepfiles < 0)
 				{
-					fprintf(stderr, "usage: pg_standby -k keepfiles must be > 0\n");
+					fprintf(stderr, "usage: pg_standby -k keepfiles must be >= 0\n");
 					usage();
 					exit(2);
 				}
@@ -429,7 +518,7 @@ main(int argc, char **argv)
 				maxretries = atoi(optarg);
 				if (maxretries < 0)
 				{
-					fprintf(stderr, "usage: pg_standby -r maxretries must be > 0\n");
+					fprintf(stderr, "usage: pg_standby -r maxretries must be >= 0\n");
 					usage();
 					exit(2);
 				}
@@ -446,8 +535,8 @@ main(int argc, char **argv)
 			case 't':			/* Trigger file */
 				triggerPath = optarg;
 				if (CheckForExternalTrigger())
-					exit(1);	 /* Normal exit, with non-zero */
-   				break;
+					exit(1);	/* Normal exit, with non-zero */
+				break;
 			case 'w':			/* Max wait time */
 				maxwaittime = atoi(optarg);
 				if (maxwaittime < 0)
@@ -464,7 +553,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	/* 
+	/*
 	 * Parameter checking - after checking to see if trigger file present
 	 */
 	if (argc == 1)
@@ -475,8 +564,8 @@ main(int argc, char **argv)
 
 	/*
 	 * We will go to the archiveLocation to get nextWALFileName.
-	 * nextWALFileName may not exist yet, which would not be an error,
-	 * so we separate the archiveLocation and nextWALFileName so we can check
+	 * nextWALFileName may not exist yet, which would not be an error, so we
+	 * separate the archiveLocation and nextWALFileName so we can check
 	 * separately whether archiveLocation exists, if not that is an error
 	 */
 	if (optind < argc)
@@ -486,7 +575,7 @@ main(int argc, char **argv)
 	}
 	else
 	{
-	   	fprintf(stderr, "pg_standby: must specify archiveLocation\n");
+		fprintf(stderr, "pg_standby: must specify archiveLocation\n");
 		usage();
 		exit(2);
 	}
@@ -498,7 +587,7 @@ main(int argc, char **argv)
 	}
 	else
 	{
-	   	fprintf(stderr, "pg_standby: use %%f to specify nextWALFileName\n");
+		fprintf(stderr, "pg_standby: use %%f to specify nextWALFileName\n");
 		usage();
 		exit(2);
 	}
@@ -510,28 +599,37 @@ main(int argc, char **argv)
 	}
 	else
 	{
-	   	fprintf(stderr, "pg_standby: use %%p to specify xlogFilePath\n");
+		fprintf(stderr, "pg_standby: use %%p to specify xlogFilePath\n");
 		usage();
 		exit(2);
 	}
 
+	if (optind < argc)
+	{
+		restartWALFileName = argv[optind];
+		optind++;
+	}
+
 	CustomizableInitialize();
 
+	need_cleanup = SetWALFileNameForCleanup();
+
 	if (debug)
 	{
-        fprintf(stderr, "\nTrigger file 		: %s", triggerPath ? triggerPath : "<not set>");
-	   	fprintf(stderr, "\nWaiting for WAL file	: %s", WALFilePath);
-	   	fprintf(stderr, "\nWAL file path		: %s", nextWALFileName);
-	   	fprintf(stderr, "\nRestoring to...		: %s", xlogFilePath);
-	   	fprintf(stderr, "\nSleep interval		: %d second%s", 
-					sleeptime, (sleeptime > 1 ? "s" : " "));
-	   	fprintf(stderr, "\nMax wait interval	: %d %s", 
-					maxwaittime, (maxwaittime > 0 ? "seconds" : "forever"));
+		fprintf(stderr, "\nTrigger file 		: %s", triggerPath ? triggerPath : "<not set>");
+		fprintf(stderr, "\nWaiting for WAL file	: %s", nextWALFileName);
+		fprintf(stderr, "\nWAL file path		: %s", WALFilePath);
+		fprintf(stderr, "\nRestoring to...		: %s", xlogFilePath);
+		fprintf(stderr, "\nSleep interval		: %d second%s",
+				sleeptime, (sleeptime > 1 ? "s" : " "));
+		fprintf(stderr, "\nMax wait interval	: %d %s",
+				maxwaittime, (maxwaittime > 0 ? "seconds" : "forever"));
 		fprintf(stderr, "\nCommand for restore	: %s", restoreCommand);
-		if (keepfiles > 0)
-			fprintf(stderr, "\nNum archived files kept	: last %d files", keepfiles);
+		fprintf(stderr, "\nKeep archive history	: ");
+		if (need_cleanup)
+			fprintf(stderr, "%s and later", exclusiveCleanupFileName);
 		else
-			fprintf(stderr, "\nNum archived files kept	: all files");
+			fprintf(stderr, "No cleanup required");
 		fflush(stderr);
 	}
 
@@ -558,61 +656,61 @@ main(int argc, char **argv)
 		}
 	}
 
-	/* 
+	/*
 	 * Main wait loop
 	 */
 	while (!CustomizableNextWALFileReady() && !triggered)
 	{
 		if (sleeptime <= 60)
-	        pg_usleep(sleeptime * 1000000L);
+			pg_usleep(sleeptime * 1000000L);
 
+#ifndef WIN32
 		if (signaled)
 		{
+			triggered = true;
 			if (debug)
 			{
-			   	fprintf(stderr, "\nsignaled to exit\n");
+				fprintf(stderr, "\nsignaled to exit\n");
 				fflush(stderr);
 			}
 		}
 		else
+#endif
 		{
 
 			if (debug)
 			{
-			   	fprintf(stderr, "\nWAL file not present yet.");
+				fprintf(stderr, "\nWAL file not present yet.");
 				if (triggerPath)
-				   	fprintf(stderr, " Checking for trigger file...");
+					fprintf(stderr, " Checking for trigger file...");
 				fflush(stderr);
 			}
 
 			waittime += sleeptime;
-			
+
 			if (!triggered && (CheckForExternalTrigger() || (waittime >= maxwaittime && maxwaittime > 0)))
 			{
 				triggered = true;
 				if (debug && waittime >= maxwaittime && maxwaittime > 0)
-				   	fprintf(stderr, "\nTimed out after %d seconds\n",waittime);
+					fprintf(stderr, "\nTimed out after %d seconds\n", waittime);
 			}
 		}
 	}
 
-	/* 
-	 * Action on exit 
+	/*
+	 * Action on exit
 	 */
 	if (triggered)
-		exit(1);			/* Normal exit, with non-zero */
-	else
-	{
-		/* 
-		 * Once we have restored this file successfully we
-		 * can remove some prior WAL files.
-		 * If this restore fails we musn't remove any
-		 * file because some of them will be requested again
-		 * immediately after the failed restore, or when
-		 * we restart recovery.
-		 */
-		if (RestoreWALFileForRecovery())
-			CustomizableCleanupPriorWALFiles();
-		exit(0);
-	}
+		exit(1);				/* Normal exit, with non-zero */
+
+	/*
+	 * Once we have restored this file successfully we can remove some prior
+	 * WAL files. If this restore fails we musn't remove any file because some
+	 * of them will be requested again immediately after the failed restore,
+	 * or when we restart recovery.
+	 */
+	if (RestoreWALFileForRecovery() && need_cleanup)
+		CustomizableCleanupPriorWALFiles();
+
+	return 0;
 }
diff --git a/contrib/pg_trgm/.gitignore b/contrib/pg_trgm/.gitignore
new file mode 100644
index 000000000000..9cda826ca43f
--- /dev/null
+++ b/contrib/pg_trgm/.gitignore
@@ -0,0 +1,3 @@
+/pg_trgm.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h
index 5a8d2e362a77..b8fb7cb0c4d0 100644
--- a/contrib/pg_trgm/trgm.h
+++ b/contrib/pg_trgm/trgm.h
@@ -28,6 +28,14 @@ typedef char trgm[3];
 	*(((char*)(a))+2) = *(((char*)(b))+2);	\
 } while(0);
 
+uint32		trgm2int(trgm *ptr);
+
+#ifdef KEEPONLYALNUM
+#define ISPRINTABLECHAR(a)	( isascii( *(unsigned char*)(a) ) && (isalnum( *(unsigned char*)(a) ) || *(unsigned char*)(a)==' ') )
+#else
+#define ISPRINTABLECHAR(a)	( isascii( *(unsigned char*)(a) ) && isprint( *(unsigned char*)(a) ) )
+#endif
+#define ISPRINTABLETRGM(t)	( ISPRINTABLECHAR( ((char*)t) ) && ISPRINTABLECHAR( ((char*)t)+1 ) && ISPRINTABLECHAR( ((char*)t)+2 ) )
 #define TRGMINT(a) ( (*(((char*)(a))+2)<<16)+(*(((char*)(a))+1)<<8)+*(((char*)(a))+0) )
 
 typedef struct
diff --git a/contrib/pgbench/.gitignore b/contrib/pgbench/.gitignore
index 929a08fea0c7..489a2d62d068 100644
--- a/contrib/pgbench/.gitignore
+++ b/contrib/pgbench/.gitignore
@@ -1 +1 @@
-pgbench
+/pgbench
diff --git a/contrib/pgcrypto/.gitignore b/contrib/pgcrypto/.gitignore
index d7bfb2059cce..078157c95296 100644
--- a/contrib/pgcrypto/.gitignore
+++ b/contrib/pgcrypto/.gitignore
@@ -2,7 +2,8 @@ libpgcrypto.a
 libpgcrypto.so
 libpgcrypto.so.0
 libpgcrypto.so.0.0
-pgcrypto.sql
 log
-results
 tmp_check
+/pgcrypto.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/pgcrypto/README.pgcrypto b/contrib/pgcrypto/README.pgcrypto
deleted file mode 100755
index e7aaceaf8f73..000000000000
--- a/contrib/pgcrypto/README.pgcrypto
+++ /dev/null
@@ -1,724 +0,0 @@
-pgcrypto - cryptographic functions for PostgreSQL
-=================================================
-Marko Kreen <markokr@gmail.com>
-
-// Note: this document is in asciidoc format.
-
-
-1.  Installation
------------------
-
-// Note: These installation instructions assume you have obtained a
-   precompiled build of pgcrypto from Greenplum.
-
-1. Unzip and untar the pgcrypto package. For example:
-
-   unzip greenplum-pgcrypto-<version>-<platform>.tar.zip
-   mkdir pgcrypto
-   mv greenplum-pgcrypto-<version>-<platform>.tar pgcrypto
-   untar -xvf pgcryto/greenplum-pgcrypto-<version>-<platform>.tar 
-
-2. Copy the pgcrypto.so file to your Greenplum installation's
-   library directory. 
-
-   cp pgcrypto/lib/postgresql/pgcrypto.so $GPHOME/lib/postgresql
-
-3. (optional) Edit the pgcrypto.sql file and edit the initial 
-   SET command that specifies the schema where the pgcrypto
-   objects will be created. By default they will be created in
-   the 'public' schema. For example:
-
-    vi pgcrypto/share/postgresql/contrib/pgcrypto.sql
-     
-      SET search_path = YOUR_SCHEMA;
-
-4. Run the commands in the pgcrypto.sql file using psql to 
-   install the pgcrypto objects in your database. For example:
-
-    psql -d DBNAME -f pgcrypto/share/postgresql/contrib/pgcrypto.sql
-
-
-// Note: To uninstall the pgcrypto objects, use uninstall_pgcrypto.sql
-
-
-2.  Notes
-----------
-
-2.1.  Configuration
-~~~~~~~~~~~~~~~~~~~~
-
-Greenplum's build of pgcrypto is compiled with zlib and
-OpenSSL linked in.
-
-When compiled with zlib, PGP encryption functions are able to
-compress data before encrypting.
-
-When compiled with OpenSSL there will be more algorithms available.
-Also public-key encryption functions will be faster as OpenSSL
-has more optimized BIGNUM functions.
-
-Summary of functionality with and without OpenSSL:
-
-`----------------------------`---------`------------
- Functionality                built-in   OpenSSL
-----------------------------------------------------
- MD5                          yes       yes
- SHA1                         yes       yes
- SHA224/256/384/512           yes       yes (3)
- Any other digest algo        no        yes (1)
- Blowfish                     yes       yes
- AES                          yes       yes (2)
- DES/3DES/CAST5               no        yes
- Raw encryption               yes       yes
- PGP Symmetric encryption     yes       yes
- PGP Public-Key encryption    yes       yes
-----------------------------------------------------
-
-1. Any digest algorithm OpenSSL supports is automatically picked up.
-   This is not possible with ciphers, which need to be supported
-   explicitly.
-
-2. AES is included in OpenSSL since version 0.9.7.  If pgcrypto is
-   compiled against older version, it will use built-in AES code,
-   so it has AES always available.
-
-3. SHA2 algorithms were added to OpenSSL in version 0.9.8.  For
-   older versions, pgcrypto will use built-in code.
-
-
-2.2.  NULL handling
-~~~~~~~~~~~~~~~~~~~~
-
-As standard in SQL, all functions return NULL, if any of the arguments
-are NULL.  This may create security risks on careless usage.
-
-
-2.3.  Security
-~~~~~~~~~~~~~~~
-
-All the functions here run inside database server.  That means that all
-the data and passwords move between pgcrypto and client application in
-clear-text.  Thus you must:
-
-1.  Connect locally or use SSL connections.
-2.  Trust both system and database administrator.
-
-If you cannot, then better do crypto inside client application.
-
-
-3.  General hashing
---------------------
-
-3.1.  digest(data, type)
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  digest(data text, type text) RETURNS bytea
-  digest(data bytea, type text) RETURNS bytea
-
-Type is here the algorithm to use.  Standard algorithms are `md5` and
-`sha1`, although there may be more supported, depending on build
-options.
-
-Returns binary hash.
-
-If you want hexadecimal string, use `encode()` on result.  Example:
-
-    CREATE OR REPLACE FUNCTION sha1(bytea) RETURNS text AS $$
-      SELECT encode(digest($1, 'sha1'), 'hex')
-    $$ LANGUAGE SQL STRICT IMMUTABLE;
-
-
-3.2.  hmac(data, key, type)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  hmac(data text, key text, type text) RETURNS bytea
-  hmac(data bytea, key text, type text) RETURNS bytea
-
-Calculates Hashed MAC over data.  `type` is the same as in `digest()`.
-If the key is larger than hash block size it will first hashed and the
-hash will be used as key.
-
-It is similar to digest() but the hash can be recalculated only knowing
-the key.  This avoids the scenario of someone altering data and also
-changing the hash.
-
-Returns binary hash.
-
-
-
-4.  Password hashing
----------------------
-
-The functions `crypt()` and `gen_salt()` are specifically designed
-for hashing passwords.  `crypt()` does the hashing and `gen_salt()`
-prepares algorithm parameters for it.
-
-The algorithms in `crypt()` differ from usual hashing algorithms like
-MD5 or SHA1 in following respects:
-
-1. They are slow.  As the amount of data is so small, this is only
-   way to make brute-forcing passwords hard.
-2. Include random 'salt' with result, so that users having same
-   password would have different crypted passwords.  This is also
-   additional defense against reversing the algorithm.
-3. Include algorithm type in the result, so passwords hashed with
-   different algorithms can co-exist.
-4. Some of them are adaptive - that means after computers get
-   faster, you can tune the algorithm to be slower, without
-   introducing incompatibility with existing passwords.
-
-Supported algorithms:
-`------`-------------`---------`----------`---------------------------
- Type   Max password  Adaptive  Salt bits  Description
-----------------------------------------------------------------------
-`bf`     72           yes         128      Blowfish-based, variant 2a
-`md5`    unlimited    no           48      md5-based crypt()
-`xdes`   8            yes          24      Extended DES
-`des`    8            no           12      Original UNIX crypt
-----------------------------------------------------------------------
-
-
-4.1.  crypt(password, salt)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  crypt(password text, salt text) RETURNS text
-
-Calculates UN*X crypt(3) style hash of password.  When storing new
-password, you need to use function `gen_salt()` to generate new salt.
-When checking password you should use existing hash as salt.
-
-Example - setting new password:
-
-    UPDATE .. SET pswhash = crypt('new password', gen_salt('md5'));
-
-Example - authentication:
-
-    SELECT pswhash = crypt('entered password', pswhash) WHERE .. ;
-
-returns true or false whether the entered password is correct.
-It also can return NULL if `pswhash` field is NULL.
-
-
-4.2.  gen_salt(type)
-~~~~~~~~~~~~~~~~~~~~~
-
-  gen_salt(type text) RETURNS text
-
-Generates a new random salt for usage in `crypt()`.  For adaptible
-algorithms, it uses the default iteration count.
-
-Accepted types are: `des`, `xdes`, `md5` and `bf`.
-
-
-4.3.  gen_salt(type, rounds)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  gen_salt(type text, rounds integer) RETURNS text
-
-Same as above, but lets user specify iteration count for some
-algorithms.  The higher the count, the more time it takes to hash
-the password and therefore the more time to break it.  Although with
-too high count the time to calculate a hash may be several years
-- which is somewhat impractical.
-
-Number is algorithm specific:
-
-`-----'---------'-----'----------
- type   default   min   max
----------------------------------
- `xdes`     725     1   16777215
- `bf`         6     4         31
----------------------------------
-
-In case of xdes there is a additional limitation that the count must be
-a odd number.
-
-Notes:
-
-- Original DES crypt was designed to have the speed of 4 hashes per
-  second on the hardware of that time.
-- Slower than 4 hashes per second would probably dampen usability.
-- Faster than 100 hashes per second is probably too fast.
-- See next section about possible values for `crypt-bf`.
-
-
-4.4.  Comparison of crypt and regular hashes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Here is a table that should give overview of relative slowness
-of different hashing algorithms.
-
-* The goal is to crack a 8-character password, which consists:
-  1.  Only of lowercase letters
-  2.  Numbers, lower- and uppercase letters.
-* The table below shows how much time it would take to try all
-  combinations of characters.
-* The `crypt-bf` is featured in several settings - the number
-  after slash is the `rounds` parameter of `gen_salt()`.
-
-`------------'----------'--------------'--------------------
-Algorithm     Hashes/sec  Chars: [a-z]   Chars: [A-Za-z0-9]
-------------------------------------------------------------
-crypt-bf/8            28     246 years         251322 years
-crypt-bf/7            57     121 years         123457 years
-crypt-bf/6           112      62 years          62831 years
-crypt-bf/5           211      33 years          33351 years
-crypt-md5           2681     2.6 years           2625 years
-crypt-des         362837        7 days             19 years
-sha1              590223        4 days             12 years
-md5              2345086         1 day              3 years
-------------------------------------------------------------
-
-* The machine used is 1.5GHz Pentium 4.
-* crypt-des and crypt-md5 algorithm numbers are taken from
-  John the Ripper v1.6.38 `-test` output.
-* MD5 numbers are from mdcrack 1.2.
-* SHA1 numbers are from lcrack-20031130-beta.
-* `crypt-bf` numbers are taken using simple program that loops
-  over 1000 8-character passwords.  That way I can show the speed with
-  different number of rounds.  For reference: `john -test` shows 213
-  loops/sec for crypt-bf/5.  (The small difference in results is in
-  accordance to the fact that the `crypt-bf` implementation in pgcrypto
-  is same one that is used in John the Ripper.)
-
-Note that "try all combinations" is not a realistic exercise.
-Usually password cracking is done with the help of dictionaries, which
-contain both regular words and various mutations of them.  So, even
-somewhat word-like passwords could be cracked much faster than the above
-numbers suggest, and a 6-character non-word like password may escape
-cracking.  Or not.
-
-
-5.  PGP encryption
--------------------
-
-The functions here implement the encryption part of OpenPGP (RFC2440)
-standard.   Supported are both symmetric-key and public-key encryption.
-
-
-5.1.  Overview
-~~~~~~~~~~~~~~~
-
-Encrypted PGP message consists of 2 packets:
-
-- Packet for session key - either symmetric- or public-key encrypted.
-- Packet for session-key encrypted data.
-
-When encrypting with password:
-
-1. Given password is hashed using String2Key (S2K) algorithm.  This
-   is rather similar to `crypt()` algorithm - purposefully slow
-   and with random salt - but it produces a full-length binary key.
-2. If separate session key is requested, new random key will be
-   generated.  Otherwise S2K key will be used directly as session key.
-3. If S2K key is to be used directly, then only S2K settings will be put
-   into session key packet.  Otherwise session key will be encrypted with
-   S2K key and put into session key packet.
-
-When encrypting with public key:
-
-1. New random session key is generated.
-2. It is encrypted using public key and put into session key packet.
-
-Now common part, the session-key encrypted data packet:
-
-1. Optional data-manipulation: compression, conversion to UTF-8,
-   conversion of line-endings.
-2. Data is prefixed with block of random bytes.  This is equal
-   to using random IV.
-3. A SHA1 hash of random prefix and data is appended.
-4. All this is encrypted with session key.
-
-
-5.2.  pgp_sym_encrypt(data, psw)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  pgp_sym_encrypt(data text, psw text [, options text] ) RETURNS bytea
-  pgp_sym_encrypt_bytea(data bytea, psw text [, options text] ) RETURNS bytea
-
-Return a symmetric-key encrypted PGP message.
-
-Options are described in section 5.8.
-
-
-5.3. pgp_sym_decrypt(msg, psw)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  pgp_sym_decrypt(msg bytea, psw text [, options text] ) RETURNS text
-  pgp_sym_decrypt_bytea(msg bytea, psw text [, options text] ) RETURNS bytea
-
-Decrypt a symmetric-key encrypted PGP message.
-
-Decrypting bytea data with `pgp_sym_decrypt` is disallowed.
-This is to avoid outputting invalid character data.  Decrypting
-originally textual data with `pgp_sym_decrypt_bytea` is fine.
-
-Options are described in section 5.8.
-
-
-5.4.  pgp_pub_encrypt(data, pub_key)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  pgp_pub_encrypt(data text, key bytea [, options text] ) RETURNS bytea
-  pgp_pub_encrypt_bytea(data bytea, key bytea [, options text] ) RETURNS bytea
-
-Encrypt data with a public key.  Giving this function a secret key will
-produce a error.
-
-Options are described in section 5.8.
-
-
-5.5.  pgp_pub_decrypt(msg, sec_key [, psw])
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  pgp_pub_decrypt(msg bytea, key bytea [, psw text [, options text]] ) \
-  RETURNS text
-  pgp_pub_decrypt_bytea(msg bytea, key bytea [,psw text [, options text]] ) \
-  RETURNS bytea
-
-Decrypt a public-key encrypted message with secret key.  If the secret
-key is password-protected, you must give the password in `psw`.  If
-there is no password, but you want to specify option for function, you
-need to give empty password.
-
-Decrypting bytea data with `pgp_pub_decrypt` is disallowed.
-This is to avoid outputting invalid character data.  Decrypting
-originally textual data with `pgp_pub_decrypt_bytea` is fine.
-
-Options are described in section 5.8.
-
-
-5.6.  pgp_key_id(key / msg)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  pgp_key_id(key or msg bytea) RETURNS text
-
-It shows you either key ID if given PGP public or secret key.  Or it
-gives the key ID that was used for encrypting the data, if given
-encrypted message.
-
-It can return 2 special key IDs:
-
-SYMKEY::
-   The data is encrypted with symmetric key.
-
-ANYKEY::
-   The data is public-key encrypted, but the key ID is cleared.
-   That means you need to try all your secret keys on it to see
-   which one decrypts it.  pgcrypto itself does not produce such
-   messages.
-
-Note that different keys may have same ID.   This is rare but normal
-event.  Client application should then try to decrypt with each one,
-to see which fits - like handling ANYKEY.
-
-
-5.7.  armor / dearmor
-~~~~~~~~~~~~~~~~~~~~~~
-
-  armor(data bytea) RETURNS text
-  dearmor(data text) RETURNS bytea
-
-Those wrap/unwrap data into PGP Ascii Armor which is basically Base64
-with CRC and additional formatting.
-
-
-5.8.  Options for PGP functions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Options are named to be similar to GnuPG.  Values should be given after
-an equal sign; separate options from each other with commas.  Example:
-
-  pgp_sym_encrypt(data, psw, 'compress-algo=1, cipher-algo=aes256')
-
-All of the options except `convert-crlf` apply only to encrypt
-functions.  Decrypt functions get the parameters from PGP data.
-
-Most interesting options are probably `compression-algo` and
-`unicode-mode`.  The rest should have reasonable defaults.
-
-
-cipher-algo::
-  What cipher algorithm to use.
-
-  Values: bf, aes128, aes192, aes256 (OpenSSL-only: `3des`, `cast5`)
-  Default: aes128
-  Applies: pgp_sym_encrypt, pgp_pub_encrypt
-
-compress-algo::
-  Which compression algorithm to use.  Needs building with zlib.
-
-  Values:
-    0 - no compression
-    1 - ZIP compression
-    2 - ZLIB compression [=ZIP plus meta-data and block-CRC's]
-  Default: 0
-  Applies: pgp_sym_encrypt, pgp_pub_encrypt
-
-compress-level::
-  How much to compress.  Bigger level compresses smaller but is slower.
-  0 disables compression.
-
-  Values: 0, 1-9
-  Default: 6
-  Applies: pgp_sym_encrypt, pgp_pub_encrypt
-
-convert-crlf::
-  Whether to convert `\n` into `\r\n` when encrypting and `\r\n` to `\n`
-  when decrypting.  RFC2440 specifies that text data should be stored
-  using `\r\n` line-feeds.  Use this to get fully RFC-compliant
-  behavior.
-
-  Values: 0, 1
-  Default: 0
-  Applies: pgp_sym_encrypt, pgp_pub_encrypt, pgp_sym_decrypt, pgp_pub_decrypt
-
-disable-mdc::
-  Do not protect data with SHA-1.  Only good reason to use this
-  option is to achieve compatibility with ancient PGP products, as the
-  SHA-1 protected packet is from upcoming update to RFC2440.  (Currently
-  at version RFC2440bis-14.) Recent gnupg.org and pgp.com software
-  supports it fine.
-
-  Values: 0, 1
-  Default: 0
-  Applies: pgp_sym_encrypt, pgp_pub_encrypt
-
-enable-session-key::
-  Use separate session key.  Public-key encryption always uses separate
-  session key, this is for symmetric-key encryption, which by default
-  uses S2K directly.
-
-  Values: 0, 1
-  Default: 0
-  Applies: pgp_sym_encrypt
-
-s2k-mode::
-  Which S2K algorithm to use.
-
-  Values:
-    0 - Without salt.  Dangerous!
-    1 - With salt but with fixed iteration count.
-    3 - Variable iteration count.
-  Default: 3
-  Applies: pgp_sym_encrypt
-
-s2k-digest-algo::
-  Which digest algorithm to use in S2K calculation.
-
-  Values: md5, sha1
-  Default: sha1
-  Applies: pgp_sym_encrypt
-
-s2k-cipher-algo::
-  Which cipher to use for encrypting separate session key.
-
-  Values: bf, aes, aes128, aes192, aes256
-  Default: use cipher-algo.
-  Applies: pgp_sym_encrypt
-
-unicode-mode::
-  Whether to convert textual data from database internal encoding to
-  UTF-8 and back.  If your database already is UTF-8, no conversion will
-  be done, only the data will be tagged as UTF-8.  Without this option
-  it will not be.
-
-  Values: 0, 1
-  Default: 0
-  Applies: pgp_sym_encrypt, pgp_pub_encrypt
-
-
-5.9.  Generating keys with GnuPG
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Generate a new key:
-
-    gpg --gen-key
-
-The preferred key type is "DSA and Elgamal".
-
-For RSA encryption you must create either DSA or RSA sign-only key
-as master and then add RSA encryption subkey with `gpg --edit-key`.
-
-List keys:
-
-    gpg --list-secret-keys
-
-Export ascii-armored public key:
-
-    gpg -a --export KEYID > public.key
-
-Export ascii-armored secret key:
-
-    gpg -a --export-secret-keys KEYID > secret.key
-
-You need to use `dearmor()` on them before giving them to
-pgp_pub_* functions.  Or if you can handle binary data, you can drop
-"-a" from gpg.
-
-For more details see `man gpg`, http://www.gnupg.org/gph/en/manual.html[
-The GNU Privacy Handbook] and other docs on http://www.gnupg.org[] site.
-
-
-5.10.  Limitations of PGP code
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- No support for signing.  That also means that it is not checked
-  whether the encryption subkey belongs to master key.
-
-- No support for encryption key as master key.  As such practice
-  is generally discouraged, it should not be a problem.
-
-- No support for several subkeys.  This may seem like a problem, as this
-  is common practice.  On the other hand, you should not use your regular
-  GPG/PGP keys with pgcrypto, but create new ones, as the usage scenario
-  is rather different.
-
-
-6.  Raw encryption
--------------------
-
-Those functions only run a cipher over data, they don't have any advanced
-features of PGP encryption.  Therefore they have some major problems:
-
-1. They use user key directly as cipher key.
-2. They don't provide any integrity checking, to see
-   if the encrypted data was modified.
-3. They expect that users manage all encryption parameters
-   themselves, even IV.
-4. They don't handle text.
-
-So, with the introduction of PGP encryption, usage of raw
-encryption functions is discouraged.
-
-
-    encrypt(data bytea, key bytea, type text) RETURNS bytea
-    decrypt(data bytea, key bytea, type text) RETURNS bytea
-
-    encrypt_iv(data bytea, key bytea, iv bytea, type text) RETURNS bytea
-    decrypt_iv(data bytea, key bytea, iv bytea, type text) RETURNS bytea
-
-Encrypt/decrypt data with cipher, padding data if needed.
-
-`type` parameter description in pseudo-noteup:
-
-    algo ['-' mode] ['/pad:' padding]
-
-Supported algorithms:
-
-* `bf`		- Blowfish
-* `aes`		- AES (Rijndael-128)
-
-Modes:
-
-* `cbc` - next block depends on previous. (default)
-* `ecb` - each block is encrypted separately.
-          (for testing only)
-
-Padding:
-
-* `pkcs` - data may be any length (default)
-* `none` - data must be multiple of cipher block size.
-
-IV is initial value for mode, defaults to all zeroes.  It is ignored for
-ECB.  It is clipped or padded with zeroes if not exactly block size.
-
-So, example:
-
-	encrypt(data, 'fooz', 'bf')
-
-is equal to
-
-	encrypt(data, 'fooz', 'bf-cbc/pad:pkcs')
-
-
-7.  Random bytes
------------------
-
-    gen_random_bytes(count integer)
-
-Returns `count` cryptographically strong random bytes as bytea value.
-There can be maximally 1024 bytes extracted at a time.  This is to avoid
-draining the randomness generator pool.
-
-
-8.  Credits
-------------
-
-I have used code from following sources:
-
-`--------------------`-------------------------`-------------------------------
-  Algorithm            Author                    Source origin
--------------------------------------------------------------------------------
-  DES crypt()          David Burren and others   FreeBSD libcrypt
-  MD5 crypt()          Poul-Henning Kamp         FreeBSD libcrypt
-  Blowfish crypt()     Solar Designer            www.openwall.com
-  Blowfish cipher      Niels Provos              OpenBSD sys/crypto
-  Rijndael cipher      Brian Gladman             OpenBSD sys/crypto
-  MD5 and SHA1         WIDE Project              KAME kame/sys/crypto
-  SHA256/384/512       Aaron D. Gifford          OpenBSD sys/crypto
-  BIGNUM math          Michael J. Fromberger     dartmouth.edu/~sting/sw/imath
--------------------------------------------------------------------------------
-
-
-9.  Legalese
--------------
-
-* I owe a beer to Poul-Henning.
-* This product includes software developed by Niels Provos.
-
-
-10.  References/Links
-----------------------
-
-10.1.  Useful reading
-~~~~~~~~~~~~~~~~~~~~~~
-
-http://www.gnupg.org/gph/en/manual.html[]::
-	The GNU Privacy Handbook
-
-http://www.openwall.com/crypt/[]::
-	Describes the crypt-blowfish algorithm.
-
-http://www.stack.nl/~galactus/remailers/passphrase-faq.html[]::
-	How to choose good password.
-
-http://world.std.com/~reinhold/diceware.html[]::
-	Interesting idea for picking passwords.
-
-http://www.interhack.net/people/cmcurtin/snake-oil-faq.html[]::
-	Describes good and bad cryptography.
-
-
-10.2.  Technical references
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-http://www.ietf.org/rfc/rfc2440.txt[]::
-	OpenPGP message format
-
-http://www.imc.org/draft-ietf-openpgp-rfc2440bis[]::
-	New version of RFC2440.
-
-http://www.ietf.org/rfc/rfc1321.txt[]::
-	The MD5 Message-Digest Algorithm
-
-http://www.ietf.org/rfc/rfc2104.txt[]::
-	HMAC: Keyed-Hashing for Message Authentication
-
-http://www.usenix.org/events/usenix99/provos.html[]::
-	Comparison of crypt-des, crypt-md5 and bcrypt algorithms.
-
-http://csrc.nist.gov/cryptval/des.htm[]::
-	Standards for DES, 3DES and AES.
-
-http://en.wikipedia.org/wiki/Fortuna_(PRNG)[]::
-	Description of Fortuna CSPRNG.
-
-http://jlcooke.ca/random/[]::
-	Jean-Luc Cooke Fortuna-based /dev/random driver for Linux.
-
-http://www.cs.ut.ee/~helger/crypto/[]::
-	Collection of cryptology pointers.
-
-
-// $PostgreSQL: pgsql/contrib/pgcrypto/README.pgcrypto,v 1.18 2006/09/05 21:26:48 tgl Exp $
diff --git a/contrib/pgcrypto/expected/init.out b/contrib/pgcrypto/expected/init.out
index 649f9e8e49b4..86c1fe225793 100755
--- a/contrib/pgcrypto/expected/init.out
+++ b/contrib/pgcrypto/expected/init.out
@@ -1,7 +1,13 @@
 --
 -- init pgcrypto
 --
+--
+-- first, define the functions.  Turn off echoing so that expected file
+-- does not depend on contents of pgcrypto.sql.
+--
+SET client_min_messages = warning;
 \set ECHO none
+RESET client_min_messages;
 -- check for encoding fn's
 SELECT encode('foo', 'hex');
  encode 
diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h
index 09d0e3e818b0..158171c0acd8 100644
--- a/contrib/pgcrypto/imath.h
+++ b/contrib/pgcrypto/imath.h
@@ -118,10 +118,10 @@ mp_result	mp_int_mul_pow2(mp_int a, int p2, mp_int c);
 mp_result	mp_int_sqr(mp_int a, mp_int c);		/* c = a * a */
 
 mp_result
-mp_int_div(mp_int a, mp_int b,	/* q = a / b */
+mp_int_div(mp_int a, mp_int b,			/* q = a / b */
 		   mp_int q, mp_int r); /* r = a % b */
 mp_result
-mp_int_div_value(mp_int a, int value,	/* q = a / value */
+mp_int_div_value(mp_int a, int value,			/* q = a / value */
 				 mp_int q, int *r);		/* r = a % value */
 mp_result
 mp_int_div_pow2(mp_int a, int p2,		/* q = a / 2^p2  */
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index bf882de6e8b8..8da2ae77897e 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -380,8 +380,8 @@ pg_encrypt_iv(PG_FUNCTION_ARGS)
 	err = px_combo_init(c, (uint8 *) VARDATA(key), klen,
 						(uint8 *) VARDATA(iv), ivlen);
 	if (!err)
-		px_combo_encrypt(c, (uint8 *) VARDATA(data), dlen,
-						 (uint8 *) VARDATA(res), &rlen);
+		err = px_combo_encrypt(c, (uint8 *) VARDATA(data), dlen,
+							   (uint8 *) VARDATA(res), &rlen);
 
 	px_combo_free(c);
 
@@ -434,8 +434,8 @@ pg_decrypt_iv(PG_FUNCTION_ARGS)
 	err = px_combo_init(c, (uint8 *) VARDATA(key), klen,
 						(uint8 *) VARDATA(iv), ivlen);
 	if (!err)
-		px_combo_decrypt(c, (uint8 *) VARDATA(data), dlen,
-						 (uint8 *) VARDATA(res), &rlen);
+		err = px_combo_decrypt(c, (uint8 *) VARDATA(data), dlen,
+							   (uint8 *) VARDATA(res), &rlen);
 
 	px_combo_free(c);
 
diff --git a/contrib/pgcrypto/sql/init.sql b/contrib/pgcrypto/sql/init.sql
index d11d1314d75f..4e404c9e1fcb 100644
--- a/contrib/pgcrypto/sql/init.sql
+++ b/contrib/pgcrypto/sql/init.sql
@@ -2,9 +2,15 @@
 -- init pgcrypto
 --
 
+--
+-- first, define the functions.  Turn off echoing so that expected file
+-- does not depend on contents of pgcrypto.sql.
+--
+SET client_min_messages = warning;
 \set ECHO none
 \i pgcrypto.sql
 \set ECHO all
+RESET client_min_messages;
 
 -- check for encoding fn's
 SELECT encode('foo', 'hex');
diff --git a/contrib/pgrowlocks/README.pgrowlocks b/contrib/pgrowlocks/README.pgrowlocks
deleted file mode 100755
index ebaea4ca5a3b..000000000000
--- a/contrib/pgrowlocks/README.pgrowlocks
+++ /dev/null
@@ -1,98 +0,0 @@
-$PostgreSQL: pgsql/contrib/pgrowlocks/README.pgrowlocks,v 1.1 2006/04/23 01:12:58 ishii Exp $
-
-pgrowlocks README			Tatsuo Ishii
-
-1. What is pgrowlocks?
-
-   pgrowlocks shows row locking information for specified table.
-
-   pgrowlocks returns following data type:
-
-CREATE TYPE pgrowlocks_type AS (
-	locked_row TID,		-- row TID
-	lock_type TEXT,		-- lock type
-	locker XID,		-- locking XID
-	multi bool,		-- multi XID?
-	xids xid[],		-- multi XIDs
-	pids INTEGER[]		-- locker's process id
-);
-
-  Here is a sample execution of pgrowlocks:
-
-test=# SELECT * FROM pgrowlocks('t1');
- locked_row | lock_type | locker | multi |   xids    |     pids      
-------------+-----------+--------+-------+-----------+---------------
-      (0,1) | Shared    |     19 | t     | {804,805} | {29066,29068}
-      (0,2) | Shared    |     19 | t     | {804,805} | {29066,29068}
-      (0,3) | Exclusive |    804 | f     | {804}     | {29066}
-      (0,4) | Exclusive |    804 | f     | {804}     | {29066}
-(4 rows)
-
-  locked_row		-- tuple ID(TID) of each locked rows
-  lock_type		-- "Shared" for shared lock, "Exclusive" for exclusive lock
-  locker		-- transaction ID of locker (note 1)
-  multi			-- "t" if locker is a multi transaction, otherwise "f"
-  xids			-- XIDs of lockers (note 2)
-  pids			-- process ids of locking backends
-
-  note1: if the locker is multi transaction, it represents the multi ID
-
-  note2: if the locker is multi, multiple data are shown
-
-2. Installing pgrowlocks
-
-   Installing pgrowlocks requires PostgreSQL 8.0 or later source tree.
-
-      $ cd /usr/local/src/postgresql-8.1/contrib
-      $ tar xfz /tmp/pgrowlocks-1.0.tar.gz
-
-   If you are using PostgreSQL 8.0, you need to modify pgrowlocks source code.
-   Around line 61, you will see:
-
-      #undef MAKERANGEVARFROMNAMELIST_HAS_TWO_ARGS
-
-   change this to:
-
-      #define MAKERANGEVARFROMNAMELIST_HAS_TWO_ARGS
-
-      $ make
-      $ make install
-
-      $ psql -e -f pgrowlocks.sql test
-
-3. How to use pgrowlocks
-
-   The calling sequence for pgrowlocks is as follows:
-
-   CREATE OR REPLACE FUNCTION pgrowlocks(text) RETURNS pgrowlocks_type
-     AS 'MODULE_PATHNAME', 'pgrowlocks'
-     LANGUAGE 'c' WITH (isstrict);
-
-   The parameter is a name of table. pgrowlocks returns type pgrowlocks_type.
-
-   pgrowlocks grab AccessShareLock for the target table and read each
-   row one by one to get the row locking information. You should
-   notice that:
-
-   1) if the table is exclusive locked by someone else, pgrowlocks
-      will be blocked.
-
-   2) pgrowlocks may show incorrect information if there's a new
-      lock or a lock is freeed while its execution.
-
-   pgrowlocks does not show the contents of locked rows. If you want
-   to take a look at the row contents at the same time, you could do
-   something like this:
-
-   SELECT * FROM accounts AS a, pgrowlocks('accounts') AS p WHERE p.locked_ row = a.ctid;
-
-
-4. License
-
-   pgrowlocks is distribute under (modified) BSD license described in
-   the source file.
-
-5. History
-
-   2006/03/21 pgrowlocks version 1.1 released (tested on 8.2 current)
-   2005/08/22 pgrowlocks version 1.0 released
diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index 6dae0d8af9bf..9885ef0c66b6 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -121,7 +121,7 @@ pgrowlocks(PG_FUNCTION_ARGS)
 		LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
 
 		if (HeapTupleSatisfiesUpdate(rel, tuple->t_data,
-									 GetCurrentCommandId(/*false*/),
+									 GetCurrentCommandId(false),
 									 scan->rs_cbuf) == HeapTupleBeingUpdated)
 		{
 
diff --git a/contrib/pgstattuple/.gitignore b/contrib/pgstattuple/.gitignore
new file mode 100644
index 000000000000..69b22b64cd92
--- /dev/null
+++ b/contrib/pgstattuple/.gitignore
@@ -0,0 +1 @@
+/pgstattuple.sql
diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index eb6bb00386d2..45e14dde1c0c 100644
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -24,84 +24,24 @@
 
 #include "postgres.h"
 
-#include "fmgr.h"
-#include "funcapi.h"
 #include "access/heapam.h"
-#include "access/itup.h"
 #include "access/nbtree.h"
-#include "access/transam.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
+#include "funcapi.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/inval.h"
 
-PG_FUNCTION_INFO_V1(pgstatindex);
-PG_FUNCTION_INFO_V1(bt_metap);
-PG_FUNCTION_INFO_V1(bt_page_items);
-PG_FUNCTION_INFO_V1(bt_page_stats);
-PG_FUNCTION_INFO_V1(pg_relpages);
 
 extern Datum pgstatindex(PG_FUNCTION_ARGS);
-extern Datum bt_metap(PG_FUNCTION_ARGS);
-extern Datum bt_page_items(PG_FUNCTION_ARGS);
-extern Datum bt_page_stats(PG_FUNCTION_ARGS);
 extern Datum pg_relpages(PG_FUNCTION_ARGS);
 
-#define PGSTATINDEX_TYPE "public.pgstatindex_type"
-#define PGSTATINDEX_NCOLUMNS 10
-
-#define BTMETAP_TYPE "public.bt_metap_type"
-#define BTMETAP_NCOLUMNS 6
-
-#define BTPAGEITEMS_TYPE "public.bt_page_items_type"
-#define BTPAGEITEMS_NCOLUMNS 6
-
-#define BTPAGESTATS_TYPE "public.bt_page_stats_type"
-#define BTPAGESTATS_NCOLUMNS 11
-
+PG_FUNCTION_INFO_V1(pgstatindex);
+PG_FUNCTION_INFO_V1(pg_relpages);
 
-#define IS_INDEX(r) ((r)->rd_rel->relkind == 'i')
+#define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX)
 #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
 
-#define CHECK_PAGE_OFFSET_RANGE(pg, offnum) { \
-		if ( !(FirstOffsetNumber <= (offnum) && \
-						(offnum) <= PageGetMaxOffsetNumber(pg)) ) \
-			 elog(ERROR, "page offset number out of range"); }
-
-/* note: BlockNumber is unsigned, hence can't be negative */
-#define CHECK_RELATION_BLOCK_RANGE(rel, blkno) { \
-		if ( RelationGetNumberOfBlocks(rel) <= (BlockNumber) (blkno) ) \
-			 elog(ERROR, "block number out of range"); }
-
-/* ------------------------------------------------
- * structure for single btree page statistics
- * ------------------------------------------------
- */
-typedef struct BTPageStat
-{
-	uint32		blkno;
-	uint32		live_items;
-	uint32		dead_items;
-	uint32		page_size;
-	uint32		max_avail;
-	uint32		free_size;
-	uint32		avg_item_size;
-	uint32		fragments;
-	char		type;
-
-	/* opaque data */
-	BlockNumber btpo_prev;
-	BlockNumber btpo_next;
-	union
-	{
-		uint32		level;
-		TransactionId xact;
-	}			btpo;
-	uint16		btpo_flags;
-	BTCycleId	btpo_cycleid;
-}	BTPageStat;
-
 /* ------------------------------------------------
  * A structure for a whole btree index statistics
  * used by pgstatindex().
@@ -109,120 +49,22 @@ typedef struct BTPageStat
  */
 typedef struct BTIndexStat
 {
-	uint32		magic;
 	uint32		version;
 	BlockNumber root_blkno;
 	uint32		level;
 
-	BlockNumber fastroot;
-	uint32		fastlevel;
-
-	uint32		live_items;
-	uint32		dead_items;
-
 	uint32		root_pages;
 	uint32		internal_pages;
 	uint32		leaf_pages;
 	uint32		empty_pages;
 	uint32		deleted_pages;
 
-	uint32		page_size;
-	uint32		avg_item_size;
-
 	uint32		max_avail;
 	uint32		free_space;
 
 	uint32		fragments;
 }	BTIndexStat;
 
-/* -------------------------------------------------
- * GetBTPageStatistics()
- *
- * Collect statistics of single b-tree leaf page
- * -------------------------------------------------
- */
-static bool
-GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
-{
-	Page		page = BufferGetPage(buffer);
-	PageHeader	phdr = (PageHeader) page;
-	OffsetNumber maxoff = PageGetMaxOffsetNumber(page);
-	BTPageOpaque opaque = (BTPageOpaque) PageGetSpecialPointer(page);
-	int			item_size = 0;
-	int			off;
-
-	stat->blkno = blkno;
-
-	stat->max_avail = BLCKSZ - (BLCKSZ - phdr->pd_special + SizeOfPageHeaderData);
-
-	stat->dead_items = stat->live_items = 0;
-
-	stat->page_size = PageGetPageSize(page);
-
-	/* page type (flags) */
-	if (P_ISDELETED(opaque))
-	{
-		stat->type = 'd';
-		return true;
-	}
-	else if (P_IGNORE(opaque))
-		stat->type = 'e';
-	else if (P_ISLEAF(opaque))
-		stat->type = 'l';
-	else if (P_ISROOT(opaque))
-		stat->type = 'r';
-	else
-		stat->type = 'i';
-
-	/* btpage opaque data */
-	stat->btpo_prev = opaque->btpo_prev;
-	stat->btpo_next = opaque->btpo_next;
-	if (P_ISDELETED(opaque))
-		stat->btpo.xact = opaque->btpo.xact;
-	else
-		stat->btpo.level = opaque->btpo.level;
-	stat->btpo_flags = opaque->btpo_flags;
-	stat->btpo_cycleid = opaque->btpo_cycleid;
-
-	/*----------------------------------------------
-	 * If a next leaf is on the previous block,
-	 * it means a fragmentation.
-	 *----------------------------------------------
-	 */
-	stat->fragments = 0;
-	if (stat->type == 'l')
-	{
-		if (opaque->btpo_next != P_NONE && opaque->btpo_next < blkno)
-			stat->fragments++;
-	}
-
-	/* count live and dead tuples, and free space */
-	for (off = FirstOffsetNumber; off <= maxoff; off++)
-	{
-		IndexTuple	itup;
-
-		ItemId		id = PageGetItemId(page, off);
-
-		itup = (IndexTuple) PageGetItem(page, id);
-
-		item_size += IndexTupleSize(itup);
-
-		if (!ItemIdDeleted(id))
-			stat->live_items++;
-		else
-			stat->dead_items++;
-	}
-	stat->free_size = PageGetFreeSpace(page);
-
-	if ((stat->live_items + stat->dead_items) > 0)
-		stat->avg_item_size = item_size / (stat->live_items + stat->dead_items);
-	else
-		stat->avg_item_size = 0;
-
-	return true;
-}
-
-
 /* ------------------------------------------------------
  * pgstatindex()
  *
@@ -249,23 +91,30 @@ pgstatindex(PG_FUNCTION_ARGS)
 	rel = relation_openrv(relrv, AccessShareLock);
 
 	if (!IS_INDEX(rel) || !IS_BTREE(rel))
-		elog(ERROR, "pgstatindex() can be used only on b-tree index.");
+		elog(ERROR, "relation \"%s\" is not a btree index",
+			 RelationGetRelationName(rel));
+
+	/*
+	 * Reject attempts to read non-local temporary relations; we would
+	 * be likely to get wrong data since we have no visibility into the
+	 * owning session's local buffers.
+	 */
+	if (isOtherTempNamespace(RelationGetNamespace(rel)))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot access temporary tables of other sessions")));
 
-	/*-------------------
-	 * Read a metapage
-	 *-------------------
+	/*
+	 * Read metapage
 	 */
 	{
 		Buffer		buffer = ReadBuffer(rel, 0);
 		Page		page = BufferGetPage(buffer);
 		BTMetaPageData *metad = BTPageGetMeta(page);
 
-		indexStat.magic = metad->btm_magic;
 		indexStat.version = metad->btm_version;
 		indexStat.root_blkno = metad->btm_root;
 		indexStat.level = metad->btm_level;
-		indexStat.fastroot = metad->btm_fastroot;
-		indexStat.fastlevel = metad->btm_fastlevel;
 
 		ReleaseBuffer(buffer);
 	}
@@ -290,47 +139,52 @@ pgstatindex(PG_FUNCTION_ARGS)
 	 */
 	for (blkno = 1; blkno < nblocks; blkno++)
 	{
-		Buffer		buffer = ReadBuffer(rel, blkno);
-		BTPageStat	stat;
-
-		/* scan one page */
-		stat.blkno = blkno;
-		GetBTPageStatistics(blkno, buffer, &stat);
-
-		/*---------------------
-		 * page status (type)
-		 *---------------------
-		 */
-		switch (stat.type)
-		{
-			case 'd':
-				indexStat.deleted_pages++;
-				break;
-			case 'l':
-				indexStat.leaf_pages++;
-				break;
-			case 'i':
-				indexStat.internal_pages++;
-				break;
-			case 'e':
-				indexStat.empty_pages++;
-				break;
-			case 'r':
-				indexStat.root_pages++;
-				break;
-			default:
-				elog(ERROR, "unknown page status.");
-		}
+		Buffer		buffer;
+		Page		page;
+		BTPageOpaque opaque;
+
+		CHECK_FOR_INTERRUPTS();
+
+		/* Read and lock buffer */
+		buffer = ReadBuffer(rel, blkno);
+		LockBuffer(buffer, BUFFER_LOCK_SHARE);
+
+		page = BufferGetPage(buffer);
+		opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 
-		/* -- leaf fragmentation -- */
-		indexStat.fragments += stat.fragments;
+		/* Determine page type, and update totals */
 
-		if (stat.type == 'l')
+		if (P_ISDELETED(opaque))
+			indexStat.deleted_pages++;
+
+		else if (P_IGNORE(opaque))
+			indexStat.empty_pages++;
+
+		else if (P_ISLEAF(opaque))
 		{
-			indexStat.max_avail += stat.max_avail;
-			indexStat.free_space += stat.free_size;
+			int			max_avail;
+
+			max_avail = BLCKSZ - (BLCKSZ - ((PageHeader) page)->pd_special + SizeOfPageHeaderData);
+			indexStat.max_avail += max_avail;
+			indexStat.free_space += PageGetFreeSpace(page);
+
+			indexStat.leaf_pages++;
+
+			/*
+			 * If the next leaf is on an earlier block, it means a
+			 * fragmentation.
+			 */
+			if (opaque->btpo_next != P_NONE && opaque->btpo_next < blkno)
+				indexStat.fragments++;
 		}
+		else if (P_ISROOT(opaque))
+			indexStat.root_pages++;
+
+		else
+			indexStat.internal_pages++;
 
+		/* Unlock and release buffer */
+		LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 		ReleaseBuffer(buffer);
 	}
 
@@ -343,12 +197,12 @@ pgstatindex(PG_FUNCTION_ARGS)
 	{
 		TupleDesc	tupleDesc;
 		int			j;
-		char	   *values[PGSTATINDEX_NCOLUMNS];
-
-		HeapTupleData tupleData;
-		HeapTuple	tuple = &tupleData;
+		char	   *values[10];
+		HeapTuple	tuple;
 
-		tupleDesc = RelationNameGetTupleDesc(PGSTATINDEX_TYPE);
+		/* Build a tuple descriptor for our result type */
+		if (get_call_result_type(fcinfo, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
+			elog(ERROR, "return type must be a row type");
 
 		j = 0;
 		values[j] = palloc(32);
@@ -372,337 +226,32 @@ pgstatindex(PG_FUNCTION_ARGS)
 		values[j] = palloc(32);
 		snprintf(values[j++], 32, "%d", indexStat.deleted_pages);
 		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%.2f", 100.0 - (float) indexStat.free_space / (float) indexStat.max_avail * 100.0);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%.2f", (float) indexStat.fragments / (float) indexStat.leaf_pages * 100.0);
-
-		tuple = BuildTupleFromCStrings(TupleDescGetAttInMetadata(tupleDesc),
-									   values);
-
-		result = TupleGetDatum(TupleDescGetSlot(tupleDesc), tuple);
-	}
-
-	PG_RETURN_DATUM(result);
-}
 
-/* -----------------------------------------------
- * bt_page()
- *
- * Usage: SELECT * FROM bt_page('t1_pkey', 0);
- * -----------------------------------------------
- */
-Datum
-bt_page_stats(PG_FUNCTION_ARGS)
-{
-	text	   *relname = PG_GETARG_TEXT_P(0);
-	uint32		blkno = PG_GETARG_UINT32(1);
-	Buffer		buffer;
-
-	Relation	rel;
-	RangeVar   *relrv;
-	Datum		result;
-
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 (errmsg("must be superuser to use pgstattuple functions"))));
-
-	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
-	rel = relation_openrv(relrv, AccessShareLock);
-
-	CHECK_RELATION_BLOCK_RANGE(rel, blkno);
-
-	buffer = ReadBuffer(rel, blkno);
-
-	if (!IS_INDEX(rel) || !IS_BTREE(rel))
-		elog(ERROR, "bt_page_stats() can be used only on b-tree index.");
-
-	if (blkno == 0)
-		elog(ERROR, "Block 0 is a meta page.");
-
-	{
-		HeapTuple	tuple;
-		TupleDesc	tupleDesc;
-		int			j;
-		char	   *values[BTPAGESTATS_NCOLUMNS];
-
-		BTPageStat	stat;
-
-		GetBTPageStatistics(blkno, buffer, &stat);
-
-		tupleDesc = RelationNameGetTupleDesc(BTPAGESTATS_TYPE);
-
-		j = 0;
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.blkno);
-
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%c", stat.type);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.live_items);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.dead_items);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.avg_item_size);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.page_size);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.free_size);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.btpo_prev);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.btpo_next);
-
-		values[j] = palloc(32);
-		if (stat.type == 'd')
-			snprintf(values[j++], 32, "%d", stat.btpo.xact);
+		if (indexStat.max_avail > 0)
+			snprintf(values[j++], 32, "%.2f",
+					 100.0 - (double) indexStat.free_space / (double) indexStat.max_avail * 100.0);
 		else
-			snprintf(values[j++], 32, "%d", stat.btpo.level);
-
+			snprintf(values[j++], 32, "NaN");
 		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", stat.btpo_flags);
-
-		tuple = BuildTupleFromCStrings(TupleDescGetAttInMetadata(tupleDesc),
-									   values);
-
-		result = TupleGetDatum(TupleDescGetSlot(tupleDesc), tuple);
-	}
-
-	ReleaseBuffer(buffer);
-
-	relation_close(rel, AccessShareLock);
-
-	PG_RETURN_DATUM(result);
-}
-
-/*-------------------------------------------------------
- * bt_page_items()
- *
- * Get IndexTupleData set in a leaf page
- *
- * Usage: SELECT * FROM bt_page_items('t1_pkey', 0);
- *-------------------------------------------------------
- */
-/* ---------------------------------------------------
- * data structure for SRF to hold a scan information
- * ---------------------------------------------------
- */
-struct user_args
-{
-	TupleDesc	tupd;
-	Relation	rel;
-	Buffer		buffer;
-	Page		page;
-	uint16		offset;
-};
-
-Datum
-bt_page_items(PG_FUNCTION_ARGS)
-{
-	text	   *relname = PG_GETARG_TEXT_P(0);
-	uint32		blkno = PG_GETARG_UINT32(1);
-
-	RangeVar   *relrv;
-	Datum		result;
-	char	   *values[BTPAGEITEMS_NCOLUMNS];
-	BTPageOpaque opaque;
-	HeapTuple	tuple;
-	ItemId		id;
-
-	FuncCallContext *fctx;
-	MemoryContext mctx;
-	struct user_args *uargs = NULL;
-
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 (errmsg("must be superuser to use pgstattuple functions"))));
-
-	if (blkno == 0)
-		elog(ERROR, "Block 0 is a meta page.");
-
-	if (SRF_IS_FIRSTCALL())
-	{
-		fctx = SRF_FIRSTCALL_INIT();
-		mctx = MemoryContextSwitchTo(fctx->multi_call_memory_ctx);
-
-		uargs = palloc(sizeof(struct user_args));
-
-		uargs->tupd = RelationNameGetTupleDesc(BTPAGEITEMS_TYPE);
-		uargs->offset = FirstOffsetNumber;
-
-		relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
-		uargs->rel = relation_openrv(relrv, AccessShareLock);
-
-		CHECK_RELATION_BLOCK_RANGE(uargs->rel, blkno);
-
-		uargs->buffer = ReadBuffer(uargs->rel, blkno);
-
-		if (!IS_INDEX(uargs->rel) || !IS_BTREE(uargs->rel))
-			elog(ERROR, "bt_page_items() can be used only on b-tree index.");
-
-		uargs->page = BufferGetPage(uargs->buffer);
-
-		opaque = (BTPageOpaque) PageGetSpecialPointer(uargs->page);
-
-		if (P_ISDELETED(opaque))
-			elog(NOTICE, "bt_page_items(): this page is deleted.");
-
-		fctx->max_calls = PageGetMaxOffsetNumber(uargs->page);
-		fctx->user_fctx = uargs;
-
-		MemoryContextSwitchTo(mctx);
-	}
-
-	fctx = SRF_PERCALL_SETUP();
-	uargs = fctx->user_fctx;
-
-	if (fctx->call_cntr < fctx->max_calls)
-	{
-		IndexTuple	itup;
-
-		id = PageGetItemId(uargs->page, uargs->offset);
-
-		if (!ItemIdIsValid(id))
-			elog(ERROR, "Invalid ItemId.");
-
-		itup = (IndexTuple) PageGetItem(uargs->page, id);
-
-		{
-			int			j = 0;
-
-			BlockNumber blkno = BlockIdGetBlockNumber(&(itup->t_tid.ip_blkid));
-
-			values[j] = palloc(32);
-			snprintf(values[j++], 32, "%d", uargs->offset);
-			values[j] = palloc(32);
-			snprintf(values[j++], 32, "(%u,%u)", blkno, itup->t_tid.ip_posid);
-			values[j] = palloc(32);
-			snprintf(values[j++], 32, "%d", (int) IndexTupleSize(itup));
-			values[j] = palloc(32);
-			snprintf(values[j++], 32, "%c", IndexTupleHasNulls(itup) ? 't' : 'f');
-			values[j] = palloc(32);
-			snprintf(values[j++], 32, "%c", IndexTupleHasVarwidths(itup) ? 't' : 'f');
-
-			{
-				int			off;
-				char	   *dump;
-				char	   *ptr = (char *) itup + IndexInfoFindDataOffset(itup->t_info);
-
-				dump = palloc(IndexTupleSize(itup) * 3);
-				memset(dump, 0, IndexTupleSize(itup) * 3);
-
-				for (off = 0;
-					 off < IndexTupleSize(itup) - IndexInfoFindDataOffset(itup->t_info);
-					 off++)
-				{
-					if (dump[0] == '\0')
-						sprintf(dump, "%02x", *(ptr + off) & 0xff);
-					else
-					{
-						char		buf[4];
-
-						sprintf(buf, " %02x", *(ptr + off) & 0xff);
-						strcat(dump, buf);
-					}
-				}
-				values[j] = dump;
-			}
-
-			tuple = BuildTupleFromCStrings(TupleDescGetAttInMetadata(uargs->tupd), values);
-			result = TupleGetDatum(TupleDescGetSlot(uargs->tupd), tuple);
-		}
-
-		uargs->offset = uargs->offset + 1;
-
-		SRF_RETURN_NEXT(fctx, result);
-	}
-	else
-	{
-		ReleaseBuffer(uargs->buffer);
-		relation_close(uargs->rel, AccessShareLock);
-
-		SRF_RETURN_DONE(fctx);
-	}
-}
-
-
-/* ------------------------------------------------
- * bt_metap()
- *
- * Get a btree meta-page information
- *
- * Usage: SELECT * FROM bt_metap('t1_pkey')
- * ------------------------------------------------
- */
-Datum
-bt_metap(PG_FUNCTION_ARGS)
-{
-	text	   *relname = PG_GETARG_TEXT_P(0);
-	Buffer		buffer;
-
-	Relation	rel;
-	RangeVar   *relrv;
-	Datum		result;
-
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 (errmsg("must be superuser to use pgstattuple functions"))));
-
-	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
-	rel = relation_openrv(relrv, AccessShareLock);
-
-	if (!IS_INDEX(rel) || !IS_BTREE(rel))
-		elog(ERROR, "bt_metap() can be used only on b-tree index.");
-
-	buffer = ReadBuffer(rel, 0);
-
-	{
-		BTMetaPageData *metad;
-
-		TupleDesc	tupleDesc;
-		int			j;
-		char	   *values[BTMETAP_NCOLUMNS];
-		HeapTuple	tuple;
-
-		Page		page = BufferGetPage(buffer);
-
-		metad = BTPageGetMeta(page);
-
-		tupleDesc = RelationNameGetTupleDesc(BTMETAP_TYPE);
-
-		j = 0;
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", metad->btm_magic);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", metad->btm_version);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", metad->btm_root);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", metad->btm_level);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", metad->btm_fastroot);
-		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%d", metad->btm_fastlevel);
+		if (indexStat.leaf_pages > 0)
+			snprintf(values[j++], 32, "%.2f",
+					 (double) indexStat.fragments / (double) indexStat.leaf_pages * 100.0);
+		else
+			snprintf(values[j++], 32, "NaN");
 
 		tuple = BuildTupleFromCStrings(TupleDescGetAttInMetadata(tupleDesc),
 									   values);
 
-		result = TupleGetDatum(TupleDescGetSlot(tupleDesc), tuple);
+		result = HeapTupleGetDatum(tuple);
 	}
 
-	ReleaseBuffer(buffer);
-
-	relation_close(rel, AccessShareLock);
-
 	PG_RETURN_DATUM(result);
 }
 
 /* --------------------------------------------------------
  * pg_relpages()
  *
- * Get a number of pages of the table/index.
+ * Get the number of pages of the table/index.
  *
  * Usage: SELECT pg_relpages('t1');
  *		  SELECT pg_relpages('t1_pkey');
@@ -712,7 +261,6 @@ Datum
 pg_relpages(PG_FUNCTION_ARGS)
 {
 	text	   *relname = PG_GETARG_TEXT_P(0);
-
 	Relation	rel;
 	RangeVar   *relrv;
 	int4		relpages;
@@ -725,6 +273,8 @@ pg_relpages(PG_FUNCTION_ARGS)
 	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
 	rel = relation_openrv(relrv, AccessShareLock);
 
+	/* note: this will work OK on non-local temp tables */
+
 	relpages = RelationGetNumberOfBlocks(rel);
 
 	relation_close(rel, AccessShareLock);
diff --git a/contrib/pgstattuple/uninstall_pgstattuple.sql b/contrib/pgstattuple/uninstall_pgstattuple.sql
index 5b857bb868f1..ae0ae90295f8 100644
--- a/contrib/pgstattuple/uninstall_pgstattuple.sql
+++ b/contrib/pgstattuple/uninstall_pgstattuple.sql
@@ -1,20 +1,9 @@
--- Adjust this setting to control where the objects get created.
+/* $PostgreSQL: pgsql/contrib/pgstattuple/uninstall_pgstattuple.sql,v 1.6 2007/11/13 04:24:28 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
 SET search_path = public;
 
-DROP FUNCTION pgstattuple(oid);
 DROP FUNCTION pgstattuple(text);
-DROP TYPE pgstattuple_type;
-
+DROP FUNCTION pgstattuple(oid);
 DROP FUNCTION pgstatindex(text);
-DROP TYPE pgstatindex_type;
-
-DROP FUNCTION bt_metap(text);
-DROP TYPE bt_metap_type;
-
-DROP FUNCTION bt_page_stats(text, int4);
-DROP TYPE bt_page_stats_type;
-
-DROP FUNCTION bt_page_items(text, int4);
-DROP TYPE bt_page_items_type;
-
 DROP FUNCTION pg_relpages(text);
diff --git a/contrib/seg/.gitignore b/contrib/seg/.gitignore
new file mode 100644
index 000000000000..7331698e7719
--- /dev/null
+++ b/contrib/seg/.gitignore
@@ -0,0 +1,6 @@
+/segparse.c
+/segparse.h
+/segscan.c
+/seg.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/spi/.gitignore b/contrib/spi/.gitignore
index cbe8dbb6b7ed..c214d26c3cac 100644
--- a/contrib/spi/.gitignore
+++ b/contrib/spi/.gitignore
@@ -1,6 +1,7 @@
-insert_username.sql
 moddatetime.so
-moddatetime.sql
 timetravel.so
-timetravel.sql
-refint.sql
+/autoinc.sql
+/insert_username.sql
+/moddatetime.sql
+/refint.sql
+/timetravel.sql
diff --git a/contrib/spi/README.spi b/contrib/spi/README.spi
deleted file mode 100755
index 65868f0fc7af..000000000000
--- a/contrib/spi/README.spi
+++ /dev/null
@@ -1,104 +0,0 @@
-
-Here are general trigger functions provided as workable examples
-of using SPI and triggers. "General" means that functions may be
-used for defining triggers for any tables but you have to specify
-table/field names (as described below) while creating a trigger.
-
-1. refint.c - functions for implementing referential integrity.
-
-check_primary_key () is to used for foreign keys of a table.
-   
-   You are to create trigger (BEFORE INSERT OR UPDATE) using this 
-function on a table referencing another table. You are to specify
-as function arguments: triggered table column names which correspond
-to foreign key, referenced table name and column names in referenced
-table which correspond to primary/unique key.
-   You may create as many triggers as you need - one trigger for
-one reference.
-
-check_foreign_key () is to used for primary/unique keys of a table.
-
-   You are to create trigger (BEFORE DELETE OR UPDATE) using this
-function on a table referenced by another table(s). You are to specify
-as function arguments: number of references for which function has to
-performe checking, action if referencing key found ('cascade' - to delete
-corresponding foreign key, 'restrict' - to abort transaction if foreign keys 
-exist, 'setnull' - to set foreign key referencing primary/unique key
-being deleted to null), triggered table column names which correspond
-to primary/unique key, referencing table name and column names corresponding
-to foreign key (, ... - as many referencing tables/keys as specified
-by first argument).
-   Note, that NOT NULL constraint and unique index have to be defined by
-youself.
-
-   There are examples in refint.example and regression tests
-(sql/triggers.sql).
-
-   To CREATE FUNCTIONs use refint.sql (will be made by gmake from
-refint.source).
-
-
-2. timetravel.c - functions for implementing time travel feature.
-
-   Old internally supported time-travel (TT) used insert/delete
-transaction commit times. To get the same feature using triggers
-you are to add to a table two columns of abstime type to store
-date when a tuple was inserted (start_date) and changed/deleted 
-(stop_date):
-
-CREATE TABLE XXX (
-	...		...
-	date_on		abstime default currabstime(),
-	date_off	abstime default 'infinity'
-	...		...
-);
-
-- so, tuples being inserted with NULLs in date_on/date_off will get
-_current_date_ in date_on (name of start_date column in XXX) and INFINITY in
-date_off (name of stop_date column in XXX).
-
-   Tuples with stop_date equal INFINITY are "valid now": when trigger will
-be fired for UPDATE/DELETE of a tuple with stop_date NOT equal INFINITY then
-this tuple will not be changed/deleted!
-
-   If stop_date equal INFINITY then on
-
-UPDATE: only stop_date in tuple being updated will be changed to current
-date and new tuple with new data (coming from SET ... in UPDATE) will be
-inserted. Start_date in this new tuple will be setted to current date and
-stop_date - to INFINITY.
-
-DELETE: new tuple will be inserted with stop_date setted to current date
-(and with the same data in other columns as in tuple being deleted).
-
-   NOTE:
-1. To get tuples "valid now" you are to add _stop_date_ = 'infinity'
-   to WHERE. Internally supported TT allowed to avoid this...
-   Fixed rewriting RULEs could help here...
-   As work arround you may use VIEWs...
-2. You can't change start/stop date columns with UPDATE! 
-   Use set_timetravel (below) if you need in this.
-
-   FUNCTIONs:
-
-timetravel() is general trigger function.
-
-   You are to create trigger BEFORE (!!!) UPDATE OR DELETE using this
-function on a time-traveled table. You are to specify two arguments: name of
-start_date column and name of stop_date column in triggered table.
-
-currabstime() may be used in DEFAULT for start_date column to get
-current date.
-
-set_timetravel() allows you turn time-travel ON/OFF for a table:
-
-   set_timetravel('XXX', 1) will turn TT ON for table XXX (and report
-old status).
-   set_timetravel('XXX', 0) will turn TT OFF for table XXX (-"-).
-
-Turning TT OFF allows you do with a table ALL what you want.
-
-   There is example in timetravel.example.
-
-   To CREATE FUNCTIONs use timetravel.sql (will be made by gmake from
-timetravel.source).
diff --git a/contrib/spi/README.timetravel b/contrib/spi/README.timetravel
deleted file mode 100755
index 0b4727fb248c..000000000000
--- a/contrib/spi/README.timetravel
+++ /dev/null
@@ -1,116 +0,0 @@
-2. timetravel.c - functions for implementing time travel feature.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-I rewritten this, because:
-
-on original version of postgresql 7.3.2-7.3.3:
-
-the UPDATE not work on timetravel.example if I added
->create unique index tttest_idx on tttest (price_id,price_off);
->update tttest set price_val = 30 where price_id = 3;
-ERROR:  Cannot insert a duplicate key into unique index tttest_idx
-
-And UPDATE not work on table tttest after
->alter table tttest add column q1 text;
->alter table tttest add column q2 int;
->alter table tttest drop column q1;
->update tttest set price_val = 30 where price_id = 3;
-ERROR:  Parameter '$5' is out of range
-
-And I add a new optional feature: my new timetravel have +3 optional parameters:
-inserter_user, updater_user, deleter_user.
-
-And I add a new function: get_timetravel for get timetravel status
-without change it.
-
-A big difference: 
-the old version on UPDATE changed oid on active ('infinity') record,
-the new version UPDATE keep oid, and the overdued record have a new oid.
-I sign with '!!!' my comment in this file.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-   Old internally supported time-travel (TT) used insert/delete
-transaction commit times. To get the same feature using triggers
-you are to add to a table two columns of abstime type to store
-date when a tuple was inserted (start_date) and changed/deleted 
-(stop_date):
-
-CREATE TABLE XXX (
-	...		...
-	date_on		abstime default currabstime(),
-	date_off	abstime default 'infinity'
-	...		...
-/* !!! and (if have) */
-	ins_user	text	/* user, who insert this record */
-	upd_user	text	/* user, who updated this record */
-	del_user	text	/* user, who deleted this record */
-	...		...
-);
-
-!!! on INSERT my new version:
- ... and optionally set ins_user to current user, upd_user and del_user to null.
-
-- so, tuples being inserted with NULLs in date_on/date_off will get
-_current_date_ in date_on (name of start_date column in XXX) and INFINITY in
-date_off (name of stop_date column in XXX).
-
-   Tuples with stop_date equal INFINITY are "valid now": when trigger will
-be fired for UPDATE/DELETE of a tuple with stop_date NOT equal INFINITY then
-this tuple will not be changed/deleted!
-
-   If stop_date equal INFINITY then on
-
-UPDATE: 
-original version was:
- only stop_date in tuple being updated will be changed to current
- date and new tuple with new data (coming from SET ... in UPDATE) will be
- inserted. Start_date in this new tuple will be setted to current date and
- stop_date - to INFINITY.
-On my new version:
- insert a new tuple with old values, but stop_date changed to current date;
- and update original tuple with new data, and update start_date to current date
- and optionally set upd_user to current user and clear ins_user,del_user.
-
-DELETE: new tuple will be inserted with stop_date setted to current date
-(and with the same data in other columns as in tuple being deleted).
-On my new version:
- ... and optionally set del_user to current user.
-
-   NOTE:
-1. To get tuples "valid now" you are to add _stop_date_ = 'infinity'
-   to WHERE. Internally supported TT allowed to avoid this...
-   Fixed rewriting RULEs could help here...
-   As work arround you may use VIEWs...
-2. You can't change start/stop date columns with UPDATE! 
-   Use set_timetravel (below) if you need in this.
-
-   FUNCTIONs:
-
-timetravel() is general trigger function.
-
-   You are to create trigger BEFORE UPDATE OR DELETE using this
-function on a time-traveled table. You are to specify two arguments: name of
-start_date column and name of stop_date column in triggered table.
-Or add +3 arguments: 
-  name of insert_user column, name of update_user column, name of delete_user column
-
-currabstime() may be used in DEFAULT for start_date column to get
-current date.
-!!! I deleted this function, because I newer used this.
-
-set_timetravel() allows you turn time-travel ON/OFF for a table:
-
-   set_timetravel('XXX', 1) will turn TT ON for table XXX (and report
-old status).
-   set_timetravel('XXX', 0) will turn TT OFF for table XXX (-"-).
-
-Turning TT OFF allows you do with a table ALL what you want.
-
-get_timetravel() reports time-travel status ON(1)/OFF(0) for a table.
-get_timetravel() and set_timetravel() not checking existing of table and
-existing of timetravel trigger on specified table.
-
-   There is example in timetravel.example.
-
-   To CREATE FUNCTIONs use timetravel.sql (will be made by gmake from
-timetravel.source).
diff --git a/contrib/spi/preprocessor/README.MAX b/contrib/spi/preprocessor/README.MAX
deleted file mode 100755
index 7969438c6026..000000000000
--- a/contrib/spi/preprocessor/README.MAX
+++ /dev/null
@@ -1,76 +0,0 @@
-
-Here are general trigger functions provided as workable examples
-of using SPI and triggers. "General" means that functions may be
-used for defining triggers for any tables but you have to specify
-table/field names (as described below) while creating a trigger.
-
-1. refint.c - functions for implementing referential integrity.
-
-check_primary_key () is to used for foreign keys of a table.
-   
-   You are to create trigger (BEFORE INSERT OR UPDATE) using this 
-function on a table referencing another table. You are to specify
-as function arguments: triggered table column names which correspond
-to foreign key, referenced table name and column names in referenced
-table which correspond to primary/unique key.
-   You may create as many triggers as you need - one trigger for
-one reference.
-
-check_foreign_key () is to used for primary/unique keys of a table.
-
-   You are to create trigger (BEFORE DELETE OR UPDATE) using this
-function on a table referenced by another table(s). You are to specify
-as function arguments: number of references for which function has to
-performe checking, action if referencing key found ('cascade' - to delete
-corresponding foreign key, 'restrict' - to abort transaction if foreign keys 
-exist, 'setnull' - to set foreign key referencing primary/unique key
-being deleted to null), triggered table column names which correspond
-to primary/unique key, referencing table name and column names corresponding
-to foreign key (, ... - as many referencing tables/keys as specified
-by first argument).
-   Note, that NOT NULL constraint and unique index have to be defined by
-youself.
-
-   There are examples in refint.example and regression tests
-(sql/triggers.sql).
-
-   To CREATE FUNCTIONs use refint.sql (will be made by gmake from
-refint.source).
-
-# Excuse me for my bad english. Massimo Lambertini
-#
-#
-# New check foreign key 
-#
-I think that cascade mode is to be considered like that the operation over 
-main table is to be made also in referenced table .
-When i Delete , i must delete from referenced table , 
-but when i update , i update referenced table and not delete like unmodified refint.c .
-
-I made a patch that when i update it check the type of modified key ( if is a text , char() i
-added '') and then create a update query that do the right think .
-
-For my point of view that policy is helpfull because i do not have in referenced table
-loss of information .
-
-
-In preprocessor subdir i have placed a little utility that from a SQL92 table definition,
-it create all trigger for foreign key .
-
-
-the schema that i use to analyze the problem is this 
-
-create table 
-A 
-( key int4 not null primary key ,...) ;
-create table
-REFERENCED_B 
-( key int 4 , ... , 
-foreign key ( key ) references A -- 
-);
-
-
-
-
- 
-
diff --git a/contrib/spi/preprocessor/example.sql b/contrib/spi/preprocessor/example.sql
deleted file mode 100644
index e53c84a1517b..000000000000
--- a/contrib/spi/preprocessor/example.sql
+++ /dev/null
@@ -1,37 +0,0 @@
---  Note the syntax is strict because i have no time to write better perl filter.
---
---  [blank] is 1 blank 
---  at the end of an interesting line must be a [,]  or [--]
---  [ending] must be a , or --  
---  
---  foreign[blank]key[blank]([blank]keyname,..,keyname[blank])[blank]references[blank]table[blank][ending] 
---
---  step1 < example.sql | step2.pl > foreign_key_triggers.sql
---   
---  step1.c is a simple program that UPPERCASE ALL . I know that is simple implementing in Perl
---  bu i haven't time
-
-
-CREATE TABLE 
-gruppo
-(
-codice_gruppo  		int4 			NOT NULL,
-descrizione         	varchar(32)    		NOT NULL
-primary key ( codice_gruppo ) 
-
-) ;
-
---
--- fa_parte : Appartenenza di una Azienda Conatto o Cliente ad un certo GRUPPO
---
-
-CREATE TABLE 
-fa_parte 
-(
-codice_gruppo   		int4	NOT NULL,
-codice_contatto         	int4   	NOT NULL,
-
-primary key ( codice_gruppo,codice_contatto ) ,
-foreign key ( codice_gruppo ) references gruppo --
-);
-
diff --git a/contrib/spi/preprocessor/step1.c b/contrib/spi/preprocessor/step1.c
deleted file mode 100644
index 8a5379e8e040..000000000000
--- a/contrib/spi/preprocessor/step1.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-
-char *
-strtoupper(char *string)
-{
-	int			i;
-
-	for (i = 0; i < strlen(string); i++)
-		string[i] = toupper((unsigned char) string[i]);
-	return string;
-}
-
-
-
-void
-main(char argc, char **argv)
-{
-	char		str[250];
-	int			sw = 0;
-
-	while (fgets(str, 240, stdin))
-	{
-		if (sw == 0)
-			printf("%s", strtoupper(str));
-	}
-
-}
diff --git a/contrib/spi/preprocessor/step2.pl b/contrib/spi/preprocessor/step2.pl
deleted file mode 100755
index 76ce7944cc2e..000000000000
--- a/contrib/spi/preprocessor/step2.pl
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/perl
-
-##
-##  MAIN
-##
-$table_name="";
-$old_name="";
-$references_table="";
-$references_column="";
-$is_create=0;
-
-
-
-while ( <> ) 
-{
-	chop;
-	$str=$_ ;
-
-	if ($is_create == 1) {
-		$table_name=$str;
-	  	$is_create=2;
-	}
-	if ( $str =~ /^CREATE TABLE/ ){
-		$is_create=1;
-	}
-	if ($is_create == 2) {
-	if ($str =~ /^FOREIGN KEY/){
-		($d1,$d2,$d3,$columns,$d4,$d5,$references_table,$d6) = split (/ /,$str,8);
-		#printf "Table $table_name $columns $references_table\n";
-
-		if ($table_name ne $old_name ){	
-			printf "--\n-- Trigger for $table_name\n--\n\n";
-		}
-
-		foreach $i ( split(/,/ , $columns ) ){
-			print "CREATE INDEX I_$table_name";
-			print "_$i ON $table_name ( $i ) ;\n";
-		}
-
-		printf "\nCREATE TRIGGER T_P_$table_name";
-		printf "_$references_table BEFORE INSERT OR UPDATE ON $table_name FOR EACH ROW\n" ;
-		printf "EXECUTE PROCEDURE\n";
-		printf "check_primary_key(";
-		$val=0;
-		foreach $i ( split(/,/ , $columns ) ){
-			print "'$i',";
-			$val=$val+1 ;
-		}
-		print "'$references_table',";
-		
-		$t=1;
-		foreach $i ( split(/,/,$columns ) ){
-			print "'$i'";
-			if ( $t < $val ) {
-				printf ",";
-			}	
-			$t=$t+1;
-		}
-		print " );\n\n";
-
-		printf "CREATE TRIGGER T_F_D_$references_table";
-		printf "_$table_name BEFORE DELETE ON $references_table FOR EACH ROW\n" ;
-		printf "EXECUTE PROCEDURE\n";
-		printf "check_foreign_key(1,'cascade',";
-		$val=0;
-		foreach $i ( split(/,/ , $columns ) ){
-			print "'$i',";
-			$val=$val+1 ;
-		}
-		print "'$table_name',";
-		
-		$t=1;
-		foreach $i ( split(/,/,$columns ) ){
-			print "'$i'";
-			if ( $t < $val ) {
-				printf ",";
-			}	
-			$t=$t+1;
-		}
-		print " );\n\n";
-
-		printf "CREATE TRIGGER T_F_U_$references_table";
-		printf "_$table_name AFTER UPDATE ON $references_table FOR EACH ROW\n" ;
-		printf "EXECUTE PROCEDURE\n";
-		printf "check_foreign_key(1,'cascade',";
-		$val=0;
-		foreach $i ( split(/,/ , $columns ) ){
-			print "'$i',";
-			$val=$val+1 ;
-		}
-		print "'$table_name',";
-		
-		$t=1;
-		foreach $i ( split(/,/,$columns ) ){
-			print "'$i'";
-			if ( $t < $val ) {
-				printf ",";
-			}	
-			$t=$t+1;
-		}
-		print " );\n\n";
-
-		if ($table_name ne $old_name ){	
-			printf "-- ********************************\n\n\n";
-		}
-		$old_name=$table_name ;
-
-
-
-
-	 }
-	 }
-	 if ($str =~  /^\)\;/ ) {
-	    $is_create = 0 ;
-	 }
-
-}
-
-
-
-
-
-
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 5a446c37098c..f7694ee92558 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -24,7 +24,7 @@ typedef struct
 	char	   *ident;
 	int			nplans;
 	SPIPlanPtr *splan;
-} EPlan;
+}	EPlan;
 
 static EPlan *FPlans = NULL;
 static int	nFPlans = 0;
diff --git a/contrib/sslinfo/.gitignore b/contrib/sslinfo/.gitignore
index bf8cb0f3a168..6ed45c8ce5a1 100644
--- a/contrib/sslinfo/.gitignore
+++ b/contrib/sslinfo/.gitignore
@@ -1 +1 @@
-sslinfo.sql
+/sslinfo.sql
diff --git a/contrib/sslinfo/README.sslinfo b/contrib/sslinfo/README.sslinfo
deleted file mode 100755
index 5ce13f54f5c7..000000000000
--- a/contrib/sslinfo/README.sslinfo
+++ /dev/null
@@ -1,120 +0,0 @@
-sslinfo - information about current SSL certificate for PostgreSQL
-==================================================================
-Author: Victor Wagner <vitus@cryptocom.ru>, Cryptocom LTD
-E-Mail of Cryptocom OpenSSL development group: <openssl@cryptocom.ru>
-
-
-1. Notes
---------
-This extension won't build unless your PostgreSQL server is configured
-with --with-openssl.  Information provided with these functions would
-be completely useless if you don't use SSL to connect to database.
-
-
-2. Functions Description
-------------------------
-
-2.1. ssl_is_used()
-~~~~~~~~~~~~~~~~~~
-
-	ssl_is_used() RETURNS boolean;
-
-Returns TRUE, if current connection to server uses SSL and FALSE
-otherwise.
-
-2.2. ssl_client_cert_present()
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-	ssl_client_cert_present() RETURNS boolean
-
-Returns TRUE if current client have presented valid SSL client
-certificate to the server and FALSE otherwise (e.g., no SSL,
-certificate hadn't be requested by server).
-
-2.3. ssl_client_serial() 
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-	ssl_client_serial() RETURNS numeric
-
-Returns serial number of current client certificate.  The combination
-of certificate serial number and certificate issuer is guaranteed to
-uniquely identify certificate (but not its owner -- the owner ought to
-regularily change his keys, and get new certificates from the issuer).
-
-So, if you run you own CA and allow only certificates from this CA to
-be accepted by server, the serial number is the most reliable (albeit
-not very mnemonic) means to indentify user.
-
-2.4. ssl_client_dn()
-~~~~~~~~~~~~~~~~~~~~
-	
-	ssl_client_dn() RETURNS text
-
-Returns the full subject of current client certificate, converting
-character data into the current database encoding.  It is assumed that
-if you use non-Latin characters in the certificate names, your
-database is able to represent these characters, too.  If your database
-uses the SQL_ASCII encoding, non-Latin characters in the name will be
-represented as UTF-8 sequences.
-
-The result looks like '/CN=Somebody /C=Some country/O=Some organization'.
-
-2.5. ssl_issuer_dn()
-~~~~~~~~~~~~~~~~~~~~
-
-Returns the full issuer name of the client certificate, converting
-character data into current database encoding.
-
-The combination of the return value of this function with the
-certificate serial number uniquely identifies the certificate.
-
-The result of this function is really useful only if you have more
-than one trusted CA certificate in your server's root.crt file, or if
-this CA has issued some intermediate certificate authority
-certificates.
-
-2.6. ssl_client_dn_field()
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-	ssl_client_dn_field(fieldName text) RETURNS text
-
-This function returns the value of the specified field in the
-certificate subject.  Field names are string constants that are
-converted into ASN1 object identificators using the OpenSSL object
-database.  The following values are acceptable:
-
-	commonName (alias CN)
-	surname (alias SN)
-	name
-	givenName (alias GN)
-	countryName (alias C) 
-	localityName (alias L)
-	stateOrProvinceName (alias ST)
-	organizationName (alias O)
-	organizationUnitName (alias OU)
-	title
-	description
-	initials
-	postalCode
-	streetAddress
-	generationQualifier
-	description
-	dnQualifier
-	x500UniqueIdentifier
-	pseudonim
-	role
-	emailAddress
-	
-All of these fields are optional, except commonName.  It depends
-entirely on your CA policy which of them would be included and which
-wouldn't.  The meaning of these fields, howeer, is strictly defined by
-the X.500 and X.509 standards, so you cannot just assign arbitrary
-meaning to them.
-
-2.7 ssl_issuer_field()
-~~~~~~~~~~~~~~~~~~~
-
-	ssl_issuer_field(fieldName text) RETURNS text;
-
-Does same as ssl_client_dn_field, but for the certificate issuer
-rather than the certificate subject.
diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL
new file mode 100755
index 000000000000..dc826837a320
--- /dev/null
+++ b/contrib/start-scripts/osx/PostgreSQL
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+##
+# PostgreSQL RDBMS Server
+##
+
+# PostgreSQL boot time startup script for Darwin/Mac OS X. To install, change
+# the "prefix", "PGDATA", "PGUSER", and "PGLOG" variables below as
+# necessary. Next, create a new directory, "/Library/StartupItems/PostgreSQL".
+# Then copy this script and the accompanying "StartupParameters.plist" file
+# into that directory. The name of this script file *must* be the same as the
+# directory it is in. So you'll end up with these two files:
+#
+#    /Library/StartupItems/PostgreSQL/PostgreSQL
+#    /Library/StartupItems/PostgreSQL/StartupParameters.plist
+#
+# Next, add this line to the /etc/hostconfig file:
+#
+# POSTGRESQL=-YES-
+#
+# The startup bundle will now be ready to go. To prevent this script from
+# starting PostgreSQL at system startup, simply change that line in
+# /etc/hostconfig back to:
+#
+# POSTGRESQL=-NO-
+#
+# For more information on Darwin/Mac OS X startup bundles, see this article:
+#
+#  http://www.opensource.apple.com/projects/documentation/howto/html/SystemStarter_HOWTO.html
+#
+# Created by David Wheeler, 2002.
+
+# modified by Ray Aspeitia 12-03-2003 : 
+# added log rotation script to db startup
+# modified StartupParameters.plist "Provides" parameter to make it easier to 
+# start and stop with the SystemStarter utitlity
+
+# use the below command in order to correctly start/stop/restart PG with log rotation script:
+# SystemStarter [start|stop|restart] PostgreSQL
+
+################################################################################
+## EDIT FROM HERE
+################################################################################
+
+# Installation prefix
+prefix="/usr/local/pgsql"
+
+# Data directory
+PGDATA="/usr/local/pgsql/data"
+
+# Who to run the postmaster as, usually "postgres".  (NOT "root")
+PGUSER="postgres"
+
+# the logfile path and name (NEEDS to be writeable by PGUSER)
+PGLOG="${PGDATA}/logs/logfile"
+
+# do you want to rotate the log files, 1=true 0=false
+ROTATELOGS=1
+
+# logfile rotate in seconds
+ROTATESEC="604800"
+
+
+################################################################################
+## STOP EDITING HERE
+################################################################################
+
+# 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)
+DAEMON="$prefix/bin/postmaster"
+
+# What to use to shut down the postmaster
+PGCTL="$prefix/bin/pg_ctl"
+
+# The apache log rotation utility
+LOGUTIL="/usr/sbin/rotatelogs"
+
+. /etc/rc.common
+
+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} &"
+        else
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
+        fi
+    fi
+}
+
+StopService () {
+    ConsoleMessage "Stopping PostgreSQL database server"
+    sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast
+}
+
+RestartService () {
+    if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
+        ConsoleMessage "Restarting PostgreSQL database server"
+	# should match StopService:
+	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} &"
+        else
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
+        fi
+    else
+        StopService
+    fi
+}
+
+RunService "$1"
diff --git a/contrib/start-scripts/osx/README b/contrib/start-scripts/osx/README
new file mode 100644
index 000000000000..97e299f7da6d
--- /dev/null
+++ b/contrib/start-scripts/osx/README
@@ -0,0 +1,3 @@
+To install execute the following:
+
+sudo /bin/sh ./install.sh
diff --git a/contrib/start-scripts/osx/StartupParameters.plist b/contrib/start-scripts/osx/StartupParameters.plist
new file mode 100644
index 000000000000..6c788d0dda77
--- /dev/null
+++ b/contrib/start-scripts/osx/StartupParameters.plist
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Description</key>
+    <string>PostgreSQL Database Server</string>
+    <key>Messages</key>
+    <dict>
+        <key>start</key>
+        <string>Starting PostgreSQL database server</string>
+        <key>stop</key>
+        <string>Stopping PostgreSQL database server</string>
+        <key>restart</key>
+        <string>Restarting PostgreSQL database server</string>
+    </dict>
+    <key>OrderPreference</key>
+    <string>Late</string>
+    <key>Provides</key>
+    <array>
+        <string>PostgreSQL</string>
+    </array>
+    <key>Requires</key>
+    <array>
+        <string>Disks</string>
+        <string>Resolver</string>
+    </array>
+    <key>Uses</key>
+    <array>
+        <string>NFS</string>
+        <string>NetworkTime</string>
+    </array>
+</dict>
+</plist>
diff --git a/contrib/start-scripts/osx/install.sh b/contrib/start-scripts/osx/install.sh
new file mode 100755
index 000000000000..bbc5ee392651
--- /dev/null
+++ b/contrib/start-scripts/osx/install.sh
@@ -0,0 +1,10 @@
+sudo sh -c 'echo "POSTGRESQL=-YES-" >> /etc/hostconfig'
+sudo mkdir /Library/StartupItems/PostgreSQL
+sudo cp PostgreSQL /Library/StartupItems/PostgreSQL
+sudo cp StartupParameters.plist /Library/StartupItems/PostgreSQL
+if [ -e /Library/StartupItems/PostgreSQL/PostgreSQL ]
+then
+  echo "Startup Item Installed Successfully . . . "
+  echo "Starting PostgreSQL Server . . . "
+  SystemStarter restart PostgreSQL
+fi
diff --git a/contrib/tablefunc/.gitignore b/contrib/tablefunc/.gitignore
new file mode 100644
index 000000000000..b28639637bcf
--- /dev/null
+++ b/contrib/tablefunc/.gitignore
@@ -0,0 +1,3 @@
+/tablefunc.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/test_parser/.gitignore b/contrib/test_parser/.gitignore
new file mode 100644
index 000000000000..c07f518855cc
--- /dev/null
+++ b/contrib/test_parser/.gitignore
@@ -0,0 +1,3 @@
+/test_parser.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/test_parser/Makefile b/contrib/test_parser/Makefile
new file mode 100644
index 000000000000..449906954872
--- /dev/null
+++ b/contrib/test_parser/Makefile
@@ -0,0 +1,18 @@
+# $PostgreSQL: pgsql/contrib/test_parser/Makefile,v 1.2 2007/12/03 04:22:54 tgl Exp $
+
+MODULE_big = test_parser
+OBJS = test_parser.o
+DATA_built = test_parser.sql
+DATA = uninstall_test_parser.sql
+REGRESS = test_parser
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/test_parser
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/test_parser/expected/test_parser.out b/contrib/test_parser/expected/test_parser.out
new file mode 100644
index 000000000000..ec4e3b2bb4e7
--- /dev/null
+++ b/contrib/test_parser/expected/test_parser.out
@@ -0,0 +1,50 @@
+--
+-- first, define the parser.  Turn off echoing so that expected file
+-- does not depend on contents of this file.
+--
+SET client_min_messages = warning;
+\set ECHO none
+RESET client_min_messages;
+-- make test configuration using parser
+CREATE TEXT SEARCH CONFIGURATION testcfg (PARSER = testparser);
+ALTER TEXT SEARCH CONFIGURATION testcfg ADD MAPPING FOR word WITH simple;
+-- ts_parse
+SELECT * FROM ts_parse('testparser', 'That''s simple parser can''t parse urls like http://some.url/here/');
+ tokid |         token         
+-------+-----------------------
+     3 | That's
+    12 |  
+     3 | simple
+    12 |  
+     3 | parser
+    12 |  
+     3 | can't
+    12 |  
+     3 | parse
+    12 |  
+     3 | urls
+    12 |  
+     3 | like
+    12 |  
+     3 | http://some.url/here/
+(15 rows)
+
+SELECT to_tsvector('testcfg','That''s my first own parser');
+                   to_tsvector                   
+-------------------------------------------------
+ 'my':2 'own':4 'first':3 'parser':5 'that''s':1
+(1 row)
+
+SELECT to_tsquery('testcfg', 'star');
+ to_tsquery 
+------------
+ 'star'
+(1 row)
+
+SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', 
+       to_tsquery('testcfg', 'stars'));
+                           ts_headline                           
+-----------------------------------------------------------------
+ Supernovae <b>stars</b> are the brightest phenomena in galaxies
+(1 row)
+
diff --git a/contrib/test_parser/sql/test_parser.sql b/contrib/test_parser/sql/test_parser.sql
new file mode 100644
index 000000000000..f43d4c7e09ba
--- /dev/null
+++ b/contrib/test_parser/sql/test_parser.sql
@@ -0,0 +1,26 @@
+--
+-- first, define the parser.  Turn off echoing so that expected file
+-- does not depend on contents of this file.
+--
+SET client_min_messages = warning;
+\set ECHO none
+\i test_parser.sql
+\set ECHO all
+RESET client_min_messages;
+
+-- make test configuration using parser
+
+CREATE TEXT SEARCH CONFIGURATION testcfg (PARSER = testparser);
+
+ALTER TEXT SEARCH CONFIGURATION testcfg ADD MAPPING FOR word WITH simple;
+
+-- ts_parse
+
+SELECT * FROM ts_parse('testparser', 'That''s simple parser can''t parse urls like http://some.url/here/');
+
+SELECT to_tsvector('testcfg','That''s my first own parser');
+
+SELECT to_tsquery('testcfg', 'star');
+
+SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', 
+       to_tsquery('testcfg', 'stars'));
diff --git a/contrib/test_parser/test_parser.c b/contrib/test_parser/test_parser.c
new file mode 100644
index 000000000000..4acbbc00c92d
--- /dev/null
+++ b/contrib/test_parser/test_parser.c
@@ -0,0 +1,139 @@
+/*-------------------------------------------------------------------------
+ *
+ * test_parser.c
+ *	  Simple example of a text search parser
+ *
+ * Copyright (c) 2007-2008, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.4 2008/01/01 20:31:21 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "fmgr.h"
+
+PG_MODULE_MAGIC;
+
+
+/*
+ * types
+ */
+
+/* self-defined type */
+typedef struct
+{
+	char	   *buffer;			/* text to parse */
+	int			len;			/* length of the text in buffer */
+	int			pos;			/* position of the parser */
+}	ParserState;
+
+/* copy-paste from wparser.h of tsearch2 */
+typedef struct
+{
+	int			lexid;
+	char	   *alias;
+	char	   *descr;
+} LexDescr;
+
+/*
+ * prototypes
+ */
+PG_FUNCTION_INFO_V1(testprs_start);
+Datum		testprs_start(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(testprs_getlexeme);
+Datum		testprs_getlexeme(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(testprs_end);
+Datum		testprs_end(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(testprs_lextype);
+Datum		testprs_lextype(PG_FUNCTION_ARGS);
+
+/*
+ * functions
+ */
+Datum
+testprs_start(PG_FUNCTION_ARGS)
+{
+	ParserState *pst = (ParserState *) palloc0(sizeof(ParserState));
+
+	pst->buffer = (char *) PG_GETARG_POINTER(0);
+	pst->len = PG_GETARG_INT32(1);
+	pst->pos = 0;
+
+	PG_RETURN_POINTER(pst);
+}
+
+Datum
+testprs_getlexeme(PG_FUNCTION_ARGS)
+{
+	ParserState *pst = (ParserState *) PG_GETARG_POINTER(0);
+	char	  **t = (char **) PG_GETARG_POINTER(1);
+	int		   *tlen = (int *) PG_GETARG_POINTER(2);
+	int			startpos = pst->pos;
+	int			type;
+
+	*t = pst->buffer + pst->pos;
+
+	if (pst->pos < pst->len &&
+		(pst->buffer)[pst->pos] == ' ')
+	{
+		/* blank type */
+		type = 12;
+		/* go to the next non-space character */
+		while (pst->pos < pst->len &&
+			   (pst->buffer)[pst->pos] == ' ')
+			(pst->pos)++;
+	}
+	else
+	{
+		/* word type */
+		type = 3;
+		/* go to the next space character */
+		while (pst->pos < pst->len &&
+			   (pst->buffer)[pst->pos] != ' ')
+			(pst->pos)++;
+	}
+
+	*tlen = pst->pos - startpos;
+
+	/* we are finished if (*tlen == 0) */
+	if (*tlen == 0)
+		type = 0;
+
+	PG_RETURN_INT32(type);
+}
+
+Datum
+testprs_end(PG_FUNCTION_ARGS)
+{
+	ParserState *pst = (ParserState *) PG_GETARG_POINTER(0);
+
+	pfree(pst);
+	PG_RETURN_VOID();
+}
+
+Datum
+testprs_lextype(PG_FUNCTION_ARGS)
+{
+	/*
+	 * Remarks: - we have to return the blanks for headline reason - we use
+	 * the same lexids like Teodor in the default word parser; in this way we
+	 * can reuse the headline function of the default word parser.
+	 */
+	LexDescr   *descr = (LexDescr *) palloc(sizeof(LexDescr) * (2 + 1));
+
+	/* there are only two types in this parser */
+	descr[0].lexid = 3;
+	descr[0].alias = pstrdup("word");
+	descr[0].descr = pstrdup("Word");
+	descr[1].lexid = 12;
+	descr[1].alias = pstrdup("blank");
+	descr[1].descr = pstrdup("Space symbols");
+	descr[2].lexid = 0;
+
+	PG_RETURN_POINTER(descr);
+}
diff --git a/contrib/test_parser/test_parser.sql.in b/contrib/test_parser/test_parser.sql.in
new file mode 100644
index 000000000000..4fd9b0796e22
--- /dev/null
+++ b/contrib/test_parser/test_parser.sql.in
@@ -0,0 +1,32 @@
+/* $PostgreSQL: pgsql/contrib/test_parser/test_parser.sql.in,v 1.3 2007/11/13 04:24:29 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+CREATE OR REPLACE FUNCTION testprs_start(internal, int4)
+RETURNS internal
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION testprs_getlexeme(internal, internal, internal)
+RETURNS internal
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION testprs_end(internal)
+RETURNS void
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE OR REPLACE FUNCTION testprs_lextype(internal)
+RETURNS internal
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT;
+
+CREATE TEXT SEARCH PARSER testparser (
+    START    = testprs_start,
+    GETTOKEN = testprs_getlexeme,
+    END      = testprs_end,
+    HEADLINE = pg_catalog.prsd_headline,
+    LEXTYPES = testprs_lextype
+);
diff --git a/contrib/test_parser/uninstall_test_parser.sql b/contrib/test_parser/uninstall_test_parser.sql
new file mode 100644
index 000000000000..66686d20042b
--- /dev/null
+++ b/contrib/test_parser/uninstall_test_parser.sql
@@ -0,0 +1,14 @@
+/* $PostgreSQL: pgsql/contrib/test_parser/uninstall_test_parser.sql,v 1.3 2007/11/13 04:24:29 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public;
+
+DROP TEXT SEARCH PARSER testparser;
+
+DROP FUNCTION testprs_start(internal, int4);
+
+DROP FUNCTION testprs_getlexeme(internal, internal, internal);
+
+DROP FUNCTION testprs_end(internal);
+
+DROP FUNCTION testprs_lextype(internal);
diff --git a/contrib/tsearch2/.gitignore b/contrib/tsearch2/.gitignore
index 11187a7fbeca..2f6a90856527 100644
--- a/contrib/tsearch2/.gitignore
+++ b/contrib/tsearch2/.gitignore
@@ -1,2 +1,4 @@
-tsearch2.sql
 uninstall_tsearch2.sql
+/tsearch2.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile
index b4dbec036fbb..8ab634323f23 100644
--- a/contrib/tsearch2/Makefile
+++ b/contrib/tsearch2/Makefile
@@ -1,29 +1,10 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.19 2007/06/26 22:05:03 tgl Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.20 2007/11/13 21:02:28 tgl Exp $
 
-MODULE_big = tsearch2
-OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
-       dict_snowball.o dict_ispell.o dict_syn.o dict_thesaurus.o \
-       wparser.o wparser_def.o \
-       ts_cfg.o tsvector.o query_cleanup.o crc32.o query.o gistidx.o \
-       tsvector_op.o rank.o ts_stat.o \
-       query_util.o query_support.o query_rewrite.o query_gist.o \
-       ts_locale.o ts_lexize.o ginidx.o
-
-SUBDIRS     = snowball ispell wordparser
-SUBDIROBJS  = $(SUBDIRS:%=%/SUBSYS.o)
-
-OBJS	+= $(SUBDIROBJS)
-
-PG_CPPFLAGS = -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser
-
-DATA = stopword/english.stop stopword/russian.stop stopword/russian.stop.utf8 thesaurus
-DATA_built = tsearch2.sql uninstall_tsearch2.sql
-DOCS = README.tsearch2
+MODULES = tsearch2
+DATA_built = tsearch2.sql
+DATA = uninstall_tsearch2.sql
 REGRESS = tsearch2
 
-SHLIB_LINK += $(filter -lm, $(LIBS))
-
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -34,23 +15,3 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
-
-
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
-
-.PHONY: $(SUBDIRS:%=%-recursive)
-
-$(SUBDIRS:%=%-recursive):
-	$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
-
-tsearch2.sql: tsearch.sql.in
-	sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >$@
-
-uninstall_tsearch2.sql: untsearch.sql.in
-	cp $< $@
-
-.PHONY: subclean
-clean: subclean
-
-subclean:
-	for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done
diff --git a/contrib/tsearch2/README.tsearch2 b/contrib/tsearch2/README.tsearch2
deleted file mode 100755
index 5d7b19d55f6e..000000000000
--- a/contrib/tsearch2/README.tsearch2
+++ /dev/null
@@ -1,210 +0,0 @@
-Tsearch2 - full text search extension for PostgreSQL
-
-   [1]Online version of this document is available
-
-   Tsearch2  -  is the full text engine, fully integrated into PostgreSQL
-   RDBMS.
-
-Main features
-
-     * Full online update
-     * Supports multiple table driven configurations
-     * flexible  and  rich linguistic support (dictionaries, stop words),
-       thesaurus
-     * full multibyte (UTF-8) support
-     * Sophisticated  ranking  functions  with  support  of proximity and
-       structure information (rank, rank_cd)
-     * Index support (GiST and Gin) with concurrency and recovery support
-     * Rich query language with query rewriting support
-     * Headline support (text fragments with highlighted search terms)
-     * Ability to plug-in custom dictionaries and parsers
-     * Template  generator  for  tsearch2  dictionaries  with [2]snowball
-       stemmer support
-     * It is mature (5 years of development)
-
-   Tsearch2,  in a nutshell, provides FTS operator (contains) for the new
-   data  types,  representing  document  (tsvector)  and query (tsquery).
-   Table  driven  configuration  allows creation of custom searches using
-   standard SQL commands.
-
-   tsvector is a searchable data type, representing document. It is a set
-   of  unique  words  along  with  their  positional  information  in the
-   document,  organized  in a special structure optimized for fast access
-   and  lookup. Each entry could be labelled to reflect its importance in
-   document.
-
-   tsquery  is  a  data  type for textual queries with support of boolean
-   operators.  It  consists of lexemes (optionally labelled) with boolean
-   operators between.
-
-   Table driven configuration allows to specify:
-     * parser, which used to break document onto lexemes
-     * what lexemes to index and the way they are processed
-     * dictionaries to be used along with stop words recognition.
-
-OpenFTS vs Tsearch2
-
-   [3]OpenFTS  is  a middleware between application and database. OpenFTS
-   uses  tsearch2  as  a  storage and database engine as a query executor
-   (searching).   Everything  else,  i.e.  parsing  of  documents,  query
-   processing, linguistics, carry outs on client side. That's why OpenFTS
-   has  its own configuration table (fts_conf) and works with its own set
-   of dictionaries. OpenFTS is more flexible, because it could be used in
-   multi-server  architecture  with  separate  machines for repository of
-   documents  (documents  could  be  stored  in filesystem), database and
-   query engine.
-
-   See [4]Documentation Roadmap for links to documentation.
-
-Authors
-
-     * Oleg Bartunov <oleg@sai.msu.su>, Moscow, Moscow University, Russia
-     * Teodor Sigaev <teodor@sigaev.ru>, Moscow,Moscow University,Russia
-
-Contributors
-
-     * Robert   John   Shepherd   and   Andrew   J.   Kopciuch  submitted
-       "Introduction  to  tsearch" (Robert - tsearch v1, Andrew - tsearch
-       v2)
-     * Brandon   Craig   Rhodes  wrote  "Tsearch2  Guide"  and  "Tsearch2
-       Reference" and proposed new naming convention for tsearch V2
-
-Sponsors
-
-     * ABC Startsiden - compound words support
-     * University of Mannheim for UTF-8 support (in 8.2)
-     * jfg:networks ([5]http:www.jfg-networks.com/) for Gin - Generalized
-       Inverted index (in 8.2)
-     * Georgia  Public  Library  Service  and LibLime, Inc. for Thesaurus
-       dictionary
-     * PostGIS community - GiST Concurrency and Recovery
-
-   The  authors are grateful to the Russian Foundation for Basic Research
-   and Delta-Soft Ltd., Moscow, Russia for support.
-
-Limitations
-
-     * Length of lexeme < 2K
-     * Length of tsvector (lexemes + positions) < 1Mb
-     * The number of lexemes < 4^32
-     * 0< Positional information < 16383
-     * No more than 256 positions per lexeme
-     * The number of nodes ( lexemes + operations) in tsquery < 32768
-
-References
-
-     * GiST development site -
-       [6]http://www.sai.msu.su/~megera/postgres/gist
-     * GiN development - [7]http://www.sigaev.ru/gin/
-     * OpenFTS home page - [8]http://openfts.sourceforge.net/
-     * Mailing list -
-       [9]http://sourceforge.net/mailarchive/forum.php?forum=openfts-gene
-       ral
-
-Documentation Roadmap
-
-     * Several docs are available from docs/ subdirectory
-          + "Tsearch V2 Introduction" by Andrew Kopciuch
-          + "Tsearch2 Guide" by Brandon Rhodes
-          + "Tsearch2 Reference" by Brandon Rhodes
-     * Readme.gendict in gendict/ subdirectory
-          + Also, check [10]Gendict tutorial
-     * Check [11]tsearch2 Wiki pages for various documentation
-
-Support
-
-   Authors  urgently  recommend  people  to  use  [12]openfts-general  or
-   [13]pgsql-general mailing lists for questions and discussions.
-
-Development History
-
-   Latest news
-
-   To the PostgreSQL 8.2 release we added:
-     * multibyte (UTF-8) support
-     * Thesaurus dictionary
-     * Query rewriting
-     * rank_cd  relevation  function  now  support  different  weights of
-       lexemes
-     * GiN support adds scalability of tsearch2
-
-   Pre-tsearch era
-          Development  of  OpenFTS  began in 2000 after realizing that we
-          need  a  search engine optimized for online updates with access
-          to  metadata  from  the  database. This is essential for online
-          news agencies, web portals, digital libraries, etc. Most search
-          engines  available utilize an inverted index which is very fast
-          for  searching  but  very  slow for online updates. Incremental
-          updates  of  an  inverted  index  is a complex engineering task
-          while  we  needed something light, free and with the ability to
-          access  metadata  from  the  database. The last requirement was
-          very important because in a real life application search engine
-          should  always  consult  metadata  (  topic,  permissions, date
-          range,  version,  etc.).  We  extensively  use  PostgreSQL as a
-          database  backend and have no intention to move from it, so the
-          problem  was  to find a data structure and a fast way to access
-          it.  PostgreSQL  has  rather  unique data type for storing sets
-          (think  about  words) - arrays, but lacks index access to them.
-          During our research we found a paper of Joseph Hellerstein, who
-          introduced  an  interesting  data structure suitable for sets -
-          RD-tree  (Russian  Doll  tree). Further research lead us to the
-          idea to use GiST for implementing RD-tree, but at that time the
-          GiST  code  was untouched for a long time and contained several
-          bugs.  After  work  on  improving  GiST  for  version  7.0.3 of
-          PostgreSQL  was done, we were able to implement RD-Tree and use
-          it  for index access to arrays of integers. This implementation
-          was  ideally  suited  for  small  arrays and eliminated complex
-          joins,  but  was practically useless for indexing large arrays.
-          The  next improvement came from an idea to represent a document
-          by  a  single bit-signature, a so-called superimposed signature
-          (see "Index Structures for Databases Containing Data Items with
-          Set-valued  Attributes",  1997,  Sven  Helmer  for details). We
-          developed  the  contrib/intarray  module and used it for full
-          text indexing.
-
-   tsearch v1
-          It was inconvenient to use integer id's instead of words, so we
-          introduced  a new data type called 'txtidx' - a searchable data
-          type  (textual)  with  indexed access. This was a first step of
-          our  work  on  an  implementation of a built-in PostgreSQL full
-          text search engine. Even though tsearch v1 had many features of
-          a  search  engine it lacked configuration support and relevance
-          ranking.  People were encouraged to use OpenFTS, which provided
-          relevance  ranking based on positional information and flexible
-          configuration.  OpenFTS  v.0.34  is  the  last version based on
-          tsearch v1.
-
-   tsearch V2
-          People  recognized  tsearch  as  a  powerful tool for full text
-          searching  and  insisted  on  adding  ranking  support,  better
-          configurability,  etc.  We already thought about moving most of
-          the  features  of  OpenFTS to tsearch, and in the early 2003 we
-          decided  to  work  on  a  new  version of tsearch. We abandoned
-          auxiliary  index  tables  which  were  used by OpenFTS to store
-          positional  information  and  modified the txtidx type to store
-          them  internally.  We added table-driven configuration, support
-          of  ispell  dictionaries,  snowball stemmers and the ability to
-          specify  which types of lexemes to index. Now, it's possible to
-          generate  headlines of documents with highlighted search terms.
-          These  changes make tsearch more user friendly and turn it into
-          a  really  powerful  full  text  search  engine. Brandon Rhodes
-          proposed  to  rename  tsearch  functions for consistency and we
-          renamed  txtidx  type  to tsvector and other things as well. To
-          allow  users  of tsearch v1 smooth upgrade, we named the module
-          as tsearch2. Since version 0.35 OpenFTS uses tsearch2.
-
-References
-
-   1. http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/docs/Tsearch_V2_Readme.html
-   2. http://snowball.tartarus.org/
-   3. http://openfts.sourceforge.net/
-   4. file://localhost/u/megera/WWW/postgres/gist/tsearch/V2/docs/Tsearch_V2_Readme82.html#dm
-   5. http:www.jfg-networks.com/
-   6. http://www.sai.msu.su/~megera/postgres/gist
-   7. http://www.sigaev.ru/gin/
-   8. http://openfts.sourceforge.net/
-   9. http://sourceforge.net/mailarchive/forum.php?forum=openfts-general
-  10. http://www.sai.msu.su/~megera/wiki/Gendict
-  11. http://www.sai.msu.su/~megera/wiki/Tsearch2
-  12. http://sourceforge.net/mailarchive/forum.php?forum=openfts-general
-  13. http://archives.postgresql.org/pgsql-general/
diff --git a/contrib/tsearch2/common.c b/contrib/tsearch2/common.c
deleted file mode 100644
index 2a2e0fd7750d..000000000000
--- a/contrib/tsearch2/common.c
+++ /dev/null
@@ -1,188 +0,0 @@
-#include "postgres.h"
-
-#include "fmgr.h"
-#include "catalog/pg_namespace.h"
-#include "catalog/pg_proc.h"
-#include "utils/syscache.h"
-#include "miscadmin.h"
-
-#include "ts_cfg.h"
-#include "dict.h"
-#include "wparser.h"
-#include "snmap.h"
-#include "common.h"
-#include "tsvector.h"
-
-
-
-#include "common.h"
-#include "wparser.h"
-#include "ts_cfg.h"
-#include "dict.h"
-
-
-Oid			TSNSP_FunctionOid = InvalidOid;
-
-
-text *
-char2text(char *in)
-{
-	return charl2text(in, strlen(in));
-}
-
-text *
-charl2text(char *in, int len)
-{
-	text	   *out = (text *) palloc(len + VARHDRSZ);
-
-	memcpy(VARDATA(out), in, len);
-	SET_VARSIZE(out, len + VARHDRSZ);
-	return out;
-}
-
-char
-		   *
-text2char(text *in)
-{
-	char	   *out = palloc(VARSIZE(in));
-
-	memcpy(out, VARDATA(in), VARSIZE(in) - VARHDRSZ);
-	out[VARSIZE(in) - VARHDRSZ] = '\0';
-	return out;
-}
-
-char
-		   *
-pnstrdup(const char *in, Size len)
-{
-	char	   *out = palloc(len + 1);
-
-	memcpy(out, in, len);
-	out[len] = '\0';
-	return out;
-}
-
-text
-		   *
-ptextdup(text *in)
-{
-	text	   *out = (text *) palloc(VARSIZE(in));
-
-	memcpy(out, in, VARSIZE(in));
-	return out;
-}
-
-text
-		   *
-mtextdup(text *in)
-{
-	text	   *out = (text *) malloc(VARSIZE(in));
-
-	if (!out)
-		ts_error(ERROR, "No memory");
-	memcpy(out, in, VARSIZE(in));
-	return out;
-}
-
-void
-ts_error(int state, const char *format,...)
-{
-	va_list		args;
-	int			tlen = 128,
-				len = 0;
-	char	   *buf;
-
-	reset_cfg();
-	reset_dict();
-	reset_prs();
-
-	va_start(args, format);
-	buf = palloc(tlen);
-	len = vsnprintf(buf, tlen - 1, format, args);
-	if (len >= tlen)
-	{
-		tlen = len + 1;
-		buf = repalloc(buf, tlen);
-		vsnprintf(buf, tlen - 1, format, args);
-	}
-	va_end(args);
-
-	/* ?? internal error ?? */
-	elog(state, "%s", buf);
-	pfree(buf);
-}
-
-int
-text_cmp(text *a, text *b)
-{
-	if (VARSIZE(a) == VARSIZE(b))
-		return strncmp(VARDATA(a), VARDATA(b), VARSIZE(a) - VARHDRSZ);
-	return (int) VARSIZE(a) - (int) VARSIZE(b);
-
-}
-
-char *
-get_namespace(Oid funcoid)
-{
-	HeapTuple	tuple;
-	Form_pg_proc proc;
-	Form_pg_namespace nsp;
-	Oid			nspoid;
-	char	   *txt;
-
-	tuple = SearchSysCache(PROCOID, ObjectIdGetDatum(funcoid), 0, 0, 0);
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for proc oid %u", funcoid);
-	proc = (Form_pg_proc) GETSTRUCT(tuple);
-	nspoid = proc->pronamespace;
-	ReleaseSysCache(tuple);
-
-	tuple = SearchSysCache(NAMESPACEOID, ObjectIdGetDatum(nspoid), 0, 0, 0);
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for namespace oid %u", nspoid);
-	nsp = (Form_pg_namespace) GETSTRUCT(tuple);
-	txt = pstrdup(NameStr((nsp->nspname)));
-	ReleaseSysCache(tuple);
-
-	return txt;
-}
-
-Oid
-get_oidnamespace(Oid funcoid)
-{
-	HeapTuple	tuple;
-	Form_pg_proc proc;
-	Oid			nspoid;
-
-	tuple = SearchSysCache(PROCOID, ObjectIdGetDatum(funcoid), 0, 0, 0);
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for proc oid %u", funcoid);
-	proc = (Form_pg_proc) GETSTRUCT(tuple);
-	nspoid = proc->pronamespace;
-	ReleaseSysCache(tuple);
-
-	return nspoid;
-}
-
- /* if path is relative, take it as relative to share dir */
-char *
-to_absfilename(char *filename)
-{
-	if (!is_absolute_path(filename))
-	{
-		char		sharepath[MAXPGPATH];
-		char	   *absfn;
-
-#ifdef	WIN32
-		char		delim = '\\';
-#else
-		char		delim = '/';
-#endif
-		get_share_path(my_exec_path, sharepath);
-		absfn = palloc(strlen(sharepath) + strlen(filename) + 2);
-		sprintf(absfn, "%s%c%s", sharepath, delim, filename);
-		filename = absfn;
-	}
-
-	return filename;
-}
diff --git a/contrib/tsearch2/common.h b/contrib/tsearch2/common.h
deleted file mode 100644
index c0d9f6763f01..000000000000
--- a/contrib/tsearch2/common.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __TS_COMMON_H__
-#define __TS_COMMON_H__
-
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/array.h"
-
-text	   *char2text(char *in);
-text	   *charl2text(char *in, int len);
-char	   *text2char(text *in);
-char	   *pnstrdup(const char *in, Size len);
-text	   *ptextdup(text *in);
-text	   *mtextdup(text *in);
-
-int			text_cmp(text *a, text *b);
-
-char	   *to_absfilename(char *filename);
-
-#define NEXTVAL(x) ( (text*)( (char*)(x) + INTALIGN( VARSIZE(x) ) ) )
-#define ARRNELEMS(x)  ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x))
-
-void		ts_error(int state, const char *format,...);
-
-extern Oid	TSNSP_FunctionOid;	/* oid of called function, needed only for
-								 * determ namespace, no more */
-char	   *get_namespace(Oid funcoid);
-Oid			get_oidnamespace(Oid funcoid);
-
-#define SET_FUNCOID()	do {											\
-		if ( fcinfo->flinfo && fcinfo->flinfo->fn_oid != InvalidOid )	\
-				TSNSP_FunctionOid = fcinfo->flinfo->fn_oid;					  \
-} while(0)
-
-#endif
diff --git a/contrib/tsearch2/crc32.c b/contrib/tsearch2/crc32.c
deleted file mode 100644
index bc5c7605dd34..000000000000
--- a/contrib/tsearch2/crc32.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Both POSIX and CRC32 checksums */
-
-/* $PostgreSQL: pgsql/contrib/tsearch2/crc32.c,v 1.4 2007/07/15 22:40:28 tgl Exp $ */
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#include "crc32.h"
-
-/*
- * This code implements the AUTODIN II polynomial
- * The variable corresponding to the macro argument "crc" should
- * be an unsigned long.
- * Oroginal code  by Spencer Garrett <srg@quick.com>
- */
-
-#define _CRC32_(crc, ch)	 ((crc) = ((crc) >> 8) ^ crc32tab[((crc) ^ (ch)) & 0xff])
-
-/* generated using the AUTODIN II polynomial
- *	x^32 + x^26 + x^23 + x^22 + x^16 +
- *	x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x^1 + 1
- */
-
-static const unsigned int crc32tab[256] = {
-	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
-	0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
-	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
-	0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
-	0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
-	0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-	0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
-	0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
-	0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
-	0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
-	0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
-	0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
-	0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-	0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
-	0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
-	0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-	0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-	0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
-	0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-	0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
-	0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
-	0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
-	0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
-	0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-	0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
-	0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-	0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-	0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
-	0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
-	0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-	0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-	0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
-	0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
-	0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
-	0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
-	0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
-	0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-	0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
-	0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-	0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-	0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
-	0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
-	0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-	0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-	0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
-	0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-	0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
-	0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
-	0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
-	0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
-	0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
-};
-
-unsigned int
-crc32_sz(char *buf, int size)
-{
-	unsigned int crc = ~((unsigned int) 0);
-	char	   *p;
-	int			len,
-				nr;
-
-	len = 0;
-	nr = size;
-	for (len += nr, p = buf; nr--; ++p)
-		_CRC32_(crc, *p);
-	return ~crc;
-}
diff --git a/contrib/tsearch2/crc32.h b/contrib/tsearch2/crc32.h
deleted file mode 100644
index 420c9594ac20..000000000000
--- a/contrib/tsearch2/crc32.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _CRC32_H
-#define _CRC32_H
-
-/* $PostgreSQL: pgsql/contrib/tsearch2/crc32.h,v 1.2 2006/03/11 04:38:30 momjian Exp $ */
-
-/* Returns crc32 of data block */
-extern unsigned int crc32_sz(char *buf, int size);
-
-/* Returns crc32 of null-terminated string */
-#define crc32(buf) crc32_sz((buf),strlen(buf))
-
-#endif
diff --git a/contrib/tsearch2/dict.c b/contrib/tsearch2/dict.c
deleted file mode 100644
index 182f5c329104..000000000000
--- a/contrib/tsearch2/dict.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict.c,v 1.13 2006/10/04 00:29:46 momjian Exp $ */
-
-/*
- * interface functions to dictionary
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <ctype.h>
-
-#include "catalog/pg_type.h"
-#include "executor/spi.h"
-#include "fmgr.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
-
-#include "dict.h"
-#include "common.h"
-#include "snmap.h"
-
-/*********top interface**********/
-
-void
-init_dict(Oid id, DictInfo * dict)
-{
-	Oid			arg[1];
-	bool		isnull;
-	Datum		pars[1];
-	int			stat;
-	void	   *plan;
-	char		buf[1024];
-	char	   *nsp = get_namespace(TSNSP_FunctionOid);
-
-	arg[0] = OIDOID;
-	pars[0] = ObjectIdGetDatum(id);
-
-	memset(dict, 0, sizeof(DictInfo));
-	SPI_connect();
-	sprintf(buf, "select dict_init, dict_initoption, dict_lexize from %s.pg_ts_dict where oid = $1", nsp);
-	pfree(nsp);
-	plan = SPI_prepare(buf, 1, arg);
-	if (!plan)
-		ts_error(ERROR, "SPI_prepare() failed");
-
-	stat = SPI_execp(plan, pars, " ", 1);
-	if (stat < 0)
-		ts_error(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed > 0)
-	{
-		Datum		opt;
-		Oid			oid = InvalidOid;
-
-		/* setup dictlexize method */
-		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 3, &isnull));
-		if (isnull || oid == InvalidOid)
-			ts_error(ERROR, "Null dict_lexize for dictonary %d", id);
-		fmgr_info_cxt(oid, &(dict->lexize_info), TopMemoryContext);
-
-		/* setup and call dictinit method, optinally */
-		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-		if (!(isnull || oid == InvalidOid))
-		{
-			opt = SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 2, &isnull);
-			dict->dictionary = (void *) DatumGetPointer(OidFunctionCall1(oid, opt));
-		}
-		dict->dict_id = id;
-	}
-	else
-		ts_error(ERROR, "No dictionary with id %d", id);
-	SPI_freeplan(plan);
-	SPI_finish();
-}
-
-typedef struct
-{
-	DictInfo   *last_dict;
-	int			len;
-	int			reallen;
-	DictInfo   *list;
-	SNMap		name2id_map;
-}	DictList;
-
-static DictList DList = {NULL, 0, 0, NULL, {0, 0, NULL}};
-
-void
-reset_dict(void)
-{
-	freeSNMap(&(DList.name2id_map));
-	/* XXX need to free DList.list[*].dictionary */
-	if (DList.list)
-		free(DList.list);
-	memset(&DList, 0, sizeof(DictList));
-}
-
-
-static int
-comparedict(const void *a, const void *b)
-{
-	if (((DictInfo *) a)->dict_id == ((DictInfo *) b)->dict_id)
-		return 0;
-	return (((DictInfo *) a)->dict_id < ((DictInfo *) b)->dict_id) ? -1 : 1;
-}
-
-static void
-insertdict(Oid id)
-{
-	DictInfo	newdict;
-
-	if (DList.len == DList.reallen)
-	{
-		DictInfo   *tmp;
-		int			reallen = (DList.reallen) ? 2 * DList.reallen : 16;
-
-		tmp = (DictInfo *) realloc(DList.list, sizeof(DictInfo) * reallen);
-		if (!tmp)
-			ts_error(ERROR, "No memory");
-		DList.reallen = reallen;
-		DList.list = tmp;
-	}
-	init_dict(id, &newdict);
-
-	DList.list[DList.len] = newdict;
-	DList.len++;
-
-	qsort(DList.list, DList.len, sizeof(DictInfo), comparedict);
-}
-
-DictInfo *
-finddict(Oid id)
-{
-	/* last used dict */
-	if (DList.last_dict && DList.last_dict->dict_id == id)
-		return DList.last_dict;
-
-
-	/* already used dict */
-	if (DList.len != 0)
-	{
-		DictInfo	key;
-
-		key.dict_id = id;
-		DList.last_dict = bsearch(&key, DList.list, DList.len, sizeof(DictInfo), comparedict);
-		if (DList.last_dict != NULL)
-			return DList.last_dict;
-	}
-
-	/* insert new dictionary */
-	insertdict(id);
-	return finddict(id); /* qsort changed order!! */ ;
-}
-
-Oid
-name2id_dict(text *name)
-{
-	Oid			arg[1];
-	bool		isnull;
-	Datum		pars[1];
-	int			stat;
-	Oid			id = findSNMap_t(&(DList.name2id_map), name);
-	void	   *plan;
-	char		buf[1024],
-			   *nsp;
-
-	arg[0] = TEXTOID;
-	pars[0] = PointerGetDatum(name);
-
-	if (id)
-		return id;
-
-	nsp = get_namespace(TSNSP_FunctionOid);
-	SPI_connect();
-	sprintf(buf, "select oid from %s.pg_ts_dict where dict_name = $1", nsp);
-	pfree(nsp);
-	plan = SPI_prepare(buf, 1, arg);
-	if (!plan)
-		ts_error(ERROR, "SPI_prepare() failed");
-
-	stat = SPI_execp(plan, pars, " ", 1);
-	if (stat < 0)
-		ts_error(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed > 0)
-		id = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-	else
-		ts_error(ERROR, "No dictionary with name '%s'", text2char(name));
-	SPI_freeplan(plan);
-	SPI_finish();
-	addSNMap_t(&(DList.name2id_map), name, id);
-	return id;
-}
-
-
-/******sql-level interface******/
-PG_FUNCTION_INFO_V1(lexize);
-Datum		lexize(PG_FUNCTION_ARGS);
-
-Datum
-lexize(PG_FUNCTION_ARGS)
-{
-	text	   *in = PG_GETARG_TEXT_P(1);
-	DictInfo   *dict;
-	TSLexeme   *res,
-			   *ptr;
-	Datum	   *da;
-	ArrayType  *a;
-	DictSubState dstate = {false, false, NULL};
-
-	SET_FUNCOID();
-	dict = finddict(PG_GETARG_OID(0));
-
-	ptr = res = (TSLexeme *) DatumGetPointer(
-										  FunctionCall4(&(dict->lexize_info),
-										   PointerGetDatum(dict->dictionary),
-												PointerGetDatum(VARDATA(in)),
-									   Int32GetDatum(VARSIZE(in) - VARHDRSZ),
-													 PointerGetDatum(&dstate)
-														)
-		);
-
-	if (dstate.getnext)
-	{
-		dstate.isend = true;
-		ptr = res = (TSLexeme *) DatumGetPointer(
-										  FunctionCall4(&(dict->lexize_info),
-										   PointerGetDatum(dict->dictionary),
-												PointerGetDatum(VARDATA(in)),
-									   Int32GetDatum(VARSIZE(in) - VARHDRSZ),
-													 PointerGetDatum(&dstate)
-														)
-			);
-	}
-
-	PG_FREE_IF_COPY(in, 1);
-	if (!res)
-	{
-		if (PG_NARGS() > 2)
-			PG_RETURN_POINTER(NULL);
-		else
-			PG_RETURN_NULL();
-	}
-
-	while (ptr->lexeme)
-		ptr++;
-	da = (Datum *) palloc(sizeof(Datum) * (ptr - res + 1));
-	ptr = res;
-	while (ptr->lexeme)
-	{
-		da[ptr - res] = PointerGetDatum(char2text(ptr->lexeme));
-		ptr++;
-	}
-
-	a = construct_array(
-						da,
-						ptr - res,
-						TEXTOID,
-						-1,
-						false,
-						'i'
-		);
-
-	ptr = res;
-	while (ptr->lexeme)
-	{
-		pfree(DatumGetPointer(da[ptr - res]));
-		pfree(ptr->lexeme);
-		ptr++;
-	}
-	pfree(res);
-	pfree(da);
-
-	PG_RETURN_POINTER(a);
-}
-
-PG_FUNCTION_INFO_V1(lexize_byname);
-Datum		lexize_byname(PG_FUNCTION_ARGS);
-Datum
-lexize_byname(PG_FUNCTION_ARGS)
-{
-	text	   *dictname = PG_GETARG_TEXT_P(0);
-	Datum		res;
-
-	SET_FUNCOID();
-
-	res = DirectFunctionCall3(
-							  lexize,
-							  ObjectIdGetDatum(name2id_dict(dictname)),
-							  PG_GETARG_DATUM(1),
-							  (Datum) 0
-		);
-	PG_FREE_IF_COPY(dictname, 0);
-	if (res)
-		PG_RETURN_DATUM(res);
-	else
-		PG_RETURN_NULL();
-}
-
-static Oid	currect_dictionary_id = 0;
-
-PG_FUNCTION_INFO_V1(set_curdict);
-Datum		set_curdict(PG_FUNCTION_ARGS);
-Datum
-set_curdict(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	finddict(PG_GETARG_OID(0));
-	currect_dictionary_id = PG_GETARG_OID(0);
-	PG_RETURN_VOID();
-}
-
-PG_FUNCTION_INFO_V1(set_curdict_byname);
-Datum		set_curdict_byname(PG_FUNCTION_ARGS);
-Datum
-set_curdict_byname(PG_FUNCTION_ARGS)
-{
-	text	   *dictname = PG_GETARG_TEXT_P(0);
-
-	SET_FUNCOID();
-	DirectFunctionCall1(
-						set_curdict,
-						ObjectIdGetDatum(name2id_dict(dictname))
-		);
-	PG_FREE_IF_COPY(dictname, 0);
-	PG_RETURN_VOID();
-}
-
-PG_FUNCTION_INFO_V1(lexize_bycurrent);
-Datum		lexize_bycurrent(PG_FUNCTION_ARGS);
-Datum
-lexize_bycurrent(PG_FUNCTION_ARGS)
-{
-	Datum		res;
-
-	SET_FUNCOID();
-	if (currect_dictionary_id == 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("no currect dictionary"),
-				 errhint("Execute select set_curdict().")));
-
-	res = DirectFunctionCall3(
-							  lexize,
-							  ObjectIdGetDatum(currect_dictionary_id),
-							  PG_GETARG_DATUM(0),
-							  (Datum) 0
-		);
-	if (res)
-		PG_RETURN_DATUM(res);
-	else
-		PG_RETURN_NULL();
-}
diff --git a/contrib/tsearch2/dict.h b/contrib/tsearch2/dict.h
deleted file mode 100644
index 78d5111f14f6..000000000000
--- a/contrib/tsearch2/dict.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict.h,v 1.8 2006/10/04 00:29:46 momjian Exp $ */
-
-#ifndef __DICT_H__
-#define __DICT_H__
-#include "postgres.h"
-#include "fmgr.h"
-#include "ts_cfg.h"
-
-typedef struct
-{
-	int			len;
-	char	  **stop;
-	char	   *(*wordop) (char *);
-}	StopList;
-
-void		sortstoplist(StopList * s);
-void		freestoplist(StopList * s);
-void		readstoplist(text *in, StopList * s);
-bool		searchstoplist(StopList * s, char *key);
-
-typedef struct
-{
-	Oid			dict_id;
-	FmgrInfo	lexize_info;
-	void	   *dictionary;
-}	DictInfo;
-
-void		init_dict(Oid id, DictInfo * dict);
-DictInfo   *finddict(Oid id);
-Oid			name2id_dict(text *name);
-void		reset_dict(void);
-
-typedef struct
-{
-	bool		isend;			/* in: marks for lexize_info about text end is
-								 * reached */
-	bool		getnext;		/* out: dict wants next lexeme */
-	void	   *private;		/* internal dict state between calls with
-								 * getnext == true */
-}	DictSubState;
-
-/* simple parser of cfg string */
-typedef struct
-{
-	char	   *key;
-	char	   *value;
-}	Map;
-
-void		parse_cfgdict(text *in, Map ** m);
-
-/* return struct for any lexize function */
-typedef struct
-{
-	/*
-	 * number of variant of split word , for example Word 'fotballklubber'
-	 * (norwegian) has two varian to split: ( fotball, klubb ) and ( fot,
-	 * ball, klubb ). So, dictionary should return: nvariant lexeme 1
-	 * fotball 1	  klubb 2	   fot 2	  ball 2	  klubb
-	 */
-	uint16		nvariant;
-
-	uint16		flags;
-
-	/* C-string */
-	char	   *lexeme;
-}	TSLexeme;
-
-#define TSL_ADDPOS		0x01
-
-
-/*
- * Lexize subsystem
- */
-
-typedef struct ParsedLex
-{
-	int			type;
-	char	   *lemm;
-	int			lenlemm;
-	bool		resfollow;
-	struct ParsedLex *next;
-}	ParsedLex;
-
-typedef struct ListParsedLex
-{
-	ParsedLex  *head;
-	ParsedLex  *tail;
-}	ListParsedLex;
-
-typedef struct
-{
-	TSCfgInfo  *cfg;
-	Oid			curDictId;
-	int			posDict;
-	DictSubState dictState;
-	ParsedLex  *curSub;
-	ListParsedLex towork;		/* current list to work */
-	ListParsedLex waste;		/* list of lexemes that already lexized */
-
-	/*
-	 * fields to store last variant to lexize (basically, thesaurus or similar
-	 * to, which wants	several lexemes
-	 */
-
-	ParsedLex  *lastRes;
-	TSLexeme   *tmpRes;
-}	LexizeData;
-
-
-void		LexizeInit(LexizeData * ld, TSCfgInfo * cfg);
-void		LexizeAddLemm(LexizeData * ld, int type, char *lemm, int lenlemm);
-TSLexeme   *LexizeExec(LexizeData * ld, ParsedLex ** correspondLexem);
-
-#endif
diff --git a/contrib/tsearch2/dict_ex.c b/contrib/tsearch2/dict_ex.c
deleted file mode 100644
index 2fd5cbb70093..000000000000
--- a/contrib/tsearch2/dict_ex.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict_ex.c,v 1.9 2006/11/20 14:03:30 teodor Exp $ */
-
-/*
- * example of dictionary
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include "dict.h"
-#include "common.h"
-#include "ts_locale.h"
-
-typedef struct
-{
-	StopList	stoplist;
-}	DictExample;
-
-
-PG_FUNCTION_INFO_V1(dex_init);
-Datum		dex_init(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(dex_lexize);
-Datum		dex_lexize(PG_FUNCTION_ARGS);
-
-Datum
-dex_init(PG_FUNCTION_ARGS)
-{
-	DictExample *d = (DictExample *) malloc(sizeof(DictExample));
-
-	if (!d)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	memset(d, 0, sizeof(DictExample));
-
-	d->stoplist.wordop = lowerstr;
-
-	if (!PG_ARGISNULL(0) && PG_GETARG_POINTER(0) != NULL)
-	{
-		text	   *in = PG_GETARG_TEXT_P(0);
-
-		readstoplist(in, &(d->stoplist));
-		sortstoplist(&(d->stoplist));
-		PG_FREE_IF_COPY(in, 0);
-	}
-
-	PG_RETURN_POINTER(d);
-}
-
-Datum
-dex_lexize(PG_FUNCTION_ARGS)
-{
-	DictExample *d = (DictExample *) PG_GETARG_POINTER(0);
-	char	   *in = (char *) PG_GETARG_POINTER(1);
-	char	   *utxt = pnstrdup(in, PG_GETARG_INT32(2));
-	TSLexeme   *res = palloc(sizeof(TSLexeme) * 2);
-	char	   *txt = lowerstr(utxt);
-
-	pfree(utxt);
-	memset(res, 0, sizeof(TSLexeme) * 2);
-
-	if (*txt == '\0' || searchstoplist(&(d->stoplist), txt))
-	{
-		pfree(txt);
-	}
-	else
-		res[0].lexeme = txt;
-
-	PG_RETURN_POINTER(res);
-}
diff --git a/contrib/tsearch2/dict_ispell.c b/contrib/tsearch2/dict_ispell.c
deleted file mode 100644
index 301b19d59287..000000000000
--- a/contrib/tsearch2/dict_ispell.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict_ispell.c,v 1.10 2006/03/11 04:38:30 momjian Exp $ */
-
-/*
- * ISpell interface
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <ctype.h>
-
-#include "dict.h"
-#include "common.h"
-#include "ispell/spell.h"
-#include "ts_locale.h"
-
-typedef struct
-{
-	StopList	stoplist;
-	IspellDict	obj;
-}	DictISpell;
-
-PG_FUNCTION_INFO_V1(spell_init);
-Datum		spell_init(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(spell_lexize);
-Datum		spell_lexize(PG_FUNCTION_ARGS);
-
-static void
-freeDictISpell(DictISpell * d)
-{
-	NIFree(&(d->obj));
-	freestoplist(&(d->stoplist));
-	free(d);
-}
-
-Datum
-spell_init(PG_FUNCTION_ARGS)
-{
-	DictISpell *d;
-	Map		   *cfg,
-			   *pcfg;
-	text	   *in;
-	bool		affloaded = false,
-				dictloaded = false,
-				stoploaded = false;
-
-	if (PG_ARGISNULL(0) || PG_GETARG_POINTER(0) == NULL)
-		ereport(ERROR,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("ISpell confguration error")));
-
-	d = (DictISpell *) malloc(sizeof(DictISpell));
-	if (!d)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	memset(d, 0, sizeof(DictISpell));
-	d->stoplist.wordop = lowerstr;
-
-	in = PG_GETARG_TEXT_P(0);
-	parse_cfgdict(in, &cfg);
-	PG_FREE_IF_COPY(in, 0);
-	pcfg = cfg;
-	while (pcfg->key)
-	{
-		if (pg_strcasecmp("DictFile", pcfg->key) == 0)
-		{
-			if (dictloaded)
-			{
-				freeDictISpell(d);
-				ereport(ERROR,
-						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-						 errmsg("dictionary already loaded")));
-			}
-			if (NIImportDictionary(&(d->obj), pcfg->value))
-			{
-				freeDictISpell(d);
-				ereport(ERROR,
-						(errcode(ERRCODE_CONFIG_FILE_ERROR),
-						 errmsg("could not load dictionary file \"%s\"",
-								pcfg->value)));
-			}
-			dictloaded = true;
-		}
-		else if (pg_strcasecmp("AffFile", pcfg->key) == 0)
-		{
-			if (affloaded)
-			{
-				freeDictISpell(d);
-				ereport(ERROR,
-						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-						 errmsg("affixes already loaded")));
-			}
-			if (NIImportAffixes(&(d->obj), pcfg->value))
-			{
-				freeDictISpell(d);
-				ereport(ERROR,
-						(errcode(ERRCODE_CONFIG_FILE_ERROR),
-						 errmsg("could not load affix file \"%s\"",
-								pcfg->value)));
-			}
-			affloaded = true;
-		}
-		else if (pg_strcasecmp("StopFile", pcfg->key) == 0)
-		{
-			text	   *tmp = char2text(pcfg->value);
-
-			if (stoploaded)
-			{
-				freeDictISpell(d);
-				ereport(ERROR,
-						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-						 errmsg("stop words already loaded")));
-			}
-			readstoplist(tmp, &(d->stoplist));
-			sortstoplist(&(d->stoplist));
-			pfree(tmp);
-			stoploaded = true;
-		}
-		else
-		{
-			freeDictISpell(d);
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized option: %s => %s",
-							pcfg->key, pcfg->value)));
-		}
-		pfree(pcfg->key);
-		pfree(pcfg->value);
-		pcfg++;
-	}
-	pfree(cfg);
-
-	if (affloaded && dictloaded)
-	{
-		NISortDictionary(&(d->obj));
-		NISortAffixes(&(d->obj));
-	}
-	else if (!affloaded)
-	{
-		freeDictISpell(d);
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("no affixes")));
-	}
-	else
-	{
-		freeDictISpell(d);
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("no dictionary")));
-	}
-
-	PG_RETURN_POINTER(d);
-}
-
-Datum
-spell_lexize(PG_FUNCTION_ARGS)
-{
-	DictISpell *d = (DictISpell *) PG_GETARG_POINTER(0);
-	char	   *in = (char *) PG_GETARG_POINTER(1);
-	char	   *txt;
-	TSLexeme   *res;
-	TSLexeme   *ptr,
-			   *cptr;
-
-	if (!PG_GETARG_INT32(2))
-		PG_RETURN_POINTER(NULL);
-
-	txt = pnstrdup(in, PG_GETARG_INT32(2));
-	res = NINormalizeWord(&(d->obj), txt);
-	pfree(txt);
-
-	if (res == NULL)
-		PG_RETURN_POINTER(NULL);
-
-	ptr = cptr = res;
-	while (ptr->lexeme)
-	{
-		if (searchstoplist(&(d->stoplist), ptr->lexeme))
-		{
-			pfree(ptr->lexeme);
-			ptr->lexeme = NULL;
-			ptr++;
-		}
-		else
-		{
-			memcpy(cptr, ptr, sizeof(TSLexeme));
-			cptr++;
-			ptr++;
-		}
-	}
-	cptr->lexeme = NULL;
-
-	PG_RETURN_POINTER(res);
-}
diff --git a/contrib/tsearch2/dict_snowball.c b/contrib/tsearch2/dict_snowball.c
deleted file mode 100644
index 666774482490..000000000000
--- a/contrib/tsearch2/dict_snowball.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict_snowball.c,v 1.13 2006/11/20 14:03:30 teodor Exp $ */
-
-/*
- * example of Snowball dictionary
- * http://snowball.tartarus.org/
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include "dict.h"
-#include "common.h"
-#include "snowball/english_stem.h"
-#include "snowball/header.h"
-#include "snowball/russian_stem.h"
-#include "snowball/russian_stem_UTF8.h"
-#include "ts_locale.h"
-
-typedef struct
-{
-	struct SN_env *z;
-	StopList	stoplist;
-	int			(*stem) (struct SN_env * z);
-}	DictSnowball;
-
-
-PG_FUNCTION_INFO_V1(snb_en_init);
-Datum		snb_en_init(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(snb_ru_init_koi8);
-Datum		snb_ru_init_koi8(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(snb_ru_init_utf8);
-Datum		snb_ru_init_utf8(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(snb_lexize);
-Datum		snb_lexize(PG_FUNCTION_ARGS);
-
-Datum
-snb_en_init(PG_FUNCTION_ARGS)
-{
-	DictSnowball *d = (DictSnowball *) malloc(sizeof(DictSnowball));
-
-	if (!d)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	memset(d, 0, sizeof(DictSnowball));
-	d->stoplist.wordop = lowerstr;
-
-	if (!PG_ARGISNULL(0) && PG_GETARG_POINTER(0) != NULL)
-	{
-		text	   *in = PG_GETARG_TEXT_P(0);
-
-		readstoplist(in, &(d->stoplist));
-		sortstoplist(&(d->stoplist));
-		PG_FREE_IF_COPY(in, 0);
-	}
-
-	d->z = english_ISO_8859_1_create_env();
-	if (!d->z)
-	{
-		freestoplist(&(d->stoplist));
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	}
-	d->stem = english_ISO_8859_1_stem;
-
-	PG_RETURN_POINTER(d);
-}
-
-Datum
-snb_ru_init_koi8(PG_FUNCTION_ARGS)
-{
-	DictSnowball *d = (DictSnowball *) malloc(sizeof(DictSnowball));
-
-	if (!d)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	memset(d, 0, sizeof(DictSnowball));
-	d->stoplist.wordop = lowerstr;
-
-	if (!PG_ARGISNULL(0) && PG_GETARG_POINTER(0) != NULL)
-	{
-		text	   *in = PG_GETARG_TEXT_P(0);
-
-		readstoplist(in, &(d->stoplist));
-		sortstoplist(&(d->stoplist));
-		PG_FREE_IF_COPY(in, 0);
-	}
-
-	d->z = russian_KOI8_R_create_env();
-	if (!d->z)
-	{
-		freestoplist(&(d->stoplist));
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	}
-	d->stem = russian_KOI8_R_stem;
-
-	PG_RETURN_POINTER(d);
-}
-
-Datum
-snb_ru_init_utf8(PG_FUNCTION_ARGS)
-{
-	DictSnowball *d = (DictSnowball *) malloc(sizeof(DictSnowball));
-
-	if (!d)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	memset(d, 0, sizeof(DictSnowball));
-	d->stoplist.wordop = lowerstr;
-
-	if (!PG_ARGISNULL(0) && PG_GETARG_POINTER(0) != NULL)
-	{
-		text	   *in = PG_GETARG_TEXT_P(0);
-
-		readstoplist(in, &(d->stoplist));
-		sortstoplist(&(d->stoplist));
-		PG_FREE_IF_COPY(in, 0);
-	}
-
-	d->z = russian_UTF_8_create_env();
-	if (!d->z)
-	{
-		freestoplist(&(d->stoplist));
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	}
-	d->stem = russian_UTF_8_stem;
-
-	PG_RETURN_POINTER(d);
-}
-
-Datum
-snb_lexize(PG_FUNCTION_ARGS)
-{
-	DictSnowball *d = (DictSnowball *) PG_GETARG_POINTER(0);
-	char	   *in = (char *) PG_GETARG_POINTER(1);
-	char	   *utxt = pnstrdup(in, PG_GETARG_INT32(2));
-	TSLexeme   *res = palloc(sizeof(TSLexeme) * 2);
-	char	   *txt = lowerstr(utxt);
-	
-	pfree(utxt);
-	memset(res, 0, sizeof(TSLexeme) * 2);
-	if (*txt == '\0' || searchstoplist(&(d->stoplist), txt))
-	{
-		pfree(txt);
-	}
-	else
-	{
-		SN_set_current(d->z, strlen(txt), (symbol *) txt);
-		(d->stem) (d->z);
-		if (d->z->p && d->z->l)
-		{
-			txt = repalloc(txt, d->z->l + 1);
-			memcpy(txt, d->z->p, d->z->l);
-			txt[d->z->l] = '\0';
-		}
-		res->lexeme = txt;
-	}
-
-	PG_RETURN_POINTER(res);
-}
diff --git a/contrib/tsearch2/dict_syn.c b/contrib/tsearch2/dict_syn.c
deleted file mode 100644
index 158e49b01586..000000000000
--- a/contrib/tsearch2/dict_syn.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict_syn.c,v 1.12 2007/02/08 11:10:26 petere Exp $ */
-
-/*
- * ISpell interface
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <ctype.h>
-
-#include "dict.h"
-#include "common.h"
-#include "ts_locale.h"
-
-#define SYNBUFLEN	4096
-typedef struct
-{
-	char	   *in;
-	char	   *out;
-}	Syn;
-
-typedef struct
-{
-	int			len;
-	Syn		   *syn;
-}	DictSyn;
-
-PG_FUNCTION_INFO_V1(syn_init);
-Datum		syn_init(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(syn_lexize);
-Datum		syn_lexize(PG_FUNCTION_ARGS);
-
-static char *
-findwrd(char *in, char **end)
-{
-	char	   *start;
-
-	*end = NULL;
-	while (*in && isspace((unsigned char) *in))
-		in++;
-
-	if (*in=='\0')
-		return NULL;
-	start = in;
-
-	while (*in && !isspace((unsigned char) *in))
-		in++;
-
-	*end = in;
-	return start;
-}
-
-static int
-compareSyn(const void *a, const void *b)
-{
-	return strcmp(((Syn *) a)->in, ((Syn *) b)->in);
-}
-
-
-Datum
-syn_init(PG_FUNCTION_ARGS)
-{
-	text	   *in;
-	DictSyn    *d;
-	int			cur = 0;
-	FILE	   *fin;
-	char	   *filename;
-	char		buf[SYNBUFLEN];
-	char	   *starti,
-			   *starto,
-			   *end = NULL;
-	int			slen;
-
-	if (PG_ARGISNULL(0) || PG_GETARG_POINTER(0) == NULL)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("NULL config")));
-
-	in = PG_GETARG_TEXT_P(0);
-	if (VARSIZE(in) - VARHDRSZ == 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("VOID config")));
-
-	filename = text2char(in);
-	PG_FREE_IF_COPY(in, 0);
-	if ((fin = fopen(filename, "r")) == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open file \"%s\": %m",
-						filename)));
-
-	d = (DictSyn *) malloc(sizeof(DictSyn));
-	if (!d)
-	{
-		fclose(fin);
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	}
-	memset(d, 0, sizeof(DictSyn));
-
-	while (fgets(buf, sizeof(buf), fin))
-	{
-		slen = strlen(buf);	
-		pg_verifymbstr(buf, slen, false);
-		if (cur == d->len)
-		{
-			d->len = (d->len) ? 2 * d->len : 16;
-			d->syn = (Syn *) realloc(d->syn, sizeof(Syn) * d->len);
-			if (!d->syn)
-			{
-				fclose(fin);
-				ereport(ERROR,
-						(errcode(ERRCODE_OUT_OF_MEMORY),
-						 errmsg("out of memory")));
-			}
-		}
-
-		starti = findwrd(buf, &end);
-		if (!starti)
-			continue;
-		*end = '\0';
-		if (end >= buf + slen)
-			continue;
-
-		starto = findwrd(end + 1, &end);
-		if (!starto)
-			continue;
-		*end = '\0';
-
-		d->syn[cur].in = strdup(lowerstr(starti));
-		d->syn[cur].out = strdup(lowerstr(starto));
-		if (!(d->syn[cur].in && d->syn[cur].out))
-		{
-			fclose(fin);
-			ereport(ERROR,
-					(errcode(ERRCODE_OUT_OF_MEMORY),
-					 errmsg("out of memory")));
-		}
-
-		cur++;
-	}
-
-	fclose(fin);
-
-	d->len = cur;
-	if (cur > 1)
-		qsort(d->syn, d->len, sizeof(Syn), compareSyn);
-
-	pfree(filename);
-	PG_RETURN_POINTER(d);
-}
-
-Datum
-syn_lexize(PG_FUNCTION_ARGS)
-{
-	DictSyn    *d = (DictSyn *) PG_GETARG_POINTER(0);
-	char	   *in = (char *) PG_GETARG_POINTER(1);
-	Syn			key,
-			   *found;
-	TSLexeme   *res = NULL;
-	char	   *wrd;
-
-	if (!PG_GETARG_INT32(2))
-		PG_RETURN_POINTER(NULL);
-
-	key.out = NULL;
-	wrd = pnstrdup(in, PG_GETARG_INT32(2));
-	key.in = lowerstr(wrd);
-	pfree(wrd);
-
-	found = (Syn *) bsearch(&key, d->syn, d->len, sizeof(Syn), compareSyn);
-	pfree(key.in);
-
-	if (!found)
-		PG_RETURN_POINTER(NULL);
-
-	res = palloc(sizeof(TSLexeme) * 2);
-	memset(res, 0, sizeof(TSLexeme) * 2);
-	res[0].lexeme = pstrdup(found->out);
-
-	PG_RETURN_POINTER(res);
-}
diff --git a/contrib/tsearch2/docs/tsearch-V2-intro.html b/contrib/tsearch2/docs/tsearch-V2-intro.html
deleted file mode 100644
index 8b2514e5bec0..000000000000
--- a/contrib/tsearch2/docs/tsearch-V2-intro.html
+++ /dev/null
@@ -1,1073 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>tsearch-v2-intro</title>
-</head>
-<body class="content">
-<div class="content">
-<h2>Tsearch2 - Introduction</h2>
-<p><a href="
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/docs/tsearch-V2-intro.html">
-[Online version]</a> of this document is available.</p>
-
-<p>The tsearch2 module is available to add as an extension to the
-PostgreSQL database to allow for Full Text Indexing. This document
-is an introduction to installing, configuring, using and
-maintaining the database with the tsearch2 module activated.</p>
-<p>Please, note, tsearch2 module is fully incompatible with old
-tsearch, which is deprecated in 7.4 and will be obsoleted in
-8.0.</p>
-<h3>USING TSEARCH2 AND POSTGRESQL FOR A WEB BASED SEARCH
-ENGINE</h3>
-<p>This documentation is provided as a short guide on how to
-quickly get up and running with tsearch2 and PostgreSQL, for those
-who want to implement a full text indexed based search engine. It
-is not meant to be a complete in-depth guide into the full ins and
-outs of the contrib/tsearch2 module, and is primarily aimed at
-beginners who want to speed up searching of large text fields, or
-those migrating from other database systems such as MS-SQL.</p>
-<p>The README.tsearch2 file included in the contrib/tsearch2
-directory contains a brief overview and history behind tsearch.
-This can also be found online <a href="
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/">[right
-here]</a>.</p>
-<p>Further in depth documentation such as a full function
-reference, and user guide can be found online at the <a href="
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/docs/">[tsearch
-documentation home]</a>.</p>
-<h3>ACKNOWLEDGEMENTS</h3>
-
-<p>Robert John Shepherd originally wrote this documentation for the
-previous version of tsearch module (v1) included with the postgres
-release. I took his documentation and updated it to comply with the
-tsearch2 modifications.</p>
-<p>Robert's original acknowledgements:</p>
-<p>"Thanks to Oleg Bartunov for taking the time to answer many of
-my questions regarding this module, and also to Teodor Sigaev for
-clearing up the process of making your own dictionaries. Plus of
-course a big thanks to the pair of them for writing this module in
-the first place!"</p>
-<p>I would also like to extend my thanks to the developers, and
-Oleg Bartunov for all of his direction and help with the new
-features of tsearch2.</p>
-<h3>OVERVIEW</h3>
-<p>MS-SQL provides a full text indexing (FTI) system which enables
-the fast searching of text based fields, very useful for websites
-(and other applications) that require a results set based on key
-words. PostgreSQL ships with a contributed module called tsearch2,
-which implements a special type of index that can also be used for
-full text indexing. Further more, unlike MS' offering which
-requires regular incremental rebuilds of the text indexes
-themselves, tsearch2 indexes are always up-to-date and keeping them
-so induces very little overhead.</p>
-<p>Before we get into the details, it is recommended that you have
-installed and tested PostgreSQL, are reasonably familiar with
-databases, the SQL query language and also understand the basics of
-connecting to PostgreSQL from the local shell. This document isn't
-intended for the complete PostgreSQL newbie, but anyone with a
-reasonable grasp of the basics should be able to follow it.</p>
-<h3>INSTALLATION</h3>
-<p>Starting with PostgreSQL version 7.4 tsearch2 is now included in
-the contrib directory with the PostgreSQL sources. contrib/tsearch2
-is where you will find everything needed to install and use
-tsearch2. Please note that tsearch2 will also work with PostgreSQL
-version 7.3.x, but it is not the module included with the source
-distribution. You will have to download the module separately and
-install it in the same fashion.</p>
-
-<p>I installed the tsearch2 module to a PostgreSQL 7.3 database
-from the contrib directory without squashing the original (old)
-tsearch module. What I did was move the modules tsearch src
-driectory into the contrib tree under the name tsearchV2.</p>
-<p>Step one is to download the tsearch V2 module :</p>
-<p><a href="
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/">[http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/]</a>
-(check Development History for latest stable version !)</p>
-<pre>
-        tar -zxvf tsearch-v2.tar.gz
-        mv tsearch2 $PGSQL_SRC/contrib/
-        cd $PGSQL_SRC/contrib/tsearch2
-</pre>
-<p>If you are installing from PostgreSQL version 7.4 or higher, you
-can skip those steps and just change to the contrib/tsearch2
-directory in the source tree and continue from there.</p>
-<p>As of May 9, 2004 there is a source patch available for
-tsearch2. The patch provides changes to the pg_ts_ configuration
-tables to allow for easy dump and restore of a database containing
-tsearch2. The patch is available here : <a href="
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/regprocedure_7.4.patch.gz">
-[http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/regprocedure_7.4.patch.gz]</a></p>
-
-<p>To apply this patch, download the mentioned file and place it in
-your postgreSQL source tree ($PGSQL_SRC). This patch is not
-required for tsearch2 to work. I would however, highly recommend it
-as it makes the backup and restore procedures very simple.</p>
-<pre>
-      cd $PGSQL_SRC
-        gunzip regprocedure_7.4.patch.gz
-        patch -b -p1 &lt; regprocedure_7.4.patch
-</pre>
-<p>If you have a working version of tsearch2 in your database, you
-do not need to re-install the tsearch2 module. Just apply the patch
-and run make. This patch only affects the tsearch2.sql file. You
-can run the SQL script found : <a href="
-http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/regprocedure_update.sql">
-[right here]</a> This script will make the modifications found in
-the patch, and update the fields from the existing data. From this
-point on, you can dump and restore the database in a normal
-fashion. Without this patch, you must follow the instructions later
-in this document for backup and restore.</p>
-<p>This patch is only needed for tsearch2 in PostgreSQL versions
-7.3.x and 7.4.x. The patch has been applied to the sources for
-8.0.x.</p>
-<p>When you have your source tree for tsearch2 ready, you can
-continue with the regular building and installation process</p>
-
-<pre>
-        gmake
-        gmake install
-        gmake installcheck
-</pre>
-<p>That is pretty much all you have to do, unless of course you get
-errors. However if you get those, you better go check with the
-mailing lists over at <a href="
-http://www.postgresql.org">http://www.postgresql.org</a> or
-<a href="
-http://openfts.sourceforge.net/">http://openfts.sourceforge.net/</a>
-since its never failed for me.</p>
-<p>If you ever need to revert this patch, and go back to the
-unpatched version of tsearch2, it is simple if you followed the
-above patch command. The -b option creates a backup of the original
-file, so we can just copy it back.</p>
-<pre>
-     cd $PGSQL_SRC/contrib/tsearch2
-        cp tsearch.sql.in.orig tsearch.sql.in
-        make
-
-</pre>
-<p>If you need the patched version again, just follow the patch
-instructions again.</p>
-<p>The directory in the contib/ and the directory from the archive
-is called tsearch2. Tsearch2 is completely incompatible with the
-previous version of tsearch. This means that both versions can be
-installed into a single database, and migration the new version may
-be much easier.</p>
-<p>NOTE: the previous version of tsearch found in the
-contrib/tsearch directory is depricated. Although it is still
-available and included within PostgreSQL version 7.4. It will be
-removed in version 8.0.</p>
-<h3>ADDING TSEARCH2 FUNCTIONALITY TO A DATABASE</h3>
-<p>We should create a database to use as an example for the
-remainder of this file. We can call the database "ftstest". You can
-create it from the command line like this:</p>
-<pre>
-        #createdb ftstest
-</pre>
-<p>If you thought installation was easy, this next bit is even
-easier. Change to the PGSQL_SRC/contrib/tsearch2 directory and
-type:</p>
-
-<pre>
-        psql ftstest &lt; tsearch2.sql
-</pre>
-<p>The file "tsearch2.sql" holds all the wonderful little goodies
-you need to do full text indexing. It defines numerous functions
-and operators, and creates the needed tables in the database. There
-will be 4 new tables created after running the tsearch2.sql file :
-pg_ts_dict, pg_ts_parser, pg_ts_cfg, pg_ts_cfgmap are added.</p>
-<p>You can check out the tables if you like:</p>
-<pre>
-        #psql ftstest
-        ftstest=# \d
-                    List of relations
-         Schema |     Name     | Type  |  Owner
-        --------+--------------+-------+----------
-         public | pg_ts_cfg    | table | kopciuch
-         public | pg_ts_cfgmap | table | kopciuch
-         public | pg_ts_dict   | table | kopciuch
-         public | pg_ts_parser | table | kopciuch
-        (4 rows)
-</pre>
-<p>You may need to grant permissions to use on pg_ts_dict, pg_ts_parser, pg_ts_cfg, pg_ts_cfgmap tables to let non-superuser works with tsearch2. GRANT SELECT should be enough for search-only access. </p>
-<h3>TYPES AND FUNCTIONS PROVIDED BY TSEARCH2</h3>
-<p>The first thing we can do is try out some of the types that are
-provided for us. Lets look at the tsvector type provided for
-us:</p>
-
-<pre>
-        SELECT 'Our first string used today'::tsvector;
-                        tsvector
-        ---------------------------------------
-         'Our' 'used' 'first' 'today' 'string'
-        (1 row)
-</pre>
-<p>The results are the words used within our string. Notice they
-are not in any particular order. The tsvector type returns a string
-of space separated words.</p>
-<pre>
-        SELECT 'Our first string used today first string'::tsvector;
-                            tsvector
-        -----------------------------------------------
-         'Our' 'used' 'first' 'today' 'string'
-        (1 row)
-</pre>
-<p>Notice the results string has each unique word ('first' and
-'string' only appear once in the tsvector value). Which of course
-makes sense if you are searching the full text ... you only need to
-know each unique word in the text.</p>
-<p>Those examples were just casting a text field to that of type
-tsvector. Lets check out one of the new functions created by the
-tsearch2 module.</p>
-<p>The function to_tsvector has 3 possible signatures:</p>
-<pre>
-
-        to_tsvector(oid, text);
-        to_tsvector(text, text);
-        to_tsvector(text);
-</pre>
-<p>We will use the second method using two text fields. The
-overloaded methods provide us with a way to specifiy the way the
-searchable text is broken up into words (Stemming process). Right
-now we will specify the 'default' configuration. See the section on
-TSEARCH2 CONFIGURATION to learn more about this.</p>
-<pre>
-        SELECT to_tsvector('default',
-                           'Our first string used today first string');
-                        to_tsvector
-        --------------------------------------------
-         'use':4 'first':2,6 'today':5 'string':3,7
-        (1 row)
-</pre>
-<p>The result returned from this function is of type tsvector. The
-results came about by this reasoning: All of the words in the text
-passed in are stemmed, or not used because they are stop words
-defined in our configuration. Each lower case morphed word is
-returned with all of the positons in the text.</p>
-<p>In this case the word "Our" is a stop word in the default
-configuration. That means it will not be included in the result.
-The word "first" is found at positions 2 and 6 (although "Our" is a
-stop word, it's position is maintained). The word(s) positioning is
-maintained exactly as in the original string. The word "used" is
-morphed to the word "use" based on the default configuration for
-word stemming, and is found at position 4. The rest of the results
-follow the same logic. Just a reminder again ... the order of the
-'word' position in the output is not in any kind of order. (ie
-'use':4 appears first)</p>
-<p>If you want to view the output of the tsvector fields without
-their positions, you can do so with the function
-"strip(tsvector)".</p>
-<pre>
-        SELECT strip(to_tsvector('default',
-                     'Our first string used today first string'));
-                    strip
-        --------------------------------
-         'use' 'first' 'today' 'string'
-
-</pre>
-<p>If you wish to know the number of unique words returned in the
-tsvector you can do so by using the function "length(tsvector)"</p>
-<pre>
-        SELECT length(to_tsvector('default',
-                      'Our first string used today first string'));
-         length
-        --------
-              4
-        (1 row)
-</pre>
-<p>Lets take a look at the function to_tsquery. It also has 3
-signatures which follow the same rational as the to_tsvector
-function:</p>
-<pre>
-        to_tsquery(oid, text);
-        to_tsquery(text, text);
-        to_tsquery(text);
-</pre>
-<p>Lets try using the function with a single word :</p>
-<pre>
-        SELECT to_tsquery('default', 'word');
-         to_tsquery
-        -----------
-         'word'
-         (1 row)
-
-</pre>
-<p>I call the function the same way I would a to_tsvector function,
-specifying the 'default' configuration for morphing, and the result
-is the stemmed output 'word'.</p>
-<p>Lets attempt to use the function with a string of multiple
-words:</p>
-<pre>
-        SELECT to_tsquery('default', 'this is many words');
-        ERROR:  Syntax error
-</pre>
-<p>The function can not accept a space separated string. The
-intention of the to_tsquery function is to return a type of
-"tsquery" used for searching a tsvector field. What we need to do
-is search for one to many words with some kind of logic (for now
-simple boolean).</p>
-<pre>
-        SELECT to_tsquery('default', 'searching|sentence');
-              to_tsquery
-        ----------------------
-         'search' | 'sentenc'
-        (1 row)
-</pre>
-<p>Notice that the words are separated by the boolean logic "OR",
-the text could contain boolean operators &amp;,|,!,() with their
-usual meaning.</p>
-
-<p>You can not use words defined as being a stop word in your
-configuration. The function will not fail ... you will just get no
-result, and a NOTICE like this:</p>
-<pre>
-        SELECT to_tsquery('default', 'a|is&amp;not|!the');
-        NOTICE:  Query contains only stopword(s)
-                 or doesn't contain lexeme(s), ignored
-         to_tsquery
-        -----------
-        (1 row)
-</pre>
-<p>That is a beginning to using the types, and functions defined in
-the tsearch2 module. There are numerous more functions that I have
-not touched on. You can read through the tsearch2.sql file built
-when compiling to get more familiar with what is included.</p>
-<h3>INDEXING FIELDS IN A TABLE</h3>
-<p>The next stage is to add a full text index to an existing table.
-In this example we already have a table defined as follows:</p>
-<pre>
-        CREATE TABLE tblMessages
-        (
-                intIndex        int4,
-                strTopic        varchar(100),
-                strMessage      text
-        );
-</pre>
-
-<p>We are assuming there are several rows with some kind of data in
-them. Any data will do, just do several inserts with test strings
-for a topic, and a message. here is some test data I inserted. (yes
-I know it's completely useless stuff ;-) but it will serve our
-purpose right now).</p>
-<pre>
-        INSERT INTO tblMessages
-               VALUES ('1', 'Testing Topic', 'Testing message data input');
-        INSERT INTO tblMessages
-               VALUES ('2', 'Movie', 'Breakfast at Tiffany\'s');
-        INSERT INTO tblMessages
-               VALUES ('3', 'Famous Author', 'Stephen King');
-        INSERT INTO tblMessages
-               VALUES ('4', 'Political Topic',
-                            'Nelson Mandella is released from prison');
-        INSERT INTO tblMessages
-               VALUES ('5', 'Nursery rhyme phrase',
-                            'Little jack horner sat in a corner');
-        INSERT INTO tblMessages
-               VALUES ('6', 'Gettysburg address quotation',
-                            'Four score and seven years ago'
-                            ' our fathers brought forth on this'
-                            ' continent a new nation, conceived in'
-                            ' liberty and dedicated to the proposition'
-                            ' that all men are created equal');
-        INSERT INTO tblMessages
-               VALUES ('7', 'Classic Rock Bands',
-                            'Led Zeppelin Grateful Dead and The Sex Pistols');
-        INSERT INTO tblMessages
-               VALUES ('8', 'My birth address',
-                            '18 Sommervile road, Regina, Saskatchewan');
-        INSERT INTO tblMessages
-               VALUES ('9', 'Joke', 'knock knock : who\'s there?'
-                                    ' I will not finish this joke');
-        INSERT INTO tblMessages
-               VALUES ('10', 'Computer information',
-                             'My computer is a pentium III 400 mHz'
-                             ' with 192 megabytes of RAM');
-</pre>
-<p>The next stage is to create a special text index which we will
-use for FTI, so we can search our table of messages for words or a
-phrase. We do this using the SQL command:</p>
-<pre>
-        ALTER TABLE tblMessages ADD COLUMN idxFTI tsvector;
-</pre>
-<p>Note that unlike traditional indexes, this is actually a new
-field in the same table, which is then used (through the magic of
-the tsearch2 operators and functions) by a special index we will
-create in a moment.</p>
-<p>The general rule for the initial insertion of data will follow
-four steps:</p>
-<pre>
-
-    1. update table
-    2. vacuum full analyze
-    3. create index
-    4. vacuum full analyze
-</pre>
-<p>The data can be updated into the table, the vacuum full analyze
-will reclaim unused space. The index can be created on the table
-after the data has been inserted. Having the index created prior to
-the update will slow down the process. It can be done in that
-manner, this way is just more efficient. After the index has been
-created on the table, vacuum full analyze is run again to update
-postgres's statistics (ie having the index take effect).</p>
-<pre>
-        UPDATE tblMessages SET idxFTI=to_tsvector('default', strMessage);
-        VACUUM FULL ANALYZE;
-</pre>
-<p>Note that this only inserts the field strMessage as a tsvector,
-so if you want to also add strTopic to the information stored, you
-should instead do the following, which effectively concatenates the
-two fields into one before being inserted into the table:</p>
-<pre>
-        UPDATE tblMessages
-            SET idxFTI=to_tsvector('default',coalesce(strTopic,'') ||' '|| coalesce(strMessage,''));
-        VACUUM FULL ANALYZE;
-</pre>
-<p><strong>Using the coalesce function makes sure this
-concatenation also works with NULL fields.</strong></p>
-
-<p>We need to create the index on the column idxFTI. Keep in mind
-that the database will update the index when some action is taken.
-In this case we _need_ the index (The whole point of Full Text
-INDEXING ;-)), so don't worry about any indexing overhead. We will
-create an index based on the gist or gin function. GiST is an index
-structure for Generalized Search Tree, GIN is a inverted index (see <a href="tsearch2-ref.html#indexes">The tsearch2 Reference: Indexes</a>).</p>
-<pre>
-        CREATE INDEX idxFTI_idx ON tblMessages USING gist(idxFTI);
-        VACUUM FULL ANALYZE;
-</pre>
-<p>After you have converted all of your data and indexed the
-column, you can select some rows to see what actually happened. I
-will not display output here but you can play around yourselves and
-see what happened.</p>
-<p>The last thing to do is set up a trigger so every time a row in
-this table is changed, the text index is automatically updated.
-This is easily done using:</p>
-<pre>
-        CREATE TRIGGER tsvectorupdate BEFORE UPDATE OR INSERT ON tblMessages
-            FOR EACH ROW EXECUTE PROCEDURE tsearch2(idxFTI, strMessage);
-</pre>
-<p>Or if you are indexing both strMessage and strTopic you should
-instead do:</p>
-<pre>
-
-        CREATE TRIGGER tsvectorupdate BEFORE UPDATE OR INSERT ON tblMessages
-            FOR EACH ROW EXECUTE PROCEDURE
-                tsearch2(idxFTI, strTopic, strMessage);
-</pre>
-<p>Before you ask, the tsearch2 function accepts multiple fields as
-arguments so there is no need to concatenate the two into one like
-we did before.</p>
-<p>If you want to do something specific with columns, you may write
-your very own trigger function using plpgsql or other procedural
-languages (but not SQL, unfortunately) and use it instead of
-<em>tsearch2</em> trigger.</p>
-<p>You could however call other stored procedures from within the
-tsearch2 function. Lets say we want to create a function to remove
-certain characters (like the @ symbol from all text).</p>
-<pre>
-       CREATE FUNCTION dropatsymbol(text) 
-                     RETURNS text AS 'select replace($1, \'@\', \' \');' LANGUAGE SQL;
-</pre>
-<p>Now we can use this function within the tsearch2 function on the
-trigger.</p>
-
-<pre>
-      DROP TRIGGER tsvectorupdate ON tblmessages;
-        CREATE TRIGGER tsvectorupdate BEFORE UPDATE OR INSERT ON tblMessages
-            FOR EACH ROW EXECUTE PROCEDURE tsearch2(idxFTI, dropatsymbol, strMessage);
-        INSERT INTO tblmessages VALUES (69, 'Attempt for dropatsymbol', 'Test@test.com');
-</pre>
-<p>If at this point you receive an error stating: ERROR: Can't find
-tsearch config by locale</p>
-<p>Do not worry. You have done nothing wrong. And tsearch2 is not
-broken. All that has happened here is that the configuration is
-setup to use a configuration based on the locale of the server. All
-you have to do is change your default configuration, or add a new
-one for your specific locale. See the section on TSEARCH2
-CONFIGURATION.</p>
-<pre class="real">
-   SELECT * FROM tblmessages WHERE intindex = 69;
-
-         intindex |         strtopic         |  strmessage   |        idxfti
-        ----------+--------------------------+---------------+-----------------------   
-                69 | Attempt for dropatsymbol | Test@test.com | 'test':1 'test.com':2
-        (1 row)
-</pre>
-Notice that the string content was passed throught the stored
-procedure dropatsymbol. The '@' character was replaced with a
-single space ... and the output from the procedure was then stored
-in the tsvector column.
-<p>This could be useful for removing other characters from indexed
-text, or any kind of preprocessing needed to be done on the text
-prior to insertion into the index.</p>
-<h3>QUERYING A TABLE</h3>
-
-<p>There are some examples in the README.tsearch2 file for querying
-a table. One major difference between tsearch and tsearch2 is the
-operator ## is no longer available. Only the operator @@ is
-defined, using the types tsvector on one side and tsquery on the
-other side.</p>
-<p>Lets search the indexed data for the word "Test". I indexed
-based on the the concatenation of the strTopic, and the
-strMessage:</p>
-<pre>
-        SELECT intindex, strtopic FROM tblmessages
-                                  WHERE idxfti @@ 'test'::tsquery;
-         intindex |   strtopic
-        ----------+---------------
-                1 | Testing Topic
-        (1 row)
-</pre>
-<p>The only result that matched was the row with a topic "Testing
-Topic". Notice that the word I search for was all lowercase. Let's
-see what happens when I query for uppercase "Test".</p>
-<pre>
-        SELECT intindex, strtopic FROM tblmessages
-                                  WHERE idxfti @@ 'Test'::tsquery;
-         intindex | strtopic
-        ----------+----------
-        (0 rows)
-</pre>
-<p>We get zero rows returned. The reason is because when the text
-was inserted, it was morphed to my default configuration (because
-of the call to to_tsvector in the UPDATE statement). If there was
-no morphing done, and the tsvector field(s) contained the word
-'Text', a match would have been found.</p>
-<p>Most likely the best way to query the field is to use the
-to_tsquery function on the right hand side of the @@ operator like
-this:</p>
-
-<pre>
-        SELECT intindex, strtopic FROM tblmessages
-               WHERE idxfti @@ to_tsquery('default', 'Test | Zeppelin');
-         intindex |      strtopic
-        ----------+--------------------
-                1 | Testing Topic
-                7 | Classic Rock Bands
-        (2 rows)
-</pre>
-<p>That query searched for all instances of "Test" OR "Zeppelin".
-It returned two rows: the "Testing Topic" row, and the "Classic
-Rock Bands" row. The to_tsquery function performed the correct
-morphology upon the parameters, and searched the tsvector field
-appropriately.</p>
-<p>The last example here relates to searching for a phrase, for
-example "minority report". This poses a problem with regard to
-tsearch2, as it doesn't index phrases, only words. But there is a
-way around which doesn't appear to have a significant impact on
-query time, and that is to use a query such as the following:</p>
-<pre>
-        SELECT intindex, strTopic FROM tblmessages
-                WHERE idxfti @@ to_tsquery('default', 'gettysburg &amp; address')
-                AND strMessage ~* '.*men are created equal.*';
-         intindex |           strtopic
-        ----------+------------------------------
-                6 | Gettysburg address quotation
-        (1 row)
-        SELECT intindex, strTopic FROM tblmessages
-                WHERE idxfti @@ to_tsquery('default', 'gettysburg &amp; address')
-                AND strMessage ~* '.*something that does not exist.*';
-         intindex | strtopic
-        ----------+----------
-        (0 rows)
-</pre>
-<p>Of course if your indexing both strTopic and strMessage, and
-want to search for this phrase on both, then you will have to get
-out the brackets and extend this query a little more.</p>
-
-<h3>TSEARCH2 CONFIGURATION</h3>
-<p>Some words such as "and", "the", and "who" are automatically not
-indexed, since they belong to a pre-existing dictionary of "Stop
-Words" which tsearch2 does not perform indexing on. If someone
-needs to search for "The Who" in your database, they are going to
-have a tough time coming up with any results, since both are
-ignored in the indexes. But there is a solution.</p>
-<p>Lets say we want to add a word into the stop word list for
-english stemming. We could edit the file
-:'/usr/local/pgsql/share/english.stop' and add a word to the list.
-I edited mine to exclude my name from indexing:</p>
-<pre>
-    - Edit /usr/local/pgsql/share/english.stop
-    - Add 'andy' to the list
-    - Save the file.
-</pre>
-<p>When you connect to the database, the dict_init procedure is run
-during initialization. And in my configuration it will read the
-stop words from the file I just edited. If you were connected to
-the DB while editing the stop words, you will need to end the
-current session and re-connect. When you re-connect to the
-database, 'andy' is no longer indexed:</p>
-<pre>
-        SELECT to_tsvector('default', 'Andy');
-         to_tsvector
-        ------------
-        (1 row)
-</pre>
-<p>Originally I would get the result :</p>
-
-<pre>
-        SELECT to_tsvector('default', 'Andy');
-         to_tsvector
-        ------------
-         'andi':1
-        (1 row)
-</pre>
-<p>But since I added it as a stop word, it would be ingnored on the
-indexing. The stop word added was used in the dictionary "en_stem".
-If I were to use a different configuration such as 'simple', the
-results would be different. There are no stop words for the simple
-dictionary. It will just convert to lower case, and index every
-unique word.</p>
-<pre>
-        SELECT to_tsvector('simple', 'Andy andy The the in out');
-                     to_tsvector
-        -------------------------------------
-         'in':5 'out':6 'the':3,4 'andy':1,2
-        (1 row)
-</pre>
-<p>All this talk about which configuration to use is leading us
-into the actual configuration of tsearch2. In the examples in this
-document the configuration has always been specified when using the
-tsearch2 functions:</p>
-<pre>
-        SELECT to_tsvector('default', 'Testing the default config');
-        SELECT to_tsvector('simple', 'Example of simple Config');
-</pre>
-<p>The pg_ts_cfg table holds each configuration you can use with
-the tsearch2 functions. As you can see the ts_name column contains
-both the 'default' configurations based on the 'C' locale. And the
-'simple' configuration which is not based on any locale.</p>
-
-<pre>
-        SELECT * from pg_ts_cfg;
-             ts_name     | prs_name |    locale
-        -----------------+----------+--------------
-         default         | default  | C
-         default_russian | default  | ru_RU.KOI8-R
-         simple          | default  |
-        (3 rows)
-</pre>
-<p>Each row in the pg_ts_cfg table contains the name of the
-tsearch2 configuration, the name of the parser to use, and the
-locale mapped to the configuration. There is only one parser to
-choose from the table pg_ts_parser called 'default'. More parsers
-could be written, but for our needs we will use the default.</p>
-<p>There are 3 configurations installed by tsearch2 initially. If
-your locale is set to 'en_US' for example (like my laptop), then as
-you can see there is currently no dictionary configured to use with
-that locale. You can either set up a new configuration or just use
-one that already exists. If I do not specify which configuration to
-use in the to_tsvector function, I receive the following error.</p>
-<pre>
-        SELECT to_tsvector('learning tsearch is like going to school');
-        ERROR:  Can't find tsearch config by locale
-</pre>
-<p>We will create a new configuration for use with the server
-encoding 'en_US'. The first step is to add a new configuration into
-the pg_ts_cfg table. We will call the configuration
-'default_english', with the default parser and use the locale
-'en_US'.</p>
-<pre>
-        INSERT INTO pg_ts_cfg (ts_name, prs_name, locale)
-               VALUES ('default_english', 'default', 'en_US');
-
-</pre>
-<p>We have only declared that there is a configuration called
-'default_english'. We need to set the configuration of how
-'default_english' will work. The next step is creating a new
-dictionary to use. The configuration of the dictionary is
-completlely different in tsearch2. In the prior versions to make
-changes, you would have to re-compile your changes into the
-tsearch.so. All of the configuration has now been moved into the
-system tables created by executing the SQL code from
-tsearch2.sql</p>
-<p>Lets take a first look at the pg_ts_dict table</p>
-<pre>
-  ftstest=# \d pg_ts_dict
-         Table "public.pg_ts_dict"
-             Column      |     Type     | Modifiers
-        -----------------+--------------+-----------
-         dict_name       | text         | not null
-         dict_init       | regprocedure |
-         dict_initoption | text         |
-         dict_lexize     | regprocedure | not null
-         dict_comment    | text         |
-        Indexes: pg_ts_dict_pkey primary key btree (dict_name)
-</pre>
-<p>The dict_name column is the name of the dictionary, for example
-'simple', 'en_stem' or 'ru_stem'. The dict_init column is a text
-representation of a stored procedure to run for initialization of
-that dictionary, for example 'snb_en_init(text)' or
-'snb_ru_init(text)'. The initial configuration of tsearch2 had the
-dict_init and dict_lexize columns as type oid. The patch mentioned
-in the Installation Notes changes these types to regprocedure. The
-data inserted, or updated can still be the oid of the stored
-procedure. The representation is just different. This makes backup
-and restore procedures much easier for tsearch2. The dict_init
-option is used for options passed to the init function for the
-stored procedure. In the cases of 'en_stem' or 'ru_stem' it is a
-path to a stopword file for that dictionary, for example
-'/usr/local/pgsql/share/english.stop'. This is however dictated by
-the dictionary. ISpell dictionaries may require different options.
-The dict_lexize column is another OID of a stored procedure to the
-function used to lexize, for example 'snb_lexize(internal,
-internal, integer)'. The dict_comment column is just a comment.</p>
-<p>Next we will configure the use of a new dictionary based on
-ISpell. We will assume you have ISpell installed on you machine.
-(in /usr/local/lib)</p>
-<p>There has been some confusion in the past as to which files are
-used from ISpell. ISpell operates using a hash file. This is a
-binary file created by the ISpell command line utility "buildhash".
-This utility accepts a file containing the words from the
-dictionary, and the affixes file and the output is the hash file.
-The default installation of ISPell installs the english hash file
-english.hash, which is the exact same file as american.hash. ISpell
-uses this as the fallback dictionary to use.</p>
-<p>This hash file is not what tsearch2 requires as the ISpell
-interface. The file(s) needed are those used to create the hash.
-Tsearch uses the dictionary words for morphology, so the listing is
-needed not spellchecking. Regardless, these files are included in
-the ISpell sources, and you can use them to integrate into
-tsearch2. This is not complicated, but is not very obvious to begin
-with. The tsearch2 ISpell interface needs only the listing of
-dictionary words, it will parse and load those words, and use the
-ISpell dictionary for lexeme processing.</p>
-
-<p>I found the ISPell make system to be very finicky. Their
-documentation actually states this to be the case. So I just did
-things the command line way. In the ISpell source tree under
-languages/english there are several files in this directory. For a
-complete description, please read the ISpell README. Basically for
-the english dictionary there is the option to create the small,
-medium, large and extra large dictionaries. The medium dictionary
-is recommended. If the make system is configured correctly, it
-would build and install the english.has file from the medium size
-dictionary. Since we are only concerned with the dictionary word
-listing ... it can be created from the /languages/english directory
-with the following command:</p>
-<pre>
-       sort -u -t/ +0f -1 +0 -T /usr/tmp -o english.med english.0 english.1
-</pre>
-<p>This will create a file called english.med. You can copy this
-file to whever you like. I placed mine in /usr/local/lib so it
-coincides with the ISpell hash files. You can now add the tsearch2
-configuration entry for the ISpell english dictionary. We will also
-continue to use the english word stop file that was installed for
-the en_stem dictionary. You could use a different one if you like.
-The ISpell configuration is based on the "ispell_template"
-dictionary installed by default with tsearch2. We will use the OIDs
-to the stored procedures from the row where the dict_name =
-'ispell_template'.</p>
-<pre>
-        INSERT INTO pg_ts_dict
-               (SELECT 'en_ispell',
-                       dict_init,
-                       'DictFile="/usr/local/lib/english.med",'
-                       'AffFile="/usr/local/lib/english.aff",'
-                       'StopFile="/usr/local/pgsql/share/contrib/english.stop"',
-                       dict_lexize
-                FROM pg_ts_dict
-                WHERE dict_name = 'ispell_template');
-</pre>
-<p>Now that we have a dictionary we can specify it's use in a query
-to get a lexeme. For this we will use the lexize function. The
-lexize function takes the name of the dictionary to use as an
-argument. Just as the other tsearch2 functions operate. You will
-need to stop your psql session and start it again in order for this
-modification to take place.</p>
-<pre>
-  SELECT lexize('en_ispell', 'program');
-          lexize
-        -----------
-         {program}
-        (1 row)
-
-</pre>
-<p>If you wanted to always use the ISpell english dictionary you
-have installed, you can configure tsearch2 to always use a specific
-dictionary.</p>
-<pre>
-  SELECT set_curdict('en_ispell');
-</pre>
-<p>Lexize is meant to turn a word into a lexeme. It is possible to
-receive more than one lexeme returned for a single word.</p>
-<pre>
- SELECT lexize('en_ispell', 'conditionally');
-           lexize
-        -----------------------------
-         {conditionally,conditional}
-        (1 row)
-</pre>
-<p>The lexize function is not meant to take a full string as an
-argument to return lexemes for. If you passed in an entire sentence,
-it attempts to find that entire sentence in the dictionary. Since
-the dictionary contains only words, you will receive an empty
-result set back.</p>
-<pre>
-      SELECT lexize('en_ispell', 'This is a senctece to lexize');
-         lexize
-        --------
-        
-        (1 row)
-        
-If you parse a lexeme from a word not in the dictionary, then you will receive an empty result. This makes sense because the word "tsearch" is not in the english dictionary. You can create your own additions to the dictionary if you like. This may be useful for scientific or technical glossaries that need to be indexed. SELECT lexize('en_ispell', 'tsearch'); lexize -------- (1 row)
-
-</pre>
-<p>This is not to say that tsearch will be ignored when adding text
-information to the the tsvector index column. This will be
-explained in greater detail with the table pg_ts_cfgmap.</p>
-<p>Next we need to set up the configuration for mapping the
-dictionay use to the lexxem parsings. This will be done by altering
-the pg_ts_cfgmap table. We will insert several rows, specifying to
-use the new dictionary we installed and configured for lexizing
-within tsearch2. There are several type of lexims we would be
-concerned with forcing the use of the ISpell dictionary.</p>
-<pre>
-        INSERT INTO pg_ts_cfgmap (ts_name, tok_alias, dict_name)
-               VALUES ('default_english', 'lhword', '{en_ispell,en_stem}');
-        INSERT INTO pg_ts_cfgmap (ts_name, tok_alias, dict_name)
-               VALUES ('default_english', 'lpart_hword', '{en_ispell,en_stem}');
-        INSERT INTO pg_ts_cfgmap (ts_name, tok_alias, dict_name)
-               VALUES ('default_english', 'lword', '{en_ispell,en_stem}');
-</pre>
-<p>We have just inserted 3 records to the configuration mapping,
-specifying that the lexeme types for "lhword, lpart_hword and lword"
-are to be stemmed using the 'en_ispell' dictionary we added into
-pg_ts_dict, when using the configuration ' default_english' which
-we added to pg_ts_cfg.</p>
-<p>There are several other lexeme types used that we do not need to
-specify as using the ISpell dictionary. We can simply insert values
-using the 'simple' stemming process dictionary.</p>
-<pre>
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'url', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'host', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'sfloat', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'uri', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'int', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'float', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'email', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'word', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'hword', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'nlword', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'nlpart_hword', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'part_hword', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'nlhword', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'file', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'uint', '{simple}');
-        INSERT INTO pg_ts_cfgmap
-               VALUES ('default_english', 'version', '{simple}');
-</pre>
-
-<p>Our addition of a configuration for 'default_english' is now
-complete. We have successfully created a new tsearch2
-configuration. At the same time we have also set the new
-configuration to be our default for en_US locale.</p>
-<pre>
-        SELECT to_tsvector('default_english',
-                           'learning tsearch is like going to school');
-                           to_tsvector
-        --------------------------------------------------
-         'go':5 'like':4 'learn':1 'school':7 'tsearch':2
-        SELECT to_tsvector('learning tsearch is like going to school');
-                            to_tsvector
-        --------------------------------------------------
-         'go':5 'like':4 'learn':1 'school':7 'tsearch':2
-        (1 row)
-</pre>
-<p>Notice here that words like "tsearch" are still parsed and
-indexed in the tsvector column. There is a lexeme returned for the
-word becuase in the configuration mapping table, we specify words
-to be used from the 'en_ispell' dictionary first, but as a fallback
-to use the 'en_stem' dictionary. Therefore a lexeme is not returned
-from en_ispell, but is returned from en_stem, and added to the
-tsvector.</p>
-<pre>
- SELECT to_tsvector('learning tsearch is like going to computer school');
-                                to_tsvector
-        ---------------------------------------------------------------------------
-         'go':5 'like':4 'learn':1 'school':8 'compute':7 'tsearch':2 'computer':7
-        (1 row)
-</pre>
-<p>Notice in this last example I added the word "computer" to the
-text to be converted into a tsvector. Because we have setup our
-default configuration to use the ISpell english dictionary, the
-words are lexized, and computer returns 2 lexemes at the same
-position. 'compute':7 and 'computer':7 are now both indexed for the
-word computer.</p>
-<p>You can create additional dictionary lists, or use the extra
-large dictionary from ISpell. You can read through the ISpell
-documents, and source tree to make modifications as you see
-fit.</p>
-<p>In the case that you already have a configuration set for the
-locale, and you are changing it to your new dictionary
-configuration. You will have to set the old locale to NULL. If we
-are using the 'C' locale then we would do this:</p>
-
-<pre>
-        UPDATE pg_ts_cfg SET locale=NULL WHERE locale = 'C';
-</pre>
-<p>That about wraps up the configuration of tsearch2. There is much
-more you can do with the tables provided. This was just an
-introduction to get things working rather quickly.</p>
-<h3>ADDING NEW DICTIONARIES TO TSEARCH2</h3>
-<p>To aid in the addition of new dictionaries to the tsearch2
-module you can use another additional module in combination with
-tsearch2. The gendict module is included into tsearch2 distribution
-and is available from gendict/ subdirectory.</p>
-<p>I will not go into detail about installation and instructions on
-how to use gendict to it's fullest extent right now. You can read
-the README.gendict ... it has all of the instructions and
-information you will need.</p>
-<h3>BACKING UP AND RESTORING DATABASES THAT FEATURE TSEARCH2</h3>
-<p><strong>Never rely on anyone elses instructions to backup and
-restore a database system, always develop and understand your own
-methodology, and test it numerous times before you need to do it
-for real.</strong></p>
-<p>The backup and restore procedure has changed over time. This is
-not meant to be the bible for tsearch2 back up and restore. Please
-read all sections so you have a complete understanding of some
-backup and restore issues. Please test your own procedures, and do
-not rely on these instructions solely.</p>
-
-<p>If you come accross some issues in your own procedures, please
-feel free to bring the question up on the Open-FTS, and PostgreSQL
-mailing lists.</p>
-<h3>ORIGINAL BACKUP PROCEDURES</h3>
-<p>Originally, tsearch2 had problems when using the pg_dump, and or
-the pg_dumpall utilities. The problem lies within the original use
-of OIDs for column types. Since OIDs are not consistent accross
-pg_dumps, when you reload the data values into the pg_ts_dict
-table, for example, those oids no longer point to anything. You
-would then end up trying to use a "broken" tsearch2
-configuration.</p>
-<p>The solution was to backup and restore a database using the
-tsearch2 module into small unique parts, and then load them in the
-correct order. You would have to edit the schema and remove the
-tsearch stored procedure references in the sql file. You would have
-to load your global objects, then the tsearch2 objects. You had to
-re-create the tsearch module before restoring your schema so no
-conflicts would arise. Then you could restore your data (all
-schemas, and types needed for the data were now available).</p>
-<p><strong>The original backup instructions were as
-follows</strong></p>
-<p>1) Backup any global database objects such as users and groups
-(this step is usually only necessary when you will be restoring to
-a virgin system)</p>
-<pre>
-        pg_dumpall -g &gt; GLOBALobjects.sql
-
-</pre>
-<p>2) Backup the full database schema using pg_dump</p>
-<pre>
-        pg_dump -s DATABASE &gt; DATABASEschema.sql
-</pre>
-<p>3) Backup the full database using pg_dump</p>
-<pre>
-        pg_dump -Fc DATABASE &gt; DATABASEdata.tar
-</pre>
-
-<p><strong>The original restore procedures were as
-follows</strong></p>
-<p>1) Create the blank database</p>
-<pre>
-        createdb DATABASE
-</pre>
-<p>2) Restore any global database objects such as users and groups
-(this step is usually only necessary when you will be restoring to
-a virgin system)</p>
-<pre>
-        psql DATABASE &lt; GLOBALobjects.sql
-</pre>
-<p>3) Create the tsearch2 objects, functions and operators</p>
-
-<pre>
-        psql DATABASE &lt; tsearch2.sql
-</pre>
-<p>4) Edit the backed up database schema and delete all SQL
-commands which create tsearch2 related functions, operators and
-data types, BUT NOT fields in table definitions that specify
-tsvector types. If your not sure what these are, they are the ones
-listed in tsearch2.sql. Then restore the edited schema to the
-database</p>
-<pre>
-        psql DATABASE &lt; DATABASEschema.sql
-</pre>
-<p>5) Restore the data for the database</p>
-<pre>
-
-        pg_restore -N -a -d DATABASE DATABASEdata.tar
-</pre>
-<p>If you get any errors in step 4, it will most likely be because
-you forgot to remove an object that was created in tsearch2.sql.
-Any errors in step 5 will mean the database schema was probably
-restored wrongly.</p>
-<p><strong>Issues with this procedure</strong></p>
-<p>As I mentioned before, it is vital that you test out your own
-backup and restore procedures. These procedures were originally
-adopted from this document's orignal author. Robert John Shepherd.
-It makes use of the pg_dump custom archive functionality. I am not
-that familiar with the formatting output of pg_dump, and using
-pg_restore. I have always had the luxury of using text files
-(Everything is DATABASE.sql).</p>
-<p>One issue not forseen in the case of using a binary dump is the
-when you have added more than the default tsearch2 configurations.
-Upon reload of the data it will fail due to duplicate primary keys.
-If you load the tsearch2 module, and then delete the data loaded by
-tsearch2 into the configuration tables, the data will restore. The
-configurations are incorrect because you can not remove the data
-using OID references from the custom archive.</p>
-<p>It would be very simple to fix this problem if the data was not
-in an archive format. I do believe all of your data would have been
-restored properly and you can get things working fairly easy. All
-one would have to do is create the configurations as in the
-tsearch2.sql file. And then create your custom configurations
-again.</p>
-<p>I have read in the pg_dump man page that if the tar archive
-format is used, it is possible to limit which data is restored
-using pg_restore. If anyone has more experience with pg_dump
-archives, and pg_restore. Please feel free to test and contribute
-your procedure(s).</p>
-<h3>CURRENT BACKUP AND RESTORE PROCEDURES</h3>
-
-<p>Currently a backup and restore of a database using the tsearch2
-module can be quite simple. If you have applied the patch mentioned
-in the installation instructions prior to tsearch2 installation.
-This patch removes the use of the oid column. The text
-representation for the stored procedures used are dumped with the
-data and the restoration of the data works seemlessly.</p>
-<p>1) to backup the database</p>
-<pre>
-  pg_dump DATABASE &gt; DATABASE.sql
-</pre>
-<p>1) to restore the database</p>
-<pre>
-     createdb DATABASE
-        psql -d DATABASE -f DATABASE.sql
-</pre>
-<p>This procedure is now like any normal backup and restore
-procedure. I can say whether this has been proven using the pg_dump
-archive, and restoring with pg_restore. In theory there should be
-no problems with any format after the patch is applied.</p>
-
-<p>This restoration procedure should never be an issue with the
-patch applied to version 8.0 of PostgreSQL. Only versions 7.3 and
-7.4 are affected. You can avoid any troubles by applying the patch
-prior to installation, or running the SQL script provided to live
-database before backup and restoring is done.</p>
-</div>
-</body>
-</html>
diff --git a/contrib/tsearch2/docs/tsearch2-guide.html b/contrib/tsearch2/docs/tsearch2-guide.html
deleted file mode 100644
index d2d764580c7b..000000000000
--- a/contrib/tsearch2/docs/tsearch2-guide.html
+++ /dev/null
@@ -1,1085 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>tsearch2 guide</title>
-</head>
-<body>
-<h1 align=center>The tsearch2 Guide</h1>
-
-<p align=center>
-Brandon Craig Rhodes<br>30 June 2003
-<br>Updated to 8.2 release by Oleg Bartunov, October 2006</br>
-<p>
-This Guide introduces the reader to the PostgreSQL tsearch2 module,
-version&nbsp;2.
-More formal descriptions of the module's types and functions
-are provided in the <a href="tsearch2-ref.html">tsearch2 Reference</a>,
-which is a companion to this document.
-<p>
-First we will examine the <tt>tsvector</tt> and <tt>tsquery</tt> types
-and how they are used to search documents;
-next, we will use them to build a simple search engine in&nbsp;SQL;
-and finally, we will study the internals of document conversion
-and how you might tune the internals to accommodate various searching needs.
-<p>
-Once you have tsearch2 working with PostgreSQL,
-you should be able to run the examples here exactly as they are typed.
-<p>
-<hr>
-<h2>Table of Contents</h2>
-<blockquote>
-<a href="#intro">Introduction to FTS with tsearch2</a><br>
-<a href="#vectors_queries">Vectors and Queries</a><br>
-<a href="#simple_search">A Simple Search Engine</a><br>
-<a href="#weights">Ranking and Position Weights</a><br>
-<a href="#casting">Casting Vectors and Queries</a><br>
-<a href="#parsing_lexing">Parsing and Lexing</a><br>
-<a href="#ref">Additional information</a>
-</blockquote>
-
-<hr>
-
-
-<h2><a name="intro">Introduction to FTS with tsearch2</a></h2>
-The purpose of FTS is to
-find <b>documents</b>, which satisfy <b>query</b> and optionally return 
-them in some <b>order</b>. 
-Most common case: Find documents containing all query terms and return them in order 
-of their similarity to the query. Document in database can be 
-any text attribute, or combination of text attributes from one or many tables
-(using joins).
-Text search operators existed for years, in PostgreSQL they are
-<tt><b>~,~*, LIKE, ILIKE</b></tt>, but they lack linguistic support,
-tends to be slow and have no relevance ranking. The idea behind tsearch2 is 
-is rather simple - preprocess document at index time to save time at search stage.
-Preprocessing includes
-<ul>
-<li>document parsing onto words
-<li>linguistic - normalize words to obtain lexemes
-<li>store document in optimized for searching way
-</ul>
-Tsearch2, in a nutshell, provides FTS operator (contains) for two new data types, 
-which represent document and query - <tt>tsquery  @@ tsvector</tt>.
-
-<P>
-<h2><a name=vectors_queries>Vectors and Queries</a></h2>
-
-<blockquote>
-<i>This section introduces
-the two data types upon which tsearch2 search engines are based,
-and illustrates their interaction using the simplest possible case.
-The complex examples we present later on
-are merely variations and elaborations of this basic mechanism.</i>
-</blockquote>
-<p>
-The tsearch2 module allows you to index documents by the words they contain,
-and then perform very efficient searches
-for documents that contain a given combination of words.
-Preparing your document index involves two steps:
-<ul>
-<li><b>Making a list of the words each document contains.</b>
- You must reduce each document to a <tt>tsvector</tt>
- which lists each word that appears in the document.
- This process offers many options,
- because there is no requirement
- that you must copy words into the vector
- exactly as they appear in the document.
- For example,
- many developers omit frequent and content-free <b>stop words</b>
- like <i>the</i> to reduce the size of their index;
- others reduce different forms of the same word
- (<i>forked</i>, <i>forking</i>, <i>forks</i>)
- to a common form (<i>fork</i>)
- to make search results independent of tense and case.
- Because words are very often stored in a modified form,
- we use the special term <b>lexemes</b>
- for the word forms we actually store in the vector.
-<li><b>Creating an index of the documents by lexeme.</b>
- This is managed automatically by tsearch2
- when you creat a <tt>gist()</tt> index
- on the <tt>tsvector</tt> column of a table,
- which implements a form of the Berkeley
- <a href="http://gist.cs.berkeley.edu/"><i>Generalized Search Tree</i></a>.
- Since PostgreSQL 8.2 tsearch2 supports <a href="http://www.sigaev.ru/gin/">Gin</a> index,
- which is an inverted index, commonly used in search engines. It adds scalability to tsearch2.
-</ul>
-Once your documents are indexed,
-performing a search involves:
-<ul>
-<li><b>Reducing the search terms to lexemes.</b>
- You must express each search you want to perform
- as a <tt>tsquery</tt> specifying a boolean combination of lexemes.
- Note that tsearch2 only finds <i>exact</i> matches
- between the lexemes in your query and the ones in each vector &mdash;
- even capitalization counts as a difference
- (which is why all lexemes are usually kept lowercase).
- So you must process search words the same way you processed document words;
- if <i>forking</i> became <i>fork</i> in the document's <tt>tsvector</tt>,
- then the search term <i>forking</i> must also become <i>fork</i>
- or the search will not find the document.
-<li><b>Retrieving the documents that match the query.</b>
- Running a <tt>SELECT</tt> ... <tt>WHERE</tt>
- <tt><i>query</i></tt> <tt>@@</tt> <tt><i>vector</i></tt>
- on the table with the <tt><i>vector</i></tt> column
- will return the documents that match your query.
-<li><b>Presenting your results.</b>
- This final stage offers as many options
- as turning documents into vectors.
- You can order documents by how well they matched the search terms;
- create a headline for each document
- showing some of the phrases in which it uses the search terms;
- and restrict the number of results retrieved.
- You will of course want some way to identify each document,
- so the user can ask for the full text of the ones he wants to read.
-</ul>
-And beyond deciding upon rules for turning documents into vectors
-and for presenting search results to users,
-you have to decide <i>where</i> to perform these operations &mdash;
-whether one database server
-will parse documents, perform searches, and prepare search results,
-or whether to spread the load of these operations across several machines.
-These are complicated design issues
-which we will explore later;
-in this section and the next,
-we will illustrate what can be accomplished
-using a single database server.
-<p>
-The <tt>default</tt> tsearch2 configuration,
-which we will learn more about later,
-provides a good example of a process for reducing documents to vectors:
-
-<pre>
-=# <b>SELECT set_curcfg('default')</b>
-=# <b>SELECT to_tsvector('The air smells of sea water.')</b>
-             to_tsvector             
--------------------------------------
- 'air':2 'sea':5 'smell':3 'water':6
-(1 row)
-</pre>
-
-Note the complex relationship between this document and its vector.
-The vector lists only words from the document &mdash;
-spaces and punctuation have disappeared.
-Common words like <i>the</i> and <i>of</i> have been eliminated.
-The&nbsp;<i>-s</i> that makes <i>smells</i> a plural has been removed,
-leaving a lexeme that represents the word in its simplest form.
-And finally,
-though the vector remembers the positions in which each word appeared,
-it does not store the lexemes in that order.
-<p>
-Keeping word positions in your vectors is optional, by the way.
-The positions are necessary for the tsearch2 ranking functions,
-which you can use to prioritize documents
-based on how often each document uses the search terms
-and whether they appear in close proximity.
-But if you do not perform ranking,
-or use your own process that ignores the word positions stored in the vector,
-then you can save space by stripping them from your vectors:
-
-<pre>
-=# <b>SELECT strip(to_tsvector('The air smells of sea water.'))</b>
-            strip            
------------------------------
- 'air' 'sea' 'smell' 'water'
-(1 row)
-</pre>
-
-Now that we have a procedure for creating vectors,
-we can build an indexed table of vectors very simply:
-
-<pre>
-=# <b>CREATE TABLE vectors ( vector tsvector )</b>
-=# <b>CREATE INDEX vector_index ON vectors USING gist(vector)</b>
-=# <b>INSERT INTO vectors VALUES (to_tsvector('The path forks here'))</b>
-=# <b>INSERT INTO vectors VALUES (to_tsvector('A crawl leads west'))</b>
-=# <b>INSERT INTO vectors VALUES (to_tsvector('The left fork leads northeast'))</b>
-=# <b>SELECT * FROM vectors</b>
-                  vector                  
-------------------------------------------
- 'fork':3 'path':2
- 'lead':3 'west':4 'crawl':2
- 'fork':3 'lead':4 'left':2 'northeast':5
-(3 rows)
-</pre>
-
-Now we can search this collection of document vectors
-using the <tt>@@</tt> operator and a <tt>tsquery</tt>
-that specifies the combination of lexemes we are looking for.
-Note that while vectors simply list lexemes,
-queries always combine them with the operators
-&lsquo;<tt>&amp;</tt>&rsquo;&nbsp;and,
-&lsquo;<tt>|</tt>&rsquo;&nbsp;or,
-and &nbsp;&lsquo;<tt>!</tt>&rsquo;&nbsp;not,
-plus parentheses for grouping.
-Some examples of the query syntax:
-<table align=center>
-<tr>
- <td>&lsquo;find documents with the word <i>forks</i> in them&rsquo;<br>
- <td><tt>'forks'</tt>
-<tr>
- <td>&lsquo;... with both <i>forks</i> and <i>leads</i>&rsquo;<br>
- <td><tt>'forks & leads'</tt>
-<tr>
- <td>&lsquo;... with either <i>forks</i> or <i>leads</i>&rsquo;<br>
- <td><tt>'forks | leads'</tt>
-<tr>
- <td>&lsquo;... with either <i>forks</i> or <i>leads</i>,
-  but without <i>crawl</i>&rsquo;<br>
- <td><tt>'(forks|leads) & !crawl'</tt>
-</table>
-The tsearch2 module
-provides a <tt>to_tsquery()</tt> function for creating queries
-that uses the same process as <tt>to_tsvector()</tt> uses
-to reduce words to lexemes.
-For instance,
-it will remove the&nbsp;<i>-s</i> from the plurals in the last example above:
-
-<pre>
-=# <b>SELECT to_tsquery('(leads|forks) & !crawl')</b>
-           to_tsquery           
---------------------------------
- ( 'lead' | 'fork' ) & !'crawl'
-(1 row)
-</pre>
-
-Again,
-this is critically important because the search operator <tt>@@</tt>
-only finds <i>exact</i> matches
-between the words in a query and the words in a vector;
-if the document vector lists the lexeme <i>fork</i>
-but the query looks for the plural form <i>forks</i>,
-the query would not match that document.
-Thanks to the symmetry between our process
-for producing vectors and queries, however,
-the above searches return correct results:
-
-<pre>
-=# <b>SELECT * FROM vectors WHERE vector @@ to_tsquery('(leads|forks) & !crawl')</b>
-                  vector                  
-------------------------------------------
- 'fork':3 'path':2
- 'fork':3 'lead':4 'left':2 'northeast':5
-(2 rows)
-</pre>
-
-You may want to try the other queries shown above,
-and perhaps invent some of your own.
-<p>
-You should not include stop words in a query,
-since you cannot search for words you have discarded.
-If you throw out the word <i>the</i> when building vectors, for example,
-your index will obviously not know which documents included it.
-The <tt>to_tsquery()</tt> function will automatically detect this
-and give you an error to prevent this mistake:
-
-<pre>
-=# <b>SELECT to_tsquery('the')</b>
-NOTICE:  Query contains only stopword(s) or doesn't contain lexem(s), ignored
- to_tsquery 
-------------
- 
-(1 row)
-</pre>
-
-But if you every build vectors and queries using your own routines,
-a possibility we will discuss later,
-then you will need to enforce this rule yourself.
-
-<blockquote><i>
-Now that you understand how vectors and queries work together,
-you are prepared to tackle many additional topics:
-how to distribute searching across many servers;
-how to customize the process
-by which tsearch2 turns documents and queries into lexemes,
-or use a process of your own;
-and how to sort and display search results to your users.
-But before discussing these detailed questions,
-we will build a simple search engine
-to see how easily its basic features work together.
-</i></blockquote>
-
-<h2><a name=simple_search>A Simple Search Engine</a></h2>
-
-<blockquote><i>
-In this section we build a simple search engine out of SQL functions
-that use the vector and query types described in the previous section.
-While this example is simpler
-than a search engine that has to interface with the outside world,
-it will illustrate the basic principles of building a search engine,
-and better prepare you for developing your own.
-</i></blockquote>
-Building a search engine involves only a few improvements
-upon the rudimentary vector searches described in the last section.
-<ul>
-<li>Because the user wants to read documents, not vectors,
- you must provide some way
- for the full text of each document to be accessed &mdash;
- either by storing the entire text of each document in the database,
- or storing an identifier
- like a URL, file name, or document routing number
- that lets you fetch the document from other storage.
-<li>You can make it easier for user interface code to refer to each document
- by providing a unique identifier for each document,
- perhaps with a <tt>SERIAL</tt> column.
-<li>Search results should be ordered by relevance.
- If you leave word positions in your vectors,
- you can either have PostgreSQL <tt>ORDER</tt> your results
- <tt>BY</tt> a ranking function,
- or you can fetch the vectors yourself and perform your own sort.
- If you choose to ignore word positions or strip them from your vectors,
- you will have to determine relevance yourself,
- using either the full text of the document
- or other information about each document you may possess.
-<li>For each document returned by a search,
- you will usually want to display a summary called a <i>headline</i>
- that shows short excerpts
- illustrating how the document uses the query words.
- Headlines are usually generated from the full text of the document,
- not from position information in the <tt>tsvector</tt>,
- since excerpts lacking stop words, punctuation, and suffixes
- would not be comprehensible.
- If you store the full text of each document in the database,
- headlines can be generated very simply by a tsearch2 function.
- If you store your documents elsewhere,
- then you will either have to transmit each document to the database
- every time you want to run the headline function on it,
- or use your own headline code outside of the database.
-</ul>
-<p>
-We can easily construct a simple search engine
-that accomplishes these goals.
-First we build a table that, for each document,
-stores a unique identifier, the full text of the document,
-and its <tt>tsvector</tt>:
-
-<pre>
-=# <b>CREATE TABLE docs ( id SERIAL, doc TEXT, vector tsvector )</b>
-=# <b>CREATE INDEX docs_index ON docs USING gist(vector);</b>
-</pre>
-
-Note that although searches will still work
-on tables where you have neglected
-to create a <tt>gist()</tt> index over your vectors,
-they will run much more slowly
-since they will have to compare the query
-against every document vector in the table.
-<p>
-Because the table we have created
-stores each document in two different ways &mdash;
-both as text and as a vector &mdash;
-our <tt>INSERT</tt> statements must provide the document in both forms.
-While more advanced PostgreSQL programmers
-might accomplish this with a database trigger or rule,
-for this simple example we will use a small SQL function:
-
-<pre>
-=# <b>CREATE FUNCTION insdoc(text) RETURNS void LANGUAGE sql AS
-  'INSERT INTO docs (doc, vector) VALUES ($1, to_tsvector($1));'</b>
-</pre>
-
-Now, by calling <tt>insdoc()</tt> several times,
-we can populate our table with documents:
-
-<pre>
-=# <b>SELECT insdoc('A low crawl over cobbles leads inward to the west.')</b>
-=# <b>SELECT insdoc('The canyon runs into a mass of boulders -- dead end.')</b>
-=# <b>SELECT insdoc('You are crawling over cobbles in a low passage.')</b>
-=# <b>SELECT insdoc('Cavernous passages lead east, north, and south.')</b>
-=# <b>SELECT insdoc('To the east a low wide crawl slants up.')</b>
-=# <b>SELECT insdoc('You are in the south side chamber.')</b>
-=# <b>SELECT insdoc('The passage here is blocked by a recent cave-in.')</b>
-=# <b>SELECT insdoc('You are in a splendid chamber thirty feet high.')</b>
-</pre>
-
-Now we can build a search function.
-Its <tt>SELECT</tt> statement is based upon
-the same <tt>@@</tt> operation illustrated in the previous section.
-But instead of returning matching vectors,
-we return for each document
-its <tt>SERIAL</tt> identifier, so the user can retrieve it later;
-a headline that illustrates its use of the search terms;
-and a ranking with which we also order the results.
-Our search operation can be coded as a single <tt>SELECT</tt> statement
-returning its own kind of table row,
-which we call a&nbsp;<tt>finddoc_t</tt>:
-
-<pre>
-=# <b>CREATE TYPE finddoc_t AS (id INTEGER, headline TEXT, rank REAL)</b>
-=# <b>CREATE FUNCTION finddoc(text) RETURNS SETOF finddoc_t LANGUAGE sql AS '
-   SELECT id, headline(doc, q), rank(vector, q)
-     FROM docs, to_tsquery($1) AS q
-     WHERE vector @@ q ORDER BY rank(vector, q) DESC'</b>
-</pre>
-
-This function is a rather satisfactory search engine.
-Here is one example search,
-after which the user fetches the top-ranking document itself;
-with similar commands you can try queries of your own:
-
-<pre>
-=# <b>SELECT * FROM finddoc('passage|crawl')</b>
- id |                       headline                        | rank 
-----+-------------------------------------------------------+------
-  3 | &lt;b&gt;crawling&lt;/b&gt; over cobbles in a low &lt;b&gt;passage&lt;/b&gt;. | 0.19
-  1 | &lt;b&gt;crawl&lt;/b&gt; over cobbles leads inward to the west.   |  0.1
-  4 | &lt;b&gt;passages&lt;/b&gt; lead east, north, and south.          |  0.1
-  5 | &lt;b&gt;crawl&lt;/b&gt; slants up.                               |  0.1
-  7 | &lt;b&gt;passage&lt;/b&gt; here is blocked by a recent  cave-in.  |  0.1
-(5 rows)
-=# <b>SELECT doc FROM docs WHERE id = 3</b>
-                       doc                       
--------------------------------------------------
- You are crawling over cobbles in a low passage.
-(1 row)
-</pre>
-
-While by default the <tt>headline()</tt> function
-surrounds matching words with <tt>&lt;b&gt;</tt> and <tt>&lt;/b&gt;</tt>
-in order to distinguish them from the surrounding text,
-you can provide options that change its behavior;
-consult the tsearch2 Reference for more details about
-<a href="tsearch2-ref.html#headlines">Headline Functions</a>.
-<p>
-Though a search may match hundreds or thousands of documents,
-you will usually present only ten or twenty results to the user at a time.
-This can be most easily accomplished
-by limiting your query with a <tt>LIMIT</tt>
-and an <tt>OFFSET</tt> clause &mdash;
-to display results ten at a time, for example,
-your would generate your first page of results
-with <tt>LIMIT</tt> <tt>10</tt> <tt>OFFSET</tt> <tt>0</tt>,
-your second page
-with <tt>LIMIT</tt> <tt>10</tt> <tt>OFFSET</tt> <tt>10</tt>,
-your third page
-with <tt>LIMIT</tt> <tt>10</tt> <tt>OFFSET</tt> <tt>20</tt>,
-and so forth.
-There are two problems with this approach, however.
-<p>
-The first problem is the strain of running the query over again
-for every page of results the user views.
-For small document collections or lightly loaded servers,
-this may not be a problem;
-but the impact can be high
-when a search must repeatedly rank and sort
-the same ten thousand results
-on an already busy server.
-So instead of selecting only one page of results,
-you will probably use <tt>LIMIT</tt> and <tt>OFFSET</tt>
-to return a few dozen or few hundred results,
-which you can cache and display to the user one page at a time.
-Whether a result cache rewards your effort
-will depend principally on the behavior of your users &mdash;
-how often they even view the second page of results, for instance.
-<p>
-The second issue solved by caching involves consistency.
-If the database is changing while the user browses their results,
-then documents might appear and disappear as they page through them.
-In some cases the user might even miss a particular result &mdash;
-perhaps the one they were looking for &mdash;
-if, say, its rank improves from 31th to 30th
-after they load results 21&ndash;30 but before they view results 31&ndash;40.
-While many databases are static or infrequently updated,
-and will not present this problem,
-users searching very dymanic document collections
-might benefit from the stable results that caches yield.
-
-<blockquote><i>
-Having seen the features of a search engine
-implemented entirely within the database,
-we will learn about some specific tsearch2 features.
-First we will look in more detail at document ranking.
-</i></blockquote>
-
-<h2><a name=weights>Ranking and Position Weights</a></h2>
-
-<blockquote><i>
-When we built our simple search engine,
-we used the </i><tt>rank()</tt><i> function to order our results.
-Here we describe tsearch2 ranking in more detail.
-</i></blockquote>
-
-There are two functions with which tsearch2 can rank search results.
-They both use the lexeme positions listed in the <tt>tsvector</tt>,
-so you cannot rank vectors
-from which these have been removed with <tt>strip()</tt>.
-The <tt>rank()</tt> function existed in older versions of OpenFTS,
-and has the feature that you can assign different weights
-to words from different sections of your document.
-The <tt>rank_cd()</tt> uses a recent technique for weighting results
-and also allows  different weight to be given
-to different sections of your document (since 8.2).
-<p>
-Both ranking functions allow you to specify,
-as an optional last argument,
-whether you want their results <i>normalized</i> &mdash;
-whether the rank returned should be adjusted for document length.
-Specifying a last argument of <tt>0</tt> (zero) makes no adjustment;
-<tt>1</tt> (one) divides the document rank
-by the logarithm of the document length;
-and <tt>2</tt> divides it by the plain length.
-In all of these examples we omit this optional argument,
-which is the same as specifying zero &mdash;
-we are making no adjustment for document length.
-<p>
-The <tt>rank_cd()</tt> function uses an experimental measurement
-called <i>cover density ranking</i> that rewards documents
-when they make frequent use of the search terms
-that are close together in the document.
-You can read about the algorithm in more detail
-in Clarke&nbsp;et&nbsp;al.,
- &ldquo;<a href="http://citeseer.nj.nec.com/clarke00relevance.html"
->Relevance Ranking for One to Three Term Queries</a>.&rdquo;
-An optional first argument allows you to tune their formula;
-for details
-see the <a href="tsearch2-ref.html#ranking">section on ranking</a>
-in the Reference.
-<p>
-Currently tsearch2 supports four different weight labels:
-<tt>'D'</tt>, the default weight;
-and <tt>'A'</tt>, <tt>'B'</tt>, and <tt>'C'</tt>.
-All vectors created with <tt>to_tsvector()</tt>
-assign the weight <tt>'D'</tt> to each position,
-which as the default is not displayed when you print a vector out.
-<p>
-If you want positions with weights other than <tt>'D'</tt>,
-you have two options:
-either you can author a vector directly through the <tt>::tsvector</tt>
-casting operation,
-as described in the following section,
-which lets you give each position whichever weight you want;
-or you can pass a vector through the <tt>setweight()</tt> function
-which sets all of its position weights to a single value.
-An example of the latter:
-
-
-<pre>
-=# <b>SELECT vector FROM docs WHERE id = 3</b>
-                 vector                 
-----------------------------------------
- 'low':8 'cobbl':5 'crawl':3 'passag':9
-(1 row)
-=# <b>SELECT setweight(vector, 'A') FROM docs WHERE id = 3</b>
-                 setweight                  
---------------------------------------------
- 'low':8A 'cobbl':5A 'crawl':3A 'passag':9A
-(1 row)
-</pre>
-
-
-Merely changing all of the weights in a vector is not very useful,
-of course,
-since this results still in all words having the same weight.
-But if we parse different parts of a document separately,
-giving each section its own weight,
-and then concatenate the vectors of each part into a single vector,
-the result can be very useful.
-We can construct a simple example
-in which document titles are given greater weight
-that text in the body of the document:
-
-
-<pre>
-=# <b>CREATE TABLE tdocs ( id SERIAL, title TEXT, doc TEXT, vector tsvector )</b>
-=# <b>CREATE INDEX tdocs_index ON tdocs USING gist(vector);</b>
-=# <b>CREATE FUNCTION instdoc(text, text) RETURNS void LANGUAGE sql AS
-  'INSERT INTO tdocs (title, doc, vector)
-   VALUES ($1, $2, setweight(to_tsvector($1), ''A'') || to_tsvector($2));'</b>
-</pre>
-
-
-Now words from a document title will be weighted differently
-than those in the main text
-if we provide the title and body as separate arguments:
-
-
-<pre>
-=# <b>SELECT instdoc('Spendid Chamber',
- 'The walls are frozen rivers of orange stone.')</b>
- instdoc 
----------
- 
-(1 row)
-=# <b>SELECT vector FROM tdocs</b>
-                                    vector                                    
-------------------------------------------------------------------------------
- 'wall':4 'orang':9 'river':7 'stone':10 'frozen':6 'chamber':2A 'spendid':1A
-(1 row)
-</pre>
-
-
-Note that although the necessity is unusual,
-you can constrain search terms
-to only match words from certain sections
-by following them with a colon
-and a list of the sections in which the word can occur;
-by default this list is <tt>'ABCD'</tt>
-so that search terms match words from all sections.
-For example,
-here we search for a word both generally,
-and then looking only for specific weights:
-
-
-<pre>
-=# <b>SELECT title, doc FROM tdocs WHERE vector @@ to_tsquery('spendid')</b>
-      title      |                     doc                      
------------------+----------------------------------------------
- Spendid Chamber | The walls are frozen rivers of orange stone.
-(1 row)
-=# <b>SELECT title, doc FROM tdocs WHERE vector @@ to_tsquery('spendid:A')</b>
-      title      |                     doc                      
------------------+----------------------------------------------
- Spendid Chamber | The walls are frozen rivers of orange stone.
-(1 row)
-=# <b>SELECT title, doc FROM tdocs WHERE vector @@ to_tsquery('spendid:D')</b>
- title | doc 
--------+-----
-(0 rows)
-</pre>
-
-
-
-
-<blockquote><i>
-Our examples so far use tsearch2 to parse our documents into vectors.
-When your application needs absolute control over vector content,
-you will want to use direct type casting,
-which is described in the next section.
-</i></blockquote>
-
-<h2><a name=casting>Casting Vectors and Queries</a></h2>
-
-<blockquote><i>
-While tsearch2 has powerful and flexible ways
-to process documents and turn them into document vectors,
-you will sometimes want to parse documents on your own
-and place the results directly in vectors.
-Here we show you how.
-</i></blockquote>
-
-In the preceding examples,
-we used the <tt>to_tsvector()</tt> function
-when we needed a document's text reduced to a document vector.
-We saw that the function stripped whitespace and punctuation,
-eliminated common words,
-and altered suffixes to reduce words to a common form.
-While these operations are often desirable,
-and while in the sections below
-we will gain precise control over this process,
-there are occasions on which
-you want to avoid the changes that <tt>to_tsvector()</tt> makes to text
-and specify explicitly the words that you want in your vectors.
-Or you may want to create queries directly
-rather than through <tt>to_tsquery()</tt>.
-<p>
-For example,
-you may have already developed your own routine
-for reducing your documents to searchable lexemes,
-and do not want your carefully generated terms altered
-by passing them through <tt>to_tsvector()</tt>.
-Or you might be developing and debugging parsing routines of your own
-that you are not ready to load into the database.
-In either case,
-you will find that direct insertion is easily accomplished
-if you simply follow some simple rules.
-<p>
-Vectors are created directly
-when you cast a string of whitespace separated lexemes
-to the <tt>tsvector</tt> type:
-
-
-<pre>
-=# <b>select 'the only exit is the way you came in'::tsvector</b>
-                     tsvector                     
---------------------------------------------------
- 'in' 'is' 'the' 'way' 'you' 'came' 'exit' 'only'
-(1 row)
-</pre>
-
-
-Notice that the conversion interpreted the string
-simply as a list of lexemes to be included in the vector.
-Their order was lost,
-as was the number of times each lexeme appeared.
-You must keep in mind that directly creating vectors with casting
-is <i>not</i> an alternate means of parsing;
-it is a way of directly entering lexemes into a vector <i>without</i> parsing.
-<p>
-Queries can also be created through casting,
-if you separate lexemes with boolean operators
-rather than with whitespace.
-When creating your own vectors and queries,
-remember that the search operator <tt>@@</tt>
-finds only <i>exact</i> matches between query lexemes and vector lexemes
-&mdash;
-if they are not exactly the same string,
-they will not be considered a match.
-<p>
-To include lexeme positions in your vector,
-write the positions exactly the way tsearch2 displays them
-when it prints vectors:
-by following each lexeme with a colon
-and a comma-separated list of integer positions.
-If you list a lexeme more than once,
-then all the positions listed for it are combined into a single list.
-For example,
-here are two ways of writing the same vector,
-depending on whether you mention &lsquo;<tt>the</tt>&rsquo; twice
-or combine its positions into a list yourself:
-
-
-<pre>
-=# <b>select 'the:1 only:2 exit:3 is:4 the:5 way:6 you:7 came:8 in:9'::tsvector</b>
-                              tsvector                              
---------------------------------------------------------------------
- 'in':9 'is':4 'the':1,5 'way':6 'you':7 'came':8 'exit':3 'only':2
-(1 row)
-=# <b>select 'the:1,5 only:2 exit:3 is:4 way:6 you:7 came:8 in:9'::tsvector</b>
-                              tsvector                              
---------------------------------------------------------------------
- 'in':9 'is':4 'the':1,5 'way':6 'you':7 'came':8 'exit':3 'only':2
-(1 row)
-</pre>
-
-
-Things can get slightly tricky
-if you want to include apostrophes, backslashes, or spaces
-inside your lexemes
-(wanting to include either of the latter would be unusual,
-but they can be included if you follow the rules).
-The main problem is that the apostrophe and backslash
-are important <i>both</i> to PostgreSQL when it is interpreting a string,
-<i>and</i> to the <tt>tsvector</tt> conversion function.
-You may want to review section
-<a href="http://www.postgresql.org/docs/current/static/sql-syntax.html#SQL-SYNTAX-STRINGS">
-&ldquo;String Constants&rdquo;</a>
-in the PostgreSQL documentation before proceeding.
-<p>
-When you cast strings directly into vectors:
-<ul>
-<li>The string is interpreted as a whitespace-separated list of lexemes,
- any of which can be suffixed with a colon and a list of positions.
-<li>A lexeme can be quoted by preceding it with an apostrophe,
- in which case it runs until the next apostrophe;
- otherwise a lexeme ends with the first whitespace or colon encountered.
-<li>Any character preceded by a backslash,
- including whitespace, the apostrophe, the colon, and the backslash itself,
- loses its normal meaning and is treated as a letter.
- Backslashes are effective
- both inside and outside of apostrophe-quoted lexemes.
-<li>A lexeme can be suffixed with a list of positions
- by appending a colon and a comma-separated list of integers,
- each of which can itself be followed by a letter
- to designate a position weight
- (position weights are <a href="#weights">described below</a>).
-</ul>
-
-Here are some example strings,
-showing the lexeme you want to insert
-together with the string that the <tt>::tsvector</tt> operator
-needs to see,
-and how you would type that string at the PostgreSQL prompt:
-
-<table align=center>
-<tr>
-<td><i>For the lexeme...</i>
-<td><i>you need the string...</i>
-<td><i>which you can type as:</i>
-<tr>
-<td><tt>nugget</tt>
-<td><tt>nugget</tt>
-<td><tt>'nugget'</tt>
-<tr>
-<td><tt>won't</tt>
-<td><tt>won't</tt>
-<td><tt>'won''t'</tt>
-<tr>
-<td><tt>pinin'</tt>
-<td><tt>pinin'</tt>
-<td><tt>'pinin'''</tt>
-<tr>
-<td><tt>'bout</tt>
-<td><tt>\'bout</tt>
-<td><tt>'\\''bout'</tt>
-<tr>
-<td><tt>white mist</tt>
-<td><tt>white\ mist</tt>
-<td><tt>'white\\ mist'</tt>
-<tr>
-<td align=right><tt><i>or:</i></tt>
-<td><tt>'white mist'</tt>
-<td><tt>'''white mist'''</tt>
-<tr>
-<td><tt>won't budge</tt>
-<td><tt>won\'t\ budge</tt>
-<td><tt>'won\\''t\\ budge'</tt>
-<tr>
-<td align=right><tt><i>or:</i></tt>
-<td><tt>'won\'t budge'</tt>
-<td><tt>'''won\\''t budge'''</tt>
-<tr>
-<td><tt>back\slashed</tt>
-<td><tt>back\\slashed</tt>
-<td><tt>'back\\\\slashed'</tt>
-</table>
-
-Remember to use the quoted quoting shown at the right
-only when typing in strings as part of a PostgreSQL query.
-If you are providing strings through a library
-that automatically quotes them
-or provides them in binary form to PostgreSQL,
-then you can use the strings in the middle instead &mdash;
-suitably quoted in the language you are using, of course.
-<p>
-Position weights are <a href="#weights">described below</a>
-and can be written exactly as they will be displayed
-when you select a weighted vector:
-
-<pre>
-=# <b>select 'weighty:1,3A trivial:2B,4'::tsvector</b>
-           tsvector            
--------------------------------
- 'trivial':2B,4 'weighty':1,3A
-(1 row)
-</pre>
-
-<p>
-Note that if you are composing SQL queries
-in a scripting language like Perl or Python,
-that itself considers quotes and backslashes special,
-then you may have another quoting layer to deal with
-on top of the two layers already shown above.
-In such cases you may want to write a function
-that performs the necessary quoting for you.
-
-<blockquote><i>
-Having seen how to create vectors of your own,
-it is time to learn how the native tsearch2 parser
-reduces documents to vectors.
-</i></blockquote>
-
-<h2><a name=parsing_lexing>Parsing and Lexing</a></h2>
-
-<blockquote><i>
-The previous section
-described how you can bypass the parser provided by tsearch2
-and populate your table of documents
-with vectors of your own devising.
-But for those interested in the native tsearch2 facilities,
-we present here an overview of how it goes about
-reducing documents to vectors.
-</i></blockquote>
-
-The <tt>to_tsvector()</tt> function reduces documents to vectors
-in two stages.
-First, a <i>parser</i> breaks the input document
-into short sequences of text called <i>tokens</i>.
-Each token is usually a word, space, or piece of punctuation,
-though some parsers return larger and more exotic items
-like HTML tags as single tokens.
-Each token returned by the parser
-is either discarded
-or passed to a <i>dictionary</i> that converts it into a lexeme.
-The resulting lexemes are collected into a vector and returned.
-<p>
-The choice of which parser and dictionaries <tt>to_tsvector()</tt> should use
-is controlled by your choice of <i>configuration</i>.
-The tsearch2 module comes with several configurations,
-and you can define more of your own;
-in fact the creation of a new configuration is illustrated below,
-in the section on position weights.
-<p>
-To learn about parsing in more detail,
-we will study this example:
-
-<pre>
-=# <b>select to_tsvector('default',
-     'The walls extend upward for well over 100 feet.')</b>
-                       to_tsvector                        
-----------------------------------------------------------
- '100':8 'feet':9 'wall':2 'well':6 'extend':3 'upward':4
-(1 row)
-</pre>
-
-Unlike the <tt>to_tsvector()</tt> calls used in the above examples,
-this one specifies the <tt>'default'</tt> configuration explicitly.
-When we called <tt>to_tsvector()</tt> in earlier examples
-with only one argument,
-it used the <i>current</i> configuration,
-which is chosen automatically based on your <tt>LOCALE</tt>
-if that locale is mentioned in the <tt>pg_ts_cfg</tt> table
-(which is shown under the first bullet in the description below).
-If your locale is not listed in the table,
-your attempts to use the current configuration will return:
-
-<pre>
-ERROR:  Can't find tsearch2 config by locale
-</pre>
-
-You can always change the current configuration manually
-by calling the <tt>set_curcfg()</tt> function
-described in the section on
-<a href="tsearch2-ref.html#configurations">Configurations</a>
-in the Reference.
-<p>
-Each configuration serves as an index into two different tables:
-in <tt>pg_ts_cfg</tt> it determines
-which parser will break our text into tokens,
-and in <tt>pg_ts_cfgmap</tt>
-it directs each token to a dictionary for processing.
-The steps in detail are:
-
-<ul>
-<li class=big>
-<p>First, our text is parsed,
-using the parser listed for our configuration in the <tt>pg_ts_cfg</tt> table.
-We are using the <tt>'default'</tt> configuration,
-so the table tells us to use the <tt>'default'</tt> parser:
-
-<pre>
-=# <b>SELECT * FROM pg_ts_cfg WHERE ts_name = 'default'</b>
- ts_name | prs_name | locale 
----------+----------+--------
- default | default  | C
-(1 row)
-</pre>
-
-So our text will be parsed as though we had called:
-
-<pre>
-=# <b>select * from parse('default',
-     'The walls extend upward for well over 100 feet.')</b>
-</pre>
-
-This breaks the text into a list of tokens
-which are each labelled with an integer type:
-<p align=center>
-The<sub>1</sub>&diams;<sub>12</sub
->walls<sub>1</sub>&diams;<sub>12</sub
->extend<sub>1</sub>&diams;<sub>12</sub
->upward<sub>1</sub>&diams;<sub>12</sub
->for<sub>1</sub>&diams;<sub>12</sub
->well<sub>1</sub>&diams;<sub>12</sub
->over<sub>1</sub>&diams;<sub>12</sub
->100<sub>22</sub>&diams;<sub>12</sub
->feet<sub>1</sub>.<sub>12</sub>
-<p>
-Each word has been assigned type&nbsp;1;
-each space (represented here by a diamond) and the period, type&nbsp;12;
-and the number one hundred, type&nbsp;22.
-We can retrieve the alias for each type
-through the <tt>token_type</tt> function:
-
-<pre>
-=# <b>select * from token_type('default')
-     where tokid = 1 or tokid = 12 or tokid = 22</b>
- tokid | alias |      descr       
--------+-------+------------------
-     1 | lword | Latin word
-    12 | blank | Space symbols
-    22 | uint  | Unsigned integer
-(3 rows)
-</pre>
-
-
-<li class=big>
-Next, the tokens are assigned to dictionaries
-by looking up their type aliases in <tt>pg_ts_cfgmap</tt>
-to determine which dictionary should process each token.
-Since we are using the <tt>'default'</tt> configuration:
-
-<pre>
-=# <b>select * from pg_ts_cfgmap where ts_name = 'default' and
-      (tok_alias = 'lword' or tok_alias = 'blank' or tok_alias = 'uint')</b>
- ts_name | tok_alias | dict_name 
----------+-----------+-----------
- default | lword     | {en_stem}
- default | uint      | {simple}
-(2 rows)
-</pre>
-
-Since this map provides no dictionary for <tt>blank</tt> tokens,
-the spaces and period are simply discarded,
-leaving nine tokens,
-which are then numbered by their position:
-<p align=center>
-The<sup>1</sup>
-walls<sup>2</sup>
-extend<sup>3</sup>
-upward<sup>4</sup>
-for<sup>5</sup>
-well<sup>6</sup>
-over<sup>7</sup>
-100<sup>8</sup>
-feet<sup>9</sup>
-
-<li class=big>
-Finally, the words are reduced to lexemes by their respective dictionaries.
-The <tt>100</tt> is submitted to the <tt>simple</tt> dictionary,
-which returns tokens unaltered except for making them lowercase:
-
-<pre>
-=# <b>select lexize('simple', '100')</b>
- lexize 
---------
- {100}
-(1 row)
-</pre>
-
-The other words are submitted to <tt>en_stem</tt>
-which reduces each English word to a linguistic stem,
-and then discards stems which belong to its list of stop words;
-you can see the list of stop words
-in the file whose path is in the <tt>dict_initoption</tt> field
-of the <tt>pg_ts_dict</tt> table entry for <tt>en_stem</tt>.
-The first three words of our text illustrate respectively
-an <tt>en_stem</tt> stop word,
-a word which <tt>en_stem</tt> alters by stemming,
-and a word which <tt>en_stem</tt> leaves alone:
-
-<pre>
-=# <b>select lexize('en_stem', 'The')</b>
- lexize 
---------
- {}
-(1 row)
-=# <b>select lexize('en_stem', 'walls')</b>
- lexize 
---------
- {wall}
-(1 row)
-=# <b>select lexize('en_stem', 'extend')</b>
-  lexize  
-----------
- {extend}
-(1 row)
-</pre>
-
-Once <tt>en_stem</tt> is done discarding stop words and stemming the rest,
-we are left with:
-<p align=center>
-wall<sup>2</sup>
-extend<sup>3</sup>
-upward<sup>4</sup>
-well<sup>6</sup>
-100<sup>8</sup>
-feet<sup>9</sup>
-<p>
-Which is precisely the result of the example that began this section.
-</ul>
-Query words are stemmed by the <tt>to_tsquery()</tt> function
-using the same scheme to determine the dictionary for each token,
-with the difference that the query parser recognizes as special
-the boolean operators that separate query words.
-
-
-<h2><a name="ref">Additional information</a></h2>
-More information about tsearch2 is available from 
-<a href="http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2">tsearch2</a> page.
-Also, it's worth to check 
-<a href="http://www.sai.msu.su/~megera/wiki/Tsearch2">tsearch2 wiki</a> pages.
-
-
-</body>
-</html>
-
-
diff --git a/contrib/tsearch2/docs/tsearch2-ref.html b/contrib/tsearch2/docs/tsearch2-ref.html
deleted file mode 100644
index 7edcc55a9b87..000000000000
--- a/contrib/tsearch2/docs/tsearch2-ref.html
+++ /dev/null
@@ -1,842 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-
-<title>tsearch2 reference</title></head>
-
-<body>
-<h1 align="center">The tsearch2 Reference</h1>
-
-<p align="center">
-Brandon Craig Rhodes<br>30 June 2003 (edited by Oleg Bartunov, 2 Aug 2003).
-<br>Massive update for 8.2 release by Oleg Bartunov, October 2006
-</p>
-<p>
-This Reference documents the user types and functions
-of the tsearch2 module for PostgreSQL.
-An introduction to the module is provided
-by the <a href="http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/docs/tsearch2-guide.html">tsearch2 Guide</a>,
-a companion document to this one.
-</p>
-
-<h2>Table of Contents</h2>
-<blockquote>
-<a href="#vq">Vectors and Queries</a><br>
-<a href="#vqo">Vector Operations</a><br>
-<a href="#qo">Query Operations</a><br>
-<a href="#fts">Full Text Search Operator</a><br>
-<a href="#configurations">Configurations</a><br>
-<a href="#testing">Testing</a><br>
-<a href="#parsers">Parsers</a><br>
-<a href="#dictionaries">Dictionaries</a><br>
-<a href="#ranking">Ranking</a><br>
-<a href="#headlines">Headlines</a><br>
-<a href="#indexes">Indexes</a><br>
-<a href="#tz">Thesaurus dictionary</a><br>
-</blockquote>
-
-
-
-
-<h2><a name="vq">Vectors and Queries</a></h2>
-
-Vectors and queries both store lexemes,
-but for different purposes.
-A <tt>tsvector</tt> stores the lexemes
-of the words that are parsed out of a document,
-and can also remember the position of each word.
-A <tt>tsquery</tt> specifies a boolean condition among lexemes.
-<p>
-Any of the following functions with a <tt><i>configuration</i></tt> argument
-can use either an integer <tt>id</tt> or textual <tt>ts_name</tt>
-to select a configuration;
-if the option is omitted, then the current configuration is used.
-For more information on the current configuration,
-read the next section on Configurations.
-</p>
-
-<h3><a name="vqo">Vector Operations</a></h3>
-
-<dl><dt>
-<tt>to_tsvector( <em>[</em><i>configuration</i>,<em>]</em>
- <i>document</i> TEXT) RETURNS TSVECTOR</tt>
-</dt><dd>
- Parses a document into tokens,
- reduces the tokens to lexemes,
- and returns a <tt>tsvector</tt> which lists the lexemes
- together with their positions in the document.
- For the best description of this process,
- see the section on <a href="http://www.sai.msu.su/%7Emegera/postgres/gist/tsearch/V2/docs/tsearch2-guide.html#ps">Parsing and Stemming</a>
- in the accompanying tsearch2 Guide.
-</dd><dt>
- <tt>strip(<i>vector</i> TSVECTOR) RETURNS TSVECTOR</tt>
-</dt><dd>
- Return a vector which lists the same lexemes
- as the given <tt><i>vector</i></tt>,
- but which lacks any information
- about where in the document each lexeme appeared.
- While the returned vector is thus useless for relevance ranking,
- it will usually be much smaller.
-</dd><dt>
- <tt>setweight(<i>vector</i> TSVECTOR, <i>letter</i>) RETURNS TSVECTOR</tt>
-</dt><dd>
- This function returns a copy of the input vector
- in which every location has been labeled
- with either the <tt><i>letter</i></tt>
- <tt>'A'</tt>, <tt>'B'</tt>, or <tt>'C'</tt>,
- or the default label <tt>'D'</tt>
- (which is the default with which new vectors are created,
- and as such is usually not displayed).
- These labels are retained when vectors are concatenated,
- allowing words from different parts of a document
- to be weighted differently by ranking functions.
-</dd>
-<dt>
- <tt><i>vector1</i> || <i>vector2</i></tt><BR>
- <tt>concat(<i>vector1</i> TSVECTOR, <i>vector2</i> TSVECTOR)
- RETURNS TSVECTOR</tt>
-</dt><dd>
- Returns a vector which combines the lexemes and position information
- in the two vectors given as arguments.
- Position weight labels (described in the previous paragraph)
- are retained intact during the concatenation.
- This has at least two uses.
- First,
- if some sections of your document
- need be parsed with different configurations than others,
- you can parse them separately
- and concatenate the resulting vectors into one.
- Second,
- you can weight words from some sections of you document
- more heavily than those from others by:
- parsing the sections into separate vectors;
- assigning the vectors different position labels
- with the <tt>setweight()</tt> function;
- concatenating them into a single vector;
- and then providing a <tt><i>weights</i></tt> argument
- to the <tt>rank()</tt> function
- that assigns different weights to positions with different labels.
-</dd><dt>
- <tt>length(<i>vector</i> TSVECTOR) RETURNS INT4</tt>
-</dt><dd>
- Returns the number of lexemes stored in the vector.
-</dd><dt>
- <tt><i>text</i>::TSVECTOR RETURNS TSVECTOR</tt>
-</dt><dd>
- Directly casting text to a <tt>tsvector</tt>
- allows you to directly inject lexemes into a vector,
- with whatever positions and position weights you choose to specify.
- The <tt><i>text</i></tt> should be formatted
- like the vector would be printed by the output of a <tt>SELECT</tt>.
- See the <a href="http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/docs/tsearch2-guide.html#casting">Casting</a>
- section in the Guide for details.
-</dd><dt>
- <tt>tsearch2(<i>vector_column_name</i>[, (<i>my_filter_name</i> | <i>text_column_name1</i>) [...] ], <i>text_column_nameN</i>)</tt> 
- </dt><dd>
-<tt>tsearch2()</tt> trigger used to automatically update <i>vector_column_name</i>, <i>my_filter_name</i>
-is the function name to preprocess <i>text_column_name</i>.  There are can be many
-functions  and text columns specified in <tt>tsearch2()</tt> trigger. 
-The following rule used: 
-function applied to all subsequent text columns until next function occurs.
-Example, function <tt>dropatsymbol</tt> replaces all entries of <tt>@</tt>
-sign by space.
-<pre>
-CREATE FUNCTION dropatsymbol(text) RETURNS text 
-AS 'select replace($1, ''@'', '' '');'
-LANGUAGE SQL;
-
-CREATE TRIGGER tsvectorupdate BEFORE UPDATE OR INSERT 
-ON tblMessages FOR EACH ROW EXECUTE PROCEDURE 
-tsearch2(tsvector_column,dropatsymbol, strMessage);
-</pre>
-</dd>
-
-<dt>
-<tt>stat(<i>sqlquery</i> text [, <i>weight</i> text]) RETURNS SETOF statinfo</tt>
-</dt><dd>
-Here <tt>statinfo</tt> is a type, defined as 
-<tt>
-CREATE TYPE statinfo as (<i>word</i> text, <i>ndoc</i> int4, <i>nentry</i> int4)
-</tt> and <i>sqlquery</i> is a query, which returns column <tt>tsvector</tt>.
-<P>
-This returns statistics (the number of documents <i>ndoc</i> and total number <i>nentry</i> of <i>word</i> 
-in the collection) about column <i>vector</i> <tt>tsvector</tt>. 
-Useful to check how good is your configuration and
-to  find stop-words candidates.For example, find top 10 most frequent words:
-<pre>
-=# select * from stat('select vector from apod') order by ndoc desc, nentry desc,word limit 10;
-</pre>
-Optionally, one can specify <i>weight</i> to obtain statistics about words with specific weight.
-<pre>
-=# select * from stat('select vector from apod','a') order by ndoc desc, nentry desc,word limit 10;
-</pre>
-
-</dd>
-<dt>
-<tt>TSVECTOR &lt; TSVECTOR</tt><BR>
-<tt>TSVECTOR &lt;= TSVECTOR</tt><BR>
-<tt>TSVECTOR = TSVECTOR</tt><BR>
-<tt>TSVECTOR >= TSVECTOR</tt><BR>
-<tt>TSVECTOR > TSVECTOR</tt>
-</dt><dd>
-All btree operations defined for <tt>tsvector</tt> type. <tt>tsvectors</tt> compares 
-with each other using lexicographical order.
-</dd>
-</dl>
-
-<h3><a name="qo">Query Operations</a></h3>
-
-<dl>
-<dt>
- <tt>to_tsquery( <em>[</em><i>configuration</i>,<em>]</em>
- <i>querytext</i> text) RETURNS TSQUERY[A</tt>
-</dt>
-<dd>
- Parses a query,
- which should be single words separated by the boolean operators
- "<tt>&amp;</tt>"&nbsp;and,
- "<tt>|</tt>"&nbsp;or,
- and&nbsp;"<tt>!</tt>"&nbsp;not,
- which can be grouped using parenthesis.
- Each word is reduced to a lexeme using the current
- or specified configuration. 
- Weight class can be assigned to each lexeme entry
- to restrict search region
- (see <tt>setweight</tt> for explanation), for example 
- "<tt>fat:a &amp; rats</tt>".
-</dd><dt>
-<dt>
- <tt>plainto_tsquery( <em>[</em><i>configuration</i>,<em>]</em>
- <i>querytext</i> text) RETURNS TSQUERY</tt>
-</dt>
-<dd>
-Transforms unformatted text to tsquery. It is the same as to_tsquery, 
-but assumes "<tt>&amp;</tt>" boolean operator between words and doesn't 
-recognizes weight classes.
-</dd><dt>
-
- <tt>querytree(<i>query</i> TSQUERY) RETURNS text</tt>
-</dt><dd>
-This returns a query which actually used in searching in GiST index.
-</dd><dt>
- <tt><i>text</i>::TSQUERY RETURNS TSQUERY</tt>
-</dt><dd>
- Directly casting text to a <tt>tsquery</tt>
- allows you to directly inject lexemes into a query,
- with whatever positions and position weight flags you choose to specify.
- The <tt><i>text</i></tt> should be formatted
- like the query would be printed by the output of a <tt>SELECT</tt>.
- See the <a href="http://www.sai.msu.su/%7Emegera/postgres/gist/tsearch/V2/docs/tsearch2-guide.html#casting">Casting</a>
- section in the Guide for details.
-</dd>
-<dt>
- <tt>numnode(<i>query</i> TSQUERY) RETURNS INTEGER</tt>
-</dt><dd>
-This returns the number of nodes in query tree
-</dd><dt>
- <tt>TSQUERY && TSQUERY RETURNS TSQUERY</tt>
-</dt><dd>
-AND-ed TSQUERY
-</dd><dt>
- <tt>TSQUERY || TSQUERY RETURNS TSQUERY</tt>
-</dt> <dd>
- OR-ed TSQUERY
-</dd><dt>
- <tt>!! TSQUERY RETURNS TSQUERY</tt>
-</dt> <dd>
- negation of TSQUERY
-</dd>
-<dt>
-<tt>TSQUERY &lt; TSQUERY</tt><BR>
-<tt>TSQUERY &lt;= TSQUERY</tt><BR>
-<tt>TSQUERY = TSQUERY</tt><BR>
-<tt>TSQUERY >= TSQUERY</tt><BR>
-<tt>TSQUERY > TSQUERY</tt>
-</dt><dd>
-All btree operations defined for <tt>tsquery</tt> type. <tt>tsqueries</tt> compares 
-with each other using lexicographical order.
-</dd>
-</dl>
-
-<h3>Query rewriting</h3>
-Query rewriting is a set of functions and operators for tsquery type. 
-It allows to control search at query time without reindexing (opposite to thesaurus), for example,
-expand search using  synonyms (new york,  big apple, nyc, gotham).
-<P>
-<tt><b>rewrite()</b></tt> function changes original <i>query</i> by replacing <i>target</i> by <i>sample</i>.
-There are three possibilities to use <tt>rewrite()</tt> function. Notice, that arguments of <tt>rewrite()</tt> 
-function can be column names of type <tt>tsquery</tt>.
-<pre>
-create table rw (q TSQUERY, t TSQUERY, s TSQUERY);
-insert into rw values('a & b','a', 'c');
-</pre>
-<dl>
-<dt> <tt>rewrite (<i>query</i> TSQUERY, <i>target</i> TSQUERY, <i>sample</i> TSQUERY) RETURNS TSQUERY</tt>
-</dt>
-<dd>
-<pre>
-=# select rewrite('a & b'::TSQUERY, 'a'::TSQUERY, 'c'::TSQUERY);
-  rewrite
-  -----------
-   'c' & 'b'
-</pre>
-</dd>
-<dt> <tt>rewrite (ARRAY[<i>query</i> TSQUERY, <i>target</i> TSQUERY, <i>sample</i> TSQUERY])  RETURNS TSQUERY</tt>
-</dt>
-<dd>
-<pre>
-=# select rewrite(ARRAY['a & b'::TSQUERY, t,s]) from rw;
-  rewrite
-  -----------
-   'c' & 'b'
-</pre>
-</dd>
-<dt> <tt>rewrite (<i>query</i> TSQUERY,'select <i>target</i> ,<i>sample</i> from test'::text)  RETURNS TSQUERY</tt>
-</dt>
-<dd>
-<pre>
-=# select rewrite('a & b'::TSQUERY, 'select t,s from rw'::text);
-  rewrite
-  -----------
-   'c' & 'b'
-</pre>
-</dd>
-</dl>
-Two operators defined for <tt>tsquery</tt> type:
-<dl>
-<dt><tt>TSQUERY @ TSQUERY</tt></dt>
-<dd>
-  Returns <tt>TRUE</tt> if right agrument might contained in left argument.
- </dd>
- <dt><tt>TSQUERY ~ TSQUERY</tt></dt>
- <dd> 
-  Returns <tt>TRUE</tt> if left agrument might contained in right argument.
- </dd>
-</dl>                    
-To speed up these operators one can use GiST index with <tt>gist_tp_tsquery_ops</tt> opclass.
-<pre>
-create index qq on test_tsquery using gist (keyword gist_tp_tsquery_ops);
-</pre>
-
-<h2><a name="fts">Full Text Search operator</a></h2>
-
-<dl><dt>
-<tt>TSQUERY @@ TSVECTOR</tt><br>
-<tt>TSVECTOR @@ TSQUERY</tt>
-</dt>
-<dd>
-Returns <tt>TRUE</tt> if <tt>TSQUERY</tt> contained in <tt>TSVECTOR</tt> and 
-<tt>FALSE</tt> otherwise.
-<pre>
-=# select 'cat & rat':: tsquery @@ 'a fat cat sat on a mat and ate a fat rat'::tsvector;
- ?column?
- ----------
-  t
-=# select 'fat & cow':: tsquery @@ 'a fat cat sat on a mat and ate a fat rat'::tsvector;
- ?column?
- ----------
-  f
-</pre>
-</dd>
-</dl>
-
-<h2><a name="configurations">Configurations</a></h2>
-
-A configuration specifies all of the equipment necessary
-to transform a document into a <tt>tsvector</tt>:
-the parser that breaks its text into tokens,
-and the dictionaries which then transform each token into a lexeme.
-Every call to <tt>to_tsvector(), to_tsquery()</tt> (described above)
-uses a configuration to perform its processing.
-Three configurations come with tsearch2:
-
-<ul>
-<li><b>default</b> -- Indexes words and numbers,
- using the <i>en_stem</i> English Snowball stemmer for Latin-alphabet words
- and the <i>simple</i> dictionary for all others.
-</li><li><b>default_russian</b> -- Indexes words and numbers,
- using the <i>en_stem</i> English Snowball stemmer for Latin-alphabet words
- and the <i>ru_stem</i> Russian Snowball dictionary for all others. It's default
- for <tt>ru_RU.KOI8-R</tt> locale.
-</li><li><b>utf8_russian</b> -- the same as <b>default_russian</b> but 
-for <tt>ru_RU.UTF-8</tt> locale.
-</li><li><b>simple</b> -- Processes both words and numbers
- with the <i>simple</i> dictionary,
- which neither discards any stop words nor alters them.
-</li></ul>
-
-The tsearch2 modules initially chooses your current configuration
-by looking for your current locale in the <tt>locale</tt> field
-of the <tt>pg_ts_cfg</tt> table described below.
-You can manipulate the current configuration yourself with these functions:
-
-<dl><dt>
- <tt>set_curcfg( <i>id</i> INT <em>|</em> <i>ts_name</i> TEXT
-  ) RETURNS VOID</tt>
-</dt><dd>
- Set the current configuration used by <tt>to_tsvector</tt>
- and <tt>to_tsquery</tt>.
-</dd><dt>
- <tt>show_curcfg() RETURNS INT4</tt>
-</dt><dd>
- Returns the integer <tt>id</tt> of the current configuration.
-</dd></dl>
-
-<p>
-Each configuration is defined by a record in the <tt>pg_ts_cfg</tt> table:
-
-</p><pre>create table pg_ts_cfg (
-	id		int not  null primary key,
-	ts_name		text not null,
-	prs_name	text not null,
-	locale		text
-);</pre>
-
-The <tt>id</tt> and <tt>ts_name</tt> are unique values
-which identify the configuration;
-the <tt>prs_name</tt> specifies which parser the configuration uses.
-Once this parser has split document text into tokens,
-the type of each resulting token --
-or, more specifically, the type's <tt>tok_alias</tt>
-as specified in the parser's <tt>lexem_type()</tt> table --
-is searched for together with the configuration's <tt>ts_name</tt>
-in the <tt>pg_ts_cfgmap</tt> table:
-
-<pre>create table pg_ts_cfgmap (
-	ts_name		text not null,
-	tok_alias	text not null,
-	dict_name	text[],
-	primary key (ts_name,tok_alias)
-);</pre>
-
-Those tokens whose types are not listed are discarded.
-The remaining tokens are assigned integer positions,
-starting with 1 for the first token in the document,
-and turned into lexemes with the help of the dictionaries
-whose names are given in the <tt>dict_name</tt> array for their type.
-These dictionaries are tried in order,
-stopping either with the first one to return a lexeme for the token,
-or discarding the token if no dictionary returns a lexeme for it.
-
-<h2><a name="testing">Testing</a></h2>
-
-Function <tt>ts_debug</tt> allows easy testing of your <b>current</b> configuration. 
-You may always test another configuration using <tt>set_curcfg</tt> function.
-<p>
-Example:
-</p><pre>apod=# select * from ts_debug('Tsearch module for PostgreSQL 7.3.3');
- ts_name | tok_type | description |   token    | dict_name |  tsvector    
----------+----------+-------------+------------+-----------+--------------
- default | lword    | Latin word  | Tsearch    | {en_stem} | 'tsearch'
- default | lword    | Latin word  | module     | {en_stem} | 'modul'
- default | lword    | Latin word  | for        | {en_stem} | 
- default | lword    | Latin word  | PostgreSQL | {en_stem} | 'postgresql'
- default | version  | VERSION     | 7.3.3      | {simple}  | '7.3.3'
-</pre>
-Here: 
-<br>
-<ul>
-<li>tsname - configuration name 
-</li><li>tok_type - token type 
-</li><li>description - human readable name of tok_type 
-</li><li>token - parser's token 
-</li><li>dict_name - dictionary used for the token 
-</li><li>tsvector - final result</li>
-</ul>
-
-
-<h2><a name="parsers">Parsers</a></h2>
-
-Each parser is defined by a record in the <tt>pg_ts_parser</tt> table:
-
-<pre>create table pg_ts_parser (
-	prs_name	text not null,
-	prs_start	regprocedure not null,
-	prs_nexttoken	regprocedure not null,
-	prs_end		regprocedure not null,
-	prs_headline	regprocedure not null,
-	prs_lextype	regprocedure not null,
-	prs_comment	text
-);</pre>
-
-The <tt>prs_name</tt> uniquely identify the parser,
-while <tt>prs_comment</tt> usually describes its name and version
-for the reference of users.
-The other items identify the low-level functions
-which make the parser operate,
-and are only of interest to someone writing a parser of their own.
-<p>
-The tsearch2 module comes with one parser named <tt>default</tt>
-which is suitable for parsing most plain text and HTML documents.
-</p><p>
-Each <tt><i>parser</i></tt> argument below
-must designate a parser with <tt><i>prs_name</i></tt>;
-the current parser is used when this argument is omitted.
-
-</p><dl><dt>
- <tt>CREATE FUNCTION set_curprs(<i>parser</i>) RETURNS VOID</tt>
-</dt><dd>
- Selects a current parser
- which will be used when any of the following functions
- are called without a parser as an argument.
-</dd><dt>
- <tt>CREATE FUNCTION token_type(
-  <em>[</em> <i>parser</i> <em>]</em>
-  ) RETURNS SETOF tokentype</tt>
-</dt><dd>
- Returns a table which defines and describes
- each kind of token the parser may produce as output.
- For each token type the table gives the <tt>tokid</tt>
- which the parser will label each token of that type,
- the <tt>alias</tt> which names the token type,
- and a short description <tt>descr</tt> for the user to read.
-</dd><dt>
- <tt>CREATE FUNCTION parse(
-  <em>[</em> <i>parser</i>, <em>]</em> <i>document</i> TEXT
-  ) RETURNS SETOF tokenout</tt>
-</dt><dd>
- Parses the given document and returns a series of records,
- one for each token produced by parsing.
- Each token includes a <tt>tokid</tt> giving its type
- and a <tt>lexem</tt> which gives its content.
-</dd></dl>
-
-<h2><a name="dictionaries">Dictionaries</a></h2>
-
-Dictionary is a program, which accepts lexeme(s), usually those produced by a parser, 
-on input and returns:
-<ul>
-<li>array of lexeme(s) if input lexeme is known to the dictionary
-<li>void array - dictionary knows lexeme, but it's stop word.
-<li> NULL - dictionary doesn't recognized input lexeme
-</ul>
-Usually, dictionaries used for normalization of words ( ispell, stemmer dictionaries),
-but see, for example, <tt>intdict</tt> dictionary (available from 
-<a href="http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/">Tsearch2</a> home page, 
-which controls indexing of integers.
-
-<P>
-Among the dictionaries which come installed with tsearch2 are:
-
-<ul>
-<li><b>simple</b> simply folds uppercase letters to lowercase
- before returning the word.
-</li>
-<li><b>ispell_template</b> - template for ispell dictionaries.
-</li>
-<li><b>en_stem</b> runs an English Snowball stemmer on each word
- that attempts to reduce the various forms of a verb or noun
- to a single recognizable form.
-</li><li><b>ru_stem_koi8</b>, <b>ru_stem_utf8</b> runs a Russian Snowball stemmer on each word.
-</li>
-<li><b>synonym</b> - simple lexeme-to-lexeme replacement
-</li>
-<li><b>thesaurus_template</b> - template for <a href="#tz">thesaurus dictionary</a>. It's 
-phrase-to-phrase replacement
-</li>
-</ul>
-
-<P>
-Each dictionary is defined by an entry in the <tt>pg_ts_dict</tt> table:
-
-<pre>CREATE TABLE pg_ts_dict (
-	dict_name	text not null,
-	dict_init	regprocedure,
-	dict_initoption	text,
-	dict_lexize	regprocedure not null,
-	dict_comment	text
-);</pre>
-
-The <tt>dict_name</tt>
-serve as unique identifiers for the dictionary.
-The meaning of the <tt>dict_initoption</tt> varies among dictionaries,
-but for the built-in Snowball dictionaries
-it specifies a file from which stop words should be read.
-The <tt>dict_comment</tt> is a human-readable description of the dictionary.
-The other fields are internal function identifiers
-useful only to developers trying to implement their own dictionaries.
-
-<blockquote>
-<b>WARNING:</b> Data files, used by dictionaries, should be in <tt>server_encoding</tt> to 
-avoid possible problems&nbsp;!
-</blockquote>
-
-<p>
-The argument named <tt><i>dictionary</i></tt>
-in each of the following functions
-should be <tt>dict_name</tt>
-identifying which dictionary should be used for the operation;
-if omitted then the current dictionary is used.
-
-</p><dl><dt>
- <tt>CREATE FUNCTION set_curdict(<i>dictionary</i>) RETURNS VOID</tt>
-</dt><dd>
- Selects a current dictionary for use by functions
- that do not select a dictionary explicitly.
-</dd><dt>
- <tt>CREATE FUNCTION lexize(
- <em>[</em> <i>dictionary</i>, <em>]</em> <i>word</i> text)
- RETURNS TEXT[]</tt>
-</dt><dd>
- Reduces a single word to a lexeme.
- Note that lexemes are arrays of zero or more strings,
- since in some languages there might be several base words
- from which an inflected form could arise.
-</dd></dl>
-
-<h3>Using dictionaries template</h3>
-Templates used to define new dictionaries, for example,
-<pre>
-INSERT INTO pg_ts_dict
-               (SELECT 'en_ispell', dict_init,
-                       'DictFile="/usr/local/share/dicts/ispell/english.dict",'
-                       'AffFile="/usr/local/share/dicts/ispell/english.aff",'
-                       'StopFile="/usr/local/share/dicts/english.stop"',
-                       dict_lexize
-               FROM pg_ts_dict
-               WHERE dict_name = 'ispell_template');
-</pre>
-
-<h3>Working with stop words</h3>
-Ispell and snowball stemmers treat stop words differently:
-<ul>
-<li>ispell - normalize word and then lookups normalized form in stop-word file
-<li>snowball stemmer - first, it lookups word in stop-word file and then does it job. 
-The reason - to minimize possible 'noise'.
-</ul>
-
-<h2><a name="ranking">Ranking</a></h2>
-
-Ranking attempts to measure how relevant documents are to particular queries
-by inspecting the number of times each search word appears in the document,
-and whether different search terms occur near each other.
-Note that this information is only available in unstripped vectors --
-ranking functions will only return a useful result
-for a <tt>tsvector</tt> which still has position information!
-<p>
-Notice, that ranking functions supplied are just an examples and 
-doesn't belong to the tsearch2 core, you can
-write your very own ranking function and/or combine additional
-factors to fit your specific interest.
-</p>
-
-The two ranking functions currently available are:
-
-<dl><dt>
- <tt>CREATE FUNCTION rank(<br>
-  <em>[</em> <i>weights</i> float4[], <em>]</em>
-  <i>vector</i> TSVECTOR, <i>query</i> TSQUERY,
-  <em>[</em> <i>normalization</i> int4 <em>]</em><br>
-  ) RETURNS float4</tt>
-</dt><dd>
- This is the ranking function from the old version of OpenFTS,
- and offers the ability to weight word instances more heavily
- depending on how you have classified them.
- The <i>weights</i> specify how heavily to weight each category of word:
- <pre>{<i>D-weight</i>, <i>C-weight</i>, <i>B-weight</i>, <i>A-weight</i>}</pre>
- If no weights are provided, then these defaults are used:
- <pre>{0.1, 0.2, 0.4, 1.0}</pre>
- Often weights are used to mark words from special areas of the document,
- like the title or an initial abstract,
- and make them more or less important than words in the document body.
-</dd><dt>
- <tt>CREATE FUNCTION rank_cd(<br>
-  <em>[</em> <i>weights</i> float4[], <em>]</em>
-  <i>vector</i> TSVECTOR, <i>query</i> TSQUERY,
-  <em>[</em> <i>normalization</i> int4 <em>]</em><br>
-  ) RETURNS float4</tt>
-</dt><dd>
- This function computes the cover density ranking
- for the given document <i>vector</i> and <i>query</i>,
- as described in Clarke, Cormack, and Tudhope's
- "<a href="http://citeseer.nj.nec.com/clarke00relevance.html">Relevance Ranking for One to Three Term Queries</a>"
- in the 1999 <i>Information Processing and Management</i>.
-</dd>
-<dt>
- <tt>CREATE FUNCTION get_covers(vector TSVECTOR, query TSQUERY) RETURNS text</tt>
- </dt>
- <dd>
- Returns <tt>extents</tt>, which are a shortest and non-nested sequences of words, which satisfy a query. 
- Extents (covers) used in <tt>rank_cd</tt> algorithm for fast calculation of proximity ranking.
- In example below there are two extents - <tt><b>{1</b>...<b>}1</b> and <b>{2</b> ...<b>}2</b></tt>.
- <pre>
-=# select get_covers('1:1,2,10 2:4'::tsvector,'1&amp; 2');
-get_covers
-----------------------
-1 {1 1 {2 2 }1 1 }2
-</pre>
- </dd>
-
-</dl>
-
-<p>
-Both of these (<tt>rank(), rank_cd()</tt>) ranking functions
-take an integer <i>normalization</i> option
-that specifies whether a document's length should impact its rank.
-This is often desirable,
-since a hundred-word document with five instances of a search word
-is probably more relevant than a thousand-word document with five instances.
-The option can have the values, which could be combined using "|" ( 2|4) to
-take into account several factors:
-
-</p>
-<ul>
-<li><tt>0</tt> (the default) ignores document length.</li>
-<li><tt>1</tt> divides the rank by the 1 + logarithm of the length </li>
-<li><tt>2</tt> divides the rank by the length itself.</li>
-<li><tt>4</tt> divides the rank by the mean harmonic distance between extents</li>
-<li><tt>8</tt> divides the rank by the  number of unique words in document</li>
-<li><tt>16</tt> divides the rank by 1 + logarithm of the  number of unique words in document
-</li>
-</ul>
-
-<h2><a name="headlines">Headlines</a></h2>
-
-<dl><dt>
- <tt>CREATE FUNCTION headline(<br>
-  <em>[</em> <i>id</i> int4, <em>|</em> <i>ts_name</i> text, <em>]</em>
-  <i>document</i> text, <i>query</i> TSQUERY,
-  <em>[</em> <i>options</i> text <em>]</em><br>
-  ) RETURNS text</tt>
-</dt><dd>
- Every form of the the <tt>headline()</tt> function
- accepts a <tt>document</tt> along with a <tt>query</tt>,
- and returns one or more ellipse-separated excerpts from the document
- in which terms from the query are highlighted.
- The configuration with which to parse the document
- can be specified by either its <i>id</i> or <i>ts_name</i>;
- if none is specified that the current configuration is used instead.
- <p>
- An <i>options</i> string if provided should be a comma-separated list
- of one or more '<i>option</i><tt>=</tt><i>value</i>' pairs.
- The available options are:
- </p><ul>
-  <li><tt>StartSel</tt>, <tt>StopSel</tt> --
-   the strings with which query words appearing in the document
-   should be delimited to distinguish them from other excerpted words.
-  </li><li><tt>MaxWords</tt>, <tt>MinWords</tt> --
-   limits on the shortest and longest headlines you will accept.
-  </li><li><tt>ShortWord</tt> --
-   this prevents your headline from beginning or ending
-   with a word which has this many characters or less.
-   The default value of <tt>3</tt> should eliminate most English
-   conjunctions and articles.
-  </li><li><tt>HighlightAll</tt> -- 
-   boolean flag, if TRUE, than the whole document will be highlighted.
- </li></ul>
- Any unspecified options receive these defaults:
- <pre>StartSel=&lt;b&gt;, StopSel=&lt;/b&gt;, MaxWords=35, MinWords=15, ShortWord=3, HighlightAll=FALSE
- </pre>
-</dd></dl>
-
-
-<h2><a name="indexes">Indexes</a></h2>
-Tsearch2 supports indexed access to tsvector in order to further speedup FTS. Notice, indexes are not mandatory for FTS ! 
-<ul>
-<li> RD-Tree (Russian Doll Tree, matryoshka), based on GiST (Generalized Search Tree) 
-<pre>    
-    =# create index fts_idx on apod using gist(fts);
-</pre>    
-<li>GIN - Generalized Inverted Index 
-<pre>       
-        =# create index fts_idx on apod using gin(fts);
-</pre>
-</ul>  
-<b>GiST</b> index is very good for online update, but is not as scalable as <b>GIN</b> index,
-which, in turn, isn't good for updates. Both indexes support concurrency and recovery.
-
-<h2><a name="tz">Thesaurus dictionary</a></h2>
-
-<P>
-Thesaurus - is a collection of words with included information about the relationships of words and phrases, 
-i.e., broader terms (BT), narrower terms (NT), preferred terms, non-preferred, related terms,etc.</p>
-<p>Basically,thesaurus dictionary replaces all non-preferred terms by one preferred term and, optionally, 
-preserves them for indexing. Thesaurus used when indexing, so any changes in thesaurus require reindexing.
-Tsearch2's <tt>thesaurus</tt> dictionary (TZ) is an extension of <tt>synonym</tt> dictionary 
-with <b>phrase</b> support. Thesaurus is a plain file of the following format: 
-<pre>
-# this is a comment 
-sample word(s) : indexed word(s)
-...............................
-</pre>
-<ul>
-<li><strong>Colon</strong> (:) symbol used as a delimiter.</li>
-<li>Use asterisk (<b>*</b>) at the beginning of <tt>indexed word</tt> to skip subdictionary.
-It's still required, that <tt>sample words</tt> should be known.</li>
-<li>thesaurus dictionary looks for the most longest match</li></ul>
-<P>
-TZ uses <strong>subdictionary</strong> (should be defined in tsearch2 configuration) 
-to normalize thesaurus text. It's possible to define only <strong>one dictionary</strong>. 
-Notice, that subdictionary produces an error, if it couldn't recognize word. 
-In that case, you should remove definition line with this word or teach  subdictionary to know it. 
-</p>
-<p>Stop-words recognized by subdictionary replaced by  'stop-word placeholder', i.e., 
-important only their position.
-To break possible ties thesaurus applies the last definition. For example, consider 
-thesaurus (with simple subdictionary) rules with pattern 'swsw' 
-('s' designates stop-word and 'w' - known word): </p>
-<pre>
-a one the two : swsw
-the one a two : swsw2
-</pre>
-<p>Words 'a' and 'the' are stop-words defined in the configuration of a subdictionary. 
-Thesaurus considers texts 'the one the two' and 'that one then two' as equal and  will use definition 
-'swsw2'.</p>
-<p>As a normal dictionary, it should be assigned to the specific lexeme types. 
-Since TZ has a capability to recognize phrases it must remember its  state and interact with parser. 
-TZ use these assignments to check if it should handle next word or stop accumulation. 
-Compiler of TZ should take care about proper configuration to avoid confusion. 
-For example, if TZ is assigned to handle only <tt>lword</tt> lexeme, then TZ definition like 
-' one 1:11' will not works, since lexeme type <tt>digit</tt> doesn't assigned to the TZ.</p>
-
-<h3>Configuration</h3>
-
-<dl><dt>tsearch2</dt><dd></dd></dl><p>tsearch2 comes with thesaurus template, which could be used to define new dictionary: </p>
-<pre class="real">INSERT INTO pg_ts_dict
-               (SELECT 'tz_simple', dict_init,
-                        'DictFile="/path/to/tz_simple.txt",'
-                        'Dictionary="en_stem"',
-                       dict_lexize
-                FROM pg_ts_dict
-                WHERE dict_name = 'thesaurus_template');
-
-</pre>
-<p>Here: </p>
-<ul>
-<li><tt>tz_simple</tt> - is the dictionary name</li>
-<li><tt>DictFile="/path/to/tz_simple.txt"</tt> - is the location of thesaurus file</li>
-<li><tt>Dictionary="en_stem"</tt> defines dictionary (snowball english stemmer) to use for thesaurus normalization. Notice, that <em>en_stem</em> dictionary has it's own configuration (stop-words, for example).</li>
-</ul>
-<p>Now, it's possible to use <tt>tz_simple</tt> in pg_ts_cfgmap, for  example: </p>
-<pre>
-update pg_ts_cfgmap set dict_name='{tz_simple,en_stem}' where ts_name = 'default_russian' and 
-tok_alias in ('lhword', 'lword', 'lpart_hword');
-</pre>
-<h3>Examples</h3>
-<p>tz_simple: </p>
-<pre>
-one : 1
-two : 2
-one two : 12
-the one : 1
-one 1 : 11
-</pre>
-<p>To see, how thesaurus works, one could use <tt>to_tsvector</tt>, <tt>to_tsquery</tt> or <tt>plainto_tsquery</tt> functions: </p><pre class="real">=# select plainto_tsquery('default_russian',' one day is oneday');
-    plainto_tsquery
-------------------------
- '1' &amp; 'day' &amp; 'oneday'
-
-=# select plainto_tsquery('default_russian','one two day is oneday');
-     plainto_tsquery
--------------------------
- '12' &amp; 'day' &amp; 'oneday'
-
-=# select plainto_tsquery('default_russian','the one');
-NOTICE:  Thesaurus: word 'the' is recognized as stop-word, assign any stop-word (rule 3)
- plainto_tsquery
------------------
- '1'
-</pre>
-
-Additional information about thesaurus dictionary is available from
-<a href="http://www.sai.msu.su/~megera/wiki/Thesaurus_dictionary">Wiki</a> page.
-</body></html>
diff --git a/contrib/tsearch2/expected/tsearch2.out b/contrib/tsearch2/expected/tsearch2.out
index f069fec5121d..4ad999decb79 100755
--- a/contrib/tsearch2/expected/tsearch2.out
+++ b/contrib/tsearch2/expected/tsearch2.out
@@ -388,9 +388,9 @@ select numnode( 'new & york | qwery'::tsquery );
 create table test_tsquery (txtkeyword text, txtsample text);
 \set ECHO none
 alter table test_tsquery add column keyword tsquery;
-update test_tsquery set keyword = to_tsquery('default', txtkeyword);
+update test_tsquery set keyword = to_tsquery('english', txtkeyword);
 alter table test_tsquery add column sample tsquery;
-update test_tsquery set sample = to_tsquery('default', txtsample::text);
+update test_tsquery set sample = to_tsquery('english', txtsample::text);
 create unique index bt_tsq on test_tsquery (keyword);
 select count(*) from test_tsquery where keyword <  'new & york';
  count 
@@ -457,7 +457,7 @@ set enable_seqscan=on;
 select rewrite('foo & bar & qq & new & york',  'new & york'::tsquery, 'big & apple | nyc | new & york & city');
                                      rewrite                                      
 ----------------------------------------------------------------------------------
- 'qq' & 'foo' & 'bar' & ( 'city' & 'york' & 'new' | ( 'nyc' | 'apple' & 'big' ) )
+ 'foo' & 'bar' & 'qq' & ( 'city' & 'new' & 'york' | ( 'nyc' | 'big' & 'apple' ) )
 (1 row)
 
 select rewrite('moscow', 'select keyword, sample from test_tsquery'::text );
@@ -469,13 +469,13 @@ select rewrite('moscow', 'select keyword, sample from test_tsquery'::text );
 select rewrite('moscow & hotel', 'select keyword, sample from test_tsquery'::text );
               rewrite              
 -----------------------------------
- ( 'moskva' | 'moscow' ) & 'hotel'
+ 'hotel' & ( 'moskva' | 'moscow' )
 (1 row)
 
 select rewrite('bar &  new & qq & foo & york', 'select keyword, sample from test_tsquery'::text );
                                        rewrite                                       
 -------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'qq' | 'bar' ) & ( 'nyc' | ( 'appl' & 'big' | 'york' & 'new' ) )
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
 (1 row)
 
 select rewrite( ARRAY['moscow', keyword, sample] ) from test_tsquery;
@@ -493,7 +493,7 @@ select rewrite( ARRAY['moscow & hotel', keyword, sample] ) from test_tsquery;
 select rewrite( ARRAY['bar &  new & qq & foo & york', keyword, sample] ) from test_tsquery;
                                        rewrite                                       
 -------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'qq' | 'bar' ) & ( 'nyc' | ( 'appl' & 'big' | 'york' & 'new' ) )
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
 (1 row)
 
 select keyword from test_tsquery where keyword @> 'new';
@@ -519,40 +519,40 @@ select keyword from test_tsquery where keyword <@ 'moscow';
  'moscow'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where keyword <@ query;
        rewrite       
 ---------------------
  'moskva' | 'moscow'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where keyword <@ query;
               rewrite              
 -----------------------------------
  ( 'moskva' | 'moscow' ) & 'hotel'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where keyword <@ query;
                                        rewrite                                       
 -------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'qq' | 'bar' ) & ( 'nyc' | ( 'appl' & 'big' | 'york' & 'new' ) )
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where query @> keyword;
        rewrite       
 ---------------------
  'moskva' | 'moscow'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where query @> keyword;
               rewrite              
 -----------------------------------
  ( 'moskva' | 'moscow' ) & 'hotel'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where query @> keyword;
                                        rewrite                                       
 -------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'qq' | 'bar' ) & ( 'nyc' | ( 'appl' & 'big' | 'york' & 'new' ) )
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
 (1 row)
 
 create index qq on test_tsquery using gist (keyword gist_tp_tsquery_ops);
@@ -580,40 +580,40 @@ select keyword from test_tsquery where keyword <@ 'moscow';
  'moscow'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where keyword <@ query;
        rewrite       
 ---------------------
  'moskva' | 'moscow'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where keyword <@ query;
               rewrite              
 -----------------------------------
  ( 'moskva' | 'moscow' ) & 'hotel'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where keyword <@ query;
                                        rewrite                                       
 -------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'qq' | 'bar' ) & ( 'nyc' | ( 'appl' & 'big' | 'york' & 'new' ) )
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where query @> keyword;
        rewrite       
 ---------------------
  'moskva' | 'moscow'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where query @> keyword;
               rewrite              
 -----------------------------------
  ( 'moskva' | 'moscow' ) & 'hotel'
 (1 row)
 
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where query @> keyword;
                                        rewrite                                       
 -------------------------------------------------------------------------------------
- 'citi' & 'foo' & ( 'qq' | 'bar' ) & ( 'nyc' | ( 'appl' & 'big' | 'york' & 'new' ) )
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
 (1 row)
 
 set enable_seqscan='on';
@@ -623,38 +623,38 @@ select lexize('simple', 'ASD56 hsdkf');
  {"asd56 hsdkf"}
 (1 row)
 
-select lexize('en_stem', 'SKIES Problems identity');
+select lexize('english_stem', 'SKIES Problems identity');
           lexize          
 --------------------------
  {"skies problems ident"}
 (1 row)
 
 select * from token_type('default');
- tokid |    alias     |               descr               
--------+--------------+-----------------------------------
-     1 | lword        | Latin word
-     2 | nlword       | Non-latin word
-     3 | word         | Word
-     4 | email        | Email
-     5 | url          | URL
-     6 | host         | Host
-     7 | sfloat       | Scientific notation
-     8 | version      | VERSION
-     9 | part_hword   | Part of hyphenated word
-    10 | nlpart_hword | Non-latin part of hyphenated word
-    11 | lpart_hword  | Latin part of hyphenated word
-    12 | blank        | Space symbols
-    13 | tag          | HTML Tag
-    14 | protocol     | Protocol head
-    15 | hword        | Hyphenated word
-    16 | lhword       | Latin hyphenated word
-    17 | nlhword      | Non-latin hyphenated word
-    18 | uri          | URI
-    19 | file         | File or path name
-    20 | float        | Decimal notation
-    21 | int          | Signed integer
-    22 | uint         | Unsigned integer
-    23 | entity       | HTML Entity
+ tokid |      alias      |                  descr                   
+-------+-----------------+------------------------------------------
+     1 | asciiword       | Word, all ASCII
+     2 | word            | Word, all letters
+     3 | numword         | Word, letters and digits
+     4 | email           | Email address
+     5 | url             | URL
+     6 | host            | Host
+     7 | sfloat          | Scientific notation
+     8 | version         | Version number
+     9 | hword_numpart   | Hyphenated word part, letters and digits
+    10 | hword_part      | Hyphenated word part, all letters
+    11 | hword_asciipart | Hyphenated word part, all ASCII
+    12 | blank           | Space symbols
+    13 | tag             | XML tag
+    14 | protocol        | Protocol head
+    15 | numhword        | Hyphenated word, letters and digits
+    16 | asciihword      | Hyphenated word, all ASCII
+    17 | hword           | Hyphenated word, all letters
+    18 | url_path        | URL path
+    19 | file            | File or path name
+    20 | float           | Decimal notation
+    21 | int             | Signed integer
+    22 | uint            | Unsigned integer
+    23 | entity          | XML entity
 (23 rows)
 
 select * from parse('default', '345 qwe@efd.r '' 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 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
@@ -774,15 +774,11 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc
     12 | . 
     20 | 4.2
     12 | , 
-    15 | readline-4.2
-    11 | readline
-    12 | -
-    20 | 4.2
+     1 | readline
+    20 | -4.2
     12 |  
-    15 | readline-4.2
-    11 | readline
-    12 | -
-    20 | 4.2
+     1 | readline
+    20 | -4.2
     12 | . 
     22 | 234
     12 |  
@@ -799,23 +795,23 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc
     12 |  
     12 | <> 
      1 | qwerty
-(135 rows)
+(131 rows)
 
-SELECT to_tsvector('default', '345 qwe@efd.r '' 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 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
+SELECT to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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                                                                                                                                                                                                                                                                                                                                                                                                                              
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 'ad':17 'dw':19 'jf':39 '234':63 '345':1 '4.2':54,55,56,59,62 '455':31 'jqw':66 'qwe':2,18,27,28,35 'wer':36 'wow':65 'asdf':37 'ewr1':43 'qwer':38 'sdjk':40 '5.005':32 'efd.r':3 'ewri2':44 'hjwer':42 'qwqwe':29 'wefjn':48 'gist.c':52 'gist.h':50 'qwerti':67 '234.435':30 'qwe-wer':34 'readlin':53,58,61 'www.com':4 '+4.0e-10':26 'gist.h.c':51 'rewt/ewr':47 '/?ad=qwe&dw':7,10,14,22 '/wqe-324/ewr':49 'aew.werc.ewr':6 'readline-4.2':57,60 '1aew.werc.ewr':9 '2aew.werc.ewr':11 '3aew.werc.ewr':13 '4aew.werc.ewr':15 '/usr/local/fff':45 '/awdf/dwqe/4325':46 'teodor@stack.net':33 '/?ad=qwe&dw=%20%32':25 '5aew.werc.ewr:8100':16 '6aew.werc.ewr:8100':21 '7aew.werc.ewr:8100':24 'aew.werc.ewr/?ad=qwe&dw':5 '1aew.werc.ewr/?ad=qwe&dw':8 '3aew.werc.ewr/?ad=qwe&dw':12 '6aew.werc.ewr:8100/?ad=qwe&dw':20 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':23
+                                                                                                                                                                                                                                                                                                                                                                                                                      to_tsvector                                                                                                                                                                                                                                                                                                                                                                                                                       
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ 'ad':17 'dw':19 'jf':39 '234':61 '345':1 '4.2':54,55,56 '455':31 'jqw':64 'qwe':2,18,27,28,35 'wer':36 'wow':63 '-4.2':58,60 'asdf':37 'ewr1':43 'qwer':38 'sdjk':40 '5.005':32 'efd.r':3 'ewri2':44 'hjwer':42 'qwqwe':29 'wefjn':48 'gist.c':52 'gist.h':50 'qwerti':65 '234.435':30 'qwe-wer':34 'readlin':53,57,59 'www.com':4 '+4.0e-10':26 'gist.h.c':51 'rewt/ewr':47 '/?ad=qwe&dw':7,10,14,22 '/wqe-324/ewr':49 'aew.werc.ewr':6 '1aew.werc.ewr':9 '2aew.werc.ewr':11 '3aew.werc.ewr':13 '4aew.werc.ewr':15 '/usr/local/fff':45 '/awdf/dwqe/4325':46 'teodor@stack.net':33 '/?ad=qwe&dw=%20%32':25 '5aew.werc.ewr:8100':16 '6aew.werc.ewr:8100':21 '7aew.werc.ewr:8100':24 'aew.werc.ewr/?ad=qwe&dw':5 '1aew.werc.ewr/?ad=qwe&dw':8 '3aew.werc.ewr/?ad=qwe&dw':12 '6aew.werc.ewr:8100/?ad=qwe&dw':20 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':23
 (1 row)
 
-SELECT length(to_tsvector('default', '345 qw'));
+SELECT length(to_tsvector('english', '345 qw'));
  length 
 --------
       2
 (1 row)
 
-SELECT length(to_tsvector('default', '345 qwe@efd.r '' 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 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
+SELECT length(to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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'));
  length 
@@ -823,7 +819,7 @@ SELECT length(to_tsvector('default', '345 qwe@efd.r '' http://www.com/ http://ae
      51
 (1 row)
 
-select to_tsquery('default', 'qwe & sKies '); 
+select to_tsquery('english', 'qwe & sKies '); 
   to_tsquery   
 ---------------
  'qwe' & 'sky'
@@ -835,61 +831,61 @@ select to_tsquery('simple', 'qwe & sKies ');
  'qwe' & 'skies'
 (1 row)
 
-select to_tsquery('default', '''the wether'':dc & ''           sKies '':BC ');
+select to_tsquery('english', '''the wether'':dc & ''           sKies '':BC ');
        to_tsquery       
 ------------------------
  'wether':CD & 'sky':BC
 (1 row)
 
-select to_tsquery('default', 'asd&(and|fghj)');
+select to_tsquery('english', 'asd&(and|fghj)');
    to_tsquery   
 ----------------
  'asd' & 'fghj'
 (1 row)
 
-select to_tsquery('default', '(asd&and)|fghj');
+select to_tsquery('english', '(asd&and)|fghj');
    to_tsquery   
 ----------------
  'asd' | 'fghj'
 (1 row)
 
-select to_tsquery('default', '(asd&!and)|fghj');
+select to_tsquery('english', '(asd&!and)|fghj');
    to_tsquery   
 ----------------
  'asd' | 'fghj'
 (1 row)
 
-select to_tsquery('default', '(the|and&(i&1))&fghj');
+select to_tsquery('english', '(the|and&(i&1))&fghj');
   to_tsquery  
 --------------
  '1' & 'fghj'
 (1 row)
 
-select plainto_tsquery('default', 'the and z 1))& fghj');
+select plainto_tsquery('english', 'the and z 1))& fghj');
   plainto_tsquery   
 --------------------
  'z' & '1' & 'fghj'
 (1 row)
 
-select plainto_tsquery('default', 'foo bar') && plainto_tsquery('default', 'asd');
+select plainto_tsquery('english', 'foo bar') && plainto_tsquery('english', 'asd');
        ?column?        
 -----------------------
  'foo' & 'bar' & 'asd'
 (1 row)
 
-select plainto_tsquery('default', 'foo bar') || plainto_tsquery('default', 'asd fg');
+select plainto_tsquery('english', 'foo bar') || plainto_tsquery('english', 'asd fg');
            ?column?           
 ------------------------------
  'foo' & 'bar' | 'asd' & 'fg'
 (1 row)
 
-select plainto_tsquery('default', 'foo bar') || !!plainto_tsquery('default', 'asd fg');
+select plainto_tsquery('english', 'foo bar') || !!plainto_tsquery('english', 'asd fg');
              ?column?              
 -----------------------------------
  'foo' & 'bar' | !( 'asd' & 'fg' )
 (1 row)
 
-select plainto_tsquery('default', 'foo bar') && 'asd | fg';
+select plainto_tsquery('english', 'foo bar') && 'asd | fg';
              ?column?             
 ----------------------------------
  'foo' & 'bar' & ( 'asd' | 'fg' )
@@ -1001,7 +997,7 @@ SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
     39
 (1 row)
 
-select set_curcfg('default');
+select set_curcfg('english');
  set_curcfg 
 ------------
  
@@ -1030,11 +1026,7 @@ SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
      0
 (1 row)
 
-drop trigger tsvectorupdate on test_tsvector;
-create function wow(text) returns text as 'select $1 || '' copyright''; ' language sql;
-create trigger tsvectorupdate before update or insert on test_tsvector
-for each row execute procedure tsearch2(a, wow, t);
-insert into test_tsvector (t) values ('345 qwerty');
+insert into test_tsvector (t) values ('345 qwerty copyright');
 select count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
  count 
 -------
@@ -2141,7 +2133,6 @@ select * from stat('select a from test_tsvector') order by ndoc desc, nentry des
  8w        |    2 |      2
  9f        |    2 |      2
  9y        |    2 |      2
- copyright |    2 |      2
  foo       |    1 |      3
  bar       |    1 |      2
  0e        |    1 |      1
@@ -2233,6 +2224,7 @@ select * from stat('select a from test_tsvector') order by ndoc desc, nentry des
  9h        |    1 |      1
  9r        |    1 |      1
  9w        |    1 |      1
+ copyright |    1 |      1
  qwerti    |    1 |      1
 (1146 rows)
 
@@ -2263,11 +2255,11 @@ select * from stat('select a from test_tsvector','d') order by ndoc desc, nentry
    word    | ndoc | nentry 
 -----------+------+--------
  a         |    2 |      2
- copyright |    2 |      2
  foo       |    1 |      3
  bar       |    1 |      2
  345       |    1 |      1
  b         |    1 |      1
+ copyright |    1 |      1
  qq        |    1 |      1
  qwerti    |    1 |      1
 (8 rows)
@@ -2277,22 +2269,15 @@ select * from stat('select a from test_tsvector','ad') order by ndoc desc, nentr
 -----------+------+--------
  a         |    2 |      4
  b         |    2 |      4
- copyright |    2 |      2
  foo       |    1 |      3
  bar       |    1 |      2
  345       |    1 |      1
+ copyright |    1 |      1
  qq        |    1 |      1
  qwerti    |    1 |      1
 (8 rows)
 
-select reset_tsearch();
-NOTICE:  TSearch cache cleaned
- reset_tsearch 
----------------
- 
-(1 row)
-
-select to_tsquery('default', 'skies & books');
+select to_tsquery('english', 'skies & books');
    to_tsquery   
 ----------------
  'sky' & 'book'
@@ -2340,48 +2325,6 @@ Upon a woman s face. E.  J.  Pratt  (1882 1964)
      0.2
 (1 row)
 
-select get_covers(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('sea&thousand&years'));
-                                                                                             get_covers                                                                                             
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- eros took {1 sea thousand year }1 {2 thousand year trace granit featur cliff crag scarp base took sea }2 hour one night hour storm place sculptur granit seam upon woman face e j pratt 1882 1964 
-(1 row)
-
-select get_covers(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('granite&sea'));
-                                                                                                get_covers                                                                                                
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- eros took {1 sea thousand year thousand year trace {2 granit }1 featur cliff crag scarp base took {3 sea }2 hour one night hour storm place sculptur granit }3 seam upon woman face e j pratt 1882 1964 
-(1 row)
-
-select get_covers(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('sea'));
-                                                                                             get_covers                                                                                             
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- eros took {1 sea }1 thousand year thousand year trace granit featur cliff crag scarp base took {2 sea }2 hour one night hour storm place sculptur granit seam upon woman face e j pratt 1882 1964 
-(1 row)
-
 select headline('Erosion It took the sea a thousand years,
 A thousand years to trace
 The granite features of this cliff
@@ -2462,15 +2405,19 @@ to_tsquery('sea&foo'), 'HighlightAll=true');
 (1 row)
 
 --check debug
-select * from ts_debug('Tsearch module for PostgreSQL 7.3.3');
- ts_name | tok_type | description |   token    | dict_name |   tsvector   
----------+----------+-------------+------------+-----------+--------------
- default | lword    | Latin word  | Tsearch    | {en_stem} | 'tsearch'
- default | lword    | Latin word  | module     | {en_stem} | 'modul'
- default | lword    | Latin word  | for        | {en_stem} | 
- default | lword    | Latin word  | PostgreSQL | {en_stem} | 'postgresql'
- default | version  | VERSION     | 7.3.3      | {simple}  | '7.3.3'
-(5 rows)
+select * from public.ts_debug('Tsearch module for PostgreSQL 7.3.3');
+ ts_name | tok_type  |   description   |   token    |   dict_name    |   tsvector   
+---------+-----------+-----------------+------------+----------------+--------------
+ english | asciiword | Word, all ASCII | Tsearch    | {english_stem} | 'tsearch'
+ english | blank     | Space symbols   |            | {}             | 
+ english | asciiword | Word, all ASCII | module     | {english_stem} | 'modul'
+ english | blank     | Space symbols   |            | {}             | 
+ english | asciiword | Word, all ASCII | for        | {english_stem} | 
+ english | blank     | Space symbols   |            | {}             | 
+ english | asciiword | Word, all ASCII | PostgreSQL | {english_stem} | 'postgresql'
+ english | blank     | Space symbols   |            | {}             | 
+ english | version   | Version number  | 7.3.3      | {simple}       | '7.3.3'
+(9 rows)
 
 --check ordering
 insert into test_tsvector values (null, null);
@@ -2486,10 +2433,10 @@ select a is null, a from test_tsvector order by a;
  f        | 
  f        | 
  f        | 
- f        | '345':1 'qwerti':2 'copyright':3
- f        | 'qq':7 'bar':2,8 'foo':1,3,6 'copyright':9
  f        | 'a':1A,2,3B 'b':5A,6A,7C,8
  f        | 'a':1A,2,3C 'b':5A,6B,7C,8B
+ f        | 'qq':7 'bar':2,8 'foo':1,3,6
+ f        | '345':1 'qwerti':2 'copyright':3
  f        | '7w' 'ch' 'd7' 'eo' 'gw' 'i4' 'lq' 'o6' 'qt' 'y0'
  f        | 'ar' 'ei' 'kq' 'ma' 'qa' 'qh' 'qq' 'qz' 'rx' 'st'
  f        | 'gs' 'i6' 'i9' 'j2' 'l0' 'oq' 'qx' 'sc' 'xe' 'yu'
diff --git a/contrib/tsearch2/gendict/Makefile.IN b/contrib/tsearch2/gendict/Makefile.IN
deleted file mode 100644
index c13e496d06b7..000000000000
--- a/contrib/tsearch2/gendict/Makefile.IN
+++ /dev/null
@@ -1,12 +0,0 @@
-subdir = contrib/CFG_DIR
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-MODULE_big = dict_CFG_MODNAME
-OBJS = CFG_OFILE
-DATA_built = dict_CFG_MODNAME.sql
-DOCS = README.CFG_MODNAME
-PG_CPPFLAGS =
-SHLIB_LINK = ../tsearch2/libtsearch2.a
-
-include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/tsearch2/gendict/README.gendict b/contrib/tsearch2/gendict/README.gendict
deleted file mode 100755
index e5bd010b038d..000000000000
--- a/contrib/tsearch2/gendict/README.gendict
+++ /dev/null
@@ -1,131 +0,0 @@
-Gendict - generate dictionary templates for contrib/tsearch2 module.
-
-This utility aims to help people creating dictionary for contrib/tsearch v2
-module. Particularly, it has built-in support for snowball stemmers.
-
-Programming API to tsearch2 dictionaries is described in tsearch v2 
-documentation.
-
-
-Prerequisities:
-
-* PostgreSQL 7.3 and above.
-
-* You need tsearch2 module sources already compiled
-
-* Rights to install contrib modules
-
-Usage:
-
-    run config.sh without parameters to see options and arguments
-
-Usage:
-./config.sh -n DICTNAME ( [ -s [ -p PREFIX ] ] | [ -c CFILES ] [ -h HFILES ] [ -i ] ) [ -v ] [ -d DIR ] [ -C COMMENT ]
-    -v - be verbose
-    -d DIR - name of directory in PGSQL_SRC/contrib (default dict_DICTNAME)
-    -C COMMENT - dictionary comment
-Generate Snowball stemmer:
-./config.sh -n DICTNAME -s [ -p PREFIX ] [ -v ] [ -d DIR ] [ -C COMMENT ]
-    -s - generate Snowball wrapper
-    -p - prefix of Snowball's function, (default DICTNAME)
-Generate template dictionary:
-./config.sh -n DICTNAME [ -c CFILES ] [ -h HFILES ] [ -i ] [ -v ] [ -d DIR ] [ -C COMMENT ]
-    -c CFILES - source files, must be placed in contrib/tsearch2/gendict directory.
-                These files will be used in Makefile.
-    -h HFILES - header files, must be placed in contrib/tsearch2/gendict directory.
-                These files will be used in Makefile and subinclude.h
-    -i - dictionary has init method
-
-
-Example 1:
-
-   Create Portuguese stemmer
- 
-   0. cd PGSQL_SRC/contrib/tsearch2/gendict
-
-   1. Obtain stem.{c,h} files for Portuguese
-
-      wget http://snowball.tartarus.org/portuguese/stem.c
-      wget http://snowball.tartarus.org/portuguese/stem.h
-   
-   2. Create template files for Portuguese
-
-      ./config.sh -n pt -s -p portuguese_ISO_8859_1 -v -C'Snowball stemmer for Portuguese'
-
-      Note, that argument for -p option should be *the same* as name of stemming
-      function in stem.c (without _stem)
-
-      A bunch of files will be generated and placed in PGSQL_SRC/contrib/dict_pt
-      directory.
-
-   3. Compile and install dictionary
-
-	cd PGSQL_SRC/contrib/dict_pt
-	make
-	make install
-
-   4. Test it 
-
-	Sample portuguese words with the stemmed forms are available
-        from http://snowball.tartarus.org/portuguese/stemmer.html
-
- 	createdb testdict
-	psql testdict < /usr/local/pgsql/share/contrib/tsearch2.sql
-	psql testdict < /usr/local/pgsql/share/contrib/dict_pt.sql
-	psql -d testdict -c "select lexize('pt','bobagem');"
-	 lexize  
-	---------
-	 {bobag}
-	(1 row)
-
-	Here is what I have in pg_ts_dict table
-
-	psql -d testdict -c "select * from pg_ts_dict where dict_name='pt';"
-	 dict_name |     dict_init      | dict_initoption |              dict_lexize              |          dict_comment           
-	-----------+--------------------+-----------------+---------------------------------------+---------------------------------
-	 pt        | dinit_pt(internal) |                 | snb_lexize(internal,internal,integer) | Snowball stemmer for Portuguese
-
-	(1 row)
-
- 
-        Note, that you have already installed dictionary and corresponding
-	entry in tsearch configuration and you may modify it using
-	plain SQL commands, for example, specify stop words.
-
-Example 2:
-
-      a) Simple template dictionary with init method 
-
-       ./config.sh -n wow -v -i -C WOW
-
-      b) Create simple template dict (without init method):
-	./config.sh -n wow -v  -C WOW
-
-        The same as above, but dictionary will have not init method
-
-       Dictionaries obtained in a) and b) are fully working and ready
-       for use: 
-	  a) lowercase input word and remove it if it is a stop word
-	  b) recognizes any word
-
-      c) Simple template dictionary with source files (with init method):
-
-       ./config.sh -n wow -v -i -c a.c -h a.h -C WOW
-
-        Source files ( a.c ) must be placed in contrib/tsearch2/gendict directory.
-        These files will be used in Makefile.
-
-        Header files ( a.h ), must be placed in contrib/tsearch2/gendict directory.
-        These files will be used in Makefile and subinclude.h
-
-      d) Simple template dictionary with source files (without init method):
-
-	./config.sh -n wow -v  -c a.c -h a.h -C WOW
-
-	The same as above, but dictionary will have not init method
-
-       After that you have sources in PGSQL_SRC/contrib/dict_wow and
-       you may edit them to create actual dictionary.
-
-  Please, check Tsearch2 home page (http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/)
-  for additional information about "Gendict tutorial" and dictionaries.
diff --git a/contrib/tsearch2/gendict/config.sh b/contrib/tsearch2/gendict/config.sh
deleted file mode 100755
index 2dc71fb73ef7..000000000000
--- a/contrib/tsearch2/gendict/config.sh
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/bin/sh
-
-usage () {
-	echo Usage:
-	echo $0 -n DICTNAME  \( [ -s [ -p PREFIX ] ] \| [ -c CFILES ] [ -h HFILES ] [ -i ] \) [ -v ] [ -d DIR ] [ -C COMMENT ]
-	echo '    -v - be verbose'
-	echo '    -d DIR - name of directory in PGSQL_SRL/contrib (default dict_DICTNAME)'
-	echo '    -C COMMENT - dictionary comment' 
-	echo Generate Snowball stemmer:
-	echo $0 -n DICTNAME -s [ -p PREFIX ] [ -v ] [ -d DIR ] [ -C COMMENT ]
-	echo '    -s - generate Snowball wrapper'
-	echo "    -p - prefix of Snowball's function, (default DICTNAME)" 
-	echo Generate template dictionary:
-	echo $0 -n DICTNAME [ -c CFILES ] [ -h HFILES ] [ -i ] [ -v ] [ -d DIR ] [ -C COMMENT ]
-	echo '    -c CFILES - source files, must be placed in contrib/tsearch2/gendict directory.'
-	echo '                These files will be used in Makefile.'
-	echo '    -h HFILES - header files, must be placed in contrib/tsearch2/gendict directory.'
-	echo '                These files will be used in Makefile and subinclude.h'
-	echo '    -i - dictionary has init method'
-	exit 1;
-}
-
-dictname=
-stemmode=no
-verbose=no
-cfile=
-hfile=
-dir= 
-hasinit=no
-comment=
-prefix=
-
-while getopts n:c:C:h:d:p:vis opt
-do
-	case "$opt" in
-		v) verbose=yes;;
-		s) stemmode=yes;;
-		i) hasinit=yes;;
-		n) dictname="$OPTARG";;
-		c) cfile="$OPTARG";;
-		h) hfile="$OPTARG";;
-		d) dir="$OPTARG";;
-		C) comment="$OPTARG";;
-		p) prefix="$OPTARG";;
-		\?) usage;;
-	esac
-done
-
-[ ${#dictname} -eq 0 ] && usage
-
-dictname=`echo $dictname | tr '[:upper:]' '[:lower:]'`
-
-if [ $stemmode = "yes" ] ; then 
-	[ ${#prefix} -eq 0 ] && prefix=$dictname
-	hasinit=yes
-	cfile="stem.c"
-	hfile="stem.h"
-fi 
-
-[ ${#dir}   -eq 0 ] && dir="dict_$dictname"
-
-if [ ${#comment} -eq 0 ]; then
-	comment=null
-else
-	comment="'$comment'"
-fi
-
-ofile=
-for f in $cfile
-do
-	f=` echo $f | sed 's#c$#o#'`
-	ofile="$ofile $f"
-done
-
-if [ $stemmode = "yes" ] ; then
-	ofile="$ofile dict_snowball.o"
-else
-	ofile="$ofile dict_tmpl.o"
-fi
-
-if [ $verbose = "yes" ]; then
-	echo Dictname: "'"$dictname"'"
-	echo Snowball stemmer: $stemmode
-	echo Has init method: $hasinit
-	[ $stemmode = "yes" ] && echo Function prefix: $prefix 
-	echo Source files: $cfile
-	echo Header files: $hfile
-	echo Object files: $ofile
-	echo Comment: $comment
-	echo Directory: ../../$dir
-fi
-
-
-[ $verbose = "yes" ] && echo -n 'Build directory...  '
-if [ ! -d ../../$dir ]; then
-	if ! mkdir ../../$dir ; then 
-		echo "Can't create directory ../../$dir"
-		exit 1
-	fi 
-fi
-[ $verbose = "yes" ] && echo ok
-
-
-[ $verbose = "yes" ] && echo -n 'Build Makefile...  '
-sed s#CFG_DIR#$dir# < Makefile.IN | sed s#CFG_MODNAME#$dictname# | sed "s#CFG_OFILE#$ofile#" > ../../$dir/Makefile.tmp
-if [ $stemmode = "yes" ] ; then
-	sed "s#^PG_CPPFLAGS.*\$#PG_CPPFLAGS = -I../tsearch2/snowball -I../tsearch2#" < ../../$dir/Makefile.tmp >  ../../$dir/Makefile 
-else
-	sed "s#^PG_CPPFLAGS.*\$#PG_CPPFLAGS = -I../tsearch2#" < ../../$dir/Makefile.tmp >  ../../$dir/Makefile 
-fi
-rm ../../$dir/Makefile.tmp
-[ $verbose = "yes" ] && echo ok
-
-
-[ $verbose = "yes" ] && echo -n Build dict_$dictname'.sql.in...  '
-if [ $hasinit = "yes" ]; then
-	sed s#CFG_MODNAME#$dictname# < sql.IN | sed "s#CFG_COMMENT#$comment#" | sed s#^HASINIT## | sed 's#^NOINIT.*$##' > ../../$dir/dict_$dictname.sql.in.tmp
-	if [ $stemmode = "yes" ] ; then
-		sed s#^ISSNOWBALL## < ../../$dir/dict_$dictname.sql.in.tmp | sed s#^NOSNOWBALL.*\$## > ../../$dir/dict_$dictname.sql.in
-	else
-		sed s#^NOSNOWBALL## < ../../$dir/dict_$dictname.sql.in.tmp | sed s#^ISSNOWBALL.*\$## > ../../$dir/dict_$dictname.sql.in
-	fi
-	rm ../../$dir/dict_$dictname.sql.in.tmp	
-else 
-	sed s#CFG_MODNAME#$dictname# < sql.IN | sed "s#CFG_COMMENT#$comment#" | sed s#^NOINIT## | sed 's#^HASINIT.*$##' | sed s#^NOSNOWBALL## | sed s#^ISSNOWBALL.*\$## > ../../$dir/dict_$dictname.sql.in
-fi
-[ $verbose = "yes" ] && echo ok
-
-
-
-if [ ${#cfile} -ne 0 ] || [ ${#hfile} -ne 0 ] ; then
-	[ $verbose = "yes" ] && echo -n 'Copy source and header files...  '
-	if [ ${#cfile} -ne 0 ] ; then
-		if [ $stemmode = "yes" ] ; then
-			for cfn in $cfile
-			do
-				sed s#../runtime/## < $cfn > ../../$dir/$cfn
-			done
-		else
-			if ! cp $cfile ../../$dir ; then 
-				echo "Can't cp all or one of files: $cfile"
-				exit 1
-			fi
-		fi
-	fi
-	if [ ${#hfile} -ne 0 ] ; then 
-		if ! cp $hfile ../../$dir ; then 
-   			echo "Cant cp all or one of files: $hfile"
-			exit 1
-		fi
-	fi
-	[ $verbose = "yes" ] && echo ok
-fi
-
-
-[ $verbose = "yes" ] && echo -n 'Build sub-include header...  '
-echo -n > ../../$dir/subinclude.h 
-for i in $hfile
-do
-	echo "#include \"$i\"" >> ../../$dir/subinclude.h
-done
-[ $verbose = "yes" ] && echo ok
-
-
-if  [ $stemmode = "yes" ] ; then 
-	[ $verbose = "yes" ] && echo -n 'Build Snowball stemmer...  '
-	sed s#CFG_MODNAME#$dictname#g < dict_snowball.c.IN | sed s#CFG_PREFIX#$prefix#g > ../../$dir/dict_snowball.c
-else
-	[ $verbose = "yes" ] && echo -n 'Build dictinonary...  '
-	sed s#CFG_MODNAME#$dictname#g < dict_tmpl.c.IN > ../../$dir/dict_tmpl.c.tmp
-	if [ $hasinit = "yes" ]; then
-		sed s#^HASINIT## <  ../../$dir/dict_tmpl.c.tmp | sed 's#^NOINIT.*$##' > ../../$dir/dict_tmpl.c
-	else 
-		sed s#^HASINIT.*\$## <  ../../$dir/dict_tmpl.c.tmp | sed 's#^NOINIT##' > ../../$dir/dict_tmpl.c
-	fi
-	rm ../../$dir/dict_tmpl.c.tmp
-fi 
-[ $verbose = "yes" ] && echo ok
-
-
-[ $verbose = "yes" ] && echo -n "Build README.$dictname...  "
-if  [ $stemmode = "yes" ] ; then
-	echo "Autogenerated Snowball's wrapper for $prefix" > ../../$dir/README.$dictname
-else
-	echo "Autogenerated template for $dictname" > ../../$dir/README.$dictname
-fi
-[ $verbose = "yes" ] && echo ok
-
-echo All is done
-
diff --git a/contrib/tsearch2/gendict/dict_snowball.c.IN b/contrib/tsearch2/gendict/dict_snowball.c.IN
deleted file mode 100755
index 7136ee19ddc7..000000000000
--- a/contrib/tsearch2/gendict/dict_snowball.c.IN
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_snowball.c.IN,v 1.5 2006/07/14 05:28:27 tgl Exp $ */
-
-/* 
- * example of Snowball dictionary
- * http://snowball.tartarus.org/ 
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include "dict.h"
-#include "common.h"
-#include "snowball/header.h"
-#include "subinclude.h"
-#include "ts_locale.h"
-
-typedef struct {
-	struct SN_env *z;
-	StopList	stoplist;
-	int	(*stem)(struct SN_env * z);
-} DictSnowball;
-
-
-PG_FUNCTION_INFO_V1(dinit_CFG_MODNAME);
-Datum dinit_CFG_MODNAME(PG_FUNCTION_ARGS);
-
-Datum 
-dinit_CFG_MODNAME(PG_FUNCTION_ARGS) {
-	DictSnowball	*d = (DictSnowball*)malloc( sizeof(DictSnowball) );
-
-	if ( !d )
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	memset(d,0,sizeof(DictSnowball));
-	d->stoplist.wordop=lowerstr;
-		
-	if ( !PG_ARGISNULL(0) && PG_GETARG_POINTER(0)!=NULL ) {
-		text       *in = PG_GETARG_TEXT_P(0);
-		readstoplist(in, &(d->stoplist));
-		sortstoplist(&(d->stoplist));
-		PG_FREE_IF_COPY(in, 0);
-	}
-
-	d->z = CFG_PREFIX_create_env();
-	if (!d->z) {
-		freestoplist(&(d->stoplist));
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	}
-	d->stem=CFG_PREFIX_stem;
-
-	PG_RETURN_POINTER(d);
-}
-
-
diff --git a/contrib/tsearch2/gendict/dict_tmpl.c.IN b/contrib/tsearch2/gendict/dict_tmpl.c.IN
deleted file mode 100755
index a47720aa1008..000000000000
--- a/contrib/tsearch2/gendict/dict_tmpl.c.IN
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_tmpl.c.IN,v 1.6 2006/07/14 05:28:27 tgl Exp $ */
-
-/* 
- * example of dictionary 
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include "dict.h"
-#include "common.h"
-
-#include "subinclude.h"
-#include "ts_locale.h"
-
-HASINIT typedef struct {
-HASINIT 	StopList	stoplist;
-HASINIT } DictExample;
-
-
-HASINIT PG_FUNCTION_INFO_V1(dinit_CFG_MODNAME);
-HASINIT Datum dinit_CFG_MODNAME(PG_FUNCTION_ARGS);
-
-HASINIT Datum 
-HASINIT dinit_CFG_MODNAME(PG_FUNCTION_ARGS) {
-HASINIT 	DictExample	*d = (DictExample*)malloc( sizeof(DictExample) );
-HASINIT 
-HASINIT 	if ( !d )
-HASINIT			ereport(ERROR,
-HASINIT					(errcode(ERRCODE_OUT_OF_MEMORY),
-HASINIT					 errmsg("out of memory")));
-HASINIT 	memset(d,0,sizeof(DictExample));
-HASINIT 
-HASINIT 	d->stoplist.wordop=lowerstr;
-HASINIT 	
-HASINIT 	/* Your INIT code */
-HASINIT 	
-HASINIT 	if ( !PG_ARGISNULL(0) && PG_GETARG_POINTER(0)!=NULL ) {
-HASINIT 		text       *in = PG_GETARG_TEXT_P(0);
-HASINIT 		readstoplist(in, &(d->stoplist));
-HASINIT 		sortstoplist(&(d->stoplist));
-HASINIT 		PG_FREE_IF_COPY(in, 0);
-HASINIT 	}
-HASINIT 
-HASINIT 	PG_RETURN_POINTER(d);
-HASINIT }
-
-PG_FUNCTION_INFO_V1(dlexize_CFG_MODNAME);
-Datum dlexize_CFG_MODNAME(PG_FUNCTION_ARGS);
-Datum
-dlexize_CFG_MODNAME(PG_FUNCTION_ARGS) {
-HASINIT 	DictExample *d = (DictExample*)PG_GETARG_POINTER(0);
-	char       *in = (char*)PG_GETARG_POINTER(1);
-	char *txt = pnstrdup(in, PG_GETARG_INT32(2));
-	TSLexeme	*res=palloc(sizeof(TSLexeme*)*2);
-
-	/* Your LEXIZE dictionary code */
-HASINIT 	if ( *txt=='\0' || searchstoplist(&(d->stoplist),txt) ) {
-HASINIT 		pfree(txt);
-HASINIT 		res[0].lexeme=NULL;
-HASINIT 	} else 
-		res[0].lexeme=txt;
-	res[1].lexeme=NULL;
-
-	PG_RETURN_POINTER(res);
-}
diff --git a/contrib/tsearch2/gendict/sql.IN b/contrib/tsearch2/gendict/sql.IN
deleted file mode 100755
index 399b26b0d9ec..000000000000
--- a/contrib/tsearch2/gendict/sql.IN
+++ /dev/null
@@ -1,26 +0,0 @@
-SET search_path = public;
-BEGIN;
-
-HASINIT create function dinit_CFG_MODNAME(internal)
-HASINIT         returns internal
-HASINIT         as 'MODULE_PATHNAME'
-HASINIT         language C;
-
-NOSNOWBALL create function dlexize_CFG_MODNAME(internal,internal,int4)
-NOSNOWBALL        returns internal
-NOSNOWBALL        as 'MODULE_PATHNAME'
-NOSNOWBALL        language C
-NOSNOWBALL        returns null on null input;
-
-insert into pg_ts_dict select
-        'CFG_MODNAME',
-HASINIT        (select oid from pg_proc where proname='dinit_CFG_MODNAME'),
-NOINIT        null,
-        null,
-ISSNOWBALL        (select oid from pg_proc where proname='snb_lexize'),
-NOSNOWBALL        (select oid from pg_proc where proname='dlexize_CFG_MODNAME'),
-        CFG_COMMENT
-;
-
-
-END;
diff --git a/contrib/tsearch2/ginidx.c b/contrib/tsearch2/ginidx.c
deleted file mode 100644
index d77ee9bb9f73..000000000000
--- a/contrib/tsearch2/ginidx.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include "postgres.h"
-
-#include <float.h>
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "access/skey.h"
-#include "access/tuptoaster.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-
-#include "tsvector.h"
-#include "query.h"
-#include "query_cleanup.h"
-
-PG_FUNCTION_INFO_V1(gin_extract_tsvector);
-Datum		gin_extract_tsvector(PG_FUNCTION_ARGS);
-
-Datum
-gin_extract_tsvector(PG_FUNCTION_ARGS)
-{
-	tsvector   *vector = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
-	Datum	   *entries = NULL;
-
-	*nentries = 0;
-	if (vector->size > 0)
-	{
-		int			i;
-		WordEntry  *we = ARRPTR(vector);
-
-		*nentries = (int32) vector->size;
-		entries = (Datum *) palloc(sizeof(Datum) * vector->size);
-
-		for (i = 0; i < vector->size; i++)
-		{
-			text	   *txt = (text *) palloc(VARHDRSZ + we->len);
-
-			SET_VARSIZE(txt, VARHDRSZ + we->len);
-			memcpy(VARDATA(txt), STRPTR(vector) + we->pos, we->len);
-
-			entries[i] = PointerGetDatum(txt);
-
-			we++;
-		}
-	}
-
-	PG_FREE_IF_COPY(vector, 0);
-	PG_RETURN_POINTER(entries);
-}
-
-
-PG_FUNCTION_INFO_V1(gin_extract_tsquery);
-Datum		gin_extract_tsquery(PG_FUNCTION_ARGS);
-
-Datum
-gin_extract_tsquery(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
-	StrategyNumber strategy = DatumGetUInt16(PG_GETARG_DATUM(2));
-	Datum	   *entries = NULL;
-
-	*nentries = 0;
-	if (query->size > 0)
-	{
-		int4		i,
-					j = 0,
-					len;
-		ITEM	   *item;
-
-		item = clean_NOT_v2(GETQUERY(query), &len);
-		if (!item)
-			elog(ERROR, "Query requires full scan, GIN doesn't support it");
-
-		item = GETQUERY(query);
-
-		for (i = 0; i < query->size; i++)
-			if (item[i].type == VAL)
-				(*nentries)++;
-
-		entries = (Datum *) palloc(sizeof(Datum) * (*nentries));
-
-		for (i = 0; i < query->size; i++)
-			if (item[i].type == VAL)
-			{
-				text	   *txt;
-
-				txt = (text *) palloc(VARHDRSZ + item[i].length);
-
-				SET_VARSIZE(txt, VARHDRSZ + item[i].length);
-				memcpy(VARDATA(txt), GETOPERAND(query) + item[i].distance, item[i].length);
-
-				entries[j++] = PointerGetDatum(txt);
-
-				if (strategy == 1 && item[i].weight != 0)
-					elog(ERROR, "With class of lexeme restrictions use @@@ operation");
-			}
-
-	}
-	else
-		*nentries = -1; /* nothing can be found */
-
-	PG_FREE_IF_COPY(query, 0);
-	PG_RETURN_POINTER(entries);
-}
-
-typedef struct
-{
-	ITEM	   *frst;
-	bool	   *mapped_check;
-}	GinChkVal;
-
-static bool
-checkcondition_gin(void *checkval, ITEM * val)
-{
-	GinChkVal  *gcv = (GinChkVal *) checkval;
-
-	return gcv->mapped_check[val - gcv->frst];
-}
-
-PG_FUNCTION_INFO_V1(gin_ts_consistent);
-Datum		gin_ts_consistent(PG_FUNCTION_ARGS);
-
-Datum
-gin_ts_consistent(PG_FUNCTION_ARGS)
-{
-	bool	   *check = (bool *) PG_GETARG_POINTER(0);
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(2));
-	bool		res = FALSE;
-
-	if (query->size > 0)
-	{
-		int4		i,
-					j = 0;
-		ITEM	   *item;
-		GinChkVal	gcv;
-
-		gcv.frst = item = GETQUERY(query);
-		gcv.mapped_check = (bool *) palloc(sizeof(bool) * query->size);
-
-		for (i = 0; i < query->size; i++)
-			if (item[i].type == VAL)
-				gcv.mapped_check[i] = check[j++];
-
-
-		res = TS_execute(
-						 GETQUERY(query),
-						 &gcv,
-						 true,
-						 checkcondition_gin
-			);
-
-	}
-
-	PG_FREE_IF_COPY(query, 2);
-	PG_RETURN_BOOL(res);
-}
diff --git a/contrib/tsearch2/gistidx.h b/contrib/tsearch2/gistidx.h
deleted file mode 100644
index 5362584b8078..000000000000
--- a/contrib/tsearch2/gistidx.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/gistidx.h,v 1.8 2007/02/28 22:44:38 tgl Exp $ */
-
-#ifndef __GISTIDX_H__
-#define __GISTIDX_H__
-
-/*
-#define GISTIDX_DEBUG
-*/
-
-/*
- * signature defines
- */
-
-#define SIGLENINT  63			/* >121 => key will toast, so it will not work
-								 * !!! */
-#define SIGLEN	( sizeof(int4) * SIGLENINT )
-#define SIGLENBIT (SIGLEN * BITS_PER_BYTE)
-
-typedef char BITVEC[SIGLEN];
-typedef char *BITVECP;
-
-#define LOOPBYTE(a) \
-		for(i=0;i<SIGLEN;i++) {\
-				a;\
-		}
-
-#define GETBYTE(x,i) ( *( (BITVECP)(x) + (int)( (i) / BITS_PER_BYTE ) ) )
-#define GETBITBYTE(x,i) ( ((char)(x)) >> (i) & 0x01 )
-#define CLRBIT(x,i)   GETBYTE(x,i) &= ~( 0x01 << ( (i) % BITS_PER_BYTE ) )
-#define SETBIT(x,i)   GETBYTE(x,i) |=  ( 0x01 << ( (i) % BITS_PER_BYTE ) )
-#define GETBIT(x,i) ( (GETBYTE(x,i) >> ( (i) % BITS_PER_BYTE )) & 0x01 )
-
-#define HASHVAL(val) (((unsigned int)(val)) % SIGLENBIT)
-#define HASH(sign, val) SETBIT((sign), HASHVAL(val))
-
-
-/*
- * type of index key
- */
-typedef struct
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int4		flag;
-	char		data[1];
-}	GISTTYPE;
-
-#define ARRKEY		0x01
-#define SIGNKEY		0x02
-#define ALLISTRUE	0x04
-
-#define ISARRKEY(x) ( ((GISTTYPE*)(x))->flag & ARRKEY )
-#define ISSIGNKEY(x)	( ((GISTTYPE*)(x))->flag & SIGNKEY )
-#define ISALLTRUE(x)	( ((GISTTYPE*)(x))->flag & ALLISTRUE )
-
-#define GTHDRSIZE	( VARHDRSZ + sizeof(int4) )
-#define CALCGTSIZE(flag, len) ( GTHDRSIZE + ( ( (flag) & ARRKEY ) ? ((len)*sizeof(int4)) : (((flag) & ALLISTRUE) ? 0 : SIGLEN) ) )
-
-#define GETSIGN(x)	( (BITVECP)( (char*)(x)+GTHDRSIZE ) )
-#define GETARR(x)	( (int4*)( (char*)(x)+GTHDRSIZE ) )
-#define ARRNELEM(x) ( ( VARSIZE(x) - GTHDRSIZE )/sizeof(int4) )
-
-#endif
diff --git a/contrib/tsearch2/ispell/Makefile b/contrib/tsearch2/ispell/Makefile
deleted file mode 100644
index 341f7f41e5d4..000000000000
--- a/contrib/tsearch2/ispell/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.9 2005/10/18 01:30:48 tgl Exp $
-
-SUBOBJS = spell.o regis.o 
-
-EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
-
-PG_CPPFLAGS = -I$(srcdir)/.. 
-
-ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
-include $(PGXS)
-else
-subdir = contrib/tsearch2/ispell
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
-
-override CFLAGS += $(CFLAGS_SL)
-
-all: SUBSYS.o
-
-SUBSYS.o: $(SUBOBJS)
-	$(LD) $(LDREL) $(LDOUT) $@ $^
-
-
diff --git a/contrib/tsearch2/ispell/regis.h b/contrib/tsearch2/ispell/regis.h
deleted file mode 100644
index a0b840b0a0d6..000000000000
--- a/contrib/tsearch2/ispell/regis.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __REGIS_H__
-#define __REGIS_H__
-
-#include "postgres.h"
-
-typedef struct RegisNode
-{
-	uint32
-				type:2,
-				len:16,
-				unused:14;
-	struct RegisNode *next;
-	unsigned char data[1];
-}	RegisNode;
-
-#define  RNHDRSZ	(offsetof(RegisNode,data))
-
-#define RSF_ONEOF	1
-#define RSF_NONEOF	2
-
-typedef struct Regis
-{
-	RegisNode  *node;
-	uint32
-				issuffix:1,
-				nchar:16,
-				unused:15;
-}	Regis;
-
-bool		RS_isRegis(const char *str);
-
-void		RS_compile(Regis * r, bool issuffix, char *str);
-void		RS_free(Regis * r);
-
-/*returns true if matches */
-bool		RS_execute(Regis * r, char *str);
-
-#endif
diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c
deleted file mode 100644
index 4d83532f5029..000000000000
--- a/contrib/tsearch2/ispell/spell.c
+++ /dev/null
@@ -1,1544 +0,0 @@
-#include "postgres.h"
-
-#include <ctype.h>
-
-#include "spell.h"
-#include "common.h"
-#include "ts_locale.h"
-
-#define MAX_NORM 1024
-#define MAXNORMLEN 256
-
-#define ERRSTRSIZE	1024
-
-#define STRNCMP(s,p)	strncmp( (s), (p), strlen(p) )
-#define GETWCHAR(W,L,N,T) ( ((uint8*)(W))[ ((T)==FF_PREFIX) ? (N) : ( (L) - 1 - (N) ) ] )
-#define GETCHAR(A,N,T)	  GETWCHAR( (A)->repl, (A)->replen, N, T )
-
-static char *VoidString = "";
-
-#define MEMOUT(X)  if ( !(X) ) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of memory")))
-
-static int
-cmpspell(const void *s1, const void *s2)
-{
-	return (strcmp((*(const SPELL **) s1)->word, (*(const SPELL **) s2)->word));
-}
-static int
-cmpspellaffix(const void *s1, const void *s2)
-{
-	return (strcmp((*(const SPELL **) s1)->p.flag, (*(const SPELL **) s2)->p.flag));
-}
-
-static char *
-strnduplicate(char *s, int len)
-{
-	char	   *d = (char *) palloc(len + 1);
-
-	memcpy(d, s, len);
-	d[len] = '\0';
-	return d;
-}
-
-static char *
-findchar(char *str, int c)
-{
-	while (*str)
-	{
-		if (t_iseq(str, c))
-			return str;
-		str += pg_mblen(str);
-	}
-
-	return NULL;
-}
-
-
-/* backward string compare for suffix tree operations */
-static int
-strbcmp(const unsigned char *s1, const unsigned char *s2)
-{
-	int			l1 = strlen((const char *) s1) - 1,
-				l2 = strlen((const char *) s2) - 1;
-
-	while (l1 >= 0 && l2 >= 0)
-	{
-		if (s1[l1] < s2[l2])
-			return -1;
-		if (s1[l1] > s2[l2])
-			return 1;
-		l1--;
-		l2--;
-	}
-	if (l1 < l2)
-		return -1;
-	if (l1 > l2)
-		return 1;
-
-	return 0;
-}
-static int
-strbncmp(const unsigned char *s1, const unsigned char *s2, size_t count)
-{
-	int			l1 = strlen((const char *) s1) - 1,
-				l2 = strlen((const char *) s2) - 1,
-				l = count;
-
-	while (l1 >= 0 && l2 >= 0 && l > 0)
-	{
-		if (s1[l1] < s2[l2])
-			return -1;
-		if (s1[l1] > s2[l2])
-			return 1;
-		l1--;
-		l2--;
-		l--;
-	}
-	if (l == 0)
-		return 0;
-	if (l1 < l2)
-		return -1;
-	if (l1 > l2)
-		return 1;
-	return 0;
-}
-
-static int
-cmpaffix(const void *s1, const void *s2)
-{
-	const AFFIX *a1 = (const AFFIX *) s1;
-	const AFFIX *a2 = (const AFFIX *) s2;
-
-	if (a1->type < a2->type)
-		return -1;
-	if (a1->type > a2->type)
-		return 1;
-	if (a1->type == FF_PREFIX)
-		return strcmp(a1->repl, a2->repl);
-	else
-		return strbcmp((const unsigned char *) a1->repl,
-					   (const unsigned char *) a2->repl);
-}
-
-int
-NIAddSpell(IspellDict * Conf, const char *word, const char *flag)
-{
-	if (Conf->nspell >= Conf->mspell)
-	{
-		if (Conf->mspell)
-		{
-			Conf->mspell += 1024 * 20;
-			Conf->Spell = (SPELL **) repalloc(Conf->Spell, Conf->mspell * sizeof(SPELL *));
-		}
-		else
-		{
-			Conf->mspell = 1024 * 20;
-			Conf->Spell = (SPELL **) palloc(Conf->mspell * sizeof(SPELL *));
-		}
-	}
-	Conf->Spell[Conf->nspell] = (SPELL *) palloc(SPELLHDRSZ + strlen(word) + 1);
-	strcpy(Conf->Spell[Conf->nspell]->word, word);
-	strncpy(Conf->Spell[Conf->nspell]->p.flag, flag, 16);
-	Conf->nspell++;
-	return (0);
-}
-
-
-int
-NIImportDictionary(IspellDict * Conf, const char *filename)
-{
-	char		str[BUFSIZ], *pstr;
-	FILE	   *dict;
-
-	if (!(dict = fopen(filename, "r")))
-		return (1);
-	while (fgets(str, sizeof(str), dict))
-	{
-		char	   *s;
-		const char *flag;
-
-		pg_verifymbstr(str, strlen(str), false);
-
-		flag = NULL;
-		if ((s = findchar(str, '/')))
-		{
-			*s++ = '\0';
-			flag = s;
-			while (*s)
-			{
-				/* we allow only single encoded flags for faster works */
-				if (pg_mblen(s) == 1 && t_isprint(s) && !t_isspace(s))
-					s++;
-				else
-				{
-					*s = '\0';
-					break;
-				}
-			}
-		}
-		else
-			flag = "";
-
-
-		s = str;
-		while (*s)
-		{
-			if (t_isspace(s))
-			{
-				*s = '\0';
-				break;
-			}
-			s += pg_mblen(s);
-		}
-		pstr = lowerstr(str);
-
-		NIAddSpell(Conf, pstr, flag);
-		pfree(pstr);
-	}
-	fclose(dict);
-	return (0);
-}
-
-
-static int
-FindWord(IspellDict * Conf, const char *word, int affixflag, char compoundonly)
-{
-	SPNode	   *node = Conf->Dictionary;
-	SPNodeData *StopLow,
-			   *StopHigh,
-			   *StopMiddle;
-	uint8	   *ptr = (uint8 *) word;
-
-	while (node && *ptr)
-	{
-		StopLow = node->data;
-		StopHigh = node->data + node->length;
-		while (StopLow < StopHigh)
-		{
-			StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
-			if (StopMiddle->val == *ptr)
-			{
-				if (*(ptr + 1) == '\0' && StopMiddle->isword)
-				{
-					if (compoundonly && !StopMiddle->compoundallow)
-						return 0;
-					if ((affixflag == 0) || (strchr(Conf->AffixData[StopMiddle->affix], affixflag) != NULL))
-						return 1;
-				}
-				node = StopMiddle->node;
-				ptr++;
-				break;
-			}
-			else if (StopMiddle->val < *ptr)
-				StopLow = StopMiddle + 1;
-			else
-				StopHigh = StopMiddle;
-		}
-		if (StopLow >= StopHigh)
-			break;
-	}
-	return 0;
-}
-
-int
-NIAddAffix(IspellDict * Conf, int flag, char flagflags, const char *mask, const char *find, const char *repl, int type)
-{
-	if (Conf->naffixes >= Conf->maffixes)
-	{
-		if (Conf->maffixes)
-		{
-			Conf->maffixes += 16;
-			Conf->Affix = (AFFIX *) realloc((void *) Conf->Affix, Conf->maffixes * sizeof(AFFIX));
-		}
-		else
-		{
-			Conf->maffixes = 16;
-			Conf->Affix = (AFFIX *) malloc(Conf->maffixes * sizeof(AFFIX));
-		}
-		MEMOUT(Conf->Affix);
-	}
-
-	if (strcmp(mask, ".") == 0)
-	{
-		Conf->Affix[Conf->naffixes].issimple = 1;
-		Conf->Affix[Conf->naffixes].isregis = 0;
-		Conf->Affix[Conf->naffixes].mask = VoidString;
-	}
-	else if (RS_isRegis(mask))
-	{
-		Conf->Affix[Conf->naffixes].issimple = 0;
-		Conf->Affix[Conf->naffixes].isregis = 1;
-		Conf->Affix[Conf->naffixes].mask = (mask && *mask) ? strdup(mask) : VoidString;
-	}
-	else
-	{
-		int			masklen = strlen(mask);
-
-		Conf->Affix[Conf->naffixes].issimple = 0;
-		Conf->Affix[Conf->naffixes].isregis = 0;
-		Conf->Affix[Conf->naffixes].mask = (char *) malloc(masklen + 2);
-		if (type == FF_SUFFIX)
-			sprintf(Conf->Affix[Conf->naffixes].mask, "%s$", mask);
-		else
-			sprintf(Conf->Affix[Conf->naffixes].mask, "^%s", mask);
-	}
-	MEMOUT(Conf->Affix[Conf->naffixes].mask);
-
-	Conf->Affix[Conf->naffixes].compile = 1;
-	Conf->Affix[Conf->naffixes].flagflags = flagflags;
-	Conf->Affix[Conf->naffixes].flag = flag;
-	Conf->Affix[Conf->naffixes].type = type;
-
-	Conf->Affix[Conf->naffixes].find = (find && *find) ? strdup(find) : VoidString;
-	MEMOUT(Conf->Affix[Conf->naffixes].find);
-	if ((Conf->Affix[Conf->naffixes].replen = strlen(repl)) > 0)
-	{
-		Conf->Affix[Conf->naffixes].repl = strdup(repl);
-		MEMOUT(Conf->Affix[Conf->naffixes].repl);
-	}
-	else
-		Conf->Affix[Conf->naffixes].repl = VoidString;
-	Conf->naffixes++;
-	return (0);
-}
-
-#define PAE_WAIT_MASK	0
-#define PAE_INMASK	1
-#define PAE_WAIT_FIND	2
-#define PAE_INFIND	3
-#define PAE_WAIT_REPL	4
-#define PAE_INREPL	5
-
-static bool
-parse_affentry(char *str, char *mask, char *find, char *repl, int line)
-{
-	int			state = PAE_WAIT_MASK;
-	char	   *pmask = mask,
-			   *pfind = find,
-			   *prepl = repl;
-
-	*mask = *find = *repl = '\0';
-
-	while (*str)
-	{
-		if (state == PAE_WAIT_MASK)
-		{
-			if (t_iseq(str, '#'))
-				return false;
-			else if (!t_isspace(str))
-			{
-				COPYCHAR(pmask, str);
-				pmask += pg_mblen(str);
-				state = PAE_INMASK;
-			}
-		}
-		else if (state == PAE_INMASK)
-		{
-			if (t_iseq(str, '>'))
-			{
-				*pmask = '\0';
-				state = PAE_WAIT_FIND;
-			}
-			else if (!t_isspace(str))
-			{
-				COPYCHAR(pmask, str);
-				pmask += pg_mblen(str);
-			}
-		}
-		else if (state == PAE_WAIT_FIND)
-		{
-			if (t_iseq(str, '-'))
-			{
-				state = PAE_INFIND;
-			}
-			else if (t_isalpha(str) || t_iseq(str, '\'') /* english 's */ )
-			{
-				COPYCHAR(prepl, str);
-				prepl += pg_mblen(str);
-				state = PAE_INREPL;
-			}
-			else if (!t_isspace(str))
-				ts_error(ERROR, "Affix parse error at %d line", line);
-		}
-		else if (state == PAE_INFIND)
-		{
-			if (t_iseq(str, ','))
-			{
-				*pfind = '\0';
-				state = PAE_WAIT_REPL;
-			}
-			else if (t_isalpha(str))
-			{
-				COPYCHAR(pfind, str);
-				pfind += pg_mblen(str);
-			}
-			else if (!t_isspace(str))
-				ts_error(ERROR, "Affix parse error at %d line", line);
-		}
-		else if (state == PAE_WAIT_REPL)
-		{
-			if (t_iseq(str, '-'))
-			{
-				break;			/* void repl */
-			}
-			else if (t_isalpha(str))
-			{
-				COPYCHAR(prepl, str);
-				prepl += pg_mblen(str);
-				state = PAE_INREPL;
-			}
-			else if (!t_isspace(str))
-				ts_error(ERROR, "Affix parse error at %d line", line);
-		}
-		else if (state == PAE_INREPL)
-		{
-			if (t_iseq(str, '#'))
-			{
-				*prepl = '\0';
-				break;
-			}
-			else if (t_isalpha(str))
-			{
-				COPYCHAR(prepl, str);
-				prepl += pg_mblen(str);
-			}
-			else if (!t_isspace(str))
-				ts_error(ERROR, "Affix parse error at %d line", line);
-		}
-		else
-			ts_error(ERROR, "Unknown state in parse_affentry: %d", state);
-
-		str += pg_mblen(str);
-	}
-
-	*pmask = *pfind = *prepl = '\0';
-
-	return (*mask && (*find || *repl)) ? true : false;
-}
-
-int
-NIImportAffixes(IspellDict * Conf, const char *filename)
-{
-	char		str[BUFSIZ], *pstr = NULL;
-	char		mask[BUFSIZ];
-	char		find[BUFSIZ];
-	char		repl[BUFSIZ];
-	char	   *s;
-	int			suffixes = 0;
-	int			prefixes = 0;
-	int			flag = 0;
-	char		flagflags = 0;
-	FILE	   *affix;
-	int			line = 0;
-	int			oldformat = 0;
-
-	if (!(affix = fopen(filename, "r")))
-		return (1);
-	Conf->compoundcontrol = '\t';
-
-	while (fgets(str, sizeof(str), affix))
-	{
-		line++;
-		if ( *str == '#' || *str == '\n' )
-			continue;
-
-		pg_verifymbstr(str, strlen(str), false);
-		if ( pstr )
-			pfree( pstr );
-		pstr = lowerstr(str);
-		if (STRNCMP(pstr, "compoundwords") == 0)
-		{
-			s = findchar(str, 'l');
-			if (s)
-			{
-				while (*s && !t_isspace(s))
-					s++;
-				while (*s && t_isspace(s))
-					s++;
-				if (*s && pg_mblen(s) == 1)
-					Conf->compoundcontrol = *s;
-				oldformat++;
-				continue;
-			}
-		}
-		if (STRNCMP(pstr, "suffixes") == 0)
-		{
-			suffixes = 1;
-			prefixes = 0;
-			oldformat++;
-			continue;
-		}
-		if (STRNCMP(pstr, "prefixes") == 0)
-		{
-			suffixes = 0;
-			prefixes = 1;
-			oldformat++;
-			continue;
-		}
-		if (STRNCMP(pstr, "flag") == 0)
-		{
-			s = str + 4;
-			flagflags = 0;
-
-			while (*s && t_isspace(s))
-				s++;
-			oldformat++;
-
-			/* allow only single-encoded flags */
-			if (pg_mblen(s) != 1)
-				elog(ERROR, "Multiencoded flag at line %d: %s", line, s);
-
-			if (*s == '*')
-			{
-				flagflags |= FF_CROSSPRODUCT;
-				s++;
-			}
-			else if (*s == '~')
-			{
-				flagflags |= FF_COMPOUNDONLYAFX;
-				s++;
-			}
-
-			if (*s == '\\')
-				s++;
-
-			/* allow only single-encoded flags */
-			if (pg_mblen(s) != 1)
-			{
-				flagflags = 0;
-				elog(ERROR, "Multiencoded flag at line %d: %s", line, s);
-			}
-
-			flag = (unsigned char) *s;
-			continue;
-		}
-		if (STRNCMP(str, "COMPOUNDFLAG") == 0 || STRNCMP(str, "COMPOUNDMIN") == 0 ||
-			STRNCMP(str, "PFX") == 0 || STRNCMP(str, "SFX") == 0)
-		{
-
-			if (oldformat)
-				elog(ERROR, "Wrong affix file format");
-
-			fclose(affix);
-			return NIImportOOAffixes(Conf, filename);
-
-		}
-		if ((!suffixes) && (!prefixes))
-			continue;
-
-		if (!parse_affentry(pstr, mask, find, repl, line)) 
-			continue;
-
-		NIAddAffix(Conf, flag, flagflags, mask, find, repl, suffixes ? FF_SUFFIX : FF_PREFIX);
-	}
-	fclose(affix);
-
-	if ( pstr )
-		pfree( pstr );
-
-	return (0);
-}
-
-int
-NIImportOOAffixes(IspellDict * Conf, const char *filename)
-{
-	char		str[BUFSIZ];
-	char		type[BUFSIZ], *ptype = NULL;
-	char		sflag[BUFSIZ];
-	char		mask[BUFSIZ], *pmask;
-	char		find[BUFSIZ], *pfind;
-	char		repl[BUFSIZ], *prepl;
-	bool		isSuffix = false;
-	int			flag = 0;
-	char		flagflags = 0;
-	FILE	   *affix;
-	int			line = 0;
-	int			scanread = 0;
-	char		scanbuf[BUFSIZ];
-
-	sprintf(scanbuf, "%%6s %%%ds %%%ds %%%ds %%%ds", BUFSIZ / 5, BUFSIZ / 5, BUFSIZ / 5, BUFSIZ / 5);
-
-	if (!(affix = fopen(filename, "r")))
-		return (1);
-	Conf->compoundcontrol = '\t';
-
-	while (fgets(str, sizeof(str), affix))
-	{
-		line++;
-		if (*str == '\0' || t_isspace(str) || t_iseq(str, '#'))
-			continue;
-		pg_verifymbstr(str, strlen(str), false);
-
-		if (STRNCMP(str, "COMPOUNDFLAG") == 0)
-		{
-			char	   *s = str + strlen("COMPOUNDFLAG");
-
-			while (*s && t_isspace(s))
-				s++;
-			if (*s && pg_mblen(s) == 1)
-				Conf->compoundcontrol = *s;
-			continue;
-		}
-
-		scanread = sscanf(str, scanbuf, type, sflag, find, repl, mask);
-
-		if (ptype)
-			pfree(ptype);
-		ptype = lowerstr(type);
-		if (scanread < 4 || (STRNCMP(ptype, "sfx") && STRNCMP(ptype, "pfx")))
-			continue;
-
-		if (scanread == 4)
-		{
-			if (strlen(sflag) != 1)
-				continue;
-			flag = *sflag;
-			isSuffix = (STRNCMP(ptype, "sfx") == 0) ? true : false;
-			pfind = lowerstr(find);
-			if (t_iseq(find, 'y'))
-				flagflags |= FF_CROSSPRODUCT;
-			else
-				flagflags = 0;
-			pfree(pfind);
-		}
-		else
-		{
-			if (strlen(sflag) != 1 || flag != *sflag || flag == 0)
-				continue;
-			prepl = lowerstr(repl);
-			pfind = lowerstr(find);
-			pmask = lowerstr(mask);
-			if (t_iseq(find, '0'))
-				*pfind = '\0';
-			if (t_iseq(repl, '0'))
-				*prepl = '\0';
-
-			NIAddAffix(Conf, flag, flagflags, pmask, pfind, prepl, isSuffix ? FF_SUFFIX : FF_PREFIX);
-			pfree(prepl);
-			pfree(pfind);
-			pfree(pmask);
-		}
-	}
-
-	if (ptype)
-		pfree(ptype);
-	fclose(affix);
-
-	return 0;
-}
-
-static int
-MergeAffix(IspellDict * Conf, int a1, int a2)
-{
-	int			naffix = 0;
-	char	  **ptr = Conf->AffixData;
-
-	while (*ptr)
-	{
-		naffix++;
-		ptr++;
-	}
-
-	Conf->AffixData = (char **) realloc(Conf->AffixData, (naffix + 2) * sizeof(char *));
-	MEMOUT(Conf->AffixData);
-	ptr = Conf->AffixData + naffix;
-	*ptr = malloc(strlen(Conf->AffixData[a1]) + strlen(Conf->AffixData[a2]) + 1 /* space */ + 1 /* \0 */ );
-	MEMOUT(ptr);
-	sprintf(*ptr, "%s %s", Conf->AffixData[a1], Conf->AffixData[a2]);
-	ptr++;
-	*ptr = '\0';
-	return naffix;
-}
-
-
-static SPNode *
-mkSPNode(IspellDict * Conf, int low, int high, int level)
-{
-	int			i;
-	int			nchar = 0;
-	char		lastchar = '\0';
-	SPNode	   *rs;
-	SPNodeData *data;
-	int			lownew = low;
-
-	for (i = low; i < high; i++)
-		if (Conf->Spell[i]->p.d.len > level && lastchar != Conf->Spell[i]->word[level])
-		{
-			nchar++;
-			lastchar = Conf->Spell[i]->word[level];
-		}
-
-	if (!nchar)
-		return NULL;
-
-	rs = (SPNode *) malloc(SPNHDRSZ + nchar * sizeof(SPNodeData));
-	MEMOUT(rs);
-	memset(rs, 0, SPNHDRSZ + nchar * sizeof(SPNodeData));
-	rs->length = nchar;
-	data = rs->data;
-
-	lastchar = '\0';
-	for (i = low; i < high; i++)
-		if (Conf->Spell[i]->p.d.len > level)
-		{
-			if (lastchar != Conf->Spell[i]->word[level])
-			{
-				if (lastchar)
-				{
-					data->node = mkSPNode(Conf, lownew, i, level + 1);
-					lownew = i;
-					data++;
-				}
-				lastchar = Conf->Spell[i]->word[level];
-			}
-			data->val = ((uint8 *) (Conf->Spell[i]->word))[level];
-			if (Conf->Spell[i]->p.d.len == level + 1)
-			{
-				if (data->isword && data->affix != Conf->Spell[i]->p.d.affix)
-				{
-					/*
-					 * fprintf(stderr,"Word already exists: %s (affixes: '%s'
-					 * and '%s')\n", Conf->Spell[i]->word,
-					 * Conf->AffixData[data->affix],
-					 * Conf->AffixData[Conf->Spell[i]->p.d.affix] );
-					 */
-					/* MergeAffix called a few times */
-					data->affix = MergeAffix(Conf, data->affix, Conf->Spell[i]->p.d.affix);
-				}
-				else
-					data->affix = Conf->Spell[i]->p.d.affix;
-				data->isword = 1;
-				if (strchr(Conf->AffixData[data->affix], Conf->compoundcontrol))
-					data->compoundallow = 1;
-			}
-		}
-
-	data->node = mkSPNode(Conf, lownew, high, level + 1);
-
-	return rs;
-}
-
-void
-NISortDictionary(IspellDict * Conf)
-{
-	size_t		i;
-	int			naffix = 3;
-
-	/* compress affixes */
-	qsort((void *) Conf->Spell, Conf->nspell, sizeof(SPELL *), cmpspellaffix);
-	for (i = 1; i < Conf->nspell; i++)
-		if (strcmp(Conf->Spell[i]->p.flag, Conf->Spell[i - 1]->p.flag))
-			naffix++;
-
-	Conf->AffixData = (char **) malloc(naffix * sizeof(char *));
-	MEMOUT(Conf->AffixData);
-	memset(Conf->AffixData, 0, naffix * sizeof(char *));
-	naffix = 1;
-	Conf->AffixData[0] = strdup("");
-	MEMOUT(Conf->AffixData[0]);
-	Conf->AffixData[1] = strdup(Conf->Spell[0]->p.flag);
-	MEMOUT(Conf->AffixData[1]);
-	Conf->Spell[0]->p.d.affix = 1;
-	Conf->Spell[0]->p.d.len = strlen(Conf->Spell[0]->word);
-	for (i = 1; i < Conf->nspell; i++)
-	{
-		if (strcmp(Conf->Spell[i]->p.flag, Conf->AffixData[naffix]))
-		{
-			naffix++;
-			Conf->AffixData[naffix] = strdup(Conf->Spell[i]->p.flag);
-			MEMOUT(Conf->AffixData[naffix]);
-		}
-		Conf->Spell[i]->p.d.affix = naffix;
-		Conf->Spell[i]->p.d.len = strlen(Conf->Spell[i]->word);
-	}
-
-	qsort((void *) Conf->Spell, Conf->nspell, sizeof(SPELL *), cmpspell);
-	Conf->Dictionary = mkSPNode(Conf, 0, Conf->nspell, 0);
-
-	for (i = 0; i < Conf->nspell; i++)
-		pfree(Conf->Spell[i]);
-	pfree(Conf->Spell);
-	Conf->Spell = NULL;
-}
-
-static AffixNode *
-mkANode(IspellDict * Conf, int low, int high, int level, int type)
-{
-	int			i;
-	int			nchar = 0;
-	uint8		lastchar = '\0';
-	AffixNode  *rs;
-	AffixNodeData *data;
-	int			lownew = low;
-
-	for (i = low; i < high; i++)
-		if (Conf->Affix[i].replen > level && lastchar != GETCHAR(Conf->Affix + i, level, type))
-		{
-			nchar++;
-			lastchar = GETCHAR(Conf->Affix + i, level, type);
-		}
-
-	if (!nchar)
-		return NULL;
-
-	rs = (AffixNode *) malloc(ANHRDSZ + nchar * sizeof(AffixNodeData));
-	MEMOUT(rs);
-	memset(rs, 0, ANHRDSZ + nchar * sizeof(AffixNodeData));
-	rs->length = nchar;
-	data = rs->data;
-
-	lastchar = '\0';
-	for (i = low; i < high; i++)
-		if (Conf->Affix[i].replen > level)
-		{
-			if (lastchar != GETCHAR(Conf->Affix + i, level, type))
-			{
-				if (lastchar)
-				{
-					data->node = mkANode(Conf, lownew, i, level + 1, type);
-					lownew = i;
-					data++;
-				}
-				lastchar = GETCHAR(Conf->Affix + i, level, type);
-			}
-			data->val = GETCHAR(Conf->Affix + i, level, type);
-			if (Conf->Affix[i].replen == level + 1)
-			{					/* affix stopped */
-				if (!data->naff)
-				{
-					data->aff = (AFFIX **) malloc(sizeof(AFFIX *) * (high - i + 1));
-					MEMOUT(data->aff);
-				}
-				data->aff[data->naff] = Conf->Affix + i;
-				data->naff++;
-			}
-		}
-
-	data->node = mkANode(Conf, lownew, high, level + 1, type);
-
-	return rs;
-}
-
-static void
-mkVoidAffix(IspellDict * Conf, int issuffix, int startsuffix)
-{
-	int			i,
-				cnt = 0;
-	int			start = (issuffix) ? startsuffix : 0;
-	int			end = (issuffix) ? Conf->naffixes : startsuffix;
-	AffixNode  *Affix = (AffixNode *) malloc(ANHRDSZ + sizeof(AffixNodeData));
-
-	MEMOUT(Affix);
-	memset(Affix, 0, ANHRDSZ + sizeof(AffixNodeData));
-	Affix->length = 1;
-	Affix->isvoid = 1;
-
-	if (issuffix)
-	{
-		Affix->data->node = Conf->Suffix;
-		Conf->Suffix = Affix;
-	}
-	else
-	{
-		Affix->data->node = Conf->Prefix;
-		Conf->Prefix = Affix;
-	}
-
-
-	for (i = start; i < end; i++)
-		if (Conf->Affix[i].replen == 0)
-			cnt++;
-
-	if (cnt == 0)
-		return;
-
-	Affix->data->aff = (AFFIX **) malloc(sizeof(AFFIX *) * cnt);
-	MEMOUT(Affix->data->aff);
-	Affix->data->naff = (uint32) cnt;
-
-	cnt = 0;
-	for (i = start; i < end; i++)
-		if (Conf->Affix[i].replen == 0)
-		{
-			Affix->data->aff[cnt] = Conf->Affix + i;
-			cnt++;
-		}
-}
-
-void
-NISortAffixes(IspellDict * Conf)
-{
-	AFFIX	   *Affix;
-	size_t		i;
-	CMPDAffix  *ptr;
-	int			firstsuffix = -1;
-
-	if (Conf->naffixes == 0)
-		return;
-
-	if (Conf->naffixes > 1)
-		qsort((void *) Conf->Affix, Conf->naffixes, sizeof(AFFIX), cmpaffix);
-	Conf->CompoundAffix = ptr = (CMPDAffix *) malloc(sizeof(CMPDAffix) * Conf->naffixes);
-	MEMOUT(Conf->CompoundAffix);
-	ptr->affix = NULL;
-
-	for (i = 0; i < Conf->naffixes; i++)
-	{
-		Affix = &(((AFFIX *) Conf->Affix)[i]);
-		if (Affix->type == FF_SUFFIX)
-		{
-			if (firstsuffix < 0)
-				firstsuffix = i;
-			if ((Affix->flagflags & FF_COMPOUNDONLYAFX) && Affix->replen > 0)
-			{
-				if (ptr == Conf->CompoundAffix ||
-					strbncmp((const unsigned char *) (ptr - 1)->affix,
-							 (const unsigned char *) Affix->repl,
-							 (ptr - 1)->len))
-				{
-					/* leave only unique and minimals suffixes */
-					ptr->affix = Affix->repl;
-					ptr->len = Affix->replen;
-					ptr++;
-				}
-			}
-		}
-	}
-	ptr->affix = NULL;
-	Conf->CompoundAffix = (CMPDAffix *) realloc(Conf->CompoundAffix, sizeof(CMPDAffix) * (ptr - Conf->CompoundAffix + 1));
-
-	Conf->Prefix = mkANode(Conf, 0, firstsuffix, 0, FF_PREFIX);
-	Conf->Suffix = mkANode(Conf, firstsuffix, Conf->naffixes, 0, FF_SUFFIX);
-	mkVoidAffix(Conf, 1, firstsuffix);
-	mkVoidAffix(Conf, 0, firstsuffix);
-}
-
-static AffixNodeData *
-FinfAffixes(AffixNode * node, const char *word, int wrdlen, int *level, int type)
-{
-	AffixNodeData *StopLow,
-			   *StopHigh,
-			   *StopMiddle;
-	uint8		symbol;
-
-	if (node->isvoid)
-	{							/* search void affixes */
-		if (node->data->naff)
-			return node->data;
-		node = node->data->node;
-	}
-
-	while (node && *level < wrdlen)
-	{
-		StopLow = node->data;
-		StopHigh = node->data + node->length;
-		while (StopLow < StopHigh)
-		{
-			StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
-			symbol = GETWCHAR(word, wrdlen, *level, type);
-			if (StopMiddle->val == symbol)
-			{
-				(*level)++;
-				if (StopMiddle->naff)
-					return StopMiddle;
-				node = StopMiddle->node;
-				break;
-			}
-			else if (StopMiddle->val < symbol)
-				StopLow = StopMiddle + 1;
-			else
-				StopHigh = StopMiddle;
-		}
-		if (StopLow >= StopHigh)
-			break;
-	}
-	return NULL;
-}
-
-static char *
-CheckAffix(const char *word, size_t len, AFFIX * Affix, char flagflags, char *newword, int *baselen)
-{
-
-	if (flagflags & FF_COMPOUNDONLYAFX)
-	{
-		if ((Affix->flagflags & FF_COMPOUNDONLYAFX) == 0)
-			return NULL;
-	}
-	else
-	{
-		if (Affix->flagflags & FF_COMPOUNDONLYAFX)
-			return NULL;
-	}
-
-	if (Affix->type == FF_SUFFIX)
-	{
-		strcpy(newword, word);
-		strcpy(newword + len - Affix->replen, Affix->find);
-		if (baselen)			/* store length of non-changed part of word */
-			*baselen = len - Affix->replen;
-	}
-	else
-	{
-		/*
-		 * if prefix is a all non-chaged part's length then all word contains
-		 * only prefix and suffix, so out
-		 */
-		if (baselen && *baselen + strlen(Affix->find) <= Affix->replen)
-			return NULL;
-		strcpy(newword, Affix->find);
-		strcat(newword, word + Affix->replen);
-	}
-
-	if (Affix->issimple)
-		return newword;
-	else if (Affix->isregis)
-	{
-		if (Affix->compile)
-		{
-			RS_compile(&(Affix->reg.regis), (Affix->type == FF_SUFFIX) ? true : false, Affix->mask);
-			Affix->compile = 0;
-		}
-		if (RS_execute(&(Affix->reg.regis), newword))
-			return newword;
-	}
-	else
-	{
-		int			err;
-		pg_wchar   *data;
-		size_t		data_len;
-		int			newword_len;
-
-		if (Affix->compile)
-		{
-			int			wmasklen,
-						masklen = strlen(Affix->mask);
-			pg_wchar   *mask;
-
-			mask = (pg_wchar *) palloc((masklen + 1) * sizeof(pg_wchar));
-			wmasklen = pg_mb2wchar_with_len(Affix->mask, mask, masklen);
-
-			err = pg_regcomp(&(Affix->reg.regex), mask, wmasklen, REG_ADVANCED | REG_NOSUB);
-			pfree(mask);
-			if (err)
-			{
-				char		regerrstr[ERRSTRSIZE];
-
-				pg_regerror(err, &(Affix->reg.regex), regerrstr, ERRSTRSIZE);
-				elog(ERROR, "regex error in '%s': %s", Affix->mask, regerrstr);
-			}
-			Affix->compile = 0;
-		}
-
-		/* Convert data string to wide characters */
-		newword_len = strlen(newword);
-		data = (pg_wchar *) palloc((newword_len + 1) * sizeof(pg_wchar));
-		data_len = pg_mb2wchar_with_len(newword, data, newword_len);
-
-		if (!(err = pg_regexec(&(Affix->reg.regex), data, data_len, 0, NULL, 0, NULL, 0)))
-		{
-			pfree(data);
-			return newword;
-		}
-		pfree(data);
-	}
-
-	return NULL;
-}
-
-
-static char **
-NormalizeSubWord(IspellDict * Conf, char *word, char flag)
-{
-	AffixNodeData *suffix = NULL,
-			   *prefix = NULL;
-	int			slevel = 0,
-				plevel = 0;
-	int			wrdlen = strlen(word),
-				swrdlen;
-	char	  **forms;
-	char	  **cur;
-	char		newword[2 * MAXNORMLEN] = "";
-	char		pnewword[2 * MAXNORMLEN] = "";
-	AffixNode  *snode = Conf->Suffix,
-			   *pnode;
-	int			i,
-				j;
-
-	if (wrdlen > MAXNORMLEN)
-		return NULL;
-	cur = forms = (char **) palloc(MAX_NORM * sizeof(char *));
-	*cur = NULL;
-
-
-	/* Check that the word itself is normal form */
-	if (FindWord(Conf, word, 0, flag & FF_COMPOUNDWORD))
-	{
-		*cur = pstrdup(word);
-		cur++;
-		*cur = NULL;
-	}
-
-	/* Find all other NORMAL forms of the 'word' (check only prefix) */
-	pnode = Conf->Prefix;
-	plevel = 0;
-	while (pnode)
-	{
-		prefix = FinfAffixes(pnode, word, wrdlen, &plevel, FF_PREFIX);
-		if (!prefix)
-			break;
-		for (j = 0; j < prefix->naff; j++)
-		{
-			if (CheckAffix(word, wrdlen, prefix->aff[j], flag, newword, NULL))
-			{
-				/* prefix success */
-				if (FindWord(Conf, newword, prefix->aff[j]->flag, flag & FF_COMPOUNDWORD) && (cur - forms) < (MAX_NORM - 1))
-				{
-					/* word search success */
-					*cur = pstrdup(newword);
-					cur++;
-					*cur = NULL;
-				}
-			}
-		}
-		pnode = prefix->node;
-	}
-
-	/*
-	 * Find all other NORMAL forms of the 'word' (check suffix and then
-	 * prefix)
-	 */
-	while (snode)
-	{
-		int			baselen = 0;
-
-		/* find possible suffix */
-		suffix = FinfAffixes(snode, word, wrdlen, &slevel, FF_SUFFIX);
-		if (!suffix)
-			break;
-		/* foreach suffix check affix */
-		for (i = 0; i < suffix->naff; i++)
-		{
-			if (CheckAffix(word, wrdlen, suffix->aff[i], flag, newword, &baselen))
-			{
-				/* suffix success */
-				if (FindWord(Conf, newword, suffix->aff[i]->flag, flag & FF_COMPOUNDWORD) && (cur - forms) < (MAX_NORM - 1))
-				{
-					/* word search success */
-					*cur = pstrdup(newword);
-					cur++;
-					*cur = NULL;
-				}
-				/* now we will look changed word with prefixes */
-				pnode = Conf->Prefix;
-				plevel = 0;
-				swrdlen = strlen(newword);
-				while (pnode)
-				{
-					prefix = FinfAffixes(pnode, newword, swrdlen, &plevel, FF_PREFIX);
-					if (!prefix)
-						break;
-					for (j = 0; j < prefix->naff; j++)
-					{
-						if (CheckAffix(newword, swrdlen, prefix->aff[j], flag, pnewword, &baselen))
-						{
-							/* prefix success */
-							int			ff = (prefix->aff[j]->flagflags & suffix->aff[i]->flagflags & FF_CROSSPRODUCT) ?
-							0 : prefix->aff[j]->flag;
-
-							if (FindWord(Conf, pnewword, ff, flag & FF_COMPOUNDWORD) && (cur - forms) < (MAX_NORM - 1))
-							{
-								/* word search success */
-								*cur = pstrdup(pnewword);
-								cur++;
-								*cur = NULL;
-							}
-						}
-					}
-					pnode = prefix->node;
-				}
-			}
-		}
-
-		snode = suffix->node;
-	}
-
-	if (cur == forms)
-	{
-		pfree(forms);
-		return (NULL);
-	}
-	return (forms);
-}
-
-typedef struct SplitVar
-{
-	int			nstem;
-	char	  **stem;
-	struct SplitVar *next;
-}	SplitVar;
-
-static int
-CheckCompoundAffixes(CMPDAffix ** ptr, char *word, int len, bool CheckInPlace)
-{
-	if (CheckInPlace)
-	{
-		while ((*ptr)->affix)
-		{
-			if (len > (*ptr)->len && strncmp((*ptr)->affix, word, (*ptr)->len) == 0)
-			{
-				len = (*ptr)->len;
-				(*ptr)++;
-				return len;
-			}
-			(*ptr)++;
-		}
-	}
-	else
-	{
-		char	   *affbegin;
-
-		while ((*ptr)->affix)
-		{
-			if (len > (*ptr)->len && (affbegin = strstr(word, (*ptr)->affix)) != NULL)
-			{
-				len = (*ptr)->len + (affbegin - word);
-				(*ptr)++;
-				return len;
-			}
-			(*ptr)++;
-		}
-	}
-	return 0;
-}
-
-static SplitVar *
-CopyVar(SplitVar * s, int makedup)
-{
-	SplitVar   *v = (SplitVar *) palloc(sizeof(SplitVar));
-
-	v->stem = (char **) palloc(sizeof(char *) * (MAX_NORM));
-	v->next = NULL;
-	if (s)
-	{
-		int			i;
-
-		v->nstem = s->nstem;
-		for (i = 0; i < s->nstem; i++)
-			v->stem[i] = (makedup) ? pstrdup(s->stem[i]) : s->stem[i];
-	}
-	else
-		v->nstem = 0;
-	return v;
-}
-
-
-static SplitVar *
-SplitToVariants(IspellDict * Conf, SPNode * snode, SplitVar * orig, char *word, int wordlen, int startpos, int minpos)
-{
-	SplitVar   *var = NULL;
-	SPNodeData *StopLow,
-			   *StopHigh,
-			   *StopMiddle = NULL;
-	SPNode	   *node = (snode) ? snode : Conf->Dictionary;
-	int			level = (snode) ? minpos : startpos;	/* recursive
-														 * minpos==level */
-	int			lenaff;
-	CMPDAffix  *caff;
-	char	   *notprobed;
-
-	notprobed = (char *) palloc(wordlen);
-	memset(notprobed, 1, wordlen);
-	var = CopyVar(orig, 1);
-
-	while (level < wordlen)
-	{
-		/* find word with epenthetic or/and compound suffix */
-		caff = Conf->CompoundAffix;
-		while (level > startpos && (lenaff = CheckCompoundAffixes(&caff, word + level, wordlen - level, (node) ? true : false)) > 0)
-		{
-			/*
-			 * there is one of compound suffixes, so check word for existings
-			 */
-			char		buf[MAXNORMLEN];
-			char	  **subres;
-
-			lenaff = level - startpos + lenaff;
-
-			if (!notprobed[startpos + lenaff - 1])
-				continue;
-
-			if (level + lenaff - 1 <= minpos)
-				continue;
-
-			memcpy(buf, word + startpos, lenaff);
-			buf[lenaff] = '\0';
-
-			subres = NormalizeSubWord(Conf, buf, FF_COMPOUNDWORD | FF_COMPOUNDONLYAFX);
-			if (subres)
-			{
-				/* Yes, it was a word from dictionary */
-				SplitVar   *new = CopyVar(var, 0);
-				SplitVar   *ptr = var;
-				char	  **sptr = subres;
-
-				notprobed[startpos + lenaff - 1] = 0;
-
-				while (*sptr)
-				{
-					new->stem[new->nstem] = *sptr;
-					new->nstem++;
-					sptr++;
-				}
-				pfree(subres);
-
-				while (ptr->next)
-					ptr = ptr->next;
-				ptr->next = SplitToVariants(Conf, NULL, new, word, wordlen, startpos + lenaff, startpos + lenaff);
-
-				pfree(new->stem);
-				pfree(new);
-			}
-		}
-
-		if (!node)
-			break;
-
-		StopLow = node->data;
-		StopHigh = node->data + node->length;
-		while (StopLow < StopHigh)
-		{
-			StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
-			if (StopMiddle->val == ((uint8 *) (word))[level])
-				break;
-			else if (StopMiddle->val < ((uint8 *) (word))[level])
-				StopLow = StopMiddle + 1;
-			else
-				StopHigh = StopMiddle;
-		}
-
-		if (StopLow < StopHigh)
-		{
-
-			/* find infinitive */
-			if (StopMiddle->isword && StopMiddle->compoundallow && notprobed[level])
-			{
-				/* ok, we found full compoundallowed word */
-				if (level > minpos)
-				{
-					/* and its length more than minimal */
-					if (wordlen == level + 1)
-					{
-						/* well, it was last word */
-						var->stem[var->nstem] = strnduplicate(word + startpos, wordlen - startpos);
-						var->nstem++;
-						pfree(notprobed);
-						return var;
-					}
-					else
-					{
-						/* then we will search more big word at the same point */
-						SplitVar   *ptr = var;
-
-						while (ptr->next)
-							ptr = ptr->next;
-						ptr->next = SplitToVariants(Conf, node, var, word, wordlen, startpos, level);
-						/* we can find next word */
-						level++;
-						var->stem[var->nstem] = strnduplicate(word + startpos, level - startpos);
-						var->nstem++;
-						node = Conf->Dictionary;
-						startpos = level;
-						continue;
-					}
-				}
-			}
-			node = StopMiddle->node;
-		}
-		else
-			node = NULL;
-		level++;
-	}
-
-	var->stem[var->nstem] = strnduplicate(word + startpos, wordlen - startpos);
-	var->nstem++;
-	pfree(notprobed);
-	return var;
-}
-
-TSLexeme *
-NINormalizeWord(IspellDict * Conf, char *uword)
-{
-	char	  **res;
-	char	   *word;
-	TSLexeme   *lcur = NULL,
-			   *lres = NULL;
-	uint16		NVariant = 1;
-
-	word = lowerstr(uword);
-	res = NormalizeSubWord(Conf, word, 0);
-
-	if (res)
-	{
-		char	  **ptr = res;
-
-		lcur = lres = (TSLexeme *) palloc(MAX_NORM * sizeof(TSLexeme));
-		while (*ptr)
-		{
-			lcur->lexeme = *ptr;
-			lcur->flags = 0;
-			lcur->nvariant = NVariant++;
-			lcur++;
-			ptr++;
-		}
-		lcur->lexeme = NULL;
-		pfree(res);
-	}
-
-	if (Conf->compoundcontrol != '\t')
-	{
-		int			wordlen = strlen(word);
-		SplitVar   *ptr,
-				   *var = SplitToVariants(Conf, NULL, NULL, word, wordlen, 0, -1);
-		int			i;
-
-		while (var)
-		{
-			if (var->nstem > 1)
-			{
-				char	  **subres = NormalizeSubWord(Conf, var->stem[var->nstem - 1], FF_COMPOUNDWORD);
-
-				if (subres)
-				{
-					char	  **subptr = subres;
-
-					if (!lcur)
-						lcur = lres = (TSLexeme *) palloc(MAX_NORM * sizeof(TSLexeme));
-
-					while (*subptr)
-					{
-						for (i = 0; i < var->nstem - 1; i++)
-						{
-							lcur->lexeme = (subptr == subres) ? var->stem[i] : pstrdup(var->stem[i]);
-							lcur->flags = 0;
-							lcur->nvariant = NVariant;
-							lcur++;
-						}
-
-						lcur->lexeme = *subptr;
-						lcur->flags = 0;
-						lcur->nvariant = NVariant;
-						lcur++;
-						subptr++;
-						NVariant++;
-					}
-
-					lcur->lexeme = NULL;
-					pfree(subres);
-					var->stem[0] = NULL;
-					pfree(var->stem[var->nstem - 1]);
-				}
-			}
-
-			for (i = 0; i < var->nstem && var->stem[i]; i++)
-				pfree(var->stem[i]);
-			ptr = var->next;
-			pfree(var->stem);
-			pfree(var);
-			var = ptr;
-		}
-	}
-
-	pfree(word);
-
-	return lres;
-}
-
-
-static void
-freeSPNode(SPNode * node)
-{
-	SPNodeData *data;
-
-	if (!node)
-		return;
-	data = node->data;
-	while (node->length)
-	{
-		freeSPNode(data->node);
-		data++;
-		node->length--;
-	}
-	free(node);
-}
-
-static void
-freeANode(AffixNode * node)
-{
-	AffixNodeData *data;
-
-	if (!node)
-		return;
-	data = node->data;
-	while (node->length)
-	{
-		freeANode(data->node);
-		if (data->naff)
-			free(data->aff);
-		data++;
-		node->length--;
-	}
-	free(node);
-}
-
-
-void
-NIFree(IspellDict * Conf)
-{
-	int			i;
-	AFFIX	   *Affix = (AFFIX *) Conf->Affix;
-	char	  **aff = Conf->AffixData;
-
-	if (aff)
-	{
-		while (*aff)
-		{
-			free(*aff);
-			aff++;
-		}
-		free(Conf->AffixData);
-	}
-
-
-	for (i = 0; i < Conf->naffixes; i++)
-	{
-		if (Affix[i].compile == 0)
-		{
-			if (Affix[i].isregis)
-				RS_free(&(Affix[i].reg.regis));
-			else
-				pg_regfree(&(Affix[i].reg.regex));
-		}
-		if (Affix[i].mask != VoidString)
-			free(Affix[i].mask);
-		if (Affix[i].find != VoidString)
-			free(Affix[i].find);
-		if (Affix[i].repl != VoidString)
-			free(Affix[i].repl);
-	}
-	if (Conf->Spell)
-	{
-		for (i = 0; i < Conf->nspell; i++)
-			pfree(Conf->Spell[i]);
-		pfree(Conf->Spell);
-	}
-
-	if (Conf->Affix)
-		free(Conf->Affix);
-	if (Conf->CompoundAffix)
-		free(Conf->CompoundAffix);
-	freeSPNode(Conf->Dictionary);
-	freeANode(Conf->Suffix);
-	freeANode(Conf->Prefix);
-	memset((void *) Conf, 0, sizeof(IspellDict));
-	return;
-}
diff --git a/contrib/tsearch2/ispell/spell.h b/contrib/tsearch2/ispell/spell.h
deleted file mode 100644
index 2b79f455a308..000000000000
--- a/contrib/tsearch2/ispell/spell.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifndef __SPELL_H__
-#define __SPELL_H__
-
-#include "c.h"
-
-#include <sys/types.h>
-
-#include "regex/regex.h"
-
-#include "regis.h"
-#include "dict.h"
-
-struct SPNode;
-
-
-typedef struct
-{
-	uint32
-				val:8,
-				isword:1,
-				compoundallow:1,
-				affix:22;
-	struct SPNode *node;
-}	SPNodeData;
-
-typedef struct SPNode
-{
-	uint32		length;
-	SPNodeData	data[1];
-}	SPNode;
-
-#define SPNHDRSZ	(offsetof(SPNode,data))
-
-
-typedef struct spell_struct
-{
-	union
-	{
-		char		flag[16];
-		struct
-		{
-			int			affix;
-			int			len;
-		}			d;
-	}			p;
-	char		word[1];
-}	SPELL;
-
-#define SPELLHDRSZ	(offsetof(SPELL, word))
-
-typedef struct aff_struct
-{
-	uint32
-				flag:8,
-				type:2,
-				compile:1,
-				flagflags:3,
-				issimple:1,
-				isregis:1,
-				unused:1,
-				replen:16;
-	char	   *mask;
-	char	   *find;
-	char	   *repl;
-	union
-	{
-		regex_t		regex;
-		Regis		regis;
-	}			reg;
-}	AFFIX;
-
-#define FF_CROSSPRODUCT		0x01
-#define FF_COMPOUNDWORD		0x02
-#define FF_COMPOUNDONLYAFX		0x04
-#define FF_SUFFIX				2
-#define FF_PREFIX				1
-
-struct AffixNode;
-
-typedef struct
-{
-	uint32
-				val:8,
-				naff:24;
-	AFFIX	  **aff;
-	struct AffixNode *node;
-}	AffixNodeData;
-
-typedef struct AffixNode
-{
-	uint32		isvoid:1,
-				length:31;
-	AffixNodeData data[1];
-}	AffixNode;
-
-#define ANHRDSZ		   (offsetof(AffixNode, data))
-
-typedef struct
-{
-	char	   *affix;
-	int			len;
-}	CMPDAffix;
-
-typedef struct
-{
-	int			maffixes;
-	int			naffixes;
-	AFFIX	   *Affix;
-	char		compoundcontrol;
-
-	int			nspell;
-	int			mspell;
-	SPELL	  **Spell;
-
-	AffixNode  *Suffix;
-	AffixNode  *Prefix;
-
-	SPNode	   *Dictionary;
-	char	  **AffixData;
-	CMPDAffix  *CompoundAffix;
-
-}	IspellDict;
-
-TSLexeme   *NINormalizeWord(IspellDict * Conf, char *word);
-int			NIImportAffixes(IspellDict * Conf, const char *filename);
-int			NIImportOOAffixes(IspellDict * Conf, const char *filename);
-int			NIImportDictionary(IspellDict * Conf, const char *filename);
-
-int			NIAddSpell(IspellDict * Conf, const char *word, const char *flag);
-int			NIAddAffix(IspellDict * Conf, int flag, char flagflags, const char *mask, const char *find, const char *repl, int type);
-void		NISortDictionary(IspellDict * Conf);
-void		NISortAffixes(IspellDict * Conf);
-void		NIFree(IspellDict * Conf);
-
-#endif
diff --git a/contrib/tsearch2/my2ispell/Makefile b/contrib/tsearch2/my2ispell/Makefile
deleted file mode 100644
index 426129a8df9d..000000000000
--- a/contrib/tsearch2/my2ispell/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-ZIPFILE=nb_NO
-LANGUAGE=norsk
-
-
-UNZIP=unzip -o
-
-
-all: $(LANGUAGE).dict $(LANGUAGE).aff
-
-$(ZIPFILE).aff: $(ZIPFILE).zip
-	$(UNZIP) $? $@
-	touch $@ 
-
-
-# 1 Cleanup dictionary
-# 2 remove " symbol
-# 3 add compoundwords controlled flag to word which hasn't it, but
-#   has compound only suffixes
-
-$(LANGUAGE).dict: $(ZIPFILE).zip
-	$(UNZIP) $? $(ZIPFILE).dic
-	grep -v -E '^[[:digit:]]+$$' < $(ZIPFILE).dic \
-	 | grep -v '\.' \
-	 | sed -e 's/"//g' \
-	 | perl -pi -e 's|/(\S+)| $$q=$$1; ( $$q=~/[\\_`]/ && $$q!~/z/ ) ? "/$${q}z" : "/$${q}"|e' \
-	 | sort \
-	> $@
-
-#just convert affix file
-
-$(LANGUAGE).aff: $(ZIPFILE).aff 
-	grep -v -i zyzyzy $(ZIPFILE).aff \
-	 | grep -v -i zyzyzy \
-	 | perl -pi \
-		-e 's/^COMPOUNDFLAG\s+(\S+)/compoundwords controlled $$1/;' \
-	        -e 's/^COMPOUNDMIN\s+(\d+)/compoundmin $$1/;' \
-	        -e 's/^PFX\s+(\S+)\s+([YN])\s+\d+.*$$/ if ( !$$wasprf ) { $$wasprf=1; "prefixes\n\nflag $$1:" } else { "flag $$1:" } /e;' \
-	        -e 's/^PFX\s+\S+\s+(\S+)\s+(\S+)\s+(\S+)/ uc("   $$3    > $$2")/e;' \
-	        -e 's/^(.*)SFX\s+(\S+)\s+([YN])\s+\d+.*$$/ $$flg=($$3 eq "Y") ? "*" : ""; $$flg="~$$flg" if length $$1; $$q=$$2; $$q="\\$$q" if $$q!~m#[a-zA-Z]#; if ( !$$wassfx ) { $$wassfx=1; "suffixes\n\nflag $$flg$$q:" } else { "flag $$flg$$q:" } /e;' \
-	        -e 's/^.*SFX\s+\S+\s+(\S+)\s+(\S+)\s+(\S+)/ uc("   $$3    > ".( ($$1 eq "0") ? "" : "-$$1,").( ($$2 eq "0") ? "" : "$$2") )/e;' \
-		-e 's/^(SET|TRY)/#$$1/' \
-	> $@ 
-
-clean:
-	rm -rf $(ZIPFILE).aff $(ZIPFILE).dic $(LANGUAGE).dict $(LANGUAGE).aff 
-
-
diff --git a/contrib/tsearch2/my2ispell/README b/contrib/tsearch2/my2ispell/README
deleted file mode 100644
index 583936ab42ea..000000000000
--- a/contrib/tsearch2/my2ispell/README
+++ /dev/null
@@ -1,12 +0,0 @@
-Utility for convert MySpell dictionary and affix from
-myspell to ispell format.
-Utility tested on nb_NO.zip and nn_NO.zip from
-OpenOffice (http://lingucomponent.openoffice.org/download_dictionary.html)
-
-usage:
-For example, make norwegian dictionary and affix:
-% cp nb_NO.zip my2ispell
-% cd my2ispell
-% gmake ZIPFILE=nb_NO LANGUAGE=norsk 
-
-Author: Teodor Sigaev <teodor@sigaev.ru>
diff --git a/contrib/tsearch2/prs_dcfg.c b/contrib/tsearch2/prs_dcfg.c
deleted file mode 100644
index c519f5f3d4d4..000000000000
--- a/contrib/tsearch2/prs_dcfg.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Simple config parser
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <ctype.h>
-
-#include "dict.h"
-#include "common.h"
-#include "ts_locale.h"
-
-#define CS_WAITKEY	0
-#define CS_INKEY	1
-#define CS_WAITEQ	2
-#define CS_WAITVALUE	3
-#define CS_INVALUE	4
-#define CS_IN2VALUE 5
-#define CS_WAITDELIM	6
-#define CS_INESC	7
-#define CS_IN2ESC	8
-
-static char *
-nstrdup(char *ptr, int len)
-{
-	char	   *res = palloc(len + 1),
-			   *cptr;
-
-	memcpy(res, ptr, len);
-	res[len] = '\0';
-	cptr = ptr = res;
-	while (*ptr)
-	{
-		if (t_iseq(ptr, '\\'))
-			ptr++;
-		COPYCHAR(cptr, ptr);
-		cptr += pg_mblen(ptr);
-		ptr += pg_mblen(ptr);
-	}
-	*cptr = '\0';
-
-	return res;
-}
-
-void
-parse_cfgdict(text *in, Map ** m)
-{
-	Map		   *mptr;
-	char	   *ptr = VARDATA(in),
-			   *begin = NULL;
-	char		num = 0;
-	int			state = CS_WAITKEY;
-
-	while (ptr - VARDATA(in) < VARSIZE(in) - VARHDRSZ)
-	{
-		if (t_iseq(ptr, ','))
-			num++;
-		ptr += pg_mblen(ptr);
-	}
-
-	*m = mptr = (Map *) palloc(sizeof(Map) * (num + 2));
-	memset(mptr, 0, sizeof(Map) * (num + 2));
-	ptr = VARDATA(in);
-	while (ptr - VARDATA(in) < VARSIZE(in) - VARHDRSZ)
-	{
-		if (state == CS_WAITKEY)
-		{
-			if (t_isalpha(ptr))
-			{
-				begin = ptr;
-				state = CS_INKEY;
-			}
-			else if (!t_isspace(ptr))
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error"),
-						 errdetail("Syntax error in position %d.",
-								   (int) (ptr - VARDATA(in)))));
-		}
-		else if (state == CS_INKEY)
-		{
-			if (t_isspace(ptr))
-			{
-				mptr->key = nstrdup(begin, ptr - begin);
-				state = CS_WAITEQ;
-			}
-			else if (t_iseq(ptr, '='))
-			{
-				mptr->key = nstrdup(begin, ptr - begin);
-				state = CS_WAITVALUE;
-			}
-			else if (!t_isalpha(ptr))
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error"),
-						 errdetail("Syntax error in position %d.",
-								   (int) (ptr - VARDATA(in)))));
-		}
-		else if (state == CS_WAITEQ)
-		{
-			if (t_iseq(ptr, '='))
-				state = CS_WAITVALUE;
-			else if (!t_isspace(ptr))
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error"),
-						 errdetail("Syntax error in position %d.",
-								   (int) (ptr - VARDATA(in)))));
-		}
-		else if (state == CS_WAITVALUE)
-		{
-			if (t_iseq(ptr, '"'))
-			{
-				begin = ptr + 1;
-				state = CS_INVALUE;
-			}
-			else if (!t_isspace(ptr))
-			{
-				begin = ptr;
-				state = CS_IN2VALUE;
-			}
-		}
-		else if (state == CS_INVALUE)
-		{
-			if (t_iseq(ptr, '"'))
-			{
-				mptr->value = nstrdup(begin, ptr - begin);
-				mptr++;
-				state = CS_WAITDELIM;
-			}
-			else if (t_iseq(ptr, '\\'))
-				state = CS_INESC;
-		}
-		else if (state == CS_IN2VALUE)
-		{
-			if (t_isspace(ptr) || t_iseq(ptr, ','))
-			{
-				mptr->value = nstrdup(begin, ptr - begin);
-				mptr++;
-				state = (t_iseq(ptr, ',')) ? CS_WAITKEY : CS_WAITDELIM;
-			}
-			else if (t_iseq(ptr, '\\'))
-				state = CS_INESC;
-		}
-		else if (state == CS_WAITDELIM)
-		{
-			if (t_iseq(ptr, ','))
-				state = CS_WAITKEY;
-			else if (!t_isspace(ptr))
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error"),
-						 errdetail("Syntax error in position %d.",
-								   (int) (ptr - VARDATA(in)))));
-		}
-		else if (state == CS_INESC)
-			state = CS_INVALUE;
-		else if (state == CS_IN2ESC)
-			state = CS_IN2VALUE;
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("bad parser state"),
-					 errdetail("%d at position %d.",
-							   state, (int) (ptr - VARDATA(in)))));
-		ptr += pg_mblen(ptr);
-	}
-
-	if (state == CS_IN2VALUE)
-	{
-		mptr->value = nstrdup(begin, ptr - begin);
-		mptr++;
-	}
-	else if (!(state == CS_WAITDELIM || state == CS_WAITKEY))
-		ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("unexpected end of line")));
-}
diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
deleted file mode 100644
index 89dbf6f00575..000000000000
--- a/contrib/tsearch2/query.c
+++ /dev/null
@@ -1,1055 +0,0 @@
-/*
- * IO definitions for tsquery and mtsquery. This type
- * are identical, but for parsing mtsquery used parser for text
- * and also morphology is used.
- * Internal structure:
- * query tree, then string with original value.
- * Query tree with plain view. It's means that in array of nodes
- * right child is always next and left position = item+item->left
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <float.h>
-#include <ctype.h>
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-
-#include "ts_cfg.h"
-#include "tsvector.h"
-#include "crc32.h"
-#include "query.h"
-#include "query_cleanup.h"
-#include "common.h"
-#include "ts_locale.h"
-
-PG_FUNCTION_INFO_V1(tsquery_in);
-Datum		tsquery_in(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(tsquery_out);
-Datum		tsquery_out(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(exectsq);
-Datum		exectsq(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(rexectsq);
-Datum		rexectsq(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(tsquerytree);
-Datum		tsquerytree(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(to_tsquery);
-Datum		to_tsquery(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(to_tsquery_name);
-Datum		to_tsquery_name(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(to_tsquery_current);
-Datum		to_tsquery_current(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(plainto_tsquery);
-Datum		plainto_tsquery(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(plainto_tsquery_name);
-Datum		plainto_tsquery_name(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(plainto_tsquery_current);
-Datum		plainto_tsquery_current(PG_FUNCTION_ARGS);
-
-/* parser's states */
-#define WAITOPERAND 1
-#define WAITOPERATOR	2
-#define WAITFIRSTOPERAND 3
-#define WAITSINGLEOPERAND 4
-
-/*
- * node of query tree, also used
- * for storing polish notation in parser
- */
-typedef struct NODE
-{
-	int2		weight;
-	int2		type;
-	int4		val;
-	int2		distance;
-	int2		length;
-	struct NODE *next;
-}	NODE;
-
-typedef struct
-{
-	char	   *buffer;			/* entire string we are scanning */
-	char	   *buf;			/* current scan point */
-	int4		state;
-	int4		count;
-	/* reverse polish notation in list (for temprorary usage) */
-	NODE	   *str;
-	/* number in str */
-	int4		num;
-
-	/* user-friendly operand */
-	int4		lenop;
-	int4		sumlen;
-	char	   *op;
-	char	   *curop;
-
-	/* state for value's parser */
-	TI_IN_STATE valstate;
-
-	/* tscfg */
-	int			cfg_id;
-}	QPRS_STATE;
-
-static char *
-get_weight(char *buf, int2 *weight)
-{
-	*weight = 0;
-
-	if (!t_iseq(buf, ':'))
-		return buf;
-
-	buf++;
-	while (*buf && pg_mblen(buf) == 1)
-	{
-		switch (*buf)
-		{
-			case 'a':
-			case 'A':
-				*weight |= 1 << 3;
-				break;
-			case 'b':
-			case 'B':
-				*weight |= 1 << 2;
-				break;
-			case 'c':
-			case 'C':
-				*weight |= 1 << 1;
-				break;
-			case 'd':
-			case 'D':
-				*weight |= 1;
-				break;
-			default:
-				return buf;
-		}
-		buf++;
-	}
-
-	return buf;
-}
-
-/*
- * get token from query string
- */
-static int4
-gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval, int2 *weight)
-{
-	while (1)
-	{
-		switch (state->state)
-		{
-			case WAITFIRSTOPERAND:
-			case WAITOPERAND:
-				if (t_iseq(state->buf, '!'))
-				{
-					(state->buf)++;		/* can safely ++, t_iseq guarantee
-										 * that pg_mblen()==1 */
-					*val = (int4) '!';
-					state->state = WAITOPERAND;
-					return OPR;
-				}
-				else if (t_iseq(state->buf, '('))
-				{
-					state->count++;
-					(state->buf)++;
-					state->state = WAITOPERAND;
-					return OPEN;
-				}
-				else if (t_iseq(state->buf, ':'))
-				{
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("error at start of operand in tsearch query: \"%s\"",
-									state->buffer)));
-				}
-				else if (!t_isspace(state->buf))
-				{
-					state->valstate.prsbuf = state->buf;
-					if (gettoken_tsvector(&(state->valstate)))
-					{
-						*strval = state->valstate.word;
-						*lenval = state->valstate.curpos - state->valstate.word;
-						state->buf = get_weight(state->valstate.prsbuf, weight);
-						state->state = WAITOPERATOR;
-						return VAL;
-					}
-					else if (state->state == WAITFIRSTOPERAND)
-						return END;
-					else
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("no operand in tsearch query: \"%s\"",
-										state->buffer)));
-				}
-				break;
-			case WAITOPERATOR:
-				if (t_iseq(state->buf, '&') || t_iseq(state->buf, '|'))
-				{
-					state->state = WAITOPERAND;
-					*val = (int4) *(state->buf);
-					(state->buf)++;
-					return OPR;
-				}
-				else if (t_iseq(state->buf, ')'))
-				{
-					(state->buf)++;
-					state->count--;
-					return (state->count < 0) ? ERR : CLOSE;
-				}
-				else if (*(state->buf) == '\0')
-					return (state->count) ? ERR : END;
-				else if (!t_isspace(state->buf))
-					return ERR;
-				break;
-			case WAITSINGLEOPERAND:
-				if (*(state->buf) == '\0')
-					return END;
-				*strval = state->buf;
-				*lenval = strlen(state->buf);
-				state->buf += strlen(state->buf);
-				state->count++;
-				return VAL;
-			default:
-				return ERR;
-				break;
-		}
-		state->buf += pg_mblen(state->buf);
-	}
-	return END;
-}
-
-/*
- * push new one in polish notation reverse view
- */
-static void
-pushquery(QPRS_STATE * state, int4 type, int4 val, int4 distance, int4 lenval, int2 weight)
-{
-	NODE	   *tmp = (NODE *) palloc(sizeof(NODE));
-
-	tmp->weight = weight;
-	tmp->type = type;
-	tmp->val = val;
-	if (distance >= MAXSTRPOS)
-		ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("value is too big in tsearch query: \"%s\"",
-						state->buffer)));
-	if (lenval >= MAXSTRLEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("operand is too long in tsearch query: \"%s\"",
-						state->buffer)));
-	tmp->distance = distance;
-	tmp->length = lenval;
-	tmp->next = state->str;
-	state->str = tmp;
-	state->num++;
-}
-
-/*
- * This function is used for tsquery parsing
- */
-static void
-pushval_asis(QPRS_STATE * state, int type, char *strval, int lenval, int2 weight)
-{
-	if (lenval >= MAXSTRLEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("word is too long in tsearch query: \"%s\"",
-						state->buffer)));
-
-	pushquery(state, type, crc32_sz(strval, lenval),
-			  state->curop - state->op, lenval, weight);
-
-	while (state->curop - state->op + lenval + 1 >= state->lenop)
-	{
-		int4		tmp = state->curop - state->op;
-
-		state->lenop *= 2;
-		state->op = (char *) repalloc((void *) state->op, state->lenop);
-		state->curop = state->op + tmp;
-	}
-	memcpy((void *) state->curop, (void *) strval, lenval);
-	state->curop += lenval;
-	*(state->curop) = '\0';
-	state->curop++;
-	state->sumlen += lenval + 1;
-	return;
-}
-
-/*
- * This function is used for morph parsing
- */
-static void
-pushval_morph(QPRS_STATE * state, int typeval, char *strval, int lenval, int2 weight)
-{
-	int4		count = 0;
-	PRSTEXT		prs;
-	uint32		variant,
-				pos,
-				cntvar = 0,
-				cntpos = 0,
-				cnt = 0;
-
-	prs.lenwords = 32;
-	prs.curwords = 0;
-	prs.pos = 0;
-	prs.words = (TSWORD *) palloc(sizeof(TSWORD) * prs.lenwords);
-
-	parsetext_v2(findcfg(state->cfg_id), &prs, strval, lenval);
-
-	if (prs.curwords > 0)
-	{
-
-		while (count < prs.curwords)
-		{
-			pos = prs.words[count].pos.pos;
-			cntvar = 0;
-			while (count < prs.curwords && pos == prs.words[count].pos.pos)
-			{
-				variant = prs.words[count].nvariant;
-
-				cnt = 0;
-				while (count < prs.curwords && pos == prs.words[count].pos.pos && variant == prs.words[count].nvariant)
-				{
-
-					pushval_asis(state, VAL, prs.words[count].word, prs.words[count].len, weight);
-					pfree(prs.words[count].word);
-					if (cnt)
-						pushquery(state, OPR, (int4) '&', 0, 0, 0);
-					cnt++;
-					count++;
-				}
-
-				if (cntvar)
-					pushquery(state, OPR, (int4) '|', 0, 0, 0);
-				cntvar++;
-			}
-
-			if (cntpos)
-				pushquery(state, OPR, (int4) '&', 0, 0, 0);
-
-			cntpos++;
-		}
-
-		pfree(prs.words);
-
-	}
-	else
-		pushval_asis(state, VALSTOP, NULL, 0, 0);
-}
-
-#define STACKDEPTH	32
-/*
- * make polish notaion of query
- */
-static int4
-makepol(QPRS_STATE * state, void (*pushval) (QPRS_STATE *, int, char *, int, int2))
-{
-	int4		val = 0,
-				type;
-	int4		lenval = 0;
-	char	   *strval = NULL;
-	int4		stack[STACKDEPTH];
-	int4		lenstack = 0;
-	int2		weight = 0;
-
-	while ((type = gettoken_query(state, &val, &lenval, &strval, &weight)) != END)
-	{
-		switch (type)
-		{
-			case VAL:
-				(*pushval) (state, VAL, strval, lenval, weight);
-				while (lenstack && (stack[lenstack - 1] == (int4) '&' ||
-									stack[lenstack - 1] == (int4) '!'))
-				{
-					lenstack--;
-					pushquery(state, OPR, stack[lenstack], 0, 0, 0);
-				}
-				break;
-			case OPR:
-				if (lenstack && val == (int4) '|')
-					pushquery(state, OPR, val, 0, 0, 0);
-				else
-				{
-					if (lenstack == STACKDEPTH)
-						/* internal error */
-						elog(ERROR, "stack too short");
-					stack[lenstack] = val;
-					lenstack++;
-				}
-				break;
-			case OPEN:
-				if (makepol(state, pushval) == ERR)
-					return ERR;
-				if (lenstack && (stack[lenstack - 1] == (int4) '&' ||
-								 stack[lenstack - 1] == (int4) '!'))
-				{
-					lenstack--;
-					pushquery(state, OPR, stack[lenstack], 0, 0, 0);
-				}
-				break;
-			case CLOSE:
-				while (lenstack)
-				{
-					lenstack--;
-					pushquery(state, OPR, stack[lenstack], 0, 0, 0);
-				};
-				return END;
-				break;
-			case ERR:
-			default:
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error in tsearch query: \"%s\"",
-								state->buffer)));
-				return ERR;
-
-		}
-	}
-	while (lenstack)
-	{
-		lenstack--;
-		pushquery(state, OPR, stack[lenstack], 0, 0, 0);
-	};
-	return END;
-}
-
-typedef struct
-{
-	WordEntry  *arrb;
-	WordEntry  *arre;
-	char	   *values;
-	char	   *operand;
-}	CHKVAL;
-
-/*
- * compare 2 string values
- */
-static int4
-ValCompare(CHKVAL * chkval, WordEntry * ptr, ITEM * item)
-{
-	if (ptr->len == item->length)
-		return strncmp(
-					   &(chkval->values[ptr->pos]),
-					   &(chkval->operand[item->distance]),
-					   item->length);
-
-	return (ptr->len > item->length) ? 1 : -1;
-}
-
-/*
- * check weight info
- */
-static bool
-checkclass_str(CHKVAL * chkval, WordEntry * val, ITEM * item)
-{
-	WordEntryPos *ptr = (WordEntryPos *) (chkval->values + val->pos + SHORTALIGN(val->len) + sizeof(uint16));
-	uint16		len = *((uint16 *) (chkval->values + val->pos + SHORTALIGN(val->len)));
-
-	while (len--)
-	{
-		if (item->weight & (1 << WEP_GETWEIGHT(*ptr)))
-			return true;
-		ptr++;
-	}
-	return false;
-}
-
-/*
- * is there value 'val' in array or not ?
- */
-static bool
-checkcondition_str(void *checkval, ITEM * val)
-{
-	WordEntry  *StopLow = ((CHKVAL *) checkval)->arrb;
-	WordEntry  *StopHigh = ((CHKVAL *) checkval)->arre;
-	WordEntry  *StopMiddle;
-	int			difference;
-
-	/* Loop invariant: StopLow <= val < StopHigh */
-
-	while (StopLow < StopHigh)
-	{
-		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
-		difference = ValCompare((CHKVAL *) checkval, StopMiddle, val);
-		if (difference == 0)
-			return (val->weight && StopMiddle->haspos) ?
-				checkclass_str((CHKVAL *) checkval, StopMiddle, val) : true;
-		else if (difference < 0)
-			StopLow = StopMiddle + 1;
-		else
-			StopHigh = StopMiddle;
-	}
-
-	return (false);
-}
-
-/*
- * check for boolean condition
- */
-bool
-TS_execute(ITEM * curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM * val))
-{
-	if (curitem->type == VAL)
-		return (*chkcond) (checkval, curitem);
-	else if (curitem->val == (int4) '!')
-	{
-		return (calcnot) ?
-			((TS_execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true)
-			: true;
-	}
-	else if (curitem->val == (int4) '&')
-	{
-		if (TS_execute(curitem + curitem->left, checkval, calcnot, chkcond))
-			return TS_execute(curitem + 1, checkval, calcnot, chkcond);
-		else
-			return false;
-	}
-	else
-	{							/* |-operator */
-		if (TS_execute(curitem + curitem->left, checkval, calcnot, chkcond))
-			return true;
-		else
-			return TS_execute(curitem + 1, checkval, calcnot, chkcond);
-	}
-	return false;
-}
-
-/*
- * boolean operations
- */
-Datum
-rexectsq(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	return DirectFunctionCall2(
-							   exectsq,
-							   PG_GETARG_DATUM(1),
-							   PG_GETARG_DATUM(0)
-		);
-}
-
-Datum
-exectsq(PG_FUNCTION_ARGS)
-{
-	tsvector   *val = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	CHKVAL		chkval;
-	bool		result;
-
-	SET_FUNCOID();
-	if (!val->size || !query->size)
-	{
-		PG_FREE_IF_COPY(val, 0);
-		PG_FREE_IF_COPY(query, 1);
-		PG_RETURN_BOOL(false);
-	}
-
-	chkval.arrb = ARRPTR(val);
-	chkval.arre = chkval.arrb + val->size;
-	chkval.values = STRPTR(val);
-	chkval.operand = GETOPERAND(query);
-	result = TS_execute(
-						GETQUERY(query),
-						&chkval,
-						true,
-						checkcondition_str
-		);
-
-	PG_FREE_IF_COPY(val, 0);
-	PG_FREE_IF_COPY(query, 1);
-	PG_RETURN_BOOL(result);
-}
-
-/*
- * find left operand in polish notation view
- */
-static void
-findoprnd(ITEM * ptr, int4 *pos)
-{
-#ifdef BS_DEBUG
-	elog(DEBUG3, (ptr[*pos].type == OPR) ?
-		 "%d  %c" : "%d  %d", *pos, ptr[*pos].val);
-#endif
-	if (ptr[*pos].type == VAL || ptr[*pos].type == VALSTOP)
-	{
-		ptr[*pos].left = 0;
-		(*pos)++;
-	}
-	else if (ptr[*pos].val == (int4) '!')
-	{
-		ptr[*pos].left = 1;
-		(*pos)++;
-		findoprnd(ptr, pos);
-	}
-	else
-	{
-		ITEM	   *curitem = &ptr[*pos];
-		int4		tmp = *pos;
-
-		(*pos)++;
-		findoprnd(ptr, pos);
-		curitem->left = *pos - tmp;
-		findoprnd(ptr, pos);
-	}
-}
-
-
-/*
- * input
- */
-static QUERYTYPE *
-			queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int, int2), int cfg_id, bool isplain)
-{
-	QPRS_STATE	state;
-	int4		i;
-	QUERYTYPE  *query;
-	int4		commonlen;
-	ITEM	   *ptr;
-	NODE	   *tmp;
-	int4		pos = 0;
-
-#ifdef BS_DEBUG
-	char		pbuf[16384],
-			   *cur;
-#endif
-
-	/* init state */
-	state.buffer = buf;
-	state.buf = buf;
-	state.state = (isplain) ? WAITSINGLEOPERAND : WAITFIRSTOPERAND;
-	state.count = 0;
-	state.num = 0;
-	state.str = NULL;
-	state.cfg_id = cfg_id;
-
-	/* init value parser's state */
-	state.valstate.oprisdelim = true;
-	state.valstate.len = 32;
-	state.valstate.word = (char *) palloc(state.valstate.len);
-
-	/* init list of operand */
-	state.sumlen = 0;
-	state.lenop = 64;
-	state.curop = state.op = (char *) palloc(state.lenop);
-	*(state.curop) = '\0';
-
-	/* parse query & make polish notation (postfix, but in reverse order) */
-	makepol(&state, pushval);
-	pfree(state.valstate.word);
-	if (!state.num)
-	{
-		ereport(NOTICE,
-				(errmsg("tsearch query doesn't contain lexeme(s): \"%s\"",
-						state.buffer)));
-		query = (QUERYTYPE *) palloc(HDRSIZEQT);
-		SET_VARSIZE(query, HDRSIZEQT);
-		query->size = 0;
-		return query;
-	}
-
-	/* make finish struct */
-	commonlen = COMPUTESIZE(state.num, state.sumlen);
-	query = (QUERYTYPE *) palloc(commonlen);
-	SET_VARSIZE(query, commonlen);
-	query->size = state.num;
-	ptr = GETQUERY(query);
-
-	/* set item in polish notation */
-	for (i = 0; i < state.num; i++)
-	{
-		ptr[i].weight = state.str->weight;
-		ptr[i].type = state.str->type;
-		ptr[i].val = state.str->val;
-		ptr[i].distance = state.str->distance;
-		ptr[i].length = state.str->length;
-		tmp = state.str->next;
-		pfree(state.str);
-		state.str = tmp;
-	}
-
-	/* set user friendly-operand view */
-	memcpy((void *) GETOPERAND(query), (void *) state.op, state.sumlen);
-	pfree(state.op);
-
-	/* set left operand's position for every operator */
-	pos = 0;
-	findoprnd(ptr, &pos);
-
-#ifdef BS_DEBUG
-	cur = pbuf;
-	*cur = '\0';
-	for (i = 0; i < query->size; i++)
-	{
-		if (ptr[i].type == OPR)
-			sprintf(cur, "%c(%d) ", ptr[i].val, ptr[i].left);
-		else
-			sprintf(cur, "%d(%s) ", ptr[i].val, GETOPERAND(query) + ptr[i].distance);
-		cur = strchr(cur, '\0');
-	}
-	elog(DEBUG3, "POR: %s", pbuf);
-#endif
-
-	return query;
-}
-
-/*
- * in without morphology
- */
-Datum
-tsquery_in(PG_FUNCTION_ARGS)
-{
-	char	   *in = (char *) PG_GETARG_POINTER(0);
-
-	pg_verifymbstr(in, strlen(in), false);
-
-	SET_FUNCOID();
-	PG_RETURN_POINTER(queryin((char *) in, pushval_asis, 0, false));
-}
-
-/*
- * out function
- */
-typedef struct
-{
-	ITEM	   *curpol;
-	char	   *buf;
-	char	   *cur;
-	char	   *op;
-	int4		buflen;
-}	INFIX;
-
-#define RESIZEBUF(inf,addsize) \
-while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \
-{ \
-	int4 len = (inf)->cur - (inf)->buf; \
-	(inf)->buflen *= 2; \
-	(inf)->buf = (char*) repalloc( (void*)(inf)->buf, (inf)->buflen ); \
-	(inf)->cur = (inf)->buf + len; \
-}
-
-/*
- * recursive walk on tree and print it in
- * infix (human-readable) view
- */
-static void
-infix(INFIX * in, bool first)
-{
-	if (in->curpol->type == VAL)
-	{
-		char	   *op = in->op + in->curpol->distance;
-		int			clen;
-
-		RESIZEBUF(in, in->curpol->length * (pg_database_encoding_max_length() + 1) + 2 + 5);
-		*(in->cur) = '\'';
-		in->cur++;
-		while (*op)
-		{
-			if (t_iseq(op, '\''))
-			{
-				*(in->cur) = '\'';
-				in->cur++;
-			}
-			else if (t_iseq(op, '\\'))
-			{
-				*(in->cur) = '\\';
-				in->cur++;
-			}
-			COPYCHAR(in->cur, op);
-
-			clen = pg_mblen(op);
-			op += clen;
-			in->cur += clen;
-		}
-		*(in->cur) = '\'';
-		in->cur++;
-		if (in->curpol->weight)
-		{
-			*(in->cur) = ':';
-			in->cur++;
-			if (in->curpol->weight & (1 << 3))
-			{
-				*(in->cur) = 'A';
-				in->cur++;
-			}
-			if (in->curpol->weight & (1 << 2))
-			{
-				*(in->cur) = 'B';
-				in->cur++;
-			}
-			if (in->curpol->weight & (1 << 1))
-			{
-				*(in->cur) = 'C';
-				in->cur++;
-			}
-			if (in->curpol->weight & 1)
-			{
-				*(in->cur) = 'D';
-				in->cur++;
-			}
-		}
-		*(in->cur) = '\0';
-		in->curpol++;
-	}
-	else if (in->curpol->val == (int4) '!')
-	{
-		bool		isopr = false;
-
-		RESIZEBUF(in, 1);
-		*(in->cur) = '!';
-		in->cur++;
-		*(in->cur) = '\0';
-		in->curpol++;
-		if (in->curpol->type == OPR)
-		{
-			isopr = true;
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, "( ");
-			in->cur = strchr(in->cur, '\0');
-		}
-		infix(in, isopr);
-		if (isopr)
-		{
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, " )");
-			in->cur = strchr(in->cur, '\0');
-		}
-	}
-	else
-	{
-		int4		op = in->curpol->val;
-		INFIX		nrm;
-
-		in->curpol++;
-		if (op == (int4) '|' && !first)
-		{
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, "( ");
-			in->cur = strchr(in->cur, '\0');
-		}
-
-		nrm.curpol = in->curpol;
-		nrm.op = in->op;
-		nrm.buflen = 16;
-		nrm.cur = nrm.buf = (char *) palloc(sizeof(char) * nrm.buflen);
-
-		/* get right operand */
-		infix(&nrm, false);
-
-		/* get & print left operand */
-		in->curpol = nrm.curpol;
-		infix(in, false);
-
-		/* print operator & right operand */
-		RESIZEBUF(in, 3 + (nrm.cur - nrm.buf));
-		sprintf(in->cur, " %c %s", op, nrm.buf);
-		in->cur = strchr(in->cur, '\0');
-		pfree(nrm.buf);
-
-		if (op == (int4) '|' && !first)
-		{
-			RESIZEBUF(in, 2);
-			sprintf(in->cur, " )");
-			in->cur = strchr(in->cur, '\0');
-		}
-	}
-}
-
-
-Datum
-tsquery_out(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	INFIX		nrm;
-
-	if (query->size == 0)
-	{
-		char	   *b = palloc(1);
-
-		*b = '\0';
-		PG_RETURN_POINTER(b);
-	}
-	nrm.curpol = GETQUERY(query);
-	nrm.buflen = 32;
-	nrm.cur = nrm.buf = (char *) palloc(sizeof(char) * nrm.buflen);
-	*(nrm.cur) = '\0';
-	nrm.op = GETOPERAND(query);
-	infix(&nrm, true);
-
-	PG_FREE_IF_COPY(query, 0);
-	PG_RETURN_POINTER(nrm.buf);
-}
-
-/*
- * debug function, used only for view query
- * which will be executed in non-leaf pages in index
- */
-Datum
-tsquerytree(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	INFIX		nrm;
-	text	   *res;
-	ITEM	   *q;
-	int4		len;
-
-
-	if (query->size == 0)
-	{
-		res = (text *) palloc(VARHDRSZ);
-		SET_VARSIZE(res, VARHDRSZ);
-		PG_RETURN_POINTER(res);
-	}
-
-	q = clean_NOT_v2(GETQUERY(query), &len);
-
-	if (!q)
-	{
-		res = (text *) palloc(1 + VARHDRSZ);
-		SET_VARSIZE(res, 1 + VARHDRSZ);
-		*((char *) VARDATA(res)) = 'T';
-	}
-	else
-	{
-		nrm.curpol = q;
-		nrm.buflen = 32;
-		nrm.cur = nrm.buf = (char *) palloc(sizeof(char) * nrm.buflen);
-		*(nrm.cur) = '\0';
-		nrm.op = GETOPERAND(query);
-		infix(&nrm, true);
-
-		res = (text *) palloc(nrm.cur - nrm.buf + VARHDRSZ);
-		SET_VARSIZE(res, nrm.cur - nrm.buf + VARHDRSZ);
-		memcpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);
-		pfree(q);
-	}
-
-	PG_FREE_IF_COPY(query, 0);
-
-	PG_RETURN_POINTER(res);
-}
-
-Datum
-to_tsquery(PG_FUNCTION_ARGS)
-{
-	text	   *in = PG_GETARG_TEXT_P(1);
-	char	   *str;
-	QUERYTYPE  *query;
-	ITEM	   *res;
-	int4		len;
-
-	SET_FUNCOID();
-
-	str = text2char(in);
-	PG_FREE_IF_COPY(in, 1);
-
-	query = queryin(str, pushval_morph, PG_GETARG_INT32(0), false);
-
-	if (query->size == 0)
-		PG_RETURN_POINTER(query);
-
-	res = clean_fakeval_v2(GETQUERY(query), &len);
-	if (!res)
-	{
-		SET_VARSIZE(query, HDRSIZEQT);
-		query->size = 0;
-		PG_RETURN_POINTER(query);
-	}
-	memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(ITEM));
-	pfree(res);
-	PG_RETURN_POINTER(query);
-}
-
-Datum
-to_tsquery_name(PG_FUNCTION_ARGS)
-{
-	text	   *name = PG_GETARG_TEXT_P(0);
-	Datum		res;
-
-	SET_FUNCOID();
-	res = DirectFunctionCall2(to_tsquery,
-							  Int32GetDatum(name2id_cfg(name)),
-							  PG_GETARG_DATUM(1));
-
-	PG_FREE_IF_COPY(name, 0);
-	PG_RETURN_DATUM(res);
-}
-
-Datum
-to_tsquery_current(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	PG_RETURN_DATUM(DirectFunctionCall2(to_tsquery,
-										Int32GetDatum(get_currcfg()),
-										PG_GETARG_DATUM(0)));
-}
-
-Datum
-plainto_tsquery(PG_FUNCTION_ARGS)
-{
-	text	   *in = PG_GETARG_TEXT_P(1);
-	char	   *str;
-	QUERYTYPE  *query;
-	ITEM	   *res;
-	int4		len;
-
-	SET_FUNCOID();
-
-	str = text2char(in);
-	PG_FREE_IF_COPY(in, 1);
-
-	query = queryin(str, pushval_morph, PG_GETARG_INT32(0), true);
-
-	if (query->size == 0)
-		PG_RETURN_POINTER(query);
-
-	res = clean_fakeval_v2(GETQUERY(query), &len);
-	if (!res)
-	{
-		SET_VARSIZE(query, HDRSIZEQT);
-		query->size = 0;
-		PG_RETURN_POINTER(query);
-	}
-	memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(ITEM));
-	pfree(res);
-	PG_RETURN_POINTER(query);
-}
-
-Datum
-plainto_tsquery_name(PG_FUNCTION_ARGS)
-{
-	text	   *name = PG_GETARG_TEXT_P(0);
-	Datum		res;
-
-	SET_FUNCOID();
-	res = DirectFunctionCall2(plainto_tsquery,
-							  Int32GetDatum(name2id_cfg(name)),
-							  PG_GETARG_DATUM(1));
-
-	PG_FREE_IF_COPY(name, 0);
-	PG_RETURN_DATUM(res);
-}
-
-Datum
-plainto_tsquery_current(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	PG_RETURN_DATUM(DirectFunctionCall2(plainto_tsquery,
-										Int32GetDatum(get_currcfg()),
-										PG_GETARG_DATUM(0)));
-}
diff --git a/contrib/tsearch2/query.h b/contrib/tsearch2/query.h
deleted file mode 100644
index 44f87012130d..000000000000
--- a/contrib/tsearch2/query.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef __QUERY_H__
-#define __QUERY_H__
-/*
-#define BS_DEBUG
-*/
-
-#include "ts_locale.h"
-/*
- * item in polish notation with back link
- * to left operand
- */
-typedef struct ITEM
-{
-	int8		type;
-	int8		weight;
-	int2		left;
-	int4		val;
-	/* user-friendly value, must correlate with WordEntry */
-	uint32
-				istrue:1,		/* use for ranking in Cover */
-				length:11,
-				distance:20;
-}	ITEM;
-
-/*
- *Storage:
- *	(len)(size)(array of ITEM)(array of operand in user-friendly form)
- */
-typedef struct
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int4		size;
-	char		data[1];
-}	QUERYTYPE;
-
-#define HDRSIZEQT	( VARHDRSZ + sizeof(int4) )
-#define COMPUTESIZE(size,lenofoperand)	( HDRSIZEQT + (size) * sizeof(ITEM) + (lenofoperand) )
-#define GETQUERY(x)  (ITEM*)( (char*)(x)+HDRSIZEQT )
-#define GETOPERAND(x)	( (char*)GETQUERY(x) + ((QUERYTYPE*)(x))->size * sizeof(ITEM) )
-
-#define ISOPERATOR(x) (  pg_mblen(x)==1 && ( *(x)=='!' || *(x)=='&' || *(x)=='|' || *(x)=='(' || *(x)==')' ) )
-
-#define END				0
-#define ERR				1
-#define VAL				2
-#define OPR				3
-#define OPEN			4
-#define CLOSE			5
-#define VALSTOP			6		/* for stop words */
-
-bool TS_execute(ITEM * curitem, void *checkval,
-		   bool calcnot, bool (*chkcond) (void *checkval, ITEM * val));
-
-#endif
diff --git a/contrib/tsearch2/query_cleanup.h b/contrib/tsearch2/query_cleanup.h
deleted file mode 100644
index 5879f644e649..000000000000
--- a/contrib/tsearch2/query_cleanup.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __REWRITE_H__
-#define __REWRITE_H__
-
-#include "query.h"
-
-ITEM	   *clean_NOT_v2(ITEM * ptr, int4 *len);
-ITEM	   *clean_fakeval_v2(ITEM * ptr, int4 *len);
-
-#endif
diff --git a/contrib/tsearch2/query_gist.c b/contrib/tsearch2/query_gist.c
deleted file mode 100644
index 5a547e112965..000000000000
--- a/contrib/tsearch2/query_gist.c
+++ /dev/null
@@ -1,392 +0,0 @@
-#include "postgres.h"
-
-#include "access/skey.h"
-#include "storage/bufpage.h"
-#include "access/gist.h"
-
-#include "query.h"
-
-typedef uint64 TPQTGist;
-
-#define SIGLEN	(sizeof(TPQTGist)*BITS_PER_BYTE)
-
-
-#define GETENTRY(vec,pos) ((TPQTGist *) DatumGetPointer((vec)->vector[(pos)].key))
-
-PG_FUNCTION_INFO_V1(tsq_mcontains);
-Datum		tsq_mcontains(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(tsq_mcontained);
-Datum		tsq_mcontained(PG_FUNCTION_ARGS);
-
-static TPQTGist
-makesign(QUERYTYPE * a)
-{
-	int			i;
-	ITEM	   *ptr = GETQUERY(a);
-	TPQTGist	sign = 0;
-
-	for (i = 0; i < a->size; i++)
-	{
-		if (ptr->type == VAL)
-			sign |= ((TPQTGist) 1) << (ptr->val % SIGLEN);
-		ptr++;
-	}
-
-	return sign;
-}
-
-Datum
-tsq_mcontains(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	QUERYTYPE  *ex = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	TPQTGist	sq,
-				se;
-	int			i,
-				j;
-	ITEM	   *iq,
-			   *ie;
-
-	if (query->size < ex->size)
-	{
-		PG_FREE_IF_COPY(query, 0);
-		PG_FREE_IF_COPY(ex, 1);
-
-		PG_RETURN_BOOL(false);
-	}
-
-	sq = makesign(query);
-	se = makesign(ex);
-
-	if ((sq & se) != se)
-	{
-		PG_FREE_IF_COPY(query, 0);
-		PG_FREE_IF_COPY(ex, 1);
-
-		PG_RETURN_BOOL(false);
-	}
-
-	ie = GETQUERY(ex);
-
-	for (i = 0; i < ex->size; i++)
-	{
-		iq = GETQUERY(query);
-		if (ie[i].type != VAL)
-			continue;
-		for (j = 0; j < query->size; j++)
-			if (iq[j].type == VAL && ie[i].val == iq[j].val)
-			{
-				j = query->size + 1;
-				break;
-			}
-		if (j == query->size)
-		{
-			PG_FREE_IF_COPY(query, 0);
-			PG_FREE_IF_COPY(ex, 1);
-
-			PG_RETURN_BOOL(false);
-		}
-	}
-
-	PG_FREE_IF_COPY(query, 0);
-	PG_FREE_IF_COPY(ex, 1);
-
-	PG_RETURN_BOOL(true);
-}
-
-Datum
-tsq_mcontained(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_DATUM(
-					DirectFunctionCall2(
-										tsq_mcontains,
-										PG_GETARG_DATUM(1),
-										PG_GETARG_DATUM(0)
-										)
-		);
-}
-
-PG_FUNCTION_INFO_V1(gtsq_in);
-Datum		gtsq_in(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_out);
-Datum		gtsq_out(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_compress);
-Datum		gtsq_compress(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_decompress);
-Datum		gtsq_decompress(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_consistent);
-Datum		gtsq_consistent(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_union);
-Datum		gtsq_union(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_same);
-Datum		gtsq_same(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_penalty);
-Datum		gtsq_penalty(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(gtsq_picksplit);
-Datum		gtsq_picksplit(PG_FUNCTION_ARGS);
-
-
-Datum
-gtsq_in(PG_FUNCTION_ARGS)
-{
-	elog(ERROR, "not implemented");
-	PG_RETURN_DATUM(0);
-}
-
-Datum
-gtsq_out(PG_FUNCTION_ARGS)
-{
-	elog(ERROR, "not implemented");
-	PG_RETURN_DATUM(0);
-}
-
-Datum
-gtsq_compress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GISTENTRY  *retval = entry;
-
-	if (entry->leafkey)
-	{
-		TPQTGist   *sign = (TPQTGist *) palloc(sizeof(TPQTGist));
-
-		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
-		*sign = makesign((QUERYTYPE *) PG_DETOAST_DATUM(entry->key));
-
-		gistentryinit(*retval, PointerGetDatum(sign),
-					  entry->rel, entry->page,
-					  entry->offset, FALSE);
-	}
-
-	PG_RETURN_POINTER(retval);
-}
-
-Datum
-gtsq_decompress(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_DATUM(PG_GETARG_DATUM(0));
-}
-
-Datum
-gtsq_consistent(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	TPQTGist   *key = (TPQTGist *) DatumGetPointer(entry->key);
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-	TPQTGist	sq = makesign(query);
-	bool		retval;
-
-	switch (strategy)
-	{
-		case RTContainsStrategyNumber:
-		case RTOldContainsStrategyNumber:
-			if (GIST_LEAF(entry))
-				retval = (*key & sq) == sq;
-			else
-				retval = (*key & sq) != 0;
-			break;
-		case RTContainedByStrategyNumber:
-		case RTOldContainedByStrategyNumber:
-			if (GIST_LEAF(entry))
-				retval = (*key & sq) == *key;
-			else
-				retval = (*key & sq) != 0;
-			break;
-		default:
-			retval = FALSE;
-	}
-	PG_RETURN_BOOL(retval);
-}
-
-Datum
-gtsq_union(PG_FUNCTION_ARGS)
-{
-	GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
-	TPQTGist   *sign = (TPQTGist *) palloc(sizeof(TPQTGist));
-	int			i;
-	int		   *size = (int *) PG_GETARG_POINTER(1);
-
-	memset(sign, 0, sizeof(TPQTGist));
-
-	for (i = 0; i < entryvec->n; i++)
-		*sign |= *GETENTRY(entryvec, i);
-
-	*size = sizeof(TPQTGist);
-
-	PG_RETURN_POINTER(sign);
-}
-
-Datum
-gtsq_same(PG_FUNCTION_ARGS)
-{
-	TPQTGist   *a = (TPQTGist *) PG_GETARG_POINTER(0);
-	TPQTGist   *b = (TPQTGist *) PG_GETARG_POINTER(1);
- 	bool	   *result = (bool *) PG_GETARG_POINTER(2);
-  
- 	*result = (*a == *b) ? true : false;
- 
- 	PG_RETURN_POINTER(result);
-}
-
-static int
-sizebitvec(TPQTGist sign)
-{
-	int			size = 0,
-				i;
-
-	for (i = 0; i < SIGLEN; i++)
-		size += 0x01 & (sign >> i);
-
-	return size;
-}
-
-static int
-hemdist(TPQTGist a, TPQTGist b)
-{
-	TPQTGist	res = a ^ b;
-
-	return sizebitvec(res);
-}
-
-Datum
-gtsq_penalty(PG_FUNCTION_ARGS)
-{
-	TPQTGist   *origval = (TPQTGist *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
-	TPQTGist   *newval = (TPQTGist *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
-	float	   *penalty = (float *) PG_GETARG_POINTER(2);
-
-	*penalty = hemdist(*origval, *newval);
-
-	PG_RETURN_POINTER(penalty);
-}
-
-
-typedef struct
-{
-	OffsetNumber pos;
-	int4		cost;
-}	SPLITCOST;
-
-static int
-comparecost(const void *a, const void *b)
-{
-	if (((SPLITCOST *) a)->cost == ((SPLITCOST *) b)->cost)
-		return 0;
-	else
-		return (((SPLITCOST *) a)->cost > ((SPLITCOST *) b)->cost) ? 1 : -1;
-}
-
-#define WISH_F(a,b,c) (double)( -(double)(((a)-(b))*((a)-(b))*((a)-(b)))*(c) )
-
-Datum
-gtsq_picksplit(PG_FUNCTION_ARGS)
-{
-	GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
-	GIST_SPLITVEC *v = (GIST_SPLITVEC *) PG_GETARG_POINTER(1);
-	OffsetNumber maxoff = entryvec->n - 2;
-	OffsetNumber k,
-				j;
-
-	TPQTGist   *datum_l,
-			   *datum_r;
-	int4		size_alpha,
-				size_beta;
-	int4		size_waste,
-				waste = -1;
-	int4		nbytes;
-	OffsetNumber seed_1 = 0,
-				seed_2 = 0;
-	OffsetNumber *left,
-			   *right;
-
-	SPLITCOST  *costvector;
-
-	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
-	left = v->spl_left = (OffsetNumber *) palloc(nbytes);
-	right = v->spl_right = (OffsetNumber *) palloc(nbytes);
-	v->spl_nleft = v->spl_nright = 0;
-
-	for (k = FirstOffsetNumber; k < maxoff; k = OffsetNumberNext(k))
-		for (j = OffsetNumberNext(k); j <= maxoff; j = OffsetNumberNext(j))
-		{
-			size_waste = hemdist(*GETENTRY(entryvec, j), *GETENTRY(entryvec, k));
-			if (size_waste > waste)
-			{
-				waste = size_waste;
-				seed_1 = k;
-				seed_2 = j;
-			}
-		}
-
-
-	if (seed_1 == 0 || seed_2 == 0)
-	{
-		seed_1 = 1;
-		seed_2 = 2;
-	}
-
-	datum_l = (TPQTGist *) palloc(sizeof(TPQTGist));
-	*datum_l = *GETENTRY(entryvec, seed_1);
-	datum_r = (TPQTGist *) palloc(sizeof(TPQTGist));
-	*datum_r = *GETENTRY(entryvec, seed_2);
-
-
-	maxoff = OffsetNumberNext(maxoff);
-	costvector = (SPLITCOST *) palloc(sizeof(SPLITCOST) * maxoff);
-	for (j = FirstOffsetNumber; j <= maxoff; j = OffsetNumberNext(j))
-	{
-		costvector[j - 1].pos = j;
-		size_alpha = hemdist(*GETENTRY(entryvec, seed_1), *GETENTRY(entryvec, j));
-		size_beta = hemdist(*GETENTRY(entryvec, seed_2), *GETENTRY(entryvec, j));
-		costvector[j - 1].cost = abs(size_alpha - size_beta);
-	}
-	qsort((void *) costvector, maxoff, sizeof(SPLITCOST), comparecost);
-
-	for (k = 0; k < maxoff; k++)
-	{
-		j = costvector[k].pos;
-		if (j == seed_1)
-		{
-			*left++ = j;
-			v->spl_nleft++;
-			continue;
-		}
-		else if (j == seed_2)
-		{
-			*right++ = j;
-			v->spl_nright++;
-			continue;
-		}
-		size_alpha = hemdist(*datum_l, *GETENTRY(entryvec, j));
-		size_beta = hemdist(*datum_r, *GETENTRY(entryvec, j));
-
-		if (size_alpha < size_beta + WISH_F(v->spl_nleft, v->spl_nright, 0.05))
-		{
-			*datum_l |= *GETENTRY(entryvec, j);
-			*left++ = j;
-			v->spl_nleft++;
-		}
-		else
-		{
-			*datum_r |= *GETENTRY(entryvec, j);
-			*right++ = j;
-			v->spl_nright++;
-		}
-	}
-
-	*right = *left = FirstOffsetNumber;
-	v->spl_ldatum = PointerGetDatum(datum_l);
-	v->spl_rdatum = PointerGetDatum(datum_r);
-
-	PG_RETURN_POINTER(v);
-}
diff --git a/contrib/tsearch2/query_rewrite.c b/contrib/tsearch2/query_rewrite.c
deleted file mode 100644
index 27f1be55bfc4..000000000000
--- a/contrib/tsearch2/query_rewrite.c
+++ /dev/null
@@ -1,549 +0,0 @@
-#include "postgres.h"
-#include "executor/spi.h"
-
-#include "query_util.h"
-
-MemoryContext AggregateContext = NULL;
-
-static int
-addone(int *counters, int last, int total)
-{
-	counters[last]++;
-	if (counters[last] >= total)
-	{
-		if (last == 0)
-			return 0;
-		if (addone(counters, last - 1, total - 1) == 0)
-			return 0;
-		counters[last] = counters[last - 1] + 1;
-	}
-	return 1;
-}
-
-static QTNode *
-findeq(QTNode * node, QTNode * ex, MemoryType memtype, QTNode * subs, bool *isfind)
-{
-
-	if ((node->sign & ex->sign) != ex->sign || node->valnode->type != ex->valnode->type || node->valnode->val != ex->valnode->val)
-		return node;
-
-	if (node->flags & QTN_NOCHANGE)
-		return node;
-
-	if (node->valnode->type == OPR)
-	{
-		if (node->nchild == ex->nchild)
-		{
-			if (QTNEq(node, ex))
-			{
-				QTNFree(node);
-				if (subs)
-				{
-					node = QTNCopy(subs, memtype);
-					node->flags |= QTN_NOCHANGE;
-				}
-				else
-					node = NULL;
-				*isfind = true;
-			}
-		}
-		else if (node->nchild > ex->nchild)
-		{
-			int		   *counters = (int *) palloc(sizeof(int) * node->nchild);
-			int			i;
-			QTNode	   *tnode = (QTNode *) MEMALLOC(memtype, sizeof(QTNode));
-
-			memset(tnode, 0, sizeof(QTNode));
-			tnode->child = (QTNode **) MEMALLOC(memtype, sizeof(QTNode *) * ex->nchild);
-			tnode->nchild = ex->nchild;
-			tnode->valnode = (ITEM *) MEMALLOC(memtype, sizeof(ITEM));
-			*(tnode->valnode) = *(ex->valnode);
-
-			for (i = 0; i < ex->nchild; i++)
-				counters[i] = i;
-
-			do
-			{
-				tnode->sign = 0;
-				for (i = 0; i < ex->nchild; i++)
-				{
-					tnode->child[i] = node->child[counters[i]];
-					tnode->sign |= tnode->child[i]->sign;
-				}
-
-				if (QTNEq(tnode, ex))
-				{
-					int			j = 0;
-
-					MEMFREE(memtype, tnode->valnode);
-					MEMFREE(memtype, tnode->child);
-					MEMFREE(memtype, tnode);
-					if (subs)
-					{
-						tnode = QTNCopy(subs, memtype);
-						tnode->flags = QTN_NOCHANGE | QTN_NEEDFREE;
-					}
-					else
-						tnode = NULL;
-
-					node->child[counters[0]] = tnode;
-
-					for (i = 1; i < ex->nchild; i++)
-						node->child[counters[i]] = NULL;
-					for (i = 0; i < node->nchild; i++)
-					{
-						if (node->child[i])
-						{
-							node->child[j] = node->child[i];
-							j++;
-						}
-					}
-
-					node->nchild = j;
-
-					*isfind = true;
-
-					break;
-				}
-			} while (addone(counters, ex->nchild - 1, node->nchild));
-			if (tnode && (tnode->flags & QTN_NOCHANGE) == 0)
-			{
-				MEMFREE(memtype, tnode->valnode);
-				MEMFREE(memtype, tnode->child);
-				MEMFREE(memtype, tnode);
-			}
-			else
-				QTNSort(node);
-			pfree(counters);
-		}
-	}
-	else if (QTNEq(node, ex))
-	{
-		QTNFree(node);
-		if (subs)
-		{
-			node = QTNCopy(subs, memtype);
-			node->flags |= QTN_NOCHANGE;
-		}
-		else
-		{
-			node = NULL;
-		}
-		*isfind = true;
-	}
-
-	return node;
-}
-
-static QTNode *
-dofindsubquery(QTNode * root, QTNode * ex, MemoryType memtype, QTNode * subs, bool *isfind)
-{
-	root = findeq(root, ex, memtype, subs, isfind);
-
-	if (root && (root->flags & QTN_NOCHANGE) == 0 && root->valnode->type == OPR)
-	{
-		int			i;
-
-		for (i = 0; i < root->nchild; i++)
-			root->child[i] = dofindsubquery(root->child[i], ex, memtype, subs, isfind);
-	}
-
-	return root;
-}
-
-static QTNode *
-dropvoidsubtree(QTNode * root)
-{
-
-	if (!root)
-		return NULL;
-
-	if (root->valnode->type == OPR)
-	{
-		int			i,
-					j = 0;
-
-		for (i = 0; i < root->nchild; i++)
-		{
-			if (root->child[i])
-			{
-				root->child[j] = root->child[i];
-				j++;
-			}
-		}
-
-		root->nchild = j;
-
-		if (root->valnode->val == (int4) '!' && root->nchild == 0)
-		{
-			QTNFree(root);
-			root = NULL;
-		}
-		else if (root->nchild == 1)
-		{
-			QTNode	   *nroot = root->child[0];
-
-			pfree(root);
-			root = nroot;
-		}
-	}
-
-	return root;
-}
-
-static QTNode *
-findsubquery(QTNode * root, QTNode * ex, MemoryType memtype, QTNode * subs, bool *isfind)
-{
-	bool		DidFind = false;
-
-	root = dofindsubquery(root, ex, memtype, subs, &DidFind);
-
-	if (!subs && DidFind)
-		root = dropvoidsubtree(root);
-
-	if (isfind)
-		*isfind = DidFind;
-
-	return root;
-}
-
-static Oid	tsqOid = InvalidOid;
-static void
-get_tsq_Oid(void)
-{
-	int			ret;
-	bool		isnull;
-
-	if ((ret = SPI_exec("select oid from pg_type where typname='tsquery'", 1)) < 0)
-		/* internal error */
-		elog(ERROR, "SPI_exec to get tsquery oid returns %d", ret);
-
-	if (SPI_processed < 1)
-		/* internal error */
-		elog(ERROR, "there is no tsvector type");
-	tsqOid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-	if (tsqOid == InvalidOid)
-		/* internal error */
-		elog(ERROR, "tsquery type has InvalidOid");
-}
-
-
-PG_FUNCTION_INFO_V1(tsquery_rewrite);
-PG_FUNCTION_INFO_V1(rewrite_accum);
-Datum		rewrite_accum(PG_FUNCTION_ARGS);
-
-Datum
-rewrite_accum(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *acc = (QUERYTYPE *) PG_GETARG_POINTER(0);
-	ArrayType  *qa = (ArrayType *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1));
-	QUERYTYPE  *q;
-	QTNode	   *qex,
-			   *subs = NULL,
-			   *acctree;
-	bool		isfind = false;
-	Datum	   *elemsp;
-	int			nelemsp;
-
-	AggregateContext = ((AggState *) fcinfo->context)->aggcontext;
-
-	if (acc == NULL || PG_ARGISNULL(0))
-	{
-		acc = (QUERYTYPE *) MEMALLOC(AggMemory, sizeof(QUERYTYPE));
-		SET_VARSIZE(acc, HDRSIZEQT);
-		acc->size = 0;
-	}
-
-	if (qa == NULL || PG_ARGISNULL(1))
-	{
-		PG_FREE_IF_COPY(qa, 1);
-		PG_RETURN_POINTER(acc);
-	}
-
-	if (ARR_NDIM(qa) != 1)
-		elog(ERROR, "array must be one-dimensional, not %d dimension", ARR_NDIM(qa));
-
-	if (ArrayGetNItems(ARR_NDIM(qa), ARR_DIMS(qa)) != 3)
-		elog(ERROR, "array should have only three elements");
-
-	if (tsqOid == InvalidOid)
-	{
-		SPI_connect();
-		get_tsq_Oid();
-		SPI_finish();
-	}
-
-	if (ARR_ELEMTYPE(qa) != tsqOid)
-		elog(ERROR, "array should contain tsquery type");
-
-	deconstruct_array(qa, tsqOid, -1, false, 'i', &elemsp, NULL, &nelemsp);
-
-	q = (QUERYTYPE *) DatumGetPointer(elemsp[0]);
-	if (q->size == 0)
-	{
-		pfree(elemsp);
-		PG_RETURN_POINTER(acc);
-	}
-
-	if (!acc->size)
-	{
-		if (VARSIZE(acc) > HDRSIZEQT)
-		{
-			pfree(elemsp);
-			PG_RETURN_POINTER(acc);
-		}
-		else
-			acctree = QT2QTN(GETQUERY(q), GETOPERAND(q));
-	}
-	else
-		acctree = QT2QTN(GETQUERY(acc), GETOPERAND(acc));
-
-	QTNTernary(acctree);
-	QTNSort(acctree);
-
-	q = (QUERYTYPE *) DatumGetPointer(elemsp[1]);
-	if (q->size == 0)
-	{
-		pfree(elemsp);
-		PG_RETURN_POINTER(acc);
-	}
-	qex = QT2QTN(GETQUERY(q), GETOPERAND(q));
-	QTNTernary(qex);
-	QTNSort(qex);
-
-	q = (QUERYTYPE *) DatumGetPointer(elemsp[2]);
-	if (q->size)
-		subs = QT2QTN(GETQUERY(q), GETOPERAND(q));
-
-	acctree = findsubquery(acctree, qex, PlainMemory, subs, &isfind);
-
-	if (isfind || !acc->size)
-	{
-		/* pfree( acc ); do not pfree(p), because nodeAgg.c will */
-		if (acctree)
-		{
-			QTNBinary(acctree);
-			acc = QTN2QT(acctree, AggMemory);
-		}
-		else
-		{
-			acc = (QUERYTYPE *) MEMALLOC(AggMemory, HDRSIZEQT * 2);
-			SET_VARSIZE(acc, HDRSIZEQT * 2);
-			acc->size = 0;
-		}
-	}
-
-	pfree(elemsp);
-	QTNFree(qex);
-	QTNFree(subs);
-	QTNFree(acctree);
-
-	PG_RETURN_POINTER(acc);
-}
-
-PG_FUNCTION_INFO_V1(rewrite_finish);
-Datum		rewrite_finish(PG_FUNCTION_ARGS);
-
-Datum
-rewrite_finish(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *acc = (QUERYTYPE *) PG_GETARG_POINTER(0);
-	QUERYTYPE  *rewrited;
-
-	if (acc == NULL || PG_ARGISNULL(0) || acc->size == 0)
-	{
-		acc = (QUERYTYPE *) palloc(sizeof(QUERYTYPE));
-		SET_VARSIZE(acc, HDRSIZEQT);
-		acc->size = 0;
-	}
-
-	rewrited = (QUERYTYPE *) palloc(VARSIZE(acc));
-	memcpy(rewrited, acc, VARSIZE(acc));
-	pfree(acc);
-
-	PG_RETURN_POINTER(rewrited);
-}
-
-Datum		tsquery_rewrite(PG_FUNCTION_ARGS);
-
-Datum
-tsquery_rewrite(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-	text	   *in = PG_GETARG_TEXT_P(1);
-	QUERYTYPE  *rewrited = query;
-	QTNode	   *tree;
-	char	   *buf;
-	void	   *plan;
-	Portal		portal;
-	bool		isnull;
-	int			i;
-
-	if (query->size == 0)
-	{
-		PG_FREE_IF_COPY(in, 1);
-		PG_RETURN_POINTER(rewrited);
-	}
-
-	tree = QT2QTN(GETQUERY(query), GETOPERAND(query));
-	QTNTernary(tree);
-	QTNSort(tree);
-
-	buf = (char *) palloc(VARSIZE(in));
-	memcpy(buf, VARDATA(in), VARSIZE(in) - VARHDRSZ);
-	buf[VARSIZE(in) - VARHDRSZ] = '\0';
-
-	SPI_connect();
-
-	if (tsqOid == InvalidOid)
-		get_tsq_Oid();
-
-	if ((plan = SPI_prepare(buf, 0, NULL)) == NULL)
-		elog(ERROR, "SPI_prepare('%s') returns NULL", buf);
-
-	if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, false)) == NULL)
-		elog(ERROR, "SPI_cursor_open('%s') returns NULL", buf);
-
-	SPI_cursor_fetch(portal, true, 100);
-
-	if (SPI_tuptable->tupdesc->natts != 2)
-		elog(ERROR, "number of fields doesn't equal to 2");
-
-	if (SPI_gettypeid(SPI_tuptable->tupdesc, 1) != tsqOid)
-		elog(ERROR, "column #1 isn't of tsquery type");
-
-	if (SPI_gettypeid(SPI_tuptable->tupdesc, 2) != tsqOid)
-		elog(ERROR, "column #2 isn't of tsquery type");
-
-	while (SPI_processed > 0 && tree)
-	{
-		for (i = 0; i < SPI_processed && tree; i++)
-		{
-			Datum		qdata = SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 1, &isnull);
-			Datum		sdata;
-
-			if (isnull)
-				continue;
-
-			sdata = SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 2, &isnull);
-
-			if (!isnull)
-			{
-				QUERYTYPE  *qtex = (QUERYTYPE *) PG_DETOAST_DATUM(qdata);
-				QUERYTYPE  *qtsubs = (QUERYTYPE *) PG_DETOAST_DATUM(sdata);
-				QTNode	   *qex,
-						   *qsubs = NULL;
-
-				if (qtex->size == 0)
-				{
-					if (qtex != (QUERYTYPE *) DatumGetPointer(qdata))
-						pfree(qtex);
-					if (qtsubs != (QUERYTYPE *) DatumGetPointer(sdata))
-						pfree(qtsubs);
-					continue;
-				}
-
-				qex = QT2QTN(GETQUERY(qtex), GETOPERAND(qtex));
-
-				QTNTernary(qex);
-				QTNSort(qex);
-
-				if (qtsubs->size)
-					qsubs = QT2QTN(GETQUERY(qtsubs), GETOPERAND(qtsubs));
-
-				tree = findsubquery(tree, qex, SPIMemory, qsubs, NULL);
-
-				QTNFree(qex);
-				if (qtex != (QUERYTYPE *) DatumGetPointer(qdata))
-					pfree(qtex);
-				QTNFree(qsubs);
-				if (qtsubs != (QUERYTYPE *) DatumGetPointer(sdata))
-					pfree(qtsubs);
-			}
-		}
-
-		SPI_freetuptable(SPI_tuptable);
-		SPI_cursor_fetch(portal, true, 100);
-	}
-
-	SPI_freetuptable(SPI_tuptable);
-	SPI_cursor_close(portal);
-	SPI_freeplan(plan);
-	SPI_finish();
-
-
-	if (tree)
-	{
-		QTNBinary(tree);
-		rewrited = QTN2QT(tree, PlainMemory);
-		QTNFree(tree);
-		PG_FREE_IF_COPY(query, 0);
-	}
-	else
-	{
-		SET_VARSIZE(rewrited, HDRSIZEQT);
-		rewrited->size = 0;
-	}
-
-	pfree(buf);
-	PG_FREE_IF_COPY(in, 1);
-	PG_RETURN_POINTER(rewrited);
-}
-
-
-PG_FUNCTION_INFO_V1(tsquery_rewrite_query);
-Datum		tsquery_rewrite_query(PG_FUNCTION_ARGS);
-
-Datum
-tsquery_rewrite_query(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-	QUERYTYPE  *ex = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	QUERYTYPE  *subst = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(2));
-	QUERYTYPE  *rewrited = query;
-	QTNode	   *tree,
-			   *qex,
-			   *subs = NULL;
-
-	if (query->size == 0 || ex->size == 0)
-	{
-		PG_FREE_IF_COPY(ex, 1);
-		PG_FREE_IF_COPY(subst, 2);
-		PG_RETURN_POINTER(rewrited);
-	}
-
-	tree = QT2QTN(GETQUERY(query), GETOPERAND(query));
-	QTNTernary(tree);
-	QTNSort(tree);
-
-	qex = QT2QTN(GETQUERY(ex), GETOPERAND(ex));
-	QTNTernary(qex);
-	QTNSort(qex);
-
-	if (subst->size)
-		subs = QT2QTN(GETQUERY(subst), GETOPERAND(subst));
-
-	tree = findsubquery(tree, qex, PlainMemory, subs, NULL);
-	QTNFree(qex);
-	QTNFree(subs);
-
-	if (!tree)
-	{
-		SET_VARSIZE(rewrited, HDRSIZEQT);
-		rewrited->size = 0;
-		PG_FREE_IF_COPY(ex, 1);
-		PG_FREE_IF_COPY(subst, 2);
-		PG_RETURN_POINTER(rewrited);
-	}
-	else
-	{
-		QTNBinary(tree);
-		rewrited = QTN2QT(tree, PlainMemory);
-		QTNFree(tree);
-	}
-
-	PG_FREE_IF_COPY(query, 0);
-	PG_FREE_IF_COPY(ex, 1);
-	PG_FREE_IF_COPY(subst, 2);
-	PG_RETURN_POINTER(rewrited);
-}
diff --git a/contrib/tsearch2/query_support.c b/contrib/tsearch2/query_support.c
deleted file mode 100644
index a4ca8728ac8e..000000000000
--- a/contrib/tsearch2/query_support.c
+++ /dev/null
@@ -1,205 +0,0 @@
-#include "postgres.h"
-#include "fmgr.h"
-
-#include "query_util.h"
-
-PG_FUNCTION_INFO_V1(tsquery_numnode);
-Datum		tsquery_numnode(PG_FUNCTION_ARGS);
-
-Datum
-tsquery_numnode(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-	int			nnode = query->size;
-
-	PG_FREE_IF_COPY(query, 0);
-	PG_RETURN_INT32(nnode);
-}
-
-static QTNode *
-join_tsqueries(QUERYTYPE * a, QUERYTYPE * b)
-{
-	QTNode	   *res = (QTNode *) palloc0(sizeof(QTNode));
-
-	res->flags |= QTN_NEEDFREE;
-
-	res->valnode = (ITEM *) palloc0(sizeof(ITEM));
-	res->valnode->type = OPR;
-
-	res->child = (QTNode **) palloc0(sizeof(QTNode *) * 2);
-	res->child[0] = QT2QTN(GETQUERY(b), GETOPERAND(b));
-	res->child[1] = QT2QTN(GETQUERY(a), GETOPERAND(a));
-	res->nchild = 2;
-
-	return res;
-}
-
-PG_FUNCTION_INFO_V1(tsquery_and);
-Datum		tsquery_and(PG_FUNCTION_ARGS);
-
-Datum
-tsquery_and(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *a = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-	QUERYTYPE  *b = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1));
-	QTNode	   *res;
-	QUERYTYPE  *query;
-
-	if (a->size == 0)
-	{
-		PG_FREE_IF_COPY(a, 1);
-		PG_RETURN_POINTER(b);
-	}
-	else if (b->size == 0)
-	{
-		PG_FREE_IF_COPY(b, 1);
-		PG_RETURN_POINTER(a);
-	}
-
-	res = join_tsqueries(a, b);
-
-	res->valnode->val = '&';
-
-	query = QTN2QT(res, PlainMemory);
-
-	QTNFree(res);
-	PG_FREE_IF_COPY(a, 0);
-	PG_FREE_IF_COPY(b, 1);
-
-	PG_RETURN_POINTER(query);
-}
-
-PG_FUNCTION_INFO_V1(tsquery_or);
-Datum		tsquery_or(PG_FUNCTION_ARGS);
-
-Datum
-tsquery_or(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *a = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-	QUERYTYPE  *b = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1));
-	QTNode	   *res;
-	QUERYTYPE  *query;
-
-	if (a->size == 0)
-	{
-		PG_FREE_IF_COPY(a, 1);
-		PG_RETURN_POINTER(b);
-	}
-	else if (b->size == 0)
-	{
-		PG_FREE_IF_COPY(b, 1);
-		PG_RETURN_POINTER(a);
-	}
-
-	res = join_tsqueries(a, b);
-
-	res->valnode->val = '|';
-
-	query = QTN2QT(res, PlainMemory);
-
-	QTNFree(res);
-	PG_FREE_IF_COPY(a, 0);
-	PG_FREE_IF_COPY(b, 1);
-
-	PG_RETURN_POINTER(query);
-}
-
-PG_FUNCTION_INFO_V1(tsquery_not);
-Datum		tsquery_not(PG_FUNCTION_ARGS);
-
-Datum
-tsquery_not(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *a = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-	QTNode	   *res;
-	QUERYTYPE  *query;
-
-	if (a->size == 0)
-		PG_RETURN_POINTER(a);
-
-	res = (QTNode *) palloc0(sizeof(QTNode));
-
-	res->flags |= QTN_NEEDFREE;
-
-	res->valnode = (ITEM *) palloc0(sizeof(ITEM));
-	res->valnode->type = OPR;
-	res->valnode->val = '!';
-
-	res->child = (QTNode **) palloc0(sizeof(QTNode *));
-	res->child[0] = QT2QTN(GETQUERY(a), GETOPERAND(a));
-	res->nchild = 1;
-
-	query = QTN2QT(res, PlainMemory);
-
-	QTNFree(res);
-	PG_FREE_IF_COPY(a, 0);
-
-	PG_RETURN_POINTER(query);
-}
-
-static int
-CompareTSQ(QUERYTYPE * a, QUERYTYPE * b)
-{
-	if (a->size != b->size)
-	{
-		return (a->size < b->size) ? -1 : 1;
-	}
-	else if (VARSIZE(a) != VARSIZE(b))
-	{
-		return (VARSIZE(a) < VARSIZE(b)) ? -1 : 1;
-	}
-	else
-	{
-		QTNode	   *an = QT2QTN(GETQUERY(a), GETOPERAND(a));
-		QTNode	   *bn = QT2QTN(GETQUERY(b), GETOPERAND(b));
-		int			res = QTNodeCompare(an, bn);
-
-		QTNFree(an);
-		QTNFree(bn);
-
-		return res;
-	}
-
-	return 0;
-}
-
-PG_FUNCTION_INFO_V1(tsquery_cmp);
-\
-Datum		tsquery_cmp(PG_FUNCTION_ARGS);
-
-Datum
-tsquery_cmp(PG_FUNCTION_ARGS)
-{
-	QUERYTYPE  *a = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-	QUERYTYPE  *b = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1));
-	int			res = CompareTSQ(a, b);
-
-	PG_FREE_IF_COPY(a, 0);
-	PG_FREE_IF_COPY(b, 1);
-
-	PG_RETURN_INT32(res);
-}
-
-#define CMPFUNC( NAME, ACTION )									\
-Datum	NAME(PG_FUNCTION_ARGS);									\
-													\
-Datum													\
-NAME(PG_FUNCTION_ARGS) {										\
-	QUERYTYPE  *a = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));	\
-	QUERYTYPE  *b = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1));	\
-	int res = CompareTSQ(a,b);									\
-													\
-	PG_FREE_IF_COPY(a,0);										\
-	PG_FREE_IF_COPY(b,1);										\
-													\
-	PG_RETURN_BOOL( ACTION );									\
-}													\
-													\
-PG_FUNCTION_INFO_V1(NAME)
-
-CMPFUNC(tsquery_lt, res < 0);
-CMPFUNC(tsquery_le, res <= 0);
-CMPFUNC(tsquery_eq, res == 0);
-CMPFUNC(tsquery_ge, res >= 0);
-CMPFUNC(tsquery_gt, res > 0);
-CMPFUNC(tsquery_ne, res != 0);
diff --git a/contrib/tsearch2/query_util.c b/contrib/tsearch2/query_util.c
deleted file mode 100644
index 083d173d1320..000000000000
--- a/contrib/tsearch2/query_util.c
+++ /dev/null
@@ -1,301 +0,0 @@
-#include "postgres.h"
-#include "executor/spi.h"
-#include "query_util.h"
-
-QTNode *
-QT2QTN(ITEM * in, char *operand)
-{
-	QTNode	   *node = (QTNode *) palloc0(sizeof(QTNode));
-
-	node->valnode = in;
-
-	if (in->type == OPR)
-	{
-		node->child = (QTNode **) palloc0(sizeof(QTNode *) * 2);
-		node->child[0] = QT2QTN(in + 1, operand);
-		node->sign = node->child[0]->sign;
-		if (in->val == (int4) '!')
-			node->nchild = 1;
-		else
-		{
-			node->nchild = 2;
-			node->child[1] = QT2QTN(in + in->left, operand);
-			node->sign |= node->child[1]->sign;
-		}
-	}
-	else if (operand)
-	{
-		node->word = operand + in->distance;
-		node->sign = 1 << (in->val % 32);
-	}
-
-	return node;
-}
-
-void
-QTNFree(QTNode * in)
-{
-	if (!in)
-		return;
-
-	if (in->valnode->type == VAL && in->word && (in->flags & QTN_WORDFREE) != 0)
-		pfree(in->word);
-
-	if (in->child)
-	{
-		if (in->valnode)
-		{
-			if (in->valnode->type == OPR && in->nchild > 0)
-			{
-				int			i;
-
-				for (i = 0; i < in->nchild; i++)
-					QTNFree(in->child[i]);
-			}
-			if (in->flags & QTN_NEEDFREE)
-				pfree(in->valnode);
-		}
-		pfree(in->child);
-	}
-
-	pfree(in);
-}
-
-int
-QTNodeCompare(QTNode * an, QTNode * bn)
-{
-	if (an->valnode->type != bn->valnode->type)
-		return (an->valnode->type > bn->valnode->type) ? -1 : 1;
-	else if (an->valnode->val != bn->valnode->val)
-		return (an->valnode->val > bn->valnode->val) ? -1 : 1;
-	else if (an->valnode->type == VAL)
-	{
-		if (an->valnode->length == bn->valnode->length)
-			return strncmp(an->word, bn->word, an->valnode->length);
-		else
-			return (an->valnode->length > bn->valnode->length) ? -1 : 1;
-	}
-	else if (an->nchild != bn->nchild)
-	{
-		return (an->nchild > bn->nchild) ? -1 : 1;
-	}
-	else
-	{
-		int			i,
-					res;
-
-		for (i = 0; i < an->nchild; i++)
-			if ((res = QTNodeCompare(an->child[i], bn->child[i])) != 0)
-				return res;
-	}
-
-	return 0;
-}
-
-static int
-cmpQTN(const void *a, const void *b)
-{
-	return QTNodeCompare(*(QTNode **) a, *(QTNode **) b);
-}
-
-void
-QTNSort(QTNode * in)
-{
-	int			i;
-
-	if (in->valnode->type != OPR)
-		return;
-
-	for (i = 0; i < in->nchild; i++)
-		QTNSort(in->child[i]);
-	if (in->nchild > 1)
-		qsort((void *) in->child, in->nchild, sizeof(QTNode *), cmpQTN);
-}
-
-bool
-QTNEq(QTNode * a, QTNode * b)
-{
-	uint32		sign = a->sign & b->sign;
-
-	if (!(sign == a->sign && sign == b->sign))
-		return 0;
-
-	return (QTNodeCompare(a, b) == 0) ? true : false;
-}
-
-void
-QTNTernary(QTNode * in)
-{
-	int			i;
-
-	if (in->valnode->type != OPR)
-		return;
-
-	for (i = 0; i < in->nchild; i++)
-		QTNTernary(in->child[i]);
-
-	for (i = 0; i < in->nchild; i++)
-	{
-		if (in->valnode->type == in->child[i]->valnode->type && in->valnode->val == in->child[i]->valnode->val)
-		{
-			QTNode	   *cc = in->child[i];
-			int			oldnchild = in->nchild;
-
-			in->nchild += cc->nchild - 1;
-			in->child = (QTNode **) repalloc(in->child, in->nchild * sizeof(QTNode *));
-
-			if (i + 1 != oldnchild)
-				memmove(in->child + i + cc->nchild, in->child + i + 1,
-						(oldnchild - i - 1) * sizeof(QTNode *));
-
-			memcpy(in->child + i, cc->child, cc->nchild * sizeof(QTNode *));
-			i += cc->nchild - 1;
-
-			pfree(cc);
-		}
-	}
-}
-
-void
-QTNBinary(QTNode * in)
-{
-	int			i;
-
-	if (in->valnode->type != OPR)
-		return;
-
-	for (i = 0; i < in->nchild; i++)
-		QTNBinary(in->child[i]);
-
-	if (in->nchild <= 2)
-		return;
-
-	while (in->nchild > 2)
-	{
-		QTNode	   *nn = (QTNode *) palloc0(sizeof(QTNode));
-
-		nn->valnode = (ITEM *) palloc0(sizeof(ITEM));
-		nn->child = (QTNode **) palloc0(sizeof(QTNode *) * 2);
-
-		nn->nchild = 2;
-		nn->flags = QTN_NEEDFREE;
-
-		nn->child[0] = in->child[0];
-		nn->child[1] = in->child[1];
-		nn->sign = nn->child[0]->sign | nn->child[1]->sign;
-
-		nn->valnode->type = in->valnode->type;
-		nn->valnode->val = in->valnode->val;
-
-		in->child[0] = nn;
-		in->child[1] = in->child[in->nchild - 1];
-		in->nchild--;
-	}
-}
-
-static void
-cntsize(QTNode * in, int4 *sumlen, int4 *nnode)
-{
-	*nnode += 1;
-	if (in->valnode->type == OPR)
-	{
-		int			i;
-
-		for (i = 0; i < in->nchild; i++)
-			cntsize(in->child[i], sumlen, nnode);
-	}
-	else
-	{
-		*sumlen += in->valnode->length + 1;
-	}
-}
-
-typedef struct
-{
-	ITEM	   *curitem;
-	char	   *operand;
-	char	   *curoperand;
-}	QTN2QTState;
-
-static void
-fillQT(QTN2QTState * state, QTNode * in)
-{
-	*(state->curitem) = *(in->valnode);
-
-	if (in->valnode->type == VAL)
-	{
-		memcpy(state->curoperand, in->word, in->valnode->length);
-		state->curitem->distance = state->curoperand - state->operand;
-		state->curoperand[in->valnode->length] = '\0';
-		state->curoperand += in->valnode->length + 1;
-		state->curitem++;
-	}
-	else
-	{
-		ITEM	   *curitem = state->curitem;
-
-		Assert(in->nchild <= 2);
-		state->curitem++;
-
-		fillQT(state, in->child[0]);
-
-		if (in->nchild == 2)
-		{
-			curitem->left = state->curitem - curitem;
-			fillQT(state, in->child[1]);
-		}
-	}
-}
-
-QUERYTYPE *
-QTN2QT(QTNode * in, MemoryType memtype)
-{
-	QUERYTYPE  *out;
-	int			len;
-	int			sumlen = 0,
-				nnode = 0;
-	QTN2QTState state;
-
-	cntsize(in, &sumlen, &nnode);
-	len = COMPUTESIZE(nnode, sumlen);
-
-	out = (QUERYTYPE *) MEMALLOC(memtype, len);
-	SET_VARSIZE(out, len);
-	out->size = nnode;
-
-	state.curitem = GETQUERY(out);
-	state.operand = state.curoperand = GETOPERAND(out);
-
-	fillQT(&state, in);
-	return out;
-}
-
-QTNode *
-QTNCopy(QTNode * in, MemoryType memtype)
-{
-	QTNode	   *out = (QTNode *) MEMALLOC(memtype, sizeof(QTNode));
-
-	*out = *in;
-	out->valnode = (ITEM *) MEMALLOC(memtype, sizeof(ITEM));
-	*(out->valnode) = *(in->valnode);
-	out->flags |= QTN_NEEDFREE;
-
-	if (in->valnode->type == VAL)
-	{
-		out->word = MEMALLOC(memtype, in->valnode->length + 1);
-		memcpy(out->word, in->word, in->valnode->length);
-		out->word[in->valnode->length] = '\0';
-		out->flags |= QTN_WORDFREE;
-	}
-	else
-	{
-		int			i;
-
-		out->child = (QTNode **) MEMALLOC(memtype, sizeof(QTNode *) * in->nchild);
-
-		for (i = 0; i < in->nchild; i++)
-			out->child[i] = QTNCopy(in->child[i], memtype);
-	}
-
-	return out;
-}
diff --git a/contrib/tsearch2/query_util.h b/contrib/tsearch2/query_util.h
deleted file mode 100644
index 5ed98e628ddf..000000000000
--- a/contrib/tsearch2/query_util.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __QUERY_UTIL_H__
-#define __QUERY_UTIL_H__
-
-#include "postgres.h"
-#include "utils/memutils.h"
-
-#include "query.h"
-#include "executor/spi.h"
-
-typedef struct QTNode
-{
-	ITEM	   *valnode;
-	uint32		flags;
-	int4		nchild;
-	char	   *word;
-	uint32		sign;
-	struct QTNode **child;
-}	QTNode;
-
-#define QTN_NEEDFREE	0x01
-#define QTN_NOCHANGE	0x02
-#define QTN_WORDFREE	0x04
-
-typedef enum
-{
-	PlainMemory,
-	SPIMemory,
-	AggMemory
-}	MemoryType;
-
-QTNode	   *QT2QTN(ITEM * in, char *operand);
-QUERYTYPE  *QTN2QT(QTNode * in, MemoryType memtype);
-void		QTNFree(QTNode * in);
-void		QTNSort(QTNode * in);
-void		QTNTernary(QTNode * in);
-void		QTNBinary(QTNode * in);
-int			QTNodeCompare(QTNode * an, QTNode * bn);
-QTNode	   *QTNCopy(QTNode * in, MemoryType memtype);
-bool		QTNEq(QTNode * a, QTNode * b);
-
-
-extern MemoryContext AggregateContext;
-
-#define MEMALLOC(us, s)			( ((us)==SPIMemory) ? SPI_palloc(s) : ( ( (us)==PlainMemory ) ? palloc(s) : MemoryContextAlloc(AggregateContext, (s)) ) )
-#define MEMFREE(us, p)			( ((us)==SPIMemory) ? SPI_pfree(p) : pfree(p) )
-
-#endif
diff --git a/contrib/tsearch2/rank.c b/contrib/tsearch2/rank.c
deleted file mode 100644
index 44edb22333be..000000000000
--- a/contrib/tsearch2/rank.c
+++ /dev/null
@@ -1,924 +0,0 @@
-/*
- * Relevation
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <math.h>
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "catalog/namespace.h"
-#include "commands/trigger.h"
-#include "executor/spi.h"
-#include "fmgr.h"
-#include "funcapi.h"
-#include "nodes/pg_list.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-
-#include "tsvector.h"
-#include "query.h"
-#include "common.h"
-
-PG_FUNCTION_INFO_V1(rank);
-Datum		rank(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(rank_def);
-Datum		rank_def(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(rank_cd);
-Datum		rank_cd(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(rank_cd_def);
-Datum		rank_cd_def(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(get_covers);
-Datum		get_covers(PG_FUNCTION_ARGS);
-
-static float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
-
-#define wpos(wep)	( w[ WEP_GETWEIGHT(wep) ] )
-
-#define RANK_NO_NORM		0x00
-#define RANK_NORM_LOGLENGTH		0x01
-#define RANK_NORM_LENGTH	0x02
-#define RANK_NORM_EXTDIST	0x04
-#define RANK_NORM_UNIQ		0x08
-#define RANK_NORM_LOGUNIQ	0x10
-#define DEF_NORM_METHOD		RANK_NO_NORM
-
-static float calc_rank_or(float *w, tsvector * t, QUERYTYPE * q);
-static float calc_rank_and(float *w, tsvector * t, QUERYTYPE * q);
-
-/*
- * Returns a weight of a word collocation
- */
-static float4
-word_distance(int4 w)
-{
-	if (w > 100)
-		return (float4)1e-30;
-
-	return 1.0 / (1.005 + 0.05 * exp(((float4) w) / 1.5 - 2));
-}
-
-static int
-cnt_length(tsvector * t)
-{
-	WordEntry  *ptr = ARRPTR(t),
-			   *end = (WordEntry *) STRPTR(t);
-	int			len = 0,
-				clen;
-
-	while (ptr < end)
-	{
-		if ((clen = POSDATALEN(t, ptr)) == 0)
-			len += 1;
-		else
-			len += clen;
-		ptr++;
-	}
-
-	return len;
-}
-
-static int4
-WordECompareITEM(char *eval, char *qval, WordEntry * ptr, ITEM * item)
-{
-	if (ptr->len == item->length)
-		return strncmp(
-					   eval + ptr->pos,
-					   qval + item->distance,
-					   item->length);
-
-	return (ptr->len > item->length) ? 1 : -1;
-}
-
-static WordEntry *
-find_wordentry(tsvector * t, QUERYTYPE * q, ITEM * item)
-{
-	WordEntry  *StopLow = ARRPTR(t);
-	WordEntry  *StopHigh = (WordEntry *) STRPTR(t);
-	WordEntry  *StopMiddle;
-	int			difference;
-
-	/* Loop invariant: StopLow <= item < StopHigh */
-
-	while (StopLow < StopHigh)
-	{
-		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
-		difference = WordECompareITEM(STRPTR(t), GETOPERAND(q), StopMiddle, item);
-		if (difference == 0)
-			return StopMiddle;
-		else if (difference < 0)
-			StopLow = StopMiddle + 1;
-		else
-			StopHigh = StopMiddle;
-	}
-
-	return NULL;
-}
-
-
-static int
-compareITEM(const void *a, const void *b, void *arg)
-{
-	char *operand = (char *) arg;
-
-	if ((*(ITEM **) a)->length == (*(ITEM **) b)->length)
-		return strncmp(operand + (*(ITEM **) a)->distance,
-					   operand + (*(ITEM **) b)->distance,
-					   (*(ITEM **) b)->length);
-
-	return ((*(ITEM **) a)->length > (*(ITEM **) b)->length) ? 1 : -1;
-}
-
-static ITEM **
-SortAndUniqItems(char *operand, ITEM * item, int *size)
-{
-	ITEM	  **res,
-			  **ptr,
-			  **prevptr;
-
-	ptr = res = (ITEM **) palloc(sizeof(ITEM *) * *size);
-
-	while ((*size)--)
-	{
-		if (item->type == VAL)
-		{
-			*ptr = item;
-			ptr++;
-		}
-		item++;
-	}
-
-	*size = ptr - res;
-	if (*size < 2)
-		return res;
-
-	qsort_arg(res, *size, sizeof(ITEM **), compareITEM, (void *) operand);
-
-	ptr = res + 1;
-	prevptr = res;
-
-	while (ptr - res < *size)
-	{
-		if (compareITEM((void *) ptr, (void *) prevptr, (void *) operand) != 0)
-		{
-			prevptr++;
-			*prevptr = *ptr;
-		}
-		ptr++;
-	}
-
-	*size = prevptr + 1 - res;
-	return res;
-}
-
-static WordEntryPos POSNULL[] = {
-	0,
-	0
-};
-
-static float
-calc_rank_and(float *w, tsvector * t, QUERYTYPE * q)
-{
-	uint16	  **pos;
-	int			i,
-				k,
-				l,
-				p;
-	WordEntry  *entry;
-	WordEntryPos *post,
-			   *ct;
-	int4		dimt,
-				lenct,
-				dist;
-	float		res = -1.0;
-	ITEM	  **item;
-	int			size = q->size;
-
-	item = SortAndUniqItems(GETOPERAND(q), GETQUERY(q), &size);
-	if (size < 2)
-	{
-		pfree(item);
-		return calc_rank_or(w, t, q);
-	}
-	pos = (uint16 **) palloc(sizeof(uint16 *) * q->size);
-	memset(pos, 0, sizeof(uint16 *) * q->size);
-	*(uint16 *) POSNULL = lengthof(POSNULL) - 1;
-	WEP_SETPOS(POSNULL[1], MAXENTRYPOS - 1);
-
-	for (i = 0; i < size; i++)
-	{
-		entry = find_wordentry(t, q, item[i]);
-		if (!entry)
-			continue;
-
-		if (entry->haspos)
-			pos[i] = (uint16 *) _POSDATAPTR(t, entry);
-		else
-			pos[i] = (uint16 *) POSNULL;
-
-
-		dimt = *(uint16 *) (pos[i]);
-		post = (WordEntryPos *) (pos[i] + 1);
-		for (k = 0; k < i; k++)
-		{
-			if (!pos[k])
-				continue;
-			lenct = *(uint16 *) (pos[k]);
-			ct = (WordEntryPos *) (pos[k] + 1);
-			for (l = 0; l < dimt; l++)
-			{
-				for (p = 0; p < lenct; p++)
-				{
-					dist = Abs((int) WEP_GETPOS(post[l]) - (int) WEP_GETPOS(ct[p]));
-					if (dist || (dist == 0 && (pos[i] == (uint16 *) POSNULL || pos[k] == (uint16 *) POSNULL)))
-					{
-						float		curw;
-
-						if (!dist)
-							dist = MAXENTRYPOS;
-						curw = sqrt(wpos(post[l]) * wpos(ct[p]) * word_distance(dist));
-						res = (res < 0) ? curw : 1.0 - (1.0 - res) * (1.0 - curw);
-					}
-				}
-			}
-		}
-	}
-	pfree(pos);
-	pfree(item);
-	return res;
-}
-
-static float
-calc_rank_or(float *w, tsvector * t, QUERYTYPE * q)
-{
-	WordEntry  *entry;
-	WordEntryPos *post;
-	int4		dimt,
-				j,
-				i;
-	float		res = 0.0;
-	ITEM	  **item;
-	int			size = q->size;
-
-	*(uint16 *) POSNULL = lengthof(POSNULL) - 1;
-	item = SortAndUniqItems(GETOPERAND(q), GETQUERY(q), &size);
-
-	for (i = 0; i < size; i++)
-	{
-		float		resj,
-					wjm;
-		int4		jm;
-
-		entry = find_wordentry(t, q, item[i]);
-		if (!entry)
-			continue;
-
-		if (entry->haspos)
-		{
-			dimt = POSDATALEN(t, entry);
-			post = POSDATAPTR(t, entry);
-		}
-		else
-		{
-			dimt = *(uint16 *) POSNULL;
-			post = POSNULL + 1;
-		}
-
-		resj = 0.0;
-		wjm = -1.0;
-		jm = 0;
-		for (j = 0; j < dimt; j++)
-		{
-			resj = resj + wpos(post[j]) / ((j + 1) * (j + 1));
-			if (wpos(post[j]) > wjm)
-			{
-				wjm = wpos(post[j]);
-				jm = j;
-			}
-		}
-/*
-		limit (sum(i/i^2),i->inf) = pi^2/6
-		resj = sum(wi/i^2),i=1,noccurence,
-		wi - should be sorted desc,
-		don't sort for now, just choose maximum weight. This should be corrected
-		Oleg Bartunov
-*/
-		res = res + (wjm + resj - wjm / ((jm + 1) * (jm + 1))) / 1.64493406685;
-	}
-	if (size > 0)
-		res = res / size;
-	pfree(item);
-	return res;
-}
-
-static float
-calc_rank(float *w, tsvector * t, QUERYTYPE * q, int4 method)
-{
-	ITEM	   *item = GETQUERY(q);
-	float		res = 0.0;
-	int			len;
-
-	if (!t->size || !q->size)
-		return 0.0;
-
-	res = (item->type != VAL && item->val == (int4) '&') ?
-		calc_rank_and(w, t, q) : calc_rank_or(w, t, q);
-
-	if (res < 0)
-		res = (float)1e-20;
-
-	if ((method & RANK_NORM_LOGLENGTH) && t->size > 0)
-		res /= log((double) (cnt_length(t) + 1)) / log(2.0);
-
-	if (method & RANK_NORM_LENGTH)
-	{
-		len = cnt_length(t);
-		if (len > 0)
-			res /= (float) len;
-	}
-
-	if ((method & RANK_NORM_UNIQ) && t->size > 0)
-		res /= (float) (t->size);
-
-	if ((method & RANK_NORM_LOGUNIQ) && t->size > 0)
-		res /= log((double) (t->size + 1)) / log(2.0);
-
-	return res;
-}
-
-Datum
-rank(PG_FUNCTION_ARGS)
-{
-	ArrayType  *win = (ArrayType *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	tsvector   *txt = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(2));
-	int			method = DEF_NORM_METHOD;
-	float		res = 0.0;
-	float		ws[lengthof(weights)];
-	float4	   *arrdata;
-	int			i;
-
-	if (ARR_NDIM(win) != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
-				 errmsg("array of weight must be one-dimensional")));
-
-	if (ARRNELEMS(win) < lengthof(weights))
-		ereport(ERROR,
-				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
-				 errmsg("array of weight is too short")));
-
-	if (ARR_HASNULL(win))
-		ereport(ERROR,
-				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-				 errmsg("array of weight must not contain nulls")));
-
-	arrdata = (float4 *) ARR_DATA_PTR(win);
-	for (i = 0; i < lengthof(weights); i++)
-	{
-		ws[i] = (arrdata[i] >= 0) ? arrdata[i] : weights[i];
-		if (ws[i] > 1.0)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("weight out of range")));
-	}
-
-	if (PG_NARGS() == 4)
-		method = PG_GETARG_INT32(3);
-
-	res = calc_rank(ws, txt, query, method);
-
-	PG_FREE_IF_COPY(win, 0);
-	PG_FREE_IF_COPY(txt, 1);
-	PG_FREE_IF_COPY(query, 2);
-	PG_RETURN_FLOAT4(res);
-}
-
-Datum
-rank_def(PG_FUNCTION_ARGS)
-{
-	tsvector   *txt = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	float		res = 0.0;
-	int			method = DEF_NORM_METHOD;
-
-	if (PG_NARGS() == 3)
-		method = PG_GETARG_INT32(2);
-
-	res = calc_rank(weights, txt, query, method);
-
-	PG_FREE_IF_COPY(txt, 0);
-	PG_FREE_IF_COPY(query, 1);
-	PG_RETURN_FLOAT4(res);
-}
-
-
-typedef struct
-{
-	ITEM	  **item;
-	int16		nitem;
-	bool		needfree;
-	uint8		wclass;
-	int32		pos;
-}	DocRepresentation;
-
-static int
-compareDocR(const void *a, const void *b)
-{
-	if (((DocRepresentation *) a)->pos == ((DocRepresentation *) b)->pos)
-		return 0;
-	return (((DocRepresentation *) a)->pos > ((DocRepresentation *) b)->pos) ? 1 : -1;
-}
-
-static bool
-checkcondition_ITEM(void *checkval, ITEM * val)
-{
-	return (bool) (val->istrue);
-}
-
-static void
-reset_istrue_flag(QUERYTYPE * query)
-{
-	ITEM	   *item = GETQUERY(query);
-	int			i;
-
-	/* reset istrue flag */
-	for (i = 0; i < query->size; i++)
-	{
-		if (item->type == VAL)
-			item->istrue = 0;
-		item++;
-	}
-}
-
-typedef struct
-{
-	int			pos;
-	int			p;
-	int			q;
-	DocRepresentation *begin;
-	DocRepresentation *end;
-}	Extention;
-
-
-static bool
-Cover(DocRepresentation * doc, int len, QUERYTYPE * query, Extention * ext)
-{
-	DocRepresentation *ptr;
-	int			lastpos = ext->pos;
-	int			i;
-	bool		found = false;
-
-	reset_istrue_flag(query);
-
-	ext->p = 0x7fffffff;
-	ext->q = 0;
-	ptr = doc + ext->pos;
-
-	/* find upper bound of cover from current position, move up */
-	while (ptr - doc < len)
-	{
-		for (i = 0; i < ptr->nitem; i++)
-			ptr->item[i]->istrue = 1;
-		if (TS_execute(GETQUERY(query), NULL, false, checkcondition_ITEM))
-		{
-			if (ptr->pos > ext->q)
-			{
-				ext->q = ptr->pos;
-				ext->end = ptr;
-				lastpos = ptr - doc;
-				found = true;
-			}
-			break;
-		}
-		ptr++;
-	}
-
-	if (!found)
-		return false;
-
-	reset_istrue_flag(query);
-
-	ptr = doc + lastpos;
-
-	/* find lower bound of cover from founded upper bound, move down */
-	while (ptr >= doc + ext->pos)
-	{
-		for (i = 0; i < ptr->nitem; i++)
-			ptr->item[i]->istrue = 1;
-		if (TS_execute(GETQUERY(query), NULL, true, checkcondition_ITEM))
-		{
-			if (ptr->pos < ext->p)
-			{
-				ext->begin = ptr;
-				ext->p = ptr->pos;
-			}
-			break;
-		}
-		ptr--;
-	}
-
-	if (ext->p <= ext->q)
-	{
-		/*
-		 * set position for next try to next lexeme after begining of founded
-		 * cover
-		 */
-		ext->pos = (ptr - doc) + 1;
-		return true;
-	}
-
-	ext->pos++;
-	return Cover(doc, len, query, ext);
-}
-
-static DocRepresentation *
-get_docrep(tsvector * txt, QUERYTYPE * query, int *doclen)
-{
-	ITEM	   *item = GETQUERY(query);
-	WordEntry  *entry;
-	WordEntryPos *post;
-	int4		dimt,
-				j,
-				i;
-	int			len = query->size * 4,
-				cur = 0;
-	DocRepresentation *doc;
-	char	   *operand;
-
-	*(uint16 *) POSNULL = lengthof(POSNULL) - 1;
-	doc = (DocRepresentation *) palloc(sizeof(DocRepresentation) * len);
-	operand = GETOPERAND(query);
-	reset_istrue_flag(query);
-
-	for (i = 0; i < query->size; i++)
-	{
-		if (item[i].type != VAL || item[i].istrue)
-			continue;
-
-		entry = find_wordentry(txt, query, &(item[i]));
-		if (!entry)
-			continue;
-
-		if (entry->haspos)
-		{
-			dimt = POSDATALEN(txt, entry);
-			post = POSDATAPTR(txt, entry);
-		}
-		else
-		{
-			dimt = *(uint16 *) POSNULL;
-			post = POSNULL + 1;
-		}
-
-		while (cur + dimt >= len)
-		{
-			len *= 2;
-			doc = (DocRepresentation *) repalloc(doc, sizeof(DocRepresentation) * len);
-		}
-
-		for (j = 0; j < dimt; j++)
-		{
-			if (j == 0)
-			{
-				ITEM	   *kptr,
-						   *iptr = item + i;
-				int			k;
-
-				doc[cur].needfree = false;
-				doc[cur].nitem = 0;
-				doc[cur].item = (ITEM **) palloc(sizeof(ITEM *) * query->size);
-
-				for (k = 0; k < query->size; k++)
-				{
-					kptr = item + k;
-					if (k == i ||
-						(item[k].type == VAL &&
-						 compareITEM(&kptr, &iptr, operand) == 0))
-					{
-						doc[cur].item[doc[cur].nitem] = item + k;
-						doc[cur].nitem++;
-						kptr->istrue = 1;
-					}
-				}
-			}
-			else
-			{
-				doc[cur].needfree = false;
-				doc[cur].nitem = doc[cur - 1].nitem;
-				doc[cur].item = doc[cur - 1].item;
-			}
-			doc[cur].pos = WEP_GETPOS(post[j]);
-			doc[cur].wclass = WEP_GETWEIGHT(post[j]);
-			cur++;
-		}
-	}
-
-	*doclen = cur;
-
-	if (cur > 0)
-	{
-		if (cur > 1)
-			qsort((void *) doc, cur, sizeof(DocRepresentation), compareDocR);
-		return doc;
-	}
-
-	pfree(doc);
-	return NULL;
-}
-
-static float4
-calc_rank_cd(float4 *arrdata, tsvector * txt, QUERYTYPE * query, int method)
-{
-	DocRepresentation *doc;
-	int			len,
-				i,
-				doclen = 0;
-	Extention	ext;
-	double		Wdoc = 0.0;
-	double		invws[lengthof(weights)];
-	double		SumDist = 0.0,
-				PrevExtPos = 0.0,
-				CurExtPos = 0.0;
-	int			NExtent = 0;
-
-	for (i = 0; i < lengthof(weights); i++)
-	{
-		invws[i] = ((double) ((arrdata[i] >= 0) ? arrdata[i] : weights[i]));
-		if (invws[i] > 1.0)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("weight out of range")));
-		invws[i] = 1.0 / invws[i];
-	}
-
-	doc = get_docrep(txt, query, &doclen);
-	if (!doc)
-		return 0.0;
-
-	MemSet(&ext, 0, sizeof(Extention));
-	while (Cover(doc, doclen, query, &ext))
-	{
-		double		Cpos = 0.0;
-		double		InvSum = 0.0;
-		int			nNoise;
-		DocRepresentation *ptr = ext.begin;
-
-		while (ptr <= ext.end)
-		{
-			InvSum += invws[ptr->wclass];
-			ptr++;
-		}
-
-		Cpos = ((double) (ext.end - ext.begin + 1)) / InvSum;
-		/*
-		 * if doc are big enough then ext.q may be equal to ext.p
-		 * due to limit of posional information. In this case we 
-		 * approximate number of noise word as half cover's
-		 * length
-		 */
-		nNoise = (ext.q - ext.p) - (ext.end - ext.begin);
-		if ( nNoise < 0 )
-			nNoise = (ext.end - ext.begin) / 2;
-		Wdoc += Cpos / ((double) (1 + nNoise));
-
-		CurExtPos = ((double) (ext.q + ext.p)) / 2.0;
-		if (NExtent > 0 && CurExtPos > PrevExtPos		/* prevent devision by
-														 * zero in a case of
-				multiple lexize */ )
-			SumDist += 1.0 / (CurExtPos - PrevExtPos);
-
-		PrevExtPos = CurExtPos;
-		NExtent++;
-	}
-
-	if ((method & RANK_NORM_LOGLENGTH) && txt->size > 0)
-		Wdoc /= log((double) (cnt_length(txt) + 1));
-
-	if (method & RANK_NORM_LENGTH)
-	{
-		len = cnt_length(txt);
-		if (len > 0)
-			Wdoc /= (double) len;
-	}
-
-	if ((method & RANK_NORM_EXTDIST) && SumDist > 0)
-		Wdoc /= ((double) NExtent) / SumDist;
-
-	if ((method & RANK_NORM_UNIQ) && txt->size > 0)
-		Wdoc /= (double) (txt->size);
-
-	if ((method & RANK_NORM_LOGUNIQ) && txt->size > 0)
-		Wdoc /= log((double) (txt->size + 1)) / log(2.0);
-
-	for (i = 0; i < doclen; i++)
-		if (doc[i].needfree)
-			pfree(doc[i].item);
-	pfree(doc);
-
-	return (float4) Wdoc;
-}
-
-Datum
-rank_cd(PG_FUNCTION_ARGS)
-{
-	ArrayType  *win;
-	tsvector   *txt = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(2));
-	int			method = DEF_NORM_METHOD;
-	float4		res;
-
-	/*
-	 * Pre-8.2, rank_cd took just a plain int as its first argument.
-	 * It was a mistake to keep the same C function name while changing the
-	 * signature, but it's too late to fix that.  Instead, do a runtime test
-	 * to make sure the expected datatype has been passed.  This is needed
-	 * to prevent core dumps if tsearch2 function definitions from an old
-	 * database are loaded into an 8.2 server.
-	 */
-	if (get_fn_expr_argtype(fcinfo->flinfo, 0) != FLOAT4ARRAYOID)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
-				 errmsg("rank_cd() now takes real[] as its first argument, not integer")));
-
-	/* now safe to dereference the first arg */
-	win = (ArrayType *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-
-	if (ARR_NDIM(win) != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
-				 errmsg("array of weight must be one-dimensional")));
-
-	if (ARRNELEMS(win) < lengthof(weights))
-		ereport(ERROR,
-				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
-				 errmsg("array of weight is too short")));
-
-	if (ARR_HASNULL(win))
-		ereport(ERROR,
-				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-				 errmsg("array of weight must not contain nulls")));
-
-	if (PG_NARGS() == 4)
-		method = PG_GETARG_INT32(3);
-
-	res = calc_rank_cd((float4 *) ARR_DATA_PTR(win), txt, query, method);
-
-	PG_FREE_IF_COPY(win, 0);
-	PG_FREE_IF_COPY(txt, 1);
-	PG_FREE_IF_COPY(query, 2);
-
-	PG_RETURN_FLOAT4(res);
-}
-
-
-Datum
-rank_cd_def(PG_FUNCTION_ARGS)
-{
-	tsvector   *txt = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1));
-	float4		res;
-
-	res = calc_rank_cd(weights, txt, query, (PG_NARGS() == 3) ? PG_GETARG_DATUM(2) : DEF_NORM_METHOD);
-
-	PG_FREE_IF_COPY(txt, 0);
-	PG_FREE_IF_COPY(query, 1);
-
-	PG_RETURN_FLOAT4(res);
-}
-
-/**************debug*************/
-
-typedef struct
-{
-	char	   *w;
-	int2		len;
-	int2		pos;
-	int2		start;
-	int2		finish;
-}	DocWord;
-
-static int
-compareDocWord(const void *a, const void *b)
-{
-	if (((DocWord *) a)->pos == ((DocWord *) b)->pos)
-		return 0;
-	return (((DocWord *) a)->pos > ((DocWord *) b)->pos) ? 1 : -1;
-}
-
-
-Datum
-get_covers(PG_FUNCTION_ARGS)
-{
-	tsvector   *txt = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(1));
-	WordEntry  *pptr = ARRPTR(txt);
-	int			i,
-				dlen = 0,
-				j,
-				cur = 0,
-				len = 0,
-				rlen;
-	DocWord    *dw,
-			   *dwptr;
-	text	   *out;
-	char	   *cptr;
-	DocRepresentation *doc;
-	int			olddwpos = 0;
-	int			ncover = 1;
-	Extention	ext;
-
-	doc = get_docrep(txt, query, &rlen);
-
-	if (!doc)
-	{
-		out = palloc(VARHDRSZ);
-		SET_VARSIZE(out, VARHDRSZ);
-		PG_FREE_IF_COPY(txt, 0);
-		PG_FREE_IF_COPY(query, 1);
-		PG_RETURN_POINTER(out);
-	}
-
-	for (i = 0; i < txt->size; i++)
-	{
-		if (!pptr[i].haspos)
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("no pos info")));
-		dlen += POSDATALEN(txt, &(pptr[i]));
-	}
-
-	dwptr = dw = palloc(sizeof(DocWord) * dlen);
-	memset(dw, 0, sizeof(DocWord) * dlen);
-
-	for (i = 0; i < txt->size; i++)
-	{
-		WordEntryPos *posdata = POSDATAPTR(txt, &(pptr[i]));
-
-		for (j = 0; j < POSDATALEN(txt, &(pptr[i])); j++)
-		{
-			dw[cur].w = STRPTR(txt) + pptr[i].pos;
-			dw[cur].len = pptr[i].len;
-			dw[cur].pos = WEP_GETPOS(posdata[j]);
-			cur++;
-		}
-		len += (pptr[i].len + 1) * (int) POSDATALEN(txt, &(pptr[i]));
-	}
-	qsort((void *) dw, dlen, sizeof(DocWord), compareDocWord);
-
-	MemSet(&ext, 0, sizeof(Extention));
-	while (Cover(doc, rlen, query, &ext))
-	{
-		dwptr = dw + olddwpos;
-		while (dwptr->pos < ext.p && dwptr - dw < dlen)
-			dwptr++;
-		olddwpos = dwptr - dw;
-		dwptr->start = ncover;
-		while (dwptr->pos < ext.q + 1 && dwptr - dw < dlen)
-			dwptr++;
-		(dwptr - 1)->finish = ncover;
-		len += 4 /* {}+two spaces */ + 2 * 16 /* numbers */ ;
-		ncover++;
-	}
-
-	out = palloc(VARHDRSZ + len);
-	cptr = ((char *) out) + VARHDRSZ;
-	dwptr = dw;
-
-	while (dwptr - dw < dlen)
-	{
-		if (dwptr->start)
-		{
-			sprintf(cptr, "{%d ", dwptr->start);
-			cptr = strchr(cptr, '\0');
-		}
-		memcpy(cptr, dwptr->w, dwptr->len);
-		cptr += dwptr->len;
-		*cptr = ' ';
-		cptr++;
-		if (dwptr->finish)
-		{
-			sprintf(cptr, "}%d ", dwptr->finish);
-			cptr = strchr(cptr, '\0');
-		}
-		dwptr++;
-	}
-
-	SET_VARSIZE(out, cptr - ((char *) out));
-
-	pfree(dw);
-	for (i = 0; i < rlen; i++)
-		if (doc[i].needfree)
-			pfree(doc[i].item);
-	pfree(doc);
-
-	PG_FREE_IF_COPY(txt, 0);
-	PG_FREE_IF_COPY(query, 1);
-	PG_RETURN_POINTER(out);
-}
diff --git a/contrib/tsearch2/snmap.c b/contrib/tsearch2/snmap.c
deleted file mode 100644
index 9aa0e2214f6b..000000000000
--- a/contrib/tsearch2/snmap.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * simple but fast map from str to Oid
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include "snmap.h"
-#include "common.h"
-
-static int
-compareSNMapEntry(const void *a, const void *b)
-{
-	if (((SNMapEntry *) a)->nsp < ((SNMapEntry *) b)->nsp)
-		return -1;
-	else if (((SNMapEntry *) a)->nsp > ((SNMapEntry *) b)->nsp)
-		return 1;
-	else
-		return strcmp(((SNMapEntry *) a)->key, ((SNMapEntry *) b)->key);
-}
-
-void
-addSNMap(SNMap * map, char *key, Oid value)
-{
-	if (map->len >= map->reallen)
-	{
-		SNMapEntry *tmp;
-		int			len = (map->reallen) ? 2 * map->reallen : 16;
-
-		tmp = (SNMapEntry *) realloc(map->list, sizeof(SNMapEntry) * len);
-		if (!tmp)
-			ereport(ERROR,
-					(errcode(ERRCODE_OUT_OF_MEMORY),
-					 errmsg("out of memory")));
-		map->reallen = len;
-		map->list = tmp;
-	}
-	map->list[map->len].key = strdup(key);
-	if (!map->list[map->len].key)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	map->list[map->len].nsp = get_oidnamespace(TSNSP_FunctionOid);
-	map->list[map->len].value = value;
-	map->len++;
-	if (map->len > 1)
-		qsort(map->list, map->len, sizeof(SNMapEntry), compareSNMapEntry);
-}
-
-void
-addSNMap_t(SNMap * map, text *key, Oid value)
-{
-	char	   *k = text2char(key);
-
-	addSNMap(map, k, value);
-	pfree(k);
-}
-
-Oid
-findSNMap(SNMap * map, char *key)
-{
-	SNMapEntry *ptr;
-	SNMapEntry	ks;
-
-	ks.key = key;
-	ks.nsp = get_oidnamespace(TSNSP_FunctionOid);
-	ks.value = 0;
-
-	if (map->len == 0 || !map->list)
-		return 0;
-	ptr = (SNMapEntry *) bsearch(&ks, map->list, map->len, sizeof(SNMapEntry), compareSNMapEntry);
-	return (ptr) ? ptr->value : 0;
-}
-
-Oid
-findSNMap_t(SNMap * map, text *key)
-{
-	char	   *k = text2char(key);
-	int			res;
-
-	res = findSNMap(map, k);
-	pfree(k);
-	return res;
-}
-
-void
-freeSNMap(SNMap * map)
-{
-	SNMapEntry *entry = map->list;
-
-	if (map->list)
-	{
-		while (map->len)
-		{
-			if (entry->key)
-				free(entry->key);
-			entry++;
-			map->len--;
-		}
-		free(map->list);
-	}
-	memset(map, 0, sizeof(SNMap));
-}
diff --git a/contrib/tsearch2/snmap.h b/contrib/tsearch2/snmap.h
deleted file mode 100644
index c3e80fca57c4..000000000000
--- a/contrib/tsearch2/snmap.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __SNMAP_H__
-#define __SNMAP_H__
-
-#include "postgres.h"
-
-typedef struct
-{
-	char	   *key;
-	Oid			value;
-	Oid			nsp;
-}	SNMapEntry;
-
-typedef struct
-{
-	int			len;
-	int			reallen;
-	SNMapEntry *list;
-}	SNMap;
-
-void		addSNMap(SNMap * map, char *key, Oid value);
-void		addSNMap_t(SNMap * map, text *key, Oid value);
-Oid			findSNMap(SNMap * map, char *key);
-Oid			findSNMap_t(SNMap * map, text *key);
-void		freeSNMap(SNMap * map);
-
-#endif
diff --git a/contrib/tsearch2/snowball/Makefile b/contrib/tsearch2/snowball/Makefile
deleted file mode 100644
index aa94658f6578..000000000000
--- a/contrib/tsearch2/snowball/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.9 2006/01/27 16:32:31 teodor Exp $
-
-SUBOBJS = english_stem.o api.o russian_stem.o russian_stem_UTF8.o utilities.o
-
-EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
-
-PG_CPPFLAGS = -I$(srcdir)/..
-
-ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
-include $(PGXS)
-else
-subdir = contrib/tsearch2/snowball
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
-
-override CFLAGS += $(CFLAGS_SL)
-
-all: SUBSYS.o
-
-SUBSYS.o: $(SUBOBJS)
-	$(LD) $(LDREL) $(LDOUT) $@ $^
-
-
diff --git a/contrib/tsearch2/snowball/api.c b/contrib/tsearch2/snowball/api.c
deleted file mode 100644
index 78e4fe0eefec..000000000000
--- a/contrib/tsearch2/snowball/api.c
+++ /dev/null
@@ -1,85 +0,0 @@
-
-#include <stdlib.h>				/* for calloc, free */
-#include "header.h"
-
-extern struct SN_env *
-SN_create_env(int S_size, int I_size, int B_size)
-{
-	struct SN_env *z = (struct SN_env *) calloc(1, sizeof(struct SN_env));
-
-	if (z == NULL)
-		return NULL;
-	z->p = create_s();
-	if (z->p == NULL)
-		goto error;
-	if (S_size)
-	{
-		int			i;
-
-		z->S = (symbol * *) calloc(S_size, sizeof(symbol *));
-		if (z->S == NULL)
-			goto error;
-
-		for (i = 0; i < S_size; i++)
-		{
-			z->S[i] = create_s();
-			if (z->S[i] == NULL)
-				goto error;
-		}
-		z->S_size = S_size;
-	}
-
-	if (I_size)
-	{
-		z->I = (int *) calloc(I_size, sizeof(int));
-		if (z->I == NULL)
-			goto error;
-		z->I_size = I_size;
-	}
-
-	if (B_size)
-	{
-		z->B = (symbol *) calloc(B_size, sizeof(symbol));
-		if (z->B == NULL)
-			goto error;
-		z->B_size = B_size;
-	}
-
-	return z;
-error:
-	SN_close_env(z);
-	return NULL;
-}
-
-extern void
-SN_close_env(struct SN_env * z)
-{
-	if (z == NULL)
-		return;
-	if (z->S_size)
-	{
-		int			i;
-
-		for (i = 0; i < z->S_size; i++)
-		{
-			lose_s(z->S[i]);
-		}
-		free(z->S);
-	}
-	if (z->I_size)
-		free(z->I);
-	if (z->B_size)
-		free(z->B);
-	if (z->p)
-		lose_s(z->p);
-	free(z);
-}
-
-extern int
-SN_set_current(struct SN_env * z, int size, const symbol * s)
-{
-	int			err = replace_s(z, 0, z->l, size, s, NULL);
-
-	z->c = 0;
-	return err;
-}
diff --git a/contrib/tsearch2/snowball/english_stem.c b/contrib/tsearch2/snowball/english_stem.c
deleted file mode 100644
index 9f6f65491c77..000000000000
--- a/contrib/tsearch2/snowball/english_stem.c
+++ /dev/null
@@ -1,1623 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/snowball/english_stem.c,v 1.8 2006/03/11 04:38:30 momjian Exp $ */
-
-/* This file was generated automatically by the Snowball to ANSI C compiler */
-
-#include "header.h"
-
-extern int	english_ISO_8859_1_stem(struct SN_env * z);
-static int	r_exception2(struct SN_env * z);
-static int	r_exception1(struct SN_env * z);
-static int	r_Step_5(struct SN_env * z);
-static int	r_Step_4(struct SN_env * z);
-static int	r_Step_3(struct SN_env * z);
-static int	r_Step_2(struct SN_env * z);
-static int	r_Step_1c(struct SN_env * z);
-static int	r_Step_1b(struct SN_env * z);
-static int	r_Step_1a(struct SN_env * z);
-static int	r_R2(struct SN_env * z);
-static int	r_R1(struct SN_env * z);
-static int	r_shortv(struct SN_env * z);
-static int	r_mark_regions(struct SN_env * z);
-static int	r_postlude(struct SN_env * z);
-static int	r_prelude(struct SN_env * z);
-
-extern struct SN_env *english_ISO_8859_1_create_env(void);
-extern void english_ISO_8859_1_close_env(struct SN_env * z);
-
-static symbol s_0_0[6] = {'c', 'o', 'm', 'm', 'u', 'n'};
-static symbol s_0_1[5] = {'g', 'e', 'n', 'e', 'r'};
-
-static struct among a_0[2] =
-{
-	 /* 0 */ {6, s_0_0, -1, -1, 0},
-	 /* 1 */ {5, s_0_1, -1, -1, 0}
-};
-
-static symbol s_1_0[1] = {'\''};
-static symbol s_1_1[3] = {'\'', 's', '\''};
-static symbol s_1_2[2] = {'\'', 's'};
-
-static struct among a_1[3] =
-{
-	 /* 0 */ {1, s_1_0, -1, 1, 0},
-	 /* 1 */ {3, s_1_1, 0, 1, 0},
-	 /* 2 */ {2, s_1_2, -1, 1, 0}
-};
-
-static symbol s_2_0[3] = {'i', 'e', 'd'};
-static symbol s_2_1[1] = {'s'};
-static symbol s_2_2[3] = {'i', 'e', 's'};
-static symbol s_2_3[4] = {'s', 's', 'e', 's'};
-static symbol s_2_4[2] = {'s', 's'};
-static symbol s_2_5[2] = {'u', 's'};
-
-static struct among a_2[6] =
-{
-	 /* 0 */ {3, s_2_0, -1, 2, 0},
-	 /* 1 */ {1, s_2_1, -1, 3, 0},
-	 /* 2 */ {3, s_2_2, 1, 2, 0},
-	 /* 3 */ {4, s_2_3, 1, 1, 0},
-	 /* 4 */ {2, s_2_4, 1, -1, 0},
-	 /* 5 */ {2, s_2_5, 1, -1, 0}
-};
-
-static symbol s_3_1[2] = {'b', 'b'};
-static symbol s_3_2[2] = {'d', 'd'};
-static symbol s_3_3[2] = {'f', 'f'};
-static symbol s_3_4[2] = {'g', 'g'};
-static symbol s_3_5[2] = {'b', 'l'};
-static symbol s_3_6[2] = {'m', 'm'};
-static symbol s_3_7[2] = {'n', 'n'};
-static symbol s_3_8[2] = {'p', 'p'};
-static symbol s_3_9[2] = {'r', 'r'};
-static symbol s_3_10[2] = {'a', 't'};
-static symbol s_3_11[2] = {'t', 't'};
-static symbol s_3_12[2] = {'i', 'z'};
-
-static struct among a_3[13] =
-{
-	 /* 0 */ {0, 0, -1, 3, 0},
-	 /* 1 */ {2, s_3_1, 0, 2, 0},
-	 /* 2 */ {2, s_3_2, 0, 2, 0},
-	 /* 3 */ {2, s_3_3, 0, 2, 0},
-	 /* 4 */ {2, s_3_4, 0, 2, 0},
-	 /* 5 */ {2, s_3_5, 0, 1, 0},
-	 /* 6 */ {2, s_3_6, 0, 2, 0},
-	 /* 7 */ {2, s_3_7, 0, 2, 0},
-	 /* 8 */ {2, s_3_8, 0, 2, 0},
-	 /* 9 */ {2, s_3_9, 0, 2, 0},
-	 /* 10 */ {2, s_3_10, 0, 1, 0},
-	 /* 11 */ {2, s_3_11, 0, 2, 0},
-	 /* 12 */ {2, s_3_12, 0, 1, 0}
-};
-
-static symbol s_4_0[2] = {'e', 'd'};
-static symbol s_4_1[3] = {'e', 'e', 'd'};
-static symbol s_4_2[3] = {'i', 'n', 'g'};
-static symbol s_4_3[4] = {'e', 'd', 'l', 'y'};
-static symbol s_4_4[5] = {'e', 'e', 'd', 'l', 'y'};
-static symbol s_4_5[5] = {'i', 'n', 'g', 'l', 'y'};
-
-static struct among a_4[6] =
-{
-	 /* 0 */ {2, s_4_0, -1, 2, 0},
-	 /* 1 */ {3, s_4_1, 0, 1, 0},
-	 /* 2 */ {3, s_4_2, -1, 2, 0},
-	 /* 3 */ {4, s_4_3, -1, 2, 0},
-	 /* 4 */ {5, s_4_4, 3, 1, 0},
-	 /* 5 */ {5, s_4_5, -1, 2, 0}
-};
-
-static symbol s_5_0[4] = {'a', 'n', 'c', 'i'};
-static symbol s_5_1[4] = {'e', 'n', 'c', 'i'};
-static symbol s_5_2[3] = {'o', 'g', 'i'};
-static symbol s_5_3[2] = {'l', 'i'};
-static symbol s_5_4[3] = {'b', 'l', 'i'};
-static symbol s_5_5[4] = {'a', 'b', 'l', 'i'};
-static symbol s_5_6[4] = {'a', 'l', 'l', 'i'};
-static symbol s_5_7[5] = {'f', 'u', 'l', 'l', 'i'};
-static symbol s_5_8[6] = {'l', 'e', 's', 's', 'l', 'i'};
-static symbol s_5_9[5] = {'o', 'u', 's', 'l', 'i'};
-static symbol s_5_10[5] = {'e', 'n', 't', 'l', 'i'};
-static symbol s_5_11[5] = {'a', 'l', 'i', 't', 'i'};
-static symbol s_5_12[6] = {'b', 'i', 'l', 'i', 't', 'i'};
-static symbol s_5_13[5] = {'i', 'v', 'i', 't', 'i'};
-static symbol s_5_14[6] = {'t', 'i', 'o', 'n', 'a', 'l'};
-static symbol s_5_15[7] = {'a', 't', 'i', 'o', 'n', 'a', 'l'};
-static symbol s_5_16[5] = {'a', 'l', 'i', 's', 'm'};
-static symbol s_5_17[5] = {'a', 't', 'i', 'o', 'n'};
-static symbol s_5_18[7] = {'i', 'z', 'a', 't', 'i', 'o', 'n'};
-static symbol s_5_19[4] = {'i', 'z', 'e', 'r'};
-static symbol s_5_20[4] = {'a', 't', 'o', 'r'};
-static symbol s_5_21[7] = {'i', 'v', 'e', 'n', 'e', 's', 's'};
-static symbol s_5_22[7] = {'f', 'u', 'l', 'n', 'e', 's', 's'};
-static symbol s_5_23[7] = {'o', 'u', 's', 'n', 'e', 's', 's'};
-
-static struct among a_5[24] =
-{
-	 /* 0 */ {4, s_5_0, -1, 3, 0},
-	 /* 1 */ {4, s_5_1, -1, 2, 0},
-	 /* 2 */ {3, s_5_2, -1, 13, 0},
-	 /* 3 */ {2, s_5_3, -1, 16, 0},
-	 /* 4 */ {3, s_5_4, 3, 12, 0},
-	 /* 5 */ {4, s_5_5, 4, 4, 0},
-	 /* 6 */ {4, s_5_6, 3, 8, 0},
-	 /* 7 */ {5, s_5_7, 3, 14, 0},
-	 /* 8 */ {6, s_5_8, 3, 15, 0},
-	 /* 9 */ {5, s_5_9, 3, 10, 0},
-	 /* 10 */ {5, s_5_10, 3, 5, 0},
-	 /* 11 */ {5, s_5_11, -1, 8, 0},
-	 /* 12 */ {6, s_5_12, -1, 12, 0},
-	 /* 13 */ {5, s_5_13, -1, 11, 0},
-	 /* 14 */ {6, s_5_14, -1, 1, 0},
-	 /* 15 */ {7, s_5_15, 14, 7, 0},
-	 /* 16 */ {5, s_5_16, -1, 8, 0},
-	 /* 17 */ {5, s_5_17, -1, 7, 0},
-	 /* 18 */ {7, s_5_18, 17, 6, 0},
-	 /* 19 */ {4, s_5_19, -1, 6, 0},
-	 /* 20 */ {4, s_5_20, -1, 7, 0},
-	 /* 21 */ {7, s_5_21, -1, 11, 0},
-	 /* 22 */ {7, s_5_22, -1, 9, 0},
-	 /* 23 */ {7, s_5_23, -1, 10, 0}
-};
-
-static symbol s_6_0[5] = {'i', 'c', 'a', 't', 'e'};
-static symbol s_6_1[5] = {'a', 't', 'i', 'v', 'e'};
-static symbol s_6_2[5] = {'a', 'l', 'i', 'z', 'e'};
-static symbol s_6_3[5] = {'i', 'c', 'i', 't', 'i'};
-static symbol s_6_4[4] = {'i', 'c', 'a', 'l'};
-static symbol s_6_5[6] = {'t', 'i', 'o', 'n', 'a', 'l'};
-static symbol s_6_6[7] = {'a', 't', 'i', 'o', 'n', 'a', 'l'};
-static symbol s_6_7[3] = {'f', 'u', 'l'};
-static symbol s_6_8[4] = {'n', 'e', 's', 's'};
-
-static struct among a_6[9] =
-{
-	 /* 0 */ {5, s_6_0, -1, 4, 0},
-	 /* 1 */ {5, s_6_1, -1, 6, 0},
-	 /* 2 */ {5, s_6_2, -1, 3, 0},
-	 /* 3 */ {5, s_6_3, -1, 4, 0},
-	 /* 4 */ {4, s_6_4, -1, 4, 0},
-	 /* 5 */ {6, s_6_5, -1, 1, 0},
-	 /* 6 */ {7, s_6_6, 5, 2, 0},
-	 /* 7 */ {3, s_6_7, -1, 5, 0},
-	 /* 8 */ {4, s_6_8, -1, 5, 0}
-};
-
-static symbol s_7_0[2] = {'i', 'c'};
-static symbol s_7_1[4] = {'a', 'n', 'c', 'e'};
-static symbol s_7_2[4] = {'e', 'n', 'c', 'e'};
-static symbol s_7_3[4] = {'a', 'b', 'l', 'e'};
-static symbol s_7_4[4] = {'i', 'b', 'l', 'e'};
-static symbol s_7_5[3] = {'a', 't', 'e'};
-static symbol s_7_6[3] = {'i', 'v', 'e'};
-static symbol s_7_7[3] = {'i', 'z', 'e'};
-static symbol s_7_8[3] = {'i', 't', 'i'};
-static symbol s_7_9[2] = {'a', 'l'};
-static symbol s_7_10[3] = {'i', 's', 'm'};
-static symbol s_7_11[3] = {'i', 'o', 'n'};
-static symbol s_7_12[2] = {'e', 'r'};
-static symbol s_7_13[3] = {'o', 'u', 's'};
-static symbol s_7_14[3] = {'a', 'n', 't'};
-static symbol s_7_15[3] = {'e', 'n', 't'};
-static symbol s_7_16[4] = {'m', 'e', 'n', 't'};
-static symbol s_7_17[5] = {'e', 'm', 'e', 'n', 't'};
-
-static struct among a_7[18] =
-{
-	 /* 0 */ {2, s_7_0, -1, 1, 0},
-	 /* 1 */ {4, s_7_1, -1, 1, 0},
-	 /* 2 */ {4, s_7_2, -1, 1, 0},
-	 /* 3 */ {4, s_7_3, -1, 1, 0},
-	 /* 4 */ {4, s_7_4, -1, 1, 0},
-	 /* 5 */ {3, s_7_5, -1, 1, 0},
-	 /* 6 */ {3, s_7_6, -1, 1, 0},
-	 /* 7 */ {3, s_7_7, -1, 1, 0},
-	 /* 8 */ {3, s_7_8, -1, 1, 0},
-	 /* 9 */ {2, s_7_9, -1, 1, 0},
-	 /* 10 */ {3, s_7_10, -1, 1, 0},
-	 /* 11 */ {3, s_7_11, -1, 2, 0},
-	 /* 12 */ {2, s_7_12, -1, 1, 0},
-	 /* 13 */ {3, s_7_13, -1, 1, 0},
-	 /* 14 */ {3, s_7_14, -1, 1, 0},
-	 /* 15 */ {3, s_7_15, -1, 1, 0},
-	 /* 16 */ {4, s_7_16, 15, 1, 0},
-	 /* 17 */ {5, s_7_17, 16, 1, 0}
-};
-
-static symbol s_8_0[1] = {'e'};
-static symbol s_8_1[1] = {'l'};
-
-static struct among a_8[2] =
-{
-	 /* 0 */ {1, s_8_0, -1, 1, 0},
-	 /* 1 */ {1, s_8_1, -1, 2, 0}
-};
-
-static symbol s_9_0[7] = {'s', 'u', 'c', 'c', 'e', 'e', 'd'};
-static symbol s_9_1[7] = {'p', 'r', 'o', 'c', 'e', 'e', 'd'};
-static symbol s_9_2[6] = {'e', 'x', 'c', 'e', 'e', 'd'};
-static symbol s_9_3[7] = {'c', 'a', 'n', 'n', 'i', 'n', 'g'};
-static symbol s_9_4[6] = {'i', 'n', 'n', 'i', 'n', 'g'};
-static symbol s_9_5[7] = {'e', 'a', 'r', 'r', 'i', 'n', 'g'};
-static symbol s_9_6[7] = {'h', 'e', 'r', 'r', 'i', 'n', 'g'};
-static symbol s_9_7[6] = {'o', 'u', 't', 'i', 'n', 'g'};
-
-static struct among a_9[8] =
-{
-	 /* 0 */ {7, s_9_0, -1, -1, 0},
-	 /* 1 */ {7, s_9_1, -1, -1, 0},
-	 /* 2 */ {6, s_9_2, -1, -1, 0},
-	 /* 3 */ {7, s_9_3, -1, -1, 0},
-	 /* 4 */ {6, s_9_4, -1, -1, 0},
-	 /* 5 */ {7, s_9_5, -1, -1, 0},
-	 /* 6 */ {7, s_9_6, -1, -1, 0},
-	 /* 7 */ {6, s_9_7, -1, -1, 0}
-};
-
-static symbol s_10_0[5] = {'a', 'n', 'd', 'e', 's'};
-static symbol s_10_1[5] = {'a', 't', 'l', 'a', 's'};
-static symbol s_10_2[4] = {'b', 'i', 'a', 's'};
-static symbol s_10_3[6] = {'c', 'o', 's', 'm', 'o', 's'};
-static symbol s_10_4[5] = {'d', 'y', 'i', 'n', 'g'};
-static symbol s_10_5[5] = {'e', 'a', 'r', 'l', 'y'};
-static symbol s_10_6[6] = {'g', 'e', 'n', 't', 'l', 'y'};
-static symbol s_10_7[4] = {'h', 'o', 'w', 'e'};
-static symbol s_10_8[4] = {'i', 'd', 'l', 'y'};
-static symbol s_10_9[5] = {'l', 'y', 'i', 'n', 'g'};
-static symbol s_10_10[4] = {'n', 'e', 'w', 's'};
-static symbol s_10_11[4] = {'o', 'n', 'l', 'y'};
-static symbol s_10_12[6] = {'s', 'i', 'n', 'g', 'l', 'y'};
-static symbol s_10_13[5] = {'s', 'k', 'i', 'e', 's'};
-static symbol s_10_14[4] = {'s', 'k', 'i', 's'};
-static symbol s_10_15[3] = {'s', 'k', 'y'};
-static symbol s_10_16[5] = {'t', 'y', 'i', 'n', 'g'};
-static symbol s_10_17[4] = {'u', 'g', 'l', 'y'};
-
-static struct among a_10[18] =
-{
-	 /* 0 */ {5, s_10_0, -1, -1, 0},
-	 /* 1 */ {5, s_10_1, -1, -1, 0},
-	 /* 2 */ {4, s_10_2, -1, -1, 0},
-	 /* 3 */ {6, s_10_3, -1, -1, 0},
-	 /* 4 */ {5, s_10_4, -1, 3, 0},
-	 /* 5 */ {5, s_10_5, -1, 9, 0},
-	 /* 6 */ {6, s_10_6, -1, 7, 0},
-	 /* 7 */ {4, s_10_7, -1, -1, 0},
-	 /* 8 */ {4, s_10_8, -1, 6, 0},
-	 /* 9 */ {5, s_10_9, -1, 4, 0},
-	 /* 10 */ {4, s_10_10, -1, -1, 0},
-	 /* 11 */ {4, s_10_11, -1, 10, 0},
-	 /* 12 */ {6, s_10_12, -1, 11, 0},
-	 /* 13 */ {5, s_10_13, -1, 2, 0},
-	 /* 14 */ {4, s_10_14, -1, 1, 0},
-	 /* 15 */ {3, s_10_15, -1, -1, 0},
-	 /* 16 */ {5, s_10_16, -1, 5, 0},
-	 /* 17 */ {4, s_10_17, -1, 8, 0}
-};
-
-static unsigned char g_v[] = {17, 65, 16, 1};
-
-static unsigned char g_v_WXY[] = {1, 17, 65, 208, 1};
-
-static unsigned char g_valid_LI[] = {55, 141, 2};
-
-static symbol s_0[] = {'\''};
-static symbol s_1[] = {'y'};
-static symbol s_2[] = {'Y'};
-static symbol s_3[] = {'y'};
-static symbol s_4[] = {'Y'};
-static symbol s_5[] = {'s', 's'};
-static symbol s_6[] = {'i', 'e'};
-static symbol s_7[] = {'i'};
-static symbol s_8[] = {'e', 'e'};
-static symbol s_9[] = {'e'};
-static symbol s_10[] = {'e'};
-static symbol s_11[] = {'y'};
-static symbol s_12[] = {'Y'};
-static symbol s_13[] = {'i'};
-static symbol s_14[] = {'t', 'i', 'o', 'n'};
-static symbol s_15[] = {'e', 'n', 'c', 'e'};
-static symbol s_16[] = {'a', 'n', 'c', 'e'};
-static symbol s_17[] = {'a', 'b', 'l', 'e'};
-static symbol s_18[] = {'e', 'n', 't'};
-static symbol s_19[] = {'i', 'z', 'e'};
-static symbol s_20[] = {'a', 't', 'e'};
-static symbol s_21[] = {'a', 'l'};
-static symbol s_22[] = {'f', 'u', 'l'};
-static symbol s_23[] = {'o', 'u', 's'};
-static symbol s_24[] = {'i', 'v', 'e'};
-static symbol s_25[] = {'b', 'l', 'e'};
-static symbol s_26[] = {'l'};
-static symbol s_27[] = {'o', 'g'};
-static symbol s_28[] = {'f', 'u', 'l'};
-static symbol s_29[] = {'l', 'e', 's', 's'};
-static symbol s_30[] = {'t', 'i', 'o', 'n'};
-static symbol s_31[] = {'a', 't', 'e'};
-static symbol s_32[] = {'a', 'l'};
-static symbol s_33[] = {'i', 'c'};
-static symbol s_34[] = {'s'};
-static symbol s_35[] = {'t'};
-static symbol s_36[] = {'l'};
-static symbol s_37[] = {'s', 'k', 'i'};
-static symbol s_38[] = {'s', 'k', 'y'};
-static symbol s_39[] = {'d', 'i', 'e'};
-static symbol s_40[] = {'l', 'i', 'e'};
-static symbol s_41[] = {'t', 'i', 'e'};
-static symbol s_42[] = {'i', 'd', 'l'};
-static symbol s_43[] = {'g', 'e', 'n', 't', 'l'};
-static symbol s_44[] = {'u', 'g', 'l', 'i'};
-static symbol s_45[] = {'e', 'a', 'r', 'l', 'i'};
-static symbol s_46[] = {'o', 'n', 'l', 'i'};
-static symbol s_47[] = {'s', 'i', 'n', 'g', 'l'};
-static symbol s_48[] = {'Y'};
-static symbol s_49[] = {'y'};
-
-static int
-r_prelude(struct SN_env * z)
-{
-	z->B[0] = 0;				/* unset Y_found, line 26 */
-	{
-		int			c = z->c;	/* do, line 27 */
-
-		z->bra = z->c;			/* [, line 27 */
-		if (!(eq_s(z, 1, s_0)))
-			goto lab0;
-		z->ket = z->c;			/* ], line 27 */
-		{
-			int			ret;
-
-			ret = slice_del(z); /* delete, line 27 */
-			if (ret < 0)
-				return ret;
-		}
-lab0:
-		z->c = c;
-	}
-	{
-		int			c = z->c;	/* do, line 28 */
-
-		z->bra = z->c;			/* [, line 28 */
-		if (!(eq_s(z, 1, s_1)))
-			goto lab1;
-		z->ket = z->c;			/* ], line 28 */
-		if (!(in_grouping(z, g_v, 97, 121)))
-			goto lab1;
-		{
-			int			ret;
-
-			ret = slice_from_s(z, 1, s_2);		/* <-, line 28 */
-			if (ret < 0)
-				return ret;
-		}
-		z->B[0] = 1;			/* set Y_found, line 28 */
-lab1:
-		z->c = c;
-	}
-	{
-		int			c = z->c;	/* do, line 29 */
-
-		while (1)
-		{						/* repeat, line 29 */
-			int			c = z->c;
-
-			while (1)
-			{					/* goto, line 29 */
-				int			c = z->c;
-
-				if (!(in_grouping(z, g_v, 97, 121)))
-					goto lab4;
-				z->bra = z->c;	/* [, line 29 */
-				if (!(eq_s(z, 1, s_3)))
-					goto lab4;
-				z->ket = z->c;	/* ], line 29 */
-				z->c = c;
-				break;
-		lab4:
-				z->c = c;
-				if (z->c >= z->l)
-					goto lab3;
-				z->c++;			/* goto, line 29 */
-			}
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 1, s_4);	/* <-, line 29 */
-				if (ret < 0)
-					return ret;
-			}
-			z->B[0] = 1;		/* set Y_found, line 29 */
-			continue;
-	lab3:
-			z->c = c;
-			break;
-		}
-		z->c = c;
-	}
-	return 1;
-}
-
-static int
-r_mark_regions(struct SN_env * z)
-{
-	z->I[0] = z->l;
-	z->I[1] = z->l;
-	{
-		int			c = z->c;	/* do, line 35 */
-
-		{
-			int			c = z->c;		/* or, line 40 */
-
-			if (!(find_among(z, a_0, 2)))
-				goto lab2;		/* among, line 36 */
-			goto lab1;
-	lab2:
-			z->c = c;
-			while (1)
-			{					/* gopast, line 40 */
-				if (!(in_grouping(z, g_v, 97, 121)))
-					goto lab3;
-				break;
-		lab3:
-				if (z->c >= z->l)
-					goto lab0;
-				z->c++;			/* gopast, line 40 */
-			}
-			while (1)
-			{					/* gopast, line 40 */
-				if (!(out_grouping(z, g_v, 97, 121)))
-					goto lab4;
-				break;
-		lab4:
-				if (z->c >= z->l)
-					goto lab0;
-				z->c++;			/* gopast, line 40 */
-			}
-		}
-lab1:
-		z->I[0] = z->c;			/* setmark p1, line 41 */
-		while (1)
-		{						/* gopast, line 42 */
-			if (!(in_grouping(z, g_v, 97, 121)))
-				goto lab5;
-			break;
-	lab5:
-			if (z->c >= z->l)
-				goto lab0;
-			z->c++;				/* gopast, line 42 */
-		}
-		while (1)
-		{						/* gopast, line 42 */
-			if (!(out_grouping(z, g_v, 97, 121)))
-				goto lab6;
-			break;
-	lab6:
-			if (z->c >= z->l)
-				goto lab0;
-			z->c++;				/* gopast, line 42 */
-		}
-		z->I[1] = z->c;			/* setmark p2, line 42 */
-lab0:
-		z->c = c;
-	}
-	return 1;
-}
-
-static int
-r_shortv(struct SN_env * z)
-{
-	{
-		int			m = z->l - z->c;
-
-		(void) m;				/* or, line 50 */
-		if (!(out_grouping_b(z, g_v_WXY, 89, 121)))
-			goto lab1;
-		if (!(in_grouping_b(z, g_v, 97, 121)))
-			goto lab1;
-		if (!(out_grouping_b(z, g_v, 97, 121)))
-			goto lab1;
-		goto lab0;
-lab1:
-		z->c = z->l - m;
-		if (!(out_grouping_b(z, g_v, 97, 121)))
-			return 0;
-		if (!(in_grouping_b(z, g_v, 97, 121)))
-			return 0;
-		if (z->c > z->lb)
-			return 0;			/* atlimit, line 51 */
-	}
-lab0:
-	return 1;
-}
-
-static int
-r_R1(struct SN_env * z)
-{
-	if (!(z->I[0] <= z->c))
-		return 0;
-	return 1;
-}
-
-static int
-r_R2(struct SN_env * z)
-{
-	if (!(z->I[1] <= z->c))
-		return 0;
-	return 1;
-}
-
-static int
-r_Step_1a(struct SN_env * z)
-{
-	int			among_var;
-
-	{
-		int			m = z->l - z->c;
-
-		(void) m;				/* try, line 58 */
-		z->ket = z->c;			/* [, line 59 */
-		among_var = find_among_b(z, a_1, 3);	/* substring, line 59 */
-		if (!(among_var))
-		{
-			z->c = z->l - m;
-			goto lab0;
-		}
-		z->bra = z->c;			/* ], line 59 */
-		switch (among_var)
-		{
-			case 0:
-				{
-					z->c = z->l - m;
-					goto lab0;
-				}
-			case 1:
-				{
-					int			ret;
-
-					ret = slice_del(z); /* delete, line 61 */
-					if (ret < 0)
-						return ret;
-				}
-				break;
-		}
-lab0:
-		;
-	}
-	z->ket = z->c;				/* [, line 64 */
-	among_var = find_among_b(z, a_2, 6);		/* substring, line 64 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 64 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 2, s_5);	/* <-, line 65 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 67 */
-				if (z->c <= z->lb)
-					goto lab2;
-				z->c--;			/* next, line 67 */
-				if (z->c > z->lb)
-					goto lab2;	/* atlimit, line 67 */
-				{
-					int			ret;
-
-					ret = slice_from_s(z, 2, s_6);		/* <-, line 67 */
-					if (ret < 0)
-						return ret;
-				}
-				goto lab1;
-		lab2:
-				z->c = z->l - m;
-				{
-					int			ret;
-
-					ret = slice_from_s(z, 1, s_7);		/* <-, line 67 */
-					if (ret < 0)
-						return ret;
-				}
-			}
-	lab1:
-			break;
-		case 3:
-			if (z->c <= z->lb)
-				return 0;
-			z->c--;				/* next, line 68 */
-			while (1)
-			{					/* gopast, line 68 */
-				if (!(in_grouping_b(z, g_v, 97, 121)))
-					goto lab3;
-				break;
-		lab3:
-				if (z->c <= z->lb)
-					return 0;
-				z->c--;			/* gopast, line 68 */
-			}
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 68 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_Step_1b(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 74 */
-	among_var = find_among_b(z, a_4, 6);		/* substring, line 74 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 74 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret = r_R1(z);
-
-				if (ret == 0)
-					return 0;	/* call R1, line 76 */
-				if (ret < 0)
-					return ret;
-			}
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 2, s_8);	/* <-, line 76 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			m_test = z->l - z->c;		/* test, line 79 */
-
-				while (1)
-				{				/* gopast, line 79 */
-					if (!(in_grouping_b(z, g_v, 97, 121)))
-						goto lab0;
-					break;
-			lab0:
-					if (z->c <= z->lb)
-						return 0;
-					z->c--;		/* gopast, line 79 */
-				}
-				z->c = z->l - m_test;
-			}
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 79 */
-				if (ret < 0)
-					return ret;
-			}
-			{
-				int			m_test = z->l - z->c;		/* test, line 80 */
-
-				among_var = find_among_b(z, a_3, 13);	/* substring, line 80 */
-				if (!(among_var))
-					return 0;
-				z->c = z->l - m_test;
-			}
-			switch (among_var)
-			{
-				case 0:
-					return 0;
-				case 1:
-					{
-						int			ret;
-
-						{
-							int			c = z->c;
-
-							ret = insert_s(z, z->c, z->c, 1, s_9);		/* <+, line 82 */
-							z->c = c;
-						}
-						if (ret < 0)
-							return ret;
-					}
-					break;
-				case 2:
-					z->ket = z->c;		/* [, line 85 */
-					if (z->c <= z->lb)
-						return 0;
-					z->c--;		/* next, line 85 */
-					z->bra = z->c;		/* ], line 85 */
-					{
-						int			ret;
-
-						ret = slice_del(z);		/* delete, line 85 */
-						if (ret < 0)
-							return ret;
-					}
-					break;
-				case 3:
-					if (z->c != z->I[0])
-						return 0;		/* atmark, line 86 */
-					{
-						int			m_test = z->l - z->c;		/* test, line 86 */
-
-						{
-							int			ret = r_shortv(z);
-
-							if (ret == 0)
-								return 0;		/* call shortv, line 86 */
-							if (ret < 0)
-								return ret;
-						}
-						z->c = z->l - m_test;
-					}
-					{
-						int			ret;
-
-						{
-							int			c = z->c;
-
-							ret = insert_s(z, z->c, z->c, 1, s_10);		/* <+, line 86 */
-							z->c = c;
-						}
-						if (ret < 0)
-							return ret;
-					}
-					break;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_Step_1c(struct SN_env * z)
-{
-	z->ket = z->c;				/* [, line 93 */
-	{
-		int			m = z->l - z->c;
-
-		(void) m;				/* or, line 93 */
-		if (!(eq_s_b(z, 1, s_11)))
-			goto lab1;
-		goto lab0;
-lab1:
-		z->c = z->l - m;
-		if (!(eq_s_b(z, 1, s_12)))
-			return 0;
-	}
-lab0:
-	z->bra = z->c;				/* ], line 93 */
-	if (!(out_grouping_b(z, g_v, 97, 121)))
-		return 0;
-	{
-		int			m = z->l - z->c;
-
-		(void) m;				/* not, line 94 */
-		if (z->c > z->lb)
-			goto lab2;			/* atlimit, line 94 */
-		return 0;
-lab2:
-		z->c = z->l - m;
-	}
-	{
-		int			ret;
-
-		ret = slice_from_s(z, 1, s_13); /* <-, line 95 */
-		if (ret < 0)
-			return ret;
-	}
-	return 1;
-}
-
-static int
-r_Step_2(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 99 */
-	among_var = find_among_b(z, a_5, 24);		/* substring, line 99 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 99 */
-	{
-		int			ret = r_R1(z);
-
-		if (ret == 0)
-			return 0;			/* call R1, line 99 */
-		if (ret < 0)
-			return ret;
-	}
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_14); /* <-, line 100 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_15); /* <-, line 101 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 3:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_16); /* <-, line 102 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 4:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_17); /* <-, line 103 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 5:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_18); /* <-, line 104 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 6:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_19); /* <-, line 106 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 7:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_20); /* <-, line 108 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 8:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 2, s_21); /* <-, line 110 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 9:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_22); /* <-, line 111 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 10:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_23); /* <-, line 113 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 11:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_24); /* <-, line 115 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 12:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_25); /* <-, line 117 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 13:
-			if (!(eq_s_b(z, 1, s_26)))
-				return 0;
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 2, s_27); /* <-, line 118 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 14:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_28); /* <-, line 119 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 15:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_29); /* <-, line 120 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 16:
-			if (!(in_grouping_b(z, g_valid_LI, 99, 116)))
-				return 0;
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 121 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_Step_3(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 126 */
-	among_var = find_among_b(z, a_6, 9);		/* substring, line 126 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 126 */
-	{
-		int			ret = r_R1(z);
-
-		if (ret == 0)
-			return 0;			/* call R1, line 126 */
-		if (ret < 0)
-			return ret;
-	}
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_30); /* <-, line 127 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_31); /* <-, line 128 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 3:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 2, s_32); /* <-, line 129 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 4:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 2, s_33); /* <-, line 131 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 5:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 133 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 6:
-			{
-				int			ret = r_R2(z);
-
-				if (ret == 0)
-					return 0;	/* call R2, line 135 */
-				if (ret < 0)
-					return ret;
-			}
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 135 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_Step_4(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 140 */
-	among_var = find_among_b(z, a_7, 18);		/* substring, line 140 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 140 */
-	{
-		int			ret = r_R2(z);
-
-		if (ret == 0)
-			return 0;			/* call R2, line 140 */
-		if (ret < 0)
-			return ret;
-	}
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 143 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 144 */
-				if (!(eq_s_b(z, 1, s_34)))
-					goto lab1;
-				goto lab0;
-		lab1:
-				z->c = z->l - m;
-				if (!(eq_s_b(z, 1, s_35)))
-					return 0;
-			}
-	lab0:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 144 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_Step_5(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 149 */
-	among_var = find_among_b(z, a_8, 2);		/* substring, line 149 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 149 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 150 */
-				{
-					int			ret = r_R2(z);
-
-					if (ret == 0)
-						goto lab1;		/* call R2, line 150 */
-					if (ret < 0)
-						return ret;
-				}
-				goto lab0;
-		lab1:
-				z->c = z->l - m;
-				{
-					int			ret = r_R1(z);
-
-					if (ret == 0)
-						return 0;		/* call R1, line 150 */
-					if (ret < 0)
-						return ret;
-				}
-				{
-					int			m = z->l - z->c;
-
-					(void) m;	/* not, line 150 */
-					{
-						int			ret = r_shortv(z);
-
-						if (ret == 0)
-							goto lab2;	/* call shortv, line 150 */
-						if (ret < 0)
-							return ret;
-					}
-					return 0;
-			lab2:
-					z->c = z->l - m;
-				}
-			}
-	lab0:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 150 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret = r_R2(z);
-
-				if (ret == 0)
-					return 0;	/* call R2, line 151 */
-				if (ret < 0)
-					return ret;
-			}
-			if (!(eq_s_b(z, 1, s_36)))
-				return 0;
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 151 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_exception2(struct SN_env * z)
-{
-	z->ket = z->c;				/* [, line 157 */
-	if (!(find_among_b(z, a_9, 8)))
-		return 0;				/* substring, line 157 */
-	z->bra = z->c;				/* ], line 157 */
-	if (z->c > z->lb)
-		return 0;				/* atlimit, line 157 */
-	return 1;
-}
-
-static int
-r_exception1(struct SN_env * z)
-{
-	int			among_var;
-
-	z->bra = z->c;				/* [, line 169 */
-	among_var = find_among(z, a_10, 18);		/* substring, line 169 */
-	if (!(among_var))
-		return 0;
-	z->ket = z->c;				/* ], line 169 */
-	if (z->c < z->l)
-		return 0;				/* atlimit, line 169 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_37); /* <-, line 173 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_38); /* <-, line 174 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 3:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_39); /* <-, line 175 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 4:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_40); /* <-, line 176 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 5:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_41); /* <-, line 177 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 6:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 3, s_42); /* <-, line 181 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 7:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 5, s_43); /* <-, line 182 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 8:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_44); /* <-, line 183 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 9:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 5, s_45); /* <-, line 184 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 10:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 4, s_46); /* <-, line 185 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 11:
-			{
-				int			ret;
-
-				ret = slice_from_s(z, 5, s_47); /* <-, line 186 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_postlude(struct SN_env * z)
-{
-	if (!(z->B[0]))
-		return 0;				/* Boolean test Y_found, line 202 */
-	while (1)
-	{							/* repeat, line 202 */
-		int			c = z->c;
-
-		while (1)
-		{						/* goto, line 202 */
-			int			c = z->c;
-
-			z->bra = z->c;		/* [, line 202 */
-			if (!(eq_s(z, 1, s_48)))
-				goto lab1;
-			z->ket = z->c;		/* ], line 202 */
-			z->c = c;
-			break;
-	lab1:
-			z->c = c;
-			if (z->c >= z->l)
-				goto lab0;
-			z->c++;				/* goto, line 202 */
-		}
-		{
-			int			ret;
-
-			ret = slice_from_s(z, 1, s_49);		/* <-, line 202 */
-			if (ret < 0)
-				return ret;
-		}
-		continue;
-lab0:
-		z->c = c;
-		break;
-	}
-	return 1;
-}
-
-extern int
-english_ISO_8859_1_stem(struct SN_env * z)
-{
-	{
-		int			c = z->c;	/* or, line 206 */
-
-		{
-			int			ret = r_exception1(z);
-
-			if (ret == 0)
-				goto lab1;		/* call exception1, line 206 */
-			if (ret < 0)
-				return ret;
-		}
-		goto lab0;
-lab1:
-		z->c = c;
-		{
-			int			c = z->c;		/* not, line 207 */
-
-			{
-				int			c = z->c + 3;
-
-				if (0 > c || c > z->l)
-					goto lab3;
-				z->c = c;		/* hop, line 207 */
-			}
-			goto lab2;
-	lab3:
-			z->c = c;
-		}
-		goto lab0;
-lab2:
-		z->c = c;
-		{
-			int			c = z->c;		/* do, line 208 */
-
-			{
-				int			ret = r_prelude(z);
-
-				if (ret == 0)
-					goto lab4;	/* call prelude, line 208 */
-				if (ret < 0)
-					return ret;
-			}
-	lab4:
-			z->c = c;
-		}
-		{
-			int			c = z->c;		/* do, line 209 */
-
-			{
-				int			ret = r_mark_regions(z);
-
-				if (ret == 0)
-					goto lab5;	/* call mark_regions, line 209 */
-				if (ret < 0)
-					return ret;
-			}
-	lab5:
-			z->c = c;
-		}
-		z->lb = z->c;
-		z->c = z->l;			/* backwards, line 210 */
-
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* do, line 212 */
-			{
-				int			ret = r_Step_1a(z);
-
-				if (ret == 0)
-					goto lab6;	/* call Step_1a, line 212 */
-				if (ret < 0)
-					return ret;
-			}
-	lab6:
-			z->c = z->l - m;
-		}
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* or, line 214 */
-			{
-				int			ret = r_exception2(z);
-
-				if (ret == 0)
-					goto lab8;	/* call exception2, line 214 */
-				if (ret < 0)
-					return ret;
-			}
-			goto lab7;
-	lab8:
-			z->c = z->l - m;
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* do, line 216 */
-				{
-					int			ret = r_Step_1b(z);
-
-					if (ret == 0)
-						goto lab9;		/* call Step_1b, line 216 */
-					if (ret < 0)
-						return ret;
-				}
-		lab9:
-				z->c = z->l - m;
-			}
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* do, line 217 */
-				{
-					int			ret = r_Step_1c(z);
-
-					if (ret == 0)
-						goto lab10;		/* call Step_1c, line 217 */
-					if (ret < 0)
-						return ret;
-				}
-		lab10:
-				z->c = z->l - m;
-			}
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* do, line 219 */
-				{
-					int			ret = r_Step_2(z);
-
-					if (ret == 0)
-						goto lab11;		/* call Step_2, line 219 */
-					if (ret < 0)
-						return ret;
-				}
-		lab11:
-				z->c = z->l - m;
-			}
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* do, line 220 */
-				{
-					int			ret = r_Step_3(z);
-
-					if (ret == 0)
-						goto lab12;		/* call Step_3, line 220 */
-					if (ret < 0)
-						return ret;
-				}
-		lab12:
-				z->c = z->l - m;
-			}
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* do, line 221 */
-				{
-					int			ret = r_Step_4(z);
-
-					if (ret == 0)
-						goto lab13;		/* call Step_4, line 221 */
-					if (ret < 0)
-						return ret;
-				}
-		lab13:
-				z->c = z->l - m;
-			}
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* do, line 223 */
-				{
-					int			ret = r_Step_5(z);
-
-					if (ret == 0)
-						goto lab14;		/* call Step_5, line 223 */
-					if (ret < 0)
-						return ret;
-				}
-		lab14:
-				z->c = z->l - m;
-			}
-		}
-lab7:
-		z->c = z->lb;
-		{
-			int			c = z->c;		/* do, line 226 */
-
-			{
-				int			ret = r_postlude(z);
-
-				if (ret == 0)
-					goto lab15; /* call postlude, line 226 */
-				if (ret < 0)
-					return ret;
-			}
-	lab15:
-			z->c = c;
-		}
-	}
-lab0:
-	return 1;
-}
-
-extern struct SN_env *
-english_ISO_8859_1_create_env(void)
-{
-	return SN_create_env(0, 2, 1);
-}
-
-extern void
-english_ISO_8859_1_close_env(struct SN_env * z)
-{
-	SN_close_env(z);
-}
diff --git a/contrib/tsearch2/snowball/english_stem.h b/contrib/tsearch2/snowball/english_stem.h
deleted file mode 100644
index 6918a73dd73b..000000000000
--- a/contrib/tsearch2/snowball/english_stem.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/snowball/english_stem.h,v 1.6 2006/03/11 04:38:30 momjian Exp $ */
-
-/* This file was generated automatically by the Snowball to ANSI C compiler */
-
-#ifdef __cplusplus
-extern		"C"
-{
-#endif
-
-extern struct SN_env *english_ISO_8859_1_create_env(void);
-extern void english_ISO_8859_1_close_env(struct SN_env * z);
-
-extern int	english_ISO_8859_1_stem(struct SN_env * z);
-
-#ifdef __cplusplus
-}
-
-#endif
diff --git a/contrib/tsearch2/snowball/header.h b/contrib/tsearch2/snowball/header.h
deleted file mode 100644
index 610f99886428..000000000000
--- a/contrib/tsearch2/snowball/header.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/snowball/header.h,v 1.8 2006/07/10 22:06:11 momjian Exp $ */
-
-#include <limits.h>
-
-#include "api.h"
-
-#define HEAD (2 * sizeof(int))
-
-#define SIZE(p)		   ((int *)(p))[-1]
-#define SET_SIZE(p, n) ((int *)(p))[-1] = n
-#define CAPACITY(p)    ((int *)(p))[-2]
-
-struct among
-{
-	int			s_size;			/* number of chars in string */
-	symbol	   *s;				/* search string */
-	int			substring_i;	/* index to longest matching substring */
-	int			result;			/* result of the lookup */
-	int			(*function) (struct SN_env *);
-};
-
-extern symbol *create_s(void);
-extern void lose_s(symbol * p);
-
-extern int	skip_utf8(const symbol * p, int c, int lb, int l, int n);
-
-extern int	in_grouping_U(struct SN_env * z, unsigned char *s, int min, int max);
-extern int	in_grouping_b_U(struct SN_env * z, unsigned char *s, int min, int max);
-extern int	out_grouping_U(struct SN_env * z, unsigned char *s, int min, int max);
-extern int	out_grouping_b_U(struct SN_env * z, unsigned char *s, int min, int max);
-
-extern int	in_grouping(struct SN_env * z, unsigned char *s, int min, int max);
-extern int	in_grouping_b(struct SN_env * z, unsigned char *s, int min, int max);
-extern int	out_grouping(struct SN_env * z, unsigned char *s, int min, int max);
-extern int	out_grouping_b(struct SN_env * z, unsigned char *s, int min, int max);
-
-extern int	eq_s(struct SN_env * z, int s_size, symbol * s);
-extern int	eq_s_b(struct SN_env * z, int s_size, symbol * s);
-extern int	eq_v(struct SN_env * z, symbol * p);
-extern int	eq_v_b(struct SN_env * z, symbol * p);
-
-extern int	find_among(struct SN_env * z, struct among * v, int v_size);
-extern int	find_among_b(struct SN_env * z, struct among * v, int v_size);
-
-extern int	replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int *adjustment);
-extern int	slice_from_s(struct SN_env * z, int s_size, symbol * s);
-extern int	slice_from_v(struct SN_env * z, symbol * p);
-extern int	slice_del(struct SN_env * z);
-
-extern int	insert_s(struct SN_env * z, int bra, int ket, int s_size, symbol * s);
-extern int	insert_v(struct SN_env * z, int bra, int ket, symbol * p);
-
-extern symbol *slice_to(struct SN_env * z, symbol * p);
-extern symbol *assign_to(struct SN_env * z, symbol * p);
-
-extern void debug(struct SN_env * z, int number, int line_count);
diff --git a/contrib/tsearch2/snowball/russian_stem.c b/contrib/tsearch2/snowball/russian_stem.c
deleted file mode 100644
index a9558b3ab5f9..000000000000
--- a/contrib/tsearch2/snowball/russian_stem.c
+++ /dev/null
@@ -1,928 +0,0 @@
-
-/* This file was generated automatically by the Snowball to ANSI C compiler */
-
-#include "header.h"
-
-extern int	russian_KOI8_R_stem(struct SN_env * z);
-static int	r_tidy_up(struct SN_env * z);
-static int	r_derivational(struct SN_env * z);
-static int	r_noun(struct SN_env * z);
-static int	r_verb(struct SN_env * z);
-static int	r_reflexive(struct SN_env * z);
-static int	r_adjectival(struct SN_env * z);
-static int	r_adjective(struct SN_env * z);
-static int	r_perfective_gerund(struct SN_env * z);
-static int	r_R2(struct SN_env * z);
-static int	r_mark_regions(struct SN_env * z);
-
-extern struct SN_env *russian_KOI8_R_create_env(void);
-extern void russian_KOI8_R_close_env(struct SN_env * z);
-
-static symbol s_0_0[3] = {0xD7, 0xDB, 0xC9};
-static symbol s_0_1[4] = {0xC9, 0xD7, 0xDB, 0xC9};
-static symbol s_0_2[4] = {0xD9, 0xD7, 0xDB, 0xC9};
-static symbol s_0_3[1] = {0xD7};
-static symbol s_0_4[2] = {0xC9, 0xD7};
-static symbol s_0_5[2] = {0xD9, 0xD7};
-static symbol s_0_6[5] = {0xD7, 0xDB, 0xC9, 0xD3, 0xD8};
-static symbol s_0_7[6] = {0xC9, 0xD7, 0xDB, 0xC9, 0xD3, 0xD8};
-static symbol s_0_8[6] = {0xD9, 0xD7, 0xDB, 0xC9, 0xD3, 0xD8};
-
-static struct among a_0[9] =
-{
-	 /* 0 */ {3, s_0_0, -1, 1, 0},
-	 /* 1 */ {4, s_0_1, 0, 2, 0},
-	 /* 2 */ {4, s_0_2, 0, 2, 0},
-	 /* 3 */ {1, s_0_3, -1, 1, 0},
-	 /* 4 */ {2, s_0_4, 3, 2, 0},
-	 /* 5 */ {2, s_0_5, 3, 2, 0},
-	 /* 6 */ {5, s_0_6, -1, 1, 0},
-	 /* 7 */ {6, s_0_7, 6, 2, 0},
-	 /* 8 */ {6, s_0_8, 6, 2, 0}
-};
-
-static symbol s_1_0[2] = {0xC0, 0xC0};
-static symbol s_1_1[2] = {0xC5, 0xC0};
-static symbol s_1_2[2] = {0xCF, 0xC0};
-static symbol s_1_3[2] = {0xD5, 0xC0};
-static symbol s_1_4[2] = {0xC5, 0xC5};
-static symbol s_1_5[2] = {0xC9, 0xC5};
-static symbol s_1_6[2] = {0xCF, 0xC5};
-static symbol s_1_7[2] = {0xD9, 0xC5};
-static symbol s_1_8[2] = {0xC9, 0xC8};
-static symbol s_1_9[2] = {0xD9, 0xC8};
-static symbol s_1_10[3] = {0xC9, 0xCD, 0xC9};
-static symbol s_1_11[3] = {0xD9, 0xCD, 0xC9};
-static symbol s_1_12[2] = {0xC5, 0xCA};
-static symbol s_1_13[2] = {0xC9, 0xCA};
-static symbol s_1_14[2] = {0xCF, 0xCA};
-static symbol s_1_15[2] = {0xD9, 0xCA};
-static symbol s_1_16[2] = {0xC5, 0xCD};
-static symbol s_1_17[2] = {0xC9, 0xCD};
-static symbol s_1_18[2] = {0xCF, 0xCD};
-static symbol s_1_19[2] = {0xD9, 0xCD};
-static symbol s_1_20[3] = {0xC5, 0xC7, 0xCF};
-static symbol s_1_21[3] = {0xCF, 0xC7, 0xCF};
-static symbol s_1_22[2] = {0xC1, 0xD1};
-static symbol s_1_23[2] = {0xD1, 0xD1};
-static symbol s_1_24[3] = {0xC5, 0xCD, 0xD5};
-static symbol s_1_25[3] = {0xCF, 0xCD, 0xD5};
-
-static struct among a_1[26] =
-{
-	 /* 0 */ {2, s_1_0, -1, 1, 0},
-	 /* 1 */ {2, s_1_1, -1, 1, 0},
-	 /* 2 */ {2, s_1_2, -1, 1, 0},
-	 /* 3 */ {2, s_1_3, -1, 1, 0},
-	 /* 4 */ {2, s_1_4, -1, 1, 0},
-	 /* 5 */ {2, s_1_5, -1, 1, 0},
-	 /* 6 */ {2, s_1_6, -1, 1, 0},
-	 /* 7 */ {2, s_1_7, -1, 1, 0},
-	 /* 8 */ {2, s_1_8, -1, 1, 0},
-	 /* 9 */ {2, s_1_9, -1, 1, 0},
-	 /* 10 */ {3, s_1_10, -1, 1, 0},
-	 /* 11 */ {3, s_1_11, -1, 1, 0},
-	 /* 12 */ {2, s_1_12, -1, 1, 0},
-	 /* 13 */ {2, s_1_13, -1, 1, 0},
-	 /* 14 */ {2, s_1_14, -1, 1, 0},
-	 /* 15 */ {2, s_1_15, -1, 1, 0},
-	 /* 16 */ {2, s_1_16, -1, 1, 0},
-	 /* 17 */ {2, s_1_17, -1, 1, 0},
-	 /* 18 */ {2, s_1_18, -1, 1, 0},
-	 /* 19 */ {2, s_1_19, -1, 1, 0},
-	 /* 20 */ {3, s_1_20, -1, 1, 0},
-	 /* 21 */ {3, s_1_21, -1, 1, 0},
-	 /* 22 */ {2, s_1_22, -1, 1, 0},
-	 /* 23 */ {2, s_1_23, -1, 1, 0},
-	 /* 24 */ {3, s_1_24, -1, 1, 0},
-	 /* 25 */ {3, s_1_25, -1, 1, 0}
-};
-
-static symbol s_2_0[2] = {0xC5, 0xCD};
-static symbol s_2_1[2] = {0xCE, 0xCE};
-static symbol s_2_2[2] = {0xD7, 0xDB};
-static symbol s_2_3[3] = {0xC9, 0xD7, 0xDB};
-static symbol s_2_4[3] = {0xD9, 0xD7, 0xDB};
-static symbol s_2_5[1] = {0xDD};
-static symbol s_2_6[2] = {0xC0, 0xDD};
-static symbol s_2_7[3] = {0xD5, 0xC0, 0xDD};
-
-static struct among a_2[8] =
-{
-	 /* 0 */ {2, s_2_0, -1, 1, 0},
-	 /* 1 */ {2, s_2_1, -1, 1, 0},
-	 /* 2 */ {2, s_2_2, -1, 1, 0},
-	 /* 3 */ {3, s_2_3, 2, 2, 0},
-	 /* 4 */ {3, s_2_4, 2, 2, 0},
-	 /* 5 */ {1, s_2_5, -1, 1, 0},
-	 /* 6 */ {2, s_2_6, 5, 1, 0},
-	 /* 7 */ {3, s_2_7, 6, 2, 0}
-};
-
-static symbol s_3_0[2] = {0xD3, 0xD1};
-static symbol s_3_1[2] = {0xD3, 0xD8};
-
-static struct among a_3[2] =
-{
-	 /* 0 */ {2, s_3_0, -1, 1, 0},
-	 /* 1 */ {2, s_3_1, -1, 1, 0}
-};
-
-static symbol s_4_0[1] = {0xC0};
-static symbol s_4_1[2] = {0xD5, 0xC0};
-static symbol s_4_2[2] = {0xCC, 0xC1};
-static symbol s_4_3[3] = {0xC9, 0xCC, 0xC1};
-static symbol s_4_4[3] = {0xD9, 0xCC, 0xC1};
-static symbol s_4_5[2] = {0xCE, 0xC1};
-static symbol s_4_6[3] = {0xC5, 0xCE, 0xC1};
-static symbol s_4_7[3] = {0xC5, 0xD4, 0xC5};
-static symbol s_4_8[3] = {0xC9, 0xD4, 0xC5};
-static symbol s_4_9[3] = {0xCA, 0xD4, 0xC5};
-static symbol s_4_10[4] = {0xC5, 0xCA, 0xD4, 0xC5};
-static symbol s_4_11[4] = {0xD5, 0xCA, 0xD4, 0xC5};
-static symbol s_4_12[2] = {0xCC, 0xC9};
-static symbol s_4_13[3] = {0xC9, 0xCC, 0xC9};
-static symbol s_4_14[3] = {0xD9, 0xCC, 0xC9};
-static symbol s_4_15[1] = {0xCA};
-static symbol s_4_16[2] = {0xC5, 0xCA};
-static symbol s_4_17[2] = {0xD5, 0xCA};
-static symbol s_4_18[1] = {0xCC};
-static symbol s_4_19[2] = {0xC9, 0xCC};
-static symbol s_4_20[2] = {0xD9, 0xCC};
-static symbol s_4_21[2] = {0xC5, 0xCD};
-static symbol s_4_22[2] = {0xC9, 0xCD};
-static symbol s_4_23[2] = {0xD9, 0xCD};
-static symbol s_4_24[1] = {0xCE};
-static symbol s_4_25[2] = {0xC5, 0xCE};
-static symbol s_4_26[2] = {0xCC, 0xCF};
-static symbol s_4_27[3] = {0xC9, 0xCC, 0xCF};
-static symbol s_4_28[3] = {0xD9, 0xCC, 0xCF};
-static symbol s_4_29[2] = {0xCE, 0xCF};
-static symbol s_4_30[3] = {0xC5, 0xCE, 0xCF};
-static symbol s_4_31[3] = {0xCE, 0xCE, 0xCF};
-static symbol s_4_32[2] = {0xC0, 0xD4};
-static symbol s_4_33[3] = {0xD5, 0xC0, 0xD4};
-static symbol s_4_34[2] = {0xC5, 0xD4};
-static symbol s_4_35[3] = {0xD5, 0xC5, 0xD4};
-static symbol s_4_36[2] = {0xC9, 0xD4};
-static symbol s_4_37[2] = {0xD1, 0xD4};
-static symbol s_4_38[2] = {0xD9, 0xD4};
-static symbol s_4_39[2] = {0xD4, 0xD8};
-static symbol s_4_40[3] = {0xC9, 0xD4, 0xD8};
-static symbol s_4_41[3] = {0xD9, 0xD4, 0xD8};
-static symbol s_4_42[3] = {0xC5, 0xDB, 0xD8};
-static symbol s_4_43[3] = {0xC9, 0xDB, 0xD8};
-static symbol s_4_44[2] = {0xCE, 0xD9};
-static symbol s_4_45[3] = {0xC5, 0xCE, 0xD9};
-
-static struct among a_4[46] =
-{
-	 /* 0 */ {1, s_4_0, -1, 2, 0},
-	 /* 1 */ {2, s_4_1, 0, 2, 0},
-	 /* 2 */ {2, s_4_2, -1, 1, 0},
-	 /* 3 */ {3, s_4_3, 2, 2, 0},
-	 /* 4 */ {3, s_4_4, 2, 2, 0},
-	 /* 5 */ {2, s_4_5, -1, 1, 0},
-	 /* 6 */ {3, s_4_6, 5, 2, 0},
-	 /* 7 */ {3, s_4_7, -1, 1, 0},
-	 /* 8 */ {3, s_4_8, -1, 2, 0},
-	 /* 9 */ {3, s_4_9, -1, 1, 0},
-	 /* 10 */ {4, s_4_10, 9, 2, 0},
-	 /* 11 */ {4, s_4_11, 9, 2, 0},
-	 /* 12 */ {2, s_4_12, -1, 1, 0},
-	 /* 13 */ {3, s_4_13, 12, 2, 0},
-	 /* 14 */ {3, s_4_14, 12, 2, 0},
-	 /* 15 */ {1, s_4_15, -1, 1, 0},
-	 /* 16 */ {2, s_4_16, 15, 2, 0},
-	 /* 17 */ {2, s_4_17, 15, 2, 0},
-	 /* 18 */ {1, s_4_18, -1, 1, 0},
-	 /* 19 */ {2, s_4_19, 18, 2, 0},
-	 /* 20 */ {2, s_4_20, 18, 2, 0},
-	 /* 21 */ {2, s_4_21, -1, 1, 0},
-	 /* 22 */ {2, s_4_22, -1, 2, 0},
-	 /* 23 */ {2, s_4_23, -1, 2, 0},
-	 /* 24 */ {1, s_4_24, -1, 1, 0},
-	 /* 25 */ {2, s_4_25, 24, 2, 0},
-	 /* 26 */ {2, s_4_26, -1, 1, 0},
-	 /* 27 */ {3, s_4_27, 26, 2, 0},
-	 /* 28 */ {3, s_4_28, 26, 2, 0},
-	 /* 29 */ {2, s_4_29, -1, 1, 0},
-	 /* 30 */ {3, s_4_30, 29, 2, 0},
-	 /* 31 */ {3, s_4_31, 29, 1, 0},
-	 /* 32 */ {2, s_4_32, -1, 1, 0},
-	 /* 33 */ {3, s_4_33, 32, 2, 0},
-	 /* 34 */ {2, s_4_34, -1, 1, 0},
-	 /* 35 */ {3, s_4_35, 34, 2, 0},
-	 /* 36 */ {2, s_4_36, -1, 2, 0},
-	 /* 37 */ {2, s_4_37, -1, 2, 0},
-	 /* 38 */ {2, s_4_38, -1, 2, 0},
-	 /* 39 */ {2, s_4_39, -1, 1, 0},
-	 /* 40 */ {3, s_4_40, 39, 2, 0},
-	 /* 41 */ {3, s_4_41, 39, 2, 0},
-	 /* 42 */ {3, s_4_42, -1, 1, 0},
-	 /* 43 */ {3, s_4_43, -1, 2, 0},
-	 /* 44 */ {2, s_4_44, -1, 1, 0},
-	 /* 45 */ {3, s_4_45, 44, 2, 0}
-};
-
-static symbol s_5_0[1] = {0xC0};
-static symbol s_5_1[2] = {0xC9, 0xC0};
-static symbol s_5_2[2] = {0xD8, 0xC0};
-static symbol s_5_3[1] = {0xC1};
-static symbol s_5_4[1] = {0xC5};
-static symbol s_5_5[2] = {0xC9, 0xC5};
-static symbol s_5_6[2] = {0xD8, 0xC5};
-static symbol s_5_7[2] = {0xC1, 0xC8};
-static symbol s_5_8[2] = {0xD1, 0xC8};
-static symbol s_5_9[3] = {0xC9, 0xD1, 0xC8};
-static symbol s_5_10[1] = {0xC9};
-static symbol s_5_11[2] = {0xC5, 0xC9};
-static symbol s_5_12[2] = {0xC9, 0xC9};
-static symbol s_5_13[3] = {0xC1, 0xCD, 0xC9};
-static symbol s_5_14[3] = {0xD1, 0xCD, 0xC9};
-static symbol s_5_15[4] = {0xC9, 0xD1, 0xCD, 0xC9};
-static symbol s_5_16[1] = {0xCA};
-static symbol s_5_17[2] = {0xC5, 0xCA};
-static symbol s_5_18[3] = {0xC9, 0xC5, 0xCA};
-static symbol s_5_19[2] = {0xC9, 0xCA};
-static symbol s_5_20[2] = {0xCF, 0xCA};
-static symbol s_5_21[2] = {0xC1, 0xCD};
-static symbol s_5_22[2] = {0xC5, 0xCD};
-static symbol s_5_23[3] = {0xC9, 0xC5, 0xCD};
-static symbol s_5_24[2] = {0xCF, 0xCD};
-static symbol s_5_25[2] = {0xD1, 0xCD};
-static symbol s_5_26[3] = {0xC9, 0xD1, 0xCD};
-static symbol s_5_27[1] = {0xCF};
-static symbol s_5_28[1] = {0xD1};
-static symbol s_5_29[2] = {0xC9, 0xD1};
-static symbol s_5_30[2] = {0xD8, 0xD1};
-static symbol s_5_31[1] = {0xD5};
-static symbol s_5_32[2] = {0xC5, 0xD7};
-static symbol s_5_33[2] = {0xCF, 0xD7};
-static symbol s_5_34[1] = {0xD8};
-static symbol s_5_35[1] = {0xD9};
-
-static struct among a_5[36] =
-{
-	 /* 0 */ {1, s_5_0, -1, 1, 0},
-	 /* 1 */ {2, s_5_1, 0, 1, 0},
-	 /* 2 */ {2, s_5_2, 0, 1, 0},
-	 /* 3 */ {1, s_5_3, -1, 1, 0},
-	 /* 4 */ {1, s_5_4, -1, 1, 0},
-	 /* 5 */ {2, s_5_5, 4, 1, 0},
-	 /* 6 */ {2, s_5_6, 4, 1, 0},
-	 /* 7 */ {2, s_5_7, -1, 1, 0},
-	 /* 8 */ {2, s_5_8, -1, 1, 0},
-	 /* 9 */ {3, s_5_9, 8, 1, 0},
-	 /* 10 */ {1, s_5_10, -1, 1, 0},
-	 /* 11 */ {2, s_5_11, 10, 1, 0},
-	 /* 12 */ {2, s_5_12, 10, 1, 0},
-	 /* 13 */ {3, s_5_13, 10, 1, 0},
-	 /* 14 */ {3, s_5_14, 10, 1, 0},
-	 /* 15 */ {4, s_5_15, 14, 1, 0},
-	 /* 16 */ {1, s_5_16, -1, 1, 0},
-	 /* 17 */ {2, s_5_17, 16, 1, 0},
-	 /* 18 */ {3, s_5_18, 17, 1, 0},
-	 /* 19 */ {2, s_5_19, 16, 1, 0},
-	 /* 20 */ {2, s_5_20, 16, 1, 0},
-	 /* 21 */ {2, s_5_21, -1, 1, 0},
-	 /* 22 */ {2, s_5_22, -1, 1, 0},
-	 /* 23 */ {3, s_5_23, 22, 1, 0},
-	 /* 24 */ {2, s_5_24, -1, 1, 0},
-	 /* 25 */ {2, s_5_25, -1, 1, 0},
-	 /* 26 */ {3, s_5_26, 25, 1, 0},
-	 /* 27 */ {1, s_5_27, -1, 1, 0},
-	 /* 28 */ {1, s_5_28, -1, 1, 0},
-	 /* 29 */ {2, s_5_29, 28, 1, 0},
-	 /* 30 */ {2, s_5_30, 28, 1, 0},
-	 /* 31 */ {1, s_5_31, -1, 1, 0},
-	 /* 32 */ {2, s_5_32, -1, 1, 0},
-	 /* 33 */ {2, s_5_33, -1, 1, 0},
-	 /* 34 */ {1, s_5_34, -1, 1, 0},
-	 /* 35 */ {1, s_5_35, -1, 1, 0}
-};
-
-static symbol s_6_0[3] = {0xCF, 0xD3, 0xD4};
-static symbol s_6_1[4] = {0xCF, 0xD3, 0xD4, 0xD8};
-
-static struct among a_6[2] =
-{
-	 /* 0 */ {3, s_6_0, -1, 1, 0},
-	 /* 1 */ {4, s_6_1, -1, 1, 0}
-};
-
-static symbol s_7_0[4] = {0xC5, 0xCA, 0xDB, 0xC5};
-static symbol s_7_1[1] = {0xCE};
-static symbol s_7_2[1] = {0xD8};
-static symbol s_7_3[3] = {0xC5, 0xCA, 0xDB};
-
-static struct among a_7[4] =
-{
-	 /* 0 */ {4, s_7_0, -1, 1, 0},
-	 /* 1 */ {1, s_7_1, -1, 2, 0},
-	 /* 2 */ {1, s_7_2, -1, 3, 0},
-	 /* 3 */ {3, s_7_3, -1, 1, 0}
-};
-
-static unsigned char g_v[] = {35, 130, 34, 18};
-
-static symbol s_0[] = {0xC1};
-static symbol s_1[] = {0xD1};
-static symbol s_2[] = {0xC1};
-static symbol s_3[] = {0xD1};
-static symbol s_4[] = {0xC1};
-static symbol s_5[] = {0xD1};
-static symbol s_6[] = {0xCE};
-static symbol s_7[] = {0xCE};
-static symbol s_8[] = {0xCE};
-static symbol s_9[] = {0xC9};
-
-static int
-r_mark_regions(struct SN_env * z)
-{
-	z->I[0] = z->l;
-	z->I[1] = z->l;
-	{
-		int			c = z->c;	/* do, line 63 */
-
-		while (1)
-		{						/* gopast, line 64 */
-			if (!(in_grouping(z, g_v, 192, 220)))
-				goto lab1;
-			break;
-	lab1:
-			if (z->c >= z->l)
-				goto lab0;
-			z->c++;				/* gopast, line 64 */
-		}
-		z->I[0] = z->c;			/* setmark pV, line 64 */
-		while (1)
-		{						/* gopast, line 64 */
-			if (!(out_grouping(z, g_v, 192, 220)))
-				goto lab2;
-			break;
-	lab2:
-			if (z->c >= z->l)
-				goto lab0;
-			z->c++;				/* gopast, line 64 */
-		}
-		while (1)
-		{						/* gopast, line 65 */
-			if (!(in_grouping(z, g_v, 192, 220)))
-				goto lab3;
-			break;
-	lab3:
-			if (z->c >= z->l)
-				goto lab0;
-			z->c++;				/* gopast, line 65 */
-		}
-		while (1)
-		{						/* gopast, line 65 */
-			if (!(out_grouping(z, g_v, 192, 220)))
-				goto lab4;
-			break;
-	lab4:
-			if (z->c >= z->l)
-				goto lab0;
-			z->c++;				/* gopast, line 65 */
-		}
-		z->I[1] = z->c;			/* setmark p2, line 65 */
-lab0:
-		z->c = c;
-	}
-	return 1;
-}
-
-static int
-r_R2(struct SN_env * z)
-{
-	if (!(z->I[1] <= z->c))
-		return 0;
-	return 1;
-}
-
-static int
-r_perfective_gerund(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 74 */
-	among_var = find_among_b(z, a_0, 9);		/* substring, line 74 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 74 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 78 */
-				if (!(eq_s_b(z, 1, s_0)))
-					goto lab1;
-				goto lab0;
-		lab1:
-				z->c = z->l - m;
-				if (!(eq_s_b(z, 1, s_1)))
-					return 0;
-			}
-	lab0:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 78 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 85 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_adjective(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 90 */
-	among_var = find_among_b(z, a_1, 26);		/* substring, line 90 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 90 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 99 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_adjectival(struct SN_env * z)
-{
-	int			among_var;
-
-	{
-		int			ret = r_adjective(z);
-
-		if (ret == 0)
-			return 0;			/* call adjective, line 104 */
-		if (ret < 0)
-			return ret;
-	}
-	{
-		int			m = z->l - z->c;
-
-		(void) m;				/* try, line 111 */
-		z->ket = z->c;			/* [, line 112 */
-		among_var = find_among_b(z, a_2, 8);	/* substring, line 112 */
-		if (!(among_var))
-		{
-			z->c = z->l - m;
-			goto lab0;
-		}
-		z->bra = z->c;			/* ], line 112 */
-		switch (among_var)
-		{
-			case 0:
-				{
-					z->c = z->l - m;
-					goto lab0;
-				}
-			case 1:
-				{
-					int			m = z->l - z->c;
-
-					(void) m;	/* or, line 117 */
-					if (!(eq_s_b(z, 1, s_2)))
-						goto lab2;
-					goto lab1;
-			lab2:
-					z->c = z->l - m;
-					if (!(eq_s_b(z, 1, s_3)))
-					{
-						z->c = z->l - m;
-						goto lab0;
-					}
-				}
-		lab1:
-				{
-					int			ret;
-
-					ret = slice_del(z); /* delete, line 117 */
-					if (ret < 0)
-						return ret;
-				}
-				break;
-			case 2:
-				{
-					int			ret;
-
-					ret = slice_del(z); /* delete, line 124 */
-					if (ret < 0)
-						return ret;
-				}
-				break;
-		}
-lab0:
-		;
-	}
-	return 1;
-}
-
-static int
-r_reflexive(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 131 */
-	among_var = find_among_b(z, a_3, 2);		/* substring, line 131 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 131 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 134 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_verb(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 139 */
-	among_var = find_among_b(z, a_4, 46);		/* substring, line 139 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 139 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 145 */
-				if (!(eq_s_b(z, 1, s_4)))
-					goto lab1;
-				goto lab0;
-		lab1:
-				z->c = z->l - m;
-				if (!(eq_s_b(z, 1, s_5)))
-					return 0;
-			}
-	lab0:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 145 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 153 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_noun(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 162 */
-	among_var = find_among_b(z, a_5, 36);		/* substring, line 162 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 162 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 169 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_derivational(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 178 */
-	among_var = find_among_b(z, a_6, 2);		/* substring, line 178 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 178 */
-	{
-		int			ret = r_R2(z);
-
-		if (ret == 0)
-			return 0;			/* call R2, line 178 */
-		if (ret < 0)
-			return ret;
-	}
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 181 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_tidy_up(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 186 */
-	among_var = find_among_b(z, a_7, 4);		/* substring, line 186 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 186 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 190 */
-				if (ret < 0)
-					return ret;
-			}
-			z->ket = z->c;		/* [, line 191 */
-			if (!(eq_s_b(z, 1, s_6)))
-				return 0;
-			z->bra = z->c;		/* ], line 191 */
-			if (!(eq_s_b(z, 1, s_7)))
-				return 0;
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 191 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			if (!(eq_s_b(z, 1, s_8)))
-				return 0;
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 194 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 3:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 196 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-extern int
-russian_KOI8_R_stem(struct SN_env * z)
-{
-	{
-		int			c = z->c;	/* do, line 203 */
-
-		{
-			int			ret = r_mark_regions(z);
-
-			if (ret == 0)
-				goto lab0;		/* call mark_regions, line 203 */
-			if (ret < 0)
-				return ret;
-		}
-lab0:
-		z->c = c;
-	}
-	z->lb = z->c;
-	z->c = z->l;				/* backwards, line 204 */
-
-	{
-		int			m3;			/* setlimit, line 204 */
-		int			m = z->l - z->c;
-
-		(void) m;
-		if (z->c < z->I[0])
-			return 0;
-		z->c = z->I[0];			/* tomark, line 204 */
-		m3 = z->lb;
-		z->lb = z->c;
-		z->c = z->l - m;
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* do, line 205 */
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 206 */
-				{
-					int			ret = r_perfective_gerund(z);
-
-					if (ret == 0)
-						goto lab3;		/* call perfective_gerund, line 206 */
-					if (ret < 0)
-						return ret;
-				}
-				goto lab2;
-		lab3:
-				z->c = z->l - m;
-				{
-					int			m = z->l - z->c;
-
-					(void) m;	/* try, line 207 */
-					{
-						int			ret = r_reflexive(z);
-
-						if (ret == 0)
-						{
-							z->c = z->l - m;
-							goto lab4;
-						}		/* call reflexive, line 207 */
-						if (ret < 0)
-							return ret;
-					}
-			lab4:
-					;
-				}
-				{
-					int			m = z->l - z->c;
-
-					(void) m;	/* or, line 208 */
-					{
-						int			ret = r_adjectival(z);
-
-						if (ret == 0)
-							goto lab6;	/* call adjectival, line 208 */
-						if (ret < 0)
-							return ret;
-					}
-					goto lab5;
-			lab6:
-					z->c = z->l - m;
-					{
-						int			ret = r_verb(z);
-
-						if (ret == 0)
-							goto lab7;	/* call verb, line 208 */
-						if (ret < 0)
-							return ret;
-					}
-					goto lab5;
-			lab7:
-					z->c = z->l - m;
-					{
-						int			ret = r_noun(z);
-
-						if (ret == 0)
-							goto lab1;	/* call noun, line 208 */
-						if (ret < 0)
-							return ret;
-					}
-				}
-		lab5:
-				;
-			}
-	lab2:
-	lab1:
-			z->c = z->l - m;
-		}
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* try, line 211 */
-			z->ket = z->c;		/* [, line 211 */
-			if (!(eq_s_b(z, 1, s_9)))
-			{
-				z->c = z->l - m;
-				goto lab8;
-			}
-			z->bra = z->c;		/* ], line 211 */
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 211 */
-				if (ret < 0)
-					return ret;
-			}
-	lab8:
-			;
-		}
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* do, line 214 */
-			{
-				int			ret = r_derivational(z);
-
-				if (ret == 0)
-					goto lab9;	/* call derivational, line 214 */
-				if (ret < 0)
-					return ret;
-			}
-	lab9:
-			z->c = z->l - m;
-		}
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* do, line 215 */
-			{
-				int			ret = r_tidy_up(z);
-
-				if (ret == 0)
-					goto lab10; /* call tidy_up, line 215 */
-				if (ret < 0)
-					return ret;
-			}
-	lab10:
-			z->c = z->l - m;
-		}
-		z->lb = m3;
-	}
-	z->c = z->lb;
-	return 1;
-}
-
-extern struct SN_env *
-russian_KOI8_R_create_env(void)
-{
-	return SN_create_env(0, 2, 0);
-}
-
-extern void
-russian_KOI8_R_close_env(struct SN_env * z)
-{
-	SN_close_env(z);
-}
diff --git a/contrib/tsearch2/snowball/russian_stem_UTF8.c b/contrib/tsearch2/snowball/russian_stem_UTF8.c
deleted file mode 100644
index 994ff267cab6..000000000000
--- a/contrib/tsearch2/snowball/russian_stem_UTF8.c
+++ /dev/null
@@ -1,942 +0,0 @@
-
-/* This file was generated automatically by the Snowball to ANSI C compiler */
-
-#include "header.h"
-
-extern int	russian_UTF_8_stem(struct SN_env * z);
-static int	r_tidy_up(struct SN_env * z);
-static int	r_derivational(struct SN_env * z);
-static int	r_noun(struct SN_env * z);
-static int	r_verb(struct SN_env * z);
-static int	r_reflexive(struct SN_env * z);
-static int	r_adjectival(struct SN_env * z);
-static int	r_adjective(struct SN_env * z);
-static int	r_perfective_gerund(struct SN_env * z);
-static int	r_R2(struct SN_env * z);
-static int	r_mark_regions(struct SN_env * z);
-
-extern struct SN_env *russian_UTF_8_create_env(void);
-extern void russian_UTF_8_close_env(struct SN_env * z);
-
-static symbol s_0_0[10] = {0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8, 0xD1, 0x81, 0xD1, 0x8C};
-static symbol s_0_1[12] = {0xD1, 0x8B, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8, 0xD1, 0x81, 0xD1, 0x8C};
-static symbol s_0_2[12] = {0xD0, 0xB8, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8, 0xD1, 0x81, 0xD1, 0x8C};
-static symbol s_0_3[2] = {0xD0, 0xB2};
-static symbol s_0_4[4] = {0xD1, 0x8B, 0xD0, 0xB2};
-static symbol s_0_5[4] = {0xD0, 0xB8, 0xD0, 0xB2};
-static symbol s_0_6[6] = {0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8};
-static symbol s_0_7[8] = {0xD1, 0x8B, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8};
-static symbol s_0_8[8] = {0xD0, 0xB8, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8};
-
-static struct among a_0[9] =
-{
-	 /*  0 */ {10, s_0_0, -1, 1, 0},
-	 /*  1 */ {12, s_0_1, 0, 2, 0},
-	 /*  2 */ {12, s_0_2, 0, 2, 0},
-	 /*  3 */ {2, s_0_3, -1, 1, 0},
-	 /*  4 */ {4, s_0_4, 3, 2, 0},
-	 /*  5 */ {4, s_0_5, 3, 2, 0},
-	 /*  6 */ {6, s_0_6, -1, 1, 0},
-	 /*  7 */ {8, s_0_7, 6, 2, 0},
-	 /*  8 */ {8, s_0_8, 6, 2, 0}
-};
-
-static symbol s_1_0[6] = {0xD0, 0xB5, 0xD0, 0xBC, 0xD1, 0x83};
-static symbol s_1_1[6] = {0xD0, 0xBE, 0xD0, 0xBC, 0xD1, 0x83};
-static symbol s_1_2[4] = {0xD1, 0x8B, 0xD1, 0x85};
-static symbol s_1_3[4] = {0xD0, 0xB8, 0xD1, 0x85};
-static symbol s_1_4[4] = {0xD1, 0x83, 0xD1, 0x8E};
-static symbol s_1_5[4] = {0xD1, 0x8E, 0xD1, 0x8E};
-static symbol s_1_6[4] = {0xD0, 0xB5, 0xD1, 0x8E};
-static symbol s_1_7[4] = {0xD0, 0xBE, 0xD1, 0x8E};
-static symbol s_1_8[4] = {0xD1, 0x8F, 0xD1, 0x8F};
-static symbol s_1_9[4] = {0xD0, 0xB0, 0xD1, 0x8F};
-static symbol s_1_10[4] = {0xD1, 0x8B, 0xD0, 0xB5};
-static symbol s_1_11[4] = {0xD0, 0xB5, 0xD0, 0xB5};
-static symbol s_1_12[4] = {0xD0, 0xB8, 0xD0, 0xB5};
-static symbol s_1_13[4] = {0xD0, 0xBE, 0xD0, 0xB5};
-static symbol s_1_14[6] = {0xD1, 0x8B, 0xD0, 0xBC, 0xD0, 0xB8};
-static symbol s_1_15[6] = {0xD0, 0xB8, 0xD0, 0xBC, 0xD0, 0xB8};
-static symbol s_1_16[4] = {0xD1, 0x8B, 0xD0, 0xB9};
-static symbol s_1_17[4] = {0xD0, 0xB5, 0xD0, 0xB9};
-static symbol s_1_18[4] = {0xD0, 0xB8, 0xD0, 0xB9};
-static symbol s_1_19[4] = {0xD0, 0xBE, 0xD0, 0xB9};
-static symbol s_1_20[4] = {0xD1, 0x8B, 0xD0, 0xBC};
-static symbol s_1_21[4] = {0xD0, 0xB5, 0xD0, 0xBC};
-static symbol s_1_22[4] = {0xD0, 0xB8, 0xD0, 0xBC};
-static symbol s_1_23[4] = {0xD0, 0xBE, 0xD0, 0xBC};
-static symbol s_1_24[6] = {0xD0, 0xB5, 0xD0, 0xB3, 0xD0, 0xBE};
-static symbol s_1_25[6] = {0xD0, 0xBE, 0xD0, 0xB3, 0xD0, 0xBE};
-
-static struct among a_1[26] =
-{
-	 /*  0 */ {6, s_1_0, -1, 1, 0},
-	 /*  1 */ {6, s_1_1, -1, 1, 0},
-	 /*  2 */ {4, s_1_2, -1, 1, 0},
-	 /*  3 */ {4, s_1_3, -1, 1, 0},
-	 /*  4 */ {4, s_1_4, -1, 1, 0},
-	 /*  5 */ {4, s_1_5, -1, 1, 0},
-	 /*  6 */ {4, s_1_6, -1, 1, 0},
-	 /*  7 */ {4, s_1_7, -1, 1, 0},
-	 /*  8 */ {4, s_1_8, -1, 1, 0},
-	 /*  9 */ {4, s_1_9, -1, 1, 0},
-	 /* 10 */ {4, s_1_10, -1, 1, 0},
-	 /* 11 */ {4, s_1_11, -1, 1, 0},
-	 /* 12 */ {4, s_1_12, -1, 1, 0},
-	 /* 13 */ {4, s_1_13, -1, 1, 0},
-	 /* 14 */ {6, s_1_14, -1, 1, 0},
-	 /* 15 */ {6, s_1_15, -1, 1, 0},
-	 /* 16 */ {4, s_1_16, -1, 1, 0},
-	 /* 17 */ {4, s_1_17, -1, 1, 0},
-	 /* 18 */ {4, s_1_18, -1, 1, 0},
-	 /* 19 */ {4, s_1_19, -1, 1, 0},
-	 /* 20 */ {4, s_1_20, -1, 1, 0},
-	 /* 21 */ {4, s_1_21, -1, 1, 0},
-	 /* 22 */ {4, s_1_22, -1, 1, 0},
-	 /* 23 */ {4, s_1_23, -1, 1, 0},
-	 /* 24 */ {6, s_1_24, -1, 1, 0},
-	 /* 25 */ {6, s_1_25, -1, 1, 0}
-};
-
-static symbol s_2_0[4] = {0xD0, 0xB2, 0xD1, 0x88};
-static symbol s_2_1[6] = {0xD1, 0x8B, 0xD0, 0xB2, 0xD1, 0x88};
-static symbol s_2_2[6] = {0xD0, 0xB8, 0xD0, 0xB2, 0xD1, 0x88};
-static symbol s_2_3[2] = {0xD1, 0x89};
-static symbol s_2_4[4] = {0xD1, 0x8E, 0xD1, 0x89};
-static symbol s_2_5[6] = {0xD1, 0x83, 0xD1, 0x8E, 0xD1, 0x89};
-static symbol s_2_6[4] = {0xD0, 0xB5, 0xD0, 0xBC};
-static symbol s_2_7[4] = {0xD0, 0xBD, 0xD0, 0xBD};
-
-static struct among a_2[8] =
-{
-	 /*  0 */ {4, s_2_0, -1, 1, 0},
-	 /*  1 */ {6, s_2_1, 0, 2, 0},
-	 /*  2 */ {6, s_2_2, 0, 2, 0},
-	 /*  3 */ {2, s_2_3, -1, 1, 0},
-	 /*  4 */ {4, s_2_4, 3, 1, 0},
-	 /*  5 */ {6, s_2_5, 4, 2, 0},
-	 /*  6 */ {4, s_2_6, -1, 1, 0},
-	 /*  7 */ {4, s_2_7, -1, 1, 0}
-};
-
-static symbol s_3_0[4] = {0xD1, 0x81, 0xD1, 0x8C};
-static symbol s_3_1[4] = {0xD1, 0x81, 0xD1, 0x8F};
-
-static struct among a_3[2] =
-{
-	 /*  0 */ {4, s_3_0, -1, 1, 0},
-	 /*  1 */ {4, s_3_1, -1, 1, 0}
-};
-
-static symbol s_4_0[4] = {0xD1, 0x8B, 0xD1, 0x82};
-static symbol s_4_1[4] = {0xD1, 0x8E, 0xD1, 0x82};
-static symbol s_4_2[6] = {0xD1, 0x83, 0xD1, 0x8E, 0xD1, 0x82};
-static symbol s_4_3[4] = {0xD1, 0x8F, 0xD1, 0x82};
-static symbol s_4_4[4] = {0xD0, 0xB5, 0xD1, 0x82};
-static symbol s_4_5[6] = {0xD1, 0x83, 0xD0, 0xB5, 0xD1, 0x82};
-static symbol s_4_6[4] = {0xD0, 0xB8, 0xD1, 0x82};
-static symbol s_4_7[4] = {0xD0, 0xBD, 0xD1, 0x8B};
-static symbol s_4_8[6] = {0xD0, 0xB5, 0xD0, 0xBD, 0xD1, 0x8B};
-static symbol s_4_9[4] = {0xD1, 0x82, 0xD1, 0x8C};
-static symbol s_4_10[6] = {0xD1, 0x8B, 0xD1, 0x82, 0xD1, 0x8C};
-static symbol s_4_11[6] = {0xD0, 0xB8, 0xD1, 0x82, 0xD1, 0x8C};
-static symbol s_4_12[6] = {0xD0, 0xB5, 0xD1, 0x88, 0xD1, 0x8C};
-static symbol s_4_13[6] = {0xD0, 0xB8, 0xD1, 0x88, 0xD1, 0x8C};
-static symbol s_4_14[2] = {0xD1, 0x8E};
-static symbol s_4_15[4] = {0xD1, 0x83, 0xD1, 0x8E};
-static symbol s_4_16[4] = {0xD0, 0xBB, 0xD0, 0xB0};
-static symbol s_4_17[6] = {0xD1, 0x8B, 0xD0, 0xBB, 0xD0, 0xB0};
-static symbol s_4_18[6] = {0xD0, 0xB8, 0xD0, 0xBB, 0xD0, 0xB0};
-static symbol s_4_19[4] = {0xD0, 0xBD, 0xD0, 0xB0};
-static symbol s_4_20[6] = {0xD0, 0xB5, 0xD0, 0xBD, 0xD0, 0xB0};
-static symbol s_4_21[6] = {0xD0, 0xB5, 0xD1, 0x82, 0xD0, 0xB5};
-static symbol s_4_22[6] = {0xD0, 0xB8, 0xD1, 0x82, 0xD0, 0xB5};
-static symbol s_4_23[6] = {0xD0, 0xB9, 0xD1, 0x82, 0xD0, 0xB5};
-static symbol s_4_24[8] = {0xD1, 0x83, 0xD0, 0xB9, 0xD1, 0x82, 0xD0, 0xB5};
-static symbol s_4_25[8] = {0xD0, 0xB5, 0xD0, 0xB9, 0xD1, 0x82, 0xD0, 0xB5};
-static symbol s_4_26[4] = {0xD0, 0xBB, 0xD0, 0xB8};
-static symbol s_4_27[6] = {0xD1, 0x8B, 0xD0, 0xBB, 0xD0, 0xB8};
-static symbol s_4_28[6] = {0xD0, 0xB8, 0xD0, 0xBB, 0xD0, 0xB8};
-static symbol s_4_29[2] = {0xD0, 0xB9};
-static symbol s_4_30[4] = {0xD1, 0x83, 0xD0, 0xB9};
-static symbol s_4_31[4] = {0xD0, 0xB5, 0xD0, 0xB9};
-static symbol s_4_32[2] = {0xD0, 0xBB};
-static symbol s_4_33[4] = {0xD1, 0x8B, 0xD0, 0xBB};
-static symbol s_4_34[4] = {0xD0, 0xB8, 0xD0, 0xBB};
-static symbol s_4_35[4] = {0xD1, 0x8B, 0xD0, 0xBC};
-static symbol s_4_36[4] = {0xD0, 0xB5, 0xD0, 0xBC};
-static symbol s_4_37[4] = {0xD0, 0xB8, 0xD0, 0xBC};
-static symbol s_4_38[2] = {0xD0, 0xBD};
-static symbol s_4_39[4] = {0xD0, 0xB5, 0xD0, 0xBD};
-static symbol s_4_40[4] = {0xD0, 0xBB, 0xD0, 0xBE};
-static symbol s_4_41[6] = {0xD1, 0x8B, 0xD0, 0xBB, 0xD0, 0xBE};
-static symbol s_4_42[6] = {0xD0, 0xB8, 0xD0, 0xBB, 0xD0, 0xBE};
-static symbol s_4_43[4] = {0xD0, 0xBD, 0xD0, 0xBE};
-static symbol s_4_44[6] = {0xD0, 0xB5, 0xD0, 0xBD, 0xD0, 0xBE};
-static symbol s_4_45[6] = {0xD0, 0xBD, 0xD0, 0xBD, 0xD0, 0xBE};
-
-static struct among a_4[46] =
-{
-	 /*  0 */ {4, s_4_0, -1, 2, 0},
-	 /*  1 */ {4, s_4_1, -1, 1, 0},
-	 /*  2 */ {6, s_4_2, 1, 2, 0},
-	 /*  3 */ {4, s_4_3, -1, 2, 0},
-	 /*  4 */ {4, s_4_4, -1, 1, 0},
-	 /*  5 */ {6, s_4_5, 4, 2, 0},
-	 /*  6 */ {4, s_4_6, -1, 2, 0},
-	 /*  7 */ {4, s_4_7, -1, 1, 0},
-	 /*  8 */ {6, s_4_8, 7, 2, 0},
-	 /*  9 */ {4, s_4_9, -1, 1, 0},
-	 /* 10 */ {6, s_4_10, 9, 2, 0},
-	 /* 11 */ {6, s_4_11, 9, 2, 0},
-	 /* 12 */ {6, s_4_12, -1, 1, 0},
-	 /* 13 */ {6, s_4_13, -1, 2, 0},
-	 /* 14 */ {2, s_4_14, -1, 2, 0},
-	 /* 15 */ {4, s_4_15, 14, 2, 0},
-	 /* 16 */ {4, s_4_16, -1, 1, 0},
-	 /* 17 */ {6, s_4_17, 16, 2, 0},
-	 /* 18 */ {6, s_4_18, 16, 2, 0},
-	 /* 19 */ {4, s_4_19, -1, 1, 0},
-	 /* 20 */ {6, s_4_20, 19, 2, 0},
-	 /* 21 */ {6, s_4_21, -1, 1, 0},
-	 /* 22 */ {6, s_4_22, -1, 2, 0},
-	 /* 23 */ {6, s_4_23, -1, 1, 0},
-	 /* 24 */ {8, s_4_24, 23, 2, 0},
-	 /* 25 */ {8, s_4_25, 23, 2, 0},
-	 /* 26 */ {4, s_4_26, -1, 1, 0},
-	 /* 27 */ {6, s_4_27, 26, 2, 0},
-	 /* 28 */ {6, s_4_28, 26, 2, 0},
-	 /* 29 */ {2, s_4_29, -1, 1, 0},
-	 /* 30 */ {4, s_4_30, 29, 2, 0},
-	 /* 31 */ {4, s_4_31, 29, 2, 0},
-	 /* 32 */ {2, s_4_32, -1, 1, 0},
-	 /* 33 */ {4, s_4_33, 32, 2, 0},
-	 /* 34 */ {4, s_4_34, 32, 2, 0},
-	 /* 35 */ {4, s_4_35, -1, 2, 0},
-	 /* 36 */ {4, s_4_36, -1, 1, 0},
-	 /* 37 */ {4, s_4_37, -1, 2, 0},
-	 /* 38 */ {2, s_4_38, -1, 1, 0},
-	 /* 39 */ {4, s_4_39, 38, 2, 0},
-	 /* 40 */ {4, s_4_40, -1, 1, 0},
-	 /* 41 */ {6, s_4_41, 40, 2, 0},
-	 /* 42 */ {6, s_4_42, 40, 2, 0},
-	 /* 43 */ {4, s_4_43, -1, 1, 0},
-	 /* 44 */ {6, s_4_44, 43, 2, 0},
-	 /* 45 */ {6, s_4_45, 43, 1, 0}
-};
-
-static symbol s_5_0[2] = {0xD1, 0x83};
-static symbol s_5_1[4] = {0xD1, 0x8F, 0xD1, 0x85};
-static symbol s_5_2[6] = {0xD0, 0xB8, 0xD1, 0x8F, 0xD1, 0x85};
-static symbol s_5_3[4] = {0xD0, 0xB0, 0xD1, 0x85};
-static symbol s_5_4[2] = {0xD1, 0x8B};
-static symbol s_5_5[2] = {0xD1, 0x8C};
-static symbol s_5_6[2] = {0xD1, 0x8E};
-static symbol s_5_7[4] = {0xD1, 0x8C, 0xD1, 0x8E};
-static symbol s_5_8[4] = {0xD0, 0xB8, 0xD1, 0x8E};
-static symbol s_5_9[2] = {0xD1, 0x8F};
-static symbol s_5_10[4] = {0xD1, 0x8C, 0xD1, 0x8F};
-static symbol s_5_11[4] = {0xD0, 0xB8, 0xD1, 0x8F};
-static symbol s_5_12[2] = {0xD0, 0xB0};
-static symbol s_5_13[4] = {0xD0, 0xB5, 0xD0, 0xB2};
-static symbol s_5_14[4] = {0xD0, 0xBE, 0xD0, 0xB2};
-static symbol s_5_15[2] = {0xD0, 0xB5};
-static symbol s_5_16[4] = {0xD1, 0x8C, 0xD0, 0xB5};
-static symbol s_5_17[4] = {0xD0, 0xB8, 0xD0, 0xB5};
-static symbol s_5_18[2] = {0xD0, 0xB8};
-static symbol s_5_19[4] = {0xD0, 0xB5, 0xD0, 0xB8};
-static symbol s_5_20[4] = {0xD0, 0xB8, 0xD0, 0xB8};
-static symbol s_5_21[6] = {0xD1, 0x8F, 0xD0, 0xBC, 0xD0, 0xB8};
-static symbol s_5_22[8] = {0xD0, 0xB8, 0xD1, 0x8F, 0xD0, 0xBC, 0xD0, 0xB8};
-static symbol s_5_23[6] = {0xD0, 0xB0, 0xD0, 0xBC, 0xD0, 0xB8};
-static symbol s_5_24[2] = {0xD0, 0xB9};
-static symbol s_5_25[4] = {0xD0, 0xB5, 0xD0, 0xB9};
-static symbol s_5_26[6] = {0xD0, 0xB8, 0xD0, 0xB5, 0xD0, 0xB9};
-static symbol s_5_27[4] = {0xD0, 0xB8, 0xD0, 0xB9};
-static symbol s_5_28[4] = {0xD0, 0xBE, 0xD0, 0xB9};
-static symbol s_5_29[4] = {0xD1, 0x8F, 0xD0, 0xBC};
-static symbol s_5_30[6] = {0xD0, 0xB8, 0xD1, 0x8F, 0xD0, 0xBC};
-static symbol s_5_31[4] = {0xD0, 0xB0, 0xD0, 0xBC};
-static symbol s_5_32[4] = {0xD0, 0xB5, 0xD0, 0xBC};
-static symbol s_5_33[6] = {0xD0, 0xB8, 0xD0, 0xB5, 0xD0, 0xBC};
-static symbol s_5_34[4] = {0xD0, 0xBE, 0xD0, 0xBC};
-static symbol s_5_35[2] = {0xD0, 0xBE};
-
-static struct among a_5[36] =
-{
-	 /*  0 */ {2, s_5_0, -1, 1, 0},
-	 /*  1 */ {4, s_5_1, -1, 1, 0},
-	 /*  2 */ {6, s_5_2, 1, 1, 0},
-	 /*  3 */ {4, s_5_3, -1, 1, 0},
-	 /*  4 */ {2, s_5_4, -1, 1, 0},
-	 /*  5 */ {2, s_5_5, -1, 1, 0},
-	 /*  6 */ {2, s_5_6, -1, 1, 0},
-	 /*  7 */ {4, s_5_7, 6, 1, 0},
-	 /*  8 */ {4, s_5_8, 6, 1, 0},
-	 /*  9 */ {2, s_5_9, -1, 1, 0},
-	 /* 10 */ {4, s_5_10, 9, 1, 0},
-	 /* 11 */ {4, s_5_11, 9, 1, 0},
-	 /* 12 */ {2, s_5_12, -1, 1, 0},
-	 /* 13 */ {4, s_5_13, -1, 1, 0},
-	 /* 14 */ {4, s_5_14, -1, 1, 0},
-	 /* 15 */ {2, s_5_15, -1, 1, 0},
-	 /* 16 */ {4, s_5_16, 15, 1, 0},
-	 /* 17 */ {4, s_5_17, 15, 1, 0},
-	 /* 18 */ {2, s_5_18, -1, 1, 0},
-	 /* 19 */ {4, s_5_19, 18, 1, 0},
-	 /* 20 */ {4, s_5_20, 18, 1, 0},
-	 /* 21 */ {6, s_5_21, 18, 1, 0},
-	 /* 22 */ {8, s_5_22, 21, 1, 0},
-	 /* 23 */ {6, s_5_23, 18, 1, 0},
-	 /* 24 */ {2, s_5_24, -1, 1, 0},
-	 /* 25 */ {4, s_5_25, 24, 1, 0},
-	 /* 26 */ {6, s_5_26, 25, 1, 0},
-	 /* 27 */ {4, s_5_27, 24, 1, 0},
-	 /* 28 */ {4, s_5_28, 24, 1, 0},
-	 /* 29 */ {4, s_5_29, -1, 1, 0},
-	 /* 30 */ {6, s_5_30, 29, 1, 0},
-	 /* 31 */ {4, s_5_31, -1, 1, 0},
-	 /* 32 */ {4, s_5_32, -1, 1, 0},
-	 /* 33 */ {6, s_5_33, 32, 1, 0},
-	 /* 34 */ {4, s_5_34, -1, 1, 0},
-	 /* 35 */ {2, s_5_35, -1, 1, 0}
-};
-
-static symbol s_6_0[6] = {0xD0, 0xBE, 0xD1, 0x81, 0xD1, 0x82};
-static symbol s_6_1[8] = {0xD0, 0xBE, 0xD1, 0x81, 0xD1, 0x82, 0xD1, 0x8C};
-
-static struct among a_6[2] =
-{
-	 /*  0 */ {6, s_6_0, -1, 1, 0},
-	 /*  1 */ {8, s_6_1, -1, 1, 0}
-};
-
-static symbol s_7_0[6] = {0xD0, 0xB5, 0xD0, 0xB9, 0xD1, 0x88};
-static symbol s_7_1[2] = {0xD1, 0x8C};
-static symbol s_7_2[8] = {0xD0, 0xB5, 0xD0, 0xB9, 0xD1, 0x88, 0xD0, 0xB5};
-static symbol s_7_3[2] = {0xD0, 0xBD};
-
-static struct among a_7[4] =
-{
-	 /*  0 */ {6, s_7_0, -1, 1, 0},
-	 /*  1 */ {2, s_7_1, -1, 3, 0},
-	 /*  2 */ {8, s_7_2, -1, 1, 0},
-	 /*  3 */ {2, s_7_3, -1, 2, 0}
-};
-
-static unsigned char g_v[] = {33, 65, 8, 232};
-
-static symbol s_0[] = {0xD0, 0xB0};
-static symbol s_1[] = {0xD1, 0x8F};
-static symbol s_2[] = {0xD0, 0xB0};
-static symbol s_3[] = {0xD1, 0x8F};
-static symbol s_4[] = {0xD0, 0xB0};
-static symbol s_5[] = {0xD1, 0x8F};
-static symbol s_6[] = {0xD0, 0xBD};
-static symbol s_7[] = {0xD0, 0xBD};
-static symbol s_8[] = {0xD0, 0xBD};
-static symbol s_9[] = {0xD0, 0xB8};
-
-static int
-r_mark_regions(struct SN_env * z)
-{
-	z->I[0] = z->l;
-	z->I[1] = z->l;
-	{
-		int			c = z->c;	/* do, line 61 */
-
-		while (1)
-		{						/* gopast, line 62 */
-			if (!(in_grouping_U(z, g_v, 1072, 1103)))
-				goto lab1;
-			break;
-	lab1:
-			{
-				int			c = skip_utf8(z->p, z->c, 0, z->l, 1);
-
-				if (c < 0)
-					goto lab0;
-				z->c = c;		/* gopast, line 62 */
-			}
-		}
-		z->I[0] = z->c;			/* setmark pV, line 62 */
-		while (1)
-		{						/* gopast, line 62 */
-			if (!(out_grouping_U(z, g_v, 1072, 1103)))
-				goto lab2;
-			break;
-	lab2:
-			{
-				int			c = skip_utf8(z->p, z->c, 0, z->l, 1);
-
-				if (c < 0)
-					goto lab0;
-				z->c = c;		/* gopast, line 62 */
-			}
-		}
-		while (1)
-		{						/* gopast, line 63 */
-			if (!(in_grouping_U(z, g_v, 1072, 1103)))
-				goto lab3;
-			break;
-	lab3:
-			{
-				int			c = skip_utf8(z->p, z->c, 0, z->l, 1);
-
-				if (c < 0)
-					goto lab0;
-				z->c = c;		/* gopast, line 63 */
-			}
-		}
-		while (1)
-		{						/* gopast, line 63 */
-			if (!(out_grouping_U(z, g_v, 1072, 1103)))
-				goto lab4;
-			break;
-	lab4:
-			{
-				int			c = skip_utf8(z->p, z->c, 0, z->l, 1);
-
-				if (c < 0)
-					goto lab0;
-				z->c = c;		/* gopast, line 63 */
-			}
-		}
-		z->I[1] = z->c;			/* setmark p2, line 63 */
-lab0:
-		z->c = c;
-	}
-	return 1;
-}
-
-static int
-r_R2(struct SN_env * z)
-{
-	if (!(z->I[1] <= z->c))
-		return 0;
-	return 1;
-}
-
-static int
-r_perfective_gerund(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 72 */
-	among_var = find_among_b(z, a_0, 9);		/* substring, line 72 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 72 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 76 */
-				if (!(eq_s_b(z, 2, s_0)))
-					goto lab1;
-				goto lab0;
-		lab1:
-				z->c = z->l - m;
-				if (!(eq_s_b(z, 2, s_1)))
-					return 0;
-			}
-	lab0:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 76 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 83 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_adjective(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 88 */
-	among_var = find_among_b(z, a_1, 26);		/* substring, line 88 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 88 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 97 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_adjectival(struct SN_env * z)
-{
-	int			among_var;
-
-	{
-		int			ret = r_adjective(z);
-
-		if (ret == 0)
-			return 0;			/* call adjective, line 102 */
-		if (ret < 0)
-			return ret;
-	}
-	{
-		int			m = z->l - z->c;
-
-		(void) m;				/* try, line 109 */
-		z->ket = z->c;			/* [, line 110 */
-		among_var = find_among_b(z, a_2, 8);	/* substring, line 110 */
-		if (!(among_var))
-		{
-			z->c = z->l - m;
-			goto lab0;
-		}
-		z->bra = z->c;			/* ], line 110 */
-		switch (among_var)
-		{
-			case 0:
-				{
-					z->c = z->l - m;
-					goto lab0;
-				}
-			case 1:
-				{
-					int			m = z->l - z->c;
-
-					(void) m;	/* or, line 115 */
-					if (!(eq_s_b(z, 2, s_2)))
-						goto lab2;
-					goto lab1;
-			lab2:
-					z->c = z->l - m;
-					if (!(eq_s_b(z, 2, s_3)))
-					{
-						z->c = z->l - m;
-						goto lab0;
-					}
-				}
-		lab1:
-				{
-					int			ret;
-
-					ret = slice_del(z); /* delete, line 115 */
-					if (ret < 0)
-						return ret;
-				}
-				break;
-			case 2:
-				{
-					int			ret;
-
-					ret = slice_del(z); /* delete, line 122 */
-					if (ret < 0)
-						return ret;
-				}
-				break;
-		}
-lab0:
-		;
-	}
-	return 1;
-}
-
-static int
-r_reflexive(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 129 */
-	among_var = find_among_b(z, a_3, 2);		/* substring, line 129 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 129 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 132 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_verb(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 137 */
-	among_var = find_among_b(z, a_4, 46);		/* substring, line 137 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 137 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 143 */
-				if (!(eq_s_b(z, 2, s_4)))
-					goto lab1;
-				goto lab0;
-		lab1:
-				z->c = z->l - m;
-				if (!(eq_s_b(z, 2, s_5)))
-					return 0;
-			}
-	lab0:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 143 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 151 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_noun(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 160 */
-	among_var = find_among_b(z, a_5, 36);		/* substring, line 160 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 160 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 167 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_derivational(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 176 */
-	among_var = find_among_b(z, a_6, 2);		/* substring, line 176 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 176 */
-	{
-		int			ret = r_R2(z);
-
-		if (ret == 0)
-			return 0;			/* call R2, line 176 */
-		if (ret < 0)
-			return ret;
-	}
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 179 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-static int
-r_tidy_up(struct SN_env * z)
-{
-	int			among_var;
-
-	z->ket = z->c;				/* [, line 184 */
-	among_var = find_among_b(z, a_7, 4);		/* substring, line 184 */
-	if (!(among_var))
-		return 0;
-	z->bra = z->c;				/* ], line 184 */
-	switch (among_var)
-	{
-		case 0:
-			return 0;
-		case 1:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 188 */
-				if (ret < 0)
-					return ret;
-			}
-			z->ket = z->c;		/* [, line 189 */
-			if (!(eq_s_b(z, 2, s_6)))
-				return 0;
-			z->bra = z->c;		/* ], line 189 */
-			if (!(eq_s_b(z, 2, s_7)))
-				return 0;
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 189 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 2:
-			if (!(eq_s_b(z, 2, s_8)))
-				return 0;
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 192 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-		case 3:
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 194 */
-				if (ret < 0)
-					return ret;
-			}
-			break;
-	}
-	return 1;
-}
-
-extern int
-russian_UTF_8_stem(struct SN_env * z)
-{
-	{
-		int			c = z->c;	/* do, line 201 */
-
-		{
-			int			ret = r_mark_regions(z);
-
-			if (ret == 0)
-				goto lab0;		/* call mark_regions, line 201 */
-			if (ret < 0)
-				return ret;
-		}
-lab0:
-		z->c = c;
-	}
-	z->lb = z->c;
-	z->c = z->l;				/* backwards, line 202 */
-
-	{
-		int			m3;			/* setlimit, line 202 */
-		int			m = z->l - z->c;
-
-		(void) m;
-		if (z->c < z->I[0])
-			return 0;
-		z->c = z->I[0];			/* tomark, line 202 */
-		m3 = z->lb;
-		z->lb = z->c;
-		z->c = z->l - m;
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* do, line 203 */
-			{
-				int			m = z->l - z->c;
-
-				(void) m;		/* or, line 204 */
-				{
-					int			ret = r_perfective_gerund(z);
-
-					if (ret == 0)
-						goto lab3;		/* call perfective_gerund, line 204 */
-					if (ret < 0)
-						return ret;
-				}
-				goto lab2;
-		lab3:
-				z->c = z->l - m;
-				{
-					int			m = z->l - z->c;
-
-					(void) m;	/* try, line 205 */
-					{
-						int			ret = r_reflexive(z);
-
-						if (ret == 0)
-						{
-							z->c = z->l - m;
-							goto lab4;
-						}		/* call reflexive, line 205 */
-						if (ret < 0)
-							return ret;
-					}
-			lab4:
-					;
-				}
-				{
-					int			m = z->l - z->c;
-
-					(void) m;	/* or, line 206 */
-					{
-						int			ret = r_adjectival(z);
-
-						if (ret == 0)
-							goto lab6;	/* call adjectival, line 206 */
-						if (ret < 0)
-							return ret;
-					}
-					goto lab5;
-			lab6:
-					z->c = z->l - m;
-					{
-						int			ret = r_verb(z);
-
-						if (ret == 0)
-							goto lab7;	/* call verb, line 206 */
-						if (ret < 0)
-							return ret;
-					}
-					goto lab5;
-			lab7:
-					z->c = z->l - m;
-					{
-						int			ret = r_noun(z);
-
-						if (ret == 0)
-							goto lab1;	/* call noun, line 206 */
-						if (ret < 0)
-							return ret;
-					}
-				}
-		lab5:
-				;
-			}
-	lab2:
-	lab1:
-			z->c = z->l - m;
-		}
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* try, line 209 */
-			z->ket = z->c;		/* [, line 209 */
-			if (!(eq_s_b(z, 2, s_9)))
-			{
-				z->c = z->l - m;
-				goto lab8;
-			}
-			z->bra = z->c;		/* ], line 209 */
-			{
-				int			ret;
-
-				ret = slice_del(z);		/* delete, line 209 */
-				if (ret < 0)
-					return ret;
-			}
-	lab8:
-			;
-		}
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* do, line 212 */
-			{
-				int			ret = r_derivational(z);
-
-				if (ret == 0)
-					goto lab9;	/* call derivational, line 212 */
-				if (ret < 0)
-					return ret;
-			}
-	lab9:
-			z->c = z->l - m;
-		}
-		{
-			int			m = z->l - z->c;
-
-			(void) m;			/* do, line 213 */
-			{
-				int			ret = r_tidy_up(z);
-
-				if (ret == 0)
-					goto lab10; /* call tidy_up, line 213 */
-				if (ret < 0)
-					return ret;
-			}
-	lab10:
-			z->c = z->l - m;
-		}
-		z->lb = m3;
-	}
-	z->c = z->lb;
-	return 1;
-}
-
-extern struct SN_env *russian_UTF_8_create_env(void)
-{
-	return SN_create_env(0, 2, 0);
-}
-
-extern void russian_UTF_8_close_env(struct SN_env * z)
-{
-	SN_close_env(z);
-}
diff --git a/contrib/tsearch2/snowball/russian_stem_UTF8.h b/contrib/tsearch2/snowball/russian_stem_UTF8.h
deleted file mode 100644
index 0beb0b9719a9..000000000000
--- a/contrib/tsearch2/snowball/russian_stem_UTF8.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/* This file was generated automatically by the Snowball to ANSI C compiler */
-
-#ifdef __cplusplus
-extern		"C"
-{
-#endif
-
-	extern struct SN_env *russian_UTF_8_create_env(void);
-	extern void russian_UTF_8_close_env(struct SN_env * z);
-
-	extern int	russian_UTF_8_stem(struct SN_env * z);
-
-#ifdef __cplusplus
-}
-
-#endif
diff --git a/contrib/tsearch2/snowball/utilities.c b/contrib/tsearch2/snowball/utilities.c
deleted file mode 100644
index f06e5bb7a17c..000000000000
--- a/contrib/tsearch2/snowball/utilities.c
+++ /dev/null
@@ -1,656 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "header.h"
-
-#define unless(C) if(!(C))
-
-#define CREATE_SIZE 1
-
-extern symbol *
-create_s(void)
-{
-	symbol	   *p;
-	void	   *mem = malloc(HEAD + (CREATE_SIZE + 1) * sizeof(symbol));
-
-	if (mem == NULL)
-		return NULL;
-	p = (symbol *) (HEAD + (char *) mem);
-	CAPACITY(p) = CREATE_SIZE;
-	SET_SIZE(p, CREATE_SIZE);
-	return p;
-}
-
-extern void
-lose_s(symbol * p)
-{
-	if (p == NULL)
-		return;
-	free((char *) p - HEAD);
-}
-
-/*
-   new_p = X_skip_utf8(p, c, lb, l, n); skips n characters forwards from p + c
-   if n +ve, or n characters backwards from p +c - 1 if n -ve. new_p is the new
-   position, or 0 on failure.
-
-   -- used to implement hop and next in the utf8 case.
-*/
-
-extern int
-skip_utf8(const symbol * p, int c, int lb, int l, int n)
-{
-	int			b;
-
-	if (n >= 0)
-	{
-		for (; n > 0; n--)
-		{
-			if (c >= l)
-				return -1;
-			b = p[c++];
-			if (b >= 0xC0)
-			{					/* 1100 0000 */
-				while (c < l)
-				{
-					b = p[c];
-					if (b >= 0xC0 || b < 0x80)
-						break;
-					/* break unless b is 10------ */
-					c++;
-				}
-			}
-		}
-	}
-	else
-	{
-		for (; n < 0; n++)
-		{
-			if (c <= lb)
-				return -1;
-			b = p[--c];
-			if (b >= 0x80)
-			{					/* 1000 0000 */
-				while (c > lb)
-				{
-					b = p[c];
-					if (b >= 0xC0)
-						break;	/* 1100 0000 */
-					c--;
-				}
-			}
-		}
-	}
-	return c;
-}
-
-/* Code for character groupings: utf8 cases */
-
-static int
-get_utf8(const symbol * p, int c, int l, int *slot)
-{
-	int			b0,
-				b1;
-
-	if (c >= l)
-		return 0;
-	b0 = p[c++];
-	if (b0 < 0xC0 || c == l)
-	{							/* 1100 0000 */
-		*slot = b0;
-		return 1;
-	}
-	b1 = p[c++];
-	if (b0 < 0xE0 || c == l)
-	{							/* 1110 0000 */
-		*slot = (b0 & 0x1F) << 6 | (b1 & 0x3F);
-		return 2;
-	}
-	*slot = (b0 & 0xF) << 12 | (b1 & 0x3F) << 6 | (*p & 0x3F);
-	return 3;
-}
-
-static int
-get_b_utf8(const symbol * p, int c, int lb, int *slot)
-{
-	int			b0,
-				b1;
-
-	if (c <= lb)
-		return 0;
-	b0 = p[--c];
-	if (b0 < 0x80 || c == lb)
-	{							/* 1000 0000 */
-		*slot = b0;
-		return 1;
-	}
-	b1 = p[--c];
-	if (b1 >= 0xC0 || c == lb)
-	{							/* 1100 0000 */
-		*slot = (b1 & 0x1F) << 6 | (b0 & 0x3F);
-		return 2;
-	}
-	*slot = (*p & 0xF) << 12 | (b1 & 0x3F) << 6 | (b0 & 0x3F);
-	return 3;
-}
-
-extern int
-in_grouping_U(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-	int			w = get_utf8(z->p, z->c, z->l, &ch);
-
-	unless(w) return 0;
-	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
-		return 0;
-	z->c += w;
-	return 1;
-}
-
-extern int
-in_grouping_b_U(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-	int			w = get_b_utf8(z->p, z->c, z->lb, &ch);
-
-	unless(w) return 0;
-	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
-		return 0;
-	z->c -= w;
-	return 1;
-}
-
-extern int
-out_grouping_U(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-	int			w = get_utf8(z->p, z->c, z->l, &ch);
-
-	unless(w) return 0;
-	unless(ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
-	z->c += w;
-	return 1;
-}
-
-extern int
-out_grouping_b_U(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-	int			w = get_b_utf8(z->p, z->c, z->lb, &ch);
-
-	unless(w) return 0;
-	unless(ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
-	z->c -= w;
-	return 1;
-}
-
-/* Code for character groupings: non-utf8 cases */
-
-extern int
-in_grouping(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-
-	if (z->c >= z->l)
-		return 0;
-	ch = z->p[z->c];
-	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
-		return 0;
-	z->c++;
-	return 1;
-}
-
-extern int
-in_grouping_b(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-
-	if (z->c <= z->lb)
-		return 0;
-	ch = z->p[z->c - 1];
-	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
-		return 0;
-	z->c--;
-	return 1;
-}
-
-extern int
-out_grouping(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-
-	if (z->c >= z->l)
-		return 0;
-	ch = z->p[z->c];
-	unless(ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
-	z->c++;
-	return 1;
-}
-
-extern int
-out_grouping_b(struct SN_env * z, unsigned char *s, int min, int max)
-{
-	int			ch;
-
-	if (z->c <= z->lb)
-		return 0;
-	ch = z->p[z->c - 1];
-	unless(ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return 0;
-	z->c--;
-	return 1;
-}
-
-extern int
-eq_s(struct SN_env * z, int s_size, symbol * s)
-{
-	if (z->l - z->c < s_size || memcmp(z->p + z->c, s, s_size * sizeof(symbol)) != 0)
-		return 0;
-	z->c += s_size;
-	return 1;
-}
-
-extern int
-eq_s_b(struct SN_env * z, int s_size, symbol * s)
-{
-	if (z->c - z->lb < s_size || memcmp(z->p + z->c - s_size, s, s_size * sizeof(symbol)) != 0)
-		return 0;
-	z->c -= s_size;
-	return 1;
-}
-
-extern int
-eq_v(struct SN_env * z, symbol * p)
-{
-	return eq_s(z, SIZE(p), p);
-}
-
-extern int
-eq_v_b(struct SN_env * z, symbol * p)
-{
-	return eq_s_b(z, SIZE(p), p);
-}
-
-extern int
-find_among(struct SN_env * z, struct among * v, int v_size)
-{
-
-	int			i = 0;
-	int			j = v_size;
-
-	int			c = z->c;
-	int			l = z->l;
-	symbol	   *q = z->p + c;
-
-	struct among *w;
-
-	int			common_i = 0;
-	int			common_j = 0;
-
-	int			first_key_inspected = 0;
-
-	while (1)
-	{
-		int			k = i + ((j - i) >> 1);
-		int			diff = 0;
-		int			common = common_i < common_j ? common_i : common_j; /* smaller */
-
-		w = v + k;
-		{
-			int			i;
-
-			for (i = common; i < w->s_size; i++)
-			{
-				if (c + common == l)
-				{
-					diff = -1;
-					break;
-				}
-				diff = q[common] - w->s[i];
-				if (diff != 0)
-					break;
-				common++;
-			}
-		}
-		if (diff < 0)
-		{
-			j = k;
-			common_j = common;
-		}
-		else
-		{
-			i = k;
-			common_i = common;
-		}
-		if (j - i <= 1)
-		{
-			if (i > 0)
-				break;			/* v->s has been inspected */
-			if (j == i)
-				break;			/* only one item in v */
-
-			/*
-			 * - but now we need to go round once more to get v->s inspected.
-			 * This looks messy, but is actually the optimal approach.
-			 */
-
-			if (first_key_inspected)
-				break;
-			first_key_inspected = 1;
-		}
-	}
-	while (1)
-	{
-		w = v + i;
-		if (common_i >= w->s_size)
-		{
-			z->c = c + w->s_size;
-			if (w->function == 0)
-				return w->result;
-			{
-				int			res = w->function(z);
-
-				z->c = c + w->s_size;
-				if (res)
-					return w->result;
-			}
-		}
-		i = w->substring_i;
-		if (i < 0)
-			return 0;
-	}
-}
-
-/* find_among_b is for backwards processing. Same comments apply */
-
-extern int
-find_among_b(struct SN_env * z, struct among * v, int v_size)
-{
-
-	int			i = 0;
-	int			j = v_size;
-
-	int			c = z->c;
-	int			lb = z->lb;
-	symbol	   *q = z->p + c - 1;
-
-	struct among *w;
-
-	int			common_i = 0;
-	int			common_j = 0;
-
-	int			first_key_inspected = 0;
-
-	while (1)
-	{
-		int			k = i + ((j - i) >> 1);
-		int			diff = 0;
-		int			common = common_i < common_j ? common_i : common_j;
-
-		w = v + k;
-		{
-			int			i;
-
-			for (i = w->s_size - 1 - common; i >= 0; i--)
-			{
-				if (c - common == lb)
-				{
-					diff = -1;
-					break;
-				}
-				diff = q[-common] - w->s[i];
-				if (diff != 0)
-					break;
-				common++;
-			}
-		}
-		if (diff < 0)
-		{
-			j = k;
-			common_j = common;
-		}
-		else
-		{
-			i = k;
-			common_i = common;
-		}
-		if (j - i <= 1)
-		{
-			if (i > 0)
-				break;
-			if (j == i)
-				break;
-			if (first_key_inspected)
-				break;
-			first_key_inspected = 1;
-		}
-	}
-	while (1)
-	{
-		w = v + i;
-		if (common_i >= w->s_size)
-		{
-			z->c = c - w->s_size;
-			if (w->function == 0)
-				return w->result;
-			{
-				int			res = w->function(z);
-
-				z->c = c - w->s_size;
-				if (res)
-					return w->result;
-			}
-		}
-		i = w->substring_i;
-		if (i < 0)
-			return 0;
-	}
-}
-
-
-/* Increase the size of the buffer pointed to by p to at least n symbols.
- * If insufficient memory, returns NULL and frees the old buffer.
- */
-static symbol *
-increase_size(symbol * p, int n)
-{
-	symbol	   *q;
-	int			new_size = n + 20;
-	void	   *mem = realloc((char *) p - HEAD,
-							  HEAD + (new_size + 1) * sizeof(symbol));
-
-	if (mem == NULL)
-	{
-		lose_s(p);
-		return NULL;
-	}
-	q = (symbol *) (HEAD + (char *) mem);
-	CAPACITY(q) = new_size;
-	return q;
-}
-
-/* to replace symbols between c_bra and c_ket in z->p by the
-   s_size symbols at s.
-   Returns 0 on success, -1 on error.
-   Also, frees z->p (and sets it to NULL) on error.
-*/
-extern int
-replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int *adjptr)
-{
-	int			adjustment;
-	int			len;
-
-	if (z->p == NULL)
-	{
-		z->p = create_s();
-		if (z->p == NULL)
-			return -1;
-	}
-	adjustment = s_size - (c_ket - c_bra);
-	len = SIZE(z->p);
-	if (adjustment != 0)
-	{
-		if (adjustment + len > CAPACITY(z->p))
-		{
-			z->p = increase_size(z->p, adjustment + len);
-			if (z->p == NULL)
-				return -1;
-		}
-		memmove(z->p + c_ket + adjustment,
-				z->p + c_ket,
-				(len - c_ket) * sizeof(symbol));
-		SET_SIZE(z->p, adjustment + len);
-		z->l += adjustment;
-		if (z->c >= c_ket)
-			z->c += adjustment;
-		else if (z->c > c_bra)
-			z->c = c_bra;
-	}
-	unless(s_size == 0) memmove(z->p + c_bra, s, s_size * sizeof(symbol));
-	if (adjptr != NULL)
-		*adjptr = adjustment;
-	return 0;
-}
-
-static int
-slice_check(struct SN_env * z)
-{
-
-	if (z->bra < 0 ||
-		z->bra > z->ket ||
-		z->ket > z->l ||
-		z->p == NULL ||
-		z->l > SIZE(z->p))		/* this line could be removed */
-	{
-#if 0
-		fprintf(stderr, "faulty slice operation:\n");
-		debug(z, -1, 0);
-#endif
-		return -1;
-	}
-	return 0;
-}
-
-extern int
-slice_from_s(struct SN_env * z, int s_size, symbol * s)
-{
-	if (slice_check(z))
-		return -1;
-	return replace_s(z, z->bra, z->ket, s_size, s, NULL);
-}
-
-extern int
-slice_from_v(struct SN_env * z, symbol * p)
-{
-	return slice_from_s(z, SIZE(p), p);
-}
-
-extern int
-slice_del(struct SN_env * z)
-{
-	return slice_from_s(z, 0, 0);
-}
-
-extern int
-insert_s(struct SN_env * z, int bra, int ket, int s_size, symbol * s)
-{
-	int			adjustment;
-
-	if (replace_s(z, bra, ket, s_size, s, &adjustment))
-		return -1;
-	if (bra <= z->bra)
-		z->bra += adjustment;
-	if (bra <= z->ket)
-		z->ket += adjustment;
-	return 0;
-}
-
-extern int
-insert_v(struct SN_env * z, int bra, int ket, symbol * p)
-{
-	int			adjustment;
-
-	if (replace_s(z, bra, ket, SIZE(p), p, &adjustment))
-		return -1;
-	if (bra <= z->bra)
-		z->bra += adjustment;
-	if (bra <= z->ket)
-		z->ket += adjustment;
-	return 0;
-}
-
-extern symbol *
-slice_to(struct SN_env * z, symbol * p)
-{
-	if (slice_check(z))
-	{
-		lose_s(p);
-		return NULL;
-	}
-	{
-		int			len = z->ket - z->bra;
-
-		if (CAPACITY(p) < len)
-		{
-			p = increase_size(p, len);
-			if (p == NULL)
-				return NULL;
-		}
-		memmove(p, z->p + z->bra, len * sizeof(symbol));
-		SET_SIZE(p, len);
-	}
-	return p;
-}
-
-extern symbol *
-assign_to(struct SN_env * z, symbol * p)
-{
-	int			len = z->l;
-
-	if (CAPACITY(p) < len)
-	{
-		p = increase_size(p, len);
-		if (p == NULL)
-			return NULL;
-	}
-	memmove(p, z->p, len * sizeof(symbol));
-	SET_SIZE(p, len);
-	return p;
-}
-
-#if 0
-extern void
-debug(struct SN_env * z, int number, int line_count)
-{
-	int			i;
-	int			limit = SIZE(z->p);
-
-	/* if (number >= 0) printf("%3d (line %4d): '", number, line_count); */
-	if (number >= 0)
-		printf("%3d (line %4d): [%d]'", number, line_count, limit);
-	for (i = 0; i <= limit; i++)
-	{
-		if (z->lb == i)
-			printf("{");
-		if (z->bra == i)
-			printf("[");
-		if (z->c == i)
-			printf("|");
-		if (z->ket == i)
-			printf("]");
-		if (z->l == i)
-			printf("}");
-		if (i < limit)
-		{
-			int			ch = z->p[i];
-
-			if (ch == 0)
-				ch = '#';
-			printf("%c", ch);
-		}
-	}
-	printf("'\n");
-}
-
-#endif
diff --git a/contrib/tsearch2/sql/tsearch2.sql b/contrib/tsearch2/sql/tsearch2.sql
index 27b29661d27e..8f95affc1a3b 100644
--- a/contrib/tsearch2/sql/tsearch2.sql
+++ b/contrib/tsearch2/sql/tsearch2.sql
@@ -90,9 +90,9 @@ Moscow	moskva | moscow
 \set ECHO all
 
 alter table test_tsquery add column keyword tsquery;
-update test_tsquery set keyword = to_tsquery('default', txtkeyword);
+update test_tsquery set keyword = to_tsquery('english', txtkeyword);
 alter table test_tsquery add column sample tsquery;
-update test_tsquery set sample = to_tsquery('default', txtsample::text);
+update test_tsquery set sample = to_tsquery('english', txtsample::text);
 
 create unique index bt_tsq on test_tsquery (keyword);
 
@@ -127,12 +127,12 @@ select keyword from test_tsquery where keyword @> 'new';
 select keyword from test_tsquery where keyword @> 'moscow';
 select keyword from test_tsquery where keyword <@ 'new';
 select keyword from test_tsquery where keyword <@ 'moscow';
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where keyword <@ query;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where keyword <@ query;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where keyword <@ query;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where query @> keyword;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where query @> keyword;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where query @> keyword;
 
 create index qq on test_tsquery using gist (keyword gist_tp_tsquery_ops);
 set enable_seqscan='off';
@@ -141,48 +141,48 @@ select keyword from test_tsquery where keyword @> 'new';
 select keyword from test_tsquery where keyword @> 'moscow';
 select keyword from test_tsquery where keyword <@ 'new';
 select keyword from test_tsquery where keyword <@ 'moscow';
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where keyword <@ query;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where keyword <@ query;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where keyword <@ query;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow') as query where query @> keyword;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'moscow & hotel') as query where query @> keyword;
-select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('default', 'bar &  new & qq & foo & york') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where keyword <@ query;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'moscow & hotel') as query where query @> keyword;
+select rewrite( ARRAY[query, keyword, sample] ) from test_tsquery, to_tsquery('english', 'bar &  new & qq & foo & york') as query where query @> keyword;
 set enable_seqscan='on';
 
 
 
 select lexize('simple', 'ASD56 hsdkf');
-select lexize('en_stem', 'SKIES Problems identity');
+select lexize('english_stem', 'SKIES Problems identity');
 
 select * from token_type('default');
 select * from parse('default', '345 qwe@efd.r '' 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 teodor@stack.net 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');
 
-SELECT to_tsvector('default', '345 qwe@efd.r '' 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 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
+SELECT to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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');
 
-SELECT length(to_tsvector('default', '345 qw'));
+SELECT length(to_tsvector('english', '345 qw'));
 
-SELECT length(to_tsvector('default', '345 qwe@efd.r '' 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 teodor@stack.net qwe-wer asdf <fr>qwer jf sdjk<we hjwer <werrwe> ewr1> ewri2 <a href="qwe<qwe>">
+SELECT length(to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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'));
 
 
-select to_tsquery('default', 'qwe & sKies '); 
+select to_tsquery('english', 'qwe & sKies '); 
 select to_tsquery('simple', 'qwe & sKies '); 
-select to_tsquery('default', '''the wether'':dc & ''           sKies '':BC ');
-select to_tsquery('default', 'asd&(and|fghj)');
-select to_tsquery('default', '(asd&and)|fghj');
-select to_tsquery('default', '(asd&!and)|fghj');
-select to_tsquery('default', '(the|and&(i&1))&fghj');
-
-select plainto_tsquery('default', 'the and z 1))& fghj');
-select plainto_tsquery('default', 'foo bar') && plainto_tsquery('default', 'asd');
-select plainto_tsquery('default', 'foo bar') || plainto_tsquery('default', 'asd fg');
-select plainto_tsquery('default', 'foo bar') || !!plainto_tsquery('default', 'asd fg');
-select plainto_tsquery('default', 'foo bar') && 'asd | fg';
+select to_tsquery('english', '''the wether'':dc & ''           sKies '':BC ');
+select to_tsquery('english', 'asd&(and|fghj)');
+select to_tsquery('english', '(asd&and)|fghj');
+select to_tsquery('english', '(asd&!and)|fghj');
+select to_tsquery('english', '(the|and&(i&1))&fghj');
+
+select plainto_tsquery('english', 'the and z 1))& fghj');
+select plainto_tsquery('english', 'foo bar') && plainto_tsquery('english', 'asd');
+select plainto_tsquery('english', 'foo bar') || plainto_tsquery('english', 'asd fg');
+select plainto_tsquery('english', 'foo bar') || !!plainto_tsquery('english', 'asd fg');
+select plainto_tsquery('english', 'foo bar') && 'asd | fg';
 
 select 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca';
 select 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:B';
@@ -211,7 +211,7 @@ SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
 SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
 SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
 
-select set_curcfg('default');
+select set_curcfg('english');
 
 CREATE TRIGGER tsvectorupdate
 BEFORE UPDATE OR INSERT ON test_tsvector
@@ -227,11 +227,7 @@ UPDATE test_tsvector SET t = null WHERE t = '345 qwerty';
 
 SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
 
-drop trigger tsvectorupdate on test_tsvector;
-create function wow(text) returns text as 'select $1 || '' copyright''; ' language sql;
-create trigger tsvectorupdate before update or insert on test_tsvector
-for each row execute procedure tsearch2(a, wow, t);
-insert into test_tsvector (t) values ('345 qwerty');
+insert into test_tsvector (t) values ('345 qwerty copyright');
 select count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
 select count(*) FROM test_tsvector WHERE a @@ to_tsquery('copyright');
 
@@ -253,8 +249,7 @@ select * from stat('select a from test_tsvector','c') order by ndoc desc, nentry
 select * from stat('select a from test_tsvector','d') order by ndoc desc, nentry desc, word;
 select * from stat('select a from test_tsvector','ad') order by ndoc desc, nentry desc, word;
 
-select reset_tsearch();
-select to_tsquery('default', 'skies & books');
+select to_tsquery('english', 'skies & books');
 
 select rank_cd(to_tsvector('Erosion It took the sea a thousand years,
 A thousand years to trace
@@ -286,36 +281,6 @@ The sculpture of these granite seams,
 Upon a woman s face. E.  J.  Pratt  (1882 1964)
 '), to_tsquery('sea'));
 
-select get_covers(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('sea&thousand&years'));
-
-select get_covers(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('granite&sea'));
-
-select get_covers(to_tsvector('Erosion It took the sea a thousand years,
-A thousand years to trace
-The granite features of this cliff
-In crag and scarp and base.
-It took the sea an hour one night
-An hour of storm to place
-The sculpture of these granite seams,
-Upon a woman s face. E.  J.  Pratt  (1882 1964)
-'), to_tsquery('sea'));
-
 select headline('Erosion It took the sea a thousand years,
 A thousand years to trace
 The granite features of this cliff
@@ -361,7 +326,7 @@ ff-bg
 </html>', 
 to_tsquery('sea&foo'), 'HighlightAll=true');
 --check debug
-select * from ts_debug('Tsearch module for PostgreSQL 7.3.3');
+select * from public.ts_debug('Tsearch module for PostgreSQL 7.3.3');
 
 --check ordering
 insert into test_tsvector values (null, null);
diff --git a/contrib/tsearch2/stopword.c b/contrib/tsearch2/stopword.c
deleted file mode 100644
index 5f6d56bce30f..000000000000
--- a/contrib/tsearch2/stopword.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * stopword library
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include "common.h"
-#include "dict.h"
-#include "ts_locale.h"
-
-#define STOPBUFLEN	4096
-
-void
-freestoplist(StopList * s)
-{
-	char	  **ptr = s->stop;
-
-	if (ptr)
-		while (*ptr && s->len > 0)
-		{
-			free(*ptr);
-			ptr++;
-			s->len--;
-			free(s->stop);
-		}
-	memset(s, 0, sizeof(StopList));
-}
-
-void
-readstoplist(text *in, StopList * s)
-{
-	char	  **stop = NULL;
-
-	s->len = 0;
-	if (in && VARSIZE(in) - VARHDRSZ > 0)
-	{
-		char	   *filename = to_absfilename(text2char(in));
-		FILE	   *hin;
-		char		buf[STOPBUFLEN], *pbuf;
-		int			reallen = 0;
-
-		if ((hin = fopen(filename, "r")) == NULL)
-			ereport(ERROR,
-					(errcode(ERRCODE_CONFIG_FILE_ERROR),
-					 errmsg("could not open file \"%s\": %m",
-							filename)));
-
-		while (fgets(buf, sizeof(buf), hin))
-		{
-			pbuf = buf;
-			while( *pbuf && !isspace((unsigned char) *pbuf ) )
-				pbuf++;
-			*pbuf = '\0';
-
-			pg_verifymbstr(buf, strlen(buf), false);
-			if (*buf == '\0' || *buf=='\n' || *buf=='\r')
-				continue;
-
-			if (s->len >= reallen)
-			{
-				char	  **tmp;
-
-				reallen = (reallen) ? reallen * 2 : 16;
-				tmp = (char **) realloc((void *) stop, sizeof(char *) * reallen);
-				if (!tmp)
-				{
-					freestoplist(s);
-					fclose(hin);
-					ereport(ERROR,
-							(errcode(ERRCODE_OUT_OF_MEMORY),
-							 errmsg("out of memory")));
-				}
-				stop = tmp;
-			}
-
-			if (s->wordop) 
-			{
-				pbuf = s->wordop(buf);
-				stop[s->len] = strdup(pbuf);
-				pfree(pbuf);
-			} else
-				stop[s->len] = strdup(buf);
-
-			if (!stop[s->len])
-			{
-				freestoplist(s);
-				fclose(hin);
-				ereport(ERROR,
-						(errcode(ERRCODE_OUT_OF_MEMORY),
-						 errmsg("out of memory")));
-			}
-
-			(s->len)++;
-		}
-		fclose(hin);
-		pfree(filename);
-	}
-	s->stop = stop;
-}
-
-static int
-comparestr(const void *a, const void *b)
-{
-	return strcmp(*(char **) a, *(char **) b);
-}
-
-void
-sortstoplist(StopList * s)
-{
-	if (s->stop && s->len > 0)
-		qsort(s->stop, s->len, sizeof(char *), comparestr);
-}
-
-bool
-searchstoplist(StopList * s, char *key)
-{
-	return (s->stop && s->len > 0 && bsearch(&key, s->stop, s->len, sizeof(char *), comparestr)) ? true : false;
-}
diff --git a/contrib/tsearch2/stopword/russian.stop b/contrib/tsearch2/stopword/russian.stop
deleted file mode 100755
index 1877e3ab5bee..000000000000
--- a/contrib/tsearch2/stopword/russian.stop
+++ /dev/null
@@ -1,151 +0,0 @@
-É
-×
-×Ï
-ÎÅ
-ÞÔÏ
-ÏÎ
-ÎÁ
-Ñ
-Ó
-ÓÏ
-ËÁË
-Á
-ÔÏ
-×ÓÅ
-ÏÎÁ
-ÔÁË
-ÅÇÏ
-ÎÏ
-ÄÁ
-ÔÙ
-Ë
-Õ
-ÖÅ
-×Ù
-ÚÁ
-ÂÙ
-ÐÏ
-ÔÏÌØËÏ
-ÅÅ
-ÍÎÅ
-ÂÙÌÏ
-×ÏÔ
-ÏÔ
-ÍÅÎÑ
-ÅÝÅ
-ÎÅÔ
-Ï
-ÉÚ
-ÅÍÕ
-ÔÅÐÅÒØ
-ËÏÇÄÁ
-ÄÁÖÅ
-ÎÕ
-×ÄÒÕÇ
-ÌÉ
-ÅÓÌÉ
-ÕÖÅ
-ÉÌÉ
-ÎÉ
-ÂÙÔØ
-ÂÙÌ
-ÎÅÇÏ
-ÄÏ
-×ÁÓ
-ÎÉÂÕÄØ
-ÏÐÑÔØ
-ÕÖ
-×ÁÍ
-×ÅÄØ
-ÔÁÍ
-ÐÏÔÏÍ
-ÓÅÂÑ
-ÎÉÞÅÇÏ
-ÅÊ
-ÍÏÖÅÔ
-ÏÎÉ
-ÔÕÔ
-ÇÄÅ
-ÅÓÔØ
-ÎÁÄÏ
-ÎÅÊ
-ÄÌÑ
-ÍÙ
-ÔÅÂÑ
-ÉÈ
-ÞÅÍ
-ÂÙÌÁ
-ÓÁÍ
-ÞÔÏÂ
-ÂÅÚ
-ÂÕÄÔÏ
-ÞÅÇÏ
-ÒÁÚ
-ÔÏÖÅ
-ÓÅÂÅ
-ÐÏÄ
-ÂÕÄÅÔ
-Ö
-ÔÏÇÄÁ
-ËÔÏ
-ÜÔÏÔ
-ÔÏÇÏ
-ÐÏÔÏÍÕ
-ÜÔÏÇÏ
-ËÁËÏÊ
-ÓÏ×ÓÅÍ
-ÎÉÍ
-ÚÄÅÓØ
-ÜÔÏÍ
-ÏÄÉÎ
-ÐÏÞÔÉ
-ÍÏÊ
-ÔÅÍ
-ÞÔÏÂÙ
-ÎÅÅ
-ÓÅÊÞÁÓ
-ÂÙÌÉ
-ËÕÄÁ
-ÚÁÞÅÍ
-×ÓÅÈ
-ÎÉËÏÇÄÁ
-ÍÏÖÎÏ
-ÐÒÉ
-ÎÁËÏÎÅÃ
-Ä×Á
-ÏÂ
-ÄÒÕÇÏÊ
-ÈÏÔØ
-ÐÏÓÌÅ
-ÎÁÄ
-ÂÏÌØÛÅ
-ÔÏÔ
-ÞÅÒÅÚ
-ÜÔÉ
-ÎÁÓ
-ÐÒÏ
-×ÓÅÇÏ
-ÎÉÈ
-ËÁËÁÑ
-ÍÎÏÇÏ
-ÒÁÚ×Å
-ÔÒÉ
-ÜÔÕ
-ÍÏÑ
-×ÐÒÏÞÅÍ
-ÈÏÒÏÛÏ
-Ó×ÏÀ
-ÜÔÏÊ
-ÐÅÒÅÄ
-ÉÎÏÇÄÁ
-ÌÕÞÛÅ
-ÞÕÔØ
-ÔÏÍ
-ÎÅÌØÚÑ
-ÔÁËÏÊ
-ÉÍ
-ÂÏÌÅÅ
-×ÓÅÇÄÁ
-ËÏÎÅÞÎÏ
-×ÓÀ
-ÍÅÖÄÕ
diff --git a/contrib/tsearch2/thesaurus b/contrib/tsearch2/thesaurus
deleted file mode 100755
index 95423508c118..000000000000
--- a/contrib/tsearch2/thesaurus
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Theasurus config file. Character ':' splits
-# string to part, example: 
-# sample-words : substitute-words
-#
-# Any substitute-word can be marked by preceding '*' character,
-# which means do not lexize this word
-# Docs: http://www.sai.msu.su/~megera/oddmuse/index.cgi/Thesaurus_dictionary
-
-#one two three : *123
-#one two : *12
-#one : *1
-#two : *2
-
-#foo bar : blah blah
-#f   bar : fbar
-#e   bar : ebar
-#g   bar bar : gbarbar
-#asd:sdffff
-#qwerty:qwer wert erty
-
diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c
deleted file mode 100644
index db85711e8889..000000000000
--- a/contrib/tsearch2/ts_cfg.c
+++ /dev/null
@@ -1,648 +0,0 @@
-/*
- * interface functions to tscfg
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <ctype.h>
-#include <locale.h>
-
-#include "catalog/pg_type.h"
-#include "executor/spi.h"
-#include "fmgr.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
-
-#include "ts_cfg.h"
-#include "dict.h"
-#include "wparser.h"
-#include "snmap.h"
-#include "common.h"
-#include "tsvector.h"
-
-PG_MODULE_MAGIC;
-
-#define IGNORE_LONGLEXEME	1
-
-/*********top interface**********/
-
-static Oid	current_cfg_id = 0;
-
-void
-init_cfg(Oid id, TSCfgInfo * cfg)
-{
-	Oid			arg[2];
-	bool		isnull;
-	Datum		pars[2];
-	int			stat,
-				i,
-				j;
-	text	   *ptr;
-	text	   *prsname = NULL;
-	char	   *nsp = get_namespace(TSNSP_FunctionOid);
-	char		buf[1024];
-	MemoryContext oldcontext;
-	void	   *plan;
-
-	arg[0] = OIDOID;
-	arg[1] = OIDOID;
-	pars[0] = ObjectIdGetDatum(id);
-	pars[1] = ObjectIdGetDatum(id);
-
-	memset(cfg, 0, sizeof(TSCfgInfo));
-	SPI_connect();
-
-	sprintf(buf, "select prs_name from %s.pg_ts_cfg where oid = $1", nsp);
-	plan = SPI_prepare(buf, 1, arg);
-	if (!plan)
-		ts_error(ERROR, "SPI_prepare() failed");
-
-	stat = SPI_execp(plan, pars, " ", 1);
-	if (stat < 0)
-		ts_error(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed > 0)
-	{
-		prsname = DatumGetTextP(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-		oldcontext = MemoryContextSwitchTo(TopMemoryContext);
-		prsname = ptextdup(prsname);
-		MemoryContextSwitchTo(oldcontext);
-
-		cfg->id = id;
-	}
-	else
-		ts_error(ERROR, "No tsearch cfg with id %d", id);
-
-	SPI_freeplan(plan);
-
-	arg[0] = TEXTOID;
-	sprintf(buf, "select lt.tokid, map.dict_name from %s.pg_ts_cfgmap as map, %s.pg_ts_cfg as cfg, %s.token_type( $1 ) as lt where lt.alias =  map.tok_alias and map.ts_name = cfg.ts_name and cfg.oid= $2 order by lt.tokid desc;", nsp, nsp, nsp);
-	plan = SPI_prepare(buf, 2, arg);
-	if (!plan)
-		ts_error(ERROR, "SPI_prepare() failed");
-
-	pars[0] = PointerGetDatum(prsname);
-	stat = SPI_execp(plan, pars, " ", 0);
-	if (stat < 0)
-		ts_error(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed <= 0)
-		ts_error(ERROR, "No parser with id %d", id);
-
-	for (i = 0; i < SPI_processed; i++)
-	{
-		int			lexid = DatumGetInt32(SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 1, &isnull));
-		ArrayType  *toasted_a = (ArrayType *) DatumGetPointer(SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 2, &isnull));
-		ArrayType  *a;
-
-		if (!cfg->map)
-		{
-			cfg->len = lexid + 1;
-			cfg->map = (ListDictionary *) malloc(sizeof(ListDictionary) * cfg->len);
-			if (!cfg->map)
-				ereport(ERROR,
-						(errcode(ERRCODE_OUT_OF_MEMORY),
-						 errmsg("out of memory")));
-			memset(cfg->map, 0, sizeof(ListDictionary) * cfg->len);
-		}
-
-		if (isnull)
-			continue;
-
-		a = (ArrayType *) PG_DETOAST_DATUM(PointerGetDatum(toasted_a));
-
-		if (ARR_NDIM(a) != 1)
-			ts_error(ERROR, "Wrong dimension");
-		if (ARRNELEMS(a) < 1)
-			continue;
-		if (ARR_HASNULL(a))
-			ts_error(ERROR, "Array must not contain nulls");
-
-		cfg->map[lexid].len = ARRNELEMS(a);
-		cfg->map[lexid].dict_id = (Datum *) malloc(sizeof(Datum) * cfg->map[lexid].len);
-		if (!cfg->map[lexid].dict_id)
-			ts_error(ERROR, "No memory");
-
-		memset(cfg->map[lexid].dict_id, 0, sizeof(Datum) * cfg->map[lexid].len);
-		ptr = (text *) ARR_DATA_PTR(a);
-		oldcontext = MemoryContextSwitchTo(TopMemoryContext);
-		for (j = 0; j < cfg->map[lexid].len; j++)
-		{
-			cfg->map[lexid].dict_id[j] = PointerGetDatum(ptextdup(ptr));
-			ptr = NEXTVAL(ptr);
-		}
-		MemoryContextSwitchTo(oldcontext);
-
-		if (a != toasted_a)
-			pfree(a);
-	}
-
-	SPI_freeplan(plan);
-	SPI_finish();
-	cfg->prs_id = name2id_prs(prsname);
-	pfree(prsname);
-	pfree(nsp);
-	for (i = 0; i < cfg->len; i++)
-	{
-		for (j = 0; j < cfg->map[i].len; j++)
-		{
-			ptr = (text *) DatumGetPointer(cfg->map[i].dict_id[j]);
-			cfg->map[i].dict_id[j] = ObjectIdGetDatum(name2id_dict(ptr));
-			pfree(ptr);
-		}
-	}
-}
-
-typedef struct
-{
-	TSCfgInfo  *last_cfg;
-	int			len;
-	int			reallen;
-	TSCfgInfo  *list;
-	SNMap		name2id_map;
-}	CFGList;
-
-static CFGList CList = {NULL, 0, 0, NULL, {0, 0, NULL}};
-
-void
-reset_cfg(void)
-{
-	freeSNMap(&(CList.name2id_map));
-	if (CList.list)
-	{
-		int			i,
-					j;
-
-		for (i = 0; i < CList.len; i++)
-			if (CList.list[i].map)
-			{
-				for (j = 0; j < CList.list[i].len; j++)
-					if (CList.list[i].map[j].dict_id)
-						free(CList.list[i].map[j].dict_id);
-				free(CList.list[i].map);
-			}
-		free(CList.list);
-	}
-	memset(&CList, 0, sizeof(CFGList));
-}
-
-static int
-comparecfg(const void *a, const void *b)
-{
-	if (((TSCfgInfo *) a)->id == ((TSCfgInfo *) b)->id)
-		return 0;
-	return (((TSCfgInfo *) a)->id < ((TSCfgInfo *) b)->id) ? -1 : 1;
-}
-
-TSCfgInfo *
-findcfg(Oid id)
-{
-	/* last used cfg */
-	if (CList.last_cfg && CList.last_cfg->id == id)
-		return CList.last_cfg;
-
-	/* already used cfg */
-	if (CList.len != 0)
-	{
-		TSCfgInfo	key;
-
-		key.id = id;
-		CList.last_cfg = bsearch(&key, CList.list, CList.len, sizeof(TSCfgInfo), comparecfg);
-		if (CList.last_cfg != NULL)
-			return CList.last_cfg;
-	}
-
-	/* last chance */
-	if (CList.len == CList.reallen)
-	{
-		TSCfgInfo  *tmp;
-		int			reallen = (CList.reallen) ? 2 * CList.reallen : 16;
-
-		tmp = (TSCfgInfo *) realloc(CList.list, sizeof(TSCfgInfo) * reallen);
-		if (!tmp)
-			ts_error(ERROR, "No memory");
-		CList.reallen = reallen;
-		CList.list = tmp;
-	}
-	init_cfg(id, &(CList.list[CList.len]) );
-	CList.last_cfg = &(CList.list[CList.len]);
-	CList.len++;
-	qsort(CList.list, CList.len, sizeof(TSCfgInfo), comparecfg);
-	return findcfg(id); /* qsort changed order!! */ ;
-}
-
-
-Oid
-name2id_cfg(text *name)
-{
-	Oid			arg[1];
-	bool		isnull;
-	Datum		pars[1];
-	int			stat;
-	Oid			id = findSNMap_t(&(CList.name2id_map), name);
-	void	   *plan;
-	char	   *nsp;
-	char		buf[1024];
-
-	arg[0] = TEXTOID;
-	pars[0] = PointerGetDatum(name);
-
-	if (id)
-		return id;
-
-	nsp = get_namespace(TSNSP_FunctionOid);
-	SPI_connect();
-	sprintf(buf, "select oid from %s.pg_ts_cfg where ts_name = $1", nsp);
-	plan = SPI_prepare(buf, 1, arg);
-	if (!plan)
-		/* internal error */
-		elog(ERROR, "SPI_prepare() failed");
-
-	stat = SPI_execp(plan, pars, " ", 1);
-	if (stat < 0)
-		/* internal error */
-		elog(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed > 0)
-	{
-		id = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-		if (isnull)
-			ereport(ERROR,
-					(errcode(ERRCODE_CONFIG_FILE_ERROR),
-					 errmsg("null id for tsearch config")));
-	}
-	else
-		ereport(ERROR,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("no tsearch config")));
-
-	SPI_freeplan(plan);
-	SPI_finish();
-	addSNMap_t(&(CList.name2id_map), name, id);
-	return id;
-}
-
-void
-parsetext_v2(TSCfgInfo * cfg, PRSTEXT * prs, char *buf, int4 buflen)
-{
-	int			type,
-				lenlemm;
-	char	   *lemm = NULL;
-	WParserInfo *prsobj = findprs(cfg->prs_id);
-	LexizeData	ldata;
-	TSLexeme   *norms;
-
-	prsobj->prs = (void *) DatumGetPointer(
-										   FunctionCall2(
-													   &(prsobj->start_info),
-														 PointerGetDatum(buf),
-														 Int32GetDatum(buflen)
-														 )
-		);
-
-	LexizeInit(&ldata, cfg);
-
-	do
-	{
-		type = DatumGetInt32(FunctionCall3(
-										   &(prsobj->getlexeme_info),
-										   PointerGetDatum(prsobj->prs),
-										   PointerGetDatum(&lemm),
-										   PointerGetDatum(&lenlemm)));
-
-		if (type > 0 && lenlemm >= MAXSTRLEN)
-		{
-#ifdef IGNORE_LONGLEXEME
-			ereport(NOTICE,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("A word you are indexing is too long. It will be ignored.")));
-			continue;
-#else
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("A word you are indexing is too long")));
-#endif
-		}
-
-		LexizeAddLemm(&ldata, type, lemm, lenlemm);
-
-		while ((norms = LexizeExec(&ldata, NULL)) != NULL)
-		{
-			TSLexeme   *ptr = norms;
-
-			prs->pos++;			/* set pos */
-
-			while (ptr->lexeme)
-			{
-				if (prs->curwords == prs->lenwords)
-				{
-					prs->lenwords *= 2;
-					prs->words = (TSWORD *) repalloc((void *) prs->words, prs->lenwords * sizeof(TSWORD));
-				}
-
-				if (ptr->flags & TSL_ADDPOS)
-					prs->pos++;
-				prs->words[prs->curwords].len = strlen(ptr->lexeme);
-				prs->words[prs->curwords].word = ptr->lexeme;
-				prs->words[prs->curwords].nvariant = ptr->nvariant;
-				prs->words[prs->curwords].alen = 0;
-				prs->words[prs->curwords].pos.pos = LIMITPOS(prs->pos);
-				ptr++;
-				prs->curwords++;
-			}
-			pfree(norms);
-		}
-	} while (type > 0);
-
-	FunctionCall1(
-				  &(prsobj->end_info),
-				  PointerGetDatum(prsobj->prs)
-		);
-}
-
-static void
-hladdword(HLPRSTEXT * prs, char *buf, int4 buflen, int type)
-{
-	while (prs->curwords >= prs->lenwords)
-	{
-		prs->lenwords *= 2;
-		prs->words = (HLWORD *) repalloc((void *) prs->words, prs->lenwords * sizeof(HLWORD));
-	}
-	memset(&(prs->words[prs->curwords]), 0, sizeof(HLWORD));
-	prs->words[prs->curwords].type = (uint8) type;
-	prs->words[prs->curwords].len = buflen;
-	prs->words[prs->curwords].word = palloc(buflen);
-	memcpy(prs->words[prs->curwords].word, buf, buflen);
-	prs->curwords++;
-}
-
-static void
-hlfinditem(HLPRSTEXT * prs, QUERYTYPE * query, char *buf, int buflen)
-{
-	int			i;
-	ITEM	   *item = GETQUERY(query);
-	HLWORD	   *word;
-
-	while (prs->curwords + query->size >= prs->lenwords)
-	{
-		prs->lenwords *= 2;
-		prs->words = (HLWORD *) repalloc((void *) prs->words, prs->lenwords * sizeof(HLWORD));
-	}
-
-	word = &(prs->words[prs->curwords - 1]);
-	for (i = 0; i < query->size; i++)
-	{
-		if (item->type == VAL && item->length == buflen && strncmp(GETOPERAND(query) + item->distance, buf, buflen) == 0)
-		{
-			if (word->item)
-			{
-				memcpy(&(prs->words[prs->curwords]), word, sizeof(HLWORD));
-				prs->words[prs->curwords].item = item;
-				prs->words[prs->curwords].repeated = 1;
-				prs->curwords++;
-			}
-			else
-				word->item = item;
-		}
-		item++;
-	}
-}
-
-static void
-addHLParsedLex(HLPRSTEXT * prs, QUERYTYPE * query, ParsedLex * lexs, TSLexeme * norms)
-{
-	ParsedLex  *tmplexs;
-	TSLexeme   *ptr;
-
-	while (lexs)
-	{
-
-		if (lexs->type > 0)
-			hladdword(prs, lexs->lemm, lexs->lenlemm, lexs->type);
-
-		ptr = norms;
-		while (ptr && ptr->lexeme)
-		{
-			hlfinditem(prs, query, ptr->lexeme, strlen(ptr->lexeme));
-			ptr++;
-		}
-
-		tmplexs = lexs->next;
-		pfree(lexs);
-		lexs = tmplexs;
-	}
-
-	if (norms)
-	{
-		ptr = norms;
-		while (ptr->lexeme)
-		{
-			pfree(ptr->lexeme);
-			ptr++;
-		}
-		pfree(norms);
-	}
-}
-
-void
-hlparsetext(TSCfgInfo * cfg, HLPRSTEXT * prs, QUERYTYPE * query, char *buf, int4 buflen)
-{
-	int			type,
-				lenlemm;
-	char	   *lemm = NULL;
-	WParserInfo *prsobj = findprs(cfg->prs_id);
-	LexizeData	ldata;
-	TSLexeme   *norms;
-	ParsedLex  *lexs;
-
-	prsobj->prs = (void *) DatumGetPointer(
-										   FunctionCall2(
-													   &(prsobj->start_info),
-														 PointerGetDatum(buf),
-														 Int32GetDatum(buflen)
-														 )
-		);
-
-	LexizeInit(&ldata, cfg);
-
-	do
-	{
-		type = DatumGetInt32(FunctionCall3(
-										   &(prsobj->getlexeme_info),
-										   PointerGetDatum(prsobj->prs),
-										   PointerGetDatum(&lemm),
-										   PointerGetDatum(&lenlemm)));
-
-		if (type > 0 && lenlemm >= MAXSTRLEN)
-		{
-#ifdef IGNORE_LONGLEXEME
-			ereport(NOTICE,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("A word you are indexing is too long. It will be ignored.")));
-			continue;
-#else
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("A word you are indexing is too long")));
-#endif
-		}
-
-		LexizeAddLemm(&ldata, type, lemm, lenlemm);
-
-		do
-		{
-			if ((norms = LexizeExec(&ldata, &lexs)) != NULL)
-				addHLParsedLex(prs, query, lexs, norms);
-			else
-				addHLParsedLex(prs, query, lexs, NULL);
-		} while (norms);
-
-	} while (type > 0);
-
-	FunctionCall1(
-				  &(prsobj->end_info),
-				  PointerGetDatum(prsobj->prs)
-		);
-}
-
-text *
-genhl(HLPRSTEXT * prs)
-{
-	text	   *out;
-	int			len = 128;
-	char	   *ptr;
-	HLWORD	   *wrd = prs->words;
-
-	out = (text *) palloc(len);
-	ptr = ((char *) out) + VARHDRSZ;
-
-	while (wrd - prs->words < prs->curwords)
-	{
-		while (wrd->len + prs->stopsellen + prs->startsellen + (ptr - ((char *) out)) >= len)
-		{
-			int			dist = ptr - ((char *) out);
-
-			len *= 2;
-			out = (text *) repalloc(out, len);
-			ptr = ((char *) out) + dist;
-		}
-
-		if (wrd->in && !wrd->repeated)
-		{
-			if (wrd->replace)
-			{
-				*ptr = ' ';
-				ptr++;
-			}
-			else
-			{
-				if (wrd->selected)
-				{
-					memcpy(ptr, prs->startsel, prs->startsellen);
-					ptr += prs->startsellen;
-				}
-				memcpy(ptr, wrd->word, wrd->len);
-				ptr += wrd->len;
-				if (wrd->selected)
-				{
-					memcpy(ptr, prs->stopsel, prs->stopsellen);
-					ptr += prs->stopsellen;
-				}
-			}
-		}
-		else if (!wrd->repeated)
-			pfree(wrd->word);
-
-		wrd++;
-	}
-
-	SET_VARSIZE(out, ptr - ((char *) out));
-	return out;
-}
-
-int
-get_currcfg(void)
-{
-	Oid			arg[1] = {TEXTOID};
-	const char *curlocale;
-	Datum		pars[1];
-	bool		isnull;
-	int			stat;
-	char		buf[1024];
-	char	   *nsp;
-	void	   *plan;
-
-	if (current_cfg_id > 0)
-		return current_cfg_id;
-
-	nsp = get_namespace(TSNSP_FunctionOid);
-	SPI_connect();
-	sprintf(buf, "select oid from %s.pg_ts_cfg where locale = $1 ", nsp);
-	pfree(nsp);
-	plan = SPI_prepare(buf, 1, arg);
-	if (!plan)
-		/* internal error */
-		elog(ERROR, "SPI_prepare() failed");
-
-	curlocale = setlocale(LC_CTYPE, NULL);
-	pars[0] = PointerGetDatum(char2text((char *) curlocale));
-	stat = SPI_execp(plan, pars, " ", 1);
-
-	if (stat < 0)
-		/* internal error */
-		elog(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed > 0)
-		current_cfg_id = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-	else
-		ereport(ERROR,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("could not find tsearch config by locale")));
-
-	pfree(DatumGetPointer(pars[0]));
-	SPI_freeplan(plan);
-	SPI_finish();
-	return current_cfg_id;
-}
-
-PG_FUNCTION_INFO_V1(set_curcfg);
-Datum		set_curcfg(PG_FUNCTION_ARGS);
-Datum
-set_curcfg(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	findcfg(PG_GETARG_OID(0));
-	current_cfg_id = PG_GETARG_OID(0);
-	PG_RETURN_VOID();
-}
-
-PG_FUNCTION_INFO_V1(set_curcfg_byname);
-Datum		set_curcfg_byname(PG_FUNCTION_ARGS);
-Datum
-set_curcfg_byname(PG_FUNCTION_ARGS)
-{
-	text	   *name = PG_GETARG_TEXT_P(0);
-
-	SET_FUNCOID();
-	DirectFunctionCall1(
-						set_curcfg,
-						ObjectIdGetDatum(name2id_cfg(name))
-		);
-	PG_FREE_IF_COPY(name, 0);
-	PG_RETURN_VOID();
-}
-
-PG_FUNCTION_INFO_V1(show_curcfg);
-Datum		show_curcfg(PG_FUNCTION_ARGS);
-Datum
-show_curcfg(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	PG_RETURN_OID(get_currcfg());
-}
-
-PG_FUNCTION_INFO_V1(reset_tsearch);
-Datum		reset_tsearch(PG_FUNCTION_ARGS);
-Datum
-reset_tsearch(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	ts_error(NOTICE, "TSearch cache cleaned");
-	PG_RETURN_VOID();
-}
diff --git a/contrib/tsearch2/ts_cfg.h b/contrib/tsearch2/ts_cfg.h
deleted file mode 100644
index 7bffdbcdd611..000000000000
--- a/contrib/tsearch2/ts_cfg.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef __TS_CFG_H__
-#define __TS_CFG_H__
-
-#include "postgres.h"
-#include "query.h"
-
-
-typedef struct
-{
-	int			len;
-	Datum	   *dict_id;
-}	ListDictionary;
-
-typedef struct
-{
-	Oid			id;
-	Oid			prs_id;
-	int			len;
-	ListDictionary *map;
-}	TSCfgInfo;
-
-Oid			name2id_cfg(text *name);
-TSCfgInfo  *findcfg(Oid id);
-void		init_cfg(Oid id, TSCfgInfo * cfg);
-void		reset_cfg(void);
-
-typedef struct
-{
-	uint16		len;
-	uint16		nvariant;
-	union
-	{
-		uint16		pos;
-		uint16	   *apos;
-	}			pos;
-	char	   *word;
-	uint32		alen;
-}	TSWORD;
-
-typedef struct
-{
-	TSWORD	   *words;
-	int4		lenwords;
-	int4		curwords;
-	int4		pos;
-}	PRSTEXT;
-
-typedef struct
-{
-	uint32		selected:1,
-				in:1,
-				replace:1,
-				repeated:1,
-				unused:4,
-				type:8,
-				len:16;
-	char	   *word;
-	ITEM	   *item;
-}	HLWORD;
-
-typedef struct
-{
-	HLWORD	   *words;
-	int4		lenwords;
-	int4		curwords;
-	char	   *startsel;
-	char	   *stopsel;
-	int2		startsellen;
-	int2		stopsellen;
-}	HLPRSTEXT;
-
-void		hlparsetext(TSCfgInfo * cfg, HLPRSTEXT * prs, QUERYTYPE * query, char *buf, int4 buflen);
-text	   *genhl(HLPRSTEXT * prs);
-
-void		parsetext_v2(TSCfgInfo * cfg, PRSTEXT * prs, char *buf, int4 buflen);
-int			get_currcfg(void);
-
-#endif
diff --git a/contrib/tsearch2/ts_lexize.c b/contrib/tsearch2/ts_lexize.c
deleted file mode 100644
index f2e4904eb7b3..000000000000
--- a/contrib/tsearch2/ts_lexize.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * lexize stream of lexemes
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <ctype.h>
-#include <locale.h>
-
-#include "ts_cfg.h"
-#include "dict.h"
-
-void
-LexizeInit(LexizeData * ld, TSCfgInfo * cfg)
-{
-	ld->cfg = cfg;
-	ld->curDictId = InvalidOid;
-	ld->posDict = 0;
-	ld->towork.head = ld->towork.tail = ld->curSub = NULL;
-	ld->waste.head = ld->waste.tail = NULL;
-	ld->lastRes = NULL;
-	ld->tmpRes = NULL;
-}
-
-static void
-LPLAddTail(ListParsedLex * list, ParsedLex * newpl)
-{
-	if (list->tail)
-	{
-		list->tail->next = newpl;
-		list->tail = newpl;
-	}
-	else
-		list->head = list->tail = newpl;
-	newpl->next = NULL;
-}
-
-static ParsedLex *
-LPLRemoveHead(ListParsedLex * list)
-{
-	ParsedLex  *res = list->head;
-
-	if (list->head)
-		list->head = list->head->next;
-
-	if (list->head == NULL)
-		list->tail = NULL;
-
-	return res;
-}
-
-
-void
-LexizeAddLemm(LexizeData * ld, int type, char *lemm, int lenlemm)
-{
-	ParsedLex  *newpl = (ParsedLex *) palloc(sizeof(ParsedLex));
-
-	newpl = (ParsedLex *) palloc(sizeof(ParsedLex));
-	newpl->type = type;
-	newpl->lemm = lemm;
-	newpl->lenlemm = lenlemm;
-	LPLAddTail(&ld->towork, newpl);
-	ld->curSub = ld->towork.tail;
-}
-
-static void
-RemoveHead(LexizeData * ld)
-{
-	LPLAddTail(&ld->waste, LPLRemoveHead(&ld->towork));
-
-	ld->posDict = 0;
-}
-
-static void
-setCorrLex(LexizeData * ld, ParsedLex ** correspondLexem)
-{
-	if (correspondLexem)
-	{
-		*correspondLexem = ld->waste.head;
-	}
-	else
-	{
-		ParsedLex  *tmp,
-				   *ptr = ld->waste.head;
-
-		while (ptr)
-		{
-			tmp = ptr->next;
-			pfree(ptr);
-			ptr = tmp;
-		}
-	}
-	ld->waste.head = ld->waste.tail = NULL;
-}
-
-static void
-moveToWaste(LexizeData * ld, ParsedLex * stop)
-{
-	bool		go = true;
-
-	while (ld->towork.head && go)
-	{
-		if (ld->towork.head == stop)
-		{
-			ld->curSub = stop->next;
-			go = false;
-		}
-		RemoveHead(ld);
-	}
-}
-
-static void
-setNewTmpRes(LexizeData * ld, ParsedLex * lex, TSLexeme * res)
-{
-	if (ld->tmpRes)
-	{
-		TSLexeme   *ptr;
-
-		for (ptr = ld->tmpRes; ptr->lexeme; ptr++)
-			pfree(ptr->lexeme);
-		pfree(ld->tmpRes);
-	}
-	ld->tmpRes = res;
-	ld->lastRes = lex;
-}
-
-TSLexeme *
-LexizeExec(LexizeData * ld, ParsedLex ** correspondLexem)
-{
-	int			i;
-	ListDictionary *map;
-	DictInfo   *dict;
-	TSLexeme   *res;
-
-	if (ld->curDictId == InvalidOid)
-	{
-		/*
-		 * usial mode: dictionary wants only one word, but we should keep in
-		 * mind that we should go through all stack
-		 */
-
-		while (ld->towork.head)
-		{
-			ParsedLex  *curVal = ld->towork.head;
-
-			map = ld->cfg->map + curVal->type;
-
-			if (curVal->type == 0 || curVal->type >= ld->cfg->len || map->len == 0)
-			{
-				/* skip this type of lexeme */
-				RemoveHead(ld);
-				continue;
-			}
-
-			for (i = ld->posDict; i < map->len; i++)
-			{
-				dict = finddict(DatumGetObjectId(map->dict_id[i]));
-
-				ld->dictState.isend = ld->dictState.getnext = false;
-				ld->dictState.private = NULL;
-				res = (TSLexeme *) DatumGetPointer(FunctionCall4(
-														&(dict->lexize_info),
-										   PointerGetDatum(dict->dictionary),
-											   PointerGetDatum(curVal->lemm),
-											  Int32GetDatum(curVal->lenlemm),
-											  PointerGetDatum(&ld->dictState)
-																 ));
-
-				if (ld->dictState.getnext)
-				{
-					/*
-					 * dictinary wants next word, so setup and store current
-					 * position and go to multiword  mode
-					 */
-
-					ld->curDictId = DatumGetObjectId(map->dict_id[i]);
-					ld->posDict = i + 1;
-					ld->curSub = curVal->next;
-					if (res)
-						setNewTmpRes(ld, curVal, res);
-					return LexizeExec(ld, correspondLexem);
-				}
-
-				if (!res)		/* dictionary doesn't know this lexeme */
-					continue;
-
-				RemoveHead(ld);
-				setCorrLex(ld, correspondLexem);
-				return res;
-			}
-
-			RemoveHead(ld);
-		}
-	}
-	else
-	{							/* curDictId is valid */
-		dict = finddict(ld->curDictId);
-
-		/*
-		 * Dictionary ld->curDictId asks  us about following words
-		 */
-
-		while (ld->curSub)
-		{
-			ParsedLex  *curVal = ld->curSub;
-
-			map = ld->cfg->map + curVal->type;
-
-			if (curVal->type != 0)
-			{
-				bool		dictExists = false;
-
-				if (curVal->type >= ld->cfg->len || map->len == 0)
-				{
-					/* skip this type of lexeme */
-					ld->curSub = curVal->next;
-					continue;
-				}
-
-				/*
-				 * We should be sure that current type of lexeme is recognized
-				 * by our dictinonary: we just check is it exist in list of
-				 * dictionaries ?
-				 */
-				for (i = 0; i < map->len && !dictExists; i++)
-					if (ld->curDictId == DatumGetObjectId(map->dict_id[i]))
-						dictExists = true;
-
-				if (!dictExists)
-				{
-					/*
-					 * Dictionary can't work with current tpe of lexeme,
-					 * return to basic mode and redo all stored lexemes
-					 */
-					ld->curDictId = InvalidOid;
-					return LexizeExec(ld, correspondLexem);
-				}
-			}
-
-			ld->dictState.isend = (curVal->type == 0) ? true : false;
-			ld->dictState.getnext = false;
-
-			res = (TSLexeme *) DatumGetPointer(FunctionCall4(
-														&(dict->lexize_info),
-										   PointerGetDatum(dict->dictionary),
-											   PointerGetDatum(curVal->lemm),
-											  Int32GetDatum(curVal->lenlemm),
-											  PointerGetDatum(&ld->dictState)
-															 ));
-
-			if (ld->dictState.getnext)
-			{
-				/* Dictionary wants one more */
-				ld->curSub = curVal->next;
-				if (res)
-					setNewTmpRes(ld, curVal, res);
-				continue;
-			}
-
-			if (res || ld->tmpRes)
-			{
-				/*
-				 * Dictionary normalizes lexemes, so we remove from stack all
-				 * used lexemes , return to basic mode and redo end of stack
-				 * (if it exists)
-				 */
-				if (res)
-				{
-					moveToWaste(ld, ld->curSub);
-				}
-				else
-				{
-					res = ld->tmpRes;
-					moveToWaste(ld, ld->lastRes);
-				}
-
-				/* reset to initial state */
-				ld->curDictId = InvalidOid;
-				ld->posDict = 0;
-				ld->lastRes = NULL;
-				ld->tmpRes = NULL;
-				setCorrLex(ld, correspondLexem);
-				return res;
-			}
-
-			/*
-			 * Dict don't want next lexem and didn't recognize anything, redo
-			 * from ld->towork.head
-			 */
-			ld->curDictId = InvalidOid;
-			return LexizeExec(ld, correspondLexem);
-		}
-	}
-
-	setCorrLex(ld, correspondLexem);
-	return NULL;
-}
diff --git a/contrib/tsearch2/ts_locale.c b/contrib/tsearch2/ts_locale.c
deleted file mode 100644
index 5bc40507e36c..000000000000
--- a/contrib/tsearch2/ts_locale.c
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "ts_locale.h"
-
-#include "utils/builtins.h"
-#include "utils/pg_locale.h"
-#include "mb/pg_wchar.h"
-
-
-#ifdef TS_USE_WIDE
-
-#ifdef WIN32
-
-size_t
-wchar2char(char *to, const wchar_t *from, size_t len)
-{
-	if (len == 0)
-		return 0;
-
-	if (GetDatabaseEncoding() == PG_UTF8)
-	{
-		int			r;
-
-		r = WideCharToMultiByte(CP_UTF8, 0, from, -1, to, len,
-								NULL, NULL);
-
-		if (r == 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
-					 errmsg("UTF-16 to UTF-8 translation failed: %lu",
-							GetLastError())));
-		Assert(r <= len);
-
-		return r;
-	}
-
-	return wcstombs(to, from, len);
-}
-#endif   /* WIN32 */
-
-size_t
-char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen)
-{
-	if (tolen == 0)
-		return 0;
-
-#ifdef WIN32
-	if (GetDatabaseEncoding() == PG_UTF8)
-	{
-		int			r;
-
-		r = MultiByteToWideChar(CP_UTF8, 0, from, fromlen, to, tolen);
-
-		if (!r)
-		{
-			pg_verifymbstr(from, strlen(from), false);
-			ereport(ERROR,
-					(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
-					 errmsg("invalid multibyte character for locale"),
-					 errhint("The server's LC_CTYPE locale is probably incompatible with the database encoding.")));
-		}
-
-		Assert(r <= tolen);
-
-		return r;
-	}
-	else 
-#endif /* WIN32 */
-	if ( lc_ctype_is_c() )
-	{
-		/*
-		 * pg_mb2wchar_with_len always adds trailing '\0', so 
-		 * 'to' should be allocated with sufficient space 
-		 */
-		return pg_mb2wchar_with_len(from, (pg_wchar *)to, tolen);
-	}
-
-	return mbstowcs(to, from, tolen);
-}
-
-int
-_t_isalpha(const char *ptr)
-{
-	wchar_t		character[2];
-
-	if (lc_ctype_is_c())
-		return isalpha(TOUCHAR(ptr));
-
-	char2wchar(character, 1, ptr, 1);
-
-	return iswalpha((wint_t) *character);
-}
-
-int
-_t_isprint(const char *ptr)
-{
-	wchar_t		character[2];
-
-	if (lc_ctype_is_c())
-		return isprint(TOUCHAR(ptr));
-
-	char2wchar(character, 1, ptr, 1);
-
-	return iswprint((wint_t) *character);
-}
-#endif   /* TS_USE_WIDE */
-
-char *
-lowerstr(char *str)
-{
-	char	   *ptr = str;
-	char	   *out;
-	int			len = strlen(str);
-
-	if ( len == 0 )
-		return pstrdup("");
-
-#ifdef TS_USE_WIDE
-
-	/*
-	 * Use wide char code only when max encoding length > 1 and ctype != C.
-	 * Some operating systems fail with multi-byte encodings and a C locale.
-	 * Also, for a C locale there is no need to process as multibyte. From
-	 * backend/utils/adt/oracle_compat.c Teodor
-	 */
-	if (pg_database_encoding_max_length() > 1 && !lc_ctype_is_c())
-	{
-		wchar_t    *wstr,
-				   *wptr;
-		int		    wlen;
-
-		/* 
-		 *alloc number of wchar_t for worst case, len contains
-		 * number of bytes <= number of characters and
-		 * alloc 1 wchar_t for 0, because wchar2char(wcstombs in really)
-		 * wants zero-terminated string
-		 */
-		wptr = wstr = (wchar_t *) palloc(sizeof(wchar_t) * (len+1));
-
-		/*
-		 * str SHOULD be cstring, so wlen contains number
-		 * of converted character
-		 */
-		wlen = char2wchar(wstr, len, str, len);
-		if ( wlen < 0 )
-			ereport(ERROR,
-					(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
-					 errmsg("translation failed from server encoding to wchar_t")));
-
-		Assert(wlen<=len);
-		wstr[wlen] = 0;
-
-		while (*wptr)
-		{
-			*wptr = towlower((wint_t) *wptr);
-			wptr++;
-		}
-
-		/*
-		 * Alloc result string for worst case + '\0'
-		 */
-		len = sizeof(char)*pg_database_encoding_max_length()*(wlen+1);
-		out = (char*)palloc(len);
-
-		/*
-		 * wlen now is number of bytes which is always >= number of characters
-		 */
-		wlen = wchar2char(out, wstr, len);
-		pfree(wstr);
-
-		if ( wlen < 0 )
-			ereport(ERROR,
-					(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
-					 errmsg("translation failed from wchar_t to server encoding %d", errno)));
-		Assert(wlen<=len);
-		out[wlen]='\0';
-	}
-	else
-#endif
-	{
-		char *outptr;
-
-		outptr = out = (char*)palloc( sizeof(char) * (len+1) );
-		while (*ptr)
-		{
-			*outptr++ = tolower(*(unsigned char *) ptr);
-			ptr++;
-		}
-		*outptr = '\0';
-	}
-
-	return out;
-}
diff --git a/contrib/tsearch2/ts_locale.h b/contrib/tsearch2/ts_locale.h
deleted file mode 100644
index 603631f021b1..000000000000
--- a/contrib/tsearch2/ts_locale.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef __TSLOCALE_H__
-#define __TSLOCALE_H__
-
-#include "postgres.h"
-#include "utils/pg_locale.h"
-#include "mb/pg_wchar.h"
-
-#include <ctype.h>
-#include <limits.h>
-
-/*
- * towlower() and friends should be in <wctype.h>, but some pre-C99 systems
- * declare them in <wchar.h>.
- */
-#ifdef HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-#ifdef HAVE_WCTYPE_H
-#include <wctype.h>
-#endif
-
-#if defined(HAVE_WCSTOMBS) && defined(HAVE_TOWLOWER)
-#define TS_USE_WIDE
-#endif
-
-#ifdef TS_USE_WIDE
-#endif   /* TS_USE_WIDE */
-
-
-#define TOUCHAR(x)	(*((unsigned char*)(x)))
-
-#ifdef TS_USE_WIDE
-size_t char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen);
-
-#ifdef WIN32
-
-extern size_t wchar2char(char *to, const wchar_t *from, size_t tolen);
-
-#else							/* WIN32 */
-
-/* correct wcstombs */
-#define wchar2char wcstombs
-
-#endif   /* WIN32 */
-
-#define t_isdigit(x)	( pg_mblen(x)==1 && isdigit( TOUCHAR(x) ) )
-#define t_isspace(x)	( pg_mblen(x)==1 && isspace( TOUCHAR(x) ) )
-extern int	_t_isalpha(const char *ptr);
-
-#define t_isalpha(x)	( (pg_mblen(x)==1) ? isalpha( TOUCHAR(x) ) : _t_isalpha(x) )
-extern int	_t_isprint(const char *ptr);
-
-#define t_isprint(x)	( (pg_mblen(x)==1) ? isprint( TOUCHAR(x) ) : _t_isprint(x) )
-/*
- * t_iseq() should be called only for ASCII symbols
- */
-#define t_iseq(x,c) ( (pg_mblen(x)==1) ? ( TOUCHAR(x) == ((unsigned char)(c)) ) : false )
-
-#define COPYCHAR(d,s)	do {					\
-	int lll = pg_mblen( s );					\
-												\
-	while( lll-- )								\
-		TOUCHAR((d)+lll) = TOUCHAR((s)+lll);	\
-} while(0)
-
-#else							/* not def TS_USE_WIDE */
-
-#define t_isdigit(x)	isdigit( TOUCHAR(x) )
-#define t_isspace(x)	isspace( TOUCHAR(x) )
-#define t_isalpha(x)	isalpha( TOUCHAR(x) )
-#define t_isprint(x)	isprint( TOUCHAR(x) )
-#define t_iseq(x,c) ( TOUCHAR(x) == ((unsigned char)(c)) )
-
-#define COPYCHAR(d,s)	TOUCHAR(d) = TOUCHAR(s)
-#endif
-
-char	   *lowerstr(char *str);
-
-#endif   /* __TSLOCALE_H__ */
diff --git a/contrib/tsearch2/ts_stat.c b/contrib/tsearch2/ts_stat.c
deleted file mode 100644
index d728dd579605..000000000000
--- a/contrib/tsearch2/ts_stat.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * stat functions
- */
-
-#include "tsvector.h"
-#include "ts_stat.h"
-#include "funcapi.h"
-#include "catalog/pg_type.h"
-#include "executor/spi.h"
-#include "common.h"
-#include "ts_locale.h"
-
-PG_FUNCTION_INFO_V1(tsstat_in);
-Datum		tsstat_in(PG_FUNCTION_ARGS);
-Datum
-tsstat_in(PG_FUNCTION_ARGS)
-{
-	tsstat	   *stat = palloc(STATHDRSIZE);
-
-	SET_VARSIZE(stat, STATHDRSIZE);
-	stat->size = 0;
-	stat->weight = 0;
-	PG_RETURN_POINTER(stat);
-}
-
-PG_FUNCTION_INFO_V1(tsstat_out);
-Datum		tsstat_out(PG_FUNCTION_ARGS);
-Datum
-tsstat_out(PG_FUNCTION_ARGS)
-{
-	ereport(ERROR,
-			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("tsstat_out not implemented")));
-	PG_RETURN_NULL();
-}
-
-static int
-check_weight(tsvector * txt, WordEntry * wptr, int8 weight)
-{
-	int			len = POSDATALEN(txt, wptr);
-	int			num = 0;
-	WordEntryPos *ptr = POSDATAPTR(txt, wptr);
-
-	while (len--)
-	{
-		if (weight & (1 << WEP_GETWEIGHT(*ptr)))
-			num++;
-		ptr++;
-	}
-	return num;
-}
-
-static WordEntry **
-SEI_realloc(WordEntry ** in, uint32 *len)
-{
-	if (*len == 0 || in == NULL)
-	{
-		*len = 8;
-		in = palloc(sizeof(WordEntry *) * (*len));
-	}
-	else
-	{
-		*len *= 2;
-		in = repalloc(in, sizeof(WordEntry *) * (*len));
-	}
-	return in;
-}
-
-static int
-compareStatWord(StatEntry * a, WordEntry * b, tsstat * stat, tsvector * txt)
-{
-	if (a->len == b->len)
-		return strncmp(
-					   STATSTRPTR(stat) + a->pos,
-					   STRPTR(txt) + b->pos,
-					   a->len
-			);
-	return (a->len > b->len) ? 1 : -1;
-}
-
-static tsstat *
-formstat(tsstat * stat, tsvector * txt, WordEntry ** entry, uint32 len)
-{
-	tsstat	   *newstat;
-	uint32		totallen,
-				nentry;
-	uint32		slen = 0;
-	WordEntry **ptr = entry;
-	char	   *curptr;
-	StatEntry  *sptr,
-			   *nptr;
-
-	while (ptr - entry < len)
-	{
-		slen += (*ptr)->len;
-		ptr++;
-	}
-
-	nentry = stat->size + len;
-	slen += STATSTRSIZE(stat);
-	totallen = CALCSTATSIZE(nentry, slen);
-	newstat = palloc(totallen);
-	SET_VARSIZE(newstat, totallen);
-	newstat->weight = stat->weight;
-	newstat->size = nentry;
-
-	memcpy(STATSTRPTR(newstat), STATSTRPTR(stat), STATSTRSIZE(stat));
-	curptr = STATSTRPTR(newstat) + STATSTRSIZE(stat);
-
-	ptr = entry;
-	sptr = STATPTR(stat);
-	nptr = STATPTR(newstat);
-
-	if (len == 1)
-	{
-		StatEntry  *StopLow = STATPTR(stat);
-		StatEntry  *StopHigh = (StatEntry *) STATSTRPTR(stat);
-
-		while (StopLow < StopHigh)
-		{
-			sptr = StopLow + (StopHigh - StopLow) / 2;
-			if (compareStatWord(sptr, *ptr, stat, txt) < 0)
-				StopLow = sptr + 1;
-			else
-				StopHigh = sptr;
-		}
-		nptr = STATPTR(newstat) + (StopLow - STATPTR(stat));
-		memcpy(STATPTR(newstat), STATPTR(stat), sizeof(StatEntry) * (StopLow - STATPTR(stat)));
-		if ((*ptr)->haspos)
-			nptr->nentry = (stat->weight) ? check_weight(txt, *ptr, stat->weight) : POSDATALEN(txt, *ptr);
-		else
-			nptr->nentry = 1;
-		nptr->ndoc = 1;
-		nptr->len = (*ptr)->len;
-		memcpy(curptr, STRPTR(txt) + (*ptr)->pos, nptr->len);
-		nptr->pos = curptr - STATSTRPTR(newstat);
-		memcpy(nptr + 1, StopLow, sizeof(StatEntry) * (((StatEntry *) STATSTRPTR(stat)) - StopLow));
-	}
-	else
-	{
-		while (sptr - STATPTR(stat) < stat->size && ptr - entry < len)
-		{
-			if (compareStatWord(sptr, *ptr, stat, txt) < 0)
-			{
-				memcpy(nptr, sptr, sizeof(StatEntry));
-				sptr++;
-			}
-			else
-			{
-				if ((*ptr)->haspos)
-					nptr->nentry = (stat->weight) ? check_weight(txt, *ptr, stat->weight) : POSDATALEN(txt, *ptr);
-				else
-					nptr->nentry = 1;
-				nptr->ndoc = 1;
-				nptr->len = (*ptr)->len;
-				memcpy(curptr, STRPTR(txt) + (*ptr)->pos, nptr->len);
-				nptr->pos = curptr - STATSTRPTR(newstat);
-				curptr += nptr->len;
-				ptr++;
-			}
-			nptr++;
-		}
-
-		memcpy(nptr, sptr, sizeof(StatEntry) * (stat->size - (sptr - STATPTR(stat))));
-
-		while (ptr - entry < len)
-		{
-			if ((*ptr)->haspos)
-				nptr->nentry = (stat->weight) ? check_weight(txt, *ptr, stat->weight) : POSDATALEN(txt, *ptr);
-			else
-				nptr->nentry = 1;
-			nptr->ndoc = 1;
-			nptr->len = (*ptr)->len;
-			memcpy(curptr, STRPTR(txt) + (*ptr)->pos, nptr->len);
-			nptr->pos = curptr - STATSTRPTR(newstat);
-			curptr += nptr->len;
-			ptr++;
-			nptr++;
-		}
-	}
-
-	return newstat;
-}
-
-PG_FUNCTION_INFO_V1(ts_accum);
-Datum		ts_accum(PG_FUNCTION_ARGS);
-Datum
-ts_accum(PG_FUNCTION_ARGS)
-{
-	tsstat	   *newstat,
-			   *stat = (tsstat *) PG_GETARG_POINTER(0);
-	tsvector   *txt = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	WordEntry **newentry = NULL;
-	uint32		len = 0,
-				cur = 0;
-	StatEntry  *sptr;
-	WordEntry  *wptr;
-	int			n = 0;
-
-	if (stat == NULL || PG_ARGISNULL(0))
-	{							/* Init in first */
-		stat = palloc(STATHDRSIZE);
-		SET_VARSIZE(stat, STATHDRSIZE);
-		stat->size = 0;
-		stat->weight = 0;
-	}
-
-	/* simple check of correctness */
-	if (txt == NULL || PG_ARGISNULL(1) || txt->size == 0)
-	{
-		PG_FREE_IF_COPY(txt, 1);
-		PG_RETURN_POINTER(stat);
-	}
-
-	sptr = STATPTR(stat);
-	wptr = ARRPTR(txt);
-
-	if (stat->size < 100 * txt->size)
-	{							/* merge */
-		while (sptr - STATPTR(stat) < stat->size && wptr - ARRPTR(txt) < txt->size)
-		{
-			int			cmp = compareStatWord(sptr, wptr, stat, txt);
-
-			if (cmp < 0)
-				sptr++;
-			else if (cmp == 0)
-			{
-				if (stat->weight == 0)
-				{
-					sptr->ndoc++;
-					sptr->nentry += (wptr->haspos) ? POSDATALEN(txt, wptr) : 1;
-				}
-				else if (wptr->haspos && (n = check_weight(txt, wptr, stat->weight)) != 0)
-				{
-					sptr->ndoc++;
-					sptr->nentry += n;
-				}
-				sptr++;
-				wptr++;
-			}
-			else
-			{
-				if (stat->weight == 0 || check_weight(txt, wptr, stat->weight) != 0)
-				{
-					if (cur == len)
-						newentry = SEI_realloc(newentry, &len);
-					newentry[cur] = wptr;
-					cur++;
-				}
-				wptr++;
-			}
-		}
-
-		while (wptr - ARRPTR(txt) < txt->size)
-		{
-			if (stat->weight == 0 || check_weight(txt, wptr, stat->weight) != 0)
-			{
-				if (cur == len)
-					newentry = SEI_realloc(newentry, &len);
-				newentry[cur] = wptr;
-				cur++;
-			}
-			wptr++;
-		}
-	}
-	else
-	{							/* search */
-		while (wptr - ARRPTR(txt) < txt->size)
-		{
-			StatEntry  *StopLow = STATPTR(stat);
-			StatEntry  *StopHigh = (StatEntry *) STATSTRPTR(stat);
-			int			cmp;
-
-			while (StopLow < StopHigh)
-			{
-				sptr = StopLow + (StopHigh - StopLow) / 2;
-				cmp = compareStatWord(sptr, wptr, stat, txt);
-				if (cmp == 0)
-				{
-					if (stat->weight == 0)
-					{
-						sptr->ndoc++;
-						sptr->nentry += (wptr->haspos) ? POSDATALEN(txt, wptr) : 1;
-					}
-					else if (wptr->haspos && (n = check_weight(txt, wptr, stat->weight)) != 0)
-					{
-						sptr->ndoc++;
-						sptr->nentry += n;
-					}
-					break;
-				}
-				else if (cmp < 0)
-					StopLow = sptr + 1;
-				else
-					StopHigh = sptr;
-			}
-
-			if (StopLow >= StopHigh)
-			{					/* not found */
-				if (stat->weight == 0 || check_weight(txt, wptr, stat->weight) != 0)
-				{
-					if (cur == len)
-						newentry = SEI_realloc(newentry, &len);
-					newentry[cur] = wptr;
-					cur++;
-				}
-			}
-			wptr++;
-		}
-	}
-
-
-	if (cur == 0)
-	{							/* no new words */
-		PG_FREE_IF_COPY(txt, 1);
-		PG_RETURN_POINTER(stat);
-	}
-
-	newstat = formstat(stat, txt, newentry, cur);
-	pfree(newentry);
-	PG_FREE_IF_COPY(txt, 1);
-	/* pfree(stat); */
-
-	PG_RETURN_POINTER(newstat);
-}
-
-typedef struct
-{
-	uint32		cur;
-	tsvector   *stat;
-}	StatStorage;
-
-static void
-ts_setup_firstcall(FunctionCallInfo fcinfo, FuncCallContext *funcctx,
-				   tsstat * stat)
-{
-	TupleDesc	tupdesc;
-	MemoryContext oldcontext;
-	StatStorage *st;
-
-	oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-	st = palloc(sizeof(StatStorage));
-	st->cur = 0;
-	st->stat = palloc(VARSIZE(stat));
-	memcpy(st->stat, stat, VARSIZE(stat));
-	funcctx->user_fctx = (void *) st;
-	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-		elog(ERROR, "return type must be a row type");
-	tupdesc = CreateTupleDescCopy(tupdesc);
-	funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
-	MemoryContextSwitchTo(oldcontext);
-}
-
-
-static Datum
-ts_process_call(FuncCallContext *funcctx)
-{
-	StatStorage *st;
-
-	st = (StatStorage *) funcctx->user_fctx;
-
-	if (st->cur < st->stat->size)
-	{
-		Datum		result;
-		char	   *values[3];
-		char		ndoc[16];
-		char		nentry[16];
-		StatEntry  *entry = STATPTR(st->stat) + st->cur;
-		HeapTuple	tuple;
-
-		values[1] = ndoc;
-		sprintf(ndoc, "%d", entry->ndoc);
-		values[2] = nentry;
-		sprintf(nentry, "%d", entry->nentry);
-		values[0] = palloc(entry->len + 1);
-		memcpy(values[0], STATSTRPTR(st->stat) + entry->pos, entry->len);
-		(values[0])[entry->len] = '\0';
-
-		tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
-		result = HeapTupleGetDatum(tuple);
-
-		pfree(values[0]);
-		st->cur++;
-		return result;
-	}
-	else
-	{
-		pfree(st->stat);
-		pfree(st);
-	}
-
-	return (Datum) 0;
-}
-
-PG_FUNCTION_INFO_V1(ts_accum_finish);
-Datum		ts_accum_finish(PG_FUNCTION_ARGS);
-Datum
-ts_accum_finish(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	if (SRF_IS_FIRSTCALL())
-	{
-		funcctx = SRF_FIRSTCALL_INIT();
-		ts_setup_firstcall(fcinfo, funcctx, (tsstat *) PG_GETARG_POINTER(0));
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-	if ((result = ts_process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
-
-static Oid	tiOid = InvalidOid;
-
-static void
-get_ti_Oid(void)
-{
-	int			ret;
-	bool		isnull;
-
-	if ((ret = SPI_exec("select oid from pg_type where typname='tsvector'", 1)) < 0)
-		/* internal error */
-		elog(ERROR, "SPI_exec to get tsvector oid returns %d", ret);
-
-	if (SPI_processed < 1)
-		/* internal error */
-		elog(ERROR, "there is no tsvector type");
-	tiOid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-	if (tiOid == InvalidOid)
-		/* internal error */
-		elog(ERROR, "tsvector type has InvalidOid");
-}
-
-static tsstat *
-ts_stat_sql(text *txt, text *ws)
-{
-	char	   *query = text2char(txt);
-	int			i;
-	tsstat	   *newstat,
-			   *stat;
-	bool		isnull;
-	Portal		portal;
-	void	   *plan;
-
-	if (tiOid == InvalidOid)
-		get_ti_Oid();
-
-	if ((plan = SPI_prepare(query, 0, NULL)) == NULL)
-		/* internal error */
-		elog(ERROR, "SPI_prepare('%s') returns NULL", query);
-
-	if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, false)) == NULL)
-		/* internal error */
-		elog(ERROR, "SPI_cursor_open('%s') returns NULL", query);
-
-	SPI_cursor_fetch(portal, true, 100);
-
-	if (SPI_tuptable->tupdesc->natts != 1)
-		/* internal error */
-		elog(ERROR, "number of fields doesn't equal to 1");
-
-	if (SPI_gettypeid(SPI_tuptable->tupdesc, 1) != tiOid)
-		/* internal error */
-		elog(ERROR, "column isn't of tsvector type");
-
-	stat = palloc(STATHDRSIZE);
-	SET_VARSIZE(stat, STATHDRSIZE);
-	stat->size = 0;
-	stat->weight = 0;
-
-	if (ws)
-	{
-		char	   *buf;
-
-		buf = VARDATA(ws);
-		while (buf - VARDATA(ws) < VARSIZE(ws) - VARHDRSZ)
-		{
-			if (pg_mblen(buf) == 1)
-			{
-				switch (*buf)
-				{
-					case 'A':
-					case 'a':
-						stat->weight |= 1 << 3;
-						break;
-					case 'B':
-					case 'b':
-						stat->weight |= 1 << 2;
-						break;
-					case 'C':
-					case 'c':
-						stat->weight |= 1 << 1;
-						break;
-					case 'D':
-					case 'd':
-						stat->weight |= 1;
-						break;
-					default:
-						stat->weight |= 0;
-				}
-			}
-			buf += pg_mblen(buf);
-		}
-	}
-
-	while (SPI_processed > 0)
-	{
-		for (i = 0; i < SPI_processed; i++)
-		{
-			Datum		data = SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 1, &isnull);
-
-			if (!isnull)
-			{
-				newstat = (tsstat *) DatumGetPointer(DirectFunctionCall2(
-																	ts_accum,
-													   PointerGetDatum(stat),
-																		 data
-																		 ));
-				if (stat != newstat && stat)
-					pfree(stat);
-				stat = newstat;
-			}
-		}
-
-		SPI_freetuptable(SPI_tuptable);
-		SPI_cursor_fetch(portal, true, 100);
-	}
-
-	SPI_freetuptable(SPI_tuptable);
-	SPI_cursor_close(portal);
-	SPI_freeplan(plan);
-	pfree(query);
-
-	return stat;
-}
-
-PG_FUNCTION_INFO_V1(ts_stat);
-Datum		ts_stat(PG_FUNCTION_ARGS);
-Datum
-ts_stat(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	if (SRF_IS_FIRSTCALL())
-	{
-		tsstat	   *stat;
-		text	   *txt = PG_GETARG_TEXT_P(0);
-		text	   *ws = (PG_NARGS() > 1) ? PG_GETARG_TEXT_P(1) : NULL;
-
-		funcctx = SRF_FIRSTCALL_INIT();
-		SPI_connect();
-		stat = ts_stat_sql(txt, ws);
-		PG_FREE_IF_COPY(txt, 0);
-		if (PG_NARGS() > 1)
-			PG_FREE_IF_COPY(ws, 1);
-		ts_setup_firstcall(fcinfo, funcctx, stat);
-		SPI_finish();
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-	if ((result = ts_process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
diff --git a/contrib/tsearch2/ts_stat.h b/contrib/tsearch2/ts_stat.h
deleted file mode 100644
index e1ba14b99bcb..000000000000
--- a/contrib/tsearch2/ts_stat.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __TXTIDX_STAT_H__
-#define __TXTIDX_STAT_H__
-
-#include "postgres.h"
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "utils/builtins.h"
-#include "storage/bufpage.h"
-#include "tsvector.h"
-
-typedef struct
-{
-	uint32		len;
-	uint32		pos;
-	uint32		ndoc;
-	uint32		nentry;
-}	StatEntry;
-
-typedef struct
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int4		size;
-	int4		weight;
-	char		data[1];
-}	tsstat;
-
-#define STATHDRSIZE (sizeof(int4) * 4)
-#define CALCSTATSIZE(x, lenstr) ( (x) * sizeof(StatEntry) + STATHDRSIZE + (lenstr) )
-#define STATPTR(x)	( (StatEntry*) ( (char*)(x) + STATHDRSIZE ) )
-#define STATSTRPTR(x)	( (char*)(x) + STATHDRSIZE + ( sizeof(StatEntry) * ((tsvector*)(x))->size ) )
-#define STATSTRSIZE(x)	( VARSIZE((tsvector*)(x)) - STATHDRSIZE - ( sizeof(StatEntry) * ((tsvector*)(x))->size ) )
-
-#endif
diff --git a/contrib/tsearch2/tsearch.sql.in b/contrib/tsearch2/tsearch.sql.in
deleted file mode 100644
index 08afa7629012..000000000000
--- a/contrib/tsearch2/tsearch.sql.in
+++ /dev/null
@@ -1,1243 +0,0 @@
--- Adjust this setting to control where the objects get CREATEd.
-SET search_path = public;
-
-BEGIN;
-
---dict conf
-CREATE TABLE pg_ts_dict (
-	dict_name	text not null primary key,
-	dict_init	regprocedure,
-	dict_initoption	text,
-	dict_lexize	regprocedure not null,
-	dict_comment	text
-) with oids;
-
---dict interface
-CREATE FUNCTION lexize(oid, text) 
-	RETURNS _text
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION lexize(text, text)
-        RETURNS _text
-        as 'MODULE_PATHNAME', 'lexize_byname'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION lexize(text)
-        RETURNS _text
-        as 'MODULE_PATHNAME', 'lexize_bycurrent'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION set_curdict(int)
-	RETURNS void
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION set_curdict(text)
-	RETURNS void
-	as 'MODULE_PATHNAME', 'set_curdict_byname'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
---built-in dictionaries
-CREATE FUNCTION dex_init(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME' 
-	LANGUAGE C;
-
-CREATE FUNCTION dex_lexize(internal,internal,int4)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-insert into pg_ts_dict select 
-	'simple', 
-	'dex_init(internal)',
-	null,
-	'dex_lexize(internal,internal,int4)',
-	'Simple example of dictionary.'
-;
-	 
-CREATE FUNCTION snb_en_init(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME' 
-	LANGUAGE C;
-
-CREATE FUNCTION snb_lexize(internal,internal,int4)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-insert into pg_ts_dict select 
-	'en_stem', 
-	'snb_en_init(internal)',
-	'contrib/english.stop',
-	'snb_lexize(internal,internal,int4)',
-	'English Stemmer. Snowball.'
-;
-
-CREATE FUNCTION snb_ru_init_koi8(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME' 
-	LANGUAGE C;
-
-insert into pg_ts_dict select 
-	'ru_stem_koi8', 
-	'snb_ru_init_koi8(internal)',
-	'contrib/russian.stop',
-	'snb_lexize(internal,internal,int4)',
-	'Russian Stemmer. Snowball. KOI8 Encoding'
-;
-	 
-CREATE FUNCTION snb_ru_init_utf8(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME' 
-	LANGUAGE C;
-
-insert into pg_ts_dict select 
-	'ru_stem_utf8', 
-	'snb_ru_init_utf8(internal)',
-	'contrib/russian.stop.utf8',
-	'snb_lexize(internal,internal,int4)',
-	'Russian Stemmer. Snowball. UTF8 Encoding'
-;
-	 
-CREATE FUNCTION spell_init(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME' 
-	LANGUAGE C;
-
-CREATE FUNCTION spell_lexize(internal,internal,int4)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-insert into pg_ts_dict select 
-	'ispell_template', 
-	'spell_init(internal)',
-	null,
-	'spell_lexize(internal,internal,int4)',
-	'ISpell interface. Must have .dict and .aff files'
-;
-
-CREATE FUNCTION syn_init(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME' 
-	LANGUAGE C;
-
-CREATE FUNCTION syn_lexize(internal,internal,int4)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-insert into pg_ts_dict select 
-	'synonym', 
-	'syn_init(internal)',
-	null,
-	'syn_lexize(internal,internal,int4)',
-	'Example of synonym dictionary'
-;
-
-CREATE FUNCTION thesaurus_init(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME' 
-	LANGUAGE C;
-
-CREATE FUNCTION thesaurus_lexize(internal,internal,int4,internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-insert into pg_ts_dict select 
-	'thesaurus_template', 
-	'thesaurus_init(internal)',
-	null,
-	'thesaurus_lexize(internal,internal,int4,internal)',
-	'Thesaurus template, must be pointed Dictionary and DictFile'
-;
-
---dict conf
-CREATE TABLE pg_ts_parser (
-	prs_name	text not null primary key,
-	prs_start	regprocedure not null,
-	prs_nexttoken	regprocedure not null,
-	prs_end		regprocedure not null,
-	prs_headline	regprocedure not null,
-	prs_lextype	regprocedure not null,
-	prs_comment	text
-) with oids;
-
---sql-level interface
-CREATE TYPE tokentype 
-	as (tokid int4, alias text, descr text); 
-
-CREATE FUNCTION token_type(int4)
-	RETURNS setof tokentype
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION token_type(text)
-	RETURNS setof tokentype
-	as 'MODULE_PATHNAME', 'token_type_byname'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION token_type()
-	RETURNS setof tokentype
-	as 'MODULE_PATHNAME', 'token_type_current'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION set_curprs(int)
-	RETURNS void
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION set_curprs(text)
-	RETURNS void
-	as 'MODULE_PATHNAME', 'set_curprs_byname'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE TYPE tokenout 
-	as (tokid int4, token text);
-
-CREATE FUNCTION parse(oid,text)
-	RETURNS setof tokenout
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
- 
-CREATE FUNCTION parse(text,text)
-	RETURNS setof tokenout
-	as 'MODULE_PATHNAME', 'parse_byname'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
- 
-CREATE FUNCTION parse(text)
-	RETURNS setof tokenout
-	as 'MODULE_PATHNAME', 'parse_current'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
- 
---default parser
-CREATE FUNCTION prsd_start(internal,int4)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C;
-
-CREATE FUNCTION prsd_getlexeme(internal,internal,internal)
-	RETURNS int4
-	as 'MODULE_PATHNAME'
-	LANGUAGE C;
-
-CREATE FUNCTION prsd_end(internal)
-	RETURNS void
-	as 'MODULE_PATHNAME'
-	LANGUAGE C;
-
-CREATE FUNCTION prsd_lextype(internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C;
-
-CREATE FUNCTION prsd_headline(internal,internal,internal)
-	RETURNS internal
-	as 'MODULE_PATHNAME'
-	LANGUAGE C;
-
-insert into pg_ts_parser select
-	'default',
-	'prsd_start(internal,int4)',
-	'prsd_getlexeme(internal,internal,internal)',
-	'prsd_end(internal)',
-	'prsd_headline(internal,internal,internal)',
-	'prsd_lextype(internal)',
-	'Parser from OpenFTS v0.34'
-;	
-
---tsearch config
-
-CREATE TABLE pg_ts_cfg (
-	ts_name		text not null primary key,
-	prs_name	text not null,
-	locale		text
-) with oids;
-
-CREATE TABLE pg_ts_cfgmap (
-	ts_name		text not null,
-	tok_alias	text not null,
-	dict_name	text[],
-	primary key (ts_name,tok_alias)
-) with oids;
-
-CREATE FUNCTION set_curcfg(int)
-	RETURNS void
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION set_curcfg(text)
-	RETURNS void
-	as 'MODULE_PATHNAME', 'set_curcfg_byname'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION show_curcfg()
-	RETURNS oid
-	as 'MODULE_PATHNAME'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-insert into pg_ts_cfg values ('default', 'default','C');
-insert into pg_ts_cfg values ('default_russian', 'default','ru_RU.KOI8-R');
-insert into pg_ts_cfg values ('utf8_russian', 'default','ru_RU.UTF-8');
-insert into pg_ts_cfg values ('simple', 'default');
-
-insert into pg_ts_cfgmap values ('default', 'lword', '{en_stem}');
-insert into pg_ts_cfgmap values ('default', 'nlword', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'word', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'email', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'url', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'host', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'sfloat', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'version', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'part_hword', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'nlpart_hword', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'lpart_hword', '{en_stem}');
-insert into pg_ts_cfgmap values ('default', 'hword', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'lhword', '{en_stem}');
-insert into pg_ts_cfgmap values ('default', 'nlhword', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'uri', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'file', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'float', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'int', '{simple}');
-insert into pg_ts_cfgmap values ('default', 'uint', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'lword', '{en_stem}');
-insert into pg_ts_cfgmap values ('default_russian', 'nlword', '{ru_stem_koi8}');
-insert into pg_ts_cfgmap values ('default_russian', 'word', '{ru_stem_koi8}');
-insert into pg_ts_cfgmap values ('default_russian', 'email', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'url', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'host', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'sfloat', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'version', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'part_hword', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'nlpart_hword', '{ru_stem_koi8}');
-insert into pg_ts_cfgmap values ('default_russian', 'lpart_hword', '{en_stem}');
-insert into pg_ts_cfgmap values ('default_russian', 'hword', '{ru_stem_koi8}');
-insert into pg_ts_cfgmap values ('default_russian', 'lhword', '{en_stem}');
-insert into pg_ts_cfgmap values ('default_russian', 'nlhword', '{ru_stem_koi8}');
-insert into pg_ts_cfgmap values ('default_russian', 'uri', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'file', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'float', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'int', '{simple}');
-insert into pg_ts_cfgmap values ('default_russian', 'uint', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'lword', '{en_stem}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'nlword', '{ru_stem_utf8}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'word', '{ru_stem_utf8}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'email', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'url', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'host', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'sfloat', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'version', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'part_hword', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'nlpart_hword', '{ru_stem_utf8}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'lpart_hword', '{en_stem}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'hword', '{ru_stem_utf8}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'lhword', '{en_stem}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'nlhword', '{ru_stem_utf8}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'uri', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'file', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'float', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'int', '{simple}');
-insert into pg_ts_cfgmap values ('utf8_russian', 'uint', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'lword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'nlword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'word', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'email', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'url', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'host', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'sfloat', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'version', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'part_hword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'nlpart_hword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'lpart_hword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'hword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'lhword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'nlhword', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'uri', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'file', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'float', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'int', '{simple}');
-insert into pg_ts_cfgmap values ('simple', 'uint', '{simple}');
-
---tsvector type
-CREATE FUNCTION tsvector_in(cstring)
-RETURNS tsvector
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION tsvector_out(tsvector)
-RETURNS cstring
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE TYPE tsvector (
-        INTERNALLENGTH = -1,
-        INPUT = tsvector_in,
-        OUTPUT = tsvector_out,
-        STORAGE = extended
-);
-
-CREATE FUNCTION length(tsvector)
-RETURNS int4
-AS 'MODULE_PATHNAME', 'tsvector_length'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION to_tsvector(oid, text)
-RETURNS tsvector
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION to_tsvector(text, text)
-RETURNS tsvector
-AS 'MODULE_PATHNAME', 'to_tsvector_name'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION to_tsvector(text)
-RETURNS tsvector
-AS 'MODULE_PATHNAME', 'to_tsvector_current'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION strip(tsvector)
-RETURNS tsvector
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION setweight(tsvector,"char")
-RETURNS tsvector
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION concat(tsvector,tsvector)
-RETURNS tsvector
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OPERATOR || (
-        LEFTARG = tsvector,
-        RIGHTARG = tsvector,
-        PROCEDURE = concat
-);
-
---query type
-CREATE FUNCTION tsquery_in(cstring)
-RETURNS tsquery
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION tsquery_out(tsquery)
-RETURNS cstring
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE TYPE tsquery (
-        INTERNALLENGTH = -1,
-        ALIGNMENT = int4,
-        INPUT = tsquery_in,
-        OUTPUT = tsquery_out
-);
-
-CREATE FUNCTION querytree(tsquery)
-RETURNS text
-AS 'MODULE_PATHNAME', 'tsquerytree'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION to_tsquery(oid, text)
-RETURNS tsquery
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION to_tsquery(text, text)
-RETURNS tsquery
-AS 'MODULE_PATHNAME','to_tsquery_name'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION to_tsquery(text)
-RETURNS tsquery
-AS 'MODULE_PATHNAME','to_tsquery_current'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION plainto_tsquery(oid, text)
-RETURNS tsquery
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION plainto_tsquery(text, text)
-RETURNS tsquery
-AS 'MODULE_PATHNAME','plainto_tsquery_name'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION plainto_tsquery(text)
-RETURNS tsquery
-AS 'MODULE_PATHNAME','plainto_tsquery_current'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
---operations
-CREATE FUNCTION exectsq(tsvector, tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-  
-COMMENT ON FUNCTION exectsq(tsvector, tsquery) IS 'boolean operation with text index';
-
-CREATE FUNCTION rexectsq(tsquery, tsvector)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-COMMENT ON FUNCTION rexectsq(tsquery, tsvector) IS 'boolean operation with text index';
-
-CREATE OPERATOR @@ (
-        LEFTARG = tsvector,
-        RIGHTARG = tsquery,
-        PROCEDURE = exectsq,
-        COMMUTATOR = '@@',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-CREATE OPERATOR @@ (
-        LEFTARG = tsquery,
-        RIGHTARG = tsvector,
-        PROCEDURE = rexectsq,
-        COMMUTATOR = '@@',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
---Trigger
-CREATE FUNCTION tsearch2()
-RETURNS trigger
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
---Relevation
-CREATE FUNCTION rank(float4[], tsvector, tsquery)
-RETURNS float4
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION rank(float4[], tsvector, tsquery, int4)
-RETURNS float4
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION rank(tsvector, tsquery)
-RETURNS float4
-AS 'MODULE_PATHNAME', 'rank_def'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION rank(tsvector, tsquery, int4)
-RETURNS float4
-AS 'MODULE_PATHNAME', 'rank_def'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION rank_cd(float4[], tsvector, tsquery)
-RETURNS float4
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION rank_cd(float4[], tsvector, tsquery, int4)
-RETURNS float4
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION rank_cd(tsvector, tsquery)
-RETURNS float4
-AS 'MODULE_PATHNAME', 'rank_cd_def'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION rank_cd(tsvector, tsquery, int4)
-RETURNS float4
-AS 'MODULE_PATHNAME', 'rank_cd_def'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION headline(oid, text, tsquery, text)
-RETURNS text
-AS 'MODULE_PATHNAME', 'headline'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION headline(oid, text, tsquery)
-RETURNS text
-AS 'MODULE_PATHNAME', 'headline'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION headline(text, text, tsquery, text)
-RETURNS text
-AS 'MODULE_PATHNAME', 'headline_byname'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION headline(text, text, tsquery)
-RETURNS text
-AS 'MODULE_PATHNAME', 'headline_byname'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION headline(text, tsquery, text)
-RETURNS text
-AS 'MODULE_PATHNAME', 'headline_current'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION headline(text, tsquery)
-RETURNS text
-AS 'MODULE_PATHNAME', 'headline_current'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
---GiST
---GiST key type 
-CREATE FUNCTION gtsvector_in(cstring)
-RETURNS gtsvector
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION gtsvector_out(gtsvector)
-RETURNS cstring
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE TYPE gtsvector (
-        INTERNALLENGTH = -1,
-        INPUT = gtsvector_in,
-        OUTPUT = gtsvector_out
-);
-
--- support FUNCTIONs
-CREATE FUNCTION gtsvector_consistent(gtsvector,internal,int4)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-  
-CREATE FUNCTION gtsvector_compress(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsvector_decompress(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsvector_penalty(internal,internal,internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION gtsvector_picksplit(internal, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsvector_union(internal, internal)
-RETURNS _int4
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsvector_same(gtsvector, gtsvector, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
--- CREATE the OPERATOR class
-CREATE OPERATOR CLASS gist_tsvector_ops
-DEFAULT FOR TYPE tsvector USING gist
-AS
-        OPERATOR        1       @@ (tsvector, tsquery)  RECHECK ,
-        FUNCTION        1       gtsvector_consistent (gtsvector, internal, int4),
-        FUNCTION        2       gtsvector_union (internal, internal),
-        FUNCTION        3       gtsvector_compress (internal),
-        FUNCTION        4       gtsvector_decompress (internal),
-        FUNCTION        5       gtsvector_penalty (internal, internal, internal),
-        FUNCTION        6       gtsvector_picksplit (internal, internal),
-        FUNCTION        7       gtsvector_same (gtsvector, gtsvector, internal),
-        STORAGE         gtsvector;
-
-
---stat info
-CREATE TYPE statinfo 
-	as (word text, ndoc int4, nentry int4);
-
---CREATE FUNCTION tsstat_in(cstring)
---RETURNS tsstat
---AS 'MODULE_PATHNAME'
---LANGUAGE C RETURNS NULL ON NULL INPUT;
---
---CREATE FUNCTION tsstat_out(tsstat)
---RETURNS cstring
---AS 'MODULE_PATHNAME'
---LANGUAGE C RETURNS NULL ON NULL INPUT;
---
---CREATE TYPE tsstat (
---        INTERNALLENGTH = -1,
---        INPUT = tsstat_in,
---        OUTPUT = tsstat_out,
---        STORAGE = plain
---);
---
---CREATE FUNCTION ts_accum(tsstat,tsvector)
---RETURNS tsstat
---AS 'MODULE_PATHNAME'
---LANGUAGE C RETURNS NULL ON NULL INPUT;
---
---CREATE FUNCTION ts_accum_finish(tsstat)
---	RETURNS setof statinfo
---	as 'MODULE_PATHNAME'
---	LANGUAGE C
---	RETURNS NULL ON NULL INPUT;
---
---CREATE AGGREGATE stat (
---	BASETYPE=tsvector,
---	SFUNC=ts_accum,
---	STYPE=tsstat,
---	FINALFUNC = ts_accum_finish,
---	initcond = ''
---); 
-
-CREATE FUNCTION stat(text)
-	RETURNS setof statinfo
-	as 'MODULE_PATHNAME', 'ts_stat'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION stat(text,text)
-	RETURNS setof statinfo
-	as 'MODULE_PATHNAME', 'ts_stat'
-	LANGUAGE C
-	RETURNS NULL ON NULL INPUT;
-
---reset - just for debuging
-CREATE FUNCTION reset_tsearch()
-        RETURNS void
-        as 'MODULE_PATHNAME'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT;
-
---get cover (debug for rank_cd)
-CREATE FUNCTION get_covers(tsvector,tsquery)
-        RETURNS text
-        as 'MODULE_PATHNAME'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT;
-
---debug function
-create type tsdebug as (
-        ts_name text,
-        tok_type text,
-        description text,
-        token   text,
-        dict_name text[],
-        "tsvector" tsvector
-);
-
-CREATE FUNCTION _get_parser_from_curcfg() 
-RETURNS text as 
-' select prs_name from pg_ts_cfg where oid = show_curcfg() '
-LANGUAGE SQL RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION ts_debug(text)
-RETURNS setof tsdebug as '
-select 
-        m.ts_name,
-        t.alias as tok_type,
-        t.descr as description,
-        p.token,
-        m.dict_name,
-        strip(to_tsvector(p.token)) as tsvector
-from
-        parse( _get_parser_from_curcfg(), $1 ) as p,
-        token_type() as t,
-        pg_ts_cfgmap as m,
-        pg_ts_cfg as c
-where
-        t.tokid=p.tokid and
-        t.alias = m.tok_alias and 
-        m.ts_name=c.ts_name and 
-        c.oid=show_curcfg() 
-' LANGUAGE SQL RETURNS NULL ON NULL INPUT;
-
---compare functions
-CREATE FUNCTION tsvector_cmp(tsvector,tsvector)
-RETURNS int4
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION tsvector_lt(tsvector,tsvector)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION tsvector_le(tsvector,tsvector)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-        
-CREATE FUNCTION tsvector_eq(tsvector,tsvector)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION tsvector_ge(tsvector,tsvector)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-        
-CREATE FUNCTION tsvector_gt(tsvector,tsvector)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE FUNCTION tsvector_ne(tsvector,tsvector)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OPERATOR < (
-        LEFTARG = tsvector,
-        RIGHTARG = tsvector,
-        PROCEDURE = tsvector_lt,
-        COMMUTATOR = '>',
-        NEGATOR = '>=',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR <= (
-        LEFTARG = tsvector,
-        RIGHTARG = tsvector,
-        PROCEDURE = tsvector_le,
-        COMMUTATOR = '>=',
-        NEGATOR = '>',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR >= (
-        LEFTARG = tsvector,
-        RIGHTARG = tsvector,
-        PROCEDURE = tsvector_ge,
-        COMMUTATOR = '<=',
-        NEGATOR = '<',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR > (
-        LEFTARG = tsvector,
-        RIGHTARG = tsvector,
-        PROCEDURE = tsvector_gt,
-        COMMUTATOR = '<',
-        NEGATOR = '<=',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR = (
-        LEFTARG = tsvector,
-        RIGHTARG = tsvector,
-        PROCEDURE = tsvector_eq,
-        COMMUTATOR = '=',
-        NEGATOR = '<>',
-        RESTRICT = eqsel,
-        JOIN = eqjoinsel,
-        SORT1 = '<',
-        SORT2 = '<'
-);
-
-CREATE OPERATOR <> (
-        LEFTARG = tsvector,
-        RIGHTARG = tsvector,
-        PROCEDURE = tsvector_ne,
-        COMMUTATOR = '<>',
-        NEGATOR = '=',
-        RESTRICT = neqsel,
-        JOIN = neqjoinsel
-);
-
-CREATE OPERATOR CLASS tsvector_ops
-    DEFAULT FOR TYPE tsvector USING btree AS
-        OPERATOR        1       < ,
-        OPERATOR        2       <= , 
-        OPERATOR        3       = ,
-        OPERATOR        4       >= ,
-        OPERATOR        5       > ,
-        FUNCTION        1       tsvector_cmp(tsvector, tsvector);
-
-----------------Compare functions and operators for tsquery
-CREATE OR REPLACE FUNCTION tsquery_cmp(tsquery,tsquery)
-RETURNS int4
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsquery_lt(tsquery,tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsquery_le(tsquery,tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsquery_eq(tsquery,tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsquery_ge(tsquery,tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsquery_gt(tsquery,tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsquery_ne(tsquery,tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-
-CREATE OPERATOR < (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_lt,
-        COMMUTATOR = '>',
-        NEGATOR = '>=',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR <= (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_le,
-        COMMUTATOR = '>=',
-        NEGATOR = '>',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR >= (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_ge,
-        COMMUTATOR = '<=',
-        NEGATOR = '<',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR > (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_gt,
-        COMMUTATOR = '<',
-        NEGATOR = '<=',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-
-CREATE OPERATOR = (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_eq,
-        COMMUTATOR = '=',
-        NEGATOR = '<>',
-        RESTRICT = eqsel,
-        JOIN = eqjoinsel,
-        SORT1 = '<',
-        SORT2 = '<'
-);
-
-CREATE OPERATOR <> (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_ne,
-        COMMUTATOR = '<>',
-        NEGATOR = '=',
-        RESTRICT = neqsel,
-        JOIN = neqjoinsel
-);
-
-CREATE OPERATOR CLASS tsquery_ops
-    DEFAULT FOR TYPE tsquery USING btree AS
-        OPERATOR        1       < ,
-        OPERATOR        2       <= ,
-        OPERATOR        3       = ,
-        OPERATOR        4       >= ,
-        OPERATOR        5       > ,
-        FUNCTION        1       tsquery_cmp(tsquery, tsquery);
-
-CREATE OR REPLACE FUNCTION numnode(tsquery)
-        RETURNS int4
-        as 'MODULE_PATHNAME', 'tsquery_numnode'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsquery_and(tsquery,tsquery)
-        RETURNS tsquery
-        as 'MODULE_PATHNAME', 'tsquery_and'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OPERATOR && (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_and,
-        COMMUTATOR = '&&',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OR REPLACE FUNCTION tsquery_or(tsquery,tsquery)
-        RETURNS tsquery
-        as 'MODULE_PATHNAME', 'tsquery_or'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OPERATOR || (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_or,
-        COMMUTATOR = '||',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OR REPLACE FUNCTION tsquery_not(tsquery)
-        RETURNS tsquery
-        as 'MODULE_PATHNAME', 'tsquery_not'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OPERATOR !! (
-        RIGHTARG = tsquery,
-        PROCEDURE = tsquery_not
-);
-
---------------rewrite subsystem
-
-CREATE OR REPLACE FUNCTION rewrite(tsquery, text)
-        RETURNS tsquery
-        as 'MODULE_PATHNAME', 'tsquery_rewrite'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION rewrite(tsquery, tsquery, tsquery)
-        RETURNS tsquery
-        as 'MODULE_PATHNAME', 'tsquery_rewrite_query'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION rewrite_accum(tsquery,tsquery[])
-        RETURNS tsquery
-        AS 'MODULE_PATHNAME'
-        LANGUAGE C;
-
-CREATE OR REPLACE FUNCTION rewrite_finish(tsquery)
-      RETURNS tsquery
-      as 'MODULE_PATHNAME'
-      LANGUAGE C;
-
-CREATE AGGREGATE rewrite (
-      BASETYPE=tsquery[],
-      SFUNC=rewrite_accum,
-      STYPE=tsquery,
-      FINALFUNC = rewrite_finish
-);
-
-CREATE OR REPLACE FUNCTION tsq_mcontains(tsquery, tsquery)
-        RETURNS bool
-        as 'MODULE_PATHNAME'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION tsq_mcontained(tsquery, tsquery)
-        RETURNS bool
-        as 'MODULE_PATHNAME'
-        LANGUAGE C
-        RETURNS NULL ON NULL INPUT IMMUTABLE;
-
-CREATE OPERATOR @> (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsq_mcontains,
-        COMMUTATOR = '<@',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR <@ (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsq_mcontained,
-        COMMUTATOR = '@>',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
--- obsolete:
-CREATE OPERATOR @ (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsq_mcontains,
-        COMMUTATOR = '~',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR ~ (
-        LEFTARG = tsquery,
-        RIGHTARG = tsquery,
-        PROCEDURE = tsq_mcontained,
-        COMMUTATOR = '@',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
------------gist support of rewrite------------------
-
-CREATE FUNCTION gtsq_in(cstring)
-RETURNS gtsq
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION gtsq_out(gtsq)
-RETURNS cstring
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE TYPE gtsq (
-        INTERNALLENGTH = 8,
-        INPUT = gtsq_in,
-        OUTPUT = gtsq_out
-);
-
-CREATE FUNCTION gtsq_consistent(gtsq,internal,int4)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsq_compress(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsq_decompress(internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsq_penalty(internal,internal,internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION gtsq_picksplit(internal, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsq_union(bytea, internal)
-RETURNS _int4
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE FUNCTION gtsq_same(gtsq, gtsq, internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C;
-
-CREATE OPERATOR CLASS gist_tp_tsquery_ops
-DEFAULT FOR TYPE tsquery USING gist
-AS
-        OPERATOR        7       @> (tsquery, tsquery) RECHECK,
-        OPERATOR        8       <@ (tsquery, tsquery) RECHECK,
-        OPERATOR        13      @ (tsquery, tsquery) RECHECK,
-        OPERATOR        14      ~ (tsquery, tsquery) RECHECK,
-        FUNCTION        1       gtsq_consistent (gtsq, internal, int4),
-        FUNCTION        2       gtsq_union (bytea, internal),
-        FUNCTION        3       gtsq_compress (internal),
-        FUNCTION        4       gtsq_decompress (internal),
-        FUNCTION        5       gtsq_penalty (internal, internal, internal),
-        FUNCTION        6       gtsq_picksplit (internal, internal),
-        FUNCTION        7       gtsq_same (gtsq, gtsq, internal),
-        STORAGE         gtsq;
-
---GIN support function
-CREATE FUNCTION gin_extract_tsvector(tsvector,internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION gin_extract_tsquery(tsquery,internal,internal)
-RETURNS internal
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE FUNCTION gin_ts_consistent(internal,internal,tsquery)
-RETURNS bool
-AS 'MODULE_PATHNAME'
-LANGUAGE C RETURNS NULL ON NULL INPUT;
-
-CREATE OPERATOR @@@ (
-        LEFTARG = tsvector,
-        RIGHTARG = tsquery,
-        PROCEDURE = exectsq,
-        COMMUTATOR = '@@@',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-CREATE OPERATOR @@@ (
-        LEFTARG = tsquery,
-        RIGHTARG = tsvector,
-        PROCEDURE = rexectsq,
-        COMMUTATOR = '@@@',
-        RESTRICT = contsel,
-        JOIN = contjoinsel
-);
-
-CREATE OPERATOR CLASS gin_tsvector_ops
-DEFAULT FOR TYPE tsvector USING gin
-AS
-        OPERATOR        1       @@ (tsvector, tsquery),
-        OPERATOR        2       @@@ (tsvector, tsquery) RECHECK,
-        FUNCTION        1       bttextcmp(text, text),
-        FUNCTION        2       gin_extract_tsvector(tsvector,internal),
-        FUNCTION        3       gin_extract_tsquery(tsquery,internal,internal),
-        FUNCTION        4       gin_ts_consistent(internal,internal,tsquery),
-        STORAGE         text;
-
-
---example of ISpell dictionary
---update pg_ts_dict set dict_initoption='DictFile="/usr/local/share/ispell/russian.dict" ,AffFile ="/usr/local/share/ispell/russian.aff", StopFile="/usr/local/share/ispell/russian.stop"' where dict_name='ispell_template';
-
---example of synonym dict
---update pg_ts_dict set dict_initoption='/usr/local/share/ispell/english.syn' where dict_name='synonym';
-
---example of thesaurus dict
---update pg_ts_dict set dict_initoption='DictFile="contrib/thesaurus", Dictionary="en_stem"' where dict_name='thesaurus_template';
---update pg_ts_cfgmap set dict_name = '{thesaurus_template,en_stem}' where dict_name = '{en_stem}';
-END;
diff --git a/contrib/tsearch2/tsearch2.c b/contrib/tsearch2/tsearch2.c
new file mode 100644
index 000000000000..c0ba00eafe7b
--- /dev/null
+++ b/contrib/tsearch2/tsearch2.c
@@ -0,0 +1,571 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsearch2.c
+ *		Backwards-compatibility package for old contrib/tsearch2 API
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.5.2.1 2009/01/28 18:32:55 teodor Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "catalog/namespace.h"
+#include "catalog/pg_type.h"
+#include "commands/trigger.h"
+#include "fmgr.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+#include "utils/guc.h"
+#include "utils/syscache.h"
+
+PG_MODULE_MAGIC;
+
+static Oid	current_dictionary_oid = InvalidOid;
+static Oid	current_parser_oid = InvalidOid;
+
+/* insert given value at argument position 0 */
+#define INSERT_ARGUMENT0(argument, isnull)				\
+	do {												\
+		int i;											\
+		for (i = fcinfo->nargs; i > 0; i--)				\
+		{												\
+			fcinfo->arg[i] = fcinfo->arg[i-1];			\
+			fcinfo->argnull[i] = fcinfo->argnull[i-1];	\
+		}												\
+		fcinfo->arg[0] = (argument);					\
+		fcinfo->argnull[0] = (isnull);					\
+		fcinfo->nargs++;								\
+	} while (0)
+
+#define TextPGetCString(t) \
+	DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(t)))
+#define CStringGetTextP(c) \
+	DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(c)))
+
+#define TextGetObjectId(infunction, text) \
+	DatumGetObjectId(DirectFunctionCall1(infunction, \
+					 DirectFunctionCall1(textout, PointerGetDatum(text))))
+
+#define UNSUPPORTED_FUNCTION(name)						\
+	Datum name(PG_FUNCTION_ARGS);						\
+	Datum												\
+	name(PG_FUNCTION_ARGS)								\
+	{													\
+		ereport(ERROR,									\
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),\
+				 errmsg("function %s is no longer supported", \
+						format_procedure(fcinfo->flinfo->fn_oid)), \
+				 errhint("Switch to new tsearch functionality."))); \
+		/* keep compiler quiet */						\
+		PG_RETURN_NULL();								\
+	}													\
+	PG_FUNCTION_INFO_V1(name)
+
+static Oid	GetCurrentDict(void);
+static Oid	GetCurrentParser(void);
+
+Datum		tsa_lexize_byname(PG_FUNCTION_ARGS);
+Datum		tsa_lexize_bycurrent(PG_FUNCTION_ARGS);
+Datum		tsa_set_curdict(PG_FUNCTION_ARGS);
+Datum		tsa_set_curdict_byname(PG_FUNCTION_ARGS);
+Datum		tsa_token_type_current(PG_FUNCTION_ARGS);
+Datum		tsa_set_curprs(PG_FUNCTION_ARGS);
+Datum		tsa_set_curprs_byname(PG_FUNCTION_ARGS);
+Datum		tsa_parse_current(PG_FUNCTION_ARGS);
+Datum		tsa_set_curcfg(PG_FUNCTION_ARGS);
+Datum		tsa_set_curcfg_byname(PG_FUNCTION_ARGS);
+Datum		tsa_to_tsvector_name(PG_FUNCTION_ARGS);
+Datum		tsa_to_tsquery_name(PG_FUNCTION_ARGS);
+Datum		tsa_plainto_tsquery_name(PG_FUNCTION_ARGS);
+Datum		tsa_headline_byname(PG_FUNCTION_ARGS);
+Datum		tsa_ts_stat(PG_FUNCTION_ARGS);
+Datum		tsa_tsearch2(PG_FUNCTION_ARGS);
+Datum		tsa_rewrite_accum(PG_FUNCTION_ARGS);
+Datum		tsa_rewrite_finish(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(tsa_lexize_byname);
+PG_FUNCTION_INFO_V1(tsa_lexize_bycurrent);
+PG_FUNCTION_INFO_V1(tsa_set_curdict);
+PG_FUNCTION_INFO_V1(tsa_set_curdict_byname);
+PG_FUNCTION_INFO_V1(tsa_token_type_current);
+PG_FUNCTION_INFO_V1(tsa_set_curprs);
+PG_FUNCTION_INFO_V1(tsa_set_curprs_byname);
+PG_FUNCTION_INFO_V1(tsa_parse_current);
+PG_FUNCTION_INFO_V1(tsa_set_curcfg);
+PG_FUNCTION_INFO_V1(tsa_set_curcfg_byname);
+PG_FUNCTION_INFO_V1(tsa_to_tsvector_name);
+PG_FUNCTION_INFO_V1(tsa_to_tsquery_name);
+PG_FUNCTION_INFO_V1(tsa_plainto_tsquery_name);
+PG_FUNCTION_INFO_V1(tsa_headline_byname);
+PG_FUNCTION_INFO_V1(tsa_ts_stat);
+PG_FUNCTION_INFO_V1(tsa_tsearch2);
+PG_FUNCTION_INFO_V1(tsa_rewrite_accum);
+PG_FUNCTION_INFO_V1(tsa_rewrite_finish);
+
+
+/*
+ * List of unsupported functions
+ *
+ * The parser and dictionary functions are defined only so that the former
+ * contents of pg_ts_parser and pg_ts_dict can be loaded into the system,
+ * for ease of reference while creating the new tsearch configuration.
+ */
+
+UNSUPPORTED_FUNCTION(tsa_dex_init);
+UNSUPPORTED_FUNCTION(tsa_dex_lexize);
+
+UNSUPPORTED_FUNCTION(tsa_snb_en_init);
+UNSUPPORTED_FUNCTION(tsa_snb_lexize);
+UNSUPPORTED_FUNCTION(tsa_snb_ru_init_koi8);
+UNSUPPORTED_FUNCTION(tsa_snb_ru_init_utf8);
+UNSUPPORTED_FUNCTION(tsa_snb_ru_init);
+
+UNSUPPORTED_FUNCTION(tsa_spell_init);
+UNSUPPORTED_FUNCTION(tsa_spell_lexize);
+
+UNSUPPORTED_FUNCTION(tsa_syn_init);
+UNSUPPORTED_FUNCTION(tsa_syn_lexize);
+
+UNSUPPORTED_FUNCTION(tsa_thesaurus_init);
+UNSUPPORTED_FUNCTION(tsa_thesaurus_lexize);
+
+UNSUPPORTED_FUNCTION(tsa_prsd_start);
+UNSUPPORTED_FUNCTION(tsa_prsd_getlexeme);
+UNSUPPORTED_FUNCTION(tsa_prsd_end);
+UNSUPPORTED_FUNCTION(tsa_prsd_lextype);
+UNSUPPORTED_FUNCTION(tsa_prsd_headline);
+
+UNSUPPORTED_FUNCTION(tsa_reset_tsearch);
+UNSUPPORTED_FUNCTION(tsa_get_covers);
+
+
+/*
+ * list of redefined functions
+ */
+
+/* lexize(text, text) */
+Datum
+tsa_lexize_byname(PG_FUNCTION_ARGS)
+{
+	text	   *dictname = PG_GETARG_TEXT_P(0);
+	Datum		arg1 = PG_GETARG_DATUM(1);
+
+	return DirectFunctionCall2(ts_lexize,
+				ObjectIdGetDatum(TextGetObjectId(regdictionaryin, dictname)),
+							   arg1);
+}
+
+/* lexize(text) */
+Datum
+tsa_lexize_bycurrent(PG_FUNCTION_ARGS)
+{
+	Datum		arg0 = PG_GETARG_DATUM(0);
+	Oid			id = GetCurrentDict();
+
+	return DirectFunctionCall2(ts_lexize,
+							   ObjectIdGetDatum(id),
+							   arg0);
+}
+
+/* set_curdict(int) */
+Datum
+tsa_set_curdict(PG_FUNCTION_ARGS)
+{
+	Oid			dict_oid = PG_GETARG_OID(0);
+
+	if (!SearchSysCacheExists(TSDICTOID,
+							  ObjectIdGetDatum(dict_oid),
+							  0, 0, 0))
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 dict_oid);
+
+	current_dictionary_oid = dict_oid;
+
+	PG_RETURN_VOID();
+}
+
+/* set_curdict(text) */
+Datum
+tsa_set_curdict_byname(PG_FUNCTION_ARGS)
+{
+	text	   *name = PG_GETARG_TEXT_P(0);
+	Oid			dict_oid;
+
+	dict_oid = TSDictionaryGetDictid(stringToQualifiedNameList(TextPGetCString(name)), false);
+
+	current_dictionary_oid = dict_oid;
+
+	PG_RETURN_VOID();
+}
+
+/* token_type() */
+Datum
+tsa_token_type_current(PG_FUNCTION_ARGS)
+{
+	INSERT_ARGUMENT0(ObjectIdGetDatum(GetCurrentParser()), false);
+	return ts_token_type_byid(fcinfo);
+}
+
+/* set_curprs(int) */
+Datum
+tsa_set_curprs(PG_FUNCTION_ARGS)
+{
+	Oid			parser_oid = PG_GETARG_OID(0);
+
+	if (!SearchSysCacheExists(TSPARSEROID,
+							  ObjectIdGetDatum(parser_oid),
+							  0, 0, 0))
+		elog(ERROR, "cache lookup failed for text search parser %u",
+			 parser_oid);
+
+	current_parser_oid = parser_oid;
+
+	PG_RETURN_VOID();
+}
+
+/* set_curprs(text) */
+Datum
+tsa_set_curprs_byname(PG_FUNCTION_ARGS)
+{
+	text	   *name = PG_GETARG_TEXT_P(0);
+	Oid			parser_oid;
+
+	parser_oid = TSParserGetPrsid(stringToQualifiedNameList(TextPGetCString(name)), false);
+
+	current_parser_oid = parser_oid;
+
+	PG_RETURN_VOID();
+}
+
+/* parse(text) */
+Datum
+tsa_parse_current(PG_FUNCTION_ARGS)
+{
+	INSERT_ARGUMENT0(ObjectIdGetDatum(GetCurrentParser()), false);
+	return ts_parse_byid(fcinfo);
+}
+
+/* set_curcfg(int) */
+Datum
+tsa_set_curcfg(PG_FUNCTION_ARGS)
+{
+	Oid			arg0 = PG_GETARG_OID(0);
+	char	   *name;
+
+	name = DatumGetCString(DirectFunctionCall1(regconfigout,
+											   ObjectIdGetDatum(arg0)));
+
+	set_config_option("default_text_search_config", name,
+					  PGC_USERSET,
+					  PGC_S_SESSION,
+					  GUC_ACTION_SET,
+					  true);
+
+	PG_RETURN_VOID();
+}
+
+/* set_curcfg(text) */
+Datum
+tsa_set_curcfg_byname(PG_FUNCTION_ARGS)
+{
+	text	   *arg0 = PG_GETARG_TEXT_P(0);
+	char	   *name;
+
+	name = TextPGetCString(arg0);
+
+	set_config_option("default_text_search_config", name,
+					  PGC_USERSET,
+					  PGC_S_SESSION,
+					  GUC_ACTION_SET,
+					  true);
+
+	PG_RETURN_VOID();
+}
+
+/* to_tsvector(text, text) */
+Datum
+tsa_to_tsvector_name(PG_FUNCTION_ARGS)
+{
+	text	   *cfgname = PG_GETARG_TEXT_P(0);
+	Datum		arg1 = PG_GETARG_DATUM(1);
+	Oid			config_oid;
+
+	config_oid = TextGetObjectId(regconfigin, cfgname);
+
+	return DirectFunctionCall2(to_tsvector_byid,
+							   ObjectIdGetDatum(config_oid), arg1);
+}
+
+/* to_tsquery(text, text) */
+Datum
+tsa_to_tsquery_name(PG_FUNCTION_ARGS)
+{
+	text	   *cfgname = PG_GETARG_TEXT_P(0);
+	Datum		arg1 = PG_GETARG_DATUM(1);
+	Oid			config_oid;
+
+	config_oid = TextGetObjectId(regconfigin, cfgname);
+
+	return DirectFunctionCall2(to_tsquery_byid,
+							   ObjectIdGetDatum(config_oid), arg1);
+}
+
+
+/* plainto_tsquery(text, text) */
+Datum
+tsa_plainto_tsquery_name(PG_FUNCTION_ARGS)
+{
+	text	   *cfgname = PG_GETARG_TEXT_P(0);
+	Datum		arg1 = PG_GETARG_DATUM(1);
+	Oid			config_oid;
+
+	config_oid = TextGetObjectId(regconfigin, cfgname);
+
+	return DirectFunctionCall2(plainto_tsquery_byid,
+							   ObjectIdGetDatum(config_oid), arg1);
+}
+
+/* headline(text, text, tsquery [,text]) */
+Datum
+tsa_headline_byname(PG_FUNCTION_ARGS)
+{
+	Datum		arg0 = PG_GETARG_DATUM(0);
+	Datum		arg1 = PG_GETARG_DATUM(1);
+	Datum		arg2 = PG_GETARG_DATUM(2);
+	Datum		result;
+	Oid			config_oid;
+
+	/* first parameter has to be converted to oid */
+	config_oid = DatumGetObjectId(DirectFunctionCall1(regconfigin,
+										DirectFunctionCall1(textout, arg0)));
+
+	if (PG_NARGS() == 3)
+		result = DirectFunctionCall3(ts_headline_byid,
+								   ObjectIdGetDatum(config_oid), arg1, arg2);
+	else
+	{
+		Datum		arg3 = PG_GETARG_DATUM(3);
+
+		result = DirectFunctionCall4(ts_headline_byid_opt,
+									 ObjectIdGetDatum(config_oid),
+									 arg1, arg2, arg3);
+	}
+
+	return result;
+}
+
+/*
+ * tsearch2 version of update trigger
+ *
+ * We pass this on to the core trigger after inserting the default text
+ * search configuration name as the second argument.  Note that this isn't
+ * a complete implementation of the original functionality; tsearch2 allowed
+ * transformation function names to be included in the list.  However, that
+ * is deliberately removed as being a security risk.
+ */
+Datum
+tsa_tsearch2(PG_FUNCTION_ARGS)
+{
+	TriggerData *trigdata;
+	Trigger    *trigger;
+	char	  **tgargs, 
+			  **tgargs_old;
+	int			i;
+	Datum		res;
+
+	/* Check call context */
+	if (!CALLED_AS_TRIGGER(fcinfo))		/* internal error */
+		elog(ERROR, "tsvector_update_trigger: not fired by trigger manager");
+
+	trigdata = (TriggerData *) fcinfo->context;
+	trigger = trigdata->tg_trigger;
+
+	if (trigger->tgnargs < 2)
+		elog(ERROR, "TSearch: format tsearch2(tsvector_field, text_field1,...)");
+
+	/* create space for configuration name */
+	tgargs = (char **) palloc((trigger->tgnargs + 1) * sizeof(char *));
+	tgargs[0] = trigger->tgargs[0];
+	for (i = 1; i < trigger->tgnargs; i++)
+		tgargs[i + 1] = trigger->tgargs[i];
+
+	tgargs[1] = pstrdup(GetConfigOptionByName("default_text_search_config",
+											  NULL));
+	tgargs_old = trigger->tgargs;
+	trigger->tgargs = tgargs;
+	trigger->tgnargs++;
+
+	res = tsvector_update_trigger_byid(fcinfo);
+
+	/* restore old trigger data */
+	trigger->tgargs = tgargs_old;
+	trigger->tgnargs--;
+
+	pfree(tgargs[1]);
+	pfree(tgargs);
+
+	return res;
+}
+
+
+Datum
+tsa_rewrite_accum(PG_FUNCTION_ARGS)
+{
+	TSQuery		acc;
+	ArrayType  *qa;
+	TSQuery		q;
+	QTNode	   *qex = NULL,
+			   *subs = NULL,
+			   *acctree = NULL;
+	bool		isfind = false;
+	Datum	   *elemsp;
+	int			nelemsp;
+	MemoryContext aggcontext;
+	MemoryContext oldcontext;
+
+	aggcontext = ((AggState *) fcinfo->context)->aggcontext;
+
+	if (PG_ARGISNULL(0) || PG_GETARG_POINTER(0) == NULL)
+	{
+		acc = (TSQuery) MemoryContextAlloc(aggcontext, HDRSIZETQ);
+		SET_VARSIZE(acc, HDRSIZETQ);
+		acc->size = 0;
+	}
+	else
+		acc = PG_GETARG_TSQUERY(0);
+
+	if (PG_ARGISNULL(1) || PG_GETARG_POINTER(1) == NULL)
+		PG_RETURN_TSQUERY(acc);
+	else
+		qa = PG_GETARG_ARRAYTYPE_P_COPY(1);
+
+	if (ARR_NDIM(qa) != 1)
+		elog(ERROR, "array must be one-dimensional, not %d dimensions",
+			 ARR_NDIM(qa));
+	if (ArrayGetNItems(ARR_NDIM(qa), ARR_DIMS(qa)) != 3)
+		elog(ERROR, "array must have three elements");
+	if (ARR_ELEMTYPE(qa) != TSQUERYOID)
+		elog(ERROR, "array must contain tsquery elements");
+
+	deconstruct_array(qa, TSQUERYOID, -1, false, 'i', &elemsp, NULL, &nelemsp);
+
+	q = DatumGetTSQuery(elemsp[0]);
+	if (q->size == 0)
+	{
+		pfree(elemsp);
+		PG_RETURN_POINTER(acc);
+	}
+
+	if (!acc->size)
+	{
+		if (VARSIZE(acc) > HDRSIZETQ)
+		{
+			pfree(elemsp);
+			PG_RETURN_POINTER(acc);
+		}
+		else
+			acctree = QT2QTN(GETQUERY(q), GETOPERAND(q));
+	}
+	else
+		acctree = QT2QTN(GETQUERY(acc), GETOPERAND(acc));
+
+	QTNTernary(acctree);
+	QTNSort(acctree);
+
+	q = DatumGetTSQuery(elemsp[1]);
+	if (q->size == 0)
+	{
+		pfree(elemsp);
+		PG_RETURN_POINTER(acc);
+	}
+	qex = QT2QTN(GETQUERY(q), GETOPERAND(q));
+	QTNTernary(qex);
+	QTNSort(qex);
+
+	q = DatumGetTSQuery(elemsp[2]);
+	if (q->size)
+		subs = QT2QTN(GETQUERY(q), GETOPERAND(q));
+
+	acctree = findsubquery(acctree, qex, subs, &isfind);
+
+	if (isfind || !acc->size)
+	{
+		/* pfree( acc ); do not pfree(p), because nodeAgg.c will */
+		if (acctree)
+		{
+			QTNBinary(acctree);
+			oldcontext = MemoryContextSwitchTo(aggcontext);
+			acc = QTN2QT(acctree);
+			MemoryContextSwitchTo(oldcontext);
+		}
+		else
+		{
+			acc = (TSQuery) MemoryContextAlloc(aggcontext, HDRSIZETQ);
+			SET_VARSIZE(acc, HDRSIZETQ);
+			acc->size = 0;
+		}
+	}
+
+	pfree(elemsp);
+	QTNFree(qex);
+	QTNFree(subs);
+	QTNFree(acctree);
+
+	PG_RETURN_TSQUERY(acc);
+}
+
+Datum
+tsa_rewrite_finish(PG_FUNCTION_ARGS)
+{
+	TSQuery		acc = PG_GETARG_TSQUERY(0);
+	TSQuery		rewrited;
+
+	if (acc == NULL || PG_ARGISNULL(0) || acc->size == 0)
+	{
+		rewrited = (TSQuery) palloc(HDRSIZETQ);
+		SET_VARSIZE(rewrited, HDRSIZETQ);
+		rewrited->size = 0;
+	}
+	else
+	{
+		rewrited = (TSQuery) palloc(VARSIZE(acc));
+		memcpy(rewrited, acc, VARSIZE(acc));
+		pfree(acc);
+	}
+
+	PG_RETURN_POINTER(rewrited);
+}
+
+
+/*
+ * Get Oid of current dictionary
+ */
+static Oid
+GetCurrentDict(void)
+{
+	if (current_dictionary_oid == InvalidOid)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("no current dictionary"),
+				 errhint("Execute SELECT set_curdict(...).")));
+
+	return current_dictionary_oid;
+}
+
+/*
+ * Get Oid of current parser
+ *
+ * Here, it seems reasonable to select the "default" parser if none has been
+ * set.
+ */
+static Oid
+GetCurrentParser(void)
+{
+	if (current_parser_oid == InvalidOid)
+		current_parser_oid = TSParserGetPrsid(stringToQualifiedNameList("pg_catalog.default"), false);
+	return current_parser_oid;
+}
diff --git a/contrib/tsearch2/tsearch2.sql.in b/contrib/tsearch2/tsearch2.sql.in
new file mode 100644
index 000000000000..13f22d6adfdf
--- /dev/null
+++ b/contrib/tsearch2/tsearch2.sql.in
@@ -0,0 +1,575 @@
+/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.4 2007/11/28 19:33:04 tgl Exp $ */
+
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+-- These domains are just to catch schema-qualified references to the
+-- old data types.
+CREATE DOMAIN tsvector AS pg_catalog.tsvector;
+CREATE DOMAIN tsquery AS pg_catalog.tsquery;
+CREATE DOMAIN gtsvector AS pg_catalog.gtsvector;
+CREATE DOMAIN gtsq AS pg_catalog.text;
+
+--dict interface
+CREATE FUNCTION lexize(oid, text) 
+	RETURNS _text
+	as 'ts_lexize'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION lexize(text, text)
+        RETURNS _text
+        as 'MODULE_PATHNAME', 'tsa_lexize_byname'
+        LANGUAGE C
+        RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION lexize(text)
+        RETURNS _text
+        as 'MODULE_PATHNAME', 'tsa_lexize_bycurrent'
+        LANGUAGE C
+        RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION set_curdict(int)
+	RETURNS void
+	as 'MODULE_PATHNAME', 'tsa_set_curdict'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION set_curdict(text)
+	RETURNS void
+	as 'MODULE_PATHNAME', 'tsa_set_curdict_byname'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+--built-in dictionaries
+CREATE FUNCTION dex_init(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_dex_init' 
+	LANGUAGE C;
+
+CREATE FUNCTION dex_lexize(internal,internal,int4)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_dex_lexize'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION snb_en_init(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_snb_en_init'
+	LANGUAGE C;
+
+CREATE FUNCTION snb_lexize(internal,internal,int4)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_snb_lexize'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION snb_ru_init_koi8(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_snb_ru_init_koi8' 
+	LANGUAGE C;
+
+CREATE FUNCTION snb_ru_init_utf8(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_snb_ru_init_utf8'
+	LANGUAGE C;
+
+CREATE FUNCTION snb_ru_init(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_snb_ru_init'
+	LANGUAGE C;
+
+CREATE FUNCTION spell_init(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_spell_init' 
+	LANGUAGE C;
+
+CREATE FUNCTION spell_lexize(internal,internal,int4)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_spell_lexize'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION syn_init(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_syn_init' 
+	LANGUAGE C;
+
+CREATE FUNCTION syn_lexize(internal,internal,int4)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_syn_lexize'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION thesaurus_init(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_thesaurus_init'
+	LANGUAGE C;
+
+CREATE FUNCTION thesaurus_lexize(internal,internal,int4,internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_thesaurus_lexize'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+--sql-level interface
+CREATE TYPE tokentype 
+	as (tokid int4, alias text, descr text); 
+
+CREATE FUNCTION token_type(int4)
+	RETURNS setof tokentype
+	as 'ts_token_type_byid'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT
+        ROWS 16;
+
+CREATE FUNCTION token_type(text)
+	RETURNS setof tokentype
+	as 'ts_token_type_byname'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT
+        ROWS 16;
+
+CREATE FUNCTION token_type()
+	RETURNS setof tokentype
+	as 'MODULE_PATHNAME', 'tsa_token_type_current'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT
+        ROWS 16;
+
+CREATE FUNCTION set_curprs(int)
+	RETURNS void
+	as 'MODULE_PATHNAME', 'tsa_set_curprs'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION set_curprs(text)
+	RETURNS void
+	as 'MODULE_PATHNAME', 'tsa_set_curprs_byname'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE TYPE tokenout 
+	as (tokid int4, token text);
+
+CREATE FUNCTION parse(oid,text)
+	RETURNS setof tokenout
+	as 'ts_parse_byid'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT;
+ 
+CREATE FUNCTION parse(text,text)
+	RETURNS setof tokenout
+	as 'ts_parse_byname'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT;
+ 
+CREATE FUNCTION parse(text)
+	RETURNS setof tokenout
+	as 'MODULE_PATHNAME', 'tsa_parse_current'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+ 
+--default parser
+CREATE FUNCTION prsd_start(internal,int4)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_prsd_start'
+	LANGUAGE C;
+
+CREATE FUNCTION prsd_getlexeme(internal,internal,internal)
+	RETURNS int4
+	as 'MODULE_PATHNAME', 'tsa_prsd_getlexeme'
+	LANGUAGE C;
+
+CREATE FUNCTION prsd_end(internal)
+	RETURNS void
+	as 'MODULE_PATHNAME', 'tsa_prsd_end'
+	LANGUAGE C;
+
+CREATE FUNCTION prsd_lextype(internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_prsd_lextype'
+	LANGUAGE C;
+
+CREATE FUNCTION prsd_headline(internal,internal,internal)
+	RETURNS internal
+	as 'MODULE_PATHNAME', 'tsa_prsd_headline'
+	LANGUAGE C;
+
+--tsearch config
+CREATE FUNCTION set_curcfg(int)
+	RETURNS void
+	as 'MODULE_PATHNAME', 'tsa_set_curcfg'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION set_curcfg(text)
+	RETURNS void
+	as 'MODULE_PATHNAME', 'tsa_set_curcfg_byname'
+	LANGUAGE C
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION show_curcfg()
+	RETURNS oid
+	AS 'get_current_ts_config'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT STABLE;
+
+CREATE FUNCTION length(tsvector)
+	RETURNS int4
+	AS 'tsvector_length'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION to_tsvector(oid, text)
+	RETURNS tsvector
+	AS 'to_tsvector_byid'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION to_tsvector(text, text)
+	RETURNS tsvector
+	AS 'MODULE_PATHNAME', 'tsa_to_tsvector_name'
+	LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION to_tsvector(text)
+	RETURNS tsvector
+	AS 'to_tsvector'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION strip(tsvector)
+	RETURNS tsvector
+	AS 'tsvector_strip'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION setweight(tsvector,"char")
+	RETURNS tsvector
+	AS 'tsvector_setweight'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION concat(tsvector,tsvector)
+	RETURNS tsvector
+	AS 'tsvector_concat'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION querytree(tsquery)
+	RETURNS text
+	AS 'tsquerytree'
+	LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION to_tsquery(oid, text)
+	RETURNS tsquery
+	AS 'to_tsquery_byid'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION to_tsquery(text, text)
+	RETURNS tsquery
+	AS 'MODULE_PATHNAME','tsa_to_tsquery_name'
+	LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION to_tsquery(text)
+	RETURNS tsquery
+	AS 'to_tsquery'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION plainto_tsquery(oid, text)
+	RETURNS tsquery
+	AS 'plainto_tsquery_byid'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION plainto_tsquery(text, text)
+	RETURNS tsquery
+	AS 'MODULE_PATHNAME','tsa_plainto_tsquery_name'
+	LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION plainto_tsquery(text)
+	RETURNS tsquery
+	AS 'plainto_tsquery'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+--Trigger
+CREATE FUNCTION tsearch2()
+	RETURNS trigger
+	AS 'MODULE_PATHNAME', 'tsa_tsearch2'
+	LANGUAGE C;
+
+--Relevation
+CREATE FUNCTION rank(float4[], tsvector, tsquery)
+	RETURNS float4
+	AS 'ts_rank_wtt'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION rank(float4[], tsvector, tsquery, int4)
+	RETURNS float4
+	AS 'ts_rank_wttf'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION rank(tsvector, tsquery)
+	RETURNS float4
+	AS 'ts_rank_tt'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION rank(tsvector, tsquery, int4)
+	RETURNS float4
+	AS 'ts_rank_ttf'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION rank_cd(float4[], tsvector, tsquery)
+        RETURNS float4
+	AS 'ts_rankcd_wtt'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION rank_cd(float4[], tsvector, tsquery, int4)
+	RETURNS float4
+	AS 'ts_rankcd_wttf'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION rank_cd(tsvector, tsquery)
+	RETURNS float4
+	AS 'ts_rankcd_tt'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION rank_cd(tsvector, tsquery, int4)
+	RETURNS float4
+	AS 'ts_rankcd_ttf'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION headline(oid, text, tsquery, text)
+	RETURNS text
+	AS 'ts_headline_byid_opt'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION headline(oid, text, tsquery)
+	RETURNS text
+	AS 'ts_headline_byid'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION headline(text, text, tsquery, text)
+	RETURNS text
+	AS 'MODULE_PATHNAME', 'tsa_headline_byname'
+	LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION headline(text, text, tsquery)
+	RETURNS text
+	AS 'MODULE_PATHNAME', 'tsa_headline_byname'
+	LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION headline(text, tsquery, text)
+	RETURNS text
+	AS 'ts_headline_opt'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION headline(text, tsquery)
+	RETURNS text
+	AS 'ts_headline'
+	LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+-- CREATE the OPERATOR class
+CREATE OPERATOR CLASS gist_tsvector_ops
+FOR TYPE tsvector USING gist
+AS
+        OPERATOR        1       @@ (tsvector, tsquery)  RECHECK ,
+        FUNCTION        1       gtsvector_consistent (gtsvector, internal, int4),
+        FUNCTION        2       gtsvector_union (internal, internal),
+        FUNCTION        3       gtsvector_compress (internal),
+        FUNCTION        4       gtsvector_decompress (internal),
+        FUNCTION        5       gtsvector_penalty (internal, internal, internal),
+        FUNCTION        6       gtsvector_picksplit (internal, internal),
+        FUNCTION        7       gtsvector_same (gtsvector, gtsvector, internal),
+        STORAGE         gtsvector;
+
+--stat info
+CREATE TYPE statinfo 
+	as (word text, ndoc int4, nentry int4);
+
+CREATE FUNCTION stat(text)
+	RETURNS setof statinfo
+	as 'ts_stat1'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT;
+
+CREATE FUNCTION stat(text,text)
+	RETURNS setof statinfo
+	as 'ts_stat2'
+	LANGUAGE INTERNAL
+	RETURNS NULL ON NULL INPUT;
+
+--reset - just for debuging
+CREATE FUNCTION reset_tsearch()
+        RETURNS void
+        as 'MODULE_PATHNAME', 'tsa_reset_tsearch'
+        LANGUAGE C
+        RETURNS NULL ON NULL INPUT;
+
+--get cover (debug for rank_cd)
+CREATE FUNCTION get_covers(tsvector,tsquery)
+        RETURNS text
+        as 'MODULE_PATHNAME', 'tsa_get_covers'
+        LANGUAGE C
+        RETURNS NULL ON NULL INPUT;
+
+--debug function
+create type tsdebug as (
+        ts_name text,
+        tok_type text,
+        description text,
+        token   text,
+        dict_name text[],
+        "tsvector" tsvector
+);
+
+CREATE or replace FUNCTION _get_parser_from_curcfg()
+RETURNS text as
+$$select prsname::text from pg_catalog.pg_ts_parser p join pg_ts_config c on cfgparser = p.oid where c.oid = show_curcfg();$$
+LANGUAGE SQL RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE FUNCTION ts_debug(text)
+RETURNS setof tsdebug as $$
+select
+        (select c.cfgname::text from pg_catalog.pg_ts_config as c
+         where c.oid = show_curcfg()),
+        t.alias as tok_type,
+        t.descr as description,
+        p.token,
+        ARRAY ( SELECT m.mapdict::pg_catalog.regdictionary::pg_catalog.text
+                FROM pg_catalog.pg_ts_config_map AS m
+                WHERE m.mapcfg = show_curcfg() AND m.maptokentype = p.tokid
+                ORDER BY m.mapseqno )
+        AS dict_name,
+        strip(to_tsvector(p.token)) as tsvector
+from
+        parse( _get_parser_from_curcfg(), $1 ) as p,
+        token_type() as t
+where
+        t.tokid = p.tokid
+$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT;
+
+CREATE OR REPLACE FUNCTION numnode(tsquery)
+        RETURNS int4
+        as 'tsquery_numnode'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION tsquery_and(tsquery,tsquery)
+        RETURNS tsquery
+        as 'tsquery_and'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION tsquery_or(tsquery,tsquery)
+        RETURNS tsquery
+        as 'tsquery_or'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION tsquery_not(tsquery)
+        RETURNS tsquery
+        as 'tsquery_not'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+--------------rewrite subsystem
+
+CREATE OR REPLACE FUNCTION rewrite(tsquery, text)
+        RETURNS tsquery
+        as 'tsquery_rewrite_query'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION rewrite(tsquery, tsquery, tsquery)
+        RETURNS tsquery
+        as 'tsquery_rewrite'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION rewrite_accum(tsquery,tsquery[])
+        RETURNS tsquery
+        AS 'MODULE_PATHNAME', 'tsa_rewrite_accum'
+        LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION rewrite_finish(tsquery)
+      RETURNS tsquery
+      as 'MODULE_PATHNAME', 'tsa_rewrite_finish'
+      LANGUAGE C;
+
+CREATE AGGREGATE rewrite (
+      BASETYPE = tsquery[],
+      SFUNC = rewrite_accum,
+      STYPE = tsquery,
+      FINALFUNC = rewrite_finish
+);
+
+CREATE OR REPLACE FUNCTION tsq_mcontains(tsquery, tsquery)
+        RETURNS bool
+        as 'tsq_mcontains'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION tsq_mcontained(tsquery, tsquery)
+        RETURNS bool
+        as 'tsq_mcontained'
+        LANGUAGE INTERNAL
+        RETURNS NULL ON NULL INPUT IMMUTABLE;
+
+CREATE OPERATOR CLASS gist_tp_tsquery_ops
+FOR TYPE tsquery USING gist
+AS
+        OPERATOR        7       @> (tsquery, tsquery) RECHECK,
+        OPERATOR        8       <@ (tsquery, tsquery) RECHECK,
+        FUNCTION        1       gtsquery_consistent (bigint, internal, int4),
+        FUNCTION        2       gtsquery_union (internal, internal),
+        FUNCTION        3       gtsquery_compress (internal),
+        FUNCTION        4       gtsquery_decompress (internal),
+        FUNCTION        5       gtsquery_penalty (internal, internal, internal),
+        FUNCTION        6       gtsquery_picksplit (internal, internal),
+        FUNCTION        7       gtsquery_same (bigint, bigint, internal),
+        STORAGE         bigint;
+
+CREATE OPERATOR CLASS gin_tsvector_ops
+FOR TYPE tsvector USING gin
+AS
+        OPERATOR        1       @@ (tsvector, tsquery),
+        OPERATOR        2       @@@ (tsvector, tsquery) RECHECK,
+        FUNCTION        1       bttextcmp(text, text),
+        FUNCTION        2       gin_extract_tsvector(tsvector,internal),
+        FUNCTION        3       gin_extract_tsquery(tsquery,internal,smallint),
+        FUNCTION        4       gin_tsquery_consistent(internal,smallint,tsquery),
+        STORAGE         text;
+
+CREATE OPERATOR CLASS tsvector_ops
+FOR TYPE tsvector USING btree AS
+        OPERATOR        1       < ,
+        OPERATOR        2       <= , 
+        OPERATOR        3       = ,
+        OPERATOR        4       >= ,
+        OPERATOR        5       > ,
+        FUNCTION        1       tsvector_cmp(tsvector, tsvector);
+
+CREATE OPERATOR CLASS tsquery_ops
+FOR TYPE tsquery USING btree AS
+        OPERATOR        1       < ,
+        OPERATOR        2       <= ,
+        OPERATOR        3       = ,
+        OPERATOR        4       >= ,
+        OPERATOR        5       > ,
+        FUNCTION        1       tsquery_cmp(tsquery, tsquery);
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
deleted file mode 100644
index d3251a8401ff..000000000000
--- a/contrib/tsearch2/tsvector.c
+++ /dev/null
@@ -1,1125 +0,0 @@
-/*
- * In/Out definitions for tsvector type
- * Internal structure:
- * string of values, array of position lexeme in string and it's length
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "catalog/namespace.h"
-#include "commands/trigger.h"
-#include "executor/spi.h"
-#include "nodes/pg_list.h"
-#include "storage/bufpage.h"
-#include "utils/builtins.h"
-#include "utils/pg_locale.h"
-#include "mb/pg_wchar.h"
-
-#include <ctype.h>
-#include "tsvector.h"
-#include "query.h"
-#include "ts_cfg.h"
-#include "common.h"
-
-PG_FUNCTION_INFO_V1(tsvector_in);
-Datum		tsvector_in(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(tsvector_out);
-Datum		tsvector_out(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(to_tsvector);
-Datum		to_tsvector(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(to_tsvector_current);
-Datum		to_tsvector_current(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(to_tsvector_name);
-Datum		to_tsvector_name(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(tsearch2);
-Datum		tsearch2(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(tsvector_length);
-Datum		tsvector_length(PG_FUNCTION_ARGS);
-
-/*
- * in/out text index type
- */
-static int
-comparePos(const void *a, const void *b)
-{
-	if (WEP_GETPOS(*(WordEntryPos *) a) == WEP_GETPOS(*(WordEntryPos *) b))
-		return 0;
-	return (WEP_GETPOS(*(WordEntryPos *) a) > WEP_GETPOS(*(WordEntryPos *) b)) ? 1 : -1;
-}
-
-static int
-uniquePos(WordEntryPos * a, int4 l)
-{
-	WordEntryPos *ptr,
-			   *res;
-
-	res = a;
-	if (l == 1)
-		return l;
-
-	qsort((void *) a, l, sizeof(WordEntryPos), comparePos);
-
-	ptr = a + 1;
-	while (ptr - a < l)
-	{
-		if (WEP_GETPOS(*ptr) != WEP_GETPOS(*res))
-		{
-			res++;
-			*res = *ptr;
-			if (res - a >= MAXNUMPOS - 1 || WEP_GETPOS(*res) == MAXENTRYPOS - 1)
-				break;
-		}
-		else if (WEP_GETWEIGHT(*ptr) > WEP_GETWEIGHT(*res))
-			WEP_SETWEIGHT(*res, WEP_GETWEIGHT(*ptr));
-		ptr++;
-	}
-	return res + 1 - a;
-}
-
-static int
-compareentry(const void *a, const void *b, void *arg)
-{
-	char *BufferStr = (char *) arg;
-
-	if (((WordEntryIN *) a)->entry.len == ((WordEntryIN *) b)->entry.len)
-	{
-		return strncmp(&BufferStr[((WordEntryIN *) a)->entry.pos],
-					   &BufferStr[((WordEntryIN *) b)->entry.pos],
-					   ((WordEntryIN *) a)->entry.len);
-	}
-	return (((WordEntryIN *) a)->entry.len > ((WordEntryIN *) b)->entry.len) ? 1 : -1;
-}
-
-static int
-uniqueentry(WordEntryIN * a, int4 l, char *buf, int4 *outbuflen)
-{
-	WordEntryIN *ptr,
-			   *res;
-
-	res = a;
-	if (l == 1)
-	{
-		if (a->entry.haspos)
-		{
-			*(uint16 *) (a->pos) = uniquePos(&(a->pos[1]), *(uint16 *) (a->pos));
-			*outbuflen = SHORTALIGN(res->entry.len) + (*(uint16 *) (a->pos) + 1) * sizeof(WordEntryPos);
-		}
-		return l;
-	}
-
-	ptr = a + 1;
-	qsort_arg((void *) a, l, sizeof(WordEntryIN), compareentry, (void *) buf);
-
-	while (ptr - a < l)
-	{
-		if (!(ptr->entry.len == res->entry.len &&
-			  strncmp(&buf[ptr->entry.pos], &buf[res->entry.pos], res->entry.len) == 0))
-		{
-			if (res->entry.haspos)
-			{
-				*(uint16 *) (res->pos) = uniquePos(&(res->pos[1]), *(uint16 *) (res->pos));
-				*outbuflen += *(uint16 *) (res->pos) * sizeof(WordEntryPos);
-			}
-			*outbuflen += SHORTALIGN(res->entry.len);
-			res++;
-			memcpy(res, ptr, sizeof(WordEntryIN));
-		}
-		else if (ptr->entry.haspos)
-		{
-			if (res->entry.haspos)
-			{
-				int4		len = *(uint16 *) (ptr->pos) + 1 + *(uint16 *) (res->pos);
-
-				res->pos = (WordEntryPos *) repalloc(res->pos, len * sizeof(WordEntryPos));
-				memcpy(&(res->pos[*(uint16 *) (res->pos) + 1]),
-					   &(ptr->pos[1]), *(uint16 *) (ptr->pos) * sizeof(WordEntryPos));
-				*(uint16 *) (res->pos) += *(uint16 *) (ptr->pos);
-				pfree(ptr->pos);
-			}
-			else
-			{
-				res->entry.haspos = 1;
-				res->pos = ptr->pos;
-			}
-		}
-		ptr++;
-	}
-	if (res->entry.haspos)
-	{
-		*(uint16 *) (res->pos) = uniquePos(&(res->pos[1]), *(uint16 *) (res->pos));
-		*outbuflen += *(uint16 *) (res->pos) * sizeof(WordEntryPos);
-	}
-	*outbuflen += SHORTALIGN(res->entry.len);
-
-	return res + 1 - a;
-}
-
-#define WAITWORD		1
-#define WAITENDWORD		2
-#define WAITNEXTCHAR	3
-#define WAITENDCMPLX	4
-#define WAITPOSINFO		5
-#define INPOSINFO		6
-#define WAITPOSDELIM	7
-#define WAITCHARCMPLX	8
-
-#define RESIZEPRSBUF \
-do { \
-	if ( state->curpos - state->word + pg_database_encoding_max_length() >= state->len ) \
-	{ \
-		int4 clen = state->curpos - state->word; \
-		state->len *= 2; \
-		state->word = (char*)repalloc( (void*)state->word, state->len ); \
-		state->curpos = state->word + clen; \
-	} \
-} while (0)
-
-
-int4
-gettoken_tsvector(TI_IN_STATE * state)
-{
-	int4		oldstate = 0;
-
-	state->curpos = state->word;
-	state->state = WAITWORD;
-	state->alen = 0;
-
-	while (1)
-	{
-		if (state->state == WAITWORD)
-		{
-			if (*(state->prsbuf) == '\0')
-				return 0;
-			else if (t_iseq(state->prsbuf, '\''))
-				state->state = WAITENDCMPLX;
-			else if (t_iseq(state->prsbuf, '\\'))
-			{
-				state->state = WAITNEXTCHAR;
-				oldstate = WAITENDWORD;
-			}
-			else if (state->oprisdelim && ISOPERATOR(state->prsbuf))
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error")));
-			else if (!t_isspace(state->prsbuf))
-			{
-				COPYCHAR(state->curpos, state->prsbuf);
-				state->curpos += pg_mblen(state->prsbuf);
-				state->state = WAITENDWORD;
-			}
-		}
-		else if (state->state == WAITNEXTCHAR)
-		{
-			if (*(state->prsbuf) == '\0')
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("there is no escaped character")));
-			else
-			{
-				RESIZEPRSBUF;
-				COPYCHAR(state->curpos, state->prsbuf);
-				state->curpos += pg_mblen(state->prsbuf);
-				state->state = oldstate;
-			}
-		}
-		else if (state->state == WAITENDWORD)
-		{
-			if (t_iseq(state->prsbuf, '\\'))
-			{
-				state->state = WAITNEXTCHAR;
-				oldstate = WAITENDWORD;
-			}
-			else if (t_isspace(state->prsbuf) || *(state->prsbuf) == '\0' ||
-					 (state->oprisdelim && ISOPERATOR(state->prsbuf)))
-			{
-				RESIZEPRSBUF;
-				if (state->curpos == state->word)
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("syntax error")));
-				*(state->curpos) = '\0';
-				return 1;
-			}
-			else if (t_iseq(state->prsbuf, ':'))
-			{
-				if (state->curpos == state->word)
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("syntax error")));
-				*(state->curpos) = '\0';
-				if (state->oprisdelim)
-					return 1;
-				else
-					state->state = INPOSINFO;
-			}
-			else
-			{
-				RESIZEPRSBUF;
-				COPYCHAR(state->curpos, state->prsbuf);
-				state->curpos += pg_mblen(state->prsbuf);
-			}
-		}
-		else if (state->state == WAITENDCMPLX)
-		{
-			if (t_iseq(state->prsbuf, '\''))
-			{
-				state->state = WAITCHARCMPLX;
-			}
-			else if (t_iseq(state->prsbuf, '\\'))
-			{
-				state->state = WAITNEXTCHAR;
-				oldstate = WAITENDCMPLX;
-			}
-			else if (*(state->prsbuf) == '\0')
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error")));
-			else
-			{
-				RESIZEPRSBUF;
-				COPYCHAR(state->curpos, state->prsbuf);
-				state->curpos += pg_mblen(state->prsbuf);
-			}
-		}
-		else if (state->state == WAITCHARCMPLX)
-		{
-			if (t_iseq(state->prsbuf, '\''))
-			{
-				RESIZEPRSBUF;
-				COPYCHAR(state->curpos, state->prsbuf);
-				state->curpos += pg_mblen(state->prsbuf);
-				state->state = WAITENDCMPLX;
-			}
-			else
-			{
-				RESIZEPRSBUF;
-				*(state->curpos) = '\0';
-				if (state->curpos == state->word)
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("syntax error")));
-				if (state->oprisdelim)
-				{
-					/* state->prsbuf+=pg_mblen(state->prsbuf); */
-					return 1;
-				}
-				else
-					state->state = WAITPOSINFO;
-				continue;		/* recheck current character */
-			}
-		}
-		else if (state->state == WAITPOSINFO)
-		{
-			if (t_iseq(state->prsbuf, ':'))
-				state->state = INPOSINFO;
-			else
-				return 1;
-		}
-		else if (state->state == INPOSINFO)
-		{
-			if (t_isdigit(state->prsbuf))
-			{
-				if (state->alen == 0)
-				{
-					state->alen = 4;
-					state->pos = (WordEntryPos *) palloc(sizeof(WordEntryPos) * state->alen);
-					*(uint16 *) (state->pos) = 0;
-				}
-				else if (*(uint16 *) (state->pos) + 1 >= state->alen)
-				{
-					state->alen *= 2;
-					state->pos = (WordEntryPos *) repalloc(state->pos, sizeof(WordEntryPos) * state->alen);
-				}
-				(*(uint16 *) (state->pos))++;
-				WEP_SETPOS(state->pos[*(uint16 *) (state->pos)], LIMITPOS(atoi(state->prsbuf)));
-				if (WEP_GETPOS(state->pos[*(uint16 *) (state->pos)]) == 0)
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("wrong position info")));
-				WEP_SETWEIGHT(state->pos[*(uint16 *) (state->pos)], 0);
-				state->state = WAITPOSDELIM;
-			}
-			else
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error")));
-		}
-		else if (state->state == WAITPOSDELIM)
-		{
-			if (t_iseq(state->prsbuf, ','))
-				state->state = INPOSINFO;
-			else if (t_iseq(state->prsbuf, 'a') || t_iseq(state->prsbuf, 'A') || t_iseq(state->prsbuf, '*'))
-			{
-				if (WEP_GETWEIGHT(state->pos[*(uint16 *) (state->pos)]))
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("syntax error")));
-				WEP_SETWEIGHT(state->pos[*(uint16 *) (state->pos)], 3);
-			}
-			else if (t_iseq(state->prsbuf, 'b') || t_iseq(state->prsbuf, 'B'))
-			{
-				if (WEP_GETWEIGHT(state->pos[*(uint16 *) (state->pos)]))
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("syntax error")));
-				WEP_SETWEIGHT(state->pos[*(uint16 *) (state->pos)], 2);
-			}
-			else if (t_iseq(state->prsbuf, 'c') || t_iseq(state->prsbuf, 'C'))
-			{
-				if (WEP_GETWEIGHT(state->pos[*(uint16 *) (state->pos)]))
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("syntax error")));
-				WEP_SETWEIGHT(state->pos[*(uint16 *) (state->pos)], 1);
-			}
-			else if (t_iseq(state->prsbuf, 'd') || t_iseq(state->prsbuf, 'D'))
-			{
-				if (WEP_GETWEIGHT(state->pos[*(uint16 *) (state->pos)]))
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("syntax error")));
-				WEP_SETWEIGHT(state->pos[*(uint16 *) (state->pos)], 0);
-			}
-			else if (t_isspace(state->prsbuf) ||
-					 *(state->prsbuf) == '\0')
-				return 1;
-			else if (!t_isdigit(state->prsbuf))
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("syntax error")));
-		}
-		else
-			/* internal error */
-			elog(ERROR, "internal error");
-
-		/* get next char */
-		state->prsbuf += pg_mblen(state->prsbuf);
-	}
-
-	return 0;
-}
-
-Datum
-tsvector_in(PG_FUNCTION_ARGS)
-{
-	char	   *buf = PG_GETARG_CSTRING(0);
-	TI_IN_STATE state;
-	WordEntryIN *arr;
-	WordEntry  *inarr;
-	int4		len = 0,
-				totallen = 64;
-	tsvector   *in;
-	char	   *tmpbuf,
-			   *cur;
-	int4		i,
-				buflen = 256;
-
-	SET_FUNCOID();
-
-	pg_verifymbstr(buf, strlen(buf), false);
-	state.prsbuf = buf;
-	state.len = 32;
-	state.word = (char *) palloc(state.len);
-	state.oprisdelim = false;
-
-	arr = (WordEntryIN *) palloc(sizeof(WordEntryIN) * totallen);
-	cur = tmpbuf = (char *) palloc(buflen);
-	while (gettoken_tsvector(&state))
-	{
-		if (len >= totallen)
-		{
-			totallen *= 2;
-			arr = (WordEntryIN *) repalloc((void *) arr, sizeof(WordEntryIN) * totallen);
-		}
-		while ((cur - tmpbuf) + (state.curpos - state.word) >= buflen)
-		{
-			int4		dist = cur - tmpbuf;
-
-			buflen *= 2;
-			tmpbuf = (char *) repalloc((void *) tmpbuf, buflen);
-			cur = tmpbuf + dist;
-		}
-		if (state.curpos - state.word >= MAXSTRLEN)
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("word is too long")));
-		arr[len].entry.len = state.curpos - state.word;
-		if (cur - tmpbuf > MAXSTRPOS)
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("too long value")));
-		arr[len].entry.pos = cur - tmpbuf;
-		memcpy((void *) cur, (void *) state.word, arr[len].entry.len);
-		cur += arr[len].entry.len;
-		if (state.alen)
-		{
-			arr[len].entry.haspos = 1;
-			arr[len].pos = state.pos;
-		}
-		else
-			arr[len].entry.haspos = 0;
-		len++;
-	}
-	pfree(state.word);
-
-	if (len > 0)
-		len = uniqueentry(arr, len, tmpbuf, &buflen);
-	else
-		buflen = 0;
-	totallen = CALCDATASIZE(len, buflen);
-	in = (tsvector *) palloc0(totallen);
-	SET_VARSIZE(in, totallen);
-	in->size = len;
-	cur = STRPTR(in);
-	inarr = ARRPTR(in);
-	for (i = 0; i < len; i++)
-	{
-		memcpy((void *) cur, (void *) &tmpbuf[arr[i].entry.pos], arr[i].entry.len);
-		arr[i].entry.pos = cur - STRPTR(in);
-		cur += SHORTALIGN(arr[i].entry.len);
-		if (arr[i].entry.haspos)
-		{
-			memcpy(cur, arr[i].pos, (*(uint16 *) arr[i].pos + 1) * sizeof(WordEntryPos));
-			cur += (*(uint16 *) arr[i].pos + 1) * sizeof(WordEntryPos);
-			pfree(arr[i].pos);
-		}
-		memcpy(&(inarr[i]), &(arr[i].entry), sizeof(WordEntry));
-	}
-	pfree(tmpbuf);
-	pfree(arr);
-	PG_RETURN_POINTER(in);
-}
-
-Datum
-tsvector_length(PG_FUNCTION_ARGS)
-{
-	tsvector   *in = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	int4		ret = in->size;
-
-	PG_FREE_IF_COPY(in, 0);
-	PG_RETURN_INT32(ret);
-}
-
-Datum
-tsvector_out(PG_FUNCTION_ARGS)
-{
-	tsvector   *out = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	char	   *outbuf;
-	int4		i,
-				lenbuf = 0,
-				pp;
-	WordEntry  *ptr = ARRPTR(out);
-	char	   *curbegin,
-			   *curin,
-			   *curout;
-
-	lenbuf = out->size * 2 /* '' */ + out->size - 1 /* space */ + 2 /* \0 */ ;
-	for (i = 0; i < out->size; i++)
-	{
-		lenbuf += ptr[i].len * 2 * pg_database_encoding_max_length() /* for escape */ ;
-		if (ptr[i].haspos)
-			lenbuf += 7 * POSDATALEN(out, &(ptr[i]));
-	}
-
-	curout = outbuf = (char *) palloc(lenbuf);
-	for (i = 0; i < out->size; i++)
-	{
-		curbegin = curin = STRPTR(out) + ptr->pos;
-		if (i != 0)
-			*curout++ = ' ';
-		*curout++ = '\'';
-		while (curin - curbegin < ptr->len)
-		{
-			int			len = pg_mblen(curin);
-
-			if (t_iseq(curin, '\''))
-			{
-				int4		pos = curout - outbuf;
-
-				outbuf = (char *) repalloc((void *) outbuf, ++lenbuf);
-				curout = outbuf + pos;
-				*curout++ = '\'';
-			}
-			else if (t_iseq(curin, '\\'))
-			{
-				int4		pos = curout - outbuf;
-
-				outbuf = (char *) repalloc((void *) outbuf, ++lenbuf);
-				curout = outbuf + pos;
-				*curout++ = '\\';
-			}
-			while (len--)
-				*curout++ = *curin++;
-		}
-		*curout++ = '\'';
-		if ((pp = POSDATALEN(out, ptr)) != 0)
-		{
-			WordEntryPos *wptr;
-
-			*curout++ = ':';
-			wptr = POSDATAPTR(out, ptr);
-			while (pp)
-			{
-				sprintf(curout, "%d", WEP_GETPOS(*wptr));
-				curout = strchr(curout, '\0');
-				switch (WEP_GETWEIGHT(*wptr))
-				{
-					case 3:
-						*curout++ = 'A';
-						break;
-					case 2:
-						*curout++ = 'B';
-						break;
-					case 1:
-						*curout++ = 'C';
-						break;
-					case 0:
-					default:
-						break;
-				}
-				if (pp > 1)
-					*curout++ = ',';
-				pp--;
-				wptr++;
-			}
-		}
-		ptr++;
-	}
-	*curout = '\0';
-	outbuf[lenbuf - 1] = '\0';
-	PG_FREE_IF_COPY(out, 0);
-	PG_RETURN_POINTER(outbuf);
-}
-
-static int
-compareWORD(const void *a, const void *b)
-{
-	if (((TSWORD *) a)->len == ((TSWORD *) b)->len)
-	{
-		int			res = strncmp(
-								  ((TSWORD *) a)->word,
-								  ((TSWORD *) b)->word,
-								  ((TSWORD *) b)->len);
-
-		if (res == 0)
-		{
-			if ( ((TSWORD *) a)->pos.pos == ((TSWORD *) b)->pos.pos )
-				return 0;
-
-			return (((TSWORD *) a)->pos.pos > ((TSWORD *) b)->pos.pos) ? 1 : -1;
-		}
-		return res;
-	}
-	return (((TSWORD *) a)->len > ((TSWORD *) b)->len) ? 1 : -1;
-}
-
-static int
-uniqueWORD(TSWORD * a, int4 l)
-{
-	TSWORD	   *ptr,
-			   *res;
-	int			tmppos;
-
-	if (l == 1)
-	{
-		tmppos = LIMITPOS(a->pos.pos);
-		a->alen = 2;
-		a->pos.apos = (uint16 *) palloc(sizeof(uint16) * a->alen);
-		a->pos.apos[0] = 1;
-		a->pos.apos[1] = tmppos;
-		return l;
-	}
-
-	res = a;
-	ptr = a + 1;
-
-	qsort((void *) a, l, sizeof(TSWORD), compareWORD);
-	tmppos = LIMITPOS(a->pos.pos);
-	a->alen = 2;
-	a->pos.apos = (uint16 *) palloc(sizeof(uint16) * a->alen);
-	a->pos.apos[0] = 1;
-	a->pos.apos[1] = tmppos;
-
-	while (ptr - a < l)
-	{
-		if (!(ptr->len == res->len &&
-			  strncmp(ptr->word, res->word, res->len) == 0))
-		{
-			res++;
-			res->len = ptr->len;
-			res->word = ptr->word;
-			tmppos = LIMITPOS(ptr->pos.pos);
-			res->alen = 2;
-			res->pos.apos = (uint16 *) palloc(sizeof(uint16) * res->alen);
-			res->pos.apos[0] = 1;
-			res->pos.apos[1] = tmppos;
-		}
-		else
-		{
-			pfree(ptr->word);
-			if (res->pos.apos[0] < MAXNUMPOS - 1 && res->pos.apos[res->pos.apos[0]] != MAXENTRYPOS - 1 &&
-				res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos) )
-			{
-				if (res->pos.apos[0] + 1 >= res->alen)
-				{
-					res->alen *= 2;
-					res->pos.apos = (uint16 *) repalloc(res->pos.apos, sizeof(uint16) * res->alen);
-				}
-				if (res->pos.apos[0] == 0 || res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos))
-				{
-					res->pos.apos[res->pos.apos[0] + 1] = LIMITPOS(ptr->pos.pos);
-					res->pos.apos[0]++;
-				}
-			}
-		}
-		ptr++;
-	}
-
-	return res + 1 - a;
-}
-
-/*
- * make value of tsvector
- */
-static tsvector *
-makevalue(PRSTEXT * prs)
-{
-	int4		i,
-				j,
-				lenstr = 0,
-				totallen;
-	tsvector   *in;
-	WordEntry  *ptr;
-	char	   *str,
-			   *cur;
-
-	prs->curwords = uniqueWORD(prs->words, prs->curwords);
-	for (i = 0; i < prs->curwords; i++)
-	{
-		lenstr += SHORTALIGN(prs->words[i].len);
-
-		if (prs->words[i].alen)
-			lenstr += sizeof(uint16) + prs->words[i].pos.apos[0] * sizeof(WordEntryPos);
-	}
-
-	totallen = CALCDATASIZE(prs->curwords, lenstr);
-	in = (tsvector *) palloc0(totallen);
-	SET_VARSIZE(in, totallen);
-	in->size = prs->curwords;
-
-	ptr = ARRPTR(in);
-	cur = str = STRPTR(in);
-	for (i = 0; i < prs->curwords; i++)
-	{
-		ptr->len = prs->words[i].len;
-		if (cur - str > MAXSTRPOS)
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("value is too big")));
-		ptr->pos = cur - str;
-		memcpy((void *) cur, (void *) prs->words[i].word, prs->words[i].len);
-		pfree(prs->words[i].word);
-		cur += SHORTALIGN(prs->words[i].len);
-		if (prs->words[i].alen)
-		{
-			WordEntryPos *wptr;
-
-			ptr->haspos = 1;
-			*(uint16 *) cur = prs->words[i].pos.apos[0];
-			wptr = POSDATAPTR(in, ptr);
-			for (j = 0; j < *(uint16 *) cur; j++)
-			{
-				WEP_SETWEIGHT(wptr[j], 0);
-				WEP_SETPOS(wptr[j], prs->words[i].pos.apos[j + 1]);
-			}
-			cur += sizeof(uint16) + prs->words[i].pos.apos[0] * sizeof(WordEntryPos);
-			pfree(prs->words[i].pos.apos);
-		}
-		else
-			ptr->haspos = 0;
-		ptr++;
-	}
-	pfree(prs->words);
-	return in;
-}
-
-
-Datum
-to_tsvector(PG_FUNCTION_ARGS)
-{
-	text	   *in = PG_GETARG_TEXT_P(1);
-	PRSTEXT		prs;
-	tsvector   *out;
-	TSCfgInfo  *cfg;
-
-	SET_FUNCOID();
-	cfg = findcfg(PG_GETARG_INT32(0));
-
-	prs.lenwords = 32;
-	prs.curwords = 0;
-	prs.pos = 0;
-	prs.words = (TSWORD *) palloc(sizeof(TSWORD) * prs.lenwords);
-
-	parsetext_v2(cfg, &prs, VARDATA(in), VARSIZE(in) - VARHDRSZ);
-	PG_FREE_IF_COPY(in, 1);
-
-	if (prs.curwords)
-		out = makevalue(&prs);
-	else
-	{
-		pfree(prs.words);
-		out = palloc(CALCDATASIZE(0, 0));
-		SET_VARSIZE(out, CALCDATASIZE(0, 0));
-		out->size = 0;
-	}
-	PG_RETURN_POINTER(out);
-}
-
-Datum
-to_tsvector_name(PG_FUNCTION_ARGS)
-{
-	text	   *cfg = PG_GETARG_TEXT_P(0);
-	Datum		res;
-
-	SET_FUNCOID();
-	res = DirectFunctionCall3(
-							  to_tsvector,
-							  Int32GetDatum(name2id_cfg(cfg)),
-							  PG_GETARG_DATUM(1),
-							  (Datum) 0
-		);
-
-	PG_FREE_IF_COPY(cfg, 0);
-	PG_RETURN_DATUM(res);
-}
-
-Datum
-to_tsvector_current(PG_FUNCTION_ARGS)
-{
-	Datum		res;
-
-	SET_FUNCOID();
-	res = DirectFunctionCall3(
-							  to_tsvector,
-							  Int32GetDatum(get_currcfg()),
-							  PG_GETARG_DATUM(0),
-							  (Datum) 0
-		);
-
-	PG_RETURN_DATUM(res);
-}
-
-static Oid
-findFunc(char *fname)
-{
-	FuncCandidateList clist,
-				ptr;
-	Oid			funcid = InvalidOid;
-	List	   *names = list_make1(makeString(fname));
-
-	ptr = clist = FuncnameGetCandidates(
-									  names,
-									  1,
-									  false /* whether expand variadic */,
-									  false /* whether expand default */);
-
-	list_free(names);
-
-	if (!ptr)
-		return funcid;
-
-	while (ptr)
-	{
-		if (ptr->args[0] == TEXTOID && funcid == InvalidOid)
-			funcid = ptr->oid;
-		clist = ptr->next;
-		pfree(ptr);
-		ptr = clist;
-	}
-
-	return funcid;
-}
-
-/*
- * Trigger
- */
-Datum
-tsearch2(PG_FUNCTION_ARGS)
-{
-	TriggerData *trigdata;
-	Trigger    *trigger;
-	Relation	rel;
-	HeapTuple	rettuple = NULL;
-	int			numidxattr,
-				i;
-	PRSTEXT		prs;
-	Datum		datum = (Datum) 0;
-	Oid			funcoid = InvalidOid;
-	TSCfgInfo  *cfg;
-
-	SET_FUNCOID();
-	cfg = findcfg(get_currcfg());
-
-	if (!CALLED_AS_TRIGGER(fcinfo))
-		/* internal error */
-		elog(ERROR, "TSearch: Not fired by trigger manager");
-
-	trigdata = (TriggerData *) fcinfo->context;
-	if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-		/* internal error */
-		elog(ERROR, "TSearch: Cannot process STATEMENT events");
-	if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
-		/* internal error */
-		elog(ERROR, "TSearch: Must be fired BEFORE event");
-
-	if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
-		rettuple = trigdata->tg_trigtuple;
-	else if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
-		rettuple = trigdata->tg_newtuple;
-	else
-		/* internal error */
-		elog(ERROR, "TSearch: Unknown event");
-
-	trigger = trigdata->tg_trigger;
-	rel = trigdata->tg_relation;
-
-	if (trigger->tgnargs < 2)
-		/* internal error */
-		elog(ERROR, "TSearch: format tsearch2(tsvector_field, text_field1,...)");
-
-	numidxattr = SPI_fnumber(rel->rd_att, trigger->tgargs[0]);
-	if (numidxattr == SPI_ERROR_NOATTRIBUTE)
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("tsvector column \"%s\" does not exist",
-						trigger->tgargs[0])));
-
-	prs.lenwords = 32;
-	prs.curwords = 0;
-	prs.pos = 0;
-	prs.words = (TSWORD *) palloc(sizeof(TSWORD) * prs.lenwords);
-
-	/* find all words in indexable column */
-	for (i = 1; i < trigger->tgnargs; i++)
-	{
-		int			numattr;
-		Oid			oidtype;
-		Datum		txt_toasted;
-		bool		isnull;
-		text	   *txt;
-
-		numattr = SPI_fnumber(rel->rd_att, trigger->tgargs[i]);
-		if (numattr == SPI_ERROR_NOATTRIBUTE)
-		{
-			funcoid = findFunc(trigger->tgargs[i]);
-			if (funcoid == InvalidOid)
-				ereport(ERROR,
-						(errcode(ERRCODE_UNDEFINED_COLUMN),
-						 errmsg("could not find function or field \"%s\"",
-								trigger->tgargs[i])));
-
-			continue;
-		}
-		oidtype = SPI_gettypeid(rel->rd_att, numattr);
-		/* We assume char() and varchar() are binary-equivalent to text */
-		if (!(oidtype == TEXTOID ||
-			  oidtype == VARCHAROID ||
-			  oidtype == BPCHAROID))
-		{
-			elog(WARNING, "TSearch: '%s' is not of character type",
-				 trigger->tgargs[i]);
-			continue;
-		}
-		txt_toasted = SPI_getbinval(rettuple, rel->rd_att, numattr, &isnull);
-		if (isnull)
-			continue;
-
-		if (funcoid != InvalidOid)
-		{
-			text	   *txttmp = (text *) DatumGetPointer(OidFunctionCall1(
-																	 funcoid,
-																	 txt_toasted
-																		   ));
-
-			txt = (text *) PG_DETOAST_DATUM(PointerGetDatum(txttmp));
-			if (txt == txttmp)
-				txt_toasted = PointerGetDatum(txt);
-		}
-		else
-			txt = (text *) PG_DETOAST_DATUM(txt_toasted);
-
-		parsetext_v2(cfg, &prs, VARDATA(txt), VARSIZE(txt) - VARHDRSZ);
-		if (txt != (text *) DatumGetPointer(txt_toasted))
-			pfree(txt);
-	}
-
-	/* make tsvector value */
-	if (prs.curwords)
-	{
-		datum = PointerGetDatum(makevalue(&prs));
-		rettuple = SPI_modifytuple(rel, rettuple, 1, &numidxattr,
-								   &datum, NULL);
-		pfree(DatumGetPointer(datum));
-	}
-	else
-	{
-		tsvector   *out = palloc(CALCDATASIZE(0, 0));
-
-		SET_VARSIZE(out, CALCDATASIZE(0, 0));
-		out->size = 0;
-		datum = PointerGetDatum(out);
-		pfree(prs.words);
-		rettuple = SPI_modifytuple(rel, rettuple, 1, &numidxattr,
-								   &datum, NULL);
-	}
-
-	if (rettuple == NULL)
-		/* internal error */
-		elog(ERROR, "TSearch: %d returned by SPI_modifytuple", SPI_result);
-
-	return PointerGetDatum(rettuple);
-}
-
-static int
-silly_cmp_tsvector(const tsvector * a, const tsvector * b)
-{
-	if (VARSIZE(a) < VARSIZE(b))
-		return -1;
-	else if (VARSIZE(a) > VARSIZE(b))
-		return 1;
-	else if (a->size < b->size)
-		return -1;
-	else if (a->size > b->size)
-		return 1;
-	else
-	{
-		WordEntry  *aptr = ARRPTR(a);
-		WordEntry  *bptr = ARRPTR(b);
-		int			i = 0;
-		int			res;
-
-
-		for (i = 0; i < a->size; i++)
-		{
-			if (aptr->haspos != bptr->haspos)
-			{
-				return (aptr->haspos > bptr->haspos) ? -1 : 1;
-			}
-			else if (aptr->len != bptr->len)
-			{
-				return (aptr->len > bptr->len) ? -1 : 1;
-			}
-			else if ((res = strncmp(STRPTR(a) + aptr->pos, STRPTR(b) + bptr->pos, bptr->len)) != 0)
-			{
-				return res;
-			}
-			else if (aptr->haspos)
-			{
-				WordEntryPos *ap = POSDATAPTR(a, aptr);
-				WordEntryPos *bp = POSDATAPTR(b, bptr);
-				int			j;
-
-				if (POSDATALEN(a, aptr) != POSDATALEN(b, bptr))
-					return (POSDATALEN(a, aptr) > POSDATALEN(b, bptr)) ? -1 : 1;
-
-				for (j = 0; j < POSDATALEN(a, aptr); j++)
-				{
-					if (WEP_GETPOS(*ap) != WEP_GETPOS(*bp))
-					{
-						return (WEP_GETPOS(*ap) > WEP_GETPOS(*bp)) ? -1 : 1;
-					}
-					else if (WEP_GETWEIGHT(*ap) != WEP_GETWEIGHT(*bp))
-					{
-						return (WEP_GETWEIGHT(*ap) > WEP_GETWEIGHT(*bp)) ? -1 : 1;
-					}
-					ap++, bp++;
-				}
-			}
-
-			aptr++;
-			bptr++;
-		}
-	}
-
-	return 0;
-}
-
-PG_FUNCTION_INFO_V1(tsvector_cmp);
-PG_FUNCTION_INFO_V1(tsvector_lt);
-PG_FUNCTION_INFO_V1(tsvector_le);
-PG_FUNCTION_INFO_V1(tsvector_eq);
-PG_FUNCTION_INFO_V1(tsvector_ne);
-PG_FUNCTION_INFO_V1(tsvector_ge);
-PG_FUNCTION_INFO_V1(tsvector_gt);
-Datum		tsvector_cmp(PG_FUNCTION_ARGS);
-Datum		tsvector_lt(PG_FUNCTION_ARGS);
-Datum		tsvector_le(PG_FUNCTION_ARGS);
-Datum		tsvector_eq(PG_FUNCTION_ARGS);
-Datum		tsvector_ne(PG_FUNCTION_ARGS);
-Datum		tsvector_ge(PG_FUNCTION_ARGS);
-Datum		tsvector_gt(PG_FUNCTION_ARGS);
-
-#define RUNCMP										\
-tsvector *a		   = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));\
-tsvector *b		   = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));\
-int res = silly_cmp_tsvector(a,b);							\
-PG_FREE_IF_COPY(a,0);									\
-PG_FREE_IF_COPY(b,1);									\
-
-Datum
-tsvector_cmp(PG_FUNCTION_ARGS)
-{
-	RUNCMP
-		PG_RETURN_INT32(res);
-}
-
-Datum
-tsvector_lt(PG_FUNCTION_ARGS)
-{
-	RUNCMP
-		PG_RETURN_BOOL((res < 0) ? true : false);
-}
-
-Datum
-tsvector_le(PG_FUNCTION_ARGS)
-{
-	RUNCMP
-		PG_RETURN_BOOL((res <= 0) ? true : false);
-}
-
-Datum
-tsvector_eq(PG_FUNCTION_ARGS)
-{
-	RUNCMP
-		PG_RETURN_BOOL((res == 0) ? true : false);
-}
-
-Datum
-tsvector_ge(PG_FUNCTION_ARGS)
-{
-	RUNCMP
-		PG_RETURN_BOOL((res >= 0) ? true : false);
-}
-
-Datum
-tsvector_gt(PG_FUNCTION_ARGS)
-{
-	RUNCMP
-		PG_RETURN_BOOL((res > 0) ? true : false);
-}
-
-Datum
-tsvector_ne(PG_FUNCTION_ARGS)
-{
-	RUNCMP
-		PG_RETURN_BOOL((res != 0) ? true : false);
-}
diff --git a/contrib/tsearch2/tsvector.h b/contrib/tsearch2/tsvector.h
deleted file mode 100644
index e006a1dcbdfd..000000000000
--- a/contrib/tsearch2/tsvector.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef __TXTIDX_H__
-#define __TXTIDX_H__
-
-/*
-#define TXTIDX_DEBUG
-*/
-
-#include "postgres.h"
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "utils/builtins.h"
-#include "storage/bufpage.h"
-
-typedef struct
-{
-	uint32
-				haspos:1,
-				len:11,			/* MAX 2Kb */
-				pos:20;			/* MAX 1Mb */
-}	WordEntry;
-
-#define MAXSTRLEN ( 1<<11 )
-#define MAXSTRPOS ( 1<<20 )
-
-/*
-Equivalent to
-typedef struct
-{
-	   uint16
-								weight:2,
-								pos:14;
-}	WordEntryPos;
-
-*/
-
-typedef uint16 WordEntryPos;
-
-#define  WEP_GETWEIGHT(x)	( (x) >> 14 )
-#define  WEP_GETPOS(x)		( (x) & 0x3fff )
-
-#define  WEP_SETWEIGHT(x,v)  (x) = ( (v) << 14 ) | ( (x) & 0x3fff )
-#define  WEP_SETPOS(x,v)	(x) = ( (x) & 0xc000 ) | ( (v) & 0x3fff )
-
-
-#define MAXENTRYPOS (1<<14)
-#define MAXNUMPOS	256
-#define LIMITPOS(x) ( ( (x) >= MAXENTRYPOS ) ? (MAXENTRYPOS-1) : (x) )
-
-/*
- * Structure of tsvector datatype:
- * 1) standard varlena header
- * 2) int4		size - number of lexemes or WordEntry array, which is the same
- * 3) Array of WordEntry - sorted array, comparison based on word's length
- *						and strncmp(). WordEntry->pos points number of
- *						bytes from end of WordEntry array to start of
- *						corresponding lexeme.
- * 4) Lexeme's storage:
- *	  SHORTALIGNED(lexeme) and position information if it exists
- *	  Position information: first int2 - is a number of positions and it
- *	  follows array of WordEntryPos
- */
-
-typedef struct
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int4		size;
-	char		data[1];
-}	tsvector;
-
-#define DATAHDRSIZE (VARHDRSZ + sizeof(int4))
-#define CALCDATASIZE(x, lenstr) ( (x) * sizeof(WordEntry) + DATAHDRSIZE + (lenstr) )
-#define ARRPTR(x)	( (WordEntry*) ( (char*)(x) + DATAHDRSIZE ) )
-#define STRPTR(x)	( (char*)(x) + DATAHDRSIZE + ( sizeof(WordEntry) * ((tsvector*)(x))->size ) )
-#define STRSIZE(x)	( ((tsvector*)(x))->len - DATAHDRSIZE - ( sizeof(WordEntry) * ((tsvector*)(x))->size ) )
-#define _POSDATAPTR(x,e)	(STRPTR(x)+((WordEntry*)(e))->pos+SHORTALIGN(((WordEntry*)(e))->len))
-#define POSDATALEN(x,e) ( ( ((WordEntry*)(e))->haspos ) ? (*(uint16*)_POSDATAPTR(x,e)) : 0 )
-#define POSDATAPTR(x,e) ( (WordEntryPos*)( _POSDATAPTR(x,e)+sizeof(uint16) ) )
-
-
-typedef struct
-{
-	WordEntry	entry;
-	WordEntryPos *pos;
-}	WordEntryIN;
-
-typedef struct
-{
-	char	   *prsbuf;
-	char	   *word;
-	char	   *curpos;
-	int4		len;
-	int4		state;
-	int4		alen;
-	WordEntryPos *pos;
-	bool		oprisdelim;
-}	TI_IN_STATE;
-
-int4		gettoken_tsvector(TI_IN_STATE * state);
-
-#endif
diff --git a/contrib/tsearch2/tsvector_op.c b/contrib/tsearch2/tsvector_op.c
deleted file mode 100644
index e8d8e16db416..000000000000
--- a/contrib/tsearch2/tsvector_op.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Operations for tsvector type
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-
-#include "access/gist.h"
-#include "access/itup.h"
-#include "catalog/namespace.h"
-#include "commands/trigger.h"
-#include "executor/spi.h"
-#include "nodes/pg_list.h"
-#include "storage/bufpage.h"
-#include "utils/builtins.h"
-#include "utils/pg_locale.h"
-
-#include "tsvector.h"
-#include "query.h"
-#include "ts_cfg.h"
-#include "common.h"
-
-PG_FUNCTION_INFO_V1(strip);
-Datum		strip(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(setweight);
-Datum		setweight(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(concat);
-Datum		concat(PG_FUNCTION_ARGS);
-
-Datum
-strip(PG_FUNCTION_ARGS)
-{
-	tsvector   *in = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	tsvector   *out;
-	int			i,
-				len = 0;
-	WordEntry  *arrin = ARRPTR(in),
-			   *arrout;
-	char	   *cur;
-
-	for (i = 0; i < in->size; i++)
-		len += SHORTALIGN(arrin[i].len);
-
-	len = CALCDATASIZE(in->size, len);
-	out = (tsvector *) palloc0(len);
-	SET_VARSIZE(out, len);
-	out->size = in->size;
-	arrout = ARRPTR(out);
-	cur = STRPTR(out);
-	for (i = 0; i < in->size; i++)
-	{
-		memcpy(cur, STRPTR(in) + arrin[i].pos, arrin[i].len);
-		arrout[i].haspos = 0;
-		arrout[i].len = arrin[i].len;
-		arrout[i].pos = cur - STRPTR(out);
-		cur += SHORTALIGN(arrout[i].len);
-	}
-
-	PG_FREE_IF_COPY(in, 0);
-	PG_RETURN_POINTER(out);
-}
-
-Datum
-setweight(PG_FUNCTION_ARGS)
-{
-	tsvector   *in = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	char		cw = PG_GETARG_CHAR(1);
-	tsvector   *out;
-	int			i,
-				j;
-	WordEntry  *entry;
-	WordEntryPos *p;
-	int			w = 0;
-
-	switch (cw)
-	{
-		case 'A':
-		case 'a':
-			w = 3;
-			break;
-		case 'B':
-		case 'b':
-			w = 2;
-			break;
-		case 'C':
-		case 'c':
-			w = 1;
-			break;
-		case 'D':
-		case 'd':
-			w = 0;
-			break;
-			/* internal error */
-		default:
-			elog(ERROR, "unrecognized weight");
-	}
-
-	out = (tsvector *) palloc(VARSIZE(in));
-	memcpy(out, in, VARSIZE(in));
-	entry = ARRPTR(out);
-	i = out->size;
-	while (i--)
-	{
-		if ((j = POSDATALEN(out, entry)) != 0)
-		{
-			p = POSDATAPTR(out, entry);
-			while (j--)
-			{
-				WEP_SETWEIGHT(*p, w);
-				p++;
-			}
-		}
-		entry++;
-	}
-
-	PG_FREE_IF_COPY(in, 0);
-	PG_RETURN_POINTER(out);
-}
-
-static int
-compareEntry(char *ptra, WordEntry * a, char *ptrb, WordEntry * b)
-{
-	if (a->len == b->len)
-	{
-		return strncmp(
-					   ptra + a->pos,
-					   ptrb + b->pos,
-					   a->len);
-	}
-	return (a->len > b->len) ? 1 : -1;
-}
-
-static int4
-add_pos(tsvector * src, WordEntry * srcptr, tsvector * dest, WordEntry * destptr, int4 maxpos)
-{
-	uint16	   *clen = (uint16 *) _POSDATAPTR(dest, destptr);
-	int			i;
-	uint16		slen = POSDATALEN(src, srcptr),
-				startlen;
-	WordEntryPos *spos = POSDATAPTR(src, srcptr),
-			   *dpos = POSDATAPTR(dest, destptr);
-
-	if (!destptr->haspos)
-		*clen = 0;
-
-	startlen = *clen;
-	for (i = 0; i < slen && *clen < MAXNUMPOS && (*clen == 0 || WEP_GETPOS(dpos[*clen - 1]) != MAXENTRYPOS - 1); i++)
-	{
-		WEP_SETWEIGHT(dpos[*clen], WEP_GETWEIGHT(spos[i]));
-		WEP_SETPOS(dpos[*clen], LIMITPOS(WEP_GETPOS(spos[i]) + maxpos));
-		(*clen)++;
-	}
-
-	if (*clen != startlen)
-		destptr->haspos = 1;
-	return *clen - startlen;
-}
-
-
-Datum
-concat(PG_FUNCTION_ARGS)
-{
-	tsvector   *in1 = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	tsvector   *in2 = (tsvector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
-	tsvector   *out;
-	WordEntry  *ptr;
-	WordEntry  *ptr1,
-			   *ptr2;
-	WordEntryPos *p;
-	int			maxpos = 0,
-				i,
-				j,
-				i1,
-				i2;
-	char	   *cur;
-	char	   *data,
-			   *data1,
-			   *data2;
-
-	ptr = ARRPTR(in1);
-	i = in1->size;
-	while (i--)
-	{
-		if ((j = POSDATALEN(in1, ptr)) != 0)
-		{
-			p = POSDATAPTR(in1, ptr);
-			while (j--)
-			{
-				if (WEP_GETPOS(*p) > maxpos)
-					maxpos = WEP_GETPOS(*p);
-				p++;
-			}
-		}
-		ptr++;
-	}
-
-	ptr1 = ARRPTR(in1);
-	ptr2 = ARRPTR(in2);
-	data1 = STRPTR(in1);
-	data2 = STRPTR(in2);
-	i1 = in1->size;
-	i2 = in2->size;
-	out = (tsvector *) palloc0(VARSIZE(in1) + VARSIZE(in2));
-	SET_VARSIZE(out, VARSIZE(in1) + VARSIZE(in2));
-	out->size = in1->size + in2->size;
-	data = cur = STRPTR(out);
-	ptr = ARRPTR(out);
-	while (i1 && i2)
-	{
-		int			cmp = compareEntry(data1, ptr1, data2, ptr2);
-
-		if (cmp < 0)
-		{						/* in1 first */
-			ptr->haspos = ptr1->haspos;
-			ptr->len = ptr1->len;
-			memcpy(cur, data1 + ptr1->pos, ptr1->len);
-			ptr->pos = cur - data;
-			cur += SHORTALIGN(ptr1->len);
-			if (ptr->haspos)
-			{
-				memcpy(cur, _POSDATAPTR(in1, ptr1), POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16));
-				cur += POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16);
-			}
-			ptr++;
-			ptr1++;
-			i1--;
-		}
-		else if (cmp > 0)
-		{						/* in2 first */
-			ptr->haspos = ptr2->haspos;
-			ptr->len = ptr2->len;
-			memcpy(cur, data2 + ptr2->pos, ptr2->len);
-			ptr->pos = cur - data;
-			cur += SHORTALIGN(ptr2->len);
-			if (ptr->haspos)
-			{
-				int			addlen = add_pos(in2, ptr2, out, ptr, maxpos);
-
-				if (addlen == 0)
-					ptr->haspos = 0;
-				else
-					cur += addlen * sizeof(WordEntryPos) + sizeof(uint16);
-			}
-			ptr++;
-			ptr2++;
-			i2--;
-		}
-		else
-		{
-			ptr->haspos = ptr1->haspos | ptr2->haspos;
-			ptr->len = ptr1->len;
-			memcpy(cur, data1 + ptr1->pos, ptr1->len);
-			ptr->pos = cur - data;
-			cur += SHORTALIGN(ptr1->len);
-			if (ptr->haspos)
-			{
-				if (ptr1->haspos)
-				{
-					memcpy(cur, _POSDATAPTR(in1, ptr1), POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16));
-					cur += POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16);
-					if (ptr2->haspos)
-						cur += add_pos(in2, ptr2, out, ptr, maxpos) * sizeof(WordEntryPos);
-				}
-				else if (ptr2->haspos)
-				{
-					int			addlen = add_pos(in2, ptr2, out, ptr, maxpos);
-
-					if (addlen == 0)
-						ptr->haspos = 0;
-					else
-						cur += addlen * sizeof(WordEntryPos) + sizeof(uint16);
-				}
-			}
-			ptr++;
-			ptr1++;
-			ptr2++;
-			i1--;
-			i2--;
-		}
-	}
-
-	while (i1)
-	{
-		ptr->haspos = ptr1->haspos;
-		ptr->len = ptr1->len;
-		memcpy(cur, data1 + ptr1->pos, ptr1->len);
-		ptr->pos = cur - data;
-		cur += SHORTALIGN(ptr1->len);
-		if (ptr->haspos)
-		{
-			memcpy(cur, _POSDATAPTR(in1, ptr1), POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16));
-			cur += POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16);
-		}
-		ptr++;
-		ptr1++;
-		i1--;
-	}
-
-	while (i2)
-	{
-		ptr->haspos = ptr2->haspos;
-		ptr->len = ptr2->len;
-		memcpy(cur, data2 + ptr2->pos, ptr2->len);
-		ptr->pos = cur - data;
-		cur += SHORTALIGN(ptr2->len);
-		if (ptr->haspos)
-		{
-			int			addlen = add_pos(in2, ptr2, out, ptr, maxpos);
-
-			if (addlen == 0)
-				ptr->haspos = 0;
-			else
-				cur += addlen * sizeof(WordEntryPos) + sizeof(uint16);
-		}
-		ptr++;
-		ptr2++;
-		i2--;
-	}
-
-	out->size = ptr - ARRPTR(out);
-	SET_VARSIZE(out, CALCDATASIZE(out->size, cur - data));
-	if (data != STRPTR(out))
-		memmove(STRPTR(out), data, cur - data);
-
-	PG_FREE_IF_COPY(in1, 0);
-	PG_FREE_IF_COPY(in2, 1);
-	PG_RETURN_POINTER(out);
-}
diff --git a/contrib/tsearch2/uninstall_tsearch2.sql b/contrib/tsearch2/uninstall_tsearch2.sql
new file mode 100644
index 000000000000..180b021d2c31
--- /dev/null
+++ b/contrib/tsearch2/uninstall_tsearch2.sql
@@ -0,0 +1,96 @@
+/* $PostgreSQL: pgsql/contrib/tsearch2/uninstall_tsearch2.sql,v 1.2 2007/11/16 00:34:54 tgl Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public, pg_catalog;
+
+DROP DOMAIN tsvector CASCADE;
+DROP DOMAIN tsquery CASCADE;
+DROP DOMAIN gtsvector CASCADE;
+DROP DOMAIN gtsq CASCADE;
+
+DROP TYPE tokentype CASCADE;
+DROP TYPE tokenout CASCADE;
+DROP TYPE statinfo CASCADE;
+DROP TYPE tsdebug CASCADE;
+
+DROP OPERATOR CLASS tsquery_ops USING btree CASCADE;
+
+DROP OPERATOR CLASS tsvector_ops USING btree CASCADE;
+
+DROP OPERATOR CLASS gin_tsvector_ops USING gin CASCADE;
+
+DROP OPERATOR CLASS gist_tp_tsquery_ops USING gist CASCADE;
+
+DROP OPERATOR CLASS gist_tsvector_ops USING gist CASCADE;
+
+DROP FUNCTION lexize(oid, text) ;
+DROP FUNCTION lexize(text, text);
+DROP FUNCTION lexize(text);
+DROP FUNCTION set_curdict(int);
+DROP FUNCTION set_curdict(text);
+DROP FUNCTION dex_init(internal);
+DROP FUNCTION dex_lexize(internal,internal,int4);
+DROP FUNCTION snb_en_init(internal);
+DROP FUNCTION snb_lexize(internal,internal,int4);
+DROP FUNCTION snb_ru_init_koi8(internal);
+DROP FUNCTION snb_ru_init_utf8(internal);
+DROP FUNCTION snb_ru_init(internal);
+DROP FUNCTION spell_init(internal);
+DROP FUNCTION spell_lexize(internal,internal,int4);
+DROP FUNCTION syn_init(internal);
+DROP FUNCTION syn_lexize(internal,internal,int4);
+DROP FUNCTION thesaurus_init(internal);
+DROP FUNCTION thesaurus_lexize(internal,internal,int4,internal);
+DROP FUNCTION set_curprs(int);
+DROP FUNCTION set_curprs(text);
+DROP FUNCTION prsd_start(internal,int4);
+DROP FUNCTION prsd_getlexeme(internal,internal,internal);
+DROP FUNCTION prsd_end(internal);
+DROP FUNCTION prsd_lextype(internal);
+DROP FUNCTION prsd_headline(internal,internal,internal);
+DROP FUNCTION set_curcfg(int);
+DROP FUNCTION set_curcfg(text);
+DROP FUNCTION show_curcfg();
+DROP FUNCTION length(tsvector);
+DROP FUNCTION to_tsvector(oid, text);
+DROP FUNCTION to_tsvector(text, text);
+DROP FUNCTION to_tsvector(text);
+DROP FUNCTION strip(tsvector);
+DROP FUNCTION setweight(tsvector,"char");
+DROP FUNCTION concat(tsvector,tsvector);
+DROP FUNCTION querytree(tsquery);
+DROP FUNCTION to_tsquery(oid, text);
+DROP FUNCTION to_tsquery(text, text);
+DROP FUNCTION to_tsquery(text);
+DROP FUNCTION plainto_tsquery(oid, text);
+DROP FUNCTION plainto_tsquery(text, text);
+DROP FUNCTION plainto_tsquery(text);
+DROP FUNCTION tsearch2() CASCADE;
+DROP FUNCTION rank(float4[], tsvector, tsquery);
+DROP FUNCTION rank(float4[], tsvector, tsquery, int4);
+DROP FUNCTION rank(tsvector, tsquery);
+DROP FUNCTION rank(tsvector, tsquery, int4);
+DROP FUNCTION rank_cd(float4[], tsvector, tsquery);
+DROP FUNCTION rank_cd(float4[], tsvector, tsquery, int4);
+DROP FUNCTION rank_cd(tsvector, tsquery);
+DROP FUNCTION rank_cd(tsvector, tsquery, int4);
+DROP FUNCTION headline(oid, text, tsquery, text);
+DROP FUNCTION headline(oid, text, tsquery);
+DROP FUNCTION headline(text, text, tsquery, text);
+DROP FUNCTION headline(text, text, tsquery);
+DROP FUNCTION headline(text, tsquery, text);
+DROP FUNCTION headline(text, tsquery);
+DROP FUNCTION get_covers(tsvector,tsquery);
+DROP FUNCTION _get_parser_from_curcfg();
+DROP FUNCTION numnode(tsquery);
+DROP FUNCTION tsquery_and(tsquery,tsquery);
+DROP FUNCTION tsquery_or(tsquery,tsquery);
+DROP FUNCTION tsquery_not(tsquery);
+DROP FUNCTION rewrite(tsquery, text);
+DROP FUNCTION rewrite(tsquery, tsquery, tsquery);
+DROP AGGREGATE rewrite (tsquery[]);
+DROP FUNCTION rewrite_accum(tsquery,tsquery[]);
+DROP FUNCTION rewrite_finish(tsquery);
+DROP FUNCTION tsq_mcontains(tsquery, tsquery);
+DROP FUNCTION tsq_mcontained(tsquery, tsquery);
+DROP FUNCTION reset_tsearch();
diff --git a/contrib/tsearch2/untsearch.sql.in b/contrib/tsearch2/untsearch.sql.in
deleted file mode 100644
index 26683c478e83..000000000000
--- a/contrib/tsearch2/untsearch.sql.in
+++ /dev/null
@@ -1,75 +0,0 @@
-BEGIN;
-
---Be careful !!!
---script drops all indices, triggers and columns with types defined
---in tsearch2.sql
-
-
-DROP OPERATOR CLASS gin_tsvector_ops USING gin CASCADE;
-
-DROP OPERATOR CLASS gist_tsvector_ops USING gist CASCADE;
-
-
-DROP OPERATOR || (tsvector, tsvector);
-DROP OPERATOR @@ (tsvector, tsquery);
-DROP OPERATOR @@ (tsquery, tsvector);
-
---DROP AGGREGATE stat(tsvector);
-
-DROP TABLE pg_ts_dict;
-DROP TABLE pg_ts_parser;
-DROP TABLE pg_ts_cfg;
-DROP TABLE pg_ts_cfgmap;
-
-DROP TYPE tokentype CASCADE;
-DROP TYPE tokenout CASCADE;
-DROP TYPE tsvector CASCADE;
-DROP TYPE tsquery CASCADE;
-DROP TYPE gtsvector CASCADE;
---DROP TYPE tsstat CASCADE;
-DROP TYPE statinfo CASCADE;
-DROP TYPE tsdebug CASCADE;
-DROP TYPE gtsq CASCADE;
-
-DROP FUNCTION lexize(oid, text) ;
-DROP FUNCTION lexize(text, text);
-DROP FUNCTION lexize(text);
-DROP FUNCTION set_curdict(int);
-DROP FUNCTION set_curdict(text);
-DROP FUNCTION dex_init(internal);
-DROP FUNCTION dex_lexize(internal,internal,int4);
-DROP FUNCTION snb_en_init(internal);
-DROP FUNCTION snb_lexize(internal,internal,int4);
-DROP FUNCTION snb_ru_init_koi8(internal);
-DROP FUNCTION snb_ru_init_utf8(internal);
-DROP FUNCTION spell_init(internal);
-DROP FUNCTION spell_lexize(internal,internal,int4);
-DROP FUNCTION thesaurus_init(internal);
-DROP FUNCTION thesaurus_lexize(internal,internal,int4,internal);
-DROP FUNCTION syn_init(internal);
-DROP FUNCTION syn_lexize(internal,internal,int4);
-DROP FUNCTION set_curprs(int);
-DROP FUNCTION set_curprs(text);
-DROP FUNCTION prsd_start(internal,int4);
-DROP FUNCTION prsd_getlexeme(internal,internal,internal);
-DROP FUNCTION prsd_end(internal);
-DROP FUNCTION prsd_lextype(internal);
-DROP FUNCTION prsd_headline(internal,internal,internal);
-DROP FUNCTION set_curcfg(int);
-DROP FUNCTION set_curcfg(text);
-DROP FUNCTION show_curcfg();
-DROP FUNCTION gtsvector_compress(internal);
-DROP FUNCTION gtsvector_decompress(internal);
-DROP FUNCTION gtsvector_penalty(internal,internal,internal);
-DROP FUNCTION gtsvector_picksplit(internal, internal);
-DROP FUNCTION gtsvector_union(internal, internal);
-DROP FUNCTION gtsq_compress(internal);
-DROP FUNCTION gtsq_decompress(internal);
-DROP FUNCTION gtsq_penalty(internal,internal,internal);
-DROP FUNCTION gtsq_picksplit(internal, internal);
-DROP FUNCTION gtsq_union(bytea, internal);
-DROP FUNCTION reset_tsearch();
-DROP FUNCTION tsearch2() CASCADE;
-DROP FUNCTION _get_parser_from_curcfg();
-
-END;
diff --git a/contrib/tsearch2/wordparser/Makefile b/contrib/tsearch2/wordparser/Makefile
deleted file mode 100644
index c4eceba60bb2..000000000000
--- a/contrib/tsearch2/wordparser/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.9 2005/11/21 12:27:57 teodor Exp $
-
-SUBOBJS =  parser.o deflex.o
-
-EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
-
-PG_CPPFLAGS = -I$(srcdir)/..
-
-ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
-include $(PGXS)
-else
-subdir = contrib/tsearch2/wordparser
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
-
-override CFLAGS += $(CFLAGS_SL)
-
-all: SUBSYS.o
-
-SUBSYS.o: $(SUBOBJS)
-	$(LD) $(LDREL) $(LDOUT) $@ $^
-
-
diff --git a/contrib/tsearch2/wordparser/deflex.c b/contrib/tsearch2/wordparser/deflex.c
deleted file mode 100644
index 004069f48e87..000000000000
--- a/contrib/tsearch2/wordparser/deflex.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/wordparser/deflex.c,v 1.4 2006/03/11 04:38:30 momjian Exp $ */
-
-#include "deflex.h"
-
-const char *lex_descr[] = {
-	"",
-	"Latin word",
-	"Non-latin word",
-	"Word",
-	"Email",
-	"URL",
-	"Host",
-	"Scientific notation",
-	"VERSION",
-	"Part of hyphenated word",
-	"Non-latin part of hyphenated word",
-	"Latin part of hyphenated word",
-	"Space symbols",
-	"HTML Tag",
-	"Protocol head",
-	"Hyphenated word",
-	"Latin hyphenated word",
-	"Non-latin hyphenated word",
-	"URI",
-	"File or path name",
-	"Decimal notation",
-	"Signed integer",
-	"Unsigned integer",
-	"HTML Entity"
-};
-
-const char *tok_alias[] = {
-	"",
-	"lword",
-	"nlword",
-	"word",
-	"email",
-	"url",
-	"host",
-	"sfloat",
-	"version",
-	"part_hword",
-	"nlpart_hword",
-	"lpart_hword",
-	"blank",
-	"tag",
-	"protocol",
-	"hword",
-	"lhword",
-	"nlhword",
-	"uri",
-	"file",
-	"float",
-	"int",
-	"uint",
-	"entity"
-};
diff --git a/contrib/tsearch2/wordparser/deflex.h b/contrib/tsearch2/wordparser/deflex.h
deleted file mode 100644
index 72852e448566..000000000000
--- a/contrib/tsearch2/wordparser/deflex.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/wordparser/deflex.h,v 1.3 2006/03/11 04:38:30 momjian Exp $ */
-
-#ifndef __DEFLEX_H__
-#define __DEFLEX_H__
-
-/* rememder !!!! */
-#define LASTNUM		23
-
-#define LATWORD		1
-#define CYRWORD		2
-#define UWORD		3
-#define EMAIL		4
-#define FURL		5
-#define HOST		6
-#define SCIENTIFIC	7
-#define VERSIONNUMBER	8
-#define PARTHYPHENWORD	9
-#define CYRPARTHYPHENWORD	10
-#define LATPARTHYPHENWORD	11
-#define SPACE		12
-#define TAG			13
-#define PROTOCOL		14
-#define HYPHENWORD	15
-#define LATHYPHENWORD	16
-#define CYRHYPHENWORD	17
-#define URI		18
-#define FILEPATH	19
-#define DECIMAL		20
-#define SIGNEDINT	21
-#define UNSIGNEDINT 22
-#define HTMLENTITY	23
-
-extern const char *lex_descr[];
-extern const char *tok_alias[];
-
-#endif
diff --git a/contrib/tsearch2/wordparser/parser.c b/contrib/tsearch2/wordparser/parser.c
deleted file mode 100644
index 6352c112663c..000000000000
--- a/contrib/tsearch2/wordparser/parser.c
+++ /dev/null
@@ -1,1266 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/wordparser/parser.c,v 1.11.2.2 2007/03/22 15:59:09 teodor Exp $ */
-
-#include "postgres.h"
-
-#include "utils/builtins.h"
-#include "utils/pg_locale.h"
-#include "mb/pg_wchar.h"
-
-#include "deflex.h"
-#include "parser.h"
-#include "ts_locale.h"
-
-
-static TParserPosition *
-newTParserPosition(TParserPosition * prev)
-{
-	TParserPosition *res = (TParserPosition *) palloc(sizeof(TParserPosition));
-
-	if (prev)
-		memcpy(res, prev, sizeof(TParserPosition));
-	else
-		memset(res, 0, sizeof(TParserPosition));
-
-	res->prev = prev;
-
-	res->pushedAtAction = NULL;
-
-	return res;
-}
-
-TParser *
-TParserInit(char *str, int len)
-{
-	TParser    *prs = (TParser *) palloc0(sizeof(TParser));
-
-	prs->charmaxlen = pg_database_encoding_max_length();
-	prs->str = str;
-	prs->lenstr = len;
-
-#ifdef TS_USE_WIDE
-
-	/*
-	 * Use wide char code only when max encoding length > 1.
-	 */
-
-	if (prs->charmaxlen > 1)
-	{
-		prs->usewide = true;
-		prs->wstr = (wchar_t *) palloc(sizeof(wchar_t) * (prs->lenstr+1));
-		prs->lenwstr = char2wchar(prs->wstr, prs->lenstr, prs->str, prs->lenstr);
-	}
-	else
-#endif
-		prs->usewide = false;
-
-	prs->state = newTParserPosition(NULL);
-	prs->state->state = TPS_Base;
-
-	return prs;
-}
-
-void
-TParserClose(TParser * prs)
-{
-	while (prs->state)
-	{
-		TParserPosition *ptr = prs->state->prev;
-
-		pfree(prs->state);
-		prs->state = ptr;
-	}
-
-#ifdef TS_USE_WIDE
-	if (prs->wstr)
-		pfree(prs->wstr);
-#endif
-
-	pfree(prs);
-}
-
-/*
- * defining support function, equvalent is* macroses, but
- * working with any possible encodings and locales. Note,
- * that with multibyte encoding and C-locale isw* function may fail
- * or give wrong result. Note 2: multibyte encoding and C-locale 
- * often are used for Asian languages.
- */
-
-#ifdef TS_USE_WIDE
-
-#define p_iswhat(type)														\
-static int																	\
-p_is##type(TParser *prs) {													\
-	Assert( prs->state );													\
-	if ( prs->usewide )														\
-	{																		\
-		if ( lc_ctype_is_c() )												\
-			return is##type( 0xff & *( prs->wstr + prs->state->poschar) );	\
-																			\
-		return isw##type( *(wint_t*)( prs->wstr + prs->state->poschar ) );	\
-	}																		\
-																			\
-	return is##type( *(unsigned char*)( prs->str + prs->state->posbyte ) );	\
-}																			\
-																			\
-static int																	\
-p_isnot##type(TParser *prs) {												\
-	return !p_is##type(prs);												\
-}
-
-static int 
-p_isalnum(TParser *prs)
-{
-	Assert( prs->state );
-
-	if (prs->usewide)
-	{
-		if (lc_ctype_is_c())
-		{
-			unsigned int c = *(prs->wstr + prs->state->poschar);
-
-			/*
-			 * any non-ascii symbol with multibyte encoding
-			 * with C-locale is an alpha character
-			 */
-			if ( c > 0x7f )
-				return 1;
-
-			return isalnum(0xff & c);
-		}
-
-		return iswalnum( (wint_t)*( prs->wstr + prs->state->poschar));
-	}
-
-	return isalnum( *(unsigned char*)( prs->str + prs->state->posbyte ));
-}
-
-static int
-p_isnotalnum(TParser *prs)
-{
-	return !p_isalnum(prs);
-}
-
-static int 
-p_isalpha(TParser *prs)
-{
-	Assert( prs->state );
-
-	if (prs->usewide)
-	{
-		if (lc_ctype_is_c())
-		{
-			unsigned int c = *(prs->wstr + prs->state->poschar);
-
-			/*
-			 * any non-ascii symbol with multibyte encoding
-			 * with C-locale is an alpha character
-			 */
-			if ( c > 0x7f )
-				return 1;
-
-			return isalpha(0xff & c);
-		}
-
-		return iswalpha( (wint_t)*( prs->wstr + prs->state->poschar));
-	}
-
-	return isalpha( *(unsigned char*)( prs->str + prs->state->posbyte ));
-}
-
-static int
-p_isnotalpha(TParser *prs)
-{
-	return !p_isalpha(prs);
-}
-
-/* p_iseq should be used only for ascii symbols */
-
-static int
-p_iseq(TParser * prs, char c)
-{
-	Assert(prs->state);
-	return ((prs->state->charlen == 1 && *(prs->str + prs->state->posbyte) == c)) ? 1 : 0;
-}
-
-#else							/* TS_USE_WIDE */
-
-#define p_iswhat(type)														\
-static int																	\
-p_is##type(TParser *prs) {													\
-	Assert( prs->state );													\
-	return is##type( (unsigned char)*( prs->str + prs->state->posbyte ) );	\
-}																			\
-																			\
-static int																	\
-p_isnot##type(TParser *prs) {												\
-	return !p_is##type(prs);												\
-}
-
-
-static int
-p_iseq(TParser * prs, char c)
-{
-	Assert(prs->state);
-	return (*(prs->str + prs->state->posbyte) == c) ? 1 : 0;
-}
-
-p_iswhat(alnum)
-p_iswhat(alpha)
-
-#endif   /* TS_USE_WIDE */
-
-p_iswhat(digit)
-p_iswhat(lower)
-p_iswhat(print)
-p_iswhat(punct)
-p_iswhat(space)
-p_iswhat(upper)
-p_iswhat(xdigit)
-
-static int
-p_isEOF(TParser * prs)
-{
-	Assert(prs->state);
-	return (prs->state->posbyte == prs->lenstr || prs->state->charlen == 0) ? 1 : 0;
-}
-
-static int
-p_iseqC(TParser * prs)
-{
-	return p_iseq(prs, prs->c);
-}
-
-static int
-p_isneC(TParser * prs)
-{
-	return !p_iseq(prs, prs->c);
-}
-
-static int
-p_isascii(TParser * prs)
-{
-	return (prs->state->charlen == 1 && isascii((unsigned char) *(prs->str + prs->state->posbyte))) ? 1 : 0;
-}
-
-static int
-p_islatin(TParser * prs)
-{
-	return (p_isalpha(prs) && p_isascii(prs)) ? 1 : 0;
-}
-
-static int
-p_isnonlatin(TParser * prs)
-{
-	return (p_isalpha(prs) && !p_isascii(prs)) ? 1 : 0;
-}
-
-void		_make_compiler_happy(void);
-void
-_make_compiler_happy(void)
-{
-	p_isalnum(NULL);
-	p_isnotalnum(NULL);
-	p_isalpha(NULL);
-	p_isnotalpha(NULL);
-	p_isdigit(NULL);
-	p_isnotdigit(NULL);
-	p_islower(NULL);
-	p_isnotlower(NULL);
-	p_isprint(NULL);
-	p_isnotprint(NULL);
-	p_ispunct(NULL);
-	p_isnotpunct(NULL);
-	p_isspace(NULL);
-	p_isnotspace(NULL);
-	p_isupper(NULL);
-	p_isnotupper(NULL);
-	p_isxdigit(NULL);
-	p_isnotxdigit(NULL);
-	p_isEOF(NULL);
-	p_iseqC(NULL);
-	p_isneC(NULL);
-}
-
-
-static void
-SpecialTags(TParser * prs)
-{
-	switch (prs->state->lencharlexeme)
-	{
-		case 8:			/* </script */
-			if (pg_strncasecmp(prs->lexeme, "</script", 8) == 0)
-				prs->ignore = false;
-			break;
-		case 7:			/* <script || </style */
-			if (pg_strncasecmp(prs->lexeme, "</style", 7) == 0)
-				prs->ignore = false;
-			else if (pg_strncasecmp(prs->lexeme, "<script", 7) == 0)
-				prs->ignore = true;
-			break;
-		case 6:			/* <style */
-			if (pg_strncasecmp(prs->lexeme, "<style", 6) == 0)
-				prs->ignore = true;
-			break;
-		default:
-			break;
-	}
-}
-
-static void
-SpecialFURL(TParser * prs)
-{
-	prs->wanthost = true;
-	prs->state->posbyte -= prs->state->lenbytelexeme;
-	prs->state->poschar -= prs->state->lencharlexeme;
-}
-
-static void
-SpecialHyphen(TParser * prs)
-{
-	prs->state->posbyte -= prs->state->lenbytelexeme;
-	prs->state->poschar -= prs->state->lencharlexeme;
-}
-
-static void
-SpecialVerVersion(TParser * prs)
-{
-	prs->state->posbyte -= prs->state->lenbytelexeme;
-	prs->state->poschar -= prs->state->lencharlexeme;
-	prs->state->lenbytelexeme = 0;
-	prs->state->lencharlexeme = 0;
-}
-
-static int
-p_isstophost(TParser * prs)
-{
-	if (prs->wanthost)
-	{
-		prs->wanthost = false;
-		return 1;
-	}
-	return 0;
-}
-
-static int
-p_isignore(TParser * prs)
-{
-	return (prs->ignore) ? 1 : 0;
-}
-
-static int
-p_ishost(TParser * prs)
-{
-	TParser    *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte);
-	int			res = 0;
-
-	if (TParserGet(tmpprs) && tmpprs->type == HOST)
-	{
-		prs->state->posbyte += tmpprs->lenbytelexeme;
-		prs->state->poschar += tmpprs->lencharlexeme;
-		prs->state->lenbytelexeme += tmpprs->lenbytelexeme;
-		prs->state->lencharlexeme += tmpprs->lencharlexeme;
-		prs->state->charlen = tmpprs->state->charlen;
-		res = 1;
-	}
-	TParserClose(tmpprs);
-
-	return res;
-}
-
-static int
-p_isURI(TParser * prs)
-{
-	TParser    *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte);
-	int			res = 0;
-
-	tmpprs->state = newTParserPosition(tmpprs->state);
-	tmpprs->state->state = TPS_InFileFirst;
-
-	if (TParserGet(tmpprs) && (tmpprs->type == URI || tmpprs->type == FILEPATH))
-	{
-		prs->state->posbyte += tmpprs->lenbytelexeme;
-		prs->state->poschar += tmpprs->lencharlexeme;
-		prs->state->lenbytelexeme += tmpprs->lenbytelexeme;
-		prs->state->lencharlexeme += tmpprs->lencharlexeme;
-		prs->state->charlen = tmpprs->state->charlen;
-		res = 1;
-	}
-	TParserClose(tmpprs);
-
-	return res;
-}
-
-/*
- * Table of state/action of parser
- */
-
-#define A_NEXT		0x0000
-#define A_BINGO		0x0001
-#define A_POP		0x0002
-#define A_PUSH		0x0004
-#define A_RERUN		0x0008
-#define A_CLEAR		0x0010
-#define A_MERGE		0x0020
-#define A_CLRALL	0x0040
-
-static TParserStateActionItem actionTPS_Base[] = {
-	{p_isEOF, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '<', A_PUSH, TPS_InTagFirst, 0, NULL},
-	{p_isignore, 0, A_NEXT, TPS_InSpace, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InLatWord, 0, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_InCyrWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InUnsignedInt, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InSignedIntFirst, 0, NULL},
-	{p_iseqC, '+', A_PUSH, TPS_InSignedIntFirst, 0, NULL},
-	{p_iseqC, '&', A_PUSH, TPS_InHTMLEntityFirst, 0, NULL},
-	{p_iseqC, '~', A_PUSH, TPS_InFileTwiddle, 0, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InPathFirstFirst, 0, NULL},
-	{NULL, 0, A_NEXT, TPS_InSpace, 0, NULL}
-};
-
-
-static TParserStateActionItem actionTPS_InUWord[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, UWORD, NULL},
-	{p_isalnum, 0, A_NEXT, TPS_InUWord, 0, NULL},
-	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InFileNext, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenUWordFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, UWORD, NULL}
-};
-
-static TParserStateActionItem actionTPS_InLatWord[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, LATWORD, NULL},
-	{p_islatin, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InFileNext, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenLatWordFirst, 0, NULL},
-	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
-	{p_iseqC, ':', A_PUSH, TPS_InProtocolFirst, 0, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
-	{p_isdigit, 0, A_PUSH, TPS_InHost, 0, NULL},
-	{p_isalnum, 0, A_NEXT, TPS_InUWord, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, LATWORD, NULL}
-};
-
-static TParserStateActionItem actionTPS_InCyrWord[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, CYRWORD, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_isalnum, 0, A_NEXT, TPS_InUWord, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenCyrWordFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, CYRWORD, NULL}
-};
-
-static TParserStateActionItem actionTPS_InUnsignedInt[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, UNSIGNEDINT, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InUDecimalFirst, 0, NULL},
-	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{p_islatin, 0, A_PUSH, TPS_InHost, 0, NULL},
-	{p_isalpha, 0, A_NEXT, TPS_InUWord, 0, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, UNSIGNEDINT, NULL}
-};
-
-static TParserStateActionItem actionTPS_InSignedIntFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT | A_CLEAR, TPS_InSignedInt, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InSignedInt[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, SIGNEDINT, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InDecimalFirst, 0, NULL},
-	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, SIGNEDINT, NULL}
-};
-
-static TParserStateActionItem actionTPS_InSpace[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, SPACE, NULL},
-	{p_iseqC, '<', A_BINGO, TPS_Base, SPACE, NULL},
-	{p_isignore, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '-', A_BINGO, TPS_Base, SPACE, NULL},
-	{p_iseqC, '+', A_BINGO, TPS_Base, SPACE, NULL},
-	{p_iseqC, '&', A_BINGO, TPS_Base, SPACE, NULL},
-	{p_iseqC, '/', A_BINGO, TPS_Base, SPACE, NULL},
-	{p_isnotalnum, 0, A_NEXT, TPS_InSpace, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, SPACE, NULL}
-};
-
-static TParserStateActionItem actionTPS_InUDecimalFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InUDecimal, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InUDecimal[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InUDecimal, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InVersionFirst, 0, NULL},
-	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, DECIMAL, NULL}
-};
-
-static TParserStateActionItem actionTPS_InDecimalFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InDecimal, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InDecimal[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InDecimal, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InVerVersion, 0, NULL},
-	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, DECIMAL, NULL}
-};
-
-static TParserStateActionItem actionTPS_InVerVersion[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_RERUN, TPS_InSVerVersion, 0, SpecialVerVersion},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InSVerVersion[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_BINGO | A_CLRALL, TPS_InUnsignedInt, SPACE, NULL},
-	{NULL, 0, A_NEXT, TPS_Null, 0, NULL}
-};
-
-
-static TParserStateActionItem actionTPS_InVersionFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InVersion, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InVersion[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, VERSIONNUMBER, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InVersion, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InVersionFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, VERSIONNUMBER, NULL}
-};
-
-static TParserStateActionItem actionTPS_InMantissaFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InMantissa, 0, NULL},
-	{p_iseqC, '+', A_NEXT, TPS_InMantissaSign, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_InMantissaSign, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InMantissaSign[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InMantissa, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InMantissa[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, SCIENTIFIC, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InMantissa, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, SCIENTIFIC, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHTMLEntityFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '#', A_NEXT, TPS_InHTMLEntityNumFirst, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHTMLEntity, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHTMLEntity[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHTMLEntity, 0, NULL},
-	{p_iseqC, ';', A_NEXT, TPS_InHTMLEntityEnd, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHTMLEntityNumFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHTMLEntityNum, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHTMLEntityNum[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHTMLEntityNum, 0, NULL},
-	{p_iseqC, ';', A_NEXT, TPS_InHTMLEntityEnd, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHTMLEntityEnd[] = {
-	{NULL, 0, A_BINGO | A_CLEAR, TPS_Base, HTMLENTITY, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InTagCloseFirst, 0, NULL},
-	{p_iseqC, '!', A_PUSH, TPS_InCommentFirst, 0, NULL},
-	{p_iseqC, '?', A_PUSH, TPS_InXMLBegin, 0, NULL},
-	{p_islatin, 0, A_PUSH, TPS_InTagName, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InXMLBegin[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	/* <?xml ... */
-	{p_iseqC, 'x', A_NEXT, TPS_InTag, 0, NULL},
-	{p_iseqC, 'X', A_NEXT, TPS_InTag, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagCloseFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InTagName, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagName[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	/* <br/> case */
-	{p_iseqC, '/', A_NEXT, TPS_InTagBeginEnd, 0, NULL},
-	{p_iseqC, '>', A_NEXT, TPS_InTagEnd, 0, SpecialTags},
-	{p_isspace, 0, A_NEXT, TPS_InTag, 0, SpecialTags},
-	{p_islatin, 0, A_NEXT, TPS_Null, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagBeginEnd[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '>', A_NEXT, TPS_InTagEnd, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTag[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '>', A_NEXT, TPS_InTagEnd, 0, SpecialTags},
-	{p_iseqC, '\'', A_NEXT, TPS_InTagEscapeK, 0, NULL},
-	{p_iseqC, '"', A_NEXT, TPS_InTagEscapeKK, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '=', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '#', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '/', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, ':', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '.', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '&', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '?', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '%', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '~', A_NEXT, TPS_Null, 0, NULL},
-	{p_isspace, 0, A_NEXT, TPS_Null, 0, SpecialTags},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagEscapeK[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '\\', A_PUSH, TPS_InTagBackSleshed, 0, NULL},
-	{p_iseqC, '\'', A_NEXT, TPS_InTag, 0, NULL},
-	{NULL, 0, A_NEXT, TPS_InTagEscapeK, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagEscapeKK[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '\\', A_PUSH, TPS_InTagBackSleshed, 0, NULL},
-	{p_iseqC, '"', A_NEXT, TPS_InTag, 0, NULL},
-	{NULL, 0, A_NEXT, TPS_InTagEscapeKK, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagBackSleshed[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{NULL, 0, A_MERGE, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InTagEnd[] = {
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, TAG, NULL}
-};
-
-static TParserStateActionItem actionTPS_InCommentFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_InCommentLast, 0, NULL},
-	/* <!DOCTYPE ...> */
-	{p_iseqC, 'D', A_NEXT, TPS_InTag, 0, NULL},
-	{p_iseqC, 'd', A_NEXT, TPS_InTag, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InCommentLast[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_InComment, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InComment[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_InCloseCommentFirst, 0, NULL},
-	{NULL, 0, A_NEXT, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InCloseCommentFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_InCloseCommentLast, 0, NULL},
-	{NULL, 0, A_NEXT, TPS_InComment, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InCloseCommentLast[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_Null, 0, NULL},
-	{p_iseqC, '>', A_NEXT, TPS_InCommentEnd, 0, NULL},
-	{NULL, 0, A_NEXT, TPS_InComment, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InCommentEnd[] = {
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, TAG, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHostFirstDomain[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHostDomainSecond, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHost, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHostDomainSecond[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHostDomain, 0, NULL},
-	{p_isdigit, 0, A_PUSH, TPS_InHost, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
-	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHostDomain[] = {
-	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHostDomain, 0, NULL},
-	{p_isdigit, 0, A_PUSH, TPS_InHost, 0, NULL},
-	{p_iseqC, ':', A_PUSH, TPS_InPortFirst, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
-	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
-	{p_isdigit, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isstophost, 0, A_BINGO | A_CLRALL, TPS_InURIStart, HOST, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InFURL, 0, NULL},
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL}
-};
-
-static TParserStateActionItem actionTPS_InPortFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InPort, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InPort[] = {
-	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InPort, 0, NULL},
-	{p_isstophost, 0, A_BINGO | A_CLRALL, TPS_InURIStart, HOST, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InFURL, 0, NULL},
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHostFirstAN[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHost, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHost, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHost[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHost, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHost, 0, NULL},
-	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InEmail[] = {
-	{p_ishost, 0, A_BINGO | A_CLRALL, TPS_Base, EMAIL, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InFileFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '.', A_NEXT, TPS_InPathFirst, 0, NULL},
-	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '?', A_PUSH, TPS_InURIFirst, 0, NULL},
-	{p_iseqC, '~', A_PUSH, TPS_InFileTwiddle, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InFileTwiddle[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '/', A_NEXT, TPS_InFileFirst, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InPathFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '.', A_NEXT, TPS_InPathSecond, 0, NULL},
-	{p_iseqC, '/', A_NEXT, TPS_InFileFirst, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InPathFirstFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '.', A_NEXT, TPS_InPathSecond, 0, NULL},
-	{p_iseqC, '/', A_NEXT, TPS_InFileFirst, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InPathSecond[] = {
-	{p_isEOF, 0, A_BINGO | A_CLEAR, TPS_Base, FILEPATH, NULL},
-	{p_iseqC, '/', A_NEXT | A_PUSH, TPS_InFileFirst, 0, NULL},
-	{p_iseqC, '/', A_BINGO | A_CLEAR, TPS_Base, FILEPATH, NULL},
-	{p_isspace, 0, A_BINGO | A_CLEAR, TPS_Base, FILEPATH, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InFile[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, FILEPATH, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InFileNext, 0, NULL},
-	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '-', A_NEXT, TPS_InFile, 0, NULL},
-	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
-	{p_iseqC, '?', A_PUSH, TPS_InURIFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, FILEPATH, NULL}
-};
-
-static TParserStateActionItem actionTPS_InFileNext[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_CLEAR, TPS_InFile, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InFile, 0, NULL},
-	{p_iseqC, '_', A_CLEAR, TPS_InFile, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InURIFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '"', A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '\'', A_POP, TPS_Null, 0, NULL},
-	{p_isnotspace, 0, A_CLEAR, TPS_InURI, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL},
-};
-
-static TParserStateActionItem actionTPS_InURIStart[] = {
-	{NULL, 0, A_NEXT, TPS_InURI, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InURI[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, URI, NULL},
-	{p_iseqC, '"', A_BINGO, TPS_Base, URI, NULL},
-	{p_iseqC, '\'', A_BINGO, TPS_Base, URI, NULL},
-	{p_isnotspace, 0, A_NEXT, TPS_InURI, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_Base, URI, NULL}
-};
-
-static TParserStateActionItem actionTPS_InFURL[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isURI, 0, A_BINGO | A_CLRALL, TPS_Base, FURL, SpecialFURL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InProtocolFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '/', A_NEXT, TPS_InProtocolSecond, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InProtocolSecond[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_iseqC, '/', A_NEXT, TPS_InProtocolEnd, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InProtocolEnd[] = {
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, PROTOCOL, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenLatWordFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHyphenLatWord, 0, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenValue, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenLatWord[] = {
-	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, LATHYPHENWORD, SpecialHyphen},
-	{p_islatin, 0, A_NEXT, TPS_InHyphenLatWord, 0, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenLatWordFirst, 0, NULL},
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, LATHYPHENWORD, SpecialHyphen}
-};
-
-static TParserStateActionItem actionTPS_InHyphenCyrWordFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_InHyphenCyrWord, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenValue, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenCyrWord[] = {
-	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, CYRHYPHENWORD, SpecialHyphen},
-	{p_isnonlatin, 0, A_NEXT, TPS_InHyphenCyrWord, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenCyrWordFirst, 0, NULL},
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, CYRHYPHENWORD, SpecialHyphen}
-};
-
-static TParserStateActionItem actionTPS_InHyphenUWordFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenValue, 0, NULL},
-	{p_isalnum, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenUWord[] = {
-	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HYPHENWORD, SpecialHyphen},
-	{p_isalnum, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenUWordFirst, 0, NULL},
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HYPHENWORD, SpecialHyphen}
-};
-
-static TParserStateActionItem actionTPS_InHyphenValueFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenValueExact, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenValue[] = {
-	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HYPHENWORD, SpecialHyphen},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenValue, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHyphenValueFirst, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenUWordFirst, 0, NULL},
-	{p_isalpha, 0, A_NEXT, TPS_InHyphenUWord, 0, NULL},
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HYPHENWORD, SpecialHyphen}
-};
-
-static TParserStateActionItem actionTPS_InHyphenValueExact[] = {
-	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HYPHENWORD, SpecialHyphen},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenValueExact, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHyphenValueFirst, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InHyphenUWordFirst, 0, NULL},
-	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HYPHENWORD, SpecialHyphen}
-};
-
-static TParserStateActionItem actionTPS_InParseHyphen[] = {
-	{p_isEOF, 0, A_RERUN, TPS_Base, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHyphenLatWordPart, 0, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_InHyphenCyrWordPart, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUnsignedInt, 0, NULL},
-	{p_iseqC, '-', A_PUSH, TPS_InParseHyphenHyphen, 0, NULL},
-	{NULL, 0, A_RERUN, TPS_Base, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InParseHyphenHyphen[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isalnum, 0, A_BINGO | A_CLEAR, TPS_InParseHyphen, SPACE, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenCyrWordPart[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, CYRPARTHYPHENWORD, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_InHyphenCyrWordPart, 0, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHyphenUWordPart, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUWordPart, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_InParseHyphen, CYRPARTHYPHENWORD, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenLatWordPart[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, LATPARTHYPHENWORD, NULL},
-	{p_islatin, 0, A_NEXT, TPS_InHyphenLatWordPart, 0, NULL},
-	{p_isnonlatin, 0, A_NEXT, TPS_InHyphenUWordPart, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUWordPart, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_InParseHyphen, LATPARTHYPHENWORD, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenUWordPart[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, PARTHYPHENWORD, NULL},
-	{p_isalnum, 0, A_NEXT, TPS_InHyphenUWordPart, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_InParseHyphen, PARTHYPHENWORD, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHyphenUnsignedInt[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, UNSIGNEDINT, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenUnsignedInt, 0, NULL},
-	{p_isalpha, 0, A_NEXT, TPS_InHyphenUWordPart, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHDecimalPartFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_InParseHyphen, UNSIGNEDINT, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHDecimalPartFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InHDecimalPart, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHDecimalPart[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHDecimalPart, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHVersionPartFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_InParseHyphen, DECIMAL, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHVersionPartFirst[] = {
-	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
-	{p_isdigit, 0, A_CLEAR, TPS_InHVersionPart, 0, NULL},
-	{NULL, 0, A_POP, TPS_Null, 0, NULL}
-};
-
-static TParserStateActionItem actionTPS_InHVersionPart[] = {
-	{p_isEOF, 0, A_BINGO, TPS_Base, VERSIONNUMBER, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHVersionPart, 0, NULL},
-	{p_iseqC, '.', A_PUSH, TPS_InHVersionPartFirst, 0, NULL},
-	{NULL, 0, A_BINGO, TPS_InParseHyphen, VERSIONNUMBER, NULL}
-};
-
-/*
- * order should be the same as in typedef enum {} TParserState!!
- */
-
-static const TParserStateAction Actions[] = {
-	{TPS_Base, actionTPS_Base},
-	{TPS_InUWord, actionTPS_InUWord},
-	{TPS_InLatWord, actionTPS_InLatWord},
-	{TPS_InCyrWord, actionTPS_InCyrWord},
-	{TPS_InUnsignedInt, actionTPS_InUnsignedInt},
-	{TPS_InSignedIntFirst, actionTPS_InSignedIntFirst},
-	{TPS_InSignedInt, actionTPS_InSignedInt},
-	{TPS_InSpace, actionTPS_InSpace},
-	{TPS_InUDecimalFirst, actionTPS_InUDecimalFirst},
-	{TPS_InUDecimal, actionTPS_InUDecimal},
-	{TPS_InDecimalFirst, actionTPS_InDecimalFirst},
-	{TPS_InDecimal, actionTPS_InDecimal},
-	{TPS_InVerVersion, actionTPS_InVerVersion},
-	{TPS_InSVerVersion, actionTPS_InSVerVersion},
-	{TPS_InVersionFirst, actionTPS_InVersionFirst},
-	{TPS_InVersion, actionTPS_InVersion},
-	{TPS_InMantissaFirst, actionTPS_InMantissaFirst},
-	{TPS_InMantissaSign, actionTPS_InMantissaSign},
-	{TPS_InMantissa, actionTPS_InMantissa},
-	{TPS_InHTMLEntityFirst, actionTPS_InHTMLEntityFirst},
-	{TPS_InHTMLEntity, actionTPS_InHTMLEntity},
-	{TPS_InHTMLEntityNumFirst, actionTPS_InHTMLEntityNumFirst},
-	{TPS_InHTMLEntityNum, actionTPS_InHTMLEntityNum},
-	{TPS_InHTMLEntityEnd, actionTPS_InHTMLEntityEnd},
-	{TPS_InTagFirst, actionTPS_InTagFirst},
-	{TPS_InXMLBegin, actionTPS_InXMLBegin},
-	{TPS_InTagCloseFirst, actionTPS_InTagCloseFirst},
-	{TPS_InTagName, actionTPS_InTagName},
-	{TPS_InTagBeginEnd, actionTPS_InTagBeginEnd},
-	{TPS_InTag, actionTPS_InTag},
-	{TPS_InTagEscapeK, actionTPS_InTagEscapeK},
-	{TPS_InTagEscapeKK, actionTPS_InTagEscapeKK},
-	{TPS_InTagBackSleshed, actionTPS_InTagBackSleshed},
-	{TPS_InTagEnd, actionTPS_InTagEnd},
-	{TPS_InCommentFirst, actionTPS_InCommentFirst},
-	{TPS_InCommentLast, actionTPS_InCommentLast},
-	{TPS_InComment, actionTPS_InComment},
-	{TPS_InCloseCommentFirst, actionTPS_InCloseCommentFirst},
-	{TPS_InCloseCommentLast, actionTPS_InCloseCommentLast},
-	{TPS_InCommentEnd, actionTPS_InCommentEnd},
-	{TPS_InHostFirstDomain, actionTPS_InHostFirstDomain},
-	{TPS_InHostDomainSecond, actionTPS_InHostDomainSecond},
-	{TPS_InHostDomain, actionTPS_InHostDomain},
-	{TPS_InPortFirst, actionTPS_InPortFirst},
-	{TPS_InPort, actionTPS_InPort},
-	{TPS_InHostFirstAN, actionTPS_InHostFirstAN},
-	{TPS_InHost, actionTPS_InHost},
-	{TPS_InEmail, actionTPS_InEmail},
-	{TPS_InFileFirst, actionTPS_InFileFirst},
-	{TPS_InFileTwiddle, actionTPS_InFileTwiddle},
-	{TPS_InPathFirst, actionTPS_InPathFirst},
-	{TPS_InPathFirstFirst, actionTPS_InPathFirstFirst},
-	{TPS_InPathSecond, actionTPS_InPathSecond},
-	{TPS_InFile, actionTPS_InFile},
-	{TPS_InFileNext, actionTPS_InFileNext},
-	{TPS_InURIFirst, actionTPS_InURIFirst},
-	{TPS_InURIStart, actionTPS_InURIStart},
-	{TPS_InURI, actionTPS_InURI},
-	{TPS_InFURL, actionTPS_InFURL},
-	{TPS_InProtocolFirst, actionTPS_InProtocolFirst},
-	{TPS_InProtocolSecond, actionTPS_InProtocolSecond},
-	{TPS_InProtocolEnd, actionTPS_InProtocolEnd},
-	{TPS_InHyphenLatWordFirst, actionTPS_InHyphenLatWordFirst},
-	{TPS_InHyphenLatWord, actionTPS_InHyphenLatWord},
-	{TPS_InHyphenCyrWordFirst, actionTPS_InHyphenCyrWordFirst},
-	{TPS_InHyphenCyrWord, actionTPS_InHyphenCyrWord},
-	{TPS_InHyphenUWordFirst, actionTPS_InHyphenUWordFirst},
-	{TPS_InHyphenUWord, actionTPS_InHyphenUWord},
-	{TPS_InHyphenValueFirst, actionTPS_InHyphenValueFirst},
-	{TPS_InHyphenValue, actionTPS_InHyphenValue},
-	{TPS_InHyphenValueExact, actionTPS_InHyphenValueExact},
-	{TPS_InParseHyphen, actionTPS_InParseHyphen},
-	{TPS_InParseHyphenHyphen, actionTPS_InParseHyphenHyphen},
-	{TPS_InHyphenCyrWordPart, actionTPS_InHyphenCyrWordPart},
-	{TPS_InHyphenLatWordPart, actionTPS_InHyphenLatWordPart},
-	{TPS_InHyphenUWordPart, actionTPS_InHyphenUWordPart},
-	{TPS_InHyphenUnsignedInt, actionTPS_InHyphenUnsignedInt},
-	{TPS_InHDecimalPartFirst, actionTPS_InHDecimalPartFirst},
-	{TPS_InHDecimalPart, actionTPS_InHDecimalPart},
-	{TPS_InHVersionPartFirst, actionTPS_InHVersionPartFirst},
-	{TPS_InHVersionPart, actionTPS_InHVersionPart},
-	{TPS_Null, NULL}
-};
-
-
-bool
-TParserGet(TParser * prs)
-{
-	TParserStateActionItem *item = NULL;
-
-	if (prs->state->posbyte >= prs->lenstr)
-		return false;
-
-	Assert(prs->state);
-	prs->lexeme = prs->str + prs->state->posbyte;
-	prs->state->pushedAtAction = NULL;
-
-	/* look at string */
-	while (prs->state->posbyte <= prs->lenstr)
-	{
-		if (prs->state->posbyte == prs->lenstr)
-			prs->state->charlen = 0;
-		else
-			prs->state->charlen = (prs->charmaxlen == 1) ? prs->charmaxlen :
-				pg_mblen(prs->str + prs->state->posbyte);
-
-		Assert(prs->state->posbyte + prs->state->charlen <= prs->lenstr);
-		Assert(prs->state->state >= TPS_Base && prs->state->state < TPS_Null);
-		Assert(Actions[prs->state->state].state == prs->state->state);
-
-		item = Actions[prs->state->state].action;
-		Assert(item != NULL);
-
-		if (item < prs->state->pushedAtAction)
-			item = prs->state->pushedAtAction;
-
-		/* find action by character class */
-		while (item->isclass)
-		{
-			prs->c = item->c;
-			if (item->isclass(prs) != 0)
-			{
-				if (item > prs->state->pushedAtAction)	/* remember: after
-														 * pushing we were by
-														 * false way */
-					break;
-			}
-			item++;
-		}
-
-		prs->state->pushedAtAction = NULL;
-
-		/* call special handler if exists */
-		if (item->special)
-			item->special(prs);
-
-		/* BINGO, lexeme is found */
-		if (item->flags & A_BINGO)
-		{
-			Assert(item->type > 0);
-			prs->lenbytelexeme = prs->state->lenbytelexeme;
-			prs->lencharlexeme = prs->state->lencharlexeme;
-			prs->state->lenbytelexeme = prs->state->lencharlexeme = 0;
-			prs->type = item->type;
-		}
-
-		/* do various actions by flags */
-		if (item->flags & A_POP)
-		{						/* pop stored state in stack */
-			TParserPosition *ptr = prs->state->prev;
-
-			pfree(prs->state);
-			prs->state = ptr;
-			Assert(prs->state);
-		}
-		else if (item->flags & A_PUSH)
-		{						/* push (store) state in stack */
-			prs->state->pushedAtAction = item;	/* remember where we push */
-			prs->state = newTParserPosition(prs->state);
-		}
-		else if (item->flags & A_CLEAR)
-		{						/* clear previous pushed state */
-			TParserPosition *ptr;
-
-			Assert(prs->state->prev);
-			ptr = prs->state->prev->prev;
-			pfree(prs->state->prev);
-			prs->state->prev = ptr;
-		}
-		else if (item->flags & A_CLRALL)
-		{						/* clear all previous pushed state */
-			TParserPosition *ptr;
-
-			while (prs->state->prev)
-			{
-				ptr = prs->state->prev->prev;
-				pfree(prs->state->prev);
-				prs->state->prev = ptr;
-			}
-		}
-		else if (item->flags & A_MERGE)
-		{						/* merge posinfo with current and pushed state */
-			TParserPosition *ptr = prs->state;
-
-			Assert(prs->state->prev);
-			prs->state = prs->state->prev;
-
-			prs->state->posbyte = ptr->posbyte;
-			prs->state->poschar = ptr->poschar;
-			prs->state->charlen = ptr->charlen;
-			prs->state->lenbytelexeme = ptr->lenbytelexeme;
-			prs->state->lencharlexeme = ptr->lencharlexeme;
-			pfree(ptr);
-		}
-
-		/* set new state if pointed */
-		if (item->tostate != TPS_Null)
-			prs->state->state = item->tostate;
-
-		/* check for go away */
-		if ((item->flags & A_BINGO) || (prs->state->posbyte >= prs->lenstr && (item->flags & A_RERUN) == 0))
-			break;
-
-		/* go to begining of loop if we should rerun or we just restore state */
-		if (item->flags & (A_RERUN | A_POP))
-			continue;
-
-		/* move forward */
-		if (prs->state->charlen)
-		{
-			prs->state->posbyte += prs->state->charlen;
-			prs->state->lenbytelexeme += prs->state->charlen;
-			prs->state->poschar++;
-			prs->state->lencharlexeme++;
-		}
-	}
-
-	return (item && (item->flags & A_BINGO)) ? true : false;
-}
diff --git a/contrib/tsearch2/wordparser/parser.h b/contrib/tsearch2/wordparser/parser.h
deleted file mode 100644
index c40717a80f82..000000000000
--- a/contrib/tsearch2/wordparser/parser.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/wordparser/parser.h,v 1.11 2006/03/11 04:38:30 momjian Exp $ */
-
-#ifndef __PARSER_H__
-#define __PARSER_H__
-
-#include <ctype.h>
-#include <limits.h>
-#include "ts_locale.h"
-
-typedef enum
-{
-	TPS_Base = 0,
-	TPS_InUWord,
-	TPS_InLatWord,
-	TPS_InCyrWord,
-	TPS_InUnsignedInt,
-	TPS_InSignedIntFirst,
-	TPS_InSignedInt,
-	TPS_InSpace,
-	TPS_InUDecimalFirst,
-	TPS_InUDecimal,
-	TPS_InDecimalFirst,
-	TPS_InDecimal,
-	TPS_InVerVersion,
-	TPS_InSVerVersion,
-	TPS_InVersionFirst,
-	TPS_InVersion,
-	TPS_InMantissaFirst,
-	TPS_InMantissaSign,
-	TPS_InMantissa,
-	TPS_InHTMLEntityFirst,
-	TPS_InHTMLEntity,
-	TPS_InHTMLEntityNumFirst,
-	TPS_InHTMLEntityNum,
-	TPS_InHTMLEntityEnd,
-	TPS_InTagFirst,
-	TPS_InXMLBegin,
-	TPS_InTagCloseFirst,
-	TPS_InTagName,
-	TPS_InTagBeginEnd,
-	TPS_InTag,
-	TPS_InTagEscapeK,
-	TPS_InTagEscapeKK,
-	TPS_InTagBackSleshed,
-	TPS_InTagEnd,
-	TPS_InCommentFirst,
-	TPS_InCommentLast,
-	TPS_InComment,
-	TPS_InCloseCommentFirst,
-	TPS_InCloseCommentLast,
-	TPS_InCommentEnd,
-	TPS_InHostFirstDomain,
-	TPS_InHostDomainSecond,
-	TPS_InHostDomain,
-	TPS_InPortFirst,
-	TPS_InPort,
-	TPS_InHostFirstAN,
-	TPS_InHost,
-	TPS_InEmail,
-	TPS_InFileFirst,
-	TPS_InFileTwiddle,
-	TPS_InPathFirst,
-	TPS_InPathFirstFirst,
-	TPS_InPathSecond,
-	TPS_InFile,
-	TPS_InFileNext,
-	TPS_InURIFirst,
-	TPS_InURIStart,
-	TPS_InURI,
-	TPS_InFURL,
-	TPS_InProtocolFirst,
-	TPS_InProtocolSecond,
-	TPS_InProtocolEnd,
-	TPS_InHyphenLatWordFirst,
-	TPS_InHyphenLatWord,
-	TPS_InHyphenCyrWordFirst,
-	TPS_InHyphenCyrWord,
-	TPS_InHyphenUWordFirst,
-	TPS_InHyphenUWord,
-	TPS_InHyphenValueFirst,
-	TPS_InHyphenValue,
-	TPS_InHyphenValueExact,
-	TPS_InParseHyphen,
-	TPS_InParseHyphenHyphen,
-	TPS_InHyphenCyrWordPart,
-	TPS_InHyphenLatWordPart,
-	TPS_InHyphenUWordPart,
-	TPS_InHyphenUnsignedInt,
-	TPS_InHDecimalPartFirst,
-	TPS_InHDecimalPart,
-	TPS_InHVersionPartFirst,
-	TPS_InHVersionPart,
-	TPS_Null					/* last state (fake value) */
-}	TParserState;
-
-/* forward declaration */
-struct TParser;
-
-
-typedef int (*TParserCharTest) (struct TParser *);		/* any p_is* functions
-														 * except p_iseq */
-typedef void (*TParserSpecial) (struct TParser *);		/* special handler for
-														 * special cases... */
-
-typedef struct
-{
-	TParserCharTest isclass;
-	char		c;
-	uint16		flags;
-	TParserState tostate;
-	int			type;
-	TParserSpecial special;
-}	TParserStateActionItem;
-
-typedef struct
-{
-	TParserState state;
-	TParserStateActionItem *action;
-}	TParserStateAction;
-
-typedef struct TParserPosition
-{
-	int			posbyte;		/* position of parser in bytes */
-	int			poschar;		/* osition of parser in characters */
-	int			charlen;		/* length of current char */
-	int			lenbytelexeme;
-	int			lencharlexeme;
-	TParserState state;
-	struct TParserPosition *prev;
-	int			flags;
-	TParserStateActionItem *pushedAtAction;
-}	TParserPosition;
-
-typedef struct TParser
-{
-	/* string and position information */
-	char	   *str;			/* multibyte string */
-	int			lenstr;			/* length of mbstring */
-#ifdef TS_USE_WIDE
-	wchar_t    *wstr;			/* wide character string */
-	int			lenwstr;		/* length of wsting */
-#endif
-
-	/* State of parse */
-	int			charmaxlen;
-	bool		usewide;
-	TParserPosition *state;
-	bool		ignore;
-	bool		wanthost;
-
-	/* silly char */
-	char		c;
-
-	/* out */
-	char	   *lexeme;
-	int			lenbytelexeme;
-	int			lencharlexeme;
-	int			type;
-
-}	TParser;
-
-
-TParser    *TParserInit(char *, int);
-bool		TParserGet(TParser *);
-void		TParserClose(TParser *);
-
-#endif
diff --git a/contrib/tsearch2/wparser.c b/contrib/tsearch2/wparser.c
deleted file mode 100644
index 82b4add5321e..000000000000
--- a/contrib/tsearch2/wparser.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * interface functions to parser
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include <ctype.h>
-
-#include "catalog/pg_type.h"
-#include "executor/spi.h"
-#include "fmgr.h"
-#include "funcapi.h"
-#include "utils/array.h"
-#include "utils/memutils.h"
-
-#include "wparser.h"
-#include "ts_cfg.h"
-#include "snmap.h"
-#include "common.h"
-
-/*********top interface**********/
-
-static Oid	current_parser_id = InvalidOid;
-
-void
-init_prs(Oid id, WParserInfo * prs)
-{
-	Oid			arg[1];
-	bool		isnull;
-	Datum		pars[1];
-	int			stat;
-	void	   *plan;
-	char		buf[1024],
-			   *nsp;
-
-	arg[0] = OIDOID;
-	pars[0] = ObjectIdGetDatum(id);
-
-	memset(prs, 0, sizeof(WParserInfo));
-	SPI_connect();
-	nsp = get_namespace(TSNSP_FunctionOid);
-	sprintf(buf, "select prs_start, prs_nexttoken, prs_end, prs_lextype, prs_headline from %s.pg_ts_parser where oid = $1", nsp);
-	pfree(nsp);
-	plan = SPI_prepare(buf, 1, arg);
-	if (!plan)
-		ts_error(ERROR, "SPI_prepare() failed");
-
-	stat = SPI_execp(plan, pars, " ", 1);
-	if (stat < 0)
-		ts_error(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed > 0)
-	{
-		Oid			oid = InvalidOid;
-
-		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-		fmgr_info_cxt(oid, &(prs->start_info), TopMemoryContext);
-		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 2, &isnull));
-		fmgr_info_cxt(oid, &(prs->getlexeme_info), TopMemoryContext);
-		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 3, &isnull));
-		fmgr_info_cxt(oid, &(prs->end_info), TopMemoryContext);
-		prs->lextype = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 4, &isnull));
-		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 5, &isnull));
-		fmgr_info_cxt(oid, &(prs->headline_info), TopMemoryContext);
-		prs->prs_id = id;
-	}
-	else
-		ts_error(ERROR, "No parser with id %d", id);
-	SPI_freeplan(plan);
-	SPI_finish();
-}
-
-typedef struct
-{
-	WParserInfo *last_prs;
-	int			len;
-	int			reallen;
-	WParserInfo *list;
-	SNMap		name2id_map;
-}	PrsList;
-
-static PrsList PList = {NULL, 0, 0, NULL, {0, 0, NULL}};
-
-void
-reset_prs(void)
-{
-	freeSNMap(&(PList.name2id_map));
-	if (PList.list)
-		free(PList.list);
-	memset(&PList, 0, sizeof(PrsList));
-}
-
-static int
-compareprs(const void *a, const void *b)
-{
-	if (((WParserInfo *) a)->prs_id == ((WParserInfo *) b)->prs_id)
-		return 0;
-	return (((WParserInfo *) a)->prs_id < ((WParserInfo *) b)->prs_id) ? -1 : 1;
-}
-
-WParserInfo *
-findprs(Oid id)
-{
-	/* last used prs */
-	if (PList.last_prs && PList.last_prs->prs_id == id)
-		return PList.last_prs;
-
-	/* already used prs */
-	if (PList.len != 0)
-	{
-		WParserInfo key;
-
-		key.prs_id = id;
-		PList.last_prs = bsearch(&key, PList.list, PList.len, sizeof(WParserInfo), compareprs);
-		if (PList.last_prs != NULL)
-			return PList.last_prs;
-	}
-
-	/* last chance */
-	if (PList.len == PList.reallen)
-	{
-		WParserInfo *tmp;
-		int			reallen = (PList.reallen) ? 2 * PList.reallen : 16;
-
-		tmp = (WParserInfo *) realloc(PList.list, sizeof(WParserInfo) * reallen);
-		if (!tmp)
-			ts_error(ERROR, "No memory");
-		PList.reallen = reallen;
-		PList.list = tmp;
-	}
-	init_prs(id, &(PList.list[PList.len]) );
-	PList.last_prs = &(PList.list[PList.len]);
-	PList.len++;
-	qsort(PList.list, PList.len, sizeof(WParserInfo), compareprs);
-	return findprs(id); /* qsort changed order!! */ ;
-}
-
-Oid
-name2id_prs(text *name)
-{
-	Oid			arg[1];
-	bool		isnull;
-	Datum		pars[1];
-	int			stat;
-	Oid			id = findSNMap_t(&(PList.name2id_map), name);
-	char		buf[1024],
-			   *nsp;
-	void	   *plan;
-
-	arg[0] = TEXTOID;
-	pars[0] = PointerGetDatum(name);
-
-	if (id)
-		return id;
-
-	SPI_connect();
-	nsp = get_namespace(TSNSP_FunctionOid);
-	sprintf(buf, "select oid from %s.pg_ts_parser where prs_name = $1", nsp);
-	pfree(nsp);
-	plan = SPI_prepare(buf, 1, arg);
-	if (!plan)
-		ts_error(ERROR, "SPI_prepare() failed");
-
-	stat = SPI_execp(plan, pars, " ", 1);
-	if (stat < 0)
-		ts_error(ERROR, "SPI_execp return %d", stat);
-	if (SPI_processed > 0)
-		id = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
-	else
-		ts_error(ERROR, "No parser '%s'", text2char(name));
-	SPI_freeplan(plan);
-	SPI_finish();
-	addSNMap_t(&(PList.name2id_map), name, id);
-	return id;
-}
-
-
-/******sql-level interface******/
-typedef struct
-{
-	int			cur;
-	LexDescr   *list;
-}	TypeStorage;
-
-static void
-setup_firstcall(FunctionCallInfo fcinfo, FuncCallContext *funcctx, Oid prsid)
-{
-	TupleDesc	tupdesc;
-	MemoryContext oldcontext;
-	TypeStorage *st;
-	WParserInfo *prs = findprs(prsid);
-
-	oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-	st = (TypeStorage *) palloc(sizeof(TypeStorage));
-	st->cur = 0;
-	st->list = (LexDescr *) DatumGetPointer(
-					OidFunctionCall1(prs->lextype, PointerGetDatum(prs->prs))
-		);
-	funcctx->user_fctx = (void *) st;
-	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-		elog(ERROR, "return type must be a row type");
-	tupdesc = CreateTupleDescCopy(tupdesc);
-	funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
-	MemoryContextSwitchTo(oldcontext);
-}
-
-static Datum
-process_call(FuncCallContext *funcctx)
-{
-	TypeStorage *st;
-
-	st = (TypeStorage *) funcctx->user_fctx;
-	if (st->list && st->list[st->cur].lexid)
-	{
-		Datum		result;
-		char	   *values[3];
-		char		txtid[16];
-		HeapTuple	tuple;
-
-		values[0] = txtid;
-		sprintf(txtid, "%d", st->list[st->cur].lexid);
-		values[1] = st->list[st->cur].alias;
-		values[2] = st->list[st->cur].descr;
-
-		tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
-		result = HeapTupleGetDatum(tuple);
-
-		pfree(values[1]);
-		pfree(values[2]);
-		st->cur++;
-		return result;
-	}
-	else
-	{
-		if (st->list)
-			pfree(st->list);
-		pfree(st);
-	}
-	return (Datum) 0;
-}
-
-PG_FUNCTION_INFO_V1(token_type);
-Datum		token_type(PG_FUNCTION_ARGS);
-
-Datum
-token_type(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	SET_FUNCOID();
-	if (SRF_IS_FIRSTCALL())
-	{
-		funcctx = SRF_FIRSTCALL_INIT();
-		setup_firstcall(fcinfo, funcctx, PG_GETARG_OID(0));
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-
-	if ((result = process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
-
-PG_FUNCTION_INFO_V1(token_type_byname);
-Datum		token_type_byname(PG_FUNCTION_ARGS);
-Datum
-token_type_byname(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	SET_FUNCOID();
-	if (SRF_IS_FIRSTCALL())
-	{
-		text	   *name = PG_GETARG_TEXT_P(0);
-
-		funcctx = SRF_FIRSTCALL_INIT();
-		setup_firstcall(fcinfo, funcctx, name2id_prs(name));
-		PG_FREE_IF_COPY(name, 0);
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-
-	if ((result = process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
-
-PG_FUNCTION_INFO_V1(token_type_current);
-Datum		token_type_current(PG_FUNCTION_ARGS);
-Datum
-token_type_current(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	SET_FUNCOID();
-	if (SRF_IS_FIRSTCALL())
-	{
-		funcctx = SRF_FIRSTCALL_INIT();
-		if (current_parser_id == InvalidOid)
-			current_parser_id = name2id_prs(char2text("default"));
-		setup_firstcall(fcinfo, funcctx, current_parser_id);
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-
-	if ((result = process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
-
-
-PG_FUNCTION_INFO_V1(set_curprs);
-Datum		set_curprs(PG_FUNCTION_ARGS);
-Datum
-set_curprs(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	findprs(PG_GETARG_OID(0));
-	current_parser_id = PG_GETARG_OID(0);
-	PG_RETURN_VOID();
-}
-
-PG_FUNCTION_INFO_V1(set_curprs_byname);
-Datum		set_curprs_byname(PG_FUNCTION_ARGS);
-Datum
-set_curprs_byname(PG_FUNCTION_ARGS)
-{
-	text	   *name = PG_GETARG_TEXT_P(0);
-
-	SET_FUNCOID();
-	DirectFunctionCall1(
-						set_curprs,
-						ObjectIdGetDatum(name2id_prs(name))
-		);
-	PG_FREE_IF_COPY(name, 0);
-	PG_RETURN_VOID();
-}
-
-typedef struct
-{
-	int			type;
-	char	   *lexeme;
-}	LexemeEntry;
-
-typedef struct
-{
-	int			cur;
-	int			len;
-	LexemeEntry *list;
-}	PrsStorage;
-
-
-static void
-prs_setup_firstcall(FunctionCallInfo fcinfo, FuncCallContext *funcctx,
-					int prsid, text *txt)
-{
-	TupleDesc	tupdesc;
-	MemoryContext oldcontext;
-	PrsStorage *st;
-	WParserInfo *prs = findprs(prsid);
-	char	   *lex = NULL;
-	int			llen = 0,
-				type = 0;
-
-	oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-	st = (PrsStorage *) palloc(sizeof(PrsStorage));
-	st->cur = 0;
-	st->len = 16;
-	st->list = (LexemeEntry *) palloc(sizeof(LexemeEntry) * st->len);
-
-	prs->prs = (void *) DatumGetPointer(
-										FunctionCall2(
-													  &(prs->start_info),
-											   PointerGetDatum(VARDATA(txt)),
-									   Int32GetDatum(VARSIZE(txt) - VARHDRSZ)
-													  )
-		);
-
-	while ((type = DatumGetInt32(FunctionCall3(
-											   &(prs->getlexeme_info),
-											   PointerGetDatum(prs->prs),
-											   PointerGetDatum(&lex),
-											   PointerGetDatum(&llen)))) != 0)
-	{
-
-		if (st->cur >= st->len)
-		{
-			st->len = 2 * st->len;
-			st->list = (LexemeEntry *) repalloc(st->list, sizeof(LexemeEntry) * st->len);
-		}
-		st->list[st->cur].lexeme = palloc(llen + 1);
-		memcpy(st->list[st->cur].lexeme, lex, llen);
-		st->list[st->cur].lexeme[llen] = '\0';
-		st->list[st->cur].type = type;
-		st->cur++;
-	}
-
-	FunctionCall1(
-				  &(prs->end_info),
-				  PointerGetDatum(prs->prs)
-		);
-
-	st->len = st->cur;
-	st->cur = 0;
-
-	funcctx->user_fctx = (void *) st;
-	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-		elog(ERROR, "return type must be a row type");
-	tupdesc = CreateTupleDescCopy(tupdesc);
-	funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
-	MemoryContextSwitchTo(oldcontext);
-}
-
-static Datum
-prs_process_call(FuncCallContext *funcctx)
-{
-	PrsStorage *st;
-
-	st = (PrsStorage *) funcctx->user_fctx;
-	if (st->cur < st->len)
-	{
-		Datum		result;
-		char	   *values[2];
-		char		tid[16];
-		HeapTuple	tuple;
-
-		values[0] = tid;
-		sprintf(tid, "%d", st->list[st->cur].type);
-		values[1] = st->list[st->cur].lexeme;
-		tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
-		result = HeapTupleGetDatum(tuple);
-
-		pfree(values[1]);
-		st->cur++;
-		return result;
-	}
-	else
-	{
-		if (st->list)
-			pfree(st->list);
-		pfree(st);
-	}
-	return (Datum) 0;
-}
-
-
-
-PG_FUNCTION_INFO_V1(parse);
-Datum		parse(PG_FUNCTION_ARGS);
-Datum
-parse(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	SET_FUNCOID();
-	if (SRF_IS_FIRSTCALL())
-	{
-		text	   *txt = PG_GETARG_TEXT_P(1);
-
-		funcctx = SRF_FIRSTCALL_INIT();
-		prs_setup_firstcall(fcinfo, funcctx, PG_GETARG_OID(0), txt);
-		PG_FREE_IF_COPY(txt, 1);
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-
-	if ((result = prs_process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
-
-PG_FUNCTION_INFO_V1(parse_byname);
-Datum		parse_byname(PG_FUNCTION_ARGS);
-Datum
-parse_byname(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	SET_FUNCOID();
-	if (SRF_IS_FIRSTCALL())
-	{
-		text	   *name = PG_GETARG_TEXT_P(0);
-		text	   *txt = PG_GETARG_TEXT_P(1);
-
-		funcctx = SRF_FIRSTCALL_INIT();
-		prs_setup_firstcall(fcinfo, funcctx, name2id_prs(name), txt);
-		PG_FREE_IF_COPY(name, 0);
-		PG_FREE_IF_COPY(txt, 1);
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-
-	if ((result = prs_process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
-
-
-PG_FUNCTION_INFO_V1(parse_current);
-Datum		parse_current(PG_FUNCTION_ARGS);
-Datum
-parse_current(PG_FUNCTION_ARGS)
-{
-	FuncCallContext *funcctx;
-	Datum		result;
-
-	SET_FUNCOID();
-	if (SRF_IS_FIRSTCALL())
-	{
-		text	   *txt = PG_GETARG_TEXT_P(0);
-
-		funcctx = SRF_FIRSTCALL_INIT();
-		if (current_parser_id == InvalidOid)
-			current_parser_id = name2id_prs(char2text("default"));
-		prs_setup_firstcall(fcinfo, funcctx, current_parser_id, txt);
-		PG_FREE_IF_COPY(txt, 0);
-	}
-
-	funcctx = SRF_PERCALL_SETUP();
-
-	if ((result = prs_process_call(funcctx)) != (Datum) 0)
-		SRF_RETURN_NEXT(funcctx, result);
-	SRF_RETURN_DONE(funcctx);
-}
-
-PG_FUNCTION_INFO_V1(headline);
-Datum		headline(PG_FUNCTION_ARGS);
-Datum
-headline(PG_FUNCTION_ARGS)
-{
-	text	   *in = PG_GETARG_TEXT_P(1);
-	QUERYTYPE  *query = (QUERYTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(2));
-	text	   *opt = (PG_NARGS() > 3 && PG_GETARG_POINTER(3)) ? PG_GETARG_TEXT_P(3) : NULL;
-	HLPRSTEXT	prs;
-	text	   *out;
-	TSCfgInfo  *cfg;
-	WParserInfo *prsobj;
-
-	SET_FUNCOID();
-	cfg = findcfg(PG_GETARG_OID(0));
-	prsobj = findprs(cfg->prs_id);
-
-	memset(&prs, 0, sizeof(HLPRSTEXT));
-	prs.lenwords = 32;
-	prs.words = (HLWORD *) palloc(sizeof(HLWORD) * prs.lenwords);
-	hlparsetext(cfg, &prs, query, VARDATA(in), VARSIZE(in) - VARHDRSZ);
-
-
-	FunctionCall3(
-				  &(prsobj->headline_info),
-				  PointerGetDatum(&prs),
-				  PointerGetDatum(opt),
-				  PointerGetDatum(query)
-		);
-
-	out = genhl(&prs);
-
-	PG_FREE_IF_COPY(in, 1);
-	PG_FREE_IF_COPY(query, 2);
-	if (opt)
-		PG_FREE_IF_COPY(opt, 3);
-	pfree(prs.words);
-	pfree(prs.startsel);
-	pfree(prs.stopsel);
-
-	PG_RETURN_POINTER(out);
-}
-
-
-PG_FUNCTION_INFO_V1(headline_byname);
-Datum		headline_byname(PG_FUNCTION_ARGS);
-Datum
-headline_byname(PG_FUNCTION_ARGS)
-{
-	text	   *cfg = PG_GETARG_TEXT_P(0);
-
-	Datum		out;
-
-	SET_FUNCOID();
-	out = DirectFunctionCall4(
-							  headline,
-							  ObjectIdGetDatum(name2id_cfg(cfg)),
-							  PG_GETARG_DATUM(1),
-							  PG_GETARG_DATUM(2),
-				(PG_NARGS() > 3) ? PG_GETARG_DATUM(3) : PointerGetDatum(NULL)
-		);
-
-	PG_FREE_IF_COPY(cfg, 0);
-	PG_RETURN_DATUM(out);
-}
-
-PG_FUNCTION_INFO_V1(headline_current);
-Datum		headline_current(PG_FUNCTION_ARGS);
-Datum
-headline_current(PG_FUNCTION_ARGS)
-{
-	SET_FUNCOID();
-	PG_RETURN_DATUM(DirectFunctionCall4(
-										headline,
-										ObjectIdGetDatum(get_currcfg()),
-										PG_GETARG_DATUM(0),
-										PG_GETARG_DATUM(1),
-				(PG_NARGS() > 2) ? PG_GETARG_DATUM(2) : PointerGetDatum(NULL)
-										));
-}
diff --git a/contrib/tsearch2/wparser.h b/contrib/tsearch2/wparser.h
deleted file mode 100644
index c3c44151f0e7..000000000000
--- a/contrib/tsearch2/wparser.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __WPARSER_H__
-#define __WPARSER_H__
-#include "postgres.h"
-#include "fmgr.h"
-
-typedef struct
-{
-	Oid			prs_id;
-	FmgrInfo	start_info;
-	FmgrInfo	getlexeme_info;
-	FmgrInfo	end_info;
-	FmgrInfo	headline_info;
-	Oid			lextype;
-	void	   *prs;
-}	WParserInfo;
-
-void		init_prs(Oid id, WParserInfo * prs);
-WParserInfo *findprs(Oid id);
-Oid			name2id_prs(text *name);
-void		reset_prs(void);
-
-
-typedef struct
-{
-	int			lexid;
-	char	   *alias;
-	char	   *descr;
-}	LexDescr;
-
-#endif
diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c
deleted file mode 100644
index b20909ce5bca..000000000000
--- a/contrib/tsearch2/wparser_def.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * default word parser
- * Teodor Sigaev <teodor@sigaev.ru>
- */
-#include "postgres.h"
-
-#include "utils/builtins.h"
-
-#include "dict.h"
-#include "wparser.h"
-#include "common.h"
-#include "ts_cfg.h"
-#include "wordparser/parser.h"
-#include "wordparser/deflex.h"
-
-PG_FUNCTION_INFO_V1(prsd_lextype);
-Datum		prsd_lextype(PG_FUNCTION_ARGS);
-
-Datum
-prsd_lextype(PG_FUNCTION_ARGS)
-{
-	LexDescr   *descr = (LexDescr *) palloc(sizeof(LexDescr) * (LASTNUM + 1));
-	int			i;
-
-	for (i = 1; i <= LASTNUM; i++)
-	{
-		descr[i - 1].lexid = i;
-		descr[i - 1].alias = pstrdup(tok_alias[i]);
-		descr[i - 1].descr = pstrdup(lex_descr[i]);
-	}
-
-	descr[LASTNUM].lexid = 0;
-
-	PG_RETURN_POINTER(descr);
-}
-
-PG_FUNCTION_INFO_V1(prsd_start);
-Datum		prsd_start(PG_FUNCTION_ARGS);
-Datum
-prsd_start(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(TParserInit((char *) PG_GETARG_POINTER(0), PG_GETARG_INT32(1)));
-}
-
-PG_FUNCTION_INFO_V1(prsd_getlexeme);
-Datum		prsd_getlexeme(PG_FUNCTION_ARGS);
-Datum
-prsd_getlexeme(PG_FUNCTION_ARGS)
-{
-	TParser    *p = (TParser *) PG_GETARG_POINTER(0);
-	char	  **t = (char **) PG_GETARG_POINTER(1);
-	int		   *tlen = (int *) PG_GETARG_POINTER(2);
-
-	if (!TParserGet(p))
-		PG_RETURN_INT32(0);
-
-	*t = p->lexeme;
-	*tlen = p->lenbytelexeme;
-
-	PG_RETURN_INT32(p->type);
-}
-
-PG_FUNCTION_INFO_V1(prsd_end);
-Datum		prsd_end(PG_FUNCTION_ARGS);
-Datum
-prsd_end(PG_FUNCTION_ARGS)
-{
-	TParser    *p = (TParser *) PG_GETARG_POINTER(0);
-
-	TParserClose(p);
-	PG_RETURN_VOID();
-}
-
-#define LEAVETOKEN(x)	( (x)==12 )
-#define COMPLEXTOKEN(x) ( (x)==5 || (x)==15 || (x)==16 || (x)==17 )
-#define ENDPUNCTOKEN(x) ( (x)==12 )
-
-
-#define TS_IDIGNORE(x) ( (x)==13 || (x)==14 || (x)==12 || (x)==23 )
-#define HLIDIGNORE(x) ( (x)==5 || (x)==13 || (x)==15 || (x)==16 || (x)==17 )
-#define HTMLHLIDIGNORE(x) ( (x)==5 || (x)==15 || (x)==16 || (x)==17 )
-#define NONWORDTOKEN(x) ( (x)==12 || HLIDIGNORE(x) )
-#define NOENDTOKEN(x)	( NONWORDTOKEN(x) || (x)==7 || (x)==8 || (x)==20 || (x)==21 || (x)==22 || TS_IDIGNORE(x) )
-
-typedef struct
-{
-	HLWORD	   *words;
-	int			len;
-}	hlCheck;
-
-static bool
-checkcondition_HL(void *checkval, ITEM * val)
-{
-	int			i;
-
-	for (i = 0; i < ((hlCheck *) checkval)->len; i++)
-	{
-		if (((hlCheck *) checkval)->words[i].item == val)
-			return true;
-	}
-	return false;
-}
-
-
-static bool
-hlCover(HLPRSTEXT * prs, QUERYTYPE * query, int *p, int *q)
-{
-	int			i,
-				j;
-	ITEM	   *item = GETQUERY(query);
-	int			pos = *p;
-
-	*q = 0;
-	*p = 0x7fffffff;
-
-	for (j = 0; j < query->size; j++)
-	{
-		if (item->type != VAL)
-		{
-			item++;
-			continue;
-		}
-		for (i = pos; i < prs->curwords; i++)
-		{
-			if (prs->words[i].item == item)
-			{
-				if (i > *q)
-					*q = i;
-				break;
-			}
-		}
-		item++;
-	}
-
-	if (*q == 0)
-		return false;
-
-	item = GETQUERY(query);
-	for (j = 0; j < query->size; j++)
-	{
-		if (item->type != VAL)
-		{
-			item++;
-			continue;
-		}
-		for (i = *q; i >= pos; i--)
-		{
-			if (prs->words[i].item == item)
-			{
-				if (i < *p)
-					*p = i;
-				break;
-			}
-		}
-		item++;
-	}
-
-	if (*p <= *q)
-	{
-		hlCheck		ch;
-
-		ch.words = &(prs->words[*p]);
-		ch.len = *q - *p + 1;
-		if (TS_execute(GETQUERY(query), &ch, false, checkcondition_HL))
-			return true;
-		else
-		{
-			(*p)++;
-			return hlCover(prs, query, p, q);
-		}
-	}
-
-	return false;
-}
-
-PG_FUNCTION_INFO_V1(prsd_headline);
-Datum		prsd_headline(PG_FUNCTION_ARGS);
-Datum
-prsd_headline(PG_FUNCTION_ARGS)
-{
-	HLPRSTEXT  *prs = (HLPRSTEXT *) PG_GETARG_POINTER(0);
-	text	   *opt = (text *) PG_GETARG_POINTER(1);	/* can't be toasted */
-	QUERYTYPE  *query = (QUERYTYPE *) PG_GETARG_POINTER(2);		/* can't be toasted */
-
-	/* from opt + start and and tag */
-	int			min_words = 15;
-	int			max_words = 35;
-	int			shortword = 3;
-
-	int			p = 0,
-				q = 0;
-	int			bestb = -1,
-				beste = -1;
-	int			bestlen = -1;
-	int			pose = 0,
-				posb,
-				poslen,
-				curlen;
-
-	int			i;
-	int			highlight = 0;
-
-	/* config */
-	prs->startsel = NULL;
-	prs->stopsel = NULL;
-	if (opt)
-	{
-		Map		   *map,
-				   *mptr;
-
-		parse_cfgdict(opt, &map);
-		mptr = map;
-
-		while (mptr && mptr->key)
-		{
-			if (pg_strcasecmp(mptr->key, "MaxWords") == 0)
-				max_words = pg_atoi(mptr->value, 4, 1);
-			else if (pg_strcasecmp(mptr->key, "MinWords") == 0)
-				min_words = pg_atoi(mptr->value, 4, 1);
-			else if (pg_strcasecmp(mptr->key, "ShortWord") == 0)
-				shortword = pg_atoi(mptr->value, 4, 1);
-			else if (pg_strcasecmp(mptr->key, "StartSel") == 0)
-				prs->startsel = pstrdup(mptr->value);
-			else if (pg_strcasecmp(mptr->key, "StopSel") == 0)
-				prs->stopsel = pstrdup(mptr->value);
-			else if (pg_strcasecmp(mptr->key, "HighlightAll") == 0)
-				highlight = (
-							 pg_strcasecmp(mptr->value, "1") == 0 ||
-							 pg_strcasecmp(mptr->value, "on") == 0 ||
-							 pg_strcasecmp(mptr->value, "true") == 0 ||
-							 pg_strcasecmp(mptr->value, "t") == 0 ||
-							 pg_strcasecmp(mptr->value, "y") == 0 ||
-							 pg_strcasecmp(mptr->value, "yes") == 0) ?
-					1 : 0;
-
-			pfree(mptr->key);
-			pfree(mptr->value);
-
-			mptr++;
-		}
-		pfree(map);
-
-		if (highlight == 0)
-		{
-			if (min_words >= max_words)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("MinWords should be less than MaxWords")));
-			if (min_words <= 0)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("MinWords should be positive")));
-			if (shortword < 0)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("ShortWord should be >= 0")));
-		}
-	}
-
-	if (highlight == 0)
-	{
-		while (hlCover(prs, query, &p, &q))
-		{
-			/* find cover len in words */
-			curlen = 0;
-			poslen = 0;
-			for (i = p; i <= q && curlen < max_words; i++)
-			{
-				if (!NONWORDTOKEN(prs->words[i].type))
-					curlen++;
-				if (prs->words[i].item && !prs->words[i].repeated)
-					poslen++;
-				pose = i;
-			}
-
-			if (poslen < bestlen && !(NOENDTOKEN(prs->words[beste].type) || prs->words[beste].len <= shortword))
-			{
-				/* best already finded, so try one more cover */
-				p++;
-				continue;
-			}
-
-			posb = p;
-			if (curlen < max_words)
-			{					/* find good end */
-				for (i = i - 1; i < prs->curwords && curlen < max_words; i++)
-				{
-					if (i != q)
-					{
-						if (!NONWORDTOKEN(prs->words[i].type))
-							curlen++;
-						if (prs->words[i].item && !prs->words[i].repeated)
-							poslen++;
-					}
-					pose = i;
-					if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword)
-						continue;
-					if (curlen >= min_words)
-						break;
-				}
-				if (curlen < min_words && i >= prs->curwords)
-				{				/* got end of text and our cover is shoter
-								 * than min_words */
-					for (i = p; i >= 0; i--)
-					{
-						if (!NONWORDTOKEN(prs->words[i].type))
-							curlen++;
-						if (prs->words[i].item && !prs->words[i].repeated)
-							poslen++;
-						if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword)
-							continue;
-						if (curlen >= min_words)
-							break;
-					}
-					posb = (i >= 0) ? i : 0;
-				}
-			}
-			else
-			{					/* shorter cover :((( */
-				for (; curlen > min_words; i--)
-				{
-					if (!NONWORDTOKEN(prs->words[i].type))
-						curlen--;
-					if (prs->words[i].item && !prs->words[i].repeated)
-						poslen--;
-					pose = i;
-					if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword)
-						continue;
-					break;
-				}
-			}
-
-			if (bestlen < 0 || (poslen > bestlen && !(NOENDTOKEN(prs->words[pose].type) || prs->words[pose].len <= shortword)) ||
-				(bestlen >= 0 && !(NOENDTOKEN(prs->words[pose].type) || prs->words[pose].len <= shortword) &&
-				 (NOENDTOKEN(prs->words[beste].type) || prs->words[beste].len <= shortword)))
-			{
-				bestb = posb;
-				beste = pose;
-				bestlen = poslen;
-			}
-
-			p++;
-		}
-
-		if (bestlen < 0)
-		{
-			curlen = 0;
-			for (i = 0; i < prs->curwords && curlen < min_words; i++)
-			{
-				if (!NONWORDTOKEN(prs->words[i].type))
-					curlen++;
-				pose = i;
-			}
-			bestb = 0;
-			beste = pose;
-		}
-	}
-	else
-	{
-		bestb = 0;
-		beste = prs->curwords - 1;
-	}
-
-	for (i = bestb; i <= beste; i++)
-	{
-		if (prs->words[i].item)
-			prs->words[i].selected = 1;
-		if (highlight == 0)
-		{
-			if (HLIDIGNORE(prs->words[i].type))
-				prs->words[i].replace = 1;
-		}
-		else
-		{
-			if (HTMLHLIDIGNORE(prs->words[i].type))
-				prs->words[i].replace = 1;
-		}
-
-		prs->words[i].in = (prs->words[i].repeated) ? 0 : 1;
-	}
-
-	if (!prs->startsel)
-		prs->startsel = pstrdup("<b>");
-	if (!prs->stopsel)
-		prs->stopsel = pstrdup("</b>");
-	prs->startsellen = strlen(prs->startsel);
-	prs->stopsellen = strlen(prs->stopsel);
-
-	PG_RETURN_POINTER(prs);
-}
diff --git a/contrib/uuid-ossp/.gitignore b/contrib/uuid-ossp/.gitignore
new file mode 100644
index 000000000000..ece095ad7bb2
--- /dev/null
+++ b/contrib/uuid-ossp/.gitignore
@@ -0,0 +1 @@
+/uuid-ossp.sql
diff --git a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile
new file mode 100644
index 000000000000..4ed83537dd7c
--- /dev/null
+++ b/contrib/uuid-ossp/Makefile
@@ -0,0 +1,19 @@
+# $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
+
+MODULE_big = uuid-ossp
+OBJS = uuid-ossp.o
+DATA_built = uuid-ossp.sql
+DATA = uninstall_uuid-ossp.sql
+
+SHLIB_LINK += $(OSSP_UUID_LIBS)
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/uuid-ossp
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/contrib/uuid-ossp/uninstall_uuid-ossp.sql b/contrib/uuid-ossp/uninstall_uuid-ossp.sql
new file mode 100644
index 000000000000..75c9f3678f36
--- /dev/null
+++ b/contrib/uuid-ossp/uninstall_uuid-ossp.sql
@@ -0,0 +1,16 @@
+/* $PostgreSQL: pgsql/contrib/uuid-ossp/uninstall_uuid-ossp.sql,v 1.3 2007/11/13 04:24:29 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get dropped.
+SET search_path = public;
+
+DROP FUNCTION uuid_nil();
+DROP FUNCTION uuid_ns_dns();
+DROP FUNCTION uuid_ns_url();
+DROP FUNCTION uuid_ns_oid();
+DROP FUNCTION uuid_ns_x500();
+
+DROP FUNCTION uuid_generate_v1();
+DROP FUNCTION uuid_generate_v1mc();
+DROP FUNCTION uuid_generate_v3(namespace uuid, name text);
+DROP FUNCTION uuid_generate_v4();
+DROP FUNCTION uuid_generate_v5(namespace uuid, name text);
diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c
new file mode 100644
index 000000000000..456ec5728b85
--- /dev/null
+++ b/contrib/uuid-ossp/uuid-ossp.c
@@ -0,0 +1,251 @@
+/*-------------------------------------------------------------------------
+ *
+ * UUID generation functions using the OSSP UUID library
+ *
+ * Copyright (c) 2007-2008 PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.7 2008/01/01 20:31:21 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
+#include "utils/uuid.h"
+
+/*
+ * There's some confusion over the location of the uuid.h header file.
+ * On Debian, it's installed as ossp/uuid.h, while on Fedora, or if you
+ * install ossp-uuid from a tarball, it's installed as uuid.h. Don't know
+ * what other systems do.
+ */
+#ifdef HAVE_OSSP_UUID_H
+#include <ossp/uuid.h>
+#else
+#ifdef HAVE_UUID_H
+#include <uuid.h>
+#else
+#error OSSP uuid.h not found
+#endif
+#endif
+
+/* better both be 16 */
+#if (UUID_LEN != UUID_LEN_BIN)
+#error UUID length mismatch
+#endif
+
+
+PG_MODULE_MAGIC;
+
+
+Datum		uuid_nil(PG_FUNCTION_ARGS);
+Datum		uuid_ns_dns(PG_FUNCTION_ARGS);
+Datum		uuid_ns_url(PG_FUNCTION_ARGS);
+Datum		uuid_ns_oid(PG_FUNCTION_ARGS);
+Datum		uuid_ns_x500(PG_FUNCTION_ARGS);
+
+Datum		uuid_generate_v1(PG_FUNCTION_ARGS);
+Datum		uuid_generate_v1mc(PG_FUNCTION_ARGS);
+Datum		uuid_generate_v3(PG_FUNCTION_ARGS);
+Datum		uuid_generate_v4(PG_FUNCTION_ARGS);
+Datum		uuid_generate_v5(PG_FUNCTION_ARGS);
+
+
+PG_FUNCTION_INFO_V1(uuid_nil);
+PG_FUNCTION_INFO_V1(uuid_ns_dns);
+PG_FUNCTION_INFO_V1(uuid_ns_url);
+PG_FUNCTION_INFO_V1(uuid_ns_oid);
+PG_FUNCTION_INFO_V1(uuid_ns_x500);
+
+PG_FUNCTION_INFO_V1(uuid_generate_v1);
+PG_FUNCTION_INFO_V1(uuid_generate_v1mc);
+PG_FUNCTION_INFO_V1(uuid_generate_v3);
+PG_FUNCTION_INFO_V1(uuid_generate_v4);
+PG_FUNCTION_INFO_V1(uuid_generate_v5);
+
+static void
+pguuid_complain(uuid_rc_t rc)
+{
+	char	*err = uuid_error(rc);
+
+	if (err != NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+				 errmsg("OSSP uuid library failure: %s", err)));
+	else
+		ereport(ERROR,
+				(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+				 errmsg("OSSP uuid library failure: error code %d", rc)));
+}
+
+static char *
+uuid_to_string(const uuid_t * uuid)
+{
+	char	   *buf = palloc(UUID_LEN_STR + 1);
+	void	   *ptr = buf;
+	size_t		len = UUID_LEN_STR + 1;
+	uuid_rc_t	rc;
+
+	rc = uuid_export(uuid, UUID_FMT_STR, &ptr, &len);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+
+	return buf;
+}
+
+
+static void
+string_to_uuid(const char *str, uuid_t * uuid)
+{
+	uuid_rc_t	rc;
+
+	rc = uuid_import(uuid, UUID_FMT_STR, str, UUID_LEN_STR + 1);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+}
+
+
+static Datum
+special_uuid_value(const char *name)
+{
+	uuid_t	   *uuid;
+	char	   *str;
+	uuid_rc_t	rc;
+
+	rc = uuid_create(&uuid);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+	rc = uuid_load(uuid, name);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+	str = uuid_to_string(uuid);
+	rc = uuid_destroy(uuid);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+
+	return DirectFunctionCall1(uuid_in, CStringGetDatum(str));
+}
+
+
+Datum
+uuid_nil(PG_FUNCTION_ARGS)
+{
+	return special_uuid_value("nil");
+}
+
+
+Datum
+uuid_ns_dns(PG_FUNCTION_ARGS)
+{
+	return special_uuid_value("ns:DNS");
+}
+
+
+Datum
+uuid_ns_url(PG_FUNCTION_ARGS)
+{
+	return special_uuid_value("ns:URL");
+}
+
+
+Datum
+uuid_ns_oid(PG_FUNCTION_ARGS)
+{
+	return special_uuid_value("ns:OID");
+}
+
+
+Datum
+uuid_ns_x500(PG_FUNCTION_ARGS)
+{
+	return special_uuid_value("ns:X500");
+}
+
+
+static Datum
+uuid_generate_internal(int mode, const uuid_t * ns, const char *name)
+{
+	uuid_t	   *uuid;
+	char	   *str;
+	uuid_rc_t	rc;
+
+	rc = uuid_create(&uuid);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+	rc = uuid_make(uuid, mode, ns, name);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+	str = uuid_to_string(uuid);
+	rc = uuid_destroy(uuid);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+
+	return DirectFunctionCall1(uuid_in, CStringGetDatum(str));
+}
+
+
+Datum
+uuid_generate_v1(PG_FUNCTION_ARGS)
+{
+	return uuid_generate_internal(UUID_MAKE_V1, NULL, NULL);
+}
+
+
+Datum
+uuid_generate_v1mc(PG_FUNCTION_ARGS)
+{
+	return uuid_generate_internal(UUID_MAKE_V1 | UUID_MAKE_MC, NULL, NULL);
+}
+
+
+static Datum
+uuid_generate_v35_internal(int mode, pg_uuid_t *ns, text *name)
+{
+	uuid_t	   *ns_uuid;
+	Datum		result;
+	uuid_rc_t	rc;
+
+	rc = uuid_create(&ns_uuid);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+	string_to_uuid(DatumGetCString(DirectFunctionCall1(uuid_out, UUIDPGetDatum(ns))),
+				   ns_uuid);
+
+	result = uuid_generate_internal(mode,
+									ns_uuid,
+	   DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(name))));
+
+	rc = uuid_destroy(ns_uuid);
+	if (rc != UUID_RC_OK)
+		pguuid_complain(rc);
+
+	return result;
+}
+
+
+Datum
+uuid_generate_v3(PG_FUNCTION_ARGS)
+{
+	pg_uuid_t  *ns = PG_GETARG_UUID_P(0);
+	text	   *name = PG_GETARG_TEXT_P(1);
+
+	return uuid_generate_v35_internal(UUID_MAKE_V3, ns, name);
+}
+
+
+Datum
+uuid_generate_v4(PG_FUNCTION_ARGS)
+{
+	return uuid_generate_internal(UUID_MAKE_V4, NULL, NULL);
+}
+
+
+Datum
+uuid_generate_v5(PG_FUNCTION_ARGS)
+{
+	pg_uuid_t  *ns = PG_GETARG_UUID_P(0);
+	text	   *name = PG_GETARG_TEXT_P(1);
+
+	return uuid_generate_v35_internal(UUID_MAKE_V5, ns, name);
+}
diff --git a/contrib/uuid-ossp/uuid-ossp.sql.in b/contrib/uuid-ossp/uuid-ossp.sql.in
new file mode 100644
index 000000000000..e59882f45629
--- /dev/null
+++ b/contrib/uuid-ossp/uuid-ossp.sql.in
@@ -0,0 +1,54 @@
+/* $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.sql.in,v 1.6 2007/11/13 04:24:29 momjian Exp $ */
+
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
+
+CREATE OR REPLACE FUNCTION uuid_nil()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_nil'
+IMMUTABLE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_ns_dns()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_ns_dns'
+IMMUTABLE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_ns_url()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_ns_url'
+IMMUTABLE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_ns_oid()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_ns_oid'
+IMMUTABLE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_ns_x500()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_ns_x500'
+IMMUTABLE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_generate_v1()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_generate_v1'
+VOLATILE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_generate_v1mc()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_generate_v1mc'
+VOLATILE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_generate_v3(namespace uuid, name text)
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_generate_v3'
+IMMUTABLE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_generate_v4()
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_generate_v4'
+VOLATILE STRICT LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION uuid_generate_v5(namespace uuid, name text)
+RETURNS uuid
+AS 'MODULE_PATHNAME', 'uuid_generate_v5'
+IMMUTABLE STRICT LANGUAGE C;
diff --git a/contrib/vacuumlo/.gitignore b/contrib/vacuumlo/.gitignore
new file mode 100644
index 000000000000..07f6ab4fd7c9
--- /dev/null
+++ b/contrib/vacuumlo/.gitignore
@@ -0,0 +1 @@
+/vacuumlo
diff --git a/contrib/xml2/.gitignore b/contrib/xml2/.gitignore
index 204c193baf87..5ef9dbf4d4b7 100644
--- a/contrib/xml2/.gitignore
+++ b/contrib/xml2/.gitignore
@@ -1 +1,3 @@
-pgxml.sql
+/pgxml.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index b96defa5d604..b7c91e59d94d 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -2,12 +2,13 @@
 
 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/README.xml2 b/contrib/xml2/README.xml2
deleted file mode 100755
index c2e71703860f..000000000000
--- a/contrib/xml2/README.xml2
+++ /dev/null
@@ -1,265 +0,0 @@
-XML-handling functions for PostgreSQL
-=====================================
-
-Development of this module was sponsored by Torchbox Ltd. (www.torchbox.com)
-It has the same BSD licence as PostgreSQL.
-
-This version of the XML functions provides both XPath querying and
-XSLT functionality. There is also a new table function which allows
-the straightforward return of multiple XML results. Note that the current code
-doesn't take any particular care over character sets - this is
-something that should be fixed at some point!
-
-Installation
-------------
-
-The current build process will only work if the files are in
-contrib/xml2 in a PostgreSQL 7.3 or later source tree which has been
-configured and built (If you alter the subdir value in the Makefile
-you can place it in a different directory in a PostgreSQL tree).
-
-Before you begin, just check the Makefile, and then just 'make' and
-'make install'.
-
-By default, this module requires both libxml2 and libxslt to be installed
-on your system.  If you do not have libxslt or do not want to use XSLT
-functions, you must edit the Makefile to not build the XSLT functions,
-as directed in its comments; and edit pgxml.sql.in to remove the XSLT
-function declarations, as directed in its comments.
-
-Description of functions
-------------------------
-
-The first set of functions are straightforward XML parsing and XPath queries:
-
-xml_is_well_formed(document) RETURNS bool
-
-This parses the document text in its parameter and returns true if the
-document is well-formed XML.  (Note: before PostgreSQL 8.2, this function
-was called xml_valid().  That is the wrong name since validity and
-well-formedness have different meanings in XML.  The old name is still
-available, but is deprecated and will be removed in 8.3.)
-
-xpath_string(document,query) RETURNS text
-xpath_number(document,query) RETURNS float4
-xpath_bool(document,query) RETURNS bool
-
-These functions evaluate the XPath query on the supplied document, and
-cast the result to the specified type.
-
-
-xpath_nodeset(document,query,toptag,itemtag) RETURNS text
-
-This evaluates query on document and wraps the result in XML tags. If
-the result is multivalued, the output will look like:
-
-<toptag>
-<itemtag>Value 1 which could be an XML fragment</itemtag>
-<itemtag>Value 2....</itemtag>
-</toptag>
-
-If either toptag or itemtag is an empty string, the relevant tag is omitted.
-There are also wrapper functions for this operation:
-
-xpath_nodeset(document,query) RETURNS text omits both tags.
-xpath_nodeset(document,query,itemtag) RETURNS text omits toptag.
-
-
-xpath_list(document,query,seperator) RETURNS text
-
-This function returns multiple values seperated by the specified
-seperator, e.g. Value 1,Value 2,Value 3 if seperator=','.
-
-xpath_list(document,query) RETURNS text
-
-This is a wrapper for the above function that uses ',' as the seperator.
-
-
-xpath_table
------------
-
-This is a table function which evaluates a set of XPath queries on
-each of a set of documents and returns the results as a table. The
-primary key field from the original document table is returned as the
-first column of the result so that the resultset from xpath_table can
-be readily used in joins.
-
-The function itself takes 5 arguments, all text.
-
-xpath_table(key,document,relation,xpaths,criteria)
-
-key - the name of the "key" field - this is just a field to be used as
-the first column of the output table i.e. it identifies the record from
-which each output row came (see note below about multiple values).
-
-document - the name of the field containing the XML document
-
-relation - the name of the table or view containing the documents
-
-xpaths - multiple xpath expressions separated by |
-
-criteria - The contents of the where clause. This needs to be specified,
-so use "true" or "1=1" here if you want to process all the rows in the
-relation.
-
-NB These parameters (except the XPath strings) are just substituted
-into a plain SQL SELECT statement, so you have some flexibility - the
-statement is
-
-SELECT <key>,<document> FROM <relation> WHERE <criteria>
-
-so those parameters can be *anything* valid in those particular
-locations. The result from this SELECT needs to return exactly two
-columns (which it will unless you try to list multiple fields for key
-or document). Beware that this simplistic approach requires that you
-validate any user-supplied values to avoid SQL injection attacks.
-
-Using the function
-
-The function has to be used in a FROM expression. This gives the following
-form:
-
-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);
-
-The AS clause defines the names and types of the columns in the
-virtual table. If there are more XPath queries than result columns,
-the extra queries will be ignored. If there are more result columns
-than XPath queries, the extra columns will be NULL.
-
-Note that I've said in this example that pages is an integer.  The
-function deals internally with string representations, so when you say
-you want an integer in the output, it will take the string
-representation of the XPath result and use PostgreSQL input functions
-to transform it into an integer (or whatever type the AS clause
-requests). An error will result if it can't do this - for example if
-the result is empty - so you may wish to just stick to 'text' as the
-column type if you think your data has any problems.
-
-The select statement doesn't need to use * alone - it can reference the
-columns by name or join them to other tables. The function produces a
-virtual table with which you can perform any operation you wish (e.g.
-aggregation, joining, sorting etc). So we could also have:
-
-SELECT t.title, p.fullname, p.email 
-FROM xpath_table('article_id','article_xml','articles',
-            '/article/title|/article/author/@id',
-            'xpath_string(article_xml,''/article/@date'') > ''2003-03-20'' ')
-            AS t(article_id integer, title text, author_id integer), 
-     tblPeopleInfo AS p 
-WHERE t.author_id = p.person_id;
-
-as a more complicated example. Of course, you could wrap all
-of this in a view for convenience.
-
-Multivalued results
-
-The xpath_table function assumes that the results of each XPath query
-might be multi-valued, so the number of rows returned by the function
-may not be the same as the number of input documents. The first row
-returned contains the first result from each query, the second row the
-second result from each query. If one of the queries has fewer values
-than the others, NULLs will be returned instead.
-
-In some cases, a user will know that a given XPath query will return
-only a single result (perhaps a unique document identifier) - if used
-alongside an XPath query returning multiple results, the single-valued
-result will appear only on the first row of the result. The solution
-to this is to use the key field as part of a join against a simpler
-XPath query. As an example:
-
-
-CREATE TABLE test
-(
-  id int4 NOT NULL,
-  xml text,
-  CONSTRAINT pk PRIMARY KEY (id)
-) 
-WITHOUT OIDS;
-
-INSERT INTO test VALUES (1, '<doc num="C1">
-<line num="L1"><a>1</a><b>2</b><c>3</c></line>
-<line num="L2"><a>11</a><b>22</b><c>33</c></line>
-</doc>');
-
-INSERT INTO test VALUES (2, '<doc num="C2">
-<line num="L1"><a>111</a><b>222</b><c>333</c></line>
-<line num="L2"><a>111</a><b>222</b><c>333</c></line>
-</doc>');
-
-
-The query:
-
-SELECT * FROM  xpath_table('id','xml','test', 
-'/doc/@num|/doc/line/@num|/doc/line/a|/doc/line/b|/doc/line/c','1=1') 
-AS t(id int4, doc_num varchar(10), line_num varchar(10), val1 int4, 
-val2 int4, val3 int4)
-WHERE id = 1 ORDER BY doc_num, line_num
-
-
-Gives the result:
-
- id | doc_num | line_num | val1 | val2 | val3
-----+---------+----------+------+------+------
-  1 | C1      | L1       |    1 |    2 |    3
-  1 |         | L2       |   11 |   22 |   33
-
-To get doc_num on every line, the solution is to use two invocations
-of xpath_table and join the results:
-
-SELECT t.*,i.doc_num FROM 
-  xpath_table('id','xml','test',
-   '/doc/line/@num|/doc/line/a|/doc/line/b|/doc/line/c','1=1') 
-        AS t(id int4, line_num varchar(10), val1 int4, val2 int4, val3 int4),
-  xpath_table('id','xml','test','/doc/@num','1=1') 
-        AS i(id int4, doc_num varchar(10))
-WHERE i.id=t.id AND i.id=1
-ORDER BY doc_num, line_num;
-
-which gives the desired result:
-
- id | line_num | val1 | val2 | val3 | doc_num
-----+----------+------+------+------+---------
-  1 | L1       |    1 |    2 |    3 | C1
-  1 | L2       |   11 |   22 |   33 | C1
-(2 rows)
-
-
-
-XSLT functions
---------------
-
-The following functions are available if libxslt is installed (this is
-not currently detected automatically, so you will have to amend the
-Makefile)
-
-xslt_process(document,stylesheet,paramlist) RETURNS text
-
-This function appplies the XSL stylesheet to the document and returns
-the transformed result. The paramlist is a list of parameter
-assignments to be used in the transformation, specified in the form
-'a=1,b=2'. Note that this is also proof-of-concept code and the
-parameter parsing is very simple-minded (e.g. parameter values cannot
-contain commas!)
-
-Also note that if either the document or stylesheet values do not
-begin with a < then they will be treated as URLs and libxslt will
-fetch them. It thus follows that you can use xslt_process as a means
-to fetch the contents of URLs - you should be aware of the security
-implications of this.
-
-There is also a two-parameter version of xslt_process which does not
-pass any parameters to the transformation.
-
-
-Feedback
---------
-
-If you have any comments or suggestions, please do contact me at
-jgray@azuli.co.uk. Unfortunately, this isn't my main job, so I can't
-guarantee a rapid response to your query!
diff --git a/contrib/xml2/expected/xml2.out b/contrib/xml2/expected/xml2.out
new file mode 100644
index 000000000000..8bc741e364f3
--- /dev/null
+++ b/contrib/xml2/expected/xml2.out
@@ -0,0 +1,162 @@
+--
+-- 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));
+-- possible security exploit
+SELECT xslt_process('<xml><foo>Hello from XML</foo></xml>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:sax="http://icl.com/saxon"
+      extension-element-prefixes="sax">
+
+  <xsl:template match="//foo">
+    <sax:output href="0wn3d.txt" method="text">
+      <xsl:value-of select="'0wn3d via xml2 extension and libxslt'"/>
+      <xsl:apply-templates/>
+    </sax:output>
+  </xsl:template>
+</xsl:stylesheet>$$);
+ERROR:  failed to apply stylesheet
diff --git a/contrib/xml2/expected/xml2_1.out b/contrib/xml2/expected/xml2_1.out
new file mode 100644
index 000000000000..5f267b4cd62e
--- /dev/null
+++ b/contrib/xml2/expected/xml2_1.out
@@ -0,0 +1,124 @@
+--
+-- 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));
+-- possible security exploit
+SELECT xslt_process('<xml><foo>Hello from XML</foo></xml>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:sax="http://icl.com/saxon"
+      extension-element-prefixes="sax">
+
+  <xsl:template match="//foo">
+    <sax:output href="0wn3d.txt" method="text">
+      <xsl:value-of select="'0wn3d via xml2 extension and libxslt'"/>
+      <xsl:apply-templates/>
+    </sax:output>
+  </xsl:template>
+</xsl:stylesheet>$$);
+ERROR:  xslt_process() is not available without libxslt
diff --git a/contrib/xml2/pgxml.sql.in b/contrib/xml2/pgxml.sql.in
index 09957d6ce09a..defb5280ffd5 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.11.2.1 2010/03/01 18:08:16 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 000000000000..71d3535d14f4
--- /dev/null
+++ b/contrib/xml2/sql/xml2.sql
@@ -0,0 +1,97 @@
+--
+-- 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));
+
+-- possible security exploit
+SELECT xslt_process('<xml><foo>Hello from XML</foo></xml>',
+$$<xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:sax="http://icl.com/saxon"
+      extension-element-prefixes="sax">
+
+  <xsl:template match="//foo">
+    <sax:output href="0wn3d.txt" method="text">
+      <xsl:value-of select="'0wn3d via xml2 extension and libxslt'"/>
+      <xsl:apply-templates/>
+    </sax:output>
+  </xsl:template>
+</xsl:stylesheet>$$);
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 8bafd9022598..b63c29f79735 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -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,52 @@ 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 */
+/* exported for use by xslt_proc.c */
 
-#define ERRBUF_SIZE 200
+void		pgxml_parser_init(void);
 
-/* memory handling passthrough functions (e.g. palloc, pstrdup are
-   currently macros, and the others might become so...) */
+/* workspace for pgxml_xpath() */
 
-static void *
-pgxml_palloc(size_t size)
+typedef struct
 {
-/*	elog(DEBUG1,"Alloc %d in CMC %p",size,CurrentMemoryContext); */
-	return palloc(size);
-}
+	xmlDocPtr	doctree;
+	xmlXPathContextPtr ctxt;
+	xmlXPathObjectPtr res;
+} xpath_workspace;
 
-static void *
-pgxml_repalloc(void *ptr, size_t size)
-{
-/*	elog(DEBUG1,"ReAlloc in CMC %p",CurrentMemoryContext);*/
-	return repalloc(ptr, size);
-}
+/* local declarations */
 
-static void
-pgxml_pfree(void *ptr)
-{
-/*	elog(DEBUG1,"Free in CMC %p",CurrentMemoryContext); */
-	pfree(ptr);
-}
+static xmlChar *pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
+				   xmlChar *toptagname, xmlChar *septagname,
+				   xmlChar *plainsep);
 
-static char *
-pgxml_pstrdup(const char *string)
-{
-	return pstrdup(string);
-}
+static text *pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar *toptag,
+					 xmlChar *septag, xmlChar *plainsep);
 
-/* The error handling function. This formats an error message and sets
- * a flag - an ereport will be issued prior to return
- */
+static xmlChar *pgxml_texttoxmlchar(text *textstring);
 
-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 xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar *xpath,
+									 xpath_workspace *workspace);
 
-		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 void cleanup_workspace(xpath_workspace *workspace);
 
-	}
-	memset(errbuf, 0, ERRBUF_SIZE);
-}
+#define GET_STR(textp) DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(textp)))
 
-/* 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("%s", 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 +92,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 +131,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 +164,6 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 	{
 		for (i = 0; i < nodeset->nodeNr; i++)
 		{
-
 			if (plainsep != NULL)
 			{
 				xmlBufferWriteCHAR(buf,
@@ -265,8 +175,6 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 			}
 			else
 			{
-
-
 				if ((septagname != NULL) && (xmlStrlen(septagname) > 0))
 				{
 					xmlBufferWriteChar(buf, "<");
@@ -303,47 +211,40 @@ 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
 xpath_nodeset(PG_FUNCTION_ARGS)
 {
-	xmlChar    *xpath,
-			   *toptag,
-			   *septag;
-	int32		pathsize;
-	text
-			   *xpathsupp,
-			   *xpres;
-
-	/* PG_GETARG_TEXT_P(0) is document buffer */
-	xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
+	text	   *document = PG_GETARG_TEXT_P(0);
+	text	   *xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
+	xmlChar    *toptag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2));
+	xmlChar    *septag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(3));
+	xmlChar    *xpath;
+	text	   *xpres;
+	xmlXPathObjectPtr res;
+	xpath_workspace workspace;
 
-	toptag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2));
-	septag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(3));
+	xpath = pgxml_texttoxmlchar(xpathsupp);
 
-	pathsize = VARSIZE(xpathsupp) - VARHDRSZ;
+	res = pgxml_xpath(document, xpath, &workspace);
 
-	xpath = pgxml_texttoxmlchar(xpathsupp);
+	xpres = pgxml_result_to_text(res, toptag, septag, NULL);
 
-	xpres = pgxml_result_to_text(
-								 pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
-								 toptag, septag, NULL);
+	cleanup_workspace(&workspace);
 
-	/* xmlCleanupParser(); done by result_to_text routine */
 	pfree(xpath);
 
 	if (xpres == NULL)
@@ -351,35 +252,31 @@ 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
 xpath_list(PG_FUNCTION_ARGS)
 {
-	xmlChar    *xpath,
-			   *plainsep;
-	int32		pathsize;
-	text
-			   *xpathsupp,
-			   *xpres;
-
-	/* PG_GETARG_TEXT_P(0) is document buffer */
-	xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
+	text	   *document = PG_GETARG_TEXT_P(0);
+	text	   *xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
+	xmlChar    *plainsep = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2));
+	xmlChar    *xpath;
+	text	   *xpres;
+	xmlXPathObjectPtr res;
+	xpath_workspace workspace;
 
-	plainsep = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2));
+	xpath = pgxml_texttoxmlchar(xpathsupp);
 
-	pathsize = VARSIZE(xpathsupp) - VARHDRSZ;
+	res = pgxml_xpath(document, xpath, &workspace);
 
-	xpath = pgxml_texttoxmlchar(xpathsupp);
+	xpres = pgxml_result_to_text(res, NULL, NULL, plainsep);
 
-	xpres = pgxml_result_to_text(
-								 pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
-								 NULL, NULL, plainsep);
+	cleanup_workspace(&workspace);
 
-	/* xmlCleanupParser(); done by result_to_text routine */
 	pfree(xpath);
 
 	if (xpres == NULL)
@@ -393,14 +290,13 @@ PG_FUNCTION_INFO_V1(xpath_string);
 Datum
 xpath_string(PG_FUNCTION_ARGS)
 {
+	text	   *document = PG_GETARG_TEXT_P(0);
+	text	   *xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
 	xmlChar    *xpath;
 	int32		pathsize;
-	text
-			   *xpathsupp,
-			   *xpres;
-
-	/* PG_GETARG_TEXT_P(0) is document buffer */
-	xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
+	text	   *xpres;
+	xmlXPathObjectPtr res;
+	xpath_workspace workspace;
 
 	pathsize = VARSIZE(xpathsupp) - VARHDRSZ;
 
@@ -411,16 +307,17 @@ xpath_string(PG_FUNCTION_ARGS)
 	/* We could try casting to string using the libxml function? */
 
 	xpath = (xmlChar *) palloc(pathsize + 9);
-	memcpy((char *) (xpath + 7), VARDATA(xpathsupp), pathsize);
 	strncpy((char *) xpath, "string(", 7);
+	memcpy((char *) (xpath + 7), VARDATA(xpathsupp), pathsize);
 	xpath[pathsize + 7] = ')';
 	xpath[pathsize + 8] = '\0';
 
-	xpres = pgxml_result_to_text(
-								 pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
-								 NULL, NULL, NULL);
+	res = pgxml_xpath(document, xpath, &workspace);
+
+	xpres = pgxml_result_to_text(res, NULL, NULL, NULL);
+
+	cleanup_workspace(&workspace);
 
-	xmlCleanupParser();
 	pfree(xpath);
 
 	if (xpres == NULL)
@@ -434,38 +331,30 @@ PG_FUNCTION_INFO_V1(xpath_number);
 Datum
 xpath_number(PG_FUNCTION_ARGS)
 {
+	text	   *document = PG_GETARG_TEXT_P(0);
+	text	   *xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
 	xmlChar    *xpath;
-	int32		pathsize;
-	text
-			   *xpathsupp;
-
 	float4		fRes;
-
 	xmlXPathObjectPtr res;
-
-	/* PG_GETARG_TEXT_P(0) is document buffer */
-	xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
-
-	pathsize = VARSIZE(xpathsupp) - VARHDRSZ;
+	xpath_workspace workspace;
 
 	xpath = pgxml_texttoxmlchar(xpathsupp);
 
-	res = pgxml_xpath(PG_GETARG_TEXT_P(0), xpath);
+	res = pgxml_xpath(document, xpath, &workspace);
+
 	pfree(xpath);
 
 	if (res == NULL)
-	{
-		xmlCleanupParser();
 		PG_RETURN_NULL();
-	}
 
 	fRes = xmlXPathCastToNumber(res);
-	xmlCleanupParser();
+
+	cleanup_workspace(&workspace);
+
 	if (xmlXPathIsNaN(fRes))
 		PG_RETURN_NULL();
 
 	PG_RETURN_FLOAT4(fRes);
-
 }
 
 
@@ -474,97 +363,90 @@ PG_FUNCTION_INFO_V1(xpath_bool);
 Datum
 xpath_bool(PG_FUNCTION_ARGS)
 {
+	text	   *document = PG_GETARG_TEXT_P(0);
+	text	   *xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
 	xmlChar    *xpath;
-	int32		pathsize;
-	text
-			   *xpathsupp;
-
 	int			bRes;
-
 	xmlXPathObjectPtr res;
-
-	/* PG_GETARG_TEXT_P(0) is document buffer */
-	xpathsupp = PG_GETARG_TEXT_P(1);	/* XPath expression */
-
-	pathsize = VARSIZE(xpathsupp) - VARHDRSZ;
+	xpath_workspace workspace;
 
 	xpath = pgxml_texttoxmlchar(xpathsupp);
 
-	res = pgxml_xpath(PG_GETARG_TEXT_P(0), xpath);
+	res = pgxml_xpath(document, xpath, &workspace);
+
 	pfree(xpath);
 
 	if (res == NULL)
-	{
-		xmlCleanupParser();
 		PG_RETURN_BOOL(false);
-	}
 
 	bRes = xmlXPathCastToBoolean(res);
-	xmlCleanupParser();
-	PG_RETURN_BOOL(bRes);
 
+	cleanup_workspace(&workspace);
+
+	PG_RETURN_BOOL(bRes);
 }
 
 
 
 /* Core function to evaluate XPath query */
 
-xmlXPathObjectPtr
-pgxml_xpath(text *document, xmlChar *xpath)
+static xmlXPathObjectPtr
+pgxml_xpath(text *document, xmlChar *xpath, xpath_workspace *workspace)
 {
-
-	xmlDocPtr	doctree;
-	xmlXPathContextPtr ctxt;
+	int32		docsize = VARSIZE(document) - VARHDRSZ;
 	xmlXPathObjectPtr res;
-
 	xmlXPathCompExprPtr comppath;
 
-	int32		docsize;
-
-
-	docsize = VARSIZE(document) - VARHDRSZ;
+	workspace->doctree = NULL;
+	workspace->ctxt = NULL;
+	workspace->res = NULL;
 
 	pgxml_parser_init();
 
-	doctree = xmlParseMemory((char *) VARDATA(document), docsize);
-	if (doctree == NULL)
-	{							/* not well-formed */
-		return NULL;
-	}
-
-	ctxt = xmlXPathNewContext(doctree);
-	ctxt->node = xmlDocGetRootElement(doctree);
+	workspace->doctree = xmlParseMemory((char *) VARDATA(document), docsize);
+	if (workspace->doctree == NULL)
+		return NULL;			/* not well-formed */
 
+	workspace->ctxt = xmlXPathNewContext(workspace->doctree);
+	workspace->ctxt->node = xmlDocGetRootElement(workspace->doctree);
 
 	/* compile the path */
 	comppath = xmlXPathCompile(xpath);
 	if (comppath == NULL)
 	{
-		xmlCleanupParser();
-		xmlFreeDoc(doctree);
-		elog_error(ERROR, "XPath Syntax Error", 1);
-
-		return NULL;
+		cleanup_workspace(workspace);
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"XPath Syntax Error");
 	}
 
 	/* Now evaluate the path expression. */
-	res = xmlXPathCompiledEval(comppath, ctxt);
+	res = xmlXPathCompiledEval(comppath, workspace->ctxt);
+	workspace->res = res;
+
 	xmlXPathFreeCompExpr(comppath);
 
 	if (res == NULL)
-	{
-		xmlXPathFreeContext(ctxt);
-		/* xmlCleanupParser(); */
-		xmlFreeDoc(doctree);
+		cleanup_workspace(workspace);
 
-		return NULL;
-	}
-	/* xmlFreeDoc(doctree); */
 	return res;
 }
 
-text
-		   *
+/* Clean up after processing the result of pgxml_xpath() */
+static void
+cleanup_workspace(xpath_workspace *workspace)
+{
+	if (workspace->res)
+		xmlXPathFreeObject(workspace->res);
+	workspace->res = NULL;
+	if (workspace->ctxt)
+		xmlXPathFreeContext(workspace->ctxt);
+	workspace->ctxt = NULL;
+	if (workspace->doctree)
+		xmlFreeDoc(workspace->doctree);
+	workspace->doctree = NULL;
+}
+
+static text *
 pgxml_result_to_text(xmlXPathObjectPtr res,
 					 xmlChar *toptag,
 					 xmlChar *septag,
@@ -574,10 +456,8 @@ pgxml_result_to_text(xmlXPathObjectPtr res,
 	text	   *xpres;
 
 	if (res == NULL)
-	{
-		xmlCleanupParser();
 		return NULL;
-	}
+
 	switch (res->type)
 	{
 		case XPATH_NODESET:
@@ -595,37 +475,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 = GET_STR(PG_GETARG_TEXT_P(0));
+	char	   *xmlfield = GET_STR(PG_GETARG_TEXT_P(1));
+	char	   *relname = GET_STR(PG_GETARG_TEXT_P(2));
+	char	   *xpathset = GET_STR(PG_GETARG_TEXT_P(3));
+	char	   *condition = GET_STR(PG_GETARG_TEXT_P(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 +515,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 +527,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 +554,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);
 
@@ -697,6 +568,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
@@ -712,26 +589,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);
@@ -741,30 +619,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),
@@ -772,10 +648,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 */
@@ -783,13 +659,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 */
@@ -799,10 +672,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;
 
@@ -819,9 +691,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
@@ -832,24 +702,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. */
@@ -862,11 +727,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;
@@ -882,7 +748,6 @@ xpath_table(PG_FUNCTION_ARGS)
 								resstr = xmlStrdup((const xmlChar *) "<unsupported/>");
 						}
 
-
 						/*
 						 * Insert this into the appropriate column in the
 						 * result tuple.
@@ -891,20 +756,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);
@@ -915,8 +777,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();
@@ -931,5 +791,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 055bfcc16413..f8cc749423ae 100644
--- a/contrib/xml2/xslt_proc.c
+++ b/contrib/xml2/xslt_proc.c
@@ -12,6 +12,9 @@
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
+#include "utils/xml.h"
+
+#ifdef USE_LIBXSLT
 
 /* libxml includes */
 
@@ -23,22 +26,30 @@
 
 #include <libxslt/xslt.h>
 #include <libxslt/xsltInternals.h>
+#include <libxslt/security.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() */
 
+#define GET_STR(textp) DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(textp)))
 
-#define MAXPARAMS 20			/* must be even, see parse_params() */
+#endif /* USE_LIBXSLT */
 
 
 PG_FUNCTION_INFO_V1(xslt_process);
@@ -46,18 +57,25 @@ PG_FUNCTION_INFO_V1(xslt_process);
 Datum
 xslt_process(PG_FUNCTION_ARGS)
 {
-	text	   *doct = PG_GETARG_TEXT_P(0);
-	text	   *ssheet = PG_GETARG_TEXT_P(1);
-	text	   *paramstr;
+#ifdef USE_LIBXSLT
+
 	const char *params[MAXPARAMS + 1];	/* +1 for the terminator */
 	xsltStylesheetPtr stylesheet = NULL;
 	xmlDocPtr	doctree;
 	xmlDocPtr	restree;
-	xmlDocPtr	ssdoc = NULL;
+	xmlDocPtr	ssdoc;
+	xsltSecurityPrefsPtr xslt_sec_prefs;
+	bool		xslt_sec_prefs_error;
+	xsltTransformContextPtr xslt_ctxt;
 	xmlChar    *resstr;
 	int			resstat;
 	int			reslen;
 
+	text	   *doct = PG_GETARG_TEXT_P(0);
+	text	   *ssheet = PG_GETARG_TEXT_P(1);
+	text	   *paramstr;
+	text	   *tres;
+
 	if (fcinfo->nargs == 3)
 	{
 		paramstr = PG_GETARG_TEXT_P(2);
@@ -70,65 +88,119 @@ xslt_process(PG_FUNCTION_ARGS)
 	/* Setup parser */
 	pgxml_parser_init();
 
-	/* Check to see if document is a file or a literal */
-
-	if (VARDATA(doct)[0] == '<')
-		doctree = xmlParseMemory((char *) VARDATA(doct), VARSIZE(doct) - VARHDRSZ);
-	else
-		doctree = xmlParseFile(text_to_cstring(doct));
+	/* Parse document */
+	doctree = xmlParseMemory((char *) VARDATA(doct),
+							 VARSIZE(doct) - VARHDRSZ);
 
 	if (doctree == NULL)
-	{
-		xmlCleanupParser();
-		elog_error(ERROR, "error parsing XML document", 0);
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"error parsing XML document");
 
-		PG_RETURN_NULL();
+	/* Same for stylesheet */
+	ssdoc = xmlParseMemory((char *) VARDATA(ssheet),
+						   VARSIZE(ssheet) - VARHDRSZ);
+
+	if (ssdoc == NULL)
+	{
+		xmlFreeDoc(doctree);
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"error parsing stylesheet as XML document");
 	}
 
-	/* Same for stylesheet */
-	if (VARDATA(ssheet)[0] == '<')
+	/* After this call we need not free ssdoc separately */
+	stylesheet = xsltParseStylesheetDoc(ssdoc);
+
+	if (stylesheet == NULL)
 	{
-		ssdoc = xmlParseMemory((char *) VARDATA(ssheet),
-							   VARSIZE(ssheet) - VARHDRSZ);
-		if (ssdoc == NULL)
-		{
-			xmlFreeDoc(doctree);
-			xmlCleanupParser();
-			elog_error(ERROR, "error parsing stylesheet as XML document", 0);
-			PG_RETURN_NULL();
-		}
+		xmlFreeDoc(doctree);
+		xsltCleanupGlobals();
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"failed to parse stylesheet");
+	}
 
-		stylesheet = xsltParseStylesheetDoc(ssdoc);
+	xslt_ctxt = xsltNewTransformContext(stylesheet, doctree);
+
+	xslt_sec_prefs_error = false;
+	if ((xslt_sec_prefs = xsltNewSecurityPrefs()) == NULL)
+		xslt_sec_prefs_error = true;
+
+	if (xsltSetSecurityPrefs(xslt_sec_prefs, XSLT_SECPREF_READ_FILE,
+							 xsltSecurityForbid) != 0)
+		xslt_sec_prefs_error = true;
+	if (xsltSetSecurityPrefs(xslt_sec_prefs, XSLT_SECPREF_WRITE_FILE,
+							 xsltSecurityForbid) != 0)
+		xslt_sec_prefs_error = true;
+	if (xsltSetSecurityPrefs(xslt_sec_prefs, XSLT_SECPREF_CREATE_DIRECTORY,
+							 xsltSecurityForbid) != 0)
+		xslt_sec_prefs_error = true;
+	if (xsltSetSecurityPrefs(xslt_sec_prefs, XSLT_SECPREF_READ_NETWORK,
+							 xsltSecurityForbid) != 0)
+		xslt_sec_prefs_error = true;
+	if (xsltSetSecurityPrefs(xslt_sec_prefs, XSLT_SECPREF_WRITE_NETWORK,
+							 xsltSecurityForbid) != 0)
+		xslt_sec_prefs_error = true;
+	if (xsltSetCtxtSecurityPrefs(xslt_sec_prefs, xslt_ctxt) != 0)
+		xslt_sec_prefs_error = true;
+
+	if (xslt_sec_prefs_error)
+	{
+		xsltFreeStylesheet(stylesheet);
+		xmlFreeDoc(doctree);
+		xsltFreeSecurityPrefs(xslt_sec_prefs);
+		xsltFreeTransformContext(xslt_ctxt);
+		xsltCleanupGlobals();
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"could not set libxslt security preferences");
 	}
-	else
-		stylesheet = xsltParseStylesheetFile((xmlChar *) text_to_cstring(ssheet));
 
+	restree = xsltApplyStylesheetUser(stylesheet, doctree, params,
+									  NULL, NULL, xslt_ctxt);
 
-	if (stylesheet == NULL)
+	if (restree == NULL)
 	{
+		xsltFreeStylesheet(stylesheet);
 		xmlFreeDoc(doctree);
+		xsltFreeSecurityPrefs(xslt_sec_prefs);
+		xsltFreeTransformContext(xslt_ctxt);
 		xsltCleanupGlobals();
-		xmlCleanupParser();
-		elog_error(ERROR, "failed to parse stylesheet", 0);
-		PG_RETURN_NULL();
+		xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION,
+					"failed to apply stylesheet");
 	}
 
-	restree = xsltApplyStylesheet(stylesheet, doctree, params);
 	resstat = xsltSaveResultToString(&resstr, &reslen, restree, stylesheet);
 
 	xsltFreeStylesheet(stylesheet);
 	xmlFreeDoc(restree);
 	xmlFreeDoc(doctree);
+	xsltFreeSecurityPrefs(xslt_sec_prefs);
+	xsltFreeTransformContext(xslt_ctxt);
 
 	xsltCleanupGlobals();
-	xmlCleanupParser();
 
+	/* XXX this is pretty dubious, really ought to throw error instead */
 	if (resstat < 0)
 		PG_RETURN_NULL();
 
-	PG_RETURN_TEXT_P(cstring_to_text_with_len((char *) resstr, reslen));
+	tres = palloc(reslen + VARHDRSZ);
+	memcpy(VARDATA(tres), resstr, reslen);
+	SET_VARSIZE(tres, reslen + VARHDRSZ);
+
+	if (resstr)
+		xmlFree(resstr);
+
+	PG_RETURN_TEXT_P(tres);
+
+#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
 
 static void
 parse_params(const char **params, text *paramstr)
@@ -177,3 +249,5 @@ parse_params(const char **params, text *paramstr)
 
 	params[i] = NULL;
 }
+
+#endif /* USE_LIBXSLT */
diff --git a/doc/src/sgml/.gitignore b/doc/src/sgml/.gitignore
new file mode 100644
index 000000000000..dbe5e7509d87
--- /dev/null
+++ b/doc/src/sgml/.gitignore
@@ -0,0 +1,24 @@
+# Stuff shipped in tarballs
+*.html
+*.[1-9]
+# Other popular build targets
+/HISTORY
+/INSTALL
+/regress_README
+/postgres-US.pdf
+/postgres-A4.pdf
+# GENERATED_SGML
+/features-supported.sgml
+/features-unsupported.sgml
+/version.sgml
+/bookindex.sgml
+/HTML.index
+/HTML.index.start
+# Assorted byproducts from building the above
+/postgres.xml
+/postgres-US.aux
+/postgres-US.log
+/postgres-US.out
+/postgres-A4.aux
+/postgres-A4.log
+/postgres-A4.out
diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index 9b98833fa2ae..77a4c3f159db 100755
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.69 2007/01/23 05:07:16 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.72 2007/08/21 21:08:47 tgl Exp $
 PostgreSQL documentation
 Complete list of usable sgml source files in this directory.
 -->
@@ -24,9 +24,14 @@ Complete list of usable sgml source files in this directory.
 <!entity alterSequence      system "alter_sequence.sgml">
 <!entity alterTable         system "alter_table.sgml">
 <!entity alterTableSpace    system "alter_tablespace.sgml">
+<!entity alterTSConfig      system "alter_tsconfig.sgml">
+<!entity alterTSDictionary  system "alter_tsdictionary.sgml">
+<!entity alterTSParser      system "alter_tsparser.sgml">
+<!entity alterTSTemplate    system "alter_tstemplate.sgml">
 <!entity alterTrigger       system "alter_trigger.sgml">
 <!entity alterType          system "alter_type.sgml">
 <!entity alterUser          system "alter_user.sgml">
+<!entity alterView          system "alter_view.sgml">
 <!entity analyze            system "analyze.sgml">
 <!entity begin              system "begin.sgml">
 <!entity checkpoint         system "checkpoint.sgml">
@@ -60,6 +65,10 @@ Complete list of usable sgml source files in this directory.
 <!entity createTableAs      system "create_table_as.sgml">
 <!entity createTableSpace   system "create_tablespace.sgml">
 <!entity createTrigger      system "create_trigger.sgml">
+<!entity createTSConfig     system "create_tsconfig.sgml">
+<!entity createTSDictionary system "create_tsdictionary.sgml">
+<!entity createTSParser     system "create_tsparser.sgml">
+<!entity createTSTemplate   system "create_tstemplate.sgml">
 <!entity createType         system "create_type.sgml">
 <!entity createUser         system "create_user.sgml">
 <!entity createUserMapping  system "create_user_mapping.sgml">
@@ -67,6 +76,7 @@ Complete list of usable sgml source files in this directory.
 <!entity deallocate         system "deallocate.sgml">
 <!entity declare            system "declare.sgml">
 <!entity delete             system "delete.sgml">
+<!entity discard            system "discard.sgml">
 <!entity do                 system "do.sgml">
 <!entity dropAggregate      system "drop_aggregate.sgml">
 <!entity dropCast           system "drop_cast.sgml">
@@ -91,6 +101,10 @@ Complete list of usable sgml source files in this directory.
 <!entity dropTable          system "drop_table.sgml">
 <!entity dropTableSpace     system "drop_tablespace.sgml">
 <!entity dropTrigger        system "drop_trigger.sgml">
+<!entity dropTSConfig       system "drop_tsconfig.sgml">
+<!entity dropTSDictionary   system "drop_tsdictionary.sgml">
+<!entity dropTSParser       system "drop_tsparser.sgml">
+<!entity dropTSTemplate     system "drop_tstemplate.sgml">
 <!entity dropType           system "drop_type.sgml">
 <!entity dropUser           system "drop_user.sgml">
 <!entity dropUserMapping    system "drop_user_mapping.sgml">
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml
index 8ddff97e029c..d16cc2fdad1a 100755
--- a/doc/src/sgml/ref/alter_database.sgml
+++ b/doc/src/sgml/ref/alter_database.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.19 2006/09/16 00:30:16 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.20 2007/09/03 18:46:29 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -26,12 +26,14 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
 
     CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
 
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>parameter</replaceable>
-
 ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable>
 
 ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <replaceable>new_owner</replaceable>
+
+ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
+ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>configuration_parameter</replaceable>
+ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
 </synopsis>
  </refsynopsisdiv>
 
@@ -49,20 +51,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
   </para> 
 
   <para>
-   The second and third forms change the session default for a run-time
-   configuration variable for a <productname>PostgreSQL</productname>
-   database. Whenever a new session is subsequently started in that
-   database, the specified value becomes the session default value.
-   The database-specific default overrides whatever setting is present
-   in <filename>postgresql.conf</> or has been received from the
-   <command>postgres</command> command line.  Only the database
-   owner or a superuser can change the session defaults for a
-   database.  Certain variables cannot be set this way, or can only be
-   set by a superuser.
-  </para>
-
-  <para>
-   The fourth form changes the name of the database.  Only the database
+   The second form changes the name of the database.  Only the database
    owner or a superuser can rename a database; non-superuser owners must
    also have the
    <literal>CREATEDB</literal> privilege.  The current database cannot
@@ -71,12 +60,25 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
   </para>
 
   <para>
-   The fifth form changes the owner of the database.
+   The third form changes the owner of the database.
    To alter the owner, you must own the database and also be a direct or
    indirect member of the new owning role, and you must have the
    <literal>CREATEDB</literal> privilege.
    (Note that superusers have all these privileges automatically.)
   </para>
+
+  <para>
+   The remaining forms change the session default for a run-time
+   configuration variable for a <productname>PostgreSQL</productname>
+   database. Whenever a new session is subsequently started in that
+   database, the specified value becomes the session default value.
+   The database-specific default overrides whatever setting is present
+   in <filename>postgresql.conf</> or has been received from the
+   <command>postgres</command> command line.  Only the database
+   owner or a superuser can change the session defaults for a
+   database.  Certain variables cannot be set this way, or can only be
+   set by a superuser.
+  </para>
  </refsect1>
 
  <refsect1>
@@ -102,8 +104,26 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
       </listitem>
      </varlistentry> 
 
+   <varlistentry>
+    <term><replaceable>newname</replaceable></term>
+    <listitem>
+     <para>
+      The new name of the database.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
+    <listitem>
+     <para>
+      The new owner of the database.
+     </para>
+    </listitem>
+   </varlistentry>
+
      <varlistentry>
-      <term><replaceable>parameter</replaceable></term>
+      <term><replaceable>configuration_parameter</replaceable></term>
       <term><replaceable>value</replaceable></term>
       <listitem>
        <para>
@@ -114,6 +134,8 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
         database-specific setting is removed, so the system-wide default
         setting will be inherited in new sessions.  Use <literal>RESET
         ALL</literal> to clear all database-specific settings.
+        <literal>SET FROM CURRENT</> saves the session's current value of
+        the parameter as the database-specific value.
        </para>
 
        <para>
@@ -123,24 +145,6 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
        </para>
       </listitem>
      </varlistentry>
-
-   <varlistentry>
-    <term><replaceable>newname</replaceable></term>
-    <listitem>
-     <para>
-      The new name of the database.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><replaceable class="parameter">new_owner</replaceable></term>
-    <listitem>
-     <para>
-      The new owner of the database.
-     </para>
-    </listitem>
-   </varlistentry>
   </variablelist>
  </refsect1>
 
@@ -148,10 +152,10 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
   <title>Notes</title>
 
   <para>
-   It is also possible to tie a session default to a specific user
+   It is also possible to tie a session default to a specific role
    rather than to a database; see
-   <xref linkend="sql-alteruser" endterm="sql-alteruser-title">.
-   User-specific settings override database-specific
+   <xref linkend="sql-alterrole" endterm="sql-alterrole-title">.
+   Role-specific settings override database-specific
    ones if there is a conflict.
   </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml
index 150ca3d418fb..bee2f6f4390f 100755
--- a/doc/src/sgml/ref/alter_function.sgml
+++ b/doc/src/sgml/ref/alter_function.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_function.sgml,v 1.13 2007/01/22 01:35:19 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_function.sgml,v 1.15 2007/09/03 18:46:29 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -21,7 +21,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] )
-    <replaceable class="PARAMETER">action</replaceable> [, ... ] [ RESTRICT ]
+    <replaceable class="PARAMETER">action</replaceable> [ ... ] [ RESTRICT ]
 ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] )
     RENAME TO <replaceable>new_name</replaceable>
 ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] )
@@ -36,6 +36,10 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
     [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER
     COST <replaceable class="parameter">execution_cost</replaceable>
     ROWS <replaceable class="parameter">result_rows</replaceable>
+    SET <replaceable class="parameter">configuration_parameter</replaceable> { TO | = } { <replaceable class="parameter">value</replaceable> | DEFAULT }
+    SET <replaceable class="parameter">configuration_parameter</replaceable> FROM CURRENT
+    RESET <replaceable class="parameter">configuration_parameter</replaceable>
+    RESET ALL
 </synopsis>
  </refsynopsisdiv>
   
@@ -212,6 +216,30 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
      </listitem>
    </varlistentry>
 
+     <varlistentry>
+      <term><replaceable>configuration_parameter</replaceable></term>
+      <term><replaceable>value</replaceable></term>
+      <listitem>
+       <para>
+        Add or change the assignment to be made to a configuration parameter
+        when the function is called.  If
+        <replaceable>value</replaceable> is <literal>DEFAULT</literal>
+        or, equivalently, <literal>RESET</literal> is used, the function-local
+        setting is removed, so that the function executes with the value
+        present in its environment.  Use <literal>RESET
+        ALL</literal> to clear all function-local settings.
+        <literal>SET FROM CURRENT</> saves the session's current value of
+        the parameter as the value to be applied when the function is entered.
+       </para>
+
+       <para>
+        See <xref linkend="sql-set" endterm="sql-set-title"> and
+        <xref linkend="runtime-config">
+        for more information about allowed parameter names and values.
+       </para>
+      </listitem>
+     </varlistentry>
+
    <varlistentry>
     <term><literal>RESTRICT</literal></term>
 
@@ -250,6 +278,22 @@ ALTER FUNCTION sqrt(integer) OWNER TO joe;
 ALTER FUNCTION sqrt(integer) SET SCHEMA maths;
 </programlisting>
   </para>
+
+  <para>
+   To adjust the search path that is automatically set for a function:
+<programlisting>
+ALTER FUNCTION check_password(text) SET search_path = admin, pg_temp;
+</programlisting>
+  </para>
+
+  <para>
+   To disable automatic setting of <varname>search_path</> for a function:
+<programlisting>
+ALTER FUNCTION check_password(text) RESET search_path;
+</programlisting>
+   The function will now execute with whatever search path is used by its
+   caller.
+  </para>
  </refsect1>
 
  <refsect1>
@@ -260,6 +304,7 @@ ALTER FUNCTION sqrt(integer) SET SCHEMA maths;
    FUNCTION</> statement in the SQL standard. The standard allows more
    properties of a function to be modified, but does not provide the
    ability to rename a function, make a function a security definer,
+   attach configuration parameter values to a function,
    or change the owner, schema, or volatility of a function. The standard also
    requires the <literal>RESTRICT</> key word, which is optional in
    <productname>PostgreSQL</>.
diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml
index fbd1899806ba..b8b81b8407f9 100755
--- a/doc/src/sgml/ref/alter_role.sgml
+++ b/doc/src/sgml/ref/alter_role.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.7.2.1 2007/05/15 19:43:59 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.9 2007/09/03 18:46:29 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -78,7 +78,7 @@ where option can be:
   </para>
 
   <para>
-   The third and the fourth variant change a role's session default for
+   The remaining variants change a role's session default for
    a specified configuration variable.  Whenever the role subsequently
    starts a new session, the specified value becomes the session default,
    overriding whatever setting is present in <filename>postgresql.conf</>
@@ -168,6 +168,8 @@ where option can be:
         role-specific variable setting is removed, so the role will
         inherit the system-wide default setting in new sessions.  Use
         <literal>RESET ALL</literal> to clear all role-specific settings.
+        <literal>SET FROM CURRENT</> saves the session's current value of
+        the parameter as the role-specific value.
        </para>
 
        <para>
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index 37c2ceb6314c..3c982eee6f18 100755
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.16 2007/01/31 23:26:02 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.19 2007/10/25 18:54:03 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -28,6 +28,7 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> [ INCREMENT [ B
     [ MINVALUE <replaceable class="parameter">minvalue</replaceable> | NO MINVALUE ] [ MAXVALUE <replaceable class="parameter">maxvalue</replaceable> | NO MAXVALUE ]
     [ RESTART [ WITH ] <replaceable class="parameter">start</replaceable> ] [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ]
     [ OWNED BY { <replaceable class="parameter">table</replaceable>.<replaceable class="parameter">column</replaceable> | NONE } ]
+ALTER SEQUENCE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
 ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
   </synopsis>
  </refsynopsisdiv>
@@ -113,7 +114,10 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep
        <para>
         The optional clause <literal>RESTART WITH <replaceable
         class="parameter">start</replaceable></literal> changes the
-        current value of the sequence.
+        current value of the sequence.  This is equivalent to calling the
+        <function>setval</> function with <literal>is_called</literal> =
+        <literal>false</>: the specified value will be returned by the
+        <emphasis>next</> call of <function>nextval</>.
        </para>
       </listitem>
      </varlistentry>
@@ -182,29 +186,28 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep
     </listitem>
    </varlistentry>
 
-     <varlistentry>
-      <term><replaceable class="parameter">new_schema</replaceable></term>
-      <listitem>
-       <para>
-        The new schema for the sequence.
-       </para>
-      </listitem>
-     </varlistentry>
+   <varlistentry>
+    <term><replaceable class="parameter">new_name</replaceable></term>
+    <listitem>
+     <para>
+      The new name for the sequence.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">new_schema</replaceable></term>
+    <listitem>
+     <para>
+      The new schema for the sequence.
+     </para>
+    </listitem>
+   </varlistentry>
+
     </variablelist>
    </para>
   </refsect1>
 
- <refsect1>
-  <title>Examples</title>
-
-  <para>
-   Restart a sequence called <literal>serial</literal>, at 105:
-<programlisting>
-ALTER SEQUENCE serial RESTART WITH 105;
-</programlisting>
-  </para>
- </refsect1>
-
  <refsect1>
   <title>Notes</title>
 
@@ -213,8 +216,8 @@ ALTER SEQUENCE serial RESTART WITH 105;
    same sequence, <command>ALTER SEQUENCE</command>'s effects on the sequence
    generation parameters are never rolled back;
    those changes take effect immediately and are not reversible.  However,
-   the <literal>OWNED BY</> and <literal>SET SCHEMA</> clauses are ordinary
-   catalog updates and can be rolled back.
+   the <literal>OWNED BY</>, <literal>RENAME</>, and <literal>SET SCHEMA</>
+   clauses cause ordinary catalog updates that can be rolled back.
   </para>
 
   <para>
@@ -226,22 +229,38 @@ ALTER SEQUENCE serial RESTART WITH 105;
    immediately.
   </para>
 
+  <para>
+   <command>ALTER SEQUENCE</command> does not affect the <function>currval</>
+   status for the sequence.  (Before <productname>PostgreSQL</productname>
+   8.3, it sometimes did.)
+  </para>
+
   <para>
    Some variants of <command>ALTER TABLE</command> can be used with
-   sequences as well; for example, to rename a sequence use <command>ALTER
-   TABLE RENAME</command>.
+   sequences as well; for example, to rename a sequence it is also
+   possible to use <command>ALTER TABLE RENAME</command>.
   </para>
  </refsect1>
 
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   Restart a sequence called <literal>serial</literal>, at 105:
+<programlisting>
+ALTER SEQUENCE serial RESTART WITH 105;
+</programlisting>
+  </para>
+ </refsect1>
 
  <refsect1>
   <title>Compatibility</title>
 
   <para>
    <command>ALTER SEQUENCE</command> conforms to the <acronym>SQL</acronym>
-   standard,
-   except for the <literal>OWNED BY</> and <literal>SET SCHEMA</literal>
-   clauses, which are <productname>PostgreSQL</productname> extensions.
+   standard, except for the <literal>OWNED BY</>, <literal>RENAME</>, and
+   <literal>SET SCHEMA</literal> clauses, which are
+   <productname>PostgreSQL</productname> extensions.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 7566e587340e..676c71fd33c3 100755
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.94 2007/02/01 00:28:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.98 2007/11/28 15:42:31 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -261,10 +261,10 @@ Where column_reference_storage_directive is:
    </varlistentry>
 
    <varlistentry>
-    <term><literal>DISABLE</literal>/<literal>ENABLE TRIGGER</literal></term>
+    <term><literal>DISABLE</literal>/<literal>ENABLE [ REPLICA | ALWAYS ] TRIGGER</literal></term>
     <listitem>
      <para>
-      These forms disable or enable trigger(s) belonging to the table.
+      These forms configure the firing of trigger(s) belonging to the table.
       A disabled trigger is still known to the system, but is not executed
       when its triggering event occurs.  For a deferred trigger, the enable
       status is checked when the event occurs, not when the trigger function
@@ -275,6 +275,27 @@ Where column_reference_storage_directive is:
       requires superuser privileges; it should be done with caution since
       of course the integrity of the constraint cannot be guaranteed if the
       triggers are not executed.
+      The trigger firing mechanism is also affected by the configuration
+      variable <xref linkend="guc-session-replication-role">. Simply enabled
+      triggers will fire when the replication role is <quote>origin</>
+      (the default) or <quote>local</>. Triggers configured <literal>ENABLE REPLICA</literal>
+      will only fire if the session is in <quote>replica</> mode and triggers 
+      configured <literal>ENABLE ALWAYS</literal> will fire regardless of the current replication 
+      mode.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>DISABLE</literal>/<literal>ENABLE [ REPLICA | ALWAYS ] RULE</literal></term>
+    <listitem>
+     <para>
+      These forms configure the firing of rewrite rules belonging to the table.
+      A disabled rule is still known to the system, but is not applied
+      during query rewriting. The semantics are as for disabled/enabled
+      triggers. This configuration is ignored for <literal>ON SELECT</literal> rules, which
+      are always applied in order to keep views working even if the current
+      session is in a non-default replication role.
      </para>
     </listitem>
    </varlistentry>
@@ -482,15 +503,12 @@ Where column_reference_storage_directive is:
       <term><replaceable class="PARAMETER">name</replaceable></term>
       <listitem>
        <para>
-        The name (possibly schema-qualified) of an existing table to
-        alter. If <literal>ONLY</> is specified, only that table is
-        altered. If <literal>ONLY</> is not specified, the table and all
-        its descendant tables (if any) are updated. <literal>*</> can be
-        appended to the table name to indicate that descendant tables are
-        to be altered, but in the current version, this is the default
-        behavior.  (In releases before 7.1, <literal>ONLY</> was the
-        default behavior.  The default can be altered by changing the
-        configuration parameter <xref linkend="guc-sql-inheritance">.)
+        The name (optionally schema-qualified) of an existing table to
+        alter. If <literal>ONLY</> is specified before the table name, only
+        that table is altered. If <literal>ONLY</> is not specified, the table
+        and all its descendant tables (if any) are altered.  Optionally,
+        <literal>*</> can be specified after the table name to explicitly
+        indicate that descendant tables are included.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgml
new file mode 100644
index 000000000000..b342b1900a69
--- /dev/null
+++ b/doc/src/sgml/ref/alter_tsconfig.sgml
@@ -0,0 +1,178 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsconfig.sgml,v 1.3 2007/08/22 06:26:32 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-ALTERTSCONFIG">
+ <refmeta>
+  <refentrytitle id="SQL-ALTERTSCONFIG-TITLE">ALTER TEXT SEARCH CONFIGURATION</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>ALTER TEXT SEARCH CONFIGURATION</refname>
+  <refpurpose>change the definition of a text search configuration</refpurpose>
+ </refnamediv>  
+  
+ <indexterm zone="sql-altertsconfig">
+  <primary>ALTER TEXT SEARCH CONFIGURATION</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
+    ADD MAPPING FOR <replaceable class="parameter">token_type</replaceable> [, ... ] WITH <replaceable class="parameter">dictionary_name</replaceable> [, ... ]
+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
+    ALTER MAPPING FOR <replaceable class="parameter">token_type</replaceable> [, ... ] WITH <replaceable class="parameter">dictionary_name</replaceable> [, ... ]
+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
+    ALTER MAPPING REPLACE <replaceable class="parameter">old_dictionary</replaceable> WITH <replaceable class="parameter">new_dictionary</replaceable>
+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
+    ALTER MAPPING FOR <replaceable class="parameter">token_type</replaceable> [, ... ] REPLACE <replaceable class="parameter">old_dictionary</replaceable> WITH <replaceable class="parameter">new_dictionary</replaceable>
+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable>
+    DROP MAPPING [ IF EXISTS ] FOR <replaceable class="parameter">token_type</replaceable> [, ... ]
+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable>
+ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> OWNER TO <replaceable>newowner</replaceable>
+</synopsis>
+ </refsynopsisdiv>
+  
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>ALTER TEXT SEARCH CONFIGURATION</command> changes the definition of
+   a text search configuration.  You can modify
+   its mappings from token types to dictionaries,
+   or change the configuration's name or owner.
+  </para>
+
+  <para>
+   You must be the owner of the configuration to use
+   <command>ALTER TEXT SEARCH CONFIGURATION</>.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search
+      configuration.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">token_type</replaceable></term>
+    <listitem>
+     <para>
+      The name of a token type that is emitted by the configuration's
+      parser.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">dictionary_name</replaceable></term>
+    <listitem>
+     <para>
+      The name of a text search dictionary to be consulted for the
+      specified token type(s).  If multiple dictionaries are listed,
+      they are consulted in the specified order.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">old_dictionary</replaceable></term>
+    <listitem>
+     <para>
+      The name of a text search dictionary to be replaced in the mapping.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">new_dictionary</replaceable></term>
+    <listitem>
+     <para>
+      The name of a text search dictionary to be substituted for
+      <replaceable class="parameter">old_dictionary</replaceable>.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">newname</replaceable></term>
+    <listitem>
+     <para>
+      The new name of the text search configuration.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">newowner</replaceable></term>
+    <listitem>
+     <para>
+      The new owner of the text search configuration.
+     </para>
+    </listitem>
+   </varlistentry>
+ </variablelist>
+
+  <para>
+   The <literal>ADD MAPPING FOR</> form installs a list of dictionaries to be
+   consulted for the specified token type(s); it is an error if there is
+   already a mapping for any of the token types.
+   The <literal>ALTER MAPPING FOR</> form does the same, but first removing
+   any existing mapping for those token types.
+   The <literal>ALTER MAPPING REPLACE</> forms substitute <replaceable
+   class="parameter">new_dictionary</replaceable> for <replaceable
+   class="parameter">old_dictionary</replaceable> anywhere the latter appears.
+   This is done for only the specified token types when <literal>FOR</>
+   appears, or for all mappings of the configuration when it doesn't.
+   The <literal>DROP MAPPING</> form removes all dictionaries for the
+   specified token type(s), causing tokens of those types to be ignored
+   by the text search configuration.  It is an error if there is no mapping
+   for the token types, unless <literal>IF EXISTS</> appears.
+  </para>
+
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   The following example replaces the <literal>english</> dictionary
+   with the <literal>swedish</> dictionary anywhere that <literal>english</>
+   is used within <literal>my_config</>.
+  </para>
+
+<programlisting>
+ALTER TEXT SEARCH CONFIGURATION my_config
+  ALTER MAPPING REPLACE english WITH swedish;
+</programlisting>  
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>ALTER TEXT SEARCH CONFIGURATION</command> statement in
+   the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createtsconfig" endterm="sql-createtsconfig-title"></member>
+   <member><xref linkend="sql-droptsconfig" endterm="sql-droptsconfig-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/alter_tsdictionary.sgml b/doc/src/sgml/ref/alter_tsdictionary.sgml
new file mode 100644
index 000000000000..69bc4298514f
--- /dev/null
+++ b/doc/src/sgml/ref/alter_tsdictionary.sgml
@@ -0,0 +1,159 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsdictionary.sgml,v 1.3 2007/10/17 01:01:28 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-ALTERTSDICTIONARY">
+ <refmeta>
+  <refentrytitle id="SQL-ALTERTSDICTIONARY-TITLE">ALTER TEXT SEARCH DICTIONARY</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>ALTER TEXT SEARCH DICTIONARY</refname>
+  <refpurpose>change the definition of a text search dictionary</refpurpose>
+ </refnamediv>  
+  
+ <indexterm zone="sql-altertsdictionary">
+  <primary>ALTER TEXT SEARCH DICTIONARY</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> (
+    <replaceable class="parameter">option</replaceable> [ = <replaceable class="parameter">value</replaceable> ] [, ... ]
+)
+ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable>
+ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> OWNER TO <replaceable>newowner</replaceable>
+</synopsis>
+ </refsynopsisdiv>
+  
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>ALTER TEXT SEARCH DICTIONARY</command> changes the definition of
+   a text search dictionary.  You can change the dictionary's
+   template-specific options, or change the dictionary's name or owner.
+  </para>
+
+  <para>
+   You must be the owner of the dictionary to use
+   <command>ALTER TEXT SEARCH DICTIONARY</>.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search
+      dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">option</replaceable></term>
+    <listitem>
+     <para>
+      The name of a template-specific option to be set for this dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">value</replaceable></term>
+    <listitem>
+     <para>
+      The new value to use for a template-specific option.
+      If the equal sign and value are omitted, then any previous
+      setting for the option is removed from the dictionary,
+      allowing the default to be used.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">newname</replaceable></term>
+    <listitem>
+     <para>
+      The new name of the text search dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">newowner</replaceable></term>
+    <listitem>
+     <para>
+      The new owner of the text search dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+ </variablelist>
+
+  <para>
+   Template-specific options can appear in any order.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   The following example command changes the stopword list
+   for a Snowball-based dictionary.  Other parameters remain unchanged.
+  </para>
+
+<programlisting>
+ALTER TEXT SEARCH DICTIONARY my_dict ( StopWords = newrussian );
+</programlisting>  
+
+  <para>
+   The following example command changes the language option to dutch,
+   and removes the stopword option entirely.
+  </para>
+
+<programlisting>
+ALTER TEXT SEARCH DICTIONARY my_dict ( language = dutch, StopWords );
+</programlisting>  
+
+  <para>
+   The following example command <quote>updates</> the dictionary's
+   definition without actually changing anything.
+
+<programlisting>
+ALTER TEXT SEARCH DICTIONARY my_dict ( dummy );
+</programlisting>
+
+   (The reason this works is that the option removal code doesn't complain
+   if there is no such option.)  This trick is useful when changing
+   configuration files for the dictionary: the <command>ALTER</> will
+   force existing database sessions to re-read the configuration files,
+   which otherwise they would never do if they had read them earlier.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>ALTER TEXT SEARCH DICTIONARY</command> statement in
+   the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createtsdictionary" endterm="sql-createtsdictionary-title"></member>
+   <member><xref linkend="sql-droptsdictionary" endterm="sql-droptsdictionary-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/alter_tsparser.sgml b/doc/src/sgml/ref/alter_tsparser.sgml
new file mode 100644
index 000000000000..a94d3939b892
--- /dev/null
+++ b/doc/src/sgml/ref/alter_tsparser.sgml
@@ -0,0 +1,82 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tsparser.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-ALTERTSPARSER">
+ <refmeta>
+  <refentrytitle id="SQL-ALTERTSPARSER-TITLE">ALTER TEXT SEARCH PARSER</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>ALTER TEXT SEARCH PARSER</refname>
+  <refpurpose>change the definition of a text search parser</refpurpose>
+ </refnamediv>  
+  
+ <indexterm zone="sql-altertsparser">
+  <primary>ALTER TEXT SEARCH PARSER</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable>
+</synopsis>
+ </refsynopsisdiv>
+  
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>ALTER TEXT SEARCH PARSER</command> changes the definition of
+   a text search parser.  Currently, the only supported functionality
+   is to change the parser's name.
+  </para>
+
+  <para>
+   You must be a superuser to use <command>ALTER TEXT SEARCH PARSER</>.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search parser.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">newname</replaceable></term>
+    <listitem>
+     <para>
+      The new name of the text search parser.
+     </para>
+    </listitem>
+   </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>ALTER TEXT SEARCH PARSER</command> statement in
+   the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createtsparser" endterm="sql-createtsparser-title"></member>
+   <member><xref linkend="sql-droptsparser" endterm="sql-droptsparser-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/alter_tstemplate.sgml b/doc/src/sgml/ref/alter_tstemplate.sgml
new file mode 100644
index 000000000000..4ee9e82bfb85
--- /dev/null
+++ b/doc/src/sgml/ref/alter_tstemplate.sgml
@@ -0,0 +1,82 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_tstemplate.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-ALTERTSTEMPLATE">
+ <refmeta>
+  <refentrytitle id="SQL-ALTERTSTEMPLATE-TITLE">ALTER TEXT SEARCH TEMPLATE</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>ALTER TEXT SEARCH TEMPLATE</refname>
+  <refpurpose>change the definition of a text search template</refpurpose>
+ </refnamediv>  
+  
+ <indexterm zone="sql-altertstemplate">
+  <primary>ALTER TEXT SEARCH TEMPLATE</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable>
+</synopsis>
+ </refsynopsisdiv>
+  
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>ALTER TEXT SEARCH TEMPLATE</command> changes the definition of
+   a text search template.  Currently, the only supported functionality
+   is to change the template's name.
+  </para>
+
+  <para>
+   You must be a superuser to use <command>ALTER TEXT SEARCH TEMPLATE</>.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search template.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">newname</replaceable></term>
+    <listitem>
+     <para>
+      The new name of the text search template.
+     </para>
+    </listitem>
+   </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>ALTER TEXT SEARCH TEMPLATE</command> statement in
+   the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createtstemplate" endterm="sql-createtstemplate-title"></member>
+   <member><xref linkend="sql-droptstemplate" endterm="sql-droptstemplate-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 62b0dede61a8..b9a42be2ddac 100755
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.42.2.1 2007/05/15 19:43:59 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.44 2007/09/03 18:46:29 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -38,7 +38,9 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
 ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>newname</replaceable>
 
 ALTER USER <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER USER <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
 ALTER USER <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>configuration_parameter</replaceable>
+ALTER USER <replaceable class="PARAMETER">name</replaceable> RESET ALL
 </synopsis>
  </refsynopsisdiv>
 
diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml
new file mode 100644
index 000000000000..7dd052cc1244
--- /dev/null
+++ b/doc/src/sgml/ref/alter_view.sgml
@@ -0,0 +1,102 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_view.sgml,v 1.3 2007/10/03 16:48:43 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-ALTERVIEW">
+ <refmeta>
+  <refentrytitle id="SQL-ALTERVIEW-TITLE">ALTER VIEW</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>ALTER VIEW</refname>
+  <refpurpose>change the definition of a view</refpurpose>
+ </refnamediv>  
+  
+ <indexterm zone="sql-alterview">
+  <primary>ALTER VIEW</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+ALTER VIEW <replaceable>name</replaceable> RENAME TO <replaceable>newname</replaceable>
+</synopsis>
+ </refsynopsisdiv>
+  
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>ALTER VIEW</command> changes the definition of a view.
+   The only currently available functionality is to rename the view.
+   To execute this command you must be the owner of the view.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing view.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">newname</replaceable></term>
+    <listitem>
+     <para>
+      The new name of the view.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Notes</title>
+
+  <para>
+   Some variants of <command>ALTER TABLE</command> can be used with
+   views as well; for example, to rename a view it is also
+   possible to use <command>ALTER TABLE RENAME</command>.  To change
+   the schema or owner of a view, you currently must use <command>ALTER
+   TABLE</>.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   To rename the view <literal>foo</literal> to
+   <literal>bar</literal>:
+<programlisting>
+ALTER VIEW foo RENAME TO bar;
+</programlisting>
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   <command>ALTER VIEW</command> is a <productname>PostgreSQL</>
+   extension of the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createview" endterm="sql-createview-title"></member>
+   <member><xref linkend="sql-dropview" endterm="sql-dropview-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml
index 28c272179aaf..f84999b03fe0 100755
--- a/doc/src/sgml/ref/analyze.sgml
+++ b/doc/src/sgml/ref/analyze.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.21 2007/01/31 23:26:02 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.23 2007/10/07 01:16:42 alvherre Exp $
 PostgreSQL documentation
 -->
 
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
+ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -29,10 +29,11 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
 
   <para>
    <command>ANALYZE</command> collects statistics about the contents
-   of tables in the database, and stores the results in the system
-   table <literal>pg_statistic</literal>.  Subsequently, the query
-   planner uses these statistics to help determine the most efficient
-   execution plans for queries.
+   of tables in the database, and stores the results in the <link
+   linkend="catalog-pg-statistic"><structname>pg_statistic</></>
+   system catalog.  Subsequently, the query planner uses these
+   statistics to help determine the most efficient execution plans for
+   queries.
   </para>
 
   <para>
@@ -91,7 +92,12 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
   <title>Notes</title>
 
   <para>
-   It is a good idea to run <command>ANALYZE</command> periodically, or
+   In the default <productname>PostgreSQL</productname> configuration,
+   <xref linkend="autovacuum" endterm="autovacuum-title">
+   takes care of automatic analyzing of tables when they are first loaded
+   with data, and as they change throughout regular operation.
+   When autovacuum is disabled,
+   it is a good idea to run <command>ANALYZE</command> periodically, or
    just after making major changes in the contents of a table.  Accurate
    statistics will help the planner to choose the most appropriate query
    plan, and thereby improve the speed of query processing.  A common
@@ -100,7 +106,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
   </para>
 
   <para>
-   Unlike <command>VACUUM FULL</command>, <command>ANALYZE</command>
+   <command>ANALYZE</command>
    requires only a read lock on the target table, so it can run in
    parallel with other activity on the table.
   </para>
@@ -125,7 +131,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
    will change slightly each time <command>ANALYZE</command> is run,
    even if the actual table contents did not change.  This might result
    in small changes in the planner's estimated costs shown by
-   <command>EXPLAIN</command>. In rare situations, this
+   <xref linkend="sql-explain" endterm="sql-explain-title">. In rare situations, this
    non-determinism will cause the query optimizer to choose a
    different query plan between runs of <command>ANALYZE</command>. To
    avoid this, raise the amount of statistics collected by
@@ -167,4 +173,15 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
    There is no <command>ANALYZE</command> statement in the SQL standard.
   </para>
  </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-vacuum" endterm="sql-vacuum-title"></member>
+   <member><xref linkend="app-vacuumdb" endterm="app-vacuumdb-title"></member>
+   <member><xref linkend="runtime-config-resource-vacuum-cost" endterm="runtime-config-resource-vacuum-cost-title"></member>
+   <member><xref linkend="autovacuum" endterm="autovacuum-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index f3f37d95f663..f4fada4ac713 100755
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/close.sgml,v 1.24 2006/09/16 00:30:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/close.sgml,v 1.26 2007/05/15 19:13:55 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -25,7 +25,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CLOSE <replaceable class="PARAMETER">name</replaceable>
+CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
 </synopsis>
  </refsynopsisdiv>
 
@@ -44,10 +44,10 @@ CLOSE <replaceable class="PARAMETER">name</replaceable>
    transaction is terminated by <command>COMMIT</command> or
    <command>ROLLBACK</command>.  A holdable cursor is implicitly
    closed if the transaction that created it aborts via
-   <command>ROLLBACK</command>.  If the creating transaction successfully
-   commits, the holdable
-   cursor remains open until an explicit <command>CLOSE</command> is
-   executed, or the client disconnects.
+   <command>ROLLBACK</command>.  If the creating transaction
+   successfully commits, the holdable cursor remains open until an
+   explicit <command>CLOSE</command> is executed, or the client
+   disconnects.
   </para>
  </refsect1>
   
@@ -63,6 +63,16 @@ CLOSE <replaceable class="PARAMETER">name</replaceable>
      </para>
     </listitem>
    </varlistentry>
+
+   <varlistentry>
+    <term><literal>ALL</literal></term>
+    <listitem>
+     <para>
+      Close all open cursors.
+     </para>
+    </listitem>
+   </varlistentry>
+
   </variablelist>
  </refsect1>
 
@@ -78,8 +88,8 @@ CLOSE <replaceable class="PARAMETER">name</replaceable>
   </para>
 
   <para>
-   You can see all available cursors by querying the
-   <structname>pg_cursors</structname> system view.
+   You can see all available cursors by querying the <link
+   linkend="view-pg-cursors"><structname>pg_cursors</></> system view.
   </para>
  </refsect1>
 
@@ -98,7 +108,9 @@ CLOSE liahona;
   <title>Compatibility</title>
   
   <para>
-   <command>CLOSE</command> is fully conforming with the SQL standard.
+   <command>CLOSE</command> is fully conforming with the SQL
+   standard. <command>CLOSE ALL</> is a <productname>PostgreSQL</>
+   extension.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index 0d19fd5eb4ee..91c2474bd078 100755
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.40 2007/02/01 00:28:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.44 2007/11/07 14:07:53 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -20,8 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CLUSTER <replaceable class="PARAMETER">indexname</replaceable> ON <replaceable class="PARAMETER">tablename</replaceable>
-CLUSTER <replaceable class="PARAMETER">tablename</replaceable>
+CLUSTER <replaceable class="PARAMETER">tablename</replaceable> [ USING <replaceable class="PARAMETER">indexname</replaceable> ]
 CLUSTER
 </synopsis>
  </refsynopsisdiv>
@@ -44,22 +43,24 @@ CLUSTER
    based on the index information. Clustering is a one-time operation:
    when the table is subsequently updated, the changes are
    not clustered.  That is, no attempt is made to store new or
-   updated rows according to their index order.  If one wishes, one can
-   periodically recluster by issuing the command again.
+   updated rows according to their index order.  (If one wishes, one can
+   periodically recluster by issuing the command again.  Also, setting
+   the table's <literal>FILLFACTOR</literal> storage parameter to less than 100% can aid
+   in preserving cluster ordering during updates, since updated rows
+   are preferentially kept on the same page.)
   </para>
 
   <para>
    When a table is clustered, <productname>PostgreSQL</productname>
-   remembers on which index it was clustered.  The form
+   remembers which index it was clustered by.  The form
    <command>CLUSTER <replaceable class="parameter">tablename</replaceable></command>
-   reclusters the table on the same index that it was clustered before.
+   reclusters the table using the same index as before.
   </para>
 
   <para>
-   <command>CLUSTER</command> without any parameter reclusters all the tables
-   in the
-   current database that the calling user owns, or all tables if called
-   by a superuser.  (Never-clustered tables are not included.)  This
+   <command>CLUSTER</command> without any parameter reclusters all the
+   previously-clustered tables in the current database that the calling user
+   owns, or all such tables if called by a superuser.  This
    form of <command>CLUSTER</command> cannot be executed inside a transaction
    block.
   </para>
@@ -77,19 +78,19 @@ CLUSTER
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">indexname</replaceable></term>
+    <term><replaceable class="PARAMETER">tablename</replaceable></term>
     <listitem>
      <para>
-      The name of an index.
+      The name (possibly schema-qualified) of a table.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">tablename</replaceable></term>
+    <term><replaceable class="PARAMETER">indexname</replaceable></term>
     <listitem>
      <para>
-      The name (possibly schema-qualified) of a table.
+      The name of an index.
      </para>
     </listitem>
    </varlistentry>
@@ -183,9 +184,9 @@ CREATE TABLE <replaceable class="parameter">newtable</replaceable> AS
 
   <para>
    Cluster the table <literal>employees</literal> on the basis of
-   its index <literal>emp_ind</literal>:
+   its index <literal>employees_ind</literal>:
 <programlisting>
-CLUSTER emp_ind ON emp;
+CLUSTER employees USING employees_ind;
 </programlisting>
   </para>
 
@@ -193,7 +194,7 @@ CLUSTER emp_ind ON emp;
    Cluster the <literal>employees</literal> table using the same
    index that was used before:
 <programlisting>
-CLUSTER emp;
+CLUSTER employees;
 </programlisting>
   </para>
 
@@ -211,6 +212,15 @@ CLUSTER;
   <para>
    There is no <command>CLUSTER</command> statement in the SQL standard.
   </para>
+
+  <para>
+   The syntax
+<synopsis>
+CLUSTER <replaceable class="PARAMETER">indexname</replaceable> ON <replaceable class="PARAMETER">tablename</replaceable>
+</synopsis>
+  is also supported for compatibility with pre-8.3 <productname>PostgreSQL</>
+  versions.
+  </para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index acd708f6389b..2990b2c8af2a 100755
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.18.2.2 2007/03/26 17:23:44 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.23 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -66,7 +66,7 @@ PostgreSQL documentation
       <term><option>--all</></term>
       <listitem>
        <para>
-	Cluster all databases.
+        Cluster all databases.
        </para>
       </listitem>
      </varlistentry>
@@ -76,12 +76,12 @@ PostgreSQL documentation
       <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
-	Specifies the name of the database to be clustered.
-	If this is not specified and <option>-a</option> (or
-	<option>--all</option>) is not used, the database name is read
-	from the environment variable <envar>PGDATABASE</envar>.  If
-	that is not set, the user name specified for the connection is
-	used.
+        Specifies the name of the database to be clustered.
+        If this is not specified and <option>-a</option> (or
+        <option>--all</option>) is not used, the database name is read
+        from the environment variable <envar>PGDATABASE</envar>.  If
+        that is not set, the user name specified for the connection is
+        used.
        </para>
       </listitem>
      </varlistentry>
@@ -92,7 +92,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Echo the commands that <application>clusterdb</application> generates
-	and sends to the server.
+        and sends to the server.
        </para>
       </listitem>
      </varlistentry>
@@ -102,7 +102,7 @@ PostgreSQL documentation
       <term><option>--quiet</></term>
       <listitem>
        <para>
-        Do not display a response.
+        Do not display progress messages.
        </para>
       </listitem>
      </varlistentry>
@@ -112,7 +112,7 @@ PostgreSQL documentation
       <term><option>--table <replaceable class="parameter">table</replaceable></></term>
       <listitem>
        <para>
-	Cluster <replaceable class="parameter">table</replaceable> only.
+        Cluster <replaceable class="parameter">table</replaceable> only.
        </para>
       </listitem>
      </varlistentry>
@@ -130,9 +130,9 @@ PostgreSQL documentation
       <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
-	Specifies the host name of the machine on which the server is
-	running.  If the value begins with a slash, it is used as the
-	directory for the Unix domain socket.
+        Specifies the host name of the machine on which the server is
+        running.  If the value begins with a slash, it is used as the
+        directory for the Unix domain socket.
        </para>
       </listitem>
      </varlistentry>
@@ -142,9 +142,9 @@ PostgreSQL documentation
       <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
-	Specifies the TCP port or local Unix domain socket file 
-	extension on which the server
-	is listening for connections.
+        Specifies the TCP port or local Unix domain socket file 
+        extension on which the server
+        is listening for connections.
        </para>
       </listitem>
      </varlistentry>
@@ -164,7 +164,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt.
+        Force <application>clusterdb</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>clusterdb</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>clusterdb</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index 9dcb1ded0163..e52cae2397f8 100755
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.35 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.36 2007/08/21 21:08:47 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -45,6 +45,10 @@ COMMENT ON
   SCHEMA <replaceable class="PARAMETER">object_name</replaceable> |
   SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> |
   TABLESPACE <replaceable class="PARAMETER">object_name</replaceable> |
+  TEXT SEARCH CONFIGURATION <replaceable class="PARAMETER">object_name</replaceable> |
+  TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> |
+  TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> |
+  TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> |
   TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
   TYPE <replaceable class="PARAMETER">object_name</replaceable> |
   VIEW <replaceable class="PARAMETER">object_name</replaceable>
@@ -68,9 +72,8 @@ COMMENT ON
   </para>
 
   <para>
-    Comments can be
-    easily retrieved with the <application>psql</application> commands
-    <command>\dd</command>, <command>\d+</command>, and <command>\l+</command>.
+    Comments can be viewed using <application>psql</application>'s 
+    <command>\d</command> family of commands.
     Other user interfaces to retrieve comments can be built atop
     the same built-in functions that <application>psql</application> uses, namely
     <function>obj_description</>, <function>col_description</>,
@@ -96,7 +99,8 @@ COMMENT ON
      <para>
       The name of the object to be commented.  Names of tables,
       aggregates, domains, functions, indexes, operators, operator classes,
-      operator families, sequences, types, and views can be schema-qualified.
+      operator families, sequences, text search objects, types, and views can
+      be schema-qualified.
      </para>
     </listitem>
    </varlistentry>
@@ -258,6 +262,10 @@ COMMENT ON SCHEMA my_schema IS 'Departmental data';
 COMMENT ON SEQUENCE my_sequence IS 'Used to generate primary keys';
 COMMENT ON TABLE my_schema.my_table IS 'Employee Information';
 COMMENT ON TABLESPACE my_tablespace IS 'Tablespace for indexes';
+COMMENT ON TEXT SEARCH CONFIGURATION my_config IS 'Special word filtering';
+COMMENT ON TEXT SEARCH DICTIONARY swedish IS 'Snowball stemmer for swedish language';
+COMMENT ON TEXT SEARCH PARSER my_parser IS 'Splits text into words';
+COMMENT ON TEXT SEARCH TEMPLATE snowball IS 'Snowball stemmer';
 COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for RI';
 COMMENT ON TYPE complex IS 'Complex number data type';
 COMMENT ON VIEW my_view IS 'View of departmental costs';
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 491151c18f84..1616e4d05128 100755
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.78 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.81.2.1 2008/10/10 21:46:43 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -213,7 +213,7 @@ COPY {table [(column [, ...])] | (query)} TO {'file' | STDOUT}
     <term><literal>HEADER</literal></term>
     <listitem>
      <para>
-      Specifies the file contains a header line with the names of each
+      Specifies that the file contains a header line with the names of each
       column in the file.  On output, the first line contains the column 
       names from the table, and on input, the first line is ignored.
      </para>
@@ -352,6 +352,13 @@ COPY <replaceable class="parameter">count</replaceable>
     using <command>COPY TO</>.
    </para>
 
+   <para>
+    Input data is interpreted according to the current client encoding,
+    and output data is encoded in the the current client encoding, even
+    if the data does not pass through the client but is read from or
+    written to a file.
+   </para>
+
    <para>
     <command>COPY</command> stops operation at the first error. This
     should not lead to problems in the event of a <command>COPY
@@ -362,6 +369,7 @@ COPY <replaceable class="parameter">count</replaceable>
     happened well into a large copy operation. You might wish to invoke
     <command>VACUUM</command> to recover the wasted space.
    </para>
+
  </refsect1>
  
  <refsect1>
diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml
index c6e944e26ae1..c329c36b190c 100755
--- a/doc/src/sgml/ref/create_cast.sgml
+++ b/doc/src/sgml/ref/create_cast.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.25 2007/02/01 00:28:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.26 2007/06/05 21:31:04 tgl Exp $ -->
 
 <refentry id="SQL-CREATECAST">
  <refmeta>
@@ -35,11 +35,11 @@ CREATE CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</r
    specifies how to perform a conversion between
    two data types.  For example:
 <programlisting>
-SELECT CAST(42 AS text);
+SELECT CAST(42 AS float8);
 </programlisting>
-   converts the integer constant 42 to type <type>text</type> by
+   converts the integer constant 42 to type <type>float8</type> by
    invoking a previously specified function, in this case
-   <literal>text(int4)</>. (If no suitable cast has been defined, the
+   <literal>float8(int4)</>. (If no suitable cast has been defined, the
    conversion fails.)
   </para>
 
@@ -69,8 +69,7 @@ SELECT CAST(42 AS text);
 INSERT INTO foo (f1) VALUES (42);
 </programlisting>
    will be allowed if the cast from type <type>integer</type> to type
-   <type>text</type> is marked <literal>AS ASSIGNMENT</>, otherwise
-   not.
+   <type>text</type> is marked <literal>AS ASSIGNMENT</>, otherwise not.
    (We generally use the term <firstterm>assignment
    cast</firstterm> to describe this kind of cast.)
   </para>
@@ -78,19 +77,37 @@ INSERT INTO foo (f1) VALUES (42);
   <para>
    If the cast is marked <literal>AS IMPLICIT</> then it can be invoked
    implicitly in any context, whether assignment or internally in an
-   expression.  For example, since <literal>||</> takes <type>text</>
-   operands,
+   expression.  (We generally use the term <firstterm>implicit
+   cast</firstterm> to describe this kind of cast.)
+   For example, consider this query:
 <programlisting>
-SELECT 'The time is ' || now();
+SELECT 2 + 4.0;
 </programlisting>
-   will be allowed only if the cast from type <type>timestamp</> to
-   <type>text</type> is marked <literal>AS IMPLICIT</>.  Otherwise it
-   will be necessary to write the cast explicitly, for example:
+   The parser initially marks the constants as being of type <type>integer</>
+   and <type>numeric</> respectively.  There is no <type>integer</>
+   <literal>+</> <type>numeric</> operator in the system catalogs,
+   but there is a <type>numeric</> <literal>+</> <type>numeric</> operator.
+   The query will therefore succeed if a cast from <type>integer</> to
+   <type>numeric</> is available and is marked <literal>AS IMPLICIT</> &mdash;
+   which in fact it is.  The parser will apply the implicit cast and resolve
+   the query as if it had been written
 <programlisting>
-SELECT 'The time is ' || CAST(now() AS text);
+SELECT CAST ( 2 AS numeric ) + 4.0;
 </programlisting>
-   (We generally use the term <firstterm>implicit
-   cast</firstterm> to describe this kind of cast.)
+  </para>
+
+  <para>
+   Now, the catalogs also provide a cast from <type>numeric</> to
+   <type>integer</>.  If that cast were marked <literal>AS IMPLICIT</> &mdash;
+   which it is not &mdash; then the parser would be faced with choosing
+   between the above interpretation and the alternative of casting the
+   <type>numeric</> constant to <type>integer</> and applying the
+   <type>integer</> <literal>+</> <type>integer</> operator.  Lacking any
+   knowledge of which choice to prefer, it would give up and declare the
+   query ambiguous.  The fact that only one of the two casts is
+   implicit is the way in which we teach the parser to prefer resolution
+   of a mixed <type>numeric</>-and-<type>integer</> expression as
+   <type>numeric</>; there is no built-in knowledge about that.
   </para>
 
   <para>
@@ -208,9 +225,7 @@ SELECT 'The time is ' || CAST(now() AS text);
    argument.  This is used to represent type-specific length coercion
    functions in the system catalogs.  The named function is used to
    coerce a value of the type to the type modifier value given by its
-   second argument.  (Since the grammar presently permits only certain
-   built-in data types to have type modifiers, this feature is of no
-   use for user-defined target types, but we mention it for completeness.)
+   second argument.
   </para>
 
   <para>
@@ -237,6 +252,32 @@ SELECT 'The time is ' || CAST(now() AS text);
    need to declare casts both ways explicitly.
   </para>
 
+ <indexterm zone="sql-createcast">
+  <primary>cast</primary>
+  <secondary>I/O conversion</secondary>
+ </indexterm>
+
+  <para>
+   It is normally not necessary to create casts between user-defined types
+   and the standard string types (<type>text</>, <type>varchar</>, and
+   <type>char(<replaceable>n</>)</type>).  <productname>PostgreSQL</> will
+   automatically handle a cast to a string type by invoking the other
+   type's output function, or conversely handle a cast from a string type
+   by invoking the other type's input function.  These
+   automatically-provided casts are known as <firstterm>I/O conversion
+   casts</>.  I/O conversion casts to string types are treated as
+   assignment casts, while I/O conversion casts from string types are
+   explicit-only.  You can override this behavior by declaring your own
+   cast to replace an I/O conversion cast, but usually the only reason to
+   do so is if you want the conversion to be more easily invokable than the
+   standard assignment-only or explicit-only setting.  Another possible
+   reason is that you want the conversion to behave differently from the
+   type's I/O function; but that is sufficiently surprising that you
+   should think twice about whether it's a good idea.  (A small number of
+   the built-in types do indeed have different behaviors for conversions,
+   mostly because of requirements of the SQL standard.)
+  </para>
+
   <para>
    Prior to <productname>PostgreSQL</> 7.3, every function that had
    the same name as a data type, returned that data type, and took one
@@ -265,16 +306,20 @@ SELECT 'The time is ' || CAST(now() AS text);
 
   <note>
    <para>
-   There is one small lie in the preceding paragraph: there is still one
-   case in which <structname>pg_cast</> will be used to resolve the
-   meaning of an apparent function call.  If a
-   function call <replaceable>name</>(<replaceable>x</>) matches no
-   actual function, but <replaceable>name</> is the name of a data type
-   and <structname>pg_cast</> shows a binary-compatible cast to this
-   type from the type of <replaceable>x</>, then the call will be construed
-   as an explicit cast.  This exception is made so that binary-compatible
-   casts can be invoked using functional syntax, even though they lack
-   any function.
+    Actually the preceding paragraph is an oversimplification: there are
+    two cases in which a function-call construct will be treated as a cast
+    request without having matched it to an actual function.
+    If a function call <replaceable>name</>(<replaceable>x</>) does not
+    exactly match any existing function, but <replaceable>name</> is the name
+    of a data type and <structname>pg_cast</> provides a binary-compatible cast
+    to this type from the type of <replaceable>x</>, then the call will be
+    construed as a binary-compatible cast.  This exception is made so that
+    binary-compatible casts can be invoked using functional syntax, even
+    though they lack any function.  Likewise, if there is no
+    <structname>pg_cast</> entry but the cast would be to or from a string
+    type, the call will be construed as an I/O conversion cast.  This
+    exception allows I/O conversion casts to be invoked using functional
+    syntax.
    </para>
   </note>
  </refsect1>
@@ -284,10 +329,10 @@ SELECT 'The time is ' || CAST(now() AS text);
   <title>Examples</title>
 
   <para>
-   To create a cast from type <type>text</type> to type
-   <type>int4</type> using the function <literal>int4(text)</literal>:
+   To create a cast from type <type>bigint</type> to type
+   <type>int4</type> using the function <literal>int4(bigint)</literal>:
 <programlisting>
-CREATE CAST (text AS int4) WITH FUNCTION int4(text);
+CREATE CAST (bigint AS int4) WITH FUNCTION int4(bigint);
 </programlisting>
    (This cast is already predefined in the system.)
   </para>
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index d4301a73f6a9..15e84be79f8f 100755
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.47 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.48 2007/09/28 22:25:49 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -43,14 +43,6 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
    See <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">.
   </para>
 
-  <para>
-   Normally, the creator becomes the owner of the new database.
-   Superusers can create databases owned by other users, by using the
-   <literal>OWNER</> clause. They can even create databases owned by
-   users with no special privileges. Non-superusers with <literal>CREATEDB</>
-   privilege can only create databases owned by themselves.
-  </para>
-
   <para>
    By default, the new database will be created by cloning the standard
    system database <literal>template1</>.  A different template can be
@@ -81,9 +73,11 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
       <term><replaceable class="parameter">dbowner</replaceable></term>
       <listitem>
        <para>
-        The name of the database user who will own the new database,
+        The role name of the user who will own the new database,
         or <literal>DEFAULT</literal> to use the default (namely, the
-        user executing the command).
+        user executing the command).  To create a database owned by another
+        role, you must be a direct or indirect member of that role,
+        or be a superuser.
        </para>
       </listitem>
      </varlistentry>
@@ -107,7 +101,8 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
         to use the default encoding (namely, the encoding of the
         template database). The character sets supported by the
         <productname>PostgreSQL</productname> server are described in
-        <xref linkend="multibyte-charset-supported">.
+        <xref linkend="multibyte-charset-supported">. See below for
+        additional restrictions.
        </para>
       </listitem>
      </varlistentry>
@@ -178,6 +173,21 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
    See <xref linkend="manage-ag-templatedbs"> for more information.
   </para>
 
+  <para>
+   Any character set encoding specified for the new database must be
+   compatible with the server's <envar>LC_CTYPE</> locale setting.
+   If <envar>LC_CTYPE</> is <literal>C</> (or equivalently
+   <literal>POSIX</>), then all encodings are allowed, but for other
+   locale settings there is only one encoding that will work properly,
+   and so the apparent freedom to specify an encoding is illusory if
+   you didn't initialize the database cluster in <literal>C</> locale.
+   <command>CREATE DATABASE</> will allow superusers to specify
+   <literal>SQL_ASCII</> encoding regardless of the locale setting,
+   but this choice is deprecated and may result in misbehavior of
+   character-string functions if data that is not encoding-compatible
+   with the locale is stored in the database.
+  </para>
+
   <para>
    The <literal>CONNECTION LIMIT</> option is only enforced approximately;
    if two new sessions start at about the same time when just one
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index 6f0e88dd7463..d230ebad99bb 100755
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.73 2007/02/01 19:10:24 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.78.2.2 2009/10/02 18:13:19 tgl Exp $
 -->
 
 <refentry id="SQL-CREATEFUNCTION">
@@ -28,6 +28,7 @@ CREATE [ OR REPLACE ] FUNCTION
     | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER
     | COST <replaceable class="parameter">execution_cost</replaceable>
     | ROWS <replaceable class="parameter">result_rows</replaceable>
+    | SET <replaceable class="parameter">configuration_parameter</replaceable> { TO <replaceable class="parameter">value</replaceable> | = <replaceable class="parameter">value</replaceable> | FROM CURRENT }
     | AS '<replaceable class="parameter">definition</replaceable>'
     | AS '<replaceable class="parameter">obj_file</replaceable>', '<replaceable class="parameter">link_symbol</replaceable>'
   } ...
@@ -71,6 +72,8 @@ CREATE [ OR REPLACE ] FUNCTION
    triggers, etc. that refer to the old function.  Use
    <command>CREATE OR REPLACE FUNCTION</command> to change a function
    definition without breaking objects that refer to the function.
+   Also, <command>ALTER FUNCTION</> can be used to change most of the
+   auxiliary properties of an existing function.
   </para>
 
   <para>
@@ -334,6 +337,26 @@ CREATE [ OR REPLACE ] FUNCTION
      </listitem>
     </varlistentry>
 
+    <varlistentry>
+     <term><replaceable>configuration_parameter</replaceable></term>
+     <term><replaceable>value</replaceable></term>
+     <listitem>
+      <para>
+       The <literal>SET</> clause causes the specified configuration
+       parameter to be set to the specified value when the function is
+       entered, and then restored to its prior value when the function exits.
+       <literal>SET FROM CURRENT</> saves the session's current value of
+       the parameter as the value to be applied when the function is entered.
+      </para>
+
+      <para>
+       See <xref linkend="sql-set" endterm="sql-set-title"> and
+       <xref linkend="runtime-config">
+       for more information about allowed parameter names and values.
+      </para>
+     </listitem>
+    </varlistentry>
+
     <varlistentry>
      <term><replaceable class="parameter">definition</replaceable></term>
 
@@ -447,8 +470,7 @@ CREATE FUNCTION foo(int, out text) ...
     When repeated <command>CREATE FUNCTION</command> calls refer to
     the same object file, the file is only loaded once per session.
     To unload and
-    reload the file (perhaps during development), use the <xref
-    linkend="sql-load" endterm="sql-load-title"> command.
+    reload the file (perhaps during development), start a new session.
    </para>
 
    <para>
@@ -465,11 +487,31 @@ CREATE FUNCTION foo(int, out text) ...
     be escaped by doubling them.
    </para>
 
+   <para>
+    If a <literal>SET</> clause is attached to a function, then
+    the effects of a <command>SET LOCAL</> command executed inside the
+    function for the same variable are restricted to the function: the
+    configuration parameter's prior value is still restored at function exit.
+    However, an ordinary
+    <command>SET</> command (without <literal>LOCAL</>) overrides the
+    <literal>SET</> clause, much as it would do for a previous <command>SET
+    LOCAL</> command: the effects of such a command will persist after
+    function exit, unless the current transaction is rolled back.
+   </para>
+
    <para>
     To be able to define a function, the user must have the
     <literal>USAGE</literal> privilege on the language.
    </para>
 
+   <para>
+    When <command>CREATE OR REPLACE FUNCTION</> is used to replace an
+    existing function, the ownership and permissions of the function
+    do not change.  All other function properties are assigned the
+    values specified or implied in the command.  You must own the function
+    to replace it (this includes being a member of the owning role).
+   </para>
+
  </refsect1>
 
  <refsect1 id="sql-createfunction-examples">
@@ -566,6 +608,34 @@ BEGIN
         RETURN passed;
 END;
 $$ LANGUAGE plpgsql SECURITY DEFINER;
+</programlisting>
+
+   <para>
+    Before <productname>PostgreSQL</productname> version 8.3, the
+    <literal>SET</> option was not available, and so older functions may
+    contain rather complicated logic to save, set, and restore
+    <varname>search_path</>.  The <literal>SET</> option is far easier
+    to use for this purpose.
+   </para>
+
+   <para>
+    Another point to keep in mind is that by default, execute privilege
+    is granted to <literal>PUBLIC</> for newly created functions
+    (see <xref linkend="sql-grant" endterm="sql-grant-title"> for more
+    information).  Frequently you will wish to restrict use of a security
+    definer function to only some users.  To do that, you must revoke
+    the default <literal>PUBLIC</> privileges and then grant execute
+    privilege selectively.  To avoid having a window where the new function
+    is accessible to all, create it and set the privileges within a single
+    transaction.  For example:
+   </para>
+
+<programlisting>
+BEGIN;
+CREATE FUNCTION check_password(uname TEXT, pass TEXT) ... SECURITY DEFINER;
+REVOKE ALL ON FUNCTION check_password(uname TEXT, pass TEXT) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION check_password(uname TEXT, pass TEXT) TO admins;
+COMMIT;
 </programlisting>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 63d631882b8d..55351c070a33 100755
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_index.sgml,v 1.60 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_index.sgml,v 1.66 2007/11/26 21:36:33 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -37,7 +37,7 @@ CREATE [UNIQUE] INDEX name ON table
 
   <para>
    <command>CREATE INDEX</command> constructs an index <replaceable
-   class="parameter">index_name</replaceable> on the specified table.
+   class="parameter">name</replaceable> on the specified table.
    Indexes are primarily used to enhance database performance (though
    inappropriate use can result in slower performance).
   </para>
@@ -244,9 +244,9 @@ CREATE [UNIQUE] INDEX name ON table
       <listitem>
        <para>
         The tablespace in which to create the index.  If not specified,
-        <xref linkend="guc-default-tablespace"> is used, or the database's
-        default tablespace if <varname>default_tablespace</> is an empty
-        string.
+        <xref linkend="guc-default-tablespace"> is consulted, or
+        <xref linkend="guc-temp-tablespaces"> for indexes on temporary
+        tables.
        </para>
       </listitem>
      </varlistentry>
@@ -312,7 +312,7 @@ CREATE [UNIQUE] INDEX name ON table
     table. Other transactions can still read the table, but if they try to
     insert, update, or delete rows in the table they will block until the
     index build is finished. This could have a severe effect if the system is
-    a live production database. Large tables can take many hours to be
+    a live production database.  Very large tables can take many hours to be
     indexed, and even for smaller tables, an index build can lock out writers
     for periods that are unacceptably long for a production system.
    </para>
@@ -323,7 +323,8 @@ CREATE [UNIQUE] INDEX name ON table
     <literal>CONCURRENTLY</> option of <command>CREATE INDEX</>.
     When this option is used,
     <productname>PostgreSQL</> must perform two scans of the table, and in
-    addition it must wait for all existing transactions to terminate.  Thus
+    addition it must wait for all existing transactions that could potentially
+    use the index to terminate.  Thus
     this method requires more total work than a standard index build and takes
     significantly longer to complete.  However, since it allows normal
     operations to continue while the index is built, this method is useful for
@@ -332,11 +333,27 @@ CREATE [UNIQUE] INDEX name ON table
    </para>
 
    <para>
-    If a problem arises during the second scan of the table, such as a
+    In a concurrent index build, the index is actually entered into the
+    system catalogs in one transaction, then the two table scans occur in a
+    second and third transaction.
+    If a problem arises while scanning the table, such as a
     uniqueness violation in a unique index, the <command>CREATE INDEX</>
     command will fail but leave behind an <quote>invalid</> index. This index
     will be ignored for querying purposes because it might be incomplete;
-    however it will still consume update overhead.  The recommended recovery
+    however it will still consume update overhead. The <application>psql</>
+    <command>\d</> command will mark such an index as <literal>INVALID</>:
+
+<programlisting>
+postgres=# \d tab
+       Table "public.tab"
+ Column |  Type   | Modifiers 
+--------+---------+-----------
+ col    | integer | 
+Indexes:
+    "idx" btree (col) INVALID
+</programlisting>
+
+    The recommended recovery
     method in such cases is to drop the index and try again to perform
     <command>CREATE INDEX CONCURRENTLY</>.  (Another possibility is to rebuild
     the index with <command>REINDEX</>.  However, since <command>REINDEX</>
@@ -425,12 +442,6 @@ CREATE [UNIQUE] INDEX name ON table
    to remove an index.
   </para>
 
-  <para>
-   Indexes are not used for <literal>IS NULL</> clauses by default.
-   The best way to use indexes in such cases is to create a partial index
-   using an <literal>IS NULL</> predicate.
-  </para>
-
   <para>
    Prior releases of <productname>PostgreSQL</productname> also had an
    R-tree index method.  This method has been removed because
@@ -460,6 +471,18 @@ CREATE INDEX lower_title_idx ON films ((lower(title)));
 </programlisting>
   </para>
 
+  <caution>
+   <para>
+    Hash index operations are not presently WAL-logged,
+    so hash indexes might need to be rebuilt with <command>REINDEX</>
+    after a database crash if there were unwritten changes.
+    Also, changes to hash indexes are not replicated over warm standby
+    replication after the initial base backup, so they
+    give wrong answers to queries that subsequently use them.
+    For these reasons, hash index use is presently discouraged.
+   </para>
+  </caution>
+
   <para>
    To create an index with non-default sort ordering of nulls:
 <programlisting>
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index f9b43dbdb410..5683c4a65594 100755
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_language.sgml,v 1.43 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_language.sgml,v 1.44 2007/03/26 16:58:38 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -34,9 +34,7 @@ CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">name</
    <productname>PostgreSQL</productname> user can register a new
    procedural language with a <productname>PostgreSQL</productname>
    database.  Subsequently, functions and trigger procedures can be
-   defined in this new language.  The user must have the
-   <productname>PostgreSQL</productname> superuser privilege to
-   register a new language.
+   defined in this new language.
   </para>
 
   <para>
@@ -64,6 +62,20 @@ CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">name</
    old dump files, which are likely to contain out-of-date information
    about language support functions.
   </para>
+
+  <para>
+   Ordinarily, the user must have the
+   <productname>PostgreSQL</productname> superuser privilege to
+   register a new language.  However, the owner of a database can register
+   a new language within that database if the language is listed in
+   the <structname>pg_pltemplate</structname> catalog and is marked
+   as allowed to be created by database owners (<structfield>tmpldbacreate</>
+   is true).  The default is that trusted languages can be created
+   by database owners, but this can be adjusted by superusers by modifying
+   the contents of <structname>pg_pltemplate</structname>.
+   The creator of a language becomes its owner and can later
+   drop it, rename it, or assign it to a new owner.
+  </para>
  </refsect1>
 
  <refsect1 id="sql-createlanguage-parameters">
diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml
index 78276ec954d5..366922cc6248 100755
--- a/doc/src/sgml/ref/create_opclass.sgml
+++ b/doc/src/sgml/ref/create_opclass.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.20 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.21 2007/12/03 23:49:51 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -270,7 +270,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
 <programlisting>
 CREATE OPERATOR CLASS gist__int_ops
     DEFAULT FOR TYPE _int4 USING gist AS
-        OPERATOR        3       &&,
+        OPERATOR        3       &amp;&amp;,
         OPERATOR        6       =       RECHECK,
         OPERATOR        7       @&gt;,
         OPERATOR        8       &lt;@,
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 0b8e9fbe4d1b..4eea6d213ca9 100755
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.48 2007/02/01 00:28:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.49 2007/11/28 15:42:31 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -222,9 +222,9 @@ COMMUTATOR = OPERATOR(myschema.===) ,
   <para>
    The obsolete options <literal>SORT1</>, <literal>SORT2</>,
    <literal>LTCMP</>, and <literal>GTCMP</> were formerly used to
-   specify the names of sort operators associated with a mergejoinable
+   specify the names of sort operators associated with a merge-joinable
    operator.  This is no longer necessary, since information about
-   associated operators is found by looking at btree operator families
+   associated operators is found by looking at B-tree operator families
    instead.  If one of these options is given, it is ignored except
    for implicitly setting <literal>MERGES</> true.
   </para>
diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml
index 5251b08e9c0b..920dc019836b 100755
--- a/doc/src/sgml/ref/create_role.sgml
+++ b/doc/src/sgml/ref/create_role.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.9 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.10 2007/11/07 12:24:23 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -167,7 +167,7 @@ where option can be:
         privileges, but are not users in the usual sense of the word.
         If not specified,
         <literal>NOLOGIN</literal> is the default, except when
-        <command>CREATE ROLE</> is invoked through its alternate spelling
+        <command>CREATE ROLE</> is invoked through its alternative spelling
         <command>CREATE USER</>.
        </para>
       </listitem>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index 6d42196d573f..73181f0228d5 100755
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.52 2007/11/07 12:24:23 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -39,7 +39,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
 
   <para>
    The <productname>PostgreSQL</productname> rule system allows one to
-   define an alternate action to be performed on insertions, updates,
+   define an alternative action to be performed on insertions, updates,
    or deletions in database tables.  Roughly speaking, a rule causes
    additional commands to be executed when a given command on a given
    table is executed.  Alternatively, an <literal>INSTEAD</literal>
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml
index 0f39b8404370..6cb829be198f 100755
--- a/doc/src/sgml/ref/create_schema.sgml
+++ b/doc/src/sgml/ref/create_schema.sgml
@@ -64,7 +64,8 @@ CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable
       <term><replaceable class="parameter">schemaname</replaceable></term>
       <listitem>
        <para>
-        The name of a schema to be created.  If this is omitted, the user name
+        The name of a schema to be created.  If this is omitted, the
+        <replaceable class="parameter">username</replaceable>
         is used as the schema name.  The name cannot
         begin with <literal>pg_</literal>, as such names
         are reserved for system schemas.
@@ -76,9 +77,10 @@ CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable
       <term><replaceable class="parameter">username</replaceable></term>
       <listitem>
        <para>
-        The name of the user who will own the schema.  If omitted,
-        defaults to the user executing the command.  Only superusers
-        can create schemas owned by users other than themselves.
+        The role name of the user who will own the new schema.  If omitted,
+        defaults to the user executing the command.  To create a schema
+        owned by another role, you must be a direct or indirect member of
+        that role, or be a superuser.
        </para>
       </listitem>
      </varlistentry>
@@ -175,7 +177,8 @@ CREATE VIEW hollywood.winners AS
    all objects within it.  <productname>PostgreSQL</productname>
    allows schemas to contain objects owned by users other than the
    schema owner.  This can happen only if the schema owner grants the
-   <literal>CREATE</> privilege on his schema to someone else.
+   <literal>CREATE</> privilege on his schema to someone else, or a
+   superuser chooses to create objects in it.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index b342f4f4c32b..45c1d668a427 100755
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.107 2007/02/01 00:28:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.109 2007/07/17 05:02:00 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -300,7 +300,7 @@ Where column_reference_storage_directive is:
    </varlistentry>
 
    <varlistentry>
-    <term><literal>LIKE <replaceable>parent_table</replaceable> [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS } ]</literal></term>
+    <term><literal>LIKE <replaceable>parent_table</replaceable> [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | INDEXES } ]</literal></term>
     <listitem>
      <para>
       The <literal>LIKE</literal> clause specifies a table from which
@@ -328,11 +328,16 @@ Where column_reference_storage_directive is:
       column constraints and table constraints &mdash; when constraints are
       requested, all check constraints are copied.
      </para>
+     <para>
+      Any indexes on the original table will not be created on the new
+      table, unless the <literal>INCLUDING INDEXES</literal> clause is
+      specified.
+     </para>
      <para>
       Note also that unlike <literal>INHERITS</literal>, copied columns and
       constraints are not merged with similarly named columns and constraints.
       If the same name is specified explicitly or in another
-      <literal>LIKE</literal> clause an error is signalled.
+      <literal>LIKE</literal> clause, an error is signalled.
      </para>
     </listitem>
    </varlistentry>
@@ -717,9 +722,8 @@ Where column_reference_storage_directive is:
       The <replaceable class="PARAMETER">tablespace</replaceable> is the name
       of the tablespace in which the new table is to be created.
       If not specified,
-      <xref linkend="guc-default-tablespace"> is used, or the database's
-      default tablespace if <varname>default_tablespace</> is an empty
-      string.
+      <xref linkend="guc-default-tablespace"> is consulted, or
+      <xref linkend="guc-temp-tablespaces"> if the table is temporary.
      </para>
     </listitem>
    </varlistentry>
@@ -732,9 +736,8 @@ Where column_reference_storage_directive is:
       associated with a <literal>UNIQUE</literal> or <literal>PRIMARY
       KEY</literal> constraint will be created.
       If not specified,
-      <xref linkend="guc-default-tablespace"> is used, or the database's
-      default tablespace if <varname>default_tablespace</> is an empty
-      string.
+      <xref linkend="guc-default-tablespace"> is consulted, or
+      <xref linkend="guc-temp-tablespaces"> if the table is temporary.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index 6dccf3c8a906..328d9eeb71b5 100755
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.36 2006/09/18 19:54:01 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table_as.sgml,v 1.37 2007/06/03 17:06:12 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -195,9 +195,8 @@ where storage_parameter is:
       The <replaceable class="PARAMETER">tablespace</replaceable> is the name
       of the tablespace in which the new table is to be created.
       If not specified,
-      <xref linkend="guc-default-tablespace"> is used, or the database's
-      default tablespace if <varname>default_tablespace</> is an empty
-      string.
+      <xref linkend="guc-default-tablespace"> is consulted, or
+      <xref linkend="guc-temp-tablespaces"> if the table is temporary.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 035a1d15d73c..ce3b08d8b8fb 100755
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -176,7 +176,8 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
 
   <para>
    To create a trigger on a table, the user must have the
-   <literal>TRIGGER</literal> privilege on the table.
+   <literal>TRIGGER</literal> privilege on the table.  The user must
+   also have <literal>EXECUTE</literal> privilege on the trigger function.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/create_tsconfig.sgml b/doc/src/sgml/ref/create_tsconfig.sgml
new file mode 100644
index 000000000000..048cb63ce9a6
--- /dev/null
+++ b/doc/src/sgml/ref/create_tsconfig.sgml
@@ -0,0 +1,125 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsconfig.sgml,v 1.2 2007/08/22 05:13:50 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-CREATETSCONFIG">
+ <refmeta>
+  <refentrytitle id="sql-createtsconfig-title">CREATE TEXT SEARCH CONFIGURATION</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>CREATE TEXT SEARCH CONFIGURATION</refname>
+  <refpurpose>define a new text search configuration</refpurpose>
+ </refnamediv>
+
+ <indexterm zone="sql-createtsconfig">
+  <primary>CREATE TEXT SEARCH CONFIGURATION</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+CREATE TEXT SEARCH CONFIGURATION <replaceable class="parameter">name</replaceable> (
+    PARSER = <replaceable class="parameter">parser_name</replaceable> |
+    COPY = <replaceable class="parameter">source_config</replaceable>
+)
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>CREATE TEXT SEARCH CONFIGURATION</command> creates a new text
+   search configuration.  A text search configuration specifies a text
+   search parser that can divide a string into tokens, plus dictionaries
+   that can be used to determine which tokens are of interest for searching.
+  </para>
+
+  <para>
+   If only the parser is specified, then the new text search configuration
+   initially has no mappings from token types to dictionaries, and therefore
+   will ignore all words.  Subsequent <command>ALTER TEXT SEARCH
+   CONFIGURATION</command> commands must be used to create mappings to
+   make the configuration useful.  Alternatively, an existing text search
+   configuration can be copied.
+  </para>
+
+  <para>
+   If a schema name is given then the text search configuration is created in
+   the specified schema.  Otherwise it is created in the current schema.
+  </para>
+
+  <para>
+   The user who defines a text search configuration becomes its owner.
+  </para>
+
+  <para>
+   Refer to <xref linkend="textsearch"> for further information.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the text search configuration to be created.  The name can be
+      schema-qualified.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">parser_name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the text search parser to use for this configuration.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">source_config</replaceable></term>
+    <listitem>
+     <para>
+      The name of an existing text search configuration to copy.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+  
+ <refsect1>
+  <title>Notes</title>
+
+  <para>
+   The <literal>PARSER</> and <literal>COPY</> options are mutually
+   exclusive, because when an existing configuration is copied, its
+   parser selection is copied too.
+  </para>
+
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>CREATE TEXT SEARCH CONFIGURATION</command> statement
+   in the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertsconfig" endterm="sql-altertsconfig-title"></member>
+   <member><xref linkend="sql-droptsconfig" endterm="sql-droptsconfig-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/create_tsdictionary.sgml b/doc/src/sgml/ref/create_tsdictionary.sgml
new file mode 100644
index 000000000000..9aa53a6a7c48
--- /dev/null
+++ b/doc/src/sgml/ref/create_tsdictionary.sgml
@@ -0,0 +1,140 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsdictionary.sgml,v 1.2 2007/08/22 01:39:44 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-CREATETSDICTIONARY">
+ <refmeta>
+  <refentrytitle id="sql-createtsdictionary-title">CREATE TEXT SEARCH DICTIONARY</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>CREATE TEXT SEARCH DICTIONARY</refname>
+  <refpurpose>define a new text search dictionary</refpurpose>
+ </refnamediv>
+
+ <indexterm zone="sql-createtsdictionary">
+  <primary>CREATE TEXT SEARCH DICTIONARY</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+CREATE TEXT SEARCH DICTIONARY <replaceable class="parameter">name</replaceable> (
+    TEMPLATE = <replaceable class="parameter">template</replaceable>
+    [, <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ]]
+)
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>CREATE TEXT SEARCH DICTIONARY</command> creates a new text search
+   dictionary.  A text search dictionary specifies a way of recognizing
+   interesting or uninteresting words for searching.  A dictionary depends
+   on a text search template, which specifies the functions that actually
+   perform the work.  Typically the dictionary provides some options that
+   control the detailed behavior of the template's functions.
+  </para>
+
+  <para>
+   If a schema name is given then the text search dictionary is created in the
+   specified schema.  Otherwise it is created in the current schema.
+  </para>
+
+  <para>
+   The user who defines a text search dictionary becomes its owner.
+  </para>
+
+  <para>
+   Refer to <xref linkend="textsearch"> for further information.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the text search dictionary to be created.  The name can be
+      schema-qualified.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">template</replaceable></term>
+    <listitem>
+     <para>
+      The name of the text search template that will define the basic
+      behavior of this dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">option</replaceable></term>
+    <listitem>
+     <para>
+      The name of a template-specific option to be set for this dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">value</replaceable></term>
+    <listitem>
+     <para>
+      The value to use for a template-specific option.  If the value
+      is not a simple identifier or number, it must be quoted (but you can
+      always quote it, if you wish).
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <para>
+   The options can appear in any order.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   The following example command creates a Snowball-based dictionary
+   with a nonstandard list of stop words.
+  </para>
+
+<programlisting>
+CREATE TEXT SEARCH DICTIONARY my_russian (
+    template = snowball,
+    language = russian,
+    stopwords = myrussian
+);
+</programlisting>  
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>CREATE TEXT SEARCH DICTIONARY</command> statement in
+   the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertsdictionary" endterm="sql-altertsdictionary-title"></member>
+   <member><xref linkend="sql-droptsdictionary" endterm="sql-droptsdictionary-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/create_tsparser.sgml b/doc/src/sgml/ref/create_tsparser.sgml
new file mode 100644
index 000000000000..5f612cf0d96a
--- /dev/null
+++ b/doc/src/sgml/ref/create_tsparser.sgml
@@ -0,0 +1,152 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tsparser.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-CREATETSPARSER">
+ <refmeta>
+  <refentrytitle id="sql-createtsparser-title">CREATE TEXT SEARCH PARSER</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>CREATE TEXT SEARCH PARSER</refname>
+  <refpurpose>define a new text search parser</refpurpose>
+ </refnamediv>
+
+ <indexterm zone="sql-createtsparser">
+  <primary>CREATE TEXT SEARCH PARSER</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+CREATE TEXT SEARCH PARSER <replaceable class="parameter">name</replaceable> (
+    START = <replaceable class="parameter">start_function</replaceable> ,
+    GETTOKEN = <replaceable class="parameter">gettoken_function</replaceable> ,
+    END = <replaceable class="parameter">end_function</replaceable> ,
+    LEXTYPES = <replaceable class="parameter">lextypes_function</replaceable>
+    [, HEADLINE = <replaceable class="parameter">headline_function</replaceable> ]
+)
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>CREATE TEXT SEARCH PARSER</command> creates a new text search
+   parser.  A text search parser defines a method for splitting a text
+   string into tokens and assigning types (categories) to the tokens.
+   A parser is not particularly useful by itself, but must be bound into a
+   text search configuration along with some text search dictionaries
+   to be used for searching.
+  </para>
+
+  <para>
+   If a schema name is given then the text search parser is created in the
+   specified schema.  Otherwise it is created in the current schema.
+  </para>
+
+  <para>
+   You must be a superuser to use <command>CREATE TEXT SEARCH PARSER</command>.
+   (This restriction is made because an erroneous text search parser
+   definition could confuse or even crash the server.)
+  </para>
+
+  <para>
+   Refer to <xref linkend="textsearch"> for further information.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the text search parser to be created.  The name can be
+      schema-qualified.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">start_function</replaceable></term>
+    <listitem>
+     <para>
+      The name of the start function for the parser.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">gettoken_function</replaceable></term>
+    <listitem>
+     <para>
+      The name of the get-next-token function for the parser.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">end_function</replaceable></term>
+    <listitem>
+     <para>
+      The name of the end function for the parser.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">lextypes_function</replaceable></term>
+    <listitem>
+     <para>
+      The name of the lextypes function for the parser (a function that
+      returns information about the set of token types it produces).
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">headline_function</replaceable></term>
+    <listitem>
+     <para>
+      The name of the headline function for the parser (a function that
+      summarizes a set of tokens).
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <para>
+   The function names can be schema-qualified if necessary.  Argument types
+   are not given, since the argument list for each type of function is
+   predetermined.  All except the headline function are required.
+  </para>
+
+  <para>
+   The arguments can appear in any order, not only the one shown above.
+  </para>
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no
+   <command>CREATE TEXT SEARCH PARSER</command> statement in the SQL
+   standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertsparser" endterm="sql-altertsparser-title"></member>
+   <member><xref linkend="sql-droptsparser" endterm="sql-droptsparser-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/create_tstemplate.sgml b/doc/src/sgml/ref/create_tstemplate.sgml
new file mode 100644
index 000000000000..5abadb76be6e
--- /dev/null
+++ b/doc/src/sgml/ref/create_tstemplate.sgml
@@ -0,0 +1,125 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_tstemplate.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-CREATETSTEMPLATE">
+ <refmeta>
+  <refentrytitle id="sql-createtstemplate-title">CREATE TEXT SEARCH TEMPLATE</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>CREATE TEXT SEARCH TEMPLATE</refname>
+  <refpurpose>define a new text search template</refpurpose>
+ </refnamediv>
+
+ <indexterm zone="sql-createtstemplate">
+  <primary>CREATE TEXT SEARCH TEMPLATE</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+CREATE TEXT SEARCH TEMPLATE <replaceable class="parameter">name</replaceable> (
+    [ INIT = <replaceable class="parameter">init_function</replaceable> , ]
+    LEXIZE = <replaceable class="parameter">lexize_function</replaceable>
+)
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>CREATE TEXT SEARCH TEMPLATE</command> creates a new text search
+   template.  Text search templates define the functions that implement
+   text search dictionaries.  A template is not useful by itself, but must
+   be instantiated as a dictionary to be used.  The dictionary typically
+   specifies parameters to be given to the template functions.
+  </para>
+
+  <para>
+   If a schema name is given then the text search template is created in the
+   specified schema.  Otherwise it is created in the current schema.
+  </para>
+
+  <para>
+   You must be a superuser to use <command>CREATE TEXT SEARCH
+   TEMPLATE</command>.  This restriction is made because an erroneous text
+   search template definition could confuse or even crash the server.
+   The reason for separating templates from dictionaries is that a template
+   encapsulates the <quote>unsafe</> aspects of defining a dictionary.
+   The parameters that can be set when defining a dictionary are safe for
+   unprivileged users to set, and so creating a dictionary need not be a
+   privileged operation.
+  </para>
+
+  <para>
+   Refer to <xref linkend="textsearch"> for further information.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the text search template to be created.  The name can be
+      schema-qualified.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">init_function</replaceable></term>
+    <listitem>
+     <para>
+      The name of the init function for the template.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">lexize_function</replaceable></term>
+    <listitem>
+     <para>
+      The name of the lexize function for the template.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <para>
+   The function names can be schema-qualified if necessary.  Argument types
+   are not given, since the argument list for each type of function is
+   predetermined.  The lexize function is required, but the init function
+   is optional.
+  </para>
+
+  <para>
+   The arguments can appear in any order, not only the one shown above.
+  </para>
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no
+   <command>CREATE TEXT SEARCH TEMPLATE</command> statement in the SQL
+   standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertstemplate" endterm="sql-altertstemplate-title"></member>
+   <member><xref linkend="sql-droptstemplate" endterm="sql-droptstemplate-title"></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index fc60a305d303..512827319303 100755
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.68 2007/02/01 00:28:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_type.sgml,v 1.73.2.1 2008/05/27 18:05:20 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -23,6 +23,9 @@ PostgreSQL documentation
 CREATE TYPE <replaceable class="parameter">name</replaceable> AS
     ( <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [, ... ] )
 
+CREATE TYPE <replaceable class="parameter">name</replaceable> AS ENUM
+    ( '<replaceable class="parameter">label</replaceable>' [, ... ] )
+
 CREATE TYPE <replaceable class="parameter">name</replaceable> (
     INPUT = <replaceable class="parameter">input_function</replaceable>,
     OUTPUT = <replaceable class="parameter">output_function</replaceable>
@@ -80,11 +83,23 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
   </para>
   </refsect2>
 
+  <refsect2>
+   <title>Enumerated Types</title>
+
+   <para>
+    The second form of <command>CREATE TYPE</command> creates an enumerated
+    (enum) type, as described in <xref linkend="datatype-enum">.
+    Enum types take a list of one or more quoted labels, each of which
+    must be less than <symbol>NAMEDATALEN</symbol> bytes long (64 in a standard
+    <productname>PostgreSQL</productname> build).
+   </para>
+  </refsect2>
+
   <refsect2>
    <title>Base Types</title>
 
   <para>
-   The second form of <command>CREATE TYPE</command> creates a new base type
+   The third form of <command>CREATE TYPE</command> creates a new base type
    (scalar type).  The parameters can appear in any order, not only that
    illustrated above, and most are optional.  You must register
    two or more functions (using <command>CREATE FUNCTION</command>) before
@@ -200,8 +215,8 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    function might return <literal>(30,2)</>.
    It is allowed to omit the
    <replaceable class="parameter">type_modifier_output_function</replaceable>,
-   in which case the default display format is just the stored typmod value
-   enclosed in parentheses.
+   in which case the default display format is just the stored typmod integer
+   value enclosed in parentheses.
   </para>
 
   <para>
@@ -300,16 +315,16 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    <title>Array Types</title>
 
    <para>
-    Whenever a user-defined base data type is created,
+    Whenever a user-defined type is created,
     <productname>PostgreSQL</productname> automatically creates an
     associated array type, whose name consists of the base type's
     name prepended with an underscore, and truncated if necessary to keep
-    it less than <symbol>NAMEDATALEN</symbol> bytes long. (If the name
+    it less than <symbol>NAMEDATALEN</symbol> bytes long.  (If the name
     so generated collides with an existing type name, the process is
     repeated until a non-colliding name is found.)
-    The implicitly-created array type is variable length and uses the
+    This implicitly-created array type is variable length and uses the
     built-in input and output functions <literal>array_in</> and
-    <literal>array_out</>. The array type tracks any changes in its
+    <literal>array_out</>.  The array type tracks any changes in its
     element type's owner or schema, and is dropped if the element type is.
    </para>
 
@@ -367,6 +382,16 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term><replaceable class="parameter">label</replaceable></term>
+    <listitem>
+     <para>
+      A string literal representing the textual label associated with
+      one value of an enum type.
+     </para>
+    </listitem>
+   </varlistentry>
+
    <varlistentry>
     <term><replaceable class="parameter">input_function</replaceable></term>
     <listitem>
@@ -411,7 +436,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
     <term><replaceable class="parameter">type_modifier_input_function</replaceable></term>
     <listitem>
      <para>
-      The name of a function that converts numeric modifier(s) for the type
+      The name of a function that converts an array of modifier(s) for the type
       into internal form.
      </para>
     </listitem>
@@ -567,6 +592,27 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    while converting it to or from external form.
   </para>
 
+  <para>
+   Before <productname>PostgreSQL</productname> version 8.3, the name of
+   a generated array type was always exactly the element type's name with one
+   underscore character (<literal>_</literal>) prepended.  (Type names were
+   therefore restricted in length to one less character than other names.)
+   While this is still usually the case, the array type name may vary from
+   this in case of maximum-length names or collisions with user type names
+   that begin with underscore.  Writing code that depends on this convention
+   is therefore deprecated.  Instead, use
+   <structname>pg_type</>.<structfield>typarray</> to locate the array type
+   associated with a given type.
+  </para>
+
+  <para>
+   It may be advisable to avoid using type and table names that begin with
+   underscore.  While the server will change generated array type names to
+   avoid collisions with user-given names, there is still risk of confusion,
+   particularly with old client software that may assume that type names
+   beginning with underscores always represent arrays.
+  </para>
+
   <para>
    Before <productname>PostgreSQL</productname> version 8.2, the syntax
    <literal>CREATE TYPE <replaceable>name</></literal> did not exist.
@@ -611,6 +657,20 @@ $$ LANGUAGE SQL;
 </programlisting>
   </para>
 
+  <para>
+   This example creates an enumerated type and uses it in
+   a table definition:
+<programlisting>
+CREATE TYPE bug_status AS ENUM ('new', 'open', 'closed');
+
+CREATE TABLE bug (
+    id serial,
+    description text,
+    status bug_status
+);
+</programlisting>
+  </para>
+
   <para>
    This example creates the base data type <type>box</type> and then uses the
    type in a table definition:
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index f1466c867800..5ad6934d8f17 100755
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_view.sgml,v 1.35 2007/02/01 00:28:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_view.sgml,v 1.36.2.1 2009/10/02 18:13:19 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -140,10 +140,20 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
 
    <para>
     Access to tables referenced in the view is determined by permissions of
-    the view owner.  However, functions called in the view are treated the
-    same as if they had been called directly from the query using the view.
-    Therefore the user of a view must have permissions to call all functions
-    used by the view.
+    the view owner.  In some cases, this can be used to provide secure but
+    restricted access to the underlying tables.  However, not all views are
+    secure against tampering; see <xref linkend="rules-privileges"> for
+    details.  Functions called in the view are treated the same as if they had
+    been called directly from the query using the view.  Therefore the user of
+    a view must have permissions to call all functions used by the view.
+   </para>
+
+   <para>
+    When <command>CREATE OR REPLACE VIEW</> is used on an
+    existing view, only the view's defining SELECT rule is changed.
+    Other view properties, including ownership, permissions, and non-SELECT
+    rules, remain unchanged.  You must own the view
+    to replace it (this includes being a member of the owning role).
    </para>
 
  </refsect1>
@@ -226,6 +236,7 @@ CREATE VIEW <replaceable class="parameter">name</replaceable> [ ( <replaceable c
   <title>See Also</title>
 
   <simplelist type="inline">
+   <member><xref linkend="sql-alterview" endterm="sql-alterview-title"></member>
    <member><xref linkend="sql-dropview" endterm="sql-dropview-title"></member>
   </simplelist>
  </refsect1>
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index da75e9b15100..c75042c9b744 100755
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.42.2.2 2007/03/26 17:23:44 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.47 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -129,16 +129,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
-      <listitem>
-       <para>
-        Do not display a response.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-T <replaceable class="parameter">template</replaceable></></term>
       <term><option>--template <replaceable class="parameter">template</replaceable></></term>
@@ -193,7 +183,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>
@@ -203,7 +193,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt.
+        Force <application>createdb</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>createdb</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>createdb</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
@@ -275,10 +276,7 @@ PostgreSQL documentation
     database server:
 <screen>
 <prompt>$ </prompt><userinput>createdb demo</userinput>
-<computeroutput>CREATE DATABASE</computeroutput>
 </screen>
-    The response is the same as you would have gotten from running the
-    <command>CREATE DATABASE</command> <acronym>SQL</acronym> command.
    </para>
 
    <para>
@@ -288,8 +286,7 @@ PostgreSQL documentation
     underlying command:
 <screen>
 <prompt>$ </prompt><userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput>
-<computeroutput>CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'</computeroutput>
-<computeroutput>CREATE DATABASE</computeroutput>
+<computeroutput>CREATE DATABASE demo ENCODING 'LATIN1';</computeroutput>
 </screen>
    </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 3bd6c0d9937e..8383c66a8f96 100755
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.38.2.3 2007/05/15 19:43:59 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.42 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -144,7 +144,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt.
+        Force <application>createlang</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>createlang</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>createlang</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/deallocate.sgml b/doc/src/sgml/ref/deallocate.sgml
index 2038767c0d41..26fee6aa06b8 100755
--- a/doc/src/sgml/ref/deallocate.sgml
+++ b/doc/src/sgml/ref/deallocate.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/deallocate.sgml,v 1.9 2006/09/16 00:30:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/deallocate.sgml,v 1.10 2007/04/12 06:53:46 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -25,7 +25,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DEALLOCATE [ PREPARE ] <replaceable class="parameter">name</replaceable>
+DEALLOCATE [ PREPARE ] { <replaceable class="parameter">name</replaceable> | ALL }
 </synopsis>
  </refsynopsisdiv>
 
@@ -65,6 +65,15 @@ DEALLOCATE [ PREPARE ] <replaceable class="parameter">name</replaceable>
      </para>
     </listitem>
    </varlistentry>
+
+   <varlistentry>
+    <term><literal>ALL</literal></term>
+    <listitem>
+     <para>
+      Deallocate all prepared statements.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index 4afe2d03b255..269d2c101c4c 100755
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/declare.sgml,v 1.40 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/declare.sgml,v 1.42 2007/10/24 23:27:07 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -27,7 +27,6 @@ PostgreSQL documentation
 <synopsis>
 DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]
     CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">query</replaceable>
-    [ FOR { READ ONLY | UPDATE [ OF <replaceable class="parameter">column</replaceable> [, ...] ] } ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -37,50 +36,10 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
   <para>
    <command>DECLARE</command> allows a user to create cursors, which
    can be used to retrieve
-   a small number of rows at a time out of a larger query. Cursors can
-   return data either in text or in binary format using
+   a small number of rows at a time out of a larger query.
+   After the cursor is created, rows are fetched from it using
    <xref linkend="sql-fetch" endterm="sql-fetch-title">.
   </para>
-
-  <para>
-   Normal cursors return data in text format, the same as a
-   <command>SELECT</> would produce.  Since data is stored natively in
-   binary format, the system must do a conversion to produce the text
-   format.  Once the information comes back in text form, the client
-   application might need to convert it to a binary format to manipulate
-   it.  In addition, data in the text format is often larger in size
-   than in the binary format.  Binary cursors return the data in a
-   binary representation that might be more easily manipulated.
-   Nevertheless, if you intend to display the data as text anyway,
-   retrieving it in text form will
-   save you some effort on the client side.
-  </para>
-
-  <para>
-   As an example, if a query returns a value of one from an integer column,
-   you would get a string of <literal>1</> with a default cursor
-   whereas with a binary cursor you would get
-   a 4-byte field containing the internal representation of the value
-   (in big-endian byte order).
-  </para>
-
-  <para>
-   Binary cursors should be used carefully.  Many applications,
-   including <application>psql</application>, are not prepared to
-   handle binary cursors and expect data to come back in the text
-   format.
-  </para>
-
-  <note>
-   <para>
-    When the client application uses the <quote>extended query</> protocol
-    to issue a <command>FETCH</> command, the Bind protocol message
-    specifies whether data is to be retrieved in text or binary format.
-    This choice overrides the way that the cursor is defined.  The concept
-    of a binary cursor as such is thus obsolete when using extended query
-    protocol &mdash; any cursor can be treated as either text or binary.
-   </para>
-  </note>
  </refsect1>
 
  <refsect1>
@@ -110,10 +69,10 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     <listitem>
      <para>
       Indicates that data retrieved from the cursor should be
-      unaffected by updates to the tables underlying the cursor while
-      the cursor exists.  In <productname>PostgreSQL</productname>,
-      all cursors are insensitive; this key word currently has no
-      effect and is present for compatibility with the SQL standard.
+      unaffected by updates to the table(s) underlying the cursor that occur
+      after the cursor is created.  In <productname>PostgreSQL</productname>,
+      this is the default behavior; so this key word has no
+      effect and is only accepted for compatibility with the SQL standard.
      </para>
     </listitem>
    </varlistentry>
@@ -163,34 +122,6 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
      </para>
     </listitem>
    </varlistentry>
-
-   <varlistentry>
-    <term><literal>FOR READ ONLY</literal></term>
-    <term><literal>FOR UPDATE</literal></term>
-    <listitem>
-     <para>
-      <literal>FOR READ ONLY</literal> indicates that the cursor will
-      be used in a read-only mode.  <literal>FOR UPDATE</literal>
-      indicates that the cursor will be used to update tables.  Since
-      cursor updates are not currently supported in
-      <productname>PostgreSQL</productname>, specifying <literal>FOR
-      UPDATE</literal> will cause an error message and specifying
-      <literal>FOR READ ONLY</literal> has no effect.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><replaceable class="parameter">column</replaceable></term>
-    <listitem>
-     <para>
-      Column(s) to be updated by the cursor.  Since cursor updates are
-      not currently supported in
-      <productname>PostgreSQL</productname>, the <literal>FOR
-      UPDATE</literal> clause provokes an error message.
-     </para>
-    </listitem>
-   </varlistentry>
   </variablelist>
 
   <para>
@@ -203,13 +134,45 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
  <refsect1 id="sql-declare-notes">
   <title id="sql-declare-notes-title">Notes</title>
 
+  <para>
+   Normal cursors return data in text format, the same as a
+   <command>SELECT</> would produce.  The <literal>BINARY</> option
+   specifies that the cursor should return data in binary format.
+   This reduces conversion effort for both the server and client,
+   at the cost of more programmer effort to deal with platform-dependent
+   binary data formats.
+   As an example, if a query returns a value of one from an integer column,
+   you would get a string of <literal>1</> with a default cursor,
+   whereas with a binary cursor you would get
+   a 4-byte field containing the internal representation of the value
+   (in big-endian byte order).
+  </para>
+
+  <para>
+   Binary cursors should be used carefully.  Many applications,
+   including <application>psql</application>, are not prepared to
+   handle binary cursors and expect data to come back in the text
+   format.
+  </para>
+
+  <note>
+   <para>
+    When the client application uses the <quote>extended query</> protocol
+    to issue a <command>FETCH</> command, the Bind protocol message
+    specifies whether data is to be retrieved in text or binary format.
+    This choice overrides the way that the cursor is defined.  The concept
+    of a binary cursor as such is thus obsolete when using extended query
+    protocol &mdash; any cursor can be treated as either text or binary.
+   </para>
+  </note>
+
    <para>
     Unless <literal>WITH HOLD</literal> is specified, the cursor
     created by this command can only be used within the current
     transaction.  Thus, <command>DECLARE</> without <literal>WITH
     HOLD</literal> is useless outside a transaction block: the cursor would
     survive only to the completion of the statement.  Therefore
-    <productname>PostgreSQL</productname> reports an error if this
+    <productname>PostgreSQL</productname> reports an error if such a
     command is used outside a transaction block.
     Use
     <xref linkend="sql-begin" endterm="sql-begin-title">,
@@ -232,6 +195,11 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     transactions.
    </para>
 
+   <para>
+    <literal>WITH HOLD</literal> may not be specified when the query
+    includes <literal>FOR UPDATE</> or <literal>FOR SHARE</>.
+   </para>
+
    <para>
     The <literal>SCROLL</> option should be specified when defining a
     cursor that will be used to fetch backwards.  This is required by
@@ -245,6 +213,28 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     specified, then backward fetches are disallowed in any case.
    </para>
 
+   <para>
+    If the cursor's query includes <literal>FOR UPDATE</> or <literal>FOR
+    SHARE</>, then returned rows are locked at the time they are first
+    fetched, in the same way as for a regular
+    <xref linkend="sql-select" endterm="sql-select-title"> command with
+    these options.
+    In addition, the returned rows will be the most up-to-date versions;
+    therefore these options provide the equivalent of what the SQL standard
+    calls a <quote>sensitive cursor</>.  It is often wise to use <literal>FOR
+    UPDATE</> if the cursor is intended to be used with <command>UPDATE
+    ... WHERE CURRENT OF</> or <command>DELETE ... WHERE CURRENT OF</>,
+    since this will prevent other sessions from changing the rows between
+    the time they are fetched and the time they are updated.  Without
+    <literal>FOR UPDATE</>, a subsequent <literal>WHERE CURRENT OF</> command
+    will have no effect if the row was changed meanwhile.
+   </para>
+
+   <para>
+    <literal>SCROLL</literal> may not be specified when the query
+    includes <literal>FOR UPDATE</> or <literal>FOR SHARE</>.
+   </para>
+
    <para>
     The SQL standard only makes provisions for cursors in embedded
     <acronym>SQL</acronym>.  The <productname>PostgreSQL</productname>
@@ -280,14 +270,17 @@ DECLARE liahona CURSOR FOR SELECT * FROM films;
   <title>Compatibility</title>
 
   <para>
-   The SQL standard allows cursors only in embedded
-   <acronym>SQL</acronym> and in modules. <productname>PostgreSQL</>
-   permits cursors to be used interactively.
+   The SQL standard says that it is implementation-dependent whether cursors
+   are sensitive to concurrent updates of the underlying data by default.  In
+   <productname>PostgreSQL</productname>, cursors are insensitive by default,
+   and can be made sensitive by specifying <literal>FOR UPDATE</>.  Other
+   products may work differently.
   </para>
 
   <para>
-   The SQL standard allows cursors to update table data. All
-   <productname>PostgreSQL</> cursors are read only.
+   The SQL standard allows cursors only in embedded
+   <acronym>SQL</acronym> and in modules. <productname>PostgreSQL</>
+   permits cursors to be used interactively.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index f57c56ecf7e1..81e77fdf39a5 100755
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.30 2007/02/01 00:28:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.32 2007/11/28 15:42:31 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -20,9 +20,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
+DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
     [ USING <replaceable class="PARAMETER">usinglist</replaceable> ]
-    [ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
+    [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ AS <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
 </synopsis>
  </refsynopsisdiv>
@@ -45,13 +45,6 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ]
     </para>
    </tip>
 
-  <para>
-   By default, <command>DELETE</command> will delete rows in the
-   specified table and all its child tables. If you wish to delete only
-   from the specific table mentioned, you must use the
-   <literal>ONLY</literal> clause.
-  </para>
-
   <para>
    There are two ways to delete rows in a table using information
    contained in other tables in the database: using sub-selects, or
@@ -82,21 +75,17 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ]
   <title>Parameters</title>
 
   <variablelist>
-   <varlistentry>
-    <term><literal>ONLY</></term>
-    <listitem>
-     <para>
-      If specified, delete rows from the named table only.  When not
-      specified, any tables inheriting from the named table are also processed.
-     </para>
-    </listitem>
-   </varlistentry>
-
    <varlistentry>
     <term><replaceable class="parameter">table</replaceable></term>
     <listitem>
      <para>
-      The name (optionally schema-qualified) of an existing table.
+      The name (optionally schema-qualified) of the table to delete rows
+      from.  If <literal>ONLY</> is specified before the table name,
+      matching rows are deleted from the named table only.  If
+      <literal>ONLY</> is not specified, matching rows are also deleted
+      from any tables inheriting from the named table.  Optionally,
+      <literal>*</> can be specified after the table name to explicitly
+      indicate that descendant tables are included.
      </para>
     </listitem>
    </varlistentry>
@@ -134,9 +123,23 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ]
     <term><replaceable class="parameter">condition</replaceable></term>
     <listitem>
      <para>
-      An expression returning a value of type
-      <type>boolean</type>, which determines the rows that are to be
-      deleted.
+      An expression that returns a value of type <type>boolean</type>.
+      Only rows for which this expression returns <literal>true</>
+      will be deleted.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">cursor_name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the cursor to use in a <literal>WHERE CURRENT OF</>
+      condition.  The row to be deleted is the one most recently fetched
+      from this cursor.  The cursor must be a simple (non-join, non-aggregate)
+      query on the <command>DELETE</>'s target table.
+      Note that <literal>WHERE CURRENT OF</> cannot be
+      specified together with a Boolean condition.
      </para>
     </listitem>
    </varlistentry>
@@ -236,6 +239,14 @@ DELETE FROM films;
    Delete completed tasks, returning full details of the deleted rows:
 <programlisting>
 DELETE FROM tasks WHERE status = 'DONE' RETURNING *;
+</programlisting>      
+  </para>
+
+   <para>
+   Delete the row of <structname>tasks</> on which the cursor
+   <literal>c_tasks</> is currently positioned:
+<programlisting>
+DELETE FROM tasks WHERE CURRENT OF c_tasks;
 </programlisting>      
   </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml
new file mode 100644
index 000000000000..9572d5ab858a
--- /dev/null
+++ b/doc/src/sgml/ref/discard.sgml
@@ -0,0 +1,108 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/discard.sgml,v 1.2.2.1 2008/11/27 00:34:49 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-DISCARD">
+ <refmeta>
+  <refentrytitle id="SQL-DISCARD-TITLE">DISCARD</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DISCARD</refname>
+  <refpurpose>discard session state</refpurpose>
+ </refnamediv>
+
+ <indexterm zone="sql-discard">
+  <primary>DISCARD</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+DISCARD { ALL | PLANS | TEMPORARY | TEMP }
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>DISCARD</> releases internal resources associated with a
+   database session. These resources are normally released at the end
+   of the session.
+  </para>
+
+  <para>
+   <command>DISCARD TEMP</> drops all temporary tables created in the
+   current session.  <command>DISCARD PLANS</> releases all internally
+   cached query plans.  <command>DISCARD ALL</> resets a session to
+   its original state, discarding temporary resources and resetting
+   session-local configuration changes.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+
+   <varlistentry>
+    <term><literal>TEMPORARY</literal> or <literal>TEMP</literal></term>
+    <listitem>
+     <para>
+      Drops all temporary tables created in the current session.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>PLANS</literal></term>
+    <listitem>
+     <para>
+      Releases all cached query plans.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>ALL</literal></term>
+    <listitem>
+     <para>
+      Releases all temporary resources associated with the current
+      session and resets the session to its initial state.
+      Currently, this has the same effect as executing the following sequence
+      of statements:
+<programlisting>
+SET SESSION AUTHORIZATION DEFAULT;
+RESET ALL;
+DEALLOCATE ALL;
+CLOSE ALL;
+UNLISTEN *;
+SELECT pg_advisory_unlock_all();
+DISCARD PLANS;
+DISCARD TEMP;
+</programlisting>
+     </para>
+    </listitem>
+   </varlistentry>
+
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Notes</title>
+
+   <para>
+    <command>DISCARD ALL</> cannot be executed inside a transaction block.
+   </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   <command>DISCARD</command> is a <productname>PostgreSQL</productname> extension.
+  </para>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index ebb1466bc081..d73f14b2d871 100755
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.30 2006/09/16 00:30:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.31 2007/05/15 19:13:55 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -28,7 +28,7 @@ DROP AGGREGATE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> (
   <title>Description</title>
 
   <para>
-   <command>DROP AGGREGATE</command> will delete an existing
+   <command>DROP AGGREGATE</command> removes an existing
    aggregate function. To execute this command the current
    user must be the owner of the aggregate function.
   </para>
diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index ebb7eb500b74..2e7f9e37cd73 100755
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.17 2006/09/16 00:30:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.18 2007/05/15 19:13:55 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -20,7 +20,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP DOMAIN [IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]  [ CASCADE | RESTRICT ]
+DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -28,8 +28,8 @@ DROP DOMAIN [IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
   <title>Description</title>
 
   <para>
-   <command>DROP DOMAIN</command> will remove a domain.  Only the
-   owner of a domain can remove it.
+   <command>DROP DOMAIN</command> removes a domain.  Only the owner of
+   a domain can remove it.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_group.sgml b/doc/src/sgml/ref/drop_group.sgml
index 2ac211284bf3..014575a5a875 100755
--- a/doc/src/sgml/ref/drop_group.sgml
+++ b/doc/src/sgml/ref/drop_group.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_group.sgml,v 1.13.2.1 2007/05/15 19:43:59 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_group.sgml,v 1.14 2007/05/15 19:43:51 neilc Exp $
 PostgreSQL documentation
 -->
 
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index ad37287da67e..ca0d667b6eb1 100755
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.24 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.26 2007/05/15 19:13:55 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -28,9 +28,9 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</
   <title>Description</title>
 
   <para>
-   <command>DROP LANGUAGE</command> will remove the definition
-   of the previously registered procedural language called
-   <replaceable class="parameter">name</replaceable>.
+   <command>DROP LANGUAGE</command> removes the definition of a
+   previously registered procedural language.  You must be a superuser
+   or the owner of the language to use <command>DROP LANGUAGE</>.
   </para>
  </refsect1>
   
@@ -43,7 +43,7 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</
     <term><literal>IF EXISTS</literal></term>
     <listitem>
      <para>
-      Do not throw an error if the function does not exist. A notice is issued 
+      Do not throw an error if the language does not exist. A notice is issued 
       in this case.
      </para>
     </listitem>
diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml
index 9dd4184916da..a7fce5f64d59 100755
--- a/doc/src/sgml/ref/drop_owned.sgml
+++ b/doc/src/sgml/ref/drop_owned.sgml
@@ -29,10 +29,11 @@ DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCAD
   <title>Description</title>
 
   <para>
-   <command>DROP OWNED</command> drops all the objects in the current
+   <command>DROP OWNED</command> drops all the objects within the current
    database that are owned by one of the specified roles. Any
    privileges granted to the given roles on objects in the current
-   database will also be revoked.
+   database and on shared objects (databases, tablespaces) will also be
+   revoked.
   </para>
  </refsect1>
 
@@ -92,6 +93,10 @@ DROP OWNED BY <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCAD
    reassigns the ownership of all the database objects owned by one or
    more roles.
   </para>
+
+  <para>
+   Databases and tablespaces owned by the role(s) will not be removed.
+  </para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index b0755ee18893..58be47acb076 100755
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.26 2006/09/16 00:30:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.27 2007/05/15 19:13:55 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -28,7 +28,8 @@ DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [,
   <title>Description</title>
 
   <para>
-   <command>DROP SEQUENCE</command> removes sequence number generators.
+   <command>DROP SEQUENCE</command> removes sequence number
+   generators. A sequence can only be dropped by its owner or a superuser.
   </para>
  </refsect1>
   
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index 46ee3ac9b09e..287d6dbd9973 100755
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.26 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.27 2007/05/15 19:13:55 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -29,7 +29,7 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
 
   <para>
    <command>DROP TABLE</command> removes tables from the database.
-   Only its owner can destroy a table.  To empty a table of rows
+   Only its owner can drop a table.  To empty a table of rows
    without destroying the table, use <xref linkend="sql-delete"
    endterm="sql-delete-title"> or <xref linkend="sql-truncate"
    endterm="sql-truncate-title">.
diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml
index bf570d851a0b..31a4888141c7 100755
--- a/doc/src/sgml/ref/drop_tablespace.sgml
+++ b/doc/src/sgml/ref/drop_tablespace.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tablespace.sgml,v 1.6 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tablespace.sgml,v 1.7 2007/06/03 17:06:13 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -36,7 +36,10 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">tablespacename</rep
    The tablespace must be empty of all database objects before it can be
    dropped. It is possible that objects in other databases might still reside
    in the tablespace even if no objects in the current database are using
-   the tablespace.
+   the tablespace.  Also, if the tablespace is listed in the <xref
+   linkend="guc-temp-tablespaces"> setting of any active session, the
+   <command>DROP</> might fail due to temporary files residing in the
+   tablespace.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tsconfig.sgml b/doc/src/sgml/ref/drop_tsconfig.sgml
new file mode 100644
index 000000000000..5cc8e3caf337
--- /dev/null
+++ b/doc/src/sgml/ref/drop_tsconfig.sgml
@@ -0,0 +1,118 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsconfig.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-DROPTSCONFIG">
+ <refmeta>
+  <refentrytitle id="SQL-DROPTSCONFIG-TITLE">DROP TEXT SEARCH CONFIGURATION</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DROP TEXT SEARCH CONFIGURATION</refname>
+  <refpurpose>remove a text search configuration</refpurpose>
+ </refnamediv>
+  
+ <indexterm zone="sql-droptsconfig">
+  <primary>DROP TEXT SEARCH CONFIGURATION</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>DROP TEXT SEARCH CONFIGURATION</command> drops an existing text
+   search configuration.  To execute this command you must be the owner of the
+   configuration.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+
+   <varlistentry>
+    <term><literal>IF EXISTS</literal></term>
+    <listitem>
+     <para>
+      Do not throw an error if the text search configuration does not exist.
+      A notice is issued in this case.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search
+      configuration.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>CASCADE</literal></term>
+    <listitem>
+     <para>
+      Automatically drop objects that depend on the text search configuration.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>RESTRICT</literal></term>
+    <listitem>
+     <para>
+      Refuse to drop the text search configuration if any objects depend on it.
+      This is the default.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   Remove the text search configuration <literal>my_english</literal>:
+
+<programlisting>
+DROP TEXT SEARCH CONFIGURATION my_english;
+</programlisting>
+
+   This command will not succeed if there are any existing indexes
+   that reference the configuration in <function>to_tsvector</> calls.
+   Add <literal>CASCADE</> to
+   drop such indexes along with the text search configuration.
+  </para>
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>DROP TEXT SEARCH CONFIGURATION</command> statement in
+   the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertsconfig" endterm="sql-altertsconfig-title"></member>
+   <member><xref linkend="sql-createtsconfig" endterm="sql-createtsconfig-title"></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/drop_tsdictionary.sgml b/doc/src/sgml/ref/drop_tsdictionary.sgml
new file mode 100644
index 000000000000..683d4dc9b2ff
--- /dev/null
+++ b/doc/src/sgml/ref/drop_tsdictionary.sgml
@@ -0,0 +1,117 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsdictionary.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-DROPTSDICTIONARY">
+ <refmeta>
+  <refentrytitle id="SQL-DROPTSDICTIONARY-TITLE">DROP TEXT SEARCH DICTIONARY</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DROP TEXT SEARCH DICTIONARY</refname>
+  <refpurpose>remove a text search dictionary</refpurpose>
+ </refnamediv>
+  
+ <indexterm zone="sql-droptsdictionary">
+  <primary>DROP TEXT SEARCH DICTIONARY</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>DROP TEXT SEARCH DICTIONARY</command> drops an existing text
+   search dictionary.  To execute this command you must be the owner of the
+   dictionary.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+
+   <varlistentry>
+    <term><literal>IF EXISTS</literal></term>
+    <listitem>
+     <para>
+      Do not throw an error if the text search dictionary does not exist.
+      A notice is issued in this case.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search
+      dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>CASCADE</literal></term>
+    <listitem>
+     <para>
+      Automatically drop objects that depend on the text search dictionary.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>RESTRICT</literal></term>
+    <listitem>
+     <para>
+      Refuse to drop the text search dictionary if any objects depend on it.
+      This is the default.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   Remove the text search dictionary <literal>english</literal>:
+
+<programlisting>
+DROP TEXT SEARCH DICTIONARY english;
+</programlisting>
+
+   This command will not succeed if there are any existing text search
+   configurations that use the dictionary.  Add <literal>CASCADE</> to
+   drop such configurations along with the dictionary.
+  </para>
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>DROP TEXT SEARCH DICTIONARY</command> statement in the
+   SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertsdictionary" endterm="sql-altertsdictionary-title"></member>
+   <member><xref linkend="sql-createtsdictionary" endterm="sql-createtsdictionary-title"></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/drop_tsparser.sgml b/doc/src/sgml/ref/drop_tsparser.sgml
new file mode 100644
index 000000000000..7a482283adae
--- /dev/null
+++ b/doc/src/sgml/ref/drop_tsparser.sgml
@@ -0,0 +1,115 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tsparser.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-DROPTSPARSER">
+ <refmeta>
+  <refentrytitle id="SQL-DROPTSPARSER-TITLE">DROP TEXT SEARCH PARSER</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DROP TEXT SEARCH PARSER</refname>
+  <refpurpose>remove a text search parser</refpurpose>
+ </refnamediv>
+  
+ <indexterm zone="sql-droptsparser">
+  <primary>DROP TEXT SEARCH PARSER</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+DROP TEXT SEARCH PARSER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>DROP TEXT SEARCH PARSER</command> drops an existing text search
+   parser.  You must be a superuser to use this command.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+
+   <varlistentry>
+    <term><literal>IF EXISTS</literal></term>
+    <listitem>
+     <para>
+      Do not throw an error if the text search parser does not exist.
+      A notice is issued in this case.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search parser.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>CASCADE</literal></term>
+    <listitem>
+     <para>
+      Automatically drop objects that depend on the text search parser.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>RESTRICT</literal></term>
+    <listitem>
+     <para>
+      Refuse to drop the text search parser if any objects depend on it.
+      This is the default.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   Remove the text search parser <literal>my_parser</literal>:
+
+<programlisting>
+DROP TEXT SEARCH PARSER my_parser;
+</programlisting>
+
+   This command will not succeed if there are any existing text search
+   configurations that use the parser.  Add <literal>CASCADE</> to
+   drop such configurations along with the parser.
+  </para>
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>DROP TEXT SEARCH PARSER</command> statement in the
+   SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertsparser" endterm="sql-altertsparser-title"></member>
+   <member><xref linkend="sql-createtsparser" endterm="sql-createtsparser-title"></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/drop_tstemplate.sgml b/doc/src/sgml/ref/drop_tstemplate.sgml
new file mode 100644
index 000000000000..6a776d1da97d
--- /dev/null
+++ b/doc/src/sgml/ref/drop_tstemplate.sgml
@@ -0,0 +1,116 @@
+<!--
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_tstemplate.sgml,v 1.1 2007/08/21 21:08:47 tgl Exp $
+PostgreSQL documentation
+-->
+
+<refentry id="SQL-DROPTSTEMPLATE">
+ <refmeta>
+  <refentrytitle id="SQL-DROPTSTEMPLATE-TITLE">DROP TEXT SEARCH TEMPLATE</refentrytitle>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DROP TEXT SEARCH TEMPLATE</refname>
+  <refpurpose>remove a text search template</refpurpose>
+ </refnamediv>
+  
+ <indexterm zone="sql-droptstemplate">
+  <primary>DROP TEXT SEARCH TEMPLATE</primary>
+ </indexterm>
+
+ <refsynopsisdiv>
+<synopsis>
+DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>DROP TEXT SEARCH TEMPLATE</command> drops an existing text search
+   template.  You must be a superuser to use this command.
+  </para>
+ </refsect1>
+  
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+
+   <varlistentry>
+    <term><literal>IF EXISTS</literal></term>
+    <listitem>
+     <para>
+      Do not throw an error if the text search template does not exist.
+      A notice is issued in this case.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing text search
+      template.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>CASCADE</literal></term>
+    <listitem>
+     <para>
+      Automatically drop objects that depend on the text search template.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>RESTRICT</literal></term>
+    <listitem>
+     <para>
+      Refuse to drop the text search template if any objects depend on it.
+      This is the default.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   Remove the text search template <literal>thesaurus</literal>:
+
+<programlisting>
+DROP TEXT SEARCH TEMPLATE thesaurus;
+</programlisting>
+
+   This command will not succeed if there are any existing text search
+   dictionaries that use the template.  Add <literal>CASCADE</> to
+   drop such dictionaries along with the template.
+  </para>
+ </refsect1>
+ 
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   There is no <command>DROP TEXT SEARCH TEMPLATE</command> statement in the
+   SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertstemplate" endterm="sql-altertstemplate-title"></member>
+   <member><xref linkend="sql-createtstemplate" endterm="sql-createtstemplate-title"></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/drop_user.sgml b/doc/src/sgml/ref/drop_user.sgml
index 07b621983201..cc1002562b48 100755
--- a/doc/src/sgml/ref/drop_user.sgml
+++ b/doc/src/sgml/ref/drop_user.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.23.2.1 2007/05/15 19:43:59 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.24 2007/05/15 19:43:51 neilc Exp $
 PostgreSQL documentation
 -->
 
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index 03a8d4aa0e2d..b531c6d235b2 100755
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.23 2006/09/16 00:30:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.24 2007/07/03 01:30:35 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -104,6 +104,7 @@ DROP VIEW kinds;
   <title>See Also</title>
 
   <simplelist type="inline">
+   <member><xref linkend="sql-alterview" endterm="sql-alterview-title"></member>
    <member><xref linkend="sql-createview" endterm="sql-createview-title"></member>
   </simplelist>
  </refsect1>
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 65752904cdfd..daf01287fb7f 100755
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.28.2.2 2007/03/26 17:23:44 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.34 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -60,7 +60,7 @@ PostgreSQL documentation
       <term><replaceable class="parameter">dbname</replaceable></term>
       <listitem>
        <para>
-	Specifies the name of the database to be removed.
+        Specifies the name of the database to be removed.
        </para>
       </listitem>
      </varlistentry>
@@ -71,7 +71,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Echo the commands that <application>dropdb</application> generates
-	and sends to the server.
+        and sends to the server.
        </para>
       </listitem>
      </varlistentry>
@@ -85,16 +85,6 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
-     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
-      <listitem>
-       <para>
-        Do not display a response.
-       </para>
-      </listitem>
-     </varlistentry>
     </variablelist>
   </para>
 
@@ -108,10 +98,10 @@ PostgreSQL documentation
       <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
-	Specifies the host name of the machine on which the 
-	server
-	is running.  If the value begins with a slash, it is used 
-	as the directory for the Unix domain socket.
+        Specifies the host name of the machine on which the 
+        server
+        is running.  If the value begins with a slash, it is used 
+        as the directory for the Unix domain socket.
        </para>
       </listitem>
      </varlistentry>
@@ -121,9 +111,9 @@ PostgreSQL documentation
       <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
-	Specifies the TCP port or local Unix domain socket file 
-	extension on which the server
-	is listening for connections.
+        Specifies the TCP port or local Unix domain socket file 
+        extension on which the server
+        is listening for connections.
        </para>
       </listitem>
      </varlistentry>
@@ -133,7 +123,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>
@@ -143,7 +133,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt.
+        Force <application>dropdb</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>dropdb</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>dropdb</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
@@ -202,7 +203,6 @@ PostgreSQL documentation
     database server:
 <screen>
 <prompt>$ </prompt><userinput>dropdb demo</userinput>
-<computeroutput>DROP DATABASE</computeroutput>
 </screen>
    </para>
 
@@ -214,8 +214,7 @@ PostgreSQL documentation
 <prompt>$ </prompt><userinput>dropdb -p 5000 -h eden -i -e demo</userinput>
 <computeroutput>Database "demo" will be permanently deleted.
 Are you sure? (y/n) </computeroutput><userinput>y</userinput>
-<computeroutput>DROP DATABASE "demo"
-DROP DATABASE</computeroutput>
+<computeroutput>DROP DATABASE demo;</computeroutput>
 </screen>
    </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index a33e54314bc5..ee334e13e5e5 100755
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/droplang.sgml,v 1.27.2.2 2007/03/26 17:23:44 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/droplang.sgml,v 1.31 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -67,7 +67,7 @@ PostgreSQL documentation
       <term><replaceable class="parameter">langname</replaceable></term>
       <listitem>
        <para>
-	Specifies the name of the backend programming language to be removed.
+        Specifies the name of the backend programming language to be removed.
        </para>
       </listitem>
      </varlistentry>
@@ -77,7 +77,7 @@ PostgreSQL documentation
       <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
-	Specifies from which database the language should be removed.
+        Specifies from which database the language should be removed.
         The default is to use the database with the same name as the
         current system user.
        </para>
@@ -117,10 +117,10 @@ PostgreSQL documentation
       <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
-	Specifies the host name of the machine on which the 
-	server
-	is running.  If host begins with a slash, it is used 
-	as the directory for the Unix domain socket.
+        Specifies the host name of the machine on which the 
+        server
+        is running.  If host begins with a slash, it is used 
+        as the directory for the Unix domain socket.
        </para>
       </listitem>
      </varlistentry>
@@ -130,9 +130,9 @@ PostgreSQL documentation
       <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
-	extension on which the server
-	is listening for connections.
+        Specifies the Internet TCP/IP port or local Unix domain socket file 
+        extension on which the server
+        is listening for connections.
        </para>
       </listitem>
      </varlistentry>
@@ -142,7 +142,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>
@@ -152,7 +152,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt.
+        Force <application>droplang</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>droplang</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>droplang</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 848077832361..af57135f120a 100755
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.34.2.2 2007/03/26 17:23:44 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.39 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -87,16 +87,6 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
-     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
-      <listitem>
-       <para>
-        Do not display a response.
-       </para>
-      </listitem>
-     </varlistentry>
     </variablelist>
   </para>
 
@@ -135,7 +125,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as (not the user name to drop)
+        User name to connect as (not the user name to drop).
        </para>
       </listitem>
      </varlistentry>
@@ -145,8 +135,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt (to connect to the server, not for the
-        password of the user to be dropped).
+        Force <application>dropuser</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>dropuser</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>dropuser</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
@@ -205,7 +205,6 @@ PostgreSQL documentation
     server:
 <screen>
 <prompt>$ </prompt><userinput>dropuser joe</userinput>
-<computeroutput>DROP ROLE</computeroutput>
 </screen>
    </para>
 
@@ -217,8 +216,7 @@ PostgreSQL documentation
 <prompt>$ </prompt><userinput>dropuser -p 5000 -h eden -i -e joe</userinput>
 <computeroutput>Role "joe" will be permanently removed.
 Are you sure? (y/n) </computeroutput><userinput>y</userinput>
-<computeroutput>DROP ROLE "joe"
-DROP ROLE</computeroutput>
+<computeroutput>DROP ROLE joe;</computeroutput>
 </screen>
    </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml
index 70e2be68ac5d..89fb0274cac2 100755
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/explain.sgml,v 1.39 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/explain.sgml,v 1.41 2007/11/28 15:42:31 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -72,7 +72,7 @@ EXPLAIN [ ANALYZE ] [ VERBOSE ] <replaceable class="parameter">statement</replac
   <important>
    <para>
     Keep in mind that the statement is actually executed when
-    <literal>ANALYZE</literal> is used.  Although
+    the <literal>ANALYZE</literal> option is used.  Although
     <command>EXPLAIN</command> will discard any output that a
     <command>SELECT</command> would return, other side effects of the
     statement will happen as usual.  If you wish to use
@@ -141,23 +141,33 @@ ROLLBACK;
   <para>
    In order to allow the <productname>PostgreSQL</productname> query
    planner to make reasonably informed decisions when optimizing
-   queries, the <command>ANALYZE</command> statement should be run to
-   record statistics about the distribution of data within the
-   table. If you have not done this (or if the statistical
-   distribution of the data in the table has changed significantly
-   since the last time <command>ANALYZE</command> was run), the
-   estimated costs are unlikely to conform to the real properties of
-   the query, and consequently an inferior query plan might be chosen.
+   queries, the <xref linkend="sql-analyze" endterm="sql-analyze-title">
+   statement should be run to record statistics about the distribution
+   of data within the table. If you have not done this (or if the
+   statistical distribution of the data in the table has changed
+   significantly since the last time <command>ANALYZE</command> was
+   run), the estimated costs are unlikely to conform to the real
+   properties of the query, and consequently an inferior query plan
+   might be chosen.
   </para>
 
   <para>
-   Genetic query optimization (<acronym>GEQO</acronym>) randomly 
-   tests execution plans.  Therefore, when the number of tables exceeds
-   <varname>geqo_threshold</> causing genetic query optimization to be 
-   used, the execution plan is likely to change each time the statement
-   is executed.
+   Genetic query optimization (<acronym>GEQO</acronym>) randomly tests
+   execution plans.  Therefore, when the number of join relations
+   exceeds <xref linkend="guc-geqo-threshold"> causing genetic query
+   optimization to be used, the execution plan is likely to change
+   each time the statement is executed.
   </para>
 
+  <para>
+   In order to measure the run-time cost of each node in the execution
+   plan, the current implementation of <command>EXPLAIN
+   ANALYZE</command> can add considerable profiling overhead to query
+   execution. As a result, running <command>EXPLAIN ANALYZE</command>
+   on a query can sometimes take significantly longer than executing
+   the query normally. The amount of overhead depends on the nature of
+   the query.
+  </para>
  </refsect1>
 
  <refsect1>
@@ -194,8 +204,8 @@ EXPLAIN SELECT * FROM foo WHERE i = 4;
   </para>
 
   <para>
-   And here is an example of a query plan for a query
-   using an aggregate function:
+   Here is an example of a query plan for a query using an aggregate
+   function:
 
 <programlisting>
 EXPLAIN SELECT sum(i) FROM foo WHERE i &lt; 10;
diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index c5975c73e053..a3168d5f484c 100755
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/fetch.sgml,v 1.40 2007/02/01 00:28:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/fetch.sgml,v 1.41 2007/10/24 22:55:52 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -326,11 +326,6 @@ FETCH <replaceable class="parameter">count</replaceable>
    <literal>FETCH ABSOLUTE 0</literal>) is fast.
   </para>
 
-  <para>
-   Updating data via a cursor is currently not supported by
-   <productname>PostgreSQL</productname>.
-  </para>
-
   <para>
    <xref linkend="sql-declare" endterm="sql-declare-title">
    is used to define a cursor.  Use
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index 9dd6dd604607..971dda0be716 100755
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.64 2007/02/01 00:28:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.67.2.1 2008/05/28 00:45:47 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -23,28 +23,28 @@ PostgreSQL documentation
 GRANT { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }
     [,...] | ALL [ PRIVILEGES ] }
     ON [ TABLE ] <replaceable class="PARAMETER">tablename</replaceable> [, ...]
-    TO { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { USAGE | SELECT | UPDATE }
     [,...] | ALL [ PRIVILEGES ] }
     ON SEQUENCE <replaceable class="PARAMETER">sequencename</replaceable> [, ...]
-    TO { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }
     ON DATABASE <replaceable>dbname</replaceable> [, ...]
-    TO { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { EXECUTE | ALL [ PRIVILEGES ] }
     ON FUNCTION <replaceable>funcname</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) [, ...]
-    TO { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | ALL [ PRIVILEGES ] }
     ON LANGUAGE <replaceable>langname</replaceable> [, ...]
-    TO { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }
     ON SCHEMA <replaceable>schemaname</replaceable> [, ...]
-    TO { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { CREATE | ALL [ PRIVILEGES ] }
     ON TABLESPACE <replaceable>tablespacename</replaceable> [, ...]
@@ -230,10 +230,10 @@ GRANT { SELECT | INSERT | ALL [PRIVILEGES] }
        have this privilege for the containing schema.
       </para>
       <para>
-       For tablespaces, allows tables and indexes to be created within the
-       tablespace, and allows databases to be created that have the tablespace
-       as their default tablespace.  (Note that revoking this privilege
-       will not alter the placement of existing objects.)
+       For tablespaces, allows tables, indexes, and temporary files to be
+       created within the tablespace, and allows databases to be created that
+       have the tablespace as their default tablespace.  (Note that revoking
+       this privilege will not alter the placement of existing objects.)
       </para>
      </listitem>
     </varlistentry>
@@ -463,18 +463,16 @@ GRANT { SELECT | INSERT | ALL [PRIVILEGES] }
     to obtain information about existing privileges, for example:
 <programlisting>
 =&gt; \z mytable
-
-                        Access privileges for database "lusitania"
- Schema |  Name   | Type  |                     Access privileges
---------+---------+-------+-----------------------------------------------------------
- public | mytable | table | {miriam=arwdxt/miriam,=r/miriam,"group todos=arw/miriam"}
+                  Access privileges for database "lusitania"
+ Schema |  Name   | Type  |                 Access privileges                 
+--------+---------+-------+---------------------------------------------------
+ public | mytable | table | {miriam=arwdxt/miriam,=r/miriam,admin=arw/miriam}
 (1 row)
 </programlisting>
     The entries shown by <command>\z</command> are interpreted thus:
 <programlisting>
+      rolename=xxxx -- privileges granted to a role
               =xxxx -- privileges granted to PUBLIC
-         uname=xxxx -- privileges granted to a user
-   group gname=xxxx -- privileges granted to a group
 
                   r -- SELECT ("read")
                   w -- UPDATE ("write")
@@ -490,7 +488,7 @@ GRANT { SELECT | INSERT | ALL [PRIVILEGES] }
              arwdxt -- ALL PRIVILEGES (for tables)
                   * -- grant option for preceding privilege
 
-              /yyyy -- user who granted this privilege
+              /yyyy -- role that granted this privilege
 </programlisting>
 
     The above example display would be seen by user <literal>miriam</literal> after
@@ -498,7 +496,7 @@ GRANT { SELECT | INSERT | ALL [PRIVILEGES] }
 
 <programlisting>
 GRANT SELECT ON mytable TO PUBLIC;
-GRANT SELECT, UPDATE, INSERT ON mytable TO GROUP todos;
+GRANT SELECT, UPDATE, INSERT ON mytable TO admin;
 </programlisting>
    </para>
 
@@ -578,14 +576,8 @@ GRANT admins TO joe;
    </para>
 
    <para>
-    The SQL standard allows setting privileges for individual columns
-    within a table:
-
-<synopsis>
-GRANT <replaceable class="PARAMETER">privileges</replaceable>
-    ON <replaceable class="PARAMETER">table</replaceable> [ ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) ] [, ...]
-    TO { PUBLIC | <replaceable class="PARAMETER">username</replaceable> [, ...] } [ WITH GRANT OPTION ]
-</synopsis>
+    <productname>PostgreSQL</productname> does not support the SQL-standard 
+    functionality of setting privileges for individual columns.
    </para>
 
    <para>
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index 4b32b740650e..7f027d4b9b3d 100755
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.40 2007/02/01 19:10:24 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.43 2007/03/26 17:23:36 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -176,6 +176,15 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--no-locale</option></term>
+      <listitem>
+       <para>
+		Equivalent to <option>--locale=C</option>.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-X <replaceable class="parameter">directory</replaceable></option></term>
       <term><option>--xlogdir=<replaceable class="parameter">directory</replaceable></option></term>
@@ -225,6 +234,17 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
+
+    <varlistentry>
+     <term><option>--text-search-config=<replaceable>CFG</></option></term>
+     <listitem>
+      <para>
+	   Sets the default text search configuration.
+	   See <xref linkend="guc-default-text-search-config"> for further information.
+      </para>
+     </listitem>
+    </varlistentry>
+
     </variablelist>
    </para>
 
@@ -237,11 +257,11 @@ PostgreSQL documentation
       <term><option>--debug</option></term>
       <listitem>
        <para>
-	Print debugging output from the bootstrap backend and a few other
+        Print debugging output from the bootstrap backend and a few other
         messages of lesser interest for the general public.
-	The bootstrap backend is the program <command>initdb</command>
-	uses to create the catalog tables.  This option generates a tremendous
-	amount of extremely boring output.
+        The bootstrap backend is the program <command>initdb</command>
+        uses to create the catalog tables.  This option generates a tremendous
+        amount of extremely boring output.
        </para>
       </listitem>
      </varlistentry>
@@ -263,11 +283,11 @@ PostgreSQL documentation
       <term><option>--noclean</option></term>
       <listitem>
        <para>
-	By default, when <command>initdb</command>
-	determines that an error prevented it from completely creating the database
-	cluster, it removes any files it might have created before discovering
-	that it cannot finish the job. This option inhibits tidying-up and is
-	thus useful for debugging.
+        By default, when <command>initdb</command>
+        determines that an error prevented it from completely creating the database
+        cluster, it removes any files it might have created before discovering
+        that it cannot finish the job. This option inhibits tidying-up and is
+        thus useful for debugging.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/load.sgml b/doc/src/sgml/ref/load.sgml
index fca434096bc0..30948e7152a6 100755
--- a/doc/src/sgml/ref/load.sgml
+++ b/doc/src/sgml/ref/load.sgml
@@ -11,7 +11,7 @@ $PostgreSQL: pgsql/doc/src/sgml/ref/load.sgml,v 1.25 2008/11/14 10:22:47 petere
 
  <refnamediv>
   <refname>LOAD</refname>
-  <refpurpose>load or reload a shared library file</refpurpose>
+  <refpurpose>load a shared library file</refpurpose>
  </refnamediv>
 
  <indexterm zone="sql-load">
@@ -29,13 +29,12 @@ LOAD '<replaceable class="PARAMETER">filename</replaceable>'
 
   <para>
    This command loads a shared library file into the <productname>PostgreSQL</>
-   server's address space.  If the file had been loaded previously,
-   it is first unloaded.  This command is primarily useful to unload
-   and reload a shared library file that has been changed since the
-   server first loaded it.  To make use of the shared library,
-   function(s) in it need to be declared using the <xref
-   linkend="sql-createfunction" endterm="sql-createfunction-title">
-   command.
+   server's address space.  If the file has been loaded already,
+   the command does nothing.  Shared library files that contain C functions
+   are automatically loaded whenever one of their functions is called.
+   Therefore, an explicit <command>LOAD</> is usually only needed to
+   load a library that modifies the server's behavior through <quote>hooks</>
+   rather than providing a set of functions.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index a9cc45a1003d..6ee18d406e74 100755
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.38 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.44 2007/11/10 21:48:51 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -21,9 +21,11 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
   <cmdsynopsis>
+
    <command>pg_ctl</command>
    <arg choice="plain">start</arg>
    <arg>-w</arg>
+   <arg>-t <replaceable>seconds</replaceable></arg>
    <arg>-s</arg>
    <arg>-D <replaceable>datadir</replaceable></arg>
    <arg>-l <replaceable>filename</replaceable></arg>
@@ -31,9 +33,11 @@ PostgreSQL documentation
    <arg>-p <replaceable>path</replaceable></arg>
    <arg>-c</arg>
    <sbr>
+
    <command>pg_ctl</command>
    <arg choice="plain">stop</arg>
    <arg>-W</arg>
+   <arg>-t <replaceable>seconds</replaceable></arg>
    <arg>-s</arg>
    <arg>-D <replaceable>datadir</replaceable></arg>
    <arg>-m
@@ -44,9 +48,11 @@ PostgreSQL documentation
      </group>
    </arg>
    <sbr>
+
    <command>pg_ctl</command>
    <arg choice="plain">restart</arg>
    <arg>-w</arg>
+   <arg>-t <replaceable>seconds</replaceable></arg>
    <arg>-s</arg>
    <arg>-D <replaceable>datadir</replaceable></arg>
    <arg>-c</arg>
@@ -59,20 +65,24 @@ PostgreSQL documentation
    </arg>
    <arg>-o <replaceable>options</replaceable></arg>
    <sbr>
+
    <command>pg_ctl</command>
    <arg choice="plain">reload</arg>
    <arg>-s</arg>
    <arg>-D <replaceable>datadir</replaceable></arg>
    <sbr>
+
    <command>pg_ctl</command>
    <arg choice="plain">status</arg>
    <arg>-D <replaceable>datadir</replaceable></arg>
    <sbr>
+
    <command>pg_ctl</command>
    <arg choice="plain">kill</arg>
-   <arg><replaceable>signal_name</replaceable></arg>
-   <arg><replaceable>process_id</replaceable></arg>
+   <arg choice="plain"><replaceable>signal_name</replaceable></arg>
+   <arg choice="plain"><replaceable>process_id</replaceable></arg>
    <sbr>
+
    <command>pg_ctl</command>
    <arg choice="plain">register</arg>
    <arg>-N <replaceable>servicename</replaceable></arg>
@@ -80,11 +90,15 @@ PostgreSQL documentation
    <arg>-P <replaceable>password</replaceable></arg>
    <arg>-D <replaceable>datadir</replaceable></arg>
    <arg>-w</arg>
+   <arg>-t <replaceable>seconds</replaceable></arg>
+   <arg>-s</arg>
    <arg>-o <replaceable>options</replaceable></arg>
    <sbr>
+
    <command>pg_ctl</command>
    <arg choice="plain">unregister</arg>
    <arg>-N <replaceable>servicename</replaceable></arg>
+
   </cmdsynopsis>
  </refsynopsisdiv>
 
@@ -175,13 +189,27 @@ PostgreSQL documentation
   <title>Options</title>
 
     <variablelist>
+
+     <varlistentry>
+      <term><option>-c</option></term>
+      <listitem>
+       <para>
+        Attempt to allow server crashes to produce core files, on platforms
+        where this available, by lifting any soft resource limit placed on 
+        them. 
+        This is useful in debugging or diagnosing problems by allowing a 
+        stack trace to be obtained from a failed server process.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-D <replaceable class="parameter">datadir</replaceable></option></term>
       <listitem>
        <para>
-	Specifies the file system location of the database files.  If
-	this is omitted, the environment variable
-	<envar>PGDATA</envar> is used.
+        Specifies the file system location of the database files.  If
+        this is omitted, the environment variable
+        <envar>PGDATA</envar> is used.
        </para>
       </listitem>
      </varlistentry>
@@ -202,10 +230,10 @@ PostgreSQL documentation
       <term><option>-m <replaceable class="parameter">mode</replaceable></option></term>
       <listitem>
        <para>
-	Specifies the shutdown mode.  <replaceable>mode</replaceable>
-	can be <literal>smart</literal>, <literal>fast</literal>, or
-	<literal>immediate</literal>, or the first letter of one of
-	these three.
+        Specifies the shutdown mode.  <replaceable>mode</replaceable>
+        can be <literal>smart</literal>, <literal>fast</literal>, or
+        <literal>immediate</literal>, or the first letter of one of
+        these three.
        </para>
       </listitem>
      </varlistentry>
@@ -218,8 +246,8 @@ PostgreSQL documentation
         <command>postgres</command> command.
        </para>
        <para>
-	The options are usually surrounded by single or double
-	quotes to ensure that they are passed through as a group.
+        The options are usually surrounded by single or double
+        quotes to ensure that they are passed through as a group.
        </para>
       </listitem>
      </varlistentry>
@@ -228,12 +256,12 @@ PostgreSQL documentation
       <term><option>-p <replaceable class="parameter">path</replaceable></option></term>
       <listitem>
        <para>
-	Specifies the location of the <filename>postgres</filename>
-	executable.  By default the <filename>postgres</filename> executable is taken from the same
-	directory as <command>pg_ctl</command>, or failing that, the hard-wired
-	installation directory.  It is not necessary to use this
-	option unless you are doing something unusual and get errors
-	that the <filename>postgres</filename> executable was not found.
+        Specifies the location of the <filename>postgres</filename>
+        executable.  By default the <filename>postgres</filename> executable is taken from the same
+        directory as <command>pg_ctl</command>, or failing that, the hard-wired
+        installation directory.  It is not necessary to use this
+        option unless you are doing something unusual and get errors
+        that the <filename>postgres</filename> executable was not found.
        </para>
       </listitem>
      </varlistentry>
@@ -248,14 +276,11 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-c</option></term>
+      <term><option>-t</option></term>
       <listitem>
        <para>
-        Attempt to allow server crashes to produce core files, on platforms
-        where this available, by lifting any soft resource limit placed on 
-		them. 
-		This is useful in debugging or diagnosing problems by allowing a 
-		stack trace to be obtained from a failed server process.
+        The number of seconds to wait when waiting for start or shutdown
+        to complete.
        </para>
       </listitem>
      </varlistentry>
@@ -264,8 +289,8 @@ PostgreSQL documentation
       <term><option>-w</option></term>
       <listitem>
        <para>
-	Wait for the start or shutdown to complete.  Times out after
-	60 seconds.  This is the default for shutdowns. A successful 
+        Wait for the start or shutdown to complete.  The default wait time
+        is 60 seconds.  This is the default option for shutdowns. A successful 
         shutdown is indicated by removal of the <acronym>PID</acronym> 
         file. For starting up, a successful <command>psql -l</command> 
         indicates success. <command>pg_ctl</command> will attempt to 
@@ -276,7 +301,7 @@ PostgreSQL documentation
         <productname>PostgreSQL</productname> was compiled with 
         (5432 by default). When waiting, <command>pg_ctl</command> will
         return an accurate exit code based on the success of the startup 
-	or shutdown.
+        or shutdown.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 7b12690ab103..dd5600d536ff 100755
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.95 2007/02/20 15:01:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.98.2.2 2008/08/26 00:03:24 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -632,7 +632,7 @@ PostgreSQL documentation
       <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
-        Connect as the given user.
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>
@@ -642,8 +642,18 @@ PostgreSQL documentation
       <term><option>--password</option></term>
       <listitem>
        <para>
-        Force a password prompt.  This should happen automatically if
-        the server requires password authentication.
+        Force <application>pg_dump</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>pg_dump</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>pg_dump</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
@@ -708,22 +718,13 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   <application>pg_dump</application> has a few limitations:
-
-   <itemizedlist>
-    <listitem>
-     <para>
-      When a data-only dump is chosen and the option
-      <option>--disable-triggers</> is used,
-      <application>pg_dump</application> emits commands to disable
-      triggers on user tables before inserting the data and commands
-      to re-enable them after the data has been inserted.  If the
-      restore is stopped in the middle, the system catalogs might be
-      left in the wrong state.
-     </para>
-    </listitem>
-
-   </itemizedlist>
+   <application>pg_dump</application> has a limitation; when a
+   data-only dump is chosen and the option <option>--disable-triggers</>
+   is used, <application>pg_dump</application> emits commands
+   to disable triggers on user tables before inserting the data
+   and commands to re-enable them after the data has been
+   inserted.  If the restore is stopped in the middle, the system
+   catalogs might be left in the wrong state.
   </para>
 
   <para>
@@ -736,11 +737,14 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   The dump file produced by <application>pg_dump</application> does
-   not contain the statistics used by the optimizer to make query
-   planning decisions.  Therefore, it is wise to run
-   <command>ANALYZE</command> after restoring from a dump file to
-   ensure good performance.
+   The dump file produced by <application>pg_dump</application>
+   does not contain the statistics used by the optimizer to make
+   query planning decisions.  Therefore, it is wise to run
+   <command>ANALYZE</command> after restoring from a dump file
+   to ensure good performance.  The dump file also does not
+   contain any <command>ALTER DATABASE ... SET</> commands;
+   these settings are dumped by <xref linkend="app-pg-dumpall">,
+   along with database users and other installation-wide settings.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 7166868c1617..51fa8611b3f0 100755
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.65 2007/02/01 04:39:33 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.69 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -59,7 +59,7 @@ PostgreSQL documentation
   <para>
   <application>pg_dumpall</application> needs to connect several
   times to the <productname>PostgreSQL</productname> server (once per
-  database).  If you use password authentication it is likely to ask for
+  database).  If you use password authentication it will ask for
   a password each time. It is convenient to have a
   <filename>~/.pgpass</> file in such cases. See <xref
   linkend="libpq-pgpass"> for more information.
@@ -128,7 +128,7 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
+ 
      <varlistentry>
       <term><option>-f <replaceable class="parameter">filename</replaceable></option></term>
       <term><option>--file=<replaceable class="parameter">filename</replaceable></option></term>
@@ -334,7 +334,7 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
+ 
      <varlistentry>
       <term>-l <replaceable>dbname</replaceable></term>
       <term>--database=<replaceable>dbname</replaceable></term>
@@ -366,7 +366,7 @@ PostgreSQL documentation
       <term>--username=<replaceable>username</replaceable></term>
       <listitem>
        <para>
-        Connect as the given user.
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>
@@ -376,8 +376,24 @@ PostgreSQL documentation
       <term>--password</term>
       <listitem>
        <para>
-        Force a password prompt.  This should happen automatically if
-        the server requires password authentication.
+        Force <application>pg_dumpall</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>pg_dumpall</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>pg_dumpall</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
+       </para>
+
+       <para>
+        Note that the password prompt will occur again for each database
+        to be dumped.  Usually, it's better to set up a
+        <filename>~/.pgpass</> file than to rely on manual password entry.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 29add771243a..0e9fdde0ff12 100755
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.68 2007/02/20 15:01:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.72.2.1 2010/05/15 18:11:19 tgl Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <refmeta>
@@ -11,7 +11,8 @@
   <refname>pg_restore</refname>
 
   <refpurpose>
-   restore a <productname>PostgreSQL</productname> database from an archive file created by pg_dump
+   restore a <productname>PostgreSQL</productname> database from an
+   archive file created by <application>pg_dump</application>
   </refpurpose>
  </refnamediv>
 
@@ -45,10 +46,11 @@
 
   <para>
    <application>pg_restore</application> can operate in two modes.
-   If a database name is specified, the archive is restored directly into
+   If a database name is specified, <application>pg_restore</application>
+   connects to that database and restores archive contents directly into
    the database.  Otherwise, a script containing the SQL
    commands necessary to rebuild the database is created and written
-   to a file or standard output.  The script output is equivalent to
+   to a file or standard output.  This script output is equivalent to
    the plain text output format of <application>pg_dump</application>.
    Some of the options controlling the output are therefore analogous to
    <application>pg_dump</application> options.
@@ -168,10 +170,7 @@
          <term><literal>tar</></term>
          <listitem>
           <para>
-           The archive is a <command>tar</command> archive. Using this
-           archive format allows reordering and/or exclusion of schema
-           elements at the time the database is restored. It is also
-           possible to limit which data is reloaded at restore time.
+           The archive is a <command>tar</command> archive.
           </para>
          </listitem>
         </varlistentry>
@@ -182,10 +181,7 @@
          <listitem>
           <para>
            The archive is in the custom format of
-           <application>pg_dump</application>. This is the most
-           flexible format in that it allows reordering of data load
-           as well as schema elements.  This format is also compressed
-           by default.
+           <application>pg_dump</application>.
           </para>
          </listitem>
         </varlistentry>
@@ -220,8 +216,9 @@
       <listitem>
        <para>
         List the contents of the archive. The output of this operation
-        can be used with the <option>-L</option> option to restrict
-        and reorder the items that are restored.
+        can be used as input to the <option>-L</option> option.  Note that
+        if filtering switches such as <option>-n</> or <option>-t</> are
+        used with <option>-l</>, they will restrict the items listed.
        </para>
       </listitem>
      </varlistentry>
@@ -231,11 +228,18 @@
       <term><option>--use-list=<replaceable class="parameter">list-file</replaceable></option></term>
       <listitem>
        <para>
-        Restore elements in <replaceable class="PARAMETER">
-        list-file</replaceable> only, and in the
-        order they appear in the file. Lines can be moved and can also
-        be commented out by placing a <literal>;</literal> at the
-        start of the line.  (See below for examples.)
+        Restore only those archive elements that are listed in <replaceable
+        class="PARAMETER">list-file</replaceable>, and restore them in the
+        order they appear in the file.  Note that
+        if filtering switches such as <option>-n</> or <option>-t</> are
+        used with <option>-L</>, they will further restrict the items restored.
+       </para>
+       <para>
+        <replaceable class="PARAMETER">list-file</> is normally created by
+        editing the output of a previous <option>-l</> operation.
+        Lines can be moved or removed, and can also
+        be commented out by placing a semicolon (<literal>;</literal>) at the
+        start of the line.  See below for examples.
        </para>
       </listitem>
      </varlistentry>
@@ -457,7 +461,7 @@
       <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
-        Connect as the given user.
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>
@@ -467,8 +471,18 @@
       <term><option>--password</option></term>
       <listitem>
        <para>
-        Force a password prompt.  This should happen automatically if
-        the server requires password authentication.
+        Force <application>pg_restore</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>pg_restore</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>pg_restore</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index e67042b1622c..0024c43cc5a5 100755
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.50 2007/02/16 02:10:07 alvherre Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.51 2007/07/09 01:08:09 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -33,17 +33,17 @@ PostgreSQL documentation
    <command>postgres</command> is the
    <productname>PostgreSQL</productname> database server.  In order
    for a client application to access a database it connects (over a
-   network or locally) to a running <command>postgres</command> process.
+   network or locally) to a running <command>postgres</command> instance.
    The <command>postgres</command> instance then starts a separate server
    process to handle the connection.
   </para>
 
   <para>
-   One <command>postgres</command> instance always manages the data from
+   One <command>postgres</command> instance always manages the data of
    exactly one database cluster.  A database cluster is a collection
    of databases that is stored at a common file system location (the
    <quote>data area</quote>).  More than one
-   <command>postgres</command> process can run on a system at one
+   <command>postgres</command> instance can run on a system at one
    time, so long as they use different data areas and different
    communication ports (see below).  When
    <command>postgres</command> starts it needs to know the location
@@ -119,8 +119,9 @@ PostgreSQL documentation
        <para>
         Sets the number of shared buffers for use by the server
         processes.  The default value of this parameter is chosen
-        automatically by <application>initdb</application>; refer to <xref
-        linkend="runtime-config-resource-memory"> for more information.
+        automatically by <application>initdb</application>.
+        Specifying this option is equivalent to setting the
+        <xref linkend="guc-shared-buffers"> configuration parameter.
        </para>
       </listitem>
      </varlistentry>
@@ -256,13 +257,9 @@ PostgreSQL documentation
       <listitem>
        <para>
         Sets the maximum number of client connections that this
-        server will accept.  By
-        default, this value is 32, but it can be set as high as your
-        system will support.  (Note that
-        <option>-B</option> is required to be at least twice
-        <option>-N</option>.  See <xref linkend="kernel-resources"> for a discussion of
-        system resource requirements for large numbers of client
-        connections.) Specifying this option is equivalent to setting the
+        server will accept.  The default value of this parameter is chosen
+        automatically by <application>initdb</application>.
+        Specifying this option is equivalent to setting the
         <xref linkend="guc-max-connections"> configuration parameter.
        </para>
       </listitem>
@@ -272,7 +269,7 @@ PostgreSQL documentation
       <term><option>-o <replaceable class="parameter">extra-options</replaceable></option></term>
       <listitem>
        <para>
-        The command line-style options specified in <replaceable
+        The command-line-style options specified in <replaceable
         class="parameter">extra-options</replaceable> are passed to
         all server processes started by this
         <command>postgres</command> process.  If the option string contains
@@ -354,11 +351,11 @@ PostgreSQL documentation
     <title>Semi-internal Options</title>
 
     <para>
-     There are several other options that can be specified, used
-     mainly for debugging purposes and in some cases to assist with
+     The options described here are used
+     mainly for debugging purposes, and in some cases to assist with
      recovery of severely damaged databases. There should be no reason
-     to use them in a production database setup.  These are listed
-     here only for the use by <productname>PostgreSQL</productname>
+     to use them in a production database setup.  They are listed
+     here only for use by <productname>PostgreSQL</productname>
      system developers.  Furthermore, these options might
      change or be removed in a future release without notice.
     </para>
@@ -500,8 +497,9 @@ PostgreSQL documentation
       <term><replaceable class="parameter">database</replaceable></term>
       <listitem>
        <para>
-        Specifies the name of the database to be accessed.  If it is
-        omitted it defaults to the user name.   
+        Specifies the name of the database to be accessed.  This must be
+        the last argument on the command line.  If it is
+        omitted it defaults to the user name.
        </para>
       </listitem>
      </varlistentry>
@@ -647,6 +645,12 @@ PostgreSQL documentation
 
  <refsect1>
   <title>Notes</title>
+
+  <para>
+   The utility command <xref linkend="app-pg-ctl"> can be used to
+   start and shut down the <command>postgres</command> server
+   safely and comfortably.
+  </para>
   
   <para>
    If at all possible, <emphasis>do not</emphasis> use
@@ -665,16 +669,14 @@ PostgreSQL documentation
    all clients to terminate before quitting, the second will
    forcefully disconnect all clients, and the third will quit
    immediately without proper shutdown, resulting in a recovery run
-   during restart.  The <literal>SIGHUP</literal> signal will reload
-   the server configuration files.  It is also possible to send
-   <literal>SIGHUP</literal> to an individual server process, but that
-   is usually not sensible.
+   during restart.
   </para>
 
   <para>
-   The utility command <xref linkend="app-pg-ctl"> can be used to
-   start and shut down the <command>postgres</command> server
-   safely and comfortably.
+   The <literal>SIGHUP</literal> signal will reload
+   the server configuration files.  It is also possible to send
+   <literal>SIGHUP</literal> to an individual server process, but that
+   is usually not sensible.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml
index 524e23dd6422..8debfc1ac2f3 100755
--- a/doc/src/sgml/ref/prepare.sgml
+++ b/doc/src/sgml/ref/prepare.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.22 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/prepare.sgml,v 1.23 2007/05/15 19:13:55 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -25,7 +25,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-PREPARE <replaceable class="PARAMETER">name</replaceable> [ (<replaceable class="PARAMETER">datatype</replaceable> [, ...] ) ] AS <replaceable class="PARAMETER">statement</replaceable>
+PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">datatype</replaceable> [, ...] ) ] AS <replaceable class="PARAMETER">statement</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml
index d73014cfba3b..71289116cc46 100755
--- a/doc/src/sgml/ref/prepare_transaction.sgml
+++ b/doc/src/sgml/ref/prepare_transaction.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/prepare_transaction.sgml,v 1.5 2006/09/16 00:30:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/prepare_transaction.sgml,v 1.6.2.1 2008/03/12 20:11:54 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -96,7 +96,8 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
   </para>
 
   <para>
-   If the transaction modified any run-time parameters with <command>SET</>,
+   If the transaction modified any run-time parameters with <command>SET</>
+   (without the <literal>LOCAL</> option),
    those effects persist after <command>PREPARE TRANSACTION</>, and will not
    be affected by any later <command>COMMIT PREPARED</command> or 
    <command>ROLLBACK PREPARED</command>.  Thus, in this one respect
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 05822e8e09dd..7aedc721e819 100755
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.183 2007/02/01 19:10:24 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.198.2.3 2010/03/08 12:39:42 mha Exp $
 PostgreSQL documentation
 -->
 
@@ -119,10 +119,6 @@ PostgreSQL documentation
        If this parameter contains an <symbol>=</symbol> sign, it is treated as a
        <parameter>conninfo</parameter> string. See <xref linkend="libpq-connect"> for more information.
       </para>
-	  <para>
-	  If this parameter contains an <symbol>=</symbol> sign, it it treated as a
-	  <parameter>conninfo</parameter> string. See <xref linkend="libpq-connect"> for more information.
-	  </para>
       </listitem>
     </varlistentry>
 
@@ -578,17 +574,19 @@ PostgreSQL documentation
     passwords. See <xref linkend="libpq-pgpass"> for more information.
     </para>
 
-	<para>
-    An alternative way to specify connection parameters is in a
-	<parameter>conninfo</parameter>	string, which is used instead of a 
-	database name. This mechanism give you very wide control over the 
-	connection. For example:
+    <para>
+     An alternative way to specify connection parameters is in a
+     <parameter>conninfo</parameter> string, which is used instead of a 
+     database name. This mechanism give you very wide control over the 
+     connection. For example:
 <programlisting>
 $ <userinput>psql "service=myservice sslmode=require"</userinput>
 </programlisting>
-    See <xref linkend="libpq-connect"> for more information on all the
-	available connection options.
-	</para>
+     This way you can also use LDAP for connection parameter lookup as
+     described in <xref linkend="libpq-ldap">.
+     See <xref linkend="libpq-connect"> for more information on all the
+     available connection options.
+    </para>
 
     <para>
      An alternative way to specify connection parameters is in a
@@ -924,7 +922,7 @@ testdb=&gt;
 
         <listitem>
         <para>
-        Lists aggregate functions, together with their
+        Lists all available aggregate functions, together with their
         return type and the data types they operate on. If <replaceable
         class="parameter">pattern</replaceable>
         is specified, only aggregates whose names match the pattern are shown.
@@ -2074,10 +2072,11 @@ lo_import 152801
 
 
       <varlistentry>
-        <term><literal>\q</literal></term>
+        <term><literal>\q</literal> or <literal>\quit</literal></term>
         <listitem>
         <para>
         Quits the <application>psql</application> program.
+        In a script file, only execution of that script is terminated.
         </para>
         </listitem>
       </varlistentry>
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index d6d1a13279e3..03e2736f7947 100755
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.36 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.37 2007/11/18 18:42:03 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -231,9 +231,7 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } <replaceable class="PARAMETER">nam
    subsequent <command>CREATE INDEX</> locks out writes but not reads; since
    the index is not there, no read will attempt to use it, meaning that there
    will be no blocking but reads might be forced into expensive sequential
-   scans.  Another important point is that the drop/create approach
-   invalidates any cached query plans that use the index, while
-   <command>REINDEX</> does not.
+   scans.
   </para>
 
   <para>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index c1d707bb3539..259b17086094 100755
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -69,27 +69,33 @@ PostgreSQL documentation
       <term><option>--all</></term>
       <listitem>
        <para>
-	Reindex all databases.
+        Reindex all databases.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-s</></term>
-      <term><option>--system</></term>
+      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
-	Reindex database's system catalogs.
+        Specifies the name of the database to be reindexed.
+        If this is not specified and <option>-a</option> (or
+        <option>--all</option>) is not used, the database name is read
+        from the environment variable <envar>PGDATABASE</envar>.  If
+        that is not set, the user name specified for the connection is
+        used.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-t <replaceable class="parameter">table</replaceable></></term>
-      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
-	Reindex <replaceable class="parameter">table</replaceable> only.
+        Echo the commands that <application>reindexdb</application> generates
+        and sends to the server.
        </para>
       </listitem>
      </varlistentry>
@@ -99,47 +105,40 @@ PostgreSQL documentation
       <term><option>--index <replaceable class="parameter">index</replaceable></></term>
       <listitem>
        <para>
-	Recreate <replaceable class="parameter">index</replaceable> only.
+        Recreate <replaceable class="parameter">index</replaceable> only.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>-q</></term>
+      <term><option>--quiet</></term>
       <listitem>
        <para>
-	Specifies the name of the database to be reindexed.
-	If this is not specified and <option>-a</option> (or
-	<option>--all</option>) is not used, the database name is read
-	from the environment variable <envar>PGDATABASE</envar>.  If
-	that is not set, the user name specified for the connection is
-	used.
+        Do not display progress messages.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-s</></term>
+      <term><option>--system</></term>
       <listitem>
        <para>
-        Echo the commands that <application>reindexdb</application> generates
-	and sends to the server.
+        Reindex database's system catalogs.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
+      <term><option>-t <replaceable class="parameter">table</replaceable></></term>
+      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
       <listitem>
        <para>
-        Do not display a response.
+        Reindex <replaceable class="parameter">table</replaceable> only.
        </para>
       </listitem>
      </varlistentry>
-
     </variablelist>
    </para>
 
@@ -153,9 +152,9 @@ PostgreSQL documentation
       <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
-	Specifies the host name of the machine on which the server is
-	running.  If the value begins with a slash, it is used as the
-	directory for the Unix domain socket.
+        Specifies the host name of the machine on which the server is
+        running.  If the value begins with a slash, it is used as the
+        directory for the Unix domain socket.
        </para>
       </listitem>
      </varlistentry>
@@ -165,9 +164,9 @@ PostgreSQL documentation
       <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
-	Specifies the TCP port or local Unix domain socket file 
-	extension on which the server
-	is listening for connections.
+        Specifies the TCP port or local Unix domain socket file 
+        extension on which the server
+        is listening for connections.
        </para>
       </listitem>
      </varlistentry>
@@ -187,7 +186,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt.
+        Force <application>reindexdb</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>reindexdb</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>reindexdb</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index 84426d2cb6a2..c90843ff583c 100755
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.32 2006/09/16 00:30:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.36 2007/09/11 00:06:41 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -24,7 +24,7 @@ RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
 RESET ALL
 </synopsis>
  </refsynopsisdiv>
-  
+
  <refsect1>
   <title>Description</title>
 
@@ -41,16 +41,19 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
 
   <para>
    The default value is defined as the value that the parameter would
-   have had, had no <command>SET</> ever been issued for it in the
+   have had, if no <command>SET</> had ever been issued for it in the
    current session.  The actual source of this value might be a
    compiled-in default, the configuration file, command-line options,
-   or per-database or per-user default settings.  See <xref
-   linkend="runtime-config"> for details.
+   or per-database or per-user default settings.  This is subtly different
+   from defining it as <quote>the value that the parameter had at session
+   start</>, because if the value came from the configuration file, it
+   will be reset to whatever is specified by the configuration file now.
+   See <xref linkend="runtime-config"> for details.
   </para>
 
   <para>
-   See the <command>SET</> reference page for details on the
-   transaction behavior of <command>RESET</>.
+   The transactional behavior of <command>RESET</> is the same as
+   <command>SET</>: its effects will be undone by transaction rollback.
   </para>
  </refsect1>
 
@@ -62,8 +65,9 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
     <term><replaceable class="PARAMETER">configuration_parameter</replaceable></term>
     <listitem>
      <para>
-      The name of a run-time parameter. See <xref linkend="sql-set"
-      endterm="sql-set-title"> for a list.
+      Name of a settable run-time parameter.  Available parameters are
+      documented in <xref linkend="runtime-config"> and on the
+      <xref linkend="sql-set" endterm="sql-set-title"> reference page.
      </para>
     </listitem>
    </varlistentry>
@@ -83,9 +87,9 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
   <title>Examples</title>
 
   <para>
-   Set the <varname>geqo</> configuration variable to its default value:
+   Set the <varname>timezone</> configuration variable to its default value:
 <screen>
-RESET geqo;
+RESET timezone;
 </screen>
   </para>
  </refsect1>
@@ -97,4 +101,13 @@ RESET geqo;
    <command>RESET</command> is a <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="SQL-SET" endterm="SQL-SET-title"></member>
+   <member><xref linkend="SQL-SHOW" endterm="SQL-SHOW-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
index caf62b78331f..ec70bc37a150 100755
--- a/doc/src/sgml/ref/revoke.sgml
+++ b/doc/src/sgml/ref/revoke.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/revoke.sgml,v 1.42 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/revoke.sgml,v 1.46 2007/10/30 19:43:30 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -24,48 +24,48 @@ REVOKE [ GRANT OPTION FOR ]
     { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }
     [,...] | ALL [ PRIVILEGES ] }
     ON [ TABLE ] <replaceable class="PARAMETER">tablename</replaceable> [, ...]
-    FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { USAGE | SELECT | UPDATE }
     [,...] | ALL [ PRIVILEGES ] }
     ON SEQUENCE <replaceable class="PARAMETER">sequencename</replaceable> [, ...]
-    FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }
     ON DATABASE <replaceable>dbname</replaceable> [, ...]
-    FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { EXECUTE | ALL [ PRIVILEGES ] }
     ON FUNCTION <replaceable>funcname</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) [, ...]
-    FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | ALL [ PRIVILEGES ] }
     ON LANGUAGE <replaceable>langname</replaceable> [, ...]
-    FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }
     ON SCHEMA <replaceable>schemaname</replaceable> [, ...]
-    FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { CREATE | ALL [ PRIVILEGES ] }
     ON TABLESPACE <replaceable>tablespacename</replaceable> [, ...]
-    FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="PARAMETER">rolename</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ ADMIN OPTION FOR ]
-    <replaceable class="PARAMETER">role</replaceable> [, ...] FROM <replaceable class="PARAMETER">username</replaceable> [, ...]
+    <replaceable class="PARAMETER">role</replaceable> [, ...] FROM <replaceable class="PARAMETER">rolename</replaceable> [, ...]
     [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
@@ -107,7 +107,7 @@ REVOKE [ ADMIN OPTION FOR ]
    called dependent privileges. If the privilege or the grant option
    held by the first user is being revoked and dependent privileges
    exist, those dependent privileges are also revoked if
-   <literal>CASCADE</literal> is specified, else the revoke action
+   <literal>CASCADE</literal> is specified; if it is not, the revoke action
    will fail.  This recursive revocation only affects privileges that
    were granted through a chain of users that is traceable to the user
    that is the subject of this <literal>REVOKE</literal> command.
@@ -231,15 +231,8 @@ REVOKE admins FROM joe;
 
    <para>
     The compatibility notes of the <xref linkend="sql-grant" endterm="sql-grant-title"> command
-    apply analogously to <command>REVOKE</command>.  The syntax summary is:
-
-<synopsis>
-REVOKE [ GRANT OPTION FOR ] <replaceable class="PARAMETER">privileges</replaceable>
-    ON <replaceable class="parameter">object</replaceable> [ ( <replaceable class="parameter">column</replaceable> [, ...] ) ]
-    FROM { PUBLIC | <replaceable class="parameter">username</replaceable> [, ...] }
-    { RESTRICT | CASCADE }
-</synopsis>
-    One of <literal>RESTRICT</literal> or <literal>CASCADE</literal>
+    apply analogously to <command>REVOKE</command>.
+    The keyword <literal>RESTRICT</literal> or <literal>CASCADE</literal>
     is required according to the standard, but <productname>PostgreSQL</>
     assumes <literal>RESTRICT</literal> by default.
    </para>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 6534fb136257..54a557ef8487 100755
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.99 2007/02/01 19:10:25 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.102.2.1 2009/01/22 22:56:54 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -222,16 +222,12 @@ and <replaceable class="parameter">with_query</replaceable> can be:
       <term><replaceable class="parameter">table_name</replaceable></term>
       <listitem>
        <para>
-        The name (optionally schema-qualified) of an existing table or
-        view.  If <literal>ONLY</> is specified, only that table is
-        scanned.  If <literal>ONLY</> is not specified, the table and
-        all its descendant tables (if any) are scanned.  <literal>*</>
-        can be appended to the table name to indicate that descendant
-        tables are to be scanned, but in the current version, this is
-        the default behavior.  (In releases before 7.1,
-        <literal>ONLY</> was the default behavior.)  The default
-        behavior can be modified by changing the <xref
-        linkend="guc-sql-inheritance"> configuration option.
+        The name (optionally schema-qualified) of an existing table or view.
+        If <literal>ONLY</> is specified before the table name, only that
+        table is scanned.  If <literal>ONLY</> is not specified, the table
+        and all its descendant tables (if any) are scanned.  Optionally,
+        <literal>*</> can be specified after the table name to explicitly
+        indicate that descendant tables are included.
        </para>
       </listitem>
      </varlistentry>
@@ -392,7 +388,7 @@ and <replaceable class="parameter">with_query</replaceable> can be:
      </varlistentry>
      
      <varlistentry>
-      <term><literal>USING (<replaceable class="parameter">join_column</replaceable> [, ...])</literal></term>
+      <term><literal>USING ( <replaceable class="parameter">join_column</replaceable> [, ...] )</literal></term>
       <listitem>
        <para>
         A clause of the form <literal>USING ( a, b, ... )</literal> is
@@ -736,7 +732,7 @@ SELECT name FROM distributors ORDER BY code;
     assumed by default.  Alternatively, a specific ordering operator
     name can be specified in the <literal>USING</> clause.
     An ordering operator must be a less-than or greater-than
-    member of some btree operator family.
+    member of some B-tree operator family.
     <literal>ASC</> is usually equivalent to <literal>USING &lt;</> and
     <literal>DESC</> is usually equivalent to <literal>USING &gt;</>.
     (But the creator of a user-defined data type can define exactly what the
@@ -848,6 +844,14 @@ OFFSET <replaceable class="parameter">start</replaceable>
     to deliver the results of a query in any particular order unless
     <literal>ORDER BY</> is used to constrain the order.
    </para>
+
+   <para>
+    It is even possible for repeated executions of the same <literal>LIMIT</>
+    query to return different subsets of the rows of a table, if there
+    is not an <literal>ORDER BY</> to enforce selection of a deterministic
+    subset.  Again, this is not a bug; determinism of the results is
+    simply not guaranteed in such a case.
+   </para>
   </refsect2>
 
   <refsect2 id="SQL-FOR-UPDATE-SHARE">
@@ -971,6 +975,22 @@ ROLLBACK TO s;
     anymore, in which case it will not be returned.
    </para>
   </caution>
+
+  <caution>
+   <para>
+    Similarly, it is possible for a <command>SELECT</> command
+    using <literal>ORDER BY</literal> and <literal>FOR
+    UPDATE/SHARE</literal> to return rows out of order.  This is
+    because <literal>ORDER BY</> is applied first.  The command
+    orders the result, but might then block trying to obtain a lock
+    on one or more of the rows.  Once the <literal>SELECT</>
+    unblocks, one of the ordered columns might have been modified
+    and be returned out of order.  A workaround is to perform
+    <command>SELECT ... FOR UPDATE/SHARE</> and then <command>SELECT
+    ... ORDER BY</>.
+   </para>
+  </caution>
+
   </refsect2>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml
index 841558e8d69f..2fe6ff61d7cb 100755
--- a/doc/src/sgml/ref/set_role.sgml
+++ b/doc/src/sgml/ref/set_role.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/set_role.sgml,v 1.4 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/set_role.sgml,v 1.5 2008/01/03 21:23:15 tgl Exp $
 PostgreSQL documentation
 -->
 
diff --git a/doc/src/sgml/ref/set_session_auth.sgml b/doc/src/sgml/ref/set_session_auth.sgml
index 58edbb6407b1..cf598e990264 100755
--- a/doc/src/sgml/ref/set_session_auth.sgml
+++ b/doc/src/sgml/ref/set_session_auth.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.16 2007/01/31 23:26:04 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.17 2008/01/03 21:23:15 tgl Exp $ -->
 <refentry id="SQL-SET-SESSION-AUTHORIZATION">
  <refmeta>
   <refentrytitle id="sql-set-session-authorization-title">SET SESSION AUTHORIZATION</refentrytitle>
diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml
index 79ed75b49997..3dca068b457f 100755
--- a/doc/src/sgml/ref/truncate.sgml
+++ b/doc/src/sgml/ref/truncate.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/truncate.sgml,v 1.22 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/truncate.sgml,v 1.24 2007/05/11 19:40:08 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -31,7 +31,9 @@ TRUNCATE [ TABLE ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ C
    <command>TRUNCATE</command> quickly removes all rows from a set of
    tables. It has the same effect as an unqualified
    <command>DELETE</command> on each table, but since it does not actually
-   scan the tables it is faster. This is most useful on large tables.
+   scan the tables it is faster. Furthermore, it reclaims disk space
+   immediately, rather than requiring a subsequent <command>VACUUM</command>
+   operation. This is most useful on large tables.
   </para>
  </refsect1>
   
@@ -84,14 +86,38 @@ TRUNCATE [ TABLE ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ C
    in the same command.  Checking validity in such cases would require table
    scans, and the whole point is not to do one.  The <literal>CASCADE</>
    option can be used to automatically include all dependent tables &mdash;
-   but be very careful when using this option, else you might lose data you
+   but be very careful when using this option, or else you might lose data you
    did not intend to!
   </para>
 
   <para>
-   <command>TRUNCATE</> will not run any user-defined <literal>ON
-   DELETE</literal> triggers that might exist for the tables.
+   <command>TRUNCATE</> will not run any <literal>ON DELETE</literal>
+   triggers that might exist for the tables.
   </para>
+
+  <warning>
+   <para>
+    <command>TRUNCATE</> is not MVCC-safe (see <xref linkend="mvcc">
+     for general information about MVCC).  After truncation, the table
+     will appear empty to all concurrent transactions, even if they
+     are using a snapshot taken before the truncation occurred.  This
+     will only be an issue for a transaction that did not access the
+     truncated table before the truncation happened &mdash; any
+     transaction that has done so would hold at least an
+     <literal>ACCESS SHARE</literal> lock, which would block
+     <command>TRUNCATE</> until that transaction completes.  So
+     truncation will not cause any apparent inconsistency in the table
+     contents for successive queries on the same table, but it could
+     cause visible inconsistency between the contents of the truncated
+     table and other tables in the database.
+   </para>
+
+   <para>
+    <command>TRUNCATE</> is transaction-safe, however: the truncation
+    will be safely rolled back if the surrounding transaction does not
+    commit.
+   </para>
+  </warning>
  </refsect1>
 
  <refsect1>
@@ -101,13 +127,13 @@ TRUNCATE [ TABLE ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ C
    Truncate the tables <literal>bigtable</literal> and <literal>fattable</literal>:
 
 <programlisting>
-TRUNCATE TABLE bigtable, fattable;
+TRUNCATE bigtable, fattable;
 </programlisting>
   </para>
 
   <para>
    Truncate the table <literal>othertable</literal>, and cascade to any tables
-   that are referencing <literal>othertable</literal> via foreign-key
+   that reference <literal>othertable</literal> via foreign-key
    constraints:
 
 <programlisting>
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index df0bec9a1d69..8f39a7d0c166 100755
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/update.sgml,v 1.43 2007/02/01 00:28:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/update.sgml,v 1.45 2007/11/28 15:42:31 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -20,11 +20,11 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
+UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
     SET { <replaceable class="PARAMETER">column</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } |
           ( <replaceable class="PARAMETER">column</replaceable> [, ...] ) = ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) } [, ...]
     [ FROM <replaceable class="PARAMETER">fromlist</replaceable> ]
-    [ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
+    [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ AS <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
 </synopsis>
  </refsynopsisdiv>
@@ -39,13 +39,6 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <rep
    columns not explicitly modified retain their previous values.
   </para>
 
-  <para>
-   By default, <command>UPDATE</command> will update rows in the
-   specified table and all its subtables. If you wish to only update
-   the specific table mentioned, you must use the <literal>ONLY</>
-   clause.
-  </para>
-
   <para>
    There are two ways to modify a table using information contained in
    other tables in the database: using sub-selects, or specifying
@@ -82,6 +75,11 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <rep
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table to update.
+      If <literal>ONLY</> is specified before the table name, matching rows
+      are updated in the named table only.  If <literal>ONLY</> is not
+      specified, matching rows are also updated in any tables inheriting from
+      the named table.  Optionally, <literal>*</> can be specified after the
+      table name to explicitly indicate that descendant tables are included.
      </para>
     </listitem>
    </varlistentry>
@@ -160,6 +158,20 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ [ AS ] <rep
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term><replaceable class="PARAMETER">cursor_name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the cursor to use in a <literal>WHERE CURRENT OF</>
+      condition.  The row to be updated is the one most recently fetched
+      from this cursor.  The cursor must be a simple (non-join, non-aggregate)
+      query on the <command>UPDATE</>'s target table.
+      Note that <literal>WHERE CURRENT OF</> cannot be
+      specified together with a Boolean condition.
+     </para>
+    </listitem>
+   </varlistentry>
+
    <varlistentry>
     <term><replaceable class="PARAMETER">output_expression</replaceable></term>
     <listitem>
@@ -309,6 +321,15 @@ UPDATE wines SET stock = stock + 24 WHERE winename = 'Chateau Lafite 2003';
 COMMIT;
 </programlisting>
   </para>
+
+  <para>
+   Change the <structfield>kind</> column of the table
+   <structname>films</structname> in the row on which the cursor
+   <literal>c_films</> is currently positioned:
+<programlisting>
+UPDATE films SET kind = 'Dramatic' WHERE CURRENT OF c_films;
+</programlisting>      
+  </para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index 452c3780a179..4c1e1e00bcd0 100755
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.47 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.51 2008/02/03 16:24:08 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -97,7 +97,11 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
     <term><literal>VERBOSE</literal></term>
     <listitem>
      <para>
-      Prints a detailed vacuum activity report for each table.
+      Prints a detailed vacuum activity report for each table. Can be used
+      to help determine appropriate settings for
+      <xref linkend="guc-max-fsm-pages">,
+      <xref linkend="guc-max-fsm-relations">, and
+      <xref linkend="guc-default-statistics-target">.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 9f0acca2a08c..1e915eed5d07 100755
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.38 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.42 2007/12/11 19:57:32 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -119,7 +119,7 @@ PostgreSQL documentation
       <term><option>--quiet</></term>
       <listitem>
        <para>
-        Do not display a response.
+        Do not display progress messages.
        </para>
       </listitem>
      </varlistentry>
@@ -199,7 +199,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>
@@ -209,7 +209,18 @@ PostgreSQL documentation
       <term><option>--password</></term>
       <listitem>
        <para>
-        Force password prompt.
+        Force <application>vacuumdb</application> to prompt for a
+        password before connecting to a database.  
+       </para>
+
+       <para>
+        This option is never essential, since
+        <application>vacuumdb</application> will automatically prompt
+        for a password if the server demands password authentication.
+        However, <application>vacuumdb</application> will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing <option>-W</> to avoid the extra
+        connection attempt.
        </para>
       </listitem>
      </varlistentry>
diff --git a/gpAux/extensions/gphdfs/gphdfsformatter.c b/gpAux/extensions/gphdfs/gphdfsformatter.c
index 6f22db6be0ef..1a44b74cfc77 100644
--- a/gpAux/extensions/gphdfs/gphdfsformatter.c
+++ b/gpAux/extensions/gphdfs/gphdfsformatter.c
@@ -411,7 +411,7 @@ gphdfsformatter_export(PG_FUNCTION_ARGS)
 				datlen += sizeof(int32);
 			}
 			else
-				alignpadlen = att_align(datlen, tupdesc->attrs[i]->attalign) - datlen;
+				alignpadlen = att_align_nominal(datlen, tupdesc->attrs[i]->attalign) - datlen;
 			myData->outpadlen[i] = alignpadlen;
 			datlen += alignpadlen;
 		}
@@ -671,7 +671,7 @@ gphdfsformatter_import(PG_FUNCTION_ARGS)
 			if (isVariableLength(tupdesc->attrs[i]->atttypid))
 				bufidx = INTALIGN(bufidx);
 			else
-				bufidx = att_align(bufidx, tupdesc->attrs[i]->attalign);
+				bufidx = att_align_nominal(bufidx, tupdesc->attrs[i]->attalign);
 
 			/* For fixed length type, we can use the type length attribute.
 			 * For variable length type, we'll get the payload length from the first 4 byte.
diff --git a/gpAux/extensions/orafce/assert.c b/gpAux/extensions/orafce/assert.c
index 8167916cf14d..e96e75b06f3d 100644
--- a/gpAux/extensions/orafce/assert.c
+++ b/gpAux/extensions/orafce/assert.c
@@ -252,11 +252,7 @@ dbms_assert_schema_name(PG_FUNCTION_ARGS)
 		INVALID_SCHEMA_NAME_EXCEPTION();
 
 	nspname = text_to_cstring(sname);
-#ifdef GP_VERSION_NUM
-	names = stringToQualifiedNameList(nspname, "dbms");
-#else
 	names = stringToQualifiedNameList(nspname);
-#endif
 	if (list_length(names) != 1)
 		INVALID_SCHEMA_NAME_EXCEPTION();
 
@@ -372,11 +368,7 @@ dbms_assert_object_name(PG_FUNCTION_ARGS)
 		INVALID_OBJECT_NAME_EXCEPTION();
 
 	object_name = text_to_cstring(str);
-#ifdef GP_VERSION_NUM
-	names = stringToQualifiedNameList(object_name, "dbms");
-#else
 	names = stringToQualifiedNameList(object_name);
-#endif
 
 	classId = RangeVarGetRelid(makeRangeVarFromNameList(names), true);
 	if (!OidIsValid(classId))
diff --git a/gpAux/extensions/orafce/orafunc.h b/gpAux/extensions/orafce/orafunc.h
index ef2fbf30bd92..045f67a9628f 100644
--- a/gpAux/extensions/orafce/orafunc.h
+++ b/gpAux/extensions/orafce/orafunc.h
@@ -62,47 +62,6 @@ text *cstring_to_text_with_len(const char *c, int n);
 #endif
 #endif
 
-#ifdef GP_VERSION_NUM
-#define DatumGetTextPP(X)			((text *) PG_DETOAST_DATUM_PACKED(X))
-#define SET_VARSIZE(PTR, len)				SET_VARSIZE_4B  ((varattrib_4b*)(PTR), (len))
-#define PG_GETARG_TEXT_PP(n)		DatumGetTextPP(PG_GETARG_DATUM(n))
-#define VARDATA_ANY(PTR) \
-	 (VARATT_IS_1B(PTR) ? VARDATA_1B(PTR) : VARDATA_4B(PTR))
-#define VARSIZE_ANY_EXHDR(PTR) \
-	(VARATT_IS_1B_E(PTR) ? VARSIZE_1B_E(PTR)-VARHDRSZ_EXTERNAL : \
-	 (VARATT_IS_1B(PTR) ? VARSIZE_1B(PTR)-VARHDRSZ_SHORT : \
-	  VARSIZE_4B(PTR)-VARHDRSZ))
-#define att_align_nominal(cur_offset, attalign) \
-( \
-	((attalign) == 'i') ? INTALIGN(cur_offset) : \
-	 (((attalign) == 'c') ? (intptr_t) (cur_offset) : \
-	  (((attalign) == 'd') ? DOUBLEALIGN(cur_offset) : \
-	   ( \
-			AssertMacro((attalign) == 's'), \
-			SHORTALIGN(cur_offset) \
-	   ))) \
-)
-#define att_addlength_pointer(cur_offset, attlen, attptr) \
-( \
-	((attlen) > 0) ? \
-	( \
-		(cur_offset) + (attlen) \
-	) \
-	: (((attlen) == -1) ? \
-	( \
-		(cur_offset) + VARSIZE_ANY(attptr) \
-	) \
-	: \
-	( \
-		AssertMacro((attlen) == -2), \
-		(cur_offset) + (strlen((char *) (attptr)) + 1) \
-	)) \
-)
-
-List *
-stringToQualifiedNameList(const char *string, const char *caller);
-
-#else
 #if PG_VERSION_NUM < 80300
 #define PGDLLIMPORT				DLLIMPORT
 #define session_timezone		global_timezone
@@ -115,11 +74,8 @@ stringToQualifiedNameList(const char *string, const char *caller);
 	att_align((cur_offset), (attalign))
 #define att_addlength_pointer(cur_offset, attlen, attptr) \
 	att_addlength((cur_offset), (attlen), (attptr))
-#define stringToQualifiedNameList(string) \
-	stringToQualifiedNameList((string), "")
 typedef void *SPIPlanPtr;
 #endif
-#endif
 
 #if PG_VERSION_NUM < 80200
 #define ARR_NULLBITMAP(a)		(NULL)
diff --git a/gpMgmt/bin/gppylib/data/4.3.json b/gpMgmt/bin/gppylib/data/4.3.json
index c35a48e99d4f..4901e18738fd 100644
--- a/gpMgmt/bin/gppylib/data/4.3.json
+++ b/gpMgmt/bin/gppylib/data/4.3.json
@@ -1,7 +1,7 @@
 {
-   "__comment" : "Generated by tidycat.pl version 34 on Tue Apr 12 13:19:30 2016 CATALOG_VERSION_NO=301604129",
+   "__comment" : "Generated by tidycat.pl version 34 on Wed Jun 15 15:15:21 2016 CATALOG_VERSION_NO=301605129",
    "__info" : {
-      "CATALOG_VERSION_NO" : "301604129"
+      "CATALOG_VERSION_NO" : "301605129"
    },
    "gp_configuration" : {
       "CamelCaseRelationId" : "GpConfigurationRelationId",
@@ -1459,6 +1459,7 @@
          "amoptions" : "regproc",
          "amrescan" : "regproc",
          "amrestrpos" : "regproc",
+         "amsearchnulls" : "bool",
          "amstorage" : "bool",
          "amstrategies" : "int2",
          "amsupport" : "int2",
@@ -1507,6 +1508,11 @@
             "ctype" : "bool",
             "sqltype" : "boolean"
          },
+         {
+            "colname" : "amsearchnulls",
+            "ctype" : "bool",
+            "sqltype" : "boolean"
+         },
          {
             "colname" : "amstorage",
             "ctype" : "bool",
@@ -1877,7 +1883,7 @@
          }
       ],
       "relid_comment_tag" : "/* relation id: 2601 - pg_am */\n",
-      "tabdef_text" : "\n   CREATE TABLE pg_am\n   with (camelcase=AccessMethod,  relid=2601)\n   (\n   amname           name, \n   amstrategies     smallint, \n   amsupport        smallint, \n   amcanorder       boolean, \n   amcanunique      boolean, \n   amcanmulticol    boolean, \n   amoptionalkey    boolean, \n   amindexnulls     boolean, \n   amstorage        boolean, \n   amclusterable    boolean, \n   amcanshrink      boolean, \n   aminsert         regproc, \n   ambeginscan      regproc, \n   amgettuple       regproc, \n   amgetmulti       regproc, \n   amrescan         regproc, \n   amendscan        regproc, \n   ammarkpos        regproc, \n   amrestrpos       regproc, \n   ambuild          regproc, \n   ambulkdelete     regproc, \n   amvacuumcleanup  regproc, \n   amcostestimate   regproc, \n   amoptions        regproc\n    )",
+      "tabdef_text" : "\n   CREATE TABLE pg_am\n   with (camelcase=AccessMethod,  relid=2601)\n   (\n   amname           name, \n   amstrategies     smallint, \n   amsupport        smallint, \n   amcanorder       boolean, \n   amcanunique      boolean, \n   amcanmulticol    boolean, \n   amoptionalkey    boolean, \n   amindexnulls     boolean, \n   amsearchnulls    boolean, \n   amstorage        boolean, \n   amclusterable    boolean, \n   amcanshrink      boolean, \n   aminsert         regproc, \n   ambeginscan      regproc, \n   amgettuple       regproc, \n   amgetmulti       regproc, \n   amrescan         regproc, \n   amendscan        regproc, \n   ammarkpos        regproc, \n   amrestrpos       regproc, \n   ambuild          regproc, \n   ambulkdelete     regproc, \n   amvacuumcleanup  regproc, \n   amcostestimate   regproc, \n   amoptions        regproc\n    )",
       "with" : {
          "bootstrap" : 0,
          "camelcase" : "AccessMethod",
@@ -4966,6 +4972,97 @@
          "toast_oid" : "2834"
       }
    },
+   "pg_enum" : {
+      "CamelCaseRelationId" : "EnumRelationId",
+      "colh" : {
+         "enumlabel" : "NameData",
+         "enumtypid" : "Oid",
+         "oid" : "Oid"
+      },
+      "cols" : [
+         {
+            "colname" : "enumtypid",
+            "ctype" : "Oid",
+            "precomment" : "\n**TK_BLANK_LINE**",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "enumlabel",
+            "ctype" : "NameData",
+            "sqltype" : "name"
+         }
+      ],
+      "filename" : "pg_enum.h",
+      "fk_list" : [
+         {
+            "fkcols" : [
+               "enumtypid"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_type",
+            "type" : "scalar"
+         }
+      ],
+      "foreign_keys" : [
+         [
+            [
+               "enumtypid"
+            ],
+            "pg_type",
+            [
+               "oid"
+            ]
+         ]
+      ],
+      "indexes" : [
+         {
+            "CamelCaseIndexId" : "EnumOidIndexIdIndexId",
+            "cols" : [
+               [
+                  "oid",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3502",
+            "unique" : "",
+            "with" : {
+               "camelcase" : "EnumOidIndexId",
+               "indexid" : "3502"
+            }
+         },
+         {
+            "CamelCaseIndexId" : "EnumTypIdLabelIndexId",
+            "cols" : [
+               [
+                  "enumtypid",
+                  "oid_ops"
+               ],
+               [
+                  "enumlabel",
+                  "name_ops"
+               ]
+            ],
+            "indexid" : "3503",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "EnumTypIdLabel",
+               "indexid" : "3503"
+            }
+         }
+      ],
+      "relid_comment_tag" : "/* relation id: 3501 - pg_enum */\n",
+      "tabdef_text" : "\n   CREATE TABLE pg_enum\n   with (relid=3501)\n   (\n   enumtypid       oid,\n   enumlabel       name\n   )",
+      "with" : {
+         "bootstrap" : 0,
+         "camelcase" : "Enum",
+         "oid" : 1,
+         "relid" : "3501",
+         "shared" : 0,
+         "text" : "with (relid=3501)"
+      }
+   },
    "pg_extprotocol" : {
       "CamelCaseRelationId" : "ExtprotocolRelationId",
       "colh" : {
@@ -5441,11 +5538,13 @@
    "pg_index" : {
       "CamelCaseRelationId" : "IndexRelationId",
       "colh" : {
+         "indcheckxmin" : "bool",
          "indclass" : "oidvector",
          "indexprs" : "text",
          "indexrelid" : "Oid",
          "indisclustered" : "bool",
          "indisprimary" : "bool",
+         "indisready" : "bool",
          "indisunique" : "bool",
          "indisvalid" : "bool",
          "indkey" : "int2vector",
@@ -5491,6 +5590,16 @@
             "ctype" : "bool",
             "sqltype" : "boolean"
          },
+         {
+            "colname" : "indcheckxmin",
+            "ctype" : "bool",
+            "sqltype" : "boolean"
+         },
+         {
+            "colname" : "indisready",
+            "ctype" : "bool",
+            "sqltype" : "boolean"
+         },
          {
             "colname" : "indkey",
             "ctype" : "int2vector",
@@ -5605,7 +5714,7 @@
          }
       ],
       "relid_comment_tag" : "/* relation id: 2610 - pg_index */\n",
-      "tabdef_text" : "\n   CREATE TABLE pg_index\n   with (oid=false, relid=2610)\n   (\n   indexrelid      oid        ,\n   indrelid        oid        ,\n   indnatts        smallint   ,\n   indisunique     boolean    ,\n   indisprimary    boolean    ,\n   indisclustered  boolean    ,\n   indisvalid      boolean    ,\n   indkey          int2vector ,\n   indclass        oidvector  ,\n   indoption       int2vector ,\n   indexprs        text       ,\n   indpred         text       \n   )",
+      "tabdef_text" : "\n   CREATE TABLE pg_index\n   with (oid=false, relid=2610)\n   (\n   indexrelid      oid        ,\n   indrelid        oid        ,\n   indnatts        smallint   ,\n   indisunique     boolean    ,\n   indisprimary    boolean    ,\n   indisclustered  boolean    ,\n   indisvalid      boolean    ,\n   indcheckxmin    boolean    ,\n   indisready      boolean    ,\n   indkey          int2vector ,\n   indclass        oidvector  ,\n   indoption       int2vector ,\n   indexprs        text       ,\n   indpred         text       \n   )",
       "with" : {
          "bootstrap" : 0,
          "camelcase" : "Index",
@@ -5723,6 +5832,7 @@
          "laninline" : "Oid",
          "lanispl" : "bool",
          "lanname" : "NameData",
+         "lanowner" : "Oid",
          "lanplcallfoid" : "Oid",
          "lanpltrusted" : "bool",
          "lanvalidator" : "Oid",
@@ -5735,6 +5845,11 @@
             "precomment" : "\n ",
             "sqltype" : "name"
          },
+         {
+            "colname" : "lanowner",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
          {
             "colname" : "lanispl",
             "ctype" : "bool",
@@ -5793,6 +5908,16 @@
             ],
             "pktable" : "pg_proc",
             "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "lanowner"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_authid",
+            "type" : "scalar"
          }
       ],
       "foreign_keys" : [
@@ -5813,6 +5938,15 @@
             [
                "oid"
             ]
+         ],
+         [
+            [
+               "lanowner"
+            ],
+            "pg_authid",
+            [
+               "oid"
+            ]
          ]
       ],
       "indexes" : [
@@ -5852,7 +5986,7 @@
          }
       ],
       "relid_comment_tag" : "/* relation id: 2612 - pg_language */\n",
-      "tabdef_text" : "\n   CREATE TABLE pg_language\n   with (relid=2612)\n   ( \n   lanname        name, \n   lanispl        boolean, -- Is a procedural language\n   lanpltrusted   boolean, -- PL is trusted\n   lanplcallfoid  oid,     -- Call handler for PL\n   laninline      oid,     -- Optional anonymous-block handler function\n   lanvalidator   oid,     -- optional validation function\n   lanacl         aclitem[] -- Access privileges\n   )",
+      "tabdef_text" : "\n   CREATE TABLE pg_language\n   with (relid=2612)\n   ( \n   lanname        name, \n   lanowner       oid, \n   lanispl        boolean, -- Is a procedural language\n   lanpltrusted   boolean, -- PL is trusted\n   lanplcallfoid  oid,     -- Call handler for PL\n   laninline      oid,     -- Optional anonymous-block handler function\n   lanvalidator   oid,     -- optional validation function\n   lanacl         aclitem[] -- Access privileges\n   )",
       "with" : {
          "bootstrap" : 0,
          "camelcase" : "Language",
@@ -7226,6 +7360,7 @@
       "CamelCaseRelationId" : "PLTemplateRelationId",
       "colh" : {
          "tmplacl" : "aclitem[1]",
+         "tmpldbacreate" : "bool",
          "tmplhandler" : "text",
          "tmplinline" : "text",
          "tmpllibrary" : "text",
@@ -7245,6 +7380,11 @@
             "ctype" : "bool",
             "sqltype" : "boolean"
          },
+         {
+            "colname" : "tmpldbacreate",
+            "ctype" : "bool",
+            "sqltype" : "boolean"
+         },
          {
             "colname" : "tmplhandler",
             "ctype" : "text",
@@ -7290,7 +7430,7 @@
          }
       ],
       "relid_comment_tag" : "/* relation id: 1136 - pg_pltemplate */\n",
-      "tabdef_text" : "\n   CREATE TABLE pg_pltemplate\n   with (camelcase=PLTemplate, shared=true, oid=false, relid=1136)\n   (\n   tmplname       name, \n   tmpltrusted    boolean, \n   tmplhandler    text, \n   tmplinline     text,\n   tmplvalidator  text, \n   tmpllibrary    text, \n   tmplacl        aclitem[]\n   )",
+      "tabdef_text" : "\n   CREATE TABLE pg_pltemplate\n   with (camelcase=PLTemplate, shared=true, oid=false, relid=1136)\n   (\n   tmplname       name, \n   tmpltrusted    boolean, \n   tmpldbacreate  boolean, \n   tmplhandler    text, \n   tmplinline     text,\n   tmplvalidator  text, \n   tmpllibrary    text, \n   tmplacl        aclitem[]\n   )",
       "with" : {
          "bootstrap" : 0,
          "camelcase" : "PLTemplate",
@@ -7313,6 +7453,7 @@
          "proargnames" : "text[1]",
          "proargtypes" : "oidvector",
          "probin" : "bytea",
+         "proconfig" : "text[1]",
          "procost" : "float4",
          "prodataaccess" : "char",
          "proisagg" : "bool",
@@ -7449,6 +7590,11 @@
             "ctype" : "bytea",
             "sqltype" : "bytea"
          },
+         {
+            "colname" : "proconfig",
+            "ctype" : "text[1]",
+            "sqltype" : "text[]"
+         },
          {
             "colname" : "proacl",
             "ctype" : "aclitem[1]",
@@ -7606,7 +7752,7 @@
          }
       ],
       "relid_comment_tag" : "/* relation id: 1255 - pg_proc */\n",
-      "tabdef_text" : "\n   CREATE TABLE pg_proc\n   with (camelcase=Procedure, bootstrap=true, relid=1255, toast_oid=2836, toast_index=2837)\n   (\n   proname         name, \n   pronamespace    oid, \n   proowner        oid, \n   prolang         oid, \n   procost         float4, \n   prorows         float4, \n   provariadic     oid,\n   proisagg        boolean, \n   prosecdef       boolean, \n   proisstrict     boolean, \n   proretset       boolean, \n   provolatile     \"char\", \n   pronargs        smallint, \n   pronargdefaults smallint,\n   prorettype      oid, \n   proiswin        boolean, \n   proargtypes     oidvector, \n   proallargtypes  oid[], \n   proargmodes     \"char\"[], \n   proargnames     text[], \n   proargdefaults  text,\n   prosrc          text, \n   probin          bytea, \n   proacl          aclitem[],\n   prodataaccess   \"char\"\n   )",
+      "tabdef_text" : "\n   CREATE TABLE pg_proc\n   with (camelcase=Procedure, bootstrap=true, relid=1255, toast_oid=2836, toast_index=2837)\n   (\n   proname         name, \n   pronamespace    oid, \n   proowner        oid, \n   prolang         oid, \n   procost         float4, \n   prorows         float4, \n   provariadic     oid,\n   proisagg        boolean, \n   prosecdef       boolean, \n   proisstrict     boolean, \n   proretset       boolean, \n   provolatile     \"char\", \n   pronargs        smallint, \n   pronargdefaults smallint,\n   prorettype      oid, \n   proiswin        boolean, \n   proargtypes     oidvector, \n   proallargtypes  oid[], \n   proargmodes     \"char\"[], \n   proargnames     text[], \n   proargdefaults  text,\n   prosrc          text, \n   probin          bytea, \n   proconfig       text[], \n   proacl          aclitem[],\n   prodataaccess   \"char\"\n   )",
       "with" : {
          "bootstrap" : "1",
          "camelcase" : "Procedure",
@@ -8054,6 +8200,7 @@
          "ev_action" : "text",
          "ev_attr" : "int2",
          "ev_class" : "Oid",
+         "ev_enabled" : "char",
          "ev_qual" : "text",
          "ev_type" : "char",
          "is_instead" : "bool",
@@ -8082,6 +8229,11 @@
             "ctype" : "char",
             "sqltype" : "quoted_char"
          },
+         {
+            "colname" : "ev_enabled",
+            "ctype" : "char",
+            "sqltype" : "quoted_char"
+         },
          {
             "colname" : "is_instead",
             "ctype" : "bool",
@@ -8161,7 +8313,7 @@
          }
       ],
       "relid_comment_tag" : "/* relation id: 2618 - pg_rewrite */\n",
-      "tabdef_text" : "\n   CREATE TABLE pg_rewrite\n   with (relid=2618, toast_oid=2838, toast_index=2839)\n   (\n   rulename    name, \n   ev_class    oid, \n   ev_attr     smallint, \n   ev_type     \"char\", \n   is_instead  boolean, \n   ev_qual     text, \n   ev_action   text\n   )",
+      "tabdef_text" : "\n   CREATE TABLE pg_rewrite\n   with (relid=2618, toast_oid=2838, toast_index=2839)\n   (\n   rulename    name, \n   ev_class    oid, \n   ev_attr     smallint, \n   ev_type     \"char\", \n   ev_enabled  \"char\", \n   is_instead  boolean, \n   ev_qual     text, \n   ev_action   text\n   )",
       "with" : {
          "bootstrap" : 0,
          "camelcase" : "Rewrite",
@@ -9136,7 +9288,7 @@
          "tgconstrname" : "NameData",
          "tgconstrrelid" : "Oid",
          "tgdeferrable" : "bool",
-         "tgenabled" : "bool",
+         "tgenabled" : "char",
          "tgfoid" : "Oid",
          "tginitdeferred" : "bool",
          "tgisconstraint" : "bool",
@@ -9169,8 +9321,8 @@
          },
          {
             "colname" : "tgenabled",
-            "ctype" : "bool",
-            "sqltype" : "boolean"
+            "ctype" : "char",
+            "sqltype" : "quoted_char"
          },
          {
             "colname" : "tgisconstraint",
@@ -9347,7 +9499,7 @@
          }
       ],
       "relid_comment_tag" : "/* relation id: 2620 - pg_trigger */\n",
-      "tabdef_text" : "\n   CREATE TABLE pg_trigger\n   with (relid=2620)\n   (\n   tgrelid         oid, \n   tgname          name, \n   tgfoid          oid, \n   tgtype          smallint, \n   tgenabled       boolean, \n   tgisconstraint  boolean, \n   tgconstrname    name, \n   tgconstrrelid   oid, \n   tgconstraint    oid,\n   tgdeferrable    boolean, \n   tginitdeferred  boolean, \n   tgnargs         smallint, \n   tgattr          int2vector, \n   tgargs          bytea\n   )",
+      "tabdef_text" : "\n   CREATE TABLE pg_trigger\n   with (relid=2620)\n   (\n   tgrelid         oid, \n   tgname          name, \n   tgfoid          oid, \n   tgtype          smallint, \n   tgenabled       \"char\", \n   tgisconstraint  boolean, \n   tgconstrname    name, \n   tgconstrrelid   oid, \n   tgconstraint    oid,\n   tgdeferrable    boolean, \n   tginitdeferred  boolean, \n   tgnargs         smallint, \n   tgattr          int2vector, \n   tgargs          bytea\n   )",
       "with" : {
          "bootstrap" : 0,
          "camelcase" : "Trigger",
@@ -9357,6 +9509,744 @@
          "text" : "with (relid=2620)"
       }
    },
+   "pg_ts_config" : {
+      "CamelCaseRelationId" : "Ts_configRelationId",
+      "colh" : {
+         "cfgname" : "NameData",
+         "cfgnamespace" : "Oid",
+         "cfgowner" : "Oid",
+         "cfgparser" : "Oid",
+         "oid" : "Oid"
+      },
+      "cols" : [
+         {
+            "colname" : "cfgname",
+            "ctype" : "NameData",
+            "precomment" : "\n**TK_BLANK_LINE**",
+            "sqltype" : "name"
+         },
+         {
+            "colname" : "cfgnamespace",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "cfgowner",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "cfgparser",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         }
+      ],
+      "filename" : "pg_ts_config.h",
+      "fk_list" : [
+         {
+            "fkcols" : [
+               "cfgnamespace"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_namespace",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "cfgowner"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_authid",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "cfgparser"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_ts_parser",
+            "type" : "scalar"
+         }
+      ],
+      "foreign_keys" : [
+         [
+            [
+               "cfgnamespace"
+            ],
+            "pg_namespace",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "cfgowner"
+            ],
+            "pg_authid",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "cfgparser"
+            ],
+            "pg_ts_parser",
+            [
+               "oid"
+            ]
+         ]
+      ],
+      "indexes" : [
+         {
+            "CamelCaseIndexId" : "TSConfigNameNspIndexId",
+            "cols" : [
+               [
+                  "cfgname",
+                  "name_ops"
+               ],
+               [
+                  "cfgnamespace",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3608",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSConfigNameNsp",
+               "indexid" : "3608"
+            }
+         },
+         {
+            "CamelCaseIndexId" : "TSConfigOidIndexId",
+            "cols" : [
+               [
+                  "oid",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3712",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSConfigOid",
+               "indexid" : "3712"
+            }
+         }
+      ],
+      "relid_comment_tag" : "/* relation id: 3602 - pg_ts_config */\n",
+      "tabdef_text" : "\n   CREATE TABLE pg_ts_config\n   with (relid=3602)\n   (\n   cfgname         name,\n   cfgnamespace    oid,\n   cfgowner        oid,\n   cfgparser       oid\n   )",
+      "with" : {
+         "bootstrap" : 0,
+         "camelcase" : "Ts_config",
+         "oid" : 1,
+         "relid" : "3602",
+         "shared" : 0,
+         "text" : "with (relid=3602)"
+      }
+   },
+   "pg_ts_config_map" : {
+      "CamelCaseRelationId" : "Ts_config_mapRelationId",
+      "colh" : {
+         "mapcfg" : "Oid",
+         "mapdict" : "Oid",
+         "mapseqno" : "int4",
+         "maptokentype" : "int4",
+         "oid" : "Oid"
+      },
+      "cols" : [
+         {
+            "colname" : "mapcfg",
+            "ctype" : "Oid",
+            "precomment" : "\n**TK_BLANK_LINE**",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "maptokentype",
+            "ctype" : "int4",
+            "sqltype" : "integer"
+         },
+         {
+            "colname" : "mapseqno",
+            "ctype" : "int4",
+            "sqltype" : "integer"
+         },
+         {
+            "colname" : "mapdict",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         }
+      ],
+      "filename" : "pg_ts_config_map.h",
+      "fk_list" : [
+         {
+            "fkcols" : [
+               "mapcfg"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_ts_config",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "mapdict"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_ts_dict",
+            "type" : "scalar"
+         }
+      ],
+      "foreign_keys" : [
+         [
+            [
+               "mapcfg"
+            ],
+            "pg_ts_config",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "mapdict"
+            ],
+            "pg_ts_dict",
+            [
+               "oid"
+            ]
+         ]
+      ],
+      "indexes" : [
+         {
+            "CamelCaseIndexId" : "TSConfigMapIndexId",
+            "cols" : [
+               [
+                  "mapcfg",
+                  "oid_ops"
+               ],
+               [
+                  "maptokentype",
+                  "int4_ops"
+               ],
+               [
+                  "mapseqno",
+                  "int4_ops"
+               ]
+            ],
+            "indexid" : "3608",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSConfigMap",
+               "indexid" : "3608"
+            }
+         }
+      ],
+      "relid_comment_tag" : "/* relation id: 3603 - pg_ts_config_map */\n",
+      "tabdef_text" : "\n   CREATE TABLE pg_ts_config_map\n   with (relid=3603)\n   (\n   mapcfg          oid,\n   maptokentype    integer,\n   mapseqno        integer,\n   mapdict         oid\n   )",
+      "with" : {
+         "bootstrap" : 0,
+         "camelcase" : "Ts_config_map",
+         "oid" : 1,
+         "relid" : "3603",
+         "shared" : 0,
+         "text" : "with (relid=3603)"
+      }
+   },
+   "pg_ts_dict" : {
+      "CamelCaseRelationId" : "Ts_dictRelationId",
+      "colh" : {
+         "dictinitoption" : "text",
+         "dictname" : "NameData",
+         "dictnamespace" : "Oid",
+         "dictowner" : "Oid",
+         "dicttemplate" : "Oid",
+         "oid" : "Oid"
+      },
+      "cols" : [
+         {
+            "colname" : "dictname",
+            "ctype" : "NameData",
+            "precomment" : "\n**TK_BLANK_LINE**",
+            "sqltype" : "name"
+         },
+         {
+            "colname" : "dictnamespace",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "dictowner",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "dicttemplate",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "dictinitoption",
+            "ctype" : "text",
+            "sqltype" : "text"
+         }
+      ],
+      "filename" : "pg_ts_dict.h",
+      "fk_list" : [
+         {
+            "fkcols" : [
+               "dictnamespace"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_namespace",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "dictowner"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_authid",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "dicttemplate"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_ts_template",
+            "type" : "scalar"
+         }
+      ],
+      "foreign_keys" : [
+         [
+            [
+               "dictnamespace"
+            ],
+            "pg_namespace",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "dictowner"
+            ],
+            "pg_authid",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "dicttemplate"
+            ],
+            "pg_ts_template",
+            [
+               "oid"
+            ]
+         ]
+      ],
+      "indexes" : [
+         {
+            "CamelCaseIndexId" : "TSDictionaryNameNspIndexId",
+            "cols" : [
+               [
+                  "dictname",
+                  "name_ops"
+               ],
+               [
+                  "dictnamespace",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3604",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSDictionaryNameNsp",
+               "indexid" : "3604"
+            }
+         },
+         {
+            "CamelCaseIndexId" : "TSDictionaryOidIndexId",
+            "cols" : [
+               [
+                  "oid",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3605",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSDictionaryOid",
+               "indexid" : "3605"
+            }
+         }
+      ],
+      "relid_comment_tag" : "/* relation id: 3600 - pg_ts_dict */\n",
+      "tabdef_text" : "\n   CREATE TABLE pg_ts_dict\n   with (relid=3600, toast=true)\n   (\n   dictname        name,\n   dictnamespace   oid,\n   dictowner       oid,\n   dicttemplate    oid,\n   dictinitoption  text\n   )",
+      "with" : {
+         "bootstrap" : 0,
+         "camelcase" : "Ts_dict",
+         "oid" : 1,
+         "relid" : "3600",
+         "shared" : 0,
+         "text" : "with (relid=3600, toast=true)",
+         "toast" : "true"
+      }
+   },
+   "pg_ts_parser" : {
+      "CamelCaseRelationId" : "Ts_parserRelationId",
+      "colh" : {
+         "oid" : "Oid",
+         "prsend" : "regproc",
+         "prsheadline" : "regproc",
+         "prslextype" : "regproc",
+         "prsname" : "NameData",
+         "prsnamespace" : "Oid",
+         "prsstart" : "regproc",
+         "prstoken" : "regproc"
+      },
+      "cols" : [
+         {
+            "colname" : "prsname",
+            "ctype" : "NameData",
+            "precomment" : "\n**TK_BLANK_LINE**",
+            "sqltype" : "name"
+         },
+         {
+            "colname" : "prsnamespace",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "prsstart",
+            "ctype" : "regproc",
+            "sqltype" : "regproc"
+         },
+         {
+            "colname" : "prstoken",
+            "ctype" : "regproc",
+            "sqltype" : "regproc"
+         },
+         {
+            "colname" : "prsend",
+            "ctype" : "regproc",
+            "sqltype" : "regproc"
+         },
+         {
+            "colname" : "prsheadline",
+            "ctype" : "regproc",
+            "sqltype" : "regproc"
+         },
+         {
+            "colname" : "prslextype",
+            "ctype" : "regproc",
+            "sqltype" : "regproc"
+         }
+      ],
+      "filename" : "pg_ts_parser.h",
+      "fk_list" : [
+         {
+            "fkcols" : [
+               "prsnamespace"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_namespace",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "prsstart"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_proc",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "prsend"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_proc",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "prsheadline"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_proc",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "prslextype"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_proc",
+            "type" : "scalar"
+         }
+      ],
+      "foreign_keys" : [
+         [
+            [
+               "prsnamespace"
+            ],
+            "pg_namespace",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "prsstart"
+            ],
+            "pg_proc",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "prsend"
+            ],
+            "pg_proc",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "prsheadline"
+            ],
+            "pg_proc",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "prslextype"
+            ],
+            "pg_proc",
+            [
+               "oid"
+            ]
+         ]
+      ],
+      "indexes" : [
+         {
+            "CamelCaseIndexId" : "TSParserNameNspIndexId",
+            "cols" : [
+               [
+                  "prsname",
+                  "name_ops"
+               ],
+               [
+                  "prsnamespace",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3606",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSParserNameNsp",
+               "indexid" : "3606"
+            }
+         },
+         {
+            "CamelCaseIndexId" : "TSParserOidIndexId",
+            "cols" : [
+               [
+                  "oid",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3607",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSParserOid",
+               "indexid" : "3607"
+            }
+         }
+      ],
+      "relid_comment_tag" : "/* relation id: 3601 - pg_ts_parser */\n",
+      "tabdef_text" : "\n   CREATE TABLE pg_ts_parser\n   with (relid=3601)\n   (\n   prsname         name,\n   prsnamespace    oid,\n   prsstart        regproc,\n   prstoken        regproc,\n   prsend          regproc,\n   prsheadline     regproc,\n   prslextype      regproc\n  )",
+      "with" : {
+         "bootstrap" : 0,
+         "camelcase" : "Ts_parser",
+         "oid" : 1,
+         "relid" : "3601",
+         "shared" : 0,
+         "text" : "with (relid=3601)"
+      }
+   },
+   "pg_ts_template" : {
+      "CamelCaseRelationId" : "Ts_templateRelationId",
+      "colh" : {
+         "oid" : "Oid",
+         "tmplinit" : "regproc",
+         "tmpllexize" : "regproc",
+         "tmplname" : "NameData",
+         "tmplnamespace" : "Oid"
+      },
+      "cols" : [
+         {
+            "colname" : "tmplname",
+            "ctype" : "NameData",
+            "precomment" : "\n**TK_BLANK_LINE**",
+            "sqltype" : "name"
+         },
+         {
+            "colname" : "tmplnamespace",
+            "ctype" : "Oid",
+            "sqltype" : "oid"
+         },
+         {
+            "colname" : "tmplinit",
+            "ctype" : "regproc",
+            "sqltype" : "regproc"
+         },
+         {
+            "colname" : "tmpllexize",
+            "ctype" : "regproc",
+            "sqltype" : "regproc"
+         }
+      ],
+      "filename" : "pg_ts_template.h",
+      "fk_list" : [
+         {
+            "fkcols" : [
+               "tmplnamespace"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_namespace",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "tmplinit"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_proc",
+            "type" : "scalar"
+         },
+         {
+            "fkcols" : [
+               "tmpllexize"
+            ],
+            "pkcols" : [
+               "oid"
+            ],
+            "pktable" : "pg_proc",
+            "type" : "scalar"
+         }
+      ],
+      "foreign_keys" : [
+         [
+            [
+               "tmplnamespace"
+            ],
+            "pg_namespace",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "tmplinit"
+            ],
+            "pg_proc",
+            [
+               "oid"
+            ]
+         ],
+         [
+            [
+               "tmpllexize"
+            ],
+            "pg_proc",
+            [
+               "oid"
+            ]
+         ]
+      ],
+      "indexes" : [
+         {
+            "CamelCaseIndexId" : "TSTemplateNameNspIndexId",
+            "cols" : [
+               [
+                  "tmplname",
+                  "name_ops"
+               ],
+               [
+                  "tmplnamespace",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3766",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSTemplateNameNsp",
+               "indexid" : "3766"
+            }
+         },
+         {
+            "CamelCaseIndexId" : "TSTemplateOidIndexId",
+            "cols" : [
+               [
+                  "oid",
+                  "oid_ops"
+               ]
+            ],
+            "indexid" : "3767",
+            "unique" : "1",
+            "with" : {
+               "camelcase" : "TSTemplateOid",
+               "indexid" : "3767"
+            }
+         }
+      ],
+      "relid_comment_tag" : "/* relation id: 3600 - pg_ts_template */\n",
+      "tabdef_text" : "\n   CREATE TABLE pg_ts_template\n   with (relid=3600)\n   (\n   tmplname        name,\n   tmplnamespace   oid,\n   tmplinit        regproc,\n   tmpllexize      regproc\n   )",
+      "with" : {
+         "bootstrap" : 0,
+         "camelcase" : "Ts_template",
+         "oid" : 1,
+         "relid" : "3600",
+         "shared" : 0,
+         "text" : "with (relid=3600)"
+      }
+   },
    "pg_type" : {
       "CamelCaseRelationId" : "TypeRelationId",
       "colh" : {
diff --git a/src/Makefile b/src/Makefile
index 9df9fae7568b..94096fcdac19 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/Makefile,v 1.41 2007/01/20 17:16:09 petere Exp $
+# $PostgreSQL: pgsql/src/Makefile,v 1.42 2007/08/21 01:11:12 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,6 +18,7 @@ all install installdirs uninstall distprep:
 	$(MAKE) -C timezone $@
 	$(MAKE) -C backend $@
 	$(MAKE) -C backend/utils/mb/conversion_procs $@
+	$(MAKE) -C backend/snowball $@
 	$(MAKE) -C include $@
 	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
@@ -48,6 +49,7 @@ clean:
 	$(MAKE) -C port $@
 	$(MAKE) -C timezone $@
 	$(MAKE) -C backend $@
+	$(MAKE) -C backend/snowball $@
 	$(MAKE) -C include $@
 	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
@@ -62,7 +64,7 @@ distclean maintainer-clean:
 	$(MAKE) -C port $@
 	$(MAKE) -C timezone $@
 	$(MAKE) -C backend $@
-	#$(MAKE) -C backend/snowball $@
+	$(MAKE) -C backend/snowball $@
 	$(MAKE) -C include $@
 	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a67978a40f72..bf5e11a9e9b9 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.233 2007/02/09 15:55:57 petere Exp $
+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.240 2007/11/13 00:13:19 tgl Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -167,7 +167,9 @@ with_perl	= @with_perl@
 with_python	= @with_python@
 with_tcl	= @with_tcl@
 with_openssl	= @with_openssl@
-with_libxml     = @with_libxml@
+with_ossp_uuid	= @with_ossp_uuid@
+with_libxml	= @with_libxml@
+with_libxslt	= @with_libxslt@
 with_system_tzdata = @with_system_tzdata@
 with_zlib	= @with_zlib@
 with_apr_config	= @with_apr_config@
@@ -258,6 +260,7 @@ DLLWRAP = @DLLWRAP@
 LIBS = @LIBS@
 LDAP_LIBS_FE = @LDAP_LIBS_FE@
 LDAP_LIBS_BE = @LDAP_LIBS_BE@
+OSSP_UUID_LIBS = @OSSP_UUID_LIBS@
 LD = @LD@
 with_gnu_ld = @with_gnu_ld@
 ld_R_works = @ld_R_works@
@@ -532,10 +535,10 @@ TAS         = @TAS@
 	$(CPP) $(CPPFLAGS) -o $@ $<
 
 %.gz: %
-	$(GZIP) -f --best $<
+	$(GZIP) --best -c $< >$@
 
 %.bz2: %
-	$(BZIP2) -f $<
+	$(BZIP2) -c $< >$@
 
 ifeq ($(PORTNAME),win32)
 # Build rules to add versioninfo resources to win32 binaries
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 41576ca055e6..343f10e33c81 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -135,7 +135,7 @@ ifeq ($(PORTNAME), darwin)
     ifneq ($(SO_MAJOR_VERSION), 0)
       version_link	= -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
     endif
-    LINK.shared		= $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) $(exported_symbols_list) -multiply_defined suppress
+    LINK.shared		= $(COMPILER) -dynamiclib -install_name "$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)" $(version_link) $(exported_symbols_list) -multiply_defined suppress
     shlib		= lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
     shlib_major		= lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
   else
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 3c20da26b89f..dd123b592988 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.122 2007/02/09 15:55:57 petere Exp $
+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.125 2008/01/01 19:45:45 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,10 +24,9 @@ ifdef ADDON_DIR
 include $(BLD_TOP)/$(ADDON_DIR)/src/Makefile
 endif
 
-
 SUBDIRS = access bootstrap catalog parser commands executor \
 	fts lib libpq gp_libpq_fe main nodes optimizer port postmaster regex \
-	replication rewrite storage tcop utils $(top_builddir)/src/timezone cdb \
+	replication rewrite storage tcop tsearch utils $(top_builddir)/src/timezone cdb \
 	$(ADDON_SUBDIR)
 
 ifeq ($(enable_orca),yes)
@@ -223,6 +222,7 @@ ifeq ($(MAKE_DLL), true)
 endif
 endif
 	$(MAKE) -C catalog install-data
+	$(MAKE) -C tsearch install-data
 	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
 	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
 	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
@@ -244,6 +244,7 @@ else
 endif
 ifeq ($(MAKE_EXPORTS), true)
 	$(INSTALL_DATA) $(POSTGRES_IMP) '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
+	$(INSTALL_PROGRAM) $(MKLDEXPORT) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
 endif
 
 .PHONY: install-bin
@@ -262,6 +263,7 @@ endif
 endif
 ifeq ($(MAKE_EXPORTS), true)
 	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+	$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)'
 endif
 
 
@@ -271,6 +273,7 @@ uninstall:
 	rm -f $(DESTDIR)$(bindir)/postgres$(X) $(DESTDIR)$(bindir)/postmaster $(DESTDIR)$(bindir)/cdbsyncmaster
 ifeq ($(MAKE_EXPORTS), true)
 	rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
+	rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
 endif
 ifeq ($(PORTNAME), cygwin)
 ifeq ($(MAKE_DLL), true)
@@ -283,6 +286,7 @@ ifeq ($(MAKE_DLL), true)
 endif
 endif
 	$(MAKE) -C catalog uninstall-data
+	$(MAKE) -C tsearch uninstall-data
 	rm -f '$(DESTDIR)$(datadir)/pg_hba.conf.sample' \
 	      '$(DESTDIR)$(datadir)/pg_ident.conf.sample' \
               '$(DESTDIR)$(datadir)/postgresql.conf.sample' \
diff --git a/src/backend/access/appendonly/appendonlywriter.c b/src/backend/access/appendonly/appendonlywriter.c
index d5d48ba8c71b..68968f959591 100644
--- a/src/backend/access/appendonly/appendonlywriter.c
+++ b/src/backend/access/appendonly/appendonlywriter.c
@@ -1719,19 +1719,21 @@ void
 AtCommit_AppendOnly(void)
 {
 	HASH_SEQ_STATUS status;
-	AORelHashEntry	aoentry = NULL;
-	TransactionId 	CurrentXid = GetTopTransactionId();
+	AORelHashEntry	aoentry;
+	TransactionId 	CurrentXid;
 
 	if (Gp_role != GP_ROLE_DISPATCH)
 		return;
 
 	if (!appendOnlyInsertXact)
-	{
 		return;
-	}
 
 	hash_seq_init(&status, AppendOnlyHash);
 
+	CurrentXid = GetTopTransactionIdIfAny();
+	/* We should have an XID if we modified AO tables */
+	Assert(CurrentXid != InvalidTransactionId);
+
 	LWLockAcquire(AOSegFileLock, LW_EXCLUSIVE);
 	/*
 	 * for each AO table hash entry
diff --git a/src/backend/access/bitmap/bitmap.c b/src/backend/access/bitmap/bitmap.c
index 34f4aa9e6dc8..73709ab1f561 100644
--- a/src/backend/access/bitmap/bitmap.c
+++ b/src/backend/access/bitmap/bitmap.c
@@ -115,7 +115,7 @@ bmbuild(PG_FUNCTION_ARGS)
 	_bitmap_init_buildstate(index, &bmstate);
 
 	/* do the heap scan */
-	reltuples = IndexBuildScan(heap, index, indexInfo,
+	reltuples = IndexBuildScan(heap, index, indexInfo, false,
 							  bmbuildCallback, (void *)&bmstate);
 	/* clean up the build state */
 	_bitmap_cleanup_buildstate(index, &bmstate);
diff --git a/src/backend/access/bitmap/bitmapattutil.c b/src/backend/access/bitmap/bitmapattutil.c
index 853360a12801..54b8ec310e60 100644
--- a/src/backend/access/bitmap/bitmapattutil.c
+++ b/src/backend/access/bitmap/bitmapattutil.c
@@ -104,13 +104,13 @@ _bitmap_create_lov_heapandindex(Relation rel,
 		lovIndex = index_open(idxid, AccessExclusiveLock);
 
 		if (OidIsValid(lovHeapRelfilenode))
-			setNewRelfilenodeToOid(lovHeap, lovHeapRelfilenode);
+			setNewRelfilenodeToOid(lovHeap, RecentXmin, lovHeapRelfilenode);
 		else
-			setNewRelfilenode(lovHeap);
+			setNewRelfilenode(lovHeap, RecentXmin);
 		if (OidIsValid(lovIndexRelfilenode))
-			setNewRelfilenodeToOid(lovIndex, lovIndexRelfilenode);
+			setNewRelfilenodeToOid(lovIndex, RecentXmin, lovIndexRelfilenode);
 		else
-			setNewRelfilenode(lovIndex);
+			setNewRelfilenode(lovIndex, RecentXmin);
 
 		/*
 		 * After creating the new relfilenode for a btee index, this is not
@@ -124,13 +124,12 @@ _bitmap_create_lov_heapandindex(Relation rel,
 		/* XLOG the metapage */
 		if (!XLog_UnconvertedCanBypassWal() && !lovIndex->rd_istemp)
 		{
-			
 			// Fetch gp_persistent_relation_node information that will be added to XLOG record.
 			RelationFetchGpRelationNodeForXLog(lovIndex);
 			
-			_bt_lognewpage(lovIndex,
-						   btree_metapage,
-						   BufferGetBlockNumber(btree_metabuf));
+			log_newpage(&lovIndex->rd_node,
+						BufferGetBlockNumber(btree_metabuf),
+						btree_metapage);
 		}
 		
 		/* This cache value is not valid anymore. */
diff --git a/src/backend/access/bitmap/bitmapinsert.c b/src/backend/access/bitmap/bitmapinsert.c
index 6610fd3af474..d35492a64717 100644
--- a/src/backend/access/bitmap/bitmapinsert.c
+++ b/src/backend/access/bitmap/bitmapinsert.c
@@ -1635,7 +1635,7 @@ create_lovitem(Relation rel, Buffer metabuf, uint64 tidnum,
 	_bitmap_insert_lov(lovHeap, lovIndex, lovDatum, lovNulls, use_wal);
 
 	if (PageAddItem(currLovPage, (Item)lovitem, itemSize, *lovOffsetP,
-					LP_USED) == InvalidOffsetNumber)
+					false, false) == InvalidOffsetNumber)
 		ereport(ERROR,
 				(errcode(ERRCODE_INTERNAL_ERROR),
 				errmsg("failed to add LOV item to \"%s\"",
diff --git a/src/backend/access/bitmap/bitmappages.c b/src/backend/access/bitmap/bitmappages.c
index 5c0bea9ea745..4bd9a3e6db59 100644
--- a/src/backend/access/bitmap/bitmappages.c
+++ b/src/backend/access/bitmap/bitmappages.c
@@ -433,7 +433,7 @@ _bitmap_init(Relation rel, Oid comptypeOid,
 	 * after all, we have fixed size data
 	 */
 	o = PageAddItem(currLovPage, (Item)lovItem, sizeof(BMLOVItemData),
-                    newOffset, LP_USED);
+                    newOffset, false, false);
 
 	if (o == InvalidOffsetNumber)
 		ereport(ERROR,
diff --git a/src/backend/access/bitmap/bitmapxlog.c b/src/backend/access/bitmap/bitmapxlog.c
index 4e4286d0c8a9..f9b2e74fc325 100644
--- a/src/backend/access/bitmap/bitmapxlog.c
+++ b/src/backend/access/bitmap/bitmapxlog.c
@@ -222,7 +222,7 @@ _bitmap_xlog_insert_lovitem(XLogRecPtr lsn, XLogRecord *record)
 				 xlrec->bm_lov_blkno);
 		
 		if (PageAddItem(lovPage, (Item)&(xlrec->bm_lovItem), itemSize, 
-						newOffset, LP_USED) == InvalidOffsetNumber)
+						newOffset, false, false) == InvalidOffsetNumber)
 			ereport(ERROR,
 					(errcode(ERRCODE_INTERNAL_ERROR),
 					errmsg("_bitmap_xlog_insert_lovitem: failed to add LOV "
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 8a937079492f..e531f32115f0 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -51,7 +51,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.115 2007/02/09 03:35:33 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.120.2.1 2009/03/30 04:09:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -77,6 +77,14 @@
 	((att)->attstorage != 'p')
 
 
+/* Does att's datatype allow packing into the 1-byte-header varlena format? */
+#define ATT_IS_PACKABLE(att) \
+	((att)->attlen == -1 && (att)->attstorage != 'p')
+/* Use this if it's already known varlena */
+#define VARLENA_ATT_IS_PACKABLE(att) \
+	((att)->attstorage != 'p')
+
+
 /* ----------------------------------------------------------------
  *						misc support routines
  * ----------------------------------------------------------------
@@ -99,20 +107,77 @@ heap_compute_data_size(TupleDesc tupleDesc,
 
 	for (i = 0; i < numberOfAttributes; i++)
 	{
+		Datum		val;
+
 		if (isnull[i])
 			continue;
 
-		/* we're anticipating converting to a short varlena header even if it's
-		 * not currently */
- 		if (att[i]->attlen == -1 && value_type_could_short(values[i], att[i]->atttypid))
+		val = values[i];
+
+		if (ATT_IS_PACKABLE(att[i]) &&
+			VARATT_CAN_MAKE_SHORT(DatumGetPointer(val)))
+		{
+			/*
+			 * we're anticipating converting to a short varlena header, so
+			 * adjust length and don't count any alignment
+			 */
+			data_length += VARATT_CONVERTED_SHORT_SIZE(DatumGetPointer(val));
+		}
+		else
+		{
+			data_length = att_align_datum(data_length, att[i]->attalign,
+										  att[i]->attlen, val);
+			data_length = att_addlength_datum(data_length, att[i]->attlen,
+											  val);
+		}
+	}
+
+	return data_length;
+}
+
+
+/* ----------------
+ *		ComputeDataSize
+ *
+ * Determine size of the data area of a tuple to be constructed
+ *
+ * OLD API with char 'n'/' ' convention for indicating nulls
+ * ----------------
+ */
+static Size
+ComputeDataSize(TupleDesc tupleDesc,
+				Datum *values,
+				char *nulls)
+{
+	Size		data_length = 0;
+	int			i;
+	int			numberOfAttributes = tupleDesc->natts;
+	Form_pg_attribute *att = tupleDesc->attrs;
+
+	for (i = 0; i < numberOfAttributes; i++)
+	{
+		Datum		val;
+
+		if (nulls[i] != ' ')
+			continue;
+
+		val = values[i];
+
+		if (ATT_IS_PACKABLE(att[i]) &&
+			VARATT_CAN_MAKE_SHORT(DatumGetPointer(val)))
 		{
-			/* no alignment and we will convert to 1-byte header */; 
-			data_length += VARSIZE_ANY_EXHDR_D(values[i]) + VARHDRSZ_SHORT;
+			/*
+			 * we're anticipating converting to a short varlena header, so
+			 * adjust length and don't count any alignment
+			 */
+			data_length += VARATT_CONVERTED_SHORT_SIZE(DatumGetPointer(val));
 		}
 		else
 		{
-			data_length = att_align(data_length, att[i]->attalign); 
-			data_length = att_addlength(data_length, att[i]->attlen, values[i]);
+			data_length = att_align_datum(data_length, att[i]->attalign,
+										  att[i]->attlen, val);
+			data_length = att_addlength_datum(data_length, att[i]->attlen,
+											  val);
 		}
 	}
 
@@ -135,14 +200,15 @@ heap_compute_data_size(TupleDesc tupleDesc,
 Size
 heap_fill_tuple(TupleDesc tupleDesc,
 				Datum *values, bool *isnull,
-				char *data, uint16 *infomask, bits8 *bit)
+				char *data, Size data_size,
+				uint16 *infomask, bits8 *bit)
 {
-	char	   *start = data;
 	bits8	   *bitP;
 	int			bitmask;
 	int			i;
 	int			numberOfAttributes = tupleDesc->natts;
 	Form_pg_attribute *att = tupleDesc->attrs;
+	char	   *start = data;
 
 	if (bit != NULL)
 	{
@@ -156,7 +222,7 @@ heap_fill_tuple(TupleDesc tupleDesc,
 		bitmask = 0;
 	}
 
-	*infomask &= ~(HEAP_HASNULL | HEAP_HASVARWIDTH | HEAP_HASEXTENDED);
+	*infomask &= ~(HEAP_HASNULL | HEAP_HASVARWIDTH | HEAP_HASEXTERNAL);
 
 	for (i = 0; i < numberOfAttributes; i++)
 	{
@@ -190,61 +256,58 @@ heap_fill_tuple(TupleDesc tupleDesc,
 		if (att[i]->attbyval)
 		{
 			/* pass-by-value */
-			data = (char *) att_align_zero(data, att[i]->attalign);
+			data = (char *) att_align_nominal((long) data, att[i]->attalign);
 			store_att_byval(data, values[i], att[i]->attlen);
 			data_length = att[i]->attlen;
 		}
 		else if (att[i]->attlen == -1)
 		{
 			/* varlena */
+			Pointer		val = DatumGetPointer(values[i]);
+
 			*infomask |= HEAP_HASVARWIDTH;
-			if (VARATT_IS_COMPRESSED_D(values[i]))
-				*infomask |= HEAP_HASCOMPRESSED;
-			if (VARATT_IS_EXTERNAL_D(values[i])) 
+			if (VARATT_IS_EXTERNAL(val))
 			{
 				*infomask |= HEAP_HASEXTERNAL;
-				data = (char *) att_align_zero(data, att[i]->attalign);
-				data_length = VARSIZE_EXTERNAL(DatumGetPointer(values[i]));
-				memcpy(data, DatumGetPointer(values[i]), data_length);
+				/* no alignment, since it's short by definition */
+				data_length = VARSIZE_EXTERNAL(val);
+				memcpy(data, val, data_length);
 			}
-			else if (VARATT_IS_SHORT_D(values[i])) 
+			else if (VARATT_IS_SHORT(val))
 			{
 				/* no alignment for short varlenas */
-				data_length = VARSIZE_SHORT(DatumGetPointer(values[i]));
-				memcpy(data, DatumGetPointer(values[i]), data_length);
+				data_length = VARSIZE_SHORT(val);
+				memcpy(data, val, data_length);
 			}
-			else if (VARATT_COULD_SHORT_D(values[i]) &&
-					 att[i]->atttypid != INT2VECTOROID &&
-					 att[i]->atttypid != OIDVECTOROID &&
-					 att[i]->atttypid < FirstNormalObjectId)
+			else if (VARLENA_ATT_IS_PACKABLE(att[i]) &&
+					 VARATT_CAN_MAKE_SHORT(val))
 			{
 				/* convert to short varlena -- no alignment */
-				data_length = VARSIZE_D(values[i]) - VARHDRSZ + VARHDRSZ_SHORT;
-				*data = VARSIZE_TO_SHORT_D(values[i]);
-				memcpy(data+1,
-					   VARDATA_D(values[i]),
-					   data_length-1);
+				data_length = VARATT_CONVERTED_SHORT_SIZE(val);
+				SET_VARSIZE_SHORT(data, data_length);
+				memcpy(data + 1, VARDATA(val), data_length - 1);
 			}
 			else
 			{
-				/* must store full 4-byte header varlena */
-				data = (char *) att_align_zero(data, att[i]->attalign);
-				data_length = VARSIZE(DatumGetPointer(values[i]));
-				memcpy(data, DatumGetPointer(values[i]), data_length);
+				/* full 4-byte header varlena */
+				data = (char *) att_align_nominal((long) data,
+												  att[i]->attalign);
+				data_length = VARSIZE(val);
+				memcpy(data, val, data_length);
 			}
 		}
 		else if (att[i]->attlen == -2)
 		{
-			/* cstring */
-			data = (char *) att_align_zero(data, att[i]->attalign);
+			/* cstring ... never needs alignment */
 			*infomask |= HEAP_HASVARWIDTH;
+			Assert(att[i]->attalign == 'c');
 			data_length = strlen(DatumGetCString(values[i])) + 1;
 			memcpy(data, DatumGetPointer(values[i]), data_length);
 		}
 		else
 		{
 			/* fixed-length pass-by-reference */
-			data = (char *) att_align_zero(data, att[i]->attalign);
+			data = (char *) att_align_nominal((long) data, att[i]->attalign);
 			Assert(att[i]->attlen > 0);
 			data_length = att[i]->attlen;
 			memcpy(data, DatumGetPointer(values[i]), data_length);
@@ -252,6 +315,9 @@ heap_fill_tuple(TupleDesc tupleDesc,
 
 		data += data_length;
 	}
+
+	Assert((data - start) == data_size);
+
 	return data - start;
 }
 
@@ -337,13 +403,21 @@ nocachegetattr(HeapTuple tuple,
 {
 	HeapTupleHeader tup = tuple->t_data;
 	Form_pg_attribute *att = tupleDesc->attrs;
-	char	   *tp;				/* ptr to att in tuple */
+	char	   *tp;				/* ptr to data part of tuple */
 	bits8	   *bp = tup->t_bits;		/* ptr to null bitmap in tuple */
-	bool		slow = false;	/* do we have to walk nulls? */
+	bool		slow = false;	/* do we have to walk attrs? */
+	int			off;			/* current offset within data */
 
 	Assert(!is_heaptuple_memtuple(tuple));
-	/* If any cached offsets are there we can check that they make sense, but
-	 * there may not be any at all, so pass -1 for the attnum we know is valid */
+
+	/* ----------------
+	 *	 Three cases:
+	 *
+	 *	 1: No nulls and no variable-width attributes.
+	 *	 2: Has a null or a var-width AFTER att.
+	 *	 3: Has nulls or var-widths BEFORE att.
+	 * ----------------
+	 */
 
 #ifdef IN_MACRO
 /* This is handled in the macro */
@@ -355,20 +429,11 @@ nocachegetattr(HeapTuple tuple,
 
 	attnum--;
 
-	/* ----------------
-	 *	 Three cases:
-	 *
-	 *	 1: No nulls and no variable-width attributes.
-	 *	 2: Has a null or a var-width AFTER att.
-	 *	 3: Has nulls or var-widths BEFORE att.
-	 * ----------------
-	 */
-
 	if (HeapTupleNoNulls(tuple))
 	{
 #ifdef IN_MACRO
 /* This is handled in the macro */
-		if (att[attnum]->attcacheoff != -1)
+		if (att[attnum]->attcacheoff >= 0)
 		{
 			return fetchatt(att[attnum],
 							(char *) tup + tup->t_hoff +
@@ -423,9 +488,6 @@ nocachegetattr(HeapTuple tuple,
 
 	tp = (char *) tup + tup->t_hoff;
 
-	/*
-	 * now check for any non-fixed length attrs before our attribute
-	 */
 	if (!slow)
 	{
 		/*
@@ -447,10 +509,6 @@ nocachegetattr(HeapTuple tuple,
 		{
 			int			j;
 
-			/*
-			 * In for(), we test <= and not < because we want to see if we can
-			 * go past it in initializing offsets.
-			 */
 			for (j = 0; j <= attnum; j++)
 			{
 				if (att[j]->attlen <= 0)
@@ -462,16 +520,10 @@ nocachegetattr(HeapTuple tuple,
 		}
 	}
 
-	/*
-	 * If slow is false, and we got here, we know that we have a tuple with no
-	 * nulls or var-widths before the target attribute. If possible, we also
-	 * want to initialize the remainder of the attribute cached offset values.
-	 */
 	if (!slow)
 	{
+		int			natts = tupleDesc->natts;
 		int			j = 1;
-		long		off;
-		int			natts = HeapTupleHeaderGetNatts(tup);
 
 		/*
 		 * If we get here, we have a tuple with no nulls or var-widths up to
@@ -482,46 +534,41 @@ nocachegetattr(HeapTuple tuple,
 		 * fixed-width columns, in hope of avoiding future visits to this
 		 * routine.
 		 */
-
-		/* this is always true */
 		att[0]->attcacheoff = 0;
 
-		while (j < attnum && att[j]->attcacheoff > 0)
+		/* we might have set some offsets in the slow path previously */
+		while (j < natts && att[j]->attcacheoff > 0)
 			j++;
 
 		off = att[j - 1]->attcacheoff + att[j - 1]->attlen;
 
-		for (; j <= attnum ||
-		/* Can we compute more?  We will probably need them */
-			 (j < natts &&
-			  att[j]->attcacheoff == -1 &&
-			  (HeapTupleNoNulls(tuple) || !att_isnull(j, bp)) &&
-			  (HeapTupleAllFixed(tuple) || att[j]->attlen > 0)); j++)
+		for (; j < natts; j++)
 		{
-			/* don't need to worry about shortvarlenas here since we're only
-			 * looking at non-varlenas. Note that it's important that we check
-			 * that the target attribute itself is a nonvarlena too since we
-			 * can't use cached offsets for even the first varlena any more. */
-			off = att_align(off, att[j]->attalign);
+			if (att[j]->attlen <= 0)
+				break;
+
+			off = att_align_nominal(off, att[j]->attalign);
 
 			att[j]->attcacheoff = off;
 
-			off = att_addlength(off, att[j]->attlen, PointerGetDatum(tp + off));
+			off += att[j]->attlen;
 		}
 
-		return fetchatt(att[attnum], tp + att[attnum]->attcacheoff);
+		Assert(j > attnum);
+
+		off = att[attnum]->attcacheoff;
 	}
 	else
 	{
 		bool		usecache = true;
-		int			off = 0;
 		int			i;
 
 		/* this is always true */
 		att[0]->attcacheoff = 0;
 
 		/*
-		 * Now we know that we have to walk the tuple CAREFULLY.
+		 * Now we know that we have to walk the tuple CAREFULLY.  But we still
+		 * might be able to cache some offsets for next time.
 		 *
 		 * Note - This loop is a little tricky.  For each non-null attribute,
 		 * we have to first account for alignment padding before the attr,
@@ -529,42 +576,56 @@ nocachegetattr(HeapTuple tuple,
 		 * storage and no alignment padding either.  We can use/set
 		 * attcacheoff until we reach either a null or a var-width attribute.
 		 */
-
-		for (i = 0; i < attnum; i++)
+		off = 0;
+		for (i = 0;; i++)		/* loop exit is at "break" */
 		{
 			if (HeapTupleHasNulls(tuple) && att_isnull(i, bp))
 			{
 				usecache = false;
-				continue;
+				continue;		/* this cannot be the target att */
 			}
 
-			/* If we know the next offset, we can skip the alignment calc */
-			if (usecache && att[i]->attcacheoff != -1)
+			/* If we know the next offset, we can skip the rest */
+			if (usecache && att[i]->attcacheoff >= 0)
 				off = att[i]->attcacheoff;
-			else
+			else if (att[i]->attlen == -1)
 			{
-				/* if it's a varlena it may or may not be aligned, so check for
-				 * something that looks like a padding byte before aligning. If
-				 * we're already aligned it may be the leading byte of a 4-byte
-				 * header but then the att_align is harmless. Don't bother
-				 * looking if it's not a varlena though.*/
-				if (att[i]->attlen != -1 || !tp[off])
-					off = att_align(off, att[i]->attalign);
-				if (usecache && att[i]->attlen != -1)
+				/*
+				 * We can only cache the offset for a varlena attribute if the
+				 * offset is already suitably aligned, so that there would be
+				 * no pad bytes in any case: then the offset will be valid for
+				 * either an aligned or unaligned value.
+				 */
+				if (usecache &&
+					off == att_align_nominal(off, att[i]->attalign))
 					att[i]->attcacheoff = off;
+				else
+				{
+					off = att_align_pointer(off, att[i]->attalign, -1,
+											tp + off);
+					usecache = false;
+				}
 			}
+			else
+			{
+				/* not varlena, so safe to use att_align_nominal */
+				off = att_align_nominal(off, att[i]->attalign);
 
-			if (att[i]->attlen < 0)
-				usecache = false;
+				if (usecache)
+					att[i]->attcacheoff = off;
+			}
 
-			off = att_addlength(off, att[i]->attlen, PointerGetDatum(tp + off));
-		}
+			if (i == attnum)
+				break;
 
-		if (att[attnum]->attlen != -1 || !tp[off])
-			off = att_align(off, att[attnum]->attalign);
+			off = att_addlength_pointer(off, att[i]->attlen, tp + off);
 
-		return fetchatt(att[attnum], tp + off);
+			if (usecache && att[i]->attlen <= 0)
+				usecache = false;
+		}
 	}
+
+	return fetchatt(att[attnum], tp + off);
 }
 
 /* ----------------
@@ -605,6 +666,7 @@ heap_getsysattr(HeapTuple tup, int attnum, bool *isnull)
 			break;
 		case MinCommandIdAttributeNumber:
 		case MaxCommandIdAttributeNumber:
+
 			/*
 			 * cmin and cmax are now both aliases for the same field, which
 			 * can in fact also be a combo command id.	XXX perhaps we should
@@ -710,7 +772,9 @@ heaptuple_form_to(TupleDesc tupleDescriptor, Datum *values, bool *isnull, HeapTu
 {
 	HeapTuple	tuple;			/* return tuple */
 	HeapTupleHeader td;			/* tuple data */
-	unsigned long len, predicted_len, actual_len;
+	Size		actual_len;
+	Size		len,
+				data_len;
 	int			hoff;
 	bool		hasnull = false;
 	Form_pg_attribute *att = tupleDescriptor->attrs;
@@ -741,7 +805,7 @@ heaptuple_form_to(TupleDesc tupleDescriptor, Datum *values, bool *isnull, HeapTu
 		else if (att[i]->attlen == -1 &&
 				 att[i]->attalign == 'd' &&
 				 att[i]->attndims == 0 &&
-				 !VARATT_IS_EXTENDED_D(values[i]))
+				 !VARATT_IS_EXTENDED(DatumGetPointer(values[i])))
 		{
 			values[i] = toast_flatten_tuple_attribute(values[i],
 													  att[i]->atttypid,
@@ -762,23 +826,24 @@ heaptuple_form_to(TupleDesc tupleDescriptor, Datum *values, bool *isnull, HeapTu
 
 	hoff = len = MAXALIGN(len); /* align user data safely */
 
-	predicted_len = heap_compute_data_size(tupleDescriptor, values, isnull);
+	data_len = heap_compute_data_size(tupleDescriptor, values, isnull);
 
-	len += predicted_len;
+	len += data_len;
 
-	if(dstlen && (*dstlen) < (HEAPTUPLESIZE + len))
+	if (dstlen && (*dstlen) < (HEAPTUPLESIZE + len))
 	{
 		*dstlen = HEAPTUPLESIZE + len;
 		return NULL;
 	}
 
-	if(dstlen)
+	if (dstlen)
 	{
 		*dstlen = HEAPTUPLESIZE + len;
 		tuple = dst;
+		memset(tuple, 0, HEAPTUPLESIZE + len);
 	}
 	else
-		tuple = (HeapTuple) palloc(HEAPTUPLESIZE + len);
+		tuple = (HeapTuple) palloc0(HEAPTUPLESIZE + len);
 
 	/*
 	 * Allocate and zero the space needed.	Note that the tuple body and
@@ -793,43 +858,25 @@ heaptuple_form_to(TupleDesc tupleDescriptor, Datum *values, bool *isnull, HeapTu
 	tuple->t_len = len;
 	ItemPointerSetInvalid(&(tuple->t_self));
 
-	/* 
-	 * The following 3 calls will setup the first 12 bytes of td (tuple->t_data) 
-	 */
 	HeapTupleHeaderSetDatumLength(td, len);
 	HeapTupleHeaderSetTypeId(td, tupleDescriptor->tdtypeid);
 	HeapTupleHeaderSetTypMod(td, tupleDescriptor->tdtypmod);
 
-	/* t_ctid does not matter */
-
-	/* num of attrs are stored in t_infomask2.  Clear the other flags first */
-	td->t_infomask2 = 0;
 	HeapTupleHeaderSetNatts(td, numberOfAttributes);
-
-	/* 
-	 * Set up t_hoff.  This need to be done before set up t_infomask
-	 * because HeapTupleHeaderSetOid will use t_hoff 
-	 */
 	td->t_hoff = hoff;
 
-	if (tupleDescriptor->tdhasoid)
-	{
+	if (tupleDescriptor->tdhasoid)		/* else leave infomask = 0 */
 		td->t_infomask = HEAP_HASOID;
-		HeapTupleHeaderSetOid(td, InvalidOid);
-	}
-	else
-		td->t_infomask = 0;
-
-	/* Really fill in the data. */
-	actual_len = 
-		heap_fill_tuple(tupleDescriptor,
-						values,
-						isnull,
-						(char *) td + hoff,
-						&td->t_infomask,
-						(hasnull ? td->t_bits : NULL));
-	
-	Assert(predicted_len == actual_len);
+
+	actual_len = heap_fill_tuple(tupleDescriptor,
+								 values,
+								 isnull,
+								 (char *) td + hoff,
+								 data_len,
+								 &td->t_infomask,
+								 (hasnull ? td->t_bits : NULL));
+
+	Assert(data_len == actual_len);
 	Assert(!is_heaptuple_memtuple(tuple));
 
 	return tuple;
@@ -852,19 +899,101 @@ heap_formtuple(TupleDesc tupleDescriptor,
 			   Datum *values,
 			   char *nulls)
 {
-	bool *isnull = (bool *) palloc(sizeof(bool) * tupleDescriptor->natts);
-	HeapTuple ret;
+	HeapTuple	tuple;			/* return tuple */
+	HeapTupleHeader td;			/* tuple data */
+	Size		len,
+				data_len;
+	int			hoff;
+	bool		hasnull = false;
+	Form_pg_attribute *att = tupleDescriptor->attrs;
+	int			numberOfAttributes = tupleDescriptor->natts;
+	int			i;
 
-	int i;
-	for(i=0; i<tupleDescriptor->natts; ++i)
-		isnull[i] = (nulls[i] != ' ');
+	if (numberOfAttributes > MaxTupleAttributeNumber)
+		ereport(ERROR,
+				(errcode(ERRCODE_TOO_MANY_COLUMNS),
+				 errmsg("number of columns (%d) exceeds limit (%d)",
+						numberOfAttributes, MaxTupleAttributeNumber)));
 
-	ret = heaptuple_form_to(tupleDescriptor, values, isnull, NULL, NULL);
-	pfree(isnull);
+	/*
+	 * Check for nulls and embedded tuples; expand any toasted attributes in
+	 * embedded tuples.  This preserves the invariant that toasting can only
+	 * go one level deep.
+	 *
+	 * We can skip calling toast_flatten_tuple_attribute() if the attribute
+	 * couldn't possibly be of composite type.  All composite datums are
+	 * varlena and have alignment 'd'; furthermore they aren't arrays. Also,
+	 * if an attribute is already toasted, it must have been sent to disk
+	 * already and so cannot contain toasted attributes.
+	 */
+	for (i = 0; i < numberOfAttributes; i++)
+	{
+		if (nulls[i] != ' ')
+			hasnull = true;
+		else if (att[i]->attlen == -1 &&
+				 att[i]->attalign == 'd' &&
+				 att[i]->attndims == 0 &&
+				 !VARATT_IS_EXTENDED(values[i]))
+		{
+			values[i] = toast_flatten_tuple_attribute(values[i],
+													  att[i]->atttypid,
+													  att[i]->atttypmod);
+		}
+	}
 
-	return ret;
+	/*
+	 * Determine total space needed
+	 */
+	len = offsetof(HeapTupleHeaderData, t_bits);
+
+	if (hasnull)
+		len += BITMAPLEN(numberOfAttributes);
+
+	if (tupleDescriptor->tdhasoid)
+		len += sizeof(Oid);
+
+	hoff = len = MAXALIGN(len); /* align user data safely */
+
+	data_len = ComputeDataSize(tupleDescriptor, values, nulls);
+
+	len += data_len;
+
+	/*
+	 * Allocate and zero the space needed.	Note that the tuple body and
+	 * HeapTupleData management structure are allocated in one chunk.
+	 */
+	tuple = (HeapTuple) palloc0(HEAPTUPLESIZE + len);
+	tuple->t_data = td = (HeapTupleHeader) ((char *) tuple + HEAPTUPLESIZE);
+
+	/*
+	 * And fill in the information.  Note we fill the Datum fields even though
+	 * this tuple may never become a Datum.
+	 */
+	tuple->t_len = len;
+	ItemPointerSetInvalid(&(tuple->t_self));
+
+	HeapTupleHeaderSetDatumLength(td, len);
+	HeapTupleHeaderSetTypeId(td, tupleDescriptor->tdtypeid);
+	HeapTupleHeaderSetTypMod(td, tupleDescriptor->tdtypmod);
+
+	HeapTupleHeaderSetNatts(td, numberOfAttributes);
+	td->t_hoff = hoff;
+
+	if (tupleDescriptor->tdhasoid)		/* else leave infomask = 0 */
+		td->t_infomask = HEAP_HASOID;
+
+	heap_fill_tuple(tupleDescriptor,
+			 values,
+			 nulls,
+			 (char *) td + hoff,
+			 data_len,
+			 &td->t_infomask,
+			 (hasnull ? td->t_bits : NULL));
+
+	return tuple;
 }
 
+
 /*
  * heap_modify_tuple
  *		form a new tuple from an old tuple and a set of replacement values.
@@ -1033,17 +1162,30 @@ heap_deform_tuple(HeapTuple tuple, TupleDesc tupleDesc,
 
 		if (!slow && thisatt->attcacheoff >= 0)
 			off = thisatt->attcacheoff;
+		else if (thisatt->attlen == -1)
+		{
+			/*
+			 * We can only cache the offset for a varlena attribute if the
+			 * offset is already suitably aligned, so that there would be no
+			 * pad bytes in any case: then the offset will be valid for either
+			 * an aligned or unaligned value.
+			 */
+			if (!slow &&
+				off == att_align_nominal(off, thisatt->attalign))
+				thisatt->attcacheoff = off;
+			else
+			{
+				off = att_align_pointer(off, thisatt->attalign, -1,
+										tp + off);
+				slow = true;
+			}
+		}
 		else
 		{
-			/* if it's a varlena it may or may not be aligned, so check for
-			 * something that looks like a padding byte before aligning. If
-			 * we're already aligned it may be the leading byte of a 4-byte
-			 * header but then the att_align is harmless. Don't bother looking
-			 * if it's not a varlena though.*/
-			if (thisatt->attlen != -1 || !tp[off])
-				off = att_align(off, thisatt->attalign);
-
-			if (!slow && thisatt->attlen != -1)
+			/* not varlena, so safe to use att_align_nominal */
+			off = att_align_nominal(off, thisatt->attalign);
+
+			if (!slow)
 				thisatt->attcacheoff = off;
 
 		}
@@ -1056,15 +1198,15 @@ heap_deform_tuple(HeapTuple tuple, TupleDesc tupleDesc,
 		/* Ignore attributes with dropped types */
 		if (thisatt->attlen == -1 && !thisatt->attisdropped)
 		{
-			Assert(VARATT_IS_SHORT_D(values[attnum]) || 
-				   !VARATT_COULD_SHORT_D(values[attnum]) ||
+			Assert(VARATT_IS_SHORT(DatumGetPointer(values[attnum])) ||
+				   !VARATT_CAN_MAKE_SHORT(DatumGetPointer(values[attnum])) ||
 				   thisatt->atttypid == OIDVECTOROID ||
 				   thisatt->atttypid == INT2VECTOROID ||
 				   thisatt->atttypid >= FirstNormalObjectId);	
 		}
 #endif
 
-		off = att_addlength(off, thisatt->attlen, PointerGetDatum(tp + off));
+		off = att_addlength_pointer(off, thisatt->attlen, tp + off);
 	}
 
 	/*
@@ -1105,15 +1247,90 @@ heap_deformtuple(HeapTuple tuple,
 				 Datum *values,
 				 char *nulls)
 {
-	int			i;
-	bool	   *isnull = (bool *) palloc(tupleDesc->natts * sizeof(bool));
+	HeapTupleHeader tup = tuple->t_data;
+	bool		hasnulls = HeapTupleHasNulls(tuple);
+	Form_pg_attribute *att = tupleDesc->attrs;
+	int			tdesc_natts = tupleDesc->natts;
+	int			natts;			/* number of atts to extract */
+	int			attnum;
+	char	   *tp;				/* ptr to tuple data */
+	long		off;			/* offset in tuple data */
+	bits8	   *bp = tup->t_bits;		/* ptr to null bitmap in tuple */
+	bool		slow = false;	/* can we use/set attcacheoff? */
 
-	heap_deform_tuple(tuple, tupleDesc, values, isnull);
+	natts = HeapTupleHeaderGetNatts(tup);
 
-	for(i=0; i<tupleDesc->natts; ++i)
-		nulls[i] = isnull[i] ? 'n' : ' ';
+	/*
+	 * In inheritance situations, it is possible that the given tuple actually
+	 * has more fields than the caller is expecting.  Don't run off the end of
+	 * the caller's arrays.
+	 */
+	natts = Min(natts, tdesc_natts);
 
-	pfree(isnull);
+	tp = (char *) tup + tup->t_hoff;
+
+	off = 0;
+
+	for (attnum = 0; attnum < natts; attnum++)
+	{
+		Form_pg_attribute thisatt = att[attnum];
+
+		if (hasnulls && att_isnull(attnum, bp))
+		{
+			values[attnum] = (Datum) 0;
+			nulls[attnum] = 'n';
+			slow = true;		/* can't use attcacheoff anymore */
+			continue;
+		}
+
+		nulls[attnum] = ' ';
+
+		if (!slow && thisatt->attcacheoff >= 0)
+			off = thisatt->attcacheoff;
+		else if (thisatt->attlen == -1)
+		{
+			/*
+			 * We can only cache the offset for a varlena attribute if the
+			 * offset is already suitably aligned, so that there would be no
+			 * pad bytes in any case: then the offset will be valid for either
+			 * an aligned or unaligned value.
+			 */
+			if (!slow &&
+				off == att_align_nominal(off, thisatt->attalign))
+				thisatt->attcacheoff = off;
+			else
+			{
+				off = att_align_pointer(off, thisatt->attalign, -1,
+										tp + off);
+				slow = true;
+			}
+		}
+		else
+		{
+			/* not varlena, so safe to use att_align_nominal */
+			off = att_align_nominal(off, thisatt->attalign);
+
+			if (!slow)
+				thisatt->attcacheoff = off;
+		}
+
+		values[attnum] = fetchatt(thisatt, tp + off);
+
+		off = att_addlength_pointer(off, thisatt->attlen, tp + off);
+
+		if (thisatt->attlen <= 0)
+			slow = true;		/* can't use attcacheoff anymore */
+	}
+
+	/*
+	 * If tuple doesn't have all the atts indicated by tupleDesc, read the
+	 * rest as null
+	 */
+	for (; attnum < tdesc_natts; attnum++)
+	{
+		values[attnum] = (Datum) 0;
+		nulls[attnum] = 'n';
+	}
 }
 
 /*
@@ -1179,17 +1396,30 @@ slot_deform_tuple(TupleTableSlot *slot, int natts)
 
 		if (!slow && thisatt->attcacheoff >= 0)
 			off = thisatt->attcacheoff;
+		else if (thisatt->attlen == -1)
+		{
+			/*
+			 * We can only cache the offset for a varlena attribute if the
+			 * offset is already suitably aligned, so that there would be no
+			 * pad bytes in any case: then the offset will be valid for either
+			 * an aligned or unaligned value.
+			 */
+			if (!slow &&
+				off == att_align_nominal(off, thisatt->attalign))
+				thisatt->attcacheoff = off;
+			else
+			{
+				off = att_align_pointer(off, thisatt->attalign, -1,
+										tp + off);
+				slow = true;
+			}
+		}
 		else
 		{
-			/* if it's a varlena it may or may not be aligned, so check for
-			 * something that looks like a padding byte before aligning. If
-			 * we're already aligned it may be the leading byte of a 4-byte
-			 * header but then the att_align is harmless. Don't bother looking
-			 * if it's not a varlena though.*/
-			if (thisatt->attlen != -1 || !tp[off])
-				off = att_align(off, thisatt->attalign);
-
-			if (!slow && thisatt->attlen != -1)
+			/* not varlena, so safe to use att_align_nominal */
+			off = att_align_nominal(off, thisatt->attalign);
+
+			if (!slow)
 				thisatt->attcacheoff = off;
 		}
 		if (!slow && thisatt->attlen < 0)
@@ -1197,7 +1427,10 @@ slot_deform_tuple(TupleTableSlot *slot, int natts)
 
 		values[attnum] = fetchatt(thisatt, tp + off);
 
-		off = att_addlength(off, thisatt->attlen, PointerGetDatum(tp + off));
+		off = att_addlength_pointer(off, thisatt->attlen, tp + off);
+
+		if (thisatt->attlen <= 0)
+			slow = true;		/* can't use attcacheoff anymore */
 	}
 
 	/*
@@ -1252,7 +1485,6 @@ _slot_getsomeattrs(TupleTableSlot *slot, int attnum)
 		slot->PRIVATE_tts_values[attno] = (Datum) 0;
 		slot->PRIVATE_tts_isnull[attno] = true;
 	}
-
 	slot->PRIVATE_tts_nvalid = attnum;
 	TupSetVirtualTuple(slot);
 }
@@ -1266,6 +1498,177 @@ heap_freetuple(HeapTuple htup)
 	pfree(htup);
 }
 
+
+/*
+ * heap_form_minimal_tuple
+ *		construct a MinimalTuple from the given values[] and isnull[] arrays,
+ *		which are of the length indicated by tupleDescriptor->natts
+ *
+ * This is exactly like heap_form_tuple() except that the result is a
+ * "minimal" tuple lacking a HeapTupleData header as well as room for system
+ * columns.
+ *
+ * The result is allocated in the current memory context.
+ */
+MinimalTuple
+heap_form_minimal_tuple(TupleDesc tupleDescriptor,
+						Datum *values,
+						bool *isnull)
+{
+	MinimalTuple tuple;			/* return tuple */
+	Size		len,
+				data_len;
+	int			hoff;
+	bool		hasnull = false;
+	Form_pg_attribute *att = tupleDescriptor->attrs;
+	int			numberOfAttributes = tupleDescriptor->natts;
+	int			i;
+
+	if (numberOfAttributes > MaxTupleAttributeNumber)
+		ereport(ERROR,
+				(errcode(ERRCODE_TOO_MANY_COLUMNS),
+				 errmsg("number of columns (%d) exceeds limit (%d)",
+						numberOfAttributes, MaxTupleAttributeNumber)));
+
+	/*
+	 * Check for nulls and embedded tuples; expand any toasted attributes in
+	 * embedded tuples.  This preserves the invariant that toasting can only
+	 * go one level deep.
+	 *
+	 * We can skip calling toast_flatten_tuple_attribute() if the attribute
+	 * couldn't possibly be of composite type.  All composite datums are
+	 * varlena and have alignment 'd'; furthermore they aren't arrays. Also,
+	 * if an attribute is already toasted, it must have been sent to disk
+	 * already and so cannot contain toasted attributes.
+	 */
+	for (i = 0; i < numberOfAttributes; i++)
+	{
+		if (isnull[i])
+			hasnull = true;
+		else if (att[i]->attlen == -1 &&
+				 att[i]->attalign == 'd' &&
+				 att[i]->attndims == 0 &&
+				 !VARATT_IS_EXTENDED(values[i]))
+		{
+			values[i] = toast_flatten_tuple_attribute(values[i],
+													  att[i]->atttypid,
+													  att[i]->atttypmod);
+		}
+	}
+
+	/*
+	 * Determine total space needed
+	 */
+	len = offsetof(MinimalTupleData, t_bits);
+
+	if (hasnull)
+		len += BITMAPLEN(numberOfAttributes);
+
+	if (tupleDescriptor->tdhasoid)
+		len += sizeof(Oid);
+
+	hoff = len = MAXALIGN(len); /* align user data safely */
+
+	data_len = heap_compute_data_size(tupleDescriptor, values, isnull);
+
+	len += data_len;
+
+	/*
+	 * Allocate and zero the space needed.
+	 */
+	tuple = (MinimalTuple) palloc0(len);
+
+	/*
+	 * And fill in the information.
+	 */
+	tuple->t_len = len;
+	HeapTupleHeaderSetNatts(tuple, numberOfAttributes);
+	tuple->t_hoff = hoff + MINIMAL_TUPLE_OFFSET;
+
+	if (tupleDescriptor->tdhasoid)		/* else leave infomask = 0 */
+		tuple->t_infomask = HEAP_HASOID;
+
+	heap_fill_tuple(tupleDescriptor,
+					values,
+					isnull,
+					(char *) tuple + hoff,
+					data_len,
+					&tuple->t_infomask,
+					(hasnull ? tuple->t_bits : NULL));
+
+	return tuple;
+}
+
+/*
+ * heap_free_minimal_tuple
+ */
+void
+heap_free_minimal_tuple(MinimalTuple mtup)
+{
+	pfree(mtup);
+}
+
+/*
+ * heap_copy_minimal_tuple
+ *		copy a MinimalTuple
+ *
+ * The result is allocated in the current memory context.
+ */
+MinimalTuple
+heap_copy_minimal_tuple(MinimalTuple mtup)
+{
+	MinimalTuple result;
+
+	result = (MinimalTuple) palloc(mtup->t_len);
+	memcpy(result, mtup, mtup->t_len);
+	return result;
+}
+
+/*
+ * heap_tuple_from_minimal_tuple
+ *		create a HeapTuple by copying from a MinimalTuple;
+ *		system columns are filled with zeroes
+ *
+ * The result is allocated in the current memory context.
+ * The HeapTuple struct, tuple header, and tuple data are all allocated
+ * as a single palloc() block.
+ */
+HeapTuple
+heap_tuple_from_minimal_tuple(MinimalTuple mtup)
+{
+	HeapTuple	result;
+	uint32		len = mtup->t_len + MINIMAL_TUPLE_OFFSET;
+
+	result = (HeapTuple) palloc(HEAPTUPLESIZE + len);
+	result->t_len = len;
+	ItemPointerSetInvalid(&(result->t_self));
+	result->t_data = (HeapTupleHeader) ((char *) result + HEAPTUPLESIZE);
+	memcpy((char *) result->t_data + MINIMAL_TUPLE_OFFSET, mtup, mtup->t_len);
+	memset(result->t_data, 0, offsetof(HeapTupleHeaderData, t_infomask2));
+	return result;
+}
+
+/*
+ * minimal_tuple_from_heap_tuple
+ *		create a MinimalTuple by copying from a HeapTuple
+ *
+ * The result is allocated in the current memory context.
+ */
+MinimalTuple
+minimal_tuple_from_heap_tuple(HeapTuple htup)
+{
+	MinimalTuple result;
+	uint32		len;
+
+	Assert(htup->t_len > MINIMAL_TUPLE_OFFSET);
+	len = htup->t_len - MINIMAL_TUPLE_OFFSET;
+	result = (MinimalTuple) palloc(len);
+	memcpy(result, (char *) htup->t_data + MINIMAL_TUPLE_OFFSET, len);
+	result->t_len = len;
+	return result;
+}
+
+
 /* ----------------
  *		heap_addheader
  *
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index d2db3564c7b9..31c1d524103f 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -38,6 +38,7 @@ index_form_tuple(TupleDesc tupleDescriptor,
 	char	   *tp;				/* tuple pointer */
 	IndexTuple	tuple;			/* return tuple */
 	Size		size,
+				data_size,
 				hoff;
 	int			i;
 	unsigned short infomask = 0;
@@ -72,10 +73,11 @@ index_form_tuple(TupleDesc tupleDescriptor,
 		 * If value is stored EXTERNAL, must fetch it so we are not depending
 		 * on outside storage.	This should be improved someday.
 		 */
-		if (VARATT_IS_EXTERNAL_D(values[i]))
+		if (VARATT_IS_EXTERNAL(DatumGetPointer(values[i])))
 		{
 			untoasted_values[i] =
-				PointerGetDatum(heap_tuple_fetch_attr(DatumGetPointer(values[i])));
+				PointerGetDatum(heap_tuple_fetch_attr((struct varlena *)
+												DatumGetPointer(values[i])));
 			untoasted_free[i] = true;
 		}
 
@@ -83,9 +85,8 @@ index_form_tuple(TupleDesc tupleDescriptor,
 		 * If value is above size target, and is of a compressible datatype,
 		 * try to compress it in-line.
 		 */
-		if (!VARATT_IS_SHORT_D(untoasted_values[i]) &&
-			VARSIZE_D(untoasted_values[i]) > TOAST_INDEX_TARGET &&
-			!VARATT_IS_COMPRESSED_D(untoasted_values[i]) &&
+		if (!VARATT_IS_EXTENDED(untoasted_values[i]) &&
+			VARSIZE(untoasted_values[i]) > TOAST_INDEX_TARGET &&
 			(att->attstorage == 'x' || att->attstorage == 'm'))
 		{
 			Datum		cvalue = toast_compress_datum(untoasted_values[i]);
@@ -116,12 +117,13 @@ index_form_tuple(TupleDesc tupleDescriptor,
 
 	hoff = IndexInfoFindDataOffset(infomask);
 #ifdef TOAST_INDEX_HACK
-	size = hoff + heap_compute_data_size(tupleDescriptor,
-										 untoasted_values, isnull);
+	data_size = heap_compute_data_size(tupleDescriptor,
+									   untoasted_values, isnull);
 #else
-	size = hoff + heap_compute_data_size(tupleDescriptor,
-										 values, isnull);
+	data_size = heap_compute_data_size(tupleDescriptor,
+									   values, isnull);
 #endif
+	size = hoff + data_size;
 	size = MAXALIGN(size);		/* be conservative */
 
 	tp = (char *) palloc0(size);
@@ -135,6 +137,7 @@ index_form_tuple(TupleDesc tupleDescriptor,
 #endif
 					isnull,
 					(char *) tp + hoff,
+					data_size,
 					&tupmask,
 					(hasnull ? (bits8 *) tp + sizeof(IndexTupleData) : NULL));
 
@@ -201,17 +204,14 @@ nocache_index_getattr(IndexTuple tup,
 					  bool *isnull)
 {
 	Form_pg_attribute *att = tupleDesc->attrs;
-	char	   *tp;				/* ptr to att in tuple */
-	bits8	   *bp = NULL;		/* ptr to null bitmask in tuple */
-	bool		slow = false;	/* do we have to walk nulls? */
+	char	   *tp;				/* ptr to data part of tuple */
+	bits8	   *bp = NULL;		/* ptr to null bitmap in tuple */
+	bool		slow = false;	/* do we have to walk attrs? */
 	int			data_off;		/* tuple data offset */
+	int			off;			/* current offset within data */
 
 	(void) isnull;				/* not used */
 
-	/*
-	 * sanity checks
-	 */
-
 	/* ----------------
 	 *	 Three cases:
 	 *
@@ -295,19 +295,24 @@ nocache_index_getattr(IndexTuple tup,
 
 	tp = (char *) tup + data_off;
 
-	/*
-	 * now check for any non-fixed length attrs before our attribute. Note that
-	 * we use <= not < because we can't use cached offsets even for the first
-	 * varlena any more.
-	 */
 	if (!slow)
 	{
-		if (att[attnum]->attcacheoff != -1)
+		/*
+		 * If we get here, there are no nulls up to and including the target
+		 * attribute.  If we have a cached offset, we can use it.
+		 */
+		if (att[attnum]->attcacheoff >= 0)
 		{
 			return fetchatt(att[attnum],
 							tp + att[attnum]->attcacheoff);
 		}
-		else if (IndexTupleHasVarwidths(tup))
+
+		/*
+		 * Otherwise, check for non-fixed-length attrs up to and including
+		 * target.	If there aren't any, it's safe to cheaply initialize the
+		 * cached offsets for these attrs.
+		 */
+		if (IndexTupleHasVarwidths(tup))
 		{
 			int			j;
 
@@ -322,88 +327,109 @@ nocache_index_getattr(IndexTuple tup,
 		}
 	}
 
-	/*
-	 * If slow is false, and we got here, we know that we have a tuple with no
-	 * nulls or var-widths before the target attribute. If possible, we also
-	 * want to initialize the remainder of the attribute cached offset values.
-	 */
 	if (!slow)
 	{
+		int			natts = tupleDesc->natts;
 		int			j = 1;
-		long		off;
 
 		/*
-		 * need to set cache for some atts
+		 * If we get here, we have a tuple with no nulls or var-widths up to
+		 * and including the target attribute, so we can use the cached offset
+		 * ... only we don't have it yet, or we'd not have got here.  Since
+		 * it's cheap to compute offsets for fixed-width columns, we take the
+		 * opportunity to initialize the cached offsets for *all* the leading
+		 * fixed-width columns, in hope of avoiding future visits to this
+		 * routine.
 		 */
-
 		att[0]->attcacheoff = 0;
 
-		while (j < attnum && att[j]->attcacheoff > 0)
+		/* we might have set some offsets in the slow path previously */
+		while (j < natts && att[j]->attcacheoff > 0)
 			j++;
 
 		off = att[j - 1]->attcacheoff + att[j - 1]->attlen;
 
-		for (; j <= attnum; j++)
+		for (; j < natts; j++)
 		{
-			off = att_align(off, att[j]->attalign);
+			if (att[j]->attlen <= 0)
+				break;
+
+			off = att_align_nominal(off, att[j]->attalign);
 
 			att[j]->attcacheoff = off;
 
 			off += att[j]->attlen;
 		}
 
-		return fetchatt(att[attnum], tp + att[attnum]->attcacheoff);
+		Assert(j > attnum);
+
+		off = att[attnum]->attcacheoff;
 	}
 	else
 	{
 		bool		usecache = true;
-		int			off = 0;
 		int			i;
 
 		/*
-		 * Now we know that we have to walk the tuple CAREFULLY.
+		 * Now we know that we have to walk the tuple CAREFULLY.  But we still
+		 * might be able to cache some offsets for next time.
+		 *
+		 * Note - This loop is a little tricky.  For each non-null attribute,
+		 * we have to first account for alignment padding before the attr,
+		 * then advance over the attr based on its length.	Nulls have no
+		 * storage and no alignment padding either.  We can use/set
+		 * attcacheoff until we reach either a null or a var-width attribute.
 		 */
-
-		for (i = 0; i < attnum; i++)
+		off = 0;
+		for (i = 0;; i++)		/* loop exit is at "break" */
 		{
-			if (IndexTupleHasNulls(tup))
+			if (IndexTupleHasNulls(tup) && att_isnull(i, bp))
 			{
-				if (att_isnull(i, bp))
-				{
-					usecache = false;
-					continue;
-				}
+				usecache = false;
+				continue;		/* this cannot be the target att */
 			}
 
 			/* If we know the next offset, we can skip the rest */
-			if (usecache && att[i]->attcacheoff != -1)
+			if (usecache && att[i]->attcacheoff >= 0)
 				off = att[i]->attcacheoff;
+			else if (att[i]->attlen == -1)
+			{
+				/*
+				 * We can only cache the offset for a varlena attribute if the
+				 * offset is already suitably aligned, so that there would be
+				 * no pad bytes in any case: then the offset will be valid for
+				 * either an aligned or unaligned value.
+				 */
+				if (usecache &&
+					off == att_align_nominal(off, att[i]->attalign))
+					att[i]->attcacheoff = off;
+				else
+				{
+					off = att_align_pointer(off, att[i]->attalign, -1,
+											tp + off);
+					usecache = false;
+				}
+			}
 			else
 			{
-				/* if it's a varlena it may or may not be aligned becuase
-				 * heap_deform_tuple compressees short varlenas using 1-byte
-				 * headers, so check for something that looks like a padding byte
-				 * before aligning. If we're already aligned it may be the leading
-				 * byte of a 4-byte header but then the att_align is harmless.
-				 * Don't bother looking if it's not a varlena though.*/
-				if (att[i]->attlen != -1 || !tp[off])
-					off = att_align(off, att[i]->attalign);
-				if (usecache && att[i]->attlen != -1)
+				/* not varlena, so safe to use att_align_nominal */
+				off = att_align_nominal(off, att[i]->attalign);
+
+				if (usecache)
 					att[i]->attcacheoff = off;
 			}
 
-			if (att[i]->attlen < 0)
-				usecache = false;
+			if (i == attnum)
+				break;
 
-			off = att_addlength(off, att[i]->attlen, PointerGetDatum(tp + off));
+			off = att_addlength_pointer(off, att[i]->attlen, tp + off);
 
+			if (usecache && att[i]->attlen <= 0)
+				usecache = false;
 		}
-
-		if (att[attnum]->attlen != -1 || !tp[off])
-			off = att_align(off, att[attnum]->attalign);
-
-		return fetchatt(att[attnum], tp + off);
 	}
+
+	return fetchatt(att[attnum], tp + off);
 }
 
 /*
diff --git a/src/backend/access/common/memtuple.c b/src/backend/access/common/memtuple.c
index 9519aec64670..c04fe728ec60 100644
--- a/src/backend/access/common/memtuple.c
+++ b/src/backend/access/common/memtuple.c
@@ -126,7 +126,7 @@ static inline bool add_null_save_aligned(MemTupleAttrBinding *bind, short *null_
 	Assert(null_save_aligned);
 	Assert(i >= 0);
 
-	bind->len_aligned = att_align(bind->len, next_attr_align);
+	bind->len_aligned = att_align_nominal(bind->len, next_attr_align);
 	add_null_save(null_save_aligned, i, bind->len_aligned);
 
 	return (bind->len == bind->len_aligned);
@@ -232,7 +232,7 @@ static void create_col_bind(MemTupleBindingCols *colbind, bool islarge, TupleDes
 
 			if(pass == 0 && attr->attlen > 0 && attr->attalign == 'd')
 			{
-				bind->offset = att_align(cur_offset, attr->attalign);
+				bind->offset = att_align_nominal(cur_offset, attr->attalign);
 				bind->len = attr->attlen;
 				add_null_save(colbind->null_saves, physical_col, attr->attlen);
 				if (physical_col)
@@ -261,7 +261,7 @@ static void create_col_bind(MemTupleBindingCols *colbind, bool islarge, TupleDes
 					      )
 				) 
 			{
-				bind->offset = att_align(cur_offset, 'i'); 
+				bind->offset = att_align_nominal(cur_offset, 'i'); 
 				bind->len = attr->attlen > 0 ? attr->attlen : 4; 
 				add_null_save(colbind->null_saves, physical_col, bind->len);
 				if (physical_col)
@@ -299,7 +299,7 @@ static void create_col_bind(MemTupleBindingCols *colbind, bool islarge, TupleDes
 						)
 				)
 			{
-				bind->offset = att_align(cur_offset, 's');
+				bind->offset = att_align_nominal(cur_offset, 's');
 				bind->len = attr->attlen > 0 ? attr->attlen : 2; 
 				add_null_save(colbind->null_saves, physical_col, bind->len);
 				if (physical_col)
@@ -338,7 +338,7 @@ static void create_col_bind(MemTupleBindingCols *colbind, bool islarge, TupleDes
 						)
 					)
 			{
-				bind->offset = att_align(cur_offset, 'c');
+				bind->offset = att_align_nominal(cur_offset, 'c');
 
 #ifdef MEMTUPLE_INLINE_CHARTYPE 
 				/* Inline CHAR(N) disabled.  See att_bind_as_varoffset */
@@ -488,14 +488,14 @@ static uint32 compute_memtuple_size_using_bind(
 		/* We plan to convert to short varlena even if it is not currently */
 		if (bind->flag == MTB_ByRef &&
 			attr->attstorage != 'p' &&
-			value_type_could_short(values[i], attr->atttypid))
+			value_type_could_short(DatumGetPointer(values[i]), attr->atttypid))
 		{
-			data_length += VARSIZE_ANY_EXHDR_D(values[i]) + VARHDRSZ_SHORT;
+			data_length += VARSIZE_ANY_EXHDR(DatumGetPointer(values[i])) + VARHDRSZ_SHORT;
 		}
 		else
 		{
-			data_length = att_align(data_length, attr->attalign); 
-			data_length = att_addlength(data_length, attr->attlen, values[i]);
+			data_length = att_align_nominal(data_length, attr->attalign); 
+			data_length = att_addlength_datum(data_length, attr->attlen, values[i]);
 		}
 	}
 
@@ -607,7 +607,7 @@ MemTuple memtuple_form_to_align(
 		if (attr->attlen == -1 &&
 				attr->attalign == 'd' &&
 				attr->attndims == 0 &&
-				!VARATT_IS_EXTENDED_D(values[i]))
+				!VARATT_IS_EXTENDED(DatumGetPointer(values[i])))
 		{
 			if (old_values == NULL)
 				old_values = (Datum *)palloc0(pbind->tupdesc->natts * sizeof(Datum));
@@ -617,7 +617,7 @@ MemTuple memtuple_form_to_align(
 				old_values[i] = 0;
 		}
 
-		if (attr->attlen == -1 && VARATT_IS_EXTERNAL_D(values[i]))
+		if (attr->attlen == -1 && VARATT_IS_EXTERNAL(DatumGetPointer(values[i])))
 		{
 			if(inline_toast)
 			{
@@ -780,40 +780,40 @@ MemTuple memtuple_form_to_align(
 					else
 					{
 						char *p = memtuple_get_attr_ptr(start, bind, null_saves, nullp);
-						Assert(VARATT_COULD_SHORT_D(values[i]));
-						attr_len = VARSIZE_D(values[i]) - VARHDRSZ + VARHDRSZ_SHORT;
+						Assert(VARATT_CAN_MAKE_SHORT(DatumGetPointer(values[i])));
+						attr_len = VARSIZE(DatumGetPointer(values[i])) - VARHDRSZ + VARHDRSZ_SHORT;
 						Assert(attr_len <= bind->len);
 						*p = VARSIZE_TO_SHORT_D(values[i]);
-						memcpy(p+1, VARDATA_D(values[i]), attr_len-1);
+						memcpy(p+1, VARDATA(DatumGetPointer(values[i])), attr_len-1);
 					}
 				}
 				break;
 			case MTB_ByRef:
-				if(VARATT_IS_EXTERNAL_D(values[i]))
+				if(VARATT_IS_EXTERNAL(DatumGetPointer(values[i])))
 				{
-					varlen_start = (char *) att_align((long) varlen_start, attr->attalign);
+					varlen_start = (char *) att_align_nominal((long) varlen_start, attr->attalign);
 					attr_len = VARSIZE_EXTERNAL(DatumGetPointer(values[i]));
 					Assert((varlen_start - (char *) mtup) + attr_len <= len);
 					memcpy(varlen_start, DatumGetPointer(values[i]), attr_len);
 				}
-				else if(VARATT_IS_SHORT_D(values[i]))
+				else if(VARATT_IS_SHORT(DatumGetPointer(values[i])))
 				{
 					attr_len = VARSIZE_SHORT(DatumGetPointer(values[i]));
 					Assert((varlen_start - (char *) mtup) + attr_len <= len);
 					memcpy(varlen_start, DatumGetPointer(values[i]), attr_len);
 				}
-				else if (attr->attstorage != 'p' &&
-						 value_type_could_short(values[i], attr->atttypid))
+				else if(attr->attstorage != 'p' &&
+						value_type_could_short(DatumGetPointer(values[i]), attr->atttypid))
 				{
-					attr_len = VARSIZE_D(values[i]) - VARHDRSZ + VARHDRSZ_SHORT;
+					attr_len = VARSIZE(DatumGetPointer(values[i])) - VARHDRSZ + VARHDRSZ_SHORT;
 					*varlen_start = VARSIZE_TO_SHORT_D(values[i]);
 					Assert((varlen_start - (char *) mtup) + attr_len <= len);
-					memcpy(varlen_start+1, VARDATA_D(values[i]), attr_len-1);
+					memcpy(varlen_start+1, VARDATA(DatumGetPointer(values[i])), attr_len-1);
 				}
 				else
 				{
 					/* Must be 4 byte header aligned varlena */
-					varlen_start = (char *) att_align((long) varlen_start, attr->attalign);
+					varlen_start = (char *) att_align_nominal((long) varlen_start, attr->attalign);
 					attr_len = VARSIZE(DatumGetPointer(values[i]));
 					Assert((varlen_start - (char *) mtup) + attr_len <= len);
 					memcpy(varlen_start, DatumGetPointer(values[i]), attr_len);
@@ -831,7 +831,7 @@ MemTuple memtuple_form_to_align(
 				break;
 
 			case MTB_ByRef_CStr:
-				varlen_start = (char *) att_align((long) varlen_start, attr->attalign);
+				varlen_start = (char *) att_align_nominal((long) varlen_start, attr->attalign);
 				attr_len = strlen(DatumGetCString(values[i])) + 1;
 				Assert((varlen_start - (char *) mtup) + attr_len <= len);
 				memcpy(varlen_start, DatumGetPointer(values[i]), attr_len);
@@ -1029,7 +1029,7 @@ bool MemTupleHasExternal(MemTuple mtup, MemTupleBinding *pbind)
 			Datum d = memtuple_getattr(mtup, pbind, i+1, &isnull);
 			if(!isnull)
 			{
-				if(VARATT_IS_EXTERNAL_D(d))
+				if(VARATT_IS_EXTERNAL(DatumGetPointer(d)))
 					return true;
 			}
 		}
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 5acb4acfc8ce..4f54e166ed8d 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/common/printtup.c,v 1.100 2007/01/05 22:19:21 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/common/printtup.c,v 1.101 2008/01/01 19:45:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index e433fb6ca325..e44140544b46 100644
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.3 2007/01/05 22:19:21 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.8 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -879,8 +879,8 @@ parseRelOptions(Datum options, int numkeywords, const char *const * keywords,
 				if (values[j] && validate)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-							 errmsg("duplicate parameter \"%s\"",
-									keywords[j])));
+						  errmsg("parameter \"%s\" specified more than once",
+								 keywords[j])));
 				value_len = text_len - kw_len - 1;
 				value = (char *) palloc(value_len + 1);
 				memcpy(value, text_str + kw_len + 1, value_len);
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 756cc42ebaa6..4ff2f0be89b2 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/common/tupdesc.c,v 1.120 2007/01/05 22:19:21 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/common/tupdesc.c,v 1.122 2008/01/01 19:45:46 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -560,8 +560,7 @@ BuildDescForRelation(List *schema)
 		attnum++;
 
 		attname = entry->colname;
-		atttypid = typenameTypeId(NULL, entry->typname);
-		atttypmod = typenameTypeMod(NULL, entry->typname, atttypid);
+		atttypid = typenameTypeId(NULL, entry->typname, &atttypmod);
 		attdim = list_length(entry->typname->arrayBounds);
 
 		if (entry->typname->setof)
diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c
index 27dc64723dbd..c453cda525cb 100644
--- a/src/backend/access/gin/ginarrayproc.c
+++ b/src/backend/access/gin/ginarrayproc.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.9 2007/01/31 15:09:45 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.12 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
@@ -60,17 +60,18 @@ ginarrayextract(PG_FUNCTION_ARGS)
 					  elmlen, elmbyval, elmalign,
 					  &entries, NULL, (int *) nentries);
 
-	if ( *nentries == 0 && PG_NARGS() == 3 )
+	if (*nentries == 0 && PG_NARGS() == 3)
 	{
-		switch( PG_GETARG_UINT16(2) )
+		switch (PG_GETARG_UINT16(2))	/* StrategyNumber */
 		{
 			case GinOverlapStrategy:
-					*nentries = -1; /* nobody can be found */
-					break;
+				*nentries = -1; /* nobody can be found */
+				break;
 			case GinContainsStrategy:
 			case GinContainedStrategy:
 			case GinEqualStrategy:
-			default:	/* require fullscan: GIN can't find void arrays */
+			default:			/* require fullscan: GIN can't find void
+								 * arrays */
 				break;
 		}
 	}
@@ -79,6 +80,15 @@ ginarrayextract(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(entries);
 }
 
+Datum
+ginqueryarrayextract(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall3(ginarrayextract,
+										PG_GETARG_DATUM(0),
+										PG_GETARG_DATUM(1),
+										PG_GETARG_DATUM(2)));
+}
+
 Datum
 ginarrayconsistent(PG_FUNCTION_ARGS)
 {
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 576b1a95afcf..6adbb68d6f0f 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginbtree.c,v 1.8 2007/02/01 04:16:07 neilc Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginbtree.c,v 1.11 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -328,8 +328,8 @@ ginInsertValue(GinBtree btree, GinBtreeStack *stack)
 			Page		newlpage;
 
 			/*
-			 * newlpage is a pointer to memory page, it doesn't associate
-			 * with buffer, stack->buffer should be untouched
+			 * newlpage is a pointer to memory page, it doesn't associate with
+			 * buffer, stack->buffer should be untouched
 			 */
 			newlpage = btree->splitPage(btree, stack->buffer, rbuffer, stack->off, &rdata);
 
diff --git a/src/backend/access/gin/ginbulk.c b/src/backend/access/gin/ginbulk.c
index 07549a3e6bbb..2165428c54f4 100644
--- a/src/backend/access/gin/ginbulk.c
+++ b/src/backend/access/gin/ginbulk.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginbulk.c,v 1.9 2007/02/01 04:16:08 neilc Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginbulk.c,v 1.11 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -16,6 +16,7 @@
 
 #include "access/gin.h"
 #include "utils/datum.h"
+#include "utils/memutils.h"
 
 
 #define DEF_NENTRY	2048
@@ -38,7 +39,7 @@ EAAllocate(BuildAccumulator *accum)
 	if (accum->entryallocator == NULL || accum->length >= DEF_NENTRY)
 	{
 		accum->entryallocator = palloc(sizeof(EntryAccumulator) * DEF_NENTRY);
-		accum->allocatedMemory += sizeof(EntryAccumulator) * DEF_NENTRY;
+		accum->allocatedMemory += GetMemoryChunkSpace(accum->entryallocator);
 		accum->length = 0;
 	}
 
@@ -55,10 +56,11 @@ ginInsertData(BuildAccumulator *accum, EntryAccumulator *entry, ItemPointer heap
 {
 	if (entry->number >= entry->length)
 	{
-		accum->allocatedMemory += sizeof(ItemPointerData) * entry->length;
+		accum->allocatedMemory -= GetMemoryChunkSpace(entry->list);
 		entry->length *= 2;
 		entry->list = (ItemPointerData *) repalloc(entry->list,
 									sizeof(ItemPointerData) * entry->length);
+		accum->allocatedMemory += GetMemoryChunkSpace(entry->list);
 	}
 
 	if (entry->shouldSort == FALSE)
@@ -95,10 +97,10 @@ getDatumCopy(BuildAccumulator *accum, Datum value)
 		realSize = datumGetSize(value, false, att[0]->attlen);
 
 		s = (char *) palloc(realSize);
+		accum->allocatedMemory += GetMemoryChunkSpace(s);
+
 		memcpy(s, DatumGetPointer(value), realSize);
 		res = PointerGetDatum(s);
-
-		accum->allocatedMemory += realSize;
 	}
 	return res;
 }
@@ -143,8 +145,8 @@ ginInsertEntry(BuildAccumulator *accum, ItemPointer heapptr, Datum entry)
 		ea->number = 1;
 		ea->shouldSort = FALSE;
 		ea->list = (ItemPointerData *) palloc(sizeof(ItemPointerData) * DEF_NPTR);
+		accum->allocatedMemory += GetMemoryChunkSpace(ea->list);
 		ea->list[0] = *heapptr;
-		accum->allocatedMemory += sizeof(ItemPointerData) * DEF_NPTR;
 
 		if (pea == NULL)
 			accum->entries = ea;
@@ -270,11 +272,11 @@ ginGetEntry(BuildAccumulator *accum, Datum *value, uint32 *n)
 	EntryAccumulator *entry;
 	ItemPointerData *list;
 
-
 	if (accum->stack == NULL)
 	{
 		/* first call */
 		accum->stack = palloc0(sizeof(EntryAccumulator *) * (accum->maxdepth + 1));
+		accum->allocatedMemory += GetMemoryChunkSpace(accum->stack);
 		entry = accum->entries;
 
 		if (entry == NULL)
@@ -295,6 +297,7 @@ ginGetEntry(BuildAccumulator *accum, Datum *value, uint32 *n)
 	}
 	else
 	{
+		accum->allocatedMemory -= GetMemoryChunkSpace(accum->stack[accum->stackpos]->list);
 		pfree(accum->stack[accum->stackpos]->list);
 		accum->stack[accum->stackpos]->list = NULL;
 		entry = walkTree(accum);
diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c
index 53582bfdd7df..58853db8457b 100644
--- a/src/backend/access/gin/gindatapage.c
+++ b/src/backend/access/gin/gindatapage.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/gindatapage.c,v 1.5.2.1 2007/06/04 15:59:19 teodor Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/gindatapage.c,v 1.9 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -360,7 +360,7 @@ dataPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prda
 	static XLogRecData rdata[3];
 	int			sizeofitem = GinSizeOfItem(page);
 	static ginxlogInsert data;
-	int 		cnt=0;
+	int			cnt = 0;
 
 	*prdata = rdata;
 	Assert(GinPageIsData(page));
@@ -375,14 +375,14 @@ dataPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prda
 	data.isData = TRUE;
 	data.isLeaf = GinPageIsLeaf(page) ? TRUE : FALSE;
 
-	/* 
-	 * Prevent full page write if child's split occurs. That is needed
-	 * to remove incomplete splits while replaying WAL
-	 * 
-	 * data.updateBlkno contains new block number (of newly created right page)
-	 * for recently splited page.
+	/*
+	 * Prevent full page write if child's split occurs. That is needed to
+	 * remove incomplete splits while replaying WAL
+	 *
+	 * data.updateBlkno contains new block number (of newly created right
+	 * page) for recently splited page.
 	 */
-	if ( data.updateBlkno == InvalidBlockNumber ) 
+	if (data.updateBlkno == InvalidBlockNumber)
 	{
 		rdata[0].buffer = buf;
 		rdata[0].buffer_std = FALSE;
@@ -395,7 +395,7 @@ dataPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prda
 	rdata[cnt].buffer = InvalidBuffer;
 	rdata[cnt].data = (char *) &data;
 	rdata[cnt].len = sizeof(ginxlogInsert);
-	rdata[cnt].next = &rdata[cnt+1];
+	rdata[cnt].next = &rdata[cnt + 1];
 	cnt++;
 
 	rdata[cnt].buffer = InvalidBuffer;
diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c
index 2eebc56d06b5..6352a13077d7 100644
--- a/src/backend/access/gin/ginentrypage.c
+++ b/src/backend/access/gin/ginentrypage.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginentrypage.c,v 1.5.2.1 2007/06/04 15:59:19 teodor Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginentrypage.c,v 1.12 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -354,12 +354,12 @@ entryPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prd
 	static XLogRecData rdata[3];
 	OffsetNumber placed;
 	static ginxlogInsert data;
-	int 	cnt=0;
+	int			cnt = 0;
 
 	*prdata = rdata;
 	data.updateBlkno = entryPreparePage(btree, page, off);
 
-	placed = PageAddItem(page, (Item) btree->entry, IndexTupleSize(btree->entry), off, LP_USED);
+	placed = PageAddItem(page, (Item) btree->entry, IndexTupleSize(btree->entry), off, false, false);
 	if (placed != off)
 		elog(ERROR, "failed to add item to index page in \"%s\"",
 			 RelationGetRelationName(btree->index));
@@ -372,14 +372,14 @@ entryPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prd
 	data.isData = false;
 	data.isLeaf = GinPageIsLeaf(page) ? TRUE : FALSE;
 
-    /*
-	 * Prevent full page write if child's split occurs. That is needed
-	 * to remove incomplete splits while replaying WAL
+	/*
+	 * Prevent full page write if child's split occurs. That is needed to
+	 * remove incomplete splits while replaying WAL
 	 *
-	 * data.updateBlkno contains new block number (of newly created right page)
-	 * for recently splited page.
+	 * data.updateBlkno contains new block number (of newly created right
+	 * page) for recently splited page.
 	 */
-	if ( data.updateBlkno == InvalidBlockNumber ) 
+	if (data.updateBlkno == InvalidBlockNumber)
 	{
 		rdata[0].buffer = buf;
 		rdata[0].buffer_std = TRUE;
@@ -392,7 +392,7 @@ entryPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prd
 	rdata[cnt].buffer = InvalidBuffer;
 	rdata[cnt].data = (char *) &data;
 	rdata[cnt].len = sizeof(ginxlogInsert);
-	rdata[cnt].next = &rdata[cnt+1];
+	rdata[cnt].next = &rdata[cnt + 1];
 	cnt++;
 
 	rdata[cnt].buffer = InvalidBuffer;
@@ -511,7 +511,7 @@ entrySplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogR
 			lsize += MAXALIGN(IndexTupleSize(itup)) + sizeof(ItemIdData);
 		}
 
-		if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, LP_USED) == InvalidOffsetNumber)
+		if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
 			elog(ERROR, "failed to add item to index page in \"%s\"",
 				 RelationGetRelationName(btree->index));
 		ptr += MAXALIGN(IndexTupleSize(itup));
@@ -575,11 +575,11 @@ entryFillRoot(GinBtree btree __attribute__((unused)), Buffer root, Buffer lbuf,
 	page = BufferGetPage(root);
 
 	itup = ginPageGetLinkItup(lbuf);
-	if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, LP_USED) == InvalidOffsetNumber)
+	if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
 		elog(ERROR, "failed to add item to index root page");
 
 	itup = ginPageGetLinkItup(rbuf);
-	if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, LP_USED) == InvalidOffsetNumber)
+	if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
 		elog(ERROR, "failed to add item to index root page");
 }
 
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
index 0d20ee0ade46..2dbc7df56916 100644
--- a/src/backend/access/gin/ginget.c
+++ b/src/backend/access/gin/ginget.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.7 2007/02/01 04:16:08 neilc Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.10.2.1 2008/04/22 17:54:19 teodor Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -27,14 +27,14 @@ findItemInPage(Page page, ItemPointer item, OffsetNumber *off)
 	OffsetNumber maxoff = GinPageGetOpaque(page)->maxoff;
 	int			res;
 
-	if ( GinPageGetOpaque(page)->flags & GIN_DELETED )
+	if (GinPageGetOpaque(page)->flags & GIN_DELETED)
 		/* page was deleted by concurrent  vacuum */
 		return false;
 
 	/*
 	 * scan page to find equal or first greater value
 	 */
-     
+
 	for (*off = FirstOffsetNumber; *off <= maxoff; (*off)++)
 	{
 		res = compareItemPointers(item, (ItemPointer) GinDataPageGetItem(page, *off));
@@ -55,10 +55,10 @@ startScanEntry(Relation index, GinState *ginstate, GinScanEntry entry)
 {
 	MIRROREDLOCK_BUFMGR_DECLARE;
 
-	GinBtreeData    btreeEntry;
+	GinBtreeData 	btreeEntry;
 	GinBtreeStack  *stackEntry;
-	Page            page;
-	bool            needUnlock = TRUE;
+	Page			page;
+	bool			needUnlock = TRUE;
 
 	if (entry->master != NULL)
 	{
@@ -67,7 +67,7 @@ startScanEntry(Relation index, GinState *ginstate, GinScanEntry entry)
 	}
 
 	/*
-	 * We should find entry, and begin scan of posting tree
+	 * we should find entry, and begin scan of posting tree
 	 * or just store posting list in memory
 	 */
 
@@ -118,10 +118,10 @@ startScanEntry(Relation index, GinState *ginstate, GinScanEntry entry)
 			 */
 			entry->list = (ItemPointerData *) palloc( BLCKSZ );
 			entry->nlist = GinPageGetOpaque(page)->maxoff;
-			memcpy( entry->list, GinDataPageGetItem(page, FirstOffsetNumber),
+			memcpy( entry->list, GinDataPageGetItem(page, FirstOffsetNumber), 
 						GinPageGetOpaque(page)->maxoff * sizeof(ItemPointerData) );
 
-            LockBuffer(entry->buffer, GIN_UNLOCK);
+			LockBuffer(entry->buffer, GIN_UNLOCK);
 			freeGinBtreeStack(gdi->stack);
 			pfree(gdi);
 			entry->isFinished = FALSE;
@@ -162,10 +162,10 @@ startScanKey(Relation index, GinState *ginstate, GinScanKey key)
 	if (GinFuzzySearchLimit > 0)
 	{
 		/*
-		 * If all of keys more than threshold we will try to reduce result,
-		 * we hope (and only hope, for intersection operation of array our
-		 * supposition isn't true), that total result will not more than
-		 * minimal predictNumberResult.
+		 * If all of keys more than threshold we will try to reduce
+		 * result, we hope (and only hope, for intersection operation of
+		 * array our supposition isn't true), that total result will not
+		 * more than minimal predictNumberResult.
 		 */
 
 		for (i = 0; i < key->nentries; i++)
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index ce044bb2360f..d4ea51ece7be 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -8,11 +8,12 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/gininsert.c,v 1.8 2007/02/01 04:16:08 neilc Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/gininsert.c,v 1.11.2.2 2009/03/24 22:06:24 tgl Exp $
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
+
 #include "access/genam.h"
 #include "access/gin.h"
 #include "catalog/index.h"
@@ -20,6 +21,7 @@
 #include "utils/memutils.h"
 #include "cdb/cdbfilerepprimary.h"
 
+
 typedef struct
 {
 	GinState	ginstate;
@@ -137,8 +139,7 @@ addItemPointersToTuple(Relation index, GinState *ginstate, GinBtreeStack *stack
 }
 
 /*
- * Inserts only one entry to the index, but it can adds more that 1
- * ItemPointer.
+ * Inserts only one entry to the index, but it can add more than 1 ItemPointer.
  */
 static void
 ginEntryInsert(Relation index, GinState *ginstate, Datum value, ItemPointerData *items, uint32 nitem, bool isBuild)
@@ -203,7 +204,7 @@ ginEntryInsert(Relation index, GinState *ginstate, Datum value, ItemPointerData
 
 /*
  * Saves indexed value in memory accumulator during index creation
- * Function isn't use during normal insert
+ * Function isn't used during normal insert
  */
 static uint32
 ginHeapTupleBulkInsert(GinBuildState *buildstate, Datum value, ItemPointer heapptr)
@@ -231,7 +232,6 @@ static void
 ginBuildCallback(Relation index, ItemPointer tupleId, Datum *values,
 				 bool *isnull, bool tupleIsAlive __attribute__((unused)), void *state)
 {
-
 	GinBuildState *buildstate = (GinBuildState *) state;
 	MemoryContext oldCtx;
 
@@ -242,11 +242,10 @@ ginBuildCallback(Relation index, ItemPointer tupleId, Datum *values,
 
 	buildstate->indtuples += ginHeapTupleBulkInsert(buildstate, *values, tupleId);
 
-	/*
-	 * we use only half maintenance_work_mem, because there is some leaks
-	 * during insertion and extract values
-	 */
-	if (buildstate->accum.allocatedMemory >= maintenance_work_mem * 1024L / 2L)
+	/* If we've maxed out our available memory, dump everything to the index */
+	/* Also dump if the tree seems to be getting too unbalanced */
+	if (buildstate->accum.allocatedMemory >= maintenance_work_mem * 1024L ||
+		buildstate->accum.maxdepth > GIN_MAX_TREE_DEPTH)
 	{
 		ItemPointerData *list;
 		Datum		entry;
@@ -334,8 +333,11 @@ ginbuild(PG_FUNCTION_ARGS)
 	buildstate.accum.ginstate = &buildstate.ginstate;
 	ginInitBA(&buildstate.accum);
 
-	/* do the heap scan */
-	reltuples = IndexBuildScan(heap, index, indexInfo,
+	/*
+	 * Do the heap scan.  We disallow sync scan here because dataPlaceToPage
+	 * prefers to receive tuples in TID order.
+	 */
+	reltuples = IndexBuildScan(heap, index, indexInfo, false,
 							   ginBuildCallback, (void *) &buildstate);
 
 	oldCtx = MemoryContextSwitchTo(buildstate.tmpCtx);
diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c
index b25e79b996fb..8d3b0a700078 100644
--- a/src/backend/access/gin/ginscan.c
+++ b/src/backend/access/gin/ginscan.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.9 2007/01/31 15:09:45 teodor Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.12 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -167,13 +167,13 @@ newScanKey(IndexScanDesc scan)
 									   UInt16GetDatum(scankey[i].sk_strategy)
 															  )
 			);
-		if ( nEntryValues < 0 )
+		if (nEntryValues < 0)
 		{
 			/*
-			 * extractQueryFn signals that nothing will be found,
-			 * so we can just set isVoidRes flag...
+			 * extractQueryFn signals that nothing will be found, so we can
+			 * just set isVoidRes flag...
 			 */
-			so->isVoidRes = true;	
+			so->isVoidRes = true;
 			break;
 		}
 		if (entryValues == NULL || nEntryValues == 0)
@@ -190,7 +190,7 @@ newScanKey(IndexScanDesc scan)
 	if (so->nkeys == 0 && !so->isVoidRes)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("GIN index does not support search with void query")));
+			   errmsg("GIN index does not support search with void query")));
 
 	pgstat_count_index_scan(scan->indexRelation);
 }
diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index bf40beef717b..86be7be732bd 100644
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.10 2007/01/31 15:09:45 teodor Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.13 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -129,7 +129,7 @@ compareEntries(GinState *ginstate, Datum a, Datum b)
 									   &ginstate->compareFn,
 									   a, b
 									   )
-	);
+		);
 }
 
 typedef struct
diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c
index b4d5ac8a0257..06943bf4f8c1 100644
--- a/src/backend/access/gin/ginvacuum.c
+++ b/src/backend/access/gin/ginvacuum.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.12 2007/02/01 04:16:08 neilc Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.19 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -30,6 +30,7 @@ typedef struct
 	IndexBulkDeleteCallback callback;
 	void	   *callback_state;
 	GinState	ginstate;
+	BufferAccessStrategy strategy;
 } GinVacuumState;
 
 
@@ -160,20 +161,20 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot,
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
-	buffer = ReadBuffer(gvs->index, blkno);
+	buffer = ReadBufferWithStrategy(gvs->index, blkno, gvs->strategy);
 	page = BufferGetPage(buffer);
 
 	/*
 	 * We should be sure that we don't concurrent with inserts, insert process
 	 * never release root page until end (but it can unlock it and lock
-	 * again). New scan can't start but previously started 
-	 * ones work concurrently.
+	 * again). New scan can't start but previously started ones work
+	 * concurrently.
 	 */
 
-	if ( isRoot ) 
+	if (isRoot)
 		LockBufferForCleanup(buffer);
 	else
-		LockBuffer(buffer, GIN_EXCLUSIVE); 
+		LockBuffer(buffer, GIN_EXCLUSIVE);
 
 	Assert(GinPageIsData(page));
 
@@ -253,9 +254,10 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
-	dBuffer = ReadBuffer(gvs->index, deleteBlkno);
-	lBuffer = (leftBlkno == InvalidBlockNumber) ? InvalidBuffer : ReadBuffer(gvs->index, leftBlkno);
-	pBuffer = ReadBuffer(gvs->index, parentBlkno);
+	dBuffer = ReadBufferWithStrategy(gvs->index, deleteBlkno, gvs->strategy);
+	lBuffer = (leftBlkno == InvalidBlockNumber) ?
+		InvalidBuffer : ReadBufferWithStrategy(gvs->index, leftBlkno, gvs->strategy);
+	pBuffer = ReadBufferWithStrategy(gvs->index, parentBlkno, gvs->strategy);
 
 	LockBuffer(dBuffer, GIN_EXCLUSIVE);
 	if (!isParentRoot)			/* parent is already locked by
@@ -279,17 +281,20 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
 
 	parentPage = BufferGetPage(pBuffer);
 #ifdef USE_ASSERT_CHECKING
-	do {
-		PostingItem *tod=(PostingItem *) GinDataPageGetItem(parentPage, myoff);
-		Assert( PostingItemGetBlockNumber(tod) == deleteBlkno );
-	} while(0);
+	do
+	{
+		PostingItem *tod = (PostingItem *) GinDataPageGetItem(parentPage, myoff);
+
+		Assert(PostingItemGetBlockNumber(tod) == deleteBlkno);
+	} while (0);
 #endif
 	PageDeletePostingItem(parentPage, myoff);
 
 	page = BufferGetPage(dBuffer);
+
 	/*
-	 * we shouldn't change rightlink field to save 
-	 * workability of running search scan
+	 * we shouldn't change rightlink field to save workability of running
+	 * search scan
 	 */
 	GinPageGetOpaque(page)->flags = GIN_DELETED;
 
@@ -374,8 +379,8 @@ typedef struct DataPageDeleteStack
 	struct DataPageDeleteStack *child;
 	struct DataPageDeleteStack *parent;
 
-	BlockNumber blkno; /* current block number */
-	BlockNumber leftBlkno; /* rightest non-deleted page on left */
+	BlockNumber blkno;			/* current block number */
+	BlockNumber leftBlkno;		/* rightest non-deleted page on left */
 	bool		isRoot;
 } DataPageDeleteStack;
 
@@ -412,7 +417,7 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot, DataPageDel
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	buffer = ReadBuffer(gvs->index, blkno);
+	buffer = ReadBufferWithStrategy(gvs->index, blkno, gvs->strategy);
 	page = BufferGetPage(buffer);
 
 	Assert(GinPageIsData(page));
@@ -563,7 +568,7 @@ ginVacuumEntryPage(GinVacuumState *gvs, Buffer buffer, BlockNumber *roots, uint3
 				itup = GinFormTuple(&gvs->ginstate, value, GinGetPosting(itup), newN);
 				PageIndexTupleDelete(tmppage, i);
 
-				if (PageAddItem(tmppage, (Item) itup, IndexTupleSize(itup), i, LP_USED) != i)
+				if (PageAddItem(tmppage, (Item) itup, IndexTupleSize(itup), i, false, false) != i)
 					elog(ERROR, "failed to add item to index page in \"%s\"",
 						 RelationGetRelationName(gvs->index));
 
@@ -601,12 +606,13 @@ ginbulkdelete(PG_FUNCTION_ARGS)
 	gvs.result = stats;
 	gvs.callback = callback;
 	gvs.callback_state = callback_state;
+	gvs.strategy = info->strategy;
 	initGinState(&gvs.ginstate, index);
 	
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	buffer = ReadBuffer(index, blkno);
+	buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
 
 	/* find leaf page */
 	for (;;)
@@ -637,8 +643,8 @@ ginbulkdelete(PG_FUNCTION_ARGS)
 		blkno = GinItemPointerGetBlockNumber(&(itup)->t_tid);
 		Assert(blkno != InvalidBlockNumber);
 
-		LockBuffer(buffer, GIN_UNLOCK);
-		buffer = ReleaseAndReadBuffer(buffer, index, blkno);
+		UnlockReleaseBuffer(buffer);
+		buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
 	}
 
 	/* right now we found leftmost page in entry's BTree */
@@ -680,7 +686,7 @@ ginbulkdelete(PG_FUNCTION_ARGS)
 		if (blkno == InvalidBlockNumber)		/* rightmost page */
 			break;
 
-		buffer = ReadBuffer(index, blkno);
+		buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
 		LockBuffer(buffer, GIN_EXCLUSIVE);
 	}
 	
@@ -751,7 +757,7 @@ ginvacuumcleanup(PG_FUNCTION_ARGS)
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 		
-		buffer = ReadBuffer(index, blkno);
+		buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
 		LockBuffer(buffer, GIN_SHARE);
 		page = (Page) BufferGetPage(buffer);
 
diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c
index df2d36cc89af..50824ea18075 100644
--- a/src/backend/access/gin/ginxlog.c
+++ b/src/backend/access/gin/ginxlog.c
@@ -147,6 +147,33 @@ ginRedoInsert(XLogRecPtr lsn, XLogRecord *record)
 	Buffer		buffer;
 	Page		page;
 
+	/* first, forget any incomplete split this insertion completes */
+	if (data->isData)
+	{
+		Assert(data->isDelete == FALSE);
+		if (!data->isLeaf && data->updateBlkno != InvalidBlockNumber)
+		{
+			PostingItem *pitem;
+
+			pitem = (PostingItem *) (XLogRecGetData(record) + sizeof(ginxlogInsert));
+			forgetIncompleteSplit(data->node,
+								  PostingItemGetBlockNumber(pitem),
+								  data->updateBlkno);
+		}
+	}
+	else
+	{
+		if (!data->isLeaf && data->updateBlkno != InvalidBlockNumber)
+		{
+			IndexTuple	itup;
+
+			itup = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogInsert));
+			forgetIncompleteSplit(data->node,
+								  GinItemPointerGetBlockNumber(&itup->t_tid),
+								  data->updateBlkno);
+		}
+	}
+
 	/* nothing else to do if page was backed up */
 	if (record->xl_info & XLR_BKP_BLOCK_1)
 		return;
@@ -157,17 +184,17 @@ ginRedoInsert(XLogRecPtr lsn, XLogRecord *record)
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
 	buffer = XLogReadBuffer(reln, data->blkno, false);
-	Assert(BufferIsValid(buffer));
+	if (!BufferIsValid(buffer))
+		return;
 	page = (Page) BufferGetPage(buffer);
 
-	if (data->isData)
+	if (!XLByteLE(lsn, PageGetLSN(page)))
 	{
-		Assert(data->isDelete == FALSE);
-		Assert(GinPageIsData(page));
-
 		REDO_PRINT_LSN_APPLICATION(reln, data->blkno, page, lsn);
-		if ( ! XLByteLE(lsn, PageGetLSN(page)) )
+		if (data->isData)
 		{
+			Assert(GinPageIsData(page));
+
 			if (data->isLeaf)
 			{
 				OffsetNumber i;
@@ -197,23 +224,13 @@ ginRedoInsert(XLogRecPtr lsn, XLogRecord *record)
 				GinDataPageAddItem(page, pitem, data->offset);
 			}
 		}
-
-		if (!data->isLeaf && data->updateBlkno != InvalidBlockNumber)
+		else
 		{
-			PostingItem *pitem = (PostingItem *) (XLogRecGetData(record) + sizeof(ginxlogInsert));
-			forgetIncompleteSplit(data->node, PostingItemGetBlockNumber(pitem), data->updateBlkno);
-		}
-
-	}
-	else
-	{
-		IndexTuple	itup;
+			IndexTuple	itup;
 
-		Assert(!GinPageIsData(page));
+			Assert(!GinPageIsData(page));
 
-		REDO_PRINT_LSN_APPLICATION(reln, data->blkno, page, lsn);
-		if ( ! XLByteLE(lsn, PageGetLSN(page)) )
-		{
+			REDO_PRINT_LSN_APPLICATION(reln, data->blkno, page, lsn);
 			if (data->updateBlkno != InvalidBlockNumber)
 			{
 				/* update link to right page after split */
@@ -232,25 +249,17 @@ ginRedoInsert(XLogRecPtr lsn, XLogRecord *record)
 
 			itup = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogInsert));
 
-			if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), data->offset, LP_USED) == InvalidOffsetNumber)
+			if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), data->offset, false, false) == InvalidOffsetNumber)
 				elog(ERROR, "failed to add item to index page in %u/%u/%u",
 					 data->node.spcNode, data->node.dbNode, data->node.relNode);
 		}
 
-		if (!data->isLeaf && data->updateBlkno != InvalidBlockNumber)
-		{
-			itup = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogInsert));
-			forgetIncompleteSplit(data->node, GinItemPointerGetBlockNumber(&itup->t_tid), data->updateBlkno);
-		}
-	}
-
-	if ( ! XLByteLE(lsn, PageGetLSN(page)) )
-	{
 		PageSetLSN(page, lsn);
 		PageSetTLI(page, ThisTimeLineID);
 
 		MarkBufferDirty(buffer);
 	}
+
 	UnlockReleaseBuffer(buffer);
 	
 	MIRROREDLOCK_BUFMGR_UNLOCK;
@@ -281,7 +290,7 @@ ginRedoSplit(XLogRecPtr lsn, XLogRecord *record)
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	lbuffer = XLogReadBuffer(reln, data->lblkno, data->isRootSplit);
+	lbuffer = XLogReadBuffer(reln, data->lblkno, true);
 	Assert(BufferIsValid(lbuffer));
 	lpage = (Page) BufferGetPage(lbuffer);
 	GinInitBuffer(lbuffer, flags);
@@ -330,7 +339,7 @@ ginRedoSplit(XLogRecPtr lsn, XLogRecord *record)
 
 		for (i = 0; i < data->separator; i++)
 		{
-			if (PageAddItem(lpage, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, LP_USED) == InvalidOffsetNumber)
+			if (PageAddItem(lpage, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
 				elog(ERROR, "failed to add item to index page in %u/%u/%u",
 				  data->node.spcNode, data->node.dbNode, data->node.relNode);
 			itup = (IndexTuple) (((char *) itup) + MAXALIGN(IndexTupleSize(itup)));
@@ -338,7 +347,7 @@ ginRedoSplit(XLogRecPtr lsn, XLogRecord *record)
 
 		for (i = data->separator; i < data->nitem; i++)
 		{
-			if (PageAddItem(rpage, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, LP_USED) == InvalidOffsetNumber)
+			if (PageAddItem(rpage, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
 				elog(ERROR, "failed to add item to index page in %u/%u/%u",
 				  data->node.spcNode, data->node.dbNode, data->node.relNode);
 			itup = (IndexTuple) (((char *) itup) + MAXALIGN(IndexTupleSize(itup)));
@@ -358,7 +367,7 @@ ginRedoSplit(XLogRecPtr lsn, XLogRecord *record)
 
 	if (data->isRootSplit)
 	{
-		Buffer		rootBuf = XLogReadBuffer(reln, data->rootBlkno, false);
+		Buffer		rootBuf = XLogReadBuffer(reln, data->rootBlkno, true);
 		Page		rootPage = BufferGetPage(rootBuf);
 
 		GinInitBuffer(rootBuf, flags & ~GIN_LEAF);
@@ -401,7 +410,7 @@ ginRedoVacuumPage(XLogRecPtr lsn, XLogRecord *record)
 	Buffer		buffer;
 	Page		page;
 
-	/* nothing else to do if page was backed up (and no info to do it with) */
+	/* nothing to do if page was backed up (and no info to do it with) */
 	if (record->xl_info & XLR_BKP_BLOCK_1)
 		return;
 
@@ -411,40 +420,45 @@ ginRedoVacuumPage(XLogRecPtr lsn, XLogRecord *record)
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
 	buffer = XLogReadBuffer(reln, data->blkno, false);
-	Assert(BufferIsValid(buffer));
+	if (!BufferIsValid(buffer))
+		return;
 	page = (Page) BufferGetPage(buffer);
 
-	if (GinPageIsData(page))
+	if (!XLByteLE(lsn, PageGetLSN(page)))
 	{
-		memcpy(GinDataPageGetData(page), XLogRecGetData(record) + sizeof(ginxlogVacuumPage),
-			   GinSizeOfItem(page) *data->nitem);
-		GinPageGetOpaque(page)->maxoff = data->nitem;
-	}
-	else
-	{
-		OffsetNumber i,
-				   *tod;
-		IndexTuple	itup = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogVacuumPage));
+		if (GinPageIsData(page))
+		{
+			memcpy(GinDataPageGetData(page), XLogRecGetData(record) + sizeof(ginxlogVacuumPage),
+				   GinSizeOfItem(page) *data->nitem);
+			GinPageGetOpaque(page)->maxoff = data->nitem;
+		}
+		else
+		{
+			OffsetNumber i,
+				*tod;
+			IndexTuple	itup = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogVacuumPage));
 
-		tod = (OffsetNumber *) palloc(sizeof(OffsetNumber) * PageGetMaxOffsetNumber(page));
-		for (i = FirstOffsetNumber; i <= PageGetMaxOffsetNumber(page); i++)
-			tod[i - 1] = i;
+			tod = (OffsetNumber *) palloc(sizeof(OffsetNumber) * PageGetMaxOffsetNumber(page));
+			for (i = FirstOffsetNumber; i <= PageGetMaxOffsetNumber(page); i++)
+				tod[i - 1] = i;
 
-		PageIndexMultiDelete(page, tod, PageGetMaxOffsetNumber(page));
+			PageIndexMultiDelete(page, tod, PageGetMaxOffsetNumber(page));
 
-		for (i = 0; i < data->nitem; i++)
-		{
-			if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, LP_USED) == InvalidOffsetNumber)
-				elog(ERROR, "failed to add item to index page in %u/%u/%u",
-				  data->node.spcNode, data->node.dbNode, data->node.relNode);
-			itup = (IndexTuple) (((char *) itup) + MAXALIGN(IndexTupleSize(itup)));
+			for (i = 0; i < data->nitem; i++)
+			{
+				if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
+					elog(ERROR, "failed to add item to index page in %u/%u/%u",
+						 data->node.spcNode, data->node.dbNode, data->node.relNode);
+				itup = (IndexTuple) (((char *) itup) + MAXALIGN(IndexTupleSize(itup)));
+			}
 		}
-	}
 
-	PageSetLSN(page, lsn);
-	PageSetTLI(page, ThisTimeLineID);
+		PageSetLSN(page, lsn);
+		PageSetTLI(page, ThisTimeLineID);
+
+		MarkBufferDirty(buffer);
+	}
 
-	MarkBufferDirty(buffer);
 	UnlockReleaseBuffer(buffer);
 	
 	MIRROREDLOCK_BUFMGR_UNLOCK;
@@ -470,38 +484,56 @@ ginRedoDeletePage(XLogRecPtr lsn, XLogRecord *record)
 	if (!(record->xl_info & XLR_BKP_BLOCK_1))
 	{
 		buffer = XLogReadBuffer(reln, data->blkno, false);
-		page = BufferGetPage(buffer);
-		Assert(GinPageIsData(page));
-		GinPageGetOpaque(page)->flags = GIN_DELETED;
-		PageSetLSN(page, lsn);
-		PageSetTLI(page, ThisTimeLineID);
-		MarkBufferDirty(buffer);
-		UnlockReleaseBuffer(buffer);
+		if (BufferIsValid(buffer))
+		{
+			page = BufferGetPage(buffer);
+			if (!XLByteLE(lsn, PageGetLSN(page)))
+			{
+				Assert(GinPageIsData(page));
+				GinPageGetOpaque(page)->flags = GIN_DELETED;
+				PageSetLSN(page, lsn);
+				PageSetTLI(page, ThisTimeLineID);
+				MarkBufferDirty(buffer);
+			}
+			UnlockReleaseBuffer(buffer);
+		}
 	}
 
 	if (!(record->xl_info & XLR_BKP_BLOCK_2))
 	{
 		buffer = XLogReadBuffer(reln, data->parentBlkno, false);
-		page = BufferGetPage(buffer);
-		Assert(GinPageIsData(page));
-		Assert(!GinPageIsLeaf(page));
-		PageDeletePostingItem(page, data->parentOffset);
-		PageSetLSN(page, lsn);
-		PageSetTLI(page, ThisTimeLineID);
-		MarkBufferDirty(buffer);
-		UnlockReleaseBuffer(buffer);
+		if (BufferIsValid(buffer))
+		{
+			page = BufferGetPage(buffer);
+			if (!XLByteLE(lsn, PageGetLSN(page)))
+			{
+				Assert(GinPageIsData(page));
+				Assert(!GinPageIsLeaf(page));
+				PageDeletePostingItem(page, data->parentOffset);
+				PageSetLSN(page, lsn);
+				PageSetTLI(page, ThisTimeLineID);
+				MarkBufferDirty(buffer);
+			}
+			UnlockReleaseBuffer(buffer);
+		}
 	}
 
 	if (!(record->xl_info & XLR_BKP_BLOCK_3) && data->leftBlkno != InvalidBlockNumber)
 	{
 		buffer = XLogReadBuffer(reln, data->leftBlkno, false);
-		page = BufferGetPage(buffer);
-		Assert(GinPageIsData(page));
-		GinPageGetOpaque(page)->rightlink = data->rightLink;
-		PageSetLSN(page, lsn);
-		PageSetTLI(page, ThisTimeLineID);
-		MarkBufferDirty(buffer);
-		UnlockReleaseBuffer(buffer);
+		if (BufferIsValid(buffer))
+		{
+			page = BufferGetPage(buffer);
+			if (!XLByteLE(lsn, PageGetLSN(page)))
+			{
+				Assert(GinPageIsData(page));
+				GinPageGetOpaque(page)->rightlink = data->rightLink;
+				PageSetLSN(page, lsn);
+				PageSetTLI(page, ThisTimeLineID);
+				MarkBufferDirty(buffer);
+			}
+			UnlockReleaseBuffer(buffer);
+		}
 	}
 	
 	MIRROREDLOCK_BUFMGR_UNLOCK;
@@ -629,6 +661,13 @@ ginContinueSplit(ginIncompleteSplit *split)
 	
 	buffer = XLogReadBuffer(reln, split->leftBlkno, false);
 
+	/*
+	 * Failure should be impossible here, because we wrote the page earlier.
+	 */
+	if (!BufferIsValid(buffer))
+		elog(PANIC, "ginContinueSplit: left block %u not found",
+			 split->leftBlkno);
+
 	if (split->rootBlkno == GIN_ROOT_BLKNO)
 	{
 		prepareEntryScan(&btree, reln, (Datum) 0, NULL);
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 821eb4b98e0e..070a1efc430f 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gist.c,v 1.145 2007/01/05 22:19:21 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gist.c,v 1.149.2.1 2008/11/13 17:42:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,6 @@
 #include "utils/memutils.h"
 #include "cdb/cdbfilerepprimary.h"
 
-const XLogRecPtr XLogRecPtrForTemp = {1, 1};
-
 /* Working state for gistbuild and its callback */
 typedef struct
 {
@@ -133,7 +131,7 @@ gistbuild(PG_FUNCTION_ARGS)
 		PageSetTLI(page, ThisTimeLineID);
 	}
 	else
-		PageSetLSN(page, XLogRecPtrForTemp);
+		PageSetLSN(page, GetXLogRecPtrForTemp());
 
 	UnlockReleaseBuffer(buffer);
 
@@ -153,7 +151,7 @@ gistbuild(PG_FUNCTION_ARGS)
 	buildstate.tmpCtx = createTempGistContext();
 
 	/* do the heap scan */
-	reltuples = IndexBuildScan(heap, index, indexInfo,
+	reltuples = IndexBuildScan(heap, index, indexInfo, true,
 							   gistbuildCallback, (void *) &buildstate);
 
 	/* okay, all heap tuples are indexed */
@@ -377,13 +375,13 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate)
 			ptr->block.blkno = BufferGetBlockNumber(ptr->buffer);
 
 			/*
-			 * fill page, we can do it because all these pages are new
-			 * (ie not linked in tree or masked by temp page
+			 * fill page, we can do it because all these pages are new (ie not
+			 * linked in tree or masked by temp page
 			 */
 			data = (char *) (ptr->list);
 			for (i = 0; i < ptr->block.num; i++)
 			{
-				if (PageAddItem(ptr->page, (Item) data, IndexTupleSize((IndexTuple) data), i + FirstOffsetNumber, LP_USED) == InvalidOffsetNumber)
+				if (PageAddItem(ptr->page, (Item) data, IndexTupleSize((IndexTuple) data), i + FirstOffsetNumber, false, false) == InvalidOffsetNumber)
 					elog(ERROR, "failed to add item to index page in \"%s\"", RelationGetRelationName(state->r));
 				data += IndexTupleSize((IndexTuple) data);
 			}
@@ -438,7 +436,7 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate)
 		{
 			for (ptr = dist; ptr; ptr = ptr->next)
 			{
-				PageSetLSN(ptr->page, XLogRecPtrForTemp);
+				PageSetLSN(ptr->page, GetXLogRecPtrForTemp());
 			}
 		}
 
@@ -506,7 +504,7 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate)
 			PageSetTLI(state->stack->page, ThisTimeLineID);
 		}
 		else
-			PageSetLSN(state->stack->page, XLogRecPtrForTemp);
+			PageSetLSN(state->stack->page, GetXLogRecPtrForTemp());
 
 		if (state->stack->blkno == GIST_ROOT_BLKNO)
 			state->needInsertComplete = false;
@@ -697,9 +695,12 @@ gistFindPath(Relation r, BlockNumber child)
 
 		if (GistPageIsLeaf(page))
 		{
-			/* we can safety go away, follows only leaf pages */
+			/*
+			 * Because we scan the index top-down, all the rest of the pages
+			 * in the queue must be leaf pages as well.
+			 */
 			UnlockReleaseBuffer(buffer);
-			return NULL;
+			break;
 		}
 
 		top->lsn = PageGetLSN(page);
@@ -707,14 +708,25 @@ gistFindPath(Relation r, BlockNumber child)
 		if (top->parent && XLByteLT(top->parent->lsn, GistPageGetOpaque(page)->nsn) &&
 			GistPageGetOpaque(page)->rightlink != InvalidBlockNumber /* sanity check */ )
 		{
-			/* page splited while we thinking of... */
+			/*
+			 * Page was split while we looked elsewhere. We didn't see the
+			 * downlink to the right page when we scanned the parent, so
+			 * add it to the queue now.
+			 *
+			 * Put the right page ahead of the queue, so that we visit it
+			 * next. That's important, because if this is the lowest internal
+			 * level, just above leaves, we might already have queued up some
+			 * leaf pages, and we assume that there can't be any non-leaf
+			 * pages behind leaf pages.
+			 */
 			ptr = (GISTInsertStack *) palloc0(sizeof(GISTInsertStack));
 			ptr->blkno = GistPageGetOpaque(page)->rightlink;
 			ptr->childoffnum = InvalidOffsetNumber;
-			ptr->parent = top;
-			ptr->next = NULL;
-			tail->next = ptr;
-			tail = ptr;
+			ptr->parent = top->parent;
+			ptr->next = top->next;
+			top->next = ptr;
+			if (tail == top)
+				tail = ptr;
 		}
 
 		maxoff = PageGetMaxOffsetNumber(page);
@@ -772,7 +784,9 @@ gistFindPath(Relation r, BlockNumber child)
 		top = top->next;
 	}
 
-	return NULL;
+	elog(ERROR, "failed to re-find parent of a page in index \"%s\", block %u",
+		 RelationGetRelationName(r), child);
+	return NULL; /* keep compiler quiet */
 }
 
 
@@ -846,7 +860,6 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child)
 
 		/* ok, find new path */
 		ptr = parent = gistFindPath(r, child->blkno);
-		Assert(ptr != NULL);
 
 		/* read all buffers as expected by caller */
 		/* note we don't lock them or gistcheckpage them here! */
@@ -1050,7 +1063,7 @@ gistnewroot(Relation r, Buffer buffer, IndexTuple *itup, int len, ItemPointer ke
 		PageSetTLI(page, ThisTimeLineID);
 	}
 	else
-		PageSetLSN(page, XLogRecPtrForTemp);
+		PageSetLSN(page, GetXLogRecPtrForTemp());
 
 	END_CRIT_SECTION();
 }
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index fe72a1fc4032..3540cecc7fdb 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.64 2007/01/20 18:43:35 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.69.2.3 2008/10/22 12:54:25 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,7 +48,7 @@ killtuple(Relation r, GISTScanOpaque so, ItemPointer iptr)
 	{
 		/* page unchanged, so all is simple */
 		offset = ItemPointerGetOffsetNumber(iptr);
-		PageGetItemId(p, offset)->lp_flags |= LP_DELETE;
+		ItemIdMarkDead(PageGetItemId(p, offset));
 		SetBufferCommitInfoNeedsSave(so->curbuf);
 	}
 	else
@@ -62,7 +62,7 @@ killtuple(Relation r, GISTScanOpaque so, ItemPointer iptr)
 			if (ItemPointerEquals(&(ituple->t_tid), iptr))
 			{
 				/* found */
-				PageGetItemId(p, offset)->lp_flags |= LP_DELETE;
+				ItemIdMarkDead(PageGetItemId(p, offset));
 				SetBufferCommitInfoNeedsSave(so->curbuf);
 				break;
 			}
@@ -159,6 +159,9 @@ gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids,
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 
+	if ( so->qual_ok == false )
+		return 0;
+
 	if (ItemPointerIsValid(&so->curpos) == false)
 	{
 		/* Being asked to fetch the first entry, so start at the root */
@@ -172,7 +175,7 @@ gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids,
 		stk->next = NULL;
 		stk->block = GIST_ROOT_BLKNO;
 
-			pgstat_count_index_scan(scan->indexRelation);
+		pgstat_count_index_scan(scan->indexRelation);
 	}
 	else if (so->curbuf == InvalidBuffer)
 	{
@@ -190,7 +193,7 @@ gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids,
 		while( ntids < maxtids && so->curPageData < so->nPageData )
 		{
 			tids[ ntids ] = scan->xs_ctup.t_self = so->pageData[ so->curPageData ].heapPtr;
-			ItemPointerSet(&so->curpos,
+			ItemPointerSet(&(so->curpos),
 							   BufferGetBlockNumber(so->curbuf), 
 							   so->pageData[ so->curPageData ].pageOffset);
 
@@ -303,7 +306,7 @@ gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids,
 					tids[ ntids ] = scan->xs_ctup.t_self = 
 						so->pageData[ so->curPageData ].heapPtr;
 				
-					ItemPointerSet(&so->curpos,
+					ItemPointerSet(&(so->curpos),
 								   BufferGetBlockNumber(so->curbuf), 
 								   so->pageData[ so->curPageData ].pageOffset);
 
@@ -359,7 +362,7 @@ gistnext(IndexScanDesc scan, ScanDirection dir, ItemPointer tids,
 				 * we can efficiently resume the index scan later.
 				 */
 
-				if (!(ignore_killed_tuples && ItemIdDeleted(PageGetItemId(p, n))))
+				if (!(ignore_killed_tuples && ItemIdIsDead(PageGetItemId(p, n))))
 				{
 					it = (IndexTuple) PageGetItem(p, PageGetItemId(p, n));
 					so->pageData[ so->nPageData ].heapPtr = it->t_tid;
@@ -449,37 +452,46 @@ gistindex_keytest(IndexTuple tuple,
 		if (key->sk_flags & SK_ISNULL)
 		{
 			/*
-			 * is the compared-to datum NULL? on non-leaf page it's possible
-			 * to have nulls in childs :(
+			 * On non-leaf page we can't conclude that child hasn't NULL
+			 * values because of assumption in GiST: uinon (VAL, NULL) is VAL
+			 * But if on non-leaf page key IS  NULL then all childs has NULL.
 			 */
 
-			if (isNull || !GistPageIsLeaf(p))
-				return true;
-			return false;
+			Assert(key->sk_flags & SK_SEARCHNULL);
+
+			if (GistPageIsLeaf(p) && !isNull)
+				return false;
 		}
 		else if (isNull)
+		{
 			return false;
+		}
+		else
+		{
 
-		gistdentryinit(giststate, key->sk_attno - 1, &de,
-					   datum, r, p, offset,
-					   FALSE, isNull);
-
-		/*
-		 * Call the Consistent function to evaluate the test.  The arguments
-		 * are the index datum (as a GISTENTRY*), the comparison datum, and
-		 * the comparison operator's strategy number and subtype from pg_amop.
-		 *
-		 * (Presently there's no need to pass the subtype since it'll always
-		 * be zero, but might as well pass it for possible future use.)
-		 */
-		test = FunctionCall4(&key->sk_func,
-							 PointerGetDatum(&de),
-							 key->sk_argument,
-							 Int32GetDatum(key->sk_strategy),
-							 ObjectIdGetDatum(key->sk_subtype));
+			gistdentryinit(giststate, key->sk_attno - 1, &de,
+						   datum, r, p, offset,
+						   FALSE, isNull);
 
-		if (!DatumGetBool(test))
-			return false;
+			/*
+			 * Call the Consistent function to evaluate the test.  The
+			 * arguments are the index datum (as a GISTENTRY*), the comparison
+			 * datum, and the comparison operator's strategy number and
+			 * subtype from pg_amop.
+			 *
+			 * (Presently there's no need to pass the subtype since it'll
+			 * always be zero, but might as well pass it for possible future
+			 * use.)
+			 */
+			test = FunctionCall4(&key->sk_func,
+								 PointerGetDatum(&de),
+								 key->sk_argument,
+								 Int32GetDatum(key->sk_strategy),
+								 ObjectIdGetDatum(key->sk_subtype));
+
+			if (!DatumGetBool(test))
+				return false;
+		}
 
 		keySize--;
 		key++;
diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c
index 2ebb3d1bd711..e0b8671ce902 100644
--- a/src/backend/access/gist/gistproc.c
+++ b/src/backend/access/gist/gistproc.c
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	$PostgreSQL: pgsql/src/backend/access/gist/gistproc.c,v 1.9.2.1 2007/09/07 17:04:46 teodor Exp $
+ *	$PostgreSQL: pgsql/src/backend/access/gist/gistproc.c,v 1.13.2.2 2009/09/18 14:03:12 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -228,9 +228,9 @@ chooseLR(GIST_SPLITVEC *v,
 						  NULL, NULL, InvalidOffsetNumber, FALSE);
 
 			gistentryinit(addon, BoxPGetDatum(union1), NULL, NULL, InvalidOffsetNumber, FALSE);
-			DirectFunctionCall3(gist_box_penalty, PointerGetDatum(&oldUnion), PointerGetDatum(&union1), PointerGetDatum(&p1));
+			DirectFunctionCall3(gist_box_penalty, PointerGetDatum(&oldUnion), PointerGetDatum(&addon), PointerGetDatum(&p1));
 			gistentryinit(addon, BoxPGetDatum(union2), NULL, NULL, InvalidOffsetNumber, FALSE);
-			DirectFunctionCall3(gist_box_penalty, PointerGetDatum(&oldUnion), PointerGetDatum(&union2), PointerGetDatum(&p2));
+			DirectFunctionCall3(gist_box_penalty, PointerGetDatum(&oldUnion), PointerGetDatum(&addon), PointerGetDatum(&p2));
 
 			if ((v->spl_ldatum_exists && p1 > p2) || (v->spl_rdatum_exists && p1 < p2))
 				firstToLeft = false;
@@ -267,6 +267,69 @@ chooseLR(GIST_SPLITVEC *v,
 	v->spl_ldatum_exists = v->spl_rdatum_exists = false;
 }
 
+/*
+ * Trivial split: half of entries will be placed on one page
+ * and another half - to another
+ */
+static void
+fallbackSplit(GistEntryVector *entryvec, GIST_SPLITVEC *v)
+{
+	OffsetNumber	i, 
+					maxoff;
+	BOX			   *unionL = NULL,
+				   *unionR = NULL;
+	int				nbytes;
+
+	maxoff = entryvec->n - 1;
+
+	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
+	v->spl_left = (OffsetNumber *) palloc(nbytes);
+	v->spl_right = (OffsetNumber *) palloc(nbytes);
+	v->spl_nleft = v->spl_nright = 0;
+
+	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
+	{
+		BOX * cur = DatumGetBoxP(entryvec->vector[i].key);
+
+		if (i <= (maxoff - FirstOffsetNumber + 1) / 2)
+		{
+			v->spl_left[v->spl_nleft] = i;
+			if (unionL == NULL)
+			{
+				unionL = (BOX *) palloc(sizeof(BOX));
+				*unionL = *cur;
+			}
+			else
+				adjustBox(unionL, cur);
+
+			v->spl_nleft++;
+		}
+		else
+		{
+			v->spl_right[v->spl_nright] = i;
+			if (unionR == NULL)
+			{
+				unionR = (BOX *) palloc(sizeof(BOX));
+				*unionR = *cur;
+			}
+			else
+				adjustBox(unionR, cur);
+
+			v->spl_nright++;
+		}
+	}
+
+	if (v->spl_ldatum_exists)
+		adjustBox(unionL, DatumGetBoxP(v->spl_ldatum));
+	v->spl_ldatum = BoxPGetDatum(unionL);
+
+	if (v->spl_rdatum_exists)
+		adjustBox(unionR, DatumGetBoxP(v->spl_rdatum));
+	v->spl_rdatum = BoxPGetDatum(unionR);
+
+	v->spl_ldatum_exists = v->spl_rdatum_exists = false;
+}
+
 /*
  * The GiST PickSplit method
  *
@@ -319,52 +382,22 @@ gist_box_picksplit(PG_FUNCTION_ARGS)
 		adjustBox(&pageunion, cur);
 	}
 
-	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
-	listL = (OffsetNumber *) palloc(nbytes);
-	listR = (OffsetNumber *) palloc(nbytes);
-	unionL = (BOX *) palloc(sizeof(BOX));
-	unionR = (BOX *) palloc(sizeof(BOX));
 	if (allisequal)
 	{
-		cur = DatumGetBoxP(entryvec->vector[OffsetNumberNext(FirstOffsetNumber)].key);
-		if (memcmp((void *) cur, (void *) &pageunion, sizeof(BOX)) == 0)
-		{
-			v->spl_left = listL;
-			v->spl_right = listR;
-			v->spl_nleft = v->spl_nright = 0;
-			memcpy((void *) unionL, (void *) &pageunion, sizeof(BOX));
-			memcpy((void *) unionR, (void *) &pageunion, sizeof(BOX));
-
-			for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
-			{
-				if (i <= (maxoff - FirstOffsetNumber + 1) / 2)
-				{
-					v->spl_left[v->spl_nleft] = i;
-					v->spl_nleft++;
-				}
-				else
-				{
-					v->spl_right[v->spl_nright] = i;
-					v->spl_nright++;
-				}
-			}
-
-			if (v->spl_ldatum_exists)
-				adjustBox(unionL, DatumGetBoxP(v->spl_ldatum));
-			v->spl_ldatum = BoxPGetDatum(unionL);
-
-			if (v->spl_rdatum_exists)
-				adjustBox(unionR, DatumGetBoxP(v->spl_rdatum));
-			v->spl_rdatum = BoxPGetDatum(unionR);
-
-			v->spl_ldatum_exists = v->spl_rdatum_exists = false;
-
-			PG_RETURN_POINTER(v);
-		}
+		/*
+		 * All entries are the same
+		 */
+		fallbackSplit(entryvec, v);
+		PG_RETURN_POINTER(v);
 	}
 
+	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
+	listL = (OffsetNumber *) palloc(nbytes);
+	listR = (OffsetNumber *) palloc(nbytes);
 	listB = (OffsetNumber *) palloc(nbytes);
 	listT = (OffsetNumber *) palloc(nbytes);
+	unionL = (BOX *) palloc(sizeof(BOX));
+	unionR = (BOX *) palloc(sizeof(BOX));
 	unionB = (BOX *) palloc(sizeof(BOX));
 	unionT = (BOX *) palloc(sizeof(BOX));
 
@@ -394,20 +427,22 @@ gist_box_picksplit(PG_FUNCTION_ARGS)
 			ADDLIST(listT, unionT, posT, i);
 	}
 
-#define LIMIT_RATIO	0.1
+#define LIMIT_RATIO 0.1
 #define _IS_BADRATIO(x,y)	( (y) == 0 || (float)(x)/(float)(y) < LIMIT_RATIO )
 #define IS_BADRATIO(x,y) ( _IS_BADRATIO((x),(y)) || _IS_BADRATIO((y),(x)) )
 	/* bad disposition, try to split by centers of boxes  */
-	if ( IS_BADRATIO(posR, posL) && IS_BADRATIO(posT, posB) )
+	if (IS_BADRATIO(posR, posL) && IS_BADRATIO(posT, posB))
 	{
-		double	avgCenterX=0.0, avgCenterY=0.0;
-		double	CenterX, CenterY;
+		double		avgCenterX = 0.0,
+					avgCenterY = 0.0;
+		double		CenterX,
+					CenterY;
 
 		for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
 		{
 			cur = DatumGetBoxP(entryvec->vector[i].key);
-			avgCenterX +=  ((double)cur->high.x + (double)cur->low.x)/2.0;
-			avgCenterY +=  ((double)cur->high.y + (double)cur->low.y)/2.0;
+			avgCenterX += ((double) cur->high.x + (double) cur->low.x) / 2.0;
+			avgCenterY += ((double) cur->high.y + (double) cur->low.y) / 2.0;
 		}
 
 		avgCenterX /= maxoff;
@@ -417,11 +452,11 @@ gist_box_picksplit(PG_FUNCTION_ARGS)
 		for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
 		{
 			cur = DatumGetBoxP(entryvec->vector[i].key);
-			
-			CenterX =  ((double)cur->high.x + (double)cur->low.x)/2.0;
-			CenterY =  ((double)cur->high.y + (double)cur->low.y)/2.0;
 
-			if (CenterX < avgCenterX) 
+			CenterX = ((double) cur->high.x + (double) cur->low.x) / 2.0;
+			CenterY = ((double) cur->high.y + (double) cur->low.y) / 2.0;
+
+			if (CenterX < avgCenterX)
 				ADDLIST(listL, unionL, posL, i);
 			else if (CenterX == avgCenterX)
 			{
@@ -442,9 +477,15 @@ gist_box_picksplit(PG_FUNCTION_ARGS)
 				else
 					ADDLIST(listB, unionB, posB, i);
 			}
-			else 
+			else
 				ADDLIST(listT, unionT, posT, i);
 		}
+
+		if (IS_BADRATIO(posR, posL) && IS_BADRATIO(posT, posB))
+		{
+			fallbackSplit(entryvec, v);
+			PG_RETURN_POINTER(v);
+		}
 	}
 
 	/* which split more optimal? */
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index c06a7d1d4a7e..70be7b054133 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.67 2007/01/20 18:43:35 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.68.2.4 2008/12/04 11:10:06 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,6 +84,9 @@ gistrescan(PG_FUNCTION_ARGS)
 	 */
 	ItemPointerSetInvalid(&so->curpos);
 	ItemPointerSetInvalid(&so->markpos);
+	so->nPageData = so->curPageData = 0;
+
+	so->qual_ok = true;
 
 	/* Update scan key, if a new one is given */
 	if (key && scan->numberOfKeys > 0)
@@ -97,9 +100,18 @@ gistrescan(PG_FUNCTION_ARGS)
 		 * function in the form of its strategy number, which is available
 		 * from the sk_strategy field, and its subtype from the sk_subtype
 		 * field.
+		 *
+		 * Next, if any of keys is a NULL and that key is not marked with
+		 * SK_SEARCHNULL then nothing can be found.
 		 */
-		for (i = 0; i < scan->numberOfKeys; i++)
+		for (i = 0; i < scan->numberOfKeys; i++) {
 			scan->keyData[i].sk_func = so->giststate->consistentFn[scan->keyData[i].sk_attno - 1];
+
+			if ( scan->keyData[i].sk_flags & SK_ISNULL ) {
+				if ( (scan->keyData[i].sk_flags & SK_SEARCHNULL) == 0 )
+					so->qual_ok = false;
+			}
+		}
 	}
 
 	PG_RETURN_VOID();
@@ -226,14 +238,17 @@ gistendscan(PG_FUNCTION_ARGS)
 		gistfreestack(so->stack);
 		gistfreestack(so->markstk);
 		if (so->giststate != NULL)
+		{
 			freeGISTstate(so->giststate);
+			pfree(so->giststate);
+		}
 		/* drop pins on buffers -- we aren't holding any locks */
 		if (BufferIsValid(so->curbuf))
 			ReleaseBuffer(so->curbuf);
 		if (BufferIsValid(so->markbuf))
 			ReleaseBuffer(so->markbuf);
 		MemoryContextDelete(so->tempCxt);
-		pfree(scan->opaque);
+		pfree(so);
 	}
 
 	PG_RETURN_VOID();
diff --git a/src/backend/access/gist/gistsplit.c b/src/backend/access/gist/gistsplit.c
index 2469283c651d..8d0ee414ff08 100644
--- a/src/backend/access/gist/gistsplit.c
+++ b/src/backend/access/gist/gistsplit.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistsplit.c,v 1.4 2007/01/05 22:19:22 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistsplit.c,v 1.5.2.3 2009/07/24 19:54:36 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -279,6 +279,63 @@ supportSecondarySplit(Relation r, GISTSTATE *giststate, int attno, GIST_SPLITVEC
 	sv->spl_ldatum_exists = sv->spl_rdatum_exists = false;
 }
 
+/*
+ * Trivial picksplit implementaion. Function called only 
+ * if user-defined picksplit puts all keys to the one page.
+ * That is a bug of user-defined picksplit but we'd like
+ * to "fix" that.
+ */
+static void
+genericPickSplit(GISTSTATE *giststate, GistEntryVector *entryvec, GIST_SPLITVEC *v, int attno)
+{
+	OffsetNumber	 i,
+				 	 maxoff;
+	int				 nbytes;
+	GistEntryVector	*evec;
+
+	maxoff = entryvec->n - 1;
+
+	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
+
+	v->spl_left = (OffsetNumber *) palloc(nbytes);
+	v->spl_right = (OffsetNumber *) palloc(nbytes);
+	v->spl_nleft = v->spl_nright = 0;
+
+	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
+	{
+		if (i <= (maxoff - FirstOffsetNumber + 1) / 2)
+		{
+			v->spl_left[v->spl_nleft] = i;
+			v->spl_nleft++;
+		}
+		else
+		{
+			v->spl_right[v->spl_nright] = i;
+			v->spl_nright++;
+		}
+	}
+
+	/*
+	 * Form unions of each page
+	 */
+
+	evec = palloc( sizeof(GISTENTRY) * entryvec->n + GEVHDRSZ );
+
+	evec->n = v->spl_nleft;
+	memcpy(evec->vector, entryvec->vector + FirstOffsetNumber, 
+						 sizeof(GISTENTRY) * evec->n);
+    v->spl_ldatum = FunctionCall2(&giststate->unionFn[attno],
+									PointerGetDatum(evec),
+									PointerGetDatum(&nbytes));
+
+	evec->n = v->spl_nright;
+	memcpy(evec->vector, entryvec->vector + FirstOffsetNumber + v->spl_nleft, 
+						 sizeof(GISTENTRY) * evec->n);
+    v->spl_rdatum = FunctionCall2(&giststate->unionFn[attno],
+									PointerGetDatum(evec),
+									PointerGetDatum(&nbytes));
+}
+
 /*
  * Calls user picksplit method for attno columns to split vector to
  * two vectors. May use attno+n columns data to
@@ -295,7 +352,7 @@ gistUserPicksplit(Relation r, GistEntryVector *entryvec, int attno, GistSplitVec
 
 	/*
 	 * now let the user-defined picksplit function set up the split vector; in
-	 * entryvec have no null value!!
+	 * entryvec there is no null value!!
 	 */
 
 	sv->spl_ldatum_exists = (v->spl_lisnull[attno]) ? false : true;
@@ -307,18 +364,43 @@ gistUserPicksplit(Relation r, GistEntryVector *entryvec, int attno, GistSplitVec
 				  PointerGetDatum(entryvec),
 				  PointerGetDatum(sv));
 
-	/* compatibility with old code */
-	if (sv->spl_left[sv->spl_nleft - 1] == InvalidOffsetNumber)
-		sv->spl_left[sv->spl_nleft - 1] = (OffsetNumber) (entryvec->n - 1);
-	if (sv->spl_right[sv->spl_nright - 1] == InvalidOffsetNumber)
-		sv->spl_right[sv->spl_nright - 1] = (OffsetNumber) (entryvec->n - 1);
+	if ( sv->spl_nleft == 0 || sv->spl_nright == 0 )
+	{
+		ereport(DEBUG1,
+				(errcode(ERRCODE_INTERNAL_ERROR),
+				 errmsg("picksplit method for column %d of index \"%s\" failed",
+											attno+1, RelationGetRelationName(r)),
+				 errhint("The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command.")));
 
-	if (sv->spl_ldatum_exists || sv->spl_rdatum_exists)
+		/*
+		 * Reinit GIST_SPLITVEC. Although that fields are not used
+		 * by genericPickSplit(), let us set up it for further processing 
+		 */
+		sv->spl_ldatum_exists = (v->spl_lisnull[attno]) ? false : true;
+		sv->spl_rdatum_exists = (v->spl_risnull[attno]) ? false : true;
+		sv->spl_ldatum = v->spl_lattr[attno];
+		sv->spl_rdatum = v->spl_rattr[attno];
+
+		genericPickSplit(giststate, entryvec, sv, attno);
+
+		if (sv->spl_ldatum_exists || sv->spl_rdatum_exists)
+			supportSecondarySplit(r, giststate, attno, sv, v->spl_lattr[attno], v->spl_rattr[attno]);
+	}
+	else
 	{
-		elog(LOG, "PickSplit method of %d columns of index '%s' doesn't support secondary split",
-			 attno + 1, RelationGetRelationName(r));
+		/* compatibility with old code */
+		if (sv->spl_left[sv->spl_nleft - 1] == InvalidOffsetNumber)
+			sv->spl_left[sv->spl_nleft - 1] = (OffsetNumber) (entryvec->n - 1);
+		if (sv->spl_right[sv->spl_nright - 1] == InvalidOffsetNumber)
+			sv->spl_right[sv->spl_nright - 1] = (OffsetNumber) (entryvec->n - 1);
 
-		supportSecondarySplit(r, giststate, attno, sv, v->spl_lattr[attno], v->spl_rattr[attno]);
+		if (sv->spl_ldatum_exists || sv->spl_rdatum_exists)
+		{
+			elog(LOG, "PickSplit method of %d columns of index '%s' doesn't support secondary split",
+				 attno + 1, RelationGetRelationName(r));
+
+			supportSecondarySplit(r, giststate, attno, sv, v->spl_lattr[attno], v->spl_rattr[attno]);
+		}
 	}
 
 	v->spl_lattr[attno] = sv->spl_ldatum;
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index 38140e849c4b..a052a1e17ff1 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -8,11 +8,13 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			$PostgreSQL: pgsql/src/backend/access/gist/gistutil.c,v 1.21 2007/01/05 22:19:22 momjian Exp $
+ *			$PostgreSQL: pgsql/src/backend/access/gist/gistutil.c,v 1.25 2008/01/01 19:45:46 momjian Exp $
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include <math.h>
+
 #include "access/gist_private.h"
 #include "access/heapam.h"
 #include "access/reloptions.h"
@@ -47,7 +49,7 @@ gistfillbuffer(Relation r, Page page, IndexTuple *itup,
 	for (i = 0; i < len; i++)
 	{
 		l = PageAddItem(page, (Item) itup[i], IndexTupleSize(itup[i]),
-						off, LP_USED);
+						off, false, false);
 		if (l == InvalidOffsetNumber)
 			elog(ERROR, "failed to add item to index page in \"%s\"",
 				 RelationGetRelationName(r));
@@ -373,36 +375,55 @@ gistgetadjusted(Relation r, IndexTuple oldtup, IndexTuple addtup, GISTSTATE *gis
 }
 
 /*
- * find entry with lowest penalty
+ * Search an upper index page for the entry with lowest penalty for insertion
+ * of the new index key contained in "it".
+ *
+ * Returns the index of the page entry to insert into.
  */
 OffsetNumber
 gistchoose(Relation r, Page p, IndexTuple it,	/* it has compressed entry */
 		   GISTSTATE *giststate)
 {
+	OffsetNumber result;
 	OffsetNumber maxoff;
 	OffsetNumber i;
-	OffsetNumber which;
-	float		sum_grow,
-				which_grow[INDEX_MAX_KEYS];
+	float		best_penalty[INDEX_MAX_KEYS];
 	GISTENTRY	entry,
 				identry[INDEX_MAX_KEYS];
 	bool		isnull[INDEX_MAX_KEYS];
 
-	maxoff = PageGetMaxOffsetNumber(p);
-	*which_grow = -1.0;
-	which = InvalidOffsetNumber;
-	sum_grow = 1;
+	Assert(!GistPageIsLeaf(p));
+
 	gistDeCompressAtt(giststate, r,
 					  it, NULL, (OffsetNumber) 0,
 					  identry, isnull);
 
+	/* we'll return FirstOffsetNumber if page is empty (shouldn't happen) */
+	result = FirstOffsetNumber;
+
+	/*
+	 * The index may have multiple columns, and there's a penalty value for
+	 * each column.  The penalty associated with a column that appears earlier
+	 * in the index definition is strictly more important than the penalty of
+	 * a column that appears later in the index definition.
+	 *
+	 * best_penalty[j] is the best penalty we have seen so far for column j,
+	 * or -1 when we haven't yet examined column j.  Array entries to the
+	 * right of the first -1 are undefined.
+	 */
+	best_penalty[0] = -1;
+
+	/*
+	 * Loop over tuples on page.
+	 */
+	maxoff = PageGetMaxOffsetNumber(p);
 	Assert(maxoff >= FirstOffsetNumber);
-	Assert(!GistPageIsLeaf(p));
 
-	for (i = FirstOffsetNumber; i <= maxoff && sum_grow; i = OffsetNumberNext(i))
+	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
 	{
-		int			j;
 		IndexTuple	itup = (IndexTuple) PageGetItem(p, PageGetItemId(p, i));
+		bool		zero_penalty;
+		int			j;
 
 		if (!GistPageIsLeaf(p) && GistTupleIsInvalid(itup))
 		{
@@ -412,41 +433,70 @@ gistchoose(Relation r, Page p, IndexTuple it,	/* it has compressed entry */
 			continue;
 		}
 
-		sum_grow = 0;
+		zero_penalty = true;
+
+		/* Loop over index attributes. */
 		for (j = 0; j < r->rd_att->natts; j++)
 		{
 			Datum		datum;
 			float		usize;
 			bool		IsNull;
 
+			/* Compute penalty for this column. */
 			datum = index_getattr(itup, j + 1, giststate->tupdesc, &IsNull);
 			gistdentryinit(giststate, j, &entry, datum, r, p, i,
 						   FALSE, IsNull);
 			usize = gistpenalty(giststate, j, &entry, IsNull,
 								&identry[j], isnull[j]);
+			if (usize > 0)
+				zero_penalty = false;
 
-			if (which_grow[j] < 0 || usize < which_grow[j])
+			if (best_penalty[j] < 0 || usize < best_penalty[j])
 			{
-				which = i;
-				which_grow[j] = usize;
-				if (j < r->rd_att->natts - 1 && i == FirstOffsetNumber)
-					which_grow[j + 1] = -1;
-				sum_grow += which_grow[j];
+				/*
+				 * New best penalty for column.  Tentatively select this tuple
+				 * as the target, and record the best penalty.	Then reset the
+				 * next column's penalty to "unknown" (and indirectly, the
+				 * same for all the ones to its right).  This will force us to
+				 * adopt this tuple's penalty values as the best for all the
+				 * remaining columns during subsequent loop iterations.
+				 */
+				result = i;
+				best_penalty[j] = usize;
+
+				if (j < r->rd_att->natts - 1)
+					best_penalty[j + 1] = -1;
+			}
+			else if (best_penalty[j] == usize)
+			{
+				/*
+				 * The current tuple is exactly as good for this column as the
+				 * best tuple seen so far.	The next iteration of this loop
+				 * will compare the next column.
+				 */
 			}
-			else if (which_grow[j] == usize)
-				sum_grow += usize;
 			else
 			{
-				sum_grow = 1;
+				/*
+				 * The current tuple is worse for this column than the best
+				 * tuple seen so far.  Skip the remaining columns and move on
+				 * to the next tuple, if any.
+				 */
+				zero_penalty = false;	/* so outer loop won't exit */
 				break;
 			}
 		}
-	}
 
-	if (which == InvalidOffsetNumber)
-		which = FirstOffsetNumber;
+		/*
+		 * If we find a tuple with zero penalty for all columns, there's no
+		 * need to examine remaining tuples; just break out of the loop and
+		 * return it.
+		 */
+		if (zero_penalty)
+			break;
+	}
 
-	return which;
+	return result;
 }
 
 /*
@@ -535,16 +585,22 @@ gistpenalty(GISTSTATE *giststate, int attno,
 {
 	float		penalty = 0.0;
 
-	if (giststate->penaltyFn[attno].fn_strict == FALSE || (isNullOrig == FALSE && isNullAdd == FALSE))
+	if (giststate->penaltyFn[attno].fn_strict == FALSE ||
+		(isNullOrig == FALSE && isNullAdd == FALSE))
+	{
 		FunctionCall3(&giststate->penaltyFn[attno],
 					  PointerGetDatum(orig),
 					  PointerGetDatum(add),
 					  PointerGetDatum(&penalty));
+		/* disallow negative or NaN penalty */
+		if (isnan(penalty) || penalty < 0.0)
+			penalty = 0.0;
+	}
 	else if (isNullOrig && isNullAdd)
 		penalty = 0.0;
 	else
-		penalty = 1e10;			/* try to prevent to mix null and non-null
-								 * value */
+		penalty = 1e10;			/* try to prevent mixing null and non-null
+								 * values */
 
 	return penalty;
 }
@@ -568,6 +624,7 @@ GISTInitBuffer(Buffer b, uint32 f)
 	/* memset(&(opaque->nsn), 0, sizeof(GistNSN)); */
 	opaque->rightlink = InvalidBlockNumber;
 	opaque->flags = f;
+	opaque->gist_page_id = GIST_PAGE_ID;
 }
 
 /*
@@ -686,3 +743,24 @@ gistoptions(PG_FUNCTION_ARGS)
 		PG_RETURN_BYTEA_P(result);
 	PG_RETURN_NULL();
 }
+
+/*
+ * Temporary GiST indexes are not WAL-logged, but we need LSNs to detect
+ * concurrent page splits anyway. GetXLogRecPtrForTemp() provides a fake
+ * sequence of LSNs for that purpose. Each call generates an LSN that is
+ * greater than any previous value returned by this function in the same
+ * session.
+ */
+XLogRecPtr
+GetXLogRecPtrForTemp(void)
+{
+	static XLogRecPtr counter = {0, 1};
+
+	counter.xrecoff++;
+	if (counter.xrecoff == 0)
+	{
+		counter.xlogid++;
+		counter.xrecoff++;
+	}
+	return counter;
+}
diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index 3ce83e44f4eb..5920731532fa 100644
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.29 2007/01/05 22:19:22 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.34 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,6 +36,7 @@ typedef struct
 	Relation	index;
 	MemoryContext opCtx;
 	GistBulkDeleteResult *result;
+	BufferAccessStrategy strategy;
 } GistVacuum;
 
 typedef struct
@@ -86,7 +87,7 @@ gistDeleteSubtree(GistVacuum *gv, BlockNumber blkno)
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
-	buffer = ReadBuffer(gv->index, blkno);
+	buffer = ReadBufferWithStrategy(gv->index, blkno, gv->strategy);
 	LockBuffer(buffer, GIST_EXCLUSIVE);
 	page = (Page) BufferGetPage(buffer);
 
@@ -141,7 +142,7 @@ gistDeleteSubtree(GistVacuum *gv, BlockNumber blkno)
 		PageSetTLI(page, ThisTimeLineID);
 	}
 	else
-		PageSetLSN(page, XLogRecPtrForTemp);
+		PageSetLSN(page, GetXLogRecPtrForTemp());
 
 	END_CRIT_SECTION();
 
@@ -213,7 +214,7 @@ vacuumSplitPage(GistVacuum *gv, Page tempPage, Buffer buffer, IndexTuple *addon,
 		data = (char *) (ptr->list);
 		for (i = 0; i < ptr->block.num; i++)
 		{
-			if (PageAddItem(ptr->page, (Item) data, IndexTupleSize((IndexTuple) data), i + FirstOffsetNumber, LP_USED) == InvalidOffsetNumber)
+			if (PageAddItem(ptr->page, (Item) data, IndexTupleSize((IndexTuple) data), i + FirstOffsetNumber, false, false) == InvalidOffsetNumber)
 				elog(ERROR, "failed to add item to index page in \"%s\"", RelationGetRelationName(gv->index));
 			data += IndexTupleSize((IndexTuple) data);
 		}
@@ -265,7 +266,7 @@ vacuumSplitPage(GistVacuum *gv, Page tempPage, Buffer buffer, IndexTuple *addon,
 	else
 	{
 		for (ptr = dist; ptr; ptr = ptr->next)
-			PageSetLSN(BufferGetPage(ptr->buffer), XLogRecPtrForTemp);
+			PageSetLSN(BufferGetPage(ptr->buffer), GetXLogRecPtrForTemp());
 	}
 
 	for (ptr = dist; ptr; ptr = ptr->next)
@@ -321,7 +322,7 @@ gistVacuumUpdate(GistVacuum *gv, BlockNumber blkno, bool needunion)
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 
-	buffer = ReadBuffer(gv->index, blkno);
+	buffer = ReadBufferWithStrategy(gv->index, blkno, gv->strategy);
 	LockBuffer(buffer, GIST_EXCLUSIVE);
 	gistcheckpage(gv->index, buffer);
 	page = (Page) BufferGetPage(buffer);
@@ -484,7 +485,7 @@ gistVacuumUpdate(GistVacuum *gv, BlockNumber blkno, bool needunion)
 				pfree(rdata);
 			}
 			else
-				PageSetLSN(page, XLogRecPtrForTemp);
+				PageSetLSN(page, GetXLogRecPtrForTemp());
 		}
 
 		END_CRIT_SECTION();
@@ -572,6 +573,7 @@ gistvacuumcleanup(PG_FUNCTION_ARGS)
 		initGISTstate(&(gv.giststate), rel);
 		gv.opCtx = createTempGistContext();
 		gv.result = stats;
+		gv.strategy = info->strategy;
 
 		/* walk through the entire index for update tuples */
 		res = gistVacuumUpdate(&gv, GIST_ROOT_BLKNO, false);
@@ -625,7 +627,7 @@ gistvacuumcleanup(PG_FUNCTION_ARGS)
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buffer = ReadBuffer(rel, blkno);
+		buffer = ReadBufferWithStrategy(rel, blkno, info->strategy);
 		LockBuffer(buffer, GIST_SHARE);
 		page = (Page) BufferGetPage(buffer);
 
@@ -745,7 +747,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buffer = ReadBuffer(rel, stack->blkno);
+		buffer = ReadBufferWithStrategy(rel, stack->blkno, info->strategy);
 		
 		LockBuffer(buffer, GIST_SHARE);
 		gistcheckpage(rel, buffer);
@@ -829,7 +831,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)
 					pfree(rdata);
 				}
 				else
-					PageSetLSN(page, XLogRecPtrForTemp);
+					PageSetLSN(page, GetXLogRecPtrForTemp());
 
 				END_CRIT_SECTION();
 			}
diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c
index b0322c062358..33a113b10197 100644
--- a/src/backend/access/gist/gistxlog.c
+++ b/src/backend/access/gist/gistxlog.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *			 $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.26 2007/02/01 19:10:25 momjian Exp $
+ *			 $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.27.2.1 2009/12/24 17:52:19 tgl Exp $
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
@@ -712,6 +712,7 @@ gistContinueInsert(gistIncompleteInsert *insert)
 			int			j,
 						k,
 						pituplen = 0;
+			uint8		xlinfo;
 			XLogRecData *rdata;
 			XLogRecPtr	recptr;
 			Buffer		tempbuffer = InvalidBuffer;
@@ -800,6 +801,7 @@ gistContinueInsert(gistIncompleteInsert *insert)
 				for (j = 0; j < ntodelete; j++)
 					PageIndexTupleDelete(pages[0], todelete[j]);
 
+				xlinfo = XLOG_GIST_PAGE_SPLIT;
 				rdata = formSplitRdata(index, insert->path[i],
 									   false, &(insert->key),
 									 gistMakePageLayout(buffers, numbuffer));
@@ -813,6 +815,7 @@ gistContinueInsert(gistIncompleteInsert *insert)
 					PageIndexTupleDelete(pages[0], todelete[j]);
 				gistfillbuffer(index, pages[0], itup, lenitup, InvalidOffsetNumber);
 
+				xlinfo = XLOG_GIST_PAGE_UPDATE;
 				rdata = formUpdateRdata(index, buffers[0],
 										todelete, ntodelete,
 										itup, lenitup, &(insert->key));
@@ -829,7 +832,7 @@ gistContinueInsert(gistIncompleteInsert *insert)
 				GistPageGetOpaque(pages[j])->rightlink = InvalidBlockNumber;
 				MarkBufferDirty(buffers[j]);
 			}
-			recptr = XLogInsert(RM_GIST_ID, XLOG_GIST_PAGE_UPDATE, rdata);
+			recptr = XLogInsert(RM_GIST_ID, xlinfo, rdata);
 			for (j = 0; j < numbuffer; j++)
 			{
 				PageSetLSN(pages[j], recptr);
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index b83c27ace3de..d7a5af1005fa 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hash.c,v 1.93 2007/01/20 18:43:35 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hash.c,v 1.98.2.1 2008/11/13 17:42:18 tgl Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -67,7 +67,7 @@ hashbuild(PG_FUNCTION_ARGS)
 	buildstate.indtuples = 0;
 
 	/* do the heap scan */
-	reltuples = IndexBuildScan(heap, index, indexInfo,
+	reltuples = IndexBuildScan(heap, index, indexInfo, true,
 							   hashbuildCallback, (void *) &buildstate);
 
 	/*
@@ -200,11 +200,11 @@ hashgettuple(PG_FUNCTION_ARGS)
 		if (scan->kill_prior_tuple)
 		{
 			/*
-			 * Yes, so mark it by setting the LP_DELETE bit in the item flags.
+			 * Yes, so mark it by setting the LP_DEAD state in the item flags.
 			 */
 			offnum = ItemPointerGetOffsetNumber(&(so->hashso_curpos));
 			page = BufferGetPage(so->hashso_curbuf);
-			PageGetItemId(page, offnum)->lp_flags |= LP_DELETE;
+			ItemIdMarkDead(PageGetItemId(page, offnum));
 
 			/*
 			 * Since this can be redone later if needed, it's treated the same
@@ -231,7 +231,7 @@ hashgettuple(PG_FUNCTION_ARGS)
 		{
 			offnum = ItemPointerGetOffsetNumber(&(so->hashso_curpos));
 			page = BufferGetPage(so->hashso_curbuf);
-			if (!ItemIdDeleted(PageGetItemId(page, offnum)))
+			if (!ItemIdIsDead(PageGetItemId(page, offnum)))
 				break;
 			res = _hash_next(scan, dir);
 		}
@@ -300,7 +300,7 @@ hashgetmulti(PG_FUNCTION_ARGS)
 
 				offnum = ItemPointerGetOffsetNumber(&(so->hashso_curpos));
 				page = BufferGetPage(so->hashso_curbuf);
-				if (!ItemIdDeleted(PageGetItemId(page, offnum)))
+				if (!ItemIdIsDead(PageGetItemId(page, offnum)))
 					break;
 				res = _hash_next(scan, ForwardScanDirection);
 			}
@@ -534,7 +534,7 @@ hashbulkdelete(PG_FUNCTION_ARGS)
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ);
+	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ, LH_META_PAGE);
 	_hash_checkpage(rel, metabuf, LH_META_PAGE);
 	metap = (HashMetaPage) BufferGetPage(metabuf);
 	orig_maxbucket = metap->hashm_maxbucket;
@@ -576,8 +576,9 @@ hashbulkdelete(PG_FUNCTION_ARGS)
 
 			vacuum_delay_point();
 
-			buf = _hash_getbuf(rel, blkno, HASH_WRITE);
-			_hash_checkpage(rel, buf, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
+			buf = _hash_getbuf_with_strategy(rel, blkno, HASH_WRITE,
+										   LH_BUCKET_PAGE | LH_OVERFLOW_PAGE,
+											 info->strategy);
 			page = BufferGetPage(buf);
 			opaque = (HashPageOpaque) PageGetSpecialPointer(page);
 			Assert(opaque->hasho_bucket == cur_bucket);
@@ -625,7 +626,8 @@ hashbulkdelete(PG_FUNCTION_ARGS)
 
 		/* If we deleted anything, try to compact free space */
 		if (bucket_dirty)
-			_hash_squeezebucket(rel, cur_bucket, bucket_blkno);
+			_hash_squeezebucket(rel, cur_bucket, bucket_blkno,
+								info->strategy);
 
 		/* Release bucket lock */
 		_hash_droplock(rel, bucket_blkno, HASH_EXCLUSIVE);
@@ -635,8 +637,7 @@ hashbulkdelete(PG_FUNCTION_ARGS)
 	}
 
 	/* Write-lock metapage and check for split since we started */
-	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_WRITE);
-	_hash_checkpage(rel, metabuf, LH_META_PAGE);
+	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_WRITE, LH_META_PAGE);
 	metap = (HashMetaPage) BufferGetPage(metabuf);
 
 	if (cur_maxbucket != metap->hashm_maxbucket)
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index d73109966724..644494b41014 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -1,19 +1,26 @@
 /*-------------------------------------------------------------------------
  *
  * hashfunc.c
- *	  Comparison functions for hash access method.
+ *	  Support functions for hash access method.
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashfunc.c,v 1.50 2007/01/05 22:19:22 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashfunc.c,v 1.55 2008/01/01 19:45:46 momjian Exp $
  *
  * NOTES
  *	  These functions are stored in pg_amproc.	For each operator class
- *	  defined on hash tables, they compute the hash value of the argument.
+ *	  defined for hash indexes, they compute the hash value of the argument.
  *
+ *	  Additional hash functions appear in /utils/adt/ files for various
+ *	  specialized datatypes.
+ *
+ *	  It is expected that every bit of a hash function's 32-bit result is
+ *	  as random as every other; failure to ensure this is likely to lead
+ *	  to poor performance of hash joins, for example.  In most cases a hash
+ *	  function should use hash_any() or its variant hash_uint32().
  *-------------------------------------------------------------------------
  */
 
@@ -27,19 +34,19 @@
 Datum
 hashchar(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_UINT32(~((uint32) PG_GETARG_CHAR(0)));
+	return hash_uint32((int32) PG_GETARG_CHAR(0));
 }
 
 Datum
 hashint2(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_UINT32(~((uint32) PG_GETARG_INT16(0)));
+	return hash_uint32((int32) PG_GETARG_INT16(0));
 }
 
 Datum
 hashint4(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_UINT32(~PG_GETARG_UINT32(0));
+	return hash_uint32(PG_GETARG_INT32(0));
 }
 
 Datum
@@ -60,17 +67,23 @@ hashint8(PG_FUNCTION_ARGS)
 
 	lohalf ^= (val >= 0) ? hihalf : ~hihalf;
 
-	PG_RETURN_UINT32(~lohalf);
+	return hash_uint32(lohalf);
 #else
 	/* here if we can't count on "x >> 32" to work sanely */
-	PG_RETURN_UINT32(~((uint32) PG_GETARG_INT64(0)));
+	return hash_uint32((int32) PG_GETARG_INT64(0));
 #endif
 }
 
 Datum
 hashoid(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_UINT32(~((uint32) PG_GETARG_OID(0)));
+	return hash_uint32((uint32) PG_GETARG_OID(0));
+}
+
+Datum
+hashenum(PG_FUNCTION_ARGS)
+{
+	return hash_uint32((uint32) PG_GETARG_OID(0));
 }
 
 Datum
@@ -91,8 +104,8 @@ hashfloat4(PG_FUNCTION_ARGS)
 	 * To support cross-type hashing of float8 and float4, we want to return
 	 * the same hash value hashfloat8 would produce for an equal float8 value.
 	 * So, widen the value to float8 and hash that.  (We must do this rather
-	 * than have hashfloat8 try to narrow its value to float4; that could
-	 * fail on overflow.)
+	 * than have hashfloat8 try to narrow its value to float4; that could fail
+	 * on overflow.)
 	 */
 	key8 = key;
 
@@ -147,22 +160,16 @@ extern void varattrib_untoast_ptr_len(Datum d, char **datastart, int *len, void
 Datum
 hashtext(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-	
+	text	   *key = PG_GETARG_TEXT_PP(0);
 	Datum		result;
 
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-
 	/*
 	 * Note: this is currently identical in behavior to hashvarlena, but keep
 	 * it as a separate function in case we someday want to do something
 	 * different in non-C locales.	(See also hashbpchar, if so.)
 	 */
-	result = hash_any((unsigned char *) p0, len0);
-
-	if(tofree0)
-		pfree(tofree0);
+	result = hash_any((unsigned char *) VARDATA_ANY(key),
+					  VARSIZE_ANY_EXHDR(key));
 
 	return result;
 }
@@ -174,17 +181,11 @@ hashtext(PG_FUNCTION_ARGS)
 Datum
 hashvarlena(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-	
+	struct varlena *key = PG_GETARG_VARLENA_PP(0);
 	Datum		result;
 
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-
-	result = hash_any((unsigned char *) p0, len0);
-
-	if(tofree0)
-		pfree(tofree0);
+	result = hash_any((unsigned char *) VARDATA_ANY(key),
+					  VARSIZE_ANY_EXHDR(key));
 
 	return result;
 }
@@ -1106,7 +1107,9 @@ hash_any(register const unsigned char *k, register int keylen)
 Datum
 hash_uint32(uint32 k)
 {
-	register uint32 a, b, c;
+	register uint32 a,
+				b,
+				c;
 
 	a = 0xdeadbeef + k;
 	b = 0xdeadbeef;
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 9c9f8bde80cd..d42de5705686 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashinsert.c,v 1.44 2007/01/05 22:19:22 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashinsert.c,v 1.48 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,8 +75,7 @@ _hash_doinsert(Relation rel, IndexTuple itup)
 	_hash_getlock(rel, 0, HASH_SHARE);
 
 	/* Read the metapage */
-	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ);
-	_hash_checkpage(rel, metabuf, LH_META_PAGE);
+	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ, LH_META_PAGE);
 	metap = (HashMetaPage) BufferGetPage(metabuf);
 
 	/*
@@ -113,8 +112,7 @@ _hash_doinsert(Relation rel, IndexTuple itup)
 	_hash_droplock(rel, 0, HASH_SHARE);
 
 	/* Fetch the primary bucket page for the bucket */
-	buf = _hash_getbuf(rel, blkno, HASH_WRITE);
-	_hash_checkpage(rel, buf, LH_BUCKET_PAGE);
+	buf = _hash_getbuf(rel, blkno, HASH_WRITE, LH_BUCKET_PAGE);
 	page = BufferGetPage(buf);
 	pageopaque = (HashPageOpaque) PageGetSpecialPointer(page);
 	Assert(pageopaque->hasho_bucket == bucket);
@@ -134,7 +132,7 @@ _hash_doinsert(Relation rel, IndexTuple itup)
 			 * find out next pass through the loop test above.
 			 */
 			_hash_relbuf(rel, buf);
-			buf = _hash_getbuf(rel, nextblkno, HASH_WRITE);
+			buf = _hash_getbuf(rel, nextblkno, HASH_WRITE, LH_OVERFLOW_PAGE);
 			page = BufferGetPage(buf);
 		}
 		else
@@ -154,8 +152,8 @@ _hash_doinsert(Relation rel, IndexTuple itup)
 			/* should fit now, given test above */
 			Assert(PageGetFreeSpace(page) >= itemsz);
 		}
-		_hash_checkpage(rel, buf, LH_OVERFLOW_PAGE);
 		pageopaque = (HashPageOpaque) PageGetSpecialPointer(page);
+		Assert(pageopaque->hasho_flag == LH_OVERFLOW_PAGE);
 		Assert(pageopaque->hasho_bucket == bucket);
 	}
 
@@ -214,7 +212,7 @@ _hash_pgaddtup(Relation rel,
 	page = BufferGetPage(buf);
 
 	itup_off = OffsetNumberNext(PageGetMaxOffsetNumber(page));
-	if (PageAddItem(page, (Item) itup, itemsize, itup_off, LP_USED)
+	if (PageAddItem(page, (Item) itup, itemsize, itup_off, false, false)
 		== InvalidOffsetNumber)
 		elog(ERROR, "failed to add index item to \"%s\"",
 			 RelationGetRelationName(rel));
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 8968ecd17e6e..3148ac60a169 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashovfl.c,v 1.53.2.1 2007/04/19 20:24:10 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashovfl.c,v 1.62 2008/01/01 19:45:46 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -110,7 +110,6 @@ _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf)
 
 	/* allocate and lock an empty overflow page */
 	ovflbuf = _hash_getovflpage(rel, metabuf);
-	ovflpage = BufferGetPage(ovflbuf);
 
 	/*
 	 * Write-lock the tail page.  It is okay to hold two buffer locks here
@@ -118,12 +117,14 @@ _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf)
 	 */
 	_hash_chgbufaccess(rel, buf, HASH_NOLOCK, HASH_WRITE);
 
+	/* probably redundant... */
+	_hash_checkpage(rel, buf, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
+
 	/* loop to find current tail page, in case someone else inserted too */
 	for (;;)
 	{
 		BlockNumber nextblkno;
 
-		_hash_checkpage(rel, buf, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
 		page = BufferGetPage(buf);
 		pageopaque = (HashPageOpaque) PageGetSpecialPointer(page);
 		nextblkno = pageopaque->hasho_nextblkno;
@@ -134,17 +135,17 @@ _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf)
 		/* we assume we do not need to write the unmodified page */
 		_hash_relbuf(rel, buf);
 
-		buf = _hash_getbuf(rel, nextblkno, HASH_WRITE);
+		buf = _hash_getbuf(rel, nextblkno, HASH_WRITE, LH_OVERFLOW_PAGE);
 	}
 
 	/* now that we have correct backlink, initialize new overflow page */
-	_hash_pageinit(ovflpage, BufferGetPageSize(ovflbuf));
+	ovflpage = BufferGetPage(ovflbuf);
 	ovflopaque = (HashPageOpaque) PageGetSpecialPointer(ovflpage);
 	ovflopaque->hasho_prevblkno = BufferGetBlockNumber(buf);
 	ovflopaque->hasho_nextblkno = InvalidBlockNumber;
 	ovflopaque->hasho_bucket = pageopaque->hasho_bucket;
 	ovflopaque->hasho_flag = LH_OVERFLOW_PAGE;
-	ovflopaque->hasho_filler = HASHO_FILL;
+	ovflopaque->hasho_page_id = HASHO_PAGE_ID;
 
 	MarkBufferDirty(ovflbuf);
 
@@ -158,8 +159,9 @@ _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf)
 /*
  *	_hash_getovflpage()
  *
- *	Find an available overflow page and return it.  The returned buffer
- *	is pinned and write-locked, but its contents are not initialized.
+ *	Find an available overflow page and return it.	The returned buffer
+ *	is pinned and write-locked, and has had _hash_pageinit() applied,
+ *	but it is caller's responsibility to fill the special space.
  *
  * The caller must hold a pin, but no lock, on the metapage buffer.
  * That buffer is left in the same state at exit.
@@ -225,8 +227,7 @@ _hash_getovflpage(Relation rel, Buffer metabuf)
 		/* Release exclusive lock on metapage while reading bitmap page */
 		_hash_chgbufaccess(rel, metabuf, HASH_READ, HASH_NOLOCK);
 
-		mapbuf = _hash_getbuf(rel, mapblkno, HASH_WRITE);
-		_hash_checkpage(rel, mapbuf, LH_BITMAP_PAGE);
+		mapbuf = _hash_getbuf(rel, mapblkno, HASH_WRITE, LH_BITMAP_PAGE);
 		mappage = BufferGetPage(mapbuf);
 		freep = HashPageGetBitmap(mappage);
 
@@ -282,7 +283,7 @@ _hash_getovflpage(Relation rel, Buffer metabuf)
 	 * with metapage write lock held; would be better to use a lock that
 	 * doesn't block incoming searches.
 	 */
-	newbuf = _hash_getnewbuf(rel, blkno, HASH_WRITE);
+	newbuf = _hash_getnewbuf(rel, blkno);
 
 	metap->hashm_spares[splitnum]++;
 
@@ -332,8 +333,8 @@ _hash_getovflpage(Relation rel, Buffer metabuf)
 		_hash_chgbufaccess(rel, metabuf, HASH_READ, HASH_NOLOCK);
 	}
 
-	/* Fetch and return the recycled page */
-	return _hash_getbuf(rel, blkno, HASH_WRITE);
+	/* Fetch, init, and return the recycled page */
+	return _hash_getinitbuf(rel, blkno);
 }
 
 /*
@@ -366,6 +367,9 @@ _hash_firstfreebit(uint32 map)
  *	Remove this overflow page from its bucket's chain, and mark the page as
  *	free.  On entry, ovflbuf is write-locked; it is released before exiting.
  *
+ *	Since this function is invoked in VACUUM, we provide an access strategy
+ *	parameter that controls fetches of the bucket pages.
+ *
  *	Returns the block number of the page that followed the given page
  *	in the bucket, or InvalidBlockNumber if no following page.
  *
@@ -374,7 +378,8 @@ _hash_firstfreebit(uint32 map)
  *	on the bucket, too.
  */
 BlockNumber
-_hash_freeovflpage(Relation rel, Buffer ovflbuf)
+_hash_freeovflpage(Relation rel, Buffer ovflbuf,
+				   BufferAccessStrategy bstrategy)
 {
 	HashMetaPage metap;
 	Buffer		metabuf;
@@ -404,9 +409,9 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)
 	bucket = ovflopaque->hasho_bucket;
 
 	/*
-	 * Zero the page for debugging's sake; then write and release it.
-	 * (Note: if we failed to zero the page here, we'd have problems
-	 * with the Assert in _hash_pageinit() when the page is reused.)
+	 * Zero the page for debugging's sake; then write and release it. (Note:
+	 * if we failed to zero the page here, we'd have problems with the Assert
+	 * in _hash_pageinit() when the page is reused.)
 	 */
 	MemSet(ovflpage, 0, BufferGetPageSize(ovflbuf));
 	_hash_wrtbuf(rel, ovflbuf);
@@ -419,30 +424,37 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)
 	 */
 	if (BlockNumberIsValid(prevblkno))
 	{
-		Buffer		prevbuf = _hash_getbuf(rel, prevblkno, HASH_WRITE);
+		Buffer		prevbuf = _hash_getbuf_with_strategy(rel,
+														 prevblkno,
+														 HASH_WRITE,
+										   LH_BUCKET_PAGE | LH_OVERFLOW_PAGE,
+														 bstrategy);
 		Page		prevpage = BufferGetPage(prevbuf);
 		HashPageOpaque prevopaque = (HashPageOpaque) PageGetSpecialPointer(prevpage);
 
-		_hash_checkpage(rel, prevbuf, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
 		Assert(prevopaque->hasho_bucket == bucket);
 		prevopaque->hasho_nextblkno = nextblkno;
 		_hash_wrtbuf(rel, prevbuf);
 	}
 	if (BlockNumberIsValid(nextblkno))
 	{
-		Buffer		nextbuf = _hash_getbuf(rel, nextblkno, HASH_WRITE);
+		Buffer		nextbuf = _hash_getbuf_with_strategy(rel,
+														 nextblkno,
+														 HASH_WRITE,
+														 LH_OVERFLOW_PAGE,
+														 bstrategy);
 		Page		nextpage = BufferGetPage(nextbuf);
 		HashPageOpaque nextopaque = (HashPageOpaque) PageGetSpecialPointer(nextpage);
 
-		_hash_checkpage(rel, nextbuf, LH_OVERFLOW_PAGE);
 		Assert(nextopaque->hasho_bucket == bucket);
 		nextopaque->hasho_prevblkno = prevblkno;
 		_hash_wrtbuf(rel, nextbuf);
 	}
 
+	/* Note: bstrategy is intentionally not used for metapage and bitmap */
+
 	/* Read the metapage so we can determine which bitmap page to use */
-	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ);
-	_hash_checkpage(rel, metabuf, LH_META_PAGE);
+	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ, LH_META_PAGE);
 	metap = (HashMetaPage) BufferGetPage(metabuf);
 
 	/* Identify which bit to set */
@@ -459,8 +471,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)
 	_hash_chgbufaccess(rel, metabuf, HASH_READ, HASH_NOLOCK);
 
 	/* Clear the bitmap bit to indicate that this overflow page is free */
-	mapbuf = _hash_getbuf(rel, blkno, HASH_WRITE);
-	_hash_checkpage(rel, mapbuf, LH_BITMAP_PAGE);
+	mapbuf = _hash_getbuf(rel, blkno, HASH_WRITE, LH_BITMAP_PAGE);
 	mappage = BufferGetPage(mapbuf);
 	freep = HashPageGetBitmap(mappage);
 	Assert(ISSET(freep, bitmapbit));
@@ -516,17 +527,16 @@ _hash_initbitmap(Relation rel, HashMetaPage metap, BlockNumber blkno)
 	 * page while holding the metapage lock, but this path is taken so seldom
 	 * that it's not worth worrying about.
 	 */
-	buf = _hash_getnewbuf(rel, blkno, HASH_WRITE);
+	buf = _hash_getnewbuf(rel, blkno);
 	pg = BufferGetPage(buf);
 
-	/* initialize the page */
-	_hash_pageinit(pg, BufferGetPageSize(buf));
+	/* initialize the page's special space */
 	op = (HashPageOpaque) PageGetSpecialPointer(pg);
 	op->hasho_prevblkno = InvalidBlockNumber;
 	op->hasho_nextblkno = InvalidBlockNumber;
 	op->hasho_bucket = -1;
 	op->hasho_flag = LH_BITMAP_PAGE;
-	op->hasho_filler = HASHO_FILL;
+	op->hasho_page_id = HASHO_PAGE_ID;
 
 	/* set all of the bits to 1 */
 	freep = HashPageGetBitmap(pg);
@@ -569,11 +579,15 @@ _hash_initbitmap(Relation rel, HashMetaPage metap, BlockNumber blkno)
  *
  *	Caller must hold exclusive lock on the target bucket.  This allows
  *	us to safely lock multiple pages in the bucket.
+ *
+ *	Since this function is invoked in VACUUM, we provide an access strategy
+ *	parameter that controls fetches of the bucket pages.
  */
 void
 _hash_squeezebucket(Relation rel,
 					Bucket bucket __attribute__((unused)),
-					BlockNumber bucket_blkno)
+					BlockNumber bucket_blkno,
+					BufferAccessStrategy bstrategy)
 {
 	Buffer		wbuf;
 	Buffer		rbuf = 0;
@@ -594,8 +608,11 @@ _hash_squeezebucket(Relation rel,
 	 * start squeezing into the base bucket page.
 	 */
 	wblkno = bucket_blkno;
-	wbuf = _hash_getbuf(rel, wblkno, HASH_WRITE);
-	_hash_checkpage(rel, wbuf, LH_BUCKET_PAGE);
+	wbuf = _hash_getbuf_with_strategy(rel,
+									  wblkno,
+									  HASH_WRITE,
+									  LH_BUCKET_PAGE,
+									  bstrategy);
 	wpage = BufferGetPage(wbuf);
 	wopaque = (HashPageOpaque) PageGetSpecialPointer(wpage);
 
@@ -609,8 +626,10 @@ _hash_squeezebucket(Relation rel,
 	}
 
 	/*
-	 * find the last page in the bucket chain by starting at the base bucket
-	 * page and working forward.
+	 * Find the last page in the bucket chain by starting at the base bucket
+	 * page and working forward.  Note: we assume that a hash bucket chain is
+	 * usually smaller than the buffer ring being used by VACUUM, else using
+	 * the access strategy here would be counterproductive.
 	 */
 	ropaque = wopaque;
 	do
@@ -618,8 +637,11 @@ _hash_squeezebucket(Relation rel,
 		rblkno = ropaque->hasho_nextblkno;
 		if (ropaque != wopaque)
 			_hash_relbuf(rel, rbuf);
-		rbuf = _hash_getbuf(rel, rblkno, HASH_WRITE);
-		_hash_checkpage(rel, rbuf, LH_OVERFLOW_PAGE);
+		rbuf = _hash_getbuf_with_strategy(rel,
+										  rblkno,
+										  HASH_WRITE,
+										  LH_OVERFLOW_PAGE,
+										  bstrategy);
 		rpage = BufferGetPage(rbuf);
 		ropaque = (HashPageOpaque) PageGetSpecialPointer(rpage);
 		Assert(ropaque->hasho_bucket == bucket);
@@ -659,8 +681,11 @@ _hash_squeezebucket(Relation rel,
 					return;
 				}
 
-				wbuf = _hash_getbuf(rel, wblkno, HASH_WRITE);
-				_hash_checkpage(rel, wbuf, LH_OVERFLOW_PAGE);
+				wbuf = _hash_getbuf_with_strategy(rel,
+												  wblkno,
+												  HASH_WRITE,
+												  LH_OVERFLOW_PAGE,
+												  bstrategy);
 				wpage = BufferGetPage(wbuf);
 				wopaque = (HashPageOpaque) PageGetSpecialPointer(wpage);
 				Assert(wopaque->hasho_bucket == bucket);
@@ -670,7 +695,7 @@ _hash_squeezebucket(Relation rel,
 			 * we have found room so insert on the "write" page.
 			 */
 			woffnum = OffsetNumberNext(PageGetMaxOffsetNumber(wpage));
-			if (PageAddItem(wpage, (Item) itup, itemsz, woffnum, LP_USED)
+			if (PageAddItem(wpage, (Item) itup, itemsz, woffnum, false, false)
 				== InvalidOffsetNumber)
 				elog(ERROR, "failed to add index item to \"%s\"",
 					 RelationGetRelationName(rel));
@@ -704,16 +729,19 @@ _hash_squeezebucket(Relation rel,
 				/* yes, so release wbuf lock first */
 				_hash_wrtbuf(rel, wbuf);
 				/* free this overflow page (releases rbuf) */
-				_hash_freeovflpage(rel, rbuf);
+				_hash_freeovflpage(rel, rbuf, bstrategy);
 				/* done */
 				return;
 			}
 
 			/* free this overflow page, then get the previous one */
-			_hash_freeovflpage(rel, rbuf);
+			_hash_freeovflpage(rel, rbuf, bstrategy);
 
-			rbuf = _hash_getbuf(rel, rblkno, HASH_WRITE);
-			_hash_checkpage(rel, rbuf, LH_OVERFLOW_PAGE);
+			rbuf = _hash_getbuf_with_strategy(rel,
+											  rblkno,
+											  HASH_WRITE,
+											  LH_OVERFLOW_PAGE,
+											  bstrategy);
 			rpage = BufferGetPage(rbuf);
 			ropaque = (HashPageOpaque) PageGetSpecialPointer(rpage);
 			Assert(ropaque->hasho_bucket == bucket);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 847ac85ecb10..d61c2ee729c0 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashpage.c,v 1.64 2007/01/29 23:22:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashpage.c,v 1.72 2008/01/01 19:45:46 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -101,6 +101,10 @@ _hash_droplock(Relation rel, BlockNumber whichlock, int access)
  *	_hash_getbuf() -- Get a buffer by block number for read or write.
  *
  *		'access' must be HASH_READ, HASH_WRITE, or HASH_NOLOCK.
+ *		'flags' is a bitwise OR of the allowed page types.
+ *
+ *		This must be used only to fetch pages that are expected to be valid
+ *		already.  _hash_checkpage() is applied using the given flags.
  *
  *		When this routine returns, the appropriate lock is set on the
  *		requested buffer and its reference count has been incremented
@@ -115,7 +119,7 @@ _hash_droplock(Relation rel, BlockNumber whichlock, int access)
  *		to be valid or not.
  */
 Buffer
-_hash_getbuf(Relation rel, BlockNumber blkno, int access)
+_hash_getbuf(Relation rel, BlockNumber blkno, int access, int flags)
 {
 	Buffer		buf;
 
@@ -130,13 +134,52 @@ _hash_getbuf(Relation rel, BlockNumber blkno, int access)
 		LockBuffer(buf, access);
 
 	/* ref count and lock type are correct */
+
+	_hash_checkpage(rel, buf, flags);
+
+	return buf;
+}
+
+/*
+ *	_hash_getinitbuf() -- Get and initialize a buffer by block number.
+ *
+ *		This must be used only to fetch pages that are known to be before
+ *		the index's filesystem EOF, but are to be filled from scratch.
+ *		_hash_pageinit() is applied automatically.	Otherwise it has
+ *		effects similar to _hash_getbuf() with access = HASH_WRITE.
+ *
+ *		When this routine returns, a write lock is set on the
+ *		requested buffer and its reference count has been incremented
+ *		(ie, the buffer is "locked and pinned").
+ *
+ *		P_NEW is disallowed because this routine can only be used
+ *		to access pages that are known to be before the filesystem EOF.
+ *		Extending the index should be done with _hash_getnewbuf.
+ */
+Buffer
+_hash_getinitbuf(Relation rel, BlockNumber blkno)
+{
+	Buffer		buf;
+
+	if (blkno == P_NEW)
+		elog(ERROR, "hash AM does not use P_NEW");
+
+	buf = ReadOrZeroBuffer(rel, blkno);
+
+	LockBuffer(buf, HASH_WRITE);
+
+	/* ref count and lock type are correct */
+
+	/* initialize the page */
+	_hash_pageinit(BufferGetPage(buf), BufferGetPageSize(buf));
+
 	return buf;
 }
 
 /*
  *	_hash_getnewbuf() -- Get a new page at the end of the index.
  *
- *		This has the same API as _hash_getbuf, except that we are adding
+ *		This has the same API as _hash_getinitbuf, except that we are adding
  *		a page to the index, and hence expect the page to be past the
  *		logical EOF.  (However, we have to support the case where it isn't,
  *		since a prior try might have crashed after extending the filesystem
@@ -144,14 +187,11 @@ _hash_getbuf(Relation rel, BlockNumber blkno, int access)
  *
  *		It is caller's responsibility to ensure that only one process can
  *		extend the index at a time.
- *
- *		All call sites should call _hash_pageinit on the returned page.
- *		Also, it's difficult to imagine why access would not be HASH_WRITE.
  */
 Buffer
-_hash_getnewbuf(Relation rel, BlockNumber blkno, int access)
+_hash_getnewbuf(Relation rel, BlockNumber blkno)
 {
-	BlockNumber	nblocks = RelationGetNumberOfBlocks(rel);
+	BlockNumber nblocks = RelationGetNumberOfBlocks(rel);
 	Buffer		buf;
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
@@ -171,12 +211,43 @@ _hash_getnewbuf(Relation rel, BlockNumber blkno, int access)
 				 BufferGetBlockNumber(buf), blkno);
 	}
 	else
-		buf = ReadBuffer(rel, blkno);
+		buf = ReadOrZeroBuffer(rel, blkno);
+
+	LockBuffer(buf, HASH_WRITE);
+
+	/* ref count and lock type are correct */
+
+	/* initialize the page */
+	_hash_pageinit(BufferGetPage(buf), BufferGetPageSize(buf));
+
+	return buf;
+}
+
+/*
+ *	_hash_getbuf_with_strategy() -- Get a buffer with nondefault strategy.
+ *
+ *		This is identical to _hash_getbuf() but also allows a buffer access
+ *		strategy to be specified.  We use this for VACUUM operations.
+ */
+Buffer
+_hash_getbuf_with_strategy(Relation rel, BlockNumber blkno,
+						   int access, int flags,
+						   BufferAccessStrategy bstrategy)
+{
+	Buffer		buf;
+
+	if (blkno == P_NEW)
+		elog(ERROR, "hash AM does not use P_NEW");
+
+	buf = ReadBufferWithStrategy(rel, blkno, bstrategy);
 
 	if (access != HASH_NOLOCK)
 		LockBuffer(buf, access);
 
 	/* ref count and lock type are correct */
+
+	_hash_checkpage(rel, buf, flags);
+
 	return buf;
 }
 
@@ -299,26 +370,24 @@ _hash_metapinit(Relation rel)
 	if (ffactor < 10)
 		ffactor = 10;
 
-	/*
-	 * We initialize the metapage, the first two bucket pages, and the
-	 * first bitmap page in sequence, using _hash_getnewbuf to cause
-	 * smgrextend() calls to occur.  This ensures that the smgr level
-	 * has the right idea of the physical index length.
-	 */
-	
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	metabuf = _hash_getnewbuf(rel, HASH_METAPAGE, HASH_WRITE);
+	/*
+	 * We initialize the metapage, the first two bucket pages, and the first
+	 * bitmap page in sequence, using _hash_getnewbuf to cause smgrextend()
+	 * calls to occur.	This ensures that the smgr level has the right idea of
+	 * the physical index length.
+	 */
+	metabuf = _hash_getnewbuf(rel, HASH_METAPAGE);
 	pg = BufferGetPage(metabuf);
-	_hash_pageinit(pg, BufferGetPageSize(metabuf));
 
 	pageopaque = (HashPageOpaque) PageGetSpecialPointer(pg);
 	pageopaque->hasho_prevblkno = InvalidBlockNumber;
 	pageopaque->hasho_nextblkno = InvalidBlockNumber;
 	pageopaque->hasho_bucket = -1;
 	pageopaque->hasho_flag = LH_META_PAGE;
-	pageopaque->hasho_filler = HASHO_FILL;
+	pageopaque->hasho_page_id = HASHO_PAGE_ID;
 
 	metap = (HashMetaPage) pg;
 
@@ -367,15 +436,14 @@ _hash_metapinit(Relation rel)
 	 */
 	for (i = 0; i <= 1; i++)
 	{
-		buf = _hash_getnewbuf(rel, BUCKET_TO_BLKNO(metap, i), HASH_WRITE);
+		buf = _hash_getnewbuf(rel, BUCKET_TO_BLKNO(metap, i));
 		pg = BufferGetPage(buf);
-		_hash_pageinit(pg, BufferGetPageSize(buf));
 		pageopaque = (HashPageOpaque) PageGetSpecialPointer(pg);
 		pageopaque->hasho_prevblkno = InvalidBlockNumber;
 		pageopaque->hasho_nextblkno = InvalidBlockNumber;
 		pageopaque->hasho_bucket = i;
 		pageopaque->hasho_flag = LH_BUCKET_PAGE;
-		pageopaque->hasho_filler = HASHO_FILL;
+		pageopaque->hasho_page_id = HASHO_PAGE_ID;
 		_hash_wrtbuf(rel, buf);
 	}
 
@@ -462,15 +530,16 @@ _hash_expandtable(Relation rel, Buffer metabuf)
 		goto fail;
 
 	/*
-	 * Can't split anymore if maxbucket has reached its maximum possible value.
+	 * Can't split anymore if maxbucket has reached its maximum possible
+	 * value.
 	 *
 	 * Ideally we'd allow bucket numbers up to UINT_MAX-1 (no higher because
 	 * the calculation maxbucket+1 mustn't overflow).  Currently we restrict
 	 * to half that because of overflow looping in _hash_log2() and
 	 * insufficient space in hashm_spares[].  It's moot anyway because an
-	 * index with 2^32 buckets would certainly overflow BlockNumber and
-	 * hence _hash_alloc_buckets() would fail, but if we supported buckets
-	 * smaller than a disk block then this would be an independent constraint.
+	 * index with 2^32 buckets would certainly overflow BlockNumber and hence
+	 * _hash_alloc_buckets() would fail, but if we supported buckets smaller
+	 * than a disk block then this would be an independent constraint.
 	 */
 	if (metap->hashm_maxbucket >= (uint32) 0x7FFFFFFE)
 		goto fail;
@@ -497,10 +566,10 @@ _hash_expandtable(Relation rel, Buffer metabuf)
 	/*
 	 * Likewise lock the new bucket (should never fail).
 	 *
-	 * Note: it is safe to compute the new bucket's blkno here, even though
-	 * we may still need to update the BUCKET_TO_BLKNO mapping.  This is
-	 * because the current value of hashm_spares[hashm_ovflpoint] correctly
-	 * shows where we are going to put a new splitpoint's worth of buckets.
+	 * Note: it is safe to compute the new bucket's blkno here, even though we
+	 * may still need to update the BUCKET_TO_BLKNO mapping.  This is because
+	 * the current value of hashm_spares[hashm_ovflpoint] correctly shows
+	 * where we are going to put a new splitpoint's worth of buckets.
 	 */
 	start_nblkno = BUCKET_TO_BLKNO(metap, new_bucket);
 
@@ -518,11 +587,12 @@ _hash_expandtable(Relation rel, Buffer metabuf)
 	if (spare_ndx > metap->hashm_ovflpoint)
 	{
 		Assert(spare_ndx == metap->hashm_ovflpoint + 1);
+
 		/*
-		 * The number of buckets in the new splitpoint is equal to the
-		 * total number already in existence, i.e. new_bucket.  Currently
-		 * this maps one-to-one to blocks required, but someday we may need
-		 * a more complicated calculation here.
+		 * The number of buckets in the new splitpoint is equal to the total
+		 * number already in existence, i.e. new_bucket.  Currently this maps
+		 * one-to-one to blocks required, but someday we may need a more
+		 * complicated calculation here.
 		 */
 		if (!_hash_alloc_buckets(rel, start_nblkno, new_bucket))
 		{
@@ -620,7 +690,7 @@ _hash_expandtable(Relation rel, Buffer metabuf)
  * This does not need to initialize the new bucket pages; we'll do that as
  * each one is used by _hash_expandtable().  But we have to extend the logical
  * EOF to the end of the splitpoint; this keeps smgr's idea of the EOF in
- * sync with ours, so that overflow-page allocation works correctly.
+ * sync with ours, so that we don't get complaints from smgr.
  *
  * We do this by writing a page of zeroes at the end of the splitpoint range.
  * We expect that the filesystem will ensure that the intervening pages read
@@ -641,14 +711,14 @@ _hash_expandtable(Relation rel, Buffer metabuf)
 static bool
 _hash_alloc_buckets(Relation rel, BlockNumber firstblock, uint32 nblocks)
 {
-	BlockNumber	lastblock;
+	BlockNumber lastblock;
 	char		zerobuf[BLCKSZ];
 
 	lastblock = firstblock + nblocks - 1;
 
 	/*
-	 * Check for overflow in block number calculation; if so, we cannot
-	 * extend the index anymore.
+	 * Check for overflow in block number calculation; if so, we cannot extend
+	 * the index anymore.
 	 */
 	if (lastblock < firstblock || lastblock == InvalidBlockNumber)
 		return false;
@@ -714,23 +784,21 @@ _hash_splitbucket(Relation rel,
 	 * either bucket.
 	 */
 	oblkno = start_oblkno;
-	obuf = _hash_getbuf(rel, oblkno, HASH_WRITE);
-	_hash_checkpage(rel, obuf, LH_BUCKET_PAGE);
+	obuf = _hash_getbuf(rel, oblkno, HASH_WRITE, LH_BUCKET_PAGE);
 	opage = BufferGetPage(obuf);
 	oopaque = (HashPageOpaque) PageGetSpecialPointer(opage);
 
 	nblkno = start_nblkno;
-	nbuf = _hash_getbuf(rel, nblkno, HASH_WRITE);
+	nbuf = _hash_getnewbuf(rel, nblkno);
 	npage = BufferGetPage(nbuf);
 
 	/* initialize the new bucket's primary page */
-	_hash_pageinit(npage, BufferGetPageSize(nbuf));
 	nopaque = (HashPageOpaque) PageGetSpecialPointer(npage);
 	nopaque->hasho_prevblkno = InvalidBlockNumber;
 	nopaque->hasho_nextblkno = InvalidBlockNumber;
 	nopaque->hasho_bucket = nbucket;
 	nopaque->hasho_flag = LH_BUCKET_PAGE;
-	nopaque->hasho_filler = HASHO_FILL;
+	nopaque->hasho_page_id = HASHO_PAGE_ID;
 
 	/*
 	 * Partition the tuples in the old bucket between the old bucket and the
@@ -760,8 +828,7 @@ _hash_splitbucket(Relation rel,
 			 */
 			_hash_wrtbuf(rel, obuf);
 
-			obuf = _hash_getbuf(rel, oblkno, HASH_WRITE);
-			_hash_checkpage(rel, obuf, LH_OVERFLOW_PAGE);
+			obuf = _hash_getbuf(rel, oblkno, HASH_WRITE, LH_OVERFLOW_PAGE);
 			opage = BufferGetPage(obuf);
 			oopaque = (HashPageOpaque) PageGetSpecialPointer(opage);
 			ooffnum = FirstOffsetNumber;
@@ -798,13 +865,12 @@ _hash_splitbucket(Relation rel,
 				_hash_chgbufaccess(rel, nbuf, HASH_WRITE, HASH_NOLOCK);
 				/* chain to a new overflow page */
 				nbuf = _hash_addovflpage(rel, metabuf, nbuf);
-				_hash_checkpage(rel, nbuf, LH_OVERFLOW_PAGE);
 				npage = BufferGetPage(nbuf);
 				/* we don't need nopaque within the loop */
 			}
 
 			noffnum = OffsetNumberNext(PageGetMaxOffsetNumber(npage));
-			if (PageAddItem(npage, (Item) itup, itemsz, noffnum, LP_USED)
+			if (PageAddItem(npage, (Item) itup, itemsz, noffnum, false, false)
 				== InvalidOffsetNumber)
 				elog(ERROR, "failed to add index item to \"%s\"",
 					 RelationGetRelationName(rel));
@@ -842,5 +908,5 @@ _hash_splitbucket(Relation rel,
 	_hash_wrtbuf(rel, obuf);
 	_hash_wrtbuf(rel, nbuf);
 
-	_hash_squeezebucket(rel, obucket, start_oblkno);
+	_hash_squeezebucket(rel, obucket, start_oblkno, NULL);
 }
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index abc86c553e61..a5ce88d2bd0a 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.42 2007/02/01 19:10:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.43.2.1 2008/03/07 15:59:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index b42eeced3a2c..ef7ac0f7c74a 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashsearch.c,v 1.48 2007/01/30 01:33:36 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashsearch.c,v 1.51 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,8 +82,7 @@ _hash_readnext(Relation rel,
 	CHECK_FOR_INTERRUPTS();
 	if (BlockNumberIsValid(blkno))
 	{
-		*bufp = _hash_getbuf(rel, blkno, HASH_READ);
-		_hash_checkpage(rel, *bufp, LH_OVERFLOW_PAGE);
+		*bufp = _hash_getbuf(rel, blkno, HASH_READ, LH_OVERFLOW_PAGE);
 		*pagep = BufferGetPage(*bufp);
 		*opaquep = (HashPageOpaque) PageGetSpecialPointer(*pagep);
 	}
@@ -107,8 +106,8 @@ _hash_readprev(Relation rel,
 	CHECK_FOR_INTERRUPTS();
 	if (BlockNumberIsValid(blkno))
 	{
-		*bufp = _hash_getbuf(rel, blkno, HASH_READ);
-		_hash_checkpage(rel, *bufp, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
+		*bufp = _hash_getbuf(rel, blkno, HASH_READ,
+							 LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
 		*pagep = BufferGetPage(*bufp);
 		*opaquep = (HashPageOpaque) PageGetSpecialPointer(*pagep);
 	}
@@ -198,8 +197,7 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 	_hash_getlock(rel, 0, HASH_SHARE);
 
 	/* Read the metapage */
-	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ);
-	_hash_checkpage(rel, metabuf, LH_META_PAGE);
+	metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ, LH_META_PAGE);
 	metap = (HashMetaPage) BufferGetPage(metabuf);
 
 	/*
@@ -228,8 +226,7 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 	so->hashso_bucket_blkno = blkno;
 
 	/* Fetch the primary bucket page for the bucket */
-	buf = _hash_getbuf(rel, blkno, HASH_READ);
-	_hash_checkpage(rel, buf, LH_BUCKET_PAGE);
+	buf = _hash_getbuf(rel, blkno, HASH_READ, LH_BUCKET_PAGE);
 	page = BufferGetPage(buf);
 	opaque = (HashPageOpaque) PageGetSpecialPointer(page);
 	Assert(opaque->hasho_bucket == bucket);
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index f0090f380cd8..a19e689a6a53 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.51 2007/01/30 01:33:36 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.53 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -137,6 +137,9 @@ _hash_log2(uint32 num)
 
 /*
  * _hash_checkpage -- sanity checks on the format of all hash pages
+ *
+ * If flags is not zero, it is a bitwise OR of the acceptable values of
+ * hasho_flag.
  */
 void
 _hash_checkpage(Relation rel, Buffer buf, int flags)
diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile
index ef2121bb5323..0c68660092a8 100644
--- a/src/backend/access/heap/Makefile
+++ b/src/backend/access/heap/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/heap
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/heap/Makefile,v 1.14 2007/01/20 17:16:10 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/access/heap/Makefile,v 1.17 2007/09/20 17:56:30 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,6 +12,6 @@ subdir = src/backend/access/heap
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = heapam.o hio.o tuptoaster.o
+OBJS = heapam.o hio.o pruneheap.o rewriteheap.o syncscan.o tuptoaster.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/heap/README.HOT b/src/backend/access/heap/README.HOT
new file mode 100644
index 000000000000..dd34c540311b
--- /dev/null
+++ b/src/backend/access/heap/README.HOT
@@ -0,0 +1,495 @@
+$PostgreSQL: pgsql/src/backend/access/heap/README.HOT,v 1.2 2007/09/21 21:25:42 tgl Exp $
+
+                           Heap Only Tuples (HOT)
+
+Introduction
+------------
+
+The Heap Only Tuple (HOT) feature eliminates redundant index entries and
+allows the re-use of space taken by DELETEd or obsoleted UPDATEd tuples
+without performing a table-wide vacuum.  It does this by allowing
+single-page vacuuming, also called "defragmentation".
+
+Note: there is a Glossary at the end of this document that may be helpful
+for first-time readers.
+
+
+Technical Challenges
+--------------------
+
+Page-at-a-time vacuuming is normally impractical because of the costs of
+finding and removing the index entries that link to the tuples to be
+reclaimed.  Standard vacuuming scans the indexes to ensure all such index
+entries are removed, amortizing the index scan cost across as many dead
+tuples as possible; this approach does not scale down well to the case of
+reclaiming just a few tuples.  In principle one could recompute the index
+keys and do standard index searches to find the index entries, but this is
+risky in the presence of possibly-buggy user-defined functions in
+functional indexes.  An allegedly immutable function that in fact is not
+immutable might prevent us from re-finding an index entry (and we cannot
+throw an error for not finding it, in view of the fact that dead index
+entries are sometimes reclaimed early).  That would lead to a seriously
+corrupt index, in the form of entries pointing to tuple slots that by now
+contain some unrelated content.  In any case we would prefer to be able
+to do vacuuming without invoking any user-written code.
+
+HOT solves this problem for a restricted but useful special case:
+where a tuple is repeatedly updated in ways that do not change its
+indexed columns.  (Here, "indexed column" means any column referenced
+at all in an index definition, including for example columns that are
+tested in a partial-index predicate but are not stored in the index.)
+
+An additional property of HOT is that it reduces index size by avoiding
+the creation of identically-keyed index entries.  This improves search
+speeds.
+
+
+Update Chains With a Single Index Entry
+---------------------------------------
+
+Without HOT, every version of a row in an update chain has its own index
+entries, even if all indexed columns are the same.  With HOT, a new tuple
+placed on the same page and with all indexed columns the same as its
+parent row version does not get new index entries.  This means there is
+only one index entry for the entire update chain on the heap page.
+An index-entry-less tuple is marked with the HEAP_ONLY_TUPLE flag.
+The prior row version is marked HEAP_HOT_UPDATED, and (as always in an
+update chain) its t_ctid field links forward to the newer version.
+
+For example:
+
+	Index points to 1
+	lp [1]  [2]
+
+	[111111111]->[2222222222]
+
+In the above diagram, the index points to line pointer 1, and tuple 1 is
+marked as HEAP_HOT_UPDATED.  Tuple 2 is a HOT tuple, meaning it has
+no index entry pointing to it, and is marked as HEAP_ONLY_TUPLE.
+Although tuple 2 is not directly referenced by the index, it can still be
+found by an index search: after traversing from the index to tuple 1,
+the index search proceeds forward to child tuples as long as it sees the
+HEAP_HOT_UPDATED flag set.  Since we restrict the HOT chain to lie within
+a single page, this requires no additional page fetches and doesn't
+introduce much performance penalty.
+
+Eventually, tuple 1 will no longer be visible to any transaction.
+At that point its space could be reclaimed, but its line pointer cannot,
+since the index still links to that line pointer and we still need to
+be able to find tuple 2 in an index search.  HOT handles this by turning
+line pointer 1 into a "redirecting line pointer", which links to tuple 2
+but has no actual tuple attached.  This state of affairs looks like
+
+	Index points to 1
+	lp [1]->[2]
+
+	[2222222222]
+
+If now the row is updated again, to version 3, the page looks like this:
+
+	Index points to 1
+	lp [1]->[2]  [3]
+
+	[2222222222]->[3333333333]
+
+At some later time when no transaction can see tuple 2 in its snapshot,
+tuple 2 and its line pointer can be pruned entirely:
+
+	Index points to 1
+	lp [1]------>[3]
+
+	[3333333333]
+
+This is safe because no index entry points to line pointer 2.  Subsequent
+insertions into the page can now recycle both line pointer 2 and the
+space formerly used by tuple 2.
+
+If an update changes any indexed column, or there is not room on the
+same page for the new tuple, then the HOT chain ends: the last member
+has a regular t_ctid link to the next version and is not marked
+HEAP_HOT_UPDATED.  (In principle we could continue a HOT chain across
+pages, but this would destroy the desired property of being able to
+reclaim space with just page-local manipulations.  Anyway, we don't
+want to have to chase through multiple heap pages to get from an index
+entry to the desired tuple, so it seems better to create a new index
+entry for the new tuple.)  If further updates occur, the next version
+could become the root of a new HOT chain.
+
+Line pointer 1 has to remain as long as there is any non-dead member of
+the chain on the page.  When there is not, it is marked "dead".
+This lets us reclaim the last child line pointer and associated tuple
+immediately.  The next regular VACUUM pass can reclaim the index entries
+pointing at the line pointer and then the line pointer itself.  Since a
+line pointer is small compared to a tuple, this does not represent an
+undue space cost.
+
+Note: we can use a "dead" line pointer for any DELETEd tuple,
+whether it was part of a HOT chain or not.  This allows space reclamation
+in advance of running VACUUM for plain DELETEs as well as HOT updates.
+
+The requirement for doing a HOT update is that none of the indexed
+columns are changed.  This is checked at execution time by comparing the
+binary representation of the old and new values.  We insist on bitwise
+equality rather than using datatype-specific equality routines.  The
+main reason to avoid the latter is that there might be multiple notions
+of equality for a datatype, and we don't know exactly which one is
+relevant for the indexes at hand.  We assume that bitwise equality
+guarantees equality for all purposes.
+
+
+Abort Cases
+-----------
+
+If a heap-only tuple's xmin is aborted, then it can be removed immediately:
+it was never visible to any other transaction, and all descendant row
+versions must be aborted as well.  Therefore we need not consider it part
+of a HOT chain.  By the same token, if a HOT-updated tuple's xmax is
+aborted, there is no need to follow the chain link.  However, there is a
+race condition here: the transaction that did the HOT update might abort
+between the time we inspect the HOT-updated tuple and the time we reach
+the descendant heap-only tuple.  It is conceivable that someone prunes
+the heap-only tuple before that, and even conceivable that the line pointer
+is re-used for another purpose.  Therefore, when following a HOT chain,
+it is always necessary to be prepared for the possibility that the
+linked-to item pointer is unused, dead, or redirected; and if it is a
+normal item pointer, we still have to check that XMIN of the tuple matches
+the XMAX of the tuple we left.  Otherwise we should assume that we have
+come to the end of the HOT chain.  Note that this sort of XMIN/XMAX
+matching is required when following ordinary update chains anyway.
+
+(Early versions of the HOT code assumed that holding pin on the page
+buffer while following a HOT link would prevent this type of problem,
+but checking XMIN/XMAX matching is a much more robust solution.)
+
+
+Index/Sequential Scans
+----------------------
+
+When doing an index scan, whenever we reach a HEAP_HOT_UPDATED tuple whose
+xmax is not aborted, we need to follow its t_ctid link and check that
+entry as well; possibly repeatedly until we reach the end of the HOT
+chain.  (When using an MVCC snapshot it is possible to optimize this a
+bit: there can be at most one visible tuple in the chain, so we can stop
+when we find it.  This rule does not work for non-MVCC snapshots, though.)
+
+Sequential scans do not need to pay attention to the HOT links because
+they scan every item pointer on the page anyway.  The same goes for a
+bitmap heap scan with a lossy bitmap.
+
+
+Pruning
+-------
+
+HOT pruning means updating item pointers so that HOT chains are
+reduced in length, by collapsing out line pointers for intermediate dead
+tuples.  Although this makes those line pointers available for re-use,
+it does not immediately make the space occupied by their tuples available.
+
+
+Defragmentation
+---------------
+
+Defragmentation centralizes unused space.  After we have converted root
+line pointers to redirected line pointers and pruned away any dead
+intermediate line pointers, the tuples they linked to are free space.
+But unless that space is adjacent to the central "hole" on the page
+(the pd_lower-to-pd_upper area) it cannot be used by tuple insertion.
+Defragmentation moves the surviving tuples to coalesce all the free
+space into one "hole".  This is done with the same PageRepairFragmentation
+function that regular VACUUM uses.
+
+
+When can/should we prune or defragment?
+---------------------------------------
+
+This is the most interesting question in HOT implementation, since there
+is no simple right answer: we must use heuristics to determine when it's
+most efficient to perform pruning and/or defragmenting.
+
+We cannot prune or defragment unless we can get a "buffer cleanup lock"
+on the target page; otherwise, pruning might destroy line pointers that
+other backends have live references to, and defragmenting might move
+tuples that other backends have live pointers to.  Thus the general
+approach must be to heuristically decide if we should try to prune
+or defragment, and if so try to acquire the buffer cleanup lock without
+blocking.  If we succeed we can proceed with our housekeeping work.
+If we cannot get the lock (which should not happen often, except under
+very heavy contention) then the housekeeping has to be postponed till
+some other time.  The worst-case consequence of this is only that an
+UPDATE cannot be made HOT but has to link to a new tuple version placed on
+some other page, for lack of centralized space on the original page.
+
+Ideally we would do defragmenting only when we are about to attempt
+heap_update on a HOT-safe tuple.  The difficulty with this approach
+is that the update query has certainly got a pin on the old tuple, and
+therefore our attempt to acquire a buffer cleanup lock will always fail.
+(This corresponds to the idea that we don't want to move the old tuple
+out from under where the query's HeapTuple pointer points.  It might
+be possible to finesse that, but it seems fragile.)
+
+Pruning, however, is potentially useful even when we are not about to
+insert a new tuple, since shortening a HOT chain reduces the cost of
+subsequent index searches.  However it is unclear that this gain is
+large enough to accept any extra maintenance burden for.
+
+The currently planned heuristic is to prune and defrag when first accessing
+a page that potentially has prunable tuples (as flagged by the pd_prune_xid
+page hint field) and that either has free space less than MAX(fillfactor
+target free space, BLCKSZ/10) *or* has recently had an UPDATE fail to
+find enough free space to store an updated tuple version.  (These rules
+are subject to change.)
+
+We have effectively implemented the "truncate dead tuples to just line
+pointer" idea that has been proposed and rejected before because of fear
+of line pointer bloat: we might end up with huge numbers of line pointers
+and just a few actual tuples on a page.  To limit the damage in the worst
+case, and to keep various work arrays as well as the bitmaps in bitmap
+scans reasonably sized, the maximum number of line pointers per page
+is arbitrarily capped at MaxHeapTuplesPerPage (the most tuples that
+could fit without HOT pruning).
+
+
+VACUUM
+------
+
+There is little change to regular vacuum.  It performs pruning to remove
+dead heap-only tuples, and cleans up any dead line pointers as if they were
+regular dead tuples.
+
+
+VACUUM FULL
+-----------
+
+VACUUM FULL performs an extra operation of collapsing out redirecting line
+pointers, by moving the first non-DEAD tuple of each HOT chain to the root
+position and clearing its heap-only-tuple flag.  This effectively changes
+the user-visible CTID of that tuple.  This would be completely unsafe
+during normal concurrent operation, but since VACUUM FULL takes full
+exclusive lock on the table, it should be OK.  (Note that VACUUM FULL has
+always felt free to change tuples' CTIDs by moving them across pages.)
+Eliminating redirection links means that the main body of VACUUM FULL
+doesn't have to deal with them, which seems a good thing since VACUUM FULL
+is horrendously complex already.
+
+When VACUUM FULL tries to move tuple chains, it does not distinguish regular
+and heap-only tuples, but just moves both types the same.  This is OK because
+it will move the entire non-DEAD tail of an update chain and remove index
+entries for each item moved.  At worst, we'll uselessly search for index
+entries matching the heap-only tuples included in the move.
+
+
+Statistics
+----------
+
+Currently, we count HOT updates the same as cold updates for statistics
+purposes, though there is an additional per-table counter that counts
+only HOT updates.  When a page pruning operation is able to remove a
+physical tuple by eliminating an intermediate heap-only tuple or
+replacing a physical root tuple by a redirect pointer, a decrement in
+the table's number of dead tuples is reported to pgstats, which may
+postpone autovacuuming.  Note that we do not count replacing a root tuple
+by a DEAD item pointer as decrementing n_dead_tuples; we still want
+autovacuum to run to clean up the index entries and DEAD item.
+
+This area probably needs further work ...
+
+
+CREATE INDEX
+------------
+
+CREATE INDEX presents a problem for HOT updates.  While the existing HOT
+chains all have the same index values for existing indexes, the columns
+in the new index might change within a pre-existing HOT chain, creating
+a "broken" chain that can't be indexed properly.
+
+To address this issue, regular (non-concurrent) CREATE INDEX makes the
+new index usable only by transactions newer than the CREATE INDEX
+command.  This prevents transactions that can see the inconsistent HOT
+chains from trying to use the new index and getting incorrect results.  
+New transactions can only see the rows visible after the index was
+created, hence the HOT chains are consistent for them.
+
+Entries in the new index point to root tuples (tuples with current index
+pointers) so that our index uses the same index pointers as all other
+indexes on the table.  However the row we want to index is actually at
+the *end* of the chain, ie, the most recent live tuple on the HOT chain.
+That is the one we compute the index entry values for, but the TID
+we put into the index is that of the root tuple.  Since transactions that
+will be allowed to use the new index cannot see any of the older tuple
+versions in the chain, the fact that they might not match the index entry
+isn't a problem.  (Such transactions will check the tuple visibility
+information of the older versions and ignore them, without ever looking at
+their contents, so the content inconsistency is OK.)  Subsequent updates
+to the live tuple will be allowed to extend the HOT chain only if they are
+HOT-safe for all the indexes.
+
+Because we have ShareLock on the table, any DELETE_IN_PROGRESS or
+INSERT_IN_PROGRESS tuples should have come from our own transaction.
+Therefore we can consider them committed since if the CREATE INDEX
+commits, they will be committed, and if it aborts the index is discarded.
+An exception to this is that early lock release is customary for system
+catalog updates, and so we might find such tuples when reindexing a system
+catalog.  In that case we deal with it by waiting for the source
+transaction to commit or roll back.  (We could do that for user tables
+too, but since the case is unexpected we prefer to throw an error.)
+
+Practically, we prevent old transactions from using the new index by
+setting pg_index.indcheckxmin to TRUE.  Queries are allowed to use such an
+index only after pg_index.xmin is below their TransactionXmin horizon,
+thereby ensuring that any incompatible rows in HOT chains are dead to them.
+(pg_index.xmin will be the XID of the CREATE INDEX transaction.  The reason
+for using xmin rather than a normal column is that the regular vacuum
+freezing mechanism will take care of converting xmin to FrozenTransactionId
+before it can wrap around.)
+
+This means in particular that the transaction creating the index will be
+unable to use the index.  We alleviate that problem somewhat by not setting
+indcheckxmin unless the table actually contains HOT chains with
+RECENTLY_DEAD members.  (In 8.4 we may be able to improve the situation,
+at least for non-serializable transactions, because we expect to be able to
+advance TransactionXmin intratransaction.)
+
+Another unpleasant consequence is that it is now risky to use SnapshotAny
+in an index scan: if the index was created more recently than the last
+vacuum, it's possible that some of the visited tuples do not match the
+index entry they are linked to.  This does not seem to be a fatal
+objection, since there are few users of SnapshotAny and most use seqscans.
+The only exception at this writing is CLUSTER, which is okay because it
+does not require perfect ordering of the indexscan readout (and especially
+so because CLUSTER tends to write recently-dead tuples out of order anyway).
+
+
+CREATE INDEX CONCURRENTLY
+-------------------------
+
+In the concurrent case we must take a different approach.  We create the
+pg_index entry immediately, before we scan the table.  The pg_index entry
+is marked as "not ready for inserts".  Then we commit and wait for any
+transactions which have the table open to finish.  This ensures that no
+new HOT updates will change the key value for our new index, because all
+transactions will see the existence of the index and will respect its
+constraint on which updates can be HOT.  Other transactions must include
+such an index when determining HOT-safety of updates, even though they
+must ignore it for both insertion and searching purposes.
+
+We must do this to avoid making incorrect index entries.  For example,
+suppose we are building an index on column X and we make an index entry for
+a non-HOT tuple with X=1.  Then some other backend, unaware that X is an
+indexed column, HOT-updates the row to have X=2, and commits.  We now have
+an index entry for X=1 pointing at a HOT chain whose live row has X=2.
+We could make an index entry with X=2 during the validation pass, but
+there is no nice way to get rid of the wrong entry with X=1.  So we must
+have the HOT-safety property enforced before we start to build the new
+index.
+
+After waiting for transactions which had the table open, we build the index
+for all rows that are valid in a fresh snapshot.  Any tuples visible in the
+snapshot will have only valid forward-growing HOT chains.  (They might have
+older HOT updates behind them which are broken, but this is OK for the same
+reason it's OK in a regular index build.)  As above, we point the index
+entry at the root of the HOT-update chain but we use the key value from the
+live tuple.
+
+We mark the index open for inserts (but still not ready for reads) then
+we again wait for transactions which have the table open.  Then we take
+a second reference snapshot and validate the index.  This searches for
+tuples missing from the index, and inserts any missing ones.  Again,
+the index entries have to have TIDs equal to HOT-chain root TIDs, but
+the value to be inserted is the one from the live tuple.
+
+Then we wait until every transaction that could have a snapshot older than
+the second reference snapshot is finished.  This ensures that nobody is
+alive any longer who could need to see any tuples that might be missing
+from the index, as well as ensuring that no one can see any inconsistent
+rows in a broken HOT chain (the first condition is stronger than the
+second).  Finally, we can mark the index valid for searches.
+
+Note that we do not need to set pg_index.indcheckxmin in this code path,
+because we have outwaited any transactions that would need to avoid using
+the index.  (indcheckxmin is only needed because non-concurrent CREATE
+INDEX doesn't want to wait; its stronger lock would create too much risk of
+deadlock if it did.)
+
+
+Limitations and Restrictions
+----------------------------
+
+It is worth noting that HOT forever forecloses alternative approaches
+to vacuuming, specifically the recompute-the-index-keys approach alluded
+to in Technical Challenges above.  It'll be tough to recompute the index
+keys for a root line pointer you don't have data for anymore ...
+
+
+Glossary
+--------
+
+Broken HOT Chain
+
+	A HOT chain in which the key value for an index has changed.
+
+	This is not allowed to occur normally but if a new index is created
+	it can happen.  In that case various strategies are used to ensure
+	that no transaction for which the older tuples are visible can
+	use the index.
+
+Cold update
+
+	A normal, non-HOT update, in which index entries are made for
+	the new version of the tuple.
+
+Dead line pointer
+
+	A stub line pointer, that does not point to anything, but cannot
+	be removed or reused yet because there are index pointers to it.
+	Semantically same as a dead tuple.  It has state LP_DEAD.
+
+Heap-only tuple
+
+	A heap tuple with no index pointers, which can only be reached
+	from indexes indirectly through its ancestral root tuple.
+	Marked with HEAP_ONLY_TUPLE flag.
+
+HOT-safe
+
+	A proposed tuple update is said to be HOT-safe if it changes
+	none of the tuple's indexed columns.  It will only become an
+	actual HOT update if we can find room on the same page for
+	the new tuple version.
+
+HOT update
+
+	An UPDATE where the new tuple becomes a heap-only tuple, and no
+	new index entries are made.
+
+HOT-updated tuple
+
+	An updated tuple, for which the next tuple in the chain is a
+	heap-only tuple.  Marked with HEAP_HOT_UPDATED flag.
+
+Indexed column
+
+	A column used in an index definition.  The column might not
+	actually be stored in the index --- it could be used in a
+	functional index's expression, or used in a partial index
+	predicate.  HOT treats all these cases alike.
+
+Redirecting line pointer
+
+	A line pointer that points to another line pointer and has no
+	associated tuple.  It has the special lp_flags state LP_REDIRECT,
+	and lp_off is the OffsetNumber of the line pointer it links to.
+	This is used when a root tuple becomes dead but we cannot prune
+	the line pointer because there are non-dead heap-only tuples
+	further down the chain.
+
+Root tuple
+
+	The first tuple in a HOT update chain; the one that indexes point to.
+
+Update chain
+
+	A chain of updated tuples, in which each tuple's ctid points to
+	the next tuple in the chain. A HOT update chain is an update chain
+	(or portion of an update chain) that consists of a root tuple and
+	one or more heap-only tuples.  A complete update chain can contain
+	both HOT and non-HOT (cold) updated tuples.
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index f95592c6aeee..f748dffa75fc 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.230 2007/03/29 00:15:37 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.249.2.6 2010/07/29 16:15:05 rhaas Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -57,6 +57,7 @@
 #include "pgstat.h"
 #include "storage/procarray.h"
 #include "storage/smgr.h"
+#include "utils/datum.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/relcache.h"
@@ -66,8 +67,19 @@
 #include "cdb/cdbfilerepprimary.h"
 #include "cdb/cdbpersistentrecovery.h"
 
+/* GUC variable */
+bool	synchronize_seqscans = true;
+
+
+static HeapScanDesc heap_beginscan_internal(Relation relation,
+						Snapshot snapshot,
+						int nkeys, ScanKey key,
+						bool allow_strat, bool allow_sync,
+						bool is_bitmapscan);
 static XLogRecPtr log_heap_update(Relation reln, Buffer oldbuf,
 		   ItemPointerData from, Buffer newbuf, HeapTuple newtup, bool move);
+static bool HeapSatisfiesHOTUpdate(Relation relation, Bitmapset *hot_attrs,
+					   HeapTuple oldtup, HeapTuple newtup);
 
 
 /* ----------------------------------------------------------------
@@ -80,19 +92,77 @@ static XLogRecPtr log_heap_update(Relation reln, Buffer oldbuf,
  * ----------------
  */
 static void
-initscan(HeapScanDesc scan, ScanKey key)
+initscan(HeapScanDesc scan, ScanKey key, bool is_rescan)
 {
 	int i;
+	bool		allow_strat;
+	bool		allow_sync;
 
 	/*
 	 * Determine the number of blocks we have to scan.
 	 *
 	 * It is sufficient to do this once at scan start, since any tuples added
-	 * while the scan is in progress will be invisible to my transaction
-	 * anyway...
+	 * while the scan is in progress will be invisible to my snapshot anyway.
+	 * (That is not true when using a non-MVCC snapshot.  However, we couldn't
+	 * guarantee to return tuples added after scan start anyway, since they
+	 * might go into pages we already scanned.	To guarantee consistent
+	 * results for a non-MVCC snapshot, the caller must hold some higher-level
+	 * lock that ensures the interesting tuple(s) won't change.)
 	 */
 	scan->rs_nblocks = RelationGetNumberOfBlocks(scan->rs_rd);
 
+	/*
+	 * If the table is large relative to NBuffers, use a bulk-read access
+	 * strategy and enable synchronized scanning (see syncscan.c).	Although
+	 * the thresholds for these features could be different, we make them the
+	 * same so that there are only two behaviors to tune rather than four.
+	 * (However, some callers need to be able to disable one or both of
+	 * these behaviors, independently of the size of the table; also there
+	 * is a GUC variable that can disable synchronized scanning.)
+	 *
+	 * During a rescan, don't make a new strategy object if we don't have to.
+	 */
+	if (!scan->rs_rd->rd_istemp &&
+		scan->rs_nblocks > NBuffers / 4)
+	{
+		allow_strat = scan->rs_allow_strat;
+		allow_sync = scan->rs_allow_sync;
+	}
+	else
+		allow_strat = allow_sync = false;
+
+	if (allow_strat)
+	{
+		if (scan->rs_strategy == NULL)
+			scan->rs_strategy = GetAccessStrategy(BAS_BULKREAD);
+	}
+	else
+	{
+		if (scan->rs_strategy != NULL)
+			FreeAccessStrategy(scan->rs_strategy);
+		scan->rs_strategy = NULL;
+	}
+
+	if (is_rescan)
+	{
+		/*
+		 * If rescan, keep the previous startblock setting so that rewinding
+		 * a cursor doesn't generate surprising results.  Reset the syncscan
+		 * setting, though.
+		 */
+		scan->rs_syncscan = (allow_sync && synchronize_seqscans);
+	}
+	else if (allow_sync && synchronize_seqscans)
+	{
+		scan->rs_syncscan = true;
+		scan->rs_startblock = ss_get_location(scan->rs_rd, scan->rs_nblocks);
+	}
+	else
+	{
+		scan->rs_syncscan = false;
+		scan->rs_startblock = 0;
+	}
+
 	scan->rs_inited = false;
 	scan->rs_ctup.t_data = NULL;
 	ItemPointerSetInvalid(&scan->rs_ctup.t_self);
@@ -119,8 +189,7 @@ initscan(HeapScanDesc scan, ScanKey key)
 	 * Currently, we don't have a stats counter for bitmap heap scans (but the
 	 * underlying bitmap index scans will be counted).
 	 */
-	//if (!scan->rs_bitmapscan)
-		pgstat_count_heap_scan(scan->rs_rd);
+	pgstat_count_heap_scan(scan->rs_rd);
 }
 
 /*
@@ -151,6 +220,26 @@ heapgetpage(HeapScanDesc scan, BlockNumber page, bool backward)
 
 	Assert(page < scan->rs_nblocks);
 
+	/* release previous scan buffer, if any */
+	if (BufferIsValid(scan->rs_cbuf))
+	{
+		ReleaseBuffer(scan->rs_cbuf);
+		scan->rs_cbuf = InvalidBuffer;
+	}
+
+	/*
+	 * Be sure to check for interrupts at least once per page.  Checks at
+	 * higher code levels won't be able to stop a seqscan that encounters
+	 * many pages' worth of consecutive dead tuples.
+	 */
+	CHECK_FOR_INTERRUPTS();
+
+	/* read page using selected strategy */
+	scan->rs_cbuf = ReadBufferWithStrategy(scan->rs_rd,
+										   page,
+										   scan->rs_strategy);
+	scan->rs_cblock = page;
+
 	if (! scan->rs_pageatatime)
 	{
 		scan->rs_cbuf = ReleaseAndReadBuffer(scan->rs_cbuf,
@@ -222,6 +311,12 @@ heapgetpage(HeapScanDesc scan, BlockNumber page, bool backward)
 	buffer = scan->rs_cbuf;
 	snapshot = scan->rs_snapshot;
 
+	/*
+	 * Prune and repair fragmentation for the whole page, if possible.
+	 */
+	Assert(TransactionIdIsValid(RecentGlobalXmin));
+	heap_page_prune_opt(scan->rs_rd, buffer, RecentGlobalXmin);
+
 	/*
 	 * We must hold share lock on the buffer content while examining tuple
 	 * visibility.	Afterwards, however, the tuples we have found to be
@@ -240,7 +335,7 @@ heapgetpage(HeapScanDesc scan, BlockNumber page, bool backward)
 		 lineoff <= lines;
 		 lineoff++, lpp++)
 	{
-		if (ItemIdIsUsed(lpp))
+		if (ItemIdIsNormal(lpp))
 		{
 
 			bool		valid;
@@ -313,6 +408,7 @@ heapgettup(HeapScanDesc scan,
 	Snapshot	snapshot = scan->rs_snapshot;
 	bool		backward = ScanDirectionIsBackward(dir);
 	BlockNumber page;
+	bool		finished;
 	Page		dp;
 	int			lines;
 	OffsetNumber lineoff;
@@ -343,8 +439,8 @@ heapgettup(HeapScanDesc scan,
 				tuple->t_data = NULL;
 				return;
 			}
-			page = 0;			/* first page */
-			heapgetpage(scan, page, ScanDirectionIsBackward(dir));
+			page = scan->rs_startblock; /* first page */
+			heapgetpage(scan, page, ScanDirectionIsForward(dir));
 			lineoff = FirstOffsetNumber;		/* first offnum */
 			scan->rs_inited = true;
 		}
@@ -381,7 +477,19 @@ heapgettup(HeapScanDesc scan,
 				tuple->t_data = NULL;
 				return;
 			}
-			page = scan->rs_nblocks - 1;		/* final page */
+
+			/*
+			 * Disable reporting to syncscan logic in a backwards scan; it's
+			 * not very likely anyone else is doing the same thing at the same
+			 * time, and much more likely that we'll just bollix things for
+			 * forward scanners.
+			 */
+			scan->rs_syncscan = false;
+			/* start from last page of the scan */
+			if (scan->rs_startblock > 0)
+				page = scan->rs_startblock - 1;
+			else
+				page = scan->rs_nblocks - 1;
 			heapgetpage(scan, page, ScanDirectionIsBackward(dir));
 		}
 		else
@@ -455,7 +563,7 @@ heapgettup(HeapScanDesc scan,
 
 		while (linesleft > 0)
 		{
-			if (ItemIdIsUsed(lpp))
+			if (ItemIdIsNormal(lpp))
 			{
 				bool		valid;
 
@@ -510,10 +618,43 @@ heapgettup(HeapScanDesc scan,
 		MIRROREDLOCK_BUFMGR_UNLOCK;
 		// -------- MirroredLock ----------
 		
+		/*
+		 * advance to next/prior page and detect end of scan
+		 */
+		if (backward)
+		{
+			finished = (page == scan->rs_startblock);
+			if (page == 0)
+				page = scan->rs_nblocks;
+			page--;
+		}
+		else
+		{
+			page++;
+			if (page >= scan->rs_nblocks)
+				page = 0;
+			finished = (page == scan->rs_startblock);
+
+			/*
+			 * Report our new scan position for synchronization purposes. We
+			 * don't do that when moving backwards, however. That would just
+			 * mess up any other forward-moving scanners.
+			 *
+			 * Note: we do this before checking for end of scan so that the
+			 * final state of the position hint is back at the start of the
+			 * rel.  That's not strictly necessary, but otherwise when you run
+			 * the same query multiple times the starting position would shift
+			 * a little bit backwards on every invocation, which is confusing.
+			 * We don't guarantee any specific ordering in general, though.
+			 */
+			if (scan->rs_syncscan)
+				ss_report_location(scan->rs_rd, page);
+		}
+
 		/*
 		 * return NULL if we've exhausted all the pages
 		 */
-		if (backward ? (page == 0) : (page + 1 >= scan->rs_nblocks))
+		if (finished)
 		{
 			if (BufferIsValid(scan->rs_cbuf))
 				ReleaseBuffer(scan->rs_cbuf);
@@ -524,8 +665,6 @@ heapgettup(HeapScanDesc scan,
 			return;
 		}
 
-		page = backward ? (page - 1) : (page + 1);
-		
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 		
@@ -573,6 +712,7 @@ heapgettup_pagemode(HeapScanDesc scan,
 	HeapTuple	tuple = &(scan->rs_ctup);
 	bool		backward = ScanDirectionIsBackward(dir);
 	BlockNumber page;
+	bool		finished;
 	Page		dp;
 	int			lines;
 	int			lineindex;
@@ -604,8 +744,9 @@ heapgettup_pagemode(HeapScanDesc scan,
 				tuple->t_data = NULL;
 				return;
 			}
-			page = 0;			/* first page */
-			heapgetpage(scan, page, ScanDirectionIsBackward(dir));
+
+			page = scan->rs_startblock; /* first page */
+			heapgetpage(scan, page, ScanDirectionIsForward(dir));
 			lineindex = 0;
 			scan->rs_inited = true;
 		}
@@ -639,7 +780,19 @@ heapgettup_pagemode(HeapScanDesc scan,
 				tuple->t_data = NULL;
 				return;
 			}
-			page = scan->rs_nblocks - 1;		/* final page */
+
+			/*
+			 * Disable reporting to syncscan logic in a backwards scan; it's
+			 * not very likely anyone else is doing the same thing at the same
+			 * time, and much more likely that we'll just bollix things for
+			 * forward scanners.
+			 */
+			scan->rs_syncscan = false;
+			/* start from last page of the scan */
+			if (scan->rs_startblock > 0)
+				page = scan->rs_startblock - 1;
+			else
+				page = scan->rs_nblocks - 1;
 			heapgetpage(scan, page, ScanDirectionIsBackward(dir));
 		}
 		else
@@ -716,7 +869,7 @@ heapgettup_pagemode(HeapScanDesc scan,
 		{
 			lineoff = scan->rs_vistuples[lineindex];
 			lpp = PageGetItemId(dp, lineoff);
-			Assert(ItemIdIsUsed(lpp));
+			Assert(ItemIdIsNormal(lpp));
 
 			tuple->t_data = (HeapTupleHeader) PageGetItem((Page) dp, lpp);
 			tuple->t_len = ItemIdGetLength(lpp);
@@ -765,6 +918,35 @@ heapgettup_pagemode(HeapScanDesc scan,
 		 * if we get here, it means we've exhausted the items on this page and
 		 * it's time to move to the next.
 		 */
+		if (backward)
+		{
+			finished = (page == scan->rs_startblock);
+			if (page == 0)
+				page = scan->rs_nblocks;
+			page--;
+		}
+		else
+		{
+			page++;
+			if (page >= scan->rs_nblocks)
+				page = 0;
+			finished = (page == scan->rs_startblock);
+
+			/*
+			 * Report our new scan position for synchronization purposes. We
+			 * don't do that when moving backwards, however. That would just
+			 * mess up any other forward-moving scanners.
+			 *
+			 * Note: we do this before checking for end of scan so that the
+			 * final state of the position hint is back at the start of the
+			 * rel.  That's not strictly necessary, but otherwise when you run
+			 * the same query multiple times the starting position would shift
+			 * a little bit backwards on every invocation, which is confusing.
+			 * We don't guarantee any specific ordering in general, though.
+			 */
+			if (scan->rs_syncscan)
+				ss_report_location(scan->rs_rd, page);
+		}
 
 		MIRROREDLOCK_BUFMGR_UNLOCK;
 		// -------- MirroredLock ----------
@@ -772,7 +954,7 @@ heapgettup_pagemode(HeapScanDesc scan,
 		/*
 		 * return NULL if we've exhausted all the pages
 		 */
-		if (backward ? (page == 0) : (page + 1 >= scan->rs_nblocks))
+		if (finished)
 		{
 			if (BufferIsValid(scan->rs_cbuf))
 				ReleaseBuffer(scan->rs_cbuf);
@@ -783,12 +965,13 @@ heapgettup_pagemode(HeapScanDesc scan,
 			return;
 		}
 
-		page = backward ? (page - 1) : (page + 1);
-		
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 		
-		heapgetpage(scan, page, ScanDirectionIsBackward(dir));
+		if (backward)
+			heapgetpage(scan, page, ScanDirectionIsBackward(dir));
+		else
+			heapgetpage(scan, page, ScanDirectionIsForward(dir));
 
 		dp = (Page) BufferGetPage(scan->rs_cbuf);
 		lines = scan->rs_ntuples;
@@ -842,8 +1025,12 @@ relation_open(Oid relationId, LOCKMODE lockmode)
 				 errdetail("This can be validly caused by a concurrent delete operation on this object.")));
 	}
 
+	/* Make note that we've accessed a temporary relation */
+	if (r->rd_istemp)
+		MyXactAccessedTempRel = true;
+
 	pgstat_initstats(r);
-	
+
 	return r;
 }
 
@@ -924,6 +1111,10 @@ try_relation_open(Oid relationId, LOCKMODE lockmode, bool noWait)
 				 errdetail("This can be validly caused by a concurrent delete operation on this object.")));
 	}
 
+	/* Make note that we've accessed a temporary relation */
+	if (r->rd_istemp)
+		MyXactAccessedTempRel = true;
+
 	pgstat_initstats(r);
 
 	return r;
@@ -1113,6 +1304,12 @@ relation_open_nowait(Oid relationId, LOCKMODE lockmode)
 				 errdetail("This can be validly caused by a concurrent delete operation on this object.")));
 	}
 
+	/* Make note that we've accessed a temporary relation */
+	if (r->rd_istemp)
+		MyXactAccessedTempRel = true;
+
+	pgstat_initstats(r);
+
 	return r;
 }
 
@@ -1359,11 +1556,48 @@ try_heap_openrv(const RangeVar *relation, LOCKMODE lockmode, bool noWait)
 
 /* ----------------
  *		heap_beginscan	- begin relation scan
+ *
+ * heap_beginscan_strat offers an extended API that lets the caller control
+ * whether a nondefault buffer access strategy can be used, and whether
+ * syncscan can be chosen (possibly resulting in the scan not starting from
+ * block zero).  Both of these default to TRUE with plain heap_beginscan.
+ *
+ * heap_beginscan_bm is an alternative entry point for setting up a
+ * HeapScanDesc for a bitmap heap scan.  Although that scan technology is
+ * really quite unlike a standard seqscan, there is just enough commonality
+ * to make it worth using the same data structure.
  * ----------------
  */
 HeapScanDesc
 heap_beginscan(Relation relation, Snapshot snapshot,
 			   int nkeys, ScanKey key)
+{
+	return heap_beginscan_internal(relation, snapshot, nkeys, key,
+								   true, true, false);
+}
+
+HeapScanDesc
+heap_beginscan_strat(Relation relation, Snapshot snapshot,
+					 int nkeys, ScanKey key,
+					 bool allow_strat, bool allow_sync)
+{
+	return heap_beginscan_internal(relation, snapshot, nkeys, key,
+								   allow_strat, allow_sync, false);
+}
+
+HeapScanDesc
+heap_beginscan_bm(Relation relation, Snapshot snapshot,
+				  int nkeys, ScanKey key)
+{
+	return heap_beginscan_internal(relation, snapshot, nkeys, key,
+								   false, false, true);
+}
+
+static HeapScanDesc
+heap_beginscan_internal(Relation relation, Snapshot snapshot,
+						int nkeys, ScanKey key,
+						bool allow_strat, bool allow_sync,
+						bool is_bitmapscan)
 {
 	HeapScanDesc scan;
 
@@ -1384,6 +1618,10 @@ heap_beginscan(Relation relation, Snapshot snapshot,
 	scan->rs_rd = relation;
 	scan->rs_snapshot = snapshot;
 	scan->rs_nkeys = nkeys;
+	scan->rs_bitmapscan = is_bitmapscan;
+	scan->rs_strategy = NULL;	/* set in initscan */
+	scan->rs_allow_strat = allow_strat;
+	scan->rs_allow_sync = allow_sync;
 
 	/*
 	 * we can use page-at-a-time mode if it's an MVCC-safe snapshot
@@ -1399,8 +1637,7 @@ heap_beginscan(Relation relation, Snapshot snapshot,
 	else
 		scan->rs_key = NULL;
 
-
-	initscan(scan, key);
+	initscan(scan, key, false);
 
 	return scan;
 }
@@ -1441,7 +1678,7 @@ heap_rescan(HeapScanDesc scan,
 	/*
 	 * reinitialize scan descriptor
 	 */
-	initscan(scan, key);
+	initscan(scan, key, true);
 }
 
 /* ----------------
@@ -1468,6 +1705,9 @@ heap_endscan(HeapScanDesc scan)
 	if (scan->rs_key)
 		pfree(scan->rs_key);
 
+	if (scan->rs_strategy != NULL)
+		FreeAccessStrategy(scan->rs_strategy);
+
 	pfree(scan);
 }
 
@@ -1662,6 +1902,13 @@ heap_getnextx(HeapScanDesc scan, ScanDirection dir,
  * and return it in *userbuf (so the caller must eventually unpin it); when
  * keep_buf = false, the pin is released and *userbuf is set to InvalidBuffer.
  *
+ * stats_relation is the relation to charge the heap_fetch operation against
+ * for statistical purposes.  (This could be the heap rel itself, an
+ * associated index, or NULL to not count the fetch at all.)
+ *
+ * heap_fetch does not follow HOT chains: only the exact TID requested will
+ * be fetched.
+ *
  * It is somewhat inconsistent that we ereport() on invalid block number but
  * return false on invalid item number.  There are a couple of reasons though.
  * One is that the caller can relatively easily check the block number for
@@ -1771,7 +2018,7 @@ heap_release_fetch(Relation relation,
 	/*
 	 * Must check for deleted tuple.
 	 */
-	if (!ItemIdIsUsed(lp))
+	if (!ItemIdIsNormal(lp))
 	{
 		LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 		
@@ -1832,6 +2079,146 @@ heap_release_fetch(Relation relation,
 	return false;
 }
 
+/*
+ *	heap_hot_search_buffer	- search HOT chain for tuple satisfying snapshot
+ *
+ * On entry, *tid is the TID of a tuple (either a simple tuple, or the root
+ * of a HOT chain), and buffer is the buffer holding this tuple.  We search
+ * for the first chain member satisfying the given snapshot.  If one is
+ * found, we update *tid to reference that tuple's offset number, and
+ * return TRUE.  If no match, return FALSE without modifying *tid.
+ *
+ * If all_dead is not NULL, we check non-visible tuples to see if they are
+ * globally dead; *all_dead is set TRUE if all members of the HOT chain
+ * are vacuumable, FALSE if not.
+ *
+ * Unlike heap_fetch, the caller must already have pin and (at least) share
+ * lock on the buffer; it is still pinned/locked at exit.  Also unlike
+ * heap_fetch, we do not report any pgstats count; caller may do so if wanted.
+ */
+bool
+heap_hot_search_buffer(Relation rel, ItemPointer tid, Buffer buffer, Snapshot snapshot,
+					   bool *all_dead)
+{
+	Page		dp = (Page) BufferGetPage(buffer);
+	TransactionId prev_xmax = InvalidTransactionId;
+	OffsetNumber offnum;
+	bool		at_chain_start;
+
+	if (all_dead)
+		*all_dead = true;
+
+	Assert(TransactionIdIsValid(RecentGlobalXmin));
+
+	Assert(ItemPointerGetBlockNumber(tid) == BufferGetBlockNumber(buffer));
+	offnum = ItemPointerGetOffsetNumber(tid);
+	at_chain_start = true;
+
+	/* Scan through possible multiple members of HOT-chain */
+	for (;;)
+	{
+		ItemId		lp;
+		HeapTupleData heapTuple;
+
+		/* check for bogus TID */
+		if (offnum < FirstOffsetNumber || offnum > PageGetMaxOffsetNumber(dp))
+			break;
+
+		lp = PageGetItemId(dp, offnum);
+
+		/* check for unused, dead, or redirected items */
+		if (!ItemIdIsNormal(lp))
+		{
+			/* We should only see a redirect at start of chain */
+			if (ItemIdIsRedirected(lp) && at_chain_start)
+			{
+				/* Follow the redirect */
+				offnum = ItemIdGetRedirect(lp);
+				at_chain_start = false;
+				continue;
+			}
+			/* else must be end of chain */
+			break;
+		}
+
+		heapTuple.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
+		heapTuple.t_len = ItemIdGetLength(lp);
+
+		/*
+		 * Shouldn't see a HEAP_ONLY tuple at chain start.
+		 */
+		if (at_chain_start && HeapTupleIsHeapOnly(&heapTuple))
+			break;
+
+		/*
+		 * The xmin should match the previous xmax value, else chain is
+		 * broken.
+		 */
+		if (TransactionIdIsValid(prev_xmax) &&
+			!TransactionIdEquals(prev_xmax,
+								 HeapTupleHeaderGetXmin(heapTuple.t_data)))
+			break;
+
+		/* If it's visible per the snapshot, we must return it */
+		if (HeapTupleSatisfiesVisibility(rel, &heapTuple, snapshot, buffer))
+		{
+			ItemPointerSetOffsetNumber(tid, offnum);
+			if (all_dead)
+				*all_dead = false;
+			return true;
+		}
+
+		/*
+		 * If we can't see it, maybe no one else can either.  At caller
+		 * request, check whether all chain members are dead to all
+		 * transactions.
+		 */
+		if (all_dead && *all_dead &&
+			HeapTupleSatisfiesVacuum(rel, heapTuple.t_data, RecentGlobalXmin,
+									 buffer) != HEAPTUPLE_DEAD)
+			*all_dead = false;
+
+		/*
+		 * Check to see if HOT chain continues past this tuple; if so fetch
+		 * the next offnum and loop around.
+		 */
+		if (HeapTupleIsHotUpdated(&heapTuple))
+		{
+			Assert(ItemPointerGetBlockNumber(&heapTuple.t_data->t_ctid) ==
+				   ItemPointerGetBlockNumber(tid));
+			offnum = ItemPointerGetOffsetNumber(&heapTuple.t_data->t_ctid);
+			at_chain_start = false;
+			prev_xmax = HeapTupleHeaderGetXmax(heapTuple.t_data);
+		}
+		else
+			break;				/* end of chain */
+	}
+
+	return false;
+}
+
+/*
+ *	heap_hot_search		- search HOT chain for tuple satisfying snapshot
+ *
+ * This has the same API as heap_hot_search_buffer, except that the caller
+ * does not provide the buffer containing the page, rather we access it
+ * locally.
+ */
+bool
+heap_hot_search(ItemPointer tid, Relation relation, Snapshot snapshot,
+				bool *all_dead)
+{
+	bool		result;
+	Buffer		buffer;
+
+	buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
+	LockBuffer(buffer, BUFFER_LOCK_SHARE);
+	result = heap_hot_search_buffer(relation, tid, buffer, snapshot, all_dead);
+	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
+	ReleaseBuffer(buffer);
+	return result;
+}
+
 /*
  *	heap_get_latest_tid -  get the latest tid of a specified tuple
  *
@@ -1916,7 +2303,7 @@ heap_get_latest_tid(Relation relation,
 			break;
 		}
 		lp = PageGetItemId(dp, offnum);
-		if (!ItemIdIsUsed(lp))
+		if (!ItemIdIsNormal(lp))
 		{
 			UnlockReleaseBuffer(buffer);
 
@@ -1978,6 +2365,34 @@ heap_get_latest_tid(Relation relation,
 	}							/* end of loop */
 }
 
+
+/*
+ * UpdateXmaxHintBits - update tuple hint bits after xmax transaction ends
+ *
+ * This is called after we have waited for the XMAX transaction to terminate.
+ * If the transaction aborted, we guarantee the XMAX_INVALID hint bit will
+ * be set on exit.	If the transaction committed, we set the XMAX_COMMITTED
+ * hint bit if possible --- but beware that that may not yet be possible,
+ * if the transaction committed asynchronously.  Hence callers should look
+ * only at XMAX_INVALID.
+ */
+static void
+UpdateXmaxHintBits(HeapTupleHeader tuple, Buffer buffer, TransactionId xid, Relation rel)
+{
+	Assert(TransactionIdEquals(HeapTupleHeaderGetXmax(tuple), xid));
+
+	if (!(tuple->t_infomask & (HEAP_XMAX_COMMITTED | HEAP_XMAX_INVALID)))
+	{
+		if (TransactionIdDidCommit(xid))
+			HeapTupleSetHintBits(tuple, buffer, rel, HEAP_XMAX_COMMITTED,
+								 xid);
+		else
+			HeapTupleSetHintBits(tuple, buffer, rel, HEAP_XMAX_INVALID,
+								 InvalidTransactionId);
+	}
+}
+
+
 /*
  * MUST BE CALLED IN CRITICAL SECTION!
  */
@@ -2052,9 +2467,8 @@ heap_log_tuple_insert(Relation rel, Buffer buffer, HeapTuple tup, bool isFrozen)
  * If use_wal is false, the new tuple is not logged in WAL, even for a
  * non-temp relation.  Safe usage of this behavior requires that we arrange
  * that all new tuples go into new pages not containing any tuples from other
- * transactions, that the relation gets fsync'd before commit, and that the
- * transaction emits at least one WAL record to ensure RecordTransactionCommit
- * will decide to WAL-log the commit.  (See also heap_sync() comments)
+ * transactions, and that the relation gets fsync'd before commit.
+ * (See also heap_sync() comments)
  *
  * use_fsm is passed directly to RelationGetBufferForTuple, which see for
  * more info.
@@ -2117,6 +2531,7 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	tup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
 	if (isFrozen)
 		tup->t_data->t_infomask |= HEAP_XMIN_COMMITTED;
+	tup->t_data->t_infomask2 &= ~(HEAP2_XACT_MASK);
 	tup->t_data->t_infomask |= HEAP_XMAX_INVALID;
 	HeapTupleHeaderSetXmin(tup->t_data, xid);
 	HeapTupleHeaderSetCmin(tup->t_data, cid);
@@ -2129,7 +2544,13 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	 * Note: below this point, heaptup is the data we actually intend to store
 	 * into the relation; tup is the caller's original untoasted data.
 	 */
-	if (HeapTupleHasExternal(tup) || tup->t_len > TOAST_TUPLE_THRESHOLD)
+	if (relation->rd_rel->relkind != RELKIND_RELATION)
+	{
+		/* toast table entries should never be recursively toasted */
+		Assert(!HeapTupleHasExternal(tup));
+		heaptup = tup;
+	}
+	else if (HeapTupleHasExternal(tup) || tup->t_len > TOAST_TUPLE_THRESHOLD)
 		heaptup = toast_insert_or_update(relation, tup, NULL, NULL,
 										 TOAST_TUPLE_TARGET, isFrozen,
 										 use_wal, use_fsm);
@@ -2146,15 +2567,21 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 
 	RelationPutHeapTuple(relation, buffer, heaptup);
 
+	/*
+	 * XXX Should we set PageSetPrunable on this page ?
+	 *
+	 * The inserting transaction may eventually abort thus making this tuple
+	 * DEAD and hence available for pruning. Though we don't want to optimize
+	 * for aborts, if no other tuple in this page is UPDATEd/DELETEd, the
+	 * aborted tuple will never be pruned until next vacuum is triggered.
+	 *
+	 * If you do add PageSetPrunable here, add it in heap_xlog_insert too.
+	 */
+
 	MarkBufferDirty(buffer);
 
 	/* XLOG stuff */
-	if (relation->rd_istemp)
-	{
-		/* No XLOG record, but still need to flag that XID exists on disk */
-		MyXactMadeTempRelUpdate = true;
-	}
-	else if (use_wal)
+	if (use_wal && !relation->rd_istemp)
 	{
 		heap_log_tuple_insert(relation, buffer, heaptup, isFrozen);
 	}
@@ -2207,8 +2634,8 @@ simple_heap_insert(Relation relation, HeapTuple tup)
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_ENTER;
 
-	result = heap_insert(relation, tup, GetCurrentCommandId(),
-					   true, true, GetCurrentTransactionId());
+	result = heap_insert(relation, tup, GetCurrentCommandId(true),
+						 true, true, GetCurrentTransactionId());
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_EXIT;
 
@@ -2233,7 +2660,7 @@ frozen_heap_insert(Relation relation, HeapTuple tup)
 	
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_ENTER;
 
-	result = heap_insert(relation, tup, GetCurrentCommandId(),
+	result = heap_insert(relation, tup, GetCurrentCommandId(true),
 					   true, true, FrozenTransactionId);
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_EXIT;
@@ -2254,7 +2681,7 @@ frozen_heap_insert_directed(
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_ENTER;
 
 	relation->rd_targblock = blockNum;
-	result = heap_insert(relation, tup, GetCurrentCommandId(),
+	result = heap_insert(relation, tup, GetCurrentCommandId(true),
 					   /* use_wal */ true, /* use_fsm */ false, 
 					   FrozenTransactionId);
 
@@ -2344,6 +2771,7 @@ heap_delete(Relation relation, ItemPointer tid,
 
 	dp = (PageHeader) BufferGetPage(buffer);
 	lp = PageGetItemId(dp, ItemPointerGetOffsetNumber(tid));
+	Assert(ItemIdIsNormal(lp));
 
 	tp.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	tp.t_len = ItemIdGetLength(lp);
@@ -2448,16 +2876,8 @@ heap_delete(Relation relation, ItemPointer tid,
 									 xwait))
 				goto l1;
 
-			/* Otherwise we can mark it committed or aborted */
-			if (!(tp.t_data->t_infomask & (HEAP_XMAX_COMMITTED |
-										   HEAP_XMAX_INVALID)))
-			{
-				if (TransactionIdDidCommit(xwait))
-					tp.t_data->t_infomask |= HEAP_XMAX_COMMITTED;
-				else
-					tp.t_data->t_infomask |= HEAP_XMAX_INVALID;
-				SetBufferCommitInfoNeedsSave(buffer);
-			}
+			/* Otherwise check if it committed or aborted */
+			UpdateXmaxHintBits(tp.t_data, buffer, xwait, relation);
 		}
 
 		/*
@@ -2474,7 +2894,7 @@ heap_delete(Relation relation, ItemPointer tid,
 	if (crosscheck != InvalidSnapshot && result == HeapTupleMayBeUpdated)
 	{
 		/* Perform additional check for serializable RI updates */
-		if (!HeapTupleSatisfiesSnapshot(relation, tp.t_data, crosscheck, buffer))
+		if (!HeapTupleSatisfiesVisibility(relation, &tp, crosscheck, buffer))
 			result = HeapTupleUpdated;
 	}
 
@@ -2501,12 +2921,22 @@ heap_delete(Relation relation, ItemPointer tid,
 
 	START_CRIT_SECTION();
 
+	/*
+	 * If this transaction commits, the tuple will become DEAD sooner or
+	 * later.  Set flag that this page is a candidate for pruning once our xid
+	 * falls below the OldestXmin horizon.	If the transaction finally aborts,
+	 * the subsequent page pruning will be a no-op and the hint will be
+	 * cleared.
+	 */
+	PageSetPrunable(dp, xid);
+
 	/* store transaction information of xact deleting the tuple */
 	tp.t_data->t_infomask &= ~(HEAP_XMAX_COMMITTED |
 							   HEAP_XMAX_INVALID |
 							   HEAP_XMAX_IS_MULTI |
 							   HEAP_IS_LOCKED |
 							   HEAP_MOVED);
+	HeapTupleHeaderClearHotUpdated(tp.t_data);
 	HeapTupleHeaderSetXmax(tp.t_data, xid);
 	HeapTupleHeaderSetCmax(tp.t_data, cid, iscombo);
 	/* Make sure there is no forward chain link in t_ctid */
@@ -2538,11 +2968,6 @@ heap_delete(Relation relation, ItemPointer tid,
 		PageSetLSN(dp, recptr);
 		PageSetTLI(dp, ThisTimeLineID);
 	}
-	else
-	{
-		/* No XLOG record, but still need to flag that XID exists on disk */
-		MyXactMadeTempRelUpdate = true;
-	}
 
 	END_CRIT_SECTION();
 
@@ -2557,7 +2982,12 @@ heap_delete(Relation relation, ItemPointer tid,
 	 * because we need to look at the contents of the tuple, but it's OK to
 	 * release the content lock on the buffer first.
 	 */
-	if (HeapTupleHasExternal(&tp))
+	if (relation->rd_rel->relkind != RELKIND_RELATION)
+	{
+		/* toast table entries should never be recursively toasted */
+		Assert(!HeapTupleHasExternal(&tp));
+	}
+	else if (HeapTupleHasExternal(&tp))
 		toast_delete(relation, &tp, NULL);
 
 	/*
@@ -2602,7 +3032,7 @@ simple_heap_delete(Relation relation, ItemPointer tid)
 
 	result = heap_delete(relation, tid,
 						 &update_ctid, &update_xmax,
-						 GetCurrentCommandId(), InvalidSnapshot,
+						 GetCurrentCommandId(true), InvalidSnapshot,
 						 true /* wait for commit */ );
 	switch (result)
 	{
@@ -2637,6 +3067,7 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 
 	HTSU_Result result;
 	TransactionId xid = GetCurrentTransactionId();
+	Bitmapset  *hot_attrs;
 	ItemId		lp;
 	HeapTupleData oldtup;
 	HeapTuple	heaptup;
@@ -2649,6 +3080,7 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 				pagefree;
 	bool		have_tuple_lock = false;
 	bool		iscombo;
+	bool		use_hot_update = false;
 
 	// Fetch gp_persistent_relation_node information that will be added to XLOG record.
 	RelationFetchGpRelationNodeForXLog(relation);
@@ -2659,11 +3091,26 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
+	/*
+	 * Fetch the list of attributes to be checked for HOT update.  This is
+	 * wasted effort if we fail to update or have to put the new tuple on a
+	 * different page.	But we must compute the list before obtaining buffer
+	 * lock --- in the worst case, if we are doing an update on one of the
+	 * relevant system catalogs, we could deadlock if we try to fetch the list
+	 * later.  In any case, the relcache caches the data so this is usually
+	 * pretty cheap.
+	 *
+	 * Note that we get a copy here, so we need not worry about relcache flush
+	 * happening midway through.
+	 */
+	hot_attrs = RelationGetIndexAttrBitmap(relation);
+
 	buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(otid));
 	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
 
 	dp = (PageHeader) BufferGetPage(buffer);
 	lp = PageGetItemId(dp, ItemPointerGetOffsetNumber(otid));
+	Assert(ItemIdIsNormal(lp));
 
 	oldtup.t_data = (HeapTupleHeader) PageGetItem(dp, lp);
 	oldtup.t_len = ItemIdGetLength(lp);
@@ -2774,16 +3221,8 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 									 xwait))
 				goto l2;
 
-			/* Otherwise we can mark it committed or aborted */
-			if (!(oldtup.t_data->t_infomask & (HEAP_XMAX_COMMITTED |
-											   HEAP_XMAX_INVALID)))
-			{
-				if (TransactionIdDidCommit(xwait))
-					oldtup.t_data->t_infomask |= HEAP_XMAX_COMMITTED;
-				else
-					oldtup.t_data->t_infomask |= HEAP_XMAX_INVALID;
-				SetBufferCommitInfoNeedsSave(buffer);
-			}
+			/* Otherwise check if it committed or aborted */
+			UpdateXmaxHintBits(oldtup.t_data, buffer, xwait, relation);
 		}
 
 		/*
@@ -2800,7 +3239,7 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 	if (crosscheck != InvalidSnapshot && result == HeapTupleMayBeUpdated)
 	{
 		/* Perform additional check for serializable RI updates */
-		if (!HeapTupleSatisfiesSnapshot(relation, oldtup.t_data, crosscheck, buffer))
+		if (!HeapTupleSatisfiesVisibility(relation, &oldtup, crosscheck, buffer))
 			result = HeapTupleUpdated;
 	}
 
@@ -2825,6 +3264,7 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 		
 		if (have_tuple_lock)
 			UnlockTuple(relation, &(oldtup.t_self), ExclusiveLock);
+		bms_free(hot_attrs);
 		return result;
 	}
 
@@ -2844,6 +3284,7 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 	}
 
 	newtup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
+	newtup->t_data->t_infomask2 &= ~(HEAP2_XACT_MASK);
 	newtup->t_data->t_infomask |= (HEAP_XMAX_INVALID | HEAP_UPDATED);
 	HeapTupleHeaderSetXmin(newtup->t_data, xid);
 	HeapTupleHeaderSetCmin(newtup->t_data, cid);
@@ -2866,21 +3307,32 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 	 * We need to invoke the toaster if there are already any out-of-line
 	 * toasted values present, or if the new tuple is over-threshold.
 	 */
-	need_toast = (HeapTupleHasExternal(&oldtup) ||
-				  HeapTupleHasExternal(newtup) ||
-				  newtup->t_len > TOAST_TUPLE_THRESHOLD);
+	if (relation->rd_rel->relkind != RELKIND_RELATION)
+	{
+		/* toast table entries should never be recursively toasted */
+		Assert(!HeapTupleHasExternal(&oldtup));
+		Assert(!HeapTupleHasExternal(newtup));
+		need_toast = false;
+	}
+	else
+		need_toast = (HeapTupleHasExternal(&oldtup) ||
+					  HeapTupleHasExternal(newtup) ||
+					  newtup->t_len > TOAST_TUPLE_THRESHOLD);
 
-	pagefree = PageGetFreeSpace((Page) dp);
+	pagefree = PageGetHeapFreeSpace((Page) dp);
 
 	newtupsize = MAXALIGN(newtup->t_len);
 
 	if (need_toast || newtupsize > pagefree)
 	{
+		/* Clear obsolete visibility flags ... */
 		oldtup.t_data->t_infomask &= ~(HEAP_XMAX_COMMITTED |
 									   HEAP_XMAX_INVALID |
 									   HEAP_XMAX_IS_MULTI |
 									   HEAP_IS_LOCKED |
 									   HEAP_MOVED);
+		HeapTupleClearHotUpdated(&oldtup);
+		/* ... and store info about transaction updating this tuple */
 		HeapTupleHeaderSetXmax(oldtup.t_data, xid);
 		HeapTupleHeaderSetCmax(oldtup.t_data, cid, iscombo);
 		/* temporarily make it look not-updated */
@@ -2900,6 +3352,7 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 		 */
 		if (need_toast)
 		{
+			/* Note we always use WAL and FSM during updates */
 			heaptup = toast_insert_or_update(relation, newtup, &oldtup, NULL,
 											 TOAST_TUPLE_TARGET, false, true, true);
 			newtupsize = MAXALIGN(heaptup->t_len);
@@ -2939,7 +3392,7 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 			/* Re-acquire the lock on the old tuple's page. */
 			LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
 			/* Re-check using the up-to-date free space */
-			pagefree = PageGetFreeSpace((Page) dp);
+			pagefree = PageGetHeapFreeSpace((Page) dp);
 			if (newtupsize > pagefree)
 			{
 				/*
@@ -2972,18 +3425,67 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 	 * one pin is held.
 	 */
 
+	if (newbuf == buffer)
+	{
+		/*
+		 * Since the new tuple is going into the same page, we might be able
+		 * to do a HOT update.	Check if any of the index columns have been
+		 * changed.  If not, then HOT update is possible.
+		 */
+		if (HeapSatisfiesHOTUpdate(relation, hot_attrs, &oldtup, heaptup))
+			use_hot_update = true;
+	}
+	else
+	{
+		/* Set a hint that the old page could use prune/defrag */
+		PageSetFull(dp);
+	}
+
 	/* NO EREPORT(ERROR) from here till changes are logged */
 	START_CRIT_SECTION();
 
+	/*
+	 * If this transaction commits, the old tuple will become DEAD sooner or
+	 * later.  Set flag that this page is a candidate for pruning once our xid
+	 * falls below the OldestXmin horizon.	If the transaction finally aborts,
+	 * the subsequent page pruning will be a no-op and the hint will be
+	 * cleared.
+	 *
+	 * XXX Should we set hint on newbuf as well?  If the transaction aborts,
+	 * there would be a prunable tuple in the newbuf; but for now we choose
+	 * not to optimize for aborts.	Note that heap_xlog_update must be kept in
+	 * sync if this decision changes.
+	 */
+	PageSetPrunable(dp, xid);
+
+	if (use_hot_update)
+	{
+		/* Mark the old tuple as HOT-updated */
+		HeapTupleSetHotUpdated(&oldtup);
+		/* And mark the new tuple as heap-only */
+		HeapTupleSetHeapOnly(heaptup);
+		/* Mark the caller's copy too, in case different from heaptup */
+		HeapTupleSetHeapOnly(newtup);
+	}
+	else
+	{
+		/* Make sure tuples are correctly marked as not-HOT */
+		HeapTupleClearHotUpdated(&oldtup);
+		HeapTupleClearHeapOnly(heaptup);
+		HeapTupleClearHeapOnly(newtup);
+	}
+
 	RelationPutHeapTuple(relation, newbuf, heaptup);	/* insert new tuple */
 
 	if (!already_marked)
 	{
+		/* Clear obsolete visibility flags ... */
 		oldtup.t_data->t_infomask &= ~(HEAP_XMAX_COMMITTED |
 									   HEAP_XMAX_INVALID |
 									   HEAP_XMAX_IS_MULTI |
 									   HEAP_IS_LOCKED |
 									   HEAP_MOVED);
+		/* ... and store info about transaction updating this tuple */
 		HeapTupleHeaderSetXmax(oldtup.t_data, xid);
 		HeapTupleHeaderSetCmax(oldtup.t_data, cid, iscombo);
 	}
@@ -3009,11 +3511,6 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 		PageSetLSN(BufferGetPage(buffer), recptr);
 		PageSetTLI(BufferGetPage(buffer), ThisTimeLineID);
 	}
-	else
-	{
-		/* No XLOG record, but still need to flag that XID exists on disk */
-		MyXactMadeTempRelUpdate = true;
-	}
 
 	END_CRIT_SECTION();
 
@@ -3062,6 +3559,8 @@ heap_update_internal(Relation relation, ItemPointer otid, HeapTuple newtup,
 		heap_freetuple(heaptup);
 	}
 
+	bms_free(hot_attrs);
+
 	return HeapTupleMayBeUpdated;
 }
 
@@ -3116,6 +3615,116 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 	return result;
 }
 
+/*
+ * Check if the specified attribute's value is same in both given tuples.
+ * Subroutine for HeapSatisfiesHOTUpdate.
+ */
+static bool
+heap_tuple_attr_equals(TupleDesc tupdesc, int attrnum,
+					   HeapTuple tup1, HeapTuple tup2)
+{
+	Datum		value1,
+				value2;
+	bool		isnull1,
+				isnull2;
+	Form_pg_attribute att;
+
+	/*
+	 * If it's a whole-tuple reference, say "not equal".  It's not really
+	 * worth supporting this case, since it could only succeed after a no-op
+	 * update, which is hardly a case worth optimizing for.
+	 */
+	if (attrnum == 0)
+		return false;
+
+	/*
+	 * Likewise, automatically say "not equal" for any system attribute other
+	 * than OID and tableOID; we cannot expect these to be consistent in a HOT
+	 * chain, or even to be set correctly yet in the new tuple.
+	 */
+	if (attrnum < 0)
+	{
+		if (attrnum != ObjectIdAttributeNumber &&
+			attrnum != TableOidAttributeNumber)
+			return false;
+	}
+
+	/*
+	 * Extract the corresponding values.  XXX this is pretty inefficient if
+	 * there are many indexed columns.	Should HeapSatisfiesHOTUpdate do a
+	 * single heap_deform_tuple call on each tuple, instead?  But that doesn't
+	 * work for system columns ...
+	 */
+	value1 = heap_getattr(tup1, attrnum, tupdesc, &isnull1);
+	value2 = heap_getattr(tup2, attrnum, tupdesc, &isnull2);
+
+	/*
+	 * If one value is NULL and other is not, then they are certainly not
+	 * equal
+	 */
+	if (isnull1 != isnull2)
+		return false;
+
+	/*
+	 * If both are NULL, they can be considered equal.
+	 */
+	if (isnull1)
+		return true;
+
+	/*
+	 * We do simple binary comparison of the two datums.  This may be overly
+	 * strict because there can be multiple binary representations for the
+	 * same logical value.	But we should be OK as long as there are no false
+	 * positives.  Using a type-specific equality operator is messy because
+	 * there could be multiple notions of equality in different operator
+	 * classes; furthermore, we cannot safely invoke user-defined functions
+	 * while holding exclusive buffer lock.
+	 */
+	if (attrnum <= 0)
+	{
+		/* The only allowed system columns are OIDs, so do this */
+		return (DatumGetObjectId(value1) == DatumGetObjectId(value2));
+	}
+	else
+	{
+		Assert(attrnum <= tupdesc->natts);
+		att = tupdesc->attrs[attrnum - 1];
+		return datumIsEqual(value1, value2, att->attbyval, att->attlen);
+	}
+}
+
+/*
+ * Check if the old and new tuples represent a HOT-safe update. To be able
+ * to do a HOT update, we must not have changed any columns used in index
+ * definitions.
+ *
+ * The set of attributes to be checked is passed in (we dare not try to
+ * compute it while holding exclusive buffer lock...)  NOTE that hot_attrs
+ * is destructively modified!  That is OK since this is invoked at most once
+ * by heap_update().
+ *
+ * Returns true if safe to do HOT update.
+ */
+static bool
+HeapSatisfiesHOTUpdate(Relation relation, Bitmapset *hot_attrs,
+					   HeapTuple oldtup, HeapTuple newtup)
+{
+	int			attrnum;
+
+	while ((attrnum = bms_first_member(hot_attrs)) >= 0)
+	{
+		/* Adjust for system attributes */
+		attrnum += FirstLowInvalidHeapAttributeNumber;
+
+		/* If the attribute value has changed, we can't do HOT update */
+		if (!heap_tuple_attr_equals(RelationGetDescr(relation), attrnum,
+									oldtup, newtup))
+			return false;
+	}
+
+	return true;
+}
+
 /*
  *	simple_heap_update - replace a tuple
  *
@@ -3138,7 +3747,7 @@ simple_heap_update(Relation relation, ItemPointer otid, HeapTuple tup)
 	result = heap_update_internal(
 						 relation, otid, tup,
 						 &update_ctid, &update_xmax,
-						 GetCurrentCommandId(), InvalidSnapshot,
+						 GetCurrentCommandId(true), InvalidSnapshot,
 						 true /* wait for commit */,
 						 /* simple */ true);
 	switch (result)
@@ -3261,7 +3870,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple, Buffer *buffer,
 
 	dp = (PageHeader) BufferGetPage(*buffer);
 	lp = PageGetItemId(dp, ItemPointerGetOffsetNumber(tid));
-	Assert(ItemIdIsUsed(lp));
+	Assert(ItemIdIsNormal(lp));
 
 	tuple->t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
 	tuple->t_len = ItemIdGetLength(lp);
@@ -3437,16 +4046,8 @@ heap_lock_tuple(Relation relation, HeapTuple tuple, Buffer *buffer,
 									 xwait))
 				goto l3;
 
-			/* Otherwise we can mark it committed or aborted */
-			if (!(tuple->t_data->t_infomask & (HEAP_XMAX_COMMITTED |
-											   HEAP_XMAX_INVALID)))
-			{
-				if (TransactionIdDidCommit(xwait))
-					tuple->t_data->t_infomask |= HEAP_XMAX_COMMITTED;
-				else
-					tuple->t_data->t_infomask |= HEAP_XMAX_INVALID;
-				SetBufferCommitInfoNeedsSave(*buffer);
-			}
+			/* Otherwise check if it committed or aborted */
+			UpdateXmaxHintBits(tuple->t_data, *buffer, xwait, relation);
 		}
 
 		/*
@@ -3607,6 +4208,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple, Buffer *buffer,
 	 * possibly generating a useless combo CID.
 	 */
 	tuple->t_data->t_infomask = new_infomask;
+	HeapTupleHeaderClearHotUpdated(tuple->t_data);
 	HeapTupleHeaderSetXmax(tuple->t_data, xid);
 	/* Make sure there is no forward chain link in t_ctid */
 	tuple->t_data->t_ctid = *tid;
@@ -3651,11 +4253,6 @@ heap_lock_tuple(Relation relation, HeapTuple tuple, Buffer *buffer,
 		PageSetLSN(dp, recptr);
 		PageSetTLI(dp, ThisTimeLineID);
 	}
-	else
-	{
-		/* No XLOG record, but still need to flag that XID exists on disk */
-		MyXactMadeTempRelUpdate = true;
-	}
 
 	END_CRIT_SECTION();
 
@@ -3691,11 +4288,10 @@ heap_lock_tuple(Relation relation, HeapTuple tuple, Buffer *buffer,
  * over the target tuple.  Also, tuple->t_self identifies the target tuple.
  */
 static void
-heap_inplace_update_internal(Relation relation, HeapTuple tuple, TransactionId xid)
+heap_inplace_update_internal(Relation relation, HeapTuple tuple, bool freeze)
 {
 	MIRROREDLOCK_BUFMGR_DECLARE;
 
-	bool		isFrozen = (xid == FrozenTransactionId);
 	Buffer		buffer;
 	Page		page;
 	OffsetNumber offnum;
@@ -3721,7 +4317,7 @@ heap_inplace_update_internal(Relation relation, HeapTuple tuple, TransactionId x
 	if (PageGetMaxOffsetNumber(page) >= offnum)
 		lp = PageGetItemId(page, offnum);
 
-	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp))
+	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsNormal(lp))
 		elog(ERROR, "heap_inplace_update: invalid lp");
 
 	htup = (HeapTupleHeader) PageGetItem(page, lp);
@@ -3760,7 +4356,7 @@ heap_inplace_update_internal(Relation relation, HeapTuple tuple, TransactionId x
 		rdata[1].buffer_std = true;
 		rdata[1].next = NULL;
 
-		if (!isFrozen)
+		if (!freeze)
 			recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_INPLACE, rdata);
 		else
 			recptr = XLogInsert_OverrideXid(RM_HEAP_ID, XLOG_HEAP_INPLACE, rdata, FrozenTransactionId);
@@ -3790,11 +4386,10 @@ heap_inplace_update_internal(Relation relation, HeapTuple tuple, TransactionId x
  * Modified from heap_inplace_update_internal.
  */
 static void
-heap_inplace_frozen_delete_internal(Relation relation, HeapTuple tuple, TransactionId xid)
+heap_inplace_frozen_delete_internal(Relation relation, HeapTuple tuple, bool freeze)
 {
 	MIRROREDLOCK_BUFMGR_DECLARE;
 
-	bool		isFrozen = (xid == FrozenTransactionId);
 	Buffer		buffer;
 	Page		page;
 	OffsetNumber offnum;
@@ -3864,7 +4459,7 @@ heap_inplace_frozen_delete_internal(Relation relation, HeapTuple tuple, Transact
 		rdata[1].buffer_std = true;
 		rdata[1].next = NULL;
 
-		if (!isFrozen)
+		if (!freeze)
 			recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_INPLACE, rdata);
 		else
 			recptr = XLogInsert_OverrideXid(RM_HEAP_ID, XLOG_HEAP_INPLACE, rdata, FrozenTransactionId);
@@ -3892,7 +4487,7 @@ frozen_heap_inplace_update(Relation relation, HeapTuple tuple)
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_ENTER;
 
-	heap_inplace_update_internal(relation, tuple, FrozenTransactionId);
+	heap_inplace_update_internal(relation, tuple, true);
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_EXIT;
 }
@@ -3904,7 +4499,7 @@ frozen_heap_inplace_delete(Relation relation, HeapTuple tuple)
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_ENTER;
 
-	heap_inplace_frozen_delete_internal(relation, tuple, FrozenTransactionId);
+	heap_inplace_frozen_delete_internal(relation, tuple, true);
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_EXIT;
 }
@@ -3916,7 +4511,7 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
 
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_ENTER;
 
-	heap_inplace_update_internal(relation, tuple, GetCurrentTransactionId());
+	heap_inplace_update_internal(relation, tuple, false);
 	
 	MIRROREDLOCK_BUFMGR_VERIFY_NO_LOCK_LEAK_EXIT;
 }
@@ -3964,7 +4559,8 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 	bool		changed = false;
 	TransactionId xid;
 
-	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
+	if (buf != InvalidBuffer)
+		MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
 	xid = HeapTupleHeaderGetXmin(tuple);
 	if (TransactionIdIsNormal(xid) &&
@@ -3978,6 +4574,7 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 			buf = InvalidBuffer;
 		}
 		HeapTupleHeaderSetXmin(tuple, FrozenTransactionId);
+
 		/*
 		 * Might as well fix the hint bits too; usually XMIN_COMMITTED will
 		 * already be set here, but there's a small chance not.
@@ -3990,7 +4587,7 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 	/*
 	 * When we release shared lock, it's possible for someone else to change
 	 * xmax before we get the lock back, so repeat the check after acquiring
-	 * exclusive lock.  (We don't need this pushup for xmin, because only
+	 * exclusive lock.	(We don't need this pushup for xmin, because only
 	 * VACUUM could be interested in changing an existing tuple's xmin, and
 	 * there's only one VACUUM allowed on a table at a time.)
 	 */
@@ -4007,9 +4604,10 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 				LockBuffer(buf, BUFFER_LOCK_UNLOCK);
 				LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
 				buf = InvalidBuffer;
-				goto recheck_xmax;			/* see comment above */
+				goto recheck_xmax;		/* see comment above */
 			}
 			HeapTupleHeaderSetXmax(tuple, InvalidTransactionId);
+
 			/*
 			 * The tuple might be marked either XMAX_INVALID or XMAX_COMMITTED
 			 * + LOCKED.  Normalize to INVALID just to be sure no one gets
@@ -4017,6 +4615,7 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 			 */
 			tuple->t_infomask &= ~HEAP_XMAX_COMMITTED;
 			tuple->t_infomask |= HEAP_XMAX_INVALID;
+			HeapTupleHeaderClearHotUpdated(tuple);
 			changed = true;
 		}
 	}
@@ -4058,8 +4657,9 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 				LockBuffer(buf, BUFFER_LOCK_UNLOCK);
 				LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
 				buf = InvalidBuffer;
-				goto recheck_xvac;			/* see comment above */
+				goto recheck_xvac;		/* see comment above */
 			}
+
 			/*
 			 * If a MOVED_OFF tuple is not dead, the xvac transaction must
 			 * have failed; whereas a non-dead MOVED_IN tuple must mean the
@@ -4069,6 +4669,7 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 				HeapTupleHeaderSetXvac(tuple, InvalidTransactionId);
 			else
 				HeapTupleHeaderSetXvac(tuple, FrozenTransactionId);
+
 			/*
 			 * Might as well fix the hint bits too; usually XMIN_COMMITTED
 			 * will already be set here, but there's a small chance not.
@@ -4203,25 +4804,29 @@ log_heap_newpage(Relation rel,
  * Perform XLogInsert for a heap-clean operation.  Caller must already
  * have modified the buffer and marked it dirty.
  *
- * Note: for historical reasons, the entries in the unused[] array should
- * be zero-based tuple indexes, not one-based.
- * 
  * Note: prior to Postgres 8.3, the entries in the nowunused[] array were
  * zero-based tuple indexes.  Now they are one-based like other uses
  * of OffsetNumber.
  */
 XLogRecPtr
-log_heap_clean(Relation reln, Buffer buffer, OffsetNumber *unused, int uncnt)
+log_heap_clean(Relation reln, Buffer buffer,
+			   OffsetNumber *redirected, int nredirected,
+			   OffsetNumber *nowdead, int ndead,
+			   OffsetNumber *nowunused, int nunused,
+			   bool redirect_move)
 {
 	xl_heap_clean xlrec;
+	uint8		info;
 	XLogRecPtr	recptr;
-	XLogRecData rdata[2];
+	XLogRecData rdata[4];
 
 	/* Caller should not call me on a temp relation */
 	Assert(!reln->rd_istemp);
 
 	xl_heapnode_set(&xlrec.heapnode, reln);
 	xlrec.block = BufferGetBlockNumber(buffer);
+	xlrec.nredirected = nredirected;
+	xlrec.ndead = ndead;
 
 	rdata[0].data = (char *) &xlrec;
 	rdata[0].len = SizeOfHeapClean;
@@ -4229,14 +4834,17 @@ log_heap_clean(Relation reln, Buffer buffer, OffsetNumber *unused, int uncnt)
 	rdata[0].next = &(rdata[1]);
 
 	/*
-	 * The unused-offsets array is not actually in the buffer, but pretend
-	 * that it is.	When XLogInsert stores the whole buffer, the offsets array
-	 * need not be stored too.
+	 * The OffsetNumber arrays are not actually in the buffer, but we pretend
+	 * that they are.  When XLogInsert stores the whole buffer, the offset
+	 * arrays need not be stored too.  Note that even if all three arrays are
+	 * empty, we want to expose the buffer as a candidate for whole-page
+	 * storage, since this record type implies a defragmentation operation
+	 * even if no item pointers changed state.
 	 */
-	if (uncnt > 0)
+	if (nredirected > 0)
 	{
-		rdata[1].data = (char *) unused;
-		rdata[1].len = uncnt * sizeof(OffsetNumber);
+		rdata[1].data = (char *) redirected;
+		rdata[1].len = nredirected * sizeof(OffsetNumber) * 2;
 	}
 	else
 	{
@@ -4245,18 +4853,45 @@ log_heap_clean(Relation reln, Buffer buffer, OffsetNumber *unused, int uncnt)
 	}
 	rdata[1].buffer = buffer;
 	rdata[1].buffer_std = true;
-	rdata[1].next = NULL;
+	rdata[1].next = &(rdata[2]);
+
+	if (ndead > 0)
+	{
+		rdata[2].data = (char *) nowdead;
+		rdata[2].len = ndead * sizeof(OffsetNumber);
+	}
+	else
+	{
+		rdata[2].data = NULL;
+		rdata[2].len = 0;
+	}
+	rdata[2].buffer = buffer;
+	rdata[2].buffer_std = true;
+	rdata[2].next = &(rdata[3]);
+
+	if (nunused > 0)
+	{
+		rdata[3].data = (char *) nowunused;
+		rdata[3].len = nunused * sizeof(OffsetNumber);
+	}
+	else
+	{
+		rdata[3].data = NULL;
+		rdata[3].len = 0;
+	}
+	rdata[3].buffer = buffer;
+	rdata[3].buffer_std = true;
+	rdata[3].next = NULL;
 
-	recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_CLEAN, rdata);
+	info = redirect_move ? XLOG_HEAP2_CLEAN_MOVE : XLOG_HEAP2_CLEAN;
+	recptr = XLogInsert(RM_HEAP2_ID, info, rdata);
 
 	return recptr;
 }
 
 /*
- * Perform XLogInsert for a heap-freeze operation.  Caller must already
+ * Perform XLogInsert for a heap-freeze operation.	Caller must already
  * have modified the buffer and marked it dirty.
- *
- * Unlike log_heap_clean(), the offsets[] entries are one-based.
  */
 XLogRecPtr
 log_heap_freeze(Relation reln, Buffer buffer,
@@ -4280,9 +4915,9 @@ log_heap_freeze(Relation reln, Buffer buffer,
 	rdata[0].next = &(rdata[1]);
 
 	/*
-	 * The tuple-offsets array is not actually in the buffer, but pretend
-	 * that it is.	When XLogInsert stores the whole buffer, the offsets array
-	 * need not be stored too.
+	 * The tuple-offsets array is not actually in the buffer, but pretend that
+	 * it is.  When XLogInsert stores the whole buffer, the offsets array need
+	 * not be stored too.
 	 */
 	if (offcnt > 0)
 	{
@@ -4325,16 +4960,30 @@ log_heap_update(Relation reln, Buffer oldbuf, ItemPointerData from,
 	}			xlhdr;
 	int			hsize = SizeOfHeapHeader;
 	xl_heap_update xlrec;
+	uint8		info;
 	XLogRecPtr	recptr;
 	XLogRecData rdata[4];
 	Page		page = BufferGetPage(newbuf);
-	uint8		info = (move) ? XLOG_HEAP_MOVE : XLOG_HEAP_UPDATE;
 
 	/* Caller should not call me on a temp relation */
 	Assert(!reln->rd_istemp);
 
 	xl_heaptid_set(&xlrec.target, reln, &from);
+
+	if (move)
+	{
+		Assert(!HeapTupleIsHeapOnly(newtup));
+		info = XLOG_HEAP_MOVE;
+	}
+	else if (HeapTupleIsHeapOnly(newtup))
+		info = XLOG_HEAP_HOT_UPDATE;
+	else
+		info = XLOG_HEAP_UPDATE;
+
+	xlrec.target.node = reln->rd_node;
+	xlrec.target.tid = from;
 	xlrec.newtid = newtup->t_self;
+
 	rdata[0].data = (char *) &xlrec;
 	rdata[0].len = SizeOfHeapUpdate;
 	rdata[0].buffer = InvalidBuffer;
@@ -4405,8 +5054,63 @@ log_heap_move(Relation reln, Buffer oldbuf, ItemPointerData from,
 	return log_heap_update(reln, oldbuf, from, newbuf, newtup, true);
 }
 
+/*
+ * Perform XLogInsert of a HEAP_NEWPAGE record to WAL. Caller is responsible
+ * for writing the page to disk after calling this routine.
+ *
+ * Note: all current callers build pages in private memory and write them
+ * directly to smgr, rather than using bufmgr.	Therefore there is no need
+ * to pass a buffer ID to XLogInsert, nor to perform MarkBufferDirty within
+ * the critical section.
+ *
+ * Note: the NEWPAGE log record is used for both heaps and indexes, so do
+ * not do anything that assumes we are touching a heap.
+ */
+XLogRecPtr
+log_newpage(RelFileNode *rnode, BlockNumber blkno, Page page)
+{
+	xl_heap_newpage xlrec;
+	XLogRecPtr	recptr;
+	XLogRecData rdata[2];
+
+	/* NO ELOG(ERROR) from here till newpage op is logged */
+	START_CRIT_SECTION();
+
+	xlrec.heapnode.node = *rnode;
+	xlrec.blkno = blkno;
+
+	rdata[0].data = (char *) &xlrec;
+	rdata[0].len = SizeOfHeapNewpage;
+	rdata[0].buffer = InvalidBuffer;
+	rdata[0].next = &(rdata[1]);
+
+	rdata[1].data = (char *) page;
+	rdata[1].len = BLCKSZ;
+	rdata[1].buffer = InvalidBuffer;
+	rdata[1].next = NULL;
+
+	recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_NEWPAGE, rdata);
+
+	/*
+	 * The page may be uninitialized. If so, we can't set the LSN
+	 * and TLI because that would corrupt the page.
+	 */
+	if (!PageIsNew(page))
+	{
+		PageSetLSN(page, recptr);
+		PageSetTLI(page, ThisTimeLineID);
+	}
+
+	END_CRIT_SECTION();
+
+	return recptr;
+}
+
+/*
+ * Handles CLEAN and CLEAN_MOVE record types
+ */
 static void
-heap_xlog_clean(XLogRecPtr lsn, XLogRecord *record)
+heap_xlog_clean(XLogRecPtr lsn, XLogRecord *record, bool clean_move)
 {
 	MIRROREDLOCK_BUFMGR_DECLARE;
 
@@ -4414,6 +5118,13 @@ heap_xlog_clean(XLogRecPtr lsn, XLogRecord *record)
 	Relation	reln;
 	Buffer		buffer;
 	Page		page;
+	OffsetNumber *end;
+	OffsetNumber *redirected;
+	OffsetNumber *nowdead;
+	OffsetNumber *nowunused;
+	int			nredirected;
+	int			ndead;
+	int			nunused;
 
 	if (record->xl_info & XLR_BKP_BLOCK_1)
 		return;
@@ -4446,25 +5157,26 @@ heap_xlog_clean(XLogRecPtr lsn, XLogRecord *record)
 		return;
 	}
 
-	if (record->xl_len > SizeOfHeapClean)
-	{
-		OffsetNumber *unused;
-		OffsetNumber *unend;
-		ItemId		lp;
-
-		unused = (OffsetNumber *) ((char *) xlrec + SizeOfHeapClean);
-		unend = (OffsetNumber *) ((char *) xlrec + record->xl_len);
+	nredirected = xlrec->nredirected;
+	ndead = xlrec->ndead;
+	end = (OffsetNumber *) ((char *) xlrec + record->xl_len);
+	redirected = (OffsetNumber *) ((char *) xlrec + SizeOfHeapClean);
+	nowdead = redirected + (nredirected * 2);
+	nowunused = nowdead + ndead;
+	nunused = (end - nowunused);
+	Assert(nunused >= 0);
+
+	/* Update all item pointers per the record, and repair fragmentation */
+	heap_page_prune_execute(reln, buffer,
+							redirected, nredirected,
+							nowdead, ndead,
+							nowunused, nunused,
+							clean_move);
 
-		while (unused < unend)
-		{
-			/* unused[] entries are zero-based */
-			lp = PageGetItemId(page, *unused + 1);
-			lp->lp_flags &= ~LP_USED;
-			unused++;
-		}
-	}
-
-	PageRepairFragmentation(page, NULL);
+	/*
+	 * Note: we don't worry about updating the page's prunability hints.
+	 * At worst this will cause an extra prune cycle to occur soon.
+	 */
 
 	PageSetLSN(page, lsn);
 	PageSetTLI(page, ThisTimeLineID);
@@ -4573,8 +5285,16 @@ heap_xlog_newpage(XLogRecPtr lsn, XLogRecord *record)
 	Assert(record->xl_len == SizeOfHeapNewpage + BLCKSZ);
 	memcpy(page, (char *) xlrec + SizeOfHeapNewpage, BLCKSZ);
 
-	PageSetLSN(page, lsn);
-	PageSetTLI(page, ThisTimeLineID);
+	/*
+	 * The page may be uninitialized. If so, we can't set the LSN
+	 * and TLI because that would corrupt the page.
+	 */
+	if (!PageIsNew(page))
+	{
+		PageSetLSN(page, lsn);
+		PageSetTLI(page, ThisTimeLineID);
+	}
+
 	MarkBufferDirty(buffer);
 	UnlockReleaseBuffer(buffer);
 	
@@ -4646,7 +5366,7 @@ heap_xlog_delete(XLogRecPtr lsn, XLogRecord *record)
 	if (PageGetMaxOffsetNumber(page) >= offnum)
 		lp = PageGetItemId(page, offnum);
 
-	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp))
+	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsNormal(lp))
 		elog(PANIC, "heap_delete_redo: invalid lp");
 
 	htup = (HeapTupleHeader) PageGetItem(page, lp);
@@ -4656,8 +5376,13 @@ heap_xlog_delete(XLogRecPtr lsn, XLogRecord *record)
 						  HEAP_XMAX_IS_MULTI |
 						  HEAP_IS_LOCKED |
 						  HEAP_MOVED);
+	HeapTupleHeaderClearHotUpdated(htup);
 	HeapTupleHeaderSetXmax(htup, record->xl_xid);
 	HeapTupleHeaderSetCmax(htup, FirstCommandId, false);
+
+	/* Mark the page as a candidate for pruning */
+	PageSetPrunable(page, record->xl_xid);
+
 	/* Make sure there is no forward chain link in t_ctid */
 	htup->t_ctid = xlrec->target.tid;
 	PageSetLSN(page, lsn);
@@ -4807,8 +5532,7 @@ heap_xlog_insert(XLogRecPtr lsn, XLogRecord *record)
 		}
 	}
 
-	offnum = PageAddItem(page, (Item) htup, newlen, offnum,
-						 LP_USED | OverwritePageMode);
+	offnum = PageAddItem(page, (Item) htup, newlen, offnum, true, true);
 	if (offnum == InvalidOffsetNumber)
 		elog(PANIC, "heap_insert_redo: failed to add tuple");
 
@@ -4823,10 +5547,10 @@ heap_xlog_insert(XLogRecPtr lsn, XLogRecord *record)
 }
 
 /*
- * Handles UPDATE & MOVE
+ * Handles UPDATE, HOT_UPDATE & MOVE
  */
 static void
-heap_xlog_update(XLogRecPtr lsn, XLogRecord *record, bool move)
+heap_xlog_update(XLogRecPtr lsn, XLogRecord *record, bool move, bool hot_update)
 {
 	MIRROREDLOCK_BUFMGR_DECLARE;
 
@@ -4891,7 +5615,7 @@ heap_xlog_update(XLogRecPtr lsn, XLogRecord *record, bool move)
 	if (PageGetMaxOffsetNumber(page) >= offnum)
 		lp = PageGetItemId(page, offnum);
 
-	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp))
+	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsNormal(lp))
 		elog(PANIC, "heap_update_redo: invalid lp");
 
 	htup = (HeapTupleHeader) PageGetItem(page, lp);
@@ -4902,6 +5626,7 @@ heap_xlog_update(XLogRecPtr lsn, XLogRecord *record, bool move)
 							  HEAP_XMIN_INVALID |
 							  HEAP_MOVED_IN);
 		htup->t_infomask |= HEAP_MOVED_OFF;
+		HeapTupleHeaderClearHotUpdated(htup);
 		HeapTupleHeaderSetXvac(htup, record->xl_xid);
 		/* Make sure there is no forward chain link in t_ctid */
 		htup->t_ctid = xlrec->target.tid;
@@ -4913,12 +5638,19 @@ heap_xlog_update(XLogRecPtr lsn, XLogRecord *record, bool move)
 							  HEAP_XMAX_IS_MULTI |
 							  HEAP_IS_LOCKED |
 							  HEAP_MOVED);
+		if (hot_update)
+			HeapTupleHeaderSetHotUpdated(htup);
+		else
+			HeapTupleHeaderClearHotUpdated(htup);
 		HeapTupleHeaderSetXmax(htup, record->xl_xid);
 		HeapTupleHeaderSetCmax(htup, FirstCommandId, false);
 		/* Set forward chain link in t_ctid */
 		htup->t_ctid = xlrec->newtid;
 	}
 
+	/* Mark the page as a candidate for pruning */
+	PageSetPrunable(page, record->xl_xid);
+
 	/*
 	 * this test is ugly, but necessary to avoid thinking that insert change
 	 * is already applied
@@ -5024,8 +5756,7 @@ newsame:;
 	/* Make sure there is no forward chain link in t_ctid */
 	htup->t_ctid = xlrec->newtid;
 
-	offnum = PageAddItem(page, (Item) htup, newlen, offnum,
-						 LP_USED | OverwritePageMode);
+	offnum = PageAddItem(page, (Item) htup, newlen, offnum, true, true);
 	if (offnum == InvalidOffsetNumber)
 		elog(PANIC, "heap_update_redo: failed to add tuple");
 	PageSetLSN(page, lsn);
@@ -5088,7 +5819,7 @@ heap_xlog_lock(XLogRecPtr lsn, XLogRecord *record)
 	if (PageGetMaxOffsetNumber(page) >= offnum)
 		lp = PageGetItemId(page, offnum);
 
-	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp))
+	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsNormal(lp))
 		elog(PANIC, "heap_lock_redo: invalid lp");
 
 	htup = (HeapTupleHeader) PageGetItem(page, lp);
@@ -5104,6 +5835,7 @@ heap_xlog_lock(XLogRecPtr lsn, XLogRecord *record)
 		htup->t_infomask |= HEAP_XMAX_SHARED_LOCK;
 	else
 		htup->t_infomask |= HEAP_XMAX_EXCL_LOCK;
+	HeapTupleHeaderClearHotUpdated(htup);
 	HeapTupleHeaderSetXmax(htup, xlrec->locking_xid);
 	HeapTupleHeaderSetCmax(htup, FirstCommandId, false);
 	/* Make sure there is no forward chain link in t_ctid */
@@ -5168,7 +5900,7 @@ heap_xlog_inplace(XLogRecPtr lsn, XLogRecord *record)
 	if (PageGetMaxOffsetNumber(page) >= offnum)
 		lp = PageGetItemId(page, offnum);
 
-	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsUsed(lp))
+	if (PageGetMaxOffsetNumber(page) < offnum || !ItemIdIsNormal(lp))
 		elog(PANIC, "heap_inplace_redo: invalid lp");
 
 	htup = (HeapTupleHeader) PageGetItem(page, lp);
@@ -5197,25 +5929,35 @@ heap_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 
-	info &= XLOG_HEAP_OPMASK;
-	if (info == XLOG_HEAP_INSERT)
-		heap_xlog_insert(lsn, record);
-	else if (info == XLOG_HEAP_DELETE)
-		heap_xlog_delete(lsn, record);
-	else if (info == XLOG_HEAP_UPDATE)
-		heap_xlog_update(lsn, record, false);
-	else if (info == XLOG_HEAP_MOVE)
-		heap_xlog_update(lsn, record, true);
-	else if (info == XLOG_HEAP_CLEAN)
-		heap_xlog_clean(lsn, record);
-	else if (info == XLOG_HEAP_NEWPAGE)
-		heap_xlog_newpage(lsn, record);
-	else if (info == XLOG_HEAP_LOCK)
-		heap_xlog_lock(lsn, record);
-	else if (info == XLOG_HEAP_INPLACE)
-		heap_xlog_inplace(lsn, record);
-	else
-		elog(PANIC, "heap_redo: unknown op code %u", info);
+	switch (info & XLOG_HEAP_OPMASK)
+	{
+		case XLOG_HEAP_INSERT:
+			heap_xlog_insert(lsn, record);
+			break;
+		case XLOG_HEAP_DELETE:
+			heap_xlog_delete(lsn, record);
+			break;
+		case XLOG_HEAP_UPDATE:
+			heap_xlog_update(lsn, record, false, false);
+			break;
+		case XLOG_HEAP_MOVE:
+			heap_xlog_update(lsn, record, true, false);
+			break;
+		case XLOG_HEAP_HOT_UPDATE:
+			heap_xlog_update(lsn, record, false, true);
+			break;
+		case XLOG_HEAP_NEWPAGE:
+			heap_xlog_newpage(lsn, record);
+			break;
+		case XLOG_HEAP_LOCK:
+			heap_xlog_lock(lsn, record);
+			break;
+		case XLOG_HEAP_INPLACE:
+			heap_xlog_inplace(lsn, record);
+			break;
+		default:
+			elog(PANIC, "heap_redo: unknown op code %u", info);
+	}
 }
 
 void
@@ -5223,11 +5965,20 @@ heap2_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 {
 	uint8		info = record->xl_info & ~XLR_INFO_MASK;
 
-	info &= XLOG_HEAP_OPMASK;
-	if (info == XLOG_HEAP2_FREEZE)
-		heap_xlog_freeze(lsn, record);
-	else
-		elog(PANIC, "heap2_redo: unknown op code %u", info);
+	switch (info & XLOG_HEAP_OPMASK)
+	{
+		case XLOG_HEAP2_FREEZE:
+			heap_xlog_freeze(lsn, record);
+			break;
+		case XLOG_HEAP2_CLEAN:
+			heap_xlog_clean(lsn, record, false);
+			break;
+		case XLOG_HEAP2_CLEAN_MOVE:
+			heap_xlog_clean(lsn, record, true);
+			break;
+		default:
+			elog(PANIC, "heap2_redo: unknown op code %u", info);
+	}
 }
 
 static void
@@ -5242,15 +5993,16 @@ out_target(StringInfo buf, xl_heaptid *target)
 void
 heap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 {
-	uint8		info = record->xl_info & ~XLR_INFO_MASK;
-	char		*rec = XLogRecGetData(record);
+	char	   *rec = XLogRecGetData(record);
+	uint8		xl_info = record->xl_info;
+	uint8		info = xl_info & ~XLR_INFO_MASK;
 
 	info &= XLOG_HEAP_OPMASK;
 	if (info == XLOG_HEAP_INSERT)
 	{
 		xl_heap_insert *xlrec = (xl_heap_insert *) rec;
 
-		if (record->xl_info & XLOG_HEAP_INIT_PAGE)
+		if (xl_info & XLOG_HEAP_INIT_PAGE)
 			appendStringInfo(buf, "insert(init): ");
 		else
 			appendStringInfo(buf, "insert: ");
@@ -5267,7 +6019,7 @@ heap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 	{
 		xl_heap_update *xlrec = (xl_heap_update *) rec;
 
-		if (record->xl_info & XLOG_HEAP_INIT_PAGE)
+		if (xl_info & XLOG_HEAP_INIT_PAGE)
 			appendStringInfo(buf, "update(init): ");
 		else
 			appendStringInfo(buf, "update: ");
@@ -5279,7 +6031,7 @@ heap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 	{
 		xl_heap_update *xlrec = (xl_heap_update *) rec;
 
-		if (record->xl_info & XLOG_HEAP_INIT_PAGE)
+		if (xl_info & XLOG_HEAP_INIT_PAGE)
 			appendStringInfo(buf, "move(init): ");
 		else
 			appendStringInfo(buf, "move: ");
@@ -5287,13 +6039,18 @@ heap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 		appendStringInfo(buf, "; new %s",
 						 ItemPointerToString(&(xlrec->newtid)));
 	}
-	else if (info == XLOG_HEAP_CLEAN)
+	else if (info == XLOG_HEAP_HOT_UPDATE)
 	{
-		xl_heap_clean *xlrec = (xl_heap_clean *) rec;
+		xl_heap_update *xlrec = (xl_heap_update *) rec;
 
-		appendStringInfo(buf, "clean: rel %u/%u/%u; blk %u",
-						 xlrec->heapnode.node.spcNode, xlrec->heapnode.node.dbNode,
-						 xlrec->heapnode.node.relNode, xlrec->block);
+		if (xl_info & XLOG_HEAP_INIT_PAGE)		/* can this case happen? */
+			appendStringInfo(buf, "hot_update(init): ");
+		else
+			appendStringInfo(buf, "hot_update: ");
+		out_target(buf, &(xlrec->target));
+		appendStringInfo(buf, "; new %u/%u",
+						 ItemPointerGetBlockNumber(&(xlrec->newtid)),
+						 ItemPointerGetOffsetNumber(&(xlrec->newtid)));
 	}
 	else if (info == XLOG_HEAP_NEWPAGE)
 	{
@@ -5349,7 +6106,7 @@ bool heap_getrelfilenode(
 
 		*relFileNode = xlrec->target.node;
 	}
-	else if (info == XLOG_HEAP_UPDATE)
+	else if (info == XLOG_HEAP_UPDATE || info == XLOG_HEAP_HOT_UPDATE)
 	{
 		xl_heap_update *xlrec = (xl_heap_update *) data;
 
@@ -5361,7 +6118,7 @@ bool heap_getrelfilenode(
 
 		*relFileNode = xlrec->target.node;
 	}
-	else if (info == XLOG_HEAP_CLEAN)
+	else if (info == XLOG_HEAP2_CLEAN)
 	{
 		xl_heap_clean *xlrec = (xl_heap_clean *) data;
 
@@ -5394,8 +6151,9 @@ bool heap_getrelfilenode(
 void
 heap2_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 {
-	uint8		info = record->xl_info & ~XLR_INFO_MASK;
-	char		*rec = XLogRecGetData(record);
+	char	   *rec = XLogRecGetData(record);
+	uint8		xl_info = record->xl_info;
+	uint8		info = xl_info & ~XLR_INFO_MASK;
 
 	info &= XLOG_HEAP_OPMASK;
 	if (info == XLOG_HEAP2_FREEZE)
@@ -5407,6 +6165,22 @@ heap2_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 						 xlrec->heapnode.node.relNode, xlrec->block,
 						 xlrec->cutoff_xid);
 	}
+	else if (info == XLOG_HEAP2_CLEAN)
+	{
+		xl_heap_clean *xlrec = (xl_heap_clean *) rec;
+
+		appendStringInfo(buf, "clean: rel %u/%u/%u; blk %u",
+						 xlrec->heapnode.node.spcNode, xlrec->heapnode.node.dbNode,
+						 xlrec->heapnode.node.relNode, xlrec->block);
+	}
+	else if (info == XLOG_HEAP2_CLEAN_MOVE)
+	{
+		xl_heap_clean *xlrec = (xl_heap_clean *) rec;
+
+		appendStringInfo(buf, "clean_move: rel %u/%u/%u; blk %u",
+						 xlrec->heapnode.node.spcNode, xlrec->heapnode.node.dbNode,
+						 xlrec->heapnode.node.relNode, xlrec->block);
+	}
 	else
 		appendStringInfo(buf, "UNKNOWN");
 }
@@ -5440,7 +6214,7 @@ heap_sync(Relation rel)
 	/* toast heap, if any */
 	if (OidIsValid(rel->rd_rel->reltoastrelid))
 	{
-		Relation		toastrel;
+		Relation	toastrel;
 
 		toastrel = heap_open(rel->rd_rel->reltoastrelid, AccessShareLock);
 		FlushRelationBuffers(toastrel);
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 53934af6787a..1c3f9bb901c8 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/hio.c,v 1.65 2007/02/05 04:22:18 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/hio.c,v 1.68 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,7 @@ RelationPutHeapTuple(Relation relation __attribute__((unused)),
 	pageHeader = BufferGetPage(buffer);
 
 	offnum = PageAddItem(pageHeader, (Item) tuple->t_data,
-						 tuple->t_len, InvalidOffsetNumber, LP_USED);
+						 tuple->t_len, InvalidOffsetNumber, false, true);
 
 	if (offnum == InvalidOffsetNumber)
 		elog(PANIC, "failed to add tuple to page");
@@ -221,7 +221,7 @@ RelationGetBufferForTuple(Relation relation, Size len,
 		 * we're done.
 		 */
 		pageHeader = (Page) BufferGetPage(buffer);
-		pageFreeSpace = PageGetFreeSpace(pageHeader);
+		pageFreeSpace = PageGetHeapFreeSpace(pageHeader);
 		if (len + saveFreeSpace <= pageFreeSpace)
 		{
 			/* use this page as future insert target, too */
@@ -314,7 +314,7 @@ RelationGetBufferForTuple(Relation relation, Size len,
 
 	PageInit(pageHeader, BufferGetPageSize(buffer), 0);
 
-	if (len > PageGetFreeSpace(pageHeader))
+	if (len > PageGetHeapFreeSpace(pageHeader))
 	{
 		/* We should not get here given the test at the top */
 		elog(PANIC, "tuple is too big: size %lu", (unsigned long) len);
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
new file mode 100644
index 000000000000..559f8d47881d
--- /dev/null
+++ b/src/backend/access/heap/pruneheap.c
@@ -0,0 +1,884 @@
+/*-------------------------------------------------------------------------
+ *
+ * pruneheap.c
+ *	  heap page pruning and HOT-chain management code
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.6.2.2 2008/03/13 18:00:39 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/transam.h"
+#include "miscadmin.h"
+#include "pgstat.h"
+#include "utils/inval.h"
+
+
+/* Working data for heap_page_prune and subroutines */
+typedef struct
+{
+	TransactionId new_prune_xid;	/* new prune hint value for page */
+	int			nredirected;		/* numbers of entries in arrays below */
+	int			ndead;
+	int			nunused;
+	/* arrays that accumulate indexes of items to be changed */
+	OffsetNumber redirected[MaxHeapTuplesPerPage * 2];
+	OffsetNumber nowdead[MaxHeapTuplesPerPage];
+	OffsetNumber nowunused[MaxHeapTuplesPerPage];
+	/* marked[i] is TRUE if item i is entered in one of the above arrays */
+	bool		marked[MaxHeapTuplesPerPage + 1];
+} PruneState;
+
+/* Local functions */
+static int heap_prune_chain(Relation relation, Buffer buffer,
+				 OffsetNumber rootoffnum,
+				 TransactionId OldestXmin,
+				 PruneState *prstate,
+				 bool redirect_move);
+static void heap_prune_record_prunable(PruneState *prstate, TransactionId xid);
+static void heap_prune_record_redirect(PruneState *prstate,
+						   OffsetNumber offnum, OffsetNumber rdoffnum);
+static void heap_prune_record_dead(PruneState *prstate, OffsetNumber offnum);
+static void heap_prune_record_unused(PruneState *prstate, OffsetNumber offnum);
+
+
+/*
+ * Optionally prune and repair fragmentation in the specified page.
+ *
+ * This is an opportunistic function.  It will perform housekeeping
+ * only if the page heuristically looks like a candidate for pruning and we
+ * can acquire buffer cleanup lock without blocking.
+ *
+ * Note: this is called quite often.  It's important that it fall out quickly
+ * if there's not any use in pruning.
+ *
+ * Caller must have pin on the buffer, and must *not* have a lock on it.
+ *
+ * OldestXmin is the cutoff XID used to distinguish whether tuples are DEAD
+ * or RECENTLY_DEAD (see HeapTupleSatisfiesVacuum).
+ */
+void
+heap_page_prune_opt(Relation relation, Buffer buffer, TransactionId OldestXmin)
+{
+	PageHeader	dp = (PageHeader) BufferGetPage(buffer);
+	Size		minfree;
+
+	/*
+	 * In GPDB we may call into here without having a local snapshot and thus
+	 * no valid OldestXmin transaction id. Exit early if so.
+	 */
+	if (!TransactionIdIsValid(OldestXmin))
+		return;
+
+	/*
+	 * Let's see if we really need pruning.
+	 *
+	 * Forget it if page is not hinted to contain something prunable that's
+	 * older than OldestXmin.
+	 */
+	if (!PageIsPrunable(dp, OldestXmin))
+		return;
+
+	/*
+	 * We prune when a previous UPDATE failed to find enough space on the page
+	 * for a new tuple version, or when free space falls below the relation's
+	 * fill-factor target (but not less than 10%).
+	 *
+	 * Checking free space here is questionable since we aren't holding any
+	 * lock on the buffer; in the worst case we could get a bogus answer. It's
+	 * unlikely to be *seriously* wrong, though, since reading either pd_lower
+	 * or pd_upper is probably atomic.	Avoiding taking a lock seems more
+	 * important than sometimes getting a wrong answer in what is after all
+	 * just a heuristic estimate.
+	 */
+	minfree = RelationGetTargetPageFreeSpace(relation,
+											 HEAP_DEFAULT_FILLFACTOR);
+	minfree = Max(minfree, BLCKSZ / 10);
+
+	if (PageIsFull(dp) || PageGetHeapFreeSpace((Page) dp) < minfree)
+	{
+		/*
+		 * If we don't have gp_persistent_relation_node information, to be added
+		 * to the XLOG record, give up. It's too late to fetch it here, we might
+		 * already be holding locks that would be needed to fetch the information.
+		 */
+		if (RelationNeedToFetchGpRelationNodeForXLog(relation))
+			return;
+
+		/* OK, try to get exclusive buffer lock */
+		if (!ConditionalLockBufferForCleanup(buffer))
+			return;
+
+		/*
+		 * Now that we have buffer lock, get accurate information about the
+		 * page's free space, and recheck the heuristic about whether to
+		 * prune. (We needn't recheck PageIsPrunable, since no one else could
+		 * have pruned while we hold pin.)
+		 */
+		if (PageIsFull(dp) || PageGetHeapFreeSpace((Page) dp) < minfree)
+		{
+			/* OK to prune (though not to remove redirects) */
+			(void) heap_page_prune(relation, buffer, OldestXmin, false, true);
+		}
+
+		/* And release buffer lock */
+		LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
+	}
+}
+
+
+/*
+ * Prune and repair fragmentation in the specified page.
+ *
+ * Caller must have pin and buffer cleanup lock on the page.
+ *
+ * OldestXmin is the cutoff XID used to distinguish whether tuples are DEAD
+ * or RECENTLY_DEAD (see HeapTupleSatisfiesVacuum).
+ *
+ * If redirect_move is set, we remove redirecting line pointers by
+ * updating the root line pointer to point directly to the first non-dead
+ * tuple in the chain.	NOTE: eliminating the redirect changes the first
+ * tuple's effective CTID, and is therefore unsafe except within VACUUM FULL.
+ * The only reason we support this capability at all is that by using it,
+ * VACUUM FULL need not cope with LP_REDIRECT items at all; which seems a
+ * good thing since VACUUM FULL is overly complicated already.
+ *
+ * If report_stats is true then we send the number of reclaimed heap-only
+ * tuples to pgstats.  (This must be FALSE during vacuum, since vacuum will
+ * send its own new total to pgstats, and we don't want this delta applied
+ * on top of that.)
+ *
+ * Returns the number of tuples deleted from the page.
+ */
+int
+heap_page_prune(Relation relation, Buffer buffer, TransactionId OldestXmin,
+				bool redirect_move, bool report_stats)
+{
+	int			ndeleted = 0;
+	Page		page = BufferGetPage(buffer);
+	OffsetNumber offnum,
+				maxoff;
+	PruneState	prstate;
+
+	/*
+	 * Our strategy is to scan the page and make lists of items to change,
+	 * then apply the changes within a critical section.  This keeps as
+	 * much logic as possible out of the critical section, and also ensures
+	 * that WAL replay will work the same as the normal case.
+	 *
+	 * First, inform inval.c that upcoming CacheInvalidateHeapTuple calls
+	 * are nontransactional.
+	 */
+	if (redirect_move)
+		BeginNonTransactionalInvalidation();
+
+	/*
+	 * Initialize the new pd_prune_xid value to zero (indicating no
+	 * prunable tuples).  If we find any tuples which may soon become
+	 * prunable, we will save the lowest relevant XID in new_prune_xid.
+	 * Also initialize the rest of our working state.
+	 */
+	prstate.new_prune_xid = InvalidTransactionId;
+	prstate.nredirected = prstate.ndead = prstate.nunused = 0;
+	memset(prstate.marked, 0, sizeof(prstate.marked));
+
+	/* Scan the page */
+	maxoff = PageGetMaxOffsetNumber(page);
+	for (offnum = FirstOffsetNumber;
+		 offnum <= maxoff;
+		 offnum = OffsetNumberNext(offnum))
+	{
+		ItemId		itemid;
+
+		/* Ignore items already processed as part of an earlier chain */
+		if (prstate.marked[offnum])
+			continue;
+
+		/* Nothing to do if slot is empty or already dead */
+		itemid = PageGetItemId(page, offnum);
+		if (!ItemIdIsUsed(itemid) || ItemIdIsDead(itemid))
+			continue;
+
+		/* Process this item or chain of items */
+		ndeleted += heap_prune_chain(relation, buffer, offnum,
+									 OldestXmin,
+									 &prstate,
+									 redirect_move);
+	}
+
+	/*
+	 * Send invalidation messages for any tuples we are about to move.
+	 * It is safe to do this now, even though we could theoretically still
+	 * fail before making the actual page update, because a useless cache
+	 * invalidation doesn't hurt anything.  Also, no one else can reload the
+	 * tuples while we have exclusive buffer lock, so it's not too early to
+	 * send the invals.  This avoids sending the invals while inside the
+	 * critical section, which is a good thing for robustness.
+	 */
+	if (redirect_move)
+		EndNonTransactionalInvalidation();
+
+	/* Any error while applying the changes is critical */
+	START_CRIT_SECTION();
+
+	/* Have we found any prunable items? */
+	if (prstate.nredirected > 0 || prstate.ndead > 0 || prstate.nunused > 0)
+	{
+		/*
+		 * Apply the planned item changes, then repair page fragmentation,
+		 * and update the page's hint bit about whether it has free line
+		 * pointers.
+		 */
+		heap_page_prune_execute(relation, buffer,
+								prstate.redirected, prstate.nredirected,
+								prstate.nowdead, prstate.ndead,
+								prstate.nowunused, prstate.nunused,
+								redirect_move);
+
+		/*
+		 * Update the page's pd_prune_xid field to either zero, or the lowest
+		 * XID of any soon-prunable tuple.
+		 */
+		((PageHeader) page)->pd_prune_xid = prstate.new_prune_xid;
+
+		/*
+		 * Also clear the "page is full" flag, since there's no point in
+		 * repeating the prune/defrag process until something else happens to
+		 * the page.
+		 */
+		PageClearFull(page);
+
+		MarkBufferDirty(buffer);
+
+		/*
+		 * Emit a WAL HEAP_CLEAN or HEAP_CLEAN_MOVE record showing what we did
+		 */
+		if (!relation->rd_istemp)
+		{
+			XLogRecPtr	recptr;
+
+			recptr = log_heap_clean(relation, buffer,
+									prstate.redirected, prstate.nredirected,
+									prstate.nowdead, prstate.ndead,
+									prstate.nowunused, prstate.nunused,
+									redirect_move);
+
+			PageSetLSN(BufferGetPage(buffer), recptr);
+			PageSetTLI(BufferGetPage(buffer), ThisTimeLineID);
+		}
+	}
+	else
+	{
+		/*
+		 * If we didn't prune anything, but have found a new value for the
+		 * pd_prune_xid field, update it and mark the buffer dirty.
+		 * This is treated as a non-WAL-logged hint.
+		 *
+		 * Also clear the "page is full" flag if it is set, since there's no
+		 * point in repeating the prune/defrag process until something else
+		 * happens to the page.
+		 */
+		if (((PageHeader) page)->pd_prune_xid != prstate.new_prune_xid ||
+			PageIsFull(page))
+		{
+			((PageHeader) page)->pd_prune_xid = prstate.new_prune_xid;
+			PageClearFull(page);
+			SetBufferCommitInfoNeedsSave(buffer);
+		}
+	}
+
+	END_CRIT_SECTION();
+
+	/*
+	 * If requested, report the number of tuples reclaimed to pgstats. This is
+	 * ndeleted minus ndead, because we don't want to count a now-DEAD root
+	 * item as a deletion for this purpose.
+	 */
+	if (report_stats && ndeleted > prstate.ndead)
+		pgstat_update_heap_dead_tuples(relation, ndeleted - prstate.ndead);
+
+	/*
+	 * XXX Should we update the FSM information of this page ?
+	 *
+	 * There are two schools of thought here. We may not want to update FSM
+	 * information so that the page is not used for unrelated UPDATEs/INSERTs
+	 * and any free space in this page will remain available for further
+	 * UPDATEs in *this* page, thus improving chances for doing HOT updates.
+	 *
+	 * But for a large table and where a page does not receive further UPDATEs
+	 * for a long time, we might waste this space by not updating the FSM
+	 * information. The relation may get extended and fragmented further.
+	 *
+	 * One possibility is to leave "fillfactor" worth of space in this page
+	 * and update FSM with the remaining space.
+	 *
+	 * In any case, the current FSM implementation doesn't accept
+	 * one-page-at-a-time updates, so this is all academic for now.
+	 */
+
+	return ndeleted;
+}
+
+
+/*
+ * Prune specified item pointer or a HOT chain originating at that item.
+ *
+ * If the item is an index-referenced tuple (i.e. not a heap-only tuple),
+ * the HOT chain is pruned by removing all DEAD tuples at the start of the HOT
+ * chain.  We also prune any RECENTLY_DEAD tuples preceding a DEAD tuple.
+ * This is OK because a RECENTLY_DEAD tuple preceding a DEAD tuple is really
+ * DEAD, the OldestXmin test is just too coarse to detect it.
+ *
+ * The root line pointer is redirected to the tuple immediately after the
+ * latest DEAD tuple.  If all tuples in the chain are DEAD, the root line
+ * pointer is marked LP_DEAD.  (This includes the case of a DEAD simple
+ * tuple, which we treat as a chain of length 1.)
+ *
+ * OldestXmin is the cutoff XID used to identify dead tuples.
+ *
+ * We don't actually change the page here, except perhaps for hint-bit updates
+ * caused by HeapTupleSatisfiesVacuum.  We just add entries to the arrays in
+ * prstate showing the changes to be made.  Items to be redirected are added
+ * to the redirected[] array (two entries per redirection); items to be set to
+ * LP_DEAD state are added to nowdead[]; and items to be set to LP_UNUSED
+ * state are added to nowunused[].
+ *
+ * If redirect_move is true, we intend to get rid of redirecting line pointers,
+ * not just make redirection entries.
+ *
+ * Returns the number of tuples (to be) deleted from the page.
+ */
+static int
+heap_prune_chain(Relation relation, Buffer buffer, OffsetNumber rootoffnum,
+				 TransactionId OldestXmin,
+				 PruneState *prstate,
+				 bool redirect_move)
+{
+	int			ndeleted = 0;
+	Page		dp = (Page) BufferGetPage(buffer);
+	TransactionId priorXmax = InvalidTransactionId;
+	ItemId		rootlp;
+	HeapTupleHeader htup;
+	OffsetNumber latestdead = InvalidOffsetNumber,
+				redirect_target = InvalidOffsetNumber,
+				maxoff = PageGetMaxOffsetNumber(dp),
+				offnum;
+	OffsetNumber chainitems[MaxHeapTuplesPerPage];
+	int			nchain = 0,
+				i;
+
+	rootlp = PageGetItemId(dp, rootoffnum);
+
+	/*
+	 * If it's a heap-only tuple, then it is not the start of a HOT chain.
+	 */
+	if (ItemIdIsNormal(rootlp))
+	{
+		htup = (HeapTupleHeader) PageGetItem(dp, rootlp);
+		if (HeapTupleHeaderIsHeapOnly(htup))
+		{
+			/*
+			 * If the tuple is DEAD and doesn't chain to anything else, mark
+			 * it unused immediately.  (If it does chain, we can only remove
+			 * it as part of pruning its chain.)
+			 *
+			 * We need this primarily to handle aborted HOT updates, that is,
+			 * XMIN_INVALID heap-only tuples.  Those might not be linked to by
+			 * any chain, since the parent tuple might be re-updated before
+			 * any pruning occurs.	So we have to be able to reap them
+			 * separately from chain-pruning.  (Note that
+			 * HeapTupleHeaderIsHotUpdated will never return true for an
+			 * XMIN_INVALID tuple, so this code will work even when there were
+			 * sequential updates within the aborted transaction.)
+			 *
+			 * Note that we might first arrive at a dead heap-only tuple
+			 * either here or while following a chain below.  Whichever path
+			 * gets there first will mark the tuple unused.
+			 */
+			if (HeapTupleSatisfiesVacuum(relation, htup, OldestXmin, buffer)
+				== HEAPTUPLE_DEAD && !HeapTupleHeaderIsHotUpdated(htup))
+			{
+				heap_prune_record_unused(prstate, rootoffnum);
+				ndeleted++;
+			}
+
+			/* Nothing more to do */
+			return ndeleted;
+		}
+	}
+
+	/* Start from the root tuple */
+	offnum = rootoffnum;
+
+	/* while not end of the chain */
+	for (;;)
+	{
+		ItemId		lp;
+		bool		tupdead,
+					recent_dead;
+
+		/* Some sanity checks */
+		if (offnum < FirstOffsetNumber || offnum > maxoff)
+			break;
+
+		/* If item is already processed, stop --- it must not be same chain */
+		if (prstate->marked[offnum])
+			break;
+
+		lp = PageGetItemId(dp, offnum);
+
+		/* Unused item obviously isn't part of the chain */
+		if (!ItemIdIsUsed(lp))
+			break;
+
+		/*
+		 * If we are looking at the redirected root line pointer, jump to the
+		 * first normal tuple in the chain.  If we find a redirect somewhere
+		 * else, stop --- it must not be same chain.
+		 */
+		if (ItemIdIsRedirected(lp))
+		{
+			if (nchain > 0)
+				break;			/* not at start of chain */
+			chainitems[nchain++] = offnum;
+			offnum = ItemIdGetRedirect(rootlp);
+			continue;
+		}
+
+		/*
+		 * Likewise, a dead item pointer can't be part of the chain. (We
+		 * already eliminated the case of dead root tuple outside this
+		 * function.)
+		 */
+		if (ItemIdIsDead(lp))
+			break;
+
+		Assert(ItemIdIsNormal(lp));
+		htup = (HeapTupleHeader) PageGetItem(dp, lp);
+
+		/*
+		 * Check the tuple XMIN against prior XMAX, if any
+		 */
+		if (TransactionIdIsValid(priorXmax) &&
+			!TransactionIdEquals(HeapTupleHeaderGetXmin(htup), priorXmax))
+			break;
+
+		/*
+		 * OK, this tuple is indeed a member of the chain.
+		 */
+		chainitems[nchain++] = offnum;
+
+		/*
+		 * Check tuple's visibility status.
+		 */
+		tupdead = recent_dead = false;
+
+		switch (HeapTupleSatisfiesVacuum(relation, htup, OldestXmin, buffer))
+		{
+			case HEAPTUPLE_DEAD:
+				tupdead = true;
+				break;
+
+			case HEAPTUPLE_RECENTLY_DEAD:
+				recent_dead = true;
+
+				/*
+				 * This tuple may soon become DEAD.  Update the hint field so
+				 * that the page is reconsidered for pruning in future.
+				 */
+				heap_prune_record_prunable(prstate,
+										   HeapTupleHeaderGetXmax(htup));
+				break;
+
+			case HEAPTUPLE_DELETE_IN_PROGRESS:
+
+				/*
+				 * This tuple may soon become DEAD.  Update the hint field so
+				 * that the page is reconsidered for pruning in future.
+				 */
+				heap_prune_record_prunable(prstate,
+										   HeapTupleHeaderGetXmax(htup));
+				break;
+
+			case HEAPTUPLE_LIVE:
+			case HEAPTUPLE_INSERT_IN_PROGRESS:
+
+				/*
+				 * If we wanted to optimize for aborts, we might consider
+				 * marking the page prunable when we see INSERT_IN_PROGRESS.
+				 * But we don't.  See related decisions about when to mark the
+				 * page prunable in heapam.c.
+				 */
+				break;
+
+			default:
+				elog(ERROR, "unexpected HeapTupleSatisfiesVacuum result");
+				break;
+		}
+
+		/*
+		 * Remember the last DEAD tuple seen.  We will advance past
+		 * RECENTLY_DEAD tuples just in case there's a DEAD one after them;
+		 * but we can't advance past anything else.  (XXX is it really worth
+		 * continuing to scan beyond RECENTLY_DEAD?  The case where we will
+		 * find another DEAD tuple is a fairly unusual corner case.)
+		 */
+		if (tupdead)
+			latestdead = offnum;
+		else if (!recent_dead)
+			break;
+
+		/*
+		 * If the tuple is not HOT-updated, then we are at the end of this
+		 * HOT-update chain.
+		 */
+		if (!HeapTupleHeaderIsHotUpdated(htup))
+			break;
+
+		/*
+		 * Advance to next chain member.
+		 */
+		Assert(ItemPointerGetBlockNumber(&htup->t_ctid) ==
+			   BufferGetBlockNumber(buffer));
+		offnum = ItemPointerGetOffsetNumber(&htup->t_ctid);
+		priorXmax = HeapTupleHeaderGetXmax(htup);
+	}
+
+	/*
+	 * If we found a DEAD tuple in the chain, adjust the HOT chain so that all
+	 * the DEAD tuples at the start of the chain are removed and the root line
+	 * pointer is appropriately redirected.
+	 */
+	if (OffsetNumberIsValid(latestdead))
+	{
+		/*
+		 * Mark as unused each intermediate item that we are able to remove
+		 * from the chain.
+		 *
+		 * When the previous item is the last dead tuple seen, we are at the
+		 * right candidate for redirection.
+		 */
+		for (i = 1; (i < nchain) && (chainitems[i - 1] != latestdead); i++)
+		{
+			heap_prune_record_unused(prstate, chainitems[i]);
+			ndeleted++;
+		}
+
+		/*
+		 * If the root entry had been a normal tuple, we are deleting it, so
+		 * count it in the result.	But changing a redirect (even to DEAD
+		 * state) doesn't count.
+		 */
+		if (ItemIdIsNormal(rootlp))
+			ndeleted++;
+
+		/*
+		 * If the DEAD tuple is at the end of the chain, the entire chain is
+		 * dead and the root line pointer can be marked dead.  Otherwise just
+		 * redirect the root to the correct chain member.
+		 */
+		if (i >= nchain)
+			heap_prune_record_dead(prstate, rootoffnum);
+		else
+		{
+			heap_prune_record_redirect(prstate, rootoffnum, chainitems[i]);
+			/* If the redirection will be a move, need more processing */
+			if (redirect_move)
+				redirect_target = chainitems[i];
+		}
+	}
+	else if (nchain < 2 && ItemIdIsRedirected(rootlp))
+	{
+		/*
+		 * We found a redirect item that doesn't point to a valid follow-on
+		 * item.  This can happen if the loop in heap_page_prune caused us to
+		 * visit the dead successor of a redirect item before visiting the
+		 * redirect item.  We can clean up by setting the redirect item to
+		 * DEAD state.
+		 */
+		heap_prune_record_dead(prstate, rootoffnum);
+	}
+	else if (redirect_move && ItemIdIsRedirected(rootlp))
+	{
+		/*
+		 * If we desire to eliminate LP_REDIRECT items by moving tuples,
+		 * make a redirection entry for each redirected root item; this
+		 * will cause heap_page_prune_execute to actually do the move.
+		 * (We get here only when there are no DEAD tuples in the chain;
+		 * otherwise the redirection entry was made above.)
+		 */
+		heap_prune_record_redirect(prstate, rootoffnum, chainitems[1]);
+		redirect_target = chainitems[1];
+	}
+
+	/*
+	 * If we are going to implement a redirect by moving tuples, we have
+	 * to issue a cache invalidation against the redirection target tuple,
+	 * because its CTID will be effectively changed by the move.  Note that
+	 * CacheInvalidateHeapTuple only queues the request, it doesn't send it;
+	 * if we fail before reaching EndNonTransactionalInvalidation, nothing
+	 * happens and no harm is done.
+	 */
+	if (OffsetNumberIsValid(redirect_target))
+	{
+		ItemId		firstlp = PageGetItemId(dp, redirect_target);
+		HeapTupleData firsttup;
+
+		Assert(ItemIdIsNormal(firstlp));
+		/* Set up firsttup to reference the tuple at its existing CTID */
+		firsttup.t_data = (HeapTupleHeader) PageGetItem(dp, firstlp);
+		firsttup.t_len = ItemIdGetLength(firstlp);
+		ItemPointerSet(&firsttup.t_self,
+					   BufferGetBlockNumber(buffer),
+					   redirect_target);
+		CacheInvalidateHeapTuple(relation, &firsttup);
+	}
+
+	return ndeleted;
+}
+
+/* Record lowest soon-prunable XID */
+static void
+heap_prune_record_prunable(PruneState *prstate, TransactionId xid)
+{
+	/*
+	 * This should exactly match the PageSetPrunable macro.  We can't store
+	 * directly into the page header yet, so we update working state.
+	 */
+	Assert(TransactionIdIsNormal(xid));
+	if (!TransactionIdIsValid(prstate->new_prune_xid) ||
+		TransactionIdPrecedes(xid, prstate->new_prune_xid))
+		prstate->new_prune_xid = xid;
+}
+
+/* Record item pointer to be redirected */
+static void
+heap_prune_record_redirect(PruneState *prstate,
+						   OffsetNumber offnum, OffsetNumber rdoffnum)
+{
+	Assert(prstate->nredirected < MaxHeapTuplesPerPage);
+	prstate->redirected[prstate->nredirected * 2] = offnum;
+	prstate->redirected[prstate->nredirected * 2 + 1] = rdoffnum;
+	prstate->nredirected++;
+	Assert(!prstate->marked[offnum]);
+	prstate->marked[offnum] = true;
+	Assert(!prstate->marked[rdoffnum]);
+	prstate->marked[rdoffnum] = true;
+}
+
+/* Record item pointer to be marked dead */
+static void
+heap_prune_record_dead(PruneState *prstate, OffsetNumber offnum)
+{
+	Assert(prstate->ndead < MaxHeapTuplesPerPage);
+	prstate->nowdead[prstate->ndead] = offnum;
+	prstate->ndead++;
+	Assert(!prstate->marked[offnum]);
+	prstate->marked[offnum] = true;
+}
+
+/* Record item pointer to be marked unused */
+static void
+heap_prune_record_unused(PruneState *prstate, OffsetNumber offnum)
+{
+	Assert(prstate->nunused < MaxHeapTuplesPerPage);
+	prstate->nowunused[prstate->nunused] = offnum;
+	prstate->nunused++;
+	Assert(!prstate->marked[offnum]);
+	prstate->marked[offnum] = true;
+}
+
+
+/*
+ * Perform the actual page changes needed by heap_page_prune.
+ * It is expected that the caller has suitable pin and lock on the
+ * buffer, and is inside a critical section.
+ *
+ * This is split out because it is also used by heap_xlog_clean()
+ * to replay the WAL record when needed after a crash.  Note that the
+ * arguments are identical to those of log_heap_clean().
+ */
+void
+heap_page_prune_execute(Relation reln, Buffer buffer,
+						OffsetNumber *redirected, int nredirected,
+						OffsetNumber *nowdead, int ndead,
+						OffsetNumber *nowunused, int nunused,
+						bool redirect_move)
+{
+	Page		page = (Page) BufferGetPage(buffer);
+	OffsetNumber *offnum;
+	int			i;
+
+	/* Update all redirected or moved line pointers */
+	offnum = redirected;
+	for (i = 0; i < nredirected; i++)
+	{
+		OffsetNumber fromoff = *offnum++;
+		OffsetNumber tooff = *offnum++;
+		ItemId		fromlp = PageGetItemId(page, fromoff);
+
+		if (redirect_move)
+		{
+			/* Physically move the "to" item to the "from" slot */
+			ItemId		tolp = PageGetItemId(page, tooff);
+			HeapTupleHeader htup;
+
+			*fromlp = *tolp;
+			ItemIdSetUnused(tolp);
+
+			/*
+			 * Change heap-only status of the tuple because after the line
+			 * pointer manipulation, it's no longer a heap-only tuple, but is
+			 * directly pointed to by index entries.
+			 */
+			Assert(ItemIdIsNormal(fromlp));
+			htup = (HeapTupleHeader) PageGetItem(page, fromlp);
+			Assert(HeapTupleHeaderIsHeapOnly(htup));
+			HeapTupleHeaderClearHeapOnly(htup);
+		}
+		else
+		{
+			/* Just insert a REDIRECT link at fromoff */
+			ItemIdSetRedirect(fromlp, tooff);
+		}
+	}
+
+	/* Update all now-dead line pointers */
+	offnum = nowdead;
+	for (i = 0; i < ndead; i++)
+	{
+		OffsetNumber off = *offnum++;
+		ItemId		lp = PageGetItemId(page, off);
+
+		ItemIdSetDead(lp);
+	}
+
+	/* Update all now-unused line pointers */
+	offnum = nowunused;
+	for (i = 0; i < nunused; i++)
+	{
+		OffsetNumber off = *offnum++;
+		ItemId		lp = PageGetItemId(page, off);
+
+		ItemIdSetUnused(lp);
+	}
+
+	/*
+	 * Finally, repair any fragmentation, and update the page's hint bit about
+	 * whether it has free pointers.
+	 */
+	PageRepairFragmentation(page);
+}
+
+
+/*
+ * For all items in this page, find their respective root line pointers.
+ * If item k is part of a HOT-chain with root at item j, then we set
+ * root_offsets[k - 1] = j.
+ *
+ * The passed-in root_offsets array must have MaxHeapTuplesPerPage entries.
+ * We zero out all unused entries.
+ *
+ * The function must be called with at least share lock on the buffer, to
+ * prevent concurrent prune operations.
+ *
+ * Note: The information collected here is valid only as long as the caller
+ * holds a pin on the buffer. Once pin is released, a tuple might be pruned
+ * and reused by a completely unrelated tuple.
+ */
+void
+heap_get_root_tuples(Page page, OffsetNumber *root_offsets)
+{
+	OffsetNumber offnum,
+				maxoff;
+
+	MemSet(root_offsets, 0, MaxHeapTuplesPerPage * sizeof(OffsetNumber));
+
+	maxoff = PageGetMaxOffsetNumber(page);
+	for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum++)
+	{
+		ItemId		lp = PageGetItemId(page, offnum);
+		HeapTupleHeader htup;
+		OffsetNumber nextoffnum;
+		TransactionId priorXmax;
+
+		/* skip unused and dead items */
+		if (!ItemIdIsUsed(lp) || ItemIdIsDead(lp))
+			continue;
+
+		if (ItemIdIsNormal(lp))
+		{
+			htup = (HeapTupleHeader) PageGetItem(page, lp);
+
+			/*
+			 * Check if this tuple is part of a HOT-chain rooted at some other
+			 * tuple. If so, skip it for now; we'll process it when we find
+			 * its root.
+			 */
+			if (HeapTupleHeaderIsHeapOnly(htup))
+				continue;
+
+			/*
+			 * This is either a plain tuple or the root of a HOT-chain.
+			 * Remember it in the mapping.
+			 */
+			root_offsets[offnum - 1] = offnum;
+
+			/* If it's not the start of a HOT-chain, we're done with it */
+			if (!HeapTupleHeaderIsHotUpdated(htup))
+				continue;
+
+			/* Set up to scan the HOT-chain */
+			nextoffnum = ItemPointerGetOffsetNumber(&htup->t_ctid);
+			priorXmax = HeapTupleHeaderGetXmax(htup);
+		}
+		else
+		{
+			/* Must be a redirect item. We do not set its root_offsets entry */
+			Assert(ItemIdIsRedirected(lp));
+			/* Set up to scan the HOT-chain */
+			nextoffnum = ItemIdGetRedirect(lp);
+			priorXmax = InvalidTransactionId;
+		}
+
+		/*
+		 * Now follow the HOT-chain and collect other tuples in the chain.
+		 *
+		 * Note: Even though this is a nested loop, the complexity of the
+		 * function is O(N) because a tuple in the page should be visited not
+		 * more than twice, once in the outer loop and once in HOT-chain
+		 * chases.
+		 */
+		for (;;)
+		{
+			lp = PageGetItemId(page, nextoffnum);
+
+			/* Check for broken chains */
+			if (!ItemIdIsNormal(lp))
+				break;
+
+			htup = (HeapTupleHeader) PageGetItem(page, lp);
+
+			if (TransactionIdIsValid(priorXmax) &&
+				!TransactionIdEquals(priorXmax, HeapTupleHeaderGetXmin(htup)))
+				break;
+
+			/* Remember the root line pointer for this item */
+			root_offsets[nextoffnum - 1] = offnum;
+
+			/* Advance to next chain member, if any */
+			if (!HeapTupleHeaderIsHotUpdated(htup))
+				break;
+
+			nextoffnum = ItemPointerGetOffsetNumber(&htup->t_ctid);
+			priorXmax = HeapTupleHeaderGetXmax(htup);
+		}
+	}
+}
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
new file mode 100644
index 000000000000..35bd3630da23
--- /dev/null
+++ b/src/backend/access/heap/rewriteheap.c
@@ -0,0 +1,660 @@
+/*-------------------------------------------------------------------------
+ *
+ * rewriteheap.c
+ *	  Support functions to rewrite tables.
+ *
+ * These functions provide a facility to completely rewrite a heap, while
+ * preserving visibility information and update chains.
+ *
+ * INTERFACE
+ *
+ * The caller is responsible for creating the new heap, all catalog
+ * changes, supplying the tuples to be written to the new heap, and
+ * rebuilding indexes.	The caller must hold AccessExclusiveLock on the
+ * target table, because we assume no one else is writing into it.
+ *
+ * To use the facility:
+ *
+ * begin_heap_rewrite
+ * while (fetch next tuple)
+ * {
+ *	   if (tuple is dead)
+ *		   rewrite_heap_dead_tuple
+ *	   else
+ *	   {
+ *		   // do any transformations here if required
+ *		   rewrite_heap_tuple
+ *	   }
+ * }
+ * end_heap_rewrite
+ *
+ * The contents of the new relation shouldn't be relied on until after
+ * end_heap_rewrite is called.
+ *
+ *
+ * IMPLEMENTATION
+ *
+ * This would be a fairly trivial affair, except that we need to maintain
+ * the ctid chains that link versions of an updated tuple together.
+ * Since the newly stored tuples will have tids different from the original
+ * ones, if we just copied t_ctid fields to the new table the links would
+ * be wrong.  When we are required to copy a (presumably recently-dead or
+ * delete-in-progress) tuple whose ctid doesn't point to itself, we have
+ * to substitute the correct ctid instead.
+ *
+ * For each ctid reference from A -> B, we might encounter either A first
+ * or B first.	(Note that a tuple in the middle of a chain is both A and B
+ * of different pairs.)
+ *
+ * If we encounter A first, we'll store the tuple in the unresolved_tups
+ * hash table. When we later encounter B, we remove A from the hash table,
+ * fix the ctid to point to the new location of B, and insert both A and B
+ * to the new heap.
+ *
+ * If we encounter B first, we can insert B to the new heap right away.
+ * We then add an entry to the old_new_tid_map hash table showing B's
+ * original tid (in the old heap) and new tid (in the new heap).
+ * When we later encounter A, we get the new location of B from the table,
+ * and can write A immediately with the correct ctid.
+ *
+ * Entries in the hash tables can be removed as soon as the later tuple
+ * is encountered.	That helps to keep the memory usage down.  At the end,
+ * both tables are usually empty; we should have encountered both A and B
+ * of each pair.  However, it's possible for A to be RECENTLY_DEAD and B
+ * entirely DEAD according to HeapTupleSatisfiesVacuum, because the test
+ * for deadness using OldestXmin is not exact.	In such a case we might
+ * encounter B first, and skip it, and find A later.  Then A would be added
+ * to unresolved_tups, and stay there until end of the rewrite.  Since
+ * this case is very unusual, we don't worry about the memory usage.
+ *
+ * Using in-memory hash tables means that we use some memory for each live
+ * update chain in the table, from the time we find one end of the
+ * reference until we find the other end.  That shouldn't be a problem in
+ * practice, but if you do something like an UPDATE without a where-clause
+ * on a large table, and then run CLUSTER in the same transaction, you
+ * could run out of memory.  It doesn't seem worthwhile to add support for
+ * spill-to-disk, as there shouldn't be that many RECENTLY_DEAD tuples in a
+ * table under normal circumstances.  Furthermore, in the typical scenario
+ * of CLUSTERing on an unchanging key column, we'll see all the versions
+ * of a given tuple together anyway, and so the peak memory usage is only
+ * proportional to the number of RECENTLY_DEAD versions of a single row, not
+ * in the whole table.	Note that if we do fail halfway through a CLUSTER,
+ * the old table is still valid, so failure is not catastrophic.
+ *
+ * We can't use the normal heap_insert function to insert into the new
+ * heap, because heap_insert overwrites the visibility information.
+ * We use a special-purpose raw_heap_insert function instead, which
+ * is optimized for bulk inserting a lot of tuples, knowing that we have
+ * exclusive access to the heap.  raw_heap_insert builds new pages in
+ * local storage.  When a page is full, or at the end of the process,
+ * we insert it to WAL as a single record and then write it to disk
+ * directly through smgr.  Note, however, that any data sent to the new
+ * heap's TOAST table will go through the normal bufmgr.
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994-5, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.10 2008/01/01 19:45:46 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/rewriteheap.h"
+#include "access/transam.h"
+#include "access/tuptoaster.h"
+#include "storage/smgr.h"
+#include "utils/memutils.h"
+
+
+/*
+ * State associated with a rewrite operation. This is opaque to the user
+ * of the rewrite facility.
+ */
+typedef struct RewriteStateData
+{
+	Relation	rs_new_rel;		/* destination heap */
+	Page		rs_buffer;		/* page currently being built */
+	BlockNumber rs_blockno;		/* block where page will go */
+	bool		rs_buffer_valid;	/* T if any tuples in buffer */
+	bool		rs_use_wal;		/* must we WAL-log inserts? */
+	TransactionId rs_oldest_xmin;		/* oldest xmin used by caller to
+										 * determine tuple visibility */
+	TransactionId rs_freeze_xid;/* Xid that will be used as freeze cutoff
+								 * point */
+	MemoryContext rs_cxt;		/* for hash tables and entries and tuples in
+								 * them */
+	HTAB	   *rs_unresolved_tups;		/* unmatched A tuples */
+	HTAB	   *rs_old_new_tid_map;		/* unmatched B tuples */
+} RewriteStateData;
+
+/*
+ * The lookup keys for the hash tables are tuple TID and xmin (we must check
+ * both to avoid false matches from dead tuples).  Beware that there is
+ * probably some padding space in this struct; it must be zeroed out for
+ * correct hashtable operation.
+ */
+typedef struct
+{
+	TransactionId xmin;			/* tuple xmin */
+	ItemPointerData tid;		/* tuple location in old heap */
+} TidHashKey;
+
+/*
+ * Entry structures for the hash tables
+ */
+typedef struct
+{
+	TidHashKey	key;			/* expected xmin/old location of B tuple */
+	ItemPointerData old_tid;	/* A's location in the old heap */
+	HeapTuple	tuple;			/* A's tuple contents */
+} UnresolvedTupData;
+
+typedef UnresolvedTupData *UnresolvedTup;
+
+typedef struct
+{
+	TidHashKey	key;			/* actual xmin/old location of B tuple */
+	ItemPointerData new_tid;	/* where we put it in the new heap */
+} OldToNewMappingData;
+
+typedef OldToNewMappingData *OldToNewMapping;
+
+
+/* prototypes for internal functions */
+static void raw_heap_insert(RewriteState state, HeapTuple tup);
+
+
+/*
+ * Begin a rewrite of a table
+ *
+ * new_heap		new, locked heap relation to insert tuples to
+ * oldest_xmin	xid used by the caller to determine which tuples are dead
+ * freeze_xid	xid before which tuples will be frozen
+ * use_wal		should the inserts to the new heap be WAL-logged?
+ *
+ * Returns an opaque RewriteState, allocated in current memory context,
+ * to be used in subsequent calls to the other functions.
+ */
+RewriteState
+begin_heap_rewrite(Relation new_heap, TransactionId oldest_xmin,
+				   TransactionId freeze_xid, bool use_wal)
+{
+	RewriteState state;
+	MemoryContext rw_cxt;
+	MemoryContext old_cxt;
+	HASHCTL		hash_ctl;
+
+	/*
+	 * To ease cleanup, make a separate context that will contain the
+	 * RewriteState struct itself plus all subsidiary data.
+	 */
+	rw_cxt = AllocSetContextCreate(CurrentMemoryContext,
+								   "Table rewrite",
+								   ALLOCSET_DEFAULT_MINSIZE,
+								   ALLOCSET_DEFAULT_INITSIZE,
+								   ALLOCSET_DEFAULT_MAXSIZE);
+	old_cxt = MemoryContextSwitchTo(rw_cxt);
+
+	/* Create and fill in the state struct */
+	state = palloc0(sizeof(RewriteStateData));
+
+	state->rs_new_rel = new_heap;
+	state->rs_buffer = (Page) palloc(BLCKSZ);
+	/* new_heap needn't be empty, just locked */
+	state->rs_blockno = RelationGetNumberOfBlocks(new_heap);
+	state->rs_buffer_valid = false;
+	state->rs_use_wal = use_wal;
+	state->rs_oldest_xmin = oldest_xmin;
+	state->rs_freeze_xid = freeze_xid;
+	state->rs_cxt = rw_cxt;
+
+	/* Initialize hash tables used to track update chains */
+	memset(&hash_ctl, 0, sizeof(hash_ctl));
+	hash_ctl.keysize = sizeof(TidHashKey);
+	hash_ctl.entrysize = sizeof(UnresolvedTupData);
+	hash_ctl.hcxt = state->rs_cxt;
+	hash_ctl.hash = tag_hash;
+
+	state->rs_unresolved_tups =
+		hash_create("Rewrite / Unresolved ctids",
+					128,		/* arbitrary initial size */
+					&hash_ctl,
+					HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT);
+
+	hash_ctl.entrysize = sizeof(OldToNewMappingData);
+
+	state->rs_old_new_tid_map =
+		hash_create("Rewrite / Old to new tid map",
+					128,		/* arbitrary initial size */
+					&hash_ctl,
+					HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT);
+
+	MemoryContextSwitchTo(old_cxt);
+
+	return state;
+}
+
+/*
+ * End a rewrite.
+ *
+ * state and any other resources are freed.
+ */
+void
+end_heap_rewrite(RewriteState state)
+{
+	HASH_SEQ_STATUS seq_status;
+	UnresolvedTup unresolved;
+
+	/*
+	 * Write any remaining tuples in the UnresolvedTups table. If we have any
+	 * left, they should in fact be dead, but let's err on the safe side.
+	 *
+	 * XXX this really is a waste of code no?
+	 */
+	hash_seq_init(&seq_status, state->rs_unresolved_tups);
+
+	while ((unresolved = hash_seq_search(&seq_status)) != NULL)
+	{
+		ItemPointerSetInvalid(&unresolved->tuple->t_data->t_ctid);
+		raw_heap_insert(state, unresolved->tuple);
+	}
+
+	/* Write the last page, if any */
+	if (state->rs_buffer_valid)
+	{
+		if (state->rs_use_wal)
+			log_newpage(&state->rs_new_rel->rd_node,
+						state->rs_blockno,
+						state->rs_buffer);
+		RelationOpenSmgr(state->rs_new_rel);
+		smgrextend(state->rs_new_rel->rd_smgr, state->rs_blockno,
+				   (char *) state->rs_buffer, true);
+	}
+
+	/*
+	 * If the rel isn't temp, must fsync before commit.  We use heap_sync to
+	 * ensure that the toast table gets fsync'd too.
+	 *
+	 * It's obvious that we must do this when not WAL-logging. It's less
+	 * obvious that we have to do it even if we did WAL-log the pages. The
+	 * reason is the same as in tablecmds.c's copy_relation_data(): we're
+	 * writing data that's not in shared buffers, and so a CHECKPOINT
+	 * occurring during the rewriteheap operation won't have fsync'd data we
+	 * wrote before the checkpoint.
+	 */
+	if (!state->rs_new_rel->rd_istemp)
+		heap_sync(state->rs_new_rel);
+
+	/* Deleting the context frees everything */
+	MemoryContextDelete(state->rs_cxt);
+}
+
+/*
+ * Add a tuple to the new heap.
+ *
+ * Visibility information is copied from the original tuple, except that
+ * we "freeze" very-old tuples.  Note that since we scribble on new_tuple,
+ * it had better be temp storage not a pointer to the original tuple.
+ *
+ * state		opaque state as returned by begin_heap_rewrite
+ * old_tuple	original tuple in the old heap
+ * new_tuple	new, rewritten tuple to be inserted to new heap
+ */
+void
+rewrite_heap_tuple(RewriteState state,
+				   HeapTuple old_tuple, HeapTuple new_tuple)
+{
+	MemoryContext old_cxt;
+	ItemPointerData old_tid;
+	TidHashKey	hashkey;
+	bool		found;
+	bool		free_new;
+
+	old_cxt = MemoryContextSwitchTo(state->rs_cxt);
+
+	/*
+	 * Copy the original tuple's visibility information into new_tuple.
+	 *
+	 * XXX we might later need to copy some t_infomask2 bits, too? Right now,
+	 * we intentionally clear the HOT status bits.
+	 */
+	memcpy(&new_tuple->t_data->t_choice.t_heap,
+		   &old_tuple->t_data->t_choice.t_heap,
+		   sizeof(HeapTupleFields));
+
+	new_tuple->t_data->t_infomask &= ~HEAP_XACT_MASK;
+	new_tuple->t_data->t_infomask2 &= ~HEAP2_XACT_MASK;
+	new_tuple->t_data->t_infomask |=
+		old_tuple->t_data->t_infomask & HEAP_XACT_MASK;
+
+	/*
+	 * While we have our hands on the tuple, we may as well freeze any
+	 * very-old xmin or xmax, so that future VACUUM effort can be saved.
+	 *
+	 * Note we abuse heap_freeze_tuple() a bit here, since it's expecting to
+	 * be given a pointer to a tuple in a disk buffer.	It happens though that
+	 * we can get the right things to happen by passing InvalidBuffer for the
+	 * buffer.
+	 */
+	heap_freeze_tuple(new_tuple->t_data, state->rs_freeze_xid, InvalidBuffer);
+
+	/*
+	 * Invalid ctid means that ctid should point to the tuple itself. We'll
+	 * override it later if the tuple is part of an update chain.
+	 */
+	ItemPointerSetInvalid(&new_tuple->t_data->t_ctid);
+
+	/*
+	 * If the tuple has been updated, check the old-to-new mapping hash table.
+	 */
+	if (!(old_tuple->t_data->t_infomask & (HEAP_XMAX_INVALID |
+										   HEAP_IS_LOCKED)) &&
+		!(ItemPointerEquals(&(old_tuple->t_self),
+							&(old_tuple->t_data->t_ctid))))
+	{
+		OldToNewMapping mapping;
+
+		memset(&hashkey, 0, sizeof(hashkey));
+		hashkey.xmin = HeapTupleHeaderGetXmax(old_tuple->t_data);
+		hashkey.tid = old_tuple->t_data->t_ctid;
+
+		mapping = (OldToNewMapping)
+			hash_search(state->rs_old_new_tid_map, &hashkey,
+						HASH_FIND, NULL);
+
+		if (mapping != NULL)
+		{
+			/*
+			 * We've already copied the tuple that t_ctid points to, so we can
+			 * set the ctid of this tuple to point to the new location, and
+			 * insert it right away.
+			 */
+			new_tuple->t_data->t_ctid = mapping->new_tid;
+
+			/* We don't need the mapping entry anymore */
+			hash_search(state->rs_old_new_tid_map, &hashkey,
+						HASH_REMOVE, &found);
+			Assert(found);
+		}
+		else
+		{
+			/*
+			 * We haven't seen the tuple t_ctid points to yet. Stash this
+			 * tuple into unresolved_tups to be written later.
+			 */
+			UnresolvedTup unresolved;
+
+			unresolved = hash_search(state->rs_unresolved_tups, &hashkey,
+									 HASH_ENTER, &found);
+			Assert(!found);
+
+			unresolved->old_tid = old_tuple->t_self;
+			unresolved->tuple = heap_copytuple(new_tuple);
+
+			/*
+			 * We can't do anything more now, since we don't know where the
+			 * tuple will be written.
+			 */
+			MemoryContextSwitchTo(old_cxt);
+			return;
+		}
+	}
+
+	/*
+	 * Now we will write the tuple, and then check to see if it is the B tuple
+	 * in any new or known pair.  When we resolve a known pair, we will be
+	 * able to write that pair's A tuple, and then we have to check if it
+	 * resolves some other pair.  Hence, we need a loop here.
+	 */
+	old_tid = old_tuple->t_self;
+	free_new = false;
+
+	for (;;)
+	{
+		ItemPointerData new_tid;
+
+		/* Insert the tuple and find out where it's put in new_heap */
+		raw_heap_insert(state, new_tuple);
+		new_tid = new_tuple->t_self;
+
+		/*
+		 * If the tuple is the updated version of a row, and the prior version
+		 * wouldn't be DEAD yet, then we need to either resolve the prior
+		 * version (if it's waiting in rs_unresolved_tups), or make an entry
+		 * in rs_old_new_tid_map (so we can resolve it when we do see it). The
+		 * previous tuple's xmax would equal this one's xmin, so it's
+		 * RECENTLY_DEAD if and only if the xmin is not before OldestXmin.
+		 */
+		if ((new_tuple->t_data->t_infomask & HEAP_UPDATED) &&
+			!TransactionIdPrecedes(HeapTupleHeaderGetXmin(new_tuple->t_data),
+								   state->rs_oldest_xmin))
+		{
+			/*
+			 * Okay, this is B in an update pair.  See if we've seen A.
+			 */
+			UnresolvedTup unresolved;
+
+			memset(&hashkey, 0, sizeof(hashkey));
+			hashkey.xmin = HeapTupleHeaderGetXmin(new_tuple->t_data);
+			hashkey.tid = old_tid;
+
+			unresolved = hash_search(state->rs_unresolved_tups, &hashkey,
+									 HASH_FIND, NULL);
+
+			if (unresolved != NULL)
+			{
+				/*
+				 * We have seen and memorized the previous tuple already. Now
+				 * that we know where we inserted the tuple its t_ctid points
+				 * to, fix its t_ctid and insert it to the new heap.
+				 */
+				if (free_new)
+					heap_freetuple(new_tuple);
+				new_tuple = unresolved->tuple;
+				free_new = true;
+				old_tid = unresolved->old_tid;
+				new_tuple->t_data->t_ctid = new_tid;
+
+				/*
+				 * We don't need the hash entry anymore, but don't free its
+				 * tuple just yet.
+				 */
+				hash_search(state->rs_unresolved_tups, &hashkey,
+							HASH_REMOVE, &found);
+				Assert(found);
+
+				/* loop back to insert the previous tuple in the chain */
+				continue;
+			}
+			else
+			{
+				/*
+				 * Remember the new tid of this tuple. We'll use it to set the
+				 * ctid when we find the previous tuple in the chain.
+				 */
+				OldToNewMapping mapping;
+
+				mapping = hash_search(state->rs_old_new_tid_map, &hashkey,
+									  HASH_ENTER, &found);
+				Assert(!found);
+
+				mapping->new_tid = new_tid;
+			}
+		}
+
+		/* Done with this (chain of) tuples, for now */
+		if (free_new)
+			heap_freetuple(new_tuple);
+		break;
+	}
+
+	MemoryContextSwitchTo(old_cxt);
+}
+
+/*
+ * Register a dead tuple with an ongoing rewrite. Dead tuples are not
+ * copied to the new table, but we still make note of them so that we
+ * can release some resources earlier.
+ */
+void
+rewrite_heap_dead_tuple(RewriteState state, HeapTuple old_tuple)
+{
+	/*
+	 * If we have already seen an earlier tuple in the update chain that
+	 * points to this tuple, let's forget about that earlier tuple. It's in
+	 * fact dead as well, our simple xmax < OldestXmin test in
+	 * HeapTupleSatisfiesVacuum just wasn't enough to detect it. It happens
+	 * when xmin of a tuple is greater than xmax, which sounds
+	 * counter-intuitive but is perfectly valid.
+	 *
+	 * We don't bother to try to detect the situation the other way round,
+	 * when we encounter the dead tuple first and then the recently dead one
+	 * that points to it. If that happens, we'll have some unmatched entries
+	 * in the UnresolvedTups hash table at the end. That can happen anyway,
+	 * because a vacuum might have removed the dead tuple in the chain before
+	 * us.
+	 */
+	UnresolvedTup unresolved;
+	TidHashKey	hashkey;
+	bool		found;
+
+	memset(&hashkey, 0, sizeof(hashkey));
+	hashkey.xmin = HeapTupleHeaderGetXmin(old_tuple->t_data);
+	hashkey.tid = old_tuple->t_self;
+
+	unresolved = hash_search(state->rs_unresolved_tups, &hashkey,
+							 HASH_FIND, NULL);
+
+	if (unresolved != NULL)
+	{
+		/* Need to free the contained tuple as well as the hashtable entry */
+		heap_freetuple(unresolved->tuple);
+		hash_search(state->rs_unresolved_tups, &hashkey,
+					HASH_REMOVE, &found);
+		Assert(found);
+	}
+}
+
+/*
+ * Insert a tuple to the new relation.	This has to track heap_insert
+ * and its subsidiary functions!
+ *
+ * t_self of the tuple is set to the new TID of the tuple. If t_ctid of the
+ * tuple is invalid on entry, it's replaced with the new TID as well (in
+ * the inserted data only, not in the caller's copy).
+ */
+static void
+raw_heap_insert(RewriteState state, HeapTuple tup)
+{
+	Page		page = state->rs_buffer;
+	Size		pageFreeSpace,
+				saveFreeSpace;
+	Size		len;
+	OffsetNumber newoff;
+	HeapTuple	heaptup;
+
+	/*
+	 * If the new tuple is too big for storage or contains already toasted
+	 * out-of-line attributes from some other relation, invoke the toaster.
+	 *
+	 * Note: below this point, heaptup is the data we actually intend to store
+	 * into the relation; tup is the caller's original untoasted data.
+	 */
+	if (state->rs_new_rel->rd_rel->relkind == RELKIND_TOASTVALUE)
+	{
+		/* toast table entries should never be recursively toasted */
+		Assert(!HeapTupleHasExternal(tup));
+		heaptup = tup;
+	}
+	else if (HeapTupleHasExternal(tup) || tup->t_len > TOAST_TUPLE_THRESHOLD)
+		heaptup = toast_insert_or_update(state->rs_new_rel, tup, NULL, NULL,
+										 TOAST_TUPLE_TARGET, false,
+										 state->rs_use_wal, false);
+	else
+		heaptup = tup;
+
+	len = MAXALIGN(heaptup->t_len);		/* be conservative */
+
+	/*
+	 * If we're gonna fail for oversize tuple, do it right away
+	 */
+	if (len > MaxHeapTupleSize)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("row is too big: size %lu, maximum size %lu",
+						(unsigned long) len,
+						(unsigned long) MaxHeapTupleSize)));
+
+	/* Compute desired extra freespace due to fillfactor option */
+	saveFreeSpace = RelationGetTargetPageFreeSpace(state->rs_new_rel,
+												   HEAP_DEFAULT_FILLFACTOR);
+
+	/* Now we can check to see if there's enough free space already. */
+	if (state->rs_buffer_valid)
+	{
+		pageFreeSpace = PageGetHeapFreeSpace(page);
+
+		if (len + saveFreeSpace > pageFreeSpace)
+		{
+			/* Doesn't fit, so write out the existing page */
+
+			/* XLOG stuff */
+			if (state->rs_use_wal)
+				log_newpage(&state->rs_new_rel->rd_node,
+							state->rs_blockno,
+							page);
+
+			/*
+			 * Now write the page. We say isTemp = true even if it's not a
+			 * temp table, because there's no need for smgr to schedule an
+			 * fsync for this write; we'll do it ourselves in
+			 * end_heap_rewrite.
+			 */
+			RelationOpenSmgr(state->rs_new_rel);
+			smgrextend(state->rs_new_rel->rd_smgr, state->rs_blockno,
+					   (char *) page, true);
+
+			state->rs_blockno++;
+			state->rs_buffer_valid = false;
+		}
+	}
+
+	if (!state->rs_buffer_valid)
+	{
+		/* Initialize a new empty page */
+		PageInit(page, BLCKSZ, 0);
+		state->rs_buffer_valid = true;
+	}
+
+	/* And now we can insert the tuple into the page */
+	newoff = PageAddItem(page, (Item) heaptup->t_data, heaptup->t_len,
+						 InvalidOffsetNumber, false, true);
+	if (newoff == InvalidOffsetNumber)
+		elog(ERROR, "failed to add tuple");
+
+	/* Update caller's t_self to the actual position where it was stored */
+	ItemPointerSet(&(tup->t_self), state->rs_blockno, newoff);
+
+	/*
+	 * Insert the correct position into CTID of the stored tuple, too, if the
+	 * caller didn't supply a valid CTID.
+	 */
+	if (!ItemPointerIsValid(&tup->t_data->t_ctid))
+	{
+		ItemId		newitemid;
+		HeapTupleHeader onpage_tup;
+
+		newitemid = PageGetItemId(page, newoff);
+		onpage_tup = (HeapTupleHeader) PageGetItem(page, newitemid);
+
+		onpage_tup->t_ctid = tup->t_self;
+	}
+
+	/* If heaptup is a private copy, release it. */
+	if (heaptup != tup)
+		heap_freetuple(heaptup);
+}
diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c
new file mode 100644
index 000000000000..30e5696a9e94
--- /dev/null
+++ b/src/backend/access/heap/syncscan.c
@@ -0,0 +1,318 @@
+/*-------------------------------------------------------------------------
+ *
+ * syncscan.c
+ *	  heap scan synchronization support
+ *
+ * When multiple backends run a sequential scan on the same table, we try
+ * to keep them synchronized to reduce the overall I/O needed.	The goal is
+ * to read each page into shared buffer cache only once, and let all backends
+ * that take part in the shared scan process the page before it falls out of
+ * the cache.
+ *
+ * Since the "leader" in a pack of backends doing a seqscan will have to wait
+ * for I/O, while the "followers" don't, there is a strong self-synchronizing
+ * effect once we can get the backends examining approximately the same part
+ * of the table at the same time.  Hence all that is really needed is to get
+ * a new backend beginning a seqscan to begin it close to where other backends
+ * are reading.  We can scan the table circularly, from block X up to the
+ * end and then from block 0 to X-1, to ensure we visit all rows while still
+ * participating in the common scan.
+ *
+ * To accomplish that, we keep track of the scan position of each table, and
+ * start new scans close to where the previous scan(s) are.  We don't try to
+ * do any extra synchronization to keep the scans together afterwards; some
+ * scans might progress much more slowly than others, for example if the
+ * results need to be transferred to the client over a slow network, and we
+ * don't want such queries to slow down others.
+ *
+ * There can realistically only be a few large sequential scans on different
+ * tables in progress at any time.	Therefore we just keep the scan positions
+ * in a small LRU list which we scan every time we need to look up or update a
+ * scan position.  The whole mechanism is only applied for tables exceeding
+ * a threshold size (but that is not the concern of this module).
+ *
+ * INTERFACE ROUTINES
+ *		ss_get_location		- return current scan location of a relation
+ *		ss_report_location	- update current scan location
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/syncscan.c,v 1.4 2008/01/01 19:45:46 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "miscadmin.h"
+
+
+/* GUC variables */
+#ifdef TRACE_SYNCSCAN
+bool		trace_syncscan = false;
+#endif
+
+
+/*
+ * Size of the LRU list.
+ *
+ * Note: the code assumes that SYNC_SCAN_NELEM > 1.
+ *
+ * XXX: What's a good value? It should be large enough to hold the
+ * maximum number of large tables scanned simultaneously.  But a larger value
+ * means more traversing of the LRU list when starting a new scan.
+ */
+#define SYNC_SCAN_NELEM 20
+
+/*
+ * Interval between reports of the location of the current scan, in pages.
+ *
+ * Note: This should be smaller than the ring size (see buffer/freelist.c)
+ * we use for bulk reads.  Otherwise a scan joining other scans might start
+ * from a page that's no longer in the buffer cache.  This is a bit fuzzy;
+ * there's no guarantee that the new scan will read the page before it leaves
+ * the buffer cache anyway, and on the other hand the page is most likely
+ * still in the OS cache.
+ */
+#define SYNC_SCAN_REPORT_INTERVAL (128 * 1024 / BLCKSZ)
+
+
+/*
+ * The scan locations structure is essentially a doubly-linked LRU with head
+ * and tail pointer, but designed to hold a fixed maximum number of elements in
+ * fixed-size shared memory.
+ */
+typedef struct ss_scan_location_t
+{
+	RelFileNode relfilenode;	/* identity of a relation */
+	BlockNumber location;		/* last-reported location in the relation */
+} ss_scan_location_t;
+
+typedef struct ss_lru_item_t
+{
+	struct ss_lru_item_t *prev;
+	struct ss_lru_item_t *next;
+	ss_scan_location_t location;
+} ss_lru_item_t;
+
+typedef struct ss_scan_locations_t
+{
+	ss_lru_item_t *head;
+	ss_lru_item_t *tail;
+	ss_lru_item_t items[1];		/* SYNC_SCAN_NELEM items */
+} ss_scan_locations_t;
+
+#define SizeOfScanLocations(N) offsetof(ss_scan_locations_t, items[N])
+
+/* Pointer to struct in shared memory */
+static ss_scan_locations_t *scan_locations;
+
+/* prototypes for internal functions */
+static BlockNumber ss_search(RelFileNode relfilenode,
+		  BlockNumber location, bool set);
+
+
+/*
+ * SyncScanShmemSize --- report amount of shared memory space needed
+ */
+Size
+SyncScanShmemSize(void)
+{
+	return SizeOfScanLocations(SYNC_SCAN_NELEM);
+}
+
+/*
+ * SyncScanShmemInit --- initialize this module's shared memory
+ */
+void
+SyncScanShmemInit(void)
+{
+	int			i;
+	bool		found;
+
+	scan_locations = (ss_scan_locations_t *)
+		ShmemInitStruct("Sync Scan Locations List",
+						SizeOfScanLocations(SYNC_SCAN_NELEM),
+						&found);
+
+	if (!IsUnderPostmaster)
+	{
+		/* Initialize shared memory area */
+		Assert(!found);
+
+		scan_locations->head = &scan_locations->items[0];
+		scan_locations->tail = &scan_locations->items[SYNC_SCAN_NELEM - 1];
+
+		for (i = 0; i < SYNC_SCAN_NELEM; i++)
+		{
+			ss_lru_item_t *item = &scan_locations->items[i];
+
+			/*
+			 * Initialize all slots with invalid values. As scans are started,
+			 * these invalid entries will fall off the LRU list and get
+			 * replaced with real entries.
+			 */
+			item->location.relfilenode.spcNode = InvalidOid;
+			item->location.relfilenode.dbNode = InvalidOid;
+			item->location.relfilenode.relNode = InvalidOid;
+			item->location.location = InvalidBlockNumber;
+
+			item->prev = (i > 0) ?
+				(&scan_locations->items[i - 1]) : NULL;
+			item->next = (i < SYNC_SCAN_NELEM - 1) ?
+				(&scan_locations->items[i + 1]) : NULL;
+		}
+	}
+	else
+		Assert(found);
+}
+
+/*
+ * ss_search --- search the scan_locations structure for an entry with the
+ *		given relfilenode.
+ *
+ * If "set" is true, the location is updated to the given location.  If no
+ * entry for the given relfilenode is found, it will be created at the head
+ * of the list with the given location, even if "set" is false.
+ *
+ * In any case, the location after possible update is returned.
+ *
+ * Caller is responsible for having acquired suitable lock on the shared
+ * data structure.
+ */
+static BlockNumber
+ss_search(RelFileNode relfilenode, BlockNumber location, bool set)
+{
+	ss_lru_item_t *item;
+
+	item = scan_locations->head;
+	for (;;)
+	{
+		bool		match;
+
+		match = RelFileNodeEquals(item->location.relfilenode, relfilenode);
+
+		if (match || item->next == NULL)
+		{
+			/*
+			 * If we reached the end of list and no match was found, take over
+			 * the last entry
+			 */
+			if (!match)
+			{
+				item->location.relfilenode = relfilenode;
+				item->location.location = location;
+			}
+			else if (set)
+				item->location.location = location;
+
+			/* Move the entry to the front of the LRU list */
+			if (item != scan_locations->head)
+			{
+				/* unlink */
+				if (item == scan_locations->tail)
+					scan_locations->tail = item->prev;
+				item->prev->next = item->next;
+				if (item->next)
+					item->next->prev = item->prev;
+
+				/* link */
+				item->prev = NULL;
+				item->next = scan_locations->head;
+				scan_locations->head->prev = item;
+				scan_locations->head = item;
+			}
+
+			return item->location.location;
+		}
+
+		item = item->next;
+	}
+
+	/* not reached */
+}
+
+/*
+ * ss_get_location --- get the optimal starting location for scan
+ *
+ * Returns the last-reported location of a sequential scan on the
+ * relation, or 0 if no valid location is found.
+ *
+ * We expect the caller has just done RelationGetNumberOfBlocks(), and
+ * so that number is passed in rather than computing it again.	The result
+ * is guaranteed less than relnblocks (assuming that's > 0).
+ */
+BlockNumber
+ss_get_location(Relation rel, BlockNumber relnblocks)
+{
+	BlockNumber startloc;
+
+	LWLockAcquire(SyncScanLock, LW_EXCLUSIVE);
+	startloc = ss_search(rel->rd_node, 0, false);
+	LWLockRelease(SyncScanLock);
+
+	/*
+	 * If the location is not a valid block number for this scan, start at 0.
+	 *
+	 * This can happen if for instance a VACUUM truncated the table since the
+	 * location was saved.
+	 */
+	if (startloc >= relnblocks)
+		startloc = 0;
+
+#ifdef TRACE_SYNCSCAN
+	if (trace_syncscan)
+		elog(LOG,
+			 "SYNC_SCAN: start \"%s\" (size %u) at %u",
+			 RelationGetRelationName(rel), relnblocks, startloc);
+#endif
+
+	return startloc;
+}
+
+/*
+ * ss_report_location --- update the current scan location
+ *
+ * Writes an entry into the shared Sync Scan state of the form
+ * (relfilenode, blocknumber), overwriting any existing entry for the
+ * same relfilenode.
+ */
+void
+ss_report_location(Relation rel, BlockNumber location)
+{
+#ifdef TRACE_SYNCSCAN
+	if (trace_syncscan)
+	{
+		if ((location % 1024) == 0)
+			elog(LOG,
+				 "SYNC_SCAN: scanning \"%s\" at %u",
+				 RelationGetRelationName(rel), location);
+	}
+#endif
+
+	/*
+	 * To reduce lock contention, only report scan progress every N pages. For
+	 * the same reason, don't block if the lock isn't immediately available.
+	 * Missing a few updates isn't critical, it just means that a new scan
+	 * that wants to join the pack will start a little bit behind the head of
+	 * the scan.  Hopefully the pages are still in OS cache and the scan
+	 * catches up quickly.
+	 */
+	if ((location % SYNC_SCAN_REPORT_INTERVAL) == 0)
+	{
+		if (LWLockConditionalAcquire(SyncScanLock, LW_EXCLUSIVE))
+		{
+			(void) ss_search(rel->rd_node, location, true);
+			LWLockRelease(SyncScanLock);
+		}
+#ifdef TRACE_SYNCSCAN
+		else if (trace_syncscan)
+			elog(LOG,
+				 "SYNC_SCAN: missed update for \"%s\" at %u",
+				 RelationGetRelationName(rel), location);
+#endif
+	}
+}
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c
index 651d0e27255a..c7fef6e15864 100644
--- a/src/backend/access/heap/tuptoaster.c
+++ b/src/backend/access/heap/tuptoaster.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.72 2007/03/29 00:15:37 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.81.2.3 2008/06/13 02:59:52 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -43,71 +43,6 @@
 
 #undef TOAST_DEBUG
 
-/* ----------------
- * struct varattrib is the header of a varlena object that may have been
- * TOASTed.  Generally, only the code closely associated with TOAST logic
- * should mess directly with struct varattrib or use the VARATT_FOO macros.
- * ----------------
- */
-
-typedef union varattrib
-{
-	struct						/* Normal varlena (4-byte length) */
-	{
-		uint8 	va_header;
-		char 	va_data[1];
-	} va_1byte;
-	struct
-	{
-		uint8 	va_header;
-		uint8	va_padding[3];
-		int32	va_rawsize;		/* Plain data size */
-		int32	va_extsize;		/* External saved size */
-		Oid		va_valueid;		/* Unique identifier of value */
-		Oid		va_toastrelid;	/* RelID where to find chunks */
-	} va_external;
-	struct						/* Compressed-in-line format */
-	{
-		uint32 	va_header;
-		uint32	va_rawsize;		/* Original data size (excludes header) */
-		char	va_data[1];		/* Compressed data */
-	} va_compressed;
-	struct
-	{
-		uint32 	va_header;
-		char 	va_data[1];
-	} va_4byte;
-} varattrib;
-
-
-/* these are used by tuptoaster.c */
-#define VARHDRSZ_SHORT                                          1
-#define VARSIZE_SHORT_D(D)                                      VARSIZE_SHORT(DatumGetPointer(D))
-#define VARDATA_SHORT_D(D)                                      VARDATA_SHORT(DatumGetPointer(D))
-
-/* Do we want to rename these? */
-#define VARATT_IS_COMPRESSED_D(D)                       VARATT_IS_COMPRESSED(DatumGetPointer(D))
-#define VARATT_SET_COMPRESSED(PTR)                      SET_VARSIZE_C(PTR)
-
-#define VARATT_IS_EXTENDED_D(D)                         VARATT_IS_EXTENDED(DatumGetPointer(D))
-
-#define VARATT_EXTERNAL_IS_COMPRESSED(PTR)  (((varattrib*)(PTR))->va_external.va_extsize != \
-                                              ((varattrib*)(PTR))->va_external.va_rawsize - VARHDRSZ)
-#define VARSIZE_ANY_EXHDR_D(D)                      VARSIZE_ANY_EXHDR(DatumGetPointer(D))
-
-/* caution: this will not work on an external or compressed-in-line Datum */
-/* caution: this will return a possibly unaligned pointer */
-#define VARDATA_ANY_D(D)                                        VARDATA_ANY(DatumGetPointer(D))
-
-
-#define VARATT_COULD_SHORT(PTR) (VARATT_IS_4B_U(PTR) && (VARSIZE(PTR)-VARHDRSZ+VARHDRSZ_SHORT <= VARATT_SHORT_MAX))
-#define VARSIZE_TO_SHORT(PTR)   ((char)(VARSIZE(PTR)-VARHDRSZ+VARHDRSZ_SHORT) | 0x80)
-#define VARSIZE_TO_SHORT_D(D)   VARSIZE_TO_SHORT(DatumGetPointer(D))
-
-
-#define SET_VARSIZE_C(PTR)			(((varattrib_1b *) (PTR))->va_header |= 0x40)
-
-
 /* Size of an EXTERNAL datum that contains a standard TOAST pointer */
 #define TOAST_POINTER_SIZE (VARHDRSZ_EXTERNAL + sizeof(struct varatt_external))
 
@@ -118,9 +53,9 @@ typedef union varattrib
  * overhead, the former doesn't.  We never use compression unless it actually
  * saves space, so we expect either equality or less-than.
  */
-/*#define VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer) \
+#define VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer) \
 	((toast_pointer).va_extsize < (toast_pointer).va_rawsize - VARHDRSZ)
-*/
+
 /*
  * Macro to fetch the possibly-unaligned contents of an EXTERNAL datum
  * into a local "struct varatt_external" toast pointer.  This should be
@@ -132,27 +67,11 @@ typedef union varattrib
 do { \
 	varattrib_1b_e *attre = (varattrib_1b_e *) (attr); \
 	Assert(VARATT_IS_EXTERNAL(attre)); \
+	Assert(VARSIZE_EXTERNAL(attre) == sizeof(toast_pointer) + VARHDRSZ_EXTERNAL); \
 	memcpy(&(toast_pointer), VARDATA_EXTERNAL(attre), sizeof(toast_pointer)); \
 } while (0)
 
 
-/* 
- * Although this macro sets var_len_1be, data stored in GPDB might
- * not have anything set in this byte, so you can't count on it's value
- * Not really a problem, since it is always based on TOAST_POINTER_LEN
- */
-#define SET_VARSIZE_1B_E(PTR,len) \
-	(((varattrib_1b_e *) (PTR))->va_header = 0x80, \
-	 ((varattrib_1b_e *) (PTR))->va_len_1be = (len))
-
-
-#define VARRAWSIZE_4B_C(PTR) \
-	(((varattrib_4b *) (PTR))->va_compressed.va_rawsize)
-
-
-#define SET_VARSIZE_EXTERNAL(PTR, len)		SET_VARSIZE_1B_E(PTR, len)
-
-
 #define SET_VARSIZE_C(PTR)			(((varattrib_1b *) (PTR))->va_header |= 0x40)
 
 static void toast_delete_datum(Relation rel, Datum value);
@@ -175,9 +94,9 @@ static struct varlena *toast_fetch_datum_slice(struct varlena * attr,
  ----------
  */
 struct varlena *
-heap_tuple_fetch_attr(struct varlena *attr)
+heap_tuple_fetch_attr(struct varlena * attr)
 {
-	struct varlena  *result;
+	struct varlena *result;
 
 	if (VARATT_IS_EXTERNAL(attr))
 	{
@@ -198,10 +117,11 @@ heap_tuple_fetch_attr(struct varlena *attr)
 }
 
 
-/**
+/*
  * If this function is changed then update varattrib_untoast_ptr_len as well
  */
-int varattrib_untoast_len(Datum d)
+int
+varattrib_untoast_len(Datum d)
 {
 	if (DatumGetPointer(d) == NULL)
 	{
@@ -211,48 +131,47 @@ int varattrib_untoast_len(Datum d)
 				 errprintstack(true)));
 	}
 
-	struct varlena *va = (struct varlena *) DatumGetPointer(d);
-	varattrib *attr = (varattrib *) va;
+	struct varlena *attr = (struct varlena *) DatumGetPointer(d);
+	struct varlena *result;
 
 	int len = -1;
 	void *toFree = NULL;
 
-	if(VARATT_IS_EXTENDED(attr))
+	if (VARATT_IS_EXTENDED(attr))
 	{
-		if(VARATT_IS_EXTERNAL(attr))
+		if (VARATT_IS_EXTERNAL(attr))
 		{
-			attr = (varattrib *)toast_fetch_datum((struct varlena *)attr);
+			result = toast_fetch_datum(attr);
 			/* toast_fetch_datum will palloc, so set it up for free */
-			toFree = attr;
+			toFree = result;
 		}
 
-		if(VARATT_IS_COMPRESSED(attr))
+		if (VARATT_IS_COMPRESSED(attr))
 		{
 			PGLZ_Header *tmp = (PGLZ_Header *) attr;
 			len = PGLZ_RAW_SIZE(tmp);
 		}
-		else if(VARATT_IS_SHORT(attr))
+		else if (VARATT_IS_SHORT(attr))
 		{
 			len = VARSIZE_SHORT(attr) - VARHDRSZ_SHORT;
 		}
 	}
 
 	if(len == -1)
-	{
 		len = VARSIZE(attr) - VARHDRSZ;
-	}
 
-	if ( toFree)
+	if (toFree)
 		pfree(toFree);
 
 	Assert(len >= 0);
 	return len;
 }
 
-/**
+/*
  * If this function is changed then update varattrib_untoast_len as well
  */
-void varattrib_untoast_ptr_len(Datum d, char **datastart, int *len, void **tofree)
+void
+varattrib_untoast_ptr_len(Datum d, char **datastart, int *len, void **tofree)
 {
 	if (DatumGetPointer(d) == NULL)
 	{
@@ -263,24 +182,24 @@ void varattrib_untoast_ptr_len(Datum d, char **datastart, int *len, void **tofre
 	}
 
 	struct varlena *va = (struct varlena *) DatumGetPointer(d);
-	varattrib *attr = (varattrib *) va;
+	struct varlena *attr = va;
 
 	*len = -1;
 	*tofree = NULL;
 
-	if(VARATT_IS_EXTENDED(attr))
+	if (VARATT_IS_EXTENDED(va))
 	{
-		if(VARATT_IS_EXTERNAL(attr))
+		if (VARATT_IS_EXTERNAL(va))
 		{
-			attr = (varattrib *)toast_fetch_datum((struct varlena *)attr);
+			attr = toast_fetch_datum(va);
 			/* toast_fetch_datum will palloc, so set it up for free */
 			*tofree = attr;
 		}
 
-		if(VARATT_IS_COMPRESSED(attr))
+		if (VARATT_IS_COMPRESSED(attr))
 		{
 			PGLZ_Header *tmp = (PGLZ_Header *) attr;
-			attr = (varattrib *) palloc(PGLZ_RAW_SIZE(tmp) + VARHDRSZ);
+			attr = (struct varlena *) palloc(PGLZ_RAW_SIZE(tmp) + VARHDRSZ);
 			SET_VARSIZE(attr, PGLZ_RAW_SIZE(tmp) + VARHDRSZ);
 			pglz_decompress(tmp, VARDATA(attr));
 
@@ -291,7 +210,7 @@ void varattrib_untoast_ptr_len(Datum d, char **datastart, int *len, void **tofre
 				pfree(*tofree);
 			*tofree = attr;
 		}
-		else if(VARATT_IS_SHORT(attr))
+		else if (VARATT_IS_SHORT(attr))
 		{
 		    /* Warning! Return unaligned pointer! */
 			*len = VARSIZE_SHORT(attr) - VARHDRSZ_SHORT;
@@ -300,7 +219,7 @@ void varattrib_untoast_ptr_len(Datum d, char **datastart, int *len, void **tofre
 		}
 	}
 
-	if(*len == -1)
+	if (*len == -1)
 	{
 		*datastart = VARDATA(attr);
 		*len = VARSIZE(attr) - VARHDRSZ;
@@ -317,7 +236,7 @@ void varattrib_untoast_ptr_len(Datum d, char **datastart, int *len, void **tofre
  * ----------
  */
 struct varlena *
-heap_tuple_untoast_attr(struct varlena *attr)
+heap_tuple_untoast_attr(struct varlena * attr)
 {
 	if (VARATT_IS_EXTERNAL(attr))
 	{
@@ -325,10 +244,18 @@ heap_tuple_untoast_attr(struct varlena *attr)
 		 * This is an externally stored datum --- fetch it back from there
 		 */
 		attr = toast_fetch_datum(attr);
-		/* fall through to IS_COMPRESSED if it's a compressed external datum */
+		/* If it's compressed, decompress it */
+		if (VARATT_IS_COMPRESSED(attr))
+		{
+			PGLZ_Header *tmp = (PGLZ_Header *) attr;
+
+			attr = (struct varlena *) palloc(PGLZ_RAW_SIZE(tmp) + VARHDRSZ);
+			SET_VARSIZE(attr, PGLZ_RAW_SIZE(tmp) + VARHDRSZ);
+			pglz_decompress(tmp, VARDATA(attr));
+			pfree(tmp);
+		}
 	}
-	
-	if (VARATT_IS_COMPRESSED(attr))
+	else if (VARATT_IS_COMPRESSED(attr))
 	{
 		/*
 		 * This is a compressed value inside of the main tuple
@@ -344,15 +271,14 @@ heap_tuple_untoast_attr(struct varlena *attr)
 		/*
 		 * This is a short-header varlena --- convert to 4-byte header format
 		 */
-		Size 	data_size = VARSIZE_SHORT(attr);
-		Size 	new_size = data_size - VARHDRSZ_SHORT + VARHDRSZ;
-		varattrib *tmp = (varattrib *)attr;
-		
-		/* This is a "short" varlena header but is otherwise a normal varlena */
-
-		attr = (struct varlena *) palloc(new_size);
-		SET_VARSIZE(attr, new_size);
-		memcpy(VARDATA(attr), VARDATA_SHORT(tmp), data_size - VARHDRSZ_SHORT);
+		Size		data_size = VARSIZE_SHORT(attr) - VARHDRSZ_SHORT;
+		Size		new_size = data_size + VARHDRSZ;
+		struct varlena *new_attr;
+
+		new_attr = (struct varlena *) palloc(new_size);
+		SET_VARSIZE(new_attr, new_size);
+		memcpy(VARDATA(new_attr), VARDATA_SHORT(attr), data_size);
+		attr = new_attr;
 	}
 
 	return attr;
@@ -370,31 +296,33 @@ struct varlena *
 heap_tuple_untoast_attr_slice(struct varlena * attr,
 							  int32 sliceoffset, int32 slicelength)
 {
-	varattrib *preslice;
-	varattrib *result;
+	struct varlena *preslice;
+	struct varlena *result;
 	char	   *attrdata;
 	int32		attrsize;
 
 	if (VARATT_IS_EXTERNAL(attr))
 	{
+		struct varatt_external toast_pointer;
+
+		VARATT_EXTERNAL_GET_POINTER(toast_pointer, attr);
+
 		/* fast path for non-compressed external datums */
-		if (!VARATT_EXTERNAL_IS_COMPRESSED(attr))
+		if (!VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer))
 			return toast_fetch_datum_slice(attr, sliceoffset, slicelength);
-		/* this automatically sets the compressed flag if appropriate */
-		preslice = (varattrib *)toast_fetch_datum(attr);
+
+		/* fetch it back (compressed marker will get set automatically) */
+		preslice = toast_fetch_datum(attr);
 	}
 	else
-		preslice = (varattrib *)attr;
+		preslice = attr;
 
 	if (VARATT_IS_COMPRESSED(preslice))
 	{
-		unsigned size;
-		PGLZ_Header *tmp;
-
-		tmp = (PGLZ_Header *) preslice;
-		size = PGLZ_RAW_SIZE(tmp) + VARHDRSZ;
+		PGLZ_Header *tmp = (PGLZ_Header *) preslice;
+		Size		size = PGLZ_RAW_SIZE(tmp) + VARHDRSZ;
 
-		preslice = (varattrib *) palloc(size);
+		preslice = (struct varlena *) palloc(size);
 		SET_VARSIZE(preslice, size);
 		pglz_decompress(tmp, VARDATA(preslice));
 
@@ -424,15 +352,15 @@ heap_tuple_untoast_attr_slice(struct varlena * attr,
 	if (((sliceoffset + slicelength) > attrsize) || slicelength < 0)
 		slicelength = attrsize - sliceoffset;
 
-	result = (varattrib *) palloc(slicelength + VARHDRSZ);
+	result = (struct varlena *) palloc(slicelength + VARHDRSZ);
 	SET_VARSIZE(result, slicelength + VARHDRSZ);
 
 	memcpy(VARDATA(result), attrdata + sliceoffset, slicelength);
 
-	if ((struct varlena *)preslice != (struct varlena *)attr)
+	if (preslice != attr)
 		pfree(preslice);
 
-	return (struct varlena *)result;
+	return result;
 }
 
 
@@ -446,18 +374,21 @@ heap_tuple_untoast_attr_slice(struct varlena * attr,
 Size
 toast_raw_datum_size(Datum value)
 {
-	varattrib  *attr = (varattrib *) DatumGetPointer(value);
+	struct varlena *attr = (struct varlena *) DatumGetPointer(value);
 	Size		result;
 
 	if (VARATT_IS_EXTERNAL(attr))
 	{
 		/* va_rawsize is the size of the original datum -- including header */
-		result = attr->va_external.va_rawsize;
+		struct varatt_external toast_pointer;
+
+		VARATT_EXTERNAL_GET_POINTER(toast_pointer, attr);
+		result = toast_pointer.va_rawsize;
 	}
 	else if (VARATT_IS_COMPRESSED(attr))
 	{
 		/* here, va_rawsize is just the payload size */
-		result = attr->va_compressed.va_rawsize + VARHDRSZ;
+		result = VARRAWSIZE_4B_C(attr) + VARHDRSZ;
 	}
 	else if (VARATT_IS_SHORT(attr))
 	{
@@ -484,7 +415,7 @@ toast_raw_datum_size(Datum value)
 Size
 toast_datum_size(Datum value)
 {
-	varattrib *attr = (varattrib *) DatumGetPointer(value);
+	struct varlena *attr = (struct varlena *) DatumGetPointer(value);
 	Size		result;
 
 	if (VARATT_IS_EXTERNAL(attr))
@@ -494,7 +425,10 @@ toast_datum_size(Datum value)
 		 * compressed or not.  We do not count the size of the toast pointer
 		 * ... should we?
 		 */
-		result = attr->va_external.va_extsize;
+		struct varatt_external toast_pointer;
+
+		VARATT_EXTERNAL_GET_POINTER(toast_pointer, attr);
+		result = toast_pointer.va_extsize;
 	}
 	else if (VARATT_IS_SHORT(attr))
 	{
@@ -538,6 +472,12 @@ toast_delete(Relation rel, HeapTuple oldtup, MemTupleBinding *pbind)
 	 */
 	Assert(rel->rd_rel->relkind == RELKIND_RELATION);
 
+	/*
+	 * We should only ever be called for tuples of plain relations ---
+	 * recursing on a toast rel is bad news.
+	 */
+	Assert(rel->rd_rel->relkind == RELKIND_RELATION);
+
 	/*
 	 * Get the tuple descriptor and break down the tuple into fields.
 	 *
@@ -570,7 +510,7 @@ toast_delete(Relation rel, HeapTuple oldtup, MemTupleBinding *pbind)
 		{
 			Datum		value = toast_values[i];
 
-			if (!toast_isnull[i] && VARATT_IS_EXTERNAL_D(value))
+			if (!toast_isnull[i] && VARATT_IS_EXTERNAL(value))
 				toast_delete_datum(rel, value);
 		}
 	}
@@ -625,6 +565,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	bool		has_nulls = false;
 
 	Size		maxDataLen;
+	Size		hoff;
 
 	char		toast_action[MaxHeapAttributeNumber];
 	bool		toast_isnull[MaxHeapAttributeNumber];
@@ -641,14 +582,12 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	AssertImply(!ismemtuple, !pbind);
 	AssertImply(ismemtuple && oldtup, is_heaptuple_memtuple(oldtup));
 	Assert(toast_tuple_target > 0);
-	
+
 	/*
 	 * We should only ever be called for tuples of plain relations ---
 	 * recursing on a toast rel is bad news.
 	 */
-	//Assert(rel->rd_rel->relkind == RELKIND_RELATION);
-	if (rel->rd_rel->relkind != RELKIND_RELATION)
-		elog(LOG,"Why are we toasting a non-relation! %c ",rel->rd_rel->relkind);
+	Assert(rel->rd_rel->relkind == RELKIND_RELATION);
 
 	/*
 	 * Get the tuple descriptor and break down the tuple(s) into fields.
@@ -689,16 +628,16 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 
 	for (i = 0; i < numAttrs; i++)
 	{
-		varattrib *old_value;
-		varattrib *new_value;
+		struct varlena *old_value;
+		struct varlena *new_value;
 
 		if (oldtup != NULL)
 		{
 			/*
 			 * For UPDATE get the old and new values of this attribute
 			 */
-			old_value = (varattrib *) DatumGetPointer(toast_oldvalues[i]);
-			new_value = (varattrib *) DatumGetPointer(toast_values[i]);
+			old_value = (struct varlena *) DatumGetPointer(toast_oldvalues[i]);
+			new_value = (struct varlena *) DatumGetPointer(toast_values[i]);
 
 			/*
 			 * If the old value is an external stored one, check if it has
@@ -735,7 +674,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 			/*
 			 * For INSERT simply get the new value
 			 */
-			new_value = (varattrib *) DatumGetPointer(toast_values[i]);
+			new_value = (struct varlena *) DatumGetPointer(toast_values[i]);
 		}
 
 		/*
@@ -769,9 +708,9 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 			if (VARATT_IS_EXTERNAL(new_value))
 			{
 				if (att[i]->attstorage == 'p')
-					new_value = (varattrib *)heap_tuple_untoast_attr((struct varlena *)new_value);
+					new_value = heap_tuple_untoast_attr(new_value);
 				else
-					new_value = (varattrib *)heap_tuple_fetch_attr((struct varlena *)new_value);
+					new_value = heap_tuple_fetch_attr(new_value);
 				toast_values[i] = PointerGetDatum(new_value);
 				toast_free[i] = true;
 				need_change = true;
@@ -803,18 +742,17 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	 * ----------
 	 */
 
-	if(!ismemtuple)
+	if (!ismemtuple)
 	{
 		/* compute header overhead --- this should match heap_form_tuple() */
-		maxDataLen = offsetof(HeapTupleHeaderData, t_bits);
+		hoff = offsetof(HeapTupleHeaderData, t_bits);
 		if (has_nulls)
-			maxDataLen += BITMAPLEN(numAttrs);
+			hoff += BITMAPLEN(numAttrs);
 		if (newtup->t_data->t_infomask & HEAP_HASOID)
-			maxDataLen += sizeof(Oid);
-		maxDataLen = MAXALIGN(maxDataLen);
-		Assert(maxDataLen == newtup->t_data->t_hoff);
+			hoff += sizeof(Oid);
+		hoff = MAXALIGN(hoff);
 		/* now convert to a limit on the tuple data size */
-		maxDataLen = toast_tuple_target - maxDataLen;
+		maxDataLen = TOAST_TUPLE_TARGET - hoff;
 	}
 	else
 		maxDataLen = toast_tuple_target;
@@ -827,7 +765,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 							   toast_values, toast_isnull) > maxDataLen)
 	{
 		int			biggest_attno = -1;
-		int32		biggest_size = MAXALIGN(sizeof(varattrib));
+		int32		biggest_size = MAXALIGN(TOAST_POINTER_SIZE);
 		Datum		old_value;
 		Datum		new_value;
 
@@ -838,9 +776,9 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		{
 			if (toast_action[i] != ' ')
 				continue;
-			if (VARATT_IS_EXTERNAL_D(toast_values[i]))
-				continue;
-			if (VARATT_IS_COMPRESSED_D(toast_values[i]))
+			if (VARATT_IS_EXTERNAL(toast_values[i]))
+				continue;		/* can't happen, toast_action would be 'p' */
+			if (VARATT_IS_COMPRESSED(toast_values[i]))
 				continue;
 			if (att[i]->attstorage != 'x')
 				continue;
@@ -868,7 +806,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 				pfree(DatumGetPointer(old_value));
 			toast_values[i] = new_value;
 			toast_free[i] = true;
-			toast_sizes[i] = VARSIZE_D(toast_values[i]);
+			toast_sizes[i] = VARSIZE(toast_values[i]);
 			need_change = true;
 			need_free = true;
 		}
@@ -883,14 +821,14 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 
 	/*
 	 * Second we look for attributes of attstorage 'x' or 'e' that are still
-	 * inline.
+	 * inline.	But skip this if there's no toast table to push them to.
 	 */
 	while (compute_dest_tuplen(tupleDesc, pbind, has_nulls,
 							   toast_values, toast_isnull) > maxDataLen &&
 		   rel->rd_rel->reltoastrelid != InvalidOid)
 	{
 		int			biggest_attno = -1;
-		int32		biggest_size = MAXALIGN(sizeof(varattrib));
+		int32		biggest_size = MAXALIGN(TOAST_POINTER_SIZE);
 		Datum		old_value;
 
 		/*------
@@ -902,8 +840,8 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		{
 			if (toast_action[i] == 'p')
 				continue;
-			if (VARATT_IS_EXTERNAL_D(toast_values[i]))
-				continue;
+			if (VARATT_IS_EXTERNAL(toast_values[i]))
+				continue;		/* can't happen, toast_action would be 'p' */
 			if (att[i]->attstorage != 'x' && att[i]->attstorage != 'e')
 				continue;
 			if (toast_sizes[i] > biggest_size)
@@ -922,7 +860,8 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		i = biggest_attno;
 		old_value = toast_values[i];
 		toast_action[i] = 'p';
-		toast_values[i] = toast_save_datum(rel, toast_values[i], isFrozen, use_wal, use_fsm);
+		toast_values[i] = toast_save_datum(rel, toast_values[i], isFrozen,
+										   use_wal, use_fsm);
 		if (toast_free[i])
 			pfree(DatumGetPointer(old_value));
 		toast_free[i] = true;
@@ -939,7 +878,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 							   toast_values, toast_isnull) > maxDataLen)
 	{
 		int			biggest_attno = -1;
-		int32		biggest_size = MAXALIGN(sizeof(varattrib));
+		int32		biggest_size = MAXALIGN(TOAST_POINTER_SIZE);
 		Datum		old_value;
 		Datum		new_value;
 
@@ -950,9 +889,9 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		{
 			if (toast_action[i] != ' ')
 				continue;
-			if (VARATT_IS_EXTERNAL_D(toast_values[i]))
+			if (VARATT_IS_EXTERNAL(toast_values[i]))
 				continue;		/* can't happen, toast_action would be 'p' */
-			if (VARATT_IS_COMPRESSED_D(toast_values[i]))
+			if (VARATT_IS_COMPRESSED(toast_values[i]))
 				continue;
 			if (att[i]->attstorage != 'm')
 				continue;
@@ -980,7 +919,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 				pfree(DatumGetPointer(old_value));
 			toast_values[i] = new_value;
 			toast_free[i] = true;
-			toast_sizes[i] = VARSIZE_D(toast_values[i]);
+			toast_sizes[i] = VARSIZE(toast_values[i]);
 			need_change = true;
 			need_free = true;
 		}
@@ -999,7 +938,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		   rel->rd_rel->reltoastrelid != InvalidOid)
 	{
 		int			biggest_attno = -1;
-		int32		biggest_size = MAXALIGN(sizeof(varattrib));
+		int32		biggest_size = MAXALIGN(TOAST_POINTER_SIZE);
 		Datum		old_value;
 
 		/*--------
@@ -1011,7 +950,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		{
 			if (toast_action[i] == 'p')
 				continue;
-			if (VARATT_IS_EXTERNAL_D(toast_values[i]))
+			if (VARATT_IS_EXTERNAL(toast_values[i]))
 				continue;		/* can't happen, toast_action would be 'p' */
 			if (att[i]->attstorage != 'm')
 				continue;
@@ -1031,7 +970,8 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		i = biggest_attno;
 		old_value = toast_values[i];
 		toast_action[i] = 'p';
-		toast_values[i] = toast_save_datum(rel, toast_values[i], isFrozen, use_wal, use_fsm);
+		toast_values[i] = toast_save_datum(rel, toast_values[i], isFrozen,
+										   use_wal, use_fsm);
 		if (toast_free[i])
 			pfree(DatumGetPointer(old_value));
 		toast_free[i] = true;
@@ -1058,42 +998,56 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		{
 			HeapTupleHeader olddata = newtup->t_data;
 			HeapTupleHeader new_data;
-			int32		new_len;
+			int32		new_header_len;
+			int32		new_data_len;
+			int32		new_tuple_len;
 
 			/*
-			 * Calculate the new size of the tuple.  Header size should not
-			 * change, but data size might.
+			 * Calculate the new size of the tuple.
+			 *
+			 * Note: we used to assume here that the old tuple's t_hoff must equal
+			 * the new_header_len value, but that was incorrect.  The old tuple
+			 * might have a smaller-than-current natts, if there's been an ALTER
+			 * TABLE ADD COLUMN since it was stored; and that would lead to a
+			 * different conclusion about the size of the null bitmap, or even
+			 * whether there needs to be one at all.
 			 */
-			new_len = offsetof(HeapTupleHeaderData, t_bits);
+			new_header_len = offsetof(HeapTupleHeaderData, t_bits);
 			if (has_nulls)
-				new_len += BITMAPLEN(numAttrs);
+				new_header_len += BITMAPLEN(numAttrs);
 			if (olddata->t_infomask & HEAP_HASOID)
-				new_len += sizeof(Oid);
-			new_len = MAXALIGN(new_len);
-			Assert(new_len == olddata->t_hoff);
-			new_len += heap_compute_data_size(tupleDesc,
-					toast_values, toast_isnull);
+				new_header_len += sizeof(Oid);
+			new_header_len = MAXALIGN(new_header_len);
+			new_data_len = heap_compute_data_size(tupleDesc,
+												  toast_values, toast_isnull);
+			new_tuple_len = new_header_len + new_data_len;
 
 			/*
 			 * Allocate and zero the space needed, and fill HeapTupleData fields.
 			 */
-			result_tuple = (HeapTuple) palloc0(HEAPTUPLESIZE + new_len);
-			result_tuple->t_len = new_len;
+			result_tuple = (HeapTuple) palloc0(HEAPTUPLESIZE + new_tuple_len);
+			result_tuple->t_len = new_tuple_len;
 			result_tuple->t_self = newtup->t_self;
 			new_data = (HeapTupleHeader) ((char *) result_tuple + HEAPTUPLESIZE);
 			result_tuple->t_data = new_data;
 
 			/*
-			 * Put the existing tuple header and the changed values into place
+			 * Copy the existing tuple header, but adjust natts and t_hoff.
 			 */
-			memcpy(new_data, olddata, olddata->t_hoff);
+			memcpy(new_data, olddata, offsetof(HeapTupleHeaderData, t_bits));
+			HeapTupleHeaderSetNatts(new_data, numAttrs);
+			new_data->t_hoff = new_header_len;
+			if (olddata->t_infomask & HEAP_HASOID)
+				HeapTupleHeaderSetOid(new_data, HeapTupleHeaderGetOid(olddata));
 
+			/* Copy over the data, and fill the null bitmap if needed */
 			heap_fill_tuple(tupleDesc,
-					toast_values,
-					toast_isnull,
-					(char *) new_data + olddata->t_hoff,
-					&(new_data->t_infomask),
-					has_nulls ? new_data->t_bits : NULL);
+							toast_values,
+							toast_isnull,
+							(char *) new_data + new_header_len,
+							new_data_len,
+							&(new_data->t_infomask),
+							has_nulls ? new_data->t_bits : NULL);
 		}
 	}
 	else
@@ -1119,6 +1073,86 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 }
 
 
+/* ----------
+ * toast_flatten_tuple -
+ *
+ *	"Flatten" a tuple to contain no out-of-line toasted fields.
+ *	(This does not eliminate compressed or short-header datums.)
+ * ----------
+ */
+HeapTuple
+toast_flatten_tuple(HeapTuple tup, TupleDesc tupleDesc)
+{
+	HeapTuple	new_tuple;
+	Form_pg_attribute *att = tupleDesc->attrs;
+	int			numAttrs = tupleDesc->natts;
+	int			i;
+	Datum		toast_values[MaxTupleAttributeNumber];
+	bool		toast_isnull[MaxTupleAttributeNumber];
+	bool		toast_free[MaxTupleAttributeNumber];
+
+	/*
+	 * Break down the tuple into fields.
+	 */
+	Assert(numAttrs <= MaxTupleAttributeNumber);
+	heap_deform_tuple(tup, tupleDesc, toast_values, toast_isnull);
+
+	memset(toast_free, 0, numAttrs * sizeof(bool));
+
+	for (i = 0; i < numAttrs; i++)
+	{
+		/*
+		 * Look at non-null varlena attributes
+		 */
+		if (!toast_isnull[i] && att[i]->attlen == -1)
+		{
+			struct varlena *new_value;
+
+			new_value = (struct varlena *) DatumGetPointer(toast_values[i]);
+			if (VARATT_IS_EXTERNAL(new_value))
+			{
+				new_value = toast_fetch_datum(new_value);
+				toast_values[i] = PointerGetDatum(new_value);
+				toast_free[i] = true;
+			}
+		}
+	}
+
+	/*
+	 * Form the reconfigured tuple.
+	 */
+	new_tuple = heap_form_tuple(tupleDesc, toast_values, toast_isnull);
+
+	/*
+	 * Be sure to copy the tuple's OID and identity fields.  We also make a
+	 * point of copying visibility info, just in case anybody looks at those
+	 * fields in a syscache entry.
+	 */
+	if (tupleDesc->tdhasoid)
+		HeapTupleSetOid(new_tuple, HeapTupleGetOid(tup));
+
+	new_tuple->t_self = tup->t_self;
+
+	new_tuple->t_data->t_choice = tup->t_data->t_choice;
+	new_tuple->t_data->t_ctid = tup->t_data->t_ctid;
+	new_tuple->t_data->t_infomask &= ~HEAP_XACT_MASK;
+	new_tuple->t_data->t_infomask |=
+		tup->t_data->t_infomask & HEAP_XACT_MASK;
+	new_tuple->t_data->t_infomask2 &= ~HEAP2_XACT_MASK;
+	new_tuple->t_data->t_infomask2 |=
+		tup->t_data->t_infomask2 & HEAP2_XACT_MASK;
+
+	/*
+	 * Free allocated temp values
+	 */
+	for (i = 0; i < numAttrs; i++)
+		if (toast_free[i])
+			pfree(DatumGetPointer(toast_values[i]));
+
+	return new_tuple;
+}
+
+
 /* ----------
  * toast_flatten_tuple_attribute -
  *
@@ -1138,7 +1172,9 @@ toast_flatten_tuple_attribute(Datum value,
 	TupleDesc	tupleDesc;
 	HeapTupleHeader olddata;
 	HeapTupleHeader new_data;
-	int32		new_len;
+	int32		new_header_len;
+	int32		new_data_len;
+	int32		new_tuple_len;
 	HeapTupleData tmptup;
 	Form_pg_attribute *att;
 	int			numAttrs;
@@ -1184,12 +1220,13 @@ toast_flatten_tuple_attribute(Datum value,
 			has_nulls = true;
 		else if (att[i]->attlen == -1)
 		{
-			varattrib *new_value;
+			struct varlena *new_value;
 
-			new_value = (varattrib *) DatumGetPointer(toast_values[i]);
-			if (VARATT_IS_EXTERNAL(new_value) || VARATT_IS_COMPRESSED(new_value))
+			new_value = (struct varlena *) DatumGetPointer(toast_values[i]);
+			if (VARATT_IS_EXTERNAL(new_value) ||
+				VARATT_IS_COMPRESSED(new_value))
 			{
-				new_value = (varattrib *)heap_tuple_untoast_attr((struct varlena *)new_value);
+				new_value = heap_tuple_untoast_attr(new_value);
 				toast_values[i] = PointerGetDatum(new_value);
 				toast_free[i] = true;
 				need_change = true;
@@ -1207,31 +1244,40 @@ toast_flatten_tuple_attribute(Datum value,
 	}
 
 	/*
-	 * Calculate the new size of the tuple.  Header size should not change,
-	 * but data size might.
+	 * Calculate the new size of the tuple.
+	 *
+	 * This should match the reconstruction code in toast_insert_or_update.
 	 */
-	new_len = offsetof(HeapTupleHeaderData, t_bits);
+	new_header_len = offsetof(HeapTupleHeaderData, t_bits);
 	if (has_nulls)
-		new_len += BITMAPLEN(numAttrs);
+		new_header_len += BITMAPLEN(numAttrs);
 	if (olddata->t_infomask & HEAP_HASOID)
-		new_len += sizeof(Oid);
-	new_len = MAXALIGN(new_len);
-	Assert(new_len == olddata->t_hoff);
-	new_len += heap_compute_data_size(tupleDesc, toast_values, toast_isnull);
+		new_header_len += sizeof(Oid);
+	new_header_len = MAXALIGN(new_header_len);
+	new_data_len = heap_compute_data_size(tupleDesc,
+										  toast_values, toast_isnull);
+	new_tuple_len = new_header_len + new_data_len;
 
-	new_data = (HeapTupleHeader) palloc0(new_len);
+	new_data = (HeapTupleHeader) palloc0(new_tuple_len);
 
 	/*
-	 * Put the tuple header and the changed values into place
+	 * Copy the existing tuple header, but adjust natts and t_hoff.
 	 */
-	memcpy(new_data, olddata, olddata->t_hoff);
+	memcpy(new_data, olddata, offsetof(HeapTupleHeaderData, t_bits));
+	HeapTupleHeaderSetNatts(new_data, numAttrs);
+	new_data->t_hoff = new_header_len;
+	if (olddata->t_infomask & HEAP_HASOID)
+		HeapTupleHeaderSetOid(new_data, HeapTupleHeaderGetOid(olddata));
 
-	HeapTupleHeaderSetDatumLength(new_data, new_len);
+	/* Reset the datum length field, too */
+	HeapTupleHeaderSetDatumLength(new_data, new_tuple_len);
 
+	/* Copy over the data, and fill the null bitmap if needed */
 	heap_fill_tuple(tupleDesc,
 					toast_values,
 					toast_isnull,
-					(char *) new_data + olddata->t_hoff,
+					(char *) new_data + new_header_len,
+					new_data_len,
 					&(new_data->t_infomask),
 					has_nulls ? new_data->t_bits : NULL);
 
@@ -1263,27 +1309,25 @@ toast_flatten_tuple_attribute(Datum value,
 Datum
 toast_compress_datum(Datum value)
 {
-	varattrib  *tmp;
-	int32		valsize = VARSIZE_ANY_EXHDR_D(value);
+	struct varlena *tmp;
+	int32		valsize = VARSIZE_ANY_EXHDR(value);
 
-	Assert(!VARATT_IS_EXTERNAL(DatumGetPointer(value)));
-	Assert(!VARATT_IS_COMPRESSED(DatumGetPointer(value)));
+	Assert(!VARATT_IS_EXTERNAL(value));
+	Assert(!VARATT_IS_COMPRESSED(value));
 
 	/*
-	 * No point in wasting a palloc cycle if value size is out of the allowed
-	 * range for compression
+	 * No point in wasting a palloc cycle if value is too short for
+	 * compression
 	 */
-	if (valsize < PGLZ_strategy_default->min_input_size ||
-		valsize > PGLZ_strategy_default->max_input_size)
+	if (valsize < PGLZ_strategy_default->min_input_size)
 		return PointerGetDatum(NULL);
-		
-	tmp = (varattrib *) palloc(PGLZ_MAX_OUTPUT(valsize));
-	if (pglz_compress(VARDATA_ANY_D(value), valsize,
+
+	tmp = (struct varlena *) palloc(PGLZ_MAX_OUTPUT(valsize));
+	if (pglz_compress(VARDATA_ANY(value), valsize,
 					  (PGLZ_Header *) tmp, PGLZ_strategy_default) &&
-		VARSIZE(tmp) < VARSIZE_ANY_D(value))
+		VARSIZE(tmp) < VARSIZE_ANY(value))
 	{
 		/* successful compression */
-		VARATT_SET_COMPRESSED(tmp);
 		return PointerGetDatum(tmp);
 	}
 	else
@@ -1303,7 +1347,8 @@ toast_compress_datum(Datum value)
  * ----------
  */
 static Datum
-toast_save_datum(Relation rel, Datum value, bool isFrozen, bool use_wal, bool use_fsm)
+toast_save_datum(Relation rel, Datum value, bool isFrozen,
+				 bool use_wal, bool use_fsm)
 {
 	Relation	toastrel;
 	Relation	toastidx;
@@ -1312,19 +1357,19 @@ toast_save_datum(Relation rel, Datum value, bool isFrozen, bool use_wal, bool us
 	Datum		t_values[3];
 	bool		t_isnull[3];
 	TransactionId myxid = GetCurrentTransactionId();
-	CommandId	mycid = GetCurrentCommandId();
-	varattrib  *result;
+	CommandId	mycid = GetCurrentCommandId(true);
+	struct varlena *result;
+	struct varatt_external toast_pointer;
 	struct
 	{
 		struct varlena hdr;
-		char		data[TOAST_MAX_CHUNK_SIZE]; /* make struct big enough */
+		char		data[TOAST_MAX_CHUNK_SIZE];	/* make struct big enough */
 		int32		align_it;	/* ensure struct is aligned well enough */
 	}			chunk_data;
 	int32		chunk_size;
 	int32		chunk_seq = 0;
 	char	   *data_p;
 	int32		data_todo;
-	int32		rawsize, extsize;
 
 	/*
 	 * Open the toast relation and its index.  We can use the index to check
@@ -1336,73 +1381,66 @@ toast_save_datum(Relation rel, Datum value, bool isFrozen, bool use_wal, bool us
 	toastidx = index_open(toastrel->rd_rel->reltoastidxid, RowExclusiveLock);
 
 	/*
-	 * Create the varattrib reference
-	 */
-	result = (varattrib *) palloc(sizeof(varattrib));
-
-	/* rawsize is the size of the datum that will result after decompression --
-	 * including the full header. so we have to adjust for short headers.
+	 * Get the data pointer and length, and compute va_rawsize and va_extsize.
+	 *
+	 * va_rawsize is the size of the equivalent fully uncompressed datum, so
+	 * we have to adjust for short headers.
 	 *
-	 * extsize is the actual size of the data payload in the toast records
-	 * without any headers
+	 * va_extsize is the actual size of the data payload in the toast records.
 	 */
-	if (VARATT_IS_SHORT_D(value)) 
+	if (VARATT_IS_SHORT(value))
 	{
-		rawsize = VARSIZE_SHORT_D(value) - VARHDRSZ_SHORT + VARHDRSZ;
-		extsize = VARSIZE_SHORT_D(value) - VARHDRSZ_SHORT;
-		data_p = VARDATA_SHORT_D(value);
-		data_todo = VARSIZE_SHORT_D(value) - VARHDRSZ_SHORT;
+		data_p = VARDATA_SHORT(value);
+		data_todo = VARSIZE_SHORT(value) - VARHDRSZ_SHORT;
+		toast_pointer.va_rawsize = data_todo + VARHDRSZ;		/* as if not short */
+		toast_pointer.va_extsize = data_todo;
 	}
-	else if (VARATT_IS_COMPRESSED_D(value))
+	else if (VARATT_IS_COMPRESSED(value))
 	{
-		/* rawsize in a compressed datum is the just the size of the payload */
-		rawsize = ((varattrib *) DatumGetPointer(value))->va_compressed.va_rawsize + VARHDRSZ;
-		extsize = VARSIZE_D(value) - VARHDRSZ;
-		data_p = VARDATA_D(value);
-		data_todo = VARSIZE_D(value) - VARHDRSZ;
-		/* 	we used to set result->va_header |= VARATT_FLAG_COMPRESSED; down
-		 * 	below. we don't any longer and depend on the equality holding:
-		 * 	extsize = rawsize + VARHDRSZ*/
+		data_p = VARDATA(value);
+		data_todo = VARSIZE(value) - VARHDRSZ;
+		/* rawsize in a compressed datum is just the size of the payload */
+		toast_pointer.va_rawsize = VARRAWSIZE_4B_C(value) + VARHDRSZ;
+		toast_pointer.va_extsize = data_todo;
+		/* Assert that the numbers look like it's compressed */
+		Assert(VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer));
 	}
-	else 
+	else
 	{
-		rawsize = VARSIZE_D(value);
-		extsize = VARSIZE_D(value) - VARHDRSZ;
-		data_p = VARDATA_D(value);
-		data_todo = VARSIZE_D(value) - VARHDRSZ;
+		data_p = VARDATA(value);
+		data_todo = VARSIZE(value) - VARHDRSZ;
+		toast_pointer.va_rawsize = VARSIZE(value);
+		toast_pointer.va_extsize = data_todo;
 	}
-	
-	SET_VARSIZE_EXTERNAL(result, TOAST_POINTER_SIZE);
-	result->va_external.va_rawsize = rawsize;
-	result->va_external.va_extsize = extsize;
-	result->va_external.va_valueid = GetNewOidWithIndex(toastrel, toastidx);
-	result->va_external.va_toastrelid = rel->rd_rel->reltoastrelid;
+
+	toast_pointer.va_valueid = GetNewOidWithIndex(toastrel, toastidx);
+	toast_pointer.va_toastrelid = rel->rd_rel->reltoastrelid;
 
 #ifdef USE_ASSERT_CHECKING
-	Assert( (VARATT_IS_COMPRESSED_D(value)||0) == (VARATT_EXTERNAL_IS_COMPRESSED(result)||0) );
+	Assert((VARATT_IS_COMPRESSED(value) || 0) == (VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer) || 0));
 
-	if (VARATT_IS_COMPRESSED_D(value)) 
+	if (VARATT_IS_COMPRESSED(value)) 
 	{
-		Assert(VARATT_EXTERNAL_IS_COMPRESSED(result));
+		Assert(VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer));
 		elog(DEBUG4,
 			 "saved toast datum, original varsize %ud rawsize %ud new extsize %ud rawsize %uld\n", 
-			 VARSIZE_D(value), ((varattrib *) DatumGetPointer(value))->va_compressed.va_rawsize,
-			 result->va_external.va_extsize, result->va_external.va_rawsize);
+			 VARSIZE(value), VARRAWSIZE_4B_C(value) + VARHDRSZ,
+			 toast_pointer.va_extsize, toast_pointer.va_rawsize);
 	}
 	else
 	{
-		Assert(!VARATT_EXTERNAL_IS_COMPRESSED(result));
+		Assert(!VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer));
 		elog(DEBUG4,
 			 "saved toast datum, original varsize %ud new extsize %ud rawsize %ud\n", 
-			 VARSIZE_D(value),
-			 result->va_external.va_extsize, result->va_external.va_rawsize);
+			 VARSIZE(value),
+			 toast_pointer.va_extsize, toast_pointer.va_rawsize);
 	}
 #endif
 
 	/*
 	 * Initialize constant parts of the tuple data
 	 */
-	t_values[0] = ObjectIdGetDatum(result->va_external.va_valueid);
+	t_values[0] = ObjectIdGetDatum(toast_pointer.va_valueid);
 	t_values[2] = PointerGetDatum(&chunk_data);
 	t_isnull[0] = false;
 	t_isnull[1] = false;
@@ -1425,10 +1463,8 @@ toast_save_datum(Relation rel, Datum value, bool isFrozen, bool use_wal, bool us
 		SET_VARSIZE(&chunk_data, chunk_size + VARHDRSZ);
 		memcpy(VARDATA(&chunk_data), data_p, chunk_size);
 		toasttup = heap_form_tuple(toasttupDesc, t_values, t_isnull);
-		if (!HeapTupleIsValid(toasttup))
-			elog(ERROR, "failed to build TOAST tuple");
 
-		if(!isFrozen)
+		if (!isFrozen)
 		{
 			/* the normal case. regular insert */
 			heap_insert(toastrel, toasttup, mycid, use_wal, use_fsm, myxid);
@@ -1439,9 +1475,6 @@ toast_save_datum(Relation rel, Datum value, bool isFrozen, bool use_wal, bool us
 			frozen_heap_insert(toastrel, toasttup);
 		}
 			
-		//heap_insert(relation, tup, GetCurrentCommandId(),
-		//			   true, true, GetCurrentTransactionId());
-
 		/*
 		 * Create the index entry.	We cheat a little here by not using
 		 * FormIndexDatum: this relies on the knowledge that the index columns
@@ -1472,6 +1505,13 @@ toast_save_datum(Relation rel, Datum value, bool isFrozen, bool use_wal, bool us
 	index_close(toastidx, RowExclusiveLock);
 	heap_close(toastrel, RowExclusiveLock);
 
+	/*
+	 * Create the TOAST pointer value that we'll return
+	 */
+	result = (struct varlena *) palloc(TOAST_POINTER_SIZE);
+	SET_VARSIZE_EXTERNAL(result, TOAST_POINTER_SIZE);
+	memcpy(VARDATA_EXTERNAL(result), &toast_pointer, sizeof(toast_pointer));
+
 	return PointerGetDatum(result);
 }
 
@@ -1485,7 +1525,8 @@ toast_save_datum(Relation rel, Datum value, bool isFrozen, bool use_wal, bool us
 static void
 toast_delete_datum(Relation rel __attribute__((unused)), Datum value)
 {
-	varattrib  *attr = (varattrib *) DatumGetPointer(value);
+	struct varlena *attr = (struct varlena *) DatumGetPointer(value);
+	struct varatt_external toast_pointer;
 	Relation	toastrel;
 	Relation	toastidx;
 	ScanKeyData toastkey;
@@ -1495,11 +1536,13 @@ toast_delete_datum(Relation rel __attribute__((unused)), Datum value)
 	if (!VARATT_IS_EXTERNAL(attr))
 		return;
 
+	/* Must copy to access aligned fields */
+	VARATT_EXTERNAL_GET_POINTER(toast_pointer, attr);
+
 	/*
 	 * Open the toast relation and its index
 	 */
-	toastrel = heap_open(attr->va_external.va_toastrelid,
-						 RowExclusiveLock);
+	toastrel = heap_open(toast_pointer.va_toastrelid, RowExclusiveLock);
 	toastidx = index_open(toastrel->rd_rel->reltoastidxid, RowExclusiveLock);
 
 	/*
@@ -1509,7 +1552,7 @@ toast_delete_datum(Relation rel __attribute__((unused)), Datum value)
 	ScanKeyInit(&toastkey,
 				(AttrNumber) 1,
 				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(attr->va_external.va_valueid));
+				ObjectIdGetDatum(toast_pointer.va_valueid));
 
 	/*
 	 * Find all the chunks.  (We don't actually care whether we see them in
@@ -1543,7 +1586,7 @@ toast_delete_datum(Relation rel __attribute__((unused)), Datum value)
  * ----------
  */
 static struct varlena *
-toast_fetch_datum(struct varlena *attr)
+toast_fetch_datum(struct varlena * attr)
 {
 	Relation	toastrel;
 	Relation	toastidx;
@@ -1551,28 +1594,34 @@ toast_fetch_datum(struct varlena *attr)
 	IndexScanDesc toastscan;
 	HeapTuple	ttup;
 	TupleDesc	toasttupDesc;
-	varattrib  *result;
+	struct varlena *result;
+	struct varatt_external toast_pointer;
 	int32		ressize;
 	int32		residx,
 				nextidx;
 	int32		numchunks;
 	Pointer		chunk;
 	bool		isnull;
+	char	   *chunkdata;
 	int32		chunksize;
-	void 	   *chunkdata;
 
-	ressize = ((varattrib *)attr)->va_external.va_extsize;
+	/* Must copy to access aligned fields */
+	VARATT_EXTERNAL_GET_POINTER(toast_pointer, attr);
+
+	ressize = toast_pointer.va_extsize;
 	numchunks = ((ressize - 1) / TOAST_MAX_CHUNK_SIZE) + 1;
 
-	result = (varattrib *) palloc(ressize + VARHDRSZ);
-	SET_VARSIZE(result, ressize + VARHDRSZ);
-	if (VARATT_EXTERNAL_IS_COMPRESSED(attr))
-		VARATT_SET_COMPRESSED(result);
-	
+	result = (struct varlena *) palloc(ressize + VARHDRSZ);
+
+	if (VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer))
+		SET_VARSIZE_COMPRESSED(result, ressize + VARHDRSZ);
+	else
+		SET_VARSIZE(result, ressize + VARHDRSZ);
+
 	/*
 	 * Open the toast relation and its index
 	 */
-	toastrel = heap_open(((varattrib *)attr)->va_external.va_toastrelid, AccessShareLock);
+	toastrel = heap_open(toast_pointer.va_toastrelid, AccessShareLock);
 	toasttupDesc = toastrel->rd_att;
 	toastidx = index_open(toastrel->rd_rel->reltoastidxid, AccessShareLock);
 
@@ -1582,7 +1631,7 @@ toast_fetch_datum(struct varlena *attr)
 	ScanKeyInit(&toastkey,
 				(AttrNumber) 1,
 				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(((varattrib *)attr)->va_external.va_valueid));
+				ObjectIdGetDatum(toast_pointer.va_valueid));
 
 	/*
 	 * Read the chunks by index
@@ -1604,20 +1653,24 @@ toast_fetch_datum(struct varlena *attr)
 		Assert(!isnull);
 		chunk = DatumGetPointer(fastgetattr(ttup, 3, toasttupDesc, &isnull));
 		Assert(!isnull);
-		if (VARATT_IS_SHORT(chunk)) 
-		{
-			chunksize = VARSIZE_SHORT(chunk) - VARHDRSZ_SHORT;
-			chunkdata = VARDATA_SHORT(chunk);
-		}
-		else if (!VARATT_IS_EXTENDED(chunk)) 
+		if (!VARATT_IS_EXTENDED(chunk))
 		{
 			chunksize = VARSIZE(chunk) - VARHDRSZ;
 			chunkdata = VARDATA(chunk);
 		}
-		else 
+		else if (VARATT_IS_SHORT(chunk))
 		{
-			elog(ERROR, "found toasted toast chunk?");
-			chunksize = 0; /* shut compiler up */
+			/* could happen due to heap_form_tuple doing its thing */
+			chunksize = VARSIZE_SHORT(chunk) - VARHDRSZ_SHORT;
+			chunkdata = VARDATA_SHORT(chunk);
+		}
+		else
+		{
+			/* should never happen */
+			elog(ERROR, "found toasted toast chunk for toast value %u in %s",
+				 toast_pointer.va_valueid,
+				 RelationGetRelationName(toastrel));
+			chunksize = 0;		/* keep compiler quiet */
 			chunkdata = NULL;
 		}
 
@@ -1625,35 +1678,40 @@ toast_fetch_datum(struct varlena *attr)
 		 * Some checks on the data we've found
 		 */
 		if (residx != nextidx)
-			elog(ERROR, "unexpected chunk number %d (expected %d) for toast value %u",
+			elog(ERROR, "unexpected chunk number %d (expected %d) for toast value %u in %s",
 				 residx, nextidx,
-				 ((varattrib *)attr)->va_external.va_valueid);
+				 toast_pointer.va_valueid,
+				 RelationGetRelationName(toastrel));
 		if (residx < numchunks - 1)
 		{
 			if (chunksize != TOAST_MAX_CHUNK_SIZE)
-				elog(ERROR, "unexpected chunk size %d in chunk %d of %d for toast value %u (expected %d)",
-					 chunksize, residx,
-					 ((varattrib *)attr)->va_external.va_valueid, numchunks-1,
-					 (int)TOAST_MAX_CHUNK_SIZE);
+				elog(ERROR, "unexpected chunk size %d (expected %d) in chunk %d of %d for toast value %u in %s",
+					 chunksize, (int) TOAST_MAX_CHUNK_SIZE,
+					 residx, numchunks,
+					 toast_pointer.va_valueid,
+					 RelationGetRelationName(toastrel));
 		}
-		else if (residx == numchunks-1)
+		else if (residx == numchunks - 1)
 		{
 			if ((residx * TOAST_MAX_CHUNK_SIZE + chunksize) != ressize)
-				elog(ERROR, "unexpected chunk size %d in final chunk %d for toast value %u (expected %d)",
-					 chunksize, residx,
-					 ((varattrib *)attr)->va_external.va_valueid,
-					 ressize - residx*(int)TOAST_MAX_CHUNK_SIZE);
+				elog(ERROR, "unexpected chunk size %d (expected %d) in final chunk %d for toast value %u in %s",
+					 chunksize,
+					 (int) (ressize - residx * TOAST_MAX_CHUNK_SIZE),
+					 residx,
+					 toast_pointer.va_valueid,
+					 RelationGetRelationName(toastrel));
 		}
 		else
-			elog(ERROR, "unexpected chunk number %d for toast value %u (expected in %d..%d)",
+			elog(ERROR, "unexpected chunk number %d (out of range %d..%d) for toast value %u in %s",
 				 residx,
-				 ((varattrib *)attr)->va_external.va_valueid,
-				 0, numchunks-1);
+				 0, numchunks - 1,
+				 toast_pointer.va_valueid,
+				 RelationGetRelationName(toastrel));
 
 		/*
 		 * Copy the data into proper place in our result
 		 */
-		memcpy(((char *) VARDATA(result)) + residx * TOAST_MAX_CHUNK_SIZE,
+		memcpy(VARDATA(result) + residx * TOAST_MAX_CHUNK_SIZE,
 			   chunkdata,
 			   chunksize);
 
@@ -1664,9 +1722,10 @@ toast_fetch_datum(struct varlena *attr)
 	 * Final checks that we successfully fetched the datum
 	 */
 	if (nextidx != numchunks)
-		elog(ERROR, "missing chunk number %d for toast value %u",
+		elog(ERROR, "missing chunk number %d for toast value %u in %s",
 			 nextidx,
-			 ((varattrib *)attr)->va_external.va_valueid);
+			 toast_pointer.va_valueid,
+			 RelationGetRelationName(toastrel));
 
 	/*
 	 * End scan and close relations
@@ -1686,7 +1745,7 @@ toast_fetch_datum(struct varlena *attr)
  * ----------
  */
 static struct varlena *
-toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
+toast_fetch_datum_slice(struct varlena * attr, int32 sliceoffset, int32 length)
 {
 	Relation	toastrel;
 	Relation	toastidx;
@@ -1695,7 +1754,8 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 	IndexScanDesc toastscan;
 	HeapTuple	ttup;
 	TupleDesc	toasttupDesc;
-	varattrib  *result;
+	struct varlena *result;
+	struct varatt_external toast_pointer;
 	int32		attrsize;
 	int32		residx;
 	int32		nextidx;
@@ -1707,11 +1767,23 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 	int			totalchunks;
 	Pointer		chunk;
 	bool		isnull;
+	char	   *chunkdata;
 	int32		chunksize;
 	int32		chcpystrt;
 	int32		chcpyend;
 
-	attrsize = ((varattrib *)attr)->va_external.va_extsize;
+	Assert(VARATT_IS_EXTERNAL(attr));
+
+	/* Must copy to access aligned fields */
+	VARATT_EXTERNAL_GET_POINTER(toast_pointer, attr);
+
+	/*
+	 * It's nonsense to fetch slices of a compressed datum -- this isn't lo_*
+	 * we can't return a compressed datum which is meaningful to toast later
+	 */
+	Assert(!VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer));
+
+	attrsize = toast_pointer.va_extsize;
 	totalchunks = ((attrsize - 1) / TOAST_MAX_CHUNK_SIZE) + 1;
 
 	if (sliceoffset >= attrsize)
@@ -1723,11 +1795,12 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 	if (((sliceoffset + length) > attrsize) || length < 0)
 		length = attrsize - sliceoffset;
 
-	result = (varattrib *) palloc(length + VARHDRSZ);
-	SET_VARSIZE(result, length + VARHDRSZ);
+	result = (struct varlena *) palloc(length + VARHDRSZ);
 
-	if (VARATT_EXTERNAL_IS_COMPRESSED(attr))
-		VARATT_SET_COMPRESSED(result);
+	if (VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer))
+		SET_VARSIZE_COMPRESSED(result, length + VARHDRSZ);
+	else
+		SET_VARSIZE(result, length + VARHDRSZ);
 
 	if (length == 0)
 		return (struct varlena *)result;			/* Can save a lot of work at this point! */
@@ -1742,7 +1815,7 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 	/*
 	 * Open the toast relation and its index
 	 */
-	toastrel = heap_open(((varattrib *)attr)->va_external.va_toastrelid, AccessShareLock);
+	toastrel = heap_open(toast_pointer.va_toastrelid, AccessShareLock);
 	toasttupDesc = toastrel->rd_att;
 	toastidx = index_open(toastrel->rd_rel->reltoastidxid, AccessShareLock);
 
@@ -1753,7 +1826,7 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 	ScanKeyInit(&toastkey[0],
 				(AttrNumber) 1,
 				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(((varattrib *)attr)->va_external.va_valueid));
+				ObjectIdGetDatum(toast_pointer.va_valueid));
 
 	/*
 	 * Use equality condition for one chunk, a range condition otherwise:
@@ -1796,44 +1869,60 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 		Assert(!isnull);
 		chunk = DatumGetPointer(fastgetattr(ttup, 3, toasttupDesc, &isnull));
 		Assert(!isnull);
-		if (VARATT_IS_SHORT((varattrib *)chunk))
-			chunksize = VARSIZE_SHORT((varattrib *)chunk) - VARHDRSZ_SHORT;
-		else if (!VARATT_IS_EXTENDED((varattrib *)chunk))
-			chunksize = VARSIZE((varattrib *)chunk) - VARHDRSZ;
-		else {
-			elog(ERROR, "found toasted toast chunk?");
-			chunksize = 0; /* shut compiler up */
+		if (!VARATT_IS_EXTENDED(chunk))
+		{
+			chunksize = VARSIZE(chunk) - VARHDRSZ;
+			chunkdata = VARDATA(chunk);
 		}
-		
-		
+		else if (VARATT_IS_SHORT(chunk))
+		{
+			/* could happen due to heap_form_tuple doing its thing */
+			chunksize = VARSIZE_SHORT(chunk) - VARHDRSZ_SHORT;
+			chunkdata = VARDATA_SHORT(chunk);
+		}
+		else
+		{
+			/* should never happen */
+			elog(ERROR, "found toasted toast chunk for toast value %u in %s",
+				 toast_pointer.va_valueid,
+				 RelationGetRelationName(toastrel));
+			chunksize = 0;		/* keep compiler quiet */
+			chunkdata = NULL;
+		}
+
 		/*
 		 * Some checks on the data we've found
 		 */
 		if ((residx != nextidx) || (residx > endchunk) || (residx < startchunk))
-			elog(ERROR, "unexpected chunk number %d (expected %d) for toast value %u",
+			elog(ERROR, "unexpected chunk number %d (expected %d) for toast value %u in %s",
 				 residx, nextidx,
-				 ((varattrib *)attr)->va_external.va_valueid);
+				 toast_pointer.va_valueid,
+				 RelationGetRelationName(toastrel));
 		if (residx < totalchunks - 1)
 		{
 			if (chunksize != TOAST_MAX_CHUNK_SIZE)
-				elog(ERROR, "unexpected chunk size %d in chunk %d for toast value %u of %d when fetching slice (expected %d)",
-					 chunksize, residx,
-					 ((varattrib *)attr)->va_external.va_valueid, totalchunks-1,
-					 (int)TOAST_MAX_CHUNK_SIZE);
+				elog(ERROR, "unexpected chunk size %d (expected %d) in chunk %d of %d for toast value %u in %s when fetching slice",
+					 chunksize, (int) TOAST_MAX_CHUNK_SIZE,
+					 residx, totalchunks,
+					 toast_pointer.va_valueid,
+					 RelationGetRelationName(toastrel));
 		}
-		else if (residx == totalchunks-1)
+		else if (residx == totalchunks - 1)
 		{
 			if ((residx * TOAST_MAX_CHUNK_SIZE + chunksize) != attrsize)
-				elog(ERROR, "unexpected chunk size %d in chunk %d for final toast value %u when fetching slice (expected %d)",
-					 chunksize, residx,
-					 ((varattrib *)attr)->va_external.va_valueid,
-					 attrsize - residx * (int)TOAST_MAX_CHUNK_SIZE);
-		}
-		else 
-		{
-			elog(ERROR, "unexpected chunk");
+				elog(ERROR, "unexpected chunk size %d (expected %d) in final chunk %d for toast value %u in %s when fetching slice",
+					 chunksize,
+					 (int) (attrsize - residx * TOAST_MAX_CHUNK_SIZE),
+					 residx,
+					 toast_pointer.va_valueid,
+					 RelationGetRelationName(toastrel));
 		}
-		
+		else
+			elog(ERROR, "unexpected chunk number %d (out of range %d..%d) for toast value %u in %s",
+				 residx,
+				 0, totalchunks - 1,
+				 toast_pointer.va_valueid,
+				 RelationGetRelationName(toastrel));
 
 		/*
 		 * Copy the data into proper place in our result
@@ -1845,9 +1934,9 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 		if (residx == endchunk)
 			chcpyend = endoffset;
 
-		memcpy(((char *) VARDATA(result)) +
+		memcpy(VARDATA(result) +
 			   (residx * TOAST_MAX_CHUNK_SIZE - sliceoffset) + chcpystrt,
-			   VARDATA((varattrib *)chunk) + chcpystrt,
+			   chunkdata + chcpystrt,
 			   (chcpyend - chcpystrt) + 1);
 
 		nextidx++;
@@ -1857,9 +1946,10 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length)
 	 * Final checks that we successfully fetched the datum
 	 */
 	if (nextidx != (endchunk + 1))
-		elog(ERROR, "missing chunk number %d for toast value %u",
+		elog(ERROR, "missing chunk number %d for toast value %u in %s",
 			 nextidx,
-			 ((varattrib *)attr)->va_external.va_valueid);
+			 toast_pointer.va_valueid,
+			 RelationGetRelationName(toastrel));
 
 	/*
 	 * End scan and close relations
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 931075452845..0c92ca0159dc 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -102,6 +102,9 @@ RelationGetIndexScan(Relation indexRelation,
 	ItemPointerSetInvalid(&scan->xs_ctup.t_self);
 	scan->xs_ctup.t_data = NULL;
 	scan->xs_cbuf = InvalidBuffer;
+	scan->xs_prev_xmax = InvalidTransactionId;
+	scan->xs_next_hot = InvalidOffsetNumber;
+	scan->xs_hot_dead = false;
 
 	/*
 	 * Let the AM fill in the key and any opaque data it wants.
@@ -267,7 +270,16 @@ systable_beginscan(Relation heapRelation,
 	}
 	else
 	{
-		sysscan->scan = heap_beginscan(heapRelation, snapshot, nkeys, key);
+		/*
+		 * We disallow synchronized scans when forced to use a heapscan on a
+		 * catalog.  In most cases the desired rows are near the front, so
+		 * that the unpredictable start point of a syncscan is a serious
+		 * disadvantage; and there are no compensating advantages, because
+		 * it's unlikely that such scans will occur in parallel.
+		 */
+		sysscan->scan = heap_beginscan_strat(heapRelation, snapshot,
+											 nkeys, key,
+											 true, false);
 		sysscan->iscan = NULL;
 	}
 
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index b9dfd4fb11c3..7f1dc338ec22 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.97 2007/01/05 22:19:23 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.101.2.1 2008/09/11 14:01:35 alvherre Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relation OID
@@ -334,6 +334,8 @@ index_rescan(IndexScanDesc scan, ScanKey key)
 		scan->xs_cbuf = InvalidBuffer;
 	}
 
+	scan->xs_next_hot = InvalidOffsetNumber;
+
 	scan->kill_prior_tuple = false;		/* for safety */
 
 	FunctionCall2(procedure,
@@ -391,6 +393,14 @@ index_markpos(IndexScanDesc scan)
  * NOTE: this only restores the internal scan state of the index AM.
  * The current result tuple (scan->xs_ctup) doesn't change.  See comments
  * for ExecRestrPos().
+ *
+ * NOTE: in the presence of HOT chains, mark/restore only works correctly
+ * if the scan's snapshot is MVCC-safe; that ensures that there's at most one
+ * returnable tuple in each HOT chain, and so restoring the prior state at the
+ * granularity of the index AM is sufficient.  Since the only current user
+ * of mark/restore functionality is nodeMergejoin.c, this effectively means
+ * that merge-join plans only work for MVCC snapshots.	This could be fixed
+ * if necessary, but for now it seems unimportant.
  * ----------------
  */
 void
@@ -398,9 +408,13 @@ index_restrpos(IndexScanDesc scan)
 {
 	FmgrInfo   *procedure;
 
+	Assert(IsMVCCSnapshot(scan->xs_snapshot));
+
 	SCAN_CHECKS;
 	GET_SCAN_PROCEDURE(amrestrpos);
 
+	scan->xs_next_hot = InvalidOffsetNumber;
+
 	scan->kill_prior_tuple = false;		/* for safety */
 
 	FunctionCall1(procedure, PointerGetDatum(scan));
@@ -421,80 +435,239 @@ index_getnext(IndexScanDesc scan, ScanDirection direction)
 	MIRROREDLOCK_BUFMGR_DECLARE;
 
 	HeapTuple	heapTuple = &scan->xs_ctup;
+	ItemPointer tid = &heapTuple->t_self;
 	FmgrInfo   *procedure;
 
 	SCAN_CHECKS;
 	GET_SCAN_PROCEDURE(amgettuple);
 
-	/* just make sure this is false... */
-	scan->kill_prior_tuple = false;
+	/*
+	 * We always reset xs_hot_dead; if we are here then either we are just
+	 * starting the scan, or we previously returned a visible tuple, and in
+	 * either case it's inappropriate to kill the prior index entry.
+	 */
+	scan->xs_hot_dead = false;
 
 	for (;;)
 	{
-		bool		found;
-
-		/*
-		 * The AM's gettuple proc finds the next tuple matching the scan keys.
-		 */
-		found = DatumGetBool(FunctionCall2(procedure,
-										   PointerGetDatum(scan),
-										   Int32GetDatum(direction)));
+		OffsetNumber offnum;
+		bool		at_chain_start;
+		Page		dp;
 
-		/* Reset kill flag immediately for safety */
-		scan->kill_prior_tuple = false;
-
-		if (!found)
+		if (scan->xs_next_hot != InvalidOffsetNumber)
+		{
+			/*
+			 * We are resuming scan of a HOT chain after having returned an
+			 * earlier member.	Must still hold pin on current heap page.
+			 */
+			Assert(BufferIsValid(scan->xs_cbuf));
+			Assert(ItemPointerGetBlockNumber(tid) ==
+				   BufferGetBlockNumber(scan->xs_cbuf));
+			Assert(TransactionIdIsValid(scan->xs_prev_xmax));
+			offnum = scan->xs_next_hot;
+			at_chain_start = false;
+			scan->xs_next_hot = InvalidOffsetNumber;
+
+			// -------- MirroredLock ----------
+			MIRROREDLOCK_BUFMGR_LOCK;
+		}
+		else
 		{
-			/* Release any held pin on a heap page */
-			if (BufferIsValid(scan->xs_cbuf))
+			bool		found;
+			Buffer		prev_buf;
+
+			/*
+			 * If we scanned a whole HOT chain and found only dead tuples,
+			 * tell index AM to kill its entry for that TID.
+			 */
+			scan->kill_prior_tuple = scan->xs_hot_dead;
+
+			/*
+			 * The AM's gettuple proc finds the next index entry matching the
+			 * scan keys, and puts the TID in xs_ctup.t_self (ie, *tid).
+			 */
+			found = DatumGetBool(FunctionCall2(procedure,
+											   PointerGetDatum(scan),
+											   Int32GetDatum(direction)));
+
+			/* Reset kill flag immediately for safety */
+			scan->kill_prior_tuple = false;
+
+			/* If we're out of index entries, break out of outer loop */
+			if (!found)
+				break;
+
+			pgstat_count_index_tuples(scan->indexRelation, 1);
+
+			// -------- MirroredLock ----------
+			MIRROREDLOCK_BUFMGR_LOCK;
+
+			/* Switch to correct buffer if we don't have it already */
+			prev_buf = scan->xs_cbuf;
+			scan->xs_cbuf = ReleaseAndReadBuffer(scan->xs_cbuf,
+												 scan->heapRelation,
+											 ItemPointerGetBlockNumber(tid));
+
+			/*
+			 * Prune page, but only if we weren't already on this page
+			 */
+			if (prev_buf != scan->xs_cbuf &&
+				TransactionIdIsValid(RecentGlobalXmin))
 			{
-				ReleaseBuffer(scan->xs_cbuf);
-				scan->xs_cbuf = InvalidBuffer;
+				heap_page_prune_opt(scan->heapRelation, scan->xs_cbuf,
+									RecentGlobalXmin);
 			}
-			return NULL;		/* failure exit */
+
+			/* Prepare to scan HOT chain starting at index-referenced offnum */
+			offnum = ItemPointerGetOffsetNumber(tid);
+			at_chain_start = true;
+
+			/* We don't know what the first tuple's xmin should be */
+			scan->xs_prev_xmax = InvalidTransactionId;
+
+			/* Initialize flag to detect if all entries are dead */
+			scan->xs_hot_dead = true;
 		}
 
-		pgstat_count_index_tuples(scan->indexRelation, 1);
+		/* Obtain share-lock on the buffer so we can examine visibility */
+		LockBuffer(scan->xs_cbuf, BUFFER_LOCK_SHARE);
 
-		/*
-		 * Fetch the heap tuple and see if it matches the snapshot.
-		 */
-		if (heap_release_fetch(scan->heapRelation, scan->xs_snapshot,
-							   heapTuple, &scan->xs_cbuf, true,
-							   scan->indexRelation))
-			break;
+		dp = (Page) BufferGetPage(scan->xs_cbuf);
 
-		/* Skip if no undeleted tuple at this location */
-		if (heapTuple->t_data == NULL)
-			continue;
+		/* Scan through possible multiple members of HOT-chain */
+		for (;;)
+		{
+			ItemId		lp;
+			ItemPointer ctid;
 
-		/*
-		 * If we can't see it, maybe no one else can either.  Check to see if
-		 * the tuple is dead to all transactions.  If so, signal the index AM
-		 * to not return it on future indexscans.
-		 *
-		 * We told heap_release_fetch to keep a pin on the buffer, so we can
-		 * re-access the tuple here.  But we must re-lock the buffer first.
-		 */
+			/* check for bogus TID */
+			if (offnum < FirstOffsetNumber ||
+				offnum > PageGetMaxOffsetNumber(dp))
+				break;
 
-		// -------- MirroredLock ----------
-		MIRROREDLOCK_BUFMGR_LOCK;
+			lp = PageGetItemId(dp, offnum);
 
-		LockBuffer(scan->xs_cbuf, BUFFER_LOCK_SHARE);
+			/* check for unused, dead, or redirected items */
+			if (!ItemIdIsNormal(lp))
+			{
+				/* We should only see a redirect at start of chain */
+				if (ItemIdIsRedirected(lp) && at_chain_start)
+				{
+					/* Follow the redirect */
+					offnum = ItemIdGetRedirect(lp);
+					at_chain_start = false;
+					continue;
+				}
+				/* else must be end of chain */
+				break;
+			}
 
-		if (HeapTupleSatisfiesVacuum(heapTuple->t_data, RecentGlobalXmin,
-									 scan->xs_cbuf) == HEAPTUPLE_DEAD)
-			scan->kill_prior_tuple = true;
+			/*
+			 * We must initialize all of *heapTuple (ie, scan->xs_ctup) since
+			 * it is returned to the executor on success.
+			 */
+			heapTuple->t_data = (HeapTupleHeader) PageGetItem(dp, lp);
+			heapTuple->t_len = ItemIdGetLength(lp);
+			ItemPointerSetOffsetNumber(tid, offnum);
+			ctid = &heapTuple->t_data->t_ctid;
+
+			/*
+			 * Shouldn't see a HEAP_ONLY tuple at chain start.  (This test
+			 * should be unnecessary, since the chain root can't be removed
+			 * while we have pin on the index entry, but let's make it
+			 * anyway.)
+			 */
+			if (at_chain_start && HeapTupleIsHeapOnly(heapTuple))
+				break;
+
+			/*
+			 * The xmin should match the previous xmax value, else chain is
+			 * broken.	(Note: this test is not optional because it protects
+			 * us against the case where the prior chain member's xmax aborted
+			 * since we looked at it.)
+			 */
+			if (TransactionIdIsValid(scan->xs_prev_xmax) &&
+				!TransactionIdEquals(scan->xs_prev_xmax,
+								  HeapTupleHeaderGetXmin(heapTuple->t_data)))
+				break;
+
+			/* If it's visible per the snapshot, we must return it */
+			if (HeapTupleSatisfiesVisibility(scan->heapRelation, heapTuple,
+											 scan->xs_snapshot, scan->xs_cbuf))
+			{
+				/*
+				 * If the snapshot is MVCC, we know that it could accept at
+				 * most one member of the HOT chain, so we can skip examining
+				 * any more members.  Otherwise, check for continuation of the
+				 * HOT-chain, and set state for next time.
+				 */
+				if (IsMVCCSnapshot(scan->xs_snapshot))
+					scan->xs_next_hot = InvalidOffsetNumber;
+				else if (HeapTupleIsHotUpdated(heapTuple))
+				{
+					Assert(ItemPointerGetBlockNumber(ctid) ==
+						   ItemPointerGetBlockNumber(tid));
+					scan->xs_next_hot = ItemPointerGetOffsetNumber(ctid);
+					scan->xs_prev_xmax = HeapTupleHeaderGetXmax(heapTuple->t_data);
+				}
+				else
+					scan->xs_next_hot = InvalidOffsetNumber;
+
+				LockBuffer(scan->xs_cbuf, BUFFER_LOCK_UNLOCK);
+
+				pgstat_count_heap_fetch(scan->indexRelation);
+
+				MIRROREDLOCK_BUFMGR_UNLOCK;
+				// -------- MirroredLock ----------
+
+				return heapTuple;
+			}
+
+			/*
+			 * If we can't see it, maybe no one else can either.  Check to see
+			 * if the tuple is dead to all transactions.  If we find that all
+			 * the tuples in the HOT chain are dead, we'll signal the index AM
+			 * to not return that TID on future indexscans.
+			 */
+			if (scan->xs_hot_dead &&
+				HeapTupleSatisfiesVacuum(scan->heapRelation, heapTuple->t_data,
+										 RecentGlobalXmin, scan->xs_cbuf) != HEAPTUPLE_DEAD)
+				scan->xs_hot_dead = false;
+
+			/*
+			 * Check to see if HOT chain continues past this tuple; if so
+			 * fetch the next offnum (we don't bother storing it into
+			 * xs_next_hot, but must store xs_prev_xmax), and loop around.
+			 */
+			if (HeapTupleIsHotUpdated(heapTuple))
+			{
+				Assert(ItemPointerGetBlockNumber(ctid) ==
+					   ItemPointerGetBlockNumber(tid));
+				offnum = ItemPointerGetOffsetNumber(ctid);
+				at_chain_start = false;
+				scan->xs_prev_xmax = HeapTupleHeaderGetXmax(heapTuple->t_data);
+			}
+			else
+				break;			/* end of chain */
+		}						/* loop over a single HOT chain */
 
 		LockBuffer(scan->xs_cbuf, BUFFER_LOCK_UNLOCK);
-		
+
 		MIRROREDLOCK_BUFMGR_UNLOCK;
 		// -------- MirroredLock ----------
-		
+
+		/* Loop around to ask index AM for another TID */
+		scan->xs_next_hot = InvalidOffsetNumber;
+	}
+
+	/* Release any held pin on a heap page */
+	if (BufferIsValid(scan->xs_cbuf))
+	{
+		ReleaseBuffer(scan->xs_cbuf);
+		scan->xs_cbuf = InvalidBuffer;
 	}
 
-	/* Success exit */
-	return heapTuple;
+	return NULL;				/* failure exit */
 }
 
 /* ----------------
@@ -530,7 +703,8 @@ index_getnext_indexitem(IndexScanDesc scan,
 									   PointerGetDatum(scan),
 									   Int32GetDatum(direction)));
 
-	pgstat_count_index_tuples(scan->indexRelation, 1 /*ntids*/);
+	if (found)
+		pgstat_count_index_tuples(scan->indexRelation, 1);
 
 	return found;
 }
@@ -636,7 +810,7 @@ index_vacuum_cleanup(IndexVacuumInfo *info,
  *		particular indexed attribute are those with both types equal to
  *		the index opclass' opcintype (note that this is subtly different
  *		from the indexed attribute's own type: it may be a binary-compatible
- *		type instead).  Only the default functions are stored in relcache
+ *		type instead).	Only the default functions are stored in relcache
  *		entries --- access methods can use the syscache to look up non-default
  *		functions.
  *
@@ -670,7 +844,7 @@ index_getprocid(Relation irel,
  *		index_getprocinfo
  *
  *		This routine allows index AMs to keep fmgr lookup info for
- *		support procs in the relcache.  As above, only the "default"
+ *		support procs in the relcache.	As above, only the "default"
  *		functions for any particular indexed attribute are cached.
  *
  * Note: the return value points into cached data that will be lost during
diff --git a/src/backend/access/nbtree/README b/src/backend/access/nbtree/README
index 9fe84e320e2d..101ed38a2320 100644
--- a/src/backend/access/nbtree/README
+++ b/src/backend/access/nbtree/README
@@ -261,13 +261,15 @@ we need to be sure we don't miss or re-scan any items.
 
 A deleted page can only be reclaimed once there is no scan or search that
 has a reference to it; until then, it must stay in place with its
-right-link undisturbed.  We implement this by waiting until all
-transactions that were running at the time of deletion are dead; which is
+right-link undisturbed.  We implement this by waiting until all active
+snapshots and registered snapshots as of the deletion are gone; which is
 overly strong, but is simple to implement within Postgres.  When marked
 dead, a deleted page is labeled with the next-transaction counter value.
 VACUUM can reclaim the page for re-use when this transaction number is
-older than the oldest open transaction.  (NOTE: VACUUM FULL can reclaim
-such pages immediately.)
+older than RecentGlobalXmin.  As collateral damage, this implementation
+also waits for running XIDs with no snapshots and for snapshots taken
+until the next transaction to allocate an XID commits.
+(NOTE: VACUUM FULL can reclaim such pages immediately.)
 
 Reclaiming a page doesn't actually change its state on disk --- we simply
 record it in the shared-memory free space map, from which it will be
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 98a99a91564e..428d3927c2c0 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.54 2007/01/09 02:14:10 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.55 2008/01/01 19:45:46 momjian Exp $
  *
  * NOTES
  *
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 7f4f2efedff5..025ac2d8f112 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -3,7 +3,7 @@
  * nbtinsert.c
  *	  Item insertion in Lehman and Yao btrees for Postgres.
  *
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -34,7 +34,7 @@ typedef struct
 	OffsetNumber newitemoff;	/* where the new item is to be inserted */
 	int			leftspace;		/* space available for items on left page */
 	int			rightspace;		/* space available for items on right page */
-	int			olddataitemstotal; /* space taken by old items */
+	int			olddataitemstotal;		/* space taken by old items */
 
 	bool		have_split;		/* found a valid split? */
 
@@ -71,8 +71,8 @@ static OffsetNumber _bt_findsplitloc(Relation rel, Page page,
 static void _bt_checksplitloc(FindSplitData *state,
 				  OffsetNumber firstoldonright, bool newitemonleft,
 				  int dataitemstoleft, Size firstoldonrightsz);
-static bool _bt_pgaddtup(Page page, Size itemsize,
-			 IndexTuple itup, OffsetNumber itup_off);
+static bool _bt_pgaddtup(Page page, Size itemsize, IndexTuple itup,
+			 OffsetNumber itup_off);
 static bool _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum,
 			int keysz, ScanKey scankey);
 static void _bt_vacuum_one_page(Relation rel, Buffer buffer);
@@ -185,21 +185,24 @@ _bt_doinsert(Relation rel, IndexTuple itup,
 static TransactionId
 _bt_ao_check_unique(Relation rel, Relation aoRel, ItemPointer tid)
 {
+	SnapshotData SnapshotDirty;
 	TransactionId xwait = InvalidTransactionId;
 	
 	Assert(RelationIsAoRows(aoRel) ||
 		   RelationIsAoCols(aoRel));
+
+	InitDirtySnapshot(SnapshotDirty);
 	
 	if (RelationIsAoRows(aoRel))
 	{
 		AppendOnlyFetchDesc aoFetchDesc =
-			appendonly_fetch_init(aoRel, SnapshotDirty, SnapshotDirty);
+			appendonly_fetch_init(aoRel, &SnapshotDirty, &SnapshotDirty);
 
 		if (appendonly_fetch(aoFetchDesc, (AOTupleId*)tid, NULL))
 		{
 			xwait =
-				(TransactionIdIsValid(SnapshotDirty->xmin)) ?
-				SnapshotDirty->xmin : SnapshotDirty->xmax;
+				(TransactionIdIsValid(SnapshotDirty.xmin)) ?
+				SnapshotDirty.xmin : SnapshotDirty.xmax;
 
 			/*
 			 * If this tuple is not being updated by other transaction,
@@ -223,13 +226,13 @@ _bt_ao_check_unique(Relation rel, Relation aoRel, ItemPointer tid)
 		
 		/* Just set the first column */
 		proj[0] = true;
-		aocsFetchDesc =	aocs_fetch_init(aoRel, SnapshotDirty, SnapshotDirty, proj);
+		aocsFetchDesc =	aocs_fetch_init(aoRel, &SnapshotDirty, &SnapshotDirty, proj);
 
 		if (aocs_fetch(aocsFetchDesc, (AOTupleId*)tid, NULL))
 		{
 			xwait =
-				(TransactionIdIsValid(SnapshotDirty->xmin)) ?
-				SnapshotDirty->xmin : SnapshotDirty->xmax;
+				(TransactionIdIsValid(SnapshotDirty.xmin)) ?
+				SnapshotDirty.xmin : SnapshotDirty.xmax;
 
 			/*
 			 * If this tuple is not being updated by other transaction,
@@ -267,6 +270,7 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 {
 	TupleDesc	itupdesc = RelationGetDescr(rel);
 	int			natts = rel->rd_rel->relnatts;
+	SnapshotData SnapshotDirty;
 	OffsetNumber maxoff;
 	Page		page;
 	BTPageOpaque opaque;
@@ -274,6 +278,8 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
+	InitDirtySnapshot(SnapshotDirty);
+
 	page = BufferGetPage(buf);
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 	maxoff = PageGetMaxOffsetNumber(page);
@@ -283,8 +289,6 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 	 */
 	for (;;)
 	{
-		HeapTupleData htup;
-		Buffer		hbuffer;
 		ItemId		curitemid;
 		IndexTuple	curitup;
 		BlockNumber nblkno;
@@ -311,8 +315,11 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 			 * we can. We only apply _bt_isequal() when we get to a non-killed
 			 * item or the end of the page.
 			 */
-			if (!ItemIdDeleted(curitemid))
+			if (!ItemIdIsDead(curitemid))
 			{
+				ItemPointerData htid;
+				bool		all_dead;
+
 				/*
 				 * _bt_compare returns 0 for (1,NULL) and (1,NULL) - this's
 				 * how we handling NULLs - and so we must not use _bt_compare
@@ -337,19 +344,21 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 					if (TransactionIdIsValid(xwait))
 						return xwait;
 				}
-					
 				else
 				{
-					htup.t_self = curitup->t_tid;
-					if (heap_fetch(heapRel, SnapshotDirty, &htup, &hbuffer,
-								   true, NULL))
+					htid = curitup->t_tid;
+
+					/*
+					 * We check the whole HOT-chain to see if there is any tuple
+					 * that satisfies SnapshotDirty.  This is necessary because we
+					 * have just a single index entry for the entire chain.
+					 */
+					if (heap_hot_search(&htid, heapRel, &SnapshotDirty, &all_dead))
 					{
 						/* it is a duplicate */
 						TransactionId xwait =
-							(TransactionIdIsValid(SnapshotDirty->xmin)) ?
-							SnapshotDirty->xmin : SnapshotDirty->xmax;
-
-						ReleaseBuffer(hbuffer);
+							(TransactionIdIsValid(SnapshotDirty.xmin)) ?
+							SnapshotDirty.xmin : SnapshotDirty.xmax;
 						
 						/*
 						 * If this tuple is being updated by other transaction
@@ -369,27 +378,30 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 						 * is itself now committed dead --- if so, don't complain.
 						 * This is a waste of time in normal scenarios but we must
 						 * do it to support CREATE INDEX CONCURRENTLY.
+						 *
+						 * We must follow HOT-chains here because during
+						 * concurrent index build, we insert the root TID though
+						 * the actual tuple may be somewhere in the HOT-chain.
+						 * While following the chain we might not stop at the
+						 * exact tuple which triggered the insert, but that's OK
+						 * because if we find a live tuple anywhere in this chain,
+						 * we have a unique key conflict.  The other live tuple is
+						 * not part of this chain because it had a different index
+						 * entry.
 						 */
-						htup.t_self = itup->t_tid;
-						if (heap_fetch(heapRel, SnapshotSelf, &htup, &hbuffer,
-									   false, NULL))
+						htid = itup->t_tid;
+						if (heap_hot_search(&htid, heapRel, SnapshotSelf, NULL))
 						{
 							/* Normal case --- it's still live */
-							ReleaseBuffer(hbuffer);
 						}
-						else if (htup.t_data != NULL)
+						else
 						{
 							/*
 							 * It's been deleted, so no error, and no need to
-							 * continue searching
+							 * continue searching.
 							 */
 							break;
 						}
-						else
-						{
-							/* couldn't find the tuple?? */
-							elog(ERROR, "failed to fetch tuple being inserted");
-						}
 
 						/*
 						 * This is a definite conflict.  Break the tuple down
@@ -417,30 +429,22 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
 											   BuildIndexValueDescription(rel,
 																values, isnull))));						
 						}
-
 					}
-					else if (htup.t_data != NULL)
+					else if (all_dead)
 					{
 						/*
-						 * Hmm, if we can't see the tuple, maybe it can be marked
-						 * killed.	This logic should match index_getnext and
-						 * btgettuple.
+						 * The conflicting tuple (or whole HOT chain) is dead to
+						 * everyone, so we may as well mark the index entry
+						 * killed.
 						 */
-						LockBuffer(hbuffer, BUFFER_LOCK_SHARE);
-						if (HeapTupleSatisfiesVacuum(htup.t_data, RecentGlobalXmin,
-													 hbuffer) == HEAPTUPLE_DEAD)
-						{
-							curitemid->lp_flags |= LP_DELETE;
-							opaque->btpo_flags |= BTP_HAS_GARBAGE;
-							/* be sure to mark the proper buffer dirty... */
-							if (nbuf != InvalidBuffer)
-								SetBufferCommitInfoNeedsSave(nbuf);
-							else
-								SetBufferCommitInfoNeedsSave(buf);
-						}
-						LockBuffer(hbuffer, BUFFER_LOCK_UNLOCK);
+						ItemIdMarkDead(curitemid);
+						opaque->btpo_flags |= BTP_HAS_GARBAGE;
+						/* be sure to mark the proper buffer dirty... */
+						if (nbuf != InvalidBuffer)
+							SetBufferCommitInfoNeedsSave(nbuf);
+						else
+							SetBufferCommitInfoNeedsSave(buf);
 					}
-					ReleaseBuffer(hbuffer);
 				}
 			}
 		}
@@ -498,7 +502,7 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
  *		any existing equal keys because of the way _bt_binsrch() works.
  *
  *		If there's not enough room in the space, we try to make room by
- *		removing any LP_DELETEd tuples.
+ *		removing any LP_DEAD tuples.
  *
  *		On entry, *buf and *offsetptr point to the first legal position
  *		where the new tuple could be inserted.  The caller should hold an
@@ -520,11 +524,12 @@ _bt_findinsertloc(Relation rel,
 				  ScanKey scankey,
 				  IndexTuple newtup)
 {
-	Buffer buf = *bufptr;
-	Page page = BufferGetPage(buf);
-	Size itemsz;
+	Buffer		buf = *bufptr;
+	Page		page = BufferGetPage(buf);
+	Size		itemsz;
 	BTPageOpaque lpageop;
-	bool movedright, vacuumed;
+	bool		movedright,
+				vacuumed;
 	OffsetNumber newitemoff;
 	OffsetNumber firstlegaloff = *offsetptr;
 
@@ -576,19 +581,21 @@ _bt_findinsertloc(Relation rel,
 		Buffer		rbuf;
 
 		/*
-		 * before considering moving right, see if we can obtain enough
-		 * space by erasing LP_DELETE items
+		 * before considering moving right, see if we can obtain enough space
+		 * by erasing LP_DEAD items
 		 */
 		if (P_ISLEAF(lpageop) && P_HAS_GARBAGE(lpageop))
 		{
 			_bt_vacuum_one_page(rel, buf);
 
-			/* remember that we vacuumed this page, because that makes
-			 * the hint supplied by the caller invalid */
+			/*
+			 * remember that we vacuumed this page, because that makes the
+			 * hint supplied by the caller invalid
+			 */
 			vacuumed = true;
 
 			if (PageGetFreeSpace(page) >= itemsz)
-				break;		/* OK, now we have enough space */
+				break;			/* OK, now we have enough space */
 		}
 
 		/*
@@ -602,11 +609,10 @@ _bt_findinsertloc(Relation rel,
 		/*
 		 * step right to next non-dead page
 		 *
-		 * must write-lock that page before releasing write lock on
-		 * current page; else someone else's _bt_check_unique scan could
-		 * fail to see our insertion.  write locks on intermediate dead
-		 * pages won't do because we don't know when they will get
-		 * de-linked from the tree.
+		 * must write-lock that page before releasing write lock on current
+		 * page; else someone else's _bt_check_unique scan could fail to see
+		 * our insertion.  write locks on intermediate dead pages won't do
+		 * because we don't know when they will get de-linked from the tree.
 		 */
 		rbuf = InvalidBuffer;
 
@@ -630,17 +636,16 @@ _bt_findinsertloc(Relation rel,
 	}
 
 	/*
-	 * Now we are on the right page, so find the insert position. If we
-	 * moved right at all, we know we should insert at the start of the
-	 * page. If we didn't move right, we can use the firstlegaloff hint
-	 * if the caller supplied one, unless we vacuumed the page which
-	 * might have moved tuples around making the hint invalid. If we
-	 * didn't move right or can't use the hint, find the position
-	 * by searching.
+	 * Now we are on the right page, so find the insert position. If we moved
+	 * right at all, we know we should insert at the start of the page. If we
+	 * didn't move right, we can use the firstlegaloff hint if the caller
+	 * supplied one, unless we vacuumed the page which might have moved tuples
+	 * around making the hint invalid. If we didn't move right or can't use
+	 * the hint, find the position by searching.
 	 */
 	if (movedright)
 		newitemoff = P_FIRSTDATAKEY(lpageop);
-	else if(firstlegaloff != InvalidOffsetNumber && !vacuumed)
+	else if (firstlegaloff != InvalidOffsetNumber && !vacuumed)
 		newitemoff = firstlegaloff;
 	else
 		newitemoff = _bt_binsrch(rel, buf, keysz, scankey, false);
@@ -930,7 +935,10 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
-	// Fetch gp_persistent_relation_node information that will be added to XLOG record.
+	/*
+	 * Fetch gp_persistent_relation_node information that will be added to
+	 * XLOG record.
+	 */
 	RelationFetchGpRelationNodeForXLog(rel);
 
 	/* Acquire a new page to split into */
@@ -1001,7 +1009,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 		itemsz = ItemIdGetLength(itemid);
 		item = (IndexTuple) PageGetItem(origpage, itemid);
 		if (PageAddItem(rightpage, (Item) item, itemsz, rightoff,
-						LP_USED) == InvalidOffsetNumber)
+						false, false) == InvalidOffsetNumber)
 		{
 			memset(rightpage, 0, BufferGetPageSize(rbuf));
 			elog(ERROR, "failed to add hikey to the right sibling"
@@ -1031,7 +1039,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 		item = (IndexTuple) PageGetItem(origpage, itemid);
 	}
 	if (PageAddItem(leftpage, (Item) item, itemsz, leftoff,
-					LP_USED) == InvalidOffsetNumber)
+					false, false) == InvalidOffsetNumber)
 	{
 		memset(rightpage, 0, BufferGetPageSize(rbuf));
 		elog(ERROR, "failed to add hikey to the left sibling"
@@ -1066,7 +1074,6 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 						 " while splitting block %u of index \"%s\"",
 						 origpagenumber, RelationGetRelationName(rel));
 				}
-
 				leftoff = OffsetNumberNext(leftoff);
 			}
 			else
@@ -1078,7 +1085,6 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 						 " while splitting block %u of index \"%s\"",
 						 origpagenumber, RelationGetRelationName(rel));
 				}
-
 				rightoff = OffsetNumberNext(rightoff);
 			}
 		}
@@ -1124,7 +1130,6 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 				 " while splitting block %u of index \"%s\"",
 				 origpagenumber, RelationGetRelationName(rel));
 		}
-
 		rightoff = OffsetNumberNext(rightoff);
 	}
 
@@ -1185,12 +1190,23 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 	 * (in the page management code) that the center of a page always be
 	 * clean, and the most efficient way to guarantee this is just to compact
 	 * the data by reinserting it into a new left page.  (XXX the latter
-	 * comment is probably obsolete.)
+	 * comment is probably obsolete; but in any case it's good to not scribble
+	 * on the original page until we enter the critical section.)
 	 *
-	 * We need to do this before writing the WAL record, so that XLogInsert can
-	 * WAL log an image of the page if necessary.
+	 * We need to do this before writing the WAL record, so that XLogInsert
+	 * can WAL log an image of the page if necessary.
 	 */
 	PageRestoreTempPage(leftpage, origpage);
+	/* leftpage, lopaque must not be used below here */
+
+	MarkBufferDirty(buf);
+	MarkBufferDirty(rbuf);
+
+	if (!P_RIGHTMOST(ropaque))
+	{
+		sopaque->btpo_prev = rightpagenumber;
+		MarkBufferDirty(sbuf);
+	}
 
 	MarkBufferDirty(buf);
 	MarkBufferDirty(rbuf);
@@ -1211,8 +1227,8 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 		XLogRecData *lastrdata;
 
 		xlrec.node = rel->rd_node;
-		xlrec.leftsib = BufferGetBlockNumber(buf);
-		xlrec.rightsib = BufferGetBlockNumber(rbuf);
+		xlrec.leftsib = origpagenumber;
+		xlrec.rightsib = rightpagenumber;
 		xlrec.rnext = ropaque->btpo_next;
 		xlrec.level = ropaque->btpo.level;
 		xlrec.firstright = firstright;
@@ -1259,10 +1275,10 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 		 * Log the new item and its offset, if it was inserted on the left
 		 * page. (If it was put on the right page, we don't need to explicitly
 		 * WAL log it because it's included with all the other items on the
-		 * right page.) Show the new item as belonging to the left page buffer,
-		 * so that it is not stored if XLogInsert decides it needs a full-page
-		 * image of the left page.  We store the offset anyway, though, to
-		 * support archive compression of these records.
+		 * right page.) Show the new item as belonging to the left page
+		 * buffer, so that it is not stored if XLogInsert decides it needs a
+		 * full-page image of the left page.  We store the offset anyway,
+		 * though, to support archive compression of these records.
 		 */
 		if (newitemonleft)
 		{
@@ -1278,31 +1294,31 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 
 			lastrdata->data = (char *) newitem;
 			lastrdata->len = MAXALIGN(newitemsz);
-			lastrdata->buffer = buf;		/* backup block 1 */
+			lastrdata->buffer = buf;	/* backup block 1 */
 			lastrdata->buffer_std = true;
 		}
 		else if (ropaque->btpo.level == 0)
 		{
 			/*
-			 * Although we don't need to WAL-log the new item, we still
-			 * need XLogInsert to consider storing a full-page image of the
-			 * left page, so make an empty entry referencing that buffer.
-			 * This also ensures that the left page is always backup block 1.
+			 * Although we don't need to WAL-log the new item, we still need
+			 * XLogInsert to consider storing a full-page image of the left
+			 * page, so make an empty entry referencing that buffer. This also
+			 * ensures that the left page is always backup block 1.
 			 */
 			lastrdata->next = lastrdata + 1;
 			lastrdata++;
 
 			lastrdata->data = NULL;
 			lastrdata->len = 0;
-			lastrdata->buffer = buf;		/* backup block 1 */
+			lastrdata->buffer = buf;	/* backup block 1 */
 			lastrdata->buffer_std = true;
 		}
 
 		/*
 		 * Log the contents of the right page in the format understood by
 		 * _bt_restore_page(). We set lastrdata->buffer to InvalidBuffer,
-		 * because we're going to recreate the whole page anyway, so it
-		 * should never be stored by XLogInsert.
+		 * because we're going to recreate the whole page anyway, so it should
+		 * never be stored by XLogInsert.
 		 *
 		 * Direct access to page is not good but faster - we should implement
 		 * some new func in page API.  Note we only store the tuples
@@ -1327,7 +1343,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 
 			lastrdata->data = NULL;
 			lastrdata->len = 0;
-			lastrdata->buffer = sbuf;		/* backup block 2 */
+			lastrdata->buffer = sbuf;	/* backup block 2 */
 			lastrdata->buffer_std = true;
 		}
 
@@ -1508,6 +1524,14 @@ _bt_findsplitloc(Relation rel,
 	if (newitemoff > maxoff && !goodenoughfound)
 		_bt_checksplitloc(&state, newitemoff, false, olddataitemstotal, 0);
 
+	/*
+	 * If the new item goes as the last item, check for splitting so that all
+	 * the old items go to the left page and the new item goes to the right
+	 * page.
+	 */
+	if (newitemoff > maxoff && !goodenoughfound)
+		_bt_checksplitloc(&state, newitemoff, false, olddataitemstotal, 0);
+
 	/*
 	 * I believe it is not possible to fail to find a feasible split, but just
 	 * in case ...
@@ -1540,16 +1564,16 @@ _bt_checksplitloc(FindSplitData *state,
 				  int olddataitemstoleft,
 				  Size firstoldonrightsz)
 {
-	int		leftfree,
-			rightfree;
-	Size	firstrightitemsz;
-	bool	newitemisfirstonright;
+	int			leftfree,
+				rightfree;
+	Size		firstrightitemsz;
+	bool		newitemisfirstonright;
 
 	/* Is the new item going to be the first item on the right page? */
 	newitemisfirstonright = (firstoldonright == state->newitemoff
 							 && !newitemonleft);
 
-	if(newitemisfirstonright)
+	if (newitemisfirstonright)
 		firstrightitemsz = state->newitemsz;
 	else
 		firstrightitemsz = firstoldonrightsz;
@@ -1560,9 +1584,8 @@ _bt_checksplitloc(FindSplitData *state,
 		(state->olddataitemstotal - olddataitemstoleft);
 
 	/*
-	 * The first item on the right page becomes the high key of the
-	 * left page; therefore it counts against left space as well as right
-	 * space.
+	 * The first item on the right page becomes the high key of the left page;
+	 * therefore it counts against left space as well as right space.
 	 */
 	leftfree -= firstrightitemsz;
 
@@ -1933,7 +1956,8 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
 	 * Note: we *must* insert the two items in item-number order, for the
 	 * benefit of _bt_restore_page().
 	 */
-	if (PageAddItem(rootpage, (Item) new_item, itemsz, P_HIKEY, LP_USED) == InvalidOffsetNumber)
+	if (PageAddItem(rootpage, (Item) new_item, itemsz, P_HIKEY,
+					false, false) == InvalidOffsetNumber)
 		elog(PANIC, "failed to add leftkey to new root page"
 			 " while splitting block %u of index \"%s\"",
 			 BufferGetBlockNumber(lbuf), RelationGetRelationName(rel));
@@ -1952,7 +1976,8 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
 	/*
 	 * insert the right page pointer into the new root page.
 	 */
-	if (PageAddItem(rootpage, (Item) new_item, itemsz, P_FIRSTKEY, LP_USED) == InvalidOffsetNumber)
+	if (PageAddItem(rootpage, (Item) new_item, itemsz, P_FIRSTKEY,
+					false, false) == InvalidOffsetNumber)
 		elog(PANIC, "failed to add rightkey to new root page"
 			 " while splitting block %u of index \"%s\"",
 			 BufferGetBlockNumber(lbuf), RelationGetRelationName(rel));
@@ -2040,7 +2065,7 @@ _bt_pgaddtup(Page page,
 	}
 
 	if (PageAddItem(page, (Item) itup, itemsize, itup_off,
-					LP_USED) == InvalidOffsetNumber)
+					false, false) == InvalidOffsetNumber)
 		return false;
 
 	return true;
@@ -2096,7 +2121,7 @@ _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum,
 /*
  * _bt_vacuum_one_page - vacuum just one index page.
  *
- * Try to remove LP_DELETE items from the given page.  The passed buffer
+ * Try to remove LP_DEAD items from the given page.  The passed buffer
  * must be exclusive-locked, but unlike a real VACUUM, we don't need a
  * super-exclusive "cleanup" lock (see nbtree/README).
  */
@@ -2112,8 +2137,8 @@ _bt_vacuum_one_page(Relation rel, Buffer buffer)
 	BTPageOpaque opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 
 	/*
-	 * Scan over all items to see which ones need deleted according to
-	 * LP_DELETE flags.
+	 * Scan over all items to see which ones need to be deleted according to
+	 * LP_DEAD flags.
 	 */
 	minoff = P_FIRSTDATAKEY(opaque);
 	maxoff = PageGetMaxOffsetNumber(page);
@@ -2123,7 +2148,7 @@ _bt_vacuum_one_page(Relation rel, Buffer buffer)
 	{
 		ItemId		itemId = PageGetItemId(page, offnum);
 
-		if (ItemIdDeleted(itemId))
+		if (ItemIdIsDead(itemId))
 			deletable[ndeletable++] = offnum;
 	}
 
@@ -2131,7 +2156,7 @@ _bt_vacuum_one_page(Relation rel, Buffer buffer)
 		_bt_delitems(rel, buffer, deletable, ndeletable, false);
 
 	/*
-	 * Note: if we didn't find any LP_DELETE items, then the page's
+	 * Note: if we didn't find any LP_DEAD items, then the page's
 	 * BTP_HAS_GARBAGE hint bit is falsely set.  We do not bother expending a
 	 * separate write to clear it, however.  We will clear it when we split
 	 * the page.
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 82e03778d97b..150b528f19e2 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.102 2007/01/05 22:19:23 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.106.2.1 2010/08/29 19:33:36 tgl Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -62,43 +62,6 @@ _bt_initmetapage(Page page, BlockNumber rootbknum, uint32 level)
 		((char *) metad + sizeof(BTMetaPageData)) - (char *) page;
 }
 
-/*
- * _bt_lognewpage() -- create an XLOG entry for a new page of the btree.
- */
-void
-_bt_lognewpage(Relation index,
-			   Page newPage,
-			   BlockNumber blockNo)
-{
-	/* We use the heap NEWPAGE record type for this */
-	xl_heap_newpage xlrec;
-	XLogRecPtr	recptr;
-	XLogRecData rdata[2];
-	
-	/* NO ELOG(ERROR) from here till newpage op is logged */
-	START_CRIT_SECTION();
-	
-	xl_heapnode_set(&xlrec.heapnode, index);
-	xlrec.blkno = blockNo;
-	
-	rdata[0].data = (char *) &xlrec;
-	rdata[0].len = SizeOfHeapNewpage;
-	rdata[0].buffer = InvalidBuffer;
-	rdata[0].next = &(rdata[1]);
-	
-	rdata[1].data = (char *) newPage;
-	rdata[1].len = BLCKSZ;
-	rdata[1].buffer = InvalidBuffer;
-	rdata[1].next = NULL;
-	
-	recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_NEWPAGE, rdata);
-	
-	PageSetLSN(newPage, recptr);
-	PageSetTLI(newPage, ThisTimeLineID);
-	
-	END_CRIT_SECTION();
-}
-
 /*
  *	_bt_getroot() -- Get the root page of the btree.
  *
@@ -686,7 +649,7 @@ _bt_page_recyclable(Page page)
 	 */
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 	if (P_ISDELETED(opaque) &&
-		TransactionIdPrecedesOrEquals(opaque->btpo.xact, RecentXmin))
+		TransactionIdPrecedes(opaque->btpo.xact, RecentGlobalXmin))
 		return true;
 	return false;
 }
@@ -723,7 +686,7 @@ _bt_delitems(Relation rel, Buffer buf,
 	PageIndexMultiDelete(page, itemnos, nitems);
 
 	/*
-	 * If this is within VACUUM, we can clear the vacuum cycleID since this
+	 * If this is within VACUUM, we can clear the vacuum cycle ID since this
 	 * page has certainly been processed by the current vacuum scan.
 	 */
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
@@ -731,7 +694,7 @@ _bt_delitems(Relation rel, Buffer buf,
 		opaque->btpo_cycleid = 0;
 
 	/*
-	 * Mark the page as not containing any LP_DELETE items.  This is not
+	 * Mark the page as not containing any LP_DEAD items.  This is not
 	 * certainly true (there might be some that have recently been marked, but
 	 * weren't included in our target-item list), but it will almost always be
 	 * true and it doesn't seem worth an additional page scan to check it.
@@ -815,8 +778,8 @@ _bt_parent_deletion_safe(Relation rel, BlockNumber target, BTStack stack)
 
 	/*
 	 * In recovery mode, assume the deletion being replayed is valid.  We
-	 * can't always check it because we won't have a full search stack,
-	 * and we should complain if there's a problem, anyway.
+	 * can't always check it because we won't have a full search stack, and we
+	 * should complain if there's a problem, anyway.
 	 */
 	if (InRecovery)
 		return true;
@@ -845,8 +808,8 @@ _bt_parent_deletion_safe(Relation rel, BlockNumber target, BTStack stack)
 		{
 			/*
 			 * It's only child, so safe if parent would itself be removable.
-			 * We have to check the parent itself, and then recurse to
-			 * test the conditions at the parent's parent.
+			 * We have to check the parent itself, and then recurse to test
+			 * the conditions at the parent's parent.
 			 */
 			if (P_RIGHTMOST(opaque) || P_ISROOT(opaque))
 			{
@@ -956,18 +919,18 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack, bool vacuum_full)
 	targetkey = CopyIndexTuple((IndexTuple) PageGetItem(page, itemid));
 
 	/*
-	 * To avoid deadlocks, we'd better drop the target page lock before
-	 * going further.
+	 * To avoid deadlocks, we'd better drop the target page lock before going
+	 * further.
 	 */
 	_bt_relbuf(rel, buf);
 
 	/*
-	 * We need an approximate pointer to the page's parent page.  We use
-	 * the standard search mechanism to search for the page's high key; this
-	 * will give us a link to either the current parent or someplace to its
-	 * left (if there are multiple equal high keys).  In recursion cases,
-	 * the caller already generated a search stack and we can just re-use
-	 * that work.
+	 * We need an approximate pointer to the page's parent page.  We use the
+	 * standard search mechanism to search for the page's high key; this will
+	 * give us a link to either the current parent or someplace to its left
+	 * (if there are multiple equal high keys).  In recursion cases, the
+	 * caller already generated a search stack and we can just re-use that
+	 * work.
 	 */
 	if (stack == NULL)
 	{
@@ -1002,11 +965,11 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack, bool vacuum_full)
 			/*
 			 * During WAL recovery, we can't use _bt_search (for one reason,
 			 * it might invoke user-defined comparison functions that expect
-			 * facilities not available in recovery mode).  Instead, just
-			 * set up a dummy stack pointing to the left end of the parent
-			 * tree level, from which _bt_getstackbuf will walk right to the
-			 * parent page.  Painful, but we don't care too much about
-			 * performance in this scenario.
+			 * facilities not available in recovery mode).	Instead, just set
+			 * up a dummy stack pointing to the left end of the parent tree
+			 * level, from which _bt_getstackbuf will walk right to the parent
+			 * page.  Painful, but we don't care too much about performance in
+			 * this scenario.
 			 */
 			pbuf = _bt_get_endpoint(rel, targetlevel + 1, false);
 			stack = (BTStack) palloc(sizeof(BTStackData));
@@ -1020,10 +983,10 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack, bool vacuum_full)
 
 	/*
 	 * We cannot delete a page that is the rightmost child of its immediate
-	 * parent, unless it is the only child --- in which case the parent has
-	 * to be deleted too, and the same condition applies recursively to it.
-	 * We have to check this condition all the way up before trying to delete.
-	 * We don't need to re-test when deleting a non-leaf page, though.
+	 * parent, unless it is the only child --- in which case the parent has to
+	 * be deleted too, and the same condition applies recursively to it. We
+	 * have to check this condition all the way up before trying to delete. We
+	 * don't need to re-test when deleting a non-leaf page, though.
 	 */
 	if (targetlevel == 0 &&
 		!_bt_parent_deletion_safe(rel, target, stack))
@@ -1148,8 +1111,8 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack, bool vacuum_full)
 	 * might be possible to push the fast root even further down, but the odds
 	 * of doing so are slim, and the locking considerations daunting.)
 	 *
-	 * We don't support handling this in the case where the parent is
-	 * becoming half-dead, even though it theoretically could occur.
+	 * We don't support handling this in the case where the parent is becoming
+	 * half-dead, even though it theoretically could occur.
 	 *
 	 * We can safely acquire a lock on the metapage here --- see comments for
 	 * _bt_newroot().
@@ -1386,10 +1349,10 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack, bool vacuum_full)
 		_bt_relbuf(rel, lbuf);
 
 	/*
-	 * If parent became half dead, recurse to delete it. Otherwise, if
-	 * right sibling is empty and is now the last child of the parent, recurse
-	 * to try to delete it.  (These cases cannot apply at the same time,
-	 * though the second case might itself recurse to the first.)
+	 * If parent became half dead, recurse to delete it. Otherwise, if right
+	 * sibling is empty and is now the last child of the parent, recurse to
+	 * try to delete it.  (These cases cannot apply at the same time, though
+	 * the second case might itself recurse to the first.)
 	 *
 	 * When recursing to parent, we hold the lock on the target page until
 	 * done.  This delays any insertions into the keyspace that was just
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 1d5d52c88ca9..13b25a370f85 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.154 2007/01/05 22:19:23 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.156.2.2 2008/11/13 17:42:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -128,7 +128,7 @@ btbuild(PG_FUNCTION_ARGS)
 			buildstate.spool2 = _bt_spoolinit(index, false, true);
 
 		/* do the heap scan */
-		reltuples = IndexBuildScan(heap, index, indexInfo,
+		reltuples = IndexBuildScan(heap, index, indexInfo, false,
 				btbuildCallback, (void *) &buildstate);
 
 		/* okay, all heap tuples are indexed */
@@ -153,7 +153,6 @@ btbuild(PG_FUNCTION_ARGS)
 			_bt_spooldestroy(buildstate.spool2);
 			buildstate.spool2 = NULL;
 		}
-
 	}
 	PG_CATCH();
 	{
@@ -313,7 +312,7 @@ _bt_validate_vacuum(Relation irel, Relation hrel, TransactionId oldest_xmin)
 						 RelationGetRelationName(irel),
 						 RelationGetRelationName(hrel));
 				}
-				switch (HeapTupleSatisfiesVacuum(htup.t_data, oldest_xmin, hbuf))
+				switch (HeapTupleSatisfiesVacuum(hrel, htup.t_data, oldest_xmin, hbuf))
 				{
 					case HEAPTUPLE_RECENTLY_DEAD:
 					case HEAPTUPLE_LIVE:
@@ -1138,13 +1137,14 @@ btvacuumpage(BTVacState *vstate, BlockNumber blkno, BlockNumber orig_blkno)
 	/*
 	 * We can't use _bt_getbuf() here because it always applies
 	 * _bt_checkpage(), which will barf on an all-zero page. We want to
-	 * recycle all-zero pages, not fail.
+	 * recycle all-zero pages, not fail.  Also, we want to use a nondefault
+	 * buffer access strategy.
 	 */
 	
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	buf = ReadBuffer(rel, blkno);
+	buf = ReadBufferWithStrategy(rel, blkno, info->strategy);
 	LockBuffer(buf, BT_READ);
 	page = BufferGetPage(buf);
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index cc4443289cd2..3841f38a1463 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.111 2007/01/09 02:14:10 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.116 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -649,7 +649,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 			 * even if the row comparison is of ">" or "<" type, because the
 			 * condition applied to all but the last row member is effectively
 			 * ">=" or "<=", and so the extra keys don't break the positioning
-			 * scheme.  But, by the same token, if we aren't able to use all
+			 * scheme.	But, by the same token, if we aren't able to use all
 			 * the row members, then the part of the row comparison that we
 			 * did use has to be treated as just a ">=" or "<=" condition, and
 			 * so we'd better adjust strat_total accordingly.
@@ -659,7 +659,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 				bool		used_all_subkeys = false;
 
 				Assert(!(subkey->sk_flags & SK_ROW_END));
-				for(;;)
+				for (;;)
 				{
 					subkey++;
 					Assert(subkey->sk_flags & SK_ROW_MEMBER);
@@ -758,8 +758,6 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 	 *
 	 * If goback = true, we will then step back one item, while if
 	 * goback = false, we will start the scan on the located item.
-	 *
-	 * it's yet other place to add some code later for is(not)null ...
 	 *----------
 	 */
 	switch (strat_total)
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 51f35b48dca4..364a8d778118 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -57,13 +57,14 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.110 2007/01/09 02:14:10 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.114 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include "access/heapam.h"
 #include "access/nbtree.h"
 #include "miscadmin.h"
 #include "storage/smgr.h"
@@ -287,7 +288,8 @@ _bt_blwritepage(BTWriteState *wstate, Page page, BlockNumber blkno)
 	/* XLOG stuff */
 	if (wstate->btws_use_wal)
 	{
-		_bt_lognewpage(wstate->index, page, blkno);
+		/* We use the heap NEWPAGE record type for this */
+		log_newpage(&wstate->index->rd_node, blkno, page);
 	}
 
 	else
@@ -438,7 +440,7 @@ _bt_sortaddtup(Page page,
 	}
 
 	if (PageAddItem(page, (Item) itup, itemsize, itup_off,
-					LP_USED) == InvalidOffsetNumber)
+					false, false) == InvalidOffsetNumber)
 		elog(ERROR, "failed to add item to the index page");
 }
 
@@ -559,7 +561,7 @@ _bt_buildadd(BTWriteState *wstate, BTPageState *state, IndexTuple itup)
 		 */
 		hii = PageGetItemId(opage, P_HIKEY);
 		*hii = *ii;
-		ii->lp_flags &= ~LP_USED;
+		ItemIdSetUnused(ii);	/* redundant */
 		((PageHeader) opage)->pd_lower -= sizeof(ItemIdData);
 
 		/*
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index a63d1fbff95e..1d6998a25af7 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.82 2007/01/09 02:14:10 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.88.2.1 2008/04/16 23:59:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -206,7 +206,7 @@ _bt_freestack(BTStack stack)
  * that's the only one returned.  (So, we return either a single = key,
  * or one or two boundary-condition keys for each attr.)  However, if we
  * cannot compare two keys for lack of a suitable cross-type operator,
- * we cannot eliminate either.  If there are two such keys of the same
+ * we cannot eliminate either.	If there are two such keys of the same
  * operator strategy, the second one is just pushed into the output array
  * without further processing here.  We may also emit both >/>= or both
  * </<= keys if we can't compare them.  The logic about required keys still
@@ -265,12 +265,27 @@ _bt_preprocess_keys(IndexScanDesc scan)
 	if (numberOfKeys == 1)
 	{
 		/*
-		 * We don't use indices for 'A is null' and 'A is not null' currently
-		 * and 'A < = > <> NULL' will always fail - so qual is not OK if
-		 * comparison value is NULL.	  - vadim 03/21/97
+		 * We treat all btree operators as strict (even if they're not so
+		 * marked in pg_proc).	This means that it is impossible for an
+		 * operator condition with a NULL comparison constant to succeed, and
+		 * we can reject it right away.
+		 *
+		 * However, we now also support "x IS NULL" clauses as search
+		 * conditions, so in that case keep going.	The planner has not filled
+		 * in any particular strategy in this case, so set it to
+		 * BTEqualStrategyNumber --- we can treat IS NULL as an equality
+		 * operator for purposes of search strategy.
 		 */
 		if (cur->sk_flags & SK_ISNULL)
-			so->qual_ok = false;
+		{
+			if (cur->sk_flags & SK_SEARCHNULL)
+			{
+				cur->sk_strategy = BTEqualStrategyNumber;
+				cur->sk_subtype = InvalidOid;
+			}
+			else
+				so->qual_ok = false;
+		}
 		_bt_mark_scankey_with_indoption(cur, indoption);
 		memcpy(outkeys, cur, sizeof(ScanKeyData));
 		so->numberOfKeys = 1;
@@ -289,8 +304,8 @@ _bt_preprocess_keys(IndexScanDesc scan)
 	/*
 	 * Initialize for processing of keys for attr 1.
 	 *
-	 * xform[i] points to the currently best scan key of strategy type i+1;
-	 * it is NULL if we haven't yet found such a key for this attr.
+	 * xform[i] points to the currently best scan key of strategy type i+1; it
+	 * is NULL if we haven't yet found such a key for this attr.
 	 */
 	attno = 1;
 	memset(xform, 0, sizeof(xform));
@@ -304,17 +319,20 @@ _bt_preprocess_keys(IndexScanDesc scan)
 	{
 		if (i < numberOfKeys)
 		{
-			/* See comments above: any NULL implies cannot match qual */
+			/* See comments above about NULLs and IS NULL handling. */
 			/* Note: we assume SK_ISNULL is never set in a row header key */
 			if (cur->sk_flags & SK_ISNULL)
 			{
-				so->qual_ok = false;
-
-				/*
-				 * Quit processing so we don't try to invoke comparison
-				 * routines on NULLs.
-				 */
-				return;
+				if (cur->sk_flags & SK_SEARCHNULL)
+				{
+					cur->sk_strategy = BTEqualStrategyNumber;
+					cur->sk_subtype = InvalidOid;
+				}
+				else
+				{
+					so->qual_ok = false;
+					return;
+				}
 			}
 		}
 
@@ -345,6 +363,14 @@ _bt_preprocess_keys(IndexScanDesc scan)
 
 					if (!chk || j == (BTEqualStrategyNumber - 1))
 						continue;
+
+					/* IS NULL together with any other predicate must fail */
+					if (eq->sk_flags & SK_SEARCHNULL)
+					{
+						so->qual_ok = false;
+						return;
+					}
+
 					if (_bt_compare_scankey_args(scan, chk, eq, chk,
 												 &test_result))
 					{
@@ -439,6 +465,7 @@ _bt_preprocess_keys(IndexScanDesc scan)
 			memcpy(outkey, cur, sizeof(ScanKeyData));
 			if (numberOfEqualCols == attno - 1)
 				_bt_mark_scankey_required(outkey);
+
 			/*
 			 * We don't support RowCompare using equality; such a qual would
 			 * mess up the numberOfEqualCols tracking.
@@ -456,6 +483,23 @@ _bt_preprocess_keys(IndexScanDesc scan)
 		else
 		{
 			/* yup, keep only the more restrictive key */
+
+			/* if either arg is NULL, don't try to compare */
+			if ((cur->sk_flags | xform[j]->sk_flags) & SK_ISNULL)
+			{
+				/* at least one of them must be an IS NULL clause */
+				Assert(j == (BTEqualStrategyNumber - 1));
+				Assert((cur->sk_flags | xform[j]->sk_flags) & SK_SEARCHNULL);
+				/* if one is and one isn't, the search must fail */
+				if ((cur->sk_flags ^ xform[j]->sk_flags) & SK_SEARCHNULL)
+				{
+					so->qual_ok = false;
+					return;
+				}
+				/* we have duplicate IS NULL clauses, ignore the newer one */
+				continue;
+			}
+
 			if (_bt_compare_scankey_args(scan, cur, cur, xform[j],
 										 &test_result))
 			{
@@ -472,9 +516,9 @@ _bt_preprocess_keys(IndexScanDesc scan)
 			else
 			{
 				/*
-				 * We can't determine which key is more restrictive.  Keep
-				 * the previous one in xform[j] and push this one directly
-				 * to the output array.
+				 * We can't determine which key is more restrictive.  Keep the
+				 * previous one in xform[j] and push this one directly to the
+				 * output array.
 				 */
 				ScanKey		outkey = &outkeys[new_numberOfKeys++];
 
@@ -500,7 +544,7 @@ _bt_preprocess_keys(IndexScanDesc scan)
  * and amoplefttype/amoprighttype equal to the two argument datatypes.
  *
  * If the opfamily doesn't supply a complete set of cross-type operators we
- * may not be able to make the comparison.  If we can make the comparison
+ * may not be able to make the comparison.	If we can make the comparison
  * we store the operator result in *result and return TRUE.  We return FALSE
  * if the comparison could not be made.
  *
@@ -566,8 +610,8 @@ _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,
 	 * indexscan initiated by syscache lookup will use cross-data-type
 	 * operators.)
 	 *
-	 * If the sk_strategy was flipped by _bt_mark_scankey_with_indoption,
-	 * we have to un-flip it to get the correct opfamily member.
+	 * If the sk_strategy was flipped by _bt_mark_scankey_with_indoption, we
+	 * have to un-flip it to get the correct opfamily member.
 	 */
 	strat = op->sk_strategy;
 	if (op->sk_flags & SK_BT_DESC)
@@ -612,7 +656,7 @@ _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,
 static void
 _bt_mark_scankey_with_indoption(ScanKey skey, int16 *indoption)
 {
-	int		addflags;
+	int			addflags;
 
 	addflags = indoption[skey->sk_attno - 1] << SK_BT_INDOPTION_SHIFT;
 	if ((addflags & SK_BT_DESC) && !(skey->sk_flags & SK_BT_DESC))
@@ -747,7 +791,7 @@ _bt_checkkeys(IndexScanDesc scan,
 	 * However, if this is the last tuple on the page, we should check the
 	 * index keys to prevent uselessly advancing to the next page.
 	 */
-	if (scan->ignore_killed_tuples && ItemIdDeleted(iid))
+	if (scan->ignore_killed_tuples && ItemIdIsDead(iid))
 	{
 		/* return immediately if there are more tuples on the page */
 		if (ScanDirectionIsForward(dir))
@@ -799,11 +843,29 @@ _bt_checkkeys(IndexScanDesc scan,
 							  tupdesc,
 							  &isNull);
 
-		/* btree doesn't support 'A is null' clauses, yet */
 		if (key->sk_flags & SK_ISNULL)
 		{
-			/* we shouldn't get here, really; see _bt_preprocess_keys() */
-			*continuescan = false;
+			/* Handle IS NULL tests */
+			Assert(key->sk_flags & SK_SEARCHNULL);
+
+			if (isNull)
+				continue;		/* tuple satisfies this qual */
+
+			/*
+			 * Tuple fails this qual.  If it's a required qual for the current
+			 * scan direction, then we can conclude no further tuples will
+			 * pass, either.
+			 */
+			if ((key->sk_flags & SK_BT_REQFWD) &&
+				ScanDirectionIsForward(dir))
+				*continuescan = false;
+			else if ((key->sk_flags & SK_BT_REQBKWD) &&
+					 ScanDirectionIsBackward(dir))
+				*continuescan = false;
+
+			/*
+			 * In any case, this indextuple doesn't match the qual.
+			 */
 			return false;
 		}
 
@@ -814,8 +876,8 @@ _bt_checkkeys(IndexScanDesc scan,
 				/*
 				 * Since NULLs are sorted before non-NULLs, we know we have
 				 * reached the lower limit of the range of values for this
-				 * index attr.  On a backward scan, we can stop if this qual is
-				 * one of the "must match" subset.  On a forward scan,
+				 * index attr.	On a backward scan, we can stop if this qual
+				 * is one of the "must match" subset.  On a forward scan,
 				 * however, we should keep going.
 				 */
 				if ((key->sk_flags & SK_BT_REQBKWD) &&
@@ -827,8 +889,8 @@ _bt_checkkeys(IndexScanDesc scan,
 				/*
 				 * Since NULLs are sorted after non-NULLs, we know we have
 				 * reached the upper limit of the range of values for this
-				 * index attr.  On a forward scan, we can stop if this qual is
-				 * one of the "must match" subset.  On a backward scan,
+				 * index attr.	On a forward scan, we can stop if this qual is
+				 * one of the "must match" subset.	On a backward scan,
 				 * however, we should keep going.
 				 */
 				if ((key->sk_flags & SK_BT_REQFWD) &&
@@ -918,7 +980,7 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, TupleDesc tupdesc,
 				 * Since NULLs are sorted before non-NULLs, we know we have
 				 * reached the lower limit of the range of values for this
 				 * index attr. On a backward scan, we can stop if this qual is
-				 * one of the "must match" subset.  On a forward scan,
+				 * one of the "must match" subset.	On a forward scan,
 				 * however, we should keep going.
 				 */
 				if ((subkey->sk_flags & SK_BT_REQBKWD) &&
@@ -931,7 +993,7 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, TupleDesc tupdesc,
 				 * Since NULLs are sorted after non-NULLs, we know we have
 				 * reached the upper limit of the range of values for this
 				 * index attr. On a forward scan, we can stop if this qual is
-				 * one of the "must match" subset.  On a backward scan,
+				 * one of the "must match" subset.	On a backward scan,
 				 * however, we should keep going.
 				 */
 				if ((subkey->sk_flags & SK_BT_REQFWD) &&
@@ -1028,7 +1090,7 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, TupleDesc tupdesc,
 }
 
 /*
- * _bt_killitems - set LP_DELETE bit for items an indexscan caller has
+ * _bt_killitems - set LP_DEAD state for items an indexscan caller has
  * told us were killed
  *
  * scan->so contains information about the current page and killed tuples
@@ -1036,7 +1098,7 @@ _bt_check_rowcompare(ScanKey skey, IndexTuple tuple, TupleDesc tupdesc,
  *
  * The caller must have pin on so->currPos.buf, but may or may not have
  * read-lock, as indicated by haveLock.  Note that we assume read-lock
- * is sufficient for setting LP_DELETE hint bits.
+ * is sufficient for setting LP_DEAD status (which is only a hint).
  *
  * We match items by heap TID before assuming they are the right ones to
  * delete.	We cope with cases where items have moved right due to insertions.
@@ -1100,7 +1162,7 @@ _bt_killitems(IndexScanDesc scan, bool haveLock)
 			if (ItemPointerEquals(&ituple->t_tid, &kitem->heapTid))
 			{
 				/* found the item */
-				iid->lp_flags |= LP_DELETE;
+				ItemIdMarkDead(iid);
 				killedsomething = true;
 				break;			/* out of inner search loop */
 			}
@@ -1113,7 +1175,7 @@ _bt_killitems(IndexScanDesc scan, bool haveLock)
 	 * commit-hint-bit status update for heap tuples: we mark the buffer dirty
 	 * but don't make a WAL log entry.
 	 *
-	 * Whenever we mark anything LP_DELETEd, we also set the page's
+	 * Whenever we mark anything LP_DEAD, we also set the page's
 	 * BTP_HAS_GARBAGE flag, which is likewise just a hint.
 	 */
 	if (killedsomething)
@@ -1223,11 +1285,13 @@ _bt_start_vacuum(Relation rel)
 
 	LWLockAcquire(BtreeVacuumLock, LW_EXCLUSIVE);
 
-	/* Assign the next cycle ID, being careful to avoid zero */
-	do
-	{
-		result = ++(btvacinfo->cycle_ctr);
-	} while (result == 0);
+	/*
+	 * Assign the next cycle ID, being careful to avoid zero as well as the
+	 * reserved high values.
+	 */
+	result = ++(btvacinfo->cycle_ctr);
+	if (result == 0 || result > MAX_BT_CYCLE_ID)
+		result = btvacinfo->cycle_ctr = 1;
 
 	/* Let's just make sure there's no entry already for this index */
 	for (i = 0; i < btvacinfo->num_vacuums; i++)
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index 2408e2b675ff..62775e32044b 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.49 2007/11/16 19:53:50 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.50 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -145,8 +145,8 @@ _bt_restore_page(Page page, char *from, int len)
 		memcpy(&itupdata, from, sizeof(IndexTupleData));
 		itemsz = IndexTupleDSize(itupdata);
 		itemsz = MAXALIGN(itemsz);
-		if (PageAddItem(page, (Item) from, itemsz,
-						FirstOffsetNumber, LP_USED) == InvalidOffsetNumber)
+		if (PageAddItem(page, (Item) from, itemsz, FirstOffsetNumber,
+						false, false) == InvalidOffsetNumber)
 			elog(PANIC, "_bt_restore_page: cannot add item to page");
 		from += itemsz;
 	}
@@ -251,7 +251,7 @@ btree_xlog_insert(bool isleaf, bool ismeta,
 			{
 				if (PageAddItem(page, (Item) datapos, datalen,
 							ItemPointerGetOffsetNumber(&(xlrec->target.tid)),
-								LP_USED) == InvalidOffsetNumber)
+								false, false) == InvalidOffsetNumber)
 					elog(PANIC, "btree_insert_redo: failed to add item");
 
 				PageSetLSN(page, lsn);
@@ -385,15 +385,15 @@ btree_xlog_split(bool onleft, bool isroot,
 	 * Reconstruct left (original) sibling if needed.  Note that this code
 	 * ensures that the items remaining on the left page are in the correct
 	 * item number order, but it does not reproduce the physical order they
-	 * would have had.  Is this worth changing?  See also _bt_restore_page().
+	 * would have had.	Is this worth changing?  See also _bt_restore_page().
 	 */
 	if (!(record->xl_info & XLR_BKP_BLOCK_1))
 	{
-		Buffer lbuf = XLogReadBuffer(reln, xlrec->leftsib, false);
+		Buffer		lbuf = XLogReadBuffer(reln, xlrec->leftsib, false);
 
 		if (BufferIsValid(lbuf))
 		{
-			Page lpage = (Page) BufferGetPage(lbuf);
+			Page		lpage = (Page) BufferGetPage(lbuf);
 			BTPageOpaque lopaque = (BTPageOpaque) PageGetSpecialPointer(lpage);
 
 			if (!XLByteLE(lsn, PageGetLSN(lpage)))
@@ -401,17 +401,18 @@ btree_xlog_split(bool onleft, bool isroot,
 				OffsetNumber off;
 				OffsetNumber maxoff = PageGetMaxOffsetNumber(lpage);
 				OffsetNumber deletable[MaxOffsetNumber];
-				int ndeletable = 0;
+				int			ndeletable = 0;
 
 				/*
-				 * Remove the items from the left page that were copied to
-				 * the right page.  Also remove the old high key, if any.
-				 * (We must remove everything before trying to insert any
-				 * items, else we risk not having enough space.)
+				 * Remove the items from the left page that were copied to the
+				 * right page.	Also remove the old high key, if any. (We must
+				 * remove everything before trying to insert any items, else
+				 * we risk not having enough space.)
 				 */
 				if (!P_RIGHTMOST(lopaque))
 				{
 					deletable[ndeletable++] = P_HIKEY;
+
 					/*
 					 * newitemoff is given to us relative to the original
 					 * page's item numbering, so adjust it for this deletion.
@@ -429,13 +430,13 @@ btree_xlog_split(bool onleft, bool isroot,
 				if (onleft)
 				{
 					if (PageAddItem(lpage, newitem, newitemsz, newitemoff,
-									LP_USED) == InvalidOffsetNumber)
+									false, false) == InvalidOffsetNumber)
 						elog(PANIC, "failed to add new item to left page after split");
 				}
 
 				/* Set high key */
 				if (PageAddItem(lpage, left_hikey, left_hikeysz,
-								P_HIKEY, LP_USED) == InvalidOffsetNumber)
+								P_HIKEY, false, false) == InvalidOffsetNumber)
 					elog(PANIC, "failed to add high key to left page after split");
 
 				/* Fix opaque fields */
@@ -452,17 +453,17 @@ btree_xlog_split(bool onleft, bool isroot,
 		}
 	}
 
-	/* We no longer need the right buffer. */
+	/* We no longer need the right buffer */
 	UnlockReleaseBuffer(rbuf);
 
 	/* Fix left-link of the page to the right of the new right sibling */
 	if (xlrec->rnext != P_NONE && !(record->xl_info & XLR_BKP_BLOCK_2))
 	{
-		Buffer buffer = XLogReadBuffer(reln, xlrec->rnext, false);
+		Buffer		buffer = XLogReadBuffer(reln, xlrec->rnext, false);
 
 		if (BufferIsValid(buffer))
 		{
-			Page page = (Page) BufferGetPage(buffer);
+			Page		page = (Page) BufferGetPage(buffer);
 
 			if (!XLByteLE(lsn, PageGetLSN(page)))
 			{
@@ -537,7 +538,7 @@ btree_xlog_delete(XLogRecPtr lsn, XLogRecord *record)
 	}
 
 	/*
-	 * Mark the page as not containing any LP_DELETE items --- see comments in
+	 * Mark the page as not containing any LP_DEAD items --- see comments in
 	 * _bt_delitems().
 	 */
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
@@ -993,7 +994,7 @@ btree_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 								 xlrec->node.spcNode, xlrec->node.dbNode,
 								 xlrec->node.relNode);
 				appendStringInfo(buf, "left %u, right %u, next %u, level %u, firstright %d",
-								 xlrec->leftsib, xlrec->rightsib, xlrec->rnext,
+							     xlrec->leftsib, xlrec->rightsib, xlrec->rnext,
 								 xlrec->level, xlrec->firstright);
 				break;
 			}
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index dc870c64cca8..83662043648d 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -14,17 +14,19 @@
  * CLOG page is initialized to zeroes.	Other writes of CLOG come from
  * recording of transaction commit or abort in xact.c, which generates its
  * own XLOG records for these events and will re-perform the status update
- * on redo; so we need make no additional XLOG entry here.	Also, the XLOG
- * is guaranteed flushed through the XLOG commit record before we are called
- * to log a commit, so the WAL rule "write xlog before data" is satisfied
- * automatically for commits, and we don't really care for aborts.  Therefore,
- * we don't need to mark CLOG pages with LSN information; we have enough
- * synchronization already.
+ * on redo; so we need make no additional XLOG entry here.	For synchronous
+ * transaction commits, the XLOG is guaranteed flushed through the XLOG commit
+ * record before we are called to log a commit, so the WAL rule "write xlog
+ * before data" is satisfied automatically.  However, for async commits we
+ * must track the latest LSN affecting each CLOG page, so that we can flush
+ * XLOG that far and satisfy the WAL rule.	We don't have to worry about this
+ * for aborts (whether sync or async), since the post-crash assumption would
+ * be that such transactions failed anyway.
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.42 2007/01/05 22:19:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.46 2008/01/01 19:45:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,6 +60,13 @@
 #define TransactionIdToByte(xid)	(TransactionIdToPgIndex(xid) / CLOG_XACTS_PER_BYTE)
 #define TransactionIdToBIndex(xid)	((xid) % (TransactionId) CLOG_XACTS_PER_BYTE)
 
+/* We store the latest async LSN for each group of transactions */
+#define CLOG_XACTS_PER_LSN_GROUP	32	/* keep this a power of 2 */
+#define CLOG_LSNS_PER_PAGE	(CLOG_XACTS_PER_PAGE / CLOG_XACTS_PER_LSN_GROUP)
+
+#define GetLSNIndex(slotno, xid)	((slotno) * CLOG_LSNS_PER_PAGE + \
+	((xid) % (TransactionId) CLOG_XACTS_PER_PAGE) / CLOG_XACTS_PER_LSN_GROUP)
+
 
 /*
  * Link to shared-memory data structures for CLOG control
@@ -93,11 +102,16 @@ char *XidStatus_Name(XidStatus status)
 /*
  * Record the final state of a transaction in the commit log.
  *
+ * lsn must be the WAL location of the commit record when recording an async
+ * commit.	For a synchronous commit it can be InvalidXLogRecPtr, since the
+ * caller guarantees the commit record is already flushed in that case.  It
+ * should be InvalidXLogRecPtr for abort cases, too.
+ *
  * NB: this is a low-level routine and is NOT the preferred entry point
  * for most uses; TransactionLogUpdate() in transam.c is the intended caller.
  */
 void
-TransactionIdSetStatus(TransactionId xid, XidStatus status)
+TransactionIdSetStatus(TransactionId xid, XidStatus status, XLogRecPtr lsn)
 {
 	MIRRORED_LOCK_DECLARE;
 
@@ -117,7 +131,16 @@ TransactionIdSetStatus(TransactionId xid, XidStatus status)
 
 	LWLockAcquire(CLogControlLock, LW_EXCLUSIVE);
 
-	slotno = SimpleLruReadPage(ClogCtl, pageno, xid);
+	/*
+	 * If we're doing an async commit (ie, lsn is valid), then we must wait
+	 * for any active write on the page slot to complete.  Otherwise our
+	 * update could reach disk in that write, which will not do since we
+	 * mustn't let it reach disk until we've done the appropriate WAL flush.
+	 * But when lsn is invalid, it's OK to scribble on a page while it is
+	 * write-busy, since we don't care if the update reaches disk sooner than
+	 * we think.  Hence, pass write_ok = XLogRecPtrIsInvalid(lsn).
+	 */
+	slotno = SimpleLruReadPage(ClogCtl, pageno, XLogRecPtrIsInvalid(lsn), xid);
 	byteptr = ClogCtl->shared->page_buffer[slotno] + byteno;
 
 	debugStatus = ((*byteptr >> bshift) & CLOG_XACT_BITMASK);
@@ -147,6 +170,22 @@ TransactionIdSetStatus(TransactionId xid, XidStatus status)
 
 	ClogCtl->shared->page_dirty[slotno] = true;
 
+	/*
+	 * Update the group LSN if the transaction completion LSN is higher.
+	 *
+	 * Note: lsn will be invalid when supplied during InRecovery processing,
+	 * so we don't need to do anything special to avoid LSN updates during
+	 * recovery. After recovery completes the next clog change will set the
+	 * LSN correctly.
+	 */
+	if (!XLogRecPtrIsInvalid(lsn))
+	{
+		int			lsnindex = GetLSNIndex(slotno, xid);
+
+		if (XLByteLT(ClogCtl->shared->group_lsn[lsnindex], lsn))
+			ClogCtl->shared->group_lsn[lsnindex] = lsn;
+	}
+
 	LWLockRelease(CLogControlLock);
 
 	MIRRORED_UNLOCK;
@@ -155,11 +194,20 @@ TransactionIdSetStatus(TransactionId xid, XidStatus status)
 /*
  * Interrogate the state of a transaction in the commit log.
  *
+ * Aside from the actual commit status, this function returns (into *lsn)
+ * an LSN that is late enough to be able to guarantee that if we flush up to
+ * that LSN then we will have flushed the transaction's commit record to disk.
+ * The result is not necessarily the exact LSN of the transaction's commit
+ * record!	For example, for long-past transactions (those whose clog pages
+ * already migrated to disk), we'll return InvalidXLogRecPtr.  Also, because
+ * we group transactions on the same clog page to conserve storage, we might
+ * return the LSN of a later transaction that falls into the same group.
+ *
  * NB: this is a low-level routine and is NOT the preferred entry point
  * for most uses; TransactionLogFetch() in transam.c is the intended caller.
  */
 XidStatus
-TransactionIdGetStatus(TransactionId xid)
+TransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn)
 {
 	MIRRORED_LOCK_DECLARE;
 
@@ -167,6 +215,7 @@ TransactionIdGetStatus(TransactionId xid)
 	int			byteno = TransactionIdToByte(xid);
 	int			bshift = TransactionIdToBIndex(xid) * CLOG_BITS_PER_XACT;
 	int			slotno;
+	int			lsnindex;
 	char	   *byteptr;
 	XidStatus	status;
 
@@ -179,6 +228,9 @@ TransactionIdGetStatus(TransactionId xid)
 
 	status = (*byteptr >> bshift) & CLOG_XACT_BITMASK;
 
+	lsnindex = GetLSNIndex(slotno, xid);
+	*lsn = ClogCtl->shared->group_lsn[lsnindex];
+
 	LWLockRelease(CLogControlLock);
 
 	MIRRORED_UNLOCK;
@@ -291,7 +343,7 @@ CLOGScanForPrevStatus(
 			return false;
 		}
 			
-		slotno = SimpleLruReadPage(ClogCtl, pageno, highXid);
+		slotno = SimpleLruReadPage(ClogCtl, pageno, false, highXid);
 
 		for (xid = highXid; xid >= lowXid; xid--)
 		{
@@ -362,15 +414,15 @@ CLOGTransactionIsOld(TransactionId xid)
 Size
 CLOGShmemSize(void)
 {
-	return SimpleLruShmemSize(NUM_CLOG_BUFFERS);
+	return SimpleLruShmemSize(NUM_CLOG_BUFFERS, CLOG_LSNS_PER_PAGE);
 }
 
 void
 CLOGShmemInit(void)
 {
 	ClogCtl->PagePrecedes = CLOGPagePrecedes;
-	SimpleLruInit(ClogCtl, "CLOG Ctl", NUM_CLOG_BUFFERS,
-				  CLogControlLock, CLOG_DIR);
+	SimpleLruInit(ClogCtl, "CLOG Ctl", NUM_CLOG_BUFFERS, CLOG_LSNS_PER_PAGE,
+				  CLogControlLock, "pg_clog");
 }
 
 /*
@@ -470,7 +522,7 @@ StartupCLOG(void)
 		int			slotno;
 		char	   *byteptr;
 
-		slotno = SimpleLruReadPage(ClogCtl, pageno, xid);
+		slotno = SimpleLruReadPage(ClogCtl, pageno, false, xid);
 		byteptr = ClogCtl->shared->page_buffer[slotno] + byteno;
 
 		/* Zero so-far-unused positions in the current byte */
@@ -630,10 +682,6 @@ CLOGPagePrecedes(int page1, int page2)
 
 /*
  * Write a ZEROPAGE xlog record
- *
- * Note: xlog record is marked as outside transaction control, since we
- * want it to be redone whether the invoking transaction commits or not.
- * (Besides which, this is normally done just before entering a transaction.)
  */
 static void
 WriteZeroPageXlogRec(int pageno)
@@ -644,7 +692,7 @@ WriteZeroPageXlogRec(int pageno)
 	rdata.len = sizeof(int);
 	rdata.buffer = InvalidBuffer;
 	rdata.next = NULL;
-	(void) XLogInsert(RM_CLOG_ID, CLOG_ZEROPAGE | XLOG_NO_TRAN, &rdata);
+	(void) XLogInsert(RM_CLOG_ID, CLOG_ZEROPAGE, &rdata);
 }
 
 /*
@@ -652,9 +700,6 @@ WriteZeroPageXlogRec(int pageno)
  *
  * We must flush the xlog record to disk before returning --- see notes
  * in TruncateCLOG().
- *
- * Note: xlog record is marked as outside transaction control, since we
- * want it to be redone whether the invoking transaction commits or not.
  */
 static void
 WriteTruncateXlogRec(int pageno)
@@ -666,7 +711,7 @@ WriteTruncateXlogRec(int pageno)
 	rdata.len = sizeof(int);
 	rdata.buffer = InvalidBuffer;
 	rdata.next = NULL;
-	recptr = XLogInsert(RM_CLOG_ID, CLOG_TRUNCATE | XLOG_NO_TRAN, &rdata);
+	recptr = XLogInsert(RM_CLOG_ID, CLOG_TRUNCATE, &rdata);
 	XLogFlush(recptr);
 }
 
@@ -704,8 +749,8 @@ clog_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 		memcpy(&pageno, XLogRecGetData(record), sizeof(int));
 
 		/*
-		 * During XLOG replay, latest_page_number isn't set up yet; insert
-		 * a suitable value to bypass the sanity test in SimpleLruTruncate.
+		 * During XLOG replay, latest_page_number isn't set up yet; insert a
+		 * suitable value to bypass the sanity test in SimpleLruTruncate.
 		 */
 		ClogCtl->shared->latest_page_number = pageno;
 
diff --git a/src/backend/access/transam/distributedlog.c b/src/backend/access/transam/distributedlog.c
index fdaac9a137b0..85e8c006fc46 100644
--- a/src/backend/access/transam/distributedlog.c
+++ b/src/backend/access/transam/distributedlog.c
@@ -110,7 +110,7 @@ DistributedLog_SetCommitted(
 		}
 	}
 	
-	slotno = SimpleLruReadPage(DistributedLogCtl, page, localXid);
+	slotno = SimpleLruReadPage(DistributedLogCtl, page, true, localXid);
 	ptr = (DistributedLogEntry *) DistributedLogCtl->shared->page_buffer[slotno];
 	ptr += entryno;
 
@@ -210,7 +210,7 @@ DistributedLog_CommittedCheck(
 		return false;
 	}
 		
-	slotno = SimpleLruReadPage(DistributedLogCtl, page, localXid);
+	slotno = SimpleLruReadPage(DistributedLogCtl, page, true, localXid);
 	ptr = (DistributedLogEntry *) DistributedLogCtl->shared->page_buffer[slotno];
 	ptr += entryno;
 	*distribTimeStamp = ptr->distribTimeStamp;
@@ -300,7 +300,7 @@ DistributedLog_ScanForPrevCommitted(
 			return false;
 		}
 			
-		slotno = SimpleLruReadPage(DistributedLogCtl, pageno, highXid);
+		slotno = SimpleLruReadPage(DistributedLogCtl, pageno, true, highXid);
 
 		for (xid = highXid; xid >= lowXid; xid--)
 		{
@@ -357,7 +357,7 @@ DistributedLog_ShmemSize(void)
 {
 	Size size;
 	
-	size = SimpleLruShmemSize(NUM_DISTRIBUTEDLOG_BUFFERS);
+	size = SimpleLruShmemSize(NUM_DISTRIBUTEDLOG_BUFFERS, 0);
 
 	size += DistributedLog_SharedShmemSize();
 
@@ -371,7 +371,7 @@ DistributedLog_ShmemInit(void)
 
 	/* Set up SLRU for the distributed log. */
 	DistributedLogCtl->PagePrecedes = DistributedLog_PagePrecedes;
-	SimpleLruInit(DistributedLogCtl, "DistributedLogCtl", NUM_DISTRIBUTEDLOG_BUFFERS,
+	SimpleLruInit(DistributedLogCtl, "DistributedLogCtl", NUM_DISTRIBUTEDLOG_BUFFERS, 0,
 				  DistributedLogControlLock, DISTRIBUTEDLOG_DIR);
 
 	/* Create or attach to the shared structure */
@@ -507,7 +507,7 @@ DistributedLog_Startup(
 
 		int			remainingEntries;
 
-		slotno = SimpleLruReadPage(DistributedLogCtl, endPage, nextXid);
+		slotno = SimpleLruReadPage(DistributedLogCtl, endPage, true, nextXid);
 		ptr = (DistributedLogEntry *) DistributedLogCtl->shared->page_buffer[slotno];
 		ptr += entryno;
 
@@ -716,7 +716,7 @@ DistributedLog_WriteZeroPageXlogRec(int page)
 	rdata.len = sizeof(int);
 	rdata.buffer = InvalidBuffer;
 	rdata.next = NULL;
-	(void) XLogInsert(RM_DISTRIBUTEDLOG_ID, DISTRIBUTEDLOG_ZEROPAGE | XLOG_NO_TRAN, &rdata);
+	(void) XLogInsert(RM_DISTRIBUTEDLOG_ID, DISTRIBUTEDLOG_ZEROPAGE, &rdata);
 }
 
 /*
@@ -738,7 +738,7 @@ DistributedLog_WriteTruncateXlogRec(int page)
 	rdata.len = sizeof(int);
 	rdata.buffer = InvalidBuffer;
 	rdata.next = NULL;
-	recptr = XLogInsert(RM_DISTRIBUTEDLOG_ID, DISTRIBUTEDLOG_TRUNCATE | XLOG_NO_TRAN, &rdata);
+	recptr = XLogInsert(RM_DISTRIBUTEDLOG_ID, DISTRIBUTEDLOG_TRUNCATE, &rdata);
 	XLogFlush(recptr);
 }
 
diff --git a/src/backend/access/transam/gp_changetracking_log.c b/src/backend/access/transam/gp_changetracking_log.c
index dd0a4677bb1b..f60afbe635a8 100644
--- a/src/backend/access/transam/gp_changetracking_log.c
+++ b/src/backend/access/transam/gp_changetracking_log.c
@@ -233,6 +233,7 @@ gp_changetracking_log(PG_FUNCTION_ARGS)
              * the calling code will copy our tuple data, so reuse our template one
              */
             HeapTupleHeader td = context->heapTuple->t_data;
+			int data_len = heap_compute_data_size(funcctx->tuple_desc, context->tupleValuesToCopy, NULL);
 #ifdef USE_ASSERT_CHECKING
             int len =
 #endif
@@ -240,6 +241,7 @@ gp_changetracking_log(PG_FUNCTION_ARGS)
                             context->tupleValuesToCopy,
                             NULL /* isnull */,
                             (char *) td + td->t_hoff,
+							data_len,
                             &td->t_infomask,
                             NULL /* bits -- NULL is okay because we have no nulls */);
 
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index f34b6bba75b6..56321b70df6f 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.23 2007/01/05 22:19:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.27.2.1 2009/11/23 09:59:00 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,6 +51,8 @@
 #include "access/multixact.h"
 #include "access/slru.h"
 #include "access/transam.h"
+#include "access/twophase.h"
+#include "access/twophase_rmgr.h"
 #include "access/xact.h"
 #include "miscadmin.h"
 #include "storage/backendid.h"
@@ -118,8 +120,11 @@ typedef struct MultiXactStateData
 	/*
 	 * Per-backend data starts here.  We have two arrays stored in the area
 	 * immediately following the MultiXactStateData struct. Each is indexed by
-	 * BackendId.  (Note: valid BackendIds run from 1 to MaxBackends; element
-	 * zero of each array is never used.)
+	 * BackendId.
+	 *
+	 * In both arrays, there's a slot for all normal backends (1..MaxBackends)
+	 * followed by a slot for max_prepared_xacts prepared transactions. Valid
+	 * BackendIds start from 1; element zero of each array is never used.
 	 *
 	 * OldestMemberMXactId[k] is the oldest MultiXactId each backend's current
 	 * transaction(s) could possibly be a member of, or InvalidMultiXactId
@@ -152,6 +157,12 @@ typedef struct MultiXactStateData
 	MultiXactId perBackendXactIds[1];	/* VARIABLE LENGTH ARRAY */
 } MultiXactStateData;
 
+/*
+ * Last element of OldestMemberMXactID and OldestVisibleMXactId arrays.
+ * Valid elements are (1..MaxOldestSlot); element 0 is never used.
+ */
+#define MaxOldestSlot	(MaxBackends + max_prepared_xacts)
+
 /* Pointers to the state data in shared memory */
 static MultiXactStateData *MultiXactState;
 static MultiXactId *OldestMemberMXactId;
@@ -381,9 +392,9 @@ MultiXactIdIsRunning(MultiXactId multi)
 	}
 
 	/*
-	 * Checking for myself is cheap compared to looking in shared memory,
-	 * so first do the equivalent of MultiXactIdIsCurrent().  This is not
-	 * needed for correctness, it's just a fast path.
+	 * Checking for myself is cheap compared to looking in shared memory, so
+	 * first do the equivalent of MultiXactIdIsCurrent().  This is not needed
+	 * for correctness, it's just a fast path.
 	 */
 	for (i = 0; i < nmembers; i++)
 	{
@@ -539,7 +550,7 @@ MultiXactIdSetOldestVisible(void)
 		if (oldestMXact < FirstMultiXactId)
 			oldestMXact = FirstMultiXactId;
 
-		for (i = 1; i <= MaxBackends; i++)
+		for (i = 1; i <= MaxOldestSlot; i++)
 		{
 			MultiXactId thisoldest = OldestMemberMXactId[i];
 
@@ -760,7 +771,7 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
 	 * enough that a MultiXactId is really involved.  Perhaps someday we'll
 	 * take the trouble to generalize the slru.c error reporting code.
 	 */
-	slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, multi);
+	slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, true, multi);
 	offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
 	offptr += entryno;
 
@@ -784,7 +795,7 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
 
 		if (pageno != prev_pageno)
 		{
-			slotno = SimpleLruReadPage(MultiXactMemberCtl, pageno, multi);
+			slotno = SimpleLruReadPage(MultiXactMemberCtl, pageno, true, multi);
 			prev_pageno = pageno;
 		}
 
@@ -1016,7 +1027,7 @@ GetMultiXactIdMembers(MultiXactId multi, TransactionId **xids)
 	pageno = MultiXactIdToOffsetPage(multi);
 	entryno = MultiXactIdToOffsetEntry(multi);
 
-	slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, multi);
+	slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, true, multi);
 	offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
 	offptr += entryno;
 	offset = *offptr;
@@ -1048,7 +1059,7 @@ GetMultiXactIdMembers(MultiXactId multi, TransactionId **xids)
 		entryno = MultiXactIdToOffsetEntry(tmpMXact);
 
 		if (pageno != prev_pageno)
-			slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, tmpMXact);
+			slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, true, tmpMXact);
 
 		offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
 		offptr += entryno;
@@ -1084,7 +1095,7 @@ GetMultiXactIdMembers(MultiXactId multi, TransactionId **xids)
 
 		if (pageno != prev_pageno)
 		{
-			slotno = SimpleLruReadPage(MultiXactMemberCtl, pageno, multi);
+			slotno = SimpleLruReadPage(MultiXactMemberCtl, pageno, true, multi);
 			prev_pageno = pageno;
 		}
 
@@ -1299,6 +1310,119 @@ AtEOXact_MultiXact(void)
 	MXactCache = NULL;
 }
 
+/*
+ * AtPrepare_MultiXact
+ *		Save multixact state at 2PC tranasction prepare
+ *
+ * In this phase, we only store our OldestMemberMXactId value in the two-phase
+ * state file.
+ */
+void
+AtPrepare_MultiXact(void)
+{
+	MultiXactId myOldestMember = OldestMemberMXactId[MyBackendId];
+
+	if (MultiXactIdIsValid(myOldestMember))
+		RegisterTwoPhaseRecord(TWOPHASE_RM_MULTIXACT_ID, 0,
+							   &myOldestMember, sizeof(MultiXactId));
+}
+
+/*
+ * PostPrepare_MultiXact
+ *		Clean up after successful PREPARE TRANSACTION
+ */
+void
+PostPrepare_MultiXact(TransactionId xid)
+{
+	MultiXactId myOldestMember;
+
+	/*
+	 * Transfer our OldestMemberMXactId value to the slot reserved for the
+	 * prepared transaction.
+	 */
+	myOldestMember = OldestMemberMXactId[MyBackendId];
+	if (MultiXactIdIsValid(myOldestMember))
+	{
+		BackendId dummyBackendId = TwoPhaseGetDummyBackendId(xid);
+
+		/*
+		 * Even though storing MultiXactId is atomic, acquire lock to make sure
+		 * others see both changes, not just the reset of the slot of the
+		 * current backend. Using a volatile pointer might suffice, but this
+		 * isn't a hot spot.
+		 */
+		LWLockAcquire(MultiXactGenLock, LW_EXCLUSIVE);
+
+		OldestMemberMXactId[dummyBackendId] = myOldestMember;
+		OldestMemberMXactId[MyBackendId] = InvalidMultiXactId;
+
+		LWLockRelease(MultiXactGenLock);
+	}
+
+	/*
+	 * We don't need to transfer OldestVisibleMXactId value, because the
+	 * transaction is not going to be looking at any more multixacts once
+	 * it's prepared.
+	 *
+	 * We assume that storing a MultiXactId is atomic and so we need not take
+	 * MultiXactGenLock to do this.
+	 */
+	OldestVisibleMXactId[MyBackendId] = InvalidMultiXactId;
+
+	/*
+	 * Discard the local MultiXactId cache like in AtEOX_MultiXact
+	 */
+	MXactContext = NULL;
+	MXactCache = NULL;
+}
+
+/*
+ * multixact_twophase_recover
+ *		Recover the state of a prepared transaction at startup
+ */
+void
+multixact_twophase_recover(TransactionId xid, uint16 info,
+						   void *recdata, uint32 len)
+{
+	BackendId	dummyBackendId = TwoPhaseGetDummyBackendId(xid);
+	MultiXactId	oldestMember;
+
+	/*
+	 * Get the oldest member XID from the state file record, and set it in
+	 * the OldestMemberMXactId slot reserved for this prepared transaction.
+	 */
+	Assert(len == sizeof(MultiXactId));
+	oldestMember = *((MultiXactId *)recdata);
+
+	OldestMemberMXactId[dummyBackendId] = oldestMember;
+}
+
+/*
+ * multixact_twophase_postcommit
+ *		Similar to AtEOX_MultiXact but for COMMIT PREPARED
+ */
+void
+multixact_twophase_postcommit(TransactionId xid, uint16 info,
+							  void *recdata, uint32 len)
+{
+	BackendId	dummyBackendId = TwoPhaseGetDummyBackendId(xid);
+
+	Assert(len == sizeof(MultiXactId));
+
+	OldestMemberMXactId[dummyBackendId] = InvalidMultiXactId;
+}
+
+/*
+ * multixact_twophase_postabort
+ *		This is actually just the same as the COMMIT case.
+ */
+void
+multixact_twophase_postabort(TransactionId xid, uint16 info,
+						void *recdata, uint32 len)
+{
+	multixact_twophase_postcommit(xid, info, recdata, len);
+}
+
 /*
  * Initialization of shared memory for MultiXact.  We use two SLRU areas,
  * thus double memory.	Also, reserve space for the shared MultiXactState
@@ -1311,11 +1435,11 @@ MultiXactShmemSize(void)
 
 #define SHARED_MULTIXACT_STATE_SIZE \
 	add_size(sizeof(MultiXactStateData), \
-			 mul_size(sizeof(MultiXactId) * 2, MaxBackends))
+			 mul_size(sizeof(MultiXactId) * 2, MaxOldestSlot))
 
 	size = SHARED_MULTIXACT_STATE_SIZE;
-	size = add_size(size, SimpleLruShmemSize(NUM_MXACTOFFSET_BUFFERS));
-	size = add_size(size, SimpleLruShmemSize(NUM_MXACTMEMBER_BUFFERS));
+	size = add_size(size, SimpleLruShmemSize(NUM_MXACTOFFSET_BUFFERS, 0));
+	size = add_size(size, SimpleLruShmemSize(NUM_MXACTMEMBER_BUFFERS, 0));
 
 	return size;
 }
@@ -1331,10 +1455,10 @@ MultiXactShmemInit(void)
 	MultiXactMemberCtl->PagePrecedes = MultiXactMemberPagePrecedes;
 
 	SimpleLruInit(MultiXactOffsetCtl,
-				  "MultiXactOffset Ctl", NUM_MXACTOFFSET_BUFFERS,
+				  "MultiXactOffset Ctl", NUM_MXACTOFFSET_BUFFERS, 0,
 				  MultiXactOffsetControlLock, MULTIXACT_OFFSETS_DIR);
 	SimpleLruInit(MultiXactMemberCtl,
-				  "MultiXactMember Ctl", NUM_MXACTMEMBER_BUFFERS,
+				  "MultiXactMember Ctl", NUM_MXACTMEMBER_BUFFERS, 0,
 				  MultiXactMemberControlLock, MULTIXACT_MEMBERS_DIR);
 
 	/* Initialize our shared state struct */
@@ -1353,10 +1477,10 @@ MultiXactShmemInit(void)
 
 	/*
 	 * Set up array pointers.  Note that perBackendXactIds[0] is wasted space
-	 * since we only use indexes 1..MaxBackends in each array.
+	 * since we only use indexes 1..MaxOldestSlot in each array.
 	 */
 	OldestMemberMXactId = MultiXactState->perBackendXactIds;
-	OldestVisibleMXactId = OldestMemberMXactId + MaxBackends;
+	OldestVisibleMXactId = OldestMemberMXactId + MaxOldestSlot;
 }
 
 /*
@@ -1489,7 +1613,7 @@ StartupMultiXact(void)
 		int			slotno;
 		MultiXactOffset *offptr;
 
-		slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, multi);
+		slotno = SimpleLruReadPage(MultiXactOffsetCtl, pageno, true, multi);
 		offptr = (MultiXactOffset *) MultiXactOffsetCtl->shared->page_buffer[slotno];
 		offptr += entryno;
 
@@ -1519,7 +1643,7 @@ StartupMultiXact(void)
 		int			slotno;
 		TransactionId *xidptr;
 
-		slotno = SimpleLruReadPage(MultiXactMemberCtl, pageno, offset);
+		slotno = SimpleLruReadPage(MultiXactMemberCtl, pageno, true, offset);
 		xidptr = (TransactionId *) MultiXactMemberCtl->shared->page_buffer[slotno];
 		xidptr += entryno;
 
@@ -1779,7 +1903,7 @@ TruncateMultiXact(void)
 		nextMXact = FirstMultiXactId;
 
 	oldestMXact = nextMXact;
-	for (i = 1; i <= MaxBackends; i++)
+	for (i = 1; i <= MaxOldestSlot; i++)
 	{
 		MultiXactId thisoldest;
 
@@ -1931,9 +2055,6 @@ MultiXactOffsetPrecedes(MultiXactOffset offset1, MultiXactOffset offset2)
 /*
  * Write an xlog record reflecting the zeroing of either a MEMBERs or
  * OFFSETs page (info shows which)
- *
- * Note: xlog record is marked as outside transaction control, since we
- * want it to be redone whether the invoking transaction commits or not.
  */
 static void
 WriteMZeroPageXlogRec(int pageno, uint8 info)
@@ -1944,7 +2065,7 @@ WriteMZeroPageXlogRec(int pageno, uint8 info)
 	rdata.len = sizeof(int);
 	rdata.buffer = InvalidBuffer;
 	rdata.next = NULL;
-	(void) XLogInsert(RM_MULTIXACT_ID, info | XLOG_NO_TRAN, &rdata);
+	(void) XLogInsert(RM_MULTIXACT_ID, info, &rdata);
 }
 
 /*
diff --git a/src/backend/access/transam/persistentendxactrec.c b/src/backend/access/transam/persistentendxactrec.c
index 63e28204cdf4..147795543998 100755
--- a/src/backend/access/transam/persistentendxactrec.c
+++ b/src/backend/access/transam/persistentendxactrec.c
@@ -366,7 +366,8 @@ int32 PersistentEndXactRec_FetchObjectsFromSmgr(
 		case PersistentEndXactObjKind_FileSysAction:
 			count = smgrGetPendingFileSysWork(
 									endXactRecKind,
-									(PersistentEndXactFileSysActionInfo**)&data);
+									(PersistentEndXactFileSysActionInfo**)&data,
+									NULL);
 			len = count * sizeof(PersistentEndXactFileSysActionInfo);
 
 			PersistentEndXactRec_VerifyFileSysActionInfos(
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index f87805739c7e..b995b9dc7910 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -41,7 +41,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.40 2007/01/05 22:19:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.44 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -154,7 +154,9 @@ static int	slru_errno;
  */
 int log_count_recovered_files_batch = 1000;
 
-static int SimpleLruReadPage_Internal(SlruCtl ctl, int pageno, TransactionId xid, bool *valid);
+static int SimpleLruReadPage_Internal(SlruCtl ctl, int pageno, bool write_ok, TransactionId xid, bool *valid);
+static void SimpleLruZeroLSNs(SlruCtl ctl, int slotno);
+static void SimpleLruWaitIO(SlruCtl ctl, int slotno);
 static bool SlruPhysicalReadPage(SlruCtl ctl, int pageno, int slotno);
 static bool SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno,
 					  SlruFlush fdata);
@@ -167,7 +169,7 @@ static int	SlruSelectLRUPage(SlruCtl ctl, int pageno);
  */
 
 Size
-SimpleLruShmemSize(int nslots)
+SimpleLruShmemSize(int nslots, int nlsns)
 {
 	Size		sz;
 
@@ -180,18 +182,21 @@ SimpleLruShmemSize(int nslots)
 	sz += MAXALIGN(nslots * sizeof(int));		/* page_lru_count[] */
 	sz += MAXALIGN(nslots * sizeof(LWLockId));	/* buffer_locks[] */
 
+	if (nlsns > 0)
+		sz += MAXALIGN(nslots * nlsns * sizeof(XLogRecPtr));	/* group_lsn[] */
+
 	return BUFFERALIGN(sz) + BLCKSZ * nslots;
 }
 
 void
-SimpleLruInit(SlruCtl ctl, const char *name, int nslots,
+SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
 			  LWLockId ctllock, const char *subdir)
 {
 	SlruShared	shared;
 	bool		found;
 
 	shared = (SlruShared) ShmemInitStruct(name,
-										  SimpleLruShmemSize(nslots),
+										  SimpleLruShmemSize(nslots, nlsns),
 										  &found);
 
 	if (!IsUnderPostmaster)
@@ -208,6 +213,7 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots,
 		shared->ControlLock = ctllock;
 
 		shared->num_slots = nslots;
+		shared->lsn_groups_per_page = nlsns;
 
 		shared->cur_lru_count = 0;
 
@@ -227,8 +233,14 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots,
 		offset += MAXALIGN(nslots * sizeof(int));
 		shared->buffer_locks = (LWLockId *) (ptr + offset);
 		offset += MAXALIGN(nslots * sizeof(LWLockId));
-		ptr += BUFFERALIGN(offset);
 
+		if (nlsns > 0)
+		{
+			shared->group_lsn = (XLogRecPtr *) (ptr + offset);
+			offset += MAXALIGN(nslots * nlsns * sizeof(XLogRecPtr));
+		}
+
+		ptr += BUFFERALIGN(offset);
 		for (slotno = 0; slotno < nslots; slotno++)
 		{
 			shared->page_buffer[slotno] = ptr;
@@ -283,15 +295,37 @@ SimpleLruZeroPage(SlruCtl ctl, int pageno)
 	/* Set the buffer to zeroes */
 	MemSet(shared->page_buffer[slotno], 0, BLCKSZ);
 
+	/* Set the LSNs for this new page to zero */
+	SimpleLruZeroLSNs(ctl, slotno);
+
 	/* Assume this page is now the latest active page */
 	shared->latest_page_number = pageno;
 
 	return slotno;
 }
 
+/*
+ * Zero all the LSNs we store for this slru page.
+ *
+ * This should be called each time we create a new page, and each time we read
+ * in a page from disk into an existing buffer.  (Such an old page cannot
+ * have any interesting LSNs, since we'd have flushed them before writing
+ * the page in the first place.)
+ */
+static void
+SimpleLruZeroLSNs(SlruCtl ctl, int slotno)
+{
+	SlruShared	shared = ctl->shared;
+
+	if (shared->lsn_groups_per_page > 0)
+		MemSet(&shared->group_lsn[slotno * shared->lsn_groups_per_page], 0,
+			   shared->lsn_groups_per_page * sizeof(XLogRecPtr));
+}
+
 /*
  * Wait for any active I/O on a page slot to finish.  (This does not
- * guarantee that new I/O hasn't been started before we return, though.)
+ * guarantee that new I/O hasn't been started before we return, though.
+ * In fact the slot might not even contain the same page anymore.)
  *
  * Control lock must be held at entry, and will be held at exit.
  */
@@ -322,8 +356,7 @@ SimpleLruWaitIO(SlruCtl ctl, int slotno)
 			/* indeed, the I/O must have failed */
 			if (shared->page_status[slotno] == SLRU_PAGE_READ_IN_PROGRESS)
 				shared->page_status[slotno] = SLRU_PAGE_EMPTY;
-			else
-				/* write_in_progress */
+			else	/* write_in_progress */
 			{
 				shared->page_status[slotno] = SLRU_PAGE_VALID;
 				shared->page_dirty[slotno] = true;
@@ -335,9 +368,9 @@ SimpleLruWaitIO(SlruCtl ctl, int slotno)
 
 
 int
-SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid)
+SimpleLruReadPage(SlruCtl ctl, int pageno, bool write_ok, TransactionId xid)
 {
-  return SimpleLruReadPage_Internal(ctl, pageno, xid, NULL);
+  return SimpleLruReadPage_Internal(ctl, pageno, write_ok, xid, NULL);
 }  /* end SimpleLruReadPage */
 
 
@@ -345,6 +378,11 @@ SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid)
  * Find a page in a shared buffer, reading it in if necessary.
  * The page number must correspond to an already-initialized page.
  *
+ * If write_ok is true then it is OK to return a page that is in
+ * WRITE_IN_PROGRESS state; it is the caller's responsibility to be sure
+ * that modification of the page is safe.  If write_ok is false then we
+ * will not return the page until it is not undergoing active I/O.
+ *
  * The passed-in xid is used only for error reporting, and may be
  * InvalidTransactionId if no specific xid is associated with the action.
  *
@@ -360,7 +398,7 @@ SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid)
  * Control lock must be held at entry, and will be held at exit.
  */
 static int
-SimpleLruReadPage_Internal(SlruCtl ctl, int pageno, TransactionId xid, bool *valid)
+SimpleLruReadPage_Internal(SlruCtl ctl, int pageno, bool write_ok, TransactionId xid, bool *valid)
 {
 	SlruShared	shared = ctl->shared;
 
@@ -377,8 +415,13 @@ SimpleLruReadPage_Internal(SlruCtl ctl, int pageno, TransactionId xid, bool *val
 		if (shared->page_number[slotno] == pageno &&
 			shared->page_status[slotno] != SLRU_PAGE_EMPTY)
 		{
-			/* If page is still being read in, we must wait for I/O */
-			if (shared->page_status[slotno] == SLRU_PAGE_READ_IN_PROGRESS)
+			/*
+			 * If page is still being read in, we must wait for I/O.  Likewise
+			 * if the page is being written and the caller said that's not OK.
+			 */
+			if (shared->page_status[slotno] == SLRU_PAGE_READ_IN_PROGRESS ||
+				(shared->page_status[slotno] == SLRU_PAGE_WRITE_IN_PROGRESS &&
+				 !write_ok))
 			{
 				SimpleLruWaitIO(ctl, slotno);
 				/* Now we must recheck state from the top */
@@ -416,6 +459,9 @@ SimpleLruReadPage_Internal(SlruCtl ctl, int pageno, TransactionId xid, bool *val
 		/* Do the read */
 		ok = SlruPhysicalReadPage(ctl, pageno, slotno);
 
+		/* Set the LSNs for this newly read-in page to zero */
+		SimpleLruZeroLSNs(ctl, slotno);
+
 		/* Re-acquire control lock and update page state */
 		LWLockAcquire(shared->ControlLock, LW_EXCLUSIVE);
 
@@ -489,7 +535,7 @@ SimpleLruReadPage_ReadOnly(SlruCtl ctl, int pageno, TransactionId xid, bool *val
 	LWLockRelease(shared->ControlLock);
 	LWLockAcquire(shared->ControlLock, LW_EXCLUSIVE);
 
-	return SimpleLruReadPage_Internal(ctl, pageno, xid, valid);
+	return SimpleLruReadPage_Internal(ctl, pageno, true, xid, valid);
 }
 
 /*
@@ -689,6 +735,48 @@ SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno, SlruFlush fdata)
 	MirroredFlatFileOpen	newMirroredOpen = MirroredFlatFileOpen_Init;
 	MirroredFlatFileOpen	*useMirroredOpen = NULL;
 
+	/*
+	 * Honor the write-WAL-before-data rule, if appropriate, so that we do not
+	 * write out data before associated WAL records.  This is the same action
+	 * performed during FlushBuffer() in the main buffer manager.
+	 */
+	if (shared->group_lsn != NULL)
+	{
+		/*
+		 * We must determine the largest async-commit LSN for the page. This
+		 * is a bit tedious, but since this entire function is a slow path
+		 * anyway, it seems better to do this here than to maintain a per-page
+		 * LSN variable (which'd need an extra comparison in the
+		 * transaction-commit path).
+		 */
+		XLogRecPtr	max_lsn;
+		int			lsnindex,
+					lsnoff;
+
+		lsnindex = slotno * shared->lsn_groups_per_page;
+		max_lsn = shared->group_lsn[lsnindex++];
+		for (lsnoff = 1; lsnoff < shared->lsn_groups_per_page; lsnoff++)
+		{
+			XLogRecPtr	this_lsn = shared->group_lsn[lsnindex++];
+
+			if (XLByteLT(max_lsn, this_lsn))
+				max_lsn = this_lsn;
+		}
+
+		if (!XLogRecPtrIsInvalid(max_lsn))
+		{
+			/*
+			 * As noted above, elog(ERROR) is not acceptable here, so if
+			 * XLogFlush were to fail, we must PANIC.  This isn't much of a
+			 * restriction because XLogFlush is just about all critical
+			 * section anyway, but let's make sure.
+			 */
+			START_CRIT_SECTION();
+			XLogFlush(max_lsn);
+			END_CRIT_SECTION();
+		}
+	}
+
 	/*
 	 * During a Flush, we may already have the desired file open.
 	 */
diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c
index 47f68af9a41d..fb90bec5f027 100644
--- a/src/backend/access/transam/subtrans.c
+++ b/src/backend/access/transam/subtrans.c
@@ -22,7 +22,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/subtrans.c,v 1.18 2007/01/05 22:19:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/subtrans.c,v 1.20 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -140,7 +140,7 @@ SubTransSetParent(TransactionId xid, TransactionId parent)
 
 	LWLockAcquire(SubtransControlLock, LW_EXCLUSIVE);
 
-	slotno = SimpleLruReadPage(SubTransCtl, pageno, xid);
+	slotno = SimpleLruReadPage(SubTransCtl, pageno, true, xid);
 	ptr = (SubTransData *) SubTransCtl->shared->page_buffer[slotno];
 	ptr += entryno;
 
@@ -192,14 +192,14 @@ SubTransGetTopmostTransaction(TransactionId xid)
 Size
 SUBTRANSShmemSize(void)
 {
-	return SimpleLruShmemSize(NUM_SUBTRANS_BUFFERS);
+	return SimpleLruShmemSize(NUM_SUBTRANS_BUFFERS, 0);
 }
 
 void
 SUBTRANSShmemInit(void)
 {
 	SubTransCtl->PagePrecedes = SubTransPagePrecedes;
-	SimpleLruInit(SubTransCtl, "SUBTRANS Ctl", NUM_SUBTRANS_BUFFERS,
+	SimpleLruInit(SubTransCtl, "SUBTRANS Ctl", NUM_SUBTRANS_BUFFERS, 0,
 				  SubtransControlLock, SUBTRANS_DIR);
 	/* Override default assumption that writes should be fsync'd */
 	SubTransCtl->do_fsync = false;
diff --git a/src/backend/access/transam/test/distributedlog_test.c b/src/backend/access/transam/test/distributedlog_test.c
index cde70b9be737..41d5372c2949 100644
--- a/src/backend/access/transam/test/distributedlog_test.c
+++ b/src/backend/access/transam/test/distributedlog_test.c
@@ -64,6 +64,7 @@ static MPP_20426(void **state, TransactionId nextXid)
 	/* This test is only for the case xid is not on the boundary. */
 	expect_value(SimpleLruReadPage, ctl, DistributedLogCtl);
 	expect_any(SimpleLruReadPage, pageno);
+	expect_any(SimpleLruReadPage, write_ok);
 	expect_value(SimpleLruReadPage, xid, nextXid);
 	will_return(SimpleLruReadPage, 0);
 
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 0a19f587610d..214eb4fc38fa 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/transam/transam.c,v 1.69 2007/01/05 22:19:23 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/transam/transam.c,v 1.73 2008/01/01 19:45:48 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -33,6 +33,10 @@
  */
 static TransactionId cachedFetchXid = InvalidTransactionId;
 static XidStatus cachedFetchXidStatus;
+static XLogRecPtr cachedCommitLSN;
+
+/* Handy constant for an invalid xlog recptr */
+static const XLogRecPtr InvalidXLogRecPtr = {0, 0};
 
 
 /* ----------------------------------------------------------------
@@ -50,6 +54,7 @@ static XidStatus
 TransactionLogFetch(TransactionId transactionId)
 {
 	XidStatus	xidstatus;
+	XLogRecPtr	xidlsn;
 
 	/*
 	 * Before going to the commit log manager, check our single item cache to
@@ -73,7 +78,7 @@ TransactionLogFetch(TransactionId transactionId)
 	/*
 	 * Get the transaction status.
 	 */
-	xidstatus = TransactionIdGetStatus(transactionId);
+	xidstatus = TransactionIdGetStatus(transactionId, &xidlsn);
 
 	/*
 	 * Cache it, but DO NOT cache status for unfinished or sub-committed
@@ -82,8 +87,9 @@ TransactionLogFetch(TransactionId transactionId)
 	if (xidstatus != TRANSACTION_STATUS_IN_PROGRESS &&
 		xidstatus != TRANSACTION_STATUS_SUB_COMMITTED)
 	{
-		TransactionIdStore(transactionId, &cachedFetchXid);
+		cachedFetchXid = transactionId;
 		cachedFetchXidStatus = xidstatus;
+		cachedCommitLSN = xidlsn;
 	}
 
 	return xidstatus;
@@ -91,16 +97,19 @@ TransactionLogFetch(TransactionId transactionId)
 
 /* --------------------------------
  *		TransactionLogUpdate
+ *
+ * Store the new status of a transaction.  The commit record LSN must be
+ * passed when recording an async commit; else it should be InvalidXLogRecPtr.
  * --------------------------------
  */
-static void
-TransactionLogUpdate(TransactionId transactionId,		/* trans id to update */
-					 XidStatus status)	/* new trans status */
+static inline void
+TransactionLogUpdate(TransactionId transactionId,
+					 XidStatus status, XLogRecPtr lsn)
 {
 	/*
 	 * update the commit log
 	 */
-	TransactionIdSetStatus(transactionId, status);
+	TransactionIdSetStatus(transactionId, status, lsn);
 }
 
 /*
@@ -109,15 +118,16 @@ TransactionLogUpdate(TransactionId transactionId,		/* trans id to update */
  * Update multiple transaction identifiers to a given status.
  * Don't depend on this being atomic; it's not.
  */
-static void
-TransactionLogMultiUpdate(int nxids, TransactionId *xids, XidStatus status)
+static inline void
+TransactionLogMultiUpdate(int nxids, TransactionId *xids,
+						  XidStatus status, XLogRecPtr lsn)
 {
 	int			i;
 
 	Assert(nxids != 0);
 
 	for (i = 0; i < nxids; i++)
-		TransactionIdSetStatus(xids[i], status);
+		TransactionIdSetStatus(xids[i], status, lsn);
 }
 
 /* ----------------------------------------------------------------
@@ -267,31 +277,49 @@ TransactionIdDidAbort(TransactionId transactionId)
 void
 TransactionIdCommit(TransactionId transactionId)
 {
-	TransactionLogUpdate(transactionId, TRANSACTION_STATUS_COMMITTED);
+	TransactionLogUpdate(transactionId, TRANSACTION_STATUS_COMMITTED,
+						 InvalidXLogRecPtr);
+}
+
+/*
+ * TransactionIdAsyncCommit
+ *		Same as above, but for async commits.  The commit record LSN is needed.
+ */
+void
+TransactionIdAsyncCommit(TransactionId transactionId, XLogRecPtr lsn)
+{
+	TransactionLogUpdate(transactionId, TRANSACTION_STATUS_COMMITTED, lsn);
 }
 
+
 /*
  * TransactionIdAbort
  *		Aborts the transaction associated with the identifier.
  *
  * Note:
  *		Assumes transaction identifier is valid.
+ *		No async version of this is needed.
  */
 void
 TransactionIdAbort(TransactionId transactionId)
 {
-	TransactionLogUpdate(transactionId, TRANSACTION_STATUS_ABORTED);
+	TransactionLogUpdate(transactionId, TRANSACTION_STATUS_ABORTED,
+						 InvalidXLogRecPtr);
 }
 
 /*
  * TransactionIdSubCommit
  *		Marks the subtransaction associated with the identifier as
  *		sub-committed.
+ *
+ * Note:
+ *		No async version of this is needed.
  */
 void
 TransactionIdSubCommit(TransactionId transactionId)
 {
-	TransactionLogUpdate(transactionId, TRANSACTION_STATUS_SUB_COMMITTED);
+	TransactionLogUpdate(transactionId, TRANSACTION_STATUS_SUB_COMMITTED,
+						 InvalidXLogRecPtr);
 }
 
 /*
@@ -307,9 +335,23 @@ void
 TransactionIdCommitTree(int nxids, TransactionId *xids)
 {
 	if (nxids > 0)
-		TransactionLogMultiUpdate(nxids, xids, TRANSACTION_STATUS_COMMITTED);
+		TransactionLogMultiUpdate(nxids, xids, TRANSACTION_STATUS_COMMITTED,
+								  InvalidXLogRecPtr);
+}
+
+/*
+ * TransactionIdAsyncCommitTree
+ *		Same as above, but for async commits.  The commit record LSN is needed.
+ */
+void
+TransactionIdAsyncCommitTree(int nxids, TransactionId *xids, XLogRecPtr lsn)
+{
+	if (nxids > 0)
+		TransactionLogMultiUpdate(nxids, xids, TRANSACTION_STATUS_COMMITTED,
+								  lsn);
 }
 
+
 /*
  * TransactionIdAbortTree
  *		Marks all the given transaction ids as aborted.
@@ -321,7 +363,8 @@ void
 TransactionIdAbortTree(int nxids, TransactionId *xids)
 {
 	if (nxids > 0)
-		TransactionLogMultiUpdate(nxids, xids, TRANSACTION_STATUS_ABORTED);
+		TransactionLogMultiUpdate(nxids, xids, TRANSACTION_STATUS_ABORTED,
+								  InvalidXLogRecPtr);
 }
 
 /*
@@ -387,3 +430,70 @@ TransactionIdFollowsOrEquals(TransactionId id1, TransactionId id2)
 	diff = (int32) (id1 - id2);
 	return (diff >= 0);
 }
+
+
+/*
+ * TransactionIdLatest --- get latest XID among a main xact and its children
+ */
+TransactionId
+TransactionIdLatest(TransactionId mainxid,
+					int nxids, const TransactionId *xids)
+{
+	TransactionId result;
+
+	/*
+	 * In practice it is highly likely that the xids[] array is sorted, and so
+	 * we could save some cycles by just taking the last child XID, but this
+	 * probably isn't so performance-critical that it's worth depending on
+	 * that assumption.  But just to show we're not totally stupid, scan the
+	 * array back-to-front to avoid useless assignments.
+	 */
+	result = mainxid;
+	while (--nxids >= 0)
+	{
+		if (TransactionIdPrecedes(result, xids[nxids]))
+			result = xids[nxids];
+	}
+	return result;
+}
+
+
+/*
+ * TransactionIdGetCommitLSN
+ *
+ * This function returns an LSN that is late enough to be able
+ * to guarantee that if we flush up to the LSN returned then we
+ * will have flushed the transaction's commit record to disk.
+ *
+ * The result is not necessarily the exact LSN of the transaction's
+ * commit record!  For example, for long-past transactions (those whose
+ * clog pages already migrated to disk), we'll return InvalidXLogRecPtr.
+ * Also, because we group transactions on the same clog page to conserve
+ * storage, we might return the LSN of a later transaction that falls into
+ * the same group.
+ */
+XLogRecPtr
+TransactionIdGetCommitLSN(TransactionId xid)
+{
+	XLogRecPtr	result;
+
+	/*
+	 * Currently, all uses of this function are for xids that were just
+	 * reported to be committed by TransactionLogFetch, so we expect that
+	 * checking TransactionLogFetch's cache will usually succeed and avoid an
+	 * extra trip to shared memory.
+	 */
+	if (TransactionIdEquals(xid, cachedFetchXid))
+		return cachedCommitLSN;
+
+	/* Special XIDs are always known committed */
+	if (!TransactionIdIsNormal(xid))
+		return InvalidXLogRecPtr;
+
+	/*
+	 * Get the transaction status.
+	 */
+	(void) TransactionIdGetStatus(xid, &result);
+
+	return result;
+}
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index fd426e298e9e..cbdd04576d9c 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.28 2007/02/13 19:39:42 tgl Exp $
+ *		$PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.39.2.3 2009/11/23 09:59:00 heikki Exp $
  *
  * NOTES
  *		Each global transaction is associated with a global transaction
@@ -118,8 +118,9 @@ extern List *expectedTLIs;
 
 typedef struct GlobalTransactionData
 {
-	PGPROC          proc;                   /* dummy proc */
-	TimestampTz prepared_at;        /* time of preparation */
+	PGPROC		proc;			/* dummy proc */
+	BackendId	dummyBackendId;	/* similar to backend id for backends */
+	TimestampTz prepared_at;	/* time of preparation */
 	XLogRecPtr  prepare_begin_lsn;  /* XLOG begging offset of prepare record */
 	XLogRecPtr	prepare_lsn;	/* XLOG offset of prepare record */
 	Oid			owner;			/* ID of user that executed the xact */
@@ -422,6 +423,20 @@ TwoPhaseShmemInit(void)
 		{
 			gxacts[i].proc.links.next = TwoPhaseState->freeGXacts;
 			TwoPhaseState->freeGXacts = MAKE_OFFSET(&gxacts[i]);
+
+			/*
+			 * Assign a unique ID for each dummy proc, so that the range of
+			 * dummy backend IDs immediately follows the range of normal
+			 * backend IDs. We don't dare to assign a real backend ID to
+			 * dummy procs, because prepared transactions don't take part in
+			 * cache invalidation like a real backend ID would imply, but
+			 * having a unique ID for them is nevertheless handy. This
+			 * arrangement allows you to allocate an array of size
+			 * (MaxBackends + max_prepared_xacts + 1), and have a slot for
+			 * every backend and prepared transaction. Currently multixact.c
+			 * uses that technique.
+			 */
+			gxacts[i].dummyBackendId = MaxBackends + 1 + i;
 		}
 	}
 	else
@@ -560,13 +575,16 @@ MarkAsPreparing(TransactionId xid,
 	MemSet(&gxact->proc, 0, sizeof(PGPROC));
 	SHMQueueElemInit(&(gxact->proc.links));
 	gxact->proc.waitStatus = STATUS_OK;
+	/* We set up the gxact's VXID as InvalidBackendId/XID */
+	gxact->proc.lxid = (LocalTransactionId) xid;
 	gxact->proc.xid = xid;
 	gxact->proc.xmin = InvalidTransactionId;
 	gxact->proc.pid = 0;
+	gxact->proc.backendId = InvalidBackendId;
 	gxact->proc.databaseId = databaseid;
 	gxact->proc.roleId = owner;
-	gxact->proc.inVacuum = false;
-	gxact->proc.isAutovacuum = false;
+	gxact->proc.inCommit = false;
+	gxact->proc.vacuumFlags = 0;
 	gxact->proc.serializableIsoLevel = false;
 	gxact->proc.inDropTransaction = false;
 	gxact->proc.lwWaiting = false;
@@ -675,7 +693,7 @@ MarkAsPrepared(GlobalTransaction gxact)
 		 gxact->gid);
 
 	/*
-	 * Put it into the global ProcArray so TransactionIdInProgress considers
+	 * Put it into the global ProcArray so TransactionIdIsInProgress considers
 	 * the XID as still running.
 	 */
 	ProcArrayAdd(&gxact->proc);
@@ -729,19 +747,16 @@ LockGXact(const char *gid, Oid user, bool raiseErrorIfNotFound)
 		}
 
 		/*
-		 * Note: it probably would be possible to allow committing from another
-		 * database; but at the moment NOTIFY is known not to work and there
-		 * may be some other issues as well.  Hence disallow until someone
-		 * gets motivated to make it work.
+		 * Note: it probably would be possible to allow committing from
+		 * another database; but at the moment NOTIFY is known not to work and
+		 * there may be some other issues as well.	Hence disallow until
+		 * someone gets motivated to make it work.
 		 */
 		if (MyDatabaseId != gxact->proc.databaseId &&  (Gp_role != GP_ROLE_EXECUTE))
-		{
-			LWLockRelease(TwoPhaseStateLock);
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("prepared transaction belongs to another database"),
+				  errmsg("prepared transaction belongs to another database"),
 					 errhint("Connect to the database where the transaction was prepared to finish it.")));
-		}
 
 		/* OK for me to lock it */
 		/* we *must* have it locked with a valid xid here! */
@@ -989,6 +1004,22 @@ pg_prepared_xact(PG_FUNCTION_ARGS)
 	SRF_RETURN_DONE(funcctx);
 }
 
+/*
+ * TwoPhaseGetDummyProc
+ *		Get the dummy backend ID for prepared transaction specified by XID
+ *
+ * Dummy backend IDs are similar to real backend IDs of real backends.
+ * They start at MaxBackends + 1, and are unique across all currently active
+ * real backends and prepared transactions.
+ */
+BackendId
+TwoPhaseGetDummyBackendId(TransactionId xid)
+{
+	PGPROC *proc = TwoPhaseGetDummyProc(xid);
+
+	return ((GlobalTransaction) proc)->dummyBackendId;
+}
+
 /*
  * TwoPhaseGetDummyProc
  *		Get the PGPROC that represents a prepared transaction specified by XID
@@ -1186,7 +1217,6 @@ StartPrepare(GlobalTransaction gxact)
 		save_state_data(children, hdr.nsubxacts * sizeof(TransactionId));
 		/* While we have the child-xact data, stuff it in the gxact too */
 		GXactLoadSubxactData(gxact, hdr.nsubxacts, children);
-		pfree(children);
 	}
 	if (hdr.persistentPrepareObjectCount > 0)
 	{
@@ -1235,15 +1265,41 @@ void
 EndPrepare(GlobalTransaction gxact)
 {
 	TransactionId xid = gxact->proc.xid;
+	TwoPhaseFileHeader *hdr;
+	char		path[MAXPGPATH];
 
 	MIRRORED_LOCK_DECLARE;
-	CHECKPOINT_START_LOCK_DECLARE;
 
 	if (Debug_persistent_print)
 		elog(Persistent_DebugPrintLevel(), "EndPrepare: xid = %d", xid);
 
 	/* Add the end sentinel to the list of 2PC records */
-	RegisterTwoPhaseRecord(TWOPHASE_RM_END_ID, 0, NULL, 0);
+	RegisterTwoPhaseRecord(TWOPHASE_RM_END_ID, 0,
+						   NULL, 0);
+
+	/* Go back and fill in total_len in the file header record */
+	hdr = (TwoPhaseFileHeader *) records.head->data;
+	Assert(hdr->magic == TWOPHASE_MAGIC);
+	hdr->total_len = records.total_len + sizeof(pg_crc32);
+
+	/*
+	 * If the file size exceeds MaxAllocSize, we won't be able to read it in
+	 * ReadTwoPhaseFile. Check for that now, rather than fail at commit time.
+	 */
+	if (hdr->total_len > MaxAllocSize)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("two-phase state file maximum length exceeded")));
+
+	/*
+	 * Create the 2PC state file.
+	 *
+	 * Note: because we use BasicOpenFile(), we are responsible for ensuring
+	 * the FD gets closed in any error exit path.  Once we get into the
+	 * critical section, though, it doesn't matter since any failure causes
+	 * PANIC anyway.
+	 */
+	TwoPhaseFilePath(path, xid);
 
 	/*
 	 * The MirroredLock will cover BOTH mirrored writes to the pg_twophase directory
@@ -1254,27 +1310,29 @@ EndPrepare(GlobalTransaction gxact)
 	MIRRORED_LOCK;
 
 	/*
-	 * We have to lock out checkpoint start here, too; otherwise a checkpoint
-	 * starting immediately after the WAL record is inserted could complete
-	 * without fsync'ing our state file.  (This is essentially the same kind
-	 * of race condition as the COMMIT-to-clog-write case that
-	 * RecordTransactionCommit uses CheckpointStartLock for; see notes there.)
+	 * We have to set inCommit here, too; otherwise a checkpoint starting
+	 * immediately after the WAL record is inserted could complete without
+	 * fsync'ing our state file.  (This is essentially the same kind of race
+	 * condition as the COMMIT-to-clog-write case that RecordTransactionCommit
+	 * uses inCommit for; see notes there.)
 	 *
 	 * We save the PREPARE record's location in the gxact for later use by
 	 * CheckPointTwoPhase.
 	 *
-	 * NOTE: Critical seciton and CheckpointStartLock were moved up.
+	 * NOTE: Critical section and CheckpointStartLock were moved up.
 	 */
-	CHECKPOINT_START_LOCK;
-
 	START_CRIT_SECTION();
 
+	MyProc->inCommit = true;
+
 	gxact->prepare_lsn       = XLogInsert(RM_XACT_ID, XLOG_XACT_PREPARE, records.head);
 	gxact->prepare_begin_lsn = XLogLastInsertBeginLoc();
 
 	/* Add the prepared record to our global list */
 	add_recover_post_checkpoint_prepared_transactions_map_entry(xid, &gxact->prepare_begin_lsn, "EndPrepare");
 
+	MyProc->inCommit = true;
+
 	XLogFlush(gxact->prepare_lsn);
 
 	/*
@@ -1282,6 +1340,7 @@ EndPrepare(GlobalTransaction gxact)
 	 */
 	if (max_wal_senders > 0)
 		WalSndWakeup();
+
 	/* If we crash now, we have prepared: WAL replay will fix things */
 
 	if (Debug_persistent_print)
@@ -1303,8 +1362,8 @@ EndPrepare(GlobalTransaction gxact)
 	 * NB: a side effect of this is to make a dummy ProcArray entry for the
 	 * prepared XID.  This must happen before we clear the XID from MyProc,
 	 * else there is a window where the XID is not running according to
-	 * TransactionIdInProgress, and onlookers would be entitled to assume the
-	 * xact crashed.  Instead we have a window where the same XID appears
+	 * TransactionIdIsInProgress, and onlookers would be entitled to assume
+	 * the xact crashed.  Instead we have a window where the same XID appears
 	 * twice in ProcArray, which is OK.
 	 */
 	MarkAsPrepared(gxact);
@@ -1321,10 +1380,11 @@ EndPrepare(GlobalTransaction gxact)
 	END_CRIT_SECTION();
 
 	/*
-	 * Now we can release the checkpoint start lock: a checkpoint starting
-	 * after this will certainly see the gxact as a candidate for fsyncing.
+	 * Now we can mark ourselves as out of the commit critical section: a
+	 * checkpoint starting after this will certainly see the gxact as a
+	 * candidate for fsyncing.
 	 */
-	CHECKPOINT_START_UNLOCK;
+	MyProc->inCommit = false;
 
 	MIRRORED_UNLOCK;
 
@@ -1393,7 +1453,6 @@ bool
 FinishPreparedTransaction(const char *gid, bool isCommit, bool raiseErrorIfNotFound)
 {
 	MIRRORED_LOCK_DECLARE;
-	CHECKPOINT_START_LOCK_DECLARE;
 
 	GlobalTransaction gxact;
 	TransactionId xid;
@@ -1401,6 +1460,7 @@ FinishPreparedTransaction(const char *gid, bool isCommit, bool raiseErrorIfNotFo
 	char	   *bufptr;
 	char	   *dummy;
 	TwoPhaseFileHeader *hdr;
+	TransactionId latestXid;
 	TransactionId *children;
 
 	PersistentEndXactRecObjects persistentPrepareObjects;
@@ -1515,7 +1575,7 @@ FinishPreparedTransaction(const char *gid, bool isCommit, bool raiseErrorIfNotFo
 	 * record and the removal the of the two phase file from the pg_twophase directory.
 	 */
 	MIRRORED_LOCK;
-
+ 
 	/*
 	 * We have to lock out checkpoint start here when updating persistent relation information
 	 * like Appendonly segment's committed EOF. Otherwise there might be a window betwwen
@@ -1523,10 +1583,11 @@ FinishPreparedTransaction(const char *gid, bool isCommit, bool raiseErrorIfNotFo
 	 * persistent relation tables. If there is a checkpoint before updating the peristent tables
 	 * and the system crash after the checkpoint, then during crash recovery we would not resync
 	 * to the right EOFs (MPP-18261).
-	 * When we use CheckpointStartLock, we make sure we already have the MirroredLock
-	 * first.
 	 */
-	CHECKPOINT_START_LOCK;
+	MyProc->inCommit = true;
+
+	/* compute latestXid among all children */
+	latestXid = TransactionIdLatest(xid, hdr->nsubxacts, children);
 
 	/*
 	 * The order of operations here is critical: make the XLOG entry for
@@ -1548,7 +1609,7 @@ FinishPreparedTransaction(const char *gid, bool isCommit, bool raiseErrorIfNotFo
 
 	prepareAppendOnlyIntentCount = gxact->prepareAppendOnlyIntentCount;
 
-	ProcArrayRemove(&gxact->proc, /* forPrepare */ true, isCommit);
+	ProcArrayRemove(&gxact->proc, latestXid, /* forPrepare */ true, isCommit);
 
 	/*
 	 * In case we fail while running the callbacks, mark the gxact invalid so
@@ -1584,6 +1645,9 @@ FinishPreparedTransaction(const char *gid, bool isCommit, bool raiseErrorIfNotFo
 	else
 		ProcessRecords(bufptr, xid, twophase_postabort_callbacks);
 
+	/* Count the prepared xact as committed or aborted */
+	AtEOXact_PgStat(isCommit);
+
 	/*
 	 * And now we can clean up our mess.
 	 */
@@ -1592,7 +1656,8 @@ FinishPreparedTransaction(const char *gid, bool isCommit, bool raiseErrorIfNotFo
 	RemoveGXact(gxact);
 	MyLockedGxact = NULL;
 
-	CHECKPOINT_START_UNLOCK;
+	/* Checkpoint can proceed now */
+	MyProc->inCommit = false;
 
 	MIRRORED_UNLOCK;
 
@@ -1640,7 +1705,6 @@ RemoveTwoPhaseFile(TransactionId xid, bool giveWarning)
 {
 	remove_recover_post_checkpoint_prepared_transactions_map_entry(xid,
         "RemoveTwoPhaseFile: Removing from list");
-
 }
 
 /*
@@ -1983,7 +2047,7 @@ RecoverPreparedTransactions(void)
  *	RecordTransactionCommitPrepared
  *
  * This is basically the same as RecordTransactionCommit: in particular,
- * we must take the CheckpointStartLock to avoid a race condition.
+ * we must set the inCommit flag to avoid a race condition.
  *
  * We know the transaction made at least one XLOG entry (its PREPARE),
  * so it is never possible to optimize out the commit record.
@@ -2015,8 +2079,9 @@ RecordTransactionCommitPrepared(TransactionId xid,
 			EndXactRecKind_Commit);
 
 	/*
-	 * Ensure the caller already has MirroredLock then CheckpointStartLock.
+	 * Ensure the caller already has MirroredLock and has set MyProc->isCommit.
 	 */
+	Assert(MyProc->inCommit);
 
 	/* Emit the XLOG commit record */
 	xlrec.xid = xid;
@@ -2082,11 +2147,13 @@ RecordTransactionCommitPrepared(TransactionId xid,
 		"" /* tableName */);
 #endif
 
-	recptr = XLogInsert(RM_XACT_ID,
-						XLOG_XACT_COMMIT_PREPARED | XLOG_NO_TRAN,
-						rdata);
+	recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_COMMIT_PREPARED, rdata);
 
-	/* we don't currently try to sleep before flush here ... */
+	/*
+	 * We don't currently try to sleep before flush here ... nor is there any
+	 * support for async commit of a prepared xact (the very idea is probably
+	 * a contradiction)
+	 */
 
 	/* Flush XLOG to disk */
 	XLogFlush(recptr);
@@ -2168,7 +2235,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
 
 	/* Emit the XLOG abort record */
 	xlrec.xid = xid;
-	xlrec.arec.xtime = time(NULL);
+	xlrec.arec.xact_time = GetCurrentTimestamp();
 	xlrec.arec.persistentAbortObjectCount = persistentAbortObjectCount;
 	xlrec.arec.nsubxacts = nchildren;
 	rdata[0].data = (char *) (&xlrec);
@@ -2229,9 +2296,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
 		"" /* tableName */);
 #endif
 
-	recptr = XLogInsert(RM_XACT_ID,
-						XLOG_XACT_ABORT_PREPARED | XLOG_NO_TRAN,
-						rdata);
+	recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_ABORT_PREPARED, rdata);
 
 	/* Always flush, since we're about to remove the 2PC state file */
 	XLogFlush(recptr);
diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c
index fc1787908b12..a7dfaf39c1d2 100644
--- a/src/backend/access/transam/twophase_rmgr.c
+++ b/src/backend/access/transam/twophase_rmgr.c
@@ -8,14 +8,16 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/transam/twophase_rmgr.c,v 1.4 2007/01/05 22:19:23 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/transam/twophase_rmgr.c,v 1.7.2.1 2009/11/23 09:59:00 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "access/multixact.h"
 #include "access/twophase_rmgr.h"
 #include "commands/async.h"
+#include "pgstat.h"
 #include "storage/lock.h"
 #include "utils/flatfiles.h"
 #include "utils/inval.h"
@@ -27,7 +29,9 @@ const TwoPhaseCallback twophase_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] =
 	lock_twophase_recover,		/* Lock */
 	NULL,						/* Inval */
 	NULL,						/* flat file update */
-	NULL						/* notify/listen */
+	NULL,						/* notify/listen */
+	NULL,						/* pgstat */
+	multixact_twophase_recover	/* MultiXact */
 };
 
 const TwoPhaseCallback twophase_postcommit_callbacks[TWOPHASE_RM_MAX_ID + 1] =
@@ -36,7 +40,9 @@ const TwoPhaseCallback twophase_postcommit_callbacks[TWOPHASE_RM_MAX_ID + 1] =
 	lock_twophase_postcommit,	/* Lock */
 	inval_twophase_postcommit,	/* Inval */
 	flatfile_twophase_postcommit,		/* flat file update */
-	notify_twophase_postcommit	/* notify/listen */
+	notify_twophase_postcommit, /* notify/listen */
+	pgstat_twophase_postcommit,	/* pgstat */
+	multixact_twophase_postcommit /* MultiXact */
 };
 
 const TwoPhaseCallback twophase_postabort_callbacks[TWOPHASE_RM_MAX_ID + 1] =
@@ -45,5 +51,7 @@ const TwoPhaseCallback twophase_postabort_callbacks[TWOPHASE_RM_MAX_ID + 1] =
 	lock_twophase_postabort,	/* Lock */
 	NULL,						/* Inval */
 	NULL,						/* flat file update */
-	NULL						/* notify/listen */
+	NULL,						/* notify/listen */
+	pgstat_twophase_postabort,	/* pgstat */
+	multixact_twophase_postabort /* MultiXact */
 };
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 2e62f7e91659..955e92ef9832 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.78 2007/02/15 23:23:22 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.81 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,7 +52,6 @@ GetNewTransactionId(bool isSubXact, bool setProcXid)
 	if (IsBootstrapProcessingMode())
 	{
 		Assert(!isSubXact);
-		//MyProc->xid = BootstrapTransactionId;
 		return BootstrapTransactionId;
 	}
 
@@ -130,19 +129,19 @@ GetNewTransactionId(bool isSubXact, bool setProcXid)
 	TransactionIdAdvance(ShmemVariableCache->nextXid);
 
 	/*
-	 * We must store the new XID into the shared PGPROC array before releasing
-	 * XidGenLock.	This ensures that when GetSnapshotData calls
-	 * ReadNewTransactionId, all active XIDs before the returned value of
-	 * nextXid are already present in PGPROC.  Else we have a race condition.
+	 * We must store the new XID into the shared ProcArray before releasing
+	 * XidGenLock.	This ensures that every active XID older than
+	 * latestCompletedXid is present in the ProcArray, which is essential for
+	 * correct OldestXmin tracking; see src/backend/access/transam/README.
 	 *
 	 * XXX by storing xid into MyProc without acquiring ProcArrayLock, we are
 	 * relying on fetch/store of an xid to be atomic, else other backends
 	 * might see a partially-set xid here.	But holding both locks at once
-	 * would be a nasty concurrency hit (and in fact could cause a deadlock
-	 * against GetSnapshotData).  So for now, assume atomicity. Note that
-	 * readers of PGPROC xid field should be careful to fetch the value only
-	 * once, rather than assume they can read it multiple times and get the
-	 * same answer each time.
+	 * would be a nasty concurrency hit.  So for now, assume atomicity.
+	 *
+	 * Note that readers of PGPROC xid fields should be careful to fetch the
+	 * value only once, rather than assume they can read a value multiple
+	 * times and get the same answer each time.
 	 *
 	 * The same comments apply to the subxact xid count and overflow fields.
 	 *
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 5cc0313f9a9b..d8272669e83c 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.234 2007/02/09 03:35:33 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.257.2.8 2010/07/23 00:43:26 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,12 +37,14 @@
 #include "executor/spi.h"
 #include "libpq/be-fsstubs.h"
 #include "miscadmin.h"
+#include "pg_trace.h"
 #include "pgstat.h"
 #include "replication/walsender.h"
 #include "replication/syncrep.h"
 #include "storage/fd.h"
 #include "storage/lmgr.h"
 #include "storage/procarray.h"
+#include "storage/sinvaladt.h"
 #include "storage/smgr.h"
 #include "storage/freespace.h"
 #include "utils/combocid.h"
@@ -72,9 +74,18 @@ int			XactIsoLevel;
 bool		DefaultXactReadOnly = false;
 bool		XactReadOnly;
 
+bool		XactSyncCommit = true;
+
 int			CommitDelay = 0;	/* precommit delay in microseconds */
 int			CommitSiblings = 5; /* # concurrent xacts needed to sleep */
 
+/*
+ * MyXactAccessedTempRel is set when a temporary relation is accessed.
+ * We don't allow PREPARE TRANSACTION in that case.  (This is global
+ * so that it can be set from heapam.c.)
+ */
+bool		MyXactAccessedTempRel = false;
+
 XidBuffer subxbuf;
 int32 gp_subtrans_warn_limit = 16777216; /* 16 million */
 
@@ -147,7 +158,9 @@ typedef struct TransactionStateData
 	int			gucNestLevel;	/* GUC context nesting depth */
 	MemoryContext curTransactionContext;		/* my xact-lifetime context */
 	ResourceOwner curTransactionOwner;	/* my query resources */
-	List	   *childXids;		/* subcommitted child XIDs */
+	TransactionId *childXids;	/* subcommitted child XIDs, in XID order */
+	int			nChildXids;		/* # of subcommitted child XIDs */
+	int			maxChildXids;	/* allocated size of childXids[] */
 	Oid			prevUser;		/* previous CurrentUserId setting */
 	int			prevSecContext;	/* previous SecurityRestrictionContext */
 	bool		prevXactReadOnly;		/* entry-time xact r/o state */
@@ -181,7 +194,9 @@ static TransactionStateData TopTransactionStateData = {
 	0,							/* GUC context nesting depth */
 	NULL,						/* cur transaction context */
 	NULL,						/* cur transaction resource owner */
-	NIL,						/* subcommitted child Xids */
+	NULL,						/* subcommitted child Xids */
+	0,							/* # of subcommitted child Xids */
+	0,							/* allocated size of childXids[] */
 	InvalidOid,					/* previous CurrentUserId setting */
 	0,							/* previous SecurityRestrictionContext */
 	false,						/* entry-time xact r/o state */
@@ -198,6 +213,7 @@ static TransactionState CurrentTransactionState = &TopTransactionStateData;
  */
 static SubTransactionId currentSubTransactionId;
 static CommandId currentCommandId;
+static bool currentCommandIdUsed;
 
 /*
  * xactStartTimestamp is the value of transaction_timestamp().
@@ -222,6 +238,11 @@ static int currentSavepointTotal;
  */
 static char *prepareGID;
 
+/*
+ * Some commands want to force synchronous commit.
+ */
+static bool forceSyncCommit = false;
+
 /*
  * Private context for transaction-abort work --- we reserve space for this
  * at startup to ensure that AbortTransaction and AbortSubTransaction can work
@@ -262,7 +283,7 @@ static SubXactCallbackItem *SubXact_callbacks = NULL;
 File subxip_file = 0;
 
 /* local function prototypes */
-static void AssignSubTransactionId(TransactionState s);
+static void AssignTransactionId(TransactionState s);
 static void AtAbort_Memory(void);
 static void AtCleanup_Memory(void);
 static void AtAbort_ResourceOwner(void);
@@ -277,7 +298,7 @@ static void CallSubXactCallbacks(SubXactEvent event,
 					 SubTransactionId mySubid,
 					 SubTransactionId parentSubid);
 static void CleanupTransaction(void);
-static void RecordTransactionAbort(void);
+static TransactionId RecordTransactionAbort(bool isSubXact);
 
 static void RecordSubTransactionCommit(void);
 static void StartSubTransaction(void);
@@ -343,26 +364,14 @@ IsTransactionState(void)
 {
 	TransactionState s = CurrentTransactionState;
 
-	switch (s->state)
-	{
-		case TRANS_DEFAULT:
-			return false;
-		case TRANS_START:
-			return true;
-		case TRANS_INPROGRESS:
-			return true;
-		case TRANS_COMMIT:
-			return true;
-		case TRANS_ABORT:
-			return true;
-		case TRANS_PREPARE:
-			return true;
-	}
-
 	/*
-	 * Shouldn't get here, but lint is not happy without this...
+	 * TRANS_DEFAULT and TRANS_ABORT are obviously unsafe states.  However, we
+	 * also reject the startup/shutdown states TRANS_START, TRANS_COMMIT,
+	 * TRANS_PREPARE since it might be too soon or too late within those
+	 * transition states to do anything interesting.  Hence, the only "valid"
+	 * state is TRANS_INPROGRESS.
 	 */
-	return false;
+	return (s->state == TRANS_INPROGRESS);
 }
 
 bool
@@ -407,23 +416,36 @@ GetAllTransactionXids(
 /*
  *	GetTopTransactionId
  *
- * Get the ID of the main transaction, even if we are currently inside
- * a subtransaction.
+ * This will return the XID of the main transaction, assigning one if
+ * it's not yet set.  Be careful to call this only inside a valid xact.
  */
 TransactionId
 GetTopTransactionId(void)
 {
+	if (!TransactionIdIsValid(TopTransactionStateData.transactionId))
+		AssignTransactionId(&TopTransactionStateData);
 	return TopTransactionStateData.transactionId;
 }
 
+/*
+ *	GetTopTransactionIdIfAny
+ *
+ * This will return the XID of the main transaction, if one is assigned.
+ * It will return InvalidTransactionId if we are not currently inside a
+ * transaction, or inside a transaction that hasn't yet been assigned an XID.
+ */
+TransactionId
+GetTopTransactionIdIfAny(void)
+{
+	return TopTransactionStateData.transactionId;
+}
 
 /*
  *	GetCurrentTransactionId
  *
- * We do not assign XIDs to subtransactions until/unless this is called.
- * When we do assign an XID to a subtransaction, recursively make sure
- * its parent has one as well (this maintains the invariant that a child
- * transaction has an XID following its parent's).
+ * This will return the XID of the current transaction (main or sub
+ * transaction), assigning one if it's not yet set.  Be careful to call this
+ * only inside a valid xact.
  */
 TransactionId
 GetCurrentTransactionId(void)
@@ -431,20 +453,71 @@ GetCurrentTransactionId(void)
 	TransactionState s = CurrentTransactionState;
 
 	if (!TransactionIdIsValid(s->transactionId))
-		AssignSubTransactionId(s);
-
+		AssignTransactionId(s);
 	return s->transactionId;
 }
 
+/*
+ *	GetCurrentTransactionIdIfAny
+ *
+ * This will return the XID of the current sub xact, if one is assigned.
+ * It will return InvalidTransactionId if we are not currently inside a
+ * transaction, or inside a transaction that hasn't been assigned an XID yet.
+ */
+TransactionId
+GetCurrentTransactionIdIfAny(void)
+{
+	return CurrentTransactionState->transactionId;
+}
+
+
+/*
+ * AssignTransactionId
+ *
+ * Assigns a new permanent XID to the given TransactionState.
+ * We do not assign XIDs to transactions until/unless this is called.
+ * Also, any parent TransactionStates that don't yet have XIDs are assigned
+ * one; this maintains the invariant that a child transaction has an XID
+ * following its parent's.
+ */
 static void
-AssignSubTransactionId(TransactionState s)
+AssignTransactionId(TransactionState s)
 {
+	bool		isSubXact = (s->parent != NULL);
 	ResourceOwner currentOwner;
 
-	Assert(s->parent != NULL);
+	/* Assert that caller didn't screw up */
+	Assert(!TransactionIdIsValid(s->transactionId));
 	Assert(s->state == TRANS_INPROGRESS);
-	if (!TransactionIdIsValid(s->parent->transactionId))
-		AssignSubTransactionId(s->parent);
+
+	/*
+	 * Ensure parent(s) have XIDs, so that a child always has an XID later
+	 * than its parent.  Musn't recurse here, or we might get a stack overflow
+	 * if we're at the bottom of a huge stack of subtransactions none of which
+	 * have XIDs yet.
+	 */
+	if (isSubXact && !TransactionIdIsValid(s->parent->transactionId))
+	{
+		TransactionState	p = s->parent;
+		TransactionState   *parents;
+		size_t	parentOffset = 0;
+
+		parents = palloc(sizeof(TransactionState) *  s->nestingLevel);
+		while (p != NULL && !TransactionIdIsValid(p->transactionId))
+		{
+			parents[parentOffset++] = p;
+			p = p->parent;
+		}
+
+		/*
+		 * This is technically a recursive call, but the recursion will
+		 * never be more than one layer deep.
+		 */
+		while (parentOffset != 0)
+			AssignTransactionId(parents[--parentOffset]);
+
+		pfree(parents);
+	}
 
 	/*
 	 * Generate a new Xid and record it in PG_PROC and pg_subtrans.
@@ -454,12 +527,14 @@ AssignSubTransactionId(TransactionState s)
 	 * PG_PROC, the subtrans entry is needed to ensure that other backends see
 	 * the Xid as "running".  See GetNewTransactionId.
 	 */
-	s->transactionId = GetNewTransactionId(true, true);
-	elog((Debug_print_full_dtm ? LOG : DEBUG5), "AssignSubTransactionId(): assigned xid %u", s->transactionId);
+	s->transactionId = GetNewTransactionId(isSubXact, true);
+	elog((Debug_print_full_dtm ? LOG : DEBUG5), "AssignTransactionId(): assigned xid %u", s->transactionId);
 
-	Assert(TransactionIdPrecedes(s->parent->transactionId, s->transactionId));
-
-	SubTransSetParent(s->transactionId, s->parent->transactionId);
+	if (isSubXact)
+	{
+		Assert(TransactionIdPrecedes(s->parent->transactionId, s->transactionId));
+		SubTransSetParent(s->transactionId, s->parent->transactionId);
+	}
 
 	/*
 	 * Acquire lock on the transaction XID.  (We assume this cannot block.) We
@@ -470,7 +545,6 @@ AssignSubTransactionId(TransactionState s)
 	PG_TRY();
 	{
 		CurrentResourceOwner = s->curTransactionOwner;
-
 		XactLockTableInsert(s->transactionId);
 	}
 	PG_CATCH();
@@ -484,22 +558,6 @@ AssignSubTransactionId(TransactionState s)
 }
 
 
-/*
- *	GetCurrentTransactionIdIfAny
- *
- * Unlike GetCurrentTransactionId, this will return InvalidTransactionId
- * if we are currently not in a transaction, or in a transaction or
- * subtransaction that has not yet assigned itself an XID.
- */
-TransactionId
-GetCurrentTransactionIdIfAny(void)
-{
-	TransactionState s = CurrentTransactionState;
-
-	return s->transactionId;
-}
-
-
 /*
  *	GetCurrentSubTransactionId
  */
@@ -514,11 +572,18 @@ GetCurrentSubTransactionId(void)
 
 /*
  *	GetCurrentCommandId
+ *
+ * "used" must be TRUE if the caller intends to use the command ID to mark
+ * inserted/updated/deleted tuples.  FALSE means the ID is being fetched
+ * for read-only purposes (ie, as a snapshot validity cutoff).  See
+ * CommandCounterIncrement() for discussion.
  */
 CommandId
-GetCurrentCommandId(void)
+GetCurrentCommandId(bool used)
 {
 	/* this is global to a transaction, not subtransaction-local */
+	if (used)
+		currentCommandIdUsed = true;
 	return currentCommandId;
 }
 
@@ -603,7 +668,7 @@ GetCurrentTransactionNestLevel(void)
  * is no longer "current", even though it may still have an entry on the
  * state stack.
  *
- * The parent list and childXIDs list within it are in sorted decreasing order.
+ * The XID of a child is always greater than that of its parent.
  * Taking advantage of this fact simple optimizations are added instead of linear traversal to fasten the search
  *  1] Added fastLink/skipLink pointers to skip nodes in list and scan fast across, instead of visiting all nodes in list
  *  2] Break-out as soon as XID to search is greater than the current node in (parent / child) list
@@ -615,23 +680,30 @@ TransactionIdIsCurrentTransactionIdInternal(TransactionId xid)
 
 	while (s != NULL)
 	{
-		ListCell   *cell;
-
 		if ((s->state != TRANS_ABORT) &&
 				(TransactionIdIsValid(s->transactionId)))
 		{
+			int low, high;
+
 			if (TransactionIdEquals(xid, s->transactionId))
 				return true;
-			foreach(cell, s->childXids)
+
+			/* As the childXids array is ordered, we can use binary search */
+			low = 0;
+			high = s->nChildXids - 1;
+			while (low <= high)
 			{
-				if (TransactionIdEquals(xid, lfirst_xid(cell)))
+				int				middle;
+				TransactionId	probe;
+
+				middle = low + (high - low) / 2;
+				probe = s->childXids[middle];
+				if (TransactionIdEquals(probe, xid))
 					return true;
-				/*
-				 * childXid list is maintained in decreasing order.
-				 * hence, can safely breakout if XID follows currentListNode XID.
-				 */
-				if (TransactionIdFollows(xid, lfirst_xid(cell)))
-					break;
+				else if (TransactionIdPrecedes(probe, xid))
+					low = middle + 1;
+				else
+					high = middle - 1;
 			}
 
 			/*
@@ -686,8 +758,8 @@ TransactionIdIsCurrentTransactionId(TransactionId xid)
 	if (!TransactionIdIsNormal(xid))
 		return false;
 
-    if ((DistributedTransactionContext == DTX_CONTEXT_QE_READER ||
-		 DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON))
+    if (DistributedTransactionContext == DTX_CONTEXT_QE_READER ||
+		DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON)
 	{
 		if (TransactionIdEquals(xid, TopTransactionStateData.transactionId))
 		{
@@ -739,7 +811,6 @@ TransactionIdIsCurrentTransactionId(TransactionId xid)
 	}
 
 	/* we aren't a reader */
-	Assert(DistributedTransactionContext != DTX_CONTEXT_QE_READER);
 	Assert(DistributedTransactionContext != DTX_CONTEXT_QE_ENTRY_DB_SINGLETON);
 
 	return TransactionIdIsCurrentTransactionIdInternal(xid);
@@ -752,28 +823,65 @@ TransactionIdIsCurrentTransactionId(TransactionId xid)
 void
 CommandCounterIncrement(void)
 {
-	currentCommandId += 1;
-	if (currentCommandId == FirstCommandId)		/* check for overflow */
+	/*
+	 * If the current value of the command counter hasn't been "used" to
+	 * mark tuples, we need not increment it, since there's no need to
+	 * distinguish a read-only command from others.  This helps postpone
+	 * command counter overflow, and keeps no-op CommandCounterIncrement
+	 * operations cheap.
+	 */
+	if (currentCommandIdUsed)
 	{
-		currentCommandId -= 1;
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+		currentCommandId += 1;
+		if (currentCommandId == FirstCommandId)	/* check for overflow */
+		{
+			currentCommandId -= 1;
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 		  errmsg("cannot have more than 2^32-1 commands in a transaction")));
-	}
+		}
+		currentCommandIdUsed = false;
 
-	/* Propagate new command ID into static snapshots, if set */
-	if (SerializableSnapshot)
-		SerializableSnapshot->curcid = currentCommandId;
-	if (LatestSnapshot)
-		LatestSnapshot->curcid = currentCommandId;
+		/* Propagate new command ID into static snapshots, if set */
+		if (SerializableSnapshot)
+			SerializableSnapshot->curcid = currentCommandId;
+		if (LatestSnapshot)
+			LatestSnapshot->curcid = currentCommandId;
+
+		/*
+		 * Make any catalog changes done by the just-completed command
+		 * visible in the local syscache.  We obviously don't need to do
+		 * this after a read-only command.  (But see hacks in inval.c
+		 * to make real sure we don't think a command that queued inval
+		 * messages was read-only.)
+		 */
+		AtCommit_LocalCache();
+	}
 
 	/*
-	 * make cache changes visible to me.
+	 * Make any other backends' catalog changes visible to me.
+	 *
+	 * XXX this is probably in the wrong place: CommandCounterIncrement
+	 * should be purely a local operation, most likely.  However fooling
+	 * with this will affect asynchronous cross-backend interactions,
+	 * which doesn't seem like a wise thing to do in late beta, so save
+	 * improving this for another day - tgl 2007-11-30
 	 */
-	AtCommit_LocalCache();
 	AtStart_Cache();
 }
 
+/*
+ * ForceSyncCommit
+ *
+ * Interface routine to allow commands to force a synchronous commit of the
+ * current top-level transaction
+ */
+void
+ForceSyncCommit(void)
+{
+	forceSyncCommit = true;
+}
+
 
 /* ----------------------------------------------------------------
  *						StartTransaction stuff
@@ -800,9 +908,9 @@ AtStart_Memory(void)
 	/*
 	 * If this is the first time through, create a private context for
 	 * AbortTransaction to work in.  By reserving some space now, we can
-	 * insulate AbortTransaction from out-of-memory scenarios.  Like
-	 * ErrorContext, we set it up with slow growth rate and a nonzero
-	 * minimum size, so that space will be reserved immediately.
+	 * insulate AbortTransaction from out-of-memory scenarios.	Like
+	 * ErrorContext, we set it up with slow growth rate and a nonzero minimum
+	 * size, so that space will be reserved immediately.
 	 */
 	if (TransactionAbortContext == NULL)
 		TransactionAbortContext =
@@ -921,19 +1029,26 @@ AtSubStart_ResourceOwner(void)
 
 /*
  *	RecordTransactionCommit
+ *
+ * Returns latest XID among xact and its children, or InvalidTransactionId
+ * if the xact has no XID.	(We compute that here just because it's easier.)
+ *
+ * This is exported only to support an ugly hack in VACUUM FULL.
  */
-void
+TransactionId
 RecordTransactionCommit(void)
 {
+	TransactionId xid;
+	bool		markXidCommitted;
+	TransactionId latestXid = InvalidTransactionId;
 	MIRRORED_LOCK_DECLARE;
 
-	CHECKPOINT_START_LOCK_DECLARE;
-
 	int32						persistentCommitSerializeLen;
 	PersistentEndXactRecObjects persistentCommitObjects;
 	int16						persistentCommitObjectCount;
 	char						*persistentCommitBuffer = NULL;
 
+	bool		haveNonTemp;
 	int			nchildren;
 	TransactionId *children;
 	bool		isDtxPrepared = 0;
@@ -941,30 +1056,34 @@ RecordTransactionCommit(void)
 	TMGXACT_LOG gxact_log;
 	XLogRecPtr	recptr = {0,0};
 
+	/* Like in CommitTransaction(), treat a QE reader as if there was no XID */
+	if (DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON ||
+		DistributedTransactionContext == DTX_CONTEXT_QE_READER)
+	{
+		xid = InvalidTransactionId;
+	}
+	else
+		xid = GetTopTransactionIdIfAny();
+	markXidCommitted = TransactionIdIsValid(xid);
+
 	/* Get data needed for commit record */
 	persistentCommitSerializeLen =
 			PersistentEndXactRec_FetchObjectsFromSmgr(
 										&persistentCommitObjects,
 										EndXactRecKind_Commit,
 										&persistentCommitObjectCount);
+	/* GPDB_83_MERGE_FIXME: smgrGetPendingDeletes() in upstream returns
+	 * the haveNonTemp boolean too. PersistentEndXactRec_FetchObjectsFromSmgr()
+	 * doesn't do that.
+	 */
+	haveNonTemp = (persistentCommitObjectCount > 0);
 
 	nchildren = xactGetCommittedChildren(&children);
 
 	isDtxPrepared = isPreparedDtxTransaction();
 	omitCommitRecordForDirtyQEReader = false;
-
-	/*
-	 * If we made neither any XLOG entries nor any temp-rel updates, and have
-	 * no files to be deleted, we can omit recording the transaction commit at
-	 * all.  (This test includes the effects of subtransactions, so the
-	 * presence of committed subxacts need not alone force a write.)
-	 */
-	if (MyXactMadeXLogEntry || MyXactMadeTempRelUpdate || isDtxPrepared ||
-		persistentCommitObjectCount > 0)
+	if (markXidCommitted)
 	{
-		TransactionId xid = GetCurrentTransactionId();
-		bool		madeTCentries;
-
 		/* Safety check in case our assumption is ever broken. */
 		if (Gp_role == GP_ROLE_EXECUTE && !Gp_is_writer && !seqXlogWrite)
 		{
@@ -999,125 +1118,135 @@ RecordTransactionCommit(void)
 #endif
 			}
 		}
+	}
+	
+	/*
+	 * If we haven't been assigned an XID yet, we neither can, nor do we want
+	 * to write a COMMIT record.
+	 */
+	if (!markXidCommitted)
+	{
+		/*
+		 * We expect that every smgrscheduleunlink is followed by a catalog
+		 * update, and hence XID assignment, so we shouldn't get here with any
+		 * pending deletes.  Use a real test not just an Assert to check this,
+		 * since it's a bit fragile.
+		 */
+		if (persistentCommitObjectCount != 0)
+			elog(ERROR, "cannot commit a transaction that deleted files but has no xid");
+
+		/* Can't have child XIDs either; AssignTransactionId enforces this */
+		Assert(nchildren == 0);
+
+		/*
+		 * If we didn't create XLOG entries, we're done here; otherwise we
+		 * should flush those entries the same as a commit record.	(An
+		 * example of a possible record that wouldn't cause an XID to be
+		 * assigned is a sequence advance record due to nextval() --- we want
+		 * to flush that to disk before reporting commit.)
+		 */
+		if (XactLastRecEnd.xrecoff == 0)
+			goto cleanup;
+	}
+	else
+	{
+		/*
+		 * Begin commit critical section and insert the commit XLOG record.
+		 */
+		XLogRecData rdata[4];
+		int			lastrdata = 0;
+		xl_xact_commit xlrec;
 
 		/* Tell bufmgr and smgr to prepare for commit */
 		BufmgrCommit();
 
-		if (!omitCommitRecordForDirtyQEReader)
-		{
-		START_CRIT_SECTION();
-
 		/*
-		 * If our transaction made any transaction-controlled XLOG entries, we
-		 * need to lock out checkpoint start between writing our XLOG record
-		 * and updating pg_clog.  Otherwise it is possible for the checkpoint
-		 * to set REDO after the XLOG record but fail to flush the pg_clog
-		 * update to disk, leading to loss of the transaction commit if we
-		 * crash a little later.  Slightly klugy fix for problem discovered
-		 * 2004-08-10.
+		 * Mark ourselves as within our "commit critical section".	This
+		 * forces any concurrent checkpoint to wait until we've updated
+		 * pg_clog.  Without this, it is possible for the checkpoint to set
+		 * REDO after the XLOG record but fail to flush the pg_clog update to
+		 * disk, leading to loss of the transaction commit if the system
+		 * crashes a little later.
 		 *
-		 * (If it made no transaction-controlled XLOG entries, its XID appears
-		 * nowhere in permanent storage, so no one else will ever care if it
-		 * committed; so it doesn't matter if we lose the commit flag.)
+		 * Note: we could, but don't bother to, set this flag in
+		 * RecordTransactionAbort.	That's because loss of a transaction abort
+		 * is noncritical; the presumption would be that it aborted, anyway.
 		 *
-		 * Note we only need a shared lock.
+		 * It's safe to change the inCommit flag of our own backend without
+		 * holding the ProcArrayLock, since we're the only one modifying it.
+		 * This makes checkpoint's determination of which xacts are inCommit a
+		 * bit fuzzy, but it doesn't matter.
 		 */
-		madeTCentries = (MyLastRecPtr.xrecoff != 0);
-		if (madeTCentries)
-		{
-			/*
-			 * When we use CheckpointStartLock, we make sure we already have the
-			 * MirroredLock first.
-			 *
-			 * The lock order is: MirroredLock then CheckpointStartLock.
-			 */
-			MIRRORED_LOCK;
+		START_CRIT_SECTION();
+		MyProc->inCommit = true;
 
-			CHECKPOINT_START_LOCK;
-		}
+		MIRRORED_LOCK;
 
 		SetCurrentTransactionStopTimestamp();
-		/*
-		 * We only need to log the commit in XLOG if the transaction made any
-		 * transaction-controlled XLOG entries or will delete files.
-		 */
-		if (madeTCentries || persistentCommitObjectCount > 0 || isDtxPrepared)
+		xlrec.xact_time = xactStopTimestamp;
+		xlrec.persistentCommitObjectCount = persistentCommitObjectCount;
+		xlrec.nsubxacts = nchildren;
+		rdata[0].data = (char *) (&xlrec);
+		rdata[0].len = MinSizeOfXactCommit;
+		rdata[0].buffer = InvalidBuffer;
+		/* dump persistent commit objects */
+		if (persistentCommitObjectCount > 0)
 		{
-			XLogRecData rdata[4];
-			int			lastrdata = 0;
-			xl_xact_commit xlrec;
-
-			xlrec.xtime = time(NULL);
-		    //xlrec.xact_time = xactStopTimestamp;
-			xlrec.persistentCommitObjectCount = persistentCommitObjectCount;
-			xlrec.nsubxacts = nchildren;
-			rdata[0].data = (char *) (&xlrec);
-			rdata[0].len = MinSizeOfXactCommit;
-			rdata[0].buffer = InvalidBuffer;
-			/* dump persistent commit objects */
-			if (persistentCommitObjectCount > 0)
-			{
-				int16 objectCount;
-
-				Assert(persistentCommitSerializeLen > 0);
-				persistentCommitBuffer =
-							(char *) palloc(persistentCommitSerializeLen);
-
-				PersistentEndXactRec_Serialize(
-										&persistentCommitObjects,
-										EndXactRecKind_Commit,
-										&objectCount,
-										(uint8*)persistentCommitBuffer,
-										persistentCommitSerializeLen);
-
-				if (Debug_persistent_print)
-					PersistentEndXactRec_Print("RecordTransactionCommit", &persistentCommitObjects);
-
-				rdata[0].next = &(rdata[1]);
-				rdata[1].data = persistentCommitBuffer;
-				rdata[1].len = persistentCommitSerializeLen;
-				rdata[1].buffer = InvalidBuffer;
-				lastrdata = 1;
-			}
-			/* dump committed child Xids */
-			if (nchildren > 0)
-			{
-				rdata[lastrdata].next = &(rdata[2]);
-				rdata[2].data = (char *) children;
-				rdata[2].len = nchildren * sizeof(TransactionId);
-				rdata[2].buffer = InvalidBuffer;
-				lastrdata = 2;
-			}
-			/* add global transaction information */
-			if (isDtxPrepared)
-			{
-				getDtxLogInfo(&gxact_log);
+			int16 objectCount;
+
+			Assert(persistentCommitSerializeLen > 0);
+			persistentCommitBuffer =
+				(char *) palloc(persistentCommitSerializeLen);
+
+			PersistentEndXactRec_Serialize(
+				&persistentCommitObjects,
+				EndXactRecKind_Commit,
+				&objectCount,
+				(uint8*)persistentCommitBuffer,
+				persistentCommitSerializeLen);
+
+			if (Debug_persistent_print)
+				PersistentEndXactRec_Print("RecordTransactionCommit", &persistentCommitObjects);
+
+			rdata[0].next = &(rdata[1]);
+			rdata[1].data = persistentCommitBuffer;
+			rdata[1].len = persistentCommitSerializeLen;
+			rdata[1].buffer = InvalidBuffer;
+			lastrdata = 1;
+		}
+		/* dump committed child Xids */
+		if (nchildren > 0)
+		{
+			rdata[lastrdata].next = &(rdata[2]);
+			rdata[2].data = (char *) children;
+			rdata[2].len = nchildren * sizeof(TransactionId);
+			rdata[2].buffer = InvalidBuffer;
+			lastrdata = 2;
+		}
+		/* add global transaction information */
+		if (isDtxPrepared)
+		{
+			getDtxLogInfo(&gxact_log);
 
-				rdata[lastrdata].next = &(rdata[3]);
-				rdata[3].data = (char *) &gxact_log;
-				rdata[3].len = sizeof(gxact_log);
-				rdata[3].buffer = InvalidBuffer;
-				lastrdata = 3;
-			}
-			rdata[lastrdata].next = NULL;
+			rdata[lastrdata].next = &(rdata[3]);
+			rdata[3].data = (char *) &gxact_log;
+			rdata[3].len = sizeof(gxact_log);
+			rdata[3].buffer = InvalidBuffer;
+			lastrdata = 3;
+		}
+		rdata[lastrdata].next = NULL;
 
-			if (isDtxPrepared)
-			{
-				insertingDistributedCommitted();
+		if (isDtxPrepared)
+		{
+			insertingDistributedCommitted();
 
-				recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_DISTRIBUTED_COMMIT, rdata);
+			recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_DISTRIBUTED_COMMIT, rdata);
 
-				insertedDistributedCommitted();
-			}
-			else
-			{
-				recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_COMMIT, rdata);
-			}
+			insertedDistributedCommitted();
 		}
 		else
 		{
-			/* Just flush through last record written by me */
-			recptr = ProcLastRecEnd;
+			recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_COMMIT, rdata);
 		}
 
 		/* MPP: If we are the QD and we've used sequences (from the sequence server) then we need
@@ -1137,70 +1266,62 @@ RecordTransactionCommit(void)
 
 			LWLockRelease(SeqServerControlLock);
 		}
+	}
 
+	/*
+	 * Check if we want to commit asynchronously.  If the user has set
+	 * synchronous_commit = off, and we're not doing cleanup of any non-temp
+	 * rels nor committing any command that wanted to force sync commit, then
+	 * we can defer flushing XLOG.	(We must not allow asynchronous commit if
+	 * there are any non-temp tables to be deleted, because we might delete
+	 * the files before the COMMIT record is flushed to disk.  We do allow
+	 * asynchronous commit if all to-be-deleted tables are temporary though,
+	 * since they are lost anyway if we crash.)
+	 */
+	if (XactSyncCommit || forceSyncCommit || haveNonTemp)
+	{
 		/*
-		 * We must flush our XLOG entries to disk if we made any XLOG entries,
-		 * whether in or out of transaction control.  For example, if we
-		 * reported a nextval() result to the client, this ensures that any
-		 * XLOG record generated by nextval will hit the disk before we report
-		 * the transaction committed.
+		 * Synchronous commit case.
 		 *
-		 * Note: if we generated a commit record above, MyXactMadeXLogEntry
-		 * will certainly be set now.
+		 * Sleep before flush! So we can flush more than one commit records
+		 * per single fsync.  (The idea is some other backend may do the
+		 * XLogFlush while we're sleeping.  This needs work still, because on
+		 * most Unixen, the minimum select() delay is 10msec or more, which is
+		 * way too long.)
+		 *
+		 * We do not sleep if enableFsync is not turned on, nor if there are
+		 * fewer than CommitSiblings other backends with active transactions.
 		 */
-		if (MyXactMadeXLogEntry)
-		{
-			/*
-			 * Sleep before flush! So we can flush more than one commit
-			 * records per single fsync.  (The idea is some other backend may
-			 * do the XLogFlush while we're sleeping.  This needs work still,
-			 * because on most Unixen, the minimum select() delay is 10msec or
-			 * more, which is way too long.)
-			 *
-			 * We do not sleep if enableFsync is not turned on, nor if there
-			 * are fewer than CommitSiblings other backends with active
-			 * transactions.
-			 */
-			if (CommitDelay > 0 && enableFsync &&
-				CountActiveBackends() >= CommitSiblings)
-				pg_usleep(CommitDelay);
+		if (CommitDelay > 0 && enableFsync &&
+			CountActiveBackends() >= CommitSiblings)
+			pg_usleep(CommitDelay);
 
-			XLogFlush(recptr);
+		XLogFlush(recptr);
 
 #ifdef FAULT_INJECTOR
-			if (isDtxPrepared == 0 &&
-				CurrentTransactionState->blockState == TBLOCK_END)
-			{
-					FaultInjector_InjectFaultIfSet(
-												   LocalTmRecordTransactionCommit,
-												   DDLNotSpecified,
-												   "",  // databaseName
-												   ""); // tableName
-			}
+		if (isDtxPrepared == 0 &&
+			CurrentTransactionState->blockState == TBLOCK_END)
+		{
+			FaultInjector_InjectFaultIfSet(LocalTmRecordTransactionCommit,
+										   DDLNotSpecified,
+										   "",  // databaseName
+										   ""); // tableName
+		}
 #endif
 
-			/*
-			 * Now we may update the CLOG, if we wrote COMMIT record above
-			 */
-			if (max_wal_senders > 0)
-				WalSndWakeup();
+		/*
+		 * Now we may update the CLOG, if we wrote COMMIT record above
+		 */
+		if (max_wal_senders > 0)
+			WalSndWakeup();
 
-			if (isDtxPrepared)
-			{
-				forcedDistributedCommitted(&recptr);
-			}
-		}
+		if (isDtxPrepared)
+			forcedDistributedCommitted(&recptr);
 
 		/*
-		 * We must mark the transaction committed in clog if its XID appears
-		 * either in permanent rels or in local temporary rels. We test this
-		 * by seeing if we made transaction-controlled entries *OR* local-rel
-		 * tuple updates.  Note that if we made only the latter, we have not
-		 * emitted an XLOG record for our commit, and so in the event of a
-		 * crash the clog update might be lost.  This is okay because no one
-		 * else will ever care whether we committed.
+		 * Now we may update the CLOG, if we wrote a COMMIT record above
 		 */
-		if (madeTCentries || MyXactMadeTempRelUpdate)
+		if (markXidCommitted)
 		{
 			if (isDtxPrepared)
 			{
@@ -1217,25 +1338,48 @@ RecordTransactionCommit(void)
 			/* to avoid race conditions, the parent must commit first */
 			TransactionIdCommitTree(nchildren, children);
 		}
+	}
+	else
+	{
+		/*
+		 * Asynchronous commit case.
+		 *
+		 * Report the latest async commit LSN, so that the WAL writer knows to
+		 * flush this commit.
+		 */
+		XLogSetAsyncCommitLSN(XactLastRecEnd);
 
-#ifdef FAULT_INJECTOR
-		FaultInjector_InjectFaultIfSet(
-					       DtmXLogDistributedCommit,
-					       DDLNotSpecified,
-					       "",	// databaseName
-					       ""); // tableName
-#endif
-
-		/* Unlock checkpoint lock if we acquired it */
-		if (madeTCentries)
+		/*
+		 * We must not immediately update the CLOG, since we didn't flush the
+		 * XLOG. Instead, we store the LSN up to which the XLOG must be
+		 * flushed before the CLOG may be updated.
+		 */
+		if (markXidCommitted)
 		{
-			CHECKPOINT_START_UNLOCK;
-
-			MIRRORED_UNLOCK;
+			TransactionIdAsyncCommit(xid, XactLastRecEnd);
+			/* to avoid race conditions, the parent must commit first */
+			TransactionIdAsyncCommitTree(nchildren, children, XactLastRecEnd);
 		}
+	}
 
+#ifdef FAULT_INJECTOR
+	FaultInjector_InjectFaultIfSet(
+		DtmXLogDistributedCommit,
+		DDLNotSpecified,
+		"",	// databaseName
+		""); // tableName
+#endif
+
+	/*
+	 * If we entered a commit critical section, leave it now, and let
+	 * checkpoints proceed.
+	 */
+	if (markXidCommitted)
+	{
+		MyProc->inCommit = false;
 		END_CRIT_SECTION();
-	}
+
+		MIRRORED_UNLOCK;
 	}
 
 	/*
@@ -1244,17 +1388,19 @@ RecordTransactionCommit(void)
 	 * Note that at this stage we have marked clog, but still show as running
 	 * in the procarray and continue to hold locks.
 	 */
-	if (MyXactMadeXLogEntry)
+	if (markXidCommitted)
 	{
 		Assert(recptr.xrecoff != 0);
 		SyncRepWaitForLSN(recptr);
 	}
 
-	/* Break the chain of back-links in the XLOG records I output */
-	MyLastRecPtr.xrecoff = 0;
-	MyXactMadeXLogEntry = false;
-	MyXactMadeTempRelUpdate = false;
+	/* Compute latestXid while we have the child XIDs handy */
+	latestXid = TransactionIdLatest(xid, nchildren, children);
+
+	/* Reset XactLastRecEnd until the next transaction writes something */
+	XactLastRecEnd.xrecoff = 0;
 
+cleanup:
 	/* And clean up local data */
 
 	// UNDONE: Free storage in persistentCommitObjects...
@@ -1263,6 +1409,8 @@ RecordTransactionCommit(void)
 		pfree(persistentCommitBuffer);
 	if (children)
 		pfree(children);
+
+	return latestXid;
 }
 
 /*
@@ -1281,7 +1429,7 @@ RecordDistributedForgetCommitted(TMGXACT_LOG *gxact_log)
 	rdata[0].buffer = InvalidBuffer;
 	rdata[0].next = NULL;
 
-	XLogInsert(RM_XACT_ID, XLOG_XACT_DISTRIBUTED_FORGET | XLOG_NO_TRAN, rdata);
+	XLogInsert(RM_XACT_ID, XLOG_XACT_DISTRIBUTED_FORGET, rdata);
 }
 
 /*
@@ -1359,49 +1507,79 @@ static void
 AtSubCommit_childXids(void)
 {
 	TransactionState s = CurrentTransactionState;
-	MemoryContext old_cxt;
+	int			new_nChildXids;
 
 	Assert(s->parent != NULL);
 
 	/*
-	 * We keep the child-XID lists in TopTransactionContext; this avoids
-	 * setting up child-transaction contexts for what might be just a few
-	 * bytes of grandchild XIDs.
+	 * The parent childXids array will need to hold my XID and all my
+	 * childXids, in addition to the XIDs already there.
 	 */
-	old_cxt = MemoryContextSwitchTo(TopTransactionContext);
+	new_nChildXids = s->parent->nChildXids + s->nChildXids + 1;
 
-	/*
-	 * The childXids is maintained in decreasing order. This is to
-	 * enable collection of subtransaction ids in decreasing order
-	 * for efficiency. See GetAddedSubtransactionsFromTree().
-	 * parent->childXids, if not NULL, has xids that precede s->childXids.
-	 */
-
-#ifdef USE_ASSERT_CHECKING
-	if (s->childXids && list_length(s->childXids))
+	/* Allocate or enlarge the parent array if necessary */
+	if (s->parent->maxChildXids < new_nChildXids)
 	{
-		Assert(TransactionIdPrecedes(s->transactionId, llast_oid(s->childXids)));
-	}
-#endif
-	List *new_childXids = lappend_xid(s->childXids,
-                                s->transactionId);
+		int				new_maxChildXids;
+		TransactionId  *new_childXids;
 
-	if (s->parent->childXids != NIL)
-	{
-		Assert(TransactionIdPrecedes(linitial_oid(s->parent->childXids), llast_oid(new_childXids)));
+		/*
+		 * Make it 2x what's needed right now, to avoid having to enlarge it
+		 * repeatedly. But we can't go above MaxAllocSize.  (The latter
+		 * limit is what ensures that we don't need to worry about integer
+		 * overflow here or in the calculation of new_nChildXids.)
+		 */
+		new_maxChildXids = Min(new_nChildXids * 2,
+							   (int) (MaxAllocSize / sizeof(TransactionId)));
 
-		new_childXids = list_concat(new_childXids,
-				  s->parent->childXids);
+		if (new_maxChildXids < new_nChildXids)
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("maximum number of committed subtransactions (%d) exceeded",
+							(int) (MaxAllocSize / sizeof(TransactionId)))));
 
 		/*
-		 * list_concat doesn't free the list header for the second list; do so
-		 * here to avoid memory leakage (kluge)
+		 * We keep the child-XID arrays in TopTransactionContext; this avoids
+		 * setting up child-transaction contexts for what might be just a few
+		 * bytes of grandchild XIDs.
 		 */
-		pfree(s->parent->childXids);
+		if (s->parent->childXids == NULL)
+			new_childXids =
+				MemoryContextAlloc(TopTransactionContext, 
+								   new_maxChildXids * sizeof(TransactionId));
+		else
+			new_childXids = repalloc(s->parent->childXids, 
+									 new_maxChildXids * sizeof(TransactionId));
+
+		s->parent->childXids  = new_childXids;
+		s->parent->maxChildXids = new_maxChildXids;
 	}
-	s->parent->childXids = new_childXids;
-	s->childXids = NIL;
-	MemoryContextSwitchTo(old_cxt);
+
+	/*
+	 * Copy all my XIDs to parent's array.
+	 *
+	 * Note: We rely on the fact that the XID of a child always follows that
+	 * of its parent.  By copying the XID of this subtransaction before the
+	 * XIDs of its children, we ensure that the array stays ordered.  Likewise,
+	 * all XIDs already in the array belong to subtransactions started and
+	 * subcommitted before us, so their XIDs must precede ours.
+	 */
+	s->parent->childXids[s->parent->nChildXids] = s->transactionId;
+
+	if (s->nChildXids > 0)
+		memcpy(&s->parent->childXids[s->parent->nChildXids + 1],
+			   s->childXids,
+			   s->nChildXids * sizeof(TransactionId));
+
+	s->parent->nChildXids = new_nChildXids;
+
+	/* Release child's array to avoid leakage */
+	if (s->childXids != NULL)
+		pfree(s->childXids);
+	/* We must reset these to avoid double-free if fail later in commit */
+	s->childXids = NULL;
+	s->nChildXids = 0;
+	s->maxChildXids = 0;
 }
 
 /*
@@ -1410,23 +1588,20 @@ AtSubCommit_childXids(void)
 static void
 RecordSubTransactionCommit(void)
 {
+	TransactionId xid = GetCurrentTransactionIdIfAny();
+
 	/*
 	 * We do not log the subcommit in XLOG; it doesn't matter until the
 	 * top-level transaction commits.
 	 *
-	 * We must mark the subtransaction subcommitted in clog if its XID appears
-	 * either in permanent rels or in local temporary rels. We test this by
-	 * seeing if we made transaction-controlled entries *OR* local-rel tuple
-	 * updates.  (The test here actually covers the entire transaction tree so
-	 * far, so it may mark subtransactions that don't really need it, but it's
-	 * probably not worth being tenser. Note that if a prior subtransaction
-	 * dirtied these variables, then RecordTransactionCommit will have to do
-	 * the full pushup anyway...)
+	 * We must mark the subtransaction subcommitted in the CLOG if it had a
+	 * valid XID assigned.	If it did not, nobody else will ever know about
+	 * the existence of this subxact.  We don't have to deal with deletions
+	 * scheduled for on-commit here, since they'll be reassigned to our parent
+	 * (who might still abort).
 	 */
-	if (MyLastRecPtr.xrecoff != 0 || MyXactMadeTempRelUpdate)
+	if (TransactionIdIsValid(xid))
 	{
-		TransactionId xid = GetCurrentTransactionId();
-
 		/* XXX does this really need to be a critical section? */
 		START_CRIT_SECTION();
 
@@ -1491,10 +1666,15 @@ RecordSubTransactionCommit(void)
 
 /*
  *	RecordTransactionAbort
+ *
+ * Returns latest XID among xact and its children, or InvalidTransactionId
+ * if the xact has no XID.	(We compute that here just because it's easier.)
  */
-static void
-RecordTransactionAbort(void)
+static TransactionId
+RecordTransactionAbort(bool isSubXact)
 {
+	TransactionId xid;
+	TransactionId latestXid;
 	int32						persistentAbortSerializeLen;
 	PersistentEndXactRecObjects persistentAbortObjects;
 	int16						persistentAbortObjectCount;
@@ -1502,6 +1682,24 @@ RecordTransactionAbort(void)
 
 	int			nchildren;
 	TransactionId *children;
+	XLogRecData rdata[3];
+	int			lastrdata = 0;
+	xl_xact_abort xlrec;
+	bool		isQEReader;
+
+	/* Like in CommitTransaction(), treat a QE reader as if there was no XID */
+	isQEReader = (DistributedTransactionContext == DTX_CONTEXT_QE_READER ||
+					DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON);
+	/*
+	 * Also, if an error occurred during distributed COMMIT processing, and
+	 * we had already decided that we are going to commit this transaction and
+	 * wrote a commit record for it, there's no turning back. The Distributed
+	 * Transaction Manager will take care of completing the transaction for us.
+	 */
+	if (isQEReader || getCurrentDtxState() == DTX_STATE_NOTIFYING_COMMIT_PREPARED)
+		xid = InvalidTransactionId;
+	else
+		xid = GetCurrentTransactionIdIfAny();
 
 	/* Get data needed for abort record */
 	persistentAbortSerializeLen =
@@ -1513,127 +1711,131 @@ RecordTransactionAbort(void)
 	nchildren = xactGetCommittedChildren(&children);
 
 	/*
-	 * If we made neither any transaction-controlled XLOG entries nor any
-	 * temp-rel updates, and are not going to delete any files, we can omit
-	 * recording the transaction abort at all.	No one will ever care that it
-	 * aborted.  (These tests cover our whole transaction tree.)
+	 * If we haven't been assigned an XID, nobody will care whether we aborted
+	 * or not.	Hence, we're done in that case.  It does not matter if we have
+	 * rels to delete (note that this routine is not responsible for actually
+	 * deleting 'em).  We cannot have any child XIDs, either.
 	 */
 	SetCurrentTransactionStopTimestamp();
-	if (MyLastRecPtr.xrecoff != 0 || MyXactMadeTempRelUpdate ||
-		persistentAbortObjectCount > 0)
+	if (!TransactionIdIsValid(xid))
 	{
-		TransactionId xid = GetCurrentTransactionId();
+		/* Reset XactLastRecEnd until the next transaction writes something */
+		if (!isSubXact)
+			XactLastRecEnd.xrecoff = 0;
+		return InvalidTransactionId;
+	}
 
-		/*
-		 * Catch the scenario where we aborted partway through
-		 * RecordTransactionCommit ...
-		 */
-		if (TransactionIdDidCommit(xid))
-			elog(PANIC, "cannot abort transaction %u, it was already committed", xid);
+	/*
+	 * We have a valid XID, so we should write an ABORT record for it.
+	 *
+	 * We do not flush XLOG to disk here, since the default assumption after a
+	 * crash would be that we aborted, anyway.	For the same reason, we don't
+	 * need to worry about interlocking against checkpoint start.
+	 */
 
-		START_CRIT_SECTION();
+	/*
+	 * Check that we haven't aborted halfway through RecordTransactionCommit.
+	 */
+	if (TransactionIdDidCommit(xid))
+		elog(PANIC, "cannot abort transaction %u, it was already committed",
+			 xid);
 
-		/*
-		 * We only need to log the abort in XLOG if the transaction made any
-		 * transaction-controlled XLOG entries or will delete files. (If it
-		 * made no transaction-controlled XLOG entries, its XID appears
-		 * nowhere in permanent storage, so no one else will ever care if it
-		 * committed.)
-		 *
-		 * We do not flush XLOG to disk unless deleting files, since the
-		 * default assumption after a crash would be that we aborted, anyway.
-		 * For the same reason, we don't need to worry about interlocking
-		 * against checkpoint start.
-		 */
-		if (MyLastRecPtr.xrecoff != 0 || persistentAbortObjectCount > 0)
-		{
-			XLogRecData rdata[3];
-			int			lastrdata = 0;
-			xl_xact_abort xlrec;
-			XLogRecPtr	recptr;
-
-			xlrec.xtime = time(NULL);
-			/* Write the ABORT record */
-			xlrec.persistentAbortObjectCount = persistentAbortObjectCount;
-			xlrec.nsubxacts = nchildren;
-			rdata[0].data = (char *) (&xlrec);
-			rdata[0].len = MinSizeOfXactAbort;
-			rdata[0].buffer = InvalidBuffer;
-			/* dump persistent abort objects */
-			if (persistentAbortObjectCount > 0)
-			{
-				int16 objectCount;
+	/* XXX do we really need a critical section here? */
+	START_CRIT_SECTION();
 
-				Assert(persistentAbortSerializeLen > 0);
-				persistentAbortBuffer =
-							(char *) palloc(persistentAbortSerializeLen);
+	/* Write the ABORT record */
+	if (isSubXact)
+		xlrec.xact_time = GetCurrentTimestamp();
+	else
+	{
+		SetCurrentTransactionStopTimestamp();
+		xlrec.xact_time = xactStopTimestamp;
+	}
+	xlrec.persistentAbortObjectCount = persistentAbortObjectCount;
+	xlrec.nsubxacts = nchildren;
+	rdata[0].data = (char *) (&xlrec);
+	rdata[0].len = MinSizeOfXactAbort;
+	rdata[0].buffer = InvalidBuffer;
+	/* dump persistent abort objects */
+	if (persistentAbortObjectCount > 0)
+	{
+		int16		objectCount;
 
-				PersistentEndXactRec_Serialize(
-										&persistentAbortObjects,
-										EndXactRecKind_Abort,
-										&objectCount,
-										(uint8*)persistentAbortBuffer,
-										persistentAbortSerializeLen);
-
-				if (Debug_persistent_print)
-					PersistentEndXactRec_Print("RecordTransactionAbort", &persistentAbortObjects);
-
-				rdata[0].next = &(rdata[1]);
-				rdata[1].data = persistentAbortBuffer;
-				rdata[1].len = persistentAbortSerializeLen;
-				rdata[1].buffer = InvalidBuffer;
-				lastrdata = 1;
-			}
-			/* dump committed child Xids */
-			if (nchildren > 0)
-			{
-				rdata[lastrdata].next = &(rdata[2]);
-				rdata[2].data = (char *) children;
-				rdata[2].len = nchildren * sizeof(TransactionId);
-				rdata[2].buffer = InvalidBuffer;
-				lastrdata = 2;
-			}
-			rdata[lastrdata].next = NULL;
+		Assert(persistentAbortSerializeLen > 0);
+		persistentAbortBuffer =
+			(char *) palloc(persistentAbortSerializeLen);
 
-			recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_ABORT, rdata);
+		PersistentEndXactRec_Serialize(
+			&persistentAbortObjects,
+			EndXactRecKind_Abort,
+			&objectCount,
+			(uint8*)persistentAbortBuffer,
+			persistentAbortSerializeLen);
 
-			/* Must flush if we are deleting files... */
-			if (persistentAbortObjectCount > 0)
-				XLogFlush(recptr);
+		if (Debug_persistent_print)
+			PersistentEndXactRec_Print("RecordTransactionAbort", &persistentAbortObjects);
 
-			if (max_wal_senders > 0)
-				WalSndWakeup();
+		rdata[0].next = &(rdata[1]);
+		rdata[1].data = persistentAbortBuffer;
+		rdata[1].len = persistentAbortSerializeLen;
+		rdata[1].buffer = InvalidBuffer;
+		lastrdata = 1;
+	}
+	/* dump committed child Xids */
+	if (nchildren > 0)
+	{
+		rdata[lastrdata].next = &(rdata[2]);
+		rdata[2].data = (char *) children;
+		rdata[2].len = nchildren * sizeof(TransactionId);
+		rdata[2].buffer = InvalidBuffer;
+		lastrdata = 2;
+	}
+	rdata[lastrdata].next = NULL;
 
-		}
+	(void) XLogInsert(RM_XACT_ID, XLOG_XACT_ABORT, rdata);
 
-		/*
-		 * Mark the transaction aborted in clog.  This is not absolutely
-		 * necessary but we may as well do it while we are here.
-		 *
-		 * The ordering here isn't critical but it seems best to mark the
-		 * parent first.  This assures an atomic transition of all the
-		 * subtransactions to aborted state from the point of view of
-		 * concurrent TransactionIdDidAbort calls.
-		 */
-		TransactionIdAbort(xid);
-		TransactionIdAbortTree(nchildren, children);
+	/*
+	 * Mark the transaction aborted in clog.  This is not absolutely necessary
+	 * but we may as well do it while we are here; also, in the subxact case
+	 * it is helpful because XactLockTableWait makes use of it to avoid
+	 * waiting for already-aborted subtransactions.  It is OK to do it without
+	 * having flushed the ABORT record to disk, because in event of a crash
+	 * we'd be assumed to have aborted anyway.
+	 *
+	 * The ordering here isn't critical but it seems best to mark the parent
+	 * first.  This assures an atomic transition of all the subtransactions to
+	 * aborted state from the point of view of concurrent
+	 * TransactionIdDidAbort calls.
+	 */
+	TransactionIdAbort(xid);
+	TransactionIdAbortTree(nchildren, children);
 
-		END_CRIT_SECTION();
-	}
+	END_CRIT_SECTION();
 
-	/* Break the chain of back-links in the XLOG records I output */
-	MyLastRecPtr.xrecoff = 0;
-	MyXactMadeXLogEntry = false;
-	MyXactMadeTempRelUpdate = false;
+	/* Compute latestXid while we have the child XIDs handy */
+	latestXid = TransactionIdLatest(xid, nchildren, children);
 
-	/* And clean up local data */
+	/*
+	 * If we're aborting a subtransaction, we can immediately remove failed
+	 * XIDs from PGPROC's cache of running child XIDs.  We do that here for
+	 * subxacts, because we already have the child XID array at hand.  For
+	 * main xacts, the equivalent happens just after this function returns.
+	 */
+	if (isSubXact && isQEReader)
+		XidCacheRemoveRunningXids(xid, nchildren, children, latestXid);
 
-	// UNDONE: Free storage in persistentAbortObjects...
+	/* Reset XactLastRecEnd until the next transaction writes something */
+	if (!isSubXact)
+		XactLastRecEnd.xrecoff = 0;
 
+	if (max_wal_senders > 0)
+		WalSndWakeup();
+
+	/* And clean up local data */
 	if (persistentAbortBuffer != 0)
 		pfree(persistentAbortBuffer);
-	if (children)
-		pfree(children);
+
+	return latestXid;
 }
 
 
@@ -1773,9 +1975,9 @@ static void
 AtAbort_Memory(void)
 {
 	/*
-	 * Switch into TransactionAbortContext, which should have some free
-	 * space even if nothing else does.  We'll work in this context until
-	 * we've finished cleaning up.
+	 * Switch into TransactionAbortContext, which should have some free space
+	 * even if nothing else does.  We'll work in this context until we've
+	 * finished cleaning up.
 	 *
 	 * It is barely possible to get here when we've not been able to create
 	 * TransactionAbortContext yet; if so use TopMemoryContext.
@@ -1784,191 +1986,64 @@ AtAbort_Memory(void)
 		MemoryContextSwitchTo(TransactionAbortContext);
 	else
 		MemoryContextSwitchTo(TopMemoryContext);
-}
-
-/*
- * AtSubAbort_Memory
- */
-static void
-AtSubAbort_Memory(void)
-{
-	Assert(TransactionAbortContext != NULL);
-
-	MemoryContextSwitchTo(TransactionAbortContext);
-}
-
-
-/*
- *	AtAbort_ResourceOwner
- */
-static void
-AtAbort_ResourceOwner(void)
-{
-	/*
-	 * Make sure we have a valid ResourceOwner, if possible (else it will be
-	 * NULL, which is OK)
-	 */
-	CurrentResourceOwner = TopTransactionResourceOwner;
-}
-
-/*
- * AtSubAbort_ResourceOwner
- */
-static void
-AtSubAbort_ResourceOwner(void)
-{
-	TransactionState s = CurrentTransactionState;
-
-	/* Make sure we have a valid ResourceOwner */
-	CurrentResourceOwner = s->curTransactionOwner;
-}
-
-
-/*
- * AtSubAbort_childXids
- */
-static void
-AtSubAbort_childXids(void)
-{
-	TransactionState s = CurrentTransactionState;
-
-	/*
-	 * We keep the child-XID lists in TopTransactionContext (see
-	 * AtSubCommit_childXids).	This means we'd better free the list
-	 * explicitly at abort to avoid leakage.
-	 */
-	list_free(s->childXids);
-	s->childXids = NIL;
-}
-
-/*
- * RecordSubTransactionAbort
- */
-static void
-RecordSubTransactionAbort(void)
-{
-	int32						persistentAbortSerializeLen;
-	PersistentEndXactRecObjects persistentAbortObjects;
-	int16						persistentAbortObjectCount;
-	char						*persistentAbortBuffer = NULL;
-
-	TransactionId xid = GetCurrentTransactionId();
-	int			nchildren;
-	TransactionId *children;
-
-	/* Get data needed for abort record */
-	persistentAbortSerializeLen =
-			PersistentEndXactRec_FetchObjectsFromSmgr(
-										&persistentAbortObjects,
-										EndXactRecKind_Abort,
-										&persistentAbortObjectCount);
-
-	nchildren = xactGetCommittedChildren(&children);
-
-	/*
-	 * If we made neither any transaction-controlled XLOG entries nor any
-	 * temp-rel updates, and are not going to delete any files, we can omit
-	 * recording the transaction abort at all.	No one will ever care that it
-	 * aborted.  (These tests cover our whole transaction tree, and therefore
-	 * may mark subxacts that don't really need it, but it's probably not
-	 * worth being tenser.)
-	 *
-	 * In this case we needn't worry about marking subcommitted children as
-	 * aborted, because they didn't mark themselves as subcommitted in the
-	 * first place; see the optimization in RecordSubTransactionCommit.
-	 */
-	if (MyLastRecPtr.xrecoff != 0 || MyXactMadeTempRelUpdate ||
-		persistentAbortObjectCount > 0)
-	{
-		START_CRIT_SECTION();
-
-		/*
-		 * We only need to log the abort in XLOG if the transaction made any
-		 * transaction-controlled XLOG entries or will delete files.
-		 */
-		if (MyLastRecPtr.xrecoff != 0 || persistentAbortObjectCount > 0)
-		{
-			XLogRecData rdata[3];
-			int			lastrdata = 0;
-			xl_xact_abort xlrec;
-			XLogRecPtr	recptr;
-
-			xlrec.xtime = time(NULL);
-			xlrec.persistentAbortObjectCount = persistentAbortObjectCount;
-			xlrec.nsubxacts = nchildren;
-			rdata[0].data = (char *) (&xlrec);
-			rdata[0].len = MinSizeOfXactAbort;
-			rdata[0].buffer = InvalidBuffer;
-			/* dump persistent abort objects */
-			if (persistentAbortObjectCount > 0)
-			{
-				int16 objectCount;
-
-				Assert(persistentAbortSerializeLen > 0);
-				persistentAbortBuffer =
-							(char*)palloc(persistentAbortSerializeLen);
-
-				PersistentEndXactRec_Serialize(
-										&persistentAbortObjects,
-										EndXactRecKind_Abort,
-										&objectCount,
-										(uint8*)persistentAbortBuffer,
-										persistentAbortSerializeLen);
-
-				if (Debug_persistent_print)
-					PersistentEndXactRec_Print("RecordSubTransactionAbort", &persistentAbortObjects);
-
-				rdata[0].next = &(rdata[1]);
-				rdata[1].data = persistentAbortBuffer;
-				rdata[1].len = persistentAbortSerializeLen;
-				rdata[1].buffer = InvalidBuffer;
-				lastrdata = 1;
-			}
-			/* dump committed child Xids */
-			if (nchildren > 0)
-			{
-				rdata[lastrdata].next = &(rdata[2]);
-				rdata[2].data = (char *) children;
-				rdata[2].len = nchildren * sizeof(TransactionId);
-				rdata[2].buffer = InvalidBuffer;
-				lastrdata = 2;
-			}
-			rdata[lastrdata].next = NULL;
-
-			recptr = XLogInsert(RM_XACT_ID, XLOG_XACT_ABORT, rdata);
+}
 
-			/* Must flush if we are deleting files... */
-			if (persistentAbortObjectCount > 0)
-				XLogFlush(recptr);
-		}
+/*
+ * AtSubAbort_Memory
+ */
+static void
+AtSubAbort_Memory(void)
+{
+	Assert(TransactionAbortContext != NULL);
 
-		/*
-		 * Mark the transaction aborted in clog.  This is not absolutely
-		 * necessary but XactLockTableWait makes use of it to avoid waiting
-		 * for already-aborted subtransactions.
-		 */
-		TransactionIdAbort(xid);
-		TransactionIdAbortTree(nchildren, children);
+	MemoryContextSwitchTo(TransactionAbortContext);
+}
 
-		END_CRIT_SECTION();
-	}
 
+/*
+ *	AtAbort_ResourceOwner
+ */
+static void
+AtAbort_ResourceOwner(void)
+{
 	/*
-	 * We can immediately remove failed XIDs from PGPROC's cache of running
-	 * child XIDs. It's easiest to do it here while we have the child XID
-	 * array at hand, even though in the main-transaction case the equivalent
-	 * work happens just after return from RecordTransactionAbort.
+	 * Make sure we have a valid ResourceOwner, if possible (else it will be
+	 * NULL, which is OK)
 	 */
-	XidCacheRemoveRunningXids(xid, nchildren, children);
+	CurrentResourceOwner = TopTransactionResourceOwner;
+}
 
-	/* And clean up local data */
+/*
+ * AtSubAbort_ResourceOwner
+ */
+static void
+AtSubAbort_ResourceOwner(void)
+{
+	TransactionState s = CurrentTransactionState;
 
-	// UNDONE: Free storage in persistentAbortObjects...
+	/* Make sure we have a valid ResourceOwner */
+	CurrentResourceOwner = s->curTransactionOwner;
+}
 
-	if (persistentAbortBuffer != 0)
-		pfree(persistentAbortBuffer);
-	if (children)
-		pfree(children);
+
+/*
+ * AtSubAbort_childXids
+ */
+static void
+AtSubAbort_childXids(void)
+{
+	TransactionState s = CurrentTransactionState;
+
+	/*
+	 * We keep the child-XID arrays in TopTransactionContext (see
+	 * AtSubCommit_childXids).	This means we'd better free the array
+	 * explicitly at abort to avoid leakage.
+	 */
+	if (s->childXids != NULL)
+		pfree(s->childXids);
+	s->childXids = NULL;
+	s->nChildXids = 0;
+	s->maxChildXids = 0;
 }
 
 /* ----------------------------------------------------------------
@@ -2105,6 +2180,13 @@ SetSharedTransactionId_reader(TransactionId xid, CommandId cid)
 	Assert(DistributedTransactionContext == DTX_CONTEXT_QE_READER ||
 		   DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON);
 
+	/*
+	 * GPDB_83_MERGE_FIXME: I don't understand how the top-level XID
+	 * can ever be different here from what it was in StartTransaction().
+	 * And usually it isn't, but when I tried adding the below assertion, it was
+	 * tripped.
+	 */
+	//Assert(TopTransactionStateData.transactionId == xid);
 	TopTransactionStateData.transactionId = xid;
 	currentCommandId = cid;
 }
@@ -2365,7 +2447,7 @@ GetAddedSubtransactionsFromTree(TransactionId xid, TransactionState state,
 	 */
 	for (s = state; s != NULL; s = s->parent)
 	{
-		ListCell   *cell;
+		int			i;
 
 		/* it can't have any child XIDs too */
 		if (!TransactionIdIsValid(s->transactionId))
@@ -2374,40 +2456,32 @@ GetAddedSubtransactionsFromTree(TransactionId xid, TransactionState state,
 		/*
 		 * subcommitted child XIDs
 		 */
-		foreach(cell, s->childXids)
+		while (size < *subcnt + s->nChildXids + 1)
+		{
+			size *= 2;
+			*subxids = (TransactionId *) repalloc((*subxids),
+												  size * sizeof(TransactionId));
+		}
+		for (i = 0; i < s->nChildXids; i++)
 		{
+			TransactionId childXid = s->childXids[i];
+
 			Assert(*subcnt < size);
 			elog((Debug_print_full_dtm ? LOG : DEBUG5),
 			     "Adding subcommitted child xid %u as #%u to shared"
-			     " snapshot", lfirst_xid(cell), *subcnt);
+			     " snapshot", childXid, *subcnt);
 
-			if (TransactionIdPrecedesOrEquals(lfirst_xid(cell), xid))
-			{
+			if (TransactionIdPrecedesOrEquals(childXid, xid))
 				continue;
-			}
-			(*subxids)[(*subcnt)++] = lfirst_xid(cell);
-			if (*subcnt == size)
-			{
-				size *= 2;
-				*subxids = (TransactionId *)repalloc((*subxids),
-						size * sizeof(TransactionId));
-			}
-		}
 
-		/*
-		 * This means xid is equal to one of the childXids. We
-		 * are done and not look any further.
-		 */
-		if (cell != NULL)
-			break;
+			(*subxids)[(*subcnt)++] = childXid;
+		}
 
 		if (s->nestingLevel == 1)
 			break;
 
 		if (TransactionIdPrecedesOrEquals(s->transactionId, xid))
-		{
 			continue;
-		}
 
 		/*
 		 * Ignore aborted subtransactions.
@@ -2421,12 +2495,6 @@ GetAddedSubtransactionsFromTree(TransactionId xid, TransactionState state,
 		     " snapshot", s->transactionId, *subcnt);
 
 		(*subxids)[(*subcnt)++] = s->transactionId;
-		if (*subcnt == size)
-		{
-			size *= 2;
-			*subxids = (TransactionId *)repalloc((*subxids),
-					size * sizeof(TransactionId));
-		}
 	}
 
 	reverse_xids(*subxids, *subcnt);
@@ -2446,8 +2514,8 @@ GetLastSubTransactionIdFromTree(TransactionState s)
 		/*
 		 * subcommitted child XIDs
 		 */
-		if (s->childXids && list_length(s->childXids))
-			return linitial_oid(s->childXids);
+		if (s->childXids && s->nChildXids > 0)
+			return s->childXids[s->nChildXids - 1];
 		else if (s->nestingLevel >= 2)
 			return s->transactionId;
 	}
@@ -2824,6 +2892,7 @@ void
 StartTransaction(void)
 {
 	TransactionState s;
+	VirtualTransactionId vxid;
 
 	/*
 	 * Let's just make sure the state stack is empty
@@ -2851,6 +2920,8 @@ StartTransaction(void)
 	FreeXactSnapshot();
 	XactIsoLevel = DefaultXactIsoLevel;
 	XactReadOnly = DefaultXactReadOnly;
+	forceSyncCommit = false;
+	MyXactAccessedTempRel = false;
 	seqXlogWrite = false;
 
 	/* set read only by fts, if any fts action is read only */
@@ -2862,6 +2933,7 @@ StartTransaction(void)
 	s->subTransactionId = TopSubTransactionId;
 	currentSubTransactionId = TopSubTransactionId;
 	currentCommandId = FirstCommandId;
+	currentCommandIdUsed = false;
 	currentSavepointTotal = 0;
 
 	fastNodeCount = 0;
@@ -2898,15 +2970,7 @@ StartTransaction(void)
 			 * transaction without any synchronization to segmates!
 			 * (e.g. CatchupInterruptHandler)
 			 */
-
-			/*
-			 * generate a new transaction id
-			 */
-			s->transactionId = GetNewTransactionId(false, true);
-
-			XactLockTableInsert(s->transactionId);
-			
-			PG_TRACE1(transaction__start, s->transactionId);
+			PG_TRACE1(transaction__start, InvalidTransactionId);
 
 			/*
 		 	 * set transaction_timestamp() (a/k/a now()).  We want this to be the
@@ -3131,6 +3195,13 @@ StartTransaction(void)
 						 xactStartTimestamp,
 						 SharedLocalSnapshotSlot->startTimestamp);
 
+					/*
+					 * We set TopTransactionStateData.transactionId to the same top-level
+					 * XID as the QE writer, so that visibility checks consider that
+					 * XID as "current transaction". But we don't advertise it in the
+					 * proc array, nor write a commit record for it, as the QE writer will
+					 * do that.
+					 */
 					s->transactionId = SharedLocalSnapshotSlot->xid;
 					xactStartTimestamp = SharedLocalSnapshotSlot->startTimestamp;
 					xactStopTimestamp = 0;
@@ -3211,6 +3282,37 @@ StartTransaction(void)
 		 s->transactionId,
 		 DtxContextToString(DistributedTransactionContext));
 
+	/*
+	 * Assign a new LocalTransactionId, and combine it with the backendId to
+	 * form a virtual transaction id.
+	 */
+	vxid.backendId = MyBackendId;
+	vxid.localTransactionId = GetNextLocalTransactionId();
+
+	/*
+	 * Lock the virtual transaction id before we announce it in the proc array
+	 */
+	VirtualXactLockTableInsert(vxid);
+
+	/*
+	 * Advertise it in the proc array.	We assume assignment of
+	 * LocalTransactionID is atomic, and the backendId should be set already.
+	 */
+	Assert(MyProc->backendId == vxid.backendId);
+	MyProc->lxid = vxid.localTransactionId;
+
+	PG_TRACE1(transaction__start, vxid.localTransactionId);
+
+	/*
+	 * set transaction_timestamp() (a/k/a now()).  We want this to be the same
+	 * as the first command's statement_timestamp(), so don't do a fresh
+	 * GetCurrentTimestamp() call (which'd be expensive anyway).  Also, mark
+	 * xactStopTimestamp as unset.
+	 */
+	xactStartTimestamp = stmtStartTimestamp;
+	xactStopTimestamp = 0;
+	pgstat_report_xact_timestamp(xactStartTimestamp);
+
 	/*
 	 * initialize current transaction state fields
 	 *
@@ -3218,7 +3320,9 @@ StartTransaction(void)
 	 */
 	s->nestingLevel = 1;
 	s->gucNestLevel = 1;
-	s->childXids = NIL;
+	s->childXids = NULL;
+	s->nChildXids = 0;
+	s->maxChildXids = 0;
 	GetUserIdAndSecContext(&s->prevUser, &s->prevSecContext);
 	/* SecurityRestrictionContext should never be set outside a transaction */
 	Assert(s->prevSecContext == 0);
@@ -3245,25 +3349,6 @@ StartTransaction(void)
  	     LocalDistribXact_DisplayString(&MyProc->localDistribXactRef));
 }
 
-/*
- * Clears the current transaction from PGPROC.
- *
- * Must be called while holding the ProcArrayLock.
- */
-void
-ClearTransactionFromPgProc_UnderLock(void)
-{
-	MyProc->xid = InvalidTransactionId;
-	MyProc->xmin = InvalidTransactionId;
-	MyProc->inVacuum = false;		/* must be cleared with xid/xmin */
-	MyProc->serializableIsoLevel = false;
-	MyProc->inDropTransaction = false;
-
-	/* Clear the subtransaction-XID cache too while holding the lock */
-	MyProc->subxids.nxids = 0;
-	MyProc->subxids.overflowed = false;
-}
-
 /*
  *	CommitTransaction
  *
@@ -3274,11 +3359,10 @@ CommitTransaction(void)
 {
 	MIRRORED_LOCK_DECLARE;
 
-	CHECKPOINT_START_LOCK_DECLARE;
-
 	TransactionState s = CurrentTransactionState;
+	TransactionId latestXid;
 
-	TransactionId localXid = InvalidTransactionId;
+	TransactionId localXid;
 	LocalDistribXactRef localDistribXactRef;
 	bool needStateChangeFromDistributed = false;
 	bool needNotifyCommittedDtxTransaction = false;
@@ -3329,6 +3413,8 @@ CommitTransaction(void)
 	/* Close any open regular cursors */
 	AtCommit_Portals();
 
+	AtEOXact_SharedSnapshot();
+
 	/* Perform any Resource Scheduler commit procesing. */
 	if (Gp_role == GP_ROLE_DISPATCH && ResourceScheduler)
 		AtCommit_ResScheduler();
@@ -3398,11 +3484,12 @@ CommitTransaction(void)
 		 * When we use CheckpointStartLock, we make sure we already have the
 		 * MirroredLock first.
 		 *
-		 * The lock order is: MirroredLock then CheckpointStartLock.
+		 * GPDB_83_MERGE_FIXME: we no longer need to worry about deadlock between
+		 * CheckpointStartLock and MirroredLock, as CheckpointStartLock is no longer
+		 * a lwlock but just a flag,  MyProc->inCommit. Do we still need to grab
+		 * MirroredLock?
 		 */
 		MIRRORED_LOCK;
-			
-		CHECKPOINT_START_LOCK;
 	}
 
 	/* Prevent cancel/die interrupt while cleaning up */
@@ -3415,96 +3502,40 @@ CommitTransaction(void)
 	s->state = TRANS_COMMIT;
 
 	/*
-	 * Here is where we really truly commit.
-	 */
-	RecordTransactionCommit();
-
-	/*----------
-	 * Let others know about no transaction in progress by me. Note that
-	 * this must be done _before_ releasing locks we hold and _after_
-	 * RecordTransactionCommit.
-	 *
-	 * LWLockAcquire(ProcArrayLock) is required; consider this example:
-	 *		UPDATE with xid 0 is blocked by xid 1's UPDATE.
-	 *		xid 1 is doing commit while xid 2 gets snapshot.
-	 * If xid 2's GetSnapshotData sees xid 1 as running then it must see
-	 * xid 0 as running as well, or it will be able to see two tuple versions
-	 * - one deleted by xid 1 and one inserted by xid 0.  See notes in
-	 * GetSnapshotData.
-	 *
-	 * Note: MyProc may be null during bootstrap.
-	 *----------
+	 * If we're a QE reader, we share the same top-level as the QE writer, but we
+	 * should't write a commit record because the QE writer will do that. We also
+	 * haven't advertised that XID in the proc array, so we don't need to clean
+	 * that up here either.
 	 */
-	if (MyProc != NULL)
+	if (DistributedTransactionContext == DTX_CONTEXT_QE_READER ||
+		DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON)
 	{
-		/* Lock ProcArrayLock because that's what GetSnapshotData uses. */
-
-		// UNDONE: Move lock up over RecordTransactionCommit ??
-		
-		LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
-
-		if (!LocalDistribXactRef_IsNil(&MyProc->localDistribXactRef))
-		{
-			switch (DistributedTransactionContext)
-			{
-				case DTX_CONTEXT_QD_DISTRIBUTED_CAPABLE:
-					LocalDistribXact_ChangeStateUnderLock(
-						MyProc->xid,
-						&MyProc->localDistribXactRef,
-						LOCALDISTRIBXACT_STATE_COMMITDELIVERY);
-					needStateChangeFromDistributed = true;
-					break;
-				
-				case DTX_CONTEXT_QE_TWO_PHASE_EXPLICIT_WRITER:
-				case DTX_CONTEXT_QE_TWO_PHASE_IMPLICIT_WRITER:
-				case DTX_CONTEXT_QE_AUTO_COMMIT_IMPLICIT:
-					LocalDistribXact_ChangeStateUnderLock(
-						MyProc->xid,
-						&MyProc->localDistribXactRef,
-						LOCALDISTRIBXACT_STATE_COMMITTED);
-					break;
-				
-				case DTX_CONTEXT_QE_READER:
-				case DTX_CONTEXT_QE_ENTRY_DB_SINGLETON:
-					// QD or QE Writer will handle it.
-					break;
-
-				case DTX_CONTEXT_QD_RETRY_PHASE_2:
-				case DTX_CONTEXT_QE_PREPARED:
-				case DTX_CONTEXT_QE_FINISH_PREPARED:
-					elog(PANIC, "Unexpected distribute transaction context: '%s'",
-						 DtxContextToString(DistributedTransactionContext));
-
-				default:
-					elog(PANIC, "Unrecognized DTX transaction context: %d",
-						 (int) DistributedTransactionContext);
-			}
-
-			/*
-			 * We need to transfer the xid and disributed ref
-			 * for processing below.
-			 */
-			localXid = MyProc->xid;
-			LocalDistribXactRef_Transfer(
-				&localDistribXactRef,
-				&MyProc->localDistribXactRef);
-		}
-
-		
-		if (!notifyCommittedDtxTransactionIsNeeded())
-		{
-			ClearTransactionFromPgProc_UnderLock();
-		}
-		else
-		{
-			needNotifyCommittedDtxTransaction = true;
-		}
-
-		LWLockRelease(ProcArrayLock);
+		localXid = InvalidTransactionId;
 	}
+	else
+		localXid = GetTopTransactionIdIfAny();
+
+	/*
+	 * Here is where we really truly commit.
+	 */
+	latestXid = RecordTransactionCommit();
 
-	PG_TRACE1(transaction__commit, s->transactionId);
+	PG_TRACE1(transaction__commit, MyProc->lxid);
 
+	/*
+	 * Let others know about no transaction in progress by me. Note that this
+	 * must be done _before_ releasing locks we hold and _after_
+	 * RecordTransactionCommit.
+	 */
+	ProcArrayEndTransaction(MyProc, latestXid,
+							true,
+							&needStateChangeFromDistributed,
+							&needNotifyCommittedDtxTransaction,
+							&localDistribXactRef);
+	/*
+	 * Note that in GPDB, ProcArrayEndTransaction does *not* clear the PGPROC
+	 * entry, if it sets *needNotifyCommittedDtxTransaction!
+	 */
 	if (needNotifyCommittedDtxTransaction)
 	{
 		/*
@@ -3577,8 +3608,6 @@ CommitTransaction(void)
 
 	if (willHaveObjectsFromSmgr)
 	{
-		CHECKPOINT_START_UNLOCK;
-		
 		MIRRORED_UNLOCK;
 	}
 	
@@ -3605,7 +3634,6 @@ CommitTransaction(void)
 	AtEOXact_ComboCid();
 	AtEOXact_HashTables(true);
 	AtEOXact_PgStat(true);
-	//AtEOXact_Snapshot(true);
 	pgstat_report_xact_timestamp(0);
 
 	CurrentResourceOwner = NULL;
@@ -3646,7 +3674,9 @@ CommitTransaction(void)
 	s->subTransactionId = InvalidSubTransactionId;
 	s->nestingLevel = 0;
 	s->gucNestLevel = 0;
-	s->childXids = NIL;
+	s->childXids = NULL;
+	s->nChildXids = 0;
+	s->maxChildXids = 0;
 	s->executorSaysXactDoesWrites = false;
 
 	/*
@@ -3717,6 +3747,8 @@ PrepareTransaction(void)
 	/* Close any open regular cursors */
 	AtCommit_Portals();
 
+	AtEOXact_SharedSnapshot();
+
 	/*
 	 * Let ON COMMIT management do its thing (must happen after closing
 	 * cursors, to avoid dangling-reference problems)
@@ -3728,6 +3760,29 @@ PrepareTransaction(void)
 
 	/* NOTIFY and flatfiles will be handled below */
 
+	/*
+	 * Don't allow PREPARE TRANSACTION if we've accessed a temporary table
+	 * in this transaction.  Having the prepared xact hold locks on another
+	 * backend's temp table seems a bad idea --- for instance it would prevent
+	 * the backend from exiting.  There are other problems too, such as how
+	 * to clean up the source backend's local buffers and ON COMMIT state
+	 * if the prepared xact includes a DROP of a temp table.
+	 *
+	 * We must check this after executing any ON COMMIT actions, because
+	 * they might still access a temp relation.
+	 *
+	 * XXX In principle this could be relaxed to allow some useful special
+	 * cases, such as a temp table created and dropped all within the
+	 * transaction.  That seems to require much more bookkeeping though.
+	 */
+	/* In GPDB, we allow this, however. GPDB_83_MERGE_FIXME: Is it really safe? */
+#if 0
+	if (MyXactAccessedTempRel)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot PREPARE a transaction that has operated on temporary tables")));
+#endif
+
 	/* Prevent cancel/die interrupt while cleaning up */
 	HOLD_INTERRUPTS();
 
@@ -3782,6 +3837,7 @@ PrepareTransaction(void)
 	AtPrepare_Inval();
 	AtPrepare_Locks();
 	AtPrepare_PgStat();
+	AtPrepare_MultiXact();
 
 	/*
 	 * Here is where we really truly prepare.
@@ -3796,32 +3852,17 @@ PrepareTransaction(void)
 	 * Now we clean up backend-internal state and release internal resources.
 	 */
 
-	/* Break the chain of back-links in the XLOG records I output */
-	MyLastRecPtr.xrecoff = 0;
-	MyXactMadeXLogEntry = false;
-	MyXactMadeTempRelUpdate = false;
+	/* Reset XactLastRecEnd until the next transaction writes something */
+	XactLastRecEnd.xrecoff = 0;
 
 	/*
 	 * Let others know about no transaction in progress by me.	This has to be
 	 * done *after* the prepared transaction has been marked valid, else
 	 * someone may think it is unlocked and recyclable.
 	 */
-
-	/* Lock ProcArrayLock because that's what GetSnapshotData uses. */
 	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
-	MyProc->xid = InvalidTransactionId;
-
+	ClearTransactionFromPgProc_UnderLock(MyProc);
 	LocalDistribXactRef_ReleaseUnderLock(&MyProc->localDistribXactRef);
-	
-	MyProc->xmin = InvalidTransactionId;
-	MyProc->inVacuum = false;	/* must be cleared with xid/xmin */
-	MyProc->serializableIsoLevel = false;
-	MyProc->inDropTransaction = false;
-
-	/* Clear the subtransaction-XID cache too while holding the lock */
-	MyProc->subxids.nxids = 0;
-	MyProc->subxids.overflowed = false;
-
 	LWLockRelease(ProcArrayLock);
 
 	/*
@@ -3855,7 +3896,7 @@ PrepareTransaction(void)
 
 	PostPrepare_smgr();
 
-	AtEOXact_MultiXact();
+	PostPrepare_MultiXact(xid);
 
 	PostPrepare_Locks(xid);
 
@@ -3905,7 +3946,9 @@ PrepareTransaction(void)
 	s->subTransactionId = InvalidSubTransactionId;
 	s->nestingLevel = 0;
 	s->gucNestLevel = 0;
-	s->childXids = NIL;
+	s->childXids = NULL;
+	s->nChildXids = 0;
+	s->maxChildXids = 0;
 	s->executorSaysXactDoesWrites = false;
 
 	/*
@@ -3929,11 +3972,10 @@ AbortTransaction(void)
 {
 	MIRRORED_LOCK_DECLARE;
 
-	CHECKPOINT_START_LOCK_DECLARE;
-
 	TransactionState s = CurrentTransactionState;
+	TransactionId latestXid;
 
-	TransactionId localXid = InvalidTransactionId;
+	TransactionId localXid = GetTopTransactionIdIfAny();
 	LocalDistribXactRef localDistribXactRef;
 	bool needDistribAborted = false;
 	bool willHaveObjectsFromSmgr;
@@ -4017,6 +4059,8 @@ AbortTransaction(void)
 	 */
 	AtEOXact_ResetDataSourceCtx();
 
+	AtEOXact_SharedSnapshot();
+
 	/* Perform any Resource Scheduler abort procesing. */
 	if (Gp_role == GP_ROLE_DISPATCH && ResourceScheduler)
 		AtAbort_ResScheduler();
@@ -4041,19 +4085,27 @@ AbortTransaction(void)
 		 * When we use CheckpointStartLock, we make sure we already have the
 		 * MirroredLock first.
 		 *
-		 * The lock order is: MirroredLock then CheckpointStartLock.
+		 * GPDB_83_MERGE_FIXME: see comments in CommitTransaction()
 		 */
 		MIRRORED_LOCK;
-			
-		CHECKPOINT_START_LOCK;
 	}
 
+	/* Like in CommitTransaction(), treat a QE reader as if there was no XID */
+	if (DistributedTransactionContext == DTX_CONTEXT_QE_READER ||
+		DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON)
+	{
+		localXid = InvalidTransactionId;
+	}
+	else
+		localXid = GetTopTransactionIdIfAny();
+
 	/*
 	 * Advertise the fact that we aborted in pg_clog (assuming that we got as
 	 * far as assigning an XID to advertise).
 	 */
-	if (TransactionIdIsValid(s->transactionId))
-		RecordTransactionAbort();
+	latestXid = RecordTransactionAbort(false);
+
+	PG_TRACE1(transaction__abort, MyProc->lxid);
 
 	ResetXidBuffer(&subxbuf);
 	ResetSharedSnapshotSubxids(SharedLocalSnapshotSlot);
@@ -4063,75 +4115,10 @@ AbortTransaction(void)
 	 * must be done _before_ releasing locks we hold and _after_
 	 * RecordTransactionAbort.
 	 */
-	if (MyProc != NULL)
-	{
-		/* Lock ProcArrayLock because that's what GetSnapshotData uses. */
-
-		// UNDONE: Move lock up over RecordTransactionAbort ??
-		
-		LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
-
-		if (!LocalDistribXactRef_IsNil(&MyProc->localDistribXactRef))
-		{
-			switch (DistributedTransactionContext)
-			{
-				case DTX_CONTEXT_QD_DISTRIBUTED_CAPABLE:
-					LocalDistribXact_ChangeStateUnderLock(
-						MyProc->xid,
-						&MyProc->localDistribXactRef,
-						LOCALDISTRIBXACT_STATE_ABORTDELIVERY);
-					needDistribAborted = true;
-					break;
-				
-				case DTX_CONTEXT_QE_TWO_PHASE_EXPLICIT_WRITER:
-				case DTX_CONTEXT_QE_TWO_PHASE_IMPLICIT_WRITER:
-				case DTX_CONTEXT_QE_AUTO_COMMIT_IMPLICIT:
-					LocalDistribXact_ChangeStateUnderLock(
-						MyProc->xid,
-						&MyProc->localDistribXactRef,
-						LOCALDISTRIBXACT_STATE_ABORTED);
-					break;
-				
-				case DTX_CONTEXT_QE_READER:
-				case DTX_CONTEXT_QE_ENTRY_DB_SINGLETON:
-					// QD or QE Writer will handle it.
-					break;
-
-				case DTX_CONTEXT_QD_RETRY_PHASE_2:
-				case DTX_CONTEXT_QE_PREPARED:
-				case DTX_CONTEXT_QE_FINISH_PREPARED:
-					elog(PANIC, "Unexpected distribute transaction context: '%s'",
-						 DtxContextToString(DistributedTransactionContext));
-
-				default:
-					elog(PANIC, "Unrecognized DTX transaction context: %d",
-						 (int) DistributedTransactionContext);
-			}
-			
-			/*
-			 * We need to transfer the xid and disributed ref
-			 * for processing below.
-			 */
-			localXid = MyProc->xid;
-			LocalDistribXactRef_Transfer(
-				&localDistribXactRef,
-				&MyProc->localDistribXactRef);
-		}
-
-		MyProc->xid = InvalidTransactionId;
-		MyProc->xmin = InvalidTransactionId;
-		MyProc->inVacuum = false;		/* must be cleared with xid/xmin */
-		MyProc->serializableIsoLevel = false;
-		MyProc->inDropTransaction = false;
-
-		/* Clear the subtransaction-XID cache too while holding the lock */
-		MyProc->subxids.nxids = 0;
-		MyProc->subxids.overflowed = false;
-
-		LWLockRelease(ProcArrayLock);
-	}
-
-	PG_TRACE1(transaction__abort, s->transactionId);
+	ProcArrayEndTransaction(MyProc, latestXid, false,
+							NULL,
+							NULL,
+							&localDistribXactRef);
 
 	/*
 	 * Post-abort cleanup.	See notes in CommitTransaction() concerning
@@ -4153,8 +4140,6 @@ AbortTransaction(void)
 	}
 	if (willHaveObjectsFromSmgr)
 	{
-		CHECKPOINT_START_UNLOCK;
-
 		MIRRORED_UNLOCK;
 	}
 	if (TopTransactionResourceOwner != NULL)
@@ -4178,14 +4163,22 @@ AbortTransaction(void)
 		AtEOXact_ComboCid();
 		AtEOXact_HashTables(false);
 		AtEOXact_PgStat(false);
-		//AtEOXact_Snapshot(false);
 		pgstat_report_xact_timestamp(0);
 	}
 
 	/*
 	 * Do abort to all QE. NOTE: we don't process
 	 * signals to prevent recursion until we've notified the QEs.
+	 *
+	 * If something goes wrong after this, we might recurse back to
+	 * AbortTransaction(). To avoid creating another Abort WAL record
+	 * and failing assertion in ProcArrayEndTransaction because MyProc->xid
+	 * has already been cleared, clear out transactionId now. The rest
+	 * of the fields in TransactionState will be cleared later, in
+	 * CleanupTransaction().
 	 */
+	TopTransactionStateData.transactionId = InvalidTransactionId;
+
 	rollbackDtxTransaction();
 
 	if (!LocalDistribXactRef_IsNil(&localDistribXactRef))
@@ -4260,7 +4253,9 @@ CleanupTransaction(void)
 	s->subTransactionId = InvalidSubTransactionId;
 	s->nestingLevel = 0;
 	s->gucNestLevel = 0;
-	s->childXids = NIL;
+	s->childXids = NULL;
+	s->nChildXids = 0;
+	s->maxChildXids = 0;
 	s->executorSaysXactDoesWrites = false;
 
 	/*
@@ -4782,12 +4777,14 @@ AbortCurrentTransaction(void)
  *	could issue more commands and possibly cause a failure after the statement
  *	completes).  Subtransactions are verboten too.
  *
- *	stmtNode: pointer to parameter block for statement; this is used in
- *	a very klugy way to determine whether we are inside a function.
- *	stmtType: statement type name for error messages.
+ *	isTopLevel: passed down from ProcessUtility to determine whether we are
+ *	inside a function or multi-query querystring.  (We will always fail if
+ *	this is false, but it's convenient to centralize the check here instead of
+ *	making callers do it.)
+ *	stmtType: statement type name, for error messages.
  */
 void
-PreventTransactionChain(void *stmtNode, const char *stmtType)
+PreventTransactionChain(bool isTopLevel, const char *stmtType)
 {
 	/*
 	 * xact block already started?
@@ -4810,15 +4807,14 @@ PreventTransactionChain(void *stmtNode, const char *stmtType)
 						stmtType)));
 
 	/*
-	 * Are we inside a function call?  If the statement's parameter block was
-	 * allocated in QueryContext, assume it is an interactive command.
-	 * Otherwise assume it is coming from a function.
+	 * inside a function call?
 	 */
-	if (!MemoryContextContains(QueryContext, stmtNode))
+	if (!isTopLevel)
 		ereport(ERROR,
 				(errcode(ERRCODE_ACTIVE_SQL_TRANSACTION),
 		/* translator: %s represents an SQL statement name */
-				 errmsg("%s cannot be executed from a function", stmtType)));
+				 errmsg("%s cannot be executed from a function or multi-command string",
+						stmtType)));
 
 	/* If we got past IsTransactionBlock test, should be in default state */
 	if (CurrentTransactionState->blockState != TBLOCK_DEFAULT &&
@@ -4840,12 +4836,12 @@ PreventTransactionChain(void *stmtNode, const char *stmtType)
  *	use of the current statement's results.  Likewise subtransactions.
  *	Thus this is an inverse for PreventTransactionChain.
  *
- *	stmtNode: pointer to parameter block for statement; this is used in
- *	a very klugy way to determine whether we are inside a function.
- *	stmtType: statement type name for error messages.
+ *	isTopLevel: passed down from ProcessUtility to determine whether we are
+ *	inside a function.
+ *	stmtType: statement type name, for error messages.
  */
 void
-RequireTransactionChain(void *stmtNode, const char *stmtType)
+RequireTransactionChain(bool isTopLevel, const char *stmtType)
 {
 	/*
 	 * xact block already started?
@@ -4860,12 +4856,11 @@ RequireTransactionChain(void *stmtNode, const char *stmtType)
 		return;
 
 	/*
-	 * Are we inside a function call?  If the statement's parameter block was
-	 * allocated in QueryContext, assume it is an interactive command.
-	 * Otherwise assume it is coming from a function.
+	 * inside a function call?
 	 */
-	if (!MemoryContextContains(QueryContext, stmtNode))
+	if (!isTopLevel)
 		return;
+
 	ereport(ERROR,
 			(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
 	/* translator: %s represents an SQL statement name */
@@ -4880,11 +4875,11 @@ RequireTransactionChain(void *stmtNode, const char *stmtType)
  *	a transaction block than when running as single commands.  ANALYZE is
  *	currently the only example.
  *
- *	stmtNode: pointer to parameter block for statement; this is used in
- *	a very klugy way to determine whether we are inside a function.
+ *	isTopLevel: passed down from ProcessUtility to determine whether we are
+ *	inside a function.
  */
 bool
-IsInTransactionChain(void *stmtNode)
+IsInTransactionChain(bool isTopLevel)
 {
 	/*
 	 * Return true on same conditions that would make PreventTransactionChain
@@ -4896,7 +4891,7 @@ IsInTransactionChain(void *stmtNode)
 	if (IsSubTransaction())
 		return true;
 
-	if (!MemoryContextContains(QueryContext, stmtNode))
+	if (!isTopLevel)
 		return true;
 
 	if (CurrentTransactionState->blockState != TBLOCK_DEFAULT &&
@@ -5372,16 +5367,9 @@ UserAbortTransactionBlock(void)
 			 * default state.
 			 */
 		case TBLOCK_STARTED:
-			if (Gp_role == GP_ROLE_EXECUTE)
-			{
-				ereport(DEBUG2,
-						(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
-						 errmsg("there is no transaction in progress")));
-			}
-			else
-				ereport(WARNING,
-						(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
-						 errmsg("there is no transaction in progress")));
+			ereport((Gp_role == GP_ROLE_EXECUTE) ? DEBUG2 : NOTICE,
+					(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
+					 errmsg("there is no transaction in progress")));
 			s->blockState = TBLOCK_ABORT_PENDING;
 			break;
 
@@ -5961,7 +5949,24 @@ AbortOutOfAnyTransaction(void)
 		switch (s->blockState)
 		{
 			case TBLOCK_DEFAULT:
-				/* Not in a transaction, do nothing */
+				if (s->state == TRANS_DEFAULT)
+				{
+					/* Not in a transaction, do nothing */
+				}
+				else
+				{
+					/*
+					 * We can get here after an error during transaction start
+					 * (state will be TRANS_START).  Need to clean up the
+					 * incompletely started transaction.  First, adjust the
+					 * low-level state to suppress warning message from
+					 * AbortTransaction.
+					 */
+					if (s->state == TRANS_START)
+						s->state = TRANS_INPROGRESS;
+					AbortTransaction();
+					CleanupTransaction();
+				}
 				break;
 			case TBLOCK_STARTED:
 			case TBLOCK_BEGIN:
@@ -6047,22 +6052,24 @@ IsTransactionOrTransactionBlock(void)
 /*
  * Did the transaction do work that requires a commit record to be written?
  */
-bool
+static bool
 IsTransactionDirty(void)
 {
-	bool result = (MyXactMadeXLogEntry || MyXactMadeTempRelUpdate || smgrIsPendingFileSysWork(EndXactRecKind_Commit));
+	TransactionId xid = GetTopTransactionIdIfAny();
+	bool		markXidCommitted = TransactionIdIsValid(xid);
 
 	elog((Debug_print_full_dtm ? LOG : DEBUG5), "IsTransactionDirty: TopTransactionId %u, dirty = %s",
-		 GetTopTransactionId(), (result ? "true" : "false"));
+		 xid, (markXidCommitted ? "true" : "false"));
 	
-	return result;
+	return markXidCommitted;
 }
 
 void
 ExecutorMarkTransactionUsesSequences(void)
 {
 	seqXlogWrite = true;
-	MyXactMadeXLogEntry = true;
+
+	ForceSyncCommit();
 }
 
 void 
@@ -6220,13 +6227,11 @@ CommitSubTransaction(void)
 	CommandCounterIncrement();
 
 	/* Mark subtransaction as subcommitted */
-	if (TransactionIdIsValid(s->transactionId))
-	{
-		RecordSubTransactionCommit();
-		AtSubCommit_childXids();
-	}
+	RecordSubTransactionCommit();
 
 	/* Post-commit cleanup */
+	if (TransactionIdIsValid(s->transactionId))
+		AtSubCommit_childXids();
 	AfterTriggerEndSubXact(true);
 	AtSubCommit_Portals(s->subTransactionId,
 						s->parent->subTransactionId,
@@ -6344,8 +6349,8 @@ AbortSubTransaction(void)
 	s->state = TRANS_ABORT;
 
 	/*
-	 * Reset user ID which might have been changed transiently.  (See notes in
-	 * AbortTransaction.)
+	 * Reset user ID which might have been changed transiently.  (See notes
+	 * in AbortTransaction.)
 	 */
 	SetUserIdAndSecContext(s->prevUser, s->prevSecContext);
 
@@ -6366,13 +6371,12 @@ AbortSubTransaction(void)
 									s->parent->subTransactionId);
 
 		/* Advertise the fact that we aborted in pg_clog. */
+		(void) RecordTransactionAbort(true);
+
+		/* Post-abort cleanup */
 		if (TransactionIdIsValid(s->transactionId))
-		{
-			RecordSubTransactionAbort();
 			AtSubAbort_childXids();
-		}
 
-		/* Post-abort cleanup */
 		CallSubXactCallbacks(SUBXACT_EVENT_ABORT_SUB, s->subTransactionId,
 							 s->parent->subTransactionId);
 
@@ -6597,20 +6601,35 @@ ShowTransactionState(const char *str)
 static void
 ShowTransactionStateRec(TransactionState s)
 {
+	StringInfoData buf;
+
+	initStringInfo(&buf);
+
+	if (s->nChildXids > 0)
+	{
+		int i;
+
+		appendStringInfo(&buf, "%u", s->childXids[0]);
+		for (i = 1; i < s->nChildXids; i++)
+			appendStringInfo(&buf, " %u", s->childXids[i]);
+	}
+
 	if (s->parent)
 		ShowTransactionStateRec(s->parent);
 
 	/* use ereport to suppress computation if msg will not be printed */
 	ereport(DEBUG3,
-			(errmsg_internal("name: %s; blockState: %13s; state: %7s, xid/subid/cid: %u/%u/%u, nestlvl: %d, children: %s",
+			(errmsg_internal("name: %s; blockState: %13s; state: %7s, xid/subid/cid: %u/%u/%u%s, nestlvl: %d, children: %s",
 							 PointerIsValid(s->name) ? s->name : "unnamed",
 							 BlockStateAsString(s->blockState),
 							 TransStateAsString(s->state),
 							 (unsigned int) s->transactionId,
 							 (unsigned int) s->subTransactionId,
 							 (unsigned int) currentCommandId,
-							 s->nestingLevel,
-							 nodeToString(s->childXids))));
+							 currentCommandIdUsed ? " (used)" : "",
+							 s->nestingLevel, buf.data)));
+
+	pfree(buf.data);
 }
 
 /*
@@ -6721,28 +6740,13 @@ int
 xactGetCommittedChildren(TransactionId **ptr)
 {
 	TransactionState s = CurrentTransactionState;
-	int			nchildren;
-	TransactionId *children;
-	ListCell   *p;
 
-	nchildren = list_length(s->childXids);
-	if (nchildren == 0)
-	{
+	if (s->nChildXids == 0)
 		*ptr = NULL;
-		return 0;
-	}
-
-	children = (TransactionId *) palloc(nchildren * sizeof(TransactionId));
-	*ptr = children;
-
-	foreach(p, s->childXids)
-	{
-		TransactionId child = lfirst_xid(p);
-
-		*children++ = child;
-	}
+	else
+		*ptr = s->childXids;
 
-	return nchildren;
+	return s->nChildXids;
 }
 
 /*
@@ -7161,15 +7165,12 @@ xact_redo_get_info(
 static char*
 xact_desc_commit(StringInfo buf, xl_xact_commit *xlrec)
 {
-	struct tm  *tm = localtime(&xlrec->xtime);
 	int			i;
 	uint8 *data;
 	PersistentEndXactRecObjects persistentCommitObjects;
 	TransactionId *sub_xids;
 
-	appendStringInfo(buf, "%04u-%02u-%02u %02u:%02u:%02u",
-					 tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-					 tm->tm_hour, tm->tm_min, tm->tm_sec);
+	appendStringInfoString(buf, timestamptz_to_str(xlrec->xact_time));
 	data = xlrec->data;
 	appendStringInfo(buf, "; persistent commit object count = %d",
 					 xlrec->persistentCommitObjectCount);
@@ -7248,15 +7249,12 @@ xact_desc_distributed_forget(StringInfo buf, xl_xact_distributed_forget *xlrec)
 static void
 xact_desc_abort(StringInfo buf, xl_xact_abort *xlrec)
 {
-	struct tm  *tm = localtime(&xlrec->xtime);
 	uint8 *data;
 	PersistentEndXactRecObjects persistentAbortObjects;
 	TransactionId *sub_xids;
 	int			i;
 
-	appendStringInfo(buf, "%04u-%02u-%02u %02u:%02u:%02u",
-					 tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-					 tm->tm_hour, tm->tm_min, tm->tm_sec);
+	appendStringInfoString(buf, timestamptz_to_str(xlrec->xact_time));
 	data = xlrec->data;
 	appendStringInfo(buf, "; persistent abort object count = %d",
 					 xlrec->persistentAbortObjectCount);
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index ae7495f0a78f..755f3fc96099 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.269 2007/05/20 21:08:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.292.2.11 2010/06/09 10:54:50 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@
 #include "access/distributedlog.h"
 #include "access/subtrans.h"
 #include "access/transam.h"
+#include "access/tuptoaster.h"
 #include "access/twophase.h"
 #include "access/xact.h"
 #include "access/xlog_internal.h"
@@ -55,6 +56,7 @@
 #include "storage/ipc.h"
 #include "storage/pmsignal.h"
 #include "storage/procarray.h"
+#include "storage/smgr.h"
 #include "storage/spin.h"
 #include "utils/builtins.h"
 #include "utils/nabstime.h"
@@ -69,6 +71,8 @@
 #include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/pg_crc.h"
+#include "utils/pg_locale.h"
+#include "utils/ps_status.h"
 #include "replication/walreceiver.h"
 #include "replication/walsender.h"
 #include "storage/backendid.h"
@@ -86,6 +90,7 @@
 #include "cdb/cdbpersistentcheck.h"
 
 
+
 /* File path names (all relative to $PGDATA) */
 #define RECOVERY_COMMAND_FILE	"recovery.conf"
 #define RECOVERY_COMMAND_DONE	"recovery.done"
@@ -96,26 +101,28 @@
 int			CheckPointSegments = 3;
 int			XLOGbuffers = 8;
 int			XLogArchiveTimeout = 0;
+bool		XLogArchiveMode = false;
 char	   *XLogArchiveCommand = NULL;
 char	   *XLOG_sync_method = NULL;
 const char	XLOG_sync_method_default[] = DEFAULT_SYNC_METHOD_STR;
 bool		fullPageWrites = true;
+bool		log_checkpoints = false;
 
 #ifdef WAL_DEBUG
 bool		XLOG_DEBUG = false;
 #endif
 
 /*
- * XLOGfileslop is used in the code as the allowed "fuzz" in the number of
- * preallocated XLOG segments --- we try to have at least XLOGfiles advance
- * segments but no more than XLOGfileslop segments.  This could
- * be made a separate GUC variable, but at present I think it's sufficient
- * to hardwire it as 2*CheckPointSegments+1.  Under normal conditions, a
- * checkpoint will free no more than 2*CheckPointSegments log segments, and
- * we want to recycle all of them; the +1 allows boundary cases to happen
- * without wasting a delete/create-segment cycle.
+ * XLOGfileslop is the maximum number of preallocated future XLOG segments.
+ * When we are done with an old XLOG segment file, we will recycle it as a
+ * future XLOG segment as long as there aren't already XLOGfileslop future
+ * segments; else we'll delete it.  This could be made a separate GUC
+ * variable, but at present I think it's sufficient to hardwire it as
+ * 2*CheckPointSegments+1.	Under normal conditions, a checkpoint will free
+ * no more than 2*CheckPointSegments log segments, and we want to recycle all
+ * of them; the +1 allows boundary cases to happen without wasting a
+ * delete/create-segment cycle.
  */
-
 #define XLOGfileslop	(2*CheckPointSegments + 1)
 
 
@@ -136,6 +143,13 @@ static int	open_sync_bit = DEFAULT_SYNC_FLAGBIT;
 
 bool am_startup = false;
 
+/*
+ * Statistics for current checkpoint are collected in this global struct.
+ * Because only the background writer or a stand-alone backend can perform
+ * checkpoints, this will be unused in normal backends.
+ */
+CheckpointStatsData CheckpointStats;
+
 /*
  * ThisTimeLineID will be same in all backends --- it identifies current
  * WAL timeline for the database system.
@@ -158,8 +172,10 @@ static bool restoredFromArchive = false;
 static bool recoveryTarget = false;
 static bool recoveryTargetExact = false;
 static bool recoveryTargetInclusive = true;
+static bool recoveryLogRestartpoints = false;
 static TransactionId recoveryTargetXid;
-static time_t recoveryTargetTime;
+static TimestampTz recoveryTargetTime;
+static TimestampTz recoveryLastXTime = 0;
 
 /* options taken from recovery.conf for XLOG streaming */
 static bool StandbyModeRequested = false;
@@ -170,7 +186,7 @@ bool StandbyMode = false;
 
 /* if recoveryStopsHere returns true, it saves actual stop xid/time here */
 static TransactionId recoveryStopXid;
-static time_t recoveryStopTime;
+static TimestampTz recoveryStopTime;
 static bool recoveryStopAfter;
 
 /*
@@ -199,38 +215,16 @@ static TimeLineID recoveryTargetTLI;
 List *expectedTLIs;
 static TimeLineID curFileTLI;
 
-/*
- * MyLastRecPtr points to the start of the last XLOG record inserted by the
- * current transaction.  If MyLastRecPtr.xrecoff == 0, then the current
- * xact hasn't yet inserted any transaction-controlled XLOG records.
- *
- * Note that XLOG records inserted outside transaction control are not
- * reflected into MyLastRecPtr.  They do, however, cause MyXactMadeXLogEntry
- * to be set true.	The latter can be used to test whether the current xact
- * made any loggable changes (including out-of-xact changes, such as
- * sequence updates).
- *
- * When we insert/update/delete a tuple in a temporary relation, we do not
- * make any XLOG record, since we don't care about recovering the state of
- * the temp rel after a crash.	However, we will still need to remember
- * whether our transaction committed or aborted in that case.  So, we must
- * set MyXactMadeTempRelUpdate true to indicate that the XID will be of
- * interest later.
- */
-XLogRecPtr	MyLastRecPtr = {0, 0};
-
-bool		MyXactMadeXLogEntry = false;
-
-bool		MyXactMadeTempRelUpdate = false;
-
 /*
  * ProcLastRecPtr points to the start of the last XLOG record inserted by the
- * current backend.  It is updated for all inserts, transaction-controlled
- * or not.	ProcLastRecEnd is similar but points to end+1 of last record.
+ * current backend.  It is updated for all inserts.  XactLastRecEnd points to
+ * end+1 of the last record, and is reset when we end a top-level transaction,
+ * or start a new one; so it can be used to tell if the current transaction has
+ * created any XLOG records.
  */
 static XLogRecPtr ProcLastRecPtr = {0, 0};
 
-XLogRecPtr	ProcLastRecEnd = {0, 0};
+XLogRecPtr	XactLastRecEnd = {0, 0};
 
 static uint32 ProcLastRecTotalLen = 0;
 
@@ -377,6 +371,7 @@ typedef struct XLogCtlData
 	XLogwrtResult LogwrtResult;
 	uint32		ckptXidEpoch;	/* nextXID & epoch of latest checkpoint */
 	TransactionId ckptXid;
+	XLogRecPtr	asyncCommitLSN; /* LSN of newest async commit */
 	uint32		lastRemovedLog; /* latest removed/recycled XLOG segment */
 	uint32		lastRemovedSeg;
 
@@ -624,8 +619,9 @@ static void XLogArchiveCleanup(const char *xlog);
 static void exitArchiveRecovery(TimeLineID endTLI,
 					uint32 endLogId, uint32 endLogSeg);
 static bool recoveryStopsHere(XLogRecord *record, bool *includeThis);
-static void CheckPointGuts(XLogRecPtr checkPointRedo);
+static void CheckPointGuts(XLogRecPtr checkPointRedo, int flags);
 static void Checkpoint_RecoveryPass(XLogRecPtr checkPointRedo);
+
 static bool XLogCheckBuffer(XLogRecData *rdata, bool doPageWrites,
 				XLogRecPtr *lsn, BkpBlock *bkpb);
 static bool AdvanceXLInsertBuffer(bool new_segment);
@@ -651,10 +647,8 @@ static bool StartupXLOG_Pass4_GetDBForPTCatVerification(void);
 static bool XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,
 			 bool randAccess);
 
-static int	PreallocXlogFiles(XLogRecPtr endptr);
+static void PreallocXlogFiles(XLogRecPtr endptr);
 static void UpdateLastRemovedPtr(char *filename);
-static void MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr,
-				int *nsegsremoved, int *nsegsrecycled);
 static void CleanupBackupHistory(void);
 static XLogRecord *ReadCheckpointRecord(XLogRecPtr RecPtr, int whichChkpt);
 static bool ValidXLOGHeader(XLogPageHeader hdr, int emode, bool segmentonly);
@@ -679,10 +673,9 @@ static bool XLogGetWriteAndFlushedLoc(XLogRecPtr *writeLoc, XLogRecPtr *flushedL
 static XLogRecPtr XLogInsert_Internal(RmgrId rmid, uint8 info, XLogRecData *rdata, TransactionId headerXid);
 static void WriteControlFile(void);
 static void ReadControlFile(void);
+
 static char *str_time(pg_time_t tnow);
-#ifdef suppress
-static void issue_xlog_fsync(void);
-#endif
+
 static void xlog_outrec(StringInfo buf, XLogRecord *record);
 static void pg_start_backup_callback(int code, Datum arg);
 static bool read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired);
@@ -840,11 +833,9 @@ XLogInsert_Internal(RmgrId rmid, uint8 info, XLogRecData *rdata, TransactionId h
 	uint32		len,
 				write_len;
 	unsigned	i;
-	XLogwrtRqst LogwrtRqst;
 	bool		updrqst;
 	bool		doPageWrites;
 	bool		isLogSwitch = (rmid == RM_XLOG_ID && info == XLOG_SWITCH);
-	bool		no_tran = (rmid == RM_XLOG_ID);
 
 	bool		rdata_iscopy = false;
 
@@ -883,13 +874,9 @@ XLogInsert_Internal(RmgrId rmid, uint8 info, XLogRecData *rdata, TransactionId h
 		}
  	}
 
+	/* info's high bits are reserved for use by me */
 	if (info & XLR_INFO_MASK)
-	{
-		if ((info & XLR_INFO_MASK) != XLOG_NO_TRAN)
-			elog(PANIC, "invalid xlog info mask %02X", (info & XLR_INFO_MASK));
-		no_tran = true;
-		info &= ~XLR_INFO_MASK;
-	}
+		elog(PANIC, "invalid xlog info mask %02X", info);
 
 	/*
 	 * In bootstrap mode, we don't actually log anything but XLOG resources;
@@ -1032,43 +1019,6 @@ begin:;
 
 	START_CRIT_SECTION();
 
-	/* update LogwrtResult before doing cache fill check */
-	{
-		/* use volatile pointer to prevent code rearrangement */
-		volatile XLogCtlData *xlogctl = XLogCtl;
-
-		SpinLockAcquire(&xlogctl->info_lck);
-		LogwrtRqst = xlogctl->LogwrtRqst;
-		LogwrtResult = xlogctl->LogwrtResult;
-		SpinLockRelease(&xlogctl->info_lck);
-	}
-
-	/*
-	 * If cache is half filled then try to acquire write lock and do
-	 * XLogWrite. Ignore any fractional blocks in performing this check.
-	 */
-	LogwrtRqst.Write.xrecoff -= LogwrtRqst.Write.xrecoff % XLOG_BLCKSZ;
-	if (LogwrtRqst.Write.xlogid != LogwrtResult.Write.xlogid ||
-		(LogwrtRqst.Write.xrecoff >= LogwrtResult.Write.xrecoff +
-		 XLogCtl->XLogCacheByte / 2))
-	{
-		if (LWLockConditionalAcquire(WALWriteLock, LW_EXCLUSIVE))
-		{
-			/*
-			 * Since the amount of data we write here is completely optional
-			 * anyway, tell XLogWrite it can be "flexible" and stop at a
-			 * convenient boundary.  This allows writes triggered by this
-			 * mechanism to synchronize with the cache boundaries, so that in
-			 * a long transaction we'll basically dump alternating halves of
-			 * the buffer array.
-			 */
-			LogwrtResult = XLogCtl->Write.LogwrtResult;
-			if (XLByteLT(LogwrtResult.Write, LogwrtRqst.Write))
-				XLogWrite(LogwrtRqst, true, false);
-			LWLockRelease(WALWriteLock);
-		}
-	}
-
 	/* Now wait to get insert lock */
 	LWLockAcquire(WALInsertLock, LW_EXCLUSIVE);
 
@@ -1187,8 +1137,8 @@ begin:;
 	 * full-block records into the non-full-block format.
 	 *
 	 * Note: we could just set the flag whenever !forcePageWrites, but
-	 * defining it like this leaves the info bit free for some potential
-	 * other use in records without any backup blocks.
+	 * defining it like this leaves the info bit free for some potential other
+	 * use in records without any backup blocks.
 	 */
 	if ((info & XLR_BKP_BLOCK_MASK) && !Insert->forcePageWrites)
 		info |= XLR_BKP_REMOVABLE;
@@ -1264,11 +1214,8 @@ begin:;
 	record->xl_crc = rdata_crc;
 
 	/* Record begin of record in appropriate places */
-	if (!no_tran)
-		MyLastRecPtr = RecPtr;
 	ProcLastRecPtr = RecPtr;
 	Insert->PrevRecord = RecPtr;
-	MyXactMadeXLogEntry = true;
 
 	ProcLastRecTotalLen = record->xl_tot_len;
 	ProcLastRecDataLen = write_len;
@@ -1526,7 +1473,7 @@ begin:;
 		SpinLockRelease(&xlogctl->info_lck);
 	}
 
-	ProcLastRecEnd = RecPtr;
+	XactLastRecEnd = RecPtr;
 
 	END_CRIT_SECTION();
 
@@ -1542,7 +1489,7 @@ XLogLastInsertBeginLoc(void)
 XLogRecPtr
 XLogLastInsertEndLoc(void)
 {
-	return ProcLastRecEnd;
+	return XactLastRecEnd;
 }
 
 XLogRecPtr
@@ -1896,6 +1843,40 @@ AdvanceXLInsertBuffer(bool new_segment)
 	return update_needed;
 }
 
+/*
+ * Check whether we've consumed enough xlog space that a checkpoint is needed.
+ *
+ * Caller must have just finished filling the open log file (so that
+ * openLogId/openLogSeg are valid).  We measure the distance from RedoRecPtr
+ * to the open log file and see if that exceeds CheckPointSegments.
+ *
+ * Note: it is caller's responsibility that RedoRecPtr is up-to-date.
+ */
+static bool
+XLogCheckpointNeeded(void)
+{
+	/*
+	 * A straight computation of segment number could overflow 32 bits. Rather
+	 * than assuming we have working 64-bit arithmetic, we compare the
+	 * highest-order bits separately, and force a checkpoint immediately when
+	 * they change.
+	 */
+	uint32		old_segno,
+				new_segno;
+	uint32		old_highbits,
+				new_highbits;
+
+	old_segno = (RedoRecPtr.xlogid % XLogSegSize) * XLogSegsPerFile +
+		(RedoRecPtr.xrecoff / XLogSegSize);
+	old_highbits = RedoRecPtr.xlogid / XLogSegSize;
+	new_segno = (openLogId % XLogSegSize) * XLogSegsPerFile + openLogSeg;
+	new_highbits = openLogId / XLogSegSize;
+	if (new_highbits != old_highbits ||
+		new_segno >= old_segno + (uint32) (CheckPointSegments - 1))
+		return true;
+	return false;
+}
+
 /*
  * Write and/or fsync the log at least as far as WriteRqst indicates.
  *
@@ -2117,40 +2098,20 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible, bool xlog_switch)
 				Write->lastSegSwitchTime = time(NULL);
 
 				/*
-				 * Signal bgwriter to start a checkpoint if it's been too long
-				 * since the last one.	(We look at local copy of RedoRecPtr
-				 * which might be a little out of date, but should be close
-				 * enough for this purpose.)
-				 *
-				 * A straight computation of segment number could overflow 32
-				 * bits.  Rather than assuming we have working 64-bit
-				 * arithmetic, we compare the highest-order bits separately,
-				 * and force a checkpoint immediately when they change.
+				 * Signal bgwriter to start a checkpoint if we've consumed too
+				 * much xlog since the last one.  For speed, we first check
+				 * using the local copy of RedoRecPtr, which might be out of
+				 * date; if it looks like a checkpoint is needed, forcibly
+				 * update RedoRecPtr and recheck.
 				 */
-				if (IsUnderPostmaster)
+				if (IsUnderPostmaster &&
+					XLogCheckpointNeeded())
 				{
-					uint32		old_segno,
-								new_segno;
-					uint32		old_highbits,
-								new_highbits;
-
-					old_segno = (RedoRecPtr.xlogid % XLogSegSize) * XLogSegsPerFile +
-						(RedoRecPtr.xrecoff / XLogSegSize);
-					old_highbits = RedoRecPtr.xlogid / XLogSegSize;
-					new_segno = (openLogId % XLogSegSize) * XLogSegsPerFile +
-						openLogSeg;
-					new_highbits = openLogId / XLogSegSize;
-					if (new_highbits != old_highbits ||
-						new_segno >= old_segno + (uint32) (CheckPointSegments-1))
-					{
-#ifdef WAL_DEBUG
-						if (XLOG_DEBUG)
-							elog(LOG, "time for a checkpoint, signaling bgwriter");
-#endif
-						if (Debug_print_qd_mirroring)
-							elog(LOG, "time for a checkpoint, signaling bgwriter");
-						RequestCheckpoint(false, true);
-					}
+					if (Debug_print_qd_mirroring)
+						elog(LOG, "time for a checkpoint, signaling bgwriter");
+					(void) GetRedoRecPtr();
+					if (XLogCheckpointNeeded())
+						RequestCheckpoint(CHECKPOINT_CAUSE_XLOG);
 				}
 			}
 		}
@@ -2233,6 +2194,22 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible, bool xlog_switch)
 	Write->LogwrtResult = LogwrtResult;
 }
 
+/*
+ * Record the LSN for an asynchronous transaction commit.
+ * (This should not be called for aborts, nor for synchronous commits.)
+ */
+void
+XLogSetAsyncCommitLSN(XLogRecPtr asyncCommitLSN)
+{
+	/* use volatile pointer to prevent code rearrangement */
+	volatile XLogCtlData *xlogctl = XLogCtl;
+
+	SpinLockAcquire(&xlogctl->info_lck);
+	if (XLByteLT(xlogctl->asyncCommitLSN, asyncCommitLSN))
+		xlogctl->asyncCommitLSN = asyncCommitLSN;
+	SpinLockRelease(&xlogctl->info_lck);
+}
+
 /*
  * Ensure that all XLOG data through the given position is flushed to disk.
  *
@@ -2359,6 +2336,7 @@ XLogFlush(XLogRecPtr record)
 }
 
 /*
+
  * TODO: This is just for the matter of WAL receiver build.  We cannot
  * expose MirroredFlatFileOpen in xlog.h.
  */
@@ -2371,6 +2349,148 @@ XLogFileInitExt(uint32 log, uint32 seg, bool *use_existent, bool use_lock)
 	return mirroredOpen.primaryFile;
 }
 
+/*
+ * Flush xlog, but without specifying exactly where to flush to.
+ *
+ * We normally flush only completed blocks; but if there is nothing to do on
+ * that basis, we check for unflushed async commits in the current incomplete
+ * block, and flush through the latest one of those.  Thus, if async commits
+ * are not being used, we will flush complete blocks only.	We can guarantee
+ * that async commits reach disk after at most three cycles; normally only
+ * one or two.	(We allow XLogWrite to write "flexibly", meaning it can stop
+ * at the end of the buffer ring; this makes a difference only with very high
+ * load or long wal_writer_delay, but imposes one extra cycle for the worst
+ * case for async commits.)
+ *
+ * This routine is invoked periodically by the background walwriter process.
+ */
+void
+XLogBackgroundFlush(void)
+{
+	XLogRecPtr	WriteRqstPtr;
+	bool		flexible = true;
+
+	/* read LogwrtResult and update local state */
+	{
+		/* use volatile pointer to prevent code rearrangement */
+		volatile XLogCtlData *xlogctl = XLogCtl;
+
+		SpinLockAcquire(&xlogctl->info_lck);
+		LogwrtResult = xlogctl->LogwrtResult;
+		WriteRqstPtr = xlogctl->LogwrtRqst.Write;
+		SpinLockRelease(&xlogctl->info_lck);
+	}
+
+	/* back off to last completed page boundary */
+	WriteRqstPtr.xrecoff -= WriteRqstPtr.xrecoff % XLOG_BLCKSZ;
+
+	/* if we have already flushed that far, consider async commit records */
+	if (XLByteLE(WriteRqstPtr, LogwrtResult.Flush))
+	{
+		/* use volatile pointer to prevent code rearrangement */
+		volatile XLogCtlData *xlogctl = XLogCtl;
+
+		SpinLockAcquire(&xlogctl->info_lck);
+		WriteRqstPtr = xlogctl->asyncCommitLSN;
+		SpinLockRelease(&xlogctl->info_lck);
+		flexible = false;		/* ensure it all gets written */
+	}
+
+	/*
+	 * If already known flushed, we're done. Just need to check if we
+	 * are holding an open file handle to a logfile that's no longer
+	 * in use, preventing the file from being deleted.
+	 */
+	if (XLByteLE(WriteRqstPtr, LogwrtResult.Flush))
+	{
+		if (MirroredFlatFile_IsActive(&mirroredLogFileOpen))
+		{
+			if (!XLByteInPrevSeg(LogwrtResult.Write, openLogId, openLogSeg))
+			{
+				XLogFileClose();
+			}
+		}
+		return;
+	}
+
+#ifdef WAL_DEBUG
+	if (XLOG_DEBUG)
+		elog(LOG, "xlog bg flush request %X/%X; write %X/%X; flush %X/%X",
+			 WriteRqstPtr.xlogid, WriteRqstPtr.xrecoff,
+			 LogwrtResult.Write.xlogid, LogwrtResult.Write.xrecoff,
+			 LogwrtResult.Flush.xlogid, LogwrtResult.Flush.xrecoff);
+#endif
+
+	START_CRIT_SECTION();
+
+	/* now wait for the write lock */
+	LWLockAcquire(WALWriteLock, LW_EXCLUSIVE);
+	LogwrtResult = XLogCtl->Write.LogwrtResult;
+	if (!XLByteLE(WriteRqstPtr, LogwrtResult.Flush))
+	{
+		XLogwrtRqst WriteRqst;
+
+		WriteRqst.Write = WriteRqstPtr;
+		WriteRqst.Flush = WriteRqstPtr;
+		XLogWrite(WriteRqst, flexible, false);
+	}
+	LWLockRelease(WALWriteLock);
+
+	END_CRIT_SECTION();
+}
+
+/*
+ * Flush any previous asynchronously-committed transactions' commit records.
+ *
+ * NOTE: it is unwise to assume that this provides any strong guarantees.
+ * In particular, because of the inexact LSN bookkeeping used by clog.c,
+ * we cannot assume that hint bits will be settable for these transactions.
+ */
+void
+XLogAsyncCommitFlush(void)
+{
+	XLogRecPtr	WriteRqstPtr;
+
+	/* use volatile pointer to prevent code rearrangement */
+	volatile XLogCtlData *xlogctl = XLogCtl;
+
+	SpinLockAcquire(&xlogctl->info_lck);
+	WriteRqstPtr = xlogctl->asyncCommitLSN;
+	SpinLockRelease(&xlogctl->info_lck);
+
+	XLogFlush(WriteRqstPtr);
+}
+
+/*
+ * Test whether XLOG data has been flushed up to (at least) the given position.
+ *
+ * Returns true if a flush is still needed.  (It may be that someone else
+ * is already in process of flushing that far, however.)
+ */
+bool
+XLogNeedsFlush(XLogRecPtr record)
+{
+	/* Quick exit if already known flushed */
+	if (XLByteLE(record, LogwrtResult.Flush))
+		return false;
+
+	/* read LogwrtResult and update local state */
+	{
+		/* use volatile pointer to prevent code rearrangement */
+		volatile XLogCtlData *xlogctl = XLogCtl;
+
+		SpinLockAcquire(&xlogctl->info_lck);
+		LogwrtResult = xlogctl->LogwrtResult;
+		SpinLockRelease(&xlogctl->info_lck);
+	}
+
+	/* check again */
+	if (XLByteLE(record, LogwrtResult.Flush))
+		return false;
+
+	return true;
+}
+
 /*
  * Create a new XLOG file segment, or open a pre-existing one.
  *
@@ -2400,10 +2520,8 @@ XLogFileInit(
 	char		simpleFileName[MAXPGPATH];
 	char		tmpsimple[MAXPGPATH];
 	char		tmppath[MAXPGPATH];
-
 	MirroredFlatFileOpen tmpMirroredOpen;
-
-	char		zbuffer[XLOG_BLCKSZ];
+	char	   *zbuffer;
 	uint32		installed_log;
 	uint32		installed_seg;
 	int			max_advance;
@@ -2447,18 +2565,21 @@ XLogFileInit(
 	 * pre-creating an extra log segment.  That seems OK, and better than
 	 * holding the lock throughout this lengthy process.
 	 */
+	elog(DEBUG2, "creating and filling new WAL file");
+
 	xlogDir = makeRelativeToTxnFilespace(XLOGDIR);
 		
 	if (snprintf(tmpsimple, MAXPGPATH, "xlogtemp.%d", (int) getpid()) > MAXPGPATH)
 	{
-		ereport(ERROR, (errmsg("could not generate filename xlogtemp.%d", (int)getpid())));
-        }
+		ereport(ERROR,
+				(errmsg("could not generate filename xlogtemp.%d", (int)getpid())));
+	}
 
 	if (snprintf(tmppath, MAXPGPATH, "%s/%s", xlogDir, tmpsimple) > MAXPGPATH)
 	{
-		ereport(ERROR, (errmsg("could not generate filename %s/%s", xlogDir, tmpsimple)));
-        }
-
+		ereport(ERROR,
+				(errmsg("could not generate filename %s/%s", xlogDir, tmpsimple)));
+	}
 
 	MirroredFlatFile_Drop(
 						  XLOGDIR,
@@ -2485,15 +2606,19 @@ XLogFileInit(
 	 * fsync below) that all the indirect blocks are down on disk.	Therefore,
 	 * fdatasync(2) or O_DSYNC will be sufficient to sync future writes to the
 	 * log file.
+	 *
+	 * Note: palloc zbuffer, instead of just using a local char array, to
+	 * ensure it is reasonably well-aligned; this may save a few cycles
+	 * transferring data to the kernel.
 	 */
-	MemSet(zbuffer, 0, sizeof(zbuffer));
-	for (nbytes = 0; nbytes < XLogSegSize; nbytes += sizeof(zbuffer))
+	zbuffer = (char *) palloc0(XLOG_BLCKSZ);
+	for (nbytes = 0; nbytes < XLogSegSize; nbytes += XLOG_BLCKSZ)
 	{
 		errno = 0;
 		if (MirroredFlatFile_Append(
 							&tmpMirroredOpen,
 							zbuffer,
-							sizeof(zbuffer),
+							XLOG_BLCKSZ,
 							/* suppressError */ true))
 		{
 			int			save_errno = errno;
@@ -2515,6 +2640,7 @@ XLogFileInit(
 					 errmsg("could not write to file \"%s\": %m", tmppath)));
 		}
 	}
+	pfree(zbuffer);
 
 	MirroredFlatFile_Flush(
 				&tmpMirroredOpen,
@@ -2537,7 +2663,11 @@ XLogFileInit(
 								*use_existent, &max_advance,
 								use_lock, tmpsimple))
 	{
-		/* No need for any more future segments... */
+		/*
+		 * No need for any more future segments, or InstallXLogFileSegment()
+		 * failed to rename the file into place. If the rename failed, opening
+		 * the file below will fail.
+		 */
 		MirroredFlatFile_Drop(
 						XLOGDIR,
 						tmpsimple,
@@ -2560,6 +2690,8 @@ XLogFileInit(
 						/*isMirrorRecovery */ false);
 
 	pfree(xlogDir);
+
+	elog(DEBUG2, "done creating and filling new WAL file");
 }
 
 /*
@@ -2697,10 +2829,9 @@ XLogFileCopy(uint32 log, uint32 seg,
  * place.  This should be TRUE except during bootstrap log creation.  The
  * caller must *not* hold the lock at call.
  *
- * Returns TRUE if file installed, FALSE if not installed because of
- * exceeding max_advance limit.  On Windows, we also return FALSE if we
- * can't rename the file into place because someone's got it open.
- * (Any other kind of failure causes ereport().)
+ * Returns TRUE if the file was installed successfully.  FALSE indicates that
+ * max_advance limit was exceeded, or an error occurred while renaming the
+ * file into place.
  */
 static bool
 InstallXLogFileSegment(uint32 *log, uint32 *seg, char *tmppath,
@@ -2777,10 +2908,15 @@ InstallXLogFileSegment(uint32 *log, uint32 *seg, char *tmppath,
 	}
 
 	if (retval < 0)
-		ereport(ERROR,
+	{
+		if (use_lock)
+			LWLockRelease(ControlFileLock);
+		ereport(LOG,
 				(errcode_for_file_access(),
 				 errmsg("could not link file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m",
 						tmppath, path, *log, *seg)));
+		return false;
+	}
 
 	if (tmpsimpleFileName) {
 
@@ -2807,23 +2943,13 @@ InstallXLogFileSegment(uint32 *log, uint32 *seg, char *tmppath,
 
 	if (retval < 0)
 	{
-#ifdef WIN32
-#if !defined(__CYGWIN__)
-		if (GetLastError() == ERROR_ACCESS_DENIED)
-#else
-		if (errno == EACCES)
-#endif
-		{
-			if (use_lock)
-				LWLockRelease(ControlFileLock);
-			return false;
-		}
-#endif /* WIN32 */
-
-		ereport(ERROR,
+		if (use_lock)
+			LWLockRelease(ControlFileLock);
+		ereport(LOG,
 				(errcode_for_file_access(),
 				 errmsg("could not rename file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m",
 						tmppath, path, *log, *seg)));
+		return false;
 	}
 #endif
 
@@ -2904,13 +3030,18 @@ XLogFileClose(void)
 }
 
 /*
- * Preallocate log files beyond the specified log endpoint, according to
- * the XLOGfile user parameter.
+ * Preallocate log files beyond the specified log endpoint.
+ *
+ * XXX this is currently extremely conservative, since it forces only one
+ * future log segment to exist, and even that only if we are 75% done with
+ * the current one.  This is only appropriate for very low-WAL-volume systems.
+ * High-volume systems will be OK once they've built up a sufficient set of
+ * recycled log segments, but the startup transient is likely to include
+ * a lot of segment creations by foreground processes, which is not so good.
  */
-static int
+static void
 PreallocXlogFiles(XLogRecPtr endptr)
 {
-	int			nsegsadded = 0;
 	uint32		_logId;
 	uint32		_logSeg;
 
@@ -2929,9 +3060,8 @@ PreallocXlogFiles(XLogRecPtr endptr)
 			_logId, _logSeg, &use_existent, true);
 		MirroredFlatFile_Close(&mirroredOpen);
 		if (!use_existent)
-			nsegsadded++;
+			CheckpointStats.ckpt_segs_added++;
 	}
-	return nsegsadded;
 }
 
 /*
@@ -2976,14 +3106,13 @@ UpdateLastRemovedPtr(char *filename)
 }
 
 /*
- * Remove or move offline all log files older or equal to passed log/seg#
+ * Recycle or remove all log files older or equal to passed log/seg#
  *
  * endptr is current (or recent) end of xlog; this is used to determine
  * whether we want to recycle rather than delete no-longer-wanted log files.
  */
 static void
-MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr,
-				int *nsegsremoved, int *nsegsrecycled)
+RemoveOldXlogFiles(uint32 log, uint32 seg, XLogRecPtr endptr)
 {
 	uint32		endlogId;
 	uint32		endlogSeg;
@@ -2994,8 +3123,11 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr,
 	char		path[MAXPGPATH];
 	char		*xlogDir = NULL;
 
-	*nsegsremoved = 0;
-	*nsegsrecycled = 0;
+#ifdef WIN32
+	char		newpath[MAXPGPATH];
+	char		newfilename[MAXPGPATH];
+#endif
+	struct stat statbuf;
 
 	/*
 	 * Initialize info about where to try to recycle to.  We allow recycling
@@ -3043,16 +3175,18 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr,
 
 				/*
 				 * Before deleting the file, see if it can be recycled as a
-				 * future log segment.
+				 * future log segment. Only recycle normal files, pg_standby
+				 * for example can create symbolic links pointing to a
+				 * separate archive directory.
 				 */
-				if (InstallXLogFileSegment(&endlogId, &endlogSeg, path,
-										   true, &max_advance,
-										   true, xlde->d_name))
+				if (lstat(path, &statbuf) == 0 && S_ISREG(statbuf.st_mode) &&
+					InstallXLogFileSegment(&endlogId, &endlogSeg, path,
+										   true, &max_advance, true, xlde->d_name))
 				{
 					ereport(DEBUG2,
 							(errmsg("recycled transaction log file \"%s\"",
 									xlde->d_name)));
-					(*nsegsrecycled)++;
+					CheckpointStats.ckpt_segs_recycled++;
 					/* Needn't recheck that slot on future iterations */
 					if (max_advance > 0)
 					{
@@ -3063,17 +3197,62 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr,
 				else
 				{
 					/* No need for any more future segments... */
+					//int rc;
+
 					ereport(DEBUG2,
 							(errmsg("removing transaction log file \"%s\"",
 									xlde->d_name)));
 
+#ifdef WIN32
+					/*
+					 * On Windows, if another process (e.g another backend)
+					 * holds the file open in FILE_SHARE_DELETE mode, unlink
+					 * will succeed, but the file will still show up in
+					 * directory listing until the last handle is closed.
+					 * To avoid confusing the lingering deleted file for a
+					 * live WAL file that needs to be archived, rename it
+					 * before deleting it.
+					 *
+					 * If another process holds the file open without
+					 * FILE_SHARE_DELETE flag, rename will fail. We'll try
+					 * again at the next checkpoint.
+					 */
+					snprintf(newpath, MAXPGPATH, "%s.deleted", path);
+					if (rename(path, newpath) != 0)
+					{
+						ereport(LOG,
+								(errcode_for_file_access(),
+								 errmsg("could not rename old transaction log file \"%s\": %m",
+										path)));
+						continue;
+					}
+					snprintf(newfilename, MAXPGPATH, "%s.deleted", xlde->d_name);
+					MirroredFlatFile_Drop(
+										  XLOGDIR,
+										  newfilename,
+										  /* suppressError */ true,
+										  /*isMirrorRecovery */ false);
+#else
 					MirroredFlatFile_Drop(
 										  XLOGDIR,
 										  xlde->d_name,
 										  /* suppressError */ true,
 										  /*isMirrorRecovery */ false);
+#endif
 
-					(*nsegsremoved)++;
+					/* GPDB_83_MERGE_FIXME: MirroredFlatFile_Drop doesn't return a return
+					 * code */
+#if 0
+					if (rc != 0)
+					{
+						ereport(LOG,
+								(errcode_for_file_access(),
+								 errmsg("could not remove old transaction log file \"%s\": %m",
+										path)));
+						continue;
+					}
+#endif
+					CheckpointStats.ckpt_segs_removed++;
 				}
 
 				XLogArchiveCleanup(xlde->d_name);
@@ -3816,8 +3995,10 @@ XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,
 		}
 		if (!ValidXLOGHeader((XLogPageHeader) readBuf, emode, true))
 		{
-			elogif(debug_xlog_record_read, LOG,
-				   "xlog page read -- xlog page header invalid");
+			ereport(emode,
+					(errcode_for_file_access(),
+					 errmsg("could not read from log file %u, segment %u, offset %u: %m",
+							readId, readSeg, readOff)));
 			goto next_record_is_invalid;
 		}
 	}
@@ -3933,14 +4114,12 @@ XLogReadRecord(XLogRecPtr *RecPtr, bool fetching_ckpt, int emode)
 		if (nextRecord == NULL)
 		{
 			/* align old recptr to next page */
-
-			if (tmpRecPtr.xrecoff % XLOG_BLCKSZ != 0)
-				tmpRecPtr.xrecoff += (XLOG_BLCKSZ - tmpRecPtr.xrecoff % XLOG_BLCKSZ);
-
-			if (tmpRecPtr.xrecoff >= XLogFileSize)
+			if (RecPtr->xrecoff % XLOG_BLCKSZ != 0)
+				RecPtr->xrecoff += (XLOG_BLCKSZ - RecPtr->xrecoff % XLOG_BLCKSZ);
+			if (RecPtr->xrecoff >= XLogFileSize)
 			{
-				(tmpRecPtr.xlogid)++;
-				tmpRecPtr.xrecoff = 0;
+				(RecPtr->xlogid)++;
+				RecPtr->xrecoff = 0;
 			}
 		}
 		/* We will account for page header size below */
@@ -3990,12 +4169,13 @@ XLogReadRecord(XLogRecPtr *RecPtr, bool fetching_ckpt, int emode)
 	if (targetRecOff == 0)
 	{
 		/*
-		 * Can only get here in the continuing-from-prev-page case, because
-		 * XRecOffIsValid eliminated the zero-page-offset case otherwise. Need
-		 * to skip over the new page's header.
+		 * At page start, so skip over page header.  The Assert checks that
+		 * we're not scribbling on caller's record pointer; it's OK because we
+		 * can only get here in the continuing-from-prev-record case, since
+		 * XRecOffIsValid rejected the zero-page-offset case otherwise.
 		 */
 		Assert(RecPtr == &tmpRecPtr);
-		tmpRecPtr.xrecoff += pageHeaderSize;
+		RecPtr->xrecoff += pageHeaderSize;
 		targetRecOff = pageHeaderSize;
 	}
 	else if (targetRecOff < pageHeaderSize)
@@ -4243,12 +4423,6 @@ XLogReadRecord(XLogRecPtr *RecPtr, bool fetching_ckpt, int emode)
 
 	failedSources |= readSource;
 
-	if (readFile >= 0)
-	{
-		close(readFile);
-		readFile = -1;
-	}
-
 	nextRecord = NULL;
 
 	/* In standby-mode, keep trying */
@@ -4685,7 +4859,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
 			 xlogfname,
 			 recoveryStopAfter ? "after" : "before",
 			 recoveryStopXid,
-			 str_time(recoveryStopTime));
+			 timestamptz_to_str(recoveryStopTime));
 
 	nbytes = strlen(buffer);
 	errno = 0;
@@ -4843,6 +5017,8 @@ WriteControlFile(void)
 	ControlFile->nameDataLen = NAMEDATALEN;
 	ControlFile->indexMaxKeys = INDEX_MAX_KEYS;
 
+	ControlFile->toast_max_chunk_size = TOAST_MAX_CHUNK_SIZE;
+
 #ifdef HAVE_INT64_TIMESTAMP
 	ControlFile->enableIntTimes = TRUE;
 #else
@@ -4938,6 +5114,16 @@ ReadControlFile(void)
 	 * of bytes.  Complaining about wrong version will probably be more
 	 * enlightening than complaining about wrong CRC.
 	 */
+
+	if (ControlFile->pg_control_version != PG_CONTROL_VERSION && ControlFile->pg_control_version % 65536 == 0 && ControlFile->pg_control_version / 65536 != 0)
+		ereport(FATAL,
+				(errmsg("database files are incompatible with server"),
+				 errdetail("The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x),"
+						   " but the server was compiled with PG_CONTROL_VERSION %d (0x%08x).",
+						   ControlFile->pg_control_version, ControlFile->pg_control_version,
+						   PG_CONTROL_VERSION, PG_CONTROL_VERSION),
+				 errhint("This could be a problem of mismatched byte ordering.  It looks like you need to initdb.")));
+
 	if (ControlFile->pg_control_version != PG_CONTROL_VERSION)
 		ereport(FATAL,
 				(errmsg("database files are incompatible with server"),
@@ -5030,6 +5216,13 @@ ReadControlFile(void)
 					  " but the server was compiled with INDEX_MAX_KEYS %d.",
 						   ControlFile->indexMaxKeys, INDEX_MAX_KEYS),
 				 errhint("It looks like you need to recompile or initdb.")));
+	if (ControlFile->toast_max_chunk_size != TOAST_MAX_CHUNK_SIZE)
+		ereport(FATAL,
+				(errmsg("database files are incompatible with server"),
+				 errdetail("The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d,"
+				" but the server was compiled with TOAST_MAX_CHUNK_SIZE %d.",
+			  ControlFile->toast_max_chunk_size, (int) TOAST_MAX_CHUNK_SIZE),
+				 errhint("It looks like you need to recompile or initdb.")));
 
 #ifdef HAVE_INT64_TIMESTAMP
 	if (ControlFile->enableIntTimes != TRUE)
@@ -5393,7 +5586,6 @@ BootStrapXLOG(void)
 	 */
 	checkPoint.redo.xlogid = 0;
 	checkPoint.redo.xrecoff = XLogSegSize + SizeOfXLogLongPHD;
-	checkPoint.undo = checkPoint.redo;
 	checkPoint.ThisTimeLineID = ThisTimeLineID;
 	checkPoint.nextXidEpoch = 0;
 	checkPoint.nextXid = FirstNormalTransactionId;
@@ -5494,13 +5686,8 @@ str_time(pg_time_t tnow)
 	static char buf[128];
 
 	pg_strftime(buf, sizeof(buf),
-			 /* Win32 timezone names are too long so don't print them */
-#ifndef WIN32
-			 "%Y-%m-%d %H:%M:%S %Z",
-#else
-			 "%Y-%m-%d %H:%M:%S",
-#endif
-			 pg_localtime(&tnow, log_timezone ? log_timezone : gmt_timezone));
+				"%Y-%m-%d %H:%M:%S %Z",
+				pg_localtime(&tnow, log_timezone));
 
 	return buf;
 }
@@ -5596,6 +5783,21 @@ XLogReadRecoveryCommandFile(int emode)
 			ereport(emode,
 					(errmsg("StandbyModeRequested = %s", tok2)));
 		}
+		else if (strcmp(tok1, "log_restartpoints") == 0)
+		{
+			/*
+			 * does nothing if a recovery_target is not also set
+			 */
+			if (strcmp(tok2, "true") == 0)
+				recoveryLogRestartpoints = true;
+			else
+			{
+				recoveryLogRestartpoints = false;
+				tok2 = "false";
+			}
+			ereport(LOG,
+					(errmsg("log_restartpoints = %s", tok2)));
+		}
 		else
 			ereport(FATAL,
 					(errmsg("unrecognized recovery parameter \"%s\"",
@@ -5738,6 +5940,9 @@ exitArchiveRecovery(TimeLineID endTLI, uint32 endLogId, uint32 endLogSeg)
  *
  * Returns TRUE if we are stopping, FALSE otherwise.  On TRUE return,
  * *includeThis is set TRUE if we should apply this record before stopping.
+ *
+ * We also track the timestamp of the latest applied COMMIT/ABORT record
+ * in recoveryLastXTime, for logging purposes.
  * Also, some information is saved in recoveryStopXid et al for use in
  * annotating the new timeline's history file.
  */
@@ -5746,11 +5951,7 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
 {
 	bool		stopsHere;
 	uint8		record_info;
-	time_t		recordXtime;
-
-	/* Do we have a PITR target at all? */
-	if (!recoveryTarget)
-		return false;
+	TimestampTz recordXtime;
 
 	/* We only consider stopping at COMMIT or ABORT records */
 	if (record->xl_rmid != RM_XACT_ID)
@@ -5761,18 +5962,25 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
 		xl_xact_commit *recordXactCommitData;
 
 		recordXactCommitData = (xl_xact_commit *) XLogRecGetData(record);
-		recordXtime = recordXactCommitData->xtime;
+		recordXtime = recordXactCommitData->xact_time;
 	}
 	else if (record_info == XLOG_XACT_ABORT)
 	{
 		xl_xact_abort *recordXactAbortData;
 
 		recordXactAbortData = (xl_xact_abort *) XLogRecGetData(record);
-		recordXtime = recordXactAbortData->xtime;
+		recordXtime = recordXactAbortData->xact_time;
 	}
 	else
 		return false;
 
+	/* Do we have a PITR target at all? */
+	if (!recoveryTarget)
+	{
+		recoveryLastXTime = recordXtime;
+		return false;
+	}
+
 	if (recoveryTargetExact)
 	{
 		/*
@@ -5814,24 +6022,33 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
 			if (recoveryStopAfter)
 				ereport(LOG,
 						(errmsg("recovery stopping after commit of transaction %u, time %s",
-							  recoveryStopXid, str_time(recoveryStopTime))));
+								recoveryStopXid,
+								timestamptz_to_str(recoveryStopTime))));
 			else
 				ereport(LOG,
 						(errmsg("recovery stopping before commit of transaction %u, time %s",
-							  recoveryStopXid, str_time(recoveryStopTime))));
+								recoveryStopXid,
+								timestamptz_to_str(recoveryStopTime))));
 		}
 		else
 		{
 			if (recoveryStopAfter)
 				ereport(LOG,
 						(errmsg("recovery stopping after abort of transaction %u, time %s",
-							  recoveryStopXid, str_time(recoveryStopTime))));
+								recoveryStopXid,
+								timestamptz_to_str(recoveryStopTime))));
 			else
 				ereport(LOG,
 						(errmsg("recovery stopping before abort of transaction %u, time %s",
-							  recoveryStopXid, str_time(recoveryStopTime))));
+								recoveryStopXid,
+								timestamptz_to_str(recoveryStopTime))));
 		}
+
+		if (recoveryStopAfter)
+			recoveryLastXTime = recordXtime;
 	}
+	else
+		recoveryLastXTime = recordXtime;
 
 	return stopsHere;
 }
@@ -5934,7 +6151,7 @@ StartupXLOG_InProduction(void)
 	 * pg_control state just in this special situation. CreateCheckpoint() also
 	 * has a comment referring this.
 	 */
-	CreateCheckPoint(true, true);
+	CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 
 	/*
 	 * If this system was a standby which was promoted (or whose catalog is not
@@ -6382,14 +6599,16 @@ StartupXLOG(void)
 		{
 			memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
 			wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
-			ereport(LOG,
+			ereport(DEBUG1,
 					(errmsg("checkpoint record is at %X/%X",
 							checkPointLoc.xlogid, checkPointLoc.xrecoff)));
 			InRecovery = true;	/* force recovery even if SHUTDOWNED */
 
 			/*
-			 * Make sure that REDO location exists. This may not be the case
-			 * if there was a crash during an online backup
+			 * Make sure that REDO location exists. This may not be
+			 * the case if there was a crash during an online backup,
+			 * which left a backup_label around that references a WAL
+			 * segment that's already been archived.
 			 */
 			if (XLByteLT(checkPoint.redo, checkPointLoc))
 			{
@@ -6401,10 +6620,10 @@ StartupXLOG(void)
 		}
 		else
 		{
-			ereport(PANIC,
+			ereport(FATAL,
 					(errmsg("could not locate required checkpoint record"),
 					 errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
-			wasShutdown = false;	/* keep compiler quiet */
+			wasShutdown = false; /* keep compiler quiet */
 		}
 		/* set flag to delete it later */
 		haveBackupLabel = true;
@@ -6427,7 +6646,7 @@ StartupXLOG(void)
 		record = ReadCheckpointRecord(checkPointLoc, 1);
 		if (record != NULL)
 		{
-			ereport(LOG,
+			ereport(DEBUG1,
 					(errmsg("checkpoint record is at %X/%X",
 							checkPointLoc.xlogid, checkPointLoc.xrecoff)));
 		}
@@ -6482,16 +6701,15 @@ StartupXLOG(void)
 	 */
 	XLogProcessCheckpointRecord(record, checkPointLoc);
 
-	ereport(LOG,
-	 (errmsg("redo record is at %X/%X; undo record is at %X/%X; shutdown %s",
-			 checkPoint.redo.xlogid, checkPoint.redo.xrecoff,
-			 checkPoint.undo.xlogid, checkPoint.undo.xrecoff,
-			 wasShutdown ? "TRUE" : "FALSE")));
-	ereport(LOG,
+	ereport(DEBUG1,
+			(errmsg("redo record is at %X/%X; shutdown %s",
+					checkPoint.redo.xlogid, checkPoint.redo.xrecoff,
+					wasShutdown ? "TRUE" : "FALSE")));
+	ereport(DEBUG1,
 			(errmsg("next transaction ID: %u/%u; next OID: %u",
 					checkPoint.nextXidEpoch, checkPoint.nextXid,
 					checkPoint.nextOid)));
-	ereport(LOG,
+	ereport(DEBUG1,
 			(errmsg("next MultiXactId: %u; next MultiXactOffset: %u",
 					checkPoint.nextMulti, checkPoint.nextMultiOffset)));
 
@@ -6507,6 +6725,10 @@ StartupXLOG(void)
 	XLogCtl->ckptXidEpoch = checkPoint.nextXidEpoch;
 	XLogCtl->ckptXid = checkPoint.nextXid;
 
+	/* also initialize latestCompletedXid, to nextXid - 1 */
+	ShmemVariableCache->latestCompletedXid = ShmemVariableCache->nextXid;
+	TransactionIdRetreat(ShmemVariableCache->latestCompletedXid);
+
 	/*
 	 * We must replay WAL entries using the same TimeLineID they were created
 	 * under, so temporarily adopt the TLI indicated by the checkpoint (see
@@ -6519,20 +6741,17 @@ StartupXLOG(void)
 	if (XLByteLT(RecPtr, checkPoint.redo))
 		ereport(PANIC,
 				(errmsg("invalid redo in checkpoint record")));
-	if (checkPoint.undo.xrecoff == 0)
-		checkPoint.undo = RecPtr;
 
 	/*
 	 * Check whether we need to force recovery from WAL.  If it appears to
 	 * have been a clean shutdown and we did not have a recovery.conf file,
 	 * then assume no recovery needed.
 	 */
-	if (XLByteLT(checkPoint.undo, RecPtr) ||
-		XLByteLT(checkPoint.redo, RecPtr))
+	if (XLByteLT(checkPoint.redo, RecPtr))
 	{
 		if (wasShutdown)
 			ereport(PANIC,
-				(errmsg("invalid redo/undo record in shutdown checkpoint")));
+					(errmsg("invalid redo record in shutdown checkpoint")));
 		InRecovery = true;
 	}
 	else if (StandbyModeRequested)
@@ -6724,7 +6943,7 @@ StartupXLOG(void)
 				 */
 				if (recoveryStopsHere(record, &recoveryApply))
 				{
-					reachedStopPoint = true;		/* see below */
+					reachedStopPoint = true;	/* see below */
 					recoveryContinue = false;
 					if (!recoveryApply)
 						break;
@@ -6799,11 +7018,16 @@ StartupXLOG(void)
 
 			} while (record != NULL && recoveryContinue);
 
+			CurrentResourceOwner = NULL;
+
 			ereport(LOG,
 					(errmsg("redo done at %X/%X",
 							ReadRecPtr.xlogid, ReadRecPtr.xrecoff)));
 
-			CurrentResourceOwner = NULL;
+			if (recoveryLastXTime)
+				ereport(LOG,
+					 (errmsg("last completed transaction was at log time %s",
+							 timestamptz_to_str(recoveryLastXTime))));
 			InRedo = false;
 		}
 		/*
@@ -6859,6 +7083,32 @@ StartupXLOG(void)
 	if (InRecovery &&
 		(XLByteLT(EndOfLog, ControlFile->minRecoveryPoint) ||
 		 !XLogRecPtrIsInvalid(ControlFile->backupStartPoint)))
+	{
+		if (reachedStopPoint)	/* stopped because of stop request */
+			ereport(FATAL,
+					(errmsg("requested recovery stop point is before end time of backup dump")));
+		else	/* ran off end of WAL */
+			ereport(FATAL,
+					(errmsg("WAL ends before end time of backup dump")));
+	}
+
+	/*
+	 * Consider whether we need to assign a new timeline ID.
+	 *
+	 * If we are doing an archive recovery, we always assign a new ID.	This
+	 * handles a couple of issues.	If we stopped short of the end of WAL
+	 * during recovery, then we are clearly generating a new timeline and must
+	 * assign it a unique new ID.  Even if we ran to the end, modifying the
+	 * current last segment is problematic because it may result in trying to
+	 * overwrite an already-archived copy of that segment, and we encourage
+	 * DBAs to make their archive_commands reject that.  We can dodge the
+	 * problem by making the new active segment have a new timeline ID.
+	 *
+	 * In a normal crash recovery, we can just extend the timeline we were in.
+	 *
+	 * GPDB: Greenplum doesn't support archive recovery.
+	 */
+	if (false /*InArchiveRecovery */)
 	{
 		/*
 		 * Ran off end of WAL before reaching end-of-backup WAL record, or
@@ -6991,7 +7241,7 @@ StartupXLOG(void)
 	/*
 	 * Preallocate additional log files, if wanted.
 	 */
-	(void) PreallocXlogFiles(EndOfLog);
+	PreallocXlogFiles(EndOfLog);
 
 	/*
 	 * Okay, we're finished with Pass 1.
@@ -8365,7 +8615,7 @@ ShutdownXLOG(int code __attribute__((unused)) , Datum arg __attribute__((unused)
 	 * Restart point has been updated by xlog redo in case of recovery.
 	 */
 	if (!RecoveryInProgress())
-		CreateCheckPoint(true, true);
+		CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 
 	ShutdownCLOG();
 	ShutdownSUBTRANS();
@@ -8434,6 +8684,61 @@ CheckKeepWalSegments(XLogRecPtr recptr, uint32 *_logId, uint32 *_logSeg)
 					PG_FUNCNAME_MACRO, *_logId, *_logSeg)));
 }
 
+/*
+ * Log start of a checkpoint.
+ */
+static void
+LogCheckpointStart(int flags)
+{
+	elog(LOG, "checkpoint starting:%s%s%s%s%s%s",
+		 (flags & CHECKPOINT_IS_SHUTDOWN) ? " shutdown" : "",
+		 (flags & CHECKPOINT_IMMEDIATE) ? " immediate" : "",
+		 (flags & CHECKPOINT_FORCE) ? " force" : "",
+		 (flags & CHECKPOINT_WAIT) ? " wait" : "",
+		 (flags & CHECKPOINT_CAUSE_XLOG) ? " xlog" : "",
+		 (flags & CHECKPOINT_CAUSE_TIME) ? " time" : "");
+}
+
+/*
+ * Log end of a checkpoint.
+ */
+static void
+LogCheckpointEnd(void)
+{
+	long		write_secs,
+				sync_secs,
+				total_secs;
+	int			write_usecs,
+				sync_usecs,
+				total_usecs;
+
+	CheckpointStats.ckpt_end_t = GetCurrentTimestamp();
+
+	TimestampDifference(CheckpointStats.ckpt_start_t,
+						CheckpointStats.ckpt_end_t,
+						&total_secs, &total_usecs);
+
+	TimestampDifference(CheckpointStats.ckpt_write_t,
+						CheckpointStats.ckpt_sync_t,
+						&write_secs, &write_usecs);
+
+	TimestampDifference(CheckpointStats.ckpt_sync_t,
+						CheckpointStats.ckpt_sync_end_t,
+						&sync_secs, &sync_usecs);
+
+	elog(LOG, "checkpoint complete: wrote %d buffers (%.1f%%); "
+		 "%d transaction log file(s) added, %d removed, %d recycled; "
+		 "write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s",
+		 CheckpointStats.ckpt_bufs_written,
+		 (double) CheckpointStats.ckpt_bufs_written * 100 / NBuffers,
+		 CheckpointStats.ckpt_segs_added,
+		 CheckpointStats.ckpt_segs_removed,
+		 CheckpointStats.ckpt_segs_recycled,
+		 write_secs, write_usecs / 1000,
+		 sync_secs, sync_usecs / 1000,
+		 total_secs, total_usecs / 1000);
+}
+
 /*
  * Perform a checkpoint --- either during shutdown, or on-the-fly
  *
@@ -8441,10 +8746,11 @@ CheckKeepWalSegments(XLogRecPtr recptr, uint32 *_logId, uint32 *_logSeg)
  * activity has occurred since the last one.
  */
 void
-CreateCheckPoint(bool shutdown, bool force)
+CreateCheckPoint(int flags)
 {
 	MIRRORED_LOCK_DECLARE;
 
+	bool		shutdown = (flags & CHECKPOINT_IS_SHUTDOWN) != 0;
 	CheckPoint	checkPoint;
 	XLogRecPtr	recptr;
 	XLogCtlInsert *Insert = &XLogCtl->Insert;
@@ -8454,9 +8760,8 @@ CreateCheckPoint(bool shutdown, bool force)
 	uint32		freespace;
 	uint32		_logId;
 	uint32		_logSeg;
-	int			nsegsadded = 0;
-	int			nsegsremoved = 0;
-	int			nsegsrecycled = 0;
+	TransactionId *inCommitXids;
+	int			nInCommit;
 
 	if (Debug_persistent_recovery_print)
 	  {
@@ -8490,6 +8795,16 @@ CreateCheckPoint(bool shutdown, bool force)
 	 */
 	LWLockAcquire(CheckpointLock, LW_EXCLUSIVE);
 
+	/*
+	 * Prepare to accumulate statistics.
+	 *
+	 * Note: because it is possible for log_checkpoints to change while a
+	 * checkpoint proceeds, we always accumulate stats, even if
+	 * log_checkpoints is currently off.
+	 */
+	MemSet(&CheckpointStats, 0, sizeof(CheckpointStats));
+	CheckpointStats.ckpt_start_t = GetCurrentTimestamp();
+
 	if (FileRepResync_IsTransitionFromResyncToInSync())
 	{
 		LWLockAcquire(MirroredLock, LW_EXCLUSIVE);
@@ -8535,6 +8850,14 @@ CreateCheckPoint(bool shutdown, bool force)
 		}
 	}
 
+	/*
+	 * Let smgr prepare for checkpoint; this has to happen before we determine
+	 * the REDO pointer.  Note that smgr must not do anything that'd have to
+	 * be undone if we decide no checkpoint is needed.
+	 */
+	smgrpreckpt();
+
+	/* Begin filling in the checkpoint WAL record */
 	MemSet(&checkPoint, 0, sizeof(checkPoint));
 	checkPoint.ThisTimeLineID = ThisTimeLineID;
 	checkPoint.time = time(NULL);
@@ -8552,6 +8875,9 @@ CreateCheckPoint(bool shutdown, bool force)
 	 * prevent persistent object reads while writing.  And acquire the MirroredLock
 	 * at a level that blocks DDL during FileRep statechanges...
 	 *
+	 * GPDB_83_MERGE_FIXME: CheckpointStartLock is no more. Do we need to hold something
+	 * else instead?
+	 * 
 	 * We get the CheckpointStartLock to prevent Persistent object writers as
 	 * we collect the Master Mirroring information from mmxlog_append_checkpoint_data
 	 * until finally after the checkpoint record is inserted into the XLOG to prevent the
@@ -8562,9 +8888,11 @@ CreateCheckPoint(bool shutdown, bool force)
 	 * either not yet logged, or logged and recorded in pg_clog. See notes in
 	 * RecordTransactionCommit().
 	 */
-	LWLockAcquire(CheckpointStartLock, LW_EXCLUSIVE);
 
-	/* And we need WALInsertLock too */
+	/*
+	 * We must hold WALInsertLock while examining insert state to determine
+	 * the checkpoint REDO pointer.
+	 */
 	LWLockAcquire(WALInsertLock, LW_EXCLUSIVE);
 
 	/*
@@ -8582,7 +8910,7 @@ CreateCheckPoint(bool shutdown, bool force)
 	 * the end of the last checkpoint record, and its redo pointer must point
 	 * to itself.
 	 */
-	if (!shutdown && !force)
+	if ((flags & (CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_FORCE)) == 0)
 	{
 		XLogRecPtr	curInsert;
 
@@ -8608,7 +8936,6 @@ CreateCheckPoint(bool shutdown, bool force)
 #endif
 		{
 			LWLockRelease(WALInsertLock);
-			LWLockRelease(CheckpointStartLock);
 			if (FileRepResync_IsTransitionFromResyncToInSync())
 			{
 				LWLockRelease(MirroredLock);
@@ -8665,18 +8992,51 @@ CreateCheckPoint(bool shutdown, bool force)
 	}
 
 	/*
-	 * Now we can release insert lock and checkpoint start lock, allowing
-	 * other xacts to proceed even while we are flushing disk buffers.
+	 * Now we can release WAL insert lock, allowing other xacts to proceed
+	 * while we are flushing disk buffers.
 	 */
 	LWLockRelease(WALInsertLock);
 
-	// We used to release the CheckpointStartLock here.  Now we do it after the checkpoint
-	// record is written...
-//	LWLockRelease(CheckpointStartLock);
+	/*
+	 * If enabled, log checkpoint start.  We postpone this until now so as not
+	 * to log anything if we decided to skip the checkpoint.
+	 */
+	if (log_checkpoints)
+		LogCheckpointStart(flags);
 
-	if (!shutdown)
-		ereport(DEBUG2,
-				(errmsg("checkpoint starting")));
+	/*
+	 * Before flushing data, we must wait for any transactions that are
+	 * currently in their commit critical sections.  If an xact inserted its
+	 * commit record into XLOG just before the REDO point, then a crash
+	 * restart from the REDO point would not replay that record, which means
+	 * that our flushing had better include the xact's update of pg_clog.  So
+	 * we wait till he's out of his commit critical section before proceeding.
+	 * See notes in RecordTransactionCommit().
+	 *
+	 * Because we've already released WALInsertLock, this test is a bit fuzzy:
+	 * it is possible that we will wait for xacts we didn't really need to
+	 * wait for.  But the delay should be short and it seems better to make
+	 * checkpoint take a bit longer than to hold locks longer than necessary.
+	 * (In fact, the whole reason we have this issue is that xact.c does
+	 * commit record XLOG insertion and clog update as two separate steps
+	 * protected by different locks, but again that seems best on grounds of
+	 * minimizing lock contention.)
+	 *
+	 * A transaction that has not yet set inCommit when we look cannot be at
+	 * risk, since he's not inserted his commit record yet; and one that's
+	 * already cleared it is not at risk either, since he's done fixing clog
+	 * and we will correctly flush the update below.  So we cannot miss any
+	 * xacts we need to wait for.
+	 */
+	nInCommit = GetTransactionsInCommit(&inCommitXids);
+	if (nInCommit > 0)
+	{
+		do
+		{
+			pg_usleep(10000L);	/* wait for 10 msec */
+		} while (HaveTransactionsInCommit(inCommitXids, nInCommit));
+	}
+	pfree(inCommitXids);
 
 	/*
 	 * Get the other info we need for the checkpoint record.
@@ -8710,7 +9070,7 @@ CreateCheckPoint(bool shutdown, bool force)
 	 */
 	END_CRIT_SECTION();
 
-	CheckPointGuts(checkPoint.redo);
+	CheckPointGuts(checkPoint.redo, flags);
 
 	START_CRIT_SECTION();
 
@@ -8805,9 +9165,6 @@ CreateCheckPoint(bool shutdown, bool force)
 			 XLogLastInsertDataLen());
 	}
 
-	// See the comments above where this lock is acquired.
-	LWLockRelease(CheckpointStartLock);
-
 	freeDtxCheckPointInfoAndUnlock(dtxCheckPointInfo, dtxCheckPointInfoSize, &recptr);
 
 	XLogFlush(recptr);
@@ -8861,7 +9218,7 @@ CreateCheckPoint(bool shutdown, bool force)
 	 */
 	XLogCtl->haveLastCheckpointLoc = true;
 	XLogCtl->lastCheckpointLoc = ProcLastRecPtr;
-	XLogCtl->lastCheckpointEndLoc = ProcLastRecEnd;
+	XLogCtl->lastCheckpointEndLoc = XactLastRecEnd;
 
 	UpdateControlFile();
 	LWLockRelease(ControlFileLock);
@@ -8879,12 +9236,17 @@ CreateCheckPoint(bool shutdown, bool force)
 
 	/*
 	 * We are now done with critical updates; no need for system panic if we
-	 * have trouble while fooling with offline log segments.
+	 * have trouble while fooling with old log segments.
 	 */
 	END_CRIT_SECTION();
 
 	/*
-	 * Delete offline log files (those no longer needed even for previous
+	 * Let smgr do post-checkpoint cleanup (eg, deleting old files).
+	 */
+	smgrpostckpt();
+
+	/*
+	 * Delete old log files (those no longer needed even for previous
 	 * checkpoint).
 	 */
 	if (gp_keep_all_xlog == false && (_logId || _logSeg))
@@ -8913,8 +9275,7 @@ CreateCheckPoint(bool shutdown, bool force)
 		}
 
 		PrevLogSeg(_logId, _logSeg);
-		MoveOfflineLogs(_logId, _logSeg, recptr,
-						&nsegsremoved, &nsegsrecycled);
+		RemoveOldXlogFiles(_logId, _logSeg, recptr);
 	}
 
 	/*
@@ -8922,7 +9283,7 @@ CreateCheckPoint(bool shutdown, bool force)
 	 * segments, to avoid having peak disk space usage higher than necessary.)
 	 */
 	if (!shutdown)
-		nsegsadded = PreallocXlogFiles(recptr);
+		PreallocXlogFiles(recptr);
 
 	/*
 	 * Truncate pg_subtrans if possible.  We can throw away all data before
@@ -8932,18 +9293,18 @@ CreateCheckPoint(bool shutdown, bool force)
 	 * StartupSUBTRANS hasn't been called yet.
 	 */
 	if (!InRecovery)
-		TruncateSUBTRANS(GetOldestXmin(true));
+		TruncateSUBTRANS(GetOldestXmin(true, false));
 
-	if (!shutdown)
-		ereport(DEBUG2,
-				(errmsg("checkpoint complete; %d transaction log file(s) added, %d removed, %d recycled",
-						nsegsadded, nsegsremoved, nsegsrecycled)));
+	/* All real work is done, but log before releasing lock. */
+	if (log_checkpoints)
+		LogCheckpointEnd();
 
+	/* GPDB_83_MERGE_FIXME: Isn't this redundant with log_checkpoints? */
 	if (Debug_persistent_recovery_print)
 		elog(PersistentRecovery_DebugPrintLevel(),
 			 "CreateCheckPoint: shutdown %s, force %s, checkpoint location %s, redo location %s",
 			 (shutdown ? "true" : "false"),
-			 (force ? "true" : "false"),
+			 ((flags & CHECKPOINT_FORCE) ? "true" : "false"),
 			 XLogLocationToString(&ControlFile->checkPoint),
 			 XLogLocationToString2(&checkPoint.redo));
 
@@ -8978,21 +9339,22 @@ CreateCheckPoint(bool shutdown, bool force)
  * recovery restartpoints.
  */
 static void
-CheckPointGuts(XLogRecPtr checkPointRedo)
+CheckPointGuts(XLogRecPtr checkPointRedo, int flags)
 {
 	CheckPointCLOG();
 	CheckPointSUBTRANS();
 	CheckPointMultiXact();
 	CheckPointChangeTracking();
 	DistributedLog_CheckPoint();
-	FlushBufferPool();			/* performs all required fsyncs */
+	CheckPointBuffers(flags);	/* performs all required fsyncs */
 	/* We deliberately delay 2PC checkpointing as long as possible */
 	CheckPointTwoPhase(checkPointRedo);
 }
 
-static void Checkpoint_RecoveryPass(XLogRecPtr checkPointRedo)
+static void
+Checkpoint_RecoveryPass(XLogRecPtr checkPointRedo)
 {
-	CheckPointGuts(checkPointRedo);
+	CheckPointGuts(checkPointRedo, CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 }
 
 /*
@@ -9040,7 +9402,13 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
 	{
 		if (RmgrTable[rmid].rm_safe_restartpoint != NULL)
 			if (!(RmgrTable[rmid].rm_safe_restartpoint()))
+			{
+				elog(DEBUG2, "RM %d not safe to record restart point at %X/%X",
+					 rmid,
+					 checkPoint->redo.xlogid,
+					 checkPoint->redo.xrecoff);
 				return;
+			}
 	}
 
 	/* Update the shared RedoRecPtr */
@@ -9051,7 +9419,7 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
 	/*
 	 * OK, force data out to disk
 	 */
-	CheckPointGuts(checkPoint->redo);
+	CheckPointGuts(checkPoint->redo, CHECKPOINT_IMMEDIATE);
 
 	if (IsStandbyMode())
 	{
@@ -9081,9 +9449,13 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
 
 	UpdateControlFile();
 
-	ereport(LOG,
+	ereport((recoveryLogRestartpoints ? LOG : DEBUG2),
 			(errmsg("recovery restart point at %X/%X",
 					checkPoint->redo.xlogid, checkPoint->redo.xrecoff)));
+	if (recoveryLastXTime)
+		ereport((recoveryLogRestartpoints ? LOG : DEBUG2),
+				(errmsg("last completed transaction was at log time %s",
+						timestamptz_to_str(recoveryLastXTime))));
 	elog((Debug_print_qd_mirroring ? LOG : DEBUG1), "RecoveryRestartPoint: checkpoint copy redo location %s, previous checkpoint location %s",
 		 XLogLocationToString(&ControlFile->checkPointCopy.redo),
 		 XLogLocationToString2(&ControlFile->prevCheckPoint));
@@ -9097,14 +9469,12 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
 		if (gp_keep_all_xlog == false && (_logId || _logSeg))
 		{
 			XLogRecPtr endptr;
-			int        nsegsremoved;
-			int        nsegsrecycled;
 
 			/* Get the current (or recent) end of xlog */
 			endptr = GetStandbyFlushRecPtr(NULL);
 
 			PrevLogSeg(_logId, _logSeg);
-			MoveOfflineLogs(_logId, _logSeg, endptr, &nsegsremoved, &nsegsrecycled);
+			RemoveOldXlogFiles(_logId, _logSeg, endptr);
 		}
 	}
 }
@@ -9132,14 +9502,14 @@ XLogPutNextOid(Oid nextOid)
 	 * does.
 	 *
 	 * Note, however, that the above statement only covers state "within" the
-	 * database.  When we use a generated OID as a file or directory name,
-	 * we are in a sense violating the basic WAL rule, because that filesystem
+	 * database.  When we use a generated OID as a file or directory name, we
+	 * are in a sense violating the basic WAL rule, because that filesystem
 	 * change may reach disk before the NEXTOID WAL record does.  The impact
-	 * of this is that if a database crash occurs immediately afterward,
-	 * we might after restart re-generate the same OID and find that it
-	 * conflicts with the leftover file or directory.  But since for safety's
-	 * sake we always loop until finding a nonconflicting filename, this poses
-	 * no real problem in practice. See pgsql-hackers discussion 27-Sep-2006.
+	 * of this is that if a database crash occurs immediately afterward, we
+	 * might after restart re-generate the same OID and find that it conflicts
+	 * with the leftover file or directory.  But since for safety's sake we
+	 * always loop until finding a nonconflicting filename, this poses no real
+	 * problem in practice. See pgsql-hackers discussion 27-Sep-2006.
 	 */
 }
 
@@ -9248,12 +9618,15 @@ xlog_redo(XLogRecPtr beginLoc __attribute__((unused)), XLogRecPtr lsn __attribut
 	{
 		Oid			nextOid;
 
+		/*
+		 * We used to try to take the maximum of ShmemVariableCache->nextOid
+		 * and the recorded nextOid, but that fails if the OID counter wraps
+		 * around.  Since no OID allocation should be happening during replay
+		 * anyway, better to just believe the record exactly.
+		 */
 		memcpy(&nextOid, XLogRecGetData(record), sizeof(Oid));
-		if (ShmemVariableCache->nextOid < nextOid)
-		{
-			ShmemVariableCache->nextOid = nextOid;
-			ShmemVariableCache->oidCount = 0;
-		}
+		ShmemVariableCache->nextOid = nextOid;
+		ShmemVariableCache->oidCount = 0;
 	}
 	else if (info == XLOG_CHECKPOINT_SHUTDOWN)
 	{
@@ -9320,15 +9693,13 @@ xlog_redo(XLogRecPtr beginLoc __attribute__((unused)), XLogRecPtr lsn __attribut
 		CheckPoint	checkPoint;
 
 		memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
-		/* In an ONLINE checkpoint, treat the counters like NEXTOID */
+		/* In an ONLINE checkpoint, treat the XID counter as a minimum */
 		if (TransactionIdPrecedes(ShmemVariableCache->nextXid,
 								  checkPoint.nextXid))
 			ShmemVariableCache->nextXid = checkPoint.nextXid;
-		if (ShmemVariableCache->nextOid < checkPoint.nextOid)
-		{
-			ShmemVariableCache->nextOid = checkPoint.nextOid;
-			ShmemVariableCache->oidCount = 0;
-		}
+		/* ... but still treat OID counter as exact */
+		ShmemVariableCache->nextOid = checkPoint.nextOid;
+		ShmemVariableCache->oidCount = 0;
 		MultiXactAdvanceNextMXact(checkPoint.nextMulti,
 								  checkPoint.nextMultiOffset);
 
@@ -9416,10 +9787,9 @@ xlog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record)
 		uint32				masterMirroringCheckpointLen;
 		prepared_transaction_agg_state  *ptas;
 
-		appendStringInfo(buf, "checkpoint: redo %X/%X; undo %X/%X; "
+		appendStringInfo(buf, "checkpoint: redo %X/%X; "
 						 "tli %u; xid %u/%u; oid %u; multi %u; offset %u; %s",
 						 checkpoint->redo.xlogid, checkpoint->redo.xrecoff,
-						 checkpoint->undo.xlogid, checkpoint->undo.xrecoff,
 						 checkpoint->ThisTimeLineID,
 						 checkpoint->nextXidEpoch, checkpoint->nextXid,
 						 checkpoint->nextOid,
@@ -9777,7 +10147,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile)
 			 * We use CHECKPOINT_IMMEDIATE only if requested by user (via
 			 * passing fast = true).  Otherwise this can take awhile.
 			 */
-			RequestCheckpoint(true, false);
+			RequestCheckpoint(CHECKPOINT_FORCE | CHECKPOINT_WAIT);
 
 			/*
 			 * Now we need to fetch the checkpoint record location, and also
@@ -10152,7 +10522,7 @@ do_pg_abort_backup(void)
  * pg_switch_xlog: switch to next xlog file
  */
 Datum
-pg_switch_xlog(PG_FUNCTION_ARGS __attribute__((unused)) )
+pg_switch_xlog(PG_FUNCTION_ARGS)
 {
 	text	   *result;
 	XLogRecPtr	switchpoint;
@@ -10161,7 +10531,7 @@ pg_switch_xlog(PG_FUNCTION_ARGS __attribute__((unused)) )
 	if (!superuser())
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 (errmsg("must be superuser to switch transaction log files"))));
+			 (errmsg("must be superuser to switch transaction log files"))));
 
 	switchpoint = RequestXLogSwitch();
 
diff --git a/src/backend/access/transam/xlog_mm.c b/src/backend/access/transam/xlog_mm.c
index b58630bcb307..cd810d172260 100644
--- a/src/backend/access/transam/xlog_mm.c
+++ b/src/backend/access/transam/xlog_mm.c
@@ -571,9 +571,8 @@ emit_mmxlog_fs_record(mm_fs_obj_type type, Oid filespace,
 		}
 
 		/*
-		 * Make a non-transactional XLOG entry showing the file creation. It's
-		 * non-transactional because we should replay it whether the transaction
-		 * commits or not; if not, the file will be dropped at abort time.
+		 * Make an XLOG entry showing the file creation.  If we abort, the file
+		 * will be dropped at abort time.
 		 */
 		xlrec.objtype = type;
 		xlrec.filespace = filespace;
@@ -628,7 +627,7 @@ emit_mmxlog_fs_record(mm_fs_obj_type type, Oid filespace,
 		rdata.buffer = InvalidBuffer;
 		rdata.next = NULL;
 
-		XLogInsert(RM_MMXLOG_ID, flags | XLOG_NO_TRAN, &rdata);
+		XLogInsert(RM_MMXLOG_ID, flags, &rdata);
 		*beginLoc = XLogLastInsertBeginLoc();
 
 		return true;
diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
index 164bdc8b546c..ed2f53b75144 100644
--- a/src/backend/access/transam/xlogutils.c
+++ b/src/backend/access/transam/xlogutils.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.49 2007/01/05 22:19:24 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.51 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -253,7 +253,9 @@ XLogCheckInvalidPages(void)
  * If "init" is true then the caller intends to rewrite the page fully
  * using the info in the XLOG record.  In this case we will extend the
  * relation if needed to make the page exist, and we will not complain about
- * the page being "new" (all zeroes).
+ * the page being "new" (all zeroes); in fact, we usually will supply a
+ * zeroed buffer without reading the page at all, so as to avoid unnecessary
+ * failure if the page is present on disk but has corrupt headers.
  *
  * If "init" is false then the caller needs the page to be valid already.
  * If the page doesn't exist or contains zeroes, we return InvalidBuffer.
@@ -275,7 +277,10 @@ XLogReadBuffer(Relation reln, BlockNumber blkno, bool init)
 	if (blkno < lastblock)
 	{
 		/* page exists in file */
-		buffer = ReadBuffer(reln, blkno);
+		if (init)
+			buffer = ReadOrZeroBuffer(reln, blkno);
+		else
+			buffer = ReadBuffer(reln, blkno);
 	}
 	else
 	{
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 452e6a9fc24c..c0224722ac90 100755
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.86 2007/01/09 02:14:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.91 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -340,7 +340,7 @@ Boot_DeclareIndexStmt:
 								LexIDStr($8),
 								NULL,
 								$10,
-								NULL, NIL, NIL,
+								NULL, NIL,
 								false, false, false,
 								false, false, true, false, false,
 								false, NULL);
@@ -359,7 +359,7 @@ Boot_DeclareUniqueIndexStmt:
 								LexIDStr($9),
 								NULL,
 								$11,
-								NULL, NIL, NIL,
+								NULL, NIL,
 								true, false, false,
 								false, false, true, false, false,
 								false,
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 5b3d32ed69c3..7a77fa59cd9f 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.232 2007/02/16 02:10:07 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.238 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,6 @@
 #include <getopt.h>
 #endif
 
-#define BOOTSTRAP_INCLUDE		/* mask out stuff in tcop/tcopprot.h */
-
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/xact.h"
@@ -37,6 +35,7 @@
 #include "nodes/makefuncs.h"
 #include "postmaster/bgwriter.h"
 #include "postmaster/primary_mirror_mode.h"
+#include "postmaster/walwriter.h"
 #include "replication/walreceiver.h"
 #include "storage/freespace.h"
 #include "storage/ipc.h"
@@ -178,7 +177,6 @@ struct typmap
 static struct typmap **Typ = NULL;
 static struct typmap *Ap = NULL;
 
-static int	Warnings = 0;
 static bool Nulls[MAXATTR];
 
 Form_pg_attribute attrtypes[MAXATTR];	/* points to attribute info */
@@ -359,6 +357,9 @@ AuxiliaryProcessMain(int argc, char *argv[])
 			case BgWriterProcess:
 				statmsg = "writer process";
 				break;
+			case WalWriterProcess:
+				statmsg = "wal writer process";
+				break;
 			case CheckpointProcess:
 				statmsg = "checkpoint process";
 				break;
@@ -490,6 +491,12 @@ AuxiliaryProcessMain(int argc, char *argv[])
 			WalReceiverMain();
 			proc_exit(1);		/* should never return */
 
+		case WalWriterProcess:
+			/* don't set signals, walwriter has its own agenda */
+			InitXLOGAccess();
+			WalWriterMain();
+			proc_exit(1);		/* should never return */
+
 		case FilerepProcess:
 			FileRep_Main();
 			proc_exit(1); /* should never return */
@@ -547,7 +554,7 @@ BootstrapModeMain(void)
 	 * Do backend-like initialization for bootstrap mode
 	 */
 	InitProcess();
-	(void) InitPostgres(NULL, InvalidOid, NULL, NULL);
+	InitPostgres(NULL, InvalidOid, NULL, NULL);
 
 	/* Initialize stuff for bootstrap-file processing */
 	for (i = 0; i < MAXATTR; i++)
@@ -567,11 +574,9 @@ BootstrapModeMain(void)
 
 	/* Perform a checkpoint to ensure everything's down to disk */
 	SetProcessingMode(NormalProcessing);
-	CreateCheckPoint(true, true);
-	SetProcessingMode(BootstrapProcessing);
+	CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 
 	/* Clean up and exit */
-	StartTransactionCommand();
 	cleanup();
 	proc_exit(0);
 }
@@ -648,18 +653,6 @@ ShutdownAuxiliaryProcess(int code, Datum arg)
 	LWLockReleaseAll();
 }
 
-/* ----------------
- *		error handling / abort routines
- * ----------------
- */
-void
-err_out(void)
-{
-	Warnings++;
-	cleanup();
-}
-
-
 /* ----------------------------------------------------------------
  *				MANUAL BACKEND INTERACTIVE INTERFACE COMMANDS
  * ----------------------------------------------------------------
@@ -913,15 +906,7 @@ InsertOneValue(char *value, int i)
 
 	elog(DEBUG4, "inserting column %d value \"%s\"", i, value);
 
-	if (Typ != NULL)
-	{
-		typoid = boot_reldesc->rd_att->attrs[i]->atttypid;
-	}
-	else
-	{
-		/* XXX why is typoid determined differently in this case? */
-		typoid = attrtypes[i]->atttypid;
-	}
+	typoid = boot_reldesc->rd_att->attrs[i]->atttypid;
 
 	boot_get_type_io_data(typoid,
 						  &typlen, &typbyval, &typalign,
@@ -954,19 +939,8 @@ InsertOneNull(int i)
 static void
 cleanup(void)
 {
-	static int	beenhere = 0;
-
-	if (!beenhere)
-		beenhere = 1;
-	else
-	{
-		elog(FATAL, "cleanup called twice");
-		proc_exit(1);
-	}
 	if (boot_reldesc != NULL)
 		closerel(NULL);
-	CommitTransactionCommand();
-	proc_exit(Warnings ? 1 : 0);
 }
 
 /* ----------------
@@ -1032,7 +1006,6 @@ gettype(char *type)
 		return gettype(type);
 	}
 	elog(ERROR, "unrecognized type \"%s\"", type);
-	err_out();
 	/* not reached, here to make compiler happy */
 	return 0;
 }
@@ -1401,8 +1374,7 @@ build_indices(void)
 		heap = heap_open(ILHead->il_heap, NoLock);
 		ind = index_open(ILHead->il_ind, NoLock);
 
-		elog(DEBUG4, "building index %s on %s", NameStr(ind->rd_rel->relname), NameStr(heap->rd_rel->relname));
-		index_build(heap, ind, ILHead->il_info, false);
+		index_build(heap, ind, ILHead->il_info, false, false);
 
 		index_close(ind, NoLock);
 		heap_close(heap, NoLock);
diff --git a/src/backend/catalog/.gitignore b/src/backend/catalog/.gitignore
index 2762194b7bed..30c1f742f40a 100644
--- a/src/backend/catalog/.gitignore
+++ b/src/backend/catalog/.gitignore
@@ -3,3 +3,4 @@
 /postgres.shdescription
 /cdb_init.sql
 /postgres_bki_srcs
+/schemapg.h
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 658f8547d170..c90bc6aaf1e2 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -15,7 +15,7 @@ QUICKLZ_COMPRESSION = quicklz_compression.o
 endif
 
 OBJS = catalog.o dependency.o heap.o index.o indexing.o namespace.o aclchk.o \
-       pg_aggregate.o pg_constraint.o pg_conversion.o pg_depend.o \
+       pg_aggregate.o pg_constraint.o pg_conversion.o pg_depend.o pg_enum.o \
        pg_largeobject.o pg_namespace.o pg_operator.o pg_proc.o pg_shdepend.o \
        pg_type.o toasting.o \
        pg_exttable.o pg_extprotocol.o \
@@ -62,9 +62,11 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/, \
 	pg_opfamily.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
 	pg_language.h pg_largeobject.h pg_aggregate.h pg_statistic.h \
 	pg_rewrite.h pg_trigger.h pg_listener.h pg_description.h pg_cast.h \
-	pg_namespace.h pg_conversion.h pg_depend.h \
+	pg_enum.h pg_namespace.h pg_conversion.h pg_depend.h \
 	pg_database.h pg_tablespace.h pg_pltemplate.h \
 	pg_authid.h pg_auth_members.h pg_shdepend.h pg_shdescription.h pg_resqueue.h \
+	pg_ts_config.h pg_ts_config_map.h pg_ts_dict.h \
+	pg_ts_parser.h pg_ts_template.h \
 	gp_configuration.h gp_id.h gp_policy.h gp_version.h \
 	gp_segment_config.h gp_san_config.h \
 	pg_window.h \
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 693586205878..0608917c5fd6 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.137 2007/02/14 01:58:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.143.2.1 2008/03/24 19:12:58 tgl Exp $
  *
  * NOTES
  *	  See acl.h.
@@ -40,6 +40,8 @@
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_filespace.h"
 #include "catalog/pg_type.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_dict.h"
 #include "cdb/cdbpartition.h"
 #include "commands/dbcommands.h"
 #include "commands/tablecmds.h"
@@ -394,35 +396,35 @@ ExecuteGrantStmt(GrantStmt *stmt)
 				 */
 			case ACL_OBJECT_RELATION:
 				all_privileges = ACL_ALL_RIGHTS_RELATION | ACL_ALL_RIGHTS_SEQUENCE;
-				errormsg = _("invalid privilege type %s for relation");
+				errormsg = gettext_noop("invalid privilege type %s for relation");
 				break;
 			case ACL_OBJECT_SEQUENCE:
 				all_privileges = ACL_ALL_RIGHTS_SEQUENCE;
-				errormsg = _("invalid privilege type %s for sequence");
+				errormsg = gettext_noop("invalid privilege type %s for sequence");
 				break;
 			case ACL_OBJECT_DATABASE:
 				all_privileges = ACL_ALL_RIGHTS_DATABASE;
-				errormsg = _("invalid privilege type %s for database");
+				errormsg = gettext_noop("invalid privilege type %s for database");
 				break;
 			case ACL_OBJECT_FUNCTION:
 				all_privileges = ACL_ALL_RIGHTS_FUNCTION;
-				errormsg = _("invalid privilege type %s for function");
+				errormsg = gettext_noop("invalid privilege type %s for function");
 				break;
 			case ACL_OBJECT_LANGUAGE:
 				all_privileges = ACL_ALL_RIGHTS_LANGUAGE;
-				errormsg = _("invalid privilege type %s for language");
+				errormsg = gettext_noop("invalid privilege type %s for language");
 				break;
 			case ACL_OBJECT_NAMESPACE:
 				all_privileges = ACL_ALL_RIGHTS_NAMESPACE;
-				errormsg = _("invalid privilege type %s for schema");
+				errormsg = gettext_noop("invalid privilege type %s for schema");
 				break;
 			case ACL_OBJECT_TABLESPACE:
 				all_privileges = ACL_ALL_RIGHTS_TABLESPACE;
-				errormsg = _("invalid privilege type %s for tablespace");
+				errormsg = gettext_noop("invalid privilege type %s for tablespace");
 				break;
 			case ACL_OBJECT_EXTPROTOCOL:
 				all_privileges = ACL_ALL_RIGHTS_EXTPROTOCOL;
-				errormsg = _("invalid privilege type %s for external protocol");
+				errormsg = gettext_noop("invalid privilege type %s for external protocol");
 				break;
 			default:
 				/* keep compiler quiet */
@@ -455,8 +457,7 @@ ExecuteGrantStmt(GrantStmt *stmt)
 				if (priv & ~((AclMode) all_privileges))
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_GRANT_OPERATION),
-							 errmsg(errormsg,
-									privilege_to_string(priv))));
+							 errmsg(errormsg, privilege_to_string(priv))));
 	
 				istmt.privileges |= priv;
 			}
@@ -1204,18 +1205,10 @@ ExecGrant_Language(InternalGrant *istmt)
 		int			nnewmembers;
 		Oid		   *oldmembers;
 		Oid		   *newmembers;
-		cqContext	cqc;
-		cqContext  *pcqCtx;
-
-		pcqCtx = caql_beginscan(
-				caql_addrel(cqclr(&cqc), relation),
-				cql("SELECT * FROM pg_language "
-					" WHERE oid = :1 "
-					" FOR UPDATE ",
-					ObjectIdGetDatum(langId)));
-
-		tuple = caql_getnext(pcqCtx);
 
+		tuple = SearchSysCache(LANGOID,
+							   ObjectIdGetDatum(langId),
+							   0, 0, 0);
 		if (!HeapTupleIsValid(tuple))
 			elog(ERROR, "cache lookup failed for language %u", langId);
 
@@ -1231,13 +1224,10 @@ ExecGrant_Language(InternalGrant *istmt)
 		/*
 		 * Get owner ID and working copy of existing ACL. If there's no ACL,
 		 * substitute the proper default.
-		 *
-		 * Note: for now, languages are treated as owned by the bootstrap
-		 * user. We should add an owner column to pg_language instead.
 		 */
-		ownerId = BOOTSTRAP_SUPERUSERID;
-		aclDatum = caql_getattr(pcqCtx, Anum_pg_language_lanacl,
-								&isNull);
+		ownerId = pg_language_tuple->lanowner;
+		aclDatum = SysCacheGetAttr(LANGNAME, tuple, Anum_pg_language_lanacl,
+								   &isNull);
 		if (isNull)
 			old_acl = acldefault(ACL_OBJECT_LANGUAGE, ownerId);
 		else
@@ -1281,10 +1271,13 @@ ExecGrant_Language(InternalGrant *istmt)
 		replaces[Anum_pg_language_lanacl - 1] = true;
 		values[Anum_pg_language_lanacl - 1] = PointerGetDatum(new_acl);
 
-		newtuple = caql_modify_current(pcqCtx, values, nulls, replaces);
+		newtuple = heap_modify_tuple(tuple, RelationGetDescr(relation), values,
+									 nulls, replaces);
 
-		caql_update_current(pcqCtx, newtuple);
-		/* and Update indexes (implicit) */
+		simple_heap_update(relation, &newtuple->t_self, newtuple);
+
+		/* keep the catalog indexes up to date */
+		CatalogUpdateIndexes(relation, newtuple);
 
 		/* Update the shared dependency ACL info */
 		updateAclDependencies(LanguageRelationId, HeapTupleGetOid(tuple),
@@ -1292,7 +1285,7 @@ ExecGrant_Language(InternalGrant *istmt)
 							  noldmembers, oldmembers,
 							  nnewmembers, newmembers);
 
-		caql_endscan(pcqCtx);
+		ReleaseSysCache(tuple);
 
 		pfree(new_acl);
 
@@ -1836,6 +1829,10 @@ static const char *const no_priv_msg[MAX_ACL_KIND] =
 	gettext_noop("permission denied for conversion %s"),
 	/* ACL_KIND_TABLESPACE */
 	gettext_noop("permission denied for tablespace %s"),
+	/* ACL_KIND_TSDICTIONARY */
+	gettext_noop("permission denied for text search dictionary %s"),
+	/* ACL_KIND_TSCONFIGURATION */
+	gettext_noop("permission denied for text search configuration %s"),
 	/* ACL_KIND_FILESPACE */
 	gettext_noop("permission denied for filespace %s"),	
 	/* ACL_KIND_EXTPROTOCOL */
@@ -1868,6 +1865,10 @@ static const char *const not_owner_msg[MAX_ACL_KIND] =
 	gettext_noop("must be owner of conversion %s"),
 	/* ACL_KIND_TABLESPACE */
 	gettext_noop("must be owner of tablespace %s"),
+	/* ACL_KIND_TSDICTIONARY */
+	gettext_noop("must be owner of text search dictionary %s"),
+	/* ACL_KIND_TSCONFIGURATION */
+	gettext_noop("must be owner of text search configuration %s"),
 	/* ACL_KIND_FILESPACE */
 	gettext_noop("must be owner of filespace %s"),
 	/* ACL_KIND_EXTPROTOCOL */
@@ -2274,8 +2275,7 @@ pg_language_aclmask(Oid lang_oid, Oid roleid,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("language with OID %u does not exist", lang_oid)));
 
-	/* XXX pg_language should have an owner column, but doesn't */
-	ownerId = BOOTSTRAP_SUPERUSERID;
+	ownerId = ((Form_pg_language) GETSTRUCT(tuple))->lanowner;
 
 	aclDatum = caql_getattr(pcqCtx, Anum_pg_language_lanacl,
 							&isNull);
@@ -2409,14 +2409,7 @@ pg_tablespace_aclmask(Oid spc_oid, Oid roleid,
 	cqContext	cqc;
 	cqContext  *pcqCtx;
 
-	/*
-	 * Only shared relations can be stored in global space; don't let even
-	 * superusers override this, except during bootstrap and upgrade.
-	 */
-	if (spc_oid == GLOBALTABLESPACE_OID && !IsBootstrapProcessingMode())
-		return 0;
-
-	/* Otherwise, superusers bypass all permission checking. */
+	/* Superusers bypass all permission checking. */
 	if (superuser_arg(roleid))
 		return mask;
 
@@ -2752,6 +2745,34 @@ pg_proc_ownercheck(Oid proc_oid, Oid roleid)
 	return has_privs_of_role(roleid, ownerId);
 }
 
+/*
+ * Ownership check for a procedural language (specified by OID)
+ */
+bool
+pg_language_ownercheck(Oid lan_oid, Oid roleid)
+{
+	HeapTuple	tuple;
+	Oid			ownerId;
+
+	/* Superusers bypass all permission checking. */
+	if (superuser_arg(roleid))
+		return true;
+
+	tuple = SearchSysCache(LANGOID,
+						   ObjectIdGetDatum(lan_oid),
+						   0, 0, 0);
+	if (!HeapTupleIsValid(tuple))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_FUNCTION),
+				 errmsg("language with OID %u does not exist", lan_oid)));
+
+	ownerId = ((Form_pg_language) GETSTRUCT(tuple))->lanowner;
+
+	ReleaseSysCache(tuple);
+
+	return has_privs_of_role(roleid, ownerId);
+}
+
 /*
  * Ownership check for a namespace (specified by OID).
  */
@@ -2895,6 +2916,65 @@ pg_opfamily_ownercheck(Oid opf_oid, Oid roleid)
 	return has_privs_of_role(roleid, ownerId);
 }
 
+/*
+ * Ownership check for a text search dictionary (specified by OID).
+ */
+bool
+pg_ts_dict_ownercheck(Oid dict_oid, Oid roleid)
+{
+	HeapTuple	tuple;
+	Oid			ownerId;
+
+	/* Superusers bypass all permission checking. */
+	if (superuser_arg(roleid))
+		return true;
+
+	tuple = SearchSysCache(TSDICTOID,
+						   ObjectIdGetDatum(dict_oid),
+						   0, 0, 0);
+	if (!HeapTupleIsValid(tuple))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("text search dictionary with OID %u does not exist",
+						dict_oid)));
+
+	ownerId = ((Form_pg_ts_dict) GETSTRUCT(tuple))->dictowner;
+
+	ReleaseSysCache(tuple);
+
+	return has_privs_of_role(roleid, ownerId);
+}
+
+/*
+ * Ownership check for a text search configuration (specified by OID).
+ */
+bool
+pg_ts_config_ownercheck(Oid cfg_oid, Oid roleid)
+{
+	HeapTuple	tuple;
+	Oid			ownerId;
+
+	/* Superusers bypass all permission checking. */
+	if (superuser_arg(roleid))
+		return true;
+
+	tuple = SearchSysCache(TSCONFIGOID,
+						   ObjectIdGetDatum(cfg_oid),
+						   0, 0, 0);
+	if (!HeapTupleIsValid(tuple))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+			   errmsg("text search configuration with OID %u does not exist",
+					  cfg_oid)));
+
+	ownerId = ((Form_pg_ts_config) GETSTRUCT(tuple))->cfgowner;
+
+	ReleaseSysCache(tuple);
+
+	return has_privs_of_role(roleid, ownerId);
+}
+
+
 /*
  * Ownership check for a database (specified by OID).
  */
diff --git a/src/backend/catalog/caql/catquery.c b/src/backend/catalog/caql/catquery.c
index e16714dc8a57..f14c63a95467 100644
--- a/src/backend/catalog/caql/catquery.c
+++ b/src/backend/catalog/caql/catquery.c
@@ -940,6 +940,7 @@ cqContext *
 caql_getattname_scan(cqContext *pCtx0, Oid relid, const char *attname)
 {
 	cqContext				*pCtx;
+	HeapTuple tup;
 
 	/* use the provided context, or *allocate* a clean one */
 	if (pCtx0)
@@ -950,8 +951,6 @@ caql_getattname_scan(cqContext *pCtx0, Oid relid, const char *attname)
 		pCtx->cq_free = true;  /* free this context in caql_endscan */
 	}
 
-	HeapTuple tup;
-
 	tup = SearchSysCacheAttName(relid, attname);
 
 	if (pCtx)
diff --git a/src/backend/catalog/caql/test/caqlanalyze_test.c b/src/backend/catalog/caql/test/caqlanalyze_test.c
index c24e70dd9493..6e53ebb718c4 100644
--- a/src/backend/catalog/caql/test/caqlanalyze_test.c
+++ b/src/backend/catalog/caql/test/caqlanalyze_test.c
@@ -400,11 +400,13 @@ test__caql_switch7(void **state)
 	cq_list			   *pcql = CaQL(query, 1, keys);
 	RelationData		dummyrel;
 	SysScanDescData		dummydesc;
+	SnapshotData		SnapshotDirty;
 
+	InitDirtySnapshot(SnapshotDirty);
 	dummyrel.rd_id = RelationRelationId;
 	hash_cookie = cq_lookup(query, strlen(query), pcql);
 
-	pCtx = caql_snapshot(cqclr(&context), SnapshotDirty);
+	pCtx = caql_snapshot(cqclr(&context), &SnapshotDirty);
 	/* setup heap_open */
 	expect__heap_open(RelationRelationId, true,
 					  AccessShareLock, true,
@@ -436,7 +438,7 @@ test__caql_switch7(void **state)
 	expect__systable_beginscan(&dummyrel, true,
 							   InvalidOid, false,
 							   false, true,
-							   SnapshotDirty, true,
+							   &SnapshotDirty, true,
 							   4, true,
 							   NULL, false,
 							   &dummydesc);
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 430b8b9915e2..0b5695481077 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.69 2007/01/05 22:19:24 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.72.2.1 2008/02/20 17:44:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@
 #include "access/transam.h"
 #include "catalog/catalog.h"
 #include "catalog/indexing.h"
+#include "catalog/namespace.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_auth_members.h"
@@ -606,15 +607,17 @@ IsSystemNamespace(Oid namespaceId)
 
 /*
  * IsToastNamespace
- *		True iff namespace is pg_toast.
+ *		True iff namespace is pg_toast or my temporary-toast-table namespace.
  *
- * NOTE: the reason this isn't a macro is to avoid having to include
- * catalog/pg_namespace.h in a lot of places.
+ * Note: this will return false for temporary-toast-table namespaces belonging
+ * to other backends.  Those are treated the same as other backends' regular
+ * temp table namespaces, and access is prevented where appropriate.
  */
 bool
 IsToastNamespace(Oid namespaceId)
 {
-	return namespaceId == PG_TOAST_NAMESPACE;
+	return (namespaceId == PG_TOAST_NAMESPACE) ||
+		isTempToastNamespace(namespaceId);
 }
 
 /*
@@ -983,10 +986,13 @@ Oid
 GetNewOidWithIndex(Relation relation, Relation indexrel)
 {
 	Oid			newOid;
+	SnapshotData SnapshotDirty;
 	IndexScanDesc scan;
 	ScanKeyData key;
 	bool		collides;
 
+	InitDirtySnapshot(SnapshotDirty);
+
 	/* Generate new OIDs until we find one not in the table */
 	do
 	{
@@ -1001,7 +1007,7 @@ GetNewOidWithIndex(Relation relation, Relation indexrel)
 
 		/* see notes above about using SnapshotDirty */
 		scan = index_beginscan(relation, indexrel,
-							   SnapshotDirty, 1, &key);
+							   &SnapshotDirty, 1, &key);
 
 		collides = HeapTupleIsValid(index_getnext(scan, ForwardScanDirection));
 
@@ -1100,8 +1106,10 @@ CheckNewRelFileNodeIsOk(Oid newOid, Oid reltablespace, bool relisshared,
 	char	   *rpath;
 	int			fd;
 	bool		collides;
-	
-	
+	SnapshotData SnapshotDirty;
+
+	InitDirtySnapshot(SnapshotDirty);
+
 	if (pg_class)
 	{
 		Oid			oidIndex;
@@ -1124,7 +1132,7 @@ CheckNewRelFileNodeIsOk(Oid newOid, Oid reltablespace, bool relisshared,
 					BTEqualStrategyNumber, F_OIDEQ,
 					ObjectIdGetDatum(newOid));
 
-		scan = index_beginscan(pg_class, indexrel, SnapshotDirty, 1, &key);
+		scan = index_beginscan(pg_class, indexrel, &SnapshotDirty, 1, &key);
 
 		collides = HeapTupleIsValid(index_getnext(scan, ForwardScanDirection));
 
diff --git a/src/backend/catalog/core/catcoregen.pl b/src/backend/catalog/core/catcoregen.pl
index ac32344d9bee..203f48128cf0 100644
--- a/src/backend/catalog/core/catcoregen.pl
+++ b/src/backend/catalog/core/catcoregen.pl
@@ -148,6 +148,7 @@
 #include "catalog/pg_database.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_description.h"
+#include "catalog/pg_enum.h"
 #include "catalog/pg_extprotocol.h"
 #include "catalog/pg_exttable.h"
 #include "catalog/pg_filespace.h"
@@ -171,6 +172,11 @@
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_trigger.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_config_map.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
 #include "catalog/pg_window.h"
 #include "catalog/pg_tidycat.h"
 #include "utils/fmgroids.h"
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 60dc843ae483..a9a694353378 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.64 2007/02/14 01:58:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.69.2.1 2008/07/11 16:08:50 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,6 +47,10 @@
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_trigger.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_type_encoding.h"
 #include "cdb/cdbpartition.h"
@@ -94,28 +98,32 @@ typedef struct
  * See also getObjectClass().
  */
 static const Oid object_classes[MAX_OCLASS] = {
-	RelationRelationId,					/* OCLASS_CLASS */
-	ProcedureRelationId,				/* OCLASS_PROC */
-	TypeRelationId,						/* OCLASS_TYPE */
-	CastRelationId,						/* OCLASS_CAST */
-	ConstraintRelationId,				/* OCLASS_CONSTRAINT */
-	ConversionRelationId,				/* OCLASS_CONVERSION */
-	AttrDefaultRelationId,				/* OCLASS_DEFAULT */
-	LanguageRelationId,					/* OCLASS_LANGUAGE */
-	OperatorRelationId,					/* OCLASS_OPERATOR */
-	OperatorClassRelationId,			/* OCLASS_OPCLASS */
-	OperatorFamilyRelationId,			/* OCLASS_OPFAMILY */
+	RelationRelationId,			/* OCLASS_CLASS */
+	ProcedureRelationId,		/* OCLASS_PROC */
+	TypeRelationId,				/* OCLASS_TYPE */
+	CastRelationId,				/* OCLASS_CAST */
+	ConstraintRelationId,		/* OCLASS_CONSTRAINT */
+	ConversionRelationId,		/* OCLASS_CONVERSION */
+	AttrDefaultRelationId,		/* OCLASS_DEFAULT */
+	LanguageRelationId,			/* OCLASS_LANGUAGE */
+	OperatorRelationId,			/* OCLASS_OPERATOR */
+	OperatorClassRelationId,	/* OCLASS_OPCLASS */
+	OperatorFamilyRelationId,	/* OCLASS_OPFAMILY */
 	AccessMethodOperatorRelationId,		/* OCLASS_AMOP */
 	AccessMethodProcedureRelationId,	/* OCLASS_AMPROC */
-	RewriteRelationId,					/* OCLASS_REWRITE */
-	TriggerRelationId,					/* OCLASS_TRIGGER */
-	NamespaceRelationId,				/* OCLASS_SCHEMA */
-	AuthIdRelationId,					/* OCLASS_ROLE */
-	DatabaseRelationId,					/* OCLASS_DATABASE */
-	TableSpaceRelationId,				/* OCLASS_TBLSPACE */
-	FileSpaceRelationId,        		/* OCLASS_FILESPACE */
-	ExtprotocolRelationId,				/* OCLASS_EXTPROTOCOL */
-	CompressionRelationId				/* OCLASS_COMPRESSION */
+	RewriteRelationId,			/* OCLASS_REWRITE */
+	TriggerRelationId,			/* OCLASS_TRIGGER */
+	NamespaceRelationId,		/* OCLASS_SCHEMA */
+	TSParserRelationId,			/* OCLASS_TSPARSER */
+	TSDictionaryRelationId,		/* OCLASS_TSDICT */
+	TSTemplateRelationId,		/* OCLASS_TSTEMPLATE */
+	TSConfigRelationId,			/* OCLASS_TSCONFIG */
+	AuthIdRelationId,			/* OCLASS_ROLE */
+	DatabaseRelationId,			/* OCLASS_DATABASE */
+	TableSpaceRelationId,		/* OCLASS_TBLSPACE */
+	FileSpaceRelationId,		/* OCLASS_FILESPACE */
+	ExtprotocolRelationId,		/* OCLASS_EXTPROTOCOL */
+	CompressionRelationId		/* OCLASS_COMPRESSION */
 };
 
 
@@ -1042,14 +1050,26 @@ doDeletion(const ObjectAddress *object)
 			RemoveSchemaById(object->objectId);
 			break;
 
+		case OCLASS_TSPARSER:
+			RemoveTSParserById(object->objectId);
+			break;
+
+		case OCLASS_TSDICT:
+			RemoveTSDictionaryById(object->objectId);
+			break;
+
+		case OCLASS_TSTEMPLATE:
+			RemoveTSTemplateById(object->objectId);
+			break;
+
+		case OCLASS_TSCONFIG:
+			RemoveTSConfigurationById(object->objectId);
+			break;
+
 		case OCLASS_FILESPACE:
 			RemoveFileSpaceById(object->objectId);
 			break;
 
-			/*
-			 * OCLASS_ROLE, OCLASS_DATABASE, OCLASS_TBLSPACE intentionally
-			 * not handled here
-			 */
 
 		case OCLASS_EXTPROTOCOL:
 			RemoveExtProtocolById(object->objectId);
@@ -1059,6 +1079,11 @@ doDeletion(const ObjectAddress *object)
 			elog(NOTICE, "dependency: not yet implemented!");
 			break;
 
+			/*
+			 * OCLASS_ROLE, OCLASS_DATABASE, OCLASS_TBLSPACE intentionally
+			 * not handled here
+			 */
+
 		default:
 			elog(ERROR, "unrecognized object class: %u",
 				 object->classId);
@@ -1113,6 +1138,12 @@ recordDependencyOnExpr(const ObjectAddress *depender,
  * range table.  An additional frammish is that dependencies on that
  * relation (or its component columns) will be marked with 'self_behavior',
  * whereas 'behavior' is used for everything else.
+ *
+ * NOTE: the caller should ensure that a whole-table dependency on the
+ * specified relation is created separately, if one is needed.  In particular,
+ * a whole-row Var "relation.*" will not cause this routine to emit any
+ * dependency item.  This is appropriate behavior for subexpressions of an
+ * ordinary query, so other cases need to cope as necessary.
  */
 void
 recordDependencyOnSingleRelExpr(const ObjectAddress *depender,
@@ -1228,7 +1259,14 @@ find_expr_references_walker(Node *node,
 
 		/*
 		 * A whole-row Var references no specific columns, so adds no new
-		 * dependency.
+		 * dependency.  (We assume that there is a whole-table dependency
+		 * arising from each underlying rangetable entry.  While we could
+		 * record such a dependency when finding a whole-row Var that
+		 * references a relation directly, it's quite unclear how to extend
+		 * that to whole-row Vars for JOINs, so it seems better to leave the
+		 * responsibility with the range table.  Note that this poses some
+		 * risks for identifying dependencies of stand-alone expressions:
+		 * whole-table references may need to be created separately.)
 		 */
 		if (var->varattno == InvalidAttrNumber)
 			return false;
@@ -1270,8 +1308,8 @@ find_expr_references_walker(Node *node,
 		/*
 		 * If it's a regclass or similar literal referring to an existing
 		 * object, add a reference to that object.	(Currently, only the
-		 * regclass case has any likely use, but we may as well handle all the
-		 * OID-alias datatypes consistently.)
+		 * regclass and regconfig cases have any likely use, but we may as
+		 * well handle all the OID-alias datatypes consistently.)
 		 */
 		if (!con->constisnull)
 		{
@@ -1320,6 +1358,22 @@ find_expr_references_walker(Node *node,
 						add_object_address(OCLASS_TYPE, objoid, 0,
 										   context->addrs);
 					break;
+				case REGCONFIGOID:
+					objoid = DatumGetObjectId(con->constvalue);
+					if (SearchSysCacheExists(TSCONFIGOID,
+											 ObjectIdGetDatum(objoid),
+											 0, 0, 0))
+						add_object_address(OCLASS_TSCONFIG, objoid, 0,
+										   context->addrs);
+					break;
+				case REGDICTIONARYOID:
+					objoid = DatumGetObjectId(con->constvalue);
+					if (SearchSysCacheExists(TSDICTOID,
+											 ObjectIdGetDatum(objoid),
+											 0, 0, 0))
+						add_object_address(OCLASS_TSDICT, objoid, 0,
+										   context->addrs);
+					break;
 			}
 		}
 		return false;
@@ -1404,9 +1458,10 @@ find_expr_references_walker(Node *node,
 	if (IsA(node, CoerceViaIO))
 	{
 		CoerceViaIO *iocoerce = (CoerceViaIO *) node;
+
 		/* since there is no exposed function, need to depend on type */
 		add_object_address(OCLASS_TYPE, iocoerce->resulttype, 0,
-						context->addrs);
+						   context->addrs);
 	}
 	if (IsA(node, ArrayCoerceExpr))
 	{
@@ -1691,6 +1746,21 @@ object_address_present(const ObjectAddress *object,
 	return false;
 }
 
+/*
+ * Record multiple dependencies from an ObjectAddresses array, after first
+ * removing any duplicates.
+ */
+void
+record_object_address_dependencies(const ObjectAddress *depender,
+								   ObjectAddresses *referenced,
+								   DependencyType behavior)
+{
+	eliminate_duplicate_dependencies(referenced);
+	recordMultipleDependencies(depender,
+							   referenced->refs, referenced->numrefs,
+							   behavior);
+}
+
 /*
  * Clean up when done with an ObjectAddresses array.
  */
@@ -1776,6 +1846,22 @@ getObjectClass(const ObjectAddress *object)
 			Assert(object->objectSubId == 0);
 			return OCLASS_SCHEMA;
 
+		case TSParserRelationId:
+			Assert(object->objectSubId == 0);
+			return OCLASS_TSPARSER;
+
+		case TSDictionaryRelationId:
+			Assert(object->objectSubId == 0);
+			return OCLASS_TSDICT;
+
+		case TSTemplateRelationId:
+			Assert(object->objectSubId == 0);
+			return OCLASS_TSTEMPLATE;
+
+		case TSConfigRelationId:
+			Assert(object->objectSubId == 0);
+			return OCLASS_TSCONFIG;
+
 		case AuthIdRelationId:
 			Assert(object->objectSubId == 0);
 			return OCLASS_ROLE;
@@ -2146,6 +2232,70 @@ getObjectDescription(const ObjectAddress *object)
 				break;
 			}
 
+		case OCLASS_TSPARSER:
+			{
+				HeapTuple	tup;
+
+				tup = SearchSysCache(TSPARSEROID,
+									 ObjectIdGetDatum(object->objectId),
+									 0, 0, 0);
+				if (!HeapTupleIsValid(tup))
+					elog(ERROR, "cache lookup failed for text search parser %u",
+						 object->objectId);
+				appendStringInfo(&buffer, _("text search parser %s"),
+					 NameStr(((Form_pg_ts_parser) GETSTRUCT(tup))->prsname));
+				ReleaseSysCache(tup);
+				break;
+			}
+
+		case OCLASS_TSDICT:
+			{
+				HeapTuple	tup;
+
+				tup = SearchSysCache(TSDICTOID,
+									 ObjectIdGetDatum(object->objectId),
+									 0, 0, 0);
+				if (!HeapTupleIsValid(tup))
+					elog(ERROR, "cache lookup failed for text search dictionary %u",
+						 object->objectId);
+				appendStringInfo(&buffer, _("text search dictionary %s"),
+					  NameStr(((Form_pg_ts_dict) GETSTRUCT(tup))->dictname));
+				ReleaseSysCache(tup);
+				break;
+			}
+
+		case OCLASS_TSTEMPLATE:
+			{
+				HeapTuple	tup;
+
+				tup = SearchSysCache(TSTEMPLATEOID,
+									 ObjectIdGetDatum(object->objectId),
+									 0, 0, 0);
+				if (!HeapTupleIsValid(tup))
+					elog(ERROR, "cache lookup failed for text search template %u",
+						 object->objectId);
+				appendStringInfo(&buffer, _("text search template %s"),
+				  NameStr(((Form_pg_ts_template) GETSTRUCT(tup))->tmplname));
+				ReleaseSysCache(tup);
+				break;
+			}
+
+		case OCLASS_TSCONFIG:
+			{
+				HeapTuple	tup;
+
+				tup = SearchSysCache(TSCONFIGOID,
+									 ObjectIdGetDatum(object->objectId),
+									 0, 0, 0);
+				if (!HeapTupleIsValid(tup))
+					elog(ERROR, "cache lookup failed for text search configuration %u",
+						 object->objectId);
+				appendStringInfo(&buffer, _("text search configuration %s"),
+					 NameStr(((Form_pg_ts_config) GETSTRUCT(tup))->cfgname));
+				ReleaseSysCache(tup);
+				break;
+			}
+
 		case OCLASS_ROLE:
 			{
 				appendStringInfo(&buffer, _("role %s"),
diff --git a/src/backend/catalog/gp_toolkit.sql b/src/backend/catalog/gp_toolkit.sql
index 9fae3753cc9a..18c22edaf8b7 100644
--- a/src/backend/catalog/gp_toolkit.sql
+++ b/src/backend/catalog/gp_toolkit.sql
@@ -1284,15 +1284,15 @@ GRANT SELECT ON TABLE gp_toolkit.gp_resq_role TO public;
 CREATE VIEW gp_toolkit.gp_locks_on_resqueue
 AS
     SELECT
-        pgsa.usename     AS lorusename,
-        pgrq.rsqname     AS lorrsqname,
-        pgl.locktype     AS lorlocktype,
-        pgl.objid        AS lorobjid,
-        pgl.transaction  AS lortransaction,
-        pgl.pid          AS lorpid,
-        pgl.mode         AS lormode,
-        pgl.granted      AS lorgranted,
-        pgsa.waiting     AS lorwaiting
+        pgsa.usename      AS lorusename,
+        pgrq.rsqname      AS lorrsqname,
+        pgl.locktype      AS lorlocktype,
+        pgl.objid         AS lorobjid,
+        pgl.transactionid AS lortransaction,
+        pgl.pid           AS lorpid,
+        pgl.mode          AS lormode,
+        pgl.granted       AS lorgranted,
+        pgsa.waiting      AS lorwaiting
     FROM pg_catalog.pg_stat_activity pgsa
 
     JOIN pg_catalog.pg_locks pgl
@@ -1319,7 +1319,7 @@ AS
         pgl.database       AS lordatabase,
         pgc.relname        AS lorrelname,
         pgl.relation       AS lorrelation,
-        pgl.transaction    AS lortransaction,
+        pgl.transactionid  AS lortransaction,
         pgl.pid            AS lorpid,
         pgl.mode           AS lormode,
         pgl.granted        AS lorgranted,
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index a6d7e2ff69ad..6dbed6a28885 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.317 2007/02/14 01:58:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.327.2.1 2009/02/24 01:38:49 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -101,7 +101,8 @@ static void AddNewRelationTuple(Relation pg_class_desc,
 					char relkind,
 					char relstorage,
 					Datum reloptions);
-static Oid AddNewRelationType(const char *typeName,
+static Oid AddNewRelationType(Oid new_type_oid,
+				   const char *typeName,
 				   Oid typeNamespace,
 				   Oid new_rel_oid,
 				   char new_rel_kind,
@@ -502,7 +503,7 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind)
 					   NameStr(tupdesc->attrs[i]->attname)) == 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_DUPLICATE_COLUMN),
-						 errmsg("column name \"%s\" is duplicated",
+						 errmsg("column name \"%s\" specified more than once",
 								NameStr(tupdesc->attrs[j]->attname))));
 		}
 	}
@@ -513,7 +514,8 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind)
 	for (i = 0; i < natts; i++)
 	{
 		CheckAttributeType(NameStr(tupdesc->attrs[i]->attname),
-						   tupdesc->attrs[i]->atttypid);
+						   tupdesc->attrs[i]->atttypid,
+						   NIL /* assume we're creating a new rowtype */);
 	}
 }
 
@@ -521,66 +523,106 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind)
  *		CheckAttributeType
  *
  *		Verify that the proposed datatype of an attribute is legal.
- *		This is needed because there are types (and pseudo-types)
+ *		This is needed mainly because there are types (and pseudo-types)
  *		in the catalogs that we do not support as elements of real tuples.
+ *		We also check some other properties required of a table column.
+ *
+ * If the attribute is being proposed for addition to an existing table or
+ * composite type, pass a one-element list of the rowtype OID as
+ * containing_rowtypes.  When checking a to-be-created rowtype, it's
+ * sufficient to pass NIL, because there could not be any recursive reference
+ * to a not-yet-existing rowtype.
  * --------------------------------
  */
 void
-CheckAttributeType(const char *attname, Oid atttypid)
+CheckAttributeType(const char *attname, Oid atttypid,
+				   List *containing_rowtypes)
 {
 	char		att_typtype = get_typtype(atttypid);
+	Oid			att_typelem;
 
-	if (Gp_role != GP_ROLE_EXECUTE)
+	if (Gp_role == GP_ROLE_EXECUTE)
 	{
-		if (atttypid == UNKNOWNOID)
-		{
-			/*
-			 * Warn user, but don't fail, if column to be created has UNKNOWN type
-			 * (usually as a result of a 'retrieve into' - jolly)
-			 */
-			ereport(WARNING,
+		/*
+		 * In executor nodes, don't bother checking, as the dispatcher should've
+		 * checked this already.
+		 */
+		return;
+	}
+
+	if (atttypid == UNKNOWNOID)
+	{
+		/*
+		 * Warn user, but don't fail, if column to be created has UNKNOWN type
+		 * (usually as a result of a 'retrieve into' - jolly)
+		 */
+		ereport(WARNING,
+				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+				 errmsg("column \"%s\" has type \"unknown\"", attname),
+				 errdetail("Proceeding with relation creation anyway.")));
+	}
+	else if (att_typtype == TYPTYPE_PSEUDO)
+	{
+		/*
+		 * Refuse any attempt to create a pseudo-type column, except for a
+		 * special hack for pg_statistic: allow ANYARRAY during initdb
+		 */
+		if (atttypid != ANYARRAYOID || IsUnderPostmaster)
+			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-					 errmsg("column \"%s\" has type \"unknown\"", attname),
-					 errdetail("Proceeding with relation creation anyway.")));
-		}
-		else if (att_typtype == TYPTYPE_PSEUDO)
-		{
-			/*
-			 * Refuse any attempt to create a pseudo-type column, except for
-			 * a special hack for pg_statistic: allow ANYARRAY during initdb
-			 */
-			if (atttypid != ANYARRAYOID || IsUnderPostmaster)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-						 errmsg("column \"%s\" has pseudo-type %s",
-								attname, format_type_be(atttypid))));
-		}
-		else if (att_typtype == TYPTYPE_COMPOSITE)
-		{
-			/*
-			 * For a composite type, recurse into its attributes.  You might
-			 * think this isn't necessary, but since we allow system catalogs
-			 * to break the rule, we have to guard against the case.
-			 */
-			Relation relation;
-			TupleDesc tupdesc;
-			int i;
+					 errmsg("column \"%s\" has pseudo-type %s",
+							attname, format_type_be(atttypid))));
+	}
+	else if (att_typtype == TYPTYPE_COMPOSITE)
+	{
+		/*
+		 * For a composite type, recurse into its attributes.  You might think
+		 * this isn't necessary, but since we allow system catalogs to break
+		 * the rule, we have to guard against the case.
+		 */
+		Relation	relation;
+		TupleDesc	tupdesc;
+		int			i;
 
-			relation = relation_open(get_typ_typrelid(atttypid), AccessShareLock);
+		/*
+		 * Check for self-containment.  Eventually we might be able to allow
+		 * this (just return without complaint, if so) but it's not clear how
+		 * many other places would require anti-recursion defenses before it
+		 * would be safe to allow tables to contain their own rowtype.
+		 */
+		if (list_member_oid(containing_rowtypes, atttypid))
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+					 errmsg("composite type %s cannot be made a member of itself",
+							format_type_be(atttypid))));
 
-			tupdesc = RelationGetDescr(relation);
+		containing_rowtypes = lcons_oid(atttypid, containing_rowtypes);
 
-			for (i = 0; i < tupdesc->natts; i++)
-			{
-				Form_pg_attribute attr = tupdesc->attrs[i];
+		relation = relation_open(get_typ_typrelid(atttypid), AccessShareLock);
 
-				if (attr->attisdropped)
-					continue;
-				CheckAttributeType(NameStr(attr->attname), attr->atttypid);
-			}
+		tupdesc = RelationGetDescr(relation);
 
-			relation_close(relation, AccessShareLock);
+		for (i = 0; i < tupdesc->natts; i++)
+		{
+			Form_pg_attribute attr = tupdesc->attrs[i];
+
+			if (attr->attisdropped)
+				continue;
+			CheckAttributeType(NameStr(attr->attname), attr->atttypid,
+							   containing_rowtypes);
 		}
+
+		relation_close(relation, AccessShareLock);
+
+		containing_rowtypes = list_delete_first(containing_rowtypes);
+	}
+	else if (OidIsValid((att_typelem = get_element_type(atttypid))))
+	{
+		/*
+		 * Must recurse into array types, too, in case they are composite.
+		 */
+		CheckAttributeType(attname, att_typelem,
+						   containing_rowtypes);
 	}
 }
 
@@ -1108,13 +1150,10 @@ AddNewRelationTuple(Relation pg_class_desc,
 	{
 		/*
 		 * Initialize to the minimum XID that could put tuples in the table.
-		 * We know that no xacts older than RecentXmin are still running,
-		 * so that will do.
+		 * We know that no xacts older than RecentXmin are still running, so
+		 * that will do.
 		 */
-		if (!IsBootstrapProcessingMode())
-			new_rel_reltup->relfrozenxid = RecentXmin;
-		else
-			new_rel_reltup->relfrozenxid = FirstNormalTransactionId;
+		new_rel_reltup->relfrozenxid = RecentXmin;
 	}
 	else
 	{
@@ -1146,7 +1185,8 @@ AddNewRelationTuple(Relation pg_class_desc,
  * --------------------------------
  */
 static Oid
-AddNewRelationType(const char *typeName,
+AddNewRelationType(Oid new_type_oid,
+				   const char *typeName,
 				   Oid typeNamespace,
 				   Oid new_rel_oid,
 				   char new_rel_kind,
@@ -1154,7 +1194,8 @@ AddNewRelationType(const char *typeName,
 				   Oid new_array_type)
 {
 	return
-		TypeCreate(typeName,		/* type name */
+		TypeCreate(new_type_oid,	/* can have a predetermined OID in bootstrap */
+				   typeName,		/* type name */
 				   typeNamespace,	/* type namespace */
 				   new_rel_oid, 	/* relation oid */
 				   new_rel_kind,	/* relation kind */
@@ -1197,8 +1238,6 @@ InsertGpRelationNodeTuple(
 	Datum		values[Natts_gp_relation_node];
 	bool		nulls[Natts_gp_relation_node];
 	HeapTuple	tuple;
-//	cqContext	cqc;
-//	cqContext  *pcqCtx;
 
 	if (!Persistent_BeforePersistenceWork() &&
 		PersistentStore_IsZeroTid(persistentTid))
@@ -1225,11 +1264,6 @@ InsertGpRelationNodeTuple(
 			 persistentSerialNum,
 			 ItemPointerToString(persistentTid));
 
-//	pcqCtx = caql_beginscan(
-//			caql_addrel(cqclr(&cqc), pg_class_desc),
-//			cqlXXX("INSERT INTO gp_relation_node ",
-//				NULL));
-
 	GpRelationNode_SetDatumValues(
 								values,
 								relfilenode,
@@ -1238,7 +1272,6 @@ InsertGpRelationNodeTuple(
 								persistentTid,
 								persistentSerialNum);
 
-//	tuple = caql_form_tuple(pcqCtx, values, nulls);
 	/* XXX XXX: note optional index update */
 	tuple = heap_form_tuple(RelationGetDescr(gp_relation_node), values, nulls);
 
@@ -1250,8 +1283,6 @@ InsertGpRelationNodeTuple(
 		CatalogUpdateIndexes(gp_relation_node, tuple);
 	}
 
-//	caql_endscan(pcqCtx);
-
 	heap_freetuple(tuple);
 }
 
@@ -1368,11 +1399,24 @@ heap_create_with_catalog(const char *relname,
 	Relation	pg_class_desc;
 	Relation	gp_relation_node_desc;
 	Relation	new_rel_desc;
+	Oid			old_type_oid;
 	Oid			new_type_oid;
 	Oid			new_array_oid = InvalidOid;
 	bool		appendOnlyRel;
 	StdRdOptions *stdRdOptions;
 	int			safefswritesize = gp_safefswritesize;
+	bool		rowtype_already_exists;
+
+	if (comptypeArrayOid)
+	    new_array_oid = *comptypeArrayOid;
+
+	/*
+	 * Don't create the row type if the bootstrapper tells us it already
+	 * knows what it is.
+	 */
+	rowtype_already_exists =
+		(IsBootstrapProcessingMode() &&
+		 (PointerIsValid(comptypeOid) && OidIsValid(*comptypeOid)));
 
 	if (PointerIsValid(comptypeArrayOid))
 	{
@@ -1445,6 +1489,46 @@ heap_create_with_catalog(const char *relname,
 				(errcode(ERRCODE_DUPLICATE_TABLE),
 				 errmsg("relation \"%s\" already exists", relname)));
 
+	/*
+	 * Since we are going to create a rowtype as well, also check for
+	 * collision with an existing type name.  If there is one and it's an
+	 * autogenerated array, we can rename it out of the way; otherwise we can
+	 * at least give a good error message.
+	 */
+	old_type_oid = GetSysCacheOid(TYPENAMENSP,
+								  CStringGetDatum(relname),
+								  ObjectIdGetDatum(relnamespace),
+								  0, 0);
+	if (OidIsValid(old_type_oid) && !rowtype_already_exists)
+	{
+		if (!moveArrayTypeName(old_type_oid, relname, relnamespace))
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_OBJECT),
+					 errmsg("type \"%s\" already exists", relname),
+			   errhint("A relation has an associated type of the same name, "
+					   "so you must use a name that doesn't conflict "
+					   "with any existing type.")));
+	}
+
+	/*
+	 * Validate shared/non-shared tablespace (must check this before doing
+	 * GetNewRelFileNode, to prevent Assert therein)
+	 */
+	if (shared_relation)
+	{
+		if (reltablespace != GLOBALTABLESPACE_OID)
+			/* elog since this is not a user-facing error */
+			elog(ERROR,
+				 "shared relations must be placed in pg_global tablespace");
+	}
+	else
+	{
+		if (reltablespace == GLOBALTABLESPACE_OID)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("only shared relations can be placed in pg_global tablespace")));
+	}
+
 	/*
 	 * Allocate an OID for the relation, unless we were told what to use.
 	 *
@@ -1509,61 +1593,44 @@ heap_create_with_catalog(const char *relname,
 	 * NOTE: we could get a unique-index failure here, in case the same name
 	 * has already been used for a type.
 	 *
-	 * Don't create the shell type if the bootstrapper tells us it already
-	 * knows what it is. Importing for upgrading.
+	 * Also not for the auxiliary heaps created for bitmap indexes.
 	 */
-	if (IsBootstrapProcessingMode() &&
-		(PointerIsValid(comptypeOid) && OidIsValid(*comptypeOid)))
+	if (IsUnderPostmaster && (relkind == RELKIND_RELATION ||
+							  relkind == RELKIND_VIEW ||
+							  relkind == RELKIND_COMPOSITE_TYPE) &&
+		relnamespace != PG_BITMAPINDEX_NAMESPACE &&
+		!OidIsValid(new_array_oid))
 	{
-		new_type_oid = *comptypeOid;
+		/* OK, so pre-assign a type OID for the array type */
+		Relation	pg_type = heap_open(TypeRelationId, AccessShareLock);
+
+		new_array_oid = GetNewOid(pg_type);
+		heap_close(pg_type, AccessShareLock);
 	}
+
+	/*
+	 * Since defining a relation also defines a complex type, we add a new
+	 * system type corresponding to the new relation.
+	 *
+	 * NOTE: we could get a unique-index failure here, in case someone else is
+	 * creating the same type name in parallel but hadn't committed yet when
+	 * we checked for a duplicate name above.
+	 */
+	if (rowtype_already_exists)
+		new_type_oid = *comptypeOid;
 	else
 	{
-		if (comptypeOid == NULL || *comptypeOid == InvalidOid)
-			new_type_oid = AddNewRelationType(relname,
-											  relnamespace,
-											  relid,
-											  relkind,
-											  ownerid,
-											  new_array_oid);
-		else
-		{
-			new_type_oid = TypeCreateWithOid(
-					   relname,			/* type name */
-					   relnamespace,	/* type namespace */
-					   relid,			/* relation oid */
-					   relkind,			/* relation kind */
-					   ownerid,
-					   -1,				/* internal size (varlena) */
-					   'c',				/* type-type (complex) */
-					   DEFAULT_TYPDELIM,/* default array delimiter */
-					   F_RECORD_IN, 	/* input procedure */
-					   F_RECORD_OUT,	/* output procedure */
-					   F_RECORD_RECV,	/* receive procedure */
-					   F_RECORD_SEND,	/* send procedure */
-					   InvalidOid,		/* typmodin procedure - none */
-					   InvalidOid,		/* typmodout procedure - none */
-					   InvalidOid,		/* analyze procedure - default */
-					   InvalidOid,		/* array element type - irrelevant */
-					   false,			/* this is not an array type */
-					   new_array_oid,	/* array type if any */	
-					   InvalidOid,		/* domain base type - irrelevant */
-					   NULL,			/* default value - none */
-					   NULL,			/* default binary representation */
-					   false,			/* passed by reference */
-					   'd',				/* alignment - must be the largest! */
-					   'x',				/* fully TOASTable */
-					   -1,				/* typmod */
-					   0,				/* array dimensions for typBaseType */
-					   false,			/* Type NOT NULL */
-					   *comptypeOid,
-					   0);
-		}
+		new_type_oid = AddNewRelationType(comptypeOid ? *comptypeOid : InvalidOid,
+										  relname,
+										  relnamespace,
+										  relid,
+										  relkind,
+										  ownerid,
+										  new_array_oid);
+		if (comptypeOid)
+			*comptypeOid = new_type_oid;
 	}
 
-	if (comptypeOid)
-		*comptypeOid = new_type_oid;
-
 	/*
 	 * Now make the array type if wanted.
 	 */
@@ -1573,41 +1640,38 @@ heap_create_with_catalog(const char *relname,
 
 		relarrayname = makeArrayTypeName(relname, relnamespace);
 
-		TypeCreateWithOid(
-						relarrayname,		/* type name */
-						relnamespace,		/* type namespace */
-						InvalidOid,			/* relation oid */
-						0,					/* relation kind */
-						ownerid,
-						-1,					/* internal size (varlena) */
-						TYPTYPE_BASE,		/* type-type (complex) */
-						DEFAULT_TYPDELIM,	/* default array delimiter */
-						F_ARRAY_IN,			/* input procedure */
-						F_ARRAY_OUT,		/* output procedure */
-						F_ARRAY_RECV,		/* receive procedure */
-						F_ARRAY_SEND,		/* send procedure */
-						InvalidOid,			/* typmodin procedure */
-						InvalidOid,			/* typmodout procedure */
-						InvalidOid,			/* analyze procedure - default */
-						new_type_oid,		/* array element type - irrelevant */
-						true,				/* this is not an array type */
-						InvalidOid,			/* array type if any */		
-						InvalidOid,			/* domain base type - irrelevant */
-						NULL,				/* default value - none */
-						NULL,				/* default binary representation */
-						false,				/* passed by reference */
-						'd',				/* alignment - must be the largest! */
-						'x',				/* fully TOASTable */
-						-1,					/* typmod */
-						0,					/* array dimensions for typBaseType */
-						false,				/* Type NOT NULL */
-						new_array_oid,
-						0);
-
-		if (PointerIsValid(comptypeArrayOid))
-		{
+		TypeCreate(new_array_oid,		/* force the type's OID to this */
+				   relarrayname,	/* Array type name */
+				   relnamespace,	/* Same namespace as parent */
+				   InvalidOid,	/* Not composite, no relationOid */
+				   0,			/* relkind, also N/A here */
+				   ownerid,		/* owner's ID */
+				   -1,			/* Internal size (varlena) */
+				   TYPTYPE_BASE,	/* Not composite - typelem is */
+				   DEFAULT_TYPDELIM,	/* default array delimiter */
+				   F_ARRAY_IN,	/* array input proc */
+				   F_ARRAY_OUT, /* array output proc */
+				   F_ARRAY_RECV,	/* array recv (bin) proc */
+				   F_ARRAY_SEND,	/* array send (bin) proc */
+				   InvalidOid,	/* typmodin procedure - none */
+				   InvalidOid,	/* typmodout procedure - none */
+				   InvalidOid,	/* analyze procedure - default */
+				   new_type_oid,	/* array element type - the rowtype */
+				   true,		/* yes, this is an array type */
+				   InvalidOid,	/* this has no array type */
+				   InvalidOid,	/* domain base type - irrelevant */
+				   NULL,		/* default value - none */
+				   NULL,		/* default binary representation */
+				   false,		/* passed by reference */
+				   'd',			/* alignment - must be the largest! */
+				   'x',			/* fully TOASTable */
+				   -1,			/* typmod */
+				   0,			/* array dimensions for typBaseType */
+				   false);		/* Type NOT NULL */
+
+		if (comptypeArrayOid)
 			*comptypeArrayOid = new_array_oid;
-		}
+
 		pfree(relarrayname);
 	}
 
@@ -2272,6 +2336,13 @@ heap_drop_with_catalog(Oid relid)
 	is_appendonly_rel = (RelationIsAoRows(rel) || RelationIsAoCols(rel));
 	is_external_rel = RelationIsExternal(rel);
 
+	/*
+	 * There can no longer be anyone *else* touching the relation, but we
+	 * might still have open queries or cursors, or pending trigger events,
+	 * in our own session.
+	 */
+	CheckTableNotInUse(rel, "DROP TABLE");
+
 	/*
 	 * Schedule unlinking of the relation's physical file at commit.
 	 */
@@ -2663,6 +2734,21 @@ AddRelationConstraints(Relation rel,
 			expr = stringToNode(colDef->cooked_default);
 		}
 
+		/*
+		 * If the expression is just a NULL constant, we do not bother to make
+		 * an explicit pg_attrdef entry, since the default behavior is
+		 * equivalent.
+		 *
+		 * Note a nonobvious property of this test: if the column is of a
+		 * domain type, what we'll get is not a bare null Const but a
+		 * CoerceToDomain expr, so we will not discard the default.  This is
+		 * critical because the column default needs to be retained to
+		 * override any default that the domain might have.
+		 */
+		if (expr == NULL ||
+			(IsA(expr, Const) &&((Const *) expr)->constisnull))
+			continue;
+
 		colDef->default_oid = StoreAttrDefault(rel, colDef->attnum,
 											   expr, colDef->default_oid);
 
@@ -3102,7 +3188,7 @@ RelationTruncateIndexes(Relation heapRelation)
 
 		/* Initialize the index and rebuild */
 		/* Note: we do not need to re-establish pkey setting */
-		index_build(heapRelation, currentIndex, indexInfo, false);
+		index_build(heapRelation, currentIndex, indexInfo, false, true);
 
 		/* We're done with this index */
 		index_close(currentIndex, NoLock);
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 2ab31e8a8f6c..7770d918891e 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.282 2007/03/29 00:15:37 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.292.2.3 2009/12/09 21:58:16 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -31,6 +31,7 @@
 #include "access/transam.h"
 #include "access/xact.h"
 #include "bootstrap/bootstrap.h"
+#include "catalog/aoblkdir.h"
 #include "catalog/catalog.h"
 #include "catalog/catquery.h"
 #include "catalog/dependency.h"
@@ -44,6 +45,7 @@
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
+#include "cdb/cdbpersistentfilesysobj.h"
 #include "catalog/aoblkdir.h"
 #include "commands/tablecmds.h"
 #include "executor/executor.h"
@@ -105,6 +107,7 @@ static void validate_index_heapscan(Relation heapRelation,
 static double IndexBuildHeapScan(Relation heapRelation,
 								 Relation indexRelation,
 								 struct IndexInfo *indexInfo,
+								 bool allow_sync,
 								 EState *estate,
 								 Snapshot snapshot,
 								 TransactionId OldestXmin,
@@ -464,6 +467,9 @@ UpdateIndexRelation(Oid indexoid,
 	values[Anum_pg_index_indisprimary - 1] = BoolGetDatum(primary);
 	values[Anum_pg_index_indisclustered - 1] = BoolGetDatum(false);
 	values[Anum_pg_index_indisvalid - 1] = BoolGetDatum(isvalid);
+	values[Anum_pg_index_indcheckxmin - 1] = BoolGetDatum(false);
+	/* we set isvalid and isready the same way */
+	values[Anum_pg_index_indisready - 1] = BoolGetDatum(isvalid);
 	values[Anum_pg_index_indkey - 1] = PointerGetDatum(indkey);
 	values[Anum_pg_index_indclass - 1] = PointerGetDatum(indclass);
 	values[Anum_pg_index_indoption - 1] = PointerGetDatum(indoption);
@@ -600,6 +606,25 @@ index_create(Oid heapRelationId,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("shared indexes cannot be created after initdb")));
 
+	/*
+	 * Validate shared/non-shared tablespace (must check this before doing
+	 * GetNewRelFileNode, to prevent Assert therein)
+	 */
+	if (shared_relation)
+	{
+		if (tableSpaceId != GLOBALTABLESPACE_OID)
+			/* elog since this is not a user-facing error */
+			elog(ERROR,
+				 "shared relations must be placed in pg_global tablespace");
+	}
+	else
+	{
+		if (tableSpaceId == GLOBALTABLESPACE_OID)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("only shared relations can be placed in pg_global tablespace")));
+	}
+
 	if (get_relname_relid(indexRelationName, namespaceId))
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_TABLE),
@@ -777,7 +802,7 @@ index_create(Oid heapRelationId,
 		{
 			char		constraintType;
 			const char *constraintName = indexRelationName;
-			
+
 			if ( altConName )
 			{
 				constraintName = altConName;
@@ -862,16 +887,12 @@ index_create(Oid heapRelationId,
 			}
 
 			/*
-			 * It's possible for an index to not depend on any columns of the
-			 * table at all, in which case we need to give it a dependency on
-			 * the table as a whole; else it won't get dropped when the table
-			 * is dropped.	This edge case is not totally useless; for
-			 * example, a unique index on a constant expression can serve to
-			 * prevent a table from containing more than one row.
+			 * If there are no simply-referenced columns, give the index an
+			 * auto dependency on the whole table.  In most cases, this will
+			 * be redundant, but it might not be if the index expressions and
+			 * predicate contain no Vars or only whole-row Vars.
 			 */
-			if (!have_simple_col &&
-				!contain_vars_of_level((Node *) indexInfo->ii_Expressions, 0) &&
-				!contain_vars_of_level((Node *) indexInfo->ii_Predicate, 0))
+			if (!have_simple_col)
 			{
 				referenced.classId = RelationRelationId;
 				referenced.objectId = heapRelationId;
@@ -958,7 +979,7 @@ index_create(Oid heapRelationId,
 	}
 	else
 	{
-		index_build(heapRelation, indexRelation, indexInfo, isprimary);
+		index_build(heapRelation, indexRelation, indexInfo, isprimary, false);
 	}
 
 	/*
@@ -1018,7 +1039,13 @@ index_drop(Oid indexId)
 		RelationFetchSegFile0GpRelationNode(userIndexRelation);
 
 	/*
-	 * Schedule physical removal of the files
+	 * There can no longer be anyone *else* touching the index, but we
+	 * might still have open queries using it in our own session.
+	 */
+	CheckTableNotInUse(userIndexRelation, "DROP INDEX");
+
+	/*
+	 * Schedule physical removal of the file
 	 */
 	MirroredFileSysObj_ScheduleDropBufferPoolRel(userIndexRelation);
 
@@ -1139,7 +1166,11 @@ BuildIndexInfo(Relation index)
 
 	/* other info */
 	ii->ii_Unique = indexStruct->indisunique;
-	ii->ii_Concurrent = false;	/* assume normal case */
+	ii->ii_ReadyForInserts = IndexIsReady(indexStruct);
+
+	/* initialize index-build state to default */
+	ii->ii_Concurrent = false;
+	ii->ii_BrokenHotChain = false;
 
 	ii->opaque = NULL;
 
@@ -1399,6 +1430,9 @@ index_update_stats(Relation rel, bool hasindex, bool isprimary,
  *
  * Caller must already hold exclusive lock on the relation.
  *
+ * The relation is marked with relfrozenxid=freezeXid (InvalidTransactionId
+ * must be passed for indexes)
+ *
  * Replaces relfilenode and updates pg_class / gp_relation_node.
  * If the updating relation is gp_relation_node's index, the caller
  * should rebuild the index by index_build().
@@ -1407,20 +1441,20 @@ index_update_stats(Relation rel, bool hasindex, bool isprimary,
  * InvalidOid, an unused one is allocated.
  */
 Oid
-setNewRelfilenode(Relation relation)
+setNewRelfilenode(Relation relation, TransactionId freezeXid)
 {
-	return setNewRelfilenodeToOid(relation, InvalidOid);
+	return setNewRelfilenodeToOid(relation, freezeXid, InvalidOid);
 }
 Oid
-setNewRelfilenodeToOid(Relation relation, Oid newrelfilenode)
+setNewRelfilenodeToOid(Relation relation, TransactionId freezeXid, Oid newrelfilenode)
 {
 	RelFileNode newrnode;
 	SMgrRelation srel;
 	Relation	pg_class;
+	Relation	gp_relation_node;
 	HeapTuple	tuple;
 	Form_pg_class rd_rel;
 	bool		isAppendOnly;
-	Relation	gp_relation_node;
 	bool		is_gp_relation_node_index;
 
 	/* Can't change relfilenode for nailed tables (indexes ok though) */
@@ -1428,6 +1462,10 @@ setNewRelfilenodeToOid(Relation relation, Oid newrelfilenode)
 		   relation->rd_rel->relkind == RELKIND_INDEX);
 	/* Can't change for shared tables or indexes */
 	Assert(!relation->rd_rel->relisshared);
+	/* Indexes must have Invalid frozenxid; other relations must not */
+	Assert((relation->rd_rel->relkind == RELKIND_INDEX &&
+			freezeXid == InvalidTransactionId) ||
+		   TransactionIdIsNormal(freezeXid));
 
 	if (newrelfilenode == InvalidOid)
 	{
@@ -1464,16 +1502,17 @@ setNewRelfilenodeToOid(Relation relation, Oid newrelfilenode)
 			 RelationGetRelid(relation));
 	rd_rel = (Form_pg_class) GETSTRUCT(tuple);
 
-	/* schedule unlinking old relfilenode */
-	remove_gp_relation_node_and_schedule_drop(relation);
-
 	/* create another storage file. Is it a little ugly ? */
 	/* NOTE: any conflict in relfilenode value will be caught here */
 	newrnode = relation->rd_node;
 	newrnode.relNode = newrelfilenode;
 
-	isAppendOnly = (relation->rd_rel->relstorage == RELSTORAGE_AOROWS ||
+	/* schedule unlinking old relfilenode */
+	remove_gp_relation_node_and_schedule_drop(relation);
+
+	isAppendOnly = (relation->rd_rel->relstorage == RELSTORAGE_AOROWS || 
 					relation->rd_rel->relstorage == RELSTORAGE_AOCOLS);
+
 	if (!isAppendOnly)
 	{
 		PersistentFileSysRelStorageMgr localRelStorageMgr;
@@ -1533,10 +1572,13 @@ setNewRelfilenodeToOid(Relation relation, Oid newrelfilenode)
 			 ItemPointerToString(&relation->rd_segfile0_relationnodeinfo.persistentTid),
 			 relation->rd_segfile0_relationnodeinfo.persistentSerialNum);
 
-	/* Update GETSTRUCT fields of the pg_class row */
+	/* update the pg_class row */
 	rd_rel->relfilenode = newrelfilenode;
 	rd_rel->relpages = 0;		/* it's empty until further notice */
 	rd_rel->reltuples = 0;
+	rd_rel->relfrozenxid = freezeXid;
+	simple_heap_update(pg_class, &tuple->t_self, tuple);
+	CatalogUpdateIndexes(pg_class, tuple);
 
 	/*
 	 * If the swapping relation is an index of gp_relation_node,
@@ -1557,9 +1599,6 @@ setNewRelfilenodeToOid(Relation relation, Oid newrelfilenode)
 						&relation->rd_segfile0_relationnodeinfo.persistentTid,
 						relation->rd_segfile0_relationnodeinfo.persistentSerialNum);
 
-	simple_heap_update(pg_class, &tuple->t_self, tuple);
-	CatalogUpdateIndexes(pg_class, tuple);
-
 	heap_freetuple(tuple);
 
 	heap_close(pg_class, RowExclusiveLock);
@@ -1585,8 +1624,11 @@ setNewRelfilenodeToOid(Relation relation, Oid newrelfilenode)
  * entries of the index and heap relation as needed, using statistics
  * returned by ambuild as well as data passed by the caller.
  *
- * Note: when reindexing an existing index, isprimary can be false;
- * the index is already properly marked and need not be re-marked.
+ * isprimary tells whether to mark the index as a primary-key index.
+ * isreindex indicates we are recreating a previously-existing index.
+ *
+ * Note: when reindexing an existing index, isprimary can be false even if
+ * the index is a PK; it's already properly marked and need not be re-marked.
  *
  * Note: before Postgres 8.2, the passed-in heap and index Relations
  * were automatically closed by this routine.  This is no longer the case.
@@ -1596,7 +1638,8 @@ void
 index_build(Relation heapRelation,
 			Relation indexRelation,
 			IndexInfo *indexInfo,
-			bool isprimary)
+			bool isprimary,
+			bool isreindex)
 {
 	RegProcedure procedure;
 	IndexBuildResult *stats;
@@ -1639,6 +1682,57 @@ index_build(Relation heapRelation,
 	/* Restore userid and security context */
 	SetUserIdAndSecContext(save_userid, save_sec_context);
 
+	/*
+	 * If we found any potentially broken HOT chains, mark the index as not
+	 * being usable until the current transaction is below the event horizon.
+	 * See src/backend/access/heap/README.HOT for discussion.
+	 *
+	 * However, when reindexing an existing index, we should do nothing here.
+	 * Any HOT chains that are broken with respect to the index must predate
+	 * the index's original creation, so there is no need to change the
+	 * index's usability horizon.  Moreover, we *must not* try to change
+	 * the index's pg_index entry while reindexing pg_index itself, and this
+	 * optimization nicely prevents that.
+	 *
+	 * We also need not set indcheckxmin during a concurrent index build,
+	 * because we won't set indisvalid true until all transactions that care
+	 * about the broken HOT chains are gone.
+	 *
+	 * Therefore, this code path can only be taken during non-concurrent
+	 * CREATE INDEX.  Thus the fact that heap_update will set the pg_index
+	 * tuple's xmin doesn't matter, because that tuple was created in the
+	 * current transaction anyway.	That also means we don't need to worry
+	 * about any concurrent readers of the tuple; no other transaction can see
+	 * it yet.
+	 */
+	if (indexInfo->ii_BrokenHotChain && !isreindex &&
+		!indexInfo->ii_Concurrent)
+	{
+		Oid			indexId = RelationGetRelid(indexRelation);
+		Relation	pg_index;
+		HeapTuple	indexTuple;
+		Form_pg_index indexForm;
+
+		pg_index = heap_open(IndexRelationId, RowExclusiveLock);
+
+		indexTuple = SearchSysCacheCopy(INDEXRELID,
+										ObjectIdGetDatum(indexId),
+										0, 0, 0);
+		if (!HeapTupleIsValid(indexTuple))
+			elog(ERROR, "cache lookup failed for index %u", indexId);
+		indexForm = (Form_pg_index) GETSTRUCT(indexTuple);
+
+		/* If it's a new index, indcheckxmin shouldn't be set ... */
+		Assert(!indexForm->indcheckxmin);
+
+		indexForm->indcheckxmin = true;
+		simple_heap_update(pg_index, &indexTuple->t_self, indexTuple);
+		CatalogUpdateIndexes(pg_index, indexTuple);
+
+		heap_freetuple(indexTuple);
+		heap_close(pg_index, RowExclusiveLock);
+	}
+
 	/*
 	 * Update heap and index pg_class rows
 	 */
@@ -1698,20 +1792,27 @@ index_build(Relation heapRelation,
  * must keep track of the number of index tuples; we don't do so here because
  * the AM might reject some of the tuples for its own reasons, such as being
  * unable to store NULLs.
+ *
+ * A side effect is to set indexInfo->ii_BrokenHotChain to true if we detect
+ * any potentially broken HOT chains.  Currently, we set this if there are
+ * any RECENTLY_DEAD or DELETE_IN_PROGRESS entries in a HOT chain, without
+ * trying very hard to detect whether they're really incompatible with the
+ * chain tip.
  */
 double
 IndexBuildScan(Relation parentRelation,
 			   Relation indexRelation,
 			   struct IndexInfo *indexInfo,
+			   bool allow_sync,
 			   IndexBuildCallback callback,
 			   void *callback_state)
 {
+	double		reltuples;
 	TupleTableSlot *slot;
 	EState	   *estate;
 	ExprContext *econtext;
 	Snapshot	snapshot;
 	TransactionId OldestXmin;
-	double reltuples = 0;
 
 	/*
 	 * sanity checks
@@ -1755,19 +1856,19 @@ IndexBuildScan(Relation parentRelation,
 	{
 		snapshot = SnapshotAny;
 		/* okay to ignore lazy VACUUMs here */
-		OldestXmin = GetOldestXmin(parentRelation->rd_rel->relisshared);
+		OldestXmin = GetOldestXmin(parentRelation->rd_rel->relisshared, true);
 	}
 
 	if (RelationIsHeap(parentRelation))
 		reltuples = IndexBuildHeapScan(parentRelation,
 									   indexRelation,
 									   indexInfo,
+									   allow_sync,
 									   estate,
 									   snapshot,
 									   OldestXmin,
 									   callback,
 									   callback_state);
-	
 	else if (RelationIsAoRows(parentRelation))
 		reltuples = IndexBuildAppendOnlyRowScan(parentRelation,
 												indexRelation,
@@ -1784,6 +1885,12 @@ IndexBuildScan(Relation parentRelation,
 												snapshot,
 												callback,
 												callback_state);
+	else
+	{
+		reltuples = 0; /* keep compiler quiet */
+		elog(ERROR, "unrecognized relation storage type: %c",
+			 parentRelation->rd_rel->relstorage);
+	}
 
 	ExecDropSingleTupleTableSlot(slot);
 	FreeExecutorState(estate);
@@ -1818,6 +1925,7 @@ static double
 IndexBuildHeapScan(Relation heapRelation,
 				   Relation indexRelation,
 				   struct IndexInfo *indexInfo,
+				   bool allow_sync,
 				   EState *estate,
 				   Snapshot snapshot,
 				   TransactionId OldestXmin,
@@ -1834,6 +1942,8 @@ IndexBuildHeapScan(Relation heapRelation,
 	List	   *predicate = NIL;
 	ExprContext *econtext;
 	TupleTableSlot *slot;
+	BlockNumber root_blkno = InvalidBlockNumber;
+	OffsetNumber root_offsets[MaxHeapTuplesPerPage];
 
 	Assert(estate->es_per_tuple_exprcontext != NULL);
 	econtext = estate->es_per_tuple_exprcontext;
@@ -1841,12 +1951,15 @@ IndexBuildHeapScan(Relation heapRelation,
 
 	/* Set up execution state for predicate, if any. */
 	predicate = (List *)
-		ExecPrepareExpr((Expr *) indexInfo->ii_Predicate, estate);
+		ExecPrepareExpr((Expr *) indexInfo->ii_Predicate,
+						estate);
 
-	scan = heap_beginscan(heapRelation, /* relation */
-						  snapshot,		/* seeself */
-						  0,	/* number of keys */
-						  NULL);	/* scan key */
+	scan = heap_beginscan_strat(heapRelation,	/* relation */
+								snapshot,		/* snapshot */
+								0,				/* number of keys */
+								NULL,			/* scan key */
+								true,			/* buffer access strategy OK */
+								allow_sync);	/* syncscan OK? */
 
 	reltuples = 0;
 
@@ -1859,23 +1972,68 @@ IndexBuildHeapScan(Relation heapRelation,
 
 		CHECK_FOR_INTERRUPTS();
 
+		/*
+		 * When dealing with a HOT-chain of updated tuples, we want to index
+		 * the values of the live tuple (if any), but index it under the TID
+		 * of the chain's root tuple.  This approach is necessary to preserve
+		 * the HOT-chain structure in the heap. So we need to be able to find
+		 * the root item offset for every tuple that's in a HOT-chain.  When
+		 * first reaching a new page of the relation, call
+		 * heap_get_root_tuples() to build a map of root item offsets on the
+		 * page.
+		 *
+		 * It might look unsafe to use this information across buffer
+		 * lock/unlock.  However, we hold ShareLock on the table so no
+		 * ordinary insert/update/delete should occur; and we hold pin on the
+		 * buffer continuously while visiting the page, so no pruning
+		 * operation can occur either.
+		 *
+		 * Also, although our opinions about tuple liveness could change while
+		 * we scan the page (due to concurrent transaction commits/aborts),
+		 * the chain root locations won't, so this info doesn't need to be
+		 * rebuilt after waiting for another transaction.
+		 *
+		 * Note the implied assumption that there is no more than one live
+		 * tuple per HOT-chain --- else we could create more than one index
+		 * entry pointing to the same root tuple.
+		 */
+		if (scan->rs_cblock != root_blkno)
+		{
+			Page		page = BufferGetPage(scan->rs_cbuf);
+
+			// -------- MirroredLock ----------
+			MIRROREDLOCK_BUFMGR_LOCK;
+
+			LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
+			heap_get_root_tuples(page, root_offsets);
+			LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
+
+			MIRROREDLOCK_BUFMGR_UNLOCK;
+			// -------- MirroredLock ----------
+
+			root_blkno = scan->rs_cblock;
+		}
+
 		if (snapshot == SnapshotAny)
 		{
 			/* do our own time qual check */
 			bool		indexIt;
 
+	recheck:
+
 			/*
 			 * We could possibly get away with not locking the buffer here,
 			 * since caller should hold ShareLock on the relation, but let's
-			 * be conservative about it.
+			 * be conservative about it.  (This remark is still correct even
+			 * with HOT-pruning: our pin on the buffer prevents pruning.)
 			 */
-			
+
 			// -------- MirroredLock ----------
 			MIRROREDLOCK_BUFMGR_LOCK;
 			
 			LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
 
-			switch (HeapTupleSatisfiesVacuum(heapTuple->t_data, OldestXmin,
+			switch (HeapTupleSatisfiesVacuum(heapRelation, heapTuple->t_data, OldestXmin,
 											 scan->rs_cbuf))
 			{
 				case HEAPTUPLE_DEAD:
@@ -1894,10 +2052,22 @@ IndexBuildHeapScan(Relation heapRelation,
 					 * If tuple is recently deleted then we must index it
 					 * anyway to preserve MVCC semantics.  (Pre-existing
 					 * transactions could try to use the index after we finish
-					 * building it, and may need to see such tuples.) Exclude
-					 * it from unique-checking, however.
+					 * building it, and may need to see such tuples.)
+					 *
+					 * However, if it was HOT-updated then we must only index
+					 * the live tuple at the end of the HOT-chain.	Since this
+					 * breaks semantics for pre-existing snapshots, mark the
+					 * index as unusable for them.
 					 */
-					indexIt = true;
+					if (HeapTupleIsHotUpdated(heapTuple))
+					{
+						indexIt = false;
+						/* mark the index as unsafe for old snapshots */
+						indexInfo->ii_BrokenHotChain = true;
+					}
+					else
+						indexIt = true;
+					/* In any case, exclude the tuple from unique-checking */
 					tupleIsAlive = false;
 					break;
 				case HEAPTUPLE_INSERT_IN_PROGRESS:
@@ -1909,35 +2079,104 @@ IndexBuildHeapScan(Relation heapRelation,
 					 * followed by CREATE INDEX within a transaction.)	An
 					 * exception occurs when reindexing a system catalog,
 					 * because we often release lock on system catalogs before
-					 * committing.
+					 * committing.	In that case we wait for the inserting
+					 * transaction to finish and check again.  (We could do
+					 * that on user tables too, but since the case is not
+					 * expected it seems better to throw an error.)
 					 */
 					if (!TransactionIdIsCurrentTransactionId(
-								   HeapTupleHeaderGetXmin(heapTuple->t_data))
-						&& !IsSystemRelation(heapRelation))
-						elog(ERROR, "concurrent insert in progress");
+								  HeapTupleHeaderGetXmin(heapTuple->t_data)))
+					{
+						if (!IsSystemRelation(heapRelation))
+							elog(ERROR, "concurrent insert in progress");
+						else
+						{
+							/*
+							 * Must drop the lock on the buffer before we wait
+							 */
+							TransactionId xwait = HeapTupleHeaderGetXmin(heapTuple->t_data);
+
+							LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
+							XactLockTableWait(xwait);
+							goto recheck;
+						}
+					}
+
+					/*
+					 * We must index such tuples, since if the index build
+					 * commits then they're good.
+					 */
 					indexIt = true;
 					tupleIsAlive = true;
 					break;
 				case HEAPTUPLE_DELETE_IN_PROGRESS:
 
 					/*
-					 * Since caller should hold ShareLock or better, we should
-					 * not see any tuples deleted by open transactions ---
-					 * unless it's our own transaction. (Consider DELETE
-					 * followed by CREATE INDEX within a transaction.)	An
-					 * exception occurs when reindexing a system catalog,
-					 * because we often release lock on system catalogs before
-					 * committing.
-					 *
-					 * XXX we also skip the check for any bitmap indexes.
+					 * As with INSERT_IN_PROGRESS case, this is unexpected
+					 * unless it's our own deletion or a system catalog.
 					 */
 					Assert(!(heapTuple->t_data->t_infomask & HEAP_XMAX_IS_MULTI));
 					if (!TransactionIdIsCurrentTransactionId(
-								   HeapTupleHeaderGetXmax(heapTuple->t_data))
-						&& !IsSystemRelation(heapRelation)
-						&& (!RelationIsBitmapIndex(indexRelation)))
-						elog(ERROR, "concurrent delete in progress");
-					indexIt = true;
+								  HeapTupleHeaderGetXmax(heapTuple->t_data)))
+					{
+						/*
+						 * GPDB_83MERGE_FIXME:
+						 *
+						 * Before the 8.3 merge, we also didn't throw an error if
+						 * it was a bitmap index. The old comment didn't explain why,
+						 * however. I don't understand why bitmap indexes would behave
+						 * differently here; indexes contain no visibility information,
+						 * this is all about how the heap works.
+						 *
+						 * I'm leaving this as it's in upstream, with no special handling
+						 * for bitmap indexes, to see what breaks. But if someone reports
+						 * a "concurrent delete in progress" error while creating a bitmap
+						 * index on a heap table, then we possibly need to put that
+						 * exception back.
+						 */
+						if (!IsSystemRelation(heapRelation))
+							elog(ERROR, "concurrent delete in progress");
+						else
+						{
+							/*
+							 * Must drop the lock on the buffer before we wait
+							 */
+							TransactionId xwait = HeapTupleHeaderGetXmax(heapTuple->t_data);
+
+							LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
+							XactLockTableWait(xwait);
+							goto recheck;
+						}
+
+						/*
+						 * Otherwise index it but don't check for uniqueness,
+						 * the same as a RECENTLY_DEAD tuple.  (We can't
+						 * actually get here, but keep compiler quiet.)
+						 */
+						indexIt = true;
+					}
+					else if (HeapTupleIsHotUpdated(heapTuple))
+					{
+						/*
+						 * It's a HOT-updated tuple deleted by our own xact.
+						 * We can assume the deletion will commit (else the
+						 * index contents don't matter), so treat the same
+						 * as RECENTLY_DEAD HOT-updated tuples.
+						 */
+						indexIt = false;
+						/* mark the index as unsafe for old snapshots */
+						indexInfo->ii_BrokenHotChain = true;
+					}
+					else
+					{
+						/*
+						 * It's a regular tuple deleted by our own xact.
+						 * Index it but don't check for uniqueness, the same
+						 * as a RECENTLY_DEAD tuple.
+						 */
+						indexIt = true;
+					}
+					/* In any case, exclude the tuple from unique-checking */
 					tupleIsAlive = false;
 					break;
 				default:
@@ -1994,9 +2233,33 @@ IndexBuildHeapScan(Relation heapRelation,
 		 * pass the values[] and isnull[] arrays, instead.
 		 */
 
-		/* Call the AM's callback routine to process the tuple */
-		callback(indexRelation, slot_get_ctid(slot),
-				 values, isnull, tupleIsAlive, callback_state);
+		if (HeapTupleIsHeapOnly(heapTuple))
+		{
+			/*
+			 * For a heap-only tuple, pretend its TID is that of the root. See
+			 * src/backend/access/heap/README.HOT for discussion.
+			 */
+			HeapTupleData rootTuple;
+			OffsetNumber offnum;
+
+			rootTuple = *heapTuple;
+			offnum = ItemPointerGetOffsetNumber(&heapTuple->t_self);
+
+			Assert(OffsetNumberIsValid(root_offsets[offnum - 1]));
+
+			ItemPointerSetOffsetNumber(&rootTuple.t_self,
+									   root_offsets[offnum - 1]);
+
+			/* Call the AM's callback routine to process the tuple */
+			callback(indexRelation, &rootTuple.t_self, values, isnull, tupleIsAlive,
+					 callback_state);
+		}
+		else
+		{
+			/* Call the AM's callback routine to process the tuple */
+			callback(indexRelation, &heapTuple->t_self, values, isnull, tupleIsAlive,
+					 callback_state);
+		}
 	}
 
 	heap_endscan(scan);
@@ -2281,8 +2544,15 @@ IndexBuildAppendOnlyColScan(Relation parentRelation,
 /*
  * validate_index - support code for concurrent index builds
  *
- * We do a concurrent index build by first building the index normally via
- * index_create(), while holding a weak lock that allows concurrent
+ * We do a concurrent index build by first inserting the catalog entry for the
+ * index via index_create(), marking it not indisready and not indisvalid.
+ * Then we commit our transaction and start a new one, then we wait for all
+ * transactions that could have been modifying the table to terminate.	Now
+ * we know that any subsequently-started transactions will see the index and
+ * honor its constraints on HOT updates; so while existing HOT-chains might
+ * be broken with respect to the index, no currently live tuple will have an
+ * incompatible HOT update done to it.	We now build the index normally via
+ * index_build(), while holding a weak lock that allows concurrent
  * insert/update/delete.  Also, we index only tuples that are valid
  * as of the start of the scan (see IndexBuildHeapScan), whereas a normal
  * build takes care to include recently-dead tuples.  This is OK because
@@ -2293,11 +2563,10 @@ IndexBuildAppendOnlyColScan(Relation parentRelation,
  * if we used HeapTupleSatisfiesVacuum).  This leaves us with an index that
  * does not contain any tuples added to the table while we built the index.
  *
- * Next, we commit the transaction so that the index becomes visible to other
- * backends, but it is marked not "indisvalid" to prevent the planner from
- * relying on it for indexscans.  Then we wait for all transactions that
- * could have been modifying the table to terminate.  At this point we
- * know that any subsequently-started transactions will see the index and
+ * Next, we mark the index "indisready" (but still not "indisvalid") and
+ * commit the second transaction and start a third.  Again we wait for all
+ * transactions that could have been modifying the table to terminate.	Now
+ * we know that any subsequently-started transactions will see the index and
  * insert their new tuples into it.  We then take a new reference snapshot
  * which is passed to validate_index().  Any tuples that are valid according
  * to this snap, but are not in the index, must be added to the index.
@@ -2317,7 +2586,7 @@ IndexBuildAppendOnlyColScan(Relation parentRelation,
  * Building a unique index this way is tricky: we might try to insert a
  * tuple that is already dead or is in process of being deleted, and we
  * mustn't have a uniqueness failure against an updated version of the same
- * row.  We can check the tuple to see if it's already dead and tell
+ * row.  We could try to check the tuple to see if it's already dead and tell
  * index_insert() not to do the uniqueness check, but that still leaves us
  * with a race condition against an in-progress update.  To handle that,
  * we expect the index AM to recheck liveness of the to-be-inserted tuple
@@ -2327,7 +2596,8 @@ IndexBuildAppendOnlyColScan(Relation parentRelation,
  * were alive at the time of the reference snapshot are gone; this is
  * necessary to be sure there are none left with a serializable snapshot
  * older than the reference (and hence possibly able to see tuples we did
- * not index).	Then we mark the index valid and commit.
+ * not index).	Then we mark the index "indisvalid" and commit.  Subsequent
+ * transactions will be able to use it for queries.
  *
  * Doing two full table scans is a brute-force strategy.  We could try to be
  * cleverer, eg storing new tuples in a special area of the table (perhaps
@@ -2378,6 +2648,7 @@ validate_index(Oid heapId, Oid indexId, Snapshot snapshot)
 	ivinfo.vacuum_full = false;
 	ivinfo.message_level = DEBUG2;
 	ivinfo.num_heap_tuples = -1;
+	ivinfo.strategy = NULL;
 	ivinfo.extra_oids = NIL;
 	state.tuplesort = NULL;
 
@@ -2505,6 +2776,9 @@ validate_index_heapscan(Relation heapRelation,
 	TupleTableSlot *slot;
 	EState	   *estate;
 	ExprContext *econtext;
+	BlockNumber root_blkno = InvalidBlockNumber;
+	OffsetNumber root_offsets[MaxHeapTuplesPerPage];
+	bool		in_index[MaxHeapTuplesPerPage];
 
 	/* state variables for the merge */
 	ItemPointer indexcursor = NULL;
@@ -2533,12 +2807,16 @@ validate_index_heapscan(Relation heapRelation,
 
 	/*
 	 * Prepare for scan of the base relation.  We need just those tuples
-	 * satisfying the passed-in reference snapshot.
+	 * satisfying the passed-in reference snapshot.  We must disable syncscan
+	 * here, because it's critical that we read from block zero forward to
+	 * match the sorted TIDs.
 	 */
-	scan = heap_beginscan(heapRelation, /* relation */
-						  snapshot,		/* seeself */
-						  0,	/* number of keys */
-						  NULL);	/* scan key */
+	scan = heap_beginscan_strat(heapRelation,	/* relation */
+								snapshot,		/* snapshot */
+								0,				/* number of keys */
+								NULL,			/* scan key */
+								true,			/* buffer access strategy OK */
+								false);			/* syncscan not OK */
 
 	/*
 	 * Scan all tuples matching the snapshot.
@@ -2546,45 +2824,96 @@ validate_index_heapscan(Relation heapRelation,
 	while ((heapTuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
 	{
 		ItemPointer heapcursor = &heapTuple->t_self;
+		ItemPointerData rootTuple;
+		OffsetNumber root_offnum;
 
 		CHECK_FOR_INTERRUPTS();
 
 		state->htups += 1;
 
+		/*
+		 * As commented in IndexBuildHeapScan, we should index heap-only
+		 * tuples under the TIDs of their root tuples; so when we advance onto
+		 * a new heap page, build a map of root item offsets on the page.
+		 *
+		 * This complicates merging against the tuplesort output: we will
+		 * visit the live tuples in order by their offsets, but the root
+		 * offsets that we need to compare against the index contents might be
+		 * ordered differently.  So we might have to "look back" within the
+		 * tuplesort output, but only within the current page.	We handle that
+		 * by keeping a bool array in_index[] showing all the
+		 * already-passed-over tuplesort output TIDs of the current page. We
+		 * clear that array here, when advancing onto a new heap page.
+		 */
+		if (scan->rs_cblock != root_blkno)
+		{
+			Page		page = BufferGetPage(scan->rs_cbuf);
+
+			// -------- MirroredLock ----------
+			MIRROREDLOCK_BUFMGR_LOCK;
+
+			LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
+			heap_get_root_tuples(page, root_offsets);
+			LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
+
+			MIRROREDLOCK_BUFMGR_UNLOCK;
+			// -------- MirroredLock ----------
+
+			memset(in_index, 0, sizeof(in_index));
+
+			root_blkno = scan->rs_cblock;
+		}
+
+		/* Convert actual tuple TID to root TID */
+		rootTuple = *heapcursor;
+		root_offnum = ItemPointerGetOffsetNumber(heapcursor);
+
+		if (HeapTupleIsHeapOnly(heapTuple))
+		{
+			root_offnum = root_offsets[root_offnum - 1];
+			Assert(OffsetNumberIsValid(root_offnum));
+			ItemPointerSetOffsetNumber(&rootTuple, root_offnum);
+		}
+
 		/*
 		 * "merge" by skipping through the index tuples until we find or pass
-		 * the current heap tuple.
+		 * the current root tuple.
 		 */
 		while (!tuplesort_empty &&
 			   (!indexcursor ||
-				ItemPointerCompare(indexcursor, heapcursor) < 0))
+				ItemPointerCompare(indexcursor, &rootTuple) < 0))
 		{
 			Datum		ts_val;
 			bool		ts_isnull;
 
 			if (indexcursor)
+			{
+				/*
+				 * Remember index items seen earlier on the current heap page
+				 */
+				if (ItemPointerGetBlockNumber(indexcursor) == root_blkno)
+					in_index[ItemPointerGetOffsetNumber(indexcursor) - 1] = true;
 				pfree(indexcursor);
+			}
 
-			if(gp_enable_mk_sort)
+			if (gp_enable_mk_sort)
 				tuplesort_empty = !tuplesort_getdatum_mk((Tuplesortstate_mk *) state->tuplesort,
 						true, &ts_val, &ts_isnull);
 			else
 				tuplesort_empty = !tuplesort_getdatum((Tuplesortstate *) state->tuplesort,
 						true, &ts_val, &ts_isnull);
-
 			Assert(tuplesort_empty || !ts_isnull);
 			indexcursor = (ItemPointer) DatumGetPointer(ts_val);
 		}
 
-		if (tuplesort_empty ||
-			ItemPointerCompare(indexcursor, heapcursor) > 0)
+		/*
+		 * If the tuplesort has overshot *and* we didn't see a match earlier,
+		 * then this tuple is missing from the index, so insert it.
+		 */
+		if ((tuplesort_empty ||
+			 ItemPointerCompare(indexcursor, &rootTuple) > 0) &&
+			!in_index[root_offnum - 1])
 		{
-			/*
-			 * We've overshot which means this heap tuple is missing from the
-			 * index, so insert it.
-			 */
-			bool		check_unique;
-
 			MemoryContextReset(econtext->ecxt_per_tuple_memory);
 
 			/* Set up for predicate or expression evaluation */
@@ -2611,47 +2940,30 @@ validate_index_heapscan(Relation heapRelation,
 						   values,
 						   isnull);
 
-			/*
-			 * If the tuple is already committed dead, we still have to put it
-			 * in the index (because some xacts might be able to see it), but
-			 * we might as well suppress uniqueness checking. This is just an
-			 * optimization because the index AM is not supposed to raise a
-			 * uniqueness failure anyway.
-			 */
-			if (indexInfo->ii_Unique)
-			{
-				
-				// -------- MirroredLock ----------
-				MIRROREDLOCK_BUFMGR_LOCK;
-				
-				/* must hold a buffer lock to call HeapTupleSatisfiesNow */
-				LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
-
-				if (HeapTupleSatisfiesNow(scan->rs_rd, heapTuple->t_data, scan->rs_cbuf))
-					check_unique = true;
-				else
-					check_unique = false;
-
-				LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
-				
-				MIRROREDLOCK_BUFMGR_UNLOCK;
-				// -------- MirroredLock ----------
-				
-			}
-			else
-				check_unique = false;
-
 			/*
 			 * You'd think we should go ahead and build the index tuple here,
 			 * but some index AMs want to do further processing on the data
 			 * first. So pass the values[] and isnull[] arrays, instead.
 			 */
+
+			/*
+			 * If the tuple is already committed dead, you might think we
+			 * could suppress uniqueness checking, but this is no longer true
+			 * in the presence of HOT, because the insert is actually a proxy
+			 * for a uniqueness check on the whole HOT-chain.  That is, the
+			 * tuple we have here could be dead because it was already
+			 * HOT-updated, and if so the updating transaction will not have
+			 * thought it should insert index entries.	The index AM will
+			 * check the whole HOT-chain and correctly detect a conflict if
+			 * there is one.
+			 */
+
 			index_insert(indexRelation,
 						 values,
 						 isnull,
-						 heapcursor,
+						 &rootTuple,
 						 heapRelation,
-						 check_unique);
+						 indexInfo->ii_Unique);
 
 			state->tups_inserted += 1;
 		}
@@ -2669,6 +2981,66 @@ validate_index_heapscan(Relation heapRelation,
 }
 
 
+/*
+ * index_set_state_flags - adjust pg_index state flags
+ *
+ * This is used during CREATE INDEX CONCURRENTLY to adjust the pg_index
+ * flags that denote the index's state.  We must use an in-place update of
+ * the pg_index tuple, because we do not have exclusive lock on the parent
+ * table and so other sessions might concurrently be doing SnapshotNow scans
+ * of pg_index to identify the table's indexes.  A transactional update would
+ * risk somebody not seeing the index at all.  Because the update is not
+ * transactional and will not roll back on error, this must only be used as
+ * the last step in a transaction that has not made any transactional catalog
+ * updates!
+ *
+ * Note that heap_inplace_update does send a cache inval message for the
+ * tuple, so other sessions will hear about the update as soon as we commit.
+ */
+void
+index_set_state_flags(Oid indexId, IndexStateFlagsAction action)
+{
+	Relation	pg_index;
+	HeapTuple	indexTuple;
+	Form_pg_index indexForm;
+
+	/* Assert that current xact hasn't done any transactional updates */
+	Assert(GetTopTransactionIdIfAny() == InvalidTransactionId);
+
+	/* Open pg_index and fetch a writable copy of the index's tuple */
+	pg_index = heap_open(IndexRelationId, RowExclusiveLock);
+
+	indexTuple = SearchSysCacheCopy(INDEXRELID,
+									ObjectIdGetDatum(indexId),
+									0, 0, 0);
+	if (!HeapTupleIsValid(indexTuple))
+		elog(ERROR, "cache lookup failed for index %u", indexId);
+	indexForm = (Form_pg_index) GETSTRUCT(indexTuple);
+
+	/* Perform the requested state change on the copy */
+	switch (action)
+	{
+		case INDEX_CREATE_SET_READY:
+			/* Set indisready during a CREATE INDEX CONCURRENTLY sequence */
+			Assert(!indexForm->indisready);
+			Assert(!indexForm->indisvalid);
+			indexForm->indisready = true;
+			break;
+		case INDEX_CREATE_SET_VALID:
+			/* Set indisvalid during a CREATE INDEX CONCURRENTLY sequence */
+			Assert(indexForm->indisready);
+			Assert(!indexForm->indisvalid);
+			indexForm->indisvalid = true;
+			break;
+	}
+
+	/* ... and write it back in-place */
+	heap_inplace_update(pg_index, indexTuple);
+
+	heap_close(pg_index, RowExclusiveLock);
+}
+
+
 /*
  * IndexGetRelation: given an index's relation OID, get the OID of the
  * relation it is an index on.	Uses the system cache.
@@ -2801,8 +3173,6 @@ reindex_index(Oid indexId, Oid newrelfilenode, List **extra_oids)
 	Form_pg_index	indexForm;
 	Oid				retrelfilenode;
 	Oid				namespaceId;
-	cqContext		cqc;
-	cqContext	   *pcqCtx;
 
 	Assert(OidIsValid(indexId));
 	Assert(extra_oids != NULL);
@@ -2890,12 +3260,12 @@ reindex_index(Oid indexId, Oid newrelfilenode, List **extra_oids)
 			 */
 			if (OidIsValid(newrelfilenode))
 			{
-				setNewRelfilenodeToOid(iRel, newrelfilenode);
+				setNewRelfilenodeToOid(iRel, InvalidTransactionId, newrelfilenode);
 				retrelfilenode = newrelfilenode;
 			}
 			else
 			{
-				retrelfilenode = setNewRelfilenode(iRel);
+				retrelfilenode = setNewRelfilenode(iRel, InvalidTransactionId);
 
 				Assert(*extra_oids == NULL);
 
@@ -2919,7 +3289,7 @@ reindex_index(Oid indexId, Oid newrelfilenode, List **extra_oids)
 
 		/* Initialize the index and rebuild */
 		/* Note: we do not need to re-establish pkey setting */
-		index_build(heapRelation, iRel, indexInfo, false);
+		index_build(heapRelation, iRel, indexInfo, false, true);
 	}
 	PG_CATCH();
 	{
@@ -2931,29 +3301,44 @@ reindex_index(Oid indexId, Oid newrelfilenode, List **extra_oids)
 	ResetReindexProcessing();
 
 	/*
-	 * If the index is marked invalid (ie, it's from a failed CREATE INDEX
-	 * CONCURRENTLY), we can now mark it valid.  This allows REINDEX to be
-	 * used to clean up in such cases.
+	 * If the index is marked invalid or not ready (ie, it's from a failed
+	 * CREATE INDEX CONCURRENTLY), we can now mark it valid.  This allows
+	 * REINDEX to be used to clean up in such cases.
+	 *
+	 * Note that it is important to not update the pg_index entry if we don't
+	 * have to, because updating it will move the index's usability horizon
+	 * (recorded as the tuple's xmin value) if indcheckxmin is true.  We don't
+	 * really want REINDEX to move the usability horizon forward ever, but we
+	 * have no choice if we are to fix indisvalid or indisready.  Of course,
+	 * clearing indcheckxmin eliminates the issue, so we're happy to do that
+	 * if we can.  Another reason for caution here is that while reindexing
+	 * pg_index itself, we must not try to update it.  We assume that
+	 * pg_index's indexes will always have these flags in their clean state.
 	 */
 	pg_index = heap_open(IndexRelationId, RowExclusiveLock);
 
-	pcqCtx = caql_addrel(cqclr(&cqc), pg_index);
-
-	indexTuple = caql_getfirst(pcqCtx,
-							   cql("SELECT * FROM pg_index "
-								   " WHERE indexrelid = :1 "
-								   " FOR UPDATE ",
-								   ObjectIdGetDatum(indexId)));
-
+	indexTuple = SearchSysCacheCopy(INDEXRELID,
+									ObjectIdGetDatum(indexId),
+									0, 0, 0);
 	if (!HeapTupleIsValid(indexTuple))
 		elog(ERROR, "cache lookup failed for index %u", indexId);
 	indexForm = (Form_pg_index) GETSTRUCT(indexTuple);
 
-	if (!indexForm->indisvalid)
+	if (!indexForm->indisvalid || !indexForm->indisready)
 	{
 		indexForm->indisvalid = true;
-		caql_update_current(pcqCtx, indexTuple);
-		/* and Update indexes (implicit) */
+		indexForm->indisready = true;
+		simple_heap_update(pg_index, &indexTuple->t_self, indexTuple);
+		CatalogUpdateIndexes(pg_index, indexTuple);
+
+		/*
+		 * Invalidate the relcache for the table, so that after we commit
+		 * all sessions will refresh the table's index list.  This ensures
+		 * that if anyone misses seeing the pg_index row during this
+		 * update, they'll refresh their list before attempting any update
+		 * on the table.
+		 */
+		CacheInvalidateRelcache(heapRelation);
 	}
 	heap_close(pg_index, RowExclusiveLock);
 
@@ -2995,7 +3380,6 @@ reindex_index(Oid indexId, Oid newrelfilenode, List **extra_oids)
 					);
 	}
 
-
 	/* Close rels, but keep locks */
 	index_close(iRel, NoLock);
 	heap_close(heapRelation, NoLock);
@@ -3075,9 +3459,13 @@ reindex_relation(Oid relid,
 	 * problem.
 	 */
 	is_pg_class = (RelationGetRelid(rel) == RelationRelationId);
-	doneIndexes = NIL;
+
+	/* Ensure rd_indexattr is valid; see comments for RelationSetIndexList */
+	if (is_pg_class)
+		(void) RelationGetIndexAttrBitmap(rel);
 
 	/* Reindex all the indexes. */
+	doneIndexes = NIL;
 	foreach(indexId, indexIds)
 	{
 		Oid			indexOid = lfirst_oid(indexId);
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index e563a896b2df..6d9edaf49dac 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/indexing.c,v 1.114 2007/01/05 22:19:24 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/indexing.c,v 1.116 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,6 +78,10 @@ CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
 	Datum		values[INDEX_MAX_KEYS];
 	bool		isnull[INDEX_MAX_KEYS];
 
+	/* HOT update does not require index inserts */
+	if (HeapTupleIsHeapOnly(heapTuple))
+		return;
+
 	/*
 	 * Get information from the state structure.  Fall out if nothing to do.
 	 */
@@ -101,6 +105,10 @@ CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
 
 		indexInfo = indexInfoArray[i];
 
+		/* If the index is marked as read-only, ignore it */
+		if (!indexInfo->ii_ReadyForInserts)
+			continue;
+
 		/*
 		 * Expressional and partial indexes on system catalogs are not
 		 * supported
diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql
index 0488544cedcf..135d9428c061 100644
--- a/src/backend/catalog/information_schema.sql
+++ b/src/backend/catalog/information_schema.sql
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2003-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/catalog/information_schema.sql,v 1.41 2007/02/03 17:59:35 petere Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/information_schema.sql,v 1.43 2008/01/01 19:45:48 momjian Exp $
  */
 
 /*
@@ -1105,17 +1105,21 @@ CREATE VIEW referential_constraints AS
 
     FROM (pg_namespace ncon
           INNER JOIN pg_constraint con ON ncon.oid = con.connamespace
-          INNER JOIN pg_class c ON con.conrelid = c.oid)
-         LEFT JOIN
-         (pg_constraint pkc
-          INNER JOIN pg_namespace npkc ON pkc.connamespace = npkc.oid)
-         ON con.confrelid = pkc.conrelid
-            AND _pg_keysequal(con.confkey, pkc.conkey)
-
-    WHERE c.relkind = 'r'
-          AND con.contype = 'f'
-          AND (pkc.contype IN ('p', 'u') OR pkc.contype IS NULL)
-          AND pg_has_role(c.relowner, 'USAGE');
+          INNER JOIN pg_class c ON con.conrelid = c.oid AND con.contype = 'f')
+         LEFT JOIN pg_depend d1  -- find constraint's dependency on an index
+          ON d1.objid = con.oid AND d1.classid = 'pg_constraint'::regclass
+             AND d1.refclassid = 'pg_class'::regclass AND d1.refobjsubid = 0
+         LEFT JOIN pg_depend d2  -- find pkey/unique constraint for that index
+          ON d2.refclassid = 'pg_constraint'::regclass
+             AND d2.classid = 'pg_class'::regclass
+             AND d2.objid = d1.refobjid AND d2.objsubid = 0
+             AND d2.deptype = 'i'
+         LEFT JOIN pg_constraint pkc ON pkc.oid = d2.refobjid
+            AND pkc.contype IN ('p', 'u')
+            AND pkc.conrelid = con.confrelid
+         LEFT JOIN pg_namespace npkc ON pkc.connamespace = npkc.oid
+
+    WHERE pg_has_role(c.relowner, 'USAGE');
 
 GRANT SELECT ON referential_constraints TO PUBLIC;
 
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index cdfb09178b6c..355fe73ec7cf 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.92 2007/02/14 01:58:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.104.2.1 2010/08/13 16:27:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,6 +32,10 @@
 #include "catalog/pg_operator.h"
 #include "catalog/pg_opfamily.h"
 #include "catalog/pg_proc.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "commands/schemacmds.h"
@@ -57,16 +61,15 @@
 
 /*
  * The namespace search path is a possibly-empty list of namespace OIDs.
- * In addition to the explicit list, several implicitly-searched namespaces
+ * In addition to the explicit list, implicitly-searched namespaces
  * may be included:
  *
- * 1. If a "special" namespace has been set by PushSpecialNamespace, it is
- * always searched first.  (This is a hack for CREATE SCHEMA.)
+ * 1. If a TEMP table namespace has been initialized in this session, it
+ * is implicitly searched first.  (The only time this doesn't happen is
+ * when we are obeying an override search path spec that says not to use the
+ * temp namespace, or the temp namespace is included in the explicit list.)
  *
- * 2. If a TEMP table namespace has been initialized in this session, it
- * is always searched just after any special namespace.
- *
- * 3. The system catalog namespace is always searched.	If the system
+ * 2. The system catalog namespace is always searched.	If the system
  * namespace is present in the explicit path then it will be searched in
  * the specified order; otherwise it will be searched after TEMP tables and
  * *before* the explicit list.	(It might seem that the system namespace
@@ -78,66 +81,95 @@
  * namespace when searching for any object type other than relations and
  * types.  (We must allow types since temp tables have rowtypes.)
  *
- * The default creation target namespace is normally equal to the first
- * element of the explicit list, but is the "special" namespace when one
- * has been set.  If the explicit list is empty and there is no special
- * namespace, there is no default target.
+ * The default creation target namespace is always the first element of the
+ * explicit list.  If the explicit list is empty, there is no default target.
  *
  * The textual specification of search_path can include "$user" to refer to
  * the namespace named the same as the current user, if any.  (This is just
- * ignored if there is no such namespace.)  Also, it can include "pg_temp"
+ * ignored if there is no such namespace.)	Also, it can include "pg_temp"
  * to refer to the current backend's temp namespace.  This is usually also
  * ignorable if the temp namespace hasn't been set up, but there's a special
  * case: if "pg_temp" appears first then it should be the default creation
- * target.  We kluge this case a little bit so that the temp namespace isn't
+ * target.	We kluge this case a little bit so that the temp namespace isn't
  * set up until the first attempt to create something in it.  (The reason for
  * klugery is that we can't create the temp namespace outside a transaction,
  * but initial GUC processing of search_path happens outside a transaction.)
- * tempCreationPending is TRUE if "pg_temp" appears first in the string but
- * is not reflected in defaultCreationNamespace because the namespace isn't
+ * activeTempCreationPending is TRUE if "pg_temp" appears first in the string
+ * but is not reflected in activeCreationNamespace because the namespace isn't
  * set up yet.
  *
  * In bootstrap mode, the search path is set equal to "pg_catalog", so that
  * the system namespace is the only one searched or inserted into.
- * The initdb script is also careful to set search_path to "pg_catalog" for
- * its post-bootstrap standalone backend runs.	Otherwise the default search
+ * initdb is also careful to set search_path to "pg_catalog" for its
+ * post-bootstrap standalone backend runs.	Otherwise the default search
  * path is determined by GUC.  The factory default path contains the PUBLIC
  * namespace (if it exists), preceded by the user's personal namespace
  * (if one exists).
  *
- * If namespaceSearchPathValid is false, then namespaceSearchPath (and other
+ * We support a stack of "override" search path settings for use within
+ * specific sections of backend code.  namespace_search_path is ignored
+ * whenever the override stack is nonempty.  activeSearchPath is always
+ * the actually active path; it points either to the search list of the
+ * topmost stack entry, or to baseSearchPath which is the list derived
+ * from namespace_search_path.
+ *
+ * If baseSearchPathValid is false, then baseSearchPath (and other
  * derived variables) need to be recomputed from namespace_search_path.
  * We mark it invalid upon an assignment to namespace_search_path or receipt
  * of a syscache invalidation event for pg_namespace.  The recomputation
- * is done during the next lookup attempt.
+ * is done during the next non-overridden lookup attempt.  Note that an
+ * override spec is never subject to recomputation.
  *
  * Any namespaces mentioned in namespace_search_path that are not readable
- * by the current user ID are simply left out of namespaceSearchPath; so
+ * by the current user ID are simply left out of baseSearchPath; so
  * we have to be willing to recompute the path when current userid changes.
  * namespaceUser is the userid the path has been computed for.
+ *
+ * Note: all data pointed to by these List variables is in TopMemoryContext.
  */
 
-static List *namespaceSearchPath = NIL;
+/* These variables define the actually active state: */
 
-static Oid	namespaceUser = InvalidOid;
+static List *activeSearchPath = NIL;
 
 /* default place to create stuff; if InvalidOid, no default */
-static Oid	defaultCreationNamespace = InvalidOid;
+static Oid	activeCreationNamespace = InvalidOid;
+
+/* if TRUE, activeCreationNamespace is wrong, it should be temp namespace */
+static bool activeTempCreationPending = false;
+
+/* These variables are the values last derived from namespace_search_path: */
+
+static List *baseSearchPath = NIL;
+
+static Oid	baseCreationNamespace = InvalidOid;
 
-/* first explicit member of list; usually same as defaultCreationNamespace */
-static Oid	firstExplicitNamespace = InvalidOid;
+static bool baseTempCreationPending = false;
 
-/* if TRUE, defaultCreationNamespace is wrong, it should be temp namespace */
-static bool tempCreationPending = false;
+static Oid	namespaceUser = InvalidOid;
+
+/* The above four values are valid only if baseSearchPathValid */
+static bool baseSearchPathValid = true;
+
+/* Override requests are remembered in a stack of OverrideStackEntry structs */
+
+typedef struct
+{
+	List	   *searchPath;		/* the desired search path */
+	Oid			creationNamespace;		/* the desired creation namespace */
+	int			nestLevel;		/* subtransaction nesting level */
+} OverrideStackEntry;
 
-/* The above five values are valid only if namespaceSearchPathValid */
-static bool namespaceSearchPathValid = true;
+static List *overrideStack = NIL;
 
 /*
  * myTempNamespace is InvalidOid until and unless a TEMP namespace is set up
  * in a particular backend session (this happens when a CREATE TEMP TABLE
  * command is first executed).	Thereafter it's the OID of the temp namespace.
  *
+ * myTempToastNamespace is the OID of the namespace for my temp tables' toast
+ * tables.	It is set when myTempNamespace is, and is InvalidOid before that.
+ *
  * myTempNamespaceSubID shows whether we've created the TEMP namespace in the
  * current subtransaction.	The flag propagates up the subtransaction tree,
  * so the main transaction will correctly recognize the flag if all
@@ -147,16 +179,12 @@ static bool namespaceSearchPathValid = true;
  */
 static Oid	myTempNamespace = InvalidOid;
 
-static SubTransactionId myTempNamespaceSubID = InvalidSubTransactionId;
+static Oid	myTempToastNamespace = InvalidOid;
 
-/*
- * "Special" namespace for CREATE SCHEMA.  If set, it's the first search
- * path element, and also the default creation namespace.
- */
-static Oid	mySpecialNamespace = InvalidOid;
+static SubTransactionId myTempNamespaceSubID = InvalidSubTransactionId;
 
 /*
- * This is the text equivalent of the search path --- it's the value
+ * This is the user's textual search path specification --- it's the value
  * of the GUC variable 'search_path'.
  */
 char	   *namespace_search_path = NULL;
@@ -167,7 +195,7 @@ static void recomputeNamespacePath(void);
 static void InitTempTableNamespace(void);
 static void RemoveTempRelations(Oid tempNamespaceId);
 static void RemoveTempRelationsCallback(int code, Datum arg);
-static void NamespaceCallback(Datum arg __attribute__((unused)) , Oid relid __attribute__((unused)) );
+static void NamespaceCallback(Datum arg, int cacheid, ItemPointer tuplePtr);
 static bool TempNamespaceValid(bool error_if_removed);
 
 /* These don't really need to appear in any header file */
@@ -177,6 +205,10 @@ Datum		pg_function_is_visible(PG_FUNCTION_ARGS);
 Datum		pg_operator_is_visible(PG_FUNCTION_ARGS);
 Datum		pg_opclass_is_visible(PG_FUNCTION_ARGS);
 Datum		pg_conversion_is_visible(PG_FUNCTION_ARGS);
+Datum		pg_ts_parser_is_visible(PG_FUNCTION_ARGS);
+Datum		pg_ts_dict_is_visible(PG_FUNCTION_ARGS);
+Datum		pg_ts_template_is_visible(PG_FUNCTION_ARGS);
+Datum		pg_ts_config_is_visible(PG_FUNCTION_ARGS);
 Datum		pg_my_temp_schema(PG_FUNCTION_ARGS);
 Datum		pg_is_other_temp_schema(PG_FUNCTION_ARGS);
 Datum       pg_objname_to_oid(PG_FUNCTION_ARGS);
@@ -209,7 +241,27 @@ RangeVarGetRelid(const RangeVar *relation, bool failOK)
 							relation->relname)));
 	}
 
-	if (relation->schemaname)
+	/*
+	 * If istemp is set, this is a reference to a temp relation.  The parser
+	 * never generates such a RangeVar in simple DML, but it can happen in
+	 * contexts such as "CREATE TEMP TABLE foo (f1 int PRIMARY KEY)".  Such a
+	 * command will generate an added CREATE INDEX operation, which must be
+	 * careful to find the temp table, even when pg_temp is not first in the
+	 * search path.
+	 */
+	if (relation->istemp)
+	{
+		if (relation->schemaname &&
+			(!TempNamespaceValid(false) || strcmp(relation->schemaname, get_namespace_name(myTempNamespace)) != 0))
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+				   errmsg("temporary tables cannot specify a schema name")));
+		if (OidIsValid(myTempNamespace))
+			relId = get_relname_relid(relation->relname, myTempNamespace);
+		else	/* this probably can't happen? */
+			relId = InvalidOid;
+	}
+	else if (relation->schemaname)
 	{
 		/* use exact schema given */
 		namespaceId = LookupExplicitNamespace(relation->schemaname);
@@ -448,7 +500,7 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation)
 			if (strcmp(newRelation->schemaname,namespaceName)!=0)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-					  errmsg("temporary tables cannot specify a schema name")));
+				   errmsg("temporary tables cannot specify a schema name")));
 		}
 		/* Initialize temp namespace if first time through */
 		if (!TempNamespaceValid(false))
@@ -484,13 +536,13 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation)
 	{
 		/* use the default creation namespace */
 		recomputeNamespacePath();
-		if (tempCreationPending)
+		if (activeTempCreationPending)
 		{
 			/* Need to initialize temp namespace */
 			InitTempTableNamespace();
 			return myTempNamespace;
 		}
-		namespaceId = defaultCreationNamespace;
+		namespaceId = activeCreationNamespace;
 		if (!OidIsValid(namespaceId))
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_SCHEMA),
@@ -515,7 +567,7 @@ RelnameGetRelid(const char *relname)
 
 	recomputeNamespacePath();
 
-	foreach(l, namespaceSearchPath)
+	foreach(l, activeSearchPath)
 	{
 		Oid			namespaceId = lfirst_oid(l);
 
@@ -575,7 +627,7 @@ RelationIsVisible(Oid relid)
 	 */
 	relnamespace = relform->relnamespace;
 	if (relnamespace != PG_CATALOG_NAMESPACE &&
-		!list_member_oid(namespaceSearchPath, relnamespace))
+		!list_member_oid(activeSearchPath, relnamespace))
 		visible = false;
 	else
 	{
@@ -588,7 +640,7 @@ RelationIsVisible(Oid relid)
 		ListCell   *l;
 
 		visible = false;
-		foreach(l, namespaceSearchPath)
+		foreach(l, activeSearchPath)
 		{
 			Oid			namespaceId = lfirst_oid(l);
 
@@ -627,7 +679,7 @@ TypenameGetTypid(const char *typname)
 
 	recomputeNamespacePath();
 
-	foreach(l, namespaceSearchPath)
+	foreach(l, activeSearchPath)
 	{
 		Oid			namespaceId = lfirst_oid(l);
 
@@ -683,7 +735,7 @@ TypeIsVisible(Oid typid)
 	 */
 	typnamespace = typform->typnamespace;
 	if (typnamespace != PG_CATALOG_NAMESPACE &&
-		!list_member_oid(namespaceSearchPath, typnamespace))
+		!list_member_oid(activeSearchPath, typnamespace))
 		visible = false;
 	else
 	{
@@ -696,7 +748,7 @@ TypeIsVisible(Oid typid)
 		ListCell   *l;
 
 		visible = false;
-		foreach(l, namespaceSearchPath)
+		foreach(l, activeSearchPath)
 		{
 			Oid			namespaceId = lfirst_oid(l);
 
@@ -874,7 +926,7 @@ FuncnameGetCandidates(List *names, int nargs,
 			 */
 			ListCell   *nsp;
 
-			foreach(nsp, namespaceSearchPath)
+			foreach(nsp, activeSearchPath)
 			{
 				if (procform->pronamespace == lfirst_oid(nsp) &&
 					procform->pronamespace != myTempNamespace)
@@ -1097,7 +1149,7 @@ FunctionIsVisible(Oid funcid)
 	 */
 	pronamespace = procform->pronamespace;
 	if (pronamespace != PG_CATALOG_NAMESPACE &&
-		!list_member_oid(namespaceSearchPath, pronamespace))
+		!list_member_oid(activeSearchPath, pronamespace))
 		visible = false;
 	else
 	{
@@ -1208,7 +1260,7 @@ OpernameGetOprid(List *names, Oid oprleft, Oid oprright)
 	 */
 	recomputeNamespacePath();
 
-	foreach(l, namespaceSearchPath)
+	foreach(l, activeSearchPath)
 	{
 		Oid			namespaceId = lfirst_oid(l);
 		int			i;
@@ -1325,12 +1377,12 @@ OpernameGetCandidates(List *names, char oprkind)
 		else
 		{
 			/*
-			 * Consider only opers that are in the search path and are not
-			 * in the temp namespace.
+			 * Consider only opers that are in the search path and are not in
+			 * the temp namespace.
 			 */
 			ListCell   *nsp;
 
-			foreach(nsp, namespaceSearchPath)
+			foreach(nsp, activeSearchPath)
 			{
 				if (operform->oprnamespace == lfirst_oid(nsp) &&
 					operform->oprnamespace != myTempNamespace)
@@ -1446,7 +1498,7 @@ OperatorIsVisible(Oid oprid)
 	 */
 	oprnamespace = oprform->oprnamespace;
 	if (oprnamespace != PG_CATALOG_NAMESPACE &&
-		!list_member_oid(namespaceSearchPath, oprnamespace))
+		!list_member_oid(activeSearchPath, oprnamespace))
 		visible = false;
 	else
 	{
@@ -1485,7 +1537,7 @@ OpclassnameGetOpcid(Oid amid, const char *opcname)
 
 	recomputeNamespacePath();
 
-	foreach(l, namespaceSearchPath)
+	foreach(l, activeSearchPath)
 	{
 		Oid			namespaceId = lfirst_oid(l);
 
@@ -1541,7 +1593,7 @@ OpclassIsVisible(Oid opcid)
 	 */
 	opcnamespace = opcform->opcnamespace;
 	if (opcnamespace != PG_CATALOG_NAMESPACE &&
-		!list_member_oid(namespaceSearchPath, opcnamespace))
+		!list_member_oid(activeSearchPath, opcnamespace))
 		visible = false;
 	else
 	{
@@ -1577,10 +1629,13 @@ OpfamilynameGetOpfid(Oid amid, const char *opfname)
 
 	recomputeNamespacePath();
 
-	foreach(l, namespaceSearchPath)
+	foreach(l, activeSearchPath)
 	{
 		Oid			namespaceId = lfirst_oid(l);
 
+		if (namespaceId == myTempNamespace)
+			continue;			/* do not look in temp namespace */
+
 		opfid = GetSysCacheOid(OPFAMILYAMNAMENSP,
 							   ObjectIdGetDatum(amid),
 							   PointerGetDatum(opfname),
@@ -1624,7 +1679,7 @@ OpfamilyIsVisible(Oid opfid)
 	 */
 	opfnamespace = opfform->opfnamespace;
 	if (opfnamespace != PG_CATALOG_NAMESPACE &&
-		!list_member_oid(namespaceSearchPath, opfnamespace))
+		!list_member_oid(activeSearchPath, opfnamespace))
 		visible = false;
 	else
 	{
@@ -1659,21 +1714,17 @@ ConversionGetConid(const char *conname)
 
 	recomputeNamespacePath();
 
-	foreach(l, namespaceSearchPath)
+	foreach(l, activeSearchPath)
 	{
 		Oid			namespaceId = lfirst_oid(l);
 
 		if (namespaceId == myTempNamespace)
 			continue;			/* do not look in temp namespace */
 
-		conid = caql_getoid(
-				NULL,
-				cql("SELECT oid FROM pg_conversion "
-					" WHERE conname = :1 "
-					" AND connamespace = :2 ",
-					CStringGetDatum((char *) conname),
-					ObjectIdGetDatum(namespaceId)));
-
+		conid = GetSysCacheOid(CONNAMENSP,
+							   PointerGetDatum(conname),
+							   ObjectIdGetDatum(namespaceId),
+							   0, 0);
 		if (OidIsValid(conid))
 			return conid;
 	}
@@ -1712,7 +1763,7 @@ ConversionIsVisible(Oid conid)
 	 */
 	connamespace = conform->connamespace;
 	if (connamespace != PG_CATALOG_NAMESPACE &&
-		!list_member_oid(namespaceSearchPath, connamespace))
+		!list_member_oid(activeSearchPath, connamespace))
 		visible = false;
 	else
 	{
@@ -1733,165 +1784,149 @@ ConversionIsVisible(Oid conid)
 }
 
 /*
- * DeconstructQualifiedName
- *		Given a possibly-qualified name expressed as a list of String nodes,
- *		extract the schema name and object name.
+ * TSParserGetPrsid - find a TS parser by possibly qualified name
  *
- * *nspname_p is set to NULL if there is no explicit schema name.
+ * If not found, returns InvalidOid if failOK, else throws error
  */
-void
-DeconstructQualifiedName(List *names,
-						 char **nspname_p,
-						 char **objname_p)
+Oid
+TSParserGetPrsid(List *names, bool failOK)
 {
-	char	   *catalogname;
-	char	   *schemaname = NULL;
-	char	   *objname = NULL;
+	char	   *schemaname;
+	char	   *parser_name;
+	Oid			namespaceId;
+	Oid			prsoid = InvalidOid;
+	ListCell   *l;
 
-	switch (list_length(names))
-	{
-		case 1:
-			objname = strVal(linitial(names));
-			break;
-		case 2:
-			schemaname = strVal(linitial(names));
-			objname = strVal(lsecond(names));
-			break;
-		case 3:
-			catalogname = strVal(linitial(names));
-			schemaname = strVal(lsecond(names));
-			objname = strVal(lthird(names));
+	/* deconstruct the name list */
+	DeconstructQualifiedName(names, &schemaname, &parser_name);
 
-			/*
-			 * We check the catalog name and then ignore it.
-			 */
-			if (strcmp(catalogname, get_database_name(MyDatabaseId)) != 0)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				  errmsg("cross-database references are not implemented: %s",
-						 NameListToString(names))));
-			break;
-		default:
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-				errmsg("improper qualified name (too many dotted names): %s",
-					   NameListToString(names))));
-			break;
+	if (schemaname)
+	{
+		/* use exact schema given */
+		namespaceId = LookupExplicitNamespace(schemaname);
+		prsoid = GetSysCacheOid(TSPARSERNAMENSP,
+								PointerGetDatum(parser_name),
+								ObjectIdGetDatum(namespaceId),
+								0, 0);
 	}
+	else
+	{
+		/* search for it in search path */
+		recomputeNamespacePath();
 
-	*nspname_p = schemaname;
-	*objname_p = objname;
-}
+		foreach(l, activeSearchPath)
+		{
+			namespaceId = lfirst_oid(l);
 
-/*
- * LookupExplicitNamespace
- *		Process an explicitly-specified schema name: look up the schema
- *		and verify we have USAGE (lookup) rights in it.
- *
- * Returns the namespace OID.  Raises ereport if any problem.
- */
-Oid
-LookupExplicitNamespace(const char *nspname)
-{
-	Oid			namespaceId;
-	AclResult	aclresult;
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
 
-	/* check for pg_temp alias */
-	if (strcmp(nspname, "pg_temp") == 0)
-	{
-		if (TempNamespaceValid(true))
-			return myTempNamespace;
-		/*
-		 * Since this is used only for looking up existing objects, there
-		 * is no point in trying to initialize the temp namespace here;
-		 * and doing so might create problems for some callers.
-		 * Just fall through and give the "does not exist" error.
-		 */
+			prsoid = GetSysCacheOid(TSPARSERNAMENSP,
+									PointerGetDatum(parser_name),
+									ObjectIdGetDatum(namespaceId),
+									0, 0);
+			if (OidIsValid(prsoid))
+				break;
+		}
 	}
 
-	namespaceId = caql_getoid(
-			NULL,
-			cql("SELECT oid FROM pg_namespace "
-				" WHERE nspname = :1 ",
-				CStringGetDatum((char *) nspname)));
-
-	if (!OidIsValid(namespaceId))
+	if (!OidIsValid(prsoid) && !failOK)
 		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_SCHEMA),
-				 errmsg("schema \"%s\" does not exist", nspname)));
-
-	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_USAGE);
-	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
-					   nspname);
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("text search parser \"%s\" does not exist",
+						NameListToString(names))));
 
-	return namespaceId;
+	return prsoid;
 }
 
 /*
- * LookupCreationNamespace
- *		Look up the schema and verify we have CREATE rights on it.
- *
- * This is just like LookupExplicitNamespace except for the permission check,
- * and that we are willing to create pg_temp if needed.
- *
- * Note: calling this may result in a CommandCounterIncrement operation,
- * if we have to create or clean out the temp namespace.
+ * TSParserIsVisible
+ *		Determine whether a parser (identified by OID) is visible in the
+ *		current search path.  Visible means "would be found by searching
+ *		for the unqualified parser name".
  */
-Oid
-LookupCreationNamespace(const char *nspname)
+bool
+TSParserIsVisible(Oid prsId)
 {
-	Oid			namespaceId;
-	AclResult	aclresult;
+	HeapTuple	tup;
+	Form_pg_ts_parser form;
+	Oid			namespace;
+	bool		visible;
 
-	/* check for pg_temp alias */
-	if (strcmp(nspname, "pg_temp") == 0)
+	tup = SearchSysCache(TSPARSEROID,
+						 ObjectIdGetDatum(prsId),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search parser %u", prsId);
+	form = (Form_pg_ts_parser) GETSTRUCT(tup);
+
+	recomputeNamespacePath();
+
+	/*
+	 * Quick check: if it ain't in the path at all, it ain't visible. Items in
+	 * the system namespace are surely in the path and so we needn't even do
+	 * list_member_oid() for them.
+	 */
+	namespace = form->prsnamespace;
+	if (namespace != PG_CATALOG_NAMESPACE &&
+		!list_member_oid(activeSearchPath, namespace))
+		visible = false;
+	else
 	{
-		/* Initialize temp namespace if first time through */
-		if (!TempNamespaceValid(false))
-			InitTempTableNamespace();
-		return myTempNamespace;
-	}
+		/*
+		 * If it is in the path, it might still not be visible; it could be
+		 * hidden by another parser of the same name earlier in the path. So
+		 * we must do a slow check for conflicting parsers.
+		 */
+		char	   *name = NameStr(form->prsname);
+		ListCell   *l;
 
-	namespaceId = caql_getoid(
-			NULL,
-			cql("SELECT oid FROM pg_namespace "
-				" WHERE nspname = :1 ",
-				CStringGetDatum((char *) nspname)));
+		visible = false;
+		foreach(l, activeSearchPath)
+		{
+			Oid			namespaceId = lfirst_oid(l);
 
-	if (!OidIsValid(namespaceId))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_SCHEMA),
-				 errmsg("schema \"%s\" does not exist", nspname)));
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
 
-	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_CREATE);
-	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
-					   nspname);
+			if (namespaceId == namespace)
+			{
+				/* Found it first in path */
+				visible = true;
+				break;
+			}
+			if (SearchSysCacheExists(TSPARSERNAMENSP,
+									 PointerGetDatum(name),
+									 ObjectIdGetDatum(namespaceId),
+									 0, 0))
+			{
+				/* Found something else first in path */
+				break;
+			}
+		}
+	}
 
-	return namespaceId;
+	ReleaseSysCache(tup);
+
+	return visible;
 }
 
 /*
- * QualifiedNameGetCreationNamespace
- *		Given a possibly-qualified name for an object (in List-of-Values
- *		format), determine what namespace the object should be created in.
- *		Also extract and return the object name (last component of list).
- *
- * Note: this does not apply any permissions check.  Callers must check
- * for CREATE rights on the selected namespace when appropriate.
+ * TSDictionaryGetDictid - find a TS dictionary by possibly qualified name
  *
- * Note: calling this may result in a CommandCounterIncrement operation,
- * if we have to create or clean out the temp namespace.
+ * If not found, returns InvalidOid if failOK, else throws error
  */
 Oid
-QualifiedNameGetCreationNamespace(List *names, char **objname_p)
+TSDictionaryGetDictid(List *names, bool failOK)
 {
 	char	   *schemaname;
+	char	   *dict_name;
 	Oid			namespaceId;
+	Oid			dictoid = InvalidOid;
+	ListCell   *l;
 
 	/* deconstruct the name list */
-	DeconstructQualifiedName(names, &schemaname, objname_p);
+	DeconstructQualifiedName(names, &schemaname, &dict_name);
 
 	if (schemaname)
 	{
@@ -1904,58 +1939,589 @@ QualifiedNameGetCreationNamespace(List *names, char **objname_p)
 			return myTempNamespace;
 		}
 		/* use exact schema given */
-		namespaceId = caql_getoid(
-				NULL,
-				cql("SELECT oid FROM pg_namespace "
-					" WHERE nspname = :1 ",
-					CStringGetDatum(schemaname)));
-
-		if (!OidIsValid(namespaceId))
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_SCHEMA),
-					 errmsg("schema \"%s\" does not exist", schemaname)));
-		/* we do not check for USAGE rights here! */
+		namespaceId = LookupExplicitNamespace(schemaname);
+		dictoid = GetSysCacheOid(TSDICTNAMENSP,
+								 PointerGetDatum(dict_name),
+								 ObjectIdGetDatum(namespaceId),
+								 0, 0);
 	}
 	else
 	{
-		/* use the default creation namespace */
+		/* search for it in search path */
 		recomputeNamespacePath();
-		if (tempCreationPending)
+
+		foreach(l, activeSearchPath)
 		{
-			/* Need to initialize temp namespace */
-			InitTempTableNamespace();
-			return myTempNamespace;
+			namespaceId = lfirst_oid(l);
+
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
+
+			dictoid = GetSysCacheOid(TSDICTNAMENSP,
+									 PointerGetDatum(dict_name),
+									 ObjectIdGetDatum(namespaceId),
+									 0, 0);
+			if (OidIsValid(dictoid))
+				break;
 		}
-		namespaceId = defaultCreationNamespace;
-		if (!OidIsValid(namespaceId))
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_SCHEMA),
-					 errmsg("no schema has been selected to create in")));
 	}
 
-	return namespaceId;
+	if (!OidIsValid(dictoid) && !failOK)
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("text search dictionary \"%s\" does not exist",
+						NameListToString(names))));
+
+	return dictoid;
 }
 
 /*
- * makeRangeVarFromNameList
- *		Utility routine to convert a qualified-name list into RangeVar form.
+ * TSDictionaryIsVisible
+ *		Determine whether a dictionary (identified by OID) is visible in the
+ *		current search path.  Visible means "would be found by searching
+ *		for the unqualified dictionary name".
  */
-RangeVar *
-makeRangeVarFromNameList(List *names)
+bool
+TSDictionaryIsVisible(Oid dictId)
 {
-	RangeVar   *rel = makeRangeVar(NULL, NULL, -1);
+	HeapTuple	tup;
+	Form_pg_ts_dict form;
+	Oid			namespace;
+	bool		visible;
 
-	switch (list_length(names))
+	tup = SearchSysCache(TSDICTOID,
+						 ObjectIdGetDatum(dictId),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 dictId);
+	form = (Form_pg_ts_dict) GETSTRUCT(tup);
+
+	recomputeNamespacePath();
+
+	/*
+	 * Quick check: if it ain't in the path at all, it ain't visible. Items in
+	 * the system namespace are surely in the path and so we needn't even do
+	 * list_member_oid() for them.
+	 */
+	namespace = form->dictnamespace;
+	if (namespace != PG_CATALOG_NAMESPACE &&
+		!list_member_oid(activeSearchPath, namespace))
+		visible = false;
+	else
 	{
-		case 1:
-			rel->relname = strVal(linitial(names));
-			break;
-		case 2:
-			rel->schemaname = strVal(linitial(names));
-			rel->relname = strVal(lsecond(names));
-			break;
-		case 3:
-			rel->catalogname = strVal(linitial(names));
+		/*
+		 * If it is in the path, it might still not be visible; it could be
+		 * hidden by another dictionary of the same name earlier in the path.
+		 * So we must do a slow check for conflicting dictionaries.
+		 */
+		char	   *name = NameStr(form->dictname);
+		ListCell   *l;
+
+		visible = false;
+		foreach(l, activeSearchPath)
+		{
+			Oid			namespaceId = lfirst_oid(l);
+
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
+
+			if (namespaceId == namespace)
+			{
+				/* Found it first in path */
+				visible = true;
+				break;
+			}
+			if (SearchSysCacheExists(TSDICTNAMENSP,
+									 PointerGetDatum(name),
+									 ObjectIdGetDatum(namespaceId),
+									 0, 0))
+			{
+				/* Found something else first in path */
+				break;
+			}
+		}
+	}
+
+	ReleaseSysCache(tup);
+
+	return visible;
+}
+
+/*
+ * TSTemplateGetTmplid - find a TS template by possibly qualified name
+ *
+ * If not found, returns InvalidOid if failOK, else throws error
+ */
+Oid
+TSTemplateGetTmplid(List *names, bool failOK)
+{
+	char	   *schemaname;
+	char	   *template_name;
+	Oid			namespaceId;
+	Oid			tmploid = InvalidOid;
+	ListCell   *l;
+
+	/* deconstruct the name list */
+	DeconstructQualifiedName(names, &schemaname, &template_name);
+
+	if (schemaname)
+	{
+		/* use exact schema given */
+		namespaceId = LookupExplicitNamespace(schemaname);
+		tmploid = GetSysCacheOid(TSTEMPLATENAMENSP,
+								 PointerGetDatum(template_name),
+								 ObjectIdGetDatum(namespaceId),
+								 0, 0);
+	}
+	else
+	{
+		/* search for it in search path */
+		recomputeNamespacePath();
+
+		foreach(l, activeSearchPath)
+		{
+			namespaceId = lfirst_oid(l);
+
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
+
+			tmploid = GetSysCacheOid(TSTEMPLATENAMENSP,
+									 PointerGetDatum(template_name),
+									 ObjectIdGetDatum(namespaceId),
+									 0, 0);
+			if (OidIsValid(tmploid))
+				break;
+		}
+	}
+
+	if (!OidIsValid(tmploid) && !failOK)
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("text search template \"%s\" does not exist",
+						NameListToString(names))));
+
+	return tmploid;
+}
+
+/*
+ * TSTemplateIsVisible
+ *		Determine whether a template (identified by OID) is visible in the
+ *		current search path.  Visible means "would be found by searching
+ *		for the unqualified template name".
+ */
+bool
+TSTemplateIsVisible(Oid tmplId)
+{
+	HeapTuple	tup;
+	Form_pg_ts_template form;
+	Oid			namespace;
+	bool		visible;
+
+	tup = SearchSysCache(TSTEMPLATEOID,
+						 ObjectIdGetDatum(tmplId),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search template %u", tmplId);
+	form = (Form_pg_ts_template) GETSTRUCT(tup);
+
+	recomputeNamespacePath();
+
+	/*
+	 * Quick check: if it ain't in the path at all, it ain't visible. Items in
+	 * the system namespace are surely in the path and so we needn't even do
+	 * list_member_oid() for them.
+	 */
+	namespace = form->tmplnamespace;
+	if (namespace != PG_CATALOG_NAMESPACE &&
+		!list_member_oid(activeSearchPath, namespace))
+		visible = false;
+	else
+	{
+		/*
+		 * If it is in the path, it might still not be visible; it could be
+		 * hidden by another template of the same name earlier in the path. So
+		 * we must do a slow check for conflicting templates.
+		 */
+		char	   *name = NameStr(form->tmplname);
+		ListCell   *l;
+
+		visible = false;
+		foreach(l, activeSearchPath)
+		{
+			Oid			namespaceId = lfirst_oid(l);
+
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
+
+			if (namespaceId == namespace)
+			{
+				/* Found it first in path */
+				visible = true;
+				break;
+			}
+			if (SearchSysCacheExists(TSTEMPLATENAMENSP,
+									 PointerGetDatum(name),
+									 ObjectIdGetDatum(namespaceId),
+									 0, 0))
+			{
+				/* Found something else first in path */
+				break;
+			}
+		}
+	}
+
+	ReleaseSysCache(tup);
+
+	return visible;
+}
+
+/*
+ * TSConfigGetCfgid - find a TS config by possibly qualified name
+ *
+ * If not found, returns InvalidOid if failOK, else throws error
+ */
+Oid
+TSConfigGetCfgid(List *names, bool failOK)
+{
+	char	   *schemaname;
+	char	   *config_name;
+	Oid			namespaceId;
+	Oid			cfgoid = InvalidOid;
+	ListCell   *l;
+
+	/* deconstruct the name list */
+	DeconstructQualifiedName(names, &schemaname, &config_name);
+
+	if (schemaname)
+	{
+		/* use exact schema given */
+		namespaceId = LookupExplicitNamespace(schemaname);
+		cfgoid = GetSysCacheOid(TSCONFIGNAMENSP,
+								PointerGetDatum(config_name),
+								ObjectIdGetDatum(namespaceId),
+								0, 0);
+	}
+	else
+	{
+		/* search for it in search path */
+		recomputeNamespacePath();
+
+		foreach(l, activeSearchPath)
+		{
+			namespaceId = lfirst_oid(l);
+
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
+
+			cfgoid = GetSysCacheOid(TSCONFIGNAMENSP,
+									PointerGetDatum(config_name),
+									ObjectIdGetDatum(namespaceId),
+									0, 0);
+			if (OidIsValid(cfgoid))
+				break;
+		}
+	}
+
+	if (!OidIsValid(cfgoid) && !failOK)
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("text search configuration \"%s\" does not exist",
+						NameListToString(names))));
+
+	return cfgoid;
+}
+
+/*
+ * TSConfigIsVisible
+ *		Determine whether a text search configuration (identified by OID)
+ *		is visible in the current search path.	Visible means "would be found
+ *		by searching for the unqualified text search configuration name".
+ */
+bool
+TSConfigIsVisible(Oid cfgid)
+{
+	HeapTuple	tup;
+	Form_pg_ts_config form;
+	Oid			namespace;
+	bool		visible;
+
+	tup = SearchSysCache(TSCONFIGOID,
+						 ObjectIdGetDatum(cfgid),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search configuration %u",
+			 cfgid);
+	form = (Form_pg_ts_config) GETSTRUCT(tup);
+
+	recomputeNamespacePath();
+
+	/*
+	 * Quick check: if it ain't in the path at all, it ain't visible. Items in
+	 * the system namespace are surely in the path and so we needn't even do
+	 * list_member_oid() for them.
+	 */
+	namespace = form->cfgnamespace;
+	if (namespace != PG_CATALOG_NAMESPACE &&
+		!list_member_oid(activeSearchPath, namespace))
+		visible = false;
+	else
+	{
+		/*
+		 * If it is in the path, it might still not be visible; it could be
+		 * hidden by another configuration of the same name earlier in the
+		 * path. So we must do a slow check for conflicting configurations.
+		 */
+		char	   *name = NameStr(form->cfgname);
+		ListCell   *l;
+
+		visible = false;
+		foreach(l, activeSearchPath)
+		{
+			Oid			namespaceId = lfirst_oid(l);
+
+			if (namespaceId == myTempNamespace)
+				continue;		/* do not look in temp namespace */
+
+			if (namespaceId == namespace)
+			{
+				/* Found it first in path */
+				visible = true;
+				break;
+			}
+			if (SearchSysCacheExists(TSCONFIGNAMENSP,
+									 PointerGetDatum(name),
+									 ObjectIdGetDatum(namespaceId),
+									 0, 0))
+			{
+				/* Found something else first in path */
+				break;
+			}
+		}
+	}
+
+	ReleaseSysCache(tup);
+
+	return visible;
+}
+
+
+/*
+ * DeconstructQualifiedName
+ *		Given a possibly-qualified name expressed as a list of String nodes,
+ *		extract the schema name and object name.
+ *
+ * *nspname_p is set to NULL if there is no explicit schema name.
+ */
+void
+DeconstructQualifiedName(List *names,
+						 char **nspname_p,
+						 char **objname_p)
+{
+	char	   *catalogname;
+	char	   *schemaname = NULL;
+	char	   *objname = NULL;
+
+	switch (list_length(names))
+	{
+		case 1:
+			objname = strVal(linitial(names));
+			break;
+		case 2:
+			schemaname = strVal(linitial(names));
+			objname = strVal(lsecond(names));
+			break;
+		case 3:
+			catalogname = strVal(linitial(names));
+			schemaname = strVal(lsecond(names));
+			objname = strVal(lthird(names));
+
+			/*
+			 * We check the catalog name and then ignore it.
+			 */
+			if (strcmp(catalogname, get_database_name(MyDatabaseId)) != 0)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				  errmsg("cross-database references are not implemented: %s",
+						 NameListToString(names))));
+			break;
+		default:
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+				errmsg("improper qualified name (too many dotted names): %s",
+					   NameListToString(names))));
+			break;
+	}
+
+	*nspname_p = schemaname;
+	*objname_p = objname;
+}
+
+/*
+ * LookupExplicitNamespace
+ *		Process an explicitly-specified schema name: look up the schema
+ *		and verify we have USAGE (lookup) rights in it.
+ *
+ * Returns the namespace OID.  Raises ereport if any problem.
+ */
+Oid
+LookupExplicitNamespace(const char *nspname)
+{
+	Oid			namespaceId;
+	AclResult	aclresult;
+
+	/* check for pg_temp alias */
+	if (strcmp(nspname, "pg_temp") == 0)
+	{
+		if (TempNamespaceValid(true))
+			return myTempNamespace;
+
+		/*
+		 * Since this is used only for looking up existing objects, there is
+		 * no point in trying to initialize the temp namespace here; and doing
+		 * so might create problems for some callers. Just fall through and
+		 * give the "does not exist" error.
+		 */
+	}
+
+	namespaceId = GetSysCacheOid(NAMESPACENAME,
+								 CStringGetDatum(nspname),
+								 0, 0, 0);
+	if (!OidIsValid(namespaceId))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_SCHEMA),
+				 errmsg("schema \"%s\" does not exist", nspname)));
+
+	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_USAGE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					   nspname);
+
+	return namespaceId;
+}
+
+/*
+ * LookupCreationNamespace
+ *		Look up the schema and verify we have CREATE rights on it.
+ *
+ * This is just like LookupExplicitNamespace except for the permission check,
+ * and that we are willing to create pg_temp if needed.
+ *
+ * Note: calling this may result in a CommandCounterIncrement operation,
+ * if we have to create or clean out the temp namespace.
+ */
+Oid
+LookupCreationNamespace(const char *nspname)
+{
+	Oid			namespaceId;
+	AclResult	aclresult;
+
+	/* check for pg_temp alias */
+	if (strcmp(nspname, "pg_temp") == 0)
+	{
+		/* Initialize temp namespace if first time through */
+		if (!TempNamespaceValid(false))
+			InitTempTableNamespace();
+		return myTempNamespace;
+	}
+
+	namespaceId = GetSysCacheOid(NAMESPACENAME,
+								 CStringGetDatum(nspname),
+								 0, 0, 0);
+	if (!OidIsValid(namespaceId))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_SCHEMA),
+				 errmsg("schema \"%s\" does not exist", nspname)));
+
+	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_CREATE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					   nspname);
+
+	return namespaceId;
+}
+
+/*
+ * QualifiedNameGetCreationNamespace
+ *		Given a possibly-qualified name for an object (in List-of-Values
+ *		format), determine what namespace the object should be created in.
+ *		Also extract and return the object name (last component of list).
+ *
+ * Note: this does not apply any permissions check.  Callers must check
+ * for CREATE rights on the selected namespace when appropriate.
+ *
+ * Note: calling this may result in a CommandCounterIncrement operation,
+ * if we have to create or clean out the temp namespace.
+ */
+Oid
+QualifiedNameGetCreationNamespace(List *names, char **objname_p)
+{
+	char	   *schemaname;
+	Oid			namespaceId;
+
+	/* deconstruct the name list */
+	DeconstructQualifiedName(names, &schemaname, objname_p);
+
+	if (schemaname)
+	{
+		/* check for pg_temp alias */
+		if (strcmp(schemaname, "pg_temp") == 0)
+		{
+			/* Initialize temp namespace if first time through */
+			if (!OidIsValid(myTempNamespace))
+				InitTempTableNamespace();
+			return myTempNamespace;
+		}
+		/* use exact schema given */
+		namespaceId = GetSysCacheOid(NAMESPACENAME,
+									 CStringGetDatum(schemaname),
+									 0, 0, 0);
+		if (!OidIsValid(namespaceId))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_SCHEMA),
+					 errmsg("schema \"%s\" does not exist", schemaname)));
+		/* we do not check for USAGE rights here! */
+	}
+	else
+	{
+		/* use the default creation namespace */
+		recomputeNamespacePath();
+		if (activeTempCreationPending)
+		{
+			/* Need to initialize temp namespace */
+			InitTempTableNamespace();
+			return myTempNamespace;
+		}
+		namespaceId = activeCreationNamespace;
+		if (!OidIsValid(namespaceId))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_SCHEMA),
+					 errmsg("no schema has been selected to create in")));
+	}
+
+	return namespaceId;
+}
+
+/*
+ * makeRangeVarFromNameList
+ *		Utility routine to convert a qualified-name list into RangeVar form.
+ */
+RangeVar *
+makeRangeVarFromNameList(List *names)
+{
+	RangeVar   *rel = makeRangeVar(NULL, NULL, -1);
+
+	switch (list_length(names))
+	{
+		case 1:
+			rel->relname = strVal(linitial(names));
+			break;
+		case 2:
+			rel->schemaname = strVal(linitial(names));
+			rel->relname = strVal(lsecond(names));
+			break;
+		case 3:
+			rel->catalogname = strVal(linitial(names));
 			rel->schemaname = strVal(lsecond(names));
 			rel->relname = strVal(lthird(names));
 			break;
@@ -2042,9 +2608,35 @@ isTempNamespace(Oid namespaceId)
 	return false;
 }
 
+/*
+ * isTempToastNamespace - is the given namespace my temporary-toast-table
+ *		namespace?
+ */
+bool
+isTempToastNamespace(Oid namespaceId)
+{
+	if (OidIsValid(myTempToastNamespace) && myTempToastNamespace == namespaceId)
+		return true;
+	return false;
+}
+
+/*
+ * isTempOrToastNamespace - is the given namespace my temporary-table
+ *		namespace or my temporary-toast-table namespace?
+ */
+bool
+isTempOrToastNamespace(Oid namespaceId)
+{
+	if (OidIsValid(myTempNamespace) &&
+	 (myTempNamespace == namespaceId || myTempToastNamespace == namespaceId))
+		return true;
+	return false;
+}
+
 /*
  * isAnyTempNamespace - is the given namespace a temporary-table namespace
- * (either my own, or another backend's)?
+ * (either my own, or another backend's)?  Temporary-toast-table namespaces
+ * are included, too.
  */
 bool
 isAnyTempNamespace(Oid namespaceId)
@@ -2058,59 +2650,193 @@ isAnyTempNamespace(Oid namespaceId)
 	if (IsBootstrapProcessingMode())
 		return false;
 
-	/* If the namespace name starts with "pg_temp_", say "true" */
+	/* True if the namespace name starts with "pg_temp_" or "pg_toast_temp_" */
 	nspname = get_namespace_name(namespaceId);
 	if (!nspname)
 		return false;			/* no such namespace? */
-	result = (strncmp(nspname, "pg_temp_", 8) == 0);
+	result = (strncmp(nspname, "pg_temp_", 8) == 0) ||
+		(strncmp(nspname, "pg_toast_temp_", 14) == 0);
 	pfree(nspname);
 	return result;
 }
 
 /*
  * isOtherTempNamespace - is the given namespace some other backend's
- * temporary-table namespace?
+ * temporary-table namespace (including temporary-toast-table namespaces)?
  */
 bool
 isOtherTempNamespace(Oid namespaceId)
 {
 	/* If it's my own temp namespace, say "false" */
-	if (isTempNamespace(namespaceId))
+	if (isTempOrToastNamespace(namespaceId))
 		return false;
-	/* Else, if the namespace name starts with "pg_temp_", say "true" */
+	/* Else, if it's any temp namespace, say "true" */
 	return isAnyTempNamespace(namespaceId);
 }
 
 /*
- * PushSpecialNamespace - push a "special" namespace onto the front of the
- * search path.
+ * GetTempToastNamespace - get the OID of my temporary-toast-table namespace,
+ * which must already be assigned.	(This is only used when creating a toast
+ * table for a temp table, so we must have already done InitTempTableNamespace)
+ */
+Oid
+GetTempToastNamespace(void)
+{
+	Assert(OidIsValid(myTempToastNamespace));
+	return myTempToastNamespace;
+}
+
+
+/*
+ * GetOverrideSearchPath - fetch current search path definition in form
+ * used by PushOverrideSearchPath.
+ *
+ * The result structure is allocated in the specified memory context
+ * (which might or might not be equal to CurrentMemoryContext); but any
+ * junk created by revalidation calculations will be in CurrentMemoryContext.
+ */
+OverrideSearchPath *
+GetOverrideSearchPath(MemoryContext context)
+{
+	OverrideSearchPath *result;
+	List	   *schemas;
+	MemoryContext oldcxt;
+
+	recomputeNamespacePath();
+
+	oldcxt = MemoryContextSwitchTo(context);
+
+	result = (OverrideSearchPath *) palloc0(sizeof(OverrideSearchPath));
+	schemas = list_copy(activeSearchPath);
+	while (schemas && linitial_oid(schemas) != activeCreationNamespace)
+	{
+		if (linitial_oid(schemas) == myTempNamespace)
+			result->addTemp = true;
+		else
+		{
+			Assert(linitial_oid(schemas) == PG_CATALOG_NAMESPACE);
+			result->addCatalog = true;
+		}
+		schemas = list_delete_first(schemas);
+	}
+	result->schemas = schemas;
+
+	MemoryContextSwitchTo(oldcxt);
+
+	return result;
+}
+
+/*
+ * PushOverrideSearchPath - temporarily override the search path
  *
- * This is a slightly messy hack intended only for support of CREATE SCHEMA.
- * Although the API is defined to allow a stack of pushed namespaces, we
- * presently only support one at a time.
+ * We allow nested overrides, hence the push/pop terminology.  The GUC
+ * search_path variable is ignored while an override is active.
  *
- * The pushed namespace will be removed from the search path at end of
- * transaction, whether commit or abort.
+ * It's possible that newpath->useTemp is set but there is no longer any
+ * active temp namespace, if the path was saved during a transaction that
+ * created a temp namespace and was later rolled back.  In that case we just
+ * ignore useTemp.  A plausible alternative would be to create a new temp
+ * namespace, but for existing callers that's not necessary because an empty
+ * temp namespace wouldn't affect their results anyway.
+ *
+ * It's also worth noting that other schemas listed in newpath might not
+ * exist anymore either.  We don't worry about this because OIDs that match
+ * no existing namespace will simply not produce any hits during searches.
  */
 void
-PushSpecialNamespace(Oid namespaceId)
+PushOverrideSearchPath(OverrideSearchPath *newpath)
 {
-	Assert(!OidIsValid(mySpecialNamespace));
-	mySpecialNamespace = namespaceId;
-	namespaceSearchPathValid = false;
+	OverrideStackEntry *entry;
+	List	   *oidlist;
+	Oid			firstNS;
+	MemoryContext oldcxt;
+
+	/*
+	 * Copy the list for safekeeping, and insert implicitly-searched
+	 * namespaces as needed.  This code should track recomputeNamespacePath.
+	 */
+	oldcxt = MemoryContextSwitchTo(TopMemoryContext);
+
+	oidlist = list_copy(newpath->schemas);
+
+	/*
+	 * Remember the first member of the explicit list.
+	 */
+	if (oidlist == NIL)
+		firstNS = InvalidOid;
+	else
+		firstNS = linitial_oid(oidlist);
+
+	/*
+	 * Add any implicitly-searched namespaces to the list.	Note these go on
+	 * the front, not the back; also notice that we do not check USAGE
+	 * permissions for these.
+	 */
+	if (newpath->addCatalog)
+		oidlist = lcons_oid(PG_CATALOG_NAMESPACE, oidlist);
+
+	if (newpath->addTemp && OidIsValid(myTempNamespace))
+		oidlist = lcons_oid(myTempNamespace, oidlist);
+
+	/*
+	 * Build the new stack entry, then insert it at the head of the list.
+	 */
+	entry = (OverrideStackEntry *) palloc(sizeof(OverrideStackEntry));
+	entry->searchPath = oidlist;
+	entry->creationNamespace = firstNS;
+	entry->nestLevel = GetCurrentTransactionNestLevel();
+
+	overrideStack = lcons(entry, overrideStack);
+
+	/* And make it active. */
+	activeSearchPath = entry->searchPath;
+	activeCreationNamespace = entry->creationNamespace;
+	activeTempCreationPending = false;	/* XXX is this OK? */
+
+	MemoryContextSwitchTo(oldcxt);
 }
 
 /*
- * PopSpecialNamespace - remove previously pushed special namespace.
+ * PopOverrideSearchPath - undo a previous PushOverrideSearchPath
+ *
+ * Any push during a (sub)transaction will be popped automatically at abort.
+ * But it's caller error if a push isn't popped in normal control flow.
  */
 void
-PopSpecialNamespace(Oid namespaceId)
+PopOverrideSearchPath(void)
 {
-	Assert(mySpecialNamespace == namespaceId);
-	mySpecialNamespace = InvalidOid;
-	namespaceSearchPathValid = false;
+	OverrideStackEntry *entry;
+
+	/* Sanity checks. */
+	if (overrideStack == NIL)
+		elog(ERROR, "bogus PopOverrideSearchPath call");
+	entry = (OverrideStackEntry *) linitial(overrideStack);
+	if (entry->nestLevel != GetCurrentTransactionNestLevel())
+		elog(ERROR, "bogus PopOverrideSearchPath call");
+
+	/* Pop the stack and free storage. */
+	overrideStack = list_delete_first(overrideStack);
+	list_free(entry->searchPath);
+	pfree(entry);
+
+	/* Activate the next level down. */
+	if (overrideStack)
+	{
+		entry = (OverrideStackEntry *) linitial(overrideStack);
+		activeSearchPath = entry->searchPath;
+		activeCreationNamespace = entry->creationNamespace;
+		activeTempCreationPending = false;		/* XXX is this OK? */
+	}
+	else
+	{
+		/* If not baseSearchPathValid, this is useless but harmless */
+		activeSearchPath = baseSearchPath;
+		activeCreationNamespace = baseCreationNamespace;
+		activeTempCreationPending = baseTempCreationPending;
+	}
 }
 
+
 /*
  * FindConversionByName - find a conversion by possibly qualified name
  */
@@ -2137,12 +2863,12 @@ FindConversionByName(List *name)
 		/* search for it in search path */
 		recomputeNamespacePath();
 
-		foreach(l, namespaceSearchPath)
+		foreach(l, activeSearchPath)
 		{
 			namespaceId = lfirst_oid(l);
 
 			if (namespaceId == myTempNamespace)
-				continue;			/* do not look in temp namespace */
+				continue;		/* do not look in temp namespace */
 
 			conoid = FindConversion(conversion_name, namespaceId);
 			if (OidIsValid(conoid))
@@ -2165,7 +2891,7 @@ FindDefaultConversionProc(int4 for_encoding, int4 to_encoding)
 
 	recomputeNamespacePath();
 
-	foreach(l, namespaceSearchPath)
+	foreach(l, activeSearchPath)
 	{
 		Oid			namespaceId = lfirst_oid(l);
 
@@ -2197,10 +2923,12 @@ recomputeNamespacePath(void)
 	Oid			firstNS;
 	MemoryContext oldcxt;
 
-	/*
-	 * Do nothing if path is already valid.
-	 */
-	if (namespaceSearchPathValid && namespaceUser == roleid)
+	/* Do nothing if an override search spec is active. */
+	if (overrideStack)
+		return;
+
+	/* Do nothing if path is already valid. */
+	if (baseSearchPathValid && namespaceUser == roleid)
 		return;
 
 	/* Need a modifiable copy of namespace_search_path string */
@@ -2259,7 +2987,6 @@ recomputeNamespacePath(void)
 		else if (strcmp(curname, "pg_temp") == 0)
 		{
 			/* pg_temp --- substitute temp namespace, if any */
-
 			if (TempNamespaceValid(true))
 			{
 				if (!list_member_oid(oidlist, myTempNamespace))
@@ -2290,7 +3017,7 @@ recomputeNamespacePath(void)
 	}
 
 	/*
-	 * Remember the first member of the explicit list.  (Note: this is
+	 * Remember the first member of the explicit list.	(Note: this is
 	 * nominally wrong if temp_missing, but we need it anyway to distinguish
 	 * explicit from implicit mention of pg_catalog.)
 	 */
@@ -2311,10 +3038,6 @@ recomputeNamespacePath(void)
 		!list_member_oid(oidlist, myTempNamespace))
 		oidlist = lcons_oid(myTempNamespace, oidlist);
 
-	if (OidIsValid(mySpecialNamespace) &&
-		!list_member_oid(oidlist, mySpecialNamespace))
-		oidlist = lcons_oid(mySpecialNamespace, oidlist);
-
 	/*
 	 * Now that we've successfully built the new list of namespace OIDs, save
 	 * it in permanent storage.
@@ -2323,30 +3046,21 @@ recomputeNamespacePath(void)
 	newpath = list_copy(oidlist);
 	MemoryContextSwitchTo(oldcxt);
 
-	/* Now safe to assign to state variable. */
-	list_free(namespaceSearchPath);
-	namespaceSearchPath = newpath;
-
-	/*
-	 * Update info derived from search path.
-	 */
-	firstExplicitNamespace = firstNS;
-	if (OidIsValid(mySpecialNamespace))
-	{
-		defaultCreationNamespace = mySpecialNamespace;
-		/* don't have to create temp in this state */
-		tempCreationPending = false;
-	}
-	else
-	{
-		defaultCreationNamespace = firstNS;
-		tempCreationPending = temp_missing;
-	}
+	/* Now safe to assign to state variables. */
+	list_free(baseSearchPath);
+	baseSearchPath = newpath;
+	baseCreationNamespace = firstNS;
+	baseTempCreationPending = temp_missing;
 
 	/* Mark the path valid. */
-	namespaceSearchPathValid = true;
+	baseSearchPathValid = true;
 	namespaceUser = roleid;
 
+	/* And make it active. */
+	activeSearchPath = baseSearchPath;
+	activeCreationNamespace = baseCreationNamespace;
+	activeTempCreationPending = baseTempCreationPending;
+
 	/* Clean up. */
 	pfree(rawname);
 	list_free(namelist);
@@ -2360,14 +3074,15 @@ recomputeNamespacePath(void)
 static void
 InitTempTableNamespace(void)
 {
-	InitTempTableNamespaceWithOids(InvalidOid);
+	InitTempTableNamespaceWithOids(InvalidOid, InvalidOid);
 }
 
 void
-InitTempTableNamespaceWithOids(Oid tempSchema)
+InitTempTableNamespaceWithOids(Oid tempSchema, Oid tempToastSchema)
 {
 	char		namespaceName[NAMEDATALEN];
 	Oid			namespaceId;
+	Oid			toastspaceId;
 	int			session_suffix;
 
 	/*
@@ -2450,22 +3165,48 @@ InitTempTableNamespaceWithOids(Oid tempSchema)
 	/* Advance command counter to make namespace visible */
 	CommandCounterIncrement();
 
+	/*
+	 * If the corresponding toast-table namespace doesn't exist yet, create it.
+	 * (We assume there is no need to clean it out if it does exist, since
+	 * dropping a parent table should make its toast table go away.)
+	 * (in GPDB, though, we drop and recreate it anyway, to make sure it has
+	 * the same OID on master and segments.)
+	 */
+	snprintf(namespaceName, sizeof(namespaceName), "pg_toast_temp_%d",
+			 session_suffix);
+
+	toastspaceId = GetSysCacheOid(NAMESPACENAME,
+								  CStringGetDatum(namespaceName),
+								  0, 0, 0);
+	if (OidIsValid(toastspaceId))
+	{
+		RemoveSchemaById(toastspaceId);
+		elog(DEBUG1, "Remove schema entry %u from pg_namespace",
+			 namespaceId);
+		toastspaceId = InvalidOid;
+		CommandCounterIncrement();
+	}
+	toastspaceId = NamespaceCreate(namespaceName, BOOTSTRAP_SUPERUSERID, tempToastSchema);
+	/* Advance command counter to make namespace visible */
+	CommandCounterIncrement();
+
 	/*
 	 * Okay, we've prepared the temp namespace ... but it's not committed yet,
 	 * so all our work could be undone by transaction rollback.  Set flag for
 	 * AtEOXact_Namespace to know what to do.
 	 */
 	myTempNamespace = namespaceId;
+	myTempToastNamespace = toastspaceId;
 
 	/* It should not be done already. */
 	AssertState(myTempNamespaceSubID == InvalidSubTransactionId);
 	myTempNamespaceSubID = GetCurrentSubTransactionId();
 
-	namespaceSearchPathValid = false;	/* need to rebuild list */
+	baseSearchPathValid = false;	/* need to rebuild list */
 
 	/*
 	 * GPDB: Dispatch a special CREATE SCHEMA command, to also create the
-	 * temp schema in all the segments.
+	 * temp schemas in all the segments.
 	 *
 	 * We need to keep the OID of the temp schema synchronized across the
 	 * cluster which means that we must go through regular dispatch
@@ -2478,6 +3219,7 @@ InitTempTableNamespaceWithOids(Oid tempSchema)
 		stmt = makeNode(CreateSchemaStmt);
 		stmt->istemp	 = true;
 		stmt->schemaOid = namespaceId;
+		stmt->toastSchemaOid = toastspaceId;
 
 		/*
 		 * Dispatch the command to all primary and mirror segment dbs.
@@ -2508,7 +3250,7 @@ DropTempTableNamespaceForResetSession(Oid namespaceOid)
  * Called by CreateSchemaCommand when creating a temporary schema 
  */
 void
-SetTempNamespace(Oid namespaceOid)
+SetTempNamespace(Oid namespaceId, Oid toastNamespaceId)
 {
 	if (TempNamespaceValid(false))
 		elog(ERROR, "temporary namespace already exists");
@@ -2518,13 +3260,14 @@ SetTempNamespace(Oid namespaceOid)
 	 * so all our work could be undone by transaction rollback.  Set flag for
 	 * AtEOXact_Namespace to know what to do.
 	 */
-	myTempNamespace = namespaceOid;
+	myTempNamespace = namespaceId;
+	myTempToastNamespace = toastNamespaceId;
 
 	/* It should not be done already. */
 	AssertState(myTempNamespaceSubID == InvalidSubTransactionId);
 	myTempNamespaceSubID = GetCurrentSubTransactionId();
 
-	namespaceSearchPathValid = false;	/* need to rebuild list */
+	baseSearchPathValid = false;	/* need to rebuild list */
 }
 
 /*
@@ -2548,7 +3291,7 @@ ResetTempNamespace(void)
 
 	myTempNamespace = InvalidOid;
 	myTempNamespaceSubID = InvalidSubTransactionId;
-	namespaceSearchPathValid = false;	/* need to rebuild list */
+	baseSearchPathValid = false;	/* need to rebuild list */
 
 	return result;
 }
@@ -2574,18 +3317,32 @@ AtEOXact_Namespace(bool isCommit)
 		else
 		{
 			myTempNamespace = InvalidOid;
-			namespaceSearchPathValid = false;	/* need to rebuild list */
+			myTempToastNamespace = InvalidOid;
+			baseSearchPathValid = false;		/* need to rebuild list */
 		}
 		myTempNamespaceSubID = InvalidSubTransactionId;
 	}
 
 	/*
-	 * Clean up if someone failed to do PopSpecialNamespace
+	 * Clean up if someone failed to do PopOverrideSearchPath
 	 */
-	if (OidIsValid(mySpecialNamespace))
+	if (overrideStack)
 	{
-		mySpecialNamespace = InvalidOid;
-		namespaceSearchPathValid = false;		/* need to rebuild list */
+		if (isCommit)
+			elog(WARNING, "leaked override search path");
+		while (overrideStack)
+		{
+			OverrideStackEntry *entry;
+
+			entry = (OverrideStackEntry *) linitial(overrideStack);
+			overrideStack = list_delete_first(overrideStack);
+			list_free(entry->searchPath);
+			pfree(entry);
+		}
+		/* If not baseSearchPathValid, this is useless but harmless */
+		activeSearchPath = baseSearchPath;
+		activeCreationNamespace = baseCreationNamespace;
+		activeTempCreationPending = baseTempCreationPending;
 	}
 }
 
@@ -2601,6 +3358,8 @@ void
 AtEOSubXact_Namespace(bool isCommit, SubTransactionId mySubid,
 					  SubTransactionId parentSubid)
 {
+	OverrideStackEntry *entry;
+
 	if (myTempNamespaceSubID == mySubid)
 	{
 		if (isCommit)
@@ -2610,9 +3369,41 @@ AtEOSubXact_Namespace(bool isCommit, SubTransactionId mySubid,
 			myTempNamespaceSubID = InvalidSubTransactionId;
 			/* TEMP namespace creation failed, so reset state */
 			myTempNamespace = InvalidOid;
-			namespaceSearchPathValid = false;	/* need to rebuild list */
+			myTempToastNamespace = InvalidOid;
+			baseSearchPathValid = false;		/* need to rebuild list */
 		}
 	}
+
+	/*
+	 * Clean up if someone failed to do PopOverrideSearchPath
+	 */
+	while (overrideStack)
+	{
+		entry = (OverrideStackEntry *) linitial(overrideStack);
+		if (entry->nestLevel < GetCurrentTransactionNestLevel())
+			break;
+		if (isCommit)
+			elog(WARNING, "leaked override search path");
+		overrideStack = list_delete_first(overrideStack);
+		list_free(entry->searchPath);
+		pfree(entry);
+	}
+
+	/* Activate the next level down. */
+	if (overrideStack)
+	{
+		entry = (OverrideStackEntry *) linitial(overrideStack);
+		activeSearchPath = entry->searchPath;
+		activeCreationNamespace = entry->creationNamespace;
+		activeTempCreationPending = false;		/* XXX is this OK? */
+	}
+	else
+	{
+		/* If not baseSearchPathValid, this is useless but harmless */
+		activeSearchPath = baseSearchPath;
+		activeCreationNamespace = baseCreationNamespace;
+		activeTempCreationPending = baseTempCreationPending;
+	}
 }
 
 /*
@@ -2683,6 +3474,16 @@ RemoveTempRelationsCallback(int code, Datum arg)
 	}
 }
 
+/*
+ * Remove all temp tables from the temporary namespace.
+ */
+void
+ResetTempTableNamespace(void)
+{
+	if (OidIsValid(myTempNamespace))
+		RemoveTempRelations(myTempNamespace);
+}
+
 
 /*
  * Routines for handling the GUC variable 'search_path'.
@@ -2734,17 +3535,14 @@ assign_search_path(const char *newval, bool doit, GucSource source)
 				continue;
 			if (strcmp(curname, "pg_temp") == 0)
 				continue;
-
-			if (0 == caql_getcount(
-						NULL,
-						cql("SELECT COUNT(*) FROM pg_namespace "
-							" WHERE nspname = :1 ",
-							CStringGetDatum(curname))))
+			if (!SearchSysCacheExists(NAMESPACENAME,
+									  CStringGetDatum(curname),
+									  0, 0, 0))
 			{
 				if (Gp_role != GP_ROLE_EXECUTE)
 					ereport((source == PGC_S_TEST) ? NOTICE : ERROR,
-							(errcode(ERRCODE_UNDEFINED_SCHEMA),
-							 errmsg("schema \"%s\" does not exist", curname)));
+						(errcode(ERRCODE_UNDEFINED_SCHEMA),
+						 errmsg("schema \"%s\" does not exist", curname)));
 			}
 		}
 	}
@@ -2758,7 +3556,7 @@ assign_search_path(const char *newval, bool doit, GucSource source)
 	 * initialization.
 	 */
 	if (doit)
-		namespaceSearchPathValid = false;
+		baseSearchPathValid = false;
 
 	return newval;
 }
@@ -2780,13 +3578,15 @@ InitializeSearchPath(void)
 		MemoryContext oldcxt;
 
 		oldcxt = MemoryContextSwitchTo(TopMemoryContext);
-		namespaceSearchPath = list_make1_oid(PG_CATALOG_NAMESPACE);
+		baseSearchPath = list_make1_oid(PG_CATALOG_NAMESPACE);
 		MemoryContextSwitchTo(oldcxt);
-		defaultCreationNamespace = PG_CATALOG_NAMESPACE;
-		firstExplicitNamespace = PG_CATALOG_NAMESPACE;
-		tempCreationPending = false;
-		namespaceSearchPathValid = true;
+		baseCreationNamespace = PG_CATALOG_NAMESPACE;
+		baseTempCreationPending = false;
+		baseSearchPathValid = true;
 		namespaceUser = GetUserId();
+		activeSearchPath = baseSearchPath;
+		activeCreationNamespace = baseCreationNamespace;
+		activeTempCreationPending = baseTempCreationPending;
 	}
 	else
 	{
@@ -2798,7 +3598,7 @@ InitializeSearchPath(void)
 									  NamespaceCallback,
 									  (Datum) 0);
 		/* Force search path to be recomputed on next use */
-		namespaceSearchPathValid = false;
+		baseSearchPathValid = false;
 	}
 }
 
@@ -2807,10 +3607,10 @@ InitializeSearchPath(void)
  *		Syscache inval callback function
  */
 static void
-NamespaceCallback(Datum arg, Oid relid)
+NamespaceCallback(Datum arg, int cacheid, ItemPointer tuplePtr)
 {
 	/* Force search path to be recomputed on next use */
-	namespaceSearchPathValid = false;
+	baseSearchPathValid = false;
 }
 
 /* double check that temp name space is valid. */
@@ -2881,28 +3681,62 @@ fetch_search_path(bool includeImplicit)
 	recomputeNamespacePath();
 
 	/*
-	 * If the temp namespace should be first, force it to exist.  This is
-	 * so that callers can trust the result to reflect the actual default
-	 * creation namespace.  It's a bit bogus to do this here, since
+	 * If the temp namespace should be first, force it to exist.  This is so
+	 * that callers can trust the result to reflect the actual default
+	 * creation namespace.	It's a bit bogus to do this here, since
 	 * current_schema() is supposedly a stable function without side-effects,
 	 * but the alternatives seem worse.
 	 */
-	if (tempCreationPending)
+	if (activeTempCreationPending)
 	{
 		InitTempTableNamespace();
 		recomputeNamespacePath();
 	}
 
-	result = list_copy(namespaceSearchPath);
+	result = list_copy(activeSearchPath);
 	if (!includeImplicit)
 	{
-		while (result && linitial_oid(result) != firstExplicitNamespace)
+		while (result && linitial_oid(result) != activeCreationNamespace)
 			result = list_delete_first(result);
 	}
 
 	return result;
 }
 
+/*
+ * Fetch the active search path into a caller-allocated array of OIDs.
+ * Returns the number of path entries.  (If this is more than sarray_len,
+ * then the data didn't fit and is not all stored.)
+ *
+ * The returned list always includes the implicitly-prepended namespaces,
+ * but never includes the temp namespace.  (This is suitable for existing
+ * users, which would want to ignore the temp namespace anyway.)  This
+ * definition allows us to not worry about initializing the temp namespace.
+ */
+int
+fetch_search_path_array(Oid *sarray, int sarray_len)
+{
+	int			count = 0;
+	ListCell   *l;
+
+	recomputeNamespacePath();
+
+	foreach(l, activeSearchPath)
+	{
+		Oid			namespaceId = lfirst_oid(l);
+
+		if (namespaceId == myTempNamespace)
+			continue;			/* do not include temp namespace */
+
+		if (count < sarray_len)
+			sarray[count] = namespaceId;
+		count++;
+	}
+
+	return count;
+}
+
+
 /*
  * Export the FooIsVisible functions as SQL-callable functions.
  *
@@ -3006,6 +3840,38 @@ pg_conversion_is_visible(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(ConversionIsVisible(oid));
 }
 
+Datum
+pg_ts_parser_is_visible(PG_FUNCTION_ARGS)
+{
+	Oid			oid = PG_GETARG_OID(0);
+
+	PG_RETURN_BOOL(TSParserIsVisible(oid));
+}
+
+Datum
+pg_ts_dict_is_visible(PG_FUNCTION_ARGS)
+{
+	Oid			oid = PG_GETARG_OID(0);
+
+	PG_RETURN_BOOL(TSDictionaryIsVisible(oid));
+}
+
+Datum
+pg_ts_template_is_visible(PG_FUNCTION_ARGS)
+{
+	Oid			oid = PG_GETARG_OID(0);
+
+	PG_RETURN_BOOL(TSTemplateIsVisible(oid));
+}
+
+Datum
+pg_ts_config_is_visible(PG_FUNCTION_ARGS)
+{
+	Oid			oid = PG_GETARG_OID(0);
+
+	PG_RETURN_BOOL(TSConfigIsVisible(oid));
+}
+
 Datum
 pg_my_temp_schema(PG_FUNCTION_ARGS)
 {
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index b1902f37f307..7a3de1d31515 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.85 2007/01/22 01:35:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.90 2008/01/11 18:39:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -89,8 +89,7 @@ AggregateCreateWithOid(const char		*aggName,
 	hasInternalArg = false;
 	for (i = 0; i < numArgs; i++)
 	{
-		if (aggArgTypes[i] == ANYARRAYOID ||
-			aggArgTypes[i] == ANYELEMENTOID)
+		if (IsPolymorphicType(aggArgTypes[i]))
 			hasPolyArg = true;
 		else if (aggArgTypes[i] == INTERNALOID)
 			hasInternalArg = true;
@@ -100,12 +99,11 @@ AggregateCreateWithOid(const char		*aggName,
 	 * If transtype is polymorphic, must have polymorphic argument also; else
 	 * we will have no way to deduce the actual transtype.
 	 */
-	if (!hasPolyArg &&
-		(aggTransType == ANYARRAYOID || aggTransType == ANYELEMENTOID))
+	if (IsPolymorphicType(aggTransType) && !hasPolyArg)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 				 errmsg("cannot determine transition data type"),
-				 errdetail("An aggregate using \"anyarray\" or \"anyelement\" as transition type must have at least one argument of either type.")));
+				 errdetail("An aggregate using a polymorphic transition type must have at least one polymorphic argument.")));
 
 	/* find the transfn */
 	nargs_transfn = numArgs + 1;
@@ -223,13 +221,12 @@ AggregateCreateWithOid(const char		*aggName,
 	 * that itself violates the rule against polymorphic result with no
 	 * polymorphic input.)
 	 */
-	if (!hasPolyArg &&
-		(finaltype == ANYARRAYOID || finaltype == ANYELEMENTOID))
+	if (IsPolymorphicType(finaltype) && !hasPolyArg)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("cannot determine result data type"),
-				 errdetail("An aggregate returning \"anyarray\" or \"anyelement\" "
-						   "must have at least one argument of either type.")));
+				 errdetail("An aggregate returning a polymorphic type "
+						   "must have at least one polymorphic argument.")));
 
 	/*
 	 * Also, the return type can't be INTERNAL unless there's at least one
@@ -283,6 +280,7 @@ AggregateCreateWithOid(const char		*aggName,
 							  PointerGetDatum(NULL),	/* parameterModes */
 							  PointerGetDatum(NULL),	/* parameterNames */
 							  NIL,						/* parameterDefaults */
+							  PointerGetDatum(NULL),	/* proconfig */
 							  1,				/* procost */
 							  0,				/* prorows */
 							  PRODATAACCESS_NONE,		/* prodataaccess */
@@ -405,7 +403,6 @@ lookup_agg_function(List *fnName,
 	FuncDetailCode fdresult;
 	AclResult	aclresult;
 	int			i;
-	bool		allPolyArgs = true;
 
 	/*
 	 * func_get_detail looks up the function in the catalogs, does
@@ -431,26 +428,15 @@ lookup_agg_function(List *fnName,
 						func_signature_string(fnName, nargs, input_types))));
 
 	/*
-	 * If the given type(s) are all polymorphic, there's nothing we can check.
-	 * Otherwise, enforce consistency, and possibly refine the result type.
+	 * If there are any polymorphic types involved, enforce consistency, and
+	 * possibly refine the result type.  It's OK if the result is still
+	 * polymorphic at this point, though.
 	 */
-	for (i = 0; i < nargs; i++)
-	{
-		if (input_types[i] != ANYARRAYOID &&
-			input_types[i] != ANYELEMENTOID)
-		{
-			allPolyArgs = false;
-			break;
-		}
-	}
-
-	if (!allPolyArgs)
-	{
-		*rettype = enforce_generic_type_consistency(input_types,
-													true_oid_array,
-													nargs,
-													*rettype);
-	}
+	*rettype = enforce_generic_type_consistency(input_types,
+												true_oid_array,
+												nargs,
+												*rettype,
+												true);
 
 	/*
 	 * func_get_detail will find functions requiring run-time argument type
@@ -458,8 +444,7 @@ lookup_agg_function(List *fnName,
 	 */
 	for (i = 0; i < nargs; i++)
 	{
-		if (true_oid_array[i] != ANYARRAYOID &&
-			true_oid_array[i] != ANYELEMENTOID &&
+		if (!IsPolymorphicType(true_oid_array[i]) &&
 			!IsBinaryCoercible(input_types[i], true_oid_array[i]))
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
index 66a22fe63aa8..a49889e26d2b 100644
--- a/src/backend/catalog/pg_constraint.c
+++ b/src/backend/catalog/pg_constraint.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.35 2007/02/14 01:58:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.38 2008/01/17 18:56:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -293,10 +293,10 @@ CreateConstraintEntry(const char *constraintName,
 	if (foreignNKeys > 0)
 	{
 		/*
-		 * Register normal dependencies on the equality operators that
-		 * support a foreign-key constraint.  If the PK and FK types
-		 * are the same then all three operators for a column are the
-		 * same; otherwise they are different.
+		 * Register normal dependencies on the equality operators that support
+		 * a foreign-key constraint.  If the PK and FK types are the same then
+		 * all three operators for a column are the same; otherwise they are
+		 * different.
 		 */
 		ObjectAddress oprobject;
 
@@ -600,6 +600,67 @@ GetConstraintNameByOid(Oid constraintId)
 	return result;
 }
 
+/*
+ * RenameConstraintById
+ *		Rename a constraint.
+ *
+ * Note: this isn't intended to be a user-exposed function; it doesn't check
+ * permissions etc.  Currently this is only invoked when renaming an index
+ * that is associated with a constraint, but it's made a little more general
+ * than that with the expectation of someday having ALTER TABLE RENAME
+ * CONSTRAINT.
+ */
+void
+RenameConstraintById(Oid conId, const char *newname)
+{
+	Relation	conDesc;
+	HeapTuple	tuple;
+	Form_pg_constraint con;
+
+	conDesc = heap_open(ConstraintRelationId, RowExclusiveLock);
+
+	tuple = SearchSysCacheCopy(CONSTROID,
+							   ObjectIdGetDatum(conId),
+							   0, 0, 0);
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for constraint %u", conId);
+	con = (Form_pg_constraint) GETSTRUCT(tuple);
+
+	/*
+	 * We need to check whether the name is already in use --- note that
+	 * there currently is not a unique index that would catch this.
+	 */
+	if (OidIsValid(con->conrelid) &&
+		ConstraintNameIsUsed(CONSTRAINT_RELATION,
+							 con->conrelid,
+							 con->connamespace,
+							 newname))
+		ereport(ERROR,
+				(errcode(ERRCODE_DUPLICATE_OBJECT),
+				 errmsg("constraint \"%s\" for relation \"%s\" already exists",
+						newname, get_rel_name(con->conrelid))));
+	if (OidIsValid(con->contypid) &&
+		ConstraintNameIsUsed(CONSTRAINT_DOMAIN,
+							 con->contypid,
+							 con->connamespace,
+							 newname))
+		ereport(ERROR,
+				(errcode(ERRCODE_DUPLICATE_OBJECT),
+				 errmsg("constraint \"%s\" for domain \"%s\" already exists",
+						newname, format_type_be(con->contypid))));
+
+	/* OK, do the rename --- tuple is a copy, so OK to scribble on it */
+	namestrcpy(&(con->conname), newname);
+
+	simple_heap_update(conDesc, &tuple->t_self, tuple);
+
+	/* update the system catalog indexes */
+	CatalogUpdateIndexes(conDesc, tuple);
+
+	heap_freetuple(tuple);
+	heap_close(conDesc, RowExclusiveLock);
+}
+
 /*
  * AlterConstraintNamespaces
  *		Find any constraints belonging to the specified object,
diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 9b5ec2f8ac75..56e8cd6cbed0 100644
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.38 2007/09/24 01:29:28 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.40 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -291,4 +291,3 @@ FindConversion(const char *conname, Oid connamespace)
 
 	return conoid;
 }
-
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
new file mode 100644
index 000000000000..9d7cc41ad1b2
--- /dev/null
+++ b/src/backend/catalog/pg_enum.c
@@ -0,0 +1,181 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_enum.c
+ *	  routines to support manipulation of the pg_enum relation
+ *
+ * Copyright (c) 2006-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.5 2008/01/20 17:50:41 alvherre Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "catalog/catalog.h"
+#include "catalog/indexing.h"
+#include "catalog/pg_enum.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+
+static int	oid_cmp(const void *p1, const void *p2);
+
+
+/*
+ * EnumValuesCreate
+ *		Create an entry in pg_enum for each of the supplied enum values.
+ *
+ * vals is a list of Value strings.
+ *
+ * GPDB: valOids is a list of Oids to assign to the values. If it's an
+ * empty list on entry, new Oids are assigned, and the return Oids are
+ * returned in the list.
+ */
+void
+EnumValuesCreate(Oid enumTypeOid, List *vals, List **valOids)
+{
+	Relation	pg_enum;
+	TupleDesc	tupDesc;
+	NameData	enumlabel;
+	Oid		   *oids;
+	int			i,
+				n;
+	Datum		values[Natts_pg_enum];
+	bool		nulls[Natts_pg_enum];
+	ListCell   *lc;
+	HeapTuple	tup;
+
+	Assert(*valOids == NIL || list_length(vals) == list_length(*valOids));
+
+	n = list_length(vals);
+
+	/*
+	 * XXX we do not bother to check the list of values for duplicates --- if
+	 * you have any, you'll get a less-than-friendly unique-index violation.
+	 * Is it worth trying harder?
+	 */
+
+	pg_enum = heap_open(EnumRelationId, RowExclusiveLock);
+	tupDesc = pg_enum->rd_att;
+
+	/*
+	 * Allocate oids.  While this method does not absolutely guarantee that we
+	 * generate no duplicate oids (since we haven't entered each oid into the
+	 * table before allocating the next), trouble could only occur if the oid
+	 * counter wraps all the way around before we finish. Which seems
+	 * unlikely.
+	 *
+	 * GPDB: if the caller supplied a list of Oids, use those instead of allocating
+	 * new ones.
+	 */
+	oids = (Oid *) palloc(n * sizeof(Oid));
+	if (*valOids != NIL)
+	{
+		i = 0;
+		foreach(lc, *valOids)
+		{
+			oids[i++] = lfirst_oid(lc);
+		}
+	}
+	else
+	{
+		for (i = 0; i < n; i++)
+		{
+			oids[i] = GetNewOid(pg_enum);
+		}
+
+		/* sort them, just in case counter wrapped from high to low */
+		qsort(oids, n, sizeof(Oid), oid_cmp);
+
+		for (i = 0; i < n; i++)
+			*valOids = lappend_oid(*valOids, oids[i]);
+	}
+
+	/* and make the entries */
+	memset(nulls, false, sizeof(nulls));
+
+	i = 0;
+	foreach(lc, vals)
+	{
+		char	   *lab = strVal(lfirst(lc));
+
+		/*
+		 * labels are stored in a name field, for easier syscache lookup, so
+		 * check the length to make sure it's within range.
+		 */
+		if (strlen(lab) > (NAMEDATALEN - 1))
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_NAME),
+					 errmsg("invalid enum label \"%s\"", lab),
+					 errdetail("Labels must be %d characters or less.",
+							   NAMEDATALEN - 1)));
+
+		values[Anum_pg_enum_enumtypid - 1] = ObjectIdGetDatum(enumTypeOid);
+		namestrcpy(&enumlabel, lab);
+		values[Anum_pg_enum_enumlabel - 1] = NameGetDatum(&enumlabel);
+
+		tup = heap_form_tuple(tupDesc, values, nulls);
+		HeapTupleSetOid(tup, oids[i]);
+
+		simple_heap_insert(pg_enum, tup);
+		CatalogUpdateIndexes(pg_enum, tup);
+		heap_freetuple(tup);
+
+		i++;
+	}
+
+	/* clean up */
+	pfree(oids);
+	heap_close(pg_enum, RowExclusiveLock);
+}
+
+
+/*
+ * EnumValuesDelete
+ *		Remove all the pg_enum entries for the specified enum type.
+ */
+void
+EnumValuesDelete(Oid enumTypeOid)
+{
+	Relation	pg_enum;
+	ScanKeyData key[1];
+	SysScanDesc scan;
+	HeapTuple	tup;
+
+	pg_enum = heap_open(EnumRelationId, RowExclusiveLock);
+
+	ScanKeyInit(&key[0],
+				Anum_pg_enum_enumtypid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(enumTypeOid));
+
+	scan = systable_beginscan(pg_enum, EnumTypIdLabelIndexId, true,
+							  SnapshotNow, 1, key);
+
+	while (HeapTupleIsValid(tup = systable_getnext(scan)))
+	{
+		simple_heap_delete(pg_enum, &tup->t_self);
+	}
+
+	systable_endscan(scan);
+
+	heap_close(pg_enum, RowExclusiveLock);
+}
+
+
+/* qsort comparison function */
+static int
+oid_cmp(const void *p1, const void *p2)
+{
+	Oid			v1 = *((const Oid *) p1);
+	Oid			v2 = *((const Oid *) p2);
+
+	if (v1 < v2)
+		return -1;
+	if (v1 > v2)
+		return 1;
+	return 0;
+}
diff --git a/src/backend/catalog/pg_namespace.c b/src/backend/catalog/pg_namespace.c
index 4b0b5e28b3e9..4be3235971a6 100644
--- a/src/backend/catalog/pg_namespace.c
+++ b/src/backend/catalog/pg_namespace.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_namespace.c,v 1.17 2007/01/05 22:19:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_namespace.c,v 1.18 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 33fe7f52f5d5..8f00d0250834 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.100 2007/01/05 22:19:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.103 2008/01/01 19:45:48 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -922,7 +922,7 @@ makeOperatorDependencies(HeapTuple tuple)
 	 * operators oprcom and oprnegate. We would not want to delete this
 	 * operator if those go away, but only reset the link fields; which is not
 	 * a function that the dependency code can presently handle.  (Something
-	 * could perhaps be done with objectSubId though.)  For now, it's okay to
+	 * could perhaps be done with objectSubId though.)	For now, it's okay to
 	 * let those links dangle if a referenced operator is removed.
 	 */
 
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 2e5e1658c9fb..aa1217044c90 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.143 2007/01/22 01:35:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.148.2.2 2010/05/11 04:57:51 itagaki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,9 +58,9 @@ static bool match_prosrc_to_literal(const char *prosrc, const char *literal,
 /* ----------------------------------------------------------------
  *		ProcedureCreate
  *
- * Note: allParameterTypes, parameterModes, parameterNames are either arrays
- * of the proper types or NULL.  We declare them Datum, not "ArrayType *",
- * to avoid importing array.h into pg_proc.h.
+ * Note: allParameterTypes, parameterModes, parameterNames, and proconfig
+ * are either arrays of the proper types or NULL.  We declare them Datum,
+ * not "ArrayType *", to avoid importing array.h into pg_proc.h.
  * ----------------------------------------------------------------
  */
 Oid
@@ -84,6 +84,7 @@ ProcedureCreate(const char *procedureName,
 				Datum parameterModes,
 				Datum parameterNames,
 				List *parameterDefaults,
+				Datum proconfig,
 				float4 procost,
 				float4 prorows,
 				char prodataaccess,
@@ -98,6 +99,7 @@ ProcedureCreate(const char *procedureName,
 	bool		internalInParam = false;
 	bool		internalOutParam = false;
 	Oid			variadicType = InvalidOid;
+	Oid			proowner = GetUserId();
 	Relation	rel;
 	HeapTuple	tup;
 	HeapTuple	oldtup;
@@ -155,9 +157,9 @@ ProcedureCreate(const char *procedureName,
 	}
 
 	/*
-	 * Do not allow return type ANYARRAY or ANYELEMENT unless at least one
-	 * input argument is ANYARRAY or ANYELEMENT.  Also, do not allow return
-	 * type INTERNAL unless at least one input argument is INTERNAL.
+	 * Do not allow polymorphic return type unless at least one input argument
+	 * is polymorphic.	Also, do not allow return type INTERNAL unless at
+	 * least one input argument is INTERNAL.
 	 */
 	for (i = 0; i < parameterCount; i++)
 	{
@@ -165,6 +167,8 @@ ProcedureCreate(const char *procedureName,
 		{
 			case ANYARRAYOID:
 			case ANYELEMENTOID:
+			case ANYNONARRAYOID:
+			case ANYENUMOID:
 				genericInParam = true;
 				break;
 			case INTERNALOID:
@@ -187,6 +191,8 @@ ProcedureCreate(const char *procedureName,
 			{
 				case ANYARRAYOID:
 				case ANYELEMENTOID:
+				case ANYNONARRAYOID:
+				case ANYENUMOID:
 					genericOutParam = true;
 					break;
 				case INTERNALOID:
@@ -196,16 +202,12 @@ ProcedureCreate(const char *procedureName,
 		}
 	}
 
-	/* Normally, we don't allow ANY* return type without an ANY* input type.
-	 * But during upgrade, we're creating "special" function used by aggregate
-	 * and we'll bypass this check for those functions.
-	 */
-	if ((returnType == ANYARRAYOID || returnType == ANYELEMENTOID ||
-		 genericOutParam) && !genericInParam)
+	if ((IsPolymorphicType(returnType) || genericOutParam)
+		&& !genericInParam)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 				 errmsg("cannot determine result data type"),
-				 errdetail("A function returning \"anyarray\" or \"anyelement\" must have at least one argument of either type.")));
+				 errdetail("A function returning a polymorphic type must have at least one polymorphic argument.")));
 
 	if ((returnType == INTERNALOID || internalOutParam) && !internalInParam)
 		ereport(ERROR,
@@ -301,7 +303,7 @@ ProcedureCreate(const char *procedureName,
 	namestrcpy(&procname, procedureName);
 	values[Anum_pg_proc_proname - 1] = NameGetDatum(&procname);
 	values[Anum_pg_proc_pronamespace - 1] = ObjectIdGetDatum(procNamespace);
-	values[Anum_pg_proc_proowner - 1] = ObjectIdGetDatum(GetUserId());
+	values[Anum_pg_proc_proowner - 1] = ObjectIdGetDatum(proowner);
 	values[Anum_pg_proc_prolang - 1] = ObjectIdGetDatum(languageObjectId);
 	values[Anum_pg_proc_procost - 1] = Float4GetDatum(procost);
 	values[Anum_pg_proc_prorows - 1] = Float4GetDatum(prorows);
@@ -332,6 +334,10 @@ ProcedureCreate(const char *procedureName,
 		values[Anum_pg_proc_probin - 1] = CStringGetTextDatum(probin);
 	else
 		nulls[Anum_pg_proc_probin - 1] = true;
+	if (proconfig != PointerGetDatum(NULL))
+		values[Anum_pg_proc_proconfig - 1] = proconfig;
+	else
+		nulls[Anum_pg_proc_proconfig - 1] = 'n';
 	/* start out with empty permissions */
 	nulls[Anum_pg_proc_proacl - 1] = true;
 	values[Anum_pg_proc_prodataaccess - 1] = CharGetDatum(prodataaccess);
@@ -370,7 +376,7 @@ ProcedureCreate(const char *procedureName,
 					(errcode(ERRCODE_DUPLICATE_FUNCTION),
 			errmsg("function \"%s\" already exists with same argument types",
 				   procedureName)));
-		if (!pg_proc_ownercheck(oldOid, GetUserId()))
+		if (!pg_proc_ownercheck(oldOid, proowner))
 			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
 						   procedureName);
 
@@ -521,7 +527,10 @@ ProcedureCreate(const char *procedureName,
 								procedureName)));
 		}
 
-		/* do not change existing ownership or permissions, either */
+		/*
+		 * Do not change existing ownership or permissions, either.  Note
+		 * dependency-update code below has to agree with this decision.
+		 */
 		replaces[Anum_pg_proc_proowner - 1] = false;
 		replaces[Anum_pg_proc_proacl - 1] = false;
 
@@ -557,11 +566,12 @@ ProcedureCreate(const char *procedureName,
 	/*
 	 * Create dependencies for the new function.  If we are updating an
 	 * existing function, first delete any existing pg_depend entries.
+	 * (However, since we are not changing ownership or permissions, the
+	 * shared dependencies do *not* need to change, and we leave them alone.)
 	 */
 	if (is_update)
 	{
 		deleteDependencyRecordsFor(ProcedureRelationId, retval);
-		deleteSharedDependencyRecordsFor(ProcedureRelationId, retval);
 		deleteProcCallbacks(retval);
 	}
 
@@ -612,7 +622,8 @@ ProcedureCreate(const char *procedureName,
 							   NIL, DEPENDENCY_NORMAL);
 
 	/* dependency on owner */
-	recordDependencyOnOwner(ProcedureRelationId, retval, GetUserId());
+	if (!is_update)
+		recordDependencyOnOwner(ProcedureRelationId, retval, proowner);
 
 	heap_freetuple(tup);
 
@@ -621,9 +632,29 @@ ProcedureCreate(const char *procedureName,
 	/* Verify function body */
 	if (OidIsValid(languageValidator))
 	{
+		ArrayType  *set_items;
+		int			save_nestlevel;
+
 		/* Advance command counter so new tuple can be seen by validator */
 		CommandCounterIncrement();
+
+		/* Set per-function configuration parameters */
+		set_items = (ArrayType *) DatumGetPointer(proconfig);
+		if (set_items)		/* Need a new GUC nesting level */
+		{
+			save_nestlevel = NewGUCNestLevel();
+			ProcessGUCArray(set_items,
+							(superuser() ? PGC_SUSET : PGC_USERSET),
+							PGC_S_SESSION,
+							GUC_ACTION_SAVE);
+		}
+		else
+			save_nestlevel = 0;		/* keep compiler quiet */
+
 		OidFunctionCall1(languageValidator, ObjectIdGetDatum(retval));
+
+		if (set_items)
+			AtEOXact_GUC(true, save_nestlevel);
 	}
 
 	return retval;
@@ -772,26 +803,24 @@ fmgr_sql_validator(PG_FUNCTION_ARGS)
 	proc = (Form_pg_proc) GETSTRUCT(tuple);
 
 	/* Disallow pseudotype result */
-	/* except for RECORD, VOID, ANYARRAY, or ANYELEMENT */
-	if (get_typtype(proc->prorettype) == 'p' &&
+	/* except for RECORD, VOID, or polymorphic */
+	if (get_typtype(proc->prorettype) == TYPTYPE_PSEUDO &&
 		proc->prorettype != RECORDOID &&
 		proc->prorettype != VOIDOID &&
-		proc->prorettype != ANYARRAYOID &&
-		proc->prorettype != ANYELEMENTOID)
+		!IsPolymorphicType(proc->prorettype))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 				 errmsg("SQL functions cannot return type %s",
 						format_type_be(proc->prorettype))));
 
 	/* Disallow pseudotypes in arguments */
-	/* except for ANYARRAY or ANYELEMENT */
+	/* except for polymorphic */
 	haspolyarg = false;
 	for (i = 0; i < proc->pronargs; i++)
 	{
-		if (get_typtype(proc->proargtypes.values[i]) == 'p')
+		if (get_typtype(proc->proargtypes.values[i]) == TYPTYPE_PSEUDO)
 		{
-			if (proc->proargtypes.values[i] == ANYARRAYOID ||
-				proc->proargtypes.values[i] == ANYELEMENTOID)
+			if (IsPolymorphicType(proc->proargtypes.values[i]))
 				haspolyarg = true;
 			else
 				ereport(ERROR,
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index cad50f3ba65f..8abc4228988f 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.16 2007/01/05 22:19:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.23.2.3 2010/07/03 13:53:38 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,12 +27,15 @@
 #include "catalog/pg_language.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_operator.h"
+#include "catalog/pg_opclass.h"
+#include "catalog/pg_opfamily.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_shdepend.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
 #include "commands/conversioncmds.h"
 #include "commands/defrem.h"
+#include "commands/proclang.h"
 #include "commands/schemacmds.h"
 #include "commands/tablecmds.h"
 #include "commands/typecmds.h"
@@ -509,6 +512,9 @@ typedef struct
  * Check whether there are shared dependency entries for a given shared
  * object.	Returns a string containing a newline-separated list of object
  * descriptions that depend on the shared object, or NULL if none is found.
+ * The size of the returned string is limited to about MAX_REPORTED_DEPS lines;
+ * if there are more objects than that, the output is returned truncated at
+ * that point while the full message is logged to the postmaster log.
  *
  * We can find three different kinds of dependencies: dependencies on objects
  * of the current database; dependencies on shared objects; and dependencies
@@ -521,33 +527,46 @@ typedef struct
 char *
 checkSharedDependencies(Oid classId, Oid objectId)
 {
+	Relation	sdepRel;
+	ScanKeyData key[2];
+	SysScanDesc scan;
 	HeapTuple	tup;
-	cqContext  *pcqCtx;	
-	int			totalDeps = 0;
-	int			numLocalDeps = 0;
-	int			numSharedDeps = 0;
+	int			numReportedDeps = 0;
+	int			numNotReportedDeps = 0;
+	int			numNotReportedDbs = 0;
 	List	   *remDeps = NIL;
 	ListCell   *cell;
 	ObjectAddress object;
 	StringInfoData descs;
+	StringInfoData alldescs;
 
 	/*
-	 * We try to limit the number of reported dependencies to something sane,
-	 * both for the user's sake and to avoid blowing out memory.
+	 * We limit the number of dependencies reported to the client to
+	 * MAX_REPORTED_DEPS, since client software may not deal well with
+	 * enormous error strings.	The server log always gets a full report,
+	 * which is collected in a separate StringInfo if and only if we detect
+	 * that the client report is going to be truncated.
 	 */
 #define MAX_REPORTED_DEPS 100
 
 	initStringInfo(&descs);
+	initStringInfo(&alldescs);
 
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_shdepend "
-				" WHERE refclassid = :1 "
-				" AND refobjid = :2 ",
-				ObjectIdGetDatum(classId),
-				ObjectIdGetDatum(objectId)));
+	sdepRel = heap_open(SharedDependRelationId, AccessShareLock);
 
-	while (HeapTupleIsValid(tup = caql_getnext(pcqCtx)))
+	ScanKeyInit(&key[0],
+				Anum_pg_shdepend_refclassid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(classId));
+	ScanKeyInit(&key[1],
+				Anum_pg_shdepend_refobjid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(objectId));
+
+	scan = systable_beginscan(sdepRel, SharedDependReferenceIndexId, true,
+							  SnapshotNow, 2, key);
+
+	while (HeapTupleIsValid(tup = systable_getnext(scan)))
 	{
 		Form_pg_shdepend sdepForm = (Form_pg_shdepend) GETSTRUCT(tup);
 
@@ -576,17 +595,41 @@ checkSharedDependencies(Oid classId, Oid objectId)
 		 */
 		if (sdepForm->dbid == MyDatabaseId)
 		{
-			numLocalDeps++;
-			if (++totalDeps <= MAX_REPORTED_DEPS)
+			if (numReportedDeps < MAX_REPORTED_DEPS)
+			{
+				numReportedDeps++;
 				storeObjectDescription(&descs, LOCAL_OBJECT, &object,
 									   sdepForm->deptype, 0);
+			}
+			else
+			{
+				numNotReportedDeps++;
+				/* initialize the server-only log line */
+				if (alldescs.len == 0)
+					appendBinaryStringInfo(&alldescs, descs.data, descs.len);
+
+				storeObjectDescription(&alldescs, LOCAL_OBJECT, &object,
+									   sdepForm->deptype, 0);
+			}
 		}
 		else if (sdepForm->dbid == InvalidOid)
 		{
-			numSharedDeps++;
-			if (++totalDeps <= MAX_REPORTED_DEPS)
+			if (numReportedDeps < MAX_REPORTED_DEPS)
+			{
+				numReportedDeps++;
 				storeObjectDescription(&descs, SHARED_OBJECT, &object,
 									   sdepForm->deptype, 0);
+			}
+			else
+			{
+				numNotReportedDeps++;
+				/* initialize the server-only log line */
+				if (alldescs.len == 0)
+					appendBinaryStringInfo(&alldescs, descs.data, descs.len);
+
+				storeObjectDescription(&alldescs, SHARED_OBJECT, &object,
+									   sdepForm->deptype, 0);
+			}
 		}
 		else
 		{
@@ -616,36 +659,19 @@ checkSharedDependencies(Oid classId, Oid objectId)
 				dep->dbOid = sdepForm->dbid;
 				dep->count = 1;
 				remDeps = lappend(remDeps, dep);
-				totalDeps++;
 			}
 		}
 	}
 
-	caql_endscan(pcqCtx);
-
-	if (totalDeps > MAX_REPORTED_DEPS)
-	{
-		/*
-		 * Report seems unreasonably long, so reduce it to per-database info
-		 *
-		 * Note: we don't ever suppress per-database totals, which should be
-		 * OK as long as there aren't too many databases ...
-		 */
-		descs.len = 0;			/* reset to empty */
-		descs.data[0] = '\0';
+	systable_endscan(scan);
 
-		if (numLocalDeps > 0)
-		{
-			appendStringInfo(&descs, _("%d objects in this database"),
-							 numLocalDeps);
-			if (numSharedDeps > 0)
-				appendStringInfoChar(&descs, '\n');
-		}
-		if (numSharedDeps > 0)
-			appendStringInfo(&descs, _("%d shared objects"),
-							 numSharedDeps);
-	}
+	heap_close(sdepRel, AccessShareLock);
 
+	/*
+	 * Report dependencies on remote databases.  If we're truncating the
+	 * output already, don't put a line per database, but a single one for all
+	 * of them.  Otherwise add as many as fit in MAX_REPORTED_DEPS.
+	 */
 	foreach(cell, remDeps)
 	{
 		remoteDep  *dep = lfirst(cell);
@@ -654,8 +680,22 @@ checkSharedDependencies(Oid classId, Oid objectId)
 		object.objectId = dep->dbOid;
 		object.objectSubId = 0;
 
-		storeObjectDescription(&descs, REMOTE_OBJECT, &object,
-							   SHARED_DEPENDENCY_INVALID, dep->count);
+		if (numReportedDeps < MAX_REPORTED_DEPS)
+		{
+			numReportedDeps++;
+			storeObjectDescription(&descs, REMOTE_OBJECT, &object,
+								   SHARED_DEPENDENCY_INVALID, dep->count);
+		}
+		else
+		{
+			numNotReportedDbs++;
+			/* initialize the server-only log line */
+			if (alldescs.len == 0)
+				appendBinaryStringInfo(&alldescs, descs.data, descs.len);
+
+			storeObjectDescription(&alldescs, REMOTE_OBJECT, &object,
+								   SHARED_DEPENDENCY_INVALID, dep->count);
+		}
 	}
 
 	list_free_deep(remDeps);
@@ -663,9 +703,34 @@ checkSharedDependencies(Oid classId, Oid objectId)
 	if (descs.len == 0)
 	{
 		pfree(descs.data);
+		pfree(alldescs.data);
 		return NULL;
 	}
 
+	if (numNotReportedDeps > 0)
+		appendStringInfo(&descs, _("\nand %d other objects "
+								   "(see server log for list)"),
+						 numNotReportedDeps);
+	if (numNotReportedDbs > 0)
+		appendStringInfo(&descs, _("\nand objects in %d other databases "
+								   "(see server log for list)"),
+						 numNotReportedDbs);
+
+	if (numNotReportedDeps > 0 || numNotReportedDbs > 0)
+	{
+		ObjectAddress obj;
+
+		obj.classId = classId;
+		obj.objectId = objectId;
+		obj.objectSubId = 0;
+		ereport(LOG,
+				(errmsg("there are objects dependent on %s",
+						getObjectDescription(&obj)),
+				 errdetail("%s", alldescs.data)));
+	}
+
+	pfree(alldescs.data);
+
 	return descs.data;
 }
 
@@ -1075,7 +1140,12 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
 
 	deleteobjs = new_object_addresses();
 
-	sdepRel = heap_open(SharedDependRelationId, AccessExclusiveLock);
+	/*
+	 * We don't need this strong a lock here, but we'll call routines that
+	 * acquire RowExclusiveLock.  Better get that right now to avoid potential
+	 * deadlock failures.
+	 */
+	sdepRel = heap_open(SharedDependRelationId, RowExclusiveLock);
 
 	/*
 	 * For each role, find the dependent objects and drop them using the
@@ -1120,8 +1190,12 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
 			InternalGrant istmt;
 			Form_pg_shdepend sdepForm = (Form_pg_shdepend) GETSTRUCT(tuple);
 
-			/* We only operate on objects in the current database */
-			if (sdepForm->dbid != MyDatabaseId)
+			/*
+			 * We only operate on shared objects and objects in the current
+			 * database
+			 */
+			if (sdepForm->dbid != MyDatabaseId &&
+				sdepForm->dbid != InvalidOid)
 				continue;
 
 			switch (sdepForm->deptype)
@@ -1172,11 +1246,14 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
 					ExecGrantStmt_oids(&istmt);
 					break;
 				case SHARED_DEPENDENCY_OWNER:
-					/* Save it for deletion below */
-					obj.classId = sdepForm->classid;
-					obj.objectId = sdepForm->objid;
-					obj.objectSubId = 0;
-					add_exact_object_address(&obj, deleteobjs);
+					/* If a local object, save it for deletion below */
+					if (sdepForm->dbid == MyDatabaseId)
+					{
+						obj.classId = sdepForm->classid;
+						obj.objectId = sdepForm->objid;
+						obj.objectSubId = 0;
+						add_exact_object_address(&obj, deleteobjs);
+					}
 					break;
 			}
 		}
@@ -1187,7 +1264,7 @@ shdepDropOwned(List *roleids, DropBehavior behavior)
 	/* the dependency mechanism does the actual work */
 	performMultipleDeletions(deleteobjs, behavior);
 
-	heap_close(sdepRel, AccessExclusiveLock);
+	heap_close(sdepRel, RowExclusiveLock);
 
 	free_object_addresses(deleteobjs);
 }
@@ -1204,7 +1281,12 @@ shdepReassignOwned(List *roleids, Oid newrole)
 	Relation	sdepRel;
 	ListCell   *cell;
 
-	sdepRel = heap_open(SharedDependRelationId, AccessShareLock);
+	/*
+	 * We don't need this strong a lock here, but we'll call routines that
+	 * acquire RowExclusiveLock.  Better get that right now to avoid potential
+	 * deadlock problems.
+	 */
+	sdepRel = heap_open(SharedDependRelationId, RowExclusiveLock);
 
 	foreach(cell, roleids)
 	{
@@ -1224,8 +1306,7 @@ shdepReassignOwned(List *roleids, Oid newrole)
 
 			ereport(ERROR,
 					(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
-				   errmsg("cannot drop objects owned by %s because they are "
-						  "required by the database system",
+					 errmsg("cannot reassign ownership of objects owned by %s because they are required by the database system",
 						  getObjectDescription(&obj))));
 
 			/*
@@ -1291,6 +1372,18 @@ shdepReassignOwned(List *roleids, Oid newrole)
 					AlterFunctionOwner_oid(sdepForm->objid, newrole);
 					break;
 
+				case LanguageRelationId:
+					AlterLanguageOwner_oid(sdepForm->objid, newrole);
+					break;
+
+				case OperatorClassRelationId:
+					AlterOpClassOwner_oid(sdepForm->objid, newrole);
+					break;
+
+				case OperatorFamilyRelationId:
+					AlterOpFamilyOwner_oid(sdepForm->objid, newrole);
+					break;
+
 				default:
 					elog(ERROR, "unexpected classid %d", sdepForm->classid);
 					break;
@@ -1302,5 +1395,5 @@ shdepReassignOwned(List *roleids, Oid newrole)
 		caql_endscan(pcqCtx);
 	}
 
-	heap_close(sdepRel, AccessShareLock);
+	heap_close(sdepRel, RowExclusiveLock);
 }
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 0ed09197451f..f1a97ea18559 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/pg_type.c,v 1.110 2007/01/05 22:19:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/pg_type.c,v 1.115.2.2 2009/08/16 18:14:46 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,7 @@
 
 #include "access/heapam.h"
 #include "catalog/catquery.h"
+#include "access/xact.h"
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_namespace.h"
@@ -28,6 +29,7 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
 #include "cdb/cdbvars.h"
@@ -77,13 +79,6 @@ add_type_encoding(Oid typid, Datum typoptions)
 Oid
 TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId,
 			  Oid shelloid)
-{
-	return TypeShellMakeWithOid(typeName,typeNamespace,ownerId, shelloid);
-}
-
-Oid
-TypeShellMakeWithOid(const char *typeName, Oid typeNamespace, Oid ownerId,
-					 Oid shelltypeOid)
 {
 	int			i;
 	HeapTuple	tup;
@@ -117,17 +112,17 @@ TypeShellMakeWithOid(const char *typeName, Oid typeNamespace, Oid ownerId,
 	 *
 	 * The representational details are the same as int4 ... it doesn't really
 	 * matter what they are so long as they are consistent.  Also note that we
-	 * give it typtype = 'p' (pseudotype) as extra insurance that it won't be
+	 * give it typtype = TYPTYPE_PSEUDO as extra insurance that it won't be
 	 * mistaken for a usable type.
 	 */
 	i = 0;
 	namestrcpy(&name, typeName);
 	values[i++] = NameGetDatum(&name);	/* typname */
 	values[i++] = ObjectIdGetDatum(typeNamespace);		/* typnamespace */
-	values[i++] = ObjectIdGetDatum(ownerId);		/* typowner */
+	values[i++] = ObjectIdGetDatum(ownerId);	/* typowner */
 	values[i++] = Int16GetDatum(sizeof(int4));	/* typlen */
 	values[i++] = BoolGetDatum(true);	/* typbyval */
-	values[i++] = CharGetDatum('p');	/* typtype */
+	values[i++] = CharGetDatum(TYPTYPE_PSEUDO); /* typtype */
 	values[i++] = BoolGetDatum(false);	/* typisdefined */
 	values[i++] = CharGetDatum(DEFAULT_TYPDELIM);		/* typdelim */
 	values[i++] = ObjectIdGetDatum(InvalidOid); /* typrelid */
@@ -157,8 +152,8 @@ TypeShellMakeWithOid(const char *typeName, Oid typeNamespace, Oid ownerId,
 	/*
 	 * MPP: If we are on the QEs, we need to use the same Oid as the QD used
 	 */
-	if (shelltypeOid != InvalidOid)
-		HeapTupleSetOid(tup, shelltypeOid);
+	if (shelloid != InvalidOid)
+		HeapTupleSetOid(tup, shelloid);
 	/*
 	 * insert the tuple in the relation and get the tuple's oid.
 	 */
@@ -200,13 +195,16 @@ TypeShellMakeWithOid(const char *typeName, Oid typeNamespace, Oid ownerId,
  *
  *		This does all the necessary work needed to define a new type.
  *
- *		Returns the OID assigned to the new type.
+ *		Returns the OID assigned to the new type.  If newTypeOid is
+ *		zero (the normal case), a new OID is created; otherwise we
+ *		use exactly that OID.
  * ----------------------------------------------------------------
  */
 Oid
-TypeCreateWithOid(const char *typeName,
+TypeCreateWithOptions(Oid newTypeOid,
+		   const char *typeName,
 		   Oid typeNamespace,
-		   Oid relationOid,		/* only for 'c'atalog types */
+		   Oid relationOid,		/* only for relation rowtypes */
 		   char relationKind,	/* ditto */
 		   Oid ownerId,
 		   int16 internalSize,
@@ -231,7 +229,6 @@ TypeCreateWithOid(const char *typeName,
 		   int32 typeMod,
 		   int32 typNDims,		/* Array dimensions for baseType */
 		   bool typeNotNull,
-		   Oid newtypeOid,
 		   Datum typoptions)
 {
 	Relation	pg_type_desc;
@@ -243,8 +240,6 @@ TypeCreateWithOid(const char *typeName,
 	Datum		values[Natts_pg_type];
 	NameData	name;
 	int			i;
-	cqContext	*pcqCtx;
-	cqContext	 cqc;
 
 	/*
 	 * We assume that the caller validated the arguments individually, but did
@@ -291,7 +286,7 @@ TypeCreateWithOid(const char *typeName,
 	namestrcpy(&name, typeName);
 	values[i++] = NameGetDatum(&name);	/* typname */
 	values[i++] = ObjectIdGetDatum(typeNamespace);		/* typnamespace */
-	values[i++] = ObjectIdGetDatum(ownerId);		/* typowner */
+	values[i++] = ObjectIdGetDatum(ownerId);	/* typowner */
 	values[i++] = Int16GetDatum(internalSize);	/* typlen */
 	values[i++] = BoolGetDatum(passedByValue);	/* typbyval */
 	values[i++] = CharGetDatum(typeType);		/* typtype */
@@ -305,7 +300,7 @@ TypeCreateWithOid(const char *typeName,
 	values[i++] = ObjectIdGetDatum(receiveProcedure);	/* typreceive */
 	values[i++] = ObjectIdGetDatum(sendProcedure);		/* typsend */
 	values[i++] = ObjectIdGetDatum(typmodinProcedure);	/* typmodin */
-	values[i++] = ObjectIdGetDatum(typmodoutProcedure);	/* typmodout */
+	values[i++] = ObjectIdGetDatum(typmodoutProcedure); /* typmodout */
 	values[i++] = ObjectIdGetDatum(analyzeProcedure);	/* typanalyze */
 	values[i++] = CharGetDatum(alignment);		/* typalign */
 	values[i++] = CharGetDatum(storage);		/* typstorage */
@@ -341,17 +336,10 @@ TypeCreateWithOid(const char *typeName,
 	 */
 	pg_type_desc = heap_open(TypeRelationId, RowExclusiveLock);
 
-	pcqCtx = caql_addrel(cqclr(&cqc), pg_type_desc);
-
-	tup = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_type "
-				" WHERE typname = :1 "
-				" AND typnamespace = :2 "
-				" FOR UPDATE ",
-				CStringGetDatum((char *) typeName),
-				ObjectIdGetDatum(typeNamespace)));
-
+	tup = SearchSysCacheCopy(TYPENAMENSP,
+							 CStringGetDatum(typeName),
+							 ObjectIdGetDatum(typeNamespace),
+							 0, 0);
 	if (HeapTupleIsValid(tup))
 	{
 		/*
@@ -369,21 +357,20 @@ TypeCreateWithOid(const char *typeName,
 		if (((Form_pg_type) GETSTRUCT(tup))->typowner != ownerId)
 			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TYPE, typeName);
 
-		/*  trouble if caller wanted to force the OID */
-		if (OidIsValid(newtypeOid) &&
-			newtypeOid != HeapTupleHeaderGetOid((tup)->t_data))
-			elog(ERROR, "cannot assign new OID to existing shell type");
+		/* trouble if caller wanted to force the OID */
+		if (OidIsValid(newTypeOid) &&
+			newTypeOid != HeapTupleHeaderGetOid((tup)->t_data))
+			elog(ERROR, "cannot assign new OID to existing shell type %u", HeapTupleHeaderGetOid((tup)->t_data));
 
 		/*
 		 * Okay to update existing shell type tuple
 		 */
-		tup = caql_modify_current(pcqCtx,
-								  values,
-								  nulls,
-								  replaces);
-
-		caql_update_current(pcqCtx, tup);
-		/* and Update indexes (implicit) */
+		tup = heap_modify_tuple(tup,
+							   RelationGetDescr(pg_type_desc),
+							   values,
+							   nulls,
+							   replaces);
+		simple_heap_update(pg_type_desc, &tup->t_self, tup);
 
 		typeObjectId = HeapTupleGetOid(tup);
 
@@ -391,20 +378,21 @@ TypeCreateWithOid(const char *typeName,
 	}
 	else
 	{
-		tup = caql_form_tuple(pcqCtx, values, nulls);
-						 
-		if (newtypeOid != InvalidOid)
-		{
-			elog(DEBUG5," Setting Oid in new pg_type tuple");
-			HeapTupleSetOid(tup, newtypeOid);
-		}
+		tup = heap_form_tuple(RelationGetDescr(pg_type_desc),
+							 values,
+							 nulls);
+
+		/* Force the OID if requested by caller, else heap_insert does it */
+		if (OidIsValid(newTypeOid))
+			HeapTupleSetOid(tup, newTypeOid);
 		else if (Gp_role == GP_ROLE_EXECUTE) elog(ERROR," newtypeOid NULL");
 
-		/* Insert tuple into the relation */
-		typeObjectId = caql_insert(pcqCtx, tup);
-		/* and Update indexes (implicit) */
+		typeObjectId = simple_heap_insert(pg_type_desc, tup);
 	}
 
+	/* Update indexes */
+	CatalogUpdateIndexes(pg_type_desc, tup);
+
 	/*
 	 * Create dependencies.  We can/must skip this in bootstrap mode.
 	 */
@@ -441,7 +429,9 @@ TypeCreateWithOid(const char *typeName,
 	return typeObjectId;
 }
 
-Oid TypeCreate(const char *typeName,
+Oid
+TypeCreate(Oid newTypeOid,
+		   const char *typeName,
 		   Oid typeNamespace,
 		   Oid relationOid,
 		   char relationKind,
@@ -469,36 +459,35 @@ Oid TypeCreate(const char *typeName,
 		   int32 typNDims,
 		   bool typeNotNull)
 {
-	return TypeCreateWithOid(
-							typeName,
-							typeNamespace,
-							relationOid,
-							relationKind,
-							ownerId,
-							internalSize,
-							typeType,
-							typDelim,
-							inputProcedure,
-							outputProcedure,
-							receiveProcedure,
-							sendProcedure,
-							typmodinProcedure,
-							typmodoutProcedure,
-							analyzeProcedure,
-							elementType,
-							isImplicitArray,
-							arrayType,
-							baseType,
-							defaultTypeValue,
-							defaultTypeBin,
-							passedByValue,
-							alignment,
-							storage,
-							typeMod,
-							typNDims,
-							typeNotNull,
-							InvalidOid,
-							0);
+	return TypeCreateWithOptions(newTypeOid,
+		   typeName,
+		   typeNamespace,
+		   relationOid,
+		   relationKind,
+		   ownerId,
+		   internalSize,
+		   typeType,
+		   typDelim,
+		   inputProcedure,
+		   outputProcedure,
+		   receiveProcedure,
+		   sendProcedure,
+		   typmodinProcedure,
+		   typmodoutProcedure,
+		   analyzeProcedure,
+		   elementType,
+		   isImplicitArray,
+		   arrayType,
+		   baseType,
+		   defaultTypeValue,
+		   defaultTypeBin,
+		   passedByValue,
+		   alignment,
+		   storage,
+		   typeMod,
+		   typNDims,
+		   typeNotNull,
+		   (Datum) 0);
 }
 
 /*
@@ -511,7 +500,7 @@ Oid TypeCreate(const char *typeName,
 void
 GenerateTypeDependencies(Oid typeNamespace,
 						 Oid typeObjectId,
-						 Oid relationOid,		/* only for 'c'atalog types */
+						 Oid relationOid,		/* only for relation rowtypes */
 						 char relationKind,		/* ditto */
 						 Oid owner,
 						 Oid inputProcedure,
@@ -648,7 +637,7 @@ GenerateTypeDependencies(Oid typeNamespace,
 		referenced.objectId = elementType;
 		referenced.objectSubId = 0;
 		recordDependencyOn(&myself, &referenced,
-								isImplicitArray ? DEPENDENCY_INTERNAL : DEPENDENCY_NORMAL);
+				  isImplicitArray ? DEPENDENCY_INTERNAL : DEPENDENCY_NORMAL);
 	}
 
 	/* Normal dependency from a domain to its base type. */
@@ -667,65 +656,67 @@ GenerateTypeDependencies(Oid typeNamespace,
 
 /*
  * TypeRename
- *		This renames a type
+ *		This renames a type, as well as any associated array type.
  *
- * Note: any associated array type is *not* renamed; caller must make
- * another call to handle that case.  Currently this is only used for
- * renaming types associated with tables, for which there are no arrays.
+ * Note: this isn't intended to be a user-exposed function; it doesn't check
+ * permissions etc.  (Perhaps TypeRenameInternal would be a better name.)
+ * Currently this is only used for renaming table rowtypes.
  */
 void
-TypeRename(Oid typeOid, const char *newTypeName)
+TypeRename(Oid typeOid, const char *newTypeName, Oid typeNamespace)
 {
-	Relation		pg_type_desc;
-	HeapTuple		tuple;
-	Form_pg_type	form;
-	cqContext	   *pcqCtx;
-	cqContext		cqc, cqc2;
+	Relation	pg_type_desc;
+	HeapTuple	tuple;
+	Form_pg_type typ;
+	Oid			arrayOid;
 
 	pg_type_desc = heap_open(TypeRelationId, RowExclusiveLock);
 
-	pcqCtx = caql_addrel(cqclr(&cqc), pg_type_desc);
+	tuple = SearchSysCacheCopy(TYPEOID,
+							   ObjectIdGetDatum(typeOid),
+							   0, 0, 0);
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for type %u", typeOid);
+	typ = (Form_pg_type) GETSTRUCT(tuple);
 
-	tuple = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_type "
-				" WHERE oid = :1 "
-				" FOR UPDATE ",
-				ObjectIdGetDatum(typeOid)));
+	/* We are not supposed to be changing schemas here */
+	Assert(typeNamespace == typ->typnamespace);
 
-	if (!HeapTupleIsValid(tuple))
+	arrayOid = typ->typarray;
+
+	/* Just to give a more friendly error than unique-index violation */
+	if (SearchSysCacheExists(TYPENAMENSP,
+							 CStringGetDatum(newTypeName),
+							 ObjectIdGetDatum(typeNamespace),
+							 0, 0))
 		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("type with OID \"%d\" does not exist", typeOid)));
+				(errcode(ERRCODE_DUPLICATE_OBJECT),
+				 errmsg("type \"%s\" already exists", newTypeName)));
 
-	form = (Form_pg_type) GETSTRUCT(tuple);
-	if (namestrcmp(&(form->typname), newTypeName))
-	{
-		if (caql_getcount(
-					caql_addrel(cqclr(&cqc2), pg_type_desc),
-					cql("SELECT COUNT(*) FROM pg_type "
-						" WHERE typname = :1 "
-						" AND typnamespace = :2 ",
-						CStringGetDatum((char *) newTypeName),
-						ObjectIdGetDatum(form->typnamespace))))
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_DUPLICATE_OBJECT),
-					 errmsg("type \"%s\" already exists", newTypeName)));
-		}
+	/* OK, do the rename --- tuple is a copy, so OK to scribble on it */
+	namestrcpy(&(typ->typname), newTypeName);
 
-		namestrcpy(&(form->typname), newTypeName);
+	simple_heap_update(pg_type_desc, &tuple->t_self, tuple);
 
-		caql_update_current(pcqCtx, tuple);
-		/* update the system catalog indexes (implicit) */
-	}
+	/* update the system catalog indexes */
+	CatalogUpdateIndexes(pg_type_desc, tuple);
 
 	heap_freetuple(tuple);
 	heap_close(pg_type_desc, RowExclusiveLock);
+
+	/* If the type has an array type, recurse to handle that */
+	if (OidIsValid(arrayOid))
+	{
+		char	   *arrname = makeArrayTypeName(newTypeName, typeNamespace);
+
+		TypeRename(arrayOid, arrname, typeNamespace);
+		pfree(arrname);
+	}
 }
 
+
 /*
- * makeArrayTypeName(typeName);
+ * makeArrayTypeName
  *	  - given a base type name, make an array type name for it
  *
  * the caller is responsible for pfreeing the result
@@ -733,23 +724,27 @@ TypeRename(Oid typeOid, const char *newTypeName)
 char *
 makeArrayTypeName(const char *typeName, Oid typeNamespace)
 {
-	char		*arr;
-	int			i;
+	char	   *arr = (char *) palloc(NAMEDATALEN);
+	int			namelen = strlen(typeName);
 	Relation	pg_type_desc;
+	int			i;
 
 	/*
 	 * The idea is to prepend underscores as needed until we make a name that
 	 * doesn't collide with anything...
 	 */
-	arr = (char*)palloc(NAMEDATALEN);
-
 	pg_type_desc = heap_open(TypeRelationId, AccessShareLock);
 
 	for (i = 1; i < NAMEDATALEN - 1; i++)
 	{
 		arr[i - 1] = '_';
-		strlcpy(arr + i, typeName, NAMEDATALEN - i);
-		truncate_identifier(arr, strlen(arr), false);
+		if (i + namelen < NAMEDATALEN)
+			strcpy(arr + i, typeName);
+		else
+		{
+			memcpy(arr + i, typeName, NAMEDATALEN - i);
+			truncate_identifier(arr, NAMEDATALEN, false);
+		}
 		if (!SearchSysCacheExists(TYPENAMENSP,
 								  CStringGetDatum(arr),
 								  ObjectIdGetDatum(typeNamespace),
@@ -759,7 +754,7 @@ makeArrayTypeName(const char *typeName, Oid typeNamespace)
 
 	heap_close(pg_type_desc, AccessShareLock);
 
-	if (i >= NAMEDATALEN-1)
+	if (i >= NAMEDATALEN - 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
 				 errmsg("could not form array type name for type \"%s\"",
@@ -767,3 +762,66 @@ makeArrayTypeName(const char *typeName, Oid typeNamespace)
 
 	return arr;
 }
+
+
+/*
+ * moveArrayTypeName
+ *	  - try to reassign an array type name that the user wants to use.
+ *
+ * The given type name has been discovered to already exist (with the given
+ * OID).  If it is an autogenerated array type, change the array type's name
+ * to not conflict.  This allows the user to create type "foo" followed by
+ * type "_foo" without problems.  (Of course, there are race conditions if
+ * two backends try to create similarly-named types concurrently, but the
+ * worst that can happen is an unnecessary failure --- anything we do here
+ * will be rolled back if the type creation fails due to conflicting names.)
+ *
+ * Note that this must be called *before* calling makeArrayTypeName to
+ * determine the new type's own array type name; else the latter will
+ * certainly pick the same name.
+ *
+ * Returns TRUE if successfully moved the type, FALSE if not.
+ *
+ * We also return TRUE if the given type is a shell type.  In this case
+ * the type has not been renamed out of the way, but nonetheless it can
+ * be expected that TypeCreate will succeed.  This behavior is convenient
+ * for most callers --- those that need to distinguish the shell-type case
+ * must do their own typisdefined test.
+ */
+bool
+moveArrayTypeName(Oid typeOid, const char *typeName, Oid typeNamespace)
+{
+	Oid			elemOid;
+	char	   *newname;
+
+	/* We need do nothing if it's a shell type. */
+	if (!get_typisdefined(typeOid))
+		return true;
+
+	/* Can't change it if it's not an autogenerated array type. */
+	elemOid = get_element_type(typeOid);
+	if (!OidIsValid(elemOid) ||
+		get_array_type(elemOid) != typeOid)
+		return false;
+
+	/*
+	 * OK, use makeArrayTypeName to pick an unused modification of the name.
+	 * Note that since makeArrayTypeName is an iterative process, this will
+	 * produce a name that it might have produced the first time, had the
+	 * conflicting type we are about to create already existed.
+	 */
+	newname = makeArrayTypeName(typeName, typeNamespace);
+
+	/* Apply the rename */
+	TypeRename(typeOid, newname, typeNamespace);
+
+	/*
+	 * We must bump the command counter so that any subsequent use of
+	 * makeArrayTypeName sees what we just did and doesn't pick the same name.
+	 */
+	CommandCounterIncrement();
+
+	pfree(newname);
+
+	return true;
+}
diff --git a/src/backend/catalog/sql_features.txt b/src/backend/catalog/sql_features.txt
index 41c3a5123475..ac055851e466 100644
--- a/src/backend/catalog/sql_features.txt
+++ b/src/backend/catalog/sql_features.txt
@@ -528,25 +528,24 @@ X035	XMLAgg: ORDER BY option			NO
 X036	XMLComment			YES	
 X037	XMLPI			YES	
 X038	XMLText			NO	
-X040	Basic table mapping			NO	
-X041	Basic table mapping: nulls absent			NO	
-X042	Basic table mapping: null as nil			NO	
-X043	Basic table mapping: table as forest			NO	
-X044	Basic table mapping: table as element			NO	
-X045	Basic table mapping: with target namespace			NO	
-X046	Basic table mapping: data mapping			NO	
-X047	Basic table mapping: metadata mapping			NO	
-X048	Basic table mapping: base64 encoding of binary strings			NO	
-X049	Basic table mapping: hex encoding of binary strings			NO	
-X051	Advanced table mapping: nulls absent			NO	
-X052	Advanced table mapping: null as nil			NO	
-X053	Advanced table mapping: table as forest			NO	
-X054	Advanced table mapping: table as element			NO	
-X055	Advanced table mapping: target namespace			NO	
-X056	Advanced table mapping: data mapping			NO	
-X057	Advanced table mapping: metadata mapping			NO	
-X058	Advanced table mapping: base64 encoding of binary strings			NO	
-X059	Advanced table mapping: hex encoding of binary strings			NO	
+X041	Basic table mapping: nulls absent			YES	
+X042	Basic table mapping: null as nil			YES	
+X043	Basic table mapping: table as forest			YES	
+X044	Basic table mapping: table as element			YES	
+X045	Basic table mapping: with target namespace			YES	
+X046	Basic table mapping: data mapping			YES	
+X047	Basic table mapping: metadata mapping			YES	
+X048	Basic table mapping: base64 encoding of binary strings			YES	
+X049	Basic table mapping: hex encoding of binary strings			YES	
+X051	Advanced table mapping: nulls absent			YES	
+X052	Advanced table mapping: null as nil			YES	
+X053	Advanced table mapping: table as forest			YES	
+X054	Advanced table mapping: table as element			YES	
+X055	Advanced table mapping: target namespace			YES	
+X056	Advanced table mapping: data mapping			YES	
+X057	Advanced table mapping: metadata mapping			YES	
+X058	Advanced table mapping: base64 encoding of binary strings			YES	
+X059	Advanced table mapping: hex encoding of binary strings			YES	
 X060	XMLParse: Character string input and CONTENT option			YES	
 X061	XMLParse: Character string input and DOCUMENT option			YES	
 X062	XMLParse: explicit WHITESPACE option			YES	
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index b4bda0e5f6d1..30a2506df29c 100644
--- a/src/backend/catalog/system_views.sql
+++ b/src/backend/catalog/system_views.sql
@@ -4,7 +4,7 @@
  * Copyright (c) 2006-2010, Greenplum inc.
  * Copyright (c) 1996-2010, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.35 2007/01/05 22:19:25 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.48 2008/01/01 19:45:48 momjian Exp $
  */
 
 CREATE VIEW pg_roles AS 
@@ -152,8 +152,9 @@ CREATE VIEW pg_locks AS
     SELECT * 
     FROM pg_lock_status() AS L
     (locktype text, database oid, relation oid, page int4, tuple int2,
-     transactionid xid, classid oid, objid oid, objsubid int2,
-     transaction xid, pid int4, mode text, granted boolean, mppSessionId int4, mppIsWriter boolean, gp_segment_id int4);
+     virtualxid text, transactionid xid, classid oid, objid oid, objsubid int2,
+     virtualtransaction text, pid int4, mode text, granted boolean,
+     mppSessionId int4, mppIsWriter boolean, gp_segment_id int4);
 
 CREATE VIEW pg_cursors AS
     SELECT C.name, C.statement, C.is_holdable, C.is_binary,
@@ -214,6 +215,7 @@ CREATE VIEW pg_stat_all_tables AS
             pg_stat_get_tuples_inserted(C.oid) AS n_tup_ins, 
             pg_stat_get_tuples_updated(C.oid) AS n_tup_upd, 
             pg_stat_get_tuples_deleted(C.oid) AS n_tup_del,
+            pg_stat_get_tuples_hot_updated(C.oid) AS n_tup_hot_upd,
             pg_stat_get_live_tuples(C.oid) AS n_live_tup, 
             pg_stat_get_dead_tuples(C.oid) AS n_dead_tup,
             pg_stat_get_last_vacuum_time(C.oid) as last_vacuum,
@@ -228,11 +230,13 @@ CREATE VIEW pg_stat_all_tables AS
 
 CREATE VIEW pg_stat_sys_tables AS 
     SELECT * FROM pg_stat_all_tables 
-    WHERE schemaname IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname IN ('pg_catalog', 'information_schema') OR
+          schemaname ~ '^pg_toast';
 
 CREATE VIEW pg_stat_user_tables AS 
     SELECT * FROM pg_stat_all_tables 
-    WHERE schemaname NOT IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND
+          schemaname !~ '^pg_toast';
 
 CREATE VIEW pg_statio_all_tables AS 
     SELECT 
@@ -261,11 +265,13 @@ CREATE VIEW pg_statio_all_tables AS
 
 CREATE VIEW pg_statio_sys_tables AS 
     SELECT * FROM pg_statio_all_tables 
-    WHERE schemaname IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname IN ('pg_catalog', 'information_schema') OR
+          schemaname ~ '^pg_toast';
 
 CREATE VIEW pg_statio_user_tables AS 
     SELECT * FROM pg_statio_all_tables 
-    WHERE schemaname NOT IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND
+          schemaname !~ '^pg_toast';
 
 CREATE VIEW pg_stat_all_indexes AS 
     SELECT 
@@ -285,11 +291,13 @@ CREATE VIEW pg_stat_all_indexes AS
 
 CREATE VIEW pg_stat_sys_indexes AS 
     SELECT * FROM pg_stat_all_indexes 
-    WHERE schemaname IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname IN ('pg_catalog', 'information_schema') OR
+          schemaname ~ '^pg_toast';
 
 CREATE VIEW pg_stat_user_indexes AS 
     SELECT * FROM pg_stat_all_indexes 
-    WHERE schemaname NOT IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND
+          schemaname !~ '^pg_toast';
 
 CREATE VIEW pg_statio_all_indexes AS 
     SELECT 
@@ -309,11 +317,13 @@ CREATE VIEW pg_statio_all_indexes AS
 
 CREATE VIEW pg_statio_sys_indexes AS 
     SELECT * FROM pg_statio_all_indexes 
-    WHERE schemaname IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname IN ('pg_catalog', 'information_schema') OR
+          schemaname ~ '^pg_toast';
 
 CREATE VIEW pg_statio_user_indexes AS 
     SELECT * FROM pg_statio_all_indexes 
-    WHERE schemaname NOT IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND
+          schemaname !~ '^pg_toast';
 
 CREATE VIEW pg_statio_all_sequences AS 
     SELECT 
@@ -329,11 +339,13 @@ CREATE VIEW pg_statio_all_sequences AS
 
 CREATE VIEW pg_statio_sys_sequences AS 
     SELECT * FROM pg_statio_all_sequences 
-    WHERE schemaname IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname IN ('pg_catalog', 'information_schema') OR
+          schemaname ~ '^pg_toast';
 
 CREATE VIEW pg_statio_user_sequences AS 
     SELECT * FROM pg_statio_all_sequences 
-    WHERE schemaname NOT IN ('pg_catalog', 'pg_toast', 'information_schema');
+    WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND
+          schemaname !~ '^pg_toast';
 
 CREATE VIEW pg_stat_activity AS 
     SELECT 
@@ -386,7 +398,12 @@ CREATE VIEW pg_stat_database AS
             pg_stat_get_db_xact_rollback(D.oid) AS xact_rollback, 
             pg_stat_get_db_blocks_fetched(D.oid) - 
                     pg_stat_get_db_blocks_hit(D.oid) AS blks_read, 
-            pg_stat_get_db_blocks_hit(D.oid) AS blks_hit 
+            pg_stat_get_db_blocks_hit(D.oid) AS blks_hit,
+            pg_stat_get_db_tuples_returned(D.oid) AS tup_returned,
+            pg_stat_get_db_tuples_fetched(D.oid) AS tup_fetched,
+            pg_stat_get_db_tuples_inserted(D.oid) AS tup_inserted,
+            pg_stat_get_db_tuples_updated(D.oid) AS tup_updated,
+            pg_stat_get_db_tuples_deleted(D.oid) AS tup_deleted
     FROM pg_database D;
 
 CREATE VIEW pg_stat_resqueues AS
@@ -839,3 +856,75 @@ pg_resqueuecapability rc WHERE
 rq.oid=rc.resqueueid AND rc.restypid = rt.restypid
 ORDER BY rsqname, restypid
 ;
+
+CREATE VIEW pg_stat_bgwriter AS
+    SELECT
+        pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed,
+        pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req,
+        pg_stat_get_bgwriter_buf_written_checkpoints() AS buffers_checkpoint,
+        pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean,
+        pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean,
+        pg_stat_get_buf_written_backend() AS buffers_backend,
+        pg_stat_get_buf_alloc() AS buffers_alloc;
+
+-- Tsearch debug function.  Defined here because it'd be pretty unwieldy
+-- to put it into pg_proc.h
+
+CREATE FUNCTION ts_debug(IN config regconfig, IN document text,
+    OUT alias text,
+    OUT description text,
+    OUT token text,
+    OUT dictionaries regdictionary[],
+    OUT dictionary regdictionary,
+    OUT lexemes text[])
+RETURNS SETOF record AS
+$$
+SELECT 
+    tt.alias AS alias,
+    tt.description AS description,
+    parse.token AS token,
+    ARRAY ( SELECT m.mapdict::pg_catalog.regdictionary
+            FROM pg_catalog.pg_ts_config_map AS m
+            WHERE m.mapcfg = $1 AND m.maptokentype = parse.tokid
+            ORDER BY m.mapseqno )
+    AS dictionaries,
+    ( SELECT mapdict::pg_catalog.regdictionary
+      FROM pg_catalog.pg_ts_config_map AS m
+      WHERE m.mapcfg = $1 AND m.maptokentype = parse.tokid
+      ORDER BY pg_catalog.ts_lexize(mapdict, parse.token) IS NULL, m.mapseqno
+      LIMIT 1
+    ) AS dictionary,
+    ( SELECT pg_catalog.ts_lexize(mapdict, parse.token)
+      FROM pg_catalog.pg_ts_config_map AS m
+      WHERE m.mapcfg = $1 AND m.maptokentype = parse.tokid
+      ORDER BY pg_catalog.ts_lexize(mapdict, parse.token) IS NULL, m.mapseqno
+      LIMIT 1
+    ) AS lexemes
+FROM pg_catalog.ts_parse(
+        (SELECT cfgparser FROM pg_catalog.pg_ts_config WHERE oid = $1 ), $2 
+    ) AS parse,
+     pg_catalog.ts_token_type(
+        (SELECT cfgparser FROM pg_catalog.pg_ts_config WHERE oid = $1 )
+    ) AS tt
+WHERE tt.tokid = parse.tokid
+$$
+LANGUAGE SQL STRICT STABLE;
+
+COMMENT ON FUNCTION ts_debug(regconfig,text) IS
+    'debug function for text search configuration';
+
+CREATE FUNCTION ts_debug(IN document text,
+    OUT alias text,
+    OUT description text,
+    OUT token text,
+    OUT dictionaries regdictionary[],
+    OUT dictionary regdictionary,
+    OUT lexemes text[])
+RETURNS SETOF record AS
+$$
+    SELECT * FROM pg_catalog.ts_debug( pg_catalog.get_current_ts_config(), $1);
+$$
+LANGUAGE SQL STRICT STABLE;
+
+COMMENT ON FUNCTION ts_debug(text) IS
+    'debug function for current text search configuration';
diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index 5c2c56fdc44d..da35e60532fd 100644
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/toasting.c,v 1.5 2007/01/09 02:14:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/toasting.c,v 1.9 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,7 @@
 #include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
+#include "catalog/namespace.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_type.h"
@@ -136,6 +137,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 	Relation	class_rel;
 	Oid			toast_relid;
 	Oid			toast_idxid;
+	Oid			namespaceid;
 	char		toast_relname[NAMEDATALEN];
 	char		toast_idxname[NAMEDATALEN];
 	IndexInfo  *indexInfo;
@@ -203,17 +205,21 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 	tupdesc->attrs[2]->attstorage = 'p';
 
 	/*
-	 * Note: the toast relation is placed in the regular pg_toast namespace
-	 * even if its master relation is a temp table.  There cannot be any
-	 * naming collision, and the toast rel will be destroyed when its master
-	 * is, so there's no need to handle the toast rel as temp.
-	 *
+	 * Toast tables for regular relations go in pg_toast; those for temp
+	 * relations go into the per-backend temp-toast-table namespace.
+	 */
+	if (rel->rd_istemp)
+		namespaceid = GetTempToastNamespace();
+	else
+		namespaceid = PG_TOAST_NAMESPACE;
+
+	/*
 	 * XXX would it make sense to apply the master's reloptions to the toast
-	 * table?
+	 * table?  Or maybe some toast-specific reloptions?
 	 */
 	Oid unusedTypArrayOid = InvalidOid;
 	toast_relid = heap_create_with_catalog(toast_relname,
-										   PG_TOAST_NAMESPACE,
+										   namespaceid,
 										   rel->rd_rel->reltablespace,
 										   toastOid,
 										   rel->rd_rel->relowner,
@@ -259,7 +265,9 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 	indexInfo->ii_Predicate = NIL;
 	indexInfo->ii_PredicateState = NIL;
 	indexInfo->ii_Unique = true;
+	indexInfo->ii_ReadyForInserts = true;
 	indexInfo->ii_Concurrent = false;
+	indexInfo->ii_BrokenHotChain = false;
 
 	classObjectId[0] = OID_BTREE_OPS_OID;
 	classObjectId[1] = INT4_BTREE_OPS_OID;
@@ -371,7 +379,7 @@ RelationNeedsToastTable(Relation rel)
 	{
 		if (att[i]->attisdropped)
 			continue;
-		data_length = att_align(data_length, att[i]->attalign);
+		data_length = att_align_nominal(data_length, att[i]->attalign);
 		if (att[i]->attlen > 0)
 		{
 			/* Fixed-length types are never toastable */
diff --git a/src/backend/cdb/cdbcopy.c b/src/backend/cdb/cdbcopy.c
index dfbca40eee93..479aa09451d2 100644
--- a/src/backend/cdb/cdbcopy.c
+++ b/src/backend/cdb/cdbcopy.c
@@ -114,8 +114,6 @@ cdbCopyStart(CdbCopy *c, char *copyCmd)
 	 */
 	oldcontext = MemoryContextSwitchTo(MessageContext);
 
-	QueryContext = CurrentMemoryContext;
-	
 	/* dispatch copy command to both primary and mirror writer gangs */
 	
 	/*
diff --git a/src/backend/cdb/cdbdatabaseinfo.c b/src/backend/cdb/cdbdatabaseinfo.c
index d2849c1324bd..1be01e3d9b63 100755
--- a/src/backend/cdb/cdbdatabaseinfo.c
+++ b/src/backend/cdb/cdbdatabaseinfo.c
@@ -1199,6 +1199,7 @@ DatabaseInfo_CollectPgClass(
 	DatabaseInfo 		*info,
 	HTAB				*dbInfoRelHashTable,
 	HTAB				*relationIdHashTable,
+	Snapshot			 snapshot,
 	int					*count)
 {
 	Relation	pg_class_rel;
@@ -1206,6 +1207,13 @@ DatabaseInfo_CollectPgClass(
 	HeapScanDesc scan;
 	HeapTuple	tuple;
 
+	/*
+	 * If the caller isn't providing a Snapshot to use, fall back to using
+	 * SnapshotNow
+	 */
+	if (snapshot == NULL)
+		snapshot = SnapshotNow;
+
 	/*
 	 * Iterate through all the relations of the database and determine which
 	 * database directories are active.  I.e. Fill up the tablespaces array.
@@ -1215,7 +1223,7 @@ DatabaseInfo_CollectPgClass(
 			DirectOpen_PgClassOpen(
 							info->defaultTablespace, 
 							info->database);
-	scan = heap_beginscan(pg_class_rel, SnapshotNow, 0, NULL);
+	scan = heap_beginscan(pg_class_rel, snapshot, 0, NULL);
 	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
 	{
 		Oid 			relationOid;
@@ -1277,7 +1285,6 @@ DatabaseInfo_CollectPgClass(
 	heap_endscan(scan);
 
 	DirectOpen_PgClassClose(pg_class_rel);
-
 }
 
 /*
@@ -1374,6 +1381,7 @@ DatabaseInfo *
 DatabaseInfo_Collect(
 	Oid			database,
 	Oid 		defaultTablespace,
+	Snapshot	snapshot,
 	bool        collectGpRelationNodeInfo,
 	bool		collectAppendOnlyCatalogSegmentInfo,
 	bool		scanFileSystem)
@@ -1425,7 +1433,7 @@ DatabaseInfo_Collect(
 	 *   - from gp_relation_node [if specified]
 	 *   - from file system
 	 */
-	DatabaseInfo_CollectPgClass(info, dbInfoRelHashTable, relationIdHashTable, &count);
+	DatabaseInfo_CollectPgClass(info, dbInfoRelHashTable, relationIdHashTable, NULL, &count);
 	DatabaseInfo_CollectPgAppendOnly(info, pgAppendOnlyHashTable);
 
 	if (info->collectAppendOnlyCatalogSegmentInfo)
diff --git a/src/backend/cdb/cdbdistributedsnapshot.c b/src/backend/cdb/cdbdistributedsnapshot.c
index 3de669d9c803..3ee8b9c01152 100644
--- a/src/backend/cdb/cdbdistributedsnapshot.c
+++ b/src/backend/cdb/cdbdistributedsnapshot.c
@@ -82,7 +82,7 @@ DistributedSnapshotWithLocalMapping_CommittedTest(
 										&distribXid))
 		{
 			DistributedTransactionTimeStamp checkDistribTimeStamp;
-			
+
 			/*
 			 * Ok, now we must consult the distributed log.
 			 */
@@ -115,7 +115,7 @@ DistributedSnapshotWithLocalMapping_CommittedTest(
 												localXid, 
 												dslm->header.distribTransactionTimeStamp,
 												/* distribXid */ InvalidDistributedTransactionId);
-				
+
 				return DISTRIBUTEDSNAPSHOT_COMMITTED_IGNORE;
 			}
 		}
diff --git a/src/backend/cdb/cdbfilerepmirror.c b/src/backend/cdb/cdbfilerepmirror.c
index 19d1ee373ed1..00dd9005a272 100644
--- a/src/backend/cdb/cdbfilerepmirror.c
+++ b/src/backend/cdb/cdbfilerepmirror.c
@@ -1959,7 +1959,8 @@ FileRepMirror_RunConsumer(void)
 											   fileRepMessageHeader->messageCount),
 							 FileRep_errcontext()));		
 					
-					FileUnlink(fd);
+					SetDeleteOnExit(fd);
+					FileClose(fd);
 					FileRepMirror_RemoveFileName(newFileName);
 				}
 				fd = 0;
@@ -2621,7 +2622,8 @@ FileRepMirror_Drop(FileName fileName)
 		FileRepMirror_RemoveFileName(fileName);
 	}
 
-	FileUnlink(fd);
+	SetDeleteOnExit(fd);
+	FileClose(fd);
 	
 	return status;
 }
diff --git a/src/backend/cdb/cdbfilerepresyncmanager.c b/src/backend/cdb/cdbfilerepresyncmanager.c
index 5c1ba395885d..201299abe975 100644
--- a/src/backend/cdb/cdbfilerepresyncmanager.c
+++ b/src/backend/cdb/cdbfilerepresyncmanager.c
@@ -1324,15 +1324,15 @@ FileRepResyncManager_InSyncTransition(void)
 		MirroredFlatFile_DropFilesFromDir();
 		
 		fileRepResyncShmem->checkpointRequest = TRUE;		
-		CreateCheckPoint(false, true);
+		CreateCheckPoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
 		fileRepResyncShmem->checkpointRequest = FALSE;
 		
 		/* 
 		 * The second checkpoint is required in order to mirror pg_control
 		 * with last checkpoint position in the xlog file that is mirrored (XLogSwitch).
 		 */
-		CreateCheckPoint(false, true);
-		
+		CreateCheckPoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
+
 		FileRepSubProcess_ProcessSignals();
 		if (! (FileRepSubProcess_GetState() == FileRepStateReady &&
 			   dataState == DataStateInSync))
diff --git a/src/backend/cdb/cdbgroup.c b/src/backend/cdb/cdbgroup.c
index 954e0fea1e1f..8719538cff89 100644
--- a/src/backend/cdb/cdbgroup.c
+++ b/src/backend/cdb/cdbgroup.c
@@ -1004,7 +1004,7 @@ make_one_stage_agg_plan(PlannerInfo *root,
 		 * base plan can't project. (This may be unnecessary, but, if so,
 		 * the Result node will be removed later.)
 		 */
-		result_plan = plan_pushdown_tlist(result_plan, sub_tlist);
+		result_plan = plan_pushdown_tlist(root, result_plan, sub_tlist);
 
 		Assert(result_plan->flow); 
     
@@ -1251,7 +1251,7 @@ make_two_stage_agg_plan(PlannerInfo *root,
 		 * (Though the result node may not always be necessary, it is safe,
 		 * and superfluous Result nodes are removed later.)
 		 */
-		result_plan = plan_pushdown_tlist(result_plan, ctx->sub_tlist);
+		result_plan = plan_pushdown_tlist(root, result_plan, ctx->sub_tlist);
 
 		/* Account for the cost of evaluation of the sub_tlist. */
 		cost_qual_eval(&tlist_cost, ctx->sub_tlist, root);
@@ -1651,7 +1651,7 @@ make_three_stage_agg_plan(PlannerInfo *root, MppGroupContext *ctx)
 		 * base plan can't project. (This may be unnecessary, but, if so,
 		 * the Result node will be removed later.)
 		 */
-		result_plan = plan_pushdown_tlist(result_plan, ctx->sub_tlist);
+		result_plan = plan_pushdown_tlist(root, result_plan, ctx->sub_tlist);
 
 		Assert(result_plan->flow); 
 		
@@ -4058,6 +4058,12 @@ add_second_stage_agg(PlannerInfo *root,
 		parse->targetList = copyObject(upper_tlist); /* Match range. */
 	}
 
+	/*
+	 * Ensure that the plan we're going to attach to the subquery scan has all the
+	 * parameter fields figured out.
+	 */
+	SS_finalize_plan(root, result_plan, false);
+
 	result_plan = add_subqueryscan(root, p_current_pathkeys, 
 								   1, subquery, result_plan);
 
@@ -4088,16 +4094,20 @@ add_second_stage_agg(PlannerInfo *root,
 								  agg_node->lefttree, 
 								  (*p_current_pathkeys != NIL)
 								   && aggstrategy != AGG_HASHED );
-	
+
 	/* 
-	 * Since the rtable has changed, we had better recreate a RelOptInfo entry for it.
+	 * Since the rtable has changed, we had better recreate a RelOptInfo entry
+	 * for it. Make a copy of the groupClause since freeing the arrays can pull
+	 * out references still in use from underneath it.
 	 */
+	root->parse->groupClause = copyObject(root->parse->groupClause);
+
 	if (root->simple_rel_array)
 		pfree(root->simple_rel_array);
-	root->simple_rel_array_size = list_length(parse->rtable) + 1;
-	root->simple_rel_array = (RelOptInfo **)
-		palloc0(root->simple_rel_array_size * sizeof(RelOptInfo *));
-	build_simple_rel(root, 1, RELOPT_BASEREL);
+	if (root->simple_rte_array)
+		pfree(root->simple_rte_array);
+
+	rebuild_simple_rel_and_rte(root);
 
 	return agg_node;
 }
@@ -4221,6 +4231,7 @@ reconstruct_pathkeys(PlannerInfo *root, List *pathkeys, int *resno_map,
 	foreach(i, pathkeys)
 	{
 		PathKey    *pathkey = (PathKey *) lfirst(i);
+		bool		found = false;
 
 		foreach(j, pathkey->pk_eclass->ec_members)
 		{
@@ -4239,14 +4250,19 @@ reconstruct_pathkeys(PlannerInfo *root, List *pathkeys, int *resno_map,
 
 				new_eclass = get_eclass_for_sort_expr(root, new_tle->expr,
 													  em->em_datatype,
-													  pathkey->pk_eclass->ec_opfamilies);
+													  pathkey->pk_eclass->ec_opfamilies, 0);
 				new_pathkey = makePathKey(new_eclass, pathkey->pk_opfamily, pathkey->pk_strategy,
 										  pathkey->pk_nulls_first);
 
 				new_pathkeys = lappend(new_pathkeys, new_pathkey);
+				found = true;
 				break;
 			}
 		}
+		if (!found)
+		{	
+			new_pathkeys = lappend(new_pathkeys, copyObject(pathkey));
+		}
 	}
 
 	new_pathkeys = canonicalize_pathkeys(root, new_pathkeys);
@@ -4367,7 +4383,7 @@ Cost cost_1phase_aggregation(PlannerInfo *root, MppGroupContext *ctx, AggPlanInf
 			/* GroupAgg */
 			if ( ! is_sorted )
 			{
-				add_sort_cost(NULL, &input_dummy, ctx->numGroupCols, NULL, NULL);
+				add_sort_cost(NULL, &input_dummy, ctx->numGroupCols, NULL, NULL, -1.0);
 			}
 			add_agg_cost(NULL, &input_dummy, 
 						 ctx->sub_tlist, (List*)root->parse->havingQual,
@@ -4387,7 +4403,7 @@ Cost cost_1phase_aggregation(PlannerInfo *root, MppGroupContext *ctx, AggPlanInf
 			double ngrps = *(ctx->p_dNumGroups);
 			double nsorts = ngrps * ctx->numDistinctCols;
 			double avgsize = input_dummy.plan_rows / ngrps;
-			cost_sort(&path_dummy, NULL, NIL, 0.0, avgsize, 32);
+			cost_sort(&path_dummy, NULL, NIL, 0.0, avgsize, 32, -1);
 			input_dummy.total_cost += nsorts * path_dummy.total_cost;
 		}
 	}
@@ -4475,7 +4491,7 @@ Cost cost_2phase_aggregation(PlannerInfo *root, MppGroupContext *ctx, AggPlanInf
 			/* Preliminary GroupAgg */
 			if ( ! is_sorted )
 			{
-				add_sort_cost(NULL, &input_dummy, ctx->numGroupCols, NULL, NULL);
+				add_sort_cost(NULL, &input_dummy, ctx->numGroupCols, NULL, NULL, -1.0);
 			}
 			add_agg_cost(NULL, &input_dummy, 
 						NIL, NIL, /* Don't know preliminary tlist, qual IS NIL */
@@ -4497,7 +4513,7 @@ Cost cost_2phase_aggregation(PlannerInfo *root, MppGroupContext *ctx, AggPlanInf
 			
 			Assert(ctx->numDistinctCols == 1);
 			
-			cost_sort(&path_dummy, NULL, NIL, input_dummy.total_cost, avgsize, 32);
+			cost_sort(&path_dummy, NULL, NIL, input_dummy.total_cost, avgsize, 32, -1.0);
 			run_cost = path_dummy.total_cost - path_dummy.startup_cost;
 			input_dummy.total_cost += path_dummy.startup_cost + ngrps * run_cost;
 		}
@@ -4551,7 +4567,7 @@ Cost cost_2phase_aggregation(PlannerInfo *root, MppGroupContext *ctx, AggPlanInf
 		else
 		{
 			/* GroupAgg */
-			add_sort_cost(NULL, &input_dummy, ctx->numGroupCols, NULL, NULL);
+			add_sort_cost(NULL, &input_dummy, ctx->numGroupCols, NULL, NULL, -1.0);
 			add_agg_cost(NULL, &input_dummy, 
 						NIL, NIL, /* Don't know tlist or qual */
 						 AGG_SORTED, false, 
@@ -5013,7 +5029,7 @@ Cost incremental_sort_cost(double rows, int width, int numKeyCols)
 	dummy.plan_rows = rows;
 	dummy.plan_width = width;
 	
-	add_sort_cost(NULL, &dummy, numKeyCols, NULL, NULL);
+	add_sort_cost(NULL, &dummy, numKeyCols, NULL, NULL, -1.0);
 	
 	return dummy.total_cost;
 }	
@@ -5088,9 +5104,27 @@ choose_deduplicate(PlannerInfo *root, List *sortExprs,
 	cost_sort(&dummy_path, root, NIL,
 			  input_plan->total_cost,
 			  input_plan->plan_rows,
-			  input_plan->plan_width);
+			  input_plan->plan_width, -1.0);
 	naive_cost = dummy_path.total_cost;
 
+	/*
+	 * Make a flattened version of the rangetable. estimate_num_groups()
+	 * needs it. It is normally created later in the planning process,
+	 * in query_planner(), but since we want to call estimate_num_groups()
+	 * before query_planner(), we have to build it here.
+	 */
+	root->simple_rel_array_size = list_length(root->parse->rtable) + 1;
+	root->simple_rte_array = (RangeTblEntry **)
+		palloc0(root->simple_rel_array_size * sizeof(RangeTblEntry *));
+	int rti = 1;
+	ListCell *lc;
+	foreach(lc, root->parse->rtable)
+	{
+		RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+
+		root->simple_rte_array[rti++] = rte;
+	}
+
 	/*
 	 * Next, calculate cost of deduplicate.
 	 * The first aggregate calculates number of duplicate for
@@ -5109,9 +5143,11 @@ choose_deduplicate(PlannerInfo *root, List *sortExprs,
 	cost_sort(&dummy_path, root, NIL,
 			  dummy_path.total_cost,
 			  num_distinct,
-			  width);
+			  width, -1.0);
 	dedup_cost = dummy_path.total_cost;
 
+	pfree(root->simple_rte_array);
+
 	if (numGroups)
 		*numGroups = num_distinct;
 
@@ -5237,10 +5273,15 @@ rebuild_simple_rel_and_rte(PlannerInfo *root)
 	i = 1;
 	foreach (l, root->parse->rtable)
 	{
-		(void) build_simple_rel(root, i, RELOPT_BASEREL);
 		root->simple_rte_array[i] = lfirst(l);
 		i++;
 	}
+	i = 1;
+	foreach (l, root->parse->rtable)
+	{
+		(void) build_simple_rel(root, i, RELOPT_BASEREL);
+		i++;
+	}
 }
 
 /*
@@ -5600,6 +5641,7 @@ make_deduplicate_plan(PlannerInfo *root,
 
 	use_hashed_grouping = choose_hashed_grouping(root,
 												 group_context->tuple_fraction,
+												 -1.0,
 												 group_context->cheapest_path,
 												 NULL,
 												 groupOperators, numGroupCols, numGroups,
@@ -6021,6 +6063,7 @@ within_agg_construct_inner(PlannerInfo *root,
 	 */
 	use_hashed_grouping = choose_hashed_grouping(root,
 												 group_context->tuple_fraction,
+												 -1.0,
 												 &input_path,
 												 &input_path,
 												 grpOperators, numGroupCols, numGroups,
@@ -6115,7 +6158,6 @@ within_agg_join_plans(PlannerInfo *root,
 	const Index		Outer = 1, Inner = 2;
 	List		   *extravars;
 	Var			   *pc_var, *tc_var;
-	int				ngroups;
 
 	/*
 	 * Up to now, these should've been prepared.
@@ -6123,10 +6165,6 @@ within_agg_join_plans(PlannerInfo *root,
 	Assert(wag_context->pc_pos > 0);
 	Assert(wag_context->tc_pos > 0);
 
-	ngroups = list_length(root->parse->groupClause);
-	if (list_length(wag_context->current_pathkeys) < ngroups)
-		elog(ERROR, "fewer pathkeys than join clauses");
-
 	/*
 	 * Build target list for grouping columns.
 	 *
@@ -6212,11 +6250,12 @@ within_agg_join_plans(PlannerInfo *root,
 	 * We choose cartesian product if there is no join clauses, meaning
 	 * no grouping happens.
 	 */
-	if (ngroups > 0)
+	if (root->parse->groupClause != NIL)
 	{
 		int				idx;
 		ListCell	   *lg;
 		ListCell	   *lpk;
+		int			ngroups = list_length(root->parse->groupClause);
 
 		/* Build merge join clauses for grouping columns */
 		mergefamilies = (Oid *) palloc(ngroups * sizeof(Oid));
@@ -6224,7 +6263,7 @@ within_agg_join_plans(PlannerInfo *root,
 		mergenullsfirst = (bool *) palloc(ngroups * sizeof(bool));
 		join_clause = NIL;
 		idx = 0;
-		forboth(lg, root->parse->groupClause, lpk, wag_context->current_pathkeys)
+		forboth(lg, root->parse->groupClause, lpk, root->group_pathkeys)
 		{
 			GroupClause	   *gc = (GroupClause *) lfirst(lg);
 			PathKey		   *pk = (PathKey *) lfirst(lpk);
@@ -6720,7 +6759,7 @@ within_agg_planner(PlannerInfo *root,
 	 */
 	Assert(sub_tlist != NIL);
 	result_plan = create_plan(root, group_context->best_path);
-	result_plan = plan_pushdown_tlist(result_plan, sub_tlist);
+	result_plan = plan_pushdown_tlist(root, result_plan, sub_tlist);
 	Assert(result_plan->flow);
 	current_pathkeys = group_context->best_path->pathkeys;
 
diff --git a/src/backend/cdb/cdbhash.c b/src/backend/cdb/cdbhash.c
index 44aa9bad2bf5..c559c0d61f46 100644
--- a/src/backend/cdb/cdbhash.c
+++ b/src/backend/cdb/cdbhash.c
@@ -238,6 +238,9 @@ hashDatum(Datum datum, Oid type, datumHashFunction hashFn, void *clientData)
 
 	void *tofree = NULL;
 
+	if (typeIsEnumType(type))
+		type = ANYENUMOID;
+
 	/*
 	 * Select the hash to be performed according to the field type we are adding to the
 	 * hash.
@@ -371,6 +374,7 @@ hashDatum(Datum datum, Oid type, datumHashFunction hashFn, void *clientData)
 		case REGOPERATOROID:		/* operator with argument types */
 		case REGCLASSOID:			/* relation name */
 		case REGTYPEOID:			/* data type name */
+		case ANYENUMOID:			/* enum type name */
 			intbuf = (int64) DatumGetUInt32(datum);	/* cast to 8 byte before hashing */
 			buf = &intbuf;
 			len = sizeof(intbuf);
@@ -708,6 +712,21 @@ typeIsArrayType(Oid typeoid)
 	return res;
 }
 
+bool
+typeIsEnumType(Oid typeoid)
+{
+	Type tup = typeidType(typeoid);
+	Form_pg_type typeform;
+	bool res = false;
+
+	typeform = (Form_pg_type) GETSTRUCT(tup);
+
+	if (typeform->typtype == 'e' && typeform->typinput == F_ENUM_IN)
+		res = true;
+
+	ReleaseType(tup);
+	return res;
+}
 
 bool isGreenplumDbHashable(Oid typid)
 {
@@ -719,6 +738,10 @@ bool isGreenplumDbHashable(Oid typid)
 	if (get_typtype(typid) == 'd')
 		typid = getBaseType(typid);
 	
+	/* we can hash all enums */
+	if (typeIsEnumType(typid))
+		return true;
+
 	/*
 	 * NB: Every GPDB-hashable datatype must also be mergejoinable, i.e.
 	 * must have a B-tree operator family. There is a sanity check for
diff --git a/src/backend/cdb/cdbllize.c b/src/backend/cdb/cdbllize.c
index b1f3fb57497b..9815fbec3066 100644
--- a/src/backend/cdb/cdbllize.c
+++ b/src/backend/cdb/cdbllize.c
@@ -136,7 +136,6 @@ cdbparallelize(PlannerInfo *root,
 			   ParamListInfo boundParams __attribute__((unused))
 )
 {
-	int			nParamExec;
 	PlanProfile profile;
 	PlanProfile *context = &profile;
 	
@@ -242,10 +241,6 @@ cdbparallelize(PlannerInfo *root,
 	/* We need to keep track of whether any part of the plan needs to be
 	 * dispatched in parallel. */
 	context->dispatchParallel = context->resultSegments;
-	
-	/* Save the global count of PARAM_EXEC from the top plan node. */
-	nParamExec = plan->nParamExec;
-
 	context->currentPlanFlow = NULL;
 
 	/*
@@ -270,10 +265,6 @@ cdbparallelize(PlannerInfo *root,
 		plan = apply_motion(root, plan, query);
 	}
 
-
-	/* Restore the global count of PARAM_EXEC from the top plan node. */
-	plan->nParamExec = nParamExec;
-
 	if (gp_enable_motion_deadlock_sanity)
 		motion_sanity_check(root, plan);
 
@@ -606,7 +597,7 @@ ParallelizeCorrelatedSubPlanMutator(Node *node, ParallelizeCorrelatedPlanWalkerC
 		/**
 		 * Step 8: Fix up the result node on top of the material node
 		 */
-		Result *res = make_result(resTL, NULL, mat);
+		Result *res = make_result((PlannerInfo *) ctx->base.node, resTL, NULL, mat);
 		res->plan.qual = resQual;
 		((Plan *) res)->allParam = saveAllParam;
 		((Plan *) res)->extParam = saveExtParam;
diff --git a/src/backend/cdb/cdbmutate.c b/src/backend/cdb/cdbmutate.c
index 4c31080e667a..c49ed7fe2165 100644
--- a/src/backend/cdb/cdbmutate.c
+++ b/src/backend/cdb/cdbmutate.c
@@ -16,6 +16,7 @@
 #include "parser/parse_oper.h"	/* for compatible_oper_opid() */
 #include "utils/relcache.h"     /* RelationGetPartitioningKey() */
 #include "optimizer/tlist.h"	/* get_sortgroupclause_tle() */
+#include "optimizer/planmain.h"
 #include "optimizer/predtest.h"
 #include "optimizer/var.h"
 #include "parser/parse_relation.h"
@@ -68,15 +69,9 @@ typedef struct
 {
 	plan_tree_base_prefix base; /* Required prefix for plan_tree_walker/mutator */
 	bool single_row_insert;
+	List	   *cursorPositions;
 } pre_dispatch_function_evaluation_context;
 
-static void
-bindCurrentOfParams(char *cursor_name,
-					Oid target_relid,
-					ItemPointer ctid,
-					int *gp_segment_id,
-					Oid *tableoid);
-
 static Node *
 pre_dispatch_function_evaluation_mutator(Node *node,
 										 pre_dispatch_function_evaluation_context * context);
@@ -110,6 +105,8 @@ doesUpdateAffectPartitionCols(PlannerInfo  *root,
 							  Plan         *plan,
                               Query        *query);
 
+static bool replace_shareinput_targetlists_walker(Node *node, PlannerGlobal *glob, bool fPop);
+
 /*
  * Given an expression, return true if it contains anything non-constant.
  *
@@ -1742,8 +1739,8 @@ cdbmutate_warn_ctid_without_segid(struct PlannerInfo *root, struct RelOptInfo *r
  * Shareinput fix shared_as_id and underlying_share_id of nodes in place.  We do not want to use
  * the ordinary tree walker as it is unnecessary to make copies etc.
  */
-typedef bool (*SHAREINPUT_MUTATOR) (Node *node, ApplyShareInputContext *ctxt, bool fPop);
-static void shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputContext *ctxt)
+typedef bool (*SHAREINPUT_MUTATOR) (Node *node, PlannerGlobal *glob, bool fPop);
+static void shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, PlannerGlobal *glob)
 {
 	Plan *plan = NULL; 
 	bool recursive_down;
@@ -1758,7 +1755,7 @@ static void shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputC
 		foreach(lc, l)
 		{
 			Node* n = lfirst(lc);
-			shareinput_walker(f, n, ctxt);
+			shareinput_walker(f, n, glob);
 		}
 		return;
 	}
@@ -1767,7 +1764,7 @@ static void shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputC
 		return;
 
 	plan = (Plan *) node;
-	recursive_down = (*f)(node, ctxt, false);
+	recursive_down = (*f)(node, glob, false);
 
 	if(recursive_down) 
 	{
@@ -1776,26 +1773,31 @@ static void shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputC
 			ListCell *cell;
 			Append *app = (Append *) node;
 			foreach(cell, app->appendplans)
-				shareinput_walker(f, (Node *)lfirst(cell), ctxt);
+				shareinput_walker(f, (Node *)lfirst(cell), glob);
 		}
 		else if(IsA(node, SubqueryScan))
 		{
 			SubqueryScan *subqscan = (SubqueryScan *) node;
-			shareinput_walker(f, (Node *) subqscan->subplan, ctxt);
+			List	   *save_rtable;
+
+			save_rtable = glob->share.curr_rtable;
+			glob->share.curr_rtable = subqscan->subrtable;
+			shareinput_walker(f, (Node *) subqscan->subplan, glob);
+			glob->share.curr_rtable = save_rtable;
 		}
 		else if(IsA(node, BitmapAnd))
 		{
 			ListCell *cell;
 			BitmapAnd *ba = (BitmapAnd *) node;
 			foreach(cell, ba->bitmapplans)
-				shareinput_walker(f, (Node *)lfirst(cell), ctxt);
+				shareinput_walker(f, (Node *)lfirst(cell), glob);
 		}
 		else if(IsA(node, BitmapOr))
 		{
 			ListCell *cell;
 			BitmapOr *bo = (BitmapOr *) node;
 			foreach(cell, bo->bitmapplans)
-				shareinput_walker(f, (Node *)lfirst(cell), ctxt);
+				shareinput_walker(f, (Node *)lfirst(cell), glob);
 		}
 		else if(IsA(node, NestLoop))
 		{
@@ -1803,33 +1805,33 @@ static void shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputC
 			NestLoop *nl = (NestLoop *) node;
 			if(nl->join.prefetch_inner)
 			{
-				shareinput_walker(f, (Node *)plan->righttree, ctxt);
-				shareinput_walker(f, (Node *)plan->lefttree, ctxt);
+				shareinput_walker(f, (Node *)plan->righttree, glob);
+				shareinput_walker(f, (Node *)plan->lefttree, glob);
 			}
 			else	
 			{
-				shareinput_walker(f, (Node *)plan->lefttree, ctxt);
-				shareinput_walker(f, (Node *)plan->righttree, ctxt);
+				shareinput_walker(f, (Node *)plan->lefttree, glob);
+				shareinput_walker(f, (Node *)plan->righttree, glob);
 			}
 		}
 		else if(IsA(node, HashJoin))
 		{
 			/* Hash join the hash table is at inner */
-			shareinput_walker(f, (Node *)plan->righttree, ctxt);
-			shareinput_walker(f, (Node *)plan->lefttree, ctxt);
+			shareinput_walker(f, (Node *)plan->righttree, glob);
+			shareinput_walker(f, (Node *)plan->lefttree, glob);
 		}
 		else if (IsA(node, MergeJoin))
 		{
 			MergeJoin *mj = (MergeJoin *) node;
 			if (mj->unique_outer)
 			{
-				shareinput_walker(f, (Node *)plan->lefttree, ctxt);
-				shareinput_walker(f, (Node *)plan->righttree, ctxt);
+				shareinput_walker(f, (Node *)plan->lefttree, glob);
+				shareinput_walker(f, (Node *)plan->righttree, glob);
 			}
 			else
 			{
-				shareinput_walker(f, (Node *)plan->righttree, ctxt);
-				shareinput_walker(f, (Node *)plan->lefttree, ctxt);
+				shareinput_walker(f, (Node *)plan->righttree, glob);
+				shareinput_walker(f, (Node *)plan->lefttree, glob);
 			}
 		}
 		else if (IsA(node, Sequence))
@@ -1838,24 +1840,31 @@ static void shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputC
 			Sequence *sequence = (Sequence *) node;
 			foreach(cell, sequence->subplans)
 			{
-				shareinput_walker(f, (Node *)lfirst(cell), ctxt);
+				shareinput_walker(f, (Node *)lfirst(cell), glob);
 			}
 		}
 		else
 		{
-			shareinput_walker(f, (Node *)plan->lefttree, ctxt);
-			shareinput_walker(f, (Node *)plan->righttree, ctxt);
-			shareinput_walker(f, (Node *)plan->initPlan, ctxt);
+			shareinput_walker(f, (Node *)plan->lefttree, glob);
+			shareinput_walker(f, (Node *)plan->righttree, glob);
+			shareinput_walker(f, (Node *)plan->initPlan, glob);
 		}
 	}
 
-	(*f)(node, ctxt, true);
+	(*f)(node, glob, true);
 }
 
-static void leftdeep_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputContext *ctxt)
+typedef struct
+{
+	int			nextPlanId;
+	List	   *planNodes;
+} assign_plannode_id_walker_context;
+
+static void
+assign_plannode_id_walker(Node *node, assign_plannode_id_walker_context *ctxt)
 {
-	Plan *plan = NULL; 
-	bool recursive_down;
+	Plan	   *plan;
+	Plan	   *parent;
 
 	if(node == NULL)
 		return;
@@ -1867,7 +1876,7 @@ static void leftdeep_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputCon
 		foreach(lc, l)
 		{
 			Node* n = lfirst(lc);
-			leftdeep_walker(f, n, ctxt);
+			assign_plannode_id_walker(n, ctxt);
 		}
 		return;
 	}
@@ -1876,45 +1885,52 @@ static void leftdeep_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputCon
 		return;
 
 	plan = (Plan *) node;
-	recursive_down = (*f)(node, ctxt, false);
 
-	if(recursive_down) 
+	plan->plan_node_id = ++ctxt->nextPlanId;
+
+	parent = ctxt->planNodes == NIL ? NIL : linitial(ctxt->planNodes);
+
+	if(!parent)
+		plan->plan_parent_node_id = -1;
+	else
+		plan->plan_parent_node_id = parent->plan_node_id;
+
+	ctxt->planNodes = lcons(plan, ctxt->planNodes);
+
+	if(IsA(node, Append))
 	{
-		if(IsA(node, Append))
-		{
-			ListCell *cell;
-			Append *app = (Append *) node;
-			foreach(cell, app->appendplans)
-				leftdeep_walker(f, (Node *)lfirst(cell), ctxt);
-		}
-		else if(IsA(node, BitmapAnd))
-		{
-			ListCell *cell;
-			BitmapAnd *ba = (BitmapAnd *) node;
-			foreach(cell, ba->bitmapplans)
-				leftdeep_walker(f, (Node *)lfirst(cell), ctxt);
-		}
-		else if(IsA(node, BitmapOr))
-		{
-			ListCell *cell;
-			BitmapOr *bo = (BitmapOr *) node;
-			foreach(cell, bo->bitmapplans)
-				leftdeep_walker(f, (Node *)lfirst(cell), ctxt);
-		}
-		else if(IsA(node, SubqueryScan))
-		{
-			SubqueryScan *subqscan = (SubqueryScan *) node;
-			leftdeep_walker(f, (Node *) subqscan->subplan, ctxt);
-		}
-		else
-		{
-			leftdeep_walker(f, (Node *)plan->lefttree, ctxt);
-			leftdeep_walker(f, (Node *)plan->righttree, ctxt);
-			leftdeep_walker(f, (Node *)plan->initPlan, ctxt);
-		}
+		ListCell *cell;
+		Append *app = (Append *) node;
+		foreach(cell, app->appendplans)
+			assign_plannode_id_walker((Node *)lfirst(cell), ctxt);
+	}
+	else if(IsA(node, BitmapAnd))
+	{
+		ListCell *cell;
+		BitmapAnd *ba = (BitmapAnd *) node;
+		foreach(cell, ba->bitmapplans)
+			assign_plannode_id_walker((Node *)lfirst(cell), ctxt);
+	}
+	else if(IsA(node, BitmapOr))
+	{
+		ListCell *cell;
+		BitmapOr *bo = (BitmapOr *) node;
+		foreach(cell, bo->bitmapplans)
+			assign_plannode_id_walker((Node *)lfirst(cell), ctxt);
+	}
+	else if(IsA(node, SubqueryScan))
+	{
+		SubqueryScan *subqscan = (SubqueryScan *) node;
+		assign_plannode_id_walker((Node *) subqscan->subplan, ctxt);
+	}
+	else
+	{
+		assign_plannode_id_walker((Node *)plan->lefttree, ctxt);
+		assign_plannode_id_walker((Node *)plan->righttree, ctxt);
+		assign_plannode_id_walker((Node *)plan->initPlan, ctxt);
 	}
 
-	(*f)(node, ctxt, true);
+	list_delete_first(ctxt->planNodes);
 }
 
 /* 
@@ -1922,8 +1938,9 @@ static void leftdeep_walker(SHAREINPUT_MUTATOR f, Node *node, ApplyShareInputCon
  * Zap children if I am not the first sharer (not recursive down).  
  * Assign share_id to both ShareInputScan and Material/Sort.
  */
-static bool shareinput_mutator_dag_to_tree(Node *node, ApplyShareInputContext* ctxt, bool fPop)
+static bool shareinput_mutator_dag_to_tree(Node *node, PlannerGlobal *glob, bool fPop)
 {
+	ApplyShareInputContext *ctxt = &glob->share;
 	Plan *plan = (Plan *) node;
 
 	if(fPop)
@@ -1931,7 +1948,10 @@ static bool shareinput_mutator_dag_to_tree(Node *node, ApplyShareInputContext* c
 
 	if(IsA(plan, ShareInputScan))
 	{
-		Plan *subplan = plan->lefttree;
+		ShareInputScan *siscan = (ShareInputScan *) plan;
+		Plan	   *subplan = plan->lefttree;
+		int			attno;
+		ListCell   *lc;
 
 		Assert(subplan);
 		Assert(IsA(subplan, Material) || IsA(subplan, Sort));
@@ -1939,6 +1959,29 @@ static bool shareinput_mutator_dag_to_tree(Node *node, ApplyShareInputContext* c
 		Assert(plan->righttree == NULL);
 		Assert(plan->initPlan == NULL);
 
+		/*
+		 * Before we zap the child, fill in information about the child's
+		 * targetlist, so that we can still EXPLAIN this correctly.
+		 */
+		attno = 1;
+		foreach(lc, subplan->targetlist)
+		{
+			TargetEntry *tle = (TargetEntry *) lfirst(lc);
+			char		buf[100];
+			Oid			vartype;
+			int32		vartypmod;
+
+			snprintf(buf, sizeof(buf), "col_%d", attno);
+
+			vartype = exprType((Node *) tle->expr);
+			vartypmod = exprTypmod((Node *) tle->expr);
+
+			siscan->colnames = lappend(siscan->colnames, get_tle_name(tle, ctxt->curr_rtable, buf));
+			siscan->coltypes = lappend_oid(siscan->coltypes, vartype);
+			siscan->coltypmods = lappend_int(siscan->coltypmods, vartypmod);
+			attno++;
+		}
+
 		if(list_member_ptr(ctxt->sharedNodes, subplan))
 		{
 			Assert(get_plan_share_id(subplan) >= 0);
@@ -1962,9 +2005,11 @@ static bool shareinput_mutator_dag_to_tree(Node *node, ApplyShareInputContext* c
 /* 
  * Apply the share input mutator.
  */
-Plan *apply_shareinput_dag_to_tree(Plan *plan, ApplyShareInputContext *ctxt)
+Plan *
+apply_shareinput_dag_to_tree(PlannerGlobal *glob, Plan *plan, List *rtable)
 {
-	shareinput_walker(shareinput_mutator_dag_to_tree, (Node *) plan, ctxt);
+	glob->share.curr_rtable = rtable;
+	shareinput_walker(shareinput_mutator_dag_to_tree, (Node *) plan, glob);
 	return plan;
 }
 
@@ -1982,6 +2027,129 @@ static int shareinput_peekmot(ApplyShareInputContext *ctxt)
 	return linitial_int(ctxt->motStack);
 }
 
+
+/*
+ * Replace the target list of ShareInputScan nodes, with references
+ * to CTEs that we build on the fly.
+ *
+ * Only one of the ShareInputScan nodes in a plan tree contains the real
+ * child plan, while others contain just a "share id" that binds all the
+ * ShareInputScan nodes sharing the same input together. The missing
+ * child plan is a problem for EXPLAIN, as any OUTER Vars in the
+ * ShareInputScan's target list cannot be resolved without the child
+ * plan.
+ *
+ * To work around that issue, create a CTE for each shared input node, with
+ * columns that match the target list of the SharedInputScan's subplan,
+ * and replace the target list entries of the SharedInputScan with
+ * Vars that point to the CTE instead of the child plan.
+ */
+Plan *
+replace_shareinput_targetlists(PlannerGlobal *glob, Plan *plan)
+{
+	shareinput_walker(replace_shareinput_targetlists_walker, (Node *) plan, glob);
+	return plan;
+}
+
+static bool
+replace_shareinput_targetlists_walker(Node *node, PlannerGlobal *glob, bool fPop)
+{
+	ApplyShareInputContext *ctxt = &glob->share;
+
+	if (fPop)
+		return true;
+
+	if(IsA(node, ShareInputScan))
+	{
+		ShareInputScan *sisc = (ShareInputScan *) node;
+		int			share_id = sisc->share_id;
+		ListCell   *lc;
+		int			attno;
+		List	   *newtargetlist;
+		RangeTblEntry *rte;
+		char		buf[100];
+
+		/*
+		 * Note that even though the planner assigns sequential share_ids for each
+		 * shared node, so that share_id is always below list_length(ctxt->sharedNodes),
+		 * ORCA has a different assignment scheme. So we have to be prepared for any
+		 * share_id, at least when ORCA is in use.
+		 */
+		if (ctxt->share_refcounts == NULL)
+		{
+			int			new_sz = share_id + 1;
+
+			ctxt->share_refcounts = palloc0(new_sz * sizeof(int));
+			ctxt->share_refcounts_sz = new_sz;
+		}
+		else if (share_id >= ctxt->share_refcounts_sz)
+		{
+			int			old_sz = ctxt->share_refcounts_sz;
+			int			new_sz = share_id + 1;
+
+			ctxt->share_refcounts = repalloc(ctxt->share_refcounts, new_sz * sizeof(int));
+			memset(&ctxt->share_refcounts[old_sz], 0, (new_sz - old_sz) * sizeof(int));
+			ctxt->share_refcounts_sz = new_sz;
+		}
+
+		ctxt->share_refcounts[share_id]++;
+
+		/*
+		 * Create a new RTE. Note that we use a different RTE for each reference,
+		 * because we want to give each reference a different name.
+		 */
+		snprintf(buf, sizeof(buf), "share%d_ref%d",
+				 sisc->share_id,
+				 ctxt->share_refcounts[share_id]);
+
+		rte = makeNode(RangeTblEntry);
+		rte->rtekind = RTE_CTE;
+		rte->ctename = pstrdup(buf);
+		rte->ctelevelsup = 0;
+		rte->self_reference = false;
+		rte->alias = NULL;
+
+		rte->eref = makeAlias(rte->ctename, sisc->colnames);
+
+		rte->ctecoltypes = sisc->coltypes;
+		rte->ctecoltypmods = sisc->coltypmods;
+
+		rte->inh = false;
+		rte->inFromCl = false;
+
+		rte->requiredPerms = 0;
+		rte->checkAsUser = InvalidOid;
+
+		glob->finalrtable = lappend(glob->finalrtable, rte);
+		sisc->scan.scanrelid = list_length(glob->finalrtable);
+
+		/*
+		 * Replace all the target list entries.
+		 *
+		 * SharedInputScan nodes are not projection-capable, so the target list
+		 * of the SharedInputScan matches the subplan's target list.
+		 */
+		newtargetlist = NIL;
+		attno = 1;
+		foreach(lc, sisc->scan.plan.targetlist)
+		{
+			TargetEntry *tle = (TargetEntry *) lfirst(lc);
+			TargetEntry *newtle = flatCopyTargetEntry(tle);
+
+			newtle->expr = (Expr *) makeVar(sisc->scan.scanrelid, attno,
+											exprType((Node *) tle->expr),
+											exprTypmod((Node *) tle->expr),
+											0);
+			newtargetlist = lappend(newtargetlist, newtle);
+			attno++;
+		}
+		sisc->scan.plan.targetlist = newtargetlist;
+	}
+
+	return true;
+}
+
+
 typedef struct ShareNodeWithSliceMark
 {
 	Plan *plan;
@@ -2023,8 +2191,9 @@ static bool shareinput_find_sharenode(ApplyShareInputContext *ctxt, int share_id
  * 3. Build a list a share on QD
  */
 static bool
-shareinput_mutator_xslice_1(Node* node, ApplyShareInputContext *ctxt, bool fPop)
+shareinput_mutator_xslice_1(Node* node, PlannerGlobal *glob, bool fPop)
 {
+	ApplyShareInputContext *ctxt = &glob->share;
 	Plan *plan = (Plan *) node;
 
 	if(fPop)
@@ -2047,10 +2216,10 @@ shareinput_mutator_xslice_1(Node* node, ApplyShareInputContext *ctxt, bool fPop)
 		int motId = shareinput_peekmot(ctxt);
 		Plan *shared = plan->lefttree;
 
-		Assert(sisc->plan.flow);
-		if(sisc->plan.flow->flotype == FLOW_SINGLETON)
+		Assert(sisc->scan.plan.flow);
+		if(sisc->scan.plan.flow->flotype == FLOW_SINGLETON)
 		{
-			if(sisc->plan.flow->segindex < 0) 
+			if(sisc->scan.plan.flow->segindex < 0) 
 				ctxt->qdShares = list_append_unique_int(ctxt->qdShares, sisc->share_id);
 		}
 
@@ -2073,8 +2242,9 @@ shareinput_mutator_xslice_1(Node* node, ApplyShareInputContext *ctxt, bool fPop)
  * if a 'shared' is cross-slice.
  */
 static bool
-shareinput_mutator_xslice_2(Node* node, ApplyShareInputContext *ctxt, bool fPop)
+shareinput_mutator_xslice_2(Node* node, PlannerGlobal *glob, bool fPop)
 {
+	ApplyShareInputContext *ctxt = &glob->share;
 	Plan	   *plan = (Plan *) node;
 
 	if (fPop)
@@ -2129,8 +2299,9 @@ shareinput_mutator_xslice_2(Node* node, ApplyShareInputContext *ctxt, bool fPop)
  * 	2. Bulid a list of QD slices
  */
 static bool
-shareinput_mutator_xslice_3(Node *node, ApplyShareInputContext *ctxt, bool fPop)
+shareinput_mutator_xslice_3(Node *node, PlannerGlobal *glob, bool fPop)
 {
+	ApplyShareInputContext *ctxt = &glob->share;
 	Plan *plan = (Plan *) node;
 
 	if(fPop)
@@ -2179,8 +2350,8 @@ shareinput_mutator_xslice_3(Node *node, ApplyShareInputContext *ctxt, bool fPop)
 
 		if(list_member_int(ctxt->qdShares, sisc->share_id))
 		{
-			Assert(sisc->plan.flow);
-			Assert(sisc->plan.flow->flotype == FLOW_SINGLETON);
+			Assert(sisc->scan.plan.flow);
+			Assert(sisc->scan.plan.flow->flotype == FLOW_SINGLETON);
 			ctxt->qdSlices = list_append_unique_int(ctxt->qdSlices, motId);
 		}
 	}
@@ -2192,8 +2363,9 @@ shareinput_mutator_xslice_3(Node *node, ApplyShareInputContext *ctxt, bool fPop)
  * this share must be on QD.  Move them to QD.
  */
 static bool
-shareinput_mutator_xslice_4(Node *node, ApplyShareInputContext *ctxt, bool fPop)
+shareinput_mutator_xslice_4(Node *node, PlannerGlobal *glob, bool fPop)
 {
+	ApplyShareInputContext *ctxt = &glob->share;
 	Plan *plan = (Plan *) node;
 	int motId = shareinput_peekmot(ctxt);
 
@@ -2226,43 +2398,6 @@ shareinput_mutator_xslice_4(Node *node, ApplyShareInputContext *ctxt, bool fPop)
 	return true;
 }
 
-static void gpmon_pushplannode(ApplyShareInputContext *ctxt, Plan *plan)
-{
-	ctxt->planNodes = lcons(plan, ctxt->planNodes);
-}
-static void gpmon_popplannode(ApplyShareInputContext *ctxt)
-{
-	list_delete_first(ctxt->planNodes);
-}
-static Plan *gpmon_peekplannode(ApplyShareInputContext *ctxt)
-{
-	return ctxt->planNodes == NULL ? NULL : linitial(ctxt->planNodes);
-}
-
-static bool assign_plannode_id_walker(Node *node, ApplyShareInputContext *ctxt, bool fPop)
-{
-	Plan *p = (Plan *) node;
-	Plan *parent;
-
-	if(fPop)
-	{
-		gpmon_popplannode(ctxt);
-		return false;
-	}
-
-	p->plan_node_id = ++ctxt->nextPlanId;
-
-	parent = gpmon_peekplannode(ctxt);
-
-	if(!parent)
-		p->plan_parent_node_id = -1;
-	else
-		p->plan_parent_node_id = parent->plan_node_id;
-
-	gpmon_pushplannode(ctxt, p);
-	return true;
-}
-
 Plan *
 apply_shareinput_xslice(Plan *plan, PlannerGlobal *glob)
 {
@@ -2274,7 +2409,6 @@ apply_shareinput_xslice(Plan *plan, PlannerGlobal *glob)
 	ctxt->motStack = NULL;
 	ctxt->qdShares = NULL;
 	ctxt->qdSlices = NULL;
-	ctxt->planNodes = NIL;
 	ctxt->nextPlanId = 0;
 
 	shareinput_pushmot(ctxt, 0);
@@ -2294,31 +2428,31 @@ apply_shareinput_xslice(Plan *plan, PlannerGlobal *glob)
 	foreach (lp, glob->subplans)
 	{
 		Plan	   *subplan = (Plan *) lfirst(lp);
-		shareinput_walker(shareinput_mutator_xslice_1, (Node *) subplan, ctxt);
+		shareinput_walker(shareinput_mutator_xslice_1, (Node *) subplan, glob);
 	}
-	shareinput_walker(shareinput_mutator_xslice_1, (Node *) plan, ctxt);
+	shareinput_walker(shareinput_mutator_xslice_1, (Node *) plan, glob);
 
 	/* Now walk the tree again, and process all the consumers. */
 	foreach (lp, glob->subplans)
 	{
 		Plan	   *subplan = (Plan *) lfirst(lp);
-		shareinput_walker(shareinput_mutator_xslice_2, (Node *) subplan, ctxt);
+		shareinput_walker(shareinput_mutator_xslice_2, (Node *) subplan, glob);
 	}
-	shareinput_walker(shareinput_mutator_xslice_2, (Node *) plan, ctxt);
+	shareinput_walker(shareinput_mutator_xslice_2, (Node *) plan, glob);
 
 	foreach (lp, glob->subplans)
 	{
 		Plan	   *subplan = (Plan *) lfirst(lp);
-		shareinput_walker(shareinput_mutator_xslice_3, (Node *) subplan, ctxt);
+		shareinput_walker(shareinput_mutator_xslice_3, (Node *) subplan, glob);
 	}
-	shareinput_walker(shareinput_mutator_xslice_3, (Node *) plan, ctxt);
+	shareinput_walker(shareinput_mutator_xslice_3, (Node *) plan, glob);
 
 	foreach (lp, glob->subplans)
 	{
 		Plan	   *subplan = (Plan *) lfirst(lp);
-		shareinput_walker(shareinput_mutator_xslice_4, (Node *) subplan, ctxt);
+		shareinput_walker(shareinput_mutator_xslice_4, (Node *) subplan, glob);
 	}
-	shareinput_walker(shareinput_mutator_xslice_4, (Node *) plan, ctxt);
+	shareinput_walker(shareinput_mutator_xslice_4, (Node *) plan, glob);
 
 	return plan;
 }
@@ -2328,16 +2462,16 @@ apply_shareinput_xslice(Plan *plan, PlannerGlobal *glob)
  */
 void assign_plannode_id(PlannedStmt *stmt)
 {
-	ApplyShareInputContext ctxt;
+	assign_plannode_id_walker_context ctxt;
 
 	/* We only care about planNodes and nextPlanId, so initialize them. */
 	ctxt.planNodes = NIL;
 	ctxt.nextPlanId = 0;
-	
-	leftdeep_walker(assign_plannode_id_walker, (Node *) stmt->planTree, &ctxt);
-	
+
+	assign_plannode_id_walker((Node *) stmt->planTree, &ctxt);
+
 	ctxt.planNodes = NIL;
-	
+
 	ListCell *lc = NULL;
 	foreach (lc, stmt->subplans)
 	{
@@ -2346,7 +2480,7 @@ void assign_plannode_id(PlannedStmt *stmt)
 
 		ctxt.planNodes = NIL;
 
-		leftdeep_walker(assign_plannode_id_walker, (Node *) subplan, &ctxt);
+		assign_plannode_id_walker((Node *) subplan, &ctxt);
 	}
 }
 
@@ -2586,7 +2720,9 @@ static bool find_params_walker(Node *node, find_params_context *context)
  * Remove unused initplans. This may happen if an initplan has been created, but
  * its corresponding param has been removed because of contradiction detection
  */
-static void remove_unused_initplans_helper(Plan *plan, Bitmapset **usedParams, Bitmapset *rte_params)
+static void
+remove_unused_initplans_helper(Plan *plan, Bitmapset **usedParams, Bitmapset *rte_params,
+							   PlannerInfo *root)
 {
 	if (NULL == plan || IsA(plan, ValuesScan) || IsA(plan, FunctionScan))
 	{
@@ -2603,7 +2739,7 @@ static void remove_unused_initplans_helper(Plan *plan, Bitmapset **usedParams, B
 
 		foreach(lc, l)
 		{
-			remove_unused_initplans_helper(lfirst(lc), usedParams, rte_params);
+			remove_unused_initplans_helper(lfirst(lc), usedParams, rte_params, root);
 		}
 
 		return;
@@ -2697,17 +2833,17 @@ static void remove_unused_initplans_helper(Plan *plan, Bitmapset **usedParams, B
 	if (IsA(plan, Append))
 	{
 		Append *app = (Append *) plan;
-		remove_unused_initplans_helper((Plan *) app->appendplans, &(context.paramids), rte_params);
+		remove_unused_initplans_helper((Plan *) app->appendplans, &(context.paramids), rte_params, root);
 	}
 	else if (IsA(plan, SubqueryScan))
 	{
 		SubqueryScan *subq = (SubqueryScan *) plan;
-		remove_unused_initplans_helper(subq->subplan, &(context.paramids), rte_params);
+		remove_unused_initplans_helper(subq->subplan, &(context.paramids), rte_params, root);
 	}
 	else
 	{
-		remove_unused_initplans_helper(plan->lefttree, &(context.paramids), rte_params);
-		remove_unused_initplans_helper(plan->righttree, &(context.paramids), rte_params);
+		remove_unused_initplans_helper(plan->lefttree, &(context.paramids), rte_params, root);
+		remove_unused_initplans_helper(plan->righttree, &(context.paramids), rte_params, root);
 	}
 
 	if (NIL != plan->initPlan)
@@ -2740,7 +2876,25 @@ static void remove_unused_initplans_helper(Plan *plan, Bitmapset **usedParams, B
 			if (anyused)
 				newInitPlans = lappend(newInitPlans, initplan);
 			else
-				elog(DEBUG2, "removing unused InitPlan %s", initplan->plan_name);
+			{
+				/*
+				 * This init plan is unused. Leave it out of this plan node's
+				 * initPlan list, and also replace it in the global list of
+				 * subplans with a dummy. (We can't just remove it from the global
+				 * list, because that would screw up the plan_id numbering
+				 * of the subplans).
+				 */
+				ListCell *plancell = list_nth_cell(root->glob->subplans, initplan->plan_id-1);
+				ListCell *rtablecell = list_nth_cell(root->glob->subrtables, initplan->plan_id-1);
+				Plan *subplan = (Plan *) lfirst(plancell);
+
+				lfirst(plancell) = make_result(root, subplan->targetlist,
+											   (Node *) list_make1(makeBoolConst(false, false)),
+											   NULL);;
+				lfirst(rtablecell) = NIL;
+
+				pfree(initplan);
+			}
 		}
 
 		/* remove unused params */
@@ -2827,7 +2981,7 @@ void remove_unused_initplans(Plan *plan, PlannerInfo *root)
 
 	/* now do the actual cleanup */
 	Bitmapset *params = NULL;
-	remove_unused_initplans_helper(plan, &params, rte_params);
+	remove_unused_initplans_helper(plan, &params, rte_params, root);
 	bms_free(params);
 	bms_free(rte_params);
 }
@@ -2847,15 +3001,20 @@ planner_make_plan_constant(struct PlannerInfo *root, Node *n, bool is_SRI)
  * Evaluate functions to constants.
  */
 Node *
-exec_make_plan_constant(struct PlannedStmt *stmt, bool is_SRI)
+exec_make_plan_constant(struct PlannedStmt *stmt, bool is_SRI, List **cursorPositions)
 {
 	pre_dispatch_function_evaluation_context pcontext;
+	Node	   *result;
 
 	Assert(stmt);
 	exec_init_plan_tree_base(&pcontext.base, stmt);
 	pcontext.single_row_insert = is_SRI;
+	pcontext.cursorPositions = NIL;
+
+	result = pre_dispatch_function_evaluation_mutator((Node *) stmt->planTree, &pcontext);
 
-	return plan_tree_mutator((Node *)stmt->planTree, pre_dispatch_function_evaluation_mutator, &pcontext);
+	*cursorPositions = pcontext.cursorPositions;
+	return result;
 }
 
 /*
@@ -3147,23 +3306,32 @@ pre_dispatch_function_evaluation_mutator(Node *node,
 	else if (IsA(node, CurrentOfExpr))
 	{
 		/*
-		 * updatable cursors 
+		 * updatable cursors
 		 *
-		 * During constant folding, the CurrentOfExpr's gp_segment_id, ctid, 
-		 * and tableoid fields are filled in with observed values from the 
-		 * referenced cursor. For more detail, see bindCurrentOfParams below.
+		 * During constant folding, we collect the current position of
+		 * each cursor mentioned in the plan into a list, and dispatch
+		 * them to the QEs.
 		 */
-		CurrentOfExpr *expr = (CurrentOfExpr *) node,
-					  *newexpr = copyObject(expr);
-
-		bindCurrentOfParams(newexpr->cursor_name,
-							newexpr->target_relid,
-			   		   		&newexpr->ctid,
-					  	   	&newexpr->gp_segment_id,
-					  	   	&newexpr->tableoid);
-		return (Node *) newexpr;
+		CurrentOfExpr *expr = (CurrentOfExpr *) node;
+		CursorPosInfo *cpos;
+
+		cpos = makeNode(CursorPosInfo);
+		cpos->cursor_name = expr->cursor_name;
+
+		/*
+		 * Passing a NULL econtext is Ok in this instance since getCurrentOf()
+		 * will pull out the cursor name from the CurrentOfExpr node.
+		 */
+		getCurrentOf(expr,
+					 NULL /* econtext */,
+					 expr->target_relid,
+					 &cpos->ctid,
+					 &cpos->gp_segment_id,
+					 &cpos->table_oid);
+
+		context->cursorPositions = lappend(context->cursorPositions, cpos);
 	}
-	
+
 	/*
 	 * For any node type not handled above, we recurse using
 	 * plan_tree_mutator, which will copy the node unchanged but try to
@@ -3175,147 +3343,3 @@ pre_dispatch_function_evaluation_mutator(Node *node,
 
 	return new_node;
 }
-
-/*
- * bindCurrentOfParams
- *
- * During constant folding, we evaluate STABLE functions to give QEs a consistent view
- * of the query. At this stage, we will also bind observed values of 
- * gp_segment_id/ctid/tableoid into the CurrentOfExpr.
- * This binding must happen only after planning, otherwise we disrupt prepared statements.
- * Furthermore, this binding must occur before dispatch, because a QE lacks the 
- * the information needed to discern whether it's responsible for the currently 
- * positioned tuple.
- *
- * The design of this parameter binding is very tightly bound to the parse/analyze
- * and subsequent planning of DECLARE CURSOR. We depend on the "is_simply_updatable"
- * calculation of parse/analyze to decide whether CURRENT OF makes sense for the
- * referenced cursor. Moreover, we depend on the ensuing planning of DECLARE CURSOR
- * to provide the junk metadata of gp_segment_id/ctid/tableoid (per tuple).
- *
- * This function will lookup the portal given by "cursor_name". If it's simply updatable,
- * we'll glean gp_segment_id/ctid/tableoid from the portal's most recently fetched 
- * (raw) tuple. We bind this information into the CurrentOfExpr to precisely identify
- * the currently scanned tuple, ultimately for consumption of TidScan/execQual by the QEs.
- */
-static void
-bindCurrentOfParams(char *cursor_name, Oid target_relid, ItemPointer ctid, int *gp_segment_id, Oid *tableoid)
-{
-	char *table_name;
-	Portal portal;
-	QueryDesc *queryDesc;
-	AttrNumber gp_segment_id_attno;
-	AttrNumber ctid_attno;
-	AttrNumber tableoid_attno;
-	bool isnull;
-	Datum value;
-
-	portal = GetPortalByName(cursor_name);
-	if (!PortalIsValid(portal))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_CURSOR_STATE),
-				 errmsg("cursor \"%s\" does not exist", cursor_name)));
-
-	queryDesc = PortalGetQueryDesc(portal);
-	if (queryDesc == NULL)
-		ereport(ERROR, 
-				(errcode(ERRCODE_INVALID_CURSOR_STATE),
-				 errmsg("cursor \"%s\" is held from a previous transaction", cursor_name)));
-
-	/* obtain table_name for potential error messages */
-	table_name = get_rel_name(target_relid);
-
-	/* 
-	 * The referenced cursor must be simply updatable. This has already
-	 * been discerned by parse/analyze for the DECLARE CURSOR of the given
-	 * cursor. This flag assures us that gp_segment_id, ctid, and tableoid (if necessary)
- 	 * will be available as junk metadata, courtesy of preprocess_targetlist.
-	 */
-	if (!portal->is_simply_updatable)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_CURSOR_STATE),
-				 errmsg("cursor \"%s\" is not a simply updatable scan of table \"%s\"",
-						cursor_name, table_name)));
-
-	/* 
-	 * The target relation must directly match the cursor's relation. This throws out
-	 * the simple case in which a cursor is declared against table X and the update is
-	 * issued against Y. Moreover, this disallows some subtler inheritance cases where
-	 * Y inherits from X. While such cases could be implemented, it seems wiser to
-	 * simply error out cleanly.
-	 */
-	Index varno = extractSimplyUpdatableRTEIndex(queryDesc->plannedstmt->rtable);
-	Oid cursor_relid = getrelid(varno, queryDesc->plannedstmt->rtable);
-	if (target_relid != cursor_relid)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_CURSOR_STATE),
-				 errmsg("cursor \"%s\" is not a simply updatable scan of table \"%s\"",
-						cursor_name, table_name)));
-	/* 
-	 * The cursor must have a current result row: per the SQL spec, it's 
-	 * an error if not.
-	 */
-	if (portal->atStart || portal->atEnd)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_CURSOR_STATE),
-				 errmsg("cursor \"%s\" is not positioned on a row", cursor_name)));
-
-	/*
-	 * As mentioned above, if parse/analyze recognized this cursor as simply
-	 * updatable during DECLARE CURSOR, then its subsequent planning must have
-	 * made gp_segment_id, ctid, and tableoid available as junk for each tuple.
-	 *
-	 * To retrieve this junk metadeta, we leverage the EState's junkfilter against
-	 * the raw tuple yielded by the highest most node in the plan.
-	 */
-	TupleTableSlot *slot = queryDesc->planstate->ps_ResultTupleSlot;
-	Insist(!TupIsNull(slot));
-	Assert(queryDesc->estate->es_junkFilter);
-
-	/* extract gp_segment_id metadata */
-	gp_segment_id_attno = ExecFindJunkAttribute(queryDesc->estate->es_junkFilter, "gp_segment_id");
-	if (!AttributeNumberIsValid(gp_segment_id_attno))
-		elog(ERROR, "could not find junk gp_segment_id column");
-	value = ExecGetJunkAttribute(slot, gp_segment_id_attno, &isnull);
-	if (isnull)
-		elog(ERROR, "gp_segment_id is NULL");
-	*gp_segment_id = DatumGetInt32(value);
-
-	/* extract ctid metadata */
-	ctid_attno = ExecFindJunkAttribute(queryDesc->estate->es_junkFilter, "ctid");
-	if (!AttributeNumberIsValid(ctid_attno))
-		elog(ERROR, "could not find junk ctid column");
-	value = ExecGetJunkAttribute(slot, ctid_attno, &isnull);
-	if (isnull)
-		elog(ERROR, "ctid is NULL");
-	ItemPointerCopy(DatumGetItemPointer(value), ctid);
-
-	/* 
-	 * extract tableoid metadata
-	 *
-	 * DECLARE CURSOR planning only includes tableoid metadata when
-	 * scrolling a partitioned table, as this is the only case in which
-	 * gp_segment_id/ctid alone do not suffice to uniquely identify a tuple.
-	 */
-	tableoid_attno = ExecFindJunkAttribute(queryDesc->estate->es_junkFilter, "tableoid");
-	if (AttributeNumberIsValid(tableoid_attno))
-	{
-		value = ExecGetJunkAttribute(slot, tableoid_attno, &isnull);
-		if (isnull)
-			elog(ERROR, "tableoid is NULL");
-		*tableoid = DatumGetObjectId(value);
-
-		/*
-		 * This is our last opportunity to verify that the physical table given
-		 * by tableoid is, indeed, simply updatable.
-		 */
-		if (!isSimplyUpdatableRelation(*tableoid))
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("%s is not updatable",
-							get_rel_name_partition(*tableoid))));
-	} else
-		*tableoid = InvalidOid;
-
-	pfree(table_name);
-}
diff --git a/src/backend/cdb/cdbpartindex.c b/src/backend/cdb/cdbpartindex.c
index df88228c91e4..52a095a850f3 100644
--- a/src/backend/cdb/cdbpartindex.c
+++ b/src/backend/cdb/cdbpartindex.c
@@ -18,6 +18,7 @@
 #include "catalog/pg_partition_encoding.h"
 #include "catalog/pg_partition_rule.h"
 #include "cdb/cdbpartition.h"
+#include "cdb/partitionselection.h"
 #include "cdb/cdbvars.h"
 #include "commands/tablecmds.h"
 #include "nodes/makefuncs.h"
diff --git a/src/backend/cdb/cdbpartition.c b/src/backend/cdb/cdbpartition.c
index 7393a0f8a293..054353f0f0dc 100644
--- a/src/backend/cdb/cdbpartition.c
+++ b/src/backend/cdb/cdbpartition.c
@@ -41,6 +41,7 @@
 #include "parser/parse_partition.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
+#include "parser/parse_utilcmd.h"
 #include "tcop/utility.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
@@ -6695,21 +6696,14 @@ atpxPartAddList(Relation rel,
 		bool			 bFirst_TemplateOnly = true;   /* ignore dummy entry */
 		int				 pby_templ_depth	 = 0;	   /* template partdepth */
 		Oid				 skipTableRelid		 = InvalidOid;
-		List			*attr_encodings		 = NIL;
-
-		/* this parse_analyze expands the phony create of a partitioned table
-		 * that we just build into the constituent commands we need to create
-		 * the new part.  (This will include some commands for the parent that
-		 * we don't need, since the parent already exists.)
-		 */
-
-		l1 = parse_analyze((Node *)ct, NULL, NULL, 0);
 
 		/*
-		 * Must reference ct->attr_encodings after parse_analyze() since that
-		 * stage by change the attribute encodings via expansion.
+		 * This transformCreateStmt() expands the phony create of a partitioned
+		 * table that we just build into the constituent commands we need to create
+		 * the new part.  (This will include some commands for the parent that we
+		 * don't need, since the parent already exists.)
 		 */
-		attr_encodings = ct->attr_encodings;
+		l1 = transformCreateStmt(ct, "ADD PARTITION", true);
 
 		/*
 		 * Look for the first CreateStmt and generate a GrantStmt
@@ -6723,16 +6717,14 @@ atpxPartAddList(Relation rel,
 			if (lc == list_head(l1))
 				continue;
 
-			if (IsA(s, Query) && IsA(((Query *)s)->utilityStmt, CreateStmt))
+			if (IsA(s, CreateStmt))
 			{
 				HeapTuple tuple;
 				Datum aclDatum;
 				bool isNull;
-				CreateStmt *t = (CreateStmt *)((Query *)s)->utilityStmt;
+				CreateStmt *t = (CreateStmt *) s;
 				cqContext	*classcqCtx;
 
-				t->attr_encodings = copyObject(attr_encodings);
-
 				classcqCtx = caql_beginscan(
 						NULL,
 						cql("SELECT * FROM pg_class "
@@ -6777,7 +6769,6 @@ atpxPartAddList(Relation rel,
 					if (list_length(cp))
 					{
 						GrantStmt *gs = makeNode(GrantStmt);
-						List *pt;
 
 						gs->is_grant = true;
 						gs->objtype = ACL_OBJECT_RELATION;
@@ -6785,8 +6776,7 @@ atpxPartAddList(Relation rel,
 
 						gs->objects = list_make1(copyObject(t->relation));
 
-						pt = parse_analyze((Node *)gs, NULL, NULL, 0);
-						l1 = list_concat(l1, pt);
+						l1 = lappend(l1, gs);
 					}
 				}
 
@@ -6807,9 +6797,9 @@ atpxPartAddList(Relation rel,
 			/* MPP-10421: but save the relid of the skipped table,
 			 * because we skip indexes associated with it...
 			 */
-			if (IsA(s, Query) && IsA(((Query *)s)->utilityStmt, CreateStmt))
+			if (IsA(s, CreateStmt))
 			{
-				CreateStmt *t = (CreateStmt *)((Query *)s)->utilityStmt;
+				CreateStmt *t = (CreateStmt *) s;
 
 				skipTableRelid = RangeVarGetRelid(t->relation, true);
 			}
@@ -6818,7 +6808,7 @@ atpxPartAddList(Relation rel,
 
 		for_each_cell(lc, lnext(lc))
 		{
-			Query *q = lfirst(lc);
+			Node *q = lfirst(lc);
 
 			/*
 			 * MPP-6379, MPP-10421: If the statement is an expanded
@@ -6827,9 +6817,9 @@ atpxPartAddList(Relation rel,
 			 * parent has one or more indexes on it that our new
 			 * partition is inheriting.
 			 */
-			if (IsA(q->utilityStmt, IndexStmt))
+			if (IsA(q, IndexStmt))
 			{
-				IndexStmt *istmt	 = (IndexStmt *)q->utilityStmt;
+				IndexStmt *istmt	 = (IndexStmt *)q;
 				Oid		   idxRelid	 = RangeVarGetRelid(istmt->relation, true);
 
 				if (idxRelid == RelationGetRelid(rel))
@@ -6843,8 +6833,7 @@ atpxPartAddList(Relation rel,
 			/* XXX XXX: fix the first Alter Table Statement to have
 			 * the correct maxpartno.  Whoohoo!!
 			 */
-			if (bFixFirstATS && q && q->utilityStmt
-				&& IsA(q->utilityStmt, AlterTableStmt))
+			if (bFixFirstATS && q && IsA(q, AlterTableStmt))
 			{
 				PartitionSpec	*spec = NULL;
 				AlterTableStmt	*ats;
@@ -6853,7 +6842,7 @@ atpxPartAddList(Relation rel,
 
 				bFixFirstATS = false;
 
-				ats = (AlterTableStmt *)q->utilityStmt;
+				ats = (AlterTableStmt *) q;
 				Assert(IsA(ats, AlterTableStmt));
 
 				cmds = ats->cmds;
@@ -6885,17 +6874,17 @@ atpxPartAddList(Relation rel,
 				}
 
 			} /* end first alter table fixup */
-			else if (IsA(q->utilityStmt, CreateStmt))
+			else if (IsA(q, CreateStmt))
 			{
 				/* propagate owner */
-				((CreateStmt *)q->utilityStmt)->ownerid = ownerid;
+				((CreateStmt *) q)->ownerid = ownerid;
 			}
 
 			/* normal case - add partitions using CREATE statements
 			 * that get dispatched to the segments
 			 */
 			if (!bSetTemplate)
-				ProcessUtility(q->utilityStmt,
+				ProcessUtility(q,
 							   synthetic_sql,
 							   NULL,
 							   false, /* not top level */
@@ -6909,10 +6898,9 @@ atpxPartAddList(Relation rel,
 				 * build the catalog entries for subpartition
 				 * templates, not "real" table entries.
 				 */
-				if (q && q->utilityStmt
-					&& IsA(q->utilityStmt, AlterTableStmt))
+				if (IsA(q, AlterTableStmt))
 				{
-					AlterTableStmt *at2 = (AlterTableStmt *)q->utilityStmt;
+					AlterTableStmt *at2 = (AlterTableStmt *) q;
 					List *l2 = at2->cmds;
 					ListCell *lc2;
 
diff --git a/src/backend/cdb/cdbpath.c b/src/backend/cdb/cdbpath.c
index 89326d58a6e3..72218d8cb345 100644
--- a/src/backend/cdb/cdbpath.c
+++ b/src/backend/cdb/cdbpath.c
@@ -1228,7 +1228,6 @@ cdbpath_dedup_fixup_unique(UniquePath *uniquePath, CdbpathDedupFixupContext *ctx
 		}
     }
 
-    Assert(ctid_exprs);
     uniquePath->distinct_on_exprs = list_concat(ctid_exprs, other_vars);
 	uniquePath->distinct_on_eq_operators = list_concat(ctid_operators, other_operators);
 
@@ -1390,6 +1389,14 @@ cdbpath_dedup_fixup_append(AppendPath *appendPath, CdbpathDedupFixupContext *ctx
     int         ncol;
     bool        save_need_subplan_id = ctx->need_subplan_id;
 
+	/*
+	 * The planner creates dummy AppendPaths with no subplans, if it can
+	 * eliminate a relation altogther with constraint exclusion. We have
+	 * nothing to do for those.
+	 */
+	if (appendPath->subpaths == NIL)
+		return;
+
     Assert(!ctx->rowid_vars);
 
     /* Make a working copy of the set of relids for which row ids are needed. */
diff --git a/src/backend/cdb/cdbpathlocus.c b/src/backend/cdb/cdbpathlocus.c
index 642e6908b266..fa3ebe74ee7a 100644
--- a/src/backend/cdb/cdbpathlocus.c
+++ b/src/backend/cdb/cdbpathlocus.c
@@ -404,13 +404,13 @@ cdbpathlocus_from_subquery(struct PlannerInfo  *root,
             List       *eq = list_make1(makeString("="));
             foreach(hashexprcell, flow->hashExpr)
             {
-                Expr           *expr = (Expr *)lfirst(hashexprcell);
+                Node	   *expr = (Node *) lfirst(hashexprcell);
                 TargetEntry    *tle;
                 Var            *var;
                 PathKey        *pathkey;
 
                 /* Look for hash key expr among the subquery result columns. */
-                tle = tlist_member_ignoring_RelabelType(expr, subqplan->targetlist);
+                tle = tlist_member_ignore_relabel(expr, subqplan->targetlist);
                 if (!tle)
                     break;
 
diff --git a/src/backend/cdb/cdbpathtoplan.c b/src/backend/cdb/cdbpathtoplan.c
index 1f92e91a607f..f0f90b0c9e45 100644
--- a/src/backend/cdb/cdbpathtoplan.c
+++ b/src/backend/cdb/cdbpathtoplan.c
@@ -182,7 +182,7 @@ cdbpathtoplan_create_motion_plan(PlannerInfo   *root,
 			{
 				List *tlist = copyObject(subplan->targetlist);
 
-				subplan = (Plan *) make_result(tlist, NULL, subplan);
+				subplan = (Plan *) make_result(root, tlist, NULL, subplan);
 			}
 			subplan->targetlist = add_to_flat_tlist(subplan->targetlist,
 													hashExpr,
diff --git a/src/backend/cdb/cdbpersistentbuild.c b/src/backend/cdb/cdbpersistentbuild.c
index 508e8169507a..a6771b859368 100755
--- a/src/backend/cdb/cdbpersistentbuild.c
+++ b/src/backend/cdb/cdbpersistentbuild.c
@@ -466,7 +466,8 @@ static void PersistentBuild_PopulateGpRelationNode(
 			gp_relation_node,
 			gp_relation_node_index,
 			indexInfo,
-			false);
+			false,
+			true);
 
 	DirectOpen_GpRelationNodeIndexClose(gp_relation_node_index);
 
@@ -591,6 +592,7 @@ PersistentBuild_BuildDb(
 	info = DatabaseInfo_Collect(
 							dbOid,
 							defaultTablespace,
+							/* snapshot */ NULL,
 							/* collectGpRelationNodeInfo */ false,
 							/* collectAppendOnlyCatalogSegmentInfo */ true,
 							/* scanFileSystem */ true);
@@ -639,7 +641,7 @@ PersistentBuild_BuildDb(
 	 * GUC, lets do a checkpoint to force out all buffer pool pages so we never
 	 * try to redo those XLOG records in Crash Recovery.
 	 */
-	CreateCheckPoint(false, true);
+	CreateCheckPoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
 
 	return count;
 }
diff --git a/src/backend/cdb/cdbpullup.c b/src/backend/cdb/cdbpullup.c
index 2f452db87e31..86a952f92785 100644
--- a/src/backend/cdb/cdbpullup.c
+++ b/src/backend/cdb/cdbpullup.c
@@ -98,7 +98,7 @@ cdbpullup_colIdx(struct Plan   *plan,
             Assert(subtle);
 
             /* Look for matching expr in the given plan's targetlist. */
-            tle = tlist_member_ignoring_RelabelType(subtle->expr, plan->targetlist);
+            tle = tlist_member_ignore_relabel((Node *) subtle->expr, plan->targetlist);
         }
 
         /* Quit if the plan's projection doesn't include this column. */
@@ -399,7 +399,7 @@ cdbpullup_findPathKeyExprInTargetList(PathKey *item, List *targetlist)
 			{
 				TargetEntry *tle;
 
-				tle = tlist_member_ignoring_RelabelType(key, targetlist);
+				tle = tlist_member_ignore_relabel((Node *) key, targetlist);
 				if (tle)
 					return key;
 			}
@@ -494,17 +494,17 @@ cdbpullup_isExprCoveredByTargetlist(Expr *expr, List *targetlist)
     {
         foreach(cell, (List *)expr)
         {
-            Expr   *item = (Expr *)lfirst(cell);
+            Node	   *item = (Node *) lfirst(cell);
 
             /* The whole expr or all of its Vars must be in targetlist. */
-            if (!tlist_member_ignoring_RelabelType(item, targetlist) &&
-                cdbpullup_missingVarWalker((Node *)item, targetlist))
+            if (!tlist_member_ignore_relabel(item, targetlist) &&
+                cdbpullup_missingVarWalker(item, targetlist))
                 return false;
         }
     }
 
     /* The whole expr or all of its Vars must be in targetlist. */
-    else if (!tlist_member_ignoring_RelabelType(expr, targetlist) &&
+    else if (!tlist_member_ignore_relabel((Node *) expr, targetlist) &&
              cdbpullup_missingVarWalker((Node *)expr, targetlist))
         return false;
 
@@ -599,7 +599,7 @@ cdbpullup_missingVarWalker(Node *node, void *targetlist)
         /* is targetlist a List of TargetEntry? */
         if (IsA(linitial(targetlist), TargetEntry))
         {
-            if (tlist_member_ignoring_RelabelType((Expr *)node, (List *)targetlist))
+            if (tlist_member_ignore_relabel(node, (List *) targetlist))
                 return false;   /* this Var ok - go on to check rest of expr */
         }
 
diff --git a/src/backend/cdb/cdbresynchronizechangetracking.c b/src/backend/cdb/cdbresynchronizechangetracking.c
index 8a7abfa0760a..f8311dfd298c 100644
--- a/src/backend/cdb/cdbresynchronizechangetracking.c
+++ b/src/backend/cdb/cdbresynchronizechangetracking.c
@@ -600,7 +600,8 @@ void ChangeTracking_GetRelationChangeInfoFromXlog(
 		 * The following changes must be logged in the change log.
 		 */
 		case RM_HEAP2_ID:
-			switch (info)
+			op = info & XLOG_HEAP_OPMASK;
+			switch (op)
 			{
 				case XLOG_HEAP2_FREEZE:
 				{
@@ -616,6 +617,21 @@ void ChangeTracking_GetRelationChangeInfoFromXlog(
 													   xlrec->heapnode.persistentSerialNum);
 					break;
 				}
+				case XLOG_HEAP2_CLEAN:
+				case XLOG_HEAP2_CLEAN_MOVE:
+				{
+					xl_heap_clean *xlrec = (xl_heap_clean *) data;
+
+					ChangeTracking_AddRelationChangeInfo(
+													   relationChangeInfoArray,
+													   relationChangeInfoArrayCount,
+													   relationChangeInfoMaxSize,
+													   &(xlrec->heapnode.node),
+													   xlrec->block,
+													   &xlrec->heapnode.persistentTid,
+													   xlrec->heapnode.persistentSerialNum);
+					break;
+				}
 				default:
 					elog(ERROR, "internal error: unsupported RM_HEAP2_ID op (%u) in ChangeTracking_GetRelationChangeInfoFromXlog", info);
 			}
@@ -652,6 +668,7 @@ void ChangeTracking_GetRelationChangeInfoFromXlog(
 													   xlrec->target.persistentSerialNum);
 					break;
 				}
+				case XLOG_HEAP_HOT_UPDATE:
 				case XLOG_HEAP_UPDATE:
 				case XLOG_HEAP_MOVE:
 				{
@@ -682,20 +699,6 @@ void ChangeTracking_GetRelationChangeInfoFromXlog(
 						
 					break;
 				}
-				case XLOG_HEAP_CLEAN:
-				{
-					xl_heap_clean *xlrec = (xl_heap_clean *) data;
-
-					ChangeTracking_AddRelationChangeInfo(
-													   relationChangeInfoArray,
-													   relationChangeInfoArrayCount,
-													   relationChangeInfoMaxSize,
-													   &(xlrec->heapnode.node),
-													   xlrec->block,
-													   &xlrec->heapnode.persistentTid,
-													   xlrec->heapnode.persistentSerialNum);
-					break;
-				}
 				case XLOG_HEAP_NEWPAGE:
 				{
 					xl_heap_newpage *xlrec = (xl_heap_newpage *) data;
@@ -1926,12 +1929,14 @@ static void ChangeTracking_RenameLogFile(CTFType source, CTFType dest)
 
 static void ChangeTracking_DropLogFile(CTFType ftype)
 {
-	File	file;
+	char	path[MAXPGPATH];
 
 	Assert(ftype != CTF_META);
-	
-	file = ChangeTracking_OpenFile(ftype);
-	FileUnlink(file);
+
+	ChangeTracking_SetPathByType(ftype, path);
+
+	if (unlink(path))
+		elog(LOG, "could not unlink file \"%s\": %m", path);
 }
 
 static void ChangeTracking_DropLogFiles(void)
@@ -1948,19 +1953,20 @@ static void ChangeTracking_DropLogFiles(void)
 
 static void ChangeTracking_DropMetaFile(void)
 {
-	File	file;
+	char	path[MAXPGPATH];
 
-	file = ChangeTracking_OpenFile(CTF_META);
-	
 	changeTrackingResyncMeta->resync_mode_full = false;
 	setFullResync(changeTrackingResyncMeta->resync_mode_full);
 	changeTrackingResyncMeta->resync_lsn_end.xlogid = 0;
 	changeTrackingResyncMeta->resync_lsn_end.xrecoff = 0;
 	changeTrackingResyncMeta->resync_transition_completed = false;
 	changeTrackingResyncMeta->insync_transition_completed = false;
-	
-	/* delete the change tracking meta file*/
-	FileUnlink(file);	
+
+	/* Delete the change tracking meta file */
+	ChangeTracking_SetPathByType(CTF_META, path);
+
+	if (unlink(path))
+		elog(WARNING, "could not unlink file \"%s\": %m", path);
 }
 
 /*
diff --git a/src/backend/cdb/cdbsubplan.c b/src/backend/cdb/cdbsubplan.c
index 896cd460f3e0..0d81ab5bcbd9 100644
--- a/src/backend/cdb/cdbsubplan.c
+++ b/src/backend/cdb/cdbsubplan.c
@@ -72,7 +72,7 @@ preprocess_initplans(QueryDesc *queryDesc)
 	int			originalSlice,
 				rootIndex;
 
-	if (queryDesc->plannedstmt->nCrossLevelParams == 0)
+	if (queryDesc->plannedstmt->nParamExec == 0)
 		return;
 
 	originalPli = queryDesc->params;
@@ -87,7 +87,7 @@ preprocess_initplans(QueryDesc *queryDesc)
 	 * order, i.e. if a subplan x has a sublan y, then y will come before x in
 	 * the es_param_exec_vals array.
 	 */
-	for (i = 0; i < queryDesc->plannedstmt->nCrossLevelParams; i++)
+	for (i = 0; i < queryDesc->plannedstmt->nParamExec; i++)
 	{
 		ParamExecData *prm;
 		SubPlanState *sps;
@@ -112,50 +112,51 @@ preprocess_initplans(QueryDesc *queryDesc)
 		{
             SubPlan    *subplan = (SubPlan *)sps->xprstate.expr;
 
-            Assert(IsA(subplan, SubPlan) &&
-                   subplan->qDispSliceId > 0);
-
-			sps->planstate->plan->nParamExec = queryDesc->plannedstmt->nCrossLevelParams;
-			sps->planstate->plan->nMotionNodes = queryDesc->plannedstmt->nMotionNodes;
-			sps->planstate->plan->dispatch = DISPATCH_PARALLEL;
-
-			/*
-			 * Adjust for the slice to execute on the QD.
-			 */
-			rootIndex = subplan->qDispSliceId;
-			queryDesc->estate->es_sliceTable->localSlice = rootIndex;
-
-			/* set our global sliceid variable for elog. */
-			currentSliceId = rootIndex;
-
-			/*
-			 * This runs the SubPlan and puts the answer back into prm->value.
-			 */
-			queryDesc->params = augmentedPli;
-
-			/*
-			 * Use ExprContext to set the param. If ExprContext is not initialized,
-			 * create a new one here. (see MPP-3511)
-			 */
-			if (sps->planstate->ps_ExprContext == NULL)
-				sps->planstate->ps_ExprContext = CreateExprContext(estate);
+            Assert(IsA(subplan, SubPlan));
+
+			if (subplan->qDispSliceId > 0)
+			{
+				sps->planstate->plan->nMotionNodes = queryDesc->plannedstmt->nMotionNodes;
+				sps->planstate->plan->dispatch = DISPATCH_PARALLEL;
+
+				/*
+				 * Adjust for the slice to execute on the QD.
+				 */
+				rootIndex = subplan->qDispSliceId;
+				queryDesc->estate->es_sliceTable->localSlice = rootIndex;
+
+				/* set our global sliceid variable for elog. */
+				currentSliceId = rootIndex;
+
+				/*
+				 * This runs the SubPlan and puts the answer back into prm->value.
+				 */
+				queryDesc->params = augmentedPli;
+
+				/*
+				 * Use ExprContext to set the param. If ExprContext is not initialized,
+				 * create a new one here. (see MPP-3511)
+				 */
+				if (sps->planstate->ps_ExprContext == NULL)
+					sps->planstate->ps_ExprContext = CreateExprContext(estate);
 			
-			/* MPP-12048: Set the right slice index before execution. */
-			Assert( (subplan->qDispSliceId > queryDesc->plannedstmt->nMotionNodes)  &&
-					(subplan->qDispSliceId <=
-							(queryDesc->plannedstmt->nMotionNodes
-							+ queryDesc->plannedstmt->nInitPlans) )   );
-
-			Assert(LocallyExecutingSliceIndex(sps->planstate->state) == subplan->qDispSliceId);
-		    //sps->planstate->state->es_cur_slice_idx = subplan->qDispSliceId;
-
-			ExecSetParamPlan(sps, sps->planstate->ps_ExprContext, queryDesc);
-
-			/*
-			 * We dispatched, and have returned. We may have used the
-			 * interconnect; so let's bump the interconnect-id.
-			 */
-			queryDesc->estate->es_sliceTable->ic_instance_id = ++gp_interconnect_id;
+				/* MPP-12048: Set the right slice index before execution. */
+				Assert( (subplan->qDispSliceId > queryDesc->plannedstmt->nMotionNodes)  &&
+						(subplan->qDispSliceId <=
+						 (queryDesc->plannedstmt->nMotionNodes
+						  + queryDesc->plannedstmt->nInitPlans) )   );
+
+				Assert(LocallyExecutingSliceIndex(sps->planstate->state) == subplan->qDispSliceId);
+				//sps->planstate->state->es_cur_slice_idx = subplan->qDispSliceId;
+
+				ExecSetParamPlan(sps, sps->planstate->ps_ExprContext, queryDesc);
+
+				/*
+				 * We dispatched, and have returned. We may have used the
+				 * interconnect; so let's bump the interconnect-id.
+				 */
+				queryDesc->estate->es_sliceTable->ic_instance_id = ++gp_interconnect_id;
+			}
 		}
 
 		queryDesc->params = originalPli;
@@ -190,7 +191,7 @@ addRemoteExecParamsToParamList(PlannedStmt *stmt, ParamListInfo extPrm, ParamExe
 	ListCell *lc;
 	Plan	   *plan = stmt->planTree;
 	List	   *rtable = stmt->rtable;
-	int			nIntPrm = stmt->nCrossLevelParams;
+	int			nIntPrm = stmt->nParamExec;
 
 	if (nIntPrm == 0)
 		return extPrm;
diff --git a/src/backend/cdb/cdbsubselect.c b/src/backend/cdb/cdbsubselect.c
index 45cb02533e74..c19f7b60ef28 100644
--- a/src/backend/cdb/cdbsubselect.c
+++ b/src/backend/cdb/cdbsubselect.c
@@ -1273,15 +1273,25 @@ make_join_expr(Node *larg, int r_rtindex, int join_type)
 static Node *
 make_lasj_quals(PlannerInfo *root, SubLink * sublink, int subquery_indx)
 {
+	Query	   *subselect = (Query *) sublink->subselect;
 	Expr	   *join_pred;
-	List	   *subtlist = NIL;
+	List	   *subquery_vars;
 
 	Assert(sublink->subLinkType == ALL_SUBLINK);
 
+	/*
+	 * Build a list of Vars representing the subselect outputs.
+	 */
+	subquery_vars = generate_subquery_vars(root,
+										   subselect->targetList,
+										   subquery_indx);
+
+	/*
+	 * Build the result qual expression, replacing Params with these Vars.
+	 */
 	join_pred = (Expr *) convert_testexpr(root,
 										  sublink->testexpr,
-										  subquery_indx,
-										  &subtlist);
+										  subquery_vars);
 
 	join_pred = canonicalize_qual(make_notclause(join_pred));
 
diff --git a/src/backend/cdb/cdbthreadlog.c b/src/backend/cdb/cdbthreadlog.c
index 4a83aef1c5b6..3ed56372f60b 100644
--- a/src/backend/cdb/cdbthreadlog.c
+++ b/src/backend/cdb/cdbthreadlog.c
@@ -105,7 +105,7 @@ write_log(const char *fmt,...)
 
 	va_start(ap, fmt);
 
-	if (Redirect_stderr && gp_log_format == 1)
+	if (Logging_collector && gp_log_format == 1)
 	{
 		char		errbuf[2048]; /* Arbitrary size? */
 
diff --git a/src/backend/cdb/cdbtm.c b/src/backend/cdb/cdbtm.c
index 4807a9c28cd8..d1127249867c 100644
--- a/src/backend/cdb/cdbtm.c
+++ b/src/backend/cdb/cdbtm.c
@@ -35,6 +35,7 @@
 #include "access/twophase.h"
 #include "access/distributedlog.h"
 #include "postmaster/postmaster.h"
+#include "storage/procarray.h"
 #include "cdb/cdbpersistentrecovery.h"
 #include "cdb/cdbpersistentcheck.h"
 
@@ -740,7 +741,7 @@ doInsertForgetCommitted(void)
 	 * master readers (e.g. those using  SnapshotNow for reading) the same as for
 	 * distributed transactions.
 	 */
-	ClearTransactionFromPgProc_UnderLock();
+	ClearTransactionFromPgProc_UnderLock(MyProc);
 	releaseGxact_UnderLocks();
 
 	elog(DTM_DEBUG5, "doInsertForgetCommitted called releaseGxact");
diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c
index d12687a5e450..e54ec639ee90 100644
--- a/src/backend/cdb/cdbvars.c
+++ b/src/backend/cdb/cdbvars.c
@@ -67,8 +67,6 @@ bool		Debug_print_slice_table;	/* Shall we log the slice table? */
 
 bool		Debug_print_dispatch_plan;	/* Shall we log the plan we'll dispatch? */
 
-bool		Debug_print_plannedstmt;	/* Shall we log the final planned statement? */
-
 bool            gp_backup_directIO = false;     /* disable\enable direct I/O dump */
 
 int             gp_backup_directIO_read_chunk_mb = 20; /* size of readChunk buffer for directIO dump */
@@ -309,7 +307,6 @@ bool		gp_enable_motion_deadlock_sanity = FALSE; /* planning time sanity check */
 #ifdef USE_ASSERT_CHECKING
 bool		gp_mk_sort_check = false;
 #endif
-bool 		trace_sort = false;
 int			gp_sort_flags = 0;
 int			gp_dbg_flags = 0;
 int 		gp_sort_max_distinct = 20000;
diff --git a/src/backend/cdb/dispatcher/cdbdisp_query.c b/src/backend/cdb/dispatcher/cdbdisp_query.c
index a778e74c50ff..530fd64b431f 100644
--- a/src/backend/cdb/dispatcher/cdbdisp_query.c
+++ b/src/backend/cdb/dispatcher/cdbdisp_query.c
@@ -245,8 +245,8 @@ cdbdisp_dispatchPlan(struct QueryDesc *queryDesc,
 		queryDesc->operation == CMD_UPDATE ||
 		queryDesc->operation == CMD_DELETE)
 	{
-
 		MemoryContext oldContext;
+		List	   *cursors;
 
 		oldContext = CurrentMemoryContext;
 		if (stmt->qdContext)
@@ -263,9 +263,10 @@ cdbdisp_dispatchPlan(struct QueryDesc *queryDesc,
 			oldContext = MemoryContextSwitchTo(mc);
 		}
 
-		stmt->planTree = (Plan *) exec_make_plan_constant(stmt, is_SRI);
+		stmt->planTree = (Plan *) exec_make_plan_constant(stmt, is_SRI, &cursors);
 
 		MemoryContextSwitchTo(oldContext);
+		queryDesc->ddesc->cursorPositions = (List *) copyObject(cursors);
 	}
 
 	/*
diff --git a/src/backend/cdb/partitionselection.c b/src/backend/cdb/partitionselection.c
index aa036c247c21..60011075ea96 100644
--- a/src/backend/cdb/partitionselection.c
+++ b/src/backend/cdb/partitionselection.c
@@ -17,6 +17,20 @@
 #include "parser/parse_expr.h"
 #include "utils/memutils.h"
 
+/*
+ * During attribute re-mapping for heterogeneous partitions, we use
+ * this struct to identify which varno's attributes will be re-mapped.
+ * Using this struct as a *context* during expression tree walking, we
+ * can skip varattnos that do not belong to a given varno.
+ */
+typedef struct AttrMapContext
+{
+	const AttrNumber *newattno; /* The mapping table to remap the varattno */
+	Index varno; /* Which rte's varattno to re-map */
+} AttrMapContext;
+
+static bool change_varattnos_varno_walker(Node *node, const AttrMapContext *attrMapCxt);
+
 /* ----------------------------------------------------------------
  *		eval_propagation_expression
  *
@@ -712,4 +726,124 @@ static_part_selection(PartitionSelector *ps)
 	return selparts;
 }
 
-/* EOF */
+/*
+ * Generate a map for change_varattnos_of_a_node from old and new TupleDesc's,
+ * matching according to column name. This function returns a NULL pointer (i.e.
+ * null map) if no mapping is necessary (i.e., old and new TupleDesc are already
+ * aligned).
+ *
+ * This function, and change_varattnos_of_a_varno below, used to be in
+ * tablecmds.c, but were removed in upstream commit 188a0a00. But we still need
+ * this for dynamic partition selection in GDPB, so copied them here.
+ */
+AttrNumber *
+varattnos_map(TupleDesc old, TupleDesc new)
+{
+	AttrNumber *attmap;
+	int			i,
+				j;
+
+	bool mapRequired = false;
+
+	attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * old->natts);
+	for (i = 1; i <= old->natts; i++)
+	{
+		if (old->attrs[i - 1]->attisdropped)
+			continue;			/* leave the entry as zero */
+
+		for (j = 1; j <= new->natts; j++)
+		{
+			if (strcmp(NameStr(old->attrs[i - 1]->attname),
+					   NameStr(new->attrs[j - 1]->attname)) == 0)
+			{
+				attmap[i - 1] = j;
+
+				if (i != j)
+				{
+					mapRequired = true;
+				}
+				break;
+			}
+		}
+	}
+
+	if (!mapRequired)
+	{
+		pfree(attmap);
+
+		/* No mapping required, so return NULL */
+		attmap = NULL;
+	}
+
+	return attmap;
+}
+
+/*
+ * Replace varattno values in an expression tree according to the given
+ * map array, that is, varattno N is replaced by newattno[N-1].  It is
+ * caller's responsibility to ensure that the array is long enough to
+ * define values for all user varattnos present in the tree.  System column
+ * attnos remain unchanged. For historical reason, we only map varattno of the first
+ * range table entry from this method. So, we call the more general
+ * change_varattnos_of_a_varno() with varno set to 1
+ *
+ * Note that the passed node tree is modified in-place!
+ */
+void
+change_varattnos_of_a_node(Node *node, const AttrNumber *newattno)
+{
+	/* Only attempt re-mapping if re-mapping is necessary (i.e., non-null newattno map) */
+	if (newattno)
+	{
+		change_varattnos_of_a_varno(node, newattno, 1 /* varno is hard-coded to 1 (i.e., only first RTE) */);
+	}
+}
+
+/*
+ * Replace varattno values for a given varno RTE index in an expression
+ * tree according to the given map array, that is, varattno N is replaced
+ * by newattno[N-1].  It is caller's responsibility to ensure that the array
+ * is long enough to define values for all user varattnos present in the tree.
+ * System column attnos remain unchanged.
+ *
+ * Note that the passed node tree is modified in-place!
+ */
+void
+change_varattnos_of_a_varno(Node *node, const AttrNumber *newattno, Index varno)
+{
+	AttrMapContext attrMapCxt;
+
+	attrMapCxt.newattno = newattno;
+	attrMapCxt.varno = varno;
+
+	(void) change_varattnos_varno_walker(node, &attrMapCxt);
+}
+
+/*
+ * Remaps the varattno of a varattno in a Var node using an attribute map.
+ */
+static bool
+change_varattnos_varno_walker(Node *node, const AttrMapContext *attrMapCxt)
+{
+	if (node == NULL)
+		return false;
+	if (IsA(node, Var))
+	{
+		Var		   *var = (Var *) node;
+
+		if (var->varlevelsup == 0 && (var->varno == attrMapCxt->varno) &&
+			var->varattno > 0)
+		{
+			/*
+			 * ??? the following may be a problem when the node is multiply
+			 * referenced though stringToNode() doesn't create such a node
+			 * currently.
+			 */
+			Assert(attrMapCxt->newattno[var->varattno - 1] > 0);
+			var->varattno = var->varoattno = attrMapCxt->newattno[var->varattno - 1];
+		}
+		return false;
+	}
+	return expression_tree_walker(node, change_varattnos_varno_walker,
+								  (void *) attrMapCxt);
+}
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index f0b454bd2635..8886887815c9 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -15,10 +15,11 @@ override CPPFLAGS := -I$(top_srcdir)/src/backend/gp_libpq_fe $(CPPFLAGS)
 
 OBJS = aggregatecmds.o alter.o analyze.o analyzefuncs.o async.o cluster.o comment.o  \
 	conversioncmds.o copy.o \
-	dbcommands.o define.o explain.o extprotocolcmds.o filespace.o functioncmds.o \
+	dbcommands.o define.o discard.o explain.o extprotocolcmds.o filespace.o functioncmds.o \
 	indexcmds.o lockcmds.o operatorcmds.o opclasscmds.o \
 	portalcmds.o prepare.o proclang.o queue.o \
 	schemacmds.o sequence.o tablecmds.o tablespace.o trigger.o \
-	typecmds.o user.o vacuum.o vacuumlazy.o variable.o view.o
+	tsearchcmds.o typecmds.o user.o vacuum.o vacuumlazy.o \
+	variable.o view.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index 4fe4adb2003c..1c1220da81b7 100644
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.42 2007/01/05 22:19:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.45.2.1 2008/06/08 21:09:52 tgl Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -158,7 +158,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
 		{
 			numArgs = 1;
 			aggArgTypes = (Oid *) palloc(sizeof(Oid));
-			aggArgTypes[0] = typenameTypeId(NULL, baseType);
+			aggArgTypes[0] = typenameTypeId(NULL, baseType, NULL);
 		}
 	}
 	else
@@ -180,7 +180,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
 		{
 			TypeName   *curTypeName = (TypeName *) lfirst(lc);
 
-			aggArgTypes[i++] = typenameTypeId(NULL, curTypeName);
+			aggArgTypes[i++] = typenameTypeId(NULL, curTypeName, NULL);
 		}
 	}
 
@@ -196,10 +196,9 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
 	 * (or worse) by connecting up incompatible internal-using functions
 	 * in an aggregate.
 	 */
-	transTypeId = typenameTypeId(NULL, transType);
-	if ((get_typtype(transTypeId) == 'p' &&
-		 transTypeId != ANYARRAYOID &&
-		 transTypeId != ANYELEMENTOID))
+	transTypeId = typenameTypeId(NULL, transType, NULL);
+	if (get_typtype(transTypeId) == TYPTYPE_PSEUDO &&
+		!IsPolymorphicType(transTypeId))
 	{
 		if (transTypeId == INTERNALOID && superuser())
 			/* okay */ ;
@@ -209,6 +208,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters,
 					 errmsg("aggregate transition data type cannot be %s",
 							format_type_be(transTypeId))));
 	}
+
 	/*
 	 * Most of the argument-checking is done inside of AggregateCreate
 	 */
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 981bc5a1be4f..bc669d49a8a4 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.22 2007/01/23 05:07:17 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.27 2008/02/07 21:07:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -96,6 +96,8 @@ ExecRenameStmt(RenameStmt *stmt)
 			break;
 
 		case OBJECT_TABLE:
+		case OBJECT_SEQUENCE:
+		case OBJECT_VIEW:
 		case OBJECT_INDEX:
 		{
 			if (Gp_role == GP_ROLE_DISPATCH)
@@ -119,7 +121,7 @@ ExecRenameStmt(RenameStmt *stmt)
 				aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
 							   get_namespace_name(namespaceId));
 
-			renamerel(stmt->objid, stmt->newname, stmt);
+			renamerel(stmt->objid, stmt->newname, stmt->renameType, stmt);
 			break;
 		}
 
@@ -152,6 +154,22 @@ ExecRenameStmt(RenameStmt *stmt)
 				break;
 			}
 
+		case OBJECT_TSPARSER:
+			RenameTSParser(stmt->object, stmt->newname);
+			break;
+
+		case OBJECT_TSDICTIONARY:
+			RenameTSDictionary(stmt->object, stmt->newname);
+			break;
+
+		case OBJECT_TSTEMPLATE:
+			RenameTSTemplate(stmt->object, stmt->newname);
+			break;
+
+		case OBJECT_TSCONFIGURATION:
+			RenameTSConfiguration(stmt->object, stmt->newname);
+			break;
+
 		default:
 			elog(ERROR, "unrecognized rename stmt type: %d",
 				 (int) stmt->renameType);
@@ -230,6 +248,10 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
 			AlterFunctionOwner(stmt->object, stmt->objarg, newowner);
 			break;
 
+		case OBJECT_LANGUAGE:
+			AlterLanguageOwner(strVal(linitial(stmt->object)), newowner);
+			break;
+
 		case OBJECT_OPERATOR:
 			Assert(list_length(stmt->objarg) == 2);
 			AlterOperatorOwner(stmt->object,
@@ -258,15 +280,23 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
 			AlterFileSpaceOwner(stmt->object, newowner);
 			break;
 
+		case OBJECT_EXTPROTOCOL:
+			AlterExtProtocolOwner(strVal(linitial(stmt->object)), newowner);
+			break;
+
 		case OBJECT_TYPE:
 		case OBJECT_DOMAIN:		/* same as TYPE */
 			AlterTypeOwner(stmt->object, newowner);
 			break;
-		
-		case OBJECT_EXTPROTOCOL:
-			AlterExtProtocolOwner(strVal(linitial(stmt->object)), newowner);
+
+		case OBJECT_TSDICTIONARY:
+			AlterTSDictionaryOwner(stmt->object, newowner);
 			break;
-			
+
+		case OBJECT_TSCONFIGURATION:
+			AlterTSConfigurationOwner(stmt->object, newowner);
+			break;
+
 		default:
 			elog(ERROR, "unrecognized AlterOwnerStmt type: %d",
 				 (int) stmt->objectType);
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 68f76e726c8a..9e0fb3202a8f 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -47,6 +47,7 @@
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
+#include "utils/pg_rusage.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
 
@@ -75,10 +76,13 @@ typedef struct AnlIndexData
 /* Default statistics target (GUC parameter) */
 int			default_statistics_target = 10;
 
+/* A few variables that don't seem worth passing around as parameters */
 static int	elevel = -1;
 
 static MemoryContext anl_context = NULL;
 
+static BufferAccessStrategy vac_strategy;
+
 
 static void BlockSampler_Init(BlockSampler bs, BlockNumber nblocks,
 				  int samplesize);
@@ -110,7 +114,8 @@ static void analyzeEstimateIndexpages(Relation onerel, Relation indrel, BlockNum
  *	analyze_rel() -- analyze one relation
  */
 void
-analyze_rel(Oid relid, VacuumStmt *vacstmt)
+analyze_rel(Oid relid, VacuumStmt *vacstmt,
+			BufferAccessStrategy bstrategy)
 {
 	Relation	onerel;
 	int			attr_cnt,
@@ -129,12 +134,19 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt)
 				totaldeadrows;
 	BlockNumber	totalpages;
 	HeapTuple  *rows;
+	PGRUsage	ru0;
+	TimestampTz starttime = 0;
+	Oid			save_userid;
+	int			save_sec_context;
+	int			save_nestlevel;
 
 	if (vacstmt->verbose)
 		elevel = INFO;
 	else
 		elevel = DEBUG2;
 
+	vac_strategy = bstrategy;
+
 	/*
 	 * Use the current context for storing analysis info.  vacuum.c ensures
 	 * that this context will be cleared when I return, thus releasing the
@@ -215,6 +227,29 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt)
 					get_namespace_name(RelationGetNamespace(onerel)),
 					RelationGetRelationName(onerel))));
 
+	/*
+	 * Switch to the table owner's userid, so that any index functions are run
+	 * as that user.  Also lock down security-restricted operations and
+	 * arrange to make GUC variable changes local to this command.
+	 */
+	GetUserIdAndSecContext(&save_userid, &save_sec_context);
+	SetUserIdAndSecContext(onerel->rd_rel->relowner,
+						   save_sec_context | SECURITY_RESTRICTED_OPERATION);
+	save_nestlevel = NewGUCNestLevel();
+
+	/* let others know what I'm doing */
+	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+	MyProc->vacuumFlags |= PROC_IN_ANALYZE;
+	LWLockRelease(ProcArrayLock);
+
+	/* measure elapsed time iff autovacuum logging requires it */
+	if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0)
+	{
+		pg_rusage_init(&ru0);
+		if (Log_autovacuum_min_duration > 0)
+			starttime = GetCurrentTimestamp();
+	}
+
 	/*
 	 * Determine which columns to analyze
 	 *
@@ -490,6 +525,20 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt)
 	/* Done with indexes */
 	vac_close_indexes(nindexes, Irel, NoLock);
 
+	/* Log the action if appropriate */
+	if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0)
+	{
+		if (Log_autovacuum_min_duration == 0 ||
+			TimestampDifferenceExceeds(starttime, GetCurrentTimestamp(),
+									   Log_autovacuum_min_duration))
+			ereport(LOG,
+					(errmsg("automatic analyze of table \"%s.%s.%s\" system usage: %s",
+							get_database_name(MyDatabaseId),
+							get_namespace_name(RelationGetNamespace(onerel)),
+							RelationGetRelationName(onerel),
+							pg_rusage_show(&ru0))));
+	}
+
 	/*
 	 * Close source relation now, but keep lock so that no one deletes it
 	 * before we commit.  (If someone did, they'd fail to clean up the entries
@@ -497,6 +546,20 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt)
 	 * expose us to concurrent-update failures in update_attstats.)
 	 */
 	relation_close(onerel, NoLock);
+
+	/*
+	 * Reset my PGPROC flag.  Note: we need this here, and not in vacuum_rel,
+	 * because the vacuum flag is cleared by the end-of-xact code.
+	 */
+	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+	MyProc->vacuumFlags &= ~PROC_IN_ANALYZE;
+	LWLockRelease(ProcArrayLock);
+
+	/* Roll back any GUC changes executed by index functions */
+	AtEOXact_GUC(false, save_nestlevel);
+
+	/* Restore userid and security context */
+	SetUserIdAndSecContext(save_userid, save_sec_context);
 }
 
 /*
@@ -854,6 +917,7 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 	double		deadrows = 0;	/* # dead rows seen */
 	double		rowstoskip = -1;	/* -1 means not set yet */
 	BlockNumber totalblocks;
+	TransactionId OldestXmin;
 	BlockSamplerData bs;
 	double		rstate;
 
@@ -861,6 +925,9 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 
 	totalblocks = RelationGetNumberOfBlocks(onerel);
 
+	/* Need a cutoff xmin for HeapTupleSatisfiesVacuum */
+	OldestXmin = GetOldestXmin(onerel->rd_rel->relisshared, true);
+
 	/* Prepare for sampling block numbers */
 	BlockSampler_Init(&bs, totalblocks, targrows);
 	/* Prepare for sampling rows */
@@ -881,10 +948,12 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 		 * We must maintain a pin on the target page's buffer to ensure that
 		 * the maxoffset value stays good (else concurrent VACUUM might delete
 		 * tuples out from under us).  Hence, pin the page until we are done
-		 * looking at it.  We don't maintain a lock on the page, so tuples
-		 * could get added to it, but we ignore such tuples.
+		 * looking at it.  We also choose to hold sharelock on the buffer
+		 * throughout --- we could release and re-acquire sharelock for
+		 * each tuple, but since we aren't doing much work per tuple, the
+		 * extra lock traffic is probably better avoided.
 		 */
-		targbuffer = ReadBuffer(onerel, targblock);
+		targbuffer = ReadBufferWithStrategy(onerel, targblock, vac_strategy);
 		LockBuffer(targbuffer, BUFFER_LOCK_SHARE);
 		targpage = BufferGetPage(targbuffer);
 		maxoffset = PageGetMaxOffsetNumber(targpage);
@@ -894,6 +963,22 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 		{
 			ItemId		itemid;
 			HeapTupleData targtuple;
+			bool		sample_it = false;
+
+			itemid = PageGetItemId(targpage, targoffset);
+
+			/*
+			 * We ignore unused and redirect line pointers.  DEAD line
+			 * pointers should be counted as dead, because we need vacuum
+			 * to run to get rid of them.  Note that this rule agrees with
+			 * the way that heap_page_prune() counts things.
+			 */
+			if (!ItemIdIsNormal(itemid))
+			{
+				if (ItemIdIsDead(itemid))
+					deadrows += 1;
+				continue;
+			}
 
 			itemid = PageGetItemId(targpage, targoffset);
 
@@ -912,10 +997,76 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 
 			ItemPointerSet(&targtuple.t_self, targblock, targoffset);
 
-			/* We use heap_release_fetch to avoid useless bufmgr traffic */
-			if (heap_release_fetch(onerel, SnapshotNow,
-								   &targtuple, &targbuffer,
-								   true, NULL))
+			targtuple.t_data = (HeapTupleHeader) PageGetItem(targpage, itemid);
+			targtuple.t_len = ItemIdGetLength(itemid);
+
+			switch (HeapTupleSatisfiesVacuum(onerel,
+											 targtuple.t_data,
+											 OldestXmin,
+											 targbuffer))
+			{
+				case HEAPTUPLE_LIVE:
+					sample_it = true;
+					liverows += 1;
+					break;
+
+				case HEAPTUPLE_DEAD:
+				case HEAPTUPLE_RECENTLY_DEAD:
+					/* Count dead and recently-dead rows */
+					deadrows += 1;
+					break;
+
+				case HEAPTUPLE_INSERT_IN_PROGRESS:
+					/*
+					 * Insert-in-progress rows are not counted.  We assume
+					 * that when the inserting transaction commits or aborts,
+					 * it will send a stats message to increment the proper
+					 * count.  This works right only if that transaction ends
+					 * after we finish analyzing the table; if things happen
+					 * in the other order, its stats update will be
+					 * overwritten by ours.  However, the error will be
+					 * large only if the other transaction runs long enough
+					 * to insert many tuples, so assuming it will finish
+					 * after us is the safer option.
+					 *
+					 * A special case is that the inserting transaction might
+					 * be our own.  In this case we should count and sample
+					 * the row, to accommodate users who load a table and
+					 * analyze it in one transaction.  (pgstat_report_analyze
+					 * has to adjust the numbers we send to the stats collector
+					 * to make this come out right.)
+					 */
+					if (TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmin(targtuple.t_data)))
+					{
+						sample_it = true;
+						liverows += 1;
+					}
+					break;
+
+				case HEAPTUPLE_DELETE_IN_PROGRESS:
+					/*
+					 * We count delete-in-progress rows as still live, using
+					 * the same reasoning given above; but we don't bother to
+					 * include them in the sample.
+					 *
+					 * If the delete was done by our own transaction, however,
+					 * we must count the row as dead to make
+					 * pgstat_report_analyze's stats adjustments come out
+					 * right.  (Note: this works out properly when the row
+					 * was both inserted and deleted in our xact.)
+					 */
+					if (TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(targtuple.t_data)))
+						deadrows += 1;
+					else
+						liverows += 1;
+					break;
+
+				default:
+					elog(ERROR, "unexpected HeapTupleSatisfiesVacuum result");
+					break;
+			}
+
+			if (sample_it)
 			{
 				/*
 				 * The first targrows sample rows are simply copied into the
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index c1a45a57232c..5774356505a6 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -124,12 +124,12 @@ typedef enum
 typedef struct
 {
 	ListenActionKind action;
-	char		condname[1];	/* actually, as long as needed */
+	char		condname[1];				/* actually, as long as needed */
 } ListenAction;
 
-static List *pendingActions = NIL;		/* list of ListenAction */
+static List *pendingActions = NIL;			/* list of ListenAction */
 
-static List *upperPendingActions = NIL; /* list of upper-xact lists */
+static List *upperPendingActions = NIL;		/* list of upper-xact lists */
 
 /*
  * State for outbound notifies consists of a list of all relnames NOTIFYed
@@ -147,7 +147,7 @@ static List *upperPendingActions = NIL; /* list of upper-xact lists */
  * condition name, it will get a self-notify at commit.  This is a bit odd
  * but is consistent with our historical behavior.
  */
-static List *pendingNotifies = NIL;		/* list of C strings */
+static List *pendingNotifies = NIL;				/* list of C strings */
 
 static List *upperPendingNotifies = NIL;		/* list of upper-xact lists */
 
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 71033272c861..d2cfa73d2eeb 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.158 2007/03/29 00:15:37 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.169 2008/01/30 19:46:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,8 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
+#include "access/rewriteheap.h"
+#include "access/transam.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catquery.h"
@@ -37,14 +39,18 @@
 #include "catalog/pg_tablespace.h"
 #include "commands/cluster.h"
 #include "commands/tablecmds.h"
+#include "commands/trigger.h"
+#include "commands/vacuum.h"
 #include "miscadmin.h"
+#include "storage/procarray.h"
 #include "utils/acl.h"
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/syscache.h"
 #include "utils/relcache.h"
+#include "utils/syscache.h"
+
 #include "cdb/cdbvars.h"
 #include "cdb/cdbdisp_query.h"
 #include "cdb/cdboidsync.h"
@@ -64,7 +70,7 @@ typedef struct
 
 static bool cluster_rel(RelToCluster *rv, bool recheck, ClusterStmt *stmt, bool printError);
 static void rebuild_relation(Relation OldHeap, Oid indexOid, ClusterStmt *stmt);
-static void copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex);
+static TransactionId copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex);
 static List *get_tables_to_cluster(MemoryContext cluster_context);
 
 
@@ -88,13 +94,13 @@ static List *get_tables_to_cluster(MemoryContext cluster_context);
  *
  * The single-relation case does not have any such overhead.
  *
- * We also allow a relation being specified without index.	In that case,
+ * We also allow a relation to be specified without index.	In that case,
  * the indisclustered bit will be looked up, and an ERROR will be thrown
  * if there is no index with the bit set.
  *---------------------------------------------------------------------------
  */
 void
-cluster(ClusterStmt *stmt)
+cluster(ClusterStmt *stmt, bool isTopLevel)
 {
 	if (stmt->relation != NULL)
 	{
@@ -115,13 +121,13 @@ cluster(ClusterStmt *stmt)
 						   RelationGetRelationName(rel));
 
 		/*
-		 * Reject clustering a remote temp table ... their local buffer manager
-		 * is not going to cope.
+		 * Reject clustering a remote temp table ... their local buffer
+		 * manager is not going to cope.
 		 */
 		if (isOtherTempNamespace(RelationGetNamespace(rel)))
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("cannot cluster temporary tables of other sessions")));
+			   errmsg("cannot cluster temporary tables of other sessions")));
 
 		if (stmt->indexname == NULL)
 		{
@@ -207,7 +213,7 @@ cluster(ClusterStmt *stmt)
 		 * We cannot run this form of CLUSTER inside a user transaction block;
 		 * we'd be holding locks way too long.
 		 */
-		PreventTransactionChain((void *) stmt, "CLUSTER");
+		PreventTransactionChain(isTopLevel, "CLUSTER");
 
 		/*
 		 * Create special memory context for cross-transaction storage.
@@ -497,9 +503,13 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck)
 
 	/*
 	 * Disallow if index is left over from a failed CREATE INDEX CONCURRENTLY;
-	 * it might well not contain entries for every heap row.
+	 * it might well not contain entries for every heap row, or might not even
+	 * be internally consistent.  (But note that we don't check indcheckxmin;
+	 * the worst consequence of following broken HOT chains would be that we
+	 * might put recently-dead tuples out-of-order in the new table, and there
+	 * is little harm in that.)
 	 */
-	if (!OldIndex->rd_index->indisvalid)
+	if (!IndexIsValid(OldIndex->rd_index))
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("cannot cluster on invalid index \"%s\"",
@@ -541,6 +551,11 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck)
  * mark_index_clustered: mark the specified index as the one clustered on
  *
  * With indexOid == InvalidOid, will mark all indexes of rel not-clustered.
+ *
+ * Note: we do transactional updates of the pg_index rows, which are unsafe
+ * against concurrent SnapshotNow scans of pg_index.  Therefore this is unsafe
+ * to execute with less than full exclusive lock on the parent table;
+ * otherwise concurrent executions of RelationGetIndexList could miss indexes.
  */
 void
 mark_index_clustered(Relation rel, Oid indexOid)
@@ -617,6 +632,9 @@ mark_index_clustered(Relation rel, Oid indexOid)
 		}
 		else if (thisIndexOid == indexOid)
 		{
+			/* this was checked earlier, but let's be real sure */
+			if (!IndexIsValid(indexForm))
+				elog(ERROR, "cannot cluster on invalid index %u", indexOid);
 			indexForm->indisclustered = true;
 
 			caql_update_current(pcqCtx, indexTuple);
@@ -646,6 +664,7 @@ rebuild_relation(Relation OldHeap, Oid indexOid, ClusterStmt *stmt)
 	Oid			tableSpace = OldHeap->rd_rel->reltablespace;
 	Oid			OIDNewHeap;
 	char		NewHeapName[NAMEDATALEN];
+	TransactionId frozenXid;
 	ObjectAddress object;
 
 	/* Mark the correct index as clustered */
@@ -673,13 +692,13 @@ rebuild_relation(Relation OldHeap, Oid indexOid, ClusterStmt *stmt)
 	/*
 	 * Copy the heap data into the new table in the desired order.
 	 */
-	copy_heap_data(OIDNewHeap, tableOid, indexOid);
+	frozenXid = copy_heap_data(OIDNewHeap, tableOid, indexOid);
 
 	/* To make the new heap's data visible (probably not needed?). */
 	CommandCounterIncrement();
 
 	/* Swap the physical files of the old and new heaps. */
-	swap_relation_files(tableOid, OIDNewHeap, true);
+	swap_relation_files(tableOid, OIDNewHeap, frozenXid, true);
 
 	CommandCounterIncrement();
 
@@ -700,6 +719,12 @@ rebuild_relation(Relation OldHeap, Oid indexOid, ClusterStmt *stmt)
 	 * Rebuild each index on the relation (but not the toast table, which is
 	 * all-new at this point).	We do not need CommandCounterIncrement()
 	 * because reindex_relation does it.
+	 *
+	 * Note: because index_build is called via reindex_relation, it will never
+	 * set indcheckxmin true for the indexes.  This is OK even though in some
+	 * sense we are building new indexes rather than rebuilding existing ones,
+	 * because the new heap won't contain any HOT chains at all, let alone
+	 * broken ones, so it can't be necessary to set indcheckxmin.
 	 */
 	reindex_relation(tableOid, false, false, false, false,
 					 &stmt->new_ind_oids, Gp_role == GP_ROLE_DISPATCH);
@@ -860,9 +885,10 @@ make_new_heap(Oid OIDOldHeap, const char *NewName, Oid NewTableSpace,
 }
 
 /*
- * Do the physical copying of heap data.
+ * Do the physical copying of heap data.  Returns the TransactionId used as
+ * freeze cutoff point for the tuples.
  */
-static void
+static TransactionId
 copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 {
 	Relation	NewHeap,
@@ -875,9 +901,10 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 	bool	   *isnull;
 	IndexScanDesc scan;
 	HeapTuple	tuple;
-	TransactionId myxid = GetCurrentTransactionId();
-	CommandId	mycid = GetCurrentCommandId();
 	bool		use_wal;
+	TransactionId OldestXmin;
+	TransactionId FreezeXid;
+	RewriteState rwstate;
 
 	/*
 	 * Open the relations we need.
@@ -894,16 +921,30 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 	newTupDesc = RelationGetDescr(NewHeap);
 	Assert(newTupDesc->natts == oldTupDesc->natts);
 
-	/* Preallocate values/nulls arrays */
+	/* Preallocate values/isnull arrays */
 	natts = newTupDesc->natts;
-	values = (Datum *) palloc0(natts * sizeof(Datum));
-	isnull = (bool *) palloc0(natts * sizeof(bool));
+	values = (Datum *) palloc(natts * sizeof(Datum));
+	isnull = (bool *) palloc(natts * sizeof(bool));
+
+	/*
+	 * If the OldHeap has a toast table, get lock on the toast table to keep
+	 * it from being vacuumed.  This is needed because autovacuum processes
+	 * toast tables independently of their main tables, with no lock on the
+	 * latter.  If an autovacuum were to start on the toast table after we
+	 * compute our OldestXmin below, it would use a later OldestXmin, and then
+	 * possibly remove as DEAD toast tuples belonging to main tuples we think
+	 * are only RECENTLY_DEAD.  Then we'd fail while trying to copy those
+	 * tuples.
+	 *
+	 * We don't need to open the toast relation here, just lock it.  The lock
+	 * will be held till end of transaction.
+	 */
+	if (OldHeap->rd_rel->reltoastrelid)
+		LockRelationOid(OldHeap->rd_rel->reltoastrelid, AccessExclusiveLock);
 
 	/*
 	 * We need to log the copied data in WAL iff WAL archiving is enabled AND
-	 * it's not a temp rel.  (Since we know the target relation is new and
-	 * can't have any FSM data, we can always tell heap_insert to ignore FSM,
-	 * even when using WAL.)
+	 * it's not a temp rel.
 	 */
 	use_wal = XLogArchivingActive() && !NewHeap->rd_istemp;
 
@@ -911,37 +952,115 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 	Assert(NewHeap->rd_targblock == InvalidBlockNumber);
 
 	/*
-	 * Scan through the OldHeap on the OldIndex and copy each tuple into the
-	 * NewHeap.
+	 * compute xids used to freeze and weed out dead tuples.  We use -1
+	 * freeze_min_age to avoid having CLUSTER freeze tuples earlier than a
+	 * plain VACUUM would.
+	 */
+	vacuum_set_xid_limits(-1, OldHeap->rd_rel->relisshared,
+						  &OldestXmin, &FreezeXid);
+
+	/*
+	 * FreezeXid will become the table's new relfrozenxid, and that mustn't
+	 * go backwards, so take the max.
+	 */
+	if (TransactionIdPrecedes(FreezeXid, OldHeap->rd_rel->relfrozenxid))
+		FreezeXid = OldHeap->rd_rel->relfrozenxid;
+
+	/* Initialize the rewrite operation */
+	rwstate = begin_heap_rewrite(NewHeap, OldestXmin, FreezeXid, use_wal);
+
+	/*
+	 * Scan through the OldHeap in OldIndex order and copy each tuple into the
+	 * NewHeap.  To ensure we see recently-dead tuples that still need to be
+	 * copied, we scan with SnapshotAny and use HeapTupleSatisfiesVacuum for
+	 * the visibility test.
 	 */
 	scan = index_beginscan(OldHeap, OldIndex,
-						   SnapshotNow, 0, (ScanKey) NULL);
+						   SnapshotAny, 0, (ScanKey) NULL);
 
 	while ((tuple = index_getnext(scan, ForwardScanDirection)) != NULL)
 	{
+		HeapTuple	copiedTuple;
+		bool		isdead;
+		int			i;
+		MIRROREDLOCK_BUFMGR_DECLARE;
+
+		CHECK_FOR_INTERRUPTS();
+
+		/* -------- MirroredLock ---------- */
+		MIRROREDLOCK_BUFMGR_LOCK;
+
+		LockBuffer(scan->xs_cbuf, BUFFER_LOCK_SHARE);
+
+		switch (HeapTupleSatisfiesVacuum(OldHeap, tuple->t_data, OldestXmin,
+										 scan->xs_cbuf))
+		{
+			case HEAPTUPLE_DEAD:
+				/* Definitely dead */
+				isdead = true;
+				break;
+			case HEAPTUPLE_LIVE:
+			case HEAPTUPLE_RECENTLY_DEAD:
+				/* Live or recently dead, must copy it */
+				isdead = false;
+				break;
+			case HEAPTUPLE_INSERT_IN_PROGRESS:
+
+				/*
+				 * We should not see this unless it's been inserted earlier in
+				 * our own transaction.
+				 */
+				if (!TransactionIdIsCurrentTransactionId(
+									  HeapTupleHeaderGetXmin(tuple->t_data)))
+					elog(ERROR, "concurrent insert in progress");
+				/* treat as live */
+				isdead = false;
+				break;
+			case HEAPTUPLE_DELETE_IN_PROGRESS:
+
+				/*
+				 * We should not see this unless it's been deleted earlier in
+				 * our own transaction.
+				 */
+				Assert(!(tuple->t_data->t_infomask & HEAP_XMAX_IS_MULTI));
+				if (!TransactionIdIsCurrentTransactionId(
+									  HeapTupleHeaderGetXmax(tuple->t_data)))
+					elog(ERROR, "concurrent delete in progress");
+				/* treat as recently dead */
+				isdead = false;
+				break;
+			default:
+				elog(ERROR, "unexpected HeapTupleSatisfiesVacuum result");
+				isdead = false; /* keep compiler quiet */
+				break;
+		}
+
+		LockBuffer(scan->xs_cbuf, BUFFER_LOCK_UNLOCK);
+
+		MIRROREDLOCK_BUFMGR_UNLOCK;
+		/* -------- MirroredLock ---------- */
+
+		if (isdead)
+		{
+			/* heap rewrite module still needs to see it... */
+			rewrite_heap_dead_tuple(rwstate, tuple);
+			continue;
+		}
+
 		/*
-		 * We cannot simply pass the tuple to heap_insert(), for several
-		 * reasons:
-		 *
-		 * 1. heap_insert() will overwrite the commit-status fields of the
-		 * tuple it's handed.  This would trash the source relation, which is
-		 * bad news if we abort later on.  (This was a bug in releases thru
-		 * 7.0)
+		 * We cannot simply copy the tuple as-is, for several reasons:
 		 *
-		 * 2. We'd like to squeeze out the values of any dropped columns, both
+		 * 1. We'd like to squeeze out the values of any dropped columns, both
 		 * to save space and to ensure we have no corner-case failures. (It's
 		 * possible for example that the new table hasn't got a TOAST table
 		 * and so is unable to store any large values of dropped cols.)
 		 *
-		 * 3. The tuple might not even be legal for the new table; this is
+		 * 2. The tuple might not even be legal for the new table; this is
 		 * currently only known to happen as an after-effect of ALTER TABLE
 		 * SET WITHOUT OIDS.
 		 *
 		 * So, we must reconstruct the tuple from component Datums.
 		 */
-		HeapTuple	copiedTuple;
-		int			i;
-
 		heap_deform_tuple(tuple, oldTupDesc, values, isnull);
 
 		/* Be sure to null out any dropped columns */
@@ -957,24 +1076,25 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
 		if (NewHeap->rd_rel->relhasoids)
 			HeapTupleSetOid(copiedTuple, HeapTupleGetOid(tuple));
 
-		heap_insert(NewHeap, copiedTuple, mycid, use_wal, false, myxid);
+		/* The heap rewrite module does the rest */
+		rewrite_heap_tuple(rwstate, tuple, copiedTuple);
 
 		heap_freetuple(copiedTuple);
-
-		CHECK_FOR_INTERRUPTS();
 	}
 
 	index_endscan(scan);
 
+	/* Write out any remaining tuples, and fsync if needed */
+	end_heap_rewrite(rwstate);
+
 	pfree(values);
 	pfree(isnull);
 
-	if (!use_wal)
-		heap_sync(NewHeap);
-
 	index_close(OldIndex, NoLock);
 	heap_close(OldHeap, NoLock);
 	heap_close(NewHeap, NoLock);
+
+	return FreezeXid;
 }
 
 /*
@@ -1035,10 +1155,19 @@ changeDependencyLinks(Oid baseOid1, Oid baseOid2, Oid oid1, Oid oid2,
  * keeping the same logical identities of the two relations.
  *
  * Also swap any TOAST links, so that the toast data moves along with
- * the main-table data. GPDB: also swap aoseg, aoblkdir links.
- */
+ * the main-table data.
+ *
+ * Additionally, the first relation is marked with relfrozenxid set to
+ * frozenXid.  It seems a bit ugly to have this here, but all callers would
+ * have to do it anyway, so having it here saves a heap_update.  Note: the
+ * TOAST table needs no special handling, because since we swapped the links,
+ * the entry for the TOAST table will now contain RecentXmin in relfrozenxid,
+ * which is the correct value.
+ *
+ * GPDB: also swap aoseg, aoblkdir links.
+*/
 void
-swap_relation_files(Oid r1, Oid r2, bool swap_stats)
+swap_relation_files(Oid r1, Oid r2, TransactionId frozenXid, bool swap_stats)
 {
 	Relation	relRelation;
 	HeapTuple	reltup1,
@@ -1137,6 +1266,10 @@ swap_relation_files(Oid r1, Oid r2, bool swap_stats)
 
 	/* we should not swap reltoastidxid */
 
+	/* set rel1's frozen Xid */
+	Assert(TransactionIdIsNormal(frozenXid));
+	relform1->relfrozenxid = frozenXid;
+
 	/*
 	 * Swap the AO auxiliary relations and their indexes. Unlike the toast
 	 * relations, we need to swap the index oids as well.
@@ -1154,7 +1287,6 @@ swap_relation_files(Oid r1, Oid r2, bool swap_stats)
 		TransferAppendonlyEntry(r2, r1);
 	}
 	
-
 	/* swap size statistics too, since new rel has freshly-updated stats */
 	if (swap_stats)
 	{
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index 444078c31673..b81765a872da 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.96 2007/02/01 19:10:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.100 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,6 +37,10 @@
 #include "catalog/pg_shdescription.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_trigger.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
 #include "catalog/pg_type.h"
 #include "commands/comment.h"
 #include "commands/dbcommands.h"
@@ -87,6 +91,11 @@ static void CommentTablespace(List *qualname, char *comment);
 static void CommentFilespace(List *qualname, char *comment);
 static void CommentRole(List *qualname, char *comment);
 static void CommentResourceQueue(List *qualname, char *comment);
+static void CommentTSParser(List *qualname, char *comment);
+static void CommentTSDictionary(List *qualname, char *comment);
+static void CommentTSTemplate(List *qualname, char *comment);
+static void CommentTSConfiguration(List *qualname, char *comment);
+
 
 /*
  * CommentObject --
@@ -159,11 +168,23 @@ CommentObject(CommentStmt *stmt)
 		case OBJECT_FILESPACE:
 			CommentFilespace(stmt->objname, stmt->comment);
 			break;
+		case OBJECT_RESQUEUE:
+			CommentResourceQueue(stmt->objname, stmt->comment);
+			break;
 		case OBJECT_ROLE:
 			CommentRole(stmt->objname, stmt->comment);
 			break;
-		case OBJECT_RESQUEUE:
-			CommentResourceQueue(stmt->objname, stmt->comment);
+		case OBJECT_TSPARSER:
+			CommentTSParser(stmt->objname, stmt->comment);
+			break;
+		case OBJECT_TSDICTIONARY:
+			CommentTSDictionary(stmt->objname, stmt->comment);
+			break;
+		case OBJECT_TSTEMPLATE:
+			CommentTSTemplate(stmt->objname, stmt->comment);
+			break;
+		case OBJECT_TSCONFIGURATION:
+			CommentTSConfiguration(stmt->objname, stmt->comment);
 			break;
 		default:
 			elog(ERROR, "unrecognized object type: %d",
@@ -883,7 +904,7 @@ CommentType(List *typename, char *comment)
 
 	/* Find the type's oid */
 
-	oid = typenameTypeId(NULL, tname);
+	oid = typenameTypeId(NULL, tname, NULL);
 
 	/* Check object security */
 
@@ -1470,8 +1491,8 @@ CommentCast(List *qualname, List *arguments, char *comment)
 	targettype = (TypeName *) linitial(arguments);
 	Assert(IsA(targettype, TypeName));
 
-	sourcetypeid = typenameTypeId(NULL, sourcetype);
-	targettypeid = typenameTypeId(NULL, targettype);
+	sourcetypeid = typenameTypeId(NULL, sourcetype, NULL);
+	targettypeid = typenameTypeId(NULL, targettype, NULL);
 
 	castOid = caql_getoid_plus(
 			NULL,
@@ -1553,3 +1574,62 @@ CommentResourceQueue(List *qualname, char *comment)
 	/* Call CreateSharedComments() to create/drop the comments */
 	CreateSharedComments(oid, ResQueueRelationId, comment);
 }
+
+static void
+CommentTSParser(List *qualname, char *comment)
+{
+	Oid			prsId;
+
+	prsId = TSParserGetPrsid(qualname, false);
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+			  errmsg("must be superuser to comment on text search parser")));
+
+	CreateComments(prsId, TSParserRelationId, 0, comment);
+}
+
+static void
+CommentTSDictionary(List *qualname, char *comment)
+{
+	Oid			dictId;
+
+	dictId = TSDictionaryGetDictid(qualname, false);
+
+	if (!pg_ts_dict_ownercheck(dictId, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSDICTIONARY,
+					   NameListToString(qualname));
+
+	CreateComments(dictId, TSDictionaryRelationId, 0, comment);
+}
+
+static void
+CommentTSTemplate(List *qualname, char *comment)
+{
+	Oid			tmplId;
+
+	tmplId = TSTemplateGetTmplid(qualname, false);
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+			errmsg("must be superuser to comment on text search template")));
+
+	CreateComments(tmplId, TSTemplateRelationId, 0, comment);
+}
+
+static void
+CommentTSConfiguration(List *qualname, char *comment)
+{
+	Oid			cfgId;
+
+	cfgId = TSConfigGetCfgid(qualname, false);
+
+	if (!pg_ts_config_ownercheck(cfgId, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSCONFIGURATION,
+					   NameListToString(qualname));
+
+	CreateComments(cfgId, TSConfigRelationId, 0, comment);
+
+}
diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c
index 21b59c5bf2aa..7f4946233981 100644
--- a/src/backend/commands/conversioncmds.c
+++ b/src/backend/commands/conversioncmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.31 2007/02/14 01:58:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.32.2.1 2009/02/27 16:35:31 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -110,6 +110,7 @@ CreateConversionCommand(CreateConversionStmt *stmt)
 					 CStringGetDatum(""),
 					 CStringGetDatum(result),
 					 Int32GetDatum(0));
+
 	/*
 	 * All seem ok, go ahead (possible failure would be a duplicate conversion
 	 * name)
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 2ceac3052276..9e80766d9006 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.279 2007/03/29 00:15:38 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.295 2008/01/01 19:45:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -463,9 +463,7 @@ CopySendEndOfRow(CopyState cstate)
 			return; /* don't want to reset msgbug quite yet */
 	}
 
-	/* Reset fe_msgbuf to empty */
-	fe_msgbuf->len = 0;
-	fe_msgbuf->data[0] = '\0';
+	resetStringInfo(fe_msgbuf);
 }
 
 /*
@@ -511,9 +509,7 @@ CopyToDispatchFlush(CopyState cstate)
 
 	}
 
-	/* Reset fe_msgbuf to empty */
-	fe_msgbuf->len = 0;
-	fe_msgbuf->data[0] = '\0';
+	resetStringInfo(fe_msgbuf);
 }
 
 
@@ -1171,12 +1167,9 @@ DoCopyInternal(const CopyStmt *stmt, const char *queryString, CopyState cstate)
 
 			fstat(fileno(cstate->copy_file), &st);
 			if (S_ISDIR(st.st_mode))
-			{
-				FreeFile(cstate->copy_file);
 				ereport(ERROR,
 						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 						 errmsg("\"%s\" is a directory", cstate->filename)));
-			}
 		}
 
 	}
@@ -1225,12 +1218,11 @@ DoCopyInternal(const CopyStmt *stmt, const char *queryString, CopyState cstate)
 	}
 	else
 	{
-		Query	   *query = stmt->query;
 		List	   *rewritten;
-		PlannedStmt	 *plannedstmt;
+		Query	   *query;
+		PlannedStmt *plan;
 		DestReceiver *dest;
 
-		Assert(query);
 		Assert(!is_from);
 		cstate->rel = NULL;
 
@@ -1240,34 +1232,18 @@ DoCopyInternal(const CopyStmt *stmt, const char *queryString, CopyState cstate)
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("COPY (SELECT) WITH OIDS is not supported")));
 
-		if (query->intoClause)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("COPY (SELECT INTO) is not supported")));
-
-
 		/*
-		 * The query has already been through parse analysis, but not
-		 * rewriting or planning.  Do that now.
+		 * Run parse analysis and rewrite.	Note this also acquires sufficient
+		 * locks on the source table(s).
 		 *
-		 * Because the planner is not cool about not scribbling on its input,
-		 * we make a preliminary copy of the source querytree.  This prevents
+		 * Because the parser and planner tend to scribble on their input, we
+		 * make a preliminary copy of the source querytree.  This prevents
 		 * problems in the case that the COPY is in a portal or plpgsql
 		 * function and is executed repeatedly.  (See also the same hack in
-												  * EXPLAIN, DECLARE CURSOR and PREPARE.)  XXX the planner really
-		 * shouldn't modify its input ... FIXME someday.
+		 * DECLARE CURSOR and PREPARE.)  XXX FIXME someday.
 		 */
-		query = copyObject(query);
-		Assert(query->commandType == CMD_SELECT);
-
-		/*
-		 * Must acquire locks in case we didn't come fresh from the parser.
-		 * XXX this also scribbles on query, another reason for copyObject
-		 */
-		AcquireRewriteLocks(query);
-
-		/* Rewrite through rule system */
-		rewritten = QueryRewrite(query);
+		rewritten = pg_analyze_and_rewrite((Node *) copyObject(stmt->query),
+										   queryString, NULL, 0);
 
 		/* We don't expect more or less than one result query */
 		if (list_length(rewritten) != 1)
@@ -1275,9 +1251,16 @@ DoCopyInternal(const CopyStmt *stmt, const char *queryString, CopyState cstate)
 
 		query = (Query *) linitial(rewritten);
 		Assert(query->commandType == CMD_SELECT);
+		Assert(query->utilityStmt == NULL);
+
+		/* Query mustn't use INTO, either */
+		if (query->intoClause)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("COPY (SELECT INTO) is not supported")));
 
 		/* plan the query */
-		plannedstmt = planner(query, 0, NULL);
+		plan = planner(query, 0, NULL);
 
 		/*
 		 * Update snapshot command ID to ensure this query sees results of any
@@ -1286,14 +1269,14 @@ DoCopyInternal(const CopyStmt *stmt, const char *queryString, CopyState cstate)
 		 * which COPY can be invoked, I think it's OK, because the active
 		 * snapshot shouldn't be shared with anything else anyway.)
 		 */
-		ActiveSnapshot->curcid = GetCurrentCommandId();
+		ActiveSnapshot->curcid = GetCurrentCommandId(false);
 
 		/* Create dest receiver for COPY OUT */
 		dest = CreateDestReceiver(DestCopyOut, NULL);
 		((DR_copy *) dest)->cstate = cstate;
 
 		/* Create a QueryDesc requesting no output */
-		cstate->queryDesc = CreateQueryDesc(plannedstmt, queryString,
+		cstate->queryDesc = CreateQueryDesc(plan, queryString,
 											ActiveSnapshot, InvalidSnapshot,
 											dest, NULL, false);
 
@@ -1453,12 +1436,9 @@ DoCopyInternal(const CopyStmt *stmt, const char *queryString, CopyState cstate)
 
 			fstat(fileno(cstate->copy_file), &st);
 			if (S_ISDIR(st.st_mode))
-			{
-				FreeFile(cstate->copy_file);
 				ereport(ERROR,
 						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 						 errmsg("\"%s\" is a directory", cstate->filename)));
-			}
 		}
 
 
@@ -3688,7 +3668,7 @@ CopyFrom(CopyState cstate)
 	ExprContext *econtext;		/* used for ExecEvalExpr for default atts */
 	MemoryContext oldcontext = CurrentMemoryContext;
 	ErrorContextCallback errcontext;
-	CommandId	mycid = GetCurrentCommandId();
+	CommandId	mycid = GetCurrentCommandId(true);
 	bool		use_wal = true;		/* by default, use WAL logging */
 	bool		use_fsm = true;		/* by default, use FSM for free space */
 	int		   *attr_offsets;
@@ -3719,13 +3699,6 @@ CopyFrom(CopyState cstate)
 	 * rd_newRelfilenodeSubid can be cleared before the end of the transaction.
 	 * However this is OK since at worst we will fail to make the optimization.
 	 *
-	 * When skipping WAL it's entirely possible that COPY itself will write no
-	 * WAL records at all.  This is of concern because RecordTransactionCommit
-	 * might decide it doesn't need to log our eventual commit, which we
-	 * certainly need it to do.  However, we need no special action here for
-	 * that, because if we have a new table or new relfilenode then there
-	 * must have been a WAL-logged pg_class update earlier in the transaction.
-	 *
 	 * Also, if the target file is new-in-transaction, we assume that checking
 	 * FSM for free space is a waste of time, even if we must use WAL because
 	 * of archiving.  This could possibly be wrong, but it's unlikely.
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index e1019fb118f2..23e522f27540 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.192 2007/02/09 16:12:18 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.204.2.5 2010/03/25 14:45:06 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,6 +84,7 @@ typedef struct
 } createdb_failure_params;
 
 /* non-export function prototypes */
+static void createdb_failure_callback(int code, Datum arg);
 static bool get_db_info(const char *name, LOCKMODE lockmode,
 			Oid *dbIdP, Oid *ownerIdP,
 			int *encodingP, bool *dbIsTemplateP, bool *dbAllowConnP,
@@ -650,25 +651,17 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 	const char *dbtemplate = NULL;
 	int			encoding = -1;
 	int			dbconnlimit = -1;
-
+	int			ctype_encoding;
+	createdb_failure_params fparms;
 	bool		shouldDispatch = (Gp_role == GP_ROLE_DISPATCH);
 	cqContext	cqc;
 	cqContext  *pcqCtx;
+	Snapshot	snapshot;
 
 	if (shouldDispatch)
 		if (Persistent_BeforePersistenceWork())
 			elog(NOTICE, " Create database dispatch before persistence work!");
 
-
-	if (Gp_role != GP_ROLE_EXECUTE)
-	{
-		/*
-		 * Don't allow master to call this in a transaction block. Segments
-		 * are ok as distributed transaction participants. 
-		 */
-		PreventTransactionChain((void *) stmt, "CREATE DATABASE");
-	}
-
 	/* Extract options from the statement node tree */
 	foreach(option, stmt->options)
 	{
@@ -748,12 +741,12 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 		else if (IsA(dencoding->arg, String))
 		{
 			encoding_name = strVal(dencoding->arg);
-			if (pg_valid_server_encoding(encoding_name) < 0)
+			encoding = pg_valid_server_encoding(encoding_name);
+			if (encoding < 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_OBJECT),
 						 errmsg("%s is not a valid encoding name",
 								encoding_name)));
-			encoding = pg_char_to_encoding(encoding_name);
 		}
 		else
 			elog(ERROR, "unrecognized node type: %d",
@@ -833,31 +826,41 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("invalid server encoding %d", encoding)));
 
-	/* check whether encoding and locale are compatible - see also related check in initdb */
-	if (gp_encoding_check_locale_compatibility)
+	/*
+	 * Check whether encoding matches server locale settings.  We allow
+	 * mismatch in three cases:
+	 *
+	 * 1. ctype_encoding = SQL_ASCII, which means either that the locale is
+	 * C/POSIX which works with any encoding, or that we couldn't determine
+	 * the locale's encoding and have to trust the user to get it right.
+	 *
+	 * 2. selected encoding is SQL_ASCII, but only if you're a superuser. This
+	 * is risky but we have historically allowed it --- notably, the
+	 * regression tests require it.
+	 *
+	 * 3. selected encoding is UTF8 and platform is win32. This is because
+	 * UTF8 is a pseudo codepage that is supported in all locales since it's
+	 * converted to UTF16 before being used.
+	 *
+	 * Note: if you change this policy, fix initdb to match.
+	 */
+	ctype_encoding = pg_get_encoding_from_locale(NULL);
+
+	if (!(ctype_encoding == encoding ||
+		  ctype_encoding == PG_SQL_ASCII ||
+#ifdef WIN32
+		  encoding == PG_UTF8 ||
+#endif
+		  (encoding == PG_SQL_ASCII && superuser())))
 	{
-		char *lc_ctype = GetConfigOptionByName("lc_ctype", NULL);
-		char *lc_collate = GetConfigOptionByName("lc_collate", NULL);
-		if (!check_locale_encoding(lc_ctype, encoding))
-		{
-			ereport(ERROR,
-					(errmsg("Encoding mismatch"),
-					 errdetail("The encoding you selected (%s) and the encoding that the\n"
-								"selected locale uses (%s) do not match.  This would lead to\n"
-								"misbehavior in various character string processing functions.\n",
-							pg_encoding_to_char(encoding),
-							lc_ctype)));
-		}
-		if(!check_locale_encoding(lc_collate,encoding))
-		{
-			ereport(ERROR,
-					(errmsg("Encoding mismatch"),
-					 errdetail("The encoding you selected (%s) and the encoding that the\n"
-								"selected locale uses (%s) do not match.  This would lead to\n"
-								"misbehavior in various character string processing functions.\n",
-							pg_encoding_to_char(encoding),
-							lc_collate)));
-		}
+		int			elevel = gp_encoding_check_locale_compatibility ? ERROR : WARNING;
+
+		ereport(elevel,
+				(errmsg("encoding %s does not match server's locale %s",
+						pg_encoding_to_char(encoding),
+						setlocale(LC_CTYPE, NULL)),
+			 errdetail("The server's LC_CTYPE setting requires encoding %s.",
+					   pg_encoding_to_char(ctype_encoding))));
 	}
 
 	/* Resolve default tablespace for new database */
@@ -946,12 +949,12 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 	if (CheckOtherDBBackends(src_dboid))
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_IN_USE),
-				 errmsg("source database \"%s\" is being accessed by other users",
-						dbtemplate)));
+			errmsg("source database \"%s\" is being accessed by other users",
+				   dbtemplate)));
 
 	/*
-	 * Select an OID for the new database, checking that it doesn't have
-	 * a filename conflict with anything already existing in the tablespace
+	 * Select an OID for the new database, checking that it doesn't have a
+	 * filename conflict with anything already existing in the tablespace
 	 * directories.
 	 */
 	pg_database_rel = heap_open(DatabaseRelationId, RowExclusiveLock);
@@ -970,7 +973,6 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 		} while (check_db_file_conflict(dboid));
 	}
 
-
 	/* Remember this for dispatching to segDBs */
 	stmt->dbOid = dboid;
 
@@ -979,10 +981,10 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 		elog(DEBUG5, "shouldDispatch = true, dbOid = %d", dboid);
 
         /* 
-              * Dispatch the command to all primary segments.
-              *
-              * Doesn't wait for the QEs to finish execution.
-              */
+		 * Dispatch the command to all primary segments.
+		 *
+		 * Doesn't wait for the QEs to finish execution.
+		 */
         cdbdisp_dispatchUtilityStatement((Node *)stmt,
                                          true,      /* cancelOnError */
                                      	 true,      /* startTransaction */
@@ -1045,19 +1047,54 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 						   GetUserId(),
 						   "CREATE", "DATABASE"
 				);
-
 	
 	CHECK_FOR_INTERRUPTS();
 	
 	/*
-	 * Force dirty buffers out to disk, to ensure source database is
-	 * up-to-date for the copy.  (We really only need to flush buffers for the
-	 * source database, but bufmgr.c provides no API for that.)
+	 * Force a checkpoint before starting the copy. This will force dirty
+	 * buffers out to disk, to ensure source database is up-to-date on disk
+	 * for the copy. FlushDatabaseBuffers() would suffice for that, but we
+	 * also want to process any pending unlink requests. Otherwise, if a
+	 * checkpoint happened while we're copying files, a file might be deleted
+	 * just when we're about to copy it, causing the lstat() call in copydir()
+	 * to fail with ENOENT.
 	 */
-	BufferSync();
+	RequestCheckpoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
 
-	CHECK_FOR_INTERRUPTS();
-	
+	/*
+	 * Take an MVCC snapshot to use while scanning through pg_tablespace.  For
+	 * safety, copy the snapshot (this prevents it from changing if
+	 * something else were to request a snapshot during the loop).
+	 *
+	 * Traversing pg_tablespace with an MVCC snapshot is necessary to provide
+	 * us with a consistent view of the tablespaces that exist.  Using
+	 * SnapshotNow here would risk seeing the same tablespace multiple times,
+	 * or worse not seeing a tablespace at all, if its tuple is moved around
+	 * by a concurrent update (eg an ACL change).
+	 *
+	 * Inconsistency of this sort is inherent to all SnapshotNow scans, unless
+	 * some lock is held to prevent concurrent updates of the rows being
+	 * sought.	There should be a generic fix for that, but in the meantime
+	 * it's worth fixing this case in particular because we are doing very
+	 * heavyweight operations within the scan, so that the elapsed time for
+	 * the scan is vastly longer than for most other catalog scans.  That
+	 * means there's a much wider window for concurrent updates to cause
+	 * trouble here than anywhere else.  XXX this code should be changed
+	 * whenever a generic fix is implemented.
+	 */
+	snapshot = CopySnapshot(GetLatestSnapshot());
+
+	/*
+	 * Once we start copying subdirectories, we need to be able to clean 'em
+	 * up if we fail.  Use an ENSURE block to make sure this happens.  (This
+	 * is not a 100% solution, because of the possibility of failure during
+	 * transaction commit after we leave this routine, but it should handle
+	 * most scenarios.)
+	 */
+	fparms.src_dboid = src_dboid;
+	fparms.dest_dboid = dboid;
+	PG_ENSURE_ERROR_CLEANUP(createdb_failure_callback,
+							PointerGetDatum(&fparms));
 	{
 		PGRUsage	ru_start;
 		DatabaseInfo *info;
@@ -1079,6 +1116,7 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 		info = DatabaseInfo_Collect(
 							src_dboid, 
 							src_deftablespace,
+							snapshot,
 							/* collectGpRelationNodeInfo */ true,
 							/* collectAppendOnlyCatalogSegmentInfo */ true,
 							/* scanFileSystem */ true);
@@ -1090,17 +1128,12 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 
 		CHECK_FOR_INTERRUPTS();
 
-//		if (Debug_database_command_print)
-//			DatabaseInfo_Trace(info);
-
 		/*
 		 * Verify integrity of databae information.
 		 */
 		if (Debug_database_command_print)
 			pg_rusage_init(&ru_start);
 
-//		DatabaseInfo_Check(info);
-
 		if (Debug_database_command_print)
 			elog(NOTICE, "check phase: %s",
 				 pg_rusage_show(&ru_start));
@@ -1267,6 +1300,8 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 								dst_deftablespace, 
 								dboid);
 
+		RequestCheckpoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
+
 		/*
 		 * Manually set the persistence information so it will get recorded in
 		 * the insert XLOG records.
@@ -1300,19 +1335,43 @@ createdb_int(CreatedbStmt *stmt, CdbDispatcherState *ds)
 		}
 
 		DirectOpen_GpRelationNodeClose(gp_relation_node);
+
+		/*
+		 * Close pg_database, but keep lock till commit (this is important to
+		 * prevent any risk of deadlock failure while updating flat file)
+		 */
+		heap_close(pg_database_rel, NoLock);
+		caql_endscan(pcqCtx);
+
+		/*
+		 * Set flag to update flat database file at commit.  Note: this also
+		 * forces synchronous commit, which minimizes the window between
+		 * creation of the database files and commital of the transaction. If
+		 * we crash before committing, we'll have a DB that's taking up disk
+		 * space but is not in pg_database, which is not good.
+		 */
+		database_file_update_needed();
 	}
+	PG_END_ENSURE_ERROR_CLEANUP(createdb_failure_callback,
+								PointerGetDatum(&fparms));
+}
 
-	/*
-	 * Close pg_database, but keep lock till commit (this is important to
-	 * prevent any risk of deadlock failure while updating flat file)
-	 */
-	heap_close(pg_database_rel, NoLock);
-	caql_endscan(pcqCtx);
+/* Error cleanup callback for createdb */
+static void
+createdb_failure_callback(int code, Datum arg)
+{
+	createdb_failure_params *fparms = (createdb_failure_params *) DatumGetPointer(arg);
 
 	/*
-	 * Set flag to update flat database file at commit.
+	 * Release lock on source database before doing recursive remove.
+	 * This is not essential but it seems desirable to release the lock
+	 * as soon as possible.
 	 */
-	database_file_update_needed();
+	UnlockSharedObject(DatabaseRelationId, fparms->src_dboid, 0, ShareLock);
+
+	/* Throw away any successfully copied subdirectories */
+	// GPDB_83_MERGE_FIXME: We don't do this in GPDB. Why not?
+	//remove_dbtablespaces(fparms->dest_dboid);
 }
 
 
@@ -1327,15 +1386,6 @@ dropdb(const char *dbname, bool missing_ok)
 	Oid			defaultTablespace = InvalidOid;
 	Relation	pgdbrel;
 
-	if (Gp_role != GP_ROLE_EXECUTE)
-	{
-		/*
-		 * Don't allow master tp call this in a transaction block.  Segments are ok as
-		 * distributed transaction participants. 
-		 */
-		PreventTransactionChain((void *) dbname, "DROP DATABASE");
-	}
-
 	/*
 	 * Look up the target database's OID, and get exclusive lock on it. We
 	 * need this to ensure that no new backend starts up in the target
@@ -1480,15 +1530,20 @@ dropdb(const char *dbname, bool missing_ok)
 	pgstat_drop_database(db_id);
 
 	/*
-	 * Tell bgwriter to forget any pending fsync requests for files in the
-	 * database; else it'll fail at next checkpoint.
+	 * Tell bgwriter to forget any pending fsync and unlink requests for files
+	 * in the database; else the fsyncs will fail at next checkpoint, or worse,
+	 * it will delete files that belong to a newly created database with the
+	 * same OID.
 	 */
 	ForgetDatabaseFsyncRequests(InvalidOid, db_id);
 
 	/*
-	 * Force a checkpoint to make sure the bgwriter to push all pages to disk.
+	 * Force a checkpoint to make sure the bgwriter has received the message
+	 * sent by ForgetDatabaseFsyncRequests. On Windows, this also ensures that
+	 * the bgwriter doesn't hold any open files, which would cause rmdir() to
+	 * fail.
 	 */
-	RequestCheckpoint(true, false);
+	RequestCheckpoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
 
 	/*
 	 * Collect information on the database's relations from pg_class and from scanning
@@ -1510,19 +1565,13 @@ dropdb(const char *dbname, bool missing_ok)
 		info = DatabaseInfo_Collect(
 								db_id, 
 								defaultTablespace,
+								NULL,
 								/* collectGpRelationNodeInfo */ true,
 								/* collectAppendOnlyCatalogSegmentInfo */ false,
 								/* scanFileSystem */ true);
 
-//		if (Debug_database_command_print)
-//			DatabaseInfo_Trace(info);
-		
 		if (info->parentlessGpRelationNodesCount > 0)
 		{
-//			DatabaseInfo_Trace(info);
-
-//			pg_usleep(60 * 1000000L);
-			
 			elog(ERROR, "Found %d parentless gp_relation_node entries",
 				 info->parentlessGpRelationNodesCount);
 		}
@@ -1633,7 +1682,11 @@ dropdb(const char *dbname, bool missing_ok)
 	heap_close(pgdbrel, NoLock);
 
 	/*
-	 * Set flag to update flat database file at commit.
+	 * Set flag to update flat database file at commit.  Note: this also
+	 * forces synchronous commit, which minimizes the window between removal
+	 * of the database files and commital of the transaction. If we crash
+	 * before committing, we'll have a DB that's gone on disk but still there
+	 * according to pg_database, which is not good.
 	 */
 	database_file_update_needed();
 }
@@ -1648,8 +1701,6 @@ RenameDatabase(const char *oldname, const char *newname)
 	Oid			db_id = InvalidOid;
 	HeapTuple	newtup;
 	Relation	rel;
-	cqContext	cqc;
-	cqContext  *pcqCtx;
 
 	/*
 	 * Look up the target database's OID, and get exclusive lock on it. We
@@ -1707,20 +1758,14 @@ RenameDatabase(const char *oldname, const char *newname)
 						oldname)));
 
 	/* rename */
-
-	pcqCtx = caql_addrel(cqclr(&cqc), rel);
-	newtup = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_database "
-				" WHERE oid = :1 "
-				" FOR UPDATE ",
-				ObjectIdGetDatum(db_id)));
-
+	newtup = SearchSysCacheCopy(DATABASEOID,
+								ObjectIdGetDatum(db_id),
+								0, 0, 0);
 	if (!HeapTupleIsValid(newtup))
 		elog(ERROR, "cache lookup failed for database %u", db_id);
 	namestrcpy(&(((Form_pg_database) GETSTRUCT(newtup))->datname), newname);
-
-	caql_update_current(pcqCtx, newtup); /* implicit update of index as well */
+	simple_heap_update(rel, &newtup->t_self, newtup);
+	CatalogUpdateIndexes(rel, newtup);
 
 	/* MPP-6929: metadata tracking */
 	if (Gp_role == GP_ROLE_DISPATCH)
@@ -1792,7 +1837,7 @@ AlterDatabase(AlterDatabaseStmt *stmt)
 	ScanKeyInit(&scankey,
 				Anum_pg_database_datname,
 				BTEqualStrategyNumber, F_NAMEEQ,
-				NameGetDatum(stmt->dbname));
+				CStringGetDatum(stmt->dbname));
 	scan = systable_beginscan(rel, DatabaseNameIndexId, true,
 							  SnapshotNow, 1, &scankey);
 	tuple = systable_getnext(scan);
@@ -1868,16 +1913,16 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 	char	   *valuestr;
 	HeapTuple	tuple,
 		newtuple;
+	ScanKeyData scankey;
+	SysScanDesc scan;
 	Relation	rel;
-	cqContext	cqc;
-	cqContext  *pcqCtx;
 	Datum		repl_val[Natts_pg_database];
 	bool		repl_null[Natts_pg_database];
 	bool		repl_repl[Natts_pg_database];
 	Oid			dboid = InvalidOid;
 	char	   *alter_subtype = "SET"; /* metadata tracking */
 
-	valuestr = flatten_set_variable_args(stmt->variable, stmt->value);
+	valuestr = ExtractSetVariableArgs(stmt->setstmt);
 
 	/*
 	 * Get the old tuple.  We don't need a lock on the database per se,
@@ -1885,15 +1930,13 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 	 * connections.
 	 */
 	rel = heap_open(DatabaseRelationId, RowExclusiveLock);
-
-	pcqCtx = caql_addrel(cqclr(&cqc), rel);
-
-	tuple = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_database" 
-				" WHERE datname = :1 FOR UPDATE", 
-				CStringGetDatum(stmt->dbname)));
-
+	ScanKeyInit(&scankey,
+				Anum_pg_database_datname,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(stmt->dbname));
+	scan = systable_beginscan(rel, DatabaseNameIndexId, true,
+							  SnapshotNow, 1, &scankey);
+	tuple = systable_getnext(scan);
 	if (!HeapTupleIsValid(tuple))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_DATABASE),
@@ -1908,14 +1951,14 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 	memset(repl_repl, false, sizeof(repl_repl));
 	repl_repl[Anum_pg_database_datconfig - 1] = true;
 
-	if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
+	if (stmt->setstmt->kind == VAR_RESET_ALL)
 	{
-		alter_subtype = "RESET ALL";
-
 		ArrayType  *new = NULL;
 		Datum		datum;
 		bool		isnull;
 
+		alter_subtype = "RESET ALL";
+
 		/*
 		 * in RESET ALL, request GUC to reset the settings array; if none
 		 * left, we can set datconfig to null; otherwise use the returned
@@ -1928,6 +1971,7 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 		if (new)
 		{
 			repl_val[Anum_pg_database_datconfig - 1] = PointerGetDatum(new);
+			repl_repl[Anum_pg_database_datconfig - 1] = true;
 			repl_null[Anum_pg_database_datconfig - 1] = false;
 		}
 		else
@@ -1944,29 +1988,33 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 
 		repl_null[Anum_pg_database_datconfig - 1] = false;
 
+		/* Extract old value of datconfig */
 		datum = heap_getattr(tuple, Anum_pg_database_datconfig,
 							 RelationGetDescr(rel), &isnull);
-
 		a = isnull ? NULL : DatumGetArrayTypeP(datum);
 
+		/* Update (valuestr is NULL in RESET cases) */
 		if (valuestr)
-			a = GUCArrayAdd(a, stmt->variable, valuestr);
+			a = GUCArrayAdd(a, stmt->setstmt->name, valuestr);
 		else
 		{
 			alter_subtype = "RESET";
-			a = GUCArrayDelete(a, stmt->variable);
+			a = GUCArrayDelete(a, stmt->setstmt->name);
 		}
-
 		if (a)
 			repl_val[Anum_pg_database_datconfig - 1] = PointerGetDatum(a);
 		else
 			repl_null[Anum_pg_database_datconfig - 1] = true;
 	}
 
-	newtuple = caql_modify_current(pcqCtx,
-								   repl_val, repl_null, repl_repl);
-	caql_update_current(pcqCtx, newtuple); 
-	/* and Update indexes (implicit) */
+	newtuple = heap_modify_tuple(tuple, RelationGetDescr(rel),
+								 repl_val, repl_null, repl_repl);
+	simple_heap_update(rel, &tuple->t_self, newtuple);
+
+	/* Update indexes */
+	CatalogUpdateIndexes(rel, newtuple);
+
+	systable_endscan(scan);
 
 	/* MPP-6929: metadata tracking */
 	if (Gp_role == GP_ROLE_DISPATCH)
@@ -1988,31 +2036,30 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 
 		appendStringInfo(&buffer, "ALTER DATABASE \"%s\" ", stmt->dbname);
 		
-		if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
+		if (stmt->setstmt->kind ==  VAR_RESET_ALL)
 		{
 			appendStringInfo(&buffer, "RESET ALL");
 		}
 		else if (valuestr == NULL)
 		{
-			appendStringInfo(&buffer, "RESET \"%s\"", stmt->variable);
+			appendStringInfo(&buffer, "RESET \"%s\"", stmt->setstmt->name);
 		}
 		else
 		{
 			ListCell   *l;
-	
-			
-			appendStringInfo(&buffer, "SET \"%s\" TO ",stmt->variable);
-		
+			bool		first;
 
+			appendStringInfo(&buffer, "SET \"%s\" TO ",stmt->setstmt->name);
 		
 			/* Parse string into list of identifiers */
-
-			foreach(l, stmt->value)
+			first = true;
+			foreach(l, stmt->setstmt->args)
 			{
 				A_Const    *arg = (A_Const *) lfirst(l);
-				if (l != list_head(stmt->value))
+				if (!first)
 					appendStringInfo(&buffer, ",");
-				
+				first = false;
+
 				switch (nodeTag(&arg->val))
 				{
 					case T_Integer:
@@ -2302,27 +2349,102 @@ have_createdb_privilege(void)
 {
 	bool		result = false;
 	HeapTuple	utup;
-	cqContext  *pcqCtx;
 
 	/* Superusers can always do everything */
 	if (superuser())
 		return true;
 
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_authid "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(GetUserId())));
-
-	utup = caql_getnext(pcqCtx);
-
+	utup = SearchSysCache(AUTHOID,
+						  ObjectIdGetDatum(GetUserId()),
+						  0, 0, 0);
 	if (HeapTupleIsValid(utup))
+	{
 		result = ((Form_pg_authid) GETSTRUCT(utup))->rolcreatedb;
+		ReleaseSysCache(utup);
+	}
+	return result;
+}
 
-	caql_endscan(pcqCtx);
+/*
+ * Remove tablespace directories
+ *
+ * We don't know what tablespaces db_id is using, so iterate through all
+ * tablespaces removing <tablespace>/db_id
+ */
+/*
+ * GPDB_83_MERGE_FIXME: As noted in createdb_failure_callback() it's unclear
+ * why we in GPDB don't do remove_dbtablespaces(). Removing the code altogether
+ * makes for strange merge conflicts though so put back the code but blocked
+ * off with a preprocessor #if 0 until it has been investigated.
+ */
+#if 0
+static void
+remove_dbtablespaces(Oid db_id)
+{
+	Relation	rel;
+	HeapScanDesc scan;
+	HeapTuple	tuple;
+	Snapshot	snapshot;
 
-	return result;
+	/*
+	 * As in createdb(), we'd better use an MVCC snapshot here, since this
+	 * scan can run for a long time.  Duplicate visits to tablespaces would be
+	 * harmless, but missing a tablespace could result in permanently leaked
+	 * files.
+	 *
+	 * XXX change this when a generic fix for SnapshotNow races is implemented
+	 */
+	snapshot = CopySnapshot(GetLatestSnapshot());
+
+	rel = heap_open(TableSpaceRelationId, AccessShareLock);
+	scan = heap_beginscan(rel, snapshot, 0, NULL);
+	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+	{
+		Oid			dsttablespace = HeapTupleGetOid(tuple);
+		char	   *dstpath;
+		struct stat st;
+
+		/* Don't mess with the global tablespace */
+		if (dsttablespace == GLOBALTABLESPACE_OID)
+			continue;
+
+		dstpath = GetDatabasePath(db_id, dsttablespace);
+
+		if (lstat(dstpath, &st) < 0 || !S_ISDIR(st.st_mode))
+		{
+			/* Assume we can ignore it */
+			pfree(dstpath);
+			continue;
+		}
+
+		if (!rmtree(dstpath, true))
+			ereport(WARNING,
+					(errmsg("some useless files may be left behind in old database directory \"%s\"",
+							dstpath)));
+
+		/* Record the filesystem change in XLOG */
+		{
+			xl_dbase_drop_rec xlrec;
+			XLogRecData rdata[1];
+
+			xlrec.db_id = db_id;
+			xlrec.tablespace_id = dsttablespace;
+
+			rdata[0].data = (char *) &xlrec;
+			rdata[0].len = sizeof(xl_dbase_drop_rec);
+			rdata[0].buffer = InvalidBuffer;
+			rdata[0].next = NULL;
+
+			(void) XLogInsert(RM_DBASE_ID, XLOG_DBASE_DROP, rdata);
+		}
+
+		pfree(dstpath);
+	}
+
+	heap_endscan(scan);
+	heap_close(rel, AccessShareLock);
 }
+#endif
 
 /*
  * Check for existing files that conflict with a proposed new DB OID;
@@ -2340,14 +2462,23 @@ static bool
 check_db_file_conflict(Oid db_id)
 {
 	bool		result = false;
-	cqContext  *pcqCtx;
+	Relation	rel;
+	HeapScanDesc scan;
 	HeapTuple	tuple;
+	Snapshot	snapshot;
 
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_tablespace ", NULL));
+	/*
+	 * As in createdb(), we'd better use an MVCC snapshot here; missing a
+	 * tablespace could result in falsely reporting the OID is unique, with
+	 * disastrous future consequences per the comment above.
+	 *
+	 * XXX change this when a generic fix for SnapshotNow races is implemented
+	 */
+	snapshot = CopySnapshot(GetLatestSnapshot());
 
-	while (HeapTupleIsValid(tuple = caql_getnext(pcqCtx)))
+	rel = heap_open(TableSpaceRelationId, AccessShareLock);
+	scan = heap_beginscan(rel, snapshot, 0, NULL);
+	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
 	{
 		Oid			dsttablespace = HeapTupleGetOid(tuple);
 		char	   *dstpath;
@@ -2370,7 +2501,8 @@ check_db_file_conflict(Oid db_id)
 		pfree(dstpath);
 	}
 
-	caql_endscan(pcqCtx);
+	heap_endscan(scan);
+	heap_close(rel, AccessShareLock);
 	return result;
 }
 
@@ -2451,16 +2583,15 @@ dbase_redo(XLogRecPtr beginLoc  __attribute__((unused)), XLogRecPtr lsn  __attri
 		{
 			if (!rmtree(dst_path, true))
 				ereport(WARNING,
-						(errmsg("could not remove database directory \"%s\"",
+						(errmsg("some useless files may be left behind in old database directory \"%s\"",
 								dst_path)));
 		}
 
 		/*
 		 * Force dirty buffers out to disk, to ensure source database is
-		 * up-to-date for the copy.  (We really only need to flush buffers for
-		 * the source database, but bufmgr.c provides no API for that.)
+		 * up-to-date for the copy.
 		 */
-		BufferSync();
+		FlushDatabaseBuffers(xlrec->src_db_id);
 
 		/*
 		 * Copy this subdirectory to the new location
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 981352be08f5..9a0d9fc381a2 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/define.c,v 1.100 2007/01/05 22:19:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/define.c,v 1.101 2008/01/01 19:45:48 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c
new file mode 100644
index 000000000000..adf663f6ee91
--- /dev/null
+++ b/src/backend/commands/discard.c
@@ -0,0 +1,73 @@
+/*-------------------------------------------------------------------------
+ *
+ * discard.c
+ *	  The implementation of the DISCARD command
+ *
+ * Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/commands/discard.c,v 1.4.2.1 2008/11/27 00:34:49 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/xact.h"
+#include "catalog/namespace.h"
+#include "commands/async.h"
+#include "commands/discard.h"
+#include "commands/prepare.h"
+#include "commands/variable.h"
+#include "storage/lock.h"
+#include "utils/plancache.h"
+#include "utils/portal.h"
+
+static void DiscardAll(bool isTopLevel);
+
+/*
+ * DISCARD { ALL | TEMP | PLANS }
+ */
+void
+DiscardCommand(DiscardStmt *stmt, bool isTopLevel)
+{
+	switch (stmt->target)
+	{
+		case DISCARD_ALL:
+			DiscardAll(isTopLevel);
+			break;
+
+		case DISCARD_PLANS:
+			ResetPlanCache();
+			break;
+
+		case DISCARD_TEMP:
+			ResetTempTableNamespace();
+			break;
+
+		default:
+			elog(ERROR, "unrecognized DISCARD target: %d", stmt->target);
+	}
+}
+
+static void
+DiscardAll(bool isTopLevel)
+{
+	/*
+	 * Disallow DISCARD ALL in a transaction block. This is arguably
+	 * inconsistent (we don't make a similar check in the command sequence
+	 * that DISCARD ALL is equivalent to), but the idea is to catch mistakes:
+	 * DISCARD ALL inside a transaction block would leave the transaction
+	 * still uncommitted.
+	 */
+	PreventTransactionChain(isTopLevel, "DISCARD ALL");
+
+	SetPGVariable("session_authorization", NIL, false);
+	ResetAllOptions();
+	DropAllPreparedStatements();
+	PortalHashTableDeleteAll();
+	Async_UnlistenAll();
+	LockReleaseAll(USER_LOCKMETHOD, true);
+	ResetPlanCache();
+	ResetTempTableNamespace();
+}
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index e2bd7f3006da..90e7c3d9974e 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.155 2007/02/19 02:23:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.169 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"             /* AllocSetContextCreate() */
 #include "utils/resscheduler.h"
+#include "utils/tuplesort.h"
 #include "cdb/cdbdisp.h"                /* CheckDispatchResult() */
 #include "cdb/cdbexplain.h"             /* cdbexplain_recvExecStats */
 #include "cdb/cdbpartition.h"
@@ -50,6 +51,14 @@ extern char *SzDXLPlan(Query *parse);
 extern StringInfo OptVersion();
 #endif
 
+
+/* Hook for plugins to get control in ExplainOneQuery() */
+ExplainOneQuery_hook_type ExplainOneQuery_hook = NULL;
+
+/* Hook for plugins to get control in explain_get_index_name() */
+explain_get_index_name_hook_type explain_get_index_name_hook = NULL;
+
+
 typedef struct ExplainState
 {
 	/* options */
@@ -69,13 +78,14 @@ extern bool Test_print_direct_dispatch_info;
 static void ExplainOneQuery(Query *query, ExplainStmt *stmt,
 							const char *queryString,
 							ParamListInfo params, TupOutputState *tstate);
+static void report_triggers(ResultRelInfo *rInfo, bool show_relname,
+				StringInfo buf);
 
 #ifdef USE_ORCA
 static void ExplainDXL(Query *query, ExplainStmt *stmt,
 							const char *queryString,
 							ParamListInfo params, TupOutputState *tstate);
 #endif
-
 static double elapsed_time(instr_time *starttime);
 static ErrorData *explain_defer_error(ExplainState *es);
 static void explain_outNode(StringInfo str,
@@ -83,15 +93,17 @@ static void explain_outNode(StringInfo str,
 				Plan *outer_plan,
 				int indent, ExplainState *es);
 static void show_scan_qual(List *qual, const char *qlabel,
-			   int scanrelid, Plan *scan_plan, Plan *outer_plan,
+			   int scanrelid, Plan *outer_plan, Plan *inner_plan,
 			   StringInfo str, int indent, ExplainState *es);
-static void show_upper_qual(List *qual, const char *qlabel,
-				const char *outer_name, Plan *outer_plan,
-				const char *inner_name, Plan *inner_plan,
+static void show_upper_qual(List *qual, const char *qlabel, Plan *plan,
 				StringInfo str, int indent, ExplainState *es);
 static void show_sort_keys(Plan *sortplan, int nkeys, AttrNumber *keycols,
 			   const char *qlabel,
 			   StringInfo str, int indent, ExplainState *es);
+static void show_sort_info(SortState *sortstate,
+			   StringInfo str, int indent, ExplainState *es);
+static const char *explain_get_index_name(Oid indexId);
+
 static void
 show_grouping_keys(Plan        *plan,
                    int          numCols,
@@ -105,7 +117,6 @@ show_motion_keys(Plan *plan, List *hashExpr, int nkeys, AttrNumber *keycols,
 static void
 show_static_part_selection(PartitionSelector *ps, Sequence *parent, StringInfo str, int indent, ExplainState *es);
 
-static const char *explain_get_index_name(Oid indexId);
 
 /*
  * ExplainQuery -
@@ -115,60 +126,46 @@ void
 ExplainQuery(ExplainStmt *stmt, const char *queryString,
 			 ParamListInfo params, DestReceiver *dest)
 {
-	Query	   *query = stmt->query;
+	Oid		   *param_types;
+	int			num_params;
 	TupOutputState *tstate;
 	List	   *rewritten;
 	ListCell   *l;
 
+	/* Convert parameter type data to the form parser wants */
+	getParamListTypes(params, &param_types, &num_params);
+
 	/*
-	 * Because the planner is not cool about not scribbling on its input, we
-	 * make a preliminary copy of the source querytree.  This prevents
-	 * problems in the case that the EXPLAIN is in a portal or plpgsql
-	 * function and is executed repeatedly.  (See also the same hack in
-	 * DECLARE CURSOR and PREPARE.)  XXX the planner really shouldn't modify
-	 * its input ... FIXME someday.
+	 * Run parse analysis and rewrite.	Note this also acquires sufficient
+	 * locks on the source table(s).
+	 *
+	 * Because the parser and planner tend to scribble on their input, we make
+	 * a preliminary copy of the source querytree.	This prevents problems in
+	 * the case that the EXPLAIN is in a portal or plpgsql function and is
+	 * executed repeatedly.  (See also the same hack in DECLARE CURSOR and
+	 * PREPARE.)  XXX FIXME someday.
 	 */
-	query = copyObject(query);
+	rewritten = pg_analyze_and_rewrite((Node *) copyObject(stmt->query),
+									   queryString, param_types, num_params);
 
 	/* prepare for projection of tuples */
 	tstate = begin_tup_output_tupdesc(dest, ExplainResultDesc(stmt));
 
-	if (query->commandType == CMD_UTILITY)
+	if (rewritten == NIL)
 	{
-		/* Rewriter will not cope with utility statements */
-		if (query->utilityStmt && IsA(query->utilityStmt, DeclareCursorStmt))
-			ExplainOneQuery(query, stmt, queryString, params, tstate);
-		else if (query->utilityStmt && IsA(query->utilityStmt, ExecuteStmt))
-			ExplainExecuteQuery((ExecuteStmt *) stmt->query->utilityStmt, stmt, queryString, params, tstate);
-		else
-			do_text_output_oneline(tstate, "Utility statements have no plan structure");
+		/* In the case of an INSTEAD NOTHING, tell at least that */
+		do_text_output_oneline(tstate, "Query rewrites to nothing");
 	}
 	else
 	{
-		/*
-		 * Must acquire locks in case we didn't come fresh from the parser.
-		 * XXX this also scribbles on query, another reason for copyObject
-		 */
-		AcquireRewriteLocks(query);
-
-		/* Rewrite through rule system */
-		rewritten = QueryRewrite(query);
-
-		if (rewritten == NIL)
+		/* Explain every plan */
+		foreach(l, rewritten)
 		{
-			/* In the case of an INSTEAD NOTHING, tell at least that */
-			do_text_output_oneline(tstate, "Query rewrites to nothing");
-		}
-		else
-		{
-			/* Explain every plan */
-			foreach(l, rewritten)
-			{
-				ExplainOneQuery(lfirst(l), stmt, queryString, params, tstate);
-				/* put a blank line between plans */
-				if (lnext(l) != NULL)
-					do_text_output_oneline(tstate, "");
-			}
+			ExplainOneQuery((Query *) lfirst(l), stmt,
+							queryString, params, tstate);
+			/* put a blank line between plans */
+			if (lnext(l) != NULL)
+				do_text_output_oneline(tstate, "");
 		}
 	}
 
@@ -261,8 +258,6 @@ static void
 ExplainOneQuery(Query *query, ExplainStmt *stmt, const char *queryString,
 				ParamListInfo params, TupOutputState *tstate)
 {
-	PlannedStmt	*plan = NULL;
-
 #ifdef USE_ORCA
     if (stmt->dxl)
     {
@@ -279,26 +274,19 @@ ExplainOneQuery(Query *query, ExplainStmt *stmt, const char *queryString,
 		return;
 	}
 
-	/* plan the query */
-	//pstmt = planner(query, cursorOptions, params);
- 	plan = pg_plan_query(query,/*0,*/ params);
-
-	/*
-	 * Update snapshot command ID to ensure this query sees results of any
-	 * previously executed queries.  (It's a bit cheesy to modify
-	 * ActiveSnapshot without making a copy, but for the limited ways in which
-	 * EXPLAIN can be invoked, I think it's OK, because the active snapshot
-	 * shouldn't be shared with anything else anyway.)
-	 */
-	ActiveSnapshot->curcid = GetCurrentCommandId();
+	/* if an advisor plugin is present, let it manage things */
+	if (ExplainOneQuery_hook)
+		(*ExplainOneQuery_hook) (query, stmt, queryString, params, tstate);
+	else
+	{
+		PlannedStmt *plan;
 
-	/* Create a QueryDesc requesting no output */
-	//queryDesc = CreateQueryDesc(pstmt, queryString,
-	//							ActiveSnapshot, InvalidSnapshot,
-	//							None_Receiver, params,
-	//							stmt->analyze);
+		/* plan the query */
+		plan = planner(query, 0, params);
 
-	ExplainOnePlan(plan, stmt, queryString, params, tstate);
+		/* run it (if needed) and produce output */
+		ExplainOnePlan(plan, params, stmt, queryString, tstate);
+	}
 }
 
 /*
@@ -343,10 +331,8 @@ ExplainOneUtility(Node *utilityStmt, ExplainStmt *stmt,
  * to call it.
  */
 void
-ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
-			   const char *queryString,
-			   ParamListInfo params,
-			   TupOutputState *tstate)
+ExplainOnePlan(PlannedStmt *plannedstmt, ParamListInfo params,
+			   ExplainStmt *stmt, const char *queryString, TupOutputState *tstate)
 {
 	QueryDesc  *queryDesc;
 	instr_time	starttime;
@@ -359,14 +345,18 @@ ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
 	MemoryContext explaincxt = CurrentMemoryContext;
 
 	/*
-	 * Use a snapshot with an updated command ID to ensure this query sees
-	 * results of any previously executed queries.
+	 * Update snapshot command ID to ensure this query sees results of any
+	 * previously executed queries.  (It's a bit cheesy to modify
+	 * ActiveSnapshot without making a copy, but for the limited ways in which
+	 * EXPLAIN can be invoked, I think it's OK, because the active snapshot
+	 * shouldn't be shared with anything else anyway.)
 	 */
-	//PushUpdatedSnapshot(GetActiveSnapshot());
+	ActiveSnapshot->curcid = GetCurrentCommandId(false);
 
 	/* Create a QueryDesc requesting no output */
-	queryDesc = CreateQueryDesc(plannedstmt, queryString,
-			                    ActiveSnapshot, InvalidSnapshot,
+	queryDesc = CreateQueryDesc(plannedstmt,
+								queryString,
+								ActiveSnapshot, InvalidSnapshot,
 								None_Receiver, params,
 								stmt->analyze);
 
@@ -419,9 +409,8 @@ ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
     /* CDB: Find slice table entry for the root slice. */
     es->currentSlice = getCurrentSlice(estate, LocallyExecutingSliceIndex(estate));
 
-    /*
-     * Execute the plan for statistics if asked for.  Attempt to proceed
-     * with our report even if there is an error.
+	/* Execute the plan for statistics if asked for */
+	/* In GPDB, we attempt to proceed with our report even if there is an error.
      */
 	if (stmt->analyze)
 	{
@@ -469,6 +458,8 @@ ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
                                      es->showstatctx);
 	}
 
+	es->printAnalyze = stmt->analyze;
+	es->pstmt = queryDesc->plannedstmt;
 	es->rtable = queryDesc->plannedstmt->rtable;
 
     if (stmt->verbose)
@@ -566,6 +557,7 @@ ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
     }
     PG_CATCH();
     {
+		MemoryContextSwitchTo(explaincxt);
         es->deferredError = explain_defer_error(es);
 
         /* Keep a NUL at the end of the output buffer. */
@@ -579,59 +571,30 @@ ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
 	 * transaction, we can't measure them.)  Include into total runtime.
      * Skip triggers if there has been an error.
 	 */
-	if (stmt->analyze &&
+	if (es->printAnalyze &&
         !es->deferredError)
 	{
 		ResultRelInfo *rInfo;
+		bool		show_relname;
 		int			numrels = queryDesc->estate->es_num_result_relations;
+		List	   *targrels = queryDesc->estate->es_trig_target_relations;
 		int			nr;
+		ListCell   *l;
+
 
 		INSTR_TIME_SET_CURRENT(starttime);
 		AfterTriggerEndQuery(queryDesc->estate);
 		totaltime += elapsed_time(&starttime);
 
-	    /* Print info about runtime of triggers */
+		show_relname = (numrels > 1 || targrels != NIL);
 		rInfo = queryDesc->estate->es_result_relations;
 		for (nr = 0; nr < numrels; rInfo++, nr++)
-		{
-			int			nt;
-
-			if (!rInfo->ri_TrigDesc || !rInfo->ri_TrigInstrument)
-				continue;
-			for (nt = 0; nt < rInfo->ri_TrigDesc->numtriggers; nt++)
-			{
-				Trigger    *trig = rInfo->ri_TrigDesc->triggers + nt;
-				Instrumentation *instr = rInfo->ri_TrigInstrument + nt;
-				char	   *conname;
+			report_triggers(rInfo, show_relname, &buf);
 
-				/* Must clean up instrumentation state */
-				InstrEndLoop(instr);
-
-				/*
-				 * We ignore triggers that were never invoked; they likely
-				 * aren't relevant to the current query type.
-				 */
-				if (instr->ntuples == 0)
-					continue;
-
-				if (OidIsValid(trig->tgconstraint) &&
-					(conname = get_constraint_name(trig->tgconstraint)) != NULL)
-				{
-					appendStringInfo(&buf, "Trigger for constraint %s",
-									 conname);
-					pfree(conname);
-				}
-				else
-					appendStringInfo(&buf, "Trigger %s", trig->tgname);
-
-				if (numrels > 1)
-					appendStringInfo(&buf, " on %s",
-							RelationGetRelationName(rInfo->ri_RelationDesc));
-
-				appendStringInfo(&buf, ": time=%.3f calls=%.0f\n",
-								 1000.0 * instr->total,
-								 instr->ntuples);
-			}
+		foreach(l, targrels)
+		{
+			rInfo = (ResultRelInfo *) lfirst(l);
+			report_triggers(rInfo, show_relname, &buf);
 		}
 	}
 
@@ -732,6 +695,51 @@ ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
 		CommandCounterIncrement();
 }                               /* ExplainOnePlan_internal */
 
+/*
+ * report_triggers -
+ *		report execution stats for a single relation's triggers
+ */
+static void
+report_triggers(ResultRelInfo *rInfo, bool show_relname, StringInfo buf)
+{
+	int			nt;
+
+	if (!rInfo->ri_TrigDesc || !rInfo->ri_TrigInstrument)
+		return;
+	for (nt = 0; nt < rInfo->ri_TrigDesc->numtriggers; nt++)
+	{
+		Trigger    *trig = rInfo->ri_TrigDesc->triggers + nt;
+		Instrumentation *instr = rInfo->ri_TrigInstrument + nt;
+		char	   *conname;
+
+		/* Must clean up instrumentation state */
+		InstrEndLoop(instr);
+
+		/*
+		 * We ignore triggers that were never invoked; they likely aren't
+		 * relevant to the current query type.
+		 */
+		if (instr->ntuples == 0)
+			continue;
+
+		if (OidIsValid(trig->tgconstraint) &&
+			(conname = get_constraint_name(trig->tgconstraint)) != NULL)
+		{
+			appendStringInfo(buf, "Trigger for constraint %s", conname);
+			pfree(conname);
+		}
+		else
+			appendStringInfo(buf, "Trigger %s", trig->tgname);
+
+		if (show_relname)
+			appendStringInfo(buf, " on %s",
+							 RelationGetRelationName(rInfo->ri_RelationDesc));
+
+		appendStringInfo(buf, ": time=%.3f calls=%.0f\n",
+						 1000.0 * instr->total, instr->ntuples);
+	}
+}
+
 /* Compute elapsed time in seconds since given timestamp */
 static double
 elapsed_time(instr_time *starttime)
@@ -757,7 +765,7 @@ elapsed_time(instr_time *starttime)
  * handler and continue sequentially.  Otherwise we re-throw to the
  * next outer error handler.
  */
-ErrorData *
+static ErrorData *
 explain_defer_error(ExplainState *es)
 {
     ErrorData  *edata;
@@ -1192,7 +1200,7 @@ explain_outNode(StringInfo str,
 			if (ScanDirectionIsBackward(((IndexScan *) plan)->indexorderdir))
 				appendStringInfoString(str, " Backward");
 			appendStringInfo(str, " using %s",
-			  quote_identifier(get_rel_name(((IndexScan *) plan)->indexid)));
+					  explain_get_index_name(((IndexScan *) plan)->indexid));
 			/* FALL THRU */
 		case T_SeqScan:
 		case T_ExternalScan:
@@ -1367,19 +1375,19 @@ explain_outNode(StringInfo str,
 			show_scan_qual(((IndexScan *) plan)->indexqualorig,
 						   "Index Cond",
 						   ((Scan *) plan)->scanrelid,
-						   plan, outer_plan,
+						   outer_plan, NULL,
 						   str, indent, es);
 			show_scan_qual(plan->qual,
 						   "Filter",
 						   ((Scan *) plan)->scanrelid,
-						   plan, outer_plan,
+						   outer_plan, NULL,
 						   str, indent, es);
 			break;
 		case T_BitmapIndexScan:
 			show_scan_qual(((BitmapIndexScan *) plan)->indexqualorig,
 						   "Index Cond",
 						   ((Scan *) plan)->scanrelid,
-						   plan, outer_plan,
+						   outer_plan, NULL,
 						   str, indent, es);
 			break;
 		case T_BitmapHeapScan:
@@ -1391,7 +1399,7 @@ explain_outNode(StringInfo str,
 				show_scan_qual(((BitmapHeapScan *) plan)->bitmapqualorig,
 							   "Recheck Cond",
 							   ((Scan *) plan)->scanrelid,
-							   plan, outer_plan,
+							   outer_plan, NULL,
 							   str, indent, es);
 			}
 			else if (nodeTag(plan) == T_BitmapAppendOnlyScan)
@@ -1399,7 +1407,7 @@ explain_outNode(StringInfo str,
 				show_scan_qual(((BitmapAppendOnlyScan *) plan)->bitmapqualorig,
 							   "Recheck Cond",
 							   ((Scan *) plan)->scanrelid,
-							   plan, outer_plan,
+							   outer_plan, NULL,
 							   str, indent, es);
 			}
 			else if (nodeTag(plan) == T_BitmapTableScan)
@@ -1407,7 +1415,7 @@ explain_outNode(StringInfo str,
 				show_scan_qual(((BitmapTableScan *) plan)->bitmapqualorig,
 							   "Recheck Cond",
 							   ((Scan *) plan)->scanrelid,
-							   plan, outer_plan,
+							   outer_plan, NULL,
 							   str, indent, es);
 			}
 			/* FALL THRU */
@@ -1422,14 +1430,15 @@ explain_outNode(StringInfo str,
 			show_scan_qual(plan->qual,
 						   "Filter",
 						   ((Scan *) plan)->scanrelid,
-						   plan, outer_plan,
+						   outer_plan, NULL,
 						   str, indent, es);
 			break;
 		case T_SubqueryScan:
 			show_scan_qual(plan->qual,
 						   "Filter",
 						   ((Scan *) plan)->scanrelid,
-						   plan, outer_plan,
+						   outer_plan,
+						   ((SubqueryScan *) plan)->subplan,
 						   str, indent, es);
 			break;
 		case T_TidScan:
@@ -1445,42 +1454,32 @@ explain_outNode(StringInfo str,
 				show_scan_qual(tidquals,
 							   "TID Cond",
 							   ((Scan *) plan)->scanrelid,
-							   plan, outer_plan,
+							   outer_plan, NULL,
 							   str, indent, es);
 				show_scan_qual(plan->qual,
 							   "Filter",
 							   ((Scan *) plan)->scanrelid,
-							   plan, outer_plan,
+							   outer_plan, NULL,
 							   str, indent, es);
 			}
 			break;
 		case T_NestLoop:
 			show_upper_qual(((NestLoop *) plan)->join.joinqual,
-							"Join Filter",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+							"Join Filter", plan,
 							str, indent, es);
 			show_upper_qual(plan->qual,
-							"Filter",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+							"Filter", plan,
 							str, indent, es);
 			break;
 		case T_MergeJoin:
 			show_upper_qual(((MergeJoin *) plan)->mergeclauses,
-							"Merge Cond",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+							"Merge Cond", plan,
 							str, indent, es);
 			show_upper_qual(((MergeJoin *) plan)->join.joinqual,
-							"Join Filter",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+							"Join Filter", plan,
 							str, indent, es);
 			show_upper_qual(plan->qual,
-							"Filter",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+							"Filter", plan,
 							str, indent, es);
 			break;
 		case T_HashJoin: {
@@ -1494,27 +1493,19 @@ explain_outNode(StringInfo str,
 				cond_to_show = hash_join->hashqualclauses;
 			}
 			show_upper_qual(cond_to_show,
-							"Hash Cond",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+							"Hash Cond", plan,
 							str, indent, es);
-			show_upper_qual(hash_join->join.joinqual,
-							"Join Filter",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+			show_upper_qual(((HashJoin *) plan)->join.joinqual,
+							"Join Filter", plan,
 							str, indent, es);
 			show_upper_qual(plan->qual,
-							"Filter",
-							"outer", outerPlan(plan),
-							"inner", innerPlan(plan),
+							"Filter", plan,
 							str, indent, es);
 			break;
 		}
 		case T_Agg:
 			show_upper_qual(plan->qual,
-							"Filter",
-							NULL, outerPlan(plan),
-							NULL, NULL,
+							"Filter", plan,
 							str, indent, es);
 			show_grouping_keys(plan,
 						       ((Agg *) plan)->numCols,
@@ -1605,25 +1596,21 @@ explain_outNode(StringInfo str,
 						   ((Sort *) plan)->sortColIdx,
 						   SortKeystr,
 						   str, indent, es);
+			show_sort_info((SortState *) planstate,
+						   str, indent, es);
 		}
 			break;
 		case T_Result:
 			show_upper_qual((List *) ((Result *) plan)->resconstantqual,
-							"One-Time Filter",
-							NULL, outerPlan(plan),
-							NULL, NULL,
+							"One-Time Filter", plan,
 							str, indent, es);
 			show_upper_qual(plan->qual,
-							"Filter",
-							NULL, outerPlan(plan),
-							NULL, NULL,
+							"Filter", plan,
 							str, indent, es);
 			break;
 		case T_Repeat:
 			show_upper_qual(plan->qual,
-							"Filter",
-							NULL, outerPlan(plan),
-							NULL, NULL,
+							"Filter", plan,
 							str, indent, es);
 			break;
 		case T_Motion:
@@ -1648,9 +1635,7 @@ explain_outNode(StringInfo str,
 		case T_AssertOp:
 			{
 				show_upper_qual(plan->qual,
-								"Assert Cond",
-								NULL, outerPlan(plan),
-								NULL, NULL,
+								"Assert Cond", plan,
 								str, indent, es);
 			}
 			break;
@@ -1663,9 +1648,7 @@ explain_outNode(StringInfo str,
 					list_qual = list_make1(printablePredicate);
 				}
 				show_upper_qual(list_qual,
-								"Filter",
-								NULL, outerPlan(plan),
-								NULL, NULL,
+								"Filter", plan,
 								str, indent, es);
 				if (((PartitionSelector *) plan)->staticSelection)
 				{
@@ -1703,7 +1686,6 @@ explain_outNode(StringInfo str,
 	if (plan->initPlan)
 	{
         Slice      *saved_slice = es->currentSlice;
-		//List	   *saved_rtable = es->rtable;
 		ListCell   *lst;
 
 		foreach(lst, planstate->initPlan)
@@ -1733,8 +1715,6 @@ explain_outNode(StringInfo str,
             }
 
             appendStringInfoChar(str, '\n');
-
-            //es->rtable = sp->subplan_rtable;
 			for (i = 0; i < indent; i++)
 				appendStringInfo(str, "  ");
 			appendStringInfo(str, "    ->  ");
@@ -1745,7 +1725,6 @@ explain_outNode(StringInfo str,
 							indent + 4, es);
 		}
         es->currentSlice = saved_slice;
-		//es->rtable = saved_rtable;
 	}
 
 	/* lefttree */
@@ -1830,9 +1809,7 @@ explain_outNode(StringInfo str,
 			Plan *subnode = (Plan *) lfirst(lc);
 
 			for (i = 0; i < indent; i++)
-			{
 				appendStringInfo(str, "  ");
-			}
 			
 			appendStringInfo(str, "  ->  ");
 
@@ -1945,12 +1922,11 @@ explain_outNode(StringInfo str,
  */
 static void
 show_scan_qual(List *qual, const char *qlabel,
-			   int scanrelid, Plan *scan_plan, Plan *outer_plan,
+			   int scanrelid, Plan *outer_plan, Plan *inner_plan,
 			   StringInfo str, int indent, ExplainState *es)
 {
-	Node	   *outercontext;
 	List	   *context;
-	//bool		useprefix;
+	bool		useprefix;
 	Node	   *node;
 	char	   *exprstr;
 	int			i;
@@ -1962,32 +1938,14 @@ show_scan_qual(List *qual, const char *qlabel,
 	/* Convert AND list to explicit AND */
 	node = (Node *) make_ands_explicit(qual);
 
-	//useprefix = (outer_plan != NULL || inner_plan != NULL);
-	/*
-	 * If we have an outer plan that is referenced by the qual, add it to the
-	 * deparse context.  If not, don't (so that we don't force prefixes
-	 * unnecessarily).
-	 */
-	if (outer_plan)
-	{
-		Relids		varnos = pull_varnos(node);
-
-		if (bms_is_member(OUTER, varnos))
-			outercontext = deparse_context_for_subplan("outer",
-													   (Node *) outer_plan);
-		else
-			outercontext = NULL;
-		bms_free(varnos);
-	}
-	else
-		outercontext = NULL;
-
-	context = deparse_context_for_plan(OUTER, outercontext,
-									   0, NULL,
+	/* Set up deparsing context */
+	context = deparse_context_for_plan((Node *) outer_plan,
+									   (Node *) inner_plan,
 									   es->rtable);
+	useprefix = (outer_plan != NULL || inner_plan != NULL);
 
 	/* Deparse the expression */
-	exprstr = deparse_expr_sweet(node, context, (outercontext != NULL), false);
+	exprstr = deparse_expr_sweet(node, context, useprefix, false);
 
 	/* And add to str */
 	for (i = 0; i < indent; i++)
@@ -1999,51 +1957,24 @@ show_scan_qual(List *qual, const char *qlabel,
  * Show a qualifier expression for an upper-level plan node
  */
 static void
-show_upper_qual(List *qual, const char *qlabel,
-				const char *outer_name, Plan *outer_plan,
-				const char *inner_name, Plan *inner_plan,
+show_upper_qual(List *qual, const char *qlabel, Plan *plan,
 				StringInfo str, int indent, ExplainState *es)
 {
 	List	   *context;
-	Node	   *outercontext;
-	Node	   *innercontext;
-	int			outer_varno;
-	int			inner_varno;
+	bool		useprefix;
 	Node	   *node;
 	char	   *exprstr;
 	int			i;
-    bool		useprefix = inner_plan || list_length(es->rtable) > 1;  /*CDB*/
 
 	/* No work if empty qual */
 	if (qual == NIL)
 		return;
 
-	/* Generate deparse context */
-	if (outer_plan)
-	{
-		outercontext = deparse_context_for_subplan(outer_name,
-												   (Node *) outer_plan);
-		outer_varno = OUTER;
-	}
-	else
-	{
-		outercontext = NULL;
-		outer_varno = 0;
-	}
-	if (inner_plan)
-	{
-		innercontext = deparse_context_for_subplan(inner_name,
-												   (Node *) inner_plan);
-		inner_varno = INNER;
-	}
-	else
-	{
-		innercontext = NULL;
-		inner_varno = 0;
-	}
-	context = deparse_context_for_plan(outer_varno, outercontext,
-									   inner_varno, innercontext,
+	/* Set up deparsing context */
+	context = deparse_context_for_plan((Node *) outerPlan(plan),
+									   (Node *) innerPlan(plan),
 									   es->rtable);
+	useprefix = list_length(es->rtable) > 1;
 
 	/* Deparse the expression */
 	node = (Node *) make_ands_explicit(qual);
@@ -2081,36 +2012,10 @@ show_grouping_keys(Plan        *plan,
         appendStringInfoString(str, "  ");
     appendStringInfo(str, "  %s: ", qlabel);
 
-    /* Generate deparse context */
-	if (cdbpullup_exprHasSubplanRef((Expr *)subplan->targetlist))
-	{
-		Node	   *outerctx;
-		Node	   *innerctx;
-
-        if (subplan->righttree)
-        {
-            outerctx = deparse_context_for_subplan("outer",
-                                                   (Node *)subplan->lefttree);
-            innerctx = deparse_context_for_subplan("inner",
-                                                   (Node *)subplan->righttree);
-	        context = deparse_context_for_plan(OUTER, outerctx,
-									           INNER, innerctx,
-									           es->rtable);
-            useprefix = true;
-        }
-        else
-        {
-            outerctx = deparse_context_for_subplan(NULL,
-                                                   (Node *)subplan->lefttree);
-	        context = deparse_context_for_plan(OUTER, outerctx,
-									           0, NULL,
-									           es->rtable);
-        }
-	}
-	else
-		context = deparse_context_for_plan(0, NULL,
-										   0, NULL,
-										   es->rtable);
+	/* Set up deparse context */
+	context = deparse_context_for_plan((Node *) outerPlan(subplan),
+									   (Node *) innerPlan(subplan),
+									   es->rtable);
 
 	if (IsA(plan, Agg))
 	{
@@ -2183,27 +2088,11 @@ show_sort_keys(Plan *sortplan, int nkeys, AttrNumber *keycols,
 		appendStringInfo(str, "  ");
 	appendStringInfo(str, "  %s: ", qlabel);
 
-	/*
-	 * In this routine we expect that the plan node's tlist has not been
-	 * processed by set_plan_references().	Normally, any Vars will contain
-	 * valid varnos referencing the actual rtable.	But we might instead be
-	 * looking at a dummy tlist generated by prepunion.c; if there are Vars
-	 * with varno OUTER, use the tlist itself to determine their names.
-     * (NB: CDB uses varno OUTER; in PostgreSQL it was varno 0.)
-	 */
-	if (cdbpullup_exprHasSubplanRef((Expr *)sortplan->targetlist))
-	{
-		Node	   *outercontext;
-
-		outercontext = deparse_context_for_subplan(NULL, (Node *)sortplan);
-		context = deparse_context_for_plan(OUTER, outercontext,
-										   0, NULL,
-										   es->rtable);
-	}
-	else
-		context = deparse_context_for_plan(0, NULL,
-										   0, NULL,
-										   es->rtable);
+	/* Set up deparsing context */
+	context = deparse_context_for_plan((Node *) outerPlan(sortplan),
+									   NULL,	/* Sort has no innerPlan */
+									   es->rtable);
+	useprefix = list_length(es->rtable) > 1;
 
 	for (keyno = 0; keyno < nkeys; keyno++)
 	{
@@ -2244,21 +2133,10 @@ show_motion_keys(Plan *plan, List *hashExpr, int nkeys, AttrNumber *keycols,
         !hashExpr)
         return;
 
-    /* Generate deparse context */
-	if (cdbpullup_exprHasSubplanRef((Expr *)plan->targetlist) ||
-        cdbpullup_exprHasSubplanRef((Expr *)hashExpr))
-	{
-		Node	   *outercontext;
-
-	    outercontext = deparse_context_for_subplan(NULL, (Node *)plan);
-	    context = deparse_context_for_plan(OUTER, outercontext,
-									       0, NULL,
-									       es->rtable);
-	}
-	else
-		context = deparse_context_for_plan(0, NULL,
-										   0, NULL,
-										   es->rtable);
+	/* Set up deparse context */
+	context = deparse_context_for_plan((Node *) outerPlan(plan),
+									   NULL,	/* Motion has no innerPlan */
+									   es->rtable);
 
     /* Merge Receive ordering key */
     if (nkeys > 0)
@@ -2322,11 +2200,24 @@ show_static_part_selection(PartitionSelector *ps, Sequence *parent,
 
 	if (ps->printablePredicate)
 	{
-		show_upper_qual(list_make1(ps->printablePredicate),
-						"Partition Selector",
-						NULL, NULL,
-						NULL, (Plan *) parent,
-						str, indent, es);
+		List	   *context;
+		bool		useprefix;
+		char	   *exprstr;
+		int			i;
+
+		/* Set up deparsing context */
+		context = deparse_context_for_plan(NULL,
+										   (Node *) parent,
+										   es->rtable);
+		useprefix = list_length(es->rtable) > 1;
+
+		/* Deparse the expression */
+		exprstr = deparse_expr_sweet(ps->printablePredicate, context, useprefix, false);
+
+		/* And add to str */
+		for (i = 0; i < indent; i++)
+			appendStringInfo(str, "  ");
+		appendStringInfo(str, "  %s: %s\n", "Partition Selector", exprstr);
 	}
 
 	int nPartsSelected = list_length(ps->staticPartOids);
@@ -2339,6 +2230,31 @@ show_static_part_selection(PartitionSelector *ps, Sequence *parent,
 	appendStringInfo(str, "  Partitions selected: %d (out of %d)\n", nPartsSelected, nPartsTotal);
 }
 
+/*
+ * If it's EXPLAIN ANALYZE, show tuplesort explain info for a sort node
+ */
+static void
+show_sort_info(SortState *sortstate,
+			   StringInfo str, int indent, ExplainState *es)
+{
+	Assert(IsA(sortstate, SortState));
+	if (es->printAnalyze && sortstate->sort_Done &&
+		sortstate->tuplesortstate != NULL)
+	{
+		char	   *sortinfo;
+		int			i;
+
+		if (gp_enable_mk_sort)
+			sortinfo = tuplesort_explain_mk(sortstate->tuplesortstate->sortstore_mk);
+		else
+			sortinfo = tuplesort_explain(sortstate->tuplesortstate->sortstore);
+		for (i = 0; i < indent; i++)
+			appendStringInfo(str, "  ");
+		appendStringInfo(str, "  %s\n", sortinfo);
+		pfree(sortinfo);
+	}
+}
+
 /*
  * Fetch the name of an index in an EXPLAIN
  *
@@ -2348,12 +2264,12 @@ show_static_part_selection(PartitionSelector *ps, Sequence *parent,
 static const char *
 explain_get_index_name(Oid indexId)
 {
-	const char *result = NULL;
+	const char *result;
 
-	//if (explain_get_index_name_hook)
-	//	result = (*explain_get_index_name_hook) (indexId);
-	//else
-	//	result = NULL;
+	if (explain_get_index_name_hook)
+		result = (*explain_get_index_name_hook) (indexId);
+	else
+		result = NULL;
 	if (result == NULL)
 	{
 		/* default behavior: look in the catalogs and quote it */
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 6434a0999cc7..335f6c608716 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.82 2007/01/22 01:35:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.88.2.1 2009/02/24 01:38:49 tgl Exp $
  *
  *
  * DESCRIPTION
@@ -55,14 +55,15 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "cdb/cdbvars.h"
 #include "cdb/cdbdisp_query.h"
 
 static void AlterFunctionOwner_internal(cqContext *pcqCtx,
-										Relation rel, HeapTuple tup, 
-										Oid newOwnerId);
+							Relation rel, HeapTuple tup, 
+							Oid newOwnerId);
 static void CheckForModifySystemFunc(Oid funcOid, List *funcName);
 
 /*
@@ -82,12 +83,13 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 					Oid *prorettype_p, bool *returnsSet_p, Oid shelltypeOid)
 {
 	Oid			rettype;
+	Type		typtup;
 
-	rettype = LookupTypeName(NULL, returnType);
+	typtup = LookupTypeName(NULL, returnType, NULL);
 
-	if (OidIsValid(rettype))
+	if (typtup)
 	{
-		if (!get_typisdefined(rettype))
+		if (!((Form_pg_type) GETSTRUCT(typtup))->typisdefined)
 		{
 			if (languageOid == SQLlanguageId)
 				ereport(ERROR,
@@ -100,6 +102,8 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 						 errmsg("return type %s is only a shell",
 								TypeNameToString(returnType))));
 		}
+		rettype = typeTypeId(typtup);
+		ReleaseSysCache(typtup);
 	}
 	else
 	{
@@ -120,6 +124,13 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
 					 errmsg("type \"%s\" does not exist", typnam)));
 
+		/* Reject if there's typmod decoration, too */
+		if (returnType->typmods != NIL)
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+			errmsg("type modifier cannot be specified for shell type \"%s\"",
+				   typnam)));
+
 		/* Otherwise, go ahead and make a shell type */
 		if (Gp_role == GP_ROLE_EXECUTE)
 		{
@@ -142,7 +153,7 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 		if (aclresult != ACLCHECK_OK)
 			aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
 						   get_namespace_name(namespaceId));
-		rettype = TypeShellMakeWithOid(typname, namespaceId, GetUserId(), shelltypeOid);
+		rettype = TypeShellMake(typname, namespaceId, GetUserId(), shelltypeOid);
 		Assert(OidIsValid(rettype));
 	}
 
@@ -208,11 +219,12 @@ examine_parameter_list(List *parameters, Oid languageOid,
 		TypeName   *t = fp->argType;
 		bool		isinput = false;
 		Oid			toid;
+		Type		typtup;
 
-		toid = LookupTypeName(NULL, t);
-		if (OidIsValid(toid))
+		typtup = LookupTypeName(NULL, t, NULL);
+		if (typtup)
 		{
-			if (!get_typisdefined(toid))
+			if (!((Form_pg_type) GETSTRUCT(typtup))->typisdefined)
 			{
 				/* As above, hard error if language is SQL */
 				if (languageOid == SQLlanguageId)
@@ -226,6 +238,8 @@ examine_parameter_list(List *parameters, Oid languageOid,
 							 errmsg("argument type %s is only a shell",
 									TypeNameToString(t))));
 			}
+			toid = typeTypeId(typtup);
+			ReleaseSysCache(typtup);
 		}
 		else
 		{
@@ -233,6 +247,7 @@ examine_parameter_list(List *parameters, Oid languageOid,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
 					 errmsg("type %s does not exist",
 							TypeNameToString(t))));
+			toid = InvalidOid;	/* keep compiler quiet */
 		}
 
 		if (t->setof)
@@ -422,13 +437,15 @@ examine_parameter_list(List *parameters, Oid languageOid,
  * FUNCTION and ALTER FUNCTION and return it via one of the out
  * parameters. Returns true if the passed option was recognized. If
  * the out parameter we were going to assign to points to non-NULL,
- * raise a duplicate error.
+ * raise a duplicate-clause error.	(We don't try to detect duplicate
+ * SET parameters though --- if you're redundant, the last one wins.)
  */
 static bool
 compute_common_attribute(DefElem *defel,
 						 DefElem **volatility_item,
 						 DefElem **strict_item,
 						 DefElem **security_item,
+						 List **set_items,
 						 DefElem **cost_item,
 						 DefElem **rows_item,
 						 DefElem **data_access_item)
@@ -454,6 +471,10 @@ compute_common_attribute(DefElem *defel,
 
 		*security_item = defel;
 	}
+	else if (strcmp(defel->defname, "set") == 0)
+	{
+		*set_items = lappend(*set_items, defel->arg);
+	}
 	else if (strcmp(defel->defname, "cost") == 0)
 	{
 		if (*cost_item)
@@ -562,6 +583,38 @@ validate_sql_data_access(char data_access, char volatility, Oid languageOid)
 				 errhint("A SQL function cannot specify NO SQL.")));
 }
 
+/*
+ * Update a proconfig value according to a list of VariableSetStmt items.
+ *
+ * The input and result may be NULL to signify a null entry.
+ */
+static ArrayType *
+update_proconfig_value(ArrayType *a, List *set_items)
+{
+	ListCell   *l;
+
+	foreach(l, set_items)
+	{
+		VariableSetStmt *sstmt = (VariableSetStmt *) lfirst(l);
+
+		Assert(IsA(sstmt, VariableSetStmt));
+		if (sstmt->kind == VAR_RESET_ALL)
+			a = NULL;
+		else
+		{
+			char	   *valuestr = ExtractSetVariableArgs(sstmt);
+
+			if (valuestr)
+				a = GUCArrayAdd(a, sstmt->name, valuestr);
+			else	/* RESET */
+				a = GUCArrayDelete(a, sstmt->name);
+		}
+	}
+
+	return a;
+}
+
+
 /*
  * Dissect the list of options assembled in gram.y into function
  * attributes.
@@ -574,6 +627,7 @@ compute_attributes_sql_style(List *options,
 							 char *volatility_p,
 							 bool *strict_p,
 							 bool *security_definer,
+							 ArrayType **proconfig,
 							 float4 *procost,
 							 float4 *prorows,
 							 char *data_access)
@@ -584,6 +638,7 @@ compute_attributes_sql_style(List *options,
 	DefElem    *volatility_item = NULL;
 	DefElem    *strict_item = NULL;
 	DefElem    *security_item = NULL;
+	List	   *set_items = NIL;
 	DefElem    *cost_item = NULL;
 	DefElem    *rows_item = NULL;
 	DefElem    *data_access_item = NULL;
@@ -614,6 +669,7 @@ compute_attributes_sql_style(List *options,
 										  &volatility_item,
 										  &strict_item,
 										  &security_item,
+										  &set_items,
 										  &cost_item,
 										  &rows_item,
 										  &data_access_item))
@@ -670,6 +726,8 @@ compute_attributes_sql_style(List *options,
 		*strict_p = intVal(strict_item->arg);
 	if (security_item)
 		*security_definer = intVal(security_item->arg);
+	if (set_items)
+		*proconfig = update_proconfig_value(NULL, set_items);
 	if (cost_item)
 	{
 		*procost = defGetNumeric(cost_item);
@@ -960,6 +1018,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 	bool		isStrict,
 				security;
 	char		volatility;
+	ArrayType  *proconfig;
 	float4		procost;
 	float4		prorows;
 	HeapTuple	languageTuple;
@@ -983,6 +1042,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 	isStrict = false;
 	security = false;
 	volatility = PROVOLATILE_VOLATILE;
+	proconfig = NULL;
 	procost = -1;				/* indicates not set */
 	prorows = -1;				/* indicates not set */
 	dataAccess = PRODATAACCESS_NONE;
@@ -991,7 +1051,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 	compute_attributes_sql_style(stmt->options,
 								 &as_clause, &languageOid, &languageName,
 								 &volatility, &isStrict, &security,
-								 &procost, &prorows,
+								 &proconfig, &procost, &prorows,
 								 &dataAccess);
 
 	languageTuple = caql_getfirst(NULL,
@@ -1136,6 +1196,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
 					PointerGetDatum(parameterModes),
 					PointerGetDatum(parameterNames),
 					parameterDefaults,
+					PointerGetDatum(proconfig),
 					procost,
 					prorows,
 					dataAccess,
@@ -1541,6 +1602,7 @@ AlterFunction(AlterFunctionStmt *stmt)
 	DefElem    *volatility_item = NULL;
 	DefElem    *strict_item = NULL;
 	DefElem    *security_def_item = NULL;
+	List	   *set_items = NIL;
 	DefElem    *cost_item = NULL;
 	DefElem    *rows_item = NULL;
 	DefElem    *data_access_item = NULL;
@@ -1592,6 +1654,7 @@ AlterFunction(AlterFunctionStmt *stmt)
 									 &volatility_item,
 									 &strict_item,
 									 &security_def_item,
+									 &set_items,
 									 &cost_item,
 									 &rows_item,
 									 &data_access_item) == false)
@@ -1624,6 +1687,40 @@ AlterFunction(AlterFunctionStmt *stmt)
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("ROWS is not applicable when function does not return a set")));
 	}
+	if (set_items)
+	{
+		Datum		datum;
+		bool		isnull;
+		ArrayType  *a;
+		Datum		repl_val[Natts_pg_proc];
+		bool		repl_null[Natts_pg_proc];
+		bool		repl_repl[Natts_pg_proc];
+
+		/* extract existing proconfig setting */
+		datum = SysCacheGetAttr(PROCOID, tup, Anum_pg_proc_proconfig, &isnull);
+		a = isnull ? NULL : DatumGetArrayTypeP(datum);
+
+		/* update according to each SET or RESET item, left to right */
+		a = update_proconfig_value(a, set_items);
+
+		/* update the tuple */
+		memset(repl_repl, false, sizeof(repl_repl));
+		repl_repl[Anum_pg_proc_proconfig - 1] = true;
+
+		if (a == NULL)
+		{
+			repl_val[Anum_pg_proc_proconfig - 1] = (Datum) 0;
+			repl_null[Anum_pg_proc_proconfig - 1] = true;
+		}
+		else
+		{
+			repl_val[Anum_pg_proc_proconfig - 1] = PointerGetDatum(a);
+			repl_null[Anum_pg_proc_proconfig - 1] = false;
+		}
+
+		tup = heap_modify_tuple(tup, RelationGetDescr(rel),
+								repl_val, repl_null, repl_repl);
+	}
 	if (data_access_item)
 	{
 		Datum		repl_val[Natts_pg_proc];
@@ -1771,17 +1868,17 @@ CreateCast(CreateCastStmt *stmt)
 	cqContext	cqc2;
 	cqContext  *pcqCtx;
 
-	sourcetypeid = typenameTypeId(NULL, stmt->sourcetype);
-	targettypeid = typenameTypeId(NULL, stmt->targettype);
+	sourcetypeid = typenameTypeId(NULL, stmt->sourcetype, NULL);
+	targettypeid = typenameTypeId(NULL, stmt->targettype, NULL);
 
 	/* No pseudo-types allowed */
-	if (get_typtype(sourcetypeid) == 'p')
+	if (get_typtype(sourcetypeid) == TYPTYPE_PSEUDO)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("source data type %s is a pseudo-type",
 						TypeNameToString(stmt->sourcetype))));
 
-	if (get_typtype(targettypeid) == 'p')
+	if (get_typtype(targettypeid) == TYPTYPE_PSEUDO)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("target data type %s is a pseudo-type",
@@ -2021,8 +2118,8 @@ DropCast(DropCastStmt *stmt)
 	Oid			castOid;
 
 	/* when dropping a cast, the types must exist even if you use IF EXISTS */
-	sourcetypeid = typenameTypeId(NULL, stmt->sourcetype);
-	targettypeid = typenameTypeId(NULL, stmt->targettype);
+	sourcetypeid = typenameTypeId(NULL, stmt->sourcetype, NULL);
+	targettypeid = typenameTypeId(NULL, stmt->targettype, NULL);
 
 	castOid = caql_getoid_plus(
 			NULL,
@@ -2044,9 +2141,9 @@ DropCast(DropCastStmt *stmt)
 							TypeNameToString(stmt->targettype))));
 		else
 			ereport(NOTICE,
-					(errmsg("cast from type %s to type %s does not exist, skipping",
-							TypeNameToString(stmt->sourcetype),
-							TypeNameToString(stmt->targettype))));
+			 (errmsg("cast from type %s to type %s does not exist, skipping",
+					 TypeNameToString(stmt->sourcetype),
+					 TypeNameToString(stmt->targettype))));
 
 		return;
 	}
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index eb86f07d6dc1..7903aaf44fe2 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.155 2007/02/01 19:10:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.171 2008/02/07 17:09:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,11 +48,14 @@
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parsetree.h"
+#include "storage/proc.h"
+#include "storage/procarray.h"
 #include "tcop/utility.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/hsearch.h"
+#include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
@@ -99,7 +102,6 @@ bool gp_hash_index = false; /* hash index phase out. */
  * 'attributeList': a list of IndexElem specifying columns and expressions
  *		to index on.
  * 'predicate': the partial-index condition, or NULL if none.
- * 'rangetable': needed to interpret the predicate.
  * 'options': reloptions from WITH (in list-of-DefElem form).
  * 'unique': make the index enforce uniqueness.
  * 'primary': mark the index as a primary key in the catalogs.
@@ -126,7 +128,6 @@ DefineIndex(RangeVar *heapRelation,
 			char *tableSpaceName,
 			List *attributeList,
 			Expr *predicate,
-			List *rangetable,
 			List *options,
 			bool unique,
 			bool primary,
@@ -145,6 +146,7 @@ DefineIndex(RangeVar *heapRelation,
 	Oid			namespaceId;
 	Oid			tablespaceId;
 	Relation	rel;
+	Relation	indexRelation;
 	HeapTuple	tuple;
 	Form_pg_am	accessMethodForm;
 	bool		amcanorder;
@@ -153,21 +155,15 @@ DefineIndex(RangeVar *heapRelation,
 	int16	   *coloptions;
 	IndexInfo  *indexInfo;
 	int			numberOfAttributes;
-	List	   *old_xact_list;
-	ListCell   *lc;
-	uint32		ixcnt;
+	VirtualTransactionId *old_lockholders;
+	VirtualTransactionId *old_snapshots;
 	LockRelId	heaprelid;
 	LOCKTAG		heaplocktag;
 	Snapshot	snapshot;
-	Relation	pg_index;
-	HeapTuple	indexTuple;
-	Form_pg_index indexForm;
 	LOCKMODE	heap_lockmode;
 	bool		need_longlock = true;
 	bool		shouldDispatch = Gp_role == GP_ROLE_DISPATCH && !IsBootstrapProcessingMode();
 	char	   *altconname = stmt ? stmt->altconname : NULL;
-	cqContext	cqc;
-	cqContext  *pcqCtx;
 	cqContext  *amcqCtx;
 	cqContext  *attcqCtx;
 
@@ -237,7 +233,7 @@ DefineIndex(RangeVar *heapRelation,
 	}
 
 	/*
-	 * Select tablespace to use.  If not specified, use default_tablespace
+	 * Select tablespace to use.  If not specified, use default tablespace
 	 * (which may in turn default to database's default).
 	 *
 	 * Note: This code duplicates code in tablecmds.c
@@ -253,7 +249,8 @@ DefineIndex(RangeVar *heapRelation,
 	}
 	else
 	{
-		tablespaceId = GetDefaultTablespace();
+		tablespaceId = GetDefaultTablespace(rel->rd_istemp);
+		/* note InvalidOid is OK in this case */
 
 		/* Need the real tablespace id for dispatch */
 		if (!OidIsValid(tablespaceId)) 
@@ -382,18 +379,6 @@ DefineIndex(RangeVar *heapRelation,
 
 	caql_endscan(amcqCtx);
 
-	/*
-	 * If a range table was created then check that only the base rel is
-	 * mentioned.
-	 */
-	if (rangetable != NIL)
-	{
-		if (list_length(rangetable) != 1 || getrelid(1, rangetable) != relationId)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
-					 errmsg("index expressions and predicates can refer only to the table being indexed")));
-	}
-
 	/*
 	 * Validate predicate, if given
 	 */
@@ -464,7 +449,7 @@ DefineIndex(RangeVar *heapRelation,
 				/*
 				 * This shouldn't happen during CREATE TABLE, but can happen
 				 * during ALTER TABLE.	Keep message in sync with
-				 * transformIndexConstraints() in parser/analyze.c.
+				 * transformIndexConstraints() in parser/parse_utilcmd.c.
 				 */
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_COLUMN),
@@ -506,7 +491,10 @@ DefineIndex(RangeVar *heapRelation,
 	indexInfo->ii_Predicate = make_ands_implicit(predicate);
 	indexInfo->ii_PredicateState = NIL;
 	indexInfo->ii_Unique = unique;
+	/* In a concurrent build, mark it not-ready-for-inserts */
+	indexInfo->ii_ReadyForInserts = !concurrent;
 	indexInfo->ii_Concurrent = concurrent;
+	indexInfo->ii_BrokenHotChain = false;
 	indexInfo->opaque = (void*)palloc0(sizeof(IndexInfoOpaque));
 
 	classObjectId = (Oid *) palloc(numberOfAttributes * sizeof(Oid));
@@ -591,9 +579,11 @@ DefineIndex(RangeVar *heapRelation,
 
 	if (rel_needs_long_lock(RelationGetRelid(rel)))
 		need_longlock = true;
+	/* if this is a concurrent build, we must lock you long time */
+	else if (concurrent)
+		need_longlock = true;
 	else
-		/* if this is a concurrent build, we must lock you long time */
-		need_longlock = (false || concurrent);
+		need_longlock = false;
 
    	if (shouldDispatch)
 	{
@@ -660,35 +650,50 @@ DefineIndex(RangeVar *heapRelation,
 		 */
 	}
 
-	/* save lockrelid for below, then close rel */
+	/* save lockrelid and locktag for below, then close rel */
 	heaprelid = rel->rd_lockInfo.lockRelId;
+	SET_LOCKTAG_RELATION(heaplocktag, heaprelid.dbId, heaprelid.relId);
 	if (need_longlock)
 		heap_close(rel, NoLock);
 	else
 		heap_close(rel, heap_lockmode);
 
-	indexRelationId =
-		index_create(relationId, indexRelationName, indexRelationId,
-					 indexInfo, accessMethodId, tablespaceId, classObjectId,
-					 coloptions, reloptions, primary, isconstraint, &(stmt->constrOid),
-					 allowSystemTableModsDDL, skip_build, concurrent, altconname);
+	if (!concurrent)
+	{
+		indexRelationId =
+			index_create(relationId, indexRelationName, indexRelationId,
+					  indexInfo, accessMethodId, tablespaceId, classObjectId,
+						 coloptions, reloptions, primary, isconstraint, &stmt->constrOid,
+						 allowSystemTableModsDDL, skip_build, concurrent, altconname);
 
-	/*
-	 * Dispatch the command to all primary and mirror segment dbs.
-	 * Start a global transaction and reconfigure cluster if needed.
-	 * Wait for QEs to finish.  Exit via ereport(ERROR,...) if error.
-	 * (For a concurrent build, we do this later, see below.)
-	 */
-	if (shouldDispatch && !concurrent)
-		CdbDispatchUtilityStatement((Node *) stmt, "DefineIndex");
+		/*
+		 * Dispatch the command to all primary and mirror segment dbs.
+		 * Start a global transaction and reconfigure cluster if needed.
+		 * Wait for QEs to finish.  Exit via ereport(ERROR,...) if error.
+		 * (For a concurrent build, we do this later, see below.)
+		 */
+		if (shouldDispatch)
+			CdbDispatchUtilityStatement((Node *) stmt, "DefineIndex");
 
-	if (!concurrent)
 		return;					/* We're done, in the standard case */
+	}
+
+	/*
+	 * For a concurrent build, we next insert the catalog entry and add
+	 * constraints.  We don't build the index just yet; we must first make the
+	 * catalog entry so that the new index is visible to updating
+	 * transactions.  That will prevent them from making incompatible HOT
+	 * updates.  The new index will be marked not indisready and not
+	 * indisvalid, so that no one else tries to either insert into it or use
+	 * it for queries.	We pass skip_build = true to prevent the build.
+	 */
+	indexRelationId =
+		index_create(relationId, indexRelationName, indexRelationId,
+					 indexInfo, accessMethodId, tablespaceId, classObjectId,
+					 coloptions, reloptions, primary, isconstraint, &stmt->constrOid,
+					 allowSystemTableModsDDL, true, concurrent, altconname);
 
 	/*
-	 * Phase 2 of concurrent index build (see comments for validate_index()
-	 * for an overview of how this works)
-	 *
 	 * We must commit our current transaction so that the index becomes
 	 * visible; then start another.  Note that all the data structures we just
 	 * built are lost in the commit.  The only data we keep past here are the
@@ -751,6 +756,9 @@ DefineIndex(RangeVar *heapRelation,
 	StartTransactionCommand();
 
 	/*
+	 * Phase 2 of concurrent index build (see comments for validate_index()
+	 * for an overview of how this works)
+	 *
 	 * Now we must wait until no running transaction could have the table open
 	 * with the old list of indexes.  To do this, inquire which xacts
 	 * currently would conflict with ShareLock on the table -- ie, which ones
@@ -759,24 +767,102 @@ DefineIndex(RangeVar *heapRelation,
 	 * xacts that open the table for writing after this point; they will see
 	 * the new index when they open it.
 	 *
+	 * Note: the reason we use actual lock acquisition here, rather than just
+	 * checking the ProcArray and sleeping, is that deadlock is possible if
+	 * one of the transactions in question is blocked trying to acquire an
+	 * exclusive lock on our table.  The lock code will detect deadlock and
+	 * error out properly.
+	 *
 	 * Note: GetLockConflicts() never reports our own xid, hence we need not
-	 * check for that.
+	 * check for that.	Also, prepared xacts are not reported, which is fine
+	 * since they certainly aren't going to do anything more.
 	 */
-	SET_LOCKTAG_RELATION(heaplocktag, heaprelid.dbId, heaprelid.relId);
-	old_xact_list = GetLockConflicts(&heaplocktag, ShareLock);
+	old_lockholders = GetLockConflicts(&heaplocktag, ShareLock);
 
-	foreach(lc, old_xact_list)
+	while (VirtualTransactionIdIsValid(*old_lockholders))
 	{
-		TransactionId xid = lfirst_xid(lc);
+		VirtualXactLockTableWait(*old_lockholders);
+		old_lockholders++;
+	}
+
+	/*
+	 * At this moment we are sure that there are no transactions with the
+	 * table open for write that don't have this new index in their list of
+	 * indexes.  We have waited out all the existing transactions and any new
+	 * transaction will have the new index in its list, but the index is still
+	 * marked as "not-ready-for-inserts".  The index is consulted while
+	 * deciding HOT-safety though.	This arrangement ensures that no new HOT
+	 * chains can be created where the new tuple and the old tuple in the
+	 * chain have different index keys.
+	 *
+	 * We now take a new snapshot, and build the index using all tuples that
+	 * are visible in this snapshot.  We can be sure that any HOT updates to
+	 * these tuples will be compatible with the index, since any updates made
+	 * by transactions that didn't know about the index are now committed or
+	 * rolled back.  Thus, each visible tuple is either the end of its
+	 * HOT-chain or the extension of the chain is HOT-safe for this index.
+	 */
+
+	/* Open and lock the parent heap relation */
+	rel = heap_openrv(heapRelation, ShareUpdateExclusiveLock);
+
+	/* And the target index relation */
+	indexRelation = index_open(indexRelationId, RowExclusiveLock);
+
+	/* Set ActiveSnapshot since functions in the indexes may need it */
+	ActiveSnapshot = CopySnapshot(GetTransactionSnapshot());
+
+	/* We have to re-build the IndexInfo struct, since it was lost in commit */
+	indexInfo = BuildIndexInfo(indexRelation);
+	Assert(!indexInfo->ii_ReadyForInserts);
+	indexInfo->ii_Concurrent = true;
+	indexInfo->ii_BrokenHotChain = false;
+
+	/* Now build the index */
+	index_build(rel, indexRelation, indexInfo, primary, false);
+
+	/* Close both the relations, but keep the locks */
+	heap_close(rel, NoLock);
+	index_close(indexRelation, NoLock);
+
+	/*
+	 * Update the pg_index row to mark the index as ready for inserts. Once we
+	 * commit this transaction, any new transactions that open the table must
+	 * insert new entries into the index for insertions and non-HOT updates.
+	 */
+	index_set_state_flags(indexRelationId, INDEX_CREATE_SET_READY);
+
+	/*
+	 * Commit this transaction to make the indisready update visible.
+	 */
+	CommitTransactionCommand();
+	StartTransactionCommand();
+
+	/*
+	 * Phase 3 of concurrent index build
+	 *
+	 * We once again wait until no transaction can have the table open with
+	 * the index marked as read-only for updates.
+	 */
+	old_lockholders = GetLockConflicts(&heaplocktag, ShareLock);
 
-		XactLockTableWait(xid);
+	while (VirtualTransactionIdIsValid(*old_lockholders))
+	{
+		VirtualXactLockTableWait(*old_lockholders);
+		old_lockholders++;
 	}
 
 	/*
 	 * Now take the "reference snapshot" that will be used by validate_index()
-	 * to filter candidate tuples.	All other transactions running at this
-	 * time will have to be out-waited before we can commit, because we can't
-	 * guarantee that tuples deleted just before this will be in the index.
+	 * to filter candidate tuples.	Beware!  There might still be snapshots in
+	 * use that treat some transaction as in-progress that our reference
+	 * snapshot treats as committed.  If such a recently-committed transaction
+	 * deleted tuples in the table, we will not include them in the index; yet
+	 * those transactions which see the deleting one as still-in-progress will
+	 * expect them to be there once we mark the index as valid.
+	 *
+	 * We solve this by waiting for all endangered transactions to exit before
+	 * we mark the index as valid.
 	 *
 	 * We also set ActiveSnapshot to this snap, since functions in indexes may
 	 * need a snapshot.
@@ -793,40 +879,46 @@ DefineIndex(RangeVar *heapRelation,
 	 * The index is now valid in the sense that it contains all currently
 	 * interesting tuples.	But since it might not contain tuples deleted just
 	 * before the reference snap was taken, we have to wait out any
-	 * transactions older than the reference snap.	We can do this by waiting
-	 * for each xact explicitly listed in the snap.
+	 * transactions that might have older snapshots.  Obtain a list of VXIDs
+	 * of such transactions, and wait for them individually.
+	 *
+	 * We can exclude any running transactions that have xmin >= the xmax of
+	 * our reference snapshot, since they are clearly not interested in any
+	 * missing older tuples.  Transactions in other DBs aren't a problem
+	 * either, since they'll never even be able to see this index.
 	 *
-	 * Note: GetSnapshotData() never stores our own xid into a snap, hence we
-	 * need not check for that.
+	 * We can also exclude autovacuum processes and processes running manual
+	 * lazy VACUUMs, because they won't be fazed by missing index entries
+	 * either.  (Manual ANALYZEs, however, can't be excluded because they
+	 * might be within transactions that are going to do arbitrary operations
+	 * later.)
+	 *
+	 * Also, GetCurrentVirtualXIDs never reports our own vxid, so we need not
+	 * check for that.
 	 */
-	for (ixcnt = 0; ixcnt < snapshot->xcnt; ixcnt++)
-		XactLockTableWait(snapshot->xip[ixcnt]);
-
-	/* Index can now be marked valid -- update its pg_index entry */
-	pg_index = heap_open(IndexRelationId, RowExclusiveLock);
-
-	pcqCtx = caql_addrel(cqclr(&cqc), pg_index);
-
-	indexTuple = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_index "
-				" WHERE indexrelid = :1 "
-				" FOR UPDATE ",
-				ObjectIdGetDatum(indexRelationId)));
-
-	if (!HeapTupleIsValid(indexTuple))
-		elog(ERROR, "cache lookup failed for index %u", indexRelationId);
-	indexForm = (Form_pg_index) GETSTRUCT(indexTuple);
-
-	Assert(indexForm->indexrelid = indexRelationId);
-	Assert(!indexForm->indisvalid);
+	old_snapshots = GetCurrentVirtualXIDs(ActiveSnapshot->xmax, false,
+										  PROC_IS_AUTOVACUUM | PROC_IN_VACUUM);
 
-	indexForm->indisvalid = true;
+	while (VirtualTransactionIdIsValid(*old_snapshots))
+	{
+		VirtualXactLockTableWait(*old_snapshots);
+		old_snapshots++;
+	}
 
-	caql_update_current(pcqCtx, indexTuple); 
-	/* and Update indexes (implicit) */
+	/*
+	 * Index can now be marked valid -- update its pg_index entry
+	 */
+	index_set_state_flags(indexRelationId, INDEX_CREATE_SET_VALID);
 
-	heap_close(pg_index, RowExclusiveLock);
+	/*
+	 * The pg_index update will cause backends (including this one) to update
+	 * relcache entries for the index itself, but we should also send a
+	 * relcache inval on the parent table to force replanning of cached plans.
+	 * Otherwise existing sessions might fail to use the new index where it
+	 * would be useful.  (Note that our earlier commits did not create reasons
+	 * to replan; so relcache flush on the index itself was sufficient.)
+	 */
+	CacheInvalidateRelcacheByRelid(heaprelid.relId);
 
 	/*
 	 * Last thing to do is release the session-level lock on the parent table.
@@ -992,9 +1084,9 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
 										  accessMethodId);
 
 		/*
-		 * Set up the per-column options (indoption field).  For now, this
-		 * is zero for any un-ordered index, while ordered indexes have DESC
-		 * and NULLS FIRST/LAST options.
+		 * Set up the per-column options (indoption field).  For now, this is
+		 * zero for any un-ordered index, while ordered indexes have DESC and
+		 * NULLS FIRST/LAST options.
 		 */
 		colOptionP[attn] = 0;
 		if (amcanorder)
@@ -1820,6 +1912,7 @@ ReindexTable(ReindexStmt *stmt)
  *
  * To reduce the probability of deadlocks, each table is reindexed in a
  * separate transaction, so we can release the lock on it right away.
+ * That means this must not be called within a user transaction block!
  */
 void
 ReindexDatabase(ReindexStmt *stmt)
@@ -1845,14 +1938,6 @@ ReindexDatabase(ReindexStmt *stmt)
 		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
 					   databaseName);
 
-	/*
-	 * We cannot run inside a user transaction block; if we were inside a
-	 * transaction, then our commit- and start-transaction-command calls would
-	 * not have the intended effect!
-	 */
-	if (Gp_role == GP_ROLE_DISPATCH)
-		PreventTransactionChain((void *) databaseName, "REINDEX DATABASE");
-
 	/*
 	 * Create a memory context that will survive forced transaction commits we
 	 * do below.  Since it is a child of PortalContext, it will go away
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index 87f1391ad831..511e34ebb296 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/lockcmds.c,v 1.16 2007/01/05 22:19:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/lockcmds.c,v 1.17 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 0a68fc6b16cd..5081358b6d90 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.54 2007/02/01 19:10:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.58.2.1 2010/07/03 13:53:38 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,26 +61,26 @@ static void AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid,
 				 int maxOpNumber, int maxProcNumber,
 				 List *items);
 static void AlterOpFamilyDrop(List *opfamilyname, Oid amoid, Oid opfamilyoid,
-				 int maxOpNumber, int maxProcNumber,
-				 List *items);
+				  int maxOpNumber, int maxProcNumber,
+				  List *items);
 static void processTypesSpec(List *args, Oid *lefttype, Oid *righttype);
 static void assignOperTypes(OpFamilyMember *member, Oid amoid, Oid typeoid);
 static void assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid);
 static void addFamilyMember(List **list, OpFamilyMember *member, bool isProc);
 static void storeOperators(List *opfamilyname, Oid amoid,
-						   Oid opfamilyoid, Oid opclassoid,
-						   List *operators, bool isAdd);
+			   Oid opfamilyoid, Oid opclassoid,
+			   List *operators, bool isAdd);
 static void storeProcedures(List *opfamilyname, Oid amoid,
-							Oid opfamilyoid, Oid opclassoid,
-							List *procedures, bool isAdd);
+				Oid opfamilyoid, Oid opclassoid,
+				List *procedures, bool isAdd);
 static void dropOperators(List *opfamilyname, Oid amoid, Oid opfamilyoid,
-						  List *operators);
+			  List *operators);
 static void dropProcedures(List *opfamilyname, Oid amoid, Oid opfamilyoid,
-						   List *procedures);
+			   List *procedures);
 static void AlterOpClassOwner_internal(Relation rel, HeapTuple tuple,
 						   Oid newOwnerId);
 static void AlterOpFamilyOwner_internal(Relation rel, HeapTuple tuple,
-						   Oid newOwnerId);
+							Oid newOwnerId);
 
 
 /*
@@ -113,7 +113,7 @@ OpFamilyCacheLookup(Oid amID, List *opfamilyname)
 	else
 	{
 		/* Unqualified opfamily name, so search the search path */
-		Oid		opfID = OpfamilynameGetOpfid(amID, opfname);
+		Oid			opfID = OpfamilynameGetOpfid(amID, opfname);
 
 		if (!OidIsValid(opfID))
 			return NULL;
@@ -153,7 +153,7 @@ OpClassCacheLookup(Oid amID, List *opclassname)
 	else
 	{
 		/* Unqualified opclass name, so search the search path */
-		Oid		opcID = OpclassnameGetOpcid(amID, opcname);
+		Oid			opcID = OpclassnameGetOpcid(amID, opcname);
 
 		if (!OidIsValid(opcID))
 			return NULL;
@@ -343,7 +343,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
 				 errmsg("must be superuser to create an operator class")));
 
 	/* Look up the datatype */
-	typeoid = typenameTypeId(NULL, stmt->datatype);
+	typeoid = typenameTypeId(NULL, stmt->datatype, NULL);
 
 #ifdef NOT_USED
 	/* XXX this is unnecessary given the superuser check above */
@@ -364,8 +364,9 @@ DefineOpClass(CreateOpClassStmt *stmt)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
 					 errmsg("operator family \"%s\" does not exist for access method \"%s\"",
-							NameListToString(stmt->opfamilyname), stmt->amname)));
+					   NameListToString(stmt->opfamilyname), stmt->amname)));
 		opfamilyoid = HeapTupleGetOid(tup);
+
 		/*
 		 * XXX given the superuser check above, there's no need for an
 		 * ownership check here
@@ -383,6 +384,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
 		if (HeapTupleIsValid(tup))
 		{
 			opfamilyoid = HeapTupleGetOid(tup);
+
 			/*
 			 * XXX given the superuser check above, there's no need for an
 			 * ownership check here
@@ -502,7 +504,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 						   errmsg("storage type specified more than once")));
-				storageoid = typenameTypeId(NULL, item->storedtype);
+				storageoid = typenameTypeId(NULL, item->storedtype, NULL);
 
 #ifdef NOT_USED
 				/* XXX this is unnecessary given the superuser check above */
@@ -627,7 +629,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
 					opclassoid, procedures, false);
 
 	/*
-	 * Create dependencies for the opclass proper.  Note: we do not create a
+	 * Create dependencies for the opclass proper.	Note: we do not create a
 	 * dependency link to the AM, because we don't currently support DROP
 	 * ACCESS METHOD.
 	 */
@@ -725,8 +727,8 @@ DefineOpFamily(CreateOpFamilyStmt *stmt)
 	ReleaseSysCache(tup);
 
 	/*
-	 * Currently, we require superuser privileges to create an opfamily.
-	 * See comments in DefineOpClass.
+	 * Currently, we require superuser privileges to create an opfamily. See
+	 * comments in DefineOpClass.
 	 *
 	 * XXX re-enable NOT_USED code sections below if you remove this test.
 	 */
@@ -928,7 +930,7 @@ AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid,
 					ereport(ERROR,
 							(errcode(ERRCODE_SYNTAX_ERROR),
 							 errmsg("operator argument types must be specified in ALTER OPERATOR FAMILY")));
-					operOid = InvalidOid; /* keep compiler quiet */
+					operOid = InvalidOid;		/* keep compiler quiet */
 				}
 
 #ifdef NOT_USED
@@ -984,7 +986,7 @@ AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid,
 			case OPCLASS_ITEM_STORAGETYPE:
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
-						   errmsg("STORAGE cannot be specified in ALTER OPERATOR FAMILY")));
+						 errmsg("STORAGE cannot be specified in ALTER OPERATOR FAMILY")));
 				break;
 			default:
 				elog(ERROR, "unrecognized item type: %d", item->itemtype);
@@ -1087,12 +1089,12 @@ processTypesSpec(List *args, Oid *lefttype, Oid *righttype)
 	Assert(args != NIL);
 
 	typeName = (TypeName *) linitial(args);
-	*lefttype = typenameTypeId(NULL, typeName);
+	*lefttype = typenameTypeId(NULL, typeName, NULL);
 
 	if (list_length(args) > 1)
 	{
 		typeName = (TypeName *) lsecond(args);
-		*righttype = typenameTypeId(NULL, typeName);
+		*righttype = typenameTypeId(NULL, typeName, NULL);
 	}
 	else
 		*righttype = *lefttype;
@@ -1208,10 +1210,10 @@ assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid)
 	else
 	{
 		/*
-		 * The default for GiST and GIN in CREATE OPERATOR CLASS is to use
-		 * the class' opcintype as lefttype and righttype.  In CREATE or
-		 * ALTER OPERATOR FAMILY, opcintype isn't available, so make the
-		 * user specify the types.
+		 * The default for GiST and GIN in CREATE OPERATOR CLASS is to use the
+		 * class' opcintype as lefttype and righttype.  In CREATE or ALTER
+		 * OPERATOR FAMILY, opcintype isn't available, so make the user
+		 * specify the types.
 		 */
 		if (!OidIsValid(member->lefttype))
 			member->lefttype = typeoid;
@@ -1653,11 +1655,11 @@ RemoveOpFamily(RemoveOpFamilyStmt *stmt)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
 					 errmsg("operator family \"%s\" does not exist for access method \"%s\"",
-						NameListToString(stmt->opfamilyname), stmt->amname)));
+					   NameListToString(stmt->opfamilyname), stmt->amname)));
 		else
 			ereport(NOTICE,
 					(errmsg("operator family \"%s\" does not exist for access method \"%s\"",
-						NameListToString(stmt->opfamilyname), stmt->amname)));
+					   NameListToString(stmt->opfamilyname), stmt->amname)));
 		return;
 	}
 
@@ -2064,6 +2066,27 @@ AlterOpClassOwner(List *name, const char *access_method, Oid newOwnerId)
 	heap_close(rel, NoLock);
 }
 
+/*
+ * Change operator class owner, specified by OID
+ */
+void
+AlterOpClassOwner_oid(Oid opclassOid, Oid newOwnerId)
+{
+	HeapTuple       tup;
+	Relation        rel;
+
+	rel = heap_open(OperatorClassRelationId, RowExclusiveLock);
+
+	tup = SearchSysCacheCopy(CLAOID, ObjectIdGetDatum(opclassOid), 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for opclass %u", opclassOid);
+
+	AlterOpClassOwner_internal(rel, tup, newOwnerId);
+
+	heap_freetuple(tup);
+	heap_close(rel, NoLock);
+}
+
 /*
  * The zeroeth parameter is the caql context, with a single valid tuple.
  * The first parameter is pg_opclass, opened and suitably locked.  The second
@@ -2192,7 +2215,29 @@ AlterOpFamilyOwner(List *name, const char *access_method, Oid newOwnerId)
 }
 
 /*
- * The first parameter is pg_opfamily, opened and suitably locked.  The second
+ * Change operator family owner, specified by OID
+ */
+void
+AlterOpFamilyOwner_oid(Oid opfamilyOid, Oid newOwnerId)
+{
+	HeapTuple       tup;
+	Relation        rel;
+
+	rel = heap_open(OperatorFamilyRelationId, RowExclusiveLock);
+
+	tup = SearchSysCacheCopy(OPFAMILYOID, ObjectIdGetDatum(opfamilyOid),
+							 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for opfamily %u", opfamilyOid);
+
+	AlterOpFamilyOwner_internal(rel, tup, newOwnerId);
+
+	heap_freetuple(tup);
+	heap_close(rel, NoLock);
+}
+
+/*
+ * The first parameter is pg_opfamily, opened and suitably locked.	The second
  * parameter is a copy of the tuple from pg_opfamily we want to modify.
  */
 static void
diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index a09ee11ce2fd..2ccdc837a0ba 100644
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.35 2007/01/05 22:19:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.39 2008/01/01 19:45:49 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -70,7 +70,7 @@ DefineOperator(List *names, List *parameters,
 	Oid			oprNamespace;
 	AclResult	aclresult;
 	bool		canMerge = false;		/* operator merges */
-	bool		canHash = false;		/* operator hashes */
+	bool		canHash = false;	/* operator hashes */
 	List	   *functionName = NIL;		/* function for operator */
 	TypeName   *typeName1 = NULL;		/* first type name */
 	TypeName   *typeName2 = NULL;		/* second type name */
@@ -105,7 +105,7 @@ DefineOperator(List *names, List *parameters,
 			if (typeName1->setof)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
-					errmsg("setof type not allowed for operator argument")));
+					errmsg("SETOF type not allowed for operator argument")));
 		}
 		else if (pg_strcasecmp(defel->defname, "rightarg") == 0)
 		{
@@ -113,7 +113,7 @@ DefineOperator(List *names, List *parameters,
 			if (typeName2->setof)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
-					errmsg("setof type not allowed for operator argument")));
+					errmsg("SETOF type not allowed for operator argument")));
 		}
 		else if (pg_strcasecmp(defel->defname, "procedure") == 0)
 			functionName = defGetQualifiedName(defel);
@@ -155,9 +155,9 @@ DefineOperator(List *names, List *parameters,
 
 	/* Transform type names to type OIDs */
 	if (typeName1)
-		typeId1 = typenameTypeId(NULL, typeName1);
+		typeId1 = typenameTypeId(NULL, typeName1, NULL);
 	if (typeName2)
-		typeId2 = typenameTypeId(NULL, typeName2);
+		typeId2 = typenameTypeId(NULL, typeName2, NULL);
 
 	/*
 	 * now have OperatorCreate do all the work..
diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index 6b8b3190aa98..761e5ead0c40 100644
--- a/src/backend/commands/portalcmds.c
+++ b/src/backend/commands/portalcmds.c
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.60 2007/02/06 22:49:24 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.69.2.2 2008/12/01 17:06:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,7 +29,6 @@
 #include "optimizer/planner.h"
 #include "rewrite/rewriteHandler.h"
 #include "tcop/pquery.h"
-#include "tcop/tcopprot.h"
 #include "utils/memutils.h"
 #include "utils/resscheduler.h"
 
@@ -45,6 +44,10 @@ static void PortalCleanupHelper(Portal portal, volatile int *cleanupstate);
 /*
  * PerformCursorOpen
  *		Execute SQL DECLARE CURSOR command.
+ *
+ * The query has already been through parse analysis, rewriting, and planning.
+ * When it gets here, it looks like a SELECT PlannedStmt, except that the
+ * utilityStmt field is set.
  */
 void
 PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
@@ -72,7 +75,7 @@ PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
 	 * user-visible effect).
 	 */
 	if (!(cstmt->options & CURSOR_OPT_HOLD))
-		RequireTransactionChain((void *) cstmt, "DECLARE CURSOR");
+		RequireTransactionChain(isTopLevel, "DECLARE CURSOR");
 
 	/*
 	 * Allow using the SCROLL keyword even though we don't support its
@@ -95,7 +98,7 @@ PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
 	Assert(!(cstmt->options & CURSOR_OPT_SCROLL && cstmt->options & CURSOR_OPT_NO_SCROLL));
 
 	/*
-	 * Create a portal and copy the plan and queryString into its memory.
+	 * Create a portal and copy the plan into its memory context.
 	 */
 	portal = CreatePortal(cstmt->portalname, false, false);
 
@@ -104,9 +107,8 @@ PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
 	stmt = copyObject(stmt);
 	stmt->utilityStmt = NULL;	/* make it look like plain SELECT */
 
-	stmt->qdContext = PortalGetHeapMemory(portal); /* Temporary! See comment in PlannedStmt. */
-
-	queryString = pstrdup(queryString);
+	if (queryString)			/* copy the source text too for safety */
+		queryString = pstrdup(queryString);
 
 	PortalDefineQuery(portal,
 					  NULL,
@@ -114,7 +116,7 @@ PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
 					  T_DeclareCursorStmt,
 					  "SELECT", /* cursor's query is always a SELECT */
 					  list_make1(stmt),
-					  PortalGetHeapMemory(portal));
+					  NULL);
 
 	portal->is_extended_query = true; /* cursors run in extended query mode */
 
@@ -126,12 +128,15 @@ PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
 	 */
 	portal->is_simply_updatable = cstmt->is_simply_updatable;
 
-	/*
+	/*----------
 	 * Also copy the outer portal's parameter list into the inner portal's
 	 * memory context.	We want to pass down the parameter values in case we
-	 * had a command like DECLARE c CURSOR FOR SELECT ... WHERE foo = $1 This
-	 * will have been parsed using the outer parameter set and the parameter
-	 * value needs to be preserved for use when the cursor is executed.
+	 * had a command like
+	 *		DECLARE c CURSOR FOR SELECT ... WHERE foo = $1
+	 * This will have been parsed using the outer parameter set and the
+	 * parameter value needs to be preserved for use when the cursor is
+	 * executed.
+	 *----------
 	 */
 	params = copyParamList(params);
 
@@ -144,21 +149,23 @@ PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params,
 	 *
 	 * If the user didn't specify a SCROLL type, allow or disallow scrolling
 	 * based on whether it would require any additional runtime overhead to do
-	 * so.
+	 * so.	Also, we disallow scrolling for FOR UPDATE cursors.
 	 *
 	 * GPDB: we do not allow backward scans at the moment regardless
 	 * of any additional runtime overhead. We forced CURSOR_OPT_NO_SCROLL
 	 * above. Comment out this logic.
 	 */
-	/*
+#if 0
+	portal->cursorOptions = cstmt->options;
 	if (!(portal->cursorOptions & (CURSOR_OPT_SCROLL | CURSOR_OPT_NO_SCROLL)))
 	{
-		if (ExecSupportsBackwardScan(plan))
+		if (stmt->rowMarks == NIL &&
+			ExecSupportsBackwardScan(stmt->planTree))
 			portal->cursorOptions |= CURSOR_OPT_SCROLL;
 		else
 			portal->cursorOptions |= CURSOR_OPT_NO_SCROLL;
 	}
-	*/
+#endif
 
 	/*
 	 * Start execution, inserting parameters if any.
@@ -238,11 +245,18 @@ PerformPortalClose(const char *name)
 {
 	Portal		portal;
 
+	/* NULL means CLOSE ALL */
+	if (name == NULL)
+	{
+		PortalHashTableDeleteAll();
+		return;
+	}
+
 	/*
 	 * Disallow empty-string cursor name (conflicts with protocol-level
 	 * unnamed portal).
 	 */
-	if (!name || name[0] == '\0')
+	if (name[0] == '\0')
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_CURSOR_NAME),
 				 errmsg("invalid cursor name: must not be empty")));
@@ -403,7 +417,6 @@ PersistHoldablePortal(Portal portal)
 	Snapshot	saveActiveSnapshot;
 	ResourceOwner saveResourceOwner;
 	MemoryContext savePortalContext;
-	MemoryContext saveQueryContext;
 	MemoryContext oldcxt;
 
 	/*
@@ -446,7 +459,6 @@ PersistHoldablePortal(Portal portal)
 	saveActiveSnapshot = ActiveSnapshot;
 	saveResourceOwner = CurrentResourceOwner;
 	savePortalContext = PortalContext;
-	saveQueryContext = QueryContext;
 	PG_TRY();
 	{
 		ActivePortal = portal;
@@ -454,7 +466,6 @@ PersistHoldablePortal(Portal portal)
 		if (portal->resowner)
 			CurrentResourceOwner = portal->resowner;
 		PortalContext = PortalGetHeapMemory(portal);
-		QueryContext = portal->queryContext;
 
 		MemoryContextSwitchTo(PortalContext);
 
@@ -495,8 +506,8 @@ PersistHoldablePortal(Portal portal)
 		 * to be at, but the tuplestore API doesn't support that. So we start
 		 * at the beginning of the tuplestore and iterate through it until we
 		 * reach where we need to be.  FIXME someday?  (Fortunately, the
-		 * typical case is that we're supposed to be at or near the start
-		 * of the result set, so this isn't as bad as it sounds.)
+		 * typical case is that we're supposed to be at or near the start of
+		 * the result set, so this isn't as bad as it sounds.)
 		 */
 		MemoryContextSwitchTo(portal->holdContext);
 
@@ -543,7 +554,6 @@ PersistHoldablePortal(Portal portal)
 		ActiveSnapshot = saveActiveSnapshot;
 		CurrentResourceOwner = saveResourceOwner;
 		PortalContext = savePortalContext;
-		QueryContext = saveQueryContext;
 
 		PG_RE_THROW();
 	}
@@ -558,7 +568,6 @@ PersistHoldablePortal(Portal portal)
 	ActiveSnapshot = saveActiveSnapshot;
 	CurrentResourceOwner = saveResourceOwner;
 	PortalContext = savePortalContext;
-	QueryContext = saveQueryContext;
 
 	/*
 	 * We can now release any subsidiary memory of the portal's heap context;
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index 6831715371eb..45d40b601208 100644
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -10,7 +10,7 @@
  * Copyright (c) 2002-2009, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.68 2007/01/28 19:05:35 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.80.2.2 2009/12/29 17:41:18 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,10 @@
 #include "commands/prepare.h"
 #include "funcapi.h"
 #include "miscadmin.h"
+#include "parser/analyze.h"
+#include "parser/parse_coerce.h"
+#include "parser/parse_expr.h"
+#include "parser/parse_type.h"
 #include "rewrite/rewriteHandler.h"
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
@@ -43,9 +47,9 @@ extern int savedSeqServerPort;
 static HTAB *prepared_queries = NULL;
 
 static void InitQueryHashTable(void);
-static ParamListInfo EvaluateParams(EState *estate,
-			   List *params, List *argtypes);
-static Datum build_regtype_array(List *oid_list);
+static ParamListInfo EvaluateParams(PreparedStatement *pstmt, List *params,
+			   const char *queryString, EState *estate);
+static Datum build_regtype_array(Oid *param_types, int num_params);
 
 /*
  * Implements the 'PREPARE' utility statement.
@@ -53,11 +57,12 @@ static Datum build_regtype_array(List *oid_list);
 void
 PrepareQuery(PrepareStmt *stmt, const char *queryString)
 {
-	const char	*commandTag = NULL;
-	Query		*query = NULL;
-	List		*query_list = NIL;
-	List		*plan_list = NIL;
-	List		*query_list_copy = NIL;
+	Oid		   *argtypes = NULL;
+	int			nargs;
+	Query	   *query;
+	List	   *query_list,
+			   *plan_list;
+	int			i;
 	NodeTag		srctag;  /* GPDB */
 
 	/*
@@ -69,67 +74,102 @@ PrepareQuery(PrepareStmt *stmt, const char *queryString)
 				(errcode(ERRCODE_INVALID_PSTATEMENT_DEFINITION),
 				 errmsg("invalid statement name: must not be empty")));
 
-	switch (stmt->query->commandType)
+	/* Transform list of TypeNames to array of type OIDs */
+	nargs = list_length(stmt->argtypes);
+
+	if (nargs)
+	{
+		ParseState *pstate;
+		ListCell   *l;
+
+		/*
+		 * typenameTypeId wants a ParseState to carry the source query string.
+		 * Is it worth refactoring its API to avoid this?
+		 */
+		pstate = make_parsestate(NULL);
+		pstate->p_sourcetext = queryString;
+
+		argtypes = (Oid *) palloc(nargs * sizeof(Oid));
+		i = 0;
+
+		foreach(l, stmt->argtypes)
+		{
+			TypeName   *tn = lfirst(l);
+			Oid			toid = typenameTypeId(pstate, tn, NULL);
+
+			argtypes[i++] = toid;
+		}
+	}
+
+	/*
+	 * Analyze the statement using these parameter types (any parameters
+	 * passed in from above us will not be visible to it), allowing
+	 * information about unknown parameters to be deduced from context.
+	 *
+	 * Because parse analysis scribbles on the raw querytree, we must make a
+	 * copy to ensure we have a pristine raw tree to cache.  FIXME someday.
+	 */
+	query = parse_analyze_varparams((Node *) copyObject(stmt->query),
+									queryString,
+									&argtypes, &nargs);
+
+	/*
+	 * Check that all parameter types were determined.
+	 */
+	for (i = 0; i < nargs; i++)
+	{
+		Oid			argtype = argtypes[i];
+
+		if (argtype == InvalidOid || argtype == UNKNOWNOID)
+			ereport(ERROR,
+					(errcode(ERRCODE_INDETERMINATE_DATATYPE),
+					 errmsg("could not determine data type of parameter $%d",
+							i + 1)));
+	}
+
+	/*
+	 * grammar only allows OptimizableStmt, so this check should be redundant
+	 */
+	switch (query->commandType)
 	{
 		case CMD_SELECT:
-			commandTag = "SELECT";
 			srctag = T_SelectStmt;
 			break;
 		case CMD_INSERT:
-			commandTag = "INSERT";
 			srctag = T_InsertStmt;
 			break;
 		case CMD_UPDATE:
-			commandTag = "UPDATE";
 			srctag = T_UpdateStmt;
 			break;
 		case CMD_DELETE:
-			commandTag = "DELETE";
 			srctag = T_DeleteStmt;
 			break;
 		default:
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PSTATEMENT_DEFINITION),
 					 errmsg("utility statements cannot be prepared")));
-			commandTag = NULL;	/* keep compiler quiet */
-			srctag = T_Query;
+			srctag = T_Query;	/* keep compiler quiet */
 			break;
 	}
 
-	/*
-	 * Parse analysis is already done, but we must still rewrite and plan the
-	 * query.
-	 */
-
-	/*
-	 * Because the planner is not cool about not scribbling on its input, we
-	 * make a preliminary copy of the source querytree.  This prevents
-	 * problems in the case that the PREPARE is in a portal or plpgsql
-	 * function and is executed repeatedly.  (See also the same hack in
-	 * DECLARE CURSOR and EXPLAIN.)  XXX the planner really shouldn't modify
-	 * its input ... FIXME someday.
-	 */
-	query = copyObject(stmt->query);
-
 	/* Rewrite the query. The result could be 0, 1, or many queries. */
-	AcquireRewriteLocks(query);
 	query_list = QueryRewrite(query);
 
-	query_list_copy = copyObject(query_list); /* planner scribbles on query tree */
-	
 	/* Generate plans for queries.	Snapshot is already set. */
-	plan_list = pg_plan_queries(query_list, NULL, false);
+	plan_list = pg_plan_queries(query_list, 0, NULL, false);
 
 	/*
-	 * Save the results.  We don't have the query string for this PREPARE, but
-	 * we do have the string we got from the client, so use that.
+	 * Save the results.
 	 */
 	StorePreparedStatement(stmt->name,
-						   queryString, /* WAS global debug_query_string, */
+						   stmt->query,
+						   queryString,
 						   srctag,
-						   commandTag,
-						   query_list_copy,
-						   stmt->argtype_oids,
+						   CreateCommandTag((Node *) query),
+						   argtypes,
+						   nargs,
+						   0,	/* default cursor options */
+						   plan_list,
 						   true);
 }
 
@@ -148,19 +188,25 @@ ExecuteQuery(ExecuteStmt *stmt, const char *queryString,
 			 DestReceiver *dest, char *completionTag)
 {
 	PreparedStatement *entry;
-	List	   *stmt_list;
-	MemoryContext qcontext;
+	CachedPlan *cplan;
+	List	   *plan_list;
 	ParamListInfo paramLI = NULL;
 	EState	   *estate = NULL;
 	Portal		portal;
+	char	   *query_string;
 
 	/* Look it up in the hash table */
 	entry = FetchPreparedStatement(stmt->name, true);
 
-	qcontext = entry->context;
+	/* Shouldn't have a non-fully-planned plancache entry */
+	if (!entry->plansource->fully_planned)
+		elog(ERROR, "EXECUTE does not support unplanned prepared statements");
+	/* Shouldn't get any non-fixed-result cached plan, either */
+	if (!entry->plansource->fixed_result)
+		elog(ERROR, "EXECUTE does not support variable-result cached plans");
 
 	/* Evaluate parameters, if any */
-	if (entry->argtype_list != NIL)
+	if (entry->plansource->num_params > 0)
 	{
 		/*
 		 * Need an EState to evaluate parameters; must not delete it till end
@@ -168,7 +214,8 @@ ExecuteQuery(ExecuteStmt *stmt, const char *queryString,
 		 */
 		estate = CreateExecutorState();
 		estate->es_param_list_info = params;
-		paramLI = EvaluateParams(estate, stmt->params, entry->argtype_list);
+		paramLI = EvaluateParams(entry, stmt->params,
+								 queryString, estate);
 	}
 
 	/* Create a new portal to run the query in */
@@ -176,67 +223,78 @@ ExecuteQuery(ExecuteStmt *stmt, const char *queryString,
 	/* Don't display the portal in pg_cursors, it is for internal use only */
 	portal->visible = false;
 
-	/* Plan the query.  If this is a CTAS, copy the "into" information into
-	 * the query so that we construct the plan correctly.  Else the table
-	 * might not be created on the segments.  (MPP-8135) */
-	{
-		List *query_list = copyObject(entry->query_list); /* planner scribbles on query tree :( */
-		
-		if ( stmt->into )
-		{
-			Query *query = (Query*)linitial(query_list);
-			Assert(IsA(query, Query) && query->intoClause == NULL);
-			query->intoClause = copyObject(stmt->into);
-		}
-		
-		stmt_list = pg_plan_queries(query_list, paramLI, false);
-	}
+	/* Copy the plan's saved query string into the portal's memory */
+	query_string = MemoryContextStrdup(PortalGetHeapMemory(portal),
+									   entry->plansource->query_string);
 
 	/*
-	 * For CREATE TABLE / AS EXECUTE, make a copy of the stored query so that
-	 * we can modify its destination (yech, but this has always been ugly).
-	 * For regular EXECUTE we can just use the stored query where it sits,
-	 * since the executor is read-only.
+	 * For CREATE TABLE / AS EXECUTE, we must make a copy of the stored query
+	 * so that we can modify its destination (yech, but this has always been
+	 * ugly).  For regular EXECUTE we can just use the cached query, since the
+	 * executor is read-only.
+	 *
+	 * In GPDB, we use the current parameter values in the planning, because
+	 * that potentially gives a better plan. It also means that we have to
+	 * re-plan the query on every EXECUTE, but for long-running OLAP queries
+	 * that GPDB is typically used for, that seems like a good tradeoff.
+	 *
+	 * In GPDB the plan for CREATE TABLE / AS EXECUTE also depends on the
+	 * DISTRIBUTED BY clause of the target table. For example, if the table is
+	 * distributed by 'column1', then the rows to insert must be moved to the
+	 * correct nodes, determined by 'column1'. That's a very different plan
+	 * than what you get if you run the plain SELECT from the master; in that
+	 * case all the output rows will be fetched into the master. Because of
+	 * that, we also have to pass the into-clause to
+	 * RevalidateCachedPlanWithParams. (MPP-8135)
 	 */
 	if (stmt->into)
 	{
 		MemoryContext oldContext;
-		PlannedStmt	 *pstmt;
+		PlannedStmt *pstmt;
 
-		if (list_length(stmt_list) != 1)
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("prepared statement is not a SELECT")));
+		/* Replan if needed, and increment plan refcount transiently */
+		cplan = RevalidateCachedPlanWithParams(entry->plansource, true,
+											   paramLI, stmt->into);
 
+		/* Copy plan into portal's context, and modify */
 		oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
 
-		stmt_list = copyObject(stmt_list);
-		qcontext = PortalGetHeapMemory(portal);
-		pstmt = (PlannedStmt *) linitial(stmt_list);
-		pstmt->qdContext = qcontext;
-		if (pstmt->commandType != CMD_SELECT)
+		plan_list = copyObject(cplan->stmt_list);
+
+		if (list_length(plan_list) != 1)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("prepared statement is not a SELECT")));
+		pstmt = (PlannedStmt *) linitial(plan_list);
+		if (!IsA(pstmt, PlannedStmt) ||
+			pstmt->commandType != CMD_SELECT ||
+			pstmt->utilityStmt != NULL)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("prepared statement is not a SELECT")));
-
 		pstmt->intoClause = copyObject(stmt->into);
-		Assert(pstmt->intoPolicy != NULL);
-		pstmt->intoPolicy = GpPolicyCopy(CurrentMemoryContext, pstmt->intoPolicy);	
+
 		MemoryContextSwitchTo(oldContext);
-	}
 
-	/* Copy the plan's saved query string into the portal's memory */
-	Assert(entry->query_string != NULL); 
-	char *query_string = MemoryContextStrdup(PortalGetHeapMemory(portal),
-					   entry->query_string);
+		/* We no longer need the cached plan refcount ... */
+		ReleaseCachedPlan(cplan, true);
+		/* ... and we don't want the portal to depend on it, either */
+		cplan = NULL;
+	}
+	else
+	{
+		/* Replan if needed, and increment plan refcount for portal */
+		cplan = RevalidateCachedPlanWithParams(entry->plansource, false, paramLI, NULL);
+		plan_list = cplan->stmt_list;
+	}
 
 	PortalDefineQuery(portal,
 					  NULL,
 					  query_string,
-					  entry->sourceTag,
-					  entry->commandTag,
-					  stmt_list,
-					  qcontext);
+					  entry->plansource->sourceTag,
+					  entry->plansource->commandTag,
+					  plan_list,
+					  cplan);
 
 	/*
 	 * Run the portal to completion.
@@ -244,12 +302,7 @@ ExecuteQuery(ExecuteStmt *stmt, const char *queryString,
 	PortalStart(portal, paramLI, ActiveSnapshot,
 				savedSeqServerHost, savedSeqServerPort, NULL);
 
-	(void) PortalRun(portal, 
-					FETCH_ALL, 
-					 true, /* Effectively always top level. */
-					 dest, 
-					 dest, 
-					 completionTag);
+	(void) PortalRun(portal, FETCH_ALL, false, dest, dest, completionTag);
 
 	PortalDrop(portal, false);
 
@@ -260,42 +313,106 @@ ExecuteQuery(ExecuteStmt *stmt, const char *queryString,
 }
 
 /*
- * Evaluates a list of parameters, using the given executor state. It
- * requires a list of the parameter expressions themselves, and a list of
- * their types. It returns a filled-in ParamListInfo -- this can later
- * be passed to CreateQueryDesc(), which allows the executor to make use
- * of the parameters during query execution.
+ * EvaluateParams: evaluate a list of parameters.
+ *
+ * pstmt: statement we are getting parameters for.
+ * params: list of given parameter expressions (raw parser output!)
+ * queryString: source text for error messages.
+ * estate: executor state to use.
+ *
+ * Returns a filled-in ParamListInfo -- this can later be passed to
+ * CreateQueryDesc(), which allows the executor to make use of the parameters
+ * during query execution.
  */
 static ParamListInfo
-EvaluateParams(EState *estate, List *params, List *argtypes)
+EvaluateParams(PreparedStatement *pstmt, List *params,
+			   const char *queryString, EState *estate)
 {
-	int			nargs = list_length(argtypes);
+	Oid		   *param_types = pstmt->plansource->param_types;
+	int			num_params = pstmt->plansource->num_params;
+	int			nparams = list_length(params);
+	ParseState *pstate;
 	ParamListInfo paramLI;
 	List	   *exprstates;
-	ListCell   *le,
-			   *la;
-	int			i = 0;
-
-	/* Parser should have caught this error, but check for safety */
-	if (list_length(params) != nargs)
-		elog(ERROR, "wrong number of arguments");
+	ListCell   *l;
+	int			i;
 
-	if (nargs == 0)
+	if (nparams != num_params)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+		   errmsg("wrong number of parameters for prepared statement \"%s\"",
+				  pstmt->stmt_name),
+				 errdetail("Expected %d parameters but got %d.",
+						   num_params, nparams)));
+
+	/* Quick exit if no parameters */
+	if (num_params == 0)
 		return NULL;
 
+	/*
+	 * We have to run parse analysis for the expressions.  Since the parser is
+	 * not cool about scribbling on its input, copy first.
+	 */
+	params = (List *) copyObject(params);
+
+	pstate = make_parsestate(NULL);
+	pstate->p_sourcetext = queryString;
+
+	i = 0;
+	foreach(l, params)
+	{
+		Node	   *expr = lfirst(l);
+		Oid			expected_type_id = param_types[i];
+		Oid			given_type_id;
+
+		expr = transformExpr(pstate, expr);
+
+		/* Cannot contain subselects or aggregates */
+		if (pstate->p_hasSubLinks)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("cannot use subquery in EXECUTE parameter")));
+		if (pstate->p_hasAggs)
+			ereport(ERROR,
+					(errcode(ERRCODE_GROUPING_ERROR),
+			  errmsg("cannot use aggregate function in EXECUTE parameter")));
+
+		given_type_id = exprType(expr);
+
+		expr = coerce_to_target_type(pstate, expr, given_type_id,
+									 expected_type_id, -1,
+									 COERCION_ASSIGNMENT,
+									 COERCE_IMPLICIT_CAST, -1);
+
+		if (expr == NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("parameter $%d of type %s cannot be coerced to the expected type %s",
+							i + 1,
+							format_type_be(given_type_id),
+							format_type_be(expected_type_id)),
+			   errhint("You will need to rewrite or cast the expression.")));
+
+		lfirst(l) = expr;
+		i++;
+	}
+
+	/* Prepare the expressions for execution */
 	exprstates = (List *) ExecPrepareExpr((Expr *) params, estate);
 
 	/* sizeof(ParamListInfoData) includes the first array element */
-	paramLI = (ParamListInfo) palloc(sizeof(ParamListInfoData) +
-									 (nargs - 1) *sizeof(ParamExternData));
-	paramLI->numParams = nargs;
+	paramLI = (ParamListInfo)
+		palloc(sizeof(ParamListInfoData) +
+			   (num_params - 1) *sizeof(ParamExternData));
+	paramLI->numParams = num_params;
 
-	forboth(le, exprstates, la, argtypes)
+	i = 0;
+	foreach(l, exprstates)
 	{
-		ExprState  *n = lfirst(le);
+		ExprState  *n = lfirst(l);
 		ParamExternData *prm = &paramLI->params[i];
 
-		prm->ptype = lfirst_oid(la);
+		prm->ptype = param_types[i];
 		prm->pflags = 0;
 		prm->value = ExecEvalExprSwitchContext(n,
 											   GetPerTupleExprContext(estate),
@@ -330,8 +447,9 @@ InitQueryHashTable(void)
 
 /*
  * Store all the data pertaining to a query in the hash table using
- * the specified key. A copy of the data is made in a memory context belonging
- * to the hash entry, so the caller can dispose of their copy.
+ * the specified key.  All the given data is copied into either the hashtable
+ * entry or the underlying plancache entry, so the caller can dispose of its
+ * copy.
  *
  * Exception: commandTag is presumed to be a pointer to a constant string,
  * or possibly NULL, so it need not be copied.	Note that commandTag should
@@ -341,17 +459,18 @@ InitQueryHashTable(void)
  */
 void
 StorePreparedStatement(const char *stmt_name,
+					   Node *raw_parse_tree,
 					   const char *query_string,
 					   NodeTag	   sourceTag,
 					   const char *commandTag,
-					   List *query_list,
-					   List *argtype_list,
+					   Oid *param_types,
+					   int num_params,
+					   int cursor_options,
+					   List *stmt_list,
 					   bool from_sql)
 {
 	PreparedStatement *entry;
-	MemoryContext oldcxt,
-				entrycxt;
-	char	   *qstring;
+	CachedPlanSource *plansource;
 	bool		found;
 
 	/* Initialize the hash table, if necessary */
@@ -367,24 +486,16 @@ StorePreparedStatement(const char *stmt_name,
 				 errmsg("prepared statement \"%s\" already exists",
 						stmt_name)));
 
-	/* Make a permanent memory context for the hashtable entry */
-	entrycxt = AllocSetContextCreate(TopMemoryContext,
-									 stmt_name,
-									 ALLOCSET_SMALL_MINSIZE,
-									 ALLOCSET_SMALL_INITSIZE,
-									 ALLOCSET_SMALL_MAXSIZE);
-
-	oldcxt = MemoryContextSwitchTo(entrycxt);
-
-	/*
-	 * We need to copy the data so that it is stored in the correct memory
-	 * context.  Do this before making hashtable entry, so that an
-	 * out-of-memory failure only wastes memory and doesn't leave us with an
-	 * incomplete (ie corrupt) hashtable entry.
-	 */
-	qstring = query_string ? pstrdup(query_string) : NULL;
-	query_list = (List *)copyObject(query_list);
-	argtype_list = list_copy(argtype_list);
+	/* Create a plancache entry */
+	plansource = CreateCachedPlan(raw_parse_tree,
+								  query_string,
+								  commandTag,
+								  param_types,
+								  num_params,
+								  cursor_options,
+								  stmt_list,
+								  true,
+								  true);
 
 	/* Now we can add entry to hash table */
 	entry = (PreparedStatement *) hash_search(prepared_queries,
@@ -397,22 +508,18 @@ StorePreparedStatement(const char *stmt_name,
 		elog(ERROR, "duplicate prepared statement \"%s\"",
 			 stmt_name);
 
-	/* Fill in the hash table entry with copied data */
-	entry->query_string = qstring;
-	entry->sourceTag = sourceTag;
-	entry->commandTag = commandTag;
-	entry->query_list = query_list;
-	entry->argtype_list = argtype_list;
-	entry->context = entrycxt;
-	entry->prepare_time = GetCurrentStatementStartTimestamp();
+	/* Fill in the hash table entry */
+	entry->plansource = plansource;
 	entry->from_sql = from_sql;
-
-	MemoryContextSwitchTo(oldcxt);
+	entry->prepare_time = GetCurrentStatementStartTimestamp();
 }
 
 /*
  * Lookup an existing query in the hash table. If the query does not
  * actually exist, throw ereport(ERROR) or return NULL per second parameter.
+ *
+ * Note: this does not force the referenced plancache entry to be valid,
+ * since not all callers care.
  */
 PreparedStatement *
 FetchPreparedStatement(const char *stmt_name, bool throwError)
@@ -440,20 +547,6 @@ FetchPreparedStatement(const char *stmt_name, bool throwError)
 	return entry;
 }
 
-/*
- * Look up a prepared statement given the name (giving error if not found).
- * If found, return the list of argument type OIDs.
- */
-List *
-FetchPreparedStatementParams(const char *stmt_name)
-{
-	PreparedStatement *entry;
-
-	entry = FetchPreparedStatement(stmt_name, true);
-
-	return entry->argtype_list;
-}
-
 /*
  * Given a prepared statement, determine the result tupledesc it will
  * produce.  Returns NULL if the execution will not return tuples.
@@ -463,52 +556,15 @@ FetchPreparedStatementParams(const char *stmt_name)
 TupleDesc
 FetchPreparedStatementResultDesc(PreparedStatement *stmt)
 {
-	Query	   *query;
-
-	switch (ChoosePortalStrategy(stmt->query_list))
-	{
-		case PORTAL_ONE_SELECT:
-			query = (Query *) linitial(stmt->query_list);
-			return ExecCleanTypeFromTL(query->targetList, false);
-
-		case PORTAL_ONE_RETURNING:
-			query = (Query *) PortalListGetPrimaryStmt(stmt->query_list);
-			return ExecCleanTypeFromTL(query->returningList, false);
-
-		case PORTAL_UTIL_SELECT:
-			query = (Query *) linitial(stmt->query_list);
-			return UtilityTupleDescriptor(query->utilityStmt);
-
-		case PORTAL_MULTI_QUERY:
-			/* will not return tuples */
-			break;
-	}
-	return NULL;
-}
-
-/*
- * Given a prepared statement, determine whether it will return tuples.
- *
- * Note: this is used rather than just testing the result of
- * FetchPreparedStatementResultDesc() because that routine can fail if
- * invoked in an aborted transaction.  This one is safe to use in any
- * context.  Be sure to keep the two routines in sync!
- */
-bool
-PreparedStatementReturnsTuples(PreparedStatement *stmt)
-{
-	switch (ChoosePortalStrategy(stmt->query_list))
-	{
-		case PORTAL_ONE_SELECT:
-		case PORTAL_ONE_RETURNING:
-		case PORTAL_UTIL_SELECT:
-			return true;
-
-		case PORTAL_MULTI_QUERY:
-			/* will not return tuples */
-			break;
-	}
-	return false;
+	/*
+	 * Since we don't allow prepared statements' result tupdescs to change,
+	 * there's no need for a revalidate call here.
+	 */
+	Assert(stmt->plansource->fixed_result);
+	if (stmt->plansource->resultDesc)
+		return CreateTupleDescCopy(stmt->plansource->resultDesc);
+	else
+		return NULL;
 }
 
 /*
@@ -519,54 +575,29 @@ PreparedStatementReturnsTuples(PreparedStatement *stmt)
  * Note: this is pretty ugly, but since it's only used in corner cases like
  * Describe Statement on an EXECUTE command, we don't worry too much about
  * efficiency.
-
- * Note: do not modify the result.
- *
- * XXX be careful to keep this in sync with FetchPortalTargetList,
- * and with UtilityReturnsTuples.
  */
 List *
 FetchPreparedStatementTargetList(PreparedStatement *stmt)
 {
-	PortalStrategy strategy = ChoosePortalStrategy(stmt->query_list);
+	List	   *tlist;
+	CachedPlan *cplan;
 
-	if (strategy == PORTAL_ONE_SELECT)
-		return ((Query *) linitial(stmt->query_list))->targetList;
-	if (strategy == PORTAL_ONE_RETURNING)
-		return ((Query *)(PortalListGetPrimaryStmt(stmt->query_list)))->returningList;
-	if (strategy == PORTAL_UTIL_SELECT)
-	{
-		Node	   *utilityStmt;
+	/* No point in looking if it doesn't return tuples */
+	if (stmt->plansource->resultDesc == NULL)
+		return NIL;
 
-		utilityStmt = ((Query *) linitial(stmt->query_list))->utilityStmt;
-		switch (nodeTag(utilityStmt))
-		{
-			case T_FetchStmt:
-				{
-					FetchStmt  *substmt = (FetchStmt *) utilityStmt;
-					Portal		subportal;
-
-					Assert(!substmt->ismove);
-					subportal = GetPortalByName(substmt->portalname);
-					Assert(PortalIsValid(subportal));
-					return FetchPortalTargetList(subportal);
-				}
-
-			case T_ExecuteStmt:
-				{
-					ExecuteStmt *substmt = (ExecuteStmt *) utilityStmt;
-					PreparedStatement *entry;
-
-					Assert(!substmt->into);
-					entry = FetchPreparedStatement(substmt->name, true);
-					return FetchPreparedStatementTargetList(entry);
-				}
-
-			default:
-				break;
-		}
-	}
-	return NIL;
+	/* Make sure the plan is up to date */
+	cplan = RevalidateCachedPlan(stmt->plansource, true);
+
+	/* Get the primary statement and find out what it returns */
+	tlist = FetchStatementTargetList(PortalListGetPrimaryStmt(cplan->stmt_list));
+
+	/* Copy into caller's context so we can release the plancache entry */
+	tlist = (List *) copyObject(tlist);
+
+	ReleaseCachedPlan(cplan, true);
+
+	return tlist;
 }
 
 /*
@@ -576,7 +607,10 @@ FetchPreparedStatementTargetList(PreparedStatement *stmt)
 void
 DeallocateQuery(DeallocateStmt *stmt)
 {
-	DropPreparedStatement(stmt->name, true);
+	if (stmt->name)
+		DropPreparedStatement(stmt->name, true);
+	else
+		DropAllPreparedStatements();
 }
 
 /*
@@ -594,12 +628,33 @@ DropPreparedStatement(const char *stmt_name, bool showError)
 
 	if (entry)
 	{
-		/* Drop any open portals that depend on this prepared statement */
-		Assert(MemoryContextIsValid(entry->context));
-		DropDependentPortals(entry->context);
+		/* Release the plancache entry */
+		DropCachedPlan(entry->plansource);
+
+		/* Now we can remove the hash table entry */
+		hash_search(prepared_queries, entry->stmt_name, HASH_REMOVE, NULL);
+	}
+}
+
+/*
+ * Drop all cached statements.
+ */
+void
+DropAllPreparedStatements(void)
+{
+	HASH_SEQ_STATUS seq;
+	PreparedStatement *entry;
+
+	/* nothing cached */
+	if (!prepared_queries)
+		return;
 
-		/* Flush the context holding the subsidiary data */
-		MemoryContextDelete(entry->context);
+	/* walk over cache */
+	hash_seq_init(&seq, prepared_queries);
+	while ((entry = hash_seq_search(&seq)) != NULL)
+	{
+		/* Release the plancache entry */
+		DropCachedPlan(entry->plansource);
 
 		/* Now we can remove the hash table entry */
 		hash_search(prepared_queries, entry->stmt_name, HASH_REMOVE, NULL);
@@ -615,21 +670,24 @@ ExplainExecuteQuery(ExecuteStmt *execstmt, ExplainStmt *stmt,
 					ParamListInfo params, TupOutputState *tstate)
 {
 	PreparedStatement *entry;
-	ListCell   *q,
-			   *p;
-	List	   *query_list,
-			   *stmt_list;
+	CachedPlan *cplan;
+	List	   *plan_list;
+	ListCell   *p;
 	ParamListInfo paramLI = NULL;
 	EState	   *estate = NULL;
 
-	/* explain.c should only call me for EXECUTE stmt */
-	Assert(execstmt && IsA(execstmt, ExecuteStmt));
-
 	/* Look it up in the hash table */
 	entry = FetchPreparedStatement(execstmt->name, true);
 
+	/* Shouldn't have a non-fully-planned plancache entry */
+	if (!entry->plansource->fully_planned)
+		elog(ERROR, "EXPLAIN EXECUTE does not support unplanned prepared statements");
+	/* Shouldn't get any non-fixed-result cached plan, either */
+	if (!entry->plansource->fixed_result)
+		elog(ERROR, "EXPLAIN EXECUTE does not support variable-result cached plans");
+
 	/* Evaluate parameters, if any */
-	if (entry->argtype_list != NIL)
+	if (entry->plansource->num_params)
 	{
 		/*
 		 * Need an EState to evaluate parameters; must not delete it till end
@@ -637,53 +695,46 @@ ExplainExecuteQuery(ExecuteStmt *execstmt, ExplainStmt *stmt,
 		 */
 		estate = CreateExecutorState();
 		estate->es_param_list_info = params;
-		paramLI = EvaluateParams(estate, execstmt->params,
-								 entry->argtype_list);
+		paramLI = EvaluateParams(entry, execstmt->params,
+								 queryString, estate);
 	}
 
-	query_list = copyObject(entry->query_list); /* planner scribbles on query tree */
-	stmt_list = pg_plan_queries(query_list, paramLI, false);
+	/* Replan if needed, and acquire a transient refcount */
+	cplan = RevalidateCachedPlanWithParams(entry->plansource, true,
+										   paramLI, execstmt->into);
 
-	Assert(list_length(query_list) == list_length(stmt_list));
+	plan_list = cplan->stmt_list;
 
 	/* Explain each query */
-	forboth(q, query_list, p, stmt_list)
+	foreach(p, plan_list)
 	{
 		PlannedStmt *pstmt = (PlannedStmt *) lfirst(p);
-		Query	   *query = (Query *) lfirst(q);
 		bool		is_last_query;
 
 		is_last_query = (lnext(p) == NULL);
 
-		if (query->commandType == CMD_UTILITY)
-		{
-			if (query->utilityStmt && IsA(query->utilityStmt, NotifyStmt))
-				do_text_output_oneline(tstate, "NOTIFY");
-			else
-				do_text_output_oneline(tstate, "UTILITY");
-		}
-		else
+		if (IsA(pstmt, PlannedStmt))
 		{
 			if (execstmt->into)
 			{
-				if (query->commandType != CMD_SELECT)
+				if (pstmt->commandType != CMD_SELECT ||
+					pstmt->utilityStmt != NULL)
 					ereport(ERROR,
 							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 							 errmsg("prepared statement is not a SELECT")));
 
-				/* Copy the query so we can modify it */
-				query = copyObject(query);
+				/* Copy the stmt so we can modify it */
+				pstmt = copyObject(pstmt);
 
-				if ( execstmt->into )
-				{
-					Assert(query->intoClause == NULL);
-					query->intoClause = makeNode(IntoClause);
-					query->intoClause->rel = execstmt->into->rel;
-				}
+				pstmt->intoClause = execstmt->into;
 			}
 
-
-			ExplainOnePlan(pstmt, stmt, "EXECUTE", paramLI, tstate);
+			ExplainOnePlan(pstmt, paramLI, stmt, queryString, tstate);
+		}
+		else
+		{
+			ExplainOneUtility((Node *) pstmt, stmt, queryString,
+							  params, tstate);
 		}
 
 		/* No need for CommandCounterIncrement, as ExplainOnePlan did it */
@@ -695,6 +746,8 @@ ExplainExecuteQuery(ExecuteStmt *execstmt, ExplainStmt *stmt,
 
 	if (estate)
 		FreeExecutorState(estate);
+
+	ReleaseCachedPlan(cplan, true);
 }
 
 /*
@@ -747,6 +800,9 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
 	 */
 	tupstore = tuplestore_begin_heap(true, false, work_mem);
 
+	/* generate junk in short-term context */
+	MemoryContextSwitchTo(oldcontext);
+
 	/* hash table might be uninitialized */
 	if (prepared_queries)
 	{
@@ -760,28 +816,23 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
 			Datum		values[5];
 			bool		nulls[5];
 
-			/* generate junk in short-term context */
-			MemoryContextSwitchTo(oldcontext);
-
 			MemSet(nulls, 0, sizeof(nulls));
 
 			values[0] = DirectFunctionCall1(textin,
 									  CStringGetDatum(prep_stmt->stmt_name));
 
-			if (prep_stmt->query_string == NULL)
+			if (prep_stmt->plansource->query_string == NULL)
 				nulls[1] = true;
 			else
 				values[1] = DirectFunctionCall1(textin,
-								   CStringGetDatum(prep_stmt->query_string));
+					   CStringGetDatum(prep_stmt->plansource->query_string));
 
 			values[2] = TimestampTzGetDatum(prep_stmt->prepare_time);
-			values[3] = build_regtype_array(prep_stmt->argtype_list);
+			values[3] = build_regtype_array(prep_stmt->plansource->param_types,
+										  prep_stmt->plansource->num_params);
 			values[4] = BoolGetDatum(prep_stmt->from_sql);
 
 			tuple = heap_form_tuple(tupdesc, values, nulls);
-
-			/* switch to appropriate context while storing the tuple */
-			MemoryContextSwitchTo(per_query_ctx);
 			tuplestore_puttuple(tupstore, tuple);
 		}
 	}
@@ -789,8 +840,6 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
 	/* clean up and return the tuplestore */
 	tuplestore_donestoring(tupstore);
 
-	MemoryContextSwitchTo(oldcontext);
-
 	rsinfo->returnMode = SFRM_Materialize;
 	rsinfo->setResult = tupstore;
 	rsinfo->setDesc = tupdesc;
@@ -799,29 +848,23 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
 }
 
 /*
- * This utility function takes a List of Oids, and returns a Datum
- * pointing to a one-dimensional Postgres array of regtypes. The empty
- * list is returned as a zero-element array, not NULL.
+ * This utility function takes a C array of Oids, and returns a Datum
+ * pointing to a one-dimensional Postgres array of regtypes. An empty
+ * array is returned as a zero-element array, not NULL.
  */
 static Datum
-build_regtype_array(List *oid_list)
+build_regtype_array(Oid *param_types, int num_params)
 {
-	ListCell   *lc;
-	int			len;
-	int			i;
 	Datum	   *tmp_ary;
 	ArrayType  *result;
+	int			i;
 
-	len = list_length(oid_list);
-	tmp_ary = (Datum *) palloc(len * sizeof(Datum));
+	tmp_ary = (Datum *) palloc(num_params * sizeof(Datum));
 
-	i = 0;
-	foreach(lc, oid_list)
-	{
-		tmp_ary[i++] = ObjectIdGetDatum(lfirst_oid(lc));
-	}
+	for (i = 0; i < num_params; i++)
+		tmp_ary[i] = ObjectIdGetDatum(param_types[i]);
 
 	/* XXX: this hardcodes assumptions about the regtype type */
-	result = construct_array(tmp_ary, len, REGTYPEOID, 4, true, 'i');
+	result = construct_array(tmp_ary, num_params, REGTYPEOID, 4, true, 'i');
 	return PointerGetDatum(result);
 }
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 66a15dd55c84..2739960bc583 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.71 2007/01/22 01:35:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.74.2.1 2008/04/29 19:37:13 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,16 +18,19 @@
 #include "catalog/catquery.h"
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_authid.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_pltemplate.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "commands/dbcommands.h"
 #include "commands/defrem.h"
 #include "commands/proclang.h"
 #include "miscadmin.h"
 #include "parser/gramparse.h"
 #include "parser/parse_func.h"
+#include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
@@ -39,15 +42,19 @@
 typedef struct
 {
 	bool		tmpltrusted;	/* trusted? */
+	bool		tmpldbacreate;	/* db owner allowed to create? */
 	char	   *tmplhandler;	/* name of handler function */
 	char	   *tmplinline;		/* name of anonymous-block handler, or NULL */
 	char	   *tmplvalidator;	/* name of validator function, or NULL */
 	char	   *tmpllibrary;	/* path of shared library */
 } PLTemplate;
 
-static void create_proc_lang(const char *languageName, Oid handlerOid,
-				 Oid inlineOid, Oid valOid, bool trusted, Oid *plangOid);
+static void create_proc_lang(const char *languageName,
+				 Oid languageOwner, Oid handlerOid, Oid inlineOid,
+				 Oid valOid, bool trusted, Oid *plangOid);
 static PLTemplate *find_language_template(const char *languageName);
+static void AlterLanguageOwner_internal(HeapTuple tup, Relation rel,
+							Oid newOwnerId);
 
 
 /* ---------------------------------------------------------------------
@@ -65,14 +72,6 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 	Oid			funcrettype;
 	Oid			funcargtypes[1];
 
-	/*
-	 * Check permission
-	 */
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("must be superuser to create procedural language")));
-
 	/*
 	 * Translate the language name and check that this language doesn't
 	 * already exist
@@ -128,6 +127,21 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 						(errmsg("using pg_pltemplate information instead of "
 								"CREATE LANGUAGE parameters")));
 
+		/*
+		 * Check permission
+		 */
+		if (!superuser())
+		{
+			if (!pltemplate->tmpldbacreate)
+				ereport(ERROR,
+						(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+						 errmsg("must be superuser to create procedural language \"%s\"",
+								languageName)));
+			if (!pg_database_ownercheck(MyDatabaseId, GetUserId()))
+				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+							   get_database_name(MyDatabaseId));
+		}
+
 		/*
 		 * Find or create the handler function, which we force to be in the
 		 * pg_catalog schema.  If already present, it must have the correct
@@ -166,6 +180,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 										 PointerGetDatum(NULL),
 										 PointerGetDatum(NULL),
 										 NIL,
+										 PointerGetDatum(NULL),
 										 1,
 										 0,
 										 PRODATAACCESS_NONE,
@@ -203,6 +218,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 										 PointerGetDatum(NULL),
 										 PointerGetDatum(NULL),
 										 NIL,
+										 PointerGetDatum(NULL),
 										 1,
 										 0,
 										 PRODATAACCESS_NONE,
@@ -244,6 +260,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 										 PointerGetDatum(NULL),
 										 PointerGetDatum(NULL),
 										 NIL,
+										 PointerGetDatum(NULL),
 										 1,
 										 0,
 										 PRODATAACCESS_NONE,
@@ -254,8 +271,8 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 			valOid = InvalidOid;
 
 		/* ok, create it */
-		create_proc_lang(languageName, handlerOid, inlineOid, valOid,
-						 pltemplate->tmpltrusted, &(stmt->plangOid));
+		create_proc_lang(languageName, GetUserId(), handlerOid, inlineOid,
+						 valOid, pltemplate->tmpltrusted, &(stmt->plangOid));
 	}
 	else
 	{
@@ -271,6 +288,14 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 							languageName),
 					 errhint("The supported languages are listed in the pg_pltemplate system catalog.")));
 
+		/*
+		 * Check permission
+		 */
+		if (!superuser())
+			ereport(ERROR,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("must be superuser to create custom procedural language")));
+
 		/*
 		 * Lookup the PL handler function and check that it is of the expected
 		 * return type
@@ -321,10 +346,10 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 			valOid = InvalidOid;
 
 		/* ok, create it */
-		create_proc_lang(languageName, handlerOid, inlineOid, valOid, stmt->pltrusted, &(stmt->plangOid));
+		create_proc_lang(languageName, GetUserId(), handlerOid, inlineOid,
+						 valOid, stmt->pltrusted, &(stmt->plangOid));
 	}
-	
-	
+
 	if (Gp_role == GP_ROLE_DISPATCH)
 	{
 		stmt->plhandlerOid = handlerOid;
@@ -339,7 +364,8 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
  */
 static void
 create_proc_lang(const char *languageName,
-				 Oid handlerOid, Oid inlineOid, Oid valOid, bool trusted, Oid *plangoid)
+				 Oid languageOwner, Oid handlerOid, Oid inlineOid,
+				 Oid valOid, bool trusted, Oid *plangoid)
 {
 	Datum		values[Natts_pg_language];
 	bool		nulls[Natts_pg_language];
@@ -362,6 +388,7 @@ create_proc_lang(const char *languageName,
 
 	namestrcpy(&langname, languageName);
 	values[Anum_pg_language_lanname - 1] = NameGetDatum(&langname);
+	values[Anum_pg_language_lanowner - 1] = ObjectIdGetDatum(languageOwner);
 	values[Anum_pg_language_lanispl - 1] = BoolGetDatum(true);
 	values[Anum_pg_language_lanpltrusted - 1] = BoolGetDatum(trusted);
 	values[Anum_pg_language_lanplcallfoid - 1] = ObjectIdGetDatum(handlerOid);
@@ -384,6 +411,12 @@ create_proc_lang(const char *languageName,
 	myself.objectId = HeapTupleGetOid(tup);
 	myself.objectSubId = 0;
 
+	/* dependency on owner of language */
+	referenced.classId = AuthIdRelationId;
+	referenced.objectId = languageOwner;
+	referenced.objectSubId = 0;
+	recordSharedDependencyOn(&myself, &referenced, SHARED_DEPENDENCY_OWNER);
+
 	/* dependency on the PL handler function */
 	referenced.classId = ProcedureRelationId;
 	referenced.objectId = handlerOid;
@@ -439,6 +472,7 @@ find_language_template(const char *languageName)
 
 		result = (PLTemplate *) palloc0(sizeof(PLTemplate));
 		result->tmpltrusted = tmpl->tmpltrusted;
+		result->tmpldbacreate = tmpl->tmpldbacreate;
 
 		/* Remaining fields are variable-width so we need heap_getattr */
 		datum = heap_getattr(tup, Anum_pg_pltemplate_tmplhandler,
@@ -495,32 +529,18 @@ void
 DropProceduralLanguage(DropPLangStmt *stmt)
 {
 	char	   *languageName;
-	int			fetchCount;
-	Oid			langOid;
+	HeapTuple	langTup;
 	ObjectAddress object;
 
-	/*
-	 * Check permission
-	 */
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("must be superuser to drop procedural language")));
-
 	/*
 	 * Translate the language name, check that the language exists
 	 */
 	languageName = case_translate_language_name(stmt->plname);
 
-	langOid = caql_getoid_plus(
-			NULL,
-			&fetchCount,
-			NULL,
-			cql("SELECT oid FROM pg_language "
-				" WHERE lanname = :1 ",
-				CStringGetDatum(languageName)));
-
-	if (0 == fetchCount)
+	langTup = SearchSysCache(LANGNAME,
+							 CStringGetDatum(languageName),
+							 0, 0, 0);
+	if (!HeapTupleIsValid(langTup))
 	{
 		if (!stmt->missing_ok)
 			ereport(ERROR,
@@ -534,10 +554,19 @@ DropProceduralLanguage(DropPLangStmt *stmt)
 		return;
 	}
 
+	/*
+	 * Check permission
+	 */
+	if (!pg_language_ownercheck(HeapTupleGetOid(langTup), GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_LANGUAGE,
+					   languageName);
+
 	object.classId = LanguageRelationId;
-	object.objectId = langOid;
+	object.objectId = HeapTupleGetOid(langTup);
 	object.objectSubId = 0;
 
+	ReleaseSysCache(langTup);
+
 	/*
 	 * Do the deletion
 	 */
@@ -611,11 +640,10 @@ RenameLanguage(const char *oldname, const char *newname)
 				 errmsg("language \"%s\" already exists", newname)));
 	}
 
-	/* must be superuser, since we do not have owners for PLs */
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("must be superuser to rename procedural language")));
+	/* must be owner of PL */
+	if (!pg_language_ownercheck(HeapTupleGetOid(tup), GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_LANGUAGE,
+					   oldname);
 
 	/* rename */
 	namestrcpy(&(((Form_pg_language) GETSTRUCT(tup))->lanname), newname);
@@ -624,3 +652,124 @@ RenameLanguage(const char *oldname, const char *newname)
 	heap_close(rel, NoLock);
 	heap_freetuple(tup);
 }
+
+/*
+ * Change language owner
+ */
+void
+AlterLanguageOwner(const char *name, Oid newOwnerId)
+{
+	HeapTuple	tup;
+	Relation	rel;
+
+	/* Translate name for consistency with CREATE */
+	name = case_translate_language_name(name);
+
+	rel = heap_open(LanguageRelationId, RowExclusiveLock);
+
+	tup = SearchSysCache(LANGNAME,
+						 CStringGetDatum(name),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("language \"%s\" does not exist", name)));
+
+	AlterLanguageOwner_internal(tup, rel, newOwnerId);
+	
+	ReleaseSysCache(tup);
+	
+	heap_close(rel, RowExclusiveLock);
+
+}
+
+/*
+ * Change language owner, specified by OID
+ */
+void
+AlterLanguageOwner_oid(Oid oid, Oid newOwnerId)
+{
+	HeapTuple	tup;
+	Relation	rel;
+
+	rel = heap_open(LanguageRelationId, RowExclusiveLock);
+
+	tup = SearchSysCache(LANGOID,
+						 ObjectIdGetDatum(oid),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for language %u", oid);
+
+	AlterLanguageOwner_internal(tup, rel, newOwnerId);
+
+	ReleaseSysCache(tup);
+
+	heap_close(rel, RowExclusiveLock);
+}
+
+/*
+ * Workhorse for AlterLanguageOwner variants
+ */
+static void
+AlterLanguageOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId)
+{
+	Form_pg_language lanForm;
+
+	lanForm = (Form_pg_language) GETSTRUCT(tup);
+
+	/*
+	 * If the new owner is the same as the existing owner, consider the
+	 * command to have succeeded.  This is for dump restoration purposes.
+	 */
+	if (lanForm->lanowner != newOwnerId)
+	{
+		Datum		repl_val[Natts_pg_language];
+		bool		repl_null[Natts_pg_language];
+		bool		repl_repl[Natts_pg_language];
+		Acl		   *newAcl;
+		Datum		aclDatum;
+		bool		isNull;
+		HeapTuple	newtuple;
+
+		/* Otherwise, must be owner of the existing object */
+		if (!pg_language_ownercheck(HeapTupleGetOid(tup), GetUserId()))
+			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_LANGUAGE,
+						   NameStr(lanForm->lanname));
+
+		/* Must be able to become new owner */
+		check_is_member_of_role(GetUserId(), newOwnerId);
+
+		memset(repl_null, false, sizeof(repl_null));
+		memset(repl_repl, false, sizeof(repl_repl));
+
+		repl_repl[Anum_pg_language_lanowner - 1] = true;
+		repl_val[Anum_pg_language_lanowner - 1] = ObjectIdGetDatum(newOwnerId);
+
+		/*
+		 * Determine the modified ACL for the new owner.  This is only
+		 * necessary when the ACL is non-null.
+		 */
+		aclDatum = SysCacheGetAttr(LANGNAME, tup,
+								   Anum_pg_language_lanacl,
+								   &isNull);
+		if (!isNull)
+		{
+			newAcl = aclnewowner(DatumGetAclP(aclDatum),
+								 lanForm->lanowner, newOwnerId);
+			repl_repl[Anum_pg_language_lanacl - 1] = true;
+			repl_val[Anum_pg_language_lanacl - 1] = PointerGetDatum(newAcl);
+		}
+
+		newtuple = heap_modify_tuple(tup, RelationGetDescr(rel),
+									 repl_val, repl_null, repl_repl);
+
+		simple_heap_update(rel, &newtuple->t_self, newtuple);
+		CatalogUpdateIndexes(rel, newtuple);
+
+		heap_freetuple(newtuple);
+
+		/* Update owner dependency reference */
+		changeDependencyOnOwner(LanguageRelationId, HeapTupleGetOid(tup),
+								newOwnerId);
+	}
+}
diff --git a/src/backend/commands/queue.c b/src/backend/commands/queue.c
index 5338409eb63f..7b87f04db68d 100644
--- a/src/backend/commands/queue.c
+++ b/src/backend/commands/queue.c
@@ -772,17 +772,6 @@ CreateQueue(CreateQueueStmt *stmt)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("must be superuser to create resource queues")));
 
-	/*
-	 * MPP-7960: We cannot run CREATE RESOURCE QUEUE inside a user
-	 * transaction block because the shared memory structures are not
-	 * cleaned up on abort, resulting in "leaked", unreachable queues.
-	 */
-
-	if (Gp_role == GP_ROLE_DISPATCH)
-	{
-		PreventTransactionChain((void *) stmt, "CREATE RESOURCE QUEUE");
-	}
-
 	/* Extract options from the statement node tree */
 	foreach(option, stmt->options)
 	{
@@ -1094,17 +1083,6 @@ AlterQueue(AlterQueueStmt *stmt)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("must be superuser to alter resource queues")));
 
-	/*
-	 * MPP-7960: We cannot run ALTER RESOURCE QUEUE inside a user
-	 * transaction block because the shared memory structures are not
-	 * cleaned up on abort, resulting in "leaked", unreachable queues.
-	 */
-
-	if (Gp_role == GP_ROLE_DISPATCH)
-	{
-		PreventTransactionChain((void *) stmt, "ALTER RESOURCE QUEUE");
-	}
-
 	/* Extract options from the statement node tree */
 	foreach(option, stmt->options)
 	{
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 7601ba8d5f77..1267bc77fbbd 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -1,4 +1,4 @@
-/*------------------------------------------------------------------------- 
+/*-------------------------------------------------------------------------
  *
  * schemacmds.c
  *	  schema creation/manipulation commands
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.43 2007/02/01 19:10:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.49.2.1 2009/12/09 21:58:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,7 @@
 #include "commands/dbcommands.h"
 #include "commands/schemacmds.h"
 #include "miscadmin.h"
-#include "parser/analyze.h"
+#include "parser/parse_utilcmd.h"
 #include "tcop/utility.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
@@ -50,6 +50,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 	const char *schemaName = stmt->schemaname;
 	const char *authId = stmt->authid;
 	Oid			namespaceId;
+	OverrideSearchPath *overridePath;
 	List	   *parsetree_list;
 	ListCell   *parsetree_item;
 	Oid			owner_uid;
@@ -74,8 +75,10 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 		Assert(stmt->authid == NULL);
 		Assert(stmt->schemaElts == NIL);
 		Assert(stmt->schemaOid != InvalidOid);
+		Assert(stmt->toastSchemaOid != InvalidOid);
 
-		InitTempTableNamespaceWithOids(stmt->schemaOid);
+		InitTempTableNamespaceWithOids(stmt->schemaOid,
+									   stmt->toastSchemaOid);
 		return;
 	}
 
@@ -166,48 +169,43 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 	 * well as the default creation target namespace.  This will be undone at
 	 * the end of this routine, or upon error.
 	 */
-	PushSpecialNamespace(namespaceId);
+	overridePath = GetOverrideSearchPath(CurrentMemoryContext);
+	overridePath->schemas = lcons_oid(namespaceId, overridePath->schemas);
+	/* XXX should we clear overridePath->useTemp? */
+	PushOverrideSearchPath(overridePath);
 
 	/*
 	 * Examine the list of commands embedded in the CREATE SCHEMA command, and
 	 * reorganize them into a sequentially executable order with no forward
-	 * references.	Note that the result is still a list of raw parsetrees in
-	 * need of parse analysis --- we cannot, in general, run analyze.c on one
-	 * statement until we have actually executed the prior ones.
+	 * references.	Note that the result is still a list of raw parsetrees ---
+	 * we cannot, in general, run parse analysis on one statement until we
+	 * have actually executed the prior ones.
 	 */
-	parsetree_list = analyzeCreateSchemaStmt(stmt);
+	parsetree_list = transformCreateSchemaStmt(stmt);
 
 	/*
-	 * Analyze and execute each command contained in the CREATE SCHEMA
+	 * Execute each command contained in the CREATE SCHEMA.  Since the grammar
+	 * allows only utility commands in CREATE SCHEMA, there is no need to pass
+	 * them through parse_analyze() or the rewriter; we can just hand them
+	 * straight to ProcessUtility.
 	 */
 	foreach(parsetree_item, parsetree_list)
 	{
-		Node	   *parsetree = (Node *) lfirst(parsetree_item);
-		List	   *querytree_list;
-		ListCell   *querytree_item;
-
-		querytree_list = parse_analyze(parsetree, NULL, NULL, 0);
-
-		foreach(querytree_item, querytree_list)
-		{
-			Query	   *querytree = (Query *) lfirst(querytree_item);
-
-			/* schemas should contain only utility stmts */
-			Assert(querytree->commandType == CMD_UTILITY);
-			/* do this step */
-			ProcessUtility(querytree->utilityStmt, 
-						   queryString,
-						   NULL, 
-						   false, /* not top level */
-						   None_Receiver, 
-						   NULL);
-			/* make sure later steps can see the object created here */
-			CommandCounterIncrement();
-		}
+		Node	   *stmt = (Node *) lfirst(parsetree_item);
+
+		/* do this step */
+		ProcessUtility(stmt,
+					   queryString,
+					   NULL,
+					   false,	/* not top level */
+					   None_Receiver,
+					   NULL);
+		/* make sure later steps can see the object created here */
+		CommandCounterIncrement();
 	}
 
 	/* Reset search path to normal state */
-	PopSpecialNamespace(namespaceId);
+	PopOverrideSearchPath();
 
 	/* Reset current user and security context */
 	SetUserIdAndSecContext(saved_uid, save_sec_context);
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 218106e30f1e..3d9acde61ca5 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.143 2007/02/01 19:10:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.149 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@
 #include "miscadmin.h"
 #include "storage/smgr.h"               /* RelationCloseSmgr -> smgrclose */
 #include "nodes/makefuncs.h"
+#include "storage/proc.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/formatting.h"
@@ -51,7 +52,7 @@
 /*
  * We don't want to log each fetching of a value from a sequence,
  * so we pre-log a few fetches in advance. In the event of
- * crash we can lose as much as we pre-logged.
+ * crash we can lose (skip over) as many values as we pre-logged.
  */
 #define SEQ_LOG_VALS	32
 
@@ -79,11 +80,13 @@ typedef struct SeqTableData
 {
 	struct SeqTableData *next;	/* link to next SeqTable object */
 	Oid			relid;			/* pg_class OID of this sequence */
-	TransactionId xid;			/* xact in which we last did a seq op */
+	LocalTransactionId lxid;	/* xact in which we last did a seq op */
+	bool		last_valid;		/* do we have a valid "last" value? */
 	int64		last;			/* value last returned by nextval */
 	int64		cached;			/* last value already cached for nextval */
 	/* if last != cached, we have not used up all the cached values */
 	int64		increment;		/* copy of sequence's increment field */
+	/* note that increment is zero until we first do read_seq_tuple() */
 } SeqTableData;
 
 typedef SeqTableData *SeqTable;
@@ -99,14 +102,16 @@ static SeqTableData *last_used_seq = NULL;
 static int64 nextval_internal(Oid relid);
 static Relation open_share_lock(SeqTable seq);
 static void init_sequence(Oid relid, SeqTable *p_elm, Relation *p_rel);
-static Form_pg_sequence read_info(Relation rel, Buffer *buf);
+static Form_pg_sequence read_seq_tuple(SeqTable elm, Relation rel,
+			   Buffer *buf, HeapTuple seqtuple);
 static void init_params(List *options, bool isInit,
 			Form_pg_sequence new, List **owned_by);
 static void do_setval(Oid relid, int64 next, bool iscalled);
 static void process_owned_by(Relation seqrel, List *owned_by);
 
 static void
-cdb_sequence_nextval(Relation   seqrel,
+cdb_sequence_nextval(SeqTable elm,
+					 Relation   seqrel,
                      int64     *plast,
                      int64     *pcached,
                      int64     *pincrement,
@@ -462,7 +467,7 @@ DefineSequence(CreateSeqStmt *seq)
 			case SEQ_COL_LOG:
 				coldef->typname = makeTypeNameFromOid(INT8OID, -1);
 				coldef->colname = "log_cnt";
-				value[i - 1] = Int64GetDatum((int64) 1);
+				value[i - 1] = Int64GetDatum((int64) 0);
 				break;
 			case SEQ_COL_CYCLE:
 				coldef->typname = makeTypeNameFromOid(BOOLOID, -1);
@@ -591,12 +596,6 @@ DefineSequence(CreateSeqStmt *seq)
 		xl_seq_rec	xlrec;
 		XLogRecPtr	recptr;
 		XLogRecData rdata[2];
-		Form_pg_sequence newseq = (Form_pg_sequence) GETSTRUCT(tuple);
-
-		/* We do not log first nextval call, so "advance" sequence here */
-		/* Note we are scribbling on local tuple, not the disk buffer */
-		newseq->is_called = true;
-		newseq->log_cnt = 0;
 
 		xlrec.node = rel->rd_node;
 		xlrec.persistentTid = rel->rd_segfile0_relationnodeinfo.persistentTid;
@@ -612,7 +611,7 @@ DefineSequence(CreateSeqStmt *seq)
 		rdata[1].buffer = InvalidBuffer;
 		rdata[1].next = NULL;
 
-		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG | XLOG_NO_TRAN, rdata);
+		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG, rdata);
 
 		PageSetLSN(page, recptr);
 		PageSetTLI(page, ThisTimeLineID);
@@ -654,7 +653,7 @@ AlterSequence(AlterSeqStmt *stmt)
 	SeqTable	elm;
 	Relation	seqrel;
 	Buffer		buf;
-	Page		page;
+	HeapTupleData seqtuple;
 	Form_pg_sequence seq;
 	FormData_pg_sequence new;
 	List	   *owned_by;
@@ -681,9 +680,8 @@ AlterSequence(AlterSeqStmt *stmt)
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	seq = read_info(seqrel, &buf);
+	seq = read_seq_tuple(elm, seqrel, &buf, &seqtuple);
 	elm->increment = seq->increment_by;
-	page = BufferGetPage(buf);
 
 	/* Copy old values of options into workspace */
 	memcpy(&new, seq, sizeof(FormData_pg_sequence));
@@ -691,9 +689,6 @@ AlterSequence(AlterSeqStmt *stmt)
 	/* Check and set new values */
 	init_params(stmt->options, false, &new, &owned_by);
 
-	/* Now okay to update the on-disk tuple */
-	memcpy(seq, &new, sizeof(FormData_pg_sequence));
-
 	if (owned_by)
 	{
 		/* Restore previous state of elm (assume nothing else changes) */
@@ -702,17 +697,19 @@ AlterSequence(AlterSeqStmt *stmt)
 	else
 	{
 		/* Clear local cache so that we don't think we have cached numbers */
-		elm->last = new.last_value; /* last returned number */
-		elm->cached = new.last_value;	/* last cached number (forget cached
-										 * values) */
+		/* Note that we do not change the currval() state */
+		elm->cached = elm->last;
 	}
 
 	// Fetch gp_persistent_relation_node information that will be added to XLOG record.
 	Assert(seqrel != NULL);
 	Sequence_FetchGpRelationNodeForXLog(seqrel);
 
+	/* Now okay to update the on-disk tuple */
 	START_CRIT_SECTION();
 
+	memcpy(seq, &new, sizeof(FormData_pg_sequence));
+
 	MarkBufferDirty(buf);
 
 	/* XLOG stuff */
@@ -724,6 +721,7 @@ AlterSequence(AlterSeqStmt *stmt)
 		xl_seq_rec	xlrec;
 		XLogRecPtr	recptr;
 		XLogRecData rdata[2];
+		Page		page = BufferGetPage(buf);
 
 		xlrec.node = seqrel->rd_node;
 		xlrec.persistentTid = seqrel->rd_segfile0_relationnodeinfo.persistentTid;
@@ -734,13 +732,12 @@ AlterSequence(AlterSeqStmt *stmt)
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
-		rdata[1].data = (char *) page + ((PageHeader) page)->pd_upper;
-		rdata[1].len = ((PageHeader) page)->pd_special -
-			((PageHeader) page)->pd_upper;
+		rdata[1].data = (char *) seqtuple.t_data;
+		rdata[1].len = seqtuple.t_len;
 		rdata[1].buffer = InvalidBuffer;
 		rdata[1].next = NULL;
 
-		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG | XLOG_NO_TRAN, rdata);
+		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG, rdata);
 
 		PageSetLSN(page, recptr);
 		PageSetTLI(page, ThisTimeLineID);
@@ -845,9 +842,11 @@ nextval_internal(Oid relid)
 
 	if (elm->last != elm->cached)		/* some numbers were cached */
 	{
-		last_used_seq = elm;
+		Assert(elm->last_valid);
+		Assert(elm->increment != 0);
 		elm->last += elm->increment;
 		relation_close(seqrel, NoLock);
+		last_used_seq = elm;
 		return elm->last;
 	}
 
@@ -865,31 +864,35 @@ nextval_internal(Oid relid)
                                    &elm->increment,
                                    &is_overflow);
     else
-        cdb_sequence_nextval(seqrel,
+        cdb_sequence_nextval(elm,
+							 seqrel,
                              &elm->last,
                              &elm->cached,
                              &elm->increment,
                              &is_overflow);
 	last_used_seq = elm;
 
-        if(is_overflow)
-        {
-                relation_close(seqrel, NoLock);
+	if (is_overflow)
+	{
+		relation_close(seqrel, NoLock);
 
-                ereport(ERROR,
-                        (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                        errmsg("nextval: reached %s value of sequence \"%s\" (" INT64_FORMAT ")",
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("nextval: reached %s value of sequence \"%s\" (" INT64_FORMAT ")",
                         elm->increment>0 ? "maximum":"minimum",
                         RelationGetRelationName(seqrel), elm->last)));
-        }
+	}
+	else
+		elm->last_valid = true;
 
 	relation_close(seqrel, NoLock);
 	return elm->last;
 }
 
 
-void
-cdb_sequence_nextval(Relation   seqrel,
+static void
+cdb_sequence_nextval(SeqTable elm,
+					 Relation   seqrel,
                      int64     *plast,
                      int64     *pcached,
                      int64     *pincrement,
@@ -899,6 +902,7 @@ cdb_sequence_nextval(Relation   seqrel,
 
 	Buffer		buf;
 	Page		page;
+	HeapTupleData seqtuple;
 	Form_pg_sequence seq;
 	int64		incby,
 				maxv,
@@ -918,7 +922,7 @@ cdb_sequence_nextval(Relation   seqrel,
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	seq = read_info(seqrel, &buf);
+	seq = read_seq_tuple(elm, seqrel, &buf, &seqtuple);
 	page = BufferGetPage(buf);
 
 	last = next = result = seq->last_value;
@@ -930,9 +934,8 @@ cdb_sequence_nextval(Relation   seqrel,
 
 	if (!seq->is_called)
 	{
-		rescnt++;				/* last_value if not called */
+		rescnt++;				/* return last_value if not is_called */
 		fetch--;
-		log--;
 	}
 
 	/*
@@ -945,7 +948,7 @@ cdb_sequence_nextval(Relation   seqrel,
 	 * checkpoint would fail to advance the sequence past the logged values.
 	 * In this case we may as well fetch extra values.
 	 */
-	if (log < fetch)
+	if (log < fetch || !seq->is_called)
 	{
 		/* forced log to satisfy local demand for values */
 		fetch = log = fetch + SEQ_LOG_VALS;
@@ -1033,8 +1036,18 @@ cdb_sequence_nextval(Relation   seqrel,
 	Assert(seqrel != NULL);
 	Sequence_FetchGpRelationNodeForXLog(seqrel);
 
+	/* ready to change the on-disk (or really, in-buffer) tuple */
 	START_CRIT_SECTION();
 
+	/*
+	 * We must mark the buffer dirty before doing XLogInsert(); see notes in
+	 * SyncOneBuffer().  However, we don't apply the desired changes just yet.
+	 * This looks like a violation of the buffer update protocol, but it is
+	 * in fact safe because we hold exclusive lock on the buffer.  Any other
+	 * process, including a checkpoint, that tries to examine the buffer
+	 * contents will block until we release the lock, and then will see the
+	 * final state that we install below.
+	 */
 	MarkBufferDirty(buf);
 
 	/* XLOG stuff */
@@ -1044,27 +1057,32 @@ cdb_sequence_nextval(Relation   seqrel,
 		XLogRecPtr	recptr;
 		XLogRecData rdata[2];
 
+		/*
+		 * We don't log the current state of the tuple, but rather the state
+		 * as it would appear after "log" more fetches.  This lets us skip
+		 * that many future WAL records, at the cost that we lose those
+		 * sequence values if we crash.
+		 */
+
+		/* set values that will be saved in xlog */
+		seq->last_value = next;
+		seq->is_called = true;
+		seq->log_cnt = 0;
+
 		xlrec.node = seqrel->rd_node;
 		xlrec.persistentTid = seqrel->rd_segfile0_relationnodeinfo.persistentTid;
 		xlrec.persistentSerialNum = seqrel->rd_segfile0_relationnodeinfo.persistentSerialNum;
-
 		rdata[0].data = (char *) &xlrec;
 		rdata[0].len = sizeof(xl_seq_rec);
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
-		/* set values that will be saved in xlog */
-		seq->last_value = next;
-		seq->is_called = true;
-		seq->log_cnt = 0;
-
-		rdata[1].data = (char *) page + ((PageHeader) page)->pd_upper;
-		rdata[1].len = ((PageHeader) page)->pd_special -
-			((PageHeader) page)->pd_upper;
+		rdata[1].data = (char *) seqtuple.t_data;
+		rdata[1].len = seqtuple.t_len;
 		rdata[1].buffer = InvalidBuffer;
 		rdata[1].next = NULL;
 
-		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG | XLOG_NO_TRAN, rdata);
+		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG, rdata);
 
 		PageSetLSN(page, recptr);
 		PageSetTLI(page, ThisTimeLineID);
@@ -1083,7 +1101,7 @@ cdb_sequence_nextval(Relation   seqrel,
 		LWLockRelease(SeqServerControlLock);
 	}
 
-	/* update on-disk data */
+	/* Now update sequence tuple to the intended final state */
 	seq->last_value = last;		/* last fetched number */
 	seq->is_called = true;
 	seq->log_cnt = log;			/* how much is logged */
@@ -1124,7 +1142,7 @@ currval_oid(PG_FUNCTION_ARGS)
 				 errmsg("permission denied for sequence %s",
 						RelationGetRelationName(seqrel))));
 
-	if (elm->increment == 0)	/* nextval/read_info were not called */
+	if (!elm->last_valid)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("currval of sequence \"%s\" is not yet defined in this session",
@@ -1171,7 +1189,7 @@ lastval(PG_FUNCTION_ARGS)
 	seqrel = open_share_lock(last_used_seq);
 
 	/* nextval() must have already been called for this sequence */
-	Assert(last_used_seq->increment != 0);
+	Assert(last_used_seq->last_valid);
 
 	if (pg_class_aclcheck(last_used_seq->relid, GetUserId(), ACL_SELECT) != ACLCHECK_OK &&
 		pg_class_aclcheck(last_used_seq->relid, GetUserId(), ACL_USAGE) != ACLCHECK_OK)
@@ -1207,6 +1225,7 @@ do_setval(Oid relid, int64 next, bool iscalled)
 	SeqTable	elm;
 	Relation	seqrel;
 	Buffer		buf;
+	HeapTupleData seqtuple;
 	Form_pg_sequence seq;
 
 	if (Gp_role == GP_ROLE_EXECUTE)
@@ -1230,7 +1249,7 @@ do_setval(Oid relid, int64 next, bool iscalled)
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
 	
-	seq = read_info(seqrel, &buf);
+	seq = read_seq_tuple(elm, seqrel, &buf, &seqtuple);
 	elm->increment = seq->increment_by;
 
 	if ((next < seq->min_value) || (next > seq->max_value))
@@ -1249,16 +1268,27 @@ do_setval(Oid relid, int64 next, bool iscalled)
 						bufm, bufx)));
 	}
 
-	/* save info in local cache */
-	elm->last = next;			/* last returned number */
-	elm->cached = next;			/* last cached number (forget cached values) */
+	/* Set the currval() state only if iscalled = true */
+	if (iscalled)
+	{
+		elm->last = next;		/* last returned number */
+		elm->last_valid = true;
+	}
+
+	/* In any case, forget any future cached numbers */
+	elm->cached = elm->last;
 
 	// Fetch gp_persistent_relation_node information that will be added to XLOG record.
 	Assert(seqrel != NULL);
 	Sequence_FetchGpRelationNodeForXLog(seqrel);
 
+	/* ready to change the on-disk (or really, in-buffer) tuple */
 	START_CRIT_SECTION();
 
+	seq->last_value = next;		/* last fetched number */
+	seq->is_called = iscalled;
+	seq->log_cnt = 0;
+
 	MarkBufferDirty(buf);
 
 	/* XLOG stuff */
@@ -1278,28 +1308,17 @@ do_setval(Oid relid, int64 next, bool iscalled)
 		rdata[0].buffer = InvalidBuffer;
 		rdata[0].next = &(rdata[1]);
 
-		/* set values that will be saved in xlog */
-		seq->last_value = next;
-		seq->is_called = true;
-		seq->log_cnt = 0;
-
-		rdata[1].data = (char *) page + ((PageHeader) page)->pd_upper;
-		rdata[1].len = ((PageHeader) page)->pd_special -
-			((PageHeader) page)->pd_upper;
+		rdata[1].data = (char *) seqtuple.t_data;
+		rdata[1].len = seqtuple.t_len;
 		rdata[1].buffer = InvalidBuffer;
 		rdata[1].next = NULL;
 
-		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG | XLOG_NO_TRAN, rdata);
+		recptr = XLogInsert(RM_SEQ_ID, XLOG_SEQ_LOG, rdata);
 
 		PageSetLSN(page, recptr);
 		PageSetTLI(page, ThisTimeLineID);
 	}
 
-	/* save info in sequence relation */
-	seq->last_value = next;		/* last fetched number */
-	seq->is_called = iscalled;
-	seq->log_cnt = (iscalled) ? 0 : 1;
-
 	END_CRIT_SECTION();
 
 	UnlockReleaseBuffer(buf);
@@ -1353,10 +1372,10 @@ setval3_oid(PG_FUNCTION_ARGS)
 static Relation
 open_share_lock(SeqTable seq)
 {
-	TransactionId thisxid = GetTopTransactionId();
+	LocalTransactionId thislxid = MyProc->lxid;
 
 	/* Get the lock if not already held in this xact */
-	if (seq->xid != thisxid)
+	if (seq->lxid != thislxid)
 	{
 		ResourceOwner currentOwner;
 
@@ -1376,7 +1395,7 @@ open_share_lock(SeqTable seq)
 		CurrentResourceOwner = currentOwner;
 
 		/* Flag that we have a lock in the current xact */
-		seq->xid = thisxid;
+		seq->lxid = thislxid;
 	}
 
 	/* We now know we have AccessShareLock, and can safely open the rel */
@@ -1386,6 +1405,8 @@ open_share_lock(SeqTable seq)
 /*
  * Given a relation OID, open and lock the sequence.  p_elm and p_rel are
  * output parameters.
+ *
+ * GPDB: If p_rel is NULL, the sequence relation is not opened or locked.
  */
 static void
 init_sequence(Oid relid, SeqTable *p_elm, Relation *p_rel)
@@ -1419,8 +1440,8 @@ init_sequence(Oid relid, SeqTable *p_elm, Relation *p_rel)
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of memory")));
 		elm->relid = relid;
-		elm->xid = InvalidTransactionId;
-		/* increment is set to 0 until we do read_info (see currval) */
+		elm->lxid = InvalidLocalTransactionId;
+		elm->last_valid = false;
 		elm->last = elm->cached = elm->increment = 0;
 		elm->next = seqtab;
 		seqtab = elm;
@@ -1429,26 +1450,36 @@ init_sequence(Oid relid, SeqTable *p_elm, Relation *p_rel)
 	/*
 	 * Open the sequence relation.
 	 */
-	seqrel = open_share_lock(elm);
+	if (p_rel)
+	{
+		seqrel = open_share_lock(elm);
 
-	if (seqrel->rd_rel->relkind != RELKIND_SEQUENCE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a sequence",
-						RelationGetRelationName(seqrel))));
+		if (seqrel->rd_rel->relkind != RELKIND_SEQUENCE)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("\"%s\" is not a sequence",
+							RelationGetRelationName(seqrel))));
 
+		*p_rel = seqrel;
+	}
 	*p_elm = elm;
-	*p_rel = seqrel;
 }
 
 
-/* Given an opened relation, lock the page buffer and find the tuple */
+/*
+ * Given an opened sequence relation, lock the page buffer and find the tuple
+ *
+ * *buf receives the reference to the pinned-and-ex-locked buffer
+ * *seqtuple receives the reference to the sequence tuple proper
+ *		(this arg should point to a local variable of type HeapTupleData)
+ *
+ * Function's return value points to the data payload of the tuple
+ */
 static Form_pg_sequence
-read_info(Relation rel, Buffer *buf)
+read_seq_tuple(SeqTable elm, Relation rel, Buffer *buf, HeapTuple seqtuple)
 {
 	PageHeader	page;
 	ItemId		lp;
-	HeapTupleData tuple;
 	sequence_magic *sm;
 	Form_pg_sequence seq;
 
@@ -1465,10 +1496,32 @@ read_info(Relation rel, Buffer *buf)
 			 RelationGetRelationName(rel), sm->magic);
 
 	lp = PageGetItemId(page, FirstOffsetNumber);
-	Assert(ItemIdIsUsed(lp));
-	tuple.t_data = (HeapTupleHeader) PageGetItem((Page) page, lp);
+	Assert(ItemIdIsNormal(lp));
+
+	/* Note we currently only bother to set these two fields of *seqtuple */
+	seqtuple->t_data = (HeapTupleHeader) PageGetItem((Page) page, lp);
+	seqtuple->t_len = ItemIdGetLength(lp);
+
+	/*
+	 * Previous releases of Postgres neglected to prevent SELECT FOR UPDATE
+	 * on a sequence, which would leave a non-frozen XID in the sequence
+	 * tuple's xmax, which eventually leads to clog access failures or worse.
+	 * If we see this has happened, clean up after it.  We treat this like a
+	 * hint bit update, ie, don't bother to WAL-log it, since we can certainly
+	 * do this again if the update gets lost.
+	 */
+	if (HeapTupleHeaderGetXmax(seqtuple->t_data) != InvalidTransactionId)
+	{
+		HeapTupleHeaderSetXmax(seqtuple->t_data, InvalidTransactionId);
+		seqtuple->t_data->t_infomask &= ~HEAP_XMAX_COMMITTED;
+		seqtuple->t_data->t_infomask |= HEAP_XMAX_INVALID;
+		SetBufferCommitInfoNeedsSave(*buf);
+	}
 
-	seq = (Form_pg_sequence) GETSTRUCT(&tuple);
+	seq = (Form_pg_sequence) GETSTRUCT(seqtuple);
+
+	/* this is a handy place to update our copy of the increment */
+	elm->increment = seq->increment_by;
 
 	return seq;
 }
@@ -1565,6 +1618,13 @@ init_params(List *options, bool isInit,
 				 defel->defname);
 	}
 
+	/*
+	 * We must reset log_cnt when isInit or when changing any parameters
+	 * that would affect future nextval allocations.
+	 */
+	if (isInit)
+		new->log_cnt = 0;
+
 	/* INCREMENT BY */
 	if (increment_by != NULL)
 	{
@@ -1573,6 +1633,7 @@ init_params(List *options, bool isInit,
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("INCREMENT must not be zero")));
+		new->log_cnt = 0;
 	}
 	else if (isInit)
 		new->increment_by = 1;
@@ -1582,30 +1643,39 @@ init_params(List *options, bool isInit,
 	{
 		new->is_cycled = intVal(is_cycled->arg);
 		Assert(new->is_cycled == false || new->is_cycled == true);
+		new->log_cnt = 0;
 	}
 	else if (isInit)
 		new->is_cycled = false;
 
 	/* MAXVALUE (null arg means NO MAXVALUE) */
 	if (max_value != NULL && max_value->arg)
+	{
 		new->max_value = defGetInt64(max_value);
+		new->log_cnt = 0;
+	}
 	else if (isInit || max_value != NULL)
 	{
 		if (new->increment_by > 0)
 			new->max_value = SEQ_MAXVALUE;		/* ascending seq */
 		else
 			new->max_value = -1;	/* descending seq */
+		new->log_cnt = 0;
 	}
 
 	/* MINVALUE (null arg means NO MINVALUE) */
 	if (min_value != NULL && min_value->arg)
+	{
 		new->min_value = defGetInt64(min_value);
+		new->log_cnt = 0;
+	}
 	else if (isInit || min_value != NULL)
 	{
 		if (new->increment_by > 0)
 			new->min_value = 1; /* ascending seq */
 		else
 			new->min_value = SEQ_MINVALUE;		/* descending seq */
+		new->log_cnt = 0;
 	}
 
 	/* crosscheck min/max */
@@ -1661,8 +1731,8 @@ init_params(List *options, bool isInit,
 		snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->max_value);
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			   errmsg("START value (%s) cannot be greater than MAXVALUE (%s)",
-					  bufs, bufm)));
+			  errmsg("START value (%s) cannot be greater than MAXVALUE (%s)",
+					 bufs, bufm)));
 	}
 
 	/* CACHE */
@@ -1679,6 +1749,7 @@ init_params(List *options, bool isInit,
 					 errmsg("CACHE (%s) must be greater than zero",
 							buf)));
 		}
+		new->log_cnt = 0;
 	}
 	else if (isInit)
 		new->cache_value = 1;
@@ -1737,7 +1808,7 @@ process_owned_by(Relation seqrel, List *owned_by)
 		if (seqrel->rd_rel->relowner != tablerel->rd_rel->relowner)
 			ereport(ERROR,
 					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-			errmsg("sequence must have same owner as table it is linked to")));
+					 errmsg("sequence must have same owner as table it is linked to")));
 		if (RelationGetNamespace(seqrel) != RelationGetNamespace(tablerel))
 			ereport(ERROR,
 					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
@@ -1812,9 +1883,9 @@ seq_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 
 	item = (char *) xlrec + sizeof(xl_seq_rec);
 	itemsz = record->xl_len - sizeof(xl_seq_rec);
-	itemsz = MAXALIGN(itemsz);
+
 	if (PageAddItem(page, (Item) item, itemsz,
-					FirstOffsetNumber, LP_USED) == InvalidOffsetNumber)
+					FirstOffsetNumber, false, false) == InvalidOffsetNumber)
 		elog(PANIC, "seq_redo: failed to add item to page");
 
 	PageSetLSN(page, lsn);
@@ -1929,12 +2000,19 @@ cdb_sequence_nextval_server(Oid    tablespaceid,
                             bool  *poverflow)
 {
     RelationData    fakerel;
+	SeqTable	elm;
 	Relation	    seqrel = &fakerel;
 
     *plast = 0;
     *pcached = 0;
     *pincrement = 0;
 
+	/* Find the SeqTable entry for the sequence. Note that we don't lock the
+	 * relation, because the sequence server cannot hold heavy-weight locks.
+	 * GPDB_83_MERGE_FIXME: that's why I assume we don't hold the lock, anyway...
+	 * */
+	init_sequence(relid, &elm, NULL);
+
     /* Build a pseudo relcache entry with just enough info to call bufmgr. */
     seqrel = &fakerel;
     cdb_sequence_relation_init(seqrel, tablespaceid, dbid, relid, istemp);
@@ -1942,7 +2020,7 @@ cdb_sequence_nextval_server(Oid    tablespaceid,
     /* CDB TODO: Catch errors. */
 
     /* Update the sequence object. */
-    cdb_sequence_nextval(seqrel, plast, pcached, pincrement, poverflow);
+    cdb_sequence_nextval(elm, seqrel, plast, pcached, pincrement, poverflow);
 
     /* Cleanup. */
     cdb_sequence_relation_term(seqrel);
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index a082556eac03..a6e478910d37 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -70,13 +70,13 @@
 #include "executor/executor.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
 #include "nodes/print.h"
 #include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "optimizer/plancat.h"
 #include "optimizer/planner.h"
 #include "optimizer/prep.h"
-#include "parser/analyze.h"
 #include "parser/gramparse.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_clause.h"
@@ -87,8 +87,11 @@
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 #include "parser/parse_type.h"
+#include "parser/parse_utilcmd.h"
 #include "parser/parser.h"
+#include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
 #include "storage/backendid.h"
 #include "storage/sinval.h"
 #include "storage/smgr.h"
@@ -210,7 +213,6 @@ static void MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel
 static void MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel, List *inhAttrNameList,
 										bool is_partition);
 static bool add_nonduplicate_cooked_constraint(Constraint *cdef, List *stmtConstraints);
-static bool change_varattnos_varno_walker(Node *node, const AttrMapContext *attrMapCxt);
 
 static void StoreCatalogInheritance(Oid relationId, List *supers);
 static void StoreCatalogInheritance1(Oid relationId, Oid parentOid,
@@ -306,7 +308,9 @@ static void ATExecSetTableSpace(Oid tableOid, Oid newTableSpace,
 								TableOidInfo *oidInfo);
 static void ATExecSetRelOptions(Relation rel, List *defList, bool isReset);
 static void ATExecEnableDisableTrigger(Relation rel, char *trigname,
-						   bool enable, bool skip_system);
+						   char fires_when, bool skip_system);
+static void ATExecEnableDisableRule(Relation rel, char *rulename,
+						char fires_when);
 static void ATExecAddInherit(Relation rel, Node *node);
 static void ATExecDropInherit(Relation rel, RangeVar *parent, bool is_partition);
 static void ATExecSetDistributedBy(Relation rel, Node *node,
@@ -541,8 +545,8 @@ DefineRelation_int(CreateStmt *stmt,
 		 * Get the default tablespace specified via default_tablespace, or fall
 		 * back on the database tablespace.
 		 */
-		tablespaceId = GetDefaultTablespace();
-		
+		tablespaceId = GetDefaultTablespace(stmt->relation->istemp);
+
 		/* Need the real tablespace id for dispatch */
 		if (!OidIsValid(tablespaceId)) 
 			tablespaceId = MyDatabaseTableSpace;
@@ -554,11 +558,6 @@ DefineRelation_int(CreateStmt *stmt,
 			stmt->tablespacename = get_tablespace_name(tablespaceId);
 	}
 
-	/*
-	 * Parse and validate reloptions, if any.
-	 */
-	reloptions = transformRelOptions((Datum) 0, stmt->options, true, false);
-
 	/* Check permissions except when using database's default */
 	if (OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace)
 	{
@@ -571,6 +570,11 @@ DefineRelation_int(CreateStmt *stmt,
 						   get_tablespace_name(tablespaceId));
 	}
 
+	/*
+	 * Parse and validate reloptions, if any.
+	 */
+	reloptions = transformRelOptions((Datum) 0, stmt->options, true, false);
+
 	/*
 	 * Look up inheritance ancestors and generate relation schema, including
 	 * inherited attributes. Update the offsets of the distribution attributes
@@ -598,7 +602,7 @@ DefineRelation_int(CreateStmt *stmt,
 
 	/*
 	 * old_constraints: pre-cooked constraints from CREATE TABLE ... INHERIT ...
-	 * stmt->constraints: might have some pre-cooked constraints passed by analyze.c,
+	 * stmt->constraints: might have some pre-cooked constraints passed by parse_utilcmd.c,
 	 * 		due to LIKE tab INCLUDING CONSTRAINTS
 	 */
 	if ((Gp_role == GP_ROLE_DISPATCH || Gp_role == GP_ROLE_UTILITY)
@@ -1277,31 +1281,20 @@ DefinePartitionedRelation(CreateStmt *stmt, Oid relOid)
 
 	if (stmt->postCreate)
 	{
-		List *pQry;
-		Node *pUtl;
+		Query	   *pUtl;
 		DestReceiver *dest = None_Receiver;
 		List *pL1 = (List *)stmt->postCreate;
 
-		pQry = parse_analyze(linitial(pL1), NULL, NULL, 0);
-
-		if (pQry)
-		{
-			/* just grab the first guy - "There Can Be Only One"(TM) */
-			pUtl = linitial(pQry);
+		pUtl = parse_analyze(linitial(pL1), NULL, NULL, 0);
 
-			if (pUtl)
-			{
-				Assert(IsA(pUtl, Query));
-				Assert(((Query *)pUtl)->commandType == CMD_UTILITY);
+		Assert(((Query *)pUtl)->commandType == CMD_UTILITY);
 
-				ProcessUtility((Node *)(((Query *)pUtl)->utilityStmt),
-							   synthetic_sql,
-							   NULL,
-							   false, /* not top level */
-							   dest,
-							   NULL);
-			}
-		}
+		ProcessUtility((Node *)(((Query *)pUtl)->utilityStmt),
+					   synthetic_sql,
+					   NULL,
+					   false, /* not top level */
+					   dest,
+					   NULL);
 	}
 }
 
@@ -1322,32 +1315,23 @@ EvaluateDeferredStatements(List *deferredStmts)
 	
 	foreach( lc, deferredStmts )
 	{
-		ListCell *ulc;
-		List *analyzedStmts = NIL;
+		Query	   *uquery;
 		DestReceiver *dest = None_Receiver;
-		
+
 		Node *dstmt = lfirst(lc);
-		
-		analyzedStmts = parse_analyze(dstmt, NULL, NULL, 0);
-		foreach (ulc, analyzedStmts)
-		{
-			Query *uquery = NULL;
-			Node *utilityStmt = lfirst(ulc);
-			
-			Insist(IsA(utilityStmt, Query));
-			uquery = (Query*)utilityStmt;
-			Insist(uquery->commandType == CMD_UTILITY);
-			
-			ereport(DEBUG1,
-					(errmsg("processing deferred utility statement")));
-			
-			ProcessUtility((Node*)uquery->utilityStmt,
-						   synthetic_sql,
-						   NULL,
-						   false,
-						   dest,
-						   NULL);
-		}
+
+		uquery = parse_analyze(dstmt, NULL, NULL, 0);
+		Insist(uquery->commandType == CMD_UTILITY);
+
+		ereport(DEBUG1,
+				(errmsg("processing deferred utility statement")));
+
+		ProcessUtility((Node*)uquery->utilityStmt,
+					   synthetic_sql,
+					   NULL,
+					   false,
+					   dest,
+					   NULL);
 	}
 }
 
@@ -1753,7 +1737,7 @@ ExecuteTruncate(TruncateStmt *stmt)
 			 * as the relfilenode value. The old storage file is scheduled for
 			 * deletion at commit.
 			 */
-			new_heap_oid = setNewRelfilenode(rel);
+			new_heap_oid = setNewRelfilenode(rel, RecentXmin);
 
 			new_heap_oids = lappend_oid(new_heap_oids, new_heap_oid);
 
@@ -1774,7 +1758,7 @@ ExecuteTruncate(TruncateStmt *stmt)
 			if (OidIsValid(toast_relid))
 			{
 				rel = relation_open(toast_relid, AccessExclusiveLock);
-				new_toast_oid = setNewRelfilenode(rel);
+				new_toast_oid = setNewRelfilenode(rel, RecentXmin);
 				heap_close(rel, NoLock);
 			}
 
@@ -1784,21 +1768,21 @@ ExecuteTruncate(TruncateStmt *stmt)
 			if (OidIsValid(aoseg_relid))
 			{
 				rel = relation_open(aoseg_relid, AccessExclusiveLock);
-				new_aoseg_oid = setNewRelfilenode(rel);
+				new_aoseg_oid = setNewRelfilenode(rel, RecentXmin);
 				heap_close(rel, NoLock);
 			}
 
 			if (OidIsValid(aoblkdir_relid))
 			{
 				rel = relation_open(aoblkdir_relid, AccessExclusiveLock);
-				new_aoblkdir_oid = setNewRelfilenode(rel);
+				new_aoblkdir_oid = setNewRelfilenode(rel, RecentXmin);
 				heap_close(rel, NoLock);
 			}
 	
 			if (OidIsValid(aovisimap_relid))
 			{
 				rel = relation_open(aovisimap_relid, AccessExclusiveLock);
-				new_aovisimap_oid = setNewRelfilenode(rel);
+				new_aovisimap_oid = setNewRelfilenode(rel, RecentXmin);
 				heap_close(rel, NoLock);
 			}
 
@@ -1905,7 +1889,7 @@ ExecuteTruncate(TruncateStmt *stmt)
 			 * as the relfilenode value. The old storage file is scheduled for
 			 * deletion at commit.
 			 */
-			setNewRelfilenodeToOid(rel, new_heap_oid);
+			setNewRelfilenodeToOid(rel, RecentXmin, new_heap_oid);
 
 			heap_relid = RelationGetRelid(rel);
 			toast_relid = rel->rd_rel->reltoastrelid;
@@ -1923,7 +1907,7 @@ ExecuteTruncate(TruncateStmt *stmt)
 			if (OidIsValid(toast_relid))
 			{
 				rel = relation_open(toast_relid, AccessExclusiveLock);
-				setNewRelfilenodeToOid(rel, new_toast_oid);
+				setNewRelfilenodeToOid(rel, RecentXmin, new_toast_oid);
 				heap_close(rel, NoLock);
 			}
 
@@ -1934,21 +1918,21 @@ ExecuteTruncate(TruncateStmt *stmt)
 			if (OidIsValid(aoseg_relid))
 			{
 				rel = relation_open(aoseg_relid, AccessExclusiveLock);
-				setNewRelfilenodeToOid(rel, new_aoseg_oid);
+				setNewRelfilenodeToOid(rel, RecentXmin, new_aoseg_oid);
 				heap_close(rel, NoLock);
 			}
 
 			if (OidIsValid(aoblkdir_relid))
 			{
 				rel = relation_open(aoblkdir_relid, AccessExclusiveLock);
-				setNewRelfilenodeToOid(rel, new_aoblkdir_oid);
+				setNewRelfilenodeToOid(rel, RecentXmin, new_aoblkdir_oid);
 				heap_close(rel, NoLock);
 			}
 	
 			if (OidIsValid(aovisimap_relid))
 			{
 				rel = relation_open(aovisimap_relid, AccessExclusiveLock);
-				setNewRelfilenodeToOid(rel, new_aovisimap_oid);
+				setNewRelfilenodeToOid(rel, RecentXmin, new_aovisimap_oid);
 				heap_close(rel, NoLock);
 			}
 
@@ -2145,7 +2129,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, bool isPartitioned,
 			if (strcmp(coldef->colname, restdef->colname) == 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_DUPLICATE_COLUMN),
-						 errmsg("column \"%s\" duplicated",
+						 errmsg("column \"%s\" specified more than once",
 								coldef->colname)));
 		}
 	}
@@ -2199,8 +2183,8 @@ MergeAttributes(List *schema, List *supers, bool istemp, bool isPartitioned,
 		if (list_member_oid(parentOids, RelationGetRelid(relation)))
 			ereport(ERROR,
 					(errcode(ERRCODE_DUPLICATE_TABLE),
-					 errmsg("inherited relation \"%s\" duplicated",
-							parent->relname)));
+			 errmsg("relation \"%s\" would be inherited from more than once",
+					parent->relname)));
 
 		parentOids = lappend_oid(parentOids, RelationGetRelid(relation));
 
@@ -2216,7 +2200,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, bool isPartitioned,
 		 * parents after the first one, nor if we have dropped columns.)
 		 */
 		newattno = (AttrNumber *)
-			palloc(tupleDesc->natts * sizeof(AttrNumber));
+			palloc0(tupleDesc->natts * sizeof(AttrNumber));
 
 		for (parent_attno = 1; parent_attno <= tupleDesc->natts;
 			 parent_attno++)
@@ -2230,15 +2214,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, bool isPartitioned,
 			 * Ignore dropped columns in the parent.
 			 */
 			if (attribute->attisdropped)
-			{
-				/*
-				 * change_varattnos_of_a_node asserts that this is greater
-				 * than zero, so if anything tries to use it, we should find
-				 * out.
-				 */
-				newattno[parent_attno - 1] = 0;
 				continue;
-			}
 
 			/*
 			 * Does it conflict with some previously inherited column?
@@ -2264,8 +2240,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, bool isPartitioned,
 						(errmsg("merging multiple inherited definitions of column \"%s\"",
 								attributeName)));
 				def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
-				defTypeId = typenameTypeId(NULL, def->typname);
-				deftypmod = typenameTypeMod(NULL, def->typname, defTypeId);
+				defTypeId = typenameTypeId(NULL, def->typname, &deftypmod);
 				if (defTypeId != attribute->atttypid ||
 					deftypmod != attribute->atttypmod)
 					ereport(ERROR,
@@ -2378,13 +2353,31 @@ MergeAttributes(List *schema, List *supers, bool istemp, bool isPartitioned,
 			{
 				Constraint *cdef = makeNode(Constraint);
 				Node	   *expr;
+				bool		found_whole_row;
+
+				/* Adjust Vars to match new table's column numbering */
+				expr = map_variable_attnos(stringToNode(check[i].ccbin),
+										   1, 0,
+										   newattno, tupleDesc->natts,
+										   &found_whole_row);
+
+				/*
+				 * For the moment we have to reject whole-row variables.
+				 * We could convert them, if we knew the new table's rowtype
+				 * OID, but that hasn't been assigned yet.
+				 */
+				if (found_whole_row)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("cannot convert whole-row table reference"),
+							 errdetail("Constraint \"%s\" contains a whole-row reference to table \"%s\".",
+									   check[i].ccname,
+									   RelationGetRelationName(relation))));
 
 				cdef->contype = CONSTR_CHECK;
 				cdef->name = pstrdup(check[i].ccname);
 				cdef->raw_expr = NULL;
-				/* adjust varattnos of ccbin here */
-				expr = stringToNode(check[i].ccbin);
-				change_varattnos_of_a_node(expr, newattno);
+
 				cdef->cooked_expr = nodeToString(expr);
 				constraints = lappend(constraints, cdef);
 			}
@@ -2420,28 +2413,21 @@ MergeAttributes(List *schema, List *supers, bool istemp, bool isPartitioned,
 			if (exist_attno > 0)
 			{
 				ColumnDef  *def;
-				Oid			defTypeId, newTypeId;
-				int32		deftypmod, newtypmod;
+				Oid			defTypeId,
+							newTypeId;
+				int32		deftypmod,
+							newtypmod;
 
 				/*
 				 * Yes, try to merge the two column definitions. They must
 				 * have the same type and typmod.
 				 */
-				if (Gp_role == GP_ROLE_EXECUTE)
-				{
-					ereport(DEBUG1,
-					   (errmsg("merging column \"%s\" with inherited definition",
-							   attributeName)));
-				}
-				else
-				ereport(NOTICE,
+				ereport((Gp_role == GP_ROLE_EXECUTE) ? DEBUG1 : NOTICE,
 				   (errmsg("merging column \"%s\" with inherited definition",
 						   attributeName)));
 				def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
-				defTypeId = typenameTypeId(NULL, def->typname);
-				deftypmod = typenameTypeMod(NULL, def->typname, defTypeId);
-				newTypeId = typenameTypeId(NULL, newdef->typname);
-				newtypmod = typenameTypeMod(NULL, newdef->typname, newTypeId);
+				defTypeId = typenameTypeId(NULL, def->typname, &deftypmod);
+				newTypeId = typenameTypeId(NULL, newdef->typname, &newtypmod);
 				if (defTypeId != newTypeId || deftypmod != newtypmod)
 					ereport(ERROR,
 							(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -2541,148 +2527,6 @@ add_nonduplicate_cooked_constraint(Constraint *cdef, List *stmtConstraints)
 	return true;
 }
 
-
-/*
- * Replace varattno values in an expression tree according to the given
- * map array, that is, varattno N is replaced by newattno[N-1].  It is
- * caller's responsibility to ensure that the array is long enough to
- * define values for all user varattnos present in the tree.  System column
- * attnos remain unchanged. For historical reason, we only map varattno of the first
- * range table entry from this method. So, we call the more general
- * change_varattnos_of_a_varno() with varno set to 1
- *
- * Note that the passed node tree is modified in-place!
- */
-void
-change_varattnos_of_a_node(Node *node, const AttrNumber *newattno)
-{
-	/* Only attempt re-mapping if re-mapping is necessary (i.e., non-null newattno map) */
-	if (newattno)
-	{
-		change_varattnos_of_a_varno(node, newattno, 1 /* varno is hard-coded to 1 (i.e., only first RTE) */);
-	}
-}
-
-/*
- * Replace varattno values for a given varno RTE index in an expression
- * tree according to the given map array, that is, varattno N is replaced
- * by newattno[N-1].  It is caller's responsibility to ensure that the array
- * is long enough to define values for all user varattnos present in the tree.
- * System column attnos remain unchanged.
- *
- * Note that the passed node tree is modified in-place!
- */
-void
-change_varattnos_of_a_varno(Node *node, const AttrNumber *newattno, Index varno)
-{
-	AttrMapContext attrMapCxt;
-
-	attrMapCxt.newattno = newattno;
-	attrMapCxt.varno = varno;
-
-	(void) change_varattnos_varno_walker(node, &attrMapCxt);
-}
-
-/*
- * Remaps the varattno of a varattno in a Var node using an attribute map.
- */
-static bool
-change_varattnos_varno_walker(Node *node, const AttrMapContext *attrMapCxt)
-{
-	if (node == NULL)
-		return false;
-	if (IsA(node, Var))
-	{
-		Var		   *var = (Var *) node;
-
-		if (var->varlevelsup == 0 && (var->varno == attrMapCxt->varno) &&
-			var->varattno > 0)
-		{
-			/*
-			 * ??? the following may be a problem when the node is multiply
-			 * referenced though stringToNode() doesn't create such a node
-			 * currently.
-			 */
-			Assert(attrMapCxt->newattno[var->varattno - 1] > 0);
-			var->varattno = var->varoattno = attrMapCxt->newattno[var->varattno - 1];
-		}
-		return false;
-	}
-	return expression_tree_walker(node, change_varattnos_varno_walker,
-								  (void *) attrMapCxt);
-}
-
-/*
- * Generate a map for change_varattnos_of_a_node from old and new TupleDesc's,
- * matching according to column name. This function returns a NULL pointer (i.e.
- * null map) if no mapping is necessary (i.e., old and new TupleDesc are already
- * aligned).
- */
-AttrNumber *
-varattnos_map(TupleDesc old, TupleDesc new)
-{
-	AttrNumber *attmap;
-	int			i,
-				j;
-
-	bool mapRequired = false;
-
-	attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * old->natts);
-	for (i = 1; i <= old->natts; i++)
-	{
-		if (old->attrs[i - 1]->attisdropped)
-			continue;			/* leave the entry as zero */
-
-		for (j = 1; j <= new->natts; j++)
-		{
-			if (strcmp(NameStr(old->attrs[i - 1]->attname),
-					   NameStr(new->attrs[j - 1]->attname)) == 0)
-			{
-				attmap[i - 1] = j;
-
-				if (i != j)
-				{
-					mapRequired = true;
-				}
-				break;
-			}
-		}
-	}
-
-	if (!mapRequired)
-	{
-		pfree(attmap);
-
-		/* No mapping required, so return NULL */
-		attmap = NULL;
-	}
-
-	return attmap;
-}
-
-/*
- * Generate a map for change_varattnos_of_a_node from a TupleDesc and a list
- * of ColumnDefs
- */
-AttrNumber *
-varattnos_map_schema(TupleDesc old, List *schema)
-{
-	AttrNumber *attmap;
-	int			i;
-
-	attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * old->natts);
-	for (i = 1; i <= old->natts; i++)
-	{
-		if (old->attrs[i - 1]->attisdropped)
-			continue;			/* leave the entry as zero */
-
-		attmap[i - 1] = findAttrByName(NameStr(old->attrs[i - 1]->attname),
-									   schema);
-	}
-	return attmap;
-}
-
-
 /*
  * StoreCatalogInheritance
  *		Updates the system catalogs with proper inheritance information.
@@ -3106,7 +2950,7 @@ renameatt(Oid myrelid,
  *			  sequence, AFAIK there's no need for it to be there.
  */
 void
-renamerel(Oid myrelid, const char *newrelname, RenameStmt *stmt)
+renamerel(Oid myrelid, const char *newrelname, ObjectType reltype, RenameStmt *stmt)
 {
 	Relation	relrelation;	/* for RELATION relation */
 	HeapTuple	reltup;
@@ -3117,8 +2961,18 @@ renamerel(Oid myrelid, const char *newrelname, RenameStmt *stmt)
 	char		relkind;
 	bool		relhastriggers;
 	bool		isSystemRelation;
-	cqContext	cqc;
-	cqContext  *pcqCtx;
+
+	/* GPDB_83_MERGE_FIXME: For some reason, this code has been changed
+	 * in GPDB to not grab a lock on the relation. That seems incredibly
+	 * wrong to me, but need to investigate why that was done.
+	 */
+#if 0
+	/*
+	 * Grab an exclusive lock on the target table, index, sequence or view,
+	 * which we will NOT release until end of transaction.
+	 */
+	targetrelation = relation_open(myrelid, AccessExclusiveLock);
+#endif
 
 	/* if this is a child table of a partitioning configuration, complain */
 	if (stmt && rel_is_child_partition(myrelid) && !stmt->bAllowPartn)
@@ -3142,26 +2996,42 @@ renamerel(Oid myrelid, const char *newrelname, RenameStmt *stmt)
 	 */
 	relrelation = heap_open(RelationRelationId, RowExclusiveLock);
 
-	pcqCtx = caql_addrel(cqclr(&cqc), relrelation);
-
-	reltup = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_class "
-				" WHERE oid = :1 "
-				" FOR UPDATE ",
-				ObjectIdGetDatum(myrelid)));
-	if (!HeapTupleIsValid(reltup))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("relation \"%d\" does not exist", myrelid)));
-
+	reltup = SearchSysCacheCopy(RELOID,
+								ObjectIdGetDatum(myrelid),
+								0, 0, 0);
+	if (!HeapTupleIsValid(reltup))		/* shouldn't happen */
+		elog(ERROR, "cache lookup failed for relation %u", myrelid);
 	relform = (Form_pg_class) GETSTRUCT(reltup);
+
 	relkind = relform->relkind;
 	namespaceId = relform->relnamespace;
 	relhastriggers = relform->reltriggers;
 	typeId = relform->reltype;
 	oldrelname = pstrdup(NameStr(relform->relname));
 
+	/*
+	 * For compatibility with prior releases, we don't complain if ALTER TABLE
+	 * or ALTER INDEX is used to rename a sequence or view.
+	 */
+	if (reltype == OBJECT_SEQUENCE && relkind != RELKIND_SEQUENCE)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("\"%s\" is not a sequence",
+						oldrelname)));
+
+	if (reltype == OBJECT_VIEW && relkind != RELKIND_VIEW)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("\"%s\" is not a view",
+						oldrelname)));
+
+	if (get_relname_relid(newrelname, namespaceId) != InvalidOid)
+		ereport(ERROR,
+				(errcode(ERRCODE_DUPLICATE_TABLE),
+				 errmsg("relation \"%s\" already exists",
+						newrelname)));
+
+
 	isSystemRelation = IsSystemNamespace(namespaceId) ||
 					   IsToastNamespace(namespaceId) ||
 					   IsAoSegmentNamespace(namespaceId);
@@ -3180,7 +3050,10 @@ renamerel(Oid myrelid, const char *newrelname, RenameStmt *stmt)
 	 */
 	namestrcpy(&(relform->relname), newrelname);
 
-	caql_update_current(pcqCtx, reltup); /* implicit update of index as well */
+	simple_heap_update(relrelation, &reltup->t_self, reltup);
+
+	/* keep the system catalog indexes current */
+	CatalogUpdateIndexes(relrelation, reltup);
 
 	heap_freetuple(reltup);
 	heap_close(relrelation, NoLock);
@@ -3188,14 +3061,25 @@ renamerel(Oid myrelid, const char *newrelname, RenameStmt *stmt)
 	/*
 	 * Also rename the associated type, if any.
 	 */
-	if (relkind != RELKIND_INDEX)
+	if (OidIsValid(typeId))
 	{
 		if (!TypeTupleExists(typeId))
 			ereport(WARNING,
 					(errcode(ERRCODE_UNDEFINED_OBJECT),
 					 errmsg("type \"%s\" does not exist", oldrelname)));
 		else
-			TypeRename(typeId, newrelname);
+			TypeRename(typeId, newrelname, namespaceId);
+	}
+
+	/*
+	 * Also rename the associated constraint, if any.
+	 */
+	if (relkind == RELKIND_INDEX)
+	{
+		Oid			constraintId = get_index_constraint(myrelid);
+
+		if (OidIsValid(constraintId))
+			RenameConstraintById(constraintId, newrelname);
 	}
 
 	/* MPP-3059: recursive rename of partitioned table */
@@ -3521,29 +3405,11 @@ ATVerifyObject(AlterTableStmt *stmt, Relation rel)
 void
 AlterTable(AlterTableStmt *stmt)
 {
-	Relation rel = relation_openrv(stmt->relation, AccessExclusiveLock);
-	int			expected_refcnt;
+	Relation	rel = relation_openrv(stmt->relation, AccessExclusiveLock);
 
 	ATVerifyObject(stmt, rel);
 	
-	/*
-	 * Disallow ALTER TABLE when the current backend has any open reference
-	 * to it besides the one we just got (such as an open cursor or active
-	 * plan); our AccessExclusiveLock doesn't protect us against stomping on
-	 * our own foot, only other people's feet!
-	 *
-	 * Note: the only case known to cause serious trouble is ALTER COLUMN TYPE,
-	 * and some changes are obviously pretty benign, so this could possibly
-	 * be relaxed to only error out for certain types of alterations.  But
-	 * the use-case for allowing any of these things is not obvious, so we
-	 * won't work hard at it for now.
-	 */
-	expected_refcnt = rel->rd_isnailed ? 2 : 1;
-	if (rel->rd_refcnt != expected_refcnt)
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_IN_USE),
-				 errmsg("relation \"%s\" is being used by active queries in this session",
-						RelationGetRelationName(rel))));
+	CheckTableNotInUse(rel, "ALTER TABLE");
 
 	if (Gp_role == GP_ROLE_DISPATCH)
 	{
@@ -3583,7 +3449,7 @@ AlterTable(AlterTableStmt *stmt)
 void
 AlterTableInternal(Oid relid, List *cmds, bool recurse)
 {
-	Relation rel = relation_open(relid, AccessExclusiveLock);
+	Relation	rel = relation_open(relid, AccessExclusiveLock);
 
 	ATController(rel, cmds, recurse, 0, NULL, NULL);
 }
@@ -3847,20 +3713,6 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 				Insist(IsA(topindexstmt, IndexStmt));
 				if ( topindexstmt->isconstraint )
 				{
-					if ( !topindexstmt->altconname )
- 					{
- 						if ( topindexstmt->primary )
-							contype = CONSTR_PRIMARY;
-						else if ( topindexstmt->unique )
-							contype = CONSTR_UNIQUE;
-							 						 						
-						/* Pick and install a constraint name. */
-						topindexstmt->altconname =
-							ChooseConstraintNameForPartitionEarly(rel, 
-																  contype,
-																  (Node*)topindexstmt->indexParams);
-					}
-
 					switch ( rel_part_status(RelationGetRelid(rel)) )
 					{
 						case PART_STATUS_ROOT:
@@ -4123,6 +3975,8 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 			pass = AT_PASS_MISC;
 			break;
 		case AT_EnableTrig:		/* ENABLE TRIGGER variants */
+		case AT_EnableAlwaysTrig:
+		case AT_EnableReplicaTrig:
 		case AT_EnableTrigAll:
 		case AT_EnableTrigUser:
 		case AT_DisableTrig:	/* DISABLE TRIGGER variants */
@@ -4134,6 +3988,10 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 			/* No command-specific prep needed */
 			pass = AT_PASS_MISC;
 			break;
+		case AT_EnableRule:		/* ENABLE/DISABLE RULE variants */
+		case AT_EnableAlwaysRule:
+		case AT_EnableReplicaRule:
+		case AT_DisableRule:
 		case AT_AddInherit:		/* INHERIT / NO INHERIT */
 		case AT_DropInherit:
 			ATSimplePermissions(rel, false);
@@ -5000,69 +4858,71 @@ ATAddToastIfNeeded(List **wqueue,
  * ATExecCmd: dispatch a subcommand to appropriate execution routine
  */
 static void
-ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation *rel, AlterTableCmd *cmd)
+ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation *rel_p, AlterTableCmd *cmd)
 {
+	Relation rel = *rel_p;
+
 	switch (cmd->subtype)
 	{
 		case AT_AddColumn:		/* ADD COLUMN */
 		case AT_AddColumnRecurse:
-			ATExecAddColumn(tab, *rel, (ColumnDef *) cmd->def);
+			ATExecAddColumn(tab, rel, (ColumnDef *) cmd->def);
 			break;
 		case AT_ColumnDefault:	/* ALTER COLUMN DEFAULT */
 		case AT_ColumnDefaultRecurse:
-			ATExecColumnDefault(*rel, cmd->name, (ColumnDef *) cmd->def);
+			ATExecColumnDefault(rel, cmd->name, (ColumnDef *) cmd->def);
 			break;
 		case AT_DropNotNull:	/* ALTER COLUMN DROP NOT NULL */
-			ATExecDropNotNull(*rel, cmd->name);
+			ATExecDropNotNull(rel, cmd->name);
 			break;
 		case AT_SetNotNull:		/* ALTER COLUMN SET NOT NULL */
-			ATExecSetNotNull(tab, *rel, cmd->name);
+			ATExecSetNotNull(tab, rel, cmd->name);
 			break;
 		case AT_SetStatistics:	/* ALTER COLUMN STATISTICS */
-			ATExecSetStatistics(*rel, cmd->name, cmd->def);
+			ATExecSetStatistics(rel, cmd->name, cmd->def);
 			break;
 		case AT_SetStorage:		/* ALTER COLUMN STORAGE */
-			ATExecSetStorage(*rel, cmd->name, cmd->def);
+			ATExecSetStorage(rel, cmd->name, cmd->def);
 			break;
 		case AT_DropColumn:		/* DROP COLUMN */
-			ATExecDropColumn(wqueue, *rel, cmd->name, cmd->behavior, false, false);
+			ATExecDropColumn(wqueue, rel, cmd->name, cmd->behavior, false, false);
 			break;
 		case AT_DropColumnRecurse:		/* DROP COLUMN with recursion */
-			ATExecDropColumn(wqueue, *rel, cmd->name, cmd->behavior, true, false);
+			ATExecDropColumn(wqueue, rel, cmd->name, cmd->behavior, true, false);
 			break;
 		case AT_AddIndex:		/* ADD INDEX */
-			ATExecAddIndex(tab, *rel, (IndexStmt *) cmd->def, false,
+			ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, false,
 						   cmd->part_expanded);
 			break;
 		case AT_ReAddIndex:		/* ADD INDEX */
-			ATExecAddIndex(tab, *rel, (IndexStmt *) cmd->def, true,
+			ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, true,
 						   cmd->part_expanded);
 			break;
 		case AT_AddConstraint:	/* ADD CONSTRAINT */
-			ATExecAddConstraint(tab, *rel, cmd->def, false);
+			ATExecAddConstraint(tab, rel, cmd->def, false);
 			break;
 		case AT_AddConstraintRecurse: /* ADD CONSTRAINT with recursion: internal */
-			ATExecAddConstraint(tab, *rel, cmd->def, true);
+			ATExecAddConstraint(tab, rel, cmd->def, true);
 			break;
 		case AT_DropConstraint:	/* DROP CONSTRAINT */
-			ATExecDropConstraint(*rel, cmd->name, cmd->behavior, false);
+			ATExecDropConstraint(rel, cmd->name, cmd->behavior, false);
 			break;
 		case AT_DropConstraintQuietly:	/* DROP CONSTRAINT for child */
-			ATExecDropConstraint(*rel, cmd->name, cmd->behavior, true);
+			ATExecDropConstraint(rel, cmd->name, cmd->behavior, true);
 			break;
 		case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
-			ATExecAlterColumnType(tab, *rel, cmd->name, (TypeName *) cmd->def);
+			ATExecAlterColumnType(tab, rel, cmd->name, (TypeName *) cmd->def);
 			break;
 		case AT_ChangeOwner:	/* ALTER OWNER */
-			ATExecChangeOwner(RelationGetRelid(*rel),
+			ATExecChangeOwner(RelationGetRelid(rel),
 							  get_roleid_checked(cmd->name),
 							  false);
 			break;
 		case AT_ClusterOn:		/* CLUSTER ON */
-			ATExecClusterOn(*rel, cmd->name);
+			ATExecClusterOn(rel, cmd->name);
 			break;
 		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
-			ATExecDropCluster(*rel);
+			ATExecDropCluster(rel);
 			break;
 		case AT_DropOids:		/* SET WITHOUT OIDS */
 
@@ -5078,67 +4938,99 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation *rel, AlterTableCmd *cm
 			 */
 			break;
 		case AT_SetRelOptions:	/* SET (...) */
-			ATExecSetRelOptions(*rel, (List *) cmd->def, false);
+			ATExecSetRelOptions(rel, (List *) cmd->def, false);
 			break;
 		case AT_ResetRelOptions:		/* RESET (...) */
-			ATExecSetRelOptions(*rel, (List *) cmd->def, true);
+			ATExecSetRelOptions(rel, (List *) cmd->def, true);
 			break;
 		case AT_EnableTrig:		/* ENABLE TRIGGER name */
-			ATExecEnableDisableTrigger(*rel, cmd->name, true, false);
+			ATExecEnableDisableTrigger(rel, cmd->name,
+									   TRIGGER_FIRES_ON_ORIGIN, false);
+			break;
+		case AT_EnableAlwaysTrig:		/* ENABLE ALWAYS TRIGGER name */
+			ATExecEnableDisableTrigger(rel, cmd->name,
+									   TRIGGER_FIRES_ALWAYS, false);
+			break;
+		case AT_EnableReplicaTrig:		/* ENABLE REPLICA TRIGGER name */
+			ATExecEnableDisableTrigger(rel, cmd->name,
+									   TRIGGER_FIRES_ON_REPLICA, false);
 			break;
 		case AT_DisableTrig:	/* DISABLE TRIGGER name */
-			ATExecEnableDisableTrigger(*rel, cmd->name, false, false);
+			ATExecEnableDisableTrigger(rel, cmd->name,
+									   TRIGGER_DISABLED, false);
 			break;
 		case AT_EnableTrigAll:	/* ENABLE TRIGGER ALL */
-			ATExecEnableDisableTrigger(*rel, NULL, true, false);
+			ATExecEnableDisableTrigger(rel, NULL,
+									   TRIGGER_FIRES_ON_ORIGIN, false);
 			break;
 		case AT_DisableTrigAll:	/* DISABLE TRIGGER ALL */
-			ATExecEnableDisableTrigger(*rel, NULL, false, false);
+			ATExecEnableDisableTrigger(rel, NULL,
+									   TRIGGER_DISABLED, false);
 			break;
 		case AT_EnableTrigUser:	/* ENABLE TRIGGER USER */
-			ATExecEnableDisableTrigger(*rel, NULL, true, true);
+			ATExecEnableDisableTrigger(rel, NULL,
+									   TRIGGER_FIRES_ON_ORIGIN, true);
 			break;
 		case AT_DisableTrigUser:		/* DISABLE TRIGGER USER */
-			ATExecEnableDisableTrigger(*rel, NULL, false, true);
+			ATExecEnableDisableTrigger(rel, NULL,
+									   TRIGGER_DISABLED, true);
 			break;
+
+		case AT_EnableRule:		/* ENABLE RULE name */
+			ATExecEnableDisableRule(rel, cmd->name,
+									RULE_FIRES_ON_ORIGIN);
+			break;
+		case AT_EnableAlwaysRule:		/* ENABLE ALWAYS RULE name */
+			ATExecEnableDisableRule(rel, cmd->name,
+									RULE_FIRES_ALWAYS);
+			break;
+		case AT_EnableReplicaRule:		/* ENABLE REPLICA RULE name */
+			ATExecEnableDisableRule(rel, cmd->name,
+									RULE_FIRES_ON_REPLICA);
+			break;
+		case AT_DisableRule:	/* DISABLE RULE name */
+			ATExecEnableDisableRule(rel, cmd->name,
+									RULE_DISABLED);
+			break;
+
 		case AT_AddInherit:
-			ATExecAddInherit(*rel, (Node *) cmd->def);
+			ATExecAddInherit(rel, (Node *) cmd->def);
 			break;
 		case AT_DropInherit:
-			ATExecDropInherit(*rel, (RangeVar *) cmd->def, false);
+			ATExecDropInherit(rel, (RangeVar *) cmd->def, false);
 			break;
 		case AT_SetDistributedBy:	/* SET DISTRIBUTED BY */
-			ATExecSetDistributedBy(*rel, (Node *) cmd->def, cmd);
+			ATExecSetDistributedBy(rel, (Node *) cmd->def, cmd);
 			break;
 			/* CDB: Partitioned Table commands */
 		case AT_PartAdd:				/* Add */
 		case AT_PartAddForSplit:		/* Add, as part of a Split */
-			ATPExecPartAdd(tab, *rel, (AlterPartitionCmd *) cmd->def,
+			ATPExecPartAdd(tab, rel, (AlterPartitionCmd *) cmd->def,
 						   cmd->subtype);
             break;
 		case AT_PartAlter:				/* Alter */
-            ATPExecPartAlter(wqueue, tab, *rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartAlter(wqueue, tab, rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartCoalesce:			/* Coalesce */
-            ATPExecPartCoalesce(*rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartCoalesce(rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartDrop:				/* Drop */
-            ATPExecPartDrop(*rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartDrop(rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartExchange:			/* Exchange */
-            ATPExecPartExchange(tab, *rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartExchange(tab, rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartMerge:				/* Merge */
-            ATPExecPartMerge(*rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartMerge(rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartModify:				/* Modify */
-            ATPExecPartModify(*rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartModify(rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartRename:				/* Rename */
-            ATPExecPartRename(*rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartRename(rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartSetTemplate:		/* Set Subpartition Template */
-			ATPExecPartSetTemplate(tab, *rel, (AlterPartitionCmd *) cmd->def);
+			ATPExecPartSetTemplate(tab, rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartSplit:				/* Split */
 			/*
@@ -5147,13 +5039,14 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation *rel, AlterTableCmd *cm
 			 * method. After the method returns, we expect to
 			 * reference a valid relcache object through rel.
 			 */
-            ATPExecPartSplit(rel, (AlterPartitionCmd *) cmd->def);
+            ATPExecPartSplit(&rel, (AlterPartitionCmd *) cmd->def);
+			*rel_p = rel;
             break;
 		case AT_PartTruncate:			/* Truncate */
-			ATPExecPartTruncate(*rel, (AlterPartitionCmd *) cmd->def);
+			ATPExecPartTruncate(rel, (AlterPartitionCmd *) cmd->def);
             break;
 		case AT_PartAddInternal:
-			ATExecPartAddInternal(*rel, cmd->def);
+			ATExecPartAddInternal(rel, cmd->def);
 			break;
 		default:				/* oops */
 			elog(ERROR, "unrecognized alter table type: %d",
@@ -5298,16 +5191,19 @@ ATRewriteTables(List **wqueue,
 			ATRewriteTable(tab, OIDNewHeap);
 
 			/* 
-			 * Swap the physical files of the old and new heaps. 
+			 * Swap the physical files of the old and new heaps.  Since we are
+			 * generating a new heap, we can use RecentXmin for the table's
+			 * new relfrozenxid because we rewrote all the tuples on
+			 * ATRewriteTable, so no older Xid remains on the table.
 			 *
-			 * MPP-17516 - The third argument to swap_relation_files is 
+			 * MPP-17516 - The fourth argument to swap_relation_files is 
 			 * "swap_stats", and it dictates whether the relpages and 
 			 * reltuples of the fake relfile should be copied over to our 
 			 * original pg_class tuple. We do not want to do this in the case 
 			 * of ALTER TABLE rewrites as the temp relfile will not have correct 
 			 * stats.
 			 */
-			swap_relation_files(tab->relid, OIDNewHeap, false);
+			swap_relation_files(tab->relid, OIDNewHeap, RecentXmin, false);
 
 			CommandCounterIncrement();
 
@@ -6618,7 +6514,7 @@ find_composite_type_dependencies(Oid typeOid,
  *
  * Adds an additional attribute to a relation making the assumption that
  * CHECK, NOT NULL, and FOREIGN KEY constraints will be removed from the
- * AT_AddColumn AlterTableCmd by analyze.c and added as independent
+ * AT_AddColumn AlterTableCmd by parse_utilcmd.c and added as independent
  * AlterTableCmd's.
  */
 static void
@@ -6712,12 +6608,6 @@ ATPrepAddColumn(Relation rel, bool recurse, AlterTableCmd *cmd)
 	}
 }
 
-void
-ATAddColumn(Relation rel, ColumnDef *colDef)
-{
-	ATExecAddColumn((AlteredTableInfo*)NULL, rel, colDef);
-}
-
 static void
 ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
 				ColumnDef *colDef)
@@ -6770,8 +6660,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
 			int32		ctypmod;
 
 			/* Okay if child matches by type */
-			ctypeId = typenameTypeId(NULL, colDef->typname);
-			ctypmod = typenameTypeMod(NULL, colDef->typname, ctypeId);
+			ctypeId = typenameTypeId(NULL, colDef->typname, &ctypmod);
 
 			if (ctypeId != childatt->atttypid ||
 				ctypmod != childatt->atttypmod)
@@ -6856,13 +6745,13 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
 						MaxHeapAttributeNumber)));
 	i = minattnum + 1;
 
-	typeTuple = typenameType(NULL, colDef->typname);
+	typeTuple = typenameType(NULL, colDef->typname, &typmod);
 	tform = (Form_pg_type) GETSTRUCT(typeTuple);
 	typeOid = HeapTupleGetOid(typeTuple);
-	typmod = typenameTypeMod(NULL, colDef->typname, typeOid);
 
 	/* make sure datatype is legal for a column */
-	CheckAttributeType(colDef->colname, typeOid);
+	CheckAttributeType(colDef->colname, typeOid,
+					   list_make1_oid(rel->rd_rel->reltype));
 
 	attributeTuple = heap_addheader(Natts_pg_attribute,
 									false,
@@ -6952,12 +6841,15 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
 
 	if (!defval && GetDomainConstraints(typeOid) != NIL)
 	{
-		Oid			basetype = getBaseType(typeOid);
+		Oid			baseTypeId;
+		int32		baseTypeMod;
 
-		defval = (Expr *) makeNullConst(basetype, -1);
+		baseTypeMod = typmod;
+		baseTypeId = getBaseTypeAndTypmod(typeOid, &baseTypeMod);
+		defval = (Expr *) makeNullConst(baseTypeId, baseTypeMod);
 		defval = (Expr *) coerce_to_target_type(NULL, 
 												(Node *) defval,
-												basetype,
+												baseTypeId,
 												typeOid,
 												typmod,
 												COERCION_ASSIGNMENT,
@@ -7108,6 +7000,8 @@ ATExecDropNotNull(Relation rel, const char *colName)
 
 	/*
 	 * Check that the attribute is not in a primary key
+	 *
+	 * Note: we'll throw error even if the pkey index is not valid.
 	 */
 
 	/* Loop over all indexes on the relation */
@@ -7810,9 +7704,9 @@ ATExecDropColumn(List **wqueue, Relation rel, const char *colName,
 /*
  * ALTER TABLE ADD INDEX
  *
- * There is no such command in the grammar, but the parser converts UNIQUE
- * and PRIMARY KEY constraints into AT_AddIndex subcommands.  This lets us
- * schedule creation of the index at the appropriate time during ALTER.
+ * There is no such command in the grammar, but parse_utilcmd.c converts
+ * UNIQUE and PRIMARY KEY constraints into AT_AddIndex subcommands.  This lets
+ * us schedule creation of the index at the appropriate time during ALTER.
  */
 static void
 ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
@@ -7835,6 +7729,8 @@ ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
 	/* suppress notices when rebuilding existing index */
 	quiet = is_rebuild;
 
+	/* The IndexStmt has already been through transformIndexStmt */
+
 	DefineIndex(stmt->relation, /* relation */
 				stmt->idxname,	/* index name */
 				InvalidOid,		/* no predefined OID */
@@ -7842,7 +7738,6 @@ ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
 				stmt->tableSpace,
 				stmt->indexParams,		/* parameters */
 				(Expr *) stmt->whereClause,
-				stmt->rangetable,
 				stmt->options,
 				stmt->unique,
 				stmt->primary,
@@ -7961,8 +7856,8 @@ ATExecAddConstraint(AlteredTableInfo *tab, Relation rel, Node *newConstraint, bo
 				/*
 				 * Currently, we only expect to see CONSTR_CHECK nodes
 				 * arriving here (see the preprocessing done in
-				 * parser/analyze.c).  Use a switch anyway to make it easier
-				 * to add more code later.
+				 * parse_utilcmd.c).  Use a switch anyway to make it easier to
+				 * add more code later.
 				 */
 				switch (constr->contype)
 				{
@@ -8260,7 +8155,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 	 *
 	 * Note that we have to be careful about the difference between the actual
 	 * PK column type and the opclass' declared input type, which might be
-	 * only binary-compatible with it.  The declared opcintype is the right
+	 * only binary-compatible with it.	The declared opcintype is the right
 	 * thing to probe pg_amop with.
 	 */
 	if (numfks != numpks)
@@ -8297,10 +8192,10 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 
 		/*
 		 * Check it's a btree; currently this can never fail since no other
-		 * index AMs support unique indexes.  If we ever did have other
-		 * types of unique indexes, we'd need a way to determine which
-		 * operator strategy number is equality.  (Is it reasonable to
-		 * insist that every such index AM use btree's number for equality?)
+		 * index AMs support unique indexes.  If we ever did have other types
+		 * of unique indexes, we'd need a way to determine which operator
+		 * strategy number is equality.  (Is it reasonable to insist that
+		 * every such index AM use btree's number for equality?)
 		 */
 		if (amid != BTREE_AM_OID)
 			elog(ERROR, "only b-tree indexes are supported for foreign keys");
@@ -8318,8 +8213,8 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 				 eqstrategy, opcintype, opcintype, opfamily);
 
 		/*
-		 * Are there equality operators that take exactly the FK type?
-		 * Assume we should look through any domain here.
+		 * Are there equality operators that take exactly the FK type? Assume
+		 * we should look through any domain here.
 		 */
 		fktyped = getBaseType(fktype);
 
@@ -8329,21 +8224,21 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 			ffeqop = get_opfamily_member(opfamily, fktyped, fktyped,
 										 eqstrategy);
 		else
-			ffeqop = InvalidOid;				/* keep compiler quiet */
+			ffeqop = InvalidOid;	/* keep compiler quiet */
 
 		if (!(OidIsValid(pfeqop) && OidIsValid(ffeqop)))
 		{
 			/*
-			 * Otherwise, look for an implicit cast from the FK type to
-			 * the opcintype, and if found, use the primary equality operator.
-			 * This is a bit tricky because opcintype might be a generic type
-			 * such as ANYARRAY, and so what we have to test is whether the
-			 * two actual column types can be concurrently cast to that type.
-			 * (Otherwise, we'd fail to reject combinations such as int[] and
-			 * point[].)
+			 * Otherwise, look for an implicit cast from the FK type to the
+			 * opcintype, and if found, use the primary equality operator.
+			 * This is a bit tricky because opcintype might be a polymorphic
+			 * type such as ANYARRAY or ANYENUM; so what we have to test is
+			 * whether the two actual column types can be concurrently cast to
+			 * that type.  (Otherwise, we'd fail to reject combinations such
+			 * as int[] and point[].)
 			 */
-			Oid		input_typeids[2];
-			Oid		target_typeids[2];
+			Oid			input_typeids[2];
+			Oid			target_typeids[2];
 
 			input_typeids[0] = pktype;
 			input_typeids[1] = fktype;
@@ -8505,7 +8400,7 @@ transformFkeyGetPrimaryKey(Relation pkrel, Oid *indexOid,
 	/*
 	 * Get the list of index OIDs for the table from the relcache, and look up
 	 * each one in the pg_index syscache until we find one marked primary key
-	 * (hopefully there isn't more than one such).
+	 * (hopefully there isn't more than one such).  Insist it's valid, too.
 	 */
 	*indexOid = InvalidOid;
 
@@ -8521,7 +8416,7 @@ transformFkeyGetPrimaryKey(Relation pkrel, Oid *indexOid,
 		if (!HeapTupleIsValid(indexTuple))
 			elog(ERROR, "cache lookup failed for index %u", indexoid);
 		indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
-		if (indexStruct->indisprimary)
+		if (indexStruct->indisprimary && IndexIsValid(indexStruct))
 		{
 			*indexOid = indexoid;
 			break;
@@ -8613,6 +8508,7 @@ transformFkeyCheckAttrs(Relation pkrel,
 		 */
 		if (indexStruct->indnatts == numattrs &&
 			indexStruct->indisunique &&
+			IndexIsValid(indexStruct) &&
 			heap_attisnull(indexTuple, Anum_pg_index_indpred) &&
 			heap_attisnull(indexTuple, Anum_pg_index_indexprs))
 		{
@@ -8701,7 +8597,7 @@ validateForeignKeyConstraint(FkConstraint *fkconstraint,
 	MemSet(&trig, 0, sizeof(trig));
 	trig.tgoid = InvalidOid;
 	trig.tgname = fkconstraint->constr_name;
-	trig.tgenabled = TRUE;
+	trig.tgenabled = TRIGGER_FIRES_ON_ORIGIN;
 	trig.tgisconstraint = TRUE;
 	trig.tgconstrrelid = RelationGetRelid(pkrel);
 	trig.tgconstraint = constraintOid;
@@ -8831,13 +8727,6 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint,
 	/* Make changes-so-far visible */
 	CommandCounterIncrement();
 
-	/*
-	 * Build and execute a CREATE CONSTRAINT TRIGGER statement for the CHECK
-	 * action for both INSERTs and UPDATEs on the referencing table.
-	 */
-	CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, true);
-	CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, false);
-
 	/*
 	 * Build and execute a CREATE CONSTRAINT TRIGGER statement for the ON
 	 * DELETE action on the referenced table.
@@ -8893,6 +8782,24 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint,
 	/* Make changes-so-far visible */
 	CommandCounterIncrement();
 
+	/*
+	 * Build and execute CREATE CONSTRAINT TRIGGER statements for the CHECK
+	 * action for both INSERTs and UPDATEs on the referencing table.
+	 *
+	 * Note: for a self-referential FK (referencing and referenced tables are
+	 * the same), it is important that the ON UPDATE action fires before the
+	 * CHECK action, since both triggers will fire on the same row during an
+	 * UPDATE event; otherwise the CHECK trigger will be checking a non-final
+	 * state of the row.  Because triggers fire in name order, we are
+	 * effectively relying on the OIDs of the triggers to sort correctly as
+	 * text.  This will work except when the OID counter wraps around or adds
+	 * a digit, eg "99999" sorts after "100000".  That is infrequent enough,
+	 * and the use of self-referential FKs is rare enough, that we live with
+	 * it for now.  There will be a real fix in PG 9.2.
+	 */
+	CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, true);
+	CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, false);
+
 	/*
 	 * Build and execute a CREATE CONSTRAINT TRIGGER statement for the ON
 	 * UPDATE action on the referenced table.
@@ -9054,11 +8961,11 @@ ATPrepAlterColumnType(List **wqueue,
 						colName)));
 
 	/* Look up the target type */
-	targettype = typenameTypeId(NULL, typename);
-	targettypmod = typenameTypeMod(NULL, typename, targettype);
+	targettype = typenameTypeId(NULL, typename, &targettypmod);
 
 	/* make sure datatype is legal for a column */
-	CheckAttributeType(colName, targettype);
+	CheckAttributeType(colName, targettype,
+					   list_make1_oid(rel->rd_rel->reltype));
 
 	/*
 	 * Set up an expression to transform the old data value to the new type.
@@ -9204,10 +9111,9 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
 						colName)));
 
 	/* Look up the target type (should not fail, since prep found it) */
-	typeTuple = typenameType(NULL, typename);
+	typeTuple = typenameType(NULL, typename, &targettypmod);
 	tform = (Form_pg_type) GETSTRUCT(typeTuple);
 	targettype = HeapTupleGetOid(typeTuple);
-	targettypmod = typenameTypeMod(NULL, typename, targettype);
 
 	if (targettype == INT4OID ||
 		targettype == INT2OID ||
@@ -9448,8 +9354,13 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
 			case OCLASS_LANGUAGE:
 			case OCLASS_OPERATOR:
 			case OCLASS_OPCLASS:
+			case OCLASS_OPFAMILY:
 			case OCLASS_TRIGGER:
 			case OCLASS_SCHEMA:
+			case OCLASS_TSPARSER:
+			case OCLASS_TSDICT:
+			case OCLASS_TSTEMPLATE:
+			case OCLASS_TSCONFIG:
 
 				/*
 				 * We don't expect any of these sorts of objects to depend on
@@ -9680,17 +9591,27 @@ ATPostAlterTypeParse(char *cmd, List **wqueue, Oid constrOid)
 	ListCell   *list_item;
 
 	/*
-	 * We expect that we only have to do raw parsing and parse analysis, not
-	 * any rule rewriting, since these will all be utility statements.
+	 * We expect that we will get only ALTER TABLE and CREATE INDEX
+	 * statements. Hence, there is no need to pass them through
+	 * parse_analyze() or the rewriter, but instead we need to pass them
+	 * through parse_utilcmd.c to make them ready for execution.
 	 */
 	raw_parsetree_list = raw_parser(cmd);
 	querytree_list = NIL;
 	foreach(list_item, raw_parsetree_list)
 	{
-		Node	   *parsetree = (Node *) lfirst(list_item);
+		Node	   *stmt = (Node *) lfirst(list_item);
 
-		querytree_list = list_concat(querytree_list,
-									 parse_analyze(parsetree, cmd, NULL, 0));
+		if (IsA(stmt, IndexStmt))
+			querytree_list = list_concat(querytree_list,
+									 transformIndexStmt((IndexStmt *) stmt,
+														cmd));
+		else if (IsA(stmt, AlterTableStmt))
+			querytree_list = list_concat(querytree_list,
+							 transformAlterTableStmt((AlterTableStmt *) stmt,
+													 cmd));
+		else
+			querytree_list = lappend(querytree_list, stmt);
 	}
 
 	/*
@@ -9699,17 +9620,15 @@ ATPostAlterTypeParse(char *cmd, List **wqueue, Oid constrOid)
 	 */
 	foreach(list_item, querytree_list)
 	{
-		Query	   *query = (Query *) lfirst(list_item);
+		Node	   *stm = (Node *) lfirst(list_item);
 		Relation	rel;
 		AlteredTableInfo *tab;
 
-		Assert(IsA(query, Query));
-		Assert(query->commandType == CMD_UTILITY);
-		switch (nodeTag(query->utilityStmt))
+		switch (nodeTag(stm))
 		{
 			case T_IndexStmt:
 				{
-					IndexStmt  *stmt = (IndexStmt *) query->utilityStmt;
+					IndexStmt  *stmt = (IndexStmt *) stm;
 					AlterTableCmd *newcmd;
 
 					rel = relation_openrv(stmt->relation, AccessExclusiveLock);
@@ -9724,7 +9643,7 @@ ATPostAlterTypeParse(char *cmd, List **wqueue, Oid constrOid)
 				}
 			case T_AlterTableStmt:
 				{
-					AlterTableStmt *stmt = (AlterTableStmt *) query->utilityStmt;
+					AlterTableStmt *stmt = (AlterTableStmt *) stm;
 					ListCell   *lcmd;
 
 					rel = relation_openrv(stmt->relation, AccessExclusiveLock);
@@ -9759,7 +9678,7 @@ ATPostAlterTypeParse(char *cmd, List **wqueue, Oid constrOid)
 				}
 			default:
 				elog(ERROR, "unexpected statement type: %d",
-					 (int) nodeTag(query->utilityStmt));
+					 (int) nodeTag(stm));
 		}
 	}
 }
@@ -9850,11 +9769,19 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing)
 								get_rel_name(tableId))));
 			}
 			break;
+		case RELKIND_COMPOSITE_TYPE:
+			if (recursing)
+				break;
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("\"%s\" is a composite type",
+							NameStr(tuple_class->relname)),
+					 errhint("Use ALTER TYPE instead.")));
+			break;
 		case RELKIND_TOASTVALUE:
 		case RELKIND_AOSEGMENTS:
 		case RELKIND_AOBLOCKDIR:
 		case RELKIND_AOVISIMAP:
-		case RELKIND_COMPOSITE_TYPE:
 			if (recursing)
 				break;
 			/* FALL THRU */
@@ -10971,6 +10898,12 @@ ATExecSetTableSpace_Relation(Oid tableOid, Oid newTableSpace, Oid newrelfilenode
 				 errmsg("cannot move system relation \"%s\"",
 						RelationGetRelationName(rel))));
 
+	/* Can't move a non-shared relation into pg_global */
+	if (newTableSpace == GLOBALTABLESPACE_OID)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("only shared relations can be placed in pg_global tablespace")));
+
 	/*
 	 * Don't allow moving temp tables of other backends ... their local buffer
 	 * manager is not going to cope.
@@ -11189,10 +11122,10 @@ copy_buffer_pool_data(Relation rel, SMgrRelation dst,
 					  bool useWal)
 {
 	SMgrRelation src;
+	char	   *buf;
+	Page		page;
 	BlockNumber nblocks;
 	BlockNumber blkno;
-	char		buf[BLCKSZ];
-	Page		page = (Page) buf;
 
 	MirroredBufferPoolBulkLoadInfo bulkLoadInfo;
 
@@ -11204,6 +11137,15 @@ copy_buffer_pool_data(Relation rel, SMgrRelation dst,
 	 */
 	FlushRelationBuffers(rel);
 
+	/*
+	 * palloc the buffer so that it's MAXALIGN'd.  If it were just a local
+	 * char[] array, the compiler might align it on any byte boundary, which
+	 * can seriously hurt transfer speed to and from the kernel; not to
+	 * mention possibly making log_newpage's accesses to the page header fail.
+	 */
+	buf = (char *) palloc(BLCKSZ);
+	page = (Page) buf;
+
 	nblocks = RelationGetNumberOfBlocks(rel);
 
 	/* RelationGetNumberOfBlocks will certainly have opened rd_smgr */
@@ -11234,42 +11176,15 @@ copy_buffer_pool_data(Relation rel, SMgrRelation dst,
 	
 	for (blkno = 0; blkno < nblocks; blkno++)
 	{
+		/* If we got a cancel signal during the copy of the data, quit */
+		CHECK_FOR_INTERRUPTS();
+
 		smgrread(src, blkno, buf);
 
 		/* XLOG stuff */
 		if (useWal)
-		{
-			xl_heap_newpage xlrec;
-			XLogRecPtr	recptr;
-			XLogRecData rdata[2];
-
-			/* NO ELOG(ERROR) from here till newpage op is logged */
-			START_CRIT_SECTION();
-
-			xlrec.heapnode.node = dst->smgr_rnode;
-			xlrec.heapnode.persistentTid = *persistentTid;
-			xlrec.heapnode.persistentSerialNum = persistentSerialNum;
-			xlrec.blkno = blkno;
-
-			rdata[0].data = (char *) &xlrec;
-			rdata[0].len = SizeOfHeapNewpage;
-			rdata[0].buffer = InvalidBuffer;
-			rdata[0].next = &(rdata[1]);
-
-			rdata[1].data = (char *) page;
-			rdata[1].len = BLCKSZ;
-			rdata[1].buffer = InvalidBuffer;
-			rdata[1].next = NULL;
-
-			recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_NEWPAGE, rdata);
+			log_newpage(&dst->smgr_rnode, blkno, page);
 
-			PageSetLSN(page, recptr);
-			PageSetTLI(page, ThisTimeLineID);
-
-			END_CRIT_SECTION();
-		}
-
-		
 		// -------- MirroredLock ----------
 		LWLockAcquire(MirroredLock, LW_SHARED);
 		
@@ -11284,6 +11199,8 @@ copy_buffer_pool_data(Relation rel, SMgrRelation dst,
 		// -------- MirroredLock ----------
 	}
 
+	pfree(buf);
+
 	/*
 	 * If the rel isn't temp, we must fsync it down to disk before it's safe
 	 * to commit the transaction.  (For a temp rel we don't care since the rel
@@ -11372,21 +11289,50 @@ copy_buffer_pool_data(Relation rel, SMgrRelation dst,
  */
 static void
 ATExecEnableDisableTrigger(Relation rel, char *trigname,
-						   bool enable, bool skip_system)
+						   char fires_when, bool skip_system)
 {
-	EnableDisableTrigger(rel, trigname, enable, skip_system);
+	EnableDisableTrigger(rel, trigname, fires_when, skip_system);
 
 	/* MPP-6929: metadata tracking */
-	if ((Gp_role == GP_ROLE_DISPATCH)
-		&& MetaTrackValidKindNsp(rel->rd_rel))
+	if (Gp_role == GP_ROLE_DISPATCH && MetaTrackValidKindNsp(rel->rd_rel))
+	{
+		char	   *subtype;
+		switch (fires_when)
+		{
+			case TRIGGER_FIRES_ON_ORIGIN:
+				subtype = "ENABLE TRIGGER";
+				break;
+			case TRIGGER_FIRES_ALWAYS:
+				subtype = "ENABLE ALWAYS TRIGGER";
+				break;
+			case TRIGGER_FIRES_ON_REPLICA:
+				subtype = "ENABLE REPLICA TRIGGER";
+				break;
+			case TRIGGER_DISABLED:
+				subtype = "DISBLE TRIGGER";
+				break;
+			default:
+				subtype = "unknown trigger mode";
+				break;
+		}
 		MetaTrackUpdObject(RelationRelationId,
 						   RelationGetRelid(rel),
 						   GetUserId(),
 						   "ALTER", 
-						   enable ? "ENABLE TRIGGER" : 
-						   "DISABLE TRIGGER"
-				);
+						   subtype);
+	}
+}
 
+/*
+ * ALTER TABLE ENABLE/DISABLE RULE
+ *
+ * We just pass this off to rewriteDefine.c.
+ */
+static void
+ATExecEnableDisableRule(Relation rel, char *trigname,
+						char fires_when)
+{
+	EnableDisableRule(rel, trigname, fires_when);
 }
 
 static void
@@ -11424,8 +11370,8 @@ inherit_parent(Relation parent_rel, Relation child_rel, bool is_partition, List
 		if (inh->inhparent == RelationGetRelid(parent_rel))
 			ereport(ERROR,
 					(errcode(ERRCODE_DUPLICATE_TABLE),
-					 errmsg("inherited relation \"%s\" duplicated",
-							RelationGetRelationName(parent_rel))));
+			 errmsg("relation \"%s\" would be inherited from more than once",
+					RelationGetRelationName(parent_rel))));
 		if (inh->inhseqno > inhseqno)
 			inhseqno = inh->inhseqno;
 	}
@@ -11436,12 +11382,12 @@ inherit_parent(Relation parent_rel, Relation child_rel, bool is_partition, List
 	 * (In particular, this disallows making a rel inherit from itself.)
 	 *
 	 * This is not completely bulletproof because of race conditions: in
-	 * multi-level inheritance trees, someone else could concurrently
-	 * be making another inheritance link that closes the loop but does
-	 * not join either of the rels we have locked.  Preventing that seems
-	 * to require exclusive locks on the entire inheritance tree, which is
-	 * a cure worse than the disease.  find_all_inheritors() will cope with
-	 * circularity anyway, so don't sweat it too much.
+	 * multi-level inheritance trees, someone else could concurrently be
+	 * making another inheritance link that closes the loop but does not join
+	 * either of the rels we have locked.  Preventing that seems to require
+	 * exclusive locks on the entire inheritance tree, which is a cure worse
+	 * than the disease.  find_all_inheritors() will cope with circularity
+	 * anyway, so don't sweat it too much.
 	 */
 	children = find_all_inheritors(RelationGetRelid(child_rel));
 
@@ -11468,7 +11414,7 @@ inherit_parent(Relation parent_rel, Relation child_rel, bool is_partition, List
 	MergeConstraintsIntoExisting(child_rel, parent_rel);
 
 	/*
-	 * OK, it looks valid.  Make the catalog entries that show inheritance.
+	 * OK, it looks valid.	Make the catalog entries that show inheritance.
 	 */
 	StoreCatalogInheritance1(RelationGetRelid(child_rel),
 							 RelationGetRelid(parent_rel),
@@ -11701,8 +11647,8 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel, List *inhAt
 			if (attribute->attnotnull && !childatt->attnotnull)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
-					  errmsg("column \"%s\" in child table must be marked NOT NULL",
-							 attributeName)));
+				errmsg("column \"%s\" in child table must be marked NOT NULL",
+					   attributeName)));
 
 			/*
 			 * OK, bump the child column's inheritance count.  (If we fail
@@ -11883,20 +11829,20 @@ ATExecDropInherit(Relation rel, RangeVar *parent, bool is_partition)
 	bool		found = false;
 
 	/*
-	 * AccessShareLock on the parent is probably enough, seeing that DROP TABLE
-	 * doesn't lock parent tables at all.  We need some lock since we'll be
-	 * inspecting the parent's schema.
+	 * AccessShareLock on the parent is probably enough, seeing that DROP
+	 * TABLE doesn't lock parent tables at all.  We need some lock since we'll
+	 * be inspecting the parent's schema.
 	 */
 	parent_rel = heap_openrv(parent, AccessShareLock);
 
 	/*
-	 * We don't bother to check ownership of the parent table --- ownership
-	 * of the child is presumed enough rights.
+	 * We don't bother to check ownership of the parent table --- ownership of
+	 * the child is presumed enough rights.
 	 */
 
 	/*
-	 * Find and destroy the pg_inherits entry linking the two, or error out
-	 * if there is none.
+	 * Find and destroy the pg_inherits entry linking the two, or error out if
+	 * there is none.
 	 */
 
 	/* XXX XXX: could do DELETE FROM ... WHERE ... AND inhparent = :2,
@@ -12071,7 +12017,6 @@ build_ctas_with_dist(Relation rel, List *dist_clause,
 	Query *q;
 	SelectStmt *s = makeNode(SelectStmt);
 	Node *n;
-	List	*parsetrees;
 	RangeVar *from_tbl;
 	List *rewritten;
 	PlannedStmt *stmt;
@@ -12128,9 +12073,7 @@ build_ctas_with_dist(Relation rel, List *dist_clause,
 	}
 	*tmprv = tmprel;
 
-	parsetrees = parse_analyze((Node *)n, NULL, NULL, 0);
-	Assert(list_length(parsetrees) == 1);
-	q = (Query *)linitial(parsetrees);
+	q = parse_analyze((Node *)n, NULL, NULL, 0);
 
 	AcquireRewriteLocks(q);
 
@@ -12333,7 +12276,6 @@ build_hidden_type(Form_pg_attribute att)
 	CreateFunctionStmt *iofunc;
 	Value *inputname;
 	Value *outputname;
-	List *parsetrees;
 	DestReceiver *dest = None_Receiver;
 	Query *q;
 	char *alignname = NULL;
@@ -12351,9 +12293,7 @@ build_hidden_type(Form_pg_attribute att)
 	newtype->defnames = list_make1(makeString(newname));
 
 	/* that's all that's needed for the shell! */
-	parsetrees = parse_analyze((Node *)newtype, NULL, NULL, 0);
-	Assert(list_length(parsetrees) == 1);
-	q = (Query *)linitial(parsetrees);
+	q = parse_analyze((Node *)newtype, NULL, NULL, 0);
 	ProcessUtility((Node *)q->utilityStmt,
 				   synthetic_sql,
 				   NULL,
@@ -12367,8 +12307,7 @@ build_hidden_type(Form_pg_attribute att)
 	 */
 	iofunc = build_iofunc(newname, "in", "int4in", newname);
 	inputname = copyObject(linitial(iofunc->funcname));
-	parsetrees = parse_analyze((Node *)iofunc, NULL, NULL, 0);
-	q = (Query *)linitial(parsetrees);
+	q = parse_analyze((Node *)iofunc, NULL, NULL, 0);
 	ProcessUtility((Node *)q->utilityStmt,
 				   synthetic_sql,
 				   NULL,
@@ -12381,8 +12320,7 @@ build_hidden_type(Form_pg_attribute att)
 	/* output function accepts shellname as its argument */
 	iofunc = build_iofunc(newname, "out", "int4out", "cstring");
 	outputname = copyObject(linitial(iofunc->funcname));
-	parsetrees = parse_analyze((Node *)iofunc, NULL, NULL, 0);
-	q = (Query *)linitial(parsetrees);
+	q = parse_analyze((Node *)iofunc, NULL, NULL, 0);
 	ProcessUtility((Node *)q->utilityStmt,
 				   synthetic_sql,
 				   NULL,
@@ -12424,8 +12362,7 @@ build_hidden_type(Form_pg_attribute att)
 	newtype->definition = lappend(newtype->definition, makeDefElem("alignment",
 																   (Node *)makeString(alignname)));
 
-	parsetrees = parse_analyze((Node *)newtype, NULL, NULL, 0);
-	q = (Query *)linitial(parsetrees);
+	q = parse_analyze((Node *)newtype, NULL, NULL, 0);
 	ProcessUtility((Node *)q->utilityStmt,
 				   synthetic_sql,
 				   NULL,
@@ -12621,7 +12558,6 @@ prebuild_temp_table(Relation rel, RangeVar *tmpname, List *distro, List *opts,
 	if (need_rebuild)
 	{
 		CreateStmt *cs = makeNode(CreateStmt);
-		List *parsetrees;
 		Query *q;
 		char *dstr = "__gp_atsdb_droppedcol";
 		DestReceiver *dest = None_Receiver;
@@ -12739,9 +12675,7 @@ prebuild_temp_table(Relation rel, RangeVar *tmpname, List *distro, List *opts,
 			cd->typname = tname;
 			cs->tableElts = lappend(cs->tableElts, cd);
 		}
-		parsetrees = parse_analyze((Node *)cs, NULL, NULL, 0);
-		Assert(list_length(parsetrees) == 1);
-		q = (Query *)linitial(parsetrees);
+		q = parse_analyze((Node *)cs, NULL, NULL, 0);
 		ProcessUtility((Node *)q->utilityStmt,
 					   synthetic_sql,
 					   NULL,
@@ -12775,9 +12709,7 @@ prebuild_temp_table(Relation rel, RangeVar *tmpname, List *distro, List *opts,
 			elog_node_display(NOTICE, "DROP STATEMENT", ats, true);
 #endif
 
-			parsetrees = parse_analyze((Node *)ats, NULL, NULL, 0);
-			Assert(list_length(parsetrees) == 1);
-			q = (Query *)linitial(parsetrees);
+			q = parse_analyze((Node *)ats, NULL, NULL, 0);
 			ProcessUtility((Node *)q->utilityStmt,
 						   synthetic_sql,
 						   NULL,
@@ -13386,7 +13318,7 @@ ATExecSetDistributedBy(Relation rel, Node *node, AlterTableCmd *cmd)
 	heap_close(rel, NoLock);
 	rel = NULL;
 	tmprelid = RangeVarGetRelid(tmprv, false);
-	swap_relation_files(tarrelid, tmprelid, false);
+	swap_relation_files(tarrelid, tmprelid, RecentXmin, false);
 
 	if (DatumGetPointer(newOptions))
 	{
@@ -13481,7 +13413,8 @@ ATExecSetDistributedBy(Relation rel, Node *node, AlterTableCmd *cmd)
 			foreach(lc, hidden_types)
 			{
 				TypeName *tname = makeTypeNameFromNameList(lfirst(lc));
-				Oid typid = typenameTypeId(NULL, tname);
+				int32		typmod;
+				Oid			typid = typenameTypeId(NULL, tname, &typmod);
 
 				object.objectId = typid;
 
@@ -13908,7 +13841,7 @@ ATPExecPartAlter(List **wqueue, AlteredTableInfo *tab, Relation rel,
 	switch (atc->subtype)
 	{
 		case AT_PartAdd:				/* Add */
-		case AT_PartAddForSplit:		/* Add */
+		case AT_PartAddForSplit:		/* Add, as part of a split */
 		case AT_PartCoalesce:			/* Coalesce */
 		case AT_PartDrop:				/* Drop */
 		case AT_PartSplit:				/* Split */
@@ -14575,7 +14508,7 @@ ATPExecPartExchange(AlteredTableInfo *tab, Relation rel, AlterPartitionCmd *pc)
 		heap_close(oldrel, NoLock);
 
 		/* rename rel renames the type too */
-		renamerel(oldrelid, tmpname1, NULL);
+		renamerel(oldrelid, tmpname1, OBJECT_TABLE, NULL);
 		CommandCounterIncrement();
 		RelationForgetRelation(oldrelid);
 
@@ -14600,7 +14533,7 @@ ATPExecPartExchange(AlteredTableInfo *tab, Relation rel, AlterPartitionCmd *pc)
 			 * collision.  It would be nice to have an atomic
 			 * operation to rename and renamespace a relation... 
 			 */
-			renamerel(newrelid, tmpname2, NULL);
+			renamerel(newrelid, tmpname2, OBJECT_TABLE, NULL);
 			CommandCounterIncrement();
 			RelationForgetRelation(newrelid);
 
@@ -14615,11 +14548,11 @@ ATPExecPartExchange(AlteredTableInfo *tab, Relation rel, AlterPartitionCmd *pc)
 			RelationForgetRelation(newrelid);
 		}
 
-		renamerel(newrelid, oldname, NULL);
+		renamerel(newrelid, oldname, OBJECT_TABLE, NULL);
 		CommandCounterIncrement();
 		RelationForgetRelation(newrelid);
 
-		renamerel(oldrelid, newname, NULL);
+		renamerel(oldrelid, newname, OBJECT_TABLE, NULL);
 		CommandCounterIncrement();
 		RelationForgetRelation(oldrelid);
 
@@ -15714,7 +15647,6 @@ ATPExecPartSplit(Relation *rel,
 		RangeVar *tmprv;
 		PgPartRule *prule;
 		DropStmt *ds = makeNode(DropStmt);
-		List *parsetrees;
 		Query *q;
 		char *nspname = get_namespace_name(RelationGetNamespace(*rel));
 		char *relname = get_rel_name(RelationGetRelid(*rel));
@@ -15730,7 +15662,6 @@ ATPExecPartSplit(Relation *rel,
 		AlterPartitionId *aapid = NULL; /* just for alter partition pids */
 		Relation existrel;
 		List *existstorage_opts;
-		ListCell *lc;
 		char *defparname = NULL; /* name of default partition (if specified) */
 		List *distro = NIL;
 		List *colencs = NIL;
@@ -15975,9 +15906,7 @@ ATPExecPartSplit(Relation *rel,
 		ct->relKind = RELKIND_RELATION;
 		ct->ownerid = (*rel)->rd_rel->relowner;
 		ct->is_split_part = true;
-		parsetrees = parse_analyze((Node *)ct, NULL, NULL, 0);
-
-		q = (Query *)linitial(parsetrees);
+		q = parse_analyze((Node *)ct, NULL, NULL, 0);
 		ProcessUtility((Node *)q->utilityStmt,
 					   synthetic_sql,
 					   NULL,
@@ -16019,9 +15948,7 @@ ATPExecPartSplit(Relation *rel,
 		mypc2->location = -1;
 		cmd->def = (Node *)mypc;
 		ats->cmds = list_make1(cmd);
-		parsetrees = parse_analyze((Node *)ats, NULL, NULL, 0);
-		Assert(list_length(parsetrees) == 1);
-		q = (Query *)linitial(parsetrees);
+		q = parse_analyze((Node *)ats, NULL, NULL, 0);
 
 		heap_close(*rel, NoLock);
 		ProcessUtility((Node *)q->utilityStmt,
@@ -16076,24 +16003,22 @@ ATPExecPartSplit(Relation *rel,
 		mypc->arg2 = (Node *)makeNode(AlterPartitionCmd);
 
 		cmd->def = (Node *)mypc;
-		parsetrees = parse_analyze((Node *)ats, NULL, NULL, 0);
+		q = parse_analyze((Node *)ats, NULL, NULL, 0);
 		heap_close(*rel, NoLock);
 
-		/* 
-		 * Might have expanded to multiple statements if, for example, the
+		/* GPDB_83_MERGE_FIXME: the original comment said:
+		 *
+		 * [result of parse_analyze] Might have expanded to multiple statements if, for example, the
 		 * master table has indexes on it.
+		 *
+		 * Can that really happen? How do we handle that nowadays?
 		 */
-		foreach(lc, parsetrees)
-		{
-			q = (Query *)lfirst(lc);
-
-			ProcessUtility((Node *)q->utilityStmt,
-						   synthetic_sql,
-						   NULL,
-						   false, /* not top level */
-						   dest,
-						   NULL);
-		}
+		ProcessUtility((Node *)q->utilityStmt,
+					   synthetic_sql,
+					   NULL,
+					   false, /* not top level */
+					   dest,
+					   NULL);
 
 		*rel = heap_open(relid, AccessExclusiveLock);
 		CommandCounterIncrement();
@@ -16446,9 +16371,7 @@ ATPExecPartSplit(Relation *rel,
 			}
 
 			ats->cmds = list_make1(cmd);
-			parsetrees = parse_analyze((Node *)ats, NULL, NULL, 0);
-			Assert(list_length(parsetrees) == 1);
-			q = (Query *)linitial(parsetrees);
+			q = parse_analyze((Node *)ats, NULL, NULL, 0);
 
 			heap_close(*rel, NoLock);
 			ProcessUtility((Node *)q->utilityStmt,
@@ -16757,49 +16680,51 @@ AlterTableNamespace(RangeVar *relation, const char *newschema)
 	Oid			oldNspOid;
 	Oid			nspOid;
 
-	rel = heap_openrv(relation, AccessExclusiveLock);
+	rel = relation_openrv(relation, AccessExclusiveLock);
 
 	relid = RelationGetRelid(rel);
 	oldNspOid = RelationGetNamespace(rel);
 
-	/* heap_openrv allows TOAST, but we don't want to */
-	if (rel->rd_rel->relkind == RELKIND_TOASTVALUE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is a TOAST relation",
-						RelationGetRelationName(rel))));
-
-	if (rel->rd_rel->relkind == RELKIND_AOSEGMENTS)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is an Append Only segment listing relation",
-						RelationGetRelationName(rel))));
-
-	if (rel->rd_rel->relkind == RELKIND_AOBLOCKDIR)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is an Append Only block directory relation",
-						RelationGetRelationName(rel))));
-	
-	if (rel->rd_rel->relkind == RELKIND_AOVISIMAP)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is an Append Only visibility map relation",
-						RelationGetRelationName(rel))));
-
-	/* if it's an owned sequence, disallow moving it by itself */
-	if (rel->rd_rel->relkind == RELKIND_SEQUENCE)
+	/* Can we change the schema of this tuple? */
+	switch (rel->rd_rel->relkind)
 	{
-		Oid			tableId;
-		int32		colId;
+		case RELKIND_RELATION:
+		case RELKIND_VIEW:
+			/* ok to change schema */
+			break;
+		case RELKIND_SEQUENCE:
+			{
+				/* if it's an owned sequence, disallow moving it by itself */
+				Oid			tableId;
+				int32		colId;
 
-		if (sequenceIsOwned(relid, &tableId, &colId))
+				if (sequenceIsOwned(relid, &tableId, &colId))
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("cannot move an owned sequence into another schema"),
+					  errdetail("Sequence \"%s\" is linked to table \"%s\".",
+								RelationGetRelationName(rel),
+								get_rel_name(tableId))));
+			}
+			break;
+		case RELKIND_COMPOSITE_TYPE:
 			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot move an owned sequence into another schema"),
-					 errdetail("Sequence \"%s\" is linked to table \"%s\".",
-							   RelationGetRelationName(rel),
-							   get_rel_name(tableId))));
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("\"%s\" is a composite type",
+							RelationGetRelationName(rel)),
+					 errhint("Use ALTER TYPE instead.")));
+			break;
+		case RELKIND_INDEX:
+		case RELKIND_TOASTVALUE:
+		case RELKIND_AOSEGMENTS:
+		case RELKIND_AOBLOCKDIR:
+		case RELKIND_AOVISIMAP:
+			/* FALL THRU */
+		default:
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("\"%s\" is not a table, view, or sequence",
+							RelationGetRelationName(rel))));
 	}
 
 	/* get schema OID and check its permissions */
@@ -16832,10 +16757,8 @@ AlterTableNamespace(RangeVar *relation, const char *newschema)
 
 
 	/* OK, modify the pg_class row and pg_depend entry */
-	AlterRelationNamespaceInternalTwo(rel, relid,
-									  oldNspOid, nspOid,
-									  true, newschema);
-	
+	AlterRelationNamespaceInternalTwo(rel, relid, oldNspOid, nspOid, true, newschema);
+
 	/* MPP-7825, MPP-6929, MPP-7600: metadata tracking */
 	if ((Gp_role == GP_ROLE_DISPATCH)
 		&& MetaTrackValidKindNsp(rel->rd_rel))
@@ -18047,6 +17970,8 @@ char *alterTableCmdString(AlterTableType subtype)
 			break;
 			
 		case AT_EnableTrig: /* ENABLE TRIGGER name */
+		case AT_EnableAlwaysTrig: /* ENABLE ALWAYS TRIGGER name */
+		case AT_EnableReplicaTrig: /* ENABLE REPLICA TRIGGER name */
 		case AT_DisableTrig: /* DISABLE TRIGGER name */
 		case AT_EnableTrigAll: /* ENABLE TRIGGER ALL */
 		case AT_DisableTrigAll: /* DISABLE TRIGGER ALL */
@@ -18054,7 +17979,14 @@ char *alterTableCmdString(AlterTableType subtype)
 		case AT_DisableTrigUser: /* DISABLE TRIGGER USER */
 			cmdstring = pstrdup("enable or disable triggers on");
 			break;
-			
+
+		case AT_EnableRule: /* ENABLE RULE name */
+		case AT_EnableAlwaysRule: /* ENABLE ALWAYS RULE name */
+		case AT_EnableReplicaRule: /* ENABLE REPLICA RULE  name */
+		case AT_DisableRule: /* DISABLE TRIGGER name */
+			cmdstring = pstrdup("enable or disable rules on");
+			break;
+
 		case AT_AddInherit: /* INHERIT parent */
 		case AT_DropInherit: /* NO INHERIT parent */
 			cmdstring = pstrdup("alter inheritance on");
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 532ce0fc6455..c78e70d7d54f 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -38,7 +38,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.42 2007/02/01 19:10:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.53 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,12 +66,14 @@
 #include "commands/filespace.h"
 #include "commands/tablespace.h"
 #include "miscadmin.h"
+#include "postmaster/bgwriter.h"
 #include "storage/fd.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 
 #include "cdb/cdbdisp_query.h"
 #include "cdb/cdbsrlz.h"
@@ -82,13 +84,16 @@
 #include "cdb/cdbpersistentrelation.h"
 #include "cdb/cdbmirroredfilesysobj.h"
 
-
-/* GUC variable */
+/* GUC variables */
 char	   *default_tablespace = NULL;
+/* GPDB_83_MERGE_FIXME: this is NULL in upstream, but because I removed this from guc.c,
+ * the guc machinery isn't initializing it to "".
+ */
+char	   *temp_tablespaces = "";
+
 
+static bool remove_tablespace_directories(Oid tablespaceoid, bool redo, char *phys);
 
-static bool remove_tablespace_directories(Oid tablespaceoid, bool redo,
-										  char *location);
 /*
  * Create a table space
  *
@@ -113,8 +118,6 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
 	cqContext	cqc;
 	cqContext  *pcqCtx;
 
-	/* validate */
-
 	/* Must be super user */
 	if (!superuser())
 		ereport(ERROR,
@@ -267,6 +270,14 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
 				);
 
 	}
+
+	/*
+	 * Force synchronous commit, to minimize the window between creating the
+	 * symlink on-disk and marking the transaction committed.  It's not great
+	 * that there is any window at all, but definitely we don't want to make
+	 * it larger than necessary.
+	 */
+	ForceSyncCommit();
 }
 
 /*
@@ -290,9 +301,6 @@ RemoveTableSpace(List *names, DropBehavior behavior, bool missing_ok)
 	ItemPointerData persistentTid;
 	int64		persistentSerialNum;
 
-	/* don't call this in a transaction block */
-	// PreventTransactionChain((void *) stmt, "DROP TABLESPACE");
-
 	/*
 	 * General DROP (object) syntax allows fully qualified names, but
 	 * tablespaces are global objects that do not live in schemas, so
@@ -455,6 +463,14 @@ RemoveTableSpace(List *names, DropBehavior behavior, bool missing_ok)
 	 * CHECK THIS, also check if the lock makes any sense in this context.
 	 */
 
+	/*
+	 * Force synchronous commit, to minimize the window between removing the
+	 * files on-disk and marking the transaction committed.  It's not great
+	 * that there is any window at all, but definitely we don't want to make
+	 * it larger than necessary.
+	 */
+	ForceSyncCommit();
+
 	/*
 	 * Allow MirroredFileSysObj_JustInTimeDbDirCreate again.
 	 */
@@ -510,12 +526,25 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo, char *phys)
 	 * fresh subdirectories in parallel. It is possible that new files are
 	 * being created within subdirectories, though, so the rmdir call could
 	 * fail.  Worst consequence is a less friendly error message.
+	 *
+	 * If redo is true then ENOENT is a likely outcome here, and we allow it
+	 * to pass without comment.  In normal operation we still allow it, but
+	 * with a warning.	This is because even though ProcessUtility disallows
+	 * DROP TABLESPACE in a transaction block, it's possible that a previous
+	 * DROP failed and rolled back after removing the tablespace directories
+	 * and symlink.  We want to allow a new DROP attempt to succeed at
+	 * removing the catalog entries, so we should not give a hard error here.
 	 */
 	dirdesc = AllocateDir(location);
 	if (dirdesc == NULL)
 	{
-		if (redo && errno == ENOENT)
+		if (errno == ENOENT)
 		{
+			if (!redo)
+				ereport(WARNING,
+						(errcode_for_file_access(),
+						 errmsg("could not open directory \"%s\": %m",
+								location)));
 			pfree(location);
 			return true;
 		}
@@ -933,12 +962,22 @@ assign_default_tablespace(const char *newval, bool doit, GucSource source)
 		if (newval[0] != '\0' &&
 			!OidIsValid(get_tablespace_oid(newval)))
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_UNDEFINED_OBJECT),
-						 errmsg("tablespace \"%s\" does not exist",
-								newval)));
-			return NULL;
+			/*
+			 * When source == PGC_S_TEST, we are checking the argument of an
+			 * ALTER DATABASE SET or ALTER USER SET command.  pg_dumpall dumps
+			 * all roles before tablespaces, so if we're restoring a
+			 * pg_dumpall script the tablespace might not yet exist, but will
+			 * be created later.  Because of that, issue a NOTICE if source ==
+			 * PGC_S_TEST, but accept the value anyway.
+			 */
+			ereport((source == PGC_S_TEST) ? NOTICE : GUC_complaint_elevel(source),
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("tablespace \"%s\" does not exist",
+							newval)));
+			if (source == PGC_S_TEST)
+				return newval;
+			else
+				return NULL;
 		}
 	}
 
@@ -948,16 +987,29 @@ assign_default_tablespace(const char *newval, bool doit, GucSource source)
 /*
  * GetDefaultTablespace -- get the OID of the current default tablespace
  *
- * May return InvalidOid to indicate "use the database's default tablespace"
+ * Regular objects and temporary objects have different default tablespaces,
+ * hence the forTemp parameter must be specified.
+ *
+ * May return InvalidOid to indicate "use the database's default tablespace".
+ *
+ * Note that caller is expected to check appropriate permissions for any
+ * result other than InvalidOid.
  *
  * This exists to hide (and possibly optimize the use of) the
  * default_tablespace GUC variable.
  */
 Oid
-GetDefaultTablespace(void)
+GetDefaultTablespace(bool forTemp)
 {
 	Oid			result;
 
+	/* The temp-table case is handled elsewhere */
+	if (forTemp)
+	{
+		PrepareTempTablespaces();
+		return GetNextTempTableSpace();
+	}
+
 	/* Fast path for default_tablespace == "" */
 	if (default_tablespace == NULL || default_tablespace[0] == '\0')
 		return InvalidOid;
@@ -980,6 +1032,99 @@ GetDefaultTablespace(void)
 	return result;
 }
 
+/*
+ * PrepareTempTablespaces -- prepare to use temp tablespaces
+ *
+ * If we have not already done so in the current transaction, parse the
+ * temp_tablespaces GUC variable and tell fd.c which tablespace(s) to use
+ * for temp files.
+ */
+void
+PrepareTempTablespaces(void)
+{
+	char	   *rawname;
+	List	   *namelist;
+	Oid		   *tblSpcs;
+	int			numSpcs;
+	ListCell   *l;
+
+	/* No work if already done in current transaction */
+	if (TempTablespacesAreSet())
+		return;
+
+	/*
+	 * Can't do catalog access unless within a transaction.  This is just a
+	 * safety check in case this function is called by low-level code that
+	 * could conceivably execute outside a transaction.  Note that in such a
+	 * scenario, fd.c will fall back to using the current database's default
+	 * tablespace, which should always be OK.
+	 */
+	if (!IsTransactionState())
+		return;
+
+	/* Need a modifiable copy of string */
+	rawname = pstrdup(temp_tablespaces);
+
+	/* Parse string into list of identifiers */
+	if (!SplitIdentifierString(rawname, ',', &namelist))
+	{
+		/* syntax error in name list */
+		SetTempTablespaces(NULL, 0);
+		pfree(rawname);
+		list_free(namelist);
+		return;
+	}
+
+	/* Store tablespace OIDs in an array in TopTransactionContext */
+	tblSpcs = (Oid *) MemoryContextAlloc(TopTransactionContext,
+										 list_length(namelist) * sizeof(Oid));
+	numSpcs = 0;
+	foreach(l, namelist)
+	{
+		char	   *curname = (char *) lfirst(l);
+		Oid			curoid;
+		AclResult	aclresult;
+
+		/* Allow an empty string (signifying database default) */
+		if (curname[0] == '\0')
+		{
+			tblSpcs[numSpcs++] = InvalidOid;
+			continue;
+		}
+
+		/* Else verify that name is a valid tablespace name */
+		curoid = get_tablespace_oid(curname);
+		if (curoid == InvalidOid)
+		{
+			/* Silently ignore any bad list elements */
+			continue;
+		}
+
+		/*
+		 * Allow explicit specification of database's default tablespace in
+		 * temp_tablespaces without triggering permissions checks.
+		 */
+		if (curoid == MyDatabaseTableSpace)
+		{
+			tblSpcs[numSpcs++] = InvalidOid;
+			continue;
+		}
+
+		/* Check permissions similarly */
+		aclresult = pg_tablespace_aclcheck(curoid, GetUserId(),
+										   ACL_CREATE);
+		if (aclresult != ACLCHECK_OK)
+			continue;
+
+		tblSpcs[numSpcs++] = curoid;
+	}
+
+	SetTempTablespaces(tblSpcs, numSpcs);
+
+	pfree(rawname);
+	list_free(namelist);
+}
+
 
 /*
  * get_tablespace_oid - given a tablespace name, look up the OID
@@ -989,10 +1134,11 @@ GetDefaultTablespace(void)
 Oid
 get_tablespace_oid(const char *tablespacename)
 {
-	Oid			tsoid;
+	Oid			result;
 	Relation	rel;
+	HeapScanDesc scandesc;
 	HeapTuple	tuple;
-	cqContext	cqc;
+	ScanKeyData entry[1];
 
 	/*
 	 * Search pg_tablespace.  We use a heapscan here even though there is an
@@ -1001,24 +1147,25 @@ get_tablespace_oid(const char *tablespacename)
 	 */
 	rel = heap_open(TableSpaceRelationId, AccessShareLock);
 
-	tuple = caql_getfirst(
-			caql_addrel(cqclr(&cqc), rel),
-			cql("SELECT * FROM pg_tablespace "
-				" WHERE spcname = :1 ",
-				CStringGetDatum(tablespacename)));
+	ScanKeyInit(&entry[0],
+				Anum_pg_tablespace_spcname,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(tablespacename));
+	scandesc = heap_beginscan(rel, SnapshotNow, 1, entry);
+	tuple = heap_getnext(scandesc, ForwardScanDirection);
 
 	/* If nothing matches then the tablespace doesn't exist */
 	if (HeapTupleIsValid(tuple))
-		tsoid = HeapTupleGetOid(tuple);
+		result = HeapTupleGetOid(tuple);
 	else
-		tsoid = InvalidOid;
+		result = InvalidOid;
 
 	/*
 	 * Anything that needs to lookup a tablespace name must need a lock
 	 * on the tablespace for the duration of its transaction, otherwise
 	 * there is nothing preventing it from being dropped.
 	 */
-	if (OidIsValid(tsoid))
+	if (OidIsValid(result))
 	{
 		Buffer			buffer = InvalidBuffer;
 		HTSU_Result		lockTest;
@@ -1032,7 +1179,7 @@ get_tablespace_oid(const char *tablespacename)
 		 */
 		lockTest = heap_lock_tuple(rel, tuple, &buffer,
 								   &update_ctid, &update_xmax,
-								   GetCurrentCommandId(),
+								   GetCurrentCommandId(true),
 								   LockTupleShared, LockTupleWait);
 		ReleaseBuffer(buffer);
 		switch (lockTest)
@@ -1059,9 +1206,10 @@ get_tablespace_oid(const char *tablespacename)
 		}
 	}
 
+	heap_endscan(scandesc);
 	heap_close(rel, AccessShareLock);
 
-	return tsoid;
+	return result;
 }
 
 /*
@@ -1073,19 +1221,34 @@ char *
 get_tablespace_name(Oid spc_oid)
 {
 	char	   *result;
+	Relation	rel;
+	HeapScanDesc scandesc;
+	HeapTuple	tuple;
+	ScanKeyData entry[1];
 
 	/*
 	 * Search pg_tablespace.  We use a heapscan here even though there is an
 	 * index on oid, on the theory that pg_tablespace will usually have just a
 	 * few entries and so an indexed lookup is a waste of effort.
 	 */
-	result = caql_getcstring(
-			NULL,
-			cql("SELECT spcname FROM pg_tablespace "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(spc_oid)));
+	rel = heap_open(TableSpaceRelationId, AccessShareLock);
+
+	ScanKeyInit(&entry[0],
+				ObjectIdAttributeNumber,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(spc_oid));
+	scandesc = heap_beginscan(rel, SnapshotNow, 1, entry);
+	tuple = heap_getnext(scandesc, ForwardScanDirection);
 
 	/* We assume that there can be at most one matching tuple */
+	if (HeapTupleIsValid(tuple))
+		result = pstrdup(NameStr(((Form_pg_tablespace) GETSTRUCT(tuple))->spcname));
+	else
+		result = NULL;
+
+	heap_endscan(scandesc);
+	heap_close(rel, AccessShareLock);
+
 	return result;
 }
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 1bbd588c45e9..80a62fc59a7c 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.213 2007/02/14 01:58:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.227.2.4 2010/01/24 21:49:39 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,8 +30,10 @@
 #include "executor/executor.h"
 #include "executor/instrument.h"
 #include "miscadmin.h"
+#include "nodes/execnodes.h"
 #include "nodes/makefuncs.h"
 #include "parser/parse_func.h"
+#include "tcop/utility.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
@@ -44,11 +46,16 @@
 #include "cdb/cdbfilerepprimary.h"
 
 
+/* GUC variables */
+int			SessionReplicationRole = SESSION_REPLICATION_ROLE_ORIGIN;
+
+
+/* Local function prototypes */
+static void ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid);
 static void InsertTrigger(TriggerDesc *trigdesc, Trigger *trigger, int indx);
 static HeapTuple GetTupleForTrigger(EState *estate,
 				   ResultRelInfo *relinfo,
 				   ItemPointer tid,
-				   CommandId cid,
 				   TupleTableSlot **newSlot);
 
 static void AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event,
@@ -58,9 +65,13 @@ static void AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event,
 /*
  * Create a trigger.  Returns the OID of the created trigger.
  *
- * constraintOid, if nonzero, says that this trigger is being created to
- * implement that constraint.  A suitable pg_depend entry will be made
- * to link the trigger to that constraint.
+ * constraintOid, if nonzero, says that this trigger is being created
+ * internally to implement that constraint.  A suitable pg_depend entry will
+ * be made to link the trigger to that constraint.	constraintOid is zero when
+ * executing a user-entered CREATE TRIGGER command.
+ *
+ * Note: can return InvalidOid if we decided to not create a trigger at all,
+ * but a foreign-key constraint.  This is a kluge for backwards compatibility.
  */
 Oid
 CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
@@ -72,10 +83,8 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 	Relation	rel;
 	AclResult	aclresult;
 	Relation	tgrel;
-	cqContext  *pcqCtx;
-	cqContext	cqc;
-	cqContext  *pcqCtx2;
-	cqContext	cqc2;
+	SysScanDesc tgscan;
+	ScanKeyData key;
 	Relation	pgrel;
 	HeapTuple	tuple;
 	Oid			fargtypes[1];	/* dummy */
@@ -137,47 +146,6 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 						   RelationGetRelationName(rel));
 	}
 
-	/*
-	 * Generate the trigger's OID now, so that we can use it in the name if
-	 * needed.
-	 */
-	tgrel = heap_open(TriggerRelationId, RowExclusiveLock);
-
-	pcqCtx = caql_beginscan(
-			caql_addrel(cqclr(&cqc), tgrel),
-			cql("INSERT INTO pg_trigger ",
-				NULL));
-
-	if (OidIsValid(stmt->trigOid))
-		trigoid = stmt->trigOid;
-	else
-		trigoid = GetNewOid(tgrel);
-
-	/*
-	 * If trigger is for an RI constraint, the passed-in name is the
-	 * constraint name; save that and build a unique trigger name to avoid
-	 * collisions with user-selected trigger names.
-	 */
-	if (OidIsValid(constraintOid))
-	{
-		snprintf(constrtrigname, sizeof(constrtrigname),
-				 "RI_ConstraintTrigger_%u", trigoid);
-		trigname = constrtrigname;
-		constrname = stmt->trigname;
-	}
-	else if (stmt->isconstraint)
-	{
-		/* constraint trigger: trigger name is also constraint name */
-		trigname = stmt->trigname;
-		constrname = stmt->trigname;
-	}
-	else
-	{
-		/* regular trigger: use empty constraint name */
-		trigname = stmt->trigname;
-		constrname = "";
-	}
-
 	/* Compute tgtype */
 	TRIGGER_CLEAR_TYPE(tgtype);
 	if (stmt->before)
@@ -217,34 +185,6 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 		}
 	}
 
-	/*
-	 * Scan pg_trigger for existing triggers on relation.  We do this mainly
-	 * because we must count them; a secondary benefit is to give a nice error
-	 * message if there's already a trigger of the same name. (The unique
-	 * index on tgrelid/tgname would complain anyway.)
-	 *
-	 * NOTE that this is cool only because we have AccessExclusiveLock on the
-	 * relation, so the trigger set won't be changing underneath us.
-	 */
-	pcqCtx2 = caql_beginscan(
-			caql_addrel(cqclr(&cqc2), tgrel),
-			cql("SELECT * FROM pg_trigger "
-				" WHERE tgrelid = :1 ",
-				ObjectIdGetDatum(RelationGetRelid(rel))));
-	
-	while (HeapTupleIsValid(tuple = caql_getnext(pcqCtx2)))
-	{
-		Form_pg_trigger pg_trigger = (Form_pg_trigger) GETSTRUCT(tuple);
-
-		if (namestrcmp(&(pg_trigger->tgname), trigname) == 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DUPLICATE_OBJECT),
-				  errmsg("trigger \"%s\" for relation \"%s\" already exists",
-						 trigname, stmt->relation->relname)));
-		found++;
-	}
-	caql_endscan(pcqCtx2);
-
 	/*
 	 * Find and validate the trigger function.
 	 */
@@ -275,6 +215,87 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 							NameListToString(stmt->funcname))));
 	}
 
+	/*
+	 * If the command is a user-entered CREATE CONSTRAINT TRIGGER command that
+	 * references one of the built-in RI_FKey trigger functions, assume it is
+	 * from a dump of a pre-7.3 foreign key constraint, and take steps to
+	 * convert this legacy representation into a regular foreign key
+	 * constraint.	Ugly, but necessary for loading old dump files.
+	 */
+	if (stmt->isconstraint && !OidIsValid(constraintOid) &&
+		list_length(stmt->args) >= 6 &&
+		(list_length(stmt->args) % 2) == 0 &&
+		RI_FKey_trigger_type(funcoid) != RI_TRIGGER_NONE)
+	{
+		/* Keep lock on target rel until end of xact */
+		heap_close(rel, NoLock);
+
+		ConvertTriggerToFK(stmt, funcoid);
+
+		return InvalidOid;
+	}
+
+	/*
+	 * Generate the trigger's OID now, so that we can use it in the name if
+	 * needed.
+	 */
+	tgrel = heap_open(TriggerRelationId, RowExclusiveLock);
+
+	trigoid = GetNewOid(tgrel);
+
+	/*
+	 * If trigger is for an RI constraint, the passed-in name is the
+	 * constraint name; save that and build a unique trigger name to avoid
+	 * collisions with user-selected trigger names.
+	 */
+	if (OidIsValid(constraintOid))
+	{
+		snprintf(constrtrigname, sizeof(constrtrigname),
+				 "RI_ConstraintTrigger_%u", trigoid);
+		trigname = constrtrigname;
+		constrname = stmt->trigname;
+	}
+	else if (stmt->isconstraint)
+	{
+		/* constraint trigger: trigger name is also constraint name */
+		trigname = stmt->trigname;
+		constrname = stmt->trigname;
+	}
+	else
+	{
+		/* regular trigger: use empty constraint name */
+		trigname = stmt->trigname;
+		constrname = "";
+	}
+
+	/*
+	 * Scan pg_trigger for existing triggers on relation.  We do this mainly
+	 * because we must count them; a secondary benefit is to give a nice error
+	 * message if there's already a trigger of the same name. (The unique
+	 * index on tgrelid/tgname would complain anyway.)
+	 *
+	 * NOTE that this is cool only because we have AccessExclusiveLock on the
+	 * relation, so the trigger set won't be changing underneath us.
+	 */
+	ScanKeyInit(&key,
+				Anum_pg_trigger_tgrelid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(RelationGetRelid(rel)));
+	tgscan = systable_beginscan(tgrel, TriggerRelidNameIndexId, true,
+								SnapshotNow, 1, &key);
+	while (HeapTupleIsValid(tuple = systable_getnext(tgscan)))
+	{
+		Form_pg_trigger pg_trigger = (Form_pg_trigger) GETSTRUCT(tuple);
+
+		if (namestrcmp(&(pg_trigger->tgname), trigname) == 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_OBJECT),
+				  errmsg("trigger \"%s\" for relation \"%s\" already exists",
+						 trigname, stmt->relation->relname)));
+		found++;
+	}
+	systable_endscan(tgscan);
+
 	/*
 	 * Build the new pg_trigger tuple.
 	 */
@@ -294,10 +315,10 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 		/*
 		 * Create the tigger as disabled 
 		 */
-		values[Anum_pg_trigger_tgenabled - 1] = BoolGetDatum(false);
+		values[Anum_pg_trigger_tgenabled - 1] = CharGetDatum(TRIGGER_DISABLED);
 	}
 	else
-		values[Anum_pg_trigger_tgenabled - 1] = BoolGetDatum(true);
+		values[Anum_pg_trigger_tgenabled - 1] = CharGetDatum(TRIGGER_FIRES_ON_ORIGIN);
 	values[Anum_pg_trigger_tgisconstraint - 1] = BoolGetDatum(stmt->isconstraint);
 	values[Anum_pg_trigger_tgconstrname - 1] = DirectFunctionCall1(namein,
 												CStringGetDatum(constrname));
@@ -349,11 +370,12 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 		values[Anum_pg_trigger_tgargs - 1] = DirectFunctionCall1(byteain,
 														CStringGetDatum(""));
 	}
+
 	/* tgattr is currently always a zero-length array */
 	tgattr = buildint2vector(NULL, 0);
 	values[Anum_pg_trigger_tgattr - 1] = PointerGetDatum(tgattr);
 
-	tuple = caql_form_tuple(pcqCtx, values, nulls);
+	tuple = heap_form_tuple(tgrel->rd_att, values, nulls);
 
 	/* force tuple to have the desired OID */
 	HeapTupleSetOid(tuple, trigoid);
@@ -361,10 +383,11 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 	/*
 	 * Insert tuple into pg_trigger.
 	 */
-	caql_insert(pcqCtx, tuple); /* implicit update of index as well */
+	simple_heap_insert(tgrel, tuple);
+
+	CatalogUpdateIndexes(tgrel, tuple);
 
 	heap_freetuple(tuple);
-	caql_endscan(pcqCtx);
 	heap_close(tgrel, RowExclusiveLock);
 
 	pfree(DatumGetPointer(values[Anum_pg_trigger_tgname - 1]));
@@ -376,24 +399,18 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 	 * entries.
 	 */
 	pgrel = heap_open(RelationRelationId, RowExclusiveLock);
-
-	pcqCtx = caql_addrel(cqclr(&cqc), pgrel);
-
-	tuple  = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_class "
-				" WHERE oid = :1 "
-				" FOR UPDATE ",
-				ObjectIdGetDatum(RelationGetRelid(rel))));
-
+	tuple = SearchSysCacheCopy(RELOID,
+							   ObjectIdGetDatum(RelationGetRelid(rel)),
+							   0, 0, 0);
 	if (!HeapTupleIsValid(tuple))
 		elog(ERROR, "cache lookup failed for relation %u",
 			 RelationGetRelid(rel));
 
 	((Form_pg_class) GETSTRUCT(tuple))->reltriggers = found + 1;
 
-	caql_update_current(pcqCtx, tuple);
-	/* and Update indexes (implicit) */
+	simple_heap_update(pgrel, &tuple->t_self, tuple);
+
+	CatalogUpdateIndexes(pgrel, tuple);
 
 	heap_freetuple(tuple);
 	heap_close(pgrel, RowExclusiveLock);
@@ -421,8 +438,8 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 	{
 		/*
 		 * It's for a constraint, so make it an internal dependency of the
-		 * constraint.  We can skip depending on the relations, as there'll
-		 * be an indirect dependency via the constraint.
+		 * constraint.	We can skip depending on the relations, as there'll be
+		 * an indirect dependency via the constraint.
 		 */
 		referenced.classId = ConstraintRelationId;
 		referenced.objectId = constraintOid;
@@ -451,10 +468,277 @@ CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid)
 
 	/* Keep lock on target rel until end of xact */
 	heap_close(rel, NoLock);
-	
+
 	return trigoid;
 }
 
+
+/*
+ * Convert legacy (pre-7.3) CREATE CONSTRAINT TRIGGER commands into
+ * full-fledged foreign key constraints.
+ *
+ * The conversion is complex because a pre-7.3 foreign key involved three
+ * separate triggers, which were reported separately in dumps.	While the
+ * single trigger on the referencing table adds no new information, we need
+ * to know the trigger functions of both of the triggers on the referenced
+ * table to build the constraint declaration.  Also, due to lack of proper
+ * dependency checking pre-7.3, it is possible that the source database had
+ * an incomplete set of triggers resulting in an only partially enforced
+ * FK constraint.  (This would happen if one of the tables had been dropped
+ * and re-created, but only if the DB had been affected by a 7.0 pg_dump bug
+ * that caused loss of tgconstrrelid information.)	We choose to translate to
+ * an FK constraint only when we've seen all three triggers of a set.  This is
+ * implemented by storing unmatched items in a list in TopMemoryContext.
+ * We match triggers together by comparing the trigger arguments (which
+ * include constraint name, table and column names, so should be good enough).
+ */
+typedef struct
+{
+	List	   *args;			/* list of (T_String) Values or NIL */
+	Oid			funcoids[3];	/* OIDs of trigger functions */
+	/* The three function OIDs are stored in the order update, delete, child */
+} OldTriggerInfo;
+
+static void
+ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
+{
+	static List *info_list = NIL;
+
+	static const char *const funcdescr[3] = {
+		gettext_noop("Found referenced table's UPDATE trigger."),
+		gettext_noop("Found referenced table's DELETE trigger."),
+		gettext_noop("Found referencing table's trigger.")
+	};
+
+	char	   *constr_name;
+	char	   *fk_table_name;
+	char	   *pk_table_name;
+	char		fk_matchtype = FKCONSTR_MATCH_UNSPECIFIED;
+	List	   *fk_attrs = NIL;
+	List	   *pk_attrs = NIL;
+	StringInfoData buf;
+	int			funcnum;
+	OldTriggerInfo *info = NULL;
+	ListCell   *l;
+	int			i;
+
+	/* Parse out the trigger arguments */
+	constr_name = strVal(linitial(stmt->args));
+	fk_table_name = strVal(lsecond(stmt->args));
+	pk_table_name = strVal(lthird(stmt->args));
+	i = 0;
+	foreach(l, stmt->args)
+	{
+		Value	   *arg = (Value *) lfirst(l);
+
+		i++;
+		if (i < 4)				/* skip constraint and table names */
+			continue;
+		if (i == 4)				/* handle match type */
+		{
+			if (strcmp(strVal(arg), "FULL") == 0)
+				fk_matchtype = FKCONSTR_MATCH_FULL;
+			else
+				fk_matchtype = FKCONSTR_MATCH_UNSPECIFIED;
+			continue;
+		}
+		if (i % 2)
+			fk_attrs = lappend(fk_attrs, arg);
+		else
+			pk_attrs = lappend(pk_attrs, arg);
+	}
+
+	/* Prepare description of constraint for use in messages */
+	initStringInfo(&buf);
+	appendStringInfo(&buf, "FOREIGN KEY %s(",
+					 quote_identifier(fk_table_name));
+	i = 0;
+	foreach(l, fk_attrs)
+	{
+		Value	   *arg = (Value *) lfirst(l);
+
+		if (i++ > 0)
+			appendStringInfoChar(&buf, ',');
+		appendStringInfoString(&buf, quote_identifier(strVal(arg)));
+	}
+	appendStringInfo(&buf, ") REFERENCES %s(",
+					 quote_identifier(pk_table_name));
+	i = 0;
+	foreach(l, pk_attrs)
+	{
+		Value	   *arg = (Value *) lfirst(l);
+
+		if (i++ > 0)
+			appendStringInfoChar(&buf, ',');
+		appendStringInfoString(&buf, quote_identifier(strVal(arg)));
+	}
+	appendStringInfoChar(&buf, ')');
+
+	/* Identify class of trigger --- update, delete, or referencing-table */
+	switch (funcoid)
+	{
+		case F_RI_FKEY_CASCADE_UPD:
+		case F_RI_FKEY_RESTRICT_UPD:
+		case F_RI_FKEY_SETNULL_UPD:
+		case F_RI_FKEY_SETDEFAULT_UPD:
+		case F_RI_FKEY_NOACTION_UPD:
+			funcnum = 0;
+			break;
+
+		case F_RI_FKEY_CASCADE_DEL:
+		case F_RI_FKEY_RESTRICT_DEL:
+		case F_RI_FKEY_SETNULL_DEL:
+		case F_RI_FKEY_SETDEFAULT_DEL:
+		case F_RI_FKEY_NOACTION_DEL:
+			funcnum = 1;
+			break;
+
+		default:
+			funcnum = 2;
+			break;
+	}
+
+	/* See if we have a match to this trigger */
+	foreach(l, info_list)
+	{
+		info = (OldTriggerInfo *) lfirst(l);
+		if (info->funcoids[funcnum] == InvalidOid &&
+			equal(info->args, stmt->args))
+		{
+			info->funcoids[funcnum] = funcoid;
+			break;
+		}
+	}
+
+	if (l == NULL)
+	{
+		/* First trigger of set, so create a new list entry */
+		MemoryContext oldContext;
+
+		ereport(NOTICE,
+		(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
+				constr_name, buf.data),
+		 errdetail("%s", funcdescr[funcnum])));
+		oldContext = MemoryContextSwitchTo(TopMemoryContext);
+		info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
+		info->args = copyObject(stmt->args);
+		info->funcoids[funcnum] = funcoid;
+		info_list = lappend(info_list, info);
+		MemoryContextSwitchTo(oldContext);
+	}
+	else if (info->funcoids[0] == InvalidOid ||
+			 info->funcoids[1] == InvalidOid ||
+			 info->funcoids[2] == InvalidOid)
+	{
+		/* Second trigger of set */
+		ereport(NOTICE,
+		(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
+				constr_name, buf.data),
+		 errdetail("%s", funcdescr[funcnum])));
+	}
+	else
+	{
+		/* OK, we have a set, so make the FK constraint ALTER TABLE cmd */
+		AlterTableStmt *atstmt = makeNode(AlterTableStmt);
+		AlterTableCmd *atcmd = makeNode(AlterTableCmd);
+		FkConstraint *fkcon = makeNode(FkConstraint);
+
+		ereport(NOTICE,
+				(errmsg("converting trigger group into constraint \"%s\" %s",
+						constr_name, buf.data),
+				 errdetail("%s", funcdescr[funcnum])));
+		if (funcnum == 2)
+		{
+			/* This trigger is on the FK table */
+			atstmt->relation = stmt->relation;
+			if (stmt->constrrel)
+				fkcon->pktable = stmt->constrrel;
+			else
+			{
+				/* Work around ancient pg_dump bug that omitted constrrel */
+				fkcon->pktable = makeRangeVar(NULL, pk_table_name, -1);
+			}
+		}
+		else
+		{
+			/* This trigger is on the PK table */
+			fkcon->pktable = stmt->relation;
+			if (stmt->constrrel)
+				atstmt->relation = stmt->constrrel;
+			else
+			{
+				/* Work around ancient pg_dump bug that omitted constrrel */
+				atstmt->relation = makeRangeVar(NULL, fk_table_name, -1);
+			}
+		}
+		atstmt->cmds = list_make1(atcmd);
+		atstmt->relkind = OBJECT_TABLE;
+		atcmd->subtype = AT_AddConstraint;
+		atcmd->def = (Node *) fkcon;
+		if (strcmp(constr_name, "<unnamed>") == 0)
+			fkcon->constr_name = NULL;
+		else
+			fkcon->constr_name = constr_name;
+		fkcon->fk_attrs = fk_attrs;
+		fkcon->pk_attrs = pk_attrs;
+		fkcon->fk_matchtype = fk_matchtype;
+		switch (info->funcoids[0])
+		{
+			case F_RI_FKEY_NOACTION_UPD:
+				fkcon->fk_upd_action = FKCONSTR_ACTION_NOACTION;
+				break;
+			case F_RI_FKEY_CASCADE_UPD:
+				fkcon->fk_upd_action = FKCONSTR_ACTION_CASCADE;
+				break;
+			case F_RI_FKEY_RESTRICT_UPD:
+				fkcon->fk_upd_action = FKCONSTR_ACTION_RESTRICT;
+				break;
+			case F_RI_FKEY_SETNULL_UPD:
+				fkcon->fk_upd_action = FKCONSTR_ACTION_SETNULL;
+				break;
+			case F_RI_FKEY_SETDEFAULT_UPD:
+				fkcon->fk_upd_action = FKCONSTR_ACTION_SETDEFAULT;
+				break;
+			default:
+				/* can't get here because of earlier checks */
+				elog(ERROR, "confused about RI update function");
+		}
+		switch (info->funcoids[1])
+		{
+			case F_RI_FKEY_NOACTION_DEL:
+				fkcon->fk_del_action = FKCONSTR_ACTION_NOACTION;
+				break;
+			case F_RI_FKEY_CASCADE_DEL:
+				fkcon->fk_del_action = FKCONSTR_ACTION_CASCADE;
+				break;
+			case F_RI_FKEY_RESTRICT_DEL:
+				fkcon->fk_del_action = FKCONSTR_ACTION_RESTRICT;
+				break;
+			case F_RI_FKEY_SETNULL_DEL:
+				fkcon->fk_del_action = FKCONSTR_ACTION_SETNULL;
+				break;
+			case F_RI_FKEY_SETDEFAULT_DEL:
+				fkcon->fk_del_action = FKCONSTR_ACTION_SETDEFAULT;
+				break;
+			default:
+				/* can't get here because of earlier checks */
+				elog(ERROR, "confused about RI delete function");
+		}
+		fkcon->deferrable = stmt->deferrable;
+		fkcon->initdeferred = stmt->initdeferred;
+
+		/* ... and execute it */
+		ProcessUtility((Node *) atstmt,
+					   NULL, NULL, false, None_Receiver, NULL);
+
+		/* Remove the matched item from the list */
+		info_list = list_delete_ptr(info_list, info);
+		pfree(info);
+		/* We leak the copied args ... not worth worrying about */
+	}
+}
+
+
 /*
  * DropTrigger - drop an individual trigger by name
  */
@@ -718,11 +1002,11 @@ renametrig(Oid relid,
  * EnableDisableTrigger()
  *
  *	Called by ALTER TABLE ENABLE/DISABLE TRIGGER
- *	to change 'tgenabled' flag for the specified trigger(s)
+ *	to change 'tgenabled' field for the specified trigger(s)
  *
  * rel: relation to process (caller must hold suitable lock on it)
  * tgname: trigger to process, or NULL to scan all triggers
- * enable: new value for tgenabled flag
+ * enable: new value for tgenabled field
  * skip_system: if true, skip "system" triggers (constraint triggers)
  *
  * Caller should have checked permissions for the table; here we also
@@ -731,7 +1015,7 @@ renametrig(Oid relid,
  */
 void
 EnableDisableTrigger(Relation rel, const char *tgname,
-					 bool enable, bool skip_system)
+					 char fires_when, bool skip_system)
 {
 	Relation	tgrel;
 	cqContext	cqc;
@@ -784,13 +1068,13 @@ EnableDisableTrigger(Relation rel, const char *tgname,
 
 		found = true;
 
-		if (oldtrig->tgenabled != enable)
+		if (oldtrig->tgenabled != fires_when)
 		{
 			/* need to change this one ... make a copy to scribble on */
 			HeapTuple	newtup = heap_copytuple(tuple);
 			Form_pg_trigger newtrig = (Form_pg_trigger) GETSTRUCT(newtup);
 
-			newtrig->tgenabled = enable;
+			newtrig->tgenabled = fires_when;
 
 			caql_update_current(pcqCtx, newtup);
 			/* and Update indexes (implicit) */
@@ -839,8 +1123,8 @@ RelationBuildTriggers(Relation relation)
 	Trigger    *triggers;
 	int			found = 0;
 	Relation	tgrel;
-	ScanKeyData	skey;
-	SysScanDesc	tgscan;
+	ScanKeyData skey;
+	SysScanDesc tgscan;
 	HeapTuple	htup;
 	MemoryContext oldContext;
 
@@ -854,7 +1138,6 @@ RelationBuildTriggers(Relation relation)
 	 * emergency-recovery operations (ie, IgnoreSystemIndexes). This in turn
 	 * ensures that triggers will be fired in name order.
 	 */
-
 	ScanKeyInit(&skey,
 				Anum_pg_trigger_tgrelid,
 				BTEqualStrategyNumber, F_OIDEQ,
@@ -904,8 +1187,8 @@ RelationBuildTriggers(Relation relation)
 			int			i;
 
 			val = DatumGetByteaP(fastgetattr(htup,
-											Anum_pg_trigger_tgargs,
-											tgrel->rd_att, &isnull));
+											 Anum_pg_trigger_tgargs,
+											 tgrel->rd_att, &isnull));
 			if (isnull)
 				elog(ERROR, "tgargs is null in trigger for relation \"%s\"",
 					 RelationGetRelationName(relation));
@@ -1351,8 +1634,18 @@ ExecBSInsertTriggers(EState *estate, ResultRelInfo *relinfo)
 		Trigger    *trigger = &trigdesc->triggers[tgindx[i]];
 		HeapTuple	newtuple;
 
-		if (!trigger->tgenabled)
-			continue;
+		if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_ORIGIN ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
+		else	/* ORIGIN or LOCAL role */
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
 		LocTriggerData.tg_trigger = trigger;
 		newtuple = ExecCallTriggerFunc(&LocTriggerData,
 									   tgindx[i],
@@ -1400,8 +1693,18 @@ ExecBRInsertTriggers(EState *estate, ResultRelInfo *relinfo,
 	{
 		Trigger    *trigger = &trigdesc->triggers[tgindx[i]];
 
-		if (!trigger->tgenabled)
-			continue;
+		if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_ORIGIN ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
+		else	/* ORIGIN or LOCAL role */
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
 		LocTriggerData.tg_trigtuple = oldtuple = newtuple;
 		LocTriggerData.tg_trigtuplebuf = InvalidBuffer;
 		LocTriggerData.tg_trigger = trigger;
@@ -1430,8 +1733,8 @@ ExecARInsertTriggers(EState *estate, ResultRelInfo *relinfo,
 			elog(ERROR, "Trigger is not supported on AOCS yet");
 
 		AfterTriggerSaveEvent(relinfo, TRIGGER_EVENT_INSERT,
-								true, NULL, trigtuple);
-		}
+							  true, NULL, trigtuple);
+	}
 }
 
 void
@@ -1467,8 +1770,18 @@ ExecBSDeleteTriggers(EState *estate, ResultRelInfo *relinfo)
 		Trigger    *trigger = &trigdesc->triggers[tgindx[i]];
 		HeapTuple	newtuple;
 
-		if (!trigger->tgenabled)
-			continue;
+		if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_ORIGIN ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
+		else	/* ORIGIN or LOCAL role */
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
 		LocTriggerData.tg_trigger = trigger;
 		newtuple = ExecCallTriggerFunc(&LocTriggerData,
 									   tgindx[i],
@@ -1495,8 +1808,7 @@ ExecASDeleteTriggers(EState *estate, ResultRelInfo *relinfo)
 
 bool
 ExecBRDeleteTriggers(EState *estate, ResultRelInfo *relinfo,
-					 ItemPointer tupleid,
-					 CommandId cid)
+					 ItemPointer tupleid)
 {
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
 	int			ntrigs = trigdesc->n_before_row[TRIGGER_EVENT_DELETE];
@@ -1508,7 +1820,7 @@ ExecBRDeleteTriggers(EState *estate, ResultRelInfo *relinfo,
 	TupleTableSlot *newSlot;
 	int			i;
 
-	trigtuple = GetTupleForTrigger(estate, relinfo, tupleid, cid, &newSlot);
+	trigtuple = GetTupleForTrigger(estate, relinfo, tupleid, &newSlot);
 	if (trigtuple == NULL)
 		return false;
 
@@ -1523,8 +1835,18 @@ ExecBRDeleteTriggers(EState *estate, ResultRelInfo *relinfo,
 	{
 		Trigger    *trigger = &trigdesc->triggers[tgindx[i]];
 
-		if (!trigger->tgenabled)
-			continue;
+		if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_ORIGIN ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
+		else	/* ORIGIN or LOCAL role */
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
 		LocTriggerData.tg_trigtuple = trigtuple;
 		LocTriggerData.tg_trigtuplebuf = InvalidBuffer;
 		LocTriggerData.tg_trigger = trigger;
@@ -1555,9 +1877,7 @@ ExecARDeleteTriggers(EState *estate, ResultRelInfo *relinfo,
 	if (trigdesc && trigdesc->n_after_row[TRIGGER_EVENT_DELETE] > 0)
 	{
 		HeapTuple	trigtuple = GetTupleForTrigger(estate, relinfo,
-												   tupleid,
-												   (CommandId) 0,
-												   NULL);
+												   tupleid, NULL);
 
 		AfterTriggerSaveEvent(relinfo, TRIGGER_EVENT_DELETE,
 							  true, trigtuple, NULL);
@@ -1598,8 +1918,18 @@ ExecBSUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
 		Trigger    *trigger = &trigdesc->triggers[tgindx[i]];
 		HeapTuple	newtuple;
 
-		if (!trigger->tgenabled)
-			continue;
+		if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_ORIGIN ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
+		else	/* ORIGIN or LOCAL role */
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
 		LocTriggerData.tg_trigger = trigger;
 		newtuple = ExecCallTriggerFunc(&LocTriggerData,
 									   tgindx[i],
@@ -1624,31 +1954,42 @@ ExecASUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
 							  false, NULL, NULL);
 }
 
-HeapTuple
+TupleTableSlot *
 ExecBRUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
-					 ItemPointer tupleid, HeapTuple newtuple,
-					 CommandId cid)
+					 ItemPointer tupleid, TupleTableSlot *slot)
 {
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
 	int			ntrigs = trigdesc->n_before_row[TRIGGER_EVENT_UPDATE];
 	int		   *tgindx = trigdesc->tg_before_row[TRIGGER_EVENT_UPDATE];
+	HeapTuple	slottuple = ExecFetchSlotHeapTuple(slot);
+	HeapTuple	newtuple = slottuple;
 	TriggerData LocTriggerData;
 	HeapTuple	trigtuple;
 	HeapTuple	oldtuple;
-	HeapTuple	intuple = newtuple;
 	TupleTableSlot *newSlot;
 	int			i;
 
-	trigtuple = GetTupleForTrigger(estate, relinfo, tupleid, cid, &newSlot);
+	trigtuple = GetTupleForTrigger(estate, relinfo, tupleid, &newSlot);
 	if (trigtuple == NULL)
 		return NULL;
 
 	/*
-	 * In READ COMMITTED isolation level it's possible that newtuple was
-	 * changed due to concurrent update.
+	 * In READ COMMITTED isolation level it's possible that target tuple was
+	 * changed due to concurrent update.  In that case we have a raw subplan
+	 * output tuple in newSlot, and need to run it through the junk filter to
+	 * produce an insertable tuple.
+	 *
+	 * Caution: more than likely, the passed-in slot is the same as the
+	 * junkfilter's output slot, so we are clobbering the original value of
+	 * slottuple by doing the filtering.  This is OK since neither we nor our
+	 * caller have any more interest in the prior contents of that slot.
 	 */
 	if (newSlot != NULL)
-		intuple = newtuple = ExecRemoveJunk(estate->es_junkFilter, newSlot);
+	{
+		slot = ExecFilterJunk(estate->es_junkFilter, newSlot);
+		slottuple = ExecFetchSlotHeapTuple(slot);
+		newtuple = slottuple;
+	}
 
 	LocTriggerData.type = T_TriggerData;
 	LocTriggerData.tg_event = TRIGGER_EVENT_UPDATE |
@@ -1659,8 +2000,18 @@ ExecBRUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 	{
 		Trigger    *trigger = &trigdesc->triggers[tgindx[i]];
 
-		if (!trigger->tgenabled)
-			continue;
+		if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_ORIGIN ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
+		else	/* ORIGIN or LOCAL role */
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
 		LocTriggerData.tg_trigtuple = trigtuple;
 		LocTriggerData.tg_newtuple = oldtuple = newtuple;
 		LocTriggerData.tg_trigtuplebuf = InvalidBuffer;
@@ -1671,13 +2022,33 @@ ExecBRUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 									   relinfo->ri_TrigFunctions,
 									   relinfo->ri_TrigInstrument,
 									   GetPerTupleMemoryContext(estate));
-		if (oldtuple != newtuple && oldtuple != intuple)
+		if (oldtuple != newtuple && oldtuple != slottuple)
 			heap_freetuple(oldtuple);
 		if (newtuple == NULL)
-			break;
+		{
+			heap_freetuple(trigtuple);
+			return NULL;		/* "do nothing" */
+		}
 	}
 	heap_freetuple(trigtuple);
-	return newtuple;
+
+	if (newtuple != slottuple)
+	{
+		/*
+		 * Return the modified tuple using the es_trig_tuple_slot.  We assume
+		 * the tuple was allocated in per-tuple memory context, and therefore
+		 * will go away by itself. The tuple table slot should not try to
+		 * clear it.
+		 */
+		TupleTableSlot *newslot = estate->es_trig_tuple_slot;
+		TupleDesc	tupdesc = RelationGetDescr(relinfo->ri_RelationDesc);
+
+		if (newslot->tts_tupleDescriptor != tupdesc)
+			ExecSetSlotDescriptor(newslot, tupdesc);
+		ExecStoreHeapTuple(newtuple, newslot, InvalidBuffer, false);
+		slot = newslot;
+	}
+	return slot;
 }
 
 void
@@ -1689,9 +2060,7 @@ ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 	if (trigdesc && trigdesc->n_after_row[TRIGGER_EVENT_UPDATE] > 0)
 	{
 		HeapTuple	trigtuple = GetTupleForTrigger(estate, relinfo,
-												   tupleid,
-												   (CommandId) 0,
-												   NULL);
+												   tupleid, NULL);
 
 		AfterTriggerSaveEvent(relinfo, TRIGGER_EVENT_UPDATE,
 							  true, trigtuple, newtuple);
@@ -1702,7 +2071,7 @@ ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 
 static HeapTuple
 GetTupleForTrigger(EState *estate, ResultRelInfo *relinfo,
-				   ItemPointer tid, CommandId cid,
+				   ItemPointer tid,
 				   TupleTableSlot **newSlot)
 {
 	MIRROREDLOCK_BUFMGR_DECLARE;
@@ -1726,7 +2095,8 @@ GetTupleForTrigger(EState *estate, ResultRelInfo *relinfo,
 ltrmark:;
 		tuple.t_self = *tid;
 		test = heap_lock_tuple(relation, &tuple, &buffer,
-							   &update_ctid, &update_xmax, cid,
+							   &update_ctid, &update_xmax,
+							   estate->es_output_cid,
 							   LockTupleExclusive, LockTupleWait);
 		switch (test)
 		{
@@ -1752,8 +2122,7 @@ ltrmark:;
 					epqslot = EvalPlanQual(estate,
 										   relinfo->ri_RangeTableIndex,
 										   &update_ctid,
-										   update_xmax,
-										   cid);
+										   update_xmax);
 					if (!TupIsNull(epqslot))
 					{
 						*tid = update_ctid;
@@ -1787,14 +2156,26 @@ ltrmark:;
 		MIRROREDLOCK_BUFMGR_UNLOCK;
 		// -------- MirroredLock ----------
 		
+		/*
+		 * Although we already know this tuple is valid, we must lock the
+		 * buffer to ensure that no one has a buffer cleanup lock; otherwise
+		 * they might move the tuple while we try to copy it.  But we can
+		 * release the lock before actually doing the heap_copytuple call,
+		 * since holding pin is sufficient to prevent anyone from getting a
+		 * cleanup lock they don't already hold.
+		 */
+		LockBuffer(buffer, BUFFER_LOCK_SHARE);
+
 		dp = (PageHeader) BufferGetPage(buffer);
 		lp = PageGetItemId(dp, ItemPointerGetOffsetNumber(tid));
 
-		Assert(ItemIdIsUsed(lp));
+		Assert(ItemIdIsNormal(lp));
 
 		tuple.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
 		tuple.t_len = ItemIdGetLength(lp);
 		tuple.t_self = *tid;
+
+		LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 	}
 
 	result = heap_copytuple(&tuple);
@@ -2274,33 +2655,42 @@ afterTriggerMarkEvents(AfterTriggerEventList *events,
  * afterTriggerInvokeEvents()
  *
  *	Scan the given event list for events that are marked as to be fired
- *	in the current firing cycle, and fire them.
+ *	in the current firing cycle, and fire them.  query_depth is the index in
+ *	afterTriggers->query_stack, or -1 to examine afterTriggers->events.
+ *	(We have to be careful here because query_stack could move under us.)
  *
- *	If estate isn't NULL, then we expect that all the firable events are
- *	for triggers of the relations included in the estate's result relation
- *	array.	This allows us to re-use the estate's open relations and
- *	trigger cache info.  When estate is NULL, we have to find the relations
- *	the hard way.
+ *	If estate isn't NULL, we use its result relation info to avoid repeated
+ *	openings and closing of trigger target relations.  If it is NULL, we
+ *	make one locally to cache the info in case there are multiple trigger
+ *	events per rel.
  *
  *	When delete_ok is TRUE, it's okay to delete fully-processed events.
  *	The events list pointers are updated.
  * ----------
  */
 static void
-afterTriggerInvokeEvents(AfterTriggerEventList *events,
+afterTriggerInvokeEvents(int query_depth,
 						 CommandId firing_id,
 						 EState *estate,
 						 bool delete_ok)
 {
+	AfterTriggerEventList *events;
 	AfterTriggerEvent event,
 				prev_event;
 	MemoryContext per_tuple_context;
-	bool		locally_opened = false;
+	bool		local_estate = false;
 	Relation	rel = NULL;
 	TriggerDesc *trigdesc = NULL;
 	FmgrInfo   *finfo = NULL;
 	Instrumentation *instr = NULL;
 
+	/* Make a local EState if need be */
+	if (estate == NULL)
+	{
+		estate = CreateExecutorState();
+		local_estate = true;
+	}
+
 	/* Make a per-tuple memory context for trigger function calls */
 	per_tuple_context =
 		AllocSetContextCreate(CurrentMemoryContext,
@@ -2310,6 +2700,7 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 							  ALLOCSET_DEFAULT_MAXSIZE);
 
 	prev_event = NULL;
+	events = (query_depth >= 0) ? &afterTriggers->query_stack[query_depth] : &afterTriggers->events;
 	event = events->head;
 
 	while (event != NULL)
@@ -2323,11 +2714,17 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 			event->ate_firing_id == firing_id)
 		{
 			/*
-			 * So let's fire it... but first, open the correct relation if
+			 * So let's fire it... but first, find the correct relation if
 			 * this is not the same relation as before.
 			 */
-			if (rel == NULL || rel->rd_id != event->ate_relid)
+			if (rel == NULL || RelationGetRelid(rel) != event->ate_relid)
 			{
+				ResultRelInfo *rInfo;
+
+				/* GPDB_83_MERGE_FIXME: We had this in GPDB before the merge.
+				 * There are no comments on why this is needed, and I don't get it.
+				 */
+#if 0				
 				if (locally_opened)
 				{
 					/* close prior rel if any */
@@ -2340,60 +2737,16 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 					Assert(instr == NULL);		/* never used in this case */
 				}
 				locally_opened = true;
-
-				if (estate)
-				{
-					/* Find target relation among estate's result rels */
-					ResultRelInfo *rInfo;
-					int			nr;
-
-					rInfo = estate->es_result_relations;
-					nr = estate->es_num_result_relations;
-					while (nr > 0)
-					{
-						if (rInfo->ri_RelationDesc->rd_id == event->ate_relid)
-						{
-							rel = rInfo->ri_RelationDesc;
-							trigdesc = rInfo->ri_TrigDesc;
-							finfo = rInfo->ri_TrigFunctions;
-							instr = rInfo->ri_TrigInstrument;
-							locally_opened = false;
-							break;
-						}
-						rInfo++;
-						nr--;
-					}
-				}
-
-				if (locally_opened)
-				{
-					/* Hard way: open target relation for ourselves */
-
-					/*
-					 * We assume that an appropriate lock is still held by the
-					 * executor, so grab no new lock here.
-					 */
-					rel = heap_open(event->ate_relid, NoLock);
-
-					/*
-					 * Copy relation's trigger info so that we have a stable
-					 * copy no matter what the called triggers do.
-					 */
-					trigdesc = CopyTriggerDesc(rel->trigdesc);
-
-					if (trigdesc == NULL)		/* should not happen */
-						elog(ERROR, "relation %u has no triggers",
-							 event->ate_relid);
-
-					/*
-					 * Allocate space to cache fmgr lookup info for triggers.
-					 */
-					finfo = (FmgrInfo *)
-						palloc0(trigdesc->numtriggers * sizeof(FmgrInfo));
-
-					/* Never any EXPLAIN info in this case */
-					instr = NULL;
-				}
+#endif
+
+				rInfo = ExecGetTriggerResultRel(estate, event->ate_relid);
+				rel = rInfo->ri_RelationDesc;
+				trigdesc = rInfo->ri_TrigDesc;
+				finfo = rInfo->ri_TrigFunctions;
+				instr = rInfo->ri_TrigInstrument;
+				if (trigdesc == NULL)	/* should not happen */
+					elog(ERROR, "relation %u has no triggers",
+						 event->ate_relid);
 			}
 
 			/*
@@ -2427,7 +2780,10 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 			if (prev_event)
 				prev_event->ate_next = next_event;
 			else
+			{
+				events = (query_depth >= 0) ? &afterTriggers->query_stack[query_depth] : &afterTriggers->events;
 				events->head = next_event;
+			}
 			pfree(event);
 		}
 		else
@@ -2440,20 +2796,26 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 	}
 
 	/* Update list tail pointer in case we just deleted tail event */
+	events = (query_depth >= 0) ? &afterTriggers->query_stack[query_depth] : &afterTriggers->events;
 	events->tail = prev_event;
 
 	/* Release working resources */
-	if (locally_opened)
+	MemoryContextDelete(per_tuple_context);
+
+	if (local_estate)
 	{
-		if (rel)
-			heap_close(rel, NoLock);
-		if (trigdesc)
-			FreeTriggerDesc(trigdesc);
-		if (finfo)
-			pfree(finfo);
-		Assert(instr == NULL);	/* never used in this case */
+		ListCell   *l;
+
+		foreach(l, estate->es_trig_target_relations)
+		{
+			ResultRelInfo *resultRelInfo = (ResultRelInfo *) lfirst(l);
+
+			/* Close indices and then the relation itself */
+			ExecCloseIndices(resultRelInfo);
+			heap_close(resultRelInfo->ri_RelationDesc, NoLock);
+		}
+		FreeExecutorState(estate);
 	}
-	MemoryContextDelete(per_tuple_context);
 }
 
 
@@ -2554,8 +2916,6 @@ AfterTriggerBeginQuery(void)
 void
 AfterTriggerEndQuery(EState *estate)
 {
-	AfterTriggerEventList *events;
-
 	/* Must be inside a transaction */
 	Assert(afterTriggers != NULL);
 
@@ -2572,18 +2932,20 @@ AfterTriggerEndQuery(EState *estate)
 	 * IMMEDIATE: all events we have decided to defer will be available for it
 	 * to fire.
 	 *
-	 * We loop in case a trigger queues more events.
+	 * We loop in case a trigger queues more events at the same query level
+	 * (is that even possible?).  Be careful here: firing a trigger could
+	 * result in query_stack being repalloc'd, so we can't save its address
+	 * across afterTriggerInvokeEvents calls.
 	 *
 	 * If we find no firable events, we don't have to increment
 	 * firing_counter.
 	 */
-	events = &afterTriggers->query_stack[afterTriggers->query_depth];
-	while (afterTriggerMarkEvents(events, &afterTriggers->events, true))
+	while (afterTriggerMarkEvents(&afterTriggers->query_stack[afterTriggers->query_depth], &afterTriggers->events, true))
 	{
 		CommandId	firing_id = afterTriggers->firing_counter++;
 
 		/* OK to delete the immediate events after processing them */
-		afterTriggerInvokeEvents(events, firing_id, estate, true);
+		afterTriggerInvokeEvents(afterTriggers->query_depth, firing_id, estate, true);
 	}
 
 	afterTriggers->query_depth--;
@@ -2622,14 +2984,14 @@ AfterTriggerFireDeferred(void)
 		ActiveSnapshot = CopySnapshot(GetTransactionSnapshot());
 
 	/*
-	 * Run all the remaining triggers.	Loop until they are all gone, in
-	 * case some trigger queues more for us to do.
+	 * Run all the remaining triggers.	Loop until they are all gone, in case
+	 * some trigger queues more for us to do.
 	 */
 	while (afterTriggerMarkEvents(events, NULL, false))
 	{
 		CommandId	firing_id = afterTriggers->firing_counter++;
 
-		afterTriggerInvokeEvents(events, firing_id, NULL, true);
+		afterTriggerInvokeEvents(-1, firing_id, NULL, true);
 	}
 
 	Assert(events->head == NULL);
@@ -2657,13 +3019,13 @@ AfterTriggerEndXact(bool isCommit)
 	 *
 	 * Since all the info is in TopTransactionContext or children thereof, we
 	 * don't really need to do anything to reclaim memory.  However, the
-	 * pending-events list could be large, and so it's useful to discard
-	 * it as soon as possible --- especially if we are aborting because we
-	 * ran out of memory for the list!
+	 * pending-events list could be large, and so it's useful to discard it as
+	 * soon as possible --- especially if we are aborting because we ran out
+	 * of memory for the list!
 	 *
-	 * (Note: any event_cxts of child subtransactions could also be
-	 * deleted here, but we have no convenient way to find them, so we
-	 * leave it to TopTransactionContext reset to clean them up.)
+	 * (Note: any event_cxts of child subtransactions could also be deleted
+	 * here, but we have no convenient way to find them, so we leave it to
+	 * TopTransactionContext reset to clean them up.)
 	 */
 	if (afterTriggers && afterTriggers->event_cxt)
 		MemoryContextDelete(afterTriggers->event_cxt);
@@ -2690,9 +3052,8 @@ AfterTriggerBeginSubXact(void)
 
 	/*
 	 * Allocate more space in the stacks if needed.  (Note: because the
-	 * minimum nest level of a subtransaction is 2, we waste the first
-	 * couple entries of each array; not worth the notational effort to
-	 * avoid it.)
+	 * minimum nest level of a subtransaction is 2, we waste the first couple
+	 * entries of each array; not worth the notational effort to avoid it.)
 	 */
 	while (my_level >= afterTriggers->maxtransdepth)
 	{
@@ -2787,16 +3148,17 @@ AfterTriggerEndSubXact(bool isCommit)
 		afterTriggers->state_stack[my_level] = NULL;
 		Assert(afterTriggers->query_depth ==
 			   afterTriggers->depth_stack[my_level]);
+
 		/*
 		 * It's entirely possible that the subxact created an event_cxt but
 		 * there is not anything left in it (because all the triggers were
-		 * fired at end-of-statement).  If so, we should release the context
-		 * to prevent memory leakage in a long sequence of subtransactions.
-		 * We can detect whether there's anything of use in the context by
-		 * seeing if anything was added to the global events list since
-		 * subxact start.  (This test doesn't catch every case where the
-		 * context is deletable; for instance maybe the only additions were
-		 * from a sub-sub-xact.  But it handles the common case.)
+		 * fired at end-of-statement).	If so, we should release the context
+		 * to prevent memory leakage in a long sequence of subtransactions. We
+		 * can detect whether there's anything of use in the context by seeing
+		 * if anything was added to the global events list since subxact
+		 * start.  (This test doesn't catch every case where the context is
+		 * deletable; for instance maybe the only additions were from a
+		 * sub-sub-xact.  But it handles the common case.)
 		 */
 		if (afterTriggers->cxt_stack[my_level] &&
 			afterTriggers->events.tail == afterTriggers->events_stack[my_level].tail)
@@ -3189,19 +3551,51 @@ AfterTriggerSetState(ConstraintsSetStmt *stmt)
 	if (!stmt->deferred)
 	{
 		AfterTriggerEventList *events = &afterTriggers->events;
+		Snapshot	saveActiveSnapshot = ActiveSnapshot;
 
-		while (afterTriggerMarkEvents(events, NULL, true))
+		/* PG_TRY to ensure previous ActiveSnapshot is restored on error */
+		PG_TRY();
 		{
-			CommandId	firing_id = afterTriggers->firing_counter++;
+			Snapshot	mySnapshot = NULL;
 
-			/*
-			 * We can delete fired events if we are at top transaction level,
-			 * but we'd better not if inside a subtransaction, since the
-			 * subtransaction could later get rolled back.
-			 */
-			afterTriggerInvokeEvents(events, firing_id, NULL,
-									 !IsSubTransaction());
+			while (afterTriggerMarkEvents(events, NULL, true))
+			{
+				CommandId	firing_id = afterTriggers->firing_counter++;
+
+				/*
+				 * Make sure a snapshot has been established in case trigger
+				 * functions need one.  Note that we avoid setting a snapshot
+				 * if we don't find at least one trigger that has to be fired
+				 * now.  This is so that BEGIN; SET CONSTRAINTS ...; SET
+				 * TRANSACTION ISOLATION LEVEL SERIALIZABLE; ... works
+				 * properly.  (If we are at the start of a transaction it's
+				 * not possible for any trigger events to be queued yet.)
+				 */
+				if (mySnapshot == NULL)
+				{
+					mySnapshot = CopySnapshot(GetTransactionSnapshot());
+					ActiveSnapshot = mySnapshot;
+				}
+
+				/*
+				 * We can delete fired events if we are at top transaction level,
+				 * but we'd better not if inside a subtransaction, since the
+				 * subtransaction could later get rolled back.
+				 */
+				afterTriggerInvokeEvents(-1, firing_id, NULL,
+										 !IsSubTransaction());
+			}
+
+			if (mySnapshot)
+				FreeSnapshot(mySnapshot);
 		}
+		PG_CATCH();
+		{
+			ActiveSnapshot = saveActiveSnapshot;
+			PG_RE_THROW();
+		}
+		PG_END_TRY();
+		ActiveSnapshot = saveActiveSnapshot;
 	}
 	
 	if (Gp_role == GP_ROLE_DISPATCH)
@@ -3299,8 +3693,15 @@ AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger,
 	ItemPointerData oldctid;
 	ItemPointerData newctid;
 
+	/*
+	 * Check state.  We use normal tests not Asserts because it is possible
+	 * to reach here in the wrong state given misconfigured RI triggers,
+	 * in particular deferring a cascade action trigger.
+	 */
 	if (afterTriggers == NULL)
 		elog(ERROR, "AfterTriggerSaveEvent() called outside of transaction");
+	if (afterTriggers->query_depth < 0)
+		elog(ERROR, "AfterTriggerSaveEvent() called outside of query");
 
 	/*
 	 * Get the CTID's of OLD and NEW
@@ -3333,8 +3734,18 @@ AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger,
 		Trigger    *trigger = &trigdesc->triggers[tgindx[i]];
 
 		/* Ignore disabled triggers */
-		if (!trigger->tgenabled)
-			continue;
+		if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_ORIGIN ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
+		else	/* ORIGIN or LOCAL role */
+		{
+			if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA ||
+				trigger->tgenabled == TRIGGER_DISABLED)
+				continue;
+		}
 
 		/*
 		 * If this is an UPDATE of a PK table or FK table that does not change
@@ -3382,10 +3793,10 @@ AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger,
 
 		/*
 		 * If we don't yet have an event context for the current (sub)xact,
-		 * create one.  Make it a child of CurTransactionContext to ensure it
+		 * create one.	Make it a child of CurTransactionContext to ensure it
 		 * will go away if the subtransaction aborts.
 		 */
-		if (my_level > 1)			/* subtransaction? */
+		if (my_level > 1)		/* subtransaction? */
 		{
 			Assert(my_level < afterTriggers->maxtransdepth);
 			cxtptr = &afterTriggers->cxt_stack[my_level];
diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
new file mode 100644
index 000000000000..fb813293791b
--- /dev/null
+++ b/src/backend/commands/tsearchcmds.c
@@ -0,0 +1,2218 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsearchcmds.c
+ *
+ *	  Routines for tsearch manipulation commands
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.9 2008/01/01 19:45:49 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <ctype.h>
+
+#include "access/heapam.h"
+#include "access/genam.h"
+#include "access/xact.h"
+#include "catalog/dependency.h"
+#include "catalog/indexing.h"
+#include "catalog/namespace.h"
+#include "catalog/pg_namespace.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_config_map.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
+#include "catalog/pg_type.h"
+#include "commands/defrem.h"
+#include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "parser/parse_func.h"
+#include "tsearch/ts_cache.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/catcache.h"
+#include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+
+
+static void MakeConfigurationMapping(AlterTSConfigurationStmt *stmt,
+						 HeapTuple tup, Relation relMap);
+static void DropConfigurationMapping(AlterTSConfigurationStmt *stmt,
+						 HeapTuple tup, Relation relMap);
+
+
+/* --------------------- TS Parser commands ------------------------ */
+
+/*
+ * lookup a parser support function and return its OID (as a Datum)
+ *
+ * attnum is the pg_ts_parser column the function will go into
+ */
+static Datum
+get_ts_parser_func(DefElem *defel, int attnum)
+{
+	List	   *funcName = defGetQualifiedName(defel);
+	Oid			typeId[3];
+	Oid			retTypeId;
+	int			nargs;
+	Oid			procOid;
+
+	retTypeId = INTERNALOID;	/* correct for most */
+	typeId[0] = INTERNALOID;
+	switch (attnum)
+	{
+		case Anum_pg_ts_parser_prsstart:
+			nargs = 2;
+			typeId[1] = INT4OID;
+			break;
+		case Anum_pg_ts_parser_prstoken:
+			nargs = 3;
+			typeId[1] = INTERNALOID;
+			typeId[2] = INTERNALOID;
+			break;
+		case Anum_pg_ts_parser_prsend:
+			nargs = 1;
+			retTypeId = VOIDOID;
+			break;
+		case Anum_pg_ts_parser_prsheadline:
+			nargs = 3;
+			typeId[1] = INTERNALOID;
+			typeId[2] = TSQUERYOID;
+			break;
+		case Anum_pg_ts_parser_prslextype:
+			nargs = 1;
+			break;
+		default:
+			/* should not be here */
+			elog(ERROR, "unrecognized attribute for text search parser: %d",
+				 attnum);
+			nargs = 0;			/* keep compiler quiet */
+	}
+
+	procOid = LookupFuncName(funcName, nargs, typeId, false);
+	if (get_func_rettype(procOid) != retTypeId)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("function %s should return type %s",
+						func_signature_string(funcName, nargs, typeId),
+						format_type_be(retTypeId))));
+
+	return ObjectIdGetDatum(procOid);
+}
+
+/*
+ * make pg_depend entries for a new pg_ts_parser entry
+ */
+static void
+makeParserDependencies(HeapTuple tuple)
+{
+	Form_pg_ts_parser prs = (Form_pg_ts_parser) GETSTRUCT(tuple);
+	ObjectAddress myself,
+				referenced;
+
+	myself.classId = TSParserRelationId;
+	myself.objectId = HeapTupleGetOid(tuple);
+	myself.objectSubId = 0;
+
+	/* dependency on namespace */
+	referenced.classId = NamespaceRelationId;
+	referenced.objectId = prs->prsnamespace;
+	referenced.objectSubId = 0;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	/* dependencies on functions */
+	referenced.classId = ProcedureRelationId;
+	referenced.objectSubId = 0;
+
+	referenced.objectId = prs->prsstart;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	referenced.objectId = prs->prstoken;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	referenced.objectId = prs->prsend;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	referenced.objectId = prs->prslextype;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	if (OidIsValid(prs->prsheadline))
+	{
+		referenced.objectId = prs->prsheadline;
+		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+	}
+}
+
+/*
+ * CREATE TEXT SEARCH PARSER
+ */
+void
+DefineTSParser(List *names, List *parameters)
+{
+	char	   *prsname;
+	ListCell   *pl;
+	Relation	prsRel;
+	HeapTuple	tup;
+	Datum		values[Natts_pg_ts_parser];
+	bool		nulls[Natts_pg_ts_parser];
+	NameData	pname;
+	Oid			prsOid;
+	Oid			namespaceoid;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("must be superuser to create text search parsers")));
+
+	/* Convert list of names to a name and namespace */
+	namespaceoid = QualifiedNameGetCreationNamespace(names, &prsname);
+
+	/* initialize tuple fields with name/namespace */
+	memset(values, 0, sizeof(values));
+	memset(nulls, false, sizeof(nulls));
+
+	namestrcpy(&pname, prsname);
+	values[Anum_pg_ts_parser_prsname - 1] = NameGetDatum(&pname);
+	values[Anum_pg_ts_parser_prsnamespace - 1] = ObjectIdGetDatum(namespaceoid);
+
+	/*
+	 * loop over the definition list and extract the information we need.
+	 */
+	foreach(pl, parameters)
+	{
+		DefElem    *defel = (DefElem *) lfirst(pl);
+
+		if (pg_strcasecmp(defel->defname, "start") == 0)
+		{
+			values[Anum_pg_ts_parser_prsstart - 1] =
+				get_ts_parser_func(defel, Anum_pg_ts_parser_prsstart);
+		}
+		else if (pg_strcasecmp(defel->defname, "gettoken") == 0)
+		{
+			values[Anum_pg_ts_parser_prstoken - 1] =
+				get_ts_parser_func(defel, Anum_pg_ts_parser_prstoken);
+		}
+		else if (pg_strcasecmp(defel->defname, "end") == 0)
+		{
+			values[Anum_pg_ts_parser_prsend - 1] =
+				get_ts_parser_func(defel, Anum_pg_ts_parser_prsend);
+		}
+		else if (pg_strcasecmp(defel->defname, "headline") == 0)
+		{
+			values[Anum_pg_ts_parser_prsheadline - 1] =
+				get_ts_parser_func(defel, Anum_pg_ts_parser_prsheadline);
+		}
+		else if (pg_strcasecmp(defel->defname, "lextypes") == 0)
+		{
+			values[Anum_pg_ts_parser_prslextype - 1] =
+				get_ts_parser_func(defel, Anum_pg_ts_parser_prslextype);
+		}
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("text search parser parameter \"%s\" not recognized",
+						defel->defname)));
+	}
+
+	/*
+	 * Validation
+	 */
+	if (!OidIsValid(DatumGetObjectId(values[Anum_pg_ts_parser_prsstart - 1])))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("text search parser start method is required")));
+
+	if (!OidIsValid(DatumGetObjectId(values[Anum_pg_ts_parser_prstoken - 1])))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("text search parser gettoken method is required")));
+
+	if (!OidIsValid(DatumGetObjectId(values[Anum_pg_ts_parser_prsend - 1])))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("text search parser end method is required")));
+
+	if (!OidIsValid(DatumGetObjectId(values[Anum_pg_ts_parser_prslextype - 1])))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("text search parser lextypes method is required")));
+
+	/*
+	 * Looks good, insert
+	 */
+	prsRel = heap_open(TSParserRelationId, RowExclusiveLock);
+
+	tup = heap_form_tuple(prsRel->rd_att, values, nulls);
+
+	prsOid = simple_heap_insert(prsRel, tup);
+
+	CatalogUpdateIndexes(prsRel, tup);
+
+	makeParserDependencies(tup);
+
+	heap_freetuple(tup);
+
+	heap_close(prsRel, RowExclusiveLock);
+}
+
+/*
+ * DROP TEXT SEARCH PARSER
+ */
+void
+RemoveTSParser(List *names, DropBehavior behavior, bool missing_ok)
+{
+	Oid			prsOid;
+	ObjectAddress object;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("must be superuser to drop text search parsers")));
+
+	prsOid = TSParserGetPrsid(names, true);
+	if (!OidIsValid(prsOid))
+	{
+		if (!missing_ok)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("text search parser \"%s\" does not exist",
+							NameListToString(names))));
+		}
+		else
+		{
+			ereport(NOTICE,
+				(errmsg("text search parser \"%s\" does not exist, skipping",
+						NameListToString(names))));
+		}
+		return;
+	}
+
+	object.classId = TSParserRelationId;
+	object.objectId = prsOid;
+	object.objectSubId = 0;
+
+	performDeletion(&object, behavior);
+}
+
+/*
+ * Guts of TS parser deletion.
+ */
+void
+RemoveTSParserById(Oid prsId)
+{
+	Relation	relation;
+	HeapTuple	tup;
+
+	relation = heap_open(TSParserRelationId, RowExclusiveLock);
+
+	tup = SearchSysCache(TSPARSEROID,
+						 ObjectIdGetDatum(prsId),
+						 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search parser %u", prsId);
+
+	simple_heap_delete(relation, &tup->t_self);
+
+	ReleaseSysCache(tup);
+
+	heap_close(relation, RowExclusiveLock);
+}
+
+/*
+ * ALTER TEXT SEARCH PARSER RENAME
+ */
+void
+RenameTSParser(List *oldname, const char *newname)
+{
+	HeapTuple	tup;
+	Relation	rel;
+	Oid			prsId;
+	Oid			namespaceOid;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("must be superuser to rename text search parsers")));
+
+	rel = heap_open(TSParserRelationId, RowExclusiveLock);
+
+	prsId = TSParserGetPrsid(oldname, false);
+
+	tup = SearchSysCacheCopy(TSPARSEROID,
+							 ObjectIdGetDatum(prsId),
+							 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search parser %u", prsId);
+
+	namespaceOid = ((Form_pg_ts_parser) GETSTRUCT(tup))->prsnamespace;
+
+	if (SearchSysCacheExists(TSPARSERNAMENSP,
+							 PointerGetDatum(newname),
+							 ObjectIdGetDatum(namespaceOid),
+							 0, 0))
+		ereport(ERROR,
+				(errcode(ERRCODE_DUPLICATE_OBJECT),
+				 errmsg("text search parser \"%s\" already exists",
+						newname)));
+
+	namestrcpy(&(((Form_pg_ts_parser) GETSTRUCT(tup))->prsname), newname);
+	simple_heap_update(rel, &tup->t_self, tup);
+	CatalogUpdateIndexes(rel, tup);
+
+	heap_close(rel, NoLock);
+	heap_freetuple(tup);
+}
+
+/* ---------------------- TS Dictionary commands -----------------------*/
+
+/*
+ * make pg_depend entries for a new pg_ts_dict entry
+ */
+static void
+makeDictionaryDependencies(HeapTuple tuple)
+{
+	Form_pg_ts_dict dict = (Form_pg_ts_dict) GETSTRUCT(tuple);
+	ObjectAddress myself,
+				referenced;
+
+	myself.classId = TSDictionaryRelationId;
+	myself.objectId = HeapTupleGetOid(tuple);
+	myself.objectSubId = 0;
+
+	/* dependency on namespace */
+	referenced.classId = NamespaceRelationId;
+	referenced.objectId = dict->dictnamespace;
+	referenced.objectSubId = 0;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	/* dependency on owner */
+	recordDependencyOnOwner(myself.classId, myself.objectId, dict->dictowner);
+
+	/* dependency on template */
+	referenced.classId = TSTemplateRelationId;
+	referenced.objectId = dict->dicttemplate;
+	referenced.objectSubId = 0;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+}
+
+/*
+ * verify that a template's init method accepts a proposed option list
+ */
+static void
+verify_dictoptions(Oid tmplId, List *dictoptions)
+{
+	HeapTuple	tup;
+	Form_pg_ts_template tform;
+	Oid			initmethod;
+
+	/*
+	 * Suppress this test when running in a standalone backend.  This is a
+	 * hack to allow initdb to create prefab dictionaries that might not
+	 * actually be usable in template1's encoding (due to using external files
+	 * that can't be translated into template1's encoding).  We want to create
+	 * them anyway, since they might be usable later in other databases.
+	 */
+	if (!IsUnderPostmaster)
+		return;
+
+	tup = SearchSysCache(TSTEMPLATEOID,
+						 ObjectIdGetDatum(tmplId),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search template %u",
+			 tmplId);
+	tform = (Form_pg_ts_template) GETSTRUCT(tup);
+
+	initmethod = tform->tmplinit;
+
+	if (!OidIsValid(initmethod))
+	{
+		/* If there is no init method, disallow any options */
+		if (dictoptions)
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+				errmsg("text search template \"%s\" does not accept options",
+					   NameStr(tform->tmplname))));
+	}
+	else
+	{
+		/*
+		 * Copy the options just in case init method thinks it can scribble on
+		 * them ...
+		 */
+		dictoptions = copyObject(dictoptions);
+
+		/*
+		 * Call the init method and see if it complains.  We don't worry about
+		 * it leaking memory, since our command will soon be over anyway.
+		 */
+		(void) OidFunctionCall1(initmethod, PointerGetDatum(dictoptions));
+	}
+
+	ReleaseSysCache(tup);
+}
+
+/*
+ * CREATE TEXT SEARCH DICTIONARY
+ */
+void
+DefineTSDictionary(List *names, List *parameters)
+{
+	ListCell   *pl;
+	Relation	dictRel;
+	HeapTuple	tup;
+	Datum		values[Natts_pg_ts_dict];
+	bool		nulls[Natts_pg_ts_dict];
+	NameData	dname;
+	Oid			templId = InvalidOid;
+	List	   *dictoptions = NIL;
+	Oid			dictOid;
+	Oid			namespaceoid;
+	AclResult	aclresult;
+	char	   *dictname;
+
+	/* Convert list of names to a name and namespace */
+	namespaceoid = QualifiedNameGetCreationNamespace(names, &dictname);
+
+	/* Check we have creation rights in target namespace */
+	aclresult = pg_namespace_aclcheck(namespaceoid, GetUserId(), ACL_CREATE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					   get_namespace_name(namespaceoid));
+
+	/*
+	 * loop over the definition list and extract the information we need.
+	 */
+	foreach(pl, parameters)
+	{
+		DefElem    *defel = (DefElem *) lfirst(pl);
+
+		if (pg_strcasecmp(defel->defname, "template") == 0)
+		{
+			templId = TSTemplateGetTmplid(defGetQualifiedName(defel), false);
+		}
+		else
+		{
+			/* Assume it's an option for the dictionary itself */
+			dictoptions = lappend(dictoptions, defel);
+		}
+	}
+
+	/*
+	 * Validation
+	 */
+	if (!OidIsValid(templId))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("text search template is required")));
+
+	verify_dictoptions(templId, dictoptions);
+
+	/*
+	 * Looks good, insert
+	 */
+	memset(values, 0, sizeof(values));
+	memset(nulls, false, sizeof(nulls));
+
+	namestrcpy(&dname, dictname);
+	values[Anum_pg_ts_dict_dictname - 1] = NameGetDatum(&dname);
+	values[Anum_pg_ts_dict_dictnamespace - 1] = ObjectIdGetDatum(namespaceoid);
+	values[Anum_pg_ts_dict_dictowner - 1] = ObjectIdGetDatum(GetUserId());
+	values[Anum_pg_ts_dict_dicttemplate - 1] = ObjectIdGetDatum(templId);
+	if (dictoptions)
+		values[Anum_pg_ts_dict_dictinitoption - 1] =
+			PointerGetDatum(serialize_deflist(dictoptions));
+	else
+		nulls[Anum_pg_ts_dict_dictinitoption - 1] = true;
+
+	dictRel = heap_open(TSDictionaryRelationId, RowExclusiveLock);
+
+	tup = heap_form_tuple(dictRel->rd_att, values, nulls);
+
+	dictOid = simple_heap_insert(dictRel, tup);
+
+	CatalogUpdateIndexes(dictRel, tup);
+
+	makeDictionaryDependencies(tup);
+
+	heap_freetuple(tup);
+
+	heap_close(dictRel, RowExclusiveLock);
+}
+
+/*
+ * ALTER TEXT SEARCH DICTIONARY RENAME
+ */
+void
+RenameTSDictionary(List *oldname, const char *newname)
+{
+	HeapTuple	tup;
+	Relation	rel;
+	Oid			dictId;
+	Oid			namespaceOid;
+	AclResult	aclresult;
+
+	rel = heap_open(TSDictionaryRelationId, RowExclusiveLock);
+
+	dictId = TSDictionaryGetDictid(oldname, false);
+
+	tup = SearchSysCacheCopy(TSDICTOID,
+							 ObjectIdGetDatum(dictId),
+							 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 dictId);
+
+	namespaceOid = ((Form_pg_ts_dict) GETSTRUCT(tup))->dictnamespace;
+
+	if (SearchSysCacheExists(TSDICTNAMENSP,
+							 PointerGetDatum(newname),
+							 ObjectIdGetDatum(namespaceOid),
+							 0, 0))
+		ereport(ERROR,
+				(errcode(ERRCODE_DUPLICATE_OBJECT),
+				 errmsg("text search dictionary \"%s\" already exists",
+						newname)));
+
+	/* must be owner */
+	if (!pg_ts_dict_ownercheck(dictId, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSDICTIONARY,
+					   NameListToString(oldname));
+
+	/* must have CREATE privilege on namespace */
+	aclresult = pg_namespace_aclcheck(namespaceOid, GetUserId(), ACL_CREATE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					   get_namespace_name(namespaceOid));
+
+	namestrcpy(&(((Form_pg_ts_dict) GETSTRUCT(tup))->dictname), newname);
+	simple_heap_update(rel, &tup->t_self, tup);
+	CatalogUpdateIndexes(rel, tup);
+
+	heap_close(rel, NoLock);
+	heap_freetuple(tup);
+}
+
+/*
+ * DROP TEXT SEARCH DICTIONARY
+ */
+void
+RemoveTSDictionary(List *names, DropBehavior behavior, bool missing_ok)
+{
+	Oid			dictOid;
+	ObjectAddress object;
+	HeapTuple	tup;
+	Oid			namespaceId;
+
+	dictOid = TSDictionaryGetDictid(names, true);
+	if (!OidIsValid(dictOid))
+	{
+		if (!missing_ok)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("text search dictionary \"%s\" does not exist",
+							NameListToString(names))));
+		}
+		else
+		{
+			ereport(NOTICE,
+			(errmsg("text search dictionary \"%s\" does not exist, skipping",
+					NameListToString(names))));
+		}
+		return;
+	}
+
+	tup = SearchSysCache(TSDICTOID,
+						 ObjectIdGetDatum(dictOid),
+						 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 dictOid);
+
+	/* Permission check: must own dictionary or its namespace */
+	namespaceId = ((Form_pg_ts_dict) GETSTRUCT(tup))->dictnamespace;
+	if (!pg_ts_dict_ownercheck(dictOid, GetUserId()) &&
+		!pg_namespace_ownercheck(namespaceId, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSDICTIONARY,
+					   NameListToString(names));
+
+	ReleaseSysCache(tup);
+
+	object.classId = TSDictionaryRelationId;
+	object.objectId = dictOid;
+	object.objectSubId = 0;
+
+	performDeletion(&object, behavior);
+}
+
+/*
+ * Guts of TS dictionary deletion.
+ */
+void
+RemoveTSDictionaryById(Oid dictId)
+{
+	Relation	relation;
+	HeapTuple	tup;
+
+	relation = heap_open(TSDictionaryRelationId, RowExclusiveLock);
+
+	tup = SearchSysCache(TSDICTOID,
+						 ObjectIdGetDatum(dictId),
+						 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 dictId);
+
+	simple_heap_delete(relation, &tup->t_self);
+
+	ReleaseSysCache(tup);
+
+	heap_close(relation, RowExclusiveLock);
+}
+
+/*
+ * ALTER TEXT SEARCH DICTIONARY
+ */
+void
+AlterTSDictionary(AlterTSDictionaryStmt *stmt)
+{
+	HeapTuple	tup,
+				newtup;
+	Relation	rel;
+	Oid			dictId;
+	ListCell   *pl;
+	List	   *dictoptions;
+	Datum		opt;
+	bool		isnull;
+	Datum		repl_val[Natts_pg_ts_dict];
+	char		repl_null[Natts_pg_ts_dict];
+	char		repl_repl[Natts_pg_ts_dict];
+
+	dictId = TSDictionaryGetDictid(stmt->dictname, false);
+
+	rel = heap_open(TSDictionaryRelationId, RowExclusiveLock);
+
+	tup = SearchSysCache(TSDICTOID,
+						 ObjectIdGetDatum(dictId),
+						 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 dictId);
+
+	/* must be owner */
+	if (!pg_ts_dict_ownercheck(dictId, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSDICTIONARY,
+					   NameListToString(stmt->dictname));
+
+	/* deserialize the existing set of options */
+	opt = SysCacheGetAttr(TSDICTOID, tup,
+						  Anum_pg_ts_dict_dictinitoption,
+						  &isnull);
+	if (isnull)
+		dictoptions = NIL;
+	else
+		dictoptions = deserialize_deflist(opt);
+
+	/*
+	 * Modify the options list as per specified changes
+	 */
+	foreach(pl, stmt->options)
+	{
+		DefElem    *defel = (DefElem *) lfirst(pl);
+		ListCell   *cell;
+		ListCell   *prev;
+		ListCell   *next;
+
+		/*
+		 * Remove any matches ...
+		 */
+		prev = NULL;
+		for (cell = list_head(dictoptions); cell; cell = next)
+		{
+			DefElem    *oldel = (DefElem *) lfirst(cell);
+
+			next = lnext(cell);
+			if (pg_strcasecmp(oldel->defname, defel->defname) == 0)
+				dictoptions = list_delete_cell(dictoptions, cell, prev);
+			else
+				prev = cell;
+		}
+
+		/*
+		 * and add new value if it's got one
+		 */
+		if (defel->arg)
+			dictoptions = lappend(dictoptions, defel);
+	}
+
+	/*
+	 * Validate
+	 */
+	verify_dictoptions(((Form_pg_ts_dict) GETSTRUCT(tup))->dicttemplate,
+					   dictoptions);
+
+	/*
+	 * Looks good, update
+	 */
+	memset(repl_val, 0, sizeof(repl_val));
+	memset(repl_null, false, sizeof(repl_null));
+	memset(repl_repl, false, sizeof(repl_repl));
+
+	if (dictoptions)
+		repl_val[Anum_pg_ts_dict_dictinitoption - 1] =
+			PointerGetDatum(serialize_deflist(dictoptions));
+	else
+		repl_null[Anum_pg_ts_dict_dictinitoption - 1] = true;
+	repl_repl[Anum_pg_ts_dict_dictinitoption - 1] = true;
+
+	newtup = heap_modify_tuple(tup, RelationGetDescr(rel),
+							  repl_val, repl_null, repl_repl);
+
+	simple_heap_update(rel, &newtup->t_self, newtup);
+
+	CatalogUpdateIndexes(rel, newtup);
+
+	/*
+	 * NOTE: because we only support altering the options, not the template,
+	 * there is no need to update dependencies.  This might have to change if
+	 * the options ever reference inside-the-database objects.
+	 */
+
+	heap_freetuple(newtup);
+	ReleaseSysCache(tup);
+
+	heap_close(rel, RowExclusiveLock);
+}
+
+/*
+ * ALTER TEXT SEARCH DICTIONARY OWNER
+ */
+void
+AlterTSDictionaryOwner(List *name, Oid newOwnerId)
+{
+	HeapTuple	tup;
+	Relation	rel;
+	Oid			dictId;
+	Oid			namespaceOid;
+	AclResult	aclresult;
+	Form_pg_ts_dict form;
+
+	rel = heap_open(TSDictionaryRelationId, RowExclusiveLock);
+
+	dictId = TSDictionaryGetDictid(name, false);
+
+	tup = SearchSysCacheCopy(TSDICTOID,
+							 ObjectIdGetDatum(dictId),
+							 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 dictId);
+
+	form = (Form_pg_ts_dict) GETSTRUCT(tup);
+	namespaceOid = form->dictnamespace;
+
+	if (form->dictowner != newOwnerId)
+	{
+		/* Superusers can always do it */
+		if (!superuser())
+		{
+			/* must be owner */
+			if (!pg_ts_dict_ownercheck(dictId, GetUserId()))
+				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSDICTIONARY,
+							   NameListToString(name));
+
+			/* Must be able to become new owner */
+			check_is_member_of_role(GetUserId(), newOwnerId);
+
+			/* New owner must have CREATE privilege on namespace */
+			aclresult = pg_namespace_aclcheck(namespaceOid, newOwnerId, ACL_CREATE);
+			if (aclresult != ACLCHECK_OK)
+				aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+							   get_namespace_name(namespaceOid));
+		}
+
+		form->dictowner = newOwnerId;
+
+		simple_heap_update(rel, &tup->t_self, tup);
+		CatalogUpdateIndexes(rel, tup);
+
+		/* Update owner dependency reference */
+		changeDependencyOnOwner(TSDictionaryRelationId, HeapTupleGetOid(tup),
+								newOwnerId);
+	}
+
+	heap_close(rel, NoLock);
+	heap_freetuple(tup);
+}
+
+/* ---------------------- TS Template commands -----------------------*/
+
+/*
+ * lookup a template support function and return its OID (as a Datum)
+ *
+ * attnum is the pg_ts_template column the function will go into
+ */
+static Datum
+get_ts_template_func(DefElem *defel, int attnum)
+{
+	List	   *funcName = defGetQualifiedName(defel);
+	Oid			typeId[4];
+	Oid			retTypeId;
+	int			nargs;
+	Oid			procOid;
+
+	retTypeId = INTERNALOID;
+	typeId[0] = INTERNALOID;
+	typeId[1] = INTERNALOID;
+	typeId[2] = INTERNALOID;
+	typeId[3] = INTERNALOID;
+	switch (attnum)
+	{
+		case Anum_pg_ts_template_tmplinit:
+			nargs = 1;
+			break;
+		case Anum_pg_ts_template_tmpllexize:
+			nargs = 4;
+			break;
+		default:
+			/* should not be here */
+			elog(ERROR, "unrecognized attribute for text search template: %d",
+				 attnum);
+			nargs = 0;			/* keep compiler quiet */
+	}
+
+	procOid = LookupFuncName(funcName, nargs, typeId, false);
+	if (get_func_rettype(procOid) != retTypeId)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("function %s should return type %s",
+						func_signature_string(funcName, nargs, typeId),
+						format_type_be(retTypeId))));
+
+	return ObjectIdGetDatum(procOid);
+}
+
+/*
+ * make pg_depend entries for a new pg_ts_template entry
+ */
+static void
+makeTSTemplateDependencies(HeapTuple tuple)
+{
+	Form_pg_ts_template tmpl = (Form_pg_ts_template) GETSTRUCT(tuple);
+	ObjectAddress myself,
+				referenced;
+
+	myself.classId = TSTemplateRelationId;
+	myself.objectId = HeapTupleGetOid(tuple);
+	myself.objectSubId = 0;
+
+	/* dependency on namespace */
+	referenced.classId = NamespaceRelationId;
+	referenced.objectId = tmpl->tmplnamespace;
+	referenced.objectSubId = 0;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	/* dependencies on functions */
+	referenced.classId = ProcedureRelationId;
+	referenced.objectSubId = 0;
+
+	referenced.objectId = tmpl->tmpllexize;
+	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+	if (OidIsValid(tmpl->tmplinit))
+	{
+		referenced.objectId = tmpl->tmplinit;
+		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+	}
+}
+
+/*
+ * CREATE TEXT SEARCH TEMPLATE
+ */
+void
+DefineTSTemplate(List *names, List *parameters)
+{
+	ListCell   *pl;
+	Relation	tmplRel;
+	HeapTuple	tup;
+	Datum		values[Natts_pg_ts_template];
+	bool		nulls[Natts_pg_ts_template];
+	NameData	dname;
+	int			i;
+	Oid			dictOid;
+	Oid			namespaceoid;
+	char	   *tmplname;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+			   errmsg("must be superuser to create text search templates")));
+
+	/* Convert list of names to a name and namespace */
+	namespaceoid = QualifiedNameGetCreationNamespace(names, &tmplname);
+
+	for (i = 0; i < Natts_pg_ts_template; i++)
+	{
+		nulls[i] = false;
+		values[i] = ObjectIdGetDatum(InvalidOid);
+	}
+
+	namestrcpy(&dname, tmplname);
+	values[Anum_pg_ts_template_tmplname - 1] = NameGetDatum(&dname);
+	values[Anum_pg_ts_template_tmplnamespace - 1] = ObjectIdGetDatum(namespaceoid);
+
+	/*
+	 * loop over the definition list and extract the information we need.
+	 */
+	foreach(pl, parameters)
+	{
+		DefElem    *defel = (DefElem *) lfirst(pl);
+
+		if (pg_strcasecmp(defel->defname, "init") == 0)
+		{
+			values[Anum_pg_ts_template_tmplinit - 1] =
+				get_ts_template_func(defel, Anum_pg_ts_template_tmplinit);
+			nulls[Anum_pg_ts_template_tmplinit - 1] = false;
+		}
+		else if (pg_strcasecmp(defel->defname, "lexize") == 0)
+		{
+			values[Anum_pg_ts_template_tmpllexize - 1] =
+				get_ts_template_func(defel, Anum_pg_ts_template_tmpllexize);
+			nulls[Anum_pg_ts_template_tmpllexize - 1] = false;
+		}
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+			   errmsg("text search template parameter \"%s\" not recognized",
+					  defel->defname)));
+	}
+
+	/*
+	 * Validation
+	 */
+	if (!OidIsValid(DatumGetObjectId(values[Anum_pg_ts_template_tmpllexize - 1])))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("text search template lexize method is required")));
+
+	/*
+	 * Looks good, insert
+	 */
+
+	tmplRel = heap_open(TSTemplateRelationId, RowExclusiveLock);
+
+	tup = heap_form_tuple(tmplRel->rd_att, values, nulls);
+
+	dictOid = simple_heap_insert(tmplRel, tup);
+
+	CatalogUpdateIndexes(tmplRel, tup);
+
+	makeTSTemplateDependencies(tup);
+
+	heap_freetuple(tup);
+
+	heap_close(tmplRel, RowExclusiveLock);
+}
+
+/*
+ * ALTER TEXT SEARCH TEMPLATE RENAME
+ */
+void
+RenameTSTemplate(List *oldname, const char *newname)
+{
+	HeapTuple	tup;
+	Relation	rel;
+	Oid			tmplId;
+	Oid			namespaceOid;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+			   errmsg("must be superuser to rename text search templates")));
+
+	rel = heap_open(TSTemplateRelationId, RowExclusiveLock);
+
+	tmplId = TSTemplateGetTmplid(oldname, false);
+
+	tup = SearchSysCacheCopy(TSTEMPLATEOID,
+							 ObjectIdGetDatum(tmplId),
+							 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search template %u",
+			 tmplId);
+
+	namespaceOid = ((Form_pg_ts_template) GETSTRUCT(tup))->tmplnamespace;
+
+	if (SearchSysCacheExists(TSTEMPLATENAMENSP,
+							 PointerGetDatum(newname),
+							 ObjectIdGetDatum(namespaceOid),
+							 0, 0))
+		ereport(ERROR,
+				(errcode(ERRCODE_DUPLICATE_OBJECT),
+				 errmsg("text search template \"%s\" already exists",
+						newname)));
+
+	namestrcpy(&(((Form_pg_ts_template) GETSTRUCT(tup))->tmplname), newname);
+	simple_heap_update(rel, &tup->t_self, tup);
+	CatalogUpdateIndexes(rel, tup);
+
+	heap_close(rel, NoLock);
+	heap_freetuple(tup);
+}
+
+/*
+ * DROP TEXT SEARCH TEMPLATE
+ */
+void
+RemoveTSTemplate(List *names, DropBehavior behavior, bool missing_ok)
+{
+	Oid			tmplOid;
+	ObjectAddress object;
+
+	if (!superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("must be superuser to drop text search templates")));
+
+	tmplOid = TSTemplateGetTmplid(names, true);
+	if (!OidIsValid(tmplOid))
+	{
+		if (!missing_ok)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("text search template \"%s\" does not exist",
+							NameListToString(names))));
+		}
+		else
+		{
+			ereport(NOTICE,
+			  (errmsg("text search template \"%s\" does not exist, skipping",
+					  NameListToString(names))));
+		}
+		return;
+	}
+
+	object.classId = TSTemplateRelationId;
+	object.objectId = tmplOid;
+	object.objectSubId = 0;
+
+	performDeletion(&object, behavior);
+}
+
+/*
+ * Guts of TS template deletion.
+ */
+void
+RemoveTSTemplateById(Oid tmplId)
+{
+	Relation	relation;
+	HeapTuple	tup;
+
+	relation = heap_open(TSTemplateRelationId, RowExclusiveLock);
+
+	tup = SearchSysCache(TSTEMPLATEOID,
+						 ObjectIdGetDatum(tmplId),
+						 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search template %u",
+			 tmplId);
+
+	simple_heap_delete(relation, &tup->t_self);
+
+	ReleaseSysCache(tup);
+
+	heap_close(relation, RowExclusiveLock);
+}
+
+/* ---------------------- TS Configuration commands -----------------------*/
+
+/*
+ * Finds syscache tuple of configuration.
+ * Returns NULL if no such cfg.
+ */
+static HeapTuple
+GetTSConfigTuple(List *names)
+{
+	HeapTuple	tup;
+	Oid			cfgId;
+
+	cfgId = TSConfigGetCfgid(names, true);
+	if (!OidIsValid(cfgId))
+		return NULL;
+
+	tup = SearchSysCache(TSCONFIGOID,
+						 ObjectIdGetDatum(cfgId),
+						 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search configuration %u",
+			 cfgId);
+
+	return tup;
+}
+
+/*
+ * make pg_depend entries for a new or updated pg_ts_config entry
+ *
+ * Pass opened pg_ts_config_map relation if there might be any config map
+ * entries for the config.
+ */
+static void
+makeConfigurationDependencies(HeapTuple tuple, bool removeOld,
+							  Relation mapRel)
+{
+	Form_pg_ts_config cfg = (Form_pg_ts_config) GETSTRUCT(tuple);
+	ObjectAddresses *addrs;
+	ObjectAddress myself,
+				referenced;
+
+	myself.classId = TSConfigRelationId;
+	myself.objectId = HeapTupleGetOid(tuple);
+	myself.objectSubId = 0;
+
+	/* for ALTER case, first flush old dependencies */
+	if (removeOld)
+	{
+		deleteDependencyRecordsFor(myself.classId, myself.objectId);
+		deleteSharedDependencyRecordsFor(myself.classId, myself.objectId);
+	}
+
+	/*
+	 * We use an ObjectAddresses list to remove possible duplicate
+	 * dependencies from the config map info.  The pg_ts_config items
+	 * shouldn't be duplicates, but might as well fold them all into one call.
+	 */
+	addrs = new_object_addresses();
+
+	/* dependency on namespace */
+	referenced.classId = NamespaceRelationId;
+	referenced.objectId = cfg->cfgnamespace;
+	referenced.objectSubId = 0;
+	add_exact_object_address(&referenced, addrs);
+
+	/* dependency on owner */
+	recordDependencyOnOwner(myself.classId, myself.objectId, cfg->cfgowner);
+
+	/* dependency on parser */
+	referenced.classId = TSParserRelationId;
+	referenced.objectId = cfg->cfgparser;
+	referenced.objectSubId = 0;
+	add_exact_object_address(&referenced, addrs);
+
+	/* dependencies on dictionaries listed in config map */
+	if (mapRel)
+	{
+		ScanKeyData skey;
+		SysScanDesc scan;
+		HeapTuple	maptup;
+
+		/* CCI to ensure we can see effects of caller's changes */
+		CommandCounterIncrement();
+
+		ScanKeyInit(&skey,
+					Anum_pg_ts_config_map_mapcfg,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(myself.objectId));
+
+		scan = systable_beginscan(mapRel, TSConfigMapIndexId, true,
+								  SnapshotNow, 1, &skey);
+
+		while (HeapTupleIsValid((maptup = systable_getnext(scan))))
+		{
+			Form_pg_ts_config_map cfgmap = (Form_pg_ts_config_map) GETSTRUCT(maptup);
+
+			referenced.classId = TSDictionaryRelationId;
+			referenced.objectId = cfgmap->mapdict;
+			referenced.objectSubId = 0;
+			add_exact_object_address(&referenced, addrs);
+		}
+
+		systable_endscan(scan);
+	}
+
+	/* Record 'em (this includes duplicate elimination) */
+	record_object_address_dependencies(&myself, addrs, DEPENDENCY_NORMAL);
+
+	free_object_addresses(addrs);
+}
+
+/*
+ * CREATE TEXT SEARCH CONFIGURATION
+ */
+void
+DefineTSConfiguration(List *names, List *parameters)
+{
+	Relation	cfgRel;
+	Relation	mapRel = NULL;
+	HeapTuple	tup;
+	Datum		values[Natts_pg_ts_config];
+	bool		nulls[Natts_pg_ts_config];
+	AclResult	aclresult;
+	Oid			namespaceoid;
+	char	   *cfgname;
+	NameData	cname;
+	Oid			sourceOid = InvalidOid;
+	Oid			prsOid = InvalidOid;
+	Oid			cfgOid;
+	ListCell   *pl;
+
+	/* Convert list of names to a name and namespace */
+	namespaceoid = QualifiedNameGetCreationNamespace(names, &cfgname);
+
+	/* Check we have creation rights in target namespace */
+	aclresult = pg_namespace_aclcheck(namespaceoid, GetUserId(), ACL_CREATE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					   get_namespace_name(namespaceoid));
+
+	/*
+	 * loop over the definition list and extract the information we need.
+	 */
+	foreach(pl, parameters)
+	{
+		DefElem    *defel = (DefElem *) lfirst(pl);
+
+		if (pg_strcasecmp(defel->defname, "parser") == 0)
+			prsOid = TSParserGetPrsid(defGetQualifiedName(defel), false);
+		else if (pg_strcasecmp(defel->defname, "copy") == 0)
+			sourceOid = TSConfigGetCfgid(defGetQualifiedName(defel), false);
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+					 errmsg("text search configuration parameter \"%s\" not recognized",
+							defel->defname)));
+	}
+
+	if (OidIsValid(sourceOid) && OidIsValid(prsOid))
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("cannot specify both PARSER and COPY options")));
+
+	/*
+	 * Look up source config if given.
+	 */
+	if (OidIsValid(sourceOid))
+	{
+		Form_pg_ts_config cfg;
+
+		tup = SearchSysCache(TSCONFIGOID,
+							 ObjectIdGetDatum(sourceOid),
+							 0, 0, 0);
+		if (!HeapTupleIsValid(tup))
+			elog(ERROR, "cache lookup failed for text search configuration %u",
+				 sourceOid);
+
+		cfg = (Form_pg_ts_config) GETSTRUCT(tup);
+
+		/* use source's parser */
+		prsOid = cfg->cfgparser;
+
+		ReleaseSysCache(tup);
+	}
+
+	/*
+	 * Validation
+	 */
+	if (!OidIsValid(prsOid))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("text search parser is required")));
+
+	/*
+	 * Looks good, build tuple and insert
+	 */
+	memset(values, 0, sizeof(values));
+	memset(nulls, false, sizeof(nulls));
+
+	namestrcpy(&cname, cfgname);
+	values[Anum_pg_ts_config_cfgname - 1] = NameGetDatum(&cname);
+	values[Anum_pg_ts_config_cfgnamespace - 1] = ObjectIdGetDatum(namespaceoid);
+	values[Anum_pg_ts_config_cfgowner - 1] = ObjectIdGetDatum(GetUserId());
+	values[Anum_pg_ts_config_cfgparser - 1] = ObjectIdGetDatum(prsOid);
+
+	cfgRel = heap_open(TSConfigRelationId, RowExclusiveLock);
+
+	tup = heap_form_tuple(cfgRel->rd_att, values, nulls);
+
+	cfgOid = simple_heap_insert(cfgRel, tup);
+
+	CatalogUpdateIndexes(cfgRel, tup);
+
+	if (OidIsValid(sourceOid))
+	{
+		/*
+		 * Copy token-dicts map from source config
+		 */
+		ScanKeyData skey;
+		SysScanDesc scan;
+		HeapTuple	maptup;
+
+		mapRel = heap_open(TSConfigMapRelationId, RowExclusiveLock);
+
+		ScanKeyInit(&skey,
+					Anum_pg_ts_config_map_mapcfg,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(sourceOid));
+
+		scan = systable_beginscan(mapRel, TSConfigMapIndexId, true,
+								  SnapshotNow, 1, &skey);
+
+		while (HeapTupleIsValid((maptup = systable_getnext(scan))))
+		{
+			Form_pg_ts_config_map cfgmap = (Form_pg_ts_config_map) GETSTRUCT(maptup);
+			HeapTuple	newmaptup;
+			Datum		mapvalues[Natts_pg_ts_config_map];
+			bool		mapnulls[Natts_pg_ts_config_map];
+
+			memset(mapvalues, 0, sizeof(mapvalues));
+			memset(mapnulls, false, sizeof(mapnulls));
+
+			mapvalues[Anum_pg_ts_config_map_mapcfg - 1] = cfgOid;
+			mapvalues[Anum_pg_ts_config_map_maptokentype - 1] = cfgmap->maptokentype;
+			mapvalues[Anum_pg_ts_config_map_mapseqno - 1] = cfgmap->mapseqno;
+			mapvalues[Anum_pg_ts_config_map_mapdict - 1] = cfgmap->mapdict;
+
+			newmaptup = heap_form_tuple(mapRel->rd_att, mapvalues, mapnulls);
+
+			simple_heap_insert(mapRel, newmaptup);
+
+			CatalogUpdateIndexes(mapRel, newmaptup);
+
+			heap_freetuple(newmaptup);
+		}
+
+		systable_endscan(scan);
+	}
+
+	makeConfigurationDependencies(tup, false, mapRel);
+
+	heap_freetuple(tup);
+
+	if (mapRel)
+		heap_close(mapRel, RowExclusiveLock);
+	heap_close(cfgRel, RowExclusiveLock);
+}
+
+/*
+ * ALTER TEXT SEARCH CONFIGURATION RENAME
+ */
+void
+RenameTSConfiguration(List *oldname, const char *newname)
+{
+	HeapTuple	tup;
+	Relation	rel;
+	Oid			cfgId;
+	AclResult	aclresult;
+	Oid			namespaceOid;
+
+	rel = heap_open(TSConfigRelationId, RowExclusiveLock);
+
+	cfgId = TSConfigGetCfgid(oldname, false);
+
+	tup = SearchSysCacheCopy(TSCONFIGOID,
+							 ObjectIdGetDatum(cfgId),
+							 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search configuration %u",
+			 cfgId);
+
+	namespaceOid = ((Form_pg_ts_config) GETSTRUCT(tup))->cfgnamespace;
+
+	if (SearchSysCacheExists(TSCONFIGNAMENSP,
+							 PointerGetDatum(newname),
+							 ObjectIdGetDatum(namespaceOid),
+							 0, 0))
+		ereport(ERROR,
+				(errcode(ERRCODE_DUPLICATE_OBJECT),
+				 errmsg("text search configuration \"%s\" already exists",
+						newname)));
+
+	/* must be owner */
+	if (!pg_ts_config_ownercheck(cfgId, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSCONFIGURATION,
+					   NameListToString(oldname));
+
+	/* must have CREATE privilege on namespace */
+	aclresult = pg_namespace_aclcheck(namespaceOid, GetUserId(), ACL_CREATE);
+	aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+				   get_namespace_name(namespaceOid));
+
+	namestrcpy(&(((Form_pg_ts_config) GETSTRUCT(tup))->cfgname), newname);
+	simple_heap_update(rel, &tup->t_self, tup);
+	CatalogUpdateIndexes(rel, tup);
+
+	heap_close(rel, NoLock);
+	heap_freetuple(tup);
+}
+
+/*
+ * DROP TEXT SEARCH CONFIGURATION
+ */
+void
+RemoveTSConfiguration(List *names, DropBehavior behavior, bool missing_ok)
+{
+	Oid			cfgOid;
+	Oid			namespaceId;
+	ObjectAddress object;
+	HeapTuple	tup;
+
+	tup = GetTSConfigTuple(names);
+
+	if (!HeapTupleIsValid(tup))
+	{
+		if (!missing_ok)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("text search configuration \"%s\" does not exist",
+							NameListToString(names))));
+		}
+		else
+		{
+			ereport(NOTICE,
+					(errmsg("text search configuration \"%s\" does not exist, skipping",
+							NameListToString(names))));
+		}
+		return;
+	}
+
+	/* Permission check: must own configuration or its namespace */
+	cfgOid = HeapTupleGetOid(tup);
+	namespaceId = ((Form_pg_ts_config) GETSTRUCT(tup))->cfgnamespace;
+	if (!pg_ts_config_ownercheck(cfgOid, GetUserId()) &&
+		!pg_namespace_ownercheck(namespaceId, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSCONFIGURATION,
+					   NameListToString(names));
+
+	ReleaseSysCache(tup);
+
+	object.classId = TSConfigRelationId;
+	object.objectId = cfgOid;
+	object.objectSubId = 0;
+
+	performDeletion(&object, behavior);
+}
+
+/*
+ * Guts of TS configuration deletion.
+ */
+void
+RemoveTSConfigurationById(Oid cfgId)
+{
+	Relation	relCfg,
+				relMap;
+	HeapTuple	tup;
+	ScanKeyData skey;
+	SysScanDesc scan;
+
+	/* Remove the pg_ts_config entry */
+	relCfg = heap_open(TSConfigRelationId, RowExclusiveLock);
+
+	tup = SearchSysCache(TSCONFIGOID,
+						 ObjectIdGetDatum(cfgId),
+						 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup))
+		elog(ERROR, "cache lookup failed for text search dictionary %u",
+			 cfgId);
+
+	simple_heap_delete(relCfg, &tup->t_self);
+
+	ReleaseSysCache(tup);
+
+	heap_close(relCfg, RowExclusiveLock);
+
+	/* Remove any pg_ts_config_map entries */
+	relMap = heap_open(TSConfigMapRelationId, RowExclusiveLock);
+
+	ScanKeyInit(&skey,
+				Anum_pg_ts_config_map_mapcfg,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(cfgId));
+
+	scan = systable_beginscan(relMap, TSConfigMapIndexId, true,
+							  SnapshotNow, 1, &skey);
+
+	while (HeapTupleIsValid((tup = systable_getnext(scan))))
+	{
+		simple_heap_delete(relMap, &tup->t_self);
+	}
+
+	systable_endscan(scan);
+
+	heap_close(relMap, RowExclusiveLock);
+}
+
+/*
+ * ALTER TEXT SEARCH CONFIGURATION OWNER
+ */
+void
+AlterTSConfigurationOwner(List *name, Oid newOwnerId)
+{
+	HeapTuple	tup;
+	Relation	rel;
+	Oid			cfgId;
+	AclResult	aclresult;
+	Oid			namespaceOid;
+	Form_pg_ts_config form;
+
+	rel = heap_open(TSConfigRelationId, RowExclusiveLock);
+
+	cfgId = TSConfigGetCfgid(name, false);
+
+	tup = SearchSysCacheCopy(TSCONFIGOID,
+							 ObjectIdGetDatum(cfgId),
+							 0, 0, 0);
+
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for text search configuration %u",
+			 cfgId);
+
+	form = (Form_pg_ts_config) GETSTRUCT(tup);
+	namespaceOid = form->cfgnamespace;
+
+	if (form->cfgowner != newOwnerId)
+	{
+		/* Superusers can always do it */
+		if (!superuser())
+		{
+			/* must be owner */
+			if (!pg_ts_config_ownercheck(cfgId, GetUserId()))
+				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSCONFIGURATION,
+							   NameListToString(name));
+
+			/* Must be able to become new owner */
+			check_is_member_of_role(GetUserId(), newOwnerId);
+
+			/* New owner must have CREATE privilege on namespace */
+			aclresult = pg_namespace_aclcheck(namespaceOid, newOwnerId, ACL_CREATE);
+			if (aclresult != ACLCHECK_OK)
+				aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+							   get_namespace_name(namespaceOid));
+		}
+
+		form->cfgowner = newOwnerId;
+
+		simple_heap_update(rel, &tup->t_self, tup);
+		CatalogUpdateIndexes(rel, tup);
+
+		/* Update owner dependency reference */
+		changeDependencyOnOwner(TSConfigRelationId, HeapTupleGetOid(tup),
+								newOwnerId);
+	}
+
+	heap_close(rel, NoLock);
+	heap_freetuple(tup);
+}
+
+/*
+ * ALTER TEXT SEARCH CONFIGURATION - main entry point
+ */
+void
+AlterTSConfiguration(AlterTSConfigurationStmt *stmt)
+{
+	HeapTuple	tup;
+	Relation	relMap;
+
+	/* Find the configuration */
+	tup = GetTSConfigTuple(stmt->cfgname);
+	if (!HeapTupleIsValid(tup))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("text search configuration \"%s\" does not exist",
+						NameListToString(stmt->cfgname))));
+
+	/* must be owner */
+	if (!pg_ts_config_ownercheck(HeapTupleGetOid(tup), GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSCONFIGURATION,
+					   NameListToString(stmt->cfgname));
+
+	relMap = heap_open(TSConfigMapRelationId, RowExclusiveLock);
+
+	/* Add or drop mappings */
+	if (stmt->dicts)
+		MakeConfigurationMapping(stmt, tup, relMap);
+	else if (stmt->tokentype)
+		DropConfigurationMapping(stmt, tup, relMap);
+
+	/* Update dependencies */
+	makeConfigurationDependencies(tup, true, relMap);
+
+	heap_close(relMap, RowExclusiveLock);
+
+	ReleaseSysCache(tup);
+}
+
+/*
+ * Translate a list of token type names to an array of token type numbers
+ */
+static int *
+getTokenTypes(Oid prsId, List *tokennames)
+{
+	TSParserCacheEntry *prs = lookup_ts_parser_cache(prsId);
+	LexDescr   *list;
+	int		   *res,
+				i,
+				ntoken;
+	ListCell   *tn;
+
+	ntoken = list_length(tokennames);
+	if (ntoken == 0)
+		return NULL;
+	res = (int *) palloc(sizeof(int) * ntoken);
+
+	if (!OidIsValid(prs->lextypeOid))
+		elog(ERROR, "method lextype isn't defined for text search parser %u",
+			 prsId);
+
+	/* OidFunctionCall0 is absent */
+	list = (LexDescr *) DatumGetPointer(OidFunctionCall1(prs->lextypeOid,
+														 (Datum) 0));
+
+	i = 0;
+	foreach(tn, tokennames)
+	{
+		Value	   *val = (Value *) lfirst(tn);
+		bool		found = false;
+		int			j;
+
+		j = 0;
+		while (list && list[j].lexid)
+		{
+			/* XXX should we use pg_strcasecmp here? */
+			if (strcmp(strVal(val), list[j].alias) == 0)
+			{
+				res[i] = list[j].lexid;
+				found = true;
+				break;
+			}
+			j++;
+		}
+		if (!found)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("token type \"%s\" does not exist",
+							strVal(val))));
+		i++;
+	}
+
+	return res;
+}
+
+/*
+ * ALTER TEXT SEARCH CONFIGURATION ADD/ALTER MAPPING
+ */
+static void
+MakeConfigurationMapping(AlterTSConfigurationStmt *stmt,
+						 HeapTuple tup, Relation relMap)
+{
+	Oid			cfgId = HeapTupleGetOid(tup);
+	ScanKeyData skey[2];
+	SysScanDesc scan;
+	HeapTuple	maptup;
+	int			i;
+	int			j;
+	Oid			prsId;
+	int		   *tokens,
+				ntoken;
+	Oid		   *dictIds;
+	int			ndict;
+	ListCell   *c;
+
+	prsId = ((Form_pg_ts_config) GETSTRUCT(tup))->cfgparser;
+
+	tokens = getTokenTypes(prsId, stmt->tokentype);
+	ntoken = list_length(stmt->tokentype);
+
+	if (stmt->override)
+	{
+		/*
+		 * delete maps for tokens if they exist and command was ALTER
+		 */
+		for (i = 0; i < ntoken; i++)
+		{
+			ScanKeyInit(&skey[0],
+						Anum_pg_ts_config_map_mapcfg,
+						BTEqualStrategyNumber, F_OIDEQ,
+						ObjectIdGetDatum(cfgId));
+			ScanKeyInit(&skey[1],
+						Anum_pg_ts_config_map_maptokentype,
+						BTEqualStrategyNumber, F_INT4EQ,
+						Int32GetDatum(tokens[i]));
+
+			scan = systable_beginscan(relMap, TSConfigMapIndexId, true,
+									  SnapshotNow, 2, skey);
+
+			while (HeapTupleIsValid((maptup = systable_getnext(scan))))
+			{
+				simple_heap_delete(relMap, &maptup->t_self);
+			}
+
+			systable_endscan(scan);
+		}
+	}
+
+	/*
+	 * Convert list of dictionary names to array of dict OIDs
+	 */
+	ndict = list_length(stmt->dicts);
+	dictIds = (Oid *) palloc(sizeof(Oid) * ndict);
+	i = 0;
+	foreach(c, stmt->dicts)
+	{
+		List	   *names = (List *) lfirst(c);
+
+		dictIds[i] = TSDictionaryGetDictid(names, false);
+		i++;
+	}
+
+	if (stmt->replace)
+	{
+		/*
+		 * Replace a specific dictionary in existing entries
+		 */
+		Oid			dictOld = dictIds[0],
+					dictNew = dictIds[1];
+
+		ScanKeyInit(&skey[0],
+					Anum_pg_ts_config_map_mapcfg,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(cfgId));
+
+		scan = systable_beginscan(relMap, TSConfigMapIndexId, true,
+								  SnapshotNow, 1, skey);
+
+		while (HeapTupleIsValid((maptup = systable_getnext(scan))))
+		{
+			Form_pg_ts_config_map cfgmap = (Form_pg_ts_config_map) GETSTRUCT(maptup);
+
+			/*
+			 * check if it's one of target token types
+			 */
+			if (tokens)
+			{
+				bool		tokmatch = false;
+
+				for (j = 0; j < ntoken; j++)
+				{
+					if (cfgmap->maptokentype == tokens[j])
+					{
+						tokmatch = true;
+						break;
+					}
+				}
+				if (!tokmatch)
+					continue;
+			}
+
+			/*
+			 * replace dictionary if match
+			 */
+			if (cfgmap->mapdict == dictOld)
+			{
+				Datum		repl_val[Natts_pg_ts_config_map];
+				bool		repl_null[Natts_pg_ts_config_map];
+				bool		repl_repl[Natts_pg_ts_config_map];
+				HeapTuple	newtup;
+
+				memset(repl_val, 0, sizeof(repl_val));
+				memset(repl_null, false, sizeof(repl_null));
+				memset(repl_repl, false, sizeof(repl_repl));
+
+				repl_val[Anum_pg_ts_config_map_mapdict - 1] = ObjectIdGetDatum(dictNew);
+				repl_repl[Anum_pg_ts_config_map_mapdict - 1] = true;
+
+				newtup = heap_modify_tuple(maptup,
+										  RelationGetDescr(relMap),
+										  repl_val, repl_null, repl_repl);
+				simple_heap_update(relMap, &newtup->t_self, newtup);
+
+				CatalogUpdateIndexes(relMap, newtup);
+			}
+		}
+
+		systable_endscan(scan);
+	}
+	else
+	{
+		/*
+		 * Insertion of new entries
+		 */
+		for (i = 0; i < ntoken; i++)
+		{
+			for (j = 0; j < ndict; j++)
+			{
+				Datum		values[Natts_pg_ts_config_map];
+				bool		nulls[Natts_pg_ts_config_map];
+
+				memset(nulls, false, sizeof(nulls));
+				values[Anum_pg_ts_config_map_mapcfg - 1] = ObjectIdGetDatum(cfgId);
+				values[Anum_pg_ts_config_map_maptokentype - 1] = Int32GetDatum(tokens[i]);
+				values[Anum_pg_ts_config_map_mapseqno - 1] = Int32GetDatum(j + 1);
+				values[Anum_pg_ts_config_map_mapdict - 1] = ObjectIdGetDatum(dictIds[j]);
+
+				tup = heap_form_tuple(relMap->rd_att, values, nulls);
+				simple_heap_insert(relMap, tup);
+				CatalogUpdateIndexes(relMap, tup);
+
+				heap_freetuple(tup);
+			}
+		}
+	}
+}
+
+/*
+ * ALTER TEXT SEARCH CONFIGURATION DROP MAPPING
+ */
+static void
+DropConfigurationMapping(AlterTSConfigurationStmt *stmt,
+						 HeapTuple tup, Relation relMap)
+{
+	Oid			cfgId = HeapTupleGetOid(tup);
+	ScanKeyData skey[2];
+	SysScanDesc scan;
+	HeapTuple	maptup;
+	int			i;
+	Oid			prsId;
+	int		   *tokens,
+				ntoken;
+	ListCell   *c;
+
+	prsId = ((Form_pg_ts_config) GETSTRUCT(tup))->cfgparser;
+
+	tokens = getTokenTypes(prsId, stmt->tokentype);
+	ntoken = list_length(stmt->tokentype);
+
+	i = 0;
+	foreach(c, stmt->tokentype)
+	{
+		Value	   *val = (Value *) lfirst(c);
+		bool		found = false;
+
+		ScanKeyInit(&skey[0],
+					Anum_pg_ts_config_map_mapcfg,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(cfgId));
+		ScanKeyInit(&skey[1],
+					Anum_pg_ts_config_map_maptokentype,
+					BTEqualStrategyNumber, F_INT4EQ,
+					Int32GetDatum(tokens[i]));
+
+		scan = systable_beginscan(relMap, TSConfigMapIndexId, true,
+								  SnapshotNow, 2, skey);
+
+		while (HeapTupleIsValid((maptup = systable_getnext(scan))))
+		{
+			simple_heap_delete(relMap, &maptup->t_self);
+			found = true;
+		}
+
+		systable_endscan(scan);
+
+		if (!found)
+		{
+			if (!stmt->missing_ok)
+			{
+				ereport(ERROR,
+						(errcode(ERRCODE_UNDEFINED_OBJECT),
+					   errmsg("mapping for token type \"%s\" does not exist",
+							  strVal(val))));
+			}
+			else
+			{
+				ereport(NOTICE,
+						(errmsg("mapping for token type \"%s\" does not exist, skipping",
+								strVal(val))));
+			}
+		}
+
+		i++;
+	}
+}
+
+
+/*
+ * Serialize dictionary options, producing a TEXT datum from a List of DefElem
+ *
+ * This is used to form the value stored in pg_ts_dict.dictinitoption.
+ * For the convenience of pg_dump, the output is formatted exactly as it
+ * would need to appear in CREATE TEXT SEARCH DICTIONARY to reproduce the
+ * same options.
+ *
+ * Note that we assume that only the textual representation of an option's
+ * value is interesting --- hence, non-string DefElems get forced to strings.
+ */
+text *
+serialize_deflist(List *deflist)
+{
+	text	   *result;
+	StringInfoData buf;
+	ListCell   *l;
+
+	initStringInfo(&buf);
+
+	foreach(l, deflist)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+		char	   *val = defGetString(defel);
+
+		appendStringInfo(&buf, "%s = ",
+						 quote_identifier(defel->defname));
+		/* If backslashes appear, force E syntax to determine their handling */
+		if (strchr(val, '\\'))
+			appendStringInfoChar(&buf, ESCAPE_STRING_SYNTAX);
+		appendStringInfoChar(&buf, '\'');
+		while (*val)
+		{
+			char		ch = *val++;
+
+			if (SQL_STR_DOUBLE(ch, true))
+				appendStringInfoChar(&buf, ch);
+			appendStringInfoChar(&buf, ch);
+		}
+		appendStringInfoChar(&buf, '\'');
+		if (lnext(l) != NULL)
+			appendStringInfo(&buf, ", ");
+	}
+
+	result = CStringGetTextP(buf.data);
+	pfree(buf.data);
+	return result;
+}
+
+/*
+ * Deserialize dictionary options, reconstructing a List of DefElem from TEXT
+ *
+ * This is also used for prsheadline options, so for backward compatibility
+ * we need to accept a few things serialize_deflist() will never emit:
+ * in particular, unquoted and double-quoted values.
+ */
+List *
+deserialize_deflist(Datum txt)
+{
+	text	   *in = DatumGetTextP(txt);		/* in case it's toasted */
+	List	   *result = NIL;
+	int			len = VARSIZE(in) - VARHDRSZ;
+	char	   *ptr,
+			   *endptr,
+			   *workspace,
+			   *wsptr = NULL,
+			   *startvalue = NULL;
+	typedef enum
+	{
+		CS_WAITKEY,
+		CS_INKEY,
+		CS_INQKEY,
+		CS_WAITEQ,
+		CS_WAITVALUE,
+		CS_INSQVALUE,
+		CS_INDQVALUE,
+		CS_INWVALUE
+	} ds_state;
+	ds_state	state = CS_WAITKEY;
+
+	workspace = (char *) palloc(len + 1);		/* certainly enough room */
+	ptr = VARDATA(in);
+	endptr = ptr + len;
+	for (; ptr < endptr; ptr++)
+	{
+		switch (state)
+		{
+			case CS_WAITKEY:
+				if (isspace((unsigned char) *ptr) || *ptr == ',')
+					continue;
+				if (*ptr == '"')
+				{
+					wsptr = workspace;
+					state = CS_INQKEY;
+				}
+				else
+				{
+					wsptr = workspace;
+					*wsptr++ = *ptr;
+					state = CS_INKEY;
+				}
+				break;
+			case CS_INKEY:
+				if (isspace((unsigned char) *ptr))
+				{
+					*wsptr++ = '\0';
+					state = CS_WAITEQ;
+				}
+				else if (*ptr == '=')
+				{
+					*wsptr++ = '\0';
+					state = CS_WAITVALUE;
+				}
+				else
+				{
+					*wsptr++ = *ptr;
+				}
+				break;
+			case CS_INQKEY:
+				if (*ptr == '"')
+				{
+					if (ptr + 1 < endptr && ptr[1] == '"')
+					{
+						/* copy only one of the two quotes */
+						*wsptr++ = *ptr++;
+					}
+					else
+					{
+						*wsptr++ = '\0';
+						state = CS_WAITEQ;
+					}
+				}
+				else
+				{
+					*wsptr++ = *ptr;
+				}
+				break;
+			case CS_WAITEQ:
+				if (*ptr == '=')
+					state = CS_WAITVALUE;
+				else if (!isspace((unsigned char) *ptr))
+					ereport(ERROR,
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("invalid parameter list format: \"%s\"",
+									TextPGetCString(in))));
+				break;
+			case CS_WAITVALUE:
+				if (*ptr == '\'')
+				{
+					startvalue = wsptr;
+					state = CS_INSQVALUE;
+				}
+				else if (*ptr == 'E' && ptr + 1 < endptr && ptr[1] == '\'')
+				{
+					ptr++;
+					startvalue = wsptr;
+					state = CS_INSQVALUE;
+				}
+				else if (*ptr == '"')
+				{
+					startvalue = wsptr;
+					state = CS_INDQVALUE;
+				}
+				else if (!isspace((unsigned char) *ptr))
+				{
+					startvalue = wsptr;
+					*wsptr++ = *ptr;
+					state = CS_INWVALUE;
+				}
+				break;
+			case CS_INSQVALUE:
+				if (*ptr == '\'')
+				{
+					if (ptr + 1 < endptr && ptr[1] == '\'')
+					{
+						/* copy only one of the two quotes */
+						*wsptr++ = *ptr++;
+					}
+					else
+					{
+						*wsptr++ = '\0';
+						result = lappend(result,
+										 makeDefElem(pstrdup(workspace),
+								  (Node *) makeString(pstrdup(startvalue))));
+						state = CS_WAITKEY;
+					}
+				}
+				else if (*ptr == '\\')
+				{
+					if (ptr + 1 < endptr && ptr[1] == '\\')
+					{
+						/* copy only one of the two backslashes */
+						*wsptr++ = *ptr++;
+					}
+					else
+						*wsptr++ = *ptr;
+				}
+				else
+				{
+					*wsptr++ = *ptr;
+				}
+				break;
+			case CS_INDQVALUE:
+				if (*ptr == '"')
+				{
+					if (ptr + 1 < endptr && ptr[1] == '"')
+					{
+						/* copy only one of the two quotes */
+						*wsptr++ = *ptr++;
+					}
+					else
+					{
+						*wsptr++ = '\0';
+						result = lappend(result,
+										 makeDefElem(pstrdup(workspace),
+								  (Node *) makeString(pstrdup(startvalue))));
+						state = CS_WAITKEY;
+					}
+				}
+				else
+				{
+					*wsptr++ = *ptr;
+				}
+				break;
+			case CS_INWVALUE:
+				if (*ptr == ',' || isspace((unsigned char) *ptr))
+				{
+					*wsptr++ = '\0';
+					result = lappend(result,
+									 makeDefElem(pstrdup(workspace),
+								  (Node *) makeString(pstrdup(startvalue))));
+					state = CS_WAITKEY;
+				}
+				else
+				{
+					*wsptr++ = *ptr;
+				}
+				break;
+			default:
+				elog(ERROR, "unrecognized deserialize_deflist state: %d",
+					 state);
+		}
+	}
+
+	if (state == CS_INWVALUE)
+	{
+		*wsptr++ = '\0';
+		result = lappend(result,
+						 makeDefElem(pstrdup(workspace),
+								  (Node *) makeString(pstrdup(startvalue))));
+	}
+	else if (state != CS_WAITKEY)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("invalid parameter list format: \"%s\"",
+						TextPGetCString(in))));
+
+	pfree(workspace);
+
+	return result;
+}
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 73bcfb2b45a1..968e5a1a866c 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.100 2007/02/14 01:58:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.113.2.1 2009/02/24 01:38:49 tgl Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -37,12 +37,14 @@
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catquery.h"
+#include "catalog/catalog.h"
 #include "catalog/dependency.h"
 #include "catalog/heap.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_compression.h"
 #include "catalog/pg_constraint.h"
 #include "catalog/pg_depend.h"
+#include "catalog/pg_enum.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_type_encoding.h"
@@ -118,7 +120,6 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 	char		delimiter = DEFAULT_TYPDELIM;
 	char		alignment = 'i';	/* default alignment */
 	char		storage = 'p';	/* default TOAST storage method */
-	char        typtype = TYPTYPE_BASE;
 	Oid			inputOid;
 	Oid			outputOid;
 	Oid			receiveOid = InvalidOid;
@@ -146,26 +147,30 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 
 	/*
 	 * Look to see if type already exists (presumably as a shell; if not,
-	 * TypeCreate will complain).  If it doesn't, create it as a shell, so
-	 * that the OID is known for use in the I/O function definitions.
+	 * TypeCreate will complain).
 	 */
-	typoid = caql_getoid(
-			NULL,
-			cql("SELECT oid FROM pg_type "
-				" WHERE typname = :1 "
-				" AND typnamespace = :2 ",
-				CStringGetDatum(typeName),
-				ObjectIdGetDatum(typeNamespace)));
+	typoid = GetSysCacheOid(TYPENAMENSP,
+							CStringGetDatum(typeName),
+							ObjectIdGetDatum(typeNamespace),
+							0, 0);
 
+	/*
+	 * If it's not a shell, see if it's an autogenerated array type, and if so
+	 * rename it out of the way.
+	 */
+	if (OidIsValid(typoid) && get_typisdefined(typoid))
+	{
+		if (moveArrayTypeName(typoid, typeName, typeNamespace))
+			typoid = InvalidOid;
+	}
+
+	/*
+	 * If it doesn't exist, create it as a shell, so that the OID is known for
+	 * use in the I/O function definitions.
+	 */
 	if (!OidIsValid(typoid))
 	{
-		/*
-		 * See if oid is specified for the shell type during upgrade, if so use it
-		 * to create shell type.
-		 */
-		bool createShellOnly = (parameters==NIL);
 		typoid = TypeShellMake(typeName, typeNamespace, GetUserId(), newOid);
-
 		/* Make new shell type visible for modification below */
 		CommandCounterIncrement();
 
@@ -173,7 +178,7 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 		 * If the command was a parameterless CREATE TYPE, we're done ---
 		 * creating the shell type was all we're supposed to do.
 		 */
-		if (createShellOnly)
+		if (parameters == NIL)
 		{
 			/* Must dispatch shell type creation */
 			if (Gp_role == GP_ROLE_DISPATCH)
@@ -232,7 +237,7 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 		}
 		else if (pg_strcasecmp(defel->defname, "element") == 0)
 		{
-			elemType = typenameTypeId(NULL, defGetTypeName(defel));
+			elemType = typenameTypeId(NULL, defGetTypeName(defel), NULL);
 			/* disallow arrays of pseudotypes */
 			if (get_typtype(elemType) == TYPTYPE_PSEUDO)
 				ereport(ERROR,
@@ -447,24 +452,25 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 	 * now have TypeCreate do all the real work.
 	 */
 	typoid =
-		TypeCreateWithOid(typeName,	/* type name */
+		TypeCreateWithOptions(newOid,
+				   typeName,	/* type name */
 				   typeNamespace,		/* namespace */
 				   InvalidOid,	/* relation oid (n/a here) */
 				   0,			/* relation kind (ditto) */
 				   GetUserId(),	/* owner's ID */
 				   internalLength,		/* internal size */
-				   typtype,		/* type-type (base type) */
+				   TYPTYPE_BASE,	/* type-type (base type) */
 				   delimiter,	/* array element delimiter */
 				   inputOid,	/* input procedure */
 				   outputOid,	/* output procedure */
 				   receiveOid,	/* receive procedure */
 				   sendOid,		/* send procedure */
 				   typmodinOid, /* typmodin procedure */
-				   typmodoutOid,/* typmodout procedure */
+				   typmodoutOid,	/* typmodout procedure */
 				   analyzeOid,	/* analyze procedure */
 				   elemType,	/* element type ID */
-				   false,		/*  this is not an array type */
-				   array_oid,	/*  array type we are about to create */
+				   false,		/* this is not an array type */
+				   array_oid,	/* array type we are about to create */
 				   InvalidOid,	/* base type ID (only for domains) */
 				   defaultValue,	/* default type value */
 				   NULL,		/* no binary form available */
@@ -474,23 +480,17 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 				   -1,			/* typMod (Domains only) */
 				   0,			/* Array Dimensions of typbasetype */
 				   false,		/* Type NOT NULL */
-				   newOid,
 				   typoptions);
 
 	/*
-	 * When we create a base type (as opposed to a complex type) we need to
-	 * have an array entry for it in pg_type as well.
-	 *
-	 * Create a array type only if we're not creating an internal type during upgrade.
+	 * Create the array type that goes with it.
 	 */
-	if (typtype == TYPTYPE_BASE)
-	{
-		array_type = makeArrayTypeName(typeName, typeNamespace);
+	array_type = makeArrayTypeName(typeName, typeNamespace);
 
-		/* alignment must be 'i' or 'd' for arrays */
-		alignment = (alignment == 'd') ? 'd' : 'i';
+	/* alignment must be 'i' or 'd' for arrays */
+	alignment = (alignment == 'd') ? 'd' : 'i';
 
-		TypeCreateWithOid(
+	TypeCreateWithOptions(array_oid,		/* force assignment of this type OID */
 			   array_type,		/* type name */
 			   typeNamespace,	/* namespace */
 			   InvalidOid,		/* relation oid (n/a here) */
@@ -518,11 +518,9 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 			   -1,				/* typMod (Domains only) */
 			   0,				/* Array dimensions of typbasetype */
 			   false,			/* Type NOT NULL */
-			   array_oid,
 			   typoptions);
 
-		pfree(array_type);
-	}
+	pfree(array_type);
 
 	if (Gp_role == GP_ROLE_DISPATCH)
 	{
@@ -534,6 +532,7 @@ DefineType(List *names, List *parameters, Oid newOid, Oid newArrayOid)
 		stmt->definition = parameters;
 		stmt->newOid = typoid;
 		stmt->arrayOid = array_oid;
+		stmt->commutatorOid = stmt->negatorOid = InvalidOid;
 		CdbDispatchUtilityStatement((Node *) stmt, "DefineType");
 	}
 }
@@ -548,16 +547,16 @@ RemoveType(List *names, DropBehavior behavior, bool missing_ok)
 {
 	TypeName   *typename;
 	Oid			typeoid;
-	Oid			typeNsp;
+	HeapTuple	tup;
 	ObjectAddress object;
-	int			 fetchCount;
+	Form_pg_type typ;
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
 
 	/* Use LookupTypeName here so that shell types can be removed. */
-	typeoid = LookupTypeName(NULL, typename);
-	if (!OidIsValid(typeoid))
+	tup = LookupTypeName(NULL, typename, NULL);
+	if (tup == NULL)
 	{
 		if (!missing_ok)
 		{
@@ -578,29 +577,27 @@ RemoveType(List *names, DropBehavior behavior, bool missing_ok)
 		return;
 	}
 
-	typeNsp = caql_getoid_plus(
-			NULL,
-			&fetchCount,
-			NULL,
-			cql("SELECT typnamespace FROM pg_type "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(typeoid)));
-
-	if (!fetchCount)
-		elog(ERROR, "cache lookup failed for type %u", typeoid);
+	typeoid = typeTypeId(tup);
+	typ = (Form_pg_type) GETSTRUCT(tup);
 
 	/* Permission check: must own type or its namespace */
 	if (!pg_type_ownercheck(typeoid, GetUserId()) &&
-		!pg_namespace_ownercheck(typeNsp, GetUserId()))
+		!pg_namespace_ownercheck(typ->typnamespace, GetUserId()))
 		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TYPE,
 					   TypeNameToString(typename));
 
-
 	/*
 	 * Remove any storage encoding
 	 */
 	remove_type_encoding(typeoid);
 
+	/*
+	 * Note: we need no special check for array types here, as the normal
+	 * treatment of internal dependencies handles it just fine
+	 */
+
+	ReleaseSysCache(tup);
+
 	/*
 	 * Do the deletion
 	 */
@@ -619,7 +616,7 @@ void
 RemoveTypeById(Oid typeOid)
 {
 	Relation	relation;
-	cqContext	cqc;
+	HeapTuple	tup;
 
 	/* 
 	 * It might look like the call in RemoveType() is enough for
@@ -630,15 +627,23 @@ RemoveTypeById(Oid typeOid)
 
 	relation = heap_open(TypeRelationId, RowExclusiveLock);
 
-	if (0 ==
-		caql_getcount(
-			caql_addrel(cqclr(&cqc), relation),
-			cql("DELETE FROM pg_type "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(typeOid))))
-	{
+	tup = SearchSysCache(TYPEOID,
+						 ObjectIdGetDatum(typeOid),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
 		elog(ERROR, "cache lookup failed for type %u", typeOid);
-	}
+
+	simple_heap_delete(relation, &tup->t_self);
+
+	/*
+	 * If it is an enum, delete the pg_enum entries too; we don't bother with
+	 * making dependency entries for those, so it has to be done "by hand"
+	 * here.
+	 */
+	if (((Form_pg_type) GETSTRUCT(tup))->typtype == TYPTYPE_ENUM)
+		EnumValuesDelete(typeOid);
+
+	ReleaseSysCache(tup);
 
 	heap_close(relation,  Gp_role == GP_ROLE_DISPATCH ? NoLock : RowExclusiveLock);
 }
@@ -679,6 +684,7 @@ DefineDomain(CreateDomainStmt *stmt)
 	ListCell   *listptr;
 	Oid			basetypeoid;
 	Oid			domainoid;
+	Oid			old_type_oid;
 	Form_pg_type baseType;
 	int32		basetypeMod;
 
@@ -693,21 +699,38 @@ DefineDomain(CreateDomainStmt *stmt)
 		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
 					   get_namespace_name(domainNamespace));
 
+	/*
+	 * Check for collision with an existing type name.	If there is one and
+	 * it's an autogenerated array, we can rename it out of the way.
+	 */
+	old_type_oid = GetSysCacheOid(TYPENAMENSP,
+								  CStringGetDatum(domainName),
+								  ObjectIdGetDatum(domainNamespace),
+								  0, 0);
+	if (OidIsValid(old_type_oid))
+	{
+		if (!moveArrayTypeName(old_type_oid, domainName, domainNamespace))
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_OBJECT),
+					 errmsg("type \"%s\" already exists", domainName)));
+	}
+
 	/*
 	 * Look up the base type.
 	 */
-	typeTup = typenameType(NULL, stmt->typname);
+	typeTup = typenameType(NULL, stmt->typname, &basetypeMod);
 	baseType = (Form_pg_type) GETSTRUCT(typeTup);
 	basetypeoid = HeapTupleGetOid(typeTup);
-	basetypeMod = typenameTypeMod(NULL, stmt->typname, basetypeoid);
 
 	/*
-	 * Base type must be a plain base type or another domain.  Domains over
-	 * pseudotypes would create a security hole.  Domains over composite types
-	 * might be made to work in the future, but not today.
+	 * Base type must be a plain base type, another domain or an enum. Domains
+	 * over pseudotypes would create a security hole.  Domains over composite
+	 * types might be made to work in the future, but not today.
 	 */
 	typtype = baseType->typtype;
-	if (typtype != TYPTYPE_BASE && typtype != TYPTYPE_DOMAIN)
+	if (typtype != TYPTYPE_BASE &&
+		typtype != TYPTYPE_DOMAIN &&
+		typtype != TYPTYPE_ENUM)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("\"%s\" is not a valid base type for a domain",
@@ -799,31 +822,51 @@ DefineDomain(CreateDomainStmt *stmt)
 					pstate = make_parsestate(NULL);
 
 					/*
-					 * Cook the constr->raw_expr into an expression.
-					 * Note: name is strictly for error message
+					 * Cook the constr->raw_expr into an expression. Note:
+					 * name is strictly for error message
 					 */
 					defaultExpr = cookDefault(pstate, constr->raw_expr,
 											  basetypeoid,
 											  basetypeMod,
 											  domainName);
 
-					free_parsestate(pstate);
-
 					/*
-					 * Expression must be stored as a nodeToString result, but
-					 * we also require a valid textual representation (mainly
-					 * to make life easier for pg_dump).
+					 * If the expression is just a NULL constant, we treat it
+					 * like not having a default.
+					 *
+					 * Note that if the basetype is another domain, we'll see
+					 * a CoerceToDomain expr here and not discard the default.
+					 * This is critical because the domain default needs to be
+					 * retained to override any default that the base domain
+					 * might have.
 					 */
-					defaultValue =
-						deparse_expression(defaultExpr,
-										   deparse_context_for(domainName,
-															   InvalidOid),
-										   false, false);
-					defaultValueBin = nodeToString(defaultExpr);
+					if (defaultExpr == NULL ||
+						(IsA(defaultExpr, Const) &&
+						 ((Const *) defaultExpr)->constisnull))
+					{
+						defaultValue = NULL;
+						defaultValueBin = NULL;
+					}
+					else
+					{
+						/*
+						 * Expression must be stored as a nodeToString result,
+						 * but we also require a valid textual representation
+						 * (mainly to make life easier for pg_dump).
+						 */
+						defaultValue =
+							deparse_expression(defaultExpr,
+											   deparse_context_for(domainName,
+																 InvalidOid),
+											   false, false);
+						defaultValueBin = nodeToString(defaultExpr);
+					}
+
+					free_parsestate(pstate);
 				}
 				else
 				{
-					/* DEFAULT NULL is same as not having a default */
+					/* No default (can this still happen?) */
 					defaultValue = NULL;
 					defaultValueBin = NULL;
 				}
@@ -890,7 +933,8 @@ DefineDomain(CreateDomainStmt *stmt)
 	 * Have TypeCreate do all the real work.
 	 */
 	domainoid =
-		TypeCreateWithOid(domainName,	/* type name */
+		TypeCreate(stmt->domainOid,
+				   domainName,	/* type name */
 				   domainNamespace,		/* namespace */
 				   InvalidOid,	/* relation oid (n/a here) */
 				   0,			/* relation kind (ditto) */
@@ -902,12 +946,12 @@ DefineDomain(CreateDomainStmt *stmt)
 				   outputProcedure,		/* output procedure */
 				   receiveProcedure,	/* receive procedure */
 				   sendProcedure,		/* send procedure */
-				   InvalidOid,			/* typmodin procedure - none */
-				   InvalidOid,			/* typmodout procedure - none */
+				   InvalidOid,	/* typmodin procedure - none */
+				   InvalidOid,	/* typmodout procedure - none */
 				   analyzeProcedure,	/* analyze procedure */
 				   typelem,		/* element type ID */
-				   false,		/*  this isn't an array */
-				   InvalidOid,	/*  no arrays for domains (yet) */
+				   false,		/* this isn't an array */
+				   InvalidOid,	/* no arrays for domains (yet) */
 				   basetypeoid, /* base type ID */
 				   defaultValue,	/* default type value (text) */
 				   defaultValueBin,		/* default type value (binary) */
@@ -916,9 +960,7 @@ DefineDomain(CreateDomainStmt *stmt)
 				   storage,		/* TOAST strategy */
 				   basetypeMod, /* typeMod value */
 				   typNDims,	/* Array dimensions for base type */
-				   typNotNull,	/* Type NOT NULL */
-				   stmt->domainOid,
-				   0);
+				   typNotNull	/* Type NOT NULL */);
 
 	stmt->domainOid = domainoid;
 	/*
@@ -974,14 +1016,13 @@ RemoveDomain(List *names, DropBehavior behavior, bool missing_ok)
 	HeapTuple	tup;
 	char		typtype;
 	ObjectAddress object;
-	cqContext  *pcqCtx;
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
 
 	/* Use LookupTypeName here so that shell types can be removed. */
-	typeoid = LookupTypeName(NULL, typename);
-	if (!OidIsValid(typeoid))
+	tup = LookupTypeName(NULL, typename, NULL);
+	if (tup == NULL)
 	{
 		if (!missing_ok)
 		{
@@ -1002,16 +1043,7 @@ RemoveDomain(List *names, DropBehavior behavior, bool missing_ok)
 		return;
 	}
 
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_type "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(typeoid)));
-
-	tup = caql_getnext(pcqCtx);
-
-	if (!HeapTupleIsValid(tup))
-		elog(ERROR, "cache lookup failed for type %u", typeoid);
+	typeoid = typeTypeId(tup);
 
 	/* Permission check: must own type or its namespace */
 	if (!pg_type_ownercheck(typeoid, GetUserId()) &&
@@ -1029,7 +1061,7 @@ RemoveDomain(List *names, DropBehavior behavior, bool missing_ok)
 				 errmsg("\"%s\" is not a domain",
 						TypeNameToString(typename))));
 
-	caql_endscan(pcqCtx);
+	ReleaseSysCache(tup);
 
 	/*
 	 * Do the deletion
@@ -1041,6 +1073,132 @@ RemoveDomain(List *names, DropBehavior behavior, bool missing_ok)
 	performDeletion(&object, behavior);
 }
 
+/*
+ * DefineEnum
+ *		Registers a new enum.
+ */
+void
+DefineEnum(CreateEnumStmt *stmt)
+{
+	char	   *enumName;
+	char	   *enumArrayName;
+	Oid			enumNamespace;
+	Oid			enumTypeOid;
+	AclResult	aclresult;
+	Oid			old_type_oid;
+	Oid			enumArrayOid;
+	Relation	pg_type;
+
+	/* Convert list of names to a name and namespace */
+	enumNamespace = QualifiedNameGetCreationNamespace(stmt->typeName,
+													  &enumName);
+
+	/* Check we have creation rights in target namespace */
+	aclresult = pg_namespace_aclcheck(enumNamespace, GetUserId(), ACL_CREATE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					   get_namespace_name(enumNamespace));
+
+	/*
+	 * Check for collision with an existing type name.	If there is one and
+	 * it's an autogenerated array, we can rename it out of the way.
+	 */
+	old_type_oid = GetSysCacheOid(TYPENAMENSP,
+								  CStringGetDatum(enumName),
+								  ObjectIdGetDatum(enumNamespace),
+								  0, 0);
+	if (OidIsValid(old_type_oid))
+	{
+		if (!moveArrayTypeName(old_type_oid, enumName, enumNamespace))
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_OBJECT),
+					 errmsg("type \"%s\" already exists", enumName)));
+	}
+
+	/* Preassign array type OID so we can insert it in pg_type.typarray */
+	pg_type = heap_open(TypeRelationId, AccessShareLock);
+	if (OidIsValid(stmt->enumArrayOid))
+		enumArrayOid = stmt->enumArrayOid;
+	else
+		enumArrayOid = GetNewOid(pg_type);
+	heap_close(pg_type, AccessShareLock);
+
+	/* Create the pg_type entry */
+	enumTypeOid =
+		TypeCreate(stmt->enumTypeOid,
+				   enumName,	/* type name */
+				   enumNamespace,		/* namespace */
+				   InvalidOid,	/* relation oid (n/a here) */
+				   0,			/* relation kind (ditto) */
+				   GetUserId(),	/* owner's ID */
+				   sizeof(Oid), /* internal size */
+				   TYPTYPE_ENUM,	/* type-type (enum type) */
+				   DEFAULT_TYPDELIM,	/* array element delimiter */
+				   F_ENUM_IN,	/* input procedure */
+				   F_ENUM_OUT,	/* output procedure */
+				   F_ENUM_RECV, /* receive procedure */
+				   F_ENUM_SEND, /* send procedure */
+				   InvalidOid,	/* typmodin procedure - none */
+				   InvalidOid,	/* typmodout procedure - none */
+				   InvalidOid,	/* analyze procedure - default */
+				   InvalidOid,	/* element type ID */
+				   false,		/* this is not an array type */
+				   enumArrayOid,	/* array type we are about to create */
+				   InvalidOid,	/* base type ID (only for domains) */
+				   NULL,		/* never a default type value */
+				   NULL,		/* binary default isn't sent either */
+				   true,		/* always passed by value */
+				   'i',			/* int alignment */
+				   'p',			/* TOAST strategy always plain */
+				   -1,			/* typMod (Domains only) */
+				   0,			/* Array dimensions of typbasetype */
+				   false);		/* Type NOT NULL */
+	stmt->enumTypeOid = enumTypeOid;
+	stmt->enumArrayOid = enumArrayOid;
+
+	/* Enter the enum's values into pg_enum */
+	EnumValuesCreate(enumTypeOid, stmt->vals, &stmt->valOids);
+
+	/*
+	 * Create the array type that goes with it.
+	 */
+	enumArrayName = makeArrayTypeName(enumName, enumNamespace);
+
+	TypeCreate(enumArrayOid,	/* force assignment of this type OID */
+			   enumArrayName,	/* type name */
+			   enumNamespace,	/* namespace */
+			   InvalidOid,		/* relation oid (n/a here) */
+			   0,				/* relation kind (ditto) */
+			   GetUserId(),		/* owner's ID */
+			   -1,				/* internal size (always varlena) */
+			   TYPTYPE_BASE,	/* type-type (base type) */
+			   DEFAULT_TYPDELIM,	/* array element delimiter */
+			   F_ARRAY_IN,		/* input procedure */
+			   F_ARRAY_OUT,		/* output procedure */
+			   F_ARRAY_RECV,	/* receive procedure */
+			   F_ARRAY_SEND,	/* send procedure */
+			   InvalidOid,		/* typmodin procedure - none */
+			   InvalidOid,		/* typmodout procedure - none */
+			   InvalidOid,		/* analyze procedure - default */
+			   enumTypeOid,		/* element type ID */
+			   true,			/* yes this is an array type */
+			   InvalidOid,		/* no further array type */
+			   InvalidOid,		/* base type ID */
+			   NULL,			/* never a default type value */
+			   NULL,			/* binary default isn't sent either */
+			   false,			/* never passed by value */
+			   'i',				/* enums have align i, so do their arrays */
+			   'x',				/* ARRAY is always toastable */
+			   -1,				/* typMod (Domains only) */
+			   0,				/* Array dimensions of typbasetype */
+			   false);			/* Type NOT NULL */
+
+	pfree(enumArrayName);
+
+	if (Gp_role == GP_ROLE_DISPATCH)
+		CdbDispatchUtilityStatement((Node *) stmt, "DefineEnum");
+}
+
 
 /*
  * Find suitable I/O functions for a type.
@@ -1397,7 +1555,7 @@ AlterDomainDefault(List *names, Node *defaultRaw)
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
-	domainoid = typenameTypeId(NULL, typename);
+	domainoid = typenameTypeId(NULL, typename, NULL);
 
 	/* Look up the domain in the type table */
 	rel = heap_open(TypeRelationId, RowExclusiveLock);
@@ -1423,7 +1581,7 @@ AlterDomainDefault(List *names, Node *defaultRaw)
 	MemSet(new_record_nulls, false, sizeof(new_record_nulls));
 	MemSet(new_record_repl, false, sizeof(new_record_repl));
 
-	/* Store the new default, if null then skip this step */
+	/* Store the new default into the tuple */
 	if (defaultRaw)
 	{
 		/* Create a dummy ParseState for transformExpr */
@@ -1441,30 +1599,46 @@ AlterDomainDefault(List *names, Node *defaultRaw)
 		free_parsestate(pstate);
 
 		/*
-		 * Expression must be stored as a nodeToString result, but we also
-		 * require a valid textual representation (mainly to make life easier
-		 * for pg_dump).
+		 * If the expression is just a NULL constant, we treat the command
+		 * like ALTER ... DROP DEFAULT.  (But see note for same test in
+		 * DefineDomain.)
 		 */
-		defaultValue = deparse_expression(defaultExpr,
+		if (defaultExpr == NULL ||
+			(IsA(defaultExpr, Const) &&((Const *) defaultExpr)->constisnull))
+		{
+			/* Default is NULL, drop it */
+			new_record_nulls[Anum_pg_type_typdefaultbin - 1] = 'n';
+			new_record_repl[Anum_pg_type_typdefaultbin - 1] = 'r';
+			new_record_nulls[Anum_pg_type_typdefault - 1] = 'n';
+			new_record_repl[Anum_pg_type_typdefault - 1] = 'r';
+		}
+		else
+		{
+			/*
+			 * Expression must be stored as a nodeToString result, but we also
+			 * require a valid textual representation (mainly to make life
+			 * easier for pg_dump).
+			 */
+			defaultValue = deparse_expression(defaultExpr,
 								deparse_context_for(NameStr(typTup->typname),
 													InvalidOid),
-										  false, false);
+											  false, false);
 
-		/*
-		 * Form an updated tuple with the new default and write it back.
-		 */
-		new_record[Anum_pg_type_typdefaultbin - 1] = DirectFunctionCall1(textin,
-															 CStringGetDatum(
-												 nodeToString(defaultExpr)));
+			/*
+			 * Form an updated tuple with the new default and write it back.
+			 */
+			new_record[Anum_pg_type_typdefaultbin - 1] = DirectFunctionCall1(textin,
+								 CStringGetDatum(nodeToString(defaultExpr)));
 
-		new_record_repl[Anum_pg_type_typdefaultbin - 1] = true;
-		new_record[Anum_pg_type_typdefault - 1] = DirectFunctionCall1(textin,
+			new_record_repl[Anum_pg_type_typdefaultbin - 1] = true;
+			new_record[Anum_pg_type_typdefault - 1] = DirectFunctionCall1(textin,
 											  CStringGetDatum(defaultValue));
-		new_record_repl[Anum_pg_type_typdefault - 1] = true;
+			new_record_repl[Anum_pg_type_typdefault - 1] = true;
+		}
 	}
 	else
-		/* Default is NULL, drop it */
 	{
+		/* ALTER ... DROP DEFAULT */
 		new_record_nulls[Anum_pg_type_typdefaultbin - 1] = true;
 		new_record_repl[Anum_pg_type_typdefaultbin - 1] = true;
 		new_record_nulls[Anum_pg_type_typdefault - 1] = true;
@@ -1519,7 +1693,7 @@ AlterDomainNotNull(List *names, bool notNull)
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
-	domainoid = typenameTypeId(NULL, typename);
+	domainoid = typenameTypeId(NULL, typename, NULL);
 
 	/* Look up the domain in the type table */
 	typrel = heap_open(TypeRelationId, RowExclusiveLock);
@@ -1624,7 +1798,7 @@ AlterDomainDropConstraint(List *names, const char *constrName,
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
-	domainoid = typenameTypeId(NULL, typename);
+	domainoid = typenameTypeId(NULL, typename, NULL);
 
 	/* Look up the domain in the type table */
 	rel = heap_open(TypeRelationId, RowExclusiveLock);
@@ -1703,7 +1877,7 @@ AlterDomainAddConstraint(List *names, Node *newConstraint)
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
-	domainoid = typenameTypeId(NULL, typename);
+	domainoid = typenameTypeId(NULL, typename, NULL);
 
 	/* Look up the domain in the type table */
 	typrel = heap_open(TypeRelationId, RowExclusiveLock);
@@ -1914,9 +2088,10 @@ get_rels_with_domain(Oid domainOid, LOCKMODE lockmode)
 		if (pg_depend->classid == TypeRelationId)
 		{
 			Assert(get_typtype(pg_depend->objid) == TYPTYPE_DOMAIN);
+
 			/*
-			 * Recursively add dependent columns to the output list.  This
-			 * is a bit inefficient since we may fail to combine RelToCheck
+			 * Recursively add dependent columns to the output list.  This is
+			 * a bit inefficient since we may fail to combine RelToCheck
 			 * entries when attributes of the same rel have different derived
 			 * domain types, but it's probably not worth improving.
 			 */
@@ -2317,49 +2492,52 @@ AlterTypeOwner(List *names, Oid newOwnerId)
 	Oid			typeOid;
 	Relation	rel;
 	HeapTuple	tup;
+	HeapTuple	newtup;
 	Form_pg_type typTup;
 	AclResult	aclresult;
-	cqContext  *pcqCtx;
-	cqContext	cqc;
+
+	rel = heap_open(TypeRelationId, RowExclusiveLock);
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
 
-	/* Use LookupTypeName here so that shell types can be processed (why?) */
-	typeOid = LookupTypeName(NULL, typename);
-	if (!OidIsValid(typeOid))
+	/* Use LookupTypeName here so that shell types can be processed */
+	tup = LookupTypeName(NULL, typename, NULL);
+	if (tup == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("type \"%s\" does not exist",
 						TypeNameToString(typename))));
+	typeOid = typeTypeId(tup);
 
-	/* Look up the type in the type table */
-	rel = heap_open(TypeRelationId, RowExclusiveLock);
-
-	pcqCtx = caql_addrel(cqclr(&cqc), rel);
-
-	tup = caql_getfirst(
-			pcqCtx,
-			cql("SELECT * FROM pg_type "
-				" WHERE oid = :1 "
-				" FOR UPDATE ",
-				ObjectIdGetDatum(typeOid)));
-
-	if (!HeapTupleIsValid(tup))
-		elog(ERROR, "cache lookup failed for type %u", typeOid);
+	/* Copy the syscache entry so we can scribble on it below */
+	newtup = heap_copytuple(tup);
+	ReleaseSysCache(tup);
+	tup = newtup;
 	typTup = (Form_pg_type) GETSTRUCT(tup);
 
 	/*
 	 * If it's a composite type, we need to check that it really is a
-	 * free-standing composite type, and not a table's rowtype. We
-	 * want people to use ALTER TABLE not ALTER TYPE for that case.
+	 * free-standing composite type, and not a table's rowtype. We want people
+	 * to use ALTER TABLE not ALTER TYPE for that case.
 	 */
 	if (typTup->typtype == TYPTYPE_COMPOSITE &&
 		get_rel_relkind(typTup->typrelid) != RELKIND_COMPOSITE_TYPE)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is a table's row type",
-						TypeNameToString(typename))));
+				 errmsg("%s is a table's row type",
+						format_type_be(typeOid)),
+				 errhint("Use ALTER TABLE instead.")));
+
+	/* don't allow direct alteration of array types, either */
+	if (OidIsValid(typTup->typelem) &&
+		get_array_type(typTup->typelem) == typeOid)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("cannot alter array type %s",
+						format_type_be(typeOid)),
+				 errhint("You can alter type %s, which will alter the array type as well.",
+						 format_type_be(typTup->typelem))));
 
 	/* don't allow direct alteration of array types, either */
 	if (OidIsValid(typTup->typelem) &&
@@ -2398,8 +2576,8 @@ AlterTypeOwner(List *names, Oid newOwnerId)
 		}
 
 		/*
-		 * If it's a composite type, invoke ATExecChangeOwner so that we
-		 * fix up the pg_class entry properly.  That will call back to
+		 * If it's a composite type, invoke ATExecChangeOwner so that we fix
+		 * up the pg_class entry properly.	That will call back to
 		 * AlterTypeOwnerInternal to take care of the pg_type entry(s).
 		 */
 		if (typTup->typtype == TYPTYPE_COMPOSITE)
@@ -2413,7 +2591,9 @@ AlterTypeOwner(List *names, Oid newOwnerId)
 			 */
 			typTup->typowner = newOwnerId;
 
-			caql_update_current(pcqCtx, tup);
+			simple_heap_update(rel, &tup->t_self, tup);
+
+			CatalogUpdateIndexes(rel, tup);
 
 			/* Update owner dependency reference */
 			changeDependencyOnOwner(TypeRelationId, typeOid, newOwnerId);
@@ -2476,8 +2656,8 @@ AlterTypeOwnerInternal(Oid typeOid, Oid newOwnerId,
 		changeDependencyOnOwner(TypeRelationId, typeOid, newOwnerId);
 
 	/* If it has an array type, update that too */
-		if (OidIsValid(typTup->typarray))
-			AlterTypeOwnerInternal(typTup->typarray, newOwnerId, false);
+	if (OidIsValid(typTup->typarray))
+		AlterTypeOwnerInternal(typTup->typarray, newOwnerId, false);
 
 	/* Clean up */
 	heap_close(rel, RowExclusiveLock);
@@ -2496,7 +2676,7 @@ AlterTypeNamespace(List *names, const char *newschema)
 
 	/* Make a TypeName so we can use standard type lookup machinery */
 	typename = makeTypeNameFromNameList(names);
-	typeOid = typenameTypeId(NULL, typename);
+	typeOid = typenameTypeId(NULL, typename, NULL);
 
 	/* check permissions on type */
 	if (!pg_type_ownercheck(typeOid, GetUserId()))
@@ -2526,7 +2706,7 @@ AlterTypeNamespace(List *names, const char *newschema)
  * Caller must have already checked privileges.
  *
  * The function automatically recurses to process the type's array type,
- * if any.  isImplicitArray should be TRUE only when doing this internal
+ * if any.	isImplicitArray should be TRUE only when doing this internal
  * recursion (outside callers must never try to move an array type directly).
  *
  * If errorOnTableType is TRUE, the function errors out if the type is
@@ -2612,13 +2792,13 @@ AlterTypeNamespaceInternal(Oid typeOid, Oid nspOid,
 		 get_rel_relkind(typform->typrelid) == RELKIND_COMPOSITE_TYPE);
 
 	/* Enforce not-table-type if requested */
-	if (typform->typtype == TYPTYPE_COMPOSITE && 
-		!isCompositeType && errorOnTableType)
+	if (typform->typtype == TYPTYPE_COMPOSITE && !isCompositeType &&
+		errorOnTableType)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("%s is a table's row type",
 						format_type_be(typeOid)),
-				 errhint("Use ALTER TABLE SET SCHEMA instead.")));
+				 errhint("Use ALTER TABLE instead.")));
 
 	/* OK, modify the pg_type row */
 
@@ -2661,12 +2841,12 @@ AlterTypeNamespaceInternal(Oid typeOid, Oid nspOid,
 
 	/*
 	 * Update dependency on schema, if any --- a table rowtype has not got
-	 * one.
+	 * one, and neither does an implicit array.
 	 */
 	if ((isCompositeType || typform->typtype != TYPTYPE_COMPOSITE) &&
 		!isImplicitArray)
 		if (changeDependencyFor(TypeRelationId, typeOid,
-							NamespaceRelationId, oldNspOid, nspOid) != 1)
+								NamespaceRelationId, oldNspOid, nspOid) != 1)
 			elog(ERROR, "failed to change schema dependency for type %s",
 				 format_type_be(typeOid));
 
@@ -2674,7 +2854,7 @@ AlterTypeNamespaceInternal(Oid typeOid, Oid nspOid,
 
 	heap_close(rel, RowExclusiveLock);
 
-	/*  Recursively alter the associated array type, if any */
+	/* Recursively alter the associated array type, if any */
 	if (OidIsValid(arrayOid))
 		AlterTypeNamespaceInternal(arrayOid, nspOid, true, true);
 }
@@ -2689,6 +2869,7 @@ AlterType(AlterTypeStmt *stmt)
 {
 	TypeName	   *typname = stmt->typname;
 	Oid				typid;
+	int32			typmod;
 	cqContext	   *pcqCtx;
 	cqContext		cqc;
 	HeapTuple		tup;
@@ -2699,8 +2880,7 @@ AlterType(AlterTypeStmt *stmt)
 										  RowExclusiveLock);
 
 	/* Make a TypeName so we can use standard type lookup machinery */
-	typid = LookupTypeName(NULL, typname);
-
+	typid = typenameTypeId(NULL, typname, &typmod);
 	if (!OidIsValid(typid))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -2721,9 +2901,6 @@ AlterType(AlterTypeStmt *stmt)
 		 * for character, the user specified character (N) if typmod is not
 		 * VARHDRSZ + 1.
 		 */
-		int32		typmod;
-
-		typmod = typenameTypeMod(NULL, typname, typid);
 		if (typmod != VARHDRSZ + 1)
 			typmod_set = true;
 	}
@@ -2733,9 +2910,6 @@ AlterType(AlterTypeStmt *stmt)
 		 * For bit, we assume bit(1) in the parser. So only reject cases where
 		 * the typmod is not 1.
 		 */
-		int32		typmod;
-
-		typmod = typenameTypeMod(NULL, typname, typid);
 		if (typmod != 1)
 			typmod_set = true;
 	}
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 40f9b8df8a08..80234a89abe7 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.176 2007/02/01 19:10:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.178.2.1 2010/03/25 14:45:06 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1186,23 +1186,18 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
 	char	   *valuestr;
 	HeapTuple	oldtuple,
 				newtuple;
+	Relation	rel;
 	Datum		repl_val[Natts_pg_authid];
 	bool		repl_null[Natts_pg_authid];
 	bool		repl_repl[Natts_pg_authid];
 	char	   *alter_subtype = "SET"; /* metadata tracking */
-	cqContext  *pcqCtx;
 
-	valuestr = flatten_set_variable_args(stmt->variable, stmt->value);
-
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_authid "
-				" WHERE rolname = :1 "
-				" FOR UPDATE ",
-				CStringGetDatum(stmt->role)));
-
-	oldtuple = caql_getnext(pcqCtx);
+	valuestr = ExtractSetVariableArgs(stmt->setstmt);
 
+	rel = heap_open(AuthIdRelationId, RowExclusiveLock);
+	oldtuple = SearchSysCache(AUTHNAME,
+							  PointerGetDatum(stmt->role),
+							  0, 0, 0);
 	if (!HeapTupleIsValid(oldtuple))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -1231,26 +1226,27 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
 	memset(repl_repl, false, sizeof(repl_repl));
 	repl_repl[Anum_pg_authid_rolconfig - 1] = true;
 
-	if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
+	if (stmt->setstmt->kind == VAR_RESET_ALL)
 	{
-		alter_subtype = "RESET ALL";
-
 		ArrayType  *new = NULL;
 		Datum		datum;
 		bool		isnull;
 
+		alter_subtype = "RESET ALL";
+
 		/*
 		 * in RESET ALL, request GUC to reset the settings array; if none
 		 * left, we can set rolconfig to null; otherwise use the returned
 		 * array
 		 */
-		datum = caql_getattr(pcqCtx,
-							 Anum_pg_authid_rolconfig, &isnull);
+		datum = SysCacheGetAttr(AUTHNAME, oldtuple,
+								Anum_pg_authid_rolconfig, &isnull);
 		if (!isnull)
 			new = GUCArrayReset(DatumGetArrayTypeP(datum));
 		if (new)
 		{
 			repl_val[Anum_pg_authid_rolconfig - 1] = PointerGetDatum(new);
+			repl_repl[Anum_pg_authid_rolconfig - 1] = true;
 			repl_null[Anum_pg_authid_rolconfig - 1] = false;
 		}
 		else
@@ -1268,17 +1264,17 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
 		repl_null[Anum_pg_authid_rolconfig - 1] = false;
 
 		/* Extract old value of rolconfig */
-		datum = caql_getattr(pcqCtx,
-							 Anum_pg_authid_rolconfig, &isnull);
+		datum = SysCacheGetAttr(AUTHNAME, oldtuple,
+								Anum_pg_authid_rolconfig, &isnull);
 		array = isnull ? NULL : DatumGetArrayTypeP(datum);
 
 		/* Update (valuestr is NULL in RESET cases) */
 		if (valuestr)
-			array = GUCArrayAdd(array, stmt->variable, valuestr);
+			array = GUCArrayAdd(array, stmt->setstmt->name, valuestr);
 		else
 		{
 			alter_subtype = "RESET";
-			array = GUCArrayDelete(array, stmt->variable);
+			array = GUCArrayDelete(array, stmt->setstmt->name);
 		}
 
 		if (array)
@@ -1287,11 +1283,11 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
 			repl_null[Anum_pg_authid_rolconfig - 1] = true;
 	}
 
-	newtuple = caql_modify_current(pcqCtx, 
-								   repl_val, repl_null, repl_repl);
+	newtuple = heap_modify_tuple(oldtuple, RelationGetDescr(rel),
+								 repl_val, repl_null, repl_repl);
 
-	caql_update_current(pcqCtx, newtuple);
-	/* and Update indexes (implicit) */
+	simple_heap_update(rel, &oldtuple->t_self, newtuple);
+	CatalogUpdateIndexes(rel, newtuple);
 
 	if (Gp_role == GP_ROLE_DISPATCH)
 		/* MPP-6929: metadata tracking */
@@ -1301,8 +1297,9 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
 						   "ALTER", alter_subtype
 				);
 
-	caql_endscan(pcqCtx);
+	ReleaseSysCache(oldtuple);
 	/* needn't keep lock since we won't be updating the flat file */
+	heap_close(rel, RowExclusiveLock);
 
 	if (Gp_role == GP_ROLE_DISPATCH)
 		CdbDispatchUtilityStatement((Node *) stmt, "AlterRoleSetStmt");
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 39248f5da3ab..3b555916c2d6 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.350 2007/04/16 18:29:50 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.364.2.4 2009/12/09 21:58:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,6 +31,7 @@
 #include "catalog/heap.h"
 #include "access/transam.h"
 #include "access/xact.h"
+#include "access/xlog.h"
 #include "access/appendonly_compaction.h"
 #include "access/appendonly_visimap.h"
 #include "access/aocs_compaction.h"
@@ -153,10 +154,11 @@ typedef VTupleMoveData *VTupleMove;
 typedef struct VRelStats
 {
 	/* miscellaneous statistics */
-	BlockNumber rel_pages;
-	double		rel_tuples;
-	Size		min_tlen;
-	Size		max_tlen;
+	BlockNumber rel_pages;		/* pages in relation */
+	double		rel_tuples;		/* tuples that remain after vacuuming */
+	double		rel_indexed_tuples;		/* indexed tuples that remain */
+	Size		min_tlen;		/* min surviving tuple size */
+	Size		max_tlen;		/* max surviving tuple size */
 	bool		hasindex;
 	/* vtlinks array for tuple chain following - sorted by new_tid */
 	int			num_vtlinks;
@@ -266,17 +268,20 @@ static TransactionId FreezeLimit;
 static VPgClassStats VacFullInitialStats[MaxVacFullInitialStatsSize];
 static int VacFullInitialStatsSize = 0;
 
+static BufferAccessStrategy vac_strategy;
+
 /* non-export function prototypes */
 static List *get_rel_oids(List *relids, const RangeVar *vacrel,
 			 const char *stmttype, bool rootonly);
 static void vac_truncate_clog(TransactionId frozenXID);
-static void vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_stats);
-static void full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats);
+static void vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_stats,
+		   bool for_wraparound);
+static bool full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats);
 static void scan_heap_for_truncate(VRelStats *vacrelstats, Relation onerel,
 		  VacPageList vacuum_pages);
 static void scan_heap(VRelStats *vacrelstats, Relation onerel,
 		  VacPageList vacuum_pages, VacPageList fraged_pages);
-static void repair_frag(VRelStats *vacrelstats, Relation onerel,
+static bool repair_frag(VRelStats *vacrelstats, Relation onerel,
 			VacPageList vacuum_pages, VacPageList fraged_pages,
 						int nindexes, Relation *Irel, List *updated_stats,
 						List *all_extra_oids, int reindex_count);
@@ -315,7 +320,9 @@ static Relation open_relation_and_check_permission(VacuumStmt *vacstmt,
 												   Oid relid,
 												   char expected_relkind,
 												   bool forceAccessExclusiveLock);
-static void vacuumStatement_Relation(VacuumStmt *vacstmt, Oid relid, List *relations);
+static void vacuumStatement_Relation(VacuumStmt *vacstmt, Oid relid,
+						 List *relations, BufferAccessStrategy bstrategy,
+						 bool for_wraparound, bool isTopLevel);
 
 static void
 vacuum_combine_stats(CdbDispatchResults *primaryResults,
@@ -339,13 +346,21 @@ static void vacuum_appendonly_index(Relation indexRelation,
  * relation OIDs to be processed, and vacstmt->relation is ignored.
  * (The non-NIL case is currently only used by autovacuum.)
  *
- * It is the caller's responsibility that both vacstmt and relids
+ * for_wraparound is used by autovacuum to let us know when it's forcing
+ * a vacuum for wraparound, which should not be auto-cancelled.
+ *
+ * bstrategy is normally given as NULL, but in autovacuum it can be passed
+ * in to use the same buffer strategy object across multiple vacuum() calls.
+ *
+ * isTopLevel should be passed down from ProcessUtility.
+ *
+ * It is the caller's responsibility that vacstmt, relids, and bstrategy
  * (if given) be allocated in a memory context that won't disappear
- * at transaction commit.  In fact this context must be QueryContext
- * to avoid complaints from PreventTransactionChain.
+ * at transaction commit.
  */
 void
-vacuum(VacuumStmt *vacstmt, List *relids)
+vacuum(VacuumStmt *vacstmt, List *relids,
+	   BufferAccessStrategy bstrategy, bool for_wraparound, bool isTopLevel)
 {
 	const char *stmttype = vacstmt->vacuum ? "VACUUM" : "ANALYZE";
 	volatile MemoryContext anl_context = NULL;
@@ -387,11 +402,11 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 	if (vacstmt->vacuum)
 	{
 		if (Gp_role == GP_ROLE_DISPATCH)
-			PreventTransactionChain((void *) vacstmt, stmttype);
+			PreventTransactionChain(isTopLevel, stmttype);
 		in_outer_xact = false;
 	}
 	else
-		in_outer_xact = IsInTransactionChain((void *) vacstmt);
+		in_outer_xact = IsInTransactionChain(isTopLevel);
 
 	/*
 	 * Send info about dead objects to the statistics collector, unless we are
@@ -412,6 +427,19 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 										ALLOCSET_DEFAULT_INITSIZE,
 										ALLOCSET_DEFAULT_MAXSIZE);
 
+	/*
+	 * If caller didn't give us a buffer strategy object, make one in the
+	 * cross-transaction memory context.
+	 */
+	if (bstrategy == NULL)
+	{
+		MemoryContext old_context = MemoryContextSwitchTo(vac_context);
+
+		bstrategy = GetAccessStrategy(BAS_VACUUM);
+		MemoryContextSwitchTo(old_context);
+	}
+	vac_strategy = bstrategy;
+
 	/* Remember whether we are processing everything in the DB */
 	all_rels = (relids == NIL && vacstmt->relation == NULL);
 
@@ -432,14 +460,17 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 	 * For ANALYZE (no VACUUM): if inside a transaction block, we cannot
 	 * start/commit our own transactions.  Also, there's no need to do so if
 	 * only processing one relation.  For multiple relations when not within a
-	 * transaction block, use own transactions so we can release locks sooner.
+	 * transaction block, and also in an autovacuum worker, use own
+	 * transactions so we can release locks sooner.
 	 */
 	if (vacstmt->vacuum)
 		use_own_xacts = true;
 	else
 	{
 		Assert(vacstmt->analyze);
-		if (in_outer_xact)
+		if (IsAutoVacuumWorkerProcess())
+			use_own_xacts = true;
+		else if (in_outer_xact)
 			use_own_xacts = false;
 		else if (list_length(relations) > 1)
 			use_own_xacts = true;
@@ -473,11 +504,11 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 			CommitTransactionCommand();
 	}
 
+	/* Turn vacuum cost accounting on or off */
 	PG_TRY();
 	{
 		ListCell   *cur;
 
-		/* Turn vacuum cost accounting on or off */
 		VacuumCostActive = (VacuumCostDelay > 0);
 		VacuumCostBalance = 0;
 
@@ -497,7 +528,7 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 			Oid			relid = lfirst_oid(cur);
 
 			if (vacstmt->vacuum)
-				vacuumStatement_Relation(vacstmt, relid, relations);
+				vacuumStatement_Relation(vacstmt, relid, relations, bstrategy, for_wraparound, isTopLevel);
 
 			if (vacstmt->analyze)
 			{
@@ -519,15 +550,7 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 				else
 					old_context = MemoryContextSwitchTo(anl_context);
 
-				/*
-				 * Tell the buffer replacement strategy that vacuum is causing
-				 * the IO
-				 */
-				StrategyHintVacuum(true);
-
-				analyze_rel(relid, vacstmt);
-
-				StrategyHintVacuum(false);
+				analyze_rel(relid, vacstmt, vac_strategy);
 
 				if (use_own_xacts)
 					CommitTransactionCommand();
@@ -543,8 +566,6 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 	{
 		/* Make sure cost accounting is turned off after error */
 		VacuumCostActive = false;
-		/* And reset buffer replacement strategy, too */
-		StrategyHintVacuum(false);
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
@@ -918,10 +939,12 @@ vacummStatement_IsInAppendOnlyCleanupPhase(VacuumStmt *vacstmt)
  * QE still needs to deal with concurrent work well.
  */
 static void
-vacuumStatement_Relation(VacuumStmt *vacstmt, Oid relid, List *relations)
+vacuumStatement_Relation(VacuumStmt *vacstmt, Oid relid,
+						 List *relations, BufferAccessStrategy bstrategy,
+						 bool for_wraparound, bool isTopLevel)
 {
-	Relation			onerel;
 	LOCKMODE			lmode = NoLock;
+	Relation			onerel;
 	LockRelId			onerelid;
 	MemoryContext		oldctx;
 	bool				bTemp;
@@ -993,6 +1016,35 @@ vacuumStatement_Relation(VacuumStmt *vacstmt, Oid relid, List *relations)
 		 */
 		ActiveSnapshot = CopySnapshot(GetTransactionSnapshot());
 
+		if (!vacstmt->full)
+		{
+			/*
+			 * During a lazy VACUUM we can set the PROC_IN_VACUUM flag, which lets other
+			 * concurrent VACUUMs know that they can ignore this one while
+			 * determining their OldestXmin.  (The reason we don't set it during a
+			 * full VACUUM is exactly that we may have to run user- defined
+			 * functions for functional indexes, and we want to make sure that if
+			 * they use the snapshot set above, any tuples it requires can't get
+			 * removed from other tables.  An index function that depends on the
+			 * contents of other tables is arguably broken, but we won't break it
+			 * here by violating transaction semantics.)
+			 *
+			 * We also set the VACUUM_FOR_WRAPAROUND flag, which is passed down
+			 * by autovacuum; it's used to avoid cancelling a vacuum that was
+			 * invoked in an emergency.
+			 *
+			 * Note: this flag remains set until CommitTransaction or
+			 * AbortTransaction.  We don't want to clear it until we reset
+			 * MyProc->xid/xmin, else OldestXmin might appear to go backwards,
+			 * which is probably Not Good.
+			 */
+			LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+			MyProc->vacuumFlags |= PROC_IN_VACUUM;
+			if (for_wraparound)
+				MyProc->vacuumFlags |= PROC_VACUUM_FOR_WRAPAROUND;
+			LWLockRelease(ProcArrayLock);
+		}
+
 		/*
 		 * AO only: QE can tell drop phase here with dispatched vacstmt.
 		 */
@@ -1144,7 +1196,7 @@ vacuumStatement_Relation(VacuumStmt *vacstmt, Oid relid, List *relations)
 		 * that we can clear up its freespace map entry when the
 		 * vacuum process crashes or is cancelled.
 		 *
-		 * XXX: Have to allocate the space inside ToMemoryContext,
+		 * XXX: Have to allocate the space inside TopMemoryContext,
 		 * since it is required during commit.
 		 */
 		oldctx = MemoryContextSwitchTo(TopMemoryContext);
@@ -1202,7 +1254,8 @@ vacuumStatement_Relation(VacuumStmt *vacstmt, Oid relid, List *relations)
 			 */
 			LockRelationIdForSession(&onerelid, lmode);
 		}
-		vacuum_rel(onerel, vacstmt, lmode, stats_context.updated_stats);
+		vacuum_rel(onerel, vacstmt, lmode, stats_context.updated_stats,
+				   for_wraparound);
 
 		if (Gp_role == GP_ROLE_DISPATCH)
 		{
@@ -1414,7 +1467,7 @@ get_rel_oids(List *relids, const RangeVar *vacrel, const char *stmttype,
  * vacuum_set_xid_limits() -- compute oldest-Xmin and freeze cutoff points
  */
 void
-vacuum_set_xid_limits(VacuumStmt *vacstmt, bool sharedRel,
+vacuum_set_xid_limits(int freeze_min_age, bool sharedRel,
 					  TransactionId *oldestXmin,
 					  TransactionId *freezeLimit)
 {
@@ -1425,23 +1478,23 @@ vacuum_set_xid_limits(VacuumStmt *vacstmt, bool sharedRel,
 	/*
 	 * We can always ignore processes running lazy vacuum.	This is because we
 	 * use these values only for deciding which tuples we must keep in the
-	 * tables.	Since lazy vacuum doesn't write its XID anywhere, it's
-	 * safe to ignore it.  In theory it could be problematic to ignore lazy
-	 * vacuums on a full vacuum, but keep in mind that only one vacuum process
-	 * can be working on a particular table at any time, and that each vacuum
-	 * is always an independent transaction.
+	 * tables.	Since lazy vacuum doesn't write its XID anywhere, it's safe to
+	 * ignore it.  In theory it could be problematic to ignore lazy vacuums on
+	 * a full vacuum, but keep in mind that only one vacuum process can be
+	 * working on a particular table at any time, and that each vacuum is
+	 * always an independent transaction.
 	 */
-	*oldestXmin = GetOldestXmin(sharedRel);
+	*oldestXmin = GetOldestXmin(sharedRel, true);
 
 	Assert(TransactionIdIsNormal(*oldestXmin));
 
 	/*
-	 * Determine the minimum freeze age to use: as specified in the vacstmt,
-	 * or vacuum_freeze_min_age, but in any case not more than half
+	 * Determine the minimum freeze age to use: as specified by the caller, or
+	 * vacuum_freeze_min_age, but in any case not more than half
 	 * autovacuum_freeze_max_age, so that autovacuums to prevent XID
 	 * wraparound won't occur too frequently.
 	 */
-	freezemin = vacstmt->freeze_min_age;
+	freezemin = freeze_min_age;
 	if (freezemin < 0)
 		freezemin = vacuum_freeze_min_age;
 	freezemin = Min(freezemin, autovacuum_freeze_max_age / 2);
@@ -1456,8 +1509,8 @@ vacuum_set_xid_limits(VacuumStmt *vacstmt, bool sharedRel,
 
 	/*
 	 * If oldestXmin is very far back (in practice, more than
-	 * autovacuum_freeze_max_age / 2 XIDs old), complain and force a
-	 * minimum freeze age of zero.
+	 * autovacuum_freeze_max_age / 2 XIDs old), complain and force a minimum
+	 * freeze age of zero.
 	 */
 	safeLimit = ReadNewTransactionId() - autovacuum_freeze_max_age;
 	if (!TransactionIdIsNormal(safeLimit))
@@ -1526,9 +1579,9 @@ vac_update_relstats_from_list(Relation rel,
  *		fixed-size never-null columns, but these are.
  *
  *		Another reason for doing it this way is that when we are in a lazy
- *		VACUUM and have inVacuum set, we mustn't do any updates --- somebody
- *		vacuuming pg_class might think they could delete a tuple marked with
- *		xmin = our xid.
+ *		VACUUM and have PROC_IN_VACUUM set, we mustn't do any updates ---
+ *		somebody vacuuming pg_class might think they could delete a tuple
+ *		marked with xmin = our xid.
  *
  *		This routine is shared by full VACUUM, lazy VACUUM, and stand-alone
  *		ANALYZE.
@@ -1672,7 +1725,7 @@ vac_update_relstats(Oid relid, BlockNumber num_pages, double num_tuples,
  *		advance pg_database.datfrozenxid, also try to truncate pg_clog.
  *
  *		We violate transaction semantics here by overwriting the database's
- *		existing pg_database tuple with the new value.  This is reasonably
+ *		existing pg_database tuple with the new value.	This is reasonably
  *		safe since the new value is correct whether or not this transaction
  *		commits.  As with vac_update_relstats, this avoids leaving dead tuples
  *		behind after a VACUUM.
@@ -1698,7 +1751,7 @@ vac_update_datfrozenxid(void)
 	 * committed pg_class entries for new tables; see AddNewRelationTuple().
 	 * Se we cannot produce a wrong minimum by starting with this.
 	 */
-	newFrozenXid = GetOldestXmin(true);
+	newFrozenXid = GetOldestXmin(true, true);
 
 	/*
 	 * We must seqscan pg_class to find the minimum Xid, because there is no
@@ -1780,8 +1833,7 @@ vac_update_datfrozenxid(void)
 
 	/*
 	 * If we were able to advance datfrozenxid, mark the flat-file copy of
-	 * pg_database for update at commit, and see if we can truncate
-	 * pg_clog.
+	 * pg_database for update at commit, and see if we can truncate pg_clog.
 	 */
 	if (dirty)
 	{
@@ -1825,10 +1877,10 @@ vac_truncate_clog(TransactionId frozenXID)
 	 * inserted by CREATE DATABASE.  Any such entry will have a copy of some
 	 * existing DB's datfrozenxid, and that source DB cannot be ours because
 	 * of the interlock against copying a DB containing an active backend.
-	 * Hence the new entry will not reduce the minimum.  Also, if two
-	 * VACUUMs concurrently modify the datfrozenxid's of different databases,
-	 * the worst possible outcome is that pg_clog is not truncated as
-	 * aggressively as it could be.
+	 * Hence the new entry will not reduce the minimum.  Also, if two VACUUMs
+	 * concurrently modify the datfrozenxid's of different databases, the
+	 * worst possible outcome is that pg_clog is not truncated as aggressively
+	 * as it could be.
 	 */
 	pcqCtx = caql_beginscan(
 			caql_indexOK(cqclr(&cqc), false),
@@ -1902,7 +1954,8 @@ vac_truncate_clog(TransactionId frozenXID)
  *		us to lock the entire database during one pass of the vacuum cleaner.
  */
 static void
-vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_stats)
+vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_stats,
+		   bool for_wraparound)
 {
 	Oid			toast_relid;
 	Oid			aoseg_relid = InvalidOid;
@@ -1911,6 +1964,7 @@ vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_s
 	Oid			save_userid;
 	int			save_sec_context;
 	int			save_nestlevel;
+	bool		heldoff;
 
 	/*
 	 * Check for user-requested abort.	Note we want this to be inside a
@@ -1944,21 +1998,13 @@ vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_s
 						   save_sec_context | SECURITY_RESTRICTED_OPERATION);
 	save_nestlevel = NewGUCNestLevel();
 
-	/*
-	 * Tell the cache replacement strategy that vacuum is causing all
-	 * following IO
-	 */
-	StrategyHintVacuum(true);
-
 	/*
 	 * Do the actual work --- either FULL or "lazy" vacuum
 	 */
 	if (vacstmt->full)
-		full_vacuum_rel(onerel, vacstmt, updated_stats);
+		heldoff = full_vacuum_rel(onerel, vacstmt, updated_stats);
 	else
-		lazy_vacuum_rel(onerel, vacstmt, updated_stats);
-
-	StrategyHintVacuum(false);
+		heldoff = lazy_vacuum_rel(onerel, vacstmt, vac_strategy, updated_stats);
 
 	/* Roll back any GUC changes executed by index functions */
 	AtEOXact_GUC(false, save_nestlevel);
@@ -1966,11 +2012,15 @@ vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_s
 	/* Restore userid and security context */
 	SetUserIdAndSecContext(save_userid, save_sec_context);
 
+	/* now we can allow interrupts again, if disabled */
+	if (heldoff)
+		RESUME_INTERRUPTS();
+
 	/*
-	 * If the relation has a secondary toast rel, vacuum that too
-	 * while we still hold the session lock on the master table.  We
-	 * do this in cleanup phase when it's AO table or in prepare phase
-	 * if it's an empty AO table.
+	 * If the relation has a secondary toast rel, vacuum that too while we
+	 * still hold the session lock on the master table.  We do this in
+	 * cleanup phase when it's AO table or in prepare phase if it's an
+	 * empty AO table.
 	 */
 	if ((RelationIsHeap(onerel) && toast_relid != InvalidOid) ||
 		(!RelationIsHeap(onerel) && (
@@ -1981,7 +2031,7 @@ vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_s
 																RELKIND_TOASTVALUE, false);
 		if (toast_rel != NULL)
 		{
-			vacuum_rel(toast_rel, vacstmt, lmode, updated_stats);
+			vacuum_rel(toast_rel, vacstmt, lmode, updated_stats, for_wraparound);
 
 			/* all done with this class, but hold lock until commit */
 			relation_close(toast_rel, NoLock);
@@ -2008,7 +2058,7 @@ vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_s
 																	RELKIND_AOSEGMENTS, false);
 			if (aoseg_rel != NULL)
 			{
-				vacuum_rel(aoseg_rel, vacstmt, lmode, updated_stats);
+				vacuum_rel(aoseg_rel, vacstmt, lmode, updated_stats, for_wraparound);
 
 				/* all done with this class, but hold lock until commit */
 				relation_close(aoseg_rel, NoLock);
@@ -2022,7 +2072,7 @@ vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_s
 																	   RELKIND_AOBLOCKDIR, false);
 			if (aoblkdir_rel != NULL)
 			{
-				vacuum_rel(aoblkdir_rel, vacstmt, lmode, updated_stats);
+				vacuum_rel(aoblkdir_rel, vacstmt, lmode, updated_stats, for_wraparound);
 
 				/* all done with this class, but hold lock until commit */
 				relation_close(aoblkdir_rel, NoLock);
@@ -2036,7 +2086,7 @@ vacuum_rel(Relation onerel, VacuumStmt *vacstmt, LOCKMODE lmode, List *updated_s
 																	   RELKIND_AOVISIMAP, false);
 			if (aovisimap_rel != NULL)
 			{
-				vacuum_rel(aovisimap_rel, vacstmt, lmode, updated_stats);
+				vacuum_rel(aovisimap_rel, vacstmt, lmode, updated_stats, for_wraparound);
 
 				/* all done with this class, but hold lock until commit */
 				relation_close(aovisimap_rel, NoLock);
@@ -2254,7 +2304,7 @@ vacuum_appendonly_indexes(Relation aoRelation,
  * end pages are still empty, and truncate if so.  In the second transaction,
  * we don't check the number of tuple integrity with indexes.
  */
-static void
+static bool
 vacuum_heap_rel(Relation onerel, VacuumStmt *vacstmt,
 		VRelStats *vacrelstats, List *updated_stats)
 {
@@ -2270,19 +2320,42 @@ vacuum_heap_rel(Relation onerel, VacuumStmt *vacstmt,
 
 	Relation   *Irel;
 	int			nindexes;
-	int i;
-	int reindex_count = 1;
+	int			i;
+	bool		heldoff = false;
+	int			reindex_count = 1;
 	bool		check_stats;
+	bool		save_disable_tuple_hints;
 
 	Assert(RelationIsHeap(onerel));
 
-	/* scan the heap */
+	/*
+	 * scan the heap
+	 *
+	 * repair_frag() assumes that scan_heap() has set all hint bits on the
+	 * tuples, so temporarily turn off 'gp_disable_tuple_hints', i.e. allow
+	 * hint bits to be set, if we're running in FULL mode.
+	 */
 	vacuum_pages.num_pages = fraged_pages.num_pages = 0;
 
-	if (vacstmt->heap_truncate)
-		scan_heap_for_truncate(vacrelstats, onerel, &vacuum_pages);
-	else
-		scan_heap(vacrelstats, onerel, &vacuum_pages, &fraged_pages);
+	save_disable_tuple_hints = gp_disable_tuple_hints;
+	PG_TRY();
+	{
+		if (vacstmt->full)
+			gp_disable_tuple_hints = false;
+
+		if (vacstmt->heap_truncate)
+			scan_heap_for_truncate(vacrelstats, onerel, &vacuum_pages);
+		else
+			scan_heap(vacrelstats, onerel, &vacuum_pages, &fraged_pages);
+
+		gp_disable_tuple_hints = save_disable_tuple_hints;
+	}
+	PG_CATCH();
+	{
+		gp_disable_tuple_hints = save_disable_tuple_hints;
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
 
 	/* Now open all indexes of the relation */
 	vac_open_indexes(onerel, AccessExclusiveLock, &nindexes, &Irel);
@@ -2307,7 +2380,7 @@ vacuum_heap_rel(Relation onerel, VacuumStmt *vacstmt,
 										onerel, reindex_count);
 
 				vacuum_index(&vacuum_pages, Irel[i],
-							 vacrelstats->rel_tuples, 0, updated_stats,
+							 vacrelstats->rel_indexed_tuples, 0, updated_stats,
 							 extra_oids, check_stats);
 				list_free(extra_oids);
 			}
@@ -2317,7 +2390,7 @@ vacuum_heap_rel(Relation onerel, VacuumStmt *vacstmt,
 		{
 			/* just scan indexes to update statistic */
 			for (i = 0; i < nindexes; i++)
-				scan_index(Irel[i], vacrelstats->rel_tuples, updated_stats, true,
+				scan_index(Irel[i], vacrelstats->rel_indexed_tuples, updated_stats, true,
 						   check_stats);
 		}
 	}
@@ -2353,8 +2426,8 @@ vacuum_heap_rel(Relation onerel, VacuumStmt *vacstmt,
 		if (fraged_pages.num_pages > 0)
 		{
 			/* Try to shrink heap */
-			repair_frag(vacrelstats, onerel, &vacuum_pages, &fraged_pages,
-						nindexes, Irel, updated_stats, vacstmt->extra_oids, reindex_count);
+			heldoff = repair_frag(vacrelstats, onerel, &vacuum_pages, &fraged_pages,
+								  nindexes, Irel, updated_stats, vacstmt->extra_oids, reindex_count);
 			vac_close_indexes(nindexes, Irel, NoLock);
 		}
 		else
@@ -2376,26 +2449,40 @@ vacuum_heap_rel(Relation onerel, VacuumStmt *vacstmt,
 		/* update shared free space map with final free space info */
 		vac_update_fsm(onerel, &fraged_pages, vacrelstats->rel_pages);
 	}
+
+	return heldoff;
 }
 
 /*
- * full_vacuum_rel() -- perform FULL VACUUM for one relation
+ *	full_vacuum_rel() -- perform FULL VACUUM for one heap relation
+ *
+ *		This routine vacuums a single heap, cleans out its indexes, and
+ *		updates its num_pages and num_tuples statistics.
  *
- * This routine vacuums a single relation, cleans out its indexes, and
- * updates its num_pages and num_tuples statistics.
+ *		At entry, we have already established a transaction and opened
+ *		and locked the relation.
  *
- * At entry, we have already established a transaction and opened
- * and locked the relation.
+ *		The return value indicates whether this function has held off
+ *		interrupts -- caller must RESUME_INTERRUPTS() after commit if true.
  */
-static void
+static bool
 full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 {
 	VRelStats* vacrelstats;
+	bool		heldoff = false;
 	bool update_relstats = true;
 
-	vacuum_set_xid_limits(vacstmt, onerel->rd_rel->relisshared,
+	vacuum_set_xid_limits(vacstmt->freeze_min_age, onerel->rd_rel->relisshared,
 						  &OldestXmin, &FreezeLimit);
 
+	/*
+	 * Flush any previous async-commit transactions.  This does not guarantee
+	 * that we will be able to set hint bits for tuples they inserted, but it
+	 * improves the probability, especially in simple sequential-commands
+	 * cases.  See scan_heap() and repair_frag() for more about this.
+	 */
+	XLogAsyncCommitFlush();
+
 	/*
 	 * Set up statistics-gathering machinery.
 	 */
@@ -2441,7 +2528,7 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 	else
 	{
 		/* For heap. */
-		vacuum_heap_rel(onerel, vacstmt, vacrelstats, updated_stats);
+		heldoff = vacuum_heap_rel(onerel, vacstmt, vacrelstats, updated_stats);
 	}
 
 	/* Do not run update the relstats if the vacuuming has been skipped */
@@ -2458,6 +2545,8 @@ full_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 	}
 
 	pfree(vacrelstats);
+
+	return heldoff;
 }
 
 /*
@@ -2531,7 +2620,7 @@ scan_heap_for_truncate(VRelStats *vacrelstats, Relation onerel,
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buf = ReadBuffer(onerel, blkno);
+		buf = ReadBufferWithStrategy(onerel, blkno, vac_strategy);
 		page = BufferGetPage(buf);
 
 		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
@@ -2569,11 +2658,14 @@ scan_heap_for_truncate(VRelStats *vacrelstats, Relation onerel,
 			if (!ItemIdIsUsed(itemid))
 				continue;
 
+			if (ItemIdIsDead(itemid))
+				continue;
+
 			tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid);
 			tuple.t_len = ItemIdGetLength(itemid);
 			ItemPointerSet(&(tuple.t_self), blkno, offnum);
 
-			switch (HeapTupleSatisfiesVacuum(tuple.t_data, OldestXmin, buf))
+			switch (HeapTupleSatisfiesVacuum(onerel, tuple.t_data, OldestXmin, buf))
 			{
 				case HEAPTUPLE_DEAD:
 					tupgone = true;
@@ -2672,6 +2764,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 	BlockNumber empty_pages,
 				empty_end_pages;
 	double		num_tuples,
+				num_indexed_tuples,
 				tups_vacuumed,
 				nkeep,
 				nunused;
@@ -2694,7 +2787,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 					relname)));
 
 	empty_pages = empty_end_pages = 0;
-	num_tuples = tups_vacuumed = nkeep = nunused = 0;
+	num_tuples = num_indexed_tuples = tups_vacuumed = nkeep = nunused = 0;
 	free_space = 0;
 
 	nblocks = RelationGetNumberOfBlocks(onerel);
@@ -2726,7 +2819,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buf = ReadBuffer(onerel, blkno);
+		buf = ReadBufferWithStrategy(onerel, blkno, vac_strategy);
 		page = BufferGetPage(buf);
 
 		/*
@@ -2735,9 +2828,14 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 		 * background writer will try to write the page if it's already marked
 		 * dirty.  To ensure that invalid data doesn't get written to disk, we
 		 * must take exclusive buffer lock wherever we potentially modify
-		 * pages.
+		 * pages.  In fact, we insist on cleanup lock so that we can safely
+		 * call heap_page_prune().	(This might be overkill, since the
+		 * bgwriter pays no attention to individual tuples, but on the other
+		 * hand it's unlikely that the bgwriter has this particular page
+		 * pinned at this instant.	So violating the coding rule would buy us
+		 * little anyway.)
 		 */
-		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
+		LockBufferForCleanup(buf);
 
 		vacpage->blkno = blkno;
 		vacpage->offsets_used = 0;
@@ -2786,6 +2884,21 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 			continue;
 		}
 
+		/*
+		 * Prune all HOT-update chains in this page.
+		 *
+		 * We use the redirect_move option so that redirecting line pointers
+		 * get collapsed out; this allows us to not worry about them below.
+		 *
+		 * We count tuples removed by the pruning step as removed by VACUUM.
+		 */
+		tups_vacuumed += heap_page_prune(onerel, buf, OldestXmin,
+										 true, false);
+
+		/*
+		 * Now scan the page to collect vacuumable items and check for tuples
+		 * requiring freezing.
+		 */
 		nfrozen = 0;
 		notup = true;
 		maxoff = PageGetMaxOffsetNumber(page);
@@ -2799,7 +2912,9 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 
 			/*
 			 * Collect un-used items too - it's possible to have indexes
-			 * pointing here after crash.
+			 * pointing here after crash.  (That's an ancient comment and is
+			 * likely obsolete with WAL, but we might as well continue to
+			 * check for such problems.)
 			 */
 			if (!ItemIdIsUsed(itemid))
 			{
@@ -2808,21 +2923,97 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 				continue;
 			}
 
+			/*
+			 * DEAD item pointers are to be vacuumed normally; but we don't
+			 * count them in tups_vacuumed, else we'd be double-counting (at
+			 * least in the common case where heap_page_prune() just freed up
+			 * a non-HOT tuple).
+			 */
+			if (ItemIdIsDead(itemid))
+			{
+				vacpage->offsets[vacpage->offsets_free++] = offnum;
+				continue;
+			}
+
+			/* Shouldn't have any redirected items anymore */
+			if (!ItemIdIsNormal(itemid))
+				elog(ERROR, "relation \"%s\" TID %u/%u: unexpected redirect item",
+					 relname, blkno, offnum);
+
 			tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid);
 			tuple.t_len = ItemIdGetLength(itemid);
 			ItemPointerSet(&(tuple.t_self), blkno, offnum);
 
-			switch (HeapTupleSatisfiesVacuum(tuple.t_data, OldestXmin, buf))
+			switch (HeapTupleSatisfiesVacuum(onerel, tuple.t_data, OldestXmin, buf))
 			{
-				case HEAPTUPLE_DEAD:
-					tupgone = true;		/* we can delete the tuple */
-					break;
 				case HEAPTUPLE_LIVE:
 					/* Tuple is good --- but let's do some validity checks */
 					if (onerel->rd_rel->relhasoids &&
 						!OidIsValid(HeapTupleGetOid(&tuple)))
 						elog(WARNING, "relation \"%s\" TID %u/%u: OID is invalid",
 							 relname, blkno, offnum);
+
+					/*
+					 * The shrinkage phase of VACUUM FULL requires that all
+					 * live tuples have XMIN_COMMITTED set --- see comments in
+					 * repair_frag()'s walk-along-page loop.  Use of async
+					 * commit may prevent HeapTupleSatisfiesVacuum from
+					 * setting the bit for a recently committed tuple.	Rather
+					 * than trying to handle this corner case, we just give up
+					 * and don't shrink.
+					 */
+					if (do_shrinking &&
+						!(tuple.t_data->t_infomask & HEAP_XMIN_COMMITTED))
+					{
+						ereport(LOG,
+								(errmsg("relation \"%s\" TID %u/%u: XMIN_COMMITTED not set for transaction %u --- cannot shrink relation",
+										relname, blkno, offnum,
+									 HeapTupleHeaderGetXmin(tuple.t_data))));
+						do_shrinking = false;
+					}
+					break;
+				case HEAPTUPLE_DEAD:
+
+					/*
+					 * Ordinarily, DEAD tuples would have been removed by
+					 * heap_page_prune(), but it's possible that the tuple
+					 * state changed since heap_page_prune() looked.  In
+					 * particular an INSERT_IN_PROGRESS tuple could have
+					 * changed to DEAD if the inserter aborted.  So this
+					 * cannot be considered an error condition, though it does
+					 * suggest that someone released a lock early.
+					 *
+					 * If the tuple is HOT-updated then it must only be
+					 * removed by a prune operation; so we keep it as if it
+					 * were RECENTLY_DEAD, and abandon shrinking. (XXX is it
+					 * worth trying to make the shrinking code smart enough to
+					 * handle this?  It's an unusual corner case.)
+					 *
+					 * DEAD heap-only tuples can safely be removed if they
+					 * aren't themselves HOT-updated, although this is a bit
+					 * inefficient since we'll uselessly try to remove index
+					 * entries for them.
+					 */
+					if (HeapTupleIsHotUpdated(&tuple))
+					{
+						nkeep += 1;
+						if (do_shrinking)
+							ereport(LOG,
+									(errmsg("relation \"%s\" TID %u/%u: dead HOT-updated tuple --- cannot shrink relation",
+											relname, blkno, offnum)));
+						do_shrinking = false;
+					}
+					else
+					{
+						tupgone = true; /* we can delete the tuple */
+
+						/*
+						 * We need not require XMIN_COMMITTED or
+						 * XMAX_COMMITTED to be set, since we will remove the
+						 * tuple without any further examination of its hint
+						 * bits.
+						 */
+					}
 					break;
 				case HEAPTUPLE_RECENTLY_DEAD:
 
@@ -2832,6 +3023,20 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 					 */
 					nkeep += 1;
 
+					/*
+					 * As with the LIVE case, shrinkage requires
+					 * XMIN_COMMITTED to be set.
+					 */
+					if (do_shrinking &&
+						!(tuple.t_data->t_infomask & HEAP_XMIN_COMMITTED))
+					{
+						ereport(LOG,
+								(errmsg("relation \"%s\" TID %u/%u: XMIN_COMMITTED not set for transaction %u --- cannot shrink relation",
+										relname, blkno, offnum,
+									 HeapTupleHeaderGetXmin(tuple.t_data))));
+						do_shrinking = false;
+					}
+
 					/*
 					 * If we do shrinking and this tuple is updated one then
 					 * remember it to construct updated tuple dependencies.
@@ -2857,26 +3062,34 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 
 					/*
 					 * This should not happen, since we hold exclusive lock on
-					 * the relation; shouldn't we raise an error? (Actually,
+					 * the relation; shouldn't we raise an error?  (Actually,
 					 * it can happen in system catalogs, since we tend to
-					 * release write lock before commit there.)
+					 * release write lock before commit there.)  As above, we
+					 * can't apply repair_frag() if the tuple state is
+					 * uncertain.
 					 */
-					ereport(NOTICE,
-							(errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation",
-									relname, blkno, offnum, HeapTupleHeaderGetXmin(tuple.t_data))));
+					if (do_shrinking)
+						ereport(LOG,
+								(errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation",
+										relname, blkno, offnum,
+									 HeapTupleHeaderGetXmin(tuple.t_data))));
 					do_shrinking = false;
 					break;
 				case HEAPTUPLE_DELETE_IN_PROGRESS:
 
 					/*
 					 * This should not happen, since we hold exclusive lock on
-					 * the relation; shouldn't we raise an error? (Actually,
+					 * the relation; shouldn't we raise an error?  (Actually,
 					 * it can happen in system catalogs, since we tend to
-					 * release write lock before commit there.)
+					 * release write lock before commit there.)  As above, we
+					 * can't apply repair_frag() if the tuple state is
+					 * uncertain.
 					 */
-					ereport(NOTICE,
-							(errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation",
-									relname, blkno, offnum, HeapTupleHeaderGetXmax(tuple.t_data))));
+					if (do_shrinking)
+						ereport(LOG,
+								(errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation",
+										relname, blkno, offnum,
+									 HeapTupleHeaderGetXmax(tuple.t_data))));
 					do_shrinking = false;
 					break;
 				default:
@@ -2907,7 +3120,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 
 				/* mark it unused on the temp page */
 				lpp = PageGetItemId(tempPage, offnum);
-				lpp->lp_flags &= ~LP_USED;
+				ItemIdSetUnused(lpp);
 
 				vacpage->offsets[vacpage->offsets_free++] = offnum;
 				tups_vacuumed += 1;
@@ -2915,6 +3128,8 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 			else
 			{
 				num_tuples += 1;
+				if (!HeapTupleIsHeapOnly(&tuple))
+					num_indexed_tuples += 1;
 				notup = false;
 				if (tuple.t_len < min_tlen)
 					min_tlen = tuple.t_len;
@@ -2922,8 +3137,8 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 					max_tlen = tuple.t_len;
 
 				/*
-				 * Each non-removable tuple must be checked to see if it
-				 * needs freezing.
+				 * Each non-removable tuple must be checked to see if it needs
+				 * freezing.
 				 */
 				if (heap_freeze_tuple(tuple.t_data, FreezeLimit,
 									  InvalidBuffer))
@@ -2934,7 +3149,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 		if (tempPage != NULL)
 		{
 			/* Some tuples are removable; figure free space after removal */
-			PageRepairFragmentation(tempPage, NULL);
+			PageRepairFragmentation(tempPage);
 			vacpage->free = PageGetFreeSpaceWithFillFactor(onerel, tempPage);
 			pfree(tempPage);
 			do_reap = true;
@@ -2943,7 +3158,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 		{
 			/* Just use current available space */
 			vacpage->free = PageGetFreeSpaceWithFillFactor(onerel, page);
-			/* Need to reap the page if it has ~LP_USED line pointers */
+			/* Need to reap the page if it has UNUSED or DEAD line pointers */
 			do_reap = (vacpage->offsets_free > 0);
 		}
 
@@ -3017,6 +3232,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 
 	/* save stats in the rel list for use later */
 	vacrelstats->rel_tuples = num_tuples;
+	vacrelstats->rel_indexed_tuples = num_indexed_tuples;
 	vacrelstats->rel_pages = nblocks;
 	if (num_tuples == 0)
 		min_tlen = max_tlen = 0;
@@ -3092,8 +3308,11 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
  *		for them after committing (in hack-manner - without losing locks
  *		and freeing memory!) current transaction. It truncates relation
  *		if some end-blocks are gone away.
+ *
+ *		The return value indicates whether this function has held off
+ *		interrupts -- caller must RESUME_INTERRUPTS() after commit if true.
  */
-static void
+static bool
 repair_frag(VRelStats *vacrelstats, Relation onerel,
 			VacPageList vacuum_pages, VacPageList fraged_pages,
 			int nindexes, Relation *Irel, List *updated_stats,
@@ -3119,7 +3338,9 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 				num_fraged_pages,
 				vacuumed_pages;
 	int			keep_tuples = 0;
+	int			keep_indexed_tuples = 0;
 	PGRUsage	ru0;
+	bool		heldoff = false;
 
 	pg_rusage_init(&ru0);
 
@@ -3195,7 +3416,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 		// -------- MirroredLock ----------
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buf = ReadBuffer(onerel, blkno);
+		buf = ReadBufferWithStrategy(onerel, blkno, vac_strategy);
 		page = BufferGetPage(buf);
 
 		vacpage->offsets_free = 0;
@@ -3255,6 +3476,16 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 			if (!ItemIdIsUsed(itemid))
 				continue;
 
+			if (ItemIdIsDead(itemid))
+			{
+				/* just remember it for vacuum_page() */
+				vacpage->offsets[vacpage->offsets_free++] = offnum;
+				continue;
+			}
+
+			/* Shouldn't have any redirected items now */
+			Assert(ItemIdIsNormal(itemid));
+
 			tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid);
 			tuple_len = tuple.t_len = ItemIdGetLength(itemid);
 			ItemPointerSet(&(tuple.t_self), blkno, offnum);
@@ -3263,19 +3494,21 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 			 * VACUUM FULL has an exclusive lock on the relation.  So
 			 * normally no other transaction can have pending INSERTs or
 			 * DELETEs in this relation.  A tuple is either:
-			 *		(a) a tuple in a system catalog, inserted or deleted
-			 *			by a not yet committed transaction
+			 *		(a) live (XMIN_COMMITTED)
 			 *		(b) known dead (XMIN_INVALID, or XMAX_COMMITTED and xmax
 			 *			is visible to all active transactions)
-			 *		(c) inserted by a committed xact (XMIN_COMMITTED)
-			 *		(d) moved by the currently running VACUUM.
-			 *		(e) deleted (XMAX_COMMITTED) but at least one active
-			 *			transaction does not see the deleting transaction
-			 * In case (a) we wouldn't be in repair_frag() at all.
-			 * In case (b) we cannot be here, because scan_heap() has
-			 * already marked the item as unused, see continue above. Case
-			 * (c) is what normally is to be expected. Case (d) is only
-			 * possible, if a whole tuple chain has been moved while
+			 *		(c) inserted and deleted (XMIN_COMMITTED+XMAX_COMMITTED)
+			 *			but at least one active transaction does not see the
+			 *			deleting transaction (ie, it's RECENTLY_DEAD)
+			 *		(d) moved by the currently running VACUUM
+			 *		(e) inserted or deleted by a not yet committed transaction,
+			 *			or by a transaction we couldn't set XMIN_COMMITTED for.
+			 * In case (e) we wouldn't be in repair_frag() at all, because
+			 * scan_heap() detects those cases and shuts off shrinking.
+			 * We can't see case (b) here either, because such tuples were
+			 * already removed by vacuum_page().  Cases (a) and (c) are
+			 * normal and will have XMIN_COMMITTED set.  Case (d) is only
+			 * possible if a whole tuple chain has been moved while
 			 * processing this or a higher numbered block.
 			 * ---
 			 */
@@ -3295,7 +3528,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 			 * the hint bits again, if not set already.
 			 */
 			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
-			(void) HeapTupleSatisfiesVacuum(tuple.t_data, OldestXmin, buf);
+			(void) HeapTupleSatisfiesVacuum(onerel, tuple.t_data, OldestXmin, buf);
 			LockBuffer(buf, BUFFER_LOCK_UNLOCK);
 
 			if (!(tuple.t_data->t_infomask & HEAP_XMIN_COMMITTED))
@@ -3333,12 +3566,30 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 					if (i >= vacpage->offsets_free)		/* not found */
 					{
 						vacpage->offsets[vacpage->offsets_free++] = offnum;
+
+						/*
+						 * If this is not a heap-only tuple, there must be an
+						 * index entry for this item which will be removed in
+						 * the index cleanup. Decrement the
+						 * keep_indexed_tuples count to remember this.
+						 */
+						if (!HeapTupleHeaderIsHeapOnly(tuple.t_data))
+							keep_indexed_tuples--;
 						keep_tuples--;
 					}
 				}
 				else
 				{
 					vacpage->offsets[vacpage->offsets_free++] = offnum;
+
+					/*
+					 * If this is not a heap-only tuple, there must be an
+					 * index entry for this item which will be removed in the
+					 * index cleanup. Decrement the keep_indexed_tuples count
+					 * to remember this.
+					 */
+					if (!HeapTupleHeaderIsHeapOnly(tuple.t_data))
+						keep_indexed_tuples--;
 					keep_tuples--;
 				}
 				continue;
@@ -3417,11 +3668,11 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 				 * If this tuple is in the begin/middle of the chain then we
 				 * have to move to the end of chain.  As with any t_ctid
 				 * chase, we have to verify that each new tuple is really the
-				 * descendant of the tuple we came from; however, here we
-				 * need even more than the normal amount of paranoia.
-				 * If t_ctid links forward to a tuple determined to be DEAD,
-				 * then depending on where that tuple is, it might already
-				 * have been removed, and perhaps even replaced by a MOVED_IN
+				 * descendant of the tuple we came from; however, here we need
+				 * even more than the normal amount of paranoia. If t_ctid
+				 * links forward to a tuple determined to be DEAD, then
+				 * depending on where that tuple is, it might already have
+				 * been removed, and perhaps even replaced by a MOVED_IN
 				 * tuple.  We don't want to include any DEAD tuples in the
 				 * chain, so we have to recheck HeapTupleSatisfiesVacuum.
 				 */
@@ -3437,13 +3688,14 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 					OffsetNumber nextOffnum;
 					ItemId		nextItemid;
 					HeapTupleHeader nextTdata;
-					HTSV_Result	nextTstatus;
+					HTSV_Result nextTstatus;
 
 					nextTid = tp.t_data->t_ctid;
 					priorXmax = HeapTupleHeaderGetXmax(tp.t_data);
 					/* assume block# is OK (see heap_fetch comments) */
-					nextBuf = ReadBuffer(onerel,
-										 ItemPointerGetBlockNumber(&nextTid));
+					nextBuf = ReadBufferWithStrategy(onerel,
+										 ItemPointerGetBlockNumber(&nextTid),
+													 vac_strategy);
 					nextPage = BufferGetPage(nextBuf);
 					/* If bogus or unused slot, assume tp is end of chain */
 					nextOffnum = ItemPointerGetOffsetNumber(&nextTid);
@@ -3454,7 +3706,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 						break;
 					}
 					nextItemid = PageGetItemId(nextPage, nextOffnum);
-					if (!ItemIdIsUsed(nextItemid))
+					if (!ItemIdIsNormal(nextItemid))
 					{
 						ReleaseBuffer(nextBuf);
 						break;
@@ -3468,16 +3720,24 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 						ReleaseBuffer(nextBuf);
 						break;
 					}
-					/* must check for DEAD or MOVED_IN tuple, too */
-					nextTstatus = HeapTupleSatisfiesVacuum(nextTdata,
+
+					/*
+					 * Must check for DEAD or MOVED_IN tuple, too.	This could
+					 * potentially update hint bits, so we'd better hold the
+					 * buffer content lock.
+					 */
+					LockBuffer(nextBuf, BUFFER_LOCK_SHARE);
+					nextTstatus = HeapTupleSatisfiesVacuum(onerel,
+														   nextTdata,
 														   OldestXmin,
 														   nextBuf);
 					if (nextTstatus == HEAPTUPLE_DEAD ||
 						nextTstatus == HEAPTUPLE_INSERT_IN_PROGRESS)
 					{
-						ReleaseBuffer(nextBuf);
+						UnlockReleaseBuffer(nextBuf);
 						break;
 					}
+					LockBuffer(nextBuf, BUFFER_LOCK_UNLOCK);
 					/* if it's MOVED_OFF we shoulda moved this one with it */
 					if (nextTstatus == HEAPTUPLE_DELETE_IN_PROGRESS)
 						elog(ERROR, "updated tuple is already HEAP_MOVED_OFF");
@@ -3579,13 +3839,14 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 						break;	/* out of check-all-items loop */
 					}
 					tp.t_self = vtlp->this_tid;
-					Pbuf = ReadBuffer(onerel,
-									ItemPointerGetBlockNumber(&(tp.t_self)));
+					Pbuf = ReadBufferWithStrategy(onerel,
+									 ItemPointerGetBlockNumber(&(tp.t_self)),
+												  vac_strategy);
 					Ppage = BufferGetPage(Pbuf);
 					Pitemid = PageGetItemId(Ppage,
 								   ItemPointerGetOffsetNumber(&(tp.t_self)));
 					/* this can't happen since we saw tuple earlier: */
-					if (!ItemIdIsUsed(Pitemid))
+					if (!ItemIdIsNormal(Pitemid))
 						elog(ERROR, "parent itemid marked as unused");
 					PTdata = (HeapTupleHeader) PageGetItem(Ppage, Pitemid);
 
@@ -3662,11 +3923,14 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 
 					/* Get page to move from */
 					tuple.t_self = vtmove[ti].tid;
-					Cbuf = ReadBuffer(onerel,
-								 ItemPointerGetBlockNumber(&(tuple.t_self)));
+					Cbuf = ReadBufferWithStrategy(onerel,
+								  ItemPointerGetBlockNumber(&(tuple.t_self)),
+												  vac_strategy);
 
 					/* Get page to move to */
-					dst_buffer = ReadBuffer(onerel, destvacpage->blkno);
+					dst_buffer = ReadBufferWithStrategy(onerel,
+														destvacpage->blkno,
+														vac_strategy);
 
 					LockBuffer(dst_buffer, BUFFER_LOCK_EXCLUSIVE);
 					if (dst_buffer != Cbuf)
@@ -3684,6 +3948,14 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 									 dst_buffer, dst_page, destvacpage,
 									 &ec, &Ctid, vtmove[ti].cleanVpd);
 
+					/*
+					 * If the tuple we are moving is a heap-only tuple, this
+					 * move will generate an additional index entry, so
+					 * increment the rel_indexed_tuples count.
+					 */
+					if (HeapTupleHeaderIsHeapOnly(tuple.t_data))
+						vacrelstats->rel_indexed_tuples++;
+
 					num_moved++;
 					if (destvacpage->blkno > last_move_dest_block)
 						last_move_dest_block = destvacpage->blkno;
@@ -3696,7 +3968,31 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 						vacpage->offsets[vacpage->offsets_free++] =
 							ItemPointerGetOffsetNumber(&(tuple.t_self));
 					else
+					{
+						/*
+						 * When we move tuple chains, we may need to move
+						 * tuples from a block that we haven't yet scanned in
+						 * the outer walk-along-the-relation loop. Note that
+						 * we can't be moving a tuple from a block that we
+						 * have already scanned because if such a tuple
+						 * exists, then we must have moved the chain along
+						 * with that tuple when we scanned that block. IOW the
+						 * test of (Cbuf != buf) guarantees that the tuple we
+						 * are looking at right now is in a block which is yet
+						 * to be scanned.
+						 *
+						 * We maintain two counters to correctly count the
+						 * moved-off tuples from blocks that are not yet
+						 * scanned (keep_tuples) and how many of them have
+						 * index pointers (keep_indexed_tuples).  The main
+						 * reason to track the latter is to help verify that
+						 * indexes have the expected number of entries when
+						 * all the dust settles.
+						 */
+						if (!HeapTupleHeaderIsHeapOnly(tuple.t_data))
+							keep_indexed_tuples++;
 						keep_tuples++;
+					}
 
 					ReleaseBuffer(dst_buffer);
 					ReleaseBuffer(Cbuf);
@@ -3727,7 +4023,9 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 				if (i == num_fraged_pages)
 					break;		/* can't move item anywhere */
 				dst_vacpage = fraged_pages->pagedesc[i];
-				dst_buffer = ReadBuffer(onerel, dst_vacpage->blkno);
+				dst_buffer = ReadBufferWithStrategy(onerel,
+													dst_vacpage->blkno,
+													vac_strategy);
 				LockBuffer(dst_buffer, BUFFER_LOCK_EXCLUSIVE);
 				dst_page = BufferGetPage(dst_buffer);
 				/* if this page was not used before - clean it */
@@ -3742,6 +4040,14 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 			move_plain_tuple(onerel, buf, page, &tuple,
 							 dst_buffer, dst_page, dst_vacpage, &ec);
 
+			/*
+			 * If the tuple we are moving is a heap-only tuple, this move will
+			 * generate an additional index entry, so increment the
+			 * rel_indexed_tuples count.
+			 */
+			if (HeapTupleHeaderIsHeapOnly(tuple.t_data))
+				vacrelstats->rel_indexed_tuples++;
+
 			num_moved++;
 			if (dst_vacpage->blkno > last_move_dest_block)
 				last_move_dest_block = dst_vacpage->blkno;
@@ -3775,6 +4081,9 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 
 				if (!ItemIdIsUsed(itemid))
 					continue;
+				/* Shouldn't be any DEAD or REDIRECT items anymore */
+				Assert(ItemIdIsNormal(itemid));
+
 				htup = (HeapTupleHeader) PageGetItem(page, itemid);
 				if (htup->t_infomask & HEAP_XMIN_COMMITTED)
 					continue;
@@ -3803,6 +4112,15 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 					{
 						vacpage->offsets[vacpage->offsets_free++] = off;
 						Assert(keep_tuples > 0);
+
+						/*
+						 * If this is not a heap-only tuple, there must be an
+						 * index entry for this item which will be removed in
+						 * the index cleanup. Decrement the
+						 * keep_indexed_tuples count to remember this.
+						 */
+						if (!HeapTupleHeaderIsHeapOnly(htup))
+							keep_indexed_tuples--;
 						keep_tuples--;
 					}
 				}
@@ -3810,6 +4128,8 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 				{
 					vacpage->offsets[vacpage->offsets_free++] = off;
 					Assert(keep_tuples > 0);
+					if (!HeapTupleHeaderIsHeapOnly(htup))
+						keep_indexed_tuples--;
 					keep_tuples--;
 				}
 			}
@@ -3843,6 +4163,32 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 		ReleaseBuffer(dst_buffer);
 	}
 
+	if (num_moved > 0)
+	{
+		/*
+		 * We have to commit our tuple movings before we truncate the
+		 * relation.  Ideally we should do Commit/StartTransactionCommand
+		 * here, relying on the session-level table lock to protect our
+		 * exclusive access to the relation.  However, that would require a
+		 * lot of extra code to close and re-open the relation, indexes, etc.
+		 * For now, a quick hack: record status of current transaction as
+		 * committed, and continue.  We force the commit to be synchronous so
+		 * that it's down to disk before we truncate.  (Note: tqual.c knows
+		 * that VACUUM FULL always uses sync commit, too.)	The transaction
+		 * continues to be shown as running in the ProcArray.
+		 *
+		 * XXX This desperately needs to be revisited.	Any failure after this
+		 * point will result in a PANIC "cannot abort transaction nnn, it was
+		 * already committed"!  As a precaution, we prevent cancel interrupts
+		 * after this point to mitigate this problem; caller is responsible for
+		 * re-enabling them after committing the transaction.
+		 */
+		HOLD_INTERRUPTS();
+		heldoff = true;
+		ForceSyncCommit();
+		(void) RecordTransactionCommit();
+	}
+
 	/*
 	 * We are not going to move any more tuples across pages, but we still
 	 * need to apply vacuum_page to compact free space in the remaining pages
@@ -3867,7 +4213,9 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 			// -------- MirroredLock ----------
 			MIRROREDLOCK_BUFMGR_LOCK;
 
-			buf = ReadBuffer(onerel, (*curpage)->blkno);
+			buf = ReadBufferWithStrategy(onerel,
+										 (*curpage)->blkno,
+										 vac_strategy);
 			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
 			page = BufferGetPage(buf);
 			if (!PageIsEmpty(page))
@@ -3908,6 +4256,8 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 	vacuum_pages->empty_end_pages = nblocks - blkno;
 
 	SIMPLE_FAULT_INJECTOR(RepairFragEnd);
+
+	return heldoff;
 }
 
 /*
@@ -3991,15 +4341,17 @@ move_chain_tuple(Relation rel,
 
 	/*
 	 * Update the state of the copied tuple, and store it on the destination
-	 * page.
+	 * page.  The copied tuple is never part of a HOT chain.
 	 */
 	newtup.t_data->t_infomask &= ~(HEAP_XMIN_COMMITTED |
 								   HEAP_XMIN_INVALID |
 								   HEAP_MOVED_OFF);
 	newtup.t_data->t_infomask |= HEAP_MOVED_IN;
+	HeapTupleHeaderClearHotUpdated(newtup.t_data);
+	HeapTupleHeaderClearHeapOnly(newtup.t_data);
 	HeapTupleHeaderSetXvac(newtup.t_data, myXID);
 	newoff = PageAddItem(dst_page, (Item) newtup.t_data, tuple_len,
-						 InvalidOffsetNumber, LP_USED);
+						 InvalidOffsetNumber, false, true);
 	if (newoff == InvalidOffsetNumber)
 		elog(PANIC, "failed to add item with len = %lu to page %u while moving tuple chain",
 			 (unsigned long) tuple_len, dst_vacpage->blkno);
@@ -4039,13 +4391,6 @@ move_chain_tuple(Relation rel,
 		PageSetLSN(dst_page, recptr);
 		PageSetTLI(dst_page, ThisTimeLineID);
 	}
-	else
-	{
-		/*
-		 * No XLOG record, but still need to flag that XID exists on disk
-		 */
-		MyXactMadeTempRelUpdate = true;
-	}
 
 	END_CRIT_SECTION();
 
@@ -4106,17 +4451,19 @@ move_plain_tuple(Relation rel,
 	START_CRIT_SECTION();
 
 	/*
-	 * Mark new tuple as MOVED_IN by me.
+	 * Mark new tuple as MOVED_IN by me; also mark it not HOT.
 	 */
 	newtup.t_data->t_infomask &= ~(HEAP_XMIN_COMMITTED |
 								   HEAP_XMIN_INVALID |
 								   HEAP_MOVED_OFF);
 	newtup.t_data->t_infomask |= HEAP_MOVED_IN;
+	HeapTupleHeaderClearHotUpdated(newtup.t_data);
+	HeapTupleHeaderClearHeapOnly(newtup.t_data);
 	HeapTupleHeaderSetXvac(newtup.t_data, myXID);
 
 	/* add tuple to the page */
 	newoff = PageAddItem(dst_page, (Item) newtup.t_data, tuple_len,
-						 InvalidOffsetNumber, LP_USED);
+						 InvalidOffsetNumber, false, true);
 	if (newoff == InvalidOffsetNumber)
 		elog(PANIC, "failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %u)",
 			 (unsigned long) tuple_len,
@@ -4151,13 +4498,6 @@ move_plain_tuple(Relation rel,
 		PageSetLSN(dst_page, recptr);
 		PageSetTLI(dst_page, ThisTimeLineID);
 	}
-	else
-	{
-		/*
-		 * No XLOG record, but still need to flag that XID exists on disk
-		 */
-		MyXactMadeTempRelUpdate = true;
-	}
 
 	END_CRIT_SECTION();
 
@@ -4208,7 +4548,9 @@ vacuum_heap(VRelStats *vacrelstats, Relation onerel, VacPageList vacuum_pages)
 			// -------- MirroredLock ----------
 			MIRROREDLOCK_BUFMGR_LOCK;
 
-			buf = ReadBuffer(onerel, (*vacpage)->blkno);
+			buf = ReadBufferWithStrategy(onerel,
+										 (*vacpage)->blkno,
+										 vac_strategy);
 			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
 			vacuum_page(onerel, buf, *vacpage);
 			UnlockReleaseBuffer(buf);
@@ -4229,10 +4571,7 @@ vacuum_heap(VRelStats *vacrelstats, Relation onerel, VacPageList vacuum_pages)
 static void
 vacuum_page(Relation onerel, Buffer buffer, VacPage vacpage)
 {
-	OffsetNumber unused[MaxOffsetNumber];
-	int			uncnt;
 	Page		page = BufferGetPage(buffer);
-	ItemId		itemid;
 	int			i;
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
@@ -4244,11 +4583,12 @@ vacuum_page(Relation onerel, Buffer buffer, VacPage vacpage)
 
 	for (i = 0; i < vacpage->offsets_free; i++)
 	{
-		itemid = PageGetItemId(page, vacpage->offsets[i]);
-		itemid->lp_flags &= ~LP_USED;
+		ItemId		itemid = PageGetItemId(page, vacpage->offsets[i]);
+
+		ItemIdSetUnused(itemid);
 	}
 
-	uncnt = PageRepairFragmentation(page, unused);
+	PageRepairFragmentation(page);
 
 	MarkBufferDirty(buffer);
 
@@ -4257,15 +4597,13 @@ vacuum_page(Relation onerel, Buffer buffer, VacPage vacpage)
 	{
 		XLogRecPtr	recptr;
 
-		recptr = log_heap_clean(onerel, buffer, unused, uncnt);
+		recptr = log_heap_clean(onerel, buffer,
+								NULL, 0, NULL, 0,
+								vacpage->offsets, vacpage->offsets_free,
+								false);
 		PageSetLSN(page, recptr);
 		PageSetTLI(page, ThisTimeLineID);
 	}
-	else
-	{
-		/* No XLOG record, but still need to flag that XID exists on disk */
-		MyXactMadeTempRelUpdate = true;
-	}
 
 	END_CRIT_SECTION();
 }
@@ -4288,6 +4626,7 @@ scan_index(Relation indrel, double num_tuples, List *updated_stats, bool isfull,
 	ivinfo.vacuum_full = isfull;
 	ivinfo.message_level = elevel;
 	ivinfo.num_heap_tuples = num_tuples;
+	ivinfo.strategy = vac_strategy;
 	ivinfo.extra_oids = NIL;
 
 	stats = index_vacuum_cleanup(&ivinfo, NULL);
@@ -4357,6 +4696,7 @@ vacuum_appendonly_index(Relation indexRelation,
 	ivinfo.message_level = elevel;
 	ivinfo.extra_oids = extra_oids;
 	ivinfo.num_heap_tuples = rel_tuple_count;
+	ivinfo.strategy = vac_strategy;
 
 	/* Do bulk deletion */
 	stats = index_bulk_delete(&ivinfo, NULL, appendonly_tid_reaped,
@@ -4416,6 +4756,7 @@ vacuum_index(VacPageList vacpagelist, Relation indrel,
 	ivinfo.vacuum_full = true;
 	ivinfo.message_level = elevel;
 	ivinfo.num_heap_tuples = num_tuples + keep_tuples;
+	ivinfo.strategy = vac_strategy;
 	ivinfo.extra_oids = extra_oids;
 
 	/* Do bulk deletion */
@@ -4772,9 +5113,16 @@ vac_cmp_vtlinks(const void *left, const void *right)
 
 
 /*
- * Open all the indexes of the given relation, obtaining the specified kind
- * of lock on each.  Return an array of Relation pointers for the indexes
- * into *Irel, and the number of indexes into *nindexes.
+ * Open all the vacuumable indexes of the given relation, obtaining the
+ * specified kind of lock on each.	Return an array of Relation pointers for
+ * the indexes into *Irel, and the number of indexes into *nindexes.
+ *
+ * We consider an index vacuumable if it is marked insertable (IndexIsReady).
+ * If it isn't, probably a CREATE INDEX CONCURRENTLY command failed early in
+ * execution, and what we have is too corrupt to be processable.  We will
+ * vacuum even if the index isn't indisvalid; this is important because in a
+ * unique index, uniqueness checks will be performed anyway and had better not
+ * hit dangling index pointers.
  */
 void
 vac_open_indexes(Relation relation, LOCKMODE lockmode,
@@ -4788,21 +5136,30 @@ vac_open_indexes(Relation relation, LOCKMODE lockmode,
 
 	indexoidlist = RelationGetIndexList(relation);
 
-	*nindexes = list_length(indexoidlist);
+	/* allocate enough memory for all indexes */
+	i = list_length(indexoidlist);
 
-	if (*nindexes > 0)
-		*Irel = (Relation *) palloc(*nindexes * sizeof(Relation));
+	if (i > 0)
+		*Irel = (Relation *) palloc(i * sizeof(Relation));
 	else
 		*Irel = NULL;
 
+	/* collect just the ready indexes */
 	i = 0;
 	foreach(indexoidscan, indexoidlist)
 	{
 		Oid			indexoid = lfirst_oid(indexoidscan);
+		Relation	indrel;
 
-		(*Irel)[i++] = index_open(indexoid, lockmode);
+		indrel = index_open(indexoid, lockmode);
+		if (IndexIsReady(indrel->rd_index))
+			(*Irel)[i++] = indrel;
+		else
+			index_close(indrel, lockmode);
 	}
 
+	*nindexes = i;
+
 	list_free(indexoidlist);
 }
 
@@ -4868,8 +5225,19 @@ enough_space(VacPage vacpage, Size len)
 static Size
 PageGetFreeSpaceWithFillFactor(Relation relation, Page page)
 {
-	PageHeader	pd = (PageHeader) page;
-	Size		freespace = pd->pd_upper - pd->pd_lower;
+	/*
+	 * It is correct to use PageGetExactFreeSpace() here, *not*
+	 * PageGetHeapFreeSpace().  This is because (a) we do our own, exact
+	 * accounting for whether line pointers must be added, and (b) we will
+	 * recycle any LP_DEAD line pointers before starting to add rows to a
+	 * page, but that may not have happened yet at the time this function is
+	 * applied to a page, which means PageGetHeapFreeSpace()'s protection
+	 * against too many line pointers on a page could fire incorrectly.  We do
+	 * not need that protection here: since VACUUM FULL always recycles all
+	 * dead line pointers first, it'd be physically impossible to insert more
+	 * than MaxHeapTuplesPerPage tuples anyway.
+	 */
+	Size		freespace = PageGetExactFreeSpace(page);
 	Size		targetfree;
 
 	targetfree = RelationGetTargetPageFreeSpace(relation,
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index 2401df237270..5f3f11ec706a 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -13,7 +13,7 @@
  * We are willing to use at most maintenance_work_mem memory space to keep
  * track of dead tuples.  We initially allocate an array of TIDs of that size,
  * with an upper limit that depends on table size (this limit ensures we don't
- * allocate a huge area uselessly for vacuuming small tables).  If the array
+ * allocate a huge area uselessly for vacuuming small tables).	If the array
  * threatens to overflow, we suspend the heap scan phase and perform a pass of
  * index cleanup and page compaction, then resume the heap scan with an empty
  * TID array.
@@ -38,7 +38,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.83 2007/02/04 03:10:55 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.103.2.3 2009/11/10 18:00:44 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,6 +55,7 @@
 #include "access/aomd.h"
 #include "access/appendonly_compaction.h"
 #include "access/aocs_compaction.h"
+#include "commands/dbcommands.h"
 #include "commands/vacuum.h"
 #include "catalog/catalog.h"
 #include "catalog/indexing.h"
@@ -63,6 +64,7 @@
 #include "cdb/cdbappendonlyam.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "postmaster/autovacuum.h"
 #include "storage/freespace.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
@@ -89,7 +91,7 @@
  * provide an upper limit to memory allocated when vacuuming small
  * tables.
  */
-#define LAZY_ALLOC_TUPLES		200
+#define LAZY_ALLOC_TUPLES		MaxHeapTuplesPerPage
 
 typedef struct LVRelStats
 {
@@ -114,14 +116,18 @@ typedef struct LVRelStats
 	int			max_free_pages; /* # slots allocated in array */
 	PageFreeSpaceInfo *free_pages;		/* array or heap of blkno/avail */
 	BlockNumber tot_free_pages; /* total pages with >= threshold space */
+	int			num_index_scans;
 } LVRelStats;
 
 
+/* A few variables that don't seem worth passing around as parameters */
 static int	elevel = -1;
 
 static TransactionId OldestXmin;
 static TransactionId FreezeLimit;
 
+static BufferAccessStrategy vac_strategy;
+
 
 /* non-export function prototypes */
 static void lazy_vacuum_aorel(Relation onerel, VacuumStmt *vacstmt,
@@ -160,14 +166,27 @@ static int	vac_cmp_page_spaces(const void *left, const void *right);
  *
  *		At entry, we have already established a transaction and opened
  *		and locked the relation.
+ *
+ *		The return value indicates whether this function has held off
+ *		interrupts -- caller must RESUME_INTERRUPTS() after commit if true.
  */
-void
-lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
+bool
+lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
+				BufferAccessStrategy bstrategy, List *updated_stats)
 {
 	LVRelStats *vacrelstats;
 	Relation   *Irel;
 	int			nindexes;
 	BlockNumber possibly_freeable;
+	PGRUsage	ru0;
+	TimestampTz starttime = 0;
+	bool		heldoff = false;
+
+	pg_rusage_init(&ru0);
+
+	/* measure elapsed time iff autovacuum logging requires it */
+	if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration > 0)
+		starttime = GetCurrentTimestamp();
 
 	if (vacstmt->verbose)
 		elevel = INFO;
@@ -201,7 +220,9 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 	 * relations.  This allows setting relfrozenxid to correct value
 	 * for an appendonly (AO/CO) table.
 	 */
-	vacuum_set_xid_limits(vacstmt, onerel->rd_rel->relisshared,
+	vac_strategy = bstrategy;
+
+	vacuum_set_xid_limits(vacstmt->freeze_min_age, onerel->rd_rel->relisshared,
 						  &OldestXmin, &FreezeLimit);
 
 	/*
@@ -211,7 +232,7 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 	if (RelationIsAoRows(onerel) || RelationIsAoCols(onerel))
 	{
 		lazy_vacuum_aorel(onerel, vacstmt, updated_stats);
-		return;
+		return false;
 	}
 
 	vacrelstats = (LVRelStats *) palloc0(sizeof(LVRelStats));
@@ -222,6 +243,8 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 	/* XXX should we scale it up or down?  Adjust vacuum.c too, if so */
 	vacrelstats->threshold = GetAvgFSMRequestSize(&onerel->rd_node);
 
+	vacrelstats->num_index_scans = 0;
+
 	/* Open all indexes of the relation */
 	vac_open_indexes(onerel, RowExclusiveLock, &nindexes, &Irel);
 	vacrelstats->hasindex = (nindexes > 0);
@@ -237,15 +260,36 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 	 *
 	 * Don't even think about it unless we have a shot at releasing a goodly
 	 * number of pages.  Otherwise, the time taken isn't worth it.
+	 *
+	 * Note that after we've truncated the heap, it's too late to abort the
+	 * transaction; doing so would lose the sinval messages needed to tell
+	 * the other backends about the table being shrunk.  We prevent interrupts
+	 * in that case; caller is responsible for re-enabling them after
+	 * committing the transaction.
 	 */
 	possibly_freeable = vacrelstats->rel_pages - vacrelstats->nonempty_pages;
-	if (possibly_freeable >= REL_TRUNCATE_MINIMUM ||
-		possibly_freeable >= vacrelstats->rel_pages / REL_TRUNCATE_FRACTION)
+	if (possibly_freeable > 0 &&
+		(possibly_freeable >= REL_TRUNCATE_MINIMUM ||
+		 possibly_freeable >= vacrelstats->rel_pages / REL_TRUNCATE_FRACTION))
+	{
+		HOLD_INTERRUPTS();
+		heldoff = true;
 		lazy_truncate_heap(onerel, vacrelstats);
+	}
 
 	/* Update shared free space map with final free space info */
 	lazy_update_fsm(onerel, vacrelstats);
 
+	if (vacrelstats->tot_free_pages > MaxFSMPages)
+		ereport(WARNING,
+				(errmsg("relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful free space",
+						get_namespace_name(RelationGetNamespace(onerel)),
+						RelationGetRelationName(onerel)),
+				 /* Only suggest VACUUM FULL if > 20% free */
+				 (vacrelstats->tot_free_pages > vacrelstats->rel_pages * 0.20) ?
+				 errhint("Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\".") :
+				 errhint("Consider increasing the configuration parameter \"max_fsm_pages\".")));
+
 	/* Update statistics in pg_class */
 	vac_update_relstats_from_list(onerel,
 						vacrelstats->rel_pages,
@@ -258,6 +302,41 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats)
 	pgstat_report_vacuum(RelationGetRelid(onerel), onerel->rd_rel->relisshared,
 						 true /*vacrelstats->scanned_all*/,
 						 vacstmt->analyze, vacrelstats->rel_tuples);
+
+	if (gp_indexcheck_vacuum == INDEX_CHECK_ALL ||
+		(gp_indexcheck_vacuum == INDEX_CHECK_SYSTEM &&
+		 PG_CATALOG_NAMESPACE == RelationGetNamespace(onerel)))
+	{
+		int			i;
+
+		for (i = 0; i < nindexes; i++)
+		{
+			if (Irel[i]->rd_am->aminsert == BTINSERT_OID)
+				_bt_validate_vacuum(Irel[i], onerel, OldestXmin);
+		}
+	}
+
+	/* and log the action if appropriate */
+	if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0)
+	{
+		if (Log_autovacuum_min_duration == 0 ||
+			TimestampDifferenceExceeds(starttime, GetCurrentTimestamp(),
+									   Log_autovacuum_min_duration))
+			ereport(LOG,
+					(errmsg("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
+							"pages: %d removed, %d remain\n"
+							"tuples: %.0f removed, %.0f remain\n"
+							"system usage: %s",
+							get_database_name(MyDatabaseId),
+							get_namespace_name(RelationGetNamespace(onerel)),
+							RelationGetRelationName(onerel),
+							vacrelstats->num_index_scans,
+						  vacrelstats->pages_removed, vacrelstats->rel_pages,
+						vacrelstats->tuples_deleted, vacrelstats->rel_tuples,
+							pg_rusage_show(&ru0))));
+	}
+
+	return heldoff;
 }
 
 /*
@@ -450,15 +529,16 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 			lazy_vacuum_heap(onerel, vacrelstats);
 			/* Forget the now-vacuumed tuples, and press on */
 			vacrelstats->num_dead_tuples = 0;
+			vacrelstats->num_index_scans++;
 		}
 
 		/* -------- MirroredLock ---------- */
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buf = ReadBuffer(onerel, blkno);
+		buf = ReadBufferWithStrategy(onerel, blkno, vac_strategy);
 
-		/* Initially, we only need shared access to the buffer */
-		LockBuffer(buf, BUFFER_LOCK_SHARE);
+		/* We need buffer cleanup lock so that we can prune HOT chains. */
+		LockBufferForCleanup(buf);
 
 		page = BufferGetPage(buf);
 
@@ -495,7 +575,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 			/* -------- MirroredLock ---------- */
 			MIRROREDLOCK_BUFMGR_LOCK;
 
-			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);  /* LockBufferForCleanup(buf)? */
+			LockBufferForCleanup(buf);
 			if (PageIsNew(page))
 			{
 				ereport(WARNING,
@@ -508,7 +588,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 
 				empty_pages++;
 				lazy_record_free_space(vacrelstats, blkno,
-									   PageGetFreeSpace(page));
+									   PageGetHeapFreeSpace(page));
 			}
 			MarkBufferDirty(buf);
 			UnlockReleaseBuffer(buf);
@@ -523,7 +603,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 		{
 			empty_pages++;
 			lazy_record_free_space(vacrelstats, blkno,
-								   PageGetFreeSpace(page));
+								   PageGetHeapFreeSpace(page));
 			UnlockReleaseBuffer(buf);
 
 			MIRROREDLOCK_BUFMGR_UNLOCK;
@@ -532,6 +612,18 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 			continue;
 		}
 
+		/*
+		 * Prune all HOT-update chains in this page.
+		 *
+		 * We count tuples removed by the pruning step as removed by VACUUM.
+		 */
+		tups_vacuumed += heap_page_prune(onerel, buf, OldestXmin,
+										 false, false);
+
+		/*
+		 * Now scan the page to collect vacuumable items and check for tuples
+		 * requiring freezing.
+		 */
 		nfrozen = 0;
 		hastup = false;
 		prev_dead_count = vacrelstats->num_dead_tuples;
@@ -544,22 +636,65 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 
 			itemid = PageGetItemId(page, offnum);
 
+			/* Unused items require no processing, but we count 'em */
 			if (!ItemIdIsUsed(itemid))
 			{
 				nunused += 1;
 				continue;
 			}
 
+			/* Redirect items mustn't be touched */
+			if (ItemIdIsRedirected(itemid))
+			{
+				hastup = true;	/* this page won't be truncatable */
+				continue;
+			}
+
+			ItemPointerSet(&(tuple.t_self), blkno, offnum);
+
+			/*
+			 * DEAD item pointers are to be vacuumed normally; but we don't
+			 * count them in tups_vacuumed, else we'd be double-counting (at
+			 * least in the common case where heap_page_prune() just freed up
+			 * a non-HOT tuple).
+			 */
+			if (ItemIdIsDead(itemid))
+			{
+				lazy_record_dead_tuple(vacrelstats, &(tuple.t_self));
+				continue;
+			}
+
+			Assert(ItemIdIsNormal(itemid));
+
 			tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid);
 			tuple.t_len = ItemIdGetLength(itemid);
-			ItemPointerSet(&(tuple.t_self), blkno, offnum);
 
 			tupgone = false;
 
-			switch (HeapTupleSatisfiesVacuum(tuple.t_data, OldestXmin, buf))
+			switch (HeapTupleSatisfiesVacuum(onerel, tuple.t_data, OldestXmin, buf))
 			{
 				case HEAPTUPLE_DEAD:
-					tupgone = true;		/* we can delete the tuple */
+
+					/*
+					 * Ordinarily, DEAD tuples would have been removed by
+					 * heap_page_prune(), but it's possible that the tuple
+					 * state changed since heap_page_prune() looked.  In
+					 * particular an INSERT_IN_PROGRESS tuple could have
+					 * changed to DEAD if the inserter aborted.  So this
+					 * cannot be considered an error condition.
+					 *
+					 * If the tuple is HOT-updated then it must only be
+					 * removed by a prune operation; so we keep it just as if
+					 * it were RECENTLY_DEAD.  Also, if it's a heap-only
+					 * tuple, we choose to keep it, because it'll be a lot
+					 * cheaper to get rid of it in the next pruning pass than
+					 * to treat it like an indexed tuple.
+					 */
+					if (HeapTupleIsHotUpdated(&tuple) ||
+						HeapTupleIsHeapOnly(&tuple))
+						nkeep += 1;
+					else
+						tupgone = true; /* we can delete the tuple */
 					break;
 				case HEAPTUPLE_LIVE:
 					/* Tuple is good --- but let's do some validity checks */
@@ -598,12 +733,11 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 				hastup = true;
 
 				/*
-				 * Each non-removable tuple must be checked to see if it
-				 * needs freezing.  If we already froze anything, then
-				 * we've already switched the buffer lock to exclusive.
+				 * Each non-removable tuple must be checked to see if it needs
+				 * freezing.  Note we already have exclusive buffer lock.
 				 */
 				if (heap_freeze_tuple(tuple.t_data, FreezeLimit,
-									  (nfrozen > 0) ? InvalidBuffer : buf))
+									  InvalidBuffer))
 					frozen[nfrozen++] = offnum;
 			}
 		}						/* scan along page */
@@ -635,10 +769,6 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 		if (nindexes == 0 &&
 			vacrelstats->num_dead_tuples > 0)
 		{
-			/* Trade in buffer share lock for super-exclusive lock */
-			LockBuffer(buf, BUFFER_LOCK_UNLOCK);
-			LockBufferForCleanup(buf);
-
 			/* Remove tuples from heap */
 			lazy_vacuum_page(onerel, blkno, buf, 0, vacrelstats);
 			/* Forget the now-vacuumed tuples, and press on */
@@ -656,7 +786,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 		if (vacrelstats->num_dead_tuples == prev_dead_count)
 		{
 			lazy_record_free_space(vacrelstats, blkno,
-								   PageGetFreeSpace(page));
+								   PageGetHeapFreeSpace(page));
 		}
 
 		/* Remember the location of the last page with nonremovable tuples */
@@ -694,6 +824,7 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 
 		/* Remove tuples from heap */
 		lazy_vacuum_heap(onerel, vacrelstats);
+		vacrelstats->num_index_scans++;
 	}
 
 	/* Do post-vacuum cleanup and statistics update for each index */
@@ -721,24 +852,6 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 					   vacrelstats->tot_free_pages,
 					   empty_pages,
 					   pg_rusage_show(&ru0))));
-
-	if (vacrelstats->tot_free_pages > MaxFSMPages)
-		ereport(WARNING,
-				(errmsg("relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful free space",
-						get_namespace_name(RelationGetNamespace(onerel)),
-						relname),
-				 errhint("Consider using VACUUM FULL on this relation or increasing the configuration parameter \"max_fsm_pages\".")));
-
-	if (gp_indexcheck_vacuum == INDEX_CHECK_ALL ||
-		(gp_indexcheck_vacuum == INDEX_CHECK_SYSTEM &&
-		 PG_CATALOG_NAMESPACE == RelationGetNamespace(onerel)))
-	{
-		for (i = 0; i < nindexes; i++)
-		{
-			if (Irel[i]->rd_am->aminsert == BTINSERT_OID)
-				_bt_validate_vacuum(Irel[i], onerel, OldestXmin);
-		}
-	}
 }
 
 
@@ -783,13 +896,13 @@ lazy_vacuum_heap(Relation onerel, LVRelStats *vacrelstats)
 		/* -------- MirroredLock ---------- */
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buf = ReadBuffer(onerel, tblk);
+		buf = ReadBufferWithStrategy(onerel, tblk, vac_strategy);
 		LockBufferForCleanup(buf);
 		tupindex = lazy_vacuum_page(onerel, tblk, buf, tupindex, vacrelstats);
 		/* Now that we've compacted the page, record its available space */
 		page = BufferGetPage(buf);
 		lazy_record_free_space(vacrelstats, tblk,
-							   PageGetFreeSpace(page));
+							   PageGetHeapFreeSpace(page));
 		UnlockReleaseBuffer(buf);
 
 		MIRROREDLOCK_BUFMGR_UNLOCK;
@@ -820,10 +933,9 @@ static int
 lazy_vacuum_page(Relation onerel, BlockNumber blkno, Buffer buffer,
 				 int tupindex, LVRelStats *vacrelstats)
 {
-	OffsetNumber unused[MaxOffsetNumber];
-	int			uncnt;
 	Page		page = BufferGetPage(buffer);
-	ItemId		itemid;
+	OffsetNumber unused[MaxOffsetNumber];
+	int			uncnt = 0;
 
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
@@ -833,16 +945,18 @@ lazy_vacuum_page(Relation onerel, BlockNumber blkno, Buffer buffer,
 	{
 		BlockNumber tblk;
 		OffsetNumber toff;
+		ItemId		itemid;
 
 		tblk = ItemPointerGetBlockNumber(&vacrelstats->dead_tuples[tupindex]);
 		if (tblk != blkno)
 			break;				/* past end of tuples for this block */
 		toff = ItemPointerGetOffsetNumber(&vacrelstats->dead_tuples[tupindex]);
 		itemid = PageGetItemId(page, toff);
-		itemid->lp_flags &= ~LP_USED;
+		ItemIdSetUnused(itemid);
+		unused[uncnt++] = toff;
 	}
 
-	uncnt = PageRepairFragmentation(page, unused);
+	PageRepairFragmentation(page);
 
 	MarkBufferDirty(buffer);
 
@@ -851,15 +965,13 @@ lazy_vacuum_page(Relation onerel, BlockNumber blkno, Buffer buffer,
 	{
 		XLogRecPtr	recptr;
 
-		recptr = log_heap_clean(onerel, buffer, unused, uncnt);
+		recptr = log_heap_clean(onerel, buffer,
+								NULL, 0, NULL, 0,
+								unused, uncnt,
+								false);
 		PageSetLSN(page, recptr);
 		PageSetTLI(page, ThisTimeLineID);
 	}
-	else
-	{
-		/* No XLOG record, but still need to flag that XID exists on disk */
-		MyXactMadeTempRelUpdate = true;
-	}
 
 	END_CRIT_SECTION();
 
@@ -888,6 +1000,7 @@ lazy_vacuum_index(Relation indrel,
 	ivinfo.message_level = elevel;
 	/* We don't yet know rel_tuples, so pass -1 */
 	ivinfo.num_heap_tuples = -1;
+	ivinfo.strategy = vac_strategy;
 	ivinfo.extra_oids = extra_oids;
 
 	/* Do bulk deletion */
@@ -919,6 +1032,7 @@ lazy_cleanup_index(Relation indrel,
 	ivinfo.vacuum_full = false;
 	ivinfo.message_level = elevel;
 	ivinfo.num_heap_tuples = vacrelstats->rel_tuples;
+	ivinfo.strategy = vac_strategy;
 	ivinfo.extra_oids = NIL;
 
 	stats = index_vacuum_cleanup(&ivinfo, stats);
@@ -1011,6 +1125,14 @@ lazy_truncate_heap(Relation onerel, LVRelStats *vacrelstats)
 				new_rel_pages,
 				/* markPersistentAsPhysicallyTruncated */ true);
 
+	/*
+	 * Note: once we have truncated, we *must* keep the exclusive lock until
+	 * commit.	The sinval message that will be sent at commit (as a result of
+	 * vac_update_relstats()) must be received by other backends, to cause
+	 * them to reset their rd_targblock values, before they can safely access
+	 * the table again.
+	 */
+
 	/*
 	 * Drop free-space info for removed blocks; these must not get entered
 	 * into the FSM!
@@ -1043,6 +1165,12 @@ lazy_truncate_heap(Relation onerel, LVRelStats *vacrelstats)
 	vacrelstats->rel_pages = new_rel_pages;
 	vacrelstats->pages_removed = old_rel_pages - new_rel_pages;
 
+/*
+ * GPDB_83_MERGE_FIXME: The PostgreSQL commit above explains why we *must*
+ * keep the lock. But in GDPB, we just drop it. Either the upstream comment
+ * is wrong (unlikely), or GPDB is playing dangerous fast-and-loose with the
+ * lock, and the deadlock needs to be fixed some other way (likely)
+ */
 	/*
 	 * We can't keep the exclusive lock until commit, since this will cause
 	 * deadlock, see MPP-5733.
@@ -1245,7 +1373,7 @@ count_nondeletable_pages(Relation onerel, LVRelStats *vacrelstats)
 		/* -------- MirroredLock ---------- */
 		MIRROREDLOCK_BUFMGR_LOCK;
 
-		buf = ReadBuffer(onerel, blkno);
+		buf = ReadBufferWithStrategy(onerel, blkno, vac_strategy);
 
 		/* In this phase we only need shared access to the buffer */
 		LockBuffer(buf, BUFFER_LOCK_SHARE);
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 99419b61b715..0e90a9b7f9e3 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.119.2.2 2009/09/03 22:08:29 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.125.2.1 2009/09/03 22:08:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 #include <ctype.h>
 
 #include "access/xact.h"
-#include "catalog/catquery.h"
 #include "catalog/pg_authid.h"
 #include "commands/variable.h"
 #include "miscadmin.h"
@@ -29,8 +28,6 @@
 #include "utils/tqual.h"
 #include "mb/pg_wchar.h"
 
-#include "cdb/cdbvars.h"
-
 /*
  * DATESTYLE
  */
@@ -60,9 +57,8 @@ assign_datestyle(const char *value, bool doit, GucSource source)
 		/* syntax error in list */
 		pfree(rawstring);
 		list_free(elemlist);
-		if (source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("invalid list syntax for parameter \"datestyle\"")));
 		return NULL;
 	}
@@ -160,11 +156,10 @@ assign_datestyle(const char *value, bool doit, GucSource source)
 		}
 		else
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("unrecognized \"datestyle\" key word: \"%s\"",
-								tok)));
+			ereport(GUC_complaint_elevel(source),
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized \"datestyle\" key word: \"%s\"",
+							tok)));
 			ok = false;
 			break;
 		}
@@ -175,10 +170,9 @@ assign_datestyle(const char *value, bool doit, GucSource source)
 
 	if (!ok)
 	{
-		if (source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("conflicting \"datestyle\" specifications")));
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("conflicting \"datestyle\" specifications")));
 		return NULL;
 	}
 
@@ -286,19 +280,17 @@ assign_timezone(const char *value, bool doit, GucSource source)
 		pfree(val);
 		if (interval->month != 0)
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("invalid interval value for time zone: month not allowed")));
+			ereport(GUC_complaint_elevel(source),
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("invalid interval value for time zone: month not allowed")));
 			pfree(interval);
 			return NULL;
 		}
 		if (interval->day != 0)
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("invalid interval value for time zone: day not allowed")));
+			ereport(GUC_complaint_elevel(source),
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("invalid interval value for time zone: day not allowed")));
 			pfree(interval);
 			return NULL;
 		}
@@ -364,7 +356,7 @@ assign_timezone(const char *value, bool doit, GucSource source)
 
 			if (!new_tz)
 			{
-				ereport((source >= PGC_S_INTERACTIVE) ? ERROR : LOG,
+				ereport(GUC_complaint_elevel(source),
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("unrecognized time zone name: \"%s\"",
 								value)));
@@ -373,7 +365,7 @@ assign_timezone(const char *value, bool doit, GucSource source)
 
 			if (!tz_acceptable(new_tz))
 			{
-				ereport((source >= PGC_S_INTERACTIVE) ? ERROR : LOG,
+				ereport(GUC_complaint_elevel(source),
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					   errmsg("time zone \"%s\" appears to use leap seconds",
 							  value),
@@ -496,7 +488,7 @@ assign_log_timezone(const char *value, bool doit, GucSource source)
 
 		if (!new_tz)
 		{
-			ereport((source >= PGC_S_INTERACTIVE) ? ERROR : LOG,
+			ereport(GUC_complaint_elevel(source),
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("unrecognized time zone name: \"%s\"",
 							value)));
@@ -505,7 +497,7 @@ assign_log_timezone(const char *value, bool doit, GucSource source)
 
 		if (!tz_acceptable(new_tz))
 		{
-			ereport((source >= PGC_S_INTERACTIVE) ? ERROR : LOG,
+			ereport(GUC_complaint_elevel(source),
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("time zone \"%s\" appears to use leap seconds",
 							value),
@@ -673,11 +665,10 @@ assign_client_encoding(const char *value, bool doit, GucSource source)
 	 */
 	if (SetClientEncoding(encoding, doit) < 0)
 	{
-		if (source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("conversion between %s and %s is not supported",
-							value, GetDatabaseEncodingName())));
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("conversion between %s and %s is not supported",
+						value, GetDatabaseEncodingName())));
 		return NULL;
 	}
 	return value;
@@ -730,7 +721,6 @@ assign_session_authorization(const char *value, bool doit, GucSource source)
 	{
 		/* not a saved ID, so look it up */
 		HeapTuple	roleTup;
-		cqContext  *pcqCtx;
 
 		if (!IsTransactionState())
 		{
@@ -742,19 +732,14 @@ assign_session_authorization(const char *value, bool doit, GucSource source)
 			return NULL;
 		}
 
-		pcqCtx = caql_beginscan(
-				NULL,
-				cql("SELECT * FROM pg_authid "
-					" WHERE rolname = :1 ",
-					CStringGetDatum((char *) value)));
-
-		roleTup = caql_getnext(pcqCtx);
+		roleTup = SearchSysCache(AUTHNAME,
+								 PointerGetDatum(value),
+								 0, 0, 0);
 		if (!HeapTupleIsValid(roleTup))
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_UNDEFINED_OBJECT),
-						 errmsg("role \"%s\" does not exist", value)));
+			ereport(GUC_complaint_elevel(source),
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("role \"%s\" does not exist", value)));
 			return NULL;
 		}
 
@@ -762,7 +747,7 @@ assign_session_authorization(const char *value, bool doit, GucSource source)
 		is_superuser = ((Form_pg_authid) GETSTRUCT(roleTup))->rolsuper;
 		actual_rolename = value;
 
-		caql_endscan(pcqCtx);
+		ReleaseSysCache(roleTup);
 	}
 
 	if (doit)
@@ -793,8 +778,9 @@ show_session_authorization(void)
 	Oid			savedoid;
 	char	   *endptr;
 
-	if(!value)
-		return NULL;
+	/* If session_authorization hasn't been set in this process, return "" */
+	if (value == NULL || value[0] == '\0')
+		return "";
 
 	Assert(strspn(value, "x") == NAMEDATALEN &&
 		   (value[NAMEDATALEN] == 'T' || value[NAMEDATALEN] == 'F'));
@@ -851,7 +837,6 @@ assign_role(const char *value, bool doit, GucSource source)
 	{
 		/* not a saved ID, so look it up */
 		HeapTuple	roleTup;
-		cqContext  *pcqCtx;
 
 		if (!IsTransactionState())
 		{
@@ -863,37 +848,31 @@ assign_role(const char *value, bool doit, GucSource source)
 			return NULL;
 		}
 
-		pcqCtx = caql_beginscan(
-				NULL,
-				cql("SELECT * FROM pg_authid "
-					" WHERE rolname = :1 ",
-					CStringGetDatum((char *) value)));
-
-		roleTup = caql_getnext(pcqCtx);
+		roleTup = SearchSysCache(AUTHNAME,
+								 PointerGetDatum(value),
+								 0, 0, 0);
 		if (!HeapTupleIsValid(roleTup))
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_UNDEFINED_OBJECT),
-						 errmsg("role \"%s\" does not exist", value)));
+			ereport(GUC_complaint_elevel(source),
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("role \"%s\" does not exist", value)));
 			return NULL;
 		}
 
 		roleid = HeapTupleGetOid(roleTup);
 		is_superuser = ((Form_pg_authid) GETSTRUCT(roleTup))->rolsuper;
 
-		caql_endscan(pcqCtx);
+		ReleaseSysCache(roleTup);
 
 		/*
 		 * Verify that session user is allowed to become this role
 		 */
 		if (!is_member_of_role(GetSessionUserId(), roleid))
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-						 errmsg("permission denied to set role \"%s\"",
-								value)));
+			ereport(GUC_complaint_elevel(source),
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("permission denied to set role \"%s\"",
+							value)));
 			return NULL;
 		}
 	}
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 6f7e873336d7..f4548db54d2a 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.99 2007/01/05 22:19:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.104 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,7 @@
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
+#include "parser/analyze.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_relation.h"
 #include "rewrite/rewriteDefine.h"
@@ -102,7 +103,8 @@ isViewOnTempTable_walker(Node *node, void *context)
  *---------------------------------------------------------------------
  */
 static Oid
-DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace, Oid viewOid, Oid * comptypeOid)
+DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace, Oid viewOid,
+					  Oid *comptypeOid, Oid *comptypeArrayOid)
 {
 	Oid			namespaceId;
 	CreateStmt *createStmt = makeNode(CreateStmt);
@@ -110,10 +112,8 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace, Oid v
 	ListCell   *t;
 
 	createStmt->oidInfo.relOid = viewOid;
-	if (comptypeOid)
-		createStmt->oidInfo.comptypeOid = *comptypeOid;
-	else
-		createStmt->oidInfo.comptypeOid = 0;
+	createStmt->oidInfo.comptypeOid = comptypeOid ? *comptypeOid : 0;
+	createStmt->oidInfo.comptypeArrayOid = comptypeArrayOid ? *comptypeArrayOid : 0;
 	createStmt->oidInfo.toastOid = 0;
 	createStmt->oidInfo.toastIndexOid = 0;
 	createStmt->oidInfo.aosegOid = 0;
@@ -232,6 +232,8 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace, Oid v
 		newviewOid =  DefineRelation(createStmt, RELKIND_VIEW, RELSTORAGE_VIRTUAL);
 		if(comptypeOid)
 			*comptypeOid = createStmt->oidInfo.comptypeOid;
+		if(comptypeArrayOid)
+			*comptypeArrayOid = createStmt->oidInfo.comptypeArrayOid;
 		return newviewOid;
 	}
 }
@@ -285,56 +287,27 @@ checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc)
 	 */
 }
 
-static RuleStmt *
-FormViewRetrieveRule(const RangeVar *view, Query *viewParse, bool replace, Oid rewriteOid)
+static void
+DefineViewRules(Oid viewOid, Query *viewParse, bool replace, Oid *rewriteOid)
 {
-	RuleStmt   *rule;
-
+	/* GPDB_83_MERGE_FIXME: rewriteOid used to be set in the RuleStmt
+	 * object we constructed here. Now it's unused */
+	
 	/*
-	 * Create a RuleStmt that corresponds to the suitable rewrite rule args
-	 * for DefineQueryRewrite();
+	 * Set up the ON SELECT rule.  Since the query has already been through
+	 * parse analysis, we use DefineQueryRewrite() directly.
 	 */
-	rule = makeNode(RuleStmt);
-	rule->relation = copyObject((RangeVar *) view);
-	rule->rulename = pstrdup(ViewSelectRuleName);
-	rule->whereClause = NULL;
-	rule->event = CMD_SELECT;
-	rule->instead = true;
-	rule->actions = list_make1(viewParse);
-	rule->replace = replace;
-	rule->ruleOid = rewriteOid;
-
-	return rule;
-}
-
-static void
-DefineViewRules(const RangeVar *view, Query *viewParse, bool replace, Oid* rewriteOid)
-{
-	RuleStmt   *retrieve_rule;
-
-#ifdef NOTYET
-	RuleStmt   *replace_rule;
-	RuleStmt   *append_rule;
-	RuleStmt   *delete_rule;
-#endif
-
-	retrieve_rule = FormViewRetrieveRule(view, viewParse, replace, *rewriteOid);
-
-#ifdef NOTYET
-	replace_rule = FormViewReplaceRule(view, viewParse);
-	append_rule = FormViewAppendRule(view, viewParse);
-	delete_rule = FormViewDeleteRule(view, viewParse);
-#endif
-
-	DefineQueryRewrite(retrieve_rule);
-	*rewriteOid = retrieve_rule->ruleOid;
-
-#ifdef NOTYET
-	DefineQueryRewrite(replace_rule);
-	DefineQueryRewrite(append_rule);
-	DefineQueryRewrite(delete_rule);
-#endif
+	DefineQueryRewrite(pstrdup(ViewSelectRuleName),
+					   viewOid,
+					   NULL,
+					   CMD_SELECT,
+					   true,
+					   replace,
+					   list_make1(viewParse));
 
+	/*
+	 * Someday: automatic ON INSERT, etc
+	 */
 }
 
 /*---------------------------------------------------------------
@@ -403,37 +376,99 @@ UpdateRangeTableOfViewParse(Oid viewOid, Query *viewParse)
 	return viewParse;
 }
 
-/*-------------------------------------------------------------------
+/*
  * DefineView
- *
- *		- takes a "viewname", "parsetree" pair and then
- *		1)		construct the "virtual" relation
- *		2)		commit the command but NOT the transaction,
- *				so that the relation exists
- *				before the rules are defined.
- *		2)		define the "n" rules specified in the PRS2 paper
- *				over the "virtual" relation
- *-------------------------------------------------------------------
+ *		Execute a CREATE VIEW command.
  */
 void
-DefineView(ViewStmt *stmt)
+DefineView(ViewStmt *stmt, const char *queryString)
 {
-	Oid			viewOid = stmt->relOid;
-	RangeVar   *view = stmt->view;
-	Query	   *viewParse = stmt->query;
-	bool		replace = stmt->replace;
+	Query	   *viewParse_orig;
+	Query	   *viewParse;
+	Oid			viewOid;
+	RangeVar   *view;
+
+	/*
+	 * Run parse analysis to convert the raw parse tree to a Query.  Note this
+	 * also acquires sufficient locks on the source table(s).
+	 *
+	 * Since parse analysis scribbles on its input, copy the raw parse tree;
+	 * this ensures we don't corrupt a prepared statement, for example.
+	 *
+	 * GPDB: Parse analysis is only performed in the dispatcher, the segments
+	 * receive an already-analysed version from the dispatcher.
+	 */
+	if (Gp_role != GP_ROLE_EXECUTE)
+		viewParse = parse_analyze((Node *) copyObject(stmt->query),
+								  queryString, NULL, 0);
+	else
+		viewParse = (Query *) stmt->query;
+	viewParse_orig = copyObject(viewParse);
+
+	/*
+	 * The grammar should ensure that the result is a single SELECT Query.
+	 */
+	if (!IsA(viewParse, Query) ||
+		viewParse->commandType != CMD_SELECT)
+		elog(ERROR, "unexpected parse analysis result");
+
+	/*
+	 * Don't allow creating a view that contains dynamically typed functions.
+	 * We cannot guarantee that the future return type would be the same when
+	 * the view was used, as what it was now.
+	 */
+	if (viewParse->hasDynamicFunctions)
+		ereport(ERROR,
+				(errcode(ERRCODE_INDETERMINATE_DATATYPE),
+				 errmsg("CREATE VIEW statements cannot include calls to "
+						"dynamically typed function")));
+
+	/*
+	 * If a list of column names was given, run through and insert these into
+	 * the actual query tree. - thomas 2000-03-08
+	 */
+	if (stmt->aliases != NIL)
+	{
+		ListCell   *alist_item = list_head(stmt->aliases);
+		ListCell   *targetList;
+
+		foreach(targetList, viewParse->targetList)
+		{
+			TargetEntry *te = (TargetEntry *) lfirst(targetList);
+
+			Assert(IsA(te, TargetEntry));
+			/* junk columns don't get aliases */
+			if (te->resjunk)
+				continue;
+			te->resname = pstrdup(strVal(lfirst(alist_item)));
+			alist_item = lnext(alist_item);
+			if (alist_item == NULL)
+				break;			/* done assigning aliases */
+		}
+
+		if (alist_item != NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+					 errmsg("CREATE VIEW specifies more column "
+							"names than columns")));
+	}
 
 	if (Gp_role != GP_ROLE_EXECUTE)
 		viewOid = 0;
+	else
+		viewOid = stmt->relOid;
 	/*
 	 * If the user didn't explicitly ask for a temporary view, check whether
-	 * we need one implicitly.
+	 * we need one implicitly.	We allow TEMP to be inserted automatically as
+	 * long as the CREATE command is consistent with that --- no explicit
+	 * schema name.
 	 */
-	if (!view->istemp)
+	view = stmt->view;
+	if (!view->istemp && isViewOnTempTable(viewParse))
 	{
-		view->istemp = isViewOnTempTable(viewParse);
-		if (view->istemp)
-			if (Gp_role != GP_ROLE_EXECUTE)
+		view = copyObject(view);	/* don't corrupt original command */
+		view->istemp = true;
+		if (Gp_role != GP_ROLE_EXECUTE)
 			ereport(NOTICE,
 					(errmsg("view \"%s\" will be a temporary view",
 							view->relname)));
@@ -445,8 +480,11 @@ DefineView(ViewStmt *stmt)
 	 * NOTE: if it already exists and replace is false, the xact will be
 	 * aborted.
 	 */
-	viewOid = DefineVirtualRelation(view, viewParse->targetList, replace, viewOid, &stmt->comptypeOid);
-
+	viewOid = DefineVirtualRelation(view, viewParse->targetList,
+									stmt->replace,
+									viewOid,
+									&stmt->comptypeOid,
+									&stmt->comptypeArrayOid);
 	stmt->relOid = viewOid;
 
 	/*
@@ -465,12 +503,13 @@ DefineView(ViewStmt *stmt)
 	/*
 	 * Now create the rules associated with the view.
 	 */
-	DefineViewRules(view, viewParse, replace, &stmt->rewriteOid);
+	DefineViewRules(viewOid, viewParse, stmt->replace, &stmt->rewriteOid);
 
 	if (Gp_role == GP_ROLE_DISPATCH)
 	{
-		CdbDispatchUtilityStatement((Node *) stmt, "DefineView");
-
+		ViewStmt *dispatchStmt = (ViewStmt *) copyObject(stmt);
+		dispatchStmt->query = (Node *) viewParse_orig;
+		CdbDispatchUtilityStatement((Node *) dispatchStmt, "DefineView");
 	}
 }
 
diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile
index 33df5948c4c2..e397dd428361 100644
--- a/src/backend/executor/Makefile
+++ b/src/backend/executor/Makefile
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_srcdir)/src/backend/gp_libpq_fe $(CPPFLAGS)
 
 
-OBJS = execAmi.o execGrouping.o execJunk.o execMain.o \
+OBJS = execAmi.o execCurrent.o execGrouping.o execJunk.o execMain.o \
        execProcnode.o execQual.o execScan.o execTuples.o \
        execUtils.o functions.o instrument.o nodeAppend.o nodeAgg.o \
        nodeBitmapAnd.o nodeBitmapOr.o \
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 3b38509b0384..f844d2c37697 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$PostgreSQL: pgsql/src/backend/executor/execAmi.c,v 1.92 2007/02/19 02:23:11 tgl Exp $
+ *	$PostgreSQL: pgsql/src/backend/executor/execAmi.c,v 1.94.2.2 2008/08/05 21:28:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,7 +73,19 @@ ExecReScan(PlanState *node, ExprContext *exprCtxt)
 	if (node->instrument)
 		InstrEndLoop(node->instrument);
 
-	/* If we have changed parameters, propagate that info */
+	/*
+	 * If we have changed parameters, propagate that info.
+	 *
+	 * Note: ExecReScanSetParamPlan() can add bits to node->chgParam,
+	 * corresponding to the output param(s) that the InitPlan will update.
+	 * Since we make only one pass over the list, that means that an InitPlan
+	 * can depend on the output param(s) of a sibling InitPlan only if that
+	 * sibling appears earlier in the list.  This is workable for now given
+	 * the limited ways in which one InitPlan could depend on another, but
+	 * eventually we might need to work harder (or else make the planner
+	 * enlarge the extParam/allParam sets to include the params of depended-on
+	 * InitPlans).
+	 */
 	if (node->chgParam != NULL)
 	{
 		ListCell   *l;
@@ -439,12 +451,13 @@ ExecSupportsMarkRestore(NodeTag plantype)
 			return true;
 
 		case T_Result:
+
 			/*
-			 * T_Result only supports mark/restore if it has a child plan
-			 * that does, so we do not have enough information to give a
-			 * really correct answer.  However, for current uses it's
-			 * enough to always say "false", because this routine is not
-			 * asked about gating Result plans, only base-case Results.
+			 * T_Result only supports mark/restore if it has a child plan that
+			 * does, so we do not have enough information to give a really
+			 * correct answer.	However, for current uses it's enough to
+			 * always say "false", because this routine is not asked about
+			 * gating Result plans, only base-case Results.
 			 */
 			return false;
 
diff --git a/src/backend/executor/execBitmapHeapScan.c b/src/backend/executor/execBitmapHeapScan.c
index b57f7631363e..785f22a9d673 100644
--- a/src/backend/executor/execBitmapHeapScan.c
+++ b/src/backend/executor/execBitmapHeapScan.c
@@ -40,20 +40,12 @@ BitmapHeapScanBegin(ScanState *scanState)
 
 	/*
 	 * Even though we aren't going to do a conventional seqscan, it is useful
-	 * to create a HeapScanDesc --- this checks the relation size and sets up
-	 * statistical infrastructure for us.
+	 * to create a HeapScanDesc --- most of the fields in it are usable.
 	 */
-	node->scanDesc = heap_beginscan(currentRelation,
-												   estate->es_snapshot,
-												   0,
-												   NULL);
-
-	/*
-	 * One problem is that heap_beginscan counts a "sequential scan" start,
-	 * when we actually aren't doing any such thing.  Reverse out the added
-	 * scan count.	(Eventually we may want to count bitmap scans separately.)
-	 */
-	pgstat_discount_heap_scan(currentRelation);
+	node->scanDesc = heap_beginscan_bm(currentRelation,
+									   estate->es_snapshot,
+									   0,
+									   NULL);
 
 	/*
 	 * Heap always needs rechecking each tuple because of potential
@@ -209,6 +201,4 @@ BitmapHeapScanReScan(ScanState *scanState)
 
 	/* rescan to release any page pin */
 	heap_rescan(node->scanDesc, NULL);
-	/* undo bogus "seq scan" count (see notes in ExecInitBitmapHeapScan) */
-	pgstat_discount_heap_scan(node->ss.ss_currentRelation);
 }
diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c
new file mode 100644
index 000000000000..081bc8f07866
--- /dev/null
+++ b/src/backend/executor/execCurrent.c
@@ -0,0 +1,399 @@
+/*-------------------------------------------------------------------------
+ *
+ * execCurrent.c
+ *	  executor support for WHERE CURRENT OF cursor
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *	$PostgreSQL: pgsql/src/backend/executor/execCurrent.c,v 1.5 2008/01/01 19:45:49 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "catalog/pg_type.h"
+#include "executor/executor.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/portal.h"
+
+#include "parser/parse_relation.h"
+#include "parser/parsetree.h"
+#include "cdb/cdbvars.h"
+
+
+static char *fetch_param_value(ExprContext *econtext, int paramId);
+#ifdef NOT_USED
+static ScanState *search_plan_tree(PlanState *node, Oid table_oid);
+#endif /* NOT_USED */
+
+/*
+ * execCurrentOf
+ *
+ * Given a CURRENT OF expression and the OID of a table, determine which row
+ * of the table is currently being scanned by the cursor named by CURRENT OF,
+ * and return the row's TID into *current_tid.
+ *
+ * Returns TRUE if a row was identified.  Returns FALSE if the cursor is valid
+ * for the table but is not currently scanning a row of the table (this is a
+ * legal situation in inheritance cases).  Raises error if cursor is not a
+ * valid updatable scan of the specified table.
+ *
+ * In GPDB, we also check that the tuple came from the current segment.
+ */
+bool
+execCurrentOf(CurrentOfExpr *cexpr,
+			  ExprContext *econtext,
+			  Oid table_oid,
+			  ItemPointer current_tid)
+{
+	int			current_gp_segment_id;
+	Oid			current_table_oid;
+
+	/*
+	 * In an executor node, the dispatcher should've included the current
+	 * position of the cursor along with the query plan. Find and return it
+	 * from there.
+	 */
+	if (Gp_role == GP_ROLE_EXECUTE)
+	{
+		ListCell   *lc;
+		char	   *cursor_name;
+		bool		found = false;
+
+		/* Get the cursor name --- may have to look up a parameter reference */
+		if (cexpr->cursor_name)
+			cursor_name = cexpr->cursor_name;
+		else
+			cursor_name = fetch_param_value(econtext, cexpr->cursor_param);
+
+		foreach (lc, econtext->ecxt_estate->es_cursorPositions)
+		{
+			CursorPosInfo *cpos = (CursorPosInfo *) lfirst(lc);
+
+			if (strcmp(cpos->cursor_name, cursor_name) == 0)
+			{
+				current_gp_segment_id = cpos->gp_segment_id;
+				current_table_oid = cpos->table_oid;
+				ItemPointerCopy(&cpos->ctid, current_tid);
+				found = true;
+				break;
+			}
+		}
+
+		/* Not found. Odd, the dispatcher should've checked for this already. */
+		if (!found)
+			elog(ERROR, "no cursor position information found for cursor \"%s\"",
+				 cursor_name);
+	}
+	else
+	{
+		getCurrentOf(cexpr, econtext, table_oid, current_tid,
+					 &current_gp_segment_id, &current_table_oid);
+	}
+
+	/*
+	 * Found the cursor. Does the table and segment match?
+	 */
+	if (current_gp_segment_id == Gp_segment &&
+		(current_table_oid == InvalidOid || current_table_oid == table_oid))
+	{
+		return true;
+	}
+	else
+		return false;
+}
+
+/*
+ * Return the current position of a cursor that a CURRENT OF expression
+ * refers to.
+ *
+ * This checks that the cursor is valid for table specified by 'table_oid',
+ * but it doesn't have to be scanning a row of that table (i.e. it can
+ * be scanning a row of a different table in the same inheritance hierarchy).
+ * The current table's oid is returned in *current_table_oid.
+ */
+void
+getCurrentOf(CurrentOfExpr *cexpr,
+			 ExprContext *econtext,
+			 Oid table_oid,
+			 ItemPointer current_tid,
+			 int *current_gp_segment_id,
+			 Oid *current_table_oid)
+{
+	char	   *cursor_name;
+	char	   *table_name;
+	Portal		portal;
+	QueryDesc  *queryDesc;
+	TupleTableSlot *slot;
+	AttrNumber	gp_segment_id_attno;
+	AttrNumber	ctid_attno;
+	AttrNumber	tableoid_attno;
+	bool		isnull;
+	Datum		value;
+
+	/*
+	 * In an executor node, execCurrentOf() is supposed to use the cursor
+	 * position information received from the dispatcher, and we shouldn't
+	 * get here.
+	 */
+	if (Gp_role == GP_ROLE_EXECUTE)
+		elog(ERROR, "getCurrentOf called in executor node");
+
+	/* Get the cursor name --- may have to look up a parameter reference */
+	if (cexpr->cursor_name)
+		cursor_name = cexpr->cursor_name;
+	else
+	{
+		if (!econtext)
+			elog(ERROR, "no cursor name information found");
+
+		cursor_name = fetch_param_value(econtext, cexpr->cursor_param);
+	}
+
+	/* Fetch table name for possible use in error messages */
+	table_name = get_rel_name(table_oid);
+	if (table_name == NULL)
+		elog(ERROR, "cache lookup failed for relation %u", table_oid);
+
+	/* Find the cursor's portal */
+	portal = GetPortalByName(cursor_name);
+	if (!PortalIsValid(portal))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_CURSOR),
+				 errmsg("cursor \"%s\" does not exist", cursor_name)));
+
+	/*
+	 * We have to watch out for non-SELECT queries as well as held cursors,
+	 * both of which may have null queryDesc.
+	 */
+	if (portal->strategy != PORTAL_ONE_SELECT)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_STATE),
+				 errmsg("cursor \"%s\" is not a SELECT query",
+						cursor_name)));
+	queryDesc = PortalGetQueryDesc(portal);
+	if (queryDesc == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_STATE),
+				 errmsg("cursor \"%s\" is held from a previous transaction",
+						cursor_name)));
+
+	/*
+	 * The referenced cursor must be simply updatable. This has already
+	 * been discerned by parse/analyze for the DECLARE CURSOR of the given
+	 * cursor. This flag assures us that gp_segment_id, ctid, and tableoid (if necessary)
+	 * will be available as junk metadata, courtesy of preprocess_targetlist.
+	 */
+	if (!portal->is_simply_updatable)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_STATE),
+				 errmsg("cursor \"%s\" is not a simply updatable scan of table \"%s\"",
+						cursor_name, table_name)));
+
+	/*
+	 * The target relation must directly match the cursor's relation. This throws out
+	 * the simple case in which a cursor is declared against table X and the update is
+	 * issued against Y. Moreover, this disallows some subtler inheritance cases where
+	 * Y inherits from X. While such cases could be implemented, it seems wiser to
+	 * simply error out cleanly.
+	 */
+	Index varno = extractSimplyUpdatableRTEIndex(queryDesc->plannedstmt->rtable);
+	Oid cursor_relid = getrelid(varno, queryDesc->plannedstmt->rtable);
+	if (table_oid != cursor_relid)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_STATE),
+				 errmsg("cursor \"%s\" is not a simply updatable scan of table \"%s\"",
+						cursor_name, table_name)));
+
+	/*
+	 * The cursor must have a current result row: per the SQL spec, it's an
+	 * error if not.  We test this at the top level, rather than at the scan
+	 * node level, because in inheritance cases any one table scan could
+	 * easily not be on a row.	We want to return false, not raise error, if
+	 * the passed-in table OID is for one of the inactive scans.
+	 */
+	if (portal->atStart || portal->atEnd)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_STATE),
+				 errmsg("cursor \"%s\" is not positioned on a row",
+						cursor_name)));
+
+	/*
+	 * In PostgreSQL, we extract the current tuple's TID from the scan node
+	 * we dug above. That doesn't work in GPDB, however, because the scan is
+	 * most likely below a Motion node, and belongs to a different slice
+	 * than the top node. The slot of the scan node is empty, and the tuple
+	 * has been received by a Motion node higher up in the tree instead. So
+	 * we use a different approach:
+	 *
+	 * The planner should've made the gp_segment_id, ctid, and tableoid
+	 * available as junk columns at the top of the plan. To retrieve this
+	 * junk metadata, we leverage the EState's junkfilter against the raw
+	 * tuple yielded by the top node in the plan.
+	 */
+
+	slot = queryDesc->planstate->ps_ResultTupleSlot;
+	Insist(!TupIsNull(slot));
+	Assert(queryDesc->estate->es_junkFilter);
+
+	/* extract gp_segment_id metadata */
+	gp_segment_id_attno = ExecFindJunkAttribute(queryDesc->estate->es_junkFilter, "gp_segment_id");
+	if (!AttributeNumberIsValid(gp_segment_id_attno))
+		elog(ERROR, "could not find junk gp_segment_id column");
+
+	value = ExecGetJunkAttribute(slot, gp_segment_id_attno, &isnull);
+	if (isnull)
+		elog(ERROR, "gp_segment_id is NULL");
+	*current_gp_segment_id = DatumGetInt32(value);
+
+	/* extract ctid metadata */
+	ctid_attno = ExecFindJunkAttribute(queryDesc->estate->es_junkFilter, "ctid");
+	if (!AttributeNumberIsValid(ctid_attno))
+		elog(ERROR, "could not find junk ctid column");
+	value = ExecGetJunkAttribute(slot, ctid_attno, &isnull);
+	if (isnull)
+		elog(ERROR, "ctid is NULL");
+	ItemPointerCopy(DatumGetItemPointer(value), current_tid);
+
+	/*
+	 * extract tableoid metadata
+	 *
+	 * DECLARE CURSOR planning only includes tableoid metadata when
+	 * scrolling a partitioned table. Otherwise gp_segment_id and ctid alone
+	 * are sufficient to uniquely identify a tuple.
+	 */
+	tableoid_attno = ExecFindJunkAttribute(queryDesc->estate->es_junkFilter,
+										   "tableoid");
+	if (AttributeNumberIsValid(tableoid_attno))
+	{
+		value = ExecGetJunkAttribute(slot, tableoid_attno, &isnull);
+		if (isnull)
+			elog(ERROR, "tableoid is NULL");
+		*current_table_oid = DatumGetObjectId(value);
+
+		/*
+		 * This is our last opportunity to verify that the physical table given
+		 * by tableoid is, indeed, simply updatable.
+		 */
+		if (!isSimplyUpdatableRelation(*current_table_oid, true /* noerror */))
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("%s is not updatable",
+							get_rel_name_partition(*current_table_oid))));
+	}
+}
+
+/*
+ * fetch_param_value
+ *
+ * Fetch the string value of a param, verifying it is of type REFCURSOR.
+ */
+static char *
+fetch_param_value(ExprContext *econtext, int paramId)
+{
+	ParamListInfo paramInfo = econtext->ecxt_param_list_info;
+
+	if (paramInfo &&
+		paramId > 0 && paramId <= paramInfo->numParams)
+	{
+		ParamExternData *prm = &paramInfo->params[paramId - 1];
+
+		if (OidIsValid(prm->ptype) && !prm->isnull)
+		{
+			Assert(prm->ptype == REFCURSOROID);
+			/* We know that refcursor uses text's I/O routines */
+			return DatumGetCString(DirectFunctionCall1(textout,
+													   prm->value));
+		}
+	}
+
+	ereport(ERROR,
+			(errcode(ERRCODE_UNDEFINED_OBJECT),
+			 errmsg("no value found for parameter %d", paramId)));
+	return NULL;
+}
+
+/*
+ * search_plan_tree
+ *
+ * Search through a PlanState tree for a scan node on the specified table.
+ * Return NULL if not found or multiple candidates.
+ */
+#ifdef NOT_USED
+static ScanState *
+search_plan_tree(PlanState *node, Oid table_oid)
+{
+	if (node == NULL)
+		return NULL;
+	switch (nodeTag(node))
+	{
+			/*
+			 * scan nodes can all be treated alike
+			 */
+		case T_SeqScanState:
+		case T_AppendOnlyScanState:
+		case T_AOCSScanState:
+		case T_TableScanState:
+		case T_DynamicTableScanState:
+		case T_IndexScanState:
+		case T_BitmapHeapScanState:
+		case T_BitmapAppendOnlyScanState:
+		case T_BitmapTableScanState:
+		case T_TidScanState:
+			{
+				ScanState  *sstate = (ScanState *) node;
+
+				if (RelationGetRelid(sstate->ss_currentRelation) == table_oid)
+					return sstate;
+				break;
+			}
+
+			/*
+			 * For Append, we must look through the members; watch out for
+			 * multiple matches (possible if it was from UNION ALL)
+			 */
+		case T_AppendState:
+			{
+				AppendState *astate = (AppendState *) node;
+				ScanState  *result = NULL;
+				int			i;
+
+				for (i = 0; i < astate->as_nplans; i++)
+				{
+					ScanState  *elem = search_plan_tree(astate->appendplans[i],
+														table_oid);
+
+					if (!elem)
+						continue;
+					if (result)
+						return NULL;	/* multiple matches */
+					result = elem;
+				}
+				return result;
+			}
+
+			/*
+			 * Result and Limit can be descended through (these are safe
+			 * because they always return their input's current row)
+			 */
+		case T_ResultState:
+		case T_LimitState:
+		case T_MotionState:
+			return search_plan_tree(node->lefttree, table_oid);
+
+			/*
+			 * SubqueryScan too, but it keeps the child in a different place
+			 */
+		case T_SubqueryScanState:
+			return search_plan_tree(((SubqueryScanState *) node)->subplan,
+									table_oid);
+
+		default:
+			/* Otherwise, assume we can't descend through it */
+			break;
+	}
+	return NULL;
+}
+#endif /* NOT_USED */
diff --git a/src/backend/executor/execDynamicIndexScan.c b/src/backend/executor/execDynamicIndexScan.c
index 987f0f618809..fbe01368c888 100644
--- a/src/backend/executor/execDynamicIndexScan.c
+++ b/src/backend/executor/execDynamicIndexScan.c
@@ -10,6 +10,7 @@
 #include "postgres.h"
 
 #include "cdb/cdbpartition.h"
+#include "cdb/partitionselection.h"
 #include "executor/execDynamicIndexScan.h"
 #include "executor/execDynamicScan.h"
 #include "executor/nodeIndexscan.h"
@@ -728,7 +729,6 @@ IndexScan_EndIndexScan(IndexScanState *indexScanState)
 	Assert(NULL == indexScanState->iss_RelationDesc);
 	Assert(NULL == indexScanState->iss_ScanDesc);
 
-	Assert(NULL != indexScanState->iss_RuntimeContext);
 	FreeRuntimeKeysContext(indexScanState);
 	Assert(NULL == indexScanState->iss_RuntimeContext);
 
diff --git a/src/backend/executor/execDynamicScan.c b/src/backend/executor/execDynamicScan.c
index a708f91c7460..f7e61efc937d 100644
--- a/src/backend/executor/execDynamicScan.c
+++ b/src/backend/executor/execDynamicScan.c
@@ -10,6 +10,7 @@
 #include "postgres.h"
 
 #include "cdb/cdbpartition.h"
+#include "cdb/partitionselection.h"
 #include "executor/execDynamicScan.h"
 #include "executor/nodeIndexscan.h"
 #include "executor/instrument.h"
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 4fe547453229..3cd75cf18f66 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -8,13 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.25 2007/02/06 02:59:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.26 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "executor/executor.h"
+#include "miscadmin.h"
 #include "parser/parse_oper.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
@@ -278,9 +279,20 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
 	TupleHashTable hashtable;
 	HASHCTL		hash_ctl;
 
-	Assert(nbuckets > 0);
+	/*
+	 * Many callers pass "long" values for nbuckets, which means that we can
+	 * receive a bogus value on 64-bit machines.  It seems unwise to change
+	 * this function's signature in released branches, so instead assume that
+	 * a negative input means long->int overflow occurred.
+	 */
+	if (nbuckets <= 0)
+		nbuckets = INT_MAX;
+
 	Assert(entrysize >= sizeof(TupleHashEntryData));
 
+	/* Limit initial table size request to not more than work_mem */
+	nbuckets = Min(nbuckets, (long) ((work_mem * 1024L) / entrysize));
+
 	hashtable = (TupleHashTable) MemoryContextAlloc(tablecxt,
 												 sizeof(TupleHashTableData));
 
diff --git a/src/backend/executor/execHHashagg.c b/src/backend/executor/execHHashagg.c
index df286137ddb1..4b5283a4836c 100644
--- a/src/backend/executor/execHHashagg.c
+++ b/src/backend/executor/execHHashagg.c
@@ -644,7 +644,7 @@ static Size est_hash_tuple_size(TupleTableSlot *hashslot, List *hash_needed)
 		
 		Assert( !attr->attisdropped );
 		
-		len = att_align(len, attr->attalign);
+		len = att_align_nominal(len, attr->attalign);
 		len += get_typavgwidth(attr->atttypid, attr->atttypmod);
 	}
 
diff --git a/src/backend/executor/execIndexscan.c b/src/backend/executor/execIndexscan.c
index 765950a76da0..30a28854ee30 100644
--- a/src/backend/executor/execIndexscan.c
+++ b/src/backend/executor/execIndexscan.c
@@ -100,7 +100,7 @@ OpenIndexRelation(EState *estate, Oid indexOid, Index tableRtIndex)
  * The index quals are passed to the index AM in the form of a ScanKey array.
  * This routine sets up the ScanKeys, fills in all constant fields of the
  * ScanKeys, and prepares information about the keys that have non-constant
- * comparison values.  We divide index qual expressions into four types:
+ * comparison values.  We divide index qual expressions into five types:
  *
  * 1. Simple operator with constant comparison value ("indexkey op constant").
  * For these, we just fill in a ScanKey containing the constant value.
@@ -121,6 +121,8 @@ OpenIndexRelation(EState *estate, Oid indexOid, Index tableRtIndex)
  * (Note that we treat all array-expressions as requiring runtime evaluation,
  * even if they happen to be constants.)
  *
+ * 5. NullTest ("indexkey IS NULL").  We just fill in the ScanKey properly.
+ *
  * Input params are:
  *
  * planstate: executor state node we are working for
@@ -451,6 +453,38 @@ ExecIndexBuildScanKeys(PlanState *planstate, Relation index,
 								   opfuncid,	/* reg proc to use */
 								   (Datum) 0);	/* constant */
 		}
+		else if (IsA(clause, NullTest))
+		{
+			/* indexkey IS NULL */
+			Assert(((NullTest *) clause)->nulltesttype == IS_NULL);
+
+			/*
+			 * argument should be the index key Var, possibly relabeled
+			 */
+			leftop = ((NullTest *) clause)->arg;
+
+			if (leftop && IsA(leftop, RelabelType))
+				leftop = ((RelabelType *) leftop)->arg;
+
+			Assert(leftop != NULL);
+
+			if (!(IsA(leftop, Var) &&
+				  var_is_rel((Var *) leftop)))
+				elog(ERROR, "NullTest indexqual has wrong key");
+
+			varattno = ((Var *) leftop)->varattno;
+
+			/*
+			 * initialize the scan key's fields appropriately
+			 */
+			ScanKeyEntryInitialize(this_scan_key,
+								   SK_ISNULL | SK_SEARCHNULL,
+								   varattno,	/* attribute number to scan */
+								   strategy,	/* op's strategy */
+								   subtype,		/* strategy subtype */
+								   InvalidOid,	/* no reg proc for this */
+								   (Datum) 0);	/* constant */
+		}
 		else
 			insist_log(false, "unsupported indexqual type: %d",
 				 (int) nodeTag(clause));
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index 1ffd30fdf40c..cfc8253a9753 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execJunk.c,v 1.56 2007/01/05 22:19:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execJunk.c,v 1.57 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index be8732490c3c..a3bdc35482a6 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -27,7 +27,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.286 2007/02/02 00:07:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.303.2.3 2009/12/09 21:58:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,6 +43,7 @@
 #include "access/xact.h"
 #include "catalog/heap.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_tablespace.h"
 #include "catalog/toasting.h"
 #include "catalog/aoseg.h"
 #include "catalog/aoblkdir.h"
@@ -116,11 +117,10 @@ typedef struct evalPlanQual
 /* decls for local routines only used within this module */
 static void InitPlan(QueryDesc *queryDesc, int eflags);
 static void initResultRelInfo(ResultRelInfo *resultRelInfo,
+				  Relation resultRelationDesc,
 				  Index resultRelationIndex,
-				  List *rangeTable,
 				  CmdType operation,
-				  bool doInstrument,
-				  bool needLock);
+				  bool doInstrument);
 static void ExecCheckPlanOutput(Relation resultRel, List *targetList);
 static TupleTableSlot *ExecutePlan(EState *estate, PlanState *planstate,
 			CmdType operation,
@@ -132,6 +132,8 @@ static void ExecSelect(TupleTableSlot *slot,
 
 static TupleTableSlot *EvalPlanQualNext(EState *estate);
 static void EndEvalPlanQual(EState *estate);
+static void ExecCheckRTPerms(List *rangeTable);
+static void ExecCheckRTEPerms(RangeTblEntry *rte);
 static void ExecCheckXactReadOnly(PlannedStmt *plannedstmt);
 static void EvalPlanQualStart(evalPlanQual *epq, EState *estate,
 				  evalPlanQual *priorepq);
@@ -143,6 +145,8 @@ static void intorel_receive(TupleTableSlot *slot, DestReceiver *self);
 static void intorel_shutdown(DestReceiver *self);
 static void intorel_destroy(DestReceiver *self);
 
+static void FillSliceTable(EState *estate, PlannedStmt *stmt);
+
 /*
  * For a partitioned insert target only:  
  * This type represents an entry in the per-part hash table stored at
@@ -332,9 +336,33 @@ ExecutorStart(QueryDesc *queryDesc, int eflags)
 	 */
 	estate->es_param_list_info = queryDesc->params;
 
-	if (queryDesc->plannedstmt->nCrossLevelParams > 0)
+	if (queryDesc->plannedstmt->nParamExec > 0)
 		estate->es_param_exec_vals = (ParamExecData *)
-			palloc0(queryDesc->plannedstmt->nCrossLevelParams * sizeof(ParamExecData));
+			palloc0(queryDesc->plannedstmt->nParamExec * sizeof(ParamExecData));
+
+	/*
+	 * If non-read-only query, set the command ID to mark output tuples with
+	 */
+	switch (queryDesc->operation)
+	{
+		case CMD_SELECT:
+			/* SELECT INTO and SELECT FOR UPDATE/SHARE need to mark tuples */
+			if (queryDesc->plannedstmt->intoClause != NULL ||
+				queryDesc->plannedstmt->rowMarks != NIL)
+				estate->es_output_cid = GetCurrentCommandId(true);
+			break;
+
+		case CMD_INSERT:
+		case CMD_DELETE:
+		case CMD_UPDATE:
+			estate->es_output_cid = GetCurrentCommandId(true);
+			break;
+
+		default:
+			elog(ERROR, "unrecognized operation code: %d",
+				 (int) queryDesc->operation);
+			break;
+	}
 
 	/*
 	 * Copy other important information into the EState
@@ -440,7 +468,7 @@ ExecutorStart(QueryDesc *queryDesc, int eflags)
 			}
 			else
 			{
-				reltablespace = GetDefaultTablespace();
+				reltablespace = GetDefaultTablespace(intoClause->rel->istemp);
 
 				/* Need the real tablespace id for dispatch */
 				if (!OidIsValid(reltablespace))
@@ -465,6 +493,7 @@ ExecutorStart(QueryDesc *queryDesc, int eflags)
 				 intoOidInfo->relOid);
 
 			intoOidInfo->comptypeOid = GetNewRelFileNode(reltablespace, false, pg_type_desc);
+			intoOidInfo->comptypeArrayOid = GetNewRelFileNode(reltablespace, false, pg_type_desc);
 			intoOidInfo->toastOid = GetNewRelFileNode(reltablespace, false, pg_class_desc);
 			intoOidInfo->toastIndexOid = GetNewRelFileNode(reltablespace, false, pg_class_desc);
 			intoOidInfo->toastComptypeOid = GetNewRelFileNode(reltablespace, false, pg_type_desc);
@@ -497,6 +526,7 @@ ExecutorStart(QueryDesc *queryDesc, int eflags)
 			Assert(IsA(slice, Slice));
 
 			estate->es_sliceTable = sliceTable;
+			estate->es_cursorPositions = queryDesc->ddesc->cursorPositions;
 
 			estate->currentSliceIdInPlan = slice->rootIndex;
 			estate->currentExecutingSliceId = slice->rootIndex;
@@ -604,7 +634,6 @@ ExecutorStart(QueryDesc *queryDesc, int eflags)
 
 				/* Patch Motion node so it looks like a top node. */
 				motionstate->ps.plan->nMotionNodes = estate->es_sliceTable->nMotions;
-				motionstate->ps.plan->nParamExec = estate->es_sliceTable->nInitPlans;
 			}
 
 			if (Debug_print_slice_table)
@@ -657,7 +686,7 @@ ExecutorStart(QueryDesc *queryDesc, int eflags)
 			/*
 			 * First, see whether we need to pre-execute any initPlan subplans.
 			 */
-			if (queryDesc->plannedstmt->planTree->nParamExec > 0)
+			if (queryDesc->plannedstmt->nParamExec > 0)
 			{
 				preprocess_initplans(queryDesc);
 
@@ -1190,7 +1219,7 @@ ExecutorRewind(QueryDesc *queryDesc)
  * ExecCheckRTPerms
  *		Check access permissions for all relations listed in a range table.
  */
-void
+static void
 ExecCheckRTPerms(List *rangeTable)
 {
 	ListCell   *l;
@@ -1205,7 +1234,7 @@ ExecCheckRTPerms(List *rangeTable)
  * ExecCheckRTEPerms
  *		Check access permissions for a single RTE.
  */
-void
+static void
 ExecCheckRTEPerms(RangeTblEntry *rte)
 {
 	AclMode		requiredPerms;
@@ -1289,15 +1318,10 @@ ExecCheckXactReadOnly(PlannedStmt *plannedstmt)
     rti = 0;
 	foreach(l, plannedstmt->rtable)
 	{
-		RangeTblEntry *rte = lfirst(l);
+		RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
 
 		rti++;
 
-		if (rte->rtekind == RTE_SUBQUERY)
-		{
-			continue;
-		}
-
 		if (rte->rtekind != RTE_RELATION)
 			continue;
 
@@ -1416,67 +1440,87 @@ createPartitionState(PartitionNode *partsAndRules,
 static void
 InitializeResultRelations(PlannedStmt *plannedstmt, EState *estate, CmdType operation)
 {
-	Assert(plannedstmt != NULL && estate != NULL);
-
-	if (plannedstmt->resultRelations == NULL)
-	{
-		/*
-		 * if no result relation, then set state appropriately
-		 */
-		estate->es_result_relations = NULL;
-		estate->es_num_result_relations = 0;
-		estate->es_result_relation_info = NULL;
-		estate->es_result_partitions = NULL;
-		estate->es_result_aosegnos = NIL;
-
-		return;
-	}
-
+	List	   *rangeTable = estate->es_range_table;
+	ListCell   *l;
+	LOCKMODE    lockmode;
 	List	   *resultRelations = plannedstmt->resultRelations;
 	int			numResultRelations = list_length(resultRelations);
 	ResultRelInfo *resultRelInfos;
+	ResultRelInfo *resultRelInfo;
 
-	List *rangeTable = estate->es_range_table;
+	/*
+	 * MPP-2879: The QEs don't pass their MPPEXEC statements through
+	 * the parse (where locks would ordinarily get acquired). So we
+	 * need to take some care to pick them up here (otherwise we get
+	 * some very strange interactions with QE-local operations (vacuum?
+	 * utility-mode ?)).
+	 *
+	 * NOTE: There is a comment in lmgr.c which reads forbids use of
+	 * heap_open/relation_open with "NoLock" followed by use of
+	 * RelationOidLock/RelationLock with a stronger lock-mode:
+	 * RelationOidLock/RelationLock expect a relation to already be
+	 * locked.
+	 *
+	 * But we also need to serialize CMD_UPDATE && CMD_DELETE to preserve
+	 * order on mirrors.
+	 *
+	 * So we're going to ignore the "NoLock" issue above.
+	 */
+	/* CDB: we must promote locks for UPDATE and DELETE operations. */
+	lockmode = (Gp_role != GP_ROLE_EXECUTE || Gp_is_writer) ? RowExclusiveLock : NoLock;
 	
-	if (numResultRelations > 1)
+	Assert(plannedstmt != NULL && estate != NULL);
+
+	if (plannedstmt->resultRelations)
 	{
-		/*
-		 * Multiple result relations (due to inheritance)
-		 * stmt->resultRelations identifies them all
-		 */
-		ResultRelInfo *resultRelInfo;
-		
 		resultRelInfos = (ResultRelInfo *)
 			palloc(numResultRelations * sizeof(ResultRelInfo));
 		resultRelInfo = resultRelInfos;
-		ListCell *lc = NULL;
-		foreach(lc, resultRelations)
+		foreach(l, resultRelations)
 		{
+			Index		resultRelationIndex = lfirst_int(l);
+			Oid			resultRelationOid;
+			Relation	resultRelation;
+
+			resultRelationOid = getrelid(resultRelationIndex, rangeTable);
+			if (operation == CMD_UPDATE || operation == CMD_DELETE)
+			{
+				resultRelation = CdbOpenRelation(resultRelationOid,
+													 lockmode,
+													 false, /* noWait */
+													 NULL); /* lockUpgraded */
+			}
+			else
+			{
+				resultRelation = heap_open(resultRelationOid, lockmode);
+			}
 			initResultRelInfo(resultRelInfo,
-							  lfirst_int(lc),
-							  rangeTable,
+							  resultRelation,
+							  resultRelationIndex,
 							  operation,
-							  estate->es_instrument,
-							  (Gp_role != GP_ROLE_EXECUTE || Gp_is_writer));
+							  estate->es_instrument);
 			
 			resultRelInfo++;
 		}
+		estate->es_result_relations = resultRelInfos;
+		estate->es_num_result_relations = numResultRelations;
+		/* Initialize to first or only result rel */
+		estate->es_result_relation_info = resultRelInfos;
 	}
 	else
 	{
 		/*
-		 * Single result relation identified by stmt->queryTree->resultRelation
+		 * if no result relation, then set state appropriately
 		 */
-		numResultRelations = 1;
-		resultRelInfos = (ResultRelInfo *) palloc(sizeof(ResultRelInfo));
-		initResultRelInfo(resultRelInfos,
-						  linitial_int(plannedstmt->resultRelations),
-						  rangeTable,
-						  operation,
-						  estate->es_instrument,
-						  (Gp_role != GP_ROLE_EXECUTE || Gp_is_writer));
+		estate->es_result_relations = NULL;
+		estate->es_num_result_relations = 0;
+		estate->es_result_relation_info = NULL;
+		estate->es_result_partitions = NULL;
+		estate->es_result_aosegnos = NIL;
+
+		return;
 	}
-	
+
 	/*
 	 * In some occasions when inserting data into a target relations we
 	 * need to pass some specific information from the QD to the QEs.
@@ -1484,11 +1528,6 @@ InitializeResultRelations(PlannedStmt *plannedstmt, EState *estate, CmdType oper
 	 * this is used for partitioned and append-only tables.
 	 */
 	
-	estate->es_result_relations = resultRelInfos;
-	estate->es_num_result_relations = numResultRelations;
-	/* Initialize to first or only result rel */
-	estate->es_result_relation_info = resultRelInfos;
-	
 	if (Gp_role == GP_ROLE_EXECUTE)
 	{
 		estate->es_result_partitions = plannedstmt->result_partitions;
@@ -1629,6 +1668,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 	PlanState  *planstate;
 	TupleDesc	tupType;
 	ListCell   *l;
+	int			i;
 	bool		shouldDispatch = Gp_role == GP_ROLE_DISPATCH && plannedstmt->planTree->dispatch == DISPATCH_PARALLEL;
 
 	Assert(plannedstmt->intoPolicy == NULL
@@ -1650,15 +1690,13 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 	}
 
 	/*
-	 * Do permissions checks.  It's sufficient to examine the query's top
-	 * rangetable here --- subplan RTEs will be checked during
-	 * ExecInitSubPlan().
+	 * Do permissions checks.
 	 */
 	if (operation != CMD_SELECT ||
 		(Gp_role != GP_ROLE_EXECUTE &&
 		 !(shouldDispatch && cdbpathlocus_querysegmentcatalogs)))
 	{
-		ExecCheckRTPerms(plannedstmt->rtable);
+		ExecCheckRTPerms(rangeTable);
 	}
 	else
 	{
@@ -1673,7 +1711,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 
 		ListCell *lc = NULL;
 
-		foreach(lc, plannedstmt->rtable)
+		foreach(lc, rangeTable)
 		{
 			RangeTblEntry *rte = lfirst(lc);
 
@@ -1694,18 +1732,13 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 		}
 	}
 
-	/*
-	 * get information from query descriptor
-	 */
-	rangeTable = plannedstmt->rtable;
-
 	/*
 	 * initialize the node's execution state
 	 */
 	estate->es_range_table = rangeTable;
 
 	/*
-	 * if there is a result relation, initialize result relation stuff
+	 * initialize result relation stuff
 	 *
 	 * CDB: Note that we need this info even if we aren't the slice that will be doing
 	 * the actual updating, since it's where we learn things, such as if the row needs to
@@ -1759,6 +1792,42 @@ InitPlan(QueryDesc *queryDesc, int eflags)
             continue;
         }
 
+		/*
+		 * Check that relation is a legal target for marking.
+		 *
+		 * In most cases parser and/or planner should have noticed this
+		 * already, but they don't cover all cases.
+		 */
+		switch (relation->rd_rel->relkind)
+		{
+			case RELKIND_RELATION:
+				/* OK */
+				break;
+			case RELKIND_SEQUENCE:
+				/* Must disallow this because we don't vacuum sequences */
+				ereport(ERROR,
+						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+						 errmsg("cannot lock rows in sequence \"%s\"",
+								RelationGetRelationName(relation))));
+				break;
+			case RELKIND_TOASTVALUE:
+				/* This will be disallowed in 9.1, but for now OK */
+				break;
+			case RELKIND_VIEW:
+				/* Should not get here */
+				ereport(ERROR,
+						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+						 errmsg("cannot lock rows in view \"%s\"",
+								RelationGetRelationName(relation))));
+				break;
+			default:
+				ereport(ERROR,
+						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+						 errmsg("cannot lock rows in relation \"%s\"",
+								RelationGetRelationName(relation))));
+				break;
+		}
+
 		erm = (ExecRowMark *) palloc(sizeof(ExecRowMark));
 		erm->relation = relation;
 		erm->rti = rc->rti;
@@ -1784,6 +1853,41 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 	estate->es_evTuple = NULL;
 	estate->es_useEvalPlan = false;
 
+	/*
+	 * Initialize the slice table.
+	 */
+	if (Gp_role == GP_ROLE_DISPATCH)
+		FillSliceTable(estate, plannedstmt);
+
+	/*
+	 * Initialize private state information for each SubPlan.  We must do this
+	 * before running ExecInitNode on the main query tree, since
+	 * ExecInitSubPlan expects to be able to find these entries.
+	 */
+	Assert(estate->es_subplanstates == NIL);
+	i = 1;						/* subplan indices count from 1 */
+	foreach(l, plannedstmt->subplans)
+	{
+		Plan	   *subplan = (Plan *) lfirst(l);
+		PlanState  *subplanstate;
+		int			sp_eflags;
+
+		/*
+		 * A subplan will never need to do BACKWARD scan nor MARK/RESTORE.
+		 *
+		 * GPDB: We always set the REWIND flag, to delay eagerfree.
+		 */
+		sp_eflags = eflags & EXEC_FLAG_EXPLAIN_ONLY;
+		sp_eflags |= EXEC_FLAG_REWIND;
+
+		subplanstate = ExecInitNode(subplan, estate, sp_eflags);
+
+		estate->es_subplanstates = lappend(estate->es_subplanstates,
+										   subplanstate);
+
+		i++;
+	}
+
 	/*
 	 * Initialize the private state information for all the nodes in the query
 	 * tree.  This opens files, allocates storage and leaves us ready to start
@@ -1855,7 +1959,6 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 			 * junk filter.  Note this is only possible for UPDATE/DELETE, so
 			 * we can't be fooled by some needing a filter and some not.
 			 */
-
 			if (list_length(plannedstmt->resultRelations) > 1)
 			{
 				List *appendplans;
@@ -1886,10 +1989,10 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 							       cleanTupType,
 							       ExecInitExtraTupleSlot(estate));
 					/*
-					 * Since it must be UPDATE/DELETE, there had better be
-					 * a "ctid" junk attribute in the tlist ... but ctid could
-					 * be at a different resno for each result relation.
-					 * We look up the ctid resnos now and save them in the
+					 * Since it must be UPDATE/DELETE, there had better be a
+					 * "ctid" junk attribute in the tlist ... but ctid could
+					 * be at a different resno for each result relation. We
+					 * look up the ctid resnos now and save them in the
 					 * junkfilters.
 					 */
 					j->jf_junkAttNo = ExecFindJunkAttribute(j, "ctid");
@@ -1905,6 +2008,16 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 				 */
 				estate->es_junkFilter =
 					estate->es_result_relation_info->ri_junkFilter;
+
+				/*
+				 * We currently can't support rowmarks in this case, because
+				 * the associated junk CTIDs might have different resnos in
+				 * different subplans.
+				 */
+				if (estate->es_rowMarks)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("SELECT FOR UPDATE/SHARE is not supported within a query with multiple result relations")));
 			}
 			else
 			{
@@ -1930,24 +2043,6 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 				{
 					/* For SELECT, want to return the cleaned tuple type */
 					tupType = j->jf_cleanTupType;
-					/* For SELECT FOR UPDATE/SHARE, find the ctid attrs now */
-					foreach(l, estate->es_rowMarks)
-					{
-						ExecRowMark *erm = (ExecRowMark *) lfirst(l);
-						char		resname[32];
-
-						/* CDB: CTIDs were not fetched for distributed relation. */
-						Relation relation = erm->relation;
-						if (relation->rd_cdbpolicy &&
-							relation->rd_cdbpolicy->ptype == POLICYTYPE_PARTITIONED)
-							continue;
-
-						snprintf(resname, sizeof(resname), "ctid%u", erm->rti);
-						erm->ctidAttNo = ExecFindJunkAttribute(j, resname);
-						if (!AttributeNumberIsValid(erm->ctidAttNo))
-							elog(ERROR, "could not find junk \"%s\" column",
-								 resname);
-					}
 				}
 				else if (operation == CMD_UPDATE || operation == CMD_DELETE)
 				{
@@ -1956,6 +2051,25 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 					if (!AttributeNumberIsValid(j->jf_junkAttNo))
 						elog(ERROR, "could not find junk ctid column");
 				}
+
+				/* For SELECT FOR UPDATE/SHARE, find the ctid attrs now */
+				foreach(l, estate->es_rowMarks)
+				{
+					ExecRowMark *erm = (ExecRowMark *) lfirst(l);
+					char		resname[32];
+
+					/* CDB: CTIDs were not fetched for distributed relation. */
+					Relation relation = erm->relation;
+					if (relation->rd_cdbpolicy &&
+						relation->rd_cdbpolicy->ptype == POLICYTYPE_PARTITIONED)
+						continue;
+
+					snprintf(resname, sizeof(resname), "ctid%u", erm->rti);
+					erm->ctidAttNo = ExecFindJunkAttribute(j, resname);
+					if (!AttributeNumberIsValid(erm->ctidAttNo))
+						elog(ERROR, "could not find junk \"%s\" column",
+							 resname);
+				}
 			}
 		}
 		else
@@ -1971,6 +2085,16 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 			}
 
 			estate->es_junkFilter = NULL;
+			/*
+			 * GPDB_83_MERGE_FIXME: Disabled this test, because it was hit by the
+			 * qp_executor regression test. Disabling it doesn't seem to be have any
+			 * ill effect, which is a bit baffling. I think we have some other
+			 * mechanism to do FOR UPDATE/SHARE. We lock the whole table, perhaps?
+			 */
+#if 0
+			if (estate->es_rowMarks)
+				elog(ERROR, "SELECT FOR UPDATE/SHARE, but no junk columns");
+#endif
 		}
 	}
 
@@ -2010,23 +2134,9 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 			rliststate = (List *) ExecInitExpr((Expr *) rlist, planstate);
 			resultRelInfo->ri_projectReturning =
 				ExecBuildProjectionInfo(rliststate, econtext, slot,
-									   resultRelInfo->ri_RelationDesc->rd_att);
+									 resultRelInfo->ri_RelationDesc->rd_att);
 			resultRelInfo++;
 		}
-
-		/*
-		 * Because we already ran ExecInitNode() for the top plan node, any
-		 * subplans we just attached to it won't have been initialized; so we
-		 * have to do it here.	(Ugly, but the alternatives seem worse.)
-		 */
-		foreach(l, planstate->subPlan)
-		{
-			SubPlanState *sstate = (SubPlanState *) lfirst(l);
-
-			Assert(IsA(sstate, SubPlanState));
-			if (sstate->planstate == NULL)		/* already inited? */
-				ExecInitSubPlan(sstate, estate, eflags);
-		}
 	}
 
 	queryDesc->tupDesc = tupType;
@@ -2062,51 +2172,12 @@ InitPlan(QueryDesc *queryDesc, int eflags)
  */
 static void
 initResultRelInfo(ResultRelInfo *resultRelInfo,
+				  Relation resultRelationDesc,
 				  Index resultRelationIndex,
-				  List *rangeTable,
 				  CmdType operation,
-				  bool doInstrument,
-				  bool needLock)
+				  bool doInstrument)
 {
-	Oid			resultRelationOid;
-	Relation	resultRelationDesc;
-	LOCKMODE    lockmode;
-
-	resultRelationOid = getrelid(resultRelationIndex, rangeTable);
-
 	/*
-	 * MPP-2879: The QEs don't pass their MPPEXEC statements through
-	 * the parse (where locks would ordinarily get acquired). So we
-	 * need to take some care to pick them up here (otherwise we get
-	 * some very strange interactions with QE-local operations (vacuum?
-	 * utility-mode ?)).
-	 *
-	 * NOTE: There is a comment in lmgr.c which reads forbids use of
-	 * heap_open/relation_open with "NoLock" followed by use of
-	 * RelationOidLock/RelationLock with a stronger lock-mode:
-	 * RelationOidLock/RelationLock expect a relation to already be
-	 * locked.
-	 *
-	 * But we also need to serialize CMD_UPDATE && CMD_DELETE to preserve
-	 * order on mirrors.
-	 *
-	 * So we're going to ignore the "NoLock" issue above.
-	 */
-	/* CDB: we must promote locks for UPDATE and DELETE operations. */
-	lockmode = needLock ? RowExclusiveLock : NoLock;
-	if (operation == CMD_UPDATE || operation == CMD_DELETE)
-	{
-		resultRelationDesc = CdbOpenRelation(resultRelationOid,
-											 lockmode,
-											 false, /* noWait */ 
-											 NULL); /* lockUpgraded */
-	}
-	else
-	{
-		resultRelationDesc = heap_open(resultRelationOid, lockmode);
-	}
-
-    /*
 	 * Check valid relkind ... parser and/or planner should have noticed this
 	 * already, but let's make sure.
 	 */
@@ -2155,6 +2226,12 @@ initResultRelInfo(ResultRelInfo *resultRelInfo,
 					 errmsg("cannot change view \"%s\"",
 							RelationGetRelationName(resultRelationDesc))));
 			break;
+		default:
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("cannot change relation \"%s\"",
+							RelationGetRelationName(resultRelationDesc))));
+			break;
 	}
 
 	/* OK, fill in the node */
@@ -2199,7 +2276,7 @@ initResultRelInfo(ResultRelInfo *resultRelInfo,
 	 * entries for the tuples we add/update.  We need not do this for a
 	 * DELETE, however, since deletion doesn't affect indexes.
 	 */
-	if (needLock) /* only needed by the root slice who will do the actual updating */
+	if (Gp_role != GP_ROLE_EXECUTE || Gp_is_writer) /* only needed by the root slice who will do the actual updating */
 	{
 		if (resultRelationDesc->rd_rel->relhasindex &&
 			operation != CMD_DELETE)
@@ -2257,6 +2334,76 @@ ResultRelInfoSetSegno(ResultRelInfo *resultRelInfo, List *mapping)
 	Assert(found);
 }
 
+/*
+ *		ExecGetTriggerResultRel
+ *
+ * Get a ResultRelInfo for a trigger target relation.  Most of the time,
+ * triggers are fired on one of the result relations of the query, and so
+ * we can just return a member of the es_result_relations array.  (Note: in
+ * self-join situations there might be multiple members with the same OID;
+ * if so it doesn't matter which one we pick.)  However, it is sometimes
+ * necessary to fire triggers on other relations; this happens mainly when an
+ * RI update trigger queues additional triggers on other relations, which will
+ * be processed in the context of the outer query.	For efficiency's sake,
+ * we want to have a ResultRelInfo for those triggers too; that can avoid
+ * repeated re-opening of the relation.  (It also provides a way for EXPLAIN
+ * ANALYZE to report the runtimes of such triggers.)  So we make additional
+ * ResultRelInfo's as needed, and save them in es_trig_target_relations.
+ */
+ResultRelInfo *
+ExecGetTriggerResultRel(EState *estate, Oid relid)
+{
+	ResultRelInfo *rInfo;
+	int			nr;
+	ListCell   *l;
+	Relation	rel;
+	MemoryContext oldcontext;
+
+	/* First, search through the query result relations */
+	rInfo = estate->es_result_relations;
+	nr = estate->es_num_result_relations;
+	while (nr > 0)
+	{
+		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+			return rInfo;
+		rInfo++;
+		nr--;
+	}
+	/* Nope, but maybe we already made an extra ResultRelInfo for it */
+	foreach(l, estate->es_trig_target_relations)
+	{
+		rInfo = (ResultRelInfo *) lfirst(l);
+		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+			return rInfo;
+	}
+	/* Nope, so we need a new one */
+
+	/*
+	 * Open the target relation's relcache entry.  We assume that an
+	 * appropriate lock is still held by the backend from whenever the trigger
+	 * event got queued, so we need take no new lock here.
+	 */
+	rel = heap_open(relid, NoLock);
+
+	/*
+	 * Make the new entry in the right context.  Currently, we don't need any
+	 * index information in ResultRelInfos used only for triggers, so tell
+	 * initResultRelInfo it's a DELETE.
+	 */
+	oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);
+	rInfo = makeNode(ResultRelInfo);
+	initResultRelInfo(rInfo,
+					  rel,
+					  0,		/* dummy rangetable index */
+					  CMD_DELETE,
+					  estate->es_instrument);
+	estate->es_trig_target_relations =
+		lappend(estate->es_trig_target_relations, rInfo);
+	MemoryContextSwitchTo(oldcontext);
+
+	return rInfo;
+}
+
 /*
  *		ExecContextForcesOids
  *
@@ -2398,6 +2545,16 @@ ExecEndPlan(PlanState *planstate, EState *estate)
 	if (planstate != NULL)
 		ExecEndNode(planstate);
 
+	/*
+	 * for subplans too
+	 */
+	foreach(l, estate->es_subplanstates)
+	{
+		PlanState  *subplanstate = (PlanState *) lfirst(l);
+
+		ExecEndNode(subplanstate);
+	}
+
 	/*
 	 * destroy the executor's tuple table.  Actually we only care about
 	 * releasing buffer pins and tupdesc refcounts; there's no need to
@@ -2462,6 +2619,17 @@ ExecEndPlan(PlanState *planstate, EState *estate)
 		resultRelInfo++;
 	}
 
+	/*
+	 * likewise close any trigger target relations
+	 */
+	foreach(l, estate->es_trig_target_relations)
+	{
+		resultRelInfo = (ResultRelInfo *) lfirst(l);
+		/* Close indices and then the relation itself */
+		ExecCloseIndices(resultRelInfo);
+		heap_close(resultRelInfo->ri_RelationDesc, NoLock);
+	}
+
 	/*
 	 * close any relations selected FOR UPDATE/FOR SHARE, again keeping locks
 	 */
@@ -2670,26 +2838,10 @@ lnext:	;
 				Datum		datum;
 				bool		isNull;
 
-				/*
-				 * extract the 'ctid' junk attribute.
-				 */
-				if (operation == CMD_UPDATE || operation == CMD_DELETE)
-				{
-					datum = ExecGetJunkAttribute(slot, junkfilter->jf_junkAttNo,
-												 &isNull);
-					/* shouldn't ever get a null result... */
-					if (isNull)
-						elog(ERROR, "ctid is NULL");
-
-					tupleid = (ItemPointer) DatumGetPointer(datum);
-					tuple_ctid = *tupleid;	/* make sure we don't free the ctid!! */
-					tupleid = &tuple_ctid;
-				}
-
 				/*
 				 * Process any FOR UPDATE or FOR SHARE locking requested.
 				 */
-				else if (estate->es_rowMarks != NIL)
+				if (estate->es_rowMarks != NIL)
 				{
 					ListCell   *l;
 
@@ -2727,7 +2879,7 @@ lnext:	;
 
 						test = heap_lock_tuple(erm->relation, &tuple, &buffer,
 											   &update_ctid, &update_xmax,
-											   estate->es_snapshot->curcid,
+											   estate->es_output_cid,
 											   lockmode,
 											   (erm->noWait ? LockTupleNoWait : LockTupleWait));
 						ReleaseBuffer(buffer);
@@ -2752,8 +2904,7 @@ lnext:	;
 									newSlot = EvalPlanQual(estate,
 														   erm->rti,
 														   &update_ctid,
-														   update_xmax,
-													estate->es_snapshot->curcid);
+														   update_xmax);
 									if (!TupIsNull(newSlot))
 									{
 										slot = planSlot = newSlot;
@@ -2776,6 +2927,25 @@ lnext:	;
 					}
 				}
 
+				/*
+				 * extract the 'ctid' junk attribute.
+				 */
+				if (operation == CMD_UPDATE || operation == CMD_DELETE)
+				{
+					Datum		datum;
+					bool		isNull;
+
+					datum = ExecGetJunkAttribute(slot, junkfilter->jf_junkAttNo,
+												 &isNull);
+					/* shouldn't ever get a null result... */
+					if (isNull)
+						elog(ERROR, "ctid is NULL");
+
+					tupleid = (ItemPointer) DatumGetPointer(datum);
+					tuple_ctid = *tupleid;	/* make sure we don't free the ctid!! */
+					tupleid = &tuple_ctid;
+				}
+
 				/*
 				 * Create a new "clean" tuple with all junk attributes removed. We
 				 * don't need to do this for DELETE, however (there will in fact
@@ -3105,7 +3275,7 @@ ExecInsert(TupleTableSlot *slot,
 
 		newId = heap_insert(resultRelationDesc,
 							tuple,
-							estate->es_snapshot->curcid,
+							estate->es_output_cid,
 							true, true, GetCurrentTransactionId());
 	}
 
@@ -3208,8 +3378,7 @@ ExecDelete(ItemPointer tupleid,
 		{
 			bool		dodelete;
 
-			dodelete = ExecBRDeleteTriggers(estate, resultRelInfo, tupleid,
-											estate->es_snapshot->curcid);
+			dodelete = ExecBRDeleteTriggers(estate, resultRelInfo, tupleid);
 
 			if (!dodelete)			/* "do nothing" */
 				return;
@@ -3242,7 +3411,7 @@ ldelete:;
 	{
 		result = heap_delete(resultRelationDesc, tupleid,
 						 &update_ctid, &update_xmax,
-						 estate->es_snapshot->curcid,
+						 estate->es_output_cid,
 						 estate->es_crosscheck_snapshot,
 						 true /* wait for commit */ );
 	}
@@ -3345,8 +3514,7 @@ ldelete:;
 				epqslot = EvalPlanQual(estate,
 									   resultRelInfo->ri_RangeTableIndex,
 									   &update_ctid,
-									   update_xmax,
-									   estate->es_snapshot->curcid);
+									   update_xmax);
 				if (!TupIsNull(epqslot))
 				{
 					*tupleid = update_ctid;
@@ -3665,32 +3833,14 @@ ExecUpdate(TupleTableSlot *slot,
 	if (resultRelInfo->ri_TrigDesc &&
 		resultRelInfo->ri_TrigDesc->n_before_row[TRIGGER_EVENT_UPDATE] > 0)
 	{
-		HeapTuple	newtuple;
+		slot = ExecBRUpdateTriggers(estate, resultRelInfo,
+									tupleid, slot);
 
-		newtuple = ExecBRUpdateTriggers(estate, resultRelInfo,
-										tupleid, tuple,
-										estate->es_snapshot->curcid);
-
-		if (newtuple == NULL)	/* "do nothing" */
+		if (slot == NULL)		/* "do nothing" */
 			return;
 
-		if (newtuple != tuple)	/* modified by Trigger(s) */
-		{
-			/*
-			 * Put the modified tuple into a slot for convenience of routines
-			 * below.  We assume the tuple was allocated in per-tuple memory
-			 * context, and therefore will go away by itself. The tuple table
-			 * slot should not try to clear it.
-			 */
-			TupleTableSlot *newslot = estate->es_trig_tuple_slot;
-
-			if (newslot->tts_tupleDescriptor != partslot->tts_tupleDescriptor)
-				ExecSetSlotDescriptor(newslot, partslot->tts_tupleDescriptor);
-			ExecStoreGenericTuple(newtuple, newslot, false);
-            newslot->tts_tableOid = partslot->tts_tableOid; /* for constraints */
-			partslot = newslot;
-			tuple = newtuple;
-		}
+		/* trigger might have changed tuple */
+		tuple = ExecFetchSlotHeapTuple(slot);
 	}
 
 	/*
@@ -3724,7 +3874,7 @@ lreplace:;
 		{
 			result = heap_update(resultRelationDesc, tupleid, tuple,
 							 &update_ctid, &update_xmax,
-							 estate->es_snapshot->curcid,
+							 estate->es_output_cid,
 							 estate->es_crosscheck_snapshot,
 							 true /* wait for commit */ );
 		} 
@@ -3791,8 +3941,7 @@ lreplace:;
 					epqslot = EvalPlanQual(estate,
 										   resultRelInfo->ri_RangeTableIndex,
 										   &update_ctid,
-										   update_xmax,
-										   estate->es_snapshot->curcid);
+										   update_xmax);
 					if (!TupIsNull(epqslot))
 					{
 						*tupleid = update_ctid;
@@ -3840,6 +3989,8 @@ lreplace:;
 	 *
 	 * Note: heap_update returns the tid (location) of the new tuple in the
 	 * t_self field.
+	 *
+	 * If it's a HOT update, we mustn't insert new index entries.
 	 */
 	if (rel_is_aorows || rel_is_aocols)
 	{
@@ -3848,7 +3999,7 @@ lreplace:;
 	}
 	else
 	{
-		if (resultRelInfo->ri_NumIndices > 0)
+		if (resultRelInfo->ri_NumIndices > 0 && !HeapTupleIsHeapOnly((HeapTuple) tuple))
 			ExecInsertIndexTuples(partslot, &(((HeapTuple) tuple)->t_self), estate, false);
 	}
 
@@ -3966,7 +4117,6 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
  *	rti - rangetable index of table containing tuple
  *	*tid - t_ctid from the outdated tuple (ie, next updated version)
  *	priorXmax - t_xmax from the outdated tuple
- *	curCid - command ID of current command of my transaction
  *
  * *tid is also an output parameter: it's modified to hold the TID of the
  * latest version of the tuple (note this may be changed even on failure)
@@ -3976,13 +4126,14 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
  */
 TupleTableSlot *
 EvalPlanQual(EState *estate, Index rti,
-			 ItemPointer tid, TransactionId priorXmax, CommandId curCid)
+			 ItemPointer tid, TransactionId priorXmax)
 {
 	evalPlanQual *epq;
 	EState	   *epqstate;
 	Relation	relation;
 	HeapTupleData tuple;
 	HeapTuple	copyTuple = NULL;
+	SnapshotData SnapshotDirty;
 	bool		endNode;
 
 	Assert(rti != 0);
@@ -4015,12 +4166,13 @@ EvalPlanQual(EState *estate, Index rti,
 	 *
 	 * Loop here to deal with updated or busy tuples
 	 */
+	InitDirtySnapshot(SnapshotDirty);
 	tuple.t_self = *tid;
 	for (;;)
 	{
 		Buffer		buffer;
 
-		if (heap_fetch(relation, SnapshotDirty, &tuple, &buffer, true, NULL))
+		if (heap_fetch(relation, &SnapshotDirty, &tuple, &buffer, true, NULL))
 		{
 			/*
 			 * If xmin isn't what we're expecting, the slot must have been
@@ -4038,33 +4190,33 @@ EvalPlanQual(EState *estate, Index rti,
 			}
 
 			/* otherwise xmin should not be dirty... */
-			if (TransactionIdIsValid(SnapshotDirty->xmin))
+			if (TransactionIdIsValid(SnapshotDirty.xmin))
 				elog(ERROR, "t_xmin is uncommitted in tuple to be updated");
 
 			/*
 			 * If tuple is being updated by other transaction then we have to
 			 * wait for its commit/abort.
 			 */
-			if (TransactionIdIsValid(SnapshotDirty->xmax))
+			if (TransactionIdIsValid(SnapshotDirty.xmax))
 			{
 				ReleaseBuffer(buffer);
-				XactLockTableWait(SnapshotDirty->xmax);
+				XactLockTableWait(SnapshotDirty.xmax);
 				continue;		/* loop back to repeat heap_fetch */
 			}
 
 			/*
 			 * If tuple was inserted by our own transaction, we have to check
-			 * cmin against curCid: cmin >= curCid means our command cannot
-			 * see the tuple, so we should ignore it.  Without this we are
-			 * open to the "Halloween problem" of indefinitely re-updating the
-			 * same tuple.	(We need not check cmax because
+			 * cmin against es_output_cid: cmin >= current CID means our
+			 * command cannot see the tuple, so we should ignore it.  Without
+			 * this we are open to the "Halloween problem" of indefinitely
+			 * re-updating the same tuple. (We need not check cmax because
 			 * HeapTupleSatisfiesDirty will consider a tuple deleted by our
 			 * transaction dead, regardless of cmax.)  We just checked that
 			 * priorXmax == xmin, so we can test that variable instead of
 			 * doing HeapTupleHeaderGetXmin again.
 			 */
 			if (TransactionIdIsCurrentTransactionId(priorXmax) &&
-				HeapTupleHeaderGetCmin(tuple.t_data) >= curCid)
+				HeapTupleHeaderGetCmin(tuple.t_data) >= estate->es_output_cid)
 			{
 				ReleaseBuffer(buffer);
 				return NULL;
@@ -4333,13 +4485,10 @@ EvalPlanQualStart(evalPlanQual *epq, EState *estate, evalPlanQual *priorepq)
 	EState	   *epqstate;
 	int			rtsize;
 	MemoryContext oldcontext;
+	ListCell   *l;
 
 	rtsize = list_length(estate->es_range_table);
 
-	/*
-	 * It's tempting to think about using CreateSubExecutorState here, but
-	 * at present we can't because of memory leakage concerns ...
-	 */
 	epq->estate = epqstate = CreateExecutorState();
 
 	oldcontext = MemoryContextSwitchTo(epqstate->es_query_cxt);
@@ -4354,10 +4503,12 @@ EvalPlanQualStart(evalPlanQual *epq, EState *estate, evalPlanQual *priorepq)
 	epqstate->es_snapshot = estate->es_snapshot;
 	epqstate->es_crosscheck_snapshot = estate->es_crosscheck_snapshot;
 	epqstate->es_range_table = estate->es_range_table;
+	epqstate->es_output_cid = estate->es_output_cid;
 	epqstate->es_result_relations = estate->es_result_relations;
 	epqstate->es_num_result_relations = estate->es_num_result_relations;
 	epqstate->es_result_relation_info = estate->es_result_relation_info;
 	epqstate->es_junkFilter = estate->es_junkFilter;
+	/* es_trig_target_relations must NOT be copied */
 	epqstate->es_into_relation_descriptor = estate->es_into_relation_descriptor;
 	epqstate->es_into_relation_is_bulkload = estate->es_into_relation_is_bulkload;
 	epqstate->es_into_relation_last_heap_tid = estate->es_into_relation_last_heap_tid;
@@ -4366,9 +4517,9 @@ EvalPlanQualStart(evalPlanQual *epq, EState *estate, evalPlanQual *priorepq)
 	memcpy(epqstate->es_into_relation_bulkloadinfo, estate->es_into_relation_bulkloadinfo, sizeof(MirroredBufferPoolBulkLoadInfo));
 
 	epqstate->es_param_list_info = estate->es_param_list_info;
-	if (estate->es_plannedstmt->planTree->nParamExec > 0)
+	if (estate->es_plannedstmt->nParamExec > 0)
 		epqstate->es_param_exec_vals = (ParamExecData *)
-			palloc0(estate->es_plannedstmt->planTree->nParamExec * sizeof(ParamExecData));
+			palloc0(estate->es_plannedstmt->nParamExec * sizeof(ParamExecData));
 	epqstate->es_rowMarks = estate->es_rowMarks;
 	epqstate->es_instrument = estate->es_instrument;
 	epqstate->es_select_into = estate->es_select_into;
@@ -4394,6 +4545,23 @@ EvalPlanQualStart(evalPlanQual *epq, EState *estate, evalPlanQual *priorepq)
 	 */
 	epqstate->es_tupleTable = NIL;
 
+	/*
+	 * Initialize private state information for each SubPlan.  We must do this
+	 * before running ExecInitNode on the main query tree, since
+	 * ExecInitSubPlan expects to be able to find these entries.
+	 */
+	Assert(epqstate->es_subplanstates == NIL);
+	foreach(l, estate->es_plannedstmt->subplans)
+	{
+		Plan	   *subplan = (Plan *) lfirst(l);
+		PlanState  *subplanstate;
+
+		subplanstate = ExecInitNode(subplan, epqstate, 0);
+
+		epqstate->es_subplanstates = lappend(epqstate->es_subplanstates,
+											 subplanstate);
+	}
+
 	/*
 	 * Initialize the private state information for all the nodes in the query
 	 * tree.  This opens files, allocates storage and leaves us ready to start
@@ -4417,11 +4585,19 @@ EvalPlanQualStop(evalPlanQual *epq)
 {
 	EState	   *epqstate = epq->estate;
 	MemoryContext oldcontext;
+	ListCell   *l;
 
 	oldcontext = MemoryContextSwitchTo(epqstate->es_query_cxt);
 
 	ExecEndNode(epq->planstate);
 
+	foreach(l, epqstate->es_subplanstates)
+	{
+		PlanState  *subplanstate = (PlanState *) lfirst(l);
+
+		ExecEndNode(subplanstate);
+	}
+
 	/* throw away the per-epqstate tuple table completely */
 	ExecResetTupleTable(epqstate->es_tupleTable, true);
 	epqstate->es_tupleTable = NIL;
@@ -4432,6 +4608,15 @@ EvalPlanQualStop(evalPlanQual *epq)
 		epqstate->es_evTuple[epq->rti - 1] = NULL;
 	}
 
+	foreach(l, epqstate->es_trig_target_relations)
+	{
+		ResultRelInfo *resultRelInfo = (ResultRelInfo *) lfirst(l);
+
+		/* Close indices and then the relation itself */
+		ExecCloseIndices(resultRelInfo);
+		heap_close(resultRelInfo->ri_RelationDesc, NoLock);
+	}
+
 	MemoryContextSwitchTo(oldcontext);
 
 	/*
@@ -4476,18 +4661,20 @@ GetUpdatedTuple_Int(Relation relation,
 {
 	HeapTupleData tuple;
 	HeapTuple	copyTuple = NULL;
+	SnapshotData SnapshotDirty;
 
 	/*
 	 * fetch tid tuple
 	 *
 	 * Loop here to deal with updated or busy tuples
 	 */
+	InitDirtySnapshot(SnapshotDirty);
 	tuple.t_self = *tid;
 	for (;;)
 	{
 		Buffer		buffer;
 
-		if (heap_fetch(relation, SnapshotDirty, &tuple, &buffer, true, NULL))
+		if (heap_fetch(relation, &SnapshotDirty, &tuple, &buffer, true, NULL))
 		{
 			/*
 			 * If xmin isn't what we're expecting, the slot must have been
@@ -4505,17 +4692,17 @@ GetUpdatedTuple_Int(Relation relation,
 			}
 
 			/* otherwise xmin should not be dirty... */
-			if (TransactionIdIsValid(SnapshotDirty->xmin))
+			if (TransactionIdIsValid(SnapshotDirty.xmin))
 				elog(ERROR, "t_xmin is uncommitted in tuple to be updated");
 
 			/*
 			 * If tuple is being updated by other transaction then we have to
 			 * wait for its commit/abort.
 			 */
-			if (TransactionIdIsValid(SnapshotDirty->xmax))
+			if (TransactionIdIsValid(SnapshotDirty.xmax))
 			{
 				ReleaseBuffer(buffer);
-				XactLockTableWait(SnapshotDirty->xmax);
+				XactLockTableWait(SnapshotDirty.xmax);
 				continue;		/* loop back to repeat heap_fetch */
 			}
 
@@ -4597,6 +4784,24 @@ GetUpdatedTuple_Int(Relation relation,
 	return copyTuple;
 }
 
+/*
+ * ExecGetActivePlanTree --- get the active PlanState tree from a QueryDesc
+ *
+ * Ordinarily this is just the one mentioned in the QueryDesc, but if we
+ * are looking at a row returned by the EvalPlanQual machinery, we need
+ * to look at the subsidiary state instead.
+ */
+PlanState *
+ExecGetActivePlanTree(QueryDesc *queryDesc)
+{
+	EState	   *estate = queryDesc->estate;
+
+	if (estate && estate->es_useEvalPlan && estate->es_evalPlanQual != NULL)
+		return estate->es_evalPlanQual->planstate;
+	else
+		return queryDesc->planstate;
+}
+
 /*
  * Support for SELECT INTO (a/k/a CREATE TABLE AS)
  *
@@ -4625,7 +4830,7 @@ typedef struct
 static void
 OpenIntoRel(QueryDesc *queryDesc)
 {
-	IntoClause *intoClause;
+	IntoClause *into = queryDesc->plannedstmt->intoClause;
 	EState	   *estate = queryDesc->estate;
 	Relation	intoRelationDesc;
 	char	   *intoName;
@@ -4654,17 +4859,17 @@ OpenIntoRel(QueryDesc *queryDesc)
 	int64			persistentSerialNum;
 	
 	targetPolicy = queryDesc->plannedstmt->intoPolicy;
-	intoClause = queryDesc->plannedstmt->intoClause;
 	/*
 	 * XXX This code needs to be kept in sync with DefineRelation().
 	 * Maybe we should try to use that function instead.
 	 */
 
+	Assert(into);
+
 	/*
 	 * Check consistency of arguments
 	 */
-	Insist(intoClause);
-	if (intoClause->onCommit != ONCOMMIT_NOOP && !intoClause->rel->istemp)
+	if (into->onCommit != ONCOMMIT_NOOP && !into->rel->istemp)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 				 errmsg("ON COMMIT can only be used on temporary tables")));
@@ -4680,7 +4885,7 @@ OpenIntoRel(QueryDesc *queryDesc)
 	 * code.  This is needed because calling code might not expect untrusted
 	 * tables to appear in pg_temp at the front of its search path.
 	 */
-	if (intoClause->rel->istemp && InSecurityRestrictedOperation())
+	if (into->rel->istemp && InSecurityRestrictedOperation())
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("cannot create temporary table within security-restricted operation")));
@@ -4688,8 +4893,8 @@ OpenIntoRel(QueryDesc *queryDesc)
 	/*
 	 * Find namespace to create in, check its permissions
 	 */
-	intoName = intoClause->rel->relname;
-	namespaceId = RangeVarGetCreationNamespace(intoClause->rel);
+	intoName = into->rel->relname;
+	namespaceId = RangeVarGetCreationNamespace(into->rel);
 
 	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(),
 									  ACL_CREATE);
@@ -4698,7 +4903,7 @@ OpenIntoRel(QueryDesc *queryDesc)
 					   get_namespace_name(namespaceId));
 
 	/*
-	 * Select tablespace to use.  If not specified, use default_tablespace
+	 * Select tablespace to use.  If not specified, use default tablespace
 	 * (which may in turn default to database's default).
 	 */
 	intoTableSpaceName = queryDesc->ddesc->intoTableSpaceName;
@@ -4713,18 +4918,18 @@ OpenIntoRel(QueryDesc *queryDesc)
 	}
 	else
 	{
-		tablespaceId = GetDefaultTablespace();
+		tablespaceId = GetDefaultTablespace(into->rel->istemp);
 
 		/* Need the real tablespace id for dispatch */
 		if (!OidIsValid(tablespaceId)) 
 			tablespaceId = MyDatabaseTableSpace;
 
 		/* MPP-10329 - must dispatch tablespace */
-		intoClause->tableSpaceName = get_tablespace_name(tablespaceId);
+		into->tableSpaceName = get_tablespace_name(tablespaceId);
 	}
 
 	/* Check permissions except when using the database's default space */
-	if (tablespaceId != MyDatabaseTableSpace)
+	if (OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace)
 	{
 		AclResult	aclresult;
 
@@ -4736,9 +4941,18 @@ OpenIntoRel(QueryDesc *queryDesc)
 						   get_tablespace_name(tablespaceId));
 	}
 
+	/* In all cases disallow placing user relations in pg_global */
+	if (tablespaceId == GLOBALTABLESPACE_OID)
+		ereport(ERROR,
+		        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+		         errmsg("only shared relations can be placed in pg_global tablespace")));
+
 	/* Parse and validate any reloptions */
-	reloptions = transformRelOptions((Datum) 0, intoClause->options, true, false);
-	
+	reloptions = transformRelOptions((Datum) 0,
+									 into->options,
+									 true,
+									 false);
+
 	/* get the relstorage (heap or AO tables) */
 	stdRdOptions = (StdRdOptions*) heap_reloptions(relkind, reloptions, true);
 	heap_test_override_reloptions(relkind, stdRdOptions, &safefswritesize);
@@ -4755,12 +4969,6 @@ OpenIntoRel(QueryDesc *queryDesc)
 	 * master since we are using the old WAL based physical replication.
 	 *
 	 * GPDP does not support PITR.
-	 *
-	 * Note that for a non-temp INTO table, this is safe only because we know
-	 * that the catalog changes above will have been WAL-logged, and so
-	 * RecordTransactionCommit will think it needs to WAL-log the eventual
-	 * transaction commit.	Else the commit might be lost, even though all the
-	 * data is safely fsync'd ...
 	 */
 	bufferPoolBulkLoad = 
 		(relstorage_is_buffer_pool(relstorage) ?
@@ -4780,7 +4988,7 @@ OpenIntoRel(QueryDesc *queryDesc)
 											  true,
 											  bufferPoolBulkLoad,
 											  0,
-											  intoClause->onCommit,
+											  into->onCommit,
 											  targetPolicy,  	/* MPP */
 											  reloptions,
 											  allowSystemTableModsDDL,
@@ -4837,13 +5045,12 @@ OpenIntoRel(QueryDesc *queryDesc)
 	 * it would be a good time to relocate this code.
 	 */
 	AddDefaultRelationAttributeOptions(intoRelationDesc,
-									   intoClause->options);
+									   into->options);
 
 	/* use_wal off requires rd_targblock be initially invalid */
 	Assert(intoRelationDesc->rd_targblock == InvalidBlockNumber);
 
 	estate->es_into_relation_is_bulkload = bufferPoolBulkLoad;
-
 	estate->es_into_relation_descriptor = intoRelationDesc;
 
 	relFileNode.spcNode = tablespaceId;
@@ -4907,14 +5114,8 @@ CloseIntoRel(QueryDesc *queryDesc)
 		{
 			int32 numOfBlocks;
 
-			/*
-			 * If we skipped using WAL, and it's not a temp relation, we must
-			 * force the relation down to disk before it's safe to commit the
-			 * transaction.  This requires forcing out any dirty buffers and
-			 * then doing a forced fsync.
-			 */
-			if (estate->es_into_relation_is_bulkload &&
-				!rel->rd_istemp)
+			/* If we skipped using WAL, must heap_sync before commit */
+			if (estate->es_into_relation_is_bulkload)
 			{
 				FlushRelationBuffers(rel);
 				/* FlushRelationBuffers will have opened rd_smgr */
@@ -5066,7 +5267,7 @@ intorel_receive(TupleTableSlot *slot, DestReceiver *self)
 
 		heap_insert(into_rel,
 					tuple,
-					estate->es_snapshot->curcid,
+					estate->es_output_cid,
 					!estate->es_into_relation_is_bulkload,
 					false, /* never any point in using FSM */
 					GetCurrentTransactionId());
@@ -5180,9 +5381,8 @@ get_part(EState *estate, Datum *values, bool *isnull, TupleDesc tupdesc)
 	{
 		int result_array_size =
 			estate->es_partition_state->result_partition_array_size;
-		RangeTblEntry *rte = makeNode(RangeTblEntry);
-		List *rangeTable;
 		int natts;
+		Relation	resultRelation;
 
 		if (estate->es_num_result_relations + 1 >= result_array_size)
 		{
@@ -5204,13 +5404,12 @@ get_part(EState *estate, Datum *values, bool *isnull, TupleDesc tupdesc)
 
 		estate->es_num_result_relations++;
 
-		rte->relid = targetid; /* all we need */
-		rangeTable = list_make1(rte);
-		initResultRelInfo(resultRelInfo, 1,
-						  rangeTable,
+		resultRelation = heap_open(targetid, RowExclusiveLock);
+		initResultRelInfo(resultRelInfo,
+						  resultRelation,
+						  1,
 						  CMD_INSERT,
-						  estate->es_instrument,
-						  (Gp_role != GP_ROLE_EXECUTE || Gp_is_writer));
+						  estate->es_instrument);
 		
 		map_part_attrs(estate->es_result_relations->ri_RelationDesc, 
 					   resultRelInfo->ri_RelationDesc,
@@ -5756,3 +5955,143 @@ ClearPartitionState(EState *estate)
 	hash_destroy(pstate->result_partition_hash);
 	pstate->result_partition_hash = NULL;
 }
+
+#if 0 /* for debugging purposes only */
+char *
+DumpSliceTable(SliceTable *table)
+{
+	StringInfoData buf;
+	ListCell *lc;
+
+	if (!table)
+		return "No slice table";
+
+	initStringInfo(&buf);
+
+	foreach(lc, table->slices)
+	{
+		Slice *slice = (Slice *) lfirst(lc);
+
+		appendStringInfo(&buf, "Slice %d: rootIndex %d gangType %d parent %d\n",
+						 slice->sliceIndex, slice->rootIndex, slice->gangType, slice->parentIndex);
+	}
+	return buf.data;
+}
+#endif
+
+typedef struct
+{
+	plan_tree_base_prefix prefix;
+	EState	   *estate;
+	int			currentSliceId;
+} FillSliceTable_cxt;
+
+static bool
+FillSliceTable_walker(Node *node, void *context)
+{
+	FillSliceTable_cxt *cxt = (FillSliceTable_cxt *) context;
+	EState	   *estate = cxt->estate;
+	SliceTable *sliceTable = estate->es_sliceTable;
+	int			parentSliceIndex = cxt->currentSliceId;
+	bool		result;
+
+	if (node == NULL)
+		return false;
+
+	if (IsA(node, Motion))
+	{
+		Motion	   *motion = (Motion *) node;
+		MemoryContext oldcxt = MemoryContextSwitchTo(estate->es_query_cxt);
+		Flow	   *sendFlow;
+		Slice	   *sendSlice;
+		Slice	   *recvSlice;
+
+		/* Top node of subplan should have a Flow node. */
+		Insist(motion->plan.lefttree && motion->plan.lefttree->flow);
+		sendFlow = motion->plan.lefttree->flow;
+
+		/* Look up the sending gang's slice table entry. */
+		sendSlice = (Slice *) list_nth(sliceTable->slices, motion->motionID);
+
+		/* Look up the receiving (parent) gang's slice table entry. */
+		recvSlice = (Slice *)list_nth(sliceTable->slices, parentSliceIndex);
+
+		Assert(IsA(recvSlice, Slice));
+		Assert(recvSlice->sliceIndex == parentSliceIndex);
+		Assert(recvSlice->rootIndex == 0 ||
+			   (recvSlice->rootIndex > sliceTable->nMotions &&
+				recvSlice->rootIndex < list_length(sliceTable->slices)));
+
+		/* Sending slice become a children of recv slice */
+		recvSlice->children = lappend_int(recvSlice->children, sendSlice->sliceIndex);
+		sendSlice->parentIndex = parentSliceIndex;
+		sendSlice->rootIndex = recvSlice->rootIndex;
+
+		/* The gang beneath a Motion will be a reader. */
+		sendSlice->gangType = GANGTYPE_PRIMARY_READER;
+
+		if (sendFlow->flotype != FLOW_SINGLETON)
+		{
+			sendSlice->gangSize = getgpsegmentCount();
+			sendSlice->gangType = GANGTYPE_PRIMARY_READER;
+		}
+		else
+		{
+			sendSlice->gangSize = 1;
+			sendSlice->gangType =
+				sendFlow->segindex == -1 ?
+				GANGTYPE_ENTRYDB_READER : GANGTYPE_SINGLETON_READER;
+		}
+
+		sendSlice->numGangMembersToBeActive =
+			sliceCalculateNumSendingProcesses(sendSlice);
+
+		MemoryContextSwitchTo(oldcxt);
+
+		/* recurse into children */
+		cxt->currentSliceId = motion->motionID;
+		result = plan_tree_walker(node, FillSliceTable_walker, cxt);
+		cxt->currentSliceId = parentSliceIndex;
+		return result;
+	}
+
+	if (IsA(node, SubPlan))
+	{
+		SubPlan *subplan = (SubPlan *) node;
+
+		if (subplan->is_initplan)
+		{
+			cxt->currentSliceId = subplan->qDispSliceId;
+			result = plan_tree_walker(node, FillSliceTable_walker, cxt);
+			cxt->currentSliceId = parentSliceIndex;
+			return result;
+		}
+	}
+
+	return plan_tree_walker(node, FillSliceTable_walker, cxt);
+}
+
+/*
+ * Set up the parent-child relationships in the slice table.
+ *
+ * We used to do this as part of ExecInitMotion(), but because ExecInitNode()
+ * no longer recurses into subplans, at SubPlan nodes, we cannot easily track
+ * the parent-child slice relationships across SubPlan nodes at that phase
+ * anymore. We now do this separate walk of the whole plantree, recursing
+ * into SubPlan nodes, to do the same.
+ */
+static void
+FillSliceTable(EState *estate, PlannedStmt *stmt)
+{
+	FillSliceTable_cxt cxt;
+
+	cxt.prefix.node = (Node *) stmt;
+	cxt.estate = estate;
+	cxt.currentSliceId = 0;
+
+	/*
+	 * NOTE: We depend on plan_tree_walker() to recurse into subplans of
+	 * SubPlan nodes.
+	 */
+	FillSliceTable_walker((Node *) stmt->planTree, &cxt);
+}
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index d43f3f0b7ce7..7664cc85d13e 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execProcnode.c,v 1.60 2007/01/05 22:19:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execProcnode.c,v 1.62 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -710,11 +710,11 @@ ExecInitNode(Plan *node, EState *estate, int eflags)
 		SubPlan    *subplan = (SubPlan *) lfirst(l);
 		SubPlanState *sstate;
 
-		setSubplanSliceId(subplan, estate);
+		Assert(IsA(subplan, SubPlan));
 
-		sstate = ExecInitExprInitPlan(subplan, result);
-		ExecInitSubPlan(sstate, estate, eflags);
+		setSubplanSliceId(subplan, estate);
 
+		sstate = ExecInitSubPlan(subplan, result);
 		subps = lappend(subps, sstate);
 	}
 	if (result != NULL)
@@ -723,30 +723,6 @@ ExecInitNode(Plan *node, EState *estate, int eflags)
 	estate->currentSliceIdInPlan = origSliceIdInPlan;
 	estate->currentExecutingSliceId = origExecutingSliceId;
 
-	/*
-	 * Initialize any subPlans present in this node.  These were found by
-	 * ExecInitExpr during initialization of the PlanState.  Note we must do
-	 * this after initializing initPlans, in case their arguments contain
-	 * subPlans (is that actually possible? perhaps not).
-	 */
-	if (result != NULL)
-	{
-		foreach(l, result->subPlan)
-		{
-			SubPlanState *sstate = (SubPlanState *) lfirst(l);
-			
-			Assert(IsA(sstate, SubPlanState));
-
-			/**
-			 * Check if this subplan is an initplan. If so, we shouldn't initialize it again.
-			 */
-			if (sstate->planstate == NULL)
-			{
-				ExecInitSubPlan(sstate, estate, eflags);
-			}
-		}
-	}
-
 	/* Set up instrumentation for this node if requested */
 	if (estate->es_instrument && result != NULL)
 		result->instrument = InstrAlloc(1);
@@ -1228,14 +1204,14 @@ ExecProcNode(PlanState *node)
 			Assert(subplanState != NULL &&
 				   subplanState->planstate != NULL);
 
-			bool subplanAtTopNestLevel = (node->state->subplanLevel == 0);
+			bool subplanAtTopNestLevel = (node->state->currentSubplanLevel == 0);
 
 			if (subplanAtTopNestLevel)
 			{
 				ExecSquelchNode(subplanState->planstate);
+				ExecEagerFreeChildNodes(subplanState->planstate, subplanAtTopNestLevel);
+				ExecEagerFree(subplanState->planstate);
 			}
-			ExecEagerFreeChildNodes(subplanState->planstate, subplanAtTopNestLevel);
-			ExecEagerFree(subplanState->planstate);
 		}
 	}
 
@@ -1545,8 +1521,6 @@ ExecUpdateTransportState(PlanState *node, ChunkTransportState *state)
 void
 ExecEndNode(PlanState *node)
 {
-	ListCell   *subp;
-
 	/*
 	 * do nothing when we get to the end of a leaf on tree.
 	 */
@@ -1558,16 +1532,9 @@ ExecEndNode(PlanState *node)
 	int origSliceIdInPlan = estate->currentSliceIdInPlan;
 	int origExecutingSliceId = estate->currentExecutingSliceId;
 
-	/* Clean up initPlans and subPlans */
-	foreach(subp, node->initPlan)
-		ExecEndSubPlan((SubPlanState *) lfirst(subp));
-
 	estate->currentSliceIdInPlan = origSliceIdInPlan;
 	estate->currentExecutingSliceId = origExecutingSliceId;
 
-	foreach(subp, node->subPlan)
-		ExecEndSubPlan((SubPlanState *) lfirst(subp));
-
 	if (node->chgParam != NULL)
 	{
 		bms_free(node->chgParam);
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index a7158c0df981..5f4765bf199f 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.213 2007/02/06 17:35:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.226.2.4 2010/08/26 18:54:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
  *		ExecProject		- form a new tuple by projecting the given tuple
  *
  *	 NOTES
- *		The more heavily used ExecEvalExpr routines, such as ExecEvalVar(),
+ *		The more heavily used ExecEvalExpr routines, such as ExecEvalScalarVar,
  *		are hotspots. Making these faster will speed up the entire system.
  *
  *		ExecProject() is used to make tuple projections.  Rather then
@@ -67,6 +67,7 @@
 static Datum ExecEvalArrayRef(ArrayRefExprState *astate,
 				 ExprContext *econtext,
 				 bool *isNull, ExprDoneCond *isDone);
+static bool isAssignmentIndirectionExpr(ExprState *exprstate);
 static Datum ExecEvalAggref(AggrefExprState *aggref,
 			   ExprContext *econtext,
 			   bool *isNull, ExprDoneCond *isDone);
@@ -82,14 +83,19 @@ static Datum ExecEvalGroupId(ExprState *gstate,
 static Datum ExecEvalWindowRef(WindowRefExprState *winref,
 			   ExprContext *econtext,
 			   bool *isNull, ExprDoneCond *isDone);
-static Datum ExecEvalVar(ExprState *exprstate, ExprContext *econtext,
-			bool *isNull, ExprDoneCond *isDone);
 static Datum ExecEvalScalarVar(ExprState *exprstate, ExprContext *econtext,
-			bool *isNull, ExprDoneCond *isDone);
-static Datum ExecEvalWholeRowVar(ExprState *exprstate, ExprContext *econtext,
-					bool *isNull, ExprDoneCond *isDone);
-static Datum ExecEvalWholeRowSlow(ExprState *exprstate, ExprContext *econtext,
+				  bool *isNull, ExprDoneCond *isDone);
+static Datum ExecEvalScalarVarFast(ExprState *exprstate, ExprContext *econtext,
+					  bool *isNull, ExprDoneCond *isDone);
+static Datum ExecEvalWholeRowVar(WholeRowVarExprState *wrvstate,
+					ExprContext *econtext,
 					bool *isNull, ExprDoneCond *isDone);
+static Datum ExecEvalWholeRowSlow(WholeRowVarExprState *wrvstate,
+					 ExprContext *econtext,
+					 bool *isNull, ExprDoneCond *isDone);
+static Datum ExecEvalWholeRowFast(WholeRowVarExprState *wrvstate,
+					 ExprContext *econtext,
+					 bool *isNull, ExprDoneCond *isDone);
 static Datum ExecEvalConst(ExprState *exprstate, ExprContext *econtext,
 			  bool *isNull, ExprDoneCond *isDone);
 static Datum ExecEvalParam(ExprState *exprstate, ExprContext *econtext,
@@ -180,11 +186,15 @@ static Datum ExecEvalFieldStore(FieldStoreState *fstate,
 static Datum ExecEvalRelabelType(GenericExprState *exprstate,
 					ExprContext *econtext,
 					bool *isNull, ExprDoneCond *isDone);
-static Datum ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate, ExprContext *econtext,
-								bool *isNull, ExprDoneCond *isDone);
 static Datum ExecEvalCoerceViaIO(CoerceViaIOState *iostate,
+					ExprContext *econtext,
+					bool *isNull, ExprDoneCond *isDone);
+static Datum ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate,
 						ExprContext *econtext,
 						bool *isNull, ExprDoneCond *isDone);
+static Datum ExecEvalCurrentOfExpr(ExprState *exprstate, ExprContext *econtext,
+					  bool *isNull, ExprDoneCond *isDone);
+
 static Datum ExecEvalPartOidExpr(PartOidExprState *exprstate,
 						ExprContext *econtext,
 						bool *isNull, ExprDoneCond *isDone);
@@ -204,6 +214,7 @@ static bool ExecIsExprUnsafeToConst_walker(Node *node, void *context);
 static bool ExecIsExprUnsafeToConst(Node *node);
 
 
+
 /* ----------------------------------------------------------------
  *		ExecEvalExpr routines
  *
@@ -324,7 +335,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,
 			ereport(ERROR,
 					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 					 errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-							i, MAXDIM)));
+							i + 1, MAXDIM)));
 
 		upper.indx[i++] = DatumGetInt32(ExecEvalExpr(eltstate,
 													 econtext,
@@ -352,7 +363,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,
 				ereport(ERROR,
 						(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 						 errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-								i, MAXDIM)));
+								j + 1, MAXDIM)));
 
 			lower.indx[j++] = DatumGetInt32(ExecEvalExpr(eltstate,
 														 econtext,
@@ -380,22 +391,74 @@ ExecEvalArrayRef(ArrayRefExprState *astate,
 	if (isAssignment)
 	{
 		Datum		sourceData;
+		Datum		save_datum;
+		bool		save_isNull;
 
 		/*
-		 * Evaluate the value to be assigned into the array.
+		 * We might have a nested-assignment situation, in which the
+		 * refassgnexpr is itself a FieldStore or ArrayRef that needs to
+		 * obtain and modify the previous value of the array element or slice
+		 * being replaced.  If so, we have to extract that value from the
+		 * array and pass it down via the econtext's caseValue.  It's safe to
+		 * reuse the CASE mechanism because there cannot be a CASE between
+		 * here and where the value would be needed, and an array assignment
+		 * can't be within a CASE either.  (So saving and restoring the
+		 * caseValue is just paranoia, but let's do it anyway.)
 		 *
-		 * XXX At some point we'll need to look into making the old value of
-		 * the array element available via CaseTestExpr, as is done by
-		 * ExecEvalFieldStore.	This is not needed now but will be needed to
-		 * support arrays of composite types; in an assignment to a field of
-		 * an array member, the parser would generate a FieldStore that
-		 * expects to fetch its input tuple via CaseTestExpr.
+		 * Since fetching the old element might be a nontrivial expense, do it
+		 * only if the argument appears to actually need it.
+		 */
+		save_datum = econtext->caseValue_datum;
+		save_isNull = econtext->caseValue_isNull;
+
+		if (isAssignmentIndirectionExpr(astate->refassgnexpr))
+		{
+			if (*isNull)
+			{
+				/* whole array is null, so any element or slice is too */
+				econtext->caseValue_datum = (Datum) 0;
+				econtext->caseValue_isNull = true;
+			}
+			else if (lIndex == NULL)
+			{
+				econtext->caseValue_datum = array_ref(array_source, i,
+													  upper.indx,
+													  astate->refattrlength,
+													  astate->refelemlength,
+													  astate->refelembyval,
+													  astate->refelemalign,
+													  &econtext->caseValue_isNull);
+			}
+			else
+			{
+				resultArray = array_get_slice(array_source, i,
+											  upper.indx, lower.indx,
+											  astate->refattrlength,
+											  astate->refelemlength,
+											  astate->refelembyval,
+											  astate->refelemalign);
+				econtext->caseValue_datum = PointerGetDatum(resultArray);
+				econtext->caseValue_isNull = false;
+			}
+		}
+		else
+		{
+			/* argument shouldn't need caseValue, but for safety set it null */
+			econtext->caseValue_datum = (Datum) 0;
+			econtext->caseValue_isNull = true;
+		}
+
+		/*
+		 * Evaluate the value to be assigned into the array.
 		 */
 		sourceData = ExecEvalExpr(astate->refassgnexpr,
 								  econtext,
 								  &eisnull,
 								  NULL);
 
+		econtext->caseValue_datum = save_datum;
+		econtext->caseValue_isNull = save_isNull;
+
 		/*
 		 * For an assignment to a fixed-length array type, both the original
 		 * array and the value to be assigned into it must be non-NULL, else
@@ -457,6 +520,34 @@ ExecEvalArrayRef(ArrayRefExprState *astate,
 	}
 }
 
+/*
+ * Helper for ExecEvalArrayRef: is expr a nested FieldStore or ArrayRef
+ * that might need the old element value passed down?
+ *
+ * (We could use this in ExecEvalFieldStore too, but in that case passing
+ * the old value is so cheap there's no need.)
+ */
+static bool
+isAssignmentIndirectionExpr(ExprState *exprstate)
+{
+	if (exprstate == NULL)
+		return false;			/* just paranoia */
+	if (IsA(exprstate, FieldStoreState))
+	{
+		FieldStore *fstore = (FieldStore *) exprstate->expr;
+
+		if (fstore->arg && IsA(fstore->arg, CaseTestExpr))
+			return true;
+	}
+	else if (IsA(exprstate, ArrayRefExprState))
+	{
+		ArrayRef   *arrayRef = (ArrayRef *) exprstate->expr;
+
+		if (arrayRef->refexpr && IsA(arrayRef->refexpr, CaseTestExpr))
+			return true;
+	}
+	return false;
+}
 
 /* ----------------------------------------------------------------
  *		ExecEvalAggref
@@ -578,20 +669,19 @@ ExecEvalWindowRef(WindowRefExprState *winref, ExprContext *econtext,
 }
 
 /* ----------------------------------------------------------------
- *		ExecEvalVar
+ *		ExecEvalScalarVar
  *
- *		Returns a Datum whose value is the value of a range
- *		variable with respect to given expression context.
+ *		Returns a Datum whose value is the value of a scalar (not whole-row)
+ *		range variable with respect to given expression context.
  *
- * Note: ExecEvalVar is executed only the first time through in a given plan;
- * it changes the ExprState's function pointer to pass control directly to
- * ExecEvalScalarVar, ExecEvalWholeRowVar, or ExecEvalWholeRowSlow after
- * making one-time checks.
+ * Note: ExecEvalScalarVar is executed only the first time through in a given
+ * plan; it changes the ExprState's function pointer to pass control directly
+ * to ExecEvalScalarVarFast after making one-time checks.
  * ----------------------------------------------------------------
  */
 static Datum
-ExecEvalVar(ExprState *exprstate, ExprContext *econtext,
-			bool *isNull, ExprDoneCond *isDone)
+ExecEvalScalarVar(ExprState *exprstate, ExprContext *econtext,
+				  bool *isNull, ExprDoneCond *isDone)
 {
 	Var		   *variable = (Var *) exprstate->expr;
 	TupleTableSlot *slot;
@@ -629,157 +719,64 @@ ExecEvalVar(ExprState *exprstate, ExprContext *econtext,
 			break;
 	}
 
-	if (attnum != InvalidAttrNumber)
-	{
-		/*
-		 * Scalar variable case.
-		 *
-		 * If it's a user attribute, check validity (bogus system attnums will
-		 * be caught inside slot_getattr).  What we have to check for here
-		 * is the possibility of an attribute having been changed in type
-		 * since the plan tree was created.  Ideally the plan would get
-		 * invalidated and not re-used, but until that day arrives, we need
-		 * defenses.  Fortunately it's sufficient to check once on the first
-		 * time through.
-		 *
-		 * Note: we allow a reference to a dropped attribute.  slot_getattr
-		 * will force a NULL result in such cases.
-		 *
-		 * Note: ideally we'd check typmod as well as typid, but that seems
-		 * impractical at the moment: in many cases the tupdesc will have
-		 * been generated by ExecTypeFromTL(), and that can't guarantee to
-		 * generate an accurate typmod in all cases, because some expression
-		 * node types don't carry typmod.
-		 */
-		if (attnum > 0)
-		{
-			TupleDesc	slot_tupdesc = slot->tts_tupleDescriptor;
-			Form_pg_attribute attr;
-
-			if (attnum > slot_tupdesc->natts)	/* should never happen */
-				elog(ERROR, "attribute number %d exceeds number of columns %d",
-					 attnum, slot_tupdesc->natts);
-
-			attr = slot_tupdesc->attrs[attnum - 1];
-
-			/* can't check type if dropped, since atttypid is probably 0 */
-			if (!attr->attisdropped)
-			{
-				if (variable->vartype != attr->atttypid)
-					ereport(ERROR,
-							(errmsg("attribute %d has wrong type", attnum),
-							 errdetail("Table has type %s, but query expects %s.",
-									   format_type_be(attr->atttypid),
-									   format_type_be(variable->vartype))));
-			}
-		}
+	/* This was checked by ExecInitExpr */
+	Assert(attnum != InvalidAttrNumber);
 
-		/* Skip the checking on future executions of node */
-		exprstate->evalfunc = ExecEvalScalarVar;
-
-		/* Fetch the value from the slot */
-		return slot_getattr(slot, attnum, isNull);
-	}
-	else
+	/*
+	 * If it's a user attribute, check validity (bogus system attnums will be
+	 * caught inside slot_getattr).  What we have to check for here is the
+	 * possibility of an attribute having been changed in type since the plan
+	 * tree was created.  Ideally the plan will get invalidated and not
+	 * re-used, but just in case, we keep these defenses.  Fortunately it's
+	 * sufficient to check once on the first time through.
+	 *
+	 * Note: we allow a reference to a dropped attribute.  slot_getattr will
+	 * force a NULL result in such cases.
+	 *
+	 * Note: ideally we'd check typmod as well as typid, but that seems
+	 * impractical at the moment: in many cases the tupdesc will have been
+	 * generated by ExecTypeFromTL(), and that can't guarantee to generate an
+	 * accurate typmod in all cases, because some expression node types don't
+	 * carry typmod.
+	 */
+	if (attnum > 0)
 	{
-		/*
-		 * Whole-row variable.
-		 *
-		 * If it's a RECORD Var, we'll use the slot's type ID info.  It's
-		 * likely that the slot's type is also RECORD; if so, make sure it's
-		 * been "blessed", so that the Datum can be interpreted later.
-		 *
-		 * If the Var identifies a named composite type, we must check that
-		 * the actual tuple type is compatible with it.
-		 */
 		TupleDesc	slot_tupdesc = slot->tts_tupleDescriptor;
-		bool		needslow = false;
+		Form_pg_attribute attr;
 
-		if (variable->vartype == RECORDOID)
-		{
-			if (slot_tupdesc->tdtypeid == RECORDOID &&
-				slot_tupdesc->tdtypmod < 0)
-				assign_record_type_typmod(slot_tupdesc);
-		}
-		else
-		{
-			TupleDesc	var_tupdesc;
-			int			i;
+		if (attnum > slot_tupdesc->natts)		/* should never happen */
+			elog(ERROR, "attribute number %d exceeds number of columns %d",
+				 attnum, slot_tupdesc->natts);
+		attr = slot_tupdesc->attrs[attnum - 1];
 
-			/*
-			 * We really only care about number of attributes and data type.
-			 * Also, we can ignore type mismatch on columns that are dropped
-			 * in the destination type, so long as the physical storage
-			 * matches.  This is helpful in some cases involving out-of-date
-			 * cached plans.  Also, we have to allow the case that the slot
-			 * has more columns than the Var's type, because we might be
-			 * looking at the output of a subplan that includes resjunk
-			 * columns.  (XXX it would be nice to verify that the extra
-			 * columns are all marked resjunk, but we haven't got access to
-			 * the subplan targetlist here...)  Resjunk columns should always
-			 * be at the end of a targetlist, so it's sufficient to ignore
-			 * them here; but we need to use ExecEvalWholeRowSlow to get
-			 * rid of them in the eventual output tuples.
-			 */
-			var_tupdesc = lookup_rowtype_tupdesc(variable->vartype, -1);
-
-			if (var_tupdesc->natts > slot_tupdesc->natts)
+		/* can't check type if dropped, since atttypid is probably 0 */
+		if (!attr->attisdropped)
+		{
+			if (variable->vartype != attr->atttypid)
 				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("table row type and query-specified row type do not match"),
-						 errdetail("Table row contains %d attributes, but query expects %d.",
-								   slot_tupdesc->natts, var_tupdesc->natts)));
-			else if (var_tupdesc->natts < slot_tupdesc->natts)
-				needslow = true;
-
-			for (i = 0; i < var_tupdesc->natts; i++)
-			{
-				Form_pg_attribute vattr = var_tupdesc->attrs[i];
-				Form_pg_attribute sattr = slot_tupdesc->attrs[i];
-
-				if (vattr->atttypid == sattr->atttypid)
-					continue;			/* no worries */
-				if (!vattr->attisdropped)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("table row type and query-specified row type do not match"),
-							 errdetail("Table has type %s at ordinal position %d, but query expects %s.",
-									   format_type_be(sattr->atttypid),
-									   i + 1,
-									   format_type_be(vattr->atttypid))));
-
-				if (vattr->attlen != sattr->attlen ||
-					vattr->attalign != sattr->attalign)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("table row type and query-specified row type do not match"),
-							 errdetail("Physical storage mismatch on dropped attribute at ordinal position %d.",
-									   i + 1)));
-			}
-
-			ReleaseTupleDesc(var_tupdesc);
+						(errmsg("attribute %d has wrong type", attnum),
+						 errdetail("Table has type %s, but query expects %s.",
+								   format_type_be(attr->atttypid),
+								   format_type_be(variable->vartype))));
 		}
+	}
 
-		/* Skip the checking on future executions of node */
-		if (needslow)
-			exprstate->evalfunc = ExecEvalWholeRowSlow;
-		else
-			exprstate->evalfunc = ExecEvalWholeRowVar;
+	/* Skip the checking on future executions of node */
+	exprstate->evalfunc = ExecEvalScalarVarFast;
 
-		/* Fetch the value */
-		return ExecEvalWholeRowVar(exprstate, econtext, isNull, isDone);
-	}
+	/* Fetch the value from the slot */
+	return slot_getattr(slot, attnum, isNull);
 }
 
 /* ----------------------------------------------------------------
- *		ExecEvalScalarVar
+ *		ExecEvalScalarVarFast
  *
  *		Returns a Datum for a scalar variable.
  * ----------------------------------------------------------------
  */
 static Datum
-ExecEvalScalarVar(ExprState *exprstate, ExprContext *econtext,
-				  bool *isNull, ExprDoneCond *isDone)
+ExecEvalScalarVarFast(ExprState *exprstate, ExprContext *econtext,
+					  bool *isNull, ExprDoneCond *isDone)
 {
 	Var		   *variable = (Var *) exprstate->expr;
 	TupleTableSlot *slot;
@@ -814,14 +811,184 @@ ExecEvalScalarVar(ExprState *exprstate, ExprContext *econtext,
 /* ----------------------------------------------------------------
  *		ExecEvalWholeRowVar
  *
- *		Returns a Datum for a whole-row variable.
+ *		Returns a Datum whose value is the value of a whole-row range
+ *		variable with respect to given expression context.
+ *
+ * Note: ExecEvalWholeRowVar is executed only the first time through in a
+ * given plan; it changes the ExprState's function pointer to pass control
+ * directly to ExecEvalWholeRowFast or ExecEvalWholeRowSlow after making
+ * one-time checks.
  * ----------------------------------------------------------------
  */
 static Datum
-ExecEvalWholeRowVar(ExprState *exprstate, ExprContext *econtext,
+ExecEvalWholeRowVar(WholeRowVarExprState *wrvstate, ExprContext *econtext,
 					bool *isNull, ExprDoneCond *isDone)
 {
-	Var		   *variable = (Var *) exprstate->expr;
+	Var		   *variable = (Var *) wrvstate->xprstate.expr;
+	TupleTableSlot *slot;
+	TupleDesc	slot_tupdesc;
+	bool		needslow = false;
+
+	if (isDone)
+		*isDone = ExprSingleResult;
+
+	/* This was checked by ExecInitExpr */
+	Assert(variable->varattno == InvalidAttrNumber);
+
+	/* Get the input slot we want */
+	Assert(variable->varno != INNER);
+	Assert(variable->varno != OUTER);
+	slot = econtext->ecxt_scantuple;
+
+	/*
+	 * If the input tuple came from a subquery, it might contain "resjunk"
+	 * columns (such as GROUP BY or ORDER BY columns), which we don't want to
+	 * keep in the whole-row result.  We can get rid of such columns by
+	 * passing the tuple through a JunkFilter --- but to make one, we have to
+	 * lay our hands on the subquery's targetlist.  Fortunately, there are not
+	 * very many cases where this can happen, and we can identify all of them
+	 * by examining our parent PlanState.  We assume this is not an issue in
+	 * standalone expressions that don't have parent plans.  (Whole-row Vars
+	 * can occur in such expressions, but they will always be referencing
+	 * table rows.)
+	 */
+	if (wrvstate->parent)
+	{
+		PlanState  *subplan = NULL;
+
+		switch (nodeTag(wrvstate->parent))
+		{
+			case T_SubqueryScanState:
+				subplan = ((SubqueryScanState *) wrvstate->parent)->subplan;
+				break;
+			default:
+				break;
+		}
+
+		if (subplan)
+		{
+			bool		junk_filter_needed = false;
+			ListCell   *tlist;
+
+			/* Detect whether subplan tlist actually has any junk columns */
+			foreach(tlist, subplan->plan->targetlist)
+			{
+				TargetEntry *tle = (TargetEntry *) lfirst(tlist);
+
+				if (tle->resjunk)
+				{
+					junk_filter_needed = true;
+					break;
+				}
+			}
+
+			/* If so, build the junkfilter in the query memory context */
+			if (junk_filter_needed)
+			{
+				MemoryContext oldcontext;
+
+				oldcontext = MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
+				wrvstate->wrv_junkFilter =
+					ExecInitJunkFilter(subplan->plan->targetlist,
+									   ExecGetResultType(subplan),
+									   NULL);
+				MemoryContextSwitchTo(oldcontext);
+			}
+		}
+	}
+
+	/* Apply the junkfilter if any */
+	if (wrvstate->wrv_junkFilter != NULL)
+		slot = ExecFilterJunk(wrvstate->wrv_junkFilter, slot);
+
+	slot_tupdesc = slot->tts_tupleDescriptor;
+
+	/*
+	 * If it's a RECORD Var, we'll use the slot's type ID info.  It's likely
+	 * that the slot's type is also RECORD; if so, make sure it's been
+	 * "blessed", so that the Datum can be interpreted later.
+	 *
+	 * If the Var identifies a named composite type, we must check that the
+	 * actual tuple type is compatible with it.
+	 */
+	if (variable->vartype == RECORDOID)
+	{
+		if (slot_tupdesc->tdtypeid == RECORDOID &&
+			slot_tupdesc->tdtypmod < 0)
+			assign_record_type_typmod(slot_tupdesc);
+	}
+	else
+	{
+		TupleDesc	var_tupdesc;
+		int			i;
+
+		/*
+		 * We really only care about numbers of attributes and data types.
+		 * Also, we can ignore type mismatch on columns that are dropped in
+		 * the destination type, so long as (1) the physical storage matches
+		 * or (2) the actual column value is NULL.	Case (1) is helpful in
+		 * some cases involving out-of-date cached plans, while case (2) is
+		 * expected behavior in situations such as an INSERT into a table with
+		 * dropped columns (the planner typically generates an INT4 NULL
+		 * regardless of the dropped column type).	If we find a dropped
+		 * column and cannot verify that case (1) holds, we have to use
+		 * ExecEvalWholeRowSlow to check (2) for each row.
+		 */
+		var_tupdesc = lookup_rowtype_tupdesc(variable->vartype, -1);
+
+		if (var_tupdesc->natts != slot_tupdesc->natts)
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("table row type and query-specified row type do not match"),
+					 errdetail("Table row contains %d attributes, but query expects %d.",
+							   slot_tupdesc->natts, var_tupdesc->natts)));
+
+		for (i = 0; i < var_tupdesc->natts; i++)
+		{
+			Form_pg_attribute vattr = var_tupdesc->attrs[i];
+			Form_pg_attribute sattr = slot_tupdesc->attrs[i];
+
+			if (vattr->atttypid == sattr->atttypid)
+				continue;		/* no worries */
+			if (!vattr->attisdropped)
+				ereport(ERROR,
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
+						 errmsg("table row type and query-specified row type do not match"),
+						 errdetail("Table has type %s at ordinal position %d, but query expects %s.",
+								   format_type_be(sattr->atttypid),
+								   i + 1,
+								   format_type_be(vattr->atttypid))));
+
+			if (vattr->attlen != sattr->attlen ||
+				vattr->attalign != sattr->attalign)
+				needslow = true;	/* need runtime check for null */
+		}
+
+		ReleaseTupleDesc(var_tupdesc);
+	}
+
+	/* Skip the checking on future executions of node */
+	if (needslow)
+		wrvstate->xprstate.evalfunc = (ExprStateEvalFunc) ExecEvalWholeRowSlow;
+	else
+		wrvstate->xprstate.evalfunc = (ExprStateEvalFunc) ExecEvalWholeRowFast;
+
+	/* Fetch the value */
+	return (*wrvstate->xprstate.evalfunc) ((ExprState *) wrvstate, econtext,
+										   isNull, isDone);
+}
+
+/* ----------------------------------------------------------------
+ *		ExecEvalWholeRowFast
+ *
+ *		Returns a Datum for a whole-row variable.
+ * ----------------------------------------------------------------
+ */
+static Datum
+ExecEvalWholeRowFast(WholeRowVarExprState *wrvstate, ExprContext *econtext,
+					 bool *isNull, ExprDoneCond *isDone)
+{
+	Var		   *variable = (Var *) wrvstate->xprstate.expr;
 	TupleTableSlot *slot = econtext->ecxt_scantuple;
 	HeapTuple	tuple;
 	TupleDesc	tupleDesc;
@@ -831,6 +998,10 @@ ExecEvalWholeRowVar(ExprState *exprstate, ExprContext *econtext,
 		*isDone = ExprSingleResult;
 	*isNull = false;
 
+	/* Apply the junkfilter if any */
+	if (wrvstate->wrv_junkFilter != NULL)
+		slot = ExecFilterJunk(wrvstate->wrv_junkFilter, slot);
+
 	tuple = ExecFetchSlotHeapTuple(slot);
 	tupleDesc = slot->tts_tupleDescriptor;
 
@@ -869,36 +1040,53 @@ ExecEvalWholeRowVar(ExprState *exprstate, ExprContext *econtext,
  * ----------------------------------------------------------------
  */
 static Datum
-ExecEvalWholeRowSlow(ExprState *exprstate, ExprContext *econtext,
+ExecEvalWholeRowSlow(WholeRowVarExprState *wrvstate, ExprContext *econtext,
 					 bool *isNull, ExprDoneCond *isDone)
 {
-	Var		   *variable = (Var *) exprstate->expr;
+	Var		   *variable = (Var *) wrvstate->xprstate.expr;
 	TupleTableSlot *slot = econtext->ecxt_scantuple;
 	HeapTuple	tuple;
+	TupleDesc	tupleDesc;
 	TupleDesc	var_tupdesc;
 	HeapTupleHeader dtuple;
+	int			i;
 
 	if (isDone)
 		*isDone = ExprSingleResult;
 	*isNull = false;
 
-	/*
-	 * Currently, the only case handled here is stripping of trailing
-	 * resjunk fields, which we do in a slightly chintzy way by just
-	 * adjusting the tuple's natts header field.  Possibly there will someday
-	 * be a need for more-extensive rearrangements, in which case it'd
-	 * be worth disassembling and reassembling the tuple (perhaps use a
-	 * JunkFilter for that?)
-	 */
+	/* Apply the junkfilter if any */
+	if (wrvstate->wrv_junkFilter != NULL)
+		slot = ExecFilterJunk(wrvstate->wrv_junkFilter, slot);
+
+	tuple = ExecFetchSlotHeapTuple(slot);
+	tupleDesc = slot->tts_tupleDescriptor;
+
 	Assert(variable->vartype != RECORDOID);
 	var_tupdesc = lookup_rowtype_tupdesc(variable->vartype, -1);
 
-	tuple = ExecFetchSlotHeapTuple(slot);
+	/* Check to see if any dropped attributes are non-null */
+	for (i = 0; i < var_tupdesc->natts; i++)
+	{
+		Form_pg_attribute vattr = var_tupdesc->attrs[i];
+		Form_pg_attribute sattr = tupleDesc->attrs[i];
+
+		if (!vattr->attisdropped)
+			continue;			/* already checked non-dropped cols */
+		if (heap_attisnull(tuple, i+1))
+			continue;			/* null is always okay */
+		if (vattr->attlen != sattr->attlen ||
+			vattr->attalign != sattr->attalign)
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("table row type and query-specified row type do not match"),
+					 errdetail("Physical storage mismatch on dropped attribute at ordinal position %d.",
+							   i + 1)));
+	}
 
 	/*
 	 * We have to make a copy of the tuple so we can safely insert the Datum
-	 * overhead fields, which are not set in on-disk tuples; not to mention
-	 * fooling with its natts field.
+	 * overhead fields, which are not set in on-disk tuples.
 	 */
 	dtuple = (HeapTupleHeader) palloc(tuple->t_len);
 	memcpy((char *) dtuple, (char *) tuple->t_data, tuple->t_len);
@@ -907,9 +1095,6 @@ ExecEvalWholeRowSlow(ExprState *exprstate, ExprContext *econtext,
 	HeapTupleHeaderSetTypeId(dtuple, variable->vartype);
 	HeapTupleHeaderSetTypMod(dtuple, variable->vartypmod);
 
-	Assert(HeapTupleHeaderGetNatts(dtuple) >= var_tupdesc->natts);
-	HeapTupleHeaderSetNatts(dtuple, var_tupdesc->natts);
-
 	ReleaseTupleDesc(var_tupdesc);
 
 	return PointerGetDatum(dtuple);
@@ -2080,6 +2265,16 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
 
 				td = DatumGetHeapTupleHeader(result);
 
+				/*
+				 * Verify all returned rows have same subtype; necessary in
+				 * case the type is RECORD.
+				 */
+				if (HeapTupleHeaderGetTypeId(td) != tupdesc->tdtypeid ||
+					HeapTupleHeaderGetTypMod(td) != tupdesc->tdtypmod)
+					ereport(ERROR,
+							(errcode(ERRCODE_DATATYPE_MISMATCH),
+							 errmsg("rows returned by function are not all of the same row type")));
+
 				/*
 				 * tuplestore_puttuple needs a HeapTuple not a bare
 				 * HeapTupleHeader, but it doesn't need all the fields.
@@ -2095,9 +2290,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
 				tuple = memtuple_form_to(mt_bind, &result, &fcinfo.isnull, NULL, NULL, false);
 			}
 
-			oldcontext = MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 			tuplestore_puttuple(tupstore, (HeapTuple) tuple);
-			MemoryContextSwitchTo(oldcontext);
 
 			/*
 			 * Are we done?
@@ -2149,6 +2342,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
 			MemSetAligned(nullflags, true, natts * sizeof(bool));
 			tuple = heap_form_tuple(expectedDesc, nulldatums, nullflags);
 			MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
+
 			tuplestore_puttuple(tupstore, tuple);
 		}
 	}
@@ -2593,8 +2787,8 @@ static void FastPathScalarArrayOp(ScalarArrayOpExpr *opexpr, ScalarArrayOpExprSt
 			return;
 		
 		elt = fetch_att(s, typbyval, typlen);
-		s = att_addlength(s, typlen, PointerGetDatum(s));
-		s = (char *) att_align(s, typalign);
+		s = att_addlength_pointer(s, typlen, PointerGetDatum(s));
+		s = (char *) att_align_nominal(s, typalign);
 
 		/* int type */
 		if (fnoid == INT2EQ_OID)
@@ -2773,8 +2967,8 @@ ExecEvalScalarArrayOp(ScalarArrayOpExprState *sstate,
 		else
 		{
 			elt = fetch_att(s, typbyval, typlen);
-			s = att_addlength(s, typlen, PointerGetDatum(s));
-			s = (char *) att_align(s, typalign);
+			s = att_addlength_pointer(s, typlen, s);
+			s = (char *) att_align_nominal(s, typalign);
 			fcinfo.arg[1] = elt;
 			fcinfo.argnull[1] = false;
 		}
@@ -3388,9 +3582,9 @@ ExecEvalArray(ArrayExprState *astate, ExprContext *econtext,
 
 		/*
 		 * If all items were null or empty arrays, return an empty array;
-		 * otherwise, if some were and some weren't, raise error.  (Note:
-		 * we must special-case this somehow to avoid trying to generate
-		 * a 1-D array formed from empty arrays.  It's not ideal...)
+		 * otherwise, if some were and some weren't, raise error.  (Note: we
+		 * must special-case this somehow to avoid trying to generate a 1-D
+		 * array formed from empty arrays.	It's not ideal...)
 		 */
 		if (haveempty)
 		{
@@ -4298,9 +4492,9 @@ ExecEvalFieldSelect(FieldSelectState *fstate,
 
 	/* Check for dropped column, and force a NULL result if so */
 	if (fieldnum <= 0 ||
-		fieldnum > tupDesc->natts)	/* should never happen */
-				elog(ERROR, "attribute number %d exceeds number of columns %d",
-					 fieldnum, tupDesc->natts);
+		fieldnum > tupDesc->natts)		/* should never happen */
+		elog(ERROR, "attribute number %d exceeds number of columns %d",
+			 fieldnum, tupDesc->natts);
 	attr = tupDesc->attrs[fieldnum - 1];
 	if (attr->attisdropped)
 	{
@@ -4309,7 +4503,7 @@ ExecEvalFieldSelect(FieldSelectState *fstate,
 	}
 
 	/* Check for type mismatch --- possible after ALTER COLUMN TYPE? */
-	/* As in ExecEvalVar, we should but can't check typmod */
+	/* As in ExecEvalScalarVar, we should but can't check typmod */
 	if (fselect->resulttype != attr->atttypid)
 		ereport(ERROR,
 				(errmsg("attribute %d has wrong type", fieldnum),
@@ -4633,27 +4827,131 @@ ExecEvalCurrentOfExpr(ExprState *exprstate, ExprContext *econtext,
 	 */
 	if (TupHasHeapTuple(slot))
 	{
-		if (cexpr->gp_segment_id == Gp_segment &&
-			ItemPointerEquals(&cexpr->ctid, slot_get_ctid(slot)))
+		ItemPointerData cursor_tid;
+
+		if (execCurrentOf(cexpr, econtext,
+						  slot->tts_tableOid,
+						  &cursor_tid))
 		{
-			/*
-			 * If tableoid is InvalidOid, this implies that constant folding had
-			 * had determined tableoid was not necessary in uniquely identifying a tuple.
-			 * Otherwise, the given tuple's tableoid must match the CURRENT OF tableoid.
-			 * NOTE: If you are modifying this code, please modify corresponding code in
-			 * TidListCreate also.
-			 */
-			if (!OidIsValid(cexpr->tableoid) ||
-				cexpr->tableoid == slot->tts_tableOid)
-			{
+			if (ItemPointerEquals(&cursor_tid, slot_get_ctid(slot)))
 				result = true;
-			}
 		}
 	}
 
 	return BoolGetDatum(result);
 }
 
+/* ----------------------------------------------------------------
+ *		ExecEvalCoerceViaIO
+ *
+ *		Evaluate a CoerceViaIO node.
+ * ----------------------------------------------------------------
+ */
+static Datum
+ExecEvalCoerceViaIO(CoerceViaIOState *iostate,
+					ExprContext *econtext,
+					bool *isNull, ExprDoneCond *isDone)
+{
+	Datum		result;
+	Datum		inputval;
+	char	   *string;
+
+	inputval = ExecEvalExpr(iostate->arg, econtext, isNull, isDone);
+
+	if (isDone && *isDone == ExprEndResult)
+		return inputval;		/* nothing to do */
+
+	if (*isNull)
+		string = NULL;			/* output functions are not called on nulls */
+	else
+		string = OutputFunctionCall(&iostate->outfunc, inputval);
+
+	result = InputFunctionCall(&iostate->infunc,
+							   string,
+							   iostate->intypioparam,
+							   -1);
+
+	/* The input function cannot change the null/not-null status */
+	return result;
+}
+
+/* ----------------------------------------------------------------
+ *		ExecEvalArrayCoerceExpr
+ *
+ *		Evaluate an ArrayCoerceExpr node.
+ * ----------------------------------------------------------------
+ */
+static Datum
+ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate,
+						ExprContext *econtext,
+						bool *isNull, ExprDoneCond *isDone)
+{
+	ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) astate->xprstate.expr;
+	Datum		result;
+	ArrayType  *array;
+	FunctionCallInfoData locfcinfo;
+
+	result = ExecEvalExpr(astate->arg, econtext, isNull, isDone);
+
+	if (isDone && *isDone == ExprEndResult)
+		return result;			/* nothing to do */
+	if (*isNull)
+		return result;			/* nothing to do */
+
+	/*
+	 * If it's binary-compatible, modify the element type in the array header,
+	 * but otherwise leave the array as we received it.
+	 */
+	if (!OidIsValid(acoerce->elemfuncid))
+	{
+		/* Detoast input array if necessary, and copy in any case */
+		array = DatumGetArrayTypePCopy(result);
+		ARR_ELEMTYPE(array) = astate->resultelemtype;
+		PG_RETURN_ARRAYTYPE_P(array);
+	}
+
+	/* Detoast input array if necessary, but don't make a useless copy */
+	array = DatumGetArrayTypeP(result);
+
+	/* Initialize function cache if first time through */
+	if (astate->elemfunc.fn_oid == InvalidOid)
+	{
+		AclResult	aclresult;
+
+		/* Check permission to call function */
+		aclresult = pg_proc_aclcheck(acoerce->elemfuncid, GetUserId(),
+									 ACL_EXECUTE);
+		if (aclresult != ACLCHECK_OK)
+			aclcheck_error(aclresult, ACL_KIND_PROC,
+						   get_func_name(acoerce->elemfuncid));
+
+		/* Set up the primary fmgr lookup information */
+		fmgr_info_cxt(acoerce->elemfuncid, &(astate->elemfunc),
+					  econtext->ecxt_per_query_memory);
+
+		/* Initialize additional info */
+		astate->elemfunc.fn_expr = (Node *) acoerce;
+	}
+
+	/*
+	 * Use array_map to apply the function to each array element.
+	 *
+	 * We pass on the desttypmod and isExplicit flags whether or not the
+	 * function wants them.
+	 */
+	InitFunctionCallInfoData(locfcinfo, &(astate->elemfunc), 3,
+							 NULL, NULL);
+	locfcinfo.arg[0] = PointerGetDatum(array);
+	locfcinfo.arg[1] = Int32GetDatum(acoerce->resulttypmod);
+	locfcinfo.arg[2] = BoolGetDatum(acoerce->isExplicit);
+	locfcinfo.argnull[0] = false;
+	locfcinfo.argnull[1] = false;
+	locfcinfo.argnull[2] = false;
+
+	return array_map(&locfcinfo, ARR_ELEMTYPE(array), astate->resultelemtype,
+					 astate->amstate);
+}
+
 
 /*
  * ExecEvalExprSwitchContext
@@ -4721,8 +5019,21 @@ ExecInitExpr(Expr *node, PlanState *parent)
 	switch (nodeTag(node))
 	{
 		case T_Var:
-			state = (ExprState *) makeNode(ExprState);
-			state->evalfunc = ExecEvalVar;
+			/* varattno == InvalidAttrNumber means it's a whole-row Var */
+			if (((Var *) node)->varattno == InvalidAttrNumber)
+			{
+				WholeRowVarExprState *wstate = makeNode(WholeRowVarExprState);
+
+				wstate->parent = parent;
+				wstate->wrv_junkFilter = NULL;
+				state = (ExprState *) wstate;
+				state->evalfunc = (ExprStateEvalFunc) ExecEvalWholeRowVar;
+			}
+			else
+			{
+				state = (ExprState *) makeNode(ExprState);
+				state->evalfunc = ExecEvalScalarVar;
+			}
 			break;
 		case T_Const:
 			state = (ExprState *) makeNode(ExprState);
@@ -4776,7 +5087,7 @@ ExecInitExpr(Expr *node, PlanState *parent)
 					if (naggs != aggstate->numaggs)
 						ereport(ERROR,
 								(errcode(ERRCODE_GROUPING_ERROR),
-								 errmsg("aggregate function calls cannot be nested")));
+						errmsg("aggregate function calls cannot be nested")));
 				}
 				else
 				{
@@ -4942,27 +5253,16 @@ ExecInitExpr(Expr *node, PlanState *parent)
 			break;
 		case T_SubPlan:
 			{
-				/* Keep this in sync with ExecInitExprInitPlan, below */
 				SubPlan    *subplan = (SubPlan *) node;
-				SubPlanState *sstate = makeNode(SubPlanState);
-
-				sstate->xprstate.evalfunc = (ExprStateEvalFunc) ExecSubPlan;
+				SubPlanState *sstate;
 
 				if (!parent)
 					elog(ERROR, "SubPlan found with no parent plan");
 
-				/*
-				 * Here we just add the SubPlanState nodes to parent->subPlan.
-				 * The subplans will be initialized later.
-				 */
-				parent->subPlan = lcons(sstate, parent->subPlan);
-				sstate->sub_estate = NULL;
-				sstate->planstate = NULL;
+				sstate = ExecInitSubPlan(subplan, parent);
 
-				sstate->testexpr =
-					ExecInitExpr((Expr *) subplan->testexpr, parent);
-				sstate->args = (List *)
-					ExecInitExpr((Expr *) subplan->args, parent);
+				/* Add SubPlanState nodes to parent->subPlan */
+				parent->subPlan = lcons(sstate, parent->subPlan);
 
 				state = (ExprState *) sstate;
 			}
@@ -5004,8 +5304,8 @@ ExecInitExpr(Expr *node, PlanState *parent)
 			{
 				CoerceViaIO *iocoerce = (CoerceViaIO *) node;
 				CoerceViaIOState *iostate = makeNode(CoerceViaIOState);
-				Oid	 iofunc;
-				bool	typisvarlena;
+				Oid			iofunc;
+				bool		typisvarlena;
 
 				iostate->xprstate.evalfunc = (ExprStateEvalFunc) ExecEvalCoerceViaIO;
 				iostate->arg = ExecInitExpr(iocoerce->arg, parent);
@@ -5029,15 +5329,13 @@ ExecInitExpr(Expr *node, PlanState *parent)
 				astate->arg = ExecInitExpr(acoerce->arg, parent);
 				astate->resultelemtype = get_element_type(acoerce->resulttype);
 				if (astate->resultelemtype == InvalidOid)
-				{
-						ereport(ERROR,
-										(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-										 errmsg("target type is not an array")));
-				}
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+							 errmsg("target type is not an array")));
 				/* Arrays over domains aren't supported yet */
 				Assert(getBaseType(astate->resultelemtype) ==
-						   astate->resultelemtype);
-				astate->elemfunc.fn_oid = InvalidOid;   /* not initialized */
+					   astate->resultelemtype);
+				astate->elemfunc.fn_oid = InvalidOid;	/* not initialized */
 				astate->amstate = (ArrayMapState *) palloc0(sizeof(ArrayMapState));
 				state = (ExprState *) astate;
 			}
@@ -5518,37 +5816,6 @@ ExecInitExpr(Expr *node, PlanState *parent)
 	return state;
 }
 
-/*
- * ExecInitExprInitPlan --- initialize a subplan expr that's being handled
- * as an InitPlan.	This is identical to ExecInitExpr's handling of a regular
- * subplan expr, except we do NOT want to add the node to the parent's
- * subplan list.
- */
-SubPlanState *
-ExecInitExprInitPlan(SubPlan *node, PlanState *parent)
-{
-	SubPlanState *sstate = makeNode(SubPlanState);
-
-	/* The subplan's state will be initialized later */
-	sstate->sub_estate = NULL;
-	sstate->planstate = NULL;
-
-	if (parent != NULL)
-	{
-		sstate->testexpr = ExecInitExpr((Expr *) node->testexpr, parent);
-		sstate->args = (List *) ExecInitExpr((Expr *) node->args, parent);
-	}
-	else
-	{
-		sstate->testexpr = NULL;
-		sstate->args = NULL;
-	}
-
-	sstate->xprstate.expr = (Expr *) node;
-
-	return sstate;
-}
-
 /*
  * ExecPrepareExpr --- initialize for expression execution outside a normal
  * Plan tree context.
@@ -6016,6 +6283,7 @@ ExecEvalFunctionArgToConst(FuncExpr *fexpr, int argno, bool *isnull)
 {
 	Expr		   *aexpr;
 	Oid				argtype;
+	int32			argtypmod;
 	Const		   *result;
 
 	/* argument number sanity check */
@@ -6036,8 +6304,9 @@ ExecEvalFunctionArgToConst(FuncExpr *fexpr, int argno, bool *isnull)
 		ereport(ERROR,
 				(errmsg("unable to resolve function argument type"),
 				 errposition(exprLocation((Node *) aexpr))));
+	argtypmod = exprTypmod((Node *) aexpr);
 
-	result = (Const *) evaluate_expr(aexpr, argtype);
+	result = (Const *) evaluate_expr(aexpr, argtype, argtypmod);
 	/* evaluate_expr always returns Const */
 	Assert(IsA(result, Const));
 
@@ -6139,113 +6408,3 @@ isJoinExprNull(List *joinExpr, ExprContext *econtext)
 
 	return joinkeys_null;
 }
-
-
-/* ----------------------------------------------------------------
- *	  ExecEvalCoerceViaIO
- *
- *	  Evaluate a CoerceViaIO node.
- * ----------------------------------------------------------------
- */
-static Datum
-ExecEvalCoerceViaIO(CoerceViaIOState *iostate,
-					ExprContext *econtext,
-					bool *isNull, ExprDoneCond *isDone)
-{
-	Datum	   result;
-	Datum	   inputval;
-	char	   *string;
-
-	inputval = ExecEvalExpr(iostate->arg, econtext, isNull, isDone);
-
-	if (isDone && *isDone == ExprEndResult)
-		return inputval;		/* nothing to do */
-
-	if (*isNull)
-		string = NULL;		  /* output functions are not called on nulls */
-	else
-	string = OutputFunctionCall(&iostate->outfunc, inputval);
-
-	result = InputFunctionCall(&iostate->infunc,
-							   string,
-							   iostate->intypioparam,
-							   -1);
-
-	/* The input function cannot change the null/not-null status */
-	return result;
-}
-
-/* ----------------------------------------------------------------
- *			  ExecEvalArrayCoerceExpr
- *
- *			  Evaluate an ArrayCoerceExpr node.
- * ----------------------------------------------------------------
- */
-static Datum
-ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate,
-												ExprContext *econtext,
-												bool *isNull, ExprDoneCond *isDone)
-{
-	ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) astate->xprstate.expr;
-	Datum		   result;
-	ArrayType  *array;
-	FunctionCallInfoData locfcinfo;
-
-	result = ExecEvalExpr(astate->arg, econtext, isNull, isDone);
-
-	if (isDone && *isDone == ExprEndResult)
-			return result;				  /* nothing to do */
-	if (*isNull)
-			return result;				  /* nothing to do */
-
-	/*
-	 * If it's binary-compatible, modify the element type in the array header,
-	 * but otherwise leave the array as we received it.
-	 */
-	if (!OidIsValid(acoerce->elemfuncid))
-	{
-			/* Detoast input array if necessary, and copy in any case */
-			array = DatumGetArrayTypePCopy(result);
-			ARR_ELEMTYPE(array) = astate->resultelemtype;
-			PG_RETURN_ARRAYTYPE_P(array);
-	}
-
-	/* Detoast input array if necessary, but don't make a useless copy */
-	array = DatumGetArrayTypeP(result);
-	/* Initialize function cache if first time through */
-	if (astate->elemfunc.fn_oid == InvalidOid)
-	{
-			AclResult	   aclresult;
-
-			/* Check permission to call function */
-			aclresult = pg_proc_aclcheck(acoerce->elemfuncid, GetUserId(),
-																	 ACL_EXECUTE);
-			if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_PROC,
-											   get_func_name(acoerce->elemfuncid));
-
-			/* Set up the primary fmgr lookup information */
-			fmgr_info_cxt(acoerce->elemfuncid, &(astate->elemfunc),
-									  econtext->ecxt_per_query_memory);
-
-			/* Initialize additional info */
-			astate->elemfunc.fn_expr = (Node *) acoerce;
-	}
-	/*
-	 * Use array_map to apply the function to each array element.
-	 *
-	 * We pass on the desttypmod and isExplicit flags whether or not the
-	 * function wants them.
-	 */
-	InitFunctionCallInfoData(locfcinfo, &(astate->elemfunc), 3,
-													 NULL, NULL);
-	locfcinfo.arg[0] = PointerGetDatum(array);
-	locfcinfo.arg[1] = Int32GetDatum(acoerce->resulttypmod);
-	locfcinfo.arg[2] = BoolGetDatum(acoerce->isExplicit);
-	locfcinfo.argnull[0] = false;
-	locfcinfo.argnull[1] = false;
-	locfcinfo.argnull[2] = false;
-
-	return array_map(&locfcinfo, ARR_ELEMTYPE(array), astate->resultelemtype,
-									 astate->amstate);
-}
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index 443a7d2d4696..81447012abd6 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execScan.c,v 1.41 2007/02/02 00:07:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execScan.c,v 1.43 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -239,13 +239,14 @@ tlist_matches_tupdesc(PlanState *ps, List *tlist, Index varno, TupleDesc tupdesc
 			return false;		/* out of order */
 		if (att_tup->attisdropped)
 			return false;		/* table contains dropped columns */
+
 		/*
-		 * Note: usually the Var's type should match the tupdesc exactly,
-		 * but in situations involving unions of columns that have different
+		 * Note: usually the Var's type should match the tupdesc exactly, but
+		 * in situations involving unions of columns that have different
 		 * typmods, the Var may have come from above the union and hence have
 		 * typmod -1.  This is a legitimate situation since the Var still
-		 * describes the column, just not as exactly as the tupdesc does.
-		 * We could change the planner to prevent it, but it'd then insert
+		 * describes the column, just not as exactly as the tupdesc does. We
+		 * could change the planner to prevent it, but it'd then insert
 		 * projection steps just to convert from specific typmod to typmod -1,
 		 * which is pretty silly.
 		 */
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index f854ed975c04..2ec04da959c7 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -17,7 +17,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execTuples.c,v 1.99 2007/01/05 22:19:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execTuples.c,v 1.110 2009/09/27 20:09:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -242,7 +242,6 @@ MakeSingleTupleTableSlot(TupleDesc tupdesc)
 {
 	TupleTableSlot *slot = MakeTupleTableSlot();
 
-	init_slot(slot, NULL);
 	ExecSetSlotDescriptor(slot, tupdesc);
 
 	return slot;
@@ -599,6 +598,7 @@ ExecStoreAllNullTuple(TupleTableSlot *slot)
  *		ExecCopySlotTuple
  *			Obtain a copy of a slot's regular physical tuple.  The copy is
  *			palloc'd in the current memory context.
+ *			The slot itself is undisturbed.
  *
  *		This works even if the slot contains a virtual or minimal tuple;
  *		however the "system columns" of the result will not be meaningful.
@@ -630,6 +630,7 @@ ExecCopySlotHeapTuple(TupleTableSlot *slot)
  *		ExecCopySlotMinimalTuple
  *			Obtain a copy of a slot's minimal physical tuple.  The copy is
  *			palloc'd in the current memory context.
+ *			The slot itself is undisturbed.
  * --------------------------------
  */
 MemTuple ExecCopySlotMemTuple(TupleTableSlot *slot)
@@ -641,7 +642,8 @@ MemTuple ExecCopySlotMemTuple(TupleTableSlot *slot)
 	Assert(slot->tts_mt_bind);
 
 	/*
-	 * If we have a physical tuple then just copy it.
+	 * If we have a physical tuple then just copy it.  Prefer to copy
+	 * tts_mintuple since that's a tad cheaper.
 	 */
 	if (slot->PRIVATE_tts_memtuple)
 		return memtuple_copy_to(slot->PRIVATE_tts_memtuple, slot->tts_mt_bind, NULL, NULL);
@@ -697,9 +699,11 @@ MemTuple ExecCopySlotMemTupleTo(TupleTableSlot *slot, MemoryContext pctxt, char
  *
  *		If the slot contains a virtual tuple, we convert it to physical
  *		form.  The slot retains ownership of the physical tuple.
- *		Likewise, if it contains a minimal tuple we convert to regular form.
+ *		If it contains a minimal tuple we convert to regular form and store
+ *		that in addition to the minimal tuple (not instead of, because
+ *		callers may hold pointers to Datums within the minimal tuple).
  *
- * The difference between this and ExecMaterializeSlot() is that this
+ * The main difference between this and ExecMaterializeSlot() is that this
  * does not guarantee that the contained tuple is local storage.
  * Hence, the result must be treated as read-only.
  * --------------------------------
@@ -751,8 +755,10 @@ ExecFetchSlotHeapTuple(TupleTableSlot *slot)
  *			Fetch the slot's minimal physical tuple.
  *
  *		If the slot contains a virtual tuple, we convert it to minimal
- *		physical form.	The slot retains ownership of the physical tuple.
- *		Likewise, if it contains a regular tuple we convert to minimal form.
+ *		physical form.	The slot retains ownership of the minimal tuple.
+ *		If it contains a regular tuple we convert to minimal form and store
+ *		that in addition to the regular tuple (not instead of, because
+ *		callers may hold pointers to Datums within the regular tuple).
  *
  * As above, the result must be treated as read-only.
  * --------------------------------
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 4b984a42e237..609f6fc3b742 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -9,14 +9,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.144 2007/02/06 17:35:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.154 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 /*
  * INTERFACE ROUTINES
  *		CreateExecutorState		Create/delete executor working state
- *		CreateSubExecutorState
  *		FreeExecutorState
  *		CreateExprContext
  *		CreateStandaloneExprContext
@@ -88,8 +87,6 @@ int			NIndexTupleProcessed;
 
 DynamicTableScanInfo *dynamicTableScanInfo = NULL;
 
-static EState *InternalCreateExecutorState(MemoryContext qcontext,
-										   bool is_subquery);
 static void ShutdownExprContext(ExprContext *econtext);
 
 
@@ -174,7 +171,9 @@ DisplayTupleCount(FILE *statfp)
 EState *
 CreateExecutorState(void)
 {
+	EState	   *estate;
 	MemoryContext qcontext;
+	MemoryContext oldcontext;
 
 	/*
 	 * Create the per-query context for this Executor run.
@@ -184,57 +183,6 @@ CreateExecutorState(void)
 									 ALLOCSET_DEFAULT_MINSIZE,
 									 ALLOCSET_DEFAULT_INITSIZE,
 									 ALLOCSET_DEFAULT_MAXSIZE);
-	EState *estate = InternalCreateExecutorState(qcontext, false);
-
-	/*
-	 * Initialize dynamicTableScanInfo. Since this is shared by subqueries,
-	 * this can not be put inside InternalCreateExecutorState.
-	 */
-	MemoryContext oldcontext = MemoryContextSwitchTo(qcontext);
-	
-	estate->dynamicTableScanInfo = palloc0(sizeof(DynamicTableScanInfo));
-	estate->dynamicTableScanInfo->memoryContext = qcontext;
-
-	MemoryContextSwitchTo(oldcontext);
-
-	return estate;
-}
-
-/* ----------------
- *		CreateSubExecutorState
- *
- *		Create and initialize an EState node for a sub-query.
- *
- * Ideally, sub-queries probably shouldn't have their own EState at all,
- * but right now this is necessary because they have their own rangetables
- * and we access the rangetable via the EState.  It is critical that a
- * sub-query share the parent's es_query_cxt, else structures allocated by
- * the sub-query (especially its result tuple descriptor) may disappear
- * too soon during executor shutdown.
- * ----------------
- */
-EState *
-CreateSubExecutorState(EState *parent_estate)
-{
-    EState *es = InternalCreateExecutorState(parent_estate->es_query_cxt, true);
-
-    es->showstatctx = parent_estate->showstatctx;                   /*CDB*/
-
-	es->subplanLevel = parent_estate->subplanLevel + 1;
-	/* Subqueries share the same dynamicTableScanInfo with their parents. */
-	es->dynamicTableScanInfo = parent_estate->dynamicTableScanInfo;
-    return es;
-}
-
-/*
- * Guts of CreateExecutorState/CreateSubExecutorState
- */
-static EState *
-InternalCreateExecutorState(MemoryContext qcontext, bool is_subquery)
-{
-	EState	   *estate;
-	MemoryContext oldcontext;
-
 	/*
 	 * Make the EState node within the per-query context.  This way, we don't
 	 * need a separate pfree() operation for it at shutdown.
@@ -243,6 +191,12 @@ InternalCreateExecutorState(MemoryContext qcontext, bool is_subquery)
 
 	estate = makeNode(EState);
 
+	/*
+	 * Initialize dynamicTableScanInfo.
+	 */
+	estate->dynamicTableScanInfo = palloc0(sizeof(DynamicTableScanInfo));
+	estate->dynamicTableScanInfo->memoryContext = qcontext;
+
 	/*
 	 * Initialize all fields of the Executor State structure
 	 */
@@ -251,12 +205,15 @@ InternalCreateExecutorState(MemoryContext qcontext, bool is_subquery)
 	estate->es_crosscheck_snapshot = InvalidSnapshot;	/* no crosscheck */
 	estate->es_range_table = NIL;
 
+	estate->es_output_cid = (CommandId) 0;
+
 	estate->es_result_relations = NULL;
 	estate->es_num_result_relations = 0;
 	estate->es_result_relation_info = NULL;
 
 	estate->es_junkFilter = NULL;
 
+	estate->es_trig_target_relations = NIL;
 	estate->es_trig_tuple_slot = NULL;
 
 	estate->es_into_relation_descriptor = NULL;
@@ -277,14 +234,14 @@ InternalCreateExecutorState(MemoryContext qcontext, bool is_subquery)
 	estate->es_lastoid = InvalidOid;
 	estate->es_rowMarks = NIL;
 
-	estate->es_is_subquery = is_subquery;
-
 	estate->es_instrument = false;
 	estate->es_select_into = false;
 	estate->es_into_oids = false;
 
 	estate->es_exprcontexts = NIL;
 
+	estate->es_subplanstates = NIL;
+
 	estate->es_per_tuple_exprcontext = NULL;
 
 	estate->es_plannedstmt = NULL;
@@ -305,7 +262,7 @@ InternalCreateExecutorState(MemoryContext qcontext, bool is_subquery)
 
 	estate->currentSliceIdInPlan = 0;
 	estate->currentExecutingSliceId = 0;
-	estate->subplanLevel = 0;
+	estate->currentSubplanLevel = 0;
 	estate->rootSliceId = 0;
 
 	/*
@@ -383,11 +340,9 @@ FreeExecutorState(EState *estate)
 	}
 
 	/*
-	 * Free dynamicTableScanInfo. In a subquery, we don't do this, since
-	 * the subquery shares the value with its parent.
+	 * Free dynamicTableScanInfo.
 	 */
-	if (!estate->es_is_subquery &&
-		estate->dynamicTableScanInfo != NULL)
+	if (estate->dynamicTableScanInfo != NULL)
 	{
 		/*
 		 * In case of an abnormal termination such as elog(FATAL) we jump directly to
@@ -410,12 +365,9 @@ FreeExecutorState(EState *estate)
 
 	/*
 	 * Free the per-query memory context, thereby releasing all working
-	 * memory, including the EState node itself.  In a subquery, we don't
-	 * do this, leaving the memory cleanup to happen when the topmost query
-	 * is closed down.
+	 * memory, including the EState node itself.
 	 */
-	if (!estate->es_is_subquery)
-		MemoryContextDelete(estate->es_query_cxt);
+	MemoryContextDelete(estate->es_query_cxt);
 }
 
 /* ----------------
@@ -701,7 +653,7 @@ ExecVariableList(ProjectionInfo *projInfo, Datum *values, bool *isnull);
  * the given tlist should be a list of ExprState nodes, not Expr nodes.
  *
  * inputDesc can be NULL, but if it is not, we check to see whether simple
- * Vars in the tlist match the descriptor.  It is important to provide
+ * Vars in the tlist match the descriptor.	It is important to provide
  * inputDesc for relation-scan plan nodes, as a cross check that the relation
  * hasn't been changed since the plan was made.  At higher levels of a plan,
  * there is no need to recheck.
@@ -728,7 +680,7 @@ ExecBuildProjectionInfo(List *targetList,
 	 * Determine whether the target list consists entirely of simple Var
 	 * references (ie, references to non-system attributes) that match the
 	 * input.  If so, we can use the simpler ExecVariableList instead of
-	 * ExecTargetList.  (Note: if there is a type mismatch then ExecEvalVar
+	 * ExecTargetList.	(Note: if there is a type mismatch then ExecEvalScalarVar
 	 * will probably throw an error at runtime, but we leave that to it.)
 	 */
 	isVarList = true;
@@ -1085,25 +1037,16 @@ ExecOpenScanRelation(EState *estate, Index scanrelid)
 {
 	Oid			reloid;
 	LOCKMODE	lockmode;
-	ResultRelInfo *resultRelInfos;
-	int			i;
 
 	/*
-	 * First determine the lock type we need.  Scan to see if target relation
-	 * is either a result relation or a FOR UPDATE/FOR SHARE relation.
+	 * Determine the lock type we need.  First, scan to see if target relation
+	 * is a result relation.  If not, check if it's a FOR UPDATE/FOR SHARE
+	 * relation.  In either of those cases, we got the lock already.
 	 */
 	lockmode = AccessShareLock;
-	resultRelInfos = estate->es_result_relations;
-	for (i = 0; i < estate->es_num_result_relations; i++)
-	{
-		if (resultRelInfos[i].ri_RangeTableIndex == scanrelid)
-		{
-			lockmode = NoLock;
-			break;
-		}
-	}
-
-	if (lockmode == AccessShareLock)
+	if (ExecRelationIsTargetRelation(estate, scanrelid))
+		lockmode = NoLock;
+	else
 	{
 		ListCell   *l;
 
@@ -1219,6 +1162,9 @@ ExecOpenIndices(ResultRelInfo *resultRelInfo)
 	/*
 	 * For each index, open the index relation and save pg_index info. We
 	 * acquire RowExclusiveLock, signifying we will update the index.
+	 *
+	 * Note: we do this even if the index is not IndexIsReady; it's not worth
+	 * the trouble to optimize for the case where it isn't.
 	 */
 	i = 0;
 	foreach(l, indexoidlist)
@@ -1281,6 +1227,10 @@ ExecCloseIndices(ResultRelInfo *resultRelInfo)
  *		stuff as it only exists here because the genam stuff
  *		doesn't provide the functionality needed by the
  *		executor.. -cim 9/27/89
+ *
+ *		CAUTION: this must not be called for a HOT update.
+ *		We can't defend against that here for lack of info.
+ *		Should we change the API to make it safer?
  * ----------------------------------------------------------------
  */
 void
@@ -1329,6 +1279,10 @@ ExecInsertIndexTuples(TupleTableSlot *slot,
 
 		indexInfo = indexInfoArray[i];
 
+		/* If the index is marked as read-only, ignore it */
+		if (!indexInfo->ii_ReadyForInserts)
+			continue;
+
 		/* Check for partial index */
 		if (indexInfo->ii_Predicate != NIL)
 		{
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index d8eadd77037a..060428589dcd 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.110 2007/02/02 00:02:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.120 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -94,7 +94,8 @@ static execution_state *init_execution_state(List *queryTree_list,
 					 bool readonly_func);
 static void init_sql_fcache(FmgrInfo *finfo);
 static void postquel_start(execution_state *es, SQLFunctionCachePtr fcache);
-static TupleTableSlot * postquel_getnext(execution_state *es, SQLFunctionCachePtr fcache);
+static TupleTableSlot *postquel_getnext(execution_state *es,
+				 SQLFunctionCachePtr fcache);
 static void postquel_end(execution_state *es);
 static void postquel_sub_params(SQLFunctionCachePtr fcache,
 					FunctionCallInfo fcinfo);
@@ -189,7 +190,7 @@ init_execution_state(List *queryTree_list, SQLFunctionCache *fcache, bool readon
 
 	foreach(qtl_item, queryTree_list)
 	{
-		Query	   *queryTree = (Query *) lfirst(qtl_item);
+		Query	   *queryTree = lfirst(qtl_item);
 		Node	   *stmt;
 		execution_state *newes;
 
@@ -198,7 +199,7 @@ init_execution_state(List *queryTree_list, SQLFunctionCache *fcache, bool readon
 		if (queryTree->commandType == CMD_UTILITY)
 			stmt = queryTree->utilityStmt;
 		else
-			stmt = (Node *) pg_plan_query(queryTree, NULL);
+			stmt = (Node *) pg_plan_query(queryTree, 0, NULL);
 
 		/* Precheck all commands for validity in a function */
 		if (IsA(stmt, TransactionStmt))
@@ -265,7 +266,7 @@ init_sql_fcache(FmgrInfo *finfo)
 	 */
 	rettype = procedureStruct->prorettype;
 
-	if (rettype == ANYARRAYOID || rettype == ANYELEMENTOID)
+	if (IsPolymorphicType(rettype))
 	{
 		rettype = get_fn_expr_rettype(finfo);
 		if (rettype == InvalidOid)		/* this probably should not happen */
@@ -301,7 +302,7 @@ init_sql_fcache(FmgrInfo *finfo)
 		{
 			Oid			argtype = argOidVect[argnum];
 
-			if (argtype == ANYARRAYOID || argtype == ANYELEMENTOID)
+			if (IsPolymorphicType(argtype))
 			{
 				argtype = get_fn_expr_argtype(finfo, argnum);
 				if (argtype == InvalidOid)
@@ -318,7 +319,7 @@ init_sql_fcache(FmgrInfo *finfo)
 	fcache->argtypes = argOidVect;
 
 	/*
-	 * Parse and rewrite the queries in the function text.
+	 * And of course we need the function body text.
 	 */
 	tmp = SysCacheGetAttr(PROCOID,
 						  procedureTuple,
@@ -328,6 +329,9 @@ init_sql_fcache(FmgrInfo *finfo)
 		elog(ERROR, "null prosrc for function %u", foid);
 	fcache->src = TextDatumGetCString(tmp);
 
+	/*
+	 * Parse and rewrite the queries in the function text.
+	 */
 	queryTree_list = pg_parse_and_rewrite(fcache->src, argOidVect, nargs);
 	
 
@@ -374,16 +378,16 @@ init_sql_fcache(FmgrInfo *finfo)
 	}
 
 	/*
-	 * Check that the function returns the type it claims to.  Although
-	 * in simple cases this was already done when the function was defined,
-	 * we have to recheck because database objects used in the function's
-	 * queries might have changed type.  We'd have to do it anyway if the
-	 * function had any polymorphic arguments.
+	 * Check that the function returns the type it claims to.  Although in
+	 * simple cases this was already done when the function was defined, we
+	 * have to recheck because database objects used in the function's queries
+	 * might have changed type.  We'd have to do it anyway if the function had
+	 * any polymorphic arguments.
 	 *
-	 * Note: we set fcache->returnsTuple according to whether we are
-	 * returning the whole tuple result or just a single column.  In the
-	 * latter case we clear returnsTuple because we need not act different
-	 * from the scalar result case, even if it's a rowtype column.
+	 * Note: we set fcache->returnsTuple according to whether we are returning
+	 * the whole tuple result or just a single column.	In the latter case we
+	 * clear returnsTuple because we need not act different from the scalar
+	 * result case, even if it's a rowtype column.
 	 *
 	 * In the returnsTuple case, check_sql_fn_retval will also construct a
 	 * JunkFilter we can use to coerce the returned rowtype to the desired
@@ -470,8 +474,8 @@ postquel_start(execution_state *es, SQLFunctionCachePtr fcache)
 	if (es->qd->utilitystmt == NULL)
 	{
 		/*
-		 * Only set up to collect queued triggers if it's not a SELECT.
-		 * This isn't just an optimization, but is necessary in case a SELECT
+		 * Only set up to collect queued triggers if it's not a SELECT. This
+		 * isn't just an optimization, but is necessary in case a SELECT
 		 * returns multiple rows to caller --- we mustn't exit from the
 		 * function execution with a stacked AfterTrigger level still active.
 		 */
@@ -504,16 +508,17 @@ postquel_getnext(execution_state *es, SQLFunctionCachePtr fcache)
 	{
 		ActiveSnapshot = es->qd->snapshot;
 
-		if (es->qd->utilitystmt != NULL)
+		if (es->qd->utilitystmt)
 		{
 			/* ProcessUtility needs the PlannedStmt for DECLARE CURSOR */
 			ProcessUtility((es->qd->plannedstmt ?
 							(Node *) es->qd->plannedstmt :
-							es->qd->utilitystmt), 
+							es->qd->utilitystmt),
 						   fcache->src,
 						   es->qd->params,
-						   false, /* not top level */
-						   es->qd->dest, NULL);
+						   false,		/* not top level */
+						   es->qd->dest,
+						   NULL);
 			result = NULL;
 		}
 		else
@@ -526,6 +531,7 @@ postquel_getnext(execution_state *es, SQLFunctionCachePtr fcache)
 			 */
 			if (LAST_POSTQUEL_COMMAND(es) &&
 				es->qd->operation == CMD_SELECT &&
+				es->qd->plannedstmt->utilityStmt == NULL &&
 				es->qd->plannedstmt->intoClause == NULL)
 				count = 1L;
 			else
@@ -1056,9 +1062,9 @@ ShutdownSQLFunction(Datum arg)
  * to be sure that the user is returning the type he claims.
  *
  * For a polymorphic function the passed rettype must be the actual resolved
- * output type of the function; we should never see ANYARRAY or ANYELEMENT
- * as rettype.  (This means we can't check the type during function definition
- * of a polymorphic function.)
+ * output type of the function; we should never see a polymorphic pseudotype
+ * such as ANYELEMENT as rettype.  (This means we can't check the type during
+ * function definition of a polymorphic function.)
  *
  * This function returns true if the sql function returns the entire tuple
  * result of its final SELECT, and false otherwise.  Note that because we
@@ -1081,6 +1087,8 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 	char		fn_typtype;
 	Oid			restype;
 
+	AssertArg(!IsPolymorphicType(rettype));
+
 	if (junkFilter)
 		*junkFilter = NULL;		/* default result */
 
@@ -1102,12 +1110,12 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 	/*
 	 * If the last query isn't a SELECT, the return type must be VOID.
 	 *
-	 * Note: eventually replace this test with QueryReturnsTuples?  We'd need
+	 * Note: eventually replace this test with QueryReturnsTuples?	We'd need
 	 * a more general method of determining the output type, though.
 	 */
-	if (!(parse->commandType == CMD_SELECT && 
-		  parse->intoClause == NULL &&
-		  parse->utilityStmt == NULL))
+	if (!(parse->commandType == CMD_SELECT &&
+		  parse->utilityStmt == NULL &&
+		  parse->intoClause == NULL))
 	{
 		if (rettype != VOIDOID)
 			ereport(ERROR,
@@ -1121,10 +1129,9 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 	/*
 	 * OK, it's a SELECT, so it must return something matching the declared
 	 * type.  (We used to insist that the declared type not be VOID in this
-	 * case, but that makes it hard to write a void function that exits
-	 * after calling another void function.  Instead, we insist that the
-	 * SELECT return void ... so void is treated as if it were a scalar type
-	 * below.)
+	 * case, but that makes it hard to write a void function that exits after
+	 * calling another void function.  Instead, we insist that the SELECT
+	 * return void ... so void is treated as if it were a scalar type below.)
 	 */
 
 	/*
@@ -1135,7 +1142,9 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 
 	fn_typtype = get_typtype(rettype);
 
-	if (fn_typtype == 'b' || fn_typtype == 'd' ||
+	if (fn_typtype == TYPTYPE_BASE ||
+		fn_typtype == TYPTYPE_DOMAIN ||
+		fn_typtype == TYPTYPE_ENUM ||
 		rettype == VOIDOID)
 	{
 		/*
@@ -1159,7 +1168,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 					 errdetail("Actual return type is %s.",
 							   format_type_be(restype))));
 	}
-	else if (fn_typtype == 'c' || rettype == RECORDOID)
+	else if (fn_typtype == TYPTYPE_COMPOSITE || rettype == RECORDOID)
 	{
 		/* Returns a rowtype */
 		TupleDesc	tupdesc;
@@ -1173,6 +1182,11 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 		 * This can happen, for example, where the body of the function is
 		 * 'SELECT func2()', where func2 has the same return type as the
 		 * function that's calling it.
+		 *
+		 * XXX Note that if rettype is RECORD, the IsBinaryCoercible check
+		 * will succeed for any composite restype.  For the moment we rely on
+		 * runtime type checking to catch any discrepancy, but it'd be nice to
+		 * do better at parse time.
 		 */
 		if (tlistlen == 1)
 		{
@@ -1267,13 +1281,13 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 		/* Report that we are returning entire tuple result */
 		return true;
 	}
-	else if (rettype == ANYARRAYOID || rettype == ANYELEMENTOID)
+	else if (IsPolymorphicType(rettype))
 	{
 		/* This should already have been caught ... */
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 				 errmsg("cannot determine result data type"),
-				 errdetail("A function returning \"anyarray\" or \"anyelement\" must have at least one argument of either type.")));
+				 errdetail("A function returning a polymorphic type must have at least one polymorphic argument.")));
 	}
 	else
 		ereport(ERROR,
diff --git a/src/backend/executor/instrument.c b/src/backend/executor/instrument.c
index e62db558ed52..770b91ef3a30 100644
--- a/src/backend/executor/instrument.c
+++ b/src/backend/executor/instrument.c
@@ -8,7 +8,7 @@
  * Copyright (c) 2001-2009, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/instrument.c,v 1.19 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/instrument.c,v 1.20 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index bf2783740d6d..914591810d78 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -74,7 +74,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.150 2007/02/02 00:07:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.156.2.1 2008/10/16 19:25:58 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -944,7 +944,7 @@ find_unaggregated_cols_walker(Node *node, Bitmapset **colnos)
  * columns that haven't been explicitly grouped by.
  */
 List *
-get_agg_hash_collist(AggState *aggstate)
+find_hash_columns(AggState *aggstate)
 {
 	Agg		   *node = (Agg *) aggstate->ss.ps.plan;
 	Bitmapset  *colnos;
@@ -960,6 +960,8 @@ get_agg_hash_collist(AggState *aggstate)
 	collist = NIL;
 	while ((i = bms_first_member(colnos)) >= 0)
 		collist = lcons_int(i, collist);
+	bms_free(colnos);
+
 	return collist;
 }
 
@@ -1852,7 +1854,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 
 	if (node->aggstrategy == AGG_HASHED)
 	{
-		aggstate->hash_needed = get_agg_hash_collist(aggstate);
+		aggstate->hash_needed = find_hash_columns(aggstate);
 	}
 	else
 	{
@@ -1941,11 +1943,13 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		Assert(!(aggref->aggdistinct && aggref->aggorder));
 		Assert(numArguments == 1 || !aggref->aggdistinct);
 
-		/* Get actual datatypes of the inputs.	These could be different from
-		 * the agg's declared input types, when the agg accepts ANY, ANYARRAY
-		 * or ANYELEMENT. The result will have argument types at 0 through 
-		 * numArguments-1 and sort key types mixed in or at numArguments through 
-		 * numInputs.
+		/*
+		 * Get actual datatypes of the inputs.	These could be different from
+		 * the agg's declared input types, when the agg accepts ANY or a
+		 * polymorphic type.
+		 *
+		 * The result will have argument types at 0 through numArguments-1 and
+		 * sort key types mixed in or at numArguments through numInputs.
 		 */
 		inputTypes = (Oid*)palloc0(sizeof(Oid)*(numInputs));
 		i = 0;
@@ -2642,7 +2646,7 @@ Oid
 resolve_polymorphic_transtype(Oid aggtranstype, Oid aggfnoid,
 							  Oid *inputTypes)
 {
-	if (aggtranstype == ANYARRAYOID || aggtranstype == ANYELEMENTOID)
+	if (IsPolymorphicType(aggtranstype))
 	{
 		/* have to fetch the agg's declared input types... */
 		Oid		   *declaredArgTypes;
@@ -2652,7 +2656,8 @@ resolve_polymorphic_transtype(Oid aggtranstype, Oid aggfnoid,
 		aggtranstype = enforce_generic_type_consistency(inputTypes,
 														declaredArgTypes,
 														agg_nargs,
-														aggtranstype);
+														aggtranstype,
+														false);
 		pfree(declaredArgTypes);
 	}
 	return aggtranstype;
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index f4439720e0a2..9a970ff3867e 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeAppend.c,v 1.72 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeAppend.c,v 1.73 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c
index c025a49a55ff..3f21c1b3c891 100644
--- a/src/backend/executor/nodeBitmapAnd.c
+++ b/src/backend/executor/nodeBitmapAnd.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapAnd.c,v 1.9 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapAnd.c,v 1.10 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index bd51584e6663..6496d9b54827 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.16 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.22.2.1 2008/09/11 14:01:35 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,20 +65,12 @@ initScanDesc(BitmapHeapScanState *scanstate)
 	{
 		/*
 		 * Even though we aren't going to do a conventional seqscan, it is useful
-		 * to create a HeapScanDesc --- this checks the relation size and sets up
-		 * statistical infrastructure for us.
+		 * to create a HeapScanDesc --- most of the fields in it are usable.
 		 */
-		scanstate->ss_currentScanDesc = heap_beginscan(currentRelation,
-													   estate->es_snapshot,
-													   0,
-													   NULL);
-		
-		/*
-		 * One problem is that heap_beginscan counts a "sequential scan" start,
-		 * when we actually aren't doing any such thing.  Reverse out the added
-		 * scan count.	(Eventually we may want to count bitmap scans separately.)
-		 */
-		pgstat_discount_heap_scan(currentRelation);
+		scanstate->ss_currentScanDesc = heap_beginscan_bm(currentRelation,
+														  estate->es_snapshot,
+														  0,
+														  NULL);
 	}
 }
 
@@ -307,7 +299,7 @@ BitmapHeapNext(BitmapHeapScanState *node)
 		targoffset = scan->rs_vistuples[scan->rs_cindex];
 		dp = (Page) BufferGetPage(scan->rs_cbuf);
 		lp = PageGetItemId(dp, targoffset);
-		Assert(ItemIdIsUsed(lp));
+		Assert(ItemIdIsNormal(lp));
 
 		scan->rs_ctup.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
 		scan->rs_ctup.t_len = ItemIdGetLength(lp);
@@ -370,12 +362,7 @@ bitgetpage(HeapScanDesc scan, TBMIterateResult *tbmres)
 	BlockNumber page = tbmres->blockno;
 	Buffer		buffer;
 	Snapshot	snapshot;
-	Page		dp;
 	int			ntup;
-	int			curslot;
-	int			minslot;
-	int			maxslot;
-	int			maxoff;
 
 	/*
 	 * Acquire pin on the target heap page, trading in any pin we held before.
@@ -392,6 +379,14 @@ bitgetpage(HeapScanDesc scan, TBMIterateResult *tbmres)
 	buffer = scan->rs_cbuf;
 	snapshot = scan->rs_snapshot;
 
+	ntup = 0;
+
+	/*
+	 * Prune and repair fragmentation for the whole page, if possible.
+	 */
+	Assert(TransactionIdIsValid(RecentGlobalXmin));
+	heap_page_prune_opt(scan->rs_rd, buffer, RecentGlobalXmin);
+
 	/*
 	 * We must hold share lock on the buffer content while examining tuple
 	 * visibility.	Afterwards, however, the tuples we have found to be
@@ -399,71 +394,51 @@ bitgetpage(HeapScanDesc scan, TBMIterateResult *tbmres)
 	 */
 	LockBuffer(buffer, BUFFER_LOCK_SHARE);
 
-	dp = (Page) BufferGetPage(buffer);
-	maxoff = PageGetMaxOffsetNumber(dp);
-
 	/*
-	 * Determine how many entries we need to look at on this page. If the
-	 * bitmap is lossy then we need to look at each physical item pointer;
-	 * otherwise we just look through the offsets listed in tbmres.
+	 * We need two separate strategies for lossy and non-lossy cases.
 	 */
 	if (tbmres->ntuples >= 0)
 	{
-		/* non-lossy case */
-		minslot = 0;
-		maxslot = tbmres->ntuples - 1;
-	}
-	else
-	{
-		/* lossy case */
-		minslot = FirstOffsetNumber;
-		maxslot = maxoff;
-	}
-
-	ntup = 0;
-	for (curslot = minslot; curslot <= maxslot; curslot++)
-	{
-		OffsetNumber targoffset;
-		ItemId		lp;
-		HeapTupleData loctup;
-		bool		valid;
-
-		if (tbmres->ntuples >= 0)
-		{
-			/* non-lossy case */
-			targoffset = tbmres->offsets[curslot];
-		}
-		else
-		{
-			/* lossy case */
-			targoffset = (OffsetNumber) curslot;
-		}
-
 		/*
-		 * We'd better check for out-of-range offnum in case of VACUUM since
-		 * the TID was obtained.
+		 * Bitmap is non-lossy, so we just look through the offsets listed in
+		 * tbmres; but we have to follow any HOT chain starting at each such
+		 * offset.
 		 */
-		if (targoffset < FirstOffsetNumber || targoffset > maxoff)
-			continue;
+		int			curslot;
 
-		lp = PageGetItemId(dp, targoffset);
+		for (curslot = 0; curslot < tbmres->ntuples; curslot++)
+		{
+			OffsetNumber offnum = tbmres->offsets[curslot];
+			ItemPointerData tid;
 
+			ItemPointerSet(&tid, page, offnum);
+			if (heap_hot_search_buffer(scan->rs_rd, &tid, buffer, snapshot, NULL))
+				scan->rs_vistuples[ntup++] = ItemPointerGetOffsetNumber(&tid);
+		}
+	}
+	else
+	{
 		/*
-		 * Must check for deleted tuple.
+		 * Bitmap is lossy, so we must examine each item pointer on the page.
+		 * But we can ignore HOT chains, since we'll check each tuple anyway.
 		 */
-		if (!ItemIdIsUsed(lp))
-			continue;
+		Page		dp = (Page) BufferGetPage(buffer);
+		OffsetNumber maxoff = PageGetMaxOffsetNumber(dp);
+		OffsetNumber offnum;
 
-		/*
-		 * check time qualification of tuple, remember it if valid
-		 */
-		loctup.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
-		loctup.t_len = ItemIdGetLength(lp);
-		ItemPointerSet(&(loctup.t_self), page, targoffset);
+		for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum++)
+		{
+			ItemId		lp;
+			HeapTupleData loctup;
 
-		valid = HeapTupleSatisfiesVisibility(scan->rs_rd, &loctup, snapshot, buffer);
-		if (valid)
-			scan->rs_vistuples[ntup++] = targoffset;
+			lp = PageGetItemId(dp, offnum);
+			if (!ItemIdIsNormal(lp))
+				continue;
+			loctup.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
+			loctup.t_len = ItemIdGetLength(lp);
+			if (HeapTupleSatisfiesVisibility(scan->rs_rd, &loctup, snapshot, buffer))
+				scan->rs_vistuples[ntup++] = offnum;
+		}
 	}
 
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
@@ -527,9 +502,6 @@ ExecBitmapHeapReScan(BitmapHeapScanState *node, ExprContext *exprCtxt)
 	/* rescan to release any page pin */
 	heap_rescan(node->ss_currentScanDesc, NULL);
 
-	/* undo bogus "seq scan" count (see notes in ExecInitBitmapHeapScan) */
-	pgstat_discount_heap_scan(node->ss.ss_currentRelation);
-
 	freeBitmapState(node);
 
 	tbm_reset_bitmaps(outerPlanState(node));
diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c
index 283abe6543fc..82ff65ca6960 100644
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapIndexscan.c,v 1.22 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapIndexscan.c,v 1.25 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -219,6 +219,14 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags)
 	scanState->ss.ps.plan = (Plan *) node;
 	scanState->ss.ps.state = estate;
 
+	/*
+	 * If we are just doing EXPLAIN (ie, aren't going to run the plan), stop
+	 * here.  This allows an index-advisor plugin to EXPLAIN a plan containing
+	 * references to nonexistent indexes.
+	 */
+	if (eflags & EXEC_FLAG_EXPLAIN_ONLY)
+		return indexstate;
+
 	IndexScan_BeginIndexScan(scanState, indexstate->partitionMemoryContext, false, false, true);
 
 	/*
diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c
index 084764733711..29151567c810 100644
--- a/src/backend/executor/nodeBitmapOr.c
+++ b/src/backend/executor/nodeBitmapOr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapOr.c,v 1.8 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeBitmapOr.c,v 1.9 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeDynamicIndexscan.c b/src/backend/executor/nodeDynamicIndexscan.c
index 9b65fe418d9e..ea3a557c7954 100644
--- a/src/backend/executor/nodeDynamicIndexscan.c
+++ b/src/backend/executor/nodeDynamicIndexscan.c
@@ -27,9 +27,6 @@
 #include "utils/memutils.h"
 #include "cdb/cdbvars.h"
 
-/* Number of slots required for DynamicIndexScan */
-#define DYNAMICINDEXSCAN_NSLOTS 2
-
 /*
  * Free resources from a partition.
  */
@@ -38,11 +35,14 @@ CleanupOnePartition(IndexScanState *indexState);
 
 /*
  * Account for the number of tuple slots required for DynamicIndexScan
+ *
+ * XXX: We have backported the PostgreSQL patch that made these functions
+ * obsolete. The returned value isn't used for anything, so just return 0.
  */
 int 
 ExecCountSlotsDynamicIndexScan(DynamicIndexScan *node)
 {
-	return DYNAMICINDEXSCAN_NSLOTS;
+	return 0;
 }
 
 /*
diff --git a/src/backend/executor/nodeDynamicTableScan.c b/src/backend/executor/nodeDynamicTableScan.c
index 008697190b3a..895ac236c9f5 100644
--- a/src/backend/executor/nodeDynamicTableScan.c
+++ b/src/backend/executor/nodeDynamicTableScan.c
@@ -22,8 +22,7 @@
 #include "utils/memutils.h"
 #include "cdb/cdbpartition.h"
 #include "cdb/cdbvars.h"
-
-#define DYNAMIC_TABLE_SCAN_NSLOTS 2
+#include "cdb/partitionselection.h"
 
 static inline void
 CleanupOnePartition(ScanState *scanState);
@@ -117,7 +116,7 @@ initNextTableToScan(DynamicTableScanState *node)
 
 		ExecAssignScanType(scanState, partTupDesc);
 
-		AttrNumber	*attMap = NULL;
+		AttrNumber	*attMap;
 
 		attMap = varattnos_map(lastTupDesc, partTupDesc);
 
@@ -344,10 +343,14 @@ ExecDynamicTableRestrPos(DynamicTableScanState *node)
 	MarkRestrNotAllowed((ScanState *)node);
 }
 
+/*
+ * XXX: We have backported the PostgreSQL patch that made these functions
+ * obsolete. The returned value isn't used for anything, so just return 0.
+ */
 int
 ExecCountSlotsDynamicTableScan(DynamicTableScan *node)
 {
-	return DYNAMIC_TABLE_SCAN_NSLOTS;
+	return 0;
 }
 
 void
diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index 95578e8e2570..f85b7c80d848 100644
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.43 2007/02/19 02:23:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.45.2.1 2008/02/29 02:49:43 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,7 +84,6 @@ FunctionNext(FunctionScanState *node)
 			/* Request a callback at end of query. */
 			node->ss.ps.cdbexplainfun = ExecFunctionScanExplainEnd;
 		}
-
 	}
 
 	/*
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index ebbe6681dac7..93d2804cd0e4 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.110 2007/01/30 01:33:36 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.116.2.1 2009/10/30 20:58:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,7 @@
 #include <limits.h>
 
 #include "access/hash.h"
+#include "commands/tablespace.h"
 #include "executor/execdebug.h"
 #include "executor/hashjoin.h"
 #include "executor/instrument.h"
@@ -33,6 +34,7 @@
 #include "executor/nodeHashjoin.h"
 #include "miscadmin.h"
 #include "parser/parse_expr.h"
+#include "utils/dynahash.h"
 #include "utils/memutils.h"
 #include "utils/lsyscache.h"
 #include "utils/debugbreak.h"
@@ -50,7 +52,6 @@ ExecHashTableExplainBatches(HashJoinTable   hashtable,
                             int             ibatch_end,
                             const char     *title);
 static void ExecHashTableReallocBatchData(HashJoinTable hashtable, int new_nbatch);
-static int ExecChoosePrimeNBuckets(int nbuckets);
 
 void ExecChooseHashTableSize(double ntuples, int tupwidth,
 						int *numbuckets,
@@ -279,6 +280,7 @@ ExecHashTableCreate(HashState *hashState, HashJoinState *hjstate, List *hashOper
 	Plan	   *outerNode;
 	int			nbuckets;
 	int			nbatch;
+	int			log2_nbuckets;
 	int			nkeys;
 	int			i;
 	ListCell   *ho;
@@ -296,6 +298,17 @@ ExecHashTableCreate(HashState *hashState, HashJoinState *hjstate, List *hashOper
 	 */
 	outerNode = outerPlan(node);
 
+	ExecChooseHashTableSize(outerNode->plan_rows, outerNode->plan_width,
+			&nbuckets, &nbatch, operatorMemKB);
+
+#ifdef HJDEBUG
+    elog(LOG, "HJ: nbatch = %d, nbuckets = %d\n", nbatch, nbuckets);
+#endif
+
+	/* nbuckets must be a power of 2 */
+	log2_nbuckets = my_log2(nbuckets);
+	Assert(nbuckets == (1 << log2_nbuckets));
+
 	/*
 	 * Initialize the hash table control block.
 	 *
@@ -303,9 +316,14 @@ ExecHashTableCreate(HashState *hashState, HashJoinState *hjstate, List *hashOper
 	 * per-query memory context.
 	 */
 	hashtable = (HashJoinTable)palloc0(sizeof(HashJoinTableData));
+	hashtable->nbuckets = nbuckets;
+	hashtable->log2_nbuckets = log2_nbuckets;
+	hashtable->nbatch = nbatch;
 	hashtable->buckets = NULL;
 	hashtable->bloom = NULL;
 	hashtable->curbatch = 0;
+	hashtable->nbatch_original = nbatch;
+	hashtable->nbatch_outstart = nbatch;
 	hashtable->growEnabled = true;
 	hashtable->totalTuples = 0;
 	hashtable->batches = NULL;
@@ -316,46 +334,9 @@ ExecHashTableCreate(HashState *hashState, HashJoinState *hjstate, List *hashOper
 	hashtable->eagerlyReleased = false;
 	hashtable->hjstate = hjstate;
 
-	/*
-	 * Create temporary memory contexts in which to keep the hashtable working
-	 * storage.  See notes in executor/hashjoin.h.
-	 */
-	hashtable->hashCxt = AllocSetContextCreate(CurrentMemoryContext,
-											   "HashTableContext",
-											   ALLOCSET_DEFAULT_MINSIZE,
-											   ALLOCSET_DEFAULT_INITSIZE,
-											   ALLOCSET_DEFAULT_MAXSIZE);
-
-	hashtable->batchCxt = AllocSetContextCreate(hashtable->hashCxt,
-												"HashBatchContext",
-												ALLOCSET_DEFAULT_MINSIZE,
-												ALLOCSET_DEFAULT_INITSIZE,
-												ALLOCSET_DEFAULT_MAXSIZE);
-
-	/* CDB */ /* track temp buf file allocations in separate context */
-	hashtable->bfCxt = AllocSetContextCreate(CurrentMemoryContext,
-											 "hbbfcxt",
-											 ALLOCSET_DEFAULT_MINSIZE,
-											 ALLOCSET_DEFAULT_INITSIZE,
-											 ALLOCSET_DEFAULT_MAXSIZE);
-
-	ExecChooseHashTableSize(outerNode->plan_rows, outerNode->plan_width,
-			&hashtable->nbuckets, &hashtable->nbatch, operatorMemKB);
-
-	nbuckets = hashtable->nbuckets;
-	nbatch = hashtable->nbatch;
-	hashtable->nbatch_original = nbatch;
-	hashtable->nbatch_outstart = nbatch;
-
-
-#ifdef HJDEBUG
-    elog(LOG, "HJ: nbatch = %d, nbuckets = %d\n", nbatch, nbuckets);
-#endif
-
-
     /*
-	 * Get info about the hash functions to be used for each hash key.
-	 * Also remember whether the join operators are strict.
+	 * Get info about the hash functions to be used for each hash key. Also
+	 * remember whether the join operators are strict.
 	 */
 	nkeys = list_length(hashOperators);
 	hashtable->outer_hashfunctions =
@@ -379,6 +360,29 @@ ExecHashTableCreate(HashState *hashState, HashJoinState *hjstate, List *hashOper
 		i++;
 	}
 
+	/*
+	 * Create temporary memory contexts in which to keep the hashtable working
+	 * storage.  See notes in executor/hashjoin.h.
+	 */
+	hashtable->hashCxt = AllocSetContextCreate(CurrentMemoryContext,
+											   "HashTableContext",
+											   ALLOCSET_DEFAULT_MINSIZE,
+											   ALLOCSET_DEFAULT_INITSIZE,
+											   ALLOCSET_DEFAULT_MAXSIZE);
+
+	hashtable->batchCxt = AllocSetContextCreate(hashtable->hashCxt,
+												"HashBatchContext",
+												ALLOCSET_DEFAULT_MINSIZE,
+												ALLOCSET_DEFAULT_INITSIZE,
+												ALLOCSET_DEFAULT_MAXSIZE);
+
+	/* CDB */ /* track temp buf file allocations in separate context */
+	hashtable->bfCxt = AllocSetContextCreate(CurrentMemoryContext,
+											 "hbbfcxt",
+											 ALLOCSET_DEFAULT_MINSIZE,
+											 ALLOCSET_DEFAULT_INITSIZE,
+											 ALLOCSET_DEFAULT_MAXSIZE);
+
 	/*
      * Allocate data that will live for the life of the hashjoin
      */
@@ -451,34 +455,6 @@ ExecHashTableCreate(HashState *hashState, HashJoinState *hjstate, List *hashOper
  * #define NTUP_PER_BUCKET			10
  */
 
-/* Prime numbers that we like to use as nbuckets values */
-static const int hprimes[] = {
-	1033, 2063, 4111, 8219, 16417, 32779, 65539, 131111,
-	262151, 524341, 1048589, 2097211, 4194329, 8388619, 16777289, 33554473,
-	67108913, 134217773, 268435463, 536870951, 1073741831
-};
-
-/*
- * We want nbuckets to be prime so as to avoid having bucket and batch
- * numbers depend on only some bits of the hash code.  Choose the next
- * larger prime from the list in hprimes[].  (This also enforces that
- * nbuckets is not very small, by the simple expedient of not putting any
- * very small entries in hprimes[].)
- */
-static int
-ExecChoosePrimeNBuckets(int nbuckets)
-{
-	for (int i = 0; i < (int) lengthof(hprimes); i++)
-	{
-		if (hprimes[i] >= nbuckets)
-		{
-			nbuckets = hprimes[i];
-			break;
-		}
-	}
-	return nbuckets;
-}
-
 void
 ExecChooseHashTableSize(double ntuples, int tupwidth,
 						int *numbuckets,
@@ -488,8 +464,10 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
 	int			tupsize;
 	double		inner_rel_bytes;
 	long		hash_table_bytes;
+	long		max_pointers;
 	int			nbatch;
 	int			nbuckets;
+	int			i;
 
 	/* num tuples is a global number. We should be receiving only part of that */
 	if (Gp_role == GP_ROLE_EXECUTE)
@@ -517,8 +495,13 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
 	/*
 	 * Set nbuckets to achieve an average bucket load of gp_hashjoin_tuples_per_bucket when
 	 * memory is filled.  Set nbatch to the smallest power of 2 that appears
-	 * sufficient.
+	 * sufficient.  The Min() steps limit the results so that the pointer
+	 * arrays we'll try to allocate do not exceed work_mem.
 	 */
+	max_pointers = (work_mem * 1024L) / sizeof(void *);
+	/* also ensure we avoid integer overflow in nbatch and nbuckets */
+	max_pointers = Min(max_pointers, INT_MAX / 2);
+
 	if (inner_rel_bytes > hash_table_bytes)
 	{
 		/* We'll need multiple batches */
@@ -527,13 +510,23 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
 		int			minbatch;
 
 		lbuckets = (hash_table_bytes / tupsize) / gp_hashjoin_tuples_per_bucket;
-		lbuckets = Min(lbuckets, INT_MAX / 32);
+		lbuckets = Min(lbuckets, max_pointers);
+
+		nbuckets = (int) lbuckets;
 
-		/* Pick the closest prime number for the number of buckets */
-		nbuckets = ExecChoosePrimeNBuckets((int) lbuckets);
+		/*
+		 * Both nbuckets and nbatch must be powers of 2 to make
+		 * ExecHashGetBucketAndBatch fast.	We already fixed nbatch; now inflate
+		 * nbuckets to the next larger power of 2.	We also force nbuckets to not
+		 * be real small, by starting the search at 2^10.
+		 */
+		i = 10;
+		while ((1 << i) < nbuckets)
+			i++;
+		nbuckets = (1 << i);
 
 		dbatch = ceil(inner_rel_bytes / hash_table_bytes);
-		dbatch = Min(dbatch, INT_MAX / 32);
+		dbatch = Min(dbatch, max_pointers);
 		minbatch = (int) dbatch;
 		nbatch = 2;
 		while (nbatch < minbatch)
@@ -633,8 +626,20 @@ ExecChooseHashTableSize(double ntuples, int tupwidth,
 		dbuckets = ceil(dbuckets);
 		dbuckets = Min(dbuckets, INT_MAX);
 
-		/* Pick the closest prime number for the number of buckets */
-		nbuckets = ExecChoosePrimeNBuckets((int) dbuckets);
+		nbuckets = (int) dbuckets;
+
+		/*
+		 * Both nbuckets and nbatch must be powers of 2 to make
+		 * ExecHashGetBucketAndBatch fast.	We already fixed nbatch; now inflate
+		 * nbuckets to the next larger power of 2.	We also force nbuckets to not
+		 * be real small, by starting the search at 2^10.  (Note: above we made
+		 * sure that nbuckets is not more than INT_MAX / 2, so this loop cannot
+		 * overflow, nor can the final shift to recalculate nbuckets.)
+		 */
+		i = 10;
+		while ((1 << i) < nbuckets)
+			i++;
+		nbuckets = (1 << i);
 
 		nbatch = 1;
 	}
@@ -723,7 +728,7 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 		return;
 
 	/* safety check to avoid overflow */
-	if (oldnbatch > INT_MAX / 2)
+	if (oldnbatch > Min(INT_MAX / 2, MaxAllocSize / (sizeof(void *) * 2)))
 		return;
 
 	nbatch = oldnbatch * 2;
@@ -1063,15 +1068,15 @@ ExecHashGetHashValue(HashState *hashState, HashJoinTable hashtable,
 		/*
 		 * If the attribute is NULL, and the join operator is strict, then
 		 * this tuple cannot pass the join qual so we can reject it
-		 * immediately (unless we're scanning the outside of an outer join,
-		 * in which case we must not reject it).  Otherwise we act like the
+		 * immediately (unless we're scanning the outside of an outer join, in
+		 * which case we must not reject it).  Otherwise we act like the
 		 * hashcode of NULL is zero (this will support operators that act like
 		 * IS NOT DISTINCT, though not any more-random behavior).  We treat
 		 * the hash support function as strict even if the operator is not.
 		 *
 		 * Note: currently, all hashjoinable operators must be strict since
-		 * the hash index AM assumes that.  However, it takes so little
-		 * extra code here to allow non-strict that we may as well do it.
+		 * the hash index AM assumes that.	However, it takes so little extra
+		 * code here to allow non-strict that we may as well do it.
 		 */
 		if (isNull)
 		{
@@ -1110,10 +1115,11 @@ ExecHashGetHashValue(HashState *hashState, HashJoinTable hashtable,
  * chains), and must only cause the batch number to remain the same or
  * increase.  Our algorithm is
  *		bucketno = hashvalue MOD nbuckets
- *		batchno = hash_uint32(hashvalue) MOD nbatch
- * which gives reasonably independent bucket and batch numbers in the face
- * of some rather poorly-implemented hash functions in hashfunc.c.  (This
- * will change in PG 8.3.)
+ *		batchno = (hashvalue DIV nbuckets) MOD nbatch
+ * where nbuckets and nbatch are both expected to be powers of 2, so we can
+ * do the computations by shifting and masking.  (This assumes that all hash
+ * functions are good about randomizing all their output bits, else we are
+ * likely to have very skewed bucket or batch occupancy.)
  *
  * nbuckets doesn't change over the course of the join.
  *
@@ -1131,13 +1137,13 @@ ExecHashGetBucketAndBatch(HashJoinTable hashtable,
 
 	if (nbatch > 1)
 	{
-		*bucketno = hashvalue % nbuckets;
-		/* since nbatch is a power of 2, can do MOD by masking */
-		*batchno = hash_uint32(hashvalue) & (nbatch - 1);
+		/* we can do MOD by masking, DIV by shifting */
+		*bucketno = hashvalue & (nbuckets - 1);
+		*batchno = (hashvalue >> hashtable->log2_nbuckets) & (nbatch - 1);
 	}
 	else
 	{
-		*bucketno = hashvalue % nbuckets;
+		*bucketno = hashvalue & (nbuckets - 1);
 		*batchno = 0;
 	}
 }
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index f249f9fd70d3..34eb87ec7fe0 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.89 2007/02/02 00:07:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.93 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -724,12 +724,11 @@ ExecHashJoinOuterGetTuple(PlanState *outerNode,
 					(hjstate->js.jointype == JOIN_LASJ_NOTIN) ||
 					hjstate->hj_nonequijoin;
 			if (ExecHashGetHashValue(hashState, hashtable, econtext,
-						hjstate->hj_OuterHashKeys,
-						true,
-						keep_nulls,
-						hashvalue,
-						&hashkeys_null
-						))
+									 hjstate->hj_OuterHashKeys,
+									 true,		/* outer tuple */
+									 keep_nulls,
+									 hashvalue,
+									 &hashkeys_null))
 			{
 				/* remember outer relation is not empty for possible rescan */
 				hjstate->hj_OuterNotEmpty = true;
@@ -737,8 +736,8 @@ ExecHashJoinOuterGetTuple(PlanState *outerNode,
 				return slot;
 			}
 			/*
-			 * That tuple couldn't match because of a NULL, so discard it
-			 * and continue with the next one.
+			 * That tuple couldn't match because of a NULL, so discard it and
+			 * continue with the next one.
 			 */
 		}
 
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 5eff8aa0ee93..4afa117fc264 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.120 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.125 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -479,17 +479,17 @@ ExecEndIndexScan(IndexScanState *node)
 	ExecClearTuple(node->ss.ss_ScanTupleSlot);
 
 	/*
-	 * close the index relation
+	 * close the index relation (no-op if we didn't open it)
 	 */
 	ExecEagerFreeIndexScan(node);
-	index_close(indexRelationDesc, NoLock);
+	if (indexRelationDesc)
+		index_close(indexRelationDesc, NoLock);
 
 	/*
 	 * close the heap relation.
 	 */
 	ExecCloseScanRelation(relation);
 
-	Assert(NULL != node->iss_RuntimeContext);
 	FreeRuntimeKeysContext(node);
 	EndPlanStateGpmonPkt(&node->ss.ps);
 }
@@ -589,6 +589,20 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignScanType(&indexstate->ss, RelationGetDescr(currentRelation));
 
+	/*
+	 * Initialize result tuple type and projection info.
+	 */
+	ExecAssignResultTypeFromTL(&indexstate->ss.ps);
+	ExecAssignScanProjectionInfo(&indexstate->ss);
+
+	/*
+	 * If we are just doing EXPLAIN (ie, aren't going to run the plan), stop
+	 * here.  This allows an index-advisor plugin to EXPLAIN a plan containing
+	 * references to nonexistent indexes.
+	 */
+	if (eflags & EXEC_FLAG_EXPLAIN_ONLY)
+		return indexstate;
+
 	/*
 	 * Open the index relation.
 	 *
@@ -623,12 +637,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags)
 	 */
 	indexstate->iss_RuntimeKeysReady = false;
 
-	/*
-	 * Initialize result tuple type and projection info.
-	 */
-	ExecAssignResultTypeFromTL(&indexstate->ss.ps);
-	ExecAssignScanProjectionInfo(&indexstate->ss);
-
 	initGpmonPktForIndexScan((Plan *)node, &indexstate->ss.ps.gpmon_pkt, estate);
 
 	/*
@@ -651,7 +659,6 @@ ExecCountSlotsIndexScan(IndexScan *node)
 		ExecCountSlotsNode(innerPlan((Plan *) node)) + INDEXSCAN_NSLOTS;
 }
 
-	
 void
 initGpmonPktForIndexScan(Plan *planNode, gpmon_packet_t *gpmon_pkt, EState *estate)
 {
diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c
index 59fa57ee95e1..af6b0e3aaa23 100644
--- a/src/backend/executor/nodeLimit.c
+++ b/src/backend/executor/nodeLimit.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.29 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.33 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,17 +57,22 @@ ExecLimit(LimitState *node)
 		case LIMIT_INITIAL:
 
 			/*
-			 * If backwards scan, just return NULL without changing state.
+			 * First call for this node, so compute limit/offset. (We can't do
+			 * this any earlier, because parameters from upper nodes will not
+			 * be set during ExecInitLimit.)  This also sets position = 0 and
+			 * changes the state to LIMIT_RESCAN.
 			 */
-			if (!ScanDirectionIsForward(direction))
-				return NULL;
+			recompute_limits(node);
+
+			/* FALL THRU */
+
+		case LIMIT_RESCAN:
 
 			/*
-			 * First call for this scan, so compute limit/offset. (We can't do
-			 * this any earlier, because parameters from upper nodes may not
-			 * be set until now.)  This also sets position = 0.
+			 * If backwards scan, just return NULL without changing state.
 			 */
-			recompute_limits(node);
+			if (!ScanDirectionIsForward(direction))
+				return NULL;
 
 			/*
 			 * Check for empty window; if so, treat like empty subplan.
@@ -131,7 +136,7 @@ ExecLimit(LimitState *node)
 				 * the state machine state to record having done so.
 				 */
 				if (!node->noCount &&
-					node->position >= node->offset + node->count)
+					node->position - node->offset >= node->count)
 				{
 					node->lstate = LIMIT_WINDOWEND;
 					ExecSquelchNode(outerPlan); /* CDB */
@@ -233,7 +238,7 @@ ExecLimit(LimitState *node)
 }
 
 /*
- * Evaluate the limit/offset expressions --- done at start of each scan.
+ * Evaluate the limit/offset expressions --- done at startup or rescan.
  *
  * This is also a handy place to reset the current-position state info.
  */
@@ -296,6 +301,41 @@ recompute_limits(LimitState *node)
 	/* Reset position to start-of-scan */
 	node->position = 0;
 	node->subSlot = NULL;
+
+	/* Set state-machine state */
+	node->lstate = LIMIT_RESCAN;
+
+	/*
+	 * If we have a COUNT, and our input is a Sort node, notify it that it can
+	 * use bounded sort.
+	 *
+	 * This is a bit of a kluge, but we don't have any more-abstract way of
+	 * communicating between the two nodes; and it doesn't seem worth trying
+	 * to invent one without some more examples of special communication
+	 * needs.
+	 *
+	 * Note: it is the responsibility of nodeSort.c to react properly to
+	 * changes of these parameters.  If we ever do redesign this, it'd be a
+	 * good idea to integrate this signaling with the parameter-change
+	 * mechanism.
+	 */
+	if (IsA(outerPlanState(node), SortState))
+	{
+		SortState  *sortState = (SortState *) outerPlanState(node);
+		int64		tuples_needed = node->count + node->offset;
+
+		/* negative test checks for overflow */
+		if (node->noCount || tuples_needed < 0)
+		{
+			/* make sure flag gets reset if needed upon rescan */
+			sortState->bounded = false;
+		}
+		else
+		{
+			sortState->bounded = true;
+			sortState->bound = tuples_needed;
+		}
+	}
 }
 
 /* ----------------------------------------------------------------
@@ -392,8 +432,12 @@ ExecEndLimit(LimitState *node)
 void
 ExecReScanLimit(LimitState *node, ExprContext *exprCtxt)
 {
-	/* resetting lstate will force offset/limit recalculation */
-	node->lstate = LIMIT_INITIAL;
+	/*
+	 * Recompute limit/offset in case parameters changed, and reset the state
+	 * machine.  We must do this before rescanning our child node, in case
+	 * it's a Sort that we are passing the parameters down to.
+	 */
+	recompute_limits(node);
 
 	/*
 	 * if chgParam of subnode is not null then plan will be re-scanned by
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index faf31c561aba..992a9bd06206 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeMaterial.c,v 1.58 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeMaterial.c,v 1.61 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -77,7 +77,7 @@ ExecMaterial(MaterialState *node)
 	/*
 	 * If first time through, and we need a tuplestore, initialize it.
 	 */
-	if (ts == NULL && (ma->share_type != SHARE_NOTSHARED || node->randomAccess))
+	if (ts == NULL && (ma->share_type != SHARE_NOTSHARED || node->eflags != 0))
 	{
 		/*
 		 * For cross slice material, we only run ExecMaterial on DriverSlice
@@ -285,16 +285,18 @@ ExecInitMaterial(Material *node, EState *estate, int eflags)
 	matstate->ss.ps.plan = (Plan *) node;
 	matstate->ss.ps.state = estate;
 
+	if (node->cdb_strict)
+		eflags |= EXEC_FLAG_REWIND;
+
 	/*
-	 * We must have random access to the subplan output to do backward scan or
-	 * mark/restore.  We also prefer to materialize the subplan output if we
-	 * might be called on to rewind and replay it many times. However, if none
-	 * of these cases apply, we can skip storing the data.
+	 * We must have a tuplestore buffering the subplan output to do backward
+	 * scan or mark/restore.  We also prefer to materialize the subplan output
+	 * if we might be called on to rewind and replay it many times. However,
+	 * if none of these cases apply, we can skip storing the data.
 	 */
-	matstate->randomAccess = node->cdb_strict ||
-							(eflags & (EXEC_FLAG_REWIND |
-										EXEC_FLAG_BACKWARD |
-										EXEC_FLAG_MARK)) != 0;
+	matstate->eflags = (eflags & (EXEC_FLAG_REWIND |
+								  EXEC_FLAG_BACKWARD |
+								  EXEC_FLAG_MARK));
 
 	matstate->eof_underlying = false;
 	matstate->ts_state = palloc0(sizeof(GenericTupStore));
@@ -458,7 +460,7 @@ ExecEndMaterial(MaterialState *node)
 void
 ExecMaterialMarkPos(MaterialState *node)
 {
-	Assert(node->randomAccess);
+	Assert(node->eflags & EXEC_FLAG_MARK);
 
 #ifdef DEBUG
 	{
@@ -495,7 +497,7 @@ ExecMaterialMarkPos(MaterialState *node)
 void
 ExecMaterialRestrPos(MaterialState *node)
 {
-	Assert(node->randomAccess);
+	Assert(node->eflags & EXEC_FLAG_MARK);
 
 #ifdef DEBUG
 	{
@@ -584,7 +586,7 @@ ExecMaterialReScan(MaterialState *node, ExprContext *exprCtxt)
 {
 	ExecClearTuple(node->ss.ps.ps_ResultTupleSlot);
 
-	if (node->randomAccess)
+	if (node->eflags != 0)
 	{
 		/*
 		 * If tuple store is empty, then either we have not materialized yet
@@ -605,14 +607,20 @@ ExecMaterialReScan(MaterialState *node, ExprContext *exprCtxt)
 
 		/*
 		 * If subnode is to be rescanned then we forget previous stored
-		 * results; we have to re-read the subplan and re-store.
+		 * results; we have to re-read the subplan and re-store.  Also, if we
+		 * told tuplestore it needn't support rescan, we lose and must
+		 * re-read.  (This last should not happen in common cases; else our
+		 * caller lied by not passing EXEC_FLAG_REWIND to us.)
 		 *
 		 * Otherwise we can just rewind and rescan the stored output. The
 		 * state of the subnode does not change.
 		 */
-		if (((PlanState *) node)->lefttree->chgParam != NULL)
+		if (((PlanState *) node)->lefttree->chgParam != NULL ||
+			(node->eflags & EXEC_FLAG_REWIND) == 0)
 		{
 			DestroyTupleStore(node);
+			if (((PlanState *) node)->lefttree->chgParam == NULL)
+				ExecReScan(((PlanState *) node)->lefttree, exprCtxt);
 		}
 		else
 		{
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index c303ae003027..aed3674dcc30 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -1,3 +1,13 @@
+/*
+ * GPDB_83_MERGE_FIXME: I left out gpmon counter stuff like this:
+ *
+ * Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_OUTERTUPLE);
+ * Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN);
+ *
+ * Do we really need that stuff? There are counters in the inner and outer nodes themselves.
+ */
+
+
 /*-------------------------------------------------------------------------
  *
  * nodeMergejoin.c
@@ -9,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.87 2007/02/02 00:07:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.90.2.1 2010/05/28 01:14:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +52,7 @@
  *
  *		Therefore, rather than directly executing the merge join clauses,
  *		we evaluate the left and right key expressions separately and then
- *		compare the columns one at a time (see MJCompare).  The planner
+ *		compare the columns one at a time (see MJCompare).	The planner
  *		passes us enough information about the sort ordering of the inputs
  *		to allow us to determine how to make the comparison.  We may use the
  *		appropriate btree comparison function, since Postgres' only notion
@@ -140,6 +150,14 @@ typedef struct MergeJoinClauseData
 	FmgrInfo	cmpfinfo;
 } MergeJoinClauseData;
 
+/* Result type for MJEvalOuterValues and MJEvalInnerValues */
+typedef enum
+{
+	MJEVAL_MATCHABLE,			/* normal, potentially matchable tuple */
+	MJEVAL_NONMATCHABLE,		/* tuple cannot join because it has a null */
+	MJEVAL_ENDOFJOIN			/* end of input (physical or effective) */
+} MJEvalResult;
+
 
 #define MarkInnerTuple(innerTupleSlot, mergestate) \
 	ExecCopySlot((mergestate)->mj_MarkedTupleSlot, (innerTupleSlot))
@@ -161,7 +179,7 @@ typedef struct MergeJoinClauseData
  * sort ordering for each merge key.  The mergejoinable operator is an
  * equality operator in this opfamily, and the two inputs are guaranteed to be
  * ordered in either increasing or decreasing (respectively) order according
- * to this opfamily, with nulls at the indicated end of the range.  This
+ * to this opfamily, with nulls at the indicated end of the range.	This
  * allows us to obtain the needed comparison function from the opfamily.
  *
  * CDB: We also recognize the "is not distinct from" predicate which is
@@ -228,7 +246,7 @@ MJExamineQuals(List *mergeclauses,
 								   &op_lefttype,
 								   &op_righttype,
 								   &op_recheck);
-		if (op_strategy != BTEqualStrategyNumber)	/* should not happen */
+		if (op_strategy != BTEqualStrategyNumber)		/* should not happen */
 			elog(ERROR, "cannot merge using non-equality operator %u",
 				 qual->opno);
 		Assert(!op_recheck);	/* never true for btree */
@@ -238,7 +256,7 @@ MJExamineQuals(List *mergeclauses,
 									op_lefttype,
 									op_righttype,
 									BTORDER_PROC);
-		if (!RegProcedureIsValid(cmpproc))			/* should not happen */
+		if (!RegProcedureIsValid(cmpproc))		/* should not happen */
 			elog(ERROR, "missing support function %d(%u,%u) in opfamily %u",
 				 BTORDER_PROC, op_lefttype, op_righttype, opfamily);
 
@@ -256,7 +274,7 @@ MJExamineQuals(List *mergeclauses,
 			clause->reverse = false;
 		else if (opstrategy == BTGreaterStrategyNumber)
 			clause->reverse = true;
-		else					/* planner screwed up */
+		else	/* planner screwed up */
 			elog(ERROR, "unsupported mergejoin strategy %d", opstrategy);
 
 		clause->nulls_first = nulls_first;
@@ -273,19 +291,34 @@ MJExamineQuals(List *mergeclauses,
  * Compute the values of the mergejoined expressions for the current
  * outer tuple.  We also detect whether it's impossible for the current
  * outer tuple to match anything --- this is true if it yields a NULL
- * input, since we assume mergejoin operators are strict.
+ * input, since we assume mergejoin operators are strict.  If the NULL
+ * is in the first join column, and that column sorts nulls last, then
+ * we can further conclude that no following tuple can match anything
+ * either, since they must all have nulls in the first column.  However,
+ * that case is only interesting if we're not in FillOuter mode, else
+ * we have to visit all the tuples anyway.
+ *
+ * For the convenience of callers, we also make this routine responsible
+ * for testing for end-of-input (null outer tuple), and returning
+ * MJEVAL_ENDOFJOIN when that's seen.  This allows the same code to be used
+ * for both real end-of-input and the effective end-of-input represented by
+ * a first-column NULL.
  *
  * We evaluate the values in OuterEContext, which can be reset each
  * time we move to a new tuple.
  */
-static bool
+static MJEvalResult
 MJEvalOuterValues(MergeJoinState *mergestate)
 {
 	ExprContext *econtext = mergestate->mj_OuterEContext;
-	bool		canmatch = true;
+	MJEvalResult result = MJEVAL_MATCHABLE;
 	int			i;
 	MemoryContext oldContext;
 
+	/* Check for end of outer subplan */
+	if (TupIsNull(mergestate->mj_OuterTupleSlot))
+		return MJEVAL_ENDOFJOIN;
+
 	ResetExprContext(econtext);
 
 	oldContext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
@@ -298,13 +331,19 @@ MJEvalOuterValues(MergeJoinState *mergestate)
 
 		clause->ldatum = ExecEvalExpr(clause->lexpr, econtext,
 									  &clause->lisnull, NULL);
-		if (clause->lisnull)
-			canmatch = clause->notdistinct;
+		if (clause->lisnull && !clause->notdistinct)
+		{
+			/* match is impossible; can we end the join early? */
+			if (i == 0 && !clause->nulls_first && !mergestate->mj_FillOuter)
+				result = MJEVAL_ENDOFJOIN;
+			else if (result == MJEVAL_MATCHABLE)
+				result = MJEVAL_NONMATCHABLE;
+		}
 	}
 
 	MemoryContextSwitchTo(oldContext);
 
-	return canmatch;
+	return result;
 }
 
 /*
@@ -314,14 +353,18 @@ MJEvalOuterValues(MergeJoinState *mergestate)
  * to load data from either the true current inner, or the marked inner,
  * so caller must tell us which slot to load from.
  */
-static bool
+static MJEvalResult
 MJEvalInnerValues(MergeJoinState *mergestate, TupleTableSlot *innerslot)
 {
 	ExprContext *econtext = mergestate->mj_InnerEContext;
-	bool		canmatch = true;
+	MJEvalResult result = MJEVAL_MATCHABLE;
 	int			i;
 	MemoryContext oldContext;
 
+	/* Check for end of inner subplan */
+	if (TupIsNull(innerslot))
+		return MJEVAL_ENDOFJOIN;
+
 	ResetExprContext(econtext);
 
 	oldContext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
@@ -334,13 +377,19 @@ MJEvalInnerValues(MergeJoinState *mergestate, TupleTableSlot *innerslot)
 
 		clause->rdatum = ExecEvalExpr(clause->rexpr, econtext,
 									  &clause->risnull, NULL);
-		if (clause->risnull)
-			canmatch = clause->notdistinct;
+		if (clause->risnull && !clause->notdistinct)
+		{
+			/* match is impossible; can we end the join early? */
+			if (i == 0 && !clause->nulls_first && !mergestate->mj_FillInner)
+				result = MJEVAL_ENDOFJOIN;
+			else if (result == MJEVAL_MATCHABLE)
+				result = MJEVAL_NONMATCHABLE;
+		}
 	}
 
 	MemoryContextSwitchTo(oldContext);
 
-	return canmatch;
+	return result;
 }
 
 /*
@@ -387,17 +436,17 @@ MJCompare(MergeJoinState *mergestate)
 				continue;
 			}
 			if (clause->nulls_first)
-				result = -1;					/* NULL "<" NOT_NULL */
+				result = -1;	/* NULL "<" NOT_NULL */
 			else
-				result = 1;						/* NULL ">" NOT_NULL */
+				result = 1;		/* NULL ">" NOT_NULL */
 			break;
 		}
 		if (clause->risnull)
 		{
 			if (clause->nulls_first)
-				result = 1;						/* NOT_NULL ">" NULL */
+				result = 1;		/* NOT_NULL ">" NULL */
 			else
-				result = -1;					/* NOT_NULL "<" NULL */
+				result = -1;	/* NOT_NULL "<" NULL */
 			break;
 		}
 
@@ -413,7 +462,7 @@ MJCompare(MergeJoinState *mergestate)
 		fresult = FunctionCallInvoke(&fcinfo);
 		if (fcinfo.isnull)
 		{
-			nulleqnull = true;					/* treat like NULL = NULL */
+			nulleqnull = true;	/* treat like NULL = NULL */
 			continue;
 		}
 		result = DatumGetInt32(fresult);
@@ -655,72 +704,63 @@ ExecMergeJoin(MergeJoinState *node)
 
 				outerTupleSlot = ExecProcNode(outerPlan);
 				node->mj_OuterTupleSlot = outerTupleSlot;
-				if (TupIsNull(outerTupleSlot))
+
+				/* Compute join values and check for unmatchability */
+				switch (MJEvalOuterValues(node))
 				{
-					MJ_printf("ExecMergeJoin: nothing in outer subplan\n");
-					if (doFillInner)
-					{
-						/*
-						 * Need to emit right-join tuples for remaining inner
-						 * tuples.	We set MatchedInner = true to force the
-						 * ENDOUTER state to advance inner.
-						 */
-						node->mj_JoinState = EXEC_MJ_ENDOUTER;
-						node->mj_MatchedInner = true;
+					case MJEVAL_MATCHABLE:
+						/* OK to go get the first inner tuple */
+						node->mj_JoinState = EXEC_MJ_INITIALIZE_INNER;
 						break;
-					}
-
-					/*
-					 * CDB: We'll read no more from inner subtree. To keep our
-					 * sibling QEs from being starved, tell source QEs not to
-					 * clog up the pipeline with our never-to-be-consumed
-					 * data.
-					 */
-					if (node->mj_squelchInner)
-						ExecSquelchNode(innerPlan);
+					case MJEVAL_NONMATCHABLE:
+						/* Stay in same state to fetch next outer tuple */
+						if (doFillOuter)
+						{
+							/*
+							 * Generate a fake join tuple with nulls for the
+							 * inner tuple, and return it if it passes the
+							 * non-join quals.
+							 */
+							TupleTableSlot *result;
 
-					/*
-					 * The memory used by child nodes might not be freed because
-					 * they are not eager free safe. However, when the merge join
-					 * is done, we can free the memory used by the child nodes.
-					 */
-					ExecEagerFreeMergeJoin(node);
+							result = MJFillOuter(node);
+							if (result)
+								return result;
+						}
+						break;
+					case MJEVAL_ENDOFJOIN:
+						/* No more outer tuples */
+						MJ_printf("ExecMergeJoin: nothing in outer subplan\n");
+						if (doFillInner)
+						{
+							/*
+							 * Need to emit right-join tuples for remaining
+							 * inner tuples. We set MatchedInner = true to
+							 * force the ENDOUTER state to advance inner.
+							 */
+							node->mj_JoinState = EXEC_MJ_ENDOUTER;
+							node->mj_MatchedInner = true;
+							break;
+						}
 
-					/* Otherwise we're done. */
-					return NULL;
-				}
-				else
-				{
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_OUTERTUPLE);
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN); 
-				}
+						/*
+						 * CDB: We'll read no more from inner subtree. To keep our
+						 * sibling QEs from being starved, tell source QEs not to
+						 * clog up the pipeline with our never-to-be-consumed
+						 * data.
+						 */
+						if (node->mj_squelchInner)
+							ExecSquelchNode(innerPlan);
 
-				/* Compute join values and check for unmatchability */
-				if (MJEvalOuterValues(node))
-				{
-					/* OK to go get the first inner tuple */
-					node->mj_JoinState = EXEC_MJ_INITIALIZE_INNER;
-				}
-				else
-				{
-					/* Stay in same state to fetch next outer tuple */
-					if (doFillOuter)
-					{
 						/*
-						 * Generate a fake join tuple with nulls for the inner
-						 * tuple, and return it if it passes the non-join
-						 * quals.
+						 * The memory used by child nodes might not be freed because
+						 * they are not eager free safe. However, when the merge join
+						 * is done, we can free the memory used by the child nodes.
 						 */
-						TupleTableSlot *result;
+						ExecEagerFreeMergeJoin(node);
 
-						result = MJFillOuter(node);
-						if (result)
-						{
-							Gpmon_M_Incr_Rows_Out(GpmonPktFromMergeJoinState(node));
-                                     	CheckSendPlanStateGpmonPkt(&node->js.ps);
-							return result;
-						}
-					}
+						/* Otherwise we're done. */
+						return NULL;
 				}
 				break;
 
@@ -729,70 +769,65 @@ ExecMergeJoin(MergeJoinState *node)
 
 				innerTupleSlot = ExecProcNode(innerPlan);
 				node->mj_InnerTupleSlot = innerTupleSlot;
-				if (TupIsNull(innerTupleSlot))
+
+				/* Compute join values and check for unmatchability */
+				switch (MJEvalInnerValues(node, innerTupleSlot))
 				{
-					MJ_printf("ExecMergeJoin: nothing in inner subplan\n");
-					if (doFillOuter)
-					{
+					case MJEVAL_MATCHABLE:
 						/*
-						 * Need to emit left-join tuples for all outer tuples,
-						 * including the one we just fetched.  We set
-						 * MatchedOuter = false to force the ENDINNER state to
-						 * emit first tuple before advancing outer.
+						 * OK, we have the initial tuples.	Begin by skipping
+						 * non-matching tuples.
 						 */
-						node->mj_JoinState = EXEC_MJ_ENDINNER;
-						node->mj_MatchedOuter = false;
+						node->mj_JoinState = EXEC_MJ_SKIP_TEST;
 						break;
-					}
-
-					/*
-					 * CDB: We'll read no more from outer subtree. To keep our
-					 * sibling QEs from being starved, tell source QEs not to
-					 * clog up the pipeline with our never-to-be-consumed
-					 * data.
-					 */
-					ExecSquelchNode(outerPlan);
-
-					ExecEagerFreeMergeJoin(node);
+					case MJEVAL_NONMATCHABLE:
+						/* Mark before advancing, if wanted */
+						if (node->mj_ExtraMarks)
+							ExecMarkPos(innerPlan);
+						/* Stay in same state to fetch next inner tuple */
+						if (doFillInner)
+						{
+							/*
+							 * Generate a fake join tuple with nulls for the
+							 * outer tuple, and return it if it passes the
+							 * non-join quals.
+							 */
+							TupleTableSlot *result;
 
-					/* Otherwise we're done. */
-					return NULL;
-				}
-				else
-				{
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_INNERTUPLE);
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN); 
-				}
+							result = MJFillInner(node);
+							if (result)
+								return result;
+						}
+						break;
+					case MJEVAL_ENDOFJOIN:
+						/* No more inner tuples */
+						MJ_printf("ExecMergeJoin: nothing in inner subplan\n");
+						if (doFillOuter)
+						{
+							/*
+							 * Need to emit left-join tuples for all outer
+							 * tuples, including the one we just fetched.  We
+							 * set MatchedOuter = false to force the ENDINNER
+							 * state to emit first tuple before advancing
+							 * outer.
+							 */
+							node->mj_JoinState = EXEC_MJ_ENDINNER;
+							node->mj_MatchedOuter = false;
+							break;
+						}
 
-				/* Compute join values and check for unmatchability */
-				if (MJEvalInnerValues(node, innerTupleSlot))
-				{
-					/*
-					 * OK, we have the initial tuples.	Begin by skipping
-					 * non-matching tuples.
-					 */
-					node->mj_JoinState = EXEC_MJ_SKIP_TEST;
-				}
-				else
-				{
-					/* Stay in same state to fetch next inner tuple */
-					if (doFillInner)
-					{
 						/*
-						 * Generate a fake join tuple with nulls for the outer
-						 * tuple, and return it if it passes the non-join
-						 * quals.
+						 * CDB: We'll read no more from outer subtree. To keep our
+						 * sibling QEs from being starved, tell source QEs not to
+						 * clog up the pipeline with our never-to-be-consumed
+						 * data.
 						 */
-						TupleTableSlot *result;
+						ExecSquelchNode(outerPlan);
 
-						result = MJFillInner(node);
-						if (result)
-						{
-							Gpmon_M_Incr_Rows_Out(GpmonPktFromMergeJoinState(node));
-                                     	CheckSendPlanStateGpmonPkt(&node->js.ps);
-							return result;
-						}
-					}
+						ExecEagerFreeMergeJoin(node);
+
+						/* Otherwise we're done. */
+						return NULL;
 				}
 				break;
 
@@ -863,8 +898,6 @@ ExecMergeJoin(MergeJoinState *node)
 						 */
 						MJ_printf("ExecMergeJoin: returning tuple\n");
 
-						Gpmon_M_Incr_Rows_Out(GpmonPktFromMergeJoinState(node));
-                                CheckSendPlanStateGpmonPkt(&node->js.ps);
 						return ExecProject(node->js.ps.ps_ProjInfo, NULL);
 					}
 				}
@@ -893,72 +926,75 @@ ExecMergeJoin(MergeJoinState *node)
 
 					result = MJFillInner(node);
 					if (result)
-					{
-						Gpmon_M_Incr_Rows_Out(GpmonPktFromMergeJoinState(node)); 
-                                CheckSendPlanStateGpmonPkt(&node->js.ps);
 						return result;
-					}
 				}
 
 				/*
 				 * now we get the next inner tuple, if any.  If there's none,
 				 * advance to next outer tuple (which may be able to join to
 				 * previously marked tuples).
+				 *
+				 * NB: must NOT do "extraMarks" here, since we may need to
+				 * return to previously marked tuples.
 				 */
 				innerTupleSlot = ExecProcNode(innerPlan);
 				node->mj_InnerTupleSlot = innerTupleSlot;
 				MJ_DEBUG_PROC_NODE(innerTupleSlot);
 				node->mj_MatchedInner = false;
 
-				if (TupIsNull(innerTupleSlot))
+				/* Compute join values and check for unmatchability */
+				switch (MJEvalInnerValues(node, innerTupleSlot))
 				{
-					node->mj_JoinState = EXEC_MJ_NEXTOUTER;
+					case MJEVAL_MATCHABLE:
+						/*
+						 * Test the new inner tuple to see if it matches
+						 * outer.
+						 *
+						 * If they do match, then we join them and move on to
+						 * the next inner tuple (EXEC_MJ_JOINTUPLES).
+						 *
+						 * If they do not match then advance to next outer
+						 * tuple.
+						 */
+						compareResult = MJCompare(node);
+						MJ_DEBUG_COMPARE(compareResult);
 
-					if (((MergeJoin*)node->js.ps.plan)->unique_outer)
-					{
-						ExecEagerFreeMergeJoin(node);
-						
-						/* we are done */
-						return NULL;
-					}
-					
-					break;
-				}
-				else
-				{
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_INNERTUPLE);
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN); 
-				}
-				
-				/*
-				 * Load up the new inner tuple's comparison values.  If we see
-				 * that it contains a NULL and hence can't match any outer
-				 * tuple, we can skip the comparison and assume the new tuple
-				 * is greater than current outer.
-				 */
-				if (!MJEvalInnerValues(node, innerTupleSlot))
-				{
-					node->mj_JoinState = EXEC_MJ_NEXTOUTER;
-					break;
-				}
+						if (compareResult == 0)
+							node->mj_JoinState = EXEC_MJ_JOINTUPLES;
+						else
+						{
+							Assert(compareResult < 0);
+							node->mj_JoinState = EXEC_MJ_NEXTOUTER;
+						}
+						break;
+					case MJEVAL_NONMATCHABLE:
+						/*
+						 * It contains a NULL and hence can't match any outer
+						 * tuple, so we can skip the comparison and assume the
+						 * new tuple is greater than current outer.
+						 */
+						node->mj_JoinState = EXEC_MJ_NEXTOUTER;
+						break;
+					case MJEVAL_ENDOFJOIN:
+						/*
+						 * No more inner tuples.  However, this might be
+						 * only effective and not physical end of inner plan,
+						 * so force mj_InnerTupleSlot to null to make sure we
+						 * don't fetch more inner tuples.  (We need this hack
+						 * because we are not transiting to a state where the
+						 * inner plan is assumed to be exhausted.)
+						 */
+						node->mj_InnerTupleSlot = NULL;
+						node->mj_JoinState = EXEC_MJ_NEXTOUTER;
 
-				/*
-				 * Test the new inner tuple to see if it matches outer.
-				 *
-				 * If they do match, then we join them and move on to the next
-				 * inner tuple (EXEC_MJ_JOINTUPLES).
-				 *
-				 * If they do not match then advance to next outer tuple.
-				 */
-				compareResult = MJCompare(node);
-				MJ_DEBUG_COMPARE(compareResult);
+						if (((MergeJoin*)node->js.ps.plan)->unique_outer)
+						{
+							ExecEagerFreeMergeJoin(node);
 
-				if (compareResult == 0)
-					node->mj_JoinState = EXEC_MJ_JOINTUPLES;
-				else
-				{
-					Assert(compareResult < 0 || ((MergeJoin*)node->js.ps.plan)->unique_outer);
-					node->mj_JoinState = EXEC_MJ_NEXTOUTER;
+							/* we are done */
+							return NULL;
+						}
+						break;
 				}
 				break;
 
@@ -1008,58 +1044,36 @@ ExecMergeJoin(MergeJoinState *node)
 				MJ_DEBUG_PROC_NODE(outerTupleSlot);
 				node->mj_MatchedOuter = false;
 
-				/*
-				 * if the outer tuple is null then we are done with the join,
-				 * unless we have inner tuples we need to null-fill.
-				 */
-				if (TupIsNull(outerTupleSlot))
-				{
-					MJ_printf("ExecMergeJoin: end of outer subplan\n");
-					innerTupleSlot = node->mj_InnerTupleSlot;
-					if (doFillInner && !TupIsNull(innerTupleSlot))
-					{
-						/*
-						 * Need to emit right-join tuples for remaining inner
-						 * tuples.
-						 */
-						node->mj_JoinState = EXEC_MJ_ENDOUTER;
-						break;
-					}
-
-					/*
-					 * CDB: We'll read no more from inner subtree. To keep our
-					 * sibling QEs from being starved, tell source QEs not to
-					 * clog up the pipeline with our never-to-be-consumed
-					 * data.
-					 */
-					if (!TupIsNull(innerTupleSlot) && node->mj_squelchInner)
-						ExecSquelchNode(innerPlan);
-
-					ExecEagerFreeMergeJoin(node);
-
-					/* Otherwise we're done. */
-					return NULL;
-				}
-				else
-				{
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_OUTERTUPLE);
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN); 
-				}
-
 				/* Compute join values and check for unmatchability */
-				if (MJEvalOuterValues(node))
-				{
-					if (((MergeJoin*)node->js.ps.plan)->unique_outer)
-						/* The current innerTuple will match with this outerTuple.*/
-						node->mj_JoinState = EXEC_MJ_JOINTUPLES;
-					else
-						/* Go test the new tuple against the marked tuple */
-						node->mj_JoinState = EXEC_MJ_TESTOUTER;
-				}
-				else
+				switch (MJEvalOuterValues(node))
 				{
-					/* Can't match, so fetch next outer tuple */
-					node->mj_JoinState = EXEC_MJ_NEXTOUTER;
+					case MJEVAL_MATCHABLE:
+						if (((MergeJoin*)node->js.ps.plan)->unique_outer)
+							/* The current innerTuple will match with this outerTuple.*/
+							node->mj_JoinState = EXEC_MJ_JOINTUPLES;
+						else
+							/* Go test the new tuple against the marked tuple */
+							node->mj_JoinState = EXEC_MJ_TESTOUTER;
+						break;
+					case MJEVAL_NONMATCHABLE:
+						/* Can't match, so fetch next outer tuple */
+						node->mj_JoinState = EXEC_MJ_NEXTOUTER;
+						break;
+					case MJEVAL_ENDOFJOIN:
+						/* No more outer tuples */
+						MJ_printf("ExecMergeJoin: end of outer subplan\n");
+						innerTupleSlot = node->mj_InnerTupleSlot;
+						if (doFillInner && !TupIsNull(innerTupleSlot))
+						{
+							/*
+							 * Need to emit right-join tuples for remaining
+							 * inner tuples.
+							 */
+							node->mj_JoinState = EXEC_MJ_ENDOUTER;
+							break;
+						}
+						/* Otherwise we're done. */
+						return NULL;
 				}
 				break;
 
@@ -1156,51 +1170,51 @@ ExecMergeJoin(MergeJoinState *node)
 					 *	larger than our marked inner tuples.  So we need not
 					 *	revisit any of the marked tuples but can proceed to
 					 *	look for a match to the current inner.	If there's
-					 *	no more inners, we are done.
+					 *	no more inners, no more matches are possible.
 					 * ----------------
 					 */
 					if (compareResult <= 0 && !((MergeJoin*)node->js.ps.plan)->unique_outer)
 						insist_log(false, "Mergejoin: compareResult > 0, bad plan ?");
 					innerTupleSlot = node->mj_InnerTupleSlot;
-					if (TupIsNull(innerTupleSlot))
+
+					/* reload comparison data for current inner */
+					switch (MJEvalInnerValues(node, innerTupleSlot))
 					{
-						if (doFillOuter)
-						{
+						case MJEVAL_MATCHABLE:
+							/* proceed to compare it to the current outer */
+							node->mj_JoinState = EXEC_MJ_SKIP_TEST;
+							break;
+						case MJEVAL_NONMATCHABLE:
 							/*
-							 * Need to emit left-join tuples for remaining
-							 * outer tuples.
+							 * current inner can't possibly match any outer;
+							 * better to advance the inner scan than the outer.
 							 */
-							node->mj_JoinState = EXEC_MJ_ENDINNER;
+							node->mj_JoinState = EXEC_MJ_SKIPINNER_ADVANCE;
 							break;
-						}
-
-						/*
-						 * CDB: We'll read no more from outer subtree. To keep
-						 * our sibling QEs from being starved, tell source QEs
-						 * not to clog up the pipeline with our
-						 * never-to-be-consumed data.
-						 */
-						ExecSquelchNode(outerPlan);
+						case MJEVAL_ENDOFJOIN:
+							/* No more inner tuples */
+							if (doFillOuter)
+							{
+								/*
+								 * Need to emit left-join tuples for remaining
+								 * outer tuples.
+								 */
+								node->mj_JoinState = EXEC_MJ_ENDINNER;
+								break;
+							}
 
-						ExecEagerFreeMergeJoin(node);
+							/*
+							 * CDB: We'll read no more from outer subtree. To keep
+							 * our sibling QEs from being starved, tell source QEs
+							 * not to clog up the pipeline with our
+							 * never-to-be-consumed data.
+							 */
+							ExecSquelchNode(outerPlan);
 
-						/* Otherwise we're done. */
-						return NULL;
-					}
+							ExecEagerFreeMergeJoin(node);
 
-					/* reload comparison data for current inner */
-					if (MJEvalInnerValues(node, innerTupleSlot))
-					{
-						/* proceed to compare it to the current outer */
-						node->mj_JoinState = EXEC_MJ_SKIP_TEST;
-					}
-					else
-					{
-						/*
-						 * current inner can't possibly match any outer;
-						 * better to advance the inner scan than the outer.
-						 */
-						node->mj_JoinState = EXEC_MJ_SKIPINNER_ADVANCE;
+							/* Otherwise we're done. */
+							return NULL;
 					}
 				}
 				break;
@@ -1264,6 +1278,9 @@ ExecMergeJoin(MergeJoinState *node)
 				break;
 
 				/*
+				 * SKIPOUTER_ADVANCE: advance over an outer tuple that is
+				 * known not to join to any inner tuple.
+				 *
 				 * Before advancing, we check to see if we must emit an
 				 * outer-join fill tuple for this outer tuple.
 				 */
@@ -1282,11 +1299,7 @@ ExecMergeJoin(MergeJoinState *node)
 
 					result = MJFillOuter(node);
 					if (result)
-					{
-						Gpmon_M_Incr_Rows_Out(GpmonPktFromMergeJoinState(node)); 
-                               	CheckSendPlanStateGpmonPkt(&node->js.ps);
 						return result;
-					}
 				}
 
 				/*
@@ -1297,58 +1310,50 @@ ExecMergeJoin(MergeJoinState *node)
 				MJ_DEBUG_PROC_NODE(outerTupleSlot);
 				node->mj_MatchedOuter = false;
 
-				/*
-				 * if the outer tuple is null then we are done with the join,
-				 * unless we have inner tuples we need to null-fill.
-				 */
-				if (TupIsNull(outerTupleSlot))
+				/* Compute join values and check for unmatchability */
+				switch (MJEvalOuterValues(node))
 				{
-					MJ_printf("ExecMergeJoin: end of outer subplan\n");
-					innerTupleSlot = node->mj_InnerTupleSlot;
-					if (doFillInner && !TupIsNull(innerTupleSlot))
-					{
+					case MJEVAL_MATCHABLE:
+						/* Go test the new tuple against the current inner */
+						node->mj_JoinState = EXEC_MJ_SKIP_TEST;
+						break;
+					case MJEVAL_NONMATCHABLE:
+						/* Can't match, so fetch next outer tuple */
+						node->mj_JoinState = EXEC_MJ_SKIPOUTER_ADVANCE;
+						break;
+					case MJEVAL_ENDOFJOIN:
+						/* No more outer tuples */
+						MJ_printf("ExecMergeJoin: end of outer subplan\n");
+						innerTupleSlot = node->mj_InnerTupleSlot;
+						if (doFillInner && !TupIsNull(innerTupleSlot))
+						{
+							/*
+							 * Need to emit right-join tuples for remaining
+							 * inner tuples.
+							 */
+							node->mj_JoinState = EXEC_MJ_ENDOUTER;
+							break;
+						}
 						/*
-						 * Need to emit right-join tuples for remaining inner
-						 * tuples.
+						 * CDB: We'll read no more from inner subtree. To keep our
+						 * sibling QEs from being starved, tell source QEs not to
+						 * clog up the pipeline with our never-to-be-consumed
+						 * data.
 						 */
-						node->mj_JoinState = EXEC_MJ_ENDOUTER;
-						break;
-					}
-
-					/*
-					 * CDB: We'll read no more from inner subtree. To keep our
-					 * sibling QEs from being starved, tell source QEs not to
-					 * clog up the pipeline with our never-to-be-consumed
-					 * data.
-					 */
-					if (!TupIsNull(innerTupleSlot) && node->mj_squelchInner)
-						ExecSquelchNode(innerPlan);
+						if (!TupIsNull(innerTupleSlot) && node->mj_squelchInner)
+							ExecSquelchNode(innerPlan);
 
-					ExecEagerFreeMergeJoin(node);
+						ExecEagerFreeMergeJoin(node);
 
-					/* Otherwise we're done. */
-					return NULL;
-				}
-				else
-				{
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_OUTERTUPLE);
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN); 
-				}
-				
-				/* Compute join values and check for unmatchability */
-				if (MJEvalOuterValues(node))
-				{
-					/* Go test the new tuple against the current inner */
-					node->mj_JoinState = EXEC_MJ_SKIP_TEST;
-				}
-				else
-				{
-					/* Can't match, so fetch next outer tuple */
-					node->mj_JoinState = EXEC_MJ_SKIPOUTER_ADVANCE;
+						/* Otherwise we're done. */
+						return NULL;
 				}
 				break;
 
 				/*
+				 * SKIPINNER_ADVANCE: advance over an inner tuple that is
+				 * known not to join to any outer tuple.
+				 *
 				 * Before advancing, we check to see if we must emit an
 				 * outer-join fill tuple for this inner tuple.
 				 */
@@ -1367,13 +1372,13 @@ ExecMergeJoin(MergeJoinState *node)
 
 					result = MJFillInner(node);
 					if (result)
-					{
-						Gpmon_M_Incr_Rows_Out(GpmonPktFromMergeJoinState(node));
-                              	CheckSendPlanStateGpmonPkt(&node->js.ps);
 						return result;
-					}
 				}
 
+				/* Mark before advancing, if wanted */
+				if (node->mj_ExtraMarks)
+					ExecMarkPos(innerPlan);
+
 				/*
 				 * now we get the next inner tuple, if any
 				 */
@@ -1382,57 +1387,35 @@ ExecMergeJoin(MergeJoinState *node)
 				MJ_DEBUG_PROC_NODE(innerTupleSlot);
 				node->mj_MatchedInner = false;
 
-				/*
-				 * if the inner tuple is null then we are done with the join,
-				 * unless we have outer tuples we need to null-fill.
-				 */
-				if (TupIsNull(innerTupleSlot))
+				/* Compute join values and check for unmatchability */
+				switch (MJEvalInnerValues(node, innerTupleSlot))
 				{
-					MJ_printf("ExecMergeJoin: end of inner subplan\n");
-					outerTupleSlot = node->mj_OuterTupleSlot;
-					if (doFillOuter && !TupIsNull(outerTupleSlot))
-					{
+					case MJEVAL_MATCHABLE:
+						/* proceed to compare it to the current outer */
+						node->mj_JoinState = EXEC_MJ_SKIP_TEST;
+						break;
+					case MJEVAL_NONMATCHABLE:
 						/*
-						 * Need to emit left-join tuples for remaining outer
-						 * tuples.
+						 * current inner can't possibly match any outer;
+						 * better to advance the inner scan than the outer.
 						 */
-						node->mj_JoinState = EXEC_MJ_ENDINNER;
+						node->mj_JoinState = EXEC_MJ_SKIPINNER_ADVANCE;
 						break;
-					}
-
-					/*
-					 * CDB: We'll read no more from outer subtree. To keep our
-					 * sibling QEs from being starved, tell source QEs not to
-					 * clog up the pipeline with our never-to-be-consumed
-					 * data.
-					 */
-					if (!TupIsNull(outerTupleSlot))
-						ExecSquelchNode(outerPlan);
-
-					ExecEagerFreeMergeJoin(node);
-
-					/* Otherwise we're done. */
-					return NULL;
-				}
-				else
-				{
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_INNERTUPLE);
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN); 
-				}
-
-				/* Compute join values and check for unmatchability */
-				if (MJEvalInnerValues(node, innerTupleSlot))
-				{
-					/* proceed to compare it to the current outer */
-					node->mj_JoinState = EXEC_MJ_SKIP_TEST;
-				}
-				else
-				{
-					/*
-					 * current inner can't possibly match any outer; better to
-					 * advance the inner scan than the outer.
-					 */
-					node->mj_JoinState = EXEC_MJ_SKIPINNER_ADVANCE;
+					case MJEVAL_ENDOFJOIN:
+						/* No more inner tuples */
+						MJ_printf("ExecMergeJoin: end of inner subplan\n");
+						outerTupleSlot = node->mj_OuterTupleSlot;
+						if (doFillOuter && !TupIsNull(outerTupleSlot))
+						{
+							/*
+							 * Need to emit left-join tuples for remaining
+							 * outer tuples.
+							 */
+							node->mj_JoinState = EXEC_MJ_ENDINNER;
+							break;
+						}
+						/* Otherwise we're done. */
+						return NULL;
 				}
 				break;
 
@@ -1458,13 +1441,13 @@ ExecMergeJoin(MergeJoinState *node)
 
 					result = MJFillInner(node);
 					if (result)
-					{
-						Gpmon_M_Incr_Rows_Out(GpmonPktFromMergeJoinState(node));
-                                CheckSendPlanStateGpmonPkt(&node->js.ps);
 						return result;
-					}
 				}
 
+				/* Mark before advancing, if wanted */
+				if (node->mj_ExtraMarks)
+					ExecMarkPos(innerPlan);
+
 				/*
 				 * now we get the next inner tuple, if any
 				 */
@@ -1534,11 +1517,6 @@ ExecMergeJoin(MergeJoinState *node)
 
 					return NULL;
 				}
-				else
-				{
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_MERGEJOIN_OUTERTUPLE);
-					Gpmon_M_Incr(GpmonPktFromMergeJoinState(node), GPMON_QEXEC_M_ROWSIN); 
-				}
 
 				/* Else remain in ENDINNER state and process next tuple. */
 				break;
@@ -1621,6 +1599,22 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 	innerPlanState(mergestate) = ExecInitNode(innerPlan(node), estate,
 											  eflags | markflag);
 
+	/*
+	 * For certain types of inner child nodes, it is advantageous to issue
+	 * MARK every time we advance past an inner tuple we will never return to.
+	 * For other types, MARK on a tuple we cannot return to is a waste of
+	 * cycles.	Detect which case applies and set mj_ExtraMarks if we want to
+	 * issue "unnecessary" MARK calls.
+	 *
+	 * Currently, only Material wants the extra MARKs, and it will be helpful
+	 * only if eflags doesn't specify REWIND.
+	 */
+	if (IsA(innerPlan(node), Material) &&
+		(eflags & EXEC_FLAG_REWIND) == 0)
+		mergestate->mj_ExtraMarks = true;
+	else
+		mergestate->mj_ExtraMarks = false;
+
 #define MERGEJOIN_NSLOTS 4
 
 	/*
diff --git a/src/backend/executor/nodeMotion.c b/src/backend/executor/nodeMotion.c
index f1270a5c4194..803f737e4bd2 100644
--- a/src/backend/executor/nodeMotion.c
+++ b/src/backend/executor/nodeMotion.c
@@ -919,8 +919,6 @@ ExecInitMotion(Motion * node, EState *estate, int eflags)
     Slice      *recvSlice = NULL;
     SliceTable *sliceTable = estate->es_sliceTable;
 
-	int			parentSliceIndex = estate->currentSliceIdInPlan;
-
 #ifdef CDB_MOTION_DEBUG
 	int			i;
 #endif
@@ -952,45 +950,9 @@ ExecInitMotion(Motion * node, EState *estate, int eflags)
 	if (Gp_role == GP_ROLE_DISPATCH)
 	{
 		MemoryContext   oldcxt = MemoryContextSwitchTo(estate->es_query_cxt);
-        Flow           *sendFlow;
-
-        /* Top node of subplan should have a Flow node. */
-        Insist(node->plan.lefttree && node->plan.lefttree->flow);
-        sendFlow = node->plan.lefttree->flow;
-
-        /* Sending slice table entry hasn't been filled in yet. */
-        Assert(sendSlice->rootIndex == -1);
-		Assert(sendSlice->gangSize == 0);
 
 		/* Look up the receiving (parent) gang's slice table entry. */
-		recvSlice = (Slice *)list_nth(sliceTable->slices, parentSliceIndex);
-
-		Assert(IsA(recvSlice, Slice));
-		Assert(recvSlice->sliceIndex == parentSliceIndex);
-        Assert(recvSlice->rootIndex == 0 ||
-               (recvSlice->rootIndex > sliceTable->nMotions &&
-                recvSlice->rootIndex < list_length(sliceTable->slices)));
-
-		/* Sending slice become a children of recv slice */
-		recvSlice->children = lappend_int(recvSlice->children, sendSlice->sliceIndex);
-		sendSlice->parentIndex = parentSliceIndex;
-        sendSlice->rootIndex = recvSlice->rootIndex;
-
-		/* The gang beneath a Motion will be a reader. */
-		if (sendFlow->flotype != FLOW_SINGLETON)
-		{
-			sendSlice->gangSize = getgpsegmentCount();
-			sendSlice->gangType = GANGTYPE_PRIMARY_READER;
-		}
-		else
-		{
-			sendSlice->gangSize = 1;
-			sendSlice->gangType =
-					sendFlow->segindex == -1 ?
-							GANGTYPE_ENTRYDB_READER : GANGTYPE_SINGLETON_READER;
-		}
-
-        sendSlice->numGangMembersToBeActive = sliceCalculateNumSendingProcesses(sendSlice);
+		recvSlice = (Slice *)list_nth(sliceTable->slices, sendSlice->parentIndex);
 
 		if (node->motionType == MOTIONTYPE_FIXED && node->numOutputSegs == 1)
 		{
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index 087189d58cd3..a82d8a281de5 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeNestloop.c,v 1.45 2007/02/02 00:07:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeNestloop.c,v 1.46 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c
index b58db624d58c..3d0a13292e80 100644
--- a/src/backend/executor/nodeResult.c
+++ b/src/backend/executor/nodeResult.c
@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeResult.c,v 1.39 2007/02/16 03:49:04 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeResult.c,v 1.42 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -95,7 +95,6 @@ static TupleTableSlot *NextInputSlot(ResultState *node)
 
 		node->ps.ps_OuterTupleSlot = candidateInputSlot;
 		econtext->ecxt_outertuple = candidateInputSlot;
-		econtext->ecxt_scantuple = candidateInputSlot;
 
 		/**
 		 * Extract out qual in case result node is also performing filtering.
@@ -194,7 +193,6 @@ ExecResult(ResultState *node)
 
 			node->ps.ps_OuterTupleSlot = inputSlot;
 			econtext->ecxt_outertuple = inputSlot;
-			econtext->ecxt_scantuple = inputSlot;
 
 			ExprDoneCond isDone;
 
@@ -480,9 +478,9 @@ ExecReScanResult(ResultState *node, ExprContext *exprCtxt)
 
 	/*
 	 * If chgParam of subnode is not null then plan will be re-scanned by
-	 * first ExecProcNode.  However, if caller is passing us an exprCtxt
-	 * then forcibly rescan the subnode now, so that we can pass the
-	 * exprCtxt down to the subnode (needed for gated indexscan).
+	 * first ExecProcNode.	However, if caller is passing us an exprCtxt then
+	 * forcibly rescan the subnode now, so that we can pass the exprCtxt down
+	 * to the subnode (needed for gated indexscan).
 	 */
 	if (node->ps.lefttree &&
 		(node->ps.lefttree->chgParam == NULL || exprCtxt != NULL))
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 6ef8932d6af0..abb00ec050a0 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeSeqscan.c,v 1.63 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeSeqscan.c,v 1.64 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c
index ab5c47f45d84..278453671535 100644
--- a/src/backend/executor/nodeSetOp.c
+++ b/src/backend/executor/nodeSetOp.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.24 2007/01/10 18:06:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.25 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeShareInputScan.c b/src/backend/executor/nodeShareInputScan.c
index c3b93edfc464..e4255e307403 100644
--- a/src/backend/executor/nodeShareInputScan.c
+++ b/src/backend/executor/nodeShareInputScan.c
@@ -274,8 +274,8 @@ ExecInitShareInputScan(ShareInputScan *node, EState *estate, int eflags)
 	outerPlanState(sisstate) = ExecInitNode(outerPlan, estate, eflags);
 
 	sisstate->ss.ps.targetlist = (List *) 
-		ExecInitExpr((Expr *) node->plan.targetlist, (PlanState *) sisstate);
-	Assert(node->plan.qual == NULL);
+		ExecInitExpr((Expr *) node->scan.plan.targetlist, (PlanState *) sisstate);
+	Assert(node->scan.plan.qual == NULL);
 	sisstate->ss.ps.qual = NULL;
 
 	/* Misc initialization 
@@ -298,7 +298,7 @@ ExecInitShareInputScan(ShareInputScan *node, EState *estate, int eflags)
 		if (!ExecContextForcesOids(&sisstate->ss.ps, &hasoid))
 			hasoid = false;
 
-		tupDesc = ExecTypeFromTL(node->plan.targetlist, hasoid);
+		tupDesc = ExecTypeFromTL(node->scan.plan.targetlist, hasoid);
 	}
 		
 	ExecAssignScanType(&sisstate->ss, tupDesc);
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 56e50b3549a4..cdb4e354bfc7 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeSort.c,v 1.60 2007/01/09 02:14:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeSort.c,v 1.62 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -167,10 +167,14 @@ ExecSort(SortState *node)
 
 		if(gp_enable_mk_sort)
 		{
+			if (node->bounded)
+				tuplesort_set_bound_mk(tuplesortstate_mk, node->bound);
 			node->tuplesortstate->sortstore_mk = tuplesortstate_mk;
 		}
 		else
 		{
+			if (node->bounded)
+				tuplesort_set_bound(tuplesortstate, node->bound);
 			node->tuplesortstate->sortstore = tuplesortstate;
 		}
 
@@ -310,6 +314,8 @@ ExecSort(SortState *node)
 		 * finally set the sorted flag to true
 		 */
 		node->sort_Done = true;
+		node->bounded_Done = node->bounded;
+		node->bound_Done = node->bound;
 		SO1_printf("ExecSort: %s\n", "sorting done");
 
 		/* for share input, do not need to return any tuple */
@@ -399,6 +405,7 @@ ExecInitSort(Sort *node, EState *estate, int eflags)
 	if(node->share_type != SHARE_NOTSHARED) 
 		sortstate->randomAccess = true;
 
+	sortstate->bounded = false;
 	sortstate->sort_Done = false;
 	sortstate->tuplesortstate = palloc0(sizeof(GenericTupStore));
 	sortstate->share_lk_ctxt = NULL;
@@ -612,11 +619,14 @@ ExecReScanSort(SortState *node, ExprContext *exprCtxt)
 
 	/*
 	 * If subnode is to be rescanned then we forget previous sort results; we
-	 * have to re-read the subplan and re-sort.
+	 * have to re-read the subplan and re-sort.  Also must re-sort if the
+	 * bounded-sort parameters changed or we didn't select randomAccess.
 	 *
 	 * Otherwise we can just rewind and rescan the sorted output.
 	 */
 	if (((PlanState *) node)->lefttree->chgParam != NULL ||
+		node->bounded != node->bounded_Done ||
+		node->bound != node->bound_Done ||
 		!node->randomAccess ||
 		(NULL == node->tuplesortstate->sortstore_mk && NULL == node->tuplesortstate->sortstore))
 	{
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 5f12d0eef687..ef6e9b49891c 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.85 2007/02/06 02:59:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.92.2.1 2010/07/28 04:51:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
  *	 INTERFACE ROUTINES
  *		ExecSubPlan  - process a subselect
  *		ExecInitSubPlan - initialize a subselect
- *		ExecEndSubPlan	- shut down a subselect
  */
 #include "postgres.h"
 
@@ -48,8 +47,9 @@ static Datum ExecHashSubPlan(SubPlanState *node,
 static Datum ExecScanSubPlan(SubPlanState *node,
 				ExprContext *econtext,
 				bool *isNull);
-static void buildSubPlanHash(SubPlanState *node, ExprContext * econtext);
-static bool findPartialMatch(TupleHashTable hashtable, TupleTableSlot *slot);
+static void buildSubPlanHash(SubPlanState *node, ExprContext *econtext);
+static bool findPartialMatch(TupleHashTable hashtable, TupleTableSlot *slot,
+				 FmgrInfo *eqfunctions);
 static bool slotAllNulls(TupleTableSlot *slot);
 static bool slotNoNulls(TupleTableSlot *slot);
 
@@ -65,6 +65,7 @@ ExecSubPlan(SubPlanState *node,
 			ExprDoneCond *isDone)
 {
 	SubPlan    *subplan = (SubPlan *) node->xprstate.expr;
+	Datum		result;
 
 	/* Set default values for result flags: non-null, not a set result */
 	*isNull = false;
@@ -73,10 +74,17 @@ ExecSubPlan(SubPlanState *node,
 
 	insist_log(subplan->setParam == NIL, "cannot set parent parameters from subquery");
 
+	/* Remember that we're recursing into a sub-plan */
+	node->planstate->state->currentSubplanLevel++;
+
 	if (subplan->useHashTable)
-		return ExecHashSubPlan(node, econtext, isNull);
+		result = ExecHashSubPlan(node, econtext, isNull);
 	else
-		return ExecScanSubPlan(node, econtext, isNull);
+		result = ExecScanSubPlan(node, econtext, isNull);
+
+	node->planstate->state->currentSubplanLevel--;
+
+	return result;
 }
 
 /*
@@ -151,7 +159,7 @@ ExecHashSubPlan(SubPlanState *node,
 			return BoolGetDatum(true);
 		}
 		if (node->havenullrows &&
-			findPartialMatch(node->hashnulls, slot))
+			findPartialMatch(node->hashnulls, slot, node->cur_eq_funcs))
 		{
 			ExecClearTuple(slot);
 			*isNull = true;
@@ -184,14 +192,14 @@ ExecHashSubPlan(SubPlanState *node,
 	}
 	/* Scan partly-null table first, since more likely to get a match */
 	if (node->havenullrows &&
-		findPartialMatch(node->hashnulls, slot))
+		findPartialMatch(node->hashnulls, slot, node->cur_eq_funcs))
 	{
 		ExecClearTuple(slot);
 		*isNull = true;
 		return BoolGetDatum(false);
 	}
 	if (node->havehashrows &&
-		findPartialMatch(node->hashtable, slot))
+		findPartialMatch(node->hashtable, slot, node->cur_eq_funcs))
 	{
 		ExecClearTuple(slot);
 		*isNull = true;
@@ -225,7 +233,7 @@ ExecScanSubPlan(SubPlanState *node,
 	 * to the per-query context for manipulating the child plan's chgParam,
 	 * calling ExecProcNode on it, etc.
 	 */
-	oldcontext = MemoryContextSwitchTo(node->sub_estate->es_query_cxt);
+	oldcontext = MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 
 	/*
 	 * Set Params of this plan from parent plan correlation values. (Any
@@ -319,7 +327,7 @@ ExecScanSubPlan(SubPlanState *node,
 				pfree(node->curTuple);
 
 			node->curTuple = ExecCopySlotMemTuple(slot);
-			MemoryContextSwitchTo(node->sub_estate->es_query_cxt);
+			MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 
 			result = memtuple_getattr(node->curTuple, slot->tts_mt_bind, 1, isNull);
 			/* keep scanning subplan to make sure there's only one tuple */
@@ -401,29 +409,30 @@ ExecScanSubPlan(SubPlanState *node,
 		}
 	}
 
-	if (!found)
+	MemoryContextSwitchTo(oldcontext);
+
+	if (subLinkType == ARRAY_SUBLINK)
+	{
+		/* We return the result in the caller's context */
+		if (astate != NULL)
+			result = makeArrayResult(astate, oldcontext);
+		else
+			result = PointerGetDatum(construct_empty_array(subplan->firstColType));
+	}
+	else if (!found)
 	{
 		/*
 		 * deal with empty subplan result.	result/isNull were previously
-		 * initialized correctly for all sublink types except EXPR, ARRAY, and
+		 * initialized correctly for all sublink types except EXPR and
 		 * ROWCOMPARE; for those, return NULL.
 		 */
 		if (subLinkType == EXPR_SUBLINK ||
-			subLinkType == ARRAY_SUBLINK ||
 			subLinkType == ROWCOMPARE_SUBLINK)
 		{
 			result = (Datum) 0;
 			*isNull = true;
 		}
 	}
-	else if (subLinkType == ARRAY_SUBLINK)
-	{
-		Assert(astate != NULL);
-		/* We return the result in the caller's context */
-		result = makeArrayResult(astate, oldcontext);
-	}
-
-	MemoryContextSwitchTo(oldcontext);
 
 	return result;
 }
@@ -496,9 +505,9 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext)
 
 	/*
 	 * We are probably in a short-lived expression-evaluation context. Switch
-	 * to the child plan's per-query context for calling ExecProcNode.
+	 * to the per-query context for manipulating the child plan.
 	 */
-	oldcontext = MemoryContextSwitchTo(node->sub_estate->es_query_cxt);
+	oldcontext = MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 
 	/*
 	 * Reset subplan to start.
@@ -550,7 +559,7 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext)
 
 		/*
 		 * Reset innerecontext after each inner tuple to free any memory used
-		 * in hash computation or comparison routines.
+		 * during ExecProject.
 		 */
 		ResetExprContext(innerecontext);
 	}
@@ -574,9 +583,13 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext)
  * We have to scan the whole hashtable; we can't usefully use hashkeys
  * to guide probing, since we might get partial matches on tuples with
  * hashkeys quite unrelated to what we'd get from the given tuple.
+ *
+ * Caller must provide the equality functions to use, since in cross-type
+ * cases these are different from the hashtable's internal functions.
  */
 static bool
-findPartialMatch(TupleHashTable hashtable, TupleTableSlot *slot)
+findPartialMatch(TupleHashTable hashtable, TupleTableSlot *slot,
+				 FmgrInfo *eqfunctions)
 {
 	int			numCols = hashtable->numCols;
 	AttrNumber *keyColIdx = hashtable->keyColIdx;
@@ -589,7 +602,7 @@ findPartialMatch(TupleHashTable hashtable, TupleTableSlot *slot)
 		ExecStoreMinimalTuple(entry->firstTuple, hashtable->tableslot, false);
 		if (!execTuplesUnequal(slot, hashtable->tableslot,
 							   numCols, keyColIdx,
-							   hashtable->cur_eq_funcs,
+							   eqfunctions,
 							   hashtable->tempcxt))
 		{
 			TermTupleHashIterator(&hashiter);
@@ -643,81 +656,47 @@ slotNoNulls(TupleTableSlot *slot)
 /* ----------------------------------------------------------------
  *		ExecInitSubPlan
  *
- * Note: the eflags are those passed to the parent plan node of this
- * subplan; they don't directly describe the execution conditions the
- * subplan will face.
+ * Create a SubPlanState for a SubPlan; this is the SubPlan-specific part
+ * of ExecInitExpr().  We split it out so that it can be used for InitPlans
+ * as well as regular SubPlans.  Note that we don't link the SubPlan into
+ * the parent's subPlan list, because that shouldn't happen for InitPlans.
+ * Instead, ExecInitExpr() does that one part.
  * ----------------------------------------------------------------
  */
-void
-ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
+SubPlanState *
+ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
 {
-	SubPlan    *subplan = (SubPlan *) node->xprstate.expr;
-	EState	   *sp_estate;
+	SubPlanState *sstate = makeNode(SubPlanState);
+	EState	   *estate = parent->state;
 
-	/*
-	 * initialize my state
-	 */
-	node->needShutdown = false;
-	node->curTuple = NULL;
-	node->projLeft = NULL;
-	node->projRight = NULL;
-	node->hashtable = NULL;
-	node->hashnulls = NULL;
-	node->hashtablecxt = NULL;
-	node->hashtempcxt = NULL;
-	node->innerecontext = NULL;
-	node->keyColIdx = NULL;
-	node->tab_hash_funcs = NULL;
-	node->tab_eq_funcs = NULL;
-	node->lhs_hash_funcs = NULL;
-	node->cur_eq_funcs = NULL;
+	sstate->xprstate.evalfunc = (ExprStateEvalFunc) ExecSubPlan;
+	sstate->xprstate.expr = (Expr *) subplan;
 
-	/*
-	 * create an EState for the subplan
-	 *
-	 * The subquery needs its own EState because it has its own rangetable. It
-	 * shares our Param ID space and es_query_cxt, however.  XXX if rangetable
-	 * access were done differently, the subquery could share our EState,
-	 * which would eliminate some thrashing about in this module...
-	 */
-	sp_estate = CreateSubExecutorState(estate);
-	node->sub_estate = sp_estate;
-
-	sp_estate->es_range_table = estate->es_range_table;
-	sp_estate->es_plannedstmt = estate->es_plannedstmt;
-	sp_estate->es_param_list_info = estate->es_param_list_info;
-	sp_estate->es_param_exec_vals = estate->es_param_exec_vals;
-	sp_estate->es_tupleTable = NIL;
-	sp_estate->es_snapshot = estate->es_snapshot;
-	sp_estate->es_crosscheck_snapshot = estate->es_crosscheck_snapshot;
-	sp_estate->es_instrument = estate->es_instrument;
-
-    sp_estate->es_sliceTable = estate->es_sliceTable;
-	sp_estate->currentSliceIdInPlan = estate->currentSliceIdInPlan;
-	sp_estate->currentExecutingSliceId = estate->currentExecutingSliceId;
-	sp_estate->rootSliceId = estate->currentExecutingSliceId;
-	sp_estate->motionlayer_context = estate->motionlayer_context;
-	sp_estate->es_sharenode = estate->es_sharenode;
+	/* Link the SubPlanState to already-initialized subplan */
+	sstate->planstate = (PlanState *) list_nth(estate->es_subplanstates,
+											   subplan->plan_id - 1);
+
+	/* Initialize subexpressions */
+	sstate->testexpr = ExecInitExpr((Expr *) subplan->testexpr, parent);
+	sstate->args = (List *) ExecInitExpr((Expr *) subplan->args, parent);
 
 	/*
-	 * Start up the subplan (this is a very cut-down form of InitPlan())
-	 *
-	 * The subplan will never need to do BACKWARD scan or MARK/RESTORE.
-	 *
-	 * We set the REWIND flag to notify the subplan that it is likely to be
-	 * rescanned, and it must delay eagerfree.
+	 * initialize my state
 	 */
-	eflags &= EXEC_FLAG_EXPLAIN_ONLY;
-	eflags |= EXEC_FLAG_REWIND;
-
-	Plan *subplanplan = exec_subplan_get_plan(estate->es_plannedstmt, subplan);
-	Assert(subplanplan);
-
-	Assert(node->planstate == NULL);
-
-	node->planstate = ExecInitNode(subplanplan, sp_estate, eflags);
-
-	node->needShutdown = true;	/* now we need to shutdown the subplan */
+	sstate->curTuple = NULL;
+	sstate->curArray = PointerGetDatum(NULL);
+	sstate->projLeft = NULL;
+	sstate->projRight = NULL;
+	sstate->hashtable = NULL;
+	sstate->hashnulls = NULL;
+	sstate->hashtablecxt = NULL;
+	sstate->hashtempcxt = NULL;
+	sstate->innerecontext = NULL;
+	sstate->keyColIdx = NULL;
+	sstate->tab_hash_funcs = NULL;
+	sstate->tab_eq_funcs = NULL;
+	sstate->lhs_hash_funcs = NULL;
+	sstate->cur_eq_funcs = NULL;
 
 	/*
 	 * If this plan is un-correlated or undirect correlated one and want to
@@ -756,7 +735,7 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
 				 * To locate the value of this pre-evaluated parameter, we need to find
 				 * its location in the external parameter list.
 				 */
-				extParamIndex = paramInfo->numParams - estate->es_plannedstmt->nCrossLevelParams + paramid;
+				extParamIndex = paramInfo->numParams - estate->es_plannedstmt->nParamExec + paramid;
 
 				prmExt = &paramInfo->params[extParamIndex];
 
@@ -777,7 +756,7 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
 			}
 			else
 			{
-				prmExec->execPlan = node;
+				prmExec->execPlan = sstate;
 			}
 		}
 	}
@@ -800,26 +779,26 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
 		ListCell   *l;
 
 		/* We need a memory context to hold the hash table(s) */
-		node->hashtablecxt =
+		sstate->hashtablecxt =
 			AllocSetContextCreate(CurrentMemoryContext,
 								  "Subplan HashTable Context",
 								  ALLOCSET_DEFAULT_MINSIZE,
 								  ALLOCSET_DEFAULT_INITSIZE,
 								  ALLOCSET_DEFAULT_MAXSIZE);
 		/* and a small one for the hash tables to use as temp storage */
-		node->hashtempcxt =
+		sstate->hashtempcxt =
 			AllocSetContextCreate(CurrentMemoryContext,
 								  "Subplan HashTable Temp Context",
 								  ALLOCSET_SMALL_MINSIZE,
 								  ALLOCSET_SMALL_INITSIZE,
 								  ALLOCSET_SMALL_MAXSIZE);
 		/* and a short-lived exprcontext for function evaluation */
-		node->innerecontext = CreateExprContext(estate);
+		sstate->innerecontext = CreateExprContext(estate);
 		/* Silly little array of column numbers 1..n */
 		ncols = list_length(subplan->paramIds);
-		node->keyColIdx = (AttrNumber *) palloc(ncols * sizeof(AttrNumber));
+		sstate->keyColIdx = (AttrNumber *) palloc(ncols * sizeof(AttrNumber));
 		for (i = 0; i < ncols; i++)
-			node->keyColIdx[i] = i + 1;
+			sstate->keyColIdx[i] = i + 1;
 
 		/*
 		 * We use ExecProject to evaluate the lefthand and righthand
@@ -835,32 +814,32 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
 		 * We also extract the combining operators themselves to initialize
 		 * the equality and hashing functions for the hash tables.
 		 */
-		if (IsA(node->testexpr->expr, OpExpr))
+		if (IsA(sstate->testexpr->expr, OpExpr))
 		{
 			/* single combining operator */
-			oplist = list_make1(node->testexpr);
+			oplist = list_make1(sstate->testexpr);
 		}
-		else if (and_clause((Node *) node->testexpr->expr))
+		else if (and_clause((Node *) sstate->testexpr->expr))
 		{
 			/* multiple combining operators */
-			Assert(IsA(node->testexpr, BoolExprState));
-			oplist = ((BoolExprState *) node->testexpr)->args;
+			Assert(IsA(sstate->testexpr, BoolExprState));
+			oplist = ((BoolExprState *) sstate->testexpr)->args;
 		}
 		else
 		{
 			/* shouldn't see anything else in a hashable subplan */
 			insist_log(false, "unrecognized testexpr type: %d",
-				 (int) nodeTag(node->testexpr->expr));
+				 (int) nodeTag(sstate->testexpr->expr));
 			oplist = NIL;		/* keep compiler quiet */
 		}
 		Assert(list_length(oplist) == ncols);
 
 		lefttlist = righttlist = NIL;
 		leftptlist = rightptlist = NIL;
-		node->tab_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
-		node->tab_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
-		node->lhs_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
-		node->cur_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
+		sstate->tab_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
+		sstate->tab_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
+		sstate->lhs_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
+		sstate->cur_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
 		i = 1;
 		foreach(l, oplist)
 		{
@@ -907,23 +886,23 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
 			rightptlist = lappend(rightptlist, tle);
 
 			/* Lookup the equality function (potentially cross-type) */
-			fmgr_info(opexpr->opfuncid, &node->cur_eq_funcs[i - 1]);
-			node->cur_eq_funcs[i - 1].fn_expr = (Node *) opexpr;
+			fmgr_info(opexpr->opfuncid, &sstate->cur_eq_funcs[i - 1]);
+			sstate->cur_eq_funcs[i - 1].fn_expr = (Node *) opexpr;
 
 			/* Look up the equality function for the RHS type */
 			if (!get_compatible_hash_operators(opexpr->opno,
 											   NULL, &rhs_eq_oper))
 				elog(ERROR, "could not find compatible hash operator for operator %u",
 					 opexpr->opno);
-			fmgr_info(get_opcode(rhs_eq_oper), &node->tab_eq_funcs[i - 1]);
+			fmgr_info(get_opcode(rhs_eq_oper), &sstate->tab_eq_funcs[i - 1]);
 
 			/* Lookup the associated hash functions */
 			if (!get_op_hash_functions(opexpr->opno,
 									   &left_hashfn, &right_hashfn))
 				elog(ERROR, "could not find hash function for hash operator %u",
 					 opexpr->opno);
-			fmgr_info(left_hashfn, &node->lhs_hash_funcs[i - 1]);
-			fmgr_info(right_hashfn, &node->tab_hash_funcs[i - 1]);
+			fmgr_info(left_hashfn, &sstate->lhs_hash_funcs[i - 1]);
+			fmgr_info(right_hashfn, &sstate->tab_hash_funcs[i - 1]);
 
 			i++;
 		}
@@ -939,19 +918,21 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
 		tupDesc = ExecTypeFromTL(leftptlist, false);
 		slot = ExecInitExtraTupleSlot(estate);
 		ExecSetSlotDescriptor(slot, tupDesc);
-		node->projLeft = ExecBuildProjectionInfo(lefttlist,
-												 NULL,
-												 slot,
-												 NULL);
+		sstate->projLeft = ExecBuildProjectionInfo(lefttlist,
+												   NULL,
+												   slot,
+												   NULL);
 
 		tupDesc = ExecTypeFromTL(rightptlist, false);
 		slot = ExecInitExtraTupleSlot(estate);
 		ExecSetSlotDescriptor(slot, tupDesc);
-		node->projRight = ExecBuildProjectionInfo(righttlist,
-												  node->innerecontext,
-												  slot,
-												  NULL);
+		sstate->projRight = ExecBuildProjectionInfo(righttlist,
+													sstate->innerecontext,
+													slot,
+													NULL);
 	}
+
+	return sstate;
 }
 
 /* ----------------------------------------------------------------
@@ -978,62 +959,8 @@ ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags)
  * function: ParamListInfo p.  This may be NULL in the non-dispatch case.
  */
 
-/* Helper: SubplanQueryDesc derives a QueryDesc for use by the subplan. */
-static QueryDesc *
-SubplanQueryDesc(QueryDesc * qd)
-{
-	QueryDesc *subqd = NULL;
-	PlannedStmt *substmt = NULL;
-	PlannedStmt *stmt = qd->plannedstmt;
-
-	Assert(stmt != NULL);
-
-	/*
-	 * MPP-2869 and MPP-2859, single-row parameter-subquery inside
-	 * CTAS: we don't want to create the the table during the
-	 * initPlan execution. */
-
-	/* build the PlannedStmt substmt */
-	substmt = makeNode(PlannedStmt);
-
-	substmt->commandType = stmt->commandType;
-	substmt->canSetTag = stmt->canSetTag;
-	substmt->transientPlan = stmt->transientPlan;
-	substmt->planTree = stmt->planTree;
-	substmt->rtable = stmt->rtable;
-	substmt->resultRelations = stmt->resultRelations;
-	substmt->utilityStmt = stmt->utilityStmt;
-	substmt->intoClause = NULL;
-	substmt->subplans = stmt->subplans;
-	substmt->returningLists = stmt->returningLists;
-	substmt->rowMarks = stmt->rowMarks;
-	substmt->relationOids = stmt->relationOids;
-	substmt->invalItems = stmt->invalItems;
-	substmt->nCrossLevelParams = stmt->nCrossLevelParams;
-	substmt->nMotionNodes = stmt->nMotionNodes;
-	substmt->nInitPlans = stmt->nInitPlans;
-
-	/*
-	 * Fake a QueryDesc stucture for CdbDispatchPlan call. It should
-	 * look like the one passed in as the argument which carries the
-	 * global query, plan, parameters, and slice table, and specifies
-	 * the initplan root of interest.
-	 */
-	subqd = CreateQueryDesc(substmt,
-							pstrdup("(internal SELECT query for initplan)"),
-							qd->snapshot,
-							qd->crosscheck_snapshot,
-							NULL,		/* Null destination for the QE */
-							qd->params,
-							qd->doInstrument);
-	subqd->ddesc = qd->ddesc;
-
-	return subqd;
-}
-
 void
-ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
-		 QueryDesc *gbl_queryDesc)
+ExecSetParamPlan(SubPlanState *node, ExprContext *econtext, QueryDesc *queryDesc)
 {
 	SubPlan    *subplan = (SubPlan *) node->xprstate.expr;
 	PlanState  *planstate = node->planstate;
@@ -1045,8 +972,6 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
 	ArrayBuildState *astate = NULL;
 	Size		savepeakspace = MemoryContextGetPeakSpace(planstate->state->es_query_cxt);
 
-	QueryDesc  *queryDesc = NULL;
-
 	bool		needDtxTwoPhase;
 	bool		shouldDispatch = false;
 	volatile bool shouldTeardownInterconnect = false;
@@ -1058,42 +983,14 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
 		planstate->plan->dispatch == DISPATCH_PARALLEL)
 		shouldDispatch = true;
 
+	planstate->state->currentSubplanLevel++;
+
 	/*
 	 * Reset memory high-water mark so EXPLAIN ANALYZE can report each
 	 * root slice's usage separately.
 	 */
 	MemoryContextSetPeakSpace(planstate->state->es_query_cxt, 0);
 
-	/*
-	 * Let's initialize 'queryDesc' before our PG_TRY, to ensure the correct
-	 * value will be seen inside the PG_CATCH block without having to declare
-	 * it 'volatile'.  (setjmp/longjmp foolishness)
-	 */
-	if (shouldDispatch)
-	{
-		/*
-		 * Fake a QueryDesc stucture for CdbDispatchPlan call. It should
-		 * look like the one passed in as the argument which carries the
-		 * global query, plan, parameters, and slice table, and specifies
-		 * the initplan root of interest.
-		 */
-		queryDesc = SubplanQueryDesc(gbl_queryDesc);
-
-        /*
-         * CDB TODO: Should this use CreateSubExecutorState()?
-         * Should FreeExecutorState() eventually be called?
-         * Why do we need this at all?    ... kh 4/2007
-         */
-		queryDesc->estate = CreateExecutorState();
-
-        queryDesc->showstatctx = gbl_queryDesc->showstatctx;
-        queryDesc->estate->showstatctx = gbl_queryDesc->showstatctx;
-		queryDesc->estate->es_sliceTable = gbl_queryDesc->estate->es_sliceTable;
-		queryDesc->estate->es_param_exec_vals = gbl_queryDesc->estate->es_param_exec_vals;
-		queryDesc->estate->motionlayer_context = gbl_queryDesc->estate->motionlayer_context;
-		queryDesc->extended_query = gbl_queryDesc->extended_query;
-	}
-
 	/*
 	 * Need a try/catch block here so that if an ereport is called from
 	 * within ExecutePlan, we can clean up by calling CdbCheckDispatchResult.
@@ -1139,9 +1036,9 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
 		}
 
 		/*
-		 * Must switch to child query's per-query memory context.
+		 * Must switch to per-query memory context.
 		 */
-		oldcontext = MemoryContextSwitchTo(node->sub_estate->es_query_cxt);
+		oldcontext = MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 
 		if (subLinkType == ANY_SUBLINK ||
 			subLinkType == ALL_SUBLINK)
@@ -1215,12 +1112,9 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
 		 	 * the param structs will point at this copied tuple! node->curTuple
 		 	 * keeps track of the copied tuple for eventual freeing.
 			 */
-			MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
 			if (node->curTuple)
 				pfree(node->curTuple);
-
 			node->curTuple = ExecCopySlotMemTuple(slot);
-			MemoryContextSwitchTo(node->sub_estate->es_query_cxt);
 
 			/*
 			 * Now set all the setParam params from the columns of the tuple
@@ -1320,9 +1214,9 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
 
 	        TeardownInterconnect(queryDesc->estate->interconnect_context, 
 								 queryDesc->estate->motionlayer_context,
-								 false); /* following success on QD */	
+								 false); /* following success on QD */
+			queryDesc->estate->interconnect_context = NULL;
 		}
-
     }
 	PG_CATCH();
 	{
@@ -1366,13 +1260,18 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
          * CDB TODO: Is this needed following failure on QD?
          */
         if (shouldTeardownInterconnect)
+		{
 			TeardownInterconnect(queryDesc->estate->interconnect_context,
 								 queryDesc->estate->motionlayer_context,
 								 true);
+			queryDesc->estate->interconnect_context = NULL;
+		}
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
+	planstate->state->currentSubplanLevel--;
+
 	/* If EXPLAIN ANALYZE, collect local execution stats. */
 	if (planstate->instrument)
 		cdbexplain_localExecStats(planstate, econtext->ecxt_estate->showstatctx);
@@ -1383,23 +1282,6 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext,
 	MemoryContextSwitchTo(oldcontext);
 }
 
-/* ----------------------------------------------------------------
- *		ExecEndSubPlan
- * ----------------------------------------------------------------
- */
-void
-ExecEndSubPlan(SubPlanState *node)
-{
-	if (node->needShutdown)
-	{
-		ExecEndPlan(node->planstate, node->sub_estate);
-		FreeExecutorState(node->sub_estate);
-		node->sub_estate = NULL;
-		node->planstate = NULL;
-		node->needShutdown = false;
-	}
-}
-
 /*
  * Mark an initplan as needing recalculation
  */
diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c
index 23165da3eb3c..9945c5d45215 100644
--- a/src/backend/executor/nodeSubqueryscan.c
+++ b/src/backend/executor/nodeSubqueryscan.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.35 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.39 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,16 +49,8 @@ static TupleTableSlot *SubqueryNext(SubqueryScanState *node);
 static TupleTableSlot *
 SubqueryNext(SubqueryScanState *node)
 {
-	EState	   *estate;
-	ScanDirection direction;
 	TupleTableSlot *slot;
 
-	/*
-	 * get information from the estate and scan state
-	 */
-	estate = node->ss.ps.state;
-	direction = estate->es_direction;
-
 	/*
 	 * We need not support EvalPlanQual here, since we are not scanning a real
 	 * relation.
@@ -67,8 +59,6 @@ SubqueryNext(SubqueryScanState *node)
 	/*
 	 * Get the next tuple from the sub-query.
 	 */
-	node->sss_SubEState->es_direction = direction;
-
 	slot = ExecProcNode(node->subplan);
 
 	/*
@@ -122,13 +112,12 @@ SubqueryScanState *
 ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags)
 {
 	SubqueryScanState *subquerystate;
-	EState	   *sp_estate;
 
 	/* check for unsupported flags */
 	Assert(!(eflags & EXEC_FLAG_MARK));
 
 	/*
-	 * SubqueryScan should not have any "normal" children.  Also, if planner
+	 * SubqueryScan should not have any "normal" children.	Also, if planner
 	 * left anything in subrtable, it's fishy.
 	 */
 	Assert(outerPlan(node) == NULL);
@@ -181,64 +170,18 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags)
 
 	/*
 	 * initialize subquery
-	 *
-	 * This should agree with ExecInitSubPlan
-	 *
-	 * The subquery needs its own EState because it has its own rangetable. It
-	 * shares our Param ID space and es_query_cxt, however.  XXX if rangetable
-	 * access were done differently, the subquery could share our EState,
-	 * which would eliminate some thrashing about in this module...
-	 */
-	sp_estate = CreateSubExecutorState(estate);
-	subquerystate->sss_SubEState = sp_estate;
-
-	sp_estate->es_range_table = estate->es_range_table;
-	sp_estate->es_param_list_info = estate->es_param_list_info;
-	sp_estate->es_param_exec_vals = estate->es_param_exec_vals;
-	sp_estate->es_tupleTable = NIL;
-	sp_estate->es_snapshot = estate->es_snapshot;
-	sp_estate->es_crosscheck_snapshot = estate->es_crosscheck_snapshot;
-	sp_estate->es_instrument = estate->es_instrument;
-	sp_estate->es_plannedstmt = estate->es_plannedstmt;
-
-	/*
-	 * "Loan" the global slice table and map to the subplan EState.  The
-	 * global state is already set up by the code that called us.
-	 */
-	sp_estate->es_sliceTable = estate->es_sliceTable;
-	sp_estate->currentSliceIdInPlan = estate->currentSliceIdInPlan;
-	sp_estate->currentExecutingSliceId = estate->currentExecutingSliceId;
-	sp_estate->rootSliceId = estate->currentExecutingSliceId;
-	
-	/* 
-	 * also load shared nodes list 
 	 */
-	sp_estate->es_sharenode = estate->es_sharenode;
-
-	/*
-	 * also loan the motion later state and interconnect state
-	 */
-	sp_estate->motionlayer_context = estate->motionlayer_context;
-	sp_estate->interconnect_context = estate->interconnect_context;
-
-
-	/*
-	 * Start up the subplan (this is a very cut-down form of InitPlan())
-	 */
-	subquerystate->subplan = ExecInitNode(node->subplan, sp_estate, eflags);
+	subquerystate->subplan = ExecInitNode(node->subplan, estate, eflags);
 
 	/* return borrowed share node list */
-	estate->es_sharenode = sp_estate->es_sharenode;
+	estate->es_sharenode = estate->es_sharenode;
 	/*subquerystate->ss.ps.ps_TupFromTlist = false;*/
 
 	/*
-	 * Initialize scan tuple type (needed by ExecAssignScanProjectionInfo).
-	 * Because the subplan is in its own memory context, we need to copy its
-	 * result tuple type not just link to it; else the tupdesc will disappear
-	 * too soon during shutdown.
+	 * Initialize scan tuple type (needed by ExecAssignScanProjectionInfo)
 	 */
 	ExecAssignScanType(&subquerystate->ss,
-			CreateTupleDescCopy(ExecGetResultType(subquerystate->subplan)));
+					   ExecGetResultType(subquerystate->subplan));
 
 	/*
 	 * Initialize result tuple type and projection info.
@@ -254,11 +197,9 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags)
 int
 ExecCountSlotsSubqueryScan(SubqueryScan *node)
 {
-	/*
-	 * The subplan has its own tuple table and must not be counted here!
-	 */
-	return ExecCountSlotsNode(outerPlan(node)) +
-		ExecCountSlotsNode(innerPlan(node)) +
+	Assert(outerPlan(node) == NULL);
+	Assert(innerPlan(node) == NULL);
+	return ExecCountSlotsNode(node->subplan) +
 		SUBQUERYSCAN_NSLOTS;
 }
 
@@ -291,9 +232,7 @@ ExecEndSubqueryScan(SubqueryScanState *node)
 	/*
 	 * close down subquery
 	 */
-	ExecEndPlan(node->subplan, node->sss_SubEState);
-
-	FreeExecutorState(node->sss_SubEState);
+	ExecEndNode(node->subplan);
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeTableFunction.c b/src/backend/executor/nodeTableFunction.c
index f53d39e80fbc..7f439d076c71 100644
--- a/src/backend/executor/nodeTableFunction.c
+++ b/src/backend/executor/nodeTableFunction.c
@@ -329,6 +329,10 @@ ExecInitTableFunction(TableFunctionScan *node, EState *estate, int eflags)
 	rte	 = rt_fetch(node->scan.scanrelid, estate->es_range_table);
 	Insist(rte->rtekind == RTE_TABLEFUNCTION);
 
+	/* get info about the function */
+	rte	 = rt_fetch(node->scan.scanrelid, estate->es_range_table);
+	Insist(rte->rtekind == RTE_TABLEFUNCTION);
+
 	/* 
 	 * The funcexpr must be a function call.  This check is to verify that
 	 * the planner didn't try to perform constant folding or other inlining
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index ad40bec23710..6acad157ef43 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.53 2007/01/05 22:19:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.58.2.1 2008/04/30 23:28:37 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,6 +79,7 @@ TidListCreate(TidScanState *tidstate)
 	tidList = (ItemPointerData *)
 		palloc(numAllocTids * sizeof(ItemPointerData));
 	numTids = 0;
+	tidstate->tss_isCurrentOf = false;
 
 	foreach(l, evalList)
 	{
@@ -164,32 +165,25 @@ TidListCreate(TidScanState *tidstate)
 		}
 		else if (expr && IsA(expr, CurrentOfExpr))
 		{
-			/* 
-			 * CURRENT OF must be the only expr. This allows us to avoid
-			 * a repalloc of the tidList. 
-			 */
-			Insist(list_length(evalList) == 1);	
 			CurrentOfExpr *cexpr = (CurrentOfExpr *) expr;
+			ItemPointerData cursor_tid;
 
-			if (cexpr->gp_segment_id == Gp_segment)
+			if (execCurrentOf(cexpr, econtext,
+						   RelationGetRelid(tidstate->ss.ss_currentRelation),
+							  &cursor_tid))
 			{
-				/*
-				 * If tableoid is InvalidOid, this implies that constant
-				 * folding had determined tableoid was not necessary in
-				 * uniquely identifying a tuple. Otherwise, the given tuple's
-				 * tableoid must match the CURRENT OF tableoid.
-				 * The following code is similar to CurrentOfExpr node's evalfunc
-				 * ExecEvalCurrentOfExpr. This part only peeks into CurrentOfExpr
-				 * and gets the tableoid, gp_segment_id and ctid
-				 * whereas ExecEvalCurrentOfExpr is evaluated like any other WHERE clause.
-				 * We could potentially push down CURRENT OF predicate to TID Scan
-				 * but it seems not to be worth the effort.
-				 */
-				if (!OidIsValid(cexpr->tableoid) ||
-					cexpr->tableoid == RelationGetRelid(tidstate->ss.ss_currentRelation))
-					tidList[numTids++] = cexpr->ctid;
+				Assert(ItemPointerIsValid(&cursor_tid));
+				if (numTids >= numAllocTids)
+				{
+					numAllocTids *= 2;
+					tidList = (ItemPointerData *)
+						repalloc(tidList,
+								 numAllocTids * sizeof(ItemPointerData));
+				}
+				tidList[numTids++] = cursor_tid;
+				tidstate->tss_isCurrentOf = true;
 			}
-		} 
+		}
 		else
 			elog(ERROR, "could not identify CTID expression");
 	}
@@ -205,6 +199,9 @@ TidListCreate(TidScanState *tidstate)
 		int			lastTid;
 		int			i;
 
+		/* CurrentOfExpr could never appear OR'd with something else */
+		Assert(!tidstate->tss_isCurrentOf);
+
 		qsort((void *) tidList, numTids, sizeof(ItemPointerData),
 			  itemptr_comparator);
 		lastTid = 0;
@@ -292,7 +289,8 @@ TidNext(TidScanState *node)
 
 		/*
 		 * XXX shouldn't we check here to make sure tuple matches TID list? In
-		 * runtime-key case this is not certain, is it?
+		 * runtime-key case this is not certain, is it?  However, in the WHERE
+		 * CURRENT OF case it might not match anyway ...
 		 */
 
 		ExecStoreGenericTuple(estate->es_evTuple[scanrelid - 1], slot, false);
@@ -346,6 +344,15 @@ TidNext(TidScanState *node)
 	while (node->tss_TidPtr >= 0 && node->tss_TidPtr < numTids)
 	{
 		tuple->t_self = tidList[node->tss_TidPtr];
+
+		/*
+		 * For WHERE CURRENT OF, the tuple retrieved from the cursor might
+		 * since have been updated; if so, we should fetch the version that is
+		 * current according to our snapshot.
+		 */
+		if (node->tss_isCurrentOf)
+			heap_get_latest_tid(heapRelation, snapshot, &tuple->t_self);
+
 		if (heap_fetch(heapRelation, snapshot, tuple, &buffer, false, NULL))
 		{
 			/*
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index d92855dd6f8e..889ffe1e2677 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -3,12 +3,20 @@
  * nodeUnique.c
  *	  Routines to handle unique'ing of queries where appropriate
  *
+ * Unique is a very simple node type that just filters out duplicate
+ * tuples from a stream of sorted tuples from its subplan.  It's essentially
+ * a dumbed-down form of Group: the duplicate-removal functionality is
+ * identical.  However, Unique doesn't do projection nor qual checking,
+ * so it's marginally more efficient for cases where neither is needed.
+ * (It's debatable whether the savings justifies carrying two plan node
+ * types, though.)
+ *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeUnique.c,v 1.55 2007/01/10 18:06:02 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeUnique.c,v 1.56.2.1 2008/08/05 21:28:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c
index c53262033d2a..0f95df0261f8 100644
--- a/src/backend/executor/nodeValuesscan.c
+++ b/src/backend/executor/nodeValuesscan.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeValuesscan.c,v 1.6 2007/02/19 02:23:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeValuesscan.c,v 1.8 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 8385fca97385..ff2cedd57f50 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.169 2007/01/09 22:00:59 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.188.2.4 2009/01/07 20:39:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -87,16 +87,18 @@ static ParamListInfo _SPI_convert_params(int nargs, Oid *argtypes,
 					Datum *Values, const char *Nulls,
 					int pflags);
 
-static void _SPI_assign_query_mem(QueryDesc * queryDesc);
+static void _SPI_assign_query_mem(QueryDesc *queryDesc);
 
-static int	_SPI_pquery(QueryDesc * queryDesc, bool fire_triggers, long tcount);
+static int	_SPI_pquery(QueryDesc *queryDesc, bool fire_triggers, long tcount);
 
 static void _SPI_error_callback(void *arg);
 
-static void _SPI_cursor_operation(Portal portal, bool forward, long count,
+static void _SPI_cursor_operation(Portal portal,
+					  FetchDirection direction, long count,
 					  DestReceiver *dest);
 
-static SPIPlanPtr _SPI_copy_plan(SPIPlanPtr plan, int location);
+static SPIPlanPtr _SPI_copy_plan(SPIPlanPtr plan, MemoryContext parentcxt);
+static SPIPlanPtr _SPI_save_plan(SPIPlanPtr plan);
 
 static int	_SPI_begin_call(bool execmem);
 static int	_SPI_end_call(bool procmem);
@@ -347,7 +349,7 @@ SPI_pop(void)
 bool
 SPI_push_conditional(void)
 {
-	bool		pushed = (_SPI_curid != _SPI_connected);
+	bool	pushed = (_SPI_curid != _SPI_connected);
 
 	if (pushed)
 	{
@@ -393,11 +395,6 @@ SPI_execute(const char *src, bool read_only, long tcount)
 	memset(&plan, 0, sizeof(_SPI_plan));
 	plan.magic = _SPI_PLAN_MAGIC;
 	plan.cursor_options = 0;
-	plan.plancxt = NULL;		/* doesn't have own context */
-	plan.query = src;
-	plan.nargs = 0;
-	plan.argtypes = NULL;
-	plan.use_count = 0;
 
 	_SPI_prepare_plan(src, &plan, NULL);
 
@@ -423,7 +420,7 @@ SPI_execute_plan(SPIPlanPtr plan, Datum *Values, const char *Nulls,
 {
 	int			res;
 
-	if (plan == NULL || tcount < 0)
+	if (plan == NULL || plan->magic != _SPI_PLAN_MAGIC || tcount < 0)
 		return SPI_ERROR_ARGUMENT;
 
 	if (plan->nargs > 0 && Values == NULL)
@@ -472,7 +469,7 @@ SPI_execute_snapshot(SPIPlanPtr plan,
 {
 	int			res;
 
-	if (plan == NULL || tcount < 0)
+	if (plan == NULL || plan->magic != _SPI_PLAN_MAGIC || tcount < 0)
 		return SPI_ERROR_ARGUMENT;
 
 	if (plan->nargs > 0 && Values == NULL)
@@ -535,8 +532,6 @@ SPI_execute_with_args(const char *src,
 	 *		 from upstream, e.g. plan.query is to be assigned
 	 *		 in _SPI_prepare_plan
 	 */
-	plan.query = src;
-	plan.use_count = 0;
 	plan.plancxt = NULL;
 
 	paramLI = _SPI_convert_params(nargs, argtypes,
@@ -557,9 +552,16 @@ SPI_execute_with_args(const char *src,
 
 SPIPlanPtr
 SPI_prepare(const char *src, int nargs, Oid *argtypes)
+{
+	return SPI_prepare_cursor(src, nargs, argtypes, 0);
+}
+
+SPIPlanPtr
+SPI_prepare_cursor(const char *src, int nargs, Oid *argtypes,
+				   int cursorOptions)
 {
 	_SPI_plan	plan;
-	_SPI_plan  *result;
+	SPIPlanPtr	result;
 
 	if (src == NULL || nargs < 0 || (nargs > 0 && argtypes == NULL))
 	{
@@ -573,17 +575,14 @@ SPI_prepare(const char *src, int nargs, Oid *argtypes)
 
 	memset(&plan, 0, sizeof(_SPI_plan));
 	plan.magic = _SPI_PLAN_MAGIC;
-	//plan.cursor_options = cursorOptions;
-	plan.plancxt = NULL;		/* doesn't have own context */
-	plan.query = src;
+	plan.cursor_options = cursorOptions;
 	plan.nargs = nargs;
 	plan.argtypes = argtypes;
-	plan.use_count = 0;
 
 	_SPI_prepare_plan(src, &plan, NULL);
 
 	/* copy plan to procedure context */
-	result = _SPI_copy_plan(&plan, _SPI_CPLAN_PROCXT);
+	result = _SPI_copy_plan(&plan, _SPI_current->procCxt);
 
 	_SPI_end_call(true);
 
@@ -595,7 +594,8 @@ SPI_saveplan(SPIPlanPtr plan)
 {
 	SPIPlanPtr	newplan;
 
-	if (plan == NULL)
+	/* We don't currently support copying an already-saved plan */
+	if (plan == NULL || plan->magic != _SPI_PLAN_MAGIC || plan->saved)
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
 		return NULL;
@@ -605,7 +605,7 @@ SPI_saveplan(SPIPlanPtr plan)
 	if (SPI_result < 0)
 		return NULL;
 
-	newplan = _SPI_copy_plan(plan, _SPI_CPLAN_TOPCXT);
+	newplan = _SPI_save_plan(plan);
 
 	_SPI_curid--;
 	SPI_result = 0;
@@ -616,10 +616,25 @@ SPI_saveplan(SPIPlanPtr plan)
 int
 SPI_freeplan(SPIPlanPtr plan)
 {
-	if (plan == NULL)
+	if (plan == NULL || plan->magic != _SPI_PLAN_MAGIC)
 		return SPI_ERROR_ARGUMENT;
 
+	/* If plancache.c owns the plancache entries, we must release them */
+	if (plan->saved)
+	{
+		ListCell   *lc;
+
+		foreach(lc, plan->plancache_list)
+		{
+			CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc);
+
+			DropCachedPlan(plansource);
+		}
+	}
+
+	/* Now get rid of the _SPI_plan and subsidiary data in its plancxt */
 	MemoryContextDelete(plan->plancxt);
+
 	return 0;
 }
 
@@ -810,7 +825,7 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
 
 	SPI_result = 0;
 
-	if (fnumber > HeapTupleHeaderGetNatts(tuple->t_data) || fnumber == 0 ||
+	if (fnumber > tupdesc->natts || fnumber == 0 ||
 		fnumber <= FirstLowInvalidHeapAttributeNumber)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
@@ -851,7 +866,7 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull)
 {
 	SPI_result = 0;
 
-	if (fnumber > HeapTupleHeaderGetNatts(tuple->t_data) || fnumber == 0 ||
+	if (fnumber > tupdesc->natts || fnumber == 0 ||
 		fnumber <= FirstLowInvalidHeapAttributeNumber)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
@@ -1036,8 +1051,6 @@ SPI_cursor_open_with_args(const char *name,
 	 *		 from upstream, e.g. plan.query is to be assigned
 	 *		 in _SPI_prepare_plan
 	 */
-	plan.query = src; 
-	plan.use_count = 0;
 	plan.plancxt = NULL;
 
 	paramLI = _SPI_convert_params(nargs, argtypes,
@@ -1070,68 +1083,43 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 						 bool read_only, int pflags)
 {
 
-	_SPI_plan  *spiplan = (_SPI_plan *) plan;
-	List	   *qtlist;
-	List	   *ptlist;
+	CachedPlanSource *plansource;
+	CachedPlan *cplan;
+	List	   *stmt_list;
+	char	   *query_string;
 	ParamListInfo paramLI;
 	Snapshot	snapshot;
 	MemoryContext oldcontext;
 	Portal		portal;
 	int			k;
 
-	elog(DEBUG1, "SPI_cursor_open local: %s", spiplan->query);
-
+	elog(DEBUG1, "SPI_cursor_open local: %s", name);
 
 	/*
 	 * Check that the plan is something the Portal code will special-case as
 	 * returning one tupleset.
 	 */
-	if (!SPI_is_cursor_plan(spiplan))
+	if (!SPI_is_cursor_plan(plan))
 	{
 		/* try to give a good error message */
-		Query	   *queryTree;
-
-		if (list_length(spiplan->qtlist) != 1)
+		if (list_length(plan->plancache_list) != 1)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_CURSOR_DEFINITION),
 					 errmsg("cannot open multi-query plan as cursor")));
-		queryTree = (Query *) PortalListGetPrimaryStmt((List *) linitial(spiplan->qtlist));
-		if (queryTree == NULL)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_CURSOR_DEFINITION),
-					 errmsg("cannot open empty query as cursor")));
+		plansource = (CachedPlanSource *) linitial(plan->plancache_list);
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_CURSOR_DEFINITION),
 		/* translator: %s is name of a SQL command, eg INSERT */
 				 errmsg("cannot open %s query as cursor",
-						CreateCommandTag((Node*)queryTree))));
+						plansource->commandTag)));
 	}
 
-	Assert(list_length(spiplan->qtlist) == 1);
-	qtlist = (List *) linitial(spiplan->qtlist);
-	ptlist = spiplan->ptlist;
-	if (list_length(qtlist) != list_length(ptlist))
-		insist_log(false, "corrupted SPI plan lists");
-
-	/*
-	 * If told to be read-only, we'd better check for read-only queries.
-	 */
-	if (read_only)
-	{
-		ListCell   *lc;
-
-		foreach(lc, qtlist)
-		{
-			Query  *qry = (Query *) lfirst(lc);
+	Assert(list_length(plan->plancache_list) == 1);
+	plansource = (CachedPlanSource *) linitial(plan->plancache_list);
 
-			if (!QueryIsReadOnly(qry))
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 /* translator: %s is a SQL statement name */
-						 errmsg("%s is not allowed in a non-volatile function",
-								CreateCommandTag((Node*)qry))));
-		}
-	}
+	/* Push the SPI stack */
+	if (_SPI_begin_call(false) < 0)
+		elog(ERROR, "SPI_cursor_open called while not connected");
 
 	/* Reset SPI result (note we deliberately don't touch lastoid) */
 	SPI_processed64 = 0;
@@ -1152,24 +1140,32 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 		portal = CreatePortal(name, false, false);
 	}
 
-	/* Switch to portal's memory and copy the parsetrees and plans to there */
+	/*
+	 * Prepare to copy stuff into the portal's memory context.  We do all this
+	 * copying first, because it could possibly fail (out-of-memory) and we
+	 * don't want a failure to occur between RevalidateCachedPlan and
+	 * PortalDefineQuery; that would result in leaking our plancache refcount.
+	 */
 	oldcontext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
-	qtlist = copyObject(qtlist);
-	ptlist = copyObject(ptlist);
 
-	/* If the plan has parameters, set them up */
-	if (spiplan->nargs > 0)
+	/* Copy the plan's query string, if available, into the portal */
+	query_string = plansource->query_string;
+	if (query_string)
+		query_string = pstrdup(query_string);
+
+	/* If the plan has parameters, copy them into the portal */
+	if (plan->nargs > 0)
 	{
 		/* sizeof(ParamListInfoData) includes the first array element */
 		paramLI = (ParamListInfo) palloc(sizeof(ParamListInfoData) +
-							  (spiplan->nargs - 1) *sizeof(ParamExternData));
-		paramLI->numParams = spiplan->nargs;
+								 (plan->nargs - 1) *sizeof(ParamExternData));
+		paramLI->numParams = plan->nargs;
 
-		for (k = 0; k < spiplan->nargs; k++)
+		for (k = 0; k < plan->nargs; k++)
 		{
 			ParamExternData *prm = &paramLI->params[k];
 
-			prm->ptype = spiplan->argtypes[k];
+			prm->ptype = plan->argtypes[k];
 			prm->pflags = pflags;
 			prm->isnull = (Nulls && Nulls[k] == 'n');
 			if (prm->isnull)
@@ -1192,8 +1188,22 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	else
 		paramLI = NULL;
 
-	/* Copy the plan's query string into the portal */
-	char *query_string = pstrdup(spiplan->query);
+	MemoryContextSwitchTo(oldcontext);
+
+	if (plan->saved)
+	{
+		/* Replan if needed, and increment plan refcount for portal */
+		cplan = RevalidateCachedPlan(plansource, false);
+		stmt_list = cplan->stmt_list;
+	}
+	else
+	{
+		/* No replan, but copy the plan into the portal's context */
+		oldcontext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+		stmt_list = copyObject(plansource->plan->stmt_list);
+		MemoryContextSwitchTo(oldcontext);
+		cplan = NULL;			/* portal shouldn't depend on cplan */
+	}
 
 	/*
 	 * Set up the portal.
@@ -1202,39 +1212,24 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 					  NULL,		/* no statement name */
 					  query_string,
 					  T_SelectStmt,
-					  CreateCommandTag(PortalListGetPrimaryStmt(qtlist)),
-					  ptlist,
-					  PortalGetHeapMemory(portal));
-
-	MemoryContextSwitchTo(oldcontext);
+					  plansource->commandTag,
+					  stmt_list,
+					  cplan);
 
 	/*
-	 * Set up options for portal.
+	 * Set up options for portal.  Default SCROLL type is chosen the same way
+	 * as PerformCursorOpen does it.
 	 */
-	portal->cursorOptions &= ~(CURSOR_OPT_SCROLL | CURSOR_OPT_NO_SCROLL);
+	portal->cursorOptions = plan->cursor_options;
+	if (!(portal->cursorOptions & (CURSOR_OPT_SCROLL | CURSOR_OPT_NO_SCROLL)))
 	{
-		int option = CURSOR_OPT_NO_SCROLL;
-		
-		if ( list_length(ptlist) == 1 )
-		{
-			Node *node = (Node *)linitial(ptlist);
-
-			/*
-			 * For utility statements such as EXPLAIN, we may not have
-			 * a valid PlannedStmt pointer. Therefore, make sure that
-			 * the cast to PlannedStmt* is valid (MPP-22435).
-			 */
-			if (nodeTag(node) == T_PlannedStmt)
-			{
-				PlannedStmt *stmt = (PlannedStmt *)node;
-				if ( stmt && stmt->planTree &&
-					ExecSupportsBackwardScan(stmt->planTree) )
-				{
-					option = CURSOR_OPT_SCROLL;
-				}
-			}
-		}
-		portal->cursorOptions |= option;
+		if (list_length(stmt_list) == 1 &&
+			IsA((Node *) linitial(stmt_list), PlannedStmt) &&
+			((PlannedStmt *) linitial(stmt_list))->rowMarks == NIL &&
+			ExecSupportsBackwardScan(((PlannedStmt *) linitial(stmt_list))->planTree))
+			portal->cursorOptions |= CURSOR_OPT_SCROLL;
+		else
+			portal->cursorOptions |= CURSOR_OPT_NO_SCROLL;
 	}
 
 	/*
@@ -1242,6 +1237,46 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	 */
 	portal->is_extended_query = true;
 
+	/*
+	 * Disallow SCROLL with SELECT FOR UPDATE.	This is not redundant with the
+	 * check in transformDeclareCursorStmt because the cursor options might
+	 * not have come through there.
+	 */
+	if (portal->cursorOptions & CURSOR_OPT_SCROLL)
+	{
+		if (list_length(stmt_list) == 1 &&
+			IsA((Node *) linitial(stmt_list), PlannedStmt) &&
+			((PlannedStmt *) linitial(stmt_list))->rowMarks != NIL)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"),
+					 errdetail("Scrollable cursors must be READ ONLY.")));
+	}
+
+	/*
+	 * If told to be read-only, we'd better check for read-only queries. This
+	 * can't be done earlier because we need to look at the finished, planned
+	 * queries.  (In particular, we don't want to do it between
+	 * RevalidateCachedPlan and PortalDefineQuery, because throwing an error
+	 * between those steps would result in leaking our plancache refcount.)
+	 */
+	if (read_only)
+	{
+		ListCell   *lc;
+
+		foreach(lc, stmt_list)
+		{
+			Node	   *pstmt = (Node *) lfirst(lc);
+
+			if (!CommandIsReadOnly(pstmt))
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				/* translator: %s is a SQL statement name */
+					   errmsg("%s is not allowed in a non-volatile function",
+							  CreateCommandTag(pstmt))));
+		}
+	}
+
 	/*
 	 * Set up the snapshot to use.	(PortalStart will do CopySnapshot, so we
 	 * skip that here.)
@@ -1262,10 +1297,14 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 
 	Assert(portal->strategy != PORTAL_MULTI_QUERY);
 
+	/* Pop the SPI stack */
+	_SPI_end_call(false);
+
 	/* Return the created portal */
 	return portal;
 }
 
+
 /*
  * SPI_cursor_find()
  *
@@ -1286,7 +1325,8 @@ SPI_cursor_find(const char *name)
 void
 SPI_cursor_fetch(Portal portal, bool forward, long count)
 {
-	_SPI_cursor_operation(portal, forward, count,
+	_SPI_cursor_operation(portal,
+						  forward ? FETCH_FORWARD : FETCH_BACKWARD, count,
 						  CreateDestReceiver(DestSPI, NULL));
 	/* we know that the DestSPI receiver doesn't need a destroy call */
 }
@@ -1300,7 +1340,36 @@ SPI_cursor_fetch(Portal portal, bool forward, long count)
 void
 SPI_cursor_move(Portal portal, bool forward, long count)
 {
-	_SPI_cursor_operation(portal, forward, count, None_Receiver);
+	_SPI_cursor_operation(portal,
+						  forward ? FETCH_FORWARD : FETCH_BACKWARD, count,
+						  None_Receiver);
+}
+
+
+/*
+ * SPI_scroll_cursor_fetch()
+ *
+ *	Fetch rows in a scrollable cursor
+ */
+void
+SPI_scroll_cursor_fetch(Portal portal, FetchDirection direction, long count)
+{
+	_SPI_cursor_operation(portal,
+						  direction, count,
+						  CreateDestReceiver(DestSPI, NULL));
+	/* we know that the DestSPI receiver doesn't need a destroy call */
+}
+
+
+/*
+ * SPI_scroll_cursor_move()
+ *
+ *	Move in a scrollable cursor
+ */
+void
+SPI_scroll_cursor_move(Portal portal, FetchDirection direction, long count)
+{
+	_SPI_cursor_operation(portal, direction, count, None_Receiver);
 }
 
 
@@ -1324,7 +1393,8 @@ SPI_cursor_close(Portal portal)
 Oid
 SPI_getargtypeid(SPIPlanPtr plan, int argIndex)
 {
-	if (plan == NULL || argIndex < 0 || argIndex >= ((_SPI_plan *) plan)->nargs)
+	if (plan == NULL || plan->magic != _SPI_PLAN_MAGIC ||
+		argIndex < 0 || argIndex >= plan->nargs)
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
 		return InvalidOid;
@@ -1338,7 +1408,7 @@ SPI_getargtypeid(SPIPlanPtr plan, int argIndex)
 int
 SPI_getargcount(SPIPlanPtr plan)
 {
-	if (plan == NULL)
+	if (plan == NULL || plan->magic != _SPI_PLAN_MAGIC)
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
 		return -1;
@@ -1358,32 +1428,74 @@ SPI_getargcount(SPIPlanPtr plan)
 bool
 SPI_is_cursor_plan(SPIPlanPtr plan)
 {
-	_SPI_plan  *spiplan = (_SPI_plan *) plan;
+	CachedPlanSource *plansource;
+	CachedPlan *cplan;
 
-	if (spiplan == NULL)
+	if (plan == NULL || plan->magic != _SPI_PLAN_MAGIC)
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
 		return false;
 	}
 
-	if (list_length(spiplan->qtlist) != 1)
+	if (list_length(plan->plancache_list) != 1)
+	{
+		SPI_result = 0;
 		return false;			/* not exactly 1 pre-rewrite command */
+	}
+	plansource = (CachedPlanSource *) linitial(plan->plancache_list);
+
+	/* Need _SPI_begin_call in case replanning invokes SPI-using functions */
+	SPI_result = _SPI_begin_call(false);
+	if (SPI_result < 0)
+		return false;
 
-	switch (ChoosePortalStrategy((List *) linitial(spiplan->qtlist)))
+	if (plan->saved)
 	{
-		case PORTAL_ONE_SELECT:
-		case PORTAL_ONE_RETURNING:
-		case PORTAL_UTIL_SELECT:
-			/* OK */
-			return true;
-
-		case PORTAL_MULTI_QUERY:
-			/* will not return tuples */
-			break;
+		/* Make sure the plan is up to date */
+		cplan = RevalidateCachedPlan(plansource, true);
+		ReleaseCachedPlan(cplan, true);
 	}
+
+	_SPI_end_call(false);
+	SPI_result = 0;
+
+	/* Does it return tuples? */
+	if (plansource->resultDesc)
+		return true;
+
 	return false;
 }
 
+/*
+ * SPI_plan_is_valid --- test whether a SPI plan is currently valid
+ * (that is, not marked as being in need of revalidation).
+ *
+ * See notes for CachedPlanIsValid before using this.
+ */
+bool
+SPI_plan_is_valid(SPIPlanPtr plan)
+{
+	Assert(plan->magic == _SPI_PLAN_MAGIC);
+	if (plan->saved)
+	{
+		ListCell   *lc;
+
+		foreach(lc, plan->plancache_list)
+		{
+			CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc);
+
+			if (!CachedPlanIsValid(plansource))
+				return false;
+		}
+		return true;
+	}
+	else
+	{
+		/* An unsaved plan is assumed valid for its (short) lifetime */
+		return true;
+	}
+}
+
 /*
  * SPI_result_code_string --- convert any SPI return code to a string
  *
@@ -1406,8 +1518,6 @@ SPI_result_code_string(int code)
 			return "SPI_ERROR_OPUNKNOWN";
 		case SPI_ERROR_UNCONNECTED:
 			return "SPI_ERROR_UNCONNECTED";
-		case SPI_ERROR_CURSOR:
-			return "SPI_ERROR_CURSOR";
 		case SPI_ERROR_ARGUMENT:
 			return "SPI_ERROR_ARGUMENT";
 		case SPI_ERROR_PARAM:
@@ -1552,10 +1662,7 @@ spi_printtup(TupleTableSlot *slot, DestReceiver *self)
  * Parse and plan a querystring.
  *
  * At entry, plan->argtypes, plan->nargs, and plan->cursor_options must be
- * valid.  If boundParams isn't NULL then it represents parameter values
- * that are made available to the planner (as either estimates or hard values
- * depending on their PARAM_FLAG_CONST marking).  The boundParams had better
- * match the param types embedded in the plan!
+ * valid.
  *
  * Results are stored into *plan (specifically, plan->plancache_list).
  * Note however that the result trees are all in CurrentMemoryContext
@@ -1565,20 +1672,12 @@ static void
 _SPI_prepare_plan(const char *src, SPIPlanPtr plan, ParamListInfo boundParams)
 {
 	List	   *raw_parsetree_list;
-	List	   *query_list_list;
-	List	   *plan_list;
+	List	   *plancache_list;
 	ListCell   *list_item;
 	ErrorContextCallback spierrcontext;
 	Oid		   *argtypes = plan->argtypes;
 	int			nargs = plan->nargs;
-
-	/*
-	 * Increment CommandCounter to see changes made by now.  We must do this
-	 * to be sure of seeing any schema changes made by a just-preceding SPI
-	 * command.  (But we don't bother advancing the snapshot, since the
-	 * planner generally operates under SnapshotNow rules anyway.)
-	 */
-	CommandCounterIncrement();
+	int			cursor_options = plan->cursor_options;
 
 	/*
 	 * Setup error traceback support for ereport()
@@ -1594,48 +1693,62 @@ _SPI_prepare_plan(const char *src, SPIPlanPtr plan, ParamListInfo boundParams)
 	raw_parsetree_list = pg_parse_query(src);
 
 	/*
-	 * Do parse analysis and rule rewrite for each raw parsetree.
-	 *
-	 * We save the querytrees from each raw parsetree as a separate sublist.
-	 * This allows _SPI_execute_plan() to know where the boundaries between
-	 * original queries fall.
-	 *
-	 * TO DO Find a cleaner way to find query boundaries.  We retained this
-	 *       approach when implementing the ground work for PlannedStmt in
-	 *       order minimize changes.
+	 * Do parse analysis and rule rewrite for each raw parsetree, then cons up
+	 * a phony plancache entry for each one.
 	 */
-	query_list_list = NIL; /* a list of list of rewritten Query nodes. */
-	plan_list = NIL; /* a list of PlannedStmt nodes. */
+	plancache_list = NIL;
 
 	foreach(list_item, raw_parsetree_list)
 	{
 		Node	   *parsetree = (Node *) lfirst(list_item);
-		List	   *query_list;
-
-		query_list = pg_analyze_and_rewrite(parsetree, src, argtypes, nargs);
+		List	   *stmt_list;
+		CachedPlanSource *plansource;
+		CachedPlan *cplan;
 
-		ListCell *lc = NULL;
-		foreach (lc, query_list)
+		/* Need a copyObject here to keep parser from modifying raw tree */
+		stmt_list = pg_analyze_and_rewrite(copyObject(parsetree),
+										   src, argtypes, nargs);
 		{
-			Query *query = (Query *) lfirst(lc);
-			
-			if (Gp_role == GP_ROLE_EXECUTE)
+			ListCell *lc;
+
+			foreach (lc, stmt_list)
 			{
-				/* This method will error out if the query cannot be safely executed on segment */
-				querytree_safe_for_segment(query);
+				Query *query = (Query *) lfirst(lc);
+
+				if (Gp_role == GP_ROLE_EXECUTE)
+				{
+					/*
+					 * This method will error out if the query cannot be
+					 * safely executed on segment.
+					 */
+					querytree_safe_for_segment(query);
+				}
 			}
 		}
-		
-		query_list_list = lappend(query_list_list, query_list);
-
-		plan_list = list_concat(plan_list,
-								pg_plan_queries(query_list, NULL, false));
+		stmt_list = pg_plan_queries(stmt_list, cursor_options, NULL, false);
+
+		plansource = (CachedPlanSource *) palloc0(sizeof(CachedPlanSource));
+		cplan = (CachedPlan *) palloc0(sizeof(CachedPlan));
+
+		plansource->raw_parse_tree = parsetree;
+		/* cast-away-const here is a bit ugly, but there's no reason to copy */
+		plansource->query_string = (char *) src;
+		plansource->commandTag = CreateCommandTag(parsetree);
+		plansource->param_types = argtypes;
+		plansource->num_params = nargs;
+		plansource->fully_planned = true;
+		plansource->fixed_result = false;
+		/* no need to set search_path, generation or saved_xmin */
+		plansource->resultDesc = PlanCacheComputeResultDesc(stmt_list);
+		plansource->plan = cplan;
+
+		cplan->stmt_list = stmt_list;
+		cplan->fully_planned = true;
+
+		plancache_list = lappend(plancache_list, plansource);
 	}
 
-	plan->qtlist = query_list_list;
-	plan->ptlist = plan_list;
-
-	elog_node_display(DEBUG5, "_SPI_prepare_plan queryTree", plan->qtlist, true);
+	plan->plancache_list = plancache_list;
 
 	/*
 	 * Pop the error context stack
@@ -1665,110 +1778,87 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 	SPITupleTable *volatile my_tuptable = NULL;
 	volatile int res = 0;
 	Snapshot	saveActiveSnapshot;
-	const char *saved_query_string;
-	char *current_query_string = NULL;
 
 	/* Be sure to restore ActiveSnapshot on error exit */
 	saveActiveSnapshot = ActiveSnapshot;
 
-	/*
-	 * In the normal case, where we are on the QD, we can do the normal
-	 * PostgreSQL thing and run the command ourselves
-	 */
-
-	elog(DEBUG1, "_SPI_execute_plan local: %s", plan->query);
-
-	/*
-	 * elog_node_display(DEBUG5,"_SPI_execute_plan
-	 * queryTree",plan->qtlist,true);
-	 */
-
-	saved_query_string = debug_query_string;
-
-	/* 
-	 * plan->query is not memory context safe when FATAL/PANIC level error occurs,
-	 * to avoid debug_query_string referring to a invalid address, need to copy
-	 * the query string from TopMemoryContext. 
-	 */
-	current_query_string = MemoryContextStrdup(TopMemoryContext, plan->query);
-
-	debug_query_string = current_query_string;
-
 	PG_TRY();
 	{
-		List	   *query_list_list = plan->qtlist;
-		ListCell   *plan_list_item = list_head(plan->ptlist);
-		ListCell   *query_list_list_item;
+		ListCell   *lc1;
 		ErrorContextCallback spierrcontext;
+		CachedPlan *cplan = NULL;
 
 		/*
 		 * Setup error traceback support for ereport()
 		 */
 		spierrcontext.callback = _SPI_error_callback;
-		spierrcontext.arg = (void *) plan->query;
+		spierrcontext.arg = NULL;
 		spierrcontext.previous = error_context_stack;
 		error_context_stack = &spierrcontext;
 
-		/* indicate plan is being used */
-		plan->use_count++;
-
-		foreach(query_list_list_item, query_list_list)
+		foreach(lc1, plan->plancache_list)
 		{
-			List	   *query_list = lfirst(query_list_list_item);
-			ListCell   *query_list_item;
+			CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc1);
+			List	   *stmt_list;
+			ListCell   *lc2;
+
+			spierrcontext.arg = (void *) plansource->query_string;
 
-			foreach(query_list_item, query_list)
+			if (plan->saved)
 			{
-				Query	   *queryTree = (Query *) lfirst(query_list_item);
-				PlannedStmt *stmt;
+				/* Replan if needed, and increment plan refcount locally */
+				cplan = RevalidateCachedPlan(plansource, true);
+				stmt_list = cplan->stmt_list;
+			}
+			else
+			{
+				/* No replan here */
+				cplan = NULL;
+				stmt_list = plansource->plan->stmt_list;
+			}
+			foreach(lc2, stmt_list)
+			{
+				Node	   *stmt = (Node *) lfirst(lc2);
+				bool		canSetTag;
 				QueryDesc  *qdesc;
 				DestReceiver *dest;
 
-				stmt = (PlannedStmt*)lfirst(plan_list_item);
-				plan_list_item = lnext(plan_list_item);
-
-				/*
-				 * Get copy of the queryTree and the plan since this may be modified further down.
-				 */
-				queryTree = copyObject(queryTree);
-				stmt = copyObject(stmt);
-
 				_SPI_current->processed = 0;
 				_SPI_current->lastoid = InvalidOid;
 				_SPI_current->tuptable = NULL;
 
-				if (queryTree->commandType == CMD_UTILITY)
+				if (IsA(stmt, PlannedStmt))
+				{
+					canSetTag = ((PlannedStmt *) stmt)->canSetTag;
+				}
+				else
 				{
-					if (IsA(queryTree->utilityStmt, CopyStmt))
+					/* utilities are canSetTag if only thing in list */
+					canSetTag = (list_length(stmt_list) == 1);
+
+					if (IsA(stmt, CopyStmt))
 					{
-						CopyStmt   *stmt = (CopyStmt *) queryTree->utilityStmt;
+						CopyStmt   *cstmt = (CopyStmt *) stmt;
 
-						if (stmt->filename == NULL)
+						if (cstmt->filename == NULL)
 						{
 							my_res = SPI_ERROR_COPY;
 							goto fail;
 						}
 					}
-					else if (IsA(queryTree->utilityStmt, DeclareCursorStmt) ||
-							 IsA(queryTree->utilityStmt, ClosePortalStmt) ||
-							 IsA(queryTree->utilityStmt, FetchStmt))
-					{
-						my_res = SPI_ERROR_CURSOR;
-						goto fail;
-					}
-					else if (IsA(queryTree->utilityStmt, TransactionStmt))
+					else if (IsA(stmt, TransactionStmt))
 					{
 						my_res = SPI_ERROR_TRANSACTION;
 						goto fail;
 					}
 				}
 
-				if (read_only && !QueryIsReadOnly(queryTree))
+				if (read_only && !CommandIsReadOnly(stmt))
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					/* translator: %s is a SQL statement name */
 					   errmsg("%s is not allowed in a non-volatile function",
-							  CreateCommandTag((Node*)queryTree))));
+							  CreateCommandTag(stmt))));
 
 				/*
 				 * If not read-only mode, advance the command counter before
@@ -1777,7 +1867,7 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 				if (!read_only)
 					CommandCounterIncrement();
 
-				dest = CreateDestReceiver(queryTree->canSetTag ? DestSPI : DestNone,
+				dest = CreateDestReceiver(canSetTag ? DestSPI : DestNone,
 										  NULL);
 
 				if (snapshot == InvalidSnapshot)
@@ -1800,27 +1890,14 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 					 */
 					ActiveSnapshot = CopySnapshot(snapshot);
 					if (!read_only)
-						ActiveSnapshot->curcid = GetCurrentCommandId();
+						ActiveSnapshot->curcid = GetCurrentCommandId(false);
 				}
 
-				if (queryTree->commandType == CMD_UTILITY)
+				if (IsA(stmt, PlannedStmt) &&
+					((PlannedStmt *) stmt)->utilityStmt == NULL)
 				{
-					ProcessUtility(queryTree->utilityStmt,
-								   plan->query,
-								   paramLI,
-								   false, /* not top level */
-								   dest, 
-								   NULL);
-					/* Update "processed" if stmt returned tuples */
-					if (_SPI_current->tuptable)
-						_SPI_current->processed = _SPI_current->tuptable->alloced - _SPI_current->tuptable->free;
-					res = SPI_OK_UTILITY;
-				}
-				else
-				{
-					Assert(stmt); /* s.b. NULL only for utility command */
-
-					qdesc = CreateQueryDesc(stmt, plan->query,
+					qdesc = CreateQueryDesc((PlannedStmt *) stmt,
+											plansource->query_string,
 											ActiveSnapshot,
 											crosscheck_snapshot,
 											dest,
@@ -1831,12 +1908,12 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
                     		&& log_min_messages < DEBUG4)
                     {
                     	/* For log level of DEBUG4, gpmon is sent information about SPI internal queries as well */
-                    	Assert(plan->query);
-            			gpmon_qlog_query_text(qdesc->gpmon_pkt,
-            					plan->query,
-            					application_name,
-            					NULL /* resqueue name*/,
-            					NULL /* priority */);
+						Assert(plansource->query_string);
+						gpmon_qlog_query_text(qdesc->gpmon_pkt,
+											  plansource->query_string,
+											  application_name,
+											  NULL /* resqueue name */,
+											  NULL /* priority */);
                     }
                     else
                     {
@@ -1845,9 +1922,22 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
                     }
 
 					res = _SPI_pquery(qdesc, fire_triggers,
-									  queryTree->canSetTag ? tcount : 0);
+									  canSetTag ? tcount : 0);
 					FreeQueryDesc(qdesc);
 				}
+				else
+				{
+					ProcessUtility(stmt,
+								   plansource->query_string,
+								   paramLI,
+								   false,		/* not top level */
+								   dest,
+								   NULL);
+					/* Update "processed" if stmt returned tuples */
+					if (_SPI_current->tuptable)
+						_SPI_current->processed = _SPI_current->tuptable->alloced - _SPI_current->tuptable->free;
+					res = SPI_OK_UTILITY;
+				}
 				FreeSnapshot(ActiveSnapshot);
 				ActiveSnapshot = NULL;
 
@@ -1856,7 +1946,7 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 				 * the caller.	Be careful to free any tuptables not returned,
 				 * to avoid intratransaction memory leak.
 				 */
-				if (queryTree->canSetTag)
+				if (canSetTag)
 				{
 					my_processed = _SPI_current->processed;
 					my_lastoid = _SPI_current->lastoid;
@@ -1876,10 +1966,27 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 					goto fail;
 				}
 			}
+
+			/* Done with this plan, so release refcount */
+			if (cplan)
+				ReleaseCachedPlan(cplan, true);
+			cplan = NULL;
+
+			/*
+			 * If not read-only mode, advance the command counter after the
+			 * last command.  This ensures that its effects are visible, in
+			 * case it was DDL that would affect the next CachedPlanSource.
+			 */
+			if (!read_only)
+				CommandCounterIncrement();
 		}
 
 fail:
 
+		/* We no longer need the cached plan refcount, if any */
+		if (cplan)
+			ReleaseCachedPlan(cplan, true);
+
 		/*
 		 * Pop the error context stack
 		 */
@@ -1887,21 +1994,12 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 	}
 	PG_CATCH();
 	{
-		pfree(current_query_string);
-		debug_query_string = saved_query_string;
-
 		/* Restore global vars and propagate error */
 		ActiveSnapshot = saveActiveSnapshot;
-
-		/* decrement plan use_count */
-		plan->use_count--;
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
-	pfree(current_query_string);
-	debug_query_string = saved_query_string;
-
 	ActiveSnapshot = saveActiveSnapshot;
 
 	/* Save results for caller */
@@ -1914,9 +2012,6 @@ _SPI_execute_plan(_SPI_plan * plan, ParamListInfo paramLI,
 	/* tuptable now is caller's responsibility, not SPI's */
 	_SPI_current->tuptable = NULL;
 
-	/* plan execution is done */
-	plan->use_count--;
-
 	/*
 	 * If none of the queries had canSetTag, we return the last query's result
 	 * code, but not its auxiliary results (for backwards compatibility).
@@ -1961,7 +2056,6 @@ _SPI_convert_params(int nargs, Oid *argtypes,
 	return paramLI;
 }
 
-
 /*
  * Assign memory for a query before executing through SPI.
  * There are two possibilities:
@@ -1996,7 +2090,7 @@ _SPI_assign_query_mem(QueryDesc * queryDesc)
 }
 
 static int
-_SPI_pquery(QueryDesc * queryDesc, bool fire_triggers, long tcount)
+_SPI_pquery(QueryDesc *queryDesc, bool fire_triggers, long tcount)
 {
 	int			operation = queryDesc->operation;
 	int			res;
@@ -2004,6 +2098,7 @@ _SPI_pquery(QueryDesc * queryDesc, bool fire_triggers, long tcount)
 	switch (operation)
 	{
 		case CMD_SELECT:
+			Assert(queryDesc->plannedstmt->utilityStmt == NULL);
 			if (queryDesc->plannedstmt->intoClause)		/* select into table? */
 				res = SPI_OK_SELINTO;
 			else if (queryDesc->dest->mydest != DestSPI)
@@ -2226,7 +2321,7 @@ _SPI_error_callback(void *arg)
  *	Do a FETCH or MOVE in a cursor
  */
 static void
-_SPI_cursor_operation(Portal portal, bool forward, long count,
+_SPI_cursor_operation(Portal portal, FetchDirection direction, long count,
 					  DestReceiver *dest)
 {
 	int64		nfetched;
@@ -2250,7 +2345,7 @@ _SPI_cursor_operation(Portal portal, bool forward, long count,
 
 	/* Run the cursor */
 	nfetched = PortalRunFetch(portal,
-							  forward ? FETCH_FORWARD : FETCH_BACKWARD,
+							  direction,
 							  count,
 							  dest);
 
@@ -2348,24 +2443,18 @@ _SPI_checktuples(void)
 	return failed;
 }
 
+/*
+ * Make an "unsaved" copy of the given plan, in a child context of parentcxt.
+ */
 static SPIPlanPtr
-_SPI_copy_plan(SPIPlanPtr plan, int location)
+_SPI_copy_plan(SPIPlanPtr plan, MemoryContext parentcxt)
 {
-	SPIPlanPtr  newplan;
-	MemoryContext oldcxt;
+	SPIPlanPtr	newplan;
 	MemoryContext plancxt;
-	MemoryContext parentcxt;
+	MemoryContext oldcxt;
+	ListCell   *lc;
 
-	elog(DEBUG1, "_SPI_copy_plan");
-
-	/* Determine correct parent for the plan's memory context */
-	if (location == _SPI_CPLAN_PROCXT)
-		parentcxt = _SPI_current->procCxt;
-	else if (location == _SPI_CPLAN_TOPCXT)
-		parentcxt = TopMemoryContext;
-	else
-		/* (this case not currently used) */
-		parentcxt = CurrentMemoryContext;
+	Assert(!plan->saved);		/* not currently supported */
 
 	/*
 	 * Create a memory context for the plan.  We don't expect the plan to be
@@ -2380,31 +2469,87 @@ _SPI_copy_plan(SPIPlanPtr plan, int location)
 
 	/* Copy the SPI plan into its own context */
 	newplan = (SPIPlanPtr) palloc(sizeof(_SPI_plan));
+	newplan->magic = _SPI_PLAN_MAGIC;
+	newplan->saved = false;
+	newplan->plancache_list = NIL;
 	newplan->plancxt = plancxt;
-	newplan->query = pstrdup(plan->query);
-	newplan->qtlist = (List *) copyObject(plan->qtlist);
-	/* We don't copy the list directly, like this,
-	 *     newplan->ptlist = (List *) copyObject(plan->ptlist);
-	 * because we want to propagate the memory context into to PlannedStmt 
-	 * nodes for dispatch.  
-	 *
-	 * TO DO Simplify this when dispatch no longer modifies the Plan.
-	 */
+	newplan->cursor_options = plan->cursor_options;
+	newplan->nargs = plan->nargs;
+	if (plan->nargs > 0)
 	{
-		ListCell *lc;
-		newplan->ptlist = NIL;
-		foreach (lc, plan->ptlist)
-		{
-			Node *node = copyObject(lfirst(lc));
-			if (IsA(node, PlannedStmt))
-			{
-				PlannedStmt *ps = (PlannedStmt*) node;
-				ps->qdContext = plancxt;
-			}
-			newplan->ptlist = lappend(newplan->ptlist, node);
-		}
+		newplan->argtypes = (Oid *) palloc(plan->nargs * sizeof(Oid));
+		memcpy(newplan->argtypes, plan->argtypes, plan->nargs * sizeof(Oid));
+	}
+	else
+		newplan->argtypes = NULL;
+
+	foreach(lc, plan->plancache_list)
+	{
+		CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc);
+		CachedPlanSource *newsource;
+		CachedPlan *cplan;
+		CachedPlan *newcplan;
+
+		/* Note: we assume we don't need to revalidate the plan */
+		cplan = plansource->plan;
+
+		newsource = (CachedPlanSource *) palloc0(sizeof(CachedPlanSource));
+		newcplan = (CachedPlan *) palloc0(sizeof(CachedPlan));
+
+		newsource->raw_parse_tree = copyObject(plansource->raw_parse_tree);
+		newsource->query_string = pstrdup(plansource->query_string);
+		newsource->commandTag = plansource->commandTag;
+		newsource->param_types = newplan->argtypes;
+		newsource->num_params = newplan->nargs;
+		newsource->fully_planned = plansource->fully_planned;
+		newsource->fixed_result = plansource->fixed_result;
+		/* no need to worry about seach_path, generation or saved_xmin */
+		if (plansource->resultDesc)
+			newsource->resultDesc = CreateTupleDescCopy(plansource->resultDesc);
+		newsource->plan = newcplan;
+
+		newcplan->stmt_list = copyObject(cplan->stmt_list);
+		newcplan->fully_planned = cplan->fully_planned;
+
+		newplan->plancache_list = lappend(newplan->plancache_list, newsource);
 	}
-	
+
+	MemoryContextSwitchTo(oldcxt);
+
+	return newplan;
+}
+
+/*
+ * Make a "saved" copy of the given plan, entrusting everything to plancache.c
+ */
+static SPIPlanPtr
+_SPI_save_plan(SPIPlanPtr plan)
+{
+	SPIPlanPtr	newplan;
+	MemoryContext plancxt;
+	MemoryContext oldcxt;
+	ListCell   *lc;
+
+	Assert(!plan->saved);		/* not currently supported */
+
+	/*
+	 * Create a memory context for the plan.  We don't expect the plan to be
+	 * very large, so use smaller-than-default alloc parameters.
+	 */
+	plancxt = AllocSetContextCreate(CacheMemoryContext,
+									"SPI Plan",
+									ALLOCSET_SMALL_MINSIZE,
+									ALLOCSET_SMALL_INITSIZE,
+									ALLOCSET_SMALL_MAXSIZE);
+	oldcxt = MemoryContextSwitchTo(plancxt);
+
+	/* Copy the SPI plan into its own context */
+	newplan = (SPIPlanPtr) palloc(sizeof(_SPI_plan));
+	newplan->magic = _SPI_PLAN_MAGIC;
+	newplan->saved = true;
+	newplan->plancache_list = NIL;
+	newplan->plancxt = plancxt;
+	newplan->cursor_options = plan->cursor_options;
 	newplan->nargs = plan->nargs;
 	if (plan->nargs > 0)
 	{
@@ -2414,7 +2559,27 @@ _SPI_copy_plan(SPIPlanPtr plan, int location)
 	else
 		newplan->argtypes = NULL;
 
-	newplan->use_count = plan->use_count;
+	foreach(lc, plan->plancache_list)
+	{
+		CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc);
+		CachedPlanSource *newsource;
+		CachedPlan *cplan;
+
+		/* Note: we assume we don't need to revalidate the plan */
+		cplan = plansource->plan;
+
+		newsource = CreateCachedPlan(plansource->raw_parse_tree,
+									 plansource->query_string,
+									 plansource->commandTag,
+									 newplan->argtypes,
+									 newplan->nargs,
+									 newplan->cursor_options,
+									 cplan->stmt_list,
+									 true,
+									 false);
+
+		newplan->plancache_list = lappend(newplan->plancache_list, newsource);
+	}
 
 	MemoryContextSwitchTo(oldcxt);
 
diff --git a/src/backend/executor/test/nodeSubplan_test.c b/src/backend/executor/test/nodeSubplan_test.c
index 7c1aeb1ae053..6f0cc0d6e152 100644
--- a/src/backend/executor/test/nodeSubplan_test.c
+++ b/src/backend/executor/test/nodeSubplan_test.c
@@ -43,26 +43,9 @@ test__ExecSetParamPlan__Check_Dispatch_Results(void **state)
 	PlannedStmt   *plannedstmt = (PlannedStmt *)palloc(sizeof(PlannedStmt));
 	QueryDesc *queryDesc = (QueryDesc *)palloc(sizeof(QueryDesc));
 	queryDesc->plannedstmt = plannedstmt;
-	queryDesc->estate = (EState *)palloc(sizeof(EState));
+	queryDesc->estate = CreateExecutorState();
 	queryDesc->estate->es_sliceTable = (SliceTable *) palloc(sizeof(SliceTable));
 	
-	/*QueryDescriptor generated when shouldDispatch is true.*/
-	QueryDesc *internalQueryDesc = (QueryDesc *)palloc(sizeof(QueryDesc));
-	internalQueryDesc->estate = (EState *)palloc(sizeof(EState));
-	/* Added to force assertion on queryDesc->estate->interconnect_context;
-	to fail */
-	internalQueryDesc->estate->interconnect_context=NULL;
-	internalQueryDesc->estate->es_sliceTable = (SliceTable *) palloc(sizeof(SliceTable));
-
-	expect_any(CreateQueryDesc,plannedstmt);
-	expect_any(CreateQueryDesc,sourceText);
-	expect_any(CreateQueryDesc,snapshot);
-	expect_any(CreateQueryDesc,crosscheck_snapshot);
-	expect_any(CreateQueryDesc,dest);
-	expect_any(CreateQueryDesc,params);
-	expect_any(CreateQueryDesc,doInstrument);
-	will_return(CreateQueryDesc,internalQueryDesc);
-	
 	Gp_role = GP_ROLE_DISPATCH;
 	plan->planstate->plan->dispatch=DISPATCH_PARALLEL;
 
diff --git a/src/backend/executor/tstoreReceiver.c b/src/backend/executor/tstoreReceiver.c
index 97c189284e23..d4a0898e9fb5 100644
--- a/src/backend/executor/tstoreReceiver.c
+++ b/src/backend/executor/tstoreReceiver.c
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/tstoreReceiver.c,v 1.17.2.1 2008/12/01 17:06:35 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/tstoreReceiver.c,v 1.19.2.2 2009/12/29 17:41:18 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -95,11 +95,8 @@ static void
 tstoreReceiveSlot_notoast(TupleTableSlot *slot, DestReceiver *self)
 {
 	TStoreState *myState = (TStoreState *) self;
-	MemoryContext oldcxt = MemoryContextSwitchTo(myState->cxt);
 
 	tuplestore_puttupleslot(myState->tstore, slot);
-
-	MemoryContextSwitchTo(oldcxt);
 }
 
 /*
diff --git a/src/backend/gp_libpq_fe/fe-exec.c b/src/backend/gp_libpq_fe/fe-exec.c
index 93f4764daaef..addb51071a78 100644
--- a/src/backend/gp_libpq_fe/fe-exec.c
+++ b/src/backend/gp_libpq_fe/fe-exec.c
@@ -1053,7 +1053,6 @@ pqRowProcessor(PGconn *conn, const char **errmsgp)
 	return 0;
 }
 
-
 int
 PQsendGpQuery_shared(PGconn *conn, char *shared_query, int query_len)
 {
diff --git a/src/backend/gpopt/gpdbwrappers.cpp b/src/backend/gpopt/gpdbwrappers.cpp
index 36eebc9dd69d..6b83f57765de 100644
--- a/src/backend/gpopt/gpdbwrappers.cpp
+++ b/src/backend/gpopt/gpdbwrappers.cpp
@@ -2850,6 +2850,9 @@ gpdb::ICdbHashList
 }
 
 // check permissions on range table
+// GPDB_83_MERGE_FIXME: This is a no-op, because we do these permission
+// checks in the executor. I think we can remove this, but I wish someone
+// would confirm.
 void
 gpdb::CheckRTPermissions
 	(
@@ -2858,7 +2861,7 @@ gpdb::CheckRTPermissions
 {
 	GP_WRAP_START;
 	{
-		ExecCheckRTPerms(plRangeTable);	
+		//ExecCheckRTPerms(plRangeTable);	
 		return;
 	}
 	GP_WRAP_END;
@@ -2940,12 +2943,13 @@ Expr *
 gpdb::PexprEvaluate
 	(
 	Expr *pexpr,
-	Oid oidResultType
+	Oid oidResultType,
+	int32 iTypeMod
 	)
 {
 	GP_WRAP_START;
 	{
-		return evaluate_expr(pexpr, oidResultType);
+		return evaluate_expr(pexpr, oidResultType, iTypeMod);
 	}
 	GP_WRAP_END;
 	return NULL;
@@ -3065,7 +3069,13 @@ static int64 mdcache_invalidation_counter = 0;
 static int64 last_mdcache_invalidation_counter = 0;
 
 static void
-mdcache_invalidation_counter_callback(Datum arg, Oid relid)
+mdsyscache_invalidation_counter_callback(Datum arg, int cacheid,  ItemPointer tuplePtr)
+{
+	mdcache_invalidation_counter++;
+}
+
+static void
+mdrelcache_invalidation_counter_callback(Datum arg, Oid relid)
 {
 	mdcache_invalidation_counter++;
 }
@@ -3129,12 +3139,12 @@ register_mdcache_invalidation_callbacks(void)
 	for (i = 0; i < lengthof(metadata_caches); i++)
 	{
 		CacheRegisterSyscacheCallback(metadata_caches[i],
-									  &mdcache_invalidation_counter_callback,
+									  &mdsyscache_invalidation_counter_callback,
 									  (Datum) 0);
 	}
 
 	/* also register the relcache callback */
-	CacheRegisterRelcacheCallback(&mdcache_invalidation_counter_callback,
+	CacheRegisterRelcacheCallback(&mdrelcache_invalidation_counter_callback,
 								  (Datum) 0);
 }
 
diff --git a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
index c5764cf50fea..aebdec0dab81 100644
--- a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
+++ b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
@@ -370,8 +370,7 @@ CTranslatorDXLToPlStmt::SetInitPlanVariables(PlannedStmt* pplstmt)
 		pplstmt->planTree->nInitPlans = m_pctxdxltoplstmt->UlCurrentParamId();
 	}
 
-	pplstmt->planTree->nParamExec = m_pctxdxltoplstmt->UlCurrentParamId();
-	pplstmt->nCrossLevelParams = m_pctxdxltoplstmt->UlCurrentParamId();
+	pplstmt->nParamExec = m_pctxdxltoplstmt->UlCurrentParamId();
 
 	// Extract all subplans defined in the planTree
 	List *plSubPlans = gpdb::PlExtractNodesPlan(pplstmt->planTree, T_SubPlan, true);
@@ -3738,7 +3737,7 @@ CTranslatorDXLToPlStmt::PshscanFromDXLSharedScan
 
 	GPOS_ASSERT(SHARE_NOTSHARED != pshscan->share_type);
 
-	Plan *pplan = &(pshscan->plan);
+	Plan *pplan = &(pshscan->scan.plan);
 	pplan->plan_node_id = m_pctxdxltoplstmt->UlNextPlanId();
 	pplan->plan_parent_node_id = IPlanId(pplanParent);
 
@@ -3827,7 +3826,7 @@ CTranslatorDXLToPlStmt::PshscanFromDXLCTEProducer
 	// create the shared input scan representing the CTE Producer
 	ShareInputScan *pshscanCTEProducer = MakeNode(ShareInputScan);
 	pshscanCTEProducer->share_id = ulCTEId;
-	Plan *pplan = &(pshscanCTEProducer->plan);
+	Plan *pplan = &(pshscanCTEProducer->scan.plan);
 	pplan->plan_node_id = m_pctxdxltoplstmt->UlNextPlanId();
 	pplan->plan_parent_node_id = IPlanId(pplanParent);
 
@@ -3978,9 +3977,9 @@ CTranslatorDXLToPlStmt::InitializeSpoolingInfo
 		ShareInputScan *pshscanConsumer = (ShareInputScan *) lfirst(plcShscanCTEConsumer);
 		pshscanConsumer->share_type = share_type;
 		pshscanConsumer->driver_slice = -1; // default
-		if (NULL == (pshscanConsumer->plan).flow)
+		if (NULL == (pshscanConsumer->scan.plan).flow)
 		{
-			(pshscanConsumer->plan).flow = (Flow *) gpdb::PvCopyObject(pflow);
+			(pshscanConsumer->scan.plan).flow = (Flow *) gpdb::PvCopyObject(pflow);
 		}
 	}
 }
@@ -4006,7 +4005,7 @@ CTranslatorDXLToPlStmt::PflowCTEConsumer
 	ForEach (plcShscanCTEConsumer, plshscanCTEConsumer)
 	{
 		ShareInputScan *pshscanConsumer = (ShareInputScan *) lfirst(plcShscanCTEConsumer);
-		Flow *pflowCte = (pshscanConsumer->plan).flow;
+		Flow *pflowCte = (pshscanConsumer->scan.plan).flow;
 		if (NULL != pflowCte)
 		{
 			if (NULL == pflow)
@@ -4052,7 +4051,7 @@ CTranslatorDXLToPlStmt::PshscanFromDXLCTEConsumer
 	ShareInputScan *pshscanCTEConsumer = MakeNode(ShareInputScan);
 	pshscanCTEConsumer->share_id = ulCTEId;
 
-	Plan *pplan = &(pshscanCTEConsumer->plan);
+	Plan *pplan = &(pshscanCTEConsumer->scan.plan);
 	pplan->plan_node_id = m_pctxdxltoplstmt->UlNextPlanId();
 	pplan->plan_parent_node_id = IPlanId(pplanParent);
 
diff --git a/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp b/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp
index e7a96c237c84..ba9fc6c4a08b 100644
--- a/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp
+++ b/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp
@@ -1449,6 +1449,7 @@ CTranslatorDXLToScalar::PconstOid
 
 	Const *pconst = MakeNode(Const);
 	pconst->consttype = CMDIdGPDB::PmdidConvert(pdxldatumOid->Pmdid())->OidObjectId();
+	pconst->consttypmod = -1;
 	pconst->constbyval = pdxldatumOid->FByValue();
 	pconst->constisnull = pdxldatumOid->FNull();
 	pconst->constlen = pdxldatumOid->UlLength();
@@ -1484,6 +1485,7 @@ CTranslatorDXLToScalar::PconstInt2
 
 	Const *pconst = MakeNode(Const);
 	pconst->consttype = CMDIdGPDB::PmdidConvert(pdxldatumint2->Pmdid())->OidObjectId();
+	pconst->consttypmod = -1;
 	pconst->constbyval = pdxldatumint2->FByValue();
 	pconst->constisnull = pdxldatumint2->FNull();
 	pconst->constlen = pdxldatumint2->UlLength();
@@ -1519,6 +1521,7 @@ CTranslatorDXLToScalar::PconstInt4
 
 	Const *pconst = MakeNode(Const);
 	pconst->consttype = CMDIdGPDB::PmdidConvert(pdxldatumint4->Pmdid())->OidObjectId();
+	pconst->consttypmod = -1;
 	pconst->constbyval = pdxldatumint4->FByValue();
 	pconst->constisnull = pdxldatumint4->FNull();
 	pconst->constlen = pdxldatumint4->UlLength();
@@ -1553,6 +1556,7 @@ CTranslatorDXLToScalar::PconstInt8
 
 	Const *pconst = MakeNode(Const);
 	pconst->consttype = CMDIdGPDB::PmdidConvert(pdxldatumint8->Pmdid())->OidObjectId();
+	pconst->consttypmod = -1;
 	pconst->constbyval = pdxldatumint8->FByValue();
 	pconst->constisnull = pdxldatumint8->FNull();
 	pconst->constlen = pdxldatumint8->UlLength();
@@ -1587,6 +1591,7 @@ CTranslatorDXLToScalar::PconstBool
 
 	Const *pconst = MakeNode(Const);
 	pconst->consttype = CMDIdGPDB::PmdidConvert(pdxldatumbool->Pmdid())->OidObjectId();
+	pconst->consttypmod = -1;
 	pconst->constbyval = pdxldatumbool->FByValue();
 	pconst->constisnull = pdxldatumbool->FNull();
 	pconst->constlen = pdxldatumbool->UlLength();
@@ -1622,6 +1627,7 @@ CTranslatorDXLToScalar::PconstGeneric
 
 	Const *pconst = MakeNode(Const);
 	pconst->consttype = CMDIdGPDB::PmdidConvert(pdxldatumgeneric->Pmdid())->OidObjectId();
+	pconst->consttypmod = -1;
 	pconst->constbyval = pdxldatumgeneric->FByValue();
 	pconst->constisnull = pdxldatumgeneric->FNull();
 	pconst->constlen = pdxldatumgeneric->UlLength();
@@ -1897,7 +1903,6 @@ CTranslatorDXLToScalar::PexprArrayRef
 	ArrayRef *parrayref = MakeNode(ArrayRef);
 	parrayref->refarraytype = CMDIdGPDB::PmdidConvert(pdxlop->PmdidArray())->OidObjectId();
 	parrayref->refelemtype = CMDIdGPDB::PmdidConvert(pdxlop->PmdidElem())->OidObjectId();
-	parrayref->refrestype = CMDIdGPDB::PmdidConvert(pdxlop->PmdidReturn())->OidObjectId();
 
 	const ULONG ulArity = pdxlnArrayref->UlArity();
 	GPOS_ASSERT(3 == ulArity || 4 == ulArity);
diff --git a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
index de71eda95832..ad56d671b5dc 100644
--- a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
@@ -419,10 +419,17 @@ CTranslatorQueryToDXL::CheckSupportedCmdType
 
 	if (CMD_INSERT == pquery->commandType || CMD_DELETE == pquery->commandType || CMD_UPDATE == pquery->commandType)
 	{
+	  // GPDB_83_MERGE_FIXME: resultRelations was moved from Query to PlannedStmt. But
+	  // we're supposed to do the planning, so I assume we don't have easy access to
+	  // PlannedStmt here. I'm actually confused how this ever worked; I would've expected
+	  // resultRelations to not be filled in before planning. Or maybe it's filled in
+	  // at rewrite phase; not sure.
+#if 0
 		if (NULL != pquery->resultRelations)
 		{
 			GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature, GPOS_WSZ_LIT("DML on partitioned tables"));
 		}
+#endif
 		return;
 	}
 
@@ -484,6 +491,8 @@ CTranslatorQueryToDXL::PdrgpdxlnCTE() const
 CDXLNode *
 CTranslatorQueryToDXL::PdxlnFromQueryInternal()
 {
+	// GPDB_83_MERGE_FIXME: Why do we check permissions here? The executor
+	// will do it anyway...
 	CTranslatorUtils::CheckRTEPermissions(m_pquery->rtable);
 	
 	CDXLNode *pdxlnChild = NULL;
diff --git a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp b/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp
index ae1a23fea55e..c487ead463e3 100644
--- a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp
@@ -1922,6 +1922,13 @@ CTranslatorScalarToDXL::PdxlnArrayRef
 	GPOS_ASSERT(IsA(pexpr, ArrayRef));
 
 	const ArrayRef *parrayref = (ArrayRef *) pexpr;
+	Oid restype;
+
+	/* slice and/or store operations yield the array type */
+	if (parrayref->reflowerindexpr || parrayref->refassgnexpr)
+		restype = parrayref->refarraytype;
+	else
+		restype = parrayref->refelemtype;
 
 	CDXLScalarArrayRef *pdxlop =
 			GPOS_NEW(m_pmp) CDXLScalarArrayRef
@@ -1929,7 +1936,7 @@ CTranslatorScalarToDXL::PdxlnArrayRef
 						m_pmp,
 						GPOS_NEW(m_pmp) CMDIdGPDB(parrayref->refelemtype),
 						GPOS_NEW(m_pmp) CMDIdGPDB(parrayref->refarraytype),
-						GPOS_NEW(m_pmp) CMDIdGPDB(parrayref->refrestype)
+						GPOS_NEW(m_pmp) CMDIdGPDB(restype)
 						);
 
 	CDXLNode *pdxln = GPOS_NEW(m_pmp) CDXLNode(m_pmp, pdxlop);
diff --git a/src/backend/gpopt/translate/CTranslatorUtils.cpp b/src/backend/gpopt/translate/CTranslatorUtils.cpp
index 6c4b551eb15b..57ae482bfb02 100644
--- a/src/backend/gpopt/translate/CTranslatorUtils.cpp
+++ b/src/backend/gpopt/translate/CTranslatorUtils.cpp
@@ -591,6 +591,8 @@ CTranslatorUtils::PdrgpmdidResolvePolymorphicTypes
 //		Check if the given mdid array contains any of the polymorphic
 //		types (ANYELEMENT, ANYARRAY)
 //
+// GPDB_83_MERGE_FIXME: What about ANYENUM?
+//
 //---------------------------------------------------------------------------
 BOOL
 CTranslatorUtils::FContainsPolymorphicTypes
diff --git a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp b/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp
index 4823e85836a9..d4b1e7939902 100644
--- a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp
+++ b/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp
@@ -81,7 +81,9 @@ CConstExprEvaluatorProxy::PdxlnEvaluateExpr
 	GPOS_ASSERT(NULL != pexpr);
 
 	// Evaluate the expression
-	Expr *pexprResult = gpdb::PexprEvaluate(pexpr, gpdb::OidExprType((Node *)pexpr));
+	Expr *pexprResult = gpdb::PexprEvaluate(pexpr,
+						gpdb::OidExprType((Node *)pexpr),
+						gpdb::IExprTypeMod((Node *)pexpr));
 
 	if (!IsA(pexprResult, Const))
 	{
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 17aac0fe3970..4a0c1d75addf 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -9,19 +9,11 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/lib/dllist.c,v 1.34 2007/01/05 22:19:29 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/lib/dllist.c,v 1.36 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-
-/* can be used in frontend or backend */
-#ifdef FRONTEND
-#include "postgres_fe.h"
-/* No assert checks in frontend ... */
-#define Assert(condition)
-#else
 #include "postgres.h"
-#endif
 
 #include "lib/dllist.h"
 
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index 6861ed495a10..67fc4326838b 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -49,9 +49,7 @@ initStringInfo(StringInfo str)
 
 	str->data = (char *) palloc(size);
 	str->maxlen = size;
-	str->len = 0;
-	str->data[0] = '\0';
-	str->cursor = 0;
+	resetStringInfo(str);
 }
 
 /*
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 3047991c094c..40f65ed1beab 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.148 2007/02/08 04:52:18 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.164.2.5 2009/10/16 22:08:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -92,14 +92,8 @@ static bool ident_unix(int sock, char *ident_user);
 #define PGSQL_PAM_SERVICE "postgresql"	/* Service name passed to PAM */
 
 static int	CheckPAMAuth(Port *port, char *user, char *password);
-
-#if defined(pg_on_solaris) || (_AIX)
-static int pam_passwd_conv_proc(int num_msg, struct pam_message **msg,
-                    struct pam_response **resp, void *appdata_ptr);
-#else
 static int pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg,
                      struct pam_response ** resp, void *appdata_ptr);
-#endif
 
 static struct pam_conv pam_passw_conv = {
 	&pam_passwd_conv_proc,
@@ -215,6 +209,7 @@ static int pg_SSPI_recvauth(Port *port);
 #endif
 static int	CheckRADIUSAuth(Port *port);
 
+
 /*
  * Maximum accepted size of GSS and SSPI authentication tokens.
  *
@@ -236,7 +231,6 @@ static int	CheckRADIUSAuth(Port *port);
  *----------------------------------------------------------------
  */
 
-
 /*
  * Tell the user the authentication failed, but not (much about) why.
  *
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 88022ad2b44a..1b7a0120368e 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -110,7 +110,6 @@ static bool ssl_loaded_verify_locations = false;
 
 /* GUC variable controlling SSL cipher list */
 char	   *SSLCipherSuites = NULL;
-
 #endif
 
 /* ------------------------------------------------------------ */
@@ -270,7 +269,7 @@ secure_read(Port *port, void *ptr, size_t len)
 #ifdef WIN32
 				pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl),
 											(err == SSL_ERROR_WANT_READ) ?
-								   FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE,
+									FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE,
 											INFINITE);
 #endif
 				goto rloop;
@@ -393,7 +392,7 @@ secure_write(Port *port, void *ptr, size_t len)
 #ifdef WIN32
 				pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl),
 											(err == SSL_ERROR_WANT_READ) ?
-								   FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE,
+									FD_READ | FD_CLOSE : FD_WRITE | FD_CLOSE,
 											INFINITE);
 #endif
 				goto wloop;
@@ -775,6 +774,12 @@ initialize_SSL(void)
 					(errmsg("could not create SSL context: %s",
 							SSLerrmessage())));
 
+		/*
+		 * Disable OpenSSL's moving-write-buffer sanity check, because it
+		 * causes unnecessary failures in nonblocking send cases.
+		 */
+		SSL_CTX_set_mode(SSL_context, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+
 		/*
 		 * Load and verify server's certificate and private key
 		 */
@@ -879,9 +884,9 @@ initialize_SSL(void)
 						  X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
 #else
 				ereport(LOG,
-						(errmsg("SSL certificate revocation list file \"%s\" ignored",
-								ROOT_CRL_FILE),
-				  errdetail("SSL library does not support certificate revocation lists.")));
+				(errmsg("SSL certificate revocation list file \"%s\" ignored",
+						ROOT_CRL_FILE),
+				 errdetail("SSL library does not support certificate revocation lists.")));
 #endif
 			}
 			else
@@ -957,7 +962,7 @@ open_server_SSL(Port *port)
 #ifdef WIN32
 				pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl),
 											(err == SSL_ERROR_WANT_READ) ?
-					   FD_READ | FD_CLOSE | FD_ACCEPT : FD_WRITE | FD_CLOSE,
+						FD_READ | FD_CLOSE | FD_ACCEPT : FD_WRITE | FD_CLOSE,
 											INFINITE);
 #endif
 				goto aloop;
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 8df1841d060f..a006e489be42 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -431,7 +431,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
 		}
 #endif
 
-#ifdef IPV6_V6ONLY
+#if defined(IPV6_V6ONLY) && defined(IPPROTO_IPV6)
 		if (addr->ai_family == AF_INET6)
 		{
 			if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
@@ -524,6 +524,14 @@ static int
 Lock_AF_UNIX(unsigned short portNumber, char *unixSocketName)
 {
 	UNIXSOCK_PATH(sock_path, portNumber, unixSocketName);
+	if (strlen(sock_path) >= UNIXSOCK_PATH_BUFLEN)
+	{
+		ereport(LOG,
+				(errmsg("Unix-domain socket path \"%s\" is too long (maximum %d bytes)",
+						sock_path,
+						(int) (UNIXSOCK_PATH_BUFLEN - 1))));
+		return STATUS_ERROR;
+	}
 
 	/*
 	 * Grab an interlock file associated with the socket file.
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 2a8e9800f2ce..30c79ac4872a 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -218,7 +218,7 @@ pq_send_ascii_string(StringInfo buf, const char *str)
 {
 	while (*str)
 	{
-		char		ch = *str++;
+		char	ch = *str++;
 
 		if (IS_HIGHBIT_SET(ch))
 			ch = '?';
diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c
index 9577bc49e417..7fce43f703ea 100644
--- a/src/backend/nodes/bitmapset.c
+++ b/src/backend/nodes/bitmapset.c
@@ -14,13 +14,14 @@
  * Copyright (c) 2003-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/bitmapset.c,v 1.12 2007/01/05 22:19:29 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/bitmapset.c,v 1.14 2008/01/01 19:45:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "nodes/bitmapset.h"
+#include "access/hash.h"
 
 
 #define WORDNUM(x)	((int)((unsigned)(x) >> BITS_PER_BITMAPWORD_LOG2))
@@ -923,36 +924,23 @@ bms_first_member(Bitmapset *a)
  *
  * Note: we must ensure that any two bitmapsets that are bms_equal() will
  * hash to the same value; in practice this means that trailing all-zero
- * words cannot affect the result.	The circular-shift-and-XOR hash method
- * used here has this property, so long as we work from back to front.
- *
- * Note: you might wonder why we bother with the circular shift; at first
- * glance a straight longitudinal XOR seems as good and much simpler.  The
- * reason is empirical: this gives a better distribution of hash values on
- * the bitmapsets actually generated by the planner.  A common way to have
- * multiword bitmapsets is "a JOIN b JOIN c JOIN d ...", which gives rise
- * to rangetables in which base tables and JOIN nodes alternate; so
- * bitmapsets of base table RT indexes tend to use only odd-numbered or only
- * even-numbered bits.	A straight longitudinal XOR would preserve this
- * property, leading to a much smaller set of possible outputs than if
- * we include a shift.
+ * words must not affect the result.  Hence we strip those before applying
+ * hash_any().
  */
 uint32
 bms_hash_value(const Bitmapset *a)
 {
-	bitmapword	result = 0;
-	int			wordnum;
+	int			lastword;
 
-	if (a == NULL || a->nwords <= 0)
+	if (a == NULL)
 		return 0;				/* All empty sets hash to 0 */
-	for (wordnum = a->nwords; --wordnum > 0;)
+	for (lastword = a->nwords; --lastword >= 0;)
 	{
-		result ^= a->words[wordnum];
-		if (result & ((bitmapword) 1 << (BITS_PER_BITMAPWORD - 1)))
-			result = (result << 1) | 1;
-		else
-			result = (result << 1);
+		if (a->words[lastword] != 0)
+			break;
 	}
-	result ^= a->words[0];
-	return (uint32) result;
+	if (lastword < 0)
+		return 0;				/* All empty sets hash to 0 */
+	return DatumGetUInt32(hash_any((const unsigned char *) a->words,
+								   (lastword + 1) * sizeof(bitmapword)));
 }
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 2bd2dd08869a..72a6053c1eb4 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -16,7 +16,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.366 2007/02/19 02:23:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.388.2.2 2010/08/18 15:22:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,7 @@
 #include "access/attnum.h"
 #include "catalog/caqlparse.h"
 #include "catalog/gp_policy.h"
+#include "miscadmin.h"
 #include "nodes/plannodes.h"
 #include "nodes/execnodes.h" /* CdbProcess, Slice, and SliceTable. */
 #include "nodes/relation.h"
@@ -90,6 +91,66 @@
  * ****************************************************************
  */
 
+/*
+ * _copyPlannedStmt
+ */
+static PlannedStmt *
+_copyPlannedStmt(PlannedStmt *from)
+{
+	PlannedStmt *newnode = makeNode(PlannedStmt);
+
+	COPY_SCALAR_FIELD(commandType);
+	COPY_SCALAR_FIELD(planGen);
+	COPY_SCALAR_FIELD(canSetTag);
+	COPY_SCALAR_FIELD(transientPlan);
+
+	COPY_NODE_FIELD(planTree);
+	COPY_NODE_FIELD(rtable);
+	COPY_NODE_FIELD(resultRelations);
+
+	COPY_NODE_FIELD(utilityStmt);
+	COPY_NODE_FIELD(intoClause);
+	COPY_NODE_FIELD(subplans);
+	COPY_BITMAPSET_FIELD(rewindPlanIDs);
+	COPY_NODE_FIELD(returningLists);
+	
+	COPY_NODE_FIELD(result_partitions);
+	COPY_NODE_FIELD(result_aosegnos);
+	COPY_NODE_FIELD(queryPartOids);
+	COPY_NODE_FIELD(queryPartsMetadata);
+	COPY_NODE_FIELD(numSelectorsPerScanId);
+	COPY_NODE_FIELD(rowMarks);
+	COPY_NODE_FIELD(relationOids);
+	COPY_NODE_FIELD(invalItems);
+	COPY_SCALAR_FIELD(nParamExec);
+	COPY_SCALAR_FIELD(nMotionNodes);
+	COPY_SCALAR_FIELD(nInitPlans);
+	
+	if (from->intoPolicy)
+	{
+		COPY_POINTER_FIELD(intoPolicy,sizeof(GpPolicy) + from->intoPolicy->nattrs*sizeof(from->intoPolicy->attrs[0]));
+	}
+	else
+		newnode->intoPolicy = NULL;
+
+	COPY_SCALAR_FIELD(query_mem);
+
+	return newnode;
+}
+
+static QueryDispatchDesc *
+_copyQueryDispatchDesc(QueryDispatchDesc *from)
+{
+	QueryDispatchDesc *newnode = makeNode(QueryDispatchDesc);
+
+	COPY_NODE_FIELD(intoOidInfo);
+	COPY_NODE_FIELD(intoTableSpaceName);
+	COPY_NODE_FIELD(sliceTable);
+	COPY_NODE_FIELD(cursorPositions);
+
+	return newnode;
+}
+
 /*
  * CopyPlanFields
  *
@@ -114,7 +175,6 @@ CopyPlanFields(Plan *from, Plan *newnode)
 	COPY_NODE_FIELD(initPlan);
 	COPY_BITMAPSET_FIELD(extParam);
 	COPY_BITMAPSET_FIELD(allParam);
-	COPY_SCALAR_FIELD(nParamExec);
 	COPY_NODE_FIELD(flow);
 	COPY_SCALAR_FIELD(dispatch);
 	COPY_SCALAR_FIELD(nMotionNodes);
@@ -124,7 +184,6 @@ CopyPlanFields(Plan *from, Plan *newnode)
 	COPY_SCALAR_FIELD(directDispatch.isDirectDispatch);
 	COPY_NODE_FIELD(directDispatch.contentIds);
 	COPY_SCALAR_FIELD(operatorMemKB);
-
 }
 
 /*
@@ -147,64 +206,6 @@ CopyLogicalIndexInfo(const LogicalIndexInfo *from, LogicalIndexInfo *newnode)
 	COPY_NODE_FIELD(defaultLevels);
 }
 
-/*
- * _copyPlannedStmt 
- */
-static PlannedStmt *
-_copyPlannedStmt(PlannedStmt *from)
-{
-	PlannedStmt   *newnode = makeNode(PlannedStmt);
-
-	COPY_SCALAR_FIELD(commandType);
-	COPY_SCALAR_FIELD(planGen);
-	COPY_SCALAR_FIELD(canSetTag);
-	COPY_SCALAR_FIELD(transientPlan);
-
-	COPY_NODE_FIELD(planTree);
-	COPY_NODE_FIELD(rtable);
-	
-	COPY_NODE_FIELD(resultRelations);
-	COPY_NODE_FIELD(utilityStmt);
-	COPY_NODE_FIELD(intoClause);
-	COPY_NODE_FIELD(subplans);
-	COPY_NODE_FIELD(returningLists);
-	
-	COPY_NODE_FIELD(result_partitions);
-	COPY_NODE_FIELD(result_aosegnos);
-	COPY_NODE_FIELD(queryPartOids);
-	COPY_NODE_FIELD(queryPartsMetadata);
-	COPY_NODE_FIELD(numSelectorsPerScanId);
-	COPY_NODE_FIELD(rowMarks);
-	COPY_NODE_FIELD(relationOids);
-	COPY_SCALAR_FIELD(invalItems);
-	COPY_SCALAR_FIELD(nCrossLevelParams);
-	COPY_SCALAR_FIELD(nMotionNodes);
-	COPY_SCALAR_FIELD(nInitPlans);
-	
-	if (from->intoPolicy)
-	{
-		COPY_POINTER_FIELD(intoPolicy,sizeof(GpPolicy) + from->intoPolicy->nattrs*sizeof(from->intoPolicy->attrs[0]));
-	}
-	else
-		newnode->intoPolicy = NULL;
-
-	COPY_SCALAR_FIELD(query_mem);
-
-	return newnode;
-}
-
-static QueryDispatchDesc *
-_copyQueryDispatchDesc(QueryDispatchDesc *from)
-{
-	QueryDispatchDesc *newnode = makeNode(QueryDispatchDesc);
-
-	COPY_NODE_FIELD(intoOidInfo);
-	COPY_NODE_FIELD(intoTableSpaceName);
-	COPY_NODE_FIELD(sliceTable);
-
-	return newnode;
-}
-
 /*
  * _copyPlan
  */
@@ -649,6 +650,7 @@ _copySubqueryScan(SubqueryScan *from)
 	 * copy remainder of node
 	 */
 	COPY_NODE_FIELD(subplan);
+	COPY_NODE_FIELD(subrtable);
 
 	COPY_NODE_FIELD(subrtable);
 	
@@ -817,6 +819,10 @@ _copyShareInputScan(ShareInputScan *from)
 	COPY_SCALAR_FIELD(share_type);
 	COPY_SCALAR_FIELD(share_id);
 	COPY_SCALAR_FIELD(driver_slice);
+	COPY_NODE_FIELD(colnames);
+	COPY_NODE_FIELD(coltypes);
+	COPY_NODE_FIELD(coltypmods);
+
 	return newnode;
 }
 
@@ -1050,6 +1056,21 @@ _copyLimit(Limit *from)
 	return newnode;
 }
 
+/*
+ * _copyPlanInvalItem
+ */
+static PlanInvalItem *
+_copyPlanInvalItem(PlanInvalItem *from)
+{
+	PlanInvalItem *newnode = makeNode(PlanInvalItem);
+
+	COPY_SCALAR_FIELD(cacheId);
+	/* tupleId isn't really a "scalar", but this works anyway */
+	COPY_SCALAR_FIELD(tupleId);
+
+	return newnode;
+}
+
 /*
  * _copyMotion
  */
@@ -1084,39 +1105,6 @@ _copyMotion(Motion *from)
 	return newnode;
 }
 
-/*
-* _copyCoerceViaIO
-*/
-static CoerceViaIO *
-_copyCoerceViaIO(CoerceViaIO *from)
-{
-	CoerceViaIO   *newnode = makeNode(CoerceViaIO);
-
-	COPY_NODE_FIELD(arg);
-	COPY_SCALAR_FIELD(resulttype);
-	COPY_SCALAR_FIELD(coerceformat);
-
-	return newnode;
-}
-
-/*
- * _copyArrayCoerceExpr
- */
-static ArrayCoerceExpr *
-_copyArrayCoerceExpr(ArrayCoerceExpr *from)
-{
-	ArrayCoerceExpr   *newnode = makeNode(ArrayCoerceExpr);
-
-	COPY_NODE_FIELD(arg);
-	COPY_SCALAR_FIELD(elemfuncid);
-	COPY_SCALAR_FIELD(resulttype);
-	COPY_SCALAR_FIELD(resulttypmod);
-	COPY_SCALAR_FIELD(isExplicit);
-	COPY_SCALAR_FIELD(coerceformat);
-
-	return newnode;
-}
-
 /*
  * _copyDML
  */
@@ -1282,7 +1270,7 @@ _copyIntoClause(IntoClause *from)
 	COPY_NODE_FIELD(options);
 	COPY_SCALAR_FIELD(onCommit);
 	COPY_STRING_FIELD(tableSpaceName);
-
+	
 	return newnode;
 }
 
@@ -1346,6 +1334,7 @@ _copyConst(Const *from)
 	Const	   *newnode = makeNode(Const);
 
 	COPY_SCALAR_FIELD(consttype);
+	COPY_SCALAR_FIELD(consttypmod);
 	COPY_SCALAR_FIELD(constlen);
 
 	if (from->constbyval || from->constisnull)
@@ -1456,9 +1445,9 @@ _copyArrayRef(ArrayRef *from)
 {
 	ArrayRef   *newnode = makeNode(ArrayRef);
 
-	COPY_SCALAR_FIELD(refrestype);
 	COPY_SCALAR_FIELD(refarraytype);
 	COPY_SCALAR_FIELD(refelemtype);
+	COPY_SCALAR_FIELD(reftypmod);
 	COPY_NODE_FIELD(refupperindexpr);
 	COPY_NODE_FIELD(reflowerindexpr);
 	COPY_NODE_FIELD(refexpr);
@@ -1648,6 +1637,39 @@ _copyRelabelType(RelabelType *from)
 	return newnode;
 }
 
+/*
+ * _copyCoerceViaIO
+ */
+static CoerceViaIO *
+_copyCoerceViaIO(CoerceViaIO *from)
+{
+	CoerceViaIO *newnode = makeNode(CoerceViaIO);
+
+	COPY_NODE_FIELD(arg);
+	COPY_SCALAR_FIELD(resulttype);
+	COPY_SCALAR_FIELD(coerceformat);
+
+	return newnode;
+}
+
+/*
+ * _copyArrayCoerceExpr
+ */
+static ArrayCoerceExpr *
+_copyArrayCoerceExpr(ArrayCoerceExpr *from)
+{
+	ArrayCoerceExpr *newnode = makeNode(ArrayCoerceExpr);
+
+	COPY_NODE_FIELD(arg);
+	COPY_SCALAR_FIELD(elemfuncid);
+	COPY_SCALAR_FIELD(resulttype);
+	COPY_SCALAR_FIELD(resulttypmod);
+	COPY_SCALAR_FIELD(isExplicit);
+	COPY_SCALAR_FIELD(coerceformat);
+
+	return newnode;
+}
+
 /*
  * _copyConvertRowtypeExpr
  */
@@ -1722,7 +1744,7 @@ _copyArrayExpr(ArrayExpr *from)
 	COPY_SCALAR_FIELD(element_typeid);
 	COPY_NODE_FIELD(elements);
 	COPY_SCALAR_FIELD(multidims);
-	COPY_LOCATION_FIELD(location);
+	/* COPY_LOCATION_FIELD(location); */
 
 	return newnode;
 }
@@ -1797,7 +1819,7 @@ _copyMinMaxExpr(MinMaxExpr *from)
 static XmlExpr *
 _copyXmlExpr(XmlExpr *from)
 {
-	XmlExpr *newnode = makeNode(XmlExpr);
+	XmlExpr    *newnode = makeNode(XmlExpr);
 
 	COPY_SCALAR_FIELD(op);
 	COPY_STRING_FIELD(name);
@@ -1916,9 +1938,6 @@ _copyCurrentOfExpr(CurrentOfExpr *from)
 	COPY_STRING_FIELD(cursor_name);
 	COPY_SCALAR_FIELD(cvarno);
 	COPY_SCALAR_FIELD(target_relid);
-	COPY_SCALAR_FIELD(gp_segment_id);
-	COPY_BINARY_FIELD(ctid, sizeof(ItemPointerData));
-	COPY_SCALAR_FIELD(tableoid);
 
 	return newnode;
 }
@@ -2046,7 +2065,7 @@ _copyCdbRelColumnInfo(CdbRelColumnInfo *from)
 static PathKey *
 _copyPathKey(PathKey *from)
 {
-	PathKey *newnode = makeNode(PathKey);
+	PathKey    *newnode = makeNode(PathKey);
 
 	/* EquivalenceClasses are never moved, so just shallow-copy the pointer */
 	COPY_SCALAR_FIELD(pk_eclass);
@@ -2072,6 +2091,7 @@ _copyRestrictInfo(RestrictInfo *from)
 	COPY_SCALAR_FIELD(pseudoconstant);
 	COPY_BITMAPSET_FIELD(clause_relids);
 	COPY_BITMAPSET_FIELD(required_relids);
+	COPY_BITMAPSET_FIELD(nullable_relids);
 	COPY_BITMAPSET_FIELD(left_relids);
 	COPY_BITMAPSET_FIELD(right_relids);
 	COPY_NODE_FIELD(orclause);
@@ -2753,6 +2773,7 @@ _copyQuery(Query *from)
 	COPY_SCALAR_FIELD(hasAggs);
 	COPY_SCALAR_FIELD(hasWindFuncs);
 	COPY_SCALAR_FIELD(hasSubLinks);
+	COPY_SCALAR_FIELD(hasDynamicFunctions);
 	COPY_NODE_FIELD(rtable);
 	COPY_NODE_FIELD(jointree);
 	COPY_NODE_FIELD(targetList);
@@ -2770,11 +2791,9 @@ _copyQuery(Query *from)
 	COPY_NODE_FIELD(limitCount);
 	COPY_NODE_FIELD(rowMarks);
 	COPY_NODE_FIELD(setOperations);
-	COPY_NODE_FIELD(resultRelations);
-	COPY_NODE_FIELD(returningLists);
 	if (from->intoPolicy)
 	{
-		COPY_POINTER_FIELD(intoPolicy,sizeof(GpPolicy) + from->intoPolicy->nattrs*sizeof(from->intoPolicy->attrs[0]));
+		COPY_POINTER_FIELD(intoPolicy, sizeof(GpPolicy) + from->intoPolicy->nattrs * sizeof(from->intoPolicy->attrs[0]));
 	}
 	else
 		newnode->intoPolicy = NULL;
@@ -2873,8 +2892,33 @@ _copyAlterTableStmt(AlterTableStmt *from)
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(cmds);
 	COPY_SCALAR_FIELD(relkind);
-	
-	/* No need to copy AT workspace fields. */
+	COPY_SCALAR_FIELD(oidInfoCount);
+
+	newnode->oidInfo = NULL;
+	if (from->oidInfoCount > 0)
+	{
+		int			m;
+
+		newnode->oidInfo = palloc(sizeof(TableOidInfo) * from->oidInfoCount);
+		for (m = 0; m < from->oidInfoCount; m++)
+		{
+			COPY_SCALAR_FIELD(oidInfo[m].relOid);
+			COPY_SCALAR_FIELD(oidInfo[m].comptypeOid);
+			COPY_SCALAR_FIELD(oidInfo[m].comptypeArrayOid);
+			COPY_SCALAR_FIELD(oidInfo[m].toastOid);
+			COPY_SCALAR_FIELD(oidInfo[m].toastIndexOid);
+			COPY_SCALAR_FIELD(oidInfo[m].toastComptypeOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aosegOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aosegIndexOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aosegComptypeOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aovisimapOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aovisimapIndexOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aovisimapComptypeOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aoblkdirOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aoblkdirIndexOid);
+			COPY_SCALAR_FIELD(oidInfo[m].aoblkdirComptypeOid);
+		}
+	}
 
 	return newnode;
 }
@@ -3043,6 +3087,7 @@ _copyClusterStmt(ClusterStmt *from)
 	COPY_STRING_FIELD(indexname);
 	COPY_SCALAR_FIELD(oidInfo.relOid);
 	COPY_SCALAR_FIELD(oidInfo.comptypeOid);
+	COPY_SCALAR_FIELD(oidInfo.comptypeArrayOid);
 	COPY_SCALAR_FIELD(oidInfo.toastOid);
 	COPY_SCALAR_FIELD(oidInfo.toastIndexOid);
 	COPY_SCALAR_FIELD(oidInfo.toastComptypeOid);
@@ -3095,8 +3140,10 @@ _copyCreateStmt(CreateStmt *from)
 	COPY_SCALAR_FIELD(oncommit);
 	COPY_STRING_FIELD(tablespacename);
 	COPY_NODE_FIELD(distributedBy);
+	COPY_NODE_FIELD(partitionBy);
 	COPY_SCALAR_FIELD(oidInfo.relOid);
 	COPY_SCALAR_FIELD(oidInfo.comptypeOid);
+	COPY_SCALAR_FIELD(oidInfo.comptypeArrayOid);
 	COPY_SCALAR_FIELD(oidInfo.toastOid);
 	COPY_SCALAR_FIELD(oidInfo.toastIndexOid);
 	COPY_SCALAR_FIELD(oidInfo.toastComptypeOid);
@@ -3112,6 +3159,7 @@ _copyCreateStmt(CreateStmt *from)
 	COPY_NODE_FIELD(deferredStmts);
 	COPY_SCALAR_FIELD(is_part_child);
 	COPY_SCALAR_FIELD(is_add_part);
+	COPY_SCALAR_FIELD(is_split_part);
 	COPY_SCALAR_FIELD(ownerid);
 	COPY_SCALAR_FIELD(buildAoBlkdir);
 	COPY_NODE_FIELD(attr_encodings);
@@ -3407,7 +3455,6 @@ _copyIndexStmt(IndexStmt *from)
 	COPY_NODE_FIELD(indexParams);
 	COPY_NODE_FIELD(options);
 	COPY_NODE_FIELD(whereClause);
-	COPY_NODE_FIELD(rangetable);
 	COPY_SCALAR_FIELD(is_part_child);
 	COPY_SCALAR_FIELD(unique);
 	COPY_SCALAR_FIELD(primary);
@@ -3416,7 +3463,7 @@ _copyIndexStmt(IndexStmt *from)
 	COPY_SCALAR_FIELD(constrOid);
 	COPY_SCALAR_FIELD(concurrent);
 	COPY_NODE_FIELD(idxOids);
-	COPY_SCALAR_FIELD(do_part);
+	COPY_SCALAR_FIELD(is_split_part);
 
 	return newnode;
 }
@@ -3571,7 +3618,6 @@ _copyRuleStmt(RuleStmt *from)
 	COPY_SCALAR_FIELD(instead);
 	COPY_NODE_FIELD(actions);
 	COPY_SCALAR_FIELD(replace);
-	COPY_SCALAR_FIELD(ruleOid);
 
 	return newnode;
 }
@@ -3631,6 +3677,20 @@ _copyCompositeTypeStmt(CompositeTypeStmt *from)
 	return newnode;
 }
 
+static CreateEnumStmt *
+_copyCreateEnumStmt(CreateEnumStmt *from)
+{
+	CreateEnumStmt *newnode = makeNode(CreateEnumStmt);
+
+	COPY_NODE_FIELD(typeName);
+	COPY_NODE_FIELD(vals);
+	COPY_SCALAR_FIELD(enumTypeOid);
+	COPY_SCALAR_FIELD(enumArrayOid);
+	COPY_NODE_FIELD(valOids);
+
+	return newnode;
+}
+
 static ViewStmt *
 _copyViewStmt(ViewStmt *from)
 {
@@ -3642,6 +3702,7 @@ _copyViewStmt(ViewStmt *from)
 	COPY_SCALAR_FIELD(replace);
 	COPY_SCALAR_FIELD(relOid);
 	COPY_SCALAR_FIELD(comptypeOid);
+	COPY_SCALAR_FIELD(comptypeArrayOid);
 	COPY_SCALAR_FIELD(rewriteOid);
 
 	return newnode;
@@ -3758,8 +3819,7 @@ _copyAlterDatabaseSetStmt(AlterDatabaseSetStmt *from)
 	AlterDatabaseSetStmt *newnode = makeNode(AlterDatabaseSetStmt);
 
 	COPY_STRING_FIELD(dbname);
-	COPY_STRING_FIELD(variable);
-	COPY_NODE_FIELD(value);
+	COPY_NODE_FIELD(setstmt);
 
 	return newnode;
 }
@@ -3842,6 +3902,7 @@ _copyVariableSetStmt(VariableSetStmt *from)
 {
 	VariableSetStmt *newnode = makeNode(VariableSetStmt);
 
+	COPY_SCALAR_FIELD(kind);
 	COPY_STRING_FIELD(name);
 	COPY_NODE_FIELD(args);
 	COPY_SCALAR_FIELD(is_local);
@@ -3859,12 +3920,12 @@ _copyVariableShowStmt(VariableShowStmt *from)
 	return newnode;
 }
 
-static VariableResetStmt *
-_copyVariableResetStmt(VariableResetStmt *from)
+static DiscardStmt *
+_copyDiscardStmt(DiscardStmt *from)
 {
-	VariableResetStmt *newnode = makeNode(VariableResetStmt);
+	DiscardStmt *newnode = makeNode(DiscardStmt);
 
-	COPY_STRING_FIELD(name);
+	COPY_SCALAR_FIELD(target);
 
 	return newnode;
 }
@@ -4025,8 +4086,7 @@ _copyAlterRoleSetStmt(AlterRoleSetStmt *from)
 	AlterRoleSetStmt *newnode = makeNode(AlterRoleSetStmt);
 
 	COPY_STRING_FIELD(role);
-	COPY_STRING_FIELD(variable);
-	COPY_NODE_FIELD(value);
+	COPY_NODE_FIELD(setstmt);
 
 	return newnode;
 }
@@ -4143,7 +4203,6 @@ _copyPrepareStmt(PrepareStmt *from)
 
 	COPY_STRING_FIELD(name);
 	COPY_NODE_FIELD(argtypes);
-	COPY_NODE_FIELD(argtype_oids);
 	COPY_NODE_FIELD(query);
 
 	return newnode;
@@ -4188,7 +4247,33 @@ _copyReassignOwnedStmt(ReassignOwnedStmt *from)
 	ReassignOwnedStmt *newnode = makeNode(ReassignOwnedStmt);
 
 	COPY_NODE_FIELD(roles);
-	COPY_SCALAR_FIELD(newrole);
+	COPY_STRING_FIELD(newrole);
+
+	return newnode;
+}
+
+static AlterTSDictionaryStmt *
+_copyAlterTSDictionaryStmt(AlterTSDictionaryStmt *from)
+{
+	AlterTSDictionaryStmt *newnode = makeNode(AlterTSDictionaryStmt);
+
+	COPY_NODE_FIELD(dictname);
+	COPY_NODE_FIELD(options);
+
+	return newnode;
+}
+
+static AlterTSConfigurationStmt *
+_copyAlterTSConfigurationStmt(AlterTSConfigurationStmt *from)
+{
+	AlterTSConfigurationStmt *newnode = makeNode(AlterTSConfigurationStmt);
+
+	COPY_NODE_FIELD(cfgname);
+	COPY_NODE_FIELD(tokentype);
+	COPY_NODE_FIELD(dicts);
+	COPY_SCALAR_FIELD(override);
+	COPY_SCALAR_FIELD(replace);
+	COPY_SCALAR_FIELD(missing_ok);
 
 	return newnode;
 }
@@ -4244,6 +4329,18 @@ _copySliceTable(SliceTable *from)
 	return newnode;
 }
 
+static CursorPosInfo *
+_copyCursorPosInfo(CursorPosInfo *from)
+{
+	CursorPosInfo *newnode = makeNode(CursorPosInfo);
+
+	COPY_STRING_FIELD(cursor_name);
+	COPY_SCALAR_FIELD(gp_segment_id);
+	COPY_BINARY_FIELD(ctid, sizeof(ItemPointerData));
+	COPY_SCALAR_FIELD(table_oid);
+
+	return newnode;
+}
 
 
 static CreateQueueStmt *
@@ -4284,6 +4381,7 @@ _copyTableValueExpr(TableValueExpr *from)
 	TableValueExpr *newnode = makeNode(TableValueExpr);
 
 	COPY_NODE_FIELD(subquery);
+	COPY_LOCATION_FIELD(location);
 
 	return newnode;
 }
@@ -4440,6 +4538,9 @@ copyObject(void *from)
 	if (from == NULL)
 		return NULL;
 
+	/* Guard against stack overflow due to overly complex expressions */
+	check_stack_depth();
+
 	switch (nodeTag(from))
 	{
 			/*
@@ -4568,6 +4669,9 @@ copyObject(void *from)
 		case T_Limit:
 			retval = _copyLimit(from);
 			break;
+		case T_PlanInvalItem:
+			retval = _copyPlanInvalItem(from);
+			break;
 		case T_Motion:
 			retval = _copyMotion(from);
 			break;
@@ -4946,6 +5050,9 @@ copyObject(void *from)
 		case T_CompositeTypeStmt:
 			retval = _copyCompositeTypeStmt(from);
 			break;
+		case T_CreateEnumStmt:
+			retval = _copyCreateEnumStmt(from);
+			break;
 		case T_ViewStmt:
 			retval = _copyViewStmt(from);
 			break;
@@ -4997,8 +5104,8 @@ copyObject(void *from)
 		case T_VariableShowStmt:
 			retval = _copyVariableShowStmt(from);
 			break;
-		case T_VariableResetStmt:
-			retval = _copyVariableResetStmt(from);
+		case T_DiscardStmt:
+			retval = _copyDiscardStmt(from);
 			break;
 		case T_CreateFileSpaceStmt:
 			retval = _copyCreateFileSpaceStmt(from);
@@ -5072,6 +5179,12 @@ copyObject(void *from)
 		case T_ReassignOwnedStmt:
 			retval = _copyReassignOwnedStmt(from);
 			break;
+		case T_AlterTSDictionaryStmt:
+			retval = _copyAlterTSDictionaryStmt(from);
+			break;
+		case T_AlterTSConfigurationStmt:
+			retval = _copyAlterTSConfigurationStmt(from);
+			break;
 
 		case T_CreateQueueStmt:
 			retval = _copyCreateQueueStmt(from);
@@ -5227,6 +5340,9 @@ copyObject(void *from)
 		case T_SliceTable:
 			retval = _copySliceTable(from);
 			break;
+		case T_CursorPosInfo:
+			retval = _copyCursorPosInfo(from);
+			break;
 		case T_TableValueExpr:
 			retval = _copyTableValueExpr(from);
 			break;
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 218475d12fe0..8fd86fffe570 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.298 2007/02/03 14:06:54 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.318.2.1 2009/04/16 20:42:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -192,6 +192,7 @@ static bool
 _equalConst(Const *a, Const *b)
 {
 	COMPARE_SCALAR_FIELD(consttype);
+	COMPARE_SCALAR_FIELD(consttypmod);
 	COMPARE_SCALAR_FIELD(constlen);
 	COMPARE_SCALAR_FIELD(constisnull);
 	COMPARE_SCALAR_FIELD(constbyval);
@@ -261,9 +262,9 @@ _equalWindowRef(WindowRef *a, WindowRef *b)
 static bool
 _equalArrayRef(ArrayRef *a, ArrayRef *b)
 {
-	COMPARE_SCALAR_FIELD(refrestype);
 	COMPARE_SCALAR_FIELD(refarraytype);
 	COMPARE_SCALAR_FIELD(refelemtype);
+	COMPARE_SCALAR_FIELD(reftypmod);
 	COMPARE_NODE_FIELD(refupperindexpr);
 	COMPARE_NODE_FIELD(reflowerindexpr);
 	COMPARE_NODE_FIELD(refexpr);
@@ -477,9 +478,9 @@ _equalArrayCoerceExpr(ArrayCoerceExpr *a, ArrayCoerceExpr *b)
 	 * that are equal() to both explicit and implicit coercions.
 	 */
 	if (a->coerceformat != b->coerceformat &&
-			a->coerceformat != COERCE_DONTCARE &&
-			b->coerceformat != COERCE_DONTCARE)
-			return false;
+		a->coerceformat != COERCE_DONTCARE &&
+		b->coerceformat != COERCE_DONTCARE)
+		return false;
 
 	return true;
 }
@@ -538,7 +539,7 @@ _equalArrayExpr(ArrayExpr *a, ArrayExpr *b)
 	COMPARE_SCALAR_FIELD(element_typeid);
 	COMPARE_NODE_FIELD(elements);
 	COMPARE_SCALAR_FIELD(multidims);
-	COMPARE_LOCATION_FIELD(location);
+	/* COMPARE_LOCATION_FIELD(location); */
 
 	return true;
 }
@@ -690,6 +691,7 @@ static bool
 _equalCurrentOfExpr(CurrentOfExpr *a, CurrentOfExpr *b)
 {
 	COMPARE_STRING_FIELD(cursor_name);
+	COMPARE_SCALAR_FIELD(cursor_param);
 	COMPARE_SCALAR_FIELD(cvarno);
 	COMPARE_SCALAR_FIELD(target_relid);
 
@@ -768,9 +770,9 @@ static bool
 _equalPathKey(PathKey *a, PathKey *b)
 {
 	/*
-	 * This is normally used on non-canonicalized PathKeys, so must chase
-	 * up to the topmost merged EquivalenceClass and see if those are the
-	 * same (by pointer equality).
+	 * This is normally used on non-canonicalized PathKeys, so must chase up
+	 * to the topmost merged EquivalenceClass and see if those are the same
+	 * (by pointer equality).
 	 */
 	EquivalenceClass *a_eclass;
 	EquivalenceClass *b_eclass;
@@ -797,6 +799,7 @@ _equalRestrictInfo(RestrictInfo *a, RestrictInfo *b)
 	COMPARE_SCALAR_FIELD(is_pushed_down);
 	COMPARE_SCALAR_FIELD(outerjoin_delayed);
 	COMPARE_BITMAPSET_FIELD(required_relids);
+	COMPARE_BITMAPSET_FIELD(nullable_relids);
 
 	/*
 	 * We ignore all the remaining fields, since they may not be set yet, and
@@ -861,6 +864,7 @@ _equalQuery(Query *a, Query *b)
 	COMPARE_SCALAR_FIELD(hasAggs);
 	COMPARE_SCALAR_FIELD(hasWindFuncs);
 	COMPARE_SCALAR_FIELD(hasSubLinks);
+	COMPARE_SCALAR_FIELD(hasDynamicFunctions);
 	COMPARE_NODE_FIELD(rtable);
 	COMPARE_NODE_FIELD(jointree);
 	COMPARE_NODE_FIELD(targetList);
@@ -879,17 +883,11 @@ _equalQuery(Query *a, Query *b)
 	COMPARE_NODE_FIELD(rowMarks);
 	COMPARE_NODE_FIELD(setOperations);
 	
-	/* Prior to 3.4 these fields were compared.
-	COMPARE_NODE_FIELD(resultRelations);
-	COMPARE_NODE_FIELD(returningLists);
-	 * now they are unused.
-	 */
-	
 	/* Prior to 3.4 this test was
 	 *     COMPARE_SCALAR_FIELD(intoPolicy); 
 	 * Maybe GpPolicy should be a Node?
 	 */
-	if (! GpPolicyEqual(a->intoPolicy, b->intoPolicy) )
+	if (!GpPolicyEqual(a->intoPolicy, b->intoPolicy))
 		return false;
 
 	return true;
@@ -1318,16 +1316,14 @@ _equalIndexStmt(IndexStmt *a, IndexStmt *b)
 	COMPARE_NODE_FIELD(indexParams);
 	COMPARE_NODE_FIELD(options);
 	COMPARE_NODE_FIELD(whereClause);
-	COMPARE_NODE_FIELD(rangetable);
 	COMPARE_SCALAR_FIELD(is_part_child);
 	COMPARE_SCALAR_FIELD(unique);
 	COMPARE_SCALAR_FIELD(primary);
 	COMPARE_SCALAR_FIELD(isconstraint);
-	COMPARE_STRING_FIELD(altconname);
 	COMPARE_SCALAR_FIELD(constrOid);
 	COMPARE_SCALAR_FIELD(concurrent);
 	COMPARE_NODE_FIELD(idxOids);
-	COMPARE_SCALAR_FIELD(do_part);
+	COMPARE_SCALAR_FIELD(is_split_part);
 
 	return true;
 }
@@ -1457,7 +1453,6 @@ _equalRuleStmt(RuleStmt *a, RuleStmt *b)
 	COMPARE_SCALAR_FIELD(instead);
 	COMPARE_NODE_FIELD(actions);
 	COMPARE_SCALAR_FIELD(replace);
-	COMPARE_SCALAR_FIELD(ruleOid);
 
 	return true;
 }
@@ -1505,6 +1500,18 @@ _equalCompositeTypeStmt(CompositeTypeStmt *a, CompositeTypeStmt *b)
 	return true;
 }
 
+static bool
+_equalCreateEnumStmt(CreateEnumStmt *a, CreateEnumStmt *b)
+{
+	COMPARE_NODE_FIELD(typeName);
+	COMPARE_NODE_FIELD(vals);
+	COMPARE_SCALAR_FIELD(enumTypeOid);
+	COMPARE_SCALAR_FIELD(enumArrayOid);
+	COMPARE_NODE_FIELD(valOids);
+
+	return true;
+}
+
 static bool
 _equalViewStmt(ViewStmt *a, ViewStmt *b)
 {
@@ -1514,6 +1521,7 @@ _equalViewStmt(ViewStmt *a, ViewStmt *b)
 	COMPARE_SCALAR_FIELD(replace);
 	COMPARE_SCALAR_FIELD(relOid);
 	COMPARE_SCALAR_FIELD(comptypeOid);
+	COMPARE_SCALAR_FIELD(comptypeArrayOid);
 	COMPARE_SCALAR_FIELD(rewriteOid);
 
 	return true;
@@ -1611,8 +1619,7 @@ static bool
 _equalAlterDatabaseSetStmt(AlterDatabaseSetStmt *a, AlterDatabaseSetStmt *b)
 {
 	COMPARE_STRING_FIELD(dbname);
-	COMPARE_STRING_FIELD(variable);
-	COMPARE_NODE_FIELD(value);
+	COMPARE_NODE_FIELD(setstmt);
 
 	return true;
 }
@@ -1675,6 +1682,7 @@ _equalAlterSeqStmt(AlterSeqStmt *a, AlterSeqStmt *b)
 static bool
 _equalVariableSetStmt(VariableSetStmt *a, VariableSetStmt *b)
 {
+	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_STRING_FIELD(name);
 	COMPARE_NODE_FIELD(args);
 	COMPARE_SCALAR_FIELD(is_local);
@@ -1691,9 +1699,9 @@ _equalVariableShowStmt(VariableShowStmt *a, VariableShowStmt *b)
 }
 
 static bool
-_equalVariableResetStmt(VariableResetStmt *a, VariableResetStmt *b)
+_equalDiscardStmt(DiscardStmt *a, DiscardStmt *b)
 {
-	COMPARE_STRING_FIELD(name);
+	COMPARE_SCALAR_FIELD(target);
 
 	return true;
 }
@@ -1828,8 +1836,7 @@ static bool
 _equalAlterRoleSetStmt(AlterRoleSetStmt *a, AlterRoleSetStmt *b)
 {
 	COMPARE_STRING_FIELD(role);
-	COMPARE_STRING_FIELD(variable);
-	COMPARE_NODE_FIELD(value);
+	COMPARE_NODE_FIELD(setstmt);
 
 	return true;
 }
@@ -1928,7 +1935,6 @@ _equalPrepareStmt(PrepareStmt *a, PrepareStmt *b)
 {
 	COMPARE_STRING_FIELD(name);
 	COMPARE_NODE_FIELD(argtypes);
-	COMPARE_NODE_FIELD(argtype_oids);
 	COMPARE_NODE_FIELD(query);
 
 	return true;
@@ -1993,7 +1999,30 @@ static bool
 _equalReassignOwnedStmt(ReassignOwnedStmt *a, ReassignOwnedStmt *b)
 {
 	COMPARE_NODE_FIELD(roles);
-	COMPARE_NODE_FIELD(newrole);
+	COMPARE_STRING_FIELD(newrole);
+
+	return true;
+}
+
+static bool
+_equalAlterTSDictionaryStmt(AlterTSDictionaryStmt *a, AlterTSDictionaryStmt *b)
+{
+	COMPARE_NODE_FIELD(dictname);
+	COMPARE_NODE_FIELD(options);
+
+	return true;
+}
+
+static bool
+_equalAlterTSConfigurationStmt(AlterTSConfigurationStmt *a,
+							   AlterTSConfigurationStmt *b)
+{
+	COMPARE_NODE_FIELD(cfgname);
+	COMPARE_NODE_FIELD(tokentype);
+	COMPARE_NODE_FIELD(dicts);
+	COMPARE_SCALAR_FIELD(override);
+	COMPARE_SCALAR_FIELD(replace);
+	COMPARE_SCALAR_FIELD(missing_ok);
 
 	return true;
 }
@@ -2858,6 +2887,9 @@ equal(void *a, void *b)
 		case T_CompositeTypeStmt:
 			retval = _equalCompositeTypeStmt(a, b);
 			break;
+		case T_CreateEnumStmt:
+			retval = _equalCreateEnumStmt(a, b);
+			break;
 		case T_ViewStmt:
 			retval = _equalViewStmt(a, b);
 			break;
@@ -2909,8 +2941,8 @@ equal(void *a, void *b)
 		case T_VariableShowStmt:
 			retval = _equalVariableShowStmt(a, b);
 			break;
-		case T_VariableResetStmt:
-			retval = _equalVariableResetStmt(a, b);
+		case T_DiscardStmt:
+			retval = _equalDiscardStmt(a, b);
 			break;
 		case T_CreateFileSpaceStmt:
 			retval = _equalCreateFileSpaceStmt(a, b);
@@ -2981,10 +3013,15 @@ equal(void *a, void *b)
 		case T_DropOwnedStmt:
 			retval = _equalDropOwnedStmt(a, b);
 			break;
-
 		case T_ReassignOwnedStmt:
 			retval = _equalReassignOwnedStmt(a, b);
 			break;
+		case T_AlterTSDictionaryStmt:
+			retval = _equalAlterTSDictionaryStmt(a, b);
+			break;
+		case T_AlterTSConfigurationStmt:
+			retval = _equalAlterTSConfigurationStmt(a, b);
+			break;
 
 		case T_CreateQueueStmt:
 			retval = _equalCreateQueueStmt(a, b);
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index 163e74a60b41..f6ab90a34ccf 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/list.c,v 1.68 2007/01/05 22:19:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/list.c,v 1.69 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 3a1e1897731c..50fbb3816906 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/makefuncs.c,v 1.54 2007/01/05 22:19:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/makefuncs.c,v 1.58 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -140,6 +140,20 @@ flatCopyTargetEntry(TargetEntry *src_tle)
 	return tle;
 }
 
+/*
+ * makeFromExpr -
+ *	  creates a FromExpr node
+ */
+FromExpr *
+makeFromExpr(List *fromlist, Node *quals)
+{
+	FromExpr   *f = makeNode(FromExpr);
+
+	f->fromlist = fromlist;
+	f->quals = quals;
+	return f;
+}
+
 /*
  * makeConst -
  *	  creates a Const node
@@ -155,6 +169,7 @@ makeConst(Oid consttype,
 	Const	   *cnst = makeNode(Const);
 
 	cnst->consttype = consttype;
+	cnst->consttypmod = consttypmod;
 	cnst->constlen = constlen;
 	cnst->constvalue = constvalue;
 	cnst->constisnull = constisnull;
@@ -172,7 +187,7 @@ makeConst(Oid consttype,
  * storage properties.
  */
 Const *
-makeNullConst(Oid consttype, int consttypmod)
+makeNullConst(Oid consttype, int32 consttypmod)
 {
 	int16		typLen;
 	bool		typByVal;
@@ -194,7 +209,8 @@ Node *
 makeBoolConst(bool value, bool isnull)
 {
 	/* note that pg_type.h hardwires size of bool as 1 ... duplicate it */
-	return (Node *) makeConst(BOOLOID, -1, 1, BoolGetDatum(value), isnull, true);
+	return (Node *) makeConst(BOOLOID, -1, 1,
+							  BoolGetDatum(value), isnull, true);
 }
 
 /*
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 898431609ee0..6af485bac640 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/nodeFuncs.c,v 1.28 2007/01/05 22:19:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/nodeFuncs.c,v 1.29 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/nodes/outfast.c b/src/backend/nodes/outfast.c
index 82fb3cfad2be..9ea1af9248a5 100644
--- a/src/backend/nodes/outfast.c
+++ b/src/backend/nodes/outfast.c
@@ -297,8 +297,6 @@ _outPlanInfo(StringInfo str, Plan *node)
 	WRITE_BITMAPSET_FIELD(extParam);
 	WRITE_BITMAPSET_FIELD(allParam);
 
-	WRITE_INT_FIELD(nParamExec);
-
 	if (print_variable_fields)
 	{
 		WRITE_NODE_FIELD(flow);
@@ -340,6 +338,7 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)
 	WRITE_NODE_FIELD(utilityStmt);
 	WRITE_NODE_FIELD(intoClause);
 	WRITE_NODE_FIELD(subplans);
+	WRITE_BITMAPSET_FIELD(rewindPlanIDs);
 	WRITE_NODE_FIELD(returningLists);
 
 	WRITE_NODE_FIELD(result_partitions);
@@ -349,8 +348,11 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)
 	WRITE_NODE_FIELD(numSelectorsPerScanId);
 	WRITE_NODE_FIELD(rowMarks);
 	WRITE_NODE_FIELD(relationOids);
-	WRITE_NODE_FIELD(invalItems);
-	WRITE_INT_FIELD(nCrossLevelParams);
+	/*
+	 * Don't serialize invalItems. The TIDs of the invalidated items wouldn't
+	 * make sense in segments.
+	 */
+	WRITE_INT_FIELD(nParamExec);
 	WRITE_INT_FIELD(nMotionNodes);
 	WRITE_INT_FIELD(nInitPlans);
 
@@ -618,9 +620,6 @@ _outCurrentOfExpr(StringInfo str, CurrentOfExpr *node)
 	WRITE_STRING_FIELD(cursor_name);
 	WRITE_UINT_FIELD(cvarno);
 	WRITE_OID_FIELD(target_relid);
-	WRITE_INT_FIELD(gp_segment_id);
-	WRITE_BINARY_FIELD(ctid, sizeof(ItemPointerData));
-	WRITE_OID_FIELD(tableoid);
 }
 
 static void
@@ -905,6 +904,7 @@ _outQuery(StringInfo str, Query *node)
 	WRITE_BOOL_FIELD(hasAggs);
 	WRITE_BOOL_FIELD(hasWindFuncs);
 	WRITE_BOOL_FIELD(hasSubLinks);
+	WRITE_BOOL_FIELD(hasDynamicFunctions);
 	WRITE_NODE_FIELD(rtable);
 	WRITE_NODE_FIELD(jointree);
 	WRITE_NODE_FIELD(targetList);
@@ -922,10 +922,6 @@ _outQuery(StringInfo str, Query *node)
 	WRITE_NODE_FIELD(limitCount);
 	WRITE_NODE_FIELD(rowMarks);
 	WRITE_NODE_FIELD(setOperations);
-	WRITE_NODE_FIELD(resultRelations);
-	WRITE_NODE_FIELD(result_partitions);
-	WRITE_NODE_FIELD(result_aosegnos);
-	WRITE_NODE_FIELD(returningLists);
 	/* Don't serialize policy */
 }
 
@@ -1658,6 +1654,9 @@ _outNode(StringInfo str, void *obj)
 			case T_CompositeTypeStmt:
 				_outCompositeTypeStmt(str,obj);
 				break;
+			case T_CreateEnumStmt:
+				_outCreateEnumStmt(str,obj);
+				break;
 			case T_CreateCastStmt:
 				_outCreateCastStmt(str,obj);
 				break;
@@ -1791,12 +1790,27 @@ _outNode(StringInfo str, void *obj)
 			case T_CopyStmt:
 				_outCopyStmt(str, obj);
 				break;
+			case T_SelectStmt:
+				_outSelectStmt(str, obj);
+				break;
+			case T_InsertStmt:
+				_outInsertStmt(str, obj);
+				break;
+			case T_DeleteStmt:
+				_outDeleteStmt(str, obj);
+				break;
+			case T_UpdateStmt:
+				_outUpdateStmt(str, obj);
+				break;
 			case T_ColumnDef:
 				_outColumnDef(str, obj);
 				break;
 			case T_TypeName:
 				_outTypeName(str, obj);
 				break;
+			case T_SortBy:
+				_outSortBy(str, obj);
+				break;
 			case T_TypeCast:
 				_outTypeCast(str, obj);
 				break;
@@ -1918,8 +1932,11 @@ _outNode(StringInfo str, void *obj)
 			case T_SliceTable:
 				_outSliceTable(str, obj);
 				break;
-			case T_VariableResetStmt:
-				_outVariableResetStmt(str, obj);
+			case T_CursorPosInfo:
+				_outCursorPosInfo(str, obj);
+				break;
+			case T_VariableSetStmt:
+				_outVariableSetStmt(str, obj);
 				break;
 
 			case T_DMLActionExpr:
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 1d4d012e29a1..12d8a0a1ac97 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.299 2007/02/19 07:03:27 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.322.2.3 2010/08/18 15:22:15 tgl Exp $
  *
  * NOTES
  *	  Every node type that can appear in stored rules' parsetrees *must*
@@ -297,10 +297,10 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)
 	WRITE_BOOL_FIELD(transientPlan);
 	WRITE_NODE_FIELD(planTree);
 	WRITE_NODE_FIELD(rtable);
-	WRITE_NODE_FIELD(resultRelations);
 	WRITE_NODE_FIELD(utilityStmt);
 	WRITE_NODE_FIELD(intoClause);
 	WRITE_NODE_FIELD(subplans);
+	WRITE_BITMAPSET_FIELD(rewindPlanIDs);
 	WRITE_NODE_FIELD(returningLists);
 
 	WRITE_NODE_FIELD(result_partitions);
@@ -311,7 +311,7 @@ _outPlannedStmt(StringInfo str, PlannedStmt *node)
 	WRITE_NODE_FIELD(rowMarks);
 	WRITE_NODE_FIELD(relationOids);
 	WRITE_NODE_FIELD(invalItems);
-	WRITE_INT_FIELD(nCrossLevelParams);
+	WRITE_INT_FIELD(nParamExec);
 	WRITE_INT_FIELD(nMotionNodes);
 	WRITE_INT_FIELD(nInitPlans);
 
@@ -330,6 +330,7 @@ _outQueryDispatchDesc(StringInfo str, QueryDispatchDesc *node)
 	WRITE_NODE_FIELD(intoOidInfo);
 	WRITE_STRING_FIELD(intoTableSpaceName);
 	WRITE_NODE_FIELD(sliceTable);
+	WRITE_NODE_FIELD(cursorPositions);
 }
 
 #ifndef COMPILING_BINARY_FUNCS
@@ -353,8 +354,6 @@ _outPlanInfo(StringInfo str, Plan *node)
 	WRITE_BITMAPSET_FIELD(extParam);
 	WRITE_BITMAPSET_FIELD(allParam);
 
-	WRITE_INT_FIELD(nParamExec);
-
 	WRITE_NODE_FIELD(flow);
 	WRITE_ENUM_FIELD(dispatch, DispatchMethod);
 	WRITE_INT_FIELD(nMotionNodes);
@@ -747,7 +746,7 @@ _outHashJoin(StringInfo str, HashJoin *node)
 static void
 _outAgg(StringInfo str, Agg *node)
 {
-	int			i;
+	int i;
 
 	WRITE_NODE_TYPE("AGG");
 
@@ -756,7 +755,7 @@ _outAgg(StringInfo str, Agg *node)
 	WRITE_ENUM_FIELD(aggstrategy, AggStrategy);
 	WRITE_INT_FIELD(numCols);
 
-	appendStringInfoLiteral(str, " :grpColIdx");
+	appendStringInfo(str, " :grpColIdx");
 	for (i = 0; i < node->numCols; i++)
 		appendStringInfo(str, " %d", node->grpColIdx[i]);
 
@@ -853,6 +852,9 @@ _outShareInputScan(StringInfo str, ShareInputScan *node)
 	WRITE_ENUM_FIELD(share_type, ShareType);
 	WRITE_INT_FIELD(share_id);
 	WRITE_INT_FIELD(driver_slice);
+	WRITE_NODE_FIELD(colnames);
+	WRITE_NODE_FIELD(coltypes);
+	WRITE_NODE_FIELD(coltypmods);
 
 	_outPlanInfo(str, (Plan *) node);
 }
@@ -916,6 +918,15 @@ _outUnique(StringInfo str, Unique *node)
 }
 #endif /* COMPILING_BINARY_FUNCS */
 
+static void
+_outHash(StringInfo str, Hash *node)
+{
+	WRITE_NODE_TYPE("HASH");
+
+	_outPlanInfo(str, (Plan *) node);
+	WRITE_BOOL_FIELD(rescannable);          /*CDB*/
+}
+
 #ifndef COMPILING_BINARY_FUNCS
 static void
 _outSetOp(StringInfo str, SetOp *node)
@@ -935,7 +946,7 @@ _outSetOp(StringInfo str, SetOp *node)
 
 	appendStringInfo(str, " :dupOperators");
 	for (i = 0; i < node->numCols; i++)
-		appendStringInfo(str, " %d", node->dupOperators[i]);
+		appendStringInfo(str, " %u", node->dupOperators[i]);
 
 	WRITE_INT_FIELD(flagColIdx);
 }
@@ -952,14 +963,18 @@ _outLimit(StringInfo str, Limit *node)
 	WRITE_NODE_FIELD(limitCount);
 }
 
+#ifndef COMPILING_BINARY_FUNCS
 static void
-_outHash(StringInfo str, Hash *node)
+_outPlanInvalItem(StringInfo str, PlanInvalItem *node)
 {
-	WRITE_NODE_TYPE("HASH");
+	WRITE_NODE_TYPE("PLANINVALITEM");
 
-	_outPlanInfo(str, (Plan *) node);
-    WRITE_BOOL_FIELD(rescannable);          /*CDB*/
+	WRITE_INT_FIELD(cacheId);
+	appendStringInfo(str, " :tupleId (%u,%u)",
+					 ItemPointerGetBlockNumber(&node->tupleId),
+					 ItemPointerGetOffsetNumber(&node->tupleId));
 }
+#endif /* COMPILING_BINARY_FUNCS */
 
 #ifndef COMPILING_BINARY_FUNCS
 static void
@@ -1172,6 +1187,7 @@ _outConst(StringInfo str, Const *node)
 	WRITE_NODE_TYPE("CONST");
 
 	WRITE_OID_FIELD(consttype);
+	WRITE_INT_FIELD(consttypmod);
 	WRITE_INT_FIELD(constlen);
 	WRITE_BOOL_FIELD(constbyval);
 	WRITE_BOOL_FIELD(constisnull);
@@ -1243,9 +1259,9 @@ _outArrayRef(StringInfo str, ArrayRef *node)
 {
 	WRITE_NODE_TYPE("ARRAYREF");
 
-	WRITE_OID_FIELD(refrestype);
 	WRITE_OID_FIELD(refarraytype);
 	WRITE_OID_FIELD(refelemtype);
+	WRITE_INT_FIELD(reftypmod);
 	WRITE_NODE_FIELD(refupperindexpr);
 	WRITE_NODE_FIELD(reflowerindexpr);
 	WRITE_NODE_FIELD(refexpr);
@@ -1408,6 +1424,7 @@ static void
 _outCoerceViaIO(StringInfo str, CoerceViaIO *node)
 {
 	WRITE_NODE_TYPE("COERCEVIAIO");
+
 	WRITE_NODE_FIELD(arg);
 	WRITE_OID_FIELD(resulttype);
 	WRITE_ENUM_FIELD(coerceformat, CoercionForm);
@@ -1946,6 +1963,7 @@ _outPlannerGlobal(StringInfo str, PlannerGlobal *node)
 	WRITE_NODE_FIELD(paramlist);
 	WRITE_NODE_FIELD(subplans);
 	WRITE_NODE_FIELD(subrtables);
+	WRITE_BITMAPSET_FIELD(rewindPlanIDs);
 	WRITE_NODE_FIELD(finalrtable);
 	WRITE_NODE_FIELD(relationOids);
 	WRITE_NODE_FIELD(invalItems);
@@ -1955,7 +1973,6 @@ _outPlannerGlobal(StringInfo str, PlannerGlobal *node)
 	WRITE_NODE_FIELD(share.motStack);
 	WRITE_NODE_FIELD(share.qdShares);
 	WRITE_NODE_FIELD(share.qdSlices);
-	WRITE_NODE_FIELD(share.planNodes);
 	WRITE_INT_FIELD(share.nextPlanId);
 }
 #endif /* COMPILING_BINARY_FUNCS */
@@ -1970,6 +1987,8 @@ _outPlannerInfo(StringInfo str, PlannerInfo *node)
 	WRITE_NODE_FIELD(glob);
 	WRITE_UINT_FIELD(query_level);
 	WRITE_NODE_FIELD(join_rel_list);
+	WRITE_NODE_FIELD(resultRelations);
+	WRITE_NODE_FIELD(returningLists);
 	WRITE_NODE_FIELD(init_plans);
 	WRITE_NODE_FIELD(eq_classes);
 	WRITE_NODE_FIELD(canon_pathkeys);
@@ -2023,6 +2042,7 @@ _outRelOptInfo(StringInfo str, RelOptInfo *node)
 	WRITE_OID_FIELD(fmterrtbl);
 	WRITE_INT_FIELD(ext_encoding);
 	WRITE_BOOL_FIELD(writable);
+	WRITE_NODE_FIELD(subrtable);
 	WRITE_NODE_FIELD(baserestrictinfo);
 	WRITE_NODE_FIELD(joininfo);
 	WRITE_BOOL_FIELD(has_eclass_joins);
@@ -2128,6 +2148,7 @@ _outEquivalenceClass(StringInfo str, EquivalenceClass *node)
 	WRITE_BOOL_FIELD(ec_has_volatile);
 	WRITE_BOOL_FIELD(ec_below_outer_join);
 	WRITE_BOOL_FIELD(ec_broken);
+	WRITE_UINT_FIELD(ec_sortref);
 }
 #endif /* COMPILING_BINARY_FUNCS */
 
@@ -2139,6 +2160,7 @@ _outEquivalenceMember(StringInfo str, EquivalenceMember *node)
 
 	WRITE_NODE_FIELD(em_expr);
 	WRITE_BITMAPSET_FIELD(em_relids);
+	WRITE_BITMAPSET_FIELD(em_nullable_relids);
 	WRITE_BOOL_FIELD(em_is_const);
 	WRITE_BOOL_FIELD(em_is_child);
 	WRITE_OID_FIELD(em_datatype);
@@ -2169,10 +2191,12 @@ _outRestrictInfo(StringInfo str, RestrictInfo *node)
 	WRITE_BOOL_FIELD(pseudoconstant);
 	WRITE_BITMAPSET_FIELD(clause_relids);
 	WRITE_BITMAPSET_FIELD(required_relids);
+	WRITE_BITMAPSET_FIELD(nullable_relids);
 	WRITE_BITMAPSET_FIELD(left_relids);
 	WRITE_BITMAPSET_FIELD(right_relids);
 	WRITE_NODE_FIELD(orclause);
 	/* don't write parent_ec, leads to infinite recursion in plan tree dump */
+	WRITE_FLOAT_FIELD(this_selec, "%.4f");
 	WRITE_NODE_FIELD(mergeopfamilies);
 	/* don't write left_ec, leads to infinite recursion in plan tree dump */
 	/* don't write right_ec, leads to infinite recursion in plan tree dump */
@@ -2345,7 +2369,6 @@ _outIndexStmt(StringInfo str, IndexStmt *node)
 	WRITE_NODE_FIELD(options);
 
 	WRITE_NODE_FIELD(whereClause);
-	WRITE_NODE_FIELD(rangetable);
 	WRITE_BOOL_FIELD(is_part_child);
 	WRITE_BOOL_FIELD(unique);
 	WRITE_BOOL_FIELD(primary);
@@ -2382,6 +2405,7 @@ _outViewStmt(StringInfo str, ViewStmt *node)
 	WRITE_BOOL_FIELD(replace);
 	WRITE_OID_FIELD(relOid);
 	WRITE_OID_FIELD(comptypeOid);
+	WRITE_OID_FIELD(comptypeArrayOid);
 	WRITE_OID_FIELD(rewriteOid);
 }
 
@@ -2393,11 +2417,10 @@ _outRuleStmt(StringInfo str, RuleStmt *node)
 	WRITE_NODE_FIELD(relation);
 	WRITE_STRING_FIELD(rulename);
 	WRITE_NODE_FIELD(whereClause);
-	WRITE_ENUM_FIELD(event,CmdType);
+	WRITE_ENUM_FIELD(event, CmdType);
 	WRITE_BOOL_FIELD(instead);
 	WRITE_NODE_FIELD(actions);
 	WRITE_BOOL_FIELD(replace);
-	WRITE_OID_FIELD(ruleOid);
 }
 
 static void
@@ -2597,8 +2620,7 @@ _outAlterRoleSetStmt(StringInfo str, AlterRoleSetStmt *node)
 	WRITE_NODE_TYPE("ALTERROLESETSTMT");
 
 	WRITE_STRING_FIELD(role);
-	WRITE_STRING_FIELD(variable);
-	WRITE_NODE_FIELD(value);
+	WRITE_NODE_FIELD(setstmt);
 }
 
 
@@ -2964,6 +2986,18 @@ _outCompositeTypeStmt(StringInfo str, CompositeTypeStmt *node)
 	WRITE_OID_FIELD(comptypeOid);
 }
 
+static void
+_outCreateEnumStmt(StringInfo str, CreateEnumStmt *node)
+{
+	WRITE_NODE_TYPE("CREATEENUMSTMT");
+
+	WRITE_NODE_FIELD(typeName);
+	WRITE_NODE_FIELD(vals);
+	WRITE_OID_FIELD(enumTypeOid);
+	WRITE_OID_FIELD(enumArrayOid);
+	WRITE_NODE_FIELD(valOids);
+}
+
 static void
 _outCreateCastStmt(StringInfo str, CreateCastStmt *node)
 {
@@ -3173,24 +3207,13 @@ _outConstraintsSetStmt(StringInfo str, ConstraintsSetStmt *node)
 	WRITE_BOOL_FIELD(deferred);
 }
 
-#ifndef COMPILING_BINARY_FUNCS
-static void
-_outInsertStmt(StringInfo str, InsertStmt *node)
-{
-	WRITE_NODE_TYPE("INSERT");
-
-	WRITE_NODE_FIELD(relation);
-	WRITE_NODE_FIELD(cols);
-	WRITE_NODE_FIELD(selectStmt);
-	WRITE_NODE_FIELD(returningList);
-}
-#endif /* COMPILING_BINARY_FUNCS */
-
-#ifndef COMPILING_BINARY_FUNCS
 /*
  * SelectStmt's are never written to the catalog, they only exist
  * between parse and parseTransform.  The only use of this function
  * is for debugging purposes.
+ *
+ * In GPDB, these are also dispatched from QD to QEs, so we need full
+ * out/read support.
  */
 static void
 _outSelectStmt(StringInfo str, SelectStmt *node)
@@ -3207,10 +3230,7 @@ _outSelectStmt(StringInfo str, SelectStmt *node)
 	WRITE_NODE_FIELD(windowClause);
 	WRITE_NODE_FIELD(valuesLists);
 	WRITE_NODE_FIELD(sortClause);
-	if (node->scatterClause != NIL)
-	{
-		WRITE_NODE_FIELD(scatterClause);
-	}
+	WRITE_NODE_FIELD(scatterClause);
 	WRITE_NODE_FIELD(withClause);
 	WRITE_NODE_FIELD(limitOffset);
 	WRITE_NODE_FIELD(limitCount);
@@ -3221,7 +3241,39 @@ _outSelectStmt(StringInfo str, SelectStmt *node)
 	WRITE_NODE_FIELD(rarg);
 	WRITE_NODE_FIELD(distributedBy);
 }
-#endif /* COMPILING_BINARY_FUNCS */
+
+static void
+_outInsertStmt(StringInfo str, InsertStmt *node)
+{
+	WRITE_NODE_TYPE("INSERT");
+
+	WRITE_NODE_FIELD(relation);
+	WRITE_NODE_FIELD(cols);
+	WRITE_NODE_FIELD(selectStmt);
+	WRITE_NODE_FIELD(returningList);
+}
+
+static void
+_outDeleteStmt(StringInfo str, DeleteStmt *node)
+{
+	WRITE_NODE_TYPE("DELETE");
+
+	WRITE_NODE_FIELD(relation);
+	WRITE_NODE_FIELD(usingClause);
+	WRITE_NODE_FIELD(whereClause);
+	WRITE_NODE_FIELD(returningList);
+}
+
+static void
+_outUpdateStmt(StringInfo str, UpdateStmt *node)
+{
+	WRITE_NODE_TYPE("UPDATE");
+
+	WRITE_NODE_FIELD(relation);
+	WRITE_NODE_FIELD(targetList);
+	WRITE_NODE_FIELD(whereClause);
+	WRITE_NODE_FIELD(returningList);
+}
 
 static void
 _outFuncCall(StringInfo str, FuncCall *node)
@@ -3381,11 +3433,14 @@ _outIndexElem(StringInfo str, IndexElem *node)
 }
 
 static void
-_outVariableResetStmt(StringInfo str, VariableResetStmt *node)
+_outVariableSetStmt(StringInfo str, VariableSetStmt *node)
 {
-	WRITE_NODE_TYPE("VARIABLERESETSTMT");
+	WRITE_NODE_TYPE("VARIABLESETSTMT");
 
 	WRITE_STRING_FIELD(name);
+	WRITE_ENUM_FIELD(kind, VariableSetKind);
+	WRITE_NODE_FIELD(args);
+	WRITE_BOOL_FIELD(is_local);
 }
 
 #ifndef COMPILING_BINARY_FUNCS
@@ -3459,7 +3514,7 @@ _outQuery(StringInfo str, Query *node)
 			case T_CopyStmt:
 			case T_ReindexStmt:
 			case T_ConstraintsSetStmt:
-			case T_VariableResetStmt:
+			case T_VariableSetStmt:
 			case T_CreateTrigStmt:
 			case T_DefineStmt:
 			case T_CompositeTypeStmt:
@@ -3485,6 +3540,7 @@ _outQuery(StringInfo str, Query *node)
 	WRITE_BOOL_FIELD(hasAggs);
 	WRITE_BOOL_FIELD(hasWindFuncs);
 	WRITE_BOOL_FIELD(hasSubLinks);
+	WRITE_BOOL_FIELD(hasDynamicFunctions);
 	WRITE_NODE_FIELD(rtable);
 	WRITE_NODE_FIELD(jointree);
 	WRITE_NODE_FIELD(targetList);
@@ -3502,10 +3558,6 @@ _outQuery(StringInfo str, Query *node)
 	WRITE_NODE_FIELD(limitCount);
 	WRITE_NODE_FIELD(rowMarks);
 	WRITE_NODE_FIELD(setOperations);
-	WRITE_NODE_FIELD(resultRelations);
-	WRITE_NODE_FIELD(result_partitions);
-	WRITE_NODE_FIELD(result_aosegnos);
-	WRITE_NODE_FIELD(returningLists); /* TODO Merge issue */
 	/* Don't serialize policy */
 }
 #endif /* COMPILING_BINARY_FUNCS */
@@ -3916,6 +3968,39 @@ _outResTarget(StringInfo str, ResTarget *node)
 	WRITE_INT_FIELD(location);
 }
 
+static void
+_outSortBy(StringInfo str, SortBy *node)
+{
+	WRITE_NODE_TYPE("SORTBY");
+
+	WRITE_INT_FIELD(sortby_dir);
+	WRITE_INT_FIELD(sortby_nulls);
+	WRITE_NODE_FIELD(useOp);
+	WRITE_NODE_FIELD(node);
+	WRITE_INT_FIELD(location);
+}
+
+#ifndef COMPILING_BINARY_FUNCS
+static void
+_outRangeSubselect(StringInfo str, RangeSubselect *node)
+{
+	WRITE_NODE_TYPE("RANGESUBSELECT");
+
+	WRITE_NODE_FIELD(subquery);
+	WRITE_NODE_FIELD(alias);
+}
+
+static void
+_outRangeFunction(StringInfo str, RangeFunction *node)
+{
+	WRITE_NODE_TYPE("RANGEFUNCTION");
+
+	WRITE_NODE_FIELD(funccallnode);
+	WRITE_NODE_FIELD(alias);
+	WRITE_NODE_FIELD(coldeflist);
+}
+#endif
+
 #ifndef COMPILING_BINARY_FUNCS
 static void
 _outConstraint(StringInfo str, Constraint *node)
@@ -4087,6 +4172,20 @@ _outSliceTable(StringInfo str, SliceTable *node)
 	WRITE_INT_FIELD(ic_instance_id);
 }
 
+static void
+_outCursorPosInfo(StringInfo str, CursorPosInfo *node)
+{
+	WRITE_NODE_TYPE("CURSORPOSINFO");
+
+	WRITE_STRING_FIELD(cursor_name);
+	WRITE_INT_FIELD(gp_segment_id);
+	WRITE_UINT_FIELD(ctid.ip_blkid.bi_hi);
+	WRITE_UINT_FIELD(ctid.ip_blkid.bi_lo);
+	WRITE_UINT_FIELD(ctid.ip_posid);
+	WRITE_OID_FIELD(table_oid);
+}
+
+
 static void
 _outCreateTrigStmt(StringInfo str, CreateTrigStmt *node)
 {
@@ -4363,14 +4462,17 @@ _outNode(StringInfo str, void *obj)
 			case T_Unique:
 				_outUnique(str, obj);
 				break;
+			case T_Hash:
+				_outHash(str, obj);
+				break;
 			case T_SetOp:
 				_outSetOp(str, obj);
 				break;
 			case T_Limit:
 				_outLimit(str, obj);
 				break;
-			case T_Hash:
-				_outHash(str, obj);
+			case T_PlanInvalItem:
+				_outPlanInvalItem(str, obj);
 				break;
 			case T_Motion:
 				_outMotion(str, obj);
@@ -4673,9 +4775,6 @@ _outNode(StringInfo str, void *obj)
 			case T_PartitionValuesSpec:
 				_outPartitionValuesSpec(str, obj);
 				break;
-			case T_InhRelation:
-				_outInhRelation(str, obj);
-				break;
 			case T_SegfileMapNode:
 				_outSegfileMapNode(str, obj);
 				break;
@@ -4719,6 +4818,9 @@ _outNode(StringInfo str, void *obj)
 			case T_CompositeTypeStmt:
 				_outCompositeTypeStmt(str,obj);
 				break;
+			case T_CreateEnumStmt:
+				_outCreateEnumStmt(str,obj);
+				break;
 			case T_CreateCastStmt:
 				_outCreateCastStmt(str,obj);
 				break;
@@ -4860,6 +4962,12 @@ _outNode(StringInfo str, void *obj)
 			case T_InsertStmt:
 				_outInsertStmt(str, obj);
 				break;
+			case T_DeleteStmt:
+				_outDeleteStmt(str, obj);
+				break;
+			case T_UpdateStmt:
+				_outUpdateStmt(str, obj);
+				break;
 			case T_Null:
 				_outNull(str, obj);
 				break;
@@ -4869,6 +4977,9 @@ _outNode(StringInfo str, void *obj)
 			case T_TypeName:
 				_outTypeName(str, obj);
 				break;
+			case T_SortBy:
+				_outSortBy(str, obj);
+				break;
 			case T_TypeCast:
 				_outTypeCast(str, obj);
 				break;
@@ -4950,6 +5061,12 @@ _outNode(StringInfo str, void *obj)
 			case T_ResTarget:
 				_outResTarget(str, obj);
 				break;
+			case T_RangeSubselect:
+				_outRangeSubselect(str, obj);
+				break;
+			case T_RangeFunction:
+				_outRangeFunction(str, obj);
+				break;
 			case T_Constraint:
 				_outConstraint(str, obj);
 				break;
@@ -4962,6 +5079,9 @@ _outNode(StringInfo str, void *obj)
 			case T_DefElem:
 				_outDefElem(str, obj);
 				break;
+			case T_InhRelation:
+				_outInhRelation(str, obj);
+				break;
 			case T_LockingClause:
 				_outLockingClause(str, obj);
 				break;
@@ -4990,8 +5110,11 @@ _outNode(StringInfo str, void *obj)
 			case T_SliceTable:
 				_outSliceTable(str, obj);
 				break;
-			case T_VariableResetStmt:
-				_outVariableResetStmt(str, obj);
+			case T_CursorPosInfo:
+				_outCursorPosInfo(str, obj);
+				break;
+			case T_VariableSetStmt:
+				_outVariableSetStmt(str, obj);
 				break;
 
 			case T_DMLActionExpr:
diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c
index c8aac2fbdc5d..36f466a5002f 100644
--- a/src/backend/nodes/params.c
+++ b/src/backend/nodes/params.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/params.c,v 1.8 2007/01/05 22:19:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/params.c,v 1.10 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,3 +60,34 @@ copyParamList(ParamListInfo from)
 
 	return retval;
 }
+
+/*
+ * Extract an array of parameter type OIDs from a ParamListInfo.
+ *
+ * The result is allocated in CurrentMemoryContext.
+ */
+void
+getParamListTypes(ParamListInfo params,
+				  Oid **param_types, int *num_params)
+{
+	Oid		   *ptypes;
+	int			i;
+
+	if (params == NULL || params->numParams <= 0)
+	{
+		*param_types = NULL;
+		*num_params = 0;
+		return;
+	}
+
+	ptypes = (Oid *) palloc(params->numParams * sizeof(Oid));
+	*param_types = ptypes;
+	*num_params = params->numParams;
+
+	for (i = 0; i < params->numParams; i++)
+	{
+		ParamExternData *prm = &params->params[i];
+
+		ptypes[i] = prm->ptype;
+	}
+}
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 15d99d092259..2a719996d844 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/print.c,v 1.84 2007/02/10 14:58:54 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/print.c,v 1.87 2008/01/01 19:45:50 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -426,7 +426,7 @@ print_pathkeys(List *pathkeys, List *rtable)
 	printf("(");
 	foreach(i, pathkeys)
 	{
-		PathKey	   *pathkey = (PathKey *) lfirst(i);
+		PathKey    *pathkey = (PathKey *) lfirst(i);
 		EquivalenceClass *eclass;
 		ListCell   *k;
 		bool		first = true;
@@ -580,7 +580,7 @@ plannode_type(Plan *p)
 /*
  * Recursively prints a simple text description of the plan tree
  */
-void
+static void
 print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label)
 {
 	int			i;
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index 9354a9504a59..f809ed55b022 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/read.c,v 1.50 2007/01/05 22:19:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/read.c,v 1.51 2008/01/01 19:45:50 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
diff --git a/src/backend/nodes/readfast.c b/src/backend/nodes/readfast.c
index 13fe2b9f1c26..6a814681d416 100644
--- a/src/backend/nodes/readfast.c
+++ b/src/backend/nodes/readfast.c
@@ -229,6 +229,7 @@ _readQuery(void)
 	READ_BOOL_FIELD(hasAggs);
 	READ_BOOL_FIELD(hasWindFuncs);
 	READ_BOOL_FIELD(hasSubLinks);
+	READ_BOOL_FIELD(hasDynamicFunctions);
 	READ_NODE_FIELD(rtable);
 	READ_NODE_FIELD(jointree);
 	READ_NODE_FIELD(targetList);
@@ -246,10 +247,6 @@ _readQuery(void)
 	READ_NODE_FIELD(limitCount);
 	READ_NODE_FIELD(rowMarks);
 	READ_NODE_FIELD(setOperations);
-	READ_NODE_FIELD(resultRelations);
-	READ_NODE_FIELD(result_partitions);
-	READ_NODE_FIELD(result_aosegnos);
-	READ_NODE_FIELD(returningLists);
 	/* policy not serialized */
 
 	READ_DONE();
@@ -266,9 +263,6 @@ _readCurrentOfExpr(void)
 	READ_STRING_FIELD(cursor_name);
 	READ_UINT_FIELD(cvarno);
 	READ_OID_FIELD(target_relid);
-	READ_INT_FIELD(gp_segment_id);
-	READ_BINARY_FIELD(ctid, sizeof(ItemPointerData));
-	READ_OID_FIELD(tableoid);
 
 	READ_DONE();
 }
@@ -392,6 +386,19 @@ _readConst(void)
 	READ_DONE();
 }
 
+static ResTarget *
+_readResTarget(void)
+{
+	READ_LOCALS(ResTarget);
+
+	READ_STRING_FIELD(name);
+	READ_NODE_FIELD(indirection);
+	READ_NODE_FIELD(val);
+	READ_INT_FIELD(location);
+
+	READ_DONE();
+}
+
 /*
  * _readConstraint
  */
@@ -634,6 +641,69 @@ _readAlterOwnerStmt(void)
 	READ_DONE();
 }
 
+static SelectStmt *
+_readSelectStmt(void)
+{
+	READ_LOCALS(SelectStmt);
+
+	READ_NODE_FIELD(distinctClause);
+	READ_NODE_FIELD(intoClause);
+	READ_NODE_FIELD(targetList);
+	READ_NODE_FIELD(fromClause);
+	READ_NODE_FIELD(whereClause);
+	READ_NODE_FIELD(groupClause);
+	READ_NODE_FIELD(havingClause);
+	READ_NODE_FIELD(windowClause);
+	READ_NODE_FIELD(valuesLists);
+	READ_NODE_FIELD(sortClause);
+	READ_NODE_FIELD(scatterClause);
+	READ_NODE_FIELD(withClause);
+	READ_NODE_FIELD(limitOffset);
+	READ_NODE_FIELD(limitCount);
+	READ_NODE_FIELD(lockingClause);
+	READ_ENUM_FIELD(op, SetOperation);
+	READ_BOOL_FIELD(all);
+	READ_NODE_FIELD(larg);
+	READ_NODE_FIELD(rarg);
+	READ_NODE_FIELD(distributedBy);
+	READ_DONE();
+}
+
+static InsertStmt *
+_readInsertStmt(void)
+{
+	READ_LOCALS(InsertStmt);
+
+	READ_NODE_FIELD(relation);
+	READ_NODE_FIELD(cols);
+	READ_NODE_FIELD(selectStmt);
+	READ_NODE_FIELD(returningList);
+	READ_DONE();
+}
+
+static DeleteStmt *
+_readDeleteStmt(void)
+{
+	READ_LOCALS(DeleteStmt);
+
+	READ_NODE_FIELD(relation);
+	READ_NODE_FIELD(usingClause);
+	READ_NODE_FIELD(whereClause);
+	READ_NODE_FIELD(returningList);
+	READ_DONE();
+}
+
+static UpdateStmt *
+_readUpdateStmt(void)
+{
+	READ_LOCALS(UpdateStmt);
+
+	READ_NODE_FIELD(relation);
+	READ_NODE_FIELD(targetList);
+	READ_NODE_FIELD(whereClause);
+	READ_NODE_FIELD(returningList);
+	READ_DONE();
+}
 
 /*
  * _readFuncCall
@@ -1427,6 +1497,7 @@ _readPlannedStmt(void)
 	READ_NODE_FIELD(utilityStmt);
 	READ_NODE_FIELD(intoClause);
 	READ_NODE_FIELD(subplans);
+	READ_BITMAPSET_FIELD(rewindPlanIDs);
 	READ_NODE_FIELD(returningLists);
 	READ_NODE_FIELD(result_partitions);
 	READ_NODE_FIELD(result_aosegnos);
@@ -1435,8 +1506,8 @@ _readPlannedStmt(void)
 	READ_NODE_FIELD(numSelectorsPerScanId);
 	READ_NODE_FIELD(rowMarks);
 	READ_NODE_FIELD(relationOids);
-	READ_NODE_FIELD(invalItems);
-	READ_INT_FIELD(nCrossLevelParams);
+	/* invalItems not serialized in outfast.c */
+	READ_INT_FIELD(nParamExec);
 	READ_INT_FIELD(nMotionNodes);
 	READ_INT_FIELD(nInitPlans);
 	/* intoPolicy not serialized in outfast.c */
@@ -1454,6 +1525,7 @@ _readQueryDispatchDesc(void)
 	READ_NODE_FIELD(intoOidInfo);
 	READ_STRING_FIELD(intoTableSpaceName);
 	READ_NODE_FIELD(sliceTable);
+	READ_NODE_FIELD(cursorPositions);
 	READ_DONE();
 }
 
@@ -1995,6 +2067,9 @@ _readShareInputScan(void)
 	READ_ENUM_FIELD(share_type, ShareType);
 	READ_INT_FIELD(share_id);
 	READ_INT_FIELD(driver_slice);
+	READ_NODE_FIELD(colnames);
+	READ_NODE_FIELD(coltypes);
+	READ_NODE_FIELD(coltypmods);
 
 	readPlanInfo((Plan *)local_node);
 
@@ -2085,7 +2160,6 @@ _readLimit(void)
 	READ_DONE();
 }
 
-
 /*
  * _readHash
  */
@@ -2300,7 +2374,6 @@ void readPlanInfo(Plan *local_node)
 	READ_NODE_FIELD(qual);
 	READ_BITMAPSET_FIELD(extParam);
 	READ_BITMAPSET_FIELD(allParam);
-	READ_INT_FIELD(nParamExec);
 
 	READ_NODE_FIELD(flow);
 	READ_INT_FIELD(dispatch);
@@ -2993,6 +3066,9 @@ readNodeBinary(void)
 			case T_CompositeTypeStmt:
 				return_value = _readCompositeTypeStmt();
 				break;
+			case T_CreateEnumStmt:
+				return_value = _readCreateEnumStmt();
+				break;
 			case T_CreateCastStmt:
 				return_value = _readCreateCastStmt();
 				break;
@@ -3125,12 +3201,27 @@ readNodeBinary(void)
 			case T_CopyStmt:
 				return_value = _readCopyStmt();
 				break;
+			case T_SelectStmt:
+				return_value = _readSelectStmt();
+				break;
+			case T_InsertStmt:
+				return_value = _readInsertStmt();
+				break;
+			case T_DeleteStmt:
+				return_value = _readDeleteStmt();
+				break;
+			case T_UpdateStmt:
+				return_value = _readUpdateStmt();
+				break;
 			case T_ColumnDef:
 				return_value = _readColumnDef();
 				break;
 			case T_TypeName:
 				return_value = _readTypeName();
 				break;
+			case T_SortBy:
+				return_value = _readSortBy();
+				break;
 			case T_TypeCast:
 				return_value = _readTypeCast();
 				break;
@@ -3221,6 +3312,9 @@ readNodeBinary(void)
 			case T_A_Indirection:
 				return_value = _readA_Indirection();
 				break;
+			case T_ResTarget:
+				return_value = _readResTarget();
+				break;
 			case T_Constraint:
 				return_value = _readConstraint();
 				break;
@@ -3254,8 +3348,11 @@ readNodeBinary(void)
 			case T_SliceTable:
 				return_value = _readSliceTable();
 				break;
-			case T_VariableResetStmt:
-				return_value = _readVariableResetStmt();
+			case T_CursorPosInfo:
+				return_value = _readCursorPosInfo();
+				break;
+			case T_VariableSetStmt:
+				return_value = _readVariableSetStmt();
 				break;
 			case T_CreateTrigStmt:
 				return_value = _readCreateTrigStmt();
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index f613c233ec3f..956caf791793 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.202 2007/02/03 14:06:54 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.210 2008/01/01 19:45:50 momjian Exp $
  *
  * NOTES
  *	  Path and Plan nodes do not need to have any readfuncs support, because we
@@ -323,6 +323,7 @@ _readQuery(void)
 	READ_BOOL_FIELD(hasAggs);
 	READ_BOOL_FIELD(hasWindFuncs);
 	READ_BOOL_FIELD(hasSubLinks);
+	READ_BOOL_FIELD(hasDynamicFunctions);
 	READ_NODE_FIELD(rtable);
 	READ_NODE_FIELD(jointree);
 	READ_NODE_FIELD(targetList);
@@ -340,10 +341,6 @@ _readQuery(void)
 	READ_NODE_FIELD(limitCount);
 	READ_NODE_FIELD(rowMarks);
 	READ_NODE_FIELD(setOperations);
-	READ_NODE_FIELD(resultRelations);
-	READ_NODE_FIELD(result_partitions);
-	READ_NODE_FIELD(result_aosegnos);
-	READ_NODE_FIELD(returningLists);
 
 	local_node->intoPolicy = NULL;
 
@@ -390,6 +387,7 @@ _readCurrentOfExpr(void)
 	READ_LOCALS(CurrentOfExpr);
 
 	READ_STRING_FIELD(cursor_name);
+	READ_INT_FIELD(cursor_param);
 	READ_INT_FIELD(cvarno);
 	READ_OID_FIELD(target_relid);
 
@@ -720,6 +718,7 @@ _readConst(void)
 	READ_LOCALS(Const);
 
 	READ_OID_FIELD(consttype);
+	READ_INT_FIELD(consttypmod);
 	READ_INT_FIELD(constlen);
 	READ_BOOL_FIELD(constbyval);
 	READ_BOOL_FIELD(constisnull);
@@ -800,7 +799,6 @@ _readIndexStmt(void)
 	READ_NODE_FIELD(indexParams);
 	READ_NODE_FIELD(options);
 	READ_NODE_FIELD(whereClause);
-	READ_NODE_FIELD(rangetable);
 	READ_BOOL_FIELD(is_part_child);
 	READ_BOOL_FIELD(unique);
 	READ_BOOL_FIELD(primary);
@@ -856,6 +854,7 @@ _readViewStmt(void)
 	READ_BOOL_FIELD(replace);
 	READ_OID_FIELD(relOid);
 	READ_OID_FIELD(comptypeOid);
+	READ_OID_FIELD(comptypeArrayOid);
 	READ_OID_FIELD(rewriteOid);
 
 	READ_DONE();
@@ -873,7 +872,6 @@ _readRuleStmt(void)
 	READ_BOOL_FIELD(instead);
 	READ_NODE_FIELD(actions);
 	READ_BOOL_FIELD(replace);
-	READ_OID_FIELD(ruleOid);
 
 	READ_DONE();
 }
@@ -1096,8 +1094,7 @@ _readAlterRoleSetStmt(void)
 	READ_LOCALS(AlterRoleSetStmt);
 
 	READ_STRING_FIELD(role);
-	READ_STRING_FIELD(variable);
-	READ_NODE_FIELD(value);
+	READ_NODE_FIELD(setstmt);
 
 	READ_DONE();
 }
@@ -1154,6 +1151,39 @@ _readRenameStmt(void)
 }
 
 
+/*
+ * _readCoerceViaIO
+ */
+static CoerceViaIO *
+_readCoerceViaIO(void)
+{
+	READ_LOCALS(CoerceViaIO);
+
+	READ_NODE_FIELD(arg);
+	READ_OID_FIELD(resulttype);
+	READ_ENUM_FIELD(coerceformat, CoercionForm);
+
+	READ_DONE();
+}
+
+/*
+ * _readArrayCoerceExpr
+ */
+static ArrayCoerceExpr *
+_readArrayCoerceExpr(void)
+{
+	READ_LOCALS(ArrayCoerceExpr);
+
+	READ_NODE_FIELD(arg);
+	READ_OID_FIELD(elemfuncid);
+	READ_OID_FIELD(resulttype);
+	READ_INT_FIELD(resulttypmod);
+	READ_BOOL_FIELD(isExplicit);
+	READ_ENUM_FIELD(coerceformat, CoercionForm);
+
+	READ_DONE();
+}
+
 #ifndef COMPILING_BINARY_FUNCS
 /*
  * _readFuncCall
@@ -1412,9 +1442,9 @@ _readArrayRef(void)
 {
 	READ_LOCALS(ArrayRef);
 
-	READ_OID_FIELD(refrestype);
 	READ_OID_FIELD(refarraytype);
 	READ_OID_FIELD(refelemtype);
+	READ_INT_FIELD(reftypmod);
 	READ_NODE_FIELD(refupperindexpr);
 	READ_NODE_FIELD(reflowerindexpr);
 	READ_NODE_FIELD(refexpr);
@@ -1629,40 +1659,6 @@ _readRelabelType(void)
 	READ_DONE();
 }
 
-/*
-* _readCoerceViaIO
-*/
-static CoerceViaIO *
-_readCoerceViaIO(void)
-{
-	READ_LOCALS(CoerceViaIO);
-
-	READ_NODE_FIELD(arg);
-	READ_OID_FIELD(resulttype);
-	READ_ENUM_FIELD(coerceformat, CoercionForm);
-
-	READ_DONE();
-
-}
-
-/*
- * _readArrayCoerceExpr
- */
-static ArrayCoerceExpr *
-_readArrayCoerceExpr(void)
-{
-	READ_LOCALS(ArrayCoerceExpr);
-
-	READ_NODE_FIELD(arg);
-	READ_OID_FIELD(elemfuncid);
-	READ_OID_FIELD(resulttype);
-	READ_INT_FIELD(resulttypmod);
-	READ_BOOL_FIELD(isExplicit);
-	READ_ENUM_FIELD(coerceformat, CoercionForm);
-
-	READ_DONE();
-}
-
 /*
  * _readConvertRowtypeExpr
  */
@@ -1734,7 +1730,7 @@ _readArrayExpr(void)
 	READ_OID_FIELD(element_typeid);
 	READ_NODE_FIELD(elements);
 	READ_BOOL_FIELD(multidims);
-/*	READ_LOCATION_FIELD(location); */
+	/*READ_LOCATION_FIELD(location);*/
 
 	READ_DONE();
 }
@@ -2060,6 +2056,20 @@ _readTypeName(void)
 	READ_DONE();
 }
 
+static SortBy *
+_readSortBy(void)
+{
+	READ_LOCALS(SortBy);
+
+	READ_INT_FIELD(sortby_dir);
+	READ_INT_FIELD(sortby_nulls);
+	READ_NODE_FIELD(useOp);
+	READ_NODE_FIELD(node);
+	READ_INT_FIELD(location);
+
+	READ_DONE();
+}
+
 static TypeCast *
 _readTypeCast(void)
 {
@@ -2552,7 +2562,6 @@ _readAlterFunctionStmt(void)
 	READ_DONE();
 }
 
-
 #ifndef COMPILING_BINARY_FUNCS
 static DefineStmt *
 _readDefineStmt(void)
@@ -2586,6 +2595,20 @@ _readCompositeTypeStmt(void)
 	READ_DONE();
 }
 
+static CreateEnumStmt *
+_readCreateEnumStmt(void)
+{
+	READ_LOCALS(CreateEnumStmt);
+
+	READ_NODE_FIELD(typeName);
+	READ_NODE_FIELD(vals);
+	READ_OID_FIELD(enumTypeOid);
+	READ_OID_FIELD(enumArrayOid);
+	READ_NODE_FIELD(valOids);
+
+	READ_DONE();
+}
+
 static CreateCastStmt *
 _readCreateCastStmt(void)
 {
@@ -2883,12 +2906,30 @@ _readSliceTable(void)
 	READ_DONE();
 }
 
-static VariableResetStmt *
-_readVariableResetStmt(void)
+static CursorPosInfo *
+_readCursorPosInfo(void)
 {
-	READ_LOCALS(VariableResetStmt);
+	READ_LOCALS(CursorPosInfo);
+
+	READ_STRING_FIELD(cursor_name);
+	READ_INT_FIELD(gp_segment_id);
+	READ_UINT_FIELD(ctid.ip_blkid.bi_hi);
+	READ_UINT_FIELD(ctid.ip_blkid.bi_lo);
+	READ_UINT_FIELD(ctid.ip_posid);
+	READ_OID_FIELD(table_oid);
+
+	READ_DONE();
+}
+
+static VariableSetStmt *
+_readVariableSetStmt(void)
+{
+	READ_LOCALS(VariableSetStmt);
 
 	READ_STRING_FIELD(name);
+	READ_ENUM_FIELD(kind, VariableSetKind);
+	READ_NODE_FIELD(args);
+	READ_BOOL_FIELD(is_local);
 
 	READ_DONE();
 }
@@ -2977,6 +3018,7 @@ typedef struct ParseNodeInfo
  */
 static ParseNodeInfo infoAr[] =
 {
+	{"A_ARRAYEXPR", (ReadFn)_readA_ArrayExpr},
 	{"AEXPR", (ReadFn)_readAExpr},
 	{"AGGORDER", (ReadFn)_readAggOrder},
 	{"AGGREF", (ReadFn)_readAggref},
@@ -3020,6 +3062,7 @@ static ParseNodeInfo infoAr[] =
 	{"CREATECONVERSION", (ReadFn)_readCreateConversionStmt},
 	{"CREATEDBSTMT", (ReadFn)_readCreatedbStmt},
 	{"CREATEDOMAINSTMT", (ReadFn)_readCreateDomainStmt},
+	{"CREATEENUMSTMT", (ReadFn)_readCreateEnumStmt},
 	{"CREATEEXTERNALSTMT", (ReadFn)_readCreateExternalStmt},
 	{"CREATEFUNCSTMT", (ReadFn)_readCreateFunctionStmt},
 	{"CREATEOPCLASS", (ReadFn)_readCreateOpClassStmt},
@@ -3032,6 +3075,7 @@ static ParseNodeInfo infoAr[] =
 	{"CREATESTMT", (ReadFn)_readCreateStmt},
 	{"CREATETRIGSTMT", (ReadFn)_readCreateTrigStmt},
 	{"CURRENTOFEXPR", (ReadFn)_readCurrentOfExpr},
+	{"CURSORPOSINFO", (ReadFn)_readCursorPosInfo},
 	{"DECLARECURSOR", (ReadFn)_readDeclareCursorStmt},
 	{"DEFELEM", (ReadFn)_readDefElem},
 	{"DEFINESTMT", (ReadFn)_readDefineStmt},
@@ -3064,6 +3108,7 @@ static ParseNodeInfo infoAr[] =
 	{"INDEXSTMT", (ReadFn)_readIndexStmt},
 	{"INHERITPARTITION", (ReadFn)_readInheritPartitionCmd},
 	{"INTOCLAUSE", (ReadFn)_readIntoClause},
+	{"TABLEOIDINFO", (ReadFn)_readTableOidInfo},
 	{"JOINEXPR", (ReadFn)_readJoinExpr},
 	{"LOCKSTMT", (ReadFn)_readLockStmt},
 	{"MINMAX", (ReadFn)_readMinMaxExpr},
@@ -3100,6 +3145,7 @@ static ParseNodeInfo infoAr[] =
 	{"SINGLEROWERRORDESC",(ReadFn)_readSingleRowErrorDesc},
 	{"SLICE", (ReadFn)_readSlice},
 	{"SLICETABLE", (ReadFn)_readSliceTable},
+	{"SORTBY", (ReadFn)_readSortBy},
 	{"SORTCLAUSE", (ReadFn)_readSortClause},
 	{"SUBLINK", (ReadFn)_readSubLink},
 	{"TABLEOIDINFO", (ReadFn)_readTableOidInfo},
@@ -3110,7 +3156,7 @@ static ParseNodeInfo infoAr[] =
 	{"TYPENAME", (ReadFn)_readTypeName},
 	{"VACUUMSTMT", (ReadFn)_readVacuumStmt},
 	{"VAR", (ReadFn)_readVar},
-	{"VARIABLERESETSTMT", (ReadFn)_readVariableResetStmt},
+	{"VARIABLESETSTMT", (ReadFn)_readVariableSetStmt},
 	{"VIEWSTMT", (ReadFn)_readViewStmt},
 	{"WHEN", (ReadFn)_readCaseWhen},
 	{"WINDOWFRAME", (ReadFn)_readWindowFrame},
@@ -3121,7 +3167,6 @@ static ParseNodeInfo infoAr[] =
 	{"WINDOWSPECPARSE", (ReadFn)_readWindowSpecParse},
 	{"WITHCLAUSE", (ReadFn)_readWithClause},
 	{"XMLEXPR", (ReadFn)_readXmlExpr},
-	{"A_ARRAYEXPR", (ReadFn)_readA_ArrayExpr},
 };
 
 /*
diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c
index 1377d5da6987..189474e62fae 100644
--- a/src/backend/nodes/tidbitmap.c
+++ b/src/backend/nodes/tidbitmap.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2003-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/tidbitmap.c,v 1.11 2007/01/05 22:19:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/tidbitmap.c,v 1.14 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,7 @@
 #include "access/htup.h"
 #include "access/bitmap.h"	/* XXX: remove once pull_stream is generic */
 #include "executor/instrument.h"        /* Instrumentation */
+#include "nodes/bitmapset.h"
 #include "nodes/tidbitmap.h"
 #include "storage/bufpage.h"
 #include "utils/hsearch.h"
@@ -992,8 +993,11 @@ tbm_lossify(HashBitmap *tbm)
 	/*
 	 * XXX Really stupid implementation: this just lossifies pages in
 	 * essentially random order.  We should be paying some attention to the
-	 * number of bits set in each page, instead.  Also it might be a good idea
-	 * to lossify more than the minimum number of pages during each call.
+	 * number of bits set in each page, instead.
+	 *
+	 * Since we are called as soon as nentries exceeds maxentries, we should
+	 * push nentries down to significantly less than maxentries, or else we'll
+	 * just end up doing this again very soon.  We shoot for maxentries/2.
 	 */
 	Assert(!tbm->iterating);
 	Assert(tbm->status == HASHBM_HASH);
@@ -1027,6 +1031,19 @@ tbm_lossify(HashBitmap *tbm)
 		 * not care whether we visit lossy chunks or not.
 		 */
 	}
+
+	/*
+	 * With a big bitmap and small work_mem, it's possible that we cannot
+	 * get under maxentries.  Again, if that happens, we'd end up uselessly
+	 * calling tbm_lossify over and over.  To prevent this from becoming a
+	 * performance sink, force maxentries up to at least double the current
+	 * number of entries.  (In essence, we're admitting inability to fit
+	 * within work_mem when we do this.)  Note that this test will not fire
+	 * if we broke out of the loop early; and if we didn't, the current
+	 * number of entries is simply not reducible any further.
+	 */
+	if (tbm->nentries > tbm->maxentries / 2)
+		tbm->maxentries = Min(tbm->nentries, (INT_MAX - 1) / 2) * 2;
 }
 
 /*
diff --git a/src/backend/optimizer/README b/src/backend/optimizer/README
index 07aafec54f44..10fd9cb90a4c 100644
--- a/src/backend/optimizer/README
+++ b/src/backend/optimizer/README
@@ -240,7 +240,7 @@ these are minimums; there's no explicit maximum, since joining other
 rels to the OJ's syntactic rels may be legal.  Per identities 1 and 2,
 non-FULL joins can be freely associated into the lefthand side of an
 OJ, but in general they can't be associated into the righthand side.
-So the restriction enforced by make_join_rel is that a proposed join
+So the restriction enforced by join_is_legal is that a proposed join
 can't join a rel within or partly within an RHS boundary to one outside
 the boundary, unless the join validly implements some outer join.
 (To support use of identity 3, we have to allow cases where an apparent
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index fb95c32d1c67..82a54ff7410b 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/allpaths.c,v 1.159 2007/02/19 07:03:28 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/allpaths.c,v 1.168.2.4 2009/03/10 20:58:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,13 +51,19 @@ bool		gp_enable_sort_distinct = FALSE;
 bool		gp_enable_mk_sort = true;
 bool		gp_enable_motion_mk_sort = true;
 
+/* Hook for plugins to replace standard_join_search() */
+join_search_hook_type join_search_hook = NULL;
+
+
 static void set_base_rel_pathlists(PlannerInfo *root);
-static void set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, Index rti);
+static void set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
+				 Index rti, RangeTblEntry *rte);
 static void set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 					   RangeTblEntry *rte);
 static void set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 						Index rti, RangeTblEntry *rte);
 static bool has_multiple_baserels(PlannerInfo *root);
+static void set_dummy_rel_pathlist(PlannerInfo *root, RelOptInfo *rel);
 static void set_subquery_pathlist(PlannerInfo *root, RelOptInfo *rel,
 					  Index rti, RangeTblEntry *rte);
 static void set_function_pathlist(PlannerInfo *root, RelOptInfo *rel,
@@ -68,8 +74,6 @@ static void set_values_pathlist(PlannerInfo *root, RelOptInfo *rel,
 					RangeTblEntry *rte);
 static void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte);
 static RelOptInfo *make_rel_from_joinlist(PlannerInfo *root, List *joinlist);
-static RelOptInfo *make_one_rel_by_joins(PlannerInfo *root, int levels_needed,
-										 List *initial_rels, bool fallback);
 static Query *push_down_restrict(PlannerInfo *root, RelOptInfo *rel,
 				   RangeTblEntry *rte, Index rti,  Query *subquery);
 static bool subquery_is_pushdown_safe(Query *subquery, Query *topquery,
@@ -196,7 +200,7 @@ set_base_rel_pathlists(PlannerInfo *root)
         /* CDB: Warn if ctid column is referenced but gp_segment_id is not. */
         cdbmutate_warn_ctid_without_segid(root, rel);
 
-		set_rel_pathlist(root, rel, rti);
+		set_rel_pathlist(root, rel, rti, root->simple_rte_array[rti]);
 	}
 }
 
@@ -205,10 +209,9 @@ set_base_rel_pathlists(PlannerInfo *root)
  *	  Build access paths for a base relation
  */
 static void
-set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, Index rti)
+set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
+				 Index rti, RangeTblEntry *rte)
 {
-	RangeTblEntry *rte = rt_fetch(rti, root->parse->rtable);
-
 	if (rte->inh)
 	{
 		/* It's an "append relation", process accordingly */
@@ -265,6 +268,19 @@ set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
     ListCell   *cell;
 	char		relstorage;
 
+	/*
+	 * If we can prove we don't need to scan the rel via constraint exclusion,
+	 * set up a single dummy path for it.  We only need to check for regular
+	 * baserels; if it's an otherrel, CE was already checked in
+	 * set_append_rel_pathlist().
+	 */
+	if (rel->reloptkind == RELOPT_BASEREL &&
+		relation_excluded_by_constraints(root, rel, rte))
+	{
+		set_dummy_rel_pathlist(root, rel);
+		return;
+	}
+
 	/* Mark rel with estimated output rows, width, etc */
 	set_baserel_size_estimates(root, rel);
 
@@ -279,27 +295,6 @@ set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 	if (create_or_index_quals(root, rel))
 		set_baserel_size_estimates(root, rel);
 
-	/*
-	 * If we can prove we don't need to scan the rel via constraint exclusion,
-	 * set up a single dummy path for it.  (Rather than inventing a special
-	 * "dummy" path type, we represent this as an AppendPath with no members.)
-	 */
-	if (relation_excluded_by_constraints(root, rel, rte))
-	{
-		/* Reset output-rows estimate to 0 */
-		rel->rows = 0;
-
-        /* Obviously won't produce more than one row. */
-        rel->onerow = true;
-
-		add_path(root, rel, (Path *) create_append_path(root, rel, NIL));
-
-		/* Select cheapest path (pretty easy in this case...) */
-		set_cheapest(root, rel);
-
-		return;
-	}
-
     /* CDB: Attach subquery duplicate suppression info. */
     if (root->in_info_list)
         rel->dedup_info = cdb_make_rel_dedup_info(root, rel);
@@ -458,6 +453,7 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	{
 		AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
 		int			childRTindex;
+		RangeTblEntry *childRTE;
 		RelOptInfo *childrel;
 		Path	   *childpath;
 		ListCell   *parentvars;
@@ -468,6 +464,7 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 			continue;
 
 		childRTindex = appinfo->child_relid;
+		childRTE = root->simple_rte_array[childRTindex];
 
 		/*
 		 * The child rel's RelOptInfo was already created during
@@ -477,18 +474,34 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 		Assert(childrel->reloptkind == RELOPT_OTHER_MEMBER_REL);
 
 		/*
-		 * Copy the parent's targetlist and quals to the child, with
-		 * appropriate substitution of variables.
+		 * We have to copy the parent's targetlist and quals to the child,
+		 * with appropriate substitution of variables.	However, only the
+		 * baserestrictinfo quals are needed before we can check for
+		 * constraint exclusion; so do that first and then check to see if we
+		 * can disregard this child.
 		 */
-		childrel->reltargetlist = (List *)
-			adjust_appendrel_attrs(root, (Node *) rel->reltargetlist,
-								   appinfo);
 		childrel->baserestrictinfo = (List *)
 			adjust_appendrel_attrs(root, (Node *) rel->baserestrictinfo,
 								   appinfo);
+
+		if (relation_excluded_by_constraints(root, childrel, childRTE))
+		{
+			/*
+			 * This child need not be scanned, so we can omit it from the
+			 * appendrel.  Mark it with a dummy cheapest-path though, in case
+			 * best_appendrel_indexscan() looks at it later.
+			 */
+			set_dummy_rel_pathlist(root, childrel);
+			continue;
+		}
+
+		/* CE failed, so finish copying targetlist and join quals */
 		childrel->joininfo = (List *)
 			adjust_appendrel_attrs(root, (Node *) rel->joininfo,
 								   appinfo);
+		childrel->reltargetlist = (List *)
+			adjust_appendrel_attrs(root, (Node *) rel->reltargetlist,
+								   appinfo);
 
 		/*
 		 * We have to make child entries in the EquivalenceClass data
@@ -501,14 +514,12 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 		}
 
 		/*
-		 * Copy the parent's attr_needed data as well, with appropriate
-		 * adjustment of relids and attribute numbers.
+		 * Note: we could compute appropriate attr_needed data for the
+		 * child's variables, by transforming the parent's attr_needed
+		 * through the translated_vars mapping.  However, currently there's
+		 * no need because attr_needed is only examined for base relations
+		 * not otherrels.  So we just leave the child's attr_needed empty.
 		 */
-		pfree(childrel->attr_needed);
-		childrel->attr_needed =
-			adjust_appendrel_attr_needed(root, rel, appinfo,
-										 childrel->min_attr,
-										 childrel->max_attr);
 
 		/*
 		 * Compute the child's access paths, and add the cheapest one to the
@@ -517,24 +528,22 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 		 * It's possible that the child is itself an appendrel, in which case
 		 * we can "cut out the middleman" and just add its child paths to our
 		 * own list.  (We don't try to do this earlier because we need to
-		 * apply both levels of transformation to the quals.) This test also
-		 * handles the case where the child rel need not be scanned because of
-		 * constraint exclusion: it'll have an Append path with no subpaths,
-		 * and will vanish from our list.
+		 * apply both levels of transformation to the quals.)
 		 */
-		set_rel_pathlist(root, childrel, childRTindex);
+		set_rel_pathlist(root, childrel, childRTindex, childRTE);
 
 		childpath = childrel->cheapest_total_path;
 		if (IsA(childpath, AppendPath))
 			subpaths = list_concat(subpaths,
-								   ((AppendPath *) childpath)->subpaths);
+							list_copy(((AppendPath *) childpath)->subpaths));
 		else
 			subpaths = lappend(subpaths, childpath);
 
 		/*
 		 * Propagate size information from the child back to the parent. For
 		 * simplicity, we use the largest widths from any child as the parent
-		 * estimates.
+		 * estimates.  (If you want to change this, beware of child
+		 * attr_widths[] entries that haven't been set and are still 0.)
 		 */
         rel->tuples += childrel->tuples;
 		rel->rows += cdbpath_rows(root, childrel->cheapest_total_path);
@@ -577,6 +586,26 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	set_cheapest(root, rel);
 }
 
+/*
+ * set_dummy_rel_pathlist
+ *	  Build a dummy path for a relation that's been excluded by constraints
+ *
+ * Rather than inventing a special "dummy" path type, we represent this as an
+ * AppendPath with no members (see also IS_DUMMY_PATH macro).
+ */
+static void
+set_dummy_rel_pathlist(PlannerInfo *root, RelOptInfo *rel)
+{
+	/* Set dummy size estimates --- we leave attr_widths[] as zeroes */
+	rel->rows = 0;
+	rel->width = 0;
+
+	add_path(root, rel, (Path *) create_append_path(root, rel, NIL));
+
+	/* Select cheapest path (pretty easy in this case...) */
+	set_cheapest(root, rel);
+}
+
 /* quick-and-dirty test to see if any joining is needed */
 static bool
 has_multiple_baserels(PlannerInfo *root)
@@ -609,11 +638,18 @@ set_subquery_pathlist(PlannerInfo *root, RelOptInfo *rel,
 {
 	Query	   *subquery = rte->subquery;
 	double		tuple_fraction;
-	List	   *pathkeys;
 	PlannerInfo *subroot;
-	List	   *subquery_pathkeys;
+	List	   *pathkeys;
 	bool	   forceDistRand;
 	Path	   *subquery_path;
+	PlannerConfig *config;
+
+	/*
+	 * Must copy the Query so that planning doesn't mess up the RTE contents
+	 * (really really need to fix the planner to not scribble on its input,
+	 * someday).
+	 */
+	subquery = copyObject(subquery);
 
 	forceDistRand = rte->forceDistRandom;
 
@@ -669,19 +705,17 @@ set_subquery_pathlist(PlannerInfo *root, RelOptInfo *rel,
 			tuple_fraction = root->tuple_fraction;
 
 		/* Generate the plan for the subquery */
-		PlannerConfig *config = CopyPlannerConfig(root->config);
+		config = CopyPlannerConfig(root->config);
 
 		rel->subplan = subquery_planner(root->glob, subquery, root, tuple_fraction,
 										&subroot, config);
 		rel->subrtable = subroot->parse->rtable;
-		subquery_pathkeys = subroot->query_pathkeys;
 	}
 	else
 	{
 		/* This is a preplanned sub-query RTE. */
 		rel->subplan = rte->subquery_plan;
 		rel->subrtable = rte->subquery_rtable;
-		subquery_pathkeys = rte->subquery_pathkeys;
 		/* XXX rel->onerow = ??? */
 	}
 
@@ -699,7 +733,7 @@ set_subquery_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	set_baserel_size_estimates(root, rel);
 
 	/* Convert subquery pathkeys to outer representation */
-	pathkeys = convert_subquery_pathkeys(root, rel, subquery_pathkeys);
+	pathkeys = convert_subquery_pathkeys(root, rel, subroot->query_pathkeys);
 
 	/* Generate appropriate path */
 	subquery_path = create_subqueryscan_path(root, rel, pathkeys);
@@ -723,6 +757,16 @@ void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 	/* Find the referenced CTE based on the given range table entry */
 	Index levelsup = rte->ctelevelsup;
 	PlannerInfo *cteroot = root;
+	ListCell *lc;
+	CommonTableExpr *cte = NULL;
+	int			planinfo_id;
+	double tuple_fraction = 0.0;
+	CtePlanInfo *cteplaninfo;
+	Plan *subplan = NULL;
+	List *subrtable = NULL;
+	List *pathkeys = NULL;
+	PlannerInfo *subroot = NULL;
+
 	while (levelsup > 0)
 	{
 		cteroot = cteroot->parent_root;
@@ -730,9 +774,7 @@ void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 		levelsup--;
 	}
 
-	ListCell *lc;
-	CommonTableExpr *cte = NULL;
-	int planinfo_id = 0;
+	planinfo_id = 0;
 	foreach(lc, cteroot->parse->cteList)
 	{
 		cte = (CommonTableExpr *) lfirst(lc);
@@ -745,7 +787,7 @@ void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 	Assert(lc != NULL);
 	Assert(cte != NULL);
 
-	double tuple_fraction = 0.0;
+
 	Assert(IsA(cte->ctequery, Query));
 
 	/*
@@ -763,12 +805,7 @@ void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 	 *       in cteplaninfo so that they can be used later.
 	 */
 	Assert(list_length(cteroot->list_cteplaninfo) > planinfo_id);
-	CtePlanInfo *cteplaninfo = list_nth(cteroot->list_cteplaninfo, planinfo_id);
-
-	Plan *subplan = NULL;
-	List *subrtable = NULL;
-	List *pathkeys = NULL;
-	PlannerInfo *subroot = NULL;
+	cteplaninfo = list_nth(cteroot->list_cteplaninfo, planinfo_id);
 
 	/*
 	 * If there is exactly one reference to this CTE in the query, or plan
@@ -798,6 +835,12 @@ void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 	{
 		PlannerConfig *config = CopyPlannerConfig(root->config);
 
+		/*
+		 * Copy query node since subquery_planner may trash it, and we need
+		 * it intact in case we need to create another plan for the CTE
+		 */
+		Query		  *subquery = (Query *) copyObject(cte->ctequery);
+
 		/*
 		 * Having multiple SharedScans can lead to deadlocks. For now,
 		 * disallow sharing of ctes at lower levels.
@@ -805,17 +848,22 @@ void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 		config->gp_cte_sharing = false;
 
 		/*
-		 * Copy query node since subquery_planner may trash it, and we need
-		 * it intact in case we need to create another plan for the CTE
+		 * Adjust the subquery so that 'root', i.e. this subquery, is the
+		 * parent of the CTE subquery, even though the CTE might've been
+		 * higher up syntactically. This is because some of the quals that
+		 * we push down might refer to relations between the current level
+		 * and the CTE's syntactical level. Such relations are not visible
+		 * at the CTE's syntactical level, and SS_finalize_plan() would
+		 * throw an error on them.
 		 */
-		Query		  *subquery = (Query *) copyObject(cte->ctequery);
+		IncrementVarSublevelsUp((Node *) subquery, rte->ctelevelsup, 1);
 
 		/*
 		 * Push down quals, like we do in set_subquery_pathlist()
 		 */
 		subquery = push_down_restrict(root, rel, rte, rel->relid, subquery);
 
-		subplan = subquery_planner(cteroot->glob, subquery, cteroot,
+		subplan = subquery_planner(cteroot->glob, subquery, root,
 								   tuple_fraction, &subroot, config);
 
 		subrtable = subroot->parse->rtable;
@@ -1058,30 +1106,34 @@ make_rel_from_joinlist(PlannerInfo *root, List *joinlist)
 	{
 		/*
 		 * Consider the different orders in which we could join the rels,
-		 * using either GEQO or regular optimizer.
+		 * using a plugin, GEQO, or the regular join search code.
 		 *
 		 * We put the initial_rels list into a PlannerInfo field because
 		 * has_legal_joinclause() needs to look at it (ugly :-().
-  		 */
-		RelOptInfo *rel;
+		 */
 		root->initial_rels = initial_rels;
 
-		rel = make_one_rel_by_joins(root, levels_needed, initial_rels, false);
-
-		if (rel == NULL
-				&& root->config->gp_enable_fallback_plan)
+		if (join_search_hook)
+			return (*join_search_hook) (root, levels_needed, initial_rels);
+		else
 		{
-			root->join_rel_hash = NULL;
-			root->join_rel_list = NULL;
-			rel = make_one_rel_by_joins(root, levels_needed, initial_rels, true);
+			RelOptInfo *rel;
+
+			rel = standard_join_search(root, levels_needed, initial_rels, false);
+			if (rel == NULL && root->config->gp_enable_fallback_plan)
+			{
+				root->join_rel_hash = NULL;
+				root->join_rel_list = NULL;
+				rel = standard_join_search(root, levels_needed, initial_rels, true);
+			}
+			return rel;
 		}
-		return rel;
 	}
 }
 
 /*
- * make_one_rel_by_joins
- *	  Find all possible joinpaths for a query by successively finding ways
+ * standard_join_search
+ *	  Find possible joinpaths for a query by successively finding ways
  *	  to join component relations into join relations.
  *
  * 'levels_needed' is the number of iterations needed, ie, the number of
@@ -1089,12 +1141,27 @@ make_rel_from_joinlist(PlannerInfo *root, List *joinlist)
  *
  * 'initial_rels' is a list of RelOptInfo nodes for each independent
  *		jointree item.	These are the components to be joined together.
+ *		Note that levels_needed == list_length(initial_rels).
  *
  * Returns the final level of join relations, i.e., the relation that is
  * the result of joining all the original relations together.
+ * At least one implementation path must be provided for this relation and
+ * all required sub-relations.
+ *
+ * To support loadable plugins that modify planner behavior by changing the
+ * join searching algorithm, we provide a hook variable that lets a plugin
+ * replace or supplement this function.  Any such hook must return the same
+ * final join relation as the standard code would, but it might have a
+ * different set of implementation paths attached, and only the sub-joinrels
+ * needed for these paths need have been instantiated.
+ *
+ * Note to plugin authors: the functions invoked during standard_join_search()
+ * modify root->join_rel_list and root->join_rel_hash.	If you want to do more
+ * than one join-order search, you'll probably need to save and restore the
+ * original states of those data structures.  See geqo_eval() for an example.
  */
-static RelOptInfo *
-make_one_rel_by_joins(PlannerInfo *root, int levels_needed, List *initial_rels, bool fallback)
+RelOptInfo *
+standard_join_search(PlannerInfo *root, int levels_needed, List *initial_rels, bool fallback)
 {
 	List	  **joinitems = NULL;
 	int			lev;
@@ -1127,7 +1194,7 @@ make_one_rel_by_joins(PlannerInfo *root, int levels_needed, List *initial_rels,
 		 * level, and build paths for making each one from every available
 		 * pair of lower-level relations.
 		 */
-		joinitems[lev] = make_rels_by_joins(root, lev, joinitems);
+		joinitems[lev] = join_search_one_level(root, lev, joinitems);
 
 		/*
 		 * Do cleanup work on each just-processed rel.
@@ -1405,8 +1472,6 @@ qual_contains_winref(Query *topquery,
 				Index rti,  /* index of RTE of subquery where qual needs to be checked */
 				Node *qual)
 {
-	Assert(topquery);
-
 	/*
 	 * extract subquery where qual needs to be checked
 	 */
@@ -1441,10 +1506,7 @@ qual_contains_winref(Query *topquery,
 static bool
 qual_is_pushdown_safe_set_operation(Query *subquery, Node *qual)
 {
-	Assert(subquery);
-
 	SetOperationStmt *setop = (SetOperationStmt *)subquery->setOperations;
-	Assert(setop);
 
 	/*
 	 * MPP-21075
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index bc435fd02639..0dcc5eab04fe 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/clausesel.c,v 1.84 2007/02/19 07:03:28 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/clausesel.c,v 1.90.2.1 2008/12/01 21:06:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -130,6 +130,14 @@ clauselist_selectivity(PlannerInfo *root,
 	/* allocate array to hold all selectivity factors */
 	rgsel = (Selectivity *) palloc(sizeof(Selectivity) * list_length(clauses));
 
+	/*
+	 * If there's exactly one clause, then no use in trying to match up
+	 * pairs, so just go directly to clause_selectivity().
+	 */
+	if (list_length(clauses) == 1)
+		return clause_selectivity(root, (Node *) linitial(clauses),
+								  varRelid, jointype, use_damping);
+
 	/*
 	 * Initial scan over clauses.  Anything that doesn't look like a potential
 	 * rangequery clause gets directly added as selectivity factor. Anything that
@@ -483,7 +491,7 @@ clause_selectivity(PlannerInfo *root,
 				   JoinType jointype,
 				   bool use_damping)
 {
-	Selectivity s1 = 1.0;		/* default for any unhandled clause type */
+	Selectivity s1 = 0.5;		/* default for any unhandled clause type */
 	RestrictInfo *rinfo = NULL;
 	bool		cacheable = false;
 
@@ -505,9 +513,15 @@ clause_selectivity(PlannerInfo *root,
 		if (rinfo->pseudoconstant)
 		{
 			if (!IsA(rinfo->clause, Const))
-				return s1;
+				return (Selectivity) 1.0;
 		}
 
+		/*
+		 * If the clause is marked redundant, always return 1.0.
+		 */
+		if (rinfo->this_selec > 1)
+			return (Selectivity) 1.0;
+
 		/*
 		 * If possible, cache the result of the selectivity calculation for
 		 * the clause.	We can cache if varRelid is zero or the clause
@@ -565,15 +579,14 @@ clause_selectivity(PlannerInfo *root,
 		if (var->varlevelsup == 0 &&
 			(varRelid == 0 || varRelid == (int) var->varno))
 		{
-			RangeTblEntry *rte = rt_fetch(var->varno, root->parse->rtable);
+			RangeTblEntry *rte = planner_rt_fetch(var->varno, root);
 
 			if (rte->rtekind == RTE_SUBQUERY)
 			{
 				/*
 				 * XXX not smart about subquery references... any way to do
-				 * better?
+				 * better than default?
 				 */
-				s1 = 0.5;
 			}
 			else
 			{
@@ -614,8 +627,7 @@ clause_selectivity(PlannerInfo *root,
 		}
 		else
 		{
-			/* XXX any way to do better? */
-			s1 = (Selectivity) 0.5;
+			/* XXX any way to do better than default? */
 		}
 	}
 	else if (not_clause(clause))
@@ -658,7 +670,7 @@ clause_selectivity(PlannerInfo *root,
 			s1 = s1 + s2 - s1 * s2;
 		}
 	}
-	else if (is_opclause(clause))
+	else if (is_opclause(clause) || IsA(clause, DistinctExpr))
 	{
 		Oid			opno = ((OpExpr *) clause)->opno;
 		bool		is_join_clause;
@@ -699,6 +711,15 @@ clause_selectivity(PlannerInfo *root,
 										 ((OpExpr *) clause)->args,
 										 varRelid);
 		}
+
+		/*
+		 * DistinctExpr has the same representation as OpExpr, but the
+		 * contained operator is "=" not "<>", so we must negate the result.
+		 * This estimation method doesn't give the right behavior for nulls,
+		 * but it's better than doing nothing.
+		 */
+		if (IsA(clause, DistinctExpr))
+			s1 = 1.0 - s1;
 	}
 	else if (is_funcclause(clause))
 	{
@@ -709,6 +730,7 @@ clause_selectivity(PlannerInfo *root,
 		 */
 		s1 = (Selectivity) 0.3333333;
 	}
+#ifdef NOT_USED
 	else if (is_subplan(clause))
 	{
 		/*
@@ -716,11 +738,7 @@ clause_selectivity(PlannerInfo *root,
 		 */
 		s1 = (Selectivity) 0.5;
 	}
-	else if (IsA(clause, DistinctExpr))
-	{
-		/* can we do better? */
-		s1 = (Selectivity) 0.5;
-	}
+#endif
 	else if (IsA(clause, ScalarArrayOpExpr))
 	{
 		/* First, decide if it's a join clause, same as for OpExpr */
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index aeb83abdc2cd..804f409b2409 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -55,7 +55,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.177 2007/01/22 20:00:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.191.2.1 2008/03/24 21:53:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,6 +72,7 @@
 #include "optimizer/planmain.h"
 #include "parser/parse_expr.h"
 #include "parser/parsetree.h"
+#include "parser/parse_expr.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
 #include "utils/tuplesort.h"
@@ -107,8 +108,8 @@ typedef struct
 } cost_qual_eval_context;
 
 static MergeScanSelCache *cached_scansel(PlannerInfo *root,
-										 RestrictInfo *rinfo,
-										 PathKey *pathkey);
+			   RestrictInfo *rinfo,
+			   PathKey *pathkey);
 static bool cost_qual_eval_walker(Node *node, cost_qual_eval_context *context);
 static Selectivity approx_selectivity(PlannerInfo *root, List *quals,
 				   JoinType jointype);
@@ -392,15 +393,14 @@ cost_index(IndexPath *path, PlannerInfo *root,
 		max_IO_cost = (pages_fetched * random_page_cost) / num_scans;
 
 		/*
-		 * In the perfectly correlated case, the number of pages touched
-		 * by each scan is selectivity * table_size, and we can use the
-		 * Mackert and Lohman formula at the page level to estimate how
-		 * much work is saved by caching across scans.  We still assume
-		 * all the fetches are random, though, which is an overestimate
-		 * that's hard to correct for without double-counting the cache
-		 * effects.  (But in most cases where such a plan is actually
-		 * interesting, only one page would get fetched per scan anyway,
-		 * so it shouldn't matter much.)
+		 * In the perfectly correlated case, the number of pages touched by
+		 * each scan is selectivity * table_size, and we can use the Mackert
+		 * and Lohman formula at the page level to estimate how much work is
+		 * saved by caching across scans.  We still assume all the fetches are
+		 * random, though, which is an overestimate that's hard to correct for
+		 * without double-counting the cache effects.  (But in most cases
+		 * where such a plan is actually interesting, only one page would get
+		 * fetched per scan anyway, so it shouldn't matter much.)
 		 */
 		pages_fetched = ceil(indexSelectivity * (double) baserel->pages);
 
@@ -433,8 +433,8 @@ cost_index(IndexPath *path, PlannerInfo *root,
 	}
 
 	/*
-	 * Now interpolate based on estimated index order correlation to get
-	 * total disk I/O cost for main table accesses.
+	 * Now interpolate based on estimated index order correlation to get total
+	 * disk I/O cost for main table accesses.
 	 */
 	csquared = indexCorrelation * indexCorrelation;
 
@@ -449,6 +449,14 @@ cost_index(IndexPath *path, PlannerInfo *root,
 	 * some of the indexquals are join clauses and shouldn't be subtracted.
 	 * Rather than work out exactly how much to subtract, we don't subtract
 	 * anything.
+	 *
+	 * XXX actually, this calculation is almost completely bogus, because
+	 * indexquals will contain derived indexable conditions which might be
+	 * quite different from the "original" quals in baserestrictinfo.  We
+	 * ought to determine the actual qpqual list and cost that, rather than
+	 * using this shortcut.  But that's too invasive a change to consider
+	 * back-patching, so for the moment we just mask the worst aspects of the
+	 * problem by clamping the subtracted amount.
 	 */
 	startup_cost += baserel->baserestrictcost.startup;
 	cpu_per_tuple = cpu_tuple_cost + baserel->baserestrictcost.per_tuple;
@@ -459,7 +467,8 @@ cost_index(IndexPath *path, PlannerInfo *root,
 
 		cost_qual_eval(&index_qual_cost, indexQuals, root);
 		/* any startup cost still has to be paid ... */
-		cpu_per_tuple -= index_qual_cost.per_tuple;
+		cpu_per_tuple -= Min(index_qual_cost.per_tuple,
+							 baserel->baserestrictcost.per_tuple);
 	}
 
 	run_cost += cpu_per_tuple * tuples_fetched;
@@ -931,11 +940,12 @@ cost_bitmap_tree_node(Path *path, Cost *cost, Selectivity *selec)
 	{
 		*cost = ((IndexPath *) path)->indextotalcost;
 		*selec = ((IndexPath *) path)->indexselectivity;
+
 		/*
 		 * Charge a small amount per retrieved tuple to reflect the costs of
 		 * manipulating the bitmap.  This is mostly to make sure that a bitmap
-		 * scan doesn't look to be the same cost as an indexscan to retrieve
-		 * a single tuple.
+		 * scan doesn't look to be the same cost as an indexscan to retrieve a
+		 * single tuple.
 		 */
 		*cost += 0.1 * cpu_operator_cost * ((IndexPath *) path)->rows;
 	}
@@ -1057,7 +1067,9 @@ cost_tidscan(Path *path, PlannerInfo *root,
 {
 	Cost		startup_cost = 0;
 	Cost		run_cost = 0;
+	bool		isCurrentOf = false;
 	Cost		cpu_per_tuple;
+	QualCost	tid_qual_cost;
 	int			ntuples;
 	ListCell   *l;
 
@@ -1077,6 +1089,12 @@ cost_tidscan(Path *path, PlannerInfo *root,
 
 			ntuples += estimate_array_length(arraynode);
 		}
+		else if (IsA(lfirst(l), CurrentOfExpr))
+		{
+			/* CURRENT OF yields 1 tuple */
+			isCurrentOf = true;
+			ntuples++;
+		}
 		else
 		{
 			/* It's just CTID = something, count 1 tuple */
@@ -1084,12 +1102,36 @@ cost_tidscan(Path *path, PlannerInfo *root,
 		}
 	}
 
+	/*
+	 * We must force TID scan for WHERE CURRENT OF, because only nodeTidscan.c
+	 * understands how to do it correctly.	Therefore, honor enable_tidscan
+	 * only when CURRENT OF isn't present.  Also note that cost_qual_eval
+	 * counts a CurrentOfExpr as having startup cost disable_cost, which we
+	 * subtract off here; that's to prevent other plan types such as seqscan
+	 * from winning.
+	 */
+	if (isCurrentOf)
+	{
+		Assert(baserel->baserestrictcost.startup >= disable_cost);
+		startup_cost -= disable_cost;
+	}
+	else if (!enable_tidscan)
+		startup_cost += disable_cost;
+
+	/*
+	 * The TID qual expressions will be computed once, any other baserestrict
+	 * quals once per retrived tuple.
+	 */
+	cost_qual_eval(&tid_qual_cost, tidquals, root);
+
 	/* disk costs --- assume each tuple on a different page */
 	run_cost += random_page_cost * ntuples;
 
 	/* CPU costs */
-	startup_cost += baserel->baserestrictcost.startup;
-	cpu_per_tuple = cpu_tuple_cost + baserel->baserestrictcost.per_tuple;
+	startup_cost += baserel->baserestrictcost.startup +
+		tid_qual_cost.per_tuple;
+	cpu_per_tuple = cpu_tuple_cost + baserel->baserestrictcost.per_tuple -
+		tid_qual_cost.per_tuple;
 	run_cost += cpu_per_tuple * ntuples;
 
 	path->startup_cost = startup_cost;
@@ -1142,7 +1184,7 @@ cost_functionscan(Path *path, PlannerInfo *root, RelOptInfo *baserel)
 
 	/* Should only be applied to base relations that are functions */
 	Assert(baserel->relid > 0);
-	rte = rt_fetch(baserel->relid, root->parse->rtable);
+	rte = planner_rt_fetch(baserel->relid, root);
 	Assert(rte->rtekind == RTE_FUNCTION);
 
 	/* Estimate costs of executing the function expression */
@@ -1263,6 +1305,10 @@ cost_ctescan(Path *path, PlannerInfo *root, RelOptInfo *baserel)
  *		disk traffic = 2 * relsize * ceil(logM(p / (2*work_mem)))
  *		cpu = comparison_cost * t * log2(t)
  *
+ * If the sort is bounded (i.e., only the first k result tuples are needed)
+ * and k tuples can fit into work_mem, we use a heap method that keeps only
+ * k tuples in the heap; this will require about t*log2(k) tuple comparisons.
+ *
  * The disk traffic is assumed to be 3/4ths sequential and 1/4th random
  * accesses (XXX can't we refine that guess?)
  *
@@ -1273,6 +1319,7 @@ cost_ctescan(Path *path, PlannerInfo *root, RelOptInfo *baserel)
  * 'input_cost' is the total cost for reading the input data
  * 'tuples' is the number of tuples in the relation
  * 'width' is the average tuple width in bytes
+ * 'limit_tuples' is the bound on the number of output tuples; -1 if no bound
  *
  * NOTE: some callers currently pass NIL for pathkeys because they
  * can't conveniently supply the sort keys.  Since this routine doesn't
@@ -1283,13 +1330,19 @@ cost_ctescan(Path *path, PlannerInfo *root, RelOptInfo *baserel)
  */
 void
 cost_sort(Path *path, PlannerInfo *root,
-		  List *pathkeys, Cost input_cost, double tuples, int width)
+		  List *pathkeys, Cost input_cost, double tuples, int width,
+		  double limit_tuples)
 {
 	Cost		startup_cost = input_cost;
 	Cost		run_cost = 0;
-	double		nbytes = relation_byte_size(tuples, width);
+	double		input_bytes = relation_byte_size(tuples, width);
+	double		output_bytes;
+	double		output_tuples;
 	long		work_mem_bytes = (long) global_work_mem(root);
 
+	if (!enable_sort)
+		startup_cost += disable_cost;
+
 	/*
 	 * We want to be sure the cost of a sort is never estimated as zero, even
 	 * if passed-in tuple count is zero.  Besides, mustn't do log(0)...
@@ -1297,23 +1350,39 @@ cost_sort(Path *path, PlannerInfo *root,
 	if (tuples < 2.0)
 		tuples = 2.0;
 
-	/*
-	 * CPU costs
-	 *
-	 * Assume about two operator evals per tuple comparison and N log2 N
-	 * comparisons
-	 */
-	startup_cost += 2.0 * cpu_operator_cost * tuples * LOG2(tuples);
+	/* Do we have a useful LIMIT? */
+	if (limit_tuples > 0 && limit_tuples < tuples)
+	{
+		output_tuples = limit_tuples;
+		output_bytes = relation_byte_size(output_tuples, width);
+	}
+	else
+	{
+		output_tuples = tuples;
+		output_bytes = input_bytes;
+	}
 
-	/* disk costs */
-	if (nbytes > work_mem_bytes)
+	if (output_bytes > work_mem_bytes)
 	{
-		double		npages = ceil(nbytes / BLCKSZ);
-		double		nruns = (nbytes / work_mem_bytes) * 0.5;
+		/*
+		 * We'll have to use a disk-based sort of all the tuples
+		 */
+		double		npages = ceil(input_bytes / BLCKSZ);
+		double		nruns = (input_bytes / work_mem_bytes) * 0.5;
 		double		mergeorder = tuplesort_merge_order(work_mem_bytes);
 		double		log_runs;
 		double		npageaccesses;
 
+		/*
+		 * CPU costs
+		 *
+		 * Assume about two operator evals per tuple comparison and N log2 N
+		 * comparisons
+		 */
+		startup_cost += 2.0 * cpu_operator_cost * tuples * LOG2(tuples);
+
+		/* Disk costs */
+
 		/* Compute logM(r) as log(r) / log(M) */
 		if (nruns > mergeorder)
 			log_runs = ceil(log(nruns) / log(mergeorder));
@@ -1324,10 +1393,27 @@ cost_sort(Path *path, PlannerInfo *root,
 		startup_cost += npageaccesses *
 			(seq_page_cost * 0.75 + random_page_cost * 0.25);
 	}
+	else if (tuples > 2 * output_tuples || input_bytes > work_mem_bytes)
+	{
+		/*
+		 * We'll use a bounded heap-sort keeping just K tuples in memory, for
+		 * a total number of tuple comparisons of N log2 K; but the constant
+		 * factor is a bit higher than for quicksort.  Tweak it so that the
+		 * cost curve is continuous at the crossover point.
+		 */
+		startup_cost += 2.0 * cpu_operator_cost * tuples * LOG2(2.0 * output_tuples);
+	}
+	else
+	{
+		/* We'll use plain quicksort on all the input tuples */
+		startup_cost += 2.0 * cpu_operator_cost * tuples * LOG2(tuples);
+	}
 
 	/*
 	 * Also charge a small amount (arbitrarily set equal to operator cost) per
-	 * extracted tuple.
+	 * extracted tuple.  Note it's correct to use tuples not output_tuples
+	 * here --- the upper LIMIT will pro-rate the run cost so we'd be double
+	 * counting the LIMIT otherwise.
 	 */
 	run_cost += cpu_operator_cost * tuples;
 
@@ -1335,6 +1421,23 @@ cost_sort(Path *path, PlannerInfo *root,
 	path->total_cost = startup_cost + run_cost;
 }
 
+/*
+ * sort_exceeds_work_mem
+ *	  Given a finished Sort plan node, detect whether it is expected to
+ *	  spill to disk (ie, will need more than work_mem workspace)
+ *
+ * This assumes there will be no available LIMIT.
+ */
+bool
+sort_exceeds_work_mem(Sort *sort)
+{
+	double		input_bytes = relation_byte_size(sort->plan.plan_rows,
+												 sort->plan.plan_width);
+	long		work_mem_bytes = work_mem * 1024L;
+
+	return (input_bytes > work_mem_bytes);
+}
+
 /*
  * cost_material
  *	  Determines and returns the cost of materializing a relation, including
@@ -1724,15 +1827,28 @@ cost_mergejoin(MergePath *path, PlannerInfo *root)
 	double		outer_path_rows = PATH_ROWS(root, outer_path);
 	double		inner_path_rows = PATH_ROWS(root, inner_path);
 	double		outer_rows,
-				inner_rows;
+				inner_rows,
+				outer_skip_rows,
+				inner_skip_rows;
 	double		mergejointuples,
 				rescannedtuples;
 	double		rescanratio;
-	Selectivity outerscansel,
-				innerscansel;
+	Selectivity outerstartsel,
+				outerendsel,
+				innerstartsel,
+				innerendsel;
 	Selectivity joininfactor;
 	Path		sort_path;		/* dummy for result of cost_sort */
 
+	/* Protect some assumptions below that rowcounts aren't zero */
+	if (outer_path_rows <= 0)
+		outer_path_rows = 1;
+	if (inner_path_rows <= 0)
+		inner_path_rows = 1;
+
+	if (!enable_mergejoin)
+		startup_cost += disable_cost;
+
 	/*
 	 * Compute cost and selectivity of the mergequals and qpquals (other
 	 * restriction clauses) separately.  We use approx_selectivity here for
@@ -1793,18 +1909,20 @@ cost_mergejoin(MergePath *path, PlannerInfo *root)
 	 * A merge join will stop as soon as it exhausts either input stream
 	 * (unless it's an outer join, in which case the outer side has to be
 	 * scanned all the way anyway).  Estimate fraction of the left and right
-	 * inputs that will actually need to be scanned. We use only the first
-	 * (most significant) merge clause for this purpose.  Since
-	 * mergejoinscansel() is a fairly expensive computation, we cache the
-	 * results in the merge clause RestrictInfo.
+	 * inputs that will actually need to be scanned.  Likewise, we can
+	 * estimate the number of rows that will be skipped before the first
+	 * join pair is found, which should be factored into startup cost.
+	 * We use only the first (most significant) merge clause for this purpose.
+	 * Since mergejoinscansel() is a fairly expensive computation, we cache
+	 * the results in the merge clause RestrictInfo.
 	 */
 	if (mergeclauses && path->jpath.jointype != JOIN_FULL)
 	{
 		RestrictInfo *firstclause = (RestrictInfo *) linitial(mergeclauses);
 		List	   *opathkeys;
 		List	   *ipathkeys;
-		PathKey	   *opathkey;
-		PathKey	   *ipathkey;
+		PathKey    *opathkey;
+		PathKey    *ipathkey;
 		MergeScanSelCache *cache;
 
 		/* Get the input pathkeys to determine the sort-order details */
@@ -1827,39 +1945,63 @@ cost_mergejoin(MergePath *path, PlannerInfo *root)
 						  outer_path->parent->relids))
 		{
 			/* left side of clause is outer */
-			outerscansel = cache->leftscansel;
-			innerscansel = cache->rightscansel;
+			outerstartsel = cache->leftstartsel;
+			outerendsel = cache->leftendsel;
+			innerstartsel = cache->rightstartsel;
+			innerendsel = cache->rightendsel;
 		}
 		else
 		{
 			/* left side of clause is inner */
-			outerscansel = cache->rightscansel;
-			innerscansel = cache->leftscansel;
+			outerstartsel = cache->rightstartsel;
+			outerendsel = cache->rightendsel;
+			innerstartsel = cache->leftstartsel;
+			innerendsel = cache->leftendsel;
 		}
 		if (path->jpath.jointype == JOIN_LEFT || 
 			path->jpath.jointype == JOIN_LASJ ||
 			path->jpath.jointype == JOIN_LASJ_NOTIN)
-			outerscansel = 1.0;
+		{
+			outerstartsel = 0.0;
+			outerendsel = 1.0;
+		}
 		else if (path->jpath.jointype == JOIN_RIGHT)
-			innerscansel = 1.0;
+		{
+			innerstartsel = 0.0;
+			innerendsel = 1.0;
+		}
 	}
 	else
 	{
 		/* cope with clauseless or full mergejoin */
-		outerscansel = innerscansel = 1.0;
+		outerstartsel = innerstartsel = 0.0;
+		outerendsel = innerendsel = 1.0;
 	}
 
-	/* convert selectivity to row count; must scan at least one row */
-	outer_rows = clamp_row_est(outer_path_rows * outerscansel);
-	inner_rows = clamp_row_est(inner_path_rows * innerscansel);
+	/*
+	 * Convert selectivities to row counts.  We force outer_rows and
+	 * inner_rows to be at least 1, but the skip_rows estimates can be zero.
+	 */
+	outer_skip_rows = rint(outer_path_rows * outerstartsel);
+	inner_skip_rows = rint(inner_path_rows * innerstartsel);
+	outer_rows = clamp_row_est(outer_path_rows * outerendsel);
+	inner_rows = clamp_row_est(inner_path_rows * innerendsel);
+
+	Assert(outer_skip_rows <= outer_rows);
+	Assert(inner_skip_rows <= inner_rows);
 
 	/*
 	 * Readjust scan selectivities to account for above rounding.  This is
 	 * normally an insignificant effect, but when there are only a few rows in
 	 * the inputs, failing to do this makes for a large percentage error.
 	 */
-	outerscansel = outer_rows / outer_path_rows;
-	innerscansel = inner_rows / inner_path_rows;
+	outerstartsel = outer_skip_rows / outer_path_rows;
+	innerstartsel = inner_skip_rows / inner_path_rows;
+	outerendsel = outer_rows / outer_path_rows;
+	innerendsel = inner_rows / inner_path_rows;
+
+	Assert(outerstartsel <= outerendsel);
+	Assert(innerstartsel <= innerendsel);
 
 	/* cost of source data */
 
@@ -1870,16 +2012,21 @@ cost_mergejoin(MergePath *path, PlannerInfo *root)
 				  outersortkeys,
 				  outer_path->total_cost,
 				  outer_path_rows,
-				  outer_path->parent->width);
+				  outer_path->parent->width,
+				  -1.0);
 		startup_cost += sort_path.startup_cost;
+		startup_cost += (sort_path.total_cost - sort_path.startup_cost)
+			* outerstartsel;
 		run_cost += (sort_path.total_cost - sort_path.startup_cost)
-			* outerscansel;
+			* (outerendsel - outerstartsel);
 	}
 	else
 	{
 		startup_cost += outer_path->startup_cost;
+		startup_cost += (outer_path->total_cost - outer_path->startup_cost)
+			* outerstartsel;
 		run_cost += (outer_path->total_cost - outer_path->startup_cost)
-			* outerscansel;
+			* (outerendsel - outerstartsel);
 	}
 
 	if (innersortkeys)			/* do we need to sort inner? */
@@ -1889,16 +2036,21 @@ cost_mergejoin(MergePath *path, PlannerInfo *root)
 				  innersortkeys,
 				  inner_path->total_cost,
 				  inner_path_rows,
-				  inner_path->parent->width);
+				  inner_path->parent->width,
+				  -1.0);
 		startup_cost += sort_path.startup_cost;
+		startup_cost += (sort_path.total_cost - sort_path.startup_cost)
+			* innerstartsel * rescanratio;
 		run_cost += (sort_path.total_cost - sort_path.startup_cost)
-			* innerscansel * rescanratio;
+			* (innerendsel - innerstartsel) * rescanratio;
 	}
 	else
 	{
 		startup_cost += inner_path->startup_cost;
+		startup_cost += (inner_path->total_cost - inner_path->startup_cost)
+			* innerstartsel * rescanratio;
 		run_cost += (inner_path->total_cost - inner_path->startup_cost)
-			* innerscansel * rescanratio;
+			* (innerendsel - innerstartsel) * rescanratio;
 	}
 
 	/* CPU costs */
@@ -1920,8 +2072,11 @@ cost_mergejoin(MergePath *path, PlannerInfo *root)
 	 * joininfactor.
 	 */
 	startup_cost += merge_qual_cost.startup;
+	startup_cost += merge_qual_cost.per_tuple *
+		(outer_skip_rows + inner_skip_rows * rescanratio);
 	run_cost += merge_qual_cost.per_tuple *
-		(outer_rows + inner_rows * rescanratio);
+		((outer_rows - outer_skip_rows) +
+		 (inner_rows - inner_skip_rows) * rescanratio);
 
 	/*
 	 * For each tuple that gets through the mergejoin proper, we charge
@@ -1946,8 +2101,10 @@ cached_scansel(PlannerInfo *root, RestrictInfo *rinfo, PathKey *pathkey)
 {
 	MergeScanSelCache *cache;
 	ListCell   *lc;
-	Selectivity leftscansel,
-				rightscansel;
+	Selectivity leftstartsel,
+				leftendsel,
+				rightstartsel,
+				rightendsel;
 	MemoryContext oldcontext;
 
 	/* Do we have this result already? */
@@ -1966,8 +2123,10 @@ cached_scansel(PlannerInfo *root, RestrictInfo *rinfo, PathKey *pathkey)
 					 pathkey->pk_opfamily,
 					 pathkey->pk_strategy,
 					 pathkey->pk_nulls_first,
-					 &leftscansel,
-					 &rightscansel);
+					 &leftstartsel,
+					 &leftendsel,
+					 &rightstartsel,
+					 &rightendsel);
 
 	/* Cache the result in suitably long-lived workspace */
 	oldcontext = MemoryContextSwitchTo(root->planner_cxt);
@@ -1976,8 +2135,10 @@ cached_scansel(PlannerInfo *root, RestrictInfo *rinfo, PathKey *pathkey)
 	cache->opfamily = pathkey->pk_opfamily;
 	cache->strategy = pathkey->pk_strategy;
 	cache->nulls_first = pathkey->pk_nulls_first;
-	cache->leftscansel = leftscansel;
-	cache->rightscansel = rightscansel;
+	cache->leftstartsel = leftstartsel;
+	cache->leftendsel = leftendsel;
+	cache->rightstartsel = rightstartsel;
+	cache->rightendsel = rightendsel;
 
 	rinfo->scansel_cache = lappend(rinfo->scansel_cache, cache);
 
@@ -2147,8 +2308,8 @@ cost_hashjoin(HashPath *path, PlannerInfo *root)
 	 * If inner relation is too big then we will need to "batch" the join,
 	 * which implies writing and reading most of the tuples to disk an extra
 	 * time.  Charge seq_page_cost per page, since the I/O should be nice and
-	 * sequential.  Writing the inner rel counts as startup cost,
-	 * all the rest as run cost.
+	 * sequential.	Writing the inner rel counts as startup cost, all the rest
+	 * as run cost.
 	 */
 	if (numbatches > 1)
 	{
@@ -2272,9 +2433,9 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 
 	/*
 	 * RestrictInfo nodes contain an eval_cost field reserved for this
-	 * routine's use, so that it's not necessary to evaluate the qual
-	 * clause's cost more than once.  If the clause's cost hasn't been
-	 * computed yet, the field's startup value will contain -1.
+	 * routine's use, so that it's not necessary to evaluate the qual clause's
+	 * cost more than once.  If the clause's cost hasn't been computed yet,
+	 * the field's startup value will contain -1.
 	 */
 	if (IsA(node, RestrictInfo))
 	{
@@ -2287,14 +2448,16 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 			locContext.root = context->root;
 			locContext.total.startup = 0;
 			locContext.total.per_tuple = 0;
+
 			/*
-			 * For an OR clause, recurse into the marked-up tree so that
-			 * we set the eval_cost for contained RestrictInfos too.
+			 * For an OR clause, recurse into the marked-up tree so that we
+			 * set the eval_cost for contained RestrictInfos too.
 			 */
 			if (rinfo->orclause)
 				cost_qual_eval_walker((Node *) rinfo->orclause, &locContext);
 			else
 				cost_qual_eval_walker((Node *) rinfo->clause, &locContext);
+
 			/*
 			 * If the RestrictInfo is marked pseudoconstant, it will be tested
 			 * only once, so treat its cost as all startup cost.
@@ -2315,8 +2478,8 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 
 	/*
 	 * For each operator or function node in the given tree, we charge the
-	 * estimated execution cost given by pg_proc.procost (remember to
-	 * multiply this by cpu_operator_cost).
+	 * estimated execution cost given by pg_proc.procost (remember to multiply
+	 * this by cpu_operator_cost).
 	 *
 	 * Vars and Consts are charged zero, and so are boolean operators (AND,
 	 * OR, NOT). Simplistic, but a lot better than no model at all.
@@ -2325,7 +2488,7 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 	 * evaluation of AND/OR?  Probably *not*, because that would make the
 	 * results depend on the clause ordering, and we are not in any position
 	 * to expect that the current ordering of the clauses is the one that's
-	 * going to end up being used.  (Is it worth applying order_qual_clauses
+	 * going to end up being used.	(Is it worth applying order_qual_clauses
 	 * much earlier in the planning process to fix this?)
 	 */
 	if (IsA(node, FuncExpr))
@@ -2358,15 +2521,17 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 	else if (IsA(node, CoerceViaIO))
 	{
 		CoerceViaIO *iocoerce = (CoerceViaIO *) node;
-		Oid         iofunc;
-		Oid         typioparam;
-		bool        typisvarlena;
+		Oid			iofunc;
+		Oid			typioparam;
+		bool		typisvarlena;
 
 		/* check the result type's input function */
-		getTypeInputInfo(iocoerce->resulttype, &iofunc, &typioparam);
+		getTypeInputInfo(iocoerce->resulttype,
+						 &iofunc, &typioparam);
 		context->total.per_tuple += get_func_cost(iofunc) * cpu_operator_cost;
 		/* check the input type's output function */
-		getTypeOutputInfo(exprType((Node *) iocoerce->arg), &iofunc, &typisvarlena);
+		getTypeOutputInfo(exprType((Node *) iocoerce->arg),
+						  &iofunc, &typisvarlena);
 		context->total.per_tuple += get_func_cost(iofunc) * cpu_operator_cost;
 	}
 	else if (IsA(node, ArrayCoerceExpr))
@@ -2375,7 +2540,8 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 		Node	   *arraynode = (Node *) acoerce->arg;
 
 		if (OidIsValid(acoerce->elemfuncid))
-			context->total.per_tuple += cpu_operator_cost * estimate_array_length(arraynode);
+			context->total.per_tuple += get_func_cost(acoerce->elemfuncid) *
+				cpu_operator_cost * estimate_array_length(arraynode);
 	}
 	else if (IsA(node, RowCompareExpr))
 	{
@@ -2385,7 +2551,7 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 
 		foreach(lc, rcexpr->opnos)
 		{
-			Oid		opid = lfirst_oid(lc);
+			Oid			opid = lfirst_oid(lc);
 
 			context->total.per_tuple += get_func_cost(get_opcode(opid)) *
 				cpu_operator_cost;
@@ -2447,8 +2613,9 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 			/*
 			 * Otherwise we will be rescanning the subplan output on each
 			 * evaluation.	We need to estimate how much of the output we will
-			 * actually need to scan.  NOTE: this logic should agree with the
-			 * estimates used by make_subplan() in plan/subselect.c.
+			 * actually need to scan.  NOTE: this logic should agree with
+			 * get_initplan_cost, below, and with the estimates used by
+			 * make_subplan() in plan/subselect.c.
 			 */
 			Cost		plan_run_cost = plan->total_cost - plan->startup_cost;
 
@@ -2494,6 +2661,43 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 }
 
 
+/*
+ * get_initplan_cost
+ *		Get the expected cost of evaluating an initPlan.
+ *
+ * Keep this in sync with cost_qual_eval_walker's handling of subplans, above,
+ * and with the estimates used by make_subplan() in plan/subselect.c.
+ */
+Cost
+get_initplan_cost(PlannerInfo *root, SubPlan *subplan)
+{
+	Cost		result;
+	Plan	   *plan = planner_subplan_get_plan(root, subplan);
+
+	/* initPlans never use hashtables */
+	Assert(!subplan->useHashTable);
+	/* they are never ALL or ANY, either */
+	Assert(!(subplan->subLinkType == ALL_SUBLINK ||
+			 subplan->subLinkType == ANY_SUBLINK));
+
+	if (subplan->subLinkType == EXISTS_SUBLINK)
+	{
+		/* we only need to fetch 1 tuple */
+		Cost		plan_run_cost = plan->total_cost - plan->startup_cost;
+
+		result = plan->startup_cost;
+		result += plan_run_cost / plan->plan_rows;
+	}
+	else
+	{
+		/* assume we need all tuples */
+		result = plan->total_cost;
+	}
+
+	return result;
+}
+
+
 /*
  * approx_selectivity
  *		Quick-and-dirty estimation of clause selectivities.
@@ -2700,9 +2904,9 @@ set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 	 * double-counting them because they were not considered in estimating the
 	 * sizes of the component rels.
 	 *
-	 * For an outer join, we have to distinguish the selectivity of the
-	 * join's own clauses (JOIN/ON conditions) from any clauses that were
-	 * "pushed down".  For inner joins we just count them all as joinclauses.
+	 * For an outer join, we have to distinguish the selectivity of the join's
+	 * own clauses (JOIN/ON conditions) from any clauses that were "pushed
+	 * down".  For inner joins we just count them all as joinclauses.
 	 */
 	if (IS_OUTER_JOIN(jointype))
 	{
@@ -2765,7 +2969,7 @@ set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 	 *
 	 * If we are doing an outer join, take that into account: the joinqual
 	 * selectivity has to be clamped using the knowledge that the output must
-	 * be at least as large as the non-nullable input.  However, any
+	 * be at least as large as the non-nullable input.	However, any
 	 * pushed-down quals are applied after the outer join, so their
 	 * selectivity applies fully.
 	 */
@@ -2891,7 +3095,7 @@ set_function_size_estimates(PlannerInfo *root, RelOptInfo *rel)
 
 	/* Should only be applied to base relations that are functions */
 	Assert(rel->relid > 0);
-	rte = rt_fetch(rel->relid, root->parse->rtable);
+	rte = planner_rt_fetch(rel->relid, root);
 	Assert(rte->rtekind == RTE_FUNCTION);
 
 	/* Estimate number of rows the function itself will return */
@@ -2947,7 +3151,7 @@ set_values_size_estimates(PlannerInfo *root, RelOptInfo *rel)
 
 	/* Should only be applied to base relations that are values lists */
 	Assert(rel->relid > 0);
-	rte = rt_fetch(rel->relid, root->parse->rtable);
+	rte = planner_rt_fetch(rel->relid, root);
 	Assert(rte->rtekind == RTE_VALUES);
 
 	/*
@@ -3008,12 +3212,22 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
 {
 	int32		tuple_width = 0;
 	ListCell   *tllist;
+	Oid			rel_reloid;
+
+	/*
+	 * Usually (perhaps always), all the Vars have the same reloid, so we can
+	 * save some redundant list-searching by doing getrelid just once.
+	 */
+	if (rel->relid > 0)
+		rel_reloid = getrelid(rel->relid, root->parse->rtable);
+	else
+		rel_reloid = InvalidOid;	/* probably can't happen */
 
 	foreach(tllist, rel->reltargetlist)
 	{
 		Var		   *var = (Var *) lfirst(tllist);
 		int			ndx;
-		Oid			relid;
+		Oid			var_reloid;
 		int32		item_width;
 
 		/* For now, punt on whole-row child Vars */
@@ -3043,10 +3257,14 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
 			continue;
 		}
 
-		relid = getrelid(var->varno, root->parse->rtable);
-		if (relid != InvalidOid)
+		if (var->varno == rel->relid)
+			var_reloid = rel_reloid;
+		else
+			var_reloid = getrelid(var->varno, root->parse->rtable);
+
+		if (var_reloid != InvalidOid)
 		{
-			item_width = get_attavgwidth(relid, var->varattno);
+			item_width = get_attavgwidth(var_reloid, var->varattno);
 			if (item_width > 0)
 			{
 				rel->attr_widths[ndx] = item_width;
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
index 2f488660f053..892b5dc0fbd7 100644
--- a/src/backend/optimizer/path/equivclass.c
+++ b/src/backend/optimizer/path/equivclass.c
@@ -6,11 +6,11 @@
  * See src/backend/optimizer/README for discussion of EquivalenceClasses.
  *
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/equivclass.c,v 1.2 2007/01/22 20:00:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/equivclass.c,v 1.9.2.3 2009/09/29 01:21:02 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,14 +27,14 @@
 
 
 static EquivalenceMember *add_eq_member(EquivalenceClass *ec,
-										Expr *expr, Relids relids,
-										bool is_child, Oid datatype);
+			  Expr *expr, Relids relids, Relids nullable_relids,
+			  bool is_child, Oid datatype);
 static void generate_base_implied_equalities_const(PlannerInfo *root,
-												   EquivalenceClass *ec);
+									   EquivalenceClass *ec);
 static void generate_base_implied_equalities_no_const(PlannerInfo *root,
-													  EquivalenceClass *ec);
+										  EquivalenceClass *ec);
 static void generate_base_implied_equalities_broken(PlannerInfo *root,
-													EquivalenceClass *ec);
+										EquivalenceClass *ec);
 static List *generate_join_implied_equalities_normal(PlannerInfo *root,
 										EquivalenceClass *ec,
 										RelOptInfo *joinrel,
@@ -45,18 +45,18 @@ static List *generate_join_implied_equalities_broken(PlannerInfo *root,
 										RelOptInfo *joinrel,
 										RelOptInfo *outer_rel,
 										RelOptInfo *inner_rel);
-static Oid	select_equality_operator(EquivalenceClass *ec,
-									 Oid lefttype, Oid righttype);
+static Oid select_equality_operator(EquivalenceClass *ec,
+						 Oid lefttype, Oid righttype);
 static RestrictInfo *create_join_clause(PlannerInfo *root,
-										EquivalenceClass *ec, Oid opno,
-										EquivalenceMember *leftem,
-										EquivalenceMember *rightem,
-										EquivalenceClass *parent_ec);
-static void reconsider_outer_join_clause(PlannerInfo *root,
-										 RestrictInfo *rinfo,
-										 bool outer_on_left);
-static void reconsider_full_join_clause(PlannerInfo *root,
-										RestrictInfo *rinfo);
+				   EquivalenceClass *ec, Oid opno,
+				   EquivalenceMember *leftem,
+				   EquivalenceMember *rightem,
+				   EquivalenceClass *parent_ec);
+static bool reconsider_outer_join_clause(PlannerInfo *root,
+							 RestrictInfo *rinfo,
+							 bool outer_on_left);
+static bool reconsider_full_join_clause(PlannerInfo *root,
+							RestrictInfo *rinfo);
 
 
 /*
@@ -70,7 +70,7 @@ static void reconsider_full_join_clause(PlannerInfo *root,
  *
  * If below_outer_join is true, then the clause was found below the nullable
  * side of an outer join, so its sides might validly be both NULL rather than
- * strictly equal.  We can still deduce equalities in such cases, but we take
+ * strictly equal.	We can still deduce equalities in such cases, but we take
  * care to mark an EquivalenceClass if it came from any such clauses.  Also,
  * we have to check that both sides are either pseudo-constants or strict
  * functions of Vars, else they might not both go to NULL above the outer
@@ -97,7 +97,9 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 	Expr	   *item1;
 	Expr	   *item2;
 	Relids		item1_relids,
-				item2_relids;
+				item2_relids,
+				item1_nullable_relids,
+				item2_nullable_relids;
 	List	   *opfamilies;
 	EquivalenceClass *ec1,
 			   *ec2;
@@ -113,6 +115,19 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 	item1_relids = restrictinfo->left_relids;
 	item2_relids = restrictinfo->right_relids;
 
+	/*
+	 * Reject clauses of the form X=X.  These are not as redundant as they
+	 * might seem at first glance: assuming the operator is strict, this is
+	 * really an expensive way to write X IS NOT NULL.  So we must not risk
+	 * just losing the clause, which would be possible if there is already
+	 * a single-element EquivalenceClass containing X.  The case is not
+	 * common enough to be worth contorting the EC machinery for, so just
+	 * reject the clause and let it be processed as a normal restriction
+	 * clause.
+	 */
+	if (equal(item1, item2))
+		return false;			/* X=X is not a useful equivalence */
+
 	/*
 	 * If below outer join, check for strictness, else reject.
 	 */
@@ -126,38 +141,41 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 			return false;		/* RHS is non-strict but not constant */
 	}
 
+	/* Calculate nullable-relid sets for each side of the clause */
+	item1_nullable_relids = bms_intersect(item1_relids,
+										  restrictinfo->nullable_relids);
+	item2_nullable_relids = bms_intersect(item2_relids,
+										  restrictinfo->nullable_relids);
+
 	/*
-	 * We use the declared input types of the operator, not exprType() of
-	 * the inputs, as the nominal datatypes for opfamily lookup.  This
-	 * presumes that btree operators are always registered with amoplefttype
-	 * and amoprighttype equal to their declared input types.  We will need
-	 * this info anyway to build EquivalenceMember nodes, and by extracting
-	 * it now we can use type comparisons to short-circuit some equal() tests.
+	 * We use the declared input types of the operator, not exprType() of the
+	 * inputs, as the nominal datatypes for opfamily lookup.  This presumes
+	 * that btree operators are always registered with amoplefttype and
+	 * amoprighttype equal to their declared input types.  We will need this
+	 * info anyway to build EquivalenceMember nodes, and by extracting it now
+	 * we can use type comparisons to short-circuit some equal() tests.
 	 */
 	op_input_types(opno, &item1_type, &item2_type);
 
 	opfamilies = restrictinfo->mergeopfamilies;
 
 	/*
-	 * Sweep through the existing EquivalenceClasses looking for matches
-	 * to item1 and item2.  These are the possible outcomes:
+	 * Sweep through the existing EquivalenceClasses looking for matches to
+	 * item1 and item2.  These are the possible outcomes:
 	 *
-	 * 1. We find both in the same EC.  The equivalence is already known,
-	 * so there's nothing to do.
+	 * 1. We find both in the same EC.	The equivalence is already known, so
+	 * there's nothing to do.
 	 *
 	 * 2. We find both in different ECs.  Merge the two ECs together.
 	 *
 	 * 3. We find just one.  Add the other to its EC.
 	 *
-	 * 4. We find neither.  Make a new, two-entry EC.
+	 * 4. We find neither.	Make a new, two-entry EC.
 	 *
-	 * Note: since all ECs are built through this process, it's impossible
-	 * that we'd match an item in more than one existing EC.  It is possible
-	 * to match more than once within an EC, if someone fed us something silly
-	 * like "WHERE X=X".  (However, we can't simply discard such clauses,
-	 * since they should fail when X is null; so we will build a 2-member
-	 * EC to ensure the correct restriction clause gets generated.  Hence
-	 * there is no shortcut here for item1 and item2 equal.)
+	 * Note: since all ECs are built through this process or the similar
+	 * search in get_eclass_for_sort_expr(), it's impossible that we'd match
+	 * an item in more than one existing nonvolatile EC.  So it's okay to stop
+	 * at the first match.
 	 */
 	ec1 = ec2 = NULL;
 	em1 = em2 = NULL;
@@ -182,11 +200,11 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 		{
 			EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc2);
 
-			Assert(!cur_em->em_is_child);				/* no children yet */
+			Assert(!cur_em->em_is_child);		/* no children yet */
 
 			/*
-			 * If below an outer join, don't match constants: they're not
-			 * as constant as they look.
+			 * If below an outer join, don't match constants: they're not as
+			 * constant as they look.
 			 */
 			if ((below_outer_join || cur_ec->ec_below_outer_join) &&
 				cur_em->em_is_const)
@@ -234,11 +252,11 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 		}
 
 		/*
-		 * Case 2: need to merge ec1 and ec2.  We add ec2's items to ec1,
-		 * then set ec2's ec_merged link to point to ec1 and remove ec2
-		 * from the eq_classes list.  We cannot simply delete ec2 because
-		 * that could leave dangling pointers in existing PathKeys.  We
-		 * leave it behind with a link so that the merged EC can be found.
+		 * Case 2: need to merge ec1 and ec2.  We add ec2's items to ec1, then
+		 * set ec2's ec_merged link to point to ec1 and remove ec2 from the
+		 * eq_classes list.  We cannot simply delete ec2 because that could
+		 * leave dangling pointers in existing PathKeys.  We leave it behind
+		 * with a link so that the merged EC can be found.
 		 */
 		ec1->ec_members = list_concat(ec1->ec_members, ec2->ec_members);
 		ec1->ec_sources = list_concat(ec1->ec_sources, ec2->ec_sources);
@@ -263,7 +281,8 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 	else if (ec1)
 	{
 		/* Case 3: add item2 to ec1 */
-		em2 = add_eq_member(ec1, item2, item2_relids, false, item2_type);
+		em2 = add_eq_member(ec1, item2, item2_relids, item2_nullable_relids,
+							false, item2_type);
 		ec1->ec_sources = lappend(ec1->ec_sources, restrictinfo);
 		ec1->ec_below_outer_join |= below_outer_join;
 		/* mark the RI as usable with this pair of EMs */
@@ -273,7 +292,8 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 	else if (ec2)
 	{
 		/* Case 3: add item1 to ec2 */
-		em1 = add_eq_member(ec2, item1, item1_relids, false, item1_type);
+		em1 = add_eq_member(ec2, item1, item1_relids, item1_nullable_relids,
+							false, item1_type);
 		ec2->ec_sources = lappend(ec2->ec_sources, restrictinfo);
 		ec2->ec_below_outer_join |= below_outer_join;
 		/* mark the RI as usable with this pair of EMs */
@@ -294,9 +314,12 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 		ec->ec_has_volatile = false;
 		ec->ec_below_outer_join = below_outer_join;
 		ec->ec_broken = false;
+		ec->ec_sortref = 0;
 		ec->ec_merged = NULL;
-		em1 = add_eq_member(ec, item1, item1_relids, false, item1_type);
-		em2 = add_eq_member(ec, item2, item2_relids, false, item2_type);
+		em1 = add_eq_member(ec, item1, item1_relids, item1_nullable_relids,
+							false, item1_type);
+		em2 = add_eq_member(ec, item2, item2_relids, item2_nullable_relids,
+							false, item2_type);
 
 		root->eq_classes = lappend(root->eq_classes, ec);
 
@@ -313,12 +336,13 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
  */
 static EquivalenceMember *
 add_eq_member(EquivalenceClass *ec, Expr *expr, Relids relids,
-			  bool is_child, Oid datatype)
+			  Relids nullable_relids, bool is_child, Oid datatype)
 {
 	EquivalenceMember *em = makeNode(EquivalenceMember);
 
 	em->em_expr = expr;
 	em->em_relids = relids;
+	em->em_nullable_relids = nullable_relids;
 	em->em_is_const = false;
 	em->em_is_child = is_child;
 	em->em_datatype = datatype;
@@ -326,10 +350,10 @@ add_eq_member(EquivalenceClass *ec, Expr *expr, Relids relids,
 	if (bms_is_empty(relids))
 	{
 		/*
-		 * No Vars, assume it's a pseudoconstant.  This is correct for
-		 * entries generated from process_equivalence(), because a WHERE
-		 * clause can't contain aggregates or SRFs, and non-volatility was
-		 * checked before process_equivalence() ever got called.  But
+		 * No Vars, assume it's a pseudoconstant.  This is correct for entries
+		 * generated from process_equivalence(), because a WHERE clause can't
+		 * contain aggregates or SRFs, and non-volatility was checked before
+		 * process_equivalence() ever got called.  But
 		 * get_eclass_for_sort_expr() has to work harder.  We put the tests
 		 * there not here to save cycles in the equivalence case.
 		 */
@@ -354,6 +378,9 @@ add_eq_member(EquivalenceClass *ec, Expr *expr, Relids relids,
  *	  class it is a member of; if none, build a new single-member
  *	  EquivalenceClass for it.
  *
+ * sortref is the SortGroupRef of the originating SortClause, if any,
+ * or zero if not.
+ *
  * This can be used safely both before and after EquivalenceClass merging;
  * since it never causes merging it does not invalidate any existing ECs
  * or PathKeys.
@@ -367,7 +394,8 @@ EquivalenceClass *
 get_eclass_for_sort_expr(PlannerInfo *root,
 						 Expr *expr,
 						 Oid expr_datatype,
-						 List *opfamilies)
+						 List *opfamilies,
+						 Index sortref)
 {
 	EquivalenceClass *newec;
 	EquivalenceMember *newem;
@@ -382,7 +410,9 @@ get_eclass_for_sort_expr(PlannerInfo *root,
 		EquivalenceClass *cur_ec = (EquivalenceClass *) lfirst(lc1);
 		ListCell   *lc2;
 
-		/* we allow matching to a volatile EC here */
+		/* Never match to a volatile EC */
+		if (cur_ec->ec_has_volatile)
+			continue;
 
 		if (!equal(opfamilies, cur_ec->ec_opfamilies))
 			continue;
@@ -392,8 +422,8 @@ get_eclass_for_sort_expr(PlannerInfo *root,
 			EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc2);
 
 			/*
-			 * If below an outer join, don't match constants: they're not
-			 * as constant as they look.
+			 * If below an outer join, don't match constants: they're not as
+			 * constant as they look.
 			 */
 			if (cur_ec->ec_below_outer_join &&
 				cur_em->em_is_const)
@@ -401,15 +431,15 @@ get_eclass_for_sort_expr(PlannerInfo *root,
 
 			if (expr_datatype == cur_em->em_datatype &&
 				equal(expr, cur_em->em_expr))
-				return cur_ec;					/* Match! */
+				return cur_ec;	/* Match! */
 		}
 	}
 
 	/*
 	 * No match, so build a new single-member EC
 	 *
-	 * Here, we must be sure that we construct the EC in the right context.
-	 * We can assume, however, that the passed expr is long-lived.
+	 * Here, we must be sure that we construct the EC in the right context. We
+	 * can assume, however, that the passed expr is long-lived.
 	 */
 	oldcontext = MemoryContextSwitchTo(root->planner_cxt);
 
@@ -423,14 +453,15 @@ get_eclass_for_sort_expr(PlannerInfo *root,
 	newec->ec_has_volatile = contain_volatile_functions((Node *) expr);
 	newec->ec_below_outer_join = false;
 	newec->ec_broken = false;
+	newec->ec_sortref = sortref;
 	newec->ec_merged = NULL;
 	newem = add_eq_member(newec, expr, pull_varnos((Node *) expr),
-						  false, expr_datatype);
+						  NULL, false, expr_datatype);
 
 	/*
 	 * add_eq_member doesn't check for volatile functions, set-returning
-	 * functions, or aggregates, but such could appear in sort expressions;
-	 * so we have to check whether its const-marking was correct.
+	 * functions, or aggregates, but such could appear in sort expressions; so
+	 * we have to check whether its const-marking was correct.
 	 */
 	if (newec->ec_has_const)
 	{
@@ -438,7 +469,7 @@ get_eclass_for_sort_expr(PlannerInfo *root,
 			expression_returns_set((Node *) expr) ||
 			contain_agg_clause((Node *) expr) ||
 			contain_window_functions((Node *) expr))
-	{
+		{
 			newec->ec_has_const = false;
 			newem->em_is_const = false;
 		}
@@ -459,7 +490,7 @@ get_eclass_for_sort_expr(PlannerInfo *root,
  *
  * When an EC contains pseudoconstants, our strategy is to generate
  * "member = const1" clauses where const1 is the first constant member, for
- * every other member (including other constants).  If we are able to do this
+ * every other member (including other constants).	If we are able to do this
  * then we don't need any "var = var" comparisons because we've successfully
  * constrained all the vars at their points of creation.  If we fail to
  * generate any of these clauses due to lack of cross-type operators, we fall
@@ -484,7 +515,7 @@ get_eclass_for_sort_expr(PlannerInfo *root,
  * "WHERE a.x = b.y AND b.y = a.z", the scheme breaks down if we cannot
  * generate "a.x = a.z" as a restriction clause for A.)  In this case we mark
  * the EC "ec_broken" and fall back to regurgitating its original source
- * RestrictInfos at appropriate times.  We do not try to retract any derived
+ * RestrictInfos at appropriate times.	We do not try to retract any derived
  * clauses already generated from the broken EC, so the resulting plan could
  * be poor due to bad selectivity estimates caused by redundant clauses.  But
  * the correct solution to that is to fix the opfamilies ...
@@ -510,8 +541,8 @@ generate_base_implied_equalities(PlannerInfo *root)
 	{
 		EquivalenceClass *ec = (EquivalenceClass *) lfirst(lc);
 
-		Assert(ec->ec_merged == NULL);		/* else shouldn't be in list */
-		Assert(!ec->ec_broken);				/* not yet anyway... */
+		Assert(ec->ec_merged == NULL);	/* else shouldn't be in list */
+		Assert(!ec->ec_broken); /* not yet anyway... */
 
 		/* Single-member ECs won't generate any deductions */
 		if (list_length(ec->ec_members) <= 1)
@@ -528,9 +559,8 @@ generate_base_implied_equalities(PlannerInfo *root)
 	}
 
 	/*
-	 * This is also a handy place to mark base rels (which should all
-	 * exist by now) with flags showing whether they have pending eclass
-	 * joins.
+	 * This is also a handy place to mark base rels (which should all exist by
+	 * now) with flags showing whether they have pending eclass joins.
 	 */
 	for (rti = 1; rti < root->simple_rel_array_size; rti++)
 	{
@@ -553,7 +583,31 @@ generate_base_implied_equalities_const(PlannerInfo *root,
 	EquivalenceMember *const_em = NULL;
 	ListCell   *lc;
 
-	/* Find the constant member to use */
+	/*
+	 * In the trivial case where we just had one "var = const" clause,
+	 * push the original clause back into the main planner machinery.  There
+	 * is nothing to be gained by doing it differently, and we save the
+	 * effort to re-build and re-analyze an equality clause that will be
+	 * exactly equivalent to the old one.
+	 */
+	if (list_length(ec->ec_members) == 2 &&
+		list_length(ec->ec_sources) == 1)
+	{
+		RestrictInfo *restrictinfo = (RestrictInfo *) linitial(ec->ec_sources);
+
+		if (bms_membership(restrictinfo->required_relids) != BMS_MULTIPLE)
+		{
+			distribute_restrictinfo_to_rels(root, restrictinfo);
+			return;
+		}
+	}
+
+	/*
+	 * Find the constant member to use.  We prefer an actual constant to
+	 * pseudo-constants (such as Params), because the constraint exclusion
+	 * machinery might be able to exclude relations on the basis of generated
+	 * "var = const" equalities, but "var = param" won't work for that.
+	 */
 	foreach(lc, ec->ec_members)
 	{
 		EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc);
@@ -561,7 +615,8 @@ generate_base_implied_equalities_const(PlannerInfo *root,
 		if (cur_em->em_is_const)
 		{
 			const_em = cur_em;
-			break;
+			if (IsA(cur_em->em_expr, Const))
+				break;
 		}
 	}
 	Assert(const_em != NULL);
@@ -572,7 +627,7 @@ generate_base_implied_equalities_const(PlannerInfo *root,
 		EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc);
 		Oid			eq_op;
 
-		Assert(!cur_em->em_is_child);				/* no children yet */
+		Assert(!cur_em->em_is_child);	/* no children yet */
 		if (cur_em == const_em)
 			continue;
 		eq_op = select_equality_operator(ec,
@@ -586,7 +641,9 @@ generate_base_implied_equalities_const(PlannerInfo *root,
 		}
 		process_implied_equality(root, eq_op,
 								 cur_em->em_expr, const_em->em_expr,
-								 ec->ec_relids,
+								 bms_copy(ec->ec_relids),
+								 bms_union(cur_em->em_nullable_relids,
+										   const_em->em_nullable_relids),
 								 ec->ec_below_outer_join,
 								 cur_em->em_is_const);
 	}
@@ -606,9 +663,10 @@ generate_base_implied_equalities_no_const(PlannerInfo *root,
 	 * We scan the EC members once and track the last-seen member for each
 	 * base relation.  When we see another member of the same base relation,
 	 * we generate "prev_mem = cur_mem".  This results in the minimum number
-	 * of derived clauses, but it's possible that it will fail when a different
-	 * ordering would succeed.  XXX FIXME: use a UNION-FIND algorithm similar
-	 * to the way we build merged ECs.  (Use a list-of-lists for each rel.)
+	 * of derived clauses, but it's possible that it will fail when a
+	 * different ordering would succeed.  XXX FIXME: use a UNION-FIND
+	 * algorithm similar to the way we build merged ECs.  (Use a list-of-lists
+	 * for each rel.)
 	 */
 	prev_ems = (EquivalenceMember **)
 		palloc0(root->simple_rel_array_size * sizeof(EquivalenceMember *));
@@ -618,7 +676,7 @@ generate_base_implied_equalities_no_const(PlannerInfo *root,
 		EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc);
 		int			relid;
 
-		Assert(!cur_em->em_is_child);				/* no children yet */
+		Assert(!cur_em->em_is_child);	/* no children yet */
 		if (bms_membership(cur_em->em_relids) != BMS_SINGLETON)
 			continue;
 		relid = bms_singleton_member(cur_em->em_relids);
@@ -640,7 +698,9 @@ generate_base_implied_equalities_no_const(PlannerInfo *root,
 			}
 			process_implied_equality(root, eq_op,
 									 prev_em->em_expr, cur_em->em_expr,
-									 ec->ec_relids,
+									 bms_copy(ec->ec_relids),
+									 bms_union(prev_em->em_nullable_relids,
+											   cur_em->em_nullable_relids),
 									 ec->ec_below_outer_join,
 									 false);
 		}
@@ -650,12 +710,12 @@ generate_base_implied_equalities_no_const(PlannerInfo *root,
 	pfree(prev_ems);
 
 	/*
-	 * We also have to make sure that all the Vars used in the member
-	 * clauses will be available at any join node we might try to reference
-	 * them at.  For the moment we force all the Vars to be available at
-	 * all join nodes for this eclass.  Perhaps this could be improved by
-	 * doing some pre-analysis of which members we prefer to join, but it's
-	 * no worse than what happened in the pre-8.3 code.
+	 * We also have to make sure that all the Vars used in the member clauses
+	 * will be available at any join node we might try to reference them at.
+	 * For the moment we force all the Vars to be available at all join nodes
+	 * for this eclass.  Perhaps this could be improved by doing some
+	 * pre-analysis of which members we prefer to join, but it's no worse than
+	 * what happened in the pre-8.3 code.
 	 */
 	foreach(lc, ec->ec_members)
 	{
@@ -713,7 +773,7 @@ generate_base_implied_equalities_broken(PlannerInfo *root,
  * we consider different join paths, we avoid generating multiple copies:
  * whenever we select a particular pair of EquivalenceMembers to join,
  * we check to see if the pair matches any original clause (in ec_sources)
- * or previously-built clause (in ec_derives).  This saves memory and allows
+ * or previously-built clause (in ec_derives).	This saves memory and allows
  * re-use of information cached in RestrictInfos.
  */
 List *
@@ -728,7 +788,7 @@ generate_join_implied_equalities(PlannerInfo *root,
 	foreach(lc, root->eq_classes)
 	{
 		EquivalenceClass *ec = (EquivalenceClass *) lfirst(lc);
-		List   *sublist = NIL;
+		List	   *sublist = NIL;
 
 		/* ECs containing consts do not need any further enforcement */
 		if (ec->ec_has_const)
@@ -780,13 +840,13 @@ generate_join_implied_equalities_normal(PlannerInfo *root,
 	ListCell   *lc1;
 
 	/*
-	 * First, scan the EC to identify member values that are computable
-	 * at the outer rel, at the inner rel, or at this relation but not in
-	 * either input rel.  The outer-rel members should already be enforced
-	 * equal, likewise for the inner-rel members.  We'll need to create
-	 * clauses to enforce that any newly computable members are all equal
-	 * to each other as well as to at least one input member, plus enforce
-	 * at least one outer-rel member equal to at least one inner-rel member.
+	 * First, scan the EC to identify member values that are computable at the
+	 * outer rel, at the inner rel, or at this relation but not in either
+	 * input rel.  The outer-rel members should already be enforced equal,
+	 * likewise for the inner-rel members.	We'll need to create clauses to
+	 * enforce that any newly computable members are all equal to each other
+	 * as well as to at least one input member, plus enforce at least one
+	 * outer-rel member equal to at least one inner-rel member.
 	 */
 	foreach(lc1, ec->ec_members)
 	{
@@ -806,20 +866,20 @@ generate_join_implied_equalities_normal(PlannerInfo *root,
 	}
 
 	/*
-	 * First, select the joinclause if needed.  We can equate any one outer
+	 * First, select the joinclause if needed.	We can equate any one outer
 	 * member to any one inner member, but we have to find a datatype
-	 * combination for which an opfamily member operator exists.  If we
-	 * have choices, we prefer simple Var members (possibly with RelabelType)
-	 * since these are (a) cheapest to compute at runtime and (b) most likely
-	 * to have useful statistics.  Also, if enable_hashjoin is on, we prefer
+	 * combination for which an opfamily member operator exists.  If we have
+	 * choices, we prefer simple Var members (possibly with RelabelType) since
+	 * these are (a) cheapest to compute at runtime and (b) most likely to
+	 * have useful statistics.	Also, if enable_hashjoin is on, we prefer
 	 * operators that are also hashjoinable.
 	 */
 	if (outer_members && inner_members)
 	{
 		EquivalenceMember *best_outer_em = NULL;
 		EquivalenceMember *best_inner_em = NULL;
-		Oid		best_eq_op = InvalidOid;
-		int		best_score = -1;
+		Oid			best_eq_op = InvalidOid;
+		int			best_score = -1;
 		RestrictInfo *rinfo;
 
 		foreach(lc1, outer_members)
@@ -830,8 +890,8 @@ generate_join_implied_equalities_normal(PlannerInfo *root,
 			foreach(lc2, inner_members)
 			{
 				EquivalenceMember *inner_em = (EquivalenceMember *) lfirst(lc2);
-				Oid		eq_op;
-				int		score;
+				Oid			eq_op;
+				int			score;
 
 				eq_op = select_equality_operator(ec,
 												 outer_em->em_datatype,
@@ -856,11 +916,11 @@ generate_join_implied_equalities_normal(PlannerInfo *root,
 					best_eq_op = eq_op;
 					best_score = score;
 					if (best_score == 3)
-						break;				/* no need to look further */
+						break;	/* no need to look further */
 				}
 			}
 			if (best_score == 3)
-				break;						/* no need to look further */
+				break;			/* no need to look further */
 		}
 		if (best_score < 0)
 		{
@@ -885,8 +945,8 @@ generate_join_implied_equalities_normal(PlannerInfo *root,
 	 * Vars from both sides of the join.  We have to equate all of these to
 	 * each other as well as to at least one old member (if any).
 	 *
-	 * XXX as in generate_base_implied_equalities_no_const, we could be a
-	 * lot smarter here to avoid unnecessary failures in cross-type situations.
+	 * XXX as in generate_base_implied_equalities_no_const, we could be a lot
+	 * smarter here to avoid unnecessary failures in cross-type situations.
 	 * For now, use the same left-to-right method used there.
 	 */
 	if (new_members)
@@ -950,7 +1010,7 @@ generate_join_implied_equalities_broken(PlannerInfo *root,
 		RestrictInfo *restrictinfo = (RestrictInfo *) lfirst(lc);
 
 		if (bms_is_subset(restrictinfo->required_relids, joinrel->relids) &&
-			!bms_is_subset(restrictinfo->required_relids, outer_rel->relids) &&
+		  !bms_is_subset(restrictinfo->required_relids, outer_rel->relids) &&
 			!bms_is_subset(restrictinfo->required_relids, inner_rel->relids))
 			result = lappend(result, restrictinfo);
 	}
@@ -972,8 +1032,8 @@ select_equality_operator(EquivalenceClass *ec, Oid lefttype, Oid righttype)
 
 	foreach(lc, ec->ec_opfamilies)
 	{
-		Oid		opfamily = lfirst_oid(lc);
-		Oid		opno;
+		Oid			opfamily = lfirst_oid(lc);
+		Oid			opno;
 
 		opno = get_opfamily_member(opfamily, lefttype, righttype,
 								   BTEqualStrategyNumber);
@@ -1007,8 +1067,8 @@ create_join_clause(PlannerInfo *root,
 
 	/*
 	 * Search to see if we already built a RestrictInfo for this pair of
-	 * EquivalenceMembers.  We can use either original source clauses or
-	 * previously-derived clauses.  The check on opno is probably redundant,
+	 * EquivalenceMembers.	We can use either original source clauses or
+	 * previously-derived clauses.	The check on opno is probably redundant,
 	 * but be safe ...
 	 */
 	foreach(lc, ec->ec_sources)
@@ -1032,15 +1092,18 @@ create_join_clause(PlannerInfo *root,
 	}
 
 	/*
-	 * Not there, so build it, in planner context so we can re-use it.
-	 * (Not important in normal planning, but definitely so in GEQO.)
+	 * Not there, so build it, in planner context so we can re-use it. (Not
+	 * important in normal planning, but definitely so in GEQO.)
 	 */
 	oldcontext = MemoryContextSwitchTo(root->planner_cxt);
 
 	rinfo = build_implied_join_equality(opno,
 										leftem->em_expr,
 										rightem->em_expr,
-										ec->ec_relids);
+										bms_union(leftem->em_relids,
+												  rightem->em_relids),
+										bms_union(leftem->em_nullable_relids,
+											   rightem->em_nullable_relids));
 
 	/* Mark the clause as redundant, or not */
 	rinfo->parent_ec = parent_ec;
@@ -1067,8 +1130,9 @@ create_join_clause(PlannerInfo *root,
 /*
  * reconsider_outer_join_clauses
  *	  Re-examine any outer-join clauses that were set aside by
- *	  distribute_qual_to_rels(), and either create EquivalenceClasses
- *	  to replace them or push them out into the regular join-clause lists.
+ *	  distribute_qual_to_rels(), and see if we can derive any
+ *	  EquivalenceClasses from them.  Then, if they were not made
+ *	  redundant, push them out into the regular join-clause lists.
  *
  * When we have mergejoinable clauses A = B that are outer-join clauses,
  * we can't blindly combine them with other clauses A = C to deduce B = C,
@@ -1085,8 +1149,8 @@ create_join_clause(PlannerInfo *root,
  * equivalence clause.)
  *
  * Note that the above rule does not work for full outer joins; nor is it
- * very interesting to consider cases where the equivalence clause involves
- * relations entirely outside the outer join, since such clauses couldn't
+ * very interesting to consider cases where the generated equivalence clause
+ * would involve relations outside the outer join, since such clauses couldn't
  * be pushed into the inner side's scan anyway.  So the restriction to
  * outervar = pseudoconstant is not really giving up anything.
  *
@@ -1114,68 +1178,178 @@ create_join_clause(PlannerInfo *root,
  * that could result in propagating constant restrictions from
  * INNERVAR to OUTERVAR, which would be very wrong.
  *
+ * It's possible that the INNERVAR is also an OUTERVAR for some other
+ * outer-join clause, in which case the process can be repeated.  So we repeat
+ * looping over the lists of clauses until no further deductions can be made.
+ * Whenever we do make a deduction, we remove the generating clause from the
+ * lists, since we don't want to make the same deduction twice.
+ *
  * If we don't find any match for a set-aside outer join clause, we must
  * throw it back into the regular joinclause processing by passing it to
- * distribute_restrictinfo_to_rels().
+ * distribute_restrictinfo_to_rels().  If we do generate a derived clause,
+ * however, the outer-join clause is redundant.  We still throw it back,
+ * because otherwise the join will be seen as a clauseless join and avoided
+ * during join order searching; but we mark it as redundant to keep from
+ * messing up the joinrel's size estimate.  (This behavior means that the
+ * API for this routine is uselessly complex: we could have just put all
+ * the clauses into the regular processing initially.  We keep it because
+ * someday we might want to do something else, such as inserting "dummy"
+ * joinclauses instead of real ones.)
+ *
+ * Outer join clauses that are marked outerjoin_delayed are special: this
+ * condition means that one or both VARs might go to null due to a lower
+ * outer join.  We can still push a constant through the clause, but only
+ * if its operator is strict; and we *have to* throw the clause back into
+ * regular joinclause processing.  By keeping the strict join clause,
+ * we ensure that any null-extended rows that are mistakenly generated due
+ * to suppressing rows not matching the constant will be rejected at the
+ * upper outer join.  (This doesn't work for full-join clauses.)
  */
 void
 reconsider_outer_join_clauses(PlannerInfo *root)
 {
-	ListCell   *lc;
+	bool		found;
+	ListCell   *cell;
+	ListCell   *prev;
+	ListCell   *next;
 
-	/* Process the LEFT JOIN clauses */
-	foreach(lc, root->left_join_clauses)
+	/* Outer loop repeats until we find no more deductions */
+	do
 	{
-		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
+		found = false;
+
+		/* Process the LEFT JOIN clauses */
+		prev = NULL;
+		for (cell = list_head(root->left_join_clauses); cell; cell = next)
+		{
+			RestrictInfo *rinfo = (RestrictInfo *) lfirst(cell);
+
+			next = lnext(cell);
+			if (reconsider_outer_join_clause(root, rinfo, true))
+			{
+				found = true;
+				/* remove it from the list */
+				root->left_join_clauses =
+					list_delete_cell(root->left_join_clauses, cell, prev);
+				/* we throw it back anyway (see notes above) */
+				/* but the thrown-back clause has no extra selectivity */
+				rinfo->this_selec = 2.0;
+				distribute_restrictinfo_to_rels(root, rinfo);
+			}
+			else
+				prev = cell;
+		}
 
-		reconsider_outer_join_clause(root, rinfo, true);
+		/* Process the RIGHT JOIN clauses */
+		prev = NULL;
+		for (cell = list_head(root->right_join_clauses); cell; cell = next)
+		{
+			RestrictInfo *rinfo = (RestrictInfo *) lfirst(cell);
+
+			next = lnext(cell);
+			if (reconsider_outer_join_clause(root, rinfo, false))
+			{
+				found = true;
+				/* remove it from the list */
+				root->right_join_clauses =
+					list_delete_cell(root->right_join_clauses, cell, prev);
+				/* we throw it back anyway (see notes above) */
+				/* but the thrown-back clause has no extra selectivity */
+				rinfo->this_selec = 2.0;
+				distribute_restrictinfo_to_rels(root, rinfo);
+			}
+			else
+				prev = cell;
+		}
+
+		/* Process the FULL JOIN clauses */
+		prev = NULL;
+		for (cell = list_head(root->full_join_clauses); cell; cell = next)
+		{
+			RestrictInfo *rinfo = (RestrictInfo *) lfirst(cell);
+
+			next = lnext(cell);
+			if (reconsider_full_join_clause(root, rinfo))
+			{
+				found = true;
+				/* remove it from the list */
+				root->full_join_clauses =
+					list_delete_cell(root->full_join_clauses, cell, prev);
+				/* we throw it back anyway (see notes above) */
+				/* but the thrown-back clause has no extra selectivity */
+				rinfo->this_selec = 2.0;
+				distribute_restrictinfo_to_rels(root, rinfo);
+			}
+			else
+				prev = cell;
+		}
+	} while (found);
+
+	/* Now, any remaining clauses have to be thrown back */
+	foreach(cell, root->left_join_clauses)
+	{
+		RestrictInfo *rinfo = (RestrictInfo *) lfirst(cell);
+
+		distribute_restrictinfo_to_rels(root, rinfo);
 	}
-	/* And the RIGHT JOIN clauses */
-	foreach(lc, root->right_join_clauses)
+	foreach(cell, root->right_join_clauses)
 	{
-		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
+		RestrictInfo *rinfo = (RestrictInfo *) lfirst(cell);
 
-		reconsider_outer_join_clause(root, rinfo, false);
+		distribute_restrictinfo_to_rels(root, rinfo);
 	}
-	/* And the FULL JOIN clauses */
-	foreach(lc, root->full_join_clauses)
+	foreach(cell, root->full_join_clauses)
 	{
-		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
+		RestrictInfo *rinfo = (RestrictInfo *) lfirst(cell);
 
-		reconsider_full_join_clause(root, rinfo);
+		distribute_restrictinfo_to_rels(root, rinfo);
 	}
 }
 
 /*
  * reconsider_outer_join_clauses for a single LEFT/RIGHT JOIN clause
+ *
+ * Returns TRUE if we were able to propagate a constant through the clause.
  */
-static void
+static bool
 reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo,
 							 bool outer_on_left)
 {
 	Expr	   *outervar,
 			   *innervar;
-	Oid			left_type,
+	Oid			opno,
+				left_type,
 				right_type,
 				inner_datatype;
+	Relids		inner_relids,
+				inner_nullable_relids;
 	ListCell   *lc1;
 
-	/* Extract needed info from the clause */
 	Assert(is_opclause(rinfo->clause));
-	op_input_types(((OpExpr *) rinfo->clause)->opno,
-				   &left_type, &right_type);
+	opno = ((OpExpr *) rinfo->clause)->opno;
+
+	/* If clause is outerjoin_delayed, operator must be strict */
+	if (rinfo->outerjoin_delayed && !op_strict(opno))
+		return false;
+
+	/* Extract needed info from the clause */
+	op_input_types(opno, &left_type, &right_type);
 	if (outer_on_left)
 	{
 		outervar = (Expr *) get_leftop(rinfo->clause);
 		innervar = (Expr *) get_rightop(rinfo->clause);
 		inner_datatype = right_type;
+		inner_relids = rinfo->right_relids;
 	}
 	else
 	{
 		outervar = (Expr *) get_rightop(rinfo->clause);
 		innervar = (Expr *) get_leftop(rinfo->clause);
 		inner_datatype = left_type;
+		inner_relids = rinfo->left_relids;
 	}
+	inner_nullable_relids = bms_intersect(inner_relids,
+										  rinfo->nullable_relids);
 
 	/* Scan EquivalenceClasses for a match to outervar */
 	foreach(lc1, root->eq_classes)
@@ -1209,10 +1383,9 @@ reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo,
 			continue;			/* no match, so ignore this EC */
 
 		/*
-		 * Yes it does!  Try to generate a clause INNERVAR = CONSTANT for
-		 * each CONSTANT in the EC.  Note that we must succeed with at
-		 * least one constant before we can decide to throw away the
-		 * outer-join clause.
+		 * Yes it does!  Try to generate a clause INNERVAR = CONSTANT for each
+		 * CONSTANT in the EC.	Note that we must succeed with at least one
+		 * constant before we can decide to throw away the outer-join clause.
 		 */
 		match = false;
 		foreach(lc2, cur_ec->ec_members)
@@ -1231,45 +1404,61 @@ reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo,
 			newrinfo = build_implied_join_equality(eq_op,
 												   innervar,
 												   cur_em->em_expr,
-												   cur_ec->ec_relids);
+												   bms_copy(inner_relids),
+											bms_copy(inner_nullable_relids));
 			if (process_equivalence(root, newrinfo, true))
 				match = true;
 		}
 
 		/*
-		 * If we were able to equate INNERVAR to any constant, we're done, and
-		 * we can throw away the outer-join clause as redundant.  Otherwise,
-		 * fall out of the search loop, since we know the OUTERVAR appears in
-		 * at most one EC.
+		 * If we were able to equate INNERVAR to any constant, report success.
+		 * Otherwise, fall out of the search loop, since we know the OUTERVAR
+		 * appears in at most one EC.
 		 */
 		if (match)
-			return;
+			return true;
 		else
 			break;
 	}
 
-	/* We did not find a match, so throw it back into regular processing */
-	distribute_restrictinfo_to_rels(root, rinfo);
+	return false;				/* failed to make any deduction */
 }
 
 /*
  * reconsider_outer_join_clauses for a single FULL JOIN clause
+ *
+ * Returns TRUE if we were able to propagate a constant through the clause.
  */
-static void
+static bool
 reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 {
 	Expr	   *leftvar;
 	Expr	   *rightvar;
-	Oid			left_type,
+	Oid			opno,
+				left_type,
 				right_type;
+	Relids		left_relids,
+				right_relids,
+				left_nullable_relids,
+				right_nullable_relids;
 	ListCell   *lc1;
 
+	/* Can't use an outerjoin_delayed clause here */
+	if (rinfo->outerjoin_delayed)
+		return false;
+
 	/* Extract needed info from the clause */
 	Assert(is_opclause(rinfo->clause));
+	opno = ((OpExpr *) rinfo->clause)->opno;
+	op_input_types(opno, &left_type, &right_type);
 	leftvar = (Expr *) get_leftop(rinfo->clause);
 	rightvar = (Expr *) get_rightop(rinfo->clause);
-	op_input_types(((OpExpr *) rinfo->clause)->opno,
-				   &left_type, &right_type);
+	left_relids = rinfo->left_relids;
+	right_relids = rinfo->right_relids;
+	left_nullable_relids = bms_intersect(left_relids,
+										 rinfo->nullable_relids);
+	right_nullable_relids = bms_intersect(right_relids,
+										  rinfo->nullable_relids);
 
 	foreach(lc1, root->eq_classes)
 	{
@@ -1293,15 +1482,15 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 		/*
 		 * Does it contain a COALESCE(leftvar, rightvar) construct?
 		 *
-		 * We can assume the COALESCE() inputs are in the same order as
-		 * the join clause, since both were automatically generated in the
-		 * cases we care about.
+		 * We can assume the COALESCE() inputs are in the same order as the
+		 * join clause, since both were automatically generated in the cases
+		 * we care about.
 		 *
-		 * XXX currently this may fail to match in cross-type cases
-		 * because the COALESCE will contain typecast operations while the
-		 * join clause may not (if there is a cross-type mergejoin
-		 * operator available for the two column types). Is it OK to strip
-		 * implicit coercions from the COALESCE arguments?
+		 * XXX currently this may fail to match in cross-type cases because
+		 * the COALESCE will contain typecast operations while the join clause
+		 * may not (if there is a cross-type mergejoin operator available for
+		 * the two column types). Is it OK to strip implicit coercions from
+		 * the COALESCE arguments?
 		 */
 		match = false;
 		foreach(lc2, cur_ec->ec_members)
@@ -1330,9 +1519,9 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 
 		/*
 		 * Yes it does!  Try to generate clauses LEFTVAR = CONSTANT and
-		 * RIGHTVAR = CONSTANT for each CONSTANT in the EC.  Note that we
-		 * must succeed with at least one constant for each var before
-		 * we can decide to throw away the outer-join clause.
+		 * RIGHTVAR = CONSTANT for each CONSTANT in the EC.  Note that we must
+		 * succeed with at least one constant for each var before we can
+		 * decide to throw away the outer-join clause.
 		 */
 		matchleft = matchright = false;
 		foreach(lc2, cur_ec->ec_members)
@@ -1351,7 +1540,8 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 				newrinfo = build_implied_join_equality(eq_op,
 													   leftvar,
 													   cur_em->em_expr,
-													   cur_ec->ec_relids);
+													   bms_copy(left_relids),
+											 bms_copy(left_nullable_relids));
 				if (process_equivalence(root, newrinfo, true))
 					matchleft = true;
 			}
@@ -1363,7 +1553,8 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 				newrinfo = build_implied_join_equality(eq_op,
 													   rightvar,
 													   cur_em->em_expr,
-													   cur_ec->ec_relids);
+													   bms_copy(right_relids),
+											bms_copy(right_nullable_relids));
 				if (process_equivalence(root, newrinfo, true))
 					matchright = true;
 			}
@@ -1371,16 +1562,17 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 
 		/*
 		 * If we were able to equate both vars to constants, we're done, and
-		 * we can throw away the full-join clause as redundant.  Moreover,
-		 * we can remove the COALESCE entry from the EC, since the added
-		 * restrictions ensure it will always have the expected value.
-		 * (We don't bother trying to update ec_relids or ec_sources.)
+		 * we can throw away the full-join clause as redundant.  Moreover, we
+		 * can remove the COALESCE entry from the EC, since the added
+		 * restrictions ensure it will always have the expected value. (We
+		 * don't bother trying to update ec_relids or ec_sources.)
 		 */
 		if (matchleft && matchright)
 		{
 			cur_ec->ec_members = list_delete_ptr(cur_ec->ec_members, coal_em);
-			return;
+			return true;
 		}
+
 		/*
 		 * Otherwise, fall out of the search loop, since we know the COALESCE
 		 * appears in at most one EC (XXX might stop being true if we allow
@@ -1389,8 +1581,7 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 		break;
 	}
 
-	/* We did not find a match, so throw it back into regular processing */
-	distribute_restrictinfo_to_rels(root, rinfo);
+	return false;				/* failed to make any deduction */
 }
 
 
@@ -1482,12 +1673,28 @@ add_child_rel_equivalences(PlannerInfo *root,
 			if (bms_equal(cur_em->em_relids, parent_rel->relids))
 			{
 				/* Yes, generate transformed child version */
-				Expr *child_expr;
-				
+				Expr	   *child_expr;
+				Relids		new_nullable_relids;
+
 				child_expr = (Expr *)
 					adjust_appendrel_attrs(root, (Node *) cur_em->em_expr,
 										   appinfo);
-				(void) add_eq_member(cur_ec, child_expr, child_rel->relids,
+
+				/*
+				 * Must translate nullable_relids.  Note this code assumes
+				 * parent and child relids are singletons.
+				 */
+				new_nullable_relids = cur_em->em_nullable_relids;
+				if (bms_overlap(new_nullable_relids, parent_rel->relids))
+				{
+					new_nullable_relids = bms_difference(new_nullable_relids,
+														 parent_rel->relids);
+					new_nullable_relids = bms_add_members(new_nullable_relids,
+														  child_rel->relids);
+				}
+
+				(void) add_eq_member(cur_ec, child_expr,
+									 child_rel->relids, new_nullable_relids,
 									 true, cur_em->em_datatype);
 			}
 		}
@@ -1495,6 +1702,44 @@ add_child_rel_equivalences(PlannerInfo *root,
 }
 
 
+/*
+ * mutate_eclass_expressions
+ *	  Apply an expression tree mutator to all expressions stored in
+ *	  equivalence classes.
+ *
+ * This is a bit of a hack ... it's currently needed only by planagg.c,
+ * which needs to do a global search-and-replace of MIN/MAX Aggrefs
+ * after eclasses are already set up.  Without changing the eclasses too,
+ * subsequent matching of ORDER BY clauses would fail.
+ *
+ * Note that we assume the mutation won't affect relation membership or any
+ * other properties we keep track of (which is a bit bogus, but by the time
+ * planagg.c runs, it no longer matters).  Also we must be called in the
+ * main planner memory context.
+ */
+void
+mutate_eclass_expressions(PlannerInfo *root,
+						  Node *(*mutator) (),
+						  void *context)
+{
+	ListCell   *lc1;
+
+	foreach(lc1, root->eq_classes)
+	{
+		EquivalenceClass *cur_ec = (EquivalenceClass *) lfirst(lc1);
+		ListCell   *lc2;
+
+		foreach(lc2, cur_ec->ec_members)
+		{
+			EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc2);
+
+			cur_em->em_expr = (Expr *)
+				mutator((Node *) cur_em->em_expr, context);
+		}
+	}
+}
+
+
 /*
  * find_eclass_clauses_for_index_join
  *	  Create joinclauses usable for a nestloop-with-inner-indexscan
@@ -1521,8 +1766,8 @@ find_eclass_clauses_for_index_join(PlannerInfo *root, RelOptInfo *rel,
 			continue;
 
 		/*
-		 * No point in searching if rel not mentioned in eclass (but we
-		 * can't tell that for a child rel).
+		 * No point in searching if rel not mentioned in eclass (but we can't
+		 * tell that for a child rel).
 		 */
 		if (!is_child_rel &&
 			!bms_is_subset(rel->relids, cur_ec->ec_relids))
@@ -1536,7 +1781,7 @@ find_eclass_clauses_for_index_join(PlannerInfo *root, RelOptInfo *rel,
 		{
 			EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc2);
 			EquivalenceMember *best_outer_em = NULL;
-			Oid		best_eq_op = InvalidOid;
+			Oid			best_eq_op = InvalidOid;
 			ListCell   *lc3;
 
 			if (!bms_equal(cur_em->em_relids, rel->relids) ||
@@ -1545,14 +1790,14 @@ find_eclass_clauses_for_index_join(PlannerInfo *root, RelOptInfo *rel,
 
 			/*
 			 * Found one, so try to generate a join clause.  This is like
-			 * generate_join_implied_equalities_normal, except simpler
-			 * since our only preference item is to pick a Var on the
-			 * outer side.  We only need one join clause per index col.
+			 * generate_join_implied_equalities_normal, except simpler since
+			 * our only preference item is to pick a Var on the outer side. We
+			 * only need one join clause per index col.
 			 */
 			foreach(lc3, cur_ec->ec_members)
 			{
 				EquivalenceMember *outer_em = (EquivalenceMember *) lfirst(lc3);
-				Oid		eq_op;
+				Oid			eq_op;
 
 				if (!bms_is_subset(outer_em->em_relids, outer_relids))
 					continue;
@@ -1566,7 +1811,7 @@ find_eclass_clauses_for_index_join(PlannerInfo *root, RelOptInfo *rel,
 				if (IsA(outer_em->em_expr, Var) ||
 					(IsA(outer_em->em_expr, RelabelType) &&
 					 IsA(((RelabelType *) outer_em->em_expr)->arg, Var)))
-					break;	/* no need to look further */
+					break;		/* no need to look further */
 			}
 
 			if (best_outer_em)
@@ -1580,9 +1825,10 @@ find_eclass_clauses_for_index_join(PlannerInfo *root, RelOptInfo *rel,
 										   cur_ec);
 
 				result = lappend(result, rinfo);
+
 				/*
-				 * Note: we keep scanning here because we want to provide
-				 * a clause for every possible indexcol.
+				 * Note: we keep scanning here because we want to provide a
+				 * clause for every possible indexcol.
 				 */
 			}
 		}
@@ -1598,7 +1844,7 @@ find_eclass_clauses_for_index_join(PlannerInfo *root, RelOptInfo *rel,
  *		a joinclause between the two given relations.
  *
  * This is essentially a very cut-down version of
- * generate_join_implied_equalities().  Note it's OK to occasionally say "yes"
+ * generate_join_implied_equalities().	Note it's OK to occasionally say "yes"
  * incorrectly.  Hence we don't bother with details like whether the lack of a
  * cross-type operator might prevent the clause from actually being generated.
  */
@@ -1616,16 +1862,22 @@ have_relevant_eclass_joinclause(PlannerInfo *root,
 		ListCell   *lc2;
 
 		/*
-		 * Won't generate joinclauses if const or single-member (the latter
-		 * test covers the volatile case too)
+		 * Won't generate joinclauses if single-member (this test covers the
+		 * volatile case too)
 		 */
-		if (ec->ec_has_const || list_length(ec->ec_members) <= 1)
+		if (list_length(ec->ec_members) <= 1)
 			continue;
 
 		/*
 		 * Note we don't test ec_broken; if we did, we'd need a separate code
 		 * path to look through ec_sources.  Checking the members anyway is OK
 		 * as a possibly-overoptimistic heuristic.
+		 *
+		 * We don't test ec_has_const either, even though a const eclass
+		 * won't generate real join clauses.  This is because if we had
+		 * "WHERE a.x = b.y and a.x = 42", it is worth considering a join
+		 * between a and b, since the join result is likely to be small even
+		 * though it'll end up being an unqualified nestloop.
 		 */
 
 		/* Needn't scan if it couldn't contain members from each rel */
@@ -1639,8 +1891,8 @@ have_relevant_eclass_joinclause(PlannerInfo *root,
 		{
 			EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc2);
 
-			if (cur_em->em_is_child)
-				continue;			/* ignore children here */
+			if (cur_em->em_is_const || cur_em->em_is_child)
+				continue;		/* ignore consts and children here */
 			if (bms_is_subset(cur_em->em_relids, rel1->relids))
 			{
 				has_rel1 = true;
@@ -1684,16 +1936,22 @@ has_relevant_eclass_joinclause(PlannerInfo *root, RelOptInfo *rel1)
 		ListCell   *lc2;
 
 		/*
-		 * Won't generate joinclauses if const or single-member (the latter
-		 * test covers the volatile case too)
+		 * Won't generate joinclauses if single-member (this test covers the
+		 * volatile case too)
 		 */
-		if (ec->ec_has_const || list_length(ec->ec_members) <= 1)
+		if (list_length(ec->ec_members) <= 1)
 			continue;
 
 		/*
 		 * Note we don't test ec_broken; if we did, we'd need a separate code
 		 * path to look through ec_sources.  Checking the members anyway is OK
 		 * as a possibly-overoptimistic heuristic.
+		 *
+		 * We don't test ec_has_const either, even though a const eclass
+		 * won't generate real join clauses.  This is because if we had
+		 * "WHERE a.x = b.y and a.x = 42", it is worth considering a join
+		 * between a and b, since the join result is likely to be small even
+		 * though it'll end up being an unqualified nestloop.
 		 */
 
 		/* Needn't scan if it couldn't contain members from each rel */
@@ -1707,8 +1965,8 @@ has_relevant_eclass_joinclause(PlannerInfo *root, RelOptInfo *rel1)
 		{
 			EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc2);
 
-			if (cur_em->em_is_child)
-				continue;			/* ignore children here */
+			if (cur_em->em_is_const || cur_em->em_is_child)
+				continue;		/* ignore consts and children here */
 			if (bms_is_subset(cur_em->em_relids, rel1->relids))
 			{
 				has_rel1 = true;
@@ -1737,7 +1995,7 @@ has_relevant_eclass_joinclause(PlannerInfo *root, RelOptInfo *rel1)
  *	  against the specified relation.
  *
  * This is just a heuristic test and doesn't have to be exact; it's better
- * to say "yes" incorrectly than "no".  Hence we don't bother with details
+ * to say "yes" incorrectly than "no".	Hence we don't bother with details
  * like whether the lack of a cross-type operator might prevent the clause
  * from actually being generated.
  */
@@ -1750,16 +2008,16 @@ eclass_useful_for_merging(EquivalenceClass *eclass,
 	Assert(!eclass->ec_merged);
 
 	/*
-	 * Won't generate joinclauses if const or single-member (the latter
-	 * test covers the volatile case too)
+	 * Won't generate joinclauses if const or single-member (the latter test
+	 * covers the volatile case too)
 	 */
 	if (eclass->ec_has_const || list_length(eclass->ec_members) <= 1)
 		return false;
 
 	/*
-	 * Note we don't test ec_broken; if we did, we'd need a separate code
-	 * path to look through ec_sources.  Checking the members anyway is OK
-	 * as a possibly-overoptimistic heuristic.
+	 * Note we don't test ec_broken; if we did, we'd need a separate code path
+	 * to look through ec_sources.	Checking the members anyway is OK as a
+	 * possibly-overoptimistic heuristic.
 	 */
 
 	/* If rel already includes all members of eclass, no point in searching */
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 43702a6d6d03..2b7999847e4d 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.216 2007/01/20 20:45:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.227.2.2 2009/04/16 20:42:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,7 @@
 /*
  * DoneMatchingIndexKeys() - MACRO
  */
-#define DoneMatchingIndexKeys(families)	(families[0] == InvalidOid)
+#define DoneMatchingIndexKeys(families) (families[0] == InvalidOid)
 
 #define IsBooleanOpfamily(opfamily) \
 	((opfamily) == BOOL_BTREE_FAM_OID || (opfamily) == BOOL_HASH_FAM_OID)
@@ -72,7 +72,7 @@ static Cost bitmap_scan_cost_est(PlannerInfo *root, RelOptInfo *rel,
 static Cost bitmap_and_cost_est(PlannerInfo *root, RelOptInfo *rel,
 					List *paths, RelOptInfo *outer_rel);
 static PathClauseUsage *classify_index_clause_usage(Path *path,
-													List **clauselist);
+							List **clauselist);
 static void find_indexpath_quals(Path *bitmapqual, List **quals, List **preds);
 static int	find_list_position(Node *node, List **nodelist);
 static bool match_clause_to_indexcol(IndexOptInfo *index,
@@ -312,6 +312,7 @@ find_usable_indexes(PlannerInfo *root, RelOptInfo *rel,
 					SaOpControl saop_control)
 {
 	Relids		outer_relids = outer_rel ? outer_rel->relids : NULL;
+	bool		possibly_useful_pathkeys = has_useful_pathkeys(root, rel);
 	List	   *result = NIL;
 	List	   *all_clauses = NIL;		/* not computed till needed */
 	ListCell   *ilist;
@@ -398,7 +399,8 @@ find_usable_indexes(PlannerInfo *root, RelOptInfo *rel,
 		 * relevant unless we are at top level.
 		 */
 		index_is_ordered = OidIsValid(index->fwdsortop[0]);
-		if (index_is_ordered && istoplevel && outer_rel == NULL)
+		if (index_is_ordered && possibly_useful_pathkeys &&
+			istoplevel && outer_rel == NULL)
 		{
 			index_pathkeys = build_index_pathkeys(root, index,
 												  ForwardScanDirection);
@@ -470,10 +472,11 @@ find_usable_indexes(PlannerInfo *root, RelOptInfo *rel,
 		}
 
 		/*
-		 * 4. If the index is ordered, a backwards scan might be
-		 * interesting.  Again, this is only interesting at top level.
+		 * 4. If the index is ordered, a backwards scan might be interesting.
+		 * Again, this is only interesting at top level.
 		 */
-		if (index_is_ordered && istoplevel && outer_rel == NULL)
+		if (index_is_ordered && possibly_useful_pathkeys &&
+			istoplevel && outer_rel == NULL)
 		{
 			index_pathkeys = build_index_pathkeys(root, index,
 												  BackwardScanDirection);
@@ -668,7 +671,8 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 	List	   *clauselist;
 	List	   *bestpaths = NIL;
 	Cost		bestcost = 0;
-	int			i, j;
+	int			i,
+				j;
 	ListCell   *l;
 
 	Assert(npaths > 0);			/* else caller error */
@@ -679,40 +683,39 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 	 * In theory we should consider every nonempty subset of the given paths.
 	 * In practice that seems like overkill, given the crude nature of the
 	 * estimates, not to mention the possible effects of higher-level AND and
-	 * OR clauses.  Moreover, it's completely impractical if there are a large
+	 * OR clauses.	Moreover, it's completely impractical if there are a large
 	 * number of paths, since the work would grow as O(2^N).
 	 *
-	 * As a heuristic, we first check for paths using exactly the same
-	 * sets of WHERE clauses + index predicate conditions, and reject all
-	 * but the cheapest-to-scan in any such group.  This primarily gets rid
-	 * of indexes that include the interesting columns but also irrelevant
-	 * columns.  (In situations where the DBA has gone overboard on creating
-	 * variant indexes, this can make for a very large reduction in the number
-	 * of paths considered further.)
+	 * As a heuristic, we first check for paths using exactly the same sets of
+	 * WHERE clauses + index predicate conditions, and reject all but the
+	 * cheapest-to-scan in any such group.	This primarily gets rid of indexes
+	 * that include the interesting columns but also irrelevant columns.  (In
+	 * situations where the DBA has gone overboard on creating variant
+	 * indexes, this can make for a very large reduction in the number of
+	 * paths considered further.)
 	 *
-	 * We then sort the surviving paths with the cheapest-to-scan first,
-	 * and for each path, consider using that path alone as the basis for
-	 * a bitmap scan.  Then we consider bitmap AND scans formed from that
-	 * path plus each subsequent (higher-cost) path, adding on a subsequent
-	 * path if it results in a reduction in the estimated total scan cost.
-	 * This means we consider about O(N^2) rather than O(2^N) path
-	 * combinations, which is quite tolerable, especially given than N is
-	 * usually reasonably small because of the prefiltering step.  The
-	 * cheapest of these is returned.
+	 * We then sort the surviving paths with the cheapest-to-scan first, and
+	 * for each path, consider using that path alone as the basis for a bitmap
+	 * scan.  Then we consider bitmap AND scans formed from that path plus
+	 * each subsequent (higher-cost) path, adding on a subsequent path if it
+	 * results in a reduction in the estimated total scan cost. This means we
+	 * consider about O(N^2) rather than O(2^N) path combinations, which is
+	 * quite tolerable, especially given than N is usually reasonably small
+	 * because of the prefiltering step.  The cheapest of these is returned.
 	 *
-	 * We will only consider AND combinations in which no two indexes use
-	 * the same WHERE clause.  This is a bit of a kluge: it's needed because
+	 * We will only consider AND combinations in which no two indexes use the
+	 * same WHERE clause.  This is a bit of a kluge: it's needed because
 	 * costsize.c and clausesel.c aren't very smart about redundant clauses.
 	 * They will usually double-count the redundant clauses, producing a
 	 * too-small selectivity that makes a redundant AND step look like it
-	 * reduces the total cost.  Perhaps someday that code will be smarter and
+	 * reduces the total cost.	Perhaps someday that code will be smarter and
 	 * we can remove this limitation.  (But note that this also defends
 	 * against flat-out duplicate input paths, which can happen because
 	 * best_inner_indexscan will find the same OR join clauses that
 	 * create_or_index_quals has pulled OR restriction clauses out of.)
 	 *
 	 * For the same reason, we reject AND combinations in which an index
-	 * predicate clause duplicates another clause.  Here we find it necessary
+	 * predicate clause duplicates another clause.	Here we find it necessary
 	 * to be even stricter: we'll reject a partial index if any of its
 	 * predicate clauses are implied by the set of WHERE clauses and predicate
 	 * clauses used so far.  This covers cases such as a condition "x = 42"
@@ -726,9 +729,9 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 	 */
 
 	/*
-	 * Extract clause usage info and detect any paths that use exactly
-	 * the same set of clauses; keep only the cheapest-to-scan of any such
-	 * groups.  The surviving paths are put into an array for qsort'ing.
+	 * Extract clause usage info and detect any paths that use exactly the
+	 * same set of clauses; keep only the cheapest-to-scan of any such groups.
+	 * The surviving paths are put into an array for qsort'ing.
 	 */
 	pathinfoarray = (PathClauseUsage **)
 		palloc(npaths * sizeof(PathClauseUsage *));
@@ -736,7 +739,7 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 	npaths = 0;
 	foreach(l, paths)
 	{
-		Path   *ipath = (Path *) lfirst(l);
+		Path	   *ipath = (Path *) lfirst(l);
 
 		pathinfo = classify_index_clause_usage(ipath, &clauselist);
 		for (i = 0; i < npaths; i++)
@@ -773,9 +776,9 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 		  path_usage_comparator);
 
 	/*
-	 * For each surviving index, consider it as an "AND group leader", and
-	 * see whether adding on any of the later indexes results in an AND path
-	 * with cheaper total cost than before.  Then take the cheapest AND group.
+	 * For each surviving index, consider it as an "AND group leader", and see
+	 * whether adding on any of the later indexes results in an AND path with
+	 * cheaper total cost than before.	Then take the cheapest AND group.
 	 */
 	for (i = 0; i < npaths; i++)
 	{
@@ -792,17 +795,17 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 		clauseidsofar = bms_copy(pathinfo->clauseids);
 		lastcell = list_head(paths);	/* for quick deletions */
 
-		for (j = i+1; j < npaths; j++)
+		for (j = i + 1; j < npaths; j++)
 		{
 			Cost		newcost;
 
 			pathinfo = pathinfoarray[j];
 			/* Check for redundancy */
 			if (bms_overlap(pathinfo->clauseids, clauseidsofar))
-				continue;			/* consider it redundant */
+				continue;		/* consider it redundant */
 			if (pathinfo->preds)
 			{
-				bool	redundant = false;
+				bool		redundant = false;
 
 				/* we check each predicate clause separately */
 				foreach(l, pathinfo->preds)
@@ -812,7 +815,7 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 					if (predicate_implied_by(list_make1(np), qualsofar))
 					{
 						redundant = true;
-						break;		/* out of inner foreach loop */
+						break;	/* out of inner foreach loop */
 					}
 				}
 				if (redundant)
@@ -853,7 +856,7 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel,
 	}
 
 	if (list_length(bestpaths) == 1)
-		return (Path *) linitial(bestpaths);		/* no need for AND */
+		return (Path *) linitial(bestpaths);	/* no need for AND */
 	return (Path *) create_bitmap_and_path(root, rel, bestpaths);
 }
 
@@ -959,14 +962,14 @@ classify_index_clause_usage(Path *path, List **clauselist)
 	clauseids = NULL;
 	foreach(lc, result->quals)
 	{
-		Node   *node = (Node *) lfirst(lc);
+		Node	   *node = (Node *) lfirst(lc);
 
 		clauseids = bms_add_member(clauseids,
 								   find_list_position(node, clauselist));
 	}
 	foreach(lc, result->preds)
 	{
-		Node   *node = (Node *) lfirst(lc);
+		Node	   *node = (Node *) lfirst(lc);
 
 		clauseids = bms_add_member(clauseids,
 								   find_list_position(node, clauselist));
@@ -1031,7 +1034,7 @@ find_indexpath_quals(Path *bitmapqual, List **quals, List **preds)
 /*
  * find_list_position
  *		Return the given node's position (counting from 0) in the given
- *		list of nodes.  If it's not equal() to any existing list member,
+ *		list of nodes.	If it's not equal() to any existing list member,
  *		add it at the end, and return that position.
  */
 static int
@@ -1043,7 +1046,7 @@ find_list_position(Node *node, List **nodelist)
 	i = 0;
 	foreach(lc, *nodelist)
 	{
-		Node   *oldnode = (Node *) lfirst(lc);
+		Node	   *oldnode = (Node *) lfirst(lc);
 
 		if (equal(node, oldnode))
 			return i;
@@ -1269,6 +1272,7 @@ match_clause_to_indexcol(IndexOptInfo *index,
 	 * Clause must be a binary opclause, or possibly a ScalarArrayOpExpr
 	 * (which is always binary, by definition).  Or it could be a
 	 * RowCompareExpr, which we pass off to match_rowcompare_to_indexcol().
+	 * Or, if the index supports it, we can handle IS NULL clauses.
 	 */
 	if (is_opclause(clause))
 	{
@@ -1302,6 +1306,15 @@ match_clause_to_indexcol(IndexOptInfo *index,
 											(RowCompareExpr *) clause,
 											outer_relids);
 	}
+	else if (index->amsearchnulls && IsA(clause, NullTest))
+	{
+		NullTest   *nt = (NullTest *) clause;
+
+		if (nt->nulltesttype == IS_NULL &&
+			match_index_to_operand((Node *) nt->arg, indexcol, index))
+			return true;
+		return false;
+	}
 	else
 		return false;
 
@@ -1392,12 +1405,12 @@ match_rowcompare_to_indexcol(IndexOptInfo *index,
 	/*
 	 * We could do the matching on the basis of insisting that the opfamily
 	 * shown in the RowCompareExpr be the same as the index column's opfamily,
-	 * but that could fail in the presence of reverse-sort opfamilies: it'd
-	 * be a matter of chance whether RowCompareExpr had picked the forward
-	 * or reverse-sort family.  So look only at the operator, and match
-	 * if it is a member of the index's opfamily (after commutation, if the
-	 * indexkey is on the right).  We'll worry later about whether any
-	 * additional operators are matchable to the index.
+	 * but that could fail in the presence of reverse-sort opfamilies: it'd be
+	 * a matter of chance whether RowCompareExpr had picked the forward or
+	 * reverse-sort family.  So look only at the operator, and match if it is
+	 * a member of the index's opfamily (after commutation, if the indexkey is
+	 * on the right).  We'll worry later about whether any additional
+	 * operators are matchable to the index.
 	 */
 	leftop = (Node *) linitial(clause->largs);
 	rightop = (Node *) linitial(clause->rargs);
@@ -1498,8 +1511,8 @@ indexable_outerrelids(PlannerInfo *root, RelOptInfo *rel)
 	}
 
 	/*
-	 * We also have to look through the query's EquivalenceClasses to see
-	 * if any of them could generate indexable join conditions for this rel.
+	 * We also have to look through the query's EquivalenceClasses to see if
+	 * any of them could generate indexable join conditions for this rel.
 	 */
 	if (rel->has_eclass_joins)
 	{
@@ -1511,8 +1524,8 @@ indexable_outerrelids(PlannerInfo *root, RelOptInfo *rel)
 			ListCell   *lc2;
 
 			/*
-			 * Won't generate joinclauses if const or single-member (the latter
-			 * test covers the volatile case too)
+			 * Won't generate joinclauses if const or single-member (the
+			 * latter test covers the volatile case too)
 			 */
 			if (cur_ec->ec_has_const || list_length(cur_ec->ec_members) <= 1)
 				continue;
@@ -1661,7 +1674,18 @@ eclass_matches_any_index(EquivalenceClass *ec, EquivalenceMember *em,
 		{
 			Oid			curFamily = families[0];
 
-			if (list_member_oid(ec->ec_opfamilies, curFamily) &&
+			/*
+			 * If it's a btree index, we can reject it if its opfamily isn't
+			 * compatible with the EC, since no clause generated from the
+			 * EC could be used with the index.  For non-btree indexes,
+			 * we can't easily tell whether clauses generated from the EC
+			 * could be used with the index, so only check for expression
+			 * match.  This might mean we return "true" for a useless index,
+			 * but that will just cause some wasted planner cycles; it's
+			 * better than ignoring useful indexes.
+			 */
+			if ((index->relam != BTREE_AM_OID ||
+				 list_member_oid(ec->ec_opfamilies, curFamily)) &&
 				match_index_to_operand((Node *) em->em_expr, indexcol, index))
 				return true;
 
@@ -1711,6 +1735,9 @@ best_inner_indexscan(PlannerInfo *root, RelOptInfo *rel,
 	/* Initialize results for failure returns */
 	*cheapest_startup = *cheapest_total = NULL;
 
+	/* Initialize results for failure returns */
+	*cheapest_startup = *cheapest_total = NULL;
+
 	/*
 	 * Nestloop only supports inner and left joins.
 	 */
@@ -1924,14 +1951,14 @@ find_clauses_for_join(PlannerInfo *root, RelOptInfo *rel,
 
 	/*
 	 * Also check to see if any EquivalenceClasses can produce a relevant
-	 * joinclause.  Since all such clauses are effectively pushed-down,
-	 * this doesn't apply to outer joins.
+	 * joinclause.	Since all such clauses are effectively pushed-down, this
+	 * doesn't apply to outer joins.
 	 */
 	if (!isouterjoin && rel->has_eclass_joins)
 		clause_list = list_concat(clause_list,
 								  find_eclass_clauses_for_index_join(root,
 																	 rel,
-															   outer_relids));
+															  outer_relids));
 
 	/* If no join clause was matched then forget it, per comments above */
 	if (clause_list == NIL)
@@ -2163,7 +2190,6 @@ match_special_index_operator(Expr *clause, Oid opfamily,
 	Oid			expr_op;
 	Const	   *patt;
 	Const	   *prefix = NULL;
-	Const	   *rest = NULL;
 
 	/*
 	 * Currently, all known special operators require the indexkey on the
@@ -2190,12 +2216,12 @@ match_special_index_operator(Expr *clause, Oid opfamily,
 		case OID_NAME_LIKE_OP:
 			/* the right-hand const is type text for all of these */
 			isIndexable = pattern_fixed_prefix(patt, Pattern_Type_Like,
-									  &prefix, &rest) != Pattern_Prefix_None;
+									  &prefix, NULL) != Pattern_Prefix_None;
 			break;
 
 		case OID_BYTEA_LIKE_OP:
 			isIndexable = pattern_fixed_prefix(patt, Pattern_Type_Like,
-									  &prefix, &rest) != Pattern_Prefix_None;
+									  &prefix, NULL) != Pattern_Prefix_None;
 			break;
 
 		case OID_TEXT_ICLIKE_OP:
@@ -2203,7 +2229,7 @@ match_special_index_operator(Expr *clause, Oid opfamily,
 		case OID_NAME_ICLIKE_OP:
 			/* the right-hand const is type text for all of these */
 			isIndexable = pattern_fixed_prefix(patt, Pattern_Type_Like_IC,
-									  &prefix, &rest) != Pattern_Prefix_None;
+									  &prefix, NULL) != Pattern_Prefix_None;
 			break;
 
 		case OID_TEXT_REGEXEQ_OP:
@@ -2211,7 +2237,7 @@ match_special_index_operator(Expr *clause, Oid opfamily,
 		case OID_NAME_REGEXEQ_OP:
 			/* the right-hand const is type text for all of these */
 			isIndexable = pattern_fixed_prefix(patt, Pattern_Type_Regex,
-									  &prefix, &rest) != Pattern_Prefix_None;
+									  &prefix, NULL) != Pattern_Prefix_None;
 			break;
 
 		case OID_TEXT_ICREGEXEQ_OP:
@@ -2219,7 +2245,7 @@ match_special_index_operator(Expr *clause, Oid opfamily,
 		case OID_NAME_ICREGEXEQ_OP:
 			/* the right-hand const is type text for all of these */
 			isIndexable = pattern_fixed_prefix(patt, Pattern_Type_Regex_IC,
-									  &prefix, &rest) != Pattern_Prefix_None;
+									  &prefix, NULL) != Pattern_Prefix_None;
 			break;
 
 		case OID_INET_SUB_OP:
@@ -2243,9 +2269,9 @@ match_special_index_operator(Expr *clause, Oid opfamily,
 	 * want to apply.  (A hash index, for example, will not support ">=".)
 	 * Currently, only btree supports the operators we need.
 	 *
-	 * We insist on the opfamily being the specific one we expect, else we'd do
-	 * the wrong thing if someone were to make a reverse-sort opfamily with the
-	 * same operators.
+	 * We insist on the opfamily being the specific one we expect, else we'd
+	 * do the wrong thing if someone were to make a reverse-sort opfamily with
+	 * the same operators.
 	 */
 	switch (expr_op)
 	{
@@ -2336,24 +2362,20 @@ expand_indexqual_conditions(IndexOptInfo *index, List *clausegroups)
 				if (boolqual)
 				{
 					resultquals = lappend(resultquals,
-										  make_restrictinfo(boolqual,
-															true,
-															false,
-															false,
-															NULL));
+										  make_simple_restrictinfo(boolqual));
 					continue;
 				}
 			}
 
 			/*
-			 * Else it must be an opclause (usual case), ScalarArrayOp, or
-			 * RowCompare
+			 * Else it must be an opclause (usual case), ScalarArrayOp,
+			 * RowCompare, or NullTest
 			 */
 			if (is_opclause(clause))
 			{
 				resultquals = list_concat(resultquals,
 										  expand_indexqual_opclause(rinfo,
-																  curFamily));
+																 curFamily));
 			}
 			else if (IsA(clause, ScalarArrayOpExpr))
 			{
@@ -2367,6 +2389,12 @@ expand_indexqual_conditions(IndexOptInfo *index, List *clausegroups)
 																  index,
 																  indexcol));
 			}
+			else if (IsA(clause, NullTest))
+			{
+				Assert(index->amsearchnulls);
+				resultquals = lappend(resultquals,
+									  make_simple_restrictinfo(clause));
+			}
 			else
 				elog(ERROR, "unsupported indexqual type: %d",
 					 (int) nodeTag(clause));
@@ -2460,7 +2488,6 @@ expand_indexqual_opclause(RestrictInfo *rinfo, Oid opfamily)
 	Oid			expr_op = ((OpExpr *) clause)->opno;
 	Const	   *patt = (Const *) rightop;
 	Const	   *prefix = NULL;
-	Const	   *rest = NULL;
 	Pattern_Prefix_Status pstatus;
 	List	   *result;
 
@@ -2476,7 +2503,7 @@ expand_indexqual_opclause(RestrictInfo *rinfo, Oid opfamily)
 		case OID_NAME_LIKE_OP:
 		case OID_BYTEA_LIKE_OP:
 			pstatus = pattern_fixed_prefix(patt, Pattern_Type_Like,
-										   &prefix, &rest);
+										   &prefix, NULL);
 			result = prefix_quals(leftop, opfamily, prefix, pstatus);
 			break;
 
@@ -2485,7 +2512,7 @@ expand_indexqual_opclause(RestrictInfo *rinfo, Oid opfamily)
 		case OID_NAME_ICLIKE_OP:
 			/* the right-hand const is type text for all of these */
 			pstatus = pattern_fixed_prefix(patt, Pattern_Type_Like_IC,
-										   &prefix, &rest);
+										   &prefix, NULL);
 			result = prefix_quals(leftop, opfamily, prefix, pstatus);
 			break;
 
@@ -2494,7 +2521,7 @@ expand_indexqual_opclause(RestrictInfo *rinfo, Oid opfamily)
 		case OID_NAME_REGEXEQ_OP:
 			/* the right-hand const is type text for all of these */
 			pstatus = pattern_fixed_prefix(patt, Pattern_Type_Regex,
-										   &prefix, &rest);
+										   &prefix, NULL);
 			result = prefix_quals(leftop, opfamily, prefix, pstatus);
 			break;
 
@@ -2503,7 +2530,7 @@ expand_indexqual_opclause(RestrictInfo *rinfo, Oid opfamily)
 		case OID_NAME_ICREGEXEQ_OP:
 			/* the right-hand const is type text for all of these */
 			pstatus = pattern_fixed_prefix(patt, Pattern_Type_Regex_IC,
-										   &prefix, &rest);
+										   &prefix, NULL);
 			result = prefix_quals(leftop, opfamily, prefix, pstatus);
 			break;
 
@@ -2685,9 +2712,9 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
 		righttypes_cell = list_head(righttypes);
 		foreach(opfamilies_cell, opfamilies)
 		{
-			Oid		opfam = lfirst_oid(opfamilies_cell);
-			Oid		lefttype = lfirst_oid(lefttypes_cell);
-			Oid		righttype = lfirst_oid(righttypes_cell);
+			Oid			opfam = lfirst_oid(opfamilies_cell);
+			Oid			lefttype = lfirst_oid(lefttypes_cell);
+			Oid			righttype = lfirst_oid(righttypes_cell);
 
 			expr_op = get_opfamily_member(opfam, lefttype, righttype,
 										  op_strategy);
@@ -2702,9 +2729,9 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
 						 op_strategy, lefttype, righttype, opfam);
 			}
 			new_ops = lappend_oid(new_ops, expr_op);
+			lefttypes_cell = lnext(lefttypes_cell);
+			righttypes_cell = lnext(righttypes_cell);
 		}
-		lefttypes_cell = lnext(lefttypes_cell);
-		righttypes_cell = lnext(righttypes_cell);
 	}
 
 	/* If we have more than one matching col, create a subset rowcompare */
@@ -2724,7 +2751,7 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
 								  matching_cols);
 		rc->rargs = list_truncate((List *) copyObject(clause->rargs),
 								  matching_cols);
-		return make_restrictinfo((Expr *) rc, true, false, false, NULL);
+		return make_simple_restrictinfo((Expr *) rc);
 	}
 	else
 	{
@@ -2733,7 +2760,7 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
 		opexpr = make_opclause(linitial_oid(new_ops), BOOLOID, false,
 							   copyObject(linitial(clause->largs)),
 							   copyObject(linitial(clause->rargs)));
-		return make_restrictinfo(opexpr, true, false, false, NULL);
+		return make_simple_restrictinfo(opexpr);
 	}
 }
 
@@ -2821,7 +2848,7 @@ prefix_quals(Node *leftop, Oid opfamily,
 			elog(ERROR, "no = operator for opfamily %u", opfamily);
 		expr = make_opclause(oproid, BOOLOID, false,
 							 (Expr *) leftop, (Expr *) prefix_const);
-		result = list_make1(make_restrictinfo(expr, true, false, false, NULL));
+		result = list_make1(make_simple_restrictinfo(expr));
 		return result;
 	}
 
@@ -2836,7 +2863,7 @@ prefix_quals(Node *leftop, Oid opfamily,
 		elog(ERROR, "no >= operator for opfamily %u", opfamily);
 	expr = make_opclause(oproid, BOOLOID, false,
 						 (Expr *) leftop, (Expr *) prefix_const);
-	result = list_make1(make_restrictinfo(expr, true, false, false, NULL));
+	result = list_make1(make_simple_restrictinfo(expr));
 
 	/*-------
 	 * If we can create a string larger than the prefix, we can say
@@ -2844,21 +2871,16 @@ prefix_quals(Node *leftop, Oid opfamily,
 	 *-------
 	 */
 	oproid = get_opfamily_member(opfamily, datatype, datatype,
-								BTLessStrategyNumber);
+								 BTLessStrategyNumber);
 	if (oproid == InvalidOid)
 		elog(ERROR, "no < operator for opfamily %u", opfamily);
 	fmgr_info(get_opcode(oproid), &ltproc);
 	greaterstr = make_greater_string(prefix_const, &ltproc);
 	if (greaterstr)
 	{
-		oproid = get_opfamily_member(opfamily, datatype, datatype,
-									 BTLessStrategyNumber);
-		if (oproid == InvalidOid)
-			elog(ERROR, "no < operator for opfamily %u", opfamily);
 		expr = make_opclause(oproid, BOOLOID, false,
 							 (Expr *) leftop, (Expr *) greaterstr);
-		result = lappend(result,
-						 make_restrictinfo(expr, true, false, false, NULL));
+		result = lappend(result, make_simple_restrictinfo(expr));
 	}
 
 	return result;
@@ -2921,7 +2943,7 @@ network_prefix_quals(Node *leftop, Oid expr_op, Oid opfamily, Datum rightop)
 						 (Expr *) leftop,
 						 (Expr *) makeConst(datatype, -1, -1, opr1right,
 											false, false));
-	result = list_make1(make_restrictinfo(expr, true, false, false, NULL));
+	result = list_make1(make_simple_restrictinfo(expr));
 
 	/* create clause "key <= network_scan_last( rightop )" */
 
@@ -2936,8 +2958,7 @@ network_prefix_quals(Node *leftop, Oid expr_op, Oid opfamily, Datum rightop)
 						 (Expr *) leftop,
 						 (Expr *) makeConst(datatype, -1, -1, opr2right,
 											false, false));
-	result = lappend(result,
-					 make_restrictinfo(expr, true, false, false, NULL));
+	result = lappend(result, make_simple_restrictinfo(expr));
 
 	return result;
 }
@@ -2974,6 +2995,7 @@ string_to_const(const char *str, Oid datatype)
 {
 	Datum		conval = string_to_datum(str, datatype);
 
-	return makeConst(datatype, -1, ((datatype == NAMEOID) ? NAMEDATALEN : -1),
+	return makeConst(datatype, -1,
+					 ((datatype == NAMEOID) ? NAMEDATALEN : -1),
 					 conval, false, false);
 }
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 17d486af62cd..cdff7ffc82b3 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/joinpath.c,v 1.111 2007/01/20 20:45:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/joinpath.c,v 1.115.2.1 2008/03/24 21:53:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,8 @@ static void hash_inner_and_outer(PlannerInfo *root, RelOptInfo *joinrel,
 					 JoinType jointype);
 static Path *best_appendrel_indexscan(PlannerInfo *root, RelOptInfo *rel,
 						 RelOptInfo *outer_rel, JoinType jointype);
-static List *select_mergejoin_clauses(RelOptInfo *joinrel,
+static List *select_mergejoin_clauses(PlannerInfo *root,
+						 RelOptInfo *joinrel,
 						 RelOptInfo *outerrel,
 						 RelOptInfo *innerrel,
 						 List *restrictlist,
@@ -89,7 +90,8 @@ add_paths_to_joinrel(PlannerInfo *root,
      *
      * CDB: Always build mergeclause_list.  We need it for motion planning.
 	 */
-	mergeclause_list = select_mergejoin_clauses(joinrel,
+	mergeclause_list = select_mergejoin_clauses(root,
+												joinrel,
 												outerrel,
 												innerrel,
 												restrictlist,
@@ -238,7 +240,7 @@ sort_inner_and_outer(PlannerInfo *root,
 	 *
 	 * Actually, it's not quite true that every mergeclause ordering will
 	 * generate a different path order, because some of the clauses may be
-	 * partially redundant (refer to the same EquivalenceClasses).  Therefore,
+	 * partially redundant (refer to the same EquivalenceClasses).	Therefore,
 	 * what we do is convert the mergeclause list to a list of canonical
 	 * pathkeys, and then consider different orderings of the pathkeys.
 	 *
@@ -275,7 +277,7 @@ sort_inner_and_outer(PlannerInfo *root,
 							  list_delete_ptr(list_copy(all_pathkeys),
 											  front_pathkey));
 		else
-			outerkeys = all_pathkeys;		/* no work at first one... */
+			outerkeys = all_pathkeys;	/* no work at first one... */
 
 		/* Sort the mergeclauses into the corresponding ordering */
 		cur_mergeclauses = find_mergeclauses_for_pathkeys(root,
@@ -885,11 +887,9 @@ best_appendrel_indexscan(PlannerInfo *root, RelOptInfo *rel,
 
 		/*
 		 * Check to see if child was rejected by constraint exclusion. If so,
-		 * it will have a cheapest_total_path that's an Append path with no
-		 * members (see set_plain_rel_pathlist).
+		 * it will have a cheapest_total_path that's a "dummy" path.
 		 */
-		if (IsA(childrel->cheapest_total_path, AppendPath) &&
-			((AppendPath *) childrel->cheapest_total_path)->subpaths == NIL)
+		if (IS_DUMMY_PATH(childrel->cheapest_total_path))
 			continue;			/* OK, we can ignore it */
 
 		/*
@@ -933,7 +933,8 @@ best_appendrel_indexscan(PlannerInfo *root, RelOptInfo *rel,
  * currently of interest.
  */
 static List *
-select_mergejoin_clauses(RelOptInfo *joinrel,
+select_mergejoin_clauses(PlannerInfo *root,
+						 RelOptInfo *joinrel,
 						 RelOptInfo *outerrel,
 						 RelOptInfo *innerrel,
 						 List *restrictlist,
@@ -987,6 +988,35 @@ select_mergejoin_clauses(RelOptInfo *joinrel,
 			continue;			/* no good for these input relations */
 		}
 
+		/*
+		 * Insist that each side have a non-redundant eclass.  This
+		 * restriction is needed because various bits of the planner expect
+		 * that each clause in a merge be associatable with some pathkey in a
+		 * canonical pathkey list, but redundant eclasses can't appear in
+		 * canonical sort orderings.  (XXX it might be worth relaxing this,
+		 * but not enough time to address it for 8.3.)
+		 *
+		 * Note: it would be bad if this condition failed for an otherwise
+		 * mergejoinable FULL JOIN clause, since that would result in
+		 * undesirable planner failure.  I believe that is not possible
+		 * however; a variable involved in a full join could only appear
+		 * in below_outer_join eclasses, which aren't considered redundant.
+		 *
+		 * This case *can* happen for left/right join clauses: the
+		 * outer-side variable could be equated to a constant.  Because we
+		 * will propagate that constant across the join clause, the loss of
+		 * ability to do a mergejoin is not really all that big a deal, and
+		 * so it's not clear that improving this is important.
+		 */
+		cache_mergeclause_eclasses(root, restrictinfo);
+
+		if (EC_MUST_BE_REDUNDANT(restrictinfo->left_ec) ||
+			EC_MUST_BE_REDUNDANT(restrictinfo->right_ec))
+		{
+			have_nonmergeable_joinclause = true;
+			continue;			/* can't handle redundant eclasses */
+		}
+
 		result_list = lappend(result_list, restrictinfo);
 	}
 
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 3de22750305a..6583097549a0 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/joinrels.c,v 1.86 2007/02/16 00:14:01 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/joinrels.c,v 1.91.2.1 2008/03/24 21:53:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,13 +39,15 @@ cdb_add_subquery_join_paths(PlannerInfo    *root,
 					        List           *restrictlist);
 static bool has_join_restriction(PlannerInfo *root, RelOptInfo *rel);
 static bool has_legal_joinclause(PlannerInfo *root, RelOptInfo *rel);
+static bool is_dummy_rel(RelOptInfo *rel);
+static void mark_dummy_join(PlannerInfo *root, RelOptInfo *rel);
 
 
 /*
- * make_rels_by_joins
+ * join_search_one_level
  *	  Consider ways to produce join relations containing exactly 'level'
  *	  jointree items.  (This is one step of the dynamic-programming method
- *	  embodied in make_one_rel_by_joins.)  Join rel nodes for each feasible
+ *	  embodied in standard_join_search.)  Join rel nodes for each feasible
  *	  combination of lower-level rels are created and returned in a list.
  *	  Implementation paths are created for each such joinrel, too.
  *
@@ -53,7 +55,7 @@ static bool has_legal_joinclause(PlannerInfo *root, RelOptInfo *rel);
  * joinrels[j], 1 <= j < level, is a list of rels containing j items.
  */
 List *
-make_rels_by_joins(PlannerInfo *root, int level, List **joinrels)
+join_search_one_level(PlannerInfo *root, int level, List **joinrels)
 {
 	List	   *result_rels = NIL;
 	List	   *new_rels;
@@ -358,8 +360,8 @@ join_is_legal(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 	ListCell   *l;
 
 	/*
-	 * Ensure *jointype_p is set on failure return.  This is just to
-	 * suppress uninitialized-variable warnings from overly anal compilers.
+	 * Ensure *jointype_p is set on failure return.  This is just to suppress
+	 * uninitialized-variable warnings from overly anal compilers.
 	 */
 	*jointype_p = JOIN_INNER;
 
@@ -410,7 +412,7 @@ join_is_legal(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 			bms_is_subset(ojinfo->min_righthand, rel2->relids))
 		{
 			if (jointype != JOIN_INNER)
-				return false;			/* invalid join path */
+				return false;	/* invalid join path */
 			jointype = ojinfo->join_type;
 			if (jointype != JOIN_FULL && jointype != JOIN_LASJ && jointype != JOIN_LASJ_NOTIN)
 				jointype = JOIN_LEFT;
@@ -419,7 +421,7 @@ join_is_legal(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
 				 bms_is_subset(ojinfo->min_righthand, rel1->relids))
 		{
 			if (jointype != JOIN_INNER)
-				return false;			/* invalid join path */
+				return false;	/* invalid join path */
 			jointype = ojinfo->join_type;
 			if (jointype != JOIN_FULL && jointype != JOIN_LASJ && jointype != JOIN_LASJ_NOTIN)
 				jointype = JOIN_RIGHT;
@@ -489,7 +491,6 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
 {
 	Relids		joinrelids;
 	JoinType	jointype;
-    JoinType    swapjointype;
 	RelOptInfo *joinrel;
 	List	   *restrictlist;
 
@@ -522,10 +523,15 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
 	joinrel = build_join_rel(root, joinrelids, rel1, rel2, jointype,
 							 &restrictlist);
 
-    /* Reversed jointype is useful when rel2 becomes outer and rel1 is inner. */
-    swapjointype = (jointype == JOIN_LEFT)  ? JOIN_RIGHT
-                 : (jointype == JOIN_RIGHT) ? JOIN_LEFT
-                 :                            jointype;
+	/*
+	 * If we've already proven this join is empty, we needn't consider
+	 * any more paths for it.
+	 */
+	if (is_dummy_rel(joinrel))
+	{
+		bms_free(joinrelids);
+		return joinrel;
+	}
 
     /*
      * CDB: Consider plans in which an upstream subquery's duplicate
@@ -535,28 +541,139 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2)
      */
     if ((rel1->dedup_info && rel1->dedup_info->later_dedup_pathlist) ||
         (rel2->dedup_info && rel2->dedup_info->later_dedup_pathlist))
-        cdb_add_subquery_join_paths(root,
-                                    joinrel,
-                                    rel1,
-                                    rel2,
-                                    jointype,
-                                    swapjointype,
-                                    restrictlist);
-
-    /*
-	 * For antijoins, the outer and inner rel are fixed.
-	 */
-	else if (jointype == JOIN_LASJ || jointype == JOIN_LASJ_NOTIN)
 	{
-        add_paths_to_joinrel(root, joinrel, rel1, rel2, jointype, restrictlist);
+		/* Reversed jointype is useful when rel2 becomes outer and rel1 is inner. */
+		JoinType    swapjointype;
+
+		if (jointype == JOIN_LEFT)
+			swapjointype = JOIN_RIGHT;
+		else if (jointype == JOIN_RIGHT)
+			swapjointype = JOIN_LEFT;
+		else
+			swapjointype = jointype;
+		cdb_add_subquery_join_paths(root, joinrel, rel1, rel2,
+									jointype, swapjointype, restrictlist);
+		bms_free(joinrelids);
+		return joinrel;
 	}
-    /*
-	 * Consider paths using each rel as both outer and inner.
+
+	/*
+	 * Consider paths using each rel as both outer and inner.  Depending
+	 * on the join type, a provably empty outer or inner rel might mean
+	 * the join is provably empty too; in which case throw away any
+	 * previously computed paths and mark the join as dummy.  (We do it
+	 * this way since it's conceivable that dummy-ness of a multi-element
+	 * join might only be noticeable for certain construction paths.)
 	 */
-    else
-    {
-        add_paths_to_joinrel(root, joinrel, rel1, rel2, jointype, restrictlist);
-        add_paths_to_joinrel(root, joinrel, rel2, rel1, swapjointype, restrictlist);
+	switch (jointype)
+	{
+		case JOIN_LASJ:
+		case JOIN_LASJ_NOTIN:
+			/*
+			 * For antijoins, the outer and inner rel are fixed.
+			 */
+			/* GPDB_83MERGE_FIXME: What do about dummy_rels here? */
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, jointype, restrictlist);
+			break;
+
+		case JOIN_INNER:
+			if (is_dummy_rel(rel1) || is_dummy_rel(rel2))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_INNER,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_INNER,
+								 restrictlist);
+			break;
+		case JOIN_LEFT:
+			if (is_dummy_rel(rel1))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_LEFT,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_RIGHT,
+								 restrictlist);
+			break;
+		case JOIN_FULL:
+			if (is_dummy_rel(rel1) && is_dummy_rel(rel2))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_FULL,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_FULL,
+								 restrictlist);
+			break;
+		case JOIN_RIGHT:
+			if (is_dummy_rel(rel2))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_RIGHT,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_LEFT,
+								 restrictlist);
+			break;
+		case JOIN_IN:
+			if (is_dummy_rel(rel1) || is_dummy_rel(rel2))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_IN,
+								 restrictlist);
+			/* REVERSE_IN isn't supported by joinpath.c */
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_UNIQUE_INNER,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_UNIQUE_OUTER,
+								 restrictlist);
+			break;
+		case JOIN_REVERSE_IN:
+			if (is_dummy_rel(rel1) || is_dummy_rel(rel2))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			/* REVERSE_IN isn't supported by joinpath.c */
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_IN,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_UNIQUE_OUTER,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_UNIQUE_INNER,
+								 restrictlist);
+			break;
+		case JOIN_UNIQUE_OUTER:
+			if (is_dummy_rel(rel1) || is_dummy_rel(rel2))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_UNIQUE_OUTER,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_UNIQUE_INNER,
+								 restrictlist);
+			break;
+		case JOIN_UNIQUE_INNER:
+			if (is_dummy_rel(rel1) || is_dummy_rel(rel2))
+			{
+				mark_dummy_join(root, joinrel);
+				break;
+			}
+			add_paths_to_joinrel(root, joinrel, rel1, rel2, JOIN_UNIQUE_INNER,
+								 restrictlist);
+			add_paths_to_joinrel(root, joinrel, rel2, rel1, JOIN_UNIQUE_OUTER,
+								 restrictlist);
+			break;
+		default:
+			elog(ERROR, "unrecognized join type: %d",
+				 (int) jointype);
+			break;
     }
 
 	bms_free(joinrelids);
@@ -682,9 +799,9 @@ cdb_add_subquery_join_paths(PlannerInfo    *root,
  * Note: this is only a problem if one side of a degenerate outer join
  * contains multiple rels, or a clauseless join is required within an IN's
  * RHS; else we will find a join path via the "last ditch" case in
- * make_rels_by_joins().  We could dispense with this test if we were willing
- * to try bushy plans in the "last ditch" case, but that seems much less
- * efficient.
+ * join_search_one_level().  We could dispense with this test if we were
+ * willing to try bushy plans in the "last ditch" case, but that seems much
+ * less efficient.
  */
 bool
 have_join_order_restriction(PlannerInfo *root,
@@ -694,9 +811,9 @@ have_join_order_restriction(PlannerInfo *root,
 	ListCell   *l;
 
 	/*
-	 * It's possible that the rels correspond to the left and right sides
-	 * of a degenerate outer join, that is, one with no joinclause mentioning
-	 * the non-nullable side; in which case we should force the join to occur.
+	 * It's possible that the rels correspond to the left and right sides of a
+	 * degenerate outer join, that is, one with no joinclause mentioning the
+	 * non-nullable side; in which case we should force the join to occur.
 	 *
 	 * Also, the two rels could represent a clauseless join that has to be
 	 * completed to build up the LHS or RHS of an outer join.
@@ -724,9 +841,9 @@ have_join_order_restriction(PlannerInfo *root,
 		}
 
 		/*
-		 * Might we need to join these rels to complete the RHS?  We have
-		 * to use "overlap" tests since either rel might include a lower OJ
-		 * that has been proven to commute with this one.
+		 * Might we need to join these rels to complete the RHS?  We have to
+		 * use "overlap" tests since either rel might include a lower OJ that
+		 * has been proven to commute with this one.
 		 */
 		if (bms_overlap(ojinfo->min_righthand, rel1->relids) &&
 			bms_overlap(ojinfo->min_righthand, rel2->relids))
@@ -784,6 +901,22 @@ have_join_order_restriction(PlannerInfo *root,
 		}
 	}
 
+	/*
+	 * We do not force the join to occur if either input rel can legally be
+	 * joined to anything else using joinclauses.  This essentially means that
+	 * clauseless bushy joins are put off as long as possible. The reason is
+	 * that when there is a join order restriction high up in the join tree
+	 * (that is, with many rels inside the LHS or RHS), we would otherwise
+	 * expend lots of effort considering very stupid join combinations within
+	 * its LHS or RHS.
+	 */
+	if (result)
+	{
+		if (has_legal_joinclause(root, rel1) ||
+			has_legal_joinclause(root, rel2))
+			result = false;
+	}
+
 	return result;
 }
 
@@ -795,7 +928,7 @@ have_join_order_restriction(PlannerInfo *root,
  *
  * Essentially, this tests whether have_join_order_restriction() could
  * succeed with this rel and some other one.  It's OK if we sometimes
- * say "true" incorrectly.  (Therefore, we don't bother with the relatively
+ * say "true" incorrectly.	(Therefore, we don't bother with the relatively
  * expensive has_legal_joinclause test.)
  */
 static bool
@@ -886,3 +1019,42 @@ has_legal_joinclause(PlannerInfo *root, RelOptInfo *rel)
 
 	return false;
 }
+
+
+/*
+ * is_dummy_rel --- has relation been proven empty?
+ *
+ * If so, it will have a single path that is dummy.
+ */
+static bool
+is_dummy_rel(RelOptInfo *rel)
+{
+	return (rel->cheapest_total_path != NULL &&
+			IS_DUMMY_PATH(rel->cheapest_total_path));
+}
+
+/*
+ * Mark a joinrel as proven empty.
+ */
+static void
+mark_dummy_join(PlannerInfo *root, RelOptInfo *rel)
+{
+	/* Set dummy size estimate */
+	rel->rows = 0;
+
+	/* Evict any previously chosen paths */
+	rel->pathlist = NIL;
+
+	/* Set up the dummy path */
+	add_path(root, rel, (Path *) create_append_path(root, rel, NIL));
+
+	/* The dummy path doesn't need deduplication */
+	rel->dedup_info = NULL;
+
+	/*
+	 * Although set_cheapest will be done again later, we do it immediately
+	 * in order to keep is_dummy_rel as cheap as possible (ie, not have
+	 * to examine the pathlist).
+	 */
+	set_cheapest(root, rel);
+}
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index a77c8cb3659f..7e2fbafa5761 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/orindxpath.c,v 1.82 2007/01/05 22:19:31 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/orindxpath.c,v 1.84.2.1 2009/04/16 20:42:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -89,18 +89,26 @@ create_or_index_quals(PlannerInfo *root, RelOptInfo *rel)
 	ListCell   *i;
 
 	/*
-	 * Find potentially interesting OR joinclauses.  Note we must ignore any
-	 * joinclauses that are marked outerjoin_delayed, because they cannot be
-	 * pushed down to the per-relation level due to outer-join rules. (XXX in
-	 * some cases it might be possible to allow this, but it would require
-	 * substantially more bookkeeping about where the clause came from.)
+	 * Find potentially interesting OR joinclauses.
+	 *
+	 * We must ignore clauses for which the target rel is in nullable_relids;
+	 * that means there's an outer join below the clause and so it can't be
+	 * enforced at the relation scan level.
+	 *
+	 * We must also ignore clauses that are marked !is_pushed_down (ie they
+	 * are themselves outer-join clauses).  It would be safe to extract an
+	 * index condition from such a clause if we are within the nullable rather
+	 * than the non-nullable side of its join, but we haven't got enough
+	 * context here to tell which applies.  OR clauses in outer-join quals
+	 * aren't exactly common, so we'll let that case go unoptimized for now.
 	 */
 	foreach(i, rel->joininfo)
 	{
 		RestrictInfo *rinfo = (RestrictInfo *) lfirst(i);
 
 		if (restriction_is_or_clause(rinfo) &&
-			!rinfo->outerjoin_delayed)
+			rinfo->is_pushed_down &&
+			!bms_is_member(rel->relid, rinfo->nullable_relids))
 		{
 			/*
 			 * Use the generate_bitmap_or_paths() machinery to estimate the
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index 50d8b73ce442..b05606216d1e 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -12,13 +12,14 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/pathkeys.c,v 1.83 2007/01/21 00:57:15 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/pathkeys.c,v 1.93.2.1 2009/07/17 23:20:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "access/skey.h"
+#include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
 #include "nodes/plannodes.h"
 #include "optimizer/clauses.h"
@@ -37,13 +38,6 @@
 #include "cdb/cdbdef.h"         /* CdbSwap() */
 #include "cdb/cdbpullup.h"      /* cdbpullup_expr(), cdbpullup_make_var() */
 
-/*
- * If an EC contains a const and isn't below-outer-join, any PathKey depending
- * on it must be redundant, since there's only one possible value of the key.
- */
-#define MUST_BE_REDUNDANT(eclass)  \
-	((eclass)->ec_has_const && !(eclass)->ec_below_outer_join)
-
 static PathKey *make_canonical_pathkey(PlannerInfo *root,
 					   EquivalenceClass *eclass, Oid opfamily,
 					   int strategy, bool nulls_first);
@@ -51,7 +45,9 @@ static bool pathkey_is_redundant(PathKey *new_pathkey, List *pathkeys);
 static PathKey *make_pathkey_from_sortinfo(PlannerInfo *root,
 						   Expr *expr, Oid ordering_op,
 						   bool nulls_first,
+						   Index sortref,
 						   bool canonicalize);
+static bool right_merge_direction(PlannerInfo *root, PathKey *pathkey);
 
 
 /****************************************************************************
@@ -69,7 +65,7 @@ PathKey *
 makePathKey(EquivalenceClass *eclass, Oid opfamily,
 			int strategy, bool nulls_first)
 {
-	PathKey	   *pk = makeNode(PathKey);
+	PathKey    *pk = makeNode(PathKey);
 
 	pk->pk_eclass = eclass;
 	pk->pk_opfamily = opfamily;
@@ -113,239 +109,165 @@ replace_expression_mutator(Node *node, void *context)
 }
 
 /**
- * Do relations in qualscope fall on the nullable side of an outer join?
- */
-static bool
-isBelowNullableSideOfOuterJoin( PlannerInfo *root, Relids qualscope)
-{
-    ListCell *curOuterJoinInfo;
-
-    foreach(curOuterJoinInfo, root->oj_info_list)
-    {
-        OuterJoinInfo * oj = (OuterJoinInfo *) lfirst(curOuterJoinInfo);
-        if (bms_overlap(qualscope, oj->syn_righthand))
-            return true;
-
-        if (oj->join_type == JOIN_FULL &&
-            bms_overlap(qualscope, oj->syn_lefthand))
-            return true;
-    }
-
-    return false;
-}
-
-/**
- * Iterate on the given list of restrict infos, and build a new list that contains
- * only the elements that have outerjoin_delayed= false
- */
-static List *remove_outer_join_restrict_infos(List *restrictinfolist)
-{
-	List *newlist = NIL;
-
-	ListCell *lc = NULL;
-	foreach (lc, restrictinfolist)
-	{
-		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
-		if (!rinfo->outerjoin_delayed)
-		{
-			newlist = lappend(newlist, rinfo);
-		}
-	}
-
-	return newlist;
-}
-
-/**
- * Given an equivalence class, extract out all the relevant known clauses.
- * This is done by finding all relations represented in the equivalence class.
- * Then, we extract out all the restrictinfos from these relations and find
- * the additional relations mentioned in these clauses. These restrictinfo
- * clauses are appended into one big list
+ * Generate implied qual
  * Input:
  * 	root - planner information
- * 	eclass - equivalence class
+ * 	old_rinfo - old clause to infer from
+ * 	old_expr - the expression to be replaced
+ * 	new_expr - new expression replacing it
  */
-static List *relevant_known_clauses(PlannerInfo *root, EquivalenceClass *eclass)
+static void
+gen_implied_qual(PlannerInfo *root,
+				 RestrictInfo *old_rinfo,
+				 Node *old_expr,
+				 Node *new_expr)
 {
-	/**
-	 * Find all the relevant relids from pathkey list and corresponding restrict
-	 * infos.
-	 */
-	Relids relevant_relids;
+	Node	   *new_clause;
+	ReplaceExpressionMutatorReplacement ctx;
+	Relids		new_qualscope;
+	ListCell   *lc;
+	RestrictInfo *new_rinfo;
+	Relids		required_relids;
 
-	/**
-	 * Find the restrictinfos for every relation that has an equivalence member
-	 * and then extract out these relids as well
+	/* Expression types must match */
+	Assert(exprType(old_expr) == exprType(new_expr)
+			&& exprTypmod(old_expr) == exprTypmod(new_expr));
+
+	/*
+	 * Clone the clause, replacing first node with the second.
 	 */
-	int relid;
-	Relids iter;
+	ctx.replaceThis = old_expr;
+	ctx.withThis = new_expr;
+	ctx.numReplacementsDone = 0;
+	new_clause = (Node *) replace_expression_mutator((Node*) old_rinfo->clause, &ctx);
 
-	relevant_relids = bms_copy(eclass->ec_relids);
+	if (ctx.numReplacementsDone == 0)
+		return;
 
-	iter = bms_copy(eclass->ec_relids);
-	while ((relid = bms_first_member(iter)) >= 0)
-	{
-		RelOptInfo *rel1 = find_base_rel(root, relid);
+	new_qualscope = pull_varnos(new_clause);
 
-		List *restrictinfolist = list_union(rel1->baserestrictinfo, remove_outer_join_restrict_infos(rel1->joininfo));
-		List *restrictlistclauses = list_union(
-				extract_actual_clauses(restrictinfolist, true),
-				extract_actual_clauses(restrictinfolist, false)
-		);
+	/* distribute_qual_to_rels doesn't accept pseudoconstants? XXX: doesn't it? */
+	if (new_qualscope == NULL)
+		return;
 
-		relevant_relids = bms_union(relevant_relids, pull_varnos((Node *) restrictlistclauses));
-	}
-	bms_free(iter);
+	if (subexpression_match((Expr *) new_expr, old_rinfo->clause))
+		return;
 
-	/**
-	 * Build a list of clauses by iterating over all relevant relations
+	/* No inferences may be performed across an outer join */
+	if (old_rinfo->ojscope_relids && !bms_is_subset(new_qualscope, old_rinfo->ojscope_relids))
+		return;
+
+	/*
+	 * Have we seen this clause before? This is needed to avoid infinite recursion.
 	 */
-	List *relevant_clauses = NIL;
-	while ((relid = bms_first_member(relevant_relids)) >= 0)
+	foreach (lc, root->non_eq_clauses)
 	{
-		RelOptInfo *rel1 = find_base_rel(root, relid);
-
-		List *restrictinfolist = list_union(rel1->baserestrictinfo, remove_outer_join_restrict_infos(rel1->joininfo));
-		List *restrictlistclauses = list_union(
-				extract_actual_clauses(restrictinfolist, true),
-				extract_actual_clauses(restrictinfolist, false)
-		);
-		relevant_clauses = list_concat(relevant_clauses, restrictlistclauses);
-	}
-	bms_free(relevant_relids);
-
-	return relevant_clauses;
-}
+		RestrictInfo *r = (RestrictInfo *) lfirst(lc);
 
-/**
- * Generate implied qual
- * Input:
- * 	root - planner information
- * 	relevant_clauses - all previously known clauses
- * 	old_clause - old clause to infer from
- * 	old_pk - the pathkey item to be replaced
- * 	new_pk - new pathkey item replacing it
- * Output:
- *  New list of relevant clauses
- */
-static List *gen_implied_qual(PlannerInfo *root,
-		List *relevant_clauses, /* This list may be modified */
-		Node *old_clause,
-		Node *old_pk,
-		Node *new_pk
-		)
-{
-
-	/* Expression types must match */
-	Assert(exprType(old_pk) == exprType(new_pk)
-			&& exprTypmod(old_pk) == exprTypmod(new_pk));
+		if (equal(r->clause, new_clause))
+			return;
+	}
 
-	/* clone the clause, replacing first node with
-	 *    clone of second
+	/*
+	 * Ok, we're good to go. Construct a new RestrictInfo, and pass it to
+	 * distribute_to_rels(). This is a cut-down version of distribute_qual_to_rels():
+	 * We know the qual is not useful for the equivalence class machinery,
+	 * because it's derived from a clause that wasn't either.
 	 */
-	ReplaceExpressionMutatorReplacement ctx;
-	ctx.replaceThis = old_pk;
-	ctx.withThis = new_pk;
-	ctx.numReplacementsDone = 0;
-	Node *new_clause = (Node*) replace_expression_mutator(
-			(Node*)old_clause, &ctx);
-
-	Relids old_qualscope = pull_varnos(old_clause);
-	Relids new_qualscope = pull_varnos(new_clause);
+	required_relids = bms_union(new_qualscope, old_rinfo->ojscope_relids);
 
-	bool inferrable = new_qualscope != NULL /* distribute_qual_to_rels doesn't accept pseudoconstants */
-			&& (ctx.numReplacementsDone > 0)
-			&& !list_member(relevant_clauses, new_clause)
-			&& !subexpression_match((Expr *) new_pk, (Expr *) old_clause);
+	new_rinfo = make_restrictinfo((Expr *) new_clause,
+								  old_rinfo->is_pushed_down,
+								  old_rinfo->outerjoin_delayed,
+								  old_rinfo->pseudoconstant,
+								  required_relids,
+								  old_rinfo->nullable_relids,
+								  old_rinfo->ojscope_relids);
 
-	/**
-	 * No inferences may be performed across an outer join
+	/*
+	 * If it's a join clause (either naturally, or because delayed by
+	 * outer-join rules), add vars used in the clause to targetlists of their
+	 * relations, so that they will be emitted by the plan nodes that scan
+	 * those relations (else they won't be available at the join node!).
 	 */
-	inferrable = inferrable
-			&& !isBelowNullableSideOfOuterJoin(root, old_qualscope)
-			&& !isBelowNullableSideOfOuterJoin(root, new_qualscope);
-
-	if (inferrable)
+	if (bms_membership(new_qualscope) == BMS_MULTIPLE)
 	{
-		distribute_qual_to_rels(root, new_clause,
-				true, /* is_deduced */
-				true, /* is_deduced_but_not_equijoin */
-				false,
-				new_qualscope, /* qualscope */
-				NULL, /* ojscope */
-				NULL, /* outerjoin_nonnullable */
-				NULL /* postponed_qual_list */
-		);
-		relevant_clauses = lappend(relevant_clauses, new_clause);
+		List	   *vars = pull_var_clause(new_clause, false);
+
+		add_vars_to_targetlist(root, vars, required_relids);
+		list_free(vars);
 	}
 
-	return relevant_clauses;
+	distribute_restrictinfo_to_rels(root, new_rinfo);
 }
 
 /**
- * Generate all qualifications that are implied by the equivalence specified
- *   by the given pathkey list
+ * Generate all qualifications that are implied by the given RestrictInfo and
+ * the equivalence classes.
+
  * Input:
  * - root: planner info structure
- * - lpkitems: list of equivalent pathkey items
+ * - rinfo: clause to derive more quals from.
  */
 static void
-gen_implied_quals_for_eclass(PlannerInfo *root, EquivalenceClass *eclass)
+gen_implied_quals(PlannerInfo *root, RestrictInfo *rinfo)
 {
-	List *relevant_clauses = relevant_known_clauses(root, eclass);
+	ListCell	*lcec;
 
 	/*
-	 * For every triple (em1, clause, em2), we try to replace em1 in clause
-	 * with em2 and add it as an inferred clause since em1 = em2
+	 * Is it safe to infer from this clause?
 	 */
-    ListCell     *lcem1;
-    foreach(lcem1, eclass->ec_members)
-    {
-		EquivalenceMember *em1 = (EquivalenceMember *) lfirst(lcem1);
+	if (contain_volatile_functions((Node *) rinfo->clause) ||
+		contain_subplans((Node *) rinfo->clause))
+	{
+		return;
+	}
 
-		/*
-		 * Only look at equivalence members that correspond to a single relation
-		 */
-		if (bms_membership(em1->em_relids) == BMS_SINGLETON)
-    	{
-			/*
-			 * Iterate over all clauses
-			 */
-			ListCell   *lcclause;
-			foreach(lcclause, relevant_clauses)
-    		{
-    			Node *old_clause = (Node *) lfirst(lcclause);
+	/*
+	 * Find every equivalence class that's relevant for this RestrictInfo.
+	 *
+	 * Relevant means that some member of the equivalence class appears
+	 * in the clause, that we can replace it with another member.
+	 */
+	foreach(lcec, root->eq_classes)
+	{
+		EquivalenceClass *eclass = (EquivalenceClass *) lfirst(lcec);
+		ListCell   *lcem1;
 
-				/*
-				 * Is it safe to infer from old_clause?
-				 */
-				bool safe_to_infer =
-					!contain_volatile_functions(old_clause)
-					&& !contain_subplans(old_clause);
+		/* Single-member ECs won't generate any deductions */
+		if (list_length(eclass->ec_members) <= 1)
+			continue;
 
-				if (safe_to_infer)
-				{
-					ListCell *lcem2;
+		if (!bms_overlap(eclass->ec_relids, rinfo->clause_relids))
+			continue; /* none of the members can appear in the clause */
 
-					/* now try to apply to others in the equivalence class */
-					foreach(lcem2, eclass->ec_members)
-    				{
-						EquivalenceMember *em2 = (EquivalenceMember *) lfirst(lcem2);
+		foreach(lcem1, eclass->ec_members)
+		{
+			EquivalenceMember *em1 = (EquivalenceMember *) lfirst(lcem1);
+			ListCell *lcem2;
 
-						if (exprType((Node *) em1->em_expr) == exprType((Node *) em2->em_expr)
-							&& exprTypmod((Node *)em1->em_expr) == exprTypmod((Node *)em2->em_expr))
-						{
-							relevant_clauses = gen_implied_qual(root,
-																relevant_clauses,
-																old_clause,
-																(Node *)em1->em_expr,
-																(Node *)em2->em_expr);
-						}
-					} /* foreach lcem2 */
-				} /* safe_to_infer */
-			} /* foreach lcclause */
-		} /* BMS_SINGLETON */
-	} /* foreach lcem1 */
+			if (!bms_overlap(em1->em_relids, rinfo->clause_relids))
+				continue; /* this member cannot appear in the clause */
+
+			/* now try to apply to others in the equivalence class */
+			foreach(lcem2, eclass->ec_members)
+			{
+				EquivalenceMember *em2 = (EquivalenceMember *) lfirst(lcem2);
+
+				if (em2 == em1)
+					continue;
+
+				if (exprType((Node *) em1->em_expr) == exprType((Node *) em2->em_expr)
+					&& exprTypmod((Node *)em1->em_expr) == exprTypmod((Node *)em2->em_expr))
+				{
+					gen_implied_qual(root,
+									 rinfo,
+									 (Node *) em1->em_expr,
+									 (Node *) em2->em_expr);
+				}
+			}
+		}
+	}
 }
 
 /* TODO:
@@ -364,19 +286,16 @@ generate_implied_quals(PlannerInfo *root)
     if (!root->config->gp_enable_predicate_propagation)
         return;
 
-    /* generate using the query-global equivalence classes */
-	foreach(lc, root->eq_classes)
+	foreach (lc, root->non_eq_clauses)
 	{
-		EquivalenceClass *ec = (EquivalenceClass *) lfirst(lc);
+		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
 
-		Assert(ec->ec_merged == NULL);		/* else shouldn't be in list */
-		Assert(!ec->ec_broken);				/* not yet anyway... */
+		gen_implied_quals(root, rinfo);
 
-		/* Single-member ECs won't generate any deductions */
-		if (list_length(ec->ec_members) <= 1)
-			continue;
-
-        gen_implied_quals_for_eclass(root, ec);
+		/*
+		 * NOTE: gen_implied_quals() can append more quals to the list!
+		 * We will process those as well, as we iterate.
+		 */
 	}
 }
 
@@ -394,7 +313,7 @@ make_canonical_pathkey(PlannerInfo *root,
 					   EquivalenceClass *eclass, Oid opfamily,
 					   int strategy, bool nulls_first)
 {
-	PathKey	   *pk;
+	PathKey    *pk;
 	ListCell   *lc;
 	MemoryContext oldcontext;
 
@@ -466,13 +385,13 @@ pathkey_is_redundant(PathKey *new_pathkey, List *pathkeys)
 	Assert(!new_ec->ec_merged);
 
 	/* Check for EC containing a constant --- unconditionally redundant */
-	if (MUST_BE_REDUNDANT(new_ec))
+	if (EC_MUST_BE_REDUNDANT(new_ec))
 		return true;
 
 	/* If same EC already used in list, then redundant */
 	foreach(lc, pathkeys)
 	{
-		PathKey	   *old_pathkey = (PathKey *) lfirst(lc);
+		PathKey    *old_pathkey = (PathKey *) lfirst(lc);
 
 		/* Assert we've been given canonical pathkeys */
 		Assert(!old_pathkey->pk_eclass->ec_merged);
@@ -499,9 +418,9 @@ canonicalize_pathkeys(PlannerInfo *root, List *pathkeys)
 
 	foreach(l, pathkeys)
 	{
-		PathKey	   *pathkey = (PathKey *) lfirst(l);
+		PathKey    *pathkey = (PathKey *) lfirst(l);
 		EquivalenceClass *eclass;
-		PathKey	   *cpathkey;
+		PathKey    *cpathkey;
 
 		/* Find the canonical (merged) EquivalenceClass */
 		eclass = pathkey->pk_eclass;
@@ -513,7 +432,7 @@ canonicalize_pathkeys(PlannerInfo *root, List *pathkeys)
 		 * pathkey_is_redundant would notice that, but we needn't even bother
 		 * constructing the node...
 		 */
-		if (MUST_BE_REDUNDANT(eclass))
+		if (EC_MUST_BE_REDUNDANT(eclass))
 			continue;
 
 		/* OK, build a canonicalized PathKey struct */
@@ -536,6 +455,9 @@ canonicalize_pathkeys(PlannerInfo *root, List *pathkeys)
  *	  a PathKey.  If canonicalize = true, the result is a "canonical"
  *	  PathKey, otherwise not.  (But note it might be redundant anyway.)
  *
+ * If the PathKey is being generated from a SortClause, sortref should be
+ * the SortClause's SortGroupRef; otherwise zero.
+ *
  * canonicalize should always be TRUE after EquivalenceClass merging has
  * been performed, but FALSE if we haven't done EquivalenceClass merging yet.
  */
@@ -543,6 +465,7 @@ static PathKey *
 make_pathkey_from_sortinfo(PlannerInfo *root,
 						   Expr *expr, Oid ordering_op,
 						   bool nulls_first,
+						   Index sortref,
 						   bool canonicalize)
 {
 	Oid			opfamily,
@@ -553,13 +476,13 @@ make_pathkey_from_sortinfo(PlannerInfo *root,
 	EquivalenceClass *eclass;
 
 	/*
-	 * An ordering operator fully determines the behavior of its opfamily,
-	 * so could only meaningfully appear in one family --- or perhaps two
-	 * if one builds a reverse-sort opfamily, but there's not much point in
-	 * that anymore.  But EquivalenceClasses need to contain opfamily lists
-	 * based on the family membership of equality operators, which could
-	 * easily be bigger.  So, look up the equality operator that goes with
-	 * the ordering operator (this should be unique) and get its membership.
+	 * An ordering operator fully determines the behavior of its opfamily, so
+	 * could only meaningfully appear in one family --- or perhaps two if one
+	 * builds a reverse-sort opfamily, but there's not much point in that
+	 * anymore.  But EquivalenceClasses need to contain opfamily lists based
+	 * on the family membership of equality operators, which could easily be
+	 * bigger.	So, look up the equality operator that goes with the ordering
+	 * operator (this should be unique) and get its membership.
 	 */
 
 	/* Find the operator in pg_amop --- failure shouldn't happen */
@@ -580,8 +503,34 @@ make_pathkey_from_sortinfo(PlannerInfo *root,
 		elog(ERROR, "could not find opfamilies for ordering operator %u",
 			 ordering_op);
 
+	/*
+	 * When dealing with binary-compatible opclasses, we have to ensure that
+	 * the exposed type of the expression tree matches the declared input type
+	 * of the opclass, except when that is a polymorphic type (compare the
+	 * behavior of parse_coerce.c).  This ensures that we can correctly match
+	 * the indexkey or sortclause expression to other expressions we find in
+	 * the query, because arguments of ordinary operator expressions will be
+	 * cast that way.  (We have to do this for indexkeys because they are
+	 * represented without any explicit relabel in pg_index, and for sort
+	 * clauses because the parser is likewise cavalier about putting relabels
+	 * on them.)
+	 */
+	if (exprType((Node *) expr) != opcintype &&
+		!IsPolymorphicType(opcintype))
+	{
+		/* Strip any existing RelabelType, and add a new one if needed */
+		while (expr && IsA(expr, RelabelType))
+			expr = (Expr *) ((RelabelType *) expr)->arg;
+		if (exprType((Node *) expr) != opcintype)
+			expr = (Expr *) makeRelabelType(expr,
+											opcintype,
+											-1,
+											COERCE_DONTCARE);
+	}
+
 	/* Now find or create a matching EquivalenceClass */
-	eclass = get_eclass_for_sort_expr(root, expr, opcintype, opfamilies);
+	eclass = get_eclass_for_sort_expr(root, expr, opcintype, opfamilies,
+									  sortref);
 
 	/* And finally we can find or create a PathKey node */
 	if (canonicalize)
@@ -613,8 +562,8 @@ compare_pathkeys(List *keys1, List *keys2)
 
 	forboth(key1, keys1, key2, keys2)
 	{
-		PathKey	   *pathkey1 = (PathKey *) lfirst(key1);
-		PathKey	   *pathkey2 = (PathKey *) lfirst(key2);
+		PathKey    *pathkey1 = (PathKey *) lfirst(key1);
+		PathKey    *pathkey2 = (PathKey *) lfirst(key2);
 
 		/*
 		 * XXX would like to check that we've been given canonicalized input,
@@ -767,7 +716,7 @@ build_index_pathkeys(PlannerInfo *root,
 		bool		nulls_first;
 		int			ikey;
 		Expr	   *indexkey;
-		PathKey	   *cpathkey;
+		PathKey    *cpathkey;
 
 		if (ScanDirectionIsBackward(scandir))
 		{
@@ -803,6 +752,7 @@ build_index_pathkeys(PlannerInfo *root,
 											  indexkey,
 											  sortop,
 											  nulls_first,
+											  0,
 											  true);
 
 		/* Add to list unless redundant */
@@ -872,105 +822,165 @@ convert_subquery_pathkeys(PlannerInfo *root, RelOptInfo *rel,
 
 	foreach(i, subquery_pathkeys)
 	{
-		PathKey	   *sub_pathkey = (PathKey *) lfirst(i);
+		PathKey    *sub_pathkey = (PathKey *) lfirst(i);
 		EquivalenceClass *sub_eclass = sub_pathkey->pk_eclass;
-		PathKey	   *best_pathkey = NULL;
-		int			best_score = -1;
-		ListCell   *j;
+		PathKey    *best_pathkey = NULL;
 
-		/*
-		 * The sub_pathkey's EquivalenceClass could contain multiple elements
-		 * (representing knowledge that multiple items are effectively equal).
-		 * Each element might match none, one, or more of the output columns
-		 * that are visible to the outer query. This means we may have
-		 * multiple possible representations of the sub_pathkey in the context
-		 * of the outer query.  Ideally we would generate them all and put
-		 * them all into an EC of the outer query, thereby propagating
-		 * equality knowledge up to the outer query.  Right now we cannot do
-		 * so, because the outer query's EquivalenceClasses are already frozen
-		 * when this is called. Instead we prefer the one that has the highest
-		 * "score" (number of EC peers, plus one if it matches the outer
-		 * query_pathkeys). This is the most likely to be useful in the outer
-		 * query.
-		 */
-		foreach(j, sub_eclass->ec_members)
+		if (sub_eclass->ec_has_volatile)
 		{
-			EquivalenceMember *sub_member = (EquivalenceMember *) lfirst(j);
-			Expr	   *sub_expr = sub_member->em_expr;
-			Expr	   *rtarg;
-			ListCell   *k;
-
 			/*
-			 * We handle two cases: the sub_pathkey key can be either an exact
-			 * match for a targetlist entry, or a RelabelType of a targetlist
-			 * entry.  (The latter case is worth extra code because it arises
-			 * frequently in connection with varchar fields.)
+			 * If the sub_pathkey's EquivalenceClass is volatile, then it must
+			 * have come from an ORDER BY clause, and we have to match it to
+			 * that same targetlist entry.
 			 */
-			if (IsA(sub_expr, RelabelType))
-				rtarg = ((RelabelType *) sub_expr)->arg;
-			else
-				rtarg = NULL;
-
-			foreach(k, sub_tlist)
+			TargetEntry *tle;
+
+			if (sub_eclass->ec_sortref == 0)	/* can't happen */
+				elog(ERROR, "volatile EquivalenceClass has no sortref");
+			tle = get_sortgroupref_tle(sub_eclass->ec_sortref, sub_tlist);
+			Assert(tle);
+			/* resjunk items aren't visible to outer query */
+			if (!tle->resjunk)
 			{
-				TargetEntry *tle = (TargetEntry *) lfirst(k);
+				/* We can represent this sub_pathkey */
+				EquivalenceMember *sub_member;
 				Expr	   *outer_expr;
 				EquivalenceClass *outer_ec;
-				PathKey	   *outer_pk;
-				int			score;
 
-				/* resjunk items aren't visible to outer query */
-				if (tle->resjunk)
-					continue;
+				Assert(list_length(sub_eclass->ec_members) == 1);
+				sub_member = (EquivalenceMember *) linitial(sub_eclass->ec_members);
+				outer_expr = (Expr *)
+					makeVar(rel->relid,
+							tle->resno,
+							exprType((Node *) tle->expr),
+							exprTypmod((Node *) tle->expr),
+							0);
+				outer_ec =
+					get_eclass_for_sort_expr(root,
+											 outer_expr,
+											 sub_member->em_datatype,
+											 sub_eclass->ec_opfamilies,
+											 0);
+				best_pathkey =
+					make_canonical_pathkey(root,
+										   outer_ec,
+										   sub_pathkey->pk_opfamily,
+										   sub_pathkey->pk_strategy,
+										   sub_pathkey->pk_nulls_first);
+			}
+		}
+		else
+		{
+			/*
+			 * Otherwise, the sub_pathkey's EquivalenceClass could contain
+			 * multiple elements (representing knowledge that multiple items
+			 * are effectively equal).	Each element might match none, one, or
+			 * more of the output columns that are visible to the outer query.
+			 * This means we may have multiple possible representations of the
+			 * sub_pathkey in the context of the outer query.  Ideally we
+			 * would generate them all and put them all into an EC of the
+			 * outer query, thereby propagating equality knowledge up to the
+			 * outer query.  Right now we cannot do so, because the outer
+			 * query's EquivalenceClasses are already frozen when this is
+			 * called. Instead we prefer the one that has the highest "score"
+			 * (number of EC peers, plus one if it matches the outer
+			 * query_pathkeys). This is the most likely to be useful in the
+			 * outer query.
+			 */
+			int			best_score = -1;
+			ListCell   *j;
 
-				if (equal(tle->expr, sub_expr))
-				{
-					/* Exact match */
-					outer_expr = (Expr *)
-						makeVar(rel->relid,
-								tle->resno,
-								exprType((Node *) tle->expr),
-								exprTypmod((Node *) tle->expr),
-								0);
-				}
-				else if (rtarg && equal(tle->expr, rtarg))
-				{
-					/* Match after discarding RelabelType */
-					outer_expr = (Expr *)
-						makeVar(rel->relid,
-								tle->resno,
-								exprType((Node *) tle->expr),
-								exprTypmod((Node *) tle->expr),
-								0);
-					outer_expr = (Expr *)
-						makeRelabelType((Expr *) outer_expr,
-										((RelabelType *) sub_expr)->resulttype,
-									 ((RelabelType *) sub_expr)->resulttypmod,
-								   ((RelabelType *) sub_expr)->relabelformat);
-				}
-				else
-					continue;
+			foreach(j, sub_eclass->ec_members)
+			{
+				EquivalenceMember *sub_member = (EquivalenceMember *) lfirst(j);
+				Expr	   *sub_expr = sub_member->em_expr;
+				Expr	   *sub_stripped;
+				ListCell   *k;
+
+				/*
+				 * We handle two cases: the sub_pathkey key can be either an
+				 * exact match for a targetlist entry, or it could match after
+				 * stripping RelabelType nodes.  (We need that case since
+				 * make_pathkey_from_sortinfo could add or remove
+				 * RelabelType.)
+				 */
+				sub_stripped = sub_expr;
+				while (sub_stripped && IsA(sub_stripped, RelabelType))
+					sub_stripped = ((RelabelType *) sub_stripped)->arg;
 
-				/* Found a representation for this sub_pathkey */
-				outer_ec = get_eclass_for_sort_expr(root,
-													outer_expr,
-													sub_member->em_datatype,
-													sub_eclass->ec_opfamilies);
-				outer_pk = make_canonical_pathkey(root,
-												  outer_ec,
-												  sub_pathkey->pk_opfamily,
-												  sub_pathkey->pk_strategy,
-												  sub_pathkey->pk_nulls_first);
-				/* score = # of equivalence peers */
-				score = list_length(outer_ec->ec_members) - 1;
-				/* +1 if it matches the proper query_pathkeys item */
-				if (retvallen < outer_query_keys &&
-					list_nth(root->query_pathkeys, retvallen) == outer_pk)
-					score++;
-				if (score > best_score)
+				foreach(k, sub_tlist)
 				{
-					best_pathkey = outer_pk;
-					best_score = score;
+					TargetEntry *tle = (TargetEntry *) lfirst(k);
+					Expr	   *outer_expr;
+					EquivalenceClass *outer_ec;
+					PathKey    *outer_pk;
+					int			score;
+
+					/* resjunk items aren't visible to outer query */
+					if (tle->resjunk)
+						continue;
+
+					if (equal(tle->expr, sub_expr))
+					{
+						/* Exact match */
+						outer_expr = (Expr *)
+							makeVar(rel->relid,
+									tle->resno,
+									exprType((Node *) tle->expr),
+									exprTypmod((Node *) tle->expr),
+									0);
+					}
+					else
+					{
+						Expr	   *tle_stripped;
+
+						tle_stripped = tle->expr;
+						while (tle_stripped && IsA(tle_stripped, RelabelType))
+							tle_stripped = ((RelabelType *) tle_stripped)->arg;
+
+						if (equal(tle_stripped, sub_stripped))
+						{
+							/* Match after discarding RelabelType */
+							outer_expr = (Expr *)
+								makeVar(rel->relid,
+										tle->resno,
+										exprType((Node *) tle->expr),
+										exprTypmod((Node *) tle->expr),
+										0);
+							if (exprType((Node *) outer_expr) !=
+								exprType((Node *) sub_expr))
+								outer_expr = (Expr *)
+									makeRelabelType(outer_expr,
+												 exprType((Node *) sub_expr),
+													-1,
+													COERCE_DONTCARE);
+						}
+						else
+							continue;
+					}
+
+					/* Found a representation for this sub_pathkey */
+					outer_ec = get_eclass_for_sort_expr(root,
+														outer_expr,
+													 sub_member->em_datatype,
+												   sub_eclass->ec_opfamilies,
+														0);
+					outer_pk = make_canonical_pathkey(root,
+													  outer_ec,
+													sub_pathkey->pk_opfamily,
+													sub_pathkey->pk_strategy,
+												sub_pathkey->pk_nulls_first);
+					/* score = # of equivalence peers */
+					score = list_length(outer_ec->ec_members) - 1;
+					/* +1 if it matches the proper query_pathkeys item */
+					if (retvallen < outer_query_keys &&
+						list_nth(root->query_pathkeys, retvallen) == outer_pk)
+						score++;
+					if (score > best_score)
+					{
+						best_pathkey = outer_pk;
+						best_score = score;
+					}
 				}
 			}
 		}
@@ -1119,7 +1129,7 @@ cdb_make_pathkey_for_expr(PlannerInfo    *root,
 		if (strategy)
 			break;
 	}
-	eclass = get_eclass_for_sort_expr(root, (Expr *) expr, typeoid, mergeopfamilies);
+	eclass = get_eclass_for_sort_expr(root, (Expr *) expr, typeoid, mergeopfamilies, 0);
 	if (!canonical)
 		pk = makePathKey(eclass, opfamily, strategy, false);
 	else
@@ -1215,7 +1225,8 @@ cdb_pull_up_pathkey(PlannerInfo    *root,
 	outer_ec = get_eclass_for_sort_expr(root,
 										newexpr,
 										exprType((Node *) newexpr),
-										pathkey->pk_eclass->ec_opfamilies);
+										pathkey->pk_eclass->ec_opfamilies,
+										0);
 
     /* Find or create the equivalence class for the transformed expr. */
     return make_canonical_pathkey(root,
@@ -1259,13 +1270,14 @@ make_pathkeys_for_sortclauses(PlannerInfo *root,
 	{
 		SortClause *sortcl = (SortClause *) lfirst(l);
 		Expr	   *sortkey;
-		PathKey	   *pathkey;
+		PathKey    *pathkey;
 
 		sortkey = (Expr *) get_sortgroupclause_expr(sortcl, tlist);
 		pathkey = make_pathkey_from_sortinfo(root,
 											 sortkey,
 											 sortcl->sortop,
 											 sortcl->nulls_first,
+											 sortcl->tleSortGroupRef,
 											 canonicalize);
 
 		/* Canonical form eliminates redundant ordering keys */
@@ -1316,7 +1328,7 @@ make_pathkeys_for_groupclause(PlannerInfo *root,
 		{
 			GroupClause *gc = (GroupClause*) node;
 			sortkey = (Expr *) get_sortgroupclause_expr(gc, tlist);
-			pathkey = make_pathkey_from_sortinfo(root, sortkey, gc->sortop, gc->nulls_first, false);
+			pathkey = make_pathkey_from_sortinfo(root, sortkey, gc->sortop, gc->nulls_first, false, 0);
 
 			/*
 			 * Similar to SortClauses, the pathkey becomes a one-elment sublist.
@@ -1378,12 +1390,14 @@ cache_mergeclause_eclasses(PlannerInfo *root, RestrictInfo *restrictinfo)
 			get_eclass_for_sort_expr(root,
 									 (Expr *) get_leftop(clause),
 									 lefttype,
-									 restrictinfo->mergeopfamilies);
+									 restrictinfo->mergeopfamilies,
+									 0);
 		restrictinfo->right_ec =
 			get_eclass_for_sort_expr(root,
 									 (Expr *) get_rightop(clause),
 									 righttype,
-									 restrictinfo->mergeopfamilies);
+									 restrictinfo->mergeopfamilies,
+									 0);
 	}
 	else
 		Assert(restrictinfo->right_ec != NULL);
@@ -1427,7 +1441,7 @@ find_mergeclauses_for_pathkeys(PlannerInfo *root,
 
 	foreach(i, pathkeys)
 	{
-		PathKey	   *pathkey = (PathKey *) lfirst(i);
+		PathKey    *pathkey = (PathKey *) lfirst(i);
 		EquivalenceClass *pathkey_ec = pathkey->pk_eclass;
 		List	   *matched_restrictinfos = NIL;
 		ListCell   *j;
@@ -1451,12 +1465,21 @@ find_mergeclauses_for_pathkeys(PlannerInfo *root,
 		 * no two members have the same EC, so it's not possible for this
 		 * code to enter the same mergeclause into the result list twice.
 		 *
-		 * XXX it's possible that multiple matching clauses might have
-		 * different ECs on the other side, in which case the order we put
-		 * them into our result makes a difference in the pathkeys required
-		 * for the other input path.  However this routine hasn't got any info
-		 * about which order would be best, so for now we disregard that case
-		 * (which is probably a corner case anyway).
+		 * It's possible that multiple matching clauses might have different
+		 * ECs on the other side, in which case the order we put them into our
+		 * result makes a difference in the pathkeys required for the other
+		 * input path.  However this routine hasn't got any info about which
+		 * order would be best, so we don't worry about that.
+		 *
+		 * It's also possible that the selected mergejoin clauses produce
+		 * a noncanonical ordering of pathkeys for the other side, ie, we
+		 * might select clauses that reference b.v1, b.v2, b.v1 in that
+		 * order.  This is not harmful in itself, though it suggests that
+		 * the clauses are partially redundant.  Since it happens only with
+		 * redundant query conditions, we don't bother to eliminate it.
+		 * make_inner_pathkeys_for_merge() has to delete duplicates when
+		 * it constructs the canonical pathkeys list, and we also have to
+		 * deal with the case in create_mergejoin_plan().
 		 *----------
 		 */
 		foreach(j, restrictinfos)
@@ -1508,7 +1531,7 @@ find_mergeclauses_for_pathkeys(PlannerInfo *root,
  * Returns a pathkeys list that can be applied to the outer relation.
  *
  * Since we assume here that a sort is required, there is no particular use
- * in matching any available ordering of the outerrel.  (joinpath.c has an
+ * in matching any available ordering of the outerrel.	(joinpath.c has an
  * entirely separate code path for considering sort-free mergejoins.)  Rather,
  * it's interesting to try to match the requested query_pathkeys so that a
  * second output sort may be avoided; and failing that, we try to list "more
@@ -1583,16 +1606,15 @@ select_outer_pathkeys_for_merge(PlannerInfo *root,
 	}
 
 	/*
-	 * Find out if we have all the ECs mentioned in query_pathkeys; if so
-	 * we can generate a sort order that's also useful for final output.
-	 * There is no percentage in a partial match, though, so we have to
-	 * have 'em all.
+	 * Find out if we have all the ECs mentioned in query_pathkeys; if so we
+	 * can generate a sort order that's also useful for final output. There is
+	 * no percentage in a partial match, though, so we have to have 'em all.
 	 */
 	if (root->query_pathkeys)
 	{
 		foreach(lc, root->query_pathkeys)
 		{
-			PathKey	   *query_pathkey = (PathKey *) lfirst(lc);
+			PathKey    *query_pathkey = (PathKey *) lfirst(lc);
 			EquivalenceClass *query_ec = query_pathkey->pk_eclass;
 
 			for (j = 0; j < necs; j++)
@@ -1611,7 +1633,7 @@ select_outer_pathkeys_for_merge(PlannerInfo *root,
 			/* mark their ECs as already-emitted */
 			foreach(lc, root->query_pathkeys)
 			{
-				PathKey	   *query_pathkey = (PathKey *) lfirst(lc);
+				PathKey    *query_pathkey = (PathKey *) lfirst(lc);
 				EquivalenceClass *query_ec = query_pathkey->pk_eclass;
 
 				for (j = 0; j < necs; j++)
@@ -1627,16 +1649,16 @@ select_outer_pathkeys_for_merge(PlannerInfo *root,
 	}
 
 	/*
-	 * Add remaining ECs to the list in popularity order, using a default
-	 * sort ordering.  (We could use qsort() here, but the list length is
-	 * usually so small it's not worth it.)
+	 * Add remaining ECs to the list in popularity order, using a default sort
+	 * ordering.  (We could use qsort() here, but the list length is usually
+	 * so small it's not worth it.)
 	 */
 	for (;;)
 	{
-		int		best_j;
-		int		best_score;
+		int			best_j;
+		int			best_score;
 		EquivalenceClass *ec;
-		PathKey *pathkey;
+		PathKey    *pathkey;
 
 		best_j = 0;
 		best_score = scores[0];
@@ -1696,7 +1718,7 @@ make_inner_pathkeys_for_merge(PlannerInfo *root,
 {
 	List	   *pathkeys = NIL;
 	EquivalenceClass *lastoeclass;
-	PathKey	   *opathkey;
+	PathKey    *opathkey;
 	ListCell   *lc;
 	ListCell   *lop;
 
@@ -1709,7 +1731,7 @@ make_inner_pathkeys_for_merge(PlannerInfo *root,
 		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
 		EquivalenceClass *oeclass;
 		EquivalenceClass *ieclass;
-		PathKey	   *pathkey;
+		PathKey    *pathkey;
 
 		cache_mergeclause_eclasses(root, rinfo);
 
@@ -1782,6 +1804,13 @@ make_inner_pathkeys_for_merge(PlannerInfo *root,
  * overoptimistic, since joinclauses that require different other relations
  * might never be usable at the same time, but trying to be exact is likely
  * to be more trouble than it's worth.
+ *
+ * To avoid doubling the number of mergejoin paths considered, we would like
+ * to consider only one of the two scan directions (ASC or DESC) as useful
+ * for merging for any given target column.  The choice is arbitrary unless
+ * one of the directions happens to match an ORDER BY key, in which case
+ * that direction should be preferred, in hopes of avoiding a final sort step.
+ * right_merge_direction() implements this heuristic.
  */
 int
 pathkeys_useful_for_merging(PlannerInfo *root, RelOptInfo *rel, List *pathkeys)
@@ -1791,10 +1820,14 @@ pathkeys_useful_for_merging(PlannerInfo *root, RelOptInfo *rel, List *pathkeys)
 
 	foreach(i, pathkeys)
 	{
-		PathKey	   *pathkey = (PathKey *) lfirst(i);
+		PathKey    *pathkey = (PathKey *) lfirst(i);
 		bool		matched = false;
 		ListCell   *j;
 
+		/* If "wrong" direction, not useful for merging */
+		if (!right_merge_direction(root, pathkey))
+			break;
+
 		/*
 		 * First look into the EquivalenceClass of the pathkey, to see if
 		 * there are any members not yet joined to the rel.  If so, it's
@@ -1841,6 +1874,38 @@ pathkeys_useful_for_merging(PlannerInfo *root, RelOptInfo *rel, List *pathkeys)
 	return useful;
 }
 
+/*
+ * right_merge_direction
+ *		Check whether the pathkey embodies the preferred sort direction
+ *		for merging its target column.
+ */
+static bool
+right_merge_direction(PlannerInfo *root, PathKey *pathkey)
+{
+	ListCell   *l;
+
+	foreach(l, root->query_pathkeys)
+	{
+		PathKey    *query_pathkey = (PathKey *) lfirst(l);
+
+		if (pathkey->pk_eclass == query_pathkey->pk_eclass &&
+			pathkey->pk_opfamily == query_pathkey->pk_opfamily)
+		{
+			/*
+			 * Found a matching query sort column.	Prefer this pathkey's
+			 * direction iff it matches.  Note that we ignore pk_nulls_first,
+			 * which means that a sort might be needed anyway ... but we still
+			 * want to prefer only one of the two possible directions, and we
+			 * might as well use this one.
+			 */
+			return (pathkey->pk_strategy == query_pathkey->pk_strategy);
+		}
+	}
+
+	/* If no matching ORDER BY request, prefer the ASC direction */
+	return (pathkey->pk_strategy == BTLessStrategyNumber);
+}
+
 /*
  * pathkeys_useful_for_ordering
  *		Count the number of pathkeys that are useful for meeting the
@@ -1889,8 +1954,35 @@ truncate_useless_pathkeys(PlannerInfo *root,
 	 * Note: not safe to modify input list destructively, but we can avoid
 	 * copying the list if we're not actually going to change it
 	 */
-	if (nuseful == list_length(pathkeys))
+	if (nuseful == 0)
+		return NIL;
+	else if (nuseful == list_length(pathkeys))
 		return pathkeys;
 	else
 		return list_truncate(list_copy(pathkeys), nuseful);
 }
+
+/*
+ * has_useful_pathkeys
+ *		Detect whether the specified rel could have any pathkeys that are
+ *		useful according to truncate_useless_pathkeys().
+ *
+ * This is a cheap test that lets us skip building pathkeys at all in very
+ * simple queries.	It's OK to err in the direction of returning "true" when
+ * there really aren't any usable pathkeys, but erring in the other direction
+ * is bad --- so keep this in sync with the routines above!
+ *
+ * We could make the test more complex, for example checking to see if any of
+ * the joinclauses are really mergejoinable, but that likely wouldn't win
+ * often enough to repay the extra cycles.	Queries with neither a join nor
+ * a sort are reasonably common, though, so this much work seems worthwhile.
+ */
+bool
+has_useful_pathkeys(PlannerInfo *root, RelOptInfo *rel)
+{
+	if (rel->joininfo != NIL || rel->has_eclass_joins)
+		return true;			/* might be able to use pathkeys for merging */
+	if (root->query_pathkeys != NIL)
+		return true;			/* might be able to use them for ordering */
+	return false;				/* definitely useless */
+}
diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c
index 6476ee072846..8e05f5a50f3a 100644
--- a/src/backend/optimizer/path/tidpath.c
+++ b/src/backend/optimizer/path/tidpath.c
@@ -12,6 +12,12 @@
  * this allows
  *		WHERE ctid IN (tid1, tid2, ...)
  *
+ * We also support "WHERE CURRENT OF cursor" conditions (CurrentOfExpr),
+ * which amount to "CTID = run-time-determined-TID".  These could in
+ * theory be translated to a simple comparison of CTID to the result of
+ * a function, but in practice it works better to keep the special node
+ * representation all the way through to execution.
+ *
  * There is currently no special support for joins involving CTID; in
  * particular nothing corresponding to best_inner_indexscan().	Since it's
  * not very useful to store TIDs of one table in another table, there
@@ -25,7 +31,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/tidpath.c,v 1.29 2007/01/05 22:19:31 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/tidpath.c,v 1.31 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -178,8 +184,8 @@ TidQualFromExpr(Node *expr, int varno)
 	else if (expr && IsA(expr, CurrentOfExpr))
 	{
 		/* another base case: check for CURRENT OF on this rel */
-		Insist(((CurrentOfExpr *) expr)->cvarno == varno);
-		rlst = list_make1(expr);
+		if (((CurrentOfExpr *) expr)->cvarno == varno)
+			rlst = list_make1(expr);
 	}
 	else if (and_clause(expr))
 	{
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 37547463e7e6..0bea5afff03f 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.225 2007/02/19 02:23:12 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.237.2.2 2009/07/17 23:20:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,7 @@
 #include <limits.h>
 
 #include "catalog/pg_type.h"    /* INT8OID */
+#include "access/skey.h"
 #include "nodes/makefuncs.h"
 #include "executor/execHHashagg.h"
 #include "optimizer/clauses.h"
@@ -160,7 +161,8 @@ static ValuesScan *make_valuesscan(List *qptlist, List *qpqual,
 static BitmapAnd *make_bitmap_and(List *bitmapplans);
 static BitmapOr *make_bitmap_or(List *bitmapplans);
 static Sort *make_sort(PlannerInfo *root, Plan *lefttree, int numCols,
-		  AttrNumber *sortColIdx, Oid *sortOperators, bool *nullsFirst);
+		  AttrNumber *sortColIdx, Oid *sortOperators, bool *nullsFirst,
+		  double limit_tuples);
 static List *flatten_grouping_list(List *groupcls);
 
 
@@ -585,7 +587,8 @@ create_gating_plan(PlannerInfo *root, Plan *plan, List *quals)
 	if (!pseudoconstants)
 		return plan;
 
-	return (Plan *) make_result((List *) copyObject(plan->targetlist),
+	return (Plan *) make_result(root,
+								plan->targetlist,
 								(Node *) pseudoconstants,
 								plan);
 }
@@ -708,7 +711,8 @@ create_append_plan(PlannerInfo *root, AppendPath *best_path)
 	if (best_path->subpaths == NIL)
 	{
 		/* Generate a Result plan with constant-FALSE gating qual */
-		return (Plan *) make_result(tlist,
+		return (Plan *) make_result(root,
+									tlist,
 									(Node *) list_make1(makeBoolConst(false,
 																	  false)),
 									NULL);
@@ -748,7 +752,7 @@ create_result_plan(PlannerInfo *root, ResultPath *best_path)
 
 	quals = order_qual_clauses(root, best_path->quals);
 
-	return make_result(tlist, (Node *) quals, NULL);
+	return make_result(root, tlist, (Node *) quals, NULL);
 }
 
 /*
@@ -832,18 +836,24 @@ create_unique_plan(PlannerInfo *root, UniquePath *best_path)
 	 * add any such expressions to the subplan's tlist.
 	 *
 	 * The subplan may have a "physical" tlist if it is a simple scan plan.
-	 * This should be left as-is if we don't need to add any expressions;
+	 * If we're going to sort, this should be reduced to the regular tlist,
+	 * so that we don't sort more data than we need to.  For hashing, the
+	 * tlist should be left as-is if we don't need to add any expressions;
 	 * but if we do have to add expressions, then a projection step will be
-	 * needed at runtime anyway, and so we may as well remove unneeded items.
+	 * needed at runtime anyway, so we may as well remove unneeded items.
 	 * Therefore newtlist starts from build_relation_tlist() not just a
 	 * copy of the subplan's tlist; and we don't install it into the subplan
-	 * unless stuff has to be added.
+	 * unless we are sorting or stuff has to be added.
+	 *
+	 * To find the correct list of values to unique-ify, we look in the
+	 * information saved for IN expressions.  If this code is ever used in
+	 * other scenarios, some other way of finding what to unique-ify will
+	 * be needed.  The IN clause's operators are needed too, since they
+	 * determine what the meaning of "unique" is in this context.
 	 *----------
 	 */
 	uniq_exprs = best_path->distinct_on_exprs;  /*CDB*/
 	in_operators = best_path->distinct_on_eq_operators; /*CDB*/
-    Insist(uniq_exprs);
-    Insist(in_operators);
 
 	/* initialize modified subplan tlist as just the "required" vars */
 	newtlist = build_relation_tlist(best_path->path.parent);
@@ -868,12 +878,14 @@ create_unique_plan(PlannerInfo *root, UniquePath *best_path)
 		}
 	}
 
-	/*
-	 * If the top plan node can't do projections, we need to add a Result
-	 * node to help it along.
-	 */
-	if (newitems)
-		subplan = plan_pushdown_tlist(subplan, newtlist);
+	if (newitems || best_path->umethod == UNIQUE_PATH_SORT)
+	{
+		/*
+		 * If the top plan node can't do projections, we need to add a Result
+		 * node to help it along.
+		 */
+		subplan = plan_pushdown_tlist(root, subplan, newtlist);
+	}
 
 	/*
 	 * Build control information showing which subplan output columns are to
@@ -907,8 +919,8 @@ create_unique_plan(PlannerInfo *root, UniquePath *best_path)
 		/*
 		 * Get the hashable equality operators for the Agg node to use.
 		 * Normally these are the same as the IN clause operators, but if
-		 * those are cross-type operators then the equality operators are
-		 * the ones for the IN clause operators' RHS datatype.
+		 * those are cross-type operators then the equality operators are the
+		 * ones for the IN clause operators' RHS datatype.
 		 */
 		groupOperators = (Oid *) palloc(numGroupCols * sizeof(Oid));
 		groupColPos = 0;
@@ -958,7 +970,7 @@ create_unique_plan(PlannerInfo *root, UniquePath *best_path)
 			SortClause *sortcl;
 
 			sortop = get_ordering_op_for_equality_op(in_oper, false);
-			if (!OidIsValid(sortop))		/* shouldn't happen */
+			if (!OidIsValid(sortop))	/* shouldn't happen */
 				elog(ERROR, "could not find ordering operator for equality operator %u",
 					 in_oper);
 			tle = get_tle_by_resno(subplan->targetlist,
@@ -2190,12 +2202,6 @@ create_bitmap_appendonly_scan_plan(PlannerInfo *root,
 	 */
 	bitmapqualorig = list_difference_ptr(bitmapqualorig, qpqual);
 
-	/*
-	 * Copy the finished bitmapqualorig to make sure we have an independent
-	 * copy --- needed in case there are subplans in the index quals
-	 */
-	bitmapqualorig = copyObject(bitmapqualorig);
-
 	/* Finally ready to build the plan node */
 	scan_plan = make_bitmap_appendonlyscan(tlist,
 										   qpqual,
@@ -2483,9 +2489,10 @@ static SubqueryScan *
 create_ctescan_plan(PlannerInfo *root, Path *best_path,
 					List *tlist, List *scan_clauses)
 {
-	Assert(best_path->parent->rtekind == RTE_CTE);
-
 	Index scan_relid = best_path->parent->relid;
+	SubqueryScan *scan_plan;
+
+	Assert(best_path->parent->rtekind == RTE_CTE);
 
 	Assert(scan_relid > 0);
 	
@@ -2495,11 +2502,11 @@ create_ctescan_plan(PlannerInfo *root, Path *best_path,
 	/* Sort clauses into best execution order */
 	scan_clauses = order_qual_clauses(root, scan_clauses);
 
-	SubqueryScan *scan_plan = make_subqueryscan(root, tlist,
-												scan_clauses,
-												scan_relid,
-												best_path->parent->subplan,
-												best_path->parent->subrtable);
+	scan_plan = make_subqueryscan(root, tlist,
+								  scan_clauses,
+								  scan_relid,
+								  best_path->parent->subplan,
+								  best_path->parent->subrtable);
 
 	copy_path_costsize(root, &scan_plan->scan.plan, best_path);
 
@@ -2521,7 +2528,7 @@ create_functionscan_plan(PlannerInfo *root, Path *best_path,
 
 	/* it should be a function base rel... */
 	Assert(scan_relid > 0);
-	rte = rt_fetch(scan_relid, root->parse->rtable);
+	rte = planner_rt_fetch(scan_relid, root);
 	Assert(rte->rtekind == RTE_FUNCTION);
 
 	/* Sort clauses into best execution order */
@@ -2591,7 +2598,7 @@ create_valuesscan_plan(PlannerInfo *root, Path *best_path,
 
 	/* it should be a values base rel... */
 	Assert(scan_relid > 0);
-	rte = rt_fetch(scan_relid, root->parse->rtable);
+	rte = planner_rt_fetch(scan_relid, root);
 	Assert(rte->rtekind == RTE_VALUES);
 
 	/* Sort clauses into best execution order */
@@ -2780,8 +2787,8 @@ create_nestloop_plan(PlannerInfo *root,
 		}
 		else
 		{
-			Assert(IsA(best_path->innerjoinpath, BitmapAppendOnlyPath));
 			BitmapAppendOnlyPath *innerpath = (BitmapAppendOnlyPath *) best_path->innerjoinpath;
+			Assert(IsA(best_path->innerjoinpath, BitmapAppendOnlyPath));
 			isjoininner = innerpath->isjoininner;
 			bitmapqual = innerpath->bitmapqual;
 		}
@@ -2866,10 +2873,6 @@ create_mergejoin_plan(PlannerInfo *root,
 	bool	   *mergenullsfirst;
 	MergeJoin  *join_plan;
 	int			i;
-	EquivalenceClass *lastoeclass;
-	EquivalenceClass *lastieclass;
-	PathKey	   *opathkey;
-	PathKey	   *ipathkey;
 	ListCell   *lc;
 	ListCell   *lop;
 	ListCell   *lip;
@@ -2973,6 +2976,30 @@ create_mergejoin_plan(PlannerInfo *root,
 		}
 	}
 
+	/*
+	 * If inner plan is a sort that is expected to spill to disk, add a
+	 * materialize node to shield it from the need to handle mark/restore.
+	 * This will allow it to perform the last merge pass on-the-fly, while in
+	 * most cases not requiring the materialize to spill to disk.
+	 *
+	 * XXX really, Sort oughta do this for itself, probably, to avoid the
+	 * overhead of a separate plan node.
+	 */
+	if (IsA(inner_plan, Sort) &&
+		sort_exceeds_work_mem((Sort *) inner_plan))
+	{
+		Plan	   *matplan = (Plan *) make_material(inner_plan);
+
+		/*
+		 * We assume the materialize will not spill to disk, and therefore
+		 * charge just cpu_tuple_cost per tuple.
+		 */
+		copy_plan_costsize(matplan, inner_plan);
+		matplan->total_cost += cpu_tuple_cost * matplan->plan_rows;
+
+		inner_plan = matplan;
+	}
+
 	/*
 	 * Compute the opfamily/strategy/nullsfirst arrays needed by the executor.
 	 * The information is in the pathkeys for the two inputs, but we need to
@@ -2985,18 +3012,19 @@ create_mergejoin_plan(PlannerInfo *root,
 	mergestrategies = (int *) palloc(nClauses * sizeof(int));
 	mergenullsfirst = (bool *) palloc(nClauses * sizeof(bool));
 
-	lastoeclass = NULL;
-	lastieclass = NULL;
-	opathkey = NULL;
-	ipathkey = NULL;
 	lop = list_head(outerpathkeys);
 	lip = list_head(innerpathkeys);
 	i = 0;
 	foreach(lc, best_path->path_mergeclauses)
 	{
-		RestrictInfo   *rinfo = (RestrictInfo *) lfirst(lc);
+		RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
 		EquivalenceClass *oeclass;
 		EquivalenceClass *ieclass;
+		PathKey    *opathkey;
+		PathKey    *ipathkey;
+		EquivalenceClass *opeclass;
+		EquivalenceClass *ipeclass;
+		ListCell   *l2;
 
 		/* fetch outer/inner eclass from mergeclause */
 		Assert(IsA(rinfo, RestrictInfo));
@@ -3013,28 +3041,100 @@ create_mergejoin_plan(PlannerInfo *root,
 		Assert(oeclass != NULL);
 		Assert(ieclass != NULL);
 
-		/* should match current or next pathkeys */
-		/* we check this carefully for debugging reasons */
-		if (oeclass != lastoeclass)
+		/*
+		 * For debugging purposes, we check that the eclasses match the
+		 * paths' pathkeys.  In typical cases the merge clauses are one-to-one
+		 * with the pathkeys, but when dealing with partially redundant query
+		 * conditions, we might have clauses that re-reference earlier path
+		 * keys.  The case that we need to reject is where a pathkey is
+		 * entirely skipped over.
+		 *
+		 * lop and lip reference the first as-yet-unused pathkey elements;
+		 * it's okay to match them, or any element before them.  If they're
+		 * NULL then we have found all pathkey elements to be used.
+		 */
+		if (lop)
 		{
-			if (!lop)
-				elog(ERROR, "too few pathkeys for mergeclauses");
 			opathkey = (PathKey *) lfirst(lop);
-			lop = lnext(lop);
-			lastoeclass = opathkey->pk_eclass;
-			if (oeclass != lastoeclass)
-				elog(ERROR, "outer pathkeys do not match mergeclause");
+			opeclass = opathkey->pk_eclass;
+			if (oeclass == opeclass)
+			{
+				/* fast path for typical case */
+				lop = lnext(lop);
+			}
+			else
+			{
+				/* redundant clauses ... must match something before lop */
+				foreach(l2, outerpathkeys)
+				{
+					if (l2 == lop)
+						break;
+					opathkey = (PathKey *) lfirst(l2);
+					opeclass = opathkey->pk_eclass;
+					if (oeclass == opeclass)
+						break;
+				}
+				if (oeclass != opeclass)
+					elog(ERROR, "outer pathkeys do not match mergeclauses");
+			}
+		}
+		else
+		{
+			/* redundant clauses ... must match some already-used pathkey */
+			opathkey = NULL;
+			opeclass = NULL;
+			foreach(l2, outerpathkeys)
+			{
+				opathkey = (PathKey *) lfirst(l2);
+				opeclass = opathkey->pk_eclass;
+				if (oeclass == opeclass)
+					break;
+			}
+			if (l2 == NULL)
+				elog(ERROR, "outer pathkeys do not match mergeclauses");
 		}
-		if (ieclass != lastieclass)
+
+		if (lip)
 		{
-			if (!lip)
-				elog(ERROR, "too few pathkeys for mergeclauses");
 			ipathkey = (PathKey *) lfirst(lip);
-			lip = lnext(lip);
-			lastieclass = ipathkey->pk_eclass;
-			if (ieclass != lastieclass)
-				elog(ERROR, "inner pathkeys do not match mergeclause");
+			ipeclass = ipathkey->pk_eclass;
+			if (ieclass == ipeclass)
+			{
+				/* fast path for typical case */
+				lip = lnext(lip);
+			}
+			else
+			{
+				/* redundant clauses ... must match something before lip */
+				foreach(l2, innerpathkeys)
+				{
+					if (l2 == lip)
+						break;
+					ipathkey = (PathKey *) lfirst(l2);
+					ipeclass = ipathkey->pk_eclass;
+					if (ieclass == ipeclass)
+						break;
+				}
+				if (ieclass != ipeclass)
+					elog(ERROR, "inner pathkeys do not match mergeclauses");
+			}
 		}
+		else
+		{
+			/* redundant clauses ... must match some already-used pathkey */
+			ipathkey = NULL;
+			ipeclass = NULL;
+			foreach(l2, innerpathkeys)
+			{
+				ipathkey = (PathKey *) lfirst(l2);
+				ipeclass = ipathkey->pk_eclass;
+				if (ieclass == ipeclass)
+					break;
+			}
+			if (l2 == NULL)
+				elog(ERROR, "inner pathkeys do not match mergeclauses");
+		}
+
 		/* pathkeys should match each other too (more debugging) */
 		if (opathkey->pk_opfamily != ipathkey->pk_opfamily ||
 			opathkey->pk_strategy != ipathkey->pk_strategy ||
@@ -3048,6 +3148,11 @@ create_mergejoin_plan(PlannerInfo *root,
 		i++;
 	}
 
+	/*
+	 * Note: it is not an error if we have additional pathkey elements
+	 * (i.e., lop or lip isn't NULL here).  The input paths might be
+	 * better-sorted than we need for the current mergejoin.
+	 */
 
 	/*
 	 * Now we can build the mergejoin node.
@@ -3224,6 +3329,7 @@ fix_indexqual_references(List *indexquals, IndexPath *index_path,
 		Oid			stratlefttype;
 		Oid			stratrighttype;
 		bool		recheck;
+		bool		is_null_op = false;
 
 		Assert(IsA(rinfo, RestrictInfo));
 
@@ -3310,6 +3416,17 @@ fix_indexqual_references(List *indexquals, IndexPath *index_path,
 														 &opfamily);
 			clause_op = saop->opno;
 		}
+		else if (IsA(clause, NullTest))
+		{
+			NullTest   *nt = (NullTest *) clause;
+
+			Assert(nt->nulltesttype == IS_NULL);
+			nt->arg = (Expr *) fix_indexqual_operand((Node *) nt->arg,
+													 index,
+													 &opfamily);
+			is_null_op = true;
+			clause_op = InvalidOid;		/* keep compiler quiet */
+		}
 		else
 		{
 			elog(ERROR, "unsupported indexqual type: %d",
@@ -3319,16 +3436,27 @@ fix_indexqual_references(List *indexquals, IndexPath *index_path,
 
 		*fixed_indexquals = lappend(*fixed_indexquals, clause);
 
-		/*
-		 * Look up the (possibly commuted) operator in the operator family to
-		 * get its strategy number and the recheck indicator.	This also
-		 * double-checks that we found an operator matching the index.
-		 */
-		get_op_opfamily_properties(clause_op, opfamily,
-								   &stratno,
-								   &stratlefttype,
-								   &stratrighttype,
-								   &recheck);
+		if (is_null_op)
+		{
+			/* IS NULL doesn't have a clause_op */
+			stratno = InvalidStrategy;
+			stratrighttype = InvalidOid;
+			/* We assume it's non-lossy ... might need more work someday */
+			recheck = false;
+		}
+		else
+		{
+			/*
+			 * Look up the (possibly commuted) operator in the operator family
+			 * to get its strategy number and the recheck indicator. This also
+			 * double-checks that we found an operator matching the index.
+			 */
+			get_op_opfamily_properties(clause_op, opfamily,
+									   &stratno,
+									   &stratlefttype,
+									   &stratrighttype,
+									   &recheck);
+		}
 
 		*indexstrategy = lappend_int(*indexstrategy, stratno);
 		*indexsubtype = lappend_oid(*indexsubtype, stratrighttype);
@@ -3434,6 +3562,7 @@ get_switched_clauses(List *clauses, Relids outerrelids)
 		RestrictInfo *restrictinfo = (RestrictInfo *) lfirst(l);
 
 		Expr *rclause = restrictinfo->clause;
+		OpExpr *clause;
 
 		/**
 		 * If this is a IS NOT FALSE boolean test, we can peek underneath.
@@ -3449,7 +3578,7 @@ get_switched_clauses(List *clauses, Relids outerrelids)
 		}
 
 		Assert(is_opclause(rclause));
-		OpExpr *clause = (OpExpr *) rclause;
+		clause = (OpExpr *) rclause;
 		if (bms_is_subset(restrictinfo->right_relids, outerrelids))
 		{
 			/*
@@ -3506,8 +3635,8 @@ order_qual_clauses(PlannerInfo *root, List *clauses)
 {
 	typedef struct
 	{
-		Node   *clause;
-		Cost	cost;
+		Node	   *clause;
+		Cost		cost;
 	} QualItem;
 	int			nitems = list_length(clauses);
 	QualItem   *items;
@@ -3538,8 +3667,8 @@ order_qual_clauses(PlannerInfo *root, List *clauses)
 
 	/*
 	 * Sort.  We don't use qsort() because it's not guaranteed stable for
-	 * equal keys.  The expected number of entries is small enough that
-	 * a simple insertion sort should be good enough.
+	 * equal keys.	The expected number of entries is small enough that a
+	 * simple insertion sort should be good enough.
 	 */
 	for (i = 1; i < nitems; i++)
 	{
@@ -3549,9 +3678,9 @@ order_qual_clauses(PlannerInfo *root, List *clauses)
 		/* insert newitem into the already-sorted subarray */
 		for (j = i; j > 0; j--)
 		{
-			if (newitem.cost >= items[j-1].cost)
+			if (newitem.cost >= items[j - 1].cost)
 				break;
-			items[j] = items[j-1];
+			items[j] = items[j - 1];
 		}
 		items[j] = newitem;
 	}
@@ -3848,12 +3977,6 @@ make_subqueryscan(PlannerInfo *root,
 	SubqueryScan *node = makeNode(SubqueryScan);
 	Plan	   *plan = &node->scan.plan;
 
-	/**
-	 * Ensure that the plan we're going to attach to the subquery scan has all the
-	 * parameter fields figured out.
-	 */
-	SS_finalize_plan(root, subrtable, subplan, false);
-
 	/*
 	 * Cost is figured here for the convenience of prepunion.c.  Note this is
 	 * only correct for the case where qpqual is empty; otherwise caller
@@ -4063,7 +4186,7 @@ make_hash(Plan *lefttree)
 	 * plan; this only affects EXPLAIN display not decisions.
 	 */
 	plan->startup_cost = plan->total_cost;
-	plan->targetlist = copyObject(lefttree->targetlist);
+	plan->targetlist = lefttree->targetlist;
 	plan->qual = NIL;
 	plan->lefttree = lefttree;
 	plan->righttree = NULL;
@@ -4107,17 +4230,20 @@ make_mergejoin(List *tlist,
  * make_sort --- basic routine to build a Sort plan node
  *
  * Caller must have built the sortColIdx, sortOperators, and nullsFirst
- * arrays already.
+ * arrays already.	limit_tuples is as for cost_sort (in particular, pass
+ * -1 if no limit)
  */
 static Sort *
 make_sort(PlannerInfo *root, Plan *lefttree, int numCols,
-		  AttrNumber *sortColIdx, Oid *sortOperators, bool *nullsFirst)
+		  AttrNumber *sortColIdx, Oid *sortOperators, bool *nullsFirst,
+		  double limit_tuples)
 {
 	Sort	   *node = makeNode(Sort);
 	Plan	   *plan = &node->plan;
 
 	copy_plan_costsize(plan, lefttree); /* only care about copying size */
-	plan = add_sort_cost(root, plan, numCols, sortColIdx, sortOperators);
+	plan = add_sort_cost(root, plan, numCols, sortColIdx, sortOperators,
+						 limit_tuples);
 
 	plan->targetlist = cdbpullup_targetlist(lefttree,
                             cdbpullup_exprHasSubplanRef((Expr *)lefttree->targetlist));
@@ -4153,7 +4279,8 @@ make_sort(PlannerInfo *root, Plan *lefttree, int numCols,
  * that root may be NULL (e.g. when called outside make_sort).
  */
 Plan *
-add_sort_cost(PlannerInfo *root, Plan *input, int numCols, AttrNumber *sortColIdx, Oid *sortOperators)
+add_sort_cost(PlannerInfo *root, Plan *input, int numCols,
+			  AttrNumber *sortColIdx, Oid *sortOperators, double limit_tuples)
 {
 	Path		sort_path;		/* dummy for result of cost_sort */
 
@@ -4164,7 +4291,8 @@ add_sort_cost(PlannerInfo *root, Plan *input, int numCols, AttrNumber *sortColId
 	cost_sort(&sort_path, root, NIL,
 			  input->total_cost,
 			  input->plan_rows,
-			  input->plan_width);
+			  input->plan_width,
+			  limit_tuples);
 	input->startup_cost = sort_path.startup_cost;
 	input->total_cost = sort_path.total_cost;
 
@@ -4190,8 +4318,8 @@ add_sort_column(AttrNumber colIdx, Oid sortOp, bool nulls_first,
 	for (i = 0; i < numCols; i++)
 	{
 		/*
-		 * Note: we check sortOp because it's conceivable that "ORDER BY
-		 * foo USING <, foo USING <<<" is not redundant, if <<< distinguishes
+		 * Note: we check sortOp because it's conceivable that "ORDER BY foo
+		 * USING <, foo USING <<<" is not redundant, if <<< distinguishes
 		 * values that < considers equal.  We need not check nulls_first
 		 * however because a lower-order column with the same sortop but
 		 * opposite nulls direction is redundant.
@@ -4218,11 +4346,11 @@ add_sort_column(AttrNumber colIdx, Oid sortOp, bool nulls_first,
  *	  'lefttree' is the node which yields input tuples
  *	  'pathkeys' is the list of pathkeys by which the result is to be sorted
  *	  'limit_tuples' is the bound on the number of output tuples;
- *               -1 if no bound
+ *				-1 if no bound
  *	  'add_keys_to_targetlist' is true if it is ok to append to the subplan's
- *               targetlist or insert a Result node atop the subplan to
- *               evaluate sort key exprs that are not already present in the
- *               subplan's tlist.
+ *				targetlist or insert a Result node atop the subplan to
+ *				evaluate sort key exprs that are not already present in the
+ *				subplan's tlist.
  *
  * We must convert the pathkey information into arrays of sort key column
  * numbers and sort operator OIDs.
@@ -4262,91 +4390,128 @@ make_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 
 	foreach(i, pathkeys)
 	{
-		PathKey	   *pathkey = (PathKey *) lfirst(i);
+		PathKey    *pathkey = (PathKey *) lfirst(i);
+		EquivalenceClass *ec = pathkey->pk_eclass;
 		TargetEntry *tle = NULL;
 		Oid			pk_datatype = InvalidOid;
 		Oid			sortop;
 		ListCell   *j;
 
-		/*
-		 * We can sort by any non-constant expression listed in the pathkey's
-		 * EquivalenceClass.  For now, we take the first one that corresponds
-		 * to an available Var in the tlist. If there isn't any, use the first
-		 * one that is an expression in the input's vars.  (The non-const
-		 * restriction only matters if the EC is below_outer_join; but if it
-		 * isn't, it won't contain consts anyway, else we'd have discarded
-		 * the pathkey as redundant.)
-		 *
-		 * XXX if we have a choice, is there any way of figuring out which
-		 * might be cheapest to execute?  (For example, int4lt is likely much
-		 * cheaper to execute than numericlt, but both might appear in the
-		 * same equivalence class...)  Not clear that we ever will have an
-		 * interesting choice in practice, so it may not matter.
-		 */
-		foreach(j, pathkey->pk_eclass->ec_members)
+		if (ec->ec_has_volatile)
 		{
-			EquivalenceMember *em = (EquivalenceMember *) lfirst(j);
-
-			if (em->em_is_const || em->em_is_child)
-				continue;
-			tle = tlist_member((Node *) em->em_expr, tlist);
-			if (tle)
-			{
-				pk_datatype = em->em_datatype;
-				break;			/* found expr already in tlist */
-			}
+			/*
+			 * If the pathkey's EquivalenceClass is volatile, then it must
+			 * have come from an ORDER BY clause, and we have to match it to
+			 * that same targetlist entry.
+			 */
+			if (ec->ec_sortref == 0)	/* can't happen */
+				elog(ERROR, "volatile EquivalenceClass has no sortref");
+			tle = get_sortgroupref_tle(ec->ec_sortref, tlist);
+			Assert(tle);
+			Assert(list_length(ec->ec_members) == 1);
+			pk_datatype = ((EquivalenceMember *) linitial(ec->ec_members))->em_datatype;
 		}
-		if (!tle)
+		else
 		{
-			/* No matching Var; look for a computable expression */
-			Expr   *sortexpr = NULL;
-
-			if (!add_keys_to_targetlist)
-				break;
-
-			foreach(j, pathkey->pk_eclass->ec_members)
+			/*
+			 * Otherwise, we can sort by any non-constant expression listed in
+			 * the pathkey's EquivalenceClass.  For now, we take the first one
+			 * that corresponds to an available item in the tlist.	If there
+			 * isn't any, use the first one that is an expression in the
+			 * input's vars.  (The non-const restriction only matters if the
+			 * EC is below_outer_join; but if it isn't, it won't contain
+			 * consts anyway, else we'd have discarded the pathkey as
+			 * redundant.)
+			 *
+			 * XXX if we have a choice, is there any way of figuring out which
+			 * might be cheapest to execute?  (For example, int4lt is likely
+			 * much cheaper to execute than numericlt, but both might appear
+			 * in the same equivalence class...)  Not clear that we ever will
+			 * have an interesting choice in practice, so it may not matter.
+			 */
+			foreach(j, ec->ec_members)
 			{
 				EquivalenceMember *em = (EquivalenceMember *) lfirst(j);
-				List	   *exprvars;
-				ListCell   *k;
 
 				if (em->em_is_const || em->em_is_child)
 					continue;
-				sortexpr = em->em_expr;
-				exprvars = pull_var_clause((Node *) sortexpr, false);
-				foreach(k, exprvars)
+
+				tle = tlist_member((Node *) em->em_expr, tlist);
+				if (tle)
 				{
-					if (!tlist_member(lfirst(k), tlist))
-						break;
+					pk_datatype = em->em_datatype;
+					break;		/* found expr already in tlist */
 				}
-				list_free(exprvars);
-				if (!k)
+
+				/*
+				 * We can also use it if the pathkey expression is a relabel
+				 * of the tlist entry, or vice versa.  This is needed for
+				 * binary-compatible cases (cf. make_pathkey_from_sortinfo).
+				 * We prefer an exact match, though, so we do the basic search
+				 * first.
+				 */
+				tle = tlist_member_ignore_relabel((Node *) em->em_expr, tlist);
+				if (tle)
 				{
 					pk_datatype = em->em_datatype;
-					break;		/* found usable expression */
+					break;		/* found expr already in tlist */
 				}
 			}
-			if (!j)
-				elog(ERROR, "could not find pathkey item to sort");
 
-			/*
-			 * Do we need to insert a Result node?
-			 */
-			if (!is_projection_capable_plan(lefttree))
+			if (!tle)
 			{
-				tlist = copyObject(tlist);
-				lefttree = (Plan *) make_result(tlist, NULL, lefttree);
-			}
+				/* No matching tlist item; look for a computable expression */
+				Expr	   *sortexpr = NULL;
 
-			/*
-			 * Add resjunk entry to input's tlist
-			 */
-			tle = makeTargetEntry(sortexpr,
-								  list_length(tlist) + 1,
-								  NULL,
-								  true);
-			tlist = lappend(tlist, tle);
-			lefttree->targetlist = tlist;		/* just in case NIL before */
+				if (!add_keys_to_targetlist)
+					break;
+
+				foreach(j, ec->ec_members)
+				{
+					EquivalenceMember *em = (EquivalenceMember *) lfirst(j);
+					List	   *exprvars;
+					ListCell   *k;
+
+					if (em->em_is_const || em->em_is_child)
+						continue;
+					sortexpr = em->em_expr;
+					exprvars = pull_var_clause((Node *) sortexpr, false);
+					foreach(k, exprvars)
+					{
+						if (!tlist_member_ignore_relabel(lfirst(k), tlist))
+							break;
+					}
+					list_free(exprvars);
+					if (!k)
+					{
+						pk_datatype = em->em_datatype;
+						break;	/* found usable expression */
+					}
+				}
+				if (!j)
+					elog(ERROR, "could not find pathkey item to sort");
+
+				/*
+				 * Do we need to insert a Result node?
+				 */
+				if (!is_projection_capable_plan(lefttree))
+				{
+					/* copy needed so we don't modify input's tlist below */
+					tlist = copyObject(tlist);
+					lefttree = (Plan *) make_result(root, tlist, NULL,
+													lefttree);
+				}
+
+				/*
+				 * Add resjunk entry to input's tlist
+				 */
+				tle = makeTargetEntry(sortexpr,
+									  list_length(tlist) + 1,
+									  NULL,
+									  true);
+				tlist = lappend(tlist, tle);
+				lefttree->targetlist = tlist;	/* just in case NIL before */
+			}
 		}
 
 		/*
@@ -4380,7 +4545,7 @@ make_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 		return NULL;
 
 	return make_sort(root, lefttree, numsortkeys,
-					 sortColIdx, sortOperators, nullsFirst);
+					 sortColIdx, sortOperators, nullsFirst, limit_tuples);
 }
 
 /*
@@ -4429,7 +4594,7 @@ make_sort_from_sortclauses(PlannerInfo *root, List *sortcls, Plan *lefttree)
 	Assert(numsortkeys > 0);
 
 	return make_sort(root, lefttree, numsortkeys,
-					 sortColIdx, sortOperators, nullsFirst);
+					 sortColIdx, sortOperators, nullsFirst, -1.0);
 }
 
 /*
@@ -4516,7 +4681,7 @@ make_sort_from_groupcols(PlannerInfo *root,
 	Assert(numsortkeys > 0);
 
 	return make_sort(root, lefttree, numsortkeys,
-					 sortColIdx, sortOperators, nullsFirst);
+					 sortColIdx, sortOperators, nullsFirst, -1.0);
 }
 
 
@@ -4626,7 +4791,7 @@ make_sort_from_reordered_groupcols(PlannerInfo *root,
 	Assert(numsortkeys > 0);
 
 	return make_sort(root, lefttree, numsortkeys,
-					 sortColIdx, sortOperators, nullsFirst);
+					 sortColIdx, sortOperators, nullsFirst, -1.0);
 }
 
 /*
@@ -4673,7 +4838,7 @@ make_material(Plan *lefttree)
 	Plan	   *plan = &node->plan;
 
 	/* cost should be inserted by caller */
-	plan->targetlist = copyObject(lefttree->targetlist);
+	plan->targetlist = lefttree->targetlist;
 	plan->qual = NIL;
 	plan->lefttree = lefttree;
 	plan->righttree = NULL;
@@ -4958,7 +5123,7 @@ make_tablefunction(List *tlist,
 
 /*
  * distinctList is a list of SortClauses, identifying the targetlist items
- * that should be considered by the Unique filter.  The input path must
+ * that should be considered by the Unique filter.	The input path must
  * already be sorted accordingly.
  */
 Unique *
@@ -5008,7 +5173,7 @@ make_unique(Plan *lefttree, List *distinctList)
 
 		uniqColIdx[keyno] = tle->resno;
 		uniqOperators[keyno] = get_equality_op_for_ordering_op(sortcl->sortop);
-		if (!OidIsValid(uniqOperators[keyno]))		/* shouldn't happen */
+		if (!OidIsValid(uniqOperators[keyno]))	/* shouldn't happen */
 			elog(ERROR, "could not find equality operator for ordering operator %u",
 				 sortcl->sortop);
 		keyno++;
@@ -5082,7 +5247,7 @@ make_setop(SetOpCmd cmd, Plan *lefttree,
 
 		dupColIdx[keyno] = tle->resno;
 		dupOperators[keyno] = get_equality_op_for_ordering_op(sortcl->sortop);
-		if (!OidIsValid(dupOperators[keyno]))		/* shouldn't happen */
+		if (!OidIsValid(dupOperators[keyno]))	/* shouldn't happen */
 			elog(ERROR, "could not find equality operator for ordering operator %u",
 				 sortcl->sortop);
 		keyno++;
@@ -5190,7 +5355,8 @@ make_limit(Plan *lefttree, Node *limitOffset, Node *limitCount,
  * cost.  In either case, tlist eval cost is not to be included here.
  */
 Result *
-make_result(List *tlist,
+make_result(PlannerInfo *root,
+			List *tlist,
 			Node *resconstantqual,
 			Plan *subplan)
 {
@@ -5209,7 +5375,7 @@ make_result(List *tlist,
 		{
 			QualCost	qual_cost;
 
-			cost_qual_eval(&qual_cost, (List *) resconstantqual, NULL /*root*/);
+			cost_qual_eval(&qual_cost, (List *) resconstantqual, root);
 			/* resconstantqual is evaluated once at startup */
 			plan->startup_cost += qual_cost.startup + qual_cost.per_tuple;
 			plan->total_cost += qual_cost.startup + qual_cost.per_tuple;
@@ -5293,13 +5459,13 @@ is_projection_capable_plan(Plan *plan)
  * the given plan.
  */
 Plan *
-plan_pushdown_tlist(Plan *plan, List *tlist)
+plan_pushdown_tlist(PlannerInfo *root, Plan *plan, List *tlist)
 {
 	if (is_projection_capable_plan(plan))
     {
         /* Fix up annotation of plan's distribution and ordering properties. */
         if (plan->flow)
-            plan->flow = pull_up_Flow((Plan *)make_result(tlist, NULL, plan),
+            plan->flow = pull_up_Flow((Plan *)make_result(root, tlist, NULL, plan),
                                       plan, true);
 
         /* Install the new targetlist. */
@@ -5310,7 +5476,7 @@ plan_pushdown_tlist(Plan *plan, List *tlist)
         Plan   *subplan = plan;
 
 	    /* Insert a Result node to evaluate the targetlist. */
-        plan = (Plan *)make_result(tlist, NULL, subplan);
+        plan = (Plan *)make_result(root, tlist, NULL, subplan);
 
         /* Propagate the subplan's distribution and ordering properties. */
 		if (subplan->flow)
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 723e632e3dee..26f055641d77 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.131 2007/02/16 20:57:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.138.2.3 2009/04/16 20:42:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,14 +55,17 @@ static OuterJoinInfo *make_outerjoininfo(PlannerInfo *root,
 				   Relids inner_join_rels,
 				   JoinType join_type, Node *clause);
 void distribute_qual_to_rels(PlannerInfo *root, Node *clause,
-						bool is_deduced, bool is_deduced_but_not_equijoin,
+						bool is_deduced,
 						bool below_outer_join,
 						Relids qualscope,
 						Relids ojscope,
 						Relids outerjoin_nonnullable,
+						Relids deduced_nullable_relids,
 						List **postponed_qual_list);
 static bool check_outerjoin_delay(PlannerInfo *root, Relids *relids_p,
-								  bool is_pushed_down);
+					  Relids *nullable_relids_p, bool is_pushed_down);
+static bool check_equivalence_delay(PlannerInfo *root,
+						RestrictInfo *restrictinfo);
 static void check_mergejoinable(RestrictInfo *restrictinfo);
 static void check_hashjoinable(RestrictInfo *restrictinfo);
 
@@ -378,10 +381,10 @@ deconstruct_recurse(PlannerInfo *root, Node *jtnode, bool below_outer_join,
 
 		/*
 		 * A FROM with more than one list element is an inner join subsuming
-		 * all below it, so we should report inner_join_rels = qualscope.
-		 * If there was exactly one element, we should (and already did) report
-		 * whatever its inner_join_rels were.  If there were no elements
-		 * (is that possible?) the initialization before the loop fixed it.
+		 * all below it, so we should report inner_join_rels = qualscope. If
+		 * there was exactly one element, we should (and already did) report
+		 * whatever its inner_join_rels were.  If there were no elements (is
+		 * that possible?) the initialization before the loop fixed it.
 		 */
 		if (list_length(f->fromlist) > 1)
 			*inner_join_rels = *qualscope;
@@ -395,9 +398,9 @@ deconstruct_recurse(PlannerInfo *root, Node *jtnode, bool below_outer_join,
 			if (bms_is_subset(pq->relids, *qualscope))
 			{
 				distribute_qual_to_rels(root, pq->qual,
-										false, false, below_outer_join,
+										false, below_outer_join,
 										*qualscope, NULL, NULL,
-										NULL);
+										NULL, NULL);
 				pfree(pq);
 			}
 			else
@@ -415,8 +418,8 @@ deconstruct_recurse(PlannerInfo *root, Node *jtnode, bool below_outer_join,
 		 */
 		foreach(l, (List *) f->quals)
 			distribute_qual_to_rels(root, (Node *) lfirst(l),
-									false, false, below_outer_join,
-									*qualscope, NULL, NULL,
+									false, below_outer_join,
+									*qualscope, NULL, NULL, NULL,
 									postponed_qual_list);
 	}
 	else if (IsA(jtnode, JoinExpr))
@@ -583,9 +586,9 @@ deconstruct_recurse(PlannerInfo *root, Node *jtnode, bool below_outer_join,
 			if (bms_is_subset(pq->relids, *qualscope))
 			{
 				distribute_qual_to_rels(root, pq->qual,
-										false, false, below_outer_join,
+										false, below_outer_join,
 										*qualscope, ojscope, nonnullable_rels,
-										NULL);
+										NULL, NULL);
 				pfree(pq);
 			}
 			else
@@ -601,8 +604,8 @@ deconstruct_recurse(PlannerInfo *root, Node *jtnode, bool below_outer_join,
 		/* Process the qual clauses */
 		foreach(qual, (List *) j->quals)
 			distribute_qual_to_rels(root, (Node *) lfirst(qual),
-									false, false, below_outer_join,
-									*qualscope, ojscope, nonnullable_rels,
+									false, below_outer_join,
+									*qualscope, ojscope, nonnullable_rels, NULL,
 									postponed_qual_list);
 
 		/* Now we can add the OuterJoinInfo to oj_info_list */
@@ -628,8 +631,8 @@ deconstruct_recurse(PlannerInfo *root, Node *jtnode, bool below_outer_join,
 		else
 		{
 			/* can't combine, but needn't force join order above here */
-			Node   *leftpart,
-				   *rightpart;
+			Node	   *leftpart,
+					   *rightpart;
 
 			/* avoid creating useless 1-element sublists */
 			if (list_length(leftjoinlist) == 1)
@@ -740,13 +743,13 @@ make_outerjoininfo(PlannerInfo *root,
 	ojinfo->lhs_strict = bms_overlap(strict_relids, left_rels);
 
 	/*
-	 * Required LHS always includes the LHS rels mentioned in the clause.
-	 * We may have to add more rels based on lower outer joins; see below.
+	 * Required LHS always includes the LHS rels mentioned in the clause. We
+	 * may have to add more rels based on lower outer joins; see below.
 	 */
 	min_lefthand = bms_intersect(clause_relids, left_rels);
 
 	/*
-	 * Similarly for required RHS.  But here, we must also include any lower
+	 * Similarly for required RHS.	But here, we must also include any lower
 	 * inner joins, to ensure we don't try to commute with any of them.
 	 */
 	min_righthand = bms_int_members(bms_union(clause_relids, inner_join_rels),
@@ -764,10 +767,10 @@ make_outerjoininfo(PlannerInfo *root,
 		 * For a lower OJ in our LHS, if our join condition uses the lower
 		 * join's RHS and is not strict for that rel, we must preserve the
 		 * ordering of the two OJs, so add lower OJ's full syntactic relset to
-		 * min_lefthand.  (We must use its full syntactic relset, not just
-		 * its min_lefthand + min_righthand.  This is because there might
-		 * be other OJs below this one that this one can commute with,
-		 * but we cannot commute with them if we don't with this one.)
+		 * min_lefthand.  (We must use its full syntactic relset, not just its
+		 * min_lefthand + min_righthand.  This is because there might be other
+		 * OJs below this one that this one can commute with, but we cannot
+		 * commute with them if we don't with this one.)
 		 *
 		 * Note: I believe we have to insist on being strict for at least one
 		 * rel in the lower OJ's min_righthand, not its whole syn_righthand.
@@ -785,19 +788,19 @@ make_outerjoininfo(PlannerInfo *root,
 		/*
 		 * For a lower OJ in our RHS, if our join condition does not use the
 		 * lower join's RHS and the lower OJ's join condition is strict, we
-		 * can interchange the ordering of the two OJs; otherwise we must
-		 * add lower OJ's full syntactic relset to min_righthand.
+		 * can interchange the ordering of the two OJs; otherwise we must add
+		 * lower OJ's full syntactic relset to min_righthand.
 		 *
-		 * Here, we have to consider that "our join condition" includes
-		 * any clauses that syntactically appeared above the lower OJ and
-		 * below ours; those are equivalent to degenerate clauses in our
-		 * OJ and must be treated as such.  Such clauses obviously can't
-		 * reference our LHS, and they must be non-strict for the lower OJ's
-		 * RHS (else reduce_outer_joins would have reduced the lower OJ to
-		 * a plain join).  Hence the other ways in which we handle clauses
-		 * within our join condition are not affected by them.  The net
-		 * effect is therefore sufficiently represented by the
-		 * delay_upper_joins flag saved for us by check_outerjoin_delay.
+		 * Here, we have to consider that "our join condition" includes any
+		 * clauses that syntactically appeared above the lower OJ and below
+		 * ours; those are equivalent to degenerate clauses in our OJ and must
+		 * be treated as such.	Such clauses obviously can't reference our
+		 * LHS, and they must be non-strict for the lower OJ's RHS (else
+		 * reduce_outer_joins would have reduced the lower OJ to a plain
+		 * join).  Hence the other ways in which we handle clauses within our
+		 * join condition are not affected by them.  The net effect is
+		 * therefore sufficiently represented by the delay_upper_joins flag
+		 * saved for us by check_outerjoin_delay.
 		 */
 		if (bms_overlap(right_rels, otherinfo->syn_righthand))
 		{
@@ -863,21 +866,21 @@ make_outerjoininfo(PlannerInfo *root,
  *		baserels appearing on the outer (nonnullable) side of the join
  *		(for FULL JOIN this includes both sides of the join, and must in fact
  *		equal qualscope)
+ * 'deduced_nullable_relids': if is_deduced is TRUE, the nullable relids to
+ *		impute to the clause; otherwise NULL
  *
  * 'qualscope' identifies what level of JOIN the qual came from syntactically.
  * 'ojscope' is needed if we decide to force the qual up to the outer-join
  * level, which will be ojscope not necessarily qualscope.
- *
- * 'ptrToLocalEquiKeyList': the equiKeyList at *ptrToLocalEquiKeyList may have
- *      its equi key list expanded.  ptrToLocalEquiKeyList may be null
  */
 void
 distribute_qual_to_rels(PlannerInfo *root, Node *clause,
-						bool is_deduced, bool is_deduced_but_not_equijoin,
+						bool is_deduced,
 						bool below_outer_join,
 						Relids qualscope,
 						Relids ojscope,
 						Relids outerjoin_nonnullable,
+						Relids deduced_nullable_relids,
 						List **postponed_qual_list)
 {
 	Relids		relids;
@@ -887,6 +890,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 	bool		maybe_equivalence;
 	bool		maybe_outer_join;
 	bool        maybe_local_equijoin;
+	Relids		nullable_relids;
 	RestrictInfo *restrictinfo;
 
 	/*
@@ -948,13 +952,13 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 		if (ojscope)
 		{
 			/* clause is attached to outer join, eval it there */
-			relids = ojscope;
+			relids = bms_copy(ojscope);
 			/* mustn't use as gating qual, so don't mark pseudoconstant */
 		}
 		else
 		{
 			/* eval at original syntactic level */
-			relids = qualscope;
+			relids = bms_copy(qualscope);
 			if (!contain_volatile_functions(clause))
 			{
 				/* mark as gating qual */
@@ -987,7 +991,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 	 * Note: it is not immediately obvious that a simple boolean is enough
 	 * for this: if for some reason we were to attach a degenerate qual to
 	 * its original join level, it would need to be treated as an outer join
-	 * qual there.  However, this cannot happen, because all the rels the
+	 * qual there.	However, this cannot happen, because all the rels the
 	 * clause mentions must be in the outer join's min_righthand, therefore
 	 * the join it needs must be formed before the outer join; and we always
 	 * attach quals to the lowest level where they can be evaluated.  But
@@ -998,14 +1002,16 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 	if (is_deduced)
 	{
 		/*
-		 * If the qual came from implied-equality deduction, it should
-		 * not be outerjoin-delayed, else deducer blew it.  But we can't
-		 * check this because the ojinfo list may now contain OJs above
-		 * where the qual belongs.
+		 * If the qual came from implied-equality deduction, it should not be
+		 * outerjoin-delayed, else deducer blew it.  But we can't check this
+		 * because the ojinfo list may now contain OJs above where the qual
+		 * belongs.  For the same reason, we must rely on caller to supply the
+		 * correct nullable_relids set.
 		 */
 		Assert(!ojscope);
 		is_pushed_down = true;
 		outerjoin_delayed = false;
+		nullable_relids = deduced_nullable_relids;
 		/* Don't feed it back for more deductions */
 		maybe_equivalence = false;
 		maybe_local_equijoin = false;
@@ -1017,15 +1023,21 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 		 * The qual is attached to an outer join and mentions (some of the)
 		 * rels on the nonnullable side, so it's not degenerate.
 		 *
-		 * We can't use such a clause to deduce equivalence (the left and right
-		 * sides might be unequal above the join because one of them has gone
-		 * to NULL) ... but we might be able to use it for more limited
-		 * deductions, if there are no lower outer joins that delay its
-		 * application.  If so, consider adding it to the lists of set-aside
-		 * clauses.
+		 * We can't use such a clause to deduce equivalence (the left and
+		 * right sides might be unequal above the join because one of them has
+		 * gone to NULL) ... but we might be able to use it for more limited
+		 * deductions, if it is mergejoinable.  So consider adding it to the
+		 * lists of set-aside outer-join clauses.
 		 */
+		is_pushed_down = false;
 		maybe_equivalence = false;
-		maybe_outer_join = !check_outerjoin_delay(root, &relids, false);
+		maybe_outer_join = true;
+
+		/* Check to see if must be delayed by lower outer join */
+		outerjoin_delayed = check_outerjoin_delay(root,
+												  &relids,
+												  &nullable_relids,
+												  false);
 
 		/*
 		 * Now force the qual to be evaluated exactly at the level of joining
@@ -1039,25 +1051,27 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 		 */
 		Assert(ojscope);
 		relids = ojscope;
-		is_pushed_down = false;
-		outerjoin_delayed = true;
 		Assert(!pseudoconstant);
 	}
 	else
 	{
 		/*
-		 * Normal qual clause or degenerate outer-join clause.  Either way,
-		 * we can mark it as pushed-down.
+		 * Normal qual clause or degenerate outer-join clause.	Either way, we
+		 * can mark it as pushed-down.
 		 */
 		is_pushed_down = true;
 
-		/* Check to see if must be delayed by outer join */
-		outerjoin_delayed = check_outerjoin_delay(root, &relids, true);
+		/* Check to see if must be delayed by lower outer join */
+		outerjoin_delayed = check_outerjoin_delay(root,
+												  &relids,
+												  &nullable_relids,
+												  true);
 
 		if (outerjoin_delayed)
 		{
 			/* Should still be a subset of current scope ... */
 			Assert(bms_is_subset(relids, qualscope));
+
 			/*
 			 * Because application of the qual will be delayed by outer join,
 			 * we mustn't assume its vars are equal everywhere.
@@ -1067,12 +1081,11 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 		else
 		{
 			/*
-			 * Qual is not delayed by any lower outer-join restriction, so
-			 * we can consider feeding it to the equivalence machinery.
-			 * However, if it's itself within an outer-join clause, treat it
-			 * as though it appeared below that outer join (note that we can
-			 * only get here when the clause references only nullable-side
-			 * rels).
+			 * Qual is not delayed by any lower outer-join restriction, so we
+			 * can consider feeding it to the equivalence machinery. However,
+			 * if it's itself within an outer-join clause, treat it as though
+			 * it appeared below that outer join (note that we can only get
+			 * here when the clause references only nullable-side rels).
 			 */
 			maybe_local_equijoin = true;
 			maybe_equivalence = true;
@@ -1098,13 +1111,15 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 									 is_pushed_down,
 									 outerjoin_delayed,
 									 pseudoconstant,
-									 relids);
+									 relids,
+									 nullable_relids,
+									 ojscope);
 
 	/*
 	 * If it's a join clause (either naturally, or because delayed by
-	 * outer-join rules), add vars used in the clause to targetlists of
-	 * their relations, so that they will be emitted by the plan nodes that
-	 * scan those relations (else they won't be available at the join node!).
+	 * outer-join rules), add vars used in the clause to targetlists of their
+	 * relations, so that they will be emitted by the plan nodes that scan
+	 * those relations (else they won't be available at the join node!).
 	 *
 	 * Note: if the clause gets absorbed into an EquivalenceClass then this
 	 * may be unnecessary, but for now we have to do it to cover the case
@@ -1131,23 +1146,23 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 	 * machinery.  We do *not* attach it directly to any restriction or join
 	 * lists.  The EC code will propagate it to the appropriate places later.
 	 *
-	 * If the clause has a mergejoinable operator and is not outerjoin-delayed,
-	 * yet isn't an equivalence because it is an outer-join clause, the EC
-	 * code may yet be able to do something with it.  We add it to appropriate
-	 * lists for further consideration later.  Specifically:
+	 * If the clause has a mergejoinable operator and is not
+	 * outerjoin-delayed, yet isn't an equivalence because it is an outer-join
+	 * clause, the EC code may yet be able to do something with it.  We add it
+	 * to appropriate lists for further consideration later.  Specifically:
 	 *
-	 * If it is a left or right outer-join qualification that relates the
-	 * two sides of the outer join (no funny business like leftvar1 =
-	 * leftvar2 + rightvar), we add it to root->left_join_clauses or
+	 * If it is a left or right outer-join qualification that relates the two
+	 * sides of the outer join (no funny business like leftvar1 = leftvar2 +
+	 * rightvar), we add it to root->left_join_clauses or
 	 * root->right_join_clauses according to which side the nonnullable
 	 * variable appears on.
 	 *
 	 * If it is a full outer-join qualification, we add it to
 	 * root->full_join_clauses.  (Ideally we'd discard cases that aren't
 	 * leftvar = rightvar, as we do for left/right joins, but this routine
-	 * doesn't have the info needed to do that; and the current usage of
-	 * the full_join_clauses list doesn't require that, so it's not
-	 * currently worth complicating this routine's API to make it possible.)
+	 * doesn't have the info needed to do that; and the current usage of the
+	 * full_join_clauses list doesn't require that, so it's not currently
+	 * worth complicating this routine's API to make it possible.)
 	 *
 	 * If none of the above hold, pass it off to
 	 * distribute_restrictinfo_to_rels().
@@ -1156,7 +1171,8 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 	{
 		if (maybe_equivalence)
 		{
-			if (process_equivalence(root, restrictinfo, below_outer_join))
+			if (check_equivalence_delay(root, restrictinfo) &&
+				process_equivalence(root, restrictinfo, below_outer_join))
 				return;
 			/* EC rejected it, so pass to distribute_restrictinfo_to_rels */
 		}
@@ -1173,9 +1189,9 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 				return;
 			}
 			if (bms_is_subset(restrictinfo->right_relids,
-								   outerjoin_nonnullable) &&
-					 !bms_overlap(restrictinfo->left_relids,
-								  outerjoin_nonnullable))
+							  outerjoin_nonnullable) &&
+				!bms_overlap(restrictinfo->left_relids,
+							 outerjoin_nonnullable))
 			{
 				/* we have innervar = outervar */
 				root->right_join_clauses = lappend(root->right_join_clauses,
@@ -1194,6 +1210,14 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 
 	/* No EC special case applies, so push it into the clause lists */
 	distribute_restrictinfo_to_rels(root, restrictinfo);
+
+	/*
+	 * The predicate propagation code (gen_implied_quals()) might be able to
+	 * derive other clauses from this, though, so remember this qual for later.
+	 * (We cannot do predicate propagation yet, because we haven't built all
+	 * the equivalence classes yet.)
+	 */
+	root->non_eq_clauses = lappend(root->non_eq_clauses, restrictinfo);
 }
 
 /*
@@ -1205,12 +1229,14 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
  * If the qual must be delayed, add relids to *relids_p to reflect the lowest
  * safe level for evaluating the qual, and return TRUE.  Any extra delay for
  * higher-level joins is reflected by setting delay_upper_joins to TRUE in
- * OuterJoinInfo structs.
+ * OuterJoinInfo structs.  We also compute nullable_relids, the set of
+ * referenced relids that are nullable by lower outer joins (note that this
+ * can be nonempty even for a non-delayed qual).
  *
  * For an is_pushed_down qual, we can evaluate the qual as soon as (1) we have
  * all the rels it mentions, and (2) we are at or above any outer joins that
  * can null any of these rels and are below the syntactic location of the
- * given qual.  We must enforce (2) because pushing down such a clause below
+ * given qual.	We must enforce (2) because pushing down such a clause below
  * the OJ might cause the OJ to emit null-extended rows that should not have
  * been formed, or that should have been rejected by the clause.  (This is
  * only an issue for non-strict quals, since if we can prove a qual mentioning
@@ -1219,7 +1245,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
  *
  * To enforce (2), scan the oj_info_list and merge the required-relid sets of
  * any such OJs into the clause's own reference list.  At the time we are
- * called, the oj_info_list contains only outer joins below this qual.  We
+ * called, the oj_info_list contains only outer joins below this qual.	We
  * have to repeat the scan until no new relids get added; this ensures that
  * the qual is suitably delayed regardless of the order in which OJs get
  * executed.  As an example, if we have one OJ with LHS=A, RHS=B, and one with
@@ -1228,15 +1254,15 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
  * mentioning only C cannot be applied below the join to A.
  *
  * For a non-pushed-down qual, this isn't going to determine where we place the
- * qual, but we need to determine outerjoin_delayed anyway so we can decide
- * whether the qual is potentially useful for equivalence deductions.
+ * qual, but we need to determine outerjoin_delayed and nullable_relids anyway
+ * for use later in the planning process.
  *
  * Lastly, a pushed-down qual that references the nullable side of any current
  * oj_info_list member and has to be evaluated above that OJ (because its
  * required relids overlap the LHS too) causes that OJ's delay_upper_joins
  * flag to be set TRUE.  This will prevent any higher-level OJs from
  * being interchanged with that OJ, which would result in not having any
- * correct place to evaluate the qual.  (The case we care about here is a
+ * correct place to evaluate the qual.	(The case we care about here is a
  * sub-select WHERE clause within the RHS of some outer join.  The WHERE
  * clause must effectively be treated as a degenerate clause of that outer
  * join's condition.  Rather than trying to match such clauses with joins
@@ -1245,15 +1271,29 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
  * two OJs to commute.)
  */
 static bool
-check_outerjoin_delay(PlannerInfo *root, Relids *relids_p,
+check_outerjoin_delay(PlannerInfo *root,
+					  Relids *relids_p,				/* in/out parameter */
+					  Relids *nullable_relids_p,	/* output parameter */
 					  bool is_pushed_down)
 {
-	Relids		relids = *relids_p;
+	Relids		relids;
+	Relids		nullable_relids;
 	bool		outerjoin_delayed;
 	bool		found_some;
 
+	/* fast path if no outer joins */
+	if (root->oj_info_list == NIL)
+	{
+		*nullable_relids_p = NULL;
+		return false;
+	}
+
+	/* must copy relids because we need the original value at the end */
+	relids = bms_copy(*relids_p);
+	nullable_relids = NULL;
 	outerjoin_delayed = false;
-	do {
+	do
+	{
 		ListCell   *l;
 
 		found_some = false;
@@ -1277,6 +1317,12 @@ check_outerjoin_delay(PlannerInfo *root, Relids *relids_p,
 					/* we'll need another iteration */
 					found_some = true;
 				}
+				/* track all the nullable rels of relevant OJs */
+				nullable_relids = bms_add_members(nullable_relids,
+												  ojinfo->min_righthand);
+				if (ojinfo->join_type == JOIN_FULL)
+					nullable_relids = bms_add_members(nullable_relids,
+													  ojinfo->min_lefthand);
 				/* set delay_upper_joins if needed */
 				if (is_pushed_down && ojinfo->join_type != JOIN_FULL &&
 					bms_overlap(relids, ojinfo->min_lefthand))
@@ -1285,10 +1331,54 @@ check_outerjoin_delay(PlannerInfo *root, Relids *relids_p,
 		}
 	} while (found_some);
 
+	/* identify just the actually-referenced nullable rels */
+	nullable_relids = bms_int_members(nullable_relids, *relids_p);
+
+	/* replace *relids_p, and return nullable_relids */
+	bms_free(*relids_p);
 	*relids_p = relids;
+	*nullable_relids_p = nullable_relids;
 	return outerjoin_delayed;
 }
 
+/*
+ * check_equivalence_delay
+ *		Detect whether a potential equivalence clause is rendered unsafe
+ *		by outer-join-delay considerations.  Return TRUE if it's safe.
+ *
+ * The initial tests in distribute_qual_to_rels will consider a mergejoinable
+ * clause to be a potential equivalence clause if it is not outerjoin_delayed.
+ * But since the point of equivalence processing is that we will recombine the
+ * two sides of the clause with others, we have to check that each side
+ * satisfies the not-outerjoin_delayed condition on its own; otherwise it might
+ * not be safe to evaluate everywhere we could place a derived equivalence
+ * condition.
+ */
+static bool
+check_equivalence_delay(PlannerInfo *root,
+						RestrictInfo *restrictinfo)
+{
+	Relids		relids;
+	Relids		nullable_relids;
+
+	/* fast path if no special joins */
+	if (root->oj_info_list == NIL)
+		return true;
+
+	/* must copy restrictinfo's relids to avoid changing it */
+	relids = bms_copy(restrictinfo->left_relids);
+	/* check left side does not need delay */
+	if (check_outerjoin_delay(root, &relids, &nullable_relids, true))
+		return false;
+
+	/* and similarly for the right side */
+	relids = bms_copy(restrictinfo->right_relids);
+	if (check_outerjoin_delay(root, &relids, &nullable_relids, true))
+		return false;
+
+	return true;
+}
+
 /*
  * distribute_restrictinfo_to_rels
  *	  Push a completed RestrictInfo into the proper restriction or join
@@ -1310,8 +1400,8 @@ distribute_restrictinfo_to_rels(PlannerInfo *root,
 		case BMS_SINGLETON:
 
 			/*
-			 * There is only one relation participating in the clause, so
-			 * it is a restriction clause for that relation.
+			 * There is only one relation participating in the clause, so it
+			 * is a restriction clause for that relation.
 			 */
 			rel = find_base_rel(root, bms_singleton_member(relids));
 
@@ -1327,8 +1417,8 @@ distribute_restrictinfo_to_rels(PlannerInfo *root,
 			 */
 
 			/*
-			 * Check for hashjoinable operators.  (We don't bother setting
-			 * the hashjoin info if we're not going to need it.)
+			 * Check for hashjoinable operators.  (We don't bother setting the
+			 * hashjoin info if we're not going to need it.)
 			 */
 			if (enable_hashjoin)
 				check_hashjoinable(restrictinfo);
@@ -1361,11 +1451,20 @@ distribute_restrictinfo_to_rels(PlannerInfo *root,
  * variable-free.  Otherwise the qual is applied at the lowest join level
  * that provides all its variables.
  *
+ * "nullable_relids" is the set of relids used in the expressions that are
+ * potentially nullable below the expressions.  (This has to be supplied by
+ * caller because this function is used after deconstruct_jointree, so we
+ * don't have knowledge of where the clause items came from.)
+ *
  * "both_const" indicates whether both items are known pseudo-constant;
  * in this case it is worth applying eval_const_expressions() in case we
  * can produce constant TRUE or constant FALSE.  (Otherwise it's not,
  * because the expressions went through eval_const_expressions already.)
  *
+ * Note: this function will copy item1 and item2, but it is caller's
+ * responsibility to make sure that the Relids parameters are fresh copies
+ * not shared with other uses.
+ *
  * This is currently used only when an EquivalenceClass is found to
  * contain pseudoconstants.  See path/pathkeys.c for more details.
  */
@@ -1375,6 +1474,7 @@ process_implied_equality(PlannerInfo *root,
 						 Expr *item1,
 						 Expr *item2,
 						 Relids qualscope,
+						 Relids nullable_relids,
 						 bool below_outer_join,
 						 bool both_const)
 {
@@ -1393,12 +1493,12 @@ process_implied_equality(PlannerInfo *root,
 	/* If both constant, try to reduce to a boolean constant. */
 	if (both_const)
 	{
-		clause = (Expr *) eval_const_expressions(NULL, (Node *) clause);
+		clause = (Expr *) eval_const_expressions(root, (Node *) clause);
 
 		/* If we produced const TRUE, just drop the clause */
 		if (clause && IsA(clause, Const))
 		{
-			Const	*cclause = (Const *) clause;
+			Const	   *cclause = (Const *) clause;
 
 			Assert(cclause->consttype == BOOLOID);
 			if (!cclause->constisnull && DatumGetBool(cclause->constvalue))
@@ -1406,15 +1506,12 @@ process_implied_equality(PlannerInfo *root,
 		}
 	}
 
-	/* Make a copy of qualscope to avoid problems if source EC changes */
-	qualscope = bms_copy(qualscope);
-
 	/*
 	 * Push the new clause into all the appropriate restrictinfo lists.
 	 */
 	distribute_qual_to_rels(root, (Node *) clause,
-							true, true, below_outer_join,
-							qualscope, NULL, NULL,
+							true, below_outer_join,
+							qualscope, NULL, NULL, nullable_relids,
 							NULL);
 }
 
@@ -1423,12 +1520,17 @@ process_implied_equality(PlannerInfo *root,
  *
  * This overlaps the functionality of process_implied_equality(), but we
  * must return the RestrictInfo, not push it into the joininfo tree.
+ *
+ * Note: this function will copy item1 and item2, but it is caller's
+ * responsibility to make sure that the Relids parameters are fresh copies
+ * not shared with other uses.
  */
 RestrictInfo *
 build_implied_join_equality(Oid opno,
 							Expr *item1,
 							Expr *item2,
-							Relids qualscope)
+							Relids qualscope,
+							Relids nullable_relids)
 {
 	RestrictInfo *restrictinfo;
 	Expr	   *clause;
@@ -1443,17 +1545,16 @@ build_implied_join_equality(Oid opno,
 						   (Expr *) copyObject(item1),
 						   (Expr *) copyObject(item2));
 
-	/* Make a copy of qualscope to avoid problems if source EC changes */
-	qualscope = bms_copy(qualscope);
-
 	/*
 	 * Build the RestrictInfo node itself.
 	 */
 	restrictinfo = make_restrictinfo(clause,
-									 true, /* is_pushed_down */
-									 false,	/* outerjoin_delayed */
-									 false,	/* pseudoconstant */
-									 qualscope);
+									 true,		/* is_pushed_down */
+									 false,		/* outerjoin_delayed */
+									 false,		/* pseudoconstant */
+									 qualscope,	/* required_relids */
+									 nullable_relids,	/* nullable_relids */
+									 qualscope); /* ojscope_relids */
 
 	/* Set mergejoinability info always, and hashjoinability if enabled */
 	check_mergejoinable(restrictinfo);
@@ -1499,9 +1600,9 @@ check_mergejoinable(RestrictInfo *restrictinfo)
 		restrictinfo->mergeopfamilies = get_mergejoin_opfamilies(opno);
 
 	/*
-	 * Note: op_mergejoinable is just a hint; if we fail to find the
-	 * operator in any btree opfamilies, mergeopfamilies remains NIL
-	 * and so the clause is not treated as mergejoinable.
+	 * Note: op_mergejoinable is just a hint; if we fail to find the operator
+	 * in any btree opfamilies, mergeopfamilies remains NIL and so the clause
+	 * is not treated as mergejoinable.
 	 */
 }
 
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index 24852fe7d3e2..a46e8ec9f230 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.27 2007/02/19 07:03:29 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.36.2.2 2008/07/10 01:17:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/planmain.h"
+#include "optimizer/predtest.h"
 #include "optimizer/subselect.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_expr.h"
@@ -38,6 +39,7 @@ typedef struct
 	Oid			aggfnoid;		/* pg_proc Oid of the aggregate */
 	Oid			aggsortop;		/* Oid of its sort operator */
 	Expr	   *target;			/* expression we are aggregating on */
+	Expr	   *notnulltest;	/* expression for "target IS NOT NULL" */
 	IndexPath  *path;			/* access path for index scan */
 	Cost		pathcost;		/* estimated cost to fetch first row */
 	bool		nulls_first;	/* null ordering direction matching index */
@@ -119,7 +121,7 @@ optimize_minmax_aggregates(PlannerInfo *root, List *tlist, Path *best_path)
 	if (!IsA(jtnode, RangeTblRef))
 		return NULL;
 	rtr = (RangeTblRef *) jtnode;
-	rte = rt_fetch(rtr->rtindex, parse->rtable);
+	rte = planner_rt_fetch(rtr->rtindex, root);
 	if (rte->rtekind != RTE_RELATION || rte->inh)
 		return NULL;
 	rel = find_base_rel(root, rtr->rtindex);
@@ -188,10 +190,22 @@ optimize_minmax_aggregates(PlannerInfo *root, List *tlist, Path *best_path)
 	hqual = replace_aggs_with_params_mutator(parse->havingQual,
 											 &aggs_list);
 
+	/*
+	 * We have to replace Aggrefs with Params in equivalence classes too,
+	 * else ORDER BY or DISTINCT on an optimized aggregate will fail.
+	 *
+	 * Note: at some point it might become necessary to mutate other
+	 * data structures too, such as the query's sortClause or distinctClause.
+	 * Right now, those won't be examined after this point.
+	 */
+	mutate_eclass_expressions(root,
+							  replace_aggs_with_params_mutator,
+							  &aggs_list);
+
 	/*
 	 * Generate the output plan --- basically just a Result
 	 */
-	plan = (Plan *) make_result(tlist, hqual, NULL);
+	plan = (Plan *) make_result(root, tlist, hqual, NULL);
 
 	/* Account for evaluation cost of the tlist (make_result did the rest) */
 	cost_qual_eval(&tlist_cost, tlist, root);
@@ -288,8 +302,23 @@ build_minmax_path(PlannerInfo *root, RelOptInfo *rel, MinMaxAggInfo *info)
 	IndexPath  *best_path = NULL;
 	Cost		best_cost = 0;
 	bool		best_nulls_first = false;
+	NullTest   *ntest;
+	List	   *allquals;
 	ListCell   *l;
 
+	/* Build "target IS NOT NULL" expression for use below */
+	ntest = makeNode(NullTest);
+	ntest->nulltesttype = IS_NOT_NULL;
+	ntest->arg = copyObject(info->target);
+	info->notnulltest = (Expr *) ntest;
+
+	/*
+	 * Build list of existing restriction clauses plus the notnull test. We
+	 * cheat a bit by not bothering with a RestrictInfo node for the notnull
+	 * test --- predicate_implied_by() won't care.
+	 */
+	allquals = list_concat(list_make1(ntest), rel->baserestrictinfo);
+
 	foreach(l, rel->indexlist)
 	{
 		IndexOptInfo *index = (IndexOptInfo *) lfirst(l);
@@ -305,8 +334,13 @@ build_minmax_path(PlannerInfo *root, RelOptInfo *rel, MinMaxAggInfo *info)
 		if (index->relam != BTREE_AM_OID)
 			continue;
 
-		/* Ignore partial indexes that do not match the query */
-		if (index->indpred != NIL && !index->predOK)
+		/*
+		 * Ignore partial indexes that do not match the query --- unless their
+		 * predicates can be proven from the baserestrict list plus the IS NOT
+		 * NULL test.  In that case we can use them.
+		 */
+		if (index->indpred != NIL && !index->predOK &&
+			!predicate_implied_by(index->indpred, allquals))
 			continue;
 
 		/*
@@ -349,7 +383,9 @@ build_minmax_path(PlannerInfo *root, RelOptInfo *rel, MinMaxAggInfo *info)
 				RestrictInfo *rinfo = (RestrictInfo *) lfirst(ll);
 				int			strategy;
 
-				Assert(is_opclause(rinfo->clause));
+				/* Could be an IS_NULL test, if so ignore */
+				if (!is_opclause(rinfo->clause))
+					continue;
 				strategy =
 					get_op_opfamily_strategy(((OpExpr *) rinfo->clause)->opno,
 											 index->opfamily[prevcol]);
@@ -415,7 +451,7 @@ build_minmax_path(PlannerInfo *root, RelOptInfo *rel, MinMaxAggInfo *info)
 static ScanDirection
 match_agg_to_index_col(MinMaxAggInfo *info, IndexOptInfo *index, int indexcol)
 {
-	ScanDirection	result;
+	ScanDirection result;
 
 	/* Check for operator match first (cheaper) */
 	if (info->aggsortop == index->fwdsortop[indexcol])
@@ -444,7 +480,6 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info)
 	Plan	   *iplan;
 	TargetEntry *tle;
 	SortClause *sortcl;
-	NullTest   *ntest;
 
 	/*
 	 * Generate a suitably modified query.	Much of the work here is probably
@@ -456,8 +491,8 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info)
 	subroot.init_plans = NIL;
 	subparse->commandType = CMD_SELECT;
 	subparse->resultRelation = 0;
-	subparse->resultRelations = NIL;
-	subparse->returningLists = NIL;
+	subparse->returningList = NIL;
+	subparse->utilityStmt = NULL;
 	subparse->intoClause = NULL;
 	subparse->hasAggs = false;
 	subparse->groupClause = NIL;
@@ -511,7 +546,7 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info)
 	 * basic indexscan, but we have to convert it to a Plan and attach a LIMIT
 	 * node above it.
 	 *
-	 * Also we must add a "WHERE foo IS NOT NULL" restriction to the
+	 * Also we must add a "WHERE target IS NOT NULL" restriction to the
 	 * indexscan, to be sure we don't return a NULL, which'd be contrary to
 	 * the standard behavior of MIN/MAX.  XXX ideally this should be done
 	 * earlier, so that the selectivity of the restriction could be included
@@ -521,11 +556,14 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info)
 	 * The NOT NULL qual has to go on the actual indexscan; create_plan might
 	 * have stuck a gating Result atop that, if there were any pseudoconstant
 	 * quals.
+	 *
+	 * We can skip adding the NOT NULL qual if it's redundant with either an
+	 * already-given WHERE condition, or a clause of the index predicate.
 	 */
 	plan = create_plan(&subroot, (Path *) info->path);
 
     /* Replace the plan's tlist with a copy of the one we built above. */
-    plan = plan_pushdown_tlist(plan, copyObject(subparse->targetList));
+    plan = plan_pushdown_tlist(root, plan, copyObject(subparse->targetList));
 
 	if (IsA(plan, Result))
 		iplan = plan->lefttree;
@@ -533,11 +571,9 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info)
 		iplan = plan;
 	Assert(IsA(iplan, IndexScan));
 
-	ntest = makeNode(NullTest);
-	ntest->nulltesttype = IS_NOT_NULL;
-	ntest->arg = copyObject(info->target);
-
-	iplan->qual = lcons(ntest, iplan->qual);
+	if (!list_member(iplan->qual, info->notnulltest) &&
+		!list_member(info->path->indexinfo->indpred, info->notnulltest))
+		iplan->qual = lcons(info->notnulltest, iplan->qual);
 
 	plan = (Plan *) make_limit(plan,
 							   subparse->limitOffset,
@@ -554,7 +590,11 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info)
 											 exprType((Node *) tle->expr),
 											 -1);
 
-	/* Make sure the InitPlan gets into the outer list */
+	/*
+	 * Make sure the InitPlan gets into the outer list.  It has to appear
+	 * after any other InitPlans it might depend on, too (see comments in
+	 * ExecReScan).
+	 */
 	root->init_plans = list_concat(root->init_plans, subroot.init_plans);
 }
 
diff --git a/src/backend/optimizer/plan/plangroupext.c b/src/backend/optimizer/plan/plangroupext.c
index 08ec077a9d24..8e9eff487cf0 100644
--- a/src/backend/optimizer/plan/plangroupext.c
+++ b/src/backend/optimizer/plan/plangroupext.c
@@ -840,7 +840,7 @@ make_list_aggs_for_rollup(PlannerInfo *root,
 		dummy_path.startup_cost = agg_node->startup_cost;
 		dummy_path.total_cost = agg_node->total_cost;
 		dummy_path.pathkeys = NIL;
-		if (choose_hashed_grouping(root, context->tuple_fraction, &dummy_path,
+		if (choose_hashed_grouping(root, context->tuple_fraction, -1.0, &dummy_path,
 								   NULL, NULL, 0, *context->p_dNumGroups,
 								   context->agg_counts))
 			context->aggstrategy = AGG_HASHED;
@@ -1084,7 +1084,7 @@ add_distinct_cost(Plan *agg_plan, GroupExtContext *context)
 		Node *dqa_expr = (Node *)lfirst(dqa_lc);
 		
 		cost_sort(&path_dummy, NULL, NIL, 0.0, avgsize,
-				  get_typavgwidth(exprType(dqa_expr), exprTypmod(dqa_expr)));
+				  get_typavgwidth(exprType(dqa_expr), exprTypmod(dqa_expr)), -1.0);
 		agg_plan->total_cost += path_dummy.total_cost;
 	}
 }
@@ -2128,7 +2128,7 @@ plan_list_rollup_plans(PlannerInfo *root,
 	{
 		if (!is_projection_capable_plan(lefttree))
 		{
-			Plan *plan = (Plan *)make_result(lefttree->targetlist, NULL, lefttree);
+			Plan *plan = (Plan *) make_result(root, lefttree->targetlist, NULL, lefttree);
 			if (lefttree->flow)
 				plan->flow = pull_up_Flow(plan, lefttree, true);
 			lefttree = plan;
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 808c0ae81111..0015e0a13864 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planmain.c,v 1.99 2007/01/20 20:45:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planmain.c,v 1.106 2008/01/11 04:02:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,6 +52,8 @@ static Bitmapset *distcols_in_groupclause(List *gc, Bitmapset *bms);
  * tlist is the target list the query should produce
  *		(this is NOT necessarily root->parse->targetList!)
  * tuple_fraction is the fraction of tuples we expect will be retrieved
+ * limit_tuples is a hard limit on number of tuples to retrieve,
+ *		or -1 if no limit
  *
  * Output parameters:
  * *cheapest_path receives the overall-cheapest path for the query
@@ -79,9 +81,13 @@ static Bitmapset *distcols_in_groupclause(List *gc, Bitmapset *bms);
  *		from the plan to be retrieved
  *	  tuple_fraction >= 1: tuple_fraction is the absolute number of tuples
  *		expected to be retrieved (ie, a LIMIT specification)
+ * Note that a nonzero tuple_fraction could come from outer context; it is
+ * therefore not redundant with limit_tuples.  We use limit_tuples to determine
+ * whether a bounded sort can be used at runtime.
  */
 void
-query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
+query_planner(PlannerInfo *root, List *tlist,
+			  double tuple_fraction, double limit_tuples,
 			  Path **cheapest_path, Path **sorted_path,
 			  double *num_groups)
 {
@@ -91,8 +97,8 @@ query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
 	Path	   *cheapestpath;
 	Path	   *sortedpath;
 	Index		rti;
-	double		total_pages;
 	ListCell   *lc;
+	double		total_pages;
 
 	/* Make tuple_fraction accessible to lower-level routines */
 	root->tuple_fraction = tuple_fraction;
@@ -109,9 +115,10 @@ query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
 		*cheapest_path = (Path *)
 			create_result_path((List *) parse->jointree->quals);
 		*sorted_path = NULL;
+
 		/*
-		 * We still are required to canonicalize any pathkeys, in case
-		 * it's something like "SELECT 2+2 ORDER BY 1".
+		 * We still are required to canonicalize any pathkeys, in case it's
+		 * something like "SELECT 2+2 ORDER BY 1".
 		 */
 		root->canon_pathkeys = NIL;
 		root->query_pathkeys = canonicalize_pathkeys(root,
@@ -147,7 +154,7 @@ query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
 	 * OK because the rangetable won't change any more).
 	 */
 	root->simple_rte_array = (RangeTblEntry **)
-	palloc0(root->simple_rel_array_size * sizeof(RangeTblEntry *));
+		palloc0(root->simple_rel_array_size * sizeof(RangeTblEntry *));
 	rti = 1;
 	foreach(lc, parse->rtable)
 	{
@@ -198,8 +205,8 @@ query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
 	 * Examine the targetlist and qualifications, adding entries to baserel
 	 * targetlists for all referenced Vars.  Restrict and join clauses are
 	 * added to appropriate lists belonging to the mentioned relations.  We
-	 * also build EquivalenceClasses for provably equivalent expressions,
-	 * and form a target joinlist for make_one_rel() to work from.
+	 * also build EquivalenceClasses for provably equivalent expressions, and
+	 * form a target joinlist for make_one_rel() to work from.
 	 *
 	 * Note: all subplan nodes will have "flat" (var-only) tlists. This
 	 * implies that all expression evaluations are done at the root of the
@@ -233,14 +240,14 @@ query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
 
 	/*
 	 * If we formed any equivalence classes, generate additional restriction
-	 * clauses as appropriate.  (Implied join clauses are formed on-the-fly
+	 * clauses as appropriate.	(Implied join clauses are formed on-the-fly
 	 * later.)
 	 */
 	generate_base_implied_equalities(root);
 
 	/*
 	 * We have completed merging equivalence sets, so it's now possible to
-	 * convert the requested query_pathkeys to canonical form.  Also
+	 * convert the requested query_pathkeys to canonical form.	Also
 	 * canonicalize the groupClause and sortClause pathkeys for use later.
 	 */
 	root->query_pathkeys = canonicalize_pathkeys(root, root->query_pathkeys);
@@ -400,7 +407,8 @@ query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
 			/* Figure cost for sorting */
 			cost_sort(&sort_path, root, root->query_pathkeys,
 					  cheapestpath->total_cost,
-					  cdbpath_rows(root, cheapestpath), final_rel->width);
+					  cdbpath_rows(root, cheapestpath), final_rel->width,
+					  limit_tuples);
 		}
 
 		if (compare_fractional_path_costs(sortedpath, &sort_path,
@@ -530,13 +538,14 @@ PlannerConfig *DefaultPlannerConfig(void)
 	return c1;
 }
 
-/**
+/*
  * Copy configuration information
  */
-PlannerConfig *CopyPlannerConfig(const PlannerConfig *c1)
+PlannerConfig *
+CopyPlannerConfig(const PlannerConfig *c1)
 {
-	Assert(c1);
 	PlannerConfig *c2 = (PlannerConfig *) palloc(sizeof(PlannerConfig));
+
 	memcpy(c2, c1, sizeof(PlannerConfig));
 	return c2;
 }
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index dc1ac663bdba..f99482fbd494 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.213 2007/02/19 07:03:29 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.226.2.4 2008/04/17 21:22:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,12 +57,14 @@
 #include "cdb/cdbsubselect.h"   /* cdbsubselect_flatten_sublinks() */
 #include "cdb/cdbvars.h"
 
+
 /* GUC parameter */
 double cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
 
 /* Hook for plugins to get control in planner() */
 planner_hook_type planner_hook = NULL;
 
+
 /* Expression kind codes for preprocess_expression */
 #define EXPRKIND_QUAL		0
 #define EXPRKIND_TARGET		1
@@ -165,41 +167,6 @@ static void log_optimizer(PlannedStmt *plan, bool fUnexpectedFailure)
 }
 #endif
 
-#ifdef USE_ORCA
-/**
- * Postprocessing of optimizer's plan
- */
-static void postprocess_plan(PlannedStmt *plan)
-{
-	Assert(plan);
-
-	PlannerGlobal *globNew =  makeNode(PlannerGlobal);
-
-	/* initialize */
-	globNew->paramlist = NIL;
-	globNew->subrtables = NIL;
-	globNew->finalrtable = NIL;
-	globNew->relationOids = NIL;
-	globNew->invalItems = NIL;
-	globNew->transientPlan = false;
-	globNew->share.sharedNodes = NIL;
-	globNew->share.sliceMarks = NIL;
-	globNew->share.motStack = NIL;
-	globNew->share.qdShares = NIL;
-	globNew->share.qdSlices = NIL;
-	globNew->share.planNodes = NIL;
-	globNew->share.nextPlanId = 0;
-	globNew->subplans = plan->subplans;
-	(void) apply_shareinput_xslice(plan->planTree, globNew);
-
-	/*
-	 * To save on memory, and on the network bandwidth when the plan is dispatched
-	 * QEs, strip all subquery RTEs of the original Query objects.
-	 */
-	remove_subquery_in_RTEs((Node *) plan->rtable);
-}
-#endif
-
 #ifdef USE_ORCA
 /*
  * optimize query using the new optimizer
@@ -208,22 +175,136 @@ static PlannedStmt *
 optimize_query(Query *parse, ParamListInfo boundParams)
 {
 	/* flag to check if optimizer unexpectedly failed to produce a plan */
-	bool fUnexpectedFailure = false;
+	bool		fUnexpectedFailure = false;
+	PlannerGlobal *glob;
+	Query	   *pqueryCopy;
+	PlannedStmt *result;
+	List	   *relationOids;
+	List	   *invalItems;
+	ListCell   *lc;
+	ListCell   *lp;
+
+	/*
+	 * Initialize a dummy PlannerGlobal struct. ORCA doesn't use it, but
+	 * the pre- and post-processing steps do.
+	 */
+	glob = makeNode(PlannerGlobal);
+	glob->paramlist = NIL;
+	glob->subrtables = NIL;
+	glob->rewindPlanIDs = NULL;
+	glob->transientPlan = false;
+	glob->share.sharedNodes = NIL;
+	glob->share.sliceMarks = NIL;
+	glob->share.motStack = NIL;
+	glob->share.qdShares = NIL;
+	glob->share.qdSlices = NIL;
+	glob->share.nextPlanId = 0;
+	/* these will be filled in below, in the pre- and post-processing steps */
+	glob->finalrtable = NIL;
+	glob->subplans = NIL;
+	glob->relationOids = NIL;
+	glob->invalItems = NIL;
 
-	/* create a local copy and hand it to the optimizer */
-	Query *pqueryCopy = (Query *) copyObject(parse);
+	/* create a local copy to hand to the optimizer */
+	pqueryCopy = (Query *) copyObject(parse);
 
-	/* perform pre-processing of query tree before calling optimizer */
-	pqueryCopy = preprocess_query_optimizer(pqueryCopy, boundParams);
+	/*
+	 * Pre-process the Query tree before calling optimizer. Currently, this
+	 * performs only constant folding.
+	 *
+	 * Constant folding will add dependencies to functions or relations in
+	 * glob->invalItems, for any functions that are inlined or eliminated
+	 * away. (We will find dependencies to other objects later, after planning).
+	 */
+	pqueryCopy = preprocess_query_optimizer(glob, pqueryCopy, boundParams);
 
-	PlannedStmt *result = PplstmtOptimize(pqueryCopy, &fUnexpectedFailure);
+	/* Ok, invoke ORCA. */
+	result = PplstmtOptimize(pqueryCopy, &fUnexpectedFailure);
 
-	if (result)
+	log_optimizer(result, fUnexpectedFailure);
+
+	/*
+	 * If ORCA didn't produce a plan, bail out and fall back to the Postgres
+	 * planner.
+	 */
+	if (!result)
+		return NULL;
+
+	/*
+	 * Post-process the plan.
+	 */
+
+	/*
+	 * ORCA filled in the final range table and subplans directly in the
+	 * PlannedStmt. We might need to modify them still, so copy them out
+	 * to the PlannerGlobal struct.
+	 */
+	glob->finalrtable = result->rtable;
+	glob->subplans = result->subplans;
+
+	/* Post-process ShareInputScan nodes */
+	(void) apply_shareinput_xslice(result->planTree, glob);
+
+	/*
+	 * Fix ShareInputScans for EXPLAIN, like in standard_planner(). For all
+	 * subplans first, and then for the main plan tree.
+	 */
+	foreach(lp, glob->subplans)
 	{
-		postprocess_plan(result);
+		Plan	   *subplan = (Plan *) lfirst(lp);
+		lfirst(lp) = replace_shareinput_targetlists(glob, subplan);
 	}
+	result->planTree = replace_shareinput_targetlists(glob, result->planTree);
 
-	log_optimizer(result, fUnexpectedFailure);
+	/*
+	 * To save on memory, and on the network bandwidth when the plan is
+	 * dispatched to QEs, strip all subquery RTEs of the original Query
+	 * objects.
+	 */
+	remove_subquery_in_RTEs((Node *) glob->finalrtable);
+
+	/*
+	 * For plan cache invalidation purposes, extract the OIDs of all
+	 * relations in the final range table, and of all functions used in
+	 * expressions in the plan tree. (In the regular planner, this is done
+	 * in set_plan_references, see that for more comments.)
+	 */
+	foreach(lc, glob->finalrtable)
+	{
+		RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+
+		if (rte->rtekind == RTE_RELATION)
+			glob->relationOids = lappend_oid(glob->relationOids,
+											 rte->relid);
+	}
+	foreach(lp, glob->subplans)
+	{
+		Plan	   *subplan = (Plan *) lfirst(lp);
+
+		cdb_extract_plan_dependencies(glob, subplan);
+	}
+	cdb_extract_plan_dependencies(glob, result->planTree);
+
+	/*
+	 * Also extract dependencies from the original Query tree. This is needed
+	 * to capture dependencies to e.g. views, which have been expanded at
+	 * planning to the underlying tables, and don't appear anywhere in the
+	 * resulting plan.
+	 */
+	extract_query_dependencies(list_make1(pqueryCopy),
+							   &relationOids,
+							   &invalItems);
+	glob->relationOids = list_concat(glob->relationOids, relationOids);
+	glob->invalItems = list_concat(glob->invalItems, invalItems);
+
+	/*
+	 * All done! Copy the PlannerGlobal fields that we modified back to the
+	 * PlannedStmt before returning.
+	 */
+	result->rtable = glob->finalrtable;
+	result->subplans = glob->subplans;
+	result->relationOids = glob->relationOids;
+	result->invalItems = glob->invalItems;
 
 	return result;
 }
@@ -242,10 +323,8 @@ optimize_query(Query *parse, ParamListInfo boundParams)
  * so you'd better copy that data structure if you want to plan more than once.
  *
  *****************************************************************************/
-
 PlannedStmt *
-planner(Query *parse, int cursorOptions,
-		ParamListInfo boundParams)
+planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 {
 	PlannedStmt *result = NULL;
 	instr_time	starttime, endtime;
@@ -311,25 +390,22 @@ planner(Query *parse, int cursorOptions,
 	return result;
 }
 
-
 PlannedStmt *
 standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 {
 	PlannedStmt *result;
 	PlannerGlobal *glob;
-	bool isCursor = false;
 	double		tuple_fraction;
 	PlannerInfo *root;
 	Plan	   *top_plan;
 	ListCell   *lp,
 			   *lr;
+	PlannerConfig *config;
 
-	/* Cursor options may come from caller or from DECLARE CURSOR stmt. */
-	if (parse->utilityStmt && IsA(parse->utilityStmt, DeclareCursorStmt))
-	{
-		isCursor = true;
+	/* Cursor options may come from caller or from DECLARE CURSOR stmt */
+	if (parse->utilityStmt &&
+		IsA(parse->utilityStmt, DeclareCursorStmt))
 		cursorOptions |= ((DeclareCursorStmt *) parse->utilityStmt)->options;
-	}
 
 	/*
 	 * Set up global state for this planner invocation.  This data is needed
@@ -343,6 +419,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	glob->paramlist = NIL;
 	glob->subplans = NIL;
 	glob->subrtables = NIL;
+	glob->rewindPlanIDs = NULL;
 	glob->finalrtable = NIL;
 	glob->relationOids = NIL;
 	glob->invalItems = NIL;
@@ -353,11 +430,10 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	glob->share.motStack = NIL;
 	glob->share.qdShares = NIL;
 	glob->share.qdSlices = NIL;
-	glob->share.planNodes = NIL;
 	glob->share.nextPlanId = 0;
 
 	/* Determine what fraction of the plan is likely to be scanned */
-	if (isCursor)
+	if (cursorOptions & CURSOR_OPT_FAST_PLAN)
 	{
 		/*
 		 * We have no real idea how many tuples the user will ultimately FETCH
@@ -388,7 +464,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
 	parse = normalize_query(parse);
 
-	PlannerConfig *config = DefaultPlannerConfig();
+	config = DefaultPlannerConfig();
 
 	/* primary planning entry point (may recurse for subqueries) */
 	top_plan = subquery_planner(glob, parse, NULL, tuple_fraction, &root, config);
@@ -397,27 +473,29 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	 * If creating a plan for a scrollable cursor, make sure it can run
 	 * backwards on demand.  Add a Material node at the top at need.
 	 */
-	if (isCursor && (cursorOptions & CURSOR_OPT_SCROLL))
+	if (cursorOptions & CURSOR_OPT_SCROLL)
 	{
 		if (!ExecSupportsBackwardScan(top_plan))
 			top_plan = materialize_finished_plan(root, top_plan);
 	}
 
 
-	/* Fix sharing id and shared id.  
+	/*
+	 * Fix sharing id and shared id.
 	 *
 	 * This must be called before set_plan_references and cdbparallelize.  The other mutator
 	 * or tree walker assumes the input is a tree.  If there is plan sharing, we have a DAG. 
 	 *
 	 * apply_shareinput will fix shared_id, and change the DAG to a tree.
 	 */
-
-	foreach(lp, glob->subplans)
+	forboth(lp, glob->subplans, lr, glob->subrtables)
 	{
 		Plan	   *subplan = (Plan *) lfirst(lp);
-		lfirst(lp) = apply_shareinput_dag_to_tree(subplan, &glob->share);
+		List	   *subrtable = (List *) lfirst(lr);
+
+		lfirst(lp) = apply_shareinput_dag_to_tree(glob, subplan, subrtable);
 	}
-	top_plan = apply_shareinput_dag_to_tree(top_plan, &glob->share);
+	top_plan = apply_shareinput_dag_to_tree(glob, top_plan, root->parse->rtable);
 
 	/* final cleanup of the plan */
 	Assert(glob->finalrtable == NIL);
@@ -429,16 +507,13 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	{
 		Plan	   *subplan = (Plan *) lfirst(lp);
 		List	   *subrtable = (List *) lfirst(lr);
-		
+
 		lfirst(lp) = set_plan_references(glob, subplan, subrtable);
 	}
 
 	/* walk plan and remove unused initplans and their params */
 	remove_unused_initplans(top_plan, root);
 
-	/* executor wants to know total number of Params used overall */
-	top_plan->nParamExec = list_length(glob->paramlist);
-
 	if ( Gp_role == GP_ROLE_DISPATCH )
 	{
 		XsliceInAppendContext append_context;
@@ -466,6 +541,14 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
 	top_plan = zap_trivial_result(root, top_plan);
 
+	/* fix ShareInputScans for EXPLAIN */
+	foreach(lp, glob->subplans)
+	{
+		Plan	   *subplan = (Plan *) lfirst(lp);
+		lfirst(lp) = replace_shareinput_targetlists(glob, subplan);
+	}
+	top_plan = replace_shareinput_targetlists(glob, top_plan);
+
 	/*
 	 * To save on memory, and on the network bandwidth when the plan is dispatched
 	 * QEs, strip all subquery RTEs of the original Query objects.
@@ -474,7 +557,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
 	/* build the PlannedStmt result */
 	result = makeNode(PlannedStmt);
-	
+
 	result->commandType = parse->commandType;
 	result->canSetTag = parse->canSetTag;
 	result->transientPlan = glob->transientPlan;
@@ -484,22 +567,23 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	result->utilityStmt = parse->utilityStmt;
 	result->intoClause = parse->intoClause;
 	result->subplans = glob->subplans;
+	result->rewindPlanIDs = glob->rewindPlanIDs;
 	result->returningLists = root->returningLists;
 	result->result_partitions = root->result_partitions;
 	result->result_aosegnos = root->result_aosegnos;
 	result->rowMarks = parse->rowMarks;
 	result->relationOids = glob->relationOids;
 	result->invalItems = glob->invalItems;
-	result->nCrossLevelParams = list_length(glob->paramlist);
+	result->nParamExec = list_length(glob->paramlist);
 	result->nMotionNodes = top_plan->nMotionNodes;
 	result->nInitPlans = top_plan->nInitPlans;
 	result->intoPolicy = GpPolicyCopy(CurrentMemoryContext, parse->intoPolicy);
 	result->queryPartOids = NIL;
 	result->queryPartsMetadata = NIL;
 	result->numSelectorsPerScanId = NIL;
-	
+
 	Assert(result->utilityStmt == NULL || IsA(result->utilityStmt, DeclareCursorStmt));
-	
+
 	if (Gp_role == GP_ROLE_DISPATCH)
 	{
 		/*
@@ -541,8 +625,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
  *--------------------
  */
 Plan *
-subquery_planner(PlannerGlobal *glob,
-				 Query *parse, 
+subquery_planner(PlannerGlobal *glob, Query *parse,
 				 PlannerInfo *parent_root,
 				 double tuple_fraction,
 				 PlannerInfo **subroot,
@@ -846,7 +929,7 @@ subquery_planner(PlannerGlobal *glob,
 		root->query_level > 1)
 	{
 		Assert(root->parse == parse); /* GPDP isn't always careful about this. */
-		SS_finalize_plan(root, root->parse->rtable, plan, true);
+		SS_finalize_plan(root, plan, true);
 	}
 
 	/* Return internal info if caller wants it */
@@ -1140,6 +1223,7 @@ inheritance_planner(PlannerInfo *root)
 	}
 	
 	root->returningLists = returningLists;
+
 	/* Mark result as unordered (probably unnecessary) */
 	root->query_pathkeys = NIL;
 
@@ -1147,40 +1231,48 @@ inheritance_planner(PlannerInfo *root)
 	 * If we managed to exclude every child rel, return a dummy plan
 	 */
 	if (subplans == NIL)
-		return (Plan *) make_result(tlist,
+	{
+		root->resultRelations = list_make1_int(parentRTindex);
+		/* although dummy, it must have a valid tlist for executor */
+		tlist = preprocess_targetlist(root, parse->targetList);
+		return (Plan *) make_result(root,
+									tlist,
 									(Node *) list_make1(makeBoolConst(false,
 																	  false)),
 									NULL);
+	}
 
-	plan = (Plan *) make_append(subplans, true, tlist);
-	
-	/* MPP dispatch needs to know the kind of locus. */
-	if ( Gp_role == GP_ROLE_DISPATCH )
+	/* Suppress Append if there's only one surviving child rel */
+	if (list_length(subplans) == 1)
+		plan = (Plan *) linitial(subplans);
+	else
 	{
-		switch ( append_locustype )
+		plan = (Plan *) make_append(subplans, true, tlist);
+
+		/* MPP dispatch needs to know the kind of locus. */
+		if ( Gp_role == GP_ROLE_DISPATCH )
 		{
-		case CdbLocusType_Entry:
-			mark_plan_entry(plan);
-			break;
-			
-		case CdbLocusType_Hashed:
-		case CdbLocusType_HashedOJ:
-		case CdbLocusType_Strewn:
-			/* Depend on caller to avoid incompatible hash keys. */
-			/* For our purpose (UPD/DEL target), strewn is good enough. */
-			mark_plan_strewn(plan);
-			break;
-			
-		default:
-			ereport(ERROR, (
-				errcode(ERRCODE_CDB_INTERNAL_ERROR),
-				errmsg("unexpected locus assigned to target inheritance set") ));
+			switch ( append_locustype )
+			{
+				case CdbLocusType_Entry:
+					mark_plan_entry(plan);
+					break;
+
+				case CdbLocusType_Hashed:
+				case CdbLocusType_HashedOJ:
+				case CdbLocusType_Strewn:
+					/* Depend on caller to avoid incompatible hash keys. */
+					/* For our purpose (UPD/DEL target), strewn is good enough. */
+					mark_plan_strewn(plan);
+					break;
+
+				default:
+					ereport(ERROR,
+							(errcode(ERRCODE_CDB_INTERNAL_ERROR),
+							 errmsg("unexpected locus assigned to target inheritance set") ));
+			}
 		}
 	}
-	
-	/* Suppress Append if there's only one surviving child rel */
-	if (list_length(subplans) == 1)
-		return (Plan *) linitial(subplans);
 
 	return plan;
 }
@@ -1193,8 +1285,6 @@ static void grouping_planner_output_asserts(PlannerInfo *root, Plan *plan);
  */
 void grouping_planner_output_asserts(PlannerInfo *root, Plan *plan)
 {
-	Assert(plan);
-
 	/* Ensure that plan refers to vars that have varlevelsup = 0 AND varno is in the rtable */
 	List *allVars = extract_nodes(root->glob, (Node *) plan, T_Var);
 	ListCell *lc = NULL;
@@ -1298,13 +1388,13 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
         tuple_fraction = preprocess_limit(root, tuple_fraction,
                                           &offset_est, &count_est);
 
-        /*
-         * If we have a known LIMIT, and don't have an unknown OFFSET, we can
-         * estimate the effects of using a bounded sort.
-         */
-        if (count_est > 0 && offset_est >= 0)
-            limit_tuples = (double) count_est + (double) offset_est;
-    }
+		/*
+		 * If we have a known LIMIT, and don't have an unknown OFFSET, we can
+		 * estimate the effects of using a bounded sort.
+		 */
+		if (count_est > 0 && offset_est >= 0)
+			limit_tuples = (double) count_est + (double) offset_est;
+	}
 
 	if (parse->setOperations)
 	{
@@ -1334,7 +1424,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		 */
 		current_pathkeys = make_pathkeys_for_sortclauses(root,
 														 set_sortclauses,
-													result_plan->targetlist,
+													 result_plan->targetlist,
 														 true);
 
 		/*
@@ -1511,7 +1601,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		 * estimate the number of groups in the query, and canonicalize all
 		 * the pathkeys.
 		 */
-		query_planner(root, sub_tlist, tuple_fraction,
+		query_planner(root, sub_tlist, tuple_fraction, limit_tuples,
 					  &cheapest_path, &sorted_path, &dNumGroups);
 
 		group_pathkeys = root->group_pathkeys;
@@ -1524,7 +1614,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 		if (parse->groupClause)
 		{
 			use_hashed_grouping =
-				choose_hashed_grouping(root, tuple_fraction,
+				choose_hashed_grouping(root, tuple_fraction, limit_tuples,
 									   cheapest_path, sorted_path,
 									   groupOperators, numGroupCols, dNumGroups,
 									   &agg_counts);
@@ -1663,10 +1753,24 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 			 * Normal case --- create a plan according to query_planner's
 			 * results.
 			 */
+			bool	need_sort_for_grouping = false;
+
 			result_plan = create_plan(root, best_path);
 			current_pathkeys = best_path->pathkeys;
 			current_locus = best_path->locus; /* just use keys, don't copy */
 
+			/* Detect if we'll need an explicit sort for grouping */
+			if (parse->groupClause && !use_hashed_grouping &&
+				!pathkeys_contained_in(group_pathkeys, current_pathkeys))
+			{
+				need_sort_for_grouping = true;
+				/*
+				 * Always override query_planner's tlist, so that we don't
+				 * sort useless data from a "physical" tlist.
+				 */
+				need_tlist_eval = true;
+			}
+
 			/*
 			 * create_plan() returns a plan with just a "flat" tlist of
 			 * required Vars.  Usually we need to insert the sub_tlist as the
@@ -1681,7 +1785,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 				 * evaluation, we must insert a Result node to project the
 				 * desired tlist.
 				 */
-				result_plan = plan_pushdown_tlist(result_plan, sub_tlist);
+				result_plan = plan_pushdown_tlist(root, result_plan, sub_tlist);
 
 				/*
 				 * Also, account for the cost of evaluation of the sub_tlist.
@@ -1768,8 +1872,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 
 				if (parse->groupClause)
 				{
-					if (!pathkeys_contained_in(group_pathkeys,
-											   current_pathkeys))
+					if (need_sort_for_grouping)
 					{
 						result_plan = (Plan *)
 							make_sort_from_groupcols(root,
@@ -1895,7 +1998,8 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 				 * this routine to avoid having to generate the plan in the
 				 * first place.
 				 */
-				result_plan = (Plan *) make_result(tlist,
+				result_plan = (Plan *) make_result(root,
+												   tlist,
 												   parse->havingQual,
 												   NULL);
 				/* Result will be only one row anyway; no sort order */
@@ -1956,7 +2060,7 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 				base_cost = motion_cost_per_row * result_plan->plan_rows;
 				alt_cost = motion_cost_per_row * numDistinct;
 				cost_sort(&sort_path, root, NIL, alt_cost, 
-						  numDistinct, result_plan->plan_rows);
+						  numDistinct, result_plan->plan_rows, -1.0);
 				alt_cost += sort_path.startup_cost;
 				alt_cost += cpu_operator_cost * numDistinct 
 							* list_length(parse->distinctClause);
@@ -2551,7 +2655,8 @@ extract_grouping_ops(List *groupClause, int *numGroupOps)
  * choose_hashed_grouping - should we use hashed grouping?
  */
 bool
-choose_hashed_grouping(PlannerInfo *root, double tuple_fraction,
+choose_hashed_grouping(PlannerInfo *root,
+					   double tuple_fraction, double limit_tuples,
 					   Path *cheapest_path, Path *sorted_path,
 					   Oid *groupOperators, int numGroupOps, double dNumGroups,
 					   AggClauseCounts *agg_counts)
@@ -2572,8 +2677,8 @@ choose_hashed_grouping(PlannerInfo *root, double tuple_fraction,
 	/*
 	 * Check can't-do-it conditions, including whether the grouping operators
 	 * are hashjoinable.  (We assume hashing is OK if they are marked
-	 * oprcanhash.  If there isn't actually a supporting hash function,
-	 * the executor will complain at runtime.)
+	 * oprcanhash.	If there isn't actually a supporting hash function, the
+	 * executor will complain at runtime.)
 	 *
 	 * Executor doesn't support hashed aggregation with DISTINCT aggregates.
 	 * (Doing so would imply storing *all* the input values in the hash table,
@@ -2674,7 +2779,7 @@ choose_hashed_grouping(PlannerInfo *root, double tuple_fraction,
 	/* Result of hashed agg is always unsorted */
 	if (root->sort_pathkeys)
 		cost_sort(&hashed_p, root, root->sort_pathkeys, hashed_p.total_cost,
-				  dNumGroups, cheapest_path_width);
+				  dNumGroups, cheapest_path_width, limit_tuples);
 
 	if (sorted_path)
 	{
@@ -2691,7 +2796,7 @@ choose_hashed_grouping(PlannerInfo *root, double tuple_fraction,
 	if (!pathkeys_contained_in(root->group_pathkeys, current_pathkeys))
 	{
 		cost_sort(&sorted_p, root, root->group_pathkeys, sorted_p.total_cost,
-				  cheapest_path_rows, cheapest_path_width);
+				  cheapest_path_rows, cheapest_path_width, -1.0);
 		current_pathkeys = root->group_pathkeys;
 	}
 
@@ -2708,7 +2813,7 @@ choose_hashed_grouping(PlannerInfo *root, double tuple_fraction,
 	if (root->sort_pathkeys &&
 		!pathkeys_contained_in(root->sort_pathkeys, current_pathkeys))
 		cost_sort(&sorted_p, root, root->sort_pathkeys, sorted_p.total_cost,
-				  dNumGroups, cheapest_path_width);
+				  dNumGroups, cheapest_path_width, limit_tuples);
 
 	/*
 	 * Now make the decision using the top-level tuple fraction.  First we
@@ -2757,7 +2862,7 @@ choose_hashed_grouping(PlannerInfo *root, double tuple_fraction,
  * pass down only c,d,a+b, but it's not really worth the trouble to
  * eliminate simple var references from the subplan.  We will avoid doing
  * the extra computation to recompute a+b at the outer level; see
- * replace_vars_with_subplan_refs() in setrefs.c.)
+ * fix_upper_expr() in setrefs.c.)
  *
  * If we are grouping or aggregating, *and* there are no non-Var grouping
  * expressions, then the returned tlist is effectively dummy; we do not
diff --git a/src/backend/optimizer/plan/planpartition.c b/src/backend/optimizer/plan/planpartition.c
index 712eb52c2811..aae291ed979c 100644
--- a/src/backend/optimizer/plan/planpartition.c
+++ b/src/backend/optimizer/plan/planpartition.c
@@ -829,7 +829,7 @@ static void ConstructInitPlan(PartitionJoinMutatorContext *ctx)
 {
 	Assert(CurrentMemoryContext == ctx->callerCtx);
 
-	ctx->outerPlan = plan_pushdown_tlist(ctx->outerPlan, ctx->outerTargetList);
+	ctx->outerPlan = plan_pushdown_tlist(ctx->root, ctx->outerPlan, ctx->outerTargetList);
 
 	ctx->outerPlan = GatherToQD(ctx->outerPlan);
 
@@ -921,7 +921,7 @@ static Plan *TransformPartitionJoin(Plan *plan, PartitionJoinMutatorContext *ctx
 		saop->opfuncid = 184;
 		saop->useOr = true;
 
-		Result *result = make_result(child->targetlist, (Node *) list_make1(saop) /*resconstantqual */, child);
+		Result *result = make_result(ctx->root, child->targetlist, (Node *) list_make1(saop) /*resconstantqual */, child);
 		newChildren = lappend(newChildren, result);
 	}
 	append->appendplans = newChildren;
@@ -1304,7 +1304,7 @@ make_mergeclause(Node *outer, Node *inner)
 
 	xpr = make_notclause((Expr *) opxpr);
 
-	rinfo = make_restrictinfo(xpr, false, false, false, NULL);
+	rinfo = make_restrictinfo(xpr, false, false, false, NULL, NULL, NULL);
 	rinfo->mergeopfamilies = get_mergejoin_opfamilies(opxpr->opno);
 
 	return rinfo;
diff --git a/src/backend/optimizer/plan/planshare.c b/src/backend/optimizer/plan/planshare.c
index 60af82d615e4..daec04936ce3 100644
--- a/src/backend/optimizer/plan/planshare.c
+++ b/src/backend/optimizer/plan/planshare.c
@@ -135,27 +135,26 @@ static ShareInputScan *make_shareinputscan(PlannerInfo *root, Plan *inputplan)
 	sisc = makeNode(ShareInputScan);
 	incr_plan_nsharer(inputplan);
 
-
-	sisc->plan.targetlist = copyObject(inputplan->targetlist);
-	sisc->plan.lefttree = inputplan;
-	sisc->plan.flow = copyObject(inputplan->flow); 
+	sisc->scan.plan.targetlist = copyObject(inputplan->targetlist);
+	sisc->scan.plan.lefttree = inputplan;
+	sisc->scan.plan.flow = copyObject(inputplan->flow);
 
 	set_plan_share_type((Plan *) sisc, get_plan_share_type(inputplan));
 	set_plan_share_id((Plan *) sisc, get_plan_share_id(inputplan));
 	sisc->driver_slice = -1;
 
-	sisc->plan.qual = NIL;
-	sisc->plan.righttree = NULL;
+	sisc->scan.plan.qual = NIL;
+	sisc->scan.plan.righttree = NULL;
 
 	cost_shareinputscan(&sipath, root, inputplan->total_cost, inputplan->plan_rows, inputplan->plan_width);
 
-	sisc->plan.startup_cost = sipath.startup_cost;
-	sisc->plan.total_cost = sipath.total_cost; 
-	sisc->plan.plan_rows = inputplan->plan_rows;
-	sisc->plan.plan_width = inputplan->plan_width;
+	sisc->scan.plan.startup_cost = sipath.startup_cost;
+	sisc->scan.plan.total_cost = sipath.total_cost; 
+	sisc->scan.plan.plan_rows = inputplan->plan_rows;
+	sisc->scan.plan.plan_width = inputplan->plan_width;
 
-	sisc->plan.extParam = bms_copy(inputplan->extParam);
-	sisc->plan.allParam = bms_copy(inputplan->allParam);
+	sisc->scan.plan.extParam = bms_copy(inputplan->extParam);
+	sisc->scan.plan.allParam = bms_copy(inputplan->allParam);
 
 	return sisc;
 }
diff --git a/src/backend/optimizer/plan/planwindow.c b/src/backend/optimizer/plan/planwindow.c
index 5a52d1df7e2d..b9c0b9e32369 100644
--- a/src/backend/optimizer/plan/planwindow.c
+++ b/src/backend/optimizer/plan/planwindow.c
@@ -1779,7 +1779,7 @@ static Plan *plan_common_subquery(PlannerInfo *root, List *lower_tlist,
 
 
 	/* Generate the best unsorted and presorted paths for this Query. */
-	query_planner(root, lower_tlist, 0.0, 
+	query_planner(root, lower_tlist, 0.0, -1.0,
 				  &cheapest_path, &sorted_path, &num_groups);
 					  
 	if ( order_hint != NIL &&
@@ -1796,7 +1796,7 @@ static Plan *plan_common_subquery(PlannerInfo *root, List *lower_tlist,
 	
 	/* Make the plan. */
 	result_plan = create_plan(root, best_path);
-	result_plan = plan_pushdown_tlist(result_plan, lower_tlist);
+	result_plan = plan_pushdown_tlist(root, result_plan, lower_tlist);
 	
 	Assert(result_plan->flow);
 
@@ -2072,7 +2072,8 @@ static Plan *plan_sequential_window_query(PlannerInfo *root, WindowContext *cont
 	AttrNumber resno;
 	ListCell *lc;
 	QualCost tlist_cost;
-		
+	int			i;
+
 	Assert ( pathkeys_ptr != NULL );
 	Assert ( context->original_range );
 	
@@ -2174,6 +2175,17 @@ static Plan *plan_sequential_window_query(PlannerInfo *root, WindowContext *cont
 	root->simple_rel_array_size = list_length(root->parse->rtable) + 1;
 	root->simple_rel_array = (RelOptInfo **)
 		palloc0(root->simple_rel_array_size * sizeof(RelOptInfo *));
+
+	root->simple_rte_array = (RangeTblEntry **)
+		palloc0(sizeof(RangeTblEntry *) * root->simple_rel_array_size);
+
+	i = 1;
+	foreach(lc, root->parse->rtable)
+	{
+		root->simple_rte_array[i] = lfirst(lc);
+		i++;
+	}
+
 	add_base_rels_to_query(root, (Node *)root->parse->jointree);
 
 	/* XXX I don't think the quals are used later so no need to translate. 
@@ -2192,7 +2204,7 @@ static Plan *plan_sequential_window_query(PlannerInfo *root, WindowContext *cont
 	 * XXX Could track this and avoid, but not yet.
 	 */
 	root->parse->targetList = targetlist;
-	result_plan = plan_pushdown_tlist(result_plan, targetlist);
+	result_plan = plan_pushdown_tlist(root, result_plan, targetlist);
 	cost_qual_eval(&tlist_cost, targetlist, root);
 	result_plan->startup_cost += tlist_cost.startup;
 	result_plan->total_cost += tlist_cost.startup + tlist_cost.per_tuple * result_plan->plan_rows;
@@ -2864,7 +2876,7 @@ static Plan *plan_parallel_window_query(PlannerInfo *root, WindowContext *contex
 			make_pathkeys_for_sortclauses(root, root->parse->sortClause, targetlist, true);
 		root->query_pathkeys = root->sort_pathkeys;
 		
-		query_planner(root, targetlist, 0.0, &cheapest_path, &sorted_path, &ngroups);
+		query_planner(root, targetlist, 0.0, -1.0, &cheapest_path, &sorted_path, &ngroups);
 		
 		if ( sorted_path != NULL )
 			best_path = sorted_path;
@@ -2878,7 +2890,7 @@ static Plan *plan_parallel_window_query(PlannerInfo *root, WindowContext *contex
 		 * since our target list may have expressions.  (Could track this
 		 * and avoid, but not yet.)
 		 */
-		result_plan = plan_pushdown_tlist(result_plan, targetlist);
+		result_plan = plan_pushdown_tlist(root, result_plan, targetlist);
 		cost_qual_eval(&tlist_cost, targetlist, root);
 		result_plan->startup_cost += tlist_cost.startup;
 		result_plan->total_cost += tlist_cost.startup + tlist_cost.per_tuple * result_plan->plan_rows;
@@ -4210,8 +4222,6 @@ Query *copy_common_subquery(Query *original, List *targetList)
 	common->limitOffset = NULL;
 	common->limitCount = NULL;
 	common->rowMarks = NIL;
-	common->resultRelations = NIL;
-	common->returningLists = NIL;
 	
 	return common;
 }
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 37f1b89e79a7..ae35b2cbf221 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -2,7 +2,7 @@
  *
  * setrefs.c
  *	  Post-processing of a completed plan tree: fix references to subplan
- *	  vars, and compute regproc values for operators
+ *	  vars, compute regproc values for operators, etc
  *
  * Portions Copyright (c) 2005-2008, Greenplum inc
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
@@ -10,12 +10,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.130 2007/02/19 02:23:12 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.141.2.1 2008/06/17 14:51:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "access/transam.h"
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
@@ -70,6 +71,14 @@ typedef struct
 	int			rtoffset;
 } fix_upper_expr_context;
 
+typedef struct
+{
+	plan_tree_base_prefix base;
+
+	PlannerGlobal *glob;
+
+} cdb_extract_plan_dependencies_context;
+
 /*
  * Check if a Const node is a regclass value.  We accept plain OID too,
  * since a regclass Const will get folded to that type if it's an argument
@@ -123,28 +132,22 @@ static List *fix_child_hashclauses(PlannerGlobal *glob,
 					  indexed_tlist *inner_itlist,
 					  Index acceptable_rel, int rtoffset,
 					  Index child);
-
 static Node *fix_upper_expr(PlannerGlobal *glob,
 			   Node *node,
 			   indexed_tlist *subplan_itlist,
 			   int rtoffset);
 static Node *fix_upper_expr_mutator(Node *node,
-									fix_upper_expr_context *context);
+					   fix_upper_expr_context *context);
 static bool fix_opfuncids_walker(Node *node, void *context);
 static  bool cdb_expr_requires_full_eval(Node *node);
 static Plan *cdb_insert_result_node(PlannerGlobal *glob, 
 									Plan *plan, 
 									int rtoffset);
-static void record_plan_function_dependency(PlannerGlobal *glob, 
-											Oid funcid);
 
 static bool extract_query_dependencies_walker(Node *node,
 								  PlannerGlobal *context);
-/* fix the target lists of projection-incapable nodes to use the target list of the child node */
-static void fix_projection_incapable_nodes(Plan *plan);
-
-/* fix the target lists of  projection-incapable nodes in subplans to use the target list of the child node */
-static void fix_projection_incapable_nodes_in_subplans(PlannerGlobal *context, Plan *plan);
+static bool cdb_extract_plan_dependencies_walker(Node *node,
+									 cdb_extract_plan_dependencies_context *context);
 
 #ifdef USE_ASSERT_CHECKING
 #include "cdb/cdbplan.h"
@@ -154,14 +157,12 @@ static void fix_projection_incapable_nodes_in_subplans(PlannerGlobal *context, P
  */
 static void set_plan_references_input_asserts(PlannerGlobal *glob, Plan *plan, List *rtable)
 {
-	Assert(glob);
-	Assert(plan);
-
 	/* Note that rtable MAY be NULL */
 
 	/* Ensure that plan refers to vars that have varlevelsup = 0 AND varno is in the rtable */
 	List *allVars = extract_nodes(glob, (Node *) plan, T_Var);
 	ListCell *lc = NULL;
+	List *allParams;
 
 	foreach (lc, allVars)
 	{
@@ -191,7 +192,7 @@ static void set_plan_references_input_asserts(PlannerGlobal *glob, Plan *plan, L
 	}
 
 	/* Ensure that all params that the plan refers to has a corresponding subplan */
-	List *allParams = extract_nodes(glob, (Node *) plan, T_Param);
+	allParams = extract_nodes(glob, (Node *) plan, T_Param);
 
 	foreach (lc, allParams)
 	{
@@ -249,12 +250,10 @@ static void set_plan_references_output_asserts(PlannerGlobal *glob, Plan *plan)
 	foreach (lc, allVars)
 	{
 		Var *var = (Var *) lfirst(lc);
-
 		Assert((var->varno == INNER
 				|| var->varno == OUTER
 				|| (var->varno > 0 && var->varno <= list_length(glob->finalrtable)))
 				&& "Plan contains var that refer outside the rtable.");
-
 		Assert(var->varattno > FirstLowInvalidHeapAttributeNumber && "Invalid attribute number in plan");
 
 		if (var->varno > 0 && var->varno <= list_length(glob->finalrtable))
@@ -312,10 +311,6 @@ static void set_plan_references_output_asserts(PlannerGlobal *glob, Plan *plan)
  * that implements each op).
  *
  * 5. We create lists of specific objects that the plan depends on.
- *
- * NB In GPDB we only build the relation list, though the apparatus is in
- *    place to collect PlanInvalItems when that becomes interesting.
- *
  * This will be used by plancache.c to drive invalidation of cached plans.
  * Relation dependencies are represented by OIDs, and everything else by
  * PlanInvalItems (this distinction is motivated by the shared-inval APIs).
@@ -354,6 +349,9 @@ static void set_plan_references_output_asserts(PlannerGlobal *glob, Plan *plan)
 Plan *
 set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable)
 {
+	int			rtoffset = list_length(glob->finalrtable);
+	ListCell   *lc;
+
 #ifdef USE_ASSERT_CHECKING
 	/* 
 	 * This method formalizes our assumptions about the input to set_plan_references.
@@ -362,9 +360,6 @@ set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable)
 	set_plan_references_input_asserts(glob, plan, rtable);
 #endif
 
-	int			rtoffset = list_length(glob->finalrtable);
-	ListCell   *lc;
-
 	/*
 	 * In the flat rangetable, we zero out substructure pointers that are not
 	 * needed by the executor; this reduces the storage space and copying cost
@@ -405,9 +400,6 @@ set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable)
 	}
 
 	/* Now fix the Plan tree */
-	fix_projection_incapable_nodes(plan);
-	fix_projection_incapable_nodes_in_subplans(glob, plan);
-
 	Plan *retPlan = set_plan_refs(glob, plan, rtoffset);
 
 #ifdef USE_ASSERT_CHECKING
@@ -650,6 +642,8 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
 					fix_scan_list(glob, splan->scan.plan.targetlist, rtoffset);
 				splan->scan.plan.qual =
 					fix_scan_list(glob, splan->scan.plan.qual, rtoffset);
+				splan->funcexpr =
+					fix_scan_expr(glob, splan->funcexpr, rtoffset);
 			}
 			break;
 		case T_ValuesScan:
@@ -664,8 +658,11 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
 					fix_scan_list(glob, splan->scan.plan.targetlist, rtoffset);
 				splan->scan.plan.qual =
 					fix_scan_list(glob, splan->scan.plan.qual, rtoffset);
+				splan->values_lists =
+					fix_scan_list(glob, splan->values_lists, rtoffset);
 			}
 			break;
+
 		case T_NestLoop:
 		case T_MergeJoin:
 		case T_HashJoin:
@@ -777,6 +774,8 @@ set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset)
 			break;
 		case T_Window:
 			set_upper_references(glob, plan, rtoffset);
+			if ( plan->targetlist == NIL )
+				set_dummy_tlist_references(plan, rtoffset);
 			{
 				indexed_tlist  *subplan_itlist =
 					build_tlist_index(plan->lefttree->targetlist);
@@ -1145,6 +1144,12 @@ fix_expr_common(PlannerGlobal *glob, Node *node)
 		record_plan_function_dependency(glob,
 										((ScalarArrayOpExpr *) node)->opfuncid);
 	}
+	else if (IsA(node, ArrayCoerceExpr))
+	{
+		if (OidIsValid(((ArrayCoerceExpr *) node)->elemfuncid))
+			record_plan_function_dependency(glob,
+											((ArrayCoerceExpr *) node)->elemfuncid);
+	}
 	else if (IsA(node, Const))
 	{
 		Const	   *con = (Const *) node;
@@ -1194,8 +1199,22 @@ fix_scan_expr(PlannerGlobal *glob, Node *node, int rtoffset)
 	context.glob = glob;
 	context.rtoffset = rtoffset;
 
-	node = fix_scan_expr_mutator(node, &context);
-	return node;
+	if (rtoffset != 0)
+	{
+		return fix_scan_expr_mutator(node, &context);
+	}
+	else
+	{
+		/*
+		 * If rtoffset == 0, we don't need to change any Vars, which makes
+		 * it OK to just scribble on the input node tree instead of copying
+		 * (since the only change, filling in any unset opfuncid fields,
+		 * is harmless).  This saves just enough cycles to be noticeable on
+		 * trivial queries.
+		 */
+		(void) fix_scan_expr_walker(node, &context);
+		return node;
+	}
 }
 
 static Node *
@@ -1211,15 +1230,13 @@ fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context)
 
 		/*
 		 * We should not see any Vars marked INNER, but in a nestloop inner
-		 * scan there could be OUTER Vars.
+		 * scan there could be OUTER Vars.	Leave them alone.
 		 */
 		Assert(var->varno != INNER);
 		if (var->varno > 0 && var->varno != OUTER)
-		{
 			var->varno += context->rtoffset;
-			if (var->varnoold > 0)
-				var->varnoold += context->rtoffset;
-		}
+		if (var->varnoold > 0)
+			var->varnoold += context->rtoffset;
 
         /* Pseudo column reference? */
         if (var->varattno <= FirstLowInvalidHeapAttributeNumber)
@@ -1245,9 +1262,7 @@ fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context)
 			return (Node *) var;
 		}
 	}
-
 	fix_expr_common(context->glob, node);
-
 	return expression_tree_mutator(node, fix_scan_expr_mutator,
 								   (void *) context);
 }
@@ -1257,6 +1272,12 @@ fix_scan_expr_walker(Node *node, fix_scan_expr_context *context)
 {
 	if (node == NULL)
 		return false;
+
+	/*
+	 * fix_expr_common will look up and set operator opcodes in the
+	 * nodes. That's not needed, as ORCA has set those already, but
+	 * shouldn't do any harm either.
+	 */
 	fix_expr_common(context->glob, node);
 	return expression_tree_walker(node, fix_scan_expr_walker,
 								  (void *) context);
@@ -1354,7 +1375,7 @@ set_join_references(PlannerGlobal *glob, Join *join, int rtoffset)
  * require recursing through Append nodes.	This is split out as a separate
  * function so that it can recurse.
  *
- * Note we do *not* apply any rtoffset for Vars of the inner relation; this is because
+ * Note we do *not* apply any rtoffset for non-join Vars; this is because
  * the quals will be processed again by fix_scan_expr when the set_plan_refs
  * recursion reaches the inner indexscan, and so we'd have done it twice.
  */
@@ -1795,7 +1816,6 @@ search_indexed_tlist_for_var(Var *var, indexed_tlist *itlist,
 
 			newvar->varno = newvarno;
 			newvar->varattno = vinfo->resno;
-
 			if (newvar->varnoold > 0)
 				newvar->varnoold += rtoffset;
 			return newvar;
@@ -2028,6 +2048,9 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 		/* If it's for an acceptable_rel (the inner relation in an index nested loop join), return it */
 		if (var->varno == context->acceptable_rel)
 		{
+			var = copyVar(var);
+			var->varno += context->rtoffset;
+			var->varnoold += context->rtoffset;
 			return (Node *) var;
 		}
 
@@ -2267,29 +2290,23 @@ set_sa_opfuncid(ScalarArrayOpExpr *opexpr)
  *					QUERY DEPENDENCY MANAGEMENT
  *****************************************************************************/
 
-/* GPDB doesn't take advantage of dependency tracking at the moment
- * so its contruction it is disabled.  However the infrastructure is
- * intact (and compiled) to make it easy to switch on in the future.
- */
-static bool disable_dependency_tracking = true;
-
 /*
  * record_plan_function_dependency
  *		Mark the current plan as depending on a particular function.
+ *
+ * This is exported so that the function-inlining code can record a
+ * dependency on a function that it's removed from the plan tree.
  */
 void
 record_plan_function_dependency(PlannerGlobal *glob, Oid funcid)
 {
-	Assert(funcid != InvalidOid && "Plan cannot depend on invalid function oid");
-
-	if ( disable_dependency_tracking ) return;
 	/*
 	 * For performance reasons, we don't bother to track built-in functions;
 	 * we just assume they'll never change (or at least not in ways that'd
 	 * invalidate plans using them).  For this purpose we can consider a
 	 * built-in function to be one with OID less than FirstBootstrapObjectId.
-	 * Note that the OID generator guarantees never to generate such an OID
-	 * after startup, even at OID wraparound.
+	 * Note that the OID generator guarantees never to generate such an
+	 * OID after startup, even at OID wraparound.
 	 */
 	if (funcid >= (Oid) FirstBootstrapObjectId)
 	{
@@ -2321,6 +2338,9 @@ record_plan_function_dependency(PlannerGlobal *glob, Oid funcid)
  * extract_query_dependencies
  *		Given a list of not-yet-planned queries (i.e. Query nodes),
  *		extract their dependencies just as set_plan_references would do.
+ *
+ * This is needed by plancache.c to handle invalidation of cached unplanned
+ * queries.
  */
 void
 extract_query_dependencies(List *queries,
@@ -2329,8 +2349,6 @@ extract_query_dependencies(List *queries,
 {
 	PlannerGlobal glob;
 
-	if ( disable_dependency_tracking ) return;
-
 	/* Make up a dummy PlannerGlobal so we can use this module's machinery */
 	MemSet(&glob, 0, sizeof(glob));
 	glob.type = T_PlannerGlobal;
@@ -2374,71 +2392,43 @@ extract_query_dependencies_walker(Node *node, PlannerGlobal *context)
 }
 
 /*
- * fix_projection_incapable_nodes
- * 		Fix the project list of projection incapable nodes by copying the project list
- * 		of the child node
+ * cdb_extract_plan_dependencies()
+ *		Given a fully built Plan tree, extract their dependencies just as
+ *		set_plan_references_ would have done.
+ *
+ * This is used to extract dependencies from a plan that has been created
+ * by ORCA (set_plan_references() does this usually, but ORCA doesn't use
+ * it). This adds the new entries directly to PlannerGlobal.relationOids
+ * and invalItems.
+ *
+ * Note: This recurses into SubPlans. You better still call this for
+ * every subplan in a overall plan, to make sure you capture dependencies
+ * from subplans that are not referenced from the main plan, because
+ * changes to the relations in eliminated subpland might require
+ * re-planning, too. (XXX: it would be better to not recurse into SubPlans
+ * here, as that's a waste of time.)
  */
-static void 
-fix_projection_incapable_nodes(Plan *plan) 
+void
+cdb_extract_plan_dependencies(PlannerGlobal *glob, Plan *plan)
 {
-	if (plan == NULL)
-	{
-		return;
-	}
+	cdb_extract_plan_dependencies_context context;
 
-	fix_projection_incapable_nodes(plan->lefttree);
-	fix_projection_incapable_nodes(plan->righttree);
-
-	if (IsA(plan, ShareInputScan) || IsA(plan, SetOp)) 
-	{
-		if (NULL != plan->lefttree)
-		{
-			insist_target_lists_aligned(plan->targetlist, plan->lefttree->targetlist);
-		}
+	context.base.node = (Node *) glob;
+	context.glob = glob;
 
-		if (NULL != plan->righttree)
-		{
-			insist_target_lists_aligned(plan->targetlist, plan->righttree->targetlist);
-		}
-	}
-	else if (!is_projection_capable_plan(plan) && !IsA(plan, Append) && NULL != plan->lefttree)
-	{
-		/*
-		 * while Append does not evaluate projections, we cannot always copy the child's target list,
-		 * as Append nodes are used for updating partitioned and inherited tables, in which
-		 * cases the target lists may be legally different, e.g. in the presence of dropped columns
-		 */
-		List *oldTargetList = plan->targetlist;
-		plan->targetlist = copyObject(plan->lefttree->targetlist);
-		if (NIL != oldTargetList)
-		{
-			list_free(oldTargetList);
-		}
-	}
+	(void) cdb_extract_plan_dependencies_walker((Node *) plan, &context);
 }
 
-/*
- * fix_projection_incapable_nodes_in_subplans
- * 		Fix the project list of projection incapable nodes in subplans by copying the project list
- * 		of the child node
- */
-static void 
-fix_projection_incapable_nodes_in_subplans(PlannerGlobal *context, Plan *plan) 
+static bool
+cdb_extract_plan_dependencies_walker(Node *node, cdb_extract_plan_dependencies_context *context)
 {
-	if (plan == NULL)
-	{
-		return;
-	}
-
-	List *subplans = extract_nodes(context, (Node*) plan, T_SubPlan);
+	if (node == NULL)
+		return false;
+	/* Extract function dependencies and check for regclass Consts */
+	fix_expr_common(context->glob, node);
 
-	ListCell *lcSubPlan = NULL;
-	foreach (lcSubPlan, subplans)
-	{
-		SubPlan *sp = lfirst(lcSubPlan);
-		Plan *spPlan = list_nth(context->subplans, sp->plan_id - 1);
-		fix_projection_incapable_nodes(spPlan);
-	}
+	return plan_tree_walker(node, cdb_extract_plan_dependencies_walker,
+								  (void *) context);
 }
 
 /*
@@ -2476,7 +2466,13 @@ cdb_insert_result_node(PlannerGlobal *glob, Plan *plan, int rtoffset)
 	plan->flow = NULL;
 
     /* Build a Result node to take over the targetlist from the given Plan. */
-    resultplan = (Plan *)make_result(plan->targetlist, NULL, plan);
+	/*
+	 * GPDB_83MERGE_FIXME: We don't have a PlannerInfo struct at hand here,
+	 * so we pass NULL and hope that make_result doesn't really need it.
+	 * It's really too late to insert Result nodes at this late stage in the
+	 * planner, we should eliminate the need for this
+	 */
+    resultplan = (Plan *) make_result(NULL, plan->targetlist, NULL, plan);
 
     /* Build a new targetlist for the given Plan, with Var nodes only. */
     plan->targetlist = flatten_tlist(plan->targetlist);
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 4fa7b057c470..8bb7cdf79b70 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.120 2007/02/19 07:03:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.129.2.3 2009/04/25 16:45:02 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,7 @@
 #include "nodes/makefuncs.h"
 #include "nodes/relation.h"
 #include "optimizer/clauses.h"
+#include "optimizer/cost.h"
 #include "optimizer/planmain.h"
 #include "optimizer/planner.h"
 #include "optimizer/subselect.h"
@@ -42,8 +43,7 @@
 typedef struct convert_testexpr_context
 {
 	PlannerInfo *root;
-	int			rtindex;		/* RT index for Vars, or 0 for Params */
-	List	   *righthandIds;	/* accumulated list of Vars or Param IDs */
+	List	   *subst_nodes;	/* Nodes to substitute for Params */
 } convert_testexpr_context;
 
 typedef struct process_sublinks_context
@@ -55,24 +55,26 @@ typedef struct process_sublinks_context
 typedef struct finalize_primnode_context
 {
 	PlannerInfo *root;
-	Bitmapset  *paramids;		/* Set of PARAM_EXEC paramids found */
-	Bitmapset  *outer_params;	/* Set of accessible outer paramids */
+	Bitmapset  *paramids;		/* Non-local PARAM_EXEC paramids found */
 } finalize_primnode_context;
 
 
 static Node *build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
-						   SubLinkType subLinkType, Node *testexpr,
-						   bool unknownEqFalse);
+			  SubLinkType subLinkType, Node *testexpr,
+			  bool unknownEqFalse);
+
+static List *generate_subquery_params(PlannerInfo *root, List *tlist,
+						 List **paramIds);
 static Node *convert_testexpr_mutator(Node *node,
 						 convert_testexpr_context *context);
-static bool subplan_is_hashable(Plan *plan, PlannerInfo *root);
+static bool subplan_is_hashable(PlannerInfo *root, Plan *plan);
 static bool testexpr_is_hashable(Node *testexpr);
 static bool hash_ok_operator(OpExpr *expr);
 static Node *replace_correlation_vars_mutator(Node *node, PlannerInfo *root);
 static Node *process_sublinks_mutator(Node *node,
-									  process_sublinks_context *context);
-static Bitmapset *finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
-			  Bitmapset *outer_params,
+						 process_sublinks_context *context);
+static Bitmapset *finalize_plan(PlannerInfo *root,
+			  Plan *plan,
 			  Bitmapset *valid_params);
 static bool finalize_primnode(Node *node, finalize_primnode_context *context);
 
@@ -95,13 +97,13 @@ replace_outer_var(PlannerInfo *root, Var *var)
 	abslevel = root->query_level - var->varlevelsup;
 
 	/*
-	 * If there's already a paramlist entry for this same Var, just use
-	 * it.	NOTE: in sufficiently complex querytrees, it is possible for the
-	 * same varno/abslevel to refer to different RTEs in different parts of
-	 * the parsetree, so that different fields might end up sharing the same
-	 * Param number.  As long as we check the vartype as well, I believe that
-	 * this sort of aliasing will cause no trouble. The correct field should
-	 * get stored into the Param slot at execution in each part of the tree.
+	 * If there's already a paramlist entry for this same Var, just use it.
+	 * NOTE: in sufficiently complex querytrees, it is possible for the same
+	 * varno/abslevel to refer to different RTEs in different parts of the
+	 * parsetree, so that different fields might end up sharing the same Param
+	 * number.	As long as we check the vartype as well, I believe that this
+	 * sort of aliasing will cause no trouble. The correct field should get
+	 * stored into the Param slot at execution in each part of the tree.
 	 *
 	 * We need to demand a match on vartypmod.  This does not matter for
 	 * the Param itself, since those are not typmod-dependent, but it does
@@ -352,7 +354,7 @@ static Node *
 make_subplan(PlannerInfo *root, Query *orig_subquery, SubLinkType subLinkType,
 			 Node *testexpr, bool isTopQual)
 {
-	Query	   *subquery = NULL;
+	Query	   *subquery;
 	double		tuple_fraction = 1.0;
 
 	/*
@@ -372,7 +374,7 @@ make_subplan(PlannerInfo *root, Query *orig_subquery, SubLinkType subLinkType,
 	 * (we're only expecting one row out, anyway).
 	 *
 	 * NOTE: if you change these numbers, also change cost_qual_eval_walker()
-	 * in path/costsize.c.
+	 * and get_initplan_cost() in path/costsize.c.
 	 *
 	 * XXX If an ALL/ANY subplan is uncorrelated, we may decide to hash or
 	 * materialize its result below.  In that case it would've been better to
@@ -482,7 +484,7 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 	splan->setParam = NIL;
 	splan->parParam = NIL;
 	splan->args = NIL;
-	splan->extParam = NIL;
+	//splan->extParam = NIL;
 
 	/*
 	 * Make parParam and args lists of param IDs and expressions that current
@@ -492,6 +494,7 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 	while ((paramid = bms_first_member(tmpset)) >= 0)
 	{
 		PlannerParamItem *pitem = list_nth(root->glob->paramlist, paramid);
+		Node   *arg;
 
 		if (pitem->abslevel == root->query_level)
 		{
@@ -501,7 +504,16 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 			 * varlevelsup or agglevelsup.	We probably don't even need to
 			 * copy it again, but be safe.
 			 */
-			splan->args = lappend(splan->args, copyObject(pitem->item));
+			arg = copyObject(pitem->item);
+
+			/*
+			 * If it's an Aggref, its arguments might contain SubLinks,
+			 * which have not yet been processed.  Do that now.
+			 */
+			if (IsA(arg, Aggref))
+				arg = SS_process_sublinks(root, arg, false);
+
+			splan->args = lappend(splan->args, arg);
 		}
 		else if (pitem->abslevel < root->query_level)
 			splan->extParam = lappend_int(splan->extParam, paramid);
@@ -516,7 +528,6 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 	 * PARAM_EXEC Params instead of the PARAM_SUBLINK Params emitted by the
 	 * parser.
 	 */
-
 	if (splan->parParam == NIL && subLinkType == EXISTS_SUBLINK && Gp_role == GP_ROLE_DISPATCH)
 	{
 		Param	   *prm;
@@ -563,10 +574,14 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 	else if (splan->parParam == NIL && subLinkType == ROWCOMPARE_SUBLINK && Gp_role == GP_ROLE_DISPATCH)
 	{
 		/* Adjust the Params */
+		List	   *params;
+
+		params = generate_subquery_params(root,
+										  plan->targetlist,
+										  &splan->paramIds);
 		result = convert_testexpr(root,
 								  testexpr,
-								  0,
-								  &splan->paramIds);
+								  params);
 		splan->setParam = list_copy(splan->paramIds);
 		splan->is_initplan = true;
 
@@ -577,6 +592,21 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 	}
 	else
 	{
+		/* Adjust the Params in the testexpr */
+		if (testexpr)
+		{
+			List	   *params;
+
+			params = generate_subquery_params(root,
+											  plan->targetlist,
+											  &splan->paramIds);
+			splan->testexpr = convert_testexpr(root,
+											   testexpr,
+											   params);
+		}
+		else
+			splan->testexpr = testexpr;
+
 		splan->is_multirow = true; /* CDB: take note. */
 
 		/*
@@ -590,22 +620,11 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 		 */
 		if (subLinkType == ANY_SUBLINK &&
 			splan->parParam == NIL &&
-			subplan_is_hashable(plan, root) &&
+			subplan_is_hashable(root, plan) &&
 			testexpr_is_hashable(splan->testexpr))
 			splan->useHashTable = true;
 
-		/*
-		 * Adjust the Params in the testexpr.
-		 */
-		splan->testexpr = convert_testexpr(root,
-										   testexpr,
-										   0,
-										   &splan->paramIds);
-
 		result = (Node *) splan;
-
-		/* This cannot be an initplan because it is multi-row */
-		splan->is_initplan = false;
 	}
 
 	AssertEquivalent(splan->is_initplan, !splan->is_multirow && splan->parParam == NIL);
@@ -613,14 +632,26 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 	/*
 	 * Add the subplan and its rtable to the global lists.
 	 */
-	root->glob->subplans = lappend(root->glob->subplans, plan);
-	root->glob->subrtables = lappend(root->glob->subrtables, rtable);
-	
-	splan->plan_id = list_length(root->glob->subplans); /* instead of old PlannerPlanId */
+	root->glob->subplans = lappend(root->glob->subplans,
+								   plan);
+	root->glob->subrtables = lappend(root->glob->subrtables,
+									 rtable);
+	splan->plan_id = list_length(root->glob->subplans);
 
 	if (splan->is_initplan)
 		root->init_plans = lappend(root->init_plans, splan);
-	
+
+	/*
+	 * A parameterless subplan (not initplan) should be prepared to handle
+	 * REWIND efficiently.	If it has direct parameters then there's no point
+	 * since it'll be reset on each scan anyway; and if it's an initplan then
+	 * there's no point since it won't get re-run without parameter changes
+	 * anyway.	The input of a hashed subplan doesn't need REWIND either.
+	 */
+	if (splan->parParam == NIL && !splan->is_initplan && !splan->useHashTable)
+		root->glob->rewindPlanIDs = bms_add_member(root->glob->rewindPlanIDs,
+												   splan->plan_id);
+
 	/* Label the subplan for EXPLAIN purposes */
 	if (splan->is_initplan)
 	{
@@ -652,7 +683,69 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 		buf = NULL;
 	}
 
-	/* NB PostgreSQL calculates subplan cost here, but GPDB does it elsewhere. */
+	return result;
+}
+
+/*
+ * generate_subquery_params: build a list of Params representing the output
+ * columns of a sublink's sub-select, given the sub-select's targetlist.
+ *
+ * We also return an integer list of the paramids of the Params.
+ */
+static List *
+generate_subquery_params(PlannerInfo *root, List *tlist, List **paramIds)
+{
+	List	   *result;
+	List	   *ids;
+	ListCell   *lc;
+
+	result = ids = NIL;
+	foreach(lc, tlist)
+	{
+		TargetEntry *tent = (TargetEntry *) lfirst(lc);
+		Param	   *param;
+
+		if (tent->resjunk)
+			continue;
+
+		param = generate_new_param(root,
+								   exprType((Node *) tent->expr),
+								   exprTypmod((Node *) tent->expr));
+		result = lappend(result, param);
+		ids = lappend_int(ids, param->paramid);
+	}
+
+	*paramIds = ids;
+	return result;
+}
+
+/*
+ * generate_subquery_vars: build a list of Vars representing the output
+ * columns of a sublink's sub-select, given the sub-select's targetlist.
+ * The Vars have the specified varno (RTE index).
+ */
+List *
+generate_subquery_vars(PlannerInfo *root, List *tlist, Index varno)
+{
+	List	   *result;
+	ListCell   *lc;
+
+	result = NIL;
+	foreach(lc, tlist)
+	{
+		TargetEntry *tent = (TargetEntry *) lfirst(lc);
+		Var		   *var;
+
+		if (tent->resjunk)
+			continue;
+
+		var = makeVar(varno,
+					  tent->resno,
+					  exprType((Node *) tent->expr),
+					  exprTypmod((Node *) tent->expr),
+					  0);
+		result = lappend(result, var);
+	}
 
 	return result;
 }
@@ -660,14 +753,9 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
 /*
  * convert_testexpr: convert the testexpr given by the parser into
  * actually executable form.  This entails replacing PARAM_SUBLINK Params
- * with Params or Vars representing the results of the sub-select:
- *
- * If rtindex is 0, we build Params to represent the sub-select outputs.
- * The paramids of the Params created are returned in the *righthandIds list.
- *
- * If rtindex is not 0, we build Vars using that rtindex as varno.	Copies
- * of the Var nodes are returned in *righthandIds (this is a bit of a type
- * cheat, but we can get away with it).
+ * with Params or Vars representing the results of the sub-select.  The
+ * nodes to be substituted are passed in as the List result from
+ * generate_subquery_params or generate_subquery_vars.
  *
  * The given testexpr has already been recursively processed by
  * process_sublinks_mutator.  Hence it can no longer contain any
@@ -675,19 +763,15 @@ build_subplan(PlannerInfo *root, Plan *plan, List *rtable,
  * any we find are for our own level of SubLink.
  */
 Node *
-convert_testexpr(PlannerInfo *root, Node *testexpr,
-				 int rtindex,
-				 List **righthandIds)
+convert_testexpr(PlannerInfo *root,
+				 Node *testexpr,
+				 List *subst_nodes)
 {
-	Node	   *result;
 	convert_testexpr_context context;
 
 	context.root = root;
-	context.rtindex = rtindex;
-	context.righthandIds = NIL;
-	result = convert_testexpr_mutator(testexpr, &context);
-	*righthandIds = context.righthandIds;
-	return result;
+	context.subst_nodes = subst_nodes;
+	return convert_testexpr_mutator(testexpr, &context);
 }
 
 static Node *
@@ -702,47 +786,17 @@ convert_testexpr_mutator(Node *node,
 
 		if (param->paramkind == PARAM_SUBLINK)
 		{
-			/*
-			 * We expect to encounter the Params in column-number sequence. We
-			 * could handle non-sequential order if necessary, but for now
-			 * there's no need.  (This is also a useful cross-check that we
-			 * aren't finding any unexpected Params.)
-			 */
-			if (param->paramid != list_length(context->righthandIds) + 1)
+			if (param->paramid <= 0 ||
+				param->paramid > list_length(context->subst_nodes))
 				elog(ERROR, "unexpected PARAM_SUBLINK ID: %d", param->paramid);
 
-			if (context->rtindex)
-			{
-				/* Make the Var node representing the subplan's result */
-				Var		   *newvar;
-
-				newvar = makeVar(context->rtindex,
-								 param->paramid,
-								 param->paramtype,
-								 param->paramtypmod,
-								 0);
-
-				/*
-				 * Copy it for caller.	NB: we need a copy to avoid having
-				 * doubly-linked substructure in the modified parse tree.
-				 */
-				context->righthandIds = lappend(context->righthandIds,
-												copyObject(newvar));
-				return (Node *) newvar;
-			}
-			else
-			{
-				/* Make the Param node representing the subplan's result */
-				Param	   *newparam;
-
-				newparam = generate_new_param(context->root,
-											  param->paramtype,
-											  param->paramtypmod);
-				/* Record its ID */
-				context->righthandIds = lappend_int(context->righthandIds,
-													newparam->paramid);
-				return (Node *) newparam;
-			}
+			/*
+			 * We copy the list item to avoid having doubly-linked
+			 * substructure in the modified parse tree.  This is probably
+			 * unnecessary when it's a Param, but be safe.
+			 */
+			return (Node *) copyObject(list_nth(context->subst_nodes,
+												param->paramid - 1));
 		}
 	}
 	return expression_tree_mutator(node,
@@ -754,7 +808,7 @@ convert_testexpr_mutator(Node *node,
  * subplan_is_hashable: can we implement an ANY subplan by hashing?
  */
 static bool
-subplan_is_hashable(Plan *plan, PlannerInfo *root)
+subplan_is_hashable(PlannerInfo *root, Plan *plan)
 {
 	double		subquery_size;
 
@@ -782,13 +836,12 @@ testexpr_is_hashable(Node *testexpr)
 	 * The testexpr must be a single OpExpr, or an AND-clause containing
 	 * only OpExprs.
 	 *
-	 * The combining operators must be hashable and strict.
-	 * The need for hashability is obvious, since we want to use hashing.
-	 * Without strictness, behavior in the presence of nulls is too
-	 * unpredictable.  We actually must assume even more than plain
-	 * strictness: they can't yield NULL for non-null inputs, either
-	 * (see nodeSubplan.c).  However, hash indexes and hash joins assume
-	 * that too.
+	 * The combining operators must be hashable and strict. The need for
+	 * hashability is obvious, since we want to use hashing. Without
+	 * strictness, behavior in the presence of nulls is too unpredictable.	We
+	 * actually must assume even more than plain strictness: they can't yield
+	 * NULL for non-null inputs, either (see nodeSubplan.c).  However, hash
+	 * indexes and hash joins assume that too.
 	 */
 	if (testexpr && IsA(testexpr, OpExpr))
 	{
@@ -859,25 +912,29 @@ convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink)
 	Query	   *parse = root->parse;
 	Query	   *subselect = (Query *) sublink->subselect;
 	List	   *in_operators;
+	List	   *left_exprs = NIL;
+	List	   *right_exprs = NIL;
+	Relids		left_varnos;
 	int			rtindex;
-	InClauseInfo *ininfo;
-    bool        correlated;
-	Node	   *result;
 	RangeTblEntry *rte;
 	RangeTblRef *rtr;
+	List	   *subquery_vars;
+	InClauseInfo *ininfo;
+	bool		correlated;
+	Node	   *result;
 
-    Assert(IsA(subselect, Query));
+	Assert(IsA(subselect, Query));
 
-    cdbsubselect_drop_orderby(subselect);
-    cdbsubselect_drop_distinct(subselect);
+	cdbsubselect_drop_orderby(subselect);
+	cdbsubselect_drop_distinct(subselect);
 
 	/*
 	 * The combining operators and left-hand expressions mustn't be volatile.
 	 */
 	if (contain_volatile_functions(sublink->testexpr))
-		return (Node *)sublink;
+		return (Node *) sublink;
 
-	/**
+	/*
 	 * If subquery returns a set-returning function (SRF) in the targetlist, we
 	 * do not attempt to convert the IN to a join.
 	 */
@@ -885,32 +942,32 @@ convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink)
 	if (expression_returns_set((Node *) subselect->targetList))
 		return (Node *) sublink;
 
-	/**
+	/*
 	 * If deeply correlated, then don't pull it up
 	 */
 	if (IsSubqueryMultiLevelCorrelated(subselect))
 		return (Node *) sublink;
 
-	/**
-	 * If there are CTEs, then the transformation does not work. Don't attempt to pullup.
+	/*
+	 * If there are CTEs, then the transformation does not work. Don't attempt
+	 * to pullup.
 	 */
 	if (parse->cteList)
 		return (Node *) sublink;
 
-    /*
-     * If uncorrelated, and no Var nodes on lhs, the subquery will be executed
-     * only once.  It should become an InitPlan, but make_subplan() doesn't
-     * handle that case, so just flatten it for now.
-     * CDB TODO: Let it become an InitPlan, so its QEs can be recycled.
-     */
+	/*
+	 * If uncorrelated, and no Var nodes on lhs, the subquery will be executed
+	 * only once.  It should become an InitPlan, but make_subplan() doesn't
+	 * handle that case, so just flatten it for now.
+	 * CDB TODO: Let it become an InitPlan, so its QEs can be recycled.
+	 */
     correlated = contain_vars_of_level_or_above(sublink->subselect, 1);
 
     if (correlated)
     {
-    	/**
-    	 * Under certain conditions, we do cannot pull up the subquery as a join.
-    	 */
-
+		/*
+		 * Under certain conditions, we cannot pull up the subquery as a join.
+		 */
     	if (subselect->hasAggs
     			|| (subselect->jointree->fromlist == NULL)
     			|| subselect->havingQual
@@ -920,17 +977,15 @@ convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink)
     			|| subselect->setOperations)
     		return (Node *) sublink;
     	
-    	/* do not pull subqueries with correlation in a func expr in the 
-    	   from clause of the subselect */
+		/*
+		 * Do not pull subqueries with correlation in a func expr in the from
+		 * clause of the subselect
+		 */
     	if (has_correlation_in_funcexpr_rte(subselect->rtable))
-    	{
     		return (Node *) sublink;
-    	}
 
     	if (contain_subplans(subselect->jointree->quals))
-    	{
     		return (Node *) sublink;
-    	}
     }
 
 	/*
@@ -950,39 +1005,56 @@ convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink)
 	rtr = makeNode(RangeTblRef);
 	rtr->rtindex = rtindex;
 
-    /* Tell caller to augment the jointree with a reference to the new RTE. */
+	/* Tell caller to augment the jointree with a reference to the new RTE. */
 	*rtrlist_inout = lappend(*rtrlist_inout, rtr);
 
+	/*
+	 * Build the result qual expression.
+	 */
+	subquery_vars = generate_subquery_vars(root,
+										   subselect->targetList,
+										   rtindex);
+	result = convert_testexpr(root,
+							  sublink->testexpr,
+							  subquery_vars);
+
 	/*
 	 * Now build the InClauseInfo node.
 	 */
 	ininfo = makeNode(InClauseInfo);
-    ininfo->sub_targetlist = NULL;
+	ininfo->sub_targetlist = NULL;
 	ininfo->righthand = bms_make_singleton(rtindex);
 
-    /*
-     * Uncorrelated "=ANY" subqueries can use JOIN_UNIQUE dedup technique.  We
+	/*
+	 * Uncorrelated "=ANY" subqueries can use JOIN_UNIQUE dedup technique.  We
 	 * expect that the test expression will be either a single OpExpr, or an
 	 * AND-clause containing OpExprs.  (If it's anything else then the parser
 	 * must have determined that the operators have non-equality-like
 	 * semantics.  In the OpExpr case we can't be sure what the operator's
 	 * semantics are like, and must check for ourselves.)
-     */
-    ininfo->try_join_unique = false;
+	 */
+	ininfo->try_join_unique = false;
 	in_operators = NIL;
-	if (!correlated &&
-        sublink->testexpr)
-    {
+	if (!correlated && sublink->testexpr)
+	{
 		ininfo->try_join_unique = true;
-        if (IsA(sublink->testexpr, OpExpr))
+		if (IsA(sublink->testexpr, OpExpr))
 	    {
-			Oid			opno = ((OpExpr *) sublink->testexpr)->opno;
+			OpExpr 	   *op = (OpExpr *) sublink->testexpr;
+			Oid			opno = op->opno;
 		    List	   *opfamilies;
 		    List	   *opstrats;
 
 		    get_op_btree_interpretation(opno, &opfamilies, &opstrats);
 		    if (!list_member_int(opstrats, ROWCOMPARE_EQ))
 			    ininfo->try_join_unique = false;
+			if (list_length(op->args) != 2)
+				return (Node *) sublink;
+			else
+			{
+				left_exprs = list_make1(linitial(op->args));
+				right_exprs = list_make1(lsecond(op->args));
+			}
 			in_operators = list_make1_oid(opno);
 	    }
 		else if (and_clause(sublink->testexpr))
@@ -990,16 +1062,23 @@ convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink)
 			ListCell   *lc;
 
 			/* OK, but we need to extract the per-column operator OIDs */
-			in_operators = NIL;
+			in_operators = left_exprs = right_exprs = NIL;
 			foreach(lc, ((BoolExpr *) sublink->testexpr)->args)
 			{
 				OpExpr *op = (OpExpr *) lfirst(lc);
 
 				if (!IsA(op, OpExpr))           /* probably shouldn't happen */
 					ininfo->try_join_unique = false;
+				if (list_length(op->args) != 2)
+					return (Node *) sublink;
+				else
+				{
+					left_exprs = lappend(left_exprs, linitial(op->args));
+					right_exprs = lappend(right_exprs, lsecond(op->args));
+				}
 				in_operators = lappend_oid(in_operators, op->opno);
 			}
-        }
+		}
 		else
 			ininfo->try_join_unique = false;
     }
@@ -1007,14 +1086,24 @@ convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink)
 	ininfo->in_operators = in_operators;
 
 	/*
-	 * Build the result qual expression.  As a side effect,
-	 * ininfo->sub_targetlist is filled with a list of Vars representing the
-	 * subselect outputs.
+	 * The left-hand expressions must contain some Vars of the current query,
+	 * else it's not gonna be a join.
 	 */
-	result = convert_testexpr(root,
-							  sublink->testexpr,
-							  rtindex,
-							  &ininfo->sub_targetlist);
+	left_varnos = pull_varnos((Node *) left_exprs);
+	ininfo->lefthand = left_varnos;
+
+	/*
+	 * ininfo->sub_targetlist must be filled with a list of expressions that
+	 * would need to be unique-ified if we try to implement the IN using a
+	 * regular join to unique-ified subquery output.  This is most easily done
+	 * by applying convert_testexpr to just the RHS inputs of the testexpr
+	 * operators.  That handles cases like type coercions of the subquery
+	 * outputs, clauses dropped due to const-simplification, etc.
+	 */
+	ininfo->sub_targetlist = (List *) convert_testexpr(root,
+													   (Node *) right_exprs,
+													   subquery_vars);
+
 
 	/* Add the completed node to the query's list */
 	root->in_info_list = lappend(root->in_info_list, ininfo);
@@ -1038,6 +1127,12 @@ convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink)
  * so after expanding its sublinks to subplans.  And we don't want any steps
  * in between, else those steps would never get applied to the aggregate
  * argument expressions, either in the parent or the child level.
+ *
+ * Another fairly tricky thing going on here is the handling of SubLinks in
+ * the arguments of uplevel aggregates.  Those are not touched inside the
+ * intermediate query level, either.  Instead, SS_process_sublinks recurses
+ * on them after copying the Aggref expression into the parent plan level
+ * (this is actually taken care of in make_subplan).
  */
 Node *
 SS_replace_correlation_vars(PlannerInfo *root, Node *expr)
@@ -1114,6 +1209,18 @@ process_sublinks_mutator(Node *node, process_sublinks_context *context)
 							context->isTopQual);
 	}
 
+	/*
+	 * Don't recurse into the arguments of an outer aggregate here.
+	 * Any SubLinks in the arguments have to be dealt with at the outer
+	 * query level; they'll be handled when make_subplan collects the
+	 * Aggref into the arguments to be passed down to the current subplan.
+	 */
+	if (IsA(node, Aggref))
+	{
+		if (((Aggref *) node)->agglevelsup > 0)
+			return node;
+	}
+
 	/*
 	 * We should never see a SubPlan expression in the input (since this is
 	 * the very routine that creates 'em to begin with).  We shouldn't find
@@ -1189,10 +1296,9 @@ process_sublinks_mutator(Node *node, process_sublinks_context *context)
  * 	plan->extParam and plan->allParam - attach params to top of the plan
  */
 void
-SS_finalize_plan(PlannerInfo *root, List *rtable, Plan *plan, bool attach_initplans)
+SS_finalize_plan(PlannerInfo *root, Plan *plan, bool attach_initplans)
 {
-	Bitmapset  *outer_params,
-			   *valid_params,
+	Bitmapset  *valid_params,
 			   *initExtParam,
 			   *initSetParam;
 	Cost		initplan_cost;
@@ -1202,21 +1308,27 @@ SS_finalize_plan(PlannerInfo *root, List *rtable, Plan *plan, bool attach_initpl
 	/*
 	 * First, scan the param list to discover the sets of params that are
 	 * available from outer query levels and my own query level. We do this
-	 * once to save time in the per-plan recursion steps.
+	 * once to save time in the per-plan recursion steps.  (This calculation
+	 * is overly generous: it can include a lot of params that actually
+	 * shouldn't be referenced here.  However, valid_params is just used as
+	 * a debugging crosscheck, so it's not worth trying to be exact.)
 	 */
-	outer_params = valid_params = NULL;
+	valid_params = NULL;
 	paramid = 0;
 	foreach(l, root->glob->paramlist)
 	{
 		PlannerParamItem *pitem = (PlannerParamItem *) lfirst(l);
-		AssertImply(IsA(pitem->item, Param), ((Param *) pitem->item)->paramid == paramid);
 
-		valid_params = bms_add_member(valid_params, paramid);
-
-		if (pitem->abslevel <= root->query_level)
+		if (pitem->abslevel < root->query_level)
 		{
 			/* valid outer-level parameter */
-			outer_params = bms_add_member(outer_params, paramid);
+			valid_params = bms_add_member(valid_params, paramid);
+		}
+		else if (pitem->abslevel == root->query_level &&
+				 IsA(pitem->item, Param))
+		{
+			/* valid local parameter (i.e., a setParam of my child) */
+			valid_params = bms_add_member(valid_params, paramid);
 		}
 
 		paramid++;
@@ -1225,10 +1337,8 @@ SS_finalize_plan(PlannerInfo *root, List *rtable, Plan *plan, bool attach_initpl
 	/*
 	 * Now recurse through plan tree.
 	 */
-	(void) finalize_plan(root, plan, rtable,
-						 outer_params, valid_params);
+	(void) finalize_plan(root, plan, valid_params);
 
-	bms_free(outer_params);
 	bms_free(valid_params);
 
 	/*
@@ -1239,7 +1349,7 @@ SS_finalize_plan(PlannerInfo *root, List *rtable, Plan *plan, bool attach_initpl
 	 * have extParams that are setParams of other initPlans, so we have to
 	 * take care of this situation explicitly.)
 	 *
-	 * We also add the total_cost of each initPlan to the startup cost of the
+	 * We also add the eval cost of each initPlan to the startup cost of the
 	 * top node.  This is a conservative overestimate, since in fact each
 	 * initPlan might be executed later than plan startup, or even not at all.
 	 */
@@ -1251,27 +1361,39 @@ SS_finalize_plan(PlannerInfo *root, List *rtable, Plan *plan, bool attach_initpl
 
 		initExtParam = initSetParam = NULL;
 		initplan_cost = 0;
+
 		foreach(l, plan->initPlan)
 		{
-			SubPlan    *initplan = (SubPlan *) lfirst(l);
-			Plan	   *subplan_plan = planner_subplan_get_plan(root, initplan);
+			SubPlan    *initsubplan = (SubPlan *) lfirst(l);
+			Plan	   *initplan = planner_subplan_get_plan(root, initsubplan);
 			ListCell   *l2;
 
-			initExtParam = bms_add_members(initExtParam, subplan_plan->extParam);
-			foreach(l2, initplan->setParam)
+			initExtParam = bms_add_members(initExtParam, initplan->extParam);
+			foreach(l2, initsubplan->setParam)
 			{
-				initSetParam = bms_add_member(initSetParam, lfirst_int(l2));
+				SubPlan    *initplan = (SubPlan *) lfirst(l);
+				Plan	   *subplan_plan = planner_subplan_get_plan(root, initplan);
+				ListCell   *l2;
+
+				initExtParam = bms_add_members(initExtParam, subplan_plan->extParam);
+				foreach(l2, initplan->setParam)
+				{
+					initSetParam = bms_add_member(initSetParam, lfirst_int(l2));
+				}
+				initplan_cost += subplan_plan->total_cost;
 			}
-			initplan_cost += subplan_plan->total_cost;
+			initplan_cost += get_initplan_cost(root, initsubplan);
 		}
 		/* allParam must include all these params */
 		plan->allParam = bms_add_members(plan->allParam, initExtParam);
 		plan->allParam = bms_add_members(plan->allParam, initSetParam);
+		/* extParam must include any child extParam */
+		plan->extParam = bms_add_members(plan->extParam, initExtParam);
 		/* but extParam shouldn't include any setParams */
-		initExtParam = bms_del_members(initExtParam, initSetParam);
-		/* empty test ensures extParam is exactly NULL if it's empty */
-		if (!bms_is_empty(initExtParam))
-			plan->extParam = bms_join(plan->extParam, initExtParam);
+		plan->extParam = bms_del_members(plan->extParam, initSetParam);
+		/* ensure extParam is exactly NULL if it's empty */
+		if (bms_is_empty(plan->extParam))
+			plan->extParam = NULL;
 
 		plan->startup_cost += initplan_cost;
 		plan->total_cost += initplan_cost;
@@ -1285,8 +1407,7 @@ SS_finalize_plan(PlannerInfo *root, List *rtable, Plan *plan, bool attach_initpl
  * This is just an internal notational convenience.
  */
 static Bitmapset *
-finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
-			  Bitmapset *outer_params, Bitmapset *valid_params)
+finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params)
 {
 	finalize_primnode_context context;
 
@@ -1295,7 +1416,6 @@ finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
 
 	context.root = root;
 	context.paramids = NULL;	/* initialize set to empty */
-	context.outer_params = outer_params;
 
 	/*
 	 * When we call finalize_primnode, context.paramids sets are automatically
@@ -1373,10 +1493,13 @@ finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
 				RangeTblEntry *rte;
 
 				rte = rt_fetch(((TableFunctionScan *) plan)->scan.scanrelid,
-							   rtable);
+							   root->parse->rtable);
 				Assert(rte->rtekind == RTE_TABLEFUNCTION);
 				finalize_primnode(rte->funcexpr, &context);
 			}
+			/* TableFunctionScan's lefttree is like SubqueryScan's subplan. */
+			context.paramids = bms_add_members(context.paramids,
+								 plan->lefttree->extParam);
 			break;
 
 		case T_FunctionScan:
@@ -1399,8 +1522,6 @@ finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
-													  rtable,
-													  outer_params,
 													  valid_params));
 				}
 			}
@@ -1416,8 +1537,6 @@ finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
-													  rtable,
-													  outer_params,
 													  valid_params));
 				}
 			}
@@ -1433,8 +1552,6 @@ finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
-													  rtable,
-													  outer_params,
 													  valid_params));
 				}
 			}
@@ -1496,18 +1613,20 @@ finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
 	}
 
 	/* Process left and right child plans, if any */
-	context.paramids = bms_add_members(context.paramids,
-									   finalize_plan(root,
-													 plan->lefttree,
-													 rtable,
-													 outer_params,
-													 valid_params));
+	/*
+	 * In a TableFunctionScan, the 'lefttree' is more like a SubQueryScan's
+	 * subplan, and contains a plan that's already been finalized by the
+	 * inner invocation of subquery_planner(). So skip that.
+	 */
+	if (!IsA(plan, TableFunctionScan))
+		context.paramids = bms_add_members(context.paramids,
+										   finalize_plan(root,
+														 plan->lefttree,
+														 valid_params));
 
 	context.paramids = bms_add_members(context.paramids,
 									   finalize_plan(root,
 													 plan->righttree,
-													 rtable,
-													 outer_params,
 													 valid_params));
 
 	/* Now we have all the paramids */
@@ -1515,22 +1634,24 @@ finalize_plan(PlannerInfo *root, Plan *plan, List *rtable,
 	if (!bms_is_subset(context.paramids, valid_params))
 		elog(ERROR, "plan should not reference subplan's variable");
 
-	plan->extParam = bms_intersect(context.paramids, outer_params);
-	plan->allParam = context.paramids;
-
 	/*
+	 * Note: by definition, extParam and allParam should have the same value
+	 * in any plan node that doesn't have child initPlans.  We set them
+	 * equal here, and later SS_finalize_plan will update them properly
+	 * in node(s) that it attaches initPlans to.
+	 *
 	 * For speed at execution time, make sure extParam/allParam are actually
 	 * NULL if they are empty sets.
 	 */
-	if (bms_is_empty(plan->extParam))
+	if (bms_is_empty(context.paramids))
 	{
-		bms_free(plan->extParam);
 		plan->extParam = NULL;
+		plan->allParam = NULL;
 	}
-	if (bms_is_empty(plan->allParam))
+	else
 	{
-		bms_free(plan->allParam);
-		plan->allParam = NULL;
+		plan->extParam = context.paramids;
+		plan->allParam = bms_copy(context.paramids);
 	}
 
 	return plan->allParam;
@@ -1558,13 +1679,42 @@ finalize_primnode(Node *node, finalize_primnode_context *context)
 	if (is_subplan(node))
 	{
 		SubPlan    *subplan = (SubPlan *) node;
-		Plan	   *subplan_plan = planner_subplan_get_plan(context->root, subplan);
+		Plan	   *plan = planner_subplan_get_plan(context->root, subplan);
+		ListCell   *lc;
+		Bitmapset  *subparamids;
+
+		/* Recurse into the testexpr, but not into the Plan */
+		finalize_primnode(subplan->testexpr, context);
+
+		/*
+		 * Remove any param IDs of output parameters of the subplan that were
+		 * referenced in the testexpr.  These are not interesting for
+		 * parameter change signaling since we always re-evaluate the subplan.
+		 * Note that this wouldn't work too well if there might be uses of the
+		 * same param IDs elsewhere in the plan, but that can't happen because
+		 * generate_new_param never tries to merge params.
+		 */
+		foreach(lc, subplan->paramIds)
+		{
+			context->paramids = bms_del_member(context->paramids,
+											   lfirst_int(lc));
+		}
+
+		/* Also examine args list */
+		finalize_primnode((Node *) subplan->args, context);
 
-		/* Add outer-level params needed by the subplan to paramids */
-		context->paramids = bms_join(context->paramids,
-									 bms_intersect(subplan_plan->extParam,
-												   context->outer_params));
-		/* fall through to recurse into subplan args */
+		/*
+		 * Add params needed by the subplan to paramids, but excluding those
+		 * we will pass down to it.
+		 */
+		subparamids = bms_copy(plan->extParam);
+		foreach(lc, subplan->parParam)
+		{
+			subparamids = bms_del_member(subparamids, lfirst_int(lc));
+		}
+		context->paramids = bms_join(context->paramids, subparamids);
+
+		return false;			/* no more to do here */
 	}
 	return expression_tree_walker(node, finalize_primnode,
 								  (void *) context);
@@ -1601,7 +1751,7 @@ SS_make_initplan_from_plan(PlannerInfo *root, Plan *plan,
 	/*
 	 * Build extParam/allParam sets for plan nodes.
 	 */
-	SS_finalize_plan(root, root->parse->rtable, plan, false);
+	SS_finalize_plan(root, plan, false);
 	
 	/*
 	 * Add the subplan and its rtable to the global lists.
@@ -1610,7 +1760,7 @@ SS_make_initplan_from_plan(PlannerInfo *root, Plan *plan,
 								   plan);
 	root->glob->subrtables = lappend(root->glob->subrtables,
 									 root->parse->rtable);
-	
+
 	/*
 	 * Create a SubPlan node and add it to the outer list of InitPlans.
 	 */
diff --git a/src/backend/optimizer/plan/transform.c b/src/backend/optimizer/plan/transform.c
index a49b7aadc16c..bb41f9916f01 100644
--- a/src/backend/optimizer/plan/transform.c
+++ b/src/backend/optimizer/plan/transform.c
@@ -39,14 +39,15 @@ static void wrap_vars_with_fieldselect(List *targetlist, int varno, Oid newvarty
 /**
  * Preprocess query structure for consumption by the optimizer
  */
-Query *preprocess_query_optimizer(Query *query, ParamListInfo boundParams)
+Query *
+preprocess_query_optimizer(PlannerGlobal *glob, Query *query, ParamListInfo boundParams)
 {
 #ifdef USE_ASSERT_CHECKING
 	Query *qcopy = (Query *) copyObject(query);
 #endif
 
 	/* fold all constant expressions */
-	Query *res = fold_constants(query, boundParams, GPOPT_MAX_FOLDED_CONSTANT_SIZE);
+	Query *res = fold_constants(glob, query, boundParams, GPOPT_MAX_FOLDED_CONSTANT_SIZE);
 
 #ifdef USE_ASSERT_CHECKING
 	Assert(equal(qcopy, query) && "Preprocessing should not modify original query object");
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
index 2fca9e4a5c58..3b51f1a6dd2c 100644
--- a/src/backend/optimizer/prep/prepjointree.c
+++ b/src/backend/optimizer/prep/prepjointree.c
@@ -10,13 +10,18 @@
  *		reduce_outer_joins
  *
  *
+ * In PostgreSQL, there is code here to do with pulling up "simple UNION ALLs".
+ * In GPDB, there is no such thing as a simple UNION ALL as locus of the relations
+ * may be different, so all that has been removed.
+ *
+ *
  * Portions Copyright (c) 2006-2008, Greenplum inc
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.47 2007/02/19 07:03:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.49.2.1 2008/08/14 20:31:59 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -683,6 +688,7 @@ is_simple_subquery(PlannerInfo *root, Query *subquery)
 	 */
 	if (!IsA(subquery, Query) ||
 		subquery->commandType != CMD_SELECT ||
+		subquery->utilityStmt != NULL ||
 		subquery->intoClause != NULL)
 		elog(ERROR, "subquery is bogus");
 
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index f490a9ff9f9f..f7a54056591a 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -25,7 +25,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepqual.c,v 1.57 2007/01/05 22:19:32 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepqual.c,v 1.58 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 80816f496a03..3efbb94fbfc8 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -17,7 +17,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/preptlist.c,v 1.86 2007/02/19 07:03:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/preptlist.c,v 1.88 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -432,11 +432,12 @@ expand_targetlist(List *tlist, int command_type,
 /*
  * supplement_simply_updatable_targetlist
  * 
- * For a simply updatable cursor, we supplement the targetlist with junk metadata for
- * gp_segment_id, ctid, and tableoid. The handling of a CURRENT OF invocation will rely
- * on this junk information during its constant folding. Thus, in a nutshell, it is the 
- * responsibility of this routine to ensure whatever information needed to uniquely
- * identify the currently positioned tuple is available in the tuple itself.
+ * For a simply updatable cursor, we supplement the targetlist with junk
+ * metadata for gp_segment_id, ctid, and tableoid. The handling of a CURRENT OF
+ * invocation will rely on this junk information, in execCurrentOf(). Thus, in
+ * a nutshell, it is the responsibility of this routine to ensure whatever
+ * information needed to uniquely identify the currently positioned tuple is
+ * available in the tuple itself.
  */
 static List *
 supplement_simply_updatable_targetlist(DeclareCursorStmt *stmt, List *range_table, List *tlist) 
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 58816c2d0561..f33e7ec153fc 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -23,7 +23,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.138 2007/02/19 07:03:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.146.2.1 2008/11/11 18:13:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -231,11 +231,11 @@ recurse_set_operations(Node *setOp, PlannerInfo *root,
 		 * output columns.
 		 *
 		 * XXX you don't really want to know about this: setrefs.c will apply
-		 * replace_vars_with_subplan_refs() to the Result node's tlist. This
-		 * would fail if the Vars generated by generate_setop_tlist() were not
-		 * exactly equal() to the corresponding tlist entries of the subplan.
-		 * However, since the subplan was generated by generate_union_plan()
-		 * or generate_nonunion_plan(), and hence its tlist was generated by
+		 * fix_upper_expr() to the Result node's tlist. This would fail if the
+		 * Vars generated by generate_setop_tlist() were not exactly equal()
+		 * to the corresponding tlist entries of the subplan. However, since
+		 * the subplan was generated by generate_union_plan() or
+		 * generate_nonunion_plan(), and hence its tlist was generated by
 		 * generate_append_tlist(), this will work.  We just tell
 		 * generate_setop_tlist() to use varno OUTER (this was changed for
          * better EXPLAIN output in CDB/MPP; varno 0 is used in PostgreSQL).
@@ -244,7 +244,8 @@ recurse_set_operations(Node *setOp, PlannerInfo *root,
 			!tlist_same_datatypes(plan->targetlist, colTypes, junkOK))
 		{
 			plan = (Plan *)
-				make_result(generate_setop_tlist(colTypes, flag,
+				make_result(root,
+							generate_setop_tlist(colTypes, flag,
 												 OUTER,
 												 false,
 												 plan->targetlist,
@@ -994,7 +995,6 @@ make_inh_translation_lists(Relation oldrelation, Relation newrelation,
 	int			oldnatts = old_tupdesc->natts;
 	int			newnatts = new_tupdesc->natts;
 	int			old_attno = 0;
-	int			att_offset = 0;
 	
 	for (old_attno = 0; old_attno < oldnatts; old_attno++)
 	{
@@ -1035,36 +1035,42 @@ make_inh_translation_lists(Relation oldrelation, Relation newrelation,
 		 * Otherwise we have to search for the matching column by name.
 		 * There's no guarantee it'll have the same column position, because
 		 * of cases like ALTER TABLE ADD COLUMN and multiple inheritance.
-		 * We first check old_attno since it is quite likely that they will match
-		 * and then examine other attributes cyclically.
+		 * However, in simple cases it will be the same column number, so try
+		 * that before we go groveling through all the columns.
+		 *
+		 * Note: the test for (att = ...) != NULL cannot fail, it's just a
+		 * notational device to include the assignment into the if-clause.
 		 */
-		for (att_offset = 0; att_offset < newnatts; att_offset++)
+		if (old_attno < newnatts &&
+			(att = new_tupdesc->attrs[old_attno]) != NULL &&
+			!att->attisdropped && att->attinhcount != 0 &&
+			strcmp(attname, NameStr(att->attname)) == 0)
+			new_attno = old_attno;
+		else
 		{
-			new_attno = (old_attno + att_offset) % newnatts;
-			Assert(0 <= new_attno && new_attno <= newnatts - 1);
-
-			att = new_tupdesc->attrs[new_attno];
-			if (att->attisdropped || att->attinhcount == 0)
-				continue;
-			if (strcmp(attname, NameStr(att->attname)) != 0)
-				continue;
-			/* Found it, check type */
-			if (atttypid != att->atttypid || atttypmod != att->atttypmod)
-				elog(ERROR, "attribute \"%s\" of relation \"%s\" does not match parent's type",
+			for (new_attno = 0; new_attno < newnatts; new_attno++)
+			{
+				att = new_tupdesc->attrs[new_attno];
+				if (!att->attisdropped && att->attinhcount != 0 &&
+					strcmp(attname, NameStr(att->attname)) == 0)
+					break;
+			}
+			if (new_attno >= newnatts)
+				elog(ERROR, "could not find inherited attribute \"%s\" of relation \"%s\"",
 					 attname, RelationGetRelationName(newrelation));
-
-			numbers = lappend_int(numbers, new_attno + 1);
-			vars = lappend(vars, makeVar(newvarno,
-										 (AttrNumber) (new_attno + 1),
-										 atttypid,
-										 atttypmod,
-										 0));
-			break;
 		}
 
-		if (new_attno >= newnatts)
-			elog(ERROR, "could not find inherited attribute \"%s\" of relation \"%s\"",
+		/* Found it, check type */
+		if (atttypid != att->atttypid || atttypmod != att->atttypmod)
+			elog(ERROR, "attribute \"%s\" of relation \"%s\" does not match parent's type",
 				 attname, RelationGetRelationName(newrelation));
+
+		numbers = lappend_int(numbers, new_attno + 1);
+		vars = lappend(vars, makeVar(newvarno,
+									 (AttrNumber) (new_attno + 1),
+									 atttypid,
+									 atttypmod,
+									 0));
 	}
 
 	*col_mappings = numbers;
@@ -1287,6 +1293,9 @@ adjust_appendrel_attrs_mutator(Node *node, AppendRelInfoContext *ctx)
 		newinfo->required_relids = adjust_relid_set(oldinfo->required_relids,
 													appinfo->parent_relid,
 													appinfo->child_relid);
+		newinfo->nullable_relids = adjust_relid_set(oldinfo->nullable_relids,
+													appinfo->parent_relid,
+													appinfo->child_relid);
 		newinfo->left_relids = adjust_relid_set(oldinfo->left_relids,
 												appinfo->parent_relid,
 												appinfo->child_relid);
@@ -1362,87 +1371,6 @@ adjust_relid_set(Relids relids, Index oldrelid, Index newrelid)
 	return relids;
 }
 
-/*
- * adjust_appendrel_attr_needed
- *		Adjust an attr_needed[] array to reference a member rel instead of
- *		the original appendrel
- *
- * oldrel: source of data (we use the attr_needed, min_attr, max_attr fields)
- * appinfo: supplies parent_relid, child_relid, col_mappings
- * new_min_attr, new_max_attr: desired bounds of new attr_needed array
- *
- * The relid sets are adjusted by substituting child_relid for parent_relid.
- * (NOTE: oldrel is not necessarily the parent_relid relation!)  We are also
- * careful to map attribute numbers within the array properly.	User
- * attributes have to be mapped through col_mappings, but system attributes
- * and whole-row references always have the same attno.
- *
- * Returns a palloc'd array with the specified bounds
- */
-Relids *
-adjust_appendrel_attr_needed(PlannerInfo *root,
-                             RelOptInfo *oldrel, AppendRelInfo *appinfo,
-							 AttrNumber new_min_attr, AttrNumber new_max_attr)
-{
-	Relids	   *new_attr_needed;
-	Index		parent_relid = appinfo->parent_relid;
-	Index		child_relid = appinfo->child_relid;
-	int			parent_attr;
-	ListCell   *lm;
-    RangeTblEntry  *parent_rte = rt_fetch(parent_relid, root->parse->rtable);
-    RangeTblEntry  *child_rte = rt_fetch(child_relid, root->parse->rtable);
-    ListCell       *parent_cell;
-    ListCell       *child_cell;
-
-	/* Create empty result array */
-	new_attr_needed = (Relids *)
-		palloc0((new_max_attr - new_min_attr + 1) * sizeof(Relids));
-	/* Process user attributes, with appropriate attno mapping */
-	parent_attr = 1;
-	foreach(lm, appinfo->col_mappings)
-	{
-		int			child_attr = lfirst_int(lm);
-
-		if (child_attr > 0)
-		{
-			Relids		attrneeded;
-
-			Assert(parent_attr <= oldrel->max_attr);
-			Assert(child_attr <= new_max_attr);
-			attrneeded = oldrel->attr_needed[parent_attr - oldrel->min_attr];
-			attrneeded = adjust_relid_set(attrneeded,
-										  parent_relid, child_relid);
-			new_attr_needed[child_attr - new_min_attr] = attrneeded;
-		}
-		parent_attr++;
-	}
-	/* Process system attributes, including whole-row references */
-	Assert(new_min_attr <= oldrel->min_attr);
-	for (parent_attr = oldrel->min_attr; parent_attr <= 0; parent_attr++)
-	{
-		Relids		attrneeded;
-
-		attrneeded = oldrel->attr_needed[parent_attr - oldrel->min_attr];
-		attrneeded = adjust_relid_set(attrneeded,
-									  parent_relid, child_relid);
-		new_attr_needed[parent_attr - new_min_attr] = attrneeded;
-	}
-
-    /* CDB: Process pseudo columns. */
-    Assert(list_length(parent_rte->pseudocols) == list_length(child_rte->pseudocols));
-    forboth(parent_cell, parent_rte->pseudocols,
-            child_cell, child_rte->pseudocols)
-    {
-        CdbRelColumnInfo   *parent_crci = (CdbRelColumnInfo *)parent_cell;
-        CdbRelColumnInfo   *child_crci = (CdbRelColumnInfo *)child_cell;
-
-        child_crci->where_needed = adjust_relid_set(parent_crci->where_needed,
-                                                    parent_relid, child_relid);
-    }
-
-	return new_attr_needed;
-}
-
 /*
  * Adjust the targetlist entries of an inherited UPDATE operation
  *
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 9e25293b8d00..833a5efa259a 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.235 2007/02/19 07:03:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.254.2.3 2008/08/26 02:16:39 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -20,6 +20,7 @@
 
 #include "postgres.h"
 
+#include "access/heapam.h"
 #include "catalog/catquery.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_language.h"
@@ -53,6 +54,7 @@
 typedef struct
 {
 	ParamListInfo boundParams;
+	PlannerGlobal *glob;
 	List	   *active_fns;
 	Node	   *case_val;
 	bool		transform_stable_funcs;
@@ -91,13 +93,15 @@ static List *simplify_and_arguments(List *args,
 					   eval_const_expressions_context *context,
 					   bool *haveNull, bool *forceFalse);
 static Expr *simplify_boolean_equality(List *args);
-static Expr *simplify_function(Oid funcid, Oid result_type, List **args,
+static Expr *simplify_function(Oid funcid,
+				  Oid result_type, int32 result_typmod, List **args,
 				  bool allow_inline,
 				  eval_const_expressions_context *context);
 static bool large_const(Expr *expr, Size max_size);
 static List *add_function_defaults(List *args, Oid result_type,
 								   HeapTuple func_tuple);
-static Expr *evaluate_function(Oid funcid, Oid result_type, List *args,
+static Expr *evaluate_function(Oid funcid,
+				  Oid result_type, int32 result_typmod, List *args,
 				  HeapTuple func_tuple,
 				  eval_const_expressions_context *context);
 static Expr *inline_function(Oid funcid, Oid result_type, List *args,
@@ -498,7 +502,7 @@ count_agg_clauses_walker(Node *node, AggClauseCounts *counts)
 		}
 
 		/* resolve actual type of transition state, if polymorphic */
-		if (aggtranstype == ANYARRAYOID || aggtranstype == ANYELEMENTOID)
+		if (IsPolymorphicType(aggtranstype))
 		{
 			/* have to fetch the agg's declared input types... */
 			Oid		   *declaredArgTypes;
@@ -510,7 +514,8 @@ count_agg_clauses_walker(Node *node, AggClauseCounts *counts)
 			aggtranstype = enforce_generic_type_consistency(inputTypes,
 															declaredArgTypes,
 															agg_nargs,
-															aggtranstype);
+															aggtranstype,
+															false);
 			pfree(declaredArgTypes);
 			
 			counts->missing_prelimfunc = true; /* CDB: Disable 2P aggregation */
@@ -628,7 +633,7 @@ expression_returns_set_walker(Node *node, void *context)
  *	  Estimate the number of rows in a set result.
  *
  * We use the product of the rowcount estimates of all the functions in
- * the given tree.  The result is 1 if there are no set-returning functions.
+ * the given tree.	The result is 1 if there are no set-returning functions.
  */
 double
 expression_returns_set_rows(Node *clause)
@@ -773,39 +778,71 @@ contain_mutable_functions_walker(Node *node, void *context)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, OpExpr))
+	else if (IsA(node, OpExpr))
 	{
 		OpExpr	   *expr = (OpExpr *) node;
 
-		if (op_volatile(expr->opno) != PROVOLATILE_IMMUTABLE)
+		set_opfuncid(expr);
+		if (func_volatile(expr->opfuncid) != PROVOLATILE_IMMUTABLE)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, DistinctExpr))
+	else if (IsA(node, DistinctExpr))
 	{
 		DistinctExpr *expr = (DistinctExpr *) node;
 
-		if (op_volatile(expr->opno) != PROVOLATILE_IMMUTABLE)
+		set_opfuncid((OpExpr *) expr);	/* rely on struct equivalence */
+		if (func_volatile(expr->opfuncid) != PROVOLATILE_IMMUTABLE)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, ScalarArrayOpExpr))
+	else if (IsA(node, ScalarArrayOpExpr))
 	{
 		ScalarArrayOpExpr *expr = (ScalarArrayOpExpr *) node;
 
-		if (op_volatile(expr->opno) != PROVOLATILE_IMMUTABLE)
+		set_sa_opfuncid(expr);
+		if (func_volatile(expr->opfuncid) != PROVOLATILE_IMMUTABLE)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, NullIfExpr))
+	else if (IsA(node, CoerceViaIO))
+	{
+		CoerceViaIO *expr = (CoerceViaIO *) node;
+		Oid			iofunc;
+		Oid			typioparam;
+		bool		typisvarlena;
+
+		/* check the result type's input function */
+		getTypeInputInfo(expr->resulttype,
+						 &iofunc, &typioparam);
+		if (func_volatile(iofunc) != PROVOLATILE_IMMUTABLE)
+			return true;
+		/* check the input type's output function */
+		getTypeOutputInfo(exprType((Node *) expr->arg),
+						  &iofunc, &typisvarlena);
+		if (func_volatile(iofunc) != PROVOLATILE_IMMUTABLE)
+			return true;
+		/* else fall through to check args */
+	}
+	else if (IsA(node, ArrayCoerceExpr))
+	{
+		ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
+
+		if (OidIsValid(expr->elemfuncid) &&
+			func_volatile(expr->elemfuncid) != PROVOLATILE_IMMUTABLE)
+			return true;
+		/* else fall through to check args */
+	}
+	else if (IsA(node, NullIfExpr))
 	{
 		NullIfExpr *expr = (NullIfExpr *) node;
 
-		if (op_volatile(expr->opno) != PROVOLATILE_IMMUTABLE)
+		set_opfuncid((OpExpr *) expr);	/* rely on struct equivalence */
+		if (func_volatile(expr->opfuncid) != PROVOLATILE_IMMUTABLE)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, CoerceViaIO))
+	else if (IsA(node, CoerceViaIO))
 	{
 		CoerceViaIO *expr = (CoerceViaIO *) node;
 		Oid             iofunc;
@@ -824,7 +861,7 @@ contain_mutable_functions_walker(Node *node, void *context)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, ArrayCoerceExpr))
+	else if (IsA(node, ArrayCoerceExpr))
 	{
 		ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
 
@@ -835,7 +872,7 @@ contain_mutable_functions_walker(Node *node, void *context)
 		}
 		/* else fall through to check args */
 	}
-	if (IsA(node, RowCompareExpr))
+	else if (IsA(node, RowCompareExpr))
 	{
 		RowCompareExpr *rcexpr = (RowCompareExpr *) node;
 		ListCell   *opid;
@@ -886,36 +923,39 @@ contain_volatile_functions_walker(Node *node, void *context)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, OpExpr))
+	else if (IsA(node, OpExpr))
 	{
 		OpExpr	   *expr = (OpExpr *) node;
 
-		if (op_volatile(expr->opno) == PROVOLATILE_VOLATILE)
+		set_opfuncid(expr);
+		if (func_volatile(expr->opfuncid) == PROVOLATILE_VOLATILE)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, DistinctExpr))
+	else if (IsA(node, DistinctExpr))
 	{
 		DistinctExpr *expr = (DistinctExpr *) node;
 
-		if (op_volatile(expr->opno) == PROVOLATILE_VOLATILE)
+		set_opfuncid((OpExpr *) expr);	/* rely on struct equivalence */
+		if (func_volatile(expr->opfuncid) == PROVOLATILE_VOLATILE)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, ScalarArrayOpExpr))
+	else if (IsA(node, ScalarArrayOpExpr))
 	{
 		ScalarArrayOpExpr *expr = (ScalarArrayOpExpr *) node;
 
-		if (op_volatile(expr->opno) == PROVOLATILE_VOLATILE)
+		set_sa_opfuncid(expr);
+		if (func_volatile(expr->opfuncid) == PROVOLATILE_VOLATILE)
 			return true;
 		/* else fall through to check args */
 	}
 	else if (IsA(node, CoerceViaIO))
 	{
 		CoerceViaIO *expr = (CoerceViaIO *) node;
-		Oid	 iofunc;
-		Oid	 typioparam;
-		bool	typisvarlena;
+		Oid			iofunc;
+		Oid			typioparam;
+		bool		typisvarlena;
 
 		/* check the result type's input function */
 		getTypeInputInfo(expr->resulttype,
@@ -929,7 +969,7 @@ contain_volatile_functions_walker(Node *node, void *context)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, ArrayCoerceExpr))
+	else if (IsA(node, ArrayCoerceExpr))
 	{
 		ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
 
@@ -938,15 +978,16 @@ contain_volatile_functions_walker(Node *node, void *context)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, NullIfExpr))
+	else if (IsA(node, NullIfExpr))
 	{
 		NullIfExpr *expr = (NullIfExpr *) node;
 
-		if (op_volatile(expr->opno) == PROVOLATILE_VOLATILE)
+		set_opfuncid((OpExpr *) expr);	/* rely on struct equivalence */
+		if (func_volatile(expr->opfuncid) == PROVOLATILE_VOLATILE)
 			return true;
 		/* else fall through to check args */
 	}
-	if (IsA(node, RowCompareExpr))
+	else if (IsA(node, RowCompareExpr))
 	{
 		/* RowCompare probably can't have volatile ops, but check anyway */
 		RowCompareExpr *rcexpr = (RowCompareExpr *) node;
@@ -1056,7 +1097,8 @@ contain_nonstrict_functions_walker(Node *node, void *context)
 	{
 		OpExpr	   *expr = (OpExpr *) node;
 
-		if (!op_strict(expr->opno))
+		set_opfuncid(expr);
+		if (!func_strict(expr->opfuncid))
 			return true;
 		/* else fall through to check args */
 	}
@@ -1094,12 +1136,11 @@ contain_nonstrict_functions_walker(Node *node, void *context)
 	}
 	if (IsA(node, SubPlan))
 		return true;
+	/* ArrayCoerceExpr is strict at the array level, regardless of elemfunc */
 	if (IsA(node, FieldStore))
 		return true;
 	if (IsA(node, CaseExpr))
 		return true;
-	if (IsA(node, CaseWhen))
-		return true;
 	if (IsA(node, ArrayExpr))
 		return true;
 	if (IsA(node, RowExpr))
@@ -1171,13 +1212,13 @@ find_nonnullable_rels_walker(Node *node, bool top_level)
 	else if (IsA(node, List))
 	{
 		/*
-		 * At top level, we are examining an implicit-AND list: if any of
-		 * the arms produces FALSE-or-NULL then the result is FALSE-or-NULL.
-		 * If not at top level, we are examining the arguments of a strict
+		 * At top level, we are examining an implicit-AND list: if any of the
+		 * arms produces FALSE-or-NULL then the result is FALSE-or-NULL. If
+		 * not at top level, we are examining the arguments of a strict
 		 * function: if any of them produce NULL then the result of the
 		 * function must be NULL.  So in both cases, the set of nonnullable
-		 * rels is the union of those found in the arms, and we pass down
-		 * the top_level flag unmodified.
+		 * rels is the union of those found in the arms, and we pass down the
+		 * top_level flag unmodified.
 		 */
 		foreach(l, (List *) node)
 		{
@@ -1197,7 +1238,8 @@ find_nonnullable_rels_walker(Node *node, bool top_level)
 	{
 		OpExpr	   *expr = (OpExpr *) node;
 
-		if (op_strict(expr->opno))
+		set_opfuncid(expr);
+		if (func_strict(expr->opfuncid))
 			result = find_nonnullable_rels_walker((Node *) expr->args, false);
 	}
 	else if (IsA(node, ScalarArrayOpExpr))
@@ -1222,15 +1264,17 @@ find_nonnullable_rels_walker(Node *node, bool top_level)
 														  top_level);
 					break;
 				}
+
 				/*
 				 * Below top level, even if one arm produces NULL, the result
 				 * could be FALSE (hence not NULL).  However, if *all* the
-				 * arms produce NULL then the result is NULL, so we can
-				 * take the intersection of the sets of nonnullable rels,
-				 * just as for OR.  Fall through to share code.
+				 * arms produce NULL then the result is NULL, so we can take
+				 * the intersection of the sets of nonnullable rels, just as
+				 * for OR.	Fall through to share code.
 				 */
 				/* FALL THRU */
 			case OR_EXPR:
+
 				/*
 				 * OR is strict if all of its arms are, so we can take the
 				 * intersection of the sets of nonnullable rels for each arm.
@@ -1242,13 +1286,14 @@ find_nonnullable_rels_walker(Node *node, bool top_level)
 
 					subresult = find_nonnullable_rels_walker(lfirst(l),
 															 top_level);
-					if (result == NULL)				/* first subresult? */
+					if (result == NULL) /* first subresult? */
 						result = subresult;
 					else
 						result = bms_int_members(result, subresult);
+
 					/*
-					 * If the intersection is empty, we can stop looking.
-					 * This also justifies the test for first-subresult above.
+					 * If the intersection is empty, we can stop looking. This
+					 * also justifies the test for first-subresult above.
 					 */
 					if (bms_is_empty(result))
 						break;
@@ -1332,7 +1377,8 @@ is_strict_saop(ScalarArrayOpExpr *expr, bool falseOK)
 	Node	   *rightop;
 
 	/* The contained operator must be strict. */
-	if (!op_strict(expr->opno))
+	set_sa_opfuncid(expr);
+	if (!func_strict(expr->opfuncid))
 		return false;
 	/* If ANY and falseOK, that's all we need to check. */
 	if (expr->useOr && falseOK)
@@ -1751,10 +1797,12 @@ rowtype_field_matches(Oid rowtypeid, int fieldnum,
  *
  * Recurses into query tree and folds all constant expressions.
  */
-Query *fold_constants(Query *q, ParamListInfo boundParams, Size max_size)
+Query *
+fold_constants(PlannerGlobal *glob, Query *q, ParamListInfo boundParams, Size max_size)
 {
 	eval_const_expressions_context context;
 
+	context.glob = glob;
 	context.boundParams = boundParams;
 	context.active_fns = NIL;	/* nothing being recursively simplified */
 	context.case_val = NULL;	/* no CASE being examined */
@@ -1849,10 +1897,12 @@ eval_const_expressions(PlannerInfo *root, Node *node)
 	if (root)
 	{
 		context.boundParams = root->glob->boundParams;	/* bound Params */
+		context.glob = root->glob; /* for inlined-function dependencies */
 	}
 	else
 	{
 		context.boundParams = NULL;
+		context.glob = NULL;
 	}
 	context.active_fns = NIL;	/* nothing being recursively simplified */
 	context.case_val = NULL;	/* no CASE being examined */
@@ -1888,6 +1938,8 @@ estimate_expression_value(PlannerInfo *root, Node *node)
 	eval_const_expressions_context context;
 
 	context.boundParams = root->glob->boundParams;		/* bound Params */
+	/* we do not need to mark the plan as depending on inlined functions */
+	context.glob = NULL;
 	context.active_fns = NIL;	/* nothing being recursively simplified */
 	context.case_val = NULL;	/* no CASE being examined */
 	context.transform_stable_funcs = true;	/* unsafe transformations OK */
@@ -1940,7 +1992,7 @@ eval_const_expressions_mutator(Node *node,
 					else
 						pval = datumCopy(prm->value, typByVal, typLen);
 					return (Node *) makeConst(param->paramtype,
-											  -1,
+											  param->paramtypmod,
 											  (int) typLen,
 											  pval,
 											  prm->isnull,
@@ -1975,9 +2027,13 @@ eval_const_expressions_mutator(Node *node,
 
 		/*
 		 * Code for op/func reduction is pretty bulky, so split it out as a
-		 * separate function.
+		 * separate function.  Note: exprTypmod normally returns -1 for a
+		 * FuncExpr, but not when the node is recognizably a length coercion;
+		 * we want to preserve the typmod in the eventual Const if so.
 		 */
-		simple = simplify_function(expr->funcid, expr->funcresulttype, &args,
+		simple = simplify_function(expr->funcid,
+								   expr->funcresulttype, exprTypmod(node),
+								   &args,
 								   true, context);
 		if (simple)				/* successfully simplified it */
 			return (Node *) simple;
@@ -2032,7 +2088,9 @@ eval_const_expressions_mutator(Node *node,
 		 * Code for op/func reduction is pretty bulky, so split it out as a
 		 * separate function.
 		 */
-		simple = simplify_function(expr->opfuncid, expr->opresulttype, &args,
+		simple = simplify_function(expr->opfuncid,
+								   expr->opresulttype, -1,
+								   &args,
 								   true, context);
 		if (simple)				/* successfully simplified it */
 			return (Node *) simple;
@@ -2120,8 +2178,10 @@ eval_const_expressions_mutator(Node *node,
 			 * Code for op/func reduction is pretty bulky, so split it out as
 			 * a separate function.
 			 */
-			simple = simplify_function(expr->opfuncid, expr->opresulttype,
-									   &args, false, context);
+			simple = simplify_function(expr->opfuncid,
+									   expr->opresulttype, -1,
+									   &args,
+									   false, context);
 			if (simple)			/* successfully simplified it */
 			{
 				/*
@@ -2265,12 +2325,7 @@ eval_const_expressions_mutator(Node *node,
 			Const	   *con = (Const *) arg;
 
 			con->consttype = relabel->resulttype;
-
-			/*
-			 * relabel's resulttypmod is discarded, which is OK for now; if
-			 * the type actually needs a runtime length coercion then there
-			 * should be a function call to do it just above this node.
-			 */
+			con->consttypmod = relabel->resulttypmod;
 			return (Node *) con;
 		}
 		else
@@ -2284,6 +2339,108 @@ eval_const_expressions_mutator(Node *node,
 			return (Node *) newrelabel;
 		}
 	}
+	if (IsA(node, CoerceViaIO))
+	{
+		CoerceViaIO *expr = (CoerceViaIO *) node;
+		Expr	   *arg;
+		List	   *args;
+		Oid			outfunc;
+		bool		outtypisvarlena;
+		Oid			infunc;
+		Oid			intypioparam;
+		Expr	   *simple;
+		CoerceViaIO *newexpr;
+
+		/*
+		 * Reduce constants in the CoerceViaIO's argument.
+		 */
+		arg = (Expr *) eval_const_expressions_mutator((Node *) expr->arg,
+													  context);
+		args = list_make1(arg);
+
+		/*
+		 * CoerceViaIO represents calling the source type's output function
+		 * then the result type's input function.  So, try to simplify it
+		 * as though it were a stack of two such function calls.  First we
+		 * need to know what the functions are.
+		 */
+		getTypeOutputInfo(exprType((Node *) arg), &outfunc, &outtypisvarlena);
+		getTypeInputInfo(expr->resulttype, &infunc, &intypioparam);
+
+		simple = simplify_function(outfunc,
+								   CSTRINGOID, -1,
+								   &args,
+								   true, context);
+		if (simple)				/* successfully simplified output fn */
+		{
+			/*
+			 * Input functions may want 1 to 3 arguments.  We always supply
+			 * all three, trusting that nothing downstream will complain.
+			 */
+			List	   *args;
+
+			args = list_make3(simple,
+							  makeConst(OIDOID, -1, sizeof(Oid),
+										ObjectIdGetDatum(intypioparam),
+										false, true),
+							  makeConst(INT4OID, -1, sizeof(int32),
+										Int32GetDatum(-1),
+										false, true));
+
+			simple = simplify_function(infunc,
+									   expr->resulttype, -1,
+									   &args,
+									   true, context);
+			if (simple)			/* successfully simplified input fn */
+				return (Node *) simple;
+		}
+
+		/*
+		 * The expression cannot be simplified any further, so build and
+		 * return a replacement CoerceViaIO node using the possibly-simplified
+		 * argument.
+		 */
+		newexpr = makeNode(CoerceViaIO);
+		newexpr->arg = arg;
+		newexpr->resulttype = expr->resulttype;
+		newexpr->coerceformat = expr->coerceformat;
+		return (Node *) newexpr;
+	}
+	if (IsA(node, ArrayCoerceExpr))
+	{
+		ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
+		Expr	   *arg;
+		ArrayCoerceExpr *newexpr;
+
+		/*
+		 * Reduce constants in the ArrayCoerceExpr's argument, then build
+		 * a new ArrayCoerceExpr.
+		 */
+		arg = (Expr *) eval_const_expressions_mutator((Node *) expr->arg,
+													  context);
+
+		newexpr = makeNode(ArrayCoerceExpr);
+		newexpr->arg = arg;
+		newexpr->elemfuncid = expr->elemfuncid;
+		newexpr->resulttype = expr->resulttype;
+		newexpr->resulttypmod = expr->resulttypmod;
+		newexpr->isExplicit = expr->isExplicit;
+		newexpr->coerceformat = expr->coerceformat;
+
+		/*
+		 * If constant argument and it's a binary-coercible or immutable
+		 * conversion, we can simplify it to a constant.
+		 */
+		if (arg && IsA(arg, Const) &&
+			(!OidIsValid(newexpr->elemfuncid) ||
+			 func_volatile(newexpr->elemfuncid) == PROVOLATILE_IMMUTABLE))
+			return (Node *) evaluate_expr((Expr *) newexpr,
+										  newexpr->resulttype,
+										  newexpr->resulttypmod);
+
+		/* Else we must return the partially-simplified node */
+		return (Node *) newexpr;
+	}
 	if (IsA(node, CaseExpr))
 	{
 		/*----------
@@ -2301,7 +2458,18 @@ eval_const_expressions_mutator(Node *node,
 		 * placeholder nodes, so that we have the opportunity to reduce
 		 * constant test conditions.  For example this allows
 		 *		CASE 0 WHEN 0 THEN 1 ELSE 1/0 END
-		 * to reduce to 1 rather than drawing a divide-by-0 error.
+		 * to reduce to 1 rather than drawing a divide-by-0 error.  Note
+		 * that when the test expression is constant, we don't have to
+		 * include it in the resulting CASE; for example
+		 *		CASE 0 WHEN x THEN y ELSE z END
+		 * is transformed by the parser to
+		 *		CASE 0 WHEN CaseTestExpr = x THEN y ELSE z END
+		 * which we can simplify to
+		 *		CASE WHEN 0 = x THEN y ELSE z END
+		 * It is not necessary for the executor to evaluate the "arg"
+		 * expression when executing the CASE, since any contained
+		 * CaseTestExprs that might have referred to it will have been
+		 * replaced by the constant.
 		 *----------
 		 */
 		CaseExpr   *caseexpr = (CaseExpr *) node;
@@ -2320,7 +2488,10 @@ eval_const_expressions_mutator(Node *node,
 		/* Set up for contained CaseTestExpr nodes */
 		save_case_val = context->case_val;
 		if (newarg && IsA(newarg, Const))
+		{
 			context->case_val = newarg;
+			newarg = NULL;		/* not needed anymore, see comment above */
+		}
 		else
 			context->case_val = NULL;
 
@@ -2428,7 +2599,7 @@ eval_const_expressions_mutator(Node *node,
 
 		if ( IsA(scalar, Const) && IsA(values, Const))
 		{
-			Node *result = (Node *) evaluate_expr( (Expr *) saop, BOOLOID);
+			Node *result = (Node *) evaluate_expr( (Expr *) saop, BOOLOID, -1);
 			Assert(IsA(result, Const));
 			return result;
 		}
@@ -2473,7 +2644,8 @@ eval_const_expressions_mutator(Node *node,
 
 		if (all_const)
 			return (Node *) evaluate_expr((Expr *) newarray,
-										  newarray->array_typeid);
+										  newarray->array_typeid,
+										  exprTypmod(node));
 
 		return (Node *) newarray;
 	}
@@ -2495,7 +2667,9 @@ eval_const_expressions_mutator(Node *node,
 			/*
 			 * We can remove null constants from the list. For a non-null
 			 * constant, if it has not been preceded by any other
-			 * non-null-constant expressions then that is the result.
+			 * non-null-constant expressions then it is the result.  Otherwise,
+			 * it's the next argument, but we can drop following arguments
+			 * since they will never be reached.
 			 */
 			if (IsA(e, Const))
 			{
@@ -2503,6 +2677,8 @@ eval_const_expressions_mutator(Node *node,
 					continue;	/* drop null constant */
 				if (newargs == NIL)
 					return e;	/* first expr */
+				newargs = lappend(newargs, e);
+				break;
 			}
 			newargs = lappend(newargs, e);
 		}
@@ -3002,7 +3178,7 @@ simplify_boolean_equality(List *args)
  * (which might originally have been an operator; we don't care)
  *
  * Inputs are the function OID, actual result type OID (which is needed for
- * polymorphic functions), and the pre-simplified argument list;
+ * polymorphic functions) and typmod, and the pre-simplified argument list;
  * also the context data for eval_const_expressions.
  *
  * Returns a simplified expression if successful, or NULL if cannot
@@ -3015,7 +3191,8 @@ simplify_boolean_equality(List *args)
  * even if simplification fails.
  */
 static Expr *
-simplify_function(Oid funcid, Oid result_type, List **args,
+simplify_function(Oid funcid, Oid result_type, int32 result_typmod,
+				  List **args,
 				  bool allow_inline,
 				  eval_const_expressions_context *context)
 {
@@ -3046,7 +3223,7 @@ simplify_function(Oid funcid, Oid result_type, List **args,
 	if (((Form_pg_proc) GETSTRUCT(func_tuple))->pronargs > list_length(*args))
 		*args = add_function_defaults(*args, result_type, func_tuple);
 
-	newexpr = evaluate_function(funcid, result_type, *args,
+	newexpr = evaluate_function(funcid, result_type, result_typmod, *args,
 								func_tuple, context);
 
 	if (large_const(newexpr, context->max_size))
@@ -3125,7 +3302,8 @@ add_function_defaults(List *args, Oid result_type, HeapTuple func_tuple)
 	rettype = enforce_generic_type_consistency(actual_arg_types,
 											   declared_arg_types,
 											   nargs,
-											   funcform->prorettype);
+											   funcform->prorettype,
+											   false);
 
 	/* let's just check we got the same answer as the parser did ... */
 	if (rettype != result_type)
@@ -3178,7 +3356,7 @@ large_const(Expr *expr, Size max_size)
  * simplify the function.
  */
 static Expr *
-evaluate_function(Oid funcid, Oid result_type, List *args,
+evaluate_function(Oid funcid, Oid result_type, int32 result_typmod, List *args,
 				  HeapTuple func_tuple,
 				  eval_const_expressions_context *context)
 {
@@ -3226,7 +3404,7 @@ evaluate_function(Oid funcid, Oid result_type, List *args,
 	 * function is not otherwise immutable.
 	 */
 	if (funcform->proisstrict && has_null_input)
-		return (Expr *) makeNullConst(result_type, -1);
+		return (Expr *) makeNullConst(result_type, result_typmod);
 
 	/*
 	 * Otherwise, can simplify only if all inputs are constants. (For a
@@ -3262,7 +3440,7 @@ evaluate_function(Oid funcid, Oid result_type, List *args,
 	newexpr->funcformat = COERCE_DONTCARE;		/* doesn't matter */
 	newexpr->args = args;
 
-	return evaluate_expr((Expr *) newexpr, result_type);
+	return evaluate_expr((Expr *) newexpr, result_type, result_typmod);
 }
 
 /*
@@ -3287,6 +3465,10 @@ evaluate_function(Oid funcid, Oid result_type, List *args,
  * We must also beware of changing the volatility or strictness status of
  * functions by inlining them.
  *
+ * Also, at the moment we can't inline functions returning RECORD.  This
+ * doesn't work in the general case because it discards information such
+ * as OUT-parameter declarations.
+ *
  * Returns a simplified expression if successful, or NULL if cannot
  * simplify the function.
  */
@@ -3305,7 +3487,6 @@ inline_function(Oid funcid, Oid result_type, List *args,
 	MemoryContext mycxt;
 	ErrorContextCallback sqlerrcontext;
 	List	   *raw_parsetree_list;
-	List	   *querytree_list;
 	Query	   *querytree;
 	Node	   *newexpr;
 	int		   *usecounts;
@@ -3319,6 +3500,8 @@ inline_function(Oid funcid, Oid result_type, List *args,
 	if (funcform->prolang != SQLlanguageId ||
 		funcform->prosecdef ||
 		funcform->proretset ||
+		funcform->prorettype == RECORDOID ||
+		!heap_attisnull(func_tuple, Anum_pg_proc_proconfig) ||
 		funcform->pronargs != list_length(args))
 		return NULL;
 
@@ -3359,8 +3542,7 @@ inline_function(Oid funcid, Oid result_type, List *args,
 		   funcform->pronargs * sizeof(Oid));
 	for (i = 0; i < funcform->pronargs; i++)
 	{
-		if (argtypes[i] == ANYARRAYOID ||
-			argtypes[i] == ANYELEMENTOID)
+		if (IsPolymorphicType(argtypes[i]))
 		{
 			argtypes[i] = exprType((Node *) list_nth(args, i));
 		}
@@ -3384,19 +3566,15 @@ inline_function(Oid funcid, Oid result_type, List *args,
 	if (list_length(raw_parsetree_list) != 1)
 		goto fail;
 
-	querytree_list = parse_analyze(linitial(raw_parsetree_list), src,
-								   argtypes, funcform->pronargs);
-
-	if (list_length(querytree_list) != 1)
-		goto fail;
-
-	querytree = (Query *) linitial(querytree_list);
+	querytree = parse_analyze(linitial(raw_parsetree_list), src,
+							  argtypes, funcform->pronargs);
 
 	/*
 	 * The single command must be a simple "SELECT expression".
 	 */
 	if (!IsA(querytree, Query) ||
 		querytree->commandType != CMD_SELECT ||
+		querytree->utilityStmt ||
 		querytree->intoClause ||
 		querytree->hasAggs ||
 		querytree->hasSubLinks ||
@@ -3416,13 +3594,13 @@ inline_function(Oid funcid, Oid result_type, List *args,
 	newexpr = (Node *) ((TargetEntry *) linitial(querytree->targetList))->expr;
 
 	/*
-	 * Make sure the function (still) returns what it's declared to.  This will
-	 * raise an error if wrong, but that's okay since the function would fail
-	 * at runtime anyway.  Note we do not try this until we have verified that
-	 * no rewriting was needed; that's probably not important, but let's be
-	 * careful.
+	 * Make sure the function (still) returns what it's declared to.  This
+	 * will raise an error if wrong, but that's okay since the function would
+	 * fail at runtime anyway.	Note we do not try this until we have verified
+	 * that no rewriting was needed; that's probably not important, but let's
+	 * be careful.
 	 */
-	if (check_sql_fn_retval(funcid, result_type, querytree_list, NULL))
+	if (check_sql_fn_retval(funcid, result_type, list_make1(querytree), NULL))
 		goto fail;				/* reject whole-tuple-result cases */
 
 	/*
@@ -3523,6 +3701,13 @@ inline_function(Oid funcid, Oid result_type, List *args,
 										   COERCE_IMPLICIT_CAST);
 	}
 
+	/*
+	 * Since there is now no trace of the function in the plan tree, we
+	 * must explicitly record the plan's dependency on the function.
+	 */
+	if (context->glob)
+		record_plan_function_dependency(context->glob, funcid);
+
 	/*
 	 * Recursively try to simplify the modified expression.  Here we must add
 	 * the current function to the context list of active functions.
@@ -3625,7 +3810,7 @@ sql_inline_error_callback(void *arg)
  * code and ensure we get the same result as the executor would get.
  */
 Expr *
-evaluate_expr(Expr *expr, Oid result_type)
+evaluate_expr(Expr *expr, Oid result_type, int32 result_typmod)
 {
 	EState	   *estate;
 	ExprState  *exprstate;
@@ -3687,7 +3872,7 @@ evaluate_expr(Expr *expr, Oid result_type)
 	/*
 	 * Make the constant result node.
 	 */
-	return (Expr *) makeConst(result_type, -1, resultTypLen,
+	return (Expr *) makeConst(result_type, result_typmod, resultTypLen,
 							  const_val, const_is_null,
 							  resultTypByVal);
 }
@@ -3767,12 +3952,12 @@ expression_tree_mutator(Node *node,
 	 */
 
 #define FLATCOPY(newnode, node, nodetype)  \
-	( (newnode) = makeNode(nodetype), \
+	( (newnode) = (nodetype *) palloc(sizeof(nodetype)), \
 	  memcpy((newnode), (node), sizeof(nodetype)) )
 
 #define CHECKFLATCOPY(newnode, node, nodetype)	\
 	( AssertMacro(IsA((node), nodetype)), \
-	  (newnode) = makeNode(nodetype), \
+	  (newnode) = (nodetype *) palloc(sizeof(nodetype)), \
 	  memcpy((newnode), (node), sizeof(nodetype)) )
 
 #define MUTATE(newfield, oldfield, fieldtype)  \
@@ -3786,14 +3971,36 @@ expression_tree_mutator(Node *node,
 
 	switch (nodeTag(node))
 	{
+			/*
+			 * Primitive node types with no expression subnodes.  Var and
+			 * Const are frequent enough to deserve special cases, the others
+			 * we just use copyObject for.
+			 */
 		case T_Var:
+			{
+				Var		   *var = (Var *) node;
+				Var		   *newnode;
+
+				FLATCOPY(newnode, var, Var);
+				return (Node *) newnode;
+			}
+			break;
 		case T_Const:
+			{
+				Const	   *oldnode = (Const *) node;
+				Const	   *newnode;
+
+				FLATCOPY(newnode, oldnode, Const);
+				/* XXX we don't bother with datumCopy; should we? */
+				return (Node *) newnode;
+			}
+			break;
 		case T_Param:
 		case T_CoerceToDomainValue:
-		case T_CurrentOfExpr:
 		case T_CaseTestExpr:
 		case T_DynamicIndexScan:
 		case T_SetToDefault:
+		case T_CurrentOfExpr:
 		case T_RangeTblRef:
 		case T_OuterJoinInfo:
 		case T_String:
@@ -3805,7 +4012,6 @@ expression_tree_mutator(Node *node,
 		case T_PartBoundExpr:
 		case T_PartBoundInclusionExpr:
 		case T_PartBoundOpenExpr:
-			/* primitive node types with no expression subnodes */
 			return (Node *) copyObject(node);
 		case T_Aggref:
 			{
@@ -3951,7 +4157,6 @@ expression_tree_mutator(Node *node,
 				MUTATE(newnode->groupsets, grpingcl->groupsets, List *);
 				return (Node *)newnode;
 			}
-			break;
 		case T_ArrayRef:
 			{
 				ArrayRef   *arrayref = (ArrayRef *) node;
@@ -4037,7 +4242,6 @@ expression_tree_mutator(Node *node,
 				SubLink    *newnode;
 
 				FLATCOPY(newnode, sublink, SubLink);
-				
 				MUTATE(newnode->testexpr, sublink->testexpr, Node *);
 
 				/*
@@ -4200,11 +4404,12 @@ expression_tree_mutator(Node *node,
 			break;
 		case T_XmlExpr:
 			{
-				XmlExpr *xexpr = (XmlExpr *) node;
-				XmlExpr *newnode;
+				XmlExpr    *xexpr = (XmlExpr *) node;
+				XmlExpr    *newnode;
 
 				FLATCOPY(newnode, xexpr, XmlExpr);
 				MUTATE(newnode->named_args, xexpr->named_args, List *);
+				/* assume mutator does not care about arg_names */
 				MUTATE(newnode->args, xexpr->args, List *);
 				return (Node *) newnode;
 			}
@@ -4355,9 +4560,8 @@ expression_tree_mutator(Node *node,
 			}
 			break;
 		default:
-				ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),
-                            		errmsg_internal("unrecognized node type: %d",
-				                            nodeTag(node)) ));
+			elog(ERROR, "unrecognized node type: %d",
+				 (int) nodeTag(node));
 			break;
 	}
 	/* can't get here, but keep compiler happy */
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 96f6e39774b6..3a95d8766870 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/joininfo.c,v 1.48 2007/02/16 00:14:01 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/joininfo.c,v 1.50 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,8 +56,8 @@ have_relevant_joinclause(PlannerInfo *root,
 	}
 
 	/*
-	 * We also need to check the EquivalenceClass data structure, which
-	 * might contain relationships not emitted into the joininfo lists.
+	 * We also need to check the EquivalenceClass data structure, which might
+	 * contain relationships not emitted into the joininfo lists.
 	 */
 	if (!result && rel1->has_eclass_joins && rel2->has_eclass_joins)
 		result = have_relevant_eclass_joinclause(root, rel1, rel2);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 406a771cbbea..180520b64887 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/pathnode.c,v 1.138 2007/02/06 02:59:12 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/pathnode.c,v 1.142.2.1 2008/04/21 20:54:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1712,7 +1712,8 @@ create_unique_path(PlannerInfo *root,
 	cost_sort(&sort_path, root, NIL,
 			  subpath->total_cost,
 			  subpath_rows,
-			  rel->width);
+			  rel->width,
+			  -1.0);
 
 	/*
 	 * Charge one cpu_operator_cost per comparison per input tuple. We assume
@@ -1838,7 +1839,7 @@ create_unique_exprlist_path(PlannerInfo *root, Path *subpath,
 	 */
 	if (rel->rtekind == RTE_SUBQUERY)
 	{
-		RangeTblEntry *rte = rt_fetch(rel->relid, root->parse->rtable);
+		RangeTblEntry *rte = planner_rt_fetch(rel->relid, root);
 		List	   *sub_tlist_colnos;
 
 		sub_tlist_colnos = translate_sub_tlist(distinct_on_exprs, rel->relid);
@@ -2037,7 +2038,7 @@ make_unique_path(Path *subpath)
 /*
  * translate_sub_tlist - get subquery column numbers represented by tlist
  *
- * The given targetlist should contain only Vars referencing the given relid.
+ * The given targetlist usually contains only Vars referencing the given relid.
  * Extract their varattnos (ie, the column numbers of the subquery) and return
  * as an integer List.
  *
@@ -2070,7 +2071,7 @@ translate_sub_tlist(List *tlist, int relid)
  *
  * colnos is an integer list of output column numbers (resno's).  We are
  * interested in whether rows consisting of just these columns are certain
- * to be distinct.  "Distinctness" is defined according to whether the
+ * to be distinct.	"Distinctness" is defined according to whether the
  * corresponding upper-level equality operators listed in opids would think
  * the values are distinct.  (Note: the opids entries could be cross-type
  * operators, and thus not exactly the equality operators that the subquery
@@ -2087,8 +2088,8 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 
 	/*
 	 * DISTINCT (including DISTINCT ON) guarantees uniqueness if all the
-	 * columns in the DISTINCT clause appear in colnos and operator
-	 * semantics match.
+	 * columns in the DISTINCT clause appear in colnos and operator semantics
+	 * match.
 	 */
 	if (query->distinctClause)
 	{
@@ -2148,9 +2149,8 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 	 *
 	 * XXX this code knows that prepunion.c will adopt the default ordering
 	 * operator for each column datatype as the sortop.  It'd probably be
-	 * better if these operators were chosen at parse time and stored into
-	 * the parsetree, instead of leaving bits of the planner to decide
-	 * semantics.
+	 * better if these operators were chosen at parse time and stored into the
+	 * parsetree, instead of leaving bits of the planner to decide semantics.
 	 */
 	if (query->setOperations)
 	{
@@ -2172,7 +2172,7 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 				opid = distinct_col_search(tle->resno, colnos, opids);
 				if (!OidIsValid(opid) ||
 					!ops_in_same_btree_opfamily(opid,
-												ordering_oper_opid(exprType((Node *) tle->expr))))
+						   ordering_oper_opid(exprType((Node *) tle->expr))))
 					break;		/* exit early if no match */
 			}
 			if (l == NULL)		/* had matches for all? */
@@ -2192,7 +2192,7 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
  * distinct_col_search - subroutine for query_is_distinct_for
  *
  * If colno is in colnos, return the corresponding element of opids,
- * else return InvalidOid.  (We expect colnos does not contain duplicates,
+ * else return InvalidOid.	(We expect colnos does not contain duplicates,
  * so the result is well-defined.)
  */
 static Oid
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index c8c96c664acb..1c538b661f80 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.132 2007/01/20 23:13:01 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.140.2.1 2008/04/01 00:48:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #include "access/genam.h"
 #include "catalog/catquery.h"
 #include "access/heapam.h"
+#include "access/transam.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_exttable.h"
 #include "commands/tablecmds.h"
@@ -46,9 +47,13 @@
 /* GUC parameter */
 bool		constraint_exclusion = false;
 
+/* Hook for plugins to get control in get_relation_info() */
+get_relation_info_hook_type get_relation_info_hook = NULL;
+
+
 static List *get_relation_constraints(PlannerInfo *root,
-									  Oid relationObjectId, RelOptInfo *rel,
-									  bool include_notnull);
+						 Oid relationObjectId, RelOptInfo *rel,
+						 bool include_notnull);
 
 static void
 estimate_tuple_width(Relation   rel,
@@ -196,14 +201,29 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 			 * Ignore invalid indexes, since they can't safely be used for
 			 * queries.  Note that this is OK because the data structure we
 			 * are constructing is only used by the planner --- the executor
-			 * still needs to insert into "invalid" indexes!
+			 * still needs to insert into "invalid" indexes, if they're marked
+			 * IndexIsReady.
 			 */
-			if (!index->indisvalid)
+			if (!IndexIsValid(index))
 			{
 				index_close(indexRelation, NoLock);
 				continue;
 			}
 
+			/*
+			 * If the index is valid, but cannot yet be used, ignore it; but
+			 * mark the plan we are generating as transient. See
+			 * src/backend/access/heap/README.HOT for discussion.
+			 */
+			if (index->indcheckxmin &&
+				!TransactionIdPrecedes(HeapTupleHeaderGetXmin(indexRelation->rd_indextuple->t_data),
+									   TransactionXmin))
+			{
+				root->glob->transientPlan = true;
+				index_close(indexRelation, NoLock);
+				continue;
+			}
+
 			info = makeNode(IndexOptInfo);
 
 			info->indexoid = index->indexrelid;
@@ -211,25 +231,29 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 			info->ncolumns = ncolumns = index->indnatts;
 
 			/*
-			 * Need to make opfamily array large enough to put a terminating
-			 * zero at the end.
+			 * Allocate per-column info arrays.  To save a few palloc cycles
+			 * we allocate all the Oid-type arrays in one request.	Note that
+			 * the opfamily array needs an extra, terminating zero at the end.
+			 * We pre-zero the ordering info in case the index is unordered.
 			 */
 			info->indexkeys = (int *) palloc(sizeof(int) * ncolumns);
-			info->opfamily = (Oid *) palloc0(sizeof(Oid) * (ncolumns + 1));
-			/* initialize these to zeroes in case index is unordered */
-			info->fwdsortop = (Oid *) palloc0(sizeof(Oid) * ncolumns);
-			info->revsortop = (Oid *) palloc0(sizeof(Oid) * ncolumns);
+			info->opfamily = (Oid *) palloc0(sizeof(Oid) * (4 * ncolumns + 1));
+			info->opcintype = info->opfamily + (ncolumns + 1);
+			info->fwdsortop = info->opcintype + ncolumns;
+			info->revsortop = info->fwdsortop + ncolumns;
 			info->nulls_first = (bool *) palloc0(sizeof(bool) * ncolumns);
 
 			for (i = 0; i < ncolumns; i++)
 			{
-				info->opfamily[i] = indexRelation->rd_opfamily[i];
 				info->indexkeys[i] = index->indkey.values[i];
+				info->opfamily[i] = indexRelation->rd_opfamily[i];
+				info->opcintype[i] = indexRelation->rd_opcintype[i];
 			}
 
 			info->relam = indexRelation->rd_rel->relam;
 			info->amcostestimate = indexRelation->rd_am->amcostestimate;
 			info->amoptionalkey = indexRelation->rd_am->amoptionalkey;
+			info->amsearchnulls = indexRelation->rd_am->amsearchnulls;
 
 			/*
 			 * Fetch the ordering operators associated with the index, if any.
@@ -242,9 +266,9 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 
 				for (i = 0; i < ncolumns; i++)
 				{
-					int16	opt = indexRelation->rd_indoption[i];
-					int		fwdstrat;
-					int		revstrat;
+					int16		opt = indexRelation->rd_indoption[i];
+					int			fwdstrat;
+					int			revstrat;
 
 					if (opt & INDOPTION_DESC)
 					{
@@ -256,10 +280,11 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 						fwdstrat = BTLessStrategyNumber;
 						revstrat = BTGreaterStrategyNumber;
 					}
+
 					/*
-					 * Index AM must have a fixed set of strategies for it
-					 * to make sense to specify amcanorder, so we
-					 * need not allow the case amstrategies == 0.
+					 * Index AM must have a fixed set of strategies for it to
+					 * make sense to specify amcanorder, so we need not allow
+					 * the case amstrategies == 0.
 					 */
 					if (fwdstrat > 0)
 					{
@@ -324,6 +349,14 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 	rel->indexlist = indexinfos;
 
 	heap_close(relation, NoLock);
+
+	/*
+	 * Allow a plugin to editorialize on the info we obtained from the
+	 * catalogs.  Actions might include altering the assumed relation size,
+	 * removing an index, or adding a hypothetical index to the indexlist.
+	 */
+	if (get_relation_info_hook)
+		(*get_relation_info_hook) (root, relationObjectId, inhparent, rel);
 }
 
 /*
@@ -774,9 +807,13 @@ get_relation_constraints(PlannerInfo *root,
  * Detect whether the relation need not be scanned because it has either
  * self-inconsistent restrictions, or restrictions inconsistent with the
  * relation's CHECK constraints.
+ *
+ * Note: this examines only rel->relid and rel->baserestrictinfo; therefore
+ * it can be called before filling in other fields of the RelOptInfo.
  */
 bool
-relation_excluded_by_constraints(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
+relation_excluded_by_constraints(PlannerInfo *root,
+								 RelOptInfo *rel, RangeTblEntry *rte)
 {
 	List	   *safe_restrictions;
 	List	   *constraint_pred;
@@ -898,7 +935,7 @@ build_physical_tlist(PlannerInfo *root, RelOptInfo *rel)
 {
 	List	   *tlist = NIL;
 	Index		varno = rel->relid;
-	RangeTblEntry *rte = rt_fetch(varno, root->parse->rtable);
+	RangeTblEntry *rte = planner_rt_fetch(varno, root);
 	Relation	relation;
 	Query	   *subquery;
 	Var		   *var;
diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c
index 1f9e5386e500..89c7c23f51d3 100644
--- a/src/backend/optimizer/util/predtest.c
+++ b/src/backend/optimizer/util/predtest.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/predtest.c,v 1.13 2007/01/05 22:19:33 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/predtest.c,v 1.19.2.3 2010/02/25 21:00:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,6 +50,15 @@
 
 static const bool kUseFnEvaluationForPredicates = true;
 
+/*
+ * Proof attempts involving large arrays in ScalarArrayOpExpr nodes are
+ * likely to require O(N^2) time, and more often than not fail anyway.
+ * So we set an arbitrary limit on the number of array elements that
+ * we will allow to be treated as an AND or OR clause.
+ * XXX is it worth exposing this as a GUC knob?
+ */
+#define MAX_SAOP_ARRAY_SIZE		100
+
 /*
  * To avoid redundant coding in predicate_implied_by_recurse and
  * predicate_refuted_by_recurse, we need to abstract out the notion of
@@ -106,6 +115,7 @@ static void arrayexpr_cleanup_fn(PredIterInfo info);
 static bool predicate_implied_by_simple_clause(Expr *predicate, Node *clause);
 static bool predicate_refuted_by_simple_clause(Expr *predicate, Node *clause);
 static Node *extract_not_arg(Node *clause);
+static Node *extract_strong_not_arg(Node *clause);
 static bool list_member_strip(List *list, Expr *datum);
 static bool btree_predicate_proof(Expr *predicate, Node *clause,
 					  bool refute_it);
@@ -462,6 +472,8 @@ predicate_implied_by_recurse(Node *clause, Node *predicate)
  * Unfortunately we *cannot* use
  *	NOT A R=> B if:					B => A
  * because this type of reasoning fails to prove that B doesn't yield NULL.
+ * We can however make the more limited deduction that
+ *	NOT A R=> A
  *
  * Other comments are as for predicate_implied_by_recurse().
  *----------
@@ -647,20 +659,18 @@ predicate_refuted_by_recurse(Node *clause, Node *predicate)
 
 		case CLASS_ATOM:
 
-#ifdef NOT_USED
 			/*
-			 * If A is a NOT-clause, A R=> B if B => A's arg
+			 * If A is a strong NOT-clause, A R=> B if B equals A's arg
 			 *
-			 * Unfortunately not: this would only prove that B is not-TRUE,
-			 * not that it's not NULL either.  Keep this code as a comment
-			 * because it would be useful if we ever had a need for the
-			 * weak form of refutation.
+			 * We cannot make the stronger conclusion that B is refuted if
+			 * B implies A's arg; that would only prove that B is not-TRUE,
+			 * not that it's not NULL either.  Hence use equal() rather than
+			 * predicate_implied_by_recurse().  We could do the latter if we
+			 * ever had a need for the weak form of refutation.
 			 */
-			not_arg = extract_not_arg(clause);
-			if (not_arg &&
-				predicate_implied_by_recurse(predicate, not_arg))
+			not_arg = extract_strong_not_arg(clause);
+			if (not_arg && equal(predicate, not_arg))
 				return true;
-#endif
 
 			switch (pclass)
 			{
@@ -731,12 +741,12 @@ predicate_refuted_by_recurse(Node *clause, Node *predicate)
  * If the expression is classified as AND- or OR-type, then *info is filled
  * in with the functions needed to iterate over its components.
  *
- * This function also implements enforcement of MAX_BRANCHES_TO_TEST: if an
- * AND/OR expression has too many branches, we just classify it as an atom.
- * (This will result in its being passed as-is to the simple_clause functions,
- * which will fail to prove anything about it.)  Note that we cannot just stop
- * after considering MAX_BRANCHES_TO_TEST branches; in general that would
- * result in wrong proofs rather than failing to prove anything.
+ * This function also implements enforcement of MAX_SAOP_ARRAY_SIZE: if a
+ * ScalarArrayOpExpr's array has too many elements, we just classify it as an
+ * atom.  (This will result in its being passed as-is to the simple_clause
+ * functions, which will fail to prove anything about it.)  Note that we
+ * cannot just stop after considering MAX_SAOP_ARRAY_SIZE elements; in general
+ * that would result in wrong proofs, rather than failing to prove anything.
  */
 static PredClass
 predicate_classify(Node *clause, PredIterInfo info)
@@ -788,13 +798,22 @@ predicate_classify(Node *clause, PredIterInfo info)
 		if (arraynode && IsA(arraynode, Const) &&
 			!((Const *) arraynode)->constisnull)
 		{
-			info->startup_fn = arrayconst_startup_fn;
-			info->next_fn = arrayconst_next_fn;
-			info->cleanup_fn = arrayconst_cleanup_fn;
-			return saop->useOr ? CLASS_OR : CLASS_AND;
+			ArrayType  *arrayval;
+			int			nelems;
+
+			arrayval = DatumGetArrayTypeP(((Const *) arraynode)->constvalue);
+			nelems = ArrayGetNItems(ARR_NDIM(arrayval), ARR_DIMS(arrayval));
+			if (nelems <= MAX_SAOP_ARRAY_SIZE)
+			{
+				info->startup_fn = arrayconst_startup_fn;
+				info->next_fn = arrayconst_next_fn;
+				info->cleanup_fn = arrayconst_cleanup_fn;
+				return saop->useOr ? CLASS_OR : CLASS_AND;
+			}
 		}
-		if (arraynode && IsA(arraynode, ArrayExpr) &&
-			!((ArrayExpr *) arraynode)->multidims)
+		else if (arraynode && IsA(arraynode, ArrayExpr) &&
+				 !((ArrayExpr *) arraynode)->multidims &&
+				 list_length(((ArrayExpr *) arraynode)->elements) <= MAX_SAOP_ARRAY_SIZE)
 		{
 			info->startup_fn = arrayexpr_startup_fn;
 			info->next_fn = arrayexpr_next_fn;
@@ -897,6 +916,7 @@ arrayconst_startup_fn(Node *clause, PredIterInfo info)
 	/* Set up a dummy Const node to hold the per-element values */
 	state->constexpr.xpr.type = T_Const;
 	state->constexpr.consttype = ARR_ELEMTYPE(arrayval);
+	state->constexpr.consttypmod = -1;
 	state->constexpr.constlen = elmlen;
 	state->constexpr.constbyval = elmbyval;
 	lsecond(state->opexpr.args) = &state->constexpr;
@@ -1014,6 +1034,9 @@ arrayexpr_cleanup_fn(PredIterInfo info)
 static bool
 predicate_implied_by_simple_clause(Expr *predicate, Node *clause)
 {
+	/* Allow interrupting long proof attempts */
+	CHECK_FOR_INTERRUPTS();
+
 	/* First try the equal() test */
 	if (equal((Node *) predicate, clause))
 		return true;
@@ -1069,6 +1092,9 @@ predicate_implied_by_simple_clause(Expr *predicate, Node *clause)
 static bool
 predicate_refuted_by_simple_clause(Expr *predicate, Node *clause)
 {
+	/* Allow interrupting long proof attempts */
+	CHECK_FOR_INTERRUPTS();
+
 	/* A simple clause can't refute itself */
 	/* Worth checking because of relation_excluded_by_constraints() */
 	if ((Node *) predicate == clause)
@@ -1311,6 +1337,32 @@ extract_not_arg(Node *clause)
 	return NULL;
 }
 
+/*
+ * If clause asserts the falsity of a subclause, return that subclause;
+ * otherwise return NULL.
+ */
+static Node *
+extract_strong_not_arg(Node *clause)
+{
+	if (clause == NULL)
+		return NULL;
+	if (IsA(clause, BoolExpr))
+	{
+		BoolExpr   *bexpr = (BoolExpr *) clause;
+
+		if (bexpr->boolop == NOT_EXPR)
+			return (Node *) linitial(bexpr->args);
+	}
+	else if (IsA(clause, BooleanTest))
+	{
+		BooleanTest *btest = (BooleanTest *) clause;
+
+		if (btest->booltesttype == IS_FALSE)
+			return (Node *) btest->arg;
+	}
+	return NULL;
+}
+
 
 /*
  * Check whether an Expr is equal() to any member of a list, ignoring
@@ -1329,7 +1381,7 @@ list_member_strip(List *list, Expr *datum)
 
 	foreach(cell, list)
 	{
-		Expr *elem = (Expr *) lfirst(cell);
+		Expr	   *elem = (Expr *) lfirst(cell);
 
 		if (elem && IsA(elem, RelabelType))
 			elem = ((RelabelType *) elem)->arg;
@@ -1562,7 +1614,8 @@ btree_predicate_proof(Expr *predicate, Node *clause, bool refute_it)
 	 *
 	 * We must find a btree opfamily that contains both operators, else the
 	 * implication can't be determined.  Also, the opfamily must contain a
-	 * suitable test operator taking the pred_const and clause_const datatypes.
+	 * suitable test operator taking the pred_const and clause_const
+	 * datatypes.
 	 *
 	 * If there are multiple matching opfamilies, assume we can use any one to
 	 * determine the logical relationship of the two operators and the correct
@@ -1574,8 +1627,8 @@ btree_predicate_proof(Expr *predicate, Node *clause, bool refute_it)
 								 0, 0, 0);
 
 	/*
-	 * If we couldn't find any opfamily containing the pred_op, perhaps it is a
-	 * <> operator.  See if it has a negator that is in an opfamily.
+	 * If we couldn't find any opfamily containing the pred_op, perhaps it is
+	 * a <> operator.  See if it has a negator that is in an opfamily.
 	 */
 	pred_op_negated = false;
 	if (catlist->n_members == 0)
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 4a1b4f25cd50..c22a2b21a163 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/relnode.c,v 1.85 2007/01/20 20:45:40 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/relnode.c,v 1.89 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,9 +37,9 @@ typedef struct JoinHashEntry
 } JoinHashEntry;
 
 static List *build_joinrel_restrictlist(PlannerInfo *root,
-										RelOptInfo *joinrel,
-										RelOptInfo *outer_rel,
-										RelOptInfo *inner_rel);
+						   RelOptInfo *joinrel,
+						   RelOptInfo *outer_rel,
+						   RelOptInfo *inner_rel);
 static void build_joinrel_joinlist(RelOptInfo *joinrel,
 					   RelOptInfo *outer_rel,
 					   RelOptInfo *inner_rel);
@@ -60,15 +60,15 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptKind reloptkind)
 	RelOptInfo *rel;
 	RangeTblEntry *rte;
 
-	/* Fetch RTE for relation */
-	Assert(relid > 0 && relid <= list_length(root->parse->rtable));
-	rte = rt_fetch(relid, root->parse->rtable);
-
 	/* Rel should not exist already */
-	Assert(relid < root->simple_rel_array_size);
+	Assert(relid > 0 && relid < root->simple_rel_array_size);
 	if (root->simple_rel_array[relid] != NULL)
 		elog(ERROR, "rel %d already exists", relid);
 
+	/* Fetch RTE for relation */
+	rte = root->simple_rte_array[relid];
+	Assert(rte != NULL);
+
     /* CDB: Rel isn't expected to have any pseudo columns yet. */
     Assert(!rte->pseudocols);
 
@@ -581,8 +581,9 @@ build_joinrel_restrictlist(PlannerInfo *root,
 	 */
 	result = subbuild_joinrel_restrictlist(joinrel, outer_rel->joininfo, NIL);
 	result = subbuild_joinrel_restrictlist(joinrel, inner_rel->joininfo, result);
+
 	/*
-	 * Add on any clauses derived from EquivalenceClasses.  These cannot be
+	 * Add on any clauses derived from EquivalenceClasses.	These cannot be
 	 * redundant with the clauses in the joininfo lists, so don't bother
 	 * checking.
 	 */
@@ -670,10 +671,10 @@ subbuild_joinrel_joinlist(RelOptInfo *joinrel,
 		{
 			/*
 			 * This clause is still a join clause at this level, so add it to
-			 * the new joininfo list, being careful to eliminate
-			 * duplicates. (Since RestrictInfo nodes in different joinlists
-			 * will have been multiply-linked rather than copied, pointer
-			 * equality should be a sufficient test.)
+			 * the new joininfo list, being careful to eliminate duplicates.
+			 * (Since RestrictInfo nodes in different joinlists will have been
+			 * multiply-linked rather than copied, pointer equality should be
+			 * a sufficient test.)
 			 */
 			new_joininfo = list_append_unique_ptr(new_joininfo, rinfo);
 		}
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index eab263540de6..54738f80bf24 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.53 2007/01/22 20:00:39 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.55.2.1 2009/04/16 20:42:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,12 +27,16 @@ static RestrictInfo *make_restrictinfo_internal(Expr *clause,
 						   bool is_pushed_down,
 						   bool outerjoin_delayed,
 						   bool pseudoconstant,
-						   Relids required_relids);
+						   Relids required_relids,
+						   Relids nullable_relids,
+						   Relids ojscope_relids);
 static Expr *make_sub_restrictinfos(Expr *clause,
 					   bool is_pushed_down,
 					   bool outerjoin_delayed,
 					   bool pseudoconstant,
-					   Relids required_relids);
+					   Relids required_relids,
+					   Relids nullable_relids,
+					   Relids ojscope_relids);
 static bool join_clause_is_redundant(PlannerInfo *root,
 						 RestrictInfo *rinfo,
 						 List *reference_list);
@@ -43,9 +47,9 @@ static bool join_clause_is_redundant(PlannerInfo *root,
  * Build a RestrictInfo node containing the given subexpression.
  *
  * The is_pushed_down, outerjoin_delayed, and pseudoconstant flags for the
- * RestrictInfo must be supplied by the caller.  required_relids can be NULL,
- * in which case it defaults to the actual clause contents (i.e.,
- * clause_relids).
+ * RestrictInfo must be supplied by the caller, as well as the correct value
+ * for nullable_relids.  required_relids can be NULL, in which case it
+ * defaults to the actual clause contents (i.e., clause_relids).
  *
  * We initialize fields that depend only on the given subexpression, leaving
  * others that depend on context (or may never be needed at all) to be filled
@@ -56,7 +60,9 @@ make_restrictinfo(Expr *clause,
 				  bool is_pushed_down,
 				  bool outerjoin_delayed,
 				  bool pseudoconstant,
-				  Relids required_relids)
+				  Relids required_relids,
+				  Relids nullable_relids,
+				  Relids ojscope_relids)
 {
 	/*
 	 * If it's an OR clause, build a modified copy with RestrictInfos inserted
@@ -67,7 +73,9 @@ make_restrictinfo(Expr *clause,
 													   is_pushed_down,
 													   outerjoin_delayed,
 													   pseudoconstant,
-													   required_relids);
+													   required_relids,
+													   nullable_relids,
+													   ojscope_relids);
 
 	/* Shouldn't be an AND clause, else AND/OR flattening messed up */
 	Assert(!and_clause((Node *) clause));
@@ -77,7 +85,9 @@ make_restrictinfo(Expr *clause,
 									  is_pushed_down,
 									  outerjoin_delayed,
 									  pseudoconstant,
-									  required_relids);
+									  required_relids,
+									  nullable_relids,
+									  ojscope_relids);
 }
 
 /*
@@ -91,8 +101,8 @@ make_restrictinfo(Expr *clause,
  * RestrictInfos.
  *
  * The caller must pass is_pushed_down, but we assume outerjoin_delayed
- * and pseudoconstant are false (no such qual should ever get into a
- * bitmapqual).
+ * and pseudoconstant are false and nullable_relids is NULL (no other
+ * kind of qual should ever get into a bitmapqual).
  *
  * If include_predicates is true, we add any partial index predicates to
  * the explicit index quals.  When this is not true, we return a condition
@@ -223,6 +233,8 @@ make_restrictinfo_from_bitmapqual(Path *bitmapqual,
 													  is_pushed_down,
 													  false,
 													  false,
+													  NULL,
+													  NULL,
 													  NULL));
 		}
 	}
@@ -249,6 +261,8 @@ make_restrictinfo_from_bitmapqual(Path *bitmapqual,
 													   is_pushed_down,
 													   false,
 													   false,
+													   NULL,
+													   NULL,
 													   NULL));
 			}
 		}
@@ -273,7 +287,9 @@ make_restrictinfo_internal(Expr *clause,
 						   bool is_pushed_down,
 						   bool outerjoin_delayed,
 						   bool pseudoconstant,
-						   Relids required_relids)
+						   Relids required_relids,
+						   Relids nullable_relids,
+						   Relids ojscope_relids)
 {
 	RestrictInfo *restrictinfo = makeNode(RestrictInfo);
 
@@ -283,6 +299,8 @@ make_restrictinfo_internal(Expr *clause,
 	restrictinfo->outerjoin_delayed = outerjoin_delayed;
 	restrictinfo->pseudoconstant = pseudoconstant;
 	restrictinfo->can_join = false;		/* may get set below */
+	restrictinfo->nullable_relids = nullable_relids;
+	restrictinfo->ojscope_relids = ojscope_relids;
 
 	/**
 	 * If this is a IS NOT FALSE boolean test, we can peek underneath.
@@ -380,7 +398,8 @@ make_restrictinfo_internal(Expr *clause,
  * simple clauses are valid RestrictInfos.
  *
  * The same is_pushed_down, outerjoin_delayed, and pseudoconstant flag
- * values can be applied to all RestrictInfo nodes in the result.
+ * values can be applied to all RestrictInfo nodes in the result.  Likewise
+ * for nullable_relids.
  *
  * The given required_relids are attached to our top-level output,
  * but any OR-clause constituents are allowed to default to just the
@@ -391,7 +410,9 @@ make_sub_restrictinfos(Expr *clause,
 					   bool is_pushed_down,
 					   bool outerjoin_delayed,
 					   bool pseudoconstant,
-					   Relids required_relids)
+					   Relids required_relids,
+					   Relids nullable_relids,
+					   Relids ojscope_relids)
 {
 	if (or_clause((Node *) clause))
 	{
@@ -404,13 +425,17 @@ make_sub_restrictinfos(Expr *clause,
 													is_pushed_down,
 													outerjoin_delayed,
 													pseudoconstant,
-													NULL));
+													NULL,
+													nullable_relids,
+													ojscope_relids));
 		return (Expr *) make_restrictinfo_internal(clause,
 												   make_orclause(orlist),
 												   is_pushed_down,
 												   outerjoin_delayed,
 												   pseudoconstant,
-												   required_relids);
+												   required_relids,
+												   nullable_relids,
+												   ojscope_relids);
 	}
 	else if (and_clause((Node *) clause))
 	{
@@ -423,7 +448,9 @@ make_sub_restrictinfos(Expr *clause,
 													 is_pushed_down,
 													 outerjoin_delayed,
 													 pseudoconstant,
-													 required_relids));
+													 required_relids,
+													 nullable_relids,
+													 ojscope_relids));
 		return make_andclause(andlist);
 	}
 	else
@@ -432,7 +459,9 @@ make_sub_restrictinfos(Expr *clause,
 												   is_pushed_down,
 												   outerjoin_delayed,
 												   pseudoconstant,
-												   required_relids);
+												   required_relids,
+												   nullable_relids,
+												   ojscope_relids);
 }
 
 /*
@@ -546,7 +575,7 @@ extract_actual_join_clauses(List *restrictinfo_list,
  *
  * Given a list of RestrictInfo clauses that are to be applied in a join,
  * select the ones that are not redundant with any clause in the
- * reference_list.  This is used only for nestloop-with-inner-indexscan
+ * reference_list.	This is used only for nestloop-with-inner-indexscan
  * joins: any clauses being checked by the index should be removed from
  * the qpquals list.
  *
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 58a128d18bfa..cc1d2f0d2ff6 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/tlist.c,v 1.74 2007/01/05 22:19:33 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/tlist.c,v 1.78 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -88,36 +88,32 @@ tlist_members(Node *node, List *targetlist)
 }
 
 /*
- * tlist_member_ignoring_RelabelType
- *	  Finds the (first) member of the given tlist whose expression is
- *	  equal() to the given expression.	Result is NULL if no such member.
- *
- * Disregards the presence or absence of a RelabelType node atop the
- * given expression and/or the tlist expressions.
+ * tlist_member_ignore_relabel
+ *	  Same as above, except that we ignore top-level RelabelType nodes
+ *	  while checking for a match.  This is needed for some scenarios
+ *	  involving binary-compatible sort operations.
  */
 TargetEntry *
-tlist_member_ignoring_RelabelType(Expr *expr, List *targetlist)
+tlist_member_ignore_relabel(Node *node, List *targetlist)
 {
-    ListCell   *temp;
+	ListCell   *temp;
 
-    if (IsA(expr, RelabelType))
-        expr = ((RelabelType *)expr)->arg;
+	while (node && IsA(node, RelabelType))
+		node = (Node *) ((RelabelType *) node)->arg;
 
-    foreach(temp, targetlist)
-    {
-        TargetEntry *tlentry = (TargetEntry *)lfirst(temp);
-        Expr        *tlexpr = tlentry->expr;
-
-        Assert(IsA(tlentry, TargetEntry));
+	foreach(temp, targetlist)
+	{
+		TargetEntry *tlentry = (TargetEntry *) lfirst(temp);
+		Expr	   *tlexpr = tlentry->expr;
 
-        if (IsA(tlexpr, RelabelType))
-            tlexpr = ((RelabelType *)tlexpr)->arg;
+		while (tlexpr && IsA(tlexpr, RelabelType))
+			tlexpr = ((RelabelType *) tlexpr)->arg;
 
-        if (equal(expr, tlexpr))
-            return tlentry;
+		if (equal(node, tlexpr))
+			return tlentry;
 	}
 	return NULL;
-}                               /* tlist_member_ignoring_RelabelType */
+}
 
 
 /*
@@ -163,9 +159,9 @@ add_to_flat_tlist(List *tlist, List *exprs, bool resjunk)
 
 	foreach(v, exprs)
 	{
-		Expr		   *expr = (Expr *) lfirst(v);
+		Node	   *expr = (Node *) lfirst(v);
 
-		if (!tlist_member_ignoring_RelabelType(expr, tlist))
+		if (!tlist_member_ignore_relabel(expr, tlist))
 		{
 			TargetEntry *tle;
 
@@ -179,26 +175,22 @@ add_to_flat_tlist(List *tlist, List *exprs, bool resjunk)
 	return tlist;
 }
 
+
 /*
- * get_sortgroupclause_tle
- *		Find the targetlist entry matching the given SortClause
- *		(or GroupClause) by ressortgroupref, and return it.
- *
- * Because GroupClause is typedef'd as SortClause, either kind of
- * node can be passed without casting.
+ * get_sortgroupref_tle
+ *		Find the targetlist entry matching the given SortGroupRef index,
+ *		and return it.
  */
 TargetEntry *
-get_sortgroupclause_tle(SortClause *sortClause,
-						List *targetList)
+get_sortgroupref_tle(Index sortref, List *targetList)
 {
-	Index		refnumber = sortClause->tleSortGroupRef;
 	ListCell   *l;
 
 	foreach(l, targetList)
 	{
 		TargetEntry *tle = (TargetEntry *) lfirst(l);
 
-		if (tle->ressortgroupref == refnumber)
+		if (tle->ressortgroupref == sortref)
 			return tle;
 	}
 
@@ -206,6 +198,21 @@ get_sortgroupclause_tle(SortClause *sortClause,
 	return NULL;				/* keep compiler quiet */
 }
 
+/*
+ * get_sortgroupclause_tle
+ *		Find the targetlist entry matching the given SortClause
+ *		(or GroupClause) by ressortgroupref, and return it.
+ *
+ * Because GroupClause is typedef'd as SortClause, either kind of
+ * node can be passed without casting.
+ */
+TargetEntry *
+get_sortgroupclause_tle(SortClause *sortClause,
+						List *targetList)
+{
+	return get_sortgroupref_tle(sortClause->tleSortGroupRef, targetList);
+}
+
 /*
  * get_sortgroupclauses_tles
  *      Find a list of unique targetlist entries matching the given list of
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 9d49075998f9..e6bfc8461e6a 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -9,12 +9,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/var.c,v 1.69 2007/01/05 22:19:33 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/var.c,v 1.73.2.1 2010/07/08 00:14:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "access/htup.h"
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
 #include "optimizer/var.h"
@@ -55,8 +56,12 @@ typedef struct
 {
 	PlannerInfo *root;
 	int			sublevels_up;
+	bool		possible_sublink;		/* could aliases include a SubLink? */
+	bool		inserted_sublink;		/* have we inserted a SubLink? */
 } flatten_join_alias_vars_context;
 
+static bool pull_varattnos_walker(Node *node, Bitmapset **varattnos);
+
 static bool contain_var_clause_walker(Node *node, void *context);
 static bool contain_vars_of_level_walker(Node *node, int *sublevels_up);
 static bool locate_var_of_level_walker(Node *node,
@@ -187,6 +192,47 @@ pull_varnos(Node *node)
 	return pull_varnos_of_level(node, 0);
 }
 
+/*
+ * pull_varattnos
+ *		Find all the distinct attribute numbers present in an expression tree,
+ *		and add them to the initial contents of *varattnos.
+ *		Only Vars that reference RTE 1 of rtable level zero are considered.
+ *
+ * Attribute numbers are offset by FirstLowInvalidHeapAttributeNumber so that
+ * we can include system attributes (e.g., OID) in the bitmap representation.
+ *
+ * Currently, this does not support subqueries nor expressions containing
+ * references to multiple tables; not needed since it's only applied to
+ * index expressions and predicates.
+ */
+void
+pull_varattnos(Node *node, Bitmapset **varattnos)
+{
+	(void) pull_varattnos_walker(node, varattnos);
+}
+
+static bool
+pull_varattnos_walker(Node *node, Bitmapset **varattnos)
+{
+	if (node == NULL)
+		return false;
+	if (IsA(node, Var))
+	{
+		Var		   *var = (Var *) node;
+
+		Assert(var->varno == 1);
+		*varattnos = bms_add_member(*varattnos,
+						 var->varattno - FirstLowInvalidHeapAttributeNumber);
+		return false;
+	}
+	/* Should not find a subquery or subplan */
+	Assert(!IsA(node, Query));
+	Assert(!is_subplan(node));
+
+	return expression_tree_walker(node, pull_varattnos_walker,
+								  (void *) varattnos);
+}
+
 
 /*
  *		contain_var_reference
@@ -270,6 +316,8 @@ contain_var_clause_walker(Node *node, void *context)
 			return true;		/* abort the tree traversal and return true */
 		return false;
 	}
+	if (IsA(node, CurrentOfExpr))
+		return true;
 	return expression_tree_walker(node, contain_var_clause_walker, context);
 }
 
@@ -598,6 +646,14 @@ pull_var_clause_walker(Node *node, pull_var_clause_context *context)
  *	  is necessary since we will not scan the JOIN as a base relation, which
  *	  is the only way that the executor can directly handle whole-row Vars.
  *
+ * If a JOIN contains sub-selects that have been flattened, its join alias
+ * entries might now be arbitrary expressions, not just Vars.  This affects
+ * this function in one important way: we might find ourselves inserting
+ * SubLink expressions into subqueries, and we must make sure that their
+ * Query.hasSubLinks fields get set to TRUE if so.  If there are any
+ * SubLinks in the join alias lists, the outer Query should already have
+ * hasSubLinks = TRUE, so this is only relevant to un-flattened subqueries.
+ *
  * NOTE: this is used on not-yet-planned expressions.  We do not expect it
  * to be applied directly to a Query node.
  */
@@ -608,6 +664,10 @@ flatten_join_alias_vars(PlannerInfo *root, Node *node)
 
 	context.root = root;
 	context.sublevels_up = 0;
+	/* flag whether join aliases could possibly contain SubLinks */
+	context.possible_sublink = root->parse->hasSubLinks;
+	/* if hasSubLinks is already true, no need to work hard */
+	context.inserted_sublink = root->parse->hasSubLinks;
 
 	return flatten_join_alias_vars_mutator(node, &context);
 }
@@ -657,6 +717,7 @@ flatten_join_alias_vars_mutator(Node *node,
 					IncrementVarSublevelsUp(newvar, context->sublevels_up, 0);
 				}
 				/* Recurse in case join input is itself a join */
+				/* (also takes care of setting inserted_sublink if needed) */
 				newvar = flatten_join_alias_vars_mutator(newvar, context);
 				fields = lappend(fields, newvar);
 			}
@@ -681,8 +742,15 @@ flatten_join_alias_vars_mutator(Node *node,
 			newvar = copyObject(newvar);
 			IncrementVarSublevelsUp(newvar, context->sublevels_up, 0);
 		}
+
 		/* Recurse in case join input is itself a join */
-		return flatten_join_alias_vars_mutator(newvar, context);
+		newvar = flatten_join_alias_vars_mutator(newvar, context);
+
+		/* Detect if we are adding a sublink to query */
+		if (context->possible_sublink && !context->inserted_sublink)
+			context->inserted_sublink = checkExprHasSubLink(newvar);
+
+		return newvar;
 	}
 	if (IsA(node, InClauseInfo))
 	{
@@ -698,17 +766,21 @@ flatten_join_alias_vars_mutator(Node *node,
 												ininfo->righthand);
 		return (Node *) ininfo;
 	}
-
 	if (IsA(node, Query))
 	{
 		/* Recurse into RTE subquery or not-yet-planned sublink subquery */
 		Query	   *newnode;
+		bool		save_inserted_sublink;
 
 		context->sublevels_up++;
+		save_inserted_sublink = context->inserted_sublink;
+		context->inserted_sublink = ((Query *) node)->hasSubLinks;
 		newnode = query_tree_mutator((Query *) node,
 									 flatten_join_alias_vars_mutator,
 									 (void *) context,
 									 QTW_IGNORE_JOINALIASES);
+		newnode->hasSubLinks |= context->inserted_sublink;
+		context->inserted_sublink = save_inserted_sublink;
 		context->sublevels_up--;
 		return (Node *) newnode;
 	}
diff --git a/src/backend/optimizer/util/walkers.c b/src/backend/optimizer/util/walkers.c
index 89c1b2c3a453..c741fcef8574 100644
--- a/src/backend/optimizer/util/walkers.c
+++ b/src/backend/optimizer/util/walkers.c
@@ -934,13 +934,19 @@ plan_tree_walker(Node *node,
 		case T_BitmapHeapScan:
 		case T_BitmapAppendOnlyScan:
 		case T_BitmapTableScan:
-		case T_FunctionScan:
 		case T_TableFunctionScan:
 		case T_ValuesScan:
 			if (walk_scan_node_fields((Scan *) node, walker, context))
 				return true;
 			break;
 
+		case T_FunctionScan:
+			if (walker((Node *) ((FunctionScan *) node)->funcexpr, context))
+				return true;
+			if (walk_scan_node_fields((Scan *) node, walker, context))
+				return true;
+			break;
+
 		case T_IndexScan:
 		case T_DynamicIndexScan:
 			if (walk_scan_node_fields((Scan *) node, walker, context))
@@ -1156,6 +1162,7 @@ plan_tree_walker(Node *node,
 		case T_CoerceToDomainValue:
 		case T_CaseTestExpr:
 		case T_SetToDefault:
+		case T_CurrentOfExpr:
 		case T_RangeTblRef:
 		case T_Aggref:
 		case T_AggOrder:
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index cb26cbaa76c6..4a5736c5a032 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for parser
 #
-# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.44 2006/05/27 17:38:45 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.45 2007/06/23 22:12:51 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 032e0ffd5930..59de00e71862 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -18,28 +18,22 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.360 2007/02/01 19:10:27 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.371.2.2 2009/01/30 16:59:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/heapam.h"
 #include "access/reloptions.h"
 #include "catalog/catquery.h"
 #include "catalog/gp_policy.h"
 #include "catalog/heap.h"
-#include "catalog/index.h"
 #include "catalog/indexing.h"
-#include "catalog/namespace.h"
 #include "catalog/pg_compression.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_type_encoding.h"
 #include "cdb/cdbpartition.h"
-#include "commands/defrem.h"
-#include "commands/prepare.h"
-#include "commands/tablecmds.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
@@ -48,7 +42,6 @@
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
 #include "parser/analyze.h"
-#include "parser/gramparse.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_coerce.h"
@@ -62,35 +55,17 @@
 #include "parser/parse_utilcmd.h"
 #include "parser/parse_cte.h"
 #include "parser/parsetree.h"
-#include "rewrite/rewriteManip.h"
+
 #include "utils/builtins.h"
+#include "rewrite/rewriteManip.h"
+#include "commands/defrem.h"
+#include "commands/tablecmds.h"
 #include "utils/lsyscache.h"
-#include "utils/syscache.h"
 
 #include "cdb/cdbvars.h"
 #include "cdb/cdbhash.h"
 #include "cdb/cdbsreh.h"
 
-/* State shared by transformCreateSchemaStmt and its subroutines */
-typedef struct
-{
-	const char *stmtType;		/* "CREATE SCHEMA" or "ALTER SCHEMA" */
-	char	   *schemaname;		/* name of schema */
-	char	   *authid;			/* owner of schema */
-	List	   *sequences;		/* CREATE SEQUENCE items */
-	List	   *tables;			/* CREATE TABLE items */
-	List	   *views;			/* CREATE VIEW items */
-	List	   *indexes;		/* CREATE INDEX items */
-	List	   *triggers;		/* CREATE TRIGGER items */
-	List	   *grants;			/* GRANT items */
-	List	   *fwconstraints;	/* Forward referencing FOREIGN KEY constraints */
-	List	   *alters;			/* Generated ALTER items (from the above) */
-	List	   *ixconstraints;	/* index-creating constraints */
-	List	   *blist;			/* "before list" of things to do before
-								 * creating the schema */
-	List	   *alist;			/* "after list" of things to do after creating
-								 * the schema */
-} CreateSchemaStmtContext;
 
 /* Context for transformGroupedWindows() which mutates components
  * of a query that mixes windowing and aggregation or grouping.  It
@@ -115,15 +90,9 @@ typedef struct
 	TargetEntry *tle;
 } grouped_window_ctx;
 
-static List *do_parse_analyze(Node *parseTree, ParseState *pstate);
 static void parse_analyze_error_callback(void *parsestate);     /*CDB*/
-static Query *transformStmt(ParseState *pstate, Node *stmt,
-			  List **extras_before, List **extras_after);
-static Query *transformViewStmt(ParseState *pstate, ViewStmt *stmt,
-				  List **extras_before, List **extras_after);
 static Query *transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt);
-static Query *transformInsertStmt(ParseState *pstate, InsertStmt *stmt,
-					List **extras_before, List **extras_after);
+static Query *transformInsertStmt(ParseState *pstate, InsertStmt *stmt);
 static List *transformInsertRow(ParseState *pstate, List *exprlist,
 				   List *stmtcols, List *icolumns, List *attrnos);
 
@@ -137,55 +106,26 @@ static List *transformInsertRow(ParseState *pstate, List *exprlist,
 static List *transformReturningList(ParseState *pstate, List *returningList);
 #endif
 
-static Query *transformIndexStmt(ParseState *pstate, IndexStmt *stmt,
-								 List **extras_before, List **extras_after);
-static Query *transformRuleStmt(ParseState *query, RuleStmt *stmt,
-				  List **extras_before, List **extras_after);
 static Query *transformSelectStmt(ParseState *pstate, SelectStmt *stmt);
 static Query *transformValuesClause(ParseState *pstate, SelectStmt *stmt);
 static Query *transformSetOperationStmt(ParseState *pstate, SelectStmt *stmt);
 static Node *transformSetOperationTree(ParseState *pstate, SelectStmt *stmt);
+static void getSetColTypes(ParseState *pstate, Node *node,
+			   List **colTypes, List **colTypmods);
+static void applyColumnNames(List *dst, List *src);
 static Query *transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt);
 static Query *transformDeclareCursorStmt(ParseState *pstate,
 						   DeclareCursorStmt *stmt);
+static Query *transformExplainStmt(ParseState *pstate,
+					 ExplainStmt *stmt);
 static bool isSimplyUpdatableQuery(Query *query);
-static Query *transformPrepareStmt(ParseState *pstate, PrepareStmt *stmt);
-static Query *transformExecuteStmt(ParseState *pstate, ExecuteStmt *stmt);
-static Query *transformCreateExternalStmt(ParseState *pstate, CreateExternalStmt *stmt,
-										  List **extras_before, List **extras_after);
-static Query *transformAlterTableStmt(ParseState *pstate, AlterTableStmt *stmt,
-						List **extras_before, List **extras_after);
-static void transformColumnDefinition(ParseState *pstate,
-						  CreateStmtContext *cxt,
-						  ColumnDef *column);
-static void transformTableConstraint(ParseState *pstate,
-						 CreateStmtContext *cxt,
-						 Constraint *constraint);
-static void transformDistributedBy(ParseState *pstate,
-								   CreateStmtContext *cxt,
-								   List *distributedBy,
-								   GpPolicy ** policy, List *likeDistributedBy,
-								   bool bQuiet);
-
-static void transformFKConstraints(ParseState *pstate,
-					   CreateStmtContext *cxt,
-					   bool skipValidation,
-					   bool isAddConstraint);
-static void applyColumnNames(List *dst, List *src);
 static bool isSetopLeaf(SelectStmt *stmt);
 static int collectSetopTypes(ParseState *pstate, SelectStmt *stmt,
 							 List **types, List **typmods);
-static void getSetColTypes(ParseState *pstate, Node *node,
-			   List **colTypes, List **colTypmods);
 static void transformLockingClause(Query *qry, LockingClause *lc);
 static bool check_parameter_resolution_walker(Node *node, ParseState *pstate);
-static void transformConstraintAttrs(List *constraintList);
-static void transformColumnType(ParseState *pstate, ColumnDef *column);
-static void release_pstate_resources(ParseState *pstate);
-static FromExpr *makeFromExpr(List *fromlist, Node *quals);
 
 static void setQryDistributionPolicy(SelectStmt *stmt, Query *qry);
-static List *getLikeDistributionPolicy(InhRelation *e);
 
 static Query *transformGroupedWindows(Query *qry);
 static void init_grouped_window_context(grouped_window_ctx *ctx, Query *qry);
@@ -197,10 +137,6 @@ static Alias *make_replacement_alias(Query *qry, const char *aname);
 static char *generate_positional_name(AttrNumber attrno);
 static List*generate_alternate_vars(Var *var, grouped_window_ctx *ctx);
 
-static List *fillin_encoding(List *list);
-
-static List *transformAttributeEncoding(List *stenc, CreateStmt *stmt,
-										CreateStmtContext *cxt);
 /*
  * parse_analyze
  *		Analyze a raw parse tree and transform it to Query form.
@@ -211,28 +147,27 @@ static List *transformAttributeEncoding(List *stenc, CreateStmt *stmt,
  * Optionally, information about $n parameter types can be supplied.
  * References to $n indexes not defined by paramTypes[] are disallowed.
  *
- * The result is a List of Query nodes (we need a list since some commands
- * produce multiple Queries).  Optimizable statements require considerable
- * transformation, while many utility-type statements are simply hung off
+ * The result is a Query node.	Optimizable statements require considerable
+ * transformation, while utility-type statements are simply hung off
  * a dummy CMD_UTILITY Query node.
  */
-List *
+Query *
 parse_analyze(Node *parseTree, const char *sourceText,
 			  Oid *paramTypes, int numParams)
 {
 	ParseState *pstate = make_parsestate(NULL);
-	List	   *result;
+	Query	   *query;
 
 	pstate->p_sourcetext = sourceText;
 	pstate->p_paramtypes = paramTypes;
 	pstate->p_numparams = numParams;
 	pstate->p_variableparams = false;
 
-	result = do_parse_analyze(parseTree, pstate);
+	query = transformStmt(pstate, parseTree);
 
 	free_parsestate(pstate);
 
-	return result;
+	return query;
 }
 
 /*
@@ -242,123 +177,41 @@ parse_analyze(Node *parseTree, const char *sourceText,
  * symbol datatypes from context.  The passed-in paramTypes[] array can
  * be modified or enlarged (via repalloc).
  */
-List *
+Query *
 parse_analyze_varparams(Node *parseTree, const char *sourceText,
 						Oid **paramTypes, int *numParams)
 {
 	ParseState *pstate = make_parsestate(NULL);
-	List	   *result;
+	Query	   *query;
 
 	pstate->p_sourcetext = sourceText;
 	pstate->p_paramtypes = *paramTypes;
 	pstate->p_numparams = *numParams;
 	pstate->p_variableparams = true;
 
-	result = do_parse_analyze(parseTree, pstate);
+	query = transformStmt(pstate, parseTree);
 
 	/* make sure all is well with parameter types */
 	if (pstate->p_numparams > 0)
-		check_parameter_resolution_walker((Node *) result, pstate);
+		check_parameter_resolution_walker((Node *) query, pstate);
 
 	*paramTypes = pstate->p_paramtypes;
 	*numParams = pstate->p_numparams;
 
 	free_parsestate(pstate);
 
-	return result;
+	return query;
 }
 
 /*
  * parse_sub_analyze
  *		Entry point for recursively analyzing a sub-statement.
  */
-List *
+Query *
 parse_sub_analyze(Node *parseTree, ParseState *parentParseState)
 {
 	ParseState *pstate = make_parsestate(parentParseState);
-	List	   *result;
-
-	result = do_parse_analyze(parseTree, pstate);
-
-	free_parsestate(pstate);
-
-	return result;
-}
-
-static int
-alter_cmp(const void *a, const void *b)
-{
-	Query *qa = *(Query **)a;
-	Query *qb = *(Query **)b;
-	AlterTableStmt *stmta = (AlterTableStmt *)qa->utilityStmt;
-	AlterTableStmt *stmtb = (AlterTableStmt *)qb->utilityStmt;
-	PartitionBy *pbya = NULL;
-	PartitionBy *pbyb = NULL;
-	int len1, len2;
-	ListCell *lc;
-
-	Assert(IsA(stmta, AlterTableStmt));
-	Assert(IsA(stmtb, AlterTableStmt));
-
-	foreach(lc, stmta->cmds)
-	{
-		AlterTableCmd *cmd = lfirst(lc);
-
-		if (cmd->subtype == AT_PartAddInternal)
-		{
-			pbya = (PartitionBy *)cmd->def;
-			break;
-		}
-	}
-
-	foreach(lc, stmtb->cmds)
-	{
-		AlterTableCmd *cmd = lfirst(lc);
-
-		if (cmd->subtype == AT_PartAddInternal)
-		{
-			pbyb = (PartitionBy *)cmd->def;
-			break;
-		}
-	}
-
-	if (pbya && pbyb)
-	{
-		if (pbya->partDepth < pbyb->partDepth)
-			return -1;
-		else if (pbya->partDepth > pbyb->partDepth)
-			return 1;
-		else
-			return 0;
-	}
-
-	len1 = strlen(stmta->relation->relname);
-	len2 = strlen(stmtb->relation->relname);
-
-	if (len1 < len2)
-		return -1;
-	else if (len1 > len2)
-		return 1;
-	else
-		/* same size */
-		return strcmp(stmta->relation->relname, stmtb->relation->relname);
-}
-
-/*
- * do_parse_analyze
- *		Workhorse code shared by the above variants of parse_analyze.
- */
-static List *
-do_parse_analyze(Node *parseTree, ParseState *pstate)
-{
-	List	   *result = NIL;
-
-	/* Lists to return extra commands from transformation */
-	List	   *extras_before = NIL;
-	List	   *extras_after = NIL;
-	List	   *tmp = NIL;
 	Query	   *query;
-	ListCell   *l;
 
    	ErrorContextCallback errcontext;
 
@@ -368,119 +221,14 @@ do_parse_analyze(Node *parseTree, ParseState *pstate)
 	errcontext.previous = error_context_stack;
 	error_context_stack = &errcontext;
 
-	query = transformStmt(pstate, parseTree, &extras_before, &extras_after);
+	query = transformStmt(pstate, parseTree);
 
 	/* CDB: Pop error context callback stack. */
 	error_context_stack = errcontext.previous;
 
-	/* don't need to access result relation any more */
-	release_pstate_resources(pstate);
-
-	foreach(l, extras_before)
-		result = list_concat(result, parse_sub_analyze(lfirst(l), pstate));
-
-	result = lappend(result, query);
-
-	foreach(l, extras_after)
- 		tmp = list_concat(tmp, parse_sub_analyze(lfirst(l), pstate));
-
-	/*
-	 * If this is the top level query and it is a CreateStmt and it
-	 * has a partition by clause, reorder the expanded extras_after so
-	 * that AlterTable is able to build the partitioning hierarchy
-	 * better. The problem with the existing list is that for
-	 * subpartitioned tables, the subpartitions will be added to the
-	 * hierarchy before the root, which means we cannot get the parent
-	 * oid of rules.
-	 *
-	 * nefarious: special KeepMe case in cdbpartition.c:atpxPart_validate_spec
-	 */
-	if (pstate->parentParseState == NULL && query->utilityStmt &&
-		IsA(query->utilityStmt, CreateStmt) &&
-		((CreateStmt *)query->utilityStmt)->partitionBy)
-	{
-		/*
-		 * We just break the statements into two lists: alter statements and
-		 * other statements.
-		 */
-		List *alters = NIL;
-		List *others = NIL;
-		Query **stmts;
-		int i = 0;
-		int j;
-
-		foreach(l, tmp)
-		{
-			Query *q = lfirst(l);
-
-			Assert(IsA(q, Query));
-
-			if (IsA(q->utilityStmt, AlterTableStmt))
-				alters = lappend(alters, q);
-			else
-				others = lappend(others, q);
-		}
-
-		Assert(list_length(alters));
-
-		/*
-		 * Now, sort the ALTER statements so that the deeper partition members
-		 * are processed last.
-		 */
-		stmts = palloc(list_length(alters) * sizeof(Query *));
-		foreach(l, alters)
-			stmts[i++] = (Query *)lfirst(l);
-
-		qsort(stmts, i, sizeof(void *), alter_cmp);
-
-		list_free(alters);
-		alters = NIL;
-		for (j = 0; j < i; j++)
-		{
-			AlterTableStmt *n;
-			alters = lappend(alters, stmts[j]);
-
-			n = (AlterTableStmt *)((Query *)stmts[j])->utilityStmt;
-		}
-		result = list_concat(result, others);
-		result = list_concat(result, alters);
-
-	}
-	else
-		result = list_concat(result, tmp);
-
-	/*
-	 * Make sure that only the original query is marked original. We have to
-	 * do this explicitly since recursive calls of do_parse_analyze will have
-	 * marked some of the added-on queries as "original".  Also mark only the
-	 * original query as allowed to set the command-result tag.
-	 */
-	foreach(l, result)
-	{
-		Query	   *q = lfirst(l);
-
-		if (q == query)
-		{
-			q->querySource = QSRC_ORIGINAL;
-			q->canSetTag = true;
-		}
-		else
-		{
-			q->querySource = QSRC_PARSER;
-			q->canSetTag = false;
-		}
-	}
-
-	return result;
-}
+	free_parsestate(pstate);
 
-static void
-release_pstate_resources(ParseState *pstate)
-{
-	if (pstate->p_target_relation != NULL)
-		heap_close(pstate->p_target_relation, NoLock);
-	pstate->p_target_relation = NULL;
-	pstate->p_target_rangetblentry = NULL;
+	return query;
 }
 
 
@@ -513,87 +261,18 @@ parse_analyze_error_callback(void *parsestate)
  * transformStmt -
  *	  transform a Parse tree into a Query tree.
  */
-static Query *
-transformStmt(ParseState *pstate, Node *parseTree,
-			  List **extras_before, List **extras_after)
+Query *
+transformStmt(ParseState *pstate, Node *parseTree)
 {
-	Query	   *result = NULL;
+	Query	   *result;
 
 	switch (nodeTag(parseTree))
 	{
-			/*
-			 * Non-optimizable statements
-			 */
-		case T_CreateStmt:
-			result = transformCreateStmt(pstate, (CreateStmt *) parseTree,
-										 extras_before, extras_after);
-			break;
-
-		case T_CreateExternalStmt:
-			result = transformCreateExternalStmt(pstate, (CreateExternalStmt *) parseTree,
-												 extras_before, extras_after);
-			break;
-
-		case T_IndexStmt:
-			result = transformIndexStmt(pstate, (IndexStmt *) parseTree,
-										extras_before, extras_after);
-			break;
-
-		case T_RuleStmt:
-			result = transformRuleStmt(pstate, (RuleStmt *) parseTree,
-									   extras_before, extras_after);
-			break;
-
-		case T_ViewStmt:
-			result = transformViewStmt(pstate, (ViewStmt *) parseTree,
-									   extras_before, extras_after);
-			break;
-
-		case T_ExplainStmt:
-			{
-				ExplainStmt *n = (ExplainStmt *) parseTree;
-
-				result = makeNode(Query);
-				result->commandType = CMD_UTILITY;
-				n->query = transformStmt(pstate, (Node *) n->query,
-										 extras_before, extras_after);
-				result->utilityStmt = (Node *) parseTree;
-			}
-			break;
-
-		case T_CopyStmt:
-			{
-				CopyStmt   *n = (CopyStmt *) parseTree;
-
-				result = makeNode(Query);
-				result->commandType = CMD_UTILITY;
-				if (n->query)
-					n->query = transformStmt(pstate, (Node *) n->query,
-											 extras_before, extras_after);
-				result->utilityStmt = (Node *) parseTree;
-			}
-			break;
-
-		case T_AlterTableStmt:
-			result = transformAlterTableStmt(pstate,
-											 (AlterTableStmt *) parseTree,
-											 extras_before, extras_after);
-			break;
-
-		case T_PrepareStmt:
-			result = transformPrepareStmt(pstate, (PrepareStmt *) parseTree);
-			break;
-
-		case T_ExecuteStmt:
-			result = transformExecuteStmt(pstate, (ExecuteStmt *) parseTree);
-			break;
-
 			/*
 			 * Optimizable statements
 			 */
 		case T_InsertStmt:
-			result = transformInsertStmt(pstate, (InsertStmt *) parseTree,
-										 extras_before, extras_after);
+			result = transformInsertStmt(pstate, (InsertStmt *) parseTree);
 			break;
 
 		case T_DeleteStmt:
@@ -617,11 +296,19 @@ transformStmt(ParseState *pstate, Node *parseTree,
 			}
 			break;
 
+			/*
+			 * Special cases
+			 */
 		case T_DeclareCursorStmt:
 			result = transformDeclareCursorStmt(pstate,
 											(DeclareCursorStmt *) parseTree);
 			break;
 
+		case T_ExplainStmt:
+			result = transformExplainStmt(pstate,
+										  (ExplainStmt *) parseTree);
+			break;
+
 		default:
 
 			/*
@@ -638,16 +325,8 @@ transformStmt(ParseState *pstate, Node *parseTree,
 	result->querySource = QSRC_ORIGINAL;
 	result->canSetTag = true;
 
-	/*
-	 * Check that we did not produce too many resnos; at the very least we
-	 * cannot allow more than 2^16, since that would exceed the range of a
-	 * AttrNumber. It seems safest to use MaxTupleAttributeNumber.
-	 */
-	if (pstate->p_next_resno - 1 > MaxTupleAttributeNumber)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("target lists can have at most %d entries",
-						MaxTupleAttributeNumber)));
+	if (pstate->p_hasDynamicFunction)
+		result->hasDynamicFunctions = true;
 
 	return result;
 }
@@ -702,62 +381,6 @@ analyze_requires_snapshot(Node *parseTree)
 	return result;
 }
 
-static Query *
-transformViewStmt(ParseState *pstate, ViewStmt *stmt,
-				  List **extras_before, List **extras_after)
-{
-	Query	   *result = makeNode(Query);
-
-	result->commandType = CMD_UTILITY;
-	result->utilityStmt = (Node *) stmt;
-
-	stmt->query = transformStmt(pstate, (Node *) stmt->query,
-								extras_before, extras_after);
-
-	if (pstate->p_hasDynamicFunction)
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_INDETERMINATE_DATATYPE),
-				 errmsg("CREATE VIEW statements cannot include calls to "
-						"dynamically typed function")));
-	}
-
-	/*
-	 * If a list of column names was given, run through and insert these into
-	 * the actual query tree. - thomas 2000-03-08
-	 *
-	 * Outer loop is over targetlist to make it easier to skip junk targetlist
-	 * entries.
-	 */
-	if (stmt->aliases != NIL)
-	{
-		ListCell   *alist_item = list_head(stmt->aliases);
-		ListCell   *targetList;
-
-		foreach(targetList, stmt->query->targetList)
-		{
-			TargetEntry *te = (TargetEntry *) lfirst(targetList);
-
-			Assert(IsA(te, TargetEntry));
-			/* junk columns don't get aliases */
-			if (te->resjunk)
-				continue;
-			te->resname = pstrdup(strVal(lfirst(alist_item)));
-			alist_item = lnext(alist_item);
-			if (alist_item == NULL)
-				break;			/* done assigning aliases */
-		}
-
-		if (alist_item != NULL)
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("CREATE VIEW specifies more column "
-							"names than columns")));
-	}
-
-	return result;
-}
-
 /*
  * transformDeleteStmt -
  *	  transforms a Delete Statement
@@ -824,8 +447,7 @@ transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt)
  *	  transform an Insert Statement
  */
 static Query *
-transformInsertStmt(ParseState *pstate, InsertStmt *stmt,
-					List **extras_before, List **extras_after)
+transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 {
 	Query	   *qry = makeNode(Query);
 	SelectStmt *selectStmt = (SelectStmt *) stmt->selectStmt;
@@ -849,8 +471,16 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt,
 	 * We have three cases to deal with: DEFAULT VALUES (selectStmt == NULL),
 	 * VALUES list, or general SELECT input.  We special-case VALUES, both for
 	 * efficiency and so we can handle DEFAULT specifications.
+	 *
+	 * The grammar allows attaching ORDER BY, LIMIT, or FOR UPDATE to a
+	 * VALUES clause.  If we have any of those, treat it as a general SELECT;
+	 * so it will work, but you can't use DEFAULT items together with those.
 	 */
-	isGeneralSelect = (selectStmt && selectStmt->valuesLists == NIL);
+	isGeneralSelect = (selectStmt && (selectStmt->valuesLists == NIL ||
+									  selectStmt->sortClause != NIL ||
+									  selectStmt->limitOffset != NULL ||
+									  selectStmt->limitCount != NULL ||
+									  selectStmt->lockingClause != NIL));
 
 	/*
 	 * If a non-nil rangetable/namespace was passed in, and we are doing
@@ -926,18 +556,14 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt,
 		sub_pstate->p_relnamespace = sub_relnamespace;
 		sub_pstate->p_varnamespace = sub_varnamespace;
 
-		/*
-		 * Note: we are not expecting that extras_before and extras_after are
-		 * going to be used by the transformation of the SELECT statement.
-		 */
-		selectQuery = transformStmt(sub_pstate, stmt->selectStmt,
-									extras_before, extras_after);
+		selectQuery = transformStmt(sub_pstate, stmt->selectStmt);
 
-		release_pstate_resources(sub_pstate);
 		free_parsestate(sub_pstate);
 
+		/* The grammar should have produced a SELECT, but it might have INTO */
 		Assert(IsA(selectQuery, Query));
 		Assert(selectQuery->commandType == CMD_SELECT);
+		Assert(selectQuery->utilityStmt == NULL);
 		if (selectQuery->intoClause)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
@@ -1231,2546 +857,67 @@ transformInsertRow(ParseState *pstate, List *exprlist,
 }
 
 /*
- * Tells the caller if CO is explicitly disabled, to handle cases where we
- * want to ignore encoding clauses in partition expansion.
+ * If an input query (Q) mixes window functions with aggregate
+ * functions or grouping, then (per SQL:2003) we need to divide
+ * it into an outer query, Q', that contains no aggregate calls
+ * or grouping and an inner query, Q'', that contains no window
+ * calls.
+ *
+ * Q' will have a 1-entry range table whose entry corresponds to
+ * the results of Q''.
+ *
+ * Q'' will have the same range as Q and will be pushed down into
+ * a subquery range table entry in Q'.
+ *
+ * As a result, the depth of outer references in Q'' and below
+ * will increase, so we need to adjust non-zero xxxlevelsup fields
+ * (Var, Aggref, and WindowRef nodes) in Q'' and below.  At the end,
+ * there will be no levelsup items referring to Q'.  Prior references
+ * to Q will now refer to Q''; prior references to blocks above Q will
+ * refer to the same blocks above Q'.)
  *
- * This is an ugly special case that backup expects to work and since we've got
- * tonnes of dumps out there and the possibility that users have learned this
- * grammar from them, we must continue to support it.
+ * We do all this by creating a new Query node, subq, for Q''.  We
+ * modify the input Query node, qry, in place for Q'.  (Since qry is
+ * also the input, Q, be careful not to destroy values before we're
+ * done with them.
  */
-static bool
-co_explicitly_disabled(List *opts)
+static Query *
+transformGroupedWindows(Query *qry)
 {
-	ListCell *lc;
-
-	foreach(lc, opts)
-	{
-		DefElem *el = lfirst(lc);
-		char *arg = NULL;
+	Query *subq;
+	RangeTblEntry *rte;
+	RangeTblRef *ref;
+	Alias *alias;
+	bool hadSubLinks = qry->hasSubLinks;
 
-		/* Arguement will be a Value */
-		if (!el->arg)
-		{
-			continue;
-		}
+	grouped_window_ctx ctx;
 
-		arg = defGetString(el);
-		bool result = false;
-		if (pg_strcasecmp("appendonly", el->defname) == 0 &&
-			pg_strcasecmp("false", arg) == 0)
-		{
-			result = true;
-		}
-		else if (pg_strcasecmp("orientation", el->defname) == 0 &&
-				 pg_strcasecmp("column", arg) != 0)
-		{
-			result = true;
-		}
+	Assert(qry->commandType == CMD_SELECT);
+	Assert(!PointerIsValid(qry->utilityStmt));
+	Assert(qry->returningList == NIL);
 
-		if (result)
-		{
-			return true;
-		}
-	}
-	return false;
-}
+	if ( !qry->hasWindFuncs || !(qry->groupClause || qry->hasAggs) )
+		return qry;
 
-/*
- * Tell the caller whether appendonly=true and orientation=column
- * have been specified.
- */
-bool
-is_aocs(List *opts)
-{
-	bool found_ao = false;
-	bool found_cs = false;
-	bool aovalue = false;
-	bool csvalue = false;
+	/* Make the new subquery (Q'').  Note that (per SQL:2003) there
+	 * can't be any window functions called in the WHERE, GROUP BY,
+	 * or HAVING clauses.
+	 */
+	subq = makeNode(Query);
+	subq->commandType = CMD_SELECT;
+	subq->querySource = QSRC_PARSER;
+	subq->canSetTag = true;
+	subq->utilityStmt = NULL;
+	subq->resultRelation = 0;
+	subq->intoClause = NULL;
+	subq->hasAggs = qry->hasAggs;
+	subq->hasWindFuncs = false; /* reevaluate later */
+	subq->hasSubLinks = qry->hasSubLinks; /* reevaluate later */
 
-	ListCell *lc;
-
-	foreach(lc, opts)
-	{
-		DefElem *el = lfirst(lc);
-		char *arg = NULL;
-
-		/* Arguement will be a Value */
-		if (!el->arg)
-		{
-			continue;
-		}
-
-		arg = defGetString(el);
-
-		if (pg_strcasecmp("appendonly", el->defname) == 0)
-		{
-			found_ao = true;
-			if (!parse_bool(arg, &aovalue))
-				elog(ERROR, "invalid value for option \"appendonly\"");
-		}
-		else if (pg_strcasecmp("orientation", el->defname) == 0)
-		{
-			found_cs = true;
-			csvalue = pg_strcasecmp("column", arg) == 0;
-		}
-	}
-	if (!found_ao)
-		aovalue = isDefaultAO();
-	if (!found_cs)
-		csvalue = isDefaultAOCS();
-	return (aovalue && csvalue);
-}
-
-/*
- * See if two encodings attempt to see the same parameters. If test_conflicts is
- * true, allow setting the same value, but the setting must be identical.
- */
-static bool
-encodings_overlap(List *a, List *b, bool test_conflicts)
-{
-	ListCell *lca;
-
-	foreach(lca, a)
-	{
-		ListCell *lcb;
-		DefElem *ela = lfirst(lca);
-
-		foreach(lcb, b)
-		{
-			DefElem *elb = lfirst(lcb);
-
-			if (pg_strcasecmp(ela->defname, elb->defname) == 0)
-			{
-				if (test_conflicts)
-				{
-					if (!ela->arg && !elb->arg)
-						return true;
-					else if (!ela->arg || !elb->arg)
-					{
-						/* skip */
-					}
-					else
-					{
-						char *ela_str = defGetString(ela);
-						char *elb_str = defGetString(elb);
-
-						if (pg_strcasecmp(ela_str, elb_str) != 0)
-							return true;
-					}
-				}
-				else
-					return true;
-			}
-		}
-	}
-	return false;
-}
-
-/*
- * Transform and validate the actual encoding clauses.
- *
- * We need tell the underlying system that these are AO/CO tables too,
- * hence the concatenation of the extra elements.
- */
-List *
-transformStorageEncodingClause(List *options)
-{
-	Datum d;
-	ListCell *lc;
-	DefElem *dl;
-	foreach(lc, options)
-	{
-		dl = (DefElem *) lfirst(lc);
-		if (pg_strncasecmp(dl->defname, SOPT_CHECKSUM, strlen(SOPT_CHECKSUM))
-			== 0)
-		{
-			elog(ERROR, "\"%s\" is not a column specific option.",
-				 SOPT_CHECKSUM);
-		}
-	}
-	List *extra = list_make2(makeDefElem("appendonly",
-										 (Node *)makeString("true")),
-							 makeDefElem("orientation",
-										 (Node *)makeString("column")));
-
-	/* add defaults for missing values */
-	options = fillin_encoding(options);
-
-	/*
-	 * The following two statements validate that the encoding clause is well
-	 * formed.
-	 */
-	d = transformRelOptions(PointerGetDatum(NULL),
-									  list_concat(extra, options),
-									  true, false);
-	(void)heap_reloptions(RELKIND_RELATION, d, true);
-
-	return options;
-}
-
-/*
- * Validate the sanity of column reference storage clauses.
- *
- * 1. Ensure that we only refer to columns that exist.
- * 2. Ensure that each column is referenced either zero times or once.
- */
-static void
-validateColumnStorageEncodingClauses(List *stenc, CreateStmt *stmt)
-{
-	ListCell *lc;
-	struct HTAB *ht = NULL;
-	struct colent {
-		char colname[NAMEDATALEN];
-		int count;
-	} *ce = NULL;
-
-	if (!stenc)
-		return;
-
-	/* Generate a hash table for all the columns */
-	foreach(lc, stmt->tableElts)
-	{
-		Node *n = lfirst(lc);
-
-		if (IsA(n, ColumnDef))
-		{
-			ColumnDef *c = (ColumnDef *)n;
-			char *colname;
-			bool found = false;
-			size_t n = NAMEDATALEN - 1 < strlen(c->colname) ?
-							NAMEDATALEN - 1 : strlen(c->colname);
-
-			colname = palloc0(NAMEDATALEN);
-			MemSet(colname, 0, NAMEDATALEN);
-			memcpy(colname, c->colname, n);
-			colname[n] = '\0';
-
-			if (!ht)
-			{
-				HASHCTL  cacheInfo;
-				int      cacheFlags;
-
-				memset(&cacheInfo, 0, sizeof(cacheInfo));
-				cacheInfo.keysize = NAMEDATALEN;
-				cacheInfo.entrysize = sizeof(*ce);
-				cacheFlags = HASH_ELEM;
-
-				ht = hash_create("column info cache",
-								 list_length(stmt->tableElts),
-								 &cacheInfo, cacheFlags);
-			}
-
-			ce = hash_search(ht, colname, HASH_ENTER, &found);
-
-			/*
-			 * The user specified a duplicate column name. We check duplicate
-			 * column names VERY late (under MergeAttributes(), which is called
-			 * by DefineRelation(). For the specific case here, it is safe to
-			 * call out that this is a duplicate. We don't need to delay until
-			 * we look at inheritance.
-			 */
-			if (found)
-			{
-				ereport(ERROR,
-						(errcode(ERRCODE_DUPLICATE_COLUMN),
-						 errmsg("column \"%s\" duplicated",
-								colname)));
-				
-			}
-			ce->count = 0;
-		}
-	}
-
-	/*
-	 * If the table has no columns -- usually in the partitioning case -- then
-	 * we can short circuit.
-	 */
-	if (!ht)
-		return;
-
-	/*
-	 * All column reference storage directives without the DEFAULT
-	 * clause should refer to real columns.
-	 */
-	foreach(lc, stenc)
-	{
-		ColumnReferenceStorageDirective *c = lfirst(lc);
-
-		Insist(IsA(c, ColumnReferenceStorageDirective));
-
-		if (c->deflt)
-			continue;
-		else
-		{
-			bool found = false;
-			char colname[NAMEDATALEN];
-			size_t collen = strlen(c->column);
-			size_t n = NAMEDATALEN - 1 < collen ? NAMEDATALEN - 1 : collen;
-			MemSet(colname, 0, NAMEDATALEN);
-			memcpy(colname, c->column, n);
-			colname[n] = '\0';
-
-			ce = hash_search(ht, colname, HASH_FIND, &found);
-
-			if (!found)
-				elog(ERROR, "column \"%s\" does not exist", colname);
-
-			ce->count++;
-
-			if (ce->count > 1)
-				elog(ERROR, "column \"%s\" referenced in more than one "
-					 "COLUMN ENCODING clause", colname);
-
-		}
-	}
-
-	hash_destroy(ht);
-}
-
-/*
- * Find the column reference storage encoding clause for `column'.
- *
- * This is called by transformAttributeEncoding() in a loop but stenc should be
- * quite small in practice.
- */
-static ColumnReferenceStorageDirective *
-find_crsd(char *column, List *stenc)
-{
-	ListCell *lc;
-
-	foreach(lc, stenc)
-	{
-		ColumnReferenceStorageDirective *c = lfirst(lc);
-
-		if (c->deflt == false && strcmp(column, c->column) == 0)
-			return c;
-	}
-	return NULL;
-}
-
-List *
-TypeNameGetStorageDirective(TypeName *typname)
-{
-	HeapTuple tuple;
-	cqContext  *pcqCtx;
-	Oid typid = typenameTypeId(NULL, typname);
-	List *out = NIL;
-
-	/* XXX XXX: SELECT typoptions */
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_type_encoding "
-				" WHERE typid = :1 ",
-				ObjectIdGetDatum(typid)));
-
-	tuple = caql_getnext(pcqCtx);
-
-	if (HeapTupleIsValid(tuple))
-	{
-		Datum options;
-		bool isnull;
-
-		options = caql_getattr(pcqCtx, 
-							   Anum_pg_type_encoding_typoptions,
-							   &isnull);
-
-		Insist(!isnull);
-
-		out = untransformRelOptions(options);
-	}
-
-	caql_endscan(pcqCtx);
-	return out;
-}
-
-/*
- * Make a default column storage directive from a WITH clause
- * Ignore options in the WITH clause that don't appear in 
- * storage_directives for column-level compression.
- */
-List *
-form_default_storage_directive(List *enc)
-{
-	List *out = NIL;
-	ListCell *lc;
-
-	foreach(lc, enc)
-	{
-		DefElem *el = lfirst(lc);
-
-		if (!el->defname)
-			out = lappend(out, copyObject(el));
-
-		if (pg_strcasecmp("appendonly", el->defname) == 0)
-			continue;
-		if (pg_strcasecmp("orientation", el->defname) == 0)
-			continue;
-		if (pg_strcasecmp("oids", el->defname) == 0)
-			continue;
-		if (pg_strcasecmp("fillfactor", el->defname) == 0)
-			continue;
-		if (pg_strcasecmp("tablename", el->defname) == 0)
-			continue;
-		/* checksum is not a column specific attribute. */
-		if (pg_strcasecmp("checksum", el->defname) == 0)
-			continue;
-		out = lappend(out, copyObject(el));
-	}
-	return out;
-}
-
-static List *
-transformAttributeEncoding(List *stenc, CreateStmt *stmt, CreateStmtContext *cxt)
-{
-	ListCell *lc;
-	bool found_enc = stenc != NIL;
-	bool can_enc = is_aocs(stmt->options);
-	ColumnReferenceStorageDirective *deflt = NULL;
-	List *newenc = NIL;
-	List *tmpenc;
-	MemoryContext oldCtx;
-
-#define UNSUPPORTED_ORIENTATION_ERROR() \
-	ereport(ERROR, \
-			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
-			 errmsg("ENCODING clause only supported with column oriented tables")))
-
-	/* We only support the attribute encoding clause on AOCS tables */
-	if (stenc && !can_enc)
-		UNSUPPORTED_ORIENTATION_ERROR();
-
-	/* Use the temporary context to avoid leaving behind so much garbage. */
-	oldCtx = MemoryContextSwitchTo(cxt->tempCtx);
-
-	/* get the default clause, if there is one. */
-	foreach(lc, stenc)
-	{
-		ColumnReferenceStorageDirective *c = lfirst(lc);
-		Insist(IsA(c, ColumnReferenceStorageDirective));
-
-		if (c->deflt)
-		{
-			/*
-			 * Some quick validation: there should only be one default
-			 * clause
-			 */
-			if (deflt)
-				elog(ERROR, "only one default column encoding may be specified");
-
-			deflt = copyObject(c);
-			deflt->encoding = transformStorageEncodingClause(deflt->encoding);
-
-			/*
-			 * The default encoding and the with clause better not
-			 * try and set the same options!
-			 */
-			if (encodings_overlap(stmt->options, deflt->encoding, false))
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-						 errmsg("DEFAULT COLUMN ENCODING clause cannot "
-								"override values set in WITH clause")));
-		}
-	}
-
-	/*
-	 * If no default has been specified, we might create one out of the
-	 * WITH clause.
-	 */
-	tmpenc = form_default_storage_directive(stmt->options);
-
-	if (tmpenc)
-	{
-		deflt = makeNode(ColumnReferenceStorageDirective);
-		deflt->deflt = true;
-		deflt->encoding = transformStorageEncodingClause(tmpenc);
-	}
-
-	/*
-	 * Loop over all columns. If a column has a column reference storage clause
-	 * -- i.e., COLUMN name ENCODING () -- apply that. Otherwise, apply the
-	 * default.
-	 */
-	foreach(lc, cxt->columns)
-	{
-		ColumnDef *d = (ColumnDef *) lfirst(lc);
-		ColumnReferenceStorageDirective *c;
-
-		Insist(IsA(d, ColumnDef));
-
-		c = makeNode(ColumnReferenceStorageDirective);
-		c->column = pstrdup(d->colname);
-
-		/*
-		 * Find a storage encoding for this column, in this order:
-		 *
-		 * 1. An explicit encoding clause in the ColumnDef
-		 * 2. A column reference storage directive for this column
-		 * 3. A default column encoding in the statement
-		 * 4. A default for the type.
-		 */
-		if (d->encoding)
-		{
-			found_enc = true;
-			c->encoding = transformStorageEncodingClause(d->encoding);
-		}
-		else
-		{
-			ColumnReferenceStorageDirective *s = find_crsd(c->column, stenc);
-
-			if (s)
-				c->encoding = transformStorageEncodingClause(s->encoding);
-			else
-			{
-				if (deflt)
-					c->encoding = copyObject(deflt->encoding);
-				else
-				{
-					List *te = TypeNameGetStorageDirective(d->typname);
-
-					if (te)
-						c->encoding = copyObject(te);
-					else
-						c->encoding = default_column_encoding_clause();
-				}
-			}
-		}
-		newenc = lappend(newenc, c);
-	}
-
-	/* Check again incase we expanded a some column encoding clauses */
-	if (!can_enc)
-	{
-		if (found_enc)
-			UNSUPPORTED_ORIENTATION_ERROR();
-		else
-			newenc = NULL;
-	}
-
-	validateColumnStorageEncodingClauses(newenc, stmt);
-
-	/* copy the result out of the temporary memory context */
-	MemoryContextSwitchTo(oldCtx);
-	newenc = copyObject(newenc);
-
-	return newenc;
-}
-
-/*
- * transformCreateStmt -
- *	  transforms the "create table" statement
- *	  SQL92 allows constraints to be scattered all over, so thumb through
- *	   the columns and collect all constraints into one place.
- *	  If there are any implied indices (e.g. UNIQUE or PRIMARY KEY)
- *	   then expand those into multiple IndexStmt blocks.
- *	  - thomas 1997-12-02
- */
-Query *
-transformCreateStmt(ParseState *pstate, CreateStmt *stmt,
-					List **extras_before, List **extras_after)
-{
-	CreateStmtContext cxt;
-	Query	   *q;
-	ListCell   *elements;
-	List  	   *likeDistributedBy = NIL;
-	bool	    bQuiet = false;	/* shut up transformDistributedBy messages */
-	List	   *stenc = NIL; /* column reference storage encoding clauses */
-
-	/*
-	 * We don't normally care much about the memory consumption of parsing,
-	 * because any memory leaked is leaked into MessageContext which is
-	 * reset between each command. But if a table is heavily partitioned,
-	 * the CREATE TABLE statement can be expanded into hundreds or even
-	 * thousands of CreateStmts, so the leaks start to add up. To reduce
-	 * the memory consumption, we use a temporary memory context that's
-	 * destroyed after processing the CreateStmt for some parts of the
-	 * processing.
-	 */
-	cxt.tempCtx =
-		AllocSetContextCreate(CurrentMemoryContext,
-							  "CreateStmt analyze context",
-							  ALLOCSET_DEFAULT_MINSIZE,
-							  ALLOCSET_DEFAULT_INITSIZE,
-							  ALLOCSET_DEFAULT_MAXSIZE);
-
-	cxt.stmtType = "CREATE TABLE";
-	cxt.relation = stmt->relation;
-	cxt.inhRelations = stmt->inhRelations;
-	cxt.isalter = false;
-	cxt.isaddpart = stmt->is_add_part;
-	cxt.columns = NIL;
-	cxt.ckconstraints = NIL;
-	cxt.fkconstraints = NIL;
-	cxt.ixconstraints = NIL;
-	cxt.inh_indexes = NIL;
-	cxt.blist = NIL;
-	cxt.alist = NIL;
-	cxt.dlist = NIL; /* for deferred analysis requiring the created table */
-	cxt.pkey = NULL;
-	cxt.hasoids = interpretOidsOption(stmt->options);
-
-	stmt->policy = NULL;
-
-	/* Disallow inheritance in combination with partitioning. */
-	if (stmt->inhRelations && (stmt->partitionBy || stmt->is_part_child ))
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("cannot mix inheritance with partitioning")));
-	}
-
-	/* Disallow inheritance for CO table */
-	if (stmt->inhRelations && is_aocs(stmt->options))
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("INHERITS clause cannot be used with column oriented tables")));
-	}
-
-	/* Only on top-most partitioned tables. */
-	if ( stmt->partitionBy && !stmt->is_part_child )
-	{
-		fixCreateStmtForPartitionedTable(stmt);
-	}
-
-	/*
-	 * Run through each primary element in the table creation clause. Separate
-	 * column defs from constraints, and do preliminary analysis.
-	 */
-	foreach(elements, stmt->tableElts)
-	{
-		Node	   *element = lfirst(elements);
-
-		switch (nodeTag(element))
-		{
-			case T_ColumnDef:
-				transformColumnDefinition(pstate, &cxt,
-										  (ColumnDef *) element);
-				break;
-
-			case T_Constraint:
-				transformTableConstraint(pstate, &cxt,
-										 (Constraint *) element);
-				break;
-
-			case T_FkConstraint:
-				/* No pre-transformation needed */
-				cxt.fkconstraints = lappend(cxt.fkconstraints, element);
-				break;
-
-			case T_InhRelation:
-				{
-					bool		isBeginning = (cxt.columns == NIL);
-
-					transformInhRelation(pstate, &cxt,
-										 (InhRelation *) element, false);
-
-					if (Gp_role == GP_ROLE_DISPATCH && isBeginning &&
-						stmt->distributedBy == NIL &&
-						stmt->inhRelations == NIL &&
-						stmt->policy == NULL)
-					{
-						likeDistributedBy = getLikeDistributionPolicy((InhRelation *) element);
-					}
-				}
-				break;
-
-			case T_ColumnReferenceStorageDirective:
-				/* processed below in transformAttributeEncoding() */
-				stenc = lappend(stenc, element);
-				break;
-
-			default:
-				elog(ERROR, "unrecognized node type: %d",
-					 (int) nodeTag(element));
-				break;
-		}
-	}
-
-	/*
-	 * transformIndexConstraints wants cxt.alist to contain only index
-	 * statements, so transfer anything we already have into extras_after
-	 * immediately.
-	 */
-	*extras_after = list_concat(cxt.alist, *extras_after);
-	cxt.alist = NIL;
-
-	Assert(stmt->constraints == NIL);
-
-	/*
-	 * Postprocess constraints that give rise to index definitions.
-	 */
-	transformIndexConstraints(pstate, &cxt, stmt->is_add_part || stmt->is_split_part);
-
-	/*
-	 * Carry any deferred analysis statements forward.  Added for MPP-13750
-	 * but should also apply to the similar case involving simple inheritance.
-	 */
-	if ( cxt.dlist )
-	{
-		stmt->deferredStmts = list_concat(stmt->deferredStmts, cxt.dlist);
-		cxt.dlist = NIL;
-	}
-
-	/*
-	 * Postprocess foreign-key constraints.
-	 * But don't cascade FK constraints to parts, yet.
-	 */
-	if ( ! stmt->is_part_child )
-		transformFKConstraints(pstate, &cxt, true, false);
-
-	/*
-	 * Analyze attribute encoding clauses.
-	 *
-	 * Partitioning configurations may have things like:
-	 *
-	 * CREATE TABLE ...
-	 *  ( a int ENCODING (...))
-	 * WITH (appendonly=true, orientation=column)
-	 * PARTITION BY ...
-	 * (PARTITION ... WITH (appendonly=false));
-	 *
-	 * We don't want to throw an error when we try to apply the ENCODING clause
-	 * to the partition which the user wants to be non-AO. Just ignore it
-	 * instead.
-	 */
-	if (!is_aocs(stmt->options) && stmt->is_part_child)
-	{
-		if (co_explicitly_disabled(stmt->options) || !stenc)
-			stmt->attr_encodings = NIL;
-		else
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("ENCODING clause only supported with "
-							"column oriented partitioned tables")));
-
-		}
-	}
-	else
-		stmt->attr_encodings = transformAttributeEncoding(stenc, stmt, &cxt);
-
-	/*
-	 * Postprocess Greenplum Database distribution columns
-	 */
-	if (stmt->is_part_child ||
-		(stmt->partitionBy &&
-		 (
-			 /* be very quiet if set subpartn template */
-			 (((PartitionBy *)(stmt->partitionBy))->partQuiet ==
-			  PART_VERBO_NOPARTNAME) ||
-			 (
-				 /* quiet for partitions of depth > 0 */
-				 (((PartitionBy *)(stmt->partitionBy))->partDepth != 0) &&
-				 (((PartitionBy *)(stmt->partitionBy))->partQuiet !=
-				  PART_VERBO_NORMAL)
-					 )
-				 )
-				))
-			bQuiet = true; /* silence distro messages for partitions */
-
-	transformDistributedBy(pstate, &cxt, stmt->distributedBy, &stmt->policy,
-						   likeDistributedBy, bQuiet);
-
-	/*
-	 * Process table partitioning clause
-	 */
-	transformPartitionBy(pstate, &cxt, stmt, stmt->partitionBy, stmt->policy);
-
-	/*
-	 * Output results.
-	 */
-	q = makeNode(Query);
-	q->commandType = CMD_UTILITY;
-	q->utilityStmt = (Node *) stmt;
-	stmt->tableElts = cxt.columns;
-	stmt->constraints = cxt.ckconstraints;
-	*extras_before = list_concat(*extras_before, cxt.blist);
-	*extras_after = list_concat(cxt.alist, *extras_after);
-
-	MemoryContextDelete(cxt.tempCtx);
-
-	return q;
-}
-
-static Query *
-transformCreateExternalStmt(ParseState *pstate, CreateExternalStmt *stmt,
-							List **extras_before, List **extras_after)
-{
-	CreateStmtContext cxt;
-	Query	   *q;
-	ListCell   *elements;
-	List  	   *likeDistributedBy = NIL;
-	bool	    bQuiet = false;	/* shut up transformDistributedBy messages */
-	bool		iswritable = stmt->iswritable;
-
-	cxt.stmtType = "CREATE EXTERNAL TABLE";
-	cxt.relation = stmt->relation;
-	cxt.inhRelations = NIL;
-	cxt.hasoids = false;
-	cxt.isalter = false;
-	cxt.columns = NIL;
-	cxt.ckconstraints = NIL;
-	cxt.fkconstraints = NIL;
-	cxt.ixconstraints = NIL;
-	cxt.pkey = NULL;
-
-	cxt.blist = NIL;
-	cxt.alist = NIL;
-
-	/*
-	 * Run through each primary element in the table creation clause. Separate
-	 * column defs from constraints, and do preliminary analysis.
-	 */
-	foreach(elements, stmt->tableElts)
-	{
-		Node	   *element = lfirst(elements);
-
-		switch (nodeTag(element))
-		{
-			case T_ColumnDef:
-				transformColumnDefinition(pstate, &cxt,
-										  (ColumnDef *) element);
-				break;
-
-			case T_Constraint:
-			case T_FkConstraint:
-				/* should never happen. If it does fix gram.y */
-				elog(ERROR, "node type %d not supported for external tables",
-					 (int) nodeTag(element));
-				break;
-
-			case T_InhRelation:
-				{
-					/* LIKE */
-					bool	isBeginning = (cxt.columns == NIL);
-
-					transformInhRelation(pstate, &cxt,
-										 (InhRelation *) element, true);
-
-					if (Gp_role == GP_ROLE_DISPATCH && isBeginning &&
-						stmt->distributedBy == NIL &&
-						stmt->policy == NULL &&
-						iswritable /* dont bother if readable table */)
-					{
-						likeDistributedBy = getLikeDistributionPolicy((InhRelation *) element);
-					}
-				}
-				break;
-
-			default:
-				elog(ERROR, "unrecognized node type: %d",
-					 (int) nodeTag(element));
-				break;
-		}
-	}
-
-	/*
-	 * Forbid LOG ERRORS and ON MASTER combination.
-	 */
-	if (stmt->exttypedesc->exttabletype == EXTTBL_TYPE_EXECUTE)
-	{
-		ListCell   *exec_location_opt;
-
-		foreach(exec_location_opt, stmt->exttypedesc->on_clause)
-		{
-			DefElem    *defel = (DefElem *) lfirst(exec_location_opt);
-
-			if (strcmp(defel->defname, "master") == 0)
-			{
-				SingleRowErrorDesc *srehDesc = (SingleRowErrorDesc *)stmt->sreh;
-
-				if(srehDesc && srehDesc->into_file)
-					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-							 errmsg("External web table with ON MASTER clause "
-									"cannot use LOG ERRORS feature.")));
-			}
-		}
-	}
-
-	/*
-	 * Handle DISTRIBUTED BY clause, if any.
-	 *
-	 * For writeable external tables, by default we distribute RANDOMLY, or
-	 * by the distribution key of the LIKE table if exists. However, if
-	 * DISTRIBUTED BY was specified we use it by calling the regular
-	 * transformDistributedBy and handle it like we would for non external
-	 * tables.
-	 *
-	 * For readable external tables, don't create a policy row at all.
-	 * Non-EXECUTE type external tables are implicitly randomly distributed.
-	 * EXECUTE type external tables encapsulate similar information in the
-	 * "ON <segment spec>" clause, which is stored in pg_exttable.location.
-	 */
-	if (iswritable)
-	{
-		if (stmt->distributedBy == NIL && likeDistributedBy == NIL)
-		{
-			/*
-			 * defaults to DISTRIBUTED RANDOMLY irrespective of the
-			 * gp_create_table_random_default_distribution guc.
-			 */
-			stmt->policy = createRandomDistribution();
-		}
-		else
-		{
-			/* regular DISTRIBUTED BY transformation */
-			transformDistributedBy(pstate, &cxt, stmt->distributedBy, &stmt->policy,
-								   likeDistributedBy, bQuiet);
-		}
-	}
-	else if (stmt->distributedBy != NIL)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("Readable external tables can\'t specify a DISTRIBUTED BY clause.")));
-
-	Assert(cxt.ckconstraints == NIL);
-	Assert(cxt.fkconstraints == NIL);
-	Assert(cxt.ixconstraints == NIL);
-
-	/*
-	 * Output results.
-	 */
-	q = makeNode(Query);
-	q->commandType = CMD_UTILITY;
-	q->utilityStmt = (Node *) stmt;
-	stmt->tableElts = cxt.columns;
-	*extras_before = list_concat(*extras_before, cxt.blist);
-	*extras_after = list_concat(cxt.alist, *extras_after);
-
-	return q;
-}
-
-static void
-transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
-						  ColumnDef *column)
-{
-	bool		is_serial;
-	bool		saw_nullable;
-	bool		saw_default;
-	Constraint *constraint;
-	ListCell   *clist;
-
-	cxt->columns = lappend(cxt->columns, column);
-
-	/* Check for SERIAL pseudo-types */
-	is_serial = false;
-	if (list_length(column->typname->names) == 1)
-	{
-		char	   *typname = strVal(linitial(column->typname->names));
-
-		if (strcmp(typname, "serial") == 0 ||
-			strcmp(typname, "serial4") == 0)
-		{
-			is_serial = true;
-			column->typname->names = NIL;
-			column->typname->typid = INT4OID;
-		}
-		else if (strcmp(typname, "bigserial") == 0 ||
-				 strcmp(typname, "serial8") == 0)
-		{
-			is_serial = true;
-			column->typname->names = NIL;
-			column->typname->typid = INT8OID;
-		}
-	}
-
-	/* Do necessary work on the column type declaration */
-	transformColumnType(pstate, column);
-
-	/* Special actions for SERIAL pseudo-types */
-	if (is_serial)
-	{
-		Oid			snamespaceid;
-		char	   *snamespace;
-		char	   *sname;
-		char	   *qstring;
-		A_Const    *snamenode;
-		FuncCall   *funccallnode;
-		CreateSeqStmt *seqstmt;
-		AlterSeqStmt *altseqstmt;
-		List	   *attnamelist;
-
-		/*
-		 * Determine namespace and name to use for the sequence.
-		 *
-		 * Although we use ChooseRelationName, it's not guaranteed that the
-		 * selected sequence name won't conflict; given sufficiently long
-		 * field names, two different serial columns in the same table could
-		 * be assigned the same sequence name, and we'd not notice since we
-		 * aren't creating the sequence quite yet.  In practice this seems
-		 * quite unlikely to be a problem, especially since few people would
-		 * need two serial columns in one table.
-		 */
-		snamespaceid = RangeVarGetCreationNamespace(cxt->relation);
-		snamespace = get_namespace_name(snamespaceid);
-		sname = ChooseRelationName(cxt->relation->relname,
-								   column->colname,
-								   "seq",
-								   snamespaceid);
-
-		ereport(NOTICE,
-				(errmsg("%s will create implicit sequence \"%s\" for serial column \"%s.%s\"",
-						cxt->stmtType, sname,
-						cxt->relation->relname, column->colname)));
-
-		/*
-		 * Build a CREATE SEQUENCE command to create the sequence object, and
-		 * add it to the list of things to be done before this CREATE/ALTER
-		 * TABLE.
-		 */
-		seqstmt = makeNode(CreateSeqStmt);
-		seqstmt->sequence = makeRangeVar(snamespace, sname, -1);
-		seqstmt->sequence->istemp = cxt->relation->istemp;
-		seqstmt->options = NIL;
-
-
-		cxt->blist = lappend(cxt->blist, seqstmt);
-
-		/*
-		 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence
-		 * as owned by this column, and add it to the list of things to be
-		 * done after this CREATE/ALTER TABLE.
-		 */
-		altseqstmt = makeNode(AlterSeqStmt);
-		altseqstmt->sequence = makeRangeVar(snamespace, sname, -1);
-		attnamelist = list_make3(makeString(snamespace),
-								 makeString(cxt->relation->relname),
-								 makeString(column->colname));
-		altseqstmt->options = list_make1(makeDefElem("owned_by",
-													 (Node *) attnamelist));
-
-		cxt->alist = lappend(cxt->alist, altseqstmt);
-
-		/*
-		 * Create appropriate constraints for SERIAL.  We do this in full,
-		 * rather than shortcutting, so that we will detect any conflicting
-		 * constraints the user wrote (like a different DEFAULT).
-		 *
-		 * Create an expression tree representing the function call
-		 * nextval('sequencename').  We cannot reduce the raw tree to cooked
-		 * form until after the sequence is created, but there's no need to do
-		 * so.
-		 */
-		qstring = quote_qualified_identifier(snamespace, sname);
-		snamenode = makeNode(A_Const);
-		snamenode->val.type = T_String;
-		snamenode->val.val.str = qstring;
-		snamenode->typname = SystemTypeName("regclass");
-        snamenode->location = -1;                                       /*CDB*/
-		funccallnode = makeNode(FuncCall);
-		funccallnode->funcname = SystemFuncName("nextval");
-		funccallnode->args = list_make1(snamenode);
-		funccallnode->agg_star = false;
-		funccallnode->agg_distinct = false;
-		funccallnode->func_variadic = false;
-		funccallnode->location = -1;
-
-		constraint = makeNode(Constraint);
-		constraint->contype = CONSTR_DEFAULT;
-		constraint->raw_expr = (Node *) funccallnode;
-		constraint->cooked_expr = NULL;
-		constraint->keys = NIL;
-		column->constraints = lappend(column->constraints, constraint);
-
-		constraint = makeNode(Constraint);
-		constraint->contype = CONSTR_NOTNULL;
-		column->constraints = lappend(column->constraints, constraint);
-	}
-
-	/* Process column constraints, if any... */
-	transformConstraintAttrs(column->constraints);
-
-	saw_nullable = false;
-	saw_default = false;
-
-	foreach(clist, column->constraints)
-	{
-		constraint = lfirst(clist);
-
-		/*
-		 * If this column constraint is a FOREIGN KEY constraint, then we fill
-		 * in the current attribute's name and throw it into the list of FK
-		 * constraints to be processed later.
-		 */
-		if (IsA(constraint, FkConstraint))
-		{
-			FkConstraint *fkconstraint = (FkConstraint *) constraint;
-
-			fkconstraint->fk_attrs = list_make1(makeString(column->colname));
-			cxt->fkconstraints = lappend(cxt->fkconstraints, fkconstraint);
-			continue;
-		}
-
-		Assert(IsA(constraint, Constraint));
-
-		switch (constraint->contype)
-		{
-			case CONSTR_NULL:
-				if (saw_nullable && column->is_not_null)
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\"",
-								  column->colname, cxt->relation->relname)));
-				column->is_not_null = FALSE;
-				saw_nullable = true;
-				break;
-
-			case CONSTR_NOTNULL:
-				if (saw_nullable && !column->is_not_null)
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\"",
-								  column->colname, cxt->relation->relname)));
-				column->is_not_null = TRUE;
-				saw_nullable = true;
-				break;
-
-			case CONSTR_DEFAULT:
-				if (saw_default)
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("multiple default values specified for column \"%s\" of table \"%s\"",
-								  column->colname, cxt->relation->relname)));
-				column->raw_default = constraint->raw_expr;
-				Assert(constraint->cooked_expr == NULL);
-				saw_default = true;
-				break;
-
-			case CONSTR_PRIMARY:
-			case CONSTR_UNIQUE:
-				if (constraint->keys == NIL)
-					constraint->keys = list_make1(makeString(column->colname));
-				cxt->ixconstraints = lappend(cxt->ixconstraints, constraint);
-				break;
-
-			case CONSTR_CHECK:
-				cxt->ckconstraints = lappend(cxt->ckconstraints, constraint);
-				break;
-
-			case CONSTR_ATTR_DEFERRABLE:
-			case CONSTR_ATTR_NOT_DEFERRABLE:
-			case CONSTR_ATTR_DEFERRED:
-			case CONSTR_ATTR_IMMEDIATE:
-				/* transformConstraintAttrs took care of these */
-				break;
-
-			default:
-				elog(ERROR, "unrecognized constraint type: %d",
-					 constraint->contype);
-				break;
-		}
-	}
-}
-
-static void
-transformTableConstraint(ParseState *pstate, CreateStmtContext *cxt,
-						 Constraint *constraint)
-{
-	switch (constraint->contype)
-	{
-		case CONSTR_PRIMARY:
-		case CONSTR_UNIQUE:
-			cxt->ixconstraints = lappend(cxt->ixconstraints, constraint);
-			break;
-
-		case CONSTR_CHECK:
-			cxt->ckconstraints = lappend(cxt->ckconstraints, constraint);
-			break;
-
-		case CONSTR_NULL:
-		case CONSTR_NOTNULL:
-		case CONSTR_DEFAULT:
-		case CONSTR_ATTR_DEFERRABLE:
-		case CONSTR_ATTR_NOT_DEFERRABLE:
-		case CONSTR_ATTR_DEFERRED:
-		case CONSTR_ATTR_IMMEDIATE:
-			elog(ERROR, "invalid context for constraint type %d",
-				 constraint->contype);
-			break;
-
-		default:
-			elog(ERROR, "unrecognized constraint type: %d",
-				 constraint->contype);
-			break;
-	}
-}
-
-
-
-/****************stmt->policy*********************/
-static void
-transformDistributedBy(ParseState *pstate, CreateStmtContext *cxt,
-					   List *distributedBy, GpPolicy **policyp,
-					   List *likeDistributedBy,
-					   bool bQuiet)
-{
-	ListCell   *keys = NULL;
-	GpPolicy  *policy = NULL;
-	int			colindex = 0;
-	int			numUniqueIndexes = 0;
-	Constraint *uniqueindex = NULL;
-
-	/*
-	 * utility mode creates can't have a policy.  Only the QD can have policies
-	 *
-	 */
-	if (Gp_role != GP_ROLE_DISPATCH)
-	{
-		*policyp = NULL;
-		return;
-	}
-
-	/*
-	 * If distributedBy is NIL, the user did not explicitly say what he
-	 * wanted for a distribution policy.  So, we need to assign one.
-	 */
-	if (distributedBy == NIL && cxt && cxt->pkey != NULL)
-	{
-		/*
-		 * We have a PRIMARY KEY, so let's assign the default distribution
-		 * to be the key
-		 */
-
-		IndexStmt  *index = cxt->pkey;
-		List	   *indexParams;
-		ListCell   *ip = NULL;
-
-		Assert(index->indexParams != NULL);
-		indexParams = index->indexParams;
-
-		foreach(ip, indexParams)
-		{
-			IndexElem  *iparam = lfirst(ip);
-
-			if (iparam && iparam->name != 0)
-			{
-
-				if (distributedBy)
-					distributedBy = lappend(distributedBy,
-											(Node *) makeString(iparam->name));
-				else
-					distributedBy = list_make1((Node *) makeString(iparam->name));
-
-			}
-		}
-	}
-
-	if (cxt && cxt->ixconstraints != NULL)
-	{
-		ListCell   *lc = NULL;
-
-		foreach(lc, cxt->ixconstraints)
-		{
-			Constraint *cons = lfirst(lc);
-
-			if (cons->contype == CONSTR_UNIQUE)
-			{
-				if (uniqueindex == NULL)
-					uniqueindex = cons;
-
-				numUniqueIndexes++;
-
-				if (cxt->pkey)
-				{
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("Greenplum Database does not allow having both PRIMARY KEY and UNIQUE constraints")));
-				}
-			}
-		}
-		if (numUniqueIndexes > 1)
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("Greenplum Database does not allow having multiple UNIQUE constraints")));
-		}
-	}
-
-	if (distributedBy == NIL && cxt && cxt->ixconstraints != NULL &&
-		numUniqueIndexes > 0)
-	{
-		/*
-		 * No explicit distributed by clause, and no primary key.
-		 * If there is a UNIQUE clause, let's use that
-		 */
-		ListCell   *lc = NULL;
-
-		foreach(lc, cxt->ixconstraints)
-		{
-
-			Constraint *constraint = lfirst(lc);
-
-			if (constraint->contype == CONSTR_UNIQUE)
-			{
-
-				ListCell   *ip = NULL;
-
-
-				foreach(ip, constraint->keys)
-				{
-					Value	   *v = lfirst(ip);
-
-					if (v && v->val.str != 0)
-					{
-
-						if (distributedBy)
-							distributedBy = lappend(distributedBy, (Node *) makeString(v->val.str));
-						else
-							distributedBy = list_make1((Node *) makeString(v->val.str));
-
-					}
-				}
-			}
-		}
-
-	}
-
-	/*
-	 * If new table INHERITS from one or more parent tables, check parents.
-	 */
-	if (cxt && cxt->inhRelations != NIL)
-	{
-		ListCell   *entry;
-
-		foreach(entry, cxt->inhRelations)
-		{
-			RangeVar   *parent = (RangeVar *) lfirst(entry);
-			Oid			relId = RangeVarGetRelid(parent, false);
-			GpPolicy  *oldTablePolicy =
-				GpPolicyFetch(CurrentMemoryContext, relId);
-
-			/* Partitioned child must have partitioned parents. */
-			if (oldTablePolicy == NULL ||
-				 oldTablePolicy->ptype != POLICYTYPE_PARTITIONED)
-			{
-				ereport(ERROR, (errcode(ERRCODE_GP_FEATURE_NOT_SUPPORTED),
-						errmsg("cannot inherit from catalog table \"%s\" "
-							   "to create table \"%s\".",
-							   parent->relname, cxt->relation->relname),
-						errdetail("An inheritance hierarchy cannot contain a "
-								  "mixture of distributed and "
-								  "non-distributed tables.")));
-			}
-			/*
-			 * If we still don't know what distribution to use, and this
-			 * is an inherited table, set the distribution based on the
-			 * parent (or one of the parents)
-			 */
-			if (distributedBy == NIL && oldTablePolicy->nattrs >= 0)
-			{
-				int ia;
-
-				if (oldTablePolicy->nattrs > 0)
-				{
-					for (ia=0; ia<oldTablePolicy->nattrs; ia++)
-					{
-						char *attname =
-							get_attname(relId, oldTablePolicy->attrs[ia]);
-
-						distributedBy = lappend(distributedBy,
-												(Node *) makeString(attname));
-					}
-				}
-				else
-				{
-					/* strewn parent */
-					distributedBy = lappend(distributedBy, (Node *)NULL);
-				}
-				if (!bQuiet)
-				 elog(NOTICE, "Table has parent, setting distribution columns "
-					 "to match parent table");
-			}
-			pfree(oldTablePolicy);
-		}
-	}
-
-	if (distributedBy == NIL && likeDistributedBy != NIL)
-	{
-		distributedBy = likeDistributedBy;
-		if (!bQuiet)
-			elog(NOTICE, "Table doesn't have 'distributed by' clause, "
-				 "defaulting to distribution columns from LIKE table");
-	}
-
-	if (gp_create_table_random_default_distribution && NIL == distributedBy)
-	{
-		Assert(NIL == likeDistributedBy);
-		policy = createRandomDistribution();
-		
-		if (!bQuiet)
-		{
-			ereport(NOTICE,
-				(errcode(ERRCODE_SUCCESSFUL_COMPLETION),
-				 errmsg("Using default RANDOM distribution since no distribution was specified."),
-				 errhint("Consider including the 'DISTRIBUTED BY' clause to determine the distribution of rows.")));
-		}
-	}
-	else if (distributedBy == NIL)
-	{
-		/*
-		 * if we get here, we haven't a clue what to use for the distribution columns.
-		 */
-
-		bool	assignedDefault = false;
-
-		/*
-		 * table has one or more attributes and there is still no distribution
-		 * key. pick a default one. the winner is the first attribute that is
-		 * an Greenplum Database-hashable data type.
-		 */
-
-		ListCell   *columns;
-		ColumnDef  *column = NULL;
-
-		/* we will distribute on at most one column */
-		policy = (GpPolicy *) palloc0(sizeof(GpPolicy));
-		policy->ptype = POLICYTYPE_PARTITIONED;
-		policy->nattrs = 0;
-
-		colindex = 0;
-
-		if (cxt && cxt->inhRelations)
-		{
-			/* try inherited tables */
-			ListCell   *inher;
-
-			foreach(inher, cxt->inhRelations)
-			{
-				RangeVar   *inh = (RangeVar *) lfirst(inher);
-				Relation	rel;
-				int			count;
-
-				Assert(IsA(inh, RangeVar));
-				rel = heap_openrv(inh, AccessShareLock);
-				if (rel->rd_rel->relkind != RELKIND_RELATION)
-					ereport(ERROR,
-							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					   errmsg("inherited relation \"%s\" is not a table",
-							  inh->relname)));
-				for (count = 0; count < rel->rd_att->natts; count++)
-				{
-					Form_pg_attribute inhattr = rel->rd_att->attrs[count];
-					Oid typeOid = inhattr->atttypid;
-
-					if (inhattr->attisdropped)
-						continue;
-					colindex++;
-					if(isGreenplumDbHashable(typeOid))
-					{
-						char	   *inhname = NameStr(inhattr->attname);
-						policy->attrs[policy->nattrs++] = colindex;
-						assignedDefault = true;
-						if (!bQuiet)
-							ereport(NOTICE,
-								(errcode(ERRCODE_SUCCESSFUL_COMPLETION),
-								 errmsg("Table doesn't have 'DISTRIBUTED BY' clause -- Using column "
-										"named '%s' from parent table as the Greenplum Database data distribution key for this "
-										"table. ", inhname),
-								 errhint("The 'DISTRIBUTED BY' clause determines the distribution of data."
-								 		 " Make sure column(s) chosen are the optimal data distribution key to minimize skew.")));
-						break;
-					}
-				}
-				heap_close(rel, NoLock);
-
-				if (assignedDefault)
-					break;
-			}
-
-		}
-
-		if (!assignedDefault && cxt && cxt->columns)
-		{
-			foreach(columns, cxt->columns)
-			{
-				Oid typeOid;
-
-				column = (ColumnDef *) lfirst(columns);
-				colindex++;
-
-				typeOid = typenameTypeId(NULL, column->typname);
-
-				/*
-				 * if we can hash on this type, or if it's an array type (which
-				 * we can always hash) this column with be our default key.
-				 */
-				if(isGreenplumDbHashable(typeOid))
-				{
-					policy->attrs[policy->nattrs++] = colindex;
-					assignedDefault = true;
-					if (!bQuiet)
-						ereport(NOTICE,
-							(errcode(ERRCODE_SUCCESSFUL_COMPLETION),
-							 errmsg("Table doesn't have 'DISTRIBUTED BY' clause -- Using column "
-									"named '%s' as the Greenplum Database data distribution key for this "
-									"table. ", column->colname),
-							 errhint("The 'DISTRIBUTED BY' clause determines the distribution of data."
-							 		 " Make sure column(s) chosen are the optimal data distribution key to minimize skew.")));
-					break;
-				}
-
-			}
-		}
-
-		if(!assignedDefault)
-		{
-			/*
-			 * There was no eligible distribution column to default to. This table
-			 * will be partitioned on an empty distribution key list. In other words
-			 * tuples coming into the system will be randomly assigned a bucket.
-			 */
-			policy->nattrs = 0;
-			if (!bQuiet)
-				elog(NOTICE, "Table doesn't have 'distributed by' clause, and no column type is suitable for a distribution key. Creating a NULL policy entry.");
-		}
-
-	}
-	else
-	{
-		/*
-		 * We have a DISTRIBUTED BY column list, either specified by the user
-		 * or defaulted to a primary key or unique column. Process it now and
-		 * set the distribution policy.
-		 */
-		if (list_length(distributedBy) > MaxPolicyAttributeNumber)
-				ereport(ERROR,
-						(errcode(ERRCODE_TOO_MANY_COLUMNS),
-						 errmsg("number of distributed by columns exceeds limit (%d)",
-								MaxPolicyAttributeNumber)));
-
-		policy = (GpPolicy *) palloc0(sizeof(GpPolicy) - sizeof(policy->attrs)
-									+ list_length(distributedBy) * sizeof(policy->attrs[0]));
-		policy->ptype = POLICYTYPE_PARTITIONED;
-		policy->nattrs = 0;
-
-		if (!(distributedBy->length == 1 && linitial(distributedBy) == NULL))
-		{
-			foreach(keys, distributedBy)
-			{
-				char	   *key = strVal(lfirst(keys));
-				bool		found = false;
-				ColumnDef  *column = NULL;
-				ListCell   *columns;
-
-				colindex = 0;
-
-				if (cxt && cxt->inhRelations)
-				{
-					/* try inherited tables */
-					ListCell   *inher;
-
-					foreach(inher, cxt->inhRelations)
-					{
-						RangeVar   *inh = (RangeVar *) lfirst(inher);
-						Relation	rel;
-						int			count;
-
-						Assert(IsA(inh, RangeVar));
-						rel = heap_openrv(inh, AccessShareLock);
-						if (rel->rd_rel->relkind != RELKIND_RELATION)
-							ereport(ERROR,
-									(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-							   errmsg("inherited relation \"%s\" is not a table",
-									  inh->relname)));
-						for (count = 0; count < rel->rd_att->natts; count++)
-						{
-							Form_pg_attribute inhattr = rel->rd_att->attrs[count];
-							char	   *inhname = NameStr(inhattr->attname);
-
-							if (inhattr->attisdropped)
-								continue;
-							colindex++;
-							if (strcmp(key, inhname) == 0)
-							{
-								found = true;
-
-								break;
-							}
-						}
-						heap_close(rel, NoLock);
-						if (found)
-							elog(DEBUG1, "DISTRIBUTED BY clause refers to columns of inherited table");
-
-						if (found)
-							break;
-					}
-				}
-
-				if (!found && cxt && cxt->columns)
-				{
-					foreach(columns, cxt->columns)
-					{
-						column = (ColumnDef *) lfirst(columns);
-						Assert(IsA(column, ColumnDef));
-						colindex++;
-
-						if (strcmp(column->colname, key) == 0)
-						{
-							Oid typeOid = typenameTypeId(NULL, column->typname);
-
-							/*
-							 * To be a part of a distribution key, this type must
-							 * be supported for hashing internally in Greenplum
-							 * Database. We check if the base type is supported
-							 * for hashing or if it is an array type (we support
-							 * hashing on all array types).
-							 */
-							if (!isGreenplumDbHashable(typeOid))
-							{
-								ereport(ERROR,
-										(errcode(ERRCODE_GP_FEATURE_NOT_SUPPORTED),
-										 errmsg("type \"%s\" can't be a part of a "
-												"distribution key",
-												format_type_be(typeOid))));
-							}
-
-							found = true;
-							break;
-						}
-					}
-				}
-
-				/*
-				* In the ALTER TABLE case, don't complain about index keys
-				* not created in the command; they may well exist already.
-				* DefineIndex will complain about them if not, and will also
-				* take care of marking them NOT NULL.
-				*/
-				if (!found && cxt && !cxt->isalter)
-					ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_COLUMN),
-							 errmsg("column \"%s\" named in 'DISTRIBUTED BY' clause does not exist",
-									key)));
-
-				policy->attrs[policy->nattrs++] = colindex;
-
-			}
-
-			/* MPP-14770: we should check for duplicate column usage */
-			foreach(keys, distributedBy)
-			{
-				char *key = strVal(lfirst(keys));
-
-				ListCell *lkeys = NULL;
-				for_each_cell (lkeys, keys->next)
-				{
-					char *lkey = strVal(lfirst(lkeys));
-					if (strcmp(key,lkey) == 0)
-						ereport(ERROR,
-								(errcode(ERRCODE_DUPLICATE_COLUMN),
-								 errmsg("duplicate column \"%s\" in DISTRIBUTED BY clause", key)));
-				}
-			}
-		}
-
-	}
-
-
-	*policyp = policy;
-
-
-	if (cxt && cxt->pkey)		/* Primary key	specified.	Make sure
-								 * distribution columns match */
-	{
-		int			i = 0;
-		IndexStmt  *index = cxt->pkey;
-		List	   *indexParams = index->indexParams;
-		ListCell   *ip;
-
-		foreach(ip, indexParams)
-		{
-			IndexElem  *iparam;
-
-			if (i >= policy->nattrs)
-				break;
-
-			iparam = lfirst(ip);
-			if (iparam->name != 0)
-			{
-				bool	found = false;
-				ColumnDef  *column = NULL;
-				ListCell   *columns;
-
-				colindex = 0;
-
-				if (cxt->inhRelations)
-				{
-					/* try inherited tables */
-					ListCell   *inher;
-
-					foreach(inher, cxt->inhRelations)
-					{
-						RangeVar   *inh = (RangeVar *) lfirst(inher);
-						Relation	rel;
-						int			count;
-
-						Assert(IsA(inh, RangeVar));
-						rel = heap_openrv(inh, AccessShareLock);
-						if (rel->rd_rel->relkind != RELKIND_RELATION)
-							ereport(ERROR,
-									(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-							   errmsg("inherited relation \"%s\" is not a table",
-									  inh->relname)));
-						for (count = 0; count < rel->rd_att->natts; count++)
-						{
-							Form_pg_attribute inhattr = rel->rd_att->attrs[count];
-							char	   *inhname = NameStr(inhattr->attname);
-
-							if (inhattr->attisdropped)
-								continue;
-							colindex++;
-
-							if (strcmp(iparam->name, inhname) == 0)
-							{
-								found = true;
-								break;
-							}
-						}
-						heap_close(rel, NoLock);
-
-						if (found)
-							elog(DEBUG1, "'distributed by' clause refers to "
-								 "columns of inherited table");
-
-						if (found)
-							break;
-					}
-				}
-
-				if (!found && cxt->columns)
-				{
-					foreach(columns, cxt->columns)
-					{
-						column = (ColumnDef *) lfirst(columns);
-						Assert(IsA(column, ColumnDef));
-						colindex++;
-						if (strcmp(column->colname, iparam->name) == 0)
-						{
-							found = true;
-							break;
-						}
-					}
-				}
-				if (colindex != policy->attrs[i])
-				{
-					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-							 errmsg("PRIMARY KEY and DISTRIBUTED BY definitions incompatible"),
-							 errhint("When there is both a PRIMARY KEY, and a "
-									"DISTRIBUTED BY clause, the DISTRIBUTED BY "
-									"clause must be equal to or a left-subset "
-									"of the PRIMARY KEY")));
-				}
-
-				i++;
-			}
-		}
-	}
-
-	if (uniqueindex)			/* UNIQUE specified.  Make sure distribution
-								 * columns match */
-	{
-		int			i = 0;
-
-		List	   *keys = uniqueindex->keys;
-		ListCell   *ip;
-
-		foreach(ip, keys)
-		{
-			IndexElem  *iparam;
-
-			if (i >= policy->nattrs)
-				break;
-
-			iparam = lfirst(ip);
-			if (iparam->name != 0)
-			{
-				bool	found = false;
-				ColumnDef  *column = NULL;
-				ListCell   *columns;
-
-				colindex = 0;
-
-				if (cxt && cxt->inhRelations)
-				{
-					/* try inherited tables */
-					ListCell   *inher;
-
-					foreach(inher, cxt->inhRelations)
-					{
-						RangeVar   *inh = (RangeVar *) lfirst(inher);
-						Relation	rel;
-						int			count;
-
-						Assert(IsA(inh, RangeVar));
-						rel = heap_openrv(inh, AccessShareLock);
-						if (rel->rd_rel->relkind != RELKIND_RELATION)
-							ereport(ERROR,
-									(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-							   errmsg("inherited relation \"%s\" is not a table",
-									  inh->relname)));
-						for (count = 0; count < rel->rd_att->natts; count++)
-						{
-							Form_pg_attribute inhattr = rel->rd_att->attrs[count];
-							char	   *inhname = NameStr(inhattr->attname);
-
-							if (inhattr->attisdropped)
-								continue;
-							colindex++;
-
-							if (strcmp(iparam->name, inhname) == 0)
-							{
-								found = true;
-
-								break;
-							}
-						}
-						heap_close(rel, NoLock);
-						if (found)
-							elog(NOTICE, "'distributed by' clause refers to columns of inherited table");
-
-						if (found)
-							break;
-					}
-				}
-
-				if (!found && cxt && cxt->columns)
-				foreach(columns, cxt->columns)
-				{
-					column = (ColumnDef *) lfirst(columns);
-					Assert(IsA(column, ColumnDef));
-					colindex++;
-					if (strcmp(column->colname, iparam->name) == 0)
-					{
-						found = true;
-						break;
-					}
-				}
-
-				if (colindex != policy->attrs[i])
-				{
-					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-							 errmsg("UNIQUE constraint and DISTRIBUTED BY "
-									"definitions incompatible"),
-							 errhint("When there is both a UNIQUE constraint, "
-									 "and a DISTRIBUTED BY clause, the "
-									 "DISTRIBUTED BY clause must be equal to "
-									 "or a left-subset of the UNIQUE columns")));
-				}
-				i++;
-			}
-		}
-	}
-}
-
-/*
- * Add any missing encoding attributes (compresstype = none,
- * blocksize=...).  The column specific encoding attributes supported
- * today are compresstype, compresslevel and blocksize.  Refer to
- * pg_compression.c for more info.
- */
-static List *
-fillin_encoding(List *list)
-{
-	bool foundCompressType = false;
-	bool foundCompressTypeNone = false;
-	char *cmplevel = NULL;
-	bool foundBlockSize = false;
-	char *arg;
-	List *retList = list_copy(list);
-	ListCell *lc;
-	DefElem *el;
-	const StdRdOptions *ao_opts = currentAOStorageOptions();
-
-	foreach(lc, list)
-	{
-		el = lfirst(lc);
-
-		if (pg_strcasecmp("compresstype", el->defname) == 0)
-		{
-			foundCompressType = true;
-			arg = defGetString(el);
-			if (pg_strcasecmp("none", arg) == 0)
-				foundCompressTypeNone = true;
-		}
-		else if (pg_strcasecmp("compresslevel", el->defname) == 0)
-		{
-			cmplevel = defGetString(el);
-		}
-		else if (pg_strcasecmp("blocksize", el->defname) == 0)
-			foundBlockSize = true;
-	}
-
-	if (foundCompressType == false && cmplevel == NULL)
-	{
-		/* No compression option specified, use current defaults. */
-		arg = ao_opts->compresstype ?
-				pstrdup(ao_opts->compresstype) : "none";
-		el = makeDefElem("compresstype", (Node *) makeString(arg));
-		retList = lappend(retList, el);
-		el = makeDefElem("compresslevel",
-						 (Node *) makeInteger(ao_opts->compresslevel));
-		retList = lappend(retList, el);
-	}
-	else if (foundCompressType == false && cmplevel)
-	{
-		if (strcmp(cmplevel, "0") == 0)
-		{
-			/*
-			 * User wants to disable compression by specifying
-			 * compresslevel=0.
-			 */
-			el = makeDefElem("compresstype", (Node *) makeString("none"));
-			retList = lappend(retList, el);
-		}
-		else
-		{
-			/*
-			 * User wants to enable compression by specifying non-zero
-			 * compresslevel.  Therefore, choose default compresstype
-			 * if configured, otherwise use zlib.
-			 */
-			if (ao_opts->compresstype &&
-				strcmp(ao_opts->compresstype, "none") != 0)
-			{
-				arg = pstrdup(ao_opts->compresstype);
-			}
-			else
-			{
-				arg = AO_DEFAULT_COMPRESSTYPE;
-			}
-			el = makeDefElem("compresstype", (Node *) makeString(arg));
-			retList = lappend(retList, el);
-		}
-	}
-	else if (foundCompressType && cmplevel == NULL)
-	{
-		if (foundCompressTypeNone)
-		{
-			/*
-			 * User wants to disable compression by specifying
-			 * compresstype=none.
-			 */
-			el = makeDefElem("compresslevel", (Node *) makeInteger(0));
-			retList = lappend(retList, el);
-		}
-		else
-		{
-			/*
-			 * Valid compresstype specified.  Use default
-			 * compresslevel if it's non-zero, otherwise use 1.
-			 */
-			el = makeDefElem("compresslevel",
-							 (Node *) makeInteger(ao_opts->compresslevel > 0 ?
-												  ao_opts->compresslevel : 1));
-			retList = lappend(retList, el);
-		}
-	}
-	if (foundBlockSize == false)
-	{
-		el = makeDefElem("blocksize", (Node *) makeInteger(ao_opts->blocksize));
-		retList = lappend(retList, el);
-	}
-	return retList;
-}
-
-static void
-transformFKConstraints(ParseState *pstate, CreateStmtContext *cxt,
-					   bool skipValidation, bool isAddConstraint)
-{
-	ListCell   *fkclist;
-
-	if (cxt->fkconstraints == NIL)
-		return;
-
-	/*
-	 * If CREATE TABLE or adding a column with NULL default, we can safely
-	 * skip validation of the constraint.
-	 */
-	if (skipValidation)
-	{
-		foreach(fkclist, cxt->fkconstraints)
-		{
-			FkConstraint *fkconstraint = (FkConstraint *) lfirst(fkclist);
-
-			fkconstraint->skip_validation = true;
-		}
-	}
-
-	/*
-	 * For CREATE TABLE or ALTER TABLE ADD COLUMN, gin up an ALTER TABLE ADD
-	 * CONSTRAINT command to execute after the basic command is complete. (If
-	 * called from ADD CONSTRAINT, that routine will add the FK constraints to
-	 * its own subcommand list.)
-	 *
-	 * Note: the ADD CONSTRAINT command must also execute after any index
-	 * creation commands.  Thus, this should run after
-	 * transformIndexConstraints, so that the CREATE INDEX commands are
-	 * already in cxt->alist.
-	 */
-	if (!isAddConstraint)
-	{
-		AlterTableStmt *alterstmt = makeNode(AlterTableStmt);
-
-		alterstmt->relation = cxt->relation;
-		alterstmt->cmds = NIL;
-		alterstmt->relkind = OBJECT_TABLE;
-
-		foreach(fkclist, cxt->fkconstraints)
-		{
-			FkConstraint *fkconstraint = (FkConstraint *) lfirst(fkclist);
-			AlterTableCmd *altercmd = makeNode(AlterTableCmd);
-
-			altercmd->subtype = AT_ProcessedConstraint;
-			altercmd->name = NULL;
-			altercmd->def = (Node *) fkconstraint;
-			alterstmt->cmds = lappend(alterstmt->cmds, altercmd);
-		}
-
-		cxt->alist = lappend(cxt->alist, alterstmt);
-	}
-}
-
-/*
- * transformIndexStmt -
- *	  transforms the qualification of the index statement
- *
- * If do_part is true, build create index statements for our children.
- */
-static Query *
-transformIndexStmt(ParseState *pstate, IndexStmt *stmt,
-				   List **extras_before, List **extras_after)
-{
-	Query	   *qry;
-	RangeTblEntry *rte = NULL;
-	ListCell   *l;
-	Oid			idxOid;
-	Oid			nspOid;
-
-	qry = makeNode(Query);
-	qry->commandType = CMD_UTILITY;
-
-	/*
-	 * If the table already exists (i.e., this isn't a create table time
-	 * expansion of primary key() or unique()) and we're the ultimate parent
-	 * of a partitioned table, cascade to all children. We don't do this
-	 * at create table time because transformPartitionBy() automatically
-	 * creates the indexes on the child tables for us.
-	 *
-	 * If this is a CREATE INDEX statement, idxname should already exist.
-	 */
-	idxOid = RangeVarGetRelid(stmt->relation, true);
-	nspOid = RangeVarGetCreationNamespace(stmt->relation);
-	if (OidIsValid(idxOid) && stmt->idxname)
-	{
-		Relation rel;
-
-		rel = heap_openrv(stmt->relation, AccessShareLock);
-
-		if (RelationBuildPartitionDesc(rel, false))
-			stmt->do_part = true;
-
-		if (stmt->do_part && Gp_role != GP_ROLE_EXECUTE)
-		{
-			List		*children;
-			struct HTAB *nameCache;
-
-			/* Lookup the parser object name cache */
-			nameCache = parser_get_namecache(pstate);
-
-			/* Loop over all partition children */
-			children = find_inheritance_children(RelationGetRelid(rel));
-
-			foreach(l, children)
-			{
-				Oid relid = lfirst_oid(l);
-				Relation crel = heap_open(relid, NoLock); /* lock on master
-															 is enough */
-				if (RelationIsExternal(crel))
-				{
-					elog(NOTICE, "skip building index for external partition \"%s\"",
-						 RelationGetRelationName(crel));
-					heap_close(crel, NoLock);
-					continue;
-				}
-				IndexStmt *chidx;
-				Relation partrel;
-				HeapTuple tuple;
-				cqContext	cqc;
-				char *parname;
-				int2 position;
-				int4 depth;
-				NameData name;
-				Oid paroid;
-				char depthstr[NAMEDATALEN];
-				char prtstr[NAMEDATALEN];
-
-				chidx = (IndexStmt *)copyObject((Node *)stmt);
-
-				/* now just update the relation and index name fields */
-				chidx->relation =
-					makeRangeVar(get_namespace_name(RelationGetNamespace(crel)),
-								 pstrdup(RelationGetRelationName(crel)), -1);
-
-				elog(NOTICE, "building index for child partition \"%s\"",
-					 RelationGetRelationName(crel));
-				/*
-				 * We want the index name to resemble our partition table name
-				 * with the master index name on the front. This means, we
-				 * append to the indexname the parname, position, and depth
-				 * as we do in transformPartitionBy().
-				 *
-				 * So, firstly we must retrieve from pg_partition_rule the
-				 * partition descriptor for the current relid. This gives us
-				 * partition name and position. With paroid, we can get the
-				 * partition level descriptor from pg_partition and therefore
-				 * our depth.
-				 */
-				partrel = heap_open(PartitionRuleRelationId, AccessShareLock);
-
-				tuple = caql_getfirst(
-						caql_addrel(cqclr(&cqc), partrel), 
-						cql("SELECT * FROM pg_partition_rule "
-							" WHERE parchildrelid = :1 ",
-							ObjectIdGetDatum(relid)));
-
-				Assert(HeapTupleIsValid(tuple));
-
-				name = ((Form_pg_partition_rule)GETSTRUCT(tuple))->parname;
-				parname = pstrdup(NameStr(name));
-				position = ((Form_pg_partition_rule)GETSTRUCT(tuple))->parruleord;
-				paroid = ((Form_pg_partition_rule)GETSTRUCT(tuple))->paroid;
-
-				heap_freetuple(tuple);
-				heap_close(partrel, NoLock);
-
-				partrel = heap_open(PartitionRelationId, AccessShareLock);
-
-				tuple = caql_getfirst(
-						caql_addrel(cqclr(&cqc), partrel), 
-						cql("SELECT parlevel FROM pg_partition "
-							" WHERE oid = :1 ",
-							ObjectIdGetDatum(paroid)));
-
-				Assert(HeapTupleIsValid(tuple));
-
-				depth = ((Form_pg_partition)GETSTRUCT(tuple))->parlevel + 1;
-
-				heap_freetuple(tuple);
-				heap_close(partrel, NoLock);
-
-				heap_close(crel, NoLock);
-
-				/* now, build the piece to append */
-				snprintf(depthstr, sizeof(depthstr), "%d", depth);
-				if (strlen(parname) == 0)
-					snprintf(prtstr, sizeof(prtstr), "prt_%d", position);
-				else
-					snprintf(prtstr, sizeof(prtstr), "prt_%s", parname);
-
-				chidx->idxname = ChooseRelationNameWithCache(stmt->idxname,
-													depthstr, /* depth */
-													prtstr,   /* part spec */
-												    nspOid,
-													nameCache);
-
-				*extras_after = lappend(*extras_after, chidx);
-			}
-		}
-
-		heap_close(rel, AccessShareLock);
-	}
-
-	/* take care of the where clause */
-	if (stmt->whereClause)
-	{
-		/*
-		 * Put the parent table into the rtable so that the WHERE clause can
-		 * refer to its fields without qualification.  Note that this only
-		 * works if the parent table already exists --- so we can't easily
-		 * support predicates on indexes created implicitly by CREATE TABLE.
-		 * Fortunately, that's not necessary.
-		 */
-		rte = addRangeTableEntry(pstate, stmt->relation, NULL, false, true);
-
-		/* no to join list, yes to namespaces */
-		addRTEtoQuery(pstate, rte, false, true, true);
-
-		stmt->whereClause = transformWhereClause(pstate, stmt->whereClause,
-												 "WHERE");
-	}
-
-	/* take care of any index expressions */
-	foreach(l, stmt->indexParams)
-	{
-		IndexElem  *ielem = (IndexElem *) lfirst(l);
-
-		if (ielem->expr)
-		{
-			/* Set up rtable as for predicate, see notes above */
-			if (rte == NULL)
-			{
-				rte = addRangeTableEntry(pstate, stmt->relation, NULL,
-										 false, true);
-				/* no to join list, yes to namespaces */
-				addRTEtoQuery(pstate, rte, false, true, true);
-			}
-			ielem->expr = transformExpr(pstate, ielem->expr);
-
-			/*
-			 * We check only that the result type is legitimate; this is for
-			 * consistency with what transformWhereClause() checks for the
-			 * predicate.  DefineIndex() will make more checks.
-			 */
-			if (expression_returns_set(ielem->expr))
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("index expression cannot return a set")));
-		}
-	}
-
-	qry->hasSubLinks = pstate->p_hasSubLinks;
-	stmt->rangetable = pstate->p_rtable;
-
-	qry->utilityStmt = (Node *) stmt;
-
-	return qry;
-}
-
-/*
- * transformRuleStmt -
- *	  transform a Create Rule Statement. The actions is a list of parse
- *	  trees which is transformed into a list of query trees.
- */
-static Query *
-transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
-				  List **extras_before, List **extras_after)
-{
-	Query	   *qry;
-	Relation	rel;
-	RangeTblEntry *oldrte;
-	RangeTblEntry *newrte;
-
-	qry = makeNode(Query);
-	qry->commandType = CMD_UTILITY;
-	qry->utilityStmt = (Node *) stmt;
-
-	/*
-	 * To avoid deadlock, make sure the first thing we do is grab
-	 * AccessExclusiveLock on the target relation.	This will be needed by
-	 * DefineQueryRewrite(), and we don't want to grab a lesser lock
-	 * beforehand.
-	 */
-	rel = heap_openrv(stmt->relation, AccessExclusiveLock);
-
-	/*
-	 * NOTE: 'OLD' must always have a varno equal to 1 and 'NEW' equal to 2.
-	 * Set up their RTEs in the main pstate for use in parsing the rule
-	 * qualification.
-	 */
-	Assert(pstate->p_rtable == NIL);
-	oldrte = addRangeTableEntryForRelation(pstate, rel,
-										   makeAlias("*OLD*", NIL),
-										   false, false);
-	newrte = addRangeTableEntryForRelation(pstate, rel,
-										   makeAlias("*NEW*", NIL),
-										   false, false);
-	/* Must override addRangeTableEntry's default access-check flags */
-	oldrte->requiredPerms = 0;
-	newrte->requiredPerms = 0;
-
-	/*
-	 * They must be in the namespace too for lookup purposes, but only add the
-	 * one(s) that are relevant for the current kind of rule.  In an UPDATE
-	 * rule, quals must refer to OLD.field or NEW.field to be unambiguous, but
-	 * there's no need to be so picky for INSERT & DELETE.  We do not add them
-	 * to the joinlist.
-	 */
-	switch (stmt->event)
-	{
-		case CMD_SELECT:
-			addRTEtoQuery(pstate, oldrte, false, true, true);
-			break;
-		case CMD_UPDATE:
-			addRTEtoQuery(pstate, oldrte, false, true, true);
-			addRTEtoQuery(pstate, newrte, false, true, true);
-			break;
-		case CMD_INSERT:
-			addRTEtoQuery(pstate, newrte, false, true, true);
-			break;
-		case CMD_DELETE:
-			addRTEtoQuery(pstate, oldrte, false, true, true);
-			break;
-		default:
-			elog(ERROR, "unrecognized event type: %d",
-				 (int) stmt->event);
-			break;
-	}
-
-	/* take care of the where clause */
-	stmt->whereClause = transformWhereClause(pstate, stmt->whereClause,
-											 "WHERE");
-
-	if (list_length(pstate->p_rtable) != 2)		/* naughty, naughty... */
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-				 errmsg("rule WHERE condition cannot contain references to other relations")));
-
-	/* aggregates not allowed (but subselects are okay) */
-	if (pstate->p_hasAggs)
-		ereport(ERROR,
-				(errcode(ERRCODE_GROUPING_ERROR),
-		   errmsg("cannot use aggregate function in rule WHERE condition")));
-
-	if (pstate->p_hasWindFuncs)
-		ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("cannot use window function in rule WHERE condition")));
-
-
-	/* save info about sublinks in where clause */
-	qry->hasSubLinks = pstate->p_hasSubLinks;
-
-	/*
-	 * 'instead nothing' rules with a qualification need a query rangetable so
-	 * the rewrite handler can add the negated rule qualification to the
-	 * original query. We create a query with the new command type CMD_NOTHING
-	 * here that is treated specially by the rewrite system.
-	 */
-	if (stmt->actions == NIL)
-	{
-		Query	   *nothing_qry = makeNode(Query);
-
-		nothing_qry->commandType = CMD_NOTHING;
-		nothing_qry->rtable = pstate->p_rtable;
-		nothing_qry->jointree = makeFromExpr(NIL, NULL);		/* no join wanted */
-
-		stmt->actions = list_make1(nothing_qry);
-	}
-	else
-	{
-		ListCell   *l;
-		List	   *newactions = NIL;
-
-		/*
-		 * transform each statement, like parse_sub_analyze()
-		 */
-		foreach(l, stmt->actions)
-		{
-			Node	   *action = (Node *) lfirst(l);
-			ParseState *sub_pstate = make_parsestate(pstate->parentParseState);
-			Query	   *sub_qry,
-					   *top_subqry;
-			bool		has_old,
-						has_new;
-
-			/*
-			 * Set up OLD/NEW in the rtable for this statement.  The entries
-			 * are added only to relnamespace, not varnamespace, because we
-			 * don't want them to be referred to by unqualified field names
-			 * nor "*" in the rule actions.  We decide later whether to put
-			 * them in the joinlist.
-			 */
-			oldrte = addRangeTableEntryForRelation(sub_pstate, rel,
-												   makeAlias("*OLD*", NIL),
-												   false, false);
-			newrte = addRangeTableEntryForRelation(sub_pstate, rel,
-												   makeAlias("*NEW*", NIL),
-												   false, false);
-			oldrte->requiredPerms = 0;
-			newrte->requiredPerms = 0;
-			addRTEtoQuery(sub_pstate, oldrte, false, true, false);
-			addRTEtoQuery(sub_pstate, newrte, false, true, false);
-
-			/* Transform the rule action statement */
-			top_subqry = transformStmt(sub_pstate, action,
-									   extras_before, extras_after);
-
-			/*
-			 * We cannot support utility-statement actions (eg NOTIFY) with
-			 * nonempty rule WHERE conditions, because there's no way to make
-			 * the utility action execute conditionally.
-			 */
-			if (top_subqry->commandType == CMD_UTILITY &&
-				stmt->whereClause != NULL)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-						 errmsg("rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions")));
-
-			/*
-			 * If the action is INSERT...SELECT, OLD/NEW have been pushed down
-			 * into the SELECT, and that's what we need to look at. (Ugly
-			 * kluge ... try to fix this when we redesign querytrees.)
-			 */
-			sub_qry = getInsertSelectQuery(top_subqry, NULL);
-
-			/*
-			 * If the sub_qry is a setop, we cannot attach any qualifications
-			 * to it, because the planner won't notice them.  This could
-			 * perhaps be relaxed someday, but for now, we may as well reject
-			 * such a rule immediately.
-			 */
-			if (sub_qry->setOperations != NULL && stmt->whereClause != NULL)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("conditional UNION/INTERSECT/EXCEPT statements are not implemented")));
-
-			/*
-			 * Validate action's use of OLD/NEW, qual too
-			 */
-			has_old =
-				rangeTableEntry_used((Node *) sub_qry, PRS2_OLD_VARNO, 0) ||
-				rangeTableEntry_used(stmt->whereClause, PRS2_OLD_VARNO, 0);
-			has_new =
-				rangeTableEntry_used((Node *) sub_qry, PRS2_NEW_VARNO, 0) ||
-				rangeTableEntry_used(stmt->whereClause, PRS2_NEW_VARNO, 0);
-
-			switch (stmt->event)
-			{
-				case CMD_SELECT:
-					if (has_old)
-						ereport(ERROR,
-								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-								 errmsg("ON SELECT rule cannot use OLD")));
-					if (has_new)
-						ereport(ERROR,
-								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-								 errmsg("ON SELECT rule cannot use NEW")));
-					break;
-				case CMD_UPDATE:
-					/* both are OK */
-					break;
-				case CMD_INSERT:
-					if (has_old)
-						ereport(ERROR,
-								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-								 errmsg("ON INSERT rule cannot use OLD")));
-					break;
-				case CMD_DELETE:
-					if (has_new)
-						ereport(ERROR,
-								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-								 errmsg("ON DELETE rule cannot use NEW")));
-					break;
-				default:
-					elog(ERROR, "unrecognized event type: %d",
-						 (int) stmt->event);
-					break;
-			}
-
-			/*
-			 * For efficiency's sake, add OLD to the rule action's jointree
-			 * only if it was actually referenced in the statement or qual.
-			 *
-			 * For INSERT, NEW is not really a relation (only a reference to
-			 * the to-be-inserted tuple) and should never be added to the
-			 * jointree.
-			 *
-			 * For UPDATE, we treat NEW as being another kind of reference to
-			 * OLD, because it represents references to *transformed* tuples
-			 * of the existing relation.  It would be wrong to enter NEW
-			 * separately in the jointree, since that would cause a double
-			 * join of the updated relation.  It's also wrong to fail to make
-			 * a jointree entry if only NEW and not OLD is mentioned.
-			 */
-			if (has_old || (has_new && stmt->event == CMD_UPDATE))
-			{
-				/*
-				 * If sub_qry is a setop, manipulating its jointree will do no
-				 * good at all, because the jointree is dummy. (This should be
-				 * a can't-happen case because of prior tests.)
-				 */
-				if (sub_qry->setOperations != NULL)
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("conditional UNION/INTERSECT/EXCEPT statements are not implemented")));
-				/* hack so we can use addRTEtoQuery() */
-				sub_pstate->p_rtable = sub_qry->rtable;
-				sub_pstate->p_joinlist = sub_qry->jointree->fromlist;
-				addRTEtoQuery(sub_pstate, oldrte, true, false, false);
-				sub_qry->jointree->fromlist = sub_pstate->p_joinlist;
-			}
-
-			newactions = lappend(newactions, top_subqry);
-
-			release_pstate_resources(sub_pstate);
-			free_parsestate(sub_pstate);
-		}
-
-		stmt->actions = newactions;
-	}
-
-	/* Close relation, but keep the exclusive lock */
-	heap_close(rel, NoLock);
-
-	return qry;
-}
-
-
-/*
- * If an input query (Q) mixes window functions with aggregate
- * functions or grouping, then (per SQL:2003) we need to divide
- * it into an outer query, Q', that contains no aggregate calls
- * or grouping and an inner query, Q'', that contains no window
- * calls.
- *
- * Q' will have a 1-entry range table whose entry corresponds to
- * the results of Q''.
- *
- * Q'' will have the same range as Q and will be pushed down into
- * a subquery range table entry in Q'.
- *
- * As a result, the depth of outer references in Q'' and below
- * will increase, so we need to adjust non-zero xxxlevelsup fields
- * (Var, Aggref, and WindowRef nodes) in Q'' and below.  At the end,
- * there will be no levelsup items referring to Q'.  Prior references
- * to Q will now refer to Q''; prior references to blocks above Q will
- * refer to the same blocks above Q'.)
- *
- * We do all this by creating a new Query node, subq, for Q''.  We
- * modify the input Query node, qry, in place for Q'.  (Since qry is
- * also the input, Q, be careful not to destroy values before we're
- * done with them.
- */
-static Query *
-transformGroupedWindows(Query *qry)
-{
-	Query *subq;
-	RangeTblEntry *rte;
-	RangeTblRef *ref;
-	Alias *alias;
-	bool hadSubLinks = qry->hasSubLinks;
-
-	grouped_window_ctx ctx;
-
-	Assert(qry->commandType == CMD_SELECT);
-	Assert(!PointerIsValid(qry->utilityStmt));
-	Assert(qry->returningList == NIL);
-
-	if ( !qry->hasWindFuncs || !(qry->groupClause || qry->hasAggs) )
-		return qry;
-
-	/* Make the new subquery (Q'').  Note that (per SQL:2003) there
-	 * can't be any window functions called in the WHERE, GROUP BY,
-	 * or HAVING clauses.
-	 */
-	subq = makeNode(Query);
-	subq->commandType = CMD_SELECT;
-	subq->querySource = QSRC_PARSER;
-	subq->canSetTag = true;
-	subq->utilityStmt = NULL;
-	subq->resultRelation = 0;
-	subq->intoClause = NULL;
-	subq->hasAggs = qry->hasAggs;
-	subq->hasWindFuncs = false; /* reevaluate later */
-	subq->hasSubLinks = qry->hasSubLinks; /* reevaluate later */
-
-	/* Core of subquery input table expression: */
-	subq->rtable = qry->rtable; /* before windowing */
-	subq->jointree = qry->jointree; /* before windowing */
-	subq->targetList = NIL; /* fill in later */
+	/* Core of subquery input table expression: */
+	subq->rtable = qry->rtable; /* before windowing */
+	subq->jointree = qry->jointree; /* before windowing */
+	subq->targetList = NIL; /* fill in later */
 
 	subq->returningList = NIL;
 	subq->groupClause = qry->groupClause; /* before windowing */
@@ -4347,7 +1494,8 @@ generate_alternate_vars(Var *invar, grouped_window_ctx *ctx)
  * transformSelectStmt -
  *	  transforms a Select Statement
  *
- * Note: this is also used for DECLARE CURSOR statements.
+ * Note: this covers only cases with no set operations and no VALUES lists;
+ * see below for the other cases.
  */
 static Query *
 transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
@@ -4506,7 +1654,7 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
  *	  transforms a VALUES clause that's being used as a standalone SELECT
  *
  * We build a Query containing a VALUES RTE, rather as if one had written
- *			SELECT * FROM (VALUES ...)
+ *			SELECT * FROM (VALUES ...) AS "*VALUES*"
  */
 static Query *
 transformValuesClause(ParseState *pstate, SelectStmt *stmt)
@@ -4630,6 +1778,7 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt)
 	rtr->rtindex = list_length(pstate->p_rtable);
 	Assert(rte == rt_fetch(rtr->rtindex, pstate->p_rtable));
 	pstate->p_joinlist = lappend(pstate->p_joinlist, rtr);
+	pstate->p_relnamespace = lappend(pstate->p_relnamespace, rte);
 	pstate->p_varnamespace = lappend(pstate->p_varnamespace, rte);
 
 	/*
@@ -4766,9 +1915,7 @@ transformSetOperationStmt(ParseState *pstate, SelectStmt *stmt)
 
 	/*
 	 * Find leftmost leaf SelectStmt; extract the one-time-only items from it
-	 * and from the top-level node.  (Most of the INTO options can be
-	 * transferred to the Query immediately, but intoColNames has to be saved
-	 * to apply below.)
+	 * and from the top-level node.
 	 */
 	leftmostSelect = stmt->larg;
 	while (leftmostSelect && leftmostSelect->op != SETOP_NONE)
@@ -5097,6 +2244,9 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt)
 {
 	Assert(stmt && IsA(stmt, SelectStmt));
 
+	/* Guard against stack overflow due to overly complex set-expressions */
+	check_stack_depth();
+
 	/*
 	 * Validity-check both leaf and internal SELECTs for disallowed ops.
 	 */
@@ -5115,7 +2265,6 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt)
 	if (isSetopLeaf(stmt))
 	{
 		/* Process leaf SELECT */
-		List	   *selectList;
 		Query	   *selectQuery;
 		char		selectName[32];
 		RangeTblEntry *rte;
@@ -5128,11 +2277,7 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt)
 		 * of this sub-query, because they are not in the toplevel pstate's
 		 * namespace list.
 		 */
-		selectList = parse_sub_analyze((Node *) stmt, pstate);
-
-		Assert(list_length(selectList) == 1);
-		selectQuery = (Query *) linitial(selectList);
-		Assert(IsA(selectQuery, Query));
+		selectQuery = parse_sub_analyze((Node *) stmt, pstate);
 
 		/*
 		 * Check for bogus references to Vars on the current query level (but
@@ -5454,7 +2599,10 @@ getSetColTypes(ParseState *pstate, Node *node,
 		elog(ERROR, "unrecognized node type: %d", (int) nodeTag(node));
 }
 
-/* Attach column names from a ColumnDef list to a TargetEntry list */
+/*
+ * Attach column names from a ColumnDef list to a TargetEntry list
+ * (for CREATE TABLE AS)
+ */
 static void
 applyColumnNames(List *dst, List *src)
 {
@@ -5654,423 +2802,47 @@ transformReturningList(ParseState *pstate, List *returningList)
 	 * and restore the main tlist's value of p_next_resno, just in case
 	 * someone looks at it later (probably won't happen).
 	 */
-	save_next_resno = pstate->p_next_resno;
-	pstate->p_next_resno = 1;
-
-	/* save other state so that we can detect disallowed stuff */
-	save_hasAggs = pstate->p_hasAggs;
-	pstate->p_hasAggs = false;
-	length_rtable = list_length(pstate->p_rtable);
-
-	/* transform RETURNING identically to a SELECT targetlist */
-	rlist = transformTargetList(pstate, returningList);
-
-	/* check for disallowed stuff */
-
-	/* aggregates not allowed (but subselects are okay) */
-	if (pstate->p_hasAggs)
-		ereport(ERROR,
-				(errcode(ERRCODE_GROUPING_ERROR),
-				 errmsg("cannot use aggregate function in RETURNING"),
-				 parser_errposition(pstate,
-									locate_agg_of_level((Node *) rlist, 0))));
-	if (pstate->p_hasWindowFuncs)
-		ereport(ERROR,
-				(errcode(ERRCODE_WINDOWING_ERROR),
-				 errmsg("cannot use window function in RETURNING"),
-				 parser_errposition(pstate,
-									locate_windowfunc((Node *) rlist))));
-
-
-	/* no new relation references please */
-	if (list_length(pstate->p_rtable) != length_rtable)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			errmsg("RETURNING cannot contain references to other relations"),
-				 parser_errposition(pstate, vlocation)));
-
-	/* mark column origins */
-	markTargetListOrigins(pstate, rlist);
-
-	/* restore state */
-	pstate->p_next_resno = save_next_resno;
-	pstate->p_hasAggs = save_hasAggs;
-
-	return rlist;
-}
-#endif
-
-/*
- * transformAlterTable_all_PartitionStmt -
- *	transform an Alter Table Statement for some Partition operation
- */
-static AlterTableCmd *
-transformAlterTable_all_PartitionStmt(
-		ParseState *pstate,
-		AlterTableStmt *stmt,
-		CreateStmtContext *pCxt,
-		AlterTableCmd *cmd,
-		List **extras_before,
-		List **extras_after)
-{
-	AlterPartitionCmd 	*pc   	   = (AlterPartitionCmd *) cmd->def;
-	AlterPartitionCmd 	*pci  	   = pc;
-	AlterPartitionId  	*pid  	   = (AlterPartitionId *)pci->partid;
-	AlterTableCmd 		*atc1 	   = cmd;
-	RangeVar 			*rv   	   = stmt->relation;
-	PartitionNode 		*pNode 	   = NULL;
-	PartitionNode 		*prevNode  = NULL;
-	int 			 	 partDepth = 0;
-	Oid 			 	 par_oid   = InvalidOid;
-	StringInfoData   sid1, sid2;
-
-	if (atc1->subtype == AT_PartAlter)
-	{
-		PgPartRule* 	 prule = NULL;
-		char 			*lrelname;
-		Relation 		 rel   = heap_openrv(rv, AccessShareLock);
-
-		initStringInfo(&sid1);
-		initStringInfo(&sid2);
-
-		appendStringInfo(&sid1, "relation \"%s\"",
-						 RelationGetRelationName(rel));
-
-		lrelname = sid1.data;
-
-		pNode = RelationBuildPartitionDesc(rel, false);
-
-		if (!pNode)
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_OBJECT),
-					 errmsg("%s is not partitioned",
-							lrelname)));
-
-		/* Processes nested ALTER (if it exists) */
-		while (1)
-		{
-			AlterPartitionId  	*pid2 = NULL;
-
-			if (atc1->subtype != AT_PartAlter)
-			{
-				rv = makeRangeVar(
-						get_namespace_name(
-								RelationGetNamespace(rel)),
-						pstrdup(RelationGetRelationName(rel)), -1);
-				heap_close(rel, AccessShareLock);
-				rel = NULL;
-				break;
-			}
-
-			pid2 = (AlterPartitionId *)pci->partid;
-
-			if (pid2 && (pid2->idtype == AT_AP_IDValue))
-			{
-				List *vallist = (List *)pid2->partiddef;
-				pid2->partiddef =
-						(Node *)transformExpressionList(
-								pstate, vallist);
-			}
-
-			partDepth++;
-
-			if (!pNode)
-				prule = NULL;
-			else
-				prule = get_part_rule1(rel,
-									   pid2,
-									   false, true,
-									   NULL,
-									   pNode,
-									   sid1.data, NULL);
-
-			if (prule && prule->topRule &&
-				prule->topRule->children)
-			{
-				prevNode = pNode;
-				pNode = prule->topRule->children;
-				par_oid = RelationGetRelid(rel);
-
-				/*
-				 * Don't hold a long lock -- lock on the master is
-				 * sufficient
-				 */
-				heap_close(rel, AccessShareLock);
-				rel = heap_open(prule->topRule->parchildrelid,
-								AccessShareLock);
-
-				appendStringInfo(&sid2, "partition%s of %s",
-								 prule->partIdStr, sid1.data);
-				truncateStringInfo(&sid1, 0);
-				appendStringInfo(&sid1, "%s", sid2.data);
-				truncateStringInfo(&sid2, 0);
-			}
-			else
-			{
-				prevNode = pNode;
-				pNode = NULL;
-			}
-
-			atc1 = (AlterTableCmd *)pci->arg1;
-			pci = (AlterPartitionCmd *)atc1->def;
-		} /* end while */
-		if (rel)
-			/* No need to hold onto the lock -- see above */
-			heap_close(rel, AccessShareLock);
-	} /* end if alter */
-
-	switch (atc1->subtype)
-	{
-		case AT_PartAdd:				/* Add */
-		case AT_PartSetTemplate:		/* Set Subpartn Template */
-		case AT_PartCoalesce:			/* Coalesce */
-		case AT_PartDrop:				/* Drop */
-		case AT_PartExchange:			/* Exchange */
-		case AT_PartMerge:				/* Merge */
-		case AT_PartModify:				/* Modify */
-		case AT_PartRename:				/* Rename */
-		case AT_PartTruncate:			/* Truncate */
-		case AT_PartSplit:				/* Split */
-			/* MPP-4011: get right pid for FOR(value) */
-			pid  	   = (AlterPartitionId *)pci->partid;
-			if (pid && (pid->idtype == AT_AP_IDValue))
-			{
-				List *vallist = (List *)pid->partiddef;
-				pid->partiddef =
-						(Node *)transformExpressionList(
-								pstate, vallist);
-			}
-	break;
-		default:
-			break;
-	}
-	/* transform boundary specifications at execute time */
-	return cmd;
-} /* end transformAlterTable_all_PartitionStmt */
-
-/*
- * transformAlterTableStmt -
- *	transform an Alter Table Statement
- */
-static Query *
-transformAlterTableStmt(ParseState *pstate, AlterTableStmt *stmt,
-						List **extras_before, List **extras_after)
-{
-	CreateStmtContext cxt;
-	Query	   *qry;
-	ListCell   *lcmd,
-			   *l;
-	List	   *newcmds = NIL;
-	bool		skipValidation = true;
-	AlterTableCmd *newcmd;
-
-	cxt.stmtType = "ALTER TABLE";
-	cxt.relation = stmt->relation;
-	cxt.inhRelations = NIL;
-	cxt.isalter = true;
-	cxt.hasoids = false;		/* need not be right */
-	cxt.columns = NIL;
-	cxt.ckconstraints = NIL;
-	cxt.fkconstraints = NIL;
-	cxt.ixconstraints = NIL;
-	cxt.inh_indexes = NIL;
-	cxt.blist = NIL;
-	cxt.alist = NIL;
-	cxt.dlist = NIL; /* used by transformCreateStmt, not here */
-	cxt.pkey = NULL;
-
-	/*
-	 * The only subtypes that currently require parse transformation handling
-	 * are ADD COLUMN and ADD CONSTRAINT.  These largely re-use code from
-	 * CREATE TABLE.
-	 * And ALTER TABLE ... <operator> PARTITION ...
-	 */
-	foreach(lcmd, stmt->cmds)
-	{
-		AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
-
-		switch (cmd->subtype)
-		{
-			case AT_AddColumn:
-				{
-					ColumnDef  *def = (ColumnDef *) cmd->def;
-
-					Assert(IsA(cmd->def, ColumnDef));
-
-					/*
-					 * Disallow adding a column with primary key constraint
-					 */
-					if (Gp_role == GP_ROLE_DISPATCH)
-					{
-						ListCell *c;
-						foreach(c, def->constraints)
-						{
-							Constraint	   *cons = (Constraint *) lfirst(c);
-							if(cons->contype == CONSTR_PRIMARY)
-								elog(ERROR, "Cannot add column with primary "
-									 "key constraint");
-							if(cons->contype == CONSTR_UNIQUE)
-								elog(ERROR, "Cannot add column with unique "
-									 "constraint");
-
-						}
-					}
-
-					transformColumnDefinition(pstate, &cxt,
-											  (ColumnDef *) cmd->def);
-
-					/*
-					 * If the column has a non-null default, we can't skip
-					 * validation of foreign keys.
-					 */
-					if (((ColumnDef *) cmd->def)->raw_default != NULL)
-						skipValidation = false;
-
-					newcmds = lappend(newcmds, cmd);
-
-					/*
-					 * Convert an ADD COLUMN ... NOT NULL constraint to a
-					 * separate command
-					 */
-					if (def->is_not_null)
-					{
-						/* Remove NOT NULL from AddColumn */
-						def->is_not_null = false;
-
-						/* Add as a separate AlterTableCmd */
-						newcmd = makeNode(AlterTableCmd);
-						newcmd->subtype = AT_SetNotNull;
-						newcmd->name = pstrdup(def->colname);
-						newcmds = lappend(newcmds, newcmd);
-					}
-
-					/*
-					 * All constraints are processed in other ways. Remove the
-					 * original list
-					 */
-					def->constraints = NIL;
-
-					break;
-				}
-			case AT_AddConstraint:
-
-				/*
-				 * The original AddConstraint cmd node doesn't go to newcmds
-				 */
-
-				if (IsA(cmd->def, Constraint))
-					transformTableConstraint(pstate, &cxt,
-											 (Constraint *) cmd->def);
-				else if (IsA(cmd->def, FkConstraint))
-				{
-					cxt.fkconstraints = lappend(cxt.fkconstraints, cmd->def);
-
-					/* GPDB: always skip validation of foreign keys */
-					skipValidation = true;
-				}
-				else
-					elog(ERROR, "unrecognized node type: %d",
-						 (int) nodeTag(cmd->def));
-				break;
-
-			case AT_ProcessedConstraint:
-
-				/*
-				 * Already-transformed ADD CONSTRAINT, so just make it look
-				 * like the standard case.
-				 */
-				cmd->subtype = AT_AddConstraint;
-				newcmds = lappend(newcmds, cmd);
-				break;
-
-			/* CDB: Partitioned Tables */
-            case AT_PartAlter:				/* Alter */
-            case AT_PartAdd:				/* Add */
-            case AT_PartCoalesce:			/* Coalesce */
-            case AT_PartDrop:				/* Drop */
-            case AT_PartExchange:			/* Exchange */
-            case AT_PartMerge:				/* Merge */
-            case AT_PartModify:				/* Modify */
-            case AT_PartRename:				/* Rename */
-            case AT_PartSetTemplate:		/* Set Subpartition Template */
-            case AT_PartSplit:				/* Split */
-            case AT_PartTruncate:			/* Truncate */
-			{
-				cmd = transformAlterTable_all_PartitionStmt(
-						pstate,
-						stmt,
-						&cxt,
-						cmd,
-						extras_before,
-						extras_after);
-
-				newcmds = lappend(newcmds, cmd);
-				break;
-			}
-			default:
-				newcmds = lappend(newcmds, cmd);
-				break;
-		}
-	}
-
-	/*
-	 * transformIndexConstraints wants cxt.alist to contain only index
-	 * statements, so transfer anything we already have into extras_after
-	 * immediately.
-	 */
-	*extras_after = list_concat(cxt.alist, *extras_after);
-	cxt.alist = NIL;
+	save_next_resno = pstate->p_next_resno;
+	pstate->p_next_resno = 1;
 
-	/* Postprocess index and FK constraints */
-	transformIndexConstraints(pstate, &cxt, false);
+	/* save other state so that we can detect disallowed stuff */
+	save_hasAggs = pstate->p_hasAggs;
+	pstate->p_hasAggs = false;
+	length_rtable = list_length(pstate->p_rtable);
 
-	transformFKConstraints(pstate, &cxt, skipValidation, true);
+	/* transform RETURNING identically to a SELECT targetlist */
+	rlist = transformTargetList(pstate, returningList);
 
-	/*
-	 * Push any index-creation commands into the ALTER, so that they can be
-	 * scheduled nicely by tablecmds.c.
-	 */
-	foreach(l, cxt.alist)
-	{
-		Node	   *idxstmt = (Node *) lfirst(l);
+	/* check for disallowed stuff */
 
-		Assert(IsA(idxstmt, IndexStmt));
-		newcmd = makeNode(AlterTableCmd);
-		newcmd->subtype = AT_AddIndex;
-		newcmd->def = idxstmt;
-		newcmds = lappend(newcmds, newcmd);
-	}
-	cxt.alist = NIL;
+	/* aggregates not allowed (but subselects are okay) */
+	if (pstate->p_hasAggs)
+		ereport(ERROR,
+				(errcode(ERRCODE_GROUPING_ERROR),
+				 errmsg("cannot use aggregate function in RETURNING")));
 
-	/* Append any CHECK or FK constraints to the commands list */
-	foreach(l, cxt.ckconstraints)
-	{
-		newcmd = makeNode(AlterTableCmd);
-		newcmd->subtype = AT_AddConstraint;
-		newcmd->def = (Node *) lfirst(l);
-		newcmds = lappend(newcmds, newcmd);
-	}
-	foreach(l, cxt.fkconstraints)
-	{
-		newcmd = makeNode(AlterTableCmd);
-		newcmd->subtype = AT_AddConstraint;
-		newcmd->def = (Node *) lfirst(l);
-		newcmds = lappend(newcmds, newcmd);
-	}
+	if (pstate->p_hasWindFuncs)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("cannot use window function in RETURNING")));
 
-	/* Update statement's commands list */
-	stmt->cmds = newcmds;
 
-	qry = makeNode(Query);
-	qry->commandType = CMD_UTILITY;
-	qry->utilityStmt = (Node *) stmt;
+	/* no new relation references please */
+	if (list_length(pstate->p_rtable) != length_rtable)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		  errmsg("RETURNING cannot contain references to other relations")));
 
-	*extras_before = list_concat(*extras_before, cxt.blist);
-	*extras_after = list_concat(cxt.alist, *extras_after);
+	/* mark column origins */
+	markTargetListOrigins(pstate, rlist);
 
-	return qry;
-}
+	/* restore state */
+	pstate->p_next_resno = save_next_resno;
+	pstate->p_hasAggs = save_hasAggs;
 
+	return rlist;
+}
+#endif
 
 /*
  * transformDeclareCursorStmt -
@@ -6086,12 +2858,7 @@ transformAlterTableStmt(ParseState *pstate, AlterTableStmt *stmt,
 static Query *
 transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt)
 {
-	Query	   *result = makeNode(Query);
-	List	   *extras_before = NIL,
-			   *extras_after = NIL;
-
-	result->commandType = CMD_UTILITY;
-	result->utilityStmt = (Node *) stmt;
+	Query	   *result;
 
 	/*
 	 * Don't allow both SCROLL and NO SCROLL to be specified
@@ -6102,18 +2869,12 @@ transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt)
 				(errcode(ERRCODE_INVALID_CURSOR_DEFINITION),
 				 errmsg("cannot specify both SCROLL and NO SCROLL")));
 
-	result = transformStmt(pstate, stmt->query,
-									&extras_before, &extras_after);
-
-	/* Shouldn't get any extras, since grammar only allows SelectStmt */
-	if (extras_before || extras_after)
-		elog(ERROR, "unexpected extra stuff in cursor statement");
+	result = transformStmt(pstate, stmt->query);
 
-	/* Grammar should not have allowed anything but SELECT */
 	if (!IsA(result, Query) ||
 		result->commandType != CMD_SELECT ||
 		result->utilityStmt != NULL)
-		elog(ERROR, "unexpected non-SELECT command in DECLARE CURSOR");
+		elog(ERROR, "unexpected non-SELECT command in cursor statement");
 
 	/* But we must explicitly disallow DECLARE CURSOR ... SELECT INTO */
 	if (result->intoClause)
@@ -6123,6 +2884,27 @@ transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt)
 				 parser_errposition(pstate,
 						   exprLocation((Node *) result->intoClause))));
 
+	/* FOR UPDATE and WITH HOLD are not compatible */
+	if (result->rowMarks != NIL && (stmt->options & CURSOR_OPT_HOLD))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"),
+				 errdetail("Holdable cursors must be READ ONLY.")));
+
+	/* FOR UPDATE and SCROLL are not compatible */
+	if (result->rowMarks != NIL && (stmt->options & CURSOR_OPT_SCROLL))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		errmsg("DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"),
+				 errdetail("Scrollable cursors must be READ ONLY.")));
+
+	/* FOR UPDATE and INSENSITIVE are not compatible */
+	if (result->rowMarks != NIL && (stmt->options & CURSOR_OPT_INSENSITIVE))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"),
+				 errdetail("Insensitive cursors must be READ ONLY.")));
+
 	/* We won't need the raw querytree any more */
 	stmt->query = NULL;
 
@@ -6163,164 +2945,43 @@ isSimplyUpdatableQuery(Query *query)
 		list_length(query->rtable) == 1)
 	{
 		RangeTblEntry *rte = (RangeTblEntry *)linitial(query->rtable);
-		if (isSimplyUpdatableRelation(rte->relid))
+		if (isSimplyUpdatableRelation(rte->relid, true))
 			return true;
 	}
 	return false;
 }
 
+/*
+ * transformExplainStmt -
+ *	transform an EXPLAIN Statement
+ *
+ * EXPLAIN is just like other utility statements in that we emit it as a
+ * CMD_UTILITY Query node with no transformation of the raw parse tree.
+ * However, if p_variableparams is set, it could be that the client is
+ * expecting us to resolve parameter types in something like
+ *		EXPLAIN SELECT * FROM tab WHERE col = $1
+ * To deal with such cases, we run parse analysis and throw away the result;
+ * this is a bit grotty but not worth contorting the rest of the system for.
+ * (The approach we use for DECLARE CURSOR won't work because the statement
+ * being explained isn't necessarily a SELECT, and in particular might rewrite
+ * to multiple parsetrees.)
+ */
 static Query *
-transformPrepareStmt(ParseState *pstate, PrepareStmt *stmt)
+transformExplainStmt(ParseState *pstate, ExplainStmt *stmt)
 {
-	Query	   *result = makeNode(Query);
-	List	   *argtype_oids;	/* argtype OIDs in a list */
-	Oid		   *argtoids = NULL;	/* and as an array */
-	int			nargs;
-	List	   *queries;
-	int			i;
-
-	result->commandType = CMD_UTILITY;
-	result->utilityStmt = (Node *) stmt;
-
-	/* Transform list of TypeNames to list (and array) of type OIDs */
-	nargs = list_length(stmt->argtypes);
-
-	if (nargs)
-	{
-		ListCell   *l;
-
-		argtoids = (Oid *) palloc(nargs * sizeof(Oid));
-		i = 0;
-
-		foreach(l, stmt->argtypes)
-		{
-			TypeName   *tn = lfirst(l);
-			Oid			toid = typenameTypeId(pstate, tn);
-
-			/* Pseudotypes are not valid parameters to PREPARE */
-			if (get_typtype(toid) == TYPTYPE_PSEUDO)
-			{
-				ereport(ERROR,
-						(errcode(ERRCODE_INDETERMINATE_DATATYPE),
-						 errmsg("type \"%s\" is not a valid parameter for PREPARE",
-								TypeNameToString(tn))));
-			}
-
-			argtoids[i++] = toid;
-		}
-	}
+	Query	   *result;
 
-	/*
-	 * Analyze the statement using these parameter types (any parameters
-	 * passed in from above us will not be visible to it), allowing
-	 * information about unknown parameters to be deduced from context.
-	 */
-	queries = parse_analyze_varparams((Node *) stmt->query,
-									  pstate->p_sourcetext,
-									  &argtoids, &nargs);
-
-	/*
-	 * Shouldn't get any extra statements, since grammar only allows
-	 * OptimizableStmt
-	 */
-	if (list_length(queries) != 1)
-		elog(ERROR, "unexpected extra stuff in prepared statement");
-
-	/*
-	 * Check that all parameter types were determined, and convert the array
-	 * of OIDs into a list for storage.
-	 */
-	argtype_oids = NIL;
-	for (i = 0; i < nargs; i++)
+	if (pstate->p_variableparams)
 	{
-		Oid			argtype = argtoids[i];
-
-		if (argtype == InvalidOid || argtype == UNKNOWNOID)
-			ereport(ERROR,
-					(errcode(ERRCODE_INDETERMINATE_DATATYPE),
-					 errmsg("could not determine data type of parameter $%d",
-							i + 1)));
-
-		argtype_oids = lappend_oid(argtype_oids, argtype);
+		/* Since parse analysis scribbles on its input, copy the tree first! */
+		(void) transformStmt(pstate, copyObject(stmt->query));
 	}
 
-	stmt->argtype_oids = argtype_oids;
-	stmt->query = linitial(queries);
-	return result;
-}
-
-static Query *
-transformExecuteStmt(ParseState *pstate, ExecuteStmt *stmt)
-{
-	Query	   *result = makeNode(Query);
-	List	   *paramtypes;
-
+	/* Now return the untransformed command as a utility Query */
+	result = makeNode(Query);
 	result->commandType = CMD_UTILITY;
 	result->utilityStmt = (Node *) stmt;
 
-	paramtypes = FetchPreparedStatementParams(stmt->name);
-
-	if (stmt->params || paramtypes)
-	{
-		int			nparams = list_length(stmt->params);
-		int			nexpected = list_length(paramtypes);
-		ListCell   *l,
-				   *l2;
-		int			i = 1;
-
-		if (nparams != nexpected)
-			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-			errmsg("wrong number of parameters for prepared statement \"%s\"",
-				   stmt->name),
-					 errdetail("Expected %d parameters but got %d.",
-							   nexpected, nparams)));
-
-		forboth(l, stmt->params, l2, paramtypes)
-		{
-			Node	   *expr = lfirst(l);
-			Oid			expected_type_id = lfirst_oid(l2);
-			Oid			given_type_id;
-
-			expr = transformExpr(pstate, expr);
-
-			/* Cannot contain subselects or aggregates */
-			if (pstate->p_hasSubLinks)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot use subquery in EXECUTE parameter")));
-			if (pstate->p_hasAggs)
-				ereport(ERROR,
-						(errcode(ERRCODE_GROUPING_ERROR),
-						 errmsg("cannot use aggregate function in EXECUTE parameter")));
-			if (pstate->p_hasWindFuncs)
-				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
-				 		 errmsg("cannot use window function in EXECUTE parameter")));
-
-
-			given_type_id = exprType(expr);
-
-			expr = coerce_to_target_type(pstate, expr, given_type_id,
-										 expected_type_id, -1,
-										 COERCION_ASSIGNMENT,
-										 COERCE_IMPLICIT_CAST,
-										 -1);
-
-			if (expr == NULL)
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("parameter $%d of type %s cannot be coerced to the expected type %s",
-								i,
-								format_type_be(given_type_id),
-								format_type_be(expected_type_id)),
-				errhint("You will need to rewrite or cast the expression.")));
-
-			lfirst(l) = expr;
-			i++;
-		}
-	}
-
 	return result;
 }
 
@@ -6526,290 +3187,6 @@ applyLockingClause(Query *qry, Index rtindex, bool forUpdate, bool noWait)
 }
 
 
-/*
- * Preprocess a list of column constraint clauses
- * to attach constraint attributes to their primary constraint nodes
- * and detect inconsistent/misplaced constraint attributes.
- *
- * NOTE: currently, attributes are only supported for FOREIGN KEY primary
- * constraints, but someday they ought to be supported for other constraints.
- */
-static void
-transformConstraintAttrs(List *constraintList)
-{
-	Node	   *lastprimarynode = NULL;
-	bool		saw_deferrability = false;
-	bool		saw_initially = false;
-	ListCell   *clist;
-
-	foreach(clist, constraintList)
-	{
-		Node	   *node = lfirst(clist);
-
-		if (!IsA(node, Constraint))
-		{
-			lastprimarynode = node;
-			/* reset flags for new primary node */
-			saw_deferrability = false;
-			saw_initially = false;
-		}
-		else
-		{
-			Constraint *con = (Constraint *) node;
-
-			switch (con->contype)
-			{
-				case CONSTR_ATTR_DEFERRABLE:
-					if (lastprimarynode == NULL ||
-						!IsA(lastprimarynode, FkConstraint))
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("misplaced DEFERRABLE clause")));
-					if (saw_deferrability)
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed")));
-					saw_deferrability = true;
-					((FkConstraint *) lastprimarynode)->deferrable = true;
-					break;
-				case CONSTR_ATTR_NOT_DEFERRABLE:
-					if (lastprimarynode == NULL ||
-						!IsA(lastprimarynode, FkConstraint))
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("misplaced NOT DEFERRABLE clause")));
-					if (saw_deferrability)
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed")));
-					saw_deferrability = true;
-					((FkConstraint *) lastprimarynode)->deferrable = false;
-					if (saw_initially &&
-						((FkConstraint *) lastprimarynode)->initdeferred)
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
-					break;
-				case CONSTR_ATTR_DEFERRED:
-					if (lastprimarynode == NULL ||
-						!IsA(lastprimarynode, FkConstraint))
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("misplaced INITIALLY DEFERRED clause")));
-					if (saw_initially)
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed")));
-					saw_initially = true;
-					((FkConstraint *) lastprimarynode)->initdeferred = true;
-
-					/*
-					 * If only INITIALLY DEFERRED appears, assume DEFERRABLE
-					 */
-					if (!saw_deferrability)
-						((FkConstraint *) lastprimarynode)->deferrable = true;
-					else if (!((FkConstraint *) lastprimarynode)->deferrable)
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
-					break;
-				case CONSTR_ATTR_IMMEDIATE:
-					if (lastprimarynode == NULL ||
-						!IsA(lastprimarynode, FkConstraint))
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-							errmsg("misplaced INITIALLY IMMEDIATE clause")));
-					if (saw_initially)
-						ereport(ERROR,
-								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed")));
-					saw_initially = true;
-					((FkConstraint *) lastprimarynode)->initdeferred = false;
-					break;
-				default:
-					/* Otherwise it's not an attribute */
-					lastprimarynode = node;
-					/* reset flags for new primary node */
-					saw_deferrability = false;
-					saw_initially = false;
-					break;
-			}
-		}
-	}
-}
-
-/* Build a FromExpr node */
-static FromExpr *
-makeFromExpr(List *fromlist, Node *quals)
-{
-	FromExpr   *f = makeNode(FromExpr);
-
-	f->fromlist = fromlist;
-	f->quals = quals;
-	return f;
-}
-
-/*
- * Special handling of type definition for a column
- */
-static void
-transformColumnType(ParseState *pstate, ColumnDef *column)
-{
-	/*
-	 * All we really need to do here is verify that the type is valid.
-	 */
-	Type		ctype = typenameType(pstate, column->typname);
-
-	ReleaseType(ctype);
-}
-
-static void
-setSchemaName(char *context_schema, char **stmt_schema_name)
-{
-	if (*stmt_schema_name == NULL)
-		*stmt_schema_name = context_schema;
-	else if (strcmp(context_schema, *stmt_schema_name) != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_SCHEMA_DEFINITION),
-				 errmsg("CREATE specifies a schema (%s) "
-						"different from the one being created (%s)",
-						*stmt_schema_name, context_schema)));
-}
-
-/*
- * analyzeCreateSchemaStmt -
- *	  analyzes the "create schema" statement
- *
- * Split the schema element list into individual commands and place
- * them in the result list in an order such that there are no forward
- * references (e.g. GRANT to a table created later in the list). Note
- * that the logic we use for determining forward references is
- * presently quite incomplete.
- *
- * SQL92 also allows constraints to make forward references, so thumb through
- * the table columns and move forward references to a posterior alter-table
- * command.
- *
- * The result is a list of parse nodes that still need to be analyzed ---
- * but we can't analyze the later commands until we've executed the earlier
- * ones, because of possible inter-object references.
- *
- * Note: Called from commands/schemacmds.c
- */
-List *
-analyzeCreateSchemaStmt(CreateSchemaStmt *stmt)
-{
-	CreateSchemaStmtContext cxt;
-	List	   *result;
-	ListCell   *elements;
-
-	cxt.stmtType = "CREATE SCHEMA";
-	cxt.schemaname = stmt->schemaname;
-	cxt.authid = stmt->authid;
-	cxt.sequences = NIL;
-	cxt.tables = NIL;
-	cxt.views = NIL;
-	cxt.indexes = NIL;
-	cxt.grants = NIL;
-	cxt.triggers = NIL;
-	cxt.fwconstraints = NIL;
-	cxt.alters = NIL;
-	cxt.blist = NIL;
-	cxt.alist = NIL;
-
-	/*
-	 * Run through each schema element in the schema element list. Separate
-	 * statements by type, and do preliminary analysis.
-	 */
-	foreach(elements, stmt->schemaElts)
-	{
-		Node	   *element = lfirst(elements);
-
-		switch (nodeTag(element))
-		{
-			case T_CreateSeqStmt:
-				{
-					CreateSeqStmt *elp = (CreateSeqStmt *) element;
-
-					setSchemaName(cxt.schemaname, &elp->sequence->schemaname);
-					cxt.sequences = lappend(cxt.sequences, element);
-				}
-				break;
-
-			case T_CreateStmt:
-				{
-					CreateStmt *elp = (CreateStmt *) element;
-
-					setSchemaName(cxt.schemaname, &elp->relation->schemaname);
-
-					/*
-					 * XXX todo: deal with constraints
-					 */
-					cxt.tables = lappend(cxt.tables, element);
-				}
-				break;
-
-			case T_CreateExternalStmt:
-				{
-					CreateExternalStmt *elp = (CreateExternalStmt *) element;
-
-					setSchemaName(cxt.schemaname, &elp->relation->schemaname);
-
-					cxt.tables = lappend(cxt.tables, element);
-				}
-				break;
-
-			case T_ViewStmt:
-				{
-					ViewStmt   *elp = (ViewStmt *) element;
-
-					setSchemaName(cxt.schemaname, &elp->view->schemaname);
-
-					/*
-					 * XXX todo: deal with references between views
-					 */
-					cxt.views = lappend(cxt.views, element);
-				}
-				break;
-
-			case T_IndexStmt:
-				{
-					IndexStmt  *elp = (IndexStmt *) element;
-
-					setSchemaName(cxt.schemaname, &elp->relation->schemaname);
-					cxt.indexes = lappend(cxt.indexes, element);
-				}
-				break;
-
-			case T_CreateTrigStmt:
-				{
-					CreateTrigStmt *elp = (CreateTrigStmt *) element;
-
-					setSchemaName(cxt.schemaname, &elp->relation->schemaname);
-					cxt.triggers = lappend(cxt.triggers, element);
-				}
-				break;
-
-			case T_GrantStmt:
-				cxt.grants = lappend(cxt.grants, element);
-				break;
-
-			default:
-				elog(ERROR, "unrecognized node type: %d",
-					 (int) nodeTag(element));
-		}
-	}
-
-	result = NIL;
-	result = list_concat(result, cxt.sequences);
-	result = list_concat(result, cxt.tables);
-	result = list_concat(result, cxt.views);
-	result = list_concat(result, cxt.indexes);
-	result = list_concat(result, cxt.triggers);
-	result = list_concat(result, cxt.grants);
-
-	return result;
-}
 
 /*
  * Traverse a fully-analyzed tree to verify that parameter symbols
@@ -6898,26 +3275,20 @@ setQryDistributionPolicy(SelectStmt *stmt, Query *qry)
 			{
 				char	   *key = strVal(lfirst(keys));
 				bool		found = false;
-	
 				AttrNumber	n;
-	
-				for(n=1;n<=list_length(qry->targetList);n++)
+
+				for (n=1; n <= list_length(qry->targetList); n++)
 				{
-	
 					TargetEntry *target = get_tle_by_resno(qry->targetList, n);
 					colindex = n;
-	
+
 					if (target->resname && strcmp(target->resname, key) == 0)
 					{
 						found = true;
-	
-					} /*if*/
-	
-					if (found)
 						break;
-	
-				} /*for*/
-	
+					}
+				}
+
 				if (!found)
 					ereport(ERROR,
 							(errcode(ERRCODE_UNDEFINED_COLUMN),
@@ -6927,51 +3298,8 @@ setQryDistributionPolicy(SelectStmt *stmt, Query *qry)
 	
 				policy->attrs[policy->nattrs++] = colindex;
 	
-			} /*foreach */
-			qry->intoPolicy = policy;
-		}
-	}
-}
-
-/*
- * getLikeDistributionPolicy
- *
- * For Greenplum Database distributed tables, default to
- * the same distribution as the first LIKE table, unless
- * we also have INHERITS
- */
-static List*
-getLikeDistributionPolicy(InhRelation* e)
-{
-	List*			likeDistributedBy = NIL;
-	Oid				relId;
-	GpPolicy*		oldTablePolicy;
-
-	relId = RangeVarGetRelid(e->relation, false);
-	oldTablePolicy = GpPolicyFetch(CurrentMemoryContext, relId);
-
-	if (oldTablePolicy != NULL &&
-		oldTablePolicy->ptype == POLICYTYPE_PARTITIONED)
-	{
-		int ia;
-
-		if (oldTablePolicy->nattrs > 0)
-		{
-			for (ia = 0 ; ia < oldTablePolicy->nattrs ; ia++)
-			{
-				char *attname = get_attname(relId, oldTablePolicy->attrs[ia]);
-
-				if (likeDistributedBy)
-					likeDistributedBy = lappend(likeDistributedBy, (Node *) makeString(attname));
-				else
-					likeDistributedBy = list_make1((Node *) makeString(attname));
 			}
-		}
-		else
-		{	/* old table is distributed randomly. */
-			likeDistributedBy = list_make1((Node *) NULL);
+			qry->intoPolicy = policy;
 		}
 	}
-
-	return likeDistributedBy;
 }
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 1ea1f3e4515d..a731c258b509 100755
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.579 2007/02/03 14:06:54 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.606 2008/02/07 21:07:55 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -190,7 +190,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 		CreateTableSpaceStmt
 		CreateAssertStmt CreateTrigStmt 
 		CreateUserStmt CreateRoleStmt
-		CreatedbStmt DeclareCursorStmt DefineStmt DeleteStmt DoStmt
+		CreatedbStmt DeclareCursorStmt DefineStmt DeleteStmt DiscardStmt DoStmt
 		DropGroupStmt DropOpClassStmt DropOpFamilyStmt DropPLangStmt DropQueueStmt DropStmt
 		DropAssertStmt DropTrigStmt DropRuleStmt DropCastStmt DropRoleStmt
 		DropUserStmt DropdbStmt
@@ -207,6 +207,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 		ViewStmt CheckPointStmt CreateConversionStmt
 		DeallocateStmt PrepareStmt ExecuteStmt
 		DropOwnedStmt ReassignOwnedStmt
+		AlterTSConfigurationStmt AlterTSDictionaryStmt
 		AlterTypeStmt 
 
 %type <node>    deny_login_role deny_interval deny_point deny_day_specifier
@@ -258,7 +259,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 
 %type <str>		relation_name copy_file_name
 				database_name access_method_clause access_method attr_name
-				index_name name file_name
+				index_name name file_name cluster_index_specification
 
 %type <list>	func_name handler_name qual_Op qual_all_Op subquery_Op
 				opt_class opt_inline_handler opt_validator validator_clause
@@ -301,6 +302,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 				TableFuncElementList opt_type_modifiers
 				prep_type_clause
 				execute_param_clause using_clause returning_clause
+				enum_val_list
 				table_func_column_list scatter_clause dostmt_opt_list
 
 %type <node>    table_value_select_clause
@@ -336,9 +338,9 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 %type <boolean> opt_dxl
 %type <defelt>	opt_binary opt_oids copy_delimiter
 
-%type <boolean> copy_from opt_hold skip_external_partition
+%type <boolean> copy_from skip_external_partition
 
-%type <ival>	opt_column event cursor_options
+%type <ival>	opt_column event cursor_options opt_hold
 %type <objtype>	reindex_type drop_type comment_type
 
 %type <node>	fetch_direction select_limit_value select_offset_value
@@ -350,7 +352,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 
 %type <istmt>	insert_rest
 
-%type <vsetstmt> set_rest
+%type <vsetstmt> set_rest SetResetClause
 %type <node>	TableElement ExtTableElement ConstraintElem TableFuncElement
 %type <node>	columnDef ExtcolumnDef
 %type <node>	cdb_string
@@ -403,7 +405,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 %type <str>		Sconst comment_text
 %type <str>		RoleId opt_granted_by opt_boolean ColId_or_Sconst
 %type <str>		QueueId
-%type <list>	var_list var_list_or_default
+%type <list>	var_list
 %type <str>		ColId ColLabel ColLabelNoAs var_name type_function_name param_name
 %type <keyword> PartitionIdentKeyword	
 %type <str>		PartitionColId
@@ -480,7 +482,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 
 /* ordinary key words in alphabetical order */
 %token <keyword> ABORT_P ABSOLUTE_P ACCESS ACTION ACTIVE ADD_P ADMIN AFTER
-	AGGREGATE ALL ALSO ALTER ANALYSE ANALYZE AND ANY ARRAY AS ASC
+	AGGREGATE ALL ALSO ALTER ALWAYS ANALYSE ANALYZE AND ANY ARRAY AS ASC
 	ASSERTION ASSIGNMENT ASYMMETRIC AT AUTHORIZATION
 
 	BACKWARD BEFORE BEGIN_P BETWEEN BIGINT BINARY BIT
@@ -489,14 +491,16 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 	CACHE CALLED CASCADE CASCADED CASE CAST CHAIN CHAR_P
 	CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLOSE
 	CLUSTER COALESCE COLLATE COLUMN COMMENT COMMIT
-	COMMITTED CONCURRENTLY CONNECTION CONSTRAINT CONSTRAINTS CONTAINS CONTENT_P CONTINUE_P CONVERSION_P COPY COST
-	CREATE CREATEDB CREATEEXTTABLE
-	CREATEROLE CREATEUSER CROSS CSV CUBE CURRENT CURRENT_CATALOG CURRENT_DATE CURRENT_ROLE CURRENT_SCHEMA
+	COMMITTED CONCURRENTLY CONFIGURATION CONNECTION CONSTRAINT CONSTRAINTS CONTAINS
+	CONTENT_P CONTINUE_P CONVERSION_P COPY COST CREATE CREATEDB
+	CREATEEXTTABLE
+	CREATEROLE CREATEUSER CROSS CSV CUBE CURRENT_P CURRENT_CATALOG CURRENT_DATE CURRENT_ROLE CURRENT_SCHEMA
 	CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER CURSOR CYCLE
 
 	DATA_P DATABASE DAY_P DEALLOCATE DEC DECIMAL_P DECLARE DECODE DEFAULT DEFAULTS
-	DEFERRABLE DEFERRED DEFINER DELETE_P DELIMITER DELIMITERS DENY
-	DESC DISABLE_P DISTINCT DISTRIBUTED DO DOCUMENT_P DOMAIN_P DOUBLE_P DROP DXL
+	DEFERRABLE DEFERRED DEFINER DELETE_P DELIMITER DELIMITERS DENY DESC
+	DICTIONARY DISABLE_P DISCARD DISTINCT DISTRIBUTED DO DOCUMENT_P DOMAIN_P DOUBLE_P DROP
+	DXL
 
 	EACH ELSE ENABLE_P ENCODING ENCRYPTED END_P ENUM_P ERRORS ESCAPE EVERY EXCEPT 
 	EXCHANGE EXCLUDE EXCLUDING EXCLUSIVE EXECUTE EXISTS EXPLAIN EXTERNAL EXTRACT
@@ -523,7 +527,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 	LIKE LIMIT LIST LISTEN LOAD LOCAL LOCALTIME LOCALTIMESTAMP LOCATION
 	LOCK_P LOG_P LOGIN_P
 
-	MASTER MATCH MAXVALUE MEDIAN MERGE MINUTE_P MINVALUE MIRROR
+	MAPPING MASTER MATCH MAXVALUE MEDIAN MERGE MINUTE_P MINVALUE MIRROR
 	MISSING MODE MODIFIES MODIFY MONTH_P MOVE
 
 	NAME_P NAMES NATIONAL NATURAL NCHAR NEW NEWLINE NEXT NO NOCREATEDB NOCREATEEXTTABLE
@@ -533,17 +537,17 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 	OBJECT_P OF OFF OFFSET OIDS OLD ON ONLY OPERATOR OPTION OPTIONS OR
 	ORDER ORDERED OTHERS OUT_P OUTER_P OVER OVERCOMMIT OVERLAPS OVERLAY OWNED OWNER
 
-	PARTIAL PARTITION PARTITIONS PASSING PASSWORD PERCENT PERCENTILE_CONT PERCENTILE_DISC
-	PLACING POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY
+	PARSER PARTIAL PARTITION PARTITIONS PASSING PASSWORD PERCENT PERCENTILE_CONT PERCENTILE_DISC
+	PLACING PLANS POSITION PRECEDING
+	PRECISION PRESERVE PREPARE PREPARED PRIMARY
 	PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROTOCOL
 
 	QUEUE QUOTE
 
-	RANDOMLY RANGE READ READABLE READS REAL REASSIGN RECHECK RECURSIVE 
-	REF REFERENCES REINDEX REJECT_P RELATIVE_P
-	RELEASE RENAME REPEATABLE REPLACE RESET RESOURCE RESTART RESTRICT 
-	RETURNING RETURNS REVOKE RIGHT
-	ROLE ROLLBACK ROLLUP ROOTPARTITION ROW ROWS RULE
+	RANDOMLY RANGE READ READABLE READS
+	REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REINDEX REJECT_P RELATIVE_P RELEASE RENAME
+	REPEATABLE REPLACE REPLICA RESET RESOURCE RESTART RESTRICT RETURNING RETURNS REVOKE
+	RIGHT ROLE ROLLBACK ROLLUP ROOTPARTITION ROW ROWS RULE
 
 	SAVEPOINT SCATTER SCHEMA SCROLL SEARCH SECOND_P 
     SECURITY SEGMENT SELECT SEQUENCE
@@ -554,7 +558,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 	SUBSTRING SUPERUSER_P SYMMETRIC
 	SYSID SYSTEM_P
 
-	TABLE TABLESPACE TEMP TEMPLATE TEMPORARY THEN THRESHOLD TIES TIME TIMESTAMP
+	TABLE TABLESPACE TEMP TEMPLATE TEMPORARY TEXT_P THEN THRESHOLD TIES TIME TIMESTAMP
 	TO TRAILING TRANSACTION TREAT TRIGGER TRIM TRUE_P
 	TRUNCATE TRUSTED TYPE_P
 
@@ -660,7 +664,7 @@ static Node *makeIsNotDistinctFromNode(Node *expr, int position);
 			%nonassoc CREATEROLE
 			%nonassoc CREATEUSER
 			%nonassoc CSV
-			%nonassoc CURRENT
+			%nonassoc CURRENT_P
 			%nonassoc CURSOR
 			%nonassoc CYCLE
 			%nonassoc DATA_P
@@ -991,6 +995,8 @@ stmt :
 			| AlterQueueStmt
 			| AlterRoleSetStmt
 			| AlterRoleStmt
+			| AlterTSConfigurationStmt
+			| AlterTSDictionaryStmt
 			| AlterSeqStmt
 			| AlterTableStmt
 			| AlterTypeStmt
@@ -1029,6 +1035,7 @@ stmt :
 			| DeclareCursorStmt
 			| DefineStmt
 			| DeleteStmt
+			| DiscardStmt
 			| DoStmt
 			| DropAssertStmt
 			| DropCastStmt
@@ -1457,20 +1464,11 @@ AlterRoleStmt:
 		;
 
 AlterRoleSetStmt:
-			ALTER ROLE RoleId SET set_rest
+			ALTER ROLE RoleId SetResetClause
 				{
 					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
 					n->role = $3;
-					n->variable = $5->name;
-					n->value = $5->args;
-					$$ = (Node *)n;
-				}
-			| ALTER ROLE RoleId VariableResetStmt
-				{
-					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
-					n->role = $3;
-					n->variable = ((VariableResetStmt *)$4)->name;
-					n->value = NIL;
+					n->setstmt = $4;
 					$$ = (Node *)n;
 				}
 		;
@@ -1506,20 +1504,11 @@ AlterUserStmt:
 
 
 AlterUserSetStmt:
-			ALTER USER RoleId SET set_rest
-				{
-					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
-					n->role = $3;
-					n->variable = $5->name;
-					n->value = $5->args;
-					$$ = (Node *)n;
-				}
-			| ALTER USER RoleId VariableResetStmt
+			ALTER USER RoleId SetResetClause
 				{
 					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
 					n->role = $3;
-					n->variable = ((VariableResetStmt *)$4)->name;
-					n->value = NIL;
+					n->setstmt = $4;
 					$$ = (Node *)n;
 				}
 			;
@@ -1731,31 +1720,60 @@ VariableSetStmt:
 				}
 		;
 
-set_rest:  var_name TO var_list_or_default
+set_rest:	/* Generic SET syntaxes: */
+			var_name TO var_list
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_VALUE;
 					n->name = $1;
 					n->args = $3;
 					$$ = n;
 				}
-			| var_name '=' var_list_or_default
+			| var_name '=' var_list
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_VALUE;
 					n->name = $1;
 					n->args = $3;
 					$$ = n;
 				}
+			| var_name TO DEFAULT
+				{
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_DEFAULT;
+					n->name = $1;
+					$$ = n;
+				}
+			| var_name '=' DEFAULT
+				{
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_DEFAULT;
+					n->name = $1;
+					$$ = n;
+				}
+			| var_name FROM CURRENT_P
+				{
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_CURRENT;
+					n->name = $1;
+					$$ = n;
+				}
+			/* Special syntaxes mandated by SQL standard: */
 			| TIME ZONE zone_value
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_VALUE;
 					n->name = "timezone";
 					if ($3 != NULL)
 						n->args = list_make1($3);
+					else
+						n->kind = VAR_SET_DEFAULT;
 					$$ = n;
 				}
 			| TRANSACTION transaction_mode_list
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_MULTI;
 					n->name = "TRANSACTION";
 					n->args = $2;
 					$$ = n;
@@ -1763,6 +1781,7 @@ set_rest:  var_name TO var_list_or_default
 			| SESSION CHARACTERISTICS AS TRANSACTION transaction_mode_list
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_MULTI;
 					n->name = "SESSION CHARACTERISTICS";
 					n->args = $5;
 					$$ = n;
@@ -1770,14 +1789,18 @@ set_rest:  var_name TO var_list_or_default
 			| NAMES opt_encoding
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_VALUE;
 					n->name = "client_encoding";
 					if ($2 != NULL)
 						n->args = list_make1(makeStringConst($2, NULL, @2));
+					else
+						n->kind = VAR_SET_DEFAULT;
 					$$ = n;
 				}
 			| ROLE ColId_or_Sconst
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_VALUE;
 					n->name = "role";
 					n->args = list_make1(makeStringConst($2, NULL, @2));
 					$$ = n;
@@ -1785,6 +1808,7 @@ set_rest:  var_name TO var_list_or_default
 			| SESSION AUTHORIZATION ColId_or_Sconst
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_VALUE;
 					n->name = "session_authorization";
 					n->args = list_make1(makeStringConst($3, NULL, @3));
 					$$ = n;
@@ -1792,37 +1816,28 @@ set_rest:  var_name TO var_list_or_default
 			| SESSION AUTHORIZATION DEFAULT
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_DEFAULT;
 					n->name = "session_authorization";
-					n->args = NIL;
 					$$ = n;
 				}
 			| XML_P OPTION document_or_content
 				{
 					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_SET_VALUE;
 					n->name = "xmloption";
 					n->args = list_make1(makeStringConst($3 == XMLOPTION_DOCUMENT ? "DOCUMENT" : "CONTENT", NULL, @3));
 					$$ = n;
 				}
 		;
 
-var_name:
-			ColId								{ $$ = $1; }
+var_name:	ColId								{ $$ = $1; }
 			| var_name '.' ColId
 				{
-					int qLen = strlen($1);
-					char* qualName = palloc(qLen + strlen($3) + 2);
-					strcpy(qualName, $1);
-					qualName[qLen] = '.';
-					strcpy(qualName + qLen + 1, $3);
-					$$ = qualName;
+					$$ = palloc(strlen($1) + strlen($3) + 2);
+					sprintf($$, "%s.%s", $1, $3);
 				}
 		;
 
-var_list_or_default:
-			var_list								{ $$ = $1; }
-			| DEFAULT								{ $$ = NIL; }
-		;
-
 var_list:	var_value								{ $$ = list_make1($1); }
 			| var_list ',' var_value				{ $$ = lappend($1, $3); }
 		;
@@ -1908,68 +1923,78 @@ ColId_or_Sconst:
 			| SCONST								{ $$ = $1; }
 		;
 
-
-VariableShowStmt:
-			SHOW var_name
+VariableResetStmt:
+			RESET var_name
 				{
-					VariableShowStmt *n = makeNode(VariableShowStmt);
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_RESET;
 					n->name = $2;
 					$$ = (Node *) n;
 				}
-			| SHOW TIME ZONE
+			| RESET TIME ZONE
 				{
-					VariableShowStmt *n = makeNode(VariableShowStmt);
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_RESET;
 					n->name = "timezone";
 					$$ = (Node *) n;
 				}
-			| SHOW TRANSACTION ISOLATION LEVEL
+			| RESET TRANSACTION ISOLATION LEVEL
 				{
-					VariableShowStmt *n = makeNode(VariableShowStmt);
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_RESET;
 					n->name = "transaction_isolation";
 					$$ = (Node *) n;
 				}
-			| SHOW SESSION AUTHORIZATION
+			| RESET SESSION AUTHORIZATION
 				{
-					VariableShowStmt *n = makeNode(VariableShowStmt);
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_RESET;
 					n->name = "session_authorization";
 					$$ = (Node *) n;
 				}
-			| SHOW ALL
+			| RESET ALL
 				{
-					VariableShowStmt *n = makeNode(VariableShowStmt);
-					n->name = "all";
+					VariableSetStmt *n = makeNode(VariableSetStmt);
+					n->kind = VAR_RESET_ALL;
 					$$ = (Node *) n;
 				}
 		;
 
-VariableResetStmt:
-			RESET var_name
+/* SetResetClause allows SET or RESET without LOCAL */
+SetResetClause:
+			SET set_rest					{ $$ = $2; }
+			| VariableResetStmt				{ $$ = (VariableSetStmt *) $1; }
+		;
+
+
+VariableShowStmt:
+			SHOW var_name
 				{
-					VariableResetStmt *n = makeNode(VariableResetStmt);
+					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = $2;
 					$$ = (Node *) n;
 				}
-			| RESET TIME ZONE
+			| SHOW TIME ZONE
 				{
-					VariableResetStmt *n = makeNode(VariableResetStmt);
+					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "timezone";
 					$$ = (Node *) n;
 				}
-			| RESET TRANSACTION ISOLATION LEVEL
+			| SHOW TRANSACTION ISOLATION LEVEL
 				{
-					VariableResetStmt *n = makeNode(VariableResetStmt);
+					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "transaction_isolation";
 					$$ = (Node *) n;
 				}
-			| RESET SESSION AUTHORIZATION
+			| SHOW SESSION AUTHORIZATION
 				{
-					VariableResetStmt *n = makeNode(VariableResetStmt);
+					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "session_authorization";
 					$$ = (Node *) n;
 				}
-			| RESET ALL
+			| SHOW ALL
 				{
-					VariableResetStmt *n = makeNode(VariableResetStmt);
+					VariableShowStmt *n = makeNode(VariableShowStmt);
 					n->name = "all";
 					$$ = (Node *) n;
 				}
@@ -2008,6 +2033,40 @@ CheckPointStmt:
 				}
 		;
 
+/*****************************************************************************
+ *
+ * DISCARD { ALL | TEMP | PLANS }
+ *
+ *****************************************************************************/
+
+DiscardStmt:
+			DISCARD ALL
+				{
+					DiscardStmt *n = makeNode(DiscardStmt);
+					n->target = DISCARD_ALL;
+					$$ = (Node *) n;
+				}
+			| DISCARD TEMP
+				{
+					DiscardStmt *n = makeNode(DiscardStmt);
+					n->target = DISCARD_TEMP;
+					$$ = (Node *) n;
+				}
+			| DISCARD TEMPORARY
+				{
+					DiscardStmt *n = makeNode(DiscardStmt);
+					n->target = DISCARD_TEMP;
+					$$ = (Node *) n;
+				}
+			| DISCARD PLANS
+				{
+					DiscardStmt *n = makeNode(DiscardStmt);
+					n->target = DISCARD_PLANS;
+					$$ = (Node *) n;
+				}
+		;
+
+
 /*****************************************************************************
  *
  *	ALTER [ TABLE | INDEX ] variations
@@ -2172,6 +2231,22 @@ alter_table_cmd:
 					n->name = $3;
 					$$ = (Node *)n;
 				}
+			/* ALTER TABLE <name> ENABLE ALWAYS TRIGGER <trig> */
+			| ENABLE_P ALWAYS TRIGGER name
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_EnableAlwaysTrig;
+					n->name = $4;
+					$$ = (Node *)n;
+				}
+			/* ALTER TABLE <name> ENABLE REPLICA TRIGGER <trig> */
+			| ENABLE_P REPLICA TRIGGER name
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_EnableReplicaTrig;
+					n->name = $4;
+					$$ = (Node *)n;
+				}
 			/* ALTER TABLE <name> ENABLE TRIGGER ALL */
 			| ENABLE_P TRIGGER ALL
 				{
@@ -2208,6 +2283,38 @@ alter_table_cmd:
 					n->subtype = AT_DisableTrigUser;
 					$$ = (Node *)n;
 				}
+			/* ALTER TABLE <name> ENABLE RULE <rule> */
+			| ENABLE_P RULE name
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_EnableRule;
+					n->name = $3;
+					$$ = (Node *)n;
+				}
+			/* ALTER TABLE <name> ENABLE ALWAYS RULE <rule> */
+			| ENABLE_P ALWAYS RULE name
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_EnableAlwaysRule;
+					n->name = $4;
+					$$ = (Node *)n;
+				}
+			/* ALTER TABLE <name> ENABLE REPLICA RULE <rule> */
+			| ENABLE_P REPLICA RULE name
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_EnableReplicaRule;
+					n->name = $4;
+					$$ = (Node *)n;
+				}
+			/* ALTER TABLE <name> DISABLE RULE <rule> */
+			| DISABLE_P RULE name
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					n->subtype = AT_DisableRule;
+					n->name = $3;
+					$$ = (Node *)n;
+				}
 			/* ALTER TABLE <name> INHERIT <parent> [( column_list )] */
 			| INHERIT qualified_name opt_inherited_column_list
 				{
@@ -3021,14 +3128,7 @@ alter_rel_cmd:
 		;
 
 alter_column_default:
-			SET DEFAULT a_expr
-				{
-					/* Treat SET DEFAULT NULL the same as DROP DEFAULT */
-					if (exprIsNullConstant($3))
-						$$ = NULL;
-					else
-						$$ = $3;
-				}
+			SET DEFAULT a_expr			{ $$ = $3; }
 			| DROP DEFAULT				{ $$ = NULL; }
 		;
 
@@ -3059,6 +3159,12 @@ ClosePortalStmt:
 					n->portalname = $2;
 					$$ = (Node *)n;
 				}
+			| CLOSE ALL
+				{
+					ClosePortalStmt *n = makeNode(ClosePortalStmt);
+					n->portalname = NULL;
+					$$ = (Node *)n;
+				}
 		;
 
 
@@ -3108,7 +3214,7 @@ CopyStmt:	COPY opt_binary qualified_name opt_column_list opt_oids
 				{
 					CopyStmt *n = makeNode(CopyStmt);
 					n->relation = NULL;
-					n->query = (Query *) $2;
+					n->query = $2;
 					n->attlist = NIL;
 					n->is_from = false;
 					n->filename = $4;
@@ -3481,15 +3587,7 @@ ColConstraintElem:
 					Constraint *n = makeNode(Constraint);
 					n->contype = CONSTR_DEFAULT;
 					n->name = NULL;
-					if (exprIsNullConstant($2))
-					{
-						/* DEFAULT NULL should be reported as empty expr */
-						n->raw_expr = NULL;
-					}
-					else
-					{
-						n->raw_expr = $2;
-					}
+					n->raw_expr = $2;
 					n->cooked_expr = NULL;
 					n->keys = NULL;
 					n->indexspace = NULL;
@@ -3515,9 +3613,10 @@ ColConstraintElem:
  * ConstraintAttr represents constraint attributes, which we parse as if
  * they were independent constraint clauses, in order to avoid shift/reduce
  * conflicts (since NOT might start either an independent NOT NULL clause
- * or an attribute).  analyze.c is responsible for attaching the attribute
- * information to the preceding "real" constraint node, and for complaining
- * if attribute clauses appear in the wrong place or wrong combinations.
+ * or an attribute).  parse_utilcmd.c is responsible for attaching the
+ * attribute information to the preceding "real" constraint node, and for
+ * complaining if attribute clauses appear in the wrong place or wrong
+ * combinations.
  *
  * See also ConstraintAttributeSpec, which can be used in places where
  * there is no parsing conflict.
@@ -5382,6 +5481,49 @@ DefineStmt:
 					n->ordered = false;
 					$$ = (Node *)n;
 				}
+			| CREATE TYPE_P any_name AS ENUM_P '(' enum_val_list ')'
+				{
+					CreateEnumStmt *n = makeNode(CreateEnumStmt);
+					n->typeName = $3;
+					n->vals = $7;
+					$$ = (Node *)n;
+				}
+			| CREATE TEXT_P SEARCH PARSER any_name definition
+				{
+					DefineStmt *n = makeNode(DefineStmt);
+					n->kind = OBJECT_TSPARSER;
+					n->args = NIL;
+					n->defnames = $5;
+					n->definition = $6;
+					$$ = (Node *)n;
+				}
+			| CREATE TEXT_P SEARCH DICTIONARY any_name definition
+				{
+					DefineStmt *n = makeNode(DefineStmt);
+					n->kind = OBJECT_TSDICTIONARY;
+					n->args = NIL;
+					n->defnames = $5;
+					n->definition = $6;
+					$$ = (Node *)n;
+				}
+			| CREATE TEXT_P SEARCH TEMPLATE any_name definition
+				{
+					DefineStmt *n = makeNode(DefineStmt);
+					n->kind = OBJECT_TSTEMPLATE;
+					n->args = NIL;
+					n->defnames = $5;
+					n->definition = $6;
+					$$ = (Node *)n;
+				}
+			| CREATE TEXT_P SEARCH CONFIGURATION any_name definition
+				{
+					DefineStmt *n = makeNode(DefineStmt);
+					n->kind = OBJECT_TSCONFIGURATION;
+					n->args = NIL;
+					n->defnames = $5;
+					n->definition = $6;
+					$$ = (Node *)n;
+				}
 		;
 
 opt_ordered:	ORDERED	{ $$ = TRUE; }
@@ -5444,6 +5586,12 @@ old_aggr_elem:  IDENT '=' def_arg
 				}
 		;
 
+enum_val_list:	Sconst
+				{ $$ = list_make1(makeString($1)); }
+			| enum_val_list ',' Sconst
+				{ $$ = lappend($1, makeString($3)); }
+		;
+
 
 /*****************************************************************************
  *
@@ -5705,6 +5853,10 @@ drop_type:	TABLE									{ $$ = OBJECT_TABLE; }
 			| DOMAIN_P								{ $$ = OBJECT_DOMAIN; }
 			| CONVERSION_P							{ $$ = OBJECT_CONVERSION; }
 			| SCHEMA								{ $$ = OBJECT_SCHEMA; }
+			| TEXT_P SEARCH PARSER					{ $$ = OBJECT_TSPARSER; }
+			| TEXT_P SEARCH DICTIONARY				{ $$ = OBJECT_TSDICTIONARY; }
+			| TEXT_P SEARCH TEMPLATE				{ $$ = OBJECT_TSTEMPLATE; }
+			| TEXT_P SEARCH CONFIGURATION			{ $$ = OBJECT_TSCONFIGURATION; }
 			| FILESPACE								{ $$ = OBJECT_FILESPACE; }
 			| TABLESPACE							{ $$ = OBJECT_TABLESPACE; }
 			| PROTOCOL								{ $$ = OBJECT_EXTPROTOCOL; }
@@ -5750,7 +5902,10 @@ TruncateStmt:
  *
  *	COMMENT ON [ [ DATABASE | DOMAIN | INDEX | SEQUENCE | TABLE | TYPE | VIEW |
  *				   CONVERSION | LANGUAGE | OPERATOR CLASS | LARGE OBJECT |
- *				   CAST | COLUMN | SCHEMA | TABLESPACE | ROLE ] <objname> |
+ *				   CAST | COLUMN | SCHEMA | TABLESPACE | ROLE | 
+ *				   TEXT SEARCH PARSER | TEXT SEARCH DICTIONARY |
+ *				   TEXT SEARCH TEMPLATE |
+ *				   TEXT SEARCH CONFIGURATION ] <objname> |
  *				 AGGREGATE <aggname> (arg1, ...) |
  *				 FUNCTION <funcname> (arg1, arg2, ...) |
  *				 OPERATOR <op> (leftoperand_typ, rightoperand_typ) |
@@ -5881,6 +6036,38 @@ CommentStmt:
 					n->comment = $7;
 					$$ = (Node *) n;
 				}
+			| COMMENT ON TEXT_P SEARCH PARSER any_name IS comment_text
+				{
+					CommentStmt *n = makeNode(CommentStmt);
+					n->objtype = OBJECT_TSPARSER;
+					n->objname = $6;
+					n->comment = $8;
+					$$ = (Node *) n;
+				}
+			| COMMENT ON TEXT_P SEARCH DICTIONARY any_name IS comment_text
+				{
+					CommentStmt *n = makeNode(CommentStmt);
+					n->objtype = OBJECT_TSDICTIONARY;
+					n->objname = $6;
+					n->comment = $8;
+					$$ = (Node *) n;
+				}
+			| COMMENT ON TEXT_P SEARCH TEMPLATE any_name IS comment_text
+				{
+					CommentStmt *n = makeNode(CommentStmt);
+					n->objtype = OBJECT_TSTEMPLATE;
+					n->objname = $6;
+					n->comment = $8;
+					$$ = (Node *) n;
+				}
+			| COMMENT ON TEXT_P SEARCH CONFIGURATION any_name IS comment_text
+				{
+					CommentStmt *n = makeNode(CommentStmt);
+					n->objtype = OBJECT_TSCONFIGURATION;
+					n->objname = $6;
+					n->comment = $8;
+					$$ = (Node *) n;
+				}
 		;
 
 comment_type:
@@ -6421,8 +6608,8 @@ opt_class:	any_name								{ $$ = $1; }
 		;
 
 opt_asc_desc: ASC							{ $$ = SORTBY_ASC; }
-			| DESC							{ $$ = SORTBY_DESC; }
-			| /*EMPTY*/						{ $$ = SORTBY_DEFAULT; }
+			| DESC						{ $$ = SORTBY_DESC; }
+			| /*EMPTY*/					{ $$ = SORTBY_DEFAULT; }
 		;
 
 opt_nulls_order: NULLS_FIRST				{ $$ = SORTBY_NULLS_FIRST; }
@@ -6698,6 +6885,11 @@ common_func_opt_item:
 				{
 					$$ = makeDefElem("rows", (Node *)$2);
 				}
+			| SetResetClause
+				{
+					/* we abuse the normal content of a DefElem here */
+					$$ = makeDefElem("set", (Node *)$1);
+				}
 			| NO SQL
 				{
 					$$ = makeDefElem("data_access", (Node *)makeString("none"));
@@ -7087,13 +7279,13 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name
 					n->newname = $6;
 					$$ = (Node *)n;
 				}
-			| ALTER FUNCTION func_name func_args RENAME TO name
+			| ALTER FUNCTION function_with_argtypes RENAME TO name
 				{
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_FUNCTION;
-					n->object = $3;
-					n->objarg = extractArgTypes($4);
-					n->newname = $7;
+					n->object = $3->funcname;
+					n->objarg = $3->funcargs;
+					n->newname = $6;
 					$$ = (Node *)n;
 				}
 			| ALTER GROUP_P RoleId RENAME TO RoleId
@@ -7104,12 +7296,12 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name
 					n->newname = $6;
 					$$ = (Node *)n;
 				}
-			| ALTER LANGUAGE name RENAME TO name
+			| ALTER opt_procedural LANGUAGE name RENAME TO name
 				{
 					RenameStmt *n = makeNode(RenameStmt);
 					n->renameType = OBJECT_LANGUAGE;
-					n->subname = $3;
-					n->newname = $6;
+					n->subname = $4;
+					n->newname = $7;
 					$$ = (Node *)n;
 				}
 			| ALTER OPERATOR CLASS any_name USING access_method RENAME TO name
@@ -7147,6 +7339,24 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name
 					n->newname = $6;
 					$$ = (Node *)n;
 				}
+			| ALTER SEQUENCE relation_expr RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_SEQUENCE;
+					n->relation = $3;
+					n->subname = NULL;
+					n->newname = $6;
+					$$ = (Node *)n;
+				}
+			| ALTER VIEW relation_expr RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_VIEW;
+					n->relation = $3;
+					n->subname = NULL;
+					n->newname = $6;
+					$$ = (Node *)n;
+				}
 			| ALTER INDEX relation_expr RENAME TO name
 				{
 					RenameStmt *n = makeNode(RenameStmt);
@@ -7198,6 +7408,38 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name
 					n->newname = $6;
 					$$ = (Node *)n;
 				}
+			| ALTER TEXT_P SEARCH PARSER any_name RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_TSPARSER;
+					n->object = $5;
+					n->newname = $8;
+					$$ = (Node *)n;
+				}
+			| ALTER TEXT_P SEARCH DICTIONARY any_name RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_TSDICTIONARY;
+					n->object = $5;
+					n->newname = $8;
+					$$ = (Node *)n;
+				}
+			| ALTER TEXT_P SEARCH TEMPLATE any_name RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_TSTEMPLATE;
+					n->object = $5;
+					n->newname = $8;
+					$$ = (Node *)n;
+				}
+			| ALTER TEXT_P SEARCH CONFIGURATION any_name RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_TSCONFIGURATION;
+					n->object = $5;
+					n->newname = $8;
+					$$ = (Node *)n;
+				}
 			| ALTER PROTOCOL name RENAME TO name
 				{
 					RenameStmt *n = makeNode(RenameStmt);
@@ -7206,7 +7448,6 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name
 					n->newname = $6;
 					$$ = (Node *)n;
 				}
-			
 		;
 
 opt_column: COLUMN									{ $$ = COLUMN; }
@@ -7237,13 +7478,13 @@ AlterObjectSchemaStmt:
 					n->newschema = $6;
 					$$ = (Node *)n;
 				}
-			| ALTER FUNCTION func_name func_args SET SCHEMA name
+			| ALTER FUNCTION function_with_argtypes SET SCHEMA name
 				{
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
 					n->objectType = OBJECT_FUNCTION;
-					n->object = $3;
-					n->objarg = extractArgTypes($4);
-					n->newschema = $7;
+					n->object = $3->funcname;
+					n->objarg = $3->funcargs;
+					n->newschema = $6;
 					$$ = (Node *)n;
 				}
 			| ALTER SEQUENCE relation_expr SET SCHEMA name
@@ -7319,12 +7560,20 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
 					n->newowner = $6;
 					$$ = (Node *)n;
 				}
-			| ALTER FUNCTION func_name func_args OWNER TO RoleId
+			| ALTER FUNCTION function_with_argtypes OWNER TO RoleId
 				{
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_FUNCTION;
-					n->object = $3;
-					n->objarg = extractArgTypes($4);
+					n->object = $3->funcname;
+					n->objarg = $3->funcargs;
+					n->newowner = $6;
+					$$ = (Node *)n;
+				}
+			| ALTER opt_procedural LANGUAGE name OWNER TO RoleId
+				{
+					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
+					n->objectType = OBJECT_LANGUAGE;
+					n->object = list_make1(makeString($4));
 					n->newowner = $7;
 					$$ = (Node *)n;
 				}
@@ -7387,6 +7636,22 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
 					n->newowner = $6;
 					$$ = (Node *)n;
 				}
+			| ALTER TEXT_P SEARCH DICTIONARY any_name OWNER TO RoleId
+				{
+					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
+					n->objectType = OBJECT_TSDICTIONARY;
+					n->object = $5;
+					n->newowner = $8;
+					$$ = (Node *)n;
+				}
+			| ALTER TEXT_P SEARCH CONFIGURATION any_name OWNER TO RoleId
+				{
+					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
+					n->objectType = OBJECT_TSCONFIGURATION;
+					n->object = $5;
+					n->newowner = $8;
+					$$ = (Node *)n;
+				}
 		;
 
 
@@ -7494,27 +7759,33 @@ DropRuleStmt:
  *
  *****************************************************************************/
 
-NotifyStmt: NOTIFY qualified_name
+NotifyStmt: NOTIFY ColId
 				{
 					NotifyStmt *n = makeNode(NotifyStmt);
-					n->relation = $2;
+					n->relation = makeNode(RangeVar);
+					n->relation->relname = $2;
+					n->relation->schemaname = NULL;
 					$$ = (Node *)n;
 				}
 		;
 
-ListenStmt: LISTEN qualified_name
+ListenStmt: LISTEN ColId
 				{
 					ListenStmt *n = makeNode(ListenStmt);
-					n->relation = $2;
+					n->relation = makeNode(RangeVar);
+					n->relation->relname = $2;
+					n->relation->schemaname = NULL;
 					$$ = (Node *)n;
 				}
 		;
 
 UnlistenStmt:
-			UNLISTEN qualified_name
+			UNLISTEN ColId
 				{
 					UnlistenStmt *n = makeNode(UnlistenStmt);
-					n->relation = $2;
+					n->relation = makeNode(RangeVar);
+					n->relation->relname = $2;
+					n->relation->schemaname = NULL;
 					$$ = (Node *)n;
 				}
 			| UNLISTEN '*'
@@ -7690,22 +7961,22 @@ ViewStmt: CREATE OptTemp VIEW qualified_name opt_column_list
 				{
 					ViewStmt *n = makeNode(ViewStmt);
 					n->relOid = 0;
-					n->replace = false;
 					n->view = $4;
 					n->view->istemp = $2;
 					n->aliases = $5;
-					n->query = (Query *) $7;
+					n->query = $7;
+					n->replace = false;
 					$$ = (Node *) n;
 				}
 		| CREATE OR REPLACE OptTemp VIEW qualified_name opt_column_list
 				AS SelectStmt opt_check_option
 				{
 					ViewStmt *n = makeNode(ViewStmt);
-					n->replace = true;
 					n->view = $6;
 					n->view->istemp = $4;
 					n->aliases = $7;
-					n->query = (Query *) $9;
+					n->query = $9;
+					n->replace = true;
 					$$ = (Node *) n;
 				}
 		;
@@ -7851,20 +8122,11 @@ AlterDatabaseStmt:
 		;
 
 AlterDatabaseSetStmt:
-			ALTER DATABASE database_name SET set_rest
-				{
-					AlterDatabaseSetStmt *n = makeNode(AlterDatabaseSetStmt);
-					n->dbname = $3;
-					n->variable = $5->name;
-					n->value = $5->args;
-					$$ = (Node *)n;
-				}
-			| ALTER DATABASE database_name VariableResetStmt
+			ALTER DATABASE database_name SetResetClause
 				{
 					AlterDatabaseSetStmt *n = makeNode(AlterDatabaseSetStmt);
 					n->dbname = $3;
-					n->variable = ((VariableResetStmt *)$4)->name;
-					n->value = NIL;
+					n->setstmt = $4;
 					$$ = (Node *)n;
 				}
 		;
@@ -7977,6 +8239,82 @@ opt_as:		AS										{}
 		;
 
 
+/*****************************************************************************
+ *
+ * Manipulate a text search dictionary or configuration
+ *
+ *****************************************************************************/
+
+AlterTSDictionaryStmt:
+			ALTER TEXT_P SEARCH DICTIONARY any_name definition
+				{
+					AlterTSDictionaryStmt *n = makeNode(AlterTSDictionaryStmt);
+					n->dictname = $5;
+					n->options = $6;
+					$$ = (Node *)n;
+				}
+		;
+
+AlterTSConfigurationStmt:
+			ALTER TEXT_P SEARCH CONFIGURATION any_name ADD_P MAPPING FOR name_list WITH any_name_list
+				{
+					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->cfgname = $5;
+					n->tokentype = $9;
+					n->dicts = $11;
+					n->override = false;
+					n->replace = false;
+					$$ = (Node*)n;
+				}
+			| ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list WITH any_name_list
+				{
+					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->cfgname = $5;
+					n->tokentype = $9;
+					n->dicts = $11;
+					n->override = true;
+					n->replace = false;
+					$$ = (Node*)n;
+				}
+			| ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING REPLACE any_name WITH any_name 
+				{
+					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->cfgname = $5;
+					n->tokentype = NIL;
+					n->dicts = list_make2($9,$11);
+					n->override = false;
+					n->replace = true;
+					$$ = (Node*)n;
+				}
+			| ALTER TEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list REPLACE any_name WITH any_name 
+				{
+					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->cfgname = $5;
+					n->tokentype = $9;
+					n->dicts = list_make2($11,$13);
+					n->override = false;
+					n->replace = true;
+					$$ = (Node*)n;
+				}
+			| ALTER TEXT_P SEARCH CONFIGURATION any_name DROP MAPPING FOR name_list 
+				{
+					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->cfgname = $5;
+					n->tokentype = $9;
+					n->missing_ok = false;
+					$$ = (Node*)n;
+				}
+			| ALTER TEXT_P SEARCH CONFIGURATION any_name DROP MAPPING IF_P EXISTS FOR name_list 
+				{
+					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
+					n->cfgname = $5;
+					n->tokentype = $11;
+					n->missing_ok = true;
+					$$ = (Node*)n;
+				}
+		;
+
+
 /*****************************************************************************
  *
  * Manipulate a conversion
@@ -8010,18 +8348,11 @@ CreateConversionStmt:
  *****************************************************************************/
 
 ClusterStmt:
-			CLUSTER index_name ON qualified_name
-				{
-				   ClusterStmt *n = makeNode(ClusterStmt);
-				   n->relation = $4;
-				   n->indexname = $2;
-				   $$ = (Node*)n;
-				}
-			| CLUSTER qualified_name
+			CLUSTER qualified_name cluster_index_specification
 				{
 			       ClusterStmt *n = makeNode(ClusterStmt);
 				   n->relation = $2;
-				   n->indexname = NULL;
+				   n->indexname = $3;
 				   $$ = (Node*)n;
 				}
 			| CLUSTER
@@ -8031,8 +8362,22 @@ ClusterStmt:
 				   n->indexname = NULL;
 				   $$ = (Node*)n;
 				}
+			/* kept for pre-8.3 compatibility */
+			| CLUSTER index_name ON qualified_name
+				{
+				   ClusterStmt *n = makeNode(ClusterStmt);
+				   n->relation = $4;
+				   n->indexname = $2;
+				   $$ = (Node*)n;
+				}
 		;
 
+cluster_index_specification:
+			USING index_name		{ $$ = $2; }
+			| /*EMPTY*/				{ $$ = NULL; }
+		;
+
+
 /*****************************************************************************
  *
  *		QUERY:
@@ -8164,7 +8509,7 @@ ExplainStmt: EXPLAIN opt_analyze opt_verbose opt_dxl opt_force ExplainableStmt
 						ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), 
 								errmsg("cannot use force with explain statement")
 							       ));
-					n->query = (Query*)$6;
+					n->query = $6;
 					$$ = (Node *)n;
 				}
 		;
@@ -8207,7 +8552,7 @@ PrepareStmt: PREPARE name prep_type_clause AS PreparableStmt
 					PrepareStmt *n = makeNode(PrepareStmt);
 					n->name = $2;
 					n->argtypes = $3;
-					n->query = (Query *) $5;
+					n->query = $5;
 					$$ = (Node *) n;
 				}
 		;
@@ -8278,6 +8623,18 @@ DeallocateStmt: DEALLOCATE name
 						n->name = $3;
 						$$ = (Node *) n;
 					}
+				| DEALLOCATE ALL
+					{
+						DeallocateStmt *n = makeNode(DeallocateStmt);
+						n->name = NULL;
+						$$ = (Node *) n;
+					}
+				| DEALLOCATE PREPARE ALL
+					{
+						DeallocateStmt *n = makeNode(DeallocateStmt);
+						n->name = NULL;
+						$$ = (Node *) n;
+					}
 		;
 
 /*****************************************************************************
@@ -8519,10 +8876,9 @@ DeclareCursorStmt: DECLARE name cursor_options CURSOR opt_hold FOR SelectStmt
 				{
 					DeclareCursorStmt *n = makeNode(DeclareCursorStmt);
 					n->portalname = $2;
-					n->options = $3;
+					/* currently we always set FAST_PLAN option */
+					n->options = $3 | $5 | CURSOR_OPT_FAST_PLAN;
 					n->query = $7;
-					if ($5)
-						n->options |= CURSOR_OPT_HOLD;
 					$$ = (Node *)n;
 				}
 		;
@@ -8534,9 +8890,9 @@ cursor_options: /*EMPTY*/					{ $$ = 0; }
 			| cursor_options INSENSITIVE	{ $$ = $1 | CURSOR_OPT_INSENSITIVE; }
 		;
 
-opt_hold: /* EMPTY */						{ $$ = FALSE; }
-			| WITH HOLD						{ $$ = TRUE; }
-			| WITHOUT HOLD					{ $$ = FALSE; }
+opt_hold: /* EMPTY */						{ $$ = 0; }
+			| WITH HOLD						{ $$ = CURSOR_OPT_HOLD; }
+			| WITHOUT HOLD					{ $$ = 0; }
 		;
 
 /*****************************************************************************
@@ -8858,33 +9214,15 @@ sortby:		a_expr USING qual_all_Op opt_nulls_order
 					$$->useOp = $3;
 					$$->location = @3;
 				}
-			| a_expr ASC opt_nulls_order
+			| a_expr opt_asc_desc opt_nulls_order
 				{
 					$$ = makeNode(SortBy);
 					$$->node = $1;
-					$$->sortby_dir = SORTBY_ASC;
+					$$->sortby_dir = $2;
 					$$->sortby_nulls = $3;
 					$$->useOp = NIL;
 					$$->location = -1;		/* no operator */
 				}
-			| a_expr DESC opt_nulls_order
-				{
-					$$ = makeNode(SortBy);
-					$$->node = $1;
-					$$->sortby_dir = SORTBY_DESC;
-					$$->sortby_nulls = $3;
-					$$->useOp = NIL;
-					$$->location = -1;		/* no operator */
-				}
-			| a_expr opt_nulls_order
-				{
-					$$ = makeNode(SortBy);
-					$$->node = $1;
-					$$->sortby_dir = SORTBY_DEFAULT;
-					$$->sortby_nulls = $2;
-					$$->useOp = NIL;
-					$$->location = -1;		/* no operator */
-				}
 		;
 
 select_limit:
@@ -9111,7 +9449,7 @@ window_frame_start:
 					n->val = $1;
 					$$ = (Node *)n;
 				}
-			| CURRENT ROW
+			| CURRENT_P ROW
 				{
 					WindowFrameEdge *n = makeNode(WindowFrameEdge);
 					n->kind = WINDOW_CURRENT_ROW;
@@ -9162,7 +9500,7 @@ window_frame_following: a_expr FOLLOWING
 				}
 		;
 
-window_frame_exclusion: EXCLUDE CURRENT ROW { $$ = WINDOW_EXCLUSION_CUR_ROW; }
+window_frame_exclusion: EXCLUDE CURRENT_P ROW { $$ = WINDOW_EXCLUSION_CUR_ROW; }
 			| EXCLUDE GROUP_P { $$ = WINDOW_EXCLUSION_GROUP; }
 			| EXCLUDE TIES  { $$ = WINDOW_EXCLUSION_TIES; }
 			| EXCLUDE NO OTHERS { $$ = WINDOW_EXCLUSION_NO_OTHERS; }
@@ -9557,13 +9895,24 @@ where_clause:
 
 /* variant for UPDATE and DELETE */
 where_or_current_clause:
-			where_clause							{ $$ = $1; }
-			| WHERE CURRENT OF name
+			WHERE a_expr							{ $$ = $2; }
+			| WHERE CURRENT_P OF name
 				{
 					CurrentOfExpr *n = makeNode(CurrentOfExpr);
+					/* cvarno is filled in by parse analysis */
 					n->cursor_name = $4;
+					n->cursor_param = 0;
 					$$ = (Node *) n;
 				}
+			| WHERE CURRENT_P OF PARAM
+				{
+					CurrentOfExpr *n = makeNode(CurrentOfExpr);
+					/* cvarno is filled in by parse analysis */
+					n->cursor_name = NULL;
+					n->cursor_param = $4;
+					$$ = (Node *) n;
+				}
+			| /*EMPTY*/								{ $$ = NULL; }
 		;
 
 
@@ -10609,6 +10958,28 @@ c_expr:		columnref								{ $$ = $1; }
 					n->location = @1;
 					$$ = (Node *)n;
 				}
+			| select_with_parens indirection
+				{
+					/*
+					 * Because the select_with_parens nonterminal is designed
+					 * to "eat" as many levels of parens as possible, the
+					 * '(' a_expr ')' opt_indirection production above will
+					 * fail to match a sub-SELECT with indirection decoration;
+					 * the sub-SELECT won't be regarded as an a_expr as long
+					 * as there are parens around it.  To support applying
+					 * subscripting or field selection to a sub-SELECT result,
+					 * we need this redundant-looking production.
+					 */
+					SubLink *n = makeNode(SubLink);
+					A_Indirection *a = makeNode(A_Indirection);
+					n->subLinkType = EXPR_SUBLINK;
+					n->testexpr = NULL;
+					n->operName = NIL;
+					n->subselect = $1;
+					a->arg = (Node *)n;
+					a->indirection = $2;
+					$$ = (Node *)a;
+				}
 			| EXISTS select_with_parens
 				{
 					SubLink *n = makeNode(SubLink);
@@ -12227,6 +12598,7 @@ unreserved_keyword:
 			| AGGREGATE
 			| ALSO
 			| ALTER
+			| ALWAYS
 			| ASSERTION
 			| ASSIGNMENT
 			| AT
@@ -12248,6 +12620,7 @@ unreserved_keyword:
 			| COMMIT
 			| COMMITTED
 			| CONCURRENTLY
+			| CONFIGURATION
 			| CONNECTION
 			| CONSTRAINTS
 			| CONTAINS
@@ -12261,7 +12634,7 @@ unreserved_keyword:
 			| CREATEROLE
 			| CREATEUSER
 			| CSV
-			| CURRENT
+			| CURRENT_P
 			| CURSOR
 			| CYCLE
 			| DATA_P
@@ -12276,7 +12649,9 @@ unreserved_keyword:
 			| DELIMITER
 			| DELIMITERS
 			| DENY
+			| DICTIONARY
 			| DISABLE_P
+			| DISCARD
 			| DOCUMENT_P
 			| DOMAIN_P
 			| DOUBLE_P
@@ -12346,6 +12721,7 @@ unreserved_keyword:
 			| LOCATION
 			| LOCK_P
 			| LOGIN_P
+			| MAPPING
 			| MASTER
 			| MATCH
 			| MAXVALUE
@@ -12388,11 +12764,13 @@ unreserved_keyword:
 			| OVERCOMMIT
 			| OWNED
 			| OWNER
+			| PARSER
 			| PARTIAL
 			| PARTITIONS
 			| PASSING
 			| PASSWORD
 			| PERCENT
+			| PLANS
 			| PREPARE
 			| PREPARED
 			| PRESERVE
@@ -12418,6 +12796,7 @@ unreserved_keyword:
 			| RENAME
 			| REPEATABLE
 			| REPLACE
+			| REPLICA
 			| RESET
 			| RESOURCE
 			| RESTART
@@ -12463,6 +12842,7 @@ unreserved_keyword:
 			| TEMP
 			| TEMPLATE
 			| TEMPORARY
+			| TEXT_P
 			| THRESHOLD
 			| TIES
 			| TRANSACTION
@@ -12564,7 +12944,6 @@ PartitionIdentKeyword: ABORT_P
 			| CREATEROLE
 			| CREATEUSER
 			| CSV
-			| CURRENT
 			| CURSOR
 			| CYCLE
 			| DATABASE
@@ -12585,6 +12964,7 @@ PartitionIdentKeyword: ABORT_P
 			| ENCODING
 			| ENCRYPTED
 			| ERRORS
+			| ENUM_P
 			| ESCAPE
 			| EVERY
 			| EXCHANGE
@@ -12708,6 +13088,7 @@ PartitionIdentKeyword: ABORT_P
 			| SAVEPOINT
 			| SCHEMA
 			| SCROLL
+			| SEARCH
 			| SECURITY
 			| SEGMENT
 			| SEQUENCE
@@ -13374,23 +13755,6 @@ SystemTypeName(char *name)
 											   makeString(name)));
 }
 
-/* exprIsNullConstant()
- * Test whether an a_expr is a plain NULL constant or not.
- */
-bool
-exprIsNullConstant(Node *arg)
-{
-	if (arg && IsA(arg, A_Const))
-	{
-		A_Const *con = (A_Const *) arg;
-
-		if (con->val.type == T_Null &&
-			con->typname == NULL)
-			return TRUE;
-	}
-	return FALSE;
-}
-
 /* doNegate()
  * Handle negation of a numeric constant.
  *
diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index 65bcffd1b630..ebdb8636ab08 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -3,13 +3,12 @@
  * keywords.c
  *	  lexical token lookup for key words in PostgreSQL
  *
- *
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.183 2007/01/23 05:07:18 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.194 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index a04ec8c37f03..933af273f37e 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.77 2007/02/01 19:10:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.79 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -505,7 +505,7 @@ check_ungrouped_columns_walker(Node *node,
  *
  * agg_input_types, agg_state_type, agg_result_type identify the input,
  * transition, and result types of the aggregate.  These should all be
- * resolved to actual types (ie, none should ever be ANYARRAY or ANYELEMENT).
+ * resolved to actual types (ie, none should ever be ANYELEMENT etc).
  *
  * transfn_oid and finalfn_oid identify the funcs to be called; the latter
  * may be InvalidOid.
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index e520a7df5cce..091e7234a5dc 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.164 2007/02/01 19:10:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.168 2008/01/01 19:45:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -804,8 +804,8 @@ setTargetTable(ParseState *pstate, RangeVar *relation,
 	 * Open target rel and grab suitable lock (which we will hold till end of
 	 * transaction).
 	 *
-	 * analyze.c will eventually do the corresponding heap_close(), but *not*
-	 * release the lock.
+	 * free_parsestate() will eventually do the corresponding heap_close(),
+	 * but *not* release the lock.
      *
 	 * CDB: Acquire ExclusiveLock if it is a distributed relation and we are
 	 * doing UPDATE or DELETE activity
@@ -920,7 +920,7 @@ setTargetTable(ParseState *pstate, RangeVar *relation,
  * Simplify InhOption (yes/no/default) into boolean yes/no.
  *
  * The reason we do things this way is that we don't want to examine the
- * SQL_inheritance option flag until parse_analyze is run.	Otherwise,
+ * SQL_inheritance option flag until parse_analyze() is run.	Otherwise,
  * we'd do the wrong thing with query strings that intermix SET commands
  * with queries.
  */
@@ -1144,7 +1144,6 @@ transformTableEntry(ParseState *pstate, RangeVar *r)
 static RangeTblEntry *
 transformRangeSubselect(ParseState *pstate, RangeSubselect *r)
 {
-	List	   *parsetrees;
 	Query	   *query;
 	RangeTblEntry *rte;
 
@@ -1161,16 +1160,12 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r)
 	/*
 	 * Analyze and transform the subquery.
 	 */
-	parsetrees = parse_sub_analyze(r->subquery, pstate);
+	query = parse_sub_analyze(r->subquery, pstate);
 
 	/*
-	 * Check that we got something reasonable.	Most of these conditions are
-	 * probably impossible given restrictions of the grammar, but check 'em
-	 * anyway.
+	 * Check that we got something reasonable.	Many of these conditions are
+	 * impossible given restrictions of the grammar, but check 'em anyway.
 	 */
-	if (list_length(parsetrees) != 1)
-		elog(ERROR, "unexpected parse analysis result for subquery in FROM");
-	query = (Query *) linitial(parsetrees);
 	if (!IsA(query, Query) ||
 		query->commandType != CMD_SELECT ||
 		query->utilityStmt != NULL)
@@ -3143,9 +3138,10 @@ addTargetToSortList(ParseState *pstate, TargetEntry *tle,
 										  restype,
 										  restype,
 										  false);
+
 			/*
-			 * Verify it's a valid ordering operator, and determine
-			 * whether to consider it like ASC or DESC.
+			 * Verify it's a valid ordering operator, and determine whether to
+			 * consider it like ASC or DESC.
 			 */
 			if (!get_compare_function_for_ordering_op(sortop,
 													  &cmpfunc, &reverse))
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 326a58e022c6..d55fada7a74c 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.150 2007/01/05 22:19:34 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.161.2.2 2008/12/14 19:46:02 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,9 @@ static Node *coerce_type_typmod(Node *node,
 				   CoercionForm cformat, int location,
 				   bool isExplicit, bool hideInputCoercion);
 static void hide_coercion_node(Node *node);
-static Node *build_coercion_expression(Node *node, CoercionPathType pathtype, Oid funcId,
+static Node *build_coercion_expression(Node *node,
+						  CoercionPathType pathtype,
+						  Oid funcId,
 						  Oid targetTypeId, int32 targetTypMod,
 						  CoercionForm cformat, int location,
 						  bool isExplicit);
@@ -142,18 +144,21 @@ coerce_type(ParseState *pstate, Node *node,
 	}
 	if (targetTypeId == ANYOID ||
 		targetTypeId == ANYELEMENTOID ||
-		(targetTypeId == ANYARRAYOID && inputTypeId != UNKNOWNOID))
+		targetTypeId == ANYNONARRAYOID ||
+		(targetTypeId == ANYARRAYOID && inputTypeId != UNKNOWNOID) ||
+		(targetTypeId == ANYENUMOID && inputTypeId != UNKNOWNOID))
 	{
 		/*
 		 * Assume can_coerce_type verified that implicit coercion is okay.
 		 *
 		 * Note: by returning the unmodified node here, we are saying that
 		 * it's OK to treat an UNKNOWN constant as a valid input for a
-		 * function accepting ANY or ANYELEMENT.  This should be all right,
-		 * since an UNKNOWN value is still a perfectly valid Datum.  However
-		 * an UNKNOWN value is definitely *not* an array, and so we mustn't
-		 * accept it for ANYARRAY.  (Instead, we will call anyarray_in below,
-		 * which will produce an error.)
+		 * function accepting ANY, ANYELEMENT, or ANYNONARRAY.	This should be
+		 * all right, since an UNKNOWN value is still a perfectly valid Datum.
+		 * However an UNKNOWN value is definitely *not* an array, and so we
+		 * mustn't accept it for ANYARRAY.  (Instead, we will call anyarray_in
+		 * below, which will produce an error.)  Likewise, UNKNOWN input is no
+		 * good for ANYENUM.
 		 *
 		 * NB: we do NOT want a RelabelType here.
 		 */
@@ -223,6 +228,7 @@ coerce_type(ParseState *pstate, Node *node,
 		targetType = typeidType(baseTypeId);
 
 		newcon->consttype = baseTypeId;
+		newcon->consttypmod = -1;
 		newcon->constlen = typeLen(targetType);
 		newcon->constbyval = typeByVal(targetType);
 		newcon->constisnull = con->constisnull;
@@ -318,12 +324,13 @@ coerce_type(ParseState *pstate, Node *node,
 		}
 
 		param->paramtype = targetTypeId;
+
 		/*
 		 * Note: it is tempting here to set the Param's paramtypmod to
 		 * targetTypeMod, but that is probably unwise because we have no
-		 * infrastructure that enforces that the value delivered for a
-		 * Param will match any particular typmod.  Leaving it -1 ensures
-		 * that a run-time length check/coercion will occur if needed.
+		 * infrastructure that enforces that the value delivered for a Param
+		 * will match any particular typmod.  Leaving it -1 ensures that a
+		 * run-time length check/coercion will occur if needed.
 		 */
 		param->paramtypmod = -1;
 
@@ -334,6 +341,11 @@ coerce_type(ParseState *pstate, Node *node,
 
 		return (Node *) param;
 	}
+
+	/*
+	 * GPDB_MERGE83_FIXME: This is still required but should be on the list
+	 * for cleaning up. Can we do this more efficiently?
+	 */
 	if (pstate != NULL && inputTypeId == UNKNOWNOID && IsA(node, Var))
 	{
         /*
@@ -396,11 +408,11 @@ coerce_type(ParseState *pstate, Node *node,
 			fe->location = location;
 
 			return (Node *)fe;
-
 		}
 	}
+
 	pathtype = find_coercion_pathway(targetTypeId, inputTypeId, ccontext,
-							  &funcId);
+									 &funcId);
 	if (pathtype != COERCION_PATH_NONE)
 	{
 		if (pathtype != COERCION_PATH_RELABELTYPE)
@@ -775,13 +787,13 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *target_typeids,
 {
 	bool		have_generics = false;
 	int			i;
-	CoercionPathType	pathtype;
 
 	/* run through argument list... */
 	for (i = 0; i < nargs; i++)
 	{
 		Oid			inputTypeId = input_typeids[i];
 		Oid			targetTypeId = target_typeids[i];
+		CoercionPathType pathtype;
 		Oid			funcId;
 
 		/* no problem if same type */
@@ -807,9 +819,8 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *target_typeids,
 		if (targetTypeId == ANYOID)
 			continue;
 
-		/* accept if target is ANYARRAY or ANYELEMENT, for now */
-		if (targetTypeId == ANYARRAYOID ||
-			targetTypeId == ANYELEMENTOID)
+		/* accept if target is polymorphic, for now */
+		if (IsPolymorphicType(targetTypeId))
 		{
 			have_generics = true;		/* do more checking later */
 			continue;
@@ -827,7 +838,7 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *target_typeids,
 		 * both binary-compatible and coercion-function cases.
 		 */
 		pathtype = find_coercion_pathway(targetTypeId, inputTypeId, ccontext,
-								  &funcId);
+										 &funcId);
 		if (pathtype != COERCION_PATH_NONE)
 			continue;
 
@@ -968,8 +979,8 @@ coerce_type_typmod(Node *node, Oid targetTypeId, int32 targetTypMod,
 				   CoercionForm cformat, int location,
 				   bool isExplicit, bool hideInputCoercion)
 {
+	CoercionPathType pathtype;
 	Oid			funcId;
-	CoercionPathType	pathtype;
 
 	/*
 	 * A negative typmod is assumed to mean that no coercion is wanted. Also,
@@ -1012,10 +1023,10 @@ hide_coercion_node(Node *node)
 		((FuncExpr *) node)->funcformat = COERCE_IMPLICIT_CAST;
 	else if (IsA(node, RelabelType))
 		((RelabelType *) node)->relabelformat = COERCE_IMPLICIT_CAST;
-	else if (IsA(node, ArrayCoerceExpr))
-		((ArrayCoerceExpr *) node)->coerceformat = COERCE_IMPLICIT_CAST;
 	else if (IsA(node, CoerceViaIO))
 		((CoerceViaIO *) node)->coerceformat = COERCE_IMPLICIT_CAST;
+	else if (IsA(node, ArrayCoerceExpr))
+		((ArrayCoerceExpr *) node)->coerceformat = COERCE_IMPLICIT_CAST;
 	else if (IsA(node, ConvertRowtypeExpr))
 		((ConvertRowtypeExpr *) node)->convertformat = COERCE_IMPLICIT_CAST;
 	else if (IsA(node, RowExpr))
@@ -1028,33 +1039,29 @@ hide_coercion_node(Node *node)
 
 /*
  * build_coercion_expression()
- *Construct an expression tree for applying a pg_cast entry.
+ *		Construct an expression tree for applying a pg_cast entry.
  *
  * This is used for both type-coercion and length-coercion operations,
  * since there is no difference in terms of the calling convention.
  */
 static Node *
-build_coercion_expression(Node *node, CoercionPathType pathtype, Oid funcId,
+build_coercion_expression(Node *node,
+						  CoercionPathType pathtype,
+						  Oid funcId,
 						  Oid targetTypeId, int32 targetTypMod,
 						  CoercionForm cformat, int location,
 						  bool isExplicit)
 {
-	int		 nargs = 0;
+	int			nargs = 0;
 
 	if (OidIsValid(funcId))
 	{
-		HeapTuple   tp;
+		HeapTuple	tp;
 		Form_pg_proc procstruct;
-		cqContext  *pcqCtx;
-
-		pcqCtx = caql_beginscan(
-							NULL,
-							cql("SELECT * FROM pg_proc "
-								" WHERE oid = :1 ",
-								ObjectIdGetDatum(funcId)));
-
-		tp = caql_getnext(pcqCtx);
 
+		tp = SearchSysCache(PROCOID,
+							ObjectIdGetDatum(funcId),
+							0, 0, 0);
 		if (!HeapTupleIsValid(tp))
 			elog(ERROR, "cache lookup failed for function %u", funcId);
 		procstruct = (Form_pg_proc) GETSTRUCT(tp);
@@ -1074,7 +1081,7 @@ build_coercion_expression(Node *node, CoercionPathType pathtype, Oid funcId,
 		Assert(nargs < 2 || procstruct->proargtypes.values[1] == INT4OID);
 		Assert(nargs < 3 || procstruct->proargtypes.values[2] == BOOLOID);
 
-		caql_endscan(pcqCtx);
+		ReleaseSysCache(tp);
 	}
 
 	if (pathtype == COERCION_PATH_FUNC)
@@ -1082,7 +1089,7 @@ build_coercion_expression(Node *node, CoercionPathType pathtype, Oid funcId,
 		/* We build an ordinary FuncExpr with special arguments */
 		FuncExpr   *fexpr;
 		List	   *args;
-		Const	  *cons;
+		Const	   *cons;
 
 		Assert(OidIsValid(funcId));
 
@@ -1126,10 +1133,11 @@ build_coercion_expression(Node *node, CoercionPathType pathtype, Oid funcId,
 		acoerce->arg = (Expr *) node;
 		acoerce->elemfuncid = funcId;
 		acoerce->resulttype = targetTypeId;
+
 		/*
 		 * Label the output as having a particular typmod only if we are
-		 * really invoking a length-coercion function, ie one with more
-		 * than one argument.
+		 * really invoking a length-coercion function, ie one with more than
+		 * one argument.
 		 */
 		acoerce->resulttypmod = (nargs >= 2) ? targetTypMod : -1;
 		acoerce->isExplicit = isExplicit;
@@ -1141,17 +1149,20 @@ build_coercion_expression(Node *node, CoercionPathType pathtype, Oid funcId,
 	{
 		/* We need to build a CoerceViaIO node */
 		CoerceViaIO *iocoerce = makeNode(CoerceViaIO);
+
 		Assert(!OidIsValid(funcId));
+
 		iocoerce->arg = (Expr *) node;
 		iocoerce->resulttype = targetTypeId;
 		iocoerce->coerceformat = cformat;
+
 		return (Node *) iocoerce;
 	}
 	else
 	{
 		elog(ERROR, "unsupported pathtype %d in build_coercion_expression",
-			(int) pathtype);
-		return NULL;
+			 (int) pathtype);
+		return NULL;			/* keep compiler quiet */
 	}
 }
 
@@ -1367,7 +1378,7 @@ coerce_to_specific_type(ParseState *pstate, Node *node,
  *		This is used for determining the output type of CASE and UNION
  *		constructs.
  *
- * typeids is a nonempty list of type OIDs.  Note that earlier items
+ * 'typeids' is a nonempty list of type OIDs.  Note that earlier items
  * in the list will be preferred if there is doubt.
  * 'context' is a phrase to use in the error message if we fail to select
  * a usable type.  Pass NULL to have the routine return InvalidOid
@@ -1381,7 +1392,28 @@ select_common_type(List *typeids, const char *context)
 	ListCell   *type_item;
 
 	Assert(typeids != NIL);
-	ptype = getBaseType(linitial_oid(typeids));
+	ptype = linitial_oid(typeids);
+
+	/*
+	 * If all input types are valid and exactly the same, just pick that type.
+	 * This is the only way that we will resolve the result as being a domain
+	 * type; otherwise domains are smashed to their base types for comparison.
+	 */
+	if (ptype != UNKNOWNOID)
+	{
+		for_each_cell(type_item, lnext(list_head(typeids)))
+		{
+			Oid		ntype = lfirst_oid(type_item);
+
+			if (ntype != ptype)
+				break;
+		}
+		if (type_item == NULL)			/* got to the end of the list? */
+			return ptype;
+	}
+
+	/* Nope, so set up for the full algorithm */
+	ptype = getBaseType(ptype);
 	pcategory = TypeCategory(ptype);
 
 	for_each_cell(type_item, lnext(list_head(typeids)))
@@ -1389,11 +1421,11 @@ select_common_type(List *typeids, const char *context)
 		Oid			ntype = getBaseType(lfirst_oid(type_item));
 
 		/* move on to next one if no new information... */
-		if ((ntype != InvalidOid) && (ntype != UNKNOWNOID) && (ntype != ptype))
+		if (ntype != UNKNOWNOID && ntype != ptype)
 		{
-			if ((ptype == InvalidOid) || ptype == UNKNOWNOID)
+			if (ptype == UNKNOWNOID)
 			{
-				/* so far, only nulls so take anything... */
+				/* so far, only unknowns so take anything... */
 				ptype = ntype;
 				pcategory = TypeCategory(ptype);
 			}
@@ -1490,9 +1522,16 @@ coerce_to_common_type(ParseState *pstate, Node *node,
  * 3) If there are arguments of both ANYELEMENT and ANYARRAY, make sure
  *	  the actual ANYELEMENT datatype is in fact the element type for
  *	  the actual ANYARRAY datatype.
+ * 4) ANYENUM is treated the same as ANYELEMENT except that if it is used
+ *	  (alone or in combination with plain ANYELEMENT), we add the extra
+ *	  condition that the ANYELEMENT type must be an enum.
+ * 5) ANYNONARRAY is treated the same as ANYELEMENT except that if it is used,
+ *	  we add the extra condition that the ANYELEMENT type must not be an array.
+ *	  (This is a no-op if used in combination with ANYARRAY or ANYENUM, but
+ *	  is an extra restriction if not.)
  *
- * If we have UNKNOWN input (ie, an untyped literal) for any ANYELEMENT
- * or ANYARRAY argument, assume it is okay.
+ * If we have UNKNOWN input (ie, an untyped literal) for any polymorphic
+ * argument, assume it is okay.
  *
  * If an input is of type ANYARRAY (ie, we know it's an array, but not
  * what element type), we will accept it as a match to an argument declared
@@ -1512,25 +1551,34 @@ check_generic_type_consistency(Oid *actual_arg_types,
 	Oid			array_typeid = InvalidOid;
 	Oid			array_typelem;
 	bool		have_anyelement = false;
+	bool		have_anynonarray = false;
+	bool		have_anyenum = false;
 
 	/*
-	 * Loop through the arguments to see if we have any that are ANYARRAY or
-	 * ANYELEMENT. If so, require the actual types to be self-consistent
+	 * Loop through the arguments to see if we have any that are polymorphic.
+	 * If so, require the actual types to be consistent.
 	 */
 	for (j = 0; j < nargs; j++)
 	{
+		Oid			decl_type = declared_arg_types[j];
 		Oid			actual_type = actual_arg_types[j];
 
-		if (declared_arg_types[j] == ANYELEMENTOID)
+		if (decl_type == ANYELEMENTOID ||
+			decl_type == ANYNONARRAYOID ||
+			decl_type == ANYENUMOID)
 		{
 			have_anyelement = true;
+			if (decl_type == ANYNONARRAYOID)
+				have_anynonarray = true;
+			else if (decl_type == ANYENUMOID)
+				have_anyenum = true;
 			if (actual_type == UNKNOWNOID)
 				continue;
 			if (OidIsValid(elem_typeid) && actual_type != elem_typeid)
 				return false;
 			elem_typeid = actual_type;
 		}
-		else if (declared_arg_types[j] == ANYARRAYOID)
+		else if (decl_type == ANYARRAYOID)
 		{
 			if (actual_type == UNKNOWNOID)
 				continue;
@@ -1569,6 +1617,20 @@ check_generic_type_consistency(Oid *actual_arg_types,
 		}
 	}
 
+	if (have_anynonarray)
+	{
+		/* require the element type to not be an array */
+		if (type_is_array(elem_typeid))
+			return false;
+	}
+
+	if (have_anyenum)
+	{
+		/* require the element type to be an enum */
+		if (!type_is_enum(elem_typeid))
+			return false;
+	}
+
 	/* Looks valid */
 	return true;
 }
@@ -1578,18 +1640,18 @@ check_generic_type_consistency(Oid *actual_arg_types,
  *		Make sure a polymorphic function is legally callable, and
  *		deduce actual argument and result types.
  *
- * If ANYARRAY or ANYELEMENT is used for a function's arguments or
+ * If any polymorphic pseudotype is used in a function's arguments or
  * return type, we make sure the actual data types are consistent with
  * each other. The argument consistency rules are shown above for
  * check_generic_type_consistency().
  *
- * If we have UNKNOWN input (ie, an untyped literal) for any ANYELEMENT
- * or ANYARRAY argument, we attempt to deduce the actual type it should
- * have.  If successful, we alter that position of declared_arg_types[]
- * so that make_fn_arguments will coerce the literal to the right thing.
+ * If we have UNKNOWN input (ie, an untyped literal) for any polymorphic
+ * argument, we attempt to deduce the actual type it should have.  If
+ * successful, we alter that position of declared_arg_types[] so that
+ * make_fn_arguments will coerce the literal to the right thing.
  *
  * Rules are applied to the function's return type (possibly altering it)
- * if it is declared ANYARRAY or ANYELEMENT:
+ * if it is declared as a polymorphic type:
  *
  * 1) If return type is ANYARRAY, and any argument is ANYARRAY, use the
  *	  argument's actual type as the function's return type.
@@ -1609,12 +1671,36 @@ check_generic_type_consistency(Oid *actual_arg_types,
  * 6) If return type is ANYELEMENT, no argument is ANYARRAY or ANYELEMENT,
  *	  generate an ERROR. This condition is prevented by CREATE FUNCTION
  *	  and is therefore not expected here.
+ * 7) ANYENUM is treated the same as ANYELEMENT except that if it is used
+ *	  (alone or in combination with plain ANYELEMENT), we add the extra
+ *	  condition that the ANYELEMENT type must be an enum.
+ * 8) ANYNONARRAY is treated the same as ANYELEMENT except that if it is used,
+ *	  we add the extra condition that the ANYELEMENT type must not be an array.
+ *	  (This is a no-op if used in combination with ANYARRAY or ANYENUM, but
+ *	  is an extra restriction if not.)
+ *
+ * When allow_poly is false, we are not expecting any of the actual_arg_types
+ * to be polymorphic, and we should not return a polymorphic result type
+ * either.  When allow_poly is true, it is okay to have polymorphic "actual"
+ * arg types, and we can return ANYARRAY or ANYELEMENT as the result.  (This
+ * case is currently used only to check compatibility of an aggregate's
+ * declaration with the underlying transfn.)
+ *
+ * A special case is that we could see ANYARRAY as an actual_arg_type even
+ * when allow_poly is false (this is possible only because pg_statistic has
+ * columns shown as anyarray in the catalogs).  We allow this to match a
+ * declared ANYARRAY argument, but only if there is no ANYELEMENT argument
+ * or result (since we can't determine a specific element type to match to
+ * ANYELEMENT).  Note this means that functions taking ANYARRAY had better
+ * behave sanely if applied to the pg_statistic columns; they can't just
+ * assume that successive inputs are of the same actual element type.
  */
 Oid
 enforce_generic_type_consistency(Oid *actual_arg_types,
 								 Oid *declared_arg_types,
 								 int nargs,
-								 Oid rettype)
+								 Oid rettype,
+								 bool allow_poly)
 {
 	int			j;
 	bool		have_generics = false;
@@ -1622,24 +1708,37 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 	Oid			elem_typeid = InvalidOid;
 	Oid			array_typeid = InvalidOid;
 	Oid			array_typelem;
-	bool		have_anyelement = (rettype == ANYELEMENTOID);
+	bool		have_anyelement = (rettype == ANYELEMENTOID ||
+								   rettype == ANYNONARRAYOID ||
+								   rettype == ANYENUMOID);
+	bool		have_anynonarray = (rettype == ANYNONARRAYOID);
+	bool		have_anyenum = (rettype == ANYENUMOID);
 
 	/*
-	 * Loop through the arguments to see if we have any that are ANYARRAY or
-	 * ANYELEMENT. If so, require the actual types to be self-consistent
+	 * Loop through the arguments to see if we have any that are polymorphic.
+	 * If so, require the actual types to be consistent.
 	 */
 	for (j = 0; j < nargs; j++)
 	{
+		Oid			decl_type = declared_arg_types[j];
 		Oid			actual_type = actual_arg_types[j];
 
-		if (declared_arg_types[j] == ANYELEMENTOID)
+		if (decl_type == ANYELEMENTOID ||
+			decl_type == ANYNONARRAYOID ||
+			decl_type == ANYENUMOID)
 		{
 			have_generics = have_anyelement = true;
+			if (decl_type == ANYNONARRAYOID)
+				have_anynonarray = true;
+			else if (decl_type == ANYENUMOID)
+				have_anyenum = true;
 			if (actual_type == UNKNOWNOID)
 			{
 				have_unknowns = true;
 				continue;
 			}
+			if (allow_poly && decl_type == actual_type)
+				continue;		/* no new information here */
 			if (OidIsValid(elem_typeid) && actual_type != elem_typeid)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -1649,7 +1748,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 								   format_type_be(actual_type))));
 			elem_typeid = actual_type;
 		}
-		else if (declared_arg_types[j] == ANYARRAYOID)
+		else if (decl_type == ANYARRAYOID)
 		{
 			have_generics = true;
 			if (actual_type == UNKNOWNOID)
@@ -1657,6 +1756,8 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 				have_unknowns = true;
 				continue;
 			}
+			if (allow_poly && decl_type == actual_type)
+				continue;		/* no new information here */
 			if (OidIsValid(array_typeid) && actual_type != array_typeid)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -1669,8 +1770,8 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 	}
 
 	/*
-	 * Fast Track: if none of the arguments are ANYARRAY or ANYELEMENT, return
-	 * the unmodified rettype.
+	 * Fast Track: if none of the arguments are polymorphic, return the
+	 * unmodified rettype.	We assume it can't be polymorphic either.
 	 */
 	if (!have_generics)
 		return rettype;
@@ -1713,10 +1814,38 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 	}
 	else if (!OidIsValid(elem_typeid))
 	{
-		/* Only way to get here is if all the generic args are UNKNOWN */
-		ereport(ERROR,
-				(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 errmsg("could not determine anyarray/anyelement type because input has type \"unknown\"")));
+		if (allow_poly)
+		{
+			array_typeid = ANYARRAYOID;
+			elem_typeid = ANYELEMENTOID;
+		}
+		else
+		{
+			/* Only way to get here is if all the generic args are UNKNOWN */
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("could not determine polymorphic type because input has type \"unknown\"")));
+		}
+	}
+
+	if (have_anynonarray && elem_typeid != ANYELEMENTOID)
+	{
+		/* require the element type to not be an array */
+		if (type_is_array(elem_typeid))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+				   errmsg("type matched to anynonarray is an array type: %s",
+						  format_type_be(elem_typeid))));
+	}
+
+	if (have_anyenum && elem_typeid != ANYELEMENTOID)
+	{
+		/* require the element type to be an enum */
+		if (!type_is_enum(elem_typeid))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("type matched to anyenum is not an enum type: %s",
+							format_type_be(elem_typeid))));
 	}
 
 	/*
@@ -1726,14 +1855,17 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 	{
 		for (j = 0; j < nargs; j++)
 		{
+			Oid			decl_type = declared_arg_types[j];
 			Oid			actual_type = actual_arg_types[j];
 
 			if (actual_type != UNKNOWNOID)
 				continue;
 
-			if (declared_arg_types[j] == ANYELEMENTOID)
+			if (decl_type == ANYELEMENTOID ||
+				decl_type == ANYNONARRAYOID ||
+				decl_type == ANYENUMOID)
 				declared_arg_types[j] = elem_typeid;
-			else if (declared_arg_types[j] == ANYARRAYOID)
+			else if (decl_type == ANYARRAYOID)
 			{
 				if (!OidIsValid(array_typeid))
 				{
@@ -1749,7 +1881,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 		}
 	}
 
-	/* if we return ANYARRAYOID use the appropriate argument type */
+	/* if we return ANYARRAY use the appropriate argument type */
 	if (rettype == ANYARRAYOID)
 	{
 		if (!OidIsValid(array_typeid))
@@ -1764,8 +1896,10 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 		return array_typeid;
 	}
 
-	/* if we return ANYELEMENTOID use the appropriate argument type */
-	if (rettype == ANYELEMENTOID)
+	/* if we return ANYELEMENT use the appropriate argument type */
+	if (rettype == ANYELEMENTOID ||
+		rettype == ANYNONARRAYOID ||
+		rettype == ANYENUMOID)
 		return elem_typeid;
 
 	/* we don't return a generic type; send back the original return type */
@@ -1775,7 +1909,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
 /*
  * resolve_generic_type()
  *		Deduce an individual actual datatype on the assumption that
- *		the rules for ANYARRAY/ANYELEMENT are being followed.
+ *		the rules for polymorphic types are being followed.
  *
  * declared_type is the declared datatype we want to resolve.
  * context_actual_type is the actual input datatype to some argument
@@ -1804,7 +1938,9 @@ resolve_generic_type(Oid declared_type,
 								format_type_be(context_actual_type))));
 			return context_actual_type;
 		}
-		else if (context_declared_type == ANYELEMENTOID)
+		else if (context_declared_type == ANYELEMENTOID ||
+				 context_declared_type == ANYNONARRAYOID ||
+				 context_declared_type == ANYENUMOID)
 		{
 			/* Use the array type corresponding to actual type */
 			Oid			array_typeid = get_array_type(context_actual_type);
@@ -1817,7 +1953,9 @@ resolve_generic_type(Oid declared_type,
 			return array_typeid;
 		}
 	}
-	else if (declared_type == ANYELEMENTOID)
+	else if (declared_type == ANYELEMENTOID ||
+			 declared_type == ANYNONARRAYOID ||
+			 declared_type == ANYENUMOID)
 	{
 		if (context_declared_type == ANYARRAYOID)
 		{
@@ -1831,7 +1969,9 @@ resolve_generic_type(Oid declared_type,
 								format_type_be(context_actual_type))));
 			return array_typelem;
 		}
-		else if (context_declared_type == ANYELEMENTOID)
+		else if (context_declared_type == ANYELEMENTOID ||
+				 context_declared_type == ANYNONARRAYOID ||
+				 context_declared_type == ANYENUMOID)
 		{
 			/* Use the actual type; it doesn't matter if array or not */
 			return context_actual_type;
@@ -1844,7 +1984,7 @@ resolve_generic_type(Oid declared_type,
 	}
 	/* If we get here, declared_type is polymorphic and context isn't */
 	/* NB: this is a calling-code logic error, not a user error */
-	elog(ERROR, "could not determine ANYARRAY/ANYELEMENT type because context isn't polymorphic");
+	elog(ERROR, "could not determine polymorphic type because context isn't polymorphic");
 	return InvalidOid;			/* keep compiler quiet */
 }
 
@@ -1889,6 +2029,8 @@ TypeCategory(Oid inType)
 		case (REGOPERATOROID):
 		case (REGCLASSOID):
 		case (REGTYPEOID):
+		case (REGCONFIGOID):
+		case (REGDICTIONARYOID):
 		case (INT2OID):
 		case (INT4OID):
 		case (INT8OID):
@@ -1945,6 +2087,8 @@ TypeCategory(Oid inType)
 		case (INTERNALOID):
 		case (OPAQUEOID):
 		case (ANYELEMENTOID):
+		case (ANYNONARRAYOID):
+		case (ANYENUMOID):
 			result = GENERIC_TYPE;
 			break;
 
@@ -2006,7 +2150,9 @@ IsPreferredType(CATEGORY category, Oid type)
 				type == REGOPEROID ||
 				type == REGOPERATOROID ||
 				type == REGCLASSOID ||
-				type == REGTYPEOID)
+				type == REGTYPEOID ||
+				type == REGCONFIGOID ||
+				type == REGDICTIONARYOID)
 				preftype = OIDOID;
 			else
 				preftype = FLOAT8OID;
@@ -2088,7 +2234,17 @@ IsBinaryCoercible(Oid srctype, Oid targettype)
 
 	/* Also accept any array type as coercible to ANYARRAY */
 	if (targettype == ANYARRAYOID)
-		if (OidIsValid(get_element_type(srctype)))
+		if (type_is_array(srctype))
+			return true;
+
+	/* Also accept any non-array type as coercible to ANYNONARRAY */
+	if (targettype == ANYNONARRAYOID)
+		if (!type_is_array(srctype))
+			return true;
+
+	/* Also accept any enum type as coercible to ANYENUM */
+	if (targettype == ANYENUMOID)
+		if (type_is_enum(srctype))
 			return true;
 
 	/* Else look in pg_cast */
@@ -2119,22 +2275,25 @@ IsBinaryCoercible(Oid srctype, Oid targettype)
  * find_coercion_pathway
  *		Look for a coercion pathway between two types.
  *
+ * Currently, this deals only with scalar-type cases; it does not consider
+ * polymorphic types nor casts between composite types.  (Perhaps fold
+ * those in someday?)
+ *
  * ccontext determines the set of available casts.
  *
  * The possible result codes are:
- *  COERCION_PATH_NONE: failed to find any coercion pathway
- *              *funcid is set to InvalidOid
- *  COERCION_PATH_FUNC: apply the coercion function returned in *funcid
- *  COERCION_PATH_RELABELTYPE: binary-compatible cast, no function needed
- *              *funcid is set to InvalidOid
- *  COERCION_PATH_ARRAYCOERCE: need an ArrayCoerceExpr node
- *              *funcid is set to the element cast function, or InvalidOid
- *              if the array elements are binary-compatible
- *  COERCION_PATH_COERCEVIAIO: need a CoerceViaIO node
- *              *funcid is set to InvalidOid
+ *	COERCION_PATH_NONE: failed to find any coercion pathway
+ *				*funcid is set to InvalidOid
+ *	COERCION_PATH_FUNC: apply the coercion function returned in *funcid
+ *	COERCION_PATH_RELABELTYPE: binary-compatible cast, no function needed
+ *				*funcid is set to InvalidOid
+ *	COERCION_PATH_ARRAYCOERCE: need an ArrayCoerceExpr node
+ *				*funcid is set to the element cast function, or InvalidOid
+ *				if the array elements are binary-compatible
+ *	COERCION_PATH_COERCEVIAIO: need a CoerceViaIO node
+ *				*funcid is set to InvalidOid
  *
  * Note: COERCION_PATH_RELABELTYPE does not necessarily mean that no work is
- * coercion.
  * needed to do the coercion; if the target is a domain then we may need to
  * apply domain constraint checking.  If you want to check for a zero-effort
  * conversion then use IsBinaryCoercible().
@@ -2144,9 +2303,9 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
 					  CoercionContext ccontext,
 					  Oid *funcid)
 {
+	CoercionPathType result = COERCION_PATH_NONE;
 	HeapTuple	tuple;
 	cqContext  *pcqCtx;
-	CoercionPathType result = COERCION_PATH_NONE;
 
 	*funcid = InvalidOid;
 
@@ -2213,7 +2372,7 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
 		/*
 		 * If there's no pg_cast entry, perhaps we are dealing with a pair of
 		 * array types.  If so, and if the element types have a suitable cast,
-		 * use array_type_coerce() or array_type_length_coerce().
+		 * report that we can coerce with an ArrayCoerceExpr.
 		 *
 		 * Hack: disallow coercions to oidvector and int2vector, which
 		 * otherwise tend to capture coercions that should go to "real" array
@@ -2222,43 +2381,42 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
 		 * guaranteed to produce an output that meets the restrictions of
 		 * these datatypes, such as being 1-dimensional.)
 		 */
-		Oid			targetElemType;
-		Oid			sourceElemType;
-		Oid			elemfuncid;
-		CoercionPathType elempathtype = COERCION_PATH_NONE;
-
-		if (targetTypeId == OIDVECTOROID || targetTypeId == INT2VECTOROID)
-		{
-			caql_endscan(pcqCtx);
-			return COERCION_PATH_NONE;
-		}
-
-		if ((targetElemType = get_element_type(targetTypeId)) != InvalidOid &&
-			(sourceElemType = get_element_type(sourceTypeId)) != InvalidOid)
+		if (targetTypeId != OIDVECTOROID && targetTypeId != INT2VECTOROID)
 		{
-			elempathtype = find_coercion_pathway(targetElemType, sourceElemType,
-									  ccontext, &elemfuncid);
+			Oid			targetElem;
+			Oid			sourceElem;
 
-			if (elempathtype != COERCION_PATH_NONE && elempathtype != COERCION_PATH_ARRAYCOERCE)
+			if ((targetElem = get_element_type(targetTypeId)) != InvalidOid &&
+				(sourceElem = get_element_type(sourceTypeId)) != InvalidOid)
 			{
-				*funcid = elemfuncid;
-				if (elempathtype == COERCION_PATH_COERCEVIAIO)
-					result = COERCION_PATH_COERCEVIAIO;
-				else
-					result = COERCION_PATH_ARRAYCOERCE;
+				CoercionPathType elempathtype;
+				Oid			elemfuncid;
+
+				elempathtype = find_coercion_pathway(targetElem,
+													 sourceElem,
+													 ccontext,
+													 &elemfuncid);
+				if (elempathtype != COERCION_PATH_NONE &&
+					elempathtype != COERCION_PATH_ARRAYCOERCE)
+				{
+					*funcid = elemfuncid;
+					if (elempathtype == COERCION_PATH_COERCEVIAIO)
+						result = COERCION_PATH_COERCEVIAIO;
+					else
+						result = COERCION_PATH_ARRAYCOERCE;
+				}
 			}
 		}
 
 		/*
 		 * If we still haven't found a possibility, consider automatic casting
 		 * using I/O functions.  We allow assignment casts to textual types
-		 * and explicit casts from textual types to be handled this way.
-		 * (The CoerceViaIO mechanism is a lot more general than that, but
-		 * this is all we want to allow in the absence of a pg_cast entry.)
-		 * It would probably be better to insist on explicit casts in both
-		 * directions, but this is a compromise to preserve something of the
-		 * pre-8.3 behavior that many types had implicit casts to
-		 * text.
+		 * and explicit casts from textual types to be handled this way. (The
+		 * CoerceViaIO mechanism is a lot more general than that, but this is
+		 * all we want to allow in the absence of a pg_cast entry.) It would
+		 * probably be better to insist on explicit casts in both directions,
+		 * but this is a compromise to preserve something of the pre-8.3
+		 * behavior that many types had implicit (yipes!) casts to text.
 		 */
 		if (result == COERCION_PATH_NONE)
 		{
@@ -2273,7 +2431,6 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
 					  sourceTypeId == BPCHAROID))
 				result = COERCION_PATH_COERCEVIAIO;
 		}
-
 	}
 	caql_endscan(pcqCtx);
 	return result;
@@ -2295,18 +2452,21 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
  *
  * We use the same result enum as find_coercion_pathway, but the only possible
  * result codes are:
- *  COERCION_PATH_NONE: no length coercion needed
- *  COERCION_PATH_FUNC: apply the function returned in *funcid
- *  COERCION_PATH_ARRAYCOERCE: apply the function using ArrayCoerceExpr
-*/
+ *	COERCION_PATH_NONE: no length coercion needed
+ *	COERCION_PATH_FUNC: apply the function returned in *funcid
+ *	COERCION_PATH_ARRAYCOERCE: apply the function using ArrayCoerceExpr
+ */
 CoercionPathType
-find_typmod_coercion_function(Oid typeId, Oid *funcid)
+find_typmod_coercion_function(Oid typeId,
+							  Oid *funcid)
 {
+	CoercionPathType result;
 	Type		targetType;
 	Form_pg_type typeForm;
-	CoercionPathType	result = COERCION_PATH_FUNC;
+	HeapTuple	tuple;
 
 	*funcid = InvalidOid;
+	result = COERCION_PATH_FUNC;
 
 	targetType = typeidType(typeId);
 	typeForm = (Form_pg_type) GETSTRUCT(targetType);
@@ -2323,13 +2483,19 @@ find_typmod_coercion_function(Oid typeId, Oid *funcid)
 	ReleaseType(targetType);
 
 	/* Look in pg_cast */
-	*funcid = caql_getoid(
-			NULL,
-			cql("SELECT castfunc FROM pg_cast "
-				" WHERE castsource = :1 "
-				" AND casttarget = :2 ",
-				ObjectIdGetDatum(typeId),
-				ObjectIdGetDatum(typeId)));
+	tuple = SearchSysCache(CASTSOURCETARGET,
+						   ObjectIdGetDatum(typeId),
+						   ObjectIdGetDatum(typeId),
+						   0, 0);
+
+	if (HeapTupleIsValid(tuple))
+	{
+		Form_pg_cast castForm = (Form_pg_cast) GETSTRUCT(tuple);
+
+		*funcid = castForm->castfunc;
+		ReleaseSysCache(tuple);
+	}
+
 	if (!OidIsValid(*funcid))
 		result = COERCION_PATH_NONE;
 
diff --git a/src/backend/parser/parse_cte.c b/src/backend/parser/parse_cte.c
index b92bb73f45d7..667413f5c360 100644
--- a/src/backend/parser/parse_cte.c
+++ b/src/backend/parser/parse_cte.c
@@ -158,12 +158,9 @@ analyzeCTE(ParseState *pstate, CommonTableExpr *cte)
 	Assert(cte->ctequery != NULL);
 	Assert(!IsA(cte->ctequery, Query));
 
-	List *queryList;
-	
-	queryList = parse_sub_analyze(cte->ctequery, pstate);
-	Assert(list_length(queryList) == 1);
+	Query *query = parse_sub_analyze(cte->ctequery, pstate);
+	Assert(IsA(query, Query));
 
-	Query *query = (Query *)linitial(queryList);
 	cte->ctequery = (Node *)query;
 
 	/* Check if the query is what we expected. */
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 94ef9db5bea0..a8210de8a357 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.211 2007/02/11 22:18:15 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.226.2.5 2010/07/30 17:57:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,10 +66,10 @@ static Node *transformMinMaxExpr(ParseState *pstate, MinMaxExpr *m);
 static Node *transformXmlExpr(ParseState *pstate, XmlExpr *x);
 static Node *transformXmlSerialize(ParseState *pstate, XmlSerialize *xs);
 static Node *transformBooleanTest(ParseState *pstate, BooleanTest *b);
+static Node *transformCurrentOfExpr(ParseState *pstate, CurrentOfExpr *cexpr);
 static Node *transformColumnRef(ParseState *pstate, ColumnRef *cref);
 static Node *transformWholeRowRef(ParseState *pstate, char *schemaname,
 					 char *relname, int location);
-static Node *transformBooleanTest(ParseState *pstate, BooleanTest *b);
 static Node *transformIndirection(ParseState *pstate, Node *basenode,
 					 List *indirection);
 static Node *transformGroupingFunc(ParseState *pstate, GroupingFunc *gf);
@@ -103,6 +103,8 @@ static char *percentileFuncString(PercentileExpr *p, Oid *argtypes, int arglen,
  *	function argument to the required type (via coerce_type())
  *	can apply transformExpr to an already-transformed subexpression.
  *	An example here is "SELECT count(*) + 1.0 FROM table".
+ *	3. CREATE TABLE t1 (LIKE t2 INCLUDING INDEXES) can pass in
+ *	already-transformed index expressions.
  * While it might be possible to eliminate these cases, the path of
  * least resistance so far has been to ensure that transformExpr() does
  * no damage if applied to an already-transformed tree.  This is pretty
@@ -184,8 +186,7 @@ transformExpr(ParseState *pstate, Node *expr)
 					Oid	elementType;
 					int32	targetTypmod;
 
-					targetType = typenameTypeId(pstate, tc->typname);
-					targetTypmod = typenameTypeMod(pstate, tc->typname, targetType);
+					targetType = typenameTypeId(pstate, tc->typname, &targetTypmod);
 
 					elementType = get_element_type(targetType);
 					if (OidIsValid(elementType))
@@ -307,29 +308,8 @@ transformExpr(ParseState *pstate, Node *expr)
 			break;
 
 		case T_CurrentOfExpr:
-			{
-				/*
-				 * The target RTE must be simply updatable. If not, we error out
-				 * early here to avoid having to deal with error cases later:
-				 * rewriting/planning against views, for example.
-				 */
-				Assert(pstate->p_target_rangetblentry != NULL);
-				if (!isSimplyUpdatableRelation(pstate->p_target_rangetblentry->relid))
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("\"%s\" is not simply updatable",
-									pstate->p_target_relation->rd_rel->relname.data)));
-
-				CurrentOfExpr *c = (CurrentOfExpr *) expr;
-				int sublevels_up;
-				c->cvarno = RTERangeTablePosn(pstate,
-											  pstate->p_target_rangetblentry,
-											  &sublevels_up);
-				c->target_relid = pstate->p_target_rangetblentry->relid;
-				Assert(sublevels_up == 0);
-				result = expr;
-				break;
-			}
+			result = transformCurrentOfExpr(pstate, (CurrentOfExpr *) expr);
+			break;
 
 		case T_GroupingFunc:
 			{
@@ -426,8 +406,8 @@ transformExpr(ParseState *pstate, Node *expr)
 		case T_FieldSelect:
 		case T_FieldStore:
 		case T_RelabelType:
-		case T_ArrayCoerceExpr:
 		case T_CoerceViaIO:
+		case T_ArrayCoerceExpr:
 		case T_ConvertRowtypeExpr:
 		case T_CaseTestExpr:
 		case T_ArrayExpr:
@@ -656,7 +636,7 @@ transformIndirection(ParseState *pstate, Node *basenode, List *indirection)
 														   result,
 														   exprType(result),
 														   InvalidOid,
-														   -1,
+														   exprTypmod(result),
 														   subscripts,
 														   NULL);
 			subscripts = NIL;
@@ -674,7 +654,7 @@ transformIndirection(ParseState *pstate, Node *basenode, List *indirection)
 												   result,
 												   exprType(result),
 												   InvalidOid,
-												   -1,
+												   exprTypmod(result),
 												   subscripts,
 												   NULL);
 
@@ -876,20 +856,20 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
 	return node;
 }
 
-static Node *
-transformParamRef(ParseState *pstate, ParamRef *pref)
+/*
+ * Locate the parameter type info for the given parameter number, and
+ * return a pointer to it.
+ */
+static Oid *
+find_param_type(ParseState *pstate, int paramno, int location)
 {
-	int			paramno = pref->number;
-	ParseState *toppstate;
-	Param	   *param;
-	int			location = pref->location;
+	Oid		   *result;
 
 	/*
 	 * Find topmost ParseState, which is where paramtype info lives.
 	 */
-	toppstate = pstate;
-	while (toppstate->parentParseState != NULL)
-		toppstate = toppstate->parentParseState;
+	while (pstate->parentParseState != NULL)
+		pstate = pstate->parentParseState;
 
 	/* Check parameter number is in range */
 	if (paramno <= 0)			/* probably can't happen? */
@@ -897,44 +877,70 @@ transformParamRef(ParseState *pstate, ParamRef *pref)
 				(errcode(ERRCODE_UNDEFINED_PARAMETER),
 				 errmsg("there is no parameter $%d", paramno),
 				 parser_errposition(pstate, location)));
-	if (paramno > toppstate->p_numparams)
+	if (paramno > pstate->p_numparams)
 	{
-		if (!toppstate->p_variableparams)
+		if (!pstate->p_variableparams)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_PARAMETER),
 					 errmsg("there is no parameter $%d", paramno),
 					 parser_errposition(pstate, location)));
 		/* Okay to enlarge param array */
-		if (toppstate->p_paramtypes)
-			toppstate->p_paramtypes =
-				(Oid *) repalloc(toppstate->p_paramtypes,
-								 paramno * sizeof(Oid));
+		if (pstate->p_paramtypes)
+			pstate->p_paramtypes = (Oid *) repalloc(pstate->p_paramtypes,
+													paramno * sizeof(Oid));
 		else
-			toppstate->p_paramtypes =
-				(Oid *) palloc(paramno * sizeof(Oid));
+			pstate->p_paramtypes = (Oid *) palloc(paramno * sizeof(Oid));
 		/* Zero out the previously-unreferenced slots */
-		MemSet(toppstate->p_paramtypes + toppstate->p_numparams,
+		MemSet(pstate->p_paramtypes + pstate->p_numparams,
 			   0,
-			   (paramno - toppstate->p_numparams) * sizeof(Oid));
-		toppstate->p_numparams = paramno;
+			   (paramno - pstate->p_numparams) * sizeof(Oid));
+		pstate->p_numparams = paramno;
 	}
-	if (toppstate->p_variableparams)
+
+	result = &pstate->p_paramtypes[paramno - 1];
+
+	if (pstate->p_variableparams)
 	{
 		/* If not seen before, initialize to UNKNOWN type */
-		if (toppstate->p_paramtypes[paramno - 1] == InvalidOid)
-			toppstate->p_paramtypes[paramno - 1] = UNKNOWNOID;
+		if (*result == InvalidOid)
+			*result = UNKNOWNOID;
 	}
 
+	return result;
+}
+
+static Node *
+transformParamRef(ParseState *pstate, ParamRef *pref)
+{
+	int			paramno = pref->number;
+	Oid		   *pptype = find_param_type(pstate, paramno, pref->location);
+	Param	   *param;
+
 	param = makeNode(Param);
 	param->paramkind = PARAM_EXTERN;
 	param->paramid = paramno;
-	param->paramtype = toppstate->p_paramtypes[paramno - 1];
+	param->paramtype = *pptype;
 	param->paramtypmod = -1;
 	param->location = pref->location;
 
 	return (Node *) param;
 }
 
+/* Test whether an a_expr is a plain NULL constant or not */
+static bool
+exprIsNullConstant(Node *arg)
+{
+	if (arg && IsA(arg, A_Const))
+	{
+		A_Const    *con = (A_Const *) arg;
+
+		if (con->val.type == T_Null &&
+			con->typname == NULL)
+			return true;
+	}
+	return false;
+}
+
 static Node *
 transformAExprOp(ParseState *pstate, A_Expr *a)
 {
@@ -945,12 +951,15 @@ transformAExprOp(ParseState *pstate, A_Expr *a)
 	/*
 	 * Special-case "foo = NULL" and "NULL = foo" for compatibility with
 	 * standards-broken products (like Microsoft's).  Turn these into IS NULL
-	 * exprs.
+	 * exprs. (If either side is a CaseTestExpr, then the expression was
+	 * generated internally from a CASE-WHEN expression, and
+	 * transform_null_equals does not apply.)
 	 */
 	if (Transform_null_equals &&
 		list_length(a->name) == 1 &&
 		strcmp(strVal(linitial(a->name)), "=") == 0 &&
-		(exprIsNullConstant(lexpr) || exprIsNullConstant(rexpr)))
+		(exprIsNullConstant(lexpr) || exprIsNullConstant(rexpr)) &&
+		(!IsA(lexpr, CaseTestExpr) && !IsA(rexpr, CaseTestExpr)))
 	{
 		NullTest   *n = makeNode(NullTest);
 
@@ -1143,7 +1152,7 @@ transformAExprOf(ParseState *pstate, A_Expr *a)
 	ltype = exprType(lexpr);
 	foreach(telem, (List *) a->rexpr)
 	{
-		rtype = typenameTypeId(pstate, lfirst(telem));
+		rtype = typenameTypeId(pstate, lfirst(telem), NULL);
 		matched = (rtype == ltype);
 		if (matched)
 			break;
@@ -1165,6 +1174,8 @@ transformAExprIn(ParseState *pstate, A_Expr *a)
 	Node	   *result = NULL;
 	Node	   *lexpr;
 	List	   *rexprs;
+	List	   *rvars;
+	List	   *rnonvars;
 	List	   *typeids;
 	bool		useOr;
 	bool		haveRowExpr;
@@ -1183,54 +1194,64 @@ transformAExprIn(ParseState *pstate, A_Expr *a)
 	 * possible if the inputs are all scalars (no RowExprs) and there is a
 	 * suitable array type available.  If not, we fall back to a boolean
 	 * condition tree with multiple copies of the lefthand expression.
+	 * Also, any IN-list items that contain Vars are handled as separate
+	 * boolean conditions, because that gives the planner more scope for
+	 * optimization on such clauses.
 	 *
 	 * First step: transform all the inputs, and detect whether any are
-	 * RowExprs.
+	 * RowExprs or contain Vars.
 	 */
 	lexpr = transformExpr(pstate, a->lexpr);
 	haveRowExpr = (lexpr && IsA(lexpr, RowExpr));
 	typeids = list_make1_oid(exprType(lexpr));
-	rexprs = NIL;
+	rexprs = rvars = rnonvars = NIL;
 	foreach(l, (List *) a->rexpr)
 	{
 		Node	   *rexpr = transformExpr(pstate, lfirst(l));
 
 		haveRowExpr |= (rexpr && IsA(rexpr, RowExpr));
 		rexprs = lappend(rexprs, rexpr);
-		typeids = lappend_oid(typeids, exprType(rexpr));
+		if (contain_vars_of_level(rexpr, 0))
+			rvars = lappend(rvars, rexpr);
+		else
+		{
+			rnonvars = lappend(rnonvars, rexpr);
+			typeids = lappend_oid(typeids, exprType(rexpr));
+		}
 	}
 
 	/*
-	 * If not forced by presence of RowExpr, try to resolve a common scalar
-	 * type for all the expressions, and see if it has an array type. (But if
-	 * there's only one righthand expression, we may as well just fall through
-	 * and generate a simple = comparison.)
+	 * ScalarArrayOpExpr is only going to be useful if there's more than
+	 * one non-Var righthand item.  Also, it won't work for RowExprs.
 	 */
-	if (!haveRowExpr && list_length(rexprs) != 1)
+	if (!haveRowExpr && list_length(rnonvars) > 1)
 	{
 		Oid			scalar_type;
 		Oid			array_type;
 
 		/*
-		 * Select a common type for the array elements.  Note that since the
-		 * LHS' type is first in the list, it will be preferred when there is
-		 * doubt (eg, when all the RHS items are unknown literals).
+		 * Try to select a common type for the array elements.  Note that
+		 * since the LHS' type is first in the list, it will be preferred when
+		 * there is doubt (eg, when all the RHS items are unknown literals).
 		 */
-		scalar_type = select_common_type(typeids, "IN");
+		scalar_type = select_common_type(typeids, NULL);
 
 		/* Do we have an array type to use? */
-		array_type = get_array_type(scalar_type);
+		if (OidIsValid(scalar_type))
+			array_type = get_array_type(scalar_type);
+		else
+			array_type = InvalidOid;
 		if (array_type != InvalidOid)
 		{
 			/*
-			 * OK: coerce all the right-hand inputs to the common type and
-			 * build an ArrayExpr for them.
+			 * OK: coerce all the right-hand non-Var inputs to the common type
+			 * and build an ArrayExpr for them.
 			 */
 			List	   *aexprs;
 			ArrayExpr  *newa;
 
 			aexprs = NIL;
-			foreach(l, rexprs)
+			foreach(l, rnonvars)
 			{
 				Node	   *rexpr = (Node *) lfirst(l);
 
@@ -1246,12 +1267,15 @@ transformAExprIn(ParseState *pstate, A_Expr *a)
 			newa->multidims = false;
 			newa->location = -1;
 
-			return (Node *) make_scalar_array_op(pstate,
-												 a->name,
-												 useOr,
-												 lexpr,
-												 (Node *) newa,
-												 a->location);
+			result = (Node *) make_scalar_array_op(pstate,
+												   a->name,
+												   useOr,
+												   lexpr,
+												   (Node *) newa,
+												   a->location);
+
+			/* Consider only the Vars (if any) in the loop below */
+			rexprs = rvars;
 		}
 	}
 
@@ -1495,23 +1519,21 @@ transformCaseExpr(ParseState *pstate, CaseExpr *c)
 static Node *
 transformSubLink(ParseState *pstate, SubLink *sublink)
 {
-	List	   *qtrees;
-	Query	   *qtree;
 	Node	   *result = (Node *) sublink;
+	Query	   *qtree;
 
 	/* If we already transformed this node, do nothing */
 	if (IsA(sublink->subselect, Query))
 		return result;
 
 	pstate->p_hasSubLinks = true;
-	qtrees = parse_sub_analyze(sublink->subselect, pstate);
+
+	qtree = parse_sub_analyze(sublink->subselect, pstate);
 
 	/*
 	 * Check that we got something reasonable.	Many of these conditions are
 	 * impossible given restrictions of the grammar, but check 'em anyway.
 	 */
-	Insist(list_length(qtrees) == 1);
-	qtree = (Query *) linitial(qtrees);
 	if (!IsA(qtree, Query) ||
 		qtree->commandType != CMD_SELECT ||
 		qtree->utilityStmt != NULL)
@@ -1678,7 +1700,7 @@ transformArrayExpr(ParseState *pstate, A_ArrayExpr *a,
 			 * Check for sub-array expressions, if we haven't already
 			 * found one.
 			 */
-			if (!newa->multidims && is_array_type(newe_type))
+			if (!newa->multidims && type_is_array(newe_type))
 				newa->multidims = true;
 		}
 
@@ -1787,7 +1809,13 @@ transformArrayExpr(ParseState *pstate, A_ArrayExpr *a,
 static Node *
 transformRowExpr(ParseState *pstate, RowExpr *r)
 {
-	RowExpr    *newr = makeNode(RowExpr);
+	RowExpr    *newr;
+
+	/* If we already transformed this node, do nothing */
+	if (OidIsValid(r->row_typeid))
+		return (Node *) r;
+
+	newr = makeNode(RowExpr);
 
 	/* Transform the field expressions */
 	newr->args = transformExpressionList(pstate, r->args);
@@ -1803,7 +1831,6 @@ transformRowExpr(ParseState *pstate, RowExpr *r)
 static Node *
 transformTableValueExpr(ParseState *pstate, TableValueExpr *t)
 {
-	List		*parsetrees;
 	Query		*query;
 
 	/* If we already transformed this node, do nothing */
@@ -1818,14 +1845,12 @@ transformTableValueExpr(ParseState *pstate, TableValueExpr *t)
 	pstate->p_hasTblValueExpr = true;
 
 	/* Analyze and transform the subquery */
-	parsetrees = parse_sub_analyze(t->subquery, pstate);
+	query = parse_sub_analyze(t->subquery, pstate);
 
 	/* 
 	 * Check that we got something reasonable.  Most of these conditions
 	 * are probably impossible given restrictions in the grammar.
 	 */
-	Insist(list_length(parsetrees) == 1);
-	query = (Query *) linitial(parsetrees);
 	if (query == NULL || !IsA(query, Query))
 		elog(ERROR, "unexpected non-SELECT command in TableValueExpr");
 	if (query->commandType != CMD_SELECT)
@@ -1926,46 +1951,6 @@ transformMinMaxExpr(ParseState *pstate, MinMaxExpr *m)
 	return (Node *) newm;
 }
 
-static Node *
-transformBooleanTest(ParseState *pstate, BooleanTest *b)
-{
-	const char *clausename;
-
-	switch (b->booltesttype)
-	{
-		case IS_TRUE:
-			clausename = "IS TRUE";
-			break;
-		case IS_NOT_TRUE:
-			clausename = "IS NOT TRUE";
-			break;
-		case IS_FALSE:
-			clausename = "IS FALSE";
-			break;
-		case IS_NOT_FALSE:
-			clausename = "IS NOT FALSE";
-			break;
-		case IS_UNKNOWN:
-			clausename = "IS UNKNOWN";
-			break;
-		case IS_NOT_UNKNOWN:
-			clausename = "IS NOT UNKNOWN";
-			break;
-		default:
-			elog(ERROR, "unrecognized booltesttype: %d",
-				 (int) b->booltesttype);
-			clausename = NULL;	/* keep compiler quiet */
-	}
-
-	b->arg = (Expr *) transformExpr(pstate, (Node *) b->arg);
-
-	b->arg = (Expr *) coerce_to_boolean(pstate,
-										(Node *) b->arg,
-										clausename);
-
-	return (Node *) b;
-}
-
 static Node *
 transformXmlExpr(ParseState *pstate, XmlExpr *x)
 {
@@ -1989,7 +1974,7 @@ transformXmlExpr(ParseState *pstate, XmlExpr *x)
 	newx->location = x->location;
 
 	/*
-	 * gram.y built the named args as a list of ResTarget.  Transform each,
+	 * gram.y built the named args as a list of ResTarget.	Transform each,
 	 * and break the names out as a separate list.
 	 */
 	newx->named_args = NIL;
@@ -2116,12 +2101,7 @@ transformXmlSerialize(ParseState *pstate, XmlSerialize *xs)
 													 XMLOID,
 													 "XMLSERIALIZE"));
 
-	targetType = typenameTypeId(pstate, xs->typeName);
-	/*
-	 * 83MERGE_FIXME: use -1, until we merge the 8.3 patch to support typmods
-	 * for user-defined types.
-	 */
-	targetTypmod = -1;
+	targetType = typenameTypeId(pstate, xs->typeName, &targetTypmod);
 
 	xexpr->xmloption = xs->xmloption;
 	xexpr->location = xs->location;
@@ -2148,6 +2128,93 @@ transformXmlSerialize(ParseState *pstate, XmlSerialize *xs)
 	return result;
 }
 
+static Node *
+transformBooleanTest(ParseState *pstate, BooleanTest *b)
+{
+	const char *clausename;
+
+	switch (b->booltesttype)
+	{
+		case IS_TRUE:
+			clausename = "IS TRUE";
+			break;
+		case IS_NOT_TRUE:
+			clausename = "IS NOT TRUE";
+			break;
+		case IS_FALSE:
+			clausename = "IS FALSE";
+			break;
+		case IS_NOT_FALSE:
+			clausename = "IS NOT FALSE";
+			break;
+		case IS_UNKNOWN:
+			clausename = "IS UNKNOWN";
+			break;
+		case IS_NOT_UNKNOWN:
+			clausename = "IS NOT UNKNOWN";
+			break;
+		default:
+			elog(ERROR, "unrecognized booltesttype: %d",
+				 (int) b->booltesttype);
+			clausename = NULL;	/* keep compiler quiet */
+	}
+
+	b->arg = (Expr *) transformExpr(pstate, (Node *) b->arg);
+
+	b->arg = (Expr *) coerce_to_boolean(pstate,
+										(Node *) b->arg,
+										clausename);
+
+	return (Node *) b;
+}
+
+static Node *
+transformCurrentOfExpr(ParseState *pstate, CurrentOfExpr *cexpr)
+{
+	int			sublevels_up;
+
+	/*
+	 * The target RTE must be simply updatable. If not, we error out
+	 * early here to avoid having to deal with error cases later:
+	 * rewriting/planning against views, for example.
+	 */
+	Assert(pstate->p_target_rangetblentry != NULL);
+	(void) isSimplyUpdatableRelation(pstate->p_target_rangetblentry->relid, false);
+
+	/* CURRENT OF can only appear at top level of UPDATE/DELETE */
+	Assert(pstate->p_target_rangetblentry != NULL);
+	cexpr->cvarno = RTERangeTablePosn(pstate,
+									  pstate->p_target_rangetblentry,
+									  &sublevels_up);
+	Assert(sublevels_up == 0);
+
+	cexpr->target_relid = pstate->p_target_rangetblentry->relid;
+
+	/* If a parameter is used, it must be of type REFCURSOR */
+	if (cexpr->cursor_name == NULL)
+	{
+		Oid		   *pptype = find_param_type(pstate, cexpr->cursor_param, -1);
+
+		if (pstate->p_variableparams && *pptype == UNKNOWNOID)
+		{
+			/* resolve unknown param type as REFCURSOR */
+			*pptype = REFCURSOROID;
+		}
+		else if (*pptype != REFCURSOROID)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_AMBIGUOUS_PARAMETER),
+					 errmsg("inconsistent types deduced for parameter $%d",
+							cexpr->cursor_param),
+					 errdetail("%s versus %s",
+							   format_type_be(*pptype),
+							   format_type_be(REFCURSOROID))));
+		}
+	}
+
+	return (Node *) cexpr;
+}
+
 /*
  * Construct a whole-row reference to represent the notation "relation.*".
  *
@@ -2196,7 +2263,7 @@ transformWholeRowRef(ParseState *pstate, char *schemaname, char *relname,
 		case RTE_TABLEFUNCTION:
 		case RTE_FUNCTION:
 			toid = exprType(rte->funcexpr);
-			if (toid == RECORDOID || get_typtype(toid) == 'c')
+			if (type_is_rowtype(toid))
 			{
 				/* func returns composite; same as relation case */
 				result = (Node *) makeVar(vnum,
@@ -2626,7 +2693,15 @@ exprType(Node *expr)
 			type = ((WindowRef *) expr)->restype;
 			break;
 		case T_ArrayRef:
-			type = ((ArrayRef *) expr)->refrestype;
+			{
+				ArrayRef   *arrayref = (ArrayRef *) expr;
+
+				/* slice and/or store operations yield the array type */
+				if (arrayref->reflowerindexpr || arrayref->refassgnexpr)
+					type = arrayref->refarraytype;
+				else
+					type = arrayref->refelemtype;
+			}
 			break;
 		case T_FuncExpr:
 			type = ((FuncExpr *) expr)->funcresulttype;
@@ -2690,16 +2765,15 @@ exprType(Node *expr)
 					subplan->subLinkType == ARRAY_SUBLINK)
 				{
 					/* get the type of the subselect's first target column */
-					Oid itemtype = subplan->firstColType;
-					type = itemtype;
+					type = subplan->firstColType;
 					if (subplan->subLinkType == ARRAY_SUBLINK)
 					{
-						type = get_array_type(itemtype);
+						type = get_array_type(subplan->firstColType);
 						if (!OidIsValid(type))
 							ereport(ERROR,
 									(errcode(ERRCODE_UNDEFINED_OBJECT),
 									 errmsg("could not find array type for data type %s",
-							format_type_be(itemtype))));
+									format_type_be(subplan->firstColType))));
 					}
 				}
 				else
@@ -2730,9 +2804,6 @@ exprType(Node *expr)
 		case T_CaseExpr:
 			type = ((CaseExpr *) expr)->casetype;
 			break;
-		case T_CaseWhen:
-			type = exprType((Node *) ((CaseWhen *) expr)->result);
-			break;
 		case T_CaseTestExpr:
 			type = ((CaseTestExpr *) expr)->typeId;
 			break;
@@ -2836,8 +2907,13 @@ exprTypmod(Node *expr)
 	{
 		case T_Var:
 			return ((Var *) expr)->vartypmod;
+		case T_Const:
+			return ((Const *) expr)->consttypmod;
 		case T_Param:
 			return ((Param *) expr)->paramtypmod;
+		case T_ArrayRef:
+			/* typmod is the same for array or element */
+			return ((ArrayRef *) expr)->reftypmod;
 		case T_FuncExpr:
 			{
 				int32		coercedTypmod;
@@ -2847,6 +2923,27 @@ exprTypmod(Node *expr)
 					return coercedTypmod;
 			}
 			break;
+		case T_SubLink:
+			{
+				SubLink    *sublink = (SubLink *) expr;
+
+				if (sublink->subLinkType == EXPR_SUBLINK ||
+					sublink->subLinkType == ARRAY_SUBLINK)
+				{
+					/* get the typmod of the subselect's first target column */
+					Query	   *qtree = (Query *) sublink->subselect;
+					TargetEntry *tent;
+
+					if (!qtree || !IsA(qtree, Query))
+						elog(ERROR, "cannot get type for untransformed sublink");
+					tent = (TargetEntry *) linitial(qtree->targetList);
+					Assert(IsA(tent, TargetEntry));
+					Assert(!tent->resjunk);
+					return exprTypmod((Node *) tent->expr);
+					/* note we don't need to care if it's an array */
+				}
+			}
+			break;
 		case T_FieldSelect:
 			return ((FieldSelect *) expr)->resulttypmod;
 		case T_RelabelType:
@@ -2886,6 +2983,38 @@ exprTypmod(Node *expr)
 			break;
 		case T_CaseTestExpr:
 			return ((CaseTestExpr *) expr)->typeMod;
+		case T_ArrayExpr:
+			{
+				/*
+				 * If all the elements agree on type/typmod, return that
+				 * typmod, else use -1
+				 */
+				ArrayExpr  *arrayexpr = (ArrayExpr *) expr;
+				Oid			commontype;
+				int32		typmod;
+				ListCell   *elem;
+
+				if (arrayexpr->elements == NIL)
+					return -1;
+				typmod = exprTypmod((Node *) linitial(arrayexpr->elements));
+				if (typmod < 0)
+					return -1;	/* no point in trying harder */
+				if (arrayexpr->multidims)
+					commontype = arrayexpr->array_typeid;
+				else
+					commontype = arrayexpr->element_typeid;
+				foreach(elem, arrayexpr->elements)
+				{
+					Node	   *e = (Node *) lfirst(elem);
+
+					if (exprType(e) != commontype)
+						return -1;
+					if (exprTypmod(e) != typmod)
+						return -1;
+				}
+				return typmod;
+			}
+			break;
 		case T_CoalesceExpr:
 			{
 				/*
@@ -2985,8 +3114,8 @@ exprIsLengthCoercion(Node *expr, int32 *coercedTypmod)
 	if (expr && IsA(expr, FuncExpr))
 	{
 		FuncExpr   *func = (FuncExpr *) expr;
-		int		 nargs;
-		Const	  *second_arg;
+		int			nargs;
+		Const	   *second_arg;
 
 		/*
 		 * If it didn't come from a coercion context, reject.
@@ -3019,6 +3148,23 @@ exprIsLengthCoercion(Node *expr, int32 *coercedTypmod)
 		return true;
 	}
 
+	if (expr && IsA(expr, ArrayCoerceExpr))
+	{
+		ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) expr;
+
+		/* It's not a length coercion unless there's a nondefault typmod */
+		if (acoerce->resulttypmod < 0)
+			return false;
+
+		/*
+		 * OK, it is indeed a length-coercion expression.
+		 */
+		if (coercedTypmod != NULL)
+			*coercedTypmod = acoerce->resulttypmod;
+
+		return true;
+	}
+
 	return false;
 }
 
@@ -3035,8 +3181,7 @@ typecast_expression(ParseState *pstate, Node *expr, TypeName *typename)
 	Oid			targetType;
 	int32		targetTypmod;
 
-	targetType = typenameTypeId(pstate, typename);
-	targetTypmod = typenameTypeMod(pstate, typename, targetType);
+	targetType = typenameTypeId(pstate, typename, &targetTypmod);
 
 	if (inputType == InvalidOid)
 		return expr;			/* do nothing if NULL input */
@@ -3147,9 +3292,9 @@ make_row_comparison_op(ParseState *pstate, List *opname,
 
 	/*
 	 * Now we must determine which row comparison semantics (= <> < <= > >=)
-	 * apply to this set of operators.	We look for btree opfamilies containing
-	 * the operators, and see which interpretations (strategy numbers) exist
-	 * for each operator.
+	 * apply to this set of operators.	We look for btree opfamilies
+	 * containing the operators, and see which interpretations (strategy
+	 * numbers) exist for each operator.
 	 */
 	opfamily_lists = (List **) palloc(nopers * sizeof(List *));
 	opstrat_lists = (List **) palloc(nopers * sizeof(List *));
@@ -3232,7 +3377,7 @@ make_row_comparison_op(ParseState *pstate, List *opname,
 		}
 		if (OidIsValid(opfamily))
 			opfamilies = lappend_oid(opfamilies, opfamily);
-		else					/* should not happen */
+		else	/* should not happen */
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("could not determine interpretation of row comparison operator %s",
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 2ce3efeb60f4..06a418e6dd4a 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.194 2007/02/01 19:10:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.201.2.1 2010/07/30 17:57:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,12 +18,15 @@
 #include "catalog/catquery.h"
 #include "access/transam.h"
 #include "catalog/pg_aggregate.h"
+#include "catalog/pg_attrdef.h"
+#include "catalog/pg_constraint.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_proc_callback.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_window.h"
 #include "funcapi.h"
+#include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/walkers.h"
@@ -35,16 +38,19 @@
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 #include "parser/parse_type.h"
+#include "parser/parsetree.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
 
+static Oid	FuncNameAsType(List *funcname);
 static Node *ParseComplexProjection(ParseState *pstate, char *funcname,
 					   Node *first_arg, int location);
 static void unknown_attribute(ParseState *pstate, Node *relref, char *attname,
 				  int location);
+static bool check_pg_get_expr_arg(ParseState *pstate, Node *arg, int netlevelsup);
 
 typedef struct
 {
@@ -372,14 +378,15 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 	}
 
 	/*
-	 * enforce consistency with ANYARRAY and ANYELEMENT argument and return
-	 * types, possibly adjusting return type or declared_arg_types (which will
-	 * be used as the cast destination by make_fn_arguments)
+	 * enforce consistency with polymorphic argument and return types,
+	 * possibly adjusting return type or declared_arg_types (which will be
+	 * used as the cast destination by make_fn_arguments)
 	 */
 	rettype = enforce_generic_type_consistency(actual_arg_types,
 											   declared_arg_types,
-											   nargsplusdefs,
-											   rettype);
+											   nargs,
+											   rettype,
+											   false);
 
 	/* perform the necessary typecasting of arguments */
 	make_fn_arguments(pstate, fargs, actual_arg_types, declared_arg_types);
@@ -627,6 +634,9 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 		}
 	}
 
+	/* Hack to protect pg_get_expr() against misuse */
+	check_pg_get_expr_args(pstate, funcid, fargs);
+
 	return retval;
 }
 
@@ -1010,7 +1020,7 @@ func_select_candidate(int nargs,
  * is as quick as possible.
  *
  * If an exact match isn't found:
- *	1) check for possible interpretation as a type coercion
+ *	1) check for possible interpretation as a type coercion request
  *	2) get a vector of all possible input arg type arrays constructed
  *	   from the superclasses of the original input arg types
  *	3) get a list of all possible argument type arrays to the function
@@ -1074,20 +1084,19 @@ func_get_detail(List *funcname,
 		 * This interpretation needs to be given higher priority than
 		 * interpretations involving a type coercion followed by a function
 		 * call, otherwise we can produce surprising results. For example, we
-		 * want "text(varchar)" to be interpreted as a simple coercion, not
-		 * as "text(name(varchar))" which the code below this point is
-		 * entirely capable of selecting.
+		 * want "text(varchar)" to be interpreted as a simple coercion, not as
+		 * "text(name(varchar))" which the code below this point is entirely
+		 * capable of selecting.
 		 *
 		 * We also treat a coercion of a previously-unknown-type literal
-		 * constant to a specific type this way.*
+		 * constant to a specific type this way.
 		 *
 		 * The reason we reject COERCION_PATH_FUNC here is that we expect the
 		 * cast implementation function to be named after the target type.
 		 * Thus the function will be found by normal lookup if appropriate.
 		 *
-		 *
-		 * The reason we reject COERCION_PATH_ARRAYCOERCE is mainly that
-		 * you can't write "foo[] (something)" as a function call.  In theory
+		 * The reason we reject COERCION_PATH_ARRAYCOERCE is mainly that you
+		 * can't write "foo[] (something)" as a function call.  In theory
 		 * someone might want to invoke it as "_foo (something)" but we have
 		 * never supported that historically, so we can insist that people
 		 * write it as a normal cast instead.  Lack of historical support is
@@ -1095,20 +1104,15 @@ func_get_detail(List *funcname,
 		 *
 		 * NB: it's important that this code does not exceed what coerce_type
 		 * can do, because the caller will try to apply coerce_type if we
-		 * return FUNCDETAIL_COERCION.  If we return that result for something
+		 * return FUNCDETAIL_COERCION.	If we return that result for something
 		 * coerce_type can't handle, we'll cause infinite recursion between
 		 * this module and coerce_type!
-		 *
 		 */
 		if (nargs == 1 && fargs != NIL)
 		{
-			Oid			targetType;
+			Oid			targetType = FuncNameAsType(funcname);
 
-			targetType = LookupTypeName(NULL,
-										makeTypeNameFromNameList(funcname));
-
-			if (OidIsValid(targetType) &&
-				!ISCOMPLEX(targetType))
+			if (OidIsValid(targetType))
 			{
 				Oid			sourceType = argtypes[0];
 				Node	   *arg1 = linitial(fargs);
@@ -1121,19 +1125,19 @@ func_get_detail(List *funcname,
 				}
 				else
 				{
-					Oid			cfuncid;
 					CoercionPathType cpathtype;
+					Oid			cfuncid;
 
 					cpathtype = find_coercion_pathway(targetType, sourceType,
-										   COERCION_EXPLICIT,
-											&cfuncid);
+													  COERCION_EXPLICIT,
+													  &cfuncid);
 					iscoercion = (cpathtype == COERCION_PATH_RELABELTYPE ||
-								cpathtype == COERCION_PATH_COERCEVIAIO);
+								  cpathtype == COERCION_PATH_COERCEVIAIO);
 				}
 
 				if (iscoercion)
 				{
-					/* Yup, it's a trivial type coercion */
+					/* Treat it as a type coercion */
 					*funcid = InvalidOid;
 					*rettype = targetType;
 					*retset = false;
@@ -1440,6 +1444,33 @@ make_fn_arguments(ParseState *pstate,
 	}
 }
 
+/*
+ * FuncNameAsType -
+ *	  convenience routine to see if a function name matches a type name
+ *
+ * Returns the OID of the matching type, or InvalidOid if none.  We ignore
+ * shell types and complex types.
+ */
+static Oid
+FuncNameAsType(List *funcname)
+{
+	Oid			result;
+	Type		typtup;
+
+	typtup = LookupTypeName(NULL, makeTypeNameFromNameList(funcname), NULL);
+	if (typtup == NULL)
+		return InvalidOid;
+
+	if (((Form_pg_type) GETSTRUCT(typtup))->typisdefined &&
+		!OidIsValid(typeTypeRelid(typtup)))
+		result = typeTypeId(typtup);
+	else
+		result = InvalidOid;
+
+	ReleaseSysCache(typtup);
+	return result;
+}
+
 /*
  * ParseComplexProjection -
  *	  handles function calls with a single argument that is of complex type.
@@ -1635,6 +1666,27 @@ LookupFuncName(List *funcname, int nargs, const Oid *argtypes, bool noError)
 	return InvalidOid;
 }
 
+/*
+ * LookupTypeNameOid
+ *		Convenience routine to look up a type, silently accepting shell types
+ */
+static Oid
+LookupTypeNameOid(const TypeName *typename)
+{
+	Oid			result;
+	Type		typtup;
+
+	typtup = LookupTypeName(NULL, typename, NULL);
+	if (typtup == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("type \"%s\" does not exist",
+						TypeNameToString(typename))));
+	result = typeTypeId(typtup);
+	ReleaseSysCache(typtup);
+	return result;
+}
+
 /*
  * LookupFuncNameTypeNames
  *		Like LookupFuncName, but the argument types are specified by a
@@ -1660,14 +1712,7 @@ LookupFuncNameTypeNames(List *funcname, List *argtypes, bool noError)
 	{
 		TypeName   *t = (TypeName *) lfirst(args_item);
 
-		argoids[i] = LookupTypeName(NULL, t);
-
-		if (!OidIsValid(argoids[i]))
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_OBJECT),
-					 errmsg("type \"%s\" does not exist",
-							TypeNameToString(t))));
-
+		argoids[i] = LookupTypeNameOid(t);
 		args_item = lnext(args_item);
 	}
 
@@ -1707,12 +1752,7 @@ LookupAggNameTypeNames(List *aggname, List *argtypes, bool noError)
 	{
 		TypeName   *t = (TypeName *) lfirst(lc);
 
-		argoids[i] = LookupTypeName(NULL, t);
-		if (!OidIsValid(argoids[i]))
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_OBJECT),
-					 errmsg("type \"%s\" does not exist",
-							TypeNameToString(t))));
+		argoids[i] = LookupTypeNameOid(t);
 		i++;
 	}
 
@@ -1836,3 +1876,131 @@ checkTableFunctions_walker(Node *node, check_table_func_context *context)
 									  (void *) context);
 	}
 }
+
+/*
+ * pg_get_expr() is a system function that exposes the expression
+ * deparsing functionality in ruleutils.c to users. Very handy, but it was
+ * later realized that the functions in ruleutils.c don't check the input
+ * rigorously, assuming it to come from system catalogs and to therefore
+ * be valid. That makes it easy for a user to crash the backend by passing
+ * a maliciously crafted string representation of an expression to
+ * pg_get_expr().
+ *
+ * There's a lot of code in ruleutils.c, so it's not feasible to add
+ * water-proof input checking after the fact. Even if we did it once, it
+ * would need to be taken into account in any future patches too.
+ *
+ * Instead, we restrict pg_rule_expr() to only allow input from system
+ * catalogs. This is a hack, but it's the most robust and easiest
+ * to backpatch way of plugging the vulnerability.
+ *
+ * This is transparent to the typical usage pattern of
+ * "pg_get_expr(systemcolumn, ...)", but will break "pg_get_expr('foo',
+ * ...)", even if 'foo' is a valid expression fetched earlier from a
+ * system catalog. Hopefully there aren't many clients doing that out there.
+ */
+void
+check_pg_get_expr_args(ParseState *pstate, Oid fnoid, List *args)
+{
+	Node	   *arg;
+
+	/* if not being called for pg_get_expr, do nothing */
+	if (fnoid != F_PG_GET_EXPR && fnoid != F_PG_GET_EXPR_EXT)
+		return;
+
+	/* superusers are allowed to call it anyway (dubious) */
+	if (superuser())
+		return;
+
+	/*
+	 * The first argument must be a Var referencing one of the allowed
+	 * system-catalog columns.  It could be a join alias Var or subquery
+	 * reference Var, though, so we need a recursive subroutine to chase
+	 * through those possibilities.
+	 */
+	Assert(list_length(args) > 1);
+	arg = (Node *) linitial(args);
+
+	if (!check_pg_get_expr_arg(pstate, arg, 0))
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("argument to pg_get_expr() must come from system catalogs")));
+}
+
+static bool
+check_pg_get_expr_arg(ParseState *pstate, Node *arg, int netlevelsup)
+{
+	if (arg && IsA(arg, Var))
+	{
+		Var		   *var = (Var *) arg;
+		RangeTblEntry *rte;
+		AttrNumber	attnum;
+
+		netlevelsup += var->varlevelsup;
+		rte = GetRTEByRangeTablePosn(pstate, var->varno, netlevelsup);
+		attnum = var->varattno;
+
+		if (rte->rtekind == RTE_JOIN)
+		{
+			/* Recursively examine join alias variable */
+			if (attnum > 0 &&
+				attnum <= list_length(rte->joinaliasvars))
+			{
+				arg = (Node *) list_nth(rte->joinaliasvars, attnum - 1);
+				return check_pg_get_expr_arg(pstate, arg, netlevelsup);
+			}
+		}
+		else if (rte->rtekind == RTE_SUBQUERY)
+		{
+			/* Subselect-in-FROM: examine sub-select's output expr */
+			TargetEntry *ste = get_tle_by_resno(rte->subquery->targetList,
+												attnum);
+			ParseState	mypstate;
+
+			if (ste == NULL || ste->resjunk)
+				elog(ERROR, "subquery %s does not have attribute %d",
+					 rte->eref->aliasname, attnum);
+			arg = (Node *) ste->expr;
+
+			/*
+			 * Recurse into the sub-select to see what its expr refers to.
+			 * We have to build an additional level of ParseState to keep in
+			 * step with varlevelsup in the subselect.
+			 */
+			MemSet(&mypstate, 0, sizeof(mypstate));
+			mypstate.parentParseState = pstate;
+			mypstate.p_rtable = rte->subquery->rtable;
+			/* don't bother filling the rest of the fake pstate */
+
+			return check_pg_get_expr_arg(&mypstate, arg, 0);
+		}
+		else if (rte->rtekind == RTE_RELATION)
+		{
+			switch (rte->relid)
+			{
+				case IndexRelationId:
+					if (attnum == Anum_pg_index_indexprs ||
+						attnum == Anum_pg_index_indpred)
+						return true;
+					break;
+
+				case AttrDefaultRelationId:
+					if (attnum == Anum_pg_attrdef_adbin)
+						return true;
+					break;
+
+				case ConstraintRelationId:
+					if (attnum == Anum_pg_constraint_conbin)
+						return true;
+					break;
+
+				case TypeRelationId:
+					if (attnum == Anum_pg_type_typdefaultbin)
+						return true;
+					break;
+			}
+		}
+	}
+
+	return false;
+}
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index be4361f2a95c..f4105f6dec6a 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -8,13 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_node.c,v 1.96 2007/01/05 22:19:34 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_node.c,v 1.99 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "catalog/catquery.h"
+#include "access/heapam.h"
 #include "catalog/pg_type.h"
 #include "mb/pg_wchar.h"
 #include "nodes/makefuncs.h"
@@ -30,9 +31,11 @@
 
 static void pcb_error_callback(void *arg);
 
-/* make_parsestate()
- * Allocate and initialize a new ParseState.
- * The CALLER is responsible for freeing the ParseState* returned.
+/*
+ * make_parsestate
+ *		Allocate and initialize a new ParseState.
+ *
+ * Caller should eventually release the ParseState via free_parsestate().
  */
 ParseState *
 make_parsestate(ParseState *parentParseState)
@@ -70,8 +73,19 @@ make_parsestate(ParseState *parentParseState)
 void
 free_parsestate(ParseState *pstate)
 {
-	if (pstate->p_namecache)
-		hash_destroy(pstate->p_namecache);
+	/*
+	 * Check that we did not produce too many resnos; at the very least we
+	 * cannot allow more than 2^16, since that would exceed the range of a
+	 * AttrNumber. It seems safest to use MaxTupleAttributeNumber.
+	 */
+	if (pstate->p_next_resno - 1 > MaxTupleAttributeNumber)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("target lists can have at most %d entries",
+						MaxTupleAttributeNumber)));
+
+	if (pstate->p_target_relation != NULL)
+		heap_close(pstate->p_target_relation, NoLock);
 
 	pfree(pstate);
 }
@@ -272,7 +286,8 @@ transformArrayType(Oid arrayType)
  * arrayType	OID of array's datatype (should match type of arrayBase)
  * elementType	OID of array's element type (fetch with transformArrayType,
  *				or pass InvalidOid to do it here)
- * elementTypMod typmod to be applied to array elements (if storing)
+ * elementTypMod typmod to be applied to array elements (if storing) or of
+ *				the source array (if fetching)
  * indirection	Untransformed list of subscripts (must not be NIL)
  * assignFrom	NULL for array fetch, else transformed expression for source.
  */
@@ -285,7 +300,6 @@ transformArraySubscripts(ParseState *pstate,
 						 List *indirection,
 						 Node *assignFrom)
 {
-	Oid			resultType;
 	bool		isSlice = false;
 	List	   *upperIndexpr = NIL;
 	List	   *lowerIndexpr = NIL;
@@ -315,16 +329,6 @@ transformArraySubscripts(ParseState *pstate,
 		}
 	}
 
-	/*
-	 * The type represented by the subscript expression is the element type if
-	 * we are fetching a single element, but it is the same as the array type
-	 * if we are fetching a slice or storing.
-	 */
-	if (isSlice || assignFrom != NULL)
-		resultType = arrayType;
-	else
-		resultType = elementType;
-
 	/*
 	 * Transform the subscript expressions.
 	 */
@@ -407,9 +411,9 @@ transformArraySubscripts(ParseState *pstate,
 	 * Ready to build the ArrayRef node.
 	 */
 	aref = makeNode(ArrayRef);
-	aref->refrestype = resultType;
 	aref->refarraytype = arrayType;
 	aref->refelemtype = elementType;
+	aref->reftypmod = elementTypMod;
 	aref->refupperindexpr = upperIndexpr;
 	aref->reflowerindexpr = lowerIndexpr;
 	aref->refexpr = (Expr *) arrayBase;
@@ -544,7 +548,7 @@ make_const(ParseState *pstate, Value *value, int location)
 	}
 
 	con = makeConst(typeid,
-			        -1,
+					-1,			/* typmod -1 is OK for all cases */
 					typelen,
 					val,
 					false,
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index b2b6a50b8151..f0718758d726 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.94 2007/02/01 19:10:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.101.2.1 2010/07/30 17:57:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,11 +25,47 @@
 #include "parser/parse_oper.h"
 #include "parser/parse_type.h"
 #include "utils/builtins.h"
+#include "utils/hsearch.h"
+#include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
 
+/*
+ * The lookup key for the operator lookaside hash table.  Unused bits must be
+ * zeroes to ensure hashing works consistently --- in particular, oprname
+ * must be zero-padded and any unused entries in search_path must be zero.
+ *
+ * search_path contains the actual search_path with which the entry was
+ * derived (minus temp namespace if any), or else the single specified
+ * schema OID if we are looking up an explicitly-qualified operator name.
+ *
+ * search_path has to be fixed-length since the hashtable code insists on
+ * fixed-size keys.  If your search path is longer than that, we just punt
+ * and don't cache anything.
+ */
+
+/* If your search_path is longer than this, sucks to be you ... */
+#define MAX_CACHED_PATH_LEN		16
+
+typedef struct OprCacheKey
+{
+	char		oprname[NAMEDATALEN];
+	Oid			left_arg;		/* Left input OID, or 0 if prefix op */
+	Oid			right_arg;		/* Right input OID, or 0 if postfix op */
+	Oid			search_path[MAX_CACHED_PATH_LEN];
+} OprCacheKey;
+
+typedef struct OprCacheEntry
+{
+	/* the hash lookup key MUST BE FIRST */
+	OprCacheKey	key;
+
+	Oid			opr_oid;		/* OID of the resolved operator */
+} OprCacheEntry;
+
+
 static Oid	binary_oper_exact(List *opname, Oid arg1, Oid arg2);
 static FuncDetailCode oper_select_candidate(int nargs,
 					  Oid *input_typeids,
@@ -43,6 +79,11 @@ static void op_error(ParseState *pstate, List *op, char oprkind,
 static Expr *make_op_expr(ParseState *pstate, Operator op,
 			 Node *ltree, Node *rtree,
 			 Oid ltypeId, Oid rtypeId);
+static bool make_oper_cache_key(OprCacheKey *key, List *opname,
+								Oid ltypeId, Oid rtypeId);
+static Oid	find_oper_cache_entry(OprCacheKey *key);
+static void make_oper_cache_entry(OprCacheKey *key, Oid opr_oid);
+static void InvalidateOprCacheCallBack(Datum arg, int cacheid, ItemPointer tuplePtr);
 
 static HeapTuple fetch_op_tup(Oid oproid, bool bValid);
 /*
@@ -141,12 +182,12 @@ LookupOperNameTypeNames(ParseState *pstate, List *opername,
 	if (oprleft == NULL)
 		leftoid = InvalidOid;
 	else
-		leftoid = typenameTypeId(pstate, oprleft);
+		leftoid = typenameTypeId(pstate, oprleft, NULL);
 
 	if (oprright == NULL)
 		rightoid = InvalidOid;
 	else
-		rightoid = typenameTypeId(pstate, oprright);
+		rightoid = typenameTypeId(pstate, oprright, NULL);
 
 	return LookupOperName(pstate, opername, leftoid, rightoid,
 						  noError, location);
@@ -549,9 +590,28 @@ oper(ParseState *pstate, List *opname, Oid ltypeId, Oid rtypeId,
 	 bool noError, int location)
 {
 	Oid			operOid;
+	OprCacheKey	key;
+	bool		key_ok;
 	FuncDetailCode fdresult = FUNCDETAIL_NOTFOUND;
 	HeapTuple	tup = NULL;
 
+	/*
+	 * Try to find the mapping in the lookaside cache.
+	 */
+	key_ok = make_oper_cache_key(&key, opname, ltypeId, rtypeId);
+	if (key_ok)
+	{
+		operOid = find_oper_cache_entry(&key);
+		if (OidIsValid(operOid))
+		{
+			tup = SearchSysCache(OPEROID,
+								 ObjectIdGetDatum(operOid),
+								 0, 0, 0);
+			if (HeapTupleIsValid(tup))
+				return (Operator) tup;
+		}
+	}
+
 	/*
 	 * First try for an "exact" match.
 	 */
@@ -587,7 +647,12 @@ oper(ParseState *pstate, List *opname, Oid ltypeId, Oid rtypeId,
 
 	tup = fetch_op_tup(operOid, false);
 
-	if (!HeapTupleIsValid(tup) && !noError)
+	if (HeapTupleIsValid(tup))
+	{
+		if (key_ok)
+			make_oper_cache_entry(&key, operOid);
+	}
+	else if (!noError)
 		op_error(pstate, opname, 'b', ltypeId, rtypeId, fdresult, location);
 
 	return (Operator) tup;
@@ -672,9 +737,28 @@ Operator
 right_oper(ParseState *pstate, List *op, Oid arg, bool noError, int location)
 {
 	Oid			operOid;
+	OprCacheKey	key;
+	bool		key_ok;
 	FuncDetailCode fdresult = FUNCDETAIL_NOTFOUND;
 	HeapTuple	tup = NULL;
 
+	/*
+	 * Try to find the mapping in the lookaside cache.
+	 */
+	key_ok = make_oper_cache_key(&key, op, arg, InvalidOid);
+	if (key_ok)
+	{
+		operOid = find_oper_cache_entry(&key);
+		if (OidIsValid(operOid))
+		{
+			tup = SearchSysCache(OPEROID,
+								 ObjectIdGetDatum(operOid),
+								 0, 0, 0);
+			if (HeapTupleIsValid(tup))
+				return (Operator) tup;
+		}
+	}
+
 	/*
 	 * First try for an "exact" match.
 	 */
@@ -702,7 +786,12 @@ right_oper(ParseState *pstate, List *op, Oid arg, bool noError, int location)
 
 	tup = fetch_op_tup(operOid, false);
 
-	if (!HeapTupleIsValid(tup) && !noError)
+	if (HeapTupleIsValid(tup))
+	{
+		if (key_ok)
+			make_oper_cache_entry(&key, operOid);
+	}
+	else if (!noError)
 		op_error(pstate, op, 'r', arg, InvalidOid, fdresult, location);
 
 	return (Operator) tup;
@@ -727,9 +816,28 @@ Operator
 left_oper(ParseState *pstate, List *op, Oid arg, bool noError, int location)
 {
 	Oid			operOid;
+	OprCacheKey	key;
+	bool		key_ok;
 	FuncDetailCode fdresult = FUNCDETAIL_NOTFOUND;
 	HeapTuple	tup = NULL;
 
+	/*
+	 * Try to find the mapping in the lookaside cache.
+	 */
+	key_ok = make_oper_cache_key(&key, op, InvalidOid, arg);
+	if (key_ok)
+	{
+		operOid = find_oper_cache_entry(&key);
+		if (OidIsValid(operOid))
+		{
+			tup = SearchSysCache(OPEROID,
+								 ObjectIdGetDatum(operOid),
+								 0, 0, 0);
+			if (HeapTupleIsValid(tup))
+				return (Operator) tup;
+		}
+	}
+
 	/*
 	 * First try for an "exact" match.
 	 */
@@ -769,7 +877,12 @@ left_oper(ParseState *pstate, List *op, Oid arg, bool noError, int location)
 
 	tup = fetch_op_tup(operOid, false);
 
-	if (!HeapTupleIsValid(tup) && !noError)
+	if (HeapTupleIsValid(tup))
+	{
+		if (key_ok)
+			make_oper_cache_entry(&key, operOid);
+	}
+	else if (!noError)
 		op_error(pstate, op, 'l', InvalidOid, arg, fdresult, location);
 
 	return (Operator) tup;
@@ -930,14 +1043,15 @@ make_scalar_array_op(ParseState *pstate, List *opname,
 	declared_arg_types[1] = opform->oprright;
 
 	/*
-	 * enforce consistency with ANYARRAY and ANYELEMENT argument and return
-	 * types, possibly adjusting return type or declared_arg_types (which will
-	 * be used as the cast destination by make_fn_arguments)
+	 * enforce consistency with polymorphic argument and return types,
+	 * possibly adjusting return type or declared_arg_types (which will be
+	 * used as the cast destination by make_fn_arguments)
 	 */
 	rettype = enforce_generic_type_consistency(actual_arg_types,
 											   declared_arg_types,
 											   2,
-											   opform->oprresult);
+											   opform->oprresult,
+											   false);
 
 	/*
 	 * Check that operator result is boolean
@@ -955,15 +1069,25 @@ make_scalar_array_op(ParseState *pstate, List *opname,
 
 	/*
 	 * Now switch back to the array type on the right, arranging for any
-	 * needed cast to be applied.
+	 * needed cast to be applied.  Beware of polymorphic operators here;
+	 * enforce_generic_type_consistency may or may not have replaced a
+	 * polymorphic type with a real one.
 	 */
-	res_atypeId = get_array_type(declared_arg_types[1]);
-	if (!OidIsValid(res_atypeId))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("could not find array type for data type %s",
-						format_type_be(declared_arg_types[1])),
-				 parser_errposition(pstate, location)));
+	if (IsPolymorphicType(declared_arg_types[1]))
+	{
+		/* assume the actual array type is OK */
+		res_atypeId = atypeId;
+	}
+	else
+	{
+		res_atypeId = get_array_type(declared_arg_types[1]);
+		if (!OidIsValid(res_atypeId))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("could not find array type for data type %s",
+							format_type_be(declared_arg_types[1])),
+					 parser_errposition(pstate, location)));
+	}
 	actual_arg_types[1] = atypeId;
 	declared_arg_types[1] = res_atypeId;
 
@@ -973,12 +1097,15 @@ make_scalar_array_op(ParseState *pstate, List *opname,
 	/* and build the expression node */
 	result = makeNode(ScalarArrayOpExpr);
 	result->opno = oprid(tup);
-	result->opfuncid = InvalidOid;
+	result->opfuncid = opform->oprcode;
 	result->useOr = useOr;
 	result->args = args;
 
 	ReleaseOperator(tup);
 
+	/* Hack to protect pg_get_expr() against misuse */
+	check_pg_get_expr_args(pstate, result->opfuncid, args);
+
 	return (Expr *) result;
 }
 
@@ -1030,14 +1157,15 @@ make_op_expr(ParseState *pstate, Operator op,
 	}
 
 	/*
-	 * enforce consistency with ANYARRAY and ANYELEMENT argument and return
-	 * types, possibly adjusting return type or declared_arg_types (which will
-	 * be used as the cast destination by make_fn_arguments)
+	 * enforce consistency with polymorphic argument and return types,
+	 * possibly adjusting return type or declared_arg_types (which will be
+	 * used as the cast destination by make_fn_arguments)
 	 */
 	rettype = enforce_generic_type_consistency(actual_arg_types,
 											   declared_arg_types,
 											   nargs,
-											   opform->oprresult);
+											   opform->oprresult,
+											   false);
 
 	/* perform the necessary typecasting of arguments */
 	make_fn_arguments(pstate, args, actual_arg_types, declared_arg_types);
@@ -1045,10 +1173,170 @@ make_op_expr(ParseState *pstate, Operator op,
 	/* and build the expression node */
 	result = makeNode(OpExpr);
 	result->opno = oprid(op);
-	result->opfuncid = InvalidOid;
+	result->opfuncid = opform->oprcode;
 	result->opresulttype = rettype;
 	result->opretset = get_func_retset(opform->oprcode);
 	result->args = args;
 
+	/* Hack to protect pg_get_expr() against misuse */
+	check_pg_get_expr_args(pstate, result->opfuncid, args);
+
 	return (Expr *) result;
 }
+
+
+/*
+ * Lookaside cache to speed operator lookup.  Possibly this should be in
+ * a separate module under utils/cache/ ?
+ *
+ * The idea here is that the mapping from operator name and given argument
+ * types is constant for a given search path (or single specified schema OID)
+ * so long as the contents of pg_operator and pg_cast don't change.  And that
+ * mapping is pretty expensive to compute, especially for ambiguous operators;
+ * this is mainly because there are a *lot* of instances of popular operator
+ * names such as "=", and we have to check each one to see which is the
+ * best match.  So once we have identified the correct mapping, we save it
+ * in a cache that need only be flushed on pg_operator or pg_cast change.
+ * (pg_cast must be considered because changes in the set of implicit casts
+ * affect the set of applicable operators for any given input datatype.)
+ *
+ * XXX in principle, ALTER TABLE ... INHERIT could affect the mapping as
+ * well, but we disregard that since there's no convenient way to find out
+ * about it, and it seems a pretty far-fetched corner-case anyway.
+ *
+ * Note: at some point it might be worth doing a similar cache for function
+ * lookups.  However, the potential gain is a lot less since (a) function
+ * names are generally not overloaded as heavily as operator names, and
+ * (b) we'd have to flush on pg_proc updates, which are probably a good
+ * deal more common than pg_operator updates.
+ */
+
+/* The operator cache hashtable */
+static HTAB *OprCacheHash = NULL;
+
+
+/*
+ * make_oper_cache_key
+ *		Fill the lookup key struct given operator name and arg types.
+ *
+ * Returns TRUE if successful, FALSE if the search_path overflowed
+ * (hence no caching is possible).
+ */
+static bool
+make_oper_cache_key(OprCacheKey *key, List *opname, Oid ltypeId, Oid rtypeId)
+{
+	char	   *schemaname;
+	char	   *opername;
+
+	/* deconstruct the name list */
+	DeconstructQualifiedName(opname, &schemaname, &opername);
+
+	/* ensure zero-fill for stable hashing */
+	MemSet(key, 0, sizeof(OprCacheKey));
+
+	/* save operator name and input types into key */
+	strlcpy(key->oprname, opername, NAMEDATALEN);
+	key->left_arg = ltypeId;
+	key->right_arg = rtypeId;
+
+	if (schemaname)
+	{
+		/* search only in exact schema given */
+		key->search_path[0] = LookupExplicitNamespace(schemaname);
+	}
+	else
+	{
+		/* get the active search path */
+		if (fetch_search_path_array(key->search_path,
+									MAX_CACHED_PATH_LEN) > MAX_CACHED_PATH_LEN)
+			return false;		/* oops, didn't fit */
+	}
+
+	return true;
+}
+
+/*
+ * find_oper_cache_entry
+ *
+ * Look for a cache entry matching the given key.  If found, return the
+ * contained operator OID, else return InvalidOid.
+ */
+static Oid
+find_oper_cache_entry(OprCacheKey *key)
+{
+	OprCacheEntry *oprentry;
+
+	if (OprCacheHash == NULL)
+	{
+		/* First time through: initialize the hash table */
+		HASHCTL		ctl;
+
+		if (!CacheMemoryContext)
+			CreateCacheMemoryContext();
+
+		MemSet(&ctl, 0, sizeof(ctl));
+		ctl.keysize = sizeof(OprCacheKey);
+		ctl.entrysize = sizeof(OprCacheEntry);
+		ctl.hash = tag_hash;
+		OprCacheHash = hash_create("Operator lookup cache", 256,
+									&ctl, HASH_ELEM | HASH_FUNCTION);
+
+		/* Arrange to flush cache on pg_operator and pg_cast changes */
+		CacheRegisterSyscacheCallback(OPERNAMENSP,
+									  InvalidateOprCacheCallBack,
+									  (Datum) 0);
+		CacheRegisterSyscacheCallback(CASTSOURCETARGET,
+									  InvalidateOprCacheCallBack,
+									  (Datum) 0);
+	}
+
+	/* Look for an existing entry */
+	oprentry = (OprCacheEntry *) hash_search(OprCacheHash,
+											 (void *) key,
+											 HASH_FIND, NULL);
+	if (oprentry == NULL)
+		return InvalidOid;
+
+	return oprentry->opr_oid;
+}
+
+/*
+ * make_oper_cache_entry
+ *
+ * Insert a cache entry for the given key.
+ */
+static void
+make_oper_cache_entry(OprCacheKey *key, Oid opr_oid)
+{
+	OprCacheEntry *oprentry;
+
+	Assert(OprCacheHash != NULL);
+
+	oprentry = (OprCacheEntry *) hash_search(OprCacheHash,
+											 (void *) key,
+											 HASH_ENTER, NULL);
+	oprentry->opr_oid = opr_oid;
+}
+
+/*
+ * Callback for pg_operator and pg_cast inval events
+ */
+static void
+InvalidateOprCacheCallBack(Datum arg, int cacheid, ItemPointer tuplePtr)
+{
+	HASH_SEQ_STATUS status;
+	OprCacheEntry *hentry;
+
+	Assert(OprCacheHash != NULL);
+
+	/* Currently we just flush all entries; hard to be smarter ... */
+	hash_seq_init(&status, OprCacheHash);
+
+	while ((hentry = (OprCacheEntry *) hash_seq_search(&status)) != NULL)
+	{
+		if (hash_search(OprCacheHash,
+						(void *) &hentry->key,
+						HASH_REMOVE, NULL) == NULL)
+			elog(ERROR, "hash table corrupted");
+	}
+}
diff --git a/src/backend/parser/parse_partition.c b/src/backend/parser/parse_partition.c
index be9f8d79ffe6..447cbc1b85e4 100644
--- a/src/backend/parser/parse_partition.c
+++ b/src/backend/parser/parse_partition.c
@@ -31,6 +31,7 @@
 #include "parser/parse_node.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_partition.h"
+#include "parser/parse_utilcmd.h"
 #include "parser/parse_type.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
@@ -74,7 +75,7 @@ typedef struct
 	int			location;
 }	range_partition_ctx;
 
-static void make_child_node(CreateStmt *stmt, CreateStmtContext *cxt, char *relname,
+static void make_child_node(ParseState *pstate, CreateStmt *stmt, CreateStmtContext *cxt, char *relname,
 				PartitionBy *curPby, Node *newSub,
 				Node *pRuleCatalog, Node *pPostCreate, Node *pConstraint,
 				Node *pStoreAttr, char *prtstr, bool bQuiet,
@@ -332,10 +333,12 @@ transformPartitionBy(ParseState *pstate, CreateStmtContext *cxt,
 
 					if (!OidIsValid(typeid))
 					{
-						Type		type = typenameType(pstate, column->typname);
+						int32		typmod;
 
-						column->typname->typid = typeid = typeTypeId(type);
-						ReleaseType(type);
+						typeid = typenameTypeId(pstate, column->typname, &typmod);
+
+						column->typname->typid = typeid;
+						column->typname->typemod = typmod;
 					}
 				}
 				break;
@@ -852,7 +855,7 @@ transformPartitionBy(ParseState *pstate, CreateStmtContext *cxt,
 		if (newSub)
 			newSub->parentRel = copyObject(pBy->parentRel);
 
-		make_child_node(stmt, cxt, relname, curPby, (Node *) newSub,
+		make_child_node(pstate, stmt, cxt, relname, curPby, (Node *) newSub,
 						pRuleCatalog, pPostCreate, pConstraint, pStoreAttr,
 						prtstr, bQuiet, colencs);
 
@@ -977,7 +980,7 @@ merge_part_column_encodings(CreateStmt *cs, List *stenc)
 }
 
 static void
-make_child_node(CreateStmt *stmt, CreateStmtContext *cxt, char *relname,
+make_child_node(ParseState *pstate, CreateStmt *stmt, CreateStmtContext *cxt, char *relname,
 				PartitionBy *curPby, Node *newSub,
 				Node *pRuleCatalog, Node *pPostCreate, Node *pConstraint,
 				Node *pStoreAttr, char *prtstr, bool bQuiet,
@@ -986,6 +989,8 @@ make_child_node(CreateStmt *stmt, CreateStmtContext *cxt, char *relname,
 	RangeVar   *parent_tab_name = makeNode(RangeVar);
 	RangeVar   *child_tab_name = makeNode(RangeVar);
 	CreateStmt *child_tab_stmt = makeNode(CreateStmt);
+	AlterTableStmt *ats;
+	List	   *childstmts;
 
 	parent_tab_name->catalogname = cxt->relation->catalogname;
 	parent_tab_name->schemaname = cxt->relation->schemaname;
@@ -1101,28 +1106,33 @@ make_child_node(CreateStmt *stmt, CreateStmtContext *cxt, char *relname,
 		}
 	}
 
-	cxt->alist = lappend(cxt->alist, child_tab_stmt);
+	childstmts = transformCreateStmt(child_tab_stmt, pstate->p_sourcetext, true);
 
 	/*
-	 * ALTER TABLE for inheritance after CREATE TABLE ... XXX: Think of a
-	 * better way.
+	 * Attach the child partition to the parent, by creating an ALTER TABLE
+	 * statement. The order of the commands is important: we want the CREATE
+	 * TABLE command for the partition to be executed first, then the ALTER
+	 * TABLE to make it inherit the parent, and any additional commands to
+	 * create subpartitions after that.
 	 */
-	if (1)
 	{
-		AlterTableCmd *atc = makeNode(AlterTableCmd);
-		AlterTableStmt *ats = makeNode(AlterTableStmt);
-		InheritPartitionCmd *ipc = makeNode(InheritPartitionCmd);
+		AlterTableCmd *atc;
+		InheritPartitionCmd *ipc;
+
+		ipc = makeNode(InheritPartitionCmd);
+		ipc->parent = parent_tab_name;
 
 		/* alter table child inherits parent */
+		atc = makeNode(AlterTableCmd);
 		atc->subtype = AT_AddInherit;
-		ipc->parent = parent_tab_name;
 		atc->def = (Node *) ipc;
+
+		ats = makeNode(AlterTableStmt);
 		ats->relation = child_tab_name;
 		ats->cmds = list_make1((Node *) atc);
 		ats->relkind = OBJECT_TABLE;
 
 		/* this is the deepest we're going, add the partition rules */
-		if (1)
 		{
 			AlterTableCmd *atc2 = makeNode(AlterTableCmd);
 
@@ -1131,8 +1141,15 @@ make_child_node(CreateStmt *stmt, CreateStmtContext *cxt, char *relname,
 			atc2->def = (Node *) curPby;
 			ats->cmds = lappend(ats->cmds, atc2);
 		}
-		cxt->alist = lappend(cxt->alist, ats);
 	}
+
+	/* CREATE TABLE command for the partition */
+	cxt->alist = lappend(cxt->alist, linitial(childstmts));
+	childstmts = list_delete_first(childstmts);
+	/* ALTER TABLE goes next */
+	cxt->alist = lappend(cxt->alist, ats);
+	/* And then any additional commands generated from the CREATE TABLE */
+	cxt->alist = list_concat(cxt->alist, childstmts);
 }
 
 static void
@@ -2965,7 +2982,7 @@ partition_arg_get_val(Node *node, bool *isnull)
 {
 	Const	   *c;
 
-	c = (Const *) evaluate_expr((Expr *) node, exprType(node));
+	c = (Const *) evaluate_expr((Expr *) node, exprType(node), exprTypmod(node));
 	if (!IsA(c, Const))
 		elog(ERROR, "partition parameter is not constant");
 
@@ -3002,10 +3019,9 @@ preprocess_range_spec(partValidationState *vstate)
 				found = true;
 				if (!OidIsValid(column->typname->typid))
 				{
-					Type		type = typenameType(vstate->pstate, column->typname);
-
-					column->typname->typid = typeTypeId(type);
-					ReleaseType(type);
+					column->typname->typid =
+						typenameTypeId(vstate->pstate, column->typname,
+									   &column->typname->typemod);
 				}
 				typname = column->typname;
 				break;
@@ -3119,9 +3135,8 @@ preprocess_range_spec(partValidationState *vstate)
 					{
 						TypeName   *typ = lfirst(lccol);
 						Node	   *newnode;
-						Oid			typid = typenameTypeId(vstate->pstate, typ);
-						int32		typmod = typenameTypeMod(vstate->pstate,
-															 typ, typid);
+						int32		typmod;
+						Oid			typid = typenameTypeId(vstate->pstate, typ,  &typmod);
 
 						newnode = coerce_partition_value(lfirst(lcstart),
 														 typid, typmod,
@@ -3203,9 +3218,8 @@ preprocess_range_spec(partValidationState *vstate)
 					Const	   *myend;
 					Const	   *clauseend;
 					Const	   *clauseevery;
-					Oid			typid = typenameTypeId(vstate->pstate, type);
-					int32		typmod = typenameTypeMod(vstate->pstate,
-														 type, typid);
+					int32		typmod;
+					Oid			typid = typenameTypeId(vstate->pstate, type, &typmod);
 					int16		len = get_typlen(typid);
 					bool		typbyval = get_typbyval(typid);
 
@@ -3389,9 +3403,8 @@ preprocess_range_spec(partValidationState *vstate)
 					Node	   *mystart = lfirst(lcstart);
 					TypeName   *typ = lfirst(lccol);
 					Node	   *newnode;
-					Oid			typid = typenameTypeId(vstate->pstate, typ);
-					int32		typmod = typenameTypeMod(vstate->pstate,
-														 typ, typid);
+					int32		typmod;
+					Oid			typid = typenameTypeId(vstate->pstate, typ, &typmod);
 
 					newnode = coerce_partition_value(mystart,
 													 typid, typmod,
@@ -3413,9 +3426,8 @@ preprocess_range_spec(partValidationState *vstate)
 					Node	   *myend = lfirst(lcend);
 					TypeName   *typ = lfirst(lccol);
 					Node	   *newnode;
-					Oid			typid = typenameTypeId(vstate->pstate, typ);
-					int32		typmod = typenameTypeMod(vstate->pstate,
-														 typ, typid);
+					int32		typmod;
+					Oid			typid = typenameTypeId(vstate->pstate, typ, &typmod);
 
 					newnode = coerce_partition_value(myend,
 													 typid, typmod,
@@ -3670,9 +3682,8 @@ partition_range_every(ParseState *pstate, PartitionBy *pBy, List *coltypes,
 				Oid			restypid;
 				Type		typ;
 				char	   *outputstr;
-				Oid			coltypid = typenameTypeId(vstate->pstate, type);
-				int32		coltypmod = typenameTypeMod(vstate->pstate,
-														type, coltypid);
+				int32		coltypmod;
+				Oid			coltypid = typenameTypeId(vstate->pstate, type, &coltypmod);
 
 				oprmul = lappend(NIL, makeString("*"));
 				oprplus = lappend(NIL, makeString("+"));
@@ -4684,10 +4695,9 @@ validate_list_partition(partValidationState *vstate)
 				found = true;
 				if (!OidIsValid(column->typname->typid))
 				{
-					Type		type = typenameType(vstate->pstate, column->typname);
-
-					column->typname->typid = typeTypeId(type);
-					ReleaseType(type);
+					column->typname->typid
+						= typenameTypeId(vstate->pstate, column->typname,
+										 &column->typname->typemod);
 				}
 				typname = column->typname;
 				break;
@@ -4759,9 +4769,8 @@ validate_list_partition(partValidationState *vstate)
 				Node	   *node = transformExpr(vstate->pstate,
 												 (Node *) lfirst(lc_val));
 				TypeName   *type = lfirst(llc2);
-				Oid			typid = typenameTypeId(vstate->pstate, type);
-				int32		typmod = typenameTypeMod(vstate->pstate,
-													 type, typid);
+				int32		typmod;
+				Oid			typid = typenameTypeId(vstate->pstate, type, &typmod);
 
 				node = coerce_partition_value(node, typid, typmod,
 											  PARTTYP_LIST);
@@ -5113,7 +5122,7 @@ coerce_partition_value(Node *node, Oid typid, int32 typmod,
 	 * And then evaluate it. evaluate_expr calls possible cast function, and
 	 * returns a Const. (the check for that below is just for paranoia)
 	 */
-	out = (Node *) evaluate_expr((Expr *) out, typid);
+	out = (Node *) evaluate_expr((Expr *) out, typid, typmod);
 	if (!IsA(out, Const))
 		elog(ERROR, "partition parameter is not constant");
 
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 7eb1f7371b55..18851e9b0f7e 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.127 2007/01/05 22:19:34 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.130.2.1 2008/04/05 01:58:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -484,14 +484,18 @@ scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, char *colname,
 		attnum = specialAttNum(colname);
 		if (attnum != InvalidAttrNumber)
 		{
-			/* now check to see if column actually is defined */
-			if (caql_getcount(
-						NULL,
-						cql("SELECT COUNT(*) FROM pg_attribute "
-							" WHERE attrelid = :1 "
-							" AND attnum = :2 ",
-							ObjectIdGetDatum(rte->relid),
-							Int16GetDatum(attnum))))
+			/*
+			 * Now check to see if column actually is defined.  Because of
+			 * an ancient oversight in DefineQueryRewrite, it's possible that
+			 * pg_attribute contains entries for system columns for a view,
+			 * even though views should not have such --- so we also check
+			 * the relkind.  This kluge will not be needed in 9.3 and later.
+			 */
+			if (SearchSysCacheExists(ATTNUM,
+									 ObjectIdGetDatum(rte->relid),
+									 Int16GetDatum(attnum),
+									 0, 0) &&
+				get_rel_relkind(rte->relid) != RELKIND_VIEW)
 			{
 				result = (Node *) make_var(pstate, rte, attnum, location);
 				/* Require read access */
@@ -1178,8 +1182,7 @@ addRangeTableEntryForFunction(ParseState *pstate,
 						 errmsg("column \"%s\" cannot be declared SETOF",
 								attrname),
 						 parser_errposition(pstate, n->typname->location)));
-			attrtype = typenameTypeId(pstate, n->typname);
-			attrtypmod = typenameTypeMod(pstate, n->typname, attrtype);
+			attrtype = typenameTypeId(pstate, n->typname, &attrtypmod);
 			eref->colnames = lappend(eref->colnames, makeString(attrname));
 			rte->funccoltypes = lappend_oid(rte->funccoltypes, attrtype);
 			rte->funccoltypmods = lappend_int(rte->funccoltypmods, attrtypmod);
@@ -1490,33 +1493,53 @@ getLockingClause(ParseState *pstate, char *refname)
  *
  * The oid must reference a normal, heap relation. This disallows
  * AO, AO/CO, external tables, views, etc.
+ *
+ * If 'noerror' is true, function returns true/false. If 'noerror'
+ * is false, throws an error if the relation is not simply updatable.
  */
 bool
-isSimplyUpdatableRelation(Oid relid)
+isSimplyUpdatableRelation(Oid relid, bool noerror)
 {
-	if (OidIsValid(relid))
-	{
-		cqContext		*pcqCtx;
-		HeapTuple		 tuple;
+	Relation rel;
 
-		pcqCtx = caql_beginscan(
-				NULL,
-				cql("SELECT * FROM pg_class "
-					" WHERE oid = :1 ",
-					ObjectIdGetDatum(relid)));
+	rel = relation_open(relid, AccessShareLock);
 
-		tuple = caql_getnext(pcqCtx);
+	/*
+	 * This should match the error message in rewriteManip.c,
+	 * so that you get the same error as in PostgreSQL.
+	 */
+	if (rel->rd_rel->relkind == RELKIND_VIEW)
+	{
+		if (!noerror)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("WHERE CURRENT OF on a view is not implemented")));
+		return false;
+	}
 
-		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "cache lookup failed for relation %u", relid);
-		Form_pg_class rel = (Form_pg_class) GETSTRUCT(tuple);
-		bool is_heap_tuple = rel->relkind == RELKIND_RELATION &&
-							 rel->relstorage == RELSTORAGE_HEAP;
+	if (rel->rd_rel->relkind != RELKIND_RELATION)
+	{
+		if (!noerror)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("\"%s\" is not simply updatable",
+							RelationGetRelationName(rel))));
+		return false;
+	}
 
-		caql_endscan(pcqCtx);
-		return is_heap_tuple;
+	if (rel->rd_rel->relstorage != RELSTORAGE_HEAP)
+	{
+		if (!noerror)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("\"%s\" is not simply updatable",
+							RelationGetRelationName(rel))));
+		return false;
 	}
-	return false;
+
+	relation_close(rel, NoLock);
+
+	return true;
 }
 
 /*
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 51c888507711..18c5a71c2011 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.154 2007/02/03 14:06:54 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.158 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -415,7 +415,7 @@ transformAssignedExpr(ParseState *pstate,
 			 * is not really a source value to work with. Insert a NULL
 			 * constant as the source value.
 			 */
-			colVar = (Node *) makeNullConst(attrtype, -1);
+			colVar = (Node *) makeNullConst(attrtype, attrtypmod);
 		}
 		else
 		{
@@ -851,8 +851,8 @@ ExpandColumnRefStar(ParseState *pstate, ColumnRef *cref,
 		 *
 		 * Since the grammar only accepts bare '*' at top level of SELECT, we
 		 * need not handle the targetlist==false case here.  However, we must
-		 * test for it because the grammar currently fails to distinguish
-		 * a quoted name "*" from a real asterisk.
+		 * test for it because the grammar currently fails to distinguish a
+		 * quoted name "*" from a real asterisk.
 		 */
 		if (!targetlist)
 			elog(ERROR, "invalid use of *");
@@ -1394,7 +1394,7 @@ FigureColnameInternal(Node *node, char **name)
 			break;
 		case T_XmlExpr:
 			/* make SQL/XML functions act like a regular function */
-			switch (((XmlExpr*) node)->op)
+			switch (((XmlExpr *) node)->op)
 			{
 				case IS_XMLCONCAT:
 					*name = "xmlconcat";
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 3a513bb562bc..40d6c68e970d 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_type.c,v 1.87 2007/01/05 22:19:34 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_type.c,v 1.94 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,26 +28,46 @@
 #include "utils/syscache.h"
 
 
+static int32 typenameTypeMod(ParseState *pstate, const TypeName *typename,
+				Type typ);
+
+
 /*
  * LookupTypeName
- *		Given a TypeName object, get the OID of the referenced type.
- *		Returns InvalidOid if no such type can be found.
+ *		Given a TypeName object, lookup the pg_type syscache entry of the type.
+ *		Returns NULL if no such type can be found.	If the type is found,
+ *		the typmod value represented in the TypeName struct is computed and
+ *		stored into *typmod_p.
+ *
+ * NB: on success, the caller must ReleaseSysCache the type tuple when done
+ * with it.
+ *
+ * NB: direct callers of this function MUST check typisdefined before assuming
+ * that the type is fully valid.  Most code should go through typenameType
+ * or typenameTypeId instead.
  *
- * NB: even if the returned OID is not InvalidOid, the type might be
- * just a shell.  Caller should check typisdefined before using the type.
+ * typmod_p can be passed as NULL if the caller does not care to know the
+ * typmod value, but the typmod decoration (if any) will be validated anyway,
+ * except in the case where the type is not found.	Note that if the type is
+ * found but is a shell, and there is typmod decoration, an error will be
+ * thrown --- this is intentional.
  *
  * pstate is only used for error location info, and may be NULL.
  */
-Oid
-LookupTypeName(ParseState *pstate, const TypeName *typename)
+Type
+LookupTypeName(ParseState *pstate, const TypeName *typename,
+			   int32 *typmod_p)
 {
-	Oid			restype;
+	Oid			typoid;
+	HeapTuple	tup;
+	int32		typmod;
 
-	/* Easy if it's an internally generated TypeName */
 	if (typename->names == NIL)
-		return typename->typid;
-
-	if (typename->pct_type)
+	{
+		/* We have the OID already if it's an internally generated TypeName */
+		typoid = typename->typid;
+	}
+	else if (typename->pct_type)
 	{
 		/* Handle %TYPE reference to type of an existing field */
 		RangeVar   *rel = makeRangeVar(NULL, NULL, typename->location);
@@ -98,7 +118,7 @@ LookupTypeName(ParseState *pstate, const TypeName *typename)
 					 errmsg("column \"%s\" of relation \"%s\" does not exist",
 							field, rel->relname),
 					 parser_errposition(pstate, typename->location)));
-		restype = get_atttype(relid, attnum);
+		typoid = get_atttype(relid, attnum);
 
 		/* this construct should never have an array indicator */
 		Assert(typename->arrayBounds == NIL);
@@ -107,7 +127,7 @@ LookupTypeName(ParseState *pstate, const TypeName *typename)
 		ereport(NOTICE,
 				(errmsg("type reference %s converted to %s",
 						TypeNameToString(typename),
-						format_type_be(restype))));
+						format_type_be(typoid))));
 	}
 	else
 	{
@@ -124,135 +144,86 @@ LookupTypeName(ParseState *pstate, const TypeName *typename)
 			Oid			namespaceId;
 
 			namespaceId = LookupExplicitNamespace(schemaname);
-
-			restype = caql_getoid(
-					NULL,
-					cql("SELECT oid FROM pg_type "
-						" WHERE typname = :1 "
-						" AND typnamespace = :2 ",
-						CStringGetDatum(typname),
-						ObjectIdGetDatum(namespaceId)));
+			typoid = GetSysCacheOid(TYPENAMENSP,
+									PointerGetDatum(typname),
+									ObjectIdGetDatum(namespaceId),
+									0, 0);
 		}
 		else
 		{
 			/* Unqualified type name, so search the search path */
-			restype = TypenameGetTypid(typname);
+			typoid = TypenameGetTypid(typname);
 		}
 
-		/*  If an array reference, return the array type instead */
+		/* If an array reference, return the array type instead */
 		if (typename->arrayBounds != NIL)
-			restype = get_array_type(restype);
-
+			typoid = get_array_type(typoid);
 	}
 
-	return restype;
-}
-
-/*
- * appendTypeNameToBuffer
- *		Append a string representing the name of a TypeName to a StringInfo.
- *		This is the shared guts of TypeNameToString and TypeNameListToString.
- *
- * NB: this must work on TypeNames that do not describe any actual type;
- * it is mostly used for reporting lookup errors.
- */
-static void
-appendTypeNameToBuffer(const TypeName *typename, StringInfo string)
-{
-	if (typename->names != NIL)
-	{
-		/* Emit possibly-qualified name as-is */
-		ListCell   *l;
-
-		foreach(l, typename->names)
-		{
-			if (l != list_head(typename->names))
-				appendStringInfoChar(string, '.');
-			appendStringInfoString(string, strVal(lfirst(l)));
-		}
-	}
-	else
+	if (!OidIsValid(typoid))
 	{
-		/* Look up internally-specified type */
-		appendStringInfoString(string, format_type_be(typename->typid));
+		if (typmod_p)
+			*typmod_p = -1;
+		return NULL;
 	}
 
-	/*
-	 * Add decoration as needed, but only for fields considered by
-	 * LookupTypeName
-	 */
-	if (typename->pct_type)
-		appendStringInfoString(string, "%TYPE");
-
-	if (typename->arrayBounds != NIL)
-		appendStringInfoString(string, "[]");
-}
-
-/*
- * TypeNameToString
- *		Produce a string representing the name of a TypeName.
- *
- * NB: this must work on TypeNames that do not describe any actual type;
- * it is mostly used for reporting lookup errors.
- */
-char *
-TypeNameToString(const TypeName *typename)
-{
-	StringInfoData string;
-
-	initStringInfo(&string);
-	appendTypeNameToBuffer(typename, &string);
-	return string.data;
-}
+	tup = SearchSysCache(TYPEOID,
+						 ObjectIdGetDatum(typoid),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for type %u", typoid);
 
-/*
- * TypeNameListToString
- *		Produce a string representing the name(s) of a List of TypeNames
- */
-char *
-TypeNameListToString(List *typenames)
-{
-	StringInfoData string;
-	ListCell   *l;
+	typmod = typenameTypeMod(pstate, typename, (Type) tup);
 
-	initStringInfo(&string);
-	foreach(l, typenames)
-	{
-		TypeName   *typename = (TypeName *) lfirst(l);
+	if (typmod_p)
+		*typmod_p = typmod;
 
-		Assert(IsA(typename, TypeName));
-		if (l != list_head(typenames))
-			appendStringInfoChar(&string, ',');
-		appendTypeNameToBuffer(typename, &string);
-	}
-	return string.data;
+	return (Type) tup;
 }
 
 /*
- * typenameTypeId - given a TypeName, return the type's OID
+ * typenameType - given a TypeName, return a Type structure and typmod
  *
  * This is equivalent to LookupTypeName, except that this will report
  * a suitable error message if the type cannot be found or is not defined.
+ * Callers of this can therefore assume the result is a fully valid type.
  */
-Oid
-typenameTypeId(ParseState *pstate, const TypeName *typename)
+Type
+typenameType(ParseState *pstate, const TypeName *typename, int32 *typmod_p)
 {
-	Oid			typoid;
+	Type		tup;
 
-	typoid = LookupTypeName(pstate, typename);
-	if (!OidIsValid(typoid))
+	tup = LookupTypeName(pstate, typename, typmod_p);
+	if (tup == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("type \"%s\" does not exist",
 						TypeNameToString(typename)),
 				 parser_errposition(pstate, typename->location)));
-
-	if (!get_typisdefined(typoid))
+	if (!((Form_pg_type) GETSTRUCT(tup))->typisdefined)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("type \"%s\" is only a shell",
 						TypeNameToString(typename)),
 				 parser_errposition(pstate, typename->location)));
+	return tup;
+}
+
+/*
+ * typenameTypeId - given a TypeName, return the type's OID and typmod
+ *
+ * This is equivalent to typenameType, but we only hand back the type OID
+ * not the syscache entry.
+ */
+Oid
+typenameTypeId(ParseState *pstate, const TypeName *typename, int32 *typmod_p)
+{
+	Oid			typoid;
+	Type		tup;
+
+	tup = typenameType(pstate, typename, typmod_p);
+	typoid = HeapTupleGetOid(tup);
+	ReleaseSysCache(tup);
 
 	return typoid;
 }
@@ -264,13 +235,12 @@ typenameTypeId(ParseState *pstate, const TypeName *typename)
  * illegal for the data type.
  *
  * The actual type OID represented by the TypeName must already have been
- * determined (usually by typenameTypeId()), and is passed as typeId.
+ * looked up, and is passed as "typ".
  *
  * pstate is only used for error location info, and may be NULL.
  */
-int32
-typenameTypeMod(ParseState *pstate, const TypeName *typename,
-				Oid typeId)
+static int32
+typenameTypeMod(ParseState *pstate, const TypeName *typename, Type typ)
 {
 	int32		result;
 	Oid			typmodin;
@@ -280,14 +250,23 @@ typenameTypeMod(ParseState *pstate, const TypeName *typename,
 	ArrayType  *arrtypmod;
 	ParseCallbackState pcbstate;
 
-	Assert(OidIsValid(typeId));
-
 	/* Return prespecified typmod if no typmod expressions */
 	if (typename->typmods == NIL)
 		return typename->typemod;
 
-	/* Else, type had better accept typmods */
-	typmodin = get_typmodin(typeId);
+	/*
+	 * Else, type had better accept typmods.  We give a special error message
+	 * for the shell-type case, since a shell couldn't possibly have a
+	 * typmodin function.
+	 */
+	if (!((Form_pg_type) GETSTRUCT(typ))->typisdefined)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+			errmsg("type modifier cannot be specified for shell type \"%s\"",
+				   TypeNameToString(typename)),
+				 parser_errposition(pstate, typename->location)));
+
+	typmodin = ((Form_pg_type) GETSTRUCT(typ))->typmodin;
 
 	if (typmodin == InvalidOid)
 		ereport(ERROR,
@@ -297,9 +276,9 @@ typenameTypeMod(ParseState *pstate, const TypeName *typename,
 				 parser_errposition(pstate, typename->location)));
 
 	/*
-	 * Convert the list of raw-grammar-output  expressions to a cstring array.
-	 * Currently, we only allow simple integer constants, string literals, and
-	 * identifiers; possibly this could be extended.
+	 * Convert the list of raw-grammar-output expressions to a cstring array.
+	 * Currently, we allow simple numeric constants, string literals, and
+	 * identifiers; possibly this list could be extended.
 	 */
 	datums = (Datum *) palloc(list_length(typename->typmods) * sizeof(Datum));
 	n = 0;
@@ -362,35 +341,83 @@ typenameTypeMod(ParseState *pstate, const TypeName *typename,
 }
 
 /*
- * typenameType - given a TypeName, return a Type structure
+ * appendTypeNameToBuffer
+ *		Append a string representing the name of a TypeName to a StringInfo.
+ *		This is the shared guts of TypeNameToString and TypeNameListToString.
  *
- * This is equivalent to typenameTypeId + syscache fetch of Type tuple.
- * NB: caller must ReleaseType the type tuple when done with it.
+ * NB: this must work on TypeNames that do not describe any actual type;
+ * it is mostly used for reporting lookup errors.
  */
-Type
-typenameType(ParseState *pstate, const TypeName *typename)
+static void
+appendTypeNameToBuffer(const TypeName *typename, StringInfo string)
 {
-	Oid			typoid;
-	HeapTuple	tup;
+	if (typename->names != NIL)
+	{
+		/* Emit possibly-qualified name as-is */
+		ListCell   *l;
 
-	typoid = LookupTypeName(pstate, typename);
-	if (!OidIsValid(typoid))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("type \"%s\" does not exist",
-						TypeNameToString(typename))));
-	tup = SearchSysCache(TYPEOID,
-						 ObjectIdGetDatum(typoid),
-						 0, 0, 0);
-	if (!HeapTupleIsValid(tup)) /* should not happen */
-		elog(ERROR, "cache lookup failed for type %u", typoid);
-	if (!((Form_pg_type) GETSTRUCT(tup))->typisdefined)
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("type \"%s\" is only a shell",
-						TypeNameToString(typename)),
-				 parser_errposition(pstate, typename->location)));
-	return (Type) tup;
+		foreach(l, typename->names)
+		{
+			if (l != list_head(typename->names))
+				appendStringInfoChar(string, '.');
+			appendStringInfoString(string, strVal(lfirst(l)));
+		}
+	}
+	else
+	{
+		/* Look up internally-specified type */
+		appendStringInfoString(string, format_type_be(typename->typid));
+	}
+
+	/*
+	 * Add decoration as needed, but only for fields considered by
+	 * LookupTypeName
+	 */
+	if (typename->pct_type)
+		appendStringInfoString(string, "%TYPE");
+
+	if (typename->arrayBounds != NIL)
+		appendStringInfoString(string, "[]");
+}
+
+/*
+ * TypeNameToString
+ *		Produce a string representing the name of a TypeName.
+ *
+ * NB: this must work on TypeNames that do not describe any actual type;
+ * it is mostly used for reporting lookup errors.
+ */
+char *
+TypeNameToString(const TypeName *typename)
+{
+	StringInfoData string;
+
+	initStringInfo(&string);
+	appendTypeNameToBuffer(typename, &string);
+	return string.data;
+}
+
+/*
+ * TypeNameListToString
+ *		Produce a string representing the name(s) of a List of TypeNames
+ */
+char *
+TypeNameListToString(List *typenames)
+{
+	StringInfoData string;
+	ListCell   *l;
+
+	initStringInfo(&string);
+	foreach(l, typenames)
+	{
+		TypeName   *typename = (TypeName *) lfirst(l);
+
+		Assert(IsA(typename, TypeName));
+		if (l != list_head(typenames))
+			appendStringInfoChar(&string, ',');
+		appendTypeNameToBuffer(typename, &string);
+	}
+	return string.data;
 }
 
 /* return a Type structure, given a type id */
@@ -437,16 +464,6 @@ typeByVal(Type t)
 	return typ->typbyval;
 }
 
-/* given type (as type struct), return the value of its 'typtype' attribute.*/
-char
-typeTypType(Type t)
-{
-	Form_pg_type typ;
-
-	typ = (Form_pg_type) GETSTRUCT(t);
-	return typ->typtype;
-}
-
 /* given type (as type struct), return the name of type */
 char *
 typeTypeName(Type t)
@@ -530,7 +547,7 @@ pts_error_callback(void *arg)
  * the string and convert it to a type OID and type modifier.
  */
 void
-parseTypeString(const char *str, Oid *type_id, int32 *typmod)
+parseTypeString(const char *str, Oid *type_id, int32 *typmod_p)
 {
 	StringInfoData buf;
 	List	   *raw_parsetree_list;
@@ -603,8 +620,7 @@ parseTypeString(const char *str, Oid *type_id, int32 *typmod)
 	if (typename->setof)
 		goto fail;
 
-	*type_id = typenameTypeId(NULL, typename);
-	*typmod = typenameTypeMod(NULL, typename, *type_id);
+	*type_id = typenameTypeId(NULL, typename, typmod_p);
 
 	pfree(buf.data);
 
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 6aafb6be430d..ee982dee61f4 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -30,6 +30,7 @@
 #include "access/heapam.h"
 #include "access/reloptions.h"
 #include "catalog/catquery.h"
+#include "catalog/pg_compression.h"
 #include "catalog/pg_constraint.h"
 #include "catalog/dependency.h"
 #include "catalog/heap.h"
@@ -37,448 +38,615 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_type.h"
+#include "catalog/pg_type_encoding.h"
 #include "commands/defrem.h"
 #include "commands/tablecmds.h"
 #include "commands/tablespace.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
 #include "parser/analyze.h"
 #include "parser/gramparse.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_expr.h"
+#include "parser/parse_partition.h"
 #include "parser/parse_relation.h"
+#include "parser/parse_target.h"
 #include "parser/parse_type.h"
 #include "parser/parse_utilcmd.h"
 #include "rewrite/rewriteManip.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 
-static IndexStmt *generateClonedIndexStmt(CreateStmtContext *cxt,
-						Relation parent_index, AttrNumber *attmap);
+#include "cdb/cdbhash.h"
+#include "cdb/cdbpartition.h"
+#include "cdb/partitionselection.h"
+#include "cdb/cdbvars.h"
+
+/* State shared by transformCreateSchemaStmt and its subroutines */
+typedef struct
+{
+	const char *stmtType;		/* "CREATE SCHEMA" or "ALTER SCHEMA" */
+	char	   *schemaname;		/* name of schema */
+	char	   *authid;			/* owner of schema */
+	List	   *sequences;		/* CREATE SEQUENCE items */
+	List	   *tables;			/* CREATE TABLE items */
+	List	   *views;			/* CREATE VIEW items */
+	List	   *indexes;		/* CREATE INDEX items */
+	List	   *triggers;		/* CREATE TRIGGER items */
+	List	   *grants;			/* GRANT items */
+} CreateSchemaStmtContext;
+
+static void transformColumnDefinition(ParseState *pstate,
+						  CreateStmtContext *cxt,
+						  ColumnDef *column);
+static void transformTableConstraint(ParseState *pstate,
+						 CreateStmtContext *cxt,
+						 Constraint *constraint);
+static IndexStmt *generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
+						const AttrNumber *attmap, int attmap_length);
 static List *get_opclass(Oid opclass, Oid actual_datatype);
 static IndexStmt *transformIndexConstraint(Constraint *constraint,
 						 CreateStmtContext *cxt);
+static void transformFKConstraints(ParseState *pstate, CreateStmtContext *cxt,
+					   bool skipValidation, bool isAddConstraint);
+static void transformConstraintAttrs(List *constraintList);
+static void transformColumnType(ParseState *pstate, ColumnDef *column);
+static void setSchemaName(char *context_schema, char **stmt_schema_name);
+
+static List *getLikeDistributionPolicy(InhRelation *e);
+static bool co_explicitly_disabled(List *opts);
+static void transformDistributedBy(ParseState *pstate, CreateStmtContext *cxt,
+					   List *distributedBy, GpPolicy **policyp,
+					   List *likeDistributedBy,
+					   bool bQuiet);
+static List *transformAttributeEncoding(List *stenc, CreateStmt *stmt,
+										CreateStmtContext *cxt);
+static bool encodings_overlap(List *a, List *b, bool test_conflicts);
+
+static AlterTableCmd *transformAlterTable_all_PartitionStmt(ParseState *pstate,
+									  AlterTableStmt *stmt,
+									  CreateStmtContext *pCxt,
+									  AlterTableCmd *cmd);
+static List *transformIndexStmt_recurse(IndexStmt *stmt, const char *queryString,
+						   ParseState *masterpstate, bool recurseToPartitions);
 
 /*
- * Generate an IndexStmt node using information from an already existing index
- * "source_idx".  Attribute numbers should be adjusted according to attmap.
+ * transformCreateStmt -
+ *	  parse analysis for CREATE TABLE
+ *
+ * Returns a List of utility commands to be done in sequence.  One of these
+ * will be the transformed CreateStmt, but there may be additional actions
+ * to be done before and after the actual DefineRelation() call.
+ *
+ * SQL92 allows constraints to be scattered all over, so thumb through
+ * the columns and collect all constraints into one place.
+ * If there are any implied indices (e.g. UNIQUE or PRIMARY KEY)
+ * then expand those into multiple IndexStmt blocks.
+ *	  - thomas 1997-12-02
  */
-static IndexStmt *
-generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
-						AttrNumber *attmap)
+List *
+transformCreateStmt(CreateStmt *stmt, const char *queryString, bool createPartition)
 {
-	Oid			source_relid = RelationGetRelid(source_idx);
-	HeapTuple	ht_idxrel;
-	HeapTuple	ht_idx;
-	Form_pg_class idxrelrec;
-	Form_pg_index idxrec;
-	Form_pg_am	amrec;
-	oidvector  *indclass;
-	IndexStmt  *index;
-	List	   *indexprs;
-	ListCell   *indexpr_item;
-	Oid			indrelid;
-	Oid			conoid = InvalidOid;
-	int			keyno;
-	Oid			keycoltype;
-	Datum		datum;
-	bool		isnull;
-	cqContext  *pcqCtx;
+	ParseState *pstate;
+	CreateStmtContext cxt;
+	List	   *result;
+	List	   *save_alist;
+	ListCell   *elements;
+	List	   *likeDistributedBy = NIL;
+	bool		bQuiet = false;		/* shut up transformDistributedBy messages */
+	List	   *stenc = NIL;		/* column reference storage encoding clauses */
+
+ 	/*
+	 * We don't normally care much about the memory consumption of parsing,
+	 * because any memory leaked is leaked into MessageContext which is
+	 * reset between each command. But if a table is heavily partitioned,
+	 * the CREATE TABLE statement can be expanded into hundreds or even
+	 * thousands of CreateStmts, so the leaks start to add up. To reduce
+	 * the memory consumption, we use a temporary memory context that's
+	 * destroyed after processing the CreateStmt for some parts of the
+	 * processing.
+	 */
+	cxt.tempCtx =
+		AllocSetContextCreate(CurrentMemoryContext,
+							  "CreateStmt analyze context",
+							  ALLOCSET_DEFAULT_MINSIZE,
+							  ALLOCSET_DEFAULT_INITSIZE,
+							  ALLOCSET_DEFAULT_MAXSIZE);
 
 	/*
-	 * Fetch pg_class tuple of source index.  We can't use the copy in the
-	 * relcache entry because it doesn't include optional fields.
+	 * We must not scribble on the passed-in CreateStmt, so copy it.  (This is
+	 * overkill, but easy.)
 	 */
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_class "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(source_relid)));
+	stmt = (CreateStmt *) copyObject(stmt);
 
-	ht_idxrel = caql_getnext(pcqCtx);
+	/*
+	 * If the target relation name isn't schema-qualified, make it so.  This
+	 * prevents some corner cases in which added-on rewritten commands might
+	 * think they should apply to other relations that have the same name and
+	 * are earlier in the search path.	"istemp" is equivalent to a
+	 * specification of pg_temp, so no need for anything extra in that case.
+	 */
+	if (stmt->relation->schemaname == NULL && !stmt->relation->istemp)
+	{
+		Oid			namespaceid = RangeVarGetCreationNamespace(stmt->relation);
 
-	if (!HeapTupleIsValid(ht_idxrel))
-		elog(ERROR, "cache lookup failed for relation %u", source_relid);
-	idxrelrec = (Form_pg_class) GETSTRUCT(ht_idxrel);
+		stmt->relation->schemaname = get_namespace_name(namespaceid);
+	}
 
-	/* Fetch pg_index tuple for source index from relcache entry */
-	ht_idx = source_idx->rd_indextuple;
-	idxrec = (Form_pg_index) GETSTRUCT(ht_idx);
-	indrelid = idxrec->indrelid;
+	/* Set up pstate */
+	pstate = make_parsestate(NULL);
+	pstate->p_sourcetext = queryString;
 
-	/* Fetch pg_am tuple for source index from relcache entry */
-	amrec = source_idx->rd_am;
+	cxt.stmtType = "CREATE TABLE";
+	cxt.relation = stmt->relation;
+	cxt.rel = NULL;
+	cxt.inhRelations = stmt->inhRelations;
+	cxt.isalter = false;
+	cxt.iscreatepart = createPartition;
+	cxt.issplitpart = stmt->is_split_part;
+	cxt.columns = NIL;
+	cxt.ckconstraints = NIL;
+	cxt.fkconstraints = NIL;
+	cxt.ixconstraints = NIL;
+	cxt.inh_indexes = NIL;
+	cxt.blist = NIL;
+	cxt.alist = NIL;
+	cxt.dlist = NIL; /* for deferred analysis requiring the created table */
+	cxt.pkey = NULL;
+	cxt.hasoids = interpretOidsOption(stmt->options);
 
-	/* Must get indclass the hard way, since it's not stored in relcache */
-	datum = SysCacheGetAttr(INDEXRELID, ht_idx,
-							Anum_pg_index_indclass, &isnull);
-	Assert(!isnull);
-	indclass = (oidvector *) DatumGetPointer(datum);
+	stmt->policy = NULL;
 
-	/* Begin building the IndexStmt */
-	index = makeNode(IndexStmt);
-	index->relation = cxt->relation;
-	index->accessMethod = pstrdup(NameStr(amrec->amname));
-	if (OidIsValid(idxrelrec->reltablespace))
-		index->tableSpace = get_tablespace_name(idxrelrec->reltablespace);
-	else
-		index->tableSpace = NULL;
-	index->unique = idxrec->indisunique;
-	index->primary = idxrec->indisprimary;
-	index->concurrent = false;
+	/* Disallow inheritance in combination with partitioning. */
+	if (stmt->inhRelations && (stmt->partitionBy || stmt->is_part_child))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+				 errmsg("cannot mix inheritance with partitioning")));
 
-	/*
-	 * We don't try to preserve the name of the source index; instead, just
-	 * let DefineIndex() choose a reasonable name.
-	 */
-	index->idxname = NULL;
+	/* Disallow inheritance for CO table */
+	if (stmt->inhRelations && is_aocs(stmt->options))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("INHERITS clause cannot be used with column oriented tables")));
+
+	/* Only on top-most partitioned tables. */
+	if (stmt->partitionBy && !stmt->is_part_child)
+		fixCreateStmtForPartitionedTable(stmt);
 
 	/*
-	 * If the index is marked PRIMARY, it's certainly from a constraint; else,
-	 * if it's not marked UNIQUE, it certainly isn't; else, we have to search
-	 * pg_depend to see if there's an associated unique constraint.
-	 */
-	if (index->primary)
-		index->isconstraint = true;
-	else if (!index->unique)
-		index->isconstraint = false;
-	else
-	{
-		conoid = get_index_constraint(source_relid);
-		index->isconstraint = OidIsValid(conoid);
-	}
-		
-	/* If the index backs a constraint and we are adding a part to a paritioned
-	 * table, we need to use the same constraint name as the partition root uses.  
-	 * We assume that the inheritance hierarchy above is consistent, so we just 
-	 * use the parent's constraint. 
+	 * Run through each primary element in the table creation clause. Separate
+	 * column defs from constraints, and do preliminary analysis.
 	 */
-	if (index->isconstraint && cxt->isaddpart )
+	foreach(elements, stmt->tableElts)
 	{
-		char *conname;
-		
-		/*  */
-		if ( ! OidIsValid(conoid) )
-			conoid = get_index_constraint(source_relid);
-			
-		conname = GetConstraintNameByOid(conoid);
-		
-		if ( ! conname )
-		{
-			elog(ERROR, "missing constraint on partitioned table");
-		}
-		index->altconname = conname;
-	}
+		Node	   *element = lfirst(elements);
 
-	/* Get the index expressions, if any */
-	datum = SysCacheGetAttr(INDEXRELID, ht_idx,
-							Anum_pg_index_indexprs, &isnull);
-	if (!isnull)
-	{
-		char	   *exprsString;
+		switch (nodeTag(element))
+		{
+			case T_ColumnDef:
+				transformColumnDefinition(pstate, &cxt,
+										  (ColumnDef *) element);
+				break;
 
-		exprsString = TextDatumGetCString(datum);
-		indexprs = (List *) stringToNode(exprsString);
-	}
-	else
-		indexprs = NIL;
+			case T_Constraint:
+				transformTableConstraint(pstate, &cxt,
+										 (Constraint *) element);
+				break;
 
-	/* Build the list of IndexElem */
-	index->indexParams = NIL;
+			case T_FkConstraint:
+				/* No pre-transformation needed */
+				cxt.fkconstraints = lappend(cxt.fkconstraints, element);
+				break;
 
-	indexpr_item = list_head(indexprs);
-	for (keyno = 0; keyno < idxrec->indnatts; keyno++)
-	{
-		IndexElem  *iparam;
-		AttrNumber	attnum = idxrec->indkey.values[keyno];
+			case T_InhRelation:
+			{
+				bool            isBeginning = (cxt.columns == NIL);
 
-		iparam = makeNode(IndexElem);
+				transformInhRelation(pstate, &cxt,
+									 (InhRelation *) element, false);
 
-		if (AttributeNumberIsValid(attnum))
-		{
-			/* Simple index column */
-			char	   *attname;
+				if (Gp_role == GP_ROLE_DISPATCH && isBeginning &&
+					stmt->distributedBy == NIL &&
+					stmt->inhRelations == NIL &&
+					stmt->policy == NULL)
+				{
+					likeDistributedBy = getLikeDistributionPolicy((InhRelation *) element);
+				}
+				break;
+			}
 
-			attname = get_relid_attribute_name(indrelid, attnum);
-			keycoltype = get_atttype(indrelid, attnum);
+			case T_ColumnReferenceStorageDirective:
+				/* processed below in transformAttributeEncoding() */
+				stenc = lappend(stenc, element);
+				break;
 
-			iparam->name = attname;
-			iparam->expr = NULL;
+			default:
+				elog(ERROR, "unrecognized node type: %d",
+					 (int) nodeTag(element));
+				break;
 		}
-		else
-		{
-			/* Expressional index */
-			Node	   *indexkey;
+	}
 
-			if (indexpr_item == NULL)
-				elog(ERROR, "too few entries in indexprs list");
-			indexkey = (Node *) lfirst(indexpr_item);
-			indexpr_item = lnext(indexpr_item);
+	/*
+	 * transformIndexConstraints wants cxt.alist to contain only index
+	 * statements, so transfer anything we already have into save_alist.
+	 */
+	save_alist = cxt.alist;
+	cxt.alist = NIL;
 
-			/* OK to modify indexkey since we are working on a private copy */
-			change_varattnos_of_a_node(indexkey, attmap);
+	Assert(stmt->constraints == NIL);
 
-			iparam->name = NULL;
-			iparam->expr = indexkey;
+	/*
+	 * Postprocess constraints that give rise to index definitions.
+	 */
+	transformIndexConstraints(pstate, &cxt, stmt->is_add_part || stmt->is_split_part);
 
-			keycoltype = exprType(indexkey);
-		}
+	/*
+	 * Carry any deferred analysis statements forward.  Added for MPP-13750
+	 * but should also apply to the similar case involving simple inheritance.
+	 */
+	if (cxt.dlist)
+	{
+		stmt->deferredStmts = list_concat(stmt->deferredStmts, cxt.dlist);
+		cxt.dlist = NIL;
+	}
 
-		/* Add the operator class name, if non-default */
-		iparam->opclass = get_opclass(indclass->values[keyno], keycoltype);
+	/*
+	 * Postprocess foreign-key constraints.
+	 * But don't cascade FK constraints to parts, yet.
+	 */
+	if (!stmt->is_part_child)
+		transformFKConstraints(pstate, &cxt, true, false);
 
-		index->indexParams = lappend(index->indexParams, iparam);
+	/*-----------
+	 * Analyze attribute encoding clauses.
+	 *
+	 * Partitioning configurations may have things like:
+	 *
+	 * CREATE TABLE ...
+	 *  ( a int ENCODING (...))
+	 * WITH (appendonly=true, orientation=column)
+	 * PARTITION BY ...
+	 * (PARTITION ... WITH (appendonly=false));
+	 *
+	 * We don't want to throw an error when we try to apply the ENCODING clause
+	 * to the partition which the user wants to be non-AO. Just ignore it
+	 * instead.
+	 *-----------
+	 */
+	if (!is_aocs(stmt->options) && stmt->is_part_child)
+	{
+		if (co_explicitly_disabled(stmt->options) || !stenc)
+			stmt->attr_encodings = NIL;
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("ENCODING clause only supported with column oriented partitioned tables")));
+		}
 	}
+	else
+		stmt->attr_encodings = transformAttributeEncoding(stenc, stmt, &cxt);
 
-	/* Copy reloptions if any */
-	datum = caql_getattr(pcqCtx,
-						 Anum_pg_class_reloptions, &isnull);
-	if (!isnull)
-		index->options = untransformRelOptions(datum);
-
-	/* If it's a partial index, decompile and append the predicate */
-	datum = SysCacheGetAttr(INDEXRELID, ht_idx,
-							Anum_pg_index_indpred, &isnull);
-	if (!isnull)
+	/*
+	 * Postprocess Greenplum Database distribution columns
+	 */
+	/* silence distro messages for partitions */
+	if (stmt->is_part_child)
+		bQuiet = true;
+	else if (stmt->partitionBy)
 	{
-		char	   *pred_str;
+		PartitionBy *partitionBy = (PartitionBy *) stmt->partitionBy;
 
-		/* Convert text string to node tree */
-		pred_str = TextDatumGetCString(datum);
-		index->whereClause = (Node *) stringToNode(pred_str);
-		/* Adjust attribute numbers */
-		change_varattnos_of_a_node(index->whereClause, attmap);
+		/* be very quiet if set subpartn template */
+		if (partitionBy->partQuiet == PART_VERBO_NOPARTNAME)
+			bQuiet = true;
+		/* quiet for partitions of depth > 0 */
+		else if (partitionBy->partDepth != 0 &&
+				 partitionBy->partQuiet != PART_VERBO_NORMAL)
+			bQuiet = true;
 	}
+	transformDistributedBy(pstate, &cxt, stmt->distributedBy, &stmt->policy,
+						   likeDistributedBy, bQuiet);
 
-	/* Clean up */
-	caql_endscan(pcqCtx);
+	/*
+	 * Process table partitioning clause
+	 */
+	transformPartitionBy(pstate, &cxt, stmt, stmt->partitionBy, stmt->policy);
 
-	return index;
+	/*
+	 * Output results.
+	 */
+	stmt->tableElts = cxt.columns;
+	stmt->constraints = cxt.ckconstraints;
+
+	result = lappend(cxt.blist, stmt);
+	result = list_concat(result, cxt.alist);
+	result = list_concat(result, save_alist);
+
+	MemoryContextDelete(cxt.tempCtx);
+
+	return result;
 }
 
 /*
- * get_opclass			- fetch name of an index operator class
- *
- * If the opclass is the default for the given actual_datatype, then
- * the return value is NIL.
+ * transformColumnDefinition -
+ *		transform a single ColumnDef within CREATE TABLE
+ *		Also used in ALTER TABLE ADD COLUMN
  */
-static List *
-get_opclass(Oid opclass, Oid actual_datatype)
+static void
+transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
+						  ColumnDef *column)
 {
-	HeapTuple	ht_opc;
-	Form_pg_opclass opc_rec;
-	List	   *result = NIL;
-	cqContext  *pcqCtx;
-
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_opclass "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(opclass)));
+	bool		is_serial;
+	bool		saw_nullable;
+	bool		saw_default;
+	Constraint *constraint;
+	ListCell   *clist;
 
-	ht_opc = caql_getnext(pcqCtx);
-
-	if (!HeapTupleIsValid(ht_opc))
-		elog(ERROR, "cache lookup failed for opclass %u", opclass);
-	opc_rec = (Form_pg_opclass) GETSTRUCT(ht_opc);
+	cxt->columns = lappend(cxt->columns, column);
 
-	if (GetDefaultOpClass(actual_datatype, opc_rec->opcmethod) != opclass)
+	/* Check for SERIAL pseudo-types */
+	is_serial = false;
+	if (list_length(column->typname->names) == 1)
 	{
-		/* For simplicity, we always schema-qualify the name */
-		char	   *nsp_name = get_namespace_name(opc_rec->opcnamespace);
-		char	   *opc_name = pstrdup(NameStr(opc_rec->opcname));
+		char	   *typname = strVal(linitial(column->typname->names));
 
-		result = list_make2(makeString(nsp_name), makeString(opc_name));
+		if (strcmp(typname, "serial") == 0 ||
+			strcmp(typname, "serial4") == 0)
+		{
+			is_serial = true;
+			column->typname->names = NIL;
+			column->typname->typid = INT4OID;
+		}
+		else if (strcmp(typname, "bigserial") == 0 ||
+				 strcmp(typname, "serial8") == 0)
+		{
+			is_serial = true;
+			column->typname->names = NIL;
+			column->typname->typid = INT8OID;
+		}
 	}
 
-	caql_endscan(pcqCtx);
-
-	return result;
-}
+	/* Do necessary work on the column type declaration */
+	transformColumnType(pstate, column);
 
-/*
- * transformIndexConstraint
- *		Transform one UNIQUE or PRIMARY KEY constraint for
- *		transformIndexConstraints.
- */
-static IndexStmt *
-transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
-{
-	IndexStmt  *index;
-	ListCell   *keys;
-	IndexElem  *iparam;
+	/* Special actions for SERIAL pseudo-types */
+	if (is_serial)
+	{
+		Oid			snamespaceid;
+		char	   *snamespace;
+		char	   *sname;
+		char	   *qstring;
+		A_Const    *snamenode;
+		FuncCall   *funccallnode;
+		CreateSeqStmt *seqstmt;
+		AlterSeqStmt *altseqstmt;
+		List	   *attnamelist;
 
-	index = makeNode(IndexStmt);
+		/*
+		 * Determine namespace and name to use for the sequence.
+		 *
+		 * Although we use ChooseRelationName, it's not guaranteed that the
+		 * selected sequence name won't conflict; given sufficiently long
+		 * field names, two different serial columns in the same table could
+		 * be assigned the same sequence name, and we'd not notice since we
+		 * aren't creating the sequence quite yet.  In practice this seems
+		 * quite unlikely to be a problem, especially since few people would
+		 * need two serial columns in one table.
+		 */
+		if (cxt->rel)
+			snamespaceid = RelationGetNamespace(cxt->rel);
+		else
+			snamespaceid = RangeVarGetCreationNamespace(cxt->relation);
+		snamespace = get_namespace_name(snamespaceid);
+		sname = ChooseRelationName(cxt->relation->relname,
+								   column->colname,
+								   "seq",
+								   snamespaceid);
 
-	index->unique = true;
-	index->primary = (constraint->contype == CONSTR_PRIMARY);
-	if (index->primary)
-	{
-		if (cxt->pkey != NULL)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-			 errmsg("multiple primary keys for table \"%s\" are not allowed",
-					cxt->relation->relname)));
-		cxt->pkey = index;
+		ereport(NOTICE,
+				(errmsg("%s will create implicit sequence \"%s\" for serial column \"%s.%s\"",
+						cxt->stmtType, sname,
+						cxt->relation->relname, column->colname)));
 
 		/*
-		 * In ALTER TABLE case, a primary index might already exist, but
-		 * DefineIndex will check for it.
+		 * Build a CREATE SEQUENCE command to create the sequence object, and
+		 * add it to the list of things to be done before this CREATE/ALTER
+		 * TABLE.
 		 */
-	}
-	index->isconstraint = true;
+		seqstmt = makeNode(CreateSeqStmt);
+		seqstmt->sequence = makeRangeVar(snamespace, sname, -1);
+		seqstmt->sequence->istemp = cxt->relation->istemp;
+		seqstmt->options = NIL;
 
-	/* We used to force the index name to be the constraint name, but they are 
-	 * in different namespaces and so have different  requirements for uniqueness.  
-	 * Here we leave the index name alone and put the constaint name in the IndexStmt 
-	 * for use at a lower level.
-	 */
-	index->idxname = NULL;	/* DefineIndex will choose name */
-	index->altconname = constraint->name; /* User may have picked the name. */	
+		cxt->blist = lappend(cxt->blist, seqstmt);
 
-	index->relation = cxt->relation;
-	index->accessMethod = DEFAULT_INDEX_TYPE;
-	index->options = constraint->options;
-	index->tableSpace = constraint->indexspace;
-	index->indexParams = NIL;
-	index->whereClause = NULL;
-	index->concurrent = false;
+		/*
+		 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence
+		 * as owned by this column, and add it to the list of things to be
+		 * done after this CREATE/ALTER TABLE.
+		 */
+		altseqstmt = makeNode(AlterSeqStmt);
+		altseqstmt->sequence = makeRangeVar(snamespace, sname, -1);
+		attnamelist = list_make3(makeString(snamespace),
+								 makeString(cxt->relation->relname),
+								 makeString(column->colname));
+		altseqstmt->options = list_make1(makeDefElem("owned_by",
+													 (Node *) attnamelist));
 
-	/*
-	 * Make sure referenced keys exist.  If we are making a PRIMARY KEY index,
-	 * also make sure they are NOT NULL, if possible. (Although we could leave
-	 * it to DefineIndex to mark the columns NOT NULL, it's more efficient to
-	 * get it right the first time.)
-	 */
-	foreach(keys, constraint->keys)
-	{
-		char	   *key = strVal(lfirst(keys));
-		bool		found = false;
-		ColumnDef  *column = NULL;
-		ListCell   *columns;
+		cxt->alist = lappend(cxt->alist, altseqstmt);
 
-		foreach(columns, cxt->columns)
-		{
-			column = (ColumnDef *) lfirst(columns);
-			Assert(IsA(column, ColumnDef));
-			if (strcmp(column->colname, key) == 0)
-			{
-				found = true;
-				break;
-			}
-		}
-		if (found)
-		{
-			/* found column in the new table; force it to be NOT NULL */
-			if (constraint->contype == CONSTR_PRIMARY)
-				column->is_not_null = TRUE;
-		}
-		else if (SystemAttributeByName(key, cxt->hasoids) != NULL)
-		{
-			/*
-			 * column will be a system column in the new table, so accept it.
-			 * System columns can't ever be null, so no need to worry about
-			 * PRIMARY/NOT NULL constraint.
-			 */
-			found = true;
-		}
-		else if (cxt->inhRelations)
-		{
-			/* try inherited tables */
-			ListCell   *inher;
+		/*
+		 * Create appropriate constraints for SERIAL.  We do this in full,
+		 * rather than shortcutting, so that we will detect any conflicting
+		 * constraints the user wrote (like a different DEFAULT).
+		 *
+		 * Create an expression tree representing the function call
+		 * nextval('sequencename').  We cannot reduce the raw tree to cooked
+		 * form until after the sequence is created, but there's no need to do
+		 * so.
+		 */
+		qstring = quote_qualified_identifier(snamespace, sname);
+		snamenode = makeNode(A_Const);
+		snamenode->val.type = T_String;
+		snamenode->val.val.str = qstring;
+		snamenode->typname = SystemTypeName("regclass");
+		snamenode->location = -1;					/* CDB */
+		funccallnode = makeNode(FuncCall);
+		funccallnode->funcname = SystemFuncName("nextval");
+		funccallnode->args = list_make1(snamenode);
+		funccallnode->agg_star = false;
+		funccallnode->agg_distinct = false;
+		funccallnode->func_variadic = false;
+		funccallnode->location = -1;
 
-			foreach(inher, cxt->inhRelations)
-			{
-				RangeVar   *inh = (RangeVar *) lfirst(inher);
-				Relation	rel;
-				int			count;
+		constraint = makeNode(Constraint);
+		constraint->contype = CONSTR_DEFAULT;
+		constraint->raw_expr = (Node *) funccallnode;
+		constraint->cooked_expr = NULL;
+		constraint->keys = NIL;
+		column->constraints = lappend(column->constraints, constraint);
 
-				Assert(IsA(inh, RangeVar));
-				rel = heap_openrv(inh, AccessShareLock);
-				if (rel->rd_rel->relkind != RELKIND_RELATION)
-					ereport(ERROR,
-							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						   errmsg("inherited relation \"%s\" is not a table",
-								  inh->relname)));
-				for (count = 0; count < rel->rd_att->natts; count++)
-				{
-					Form_pg_attribute inhattr = rel->rd_att->attrs[count];
-					char	   *inhname = NameStr(inhattr->attname);
+		constraint = makeNode(Constraint);
+		constraint->contype = CONSTR_NOTNULL;
+		column->constraints = lappend(column->constraints, constraint);
+	}
 
-					if (inhattr->attisdropped)
-						continue;
-					if (strcmp(key, inhname) == 0)
-					{
-						found = true;
+	/* Process column constraints, if any... */
+	transformConstraintAttrs(column->constraints);
 
-						/*
-						 * We currently have no easy way to force an inherited
-						 * column to be NOT NULL at creation, if its parent
-						 * wasn't so already. We leave it to DefineIndex to
-						 * fix things up in this case.
-						 */
-						break;
-					}
-				}
-				heap_close(rel, NoLock);
-				if (found)
-					break;
-			}
-		}
+	saw_nullable = false;
+	saw_default = false;
+
+	foreach(clist, column->constraints)
+	{
+		constraint = lfirst(clist);
 
 		/*
-		 * In the ALTER TABLE case, don't complain about index keys not
-		 * created in the command; they may well exist already. DefineIndex
-		 * will complain about them if not, and will also take care of marking
-		 * them NOT NULL.
+		 * If this column constraint is a FOREIGN KEY constraint, then we fill
+		 * in the current attribute's name and throw it into the list of FK
+		 * constraints to be processed later.
 		 */
-		if (!found && !cxt->isalter)
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_COLUMN),
-					 errmsg("column \"%s\" named in key does not exist",
-							key)));
+		if (IsA(constraint, FkConstraint))
+		{
+			FkConstraint *fkconstraint = (FkConstraint *) constraint;
 
-		/* Check for PRIMARY KEY(foo, foo) */
-		foreach(columns, index->indexParams)
+			fkconstraint->fk_attrs = list_make1(makeString(column->colname));
+			cxt->fkconstraints = lappend(cxt->fkconstraints, fkconstraint);
+			continue;
+		}
+
+		Assert(IsA(constraint, Constraint));
+
+		switch (constraint->contype)
 		{
-			iparam = (IndexElem *) lfirst(columns);
-			if (iparam->name && strcmp(key, iparam->name) == 0)
-			{
-				if (index->primary)
+			case CONSTR_NULL:
+				if (saw_nullable && column->is_not_null)
 					ereport(ERROR,
-							(errcode(ERRCODE_DUPLICATE_COLUMN),
-							 errmsg("column \"%s\" appears twice in primary key constraint",
-									key)));
-				else
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\"",
+								  column->colname, cxt->relation->relname)));
+				column->is_not_null = FALSE;
+				saw_nullable = true;
+				break;
+
+			case CONSTR_NOTNULL:
+				if (saw_nullable && !column->is_not_null)
 					ereport(ERROR,
-							(errcode(ERRCODE_DUPLICATE_COLUMN),
-					errmsg("column \"%s\" appears twice in unique constraint",
-						   key)));
-			}
-		}
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\"",
+								  column->colname, cxt->relation->relname)));
+				column->is_not_null = TRUE;
+				saw_nullable = true;
+				break;
 
-		/* OK, add it to the index definition */
-		iparam = makeNode(IndexElem);
-		iparam->name = pstrdup(key);
-		iparam->expr = NULL;
-		iparam->opclass = NIL;
-		iparam->ordering = SORTBY_DEFAULT;
-		iparam->nulls_ordering = SORTBY_NULLS_DEFAULT;
-		index->indexParams = lappend(index->indexParams, iparam);
+			case CONSTR_DEFAULT:
+				if (saw_default)
+					ereport(ERROR,
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("multiple default values specified for column \"%s\" of table \"%s\"",
+								  column->colname, cxt->relation->relname)));
+				column->raw_default = constraint->raw_expr;
+				Assert(constraint->cooked_expr == NULL);
+				saw_default = true;
+				break;
+
+			case CONSTR_PRIMARY:
+			case CONSTR_UNIQUE:
+				if (constraint->keys == NIL)
+					constraint->keys = list_make1(makeString(column->colname));
+				cxt->ixconstraints = lappend(cxt->ixconstraints, constraint);
+				break;
+
+			case CONSTR_CHECK:
+				cxt->ckconstraints = lappend(cxt->ckconstraints, constraint);
+				break;
+
+			case CONSTR_ATTR_DEFERRABLE:
+			case CONSTR_ATTR_NOT_DEFERRABLE:
+			case CONSTR_ATTR_DEFERRED:
+			case CONSTR_ATTR_IMMEDIATE:
+				/* transformConstraintAttrs took care of these */
+				break;
+
+			default:
+				elog(ERROR, "unrecognized constraint type: %d",
+					 constraint->contype);
+				break;
+		}
 	}
+}
 
-	return index;
+/*
+ * transformTableConstraint
+ *		transform a Constraint node within CREATE TABLE or ALTER TABLE
+ */
+static void
+transformTableConstraint(ParseState *pstate, CreateStmtContext *cxt,
+						 Constraint *constraint)
+{
+	switch (constraint->contype)
+	{
+		case CONSTR_PRIMARY:
+		case CONSTR_UNIQUE:
+			cxt->ixconstraints = lappend(cxt->ixconstraints, constraint);
+			break;
+
+		case CONSTR_CHECK:
+			cxt->ckconstraints = lappend(cxt->ckconstraints, constraint);
+			break;
+
+		case CONSTR_NULL:
+		case CONSTR_NOTNULL:
+		case CONSTR_DEFAULT:
+		case CONSTR_ATTR_DEFERRABLE:
+		case CONSTR_ATTR_NOT_DEFERRABLE:
+		case CONSTR_ATTR_DEFERRED:
+		case CONSTR_ATTR_IMMEDIATE:
+			elog(ERROR, "invalid context for constraint type %d",
+				 constraint->contype);
+			break;
+
+		default:
+			elog(ERROR, "unrecognized constraint type: %d",
+				 constraint->contype);
+			break;
+	}
 }
 
 /*
  * transformInhRelation
  *
- * Change the LIKE <subtable> portion of a CREATE TABLE statement into the
- * column definitions which recreate the user defined column portions of <subtable>.
+ * Change the LIKE <subtable> portion of a CREATE TABLE statement into
+ * column definitions which recreate the user defined column portions of
+ * <subtable>.
  *
  * if forceBareCol is true we disallow inheriting any indexes/constr/defaults.
  */
@@ -490,6 +658,7 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
 	Relation	relation;
 	TupleDesc	tupleDesc;
 	TupleConstr *constr;
+	AttrNumber *attmap;
 	AclResult	aclresult;
 	bool		including_defaults = false;
 	bool		including_constraints = false;
@@ -552,8 +721,14 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
 				 errmsg("LIKE INCLUDING may not be used with this kind of relation")));
 
 	/*
-	 * Insert the copied attributes into the cxt for the new table
-	 * definition.
+	 * Initialize column number map for map_variable_attnos().  We need this
+	 * since dropped columns in the source table aren't copied, so the new
+	 * table can have different column numbers.
+	 */
+	attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * tupleDesc->natts);
+
+	/*
+	 * Insert the copied attributes into the cxt for the new table definition.
 	 */
 	for (parent_attno = 1; parent_attno <= tupleDesc->natts;
 		 parent_attno++)
@@ -563,7 +738,7 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
 		ColumnDef  *def;
 
 		/*
-		 * Ignore dropped columns in the parent.
+		 * Ignore dropped columns in the parent.  attmap entry is left zero.
 		 */
 		if (attribute->attisdropped)
 			continue;
@@ -585,243 +760,3497 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
 		def->cooked_default = NULL;
 		def->constraints = NIL;
 
-		/*
-		 * Add to column list
-		 */
-		cxt->columns = lappend(cxt->columns, def);
+		/*
+		 * Add to column list
+		 */
+		cxt->columns = lappend(cxt->columns, def);
+
+		attmap[parent_attno - 1] = list_length(cxt->columns);
+
+		/*
+		 * Copy default, if present and the default has been requested
+		 */
+		if (attribute->atthasdef && including_defaults)
+		{
+			char	   *this_default = NULL;
+			AttrDefault *attrdef;
+			int			i;
+
+			/* Find default in constraint structure */
+			Assert(constr != NULL);
+			attrdef = constr->defval;
+			for (i = 0; i < constr->num_defval; i++)
+			{
+				if (attrdef[i].adnum == parent_attno)
+				{
+					this_default = attrdef[i].adbin;
+					break;
+				}
+			}
+			Assert(this_default != NULL);
+
+			/*
+			 * If default expr could contain any vars, we'd need to fix 'em,
+			 * but it can't; so default is ready to apply to child.
+			 */
+
+			def->cooked_default = pstrdup(this_default);
+		}
+	}
+
+	/*
+	 * Copy CHECK constraints if requested, being careful to adjust attribute
+	 * numbers so they match the child.
+	 */
+	if (including_constraints && tupleDesc->constr)
+	{
+		int			ccnum;
+
+		for (ccnum = 0; ccnum < tupleDesc->constr->num_check; ccnum++)
+		{
+			char	   *ccname = tupleDesc->constr->check[ccnum].ccname;
+			char	   *ccbin = tupleDesc->constr->check[ccnum].ccbin;
+			Constraint *n = makeNode(Constraint);
+			Node	   *ccbin_node;
+			bool		found_whole_row;
+
+			ccbin_node = map_variable_attnos(stringToNode(ccbin),
+											 1, 0,
+											 attmap, tupleDesc->natts,
+											 &found_whole_row);
+
+			/*
+			 * We reject whole-row variables because the whole point of LIKE
+			 * is that the new table's rowtype might later diverge from the
+			 * parent's.  So, while translation might be possible right now,
+			 * it wouldn't be possible to guarantee it would work in future.
+			 */
+			if (found_whole_row)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("cannot convert whole-row table reference"),
+						 errdetail("Constraint \"%s\" contains a whole-row reference to table \"%s\".",
+								   ccname,
+								   RelationGetRelationName(relation))));
+
+			n->contype = CONSTR_CHECK;
+			n->name = pstrdup(ccname);
+			n->raw_expr = NULL;
+			n->cooked_expr = nodeToString(ccbin_node);
+			n->indexspace = NULL;
+			cxt->ckconstraints = lappend(cxt->ckconstraints, (Node *) n);
+		}
+	}
+
+	/*
+	 * Likewise, copy indexes if requested
+	 */
+	if (including_indexes && relation->rd_rel->relhasindex)
+	{
+		List	   *parent_indexes;
+		ListCell   *l;
+
+		parent_indexes = RelationGetIndexList(relation);
+
+		foreach(l, parent_indexes)
+		{
+			Oid			parent_index_oid = lfirst_oid(l);
+			Relation	parent_index;
+			IndexStmt  *index_stmt;
+
+			parent_index = index_open(parent_index_oid, AccessShareLock);
+
+			/* Build CREATE INDEX statement to recreate the parent_index */
+			index_stmt = generateClonedIndexStmt(cxt, parent_index,
+												 attmap, tupleDesc->natts);
+			
+			/* Save it in the inh_indexes list for the time being */
+			cxt->inh_indexes = lappend(cxt->inh_indexes, index_stmt);
+
+			index_close(parent_index, AccessShareLock);
+		}
+	}
+
+	/*
+	 * Close the parent rel, but keep our AccessShareLock on it until xact
+	 * commit.	That will prevent someone else from deleting or ALTERing the
+	 * parent before the child is committed.
+	 */
+	heap_close(relation, NoLock);
+}
+
+
+/*
+ * Generate an IndexStmt node using information from an already existing index
+ * "source_idx".  Attribute numbers should be adjusted according to attmap.
+ */
+static IndexStmt *
+generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
+						const AttrNumber *attmap, int attmap_length)
+{
+	Oid			source_relid = RelationGetRelid(source_idx);
+	HeapTuple	ht_idxrel;
+	HeapTuple	ht_idx;
+	Form_pg_class idxrelrec;
+	Form_pg_index idxrec;
+	Form_pg_am	amrec;
+	oidvector  *indclass;
+	IndexStmt  *index;
+	List	   *indexprs;
+	ListCell   *indexpr_item;
+	Oid			indrelid;
+	Oid			conoid = InvalidOid;
+	int			keyno;
+	Oid			keycoltype;
+	Datum		datum;
+	bool		isnull;
+
+	/*
+	 * Fetch pg_class tuple of source index.  We can't use the copy in the
+	 * relcache entry because it doesn't include optional fields.
+	 */
+	ht_idxrel = SearchSysCache(RELOID,
+							   ObjectIdGetDatum(source_relid),
+							   0, 0, 0);
+	if (!HeapTupleIsValid(ht_idxrel))
+		elog(ERROR, "cache lookup failed for relation %u", source_relid);
+	idxrelrec = (Form_pg_class) GETSTRUCT(ht_idxrel);
+
+	/* Fetch pg_index tuple for source index from relcache entry */
+	ht_idx = source_idx->rd_indextuple;
+	idxrec = (Form_pg_index) GETSTRUCT(ht_idx);
+	indrelid = idxrec->indrelid;
+
+	/* Fetch pg_am tuple for source index from relcache entry */
+	amrec = source_idx->rd_am;
+
+	/* Must get indclass the hard way, since it's not stored in relcache */
+	datum = SysCacheGetAttr(INDEXRELID, ht_idx,
+							Anum_pg_index_indclass, &isnull);
+	Assert(!isnull);
+	indclass = (oidvector *) DatumGetPointer(datum);
+
+	/* Begin building the IndexStmt */
+	index = makeNode(IndexStmt);
+	index->relation = cxt->relation;
+	index->accessMethod = pstrdup(NameStr(amrec->amname));
+	if (OidIsValid(idxrelrec->reltablespace))
+		index->tableSpace = get_tablespace_name(idxrelrec->reltablespace);
+	else
+		index->tableSpace = NULL;
+	index->unique = idxrec->indisunique;
+	index->primary = idxrec->indisprimary;
+	index->concurrent = false;
+	index->is_split_part = cxt->issplitpart;
+
+	/*
+	 * We don't try to preserve the name of the source index; instead, just
+	 * let DefineIndex() choose a reasonable name.
+	 */
+	index->idxname = NULL;
+
+	/*
+	 * If the index is marked PRIMARY, it's certainly from a constraint;
+	 * else, if it's not marked UNIQUE, it certainly isn't; else, we have
+	 * to search pg_depend to see if there's an associated unique constraint.
+	 */
+	if (index->primary)
+		index->isconstraint = true;
+	else if (!index->unique)
+		index->isconstraint = false;
+	else
+	{
+		conoid = get_index_constraint(source_relid);
+		index->isconstraint = OidIsValid(conoid);
+	}
+
+	/*
+	 * If the index backs a constraint, use the same name for the constraint
+	 * as the source uses. This is particularly important for partitioned
+	 * tables, as some places assume that when a partitioned table has
+	 * a constraint, the constraint has the same name in all the partitions.
+	 */
+	if (index->isconstraint)
+	{
+		char	   *conname;
+
+		if (!OidIsValid(conoid))
+			conoid = get_index_constraint(source_relid);
+
+		conname = GetConstraintNameByOid(conoid);
+		if (!conname)
+			elog(ERROR, "could not find constraint that index \"%s\" backs in source table",
+				 RelationGetRelationName(source_idx));
+
+		index->altconname = conname;
+	}
+
+	/* Get the index expressions, if any */
+	datum = SysCacheGetAttr(INDEXRELID, ht_idx,
+							Anum_pg_index_indexprs, &isnull);
+	if (!isnull)
+	{
+		char	   *exprsString;
+
+		exprsString = TextDatumGetCString(datum);
+		indexprs = (List *) stringToNode(exprsString);
+	}
+	else
+		indexprs = NIL;
+
+	/* Build the list of IndexElem */
+	index->indexParams = NIL;
+
+	indexpr_item = list_head(indexprs);
+	for (keyno = 0; keyno < idxrec->indnatts; keyno++)
+	{
+		IndexElem  *iparam;
+		AttrNumber	attnum = idxrec->indkey.values[keyno];
+		int16		opt = source_idx->rd_indoption[keyno];
+
+		iparam = makeNode(IndexElem);
+
+		if (AttributeNumberIsValid(attnum))
+		{
+			/* Simple index column */
+			char	   *attname;
+
+			attname = get_relid_attribute_name(indrelid, attnum);
+			keycoltype = get_atttype(indrelid, attnum);
+
+			iparam->name = attname;
+			iparam->expr = NULL;
+		}
+		else
+		{
+			/* Expressional index */
+			Node	   *indexkey;
+			bool		found_whole_row;
+
+			if (indexpr_item == NULL)
+				elog(ERROR, "too few entries in indexprs list");
+			indexkey = (Node *) lfirst(indexpr_item);
+			indexpr_item = lnext(indexpr_item);
+
+			/* Adjust Vars to match new table's column numbering */
+			indexkey = map_variable_attnos(indexkey,
+										   1, 0,
+										   attmap, attmap_length,
+										   &found_whole_row);
+
+			/* As in transformTableLikeClause, reject whole-row variables */
+			if (found_whole_row)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("cannot convert whole-row table reference"),
+						 errdetail("Index \"%s\" contains a whole-row table reference.",
+								   RelationGetRelationName(source_idx))));
+
+			iparam->name = NULL;
+			iparam->expr = indexkey;
+
+			keycoltype = exprType(indexkey);
+		}
+
+		/* Add the operator class name, if non-default */
+		iparam->opclass = get_opclass(indclass->values[keyno], keycoltype);
+
+		iparam->ordering = SORTBY_DEFAULT;
+		iparam->nulls_ordering = SORTBY_NULLS_DEFAULT;
+
+		/* Adjust options if necessary */
+		if (amrec->amcanorder)
+		{
+			/*
+			 * If it supports sort ordering, copy DESC and NULLS opts.
+			 * Don't set non-default settings unnecessarily, though,
+			 * so as to improve the chance of recognizing equivalence
+			 * to constraint indexes.
+			 */
+			if (opt & INDOPTION_DESC)
+			{
+				iparam->ordering = SORTBY_DESC;
+				if ((opt & INDOPTION_NULLS_FIRST) == 0)
+					iparam->nulls_ordering = SORTBY_NULLS_LAST;
+			}
+			else
+			{
+				if (opt & INDOPTION_NULLS_FIRST)
+					iparam->nulls_ordering = SORTBY_NULLS_FIRST;
+			}
+		}
+
+		index->indexParams = lappend(index->indexParams, iparam);
+	}
+
+	/* Copy reloptions if any */
+	datum = SysCacheGetAttr(RELOID, ht_idxrel,
+							Anum_pg_class_reloptions, &isnull);
+	if (!isnull)
+		index->options = untransformRelOptions(datum);
+
+	/* If it's a partial index, decompile and append the predicate */
+	datum = SysCacheGetAttr(INDEXRELID, ht_idx,
+							Anum_pg_index_indpred, &isnull);
+	if (!isnull)
+	{
+		char	   *pred_str;
+		Node	   *pred_tree;
+		bool		found_whole_row;
+
+		/* Convert text string to node tree */
+		pred_str = TextDatumGetCString(datum);
+		pred_tree = (Node *) stringToNode(pred_str);
+
+		/* Adjust Vars to match new table's column numbering */
+		pred_tree = map_variable_attnos(pred_tree,
+										1, 0,
+										attmap, attmap_length,
+										&found_whole_row);
+
+		/* As in transformTableLikeClause, reject whole-row variables */
+		if (found_whole_row)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("cannot convert whole-row table reference"),
+					 errdetail("Index \"%s\" contains a whole-row table reference.",
+							   RelationGetRelationName(source_idx))));
+
+		index->whereClause = pred_tree;
+		/* Adjust attribute numbers */
+		change_varattnos_of_a_node(index->whereClause, attmap);
+	}
+
+	/* Clean up */
+	ReleaseSysCache(ht_idxrel);
+
+	return index;
+}
+
+/*
+ * get_opclass			- fetch name of an index operator class
+ *
+ * If the opclass is the default for the given actual_datatype, then
+ * the return value is NIL.
+ */
+static List *
+get_opclass(Oid opclass, Oid actual_datatype)
+{
+	HeapTuple	ht_opc;
+	Form_pg_opclass opc_rec;
+	List	   *result = NIL;
+
+	ht_opc = SearchSysCache(CLAOID,
+							ObjectIdGetDatum(opclass),
+							0, 0, 0);
+	if (!HeapTupleIsValid(ht_opc))
+		elog(ERROR, "cache lookup failed for opclass %u", opclass);
+	opc_rec = (Form_pg_opclass) GETSTRUCT(ht_opc);
+
+	if (GetDefaultOpClass(actual_datatype, opc_rec->opcmethod) != opclass)
+	{
+		/* For simplicity, we always schema-qualify the name */
+		char	   *nsp_name = get_namespace_name(opc_rec->opcnamespace);
+		char	   *opc_name = pstrdup(NameStr(opc_rec->opcname));
+
+		result = list_make2(makeString(nsp_name), makeString(opc_name));
+	}
+
+	ReleaseSysCache(ht_opc);
+	return result;
+}
+
+CreateExternalStmt *
+transformCreateExternalStmt(CreateExternalStmt *stmt, const char *queryString)
+{
+	ParseState *pstate;
+	CreateStmtContext cxt;
+	ListCell   *elements;
+	List  	   *likeDistributedBy = NIL;
+	bool	    bQuiet = false;	/* shut up transformDistributedBy messages */
+	bool		iswritable = stmt->iswritable;
+	
+	/* Set up pstate */
+	pstate = make_parsestate(NULL);
+	pstate->p_sourcetext = queryString;
+
+	cxt.stmtType = "CREATE EXTERNAL TABLE";
+	cxt.relation = stmt->relation;
+	cxt.inhRelations = NIL;
+	cxt.hasoids = false;
+	cxt.isalter = false;
+	cxt.iscreatepart = false;
+	cxt.columns = NIL;
+	cxt.ckconstraints = NIL;
+	cxt.fkconstraints = NIL;
+	cxt.ixconstraints = NIL;
+	cxt.pkey = NULL;
+
+	cxt.blist = NIL;
+	cxt.alist = NIL;
+
+	/*
+	 * Run through each primary element in the table creation clause. Separate
+	 * column defs from constraints, and do preliminary analysis.
+	 */
+	foreach(elements, stmt->tableElts)
+	{
+		Node	   *element = lfirst(elements);
+
+		switch (nodeTag(element))
+		{
+			case T_ColumnDef:
+				transformColumnDefinition(pstate, &cxt,
+										  (ColumnDef *) element);
+				break;
+
+			case T_Constraint:
+			case T_FkConstraint:
+				/* should never happen. If it does fix gram.y */
+				elog(ERROR, "node type %d not supported for external tables",
+					 (int) nodeTag(element));
+				break;
+
+			case T_InhRelation:
+				{
+					/* LIKE */
+					bool	isBeginning = (cxt.columns == NIL);
+
+					transformInhRelation(pstate, &cxt,
+										 (InhRelation *) element, true);
+
+					if (Gp_role == GP_ROLE_DISPATCH && isBeginning &&
+						stmt->distributedBy == NIL &&
+						stmt->policy == NULL &&
+						iswritable /* dont bother if readable table */)
+					{
+						likeDistributedBy = getLikeDistributionPolicy((InhRelation *) element);
+					}
+				}
+				break;
+
+			default:
+				elog(ERROR, "unrecognized node type: %d",
+					 (int) nodeTag(element));
+				break;
+		}
+	}
+
+	/*
+	 * Forbid LOG ERRORS and ON MASTER combination.
+	 */
+	if (stmt->exttypedesc->exttabletype == EXTTBL_TYPE_EXECUTE)
+	{
+		ListCell   *exec_location_opt;
+
+		foreach(exec_location_opt, stmt->exttypedesc->on_clause)
+		{
+			DefElem    *defel = (DefElem *) lfirst(exec_location_opt);
+
+			if (strcmp(defel->defname, "master") == 0)
+			{
+				SingleRowErrorDesc *srehDesc = (SingleRowErrorDesc *)stmt->sreh;
+
+				if(srehDesc && srehDesc->into_file)
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+							 errmsg("External web table with ON MASTER clause "
+									"cannot use LOG ERRORS feature.")));
+			}
+		}
+	}
+
+	/*
+	 * Handle DISTRIBUTED BY clause, if any.
+	 *
+	 * For writeable external tables, by default we distribute RANDOMLY, or
+	 * by the distribution key of the LIKE table if exists. However, if
+	 * DISTRIBUTED BY was specified we use it by calling the regular
+	 * transformDistributedBy and handle it like we would for non external
+	 * tables.
+	 *
+	 * For readable external tables, don't create a policy row at all.
+	 * Non-EXECUTE type external tables are implicitly randomly distributed.
+	 * EXECUTE type external tables encapsulate similar information in the
+	 * "ON <segment spec>" clause, which is stored in pg_exttable.location.
+	 */
+	if (iswritable)
+	{
+		if (stmt->distributedBy == NIL && likeDistributedBy == NIL)
+		{
+			/*
+			 * defaults to DISTRIBUTED RANDOMLY irrespective of the
+			 * gp_create_table_random_default_distribution guc.
+			 */
+			stmt->policy = createRandomDistribution();
+		}
+		else
+		{
+			/* regular DISTRIBUTED BY transformation */
+			transformDistributedBy(pstate, &cxt, stmt->distributedBy, &stmt->policy,
+								   likeDistributedBy, bQuiet);
+		}
+	}
+	else if (stmt->distributedBy != NIL)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+				 errmsg("Readable external tables can\'t specify a DISTRIBUTED BY clause.")));
+
+	Assert(cxt.ckconstraints == NIL);
+	Assert(cxt.fkconstraints == NIL);
+	Assert(cxt.ixconstraints == NIL);
+
+	/*
+	 * Output results.
+	 */
+	stmt->tableElts = cxt.columns;
+	return stmt;
+}
+
+
+/****************stmt->policy*********************/
+static void
+transformDistributedBy(ParseState *pstate, CreateStmtContext *cxt,
+					   List *distributedBy, GpPolicy **policyp,
+					   List *likeDistributedBy,
+					   bool bQuiet)
+{
+	ListCell   *keys = NULL;
+	GpPolicy  *policy = NULL;
+	int			colindex = 0;
+	int			maxattrs = MaxPolicyAttributeNumber;
+	int			numUniqueIndexes = 0;
+	Constraint *uniqueindex = NULL;
+
+	/*
+	 * utility mode creates can't have a policy.  Only the QD can have policies
+	 *
+	 */
+	if (Gp_role != GP_ROLE_DISPATCH)
+	{
+		*policyp = NULL;
+		return;
+	}
+
+	policy = (GpPolicy *) palloc(sizeof(GpPolicy) + maxattrs *
+								 sizeof(policy->attrs[0]));
+	policy->ptype = POLICYTYPE_PARTITIONED;
+	policy->nattrs = 0;
+	policy->attrs[0] = 1;
+
+	/*
+	 * If distributedBy is NIL, the user did not explicitly say what he
+	 * wanted for a distribution policy.  So, we need to assign one.
+	 */
+	if (distributedBy == NIL && cxt && cxt->pkey != NULL)
+	{
+		/*
+		 * We have a PRIMARY KEY, so let's assign the default distribution
+		 * to be the key
+		 */
+
+		IndexStmt  *index = cxt->pkey;
+		List	   *indexParams;
+		ListCell   *ip = NULL;
+
+		Assert(index->indexParams != NULL);
+		indexParams = index->indexParams;
+
+		foreach(ip, indexParams)
+		{
+			IndexElem  *iparam = lfirst(ip);
+
+			if (iparam && iparam->name != 0)
+			{
+
+				if (distributedBy)
+					distributedBy = lappend(distributedBy,
+											(Node *) makeString(iparam->name));
+				else
+					distributedBy = list_make1((Node *) makeString(iparam->name));
+
+			}
+		}
+	}
+
+	if (cxt && cxt->ixconstraints != NULL)
+	{
+		ListCell   *lc = NULL;
+
+		foreach(lc, cxt->ixconstraints)
+		{
+			Constraint *cons = lfirst(lc);
+
+			if (cons->contype == CONSTR_UNIQUE)
+			{
+				if (uniqueindex == NULL)
+					uniqueindex = cons;
+
+				numUniqueIndexes++;
+
+				if (cxt->pkey)
+				{
+					ereport(ERROR,
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("Greenplum Database does not allow having both PRIMARY KEY and UNIQUE constraints")));
+				}
+			}
+		}
+		if (numUniqueIndexes > 1)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+					 errmsg("Greenplum Database does not allow having multiple UNIQUE constraints")));
+		}
+	}
+
+	if (distributedBy == NIL && cxt && cxt->ixconstraints != NULL &&
+		numUniqueIndexes > 0)
+	{
+		/*
+		 * No explicit distributed by clause, and no primary key.
+		 * If there is a UNIQUE clause, let's use that
+		 */
+		ListCell   *lc = NULL;
+
+		foreach(lc, cxt->ixconstraints)
+		{
+
+			Constraint *constraint = lfirst(lc);
+
+			if (constraint->contype == CONSTR_UNIQUE)
+			{
+
+				ListCell   *ip = NULL;
+
+
+				foreach(ip, constraint->keys)
+				{
+					Value	   *v = lfirst(ip);
+
+					if (v && v->val.str != 0)
+					{
+
+						if (distributedBy)
+							distributedBy = lappend(distributedBy, (Node *) makeString(v->val.str));
+						else
+							distributedBy = list_make1((Node *) makeString(v->val.str));
+
+					}
+				}
+			}
+		}
+
+	}
+
+	/*
+	 * If new table INHERITS from one or more parent tables, check parents.
+	 */
+	if (cxt->inhRelations != NIL)
+	{
+		ListCell   *entry;
+
+		foreach(entry, cxt->inhRelations)
+		{
+			RangeVar   *parent = (RangeVar *) lfirst(entry);
+			Oid			relId = RangeVarGetRelid(parent, false);
+			GpPolicy  *oldTablePolicy =
+				GpPolicyFetch(CurrentMemoryContext, relId);
+
+			/* Partitioned child must have partitioned parents. */
+			if (oldTablePolicy == NULL ||
+				 oldTablePolicy->ptype != POLICYTYPE_PARTITIONED)
+			{
+				ereport(ERROR, (errcode(ERRCODE_GP_FEATURE_NOT_SUPPORTED),
+						errmsg("cannot inherit from catalog table \"%s\" "
+							   "to create table \"%s\".",
+							   parent->relname, cxt->relation->relname),
+						errdetail("An inheritance hierarchy cannot contain a "
+								  "mixture of distributed and "
+								  "non-distributed tables.")));
+			}
+			/*
+			 * If we still don't know what distribution to use, and this
+			 * is an inherited table, set the distribution based on the
+			 * parent (or one of the parents)
+			 */
+			if (distributedBy == NIL && oldTablePolicy->nattrs >= 0)
+			{
+				int ia;
+
+				if (oldTablePolicy->nattrs > 0)
+				{
+					for (ia=0; ia<oldTablePolicy->nattrs; ia++)
+					{
+						char *attname =
+							get_attname(relId, oldTablePolicy->attrs[ia]);
+
+						distributedBy = lappend(distributedBy,
+												(Node *) makeString(attname));
+					}
+				}
+				else
+				{
+					/* strewn parent */
+					distributedBy = lappend(distributedBy, (Node *)NULL);
+				}
+				if (!bQuiet)
+				 elog(NOTICE, "Table has parent, setting distribution columns "
+					 "to match parent table");
+			}
+			pfree(oldTablePolicy);
+		}
+	}
+
+	if (distributedBy == NIL && likeDistributedBy != NIL)
+	{
+		distributedBy = likeDistributedBy;
+		if (!bQuiet)
+			elog(NOTICE, "Table doesn't have 'distributed by' clause, "
+				 "defaulting to distribution columns from LIKE table");
+	}
+
+	if (gp_create_table_random_default_distribution && NIL == distributedBy)
+	{
+		Assert(NIL == likeDistributedBy);
+		policy = createRandomDistribution();
+		
+		if (!bQuiet)
+		{
+			ereport(NOTICE,
+				(errcode(ERRCODE_SUCCESSFUL_COMPLETION),
+				 errmsg("Using default RANDOM distribution since no distribution was specified."),
+				 errhint("Consider including the 'DISTRIBUTED BY' clause to determine the distribution of rows.")));
+		}
+	}
+	else if (distributedBy == NIL)
+	{
+		/*
+		 * if we get here, we haven't a clue what to use for the distribution columns.
+		 */
+
+		bool	assignedDefault = false;
+
+		/*
+		 * table has one or more attributes and there is still no distribution
+		 * key. pick a default one. the winner is the first attribute that is
+		 * an Greenplum Database-hashable data type.
+		 */
+
+		ListCell   *columns;
+		ColumnDef  *column = NULL;
+
+		/* we will distribute on at most one column */
+		policy->nattrs = 1;
+
+		colindex = 0;
+
+		if (cxt->inhRelations)
+		{
+			bool		found = false;
+			/* try inherited tables */
+			ListCell   *inher;
+
+			foreach(inher, cxt->inhRelations)
+			{
+				RangeVar   *inh = (RangeVar *) lfirst(inher);
+				Relation	rel;
+				int			count;
+
+				Assert(IsA(inh, RangeVar));
+				rel = heap_openrv(inh, AccessShareLock);
+				if (rel->rd_rel->relkind != RELKIND_RELATION)
+					ereport(ERROR,
+							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					   errmsg("inherited relation \"%s\" is not a table",
+							  inh->relname)));
+				for (count = 0; count < rel->rd_att->natts; count++)
+				{
+					Form_pg_attribute inhattr = rel->rd_att->attrs[count];
+					Oid typeOid = inhattr->atttypid;
+
+					if (inhattr->attisdropped)
+						continue;
+					colindex++;
+					if(isGreenplumDbHashable(typeOid))
+					{
+						char	   *inhname = NameStr(inhattr->attname);
+						policy->attrs[0] = colindex;
+						assignedDefault = true;
+						if (!bQuiet)
+							ereport(NOTICE,
+								(errcode(ERRCODE_SUCCESSFUL_COMPLETION),
+								 errmsg("Table doesn't have 'DISTRIBUTED BY' clause -- Using column "
+										"named '%s' from parent table as the Greenplum Database data distribution key for this "
+										"table. ", inhname),
+								 errhint("The 'DISTRIBUTED BY' clause determines the distribution of data."
+								 		 " Make sure column(s) chosen are the optimal data distribution key to minimize skew.")));
+						found = true;
+						break;
+					}
+				}
+				heap_close(rel, NoLock);
+
+				if (assignedDefault)
+					break;
+			}
+
+		}
+
+		if (!assignedDefault)
+		{
+			foreach(columns, cxt->columns)
+			{
+				Oid			typeOid;
+				int32		typmod;
+
+				column = (ColumnDef *) lfirst(columns);
+				colindex++;
+
+				typeOid = typenameTypeId(NULL, column->typname, &typmod);
+
+				/*
+				 * if we can hash on this type, or if it's an array type (which
+				 * we can always hash) this column with be our default key.
+				 */
+				if (isGreenplumDbHashable(typeOid))
+				{
+					policy->attrs[0] = colindex;
+					assignedDefault = true;
+					if (!bQuiet)
+						ereport(NOTICE,
+							(errcode(ERRCODE_SUCCESSFUL_COMPLETION),
+							 errmsg("Table doesn't have 'DISTRIBUTED BY' clause -- Using column "
+									"named '%s' as the Greenplum Database data distribution key for this "
+									"table. ", column->colname),
+							 errhint("The 'DISTRIBUTED BY' clause determines the distribution of data."
+							 		 " Make sure column(s) chosen are the optimal data distribution key to minimize skew.")));
+					break;
+				}
+			}
+		}
+
+		if (!assignedDefault)
+		{
+			/*
+			 * There was no eligible distribution column to default to. This table
+			 * will be partitioned on an empty distribution key list. In other words,
+			 * tuples coming into the system will be randomly assigned a bucket.
+			 */
+			policy->nattrs = 0;
+			if (!bQuiet)
+				elog(NOTICE, "Table doesn't have 'distributed by' clause, and no column type is suitable for a distribution key. Creating a NULL policy entry.");
+		}
+
+	}
+	else
+	{
+		/*
+		 * We have a DISTRIBUTED BY column list, either specified by the user
+		 * or defaulted to a primary key or unique column. Process it now and
+		 * set the distribution policy.
+		 */
+		policy->nattrs = 0;
+		if (!(distributedBy->length == 1 && linitial(distributedBy) == NULL))
+		{
+			foreach(keys, distributedBy)
+			{
+				char	   *key = strVal(lfirst(keys));
+				bool		found = false;
+				ColumnDef  *column = NULL;
+				ListCell   *columns;
+
+				colindex = 0;
+
+				if (cxt->inhRelations)
+				{
+					/* try inherited tables */
+					ListCell   *inher;
+
+					foreach(inher, cxt->inhRelations)
+					{
+						RangeVar   *inh = (RangeVar *) lfirst(inher);
+						Relation	rel;
+						int			count;
+
+						Assert(IsA(inh, RangeVar));
+						rel = heap_openrv(inh, AccessShareLock);
+						if (rel->rd_rel->relkind != RELKIND_RELATION)
+							ereport(ERROR,
+									(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+							   errmsg("inherited relation \"%s\" is not a table",
+									  inh->relname)));
+						for (count = 0; count < rel->rd_att->natts; count++)
+						{
+							Form_pg_attribute inhattr = rel->rd_att->attrs[count];
+							char	   *inhname = NameStr(inhattr->attname);
+
+							if (inhattr->attisdropped)
+								continue;
+							colindex++;
+							if (strcmp(key, inhname) == 0)
+							{
+								found = true;
+
+								break;
+							}
+						}
+						heap_close(rel, NoLock);
+						if (found)
+							elog(DEBUG1, "DISTRIBUTED BY clause refers to columns of inherited table");
+
+						if (found)
+							break;
+					}
+				}
+
+				if (!found)
+				{
+					foreach(columns, cxt->columns)
+					{
+						column = (ColumnDef *) lfirst(columns);
+						Assert(IsA(column, ColumnDef));
+						colindex++;
+
+						if (strcmp(column->colname, key) == 0)
+						{
+							Oid			typeOid;
+							int32		typmod;
+
+							typeOid = typenameTypeId(NULL, column->typname, &typmod);
+							
+							/*
+							 * To be a part of a distribution key, this type must
+							 * be supported for hashing internally in Greenplum
+							 * Database. We check if the base type is supported
+							 * for hashing or if it is an array type (we support
+							 * hashing on all array types).
+							 */
+							if (!isGreenplumDbHashable(typeOid))
+							{
+								ereport(ERROR,
+										(errcode(ERRCODE_GP_FEATURE_NOT_SUPPORTED),
+										 errmsg("type \"%s\" can't be a part of a "
+												"distribution key",
+												format_type_be(typeOid))));
+							}
+
+							found = true;
+							break;
+						}
+					}
+				}
+
+				/*
+				* In the ALTER TABLE case, don't complain about index keys
+				* not created in the command; they may well exist already.
+				* DefineIndex will complain about them if not, and will also
+				* take care of marking them NOT NULL.
+				*/
+				if (!found && !cxt->isalter)
+					ereport(ERROR,
+							(errcode(ERRCODE_UNDEFINED_COLUMN),
+							 errmsg("column \"%s\" named in 'DISTRIBUTED BY' clause does not exist",
+									key)));
+
+				policy->attrs[policy->nattrs++] = colindex;
+
+			}
+
+			/* MPP-14770: we should check for duplicate column usage */
+			foreach(keys, distributedBy)
+			{
+				char *key = strVal(lfirst(keys));
+
+				ListCell *lkeys = NULL;
+				for_each_cell (lkeys, keys->next)
+				{
+					char *lkey = strVal(lfirst(lkeys));
+					if (strcmp(key,lkey) == 0)
+						ereport(ERROR,
+								(errcode(ERRCODE_DUPLICATE_COLUMN),
+								 errmsg("duplicate column \"%s\" in DISTRIBUTED BY clause", key)));
+				}
+			}
+		}
+
+	}
+
+
+	*policyp = policy;
+
+
+	if (cxt && cxt->pkey)		/* Primary key	specified.	Make sure
+								 * distribution columns match */
+	{
+		int			i = 0;
+		IndexStmt  *index = cxt->pkey;
+		List	   *indexParams = index->indexParams;
+		ListCell   *ip;
+
+		foreach(ip, indexParams)
+		{
+			IndexElem  *iparam;
+
+			if (i >= policy->nattrs)
+				break;
+
+			iparam = lfirst(ip);
+			if (iparam->name != 0)
+			{
+				bool	found = false;
+				ColumnDef  *column = NULL;
+				ListCell   *columns;
+
+				colindex = 0;
+
+				if (cxt->inhRelations)
+				{
+					/* try inherited tables */
+					ListCell   *inher;
+
+					foreach(inher, cxt->inhRelations)
+					{
+						RangeVar   *inh = (RangeVar *) lfirst(inher);
+						Relation	rel;
+						int			count;
+
+						Assert(IsA(inh, RangeVar));
+						rel = heap_openrv(inh, AccessShareLock);
+						if (rel->rd_rel->relkind != RELKIND_RELATION)
+							ereport(ERROR,
+									(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+							   errmsg("inherited relation \"%s\" is not a table",
+									  inh->relname)));
+						for (count = 0; count < rel->rd_att->natts; count++)
+						{
+							Form_pg_attribute inhattr = rel->rd_att->attrs[count];
+							char	   *inhname = NameStr(inhattr->attname);
+
+							if (inhattr->attisdropped)
+								continue;
+							colindex++;
+
+							if (strcmp(iparam->name, inhname) == 0)
+							{
+								found = true;
+								break;
+							}
+						}
+						heap_close(rel, NoLock);
+
+						if (found)
+							elog(DEBUG1, "'distributed by' clause refers to "
+								 "columns of inherited table");
+
+						if (found)
+							break;
+					}
+				}
+
+				if (!found)
+				{
+					foreach(columns, cxt->columns)
+					{
+						column = (ColumnDef *) lfirst(columns);
+						Assert(IsA(column, ColumnDef));
+						colindex++;
+						if (strcmp(column->colname, iparam->name) == 0)
+						{
+							found = true;
+							break;
+						}
+					}
+				}
+				if (colindex != policy->attrs[i])
+				{
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+							 errmsg("PRIMARY KEY and DISTRIBUTED BY definitions incompatible"),
+							 errhint("When there is both a PRIMARY KEY, and a "
+									"DISTRIBUTED BY clause, the DISTRIBUTED BY "
+									"clause must be equal to or a left-subset "
+									"of the PRIMARY KEY")));
+				}
+
+				i++;
+			}
+		}
+	}
+
+	if (uniqueindex)			/* UNIQUE specified.  Make sure distribution
+								 * columns match */
+	{
+		int			i = 0;
+
+		List	   *keys = uniqueindex->keys;
+		ListCell   *ip;
+
+		foreach(ip, keys)
+		{
+			IndexElem  *iparam;
+
+			if (i >= policy->nattrs)
+				break;
+
+			iparam = lfirst(ip);
+			if (iparam->name != 0)
+			{
+				bool	found = false;
+				ColumnDef  *column = NULL;
+				ListCell   *columns;
+
+				colindex = 0;
+
+				if (cxt->inhRelations)
+				{
+					/* try inherited tables */
+					ListCell   *inher;
+
+					foreach(inher, cxt->inhRelations)
+					{
+						RangeVar   *inh = (RangeVar *) lfirst(inher);
+						Relation	rel;
+						int			count;
+
+						Assert(IsA(inh, RangeVar));
+						rel = heap_openrv(inh, AccessShareLock);
+						if (rel->rd_rel->relkind != RELKIND_RELATION)
+							ereport(ERROR,
+									(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+							   errmsg("inherited relation \"%s\" is not a table",
+									  inh->relname)));
+						for (count = 0; count < rel->rd_att->natts; count++)
+						{
+							Form_pg_attribute inhattr = rel->rd_att->attrs[count];
+							char	   *inhname = NameStr(inhattr->attname);
+
+							if (inhattr->attisdropped)
+								continue;
+							colindex++;
+
+							if (strcmp(iparam->name, inhname) == 0)
+							{
+								found = true;
+
+								break;
+							}
+						}
+						heap_close(rel, NoLock);
+						if (found)
+							elog(NOTICE, "'distributed by' clause refers to columns of inherited table");
+
+						if (found)
+							break;
+					}
+				}
+
+				if (!found)
+				foreach(columns, cxt->columns)
+				{
+					column = (ColumnDef *) lfirst(columns);
+					Assert(IsA(column, ColumnDef));
+					colindex++;
+					if (strcmp(column->colname, iparam->name) == 0)
+					{
+						found = true;
+						break;
+					}
+				}
+
+				if (colindex != policy->attrs[i])
+				{
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+							 errmsg("UNIQUE constraint and DISTRIBUTED BY "
+									"definitions incompatible"),
+							 errhint("When there is both a UNIQUE constraint, "
+									 "and a DISTRIBUTED BY clause, the "
+									 "DISTRIBUTED BY clause must be equal to "
+									 "or a left-subset of the UNIQUE columns")));
+				}
+				i++;
+			}
+		}
+	}
+}
+
+/*
+ * Add any missing encoding attributes (compresstype = none,
+ * blocksize=...).  The column specific encoding attributes supported
+ * today are compresstype, compresslevel and blocksize.  Refer to
+ * pg_compression.c for more info.
+ */
+static List *
+fillin_encoding(List *list)
+{
+	bool foundCompressType = false;
+	bool foundCompressTypeNone = false;
+	char *cmplevel = NULL;
+	bool foundBlockSize = false;
+	char *arg;
+	List *retList = list_copy(list);
+	ListCell *lc;
+	DefElem *el;
+	const StdRdOptions *ao_opts = currentAOStorageOptions();
+
+	foreach(lc, list)
+	{
+		el = lfirst(lc);
+
+		if (pg_strcasecmp("compresstype", el->defname) == 0)
+		{
+			foundCompressType = true;
+			arg = defGetString(el);
+			if (pg_strcasecmp("none", arg) == 0)
+				foundCompressTypeNone = true;
+		}
+		else if (pg_strcasecmp("compresslevel", el->defname) == 0)
+		{
+			cmplevel = defGetString(el);
+		}
+		else if (pg_strcasecmp("blocksize", el->defname) == 0)
+			foundBlockSize = true;
+	}
+
+	if (foundCompressType == false && cmplevel == NULL)
+	{
+		/* No compression option specified, use current defaults. */
+		arg = ao_opts->compresstype ?
+				pstrdup(ao_opts->compresstype) : "none";
+		el = makeDefElem("compresstype", (Node *) makeString(arg));
+		retList = lappend(retList, el);
+		el = makeDefElem("compresslevel",
+						 (Node *) makeInteger(ao_opts->compresslevel));
+		retList = lappend(retList, el);
+	}
+	else if (foundCompressType == false && cmplevel)
+	{
+		if (strcmp(cmplevel, "0") == 0)
+		{
+			/*
+			 * User wants to disable compression by specifying
+			 * compresslevel=0.
+			 */
+			el = makeDefElem("compresstype", (Node *) makeString("none"));
+			retList = lappend(retList, el);
+		}
+		else
+		{
+			/*
+			 * User wants to enable compression by specifying non-zero
+			 * compresslevel.  Therefore, choose default compresstype
+			 * if configured, otherwise use zlib.
+			 */
+			if (ao_opts->compresstype &&
+				strcmp(ao_opts->compresstype, "none") != 0)
+			{
+				arg = pstrdup(ao_opts->compresstype);
+			}
+			else
+			{
+				arg = AO_DEFAULT_COMPRESSTYPE;
+			}
+			el = makeDefElem("compresstype", (Node *) makeString(arg));
+			retList = lappend(retList, el);
+		}
+	}
+	else if (foundCompressType && cmplevel == NULL)
+	{
+		if (foundCompressTypeNone)
+		{
+			/*
+			 * User wants to disable compression by specifying
+			 * compresstype=none.
+			 */
+			el = makeDefElem("compresslevel", (Node *) makeInteger(0));
+			retList = lappend(retList, el);
+		}
+		else
+		{
+			/*
+			 * Valid compresstype specified.  Use default
+			 * compresslevel if it's non-zero, otherwise use 1.
+			 */
+			el = makeDefElem("compresslevel",
+							 (Node *) makeInteger(ao_opts->compresslevel > 0 ?
+												  ao_opts->compresslevel : 1));
+			retList = lappend(retList, el);
+		}
+	}
+	if (foundBlockSize == false)
+	{
+		el = makeDefElem("blocksize", (Node *) makeInteger(ao_opts->blocksize));
+		retList = lappend(retList, el);
+	}
+	return retList;
+}
+
+/*
+ * transformIndexConstraints
+ *		Handle UNIQUE and PRIMARY KEY constraints, which create indexes.
+ *		We also merge in any index definitions arising from
+ *		LIKE ... INCLUDING INDEXES.
+ */
+void
+transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt, bool mayDefer)
+{
+	IndexStmt  *index;
+	List	   *indexlist = NIL;
+	ListCell   *lc;
+
+	/*
+	 * Run through the constraints that need to generate an index. For PRIMARY
+	 * KEY, mark each column as NOT NULL and create an index. For UNIQUE,
+	 * create an index as for PRIMARY KEY, but do not insist on NOT NULL.
+	 */
+	foreach(lc, cxt->ixconstraints)
+	{
+		Constraint *constraint = (Constraint *) lfirst(lc);
+
+		Assert(IsA(constraint, Constraint));
+		Assert(constraint->contype == CONSTR_PRIMARY ||
+			   constraint->contype == CONSTR_UNIQUE);
+
+		index = transformIndexConstraint(constraint, cxt);
+
+		indexlist = lappend(indexlist, index);
+	}
+
+	/* Add in any indexes defined by LIKE ... INCLUDING INDEXES */
+	foreach(lc, cxt->inh_indexes)
+	{
+		index = (IndexStmt *) lfirst(lc);
+
+		if (index->primary)
+		{
+			if (cxt->pkey != NULL)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+						 errmsg("multiple primary keys for table \"%s\" are not allowed",
+								cxt->relation->relname)));
+			cxt->pkey = index;
+		}
+
+		indexlist = lappend(indexlist, index);
+	}
+
+	/*
+	 * Scan the index list and remove any redundant index specifications. This
+	 * can happen if, for instance, the user writes UNIQUE PRIMARY KEY. A
+	 * strict reading of SQL92 would suggest raising an error instead, but
+	 * that strikes me as too anal-retentive. - tgl 2001-02-14
+	 *
+	 * XXX in ALTER TABLE case, it'd be nice to look for duplicate
+	 * pre-existing indexes, too.
+	 */
+	Assert(cxt->alist == NIL);
+	if (cxt->pkey != NULL)
+	{
+		/* Make sure we keep the PKEY index in preference to others... */
+		cxt->alist = list_make1(cxt->pkey);
+	}
+
+	foreach(lc, indexlist)
+	{
+		bool		keep = true;
+		bool		defer = false;
+		ListCell   *k;
+
+		index = lfirst(lc);
+
+		/* if it's pkey, it's already in cxt->alist */
+		if (index == cxt->pkey)
+			continue;
+
+		foreach(k, cxt->alist)
+		{
+			IndexStmt  *priorindex = lfirst(k);
+
+			if (equal(index->indexParams, priorindex->indexParams) &&
+				equal(index->whereClause, priorindex->whereClause) &&
+				strcmp(index->accessMethod, priorindex->accessMethod) == 0)
+			{
+				priorindex->unique |= index->unique;
+				/*
+				 * If the prior index is as yet unnamed, and this one is
+				 * named, then transfer the name to the prior index. This
+				 * ensures that if we have named and unnamed constraints,
+				 * we'll use (at least one of) the names for the index.
+				 */
+				if (priorindex->idxname == NULL)
+					priorindex->idxname = index->idxname;
+				keep = false;
+				break;
+			}
+		}
+		
+		defer = index->whereClause != NULL;
+		if ( !defer )
+		{
+			ListCell *j;
+			foreach(j, index->indexParams)
+			{
+				IndexElem *elt = (IndexElem*)lfirst(j);
+				Assert(IsA(elt, IndexElem));
+				
+				if (elt->expr != NULL)
+				{
+					defer = true;
+					break;
+				}
+			}
+		}
+
+		if (keep)
+		{
+			if (defer && mayDefer)
+			{
+				/* An index on an expression with a WHERE clause or for an 
+				 * inheritance child will cause a trip through parse_analyze.  
+				 * If we do that before creating the table, it will fail, so 
+				 * we put it on a list for later.
+				 */
+			
+				ereport(DEBUG1,
+						(errmsg("deferring index creation for table \"%s\"",
+								cxt->relation->relname)
+						 ));
+				cxt->dlist = lappend(cxt->dlist, index);
+			}
+			else
+			{
+				cxt->alist = lappend(cxt->alist, index);
+			}
+		}
+	}
+}
+
+/*
+ * transformIndexConstraint
+ *		Transform one UNIQUE or PRIMARY KEY constraint for
+ *		transformIndexConstraints.
+ */
+static IndexStmt *
+transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
+{
+	IndexStmt  *index;
+	ListCell   *keys;
+	IndexElem  *iparam;
+
+	index = makeNode(IndexStmt);
+
+	index->unique = true;
+	index->primary = (constraint->contype == CONSTR_PRIMARY);
+	if (index->primary)
+	{
+		if (cxt->pkey != NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+			 errmsg("multiple primary keys for table \"%s\" are not allowed",
+					cxt->relation->relname)));
+		cxt->pkey = index;
+
+		/*
+		 * In ALTER TABLE case, a primary index might already exist, but
+		 * DefineIndex will check for it.
+		 */
+	}
+	index->isconstraint = true;
+
+	/*
+	 * We used to force the index name to be the constraint name, but they
+	 * are in different namespaces and so have different  requirements for
+	 * uniqueness. Here we leave the index name alone and put the constraint
+	 * name in the IndexStmt, for use in DefineIndex.
+	 */
+	index->idxname = NULL;	/* DefineIndex will choose name */
+	index->altconname = constraint->name; /* User may have picked the name. */
+
+	index->relation = cxt->relation;
+	index->accessMethod = DEFAULT_INDEX_TYPE;
+	index->options = constraint->options;
+	index->tableSpace = constraint->indexspace;
+	index->indexParams = NIL;
+	index->whereClause = NULL;
+	index->concurrent = false;
+
+	/*
+	 * Make sure referenced keys exist.  If we are making a PRIMARY KEY index,
+	 * also make sure they are NOT NULL, if possible. (Although we could leave
+	 * it to DefineIndex to mark the columns NOT NULL, it's more efficient to
+	 * get it right the first time.)
+	 */
+	foreach(keys, constraint->keys)
+	{
+		char	   *key = strVal(lfirst(keys));
+		bool		found = false;
+		ColumnDef  *column = NULL;
+		ListCell   *columns;
+
+		foreach(columns, cxt->columns)
+		{
+			column = (ColumnDef *) lfirst(columns);
+			Assert(IsA(column, ColumnDef));
+			if (strcmp(column->colname, key) == 0)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
+		{
+			/* found column in the new table; force it to be NOT NULL */
+			if (constraint->contype == CONSTR_PRIMARY)
+				column->is_not_null = TRUE;
+		}
+		else if (SystemAttributeByName(key, cxt->hasoids) != NULL)
+		{
+			/*
+			 * column will be a system column in the new table, so accept it.
+			 * System columns can't ever be null, so no need to worry about
+			 * PRIMARY/NOT NULL constraint.
+			 */
+			found = true;
+		}
+		else if (cxt->inhRelations)
+		{
+			/* try inherited tables */
+			ListCell   *inher;
+
+			foreach(inher, cxt->inhRelations)
+			{
+				RangeVar   *inh = (RangeVar *) lfirst(inher);
+				Relation	rel;
+				int			count;
+
+				Assert(IsA(inh, RangeVar));
+				rel = heap_openrv(inh, AccessShareLock);
+				if (rel->rd_rel->relkind != RELKIND_RELATION)
+					ereport(ERROR,
+							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+						   errmsg("inherited relation \"%s\" is not a table",
+								  inh->relname)));
+				for (count = 0; count < rel->rd_att->natts; count++)
+				{
+					Form_pg_attribute inhattr = rel->rd_att->attrs[count];
+					char	   *inhname = NameStr(inhattr->attname);
+
+					if (inhattr->attisdropped)
+						continue;
+					if (strcmp(key, inhname) == 0)
+					{
+						found = true;
+
+						/*
+						 * We currently have no easy way to force an inherited
+						 * column to be NOT NULL at creation, if its parent
+						 * wasn't so already. We leave it to DefineIndex to
+						 * fix things up in this case.
+						 */
+						break;
+					}
+				}
+				heap_close(rel, NoLock);
+				if (found)
+					break;
+			}
+		}
+
+		/*
+		 * In the ALTER TABLE case, don't complain about index keys not
+		 * created in the command; they may well exist already. DefineIndex
+		 * will complain about them if not, and will also take care of marking
+		 * them NOT NULL.
+		 */
+		if (!found && !cxt->isalter)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("column \"%s\" named in key does not exist",
+							key)));
+
+		/* Check for PRIMARY KEY(foo, foo) */
+		foreach(columns, index->indexParams)
+		{
+			iparam = (IndexElem *) lfirst(columns);
+			if (iparam->name && strcmp(key, iparam->name) == 0)
+			{
+				if (index->primary)
+					ereport(ERROR,
+							(errcode(ERRCODE_DUPLICATE_COLUMN),
+							 errmsg("column \"%s\" appears twice in primary key constraint",
+									key)));
+				else
+					ereport(ERROR,
+							(errcode(ERRCODE_DUPLICATE_COLUMN),
+					errmsg("column \"%s\" appears twice in unique constraint",
+						   key)));
+			}
+		}
+
+		/* OK, add it to the index definition */
+		iparam = makeNode(IndexElem);
+		iparam->name = pstrdup(key);
+		iparam->expr = NULL;
+		iparam->opclass = NIL;
+		iparam->ordering = SORTBY_DEFAULT;
+		iparam->nulls_ordering = SORTBY_NULLS_DEFAULT;
+		index->indexParams = lappend(index->indexParams, iparam);
+	}
+
+	return index;
+}
+
+/*
+ * transformFKConstraints
+ *		handle FOREIGN KEY constraints
+ */
+static void
+transformFKConstraints(ParseState *pstate, CreateStmtContext *cxt,
+					   bool skipValidation, bool isAddConstraint)
+{
+	ListCell   *fkclist;
+
+	if (cxt->fkconstraints == NIL)
+		return;
+
+	/*
+	 * If CREATE TABLE or adding a column with NULL default, we can safely
+	 * skip validation of the constraint.
+	 */
+	if (skipValidation)
+	{
+		foreach(fkclist, cxt->fkconstraints)
+		{
+			FkConstraint *fkconstraint = (FkConstraint *) lfirst(fkclist);
+
+			fkconstraint->skip_validation = true;
+		}
+	}
+
+	/*
+	 * For CREATE TABLE or ALTER TABLE ADD COLUMN, gin up an ALTER TABLE ADD
+	 * CONSTRAINT command to execute after the basic command is complete. (If
+	 * called from ADD CONSTRAINT, that routine will add the FK constraints to
+	 * its own subcommand list.)
+	 *
+	 * Note: the ADD CONSTRAINT command must also execute after any index
+	 * creation commands.  Thus, this should run after
+	 * transformIndexConstraints, so that the CREATE INDEX commands are
+	 * already in cxt->alist.
+	 */
+	if (!isAddConstraint)
+	{
+		AlterTableStmt *alterstmt = makeNode(AlterTableStmt);
+
+		alterstmt->relation = cxt->relation;
+		alterstmt->cmds = NIL;
+		alterstmt->relkind = OBJECT_TABLE;
+
+		foreach(fkclist, cxt->fkconstraints)
+		{
+			FkConstraint *fkconstraint = (FkConstraint *) lfirst(fkclist);
+			AlterTableCmd *altercmd = makeNode(AlterTableCmd);
+
+			altercmd->subtype = AT_ProcessedConstraint;
+			altercmd->name = NULL;
+			altercmd->def = (Node *) fkconstraint;
+			alterstmt->cmds = lappend(alterstmt->cmds, altercmd);
+		}
+
+		cxt->alist = lappend(cxt->alist, alterstmt);
+	}
+}
+
+
+/*
+ * transformIndexStmt - parse analysis for CREATE INDEX
+ *
+ * Note: this is a no-op for an index not using either index expressions or
+ * a predicate expression.	There are several code paths that create indexes
+ * without bothering to call this, because they know they don't have any
+ * such expressions to deal with.
+ *
+ * In GPDB, this returns a list, because the single statement can be
+ * expanded into multiple IndexStmts, if the table is a partitioned table.
+ */
+List *
+transformIndexStmt(IndexStmt *stmt, const char *queryString)
+{
+	bool		recurseToPartitions = false;
+
+	/*
+	 * If the table already exists (i.e., this isn't a create table time
+	 * expansion of primary key() or unique()) and we're the ultimate parent
+	 * of a partitioned table, cascade to all children. We don't do this
+	 * at create table time because transformPartitionBy() automatically
+	 * creates the indexes on the child tables for us.
+	 *
+	 * If this is a CREATE INDEX statement, idxname should already exist.
+	 */
+	if (Gp_role != GP_ROLE_EXECUTE && stmt->idxname != NULL)
+	{
+		Oid			relId;
+
+		relId = RangeVarGetRelid(stmt->relation, true);
+
+		if (relId != InvalidOid && rel_is_partitioned(relId))
+			recurseToPartitions = true;
+	}
+
+	return transformIndexStmt_recurse(stmt, queryString, NULL, recurseToPartitions);
+
+}
+static List *
+transformIndexStmt_recurse(IndexStmt *stmt, const char *queryString,
+						   ParseState *masterpstate, bool recurseToPartitions)
+{
+	Relation	rel;
+	ParseState *pstate;
+	RangeTblEntry *rte;
+	ListCell   *l;
+	List	   *result = NIL;
+	LOCKMODE	lockmode;
+
+	/*
+	 * We must not scribble on the passed-in IndexStmt, so copy it.  (This is
+	 * overkill, but easy.)
+	 */
+	stmt = (IndexStmt *) copyObject(stmt);
+
+	/*
+	 * Open the parent table with appropriate locking.	We must do this
+	 * because addRangeTableEntry() would acquire only AccessShareLock,
+	 * leaving DefineIndex() needing to do a lock upgrade with consequent risk
+	 * of deadlock.  Make sure this stays in sync with the type of lock
+	 * DefineIndex() wants.
+	 */
+	lockmode = stmt->concurrent ? ShareUpdateExclusiveLock : ShareLock;
+	rel = heap_openrv(stmt->relation, lockmode);
+
+	/* Set up pstate */
+	pstate = make_parsestate(NULL);
+	pstate->p_sourcetext = queryString;
+
+	/* Recurse into (sub)partitions if this is a partitioned table */
+	if (recurseToPartitions)
+	{
+		List		*children;
+		struct HTAB *nameCache;
+		Oid			nspOid;
+
+		nspOid = RangeVarGetCreationNamespace(stmt->relation);
+
+		if (masterpstate == NULL)
+			masterpstate = pstate;
+
+		/* Lookup the parser object name cache */
+		nameCache = parser_get_namecache(masterpstate);
+
+		/* Loop over all partition children */
+		children = find_inheritance_children(RelationGetRelid(rel));
+
+		foreach(l, children)
+		{
+			Oid			relid = lfirst_oid(l);
+			Relation	crel = heap_open(relid, NoLock); /* lock on master
+															 is enough */
+			IndexStmt  *chidx;
+			Relation	partrel;
+			HeapTuple	tuple;
+			cqContext	cqc;
+			char	   *parname;
+			int2		position;
+			int4		depth;
+			NameData	name;
+			Oid			paroid;
+			char		depthstr[NAMEDATALEN];
+			char		prtstr[NAMEDATALEN];
+
+			if (RelationIsExternal(crel))
+			{
+				elog(NOTICE, "skip building index for external partition \"%s\"",
+					 RelationGetRelationName(crel));
+				heap_close(crel, NoLock);
+				continue;
+			}
+
+			chidx = (IndexStmt *)copyObject((Node *)stmt);
+
+			/* now just update the relation and index name fields */
+			chidx->relation =
+				makeRangeVar(get_namespace_name(RelationGetNamespace(crel)),
+							 pstrdup(RelationGetRelationName(crel)), -1);
+
+			elog(NOTICE, "building index for child partition \"%s\"",
+				 RelationGetRelationName(crel));
+
+			/*
+			 * We want the index name to resemble our partition table name
+			 * with the master index name on the front. This means, we
+			 * append to the indexname the parname, position, and depth
+			 * as we do in transformPartitionBy().
+			 *
+			 * So, firstly we must retrieve from pg_partition_rule the
+			 * partition descriptor for the current relid. This gives us
+			 * partition name and position. With paroid, we can get the
+			 * partition level descriptor from pg_partition and therefore
+			 * our depth.
+			 */
+			partrel = heap_open(PartitionRuleRelationId, AccessShareLock);
+
+			tuple = caql_getfirst(
+				caql_addrel(cqclr(&cqc), partrel),
+				cql("SELECT * FROM pg_partition_rule "
+					" WHERE parchildrelid = :1 ",
+					ObjectIdGetDatum(relid)));
+
+			Assert(HeapTupleIsValid(tuple));
+
+			name = ((Form_pg_partition_rule)GETSTRUCT(tuple))->parname;
+			parname = pstrdup(NameStr(name));
+			position = ((Form_pg_partition_rule)GETSTRUCT(tuple))->parruleord;
+			paroid = ((Form_pg_partition_rule)GETSTRUCT(tuple))->paroid;
+
+			heap_freetuple(tuple);
+			heap_close(partrel, NoLock);
+
+			partrel = heap_open(PartitionRelationId, AccessShareLock);
+
+			tuple = caql_getfirst(
+				caql_addrel(cqclr(&cqc), partrel),
+				cql("SELECT parlevel FROM pg_partition "
+					" WHERE oid = :1 ",
+					ObjectIdGetDatum(paroid)));
+
+			Assert(HeapTupleIsValid(tuple));
+
+			depth = ((Form_pg_partition)GETSTRUCT(tuple))->parlevel + 1;
+
+			heap_freetuple(tuple);
+			heap_close(partrel, NoLock);
+
+			heap_close(crel, NoLock);
+
+			/* now, build the piece to append */
+			snprintf(depthstr, sizeof(depthstr), "%d", depth);
+			if (strlen(parname) == 0)
+				snprintf(prtstr, sizeof(prtstr), "prt_%d", position);
+			else
+				snprintf(prtstr, sizeof(prtstr), "prt_%s", parname);
+
+			chidx->idxname = ChooseRelationNameWithCache(stmt->idxname,
+														 depthstr, /* depth */
+														 prtstr,   /* part spec */
+														 nspOid,
+														 nameCache);
+
+			result = list_concat(result,
+								 transformIndexStmt_recurse(chidx, queryString,
+															masterpstate, true));
+		}
+	}
+
+	/*
+	 * Put the parent table into the rtable so that the expressions can refer
+	 * to its fields without qualification.
+	 */
+	rte = addRangeTableEntryForRelation(pstate, rel, NULL, false, true);
+
+	/* no to join list, yes to namespaces */
+	addRTEtoQuery(pstate, rte, false, true, true);
+
+	/* take care of the where clause */
+	if (stmt->whereClause)
+		stmt->whereClause = transformWhereClause(pstate,
+												 stmt->whereClause,
+												 "WHERE");
+
+	/* take care of any index expressions */
+	foreach(l, stmt->indexParams)
+	{
+		IndexElem  *ielem = (IndexElem *) lfirst(l);
+
+		if (ielem->expr)
+		{
+			ielem->expr = transformExpr(pstate, ielem->expr);
+
+			/*
+			 * We check only that the result type is legitimate; this is for
+			 * consistency with what transformWhereClause() checks for the
+			 * predicate.  DefineIndex() will make more checks.
+			 */
+			if (expression_returns_set(ielem->expr))
+				ereport(ERROR,
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
+						 errmsg("index expression cannot return a set")));
+		}
+	}
+
+	/*
+	 * Check that only the base rel is mentioned.
+	 */
+	if (list_length(pstate->p_rtable) != 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+				 errmsg("index expressions and predicates can refer only to the table being indexed")));
+
+	free_parsestate(pstate);
+
+	/*
+	 * Close relation, but keep the lock. Unless this is a CREATE INDEX
+	 * for a partitioned table, and we're processing a partition. In that
+	 * case, we want to release the lock on the partition early, so that
+	 * you don't run out of space in the lock manager if there are a lot
+	 * of partitions. Holding the lock on the parent table should be
+	 * enough.
+	 */
+	if (!rel_needs_long_lock(RelationGetRelid(rel)))
+		heap_close(rel, lockmode);
+	else
+		heap_close(rel, NoLock);
+
+	result = lcons(stmt, result);
+
+	return result;
+}
+
+
+/*
+ * transformRuleStmt -
+ *	  transform a CREATE RULE Statement. The action is a list of parse
+ *	  trees which is transformed into a list of query trees, and we also
+ *	  transform the WHERE clause if any.
+ *
+ * actions and whereClause are output parameters that receive the
+ * transformed results.
+ *
+ * Note that we must not scribble on the passed-in RuleStmt, so we do
+ * copyObject() on the actions and WHERE clause.
+ */
+void
+transformRuleStmt(RuleStmt *stmt, const char *queryString,
+				  List **actions, Node **whereClause)
+{
+	Relation	rel;
+	ParseState *pstate;
+	RangeTblEntry *oldrte;
+	RangeTblEntry *newrte;
+
+	/*
+	 * To avoid deadlock, make sure the first thing we do is grab
+	 * AccessExclusiveLock on the target relation.	This will be needed by
+	 * DefineQueryRewrite(), and we don't want to grab a lesser lock
+	 * beforehand.
+	 */
+	rel = heap_openrv(stmt->relation, AccessExclusiveLock);
+
+	/* Set up pstate */
+	pstate = make_parsestate(NULL);
+	pstate->p_sourcetext = queryString;
+
+	/*
+	 * NOTE: 'OLD' must always have a varno equal to 1 and 'NEW' equal to 2.
+	 * Set up their RTEs in the main pstate for use in parsing the rule
+	 * qualification.
+	 */
+	oldrte = addRangeTableEntryForRelation(pstate, rel,
+										   makeAlias("*OLD*", NIL),
+										   false, false);
+	newrte = addRangeTableEntryForRelation(pstate, rel,
+										   makeAlias("*NEW*", NIL),
+										   false, false);
+	/* Must override addRangeTableEntry's default access-check flags */
+	oldrte->requiredPerms = 0;
+	newrte->requiredPerms = 0;
+
+	/*
+	 * They must be in the namespace too for lookup purposes, but only add the
+	 * one(s) that are relevant for the current kind of rule.  In an UPDATE
+	 * rule, quals must refer to OLD.field or NEW.field to be unambiguous, but
+	 * there's no need to be so picky for INSERT & DELETE.  We do not add them
+	 * to the joinlist.
+	 */
+	switch (stmt->event)
+	{
+		case CMD_SELECT:
+			addRTEtoQuery(pstate, oldrte, false, true, true);
+			break;
+		case CMD_UPDATE:
+			addRTEtoQuery(pstate, oldrte, false, true, true);
+			addRTEtoQuery(pstate, newrte, false, true, true);
+			break;
+		case CMD_INSERT:
+			addRTEtoQuery(pstate, newrte, false, true, true);
+			break;
+		case CMD_DELETE:
+			addRTEtoQuery(pstate, oldrte, false, true, true);
+			break;
+		default:
+			elog(ERROR, "unrecognized event type: %d",
+				 (int) stmt->event);
+			break;
+	}
+
+	/* take care of the where clause */
+	*whereClause = transformWhereClause(pstate,
+									  (Node *) copyObject(stmt->whereClause),
+										"WHERE");
+
+	if (list_length(pstate->p_rtable) != 2)		/* naughty, naughty... */
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("rule WHERE condition cannot contain references to other relations")));
+
+	/* aggregates not allowed (but subselects are okay) */
+	if (pstate->p_hasAggs)
+		ereport(ERROR,
+				(errcode(ERRCODE_GROUPING_ERROR),
+		   errmsg("cannot use aggregate function in rule WHERE condition")));
+
+	if (pstate->p_hasWindFuncs)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("cannot use window function in rule WHERE condition")));
+
+	/*
+	 * 'instead nothing' rules with a qualification need a query rangetable so
+	 * the rewrite handler can add the negated rule qualification to the
+	 * original query. We create a query with the new command type CMD_NOTHING
+	 * here that is treated specially by the rewrite system.
+	 */
+	if (stmt->actions == NIL)
+	{
+		Query	   *nothing_qry = makeNode(Query);
+
+		nothing_qry->commandType = CMD_NOTHING;
+		nothing_qry->rtable = pstate->p_rtable;
+		nothing_qry->jointree = makeFromExpr(NIL, NULL);		/* no join wanted */
+
+		*actions = list_make1(nothing_qry);
+	}
+	else
+	{
+		ListCell   *l;
+		List	   *newactions = NIL;
+
+		/*
+		 * transform each statement, like parse_sub_analyze()
+		 */
+		foreach(l, stmt->actions)
+		{
+			Node	   *action = (Node *) lfirst(l);
+			ParseState *sub_pstate = make_parsestate(NULL);
+			Query	   *sub_qry,
+					   *top_subqry;
+			bool		has_old,
+						has_new;
+
+			/*
+			 * Since outer ParseState isn't parent of inner, have to pass down
+			 * the query text by hand.
+			 */
+			sub_pstate->p_sourcetext = queryString;
+
+			/*
+			 * Set up OLD/NEW in the rtable for this statement.  The entries
+			 * are added only to relnamespace, not varnamespace, because we
+			 * don't want them to be referred to by unqualified field names
+			 * nor "*" in the rule actions.  We decide later whether to put
+			 * them in the joinlist.
+			 */
+			oldrte = addRangeTableEntryForRelation(sub_pstate, rel,
+												   makeAlias("*OLD*", NIL),
+												   false, false);
+			newrte = addRangeTableEntryForRelation(sub_pstate, rel,
+												   makeAlias("*NEW*", NIL),
+												   false, false);
+			oldrte->requiredPerms = 0;
+			newrte->requiredPerms = 0;
+			addRTEtoQuery(sub_pstate, oldrte, false, true, false);
+			addRTEtoQuery(sub_pstate, newrte, false, true, false);
+
+			/* Transform the rule action statement */
+			top_subqry = transformStmt(sub_pstate,
+									   (Node *) copyObject(action));
+
+			/*
+			 * We cannot support utility-statement actions (eg NOTIFY) with
+			 * nonempty rule WHERE conditions, because there's no way to make
+			 * the utility action execute conditionally.
+			 */
+			if (top_subqry->commandType == CMD_UTILITY &&
+				*whereClause != NULL)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions")));
+
+			/*
+			 * If the action is INSERT...SELECT, OLD/NEW have been pushed down
+			 * into the SELECT, and that's what we need to look at. (Ugly
+			 * kluge ... try to fix this when we redesign querytrees.)
+			 */
+			sub_qry = getInsertSelectQuery(top_subqry, NULL);
+
+			/*
+			 * If the sub_qry is a setop, we cannot attach any qualifications
+			 * to it, because the planner won't notice them.  This could
+			 * perhaps be relaxed someday, but for now, we may as well reject
+			 * such a rule immediately.
+			 */
+			if (sub_qry->setOperations != NULL && *whereClause != NULL)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("conditional UNION/INTERSECT/EXCEPT statements are not implemented")));
+
+			/*
+			 * Validate action's use of OLD/NEW, qual too
+			 */
+			has_old =
+				rangeTableEntry_used((Node *) sub_qry, PRS2_OLD_VARNO, 0) ||
+				rangeTableEntry_used(*whereClause, PRS2_OLD_VARNO, 0);
+			has_new =
+				rangeTableEntry_used((Node *) sub_qry, PRS2_NEW_VARNO, 0) ||
+				rangeTableEntry_used(*whereClause, PRS2_NEW_VARNO, 0);
+
+			switch (stmt->event)
+			{
+				case CMD_SELECT:
+					if (has_old)
+						ereport(ERROR,
+								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+								 errmsg("ON SELECT rule cannot use OLD")));
+					if (has_new)
+						ereport(ERROR,
+								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+								 errmsg("ON SELECT rule cannot use NEW")));
+					break;
+				case CMD_UPDATE:
+					/* both are OK */
+					break;
+				case CMD_INSERT:
+					if (has_old)
+						ereport(ERROR,
+								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+								 errmsg("ON INSERT rule cannot use OLD")));
+					break;
+				case CMD_DELETE:
+					if (has_new)
+						ereport(ERROR,
+								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+								 errmsg("ON DELETE rule cannot use NEW")));
+					break;
+				default:
+					elog(ERROR, "unrecognized event type: %d",
+						 (int) stmt->event);
+					break;
+			}
+
+			/*
+			 * For efficiency's sake, add OLD to the rule action's jointree
+			 * only if it was actually referenced in the statement or qual.
+			 *
+			 * For INSERT, NEW is not really a relation (only a reference to
+			 * the to-be-inserted tuple) and should never be added to the
+			 * jointree.
+			 *
+			 * For UPDATE, we treat NEW as being another kind of reference to
+			 * OLD, because it represents references to *transformed* tuples
+			 * of the existing relation.  It would be wrong to enter NEW
+			 * separately in the jointree, since that would cause a double
+			 * join of the updated relation.  It's also wrong to fail to make
+			 * a jointree entry if only NEW and not OLD is mentioned.
+			 */
+			if (has_old || (has_new && stmt->event == CMD_UPDATE))
+			{
+				/*
+				 * If sub_qry is a setop, manipulating its jointree will do no
+				 * good at all, because the jointree is dummy. (This should be
+				 * a can't-happen case because of prior tests.)
+				 */
+				if (sub_qry->setOperations != NULL)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("conditional UNION/INTERSECT/EXCEPT statements are not implemented")));
+				/* hack so we can use addRTEtoQuery() */
+				sub_pstate->p_rtable = sub_qry->rtable;
+				sub_pstate->p_joinlist = sub_qry->jointree->fromlist;
+				addRTEtoQuery(sub_pstate, oldrte, true, false, false);
+				sub_qry->jointree->fromlist = sub_pstate->p_joinlist;
+			}
+
+			newactions = lappend(newactions, top_subqry);
+
+			free_parsestate(sub_pstate);
+		}
+
+		*actions = newactions;
+	}
+
+	free_parsestate(pstate);
+
+	/* Close relation, but keep the exclusive lock */
+	heap_close(rel, NoLock);
+}
+
+
+/*
+ * transformAlterTableStmt -
+ *		parse analysis for ALTER TABLE
+ *
+ * Returns a List of utility commands to be done in sequence.  One of these
+ * will be the transformed AlterTableStmt, but there may be additional actions
+ * to be done before and after the actual AlterTable() call.
+ */
+List *
+transformAlterTableStmt(AlterTableStmt *stmt, const char *queryString)
+{
+	Relation	rel;
+	ParseState *pstate;
+	CreateStmtContext cxt;
+	List	   *result;
+	List	   *save_alist;
+	ListCell   *lcmd,
+			   *l;
+	List	   *newcmds = NIL;
+	bool		skipValidation = true;
+	AlterTableCmd *newcmd;
+
+	/*
+	 * We must not scribble on the passed-in AlterTableStmt, so copy it. (This
+	 * is overkill, but easy.)
+	 */
+	stmt = (AlterTableStmt *) copyObject(stmt);
+
+	/*
+	 * Acquire exclusive lock on the target relation, which will be held until
+	 * end of transaction.	This ensures any decisions we make here based on
+	 * the state of the relation will still be good at execution. We must get
+	 * exclusive lock now because execution will; taking a lower grade lock
+	 * now and trying to upgrade later risks deadlock.
+	 *
+	 * In GPDB, we release the lock early if this command is part of a
+	 * partitioned CREATE TABLE.
+	 */
+	rel = relation_openrv(stmt->relation, AccessExclusiveLock);
+
+	/* Set up pstate */
+	pstate = make_parsestate(NULL);
+	pstate->p_sourcetext = queryString;
+
+	cxt.stmtType = "ALTER TABLE";
+	cxt.relation = stmt->relation;
+	cxt.rel = rel;
+	cxt.inhRelations = NIL;
+	cxt.isalter = true;
+	cxt.iscreatepart = false;
+	cxt.hasoids = false;		/* need not be right */
+	cxt.columns = NIL;
+	cxt.ckconstraints = NIL;
+	cxt.fkconstraints = NIL;
+	cxt.ixconstraints = NIL;
+	cxt.inh_indexes = NIL;
+	cxt.blist = NIL;
+	cxt.alist = NIL;
+	cxt.dlist = NIL; /* used by transformCreateStmt, not here */
+	cxt.pkey = NULL;
+
+	/*
+	 * The only subtypes that currently require parse transformation handling
+	 * are ADD COLUMN and ADD CONSTRAINT.  These largely re-use code from
+	 * CREATE TABLE.
+	 * And ALTER TABLE ... <operator> PARTITION ...
+	 */
+	foreach(lcmd, stmt->cmds)
+	{
+		AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
+
+		switch (cmd->subtype)
+		{
+			case AT_AddColumn:
+				{
+					ColumnDef  *def = (ColumnDef *) cmd->def;
+
+					Assert(IsA(cmd->def, ColumnDef));
+
+					/*
+					 * Disallow adding a column with primary key constraint
+					 */
+					if (Gp_role == GP_ROLE_DISPATCH)
+					{
+						ListCell *c;
+						foreach(c, def->constraints)
+						{
+							Constraint *cons = (Constraint *) lfirst(c);
+							if (cons->contype == CONSTR_PRIMARY)
+								elog(ERROR, "Cannot add column with primary "
+									 "key constraint");
+							if (cons->contype == CONSTR_UNIQUE)
+								elog(ERROR, "Cannot add column with unique "
+									 "constraint");
+						}
+					}
+					transformColumnDefinition(pstate, &cxt,
+											  (ColumnDef *) cmd->def);
+
+					/*
+					 * If the column has a non-null default, we can't skip
+					 * validation of foreign keys.
+					 */
+					if (((ColumnDef *) cmd->def)->raw_default != NULL)
+						skipValidation = false;
+
+					newcmds = lappend(newcmds, cmd);
+
+					/*
+					 * Convert an ADD COLUMN ... NOT NULL constraint to a
+					 * separate command
+					 */
+					if (def->is_not_null)
+					{
+						/* Remove NOT NULL from AddColumn */
+						def->is_not_null = false;
+
+						/* Add as a separate AlterTableCmd */
+						newcmd = makeNode(AlterTableCmd);
+						newcmd->subtype = AT_SetNotNull;
+						newcmd->name = pstrdup(def->colname);
+						newcmds = lappend(newcmds, newcmd);
+					}
+
+					/*
+					 * All constraints are processed in other ways. Remove the
+					 * original list
+					 */
+					def->constraints = NIL;
+
+					break;
+				}
+			case AT_AddConstraint:
+
+				/*
+				 * The original AddConstraint cmd node doesn't go to newcmds
+				 */
+
+				if (IsA(cmd->def, Constraint))
+					transformTableConstraint(pstate, &cxt,
+											 (Constraint *) cmd->def);
+				else if (IsA(cmd->def, FkConstraint))
+				{
+					cxt.fkconstraints = lappend(cxt.fkconstraints, cmd->def);
+
+					/* GPDB: always skip validation of foreign keys */
+					skipValidation = true;
+				}
+				else
+					elog(ERROR, "unrecognized node type: %d",
+						 (int) nodeTag(cmd->def));
+				break;
+
+			case AT_ProcessedConstraint:
+
+				/*
+				 * Already-transformed ADD CONSTRAINT, so just make it look
+				 * like the standard case.
+				 */
+				cmd->subtype = AT_AddConstraint;
+				newcmds = lappend(newcmds, cmd);
+				break;
+
+				/* CDB: Partitioned Tables */
+            case AT_PartAlter:			/* Alter */
+            case AT_PartAdd:			/* Add */
+            case AT_PartCoalesce:		/* Coalesce */
+            case AT_PartDrop:			/* Drop */
+            case AT_PartExchange:		/* Exchange */
+            case AT_PartMerge:			/* Merge */
+            case AT_PartModify:			/* Modify */
+            case AT_PartRename:			/* Rename */
+            case AT_PartSetTemplate:	/* Set Subpartition Template */
+            case AT_PartSplit:			/* Split */
+            case AT_PartTruncate:		/* Truncate */
+				cmd = transformAlterTable_all_PartitionStmt(
+					pstate,
+					stmt,
+					&cxt,
+					cmd);
+
+				newcmds = lappend(newcmds, cmd);
+				break;
+
+			case AT_PartAddInternal:	/* Add partition, as part of CREATE TABLE */
+				cxt.iscreatepart = true;
+				newcmds = lappend(newcmds, cmd);
+				break;
+
+			default:
+				newcmds = lappend(newcmds, cmd);
+				break;
+		}
+	}
+
+	/*
+	 * transformIndexConstraints wants cxt.alist to contain only index
+	 * statements, so transfer anything we already have into save_alist
+	 * immediately.
+	 */
+	save_alist = cxt.alist;
+	cxt.alist = NIL;
+
+	/* Postprocess index and FK constraints */
+	transformIndexConstraints(pstate, &cxt, false);
+
+	transformFKConstraints(pstate, &cxt, skipValidation, true);
+
+	/*
+	 * Push any index-creation commands into the ALTER, so that they can be
+	 * scheduled nicely by tablecmds.c.  Note that tablecmds.c assumes that
+	 * the IndexStmt attached to an AT_AddIndex subcommand has already been
+	 * through transformIndexStmt.
+	 */
+	foreach(l, cxt.alist)
+	{
+		Node	   *idxstmt = (Node *) lfirst(l);
+		List	   *idxstmts;
+		ListCell   *li;
+
+		idxstmts = transformIndexStmt((IndexStmt *) idxstmt,
+									  queryString);
+		foreach(li, idxstmts)
+		{
+			Assert(IsA(idxstmt, IndexStmt));
+			newcmd = makeNode(AlterTableCmd);
+			newcmd->subtype = AT_AddIndex;
+			newcmd->def = lfirst(li);
+			newcmds = lappend(newcmds, newcmd);
+		}
+	}
+	cxt.alist = NIL;
+
+	/* Append any CHECK or FK constraints to the commands list */
+	foreach(l, cxt.ckconstraints)
+	{
+		newcmd = makeNode(AlterTableCmd);
+		newcmd->subtype = AT_AddConstraint;
+		newcmd->def = (Node *) lfirst(l);
+		newcmds = lappend(newcmds, newcmd);
+	}
+	foreach(l, cxt.fkconstraints)
+	{
+		newcmd = makeNode(AlterTableCmd);
+		newcmd->subtype = AT_AddConstraint;
+		newcmd->def = (Node *) lfirst(l);
+		newcmds = lappend(newcmds, newcmd);
+	}
+
+	/*
+	 * Close rel but keep lock
+	 *
+	 * If this is part of a CREATE TABLE of a partitioned table, creating
+	 * the partitions, we release the lock immediately, however. We hold
+	 * a lock on the parent table, and no-one can see the partitions yet,
+	 * so the lock on each partition isn't strictly required. Creating a
+	 * massively partitioned table could otherwise require holding a lot
+	 * of locks, running out of shared memory in the lock manager.
+	 */
+	if (cxt.iscreatepart)
+		relation_close(rel, AccessExclusiveLock);
+	else
+		relation_close(rel, NoLock);
+
+	/*
+	 * Output results.
+	 */
+	stmt->cmds = newcmds;
+
+	result = lappend(cxt.blist, stmt);
+	result = list_concat(result, cxt.alist);
+	result = list_concat(result, save_alist);
+
+	return result;
+}
+
+
+/*
+ * Preprocess a list of column constraint clauses
+ * to attach constraint attributes to their primary constraint nodes
+ * and detect inconsistent/misplaced constraint attributes.
+ *
+ * NOTE: currently, attributes are only supported for FOREIGN KEY primary
+ * constraints, but someday they ought to be supported for other constraints.
+ */
+static void
+transformConstraintAttrs(List *constraintList)
+{
+	Node	   *lastprimarynode = NULL;
+	bool		saw_deferrability = false;
+	bool		saw_initially = false;
+	ListCell   *clist;
+
+	foreach(clist, constraintList)
+	{
+		Node	   *node = lfirst(clist);
+
+		if (!IsA(node, Constraint))
+		{
+			lastprimarynode = node;
+			/* reset flags for new primary node */
+			saw_deferrability = false;
+			saw_initially = false;
+		}
+		else
+		{
+			Constraint *con = (Constraint *) node;
+
+			switch (con->contype)
+			{
+				case CONSTR_ATTR_DEFERRABLE:
+					if (lastprimarynode == NULL ||
+						!IsA(lastprimarynode, FkConstraint))
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("misplaced DEFERRABLE clause")));
+					if (saw_deferrability)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed")));
+					saw_deferrability = true;
+					((FkConstraint *) lastprimarynode)->deferrable = true;
+					break;
+				case CONSTR_ATTR_NOT_DEFERRABLE:
+					if (lastprimarynode == NULL ||
+						!IsA(lastprimarynode, FkConstraint))
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("misplaced NOT DEFERRABLE clause")));
+					if (saw_deferrability)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed")));
+					saw_deferrability = true;
+					((FkConstraint *) lastprimarynode)->deferrable = false;
+					if (saw_initially &&
+						((FkConstraint *) lastprimarynode)->initdeferred)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
+					break;
+				case CONSTR_ATTR_DEFERRED:
+					if (lastprimarynode == NULL ||
+						!IsA(lastprimarynode, FkConstraint))
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("misplaced INITIALLY DEFERRED clause")));
+					if (saw_initially)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed")));
+					saw_initially = true;
+					((FkConstraint *) lastprimarynode)->initdeferred = true;
+
+					/*
+					 * If only INITIALLY DEFERRED appears, assume DEFERRABLE
+					 */
+					if (!saw_deferrability)
+						((FkConstraint *) lastprimarynode)->deferrable = true;
+					else if (!((FkConstraint *) lastprimarynode)->deferrable)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
+					break;
+				case CONSTR_ATTR_IMMEDIATE:
+					if (lastprimarynode == NULL ||
+						!IsA(lastprimarynode, FkConstraint))
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+							errmsg("misplaced INITIALLY IMMEDIATE clause")));
+					if (saw_initially)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed")));
+					saw_initially = true;
+					((FkConstraint *) lastprimarynode)->initdeferred = false;
+					break;
+				default:
+					/* Otherwise it's not an attribute */
+					lastprimarynode = node;
+					/* reset flags for new primary node */
+					saw_deferrability = false;
+					saw_initially = false;
+					break;
+			}
+		}
+	}
+}
+
+/*
+ * Special handling of type definition for a column
+ */
+static void
+transformColumnType(ParseState *pstate, ColumnDef *column)
+{
+	/*
+	 * All we really need to do here is verify that the type is valid.
+	 */
+	Type		ctype = typenameType(pstate, column->typname, NULL);
+
+	ReleaseSysCache(ctype);
+}
+
+
+/*
+ * transformCreateSchemaStmt -
+ *	  analyzes the CREATE SCHEMA statement
+ *
+ * Split the schema element list into individual commands and place
+ * them in the result list in an order such that there are no forward
+ * references (e.g. GRANT to a table created later in the list). Note
+ * that the logic we use for determining forward references is
+ * presently quite incomplete.
+ *
+ * SQL92 also allows constraints to make forward references, so thumb through
+ * the table columns and move forward references to a posterior alter-table
+ * command.
+ *
+ * The result is a list of parse nodes that still need to be analyzed ---
+ * but we can't analyze the later commands until we've executed the earlier
+ * ones, because of possible inter-object references.
+ *
+ * Note: this breaks the rules a little bit by modifying schema-name fields
+ * within passed-in structs.  However, the transformation would be the same
+ * if done over, so it should be all right to scribble on the input to this
+ * extent.
+ */
+List *
+transformCreateSchemaStmt(CreateSchemaStmt *stmt)
+{
+	CreateSchemaStmtContext cxt;
+	List	   *result;
+	ListCell   *elements;
+
+	cxt.stmtType = "CREATE SCHEMA";
+	cxt.schemaname = stmt->schemaname;
+	cxt.authid = stmt->authid;
+	cxt.sequences = NIL;
+	cxt.tables = NIL;
+	cxt.views = NIL;
+	cxt.indexes = NIL;
+	cxt.triggers = NIL;
+	cxt.grants = NIL;
+
+	/*
+	 * Run through each schema element in the schema element list. Separate
+	 * statements by type, and do preliminary analysis.
+	 */
+	foreach(elements, stmt->schemaElts)
+	{
+		Node	   *element = lfirst(elements);
+
+		switch (nodeTag(element))
+		{
+			case T_CreateSeqStmt:
+				{
+					CreateSeqStmt *elp = (CreateSeqStmt *) element;
+
+					setSchemaName(cxt.schemaname, &elp->sequence->schemaname);
+					cxt.sequences = lappend(cxt.sequences, element);
+				}
+				break;
+
+			case T_CreateStmt:
+				{
+					CreateStmt *elp = (CreateStmt *) element;
+
+					setSchemaName(cxt.schemaname, &elp->relation->schemaname);
+
+					/*
+					 * XXX todo: deal with constraints
+					 */
+					cxt.tables = lappend(cxt.tables, element);
+				}
+				break;
+
+			case T_ViewStmt:
+				{
+					ViewStmt   *elp = (ViewStmt *) element;
+
+					setSchemaName(cxt.schemaname, &elp->view->schemaname);
+
+					/*
+					 * XXX todo: deal with references between views
+					 */
+					cxt.views = lappend(cxt.views, element);
+				}
+				break;
+
+			case T_IndexStmt:
+				{
+					IndexStmt  *elp = (IndexStmt *) element;
+
+					setSchemaName(cxt.schemaname, &elp->relation->schemaname);
+					cxt.indexes = lappend(cxt.indexes, element);
+				}
+				break;
+
+			case T_CreateTrigStmt:
+				{
+					CreateTrigStmt *elp = (CreateTrigStmt *) element;
+
+					setSchemaName(cxt.schemaname, &elp->relation->schemaname);
+					cxt.triggers = lappend(cxt.triggers, element);
+				}
+				break;
+
+			case T_GrantStmt:
+				cxt.grants = lappend(cxt.grants, element);
+				break;
+
+			default:
+				elog(ERROR, "unrecognized node type: %d",
+					 (int) nodeTag(element));
+		}
+	}
+
+	result = NIL;
+	result = list_concat(result, cxt.sequences);
+	result = list_concat(result, cxt.tables);
+	result = list_concat(result, cxt.views);
+	result = list_concat(result, cxt.indexes);
+	result = list_concat(result, cxt.triggers);
+	result = list_concat(result, cxt.grants);
+
+	return result;
+}
+
+static void
+setSchemaName(char *context_schema, char **stmt_schema_name)
+{
+	if (*stmt_schema_name == NULL)
+		*stmt_schema_name = context_schema;
+	else if (strcmp(context_schema, *stmt_schema_name) != 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_SCHEMA_DEFINITION),
+				 errmsg("CREATE specifies a schema (%s) "
+						"different from the one being created (%s)",
+						*stmt_schema_name, context_schema)));
+}
+
+/*
+ * getLikeDistributionPolicy
+ *
+ * For Greenplum Database distributed tables, default to
+ * the same distribution as the first LIKE table, unless
+ * we also have INHERITS
+ */
+static List *
+getLikeDistributionPolicy(InhRelation* e)
+{
+	List*			likeDistributedBy = NIL;
+	Oid				relId;
+	GpPolicy*		oldTablePolicy;
+
+	relId = RangeVarGetRelid(e->relation, false);
+	oldTablePolicy = GpPolicyFetch(CurrentMemoryContext, relId);
+
+	if (oldTablePolicy != NULL &&
+		oldTablePolicy->ptype == POLICYTYPE_PARTITIONED)
+	{
+		int ia;
+
+		if (oldTablePolicy->nattrs > 0)
+		{
+			for (ia = 0 ; ia < oldTablePolicy->nattrs ; ia++)
+			{
+				char *attname = get_attname(relId, oldTablePolicy->attrs[ia]);
+
+				if (likeDistributedBy)
+					likeDistributedBy = lappend(likeDistributedBy, (Node *) makeString(attname));
+				else
+					likeDistributedBy = list_make1((Node *) makeString(attname));
+			}
+		}
+		else
+		{	/* old table is distributed randomly. */
+			likeDistributedBy = list_make1((Node *) NULL);
+		}
+	}
+
+	return likeDistributedBy;
+}
+
+
+
+/*
+ * Transform and validate the actual encoding clauses.
+ *
+ * We need tell the underlying system that these are AO/CO tables too,
+ * hence the concatenation of the extra elements.
+ */
+List *
+transformStorageEncodingClause(List *options)
+{
+	Datum d;
+	ListCell *lc;
+	DefElem *dl;
+	foreach(lc, options)
+	{
+		dl = (DefElem *) lfirst(lc);
+		if (pg_strncasecmp(dl->defname, SOPT_CHECKSUM, strlen(SOPT_CHECKSUM))
+			== 0)
+		{
+			elog(ERROR, "\"%s\" is not a column specific option.",
+				 SOPT_CHECKSUM);
+		}
+	}
+	List *extra = list_make2(makeDefElem("appendonly",
+										 (Node *)makeString("true")),
+							 makeDefElem("orientation",
+										 (Node *)makeString("column")));
+
+	/* add defaults for missing values */
+	options = fillin_encoding(options);
+
+	/*
+	 * The following two statements validate that the encoding clause is well
+	 * formed.
+	 */
+	d = transformRelOptions(PointerGetDatum(NULL),
+									  list_concat(extra, options),
+									  true, false);
+	(void)heap_reloptions(RELKIND_RELATION, d, true);
+
+	return options;
+}
+
+/*
+ * Validate the sanity of column reference storage clauses.
+ *
+ * 1. Ensure that we only refer to columns that exist.
+ * 2. Ensure that each column is referenced either zero times or once.
+ */
+static void
+validateColumnStorageEncodingClauses(List *stenc, CreateStmt *stmt)
+{
+	ListCell *lc;
+	struct HTAB *ht = NULL;
+	struct colent {
+		char colname[NAMEDATALEN];
+		int count;
+	} *ce = NULL;
+
+	if (!stenc)
+		return;
+
+	/* Generate a hash table for all the columns */
+	foreach(lc, stmt->tableElts)
+	{
+		Node *n = lfirst(lc);
+
+		if (IsA(n, ColumnDef))
+		{
+			ColumnDef *c = (ColumnDef *)n;
+			char *colname;
+			bool found = false;
+			size_t n = NAMEDATALEN - 1 < strlen(c->colname) ?
+							NAMEDATALEN - 1 : strlen(c->colname);
+
+			colname = palloc0(NAMEDATALEN);
+			MemSet(colname, 0, NAMEDATALEN);
+			memcpy(colname, c->colname, n);
+			colname[n] = '\0';
+
+			if (!ht)
+			{
+				HASHCTL  cacheInfo;
+				int      cacheFlags;
+
+				memset(&cacheInfo, 0, sizeof(cacheInfo));
+				cacheInfo.keysize = NAMEDATALEN;
+				cacheInfo.entrysize = sizeof(*ce);
+				cacheFlags = HASH_ELEM;
+
+				ht = hash_create("column info cache",
+								 list_length(stmt->tableElts),
+								 &cacheInfo, cacheFlags);
+			}
+
+			ce = hash_search(ht, colname, HASH_ENTER, &found);
+
+			/*
+			 * The user specified a duplicate column name. We check duplicate
+			 * column names VERY late (under MergeAttributes(), which is called
+			 * by DefineRelation(). For the specific case here, it is safe to
+			 * call out that this is a duplicate. We don't need to delay until
+			 * we look at inheritance.
+			 */
+			if (found)
+			{
+				ereport(ERROR,
+						(errcode(ERRCODE_DUPLICATE_COLUMN),
+						 errmsg("column \"%s\" duplicated",
+								colname)));
+				
+			}
+			ce->count = 0;
+		}
+	}
+
+	/*
+	 * If the table has no columns -- usually in the partitioning case -- then
+	 * we can short circuit.
+	 */
+	if (!ht)
+		return;
+
+	/*
+	 * All column reference storage directives without the DEFAULT
+	 * clause should refer to real columns.
+	 */
+	foreach(lc, stenc)
+	{
+		ColumnReferenceStorageDirective *c = lfirst(lc);
+
+		Insist(IsA(c, ColumnReferenceStorageDirective));
+
+		if (c->deflt)
+			continue;
+		else
+		{
+			bool found = false;
+			char colname[NAMEDATALEN];
+			size_t collen = strlen(c->column);
+			size_t n = NAMEDATALEN - 1 < collen ? NAMEDATALEN - 1 : collen;
+			MemSet(colname, 0, NAMEDATALEN);
+			memcpy(colname, c->column, n);
+			colname[n] = '\0';
+
+			ce = hash_search(ht, colname, HASH_FIND, &found);
+
+			if (!found)
+				elog(ERROR, "column \"%s\" does not exist", colname);
+
+			ce->count++;
+
+			if (ce->count > 1)
+				elog(ERROR, "column \"%s\" referenced in more than one "
+					 "COLUMN ENCODING clause", colname);
+
+		}
+	}
+
+	hash_destroy(ht);
+}
+
+/*
+ * Find the column reference storage encoding clause for `column'.
+ *
+ * This is called by transformAttributeEncoding() in a loop but stenc should be
+ * quite small in practice.
+ */
+static ColumnReferenceStorageDirective *
+find_crsd(char *column, List *stenc)
+{
+	ListCell *lc;
+
+	foreach(lc, stenc)
+	{
+		ColumnReferenceStorageDirective *c = lfirst(lc);
+
+		if (c->deflt == false && strcmp(column, c->column) == 0)
+			return c;
+	}
+	return NULL;
+}
+
+
+List *
+TypeNameGetStorageDirective(TypeName *typname)
+{
+	HeapTuple tuple;
+	cqContext  *pcqCtx;
+	Oid			typid;
+	int32		typmod;
+	List *out = NIL;
+
+	typid = typenameTypeId(NULL, typname, &typmod);
+	
+	/* XXX XXX: SELECT typoptions */
+	pcqCtx = caql_beginscan(
+			NULL,
+			cql("SELECT * FROM pg_type_encoding "
+				" WHERE typid = :1 ",
+				ObjectIdGetDatum(typid)));
+
+	tuple = caql_getnext(pcqCtx);
+
+	if (HeapTupleIsValid(tuple))
+	{
+		Datum options;
+		bool isnull;
+
+		options = caql_getattr(pcqCtx, 
+							   Anum_pg_type_encoding_typoptions,
+							   &isnull);
+
+		Insist(!isnull);
+
+		out = untransformRelOptions(options);
+	}
+
+	caql_endscan(pcqCtx);
+	return out;
+}
+
+/*
+ * Make a default column storage directive from a WITH clause
+ * Ignore options in the WITH clause that don't appear in 
+ * storage_directives for column-level compression.
+ */
+List *
+form_default_storage_directive(List *enc)
+{
+	List *out = NIL;
+	ListCell *lc;
+
+	foreach(lc, enc)
+	{
+		DefElem *el = lfirst(lc);
+
+		if (!el->defname)
+			out = lappend(out, copyObject(el));
+
+		if (pg_strcasecmp("appendonly", el->defname) == 0)
+			continue;
+		if (pg_strcasecmp("orientation", el->defname) == 0)
+			continue;
+		if (pg_strcasecmp("oids", el->defname) == 0)
+			continue;
+		if (pg_strcasecmp("fillfactor", el->defname) == 0)
+			continue;
+		if (pg_strcasecmp("tablename", el->defname) == 0)
+			continue;
+		/* checksum is not a column specific attribute. */
+		if (pg_strcasecmp("checksum", el->defname) == 0)
+			continue;
+		out = lappend(out, copyObject(el));
+	}
+	return out;
+}
+
+static List *
+transformAttributeEncoding(List *stenc, CreateStmt *stmt, CreateStmtContext *cxt)
+{
+	ListCell *lc;
+	bool found_enc = stenc != NIL;
+	bool can_enc = is_aocs(stmt->options);
+	ColumnReferenceStorageDirective *deflt = NULL;
+	List *newenc = NIL;
+	List *tmpenc;
+	MemoryContext oldCtx;
+
+#define UNSUPPORTED_ORIENTATION_ERROR() \
+	ereport(ERROR, \
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
+			 errmsg("ENCODING clause only supported with column oriented tables")))
+
+	/* We only support the attribute encoding clause on AOCS tables */
+	if (stenc && !can_enc)
+		UNSUPPORTED_ORIENTATION_ERROR();
+
+	/* Use the temporary context to avoid leaving behind so much garbage. */
+	oldCtx = MemoryContextSwitchTo(cxt->tempCtx);
 
-		/*
-		 * Copy default, if present and the default has been requested
-		 */
-		if (attribute->atthasdef && including_defaults)
+	/* get the default clause, if there is one. */
+	foreach(lc, stenc)
+	{
+		ColumnReferenceStorageDirective *c = lfirst(lc);
+		Insist(IsA(c, ColumnReferenceStorageDirective));
+
+		if (c->deflt)
 		{
-			char	   *this_default = NULL;
-			AttrDefault *attrdef;
-			int			i;
+			/*
+			 * Some quick validation: there should only be one default
+			 * clause
+			 */
+			if (deflt)
+				elog(ERROR, "only one default column encoding may be specified");
 
-			/* Find default in constraint structure */
-			Assert(constr != NULL);
-			attrdef = constr->defval;
-			for (i = 0; i < constr->num_defval; i++)
-			{
-				if (attrdef[i].adnum == parent_attno)
-				{
-					this_default = attrdef[i].adbin;
-					break;
-				}
-			}
-			Assert(this_default != NULL);
+			deflt = copyObject(c);
+			deflt->encoding = transformStorageEncodingClause(deflt->encoding);
 
 			/*
-			 * If default expr could contain any vars, we'd need to fix 'em,
-			 * but it can't; so default is ready to apply to child.
+			 * The default encoding and the with clause better not
+			 * try and set the same options!
 			 */
-
-			def->cooked_default = pstrdup(this_default);
+			if (encodings_overlap(stmt->options, deflt->encoding, false))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+						 errmsg("DEFAULT COLUMN ENCODING clause cannot "
+								"override values set in WITH clause")));
 		}
 	}
 
 	/*
-	 * Copy CHECK constraints if requested, being careful to adjust
-	 * attribute numbers
+	 * If no default has been specified, we might create one out of the
+	 * WITH clause.
 	 */
-	if (including_constraints && tupleDesc->constr)
-	{
-		AttrNumber *attmap = varattnos_map_schema(tupleDesc, cxt->columns);
-		int			ccnum;
-
-		for (ccnum = 0; ccnum < tupleDesc->constr->num_check; ccnum++)
-		{
-			char	   *ccname = tupleDesc->constr->check[ccnum].ccname;
-			char	   *ccbin = tupleDesc->constr->check[ccnum].ccbin;
-			Node	   *ccbin_node = stringToNode(ccbin);
-			Constraint *n = makeNode(Constraint);
+	tmpenc = form_default_storage_directive(stmt->options);
 
-			change_varattnos_of_a_node(ccbin_node, attmap);
-
-			n->contype = CONSTR_CHECK;
-			n->name = pstrdup(ccname);
-			n->raw_expr = NULL;
-			n->cooked_expr = nodeToString(ccbin_node);
-			n->indexspace = NULL;
-			cxt->ckconstraints = lappend(cxt->ckconstraints, (Node *) n);
-		}
+	if (tmpenc)
+	{
+		deflt = makeNode(ColumnReferenceStorageDirective);
+		deflt->deflt = true;
+		deflt->encoding = transformStorageEncodingClause(tmpenc);
 	}
 
 	/*
-	 * Likewise, copy indexes if requested
+	 * Loop over all columns. If a column has a column reference storage clause
+	 * -- i.e., COLUMN name ENCODING () -- apply that. Otherwise, apply the
+	 * default.
 	 */
-	if (including_indexes && relation->rd_rel->relhasindex)
+	foreach(lc, cxt->columns)
 	{
-		AttrNumber *attmap = varattnos_map_schema(tupleDesc, cxt->columns);
-		List	   *parent_indexes;
-		ListCell   *l;
-
-		parent_indexes = RelationGetIndexList(relation);
+		ColumnDef *d = (ColumnDef *) lfirst(lc);
+		ColumnReferenceStorageDirective *c;
 
-		foreach(l, parent_indexes)
-		{
-			Oid			parent_index_oid = lfirst_oid(l);
-			Relation	parent_index;
-			IndexStmt  *index_stmt;
+		Insist(IsA(d, ColumnDef));
 
-			parent_index = index_open(parent_index_oid, AccessShareLock);
+		c = makeNode(ColumnReferenceStorageDirective);
+		c->column = pstrdup(d->colname);
 
-			/* Build CREATE INDEX statement to recreate the parent_index */
-			index_stmt = generateClonedIndexStmt(cxt, parent_index, attmap);
+		/*
+		 * Find a storage encoding for this column, in this order:
+		 *
+		 * 1. An explicit encoding clause in the ColumnDef
+		 * 2. A column reference storage directive for this column
+		 * 3. A default column encoding in the statement
+		 * 4. A default for the type.
+		 */
+		if (d->encoding)
+		{
+			found_enc = true;
+			c->encoding = transformStorageEncodingClause(d->encoding);
+		}
+		else
+		{
+			ColumnReferenceStorageDirective *s = find_crsd(c->column, stenc);
 
-			/* Save it in the inh_indexes list for the time being */
-			cxt->inh_indexes = lappend(cxt->inh_indexes, index_stmt);
+			if (s)
+				c->encoding = transformStorageEncodingClause(s->encoding);
+			else
+			{
+				if (deflt)
+					c->encoding = copyObject(deflt->encoding);
+				else
+				{
+					List *te = TypeNameGetStorageDirective(d->typname);
 
-			index_close(parent_index, AccessShareLock);
+					if (te)
+						c->encoding = copyObject(te);
+					else
+						c->encoding = default_column_encoding_clause();
+				}
+			}
 		}
+		newenc = lappend(newenc, c);
 	}
 
-	/*
-	 * Close the parent rel, but keep our AccessShareLock on it until xact
-	 * commit.	That will prevent someone else from deleting or ALTERing the
-	 * parent before the child is committed.
-	 */
-	heap_close(relation, NoLock);
+	/* Check again incase we expanded a some column encoding clauses */
+	if (!can_enc)
+	{
+		if (found_enc)
+			UNSUPPORTED_ORIENTATION_ERROR();
+		else
+			newenc = NULL;
+	}
+
+	validateColumnStorageEncodingClauses(newenc, stmt);
+
+	/* copy the result out of the temporary memory context */
+	MemoryContextSwitchTo(oldCtx);
+	newenc = copyObject(newenc);
+
+	return newenc;
 }
 
 /*
- * transformIndexConstraints
- *		Handle UNIQUE and PRIMARY KEY constraints, which create indexes.
- *		We also merge in any index definitions arising from
- *		LIKE ... INCLUDING INDEXES.
+ * Tells the caller if CO is explicitly disabled, to handle cases where we
+ * want to ignore encoding clauses in partition expansion.
+ *
+ * This is an ugly special case that backup expects to work and since we've got
+ * tonnes of dumps out there and the possibility that users have learned this
+ * grammar from them, we must continue to support it.
  */
-void
-transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt, bool mayDefer)
+static bool
+co_explicitly_disabled(List *opts)
 {
-	IndexStmt  *index;
-	List	   *indexlist = NIL;
-	ListCell   *lc;
+	ListCell *lc;
 
-	/*
-	 * Run through the constraints that need to generate an index. For PRIMARY
-	 * KEY, mark each column as NOT NULL and create an index. For UNIQUE,
-	 * create an index as for PRIMARY KEY, but do not insist on NOT NULL.
-	 */
-	foreach(lc, cxt->ixconstraints)
+	foreach(lc, opts)
 	{
-		Constraint *constraint = (Constraint *) lfirst(lc);
+		DefElem *el = lfirst(lc);
+		char *arg = NULL;
 
-		Assert(IsA(constraint, Constraint));
-		Assert(constraint->contype == CONSTR_PRIMARY ||
-			   constraint->contype == CONSTR_UNIQUE);
+		/* Argument will be a Value */
+		if (!el->arg)
+		{
+			continue;
+		}
 
-		index = transformIndexConstraint(constraint, cxt);
+		arg = defGetString(el);
+		bool result = false;
+		if (pg_strcasecmp("appendonly", el->defname) == 0 &&
+			pg_strcasecmp("false", arg) == 0)
+		{
+			result = true;
+		}
+		else if (pg_strcasecmp("orientation", el->defname) == 0 &&
+				 pg_strcasecmp("column", arg) != 0)
+		{
+			result = true;
+		}
 
-		indexlist = lappend(indexlist, index);
+		if (result)
+		{
+			return true;
+		}
 	}
+	return false;
+}
 
-	/* Add in any indexes defined by LIKE ... INCLUDING INDEXES */
-	foreach(lc, cxt->inh_indexes)
+/*
+ * Tell the caller whether appendonly=true and orientation=column
+ * have been specified.
+ */
+bool
+is_aocs(List *opts)
+{
+	bool found_ao = false;
+	bool found_cs = false;
+	bool aovalue = false;
+	bool csvalue = false;
+
+	ListCell *lc;
+
+	foreach(lc, opts)
 	{
-		index = (IndexStmt *) lfirst(lc);
+		DefElem *el = lfirst(lc);
+		char *arg = NULL;
 
-		if (index->primary)
+		/* Argument will be a Value */
+		if (!el->arg)
 		{
-			if (cxt->pkey != NULL)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-						 errmsg("multiple primary keys for table \"%s\" are not allowed",
-								cxt->relation->relname)));
-			cxt->pkey = index;
+			continue;
 		}
 
-		indexlist = lappend(indexlist, index);
+		arg = defGetString(el);
+
+		if (pg_strcasecmp("appendonly", el->defname) == 0)
+		{
+			found_ao = true;
+			if (!parse_bool(arg, &aovalue))
+				elog(ERROR, "invalid value for option \"appendonly\"");
+		}
+		else if (pg_strcasecmp("orientation", el->defname) == 0)
+		{
+			found_cs = true;
+			csvalue = pg_strcasecmp("column", arg) == 0;
+		}
 	}
+	if (!found_ao)
+		aovalue = isDefaultAO();
+	if (!found_cs)
+		csvalue = isDefaultAOCS();
+	return (aovalue && csvalue);
+}
 
-	/*
-	 * Scan the index list and remove any redundant index specifications. This
-	 * can happen if, for instance, the user writes UNIQUE PRIMARY KEY. A
-	 * strict reading of SQL92 would suggest raising an error instead, but
-	 * that strikes me as too anal-retentive. - tgl 2001-02-14
-	 *
-	 * XXX in ALTER TABLE case, it'd be nice to look for duplicate
-	 * pre-existing indexes, too.
-	 */
-	Assert(cxt->alist == NIL);
-	if (cxt->pkey != NULL)
+/*
+ * See if two encodings attempt to see the same parameters. If test_conflicts is
+ * true, allow setting the same value, but the setting must be identical.
+ */
+static bool
+encodings_overlap(List *a, List *b, bool test_conflicts)
+{
+	ListCell *lca;
+
+	foreach(lca, a)
 	{
-		/* Make sure we keep the PKEY index in preference to others... */
-		cxt->alist = list_make1(cxt->pkey);
+		ListCell *lcb;
+		DefElem *ela = lfirst(lca);
+
+		foreach(lcb, b)
+		{
+			DefElem *elb = lfirst(lcb);
+
+			if (pg_strcasecmp(ela->defname, elb->defname) == 0)
+			{
+				if (test_conflicts)
+				{
+					if (!ela->arg && !elb->arg)
+						return true;
+					else if (!ela->arg || !elb->arg)
+					{
+						/* skip */
+					}
+					else
+					{
+						char *ela_str = defGetString(ela);
+						char *elb_str = defGetString(elb);
+
+						if (pg_strcasecmp(ela_str,elb_str) != 0)
+							return true;
+					}
+				}
+				else
+					return true;
+			}
+		}
 	}
+	return false;
+}
 
-	foreach(lc, indexlist)
+/*
+ * transformAlterTable_all_PartitionStmt -
+ *	transform an Alter Table Statement for some Partition operation
+ */
+static AlterTableCmd *
+transformAlterTable_all_PartitionStmt(
+		ParseState *pstate,
+		AlterTableStmt *stmt,
+		CreateStmtContext *pCxt,
+		AlterTableCmd *cmd)
+{
+	AlterPartitionCmd 	*pc   	   = (AlterPartitionCmd *) cmd->def;
+	AlterPartitionCmd 	*pci  	   = pc;
+	AlterPartitionId  	*pid  	   = (AlterPartitionId *)pci->partid;
+	AlterTableCmd 		*atc1 	   = cmd;
+	RangeVar 			*rv   	   = stmt->relation;
+	PartitionNode 		*pNode 	   = NULL;
+	PartitionNode 		*prevNode  = NULL;
+	int 			 	 partDepth = 0;
+	Oid 			 	 par_oid   = InvalidOid;
+	StringInfoData   sid1, sid2;
+
+	if (atc1->subtype == AT_PartAlter)
 	{
-		bool		keep = true;
-		bool		defer = false;
-		ListCell   *k;
+		PgPartRule* 	 prule = NULL;
+		char 			*lrelname;
+		Relation 		 rel   = heap_openrv(rv, AccessShareLock);
 
-		index = lfirst(lc);
+		initStringInfo(&sid1);
+		initStringInfo(&sid2);
 
-		/* if it's pkey, it's already in cxt->alist */
-		if (index == cxt->pkey)
-			continue;
+		appendStringInfo(&sid1, "relation \"%s\"",
+						 RelationGetRelationName(rel));
 
-		foreach(k, cxt->alist)
+		lrelname = sid1.data;
+
+		pNode = RelationBuildPartitionDesc(rel, false);
+
+		if (!pNode)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("%s is not partitioned",
+							lrelname)));
+
+		/* Processes nested ALTER (if it exists) */
+		while (1)
 		{
-			IndexStmt  *priorindex = lfirst(k);
+			AlterPartitionId  	*pid2 = NULL;
 
-			if (equal(index->indexParams, priorindex->indexParams) &&
-				equal(index->whereClause, priorindex->whereClause) &&
-				strcmp(index->accessMethod, priorindex->accessMethod) == 0)
+			if (atc1->subtype != AT_PartAlter)
 			{
-				priorindex->unique |= index->unique;
-
-				/*
-				 * If the prior index is as yet unnamed, and this one is
-				 * named, then transfer the name to the prior index. This
-				 * ensures that if we have named and unnamed constraints,
-				 * we'll use (at least one of) the names for the index.
-				 */
-				if (priorindex->idxname == NULL)
-					priorindex->idxname = index->idxname;
-				keep = false;
+				rv = makeRangeVar(
+						get_namespace_name(
+								RelationGetNamespace(rel)),
+						pstrdup(RelationGetRelationName(rel)), -1);
+				heap_close(rel, AccessShareLock);
+				rel = NULL;
 				break;
 			}
-		}
-		
-		defer = index->whereClause != NULL;
-		if ( !defer )
-		{
-			ListCell *j;
-			foreach(j, index->indexParams)
+
+			pid2 = (AlterPartitionId *)pci->partid;
+
+			if (pid2 && (pid2->idtype == AT_AP_IDValue))
 			{
-				IndexElem *elt = (IndexElem*)lfirst(j);
-				Assert(IsA(elt, IndexElem));
-				
-				if (elt->expr != NULL)
-				{
-					defer = true;
-					break;
-				}
+				List *vallist = (List *)pid2->partiddef;
+				pid2->partiddef =
+						(Node *)transformExpressionList(
+								pstate, vallist);
 			}
-		}
 
-		if (keep)
-		{
-			if (defer && mayDefer)
+			partDepth++;
+
+			if (!pNode)
+				prule = NULL;
+			else
+				prule = get_part_rule1(rel,
+									   pid2,
+									   false, true,
+									   NULL,
+									   pNode,
+									   sid1.data, NULL);
+
+			if (prule && prule->topRule &&
+				prule->topRule->children)
 			{
-				/* An index on an expression with a WHERE clause or for an 
-				 * inheritance child will cause a trip through parse_analyze.  
-				 * If we do that before creating the table, it will fail, so 
-				 * we put it on a list for later.
+				prevNode = pNode;
+				pNode = prule->topRule->children;
+				par_oid = RelationGetRelid(rel);
+
+				/*
+				 * Don't hold a long lock -- lock on the master is
+				 * sufficient
 				 */
-			
-				ereport(DEBUG1,
-						(errmsg("deferring index creation for table \"%s\"",
-								cxt->relation->relname)
-						 ));
-				cxt->dlist = lappend(cxt->dlist, index);
+				heap_close(rel, AccessShareLock);
+				rel = heap_open(prule->topRule->parchildrelid,
+								AccessShareLock);
+
+				appendStringInfo(&sid2, "partition%s of %s",
+								 prule->partIdStr, sid1.data);
+				truncateStringInfo(&sid1, 0);
+				appendStringInfo(&sid1, "%s", sid2.data);
+				truncateStringInfo(&sid2, 0);
 			}
 			else
 			{
-				cxt->alist = lappend(cxt->alist, index);
+				prevNode = pNode;
+				pNode = NULL;
 			}
-		}
+
+			atc1 = (AlterTableCmd *)pci->arg1;
+			pci = (AlterPartitionCmd *)atc1->def;
+		} /* end while */
+		if (rel)
+			/* No need to hold onto the lock -- see above */
+			heap_close(rel, AccessShareLock);
+	} /* end if alter */
+
+	switch (atc1->subtype)
+	{
+		case AT_PartAdd:				/* Add */
+		case AT_PartSetTemplate:		/* Set Subpartn Template */
+		case AT_PartCoalesce:			/* Coalesce */
+		case AT_PartDrop:				/* Drop */
+		case AT_PartExchange:			/* Exchange */
+		case AT_PartMerge:				/* Merge */
+		case AT_PartModify:				/* Modify */
+		case AT_PartRename:				/* Rename */
+		case AT_PartTruncate:			/* Truncate */
+		case AT_PartSplit:				/* Split */
+			/* MPP-4011: get right pid for FOR(value) */
+			pid  	   = (AlterPartitionId *)pci->partid;
+			if (pid && (pid->idtype == AT_AP_IDValue))
+			{
+				List *vallist = (List *)pid->partiddef;
+				pid->partiddef =
+						(Node *)transformExpressionList(
+								pstate, vallist);
+			}
+	break;
+		default:
+			break;
 	}
-}
+	/* transform boundary specifications at execute time */
+	return cmd;
+} /* end transformAlterTable_all_PartitionStmt */
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 8154a4df7bc6..acde131cfc39 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -28,8 +28,8 @@
 
 List	   *parsetree;			/* result of parsing is left here */
 
-static bool have_lookahead;			/* is lookahead info valid? */
-static int	lookahead_token;		/* one-token lookahead */
+static bool have_lookahead;		/* is lookahead info valid? */
+static int	lookahead_token;	/* one-token lookahead */
 static YYSTYPE lookahead_yylval;	/* yylval for lookahead token */
 static YYLTYPE lookahead_yylloc;	/* yylloc for lookahead token */
 
@@ -128,6 +128,7 @@ filtered_base_yylex(void)
 	switch (cur_token)
 	{
 		case NULLS_P:
+
 			/*
 			 * NULLS FIRST and NULLS LAST must be reduced to one token
 			 */
@@ -156,6 +157,7 @@ filtered_base_yylex(void)
 			break;
 
 		case WITH:
+
 			/*
 			 * WITH TIME, CASCADED, LOCAL, or CHECK must be reduced to one token
 			 *
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index b4d8612d6c95..090b91f2f1f3 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -176,10 +176,20 @@ truncate_identifier(char *ident, int len, bool warn)
 	{
 		len = pg_mbcliplen(ident, len, NAMEDATALEN - 1);
 		if (warn)
+		{
+			/*
+			 * Cannot use %.*s here because some machines interpret %s's
+			 * precision in characters, others in bytes.
+			 */
+			char	buf[NAMEDATALEN];
+
+			memcpy(buf, ident, len);
+			buf[len] = '\0';
 			ereport(NOTICE,
 					(errcode(ERRCODE_NAME_TOO_LONG),
-					 errmsg("identifier \"%s\" will be truncated to \"%.*s\"",
-							ident, len, ident)));
+					 errmsg("identifier \"%s\" will be truncated to \"%s\"",
+							ident, buf)));
+		}
 		ident[len] = '\0';
 	}
 }
diff --git a/src/backend/port/dynloader/README.dlfcn.aix b/src/backend/port/dynloader/README.dlfcn.aix
index e7519086d11d..969a1d0a39b7 100755
--- a/src/backend/port/dynloader/README.dlfcn.aix
+++ b/src/backend/port/dynloader/README.dlfcn.aix
@@ -1,12 +1,3 @@
-Copyright (c) 1992,1993,1995, Jens-Uwe Mager, Helios Software GmbH
-Not derived from licensed software.
-
-Permission is granted to freely use, copy, modify, and redistribute
-this software, provided that no attempt is made to gain profit from it,
-the author is not construed to be liable for any results of using the
-software, alterations are clearly marked as such, and this notice is
-not modified.
-
 libdl.a
 -------
 
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index 587b24bc85dd..0ae2232823d7 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/dynloader/bsdi.c,v 1.29 2007/01/05 22:19:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/dynloader/bsdi.c,v 1.30 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h
index 4cb0a885a160..c01af92ed384 100644
--- a/src/backend/port/dynloader/bsdi.h
+++ b/src/backend/port/dynloader/bsdi.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/bsdi.h,v 1.24 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/bsdi.h,v 1.25 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h
index 34b6707c10d0..d23604b39237 100644
--- a/src/backend/port/dynloader/dgux.h
+++ b/src/backend/port/dynloader/dgux.h
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/dgux.h,v 1.21 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/dgux.h,v 1.22 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index f9b2b4f98f84..ada6aed7a3d2 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.c,v 1.26 2007/01/05 22:19:35 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.c,v 1.28 2008/01/01 19:45:51 momjian Exp $ */
 
 /*
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
@@ -13,11 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *	  notice, this list of conditions and the following disclaimer in the
  *	  documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *	  must display the following acknowledgement:
- *		This product includes software developed by the University of
- *		California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *	  may be used to endorse or promote products derived from this software
  *	  without specific prior written permission.
  *
@@ -61,7 +57,7 @@ BSD44_derived_dlerror(void)
 void *
 BSD44_derived_dlopen(const char *file, int num)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
 	snprintf(error_message, sizeof(error_message),
 			 "dlopen (%s) not supported", file);
 	return NULL;
@@ -78,7 +74,7 @@ BSD44_derived_dlopen(const char *file, int num)
 void *
 BSD44_derived_dlsym(void *handle, const char *name)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
 	snprintf(error_message, sizeof(error_message),
 			 "dlsym (%s) failed", name);
 	return NULL;
@@ -93,7 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 		snprintf(buf, sizeof(buf), "_%s", name);
 		name = buf;
 	}
-#endif
+#endif /* !__ELF__ */
 	if ((vp = dlsym(handle, (char *) name)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlsym (%s) failed", name);
@@ -104,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 void
 BSD44_derived_dlclose(void *handle)
 {
-#if defined(__mips__)
-#else
+#if defined(HAVE_DLOPEN)
 	dlclose(handle);
 #endif
 }
diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h
index 9d2efbf68048..93c02858e93b 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.h,v 1.22 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.h,v 1.23 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index c610989cefd4..23e6afe6c286 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/dynloader/hpux.c,v 1.30 2007/01/05 22:19:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/dynloader/hpux.c,v 1.31 2008/01/01 19:45:51 momjian Exp $
  *
  *	NOTES
  *		all functions are defined here -- it's impossible to trace the
diff --git a/src/backend/port/dynloader/hpux.h b/src/backend/port/dynloader/hpux.h
index df30cd99bb9b..0460a3054b67 100644
--- a/src/backend/port/dynloader/hpux.h
+++ b/src/backend/port/dynloader/hpux.h
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/dynloader/hpux.h,v 1.13 2007/01/05 22:19:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/dynloader/hpux.h,v 1.14 2008/01/01 19:45:51 momjian Exp $
  *
  *	NOTES
  *		all functions are defined here -- it's impossible to trace the
diff --git a/src/backend/port/dynloader/irix.h b/src/backend/port/dynloader/irix.h
index 13ad0ae287d3..60e0c6a4b11e 100644
--- a/src/backend/port/dynloader/irix.h
+++ b/src/backend/port/dynloader/irix.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/irix.h,v 1.5 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/irix.h,v 1.6 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
index 5936355117c2..001e4ee68960 100644
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -3,7 +3,7 @@
  * Portions Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.20 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.22.2.1 2008/03/05 21:20:47 alvherre Exp $
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -13,11 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *	  notice, this list of conditions and the following disclaimer in the
  *	  documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *	  must display the following acknowledgement:
- *		This product includes software developed by the University of
- *		California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *	  may be used to endorse or promote products derived from this software
  *	  without specific prior written permission.
  *
@@ -82,10 +78,10 @@ BSD44_derived_dlsym(void *handle, const char *name)
 	snprintf(error_message, sizeof(error_message),
 			 "dlsym (%s) failed", name);
 	return NULL;
-#elif defined(__ELF__)
-	return dlsym(handle, name);
 #else
 	void	   *vp;
+
+#ifndef __ELF__
 	char		buf[BUFSIZ];
 
 	if (*name != '_')
@@ -93,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 		snprintf(buf, sizeof(buf), "_%s", name);
 		name = buf;
 	}
+#endif /* !__ELF__ */
 	if ((vp = dlsym(handle, (char *) name)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlsym (%s) failed", name);
diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h
index bebd19c0f7fc..27b6dc60b705 100644
--- a/src/backend/port/dynloader/netbsd.h
+++ b/src/backend/port/dynloader/netbsd.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.h,v 1.16 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.h,v 1.17 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c
index d42ca08a32fb..e09199feb8a5 100644
--- a/src/backend/port/dynloader/openbsd.c
+++ b/src/backend/port/dynloader/openbsd.c
@@ -3,7 +3,7 @@
  * Portions Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.c,v 1.20 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.c,v 1.22 2008/01/01 19:45:51 momjian Exp $
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -13,11 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *	  notice, this list of conditions and the following disclaimer in the
  *	  documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *	  must display the following acknowledgement:
- *		This product includes software developed by the University of
- *		California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *	  may be used to endorse or promote products derived from this software
  *	  without specific prior written permission.
  *
@@ -61,7 +57,7 @@ BSD44_derived_dlerror(void)
 void *
 BSD44_derived_dlopen(const char *file, int num)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
 	snprintf(error_message, sizeof(error_message),
 			 "dlopen (%s) not supported", file);
 	return NULL;
@@ -78,14 +74,14 @@ BSD44_derived_dlopen(const char *file, int num)
 void *
 BSD44_derived_dlsym(void *handle, const char *name)
 {
-#if defined(__mips__)
+#if !defined(HAVE_DLOPEN)
 	snprintf(error_message, sizeof(error_message),
 			 "dlsym (%s) failed", name);
 	return NULL;
-#elif defined(__ELF__)
-	return dlsym(handle, name);
 #else
 	void	   *vp;
+
+#ifndef __ELF__
 	char		buf[BUFSIZ];
 
 	if (*name != '_')
@@ -93,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 		snprintf(buf, sizeof(buf), "_%s", name);
 		name = buf;
 	}
+#endif /* !__ELF__ */
 	if ((vp = dlsym(handle, (char *) name)) == NULL)
 		snprintf(error_message, sizeof(error_message),
 				 "dlsym (%s) failed", name);
@@ -103,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 void
 BSD44_derived_dlclose(void *handle)
 {
-#if defined(__mips__)
-#else
+#if defined(HAVE_DLOPEN)
 	dlclose(handle);
 #endif
 }
diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h
index e3af30c07de3..b8debf9a84a9 100644
--- a/src/backend/port/dynloader/openbsd.h
+++ b/src/backend/port/dynloader/openbsd.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.h,v 1.17 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.h,v 1.18 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h
index 2dfb7638a223..b8b93a2f2624 100644
--- a/src/backend/port/dynloader/osf.h
+++ b/src/backend/port/dynloader/osf.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/osf.h,v 1.15 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/osf.h,v 1.16 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h
index 14b82c956292..c9baafdbecef 100644
--- a/src/backend/port/dynloader/sco.h
+++ b/src/backend/port/dynloader/sco.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/sco.h,v 1.19 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/sco.h,v 1.20 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h
index e05881086d21..321d760655a9 100644
--- a/src/backend/port/dynloader/sunos4.h
+++ b/src/backend/port/dynloader/sunos4.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/sunos4.h,v 1.20 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/sunos4.h,v 1.21 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h
index 2f6296db0c2a..50c48a08fb1f 100644
--- a/src/backend/port/dynloader/svr4.h
+++ b/src/backend/port/dynloader/svr4.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/svr4.h,v 1.19 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/svr4.h,v 1.20 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index a8c4586e2669..a11a73db1339 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/dynloader/ultrix4.c,v 1.25 2007/01/05 22:19:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/dynloader/ultrix4.c,v 1.26 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h
index bc015f8566b9..89a095ee2d2f 100644
--- a/src/backend/port/dynloader/ultrix4.h
+++ b/src/backend/port/dynloader/ultrix4.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/dynloader/ultrix4.h,v 1.17 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/ultrix4.h,v 1.19 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,21 +16,6 @@
  *
  *	dl.h
  *		header file for the Dynamic Loader Library
- *
- *
- *	Copyright (c) 1993 Andrew K. Yu, University of California at Berkeley
- *	All rights reserved.
- *
- *	Permission to use, copy, modify, and distribute this software and its
- *	documentation for educational, research, and non-profit purposes and
- *	without fee is hereby granted, provided that the above copyright
- *	notice appear in all copies and that both that copyright notice and
- *	this permission notice appear in supporting documentation. Permission
- *	to incorporate this software into commercial products can be obtained
- *	from the author. The University of California and the author make
- *	no representations about the suitability of this software for any
- *	purpose. It is provided "as is" without express or implied warranty.
- *
  */
 #ifndef _DL_HEADER_
 #define _DL_HEADER_
diff --git a/src/backend/port/posix_sema.c b/src/backend/port/posix_sema.c
index ce1d31534b92..2f0b96744b46 100644
--- a/src/backend/port/posix_sema.c
+++ b/src/backend/port/posix_sema.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/posix_sema.c,v 1.18 2007/01/05 22:19:34 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/posix_sema.c,v 1.20 2008/01/26 19:55:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,37 +241,10 @@ PGSemaphoreLock(PGSemaphore sema, bool interruptOK)
 	int			errStatus;
 
 	/*
-	 * Note: if errStatus is -1 and errno == EINTR then it means we returned
-	 * from the operation prematurely because we were sent a signal.  So we
-	 * try and lock the semaphore again.
-	 *
-	 * Each time around the loop, we check for a cancel/die interrupt. We
-	 * assume that if such an interrupt comes in while we are waiting, it will
-	 * cause the sem_wait() call to exit with errno == EINTR, so that we will
-	 * be able to service the interrupt (if not in a critical section
-	 * already).
-	 *
-	 * Once we acquire the lock, we do NOT check for an interrupt before
-	 * returning.  The caller needs to be able to record ownership of the lock
-	 * before any interrupt can be accepted.
-	 *
-	 * There is a window of a few instructions between CHECK_FOR_INTERRUPTS
-	 * and entering the sem_wait() call.  If a cancel/die interrupt occurs in
-	 * that window, we would fail to notice it until after we acquire the lock
-	 * (or get another interrupt to escape the sem_wait()).  We can avoid this
-	 * problem by temporarily setting ImmediateInterruptOK to true before we
-	 * do CHECK_FOR_INTERRUPTS; then, a die() interrupt in this interval will
-	 * execute directly.  However, there is a huge pitfall: there is another
-	 * window of a few instructions after the sem_wait() before we are able to
-	 * reset ImmediateInterruptOK.	If an interrupt occurs then, we'll lose
-	 * control, which means that the lock has been acquired but our caller did
-	 * not get a chance to record the fact. Therefore, we only set
-	 * ImmediateInterruptOK if the caller tells us it's OK to do so, ie, the
-	 * caller does not need to record acquiring the lock.  (This is currently
-	 * true for lockmanager locks, since the process that granted us the lock
-	 * did all the necessary state updates. It's not true for Posix semaphores
-	 * used to implement LW locks or emulate spinlocks --- but the wait time
-	 * for such locks should not be very long, anyway.)
+	 * See notes in sysv_sema.c's implementation of PGSemaphoreLock.
+	 * Just as that code does for semop(), we handle both the case where
+	 * sem_wait() returns errno == EINTR after a signal, and the case
+	 * where it just keeps waiting.
 	 */
 	do
 	{
diff --git a/src/backend/port/sunos4/float.h b/src/backend/port/sunos4/float.h
index 9082435eafe5..9174052513eb 100644
--- a/src/backend/port/sunos4/float.h
+++ b/src/backend/port/sunos4/float.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/port/sunos4/float.h,v 1.16 2007/01/05 22:19:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/sunos4/float.h,v 1.17 2008/01/01 19:45:51 momjian Exp $
  *
  * NOTES
  *	  These come straight out of ANSI X3.159-1989 (p.18) and
diff --git a/src/backend/port/sysv_sema.c b/src/backend/port/sysv_sema.c
index 14dd7192361a..0d37886a0fa0 100644
--- a/src/backend/port/sysv_sema.c
+++ b/src/backend/port/sysv_sema.c
@@ -390,11 +390,11 @@ PGSemaphoreLock(PGSemaphore sema, bool interruptOK)
 	 * from the operation prematurely because we were sent a signal.  So we
 	 * try and lock the semaphore again.
 	 *
-	 * Each time around the loop, we check for a cancel/die interrupt.	On
-	 * some platforms, if such an interrupt comes in while we are waiting, it
-	 * will cause the semop() call to exit with errno == EINTR, allowing us to
-	 * service the interrupt (if not in a critical section already) during the
-	 * next loop iteration.
+	 * Each time around the loop, we check for a cancel/die interrupt.  On
+	 * some platforms, if such an interrupt comes in while we are waiting,
+	 * it will cause the semop() call to exit with errno == EINTR, allowing
+	 * us to service the interrupt (if not in a critical section already)
+	 * during the next loop iteration.
 	 *
 	 * Once we acquire the lock, we do NOT check for an interrupt before
 	 * returning.  The caller needs to be able to record ownership of the lock
@@ -420,8 +420,8 @@ PGSemaphoreLock(PGSemaphore sema, bool interruptOK)
 	 *
 	 * On some platforms, signals marked SA_RESTART (which is most, for us)
 	 * will not interrupt the semop(); it will just keep waiting.  Therefore
-	 * it's necessary for cancel/die interrupts to be serviced directly by the
-	 * signal handler.	On these platforms the behavior is really the same
+	 * it's necessary for cancel/die interrupts to be serviced directly by
+	 * the signal handler.  On these platforms the behavior is really the same
 	 * whether the signal arrives just before the semop() begins, or while it
 	 * is waiting.  The loop on EINTR is thus important only for other types
 	 * of interrupts.
diff --git a/src/backend/port/win32/mingwcompat.c b/src/backend/port/win32/mingwcompat.c
index 4088b2049234..e49e7618f891 100644
--- a/src/backend/port/win32/mingwcompat.c
+++ b/src/backend/port/win32/mingwcompat.c
@@ -14,21 +14,22 @@
 #include "postgres.h"
 
 #ifndef WIN32_ONLY_COMPILER
-/*
- * MingW defines an extern to this struct, but the actual struct isn't present
- * in any library. It's trivial enough that we can safely define it
- * ourselves.
- */
-const struct in6_addr in6addr_any = {{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}};
-
 
 /*
  * This file contains loaders for functions that are missing in the MinGW
  * import libraries. It's only for actual Win32 API functions, so they are
  * all present in proper Win32 compilers.
  */
+
 static HMODULE kernel32 = NULL;
 
+/*
+ * MingW defines an extern to this struct, but the actual struct isn't present
+ * in any library. It's trivial enough that we can safely define it
+ * ourselves.
+ */
+const struct in6_addr in6addr_any = {{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}};
+
 /*
  * Load DLL file just once regardless of how many functions
  * we load/call in it.
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
index 5b6042ef5af2..f259acdd5d76 100644
--- a/src/backend/port/win32/signal.c
+++ b/src/backend/port/win32/signal.c
@@ -275,6 +275,33 @@ pg_signal_thread(LPVOID param)
 		fConnected = ConnectNamedPipe(pipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
 		if (fConnected)
 		{
+			HANDLE newpipe;
+
+			/*
+			 * We have a connected pipe. Pass this off to a separate thread that will do the actual
+			 * processing of the pipe.
+			 *
+			 * We must also create a new instance of the pipe *before* we start running the new
+			 * thread. If we don't, there is a race condition whereby the dispatch thread might
+			 * run CloseHandle() before we have created a new instance, thereby causing a small
+			 * window of time where we will miss incoming requests.
+			 */
+			newpipe = CreateNamedPipe(pipename, PIPE_ACCESS_DUPLEX,
+									   PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+									   PIPE_UNLIMITED_INSTANCES, 16, 16, 1000, NULL);
+			if (newpipe == INVALID_HANDLE_VALUE)
+			{
+				/*
+				 * This really should never fail. Just retry in case it does, even though we have
+				 * a small race window in that case. There is nothing else we can do other than
+				 * abort the whole process which will be even worse.
+				 */
+				write_stderr("could not create signal listener pipe: error code %d; retrying\n", (int) GetLastError());
+				/*
+				 * Keep going so we at least dispatch this signal. Hopefully, the call will succeed
+				 * when retried in the loop soon after.
+				 */
+			}
 			hThread = CreateThread(NULL, 0,
 						  (LPTHREAD_START_ROUTINE) pg_signal_dispatch_thread,
 								   (LPVOID) pipe, 0, NULL);
@@ -283,13 +310,24 @@ pg_signal_thread(LPVOID param)
 							 (int) GetLastError());
 			else
 				CloseHandle(hThread);
+
+			/*
+			 * Background thread is running with our instance of the pipe. So replace our reference
+			 * with the newly created one and loop back up for another run.
+			 */
+			pipe = newpipe;
 		}
 		else
-			/* Connection failed. Cleanup and try again */
+		{
+			/*
+			 * Connection failed. Cleanup and try again.
+			 *
+			 * This should never happen. If it does, we have a small race condition until we loop
+			 * up and re-create the pipe.
+			 */
 			CloseHandle(pipe);
-
-		/* Set up so we create a new pipe on next loop */
-		pipe = INVALID_HANDLE_VALUE;
+			pipe = INVALID_HANDLE_VALUE;
+		}
 	}
 	return 0;
 }
diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c
index 99044a437fe7..eae8966ea9aa 100644
--- a/src/backend/port/win32/socket.c
+++ b/src/backend/port/win32/socket.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.17 2007/01/26 20:06:52 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.20 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,13 +105,13 @@ pgwin32_poll_signals(void)
 static int
 isDataGram(SOCKET s)
 {
-	int type;
-	int typelen = sizeof(type);
+	int			type;
+	int			typelen = sizeof(type);
 
-	if ( getsockopt(s, SOL_SOCKET, SO_TYPE, (char*)&type, &typelen) )
+	if (getsockopt(s, SOL_SOCKET, SO_TYPE, (char *) &type, &typelen))
 		return 1;
 
-	return ( type == SOCK_DGRAM ) ? 1 : 0;
+	return (type == SOCK_DGRAM) ? 1 : 0;
 }
 
 int
@@ -119,7 +119,7 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
 {
 	static HANDLE waitevent = INVALID_HANDLE_VALUE;
 	static SOCKET current_socket = -1;
-	static int    isUDP = 0;
+	static int	isUDP = 0;
 	HANDLE		events[2];
 	int			r;
 
@@ -140,9 +140,9 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
 	 * socket from a previous call
 	 */
 
-	if (current_socket != s) 
+	if (current_socket != s)
 	{
-		if ( current_socket != -1 )
+		if (current_socket != -1)
 			WSAEventSelect(current_socket, waitevent, 0);
 		isUDP = isDataGram(s);
 	}
@@ -158,7 +158,7 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
 	events[0] = pgwin32_signal_event;
 	events[1] = waitevent;
 
-	/* 
+	/*
 	 * Just a workaround of unknown locking problem with writing in UDP socket
 	 * under high load: Client's pgsql backend sleeps infinitely in
 	 * WaitForMultipleObjectsEx, pgstat process sleeps in pgwin32_select().
@@ -167,23 +167,23 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
 	 */
 	if ((what & FD_WRITE) && isUDP)
 	{
-		for(;;)
+		for (;;)
 		{
 			r = WaitForMultipleObjectsEx(2, events, FALSE, 100, TRUE);
 
-			if ( r == WAIT_TIMEOUT )
+			if (r == WAIT_TIMEOUT)
 			{
-				char        c;
-				WSABUF      buf;
-				DWORD       sent;
+				char		c;
+				WSABUF		buf;
+				DWORD		sent;
 
 				buf.buf = &c;
 				buf.len = 0;
 
 				r = WSASend(s, &buf, 1, &sent, 0, NULL, NULL);
-				if (r == 0)         /* Completed - means things are fine! */
+				if (r == 0)		/* Completed - means things are fine! */
 					return 1;
-				else if ( WSAGetLastError() != WSAEWOULDBLOCK )
+				else if (WSAGetLastError() != WSAEWOULDBLOCK)
 				{
 					TranslateSocketError();
 					return 0;
@@ -290,7 +290,7 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
 	int			r;
 	DWORD		b;
 	DWORD		flags = f;
-	int		n;
+	int			n;
 
 	if (pgwin32_poll_signals())
 		return -1;
@@ -316,8 +316,8 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
 	{
 		if (pgwin32_waitforsinglesocket(s, FD_READ | FD_CLOSE | FD_ACCEPT,
 										INFINITE) == 0)
-			return -1; /* errno already set */
-	
+			return -1;			/* errno already set */
+
 		r = WSARecv(s, &wbuf, 1, &b, &flags, NULL, NULL);
 		if (r == SOCKET_ERROR)
 		{
@@ -340,7 +340,7 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
 		return b;
 	}
 	ereport(NOTICE,
-		(errmsg_internal("Failed to read from ready socket (after retries)")));
+	  (errmsg_internal("Failed to read from ready socket (after retries)")));
 	errno = EWOULDBLOCK;
 	return -1;
 }
diff --git a/src/backend/port/win32_sema.c b/src/backend/port/win32_sema.c
index 2942ff138bbb..8a609d23f828 100644
--- a/src/backend/port/win32_sema.c
+++ b/src/backend/port/win32_sema.c
@@ -121,34 +121,38 @@ PGSemaphoreLock(PGSemaphore sema, bool interruptOK)
 	DWORD		ret;
 	HANDLE		wh[2];
 
-	wh[0] = *sema;
-	wh[1] = pgwin32_signal_event;
+	/*
+	 * Note: pgwin32_signal_event should be first to ensure that it will be
+	 * reported when multiple events are set.  We want to guarantee that
+	 * pending signals are serviced.
+	 */
+	wh[0] = pgwin32_signal_event;
+	wh[1] = *sema;
 
 	/*
-	 * As in other implementations of PGSemaphoreLock, we need to check for
-	 * cancel/die interrupts each time through the loop.  But here, there is
-	 * no hidden magic about whether the syscall will internally service a
-	 * signal --- we do that ourselves.
+	 * As in other implementations of PGSemaphoreLock, we need to check
+	 * for cancel/die interrupts each time through the loop.  But here,
+	 * there is no hidden magic about whether the syscall will internally
+	 * service a signal --- we do that ourselves.
 	 */
 	do
 	{
 		ImmediateInterruptOK = interruptOK;
 		CHECK_FOR_INTERRUPTS();
 
-		errno = 0;
 		ret = WaitForMultipleObjectsEx(2, wh, FALSE, INFINITE, TRUE);
 
 		if (ret == WAIT_OBJECT_0)
-		{
-			/* We got it! */
-			return;
-		}
-		else if (ret == WAIT_OBJECT_0 + 1)
 		{
 			/* Signal event is set - we have a signal to deliver */
 			pgwin32_dispatch_queued_signals();
 			errno = EINTR;
 		}
+		else if (ret == WAIT_OBJECT_0 + 1)
+		{
+			/* We got it! */
+			errno = 0;
+		}
 		else
 			/* Otherwise we are in trouble */
 			errno = EIDRM;
diff --git a/src/backend/port/win32_shmem.c b/src/backend/port/win32_shmem.c
index 618fa5717a27..86d036490762 100644
--- a/src/backend/port/win32_shmem.c
+++ b/src/backend/port/win32_shmem.c
@@ -58,11 +58,11 @@ GetSharedMemName(void)
 		elog(FATAL, "could not generate full pathname for datadir %s: %lu",
 			 DataDir, GetLastError());
 
-	/*
+	/* 
 	 * XXX: Intentionally overwriting the Global\ part here. This was not the
 	 * original approach, but putting it in the actual Global\ namespace
-	 * causes permission errors in a lot of cases, so we leave it in the
-	 * default namespace for now.
+	 * causes permission errors in a lot of cases, so we leave it in
+	 * the default namespace for now.
 	 */
 	for (cp = retptr; *cp; cp++)
 		if (*cp == '\\')
@@ -136,22 +136,19 @@ PGSharedMemoryCreate(Size size, bool makePrivate, int port)
 	/*
 	 * When recycling a shared memory segment, it may take a short while
 	 * before it gets dropped from the global namespace. So re-try after
-	 * sleeping for a second, and continue retrying 10 times. (both the 1
-	 * second time and the 10 retries are completely arbitrary)
+	 * sleeping for a second, and continue retrying 10 times.
+	 * (both the 1 second time and the 10 retries are completely arbitrary)
 	 */
 	for (i = 0; i < 10; i++)
 	{
-		/*
-		 * In case CreateFileMapping() doesn't set the error code to 0 on
-		 * success
-		 */
+		/* In case CreateFileMapping() doesn't set the error code to 0 on success */
 		SetLastError(0);
 
-		hmap = CreateFileMapping((HANDLE) 0xFFFFFFFF,	/* Use the pagefile */
-								 NULL,	/* Default security attrs */
-								 PAGE_READWRITE,		/* Memory is Read/Write */
+		hmap = CreateFileMapping((HANDLE) 0xFFFFFFFF,		/* Use the pagefile */
+								 NULL,		/* Default security attrs */
+								 PAGE_READWRITE,	/* Memory is Read/Write */
 								 0L,	/* Size Upper 32 Bits	*/
-								 (DWORD) size,	/* Size Lower 32 bits */
+								 (DWORD) size,		/* Size Lower 32 bits */
 								 szShareMem);
 
 		if (!hmap)
diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile
index b72cc63b3814..6e24c458217e 100644
--- a/src/backend/postmaster/Makefile
+++ b/src/backend/postmaster/Makefile
@@ -13,9 +13,9 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_srcdir)/src/backend/gp_libpq_fe $(CPPFLAGS)
 
-OBJS = bgwriter.o autovacuum.o checkpoint.o seqserver.o pgarch.o pgstat.o \
+OBJS = autovacuum.o bgwriter.o checkpoint.o fork_process.o seqserver.o pgarch.o pgstat.o \
 	postmaster.o primary_mirror_mode.o primary_mirror_transition_client.o syslogger.o \
-	fork_process.o perfmon.o backoff.o perfmon_segmentinfo.o \
-	sendalert.o alertseverity.o autostats.o
+	perfmon.o backoff.o perfmon_segmentinfo.o \
+	sendalert.o alertseverity.o autostats.o walwriter.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/postmaster/autostats.c b/src/backend/postmaster/autostats.c
index 4973feb85021..23b455ef62f7 100644
--- a/src/backend/postmaster/autostats.c
+++ b/src/backend/postmaster/autostats.c
@@ -71,7 +71,7 @@ autostats_issue_analyze(Oid relationOid)
 	analyzeStmt->rootonly = false;
 	analyzeStmt->relation = relation;	/* not used since we pass relids list */
 	analyzeStmt->va_cols = NIL;
-	vacuum(analyzeStmt, NIL);
+	vacuum(analyzeStmt, NIL, NULL, false, false);
 	pfree(analyzeStmt);
 }
 
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 5a9b31732f8c..3a72d820ce5e 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -4,13 +4,58 @@
  *
  * PostgreSQL Integrated Autovacuum Daemon
  *
+ * The autovacuum system is structured in two different kinds of processes: the
+ * autovacuum launcher and the autovacuum worker.  The launcher is an
+ * always-running process, started by the postmaster when the autovacuum GUC
+ * parameter is set.  The launcher schedules autovacuum workers to be started
+ * when appropriate.  The workers are the processes which execute the actual
+ * vacuuming; they connect to a database as determined in the launcher, and
+ * once connected they examine the catalogs to select the tables to vacuum.
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * The autovacuum launcher cannot start the worker processes by itself,
+ * because doing so would cause robustness issues (namely, failure to shut
+ * them down on exceptional conditions, and also, since the launcher is
+ * connected to shared memory and is thus subject to corruption there, it is
+ * not as robust as the postmaster).  So it leaves that task to the postmaster.
+ *
+ * There is an autovacuum shared memory area, where the launcher stores
+ * information about the database it wants vacuumed.  When it wants a new
+ * worker to start, it sets a flag in shared memory and sends a signal to the
+ * postmaster.	Then postmaster knows nothing more than it must start a worker;
+ * so it forks a new child, which turns into a worker.	This new process
+ * connects to shared memory, and there it can inspect the information that the
+ * launcher has set up.
+ *
+ * If the fork() call fails in the postmaster, it sets a flag in the shared
+ * memory area, and sends a signal to the launcher.  The launcher, upon
+ * noticing the flag, can try starting the worker again by resending the
+ * signal.	Note that the failure can only be transient (fork failure due to
+ * high load, memory pressure, too many processes, etc); more permanent
+ * problems, like failure to connect to a database, are detected later in the
+ * worker and dealt with just by having the worker exit normally.  The launcher
+ * will launch a new worker again later, per schedule.
+ *
+ * When the worker is done vacuuming it sends SIGUSR1 to the launcher.	The
+ * launcher then wakes up and is able to launch another worker, if the schedule
+ * is so tight that a new worker is needed immediately.  At this time the
+ * launcher can also balance the settings for the various remaining workers'
+ * cost-based vacuum delay feature.
+ *
+ * Note that there can be more than one worker in a database concurrently.
+ * They will store the table they are currently vacuuming in shared memory, so
+ * that other workers avoid being blocked waiting for the vacuum lock for that
+ * table.  They will also reload the pgstats data just before vacuuming each
+ * table, to avoid vacuuming a table that was just finished being vacuumed by
+ * another worker and thus is no longer noted in shared memory.  However,
+ * there is a window (caused by pgstat delay) on which a worker may choose a
+ * table that was already vacuumed; this is a bug in the current design.
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	    $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.43 2007/05/02 15:47:14 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.71.2.10 2009/08/24 17:23:28 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +75,7 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_autovacuum.h"
 #include "catalog/pg_database.h"
+#include "commands/dbcommands.h"
 #include "commands/vacuum.h"
 #include "libpq/hba.h"
 #include "libpq/pqsignal.h"
@@ -55,10 +101,6 @@
 #include "cdb/cdbvars.h"
 
 
-static volatile sig_atomic_t got_SIGUSR1 = false;
-static volatile sig_atomic_t got_SIGHUP = false;
-static volatile sig_atomic_t avlauncher_shutdown_request = false;
-
 /*
  * GUC parameters
  */
@@ -76,22 +118,26 @@ int			autovacuum_vac_cost_limit;
 
 int			Log_autovacuum_min_duration = -1;
 
-/* Flags to tell if we are in an autovacuum process */
-static bool am_autovacuum_launcher = false;
-static bool am_autovacuum_worker = false;
-
 /* how long to keep pgstat data in the launcher, in milliseconds */
 #define STATS_READ_DELAY 1000
 
 /* the minimum allowed time between two awakenings of the launcher */
-#define MIN_AUTOVAC_SLEEPTIME 100.0		/* milliseconds */
+#define MIN_AUTOVAC_SLEEPTIME 100.0 /* milliseconds */
+
+/* Flags to tell if we are in an autovacuum process */
+static bool am_autovacuum_launcher = false;
+static bool am_autovacuum_worker = false;
+
+/* Flags set by signal handlers */
+static volatile sig_atomic_t got_SIGHUP = false;
+static volatile sig_atomic_t got_SIGUSR1 = false;
+static volatile sig_atomic_t got_SIGTERM = false;
 
 /* Comparison point for determining whether freeze_max_age is exceeded */
 static TransactionId recentXid;
 
-/* Default freeze ages to use for autovacuum (varies by database) */
+/* Default freeze_min_age to use for autovacuum (varies by database) */
 static int	default_freeze_min_age;
-//static int	default_freeze_table_age;
 
 /* Memory context for long-lived data */
 static MemoryContext AutovacMemCxt;
@@ -99,8 +145,8 @@ static MemoryContext AutovacMemCxt;
 /* struct to keep track of databases in launcher */
 typedef struct avl_dbase
 {
-	Oid			adl_datid;			/* hash key -- must be first */
-	TimestampTz	adl_next_worker;
+	Oid			adl_datid;		/* hash key -- must be first */
+	TimestampTz adl_next_worker;
 	int			adl_score;
 } avl_dbase;
 
@@ -116,8 +162,8 @@ typedef struct avw_dbase
 /* struct to keep track of tables to vacuum and/or analyze, in 1st pass */
 typedef struct av_relation
 {
-	Oid		ar_relid;
-	Oid		ar_toastrelid;
+	Oid			ar_relid;
+	Oid			ar_toastrelid;
 } av_relation;
 
 /* struct to keep track of tables to vacuum and/or analyze, after rechecking */
@@ -130,6 +176,7 @@ typedef struct autovac_table
 	int			at_freeze_min_age;
 	int			at_vacuum_cost_delay;
 	int			at_vacuum_cost_limit;
+	bool		at_wraparound;
 } autovac_table;
 
 /*-------------
@@ -139,7 +186,7 @@ typedef struct autovac_table
  *
  * wi_links		entry into free list or running list
  * wi_dboid		OID of the database this worker is supposed to work on
- * wi_tableoid	OID of the table currently being vacuumed
+ * wi_tableoid	OID of the table currently being vacuumed, if any
  * wi_proc		pointer to PGPROC of the running worker, NULL if not started
  * wi_launchtime Time at which this worker was launched
  * wi_cost_*	Vacuum cost-based delay parameters current in this worker
@@ -194,14 +241,14 @@ typedef struct
 {
 	sig_atomic_t av_signal[AutoVacNumSignals];
 	pid_t		av_launcherpid;
-	WorkerInfo	av_freeWorkers;
+	SHMEM_OFFSET av_freeWorkers;
 	SHM_QUEUE	av_runningWorkers;
-	WorkerInfo	av_startingWorker;
+	SHMEM_OFFSET av_startingWorker;
 } AutoVacuumShmemStruct;
 
 static AutoVacuumShmemStruct *AutoVacuumShmem;
 
-/* The database list in the launcher, and the context that contains it */
+/* the database list in the launcher, and the context that contains it */
 static Dllist *DatabaseList = NULL;
 static MemoryContext DatabaseListCxt = NULL;
 
@@ -212,50 +259,53 @@ static WorkerInfo MyWorkerInfo = NULL;
 int			AutovacuumLauncherPid = 0;
 
 #ifdef EXEC_BACKEND
-static pid_t autovac_forkexec(void);  // old
-static pid_t avlauncher_forkexec(void); // new
-static pid_t avworker_forkexec(void);  // new
+static pid_t avlauncher_forkexec(void);
+static pid_t avworker_forkexec(void);
 #endif
 NON_EXEC_STATIC void AutoVacWorkerMain(int argc, char *argv[]);
 NON_EXEC_STATIC void AutoVacLauncherMain(int argc, char *argv[]);
 
-static Oid do_start_worker(void);
-static uint64 launcher_determine_sleep(bool canlaunch, bool recursing);
+static Oid	do_start_worker(void);
+static void launcher_determine_sleep(bool canlaunch, bool recursing,
+						 struct timeval * nap);
 static void launch_worker(TimestampTz now);
 static List *get_database_list(void);
 static void rebuild_database_list(Oid newdb);
-static int db_comparator(const void *a, const void *b);
+static int	db_comparator(const void *a, const void *b);
 static void autovac_balance_cost(void);
 
 static void do_autovacuum(void);
 static void FreeWorkerInfo(int code, Datum arg);
 
 static void relation_check_autovac(Oid relid, Form_pg_class classForm,
-					   Form_pg_autovacuum avForm, PgStat_StatTabEntry *tabentry,
+					Form_pg_autovacuum avForm, PgStat_StatTabEntry *tabentry,
 					   List **table_oids, List **table_toast_list,
 					   List **toast_oids);
 static autovac_table *table_recheck_autovac(Oid relid);
 static void relation_needs_vacanalyze(Oid relid, Form_pg_autovacuum avForm,
 						  Form_pg_class classForm,
 						  PgStat_StatTabEntry *tabentry, bool *dovacuum,
-						  bool *doanalyze);
+						  bool *doanalyze, bool *wraparound);
 
 static void autovacuum_do_vac_analyze(Oid relid, bool dovacuum,
-						  bool doanalyze, int freeze_min_age);
+						  bool doanalyze, int freeze_min_age,
+						  bool for_wraparound,
+						  BufferAccessStrategy bstrategy);
 static HeapTuple get_pg_autovacuum_tuple_relid(Relation avRel, Oid relid);
 static PgStat_StatTabEntry *get_pgstat_tabentry_relid(Oid relid, bool isshared,
 						  PgStat_StatDBEntry *shared,
 						  PgStat_StatDBEntry *dbentry);
-static void autovac_report_activity(VacuumStmt *vacstmt, Oid relid);
+static void autovac_report_activity(VacuumStmt *vacstmt, Oid relid, bool for_wraparound);
 static void avl_sighup_handler(SIGNAL_ARGS);
 static void avl_sigusr1_handler(SIGNAL_ARGS);
-static void avlauncher_shutdown(SIGNAL_ARGS);
+static void avl_sigterm_handler(SIGNAL_ARGS);
 static void avl_quickdie(SIGNAL_ARGS);
+static void autovac_refresh_stats(void);
 
 
 
 /********************************************************************
- *                    AUTOVACUUM LAUNCHER CODE
+ *					  AUTOVACUUM LAUNCHER CODE
  ********************************************************************/
 
 #ifdef EXEC_BACKEND
@@ -307,7 +357,7 @@ StartAutoVacLauncher(void)
 	{
 		case -1:
 			ereport(LOG,
-					(errmsg("could not fork autovacuum process: %m")));
+					(errmsg("could not fork autovacuum launcher process: %m")));
 			return 0;
 
 #ifndef EXEC_BACKEND
@@ -332,29 +382,6 @@ StartAutoVacLauncher(void)
 
 /*
  * Main loop for the autovacuum launcher process.
- *
- * The signalling between launcher and worker is as follows:
- *
- * When the worker has finished starting up, it stores its PID in wi_workerpid
- * and sends a SIGUSR1 signal to the launcher.  The launcher then knows that
- * the postmaster is ready to start a new worker.  We do it this way because
- * otherwise we risk calling SendPostmasterSignal() when the postmaster hasn't
- * yet processed the last one, in which case the second signal would be lost.
- * This is only useful when two workers need to be started close to one
- * another, which should be rare but it's possible.
- *
- * When a worker exits, it resets the WorkerInfo struct and puts it back into
- * the free list.  If there is no free worker slot, it will also signal the
- * launcher, which then wakes up and can launch a new worker if it needs to.
- * Note that we only need to do it when there's no free worker slot, because
- * otherwise there is no need -- the launcher would be awakened normally per
- * schedule.
- *
- * There is a potential problem if, for some reason, a worker starts and is not
- * able to bootstrap itself correctly.  To prevent this situation from starving
- * the whole system, the launcher checks the launch time of the "starting
- * worker".  If it's too old (older than autovacuum_naptime seconds), it resets
- * the worker entry and puts it back into the free list.
  */
 NON_EXEC_STATIC void
 AutoVacLauncherMain(int argc, char *argv[])
@@ -368,16 +395,22 @@ AutoVacLauncherMain(int argc, char *argv[])
 	/* reset MyProcPid */
 	MyProcPid = getpid();
 
+	/* record Start Time for logging */
+	MyStartTime = time(NULL);
+
 	/* Identify myself via ps */
 	init_ps_display("autovacuum launcher process", "", "", "");
 
+	if (PostAuthDelay)
+		pg_usleep(PostAuthDelay * 1000000L);
+
 	SetProcessingMode(InitProcessing);
 
 	/*
 	 * If possible, make this process a group leader, so that the postmaster
-	 * can signal any child processes too.  (autovacuum probably never has
-	 * any child processes, but for consistency we make all postmaster
-	 * child processes do this.)
+	 * can signal any child processes too.	(autovacuum probably never has any
+	 * child processes, but for consistency we make all postmaster child
+	 * processes do this.)
 	 */
 #ifdef HAVE_SETSID
 	if (setsid() < 0)
@@ -385,14 +418,14 @@ AutoVacLauncherMain(int argc, char *argv[])
 #endif
 
 	/*
-	 * Set up signal handlers.	Since this is a "dummy" process, it has
+	 * Set up signal handlers.	Since this is an auxiliary process, it has
 	 * particular signal requirements -- no deadlock checker or sinval
 	 * catchup, for example.
 	 */
 	pqsignal(SIGHUP, avl_sighup_handler);
 
 	pqsignal(SIGINT, SIG_IGN);
-	pqsignal(SIGTERM, avlauncher_shutdown);
+	pqsignal(SIGTERM, avl_sigterm_handler);
 	pqsignal(SIGQUIT, avl_quickdie);
 	pqsignal(SIGALRM, SIG_IGN);
 
@@ -447,11 +480,12 @@ AutoVacLauncherMain(int argc, char *argv[])
 
 		/*
 		 * These operations are really just a minimal subset of
-		 * AbortTransaction().  We don't have very many resources to worry
+		 * AbortTransaction().	We don't have very many resources to worry
 		 * about, but we do have LWLocks.
 		 */
 		LWLockReleaseAll();
 		AtEOXact_Files();
+		AtEOXact_HashTables(false);
 
 		/*
 		 * Now return to normal top-level context and clear ErrorContext for
@@ -467,7 +501,10 @@ AutoVacLauncherMain(int argc, char *argv[])
 		DatabaseListCxt = NULL;
 		DatabaseList = NULL;
 
-		/* Make sure pgstat also considers our stat data as gone */
+		/*
+		 * Make sure pgstat also considers our stat data as gone.  Note: we
+		 * mustn't use autovac_refresh_stats here.
+		 */
 		pgstat_clear_snapshot();
 
 		/* Now we can allow interrupts again */
@@ -490,10 +527,10 @@ AutoVacLauncherMain(int argc, char *argv[])
 	PG_SETMASK(&UnBlockSig);
 
 	/* in emergency mode, just start a worker and go away */
-	if (!autovacuum_start_daemon)
+	if (!AutoVacuumingActive())
 	{
 		do_start_worker();
-		proc_exit(0);		/* done */
+		proc_exit(0);			/* done */
 	}
 
 	AutoVacuumShmem->av_launcherpid = MyProcPid;
@@ -509,9 +546,10 @@ AutoVacLauncherMain(int argc, char *argv[])
 
 	for (;;)
 	{
-		uint64		micros;
-		bool	can_launch;
+		struct timeval nap;
 		TimestampTz current_time = 0;
+		bool		can_launch;
+		Dlelem	   *elem;
 
 		/*
 		 * Emergency bailout if postmaster has died.  This is to avoid the
@@ -520,13 +558,46 @@ AutoVacLauncherMain(int argc, char *argv[])
 		if (!PostmasterIsAlive(true))
 			exit(1);
 
-		micros = launcher_determine_sleep((AutoVacuumShmem->av_freeWorkers != NULL), false);
+		launcher_determine_sleep(AutoVacuumShmem->av_freeWorkers !=
+								 INVALID_OFFSET, false, &nap);
+
+		/*
+		 * Sleep for a while according to schedule.
+		 *
+		 * On some platforms, signals won't interrupt the sleep.  To ensure we
+		 * respond reasonably promptly when someone signals us, break down the
+		 * sleep into 1-second increments, and check for interrupts after each
+		 * nap.
+		 */
+		while (nap.tv_sec > 0 || nap.tv_usec > 0)
+		{
+			uint32		sleeptime;
+
+			if (nap.tv_sec > 0)
+			{
+				sleeptime = 1000000;
+				nap.tv_sec--;
+			}
+			else
+			{
+				sleeptime = nap.tv_usec;
+				nap.tv_usec = 0;
+			}
+			pg_usleep(sleeptime);
+
+			/*
+			 * Emergency bailout if postmaster has died.  This is to avoid the
+			 * necessity for manual cleanup of all postmaster children.
+			 */
+			if (!PostmasterIsAlive(true))
+				exit(1);
 
-		/* Sleep for a while according to schedule */
-		pg_usleep(micros);
+			if (got_SIGTERM || got_SIGHUP || got_SIGUSR1)
+				break;
+		}
 
 		/* the normal shutdown case */
-		if (avlauncher_shutdown_request)
+		if (got_SIGTERM)
 			break;
 
 		if (got_SIGHUP)
@@ -534,6 +605,10 @@ AutoVacLauncherMain(int argc, char *argv[])
 			got_SIGHUP = false;
 			ProcessConfigFile(PGC_SIGHUP);
 
+			/* shutdown requested in config file */
+			if (!AutoVacuumingActive())
+				break;
+
 			/* rebalance in case the default cost parameters changed */
 			LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
 			autovac_balance_cost();
@@ -543,7 +618,10 @@ AutoVacLauncherMain(int argc, char *argv[])
 			rebuild_database_list(InvalidOid);
 		}
 
-		/* a worker started up or finished */
+		/*
+		 * a worker finished, or postmaster signalled failure to start a
+		 * worker
+		 */
 		if (got_SIGUSR1)
 		{
 			got_SIGUSR1 = false;
@@ -556,111 +634,120 @@ AutoVacLauncherMain(int argc, char *argv[])
 				autovac_balance_cost();
 				LWLockRelease(AutovacuumLock);
 			}
+
+			if (AutoVacuumShmem->av_signal[AutoVacForkFailed])
+			{
+				/*
+				 * If the postmaster failed to start a new worker, we sleep
+				 * for a little while and resend the signal.  The new worker's
+				 * state is still in memory, so this is sufficient.  After
+				 * that, we restart the main loop.
+				 *
+				 * XXX should we put a limit to the number of times we retry?
+				 * I don't think it makes much sense, because a future start
+				 * of a worker will continue to fail in the same way.
+				 */
+				AutoVacuumShmem->av_signal[AutoVacForkFailed] = false;
+				pg_usleep(1000000L);		/* 1s */
+				SendPostmasterSignal(PMSIGNAL_START_AUTOVAC_WORKER);
+				continue;
+			}
 		}
 
 		/*
 		 * There are some conditions that we need to check before trying to
 		 * start a launcher.  First, we need to make sure that there is a
-		 * launcher slot available.  Second, we need to make sure that no other
-		 * worker is still starting up.
+		 * launcher slot available.  Second, we need to make sure that no
+		 * other worker failed while starting up.
 		 */
 
+		current_time = GetCurrentTimestamp();
 		LWLockAcquire(AutovacuumLock, LW_SHARED);
 
-		can_launch = (AutoVacuumShmem->av_freeWorkers != NULL);
+		can_launch = (AutoVacuumShmem->av_freeWorkers != INVALID_OFFSET);
 
-		if (can_launch && AutoVacuumShmem->av_startingWorker != NULL)
+		if (AutoVacuumShmem->av_startingWorker != INVALID_OFFSET)
 		{
-			long	secs;
-			int		usecs;
-			WorkerInfo worker = (WorkerInfo) MAKE_PTR(AutoVacuumShmem->av_startingWorker);
+			int			waittime;
 
-			if (current_time == 0)
-				current_time = GetCurrentTimestamp();
+			WorkerInfo	worker = (WorkerInfo) MAKE_PTR(AutoVacuumShmem->av_startingWorker);
 
 			/*
 			 * We can't launch another worker when another one is still
-			 * starting up, so just sleep for a bit more; that worker will wake
-			 * us up again as soon as it's ready.  We will only wait
-			 * autovacuum_naptime seconds for this to happen however.  Note
-			 * that failure to connect to a particular database is not a
-			 * problem here, because the worker removes itself from the
-			 * startingWorker pointer before trying to connect; only low-level
-			 * problems, like fork() failure, can get us here.
+			 * starting up (or failed while doing so), so just sleep for a bit
+			 * more; that worker will wake us up again as soon as it's ready.
+			 * We will only wait autovacuum_naptime seconds (up to a maximum
+			 * of 60 seconds) for this to happen however.  Note that failure
+			 * to connect to a particular database is not a problem here,
+			 * because the worker removes itself from the startingWorker
+			 * pointer before trying to connect.  Problems detected by the
+			 * postmaster (like fork() failure) are also reported and handled
+			 * differently.  The only problems that may cause this code to
+			 * fire are errors in the earlier sections of AutoVacWorkerMain,
+			 * before the worker removes the WorkerInfo from the
+			 * startingWorker pointer.
 			 */
-			TimestampDifference(worker->wi_launchtime, current_time,
-								&secs, &usecs);
-
-			/* ignore microseconds, as they cannot make any difference */
-			if (secs > autovacuum_naptime)
+			waittime = Min(autovacuum_naptime, 60) * 1000;
+			if (TimestampDifferenceExceeds(worker->wi_launchtime, current_time,
+										   waittime))
 			{
 				LWLockRelease(AutovacuumLock);
 				LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
+
 				/*
 				 * No other process can put a worker in starting mode, so if
 				 * startingWorker is still INVALID after exchanging our lock,
 				 * we assume it's the same one we saw above (so we don't
 				 * recheck the launch time).
 				 */
-				if (AutoVacuumShmem->av_startingWorker != NULL)
+				if (AutoVacuumShmem->av_startingWorker != INVALID_OFFSET)
 				{
 					worker = (WorkerInfo) MAKE_PTR(AutoVacuumShmem->av_startingWorker);
 					worker->wi_dboid = InvalidOid;
 					worker->wi_tableoid = InvalidOid;
-					worker->wi_proc = 0;
+					worker->wi_proc = NULL;
 					worker->wi_launchtime = 0;
-					worker->wi_links.next = (SHMEM_OFFSET) AutoVacuumShmem->av_freeWorkers;
-					AutoVacuumShmem->av_freeWorkers = worker;
-					AutoVacuumShmem->av_startingWorker = NULL;
+					worker->wi_links.next = AutoVacuumShmem->av_freeWorkers;
+					AutoVacuumShmem->av_freeWorkers = MAKE_OFFSET(worker);
+					AutoVacuumShmem->av_startingWorker = INVALID_OFFSET;
+					elog(WARNING, "worker took too long to start; cancelled");
 				}
 			}
 			else
-			{
-				/*
-				 * maybe the postmaster neglected this start signal --
-				 * resend it.  Note: the constraints in
-				 * launcher_determine_sleep keep us from delivering signals too
-				 * quickly (at most once every 100ms).
-				 */
-				SendPostmasterSignal(PMSIGNAL_START_AUTOVAC_WORKER);
 				can_launch = false;
-			}
 		}
-		LWLockRelease(AutovacuumLock);		/* either shared or exclusive */
+		LWLockRelease(AutovacuumLock);	/* either shared or exclusive */
 
-		if (can_launch)
-		{
-			Dlelem	   *elem;
-
-			elem = DLGetTail(DatabaseList);
-
-			if (current_time == 0)
-				current_time = GetCurrentTimestamp();
+		/* if we can't do anything, just go back to sleep */
+		if (!can_launch)
+			continue;
 
-			if (elem != NULL)
-			{
-				avl_dbase *avdb = DLE_VAL(elem);
-				long	secs;
-				int		usecs;
+		/* We're OK to start a new worker */
 
-				TimestampDifference(current_time, avdb->adl_next_worker, &secs, &usecs);
+		elem = DLGetTail(DatabaseList);
+		if (elem != NULL)
+		{
+			avl_dbase  *avdb = DLE_VAL(elem);
 
-				/* do we have to start a worker? */
-				if (secs <= 0 && usecs <= 0)
-					launch_worker(current_time);
-			}
-			else
-			{
-				/*
-				 * Special case when the list is empty: start a worker right
-				 * away.  This covers the initial case, when no database is in
-				 * pgstats (thus the list is empty).  Note that the constraints
-				 * in launcher_determine_sleep keep us from starting workers
-				 * too quickly (at most once every autovacuum_naptime when the
-				 * list is empty).
-				 */
+			/*
+			 * launch a worker if next_worker is right now or it is in the
+			 * past
+			 */
+			if (TimestampDifferenceExceeds(avdb->adl_next_worker,
+										   current_time, 0))
 				launch_worker(current_time);
-			}
+		}
+		else
+		{
+			/*
+			 * Special case when the list is empty: start a worker right away.
+			 * This covers the initial case, when no database is in pgstats
+			 * (thus the list is empty).  Note that the constraints in
+			 * launcher_determine_sleep keep us from starting workers too
+			 * quickly (at most once every autovacuum_naptime when the list is
+			 * empty).
+			 */
+			launch_worker(current_time);
 		}
 	}
 
@@ -669,47 +756,51 @@ AutoVacLauncherMain(int argc, char *argv[])
 			(errmsg("autovacuum launcher shutting down")));
 	AutoVacuumShmem->av_launcherpid = 0;
 
-	proc_exit(0);		/* done */
+	proc_exit(0);				/* done */
 }
 
 /*
- * Determine the time to sleep, in microseconds, based on the database list.
+ * Determine the time to sleep, based on the database list.
  *
  * The "canlaunch" parameter indicates whether we can start a worker right now,
- * for example due to the workers being all busy.
+ * for example due to the workers being all busy.  If this is false, we will
+ * cause a long sleep, which will be interrupted when a worker exits.
  */
-static uint64
-launcher_determine_sleep(bool canlaunch, bool recursing)
+static void
+launcher_determine_sleep(bool canlaunch, bool recursing, struct timeval * nap)
 {
-	long	secs;
-	int		usecs;
-	Dlelem *elem;
+	Dlelem	   *elem;
 
 	/*
 	 * We sleep until the next scheduled vacuum.  We trust that when the
-	 * database list was built, care was taken so that no entries have times in
-	 * the past; if the first entry has too close a next_worker value, or a
+	 * database list was built, care was taken so that no entries have times
+	 * in the past; if the first entry has too close a next_worker value, or a
 	 * time in the past, we will sleep a small nominal time.
 	 */
 	if (!canlaunch)
 	{
-		secs = autovacuum_naptime;
-		usecs = 0;
+		nap->tv_sec = autovacuum_naptime;
+		nap->tv_usec = 0;
 	}
 	else if ((elem = DLGetTail(DatabaseList)) != NULL)
 	{
 		avl_dbase  *avdb = DLE_VAL(elem);
-		TimestampTz	current_time = GetCurrentTimestamp();
-		TimestampTz	next_wakeup;
+		TimestampTz current_time = GetCurrentTimestamp();
+		TimestampTz next_wakeup;
+		long		secs;
+		int			usecs;
 
 		next_wakeup = avdb->adl_next_worker;
 		TimestampDifference(current_time, next_wakeup, &secs, &usecs);
+
+		nap->tv_sec = secs;
+		nap->tv_usec = usecs;
 	}
 	else
 	{
 		/* list is empty, sleep for whole autovacuum_naptime seconds  */
-		secs = autovacuum_naptime;
-		usecs = 0;
+		nap->tv_sec = autovacuum_naptime;
+		nap->tv_usec = 0;
 	}
 
 	/*
@@ -722,20 +813,19 @@ launcher_determine_sleep(bool canlaunch, bool recursing)
 	 * We only recurse once.  rebuild_database_list should always return times
 	 * in the future, but it seems best not to trust too much on that.
 	 */
-	if (secs == 0L && usecs == 0 && !recursing)
+	if (nap->tv_sec == 0 && nap->tv_usec == 0 && !recursing)
 	{
 		rebuild_database_list(InvalidOid);
-		return launcher_determine_sleep(canlaunch, true);
+		launcher_determine_sleep(canlaunch, true, nap);
+		return;
 	}
 
-	/* 100ms is the smallest time we'll allow the launcher to sleep */
-	if (secs <= 0L && usecs <= 100000)
+	/* The smallest time we'll allow the launcher to sleep. */
+	if (nap->tv_sec <= 0 && nap->tv_usec <= MIN_AUTOVAC_SLEEPTIME * 1000)
 	{
-		secs = 0L;
-		usecs = 100000;	/* 100 ms */
+		nap->tv_sec = 0;
+		nap->tv_usec = MIN_AUTOVAC_SLEEPTIME * 1000;
 	}
-
-	return secs * 1000000 + usecs;
 }
 
 /*
@@ -747,7 +837,7 @@ launcher_determine_sleep(bool canlaunch, bool recursing)
  * this the "new" database, because when the database was already present on
  * the list, we expect that this function is not called at all).  The
  * preexisting list, if any, will be used to preserve the order of the
- * databases in the autovacuum_naptime period.  The new database is put at the
+ * databases in the autovacuum_naptime period.	The new database is put at the
  * end of the interval.  The actual values are not saved, which should not be
  * much of a problem.
  */
@@ -765,7 +855,7 @@ rebuild_database_list(Oid newdb)
 	HTAB	   *dbhash;
 
 	/* use fresh stats */
-	pgstat_clear_snapshot();
+	autovac_refresh_stats();
 
 	newcxt = AllocSetContextCreate(AutovacMemCxt,
 								   "AV dblist",
@@ -782,14 +872,14 @@ rebuild_database_list(Oid newdb)
 	/*
 	 * Implementing this is not as simple as it sounds, because we need to put
 	 * the new database at the end of the list; next the databases that were
-	 * already on the list, and finally (at the tail of the list) all the other
-	 * databases that are not on the existing list.
+	 * already on the list, and finally (at the tail of the list) all the
+	 * other databases that are not on the existing list.
 	 *
 	 * To do this, we build an empty hash table of scored databases.  We will
-	 * start with the lowest score (zero) for the new database, then increasing
-	 * scores for the databases in the existing list, in order, and lastly
-	 * increasing scores for all databases gotten via get_database_list() that
-	 * are not already on the hash.
+	 * start with the lowest score (zero) for the new database, then
+	 * increasing scores for the databases in the existing list, in order, and
+	 * lastly increasing scores for all databases gotten via
+	 * get_database_list() that are not already on the hash.
 	 *
 	 * Then we will put all the hash elements into an array, sort the array by
 	 * score, and finally put the array elements into the new doubly linked
@@ -806,7 +896,7 @@ rebuild_database_list(Oid newdb)
 	score = 0;
 	if (OidIsValid(newdb))
 	{
-		avl_dbase	*db;
+		avl_dbase  *db;
 		PgStat_StatDBEntry *entry;
 
 		/* only consider this database if it has a pgstat entry */
@@ -825,7 +915,7 @@ rebuild_database_list(Oid newdb)
 	/* Now insert the databases from the existing list */
 	if (DatabaseList != NULL)
 	{
-		Dlelem	*elem;
+		Dlelem	   *elem;
 
 		elem = DLGetHead(DatabaseList);
 		while (elem != NULL)
@@ -838,8 +928,8 @@ rebuild_database_list(Oid newdb)
 			elem = DLGetSucc(elem);
 
 			/*
-			 * skip databases with no stat entries -- in particular, this
-			 * gets rid of dropped databases
+			 * skip databases with no stat entries -- in particular, this gets
+			 * rid of dropped databases
 			 */
 			entry = pgstat_fetch_stat_dbentry(avdb->adl_datid);
 			if (entry == NULL)
@@ -887,12 +977,12 @@ rebuild_database_list(Oid newdb)
 
 	if (nelems > 0)
 	{
-		TimestampTz		current_time;
-		int				millis_increment;
-		avl_dbase	   *dbary;
-		avl_dbase	   *db;
-		HASH_SEQ_STATUS	seq;
-		int				i;
+		TimestampTz current_time;
+		int			millis_increment;
+		avl_dbase  *dbary;
+		avl_dbase  *db;
+		HASH_SEQ_STATUS seq;
+		int			i;
 
 		/* put all the hash elements into an array */
 		dbary = palloc(nelems * sizeof(avl_dbase));
@@ -905,8 +995,17 @@ rebuild_database_list(Oid newdb)
 		/* sort the array */
 		qsort(dbary, nelems, sizeof(avl_dbase), db_comparator);
 
-		/* this is the time interval between databases in the schedule */
+		/*
+		 * Determine the time interval between databases in the schedule.
+		 * If we see that the configured naptime would take us to sleep times
+		 * lower than our min sleep time (which launcher_determine_sleep is
+		 * coded not to allow), silently use a larger naptime (but don't touch
+		 * the GUC variable).
+		 */
 		millis_increment = 1000.0 * autovacuum_naptime / nelems;
+		if (millis_increment <= MIN_AUTOVAC_SLEEPTIME)
+			millis_increment = MIN_AUTOVAC_SLEEPTIME * 1.1;
+
 		current_time = GetCurrentTimestamp();
 
 		/*
@@ -973,7 +1072,7 @@ do_start_worker(void)
 
 	/* return quickly when there are no free workers */
 	LWLockAcquire(AutovacuumLock, LW_SHARED);
-	if (AutoVacuumShmem->av_freeWorkers == NULL)
+	if (AutoVacuumShmem->av_freeWorkers == INVALID_OFFSET)
 	{
 		LWLockRelease(AutovacuumLock);
 		return InvalidOid;
@@ -981,11 +1080,11 @@ do_start_worker(void)
 	LWLockRelease(AutovacuumLock);
 
 	/*
-	 * Cretae and switch to a temporary context to avoid leaking the memory
-	 * allocated fir the database list.
+	 * Create and switch to a temporary context to avoid leaking the memory
+	 * allocated for the database list.
 	 */
 	 tmpcxt = AllocSetContextCreate(CurrentMemoryContext,
-	 								"Star worker tmp cxt",
+									"Start worker tmp cxt",
 									ALLOCSET_DEFAULT_MINSIZE,
 									ALLOCSET_DEFAULT_INITSIZE,
 									ALLOCSET_DEFAULT_MAXSIZE);
@@ -993,14 +1092,14 @@ do_start_worker(void)
 
 
 	/* use fresh stats */
-	pgstat_clear_snapshot();
+	autovac_refresh_stats();
 
 	/* Get a list of databases */
 	dblist = get_database_list();
 
 	/*
-	 * Determine the oldest datfrozenxid/relfrozenxid that we will allow
-	 * to pass without forcing a vacuum.  (This limit can be tightened for
+	 * Determine the oldest datfrozenxid/relfrozenxid that we will allow to
+	 * pass without forcing a vacuum.  (This limit can be tightened for
 	 * particular tables, but not loosened.)
 	 */
 	recentXid = ReadNewTransactionId();
@@ -1040,7 +1139,7 @@ do_start_worker(void)
 		if (TransactionIdPrecedes(tmp->adw_frozenxid, xidForceLimit))
 		{
 			if (avdb == NULL ||
-				TransactionIdPrecedes(tmp->adw_frozenxid, avdb->adw_frozenxid))
+			  TransactionIdPrecedes(tmp->adw_frozenxid, avdb->adw_frozenxid))
 				avdb = tmp;
 			for_xid_wrap = true;
 			continue;
@@ -1052,8 +1151,8 @@ do_start_worker(void)
 		tmp->adw_entry = pgstat_fetch_stat_dbentry(tmp->adw_datid);
 
 		/*
-		 * Otherwise, skip a database with no pgstat entry; it means it
-		 * hasn't seen any activity.
+		 * Skip a database with no pgstat entry; it means it hasn't seen any
+		 * activity.
 		 */
 		if (!tmp->adw_entry)
 			continue;
@@ -1070,26 +1169,19 @@ do_start_worker(void)
 
 		while (elem != NULL)
 		{
-			avl_dbase *dbp = DLE_VAL(elem);
+			avl_dbase  *dbp = DLE_VAL(elem);
 
 			if (dbp->adl_datid == tmp->adw_datid)
 			{
-				TimestampTz		curr_plus_naptime;
-				TimestampTz		next = dbp->adl_next_worker;
-				
-				curr_plus_naptime =
-					TimestampTzPlusMilliseconds(current_time,
-												autovacuum_naptime * 1000);
-
 				/*
-				 * What we want here if to skip if next_worker falls between
+				 * Skip this database if its next_worker value falls between
 				 * the current time and the current time plus naptime.
 				 */
-				if (timestamp_cmp_internal(current_time, next) > 0)
-					skipit = false;
-				else if (timestamp_cmp_internal(next, curr_plus_naptime) > 0)
-					skipit = false;
-				else
+				if (!TimestampDifferenceExceeds(dbp->adl_next_worker,
+												current_time, 0) &&
+					!TimestampDifferenceExceeds(current_time,
+												dbp->adl_next_worker,
+												autovacuum_naptime * 1000))
 					skipit = true;
 
 				break;
@@ -1100,8 +1192,8 @@ do_start_worker(void)
 			continue;
 
 		/*
-		 * Remember the db with oldest autovac time.  (If we are here,
-		 * both tmp->entry and db->entry must be non-null.)
+		 * Remember the db with oldest autovac time.  (If we are here, both
+		 * tmp->entry and db->entry must be non-null.)
 		 */
 		if (avdb == NULL ||
 			tmp->adw_entry->last_autovac_time < avdb->adw_entry->last_autovac_time)
@@ -1112,24 +1204,27 @@ do_start_worker(void)
 	if (avdb != NULL)
 	{
 		WorkerInfo	worker;
+		SHMEM_OFFSET sworker;
 
 		LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
 
 		/*
 		 * Get a worker entry from the freelist.  We checked above, so there
-		 * really should be a free slot -- complain very loudly if there isn't.
+		 * really should be a free slot -- complain very loudly if there
+		 * isn't.
 		 */
-		worker = AutoVacuumShmem->av_freeWorkers;
-		if (worker == NULL)
+		sworker = AutoVacuumShmem->av_freeWorkers;
+		if (sworker == INVALID_OFFSET)
 			elog(FATAL, "no free worker found");
 
-		AutoVacuumShmem->av_freeWorkers = (WorkerInfo) worker->wi_links.next;
+		worker = (WorkerInfo) MAKE_PTR(sworker);
+		AutoVacuumShmem->av_freeWorkers = worker->wi_links.next;
 
 		worker->wi_dboid = avdb->adw_datid;
 		worker->wi_proc = NULL;
 		worker->wi_launchtime = GetCurrentTimestamp();
 
-		AutoVacuumShmem->av_startingWorker = worker;
+		AutoVacuumShmem->av_startingWorker = sworker;
 
 		LWLockRelease(AutovacuumLock);
 
@@ -1148,6 +1243,7 @@ do_start_worker(void)
 
 	MemoryContextSwitchTo(oldcxt);
 	MemoryContextDelete(tmpcxt);
+
 	return retval;
 }
 
@@ -1166,8 +1262,8 @@ do_start_worker(void)
 static void
 launch_worker(TimestampTz now)
 {
-	Oid		dbid;
-	Dlelem *elem;
+	Oid			dbid;
+	Dlelem	   *elem;
 
 	dbid = do_start_worker();
 	if (OidIsValid(dbid))
@@ -1179,7 +1275,7 @@ launch_worker(TimestampTz now)
 		elem = (DatabaseList == NULL) ? NULL : DLGetHead(DatabaseList);
 		while (elem != NULL)
 		{
-			avl_dbase *avdb = DLE_VAL(elem);
+			avl_dbase  *avdb = DLE_VAL(elem);
 
 			if (avdb->adl_datid == dbid)
 			{
@@ -1197,17 +1293,28 @@ launch_worker(TimestampTz now)
 		}
 
 		/*
-		 * If the database was not present in the database list, we rebuild the
-		 * list.  It's possible that the database does not get into the list
-		 * anyway, for example if it's a database that doesn't have a pgstat
-		 * entry, but this is not a problem because we don't want to schedule
-		 * workers regularly into those in any case.
+		 * If the database was not present in the database list, we rebuild
+		 * the list.  It's possible that the database does not get into the
+		 * list anyway, for example if it's a database that doesn't have a
+		 * pgstat entry, but this is not a problem because we don't want to
+		 * schedule workers regularly into those in any case.
 		 */
 		if (elem == NULL)
 			rebuild_database_list(dbid);
 	}
 }
 
+/*
+ * Called from postmaster to signal a failure to fork a process to become
+ * worker.	The postmaster should kill(SIGUSR1) the launcher shortly
+ * after calling this function.
+ */
+void
+AutoVacWorkerFailed(void)
+{
+	AutoVacuumShmem->av_signal[AutoVacForkFailed] = true;
+}
+
 /* SIGHUP: set flag to re-read config file at next convenient time */
 static void
 avl_sighup_handler(SIGNAL_ARGS)
@@ -1222,13 +1329,11 @@ avl_sigusr1_handler(SIGNAL_ARGS)
 	got_SIGUSR1 = true;
 }
 
-/********************************************************************
- *					  AUTOVACUUM WORKER CODE
- ********************************************************************/
+/* SIGTERM: time to die */
 static void
-avlauncher_shutdown(SIGNAL_ARGS)
+avl_sigterm_handler(SIGNAL_ARGS)
 {
-	avlauncher_shutdown_request = true;
+	got_SIGTERM = true;
 }
 
 /*
@@ -1256,6 +1361,10 @@ avl_quickdie(SIGNAL_ARGS)
 }
 
 
+/********************************************************************
+ *					  AUTOVACUUM WORKER CODE
+ ********************************************************************/
+
 #ifdef EXEC_BACKEND
 /*
  * forkexec routines for the autovacuum worker.
@@ -1306,7 +1415,7 @@ StartAutoVacWorker(void)
 	{
 		case -1:
 			ereport(LOG,
-					(errmsg("could not fork autovacuum process: %m")));
+					(errmsg("could not fork autovacuum worker process: %m")));
 			return 0;
 
 #ifndef EXEC_BACKEND
@@ -1336,7 +1445,7 @@ NON_EXEC_STATIC void
 AutoVacWorkerMain(int argc, char *argv[])
 {
 	sigjmp_buf	local_sigjmp_buf;
-	Oid			dbid = InvalidOid;
+	Oid			dbid;
 
 	/* we are a postmaster subprocess now */
 	IsUnderPostmaster = true;
@@ -1358,9 +1467,9 @@ AutoVacWorkerMain(int argc, char *argv[])
 
 	/*
 	 * If possible, make this process a group leader, so that the postmaster
-	 * can signal any child processes too.  (autovacuum probably never has
-	 * any child processes, but for consistency we make all postmaster
-	 * child processes do this.)
+	 * can signal any child processes too.	(autovacuum probably never has any
+	 * child processes, but for consistency we make all postmaster child
+	 * processes do this.)
 	 */
 #ifdef HAVE_SETSID
 	if (setsid() < 0)
@@ -1451,12 +1560,14 @@ AutoVacWorkerMain(int argc, char *argv[])
 	LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
 
 	/*
-	 * beware of startingWorker being INVALID; this could happen if the
-	 * launcher thinks we've taking too long to start.
+	 * beware of startingWorker being INVALID; this should normally not
+	 * happen, but if a worker fails after forking and before this, the
+	 * launcher might have decided to remove it from the queue and start
+	 * again.
 	 */
-	if (AutoVacuumShmem->av_startingWorker != NULL)
+	if (AutoVacuumShmem->av_startingWorker != INVALID_OFFSET)
 	{
-		MyWorkerInfo = AutoVacuumShmem->av_startingWorker;
+		MyWorkerInfo = (WorkerInfo) MAKE_PTR(AutoVacuumShmem->av_startingWorker);
 		dbid = MyWorkerInfo->wi_dboid;
 		MyWorkerInfo->wi_proc = MyProc;
 
@@ -1464,10 +1575,10 @@ AutoVacWorkerMain(int argc, char *argv[])
 		SHMQueueInsertBefore(&AutoVacuumShmem->av_runningWorkers, 
 							 &MyWorkerInfo->wi_links);
 		/*
-		 * remove from the "starting" pointer, so that the launcher can start a new
-		 * worker if required
+		 * remove from the "starting" pointer, so that the launcher can start
+		 * a new worker if required
 		 */
-		AutoVacuumShmem->av_startingWorker = NULL;
+		AutoVacuumShmem->av_startingWorker = INVALID_OFFSET;
 		LWLockRelease(AutovacuumLock);
 
 		on_shmem_exit(FreeWorkerInfo, 0);
@@ -1476,16 +1587,17 @@ AutoVacWorkerMain(int argc, char *argv[])
 		if (AutoVacuumShmem->av_launcherpid != 0)
 			kill(AutoVacuumShmem->av_launcherpid, SIGUSR1);
 	}
-	else {
+	else
+	{
 		/* no worker entry for me, go away */
 		elog(WARNING, "autovacuum worker started without a worker entry");
-		LWLockRelease(AutovacuumLock);
 		dbid = InvalidOid;
+		LWLockRelease(AutovacuumLock);
 	}
 
 	if (OidIsValid(dbid))
 	{
-		char	*dbname = NULL;
+		char		dbname[NAMEDATALEN];
 
 		/*
 		 * Report autovac startup to the stats collector.  We deliberately do
@@ -1509,12 +1621,8 @@ AutoVacWorkerMain(int argc, char *argv[])
 		ereport(DEBUG1,
 				(errmsg("autovacuum: processing database \"%s\"", dbname)));
 
-		/* Create the memory context where cross-transaction state is stored */
-		AutovacMemCxt = AllocSetContextCreate(TopMemoryContext,
-											  "AV worker",
-											  ALLOCSET_DEFAULT_MINSIZE,
-											  ALLOCSET_DEFAULT_INITSIZE,
-											  ALLOCSET_DEFAULT_MAXSIZE);
+		if (PostAuthDelay)
+			pg_usleep(PostAuthDelay * 1000000L);
 
 		/* And do an appropriate amount of work */
 		recentXid = ReadNewTransactionId();
@@ -1531,7 +1639,8 @@ AutoVacWorkerMain(int argc, char *argv[])
 }
 
 /*
- * Return a WorkerInfo to the free list */
+ * Return a WorkerInfo to the free list
+ */
 static void
 FreeWorkerInfo(int code, Datum arg)
 {
@@ -1540,29 +1649,29 @@ FreeWorkerInfo(int code, Datum arg)
 		LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
 
 		/*
-		 * If this worker shuts down when there is no free worker slot, wake
-		 * the launcher up so that he can launch a new worker immediately if
-		 * required.  We only save the launcher's PID in local memory here --
-		 * the actual signal will be sent when the PGPROC is recycled, because
-		 * that is when the new worker can actually be launched.
+		 * Wake the launcher up so that he can launch a new worker immediately
+		 * if required.  We only save the launcher's PID in local memory here;
+		 * the actual signal will be sent when the PGPROC is recycled.	Note
+		 * that we always do this, so that the launcher can rebalance the cost
+		 * limit setting of the remaining workers.
 		 *
 		 * We somewhat ignore the risk that the launcher changes its PID
-		 * between we reading it and the actual kill; we expect ProcKill to be
+		 * between us reading it and the actual kill; we expect ProcKill to be
 		 * called shortly after us, and we assume that PIDs are not reused too
 		 * quickly after a process exits.
 		 */
 		AutovacuumLauncherPid = AutoVacuumShmem->av_launcherpid;
 
 		SHMQueueDelete(&MyWorkerInfo->wi_links);
-		MyWorkerInfo->wi_links.next = (SHMEM_OFFSET) AutoVacuumShmem->av_freeWorkers;
+		MyWorkerInfo->wi_links.next = AutoVacuumShmem->av_freeWorkers;
 		MyWorkerInfo->wi_dboid = InvalidOid;
 		MyWorkerInfo->wi_tableoid = InvalidOid;
-		MyWorkerInfo->wi_proc = 0;
+		MyWorkerInfo->wi_proc = NULL;
 		MyWorkerInfo->wi_launchtime = 0;
 		MyWorkerInfo->wi_cost_delay = 0;
 		MyWorkerInfo->wi_cost_limit = 0;
 		MyWorkerInfo->wi_cost_limit_base = 0;
-		AutoVacuumShmem->av_freeWorkers = MyWorkerInfo;
+		AutoVacuumShmem->av_freeWorkers = MAKE_OFFSET(MyWorkerInfo);
 		/* not mine anymore */
 		MyWorkerInfo = NULL;
 
@@ -1591,20 +1700,28 @@ AutoVacuumUpdateDelay(void)
 
 /*
  * autovac_balance_cost
- *		Recalculate the cost limit setting for each active workers.
+ *		Recalculate the cost limit setting for each active worker.
  *
  * Caller must hold the AutovacuumLock in exclusive mode.
  */
 static void
 autovac_balance_cost(void)
 {
+	/*
+	 * The idea here is that we ration out I/O equally.  The amount of I/O
+	 * that a worker can consume is determined by cost_limit/cost_delay, so
+	 * we try to equalize those ratios rather than the raw limit settings.
+	 *
+	 * note: in cost_limit, zero also means use value from elsewhere, because
+	 * zero is not a valid value.
+	 */
+	int			vac_cost_limit = (autovacuum_vac_cost_limit > 0 ?
+								autovacuum_vac_cost_limit : VacuumCostLimit);
+	int			vac_cost_delay = (autovacuum_vac_cost_delay >= 0 ?
+								autovacuum_vac_cost_delay : VacuumCostDelay);
+	double		cost_total;
+	double		cost_avail;
 	WorkerInfo	worker;
-	int         vac_cost_limit = (autovacuum_vac_cost_limit >= 0 ?
-								  autovacuum_vac_cost_limit : VacuumCostLimit);
-	int         vac_cost_delay = (autovacuum_vac_cost_delay >= 0 ?
-								  autovacuum_vac_cost_delay : VacuumCostDelay);
-	double      cost_total;
-	double      cost_avail;
 
 	/* not set? nothing to do */
 	if (vac_cost_limit <= 0 || vac_cost_delay <= 0)
@@ -1617,22 +1734,22 @@ autovac_balance_cost(void)
 									   offsetof(WorkerInfoData, wi_links));
 	while (worker)
 	{
-		if (worker->wi_proc != 0 &&
+		if (worker->wi_proc != NULL &&
 			worker->wi_cost_limit_base > 0 && worker->wi_cost_delay > 0)
 			cost_total +=
 				(double) worker->wi_cost_limit_base / worker->wi_cost_delay;
 
 		worker = (WorkerInfo) SHMQueueNext(&AutoVacuumShmem->av_runningWorkers,
 										   &worker->wi_links,
-										   offsetof(WorkerInfoData, wi_links));
+										 offsetof(WorkerInfoData, wi_links));
 	}
 	/* there are no cost limits -- nothing to do */
 	if (cost_total <= 0)
 		return;
 
 	/*
-	 * Adjust each cost limit of active workers to balance the total of
-	 * cost limit to autovacuum_vacuum_cost_limit.
+	 * Adjust cost limit of each active worker to balance the total of cost
+	 * limit to autovacuum_vacuum_cost_limit.
 	 */
 	cost_avail = (double) vac_cost_limit / vac_cost_delay;
 	worker = (WorkerInfo) SHMQueueNext(&AutoVacuumShmem->av_runningWorkers,
@@ -1640,22 +1757,31 @@ autovac_balance_cost(void)
 									   offsetof(WorkerInfoData, wi_links));
 	while (worker)
 	{
-		if (worker->wi_proc != 0 &&
+		if (worker->wi_proc != NULL &&
 			worker->wi_cost_limit_base > 0 && worker->wi_cost_delay > 0)
 		{
-			int     limit = (int)
-				(cost_avail * worker->wi_cost_limit_base / cost_total);
-
-			worker->wi_cost_limit = Max(Min(limit, worker->wi_cost_limit_base), 1);
+			int			limit = (int)
+			(cost_avail * worker->wi_cost_limit_base / cost_total);
 
-			elog(DEBUG2, "autovac_balance_cost(pid=%u db=%u, rel=%u, cost_limit=%d, cost_delay=%d)",
-				 worker->wi_proc->pid, worker->wi_dboid,
-				 worker->wi_tableoid, worker->wi_cost_limit, worker->wi_cost_delay);
+			/*
+			 * We put a lower bound of 1 on the cost_limit, to avoid division-
+			 * by-zero in the vacuum code.  Also, in case of roundoff trouble
+			 * in these calculations, let's be sure we don't ever set
+			 * cost_limit to more than the base value.
+			 */
+			worker->wi_cost_limit = Max(Min(limit,
+											worker->wi_cost_limit_base),
+										1);
+
+			elog(DEBUG2, "autovac_balance_cost(pid=%u db=%u, rel=%u, cost_limit=%d, cost_limit_base=%d, cost_delay=%d)",
+				 worker->wi_proc->pid, worker->wi_dboid, worker->wi_tableoid,
+				 worker->wi_cost_limit, worker->wi_cost_limit_base,
+				 worker->wi_cost_delay);
 		}
 
 		worker = (WorkerInfo) SHMQueueNext(&AutoVacuumShmem->av_runningWorkers,
 										   &worker->wi_links,
-										   offsetof(WorkerInfoData, wi_links));
+										 offsetof(WorkerInfoData, wi_links));
 	}
 }
 
@@ -1686,7 +1812,7 @@ get_database_list(void)
 	while (read_pg_database_line(db_file, thisname, &db_id,
 								 &db_tablespace, &db_frozenxid))
 	{
-		avw_dbase *avdb;
+		avw_dbase  *avdb;
 
 		avdb = (avw_dbase *) palloc(sizeof(avw_dbase));
 
@@ -1725,10 +1851,23 @@ do_autovacuum(void)
 	ListCell   *volatile cell;
 	PgStat_StatDBEntry *shared;
 	PgStat_StatDBEntry *dbentry;
+	BufferAccessStrategy bstrategy;
 
 	/*
-	 * may be NULL if we couldn't find an entry (only happens if we
-	 * are forcing a vacuum for anti-wrap purposes).
+	 * StartTransactionCommand and CommitTransactionCommand will automatically
+	 * switch to other contexts.  We need this one to keep the list of
+	 * relations to vacuum/analyze across transactions.
+	 */
+	AutovacMemCxt = AllocSetContextCreate(TopMemoryContext,
+										  "AV worker",
+										  ALLOCSET_DEFAULT_MINSIZE,
+										  ALLOCSET_DEFAULT_INITSIZE,
+										  ALLOCSET_DEFAULT_MAXSIZE);
+	MemoryContextSwitchTo(AutovacMemCxt);
+
+	/*
+	 * may be NULL if we couldn't find an entry (only happens if we are
+	 * forcing a vacuum for anti-wrap purposes).
 	 */
 	dbentry = pgstat_fetch_stat_dbentry(MyDatabaseId);
 
@@ -1746,9 +1885,9 @@ do_autovacuum(void)
 	pgstat_vacuum_stat();
 
 	/*
-	 * Find the pg_database entry and select the default freeze_min_age.
-	 * We use zero in template and nonconnectable databases,
-	 * else the system-wide default.
+	 * Find the pg_database entry and select the default freeze_min_age. We
+	 * use zero in template and nonconnectable databases, else the system-wide
+	 * default.
 	 */
 	tuple = SearchSysCache(DATABASEOID,
 						   ObjectIdGetDatum(MyDatabaseId),
@@ -1764,11 +1903,7 @@ do_autovacuum(void)
 
 	ReleaseSysCache(tuple);
 
-	/*
-	 * StartTransactionCommand and CommitTransactionCommand will automatically
-	 * switch to other contexts.  We need this one to keep the list of
-	 * relations to vacuum/analyze across transactions.
-	 */
+	/* StartTransactionCommand changed elsewhere */
 	MemoryContextSwitchTo(AutovacMemCxt);
 
 	/* The database hash where pgstat keeps shared relations */
@@ -1847,12 +1982,12 @@ do_autovacuum(void)
 	 */
 	foreach(cell, toast_oids)
 	{
-		Oid		toastoid = lfirst_oid(cell);
-		ListCell *cell2;
+		Oid			toastoid = lfirst_oid(cell);
+		ListCell   *cell2;
 
 		foreach(cell2, table_toast_list)
 		{
-			av_relation	   *ar = lfirst(cell2);
+			av_relation *ar = lfirst(cell2);
 
 			if (ar->ar_toastrelid == toastoid)
 			{
@@ -1867,23 +2002,44 @@ do_autovacuum(void)
 	list_free(toast_oids);
 	toast_oids = NIL;
 
+	/*
+	 * Create a buffer access strategy object for VACUUM to use.  We want to
+	 * use the same one across all the vacuum operations we perform, since the
+	 * point is for VACUUM not to blow out the shared cache.
+	 */
+	bstrategy = GetAccessStrategy(BAS_VACUUM);
+
+	/*
+	 * create a memory context to act as fake PortalContext, so that the
+	 * contexts created in the vacuum code are cleaned up for each table.
+	 */
+	PortalContext = AllocSetContextCreate(AutovacMemCxt,
+										  "Autovacuum Portal",
+										  ALLOCSET_DEFAULT_INITSIZE,
+										  ALLOCSET_DEFAULT_MINSIZE,
+										  ALLOCSET_DEFAULT_MAXSIZE);
+
 	/*
 	 * Perform operations on collected tables.
 	 */
 	foreach(cell, table_oids)
 	{
-		Oid		relid = lfirst_oid(cell);
+		Oid			relid = lfirst_oid(cell);
 		autovac_table *tab;
-		char   *relname;
 		WorkerInfo	worker;
-		bool        skipit;
+		bool		skipit;
+		char	   *datname,
+				   *nspname,
+				   *relname;
+		int			stdVacuumCostDelay;
+		int			stdVacuumCostLimit;
 
 		CHECK_FOR_INTERRUPTS();
 
 		/*
-		 * hold schedule lock from here until we're sure that this table
-		 * still needs vacuuming.  We also need the AutovacuumLock to walk
-		 * the worker array, but we'll let go of that one quickly.
+		 * hold schedule lock from here until we're sure that this table still
+		 * needs vacuuming.  We also need the AutovacuumLock to walk the
+		 * worker array, but we'll let go of that one quickly.
 		 */
 		LWLockAcquire(AutovacuumScheduleLock, LW_EXCLUSIVE);
 		LWLockAcquire(AutovacuumLock, LW_SHARED);
@@ -1894,8 +2050,8 @@ do_autovacuum(void)
 		 */
 		skipit = false;
 		worker = (WorkerInfo) SHMQueueNext(&AutoVacuumShmem->av_runningWorkers,
-										   &AutoVacuumShmem->av_runningWorkers,
-										   offsetof(WorkerInfoData, wi_links));
+										 &AutoVacuumShmem->av_runningWorkers,
+										 offsetof(WorkerInfoData, wi_links));
 		while (worker)
 		{
 			/* ignore myself */
@@ -1912,10 +2068,10 @@ do_autovacuum(void)
 				break;
 			}
 
-next_worker:
+	next_worker:
 			worker = (WorkerInfo) SHMQueueNext(&AutoVacuumShmem->av_runningWorkers,
 											   &worker->wi_links,
-											   offsetof(WorkerInfoData, wi_links));
+										 offsetof(WorkerInfoData, wi_links));
 		}
 		LWLockRelease(AutovacuumLock);
 		if (skipit)
@@ -1926,12 +2082,13 @@ do_autovacuum(void)
 
 		/*
 		 * Check whether pgstat data still says we need to vacuum this table.
-		 * It could have changed if something else processed the table while we
-		 * weren't looking.
+		 * It could have changed if something else processed the table while
+		 * we weren't looking.
 		 *
 		 * FIXME we ignore the possibility that the table was finished being
 		 * vacuumed in the last 500ms (PGSTAT_STAT_INTERVAL).  This is a bug.
 		 */
+		MemoryContextSwitchTo(AutovacMemCxt);
 		tab = table_recheck_autovac(relid);
 		if (tab == NULL)
 		{
@@ -1941,47 +2098,130 @@ do_autovacuum(void)
 		}
 
 		/*
-		 * Ok, good to go.  Store the table in shared memory before releasing
+		 * Ok, good to go.	Store the table in shared memory before releasing
 		 * the lock so that other workers don't vacuum it concurrently.
 		 */
 		MyWorkerInfo->wi_tableoid = relid;
 		LWLockRelease(AutovacuumScheduleLock);
 
-		/* Set the initial vacuum cost parameters for this table */
-		VacuumCostDelay = tab->at_vacuum_cost_delay;
-		VacuumCostLimit = tab->at_vacuum_cost_limit;
-
-		relname = get_rel_name(relid);
-		elog(DEBUG2, "autovac: will%s%s %s",
-			 (tab->at_dovacuum ? " VACUUM" : ""),
-			 (tab->at_doanalyze ? " ANALYZE" : ""),
-			 relname);
-
 		/*
-		 * Advertise my cost delay parameters for the balancing algorithm, and
-		 * do a balance
+		 * Remember the prevailing values of the vacuum cost GUCs.  We have
+		 * to restore these at the bottom of the loop, else we'll compute
+		 * wrong values in the next iteration of autovac_balance_cost().
 		 */
+		stdVacuumCostDelay = VacuumCostDelay;
+		stdVacuumCostLimit = VacuumCostLimit;
+
+		/* Must hold AutovacuumLock while mucking with cost balance info */
 		LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
+
+		/* advertise my cost delay parameters for the balancing algorithm */
 		MyWorkerInfo->wi_cost_delay = tab->at_vacuum_cost_delay;
 		MyWorkerInfo->wi_cost_limit = tab->at_vacuum_cost_limit;
 		MyWorkerInfo->wi_cost_limit_base = tab->at_vacuum_cost_limit;
+
+		/* do a balance */
 		autovac_balance_cost();
+
+		/* set the active cost parameters from the result of that */
+		AutoVacuumUpdateDelay();
+
+		/* done */
 		LWLockRelease(AutovacuumLock);
 
-		/* have at it */
-		autovacuum_do_vac_analyze(tab->at_relid,
-								  tab->at_dovacuum,
-								  tab->at_doanalyze,
-								  tab->at_freeze_min_age);
+		/* clean up memory before each iteration */
+		MemoryContextResetAndDeleteChildren(PortalContext);
+
+		/*
+		 * Save the relation name for a possible error message, to avoid a
+		 * catalog lookup in case of an error.  If any of these return NULL,
+		 * then the relation has been dropped since last we checked; skip it.
+		 * Note: they must live in a long-lived memory context because we call
+		 * vacuum and analyze in different transactions.
+		 */
+		datname = get_database_name(MyDatabaseId);
+		nspname = get_namespace_name(get_rel_namespace(tab->at_relid));
+		relname = get_rel_name(tab->at_relid);
+		if (!datname || !nspname || !relname)
+			goto deleted;
+
+		/*
+		 * We will abort vacuuming the current table if something errors out,
+		 * and continue with the next one in schedule; in particular, this
+		 * happens if we are interrupted with SIGINT.
+		 */
+		PG_TRY();
+		{
+			/* have at it */
+			MemoryContextSwitchTo(TopTransactionContext);
+			autovacuum_do_vac_analyze(tab->at_relid,
+									  tab->at_dovacuum,
+									  tab->at_doanalyze,
+									  tab->at_freeze_min_age,
+									  tab->at_wraparound,
+									  bstrategy);
+
+			/*
+			 * Clear a possible query-cancel signal, to avoid a late reaction
+			 * to an automatically-sent signal because of vacuuming the
+			 * current table (we're done with it, so it would make no sense to
+			 * cancel at this point.)
+			 */
+			QueryCancelPending = false;
+		}
+		PG_CATCH();
+		{
+			/*
+			 * Abort the transaction, start a new one, and proceed with the
+			 * next table in our list.
+			 */
+			HOLD_INTERRUPTS();
+			if (tab->at_dovacuum)
+				errcontext("automatic vacuum of table \"%s.%s.%s\"",
+						   datname, nspname, relname);
+			else
+				errcontext("automatic analyze of table \"%s.%s.%s\"",
+						   datname, nspname, relname);
+			EmitErrorReport();
+
+			/* this resets the PGPROC flags too */
+			AbortOutOfAnyTransaction();
+			FlushErrorState();
+			MemoryContextResetAndDeleteChildren(PortalContext);
+
+			/* restart our transaction for the following operations */
+			StartTransactionCommand();
+			RESUME_INTERRUPTS();
+		}
+		PG_END_TRY();
+
+		/* the PGPROC flags are reset at the next end of transaction */
+
+deleted:
 		/* be tidy */
 		pfree(tab);
-		pfree(relname);
-	}
+		if (datname)
+			pfree(datname);
+		if (nspname)
+			pfree(nspname);
+		if (relname)
+			pfree(relname);
 
-	/*
-	 * We leak table_toast_map here (among other things), but since we're
-	 * going away soon, it's not a problem.
-	 */
+		/*
+		 * Remove my info from shared memory.  We could, but intentionally
+		 * don't, clear wi_cost_limit and friends --- this is on the
+		 * assumption that we probably have more to do with similar cost
+		 * settings, so we don't want to give up our share of I/O for a very
+		 * short interval and thereby thrash the global balance.
+		 */
+		LWLockAcquire(AutovacuumLock, LW_EXCLUSIVE);
+		MyWorkerInfo->wi_tableoid = InvalidOid;
+		LWLockRelease(AutovacuumLock);
+
+		/* restore vacuum cost GUCs for the next iteration */
+		VacuumCostDelay = stdVacuumCostDelay;
+		VacuumCostLimit = stdVacuumCostLimit;
+	}
 
 	/*
 	 * Update pg_database.datfrozenxid, and truncate pg_clog if possible. We
@@ -2062,15 +2302,16 @@ get_pgstat_tabentry_relid(Oid relid, bool isshared, PgStat_StatDBEntry *shared,
  */
 static void
 relation_check_autovac(Oid relid, Form_pg_class classForm,
-					   Form_pg_autovacuum avForm, PgStat_StatTabEntry *tabentry,
+					Form_pg_autovacuum avForm, PgStat_StatTabEntry *tabentry,
 					   List **table_oids, List **table_toast_list,
 					   List **toast_oids)
 {
-	bool	dovacuum;
-	bool	doanalyze;
+	bool		dovacuum;
+	bool		doanalyze;
+	bool		dummy;
 
 	relation_needs_vacanalyze(relid, avForm, classForm, tabentry,
-							  &dovacuum, &doanalyze);
+							  &dovacuum, &doanalyze, &dummy);
 
 	if (classForm->relkind == RELKIND_TOASTVALUE)
 	{
@@ -2085,7 +2326,7 @@ relation_check_autovac(Oid relid, Form_pg_class classForm,
 			*table_oids = lappend_oid(*table_oids, relid);
 		else if (OidIsValid(classForm->reltoastrelid))
 		{
-			av_relation	   *rel = palloc(sizeof(av_relation));
+			av_relation *rel = palloc(sizeof(av_relation));
 
 			rel->ar_relid = relid;
 			rel->ar_toastrelid = classForm->reltoastrelid;
@@ -2117,9 +2358,11 @@ table_recheck_autovac(Oid relid)
 	bool		doit = false;
 	PgStat_StatDBEntry *shared;
 	PgStat_StatDBEntry *dbentry;
+	bool		wraparound,
+				toast_wraparound = false;
 
 	/* use fresh stats */
-	pgstat_clear_snapshot();
+	autovac_refresh_stats();
 
 	shared = pgstat_fetch_stat_dbentry(InvalidOid);
 	dbentry = pgstat_fetch_stat_dbentry(MyDatabaseId);
@@ -2143,7 +2386,7 @@ table_recheck_autovac(Oid relid)
 										 shared, dbentry);
 
 	relation_needs_vacanalyze(relid, avForm, classForm, tabentry,
-							  &dovacuum, &doanalyze);
+							  &dovacuum, &doanalyze, &wraparound);
 
 	/* OK, it needs vacuum by itself */
 	if (dovacuum)
@@ -2151,7 +2394,7 @@ table_recheck_autovac(Oid relid)
 	/* it doesn't need vacuum, but what about it's TOAST table? */
 	else if (OidIsValid(classForm->reltoastrelid))
 	{
-		Oid		toastrelid = classForm->reltoastrelid;
+		Oid			toastrelid = classForm->reltoastrelid;
 		HeapTuple	toastClassTup;
 
 		toastClassTup = SearchSysCacheCopy(RELOID,
@@ -2159,20 +2402,22 @@ table_recheck_autovac(Oid relid)
 										   0, 0, 0);
 		if (HeapTupleIsValid(toastClassTup))
 		{
-			bool			toast_dovacuum;
-			bool			toast_doanalyze;
-			Form_pg_class	toastClassForm;
+			bool		toast_dovacuum;
+			bool		toast_doanalyze;
+			bool		toast_wraparound;
+			Form_pg_class toastClassForm;
 			PgStat_StatTabEntry *toasttabentry;
 
 			toastClassForm = (Form_pg_class) GETSTRUCT(toastClassTup);
 			toasttabentry = get_pgstat_tabentry_relid(toastrelid,
-													  toastClassForm->relisshared,
+												 toastClassForm->relisshared,
 													  shared, dbentry);
 
 			/* note we use the pg_autovacuum entry for the main table */
-			relation_needs_vacanalyze(toastrelid, avForm, toastClassForm,
-									  toasttabentry, &toast_dovacuum,
-									  &toast_doanalyze);
+			relation_needs_vacanalyze(toastrelid, avForm,
+									  toastClassForm, toasttabentry,
+									  &toast_dovacuum, &toast_doanalyze,
+									  &toast_wraparound);
 			/* we only consider VACUUM for toast tables */
 			if (toast_dovacuum)
 			{
@@ -2194,16 +2439,18 @@ table_recheck_autovac(Oid relid)
 		int			vac_cost_delay;
 
 		/*
-		 * Calculate the vacuum cost parameters and the minimum freeze age.  If
+		 * Calculate the vacuum cost parameters and the minimum freeze age. If
 		 * there is a tuple in pg_autovacuum, use it; else, use the GUC
 		 * defaults.  Note that the fields may contain "-1" (or indeed any
 		 * negative value), which means use the GUC defaults for each setting.
+		 * In cost_limit, the value 0 also means to use the value from
+		 * elsewhere.
 		 */
 		if (avForm != NULL)
 		{
-			vac_cost_limit = (avForm->vac_cost_limit >= 0) ?
+			vac_cost_limit = (avForm->vac_cost_limit > 0) ?
 				avForm->vac_cost_limit :
-				((autovacuum_vac_cost_limit >= 0) ?
+				((autovacuum_vac_cost_limit > 0) ?
 				 autovacuum_vac_cost_limit : VacuumCostLimit);
 
 			vac_cost_delay = (avForm->vac_cost_delay >= 0) ?
@@ -2216,7 +2463,7 @@ table_recheck_autovac(Oid relid)
 		}
 		else
 		{
-			vac_cost_limit = (autovacuum_vac_cost_limit >= 0) ?
+			vac_cost_limit = (autovacuum_vac_cost_limit > 0) ?
 				autovacuum_vac_cost_limit : VacuumCostLimit;
 
 			vac_cost_delay = (autovacuum_vac_cost_delay >= 0) ?
@@ -2232,6 +2479,7 @@ table_recheck_autovac(Oid relid)
 		tab->at_freeze_min_age = freeze_min_age;
 		tab->at_vacuum_cost_limit = vac_cost_limit;
 		tab->at_vacuum_cost_delay = vac_cost_delay;
+		tab->at_wraparound = wraparound || toast_wraparound;
 	}
 
 	heap_close(avRel, AccessShareLock);
@@ -2246,7 +2494,8 @@ table_recheck_autovac(Oid relid)
  * relation_needs_vacanalyze
  *
  * Check whether a relation needs to be vacuumed or analyzed; return each into
- * "dovacuum" and "doanalyze", respectively.  avForm and tabentry can be NULL,
+ * "dovacuum" and "doanalyze", respectively.  Also return whether the vacuum is
+ * being forced because of Xid wraparound.	avForm and tabentry can be NULL,
  * classForm shouldn't.
  *
  * A table needs to be vacuumed if the number of dead tuples exceeds a
@@ -2265,7 +2514,7 @@ table_recheck_autovac(Oid relid)
  *
  * A table whose pg_autovacuum.enabled value is false, is automatically
  * skipped (unless we have to vacuum it due to freeze_max_age).  Thus
- * autovacuum can be disabled for specific tables.  Also, when the stats
+ * autovacuum can be disabled for specific tables.	Also, when the stats
  * collector does not have data about a table, it will be skipped.
  *
  * A table whose vac_base_thresh value is <0 takes the base value from the
@@ -2278,23 +2527,28 @@ relation_needs_vacanalyze(Oid relid,
 						  Form_pg_autovacuum avForm,
 						  Form_pg_class classForm,
 						  PgStat_StatTabEntry *tabentry,
-						  /* output params below */
+ /* output params below */
 						  bool *dovacuum,
-						  bool *doanalyze)
+						  bool *doanalyze,
+						  bool *wraparound)
 {
 	bool		force_vacuum;
 	float4		reltuples;		/* pg_class.reltuples */
+
 	/* constants from pg_autovacuum or GUC variables */
 	int			vac_base_thresh,
 				anl_base_thresh;
 	float4		vac_scale_factor,
 				anl_scale_factor;
+
 	/* thresholds calculated from above constants */
 	float4		vacthresh,
 				anlthresh;
+
 	/* number of vacuum (resp. analyze) tuples at this time */
 	float4		vactuples,
 				anltuples;
+
 	/* freeze parameters */
 	int			freeze_max_age;
 	TransactionId xidForceLimit;
@@ -2304,12 +2558,9 @@ relation_needs_vacanalyze(Oid relid,
 
 	/*
 	 * Determine vacuum/analyze equation parameters.  If there is a tuple in
-	 * pg_autovacuum, use it; else, use the GUC defaults.  Note that the fields
-	 * may contain "-1" (or indeed any negative value), which means use the GUC
-	 * defaults for each setting.	
-	 *
-	 * Note: in cost_limit, 0 also means use the value from elsewhere,
-	 * because 0 is not a valid value for VacuumCostLimit.
+	 * pg_autovacuum, use it; else, use the GUC defaults.  Note that the
+	 * fields may contain "-1" (or indeed any negative value), which means use
+	 * the GUC defaults for each setting.
 	 */
 	if (avForm != NULL)
 	{
@@ -2345,6 +2596,7 @@ relation_needs_vacanalyze(Oid relid,
 	force_vacuum = (TransactionIdIsNormal(classForm->relfrozenxid) &&
 					TransactionIdPrecedes(classForm->relfrozenxid,
 										  xidForceLimit));
+	*wraparound = force_vacuum;
 
 	/* User disabled it in pg_autovacuum?  (But ignore if at risk) */
 	if (avForm && !avForm->enabled && !force_vacuum)
@@ -2380,9 +2632,9 @@ relation_needs_vacanalyze(Oid relid,
 	else
 	{
 		/*
-		 * Skip a table not found in stat hash, unless we have to force
-		 * vacuum for anti-wrap purposes.  If it's not acted upon, there's
-		 * no need to vacuum it.
+		 * Skip a table not found in stat hash, unless we have to force vacuum
+		 * for anti-wrap purposes.	If it's not acted upon, there's no need to
+		 * vacuum it.
 		 */
 		*dovacuum = force_vacuum;
 		*doanalyze = false;
@@ -2399,45 +2651,37 @@ relation_needs_vacanalyze(Oid relid,
  */
 static void
 autovacuum_do_vac_analyze(Oid relid, bool dovacuum, bool doanalyze,
-						  int freeze_min_age)
+						  int freeze_min_age, bool for_wraparound,
+						  BufferAccessStrategy bstrategy)
 {
-	VacuumStmt *vacstmt;
+	VacuumStmt	vacstmt;
+	List	   *relids;
+	MemoryContext old_cxt;
+
+	/* Set up command parameters --- use a local variable instead of palloc */
+	MemSet(&vacstmt, 0, sizeof(vacstmt));
+
+	vacstmt.type = T_VacuumStmt;
+	vacstmt.vacuum = dovacuum;
+	vacstmt.full = false;
+	vacstmt.analyze = doanalyze;
+	vacstmt.freeze_min_age = freeze_min_age;
+	vacstmt.verbose = false;
+	vacstmt.relation = NULL;	/* not used since we pass a relids list */
+	vacstmt.va_cols = NIL;
 
 	/*
-	 * The node must survive transaction boundaries, so make sure we create it
+	 * The list must survive transaction boundaries, so make sure we create it
 	 * in a long-lived context
 	 */
-	MemoryContextSwitchTo(AutovacMemCxt);
-
-	vacstmt = makeNode(VacuumStmt);
-
-	/*
-	 * Point QueryContext to the autovac memory context to fake out the
-	 * PreventTransactionChain check inside vacuum().  Note that this is also
-	 * why we palloc vacstmt instead of just using a local variable.
-	 */
-	QueryContext = CurrentMemoryContext;
-
-	/* Set up command parameters */
-	vacstmt->type = T_VacuumStmt;
-	vacstmt->vacuum = dovacuum;
-	vacstmt->full = false;
-	vacstmt->analyze = doanalyze;
-	vacstmt->freeze_min_age = freeze_min_age;
-	vacstmt->verbose = false;
-	vacstmt->rootonly = false;
-	vacstmt->relation = NULL;	/* not used since we pass relids list */
-	vacstmt->va_cols = NIL;
+	old_cxt = MemoryContextSwitchTo(AutovacMemCxt);
+	relids = list_make1_oid(relid);
+	MemoryContextSwitchTo(old_cxt);
 
 	/* Let pgstat know what we're doing */
-	autovac_report_activity(vacstmt, relid);
+	autovac_report_activity(&vacstmt, relid, for_wraparound);
 
-	vacuum(vacstmt, list_make1_oid(relid));
-
-	pfree(vacstmt);
-
-	/* Make sure we end up pointing to the long-lived context at exit */
-	MemoryContextSwitchTo(AutovacMemCxt);
+	vacuum(&vacstmt, relids, bstrategy, for_wraparound, true);
 }
 
 /*
@@ -2452,37 +2696,42 @@ autovacuum_do_vac_analyze(Oid relid, bool dovacuum, bool doanalyze,
  * bother to report "<IDLE>" or some such.
  */
 static void
-autovac_report_activity(VacuumStmt *vacstmt, Oid relid)
+autovac_report_activity(VacuumStmt *vacstmt, Oid relid, bool for_wraparound)
 {
 	char	   *relname = get_rel_name(relid);
 	char	   *nspname = get_namespace_name(get_rel_namespace(relid));
-#define MAX_AUTOVAC_ACTIV_LEN (NAMEDATALEN * 2 + 32)
+
+#define MAX_AUTOVAC_ACTIV_LEN (NAMEDATALEN * 2 + 56)
 	char		activity[MAX_AUTOVAC_ACTIV_LEN];
 
 	/* Report the command and possible options */
 	if (vacstmt->vacuum)
 		snprintf(activity, MAX_AUTOVAC_ACTIV_LEN,
-				 "VACUUM%s",
+				 "autovacuum: VACUUM%s",
 				 vacstmt->analyze ? " ANALYZE" : "");
 	else
 		snprintf(activity, MAX_AUTOVAC_ACTIV_LEN,
-				 "ANALYZE");
+				 "autovacuum: ANALYZE");
 
 	/*
 	 * Report the qualified name of the relation.
 	 *
-	 * Paranoia is appropriate here in case relation was recently dropped
-	 * --- the lsyscache routines we just invoked will return NULL rather
-	 * than failing.
+	 * Paranoia is appropriate here in case relation was recently dropped ---
+	 * the lsyscache routines we just invoked will return NULL rather than
+	 * failing.
 	 */
 	if (relname && nspname)
 	{
 		int			len = strlen(activity);
 
 		snprintf(activity + len, MAX_AUTOVAC_ACTIV_LEN - len,
-				 " %s.%s", nspname, relname);
+				 " %s.%s%s", nspname, relname,
+				 for_wraparound ? " (to prevent wraparound)" : "");
 	}
 
+	/* Set statement_timestamp() to current time for pg_stat_activity */
+	SetCurrentStatementStartTimestamp();
+
 	pgstat_report_activity(activity);
 }
 
@@ -2508,21 +2757,10 @@ AutoVacuumingActive(void)
 void
 autovac_init(void)
 {
-	if (!autovacuum_start_daemon)
-		return;
-
-	if (!pgstat_track_counts)
-	{
+	if (autovacuum_start_daemon && !pgstat_track_counts)
 		ereport(WARNING,
 				(errmsg("autovacuum not started because of misconfiguration"),
 				 errhint("Enable the \"track_counts\" option.")));
-
-		/*
-		 * Set the GUC var so we don't fork autovacuum uselessly, and also to
-		 * help debugging.
-		 */
-		autovacuum_start_daemon = false;
-	}
 }
 
 /*
@@ -2588,9 +2826,9 @@ AutoVacuumShmemInit(void)
 		Assert(!found);
 
 		AutoVacuumShmem->av_launcherpid = 0;
-		AutoVacuumShmem->av_freeWorkers = NULL;
+		AutoVacuumShmem->av_freeWorkers = INVALID_OFFSET;
 		SHMQueueInit(&AutoVacuumShmem->av_runningWorkers);
-		AutoVacuumShmem->av_startingWorker = NULL;
+		AutoVacuumShmem->av_startingWorker = INVALID_OFFSET;
 
 		worker = (WorkerInfo) ((char *) AutoVacuumShmem +
 							   MAXALIGN(sizeof(AutoVacuumShmemStruct)));
@@ -2598,10 +2836,42 @@ AutoVacuumShmemInit(void)
 		/* initialize the WorkerInfo free list */
 		for (i = 0; i < autovacuum_max_workers; i++)
 		{
-			worker[i].wi_links.next = (SHMEM_OFFSET) (SHM_QUEUE *) AutoVacuumShmem->av_freeWorkers;
-			AutoVacuumShmem->av_freeWorkers = &worker[i];
+			worker[i].wi_links.next = AutoVacuumShmem->av_freeWorkers;
+			AutoVacuumShmem->av_freeWorkers = MAKE_OFFSET(&worker[i]);
 		}
 	}
 	else
 		Assert(found);
 }
+
+/*
+ * autovac_refresh_stats
+ *		Refresh pgstats data for an autovacuum process
+ *
+ * Cause the next pgstats read operation to obtain fresh data, but throttle
+ * such refreshing in the autovacuum launcher.	This is mostly to avoid
+ * rereading the pgstats files too many times in quick succession when there
+ * are many databases.
+ *
+ * Note: we avoid throttling in the autovac worker, as it would be
+ * counterproductive in the recheck logic.
+ */
+static void
+autovac_refresh_stats(void)
+{
+	if (IsAutoVacuumLauncherProcess())
+	{
+		static TimestampTz last_read = 0;
+		TimestampTz current_time;
+
+		current_time = GetCurrentTimestamp();
+
+		if (!TimestampDifferenceExceeds(last_read, current_time,
+										STATS_READ_DELAY))
+			return;
+
+		last_read = current_time;
+	}
+
+	pgstat_clear_snapshot();
+}
diff --git a/src/backend/postmaster/backoff.c b/src/backend/postmaster/backoff.c
index d543ec5fcec5..f6473a255495 100644
--- a/src/backend/postmaster/backoff.c
+++ b/src/backend/postmaster/backoff.c
@@ -772,6 +772,16 @@ void BackoffSweeper()
 						se->targetUsage = maxCPU;
 						se->noBackoff = true;
 						activeWeight -= (se->weight / gl->numFollowersActive);
+						/*
+						 * GPDB_83_MERGE_FIXME: I saw the Assert(activeWeight > 0.0) above to fail
+						 * every now and then, when running "make installcheck-good". Something's wrong,
+						 * not sure what, but let's just silence that failure for now
+						 */
+						if (activeWeight <= 0)
+						{
+							elog(LOG, "activeWeight underflow!");
+							activeWeight = 0.001;
+						}
 						CPUAvailable -= maxCPU;
 						found = true;
 					}
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 3b394a2105ab..139d687f342f 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -2,7 +2,7 @@
  *
  * bgwriter.c
  *
- * The background writer (bgwriter) is new as of Postgres 8.0.  It attempts
+ * The background writer (bgwriter) is new as of Postgres 8.0.	It attempts
  * to keep regular backends from having to write out dirty shared buffers
  * (which they would only do when needing to free a shared buffer to read in
  * another page).  In the best scenario all writes from shared buffers will
@@ -33,19 +33,21 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.36 2007/01/17 16:25:01 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.48 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include <signal.h>
+#include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 
 #include "access/xlog_internal.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "pgstat.h"
 #include "postmaster/bgwriter.h"
 #include "storage/fd.h"
 #include "storage/freespace.h"
@@ -54,6 +56,7 @@
 #include "storage/pmsignal.h"
 #include "storage/shmem.h"
 #include "storage/smgr.h"
+#include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/guc.h"
 #include "utils/memutils.h"
@@ -65,8 +68,14 @@
 /*----------
  * Shared memory area for communication between bgwriter and backends
  *
+ * num_backend_writes is used to count the number of buffer writes performed
+ * by non-bgwriter processes.  This counter should be wide enough that it
+ * can't overflow during a single bgwriter cycle.
+ *
  * The requests array holds fsync requests sent by backends and not yet
- * absorbed by the bgwriter.  Unlike the checkpoint fields, the requests
+ * absorbed by the bgwriter.
+ *
+ * Unlike the checkpoint fields, num_backend_writes and the requests
  * fields are protected by BgWriterCommLock.
  *----------
  */
@@ -81,6 +90,8 @@ typedef struct
 {
 	pid_t		bgwriter_pid;	/* PID of bgwriter (0 if not started) */
 
+	uint32		num_backend_writes;		/* counts non-bgwriter buffer writes */
+
 	int			num_requests;	/* current # of requests */
 	int			max_requests;	/* allocated array size */
 	BgWriterRequest requests[1];	/* VARIABLE LENGTH ARRAY */
@@ -106,6 +117,14 @@ static volatile sig_atomic_t shutdown_requested = false;
 static bool am_bg_writer = false;
 static time_t last_xlog_switch_time;
 
+/* Prototypes for private functions */
+
+static void BgWriterNap(void);
+static void CheckArchiveTimeout(void);
+static bool CompactBgwriterRequestQueue(void);
+
+/* Signal handlers */
+
 static void BgSigHupHandler(SIGNAL_ARGS);
 static void ReqCheckpointSmgrCloseHandler(SIGNAL_ARGS);
 static void ReqShutdownHandler(SIGNAL_ARGS);
@@ -122,15 +141,14 @@ BackgroundWriterMain(void)
 	sigjmp_buf	local_sigjmp_buf;
 	MemoryContext bgwriter_context;
 
-	Assert(BgWriterShmem != NULL);
 	BgWriterShmem->bgwriter_pid = MyProcPid;
 	am_bg_writer = true;
 
 	/*
 	 * If possible, make this process a group leader, so that the postmaster
-	 * can signal any child processes too.  (bgwriter probably never has
-	 * any child processes, but for consistency we make all postmaster
-	 * child processes do this.)
+	 * can signal any child processes too.	(bgwriter probably never has any
+	 * child processes, but for consistency we make all postmaster child
+	 * processes do this.)
 	 */
 #ifdef HAVE_SETSID
 	if (setsid() < 0)
@@ -272,8 +290,6 @@ BackgroundWriterMain(void)
 	for (;;)
 	{
 		bool		do_checkpoint_smgrcloseall = false;
-		time_t		now = time(NULL);
-		long		udelay;
 
 		/*
 		 * Emergency bailout if postmaster has died.  This is to avoid the
@@ -343,83 +359,109 @@ BackgroundWriterMain(void)
 		else
 			BgBufferSync();
 
-		/*
-		 * Check for archive_timeout, if so, switch xlog files.  First we do a
-		 * quick check using possibly-stale local state.
-		 */
-		if (XLogArchiveTimeout > 0 &&
-			(int) (now - last_xlog_switch_time) >= XLogArchiveTimeout)
-		{
-			/*
-			 * Update local state ... note that last_xlog_switch_time is the
-			 * last time a switch was performed *or requested*.
-			 */
-			time_t		last_time = GetLastSegSwitchTime();
+		/* Check for archive_timeout and switch xlog files if necessary. */
+		CheckArchiveTimeout();
+
+		/* Nap for the configured time. */
+		BgWriterNap();
+	}
+}
+
+/*
+ * CheckArchiveTimeout -- check for archive_timeout and switch xlog files
+ *		if needed
+ */
+static void
+CheckArchiveTimeout(void)
+{
+	time_t		now;
+	time_t		last_time;
 
-			last_xlog_switch_time = Max(last_xlog_switch_time, last_time);
+	if (XLogArchiveTimeout <= 0)
+		return;
 
-			/* if we did a checkpoint, 'now' might be stale too */
-			if (do_checkpoint_smgrcloseall)
-				now = time(NULL);
+	now = time(NULL);
 
-			/* Now we can do the real check */
-			if ((int) (now - last_xlog_switch_time) >= XLogArchiveTimeout)
-			{
-				XLogRecPtr	switchpoint;
-
-				/* OK, it's time to switch */
-				switchpoint = RequestXLogSwitch();
-
-				/*
-				 * If the returned pointer points exactly to a segment
-				 * boundary, assume nothing happened.
-				 */
-				if ((switchpoint.xrecoff % XLogSegSize) != 0)
-					ereport(DEBUG1,
-							(errmsg("transaction log switch forced (archive_timeout=%d)",
-									XLogArchiveTimeout)));
-
-				/*
-				 * Update state in any case, so we don't retry constantly when
-				 * the system is idle.
-				 */
-				last_xlog_switch_time = now;
-			}
-		}
+	/* First we do a quick check using possibly-stale local state. */
+	if ((int) (now - last_xlog_switch_time) < XLogArchiveTimeout)
+		return;
+
+	/*
+	 * Update local state ... note that last_xlog_switch_time is the last time
+	 * a switch was performed *or requested*.
+	 */
+	last_time = GetLastSegSwitchTime();
+
+	last_xlog_switch_time = Max(last_xlog_switch_time, last_time);
+
+	/* Now we can do the real check */
+	if ((int) (now - last_xlog_switch_time) >= XLogArchiveTimeout)
+	{
+		XLogRecPtr	switchpoint;
+
+		/* OK, it's time to switch */
+		switchpoint = RequestXLogSwitch();
 
 		/*
-		 * Nap for the configured time, or sleep for 10 seconds if there is no
-		 * bgwriter activity configured.
-		 *
-		 * On some platforms, signals won't interrupt the sleep.  To ensure we
-		 * respond reasonably promptly when someone signals us, break down the
-		 * sleep into 1-second increments, and check for interrupts after each
-		 * nap.
-		 *
-		 * We absorb pending requests after each short sleep.
+		 * If the returned pointer points exactly to a segment boundary,
+		 * assume nothing happened.
 		 */
-		if ((bgwriter_all_percent > 0.0 && bgwriter_all_maxpages > 0) ||
-			(bgwriter_lru_percent > 0.0 && bgwriter_lru_maxpages > 0))
-			udelay = BgWriterDelay * 1000L;
-		else if (XLogArchiveTimeout > 0)
-			udelay = 1000000L;	/* One second */
-		else
-			udelay = 10000000L; /* Ten seconds */
-
-		while (udelay > 999999L)
-		{
-			if (got_SIGHUP || checkpoint_smgrcloseall_requested || shutdown_requested)
-				break;
-			pg_usleep(1000000L);
-			AbsorbFsyncRequests();
-			udelay -= 1000000L;
-		}
+		if ((switchpoint.xrecoff % XLogSegSize) != 0)
+			ereport(DEBUG1,
+				(errmsg("transaction log switch forced (archive_timeout=%d)",
+						XLogArchiveTimeout)));
 
-		if (!(got_SIGHUP || checkpoint_smgrcloseall_requested || shutdown_requested))
-			pg_usleep(udelay);
+		/*
+		 * Update state in any case, so we don't retry constantly when the
+		 * system is idle.
+		 */
+		last_xlog_switch_time = now;
 	}
 }
 
+/*
+ * BgWriterNap -- Nap for the configured time or until a signal is received.
+ */
+void
+BgWriterNap(void)
+{
+	long		udelay;
+
+	/*
+	 * Send off activity statistics to the stats collector
+	 */
+	pgstat_send_bgwriter();
+
+	/*
+	 * Nap for the configured time, or sleep for 10 seconds if there is no
+	 * bgwriter activity configured.
+	 *
+	 * On some platforms, signals won't interrupt the sleep.  To ensure we
+	 * respond reasonably promptly when someone signals us, break down the
+	 * sleep into 1-second increments, and check for interrupts after each
+	 * nap.
+	 *
+	 * We absorb pending requests after each short sleep.
+	 */
+	if (bgwriter_lru_maxpages > 0)
+		udelay = BgWriterDelay * 1000L;
+	else if (XLogArchiveTimeout > 0)
+		udelay = 1000000L;		/* One second */
+	else
+		udelay = 10000000L;		/* Ten seconds */
+
+	while (udelay > 999999L)
+	{
+		if (got_SIGHUP || shutdown_requested)
+			break;
+		pg_usleep(1000000L);
+		AbsorbFsyncRequests();
+		udelay -= 1000000L;
+	}
+
+	if (!(got_SIGHUP || shutdown_requested))
+		pg_usleep(udelay);
+}
 
 /* --------------------------------
  *		signal handler routines
@@ -479,21 +521,28 @@ BgWriterShmemSize(void)
 void
 BgWriterShmemInit(void)
 {
+	Size		size = BgWriterShmemSize();
 	bool		found;
 
 	BgWriterShmem = (BgWriterShmemStruct *)
 		ShmemInitStruct("Background Writer Data",
-						BgWriterShmemSize(),
+						size,
 						&found);
 	if (BgWriterShmem == NULL)
 		ereport(FATAL,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("not enough shared memory for background writer")));
-	if (found)
-		return;					/* already initialized */
 
-	MemSet(BgWriterShmem, 0, sizeof(BgWriterShmemStruct));
-	BgWriterShmem->max_requests = NBuffers;
+	if (!found)
+	{
+		/*
+		 * First time through, so initialize.  Note that we zero the whole
+		 * requests array; this is so that CompactBgwriterRequestQueue
+		 * can assume that any pad bytes in the request structs are zeroes.
+		 */
+		MemSet(BgWriterShmem, 0, size);
+		BgWriterShmem->max_requests = NBuffers;
+	}
 }
 
 /*
@@ -504,8 +553,8 @@ void
 RequestCheckpointSmgrCloseAll(void)
 {
 	/*
-	 * Send signal to request checkpoint.  When waitforit is false, we
-	 * consider failure to send the signal to be nonfatal.
+	 * Send signal to request checkpoint.  When not waiting, we consider
+	 * failure to send the signal to be nonfatal.
 	 */
 	if (BgWriterShmem->bgwriter_pid == 0)
 		elog(LOG,
@@ -522,21 +571,23 @@ RequestCheckpointSmgrCloseAll(void)
  * Whenever a backend is compelled to write directly to a relation
  * (which should be seldom, if the bgwriter is getting its job done),
  * the backend calls this routine to pass over knowledge that the relation
- * is dirty and must be fsync'd before next checkpoint.
+ * is dirty and must be fsync'd before next checkpoint.  We also use this
+ * opportunity to count such writes for statistical purposes.
  *
  * segno specifies which segment (not block!) of the relation needs to be
  * fsync'd.  (Since the valid range is much less than BlockNumber, we can
  * use high values for special flags; that's all internal to md.c, which
  * see for details.)
  *
- * If we are unable to pass over the request (at present, this can happen
- * if the shared memory queue is full), we return false.  That forces
- * the backend to do its own fsync.  We hope that will be even more seldom.
- *
- * Note: we presently make no attempt to eliminate duplicate requests
- * in the requests[] queue.  The bgwriter will have to eliminate dups
- * internally anyway, so we may as well avoid holding the lock longer
- * than we have to here.
+ * To avoid holding the lock for longer than necessary, we normally write
+ * to the requests[] queue without checking for duplicates.  The bgwriter
+ * will have to eliminate dups internally anyway.  However, if we discover
+ * that the queue is full, we make a pass over the entire queue to compact
+ * it.  This is somewhat expensive, but the alternative is for the backend
+ * to perform its own fsync, which is far more expensive in practice.  It
+ * is theoretically possible a backend fsync might still be necessary, if
+ * the queue is full and contains no duplicate entries.  In that case, we
+ * let the backend know by returning false.
  */
 bool
 ForwardFsyncRequest(RelFileNode rnode, BlockNumber segno)
@@ -545,11 +596,24 @@ ForwardFsyncRequest(RelFileNode rnode, BlockNumber segno)
 
 	if (!IsUnderPostmaster)
 		return false;			/* probably shouldn't even get here */
-	Assert(BgWriterShmem != NULL);
+
+	if (am_bg_writer)
+		elog(ERROR, "ForwardFsyncRequest must not be called in bgwriter");
 
 	LWLockAcquire(BgWriterCommLock, LW_EXCLUSIVE);
+
+	/* we count non-bgwriter writes even when the request queue overflows */
+	BgWriterShmem->num_backend_writes++;
+
+	/*
+	 * If the background writer isn't running or the request queue is full,
+	 * the backend will have to perform its own fsync request.  But before
+	 * forcing that to happen, we can try to compact the background writer
+	 * request queue.
+	 */
 	if (BgWriterShmem->bgwriter_pid == 0 ||
-		BgWriterShmem->num_requests >= BgWriterShmem->max_requests)
+		(BgWriterShmem->num_requests >= BgWriterShmem->max_requests
+		&& !CompactBgwriterRequestQueue()))
 	{
 		LWLockRelease(BgWriterCommLock);
 		return false;
@@ -561,14 +625,130 @@ ForwardFsyncRequest(RelFileNode rnode, BlockNumber segno)
 	return true;
 }
 
+/*
+ * CompactBgwriterRequestQueue
+ *		Remove duplicates from the request queue to avoid backend fsyncs.
+ *		Returns "true" if any entries were removed.
+ *
+ * Although a full fsync request queue is not common, it can lead to severe
+ * performance problems when it does happen.  So far, this situation has
+ * only been observed to occur when the system is under heavy write load,
+ * and especially during the "sync" phase of a checkpoint.	Without this
+ * logic, each backend begins doing an fsync for every block written, which
+ * gets very expensive and can slow down the whole system.
+ *
+ * Trying to do this every time the queue is full could lose if there
+ * aren't any removable entries.  But that should be vanishingly rare in
+ * practice: there's one queue entry per shared buffer.
+ */
+bool
+CompactBgwriterRequestQueue(void)
+{
+	struct BgWriterSlotMapping
+	{
+		BgWriterRequest request;
+		int			slot;
+	};
+
+	int			n,
+				preserve_count;
+	int			num_skipped = 0;
+	HASHCTL		ctl;
+	HTAB	   *htab;
+	bool	   *skip_slot;
+
+	/* must hold BgWriterCommLock in exclusive mode */
+	Assert(LWLockHeldByMe(BgWriterCommLock));
+
+	/* Initialize skip_slot array */
+	skip_slot = palloc0(sizeof(bool) * BgWriterShmem->num_requests);
+
+	/* Initialize temporary hash table */
+	MemSet(&ctl, 0, sizeof(ctl));
+	ctl.keysize = sizeof(BgWriterRequest);
+	ctl.entrysize = sizeof(struct BgWriterSlotMapping);
+	ctl.hash = tag_hash;
+	ctl.hcxt = CurrentMemoryContext;
+
+	htab = hash_create("CompactBgwriterRequestQueue",
+					   BgWriterShmem->num_requests,
+					   &ctl,
+					   HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT);
+
+	/*
+	 * The basic idea here is that a request can be skipped if it's followed
+	 * by a later, identical request.  It might seem more sensible to work
+	 * backwards from the end of the queue and check whether a request is
+	 * *preceded* by an earlier, identical request, in the hopes of doing less
+	 * copying.  But that might change the semantics, if there's an
+	 * intervening FORGET_RELATION_FSYNC or FORGET_DATABASE_FSYNC request, so
+	 * we do it this way.  It would be possible to be even smarter if we made
+	 * the code below understand the specific semantics of such requests (it
+	 * could blow away preceding entries that would end up being canceled
+	 * anyhow), but it's not clear that the extra complexity would buy us
+	 * anything.
+	 */
+	for (n = 0; n < BgWriterShmem->num_requests; n++)
+	{
+		BgWriterRequest *request;
+		struct BgWriterSlotMapping *slotmap;
+		bool		found;
+
+		/*
+		 * We use the request struct directly as a hashtable key.  This
+		 * assumes that any padding bytes in the structs are consistently the
+		 * same, which should be okay because we zeroed them in
+		 * BgWriterShmemInit.  Note also that RelFileNode had better
+		 * contain no pad bytes.
+		 */
+		request = &BgWriterShmem->requests[n];
+		slotmap = hash_search(htab, request, HASH_ENTER, &found);
+		if (found)
+		{
+			/* Duplicate, so mark the previous occurrence as skippable */
+			skip_slot[slotmap->slot] = true;
+			num_skipped++;
+		}
+		/* Remember slot containing latest occurrence of this request value */
+		slotmap->slot = n;
+	}
+
+	/* Done with the hash table. */
+	hash_destroy(htab);
+
+	/* If no duplicates, we're out of luck. */
+	if (!num_skipped)
+	{
+		pfree(skip_slot);
+		return false;
+	}
+
+	/* We found some duplicates; remove them. */
+	preserve_count = 0;
+	for (n = 0; n < BgWriterShmem->num_requests; n++)
+	{
+		if (skip_slot[n])
+			continue;
+		BgWriterShmem->requests[preserve_count++] = BgWriterShmem->requests[n];
+	}
+	ereport(DEBUG1,
+	   (errmsg("compacted fsync request queue from %d entries to %d entries",
+			   BgWriterShmem->num_requests, preserve_count)));
+	BgWriterShmem->num_requests = preserve_count;
+
+	/* Cleanup. */
+	pfree(skip_slot);
+	return true;
+}
+
 /*
  * AbsorbFsyncRequests
  *		Retrieve queued fsync requests and pass them to local smgr.
  *
  * This is exported because it must be called during CreateCheckPoint;
- * we have to be sure we have accepted all pending requests *after* we
- * establish the checkpoint REDO pointer.  Since CreateCheckPoint
- * sometimes runs in non-bgwriter processes, do nothing if not bgwriter.
+ * we have to be sure we have accepted all pending requests just before
+ * we start fsync'ing.  Since CreateCheckPoint sometimes runs in
+ * non-bgwriter processes, do nothing if not bgwriter.
  */
 void
 AbsorbFsyncRequests(void)
@@ -595,6 +775,10 @@ AbsorbFsyncRequests(void)
 	 */
 	LWLockAcquire(BgWriterCommLock, LW_EXCLUSIVE);
 
+	/* Transfer write count into pending pgstats message */
+	BgWriterStats.m_buf_written_backend += BgWriterShmem->num_backend_writes;
+	BgWriterShmem->num_backend_writes = 0;
+
 	n = BgWriterShmem->num_requests;
 	if (n > 0)
 	{
diff --git a/src/backend/postmaster/checkpoint.c b/src/backend/postmaster/checkpoint.c
index bcf5ac059176..0b479fcf4127 100755
--- a/src/backend/postmaster/checkpoint.c
+++ b/src/backend/postmaster/checkpoint.c
@@ -42,6 +42,7 @@
 #include "access/xlog_internal.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "pgstat.h"
 #include "postmaster/bgwriter.h"
 #include "storage/fd.h"
 #include "storage/freespace.h"
@@ -50,6 +51,7 @@
 #include "storage/pmsignal.h"
 #include "storage/shmem.h"
 #include "storage/smgr.h"
+#include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/guc.h"
 #include "utils/memutils.h"
@@ -64,19 +66,20 @@
  *
  * The ckpt counters allow backends to watch for completion of a checkpoint
  * request they send.  Here's how it works:
- *	* At start of a checkpoint, bgwriter increments ckpt_started.
+ *	* At start of a checkpoint, bgwriter reads (and clears) the request flags
+ *	  and increments ckpt_started, while holding ckpt_lck.
  *	* On completion of a checkpoint, bgwriter sets ckpt_done to
  *	  equal ckpt_started.
- *	* On failure of a checkpoint, bgwrite first increments ckpt_failed,
- *	  then sets ckpt_done to equal ckpt_started.
- * All three fields are declared sig_atomic_t to ensure they can be read
- * and written without explicit locking.  The algorithm for backends is:
- *	1. Record current values of ckpt_failed and ckpt_started (in that
- *	   order!).
+ *	* On failure of a checkpoint, bgwriter increments ckpt_failed
+ *	  and sets ckpt_done to equal ckpt_started.
+ *
+ * The algorithm for backends is:
+ *	1. Record current values of ckpt_failed and ckpt_started, and
+ *	   set request flags, while holding ckpt_lck.
  *	2. Send signal to request checkpoint.
  *	3. Sleep until ckpt_started changes.  Now you know a checkpoint has
  *	   begun since you started this algorithm (although *not* that it was
- *	   specifically initiated by your signal).
+ *	   specifically initiated by your signal), and that it is using your flags.
  *	4. Record new value of ckpt_started.
  *	5. Sleep until ckpt_done >= saved value of ckpt_started.  (Use modulo
  *	   arithmetic here in case counters wrap around.)  Now you know a
@@ -85,11 +88,9 @@
  *	6. If ckpt_failed is different from the originally saved value,
  *	   assume request failed; otherwise it was definitely successful.
  *
- * An additional field is ckpt_time_warn; this is also sig_atomic_t for
- * simplicity, but is only used as a boolean.  If a backend is requesting
- * a checkpoint for which a checkpoints-too-close-together warning is
- * reasonable, it should set this field TRUE just before sending the signal.
- *
+ * ckpt_flags holds the OR of the checkpoint request flags sent by all
+ * requesting backends since the last checkpoint start.  The flags are
+ * chosen so that OR'ing is the correct way to combine multiple requests.
  *----------
  */
 
@@ -97,20 +98,26 @@ typedef struct
 {
 	pid_t		checkpoint_server_pid;	/* PID of checkpoint server (0 if not started) */
 
-	sig_atomic_t ckpt_started;	/* advances when checkpoint starts */
-	sig_atomic_t ckpt_done;		/* advances when checkpoint done */
-	sig_atomic_t ckpt_failed;	/* advances when checkpoint fails */
+	slock_t		ckpt_lck;		/* protects all the ckpt_* fields */
 
-	sig_atomic_t ckpt_time_warn;	/* warn if too soon since last ckpt? */
+	int			ckpt_started;	/* advances when checkpoint starts */
+	int			ckpt_done;		/* advances when checkpoint done */
+	int			ckpt_failed;	/* advances when checkpoint fails */
+
+	int			ckpt_flags;		/* checkpoint flags, as defined in xlog.h */
 } CheckpointShmemStruct;
 
 static CheckpointShmemStruct *CheckpointShmem;
 
+/* interval for calling AbsorbFsyncRequests in CheckpointWriteDelay */
+#define WRITES_PER_ABSORB		1000
+
 /*
  * GUC parameters
  */
 int			CheckPointTimeout = 300;
 int			CheckPointWarning = 30;
+double		CheckPointCompletionTarget = 0.5;
 
 /*
  * Flags set by interrupt handlers for later service in the main loop.
@@ -126,8 +133,20 @@ static bool am_checkpoint_server = false;
 
 static bool ckpt_active = false;
 
+/* these values are valid when ckpt_active is true: */
+static time_t ckpt_start_time;
+static XLogRecPtr ckpt_start_recptr;
+static double ckpt_cached_elapsed;
+
 static time_t last_checkpoint_time;
 
+/* Prototypes for private functions */
+
+static bool IsCheckpointOnSchedule(double progress);
+static bool ImmediateCheckpointRequested(void);
+
+/* Signal handlers */
+
 static void CheckpointSigHupHandler(SIGNAL_ARGS);
 static void ReqCheckpointHandler(SIGNAL_ARGS);
 static void ReqShutdownHandler(SIGNAL_ARGS);
@@ -260,9 +279,10 @@ CheckpointMain(void)
 			/* use volatile pointer to prevent code rearrangement */
 			volatile CheckpointShmemStruct *css = CheckpointShmem;
 
+			SpinLockAcquire(&css->ckpt_lck);
 			css->ckpt_failed++;
 			css->ckpt_done = css->ckpt_started;
-			ckpt_active = false;
+			SpinLockRelease(&css->ckpt_lck);
 		}
 
 		/*
@@ -307,12 +327,9 @@ CheckpointMain(void)
 	for (;;)
 	{
 		bool		do_checkpoint = false;
-		bool		force_checkpoint = false;
+		int			flags = 0;
 		time_t		now;
 		int			elapsed_secs;
-		long		udelay;
-
-		udelay = 1000000L;	/* One second */
 
 		/*
 		 * Emergency bailout if postmaster has died.  This is to avoid the
@@ -330,7 +347,7 @@ CheckpointMain(void)
 		{
 			checkpoint_requested = false;
 			do_checkpoint = true;
-			force_checkpoint = true;
+			BgWriterStats.m_requested_checkpoints++;
 		}
 		if (shutdown_requested)
 		{
@@ -352,13 +369,20 @@ CheckpointMain(void)
 		}
 
 		/*
-		 * Do an unforced checkpoint if too much time has elapsed since the
-		 * last one.
+		 * Force a checkpoint if too much time has elapsed since the last one.
+		 * Note that we count a timed checkpoint in stats only when this
+		 * occurs without an external request, but we set the CAUSE_TIME flag
+		 * bit even if there is also an external request.
 		 */
 		now = time(NULL);
 		elapsed_secs = now - last_checkpoint_time;
 		if (elapsed_secs >= CheckPointTimeout)
+		{
+			if (!do_checkpoint)
+				BgWriterStats.m_timed_checkpoints++;
 			do_checkpoint = true;
+			flags |= CHECKPOINT_CAUSE_TIME;
+		}
 
 		/*
 		 * Do a checkpoint if requested, otherwise do one cycle of
@@ -366,28 +390,46 @@ CheckpointMain(void)
 		 */
 		if (do_checkpoint)
 		{
+			/* use volatile pointer to prevent code rearrangement */
+			volatile CheckpointShmemStruct *css = CheckpointShmem;
+
+			/*
+			 * Atomically fetch the request flags to figure out what kind of a
+			 * checkpoint we should perform, and increase the started-counter
+			 * to acknowledge that we've started a new checkpoint.
+			 */
+			SpinLockAcquire(&css->ckpt_lck);
+			flags |= css->ckpt_flags;
+			css->ckpt_flags = 0;
+			css->ckpt_started++;
+			SpinLockRelease(&css->ckpt_lck);
+
 			/*
 			 * We will warn if (a) too soon since last checkpoint (whatever
-			 * caused it) and (b) somebody has set the ckpt_time_warn flag
+			 * caused it) and (b) somebody set the CHECKPOINT_CAUSE_XLOG flag
 			 * since the last checkpoint start.  Note in particular that this
 			 * implementation will not generate warnings caused by
 			 * CheckPointTimeout < CheckPointWarning.
 			 */
-			if (CheckpointShmem->ckpt_time_warn &&
+			if ((flags & CHECKPOINT_CAUSE_XLOG) &&
 				elapsed_secs < CheckPointWarning)
 				ereport(LOG,
 						(errmsg("checkpoints are occurring too frequently (%d seconds apart)",
 								elapsed_secs),
 						 errhint("Consider increasing the configuration parameter \"checkpoint_segments\".")));
-			CheckpointShmem->ckpt_time_warn = false;
 
 			/*
-			 * Indicate checkpoint start to any waiting backends.
+			 * Initialize bgwriter-private variables used during checkpoint.
 			 */
 			ckpt_active = true;
-			CheckpointShmem->ckpt_started++;
+			ckpt_start_recptr = GetInsertRecPtr();
+			ckpt_start_time = now;
+			ckpt_cached_elapsed = 0;
 
-			CreateCheckPoint(false, force_checkpoint);
+			/*
+			 * Do the checkpoint.
+			 */
+			CreateCheckPoint(flags);
 
 			/*
 			 * After any checkpoint, close all smgr files.	This is so we
@@ -403,7 +445,10 @@ CheckpointMain(void)
 			/*
 			 * Indicate checkpoint completion to any waiting backends.
 			 */
-			CheckpointShmem->ckpt_done = CheckpointShmem->ckpt_started;
+			SpinLockAcquire(&css->ckpt_lck);
+			css->ckpt_done = css->ckpt_started;
+			SpinLockRelease(&css->ckpt_lck);
+
 			ckpt_active = false;
 
 			/*
@@ -414,9 +459,167 @@ CheckpointMain(void)
 			last_checkpoint_time = now;
 		}
 
+		/* Nap for one second. */
 		if (!(got_SIGHUP || checkpoint_requested || shutdown_requested))
-			pg_usleep(udelay);
+			pg_usleep(1000000L);
+	}
+}
+
+/*
+ * Returns true if an immediate checkpoint request is pending.	(Note that
+ * this does not check the *current* checkpoint's IMMEDIATE flag, but whether
+ * there is one pending behind it.)
+ */
+static bool
+ImmediateCheckpointRequested(void)
+{
+	if (checkpoint_requested)
+	{
+		volatile CheckpointShmemStruct *css = CheckpointShmem;
+
+		/*
+		 * We don't need to acquire the ckpt_lck in this case because we're
+		 * only looking at a single flag bit.
+		 */
+		if (css->ckpt_flags & CHECKPOINT_IMMEDIATE)
+			return true;
+	}
+	return false;
+}
+
+/*
+ * CheckpointWriteDelay -- yield control to bgwriter during a checkpoint
+ *
+ * This function is called after each page write performed by BufferSync().
+ * It is responsible for keeping the bgwriter's normal activities in
+ * progress during a long checkpoint, and for throttling BufferSync()'s
+ * write rate to hit checkpoint_completion_target.
+ *
+ * The checkpoint request flags should be passed in; currently the only one
+ * examined is CHECKPOINT_IMMEDIATE, which disables delays between writes.
+ *
+ * 'progress' is an estimate of how much of the work has been done, as a
+ * fraction between 0.0 meaning none, and 1.0 meaning all done.
+ */
+void
+CheckpointWriteDelay(int flags, double progress)
+{
+	static int	absorb_counter = WRITES_PER_ABSORB;
+
+	/* Do nothing if checkpoint is being executed by non-checkpointer process */
+	if (!am_checkpoint_server)
+		return;
+
+	/*
+	 * Take a nap, unless we're behind
+	 * schedule, in which case we just try to catch up as quickly as possible.
+	 */
+	if (!(flags & CHECKPOINT_IMMEDIATE) &&
+		!shutdown_requested &&
+		!ImmediateCheckpointRequested() &&
+		IsCheckpointOnSchedule(progress))
+	{
+		if (got_SIGHUP)
+		{
+			got_SIGHUP = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
+
+		AbsorbFsyncRequests();
+		absorb_counter = WRITES_PER_ABSORB;
+
+		/*
+		 * Report interim activity statistics to the stats collector.
+		 */
+		pgstat_send_bgwriter();
+
+		/*
+		 * This sleep used to be connected to bgwriter_delay, typically 200ms.
+		 * That resulted in more frequent wakeups if not much work to do.
+		 * Checkpointer and bgwriter are no longer related so take the Big
+		 * Sleep.
+		 */
+		pg_usleep(100000L);
+	}
+	else if (--absorb_counter <= 0)
+	{
+		/*
+		 * Absorb pending fsync requests after each WRITES_PER_ABSORB write
+		 * operations even when we don't sleep, to prevent overflow of the
+		 * fsync request queue.
+		 */
+		AbsorbFsyncRequests();
+		absorb_counter = WRITES_PER_ABSORB;
+	}
+}
+
+/*
+ * IsCheckpointOnSchedule -- are we on schedule to finish this checkpoint
+ *		 in time?
+ *
+ * Compares the current progress against the time/segments elapsed since last
+ * checkpoint, and returns true if the progress we've made this far is greater
+ * than the elapsed time/segments.
+ */
+static bool
+IsCheckpointOnSchedule(double progress)
+{
+	XLogRecPtr	recptr;
+	struct timeval now;
+	double		elapsed_xlogs,
+				elapsed_time;
+
+	Assert(ckpt_active);
+
+	/* Scale progress according to checkpoint_completion_target. */
+	progress *= CheckPointCompletionTarget;
+
+	/*
+	 * Check against the cached value first. Only do the more expensive
+	 * calculations once we reach the target previously calculated. Since
+	 * neither time or WAL insert pointer moves backwards, a freshly
+	 * calculated value can only be greater than or equal to the cached value.
+	 */
+	if (progress < ckpt_cached_elapsed)
+		return false;
+
+	/*
+	 * Check progress against WAL segments written and checkpoint_segments.
+	 *
+	 * We compare the current WAL insert location against the location
+	 * computed before calling CreateCheckPoint. The code in XLogInsert that
+	 * actually triggers a checkpoint when checkpoint_segments is exceeded
+	 * compares against RedoRecptr, so this is not completely accurate.
+	 * However, it's good enough for our purposes, we're only calculating an
+	 * estimate anyway.
+	 */
+	recptr = GetInsertRecPtr();
+	elapsed_xlogs =
+		(((double) (int32) (recptr.xlogid - ckpt_start_recptr.xlogid)) * XLogSegsPerFile +
+		 ((double) recptr.xrecoff - (double) ckpt_start_recptr.xrecoff) / XLogSegSize) /
+		CheckPointSegments;
+
+	if (progress < elapsed_xlogs)
+	{
+		ckpt_cached_elapsed = elapsed_xlogs;
+		return false;
 	}
+
+	/*
+	 * Check progress against time elapsed and checkpoint_timeout.
+	 */
+	gettimeofday(&now, NULL);
+	elapsed_time = ((double) (now.tv_sec - ckpt_start_time) +
+					now.tv_usec / 1000000.0) / CheckPointTimeout;
+
+	if (progress < elapsed_time)
+	{
+		ckpt_cached_elapsed = elapsed_time;
+		return false;
+	}
+
+	/* It looks like we're on schedule. */
+	return true;
 }
 
 
@@ -487,34 +690,42 @@ CheckpointShmemInit(void)
 		return;					/* already initialized */
 
 	MemSet(CheckpointShmem, 0, sizeof(CheckpointShmemStruct));
+	SpinLockInit(&CheckpointShmem->ckpt_lck);
 }
 
 /*
  * RequestCheckpoint
- *		Called in backend processes to request an immediate checkpoint
- *
- * If waitforit is true, wait until the checkpoint is completed
- * before returning; otherwise, just signal the request and return
- * immediately.
+ *		Called in backend processes to request a checkpoint
  *
- * If warnontime is true, and it's "too soon" since the last checkpoint,
- * the bgwriter will log a warning.  This should be true only for checkpoints
- * caused due to xlog filling, else the warning will be misleading.
+ * flags is a bitwise OR of the following:
+ *	CHECKPOINT_IS_SHUTDOWN: checkpoint is for database shutdown.
+ *	CHECKPOINT_IMMEDIATE: finish the checkpoint ASAP,
+ *		ignoring checkpoint_completion_target parameter.
+ *	CHECKPOINT_FORCE: force a checkpoint even if no XLOG activity has occured
+ *		since the last one (implied by CHECKPOINT_IS_SHUTDOWN).
+ *	CHECKPOINT_WAIT: wait for completion before returning (otherwise,
+ *		just signal bgwriter to do it, and return).
+ *	CHECKPOINT_CAUSE_XLOG: checkpoint is requested due to xlog filling.
+ *		(This affects logging, and in particular enables CheckPointWarning.)
  */
 void
-RequestCheckpoint(bool waitforit, bool warnontime)
+RequestCheckpoint(int flags)
 {
 	/* use volatile pointer to prevent code rearrangement */
 	volatile CheckpointShmemStruct *css = CheckpointShmem;
-	sig_atomic_t old_failed = css->ckpt_failed;
-	sig_atomic_t old_started = css->ckpt_started;
+	int			old_failed,
+				old_started;
 
 	/*
 	 * If in a standalone backend, just do it ourselves.
 	 */
 	if (!IsPostmasterEnvironment)
 	{
-		CreateCheckPoint(false, true);
+		/*
+		 * There's no point in doing slow checkpoints in a standalone backend,
+		 * because there's no other backends the checkpoint could disrupt.
+		 */
+		CreateCheckPoint(flags | CHECKPOINT_IMMEDIATE);
 
 		/*
 		 * After any checkpoint, close all smgr files.	This is so we won't
@@ -525,49 +736,77 @@ RequestCheckpoint(bool waitforit, bool warnontime)
 		return;
 	}
 
-	/* Set warning request flag if appropriate */
-	if (warnontime)
-		css->ckpt_time_warn = true;
+	/*
+	 * Atomically set the request flags, and take a snapshot of the counters.
+	 * When we see ckpt_started > old_started, we know the flags we set here
+	 * have been seen by bgwriter.
+	 *
+	 * Note that we OR the flags with any existing flags, to avoid overriding
+	 * a "stronger" request by another backend.  The flag senses must be
+	 * chosen to make this work!
+	 */
+	SpinLockAcquire(&css->ckpt_lck);
+
+	old_failed = css->ckpt_failed;
+	old_started = css->ckpt_started;
+	css->ckpt_flags |= flags;
+
+	SpinLockRelease(&css->ckpt_lck);
 
 	/*
-	 * Send signal to request checkpoint.  When waitforit is false, we
-	 * consider failure to send the signal to be nonfatal.
+	 * Send signal to request checkpoint.  When not waiting, we consider
+	 * failure to send the signal to be nonfatal.
 	 */
 	if (CheckpointShmem->checkpoint_server_pid == 0)
-		elog(waitforit ? ERROR : LOG,
+		elog((flags & CHECKPOINT_WAIT) ? ERROR : LOG,
 			 "could not request checkpoint because checkpoint server not running");
 	if (kill(CheckpointShmem->checkpoint_server_pid, SIGINT) != 0)
-		elog(waitforit ? ERROR : LOG,
+		elog((flags & CHECKPOINT_WAIT) ? ERROR : LOG,
 			 "could not signal for checkpoint: %m");
 
 	/*
 	 * If requested, wait for completion.  We detect completion according to
 	 * the algorithm given above.
 	 */
-	if (waitforit)
+	if (flags & CHECKPOINT_WAIT)
 	{
-		while (css->ckpt_started == old_started)
+		int			new_started,
+					new_failed;
+
+		/* Wait for a new checkpoint to start. */
+		for (;;)
 		{
+			SpinLockAcquire(&css->ckpt_lck);
+			new_started = css->ckpt_started;
+			SpinLockRelease(&css->ckpt_lck);
+
+			if (new_started != old_started)
+				break;
+
 			CHECK_FOR_INTERRUPTS();
 			pg_usleep(100000L);
 		}
-		old_started = css->ckpt_started;
 
 		/*
-		 * We are waiting for ckpt_done >= old_started, in a modulo sense.
-		 * This is a little tricky since we don't know the width or signedness
-		 * of sig_atomic_t.  We make the lowest common denominator assumption
-		 * that it is only as wide as "char".  This means that this algorithm
-		 * will cope correctly as long as we don't sleep for more than 127
-		 * completed checkpoints.  (If we do, we will get another chance to
-		 * exit after 128 more checkpoints...)
+		 * We are waiting for ckpt_done >= new_started, in a modulo sense.
 		 */
-		while (((signed char) (css->ckpt_done - old_started)) < 0)
+		for (;;)
 		{
+			int			new_done;
+
+			SpinLockAcquire(&css->ckpt_lck);
+			new_done = css->ckpt_done;
+			new_failed = css->ckpt_failed;
+			SpinLockRelease(&css->ckpt_lck);
+
+			if (new_done - new_started >= 0)
+				break;
+
 			CHECK_FOR_INTERRUPTS();
 			pg_usleep(100000L);
 		}
-		if (css->ckpt_failed != old_failed)
+
+		if (new_failed != old_failed)
 			ereport(ERROR,
 					(errmsg("checkpoint request failed"),
 					 errhint("Consult recent messages in the server log for details.")));
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
index 1f20e5fa0bdf..71a7c2b5ee85 100644
--- a/src/backend/postmaster/pgarch.c
+++ b/src/backend/postmaster/pgarch.c
@@ -19,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.29 2007/02/10 14:58:54 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.38.2.1 2010/05/11 16:42:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -77,12 +77,15 @@
  * ----------
  */
 static time_t last_pgarch_start_time;
+static time_t last_sigterm_time = 0;
 
 /*
  * Flags set by interrupt handlers for later service in the main loop.
  */
 static volatile sig_atomic_t got_SIGHUP = false;
+static volatile sig_atomic_t got_SIGTERM = false;
 static volatile sig_atomic_t wakened = false;
+static volatile sig_atomic_t ready_to_stop = false;
 
 /* ----------
  * Local function forward declarations
@@ -95,7 +98,9 @@ static pid_t pgarch_forkexec(void);
 NON_EXEC_STATIC void PgArchiverMain(int argc, char *argv[]);
 static void pgarch_exit(SIGNAL_ARGS);
 static void ArchSigHupHandler(SIGNAL_ARGS);
+static void ArchSigTermHandler(SIGNAL_ARGS);
 static void pgarch_waken(SIGNAL_ARGS);
+static void pgarch_waken_stop(SIGNAL_ARGS);
 static void pgarch_MainLoop(void);
 static void pgarch_ArchiverCopyLoop(void);
 static bool pgarch_archiveXlog(char *xlog);
@@ -225,6 +230,8 @@ PgArchiverMain(int argc, char *argv[])
 	
 	MyStartTime = time(NULL);	/* record Start Time for logging */
 
+	MyStartTime = time(NULL);	/* record Start Time for logging */
+
 	/*
 	 * If possible, make this process a group leader, so that the postmaster
 	 * can signal any child processes too.
@@ -236,16 +243,16 @@ PgArchiverMain(int argc, char *argv[])
 
 	/*
 	 * Ignore all signals usually bound to some action in the postmaster,
-	 * except for SIGHUP, SIGUSR1 and SIGQUIT.
+	 * except for SIGHUP, SIGTERM, SIGUSR1, SIGUSR2, and SIGQUIT.
 	 */
 	pqsignal(SIGHUP, ArchSigHupHandler);
 	pqsignal(SIGINT, SIG_IGN);
-	pqsignal(SIGTERM, SIG_IGN);
+	pqsignal(SIGTERM, ArchSigTermHandler);
 	pqsignal(SIGQUIT, pgarch_exit);
 	pqsignal(SIGALRM, SIG_IGN);
 	pqsignal(SIGPIPE, SIG_IGN);
 	pqsignal(SIGUSR1, pgarch_waken);
-	pqsignal(SIGUSR2, SIG_IGN);
+	pqsignal(SIGUSR2, pgarch_waken_stop);
 	pqsignal(SIGCHLD, SIG_DFL);
 	pqsignal(SIGTTIN, SIG_DFL);
 	pqsignal(SIGTTOU, SIG_DFL);
@@ -267,11 +274,6 @@ PgArchiverMain(int argc, char *argv[])
 static void
 pgarch_exit(SIGNAL_ARGS)
 {
-	/*
-	 * For now, we just nail the doors shut and get out of town.  It might
-	 * seem cleaner to finish up any pending archive copies, but there's a
-	 * nontrivial risk that init will kill us partway through.
-	 */
 	/* SIGQUIT means curl up and die ... */
 	exit(1);
 }
@@ -284,6 +286,19 @@ ArchSigHupHandler(SIGNAL_ARGS)
 	got_SIGHUP = true;
 }
 
+/* SIGTERM signal handler for archiver process */
+static void
+ArchSigTermHandler(SIGNAL_ARGS)
+{
+	/*
+	 * The postmaster never sends us SIGTERM, so we assume that this means
+	 * that init is trying to shut down the whole system.  If we hang around
+	 * too long we'll get SIGKILL'd.  Set flag to prevent starting any more
+	 * archive commands.
+	 */
+	got_SIGTERM = true;
+}
+
 /* SIGUSR1 signal handler for archiver process */
 static void
 pgarch_waken(SIGNAL_ARGS)
@@ -292,6 +307,14 @@ pgarch_waken(SIGNAL_ARGS)
 	wakened = true;
 }
 
+/* SIGUSR2 signal handler for archiver process */
+static void
+pgarch_waken_stop(SIGNAL_ARGS)
+{
+	/* set flag to do a final cycle and shut down afterwards */
+	ready_to_stop = true;
+}
+
 /*
  * pgarch_MainLoop
  *
@@ -301,6 +324,7 @@ static void
 pgarch_MainLoop(void)
 {
 	time_t		last_copy_time = 0;
+	bool		time_to_stop;
 
 	/*
 	 * We run the copy loop immediately upon entry, in case there are
@@ -312,17 +336,36 @@ pgarch_MainLoop(void)
 
 	do
 	{
+		/* When we get SIGUSR2, we do one more archive cycle, then exit */
+		time_to_stop = ready_to_stop;
+
 		/* Check for config update */
 		if (got_SIGHUP)
 		{
 			got_SIGHUP = false;
 			ProcessConfigFile(PGC_SIGHUP);
-			if (!XLogArchivingActive())
-				break;			/* user wants us to shut down */
+		}
+
+		/*
+		 * If we've gotten SIGTERM, we normally just sit and do nothing until
+		 * SIGUSR2 arrives.  However, that means a random SIGTERM would
+		 * disable archiving indefinitely, which doesn't seem like a good
+		 * idea.  If more than 60 seconds pass since SIGTERM, exit anyway,
+		 * so that the postmaster can start a new archiver if needed.
+		 */
+		if (got_SIGTERM)
+		{
+			time_t		curtime = time(NULL);
+
+			if (last_sigterm_time == 0)
+				last_sigterm_time = curtime;
+			else if ((unsigned int) (curtime - last_sigterm_time) >=
+					 (unsigned int) 60)
+				break;
 		}
 
 		/* Do what we're here for */
-		if (wakened)
+		if (wakened || time_to_stop)
 		{
 			wakened = false;
 			pgarch_ArchiverCopyLoop();
@@ -339,7 +382,8 @@ pgarch_MainLoop(void)
 		 * sleep into 1-second increments, and check for interrupts after each
 		 * nap.
 		 */
-		while (!(wakened || got_SIGHUP))
+		while (!(wakened || ready_to_stop || got_SIGHUP ||
+				 !PostmasterIsAlive(true)))
 		{
 			time_t		curtime;
 
@@ -349,7 +393,13 @@ pgarch_MainLoop(void)
 				(unsigned int) PGARCH_AUTOWAKE_INTERVAL)
 				wakened = true;
 		}
-	} while (PostmasterIsAlive(true));
+
+		/*
+		 * The archiver quits either when the postmaster dies (not expected)
+		 * or after completing one more archiving cycle after receiving
+		 * SIGUSR2.
+		 */
+	} while (PostmasterIsAlive(true) && !time_to_stop);
 }
 
 /*
@@ -374,10 +424,35 @@ pgarch_ArchiverCopyLoop(void)
 
 		for (;;)
 		{
-			/* Abandon processing if we notice our postmaster has died */
-			if (!PostmasterIsAlive(true))
+			/*
+			 * Do not initiate any more archive commands after receiving
+			 * SIGTERM, nor after the postmaster has died unexpectedly.
+			 * The first condition is to try to keep from having init
+			 * SIGKILL the command, and the second is to avoid conflicts
+			 * with another archiver spawned by a newer postmaster.
+			 */
+			if (got_SIGTERM || !PostmasterIsAlive(true))
 				return;
 
+			/*
+			 * Check for config update.  This is so that we'll adopt a new
+			 * setting for archive_command as soon as possible, even if there
+			 * is a backlog of files to be archived.
+			 */
+			if (got_SIGHUP)
+			{
+				got_SIGHUP = false;
+				ProcessConfigFile(PGC_SIGHUP);
+			}
+
+			/* can't do anything if no command ... */
+			if (!XLogArchiveCommandSet())
+			{
+				ereport(WARNING,
+						(errmsg("archive_mode enabled, yet archive_command is not set")));
+				return;
+			}
+
 			if (pgarch_archiveXlog(xlog))
 			{
 				/* successful */
@@ -411,6 +486,7 @@ pgarch_archiveXlog(char *xlog)
 {
 	char		xlogarchcmd[MAXPGPATH];
 	char		pathname[MAXPGPATH];
+	char		activitymsg[MAXFNAMELEN + 16];
 	char	   *dp;
 	char	   *endp;
 	const char *sp;
@@ -473,30 +549,78 @@ pgarch_archiveXlog(char *xlog)
 	ereport(DEBUG3,
 			(errmsg_internal("executing archive command \"%s\"",
 							 xlogarchcmd)));
+
+	/* Report archive activity in PS display */
+	snprintf(activitymsg, sizeof(activitymsg), "archiving %s", xlog);
+	set_ps_display(activitymsg, false);
+
 	rc = system(xlogarchcmd);
 	if (rc != 0)
 	{
 		/*
 		 * If either the shell itself, or a called command, died on a signal,
-		 * abort the archiver.  We do this because system() ignores SIGINT and
+		 * abort the archiver.	We do this because system() ignores SIGINT and
 		 * SIGQUIT while waiting; so a signal is very likely something that
-		 * should have interrupted us too.  If we overreact it's no big deal,
+		 * should have interrupted us too.	If we overreact it's no big deal,
 		 * the postmaster will just start the archiver again.
 		 *
 		 * Per the Single Unix Spec, shells report exit status > 128 when a
 		 * called command died on a signal.
 		 */
-		bool	signaled = WIFSIGNALED(rc) || WEXITSTATUS(rc) > 128;
+		int		lev = (WIFSIGNALED(rc) || WEXITSTATUS(rc) > 128) ? FATAL : LOG;
 
-		ereport(signaled ? FATAL : LOG,
-				(errmsg("archive command \"%s\" failed: return code %d",
-						xlogarchcmd, rc)));
+		if (WIFEXITED(rc))
+		{
+			ereport(lev,
+					(errmsg("archive command failed with exit code %d",
+							WEXITSTATUS(rc)),
+					 errdetail("The failed archive command was: %s",
+							   xlogarchcmd)));
+		}
+		else if (WIFSIGNALED(rc))
+		{
+#if defined(WIN32)
+			ereport(lev,
+					(errmsg("archive command was terminated by exception 0x%X",
+							WTERMSIG(rc)),
+					 errhint("See C include file \"ntstatus.h\" for a description of the hexadecimal value."),
+					 errdetail("The failed archive command was: %s",
+							   xlogarchcmd)));
+#elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST
+			ereport(lev,
+					(errmsg("archive command was terminated by signal %d: %s",
+							WTERMSIG(rc),
+							WTERMSIG(rc) < NSIG ? sys_siglist[WTERMSIG(rc)] : "(unknown)"),
+					 errdetail("The failed archive command was: %s",
+							   xlogarchcmd)));
+#else
+			ereport(lev,
+					(errmsg("archive command was terminated by signal %d",
+							WTERMSIG(rc)),
+					 errdetail("The failed archive command was: %s",
+							   xlogarchcmd)));
+#endif
+		}
+		else
+		{
+			ereport(lev,
+					(errmsg("archive command exited with unrecognized status %d",
+							rc),
+					 errdetail("The failed archive command was: %s",
+							   xlogarchcmd)));
+		}
+
+		snprintf(activitymsg, sizeof(activitymsg), "failed on %s", xlog);
+		set_ps_display(activitymsg, false);
 
 		return false;
 	}
-	ereport(LOG,
+	ereport(DEBUG1,
 			(errmsg("archived transaction log file \"%s\"", xlog)));
 
+	snprintf(activitymsg, sizeof(activitymsg), "last was %s", xlog);
+	set_ps_display(activitymsg, false);
+
 	return true;
 }
 
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 3b777bced0e6..21909e5f539a 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -13,7 +13,7 @@
  *
  *	Copyright (c) 2001-2009, PostgreSQL Global Development Group
  *
- *    $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.151 2007/03/28 22:17:12 alvherre Exp $ 
+ *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.169.2.2 2009/10/02 22:50:03 tgl Exp $
  * ----------
  */
 #include "postgres.h"
@@ -157,7 +157,7 @@ static bool pgStatRunningInCollector = false;
  * repeatedly opened during a transaction.
  */
 #define TABSTAT_QUANTUM		100 /* we alloc this many at a time */
- 
+
 typedef struct TabStatusArray
 {
 	struct TabStatusArray *tsa_next;	/* link to next array, if any */
@@ -548,9 +548,7 @@ pgstat_init(void)
 	 * use PGC_S_OVERRIDE because there is no point in trying to turn it back
 	 * on from postgresql.conf without a restart.
 	 */
-
 	SetConfigOption("track_counts", "off", PGC_INTERNAL, PGC_S_OVERRIDE);
-	pgstat_track_counts = false;
 	pgstat_collect_queuelevel = false;
 }
 
@@ -700,8 +698,8 @@ pgstat_report_stat(bool force)
 	int			i;
 
 	/* Don't expend a clock check if nothing to do */
-	if ((pgStatTabList == NULL || pgStatTabList->tsa_used == 0)
-		&& !have_function_stats)
+	if ((pgStatTabList == NULL || pgStatTabList->tsa_used == 0) &&
+		!have_function_stats)
 		return;
 
 	/*
@@ -776,16 +774,16 @@ pgstat_report_stat(bool force)
 
 	/* Now, send function statistics */
 	pgstat_send_funcstats();
-	}
+}
 
-	/*
+/*
  * Subroutine for pgstat_report_stat: finish and send a tabstat message
-	 */
+ */
 static void
 pgstat_send_tabstat(PgStat_MsgTabstat *tsmsg)
-	{
-		int			n;
-		int			len;
+{
+	int			n;
+	int			len;
 
 	/* It's unlikely we'd get here with no socket, but maybe not impossible */
 	if (pgStatSock < 0)
@@ -808,13 +806,13 @@ pgstat_send_tabstat(PgStat_MsgTabstat *tsmsg)
 		tsmsg->m_xact_rollback = 0;
 	}
 
-		n = tsmsg->m_nentries;
-		len = offsetof(PgStat_MsgTabstat, m_entry[0]) +
-			n * sizeof(PgStat_TableEntry);
+	n = tsmsg->m_nentries;
+	len = offsetof(PgStat_MsgTabstat, m_entry[0]) +
+		n * sizeof(PgStat_TableEntry);
 
-		pgstat_setheader(&tsmsg->m_hdr, PGSTAT_MTYPE_TABSTAT);
-		pgstat_send(tsmsg, len);
-	}
+	pgstat_setheader(&tsmsg->m_hdr, PGSTAT_MTYPE_TABSTAT);
+	pgstat_send(tsmsg, len);
+}
 
 /*
  * Subroutine for pgstat_report_stat: populate and send a function stat message
@@ -1218,7 +1216,7 @@ pgstat_report_vacuum(Oid tableoid, bool shared, bool scanned_all,
 	msg.m_tableoid = tableoid;
 	msg.m_scanned_all = scanned_all;
 	msg.m_analyze = analyze;
-	msg.m_autovacuum = IsAutoVacuumWorkerProcess();	/* is this autovacuum? */
+	msg.m_autovacuum = IsAutoVacuumWorkerProcess();		/* is this autovacuum? */
 	msg.m_vacuumtime = GetCurrentTimestamp();
 	msg.m_tuples = tuples;
 	pgstat_send(&msg, sizeof(msg));
@@ -1240,14 +1238,14 @@ pgstat_report_analyze(Relation rel, PgStat_Counter livetuples,
 		return;
 
 	/*
-	 * Unlike VACUUM, ANALYZE might be running inside a transaction that has
-	 * already inserted and/or deleted rows in the target table. ANALYZE will
-	 * have counted such rows as live or dead respectively. Because we will
-	 * report our counts of such rows at transaction end, we should subtract
-	 * off these counts from what we send to the collector now, else they'll
-	 * be double-counted after commit.	(This approach also ensures that the
-	 * collector ends up with the right numbers if we abort instead of
-	 * committing.)
+	 * Unlike VACUUM, ANALYZE might be running inside a transaction that
+	 * has already inserted and/or deleted rows in the target table.
+	 * ANALYZE will have counted such rows as live or dead respectively.
+	 * Because we will report our counts of such rows at transaction end,
+	 * we should subtract off these counts from what we send to the collector
+	 * now, else they'll be double-counted after commit.  (This approach also
+	 * ensures that the collector ends up with the right numbers if we abort
+	 * instead of committing.)
 	 */
 	if (rel->pgstat_info != NULL)
 	{
@@ -1681,7 +1679,7 @@ AtEOXact_PgStat(bool isCommit)
 	 * in case the reporting message isn't sent right away.)
 	 */
 	if (isCommit)
-	pgStatXactCommit++;
+		pgStatXactCommit++;
 	else
 		pgStatXactRollback++;
 
@@ -1807,7 +1805,7 @@ AtEOSubXact_PgStat(bool isCommit, int nestDepth)
  *
  * In this phase we just generate 2PC records for all the pending
  * transaction-dependent stats work.
-	 */
+ */
 void
 AtPrepare_PgStat(void)
 {
@@ -2204,8 +2202,7 @@ pgstat_initialize(void)
  * pgstat_bestart() -
  *
  *	Initialize this backend's entry in the PgBackendStatus array.
- *	Called from InitPostgres.
- *	MyDatabaseId, session userid, and application_name must be set
+ *	Called from InitPostgres.  MyDatabaseId and session userid must be set
  *	(hence, this cannot be combined with pgstat_initialize).
  * ----------
  */
@@ -2275,13 +2272,6 @@ pgstat_bestart(void)
 	 */
 	pgstat_init_localportalhash();
 	
-
-	/*
-	 * GPDB: Set up a process-exit hook to clean up.
-	 */
-	on_shmem_exit(pgstat_beshutdown_hook, 0);
-	
-	
 	/* Update app name to current GUC setting */
 	if (application_name)
 		pgstat_report_appname(application_name);
@@ -2308,7 +2298,7 @@ pgstat_beshutdown_hook(int code, Datum arg)
 	 * during failed backend starts might never get counted.)
 	 */
 	if (OidIsValid(MyDatabaseId))
-	    pgstat_report_stat(true);
+		pgstat_report_stat(true);
 
 	/*
 	 * Clear my status entry, following the protocol of bumping st_changecount
@@ -2339,8 +2329,6 @@ pgstat_report_activity(const char *cmd_str)
 	TimestampTz start_timestamp;
 	int			len;
 
-	// TRACE_POSTGRESQL_STATEMENT_STATUS(cmd_str);
-
 	if (!pgstat_track_activities || !beentry)
 		return;
 
@@ -2448,6 +2436,7 @@ pgstat_report_waiting(char waiting)
 	beentry->st_waiting = waiting;
 }
 
+
 /* ----------
  * pgstat_read_current_status() -
  *
@@ -2861,9 +2850,9 @@ PgstatCollectorMain(int argc, char *argv[])
 
 		got_data = FD_ISSET(pgStatSock, &rfds);
 #endif   /* HAVE_POLL */
-#else /* WIN32 */
+#else							/* WIN32 */
 		got_data = pgwin32_waitforsinglesocket(pgStatSock, FD_READ,
-											   PGSTAT_SELECT_TIMEOUT*1000);
+											   PGSTAT_SELECT_TIMEOUT * 1000);
 #endif
 
 		/*
@@ -3136,11 +3125,11 @@ pgstat_write_statsfile(bool permanent)
 		{
 			fputc('F', fpout);
 			fwrite(funcentry, sizeof(PgStat_StatFuncEntry), 1, fpout);
-	}
+		}
 
-	/*
+		/*
 		 * Mark the end of this DB
-	 */
+		 */
 		fputc('d', fpout);
 	}
 
@@ -3248,7 +3237,6 @@ pgstat_read_statsfile(Oid onlydb, bool permanent)
 	 */
 	memset(&globalStats, 0, sizeof(globalStats));
 
-
 	/**
 	 ** Create the Queue hashtable
 	 **/
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index e29feb188370..5bc8e0081a47 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -38,7 +38,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.525 2007/02/16 17:06:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.551.2.6 2010/04/01 20:12:34 heikki Exp $
  *
  * NOTES
  *
@@ -260,6 +260,7 @@ static pid_t StartupPID = 0,
 			StartupPass3PID = 0,
 			StartupPass4PID = 0,
 			BgWriterPID = 0,
+			WalWriterPID = 0,
 			CheckpointPID = 0,
 			WalReceiverPID = 0,
 			AutoVacPID = 0,
@@ -472,15 +473,15 @@ static PMSubProc PMSubProcList[MaxPMSubType] =
 	"stats sender process", PMSUBPROC_FLAG_QD_AND_QE, true},
 };
 
-
 bool		ClientAuthInProgress = false;		/* T during new-client
 												 * authentication */
 
 bool		redirection_done = false;	/* stderr redirected for syslogger? */
 
-static volatile bool force_autovac = false; /* received START_AUTOVAC signal */
 /* received START_AUTOVAC_LAUNCHER signal */
-static bool start_autovac_launcher = false;
+static volatile sig_atomic_t start_autovac_launcher = false;
+/* the launcher needs to be signalled to communicate some condition */
+static volatile bool		avlauncher_needs_signal = false;
 
 /*
  * State for assigning random salts and cancel keys.
@@ -494,8 +495,9 @@ extern char *optarg;
 extern int	optind,
 			opterr;
 
-#ifdef HAVE_INT_OPTRESET
-extern int	optreset;			/* might not be declared by system headers */
+/* If not HAVE_GETOPT, we are using src/port/getopt.c, which has optreset */
+#if defined(HAVE_INT_OPTRESET) || !defined(HAVE_GETOPT)
+extern int	optreset;
 #endif
 
 /* some GUC values used in fetching status from status transition */
@@ -596,7 +598,7 @@ typedef struct
 	HANDLE		waitHandle;
 	HANDLE		procHandle;
 	DWORD		procId;
-} win32_deadchild_waitinfo;
+}	win32_deadchild_waitinfo;
 
 #endif
 
@@ -641,6 +643,7 @@ typedef struct
 	pid_t		PostmasterPid;
 	TimestampTz PgStartTime;
 	TimestampTz PgReloadTime;
+	pg_time_t	first_syslogger_file_time;
 	bool		redirection_done;
 #ifdef WIN32
 	HANDLE		PostmasterHandle;
@@ -676,8 +679,9 @@ static void ShmemBackendArrayRemove(Backend *bn);
 #define StartupPass4DataBase()	StartChildProcess(StartupPass4Process)
 #define StartBackgroundWriter() StartChildProcess(BgWriterProcess)
 #define StartCheckpointServer() StartChildProcess(CheckpointProcess)
-#define StartWalReceiver() StartChildProcess(WalReceiverProcess)
-#define StartFilerepProcess() StartChildProcess(FilerepProcess)
+#define StartWalWriter()		StartChildProcess(WalWriterProcess)
+#define StartWalReceiver()		StartChildProcess(WalReceiverProcess)
+#define StartFilerepProcess()	StartChildProcess(FilerepProcess)
 #define StartFilerepPeerResetProcess() StartChildProcess(FilerepResetPeerProcess)
 
 static bool IsSegmentDatabase = false;
@@ -1222,7 +1226,7 @@ PostmasterMain(int argc, char *argv[])
 	 * getopt(3) library so that it will work correctly in subprocesses.
 	 */
 	optind = 1;
-#ifdef HAVE_INT_OPTRESET
+#if defined(HAVE_INT_OPTRESET) || !defined(HAVE_GETOPT)
 	optreset = 1;				/* some systems need this too */
 #endif
 
@@ -1400,6 +1404,11 @@ PostmasterMain(int argc, char *argv[])
 	 */
 	set_max_safe_fds();
 
+	/*
+	 * Set reference point for stack-depth checking.
+	 */
+	set_stack_base();
+
 	/*
 	 * Initialize the list of active backends.
 	 */
@@ -1466,7 +1475,7 @@ PostmasterMain(int argc, char *argv[])
 	 *
 	 * CAUTION: when changing this list, check for side-effects on the signal
 	 * handling setup of child processes.  See tcop/postgres.c,
-	 * bootstrap/bootstrap.c, postmaster/bgwriter.c,
+	 * bootstrap/bootstrap.c, postmaster/bgwriter.c, postmaster/walwriter.c,
 	 * postmaster/autovacuum.c, postmaster/pgarch.c, postmaster/pgstat.c, and
 	 * postmaster/syslogger.c.
 	 */
@@ -1764,10 +1773,9 @@ checkDataDir(void)
 /*
  * check if file or directory under "DataDir" exists and is accessible
  */
-static void checkPgDir(const char *dir)
+static void
+checkPgDir(const char *dir)
 {
-	Assert(DataDir);
-
 	struct stat st;
 	char buf[strlen(DataDir) + strlen(dir) + 32];
 
@@ -2260,7 +2268,7 @@ ServerLoop(void)
 	fd_set		readmask;
 	int			nSockets;
 	time_t		now,
-		last_touch_time;
+				last_touch_time;
 
 	last_touch_time = time(NULL);
 
@@ -2472,7 +2480,7 @@ ServerLoop(void)
         }
 
 		/* If we have lost the log collector, try to start a new one */
-		if (SysLoggerPID == 0 && Redirect_stderr)
+		if (SysLoggerPID == 0 && Logging_collector)
 		{
 			SysLoggerPID = SysLogger_Start();
 			if (Debug_print_server_processes)
@@ -2488,22 +2496,16 @@ ServerLoop(void)
 			 * fails, we'll just try again later.
 			 */
 			if (BgWriterPID == 0 &&
-			    StartupPidsAllZero() && pmState > PM_STARTUP_PASS4 &&
-			    !FatalError &&
+			    pmState > PM_STARTUP_PASS4 &&
 			    pmState < PM_CHILD_STOP_BEGIN)
 			{
 				SetBGWriterPID(StartBackgroundWriter());
 				if (Debug_print_server_processes)
 					elog(LOG,"restarted 'background writer process' as pid %ld",
 						 (long)BgWriterPID);
-				/* If shutdown is pending, set it going */
-				if (Shutdown > NoShutdown && BgWriterPID != 0)
-					signal_child(BgWriterPID, SIGUSR2);
 			}
 
-			if (CheckpointPID == 0 &&
-				StartupPidsAllZero() && pmState > PM_STARTUP_PASS4 &&
-				!FatalError &&
+			if (CheckpointPID == 0 && pmState > PM_STARTUP_PASS4 &&
 				Shutdown == NoShutdown)
 			{
 				CheckpointPID = StartCheckpointServer();
@@ -2513,25 +2515,29 @@ ServerLoop(void)
 			}
 
 			/*
-			 * Start a new autovacuum process, if there isn't one running already.
-			 * (It'll die relatively quickly.)  
+			 * Likewise, if we have lost the walwriter process, try to start a new
+			 * one.
 			 */
-			if ((AutoVacuumingActive() || force_autovac) && AutoVacPID == 0 &&
-				StartupPidsAllZero() && pmState > PM_STARTUP_PASS4 &&
-				!FatalError && Shutdown == NoShutdown)
+			if (WalWriterPID == 0 && pmState == PM_RUN)
 			{
-				AutoVacPID = start_autovac_launcher;
+				WalWriterPID = StartWalWriter();
 				if (Debug_print_server_processes)
-					elog(LOG,"restarted 'autovacuum process' as pid %ld",
-						 (long)AutoVacPID);
-				if (AutoVacPID != 0)
-					force_autovac = false;	/* signal successfully processed */
+					elog(LOG,"restarted 'wal writer process' as pid %ld",
+						 (long)CheckpointPID);
 			}
 
+			/* If we have lost the autovacuum launcher, try to start a new one */
+			if (AutoVacPID == 0 &&
+				(AutoVacuumingActive() || start_autovac_launcher) &&
+				pmState == PM_RUN)
+			{
+				AutoVacPID = StartAutoVacLauncher();
+				if (AutoVacPID != 0)
+					start_autovac_launcher = false; /* signal processed */
+			}
+			
 			/* If we have lost the stats collector, try to start a new one */
-			if (PgStatPID == 0 &&
-				StartupPidsAllZero() && pmState > PM_STARTUP_PASS4 &&
-				!FatalError && Shutdown == NoShutdown)
+			if (PgStatPID == 0 && pmState > PM_STARTUP_PASS4)
 			{
 				PgStatPID = pgstat_start();
 				if (Debug_print_server_processes)
@@ -2561,6 +2567,14 @@ ServerLoop(void)
 			}
 		}
 
+		/* If we need to signal the autovacuum launcher, do so now */
+		if (avlauncher_needs_signal)
+		{
+			avlauncher_needs_signal = false;
+			if (AutoVacPID != 0)
+				kill(AutoVacPID, SIGUSR1);
+		}
+
 		/*
 		 * Touch the socket and lock file every 58 minutes, to ensure that
 		 * they are not removed by overzealous /tmp-cleaning tasks.  We assume
@@ -2596,7 +2610,6 @@ initMasks(fd_set *rmask)
 		if (fd == PGINVALID_SOCKET)
 			break;
 		FD_SET(fd, rmask);
-
 		if (fd > maxsock)
 			maxsock = fd;
 	}
@@ -2805,6 +2818,8 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 				port->user_name = pstrdup(valptr);
 			else if (strcmp(nameptr, "options") == 0)
 				port->cmdline_options = pstrdup(valptr);
+			else if (strcmp(nameptr, "application_name") == 0)
+				/* ignore for compatibility with libpq >= 8.5 */ ;
 			else if (strcmp(nameptr, "gpqeid") == 0)
 				gpqeid = valptr;
 			else if (strcmp(nameptr, "gpqdid") == 0)
@@ -3802,9 +3817,7 @@ processCancelRequest(Port *port, void *pkt, MsgType code)
 static enum CAC_state
 canAcceptConnections(void)
 {
-	/*
-	 * Can't start backends when in startup/shutdown/recovery state.
-	 */
+	/* Can't start backends when in startup/shutdown/recovery state. */
 	if (pmState != PM_RUN)
 	{
 		PrimaryMirrorMode mirrorMode;
@@ -3878,7 +3891,7 @@ ConnCreate(int serverFd)
 		if (port->sock >= 0)
 			StreamClose(port->sock);
 		ConnFree(port);
-		port = NULL;
+		return NULL;
 	}
 	else
 	{
@@ -4029,6 +4042,7 @@ SIGHUP_handler(SIGNAL_ARGS)
         signal_child_if_up(StartupPass4PID, SIGHUP);
 		signal_child_if_up(BgWriterPID, SIGHUP);
 		signal_child_if_up(CheckpointPID, SIGHUP);
+		signal_child_if_up(WalWriterPID, SIGHUP);
 		signal_child_if_up(WalReceiverPID, SIGHUP);
 		signal_child_if_up(FilerepPID, SIGHUP);
 		signal_child_if_up(AutoVacPID, SIGHUP);
@@ -4150,6 +4164,7 @@ pmdie(SIGNAL_ARGS)
  			StopServices(0, SIGQUIT);
 			signal_child_if_up(BgWriterPID, SIGQUIT);
 			signal_child_if_up(CheckpointPID, SIGQUIT);
+			signal_child_if_up(WalWriterPID, SIGQUIT);
 			signal_child_if_up(WalReceiverPID, SIGQUIT);
             signal_child_if_up(AutoVacPID, SIGQUIT);
             signal_child_if_up(PgArchPID, SIGQUIT);
@@ -4811,7 +4826,6 @@ static void do_reaper()
 				ExitPostmaster(1);
 			}
 
-			/* Else, proceed as in normal crash recovery */
 			continue;
 		}
 
@@ -4910,6 +4924,20 @@ static void do_reaper()
 			continue;
 		}
 
+		/*
+		 * Was it the wal writer?  Normal exit can be ignored; we'll start a
+		 * new one at the next iteration of the postmaster's main loop, if
+		 * necessary.  Any other exit condition is treated as a crash.
+		 */
+		if (pid == WalWriterPID)
+		{
+			WalWriterPID = 0;
+			if (!EXIT_STATUS_0(exitstatus))
+				HandleChildCrash(pid, exitstatus,
+								 _("WAL writer process"));
+			continue;
+		}
+
 		/*
 		 * Was it the wal receiver?  If exit status is zero (normal) or one
 		 * (FATAL exit), we assume everything is all right just like normal
@@ -4925,10 +4953,10 @@ static void do_reaper()
 		}
 
 		/*
-		 * Was it the autovacuum process?  Normal or FATAL exit can be
-		 * ignored; we'll start a new one at the next iteration of the
-		 * postmaster's main loop, if necessary.  Any other exit condition
-		 * is treated as a crash.
+		 * Was it the autovacuum launcher?	Normal exit can be ignored; we'll
+		 * start a new one at the next iteration of the postmaster's main
+		 * loop, if necessary.	Any other exit condition is treated as a
+		 * crash.
 		 */
 		if (pid == AutoVacPID)
 		{
@@ -5441,6 +5469,18 @@ HandleChildCrash(int pid, int exitstatus, const char *procname)
         }
     }
 
+	/* Take care of the walwriter too */
+	if (pid == WalWriterPID)
+		WalWriterPID = 0;
+	else if (WalWriterPID != 0 && !FatalError)
+	{
+		ereport(DEBUG2,
+				(errmsg_internal("sending %s to process %d",
+								 (SendStop ? "SIGSTOP" : "SIGQUIT"),
+								 (int) WalWriterPID)));
+		signal_child(WalWriterPID, (SendStop ? SIGSTOP : SIGQUIT));
+	}
+
 	/* Take care of walreceiver */
 	if (pid == WalReceiverPID)
 		WalReceiverPID = 0;
@@ -5588,15 +5628,15 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
 						procname, pid, WTERMSIG(exitstatus)),
 				 errhint("See C include file \"ntstatus.h\" for a description of the hexadecimal value.")));
 #elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST
-		ereport(lev,
-
-		/*------
-		  translator: %s is a noun phrase describing a child process, such as
-		  "server process" */
-				(errmsg("%s (PID %d) was terminated by signal %d: %s",
-						procname, pid, WTERMSIG(exitstatus),
-						WTERMSIG(exitstatus) < NSIG ?
-						sys_siglist[WTERMSIG(exitstatus)] : "(unknown)")));
+	ereport(lev,
+
+	/*------
+	  translator: %s is a noun phrase describing a child process, such as
+	  "server process" */
+			(errmsg("%s (PID %d) was terminated by signal %d: %s",
+					procname, pid, WTERMSIG(exitstatus),
+					WTERMSIG(exitstatus) < NSIG ?
+					sys_siglist[WTERMSIG(exitstatus)] : "(unknown)")));
 #else
 	{
 		// If we don't have strsignal or sys_siglist, do our own translation
@@ -6259,9 +6299,9 @@ signal_child(pid_t pid, int signal)
 }
 
 /*
- * Send a signal to all backend children, including autovacuum workers (but NOT
- * special children).  If only_autovac is TRUE, only the autovacuum worker
- * processes are signalled.
+ * Send a signal to all backend children, including autovacuum workers
+ * (but NOT special children; dead_end children are never signaled, either).
+ * If only_autovac is TRUE, only the autovacuum worker processes are signalled.
  */
 static void
 SignalSomeChildren(int signal, bool only_autovac)
@@ -7060,6 +7100,11 @@ SubPostmasterMain(int argc, char *argv[])
 	memset(&port, 0, sizeof(Port));
 	read_backend_variables(argv[2], &port);
 
+	/*
+	 * Set reference point for stack-depth checking
+	 */
+	set_stack_base();
+
 	/*
 	 * Set up memory area for GSS information. Mirrors the code in ConnCreate
 	 * for the non-exec case.
@@ -7145,8 +7190,8 @@ SubPostmasterMain(int argc, char *argv[])
 		 * process any libraries that should be preloaded at postmaster start
 		 *
 		 * NOTE: we have to re-load the shared_preload_libraries here because
-		 * 		 this backend is not fork()ed so we can't inherit any shared
-		 *		 libraries / DLL's from our parent (the postmaster).
+		 * this backend is not fork()ed so we can't inherit any shared
+		 * libraries / DLL's from our parent (the postmaster).
 		 */
 		process_shared_preload_libraries();
 
@@ -7209,7 +7254,7 @@ SubPostmasterMain(int argc, char *argv[])
 		InitShmemAccess(UsedShmemSegAddr);
 
 		/* Need a PGPROC to run CreateSharedMemoryAndSemaphores */
-		InitDummyProcess();
+		InitAuxiliaryProcess();
 
 		/* Attach process to shared data structures */
 		CreateSharedMemoryAndSemaphores(false, 0);
@@ -7441,9 +7486,11 @@ sigusr1_handler(SIGNAL_ARGS)
 		start_autovac_launcher = true;
 	}
 
-	/* The autovacuum launcher wants us to start a worker process. */
 	if (CheckPostmasterSignal(PMSIGNAL_START_AUTOVAC_WORKER))
+	{
+		/* The autovacuum launcher wants us to start a worker process. */
 		StartAutovacuumWorker();
+	}
 
 	if (CheckPostmasterSignal(PMSIGNAL_FILEREP_STATE_CHANGE))
 	{
@@ -7775,6 +7822,10 @@ StartChildProcess(AuxProcType type)
 				ereport(LOG,
 				   (errmsg("could not fork background checkpoint process: %m")));
 				break;
+			case WalWriterProcess:
+				ereport(LOG,
+						(errmsg("could not fork WAL writer process: %m")));
+				break;
 			default:
 				ereport(LOG,
 						(errmsg("could not fork process: %m")));
@@ -7808,42 +7859,67 @@ StartChildProcess(AuxProcType type)
 static void
 StartAutovacuumWorker(void)
 {
-	Backend	   *bn;
+	Backend    *bn;
 
 	/*
-	 * do nothing if not in condition to run a process.  This should not
-	 * actually happen, since the signal is only supposed to be sent by
-	 * autovacuum launcher when it's OK to do it, but test for it just in case.
+	 * If not in condition to run a process, don't try, but handle it like a
+	 * fork failure.  This does not normally happen, since the signal is only
+	 * supposed to be sent by autovacuum launcher when it's OK to do it, but
+	 * we have to check to avoid race-condition problems during DB state
+	 * changes.
 	 */
-	if (StartupPID != 0 || FatalError || Shutdown != NoShutdown)
-		return;
-
-	bn = (Backend *) malloc(sizeof(Backend));
-	if (!bn)
+	if (canAcceptConnections() == CAC_OK)
 	{
-		ereport(LOG,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-		return;
-	}
-
-	bn->pid = StartAutoVacWorker();
-	bn->is_autovacuum = true;
-	/* we don't need a cancel key */
+		/*
+		 * Compute the cancel key that will be assigned to this session. We
+		 * probably don't need cancel keys for autovac workers, but we'd
+		 * better have something random in the field to prevent unfriendly
+		 * people from sending cancels to them.
+		 */
+		MyCancelKey = PostmasterRandom();
 
-	if (bn->pid > 0)
-	{
-		DLAddHead(BackendList, DLNewElem(bn));
+		bn = (Backend *) malloc(sizeof(Backend));
+		if (bn)
+		{
+			bn->pid = StartAutoVacWorker();
+			if (bn->pid > 0)
+			{
+				bn->cancel_key = MyCancelKey;
+				bn->is_autovacuum = true;
+				bn->dead_end = false;
+				DLAddHead(BackendList, DLNewElem(bn));
 #ifdef EXEC_BACKEND
-		ShmemBackendArrayAdd(bn);
+				ShmemBackendArrayAdd(bn);
 #endif
+				/* all OK */
+				return;
+			}
+
+			/*
+			 * fork failed, fall through to report -- actual error message was
+			 * logged by StartAutoVacWorker
+			 */
+			free(bn);
+		}
+		else
+			ereport(LOG,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory")));
 	}
-	else
+
+	/*
+	 * Report the failure to the launcher, if it's running.  (If it's not, we
+	 * might not even be connected to shared memory, so don't try to call
+	 * AutoVacWorkerFailed.)  Note that we also need to signal it so that it
+	 * responds to the condition, but we don't do that here, instead waiting
+	 * for ServerLoop to do it.  This way we avoid a ping-pong signalling in
+	 * quick succession between the autovac launcher and postmaster in case
+	 * things get ugly.
+	 */
+	if (AutoVacPID != 0)
 	{
-		/* not much we can do */
-		ereport(LOG,
-				(errmsg("could not fork new process for autovacuum: %m")));
-		free(bn);
+		AutoVacWorkerFailed();
+		avlauncher_needs_signal = true;
 	}
 }
 
@@ -7901,7 +7977,7 @@ MaxLivePostmasterChildren(void)
 
 /*
  * The following need to be available to the save/restore_backend_variables
- * functions
+ * functions.  They are marked NON_EXEC_STATIC in their home modules.
  */
 extern slock_t *ShmemLock;
 extern LWLock *LWLockArray;
@@ -7909,6 +7985,7 @@ extern PROC_HDR *ProcGlobal;
 extern PGPROC *AuxiliaryProcs;
 extern PMSignalData *PMSignalState;
 extern int	pgStatSock;
+extern pg_time_t first_syslogger_file_time;
 
 #ifndef WIN32
 #define write_inheritable_socket(dest, src, childpid) (*(dest) = (src))
@@ -7957,6 +8034,7 @@ save_backend_variables(BackendParameters *param, Port *port,
 	param->PostmasterPid = PostmasterPid;
 	param->PgStartTime = PgStartTime;
 	param->PgReloadTime = PgReloadTime;
+	param->first_syslogger_file_time = first_syslogger_file_time;
 
 	param->redirection_done = redirection_done;
 
@@ -8164,6 +8242,7 @@ restore_backend_variables(BackendParameters *param, Port *port)
 	PostmasterPid = param->PostmasterPid;
 	PgStartTime = param->PgStartTime;
 	PgReloadTime = param->PgReloadTime;
+	first_syslogger_file_time = param->first_syslogger_file_time;
 
 	redirection_done = param->redirection_done;
 
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index 933b13bef8e4..4ec965380c49 100644
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -2,7 +2,7 @@
  *
  * syslogger.c
  *
- * The system logger (syslogger) is new in Postgres 8.0. It catches all
+ * The system logger (syslogger) appeared in Postgres 8.0. It catches all
  * stderr output from the postmaster, backends, and other subprocesses
  * by redirecting to a pipe, and writes it to a set of logfiles.
  * It's possible to have size and age limits for the logfile configured
@@ -18,7 +18,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.29.2.3 2007/08/02 23:17:20 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.44.2.4 2010/04/16 09:52:01 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,7 @@
 #include "lib/stringinfo.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "nodes/pg_list.h"
 #include "pgtime.h"
 #include "postmaster/fork_process.h"
 #include "postmaster/postmaster.h"
@@ -54,10 +55,18 @@
 extern bool Gp_entry_postmaster;
 
 /*
- * GUC parameters.	Redirect_stderr cannot be changed after postmaster
+ * We read() into a temp buffer twice as big as a chunk, so that any fragment
+ * left after processing can be moved down to the front and we'll still have
+ * room to read a full chunk.
+ */
+#define READ_BUF_SIZE (2 * PIPE_CHUNK_SIZE)
+
+
+/*
+ * GUC parameters.	Logging_collector cannot be changed after postmaster
  * start, but the rest can change at SIGHUP.
  */
-bool		Redirect_stderr = false;
+bool		Logging_collector = false;
 int			Log_RotationAge = HOURS_PER_DAY * MINS_PER_HOUR;
 int			Log_RotationSize = 10 * 1024;
 int			Alert_Log_RotationSize = 1024;
@@ -78,8 +87,12 @@ extern bool redirection_done;
  */
 static pg_time_t next_rotation_time;
 static bool pipe_eof_seen = false;
+static bool rotation_disabled = false;
 static FILE *syslogFile = NULL;
+static FILE *csvlogFile = NULL;
+NON_EXEC_STATIC pg_time_t first_syslogger_file_time = 0;
 static char *last_file_name = NULL;
+static char *last_csv_file_name = NULL;
 // Store only those logs the severe of that are at least WARNING level to
 // speed up the access for it when log files become very huge.
 static FILE *alertLogFile = NULL;
@@ -133,7 +146,7 @@ HANDLE		syslogPipe[2] = {0, 0};
 
 #ifdef WIN32
 static HANDLE threadHandle = 0;
-static CRITICAL_SECTION fileSection;
+static CRITICAL_SECTION sysloggerSection;
 #endif
 
 static bool chunk_is_postgres_chunk(PipeProtoHeader *hdr)
@@ -163,14 +176,14 @@ static void syslogger_parseArgs(int argc, char *argv[]);
 #ifdef WIN32
 static void process_pipe_input(char *logbuffer, int *bytes_in_logbuffer);
 static void flush_pipe_input(char *logbuffer, int *bytes_in_logbuffer);
-static void open_csvlogfile(void);
 
 
 static unsigned int __stdcall pipeThread(void *arg);
 #endif
-static void logfile_rotate(bool time_based_rotation, const char *log_directory, const char* log_filename, 
-                           FILE **fh, char **last_log_file_name, bool is_alert_rotate);
-static char *logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_file_pattern);
+static void logfile_rotate(bool time_based_rotation, bool size_based_rotation, const char *suffix,
+						   const char *log_directory, const char *log_filename,
+                           FILE **fh, char **last_log_file_name);
+static char *logfile_getname(pg_time_t timestamp, const char *suffix, const char *log_directory, const char *log_file_pattern);
 static void set_next_rotation_time(void);
 static void sigHupHandler(SIGNAL_ARGS);
 static void sigUsr1Handler(SIGNAL_ARGS);
@@ -183,15 +196,15 @@ static void sigUsr1Handler(SIGNAL_ARGS);
 NON_EXEC_STATIC void
 SysLoggerMain(int argc, char *argv[])
 {
-    char	   *currentLogDir;
-    char	   *currentLogFilename;
-    int			currentLogRotationAge;
+	char	   *currentLogDir;
+	char	   *currentLogFilename;
+	int			currentLogRotationAge;
 
     IsUnderPostmaster = true;	/* we are a postmaster subprocess now */
 
     MyProcPid = getpid();		/* reset MyProcPid */
 
-    MyStartTime = time(NULL);	/* set our start time in case we call elog */
+	MyStartTime = time(NULL);	/* set our start time in case we call elog */
 
 #ifdef EXEC_BACKEND
     syslogger_parseArgs(argc, argv);
@@ -222,9 +235,12 @@ SysLoggerMain(int argc, char *argv[])
          */
         close(fileno(stdout));
         close(fileno(stderr));
-        dup2(fd, fileno(stdout));
-        dup2(fd, fileno(stderr));
-        close(fd);
+		if (fd != -1)
+		{
+			dup2(fd, fileno(stdout));
+			dup2(fd, fileno(stderr));
+			close(fd);
+		}
     }
 	/*
 	 * Syslogger's own stderr can't be the syslogPipe, so set it back to text
@@ -254,12 +270,12 @@ SysLoggerMain(int argc, char *argv[])
     syslogPipe[1] = 0;
 #endif
 
-    /*
-     * If possible, make this process a group leader, so that the postmaster
+	/*
+	 * If possible, make this process a group leader, so that the postmaster
 	 * can signal any child processes too.	(syslogger probably never has any
 	 * child processes, but for consistency we make all postmaster child
 	 * processes do this.)
-     */
+	 */
 #ifdef HAVE_SETSID
     if (setsid() < 0)
         elog(FATAL, "setsid() failed: %m");
@@ -294,14 +310,22 @@ SysLoggerMain(int argc, char *argv[])
     PG_SETMASK(&UnBlockSig);
 
 #ifdef WIN32
-    /* Fire up separate data transfer thread */
-    InitializeCriticalSection(&fileSection);
+	/* Fire up separate data transfer thread */
+	InitializeCriticalSection(&sysloggerSection);
+	EnterCriticalSection(&sysloggerSection);
 
     threadHandle = (HANDLE) _beginthreadex(NULL, 0, pipeThread, NULL, 0, NULL);
     if (threadHandle == 0)
         elog(FATAL, "could not create syslogger data transfer thread: %m");
 #endif   /* WIN32 */
 
+	/*
+	 * Remember active logfile's name.  We recompute this from the reference
+	 * time because passing down just the pg_time_t is a lot cheaper than
+	 * passing a whole file path in the EXEC_BACKEND case.
+	 */
+	last_file_name = logfile_getname(first_syslogger_file_time, NULL, Log_directory, Log_filename);
+
     /* remember active logfile parameters */
     currentLogDir = pstrdup(Log_directory);
     currentLogFilename = pstrdup(Log_filename);
@@ -313,6 +337,8 @@ SysLoggerMain(int argc, char *argv[])
     for (;;)
     {
         bool		time_based_rotation = false;
+		int			size_rotation_for = 0;
+		bool		size_rotation_for_alert = false;
 
 #ifndef WIN32
         int			bytesRead = 0;
@@ -336,7 +362,12 @@ SysLoggerMain(int argc, char *argv[])
                 pfree(currentLogDir);
                 currentLogDir = pstrdup(Log_directory);
                 rotation_requested = true;
-            }
+
+				/*
+				 * Also, create new directory if not present; ignore errors
+				 */
+				mkdir(Log_directory, S_IRWXU);
+			}
             if (strcmp(Log_filename, currentLogFilename) != 0)
             {
                 pfree(currentLogFilename);
@@ -353,9 +384,19 @@ SysLoggerMain(int argc, char *argv[])
                 currentLogRotationAge = Log_RotationAge;
                 set_next_rotation_time();
             }
+
+			/*
+			 * If we had a rotation-disabling failure, re-enable rotation
+			 * attempts after SIGHUP, and force one immediately.
+			 */
+			if (rotation_disabled)
+			{
+				rotation_disabled = false;
+				rotation_requested = true;
+			}
         }
 
-        if (!rotation_requested && Log_RotationAge > 0)
+        if (!rotation_requested && Log_RotationAge > 0 && !rotation_disabled)
         {
             /* Do a logfile rotation if it's time */
             pg_time_t	now = (pg_time_t) time(NULL);
@@ -370,30 +411,57 @@ SysLoggerMain(int argc, char *argv[])
              }
         }
 
-        if (!rotation_requested && Log_RotationSize > 0)
+        if (!rotation_requested && Log_RotationSize > 0 && !rotation_disabled)
         {
             /* Do a rotation if file is too big */
             if (ftell(syslogFile) >= Log_RotationSize * 1024L)
-                rotation_requested = true;
-            
+			{
+				rotation_requested = true;
+				size_rotation_for |= LOG_DESTINATION_STDERR;
+			}
+			if (csvlogFile != NULL &&
+				ftell(csvlogFile) >= Log_RotationSize * 1024L)
+			{
+				rotation_requested = true;
+				size_rotation_for |= LOG_DESTINATION_CSVLOG;
+			}
         }
             
-        if (alert_log_level_opened && 
-            !alert_rotation_requested &&
-            alertLogFile &&
-            ftell(alertLogFile) >= Alert_Log_RotationSize * 1024L)
+        if (!alert_rotation_requested && alert_log_level_opened && alertLogFile)
         {
+			/* Do a rotation if file is too big */
+			if (ftell(alertLogFile) >= Alert_Log_RotationSize * 1024L)
+			{
                 alert_rotation_requested = true;
+				size_rotation_for_alert = true;
+			}
         }
 
         if (rotation_requested)
-            logfile_rotate(time_based_rotation, Log_directory, Log_filename, &syslogFile, &last_file_name,
-                           false /* is_alert_rotate */);
-        
-        if (alert_log_level_opened && alert_rotation_requested)
-            logfile_rotate(time_based_rotation, gp_perf_mon_directory, alert_file_pattern,
-                           &alertLogFile, &alert_last_file_name, true /* is_alert_rotate */);
+		{
+			/*
+			 * Force rotation when both values are zero. It means the request
+			 * was sent by pg_rotate_logfile.
+			 */
+			if (!time_based_rotation && size_rotation_for == 0)
+				size_rotation_for = LOG_DESTINATION_STDERR | LOG_DESTINATION_CSVLOG;
+
+			rotation_requested = false;
+            logfile_rotate(time_based_rotation, (size_rotation_for & LOG_DESTINATION_STDERR) != 0,
+						   NULL, Log_directory, Log_filename,
+						   &syslogFile, &last_file_name);
+            logfile_rotate(time_based_rotation, (size_rotation_for & LOG_DESTINATION_CSVLOG) != 0,
+						   ".csv", Log_directory, Log_filename,
+						   &csvlogFile, &last_csv_file_name);
+		}
 
+        if (alert_log_level_opened && alert_rotation_requested)
+		{
+			alert_rotation_requested = false;
+            logfile_rotate(time_based_rotation, size_rotation_for_alert,
+						   NULL, gp_perf_mon_directory, alert_file_pattern,
+                           &alertLogFile, &alert_last_file_name);
+		}
 #ifndef WIN32
 
         /*
@@ -584,21 +652,29 @@ SysLoggerMain(int argc, char *argv[])
         }
 #else							/* WIN32 */
 
-        /*
-         * On Windows we leave it to a separate thread to transfer data and
-         * detect pipe EOF.  The main thread just wakes up once a second to
-         * check for SIGHUP and rotation conditions.
-         */
-        pg_usleep(1000000L);
+		/*
+		 * On Windows we leave it to a separate thread to transfer data and
+		 * detect pipe EOF.  The main thread just wakes up once a second to
+		 * check for SIGHUP and rotation conditions.
+		 *
+		 * Server code isn't generally thread-safe, so we ensure that only
+		 * one of the threads is active at a time by entering the critical
+		 * section whenever we're not sleeping.
+		 */
+		LeaveCriticalSection(&sysloggerSection);
+
+		pg_usleep(1000000L);
+
+		EnterCriticalSection(&sysloggerSection);
 #endif   /* WIN32 */
 
-        if (pipe_eof_seen)
-        {
-            /*
-             * seeing this message on the real stderr is annoying - so we make
-             * it DEBUG1 to suppress in normal use.
-             */
-            ereport(DEBUG1,
+		if (pipe_eof_seen)
+		{
+			/*
+			 * seeing this message on the real stderr is annoying - so we make
+			 * it DEBUG1 to suppress in normal use.
+			 */
+			ereport(DEBUG1,
 					(errmsg("logger shutting down")));
 
             /*
@@ -628,7 +704,7 @@ open_alert_log_file()
 			         (errmsg("could not create log file directory \"%s\": %m",
 					  gp_perf_mon_directory))));
 		}
-        char *alert_file_name = logfile_getname(time(NULL), gp_perf_mon_directory, alert_file_pattern);
+        char *alert_file_name = logfile_getname(time(NULL), NULL, gp_perf_mon_directory, alert_file_pattern);
         alertLogFile = fopen(alert_file_name, "a");
         if (!alertLogFile)
         {
@@ -651,24 +727,24 @@ open_alert_log_file()
 int
 SysLogger_Start(void)
 {
-    pid_t		sysloggerPid;
-    char	   *filename;
+	pid_t		sysloggerPid;
+	char	   *filename;
 
-    if (!Redirect_stderr)
-        return 0;
+	if (!Logging_collector)
+		return 0;
 
-    /*
-     * If first time through, create the pipe which will receive stderr
-     * output.
-     *
-     * If the syslogger crashes and needs to be restarted, we continue to use
-     * the same pipe (indeed must do so, since extant backends will be writing
-     * into that pipe).
-     *
-     * This means the postmaster must continue to hold the read end of the
-     * pipe open, so we can pass it down to the reincarnated syslogger. This
-     * is a bit klugy but we have little choice.
-     */
+	/*
+	 * If first time through, create the pipe which will receive stderr
+	 * output.
+	 *
+	 * If the syslogger crashes and needs to be restarted, we continue to use
+	 * the same pipe (indeed must do so, since extant backends will be writing
+	 * into that pipe).
+	 *
+	 * This means the postmaster must continue to hold the read end of the
+	 * pipe open, so we can pass it down to the reincarnated syslogger. This
+	 * is a bit klugy but we have little choice.
+	 */
 #ifndef WIN32
     if (syslogPipe[0] < 0)
     {
@@ -698,11 +774,20 @@ SysLogger_Start(void)
      */
     mkdir(Log_directory, 0700);
 
-    /*
-     * The initial logfile is created right in the postmaster, to verify that
-     * the Log_directory is writable.
-     */
-    filename = logfile_getname(time(NULL), Log_directory, Log_filename);
+	/*
+	 * The initial logfile is created right in the postmaster, to verify that
+	 * the Log_directory is writable.  We save the reference time so that
+	 * the syslogger child process can recompute this file name.
+	 *
+	 * It might look a bit strange to re-do this during a syslogger restart,
+	 * but we must do so since the postmaster closed syslogFile after the
+	 * previous fork (and remembering that old file wouldn't be right anyway).
+	 * Note we always append here, we won't overwrite any existing file.  This
+	 * is consistent with the normal rules, because by definition this is not
+	 * a time-based rotation.
+	 */
+	first_syslogger_file_time = time(NULL);
+    filename = logfile_getname(first_syslogger_file_time, NULL, Log_directory, Log_filename);
 
     syslogFile = fopen(filename, "a");
 
@@ -783,8 +868,11 @@ SysLogger_Start(void)
 							 errmsg("could not redirect stderr: %m")));
                     close(fd);
                     _setmode(_fileno(stderr),_O_BINARY);
-                    /* Now we are done with the write end of the pipe. */
-                    CloseHandle(syslogPipe[1]);
+					/*
+					 * Now we are done with the write end of the pipe.
+					 * CloseHandle() must not be called because the preceding
+					 * close() closes the underlying handle.
+					 */
                     syslogPipe[1] = 0;
 #endif
                     redirection_done = true;
@@ -813,7 +901,7 @@ SysLogger_Start(void)
  *
  * Format up the arglist for, then fork and exec, a syslogger process
  */
-    static pid_t
+static pid_t
 syslogger_forkexec(void)
 {
     char	   *av[10];
@@ -827,41 +915,41 @@ syslogger_forkexec(void)
 
     /* static variables (those not passed by write_backend_variables) */
 #ifndef WIN32
-    if (syslogFile != NULL)
-        snprintf(filenobuf, sizeof(filenobuf), "%d",
-                fileno(syslogFile));
-    else
-        strcpy(filenobuf, "-1");
+	if (syslogFile != NULL)
+		snprintf(filenobuf, sizeof(filenobuf), "%d",
+				 fileno(syslogFile));
+	else
+		strcpy(filenobuf, "-1");
 #else							/* WIN32 */
-    if (syslogFile != NULL)
-        snprintf(filenobuf, sizeof(filenobuf), "%ld",
-                _get_osfhandle(_fileno(syslogFile)));
-    else
-        strcpy(filenobuf, "0");
+	if (syslogFile != NULL)
+		snprintf(filenobuf, sizeof(filenobuf), "%ld",
+				 _get_osfhandle(_fileno(syslogFile)));
+	else
+		strcpy(filenobuf, "0");
 #endif   /* WIN32 */
-    av[ac++] = filenobuf;
+	av[ac++] = filenobuf;
 
-    if (alert_log_level_opened)
-    {
+	if (alert_log_level_opened)
+	{
 #ifndef WIN32
-        if (alertLogFile != NULL)
-            snprintf(alertFileNoBuf, sizeof(alertFileNoBuf), "%d",
-                    fileno(alertLogFile));
-        else
-            strcpy(alertFileNoBuf, "-1");
+		if (alertLogFile != NULL)
+			snprintf(alertFileNoBuf, sizeof(alertFileNoBuf), "%d",
+					 fileno(alertLogFile));
+		else
+			strcpy(alertFileNoBuf, "-1");
 #else							/* WIN32 */
-        if (alertLogFile != NULL)
-            snprintf(alertFileNoBuf, sizeof(alertFileNoBuf), "%ld",
-                     _get_osfhandle(_fileno(alertLogFile)));
-        else
-            strcpy(alertFileNoBuf, "0");
+		if (alertLogFile != NULL)
+			snprintf(alertFileNoBuf, sizeof(alertFileNoBuf), "%ld",
+					 _get_osfhandle(_fileno(alertLogFile)));
+		else
+			strcpy(alertFileNoBuf, "0");
 #endif
-        av[ac++] = alertFileNoBuf;
-    }
-    av[ac] = NULL;
+		av[ac++] = alertFileNoBuf;
+	}
+	av[ac] = NULL;
 	Assert(ac < lengthof(av));
 
-    return postmaster_forkexec(ac, av);
+	return postmaster_forkexec(ac, av);
 }
 
 /*
@@ -941,7 +1029,7 @@ syslogger_append_timestamp(pg_time_t stamp_time, bool amsyslogger, bool append_c
 #endif
                 pg_localtime(&stamp_time, log_timezone ? log_timezone : gmt_timezone));
 		if (amsyslogger)
-			write_syslogger_file_binary(strbuf, strlen(strbuf));
+			write_syslogger_file_binary(strbuf, strlen(strbuf), LOG_DESTINATION_STDERR);
 		else
 			write(fileno(stderr), strbuf, strlen(strbuf));
     }
@@ -949,7 +1037,7 @@ syslogger_append_timestamp(pg_time_t stamp_time, bool amsyslogger, bool append_c
     if (append_comma)
 	{
 		if (amsyslogger)
-			write_syslogger_file_binary(",", 1);
+			write_syslogger_file_binary(",", 1, LOG_DESTINATION_STDERR);
 		else
 			write(fileno(stderr), ",", 1);
 	}
@@ -992,8 +1080,8 @@ syslogger_append_current_timestamp(bool amsyslogger)
 
 	if (amsyslogger)
 	{
-		write_syslogger_file_binary(strbuf, strlen(strbuf));
-		write_syslogger_file_binary(",", 1);
+		write_syslogger_file_binary(strbuf, strlen(strbuf), LOG_DESTINATION_STDERR);
+		write_syslogger_file_binary(",", 1, LOG_DESTINATION_STDERR);
 	}
 	else
 	{
@@ -1020,13 +1108,13 @@ int syslogger_write_str(const char *data, int len, bool amsyslogger, bool csv)
         if (csv && data[cnt] == '"')
 		{
 			if (amsyslogger)
-				write_syslogger_file_binary("\"", 1);
+				write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 			else
 				write(fileno(stderr), "\"", 1);
 		}
 		
 		if (amsyslogger)
-			write_syslogger_file_binary(data+cnt, 1);
+			write_syslogger_file_binary(data+cnt, 1, LOG_DESTINATION_STDERR);
 		else
 			write(fileno(stderr), data+cnt, 1);
 
@@ -1066,7 +1154,6 @@ syslogger_write_str_from_chunk(CSVChunkStr *chunkstr, bool csv,
 				is_empty_string = true;
 		}
 	}
-
 	else
 	{
 		Assert(chunkstr->p == NULL);
@@ -1074,7 +1161,7 @@ syslogger_write_str_from_chunk(CSVChunkStr *chunkstr, bool csv,
 	}
 
     if(csv && (!is_empty_string || quote_empty_string))
-        write_syslogger_file_binary("\"", 1);
+        write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 
     while(chunkstr->p)
     {
@@ -1111,10 +1198,10 @@ syslogger_write_str_from_chunk(CSVChunkStr *chunkstr, bool csv,
     }
 
     if(csv && (!is_empty_string || quote_empty_string))
-        write_syslogger_file_binary("\"", 1);
+        write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 
     if (append_comma)
-        write_syslogger_file_binary(",", 1);
+        write_syslogger_file_binary(",", 1, LOG_DESTINATION_STDERR);
 }
 
 void
@@ -1127,14 +1214,14 @@ syslogger_write_int32(bool test0, const char *prefix, int32 i, bool amsyslogger,
     {
         len = sprintf(buf, "%s%d", prefix, i);
 		if (amsyslogger)
-			write_syslogger_file_binary(buf, len);
+			write_syslogger_file_binary(buf, len, LOG_DESTINATION_STDERR);
 		else
 			write(fileno(stderr), buf, len);
     }
     if (append_comma)
 	{
 		if (amsyslogger)
-			write_syslogger_file_binary(",", 1);
+			write_syslogger_file_binary(",", 1, LOG_DESTINATION_STDERR);
 		else
 			write(fileno(stderr), ",", 1);
 	}
@@ -1236,18 +1323,18 @@ syslogger_write_str_with_comma(const char *data, bool amsyslogger, bool csv, boo
 		bool is_empty = (data[0] == '\0');
 		if (csv && (!is_empty || quote_empty))
 		{
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 		}
 
 		syslogger_write_str(data, strlen(data), amsyslogger, csv);
 
 		if (csv && (!is_empty || quote_empty))
 		{
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 		}
 	}
 	
-	write_syslogger_file_binary(",", 1);
+	write_syslogger_file_binary(",", 1, LOG_DESTINATION_STDERR);
 }
 
 /*
@@ -1264,14 +1351,14 @@ syslogger_write_str_end(const char *data, bool amsyslogger, bool csv, bool quote
 		bool is_empty = (data[0] == '\0');
 		if (csv && (!is_empty || quote_empty))
 		{
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 		}
 
 		syslogger_write_str(data, strlen(data), amsyslogger, csv);
 
 		if (csv && (!is_empty || quote_empty))
 		{
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 		}
 	}
 }
@@ -1347,19 +1434,19 @@ syslogger_write_errordata(PipeProtoHeader *chunkHeader, GpErrorData *errorData,
 	{
 		if (csv)
 		{
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 		}
 		
 		syslogger_write_str(errorData->stacktrace, strlen(errorData->stacktrace), true, csv);
 
 		if (csv)
 		{
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 		}
 	}
 	
 	/* EOL */
-	write_syslogger_file_binary(LOG_EOL, strlen(LOG_EOL));
+	write_syslogger_file_binary(LOG_EOL, strlen(LOG_EOL), LOG_DESTINATION_STDERR);
 	
 	/*
 	 * Send alerts when needed. The alerts are sent only by the master.
@@ -1524,7 +1611,7 @@ void syslogger_log_chunk_list(PipeProtoChunk *chunk)
         syslogger_write_str_end(errorData.stacktrace, true, true, false);
 
         /* EOL */
-        write_syslogger_file_binary(LOG_EOL, strlen(LOG_EOL));
+        write_syslogger_file_binary(LOG_EOL, strlen(LOG_EOL), LOG_DESTINATION_STDERR);
 
         free(errorData.stacktrace ); errorData.stacktrace = NULL;
         free((char *)errorData.error_filename ); errorData.error_filename = NULL;
@@ -1798,17 +1885,27 @@ static void write_binary_to_file(const char *buffer, int count, FILE *fh)
  * On Windows the data arriving in the pipe already has CR/LF newlines,
  * so we must send it to the file without further translation.
  */
-void write_syslogger_file_binary(const char *buffer, int count)
+void write_syslogger_file_binary(const char *buffer, int count, int destination)
 {
-    write_binary_to_file(buffer, count, syslogFile);
-    if (write_to_alert_log)
-    {
+	if (destination == LOG_DESTINATION_STDERR)
+		write_binary_to_file(buffer, count, syslogFile);
+	else if (destination &= LOG_DESTINATION_CSVLOG)
+		write_binary_to_file(buffer, count, csvlogFile);
+
+	/* also write to the alert log if requested */
+	if (write_to_alert_log)
         write_binary_to_file(buffer, count, alertLogFile);
-    }
 }
-void write_syslogger_file(const char *buffer, int count)
+/*
+ * Write text to the currently open logfile
+ *
+ * This is exported so that elog.c can call it when am_syslogger is true.
+ * This allows the syslogger process to record elog messages of its own,
+ * even though its stderr does not point at the syslog pipe.
+ */
+void write_syslogger_file(const char *buffer, int count, int destination)
 {
-    write_syslogger_file_binary(buffer,count);
+    write_syslogger_file_binary(buffer,count, destination);
 }
 #ifdef WIN32
 
@@ -1828,11 +1925,20 @@ pipeThread(void *arg)
     for (;;)
     {
         DWORD		bytesRead;
+		BOOL		result;
 
-        if (!ReadFile(syslogPipe[0],
-                    logbuffer + bytes_in_logbuffer,
-                    sizeof(logbuffer) - bytes_in_logbuffer,
-                    &bytesRead, 0))
+		result = ReadFile(syslogPipe[0],
+						  logbuffer + bytes_in_logbuffer,
+						  sizeof(logbuffer) - bytes_in_logbuffer,
+						  &bytesRead, 0);
+		/*
+		 * Enter critical section before doing anything that might touch
+		 * global state shared by the main thread. Anything that uses
+		 * palloc()/pfree() in particular are not safe outside the critical
+		 * section.
+		 */
+		EnterCriticalSection(&sysloggerSection);
+		if (result)
         {
             DWORD		error = GetLastError();
 
@@ -1849,7 +1955,8 @@ pipeThread(void *arg)
             bytes_in_logbuffer += bytesRead;
             process_pipe_input(logbuffer, &bytes_in_logbuffer);
         }
-    }
+		LeaveCriticalSection(&sysloggerSection);
+     }
 
     /* We exit the above loop only upon detecting pipe EOF */
     pipe_eof_seen = true;
@@ -1857,31 +1964,38 @@ pipeThread(void *arg)
     /* if there's any data left then force it out now */
     flush_pipe_input(logbuffer, &bytes_in_logbuffer);
 
-    _endthread();
+	LeaveCriticalSection(&sysloggerSection);
+     _endthread();
     return 0;
 }
 #endif   /* WIN32 */
 
 /*
- * perform logfile rotation
+ * perform logfile rotation.
+ *
+ *
+ * In GPDB, this has been modified significantly from the upstream version:
+ *
+ * - In PostgreSQL, one call to logfile_rotate performs rotation for both the
+ *   normal and the CSV log. In GPDB, this must be called separately for both,
+ *   and also for the GPDB specific 'alert' log
+ * - In PostgreSQL, this resets 'rotation_requested' flag. In GPDB, the caller
+ *   has to do it.
+ *
+ *
+ *
  */
 static void
-logfile_rotate(bool time_based_rotation, 
+logfile_rotate(bool time_based_rotation, bool size_based_rotation,
+			   const char *suffix,
                const char *log_directory, 
                const char *log_filename, 
-               FILE **fh,
-               char **last_log_file_name,
-               bool is_alert_rotate)
+               FILE **fh_p,
+               char **last_log_file_name)
 {
     char	   *filename;
-
-    if (is_alert_rotate)
-    {
-        alert_rotation_requested = false;
-    } else
-    {
-        rotation_requested = false;
-    }
+	pg_time_t	fntime;
+	FILE	   *fh = *fh_p;
 
     /*
      * When doing a time-based rotation, invent the new logfile name based on
@@ -1889,95 +2003,98 @@ logfile_rotate(bool time_based_rotation,
      * file name when we don't do the rotation immediately.
      */
     if (time_based_rotation)
-        filename = logfile_getname(next_rotation_time, log_directory, log_filename);
+		fntime = next_rotation_time;
     else
-        filename = logfile_getname(time(NULL), log_directory, log_filename);
+		fntime = time(NULL);
+	filename = logfile_getname(fntime, suffix, log_directory, log_filename);
 
-    FILE *old_fh = *fh;
     /*
      * Decide whether to overwrite or append.  We can overwrite if (a)
      * Log_truncate_on_rotation is set, (b) the rotation was triggered by
      * elapsed time and not something else, and (c) the computed file name is
      * different from what we were previously logging into.
-     *
-     * Note: during the first rotation after forking off from the postmaster,
-     * last_file_name will be NULL.  (We don't bother to set it in the
-     * postmaster because it ain't gonna work in the EXEC_BACKEND case.) So we
-     * will always append in that situation, even though truncating would
-     * usually be safe.
      */
-    if (Log_truncate_on_rotation && time_based_rotation &&
-        *last_log_file_name != NULL && strcmp(filename, *last_log_file_name) != 0)
-        *fh = fopen(filename, "w");
-    else
-        *fh = fopen(filename, "a");
+	if (time_based_rotation || size_based_rotation)
+	{
+		if (Log_truncate_on_rotation && time_based_rotation &&
+			*last_log_file_name != NULL &&
+			strcmp(filename, *last_log_file_name) != 0)
+			fh = fopen(filename, "w");
+		else
+			fh = fopen(filename, "a");
 
-    if (!(*fh))
-    {
-        int			saveerrno = errno;
+		if (!fh)
+		{
+			int			saveerrno = errno;
 
-        ereport(LOG,
-                (errcode_for_file_access(),
-                 errmsg("could not open new log file \"%s\": %m",
-                     filename)));
+			ereport(LOG,
+					(errcode_for_file_access(),
+					 errmsg("could not open new log file \"%s\": %m",
+							filename)));
 
-        /*
+			/*
 			 * ENFILE/EMFILE are not too surprising on a busy system; just
 			 * keep using the old file till we manage to get a new one.
 			 * Otherwise, assume something's wrong with Log_directory and stop
 			 * trying to create files.
-         */
-        if (saveerrno != ENFILE && saveerrno != EMFILE)
-        {
-            ereport(LOG,
-                    (errmsg("disabling automatic rotation (use SIGHUP to reenable)")));
-            Log_RotationAge = 0;
-            Log_RotationSize = 0;
-        }
-        *fh = old_fh;
-        pfree(filename);
-        return;
-    }
+			 */
+			if (saveerrno != ENFILE && saveerrno != EMFILE)
+			{
+				ereport(LOG,
+						(errmsg("disabling automatic rotation (use SIGHUP to reenable)")));
+				rotation_disabled = true;
+			}
+			if (filename)
+				pfree(filename);
+			return;
+		}
 
-    setvbuf(*fh, NULL, LBF_MODE, 0);
+		setvbuf(fh, NULL, LBF_MODE, 0);
 
 #ifdef WIN32
-    _setmode(_fileno(*fh), _O_TEXT); /* use CRLF line endings on Windows */
+		_setmode(_fileno(fh), _O_TEXT); /* use CRLF line endings on Windows */
 #endif
 
-    if (old_fh)
-    {
-    /* On Windows, need to interlock against data-transfer thread */
+		if (*fh_p)
+		{
+			/* On Windows, need to interlock against data-transfer thread */
 #ifdef WIN32
-        EnterCriticalSection(&fileSection);
+			EnterCriticalSection(&fileSection);
 #endif
-        fclose(old_fh);
+			fclose(*fh_p);
 #ifdef WIN32
-        LeaveCriticalSection(&fileSection);
+			LeaveCriticalSection(&fileSection);
 #endif
-    }
+		}
+		*fh_p = fh;
 
-    set_next_rotation_time();
+		/* instead of pfree'ing filename, remember it for next time */
+		if ((*last_log_file_name) != NULL)
+			pfree(*last_log_file_name);
+		*last_log_file_name = filename;
+		filename = NULL;
+	}
 
-    /* instead of pfree'ing filename, remember it for next time */
-    if ((*last_log_file_name) != NULL)
-        pfree(*last_log_file_name);
-    *last_log_file_name = filename;
+	if (filename)
+		pfree(filename);
+
+    set_next_rotation_time();
 }
 
 
 /*
  * construct logfile name using timestamp information
  *
+ * If suffix isn't NULL, append it to the name, replacing any ".log"
+ * that may be in the pattern.
+ *
  * Result is palloc'd.
  */
 static char *
-logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_file_pattern)
+logfile_getname(pg_time_t timestamp, const char *suffix, const char *log_directory, const char *log_file_pattern)
 {
     char	   *filename;
     int			len;
-    struct pg_tm *tm;
-	char *suffix;
 #define CSV_SUFFIX ".csv"
 
     filename = palloc(MAXPGPATH);
@@ -1989,8 +2106,8 @@ logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_
     if (strchr(log_file_pattern, '%'))
     {
         /* treat it as a strftime pattern */
-        tm = pg_localtime(&timestamp, log_timezone);
-        pg_strftime(filename + len, MAXPGPATH - len, log_file_pattern, tm);
+		pg_strftime(filename + len, MAXPGPATH - len, Log_filename,
+				   pg_localtime(&timestamp, log_timezone));
     }
     else
     {
@@ -1999,6 +2116,10 @@ logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_
                  log_file_pattern, (unsigned long) timestamp);
     }
 
+	/* GPDB_83_MERGE_FIXME: The upstream code does the ".log" -> ".csv" transformation,
+	 * but not the other one. I doubt we really need that, so I think we should revert
+	 * this to the way it is in upstream, but will need to double-check. */
+#if 0
 	/*
 	 * If the logging format is 'TEXT' and the filename ends with ".csv",
 	 * replace ".csv" with ".log".
@@ -2006,6 +2127,7 @@ logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_
 	 * If the logging format is 'CSV' and the filename does not end with ".csv",
 	 * replace the last four characters in the filename with ".cvs".
 	 */
+	{
 	if (strlen(filename) - sizeof(CSV_SUFFIX) + 1 > 0)
 		suffix = filename + (strlen(filename) - sizeof(CSV_SUFFIX) + 1);
 	else
@@ -2014,6 +2136,7 @@ logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_
 		 * the filename is less than ".csv".
 		 */
 		suffix = filename + strlen(filename);
+	}
 	
 	if (gp_log_format == 0 && pg_strcasecmp(suffix, CSV_SUFFIX) == 0)
 	{
@@ -2024,6 +2147,15 @@ logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_
 	{
 		snprintf(suffix, sizeof(CSV_SUFFIX), CSV_SUFFIX);
 	}
+#endif
+
+	if (suffix != NULL)
+	{
+		len = strlen(filename);
+		if (len > 4 && (strcmp(filename + (len - 4), ".log") == 0))
+			len -= 4;
+		strlcpy(filename + len, suffix, MAXPGPATH - len);
+	}
 
     return filename;
 }
@@ -2031,7 +2163,7 @@ logfile_getname(pg_time_t timestamp, const char *log_directory, const char *log_
 /*
  * Determine the next planned rotation time, and store in next_rotation_time.
  */
-    static void
+static void
 set_next_rotation_time(void)
 {
     pg_time_t	now;
diff --git a/src/backend/postmaster/walwriter.c b/src/backend/postmaster/walwriter.c
new file mode 100644
index 000000000000..0dc20487bd1a
--- /dev/null
+++ b/src/backend/postmaster/walwriter.c
@@ -0,0 +1,315 @@
+/*-------------------------------------------------------------------------
+ *
+ * walwriter.c
+ *
+ * The WAL writer background process is new as of Postgres 8.3.  It attempts
+ * to keep regular backends from having to write out (and fsync) WAL pages.
+ * Also, it guarantees that transaction commit records that weren't synced
+ * to disk immediately upon commit (ie, were "asynchronously committed")
+ * will reach disk within a knowable time --- which, as it happens, is at
+ * most three times the wal_writer_delay cycle time.
+ *
+ * Note that as with the bgwriter for shared buffers, regular backends are
+ * still empowered to issue WAL writes and fsyncs when the walwriter doesn't
+ * keep up.
+ *
+ * Because the walwriter's cycle is directly linked to the maximum delay
+ * before async-commit transactions are guaranteed committed, it's probably
+ * unwise to load additional functionality onto it.  For instance, if you've
+ * got a yen to create xlog segments further in advance, that'd be better done
+ * in bgwriter than in walwriter.
+ *
+ * The walwriter is started by the postmaster as soon as the startup subprocess
+ * finishes.  It remains alive until the postmaster commands it to terminate.
+ * Normal termination is by SIGTERM, which instructs the walwriter to exit(0).
+ * Emergency termination is by SIGQUIT; like any backend, the walwriter will
+ * simply abort and exit on SIGQUIT.
+ *
+ * If the walwriter exits unexpectedly, the postmaster treats that the same
+ * as a backend crash: shared memory may be corrupted, so remaining backends
+ * should be killed by SIGQUIT and then a recovery cycle started.
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/walwriter.c,v 1.4 2008/01/01 19:45:51 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <signal.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "access/xlog.h"
+#include "libpq/pqsignal.h"
+#include "miscadmin.h"
+#include "postmaster/walwriter.h"
+#include "storage/bufmgr.h"
+#include "storage/fd.h"
+#include "storage/ipc.h"
+#include "storage/lwlock.h"
+#include "storage/pmsignal.h"
+#include "storage/smgr.h"
+#include "utils/guc.h"
+#include "utils/hsearch.h"
+#include "utils/memutils.h"
+#include "utils/resowner.h"
+
+
+/*
+ * GUC parameters
+ */
+int			WalWriterDelay = 200;
+
+/*
+ * Flags set by interrupt handlers for later service in the main loop.
+ */
+static volatile sig_atomic_t got_SIGHUP = false;
+static volatile sig_atomic_t shutdown_requested = false;
+
+/* Signal handlers */
+static void wal_quickdie(SIGNAL_ARGS);
+static void WalSigHupHandler(SIGNAL_ARGS);
+static void WalShutdownHandler(SIGNAL_ARGS);
+
+
+/*
+ * Main entry point for walwriter process
+ *
+ * This is invoked from BootstrapMain, which has already created the basic
+ * execution environment, but not enabled signals yet.
+ */
+void
+WalWriterMain(void)
+{
+	sigjmp_buf	local_sigjmp_buf;
+	MemoryContext walwriter_context;
+
+	/*
+	 * If possible, make this process a group leader, so that the postmaster
+	 * can signal any child processes too.	(walwriter probably never has any
+	 * child processes, but for consistency we make all postmaster child
+	 * processes do this.)
+	 */
+#ifdef HAVE_SETSID
+	if (setsid() < 0)
+		elog(FATAL, "setsid() failed: %m");
+#endif
+
+	/*
+	 * Properly accept or ignore signals the postmaster might send us
+	 *
+	 * We have no particular use for SIGINT at the moment, but seems
+	 * reasonable to treat like SIGTERM.
+	 */
+	pqsignal(SIGHUP, WalSigHupHandler); /* set flag to read config file */
+	pqsignal(SIGINT, WalShutdownHandler);		/* request shutdown */
+	pqsignal(SIGTERM, WalShutdownHandler);		/* request shutdown */
+	pqsignal(SIGQUIT, wal_quickdie);	/* hard crash time */
+	pqsignal(SIGALRM, SIG_IGN);
+	pqsignal(SIGPIPE, SIG_IGN);
+	pqsignal(SIGUSR1, SIG_IGN); /* reserve for sinval */
+	pqsignal(SIGUSR2, SIG_IGN); /* not used */
+
+	/*
+	 * Reset some signals that are accepted by postmaster but not here
+	 */
+	pqsignal(SIGCHLD, SIG_DFL);
+	pqsignal(SIGTTIN, SIG_DFL);
+	pqsignal(SIGTTOU, SIG_DFL);
+	pqsignal(SIGCONT, SIG_DFL);
+	pqsignal(SIGWINCH, SIG_DFL);
+
+	/* We allow SIGQUIT (quickdie) at all times */
+#ifdef HAVE_SIGPROCMASK
+	sigdelset(&BlockSig, SIGQUIT);
+#else
+	BlockSig &= ~(sigmask(SIGQUIT));
+#endif
+
+	/*
+	 * Create a resource owner to keep track of our resources (not clear that
+	 * we need this, but may as well have one).
+	 */
+	CurrentResourceOwner = ResourceOwnerCreate(NULL, "Wal Writer");
+
+	/*
+	 * Create a memory context that we will do all our work in.  We do this so
+	 * that we can reset the context during error recovery and thereby avoid
+	 * possible memory leaks.  Formerly this code just ran in
+	 * TopMemoryContext, but resetting that would be a really bad idea.
+	 */
+	walwriter_context = AllocSetContextCreate(TopMemoryContext,
+											  "Wal Writer",
+											  ALLOCSET_DEFAULT_MINSIZE,
+											  ALLOCSET_DEFAULT_INITSIZE,
+											  ALLOCSET_DEFAULT_MAXSIZE);
+	MemoryContextSwitchTo(walwriter_context);
+
+	/*
+	 * If an exception is encountered, processing resumes here.
+	 *
+	 * This code is heavily based on bgwriter.c, q.v.
+	 */
+	if (sigsetjmp(local_sigjmp_buf, 1) != 0)
+	{
+		/* Since not using PG_TRY, must reset error stack by hand */
+		error_context_stack = NULL;
+
+		/* Prevent interrupts while cleaning up */
+		HOLD_INTERRUPTS();
+
+		/* Report the error to the server log */
+		EmitErrorReport();
+
+		/*
+		 * These operations are really just a minimal subset of
+		 * AbortTransaction().	We don't have very many resources to worry
+		 * about in walwriter, but we do have LWLocks, and perhaps buffers?
+		 */
+		LWLockReleaseAll();
+		AbortBufferIO();
+		UnlockBuffers();
+		/* buffer pins are released here: */
+		ResourceOwnerRelease(CurrentResourceOwner,
+							 RESOURCE_RELEASE_BEFORE_LOCKS,
+							 false, true);
+		/* we needn't bother with the other ResourceOwnerRelease phases */
+		AtEOXact_Buffers(false);
+		AtEOXact_Files();
+		AtEOXact_HashTables(false);
+
+		/*
+		 * Now return to normal top-level context and clear ErrorContext for
+		 * next time.
+		 */
+		MemoryContextSwitchTo(walwriter_context);
+		FlushErrorState();
+
+		/* Flush any leaked data in the top-level context */
+		MemoryContextResetAndDeleteChildren(walwriter_context);
+
+		/* Now we can allow interrupts again */
+		RESUME_INTERRUPTS();
+
+		/*
+		 * Sleep at least 1 second after any error.  A write error is likely
+		 * to be repeated, and we don't want to be filling the error logs as
+		 * fast as we can.
+		 */
+		pg_usleep(1000000L);
+
+		/*
+		 * Close all open files after any error.  This is helpful on Windows,
+		 * where holding deleted files open causes various strange errors.
+		 * It's not clear we need it elsewhere, but shouldn't hurt.
+		 */
+		smgrcloseall();
+	}
+
+	/* We can now handle ereport(ERROR) */
+	PG_exception_stack = &local_sigjmp_buf;
+
+	/*
+	 * Unblock signals (they were blocked when the postmaster forked us)
+	 */
+	PG_SETMASK(&UnBlockSig);
+
+	/*
+	 * Loop forever
+	 */
+	for (;;)
+	{
+		long		udelay;
+
+		/*
+		 * Emergency bailout if postmaster has died.  This is to avoid the
+		 * necessity for manual cleanup of all postmaster children.
+		 */
+		if (!PostmasterIsAlive(true))
+			exit(1);
+
+		/*
+		 * Process any requests or signals received recently.
+		 */
+		if (got_SIGHUP)
+		{
+			got_SIGHUP = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
+		if (shutdown_requested)
+		{
+			/* Normal exit from the walwriter is here */
+			proc_exit(0);		/* done */
+		}
+
+		/*
+		 * Do what we're here for...
+		 */
+		XLogBackgroundFlush();
+
+		/*
+		 * Delay until time to do something more, but fall out of delay
+		 * reasonably quickly if signaled.
+		 */
+		udelay = WalWriterDelay * 1000L;
+		while (udelay > 999999L)
+		{
+			if (got_SIGHUP || shutdown_requested)
+				break;
+			pg_usleep(1000000L);
+			udelay -= 1000000L;
+		}
+		if (!(got_SIGHUP || shutdown_requested))
+			pg_usleep(udelay);
+	}
+}
+
+
+/* --------------------------------
+ *		signal handler routines
+ * --------------------------------
+ */
+
+/*
+ * wal_quickdie() occurs when signalled SIGQUIT by the postmaster.
+ *
+ * Some backend has bought the farm,
+ * so we need to stop what we're doing and exit.
+ */
+static void
+wal_quickdie(SIGNAL_ARGS)
+{
+	PG_SETMASK(&BlockSig);
+
+	/*
+	 * DO NOT proc_exit() -- we're here because shared memory may be
+	 * corrupted, so we don't want to try to clean up our transaction. Just
+	 * nail the windows shut and get out of town.
+	 *
+	 * Note we do exit(2) not exit(0).	This is to force the postmaster into a
+	 * system reset cycle if some idiot DBA sends a manual SIGQUIT to a random
+	 * backend.  This is necessary precisely because we don't clean up our
+	 * shared memory state.
+	 */
+	exit(2);
+}
+
+/* SIGHUP: set flag to re-read config file at next convenient time */
+static void
+WalSigHupHandler(SIGNAL_ARGS)
+{
+	got_SIGHUP = true;
+}
+
+/* SIGTERM: set flag to exit normally */
+static void
+WalShutdownHandler(SIGNAL_ARGS)
+{
+	shutdown_requested = true;
+}
diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile
index 146a3d5b3434..ef697652a017 100644
--- a/src/backend/regex/Makefile
+++ b/src/backend/regex/Makefile
@@ -12,7 +12,7 @@ subdir = src/backend/regex
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = regcomp.o regerror.o regexec.o regfree.o
+OBJS = regcomp.o regerror.o regexec.o regfree.o regprefix.o
 
 include $(top_srcdir)/src/backend/common.mk
 
diff --git a/src/backend/regex/regc_color.c b/src/backend/regex/regc_color.c
index e15fd4b788e9..99c28505ae92 100644
--- a/src/backend/regex/regc_color.c
+++ b/src/backend/regex/regc_color.c
@@ -66,8 +66,9 @@ initcm(struct vars * v,
 	cd = cm->cd;				/* cm->cd[WHITE] */
 	cd->sub = NOSUB;
 	cd->arcs = NULL;
-	cd->flags = 0;
+	cd->firstchr = CHR_MIN;
 	cd->nchrs = CHR_MAX - CHR_MIN + 1;
+	cd->flags = 0;
 
 	/* upper levels of tree */
 	for (t = &cm->tree[0], j = NBYTS - 1; j > 0; t = nextt, j--)
@@ -272,6 +273,7 @@ newcolor(struct colormap * cm)
 	cd->nchrs = 0;
 	cd->sub = NOSUB;
 	cd->arcs = NULL;
+	cd->firstchr = CHR_MIN;		/* in case never set otherwise */
 	cd->flags = 0;
 	cd->block = NULL;
 
@@ -371,6 +373,8 @@ subcolor(struct colormap * cm, chr c)
 	if (co == sco)				/* already in an open subcolor */
 		return co;				/* rest is redundant */
 	cm->cd[co].nchrs--;
+	if (cm->cd[sco].nchrs == 0)
+		cm->cd[sco].firstchr = c;
 	cm->cd[sco].nchrs++;
 	setcolor(cm, c, sco);
 	return sco;
@@ -438,6 +442,11 @@ subrange(struct vars * v,
 
 /*
  * subblock - allocate new subcolors for one tree block of chrs, fill in arcs
+ *
+ * Note: subcolors that are created during execution of this function
+ * will not be given a useful value of firstchr; it'll be left as CHR_MIN.
+ * For the current usage of firstchr in pg_regprefix, this does not matter
+ * because such subcolors won't occur in the common prefix of a regex.
  */
 static void
 subblock(struct vars * v,
diff --git a/src/backend/regex/regc_nfa.c b/src/backend/regex/regc_nfa.c
index ef56630173a3..058cdf51099e 100644
--- a/src/backend/regex/regc_nfa.c
+++ b/src/backend/regex/regc_nfa.c
@@ -93,7 +93,7 @@ newnfa(struct vars * v,
  * TooManyStates - checks if the max states exceeds the compile-time value
  */
 static int
-TooManyStates(struct nfa * nfa)
+TooManyStates(struct nfa *nfa)
 {
 	struct nfa *parent = nfa->parent;
 	size_t		sz = nfa->size;
@@ -112,7 +112,7 @@ TooManyStates(struct nfa * nfa)
  * IncrementSize - increases the tracked size of the NFA and its parents.
  */
 static void
-IncrementSize(struct nfa * nfa)
+IncrementSize(struct nfa *nfa)
 {
 	struct nfa *parent = nfa->parent;
 
@@ -128,7 +128,7 @@ IncrementSize(struct nfa * nfa)
  * DecrementSize - decreases the tracked size of the NFA and its parents.
  */
 static void
-DecrementSize(struct nfa * nfa)
+DecrementSize(struct nfa *nfa)
 {
 	struct nfa *parent = nfa->parent;
 
@@ -856,8 +856,7 @@ pull(struct nfa * nfa,
 
 	/*
 	 * DGP 2007-11-15: Cloning a state with a circular constraint on its list
-	 * of outs can lead to trouble [Tcl Bug 1810038], so get rid of them
-	 * first.
+	 * of outs can lead to trouble [Tcl Bug 1810038], so get rid of them first.
 	 */
 	for (a = from->outs; a != NULL; a = nexta)
 	{
@@ -999,12 +998,12 @@ push(struct nfa * nfa,
 	}
 
 	/*
-	 * DGP 2007-11-15: Here we duplicate the same protections as appear in
-	 * pull() above to avoid troubles with cloning a state with a circular
-	 * constraint on its list of ins.  It is not clear whether this is
-	 * necessary, or is protecting against a "can't happen". Any test case
-	 * that actually leads to a freearc() call here would be a welcome
-	 * addition to the test suite.
+	 * DGP 2007-11-15: Here we duplicate the same protections as appear
+	 * in pull() above to avoid troubles with cloning a state with a
+	 * circular constraint on its list of ins.  It is not clear whether
+	 * this is necessary, or is protecting against a "can't happen".
+	 * Any test case that actually leads to a freearc() call here would
+	 * be a welcome addition to the test suite.
 	 */
 	for (a = to->ins; a != NULL; a = nexta)
 	{
@@ -1330,14 +1329,16 @@ compact(struct nfa * nfa,
 	for (s = nfa->states; s != NULL; s = s->next)
 	{
 		nstates++;
-		narcs += 1 + s->nouts + 1;
-		/* 1 as a fake for flags, nouts for arcs, 1 as endmarker */
+		narcs += s->nouts + 1;		/* need one extra for endmarker */
 	}
 
+	cnfa->stflags = (char *) MALLOC(nstates * sizeof(char));
 	cnfa->states = (struct carc **) MALLOC(nstates * sizeof(struct carc *));
 	cnfa->arcs = (struct carc *) MALLOC(narcs * sizeof(struct carc));
-	if (cnfa->states == NULL || cnfa->arcs == NULL)
+	if (cnfa->stflags == NULL || cnfa->states == NULL || cnfa->arcs == NULL)
 	{
+		if (cnfa->stflags != NULL)
+			FREE(cnfa->stflags);
 		if (cnfa->states != NULL)
 			FREE(cnfa->states);
 		if (cnfa->arcs != NULL)
@@ -1359,9 +1360,8 @@ compact(struct nfa * nfa,
 	for (s = nfa->states; s != NULL; s = s->next)
 	{
 		assert((size_t) s->no < nstates);
+		cnfa->stflags[s->no] = 0;
 		cnfa->states[s->no] = ca;
-		ca->co = 0;				/* clear and skip flags "arc" */
-		ca++;
 		first = ca;
 		for (a = s->outs; a != NULL; a = a->outchain)
 			switch (a->type)
@@ -1392,8 +1392,8 @@ compact(struct nfa * nfa,
 
 	/* mark no-progress states */
 	for (a = nfa->pre->outs; a != NULL; a = a->outchain)
-		cnfa->states[a->to->no]->co = 1;
-	cnfa->states[nfa->pre->no]->co = 1;
+		cnfa->stflags[a->to->no] = CNFA_NOPROGRESS;
+	cnfa->stflags[nfa->pre->no] = CNFA_NOPROGRESS;
 }
 
 /*
@@ -1433,6 +1433,7 @@ freecnfa(struct cnfa * cnfa)
 {
 	assert(cnfa->nstates != 0); /* not empty already */
 	cnfa->nstates = 0;
+	FREE(cnfa->stflags);
 	FREE(cnfa->states);
 	FREE(cnfa->arcs);
 }
@@ -1617,7 +1618,7 @@ dumpcnfa(struct cnfa * cnfa,
 		fprintf(f, ", haslacons");
 	fprintf(f, "\n");
 	for (st = 0; st < cnfa->nstates; st++)
-		dumpcstate(st, cnfa->states[st], cnfa, f);
+		dumpcstate(st, cnfa, f);
 	fflush(f);
 }
 #endif
@@ -1629,22 +1630,20 @@ dumpcnfa(struct cnfa * cnfa,
  */
 static void
 dumpcstate(int st,
-		   struct carc * ca,
 		   struct cnfa * cnfa,
 		   FILE *f)
 {
-	int			i;
+	struct carc * ca;
 	int			pos;
 
-	fprintf(f, "%d%s", st, (ca[0].co) ? ":" : ".");
+	fprintf(f, "%d%s", st, (cnfa->stflags[st] & CNFA_NOPROGRESS) ? ":" : ".");
 	pos = 1;
-	for (i = 1; ca[i].co != COLORLESS; i++)
+	for (ca = cnfa->states[st]; ca->co != COLORLESS; ca++)
 	{
-		if (ca[i].co < cnfa->ncolors)
-			fprintf(f, "\t[%ld]->%d", (long) ca[i].co, ca[i].to);
+		if (ca->co < cnfa->ncolors)
+			fprintf(f, "\t[%ld]->%d", (long) ca->co, ca->to);
 		else
-			fprintf(f, "\t:%ld:->%d", (long) ca[i].co - cnfa->ncolors,
-					ca[i].to);
+			fprintf(f, "\t:%ld:->%d", (long) (ca->co - cnfa->ncolors), ca->to);
 		if (pos == 5)
 		{
 			fprintf(f, "\n");
@@ -1653,7 +1652,7 @@ dumpcstate(int st,
 		else
 			pos++;
 	}
-	if (i == 1 || pos != 1)
+	if (ca == cnfa->states[st] || pos != 1)
 		fprintf(f, "\n");
 	fflush(f);
 }
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 0c08237299d2..3ec6f30a0c85 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -162,7 +162,7 @@ static void dumparcs(struct state *, FILE *);
 static int	dumprarcs(struct arc *, struct state *, FILE *, int);
 static void dumparc(struct arc *, struct state *, FILE *);
 static void dumpcnfa(struct cnfa *, FILE *);
-static void dumpcstate(int, struct carc *, struct cnfa *, FILE *);
+static void dumpcstate(int, struct cnfa *, FILE *);
 #endif
 /* === regc_cvec.c === */
 static struct cvec *newcvec(int, int);
@@ -277,6 +277,9 @@ static struct fns functions = {
 
 /*
  * pg_regcomp - compile regular expression
+ *
+ * Note: on failure, no resources remain allocated, so pg_regfree()
+ * need not be applied to re.
  */
 int
 pg_regcomp(regex_t *re,
@@ -1073,8 +1076,12 @@ parseqatom(struct vars * v,
 		NOERR();
 	}
 
-	/* it's quantifier time; first, turn x{0,...} into x{1,...}|empty */
-	if (m == 0)
+	/*
+	 * It's quantifier time.  If the atom is just a BACKREF, we'll let it deal
+	 * with quantifiers internally.  Otherwise, the first step is to turn
+	 * x{0,...} into x{1,...}|empty
+	 */
+	if (m == 0 && atomtype != BACKREF)
 	{
 		EMPTYARC(s2, atom->end);	/* the bypass */
 		assert(PREF(qprefer) != 0);
@@ -1833,15 +1840,18 @@ rfree(regex_t *re)
 	g = (struct guts *) re->re_guts;
 	re->re_guts = NULL;
 	re->re_fns = NULL;
-	g->magic = 0;
-	freecm(&g->cmap);
-	if (g->tree != NULL)
-		freesubre((struct vars *) NULL, g->tree);
-	if (g->lacons != NULL)
-		freelacons(g->lacons, g->nlacons);
-	if (!NULLCNFA(g->search))
-		freecnfa(&g->search);
-	FREE(g);
+	if (g != NULL)
+	{
+		g->magic = 0;
+		freecm(&g->cmap);
+		if (g->tree != NULL)
+			freesubre((struct vars *) NULL, g->tree);
+		if (g->lacons != NULL)
+			freelacons(g->lacons, g->nlacons);
+		if (!NULLCNFA(g->search))
+			freecnfa(&g->search);
+		FREE(g);
+	}
 }
 
 #ifdef REG_DEBUG
diff --git a/src/backend/regex/rege_dfa.c b/src/backend/regex/rege_dfa.c
index d35d855f329e..d277ec48f99a 100644
--- a/src/backend/regex/rege_dfa.c
+++ b/src/backend/regex/rege_dfa.c
@@ -458,14 +458,14 @@ miss(struct vars * v,			/* used only for debug flags */
 	gotstate = 0;
 	for (i = 0; i < d->nstates; i++)
 		if (ISBSET(css->states, i))
-			for (ca = cnfa->states[i] + 1; ca->co != COLORLESS; ca++)
+			for (ca = cnfa->states[i]; ca->co != COLORLESS; ca++)
 				if (ca->co == co)
 				{
 					BSET(d->work, ca->to);
 					gotstate = 1;
 					if (ca->to == cnfa->post)
 						ispost = 1;
-					if (!cnfa->states[ca->to]->co)
+					if (!(cnfa->stflags[ca->to] & CNFA_NOPROGRESS))
 						noprogress = 0;
 					FDEBUG(("%d -> %d\n", i, ca->to));
 				}
@@ -476,10 +476,9 @@ miss(struct vars * v,			/* used only for debug flags */
 		dolacons = 0;
 		for (i = 0; i < d->nstates; i++)
 			if (ISBSET(d->work, i))
-				for (ca = cnfa->states[i] + 1; ca->co != COLORLESS;
-					 ca++)
+				for (ca = cnfa->states[i]; ca->co != COLORLESS; ca++)
 				{
-					if (ca->co <= cnfa->ncolors)
+					if (ca->co < cnfa->ncolors)
 						continue;		/* NOTE CONTINUE */
 					sawlacons = 1;
 					if (ISBSET(d->work, ca->to))
@@ -490,7 +489,7 @@ miss(struct vars * v,			/* used only for debug flags */
 					dolacons = 1;
 					if (ca->to == cnfa->post)
 						ispost = 1;
-					if (!cnfa->states[ca->to]->co)
+					if (!(cnfa->stflags[ca->to] & CNFA_NOPROGRESS))
 						noprogress = 0;
 					FDEBUG(("%d :> %d\n", i, ca->to));
 				}
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index aa00161a5604..d727def6fbfe 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -27,7 +27,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.27 2005/10/15 02:49:24 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.27.6.1 2010/02/01 02:45:41 tgl Exp $
  *
  */
 
@@ -142,6 +142,7 @@ static int	dissect(struct vars *, struct subre *, chr *, chr *);
 static int	condissect(struct vars *, struct subre *, chr *, chr *);
 static int	altdissect(struct vars *, struct subre *, chr *, chr *);
 static int	cdissect(struct vars *, struct subre *, chr *, chr *);
+static int	ccaptdissect(struct vars *, struct subre *, chr *, chr *);
 static int	ccondissect(struct vars *, struct subre *, chr *, chr *);
 static int	crevdissect(struct vars *, struct subre *, chr *, chr *);
 static int	cbrdissect(struct vars *, struct subre *, chr *, chr *);
@@ -561,27 +562,21 @@ dissect(struct vars * v,
 		case '=':				/* terminal node */
 			assert(t->left == NULL && t->right == NULL);
 			return REG_OKAY;	/* no action, parent did the work */
-			break;
 		case '|':				/* alternation */
 			assert(t->left != NULL);
 			return altdissect(v, t, begin, end);
-			break;
 		case 'b':				/* back ref -- shouldn't be calling us! */
 			return REG_ASSERT;
-			break;
 		case '.':				/* concatenation */
 			assert(t->left != NULL && t->right != NULL);
 			return condissect(v, t, begin, end);
-			break;
 		case '(':				/* capturing */
 			assert(t->left != NULL && t->right == NULL);
 			assert(t->subno > 0);
 			subset(v, t, begin, end);
 			return dissect(v, t->left, begin, end);
-			break;
 		default:
 			return REG_ASSERT;
-			break;
 	}
 }
 
@@ -711,8 +706,6 @@ cdissect(struct vars * v,
 		 chr *begin,			/* beginning of relevant substring */
 		 chr *end)				/* end of same */
 {
-	int			er;
-
 	assert(t != NULL);
 	MDEBUG(("cdissect %ld-%ld %c\n", LOFF(begin), LOFF(end), t->op));
 
@@ -721,33 +714,42 @@ cdissect(struct vars * v,
 		case '=':				/* terminal node */
 			assert(t->left == NULL && t->right == NULL);
 			return REG_OKAY;	/* no action, parent did the work */
-			break;
 		case '|':				/* alternation */
 			assert(t->left != NULL);
 			return caltdissect(v, t, begin, end);
-			break;
-		case 'b':				/* back ref -- shouldn't be calling us! */
+		case 'b':				/* back reference */
 			assert(t->left == NULL && t->right == NULL);
 			return cbrdissect(v, t, begin, end);
-			break;
 		case '.':				/* concatenation */
 			assert(t->left != NULL && t->right != NULL);
 			return ccondissect(v, t, begin, end);
-			break;
 		case '(':				/* capturing */
 			assert(t->left != NULL && t->right == NULL);
-			assert(t->subno > 0);
-			er = cdissect(v, t->left, begin, end);
-			if (er == REG_OKAY)
-				subset(v, t, begin, end);
-			return er;
-			break;
+			return ccaptdissect(v, t, begin, end);
 		default:
 			return REG_ASSERT;
-			break;
 	}
 }
 
+/*
+ * ccaptdissect - capture subexpression matches (with complications)
+ */
+static int						/* regexec return code */
+ccaptdissect(struct vars * v,
+			 struct subre * t,
+			 chr *begin,		/* beginning of relevant substring */
+			 chr *end)			/* end of same */
+{
+	int			er;
+
+	assert(t->subno > 0);
+
+	er = cdissect(v, t->left, begin, end);
+	if (er == REG_OKAY)
+		subset(v, t, begin, end);
+	return er;
+}
+
 /*
  * ccondissect - concatenation subexpression matches (with complications)
  * The retry memory stores the offset of the trial midpoint from begin,
@@ -805,17 +807,27 @@ ccondissect(struct vars * v,
 	for (;;)
 	{
 		/* try this midpoint on for size */
-		er = cdissect(v, t->left, begin, mid);
-		if (er == REG_OKAY &&
-			longest(v, d2, mid, end, (int *) NULL) == end &&
-			(er = cdissect(v, t->right, mid, end)) ==
-			REG_OKAY)
-			break;				/* NOTE BREAK OUT */
-		if (er != REG_OKAY && er != REG_NOMATCH)
+		if (longest(v, d2, mid, end, (int *) NULL) == end)
 		{
-			freedfa(d);
-			freedfa(d2);
-			return er;
+			er = cdissect(v, t->left, begin, mid);
+			if (er == REG_OKAY)
+			{
+				er = cdissect(v, t->right, mid, end);
+				if (er == REG_OKAY)
+				{
+					/* satisfaction */
+					MDEBUG(("successful\n"));
+					freedfa(d);
+					freedfa(d2);
+					return REG_OKAY;
+				}
+			}
+			if (er != REG_OKAY && er != REG_NOMATCH)
+			{
+				freedfa(d);
+				freedfa(d2);
+				return er;
+			}
 		}
 
 		/* that midpoint didn't work, find a new one */
@@ -842,11 +854,8 @@ ccondissect(struct vars * v,
 		zapmem(v, t->right);
 	}
 
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	return REG_OKAY;
+	/* can't get here */
+	return REG_ASSERT;
 }
 
 /*
@@ -905,17 +914,27 @@ crevdissect(struct vars * v,
 	for (;;)
 	{
 		/* try this midpoint on for size */
-		er = cdissect(v, t->left, begin, mid);
-		if (er == REG_OKAY &&
-			longest(v, d2, mid, end, (int *) NULL) == end &&
-			(er = cdissect(v, t->right, mid, end)) ==
-			REG_OKAY)
-			break;				/* NOTE BREAK OUT */
-		if (er != REG_OKAY && er != REG_NOMATCH)
+		if (longest(v, d2, mid, end, (int *) NULL) == end)
 		{
-			freedfa(d);
-			freedfa(d2);
-			return er;
+			er = cdissect(v, t->left, begin, mid);
+			if (er == REG_OKAY)
+			{
+				er = cdissect(v, t->right, mid, end);
+				if (er == REG_OKAY)
+				{
+					/* satisfaction */
+					MDEBUG(("successful\n"));
+					freedfa(d);
+					freedfa(d2);
+					return REG_OKAY;
+				}
+			}
+			if (er != REG_OKAY && er != REG_NOMATCH)
+			{
+				freedfa(d);
+				freedfa(d2);
+				return er;
+			}
 		}
 
 		/* that midpoint didn't work, find a new one */
@@ -942,11 +961,8 @@ crevdissect(struct vars * v,
 		zapmem(v, t->right);
 	}
 
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	return REG_OKAY;
+	/* can't get here */
+	return REG_ASSERT;
 }
 
 /*
@@ -958,12 +974,12 @@ cbrdissect(struct vars * v,
 		   chr *begin,			/* beginning of relevant substring */
 		   chr *end)			/* end of same */
 {
-	int			i;
 	int			n = t->subno;
-	size_t		len;
-	chr		   *paren;
+	size_t		numreps;
+	size_t		tlen;
+	size_t		brlen;
+	chr		   *brstring;
 	chr		   *p;
-	chr		   *stop;
 	int			min = t->min;
 	int			max = t->max;
 
@@ -974,46 +990,65 @@ cbrdissect(struct vars * v,
 
 	MDEBUG(("cbackref n%d %d{%d-%d}\n", t->retry, n, min, max));
 
+	/* get the backreferenced string */
 	if (v->pmatch[n].rm_so == -1)
 		return REG_NOMATCH;
-	paren = v->start + v->pmatch[n].rm_so;
-	len = v->pmatch[n].rm_eo - v->pmatch[n].rm_so;
+	brstring = v->start + v->pmatch[n].rm_so;
+	brlen = v->pmatch[n].rm_eo - v->pmatch[n].rm_so;
 
 	/* no room to maneuver -- retries are pointless */
 	if (v->mem[t->retry])
 		return REG_NOMATCH;
 	v->mem[t->retry] = 1;
 
-	/* special-case zero-length string */
-	if (len == 0)
+	/* special cases for zero-length strings */
+	if (brlen == 0)
 	{
-		if (begin == end)
+		/*
+		 * matches only if target is zero length, but any number of
+		 * repetitions can be considered to be present
+		 */
+		if (begin == end && min <= max)
+		{
+			MDEBUG(("cbackref matched trivially\n"));
 			return REG_OKAY;
+		}
+		return REG_NOMATCH;
+	}
+	if (begin == end)
+	{
+		/* matches only if zero repetitions are okay */
+		if (min == 0)
+		{
+			MDEBUG(("cbackref matched trivially\n"));
+			return REG_OKAY;
+		}
 		return REG_NOMATCH;
 	}
 
-	/* and too-short string */
-	assert(end >= begin);
-	if ((size_t) (end - begin) < len)
+	/*
+	 * check target length to see if it could possibly be an allowed number of
+	 * repetitions of brstring
+	 */
+	assert(end > begin);
+	tlen = end - begin;
+	if (tlen % brlen != 0)
+		return REG_NOMATCH;
+	numreps = tlen / brlen;
+	if (numreps < min || (numreps > max && max != INFINITY))
 		return REG_NOMATCH;
-	stop = end - len;
 
-	/* count occurrences */
-	i = 0;
-	for (p = begin; p <= stop && (i < max || max == INFINITY); p += len)
+	/* okay, compare the actual string contents */
+	p = begin;
+	while (numreps-- > 0)
 	{
-		if ((*v->g->compare) (paren, p, len) != 0)
-			break;
-		i++;
+		if ((*v->g->compare) (brstring, p, brlen) != 0)
+			return REG_NOMATCH;
+		p += brlen;
 	}
-	MDEBUG(("cbackref found %d\n", i));
 
-	/* and sort it out */
-	if (p != end)				/* didn't consume all of it */
-		return REG_NOMATCH;
-	if (min <= i && (i <= max || max == INFINITY))
-		return REG_OKAY;
-	return REG_NOMATCH;			/* out of range */
+	MDEBUG(("cbackref matched\n"));
+	return REG_OKAY;
 }
 
 /*
diff --git a/src/backend/regex/regprefix.c b/src/backend/regex/regprefix.c
new file mode 100644
index 000000000000..97f1579d9374
--- /dev/null
+++ b/src/backend/regex/regprefix.c
@@ -0,0 +1,256 @@
+/*-------------------------------------------------------------------------
+ *
+ * regprefix.c
+ *	  Extract a common prefix, if any, from a compiled regex.
+ *
+ *
+ * Portions Copyright (c) 2012, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1998, 1999 Henry Spencer
+ *
+ * IDENTIFICATION
+ *	  src/backend/regex/regprefix.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "regex/regguts.h"
+
+
+/*
+ * forward declarations
+ */
+static int findprefix(struct cnfa * cnfa, struct colormap * cm,
+					  chr *string, size_t *slength);
+
+
+/*
+ * pg_regprefix - get common prefix for regular expression
+ *
+ * Returns one of:
+ *	REG_NOMATCH: there is no common prefix of strings matching the regex
+ *	REG_PREFIX: there is a common prefix of strings matching the regex
+ *	REG_EXACT: all strings satisfying the regex must match the same string
+ *	or a REG_XXX error code
+ *
+ * In the non-failure cases, *string is set to a malloc'd string containing
+ * the common prefix or exact value, of length *slength (measured in chrs
+ * not bytes!).
+ *
+ * This function does not analyze all complex cases (such as lookahead
+ * constraints) exactly.  Therefore it is possible that some strings matching
+ * the reported prefix or exact-match string do not satisfy the regex.  But
+ * it should never be the case that a string satisfying the regex does not
+ * match the reported prefix or exact-match string.
+ */
+int
+pg_regprefix(regex_t *re,
+			 chr **string,
+			 size_t *slength)
+{
+	struct guts *g;
+	struct cnfa *cnfa;
+	int			st;
+
+	/* sanity checks */
+	if (string == NULL || slength == NULL)
+		return REG_INVARG;
+	*string = NULL;				/* initialize for failure cases */
+	*slength = 0;
+	if (re == NULL || re->re_magic != REMAGIC)
+		return REG_INVARG;
+	if (re->re_csize != sizeof(chr))
+		return REG_MIXED;
+
+	/* setup */
+	g = (struct guts *) re->re_guts;
+	if (g->info & REG_UIMPOSSIBLE)
+		return REG_NOMATCH;
+
+	/*
+	 * This implementation considers only the search NFA for the topmost regex
+	 * tree node.  Therefore, constraints such as backrefs are not fully
+	 * applied, which is allowed per the function's API spec.
+	 */
+	assert(g->tree != NULL);
+	cnfa = &g->tree->cnfa;
+
+	/*
+	 * Since a correct NFA should never contain any exit-free loops, it should
+	 * not be possible for our traversal to return to a previously visited
+	 * NFA state.  Hence we need at most nstates chrs in the output string.
+	 */
+	*string = (chr *) MALLOC(cnfa->nstates * sizeof(chr));
+	if (*string == NULL)
+		return REG_ESPACE;
+
+	/* do it */
+	st = findprefix(cnfa, &g->cmap, *string, slength);
+
+	assert(*slength <= cnfa->nstates);
+
+	/* clean up */
+	if (st != REG_PREFIX && st != REG_EXACT)
+	{
+		FREE(*string);
+		*string = NULL;
+		*slength = 0;
+	}
+
+	return st;
+}
+
+/*
+ * findprefix - extract common prefix from cNFA
+ *
+ * Results are returned into the preallocated chr array string[], with
+ * *slength (which must be preset to zero) incremented for each chr.
+ */
+static int						/* regprefix return code */
+findprefix(struct cnfa * cnfa,
+		   struct colormap * cm,
+		   chr *string,
+		   size_t *slength)
+{
+	int			st;
+	int			nextst;
+	color		thiscolor;
+	chr			c;
+	struct carc *ca;
+
+	/*
+	 * The "pre" state must have only BOS/BOL outarcs, else pattern isn't
+	 * anchored left.  If we have both BOS and BOL, they must go to the
+	 * same next state.
+	 */
+	st = cnfa->pre;
+	nextst = -1;
+	for (ca = cnfa->states[st]; ca->co != COLORLESS; ca++)
+	{
+		if (ca->co == cnfa->bos[0] || ca->co == cnfa->bos[1])
+		{
+			if (nextst == -1)
+				nextst = ca->to;
+			else if (nextst != ca->to)
+				return REG_NOMATCH;
+		}
+		else
+			return REG_NOMATCH;
+	}
+	if (nextst == -1)
+		return REG_NOMATCH;
+
+	/*
+	 * Scan through successive states, stopping as soon as we find one with
+	 * more than one acceptable transition character (either multiple colors
+	 * on out-arcs, or a color with more than one member chr).
+	 *
+	 * We could find a state with multiple out-arcs that are all labeled with
+	 * the same singleton color; this comes from patterns like "^ab(cde|cxy)".
+	 * In that case we add the chr "c" to the output string but then exit the
+	 * loop with nextst == -1.  This leaves a little bit on the table: if the
+	 * pattern is like "^ab(cde|cdy)", we won't notice that "d" could be added
+	 * to the prefix.  But chasing multiple parallel state chains doesn't seem
+	 * worth the trouble.
+	 */
+	do
+	{
+		st = nextst;
+		nextst = -1;
+		thiscolor = COLORLESS;
+		for (ca = cnfa->states[st]; ca->co != COLORLESS; ca++)
+		{
+			/* We ignore lookahead constraints */
+			if (ca->co >= cnfa->ncolors)
+				continue;
+			/* We can also ignore BOS/BOL arcs */
+			if (ca->co == cnfa->bos[0] || ca->co == cnfa->bos[1])
+				continue;
+			/* ... but EOS/EOL arcs terminate the search */
+			if (ca->co == cnfa->eos[0] || ca->co == cnfa->eos[1])
+			{
+				thiscolor = COLORLESS;
+				break;
+			}
+			if (thiscolor == COLORLESS)
+			{
+				/* First plain outarc */
+				thiscolor = ca->co;
+				nextst = ca->to;
+			}
+			else if (thiscolor == ca->co)
+			{
+				/* Another plain outarc for same color */
+				nextst = -1;
+			}
+			else
+			{
+				/* More than one plain outarc color terminates the search */
+				thiscolor = COLORLESS;
+				break;
+			}
+		}
+		/* Done if we didn't find exactly one color on plain outarcs */
+		if (thiscolor == COLORLESS)
+			break;
+		/* The color must be a singleton */
+		if (cm->cd[thiscolor].nchrs != 1)
+			break;
+
+		/*
+		 * Identify the color's sole member chr and add it to the prefix
+		 * string.  In general the colormap data structure doesn't provide a
+		 * way to find color member chrs, except by trying GETCOLOR() on each
+		 * possible chr value, which won't do at all.  However, for the cases
+		 * we care about it should be sufficient to test the "firstchr" value,
+		 * that is the first chr ever added to the color.  There are cases
+		 * where this might no longer be a member of the color (so we do need
+		 * to test), but none of them are likely to arise for a character that
+		 * is a member of a common prefix.  If we do hit such a corner case,
+		 * we just fall out without adding anything to the prefix string.
+		 */
+		c = cm->cd[thiscolor].firstchr;
+		if (GETCOLOR(cm, c) != thiscolor)
+			break;
+
+		string[(*slength)++] = c;
+
+		/* Advance to next state, but only if we have a unique next state */
+	} while (nextst != -1);
+
+	/*
+	 * If we ended at a state that only has EOS/EOL outarcs leading to the
+	 * "post" state, then we have an exact-match string.  Note this is true
+	 * even if the string is of zero length.
+	 */
+	nextst = -1;
+	for (ca = cnfa->states[st]; ca->co != COLORLESS; ca++)
+	{
+		if (ca->co == cnfa->eos[0] || ca->co == cnfa->eos[1])
+		{
+			if (nextst == -1)
+				nextst = ca->to;
+			else if (nextst != ca->to)
+			{
+				nextst = -1;
+				break;
+			}
+		}
+		else
+		{
+			nextst = -1;
+			break;
+		}
+	}
+	if (nextst == cnfa->post)
+		return REG_EXACT;
+
+	/*
+	 * Otherwise, if we were unable to identify any prefix characters, say
+	 * NOMATCH --- the pattern is anchored left, but doesn't specify any
+	 * particular first character.
+	 */
+	if (*slength > 0)
+		return REG_PREFIX;
+
+	return REG_NOMATCH;
+}
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 983470d1aacc..492a650fca78 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.117 2007/02/01 19:10:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.124 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,16 +19,19 @@
 #include "catalog/catquery.h"
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
+#include "catalog/namespace.h"
 #include "catalog/pg_rewrite.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "parser/parse_expr.h"
+#include "parser/parse_utilcmd.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteManip.h"
 #include "rewrite/rewriteSupport.h"
 #include "storage/smgr.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
+#include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/rel.h"
 #include "utils/syscache.h"
@@ -58,8 +61,7 @@ InsertRule(char *rulname,
 		   bool evinstead,
 		   Node *event_qual,
 		   List *action,
-		   bool replace,
-		   Oid ruleOid)
+		   bool replace)
 {
 	char	   *evqual = nodeToString(event_qual);
 	char	   *actiontree = nodeToString((Node *) action);
@@ -87,6 +89,7 @@ InsertRule(char *rulname,
 	values[i++] = ObjectIdGetDatum(eventrel_oid);		/* ev_class */
 	values[i++] = Int16GetDatum(evslot_index);	/* ev_attr */
 	values[i++] = CharGetDatum(evtype + '0');	/* ev_type */
+	values[i++] = CharGetDatum(RULE_FIRES_ON_ORIGIN);	/* ev_enabled */
 	values[i++] = BoolGetDatum(evinstead);		/* is_instead */
 	values[i++] = CStringGetTextDatum(evqual);	/* ev_qual */
 	values[i++] = CStringGetTextDatum(actiontree);		/* ev_action */
@@ -140,9 +143,6 @@ InsertRule(char *rulname,
 	{
 		tup = caql_form_tuple(pcqCtx, values, nulls);
 
-		if (OidIsValid(ruleOid))
-			HeapTupleSetOid(tup, ruleOid);
-
 		rewriteObjectId = caql_insert(pcqCtx, tup);
 		/* and Update indexes (implicit) */
 	}
@@ -191,17 +191,52 @@ InsertRule(char *rulname,
 	return rewriteObjectId;
 }
 
+/*
+ * DefineRule
+ *		Execute a CREATE RULE command.
+ */
+void
+DefineRule(RuleStmt *stmt, const char *queryString)
+{
+	List	   *actions;
+	Node	   *whereClause;
+	Oid			relId;
+
+	/* Parse analysis ... */
+	transformRuleStmt(stmt, queryString, &actions, &whereClause);
+
+	/* ... find the relation ... */
+	relId = RangeVarGetRelid(stmt->relation, false);
+
+	/* ... and execute */
+	DefineQueryRewrite(stmt->rulename,
+					   relId,
+					   whereClause,
+					   stmt->event,
+					   stmt->instead,
+					   stmt->replace,
+					   actions);
+}
+
+
+/*
+ * DefineQueryRewrite
+ *		Create a rule
+ *
+ * This is essentially the same as DefineRule() except that the rule's
+ * action and qual have already been passed through parse analysis.
+ */
 void
-DefineQueryRewrite(RuleStmt *stmt)
+DefineQueryRewrite(char *rulename,
+				   Oid event_relid,
+				   Node *event_qual,
+				   CmdType event_type,
+				   bool is_instead,
+				   bool replace,
+				   List *action)
 {
-	RangeVar   *event_obj = stmt->relation;
-	Node	   *event_qual = stmt->whereClause;
-	CmdType		event_type = stmt->event;
-	bool		is_instead = stmt->instead;
-	bool		replace = stmt->replace;
-	List	   *action = stmt->actions;
 	Relation	event_relation;
-	Oid			ev_relid;
+	Oid			ruleId;
 	int			event_attno;
 	ListCell   *l;
 	Query	   *query;
@@ -214,13 +249,12 @@ DefineQueryRewrite(RuleStmt *stmt)
 	 * grab ShareLock to lock out insert/update/delete actions.  But for now,
 	 * let's just grab AccessExclusiveLock all the time.
 	 */
-	event_relation = heap_openrv(event_obj, AccessExclusiveLock);
-	ev_relid = RelationGetRelid(event_relation);
+	event_relation = heap_open(event_relid, AccessExclusiveLock);
 
 	/*
 	 * Check user has permission to apply rules to this relation.
 	 */
-	if (!pg_class_ownercheck(ev_relid, GetUserId()))
+	if (!pg_class_ownercheck(event_relid, GetUserId()))
 		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
 					   RelationGetRelationName(event_relation));
 
@@ -273,7 +307,9 @@ DefineQueryRewrite(RuleStmt *stmt)
 		 */
 		query = (Query *) linitial(action);
 		if (!is_instead ||
-			query->commandType != CMD_SELECT || query->intoClause != NULL)
+			query->commandType != CMD_SELECT ||
+			query->utilityStmt != NULL ||
+			query->intoClause != NULL)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("rules on SELECT must have action INSTEAD SELECT")));
@@ -317,7 +353,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 		/*
 		 * ... and finally the rule must be named _RETURN.
 		 */
-		if (strcmp(stmt->rulename, ViewSelectRuleName) != 0)
+		if (strcmp(rulename, ViewSelectRuleName) != 0)
 		{
 			/*
 			 * In versions before 7.3, the expected name was _RETviewname. For
@@ -328,14 +364,15 @@ DefineQueryRewrite(RuleStmt *stmt)
 			 * worry about where a multibyte character might have gotten
 			 * truncated.
 			 */
-			if (strncmp(stmt->rulename, "_RET", 4) != 0 ||
-				strncmp(stmt->rulename + 4, event_obj->relname,
+			if (strncmp(rulename, "_RET", 4) != 0 ||
+				strncmp(rulename + 4, RelationGetRelationName(event_relation),
 						NAMEDATALEN - 4 - 4) != 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 						 errmsg("view rule for \"%s\" must be named \"%s\"",
-								event_obj->relname, ViewSelectRuleName)));
-			stmt->rulename = pstrdup(ViewSelectRuleName);
+								RelationGetRelationName(event_relation),
+								ViewSelectRuleName)));
+			rulename = pstrdup(ViewSelectRuleName);
 		}
 
 		/*
@@ -354,27 +391,27 @@ DefineQueryRewrite(RuleStmt *stmt)
 				ereport(ERROR,
 						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 						 errmsg("could not convert table \"%s\" to a view because it is not empty",
-								event_obj->relname)));
+								RelationGetRelationName(event_relation))));
 			heap_endscan(scanDesc);
 
 			if (event_relation->rd_rel->reltriggers != 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 						 errmsg("could not convert table \"%s\" to a view because it has triggers",
-								event_obj->relname),
+								RelationGetRelationName(event_relation)),
 						 errhint("In particular, the table cannot be involved in any foreign key relationships.")));
 
 			if (event_relation->rd_rel->relhasindex)
 				ereport(ERROR,
 						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 						 errmsg("could not convert table \"%s\" to a view because it has indexes",
-								event_obj->relname)));
+								RelationGetRelationName(event_relation))));
 
 			if (event_relation->rd_rel->relhassubclass)
 				ereport(ERROR,
 						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 						 errmsg("could not convert table \"%s\" to a view because it has child tables",
-								event_obj->relname)));
+								RelationGetRelationName(event_relation))));
 
 			RelisBecomingView = true;
 		}
@@ -424,15 +461,14 @@ DefineQueryRewrite(RuleStmt *stmt)
 	/* discard rule if it's null action and not INSTEAD; it's a no-op */
 	if (action != NIL || is_instead)
 	{
-		stmt->ruleOid = InsertRule(stmt->rulename,
+		ruleId = InsertRule(rulename,
 							event_type,
-							ev_relid,
+							event_relid,
 							event_attno,
 							is_instead,
 							event_qual,
 							action,
-							replace,
-							stmt->ruleOid);
+							replace);
 
 		/*
 		 * Set pg_class 'relhasrules' field TRUE for event relation. If
@@ -443,7 +479,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 		 * backends (including me!) to update relcache entries with the new
 		 * rule.
 		 */
-		SetRelationRuleStatus(ev_relid, true, RelisBecomingView);
+		SetRelationRuleStatus(event_relid, true, RelisBecomingView);
 	}
 
 	/*
@@ -683,10 +719,76 @@ setRuleCheckAsUser_Query(Query *qry, Oid userid)
 }
 
 
+/*
+ * Change the firing semantics of an existing rule.
+ *
+ */
+void
+EnableDisableRule(Relation rel, const char *rulename,
+				  char fires_when)
+{
+	Relation	pg_rewrite_desc;
+	Oid			owningRel = RelationGetRelid(rel);
+	Oid			eventRelationOid;
+	HeapTuple	ruletup;
+	bool		changed = false;
+
+	/*
+	 * Find the rule tuple to change.
+	 */
+	pg_rewrite_desc = heap_open(RewriteRelationId, RowExclusiveLock);
+	ruletup = SearchSysCacheCopy(RULERELNAME,
+								 ObjectIdGetDatum(owningRel),
+								 PointerGetDatum(rulename),
+								 0, 0);
+	if (!HeapTupleIsValid(ruletup))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("rule \"%s\" for relation \"%s\" does not exist",
+						rulename, get_rel_name(owningRel))));
+
+	/*
+	 * Verify that the user has appropriate permissions.
+	 */
+	eventRelationOid = ((Form_pg_rewrite) GETSTRUCT(ruletup))->ev_class;
+	Assert(eventRelationOid == owningRel);
+	if (!pg_class_ownercheck(eventRelationOid, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+					   get_rel_name(eventRelationOid));
+
+	/*
+	 * Change ev_enabled if it is different from the desired new state.
+	 */
+	if (DatumGetChar(((Form_pg_rewrite) GETSTRUCT(ruletup))->ev_enabled) !=
+		fires_when)
+	{
+		((Form_pg_rewrite) GETSTRUCT(ruletup))->ev_enabled =
+			CharGetDatum(fires_when);
+		simple_heap_update(pg_rewrite_desc, &ruletup->t_self, ruletup);
+
+		/* keep system catalog indexes current */
+		CatalogUpdateIndexes(pg_rewrite_desc, ruletup);
+
+		changed = true;
+	}
+
+	heap_freetuple(ruletup);
+	heap_close(pg_rewrite_desc, RowExclusiveLock);
+
+	/*
+	 * If we changed anything, broadcast a SI inval message to force each
+	 * backend (including our own!) to rebuild relation's relcache entry.
+	 * Otherwise they will fail to apply the change promptly.
+	 */
+	if (changed)
+		CacheInvalidateRelcache(rel);
+}
+
+
 /*
  * Rename an existing rewrite rule.
  *
- * This is unused code at the moment.
+ * This is unused code at the moment.  Note that it lacks a permissions check.
  */
 #ifdef NOT_USED
 void
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 9a92a29983e6..e3eddfa3570c 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.170 2007/02/01 19:10:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.177.2.1 2008/09/24 16:52:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,10 +22,12 @@
 #include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parsetree.h"
+#include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteHandler.h"
 #include "rewrite/rewriteManip.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "commands/trigger.h"
 
 
 /* We use a list of these to detect recursion in RewriteQuery */
@@ -52,7 +54,7 @@ static Node *get_assignment_input(Node *node);
 static void rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation,
 				 List *attrnos);
 static void markQueryForLocking(Query *qry, Node *jtnode,
-								bool forUpdate, bool noWait);
+					bool forUpdate, bool noWait);
 static List *matchLocks(CmdType event, RuleLock *rulelocks,
 		   int varno, Query *parsetree);
 static Query *fireRIRrules(Query *parsetree, List *activeRIRs);
@@ -1121,6 +1123,28 @@ matchLocks(CmdType event,
 	{
 		RewriteRule *oneLock = rulelocks->rules[i];
 
+		/*
+		 * Suppress ON INSERT/UPDATE/DELETE rules that are disabled or
+		 * configured to not fire during the current sessions replication
+		 * role. ON SELECT rules will always be applied in order to keep views
+		 * working even in LOCAL or REPLICA role.
+		 */
+		if (oneLock->event != CMD_SELECT)
+		{
+			if (SessionReplicationRole == SESSION_REPLICATION_ROLE_REPLICA)
+			{
+				if (oneLock->enabled == RULE_FIRES_ON_ORIGIN ||
+					oneLock->enabled == RULE_DISABLED)
+					continue;
+			}
+			else	/* ORIGIN or LOCAL ROLE */
+			{
+				if (oneLock->enabled == RULE_FIRES_ON_REPLICA ||
+					oneLock->enabled == RULE_DISABLED)
+					continue;
+			}
+		}
+
 		if (oneLock->event == event)
 		{
 			if (parsetree->commandType != CMD_SELECT ||
@@ -1766,22 +1790,22 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 				case CMD_INSERT:
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot perform INSERT RETURNING on relation \"%s\"",
-								RelationGetRelationName(rt_entry_relation)),
+							 errmsg("cannot perform INSERT RETURNING on relation \"%s\"",
+								 RelationGetRelationName(rt_entry_relation)),
 							 errhint("You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause.")));
 					break;
 				case CMD_UPDATE:
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot perform UPDATE RETURNING on relation \"%s\"",
-								RelationGetRelationName(rt_entry_relation)),
+							 errmsg("cannot perform UPDATE RETURNING on relation \"%s\"",
+								 RelationGetRelationName(rt_entry_relation)),
 							 errhint("You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause.")));
 					break;
 				case CMD_DELETE:
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot perform DELETE RETURNING on relation \"%s\"",
-								RelationGetRelationName(rt_entry_relation)),
+							 errmsg("cannot perform DELETE RETURNING on relation \"%s\"",
+								 RelationGetRelationName(rt_entry_relation)),
 							 errhint("You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause.")));
 					break;
 				default:
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index f2ba374565bb..0e5aa38776ca 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.103 2007/01/05 22:19:36 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.107.2.1 2008/08/14 20:31:59 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -243,6 +243,14 @@ OffsetVarNodes_walker(Node *node, OffsetVarNodes_context *context)
 		}
 		return false;
 	}
+	if (IsA(node, CurrentOfExpr))
+	{
+		CurrentOfExpr *cexpr = (CurrentOfExpr *) node;
+
+		if (context->sublevels_up == 0)
+			cexpr->cvarno += context->offset;
+		return false;
+	}
 	if (IsA(node, RangeTblRef))
 	{
 		RangeTblRef *rtr = (RangeTblRef *) node;
@@ -390,6 +398,15 @@ ChangeVarNodes_walker(Node *node, ChangeVarNodes_context *context)
 		}
 		return false;
 	}
+	if (IsA(node, CurrentOfExpr))
+	{
+		CurrentOfExpr *cexpr = (CurrentOfExpr *) node;
+
+		if (context->sublevels_up == 0 &&
+			cexpr->cvarno == context->rt_index)
+			cexpr->cvarno = context->new_index;
+		return false;
+	}
 	if (IsA(node, RangeTblRef))
 	{
 		RangeTblRef *rtr = (RangeTblRef *) node;
@@ -564,6 +581,13 @@ IncrementVarSublevelsUp_walker(Node *node,
 			var->varlevelsup += context->delta_sublevels_up;
 		return false;			/* done here */
 	}
+	if (IsA(node, CurrentOfExpr))
+	{
+		/* this should not happen */
+		if (context->min_sublevels_up == 0)
+			elog(ERROR, "cannot push down CurrentOfExpr");
+		return false;
+	}
 	if (IsA(node, Aggref))
 	{
 		Aggref	   *agg = (Aggref *) node;
@@ -656,6 +680,25 @@ IncrementVarSublevelsUpInTransformGroupedWindows(Node *node,
 									QTW_EXAMINE_RTES);
 }
 
+/*
+ * IncrementVarSublevelsUp_rtable -
+ *	Same as IncrementVarSublevelsUp, but to be invoked on a range table.
+ */
+void
+IncrementVarSublevelsUp_rtable(List *rtable, int delta_sublevels_up,
+							   int min_sublevels_up)
+{
+	IncrementVarSublevelsUp_context context;
+
+	context.delta_sublevels_up = delta_sublevels_up;
+	context.min_sublevels_up = min_sublevels_up;
+
+	range_table_walker(rtable,
+					   IncrementVarSublevelsUp_walker,
+					   (void *) &context,
+					   0);
+}
+
 
 /*
  * rangeTableEntry_used - detect whether an RTE is referenced somewhere
@@ -683,6 +726,15 @@ rangeTableEntry_used_walker(Node *node,
 			return true;
 		return false;
 	}
+	if (IsA(node, CurrentOfExpr))
+	{
+		CurrentOfExpr *cexpr = (CurrentOfExpr *) node;
+
+		if (context->sublevels_up == 0 &&
+			cexpr->cvarno == context->rt_index)
+			return true;
+		return false;
+	}
 	if (IsA(node, RangeTblRef))
 	{
 		RangeTblRef *rtr = (RangeTblRef *) node;
@@ -958,6 +1010,119 @@ AddInvertedQual(Query *parsetree, Node *qual)
 }
 
 
+/*
+ * map_variable_attnos() finds all user-column Vars in an expression tree
+ * that reference a particular RTE, and adjusts their varattnos according
+ * to the given mapping array (varattno n is replaced by attno_map[n-1]).
+ * Vars for system columns are not modified.
+ *
+ * A zero in the mapping array represents a dropped column, which should not
+ * appear in the expression.
+ *
+ * If the expression tree contains a whole-row Var for the target RTE,
+ * the Var is not changed but *found_whole_row is returned as TRUE.
+ * For most callers this is an error condition, but we leave it to the caller
+ * to report the error so that useful context can be provided.  (In some
+ * usages it would be appropriate to modify the Var's vartype and insert a
+ * ConvertRowtypeExpr node to map back to the original vartype.  We might
+ * someday extend this function's API to support that.  For now, the only
+ * concession to that future need is that this function is a tree mutator
+ * not just a walker.)
+ *
+ * This could be built using replace_rte_variables and a callback function,
+ * but since we don't ever need to insert sublinks, replace_rte_variables is
+ * overly complicated.
+ */
+
+typedef struct
+{
+	int			target_varno;		/* RTE index to search for */
+	int			sublevels_up;		/* (current) nesting depth */
+	const AttrNumber *attno_map;	/* map array for user attnos */
+	int			map_length;			/* number of entries in attno_map[] */
+	bool	   *found_whole_row;	/* output flag */
+} map_variable_attnos_context;
+
+static Node *
+map_variable_attnos_mutator(Node *node,
+							map_variable_attnos_context *context)
+{
+	if (node == NULL)
+		return NULL;
+	if (IsA(node, Var))
+	{
+		Var		   *var = (Var *) node;
+
+		if (var->varno == context->target_varno &&
+			var->varlevelsup == context->sublevels_up)
+		{
+			/* Found a matching variable, make the substitution */
+			Var	   *newvar = (Var *) palloc(sizeof(Var));
+			int		attno = var->varattno;
+
+			*newvar = *var;
+			if (attno > 0)
+			{
+				/* user-defined column, replace attno */
+				if (attno > context->map_length ||
+					context->attno_map[attno - 1] == 0)
+					elog(ERROR, "unexpected varattno %d in expression to be mapped",
+						 attno);
+				newvar->varattno = newvar->varoattno = context->attno_map[attno - 1];
+			}
+			else if (attno == 0)
+			{
+				/* whole-row variable, warn caller */
+				*(context->found_whole_row) = true;
+			}
+			return (Node *) newvar;
+		}
+		/* otherwise fall through to copy the var normally */
+	}
+	else if (IsA(node, Query))
+	{
+		/* Recurse into RTE subquery or not-yet-planned sublink subquery */
+		Query	   *newnode;
+
+		context->sublevels_up++;
+		newnode = query_tree_mutator((Query *) node,
+									 map_variable_attnos_mutator,
+									 (void *) context,
+									 0);
+		context->sublevels_up--;
+		return (Node *) newnode;
+	}
+	return expression_tree_mutator(node, map_variable_attnos_mutator,
+								   (void *) context);
+}
+
+Node *
+map_variable_attnos(Node *node,
+					int target_varno, int sublevels_up,
+					const AttrNumber *attno_map, int map_length,
+					bool *found_whole_row)
+{
+	map_variable_attnos_context context;
+
+	context.target_varno = target_varno;
+	context.sublevels_up = sublevels_up;
+	context.attno_map = attno_map;
+	context.map_length = map_length;
+	context.found_whole_row = found_whole_row;
+
+	*found_whole_row = false;
+
+	/*
+	 * Must be prepared to start with a Query or a bare expression tree; if
+	 * it's a Query, we don't want to increment sublevels_up.
+	 */
+	return query_or_expression_tree_mutator(node,
+											map_variable_attnos_mutator,
+											(void *) &context,
+											0);
+}
+
+
 /*
  * ResolveNew - replace Vars with corresponding items from a targetlist
  *
@@ -1010,7 +1175,8 @@ resolve_one_var(Var *var, ResolveNew_context *context)
 		{
 			/* Otherwise replace unmatched var with a null */
 			/* need coerce_to_domain in case of NOT NULL domain constraint */
-			return coerce_to_domain((Node *) makeNullConst(var->vartype, -1),
+			return coerce_to_domain((Node *) makeNullConst(var->vartype,
+														   var->vartypmod),
 									InvalidOid, -1,
 									var->vartype,
 									COERCE_IMPLICIT_CAST,
@@ -1080,8 +1246,27 @@ ResolveNew_mutator(Node *node, ResolveNew_context *context)
 		}
 		/* otherwise fall through to copy the var normally */
 	}
+	else if (IsA(node, CurrentOfExpr))
+	{
+		CurrentOfExpr *cexpr = (CurrentOfExpr *) node;
+		int			this_varno = (int) cexpr->cvarno;
 
-	if (IsA(node, Query))
+		if (this_varno == context->target_varno &&
+			context->sublevels_up == 0)
+		{
+			/*
+			 * We get here if a WHERE CURRENT OF expression turns out to apply
+			 * to a view.  Someday we might be able to translate the
+			 * expression to apply to an underlying table of the view, but
+			 * right now it's not implemented.
+			 */
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				   errmsg("WHERE CURRENT OF on a view is not implemented")));
+		}
+		/* otherwise fall through to copy the expr normally */
+	}
+	else if (IsA(node, Query))
 	{
 		/* Recurse into RTE subquery or not-yet-planned sublink subquery */
 		Query	   *newnode;
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index fe23602d115b..1f5de55d958f 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.69 2007/01/05 22:19:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.70 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index 00f5fe716c27..44a9f37a45e9 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteSupport.c,v 1.64 2007/01/05 22:19:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteSupport.c,v 1.65 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/snowball/.gitignore b/src/backend/snowball/.gitignore
new file mode 100644
index 000000000000..ef03eb62a7bd
--- /dev/null
+++ b/src/backend/snowball/.gitignore
@@ -0,0 +1 @@
+/snowball_create.sql
diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
new file mode 100644
index 000000000000..ee41ee07ee68
--- /dev/null
+++ b/src/backend/snowball/Makefile
@@ -0,0 +1,144 @@
+#-------------------------------------------------------------------------
+#
+# Makefile for src/backend/snowball
+#
+# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.4 2007/10/23 20:46:12 tgl Exp $
+#
+#-------------------------------------------------------------------------
+
+subdir = src/backend/snowball
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \
+	-I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS)
+
+OBJS= dict_snowball.o api.o utilities.o \
+	stem_ISO_8859_1_danish.o \
+	stem_ISO_8859_1_dutch.o \
+	stem_ISO_8859_1_english.o \
+	stem_ISO_8859_1_finnish.o \
+	stem_ISO_8859_1_french.o \
+	stem_ISO_8859_1_german.o \
+	stem_ISO_8859_1_hungarian.o \
+	stem_ISO_8859_1_italian.o \
+	stem_ISO_8859_1_norwegian.o \
+	stem_ISO_8859_1_porter.o \
+	stem_ISO_8859_1_portuguese.o \
+	stem_ISO_8859_1_spanish.o \
+	stem_ISO_8859_1_swedish.o \
+	stem_ISO_8859_2_romanian.o \
+	stem_KOI8_R_russian.o \
+	stem_UTF_8_danish.o \
+	stem_UTF_8_dutch.o \
+	stem_UTF_8_english.o \
+	stem_UTF_8_finnish.o \
+	stem_UTF_8_french.o \
+	stem_UTF_8_german.o \
+	stem_UTF_8_hungarian.o \
+	stem_UTF_8_italian.o \
+	stem_UTF_8_norwegian.o \
+	stem_UTF_8_porter.o \
+	stem_UTF_8_portuguese.o \
+	stem_UTF_8_romanian.o \
+	stem_UTF_8_russian.o \
+	stem_UTF_8_spanish.o \
+	stem_UTF_8_swedish.o \
+	stem_UTF_8_turkish.o
+
+# first column is language name and also name of dictionary for not-all-ASCII
+# words, second is name of dictionary for all-ASCII words
+# Note order dependency: use of some other language as ASCII dictionary
+# must come after creation of that language
+LANGUAGES=  \
+	danish		danish 		\
+	dutch 		dutch 		\
+	english 	english		\
+	finnish 	finnish		\
+	french 		french		\
+	german 		german		\
+	hungarian 	hungarian	\
+	italian 	italian		\
+	norwegian 	norwegian	\
+	portuguese 	portuguese	\
+	romanian 	romanian	\
+	russian 	english		\
+	spanish 	spanish		\
+	swedish 	swedish		\
+	turkish		turkish
+
+
+SQLSCRIPT= snowball_create.sql
+DICTDIR=tsearch_data
+
+ifdef VPATH
+override VPATH := $(srcdir)/libstemmer:$(VPATH)
+else
+VPATH = $(srcdir)/libstemmer
+endif
+
+NAME := dict_snowball
+rpath =
+
+all: all-shared-lib $(SQLSCRIPT)
+
+include $(top_srcdir)/src/Makefile.shlib
+
+$(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in
+ifeq ($(enable_shared), yes)
+	echo '-- Language-specific snowball dictionaries' > $@
+	cat $(srcdir)/snowball_func.sql.in >> $@	
+	@set $(LANGUAGES) ; \
+	while [ "$$#" -gt 0 ] ; \
+	do \
+		lang=$$1; shift; \
+		nonascdictname=$$lang; \
+		ascdictname=$$1; shift; \
+		if [ -s $(srcdir)/stopwords/$${lang}.stop ] ; then \
+			stop=", StopWords=$${lang}" ; \
+		else \
+			stop=""; \
+		fi; \
+		cat $(srcdir)/snowball.sql.in | \
+			sed -e "s#_LANGNAME_#$$lang#g" | \
+			sed -e "s#_DICTNAME_#$${lang}_stem#g" | \
+			sed -e "s#_CFGNAME_#$$lang#g" | \
+			sed -e "s#_ASCDICTNAME_#$${ascdictname}_stem#g" | \
+			sed -e "s#_NONASCDICTNAME_#$${nonascdictname}_stem#g" | \
+			sed -e "s#_STOPWORDS_#$$stop#g" ; \
+	done >> $@
+else
+	echo "-- No language-specific snowball dictionaries, for lack of shared library support" > $@
+endif
+
+install: all installdirs
+ifeq ($(enable_shared), yes)
+	$(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)'
+endif
+	$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
+	@set $(LANGUAGES) ; \
+	while [ "$$#" -gt 0 ] ; \
+	do \
+		lang=$$1; shift; shift; \
+		if [ -s $(srcdir)/stopwords/$${lang}.stop ] ; then \
+			$(INSTALL_DATA) $(srcdir)/stopwords/$${lang}.stop '$(DESTDIR)$(datadir)/$(DICTDIR)' ; \
+		fi \
+	done
+
+installdirs:
+	$(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
+
+uninstall:
+	rm -f '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)'
+	rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)'
+	@set $(LANGUAGES) ; \
+	while [ "$$#" -gt 0 ] ; \
+	do \
+		lang=$$1; shift; shift;  \
+		if [ -s $(srcdir)/stopwords/$${lang}.stop ] ; then \
+		    rm -f '$(DESTDIR)$(datadir)/$(DICTDIR)/'$${lang}.stop ; \
+		fi \
+	done
+
+clean distclean maintainer-clean: clean-lib
+	rm -f $(OBJS) $(SQLSCRIPT)
diff --git a/src/backend/snowball/README b/src/backend/snowball/README
new file mode 100644
index 000000000000..099925ad8f05
--- /dev/null
+++ b/src/backend/snowball/README
@@ -0,0 +1,47 @@
+Snowball-based stemming
+-----------------------
+
+This module uses the word stemming code developed by the Snowball project,
+http://snowball.tartarus.org/
+which is released by them under a BSD-style license.
+
+The files under src/backend/snowball/libstemmer/ and
+src/include/snowball/libstemmer/ are taken directly from their libstemmer_c
+distribution, with only some minor adjustments of file inclusions.  Note
+that most of these files are in fact derived files, not master source.
+The master sources are in the Snowball language, and are available along
+with the Snowball-to-C compiler from the Snowball project.  We choose to
+include the derived files in the PostgreSQL distribution because most
+installations will not have the Snowball compiler available.
+
+To update the PostgreSQL sources from a new Snowball libstemmer_c
+distribution:
+
+1. Copy the *.c files in libstemmer_c/src_c/ to src/backend/snowball/libstemmer
+with replacement of "../runtime/header.h" by "header.h", for example
+
+for f in libstemmer_c/src_c/*.c
+do
+    sed 's|\.\./runtime/header\.h|header.h|' $f >libstemmer/`basename $f`
+done
+
+(Alternatively, if you rebuild the stemmer files from the master Snowball
+sources, just omit "-r ../runtime" from the Snowball compiler switches.)
+
+2. Copy the *.c files in libstemmer_c/runtime/ to
+src/backend/snowball/libstemmer, and edit them to remove direct inclusions
+of system headers such as <stdio.h> --- they should only include "header.h".
+(This removal avoids portability problems on some platforms where <stdio.h>
+is sensitive to largefile compilation options.)
+
+3. Copy the *.h files in libstemmer_c/src_c/ and libstemmer_c/runtime/
+to src/include/snowball/libstemmer.  At this writing the header files
+do not require any changes.
+
+4. Check whether any stemmer modules have been added or removed.  If so, edit
+the OBJS list in Makefile, the list of #include's in dict_snowball.c, and the
+stemmer_modules[] table in dict_snowball.c.
+
+5. The various stopword files in stopwords/ must be downloaded
+individually from pages on the snowball.tartarus.org website.
+Be careful that these files must be stored in UTF-8 encoding.
diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
new file mode 100644
index 000000000000..328ef5a0efec
--- /dev/null
+++ b/src/backend/snowball/dict_snowball.c
@@ -0,0 +1,311 @@
+/*-------------------------------------------------------------------------
+ *
+ * dict_snowball.c
+ *		Snowball dictionary
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.6 2008/01/01 19:45:51 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "commands/defrem.h"
+#include "fmgr.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+
+/* Some platforms define MAXINT and/or MININT, causing conflicts */
+#ifdef MAXINT
+#undef MAXINT
+#endif
+#ifdef MININT
+#undef MININT
+#endif
+
+/* Now we can include the original Snowball header.h */
+#include "snowball/libstemmer/header.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_danish.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_dutch.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_english.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_finnish.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_french.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_german.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_hungarian.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_italian.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_norwegian.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_porter.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_portuguese.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_spanish.h"
+#include "snowball/libstemmer/stem_ISO_8859_1_swedish.h"
+#include "snowball/libstemmer/stem_ISO_8859_2_romanian.h"
+#include "snowball/libstemmer/stem_KOI8_R_russian.h"
+#include "snowball/libstemmer/stem_UTF_8_danish.h"
+#include "snowball/libstemmer/stem_UTF_8_dutch.h"
+#include "snowball/libstemmer/stem_UTF_8_english.h"
+#include "snowball/libstemmer/stem_UTF_8_finnish.h"
+#include "snowball/libstemmer/stem_UTF_8_french.h"
+#include "snowball/libstemmer/stem_UTF_8_german.h"
+#include "snowball/libstemmer/stem_UTF_8_hungarian.h"
+#include "snowball/libstemmer/stem_UTF_8_italian.h"
+#include "snowball/libstemmer/stem_UTF_8_norwegian.h"
+#include "snowball/libstemmer/stem_UTF_8_porter.h"
+#include "snowball/libstemmer/stem_UTF_8_portuguese.h"
+#include "snowball/libstemmer/stem_UTF_8_romanian.h"
+#include "snowball/libstemmer/stem_UTF_8_russian.h"
+#include "snowball/libstemmer/stem_UTF_8_spanish.h"
+#include "snowball/libstemmer/stem_UTF_8_swedish.h"
+#include "snowball/libstemmer/stem_UTF_8_turkish.h"
+
+
+PG_MODULE_MAGIC;
+
+PG_FUNCTION_INFO_V1(dsnowball_init);
+Datum		dsnowball_init(PG_FUNCTION_ARGS);
+
+PG_FUNCTION_INFO_V1(dsnowball_lexize);
+Datum		dsnowball_lexize(PG_FUNCTION_ARGS);
+
+/* List of supported modules */
+typedef struct stemmer_module
+{
+	const char *name;
+	pg_enc		enc;
+	struct SN_env *(*create) (void);
+	void		(*close) (struct SN_env *);
+	int			(*stem) (struct SN_env *);
+} stemmer_module;
+
+static const stemmer_module stemmer_modules[] =
+{
+	/*
+	 * Stemmers list from Snowball distribution
+	 */
+	{"danish", PG_LATIN1, danish_ISO_8859_1_create_env, danish_ISO_8859_1_close_env, danish_ISO_8859_1_stem},
+	{"dutch", PG_LATIN1, dutch_ISO_8859_1_create_env, dutch_ISO_8859_1_close_env, dutch_ISO_8859_1_stem},
+	{"english", PG_LATIN1, english_ISO_8859_1_create_env, english_ISO_8859_1_close_env, english_ISO_8859_1_stem},
+	{"finnish", PG_LATIN1, finnish_ISO_8859_1_create_env, finnish_ISO_8859_1_close_env, finnish_ISO_8859_1_stem},
+	{"french", PG_LATIN1, french_ISO_8859_1_create_env, french_ISO_8859_1_close_env, french_ISO_8859_1_stem},
+	{"german", PG_LATIN1, german_ISO_8859_1_create_env, german_ISO_8859_1_close_env, german_ISO_8859_1_stem},
+	{"hungarian", PG_LATIN1, hungarian_ISO_8859_1_create_env, hungarian_ISO_8859_1_close_env, hungarian_ISO_8859_1_stem},
+	{"italian", PG_LATIN1, italian_ISO_8859_1_create_env, italian_ISO_8859_1_close_env, italian_ISO_8859_1_stem},
+	{"norwegian", PG_LATIN1, norwegian_ISO_8859_1_create_env, norwegian_ISO_8859_1_close_env, norwegian_ISO_8859_1_stem},
+	{"porter", PG_LATIN1, porter_ISO_8859_1_create_env, porter_ISO_8859_1_close_env, porter_ISO_8859_1_stem},
+	{"portuguese", PG_LATIN1, portuguese_ISO_8859_1_create_env, portuguese_ISO_8859_1_close_env, portuguese_ISO_8859_1_stem},
+	{"spanish", PG_LATIN1, spanish_ISO_8859_1_create_env, spanish_ISO_8859_1_close_env, spanish_ISO_8859_1_stem},
+	{"swedish", PG_LATIN1, swedish_ISO_8859_1_create_env, swedish_ISO_8859_1_close_env, swedish_ISO_8859_1_stem},
+	{"romanian", PG_LATIN2, romanian_ISO_8859_2_create_env, romanian_ISO_8859_2_close_env, romanian_ISO_8859_2_stem},
+	{"russian", PG_KOI8R, russian_KOI8_R_create_env, russian_KOI8_R_close_env, russian_KOI8_R_stem},
+	{"danish", PG_UTF8, danish_UTF_8_create_env, danish_UTF_8_close_env, danish_UTF_8_stem},
+	{"dutch", PG_UTF8, dutch_UTF_8_create_env, dutch_UTF_8_close_env, dutch_UTF_8_stem},
+	{"english", PG_UTF8, english_UTF_8_create_env, english_UTF_8_close_env, english_UTF_8_stem},
+	{"finnish", PG_UTF8, finnish_UTF_8_create_env, finnish_UTF_8_close_env, finnish_UTF_8_stem},
+	{"french", PG_UTF8, french_UTF_8_create_env, french_UTF_8_close_env, french_UTF_8_stem},
+	{"german", PG_UTF8, german_UTF_8_create_env, german_UTF_8_close_env, german_UTF_8_stem},
+	{"hungarian", PG_UTF8, hungarian_UTF_8_create_env, hungarian_UTF_8_close_env, hungarian_UTF_8_stem},
+	{"italian", PG_UTF8, italian_UTF_8_create_env, italian_UTF_8_close_env, italian_UTF_8_stem},
+	{"norwegian", PG_UTF8, norwegian_UTF_8_create_env, norwegian_UTF_8_close_env, norwegian_UTF_8_stem},
+	{"porter", PG_UTF8, porter_UTF_8_create_env, porter_UTF_8_close_env, porter_UTF_8_stem},
+	{"portuguese", PG_UTF8, portuguese_UTF_8_create_env, portuguese_UTF_8_close_env, portuguese_UTF_8_stem},
+	{"romanian", PG_UTF8, romanian_UTF_8_create_env, romanian_UTF_8_close_env, romanian_UTF_8_stem},
+	{"russian", PG_UTF8, russian_UTF_8_create_env, russian_UTF_8_close_env, russian_UTF_8_stem},
+	{"spanish", PG_UTF8, spanish_UTF_8_create_env, spanish_UTF_8_close_env, spanish_UTF_8_stem},
+	{"swedish", PG_UTF8, swedish_UTF_8_create_env, swedish_UTF_8_close_env, swedish_UTF_8_stem},
+	{"turkish", PG_UTF8, turkish_UTF_8_create_env, turkish_UTF_8_close_env, turkish_UTF_8_stem},
+
+	/*
+	 * Stemmer with PG_SQL_ASCII encoding should be valid for any server
+	 * encoding
+	 */
+	{"english", PG_SQL_ASCII, english_ISO_8859_1_create_env, english_ISO_8859_1_close_env, english_ISO_8859_1_stem},
+
+	{NULL, 0, NULL, NULL, NULL} /* list end marker */
+};
+
+
+typedef struct DictSnowball
+{
+	struct SN_env *z;
+	StopList	stoplist;
+	bool		needrecode;		/* needs recoding before/after call stem */
+	int			(*stem) (struct SN_env * z);
+
+	/*
+	 * snowball saves alloced memory between calls, so we should run it in our
+	 * private memory context. Note, init function is executed in long lived
+	 * context, so we just remember CurrentMemoryContext
+	 */
+	MemoryContext dictCtx;
+} DictSnowball;
+
+
+static void
+locate_stem_module(DictSnowball *d, char *lang)
+{
+	const stemmer_module *m;
+
+	/*
+	 * First, try to find exact match of stemmer module. Stemmer with
+	 * PG_SQL_ASCII encoding is treated as working with any server encoding
+	 */
+	for (m = stemmer_modules; m->name; m++)
+	{
+		if ((m->enc == PG_SQL_ASCII || m->enc == GetDatabaseEncoding()) &&
+			pg_strcasecmp(m->name, lang) == 0)
+		{
+			d->stem = m->stem;
+			d->z = m->create();
+			d->needrecode = false;
+			return;
+		}
+	}
+
+	/*
+	 * Second, try to find stemmer for needed language for UTF8 encoding.
+	 */
+	for (m = stemmer_modules; m->name; m++)
+	{
+		if (m->enc == PG_UTF8 && pg_strcasecmp(m->name, lang) == 0)
+		{
+			d->stem = m->stem;
+			d->z = m->create();
+			d->needrecode = true;
+			return;
+		}
+	}
+
+	ereport(ERROR,
+			(errcode(ERRCODE_UNDEFINED_OBJECT),
+			 errmsg("no Snowball stemmer available for language \"%s\" and encoding \"%s\"",
+					lang, GetDatabaseEncodingName())));
+}
+
+Datum
+dsnowball_init(PG_FUNCTION_ARGS)
+{
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
+	DictSnowball *d;
+	bool		stoploaded = false;
+	ListCell   *l;
+
+	d = (DictSnowball *) palloc0(sizeof(DictSnowball));
+
+	foreach(l, dictoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp("StopWords", defel->defname) == 0)
+		{
+			if (stoploaded)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple StopWords parameters")));
+			readstoplist(defGetString(defel), &d->stoplist, lowerstr);
+			stoploaded = true;
+		}
+		else if (pg_strcasecmp("Language", defel->defname) == 0)
+		{
+			if (d->stem)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple Language parameters")));
+			locate_stem_module(d, defGetString(defel));
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized Snowball parameter: \"%s\"",
+							defel->defname)));
+		}
+	}
+
+	if (!d->stem)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("missing Language parameter")));
+
+	d->dictCtx = CurrentMemoryContext;
+
+	PG_RETURN_POINTER(d);
+}
+
+Datum
+dsnowball_lexize(PG_FUNCTION_ARGS)
+{
+	DictSnowball *d = (DictSnowball *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
+	int32		len = PG_GETARG_INT32(2);
+	char	   *txt = lowerstr_with_len(in, len);
+	TSLexeme   *res = palloc0(sizeof(TSLexeme) * 2);
+
+	if (*txt == '\0' || searchstoplist(&(d->stoplist), txt))
+	{
+		pfree(txt);
+	}
+	else
+	{
+		MemoryContext saveCtx;
+
+		/*
+		 * recode to utf8 if stemmer is utf8 and doesn't match server encoding
+		 */
+		if (d->needrecode)
+		{
+			char	   *recoded;
+
+			recoded = (char *) pg_do_encoding_conversion((unsigned char *) txt,
+														 strlen(txt),
+													   GetDatabaseEncoding(),
+														 PG_UTF8);
+			if (recoded == NULL)
+				elog(ERROR, "encoding conversion failed");
+
+			if (recoded != txt)
+			{
+				pfree(txt);
+				txt = recoded;
+			}
+		}
+
+		/* see comment about d->dictCtx */
+		saveCtx = MemoryContextSwitchTo(d->dictCtx);
+		SN_set_current(d->z, strlen(txt), (symbol *) txt);
+		d->stem(d->z);
+		MemoryContextSwitchTo(saveCtx);
+
+		if (d->z->p && d->z->l)
+		{
+			txt = repalloc(txt, d->z->l + 1);
+			memcpy(txt, d->z->p, d->z->l);
+			txt[d->z->l] = '\0';
+		}
+
+		/* back recode if needed */
+		if (d->needrecode)
+		{
+			char	   *recoded;
+
+			recoded = (char *) pg_do_encoding_conversion((unsigned char *) txt,
+														 strlen(txt),
+														 PG_UTF8,
+													  GetDatabaseEncoding());
+			if (recoded == NULL)
+				elog(ERROR, "encoding conversion failed");
+
+			if (recoded != txt)
+			{
+				pfree(txt);
+				txt = recoded;
+			}
+		}
+
+		res->lexeme = txt;
+	}
+
+	PG_RETURN_POINTER(res);
+}
diff --git a/src/backend/snowball/libstemmer/api.c b/src/backend/snowball/libstemmer/api.c
new file mode 100644
index 000000000000..530b427a466c
--- /dev/null
+++ b/src/backend/snowball/libstemmer/api.c
@@ -0,0 +1,64 @@
+#include "header.h"
+
+extern struct SN_env * SN_create_env(int S_size, int I_size, int B_size)
+{
+    struct SN_env * z = (struct SN_env *) calloc(1, sizeof(struct SN_env));
+    if (z == NULL) return NULL;
+    z->p = create_s();
+    if (z->p == NULL) goto error;
+    if (S_size)
+    {
+        int i;
+        z->S = (symbol * *) calloc(S_size, sizeof(symbol *));
+        if (z->S == NULL) goto error;
+
+        for (i = 0; i < S_size; i++)
+        {
+            z->S[i] = create_s();
+            if (z->S[i] == NULL) goto error;
+        }
+    }
+
+    if (I_size)
+    {
+        z->I = (int *) calloc(I_size, sizeof(int));
+        if (z->I == NULL) goto error;
+    }
+
+    if (B_size)
+    {
+        z->B = (unsigned char *) calloc(B_size, sizeof(unsigned char));
+        if (z->B == NULL) goto error;
+    }
+
+    return z;
+error:
+    SN_close_env(z, S_size);
+    return NULL;
+}
+
+extern void SN_close_env(struct SN_env * z, int S_size)
+{
+    if (z == NULL) return;
+    if (S_size)
+    {
+        int i;
+        for (i = 0; i < S_size; i++)
+        {
+            lose_s(z->S[i]);
+        }
+        free(z->S);
+    }
+    free(z->I);
+    free(z->B);
+    if (z->p) lose_s(z->p);
+    free(z);
+}
+
+extern int SN_set_current(struct SN_env * z, int size, const symbol * s)
+{
+    int err = replace_s(z, 0, z->l, size, s, NULL);
+    z->c = 0;
+    return err;
+}
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_danish.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_danish.c
new file mode 100644
index 000000000000..36a9f99276fb
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_danish.c
@@ -0,0 +1,337 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int danish_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_undouble(struct SN_env * z);
+static int r_other_suffix(struct SN_env * z);
+static int r_consonant_pair(struct SN_env * z);
+static int r_main_suffix(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * danish_ISO_8859_1_create_env(void);
+extern void danish_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[3] = { 'h', 'e', 'd' };
+static const symbol s_0_1[5] = { 'e', 't', 'h', 'e', 'd' };
+static const symbol s_0_2[4] = { 'e', 'r', 'e', 'd' };
+static const symbol s_0_3[1] = { 'e' };
+static const symbol s_0_4[5] = { 'e', 'r', 'e', 'd', 'e' };
+static const symbol s_0_5[4] = { 'e', 'n', 'd', 'e' };
+static const symbol s_0_6[6] = { 'e', 'r', 'e', 'n', 'd', 'e' };
+static const symbol s_0_7[3] = { 'e', 'n', 'e' };
+static const symbol s_0_8[4] = { 'e', 'r', 'n', 'e' };
+static const symbol s_0_9[3] = { 'e', 'r', 'e' };
+static const symbol s_0_10[2] = { 'e', 'n' };
+static const symbol s_0_11[5] = { 'h', 'e', 'd', 'e', 'n' };
+static const symbol s_0_12[4] = { 'e', 'r', 'e', 'n' };
+static const symbol s_0_13[2] = { 'e', 'r' };
+static const symbol s_0_14[5] = { 'h', 'e', 'd', 'e', 'r' };
+static const symbol s_0_15[4] = { 'e', 'r', 'e', 'r' };
+static const symbol s_0_16[1] = { 's' };
+static const symbol s_0_17[4] = { 'h', 'e', 'd', 's' };
+static const symbol s_0_18[2] = { 'e', 's' };
+static const symbol s_0_19[5] = { 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_20[7] = { 'e', 'r', 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_21[4] = { 'e', 'n', 'e', 's' };
+static const symbol s_0_22[5] = { 'e', 'r', 'n', 'e', 's' };
+static const symbol s_0_23[4] = { 'e', 'r', 'e', 's' };
+static const symbol s_0_24[3] = { 'e', 'n', 's' };
+static const symbol s_0_25[6] = { 'h', 'e', 'd', 'e', 'n', 's' };
+static const symbol s_0_26[5] = { 'e', 'r', 'e', 'n', 's' };
+static const symbol s_0_27[3] = { 'e', 'r', 's' };
+static const symbol s_0_28[3] = { 'e', 't', 's' };
+static const symbol s_0_29[5] = { 'e', 'r', 'e', 't', 's' };
+static const symbol s_0_30[2] = { 'e', 't' };
+static const symbol s_0_31[4] = { 'e', 'r', 'e', 't' };
+
+static const struct among a_0[32] =
+{
+/*  0 */ { 3, s_0_0, -1, 1, 0},
+/*  1 */ { 5, s_0_1, 0, 1, 0},
+/*  2 */ { 4, s_0_2, -1, 1, 0},
+/*  3 */ { 1, s_0_3, -1, 1, 0},
+/*  4 */ { 5, s_0_4, 3, 1, 0},
+/*  5 */ { 4, s_0_5, 3, 1, 0},
+/*  6 */ { 6, s_0_6, 5, 1, 0},
+/*  7 */ { 3, s_0_7, 3, 1, 0},
+/*  8 */ { 4, s_0_8, 3, 1, 0},
+/*  9 */ { 3, s_0_9, 3, 1, 0},
+/* 10 */ { 2, s_0_10, -1, 1, 0},
+/* 11 */ { 5, s_0_11, 10, 1, 0},
+/* 12 */ { 4, s_0_12, 10, 1, 0},
+/* 13 */ { 2, s_0_13, -1, 1, 0},
+/* 14 */ { 5, s_0_14, 13, 1, 0},
+/* 15 */ { 4, s_0_15, 13, 1, 0},
+/* 16 */ { 1, s_0_16, -1, 2, 0},
+/* 17 */ { 4, s_0_17, 16, 1, 0},
+/* 18 */ { 2, s_0_18, 16, 1, 0},
+/* 19 */ { 5, s_0_19, 18, 1, 0},
+/* 20 */ { 7, s_0_20, 19, 1, 0},
+/* 21 */ { 4, s_0_21, 18, 1, 0},
+/* 22 */ { 5, s_0_22, 18, 1, 0},
+/* 23 */ { 4, s_0_23, 18, 1, 0},
+/* 24 */ { 3, s_0_24, 16, 1, 0},
+/* 25 */ { 6, s_0_25, 24, 1, 0},
+/* 26 */ { 5, s_0_26, 24, 1, 0},
+/* 27 */ { 3, s_0_27, 16, 1, 0},
+/* 28 */ { 3, s_0_28, 16, 1, 0},
+/* 29 */ { 5, s_0_29, 28, 1, 0},
+/* 30 */ { 2, s_0_30, -1, 1, 0},
+/* 31 */ { 4, s_0_31, 30, 1, 0}
+};
+
+static const symbol s_1_0[2] = { 'g', 'd' };
+static const symbol s_1_1[2] = { 'd', 't' };
+static const symbol s_1_2[2] = { 'g', 't' };
+static const symbol s_1_3[2] = { 'k', 't' };
+
+static const struct among a_1[4] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0},
+/*  2 */ { 2, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0}
+};
+
+static const symbol s_2_0[2] = { 'i', 'g' };
+static const symbol s_2_1[3] = { 'l', 'i', 'g' };
+static const symbol s_2_2[4] = { 'e', 'l', 'i', 'g' };
+static const symbol s_2_3[3] = { 'e', 'l', 's' };
+static const symbol s_2_4[4] = { 'l', 0xF8, 's', 't' };
+
+static const struct among a_2[5] =
+{
+/*  0 */ { 2, s_2_0, -1, 1, 0},
+/*  1 */ { 3, s_2_1, 0, 1, 0},
+/*  2 */ { 4, s_2_2, 1, 1, 0},
+/*  3 */ { 3, s_2_3, -1, 1, 0},
+/*  4 */ { 4, s_2_4, -1, 2, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 128 };
+
+static const unsigned char g_s_ending[] = { 239, 254, 42, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16 };
+
+static const symbol s_0[] = { 's', 't' };
+static const symbol s_1[] = { 'i', 'g' };
+static const symbol s_2[] = { 'l', 0xF8, 's' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c_test = z->c; /* test, line 33 */
+        {   int ret = z->c + 3;
+            if (0 > ret || ret > z->l) return 0;
+            z->c = ret; /* hop, line 33 */
+        }
+        z->I[1] = z->c; /* setmark x, line 33 */
+        z->c = c_test;
+    }
+    if (out_grouping(z, g_v, 97, 248, 1) < 0) return 0; /* goto */ /* grouping v, line 34 */
+    {    /* gopast */ /* non v, line 34 */
+        int ret = in_grouping(z, g_v, 97, 248, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 34 */
+     /* try, line 35 */
+    if (!(z->I[0] < z->I[1])) goto lab0;
+    z->I[0] = z->I[1];
+lab0:
+    return 1;
+}
+
+static int r_main_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 41 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 41 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 41 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851440 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_0, 32); /* substring, line 41 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 41 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 48 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (in_grouping_b(z, g_s_ending, 97, 229, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 50 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_consonant_pair(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 55 */
+        {   int mlimit; /* setlimit, line 56 */
+            int m1 = z->l - z->c; (void)m1;
+            if (z->c < z->I[0]) return 0;
+            z->c = z->I[0]; /* tomark, line 56 */
+            mlimit = z->lb; z->lb = z->c;
+            z->c = z->l - m1;
+            z->ket = z->c; /* [, line 56 */
+            if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 116)) { z->lb = mlimit; return 0; }
+            if (!(find_among_b(z, a_1, 4))) { z->lb = mlimit; return 0; } /* substring, line 56 */
+            z->bra = z->c; /* ], line 56 */
+            z->lb = mlimit;
+        }
+        z->c = z->l - m_test;
+    }
+    if (z->c <= z->lb) return 0;
+    z->c--; /* next, line 62 */
+    z->bra = z->c; /* ], line 62 */
+    {   int ret = slice_del(z); /* delete, line 62 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_other_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 66 */
+        z->ket = z->c; /* [, line 66 */
+        if (!(eq_s_b(z, 2, s_0))) goto lab0;
+        z->bra = z->c; /* ], line 66 */
+        if (!(eq_s_b(z, 2, s_1))) goto lab0;
+        {   int ret = slice_del(z); /* delete, line 66 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = z->l - m1;
+    }
+    {   int mlimit; /* setlimit, line 67 */
+        int m2 = z->l - z->c; (void)m2;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 67 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m2;
+        z->ket = z->c; /* [, line 67 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1572992 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_2, 5); /* substring, line 67 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 67 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 70 */
+                if (ret < 0) return ret;
+            }
+            {   int m3 = z->l - z->c; (void)m3; /* do, line 70 */
+                {   int ret = r_consonant_pair(z);
+                    if (ret == 0) goto lab1; /* call consonant_pair, line 70 */
+                    if (ret < 0) return ret;
+                }
+            lab1:
+                z->c = z->l - m3;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 3, s_2); /* <-, line 72 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_undouble(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 76 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 76 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 76 */
+        if (out_grouping_b(z, g_v, 97, 248, 0)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 76 */
+        z->S[0] = slice_to(z, z->S[0]); /* -> ch, line 76 */
+        if (z->S[0] == 0) return -1; /* -> ch, line 76 */
+        z->lb = mlimit;
+    }
+    if (!(eq_v_b(z, z->S[0]))) return 0; /* name ch, line 77 */
+    {   int ret = slice_del(z); /* delete, line 78 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int danish_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 84 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 84 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 85 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 86 */
+        {   int ret = r_main_suffix(z);
+            if (ret == 0) goto lab1; /* call main_suffix, line 86 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 87 */
+        {   int ret = r_consonant_pair(z);
+            if (ret == 0) goto lab2; /* call consonant_pair, line 87 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 88 */
+        {   int ret = r_other_suffix(z);
+            if (ret == 0) goto lab3; /* call other_suffix, line 88 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 89 */
+        {   int ret = r_undouble(z);
+            if (ret == 0) goto lab4; /* call undouble, line 89 */
+            if (ret < 0) return ret;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * danish_ISO_8859_1_create_env(void) { return SN_create_env(1, 2, 0); }
+
+extern void danish_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 1); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_dutch.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_dutch.c
new file mode 100644
index 000000000000..e5ba288b1f5a
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_dutch.c
@@ -0,0 +1,624 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int dutch_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_standard_suffix(struct SN_env * z);
+static int r_undouble(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_en_ending(struct SN_env * z);
+static int r_e_ending(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * dutch_ISO_8859_1_create_env(void);
+extern void dutch_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 0xE1 };
+static const symbol s_0_2[1] = { 0xE4 };
+static const symbol s_0_3[1] = { 0xE9 };
+static const symbol s_0_4[1] = { 0xEB };
+static const symbol s_0_5[1] = { 0xED };
+static const symbol s_0_6[1] = { 0xEF };
+static const symbol s_0_7[1] = { 0xF3 };
+static const symbol s_0_8[1] = { 0xF6 };
+static const symbol s_0_9[1] = { 0xFA };
+static const symbol s_0_10[1] = { 0xFC };
+
+static const struct among a_0[11] =
+{
+/*  0 */ { 0, 0, -1, 6, 0},
+/*  1 */ { 1, s_0_1, 0, 1, 0},
+/*  2 */ { 1, s_0_2, 0, 1, 0},
+/*  3 */ { 1, s_0_3, 0, 2, 0},
+/*  4 */ { 1, s_0_4, 0, 2, 0},
+/*  5 */ { 1, s_0_5, 0, 3, 0},
+/*  6 */ { 1, s_0_6, 0, 3, 0},
+/*  7 */ { 1, s_0_7, 0, 4, 0},
+/*  8 */ { 1, s_0_8, 0, 4, 0},
+/*  9 */ { 1, s_0_9, 0, 5, 0},
+/* 10 */ { 1, s_0_10, 0, 5, 0}
+};
+
+static const symbol s_1_1[1] = { 'I' };
+static const symbol s_1_2[1] = { 'Y' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 1, s_1_1, 0, 2, 0},
+/*  2 */ { 1, s_1_2, 0, 1, 0}
+};
+
+static const symbol s_2_0[2] = { 'd', 'd' };
+static const symbol s_2_1[2] = { 'k', 'k' };
+static const symbol s_2_2[2] = { 't', 't' };
+
+static const struct among a_2[3] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 2, s_2_2, -1, -1, 0}
+};
+
+static const symbol s_3_0[3] = { 'e', 'n', 'e' };
+static const symbol s_3_1[2] = { 's', 'e' };
+static const symbol s_3_2[2] = { 'e', 'n' };
+static const symbol s_3_3[5] = { 'h', 'e', 'd', 'e', 'n' };
+static const symbol s_3_4[1] = { 's' };
+
+static const struct among a_3[5] =
+{
+/*  0 */ { 3, s_3_0, -1, 2, 0},
+/*  1 */ { 2, s_3_1, -1, 3, 0},
+/*  2 */ { 2, s_3_2, -1, 2, 0},
+/*  3 */ { 5, s_3_3, 2, 1, 0},
+/*  4 */ { 1, s_3_4, -1, 3, 0}
+};
+
+static const symbol s_4_0[3] = { 'e', 'n', 'd' };
+static const symbol s_4_1[2] = { 'i', 'g' };
+static const symbol s_4_2[3] = { 'i', 'n', 'g' };
+static const symbol s_4_3[4] = { 'l', 'i', 'j', 'k' };
+static const symbol s_4_4[4] = { 'b', 'a', 'a', 'r' };
+static const symbol s_4_5[3] = { 'b', 'a', 'r' };
+
+static const struct among a_4[6] =
+{
+/*  0 */ { 3, s_4_0, -1, 1, 0},
+/*  1 */ { 2, s_4_1, -1, 2, 0},
+/*  2 */ { 3, s_4_2, -1, 1, 0},
+/*  3 */ { 4, s_4_3, -1, 3, 0},
+/*  4 */ { 4, s_4_4, -1, 4, 0},
+/*  5 */ { 3, s_4_5, -1, 5, 0}
+};
+
+static const symbol s_5_0[2] = { 'a', 'a' };
+static const symbol s_5_1[2] = { 'e', 'e' };
+static const symbol s_5_2[2] = { 'o', 'o' };
+static const symbol s_5_3[2] = { 'u', 'u' };
+
+static const struct among a_5[4] =
+{
+/*  0 */ { 2, s_5_0, -1, -1, 0},
+/*  1 */ { 2, s_5_1, -1, -1, 0},
+/*  2 */ { 2, s_5_2, -1, -1, 0},
+/*  3 */ { 2, s_5_3, -1, -1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const unsigned char g_v_I[] = { 1, 0, 0, 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const unsigned char g_v_j[] = { 17, 67, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'o' };
+static const symbol s_4[] = { 'u' };
+static const symbol s_5[] = { 'y' };
+static const symbol s_6[] = { 'Y' };
+static const symbol s_7[] = { 'i' };
+static const symbol s_8[] = { 'I' };
+static const symbol s_9[] = { 'y' };
+static const symbol s_10[] = { 'Y' };
+static const symbol s_11[] = { 'y' };
+static const symbol s_12[] = { 'i' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'g', 'e', 'm' };
+static const symbol s_15[] = { 'h', 'e', 'i', 'd' };
+static const symbol s_16[] = { 'h', 'e', 'i', 'd' };
+static const symbol s_17[] = { 'c' };
+static const symbol s_18[] = { 'e', 'n' };
+static const symbol s_19[] = { 'i', 'g' };
+static const symbol s_20[] = { 'e' };
+static const symbol s_21[] = { 'e' };
+
+static int r_prelude(struct SN_env * z) {
+    int among_var;
+    {   int c_test = z->c; /* test, line 42 */
+        while(1) { /* repeat, line 42 */
+            int c1 = z->c;
+            z->bra = z->c; /* [, line 43 */
+            if (z->c >= z->l || z->p[z->c + 0] >> 5 != 7 || !((340306450 >> (z->p[z->c + 0] & 0x1f)) & 1)) among_var = 6; else
+            among_var = find_among(z, a_0, 11); /* substring, line 43 */
+            if (!(among_var)) goto lab0;
+            z->ket = z->c; /* ], line 43 */
+            switch(among_var) {
+                case 0: goto lab0;
+                case 1:
+                    {   int ret = slice_from_s(z, 1, s_0); /* <-, line 45 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    {   int ret = slice_from_s(z, 1, s_1); /* <-, line 47 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    {   int ret = slice_from_s(z, 1, s_2); /* <-, line 49 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 4:
+                    {   int ret = slice_from_s(z, 1, s_3); /* <-, line 51 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 5:
+                    {   int ret = slice_from_s(z, 1, s_4); /* <-, line 53 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 6:
+                    if (z->c >= z->l) goto lab0;
+                    z->c++; /* next, line 54 */
+                    break;
+            }
+            continue;
+        lab0:
+            z->c = c1;
+            break;
+        }
+        z->c = c_test;
+    }
+    {   int c_keep = z->c; /* try, line 57 */
+        z->bra = z->c; /* [, line 57 */
+        if (!(eq_s(z, 1, s_5))) { z->c = c_keep; goto lab1; }
+        z->ket = z->c; /* ], line 57 */
+        {   int ret = slice_from_s(z, 1, s_6); /* <-, line 57 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        ;
+    }
+    while(1) { /* repeat, line 58 */
+        int c2 = z->c;
+        while(1) { /* goto, line 58 */
+            int c3 = z->c;
+            if (in_grouping(z, g_v, 97, 232, 0)) goto lab3;
+            z->bra = z->c; /* [, line 59 */
+            {   int c4 = z->c; /* or, line 59 */
+                if (!(eq_s(z, 1, s_7))) goto lab5;
+                z->ket = z->c; /* ], line 59 */
+                if (in_grouping(z, g_v, 97, 232, 0)) goto lab5;
+                {   int ret = slice_from_s(z, 1, s_8); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                goto lab4;
+            lab5:
+                z->c = c4;
+                if (!(eq_s(z, 1, s_9))) goto lab3;
+                z->ket = z->c; /* ], line 60 */
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 60 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab4:
+            z->c = c3;
+            break;
+        lab3:
+            z->c = c3;
+            if (z->c >= z->l) goto lab2;
+            z->c++; /* goto, line 58 */
+        }
+        continue;
+    lab2:
+        z->c = c2;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {    /* gopast */ /* grouping v, line 69 */
+        int ret = out_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 69 */
+        int ret = in_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 69 */
+     /* try, line 70 */
+    if (!(z->I[0] < 3)) goto lab0;
+    z->I[0] = 3;
+lab0:
+    {    /* gopast */ /* grouping v, line 71 */
+        int ret = out_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 71 */
+        int ret = in_grouping(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[1] = z->c; /* setmark p2, line 71 */
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 75 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 77 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 73 && z->p[z->c + 0] != 89)) among_var = 3; else
+        among_var = find_among(z, a_1, 3); /* substring, line 77 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 77 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 80 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_undouble(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 91 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1050640 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+        if (!(find_among_b(z, a_2, 3))) return 0; /* among, line 91 */
+        z->c = z->l - m_test;
+    }
+    z->ket = z->c; /* [, line 91 */
+    if (z->c <= z->lb) return 0;
+    z->c--; /* next, line 91 */
+    z->bra = z->c; /* ], line 91 */
+    {   int ret = slice_del(z); /* delete, line 91 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_e_ending(struct SN_env * z) {
+    z->B[0] = 0; /* unset e_found, line 95 */
+    z->ket = z->c; /* [, line 96 */
+    if (!(eq_s_b(z, 1, s_13))) return 0;
+    z->bra = z->c; /* ], line 96 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 96 */
+        if (ret < 0) return ret;
+    }
+    {   int m_test = z->l - z->c; /* test, line 96 */
+        if (out_grouping_b(z, g_v, 97, 232, 0)) return 0;
+        z->c = z->l - m_test;
+    }
+    {   int ret = slice_del(z); /* delete, line 96 */
+        if (ret < 0) return ret;
+    }
+    z->B[0] = 1; /* set e_found, line 97 */
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 98 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_en_ending(struct SN_env * z) {
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 102 */
+        if (ret < 0) return ret;
+    }
+    {   int m1 = z->l - z->c; (void)m1; /* and, line 102 */
+        if (out_grouping_b(z, g_v, 97, 232, 0)) return 0;
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 102 */
+            if (!(eq_s_b(z, 3, s_14))) goto lab0;
+            return 0;
+        lab0:
+            z->c = z->l - m2;
+        }
+    }
+    {   int ret = slice_del(z); /* delete, line 102 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 103 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 107 */
+        z->ket = z->c; /* [, line 108 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((540704 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab0;
+        among_var = find_among_b(z, a_3, 5); /* substring, line 108 */
+        if (!(among_var)) goto lab0;
+        z->bra = z->c; /* ], line 108 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = r_R1(z);
+                    if (ret == 0) goto lab0; /* call R1, line 110 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_from_s(z, 4, s_15); /* <-, line 110 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = r_en_ending(z);
+                    if (ret == 0) goto lab0; /* call en_ending, line 113 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = r_R1(z);
+                    if (ret == 0) goto lab0; /* call R1, line 116 */
+                    if (ret < 0) return ret;
+                }
+                if (out_grouping_b(z, g_v_j, 97, 232, 0)) goto lab0;
+                {   int ret = slice_del(z); /* delete, line 116 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        z->c = z->l - m1;
+    }
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 120 */
+        {   int ret = r_e_ending(z);
+            if (ret == 0) goto lab1; /* call e_ending, line 120 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 122 */
+        z->ket = z->c; /* [, line 122 */
+        if (!(eq_s_b(z, 4, s_16))) goto lab2;
+        z->bra = z->c; /* ], line 122 */
+        {   int ret = r_R2(z);
+            if (ret == 0) goto lab2; /* call R2, line 122 */
+            if (ret < 0) return ret;
+        }
+        {   int m4 = z->l - z->c; (void)m4; /* not, line 122 */
+            if (!(eq_s_b(z, 1, s_17))) goto lab3;
+            goto lab2;
+        lab3:
+            z->c = z->l - m4;
+        }
+        {   int ret = slice_del(z); /* delete, line 122 */
+            if (ret < 0) return ret;
+        }
+        z->ket = z->c; /* [, line 123 */
+        if (!(eq_s_b(z, 2, s_18))) goto lab2;
+        z->bra = z->c; /* ], line 123 */
+        {   int ret = r_en_ending(z);
+            if (ret == 0) goto lab2; /* call en_ending, line 123 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 126 */
+        z->ket = z->c; /* [, line 127 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((264336 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab4;
+        among_var = find_among_b(z, a_4, 6); /* substring, line 127 */
+        if (!(among_var)) goto lab4;
+        z->bra = z->c; /* ], line 127 */
+        switch(among_var) {
+            case 0: goto lab4;
+            case 1:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 129 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 129 */
+                    if (ret < 0) return ret;
+                }
+                {   int m6 = z->l - z->c; (void)m6; /* or, line 130 */
+                    z->ket = z->c; /* [, line 130 */
+                    if (!(eq_s_b(z, 2, s_19))) goto lab6;
+                    z->bra = z->c; /* ], line 130 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) goto lab6; /* call R2, line 130 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int m7 = z->l - z->c; (void)m7; /* not, line 130 */
+                        if (!(eq_s_b(z, 1, s_20))) goto lab7;
+                        goto lab6;
+                    lab7:
+                        z->c = z->l - m7;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 130 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m6;
+                    {   int ret = r_undouble(z);
+                        if (ret == 0) goto lab4; /* call undouble, line 130 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                break;
+            case 2:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 133 */
+                    if (ret < 0) return ret;
+                }
+                {   int m8 = z->l - z->c; (void)m8; /* not, line 133 */
+                    if (!(eq_s_b(z, 1, s_21))) goto lab8;
+                    goto lab4;
+                lab8:
+                    z->c = z->l - m8;
+                }
+                {   int ret = slice_del(z); /* delete, line 133 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 136 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 136 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = r_e_ending(z);
+                    if (ret == 0) goto lab4; /* call e_ending, line 136 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 139 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 139 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 142 */
+                    if (ret < 0) return ret;
+                }
+                if (!(z->B[0])) goto lab4; /* Boolean test e_found, line 142 */
+                {   int ret = slice_del(z); /* delete, line 142 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 146 */
+        if (out_grouping_b(z, g_v_I, 73, 232, 0)) goto lab9;
+        {   int m_test = z->l - z->c; /* test, line 148 */
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((2129954 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab9;
+            if (!(find_among_b(z, a_5, 4))) goto lab9; /* among, line 149 */
+            if (out_grouping_b(z, g_v, 97, 232, 0)) goto lab9;
+            z->c = z->l - m_test;
+        }
+        z->ket = z->c; /* [, line 152 */
+        if (z->c <= z->lb) goto lab9;
+        z->c--; /* next, line 152 */
+        z->bra = z->c; /* ], line 152 */
+        {   int ret = slice_del(z); /* delete, line 152 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m9;
+    }
+    return 1;
+}
+
+extern int dutch_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 159 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 159 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 160 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 160 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 161 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 162 */
+        {   int ret = r_standard_suffix(z);
+            if (ret == 0) goto lab2; /* call standard_suffix, line 162 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    z->c = z->lb;
+    {   int c4 = z->c; /* do, line 163 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab3; /* call postlude, line 163 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = c4;
+    }
+    return 1;
+}
+
+extern struct SN_env * dutch_ISO_8859_1_create_env(void) { return SN_create_env(0, 2, 1); }
+
+extern void dutch_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_english.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_english.c
new file mode 100644
index 000000000000..141c45dc2755
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_english.c
@@ -0,0 +1,1117 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int english_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_exception2(struct SN_env * z);
+static int r_exception1(struct SN_env * z);
+static int r_Step_5(struct SN_env * z);
+static int r_Step_4(struct SN_env * z);
+static int r_Step_3(struct SN_env * z);
+static int r_Step_2(struct SN_env * z);
+static int r_Step_1c(struct SN_env * z);
+static int r_Step_1b(struct SN_env * z);
+static int r_Step_1a(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_shortv(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * english_ISO_8859_1_create_env(void);
+extern void english_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[5] = { 'a', 'r', 's', 'e', 'n' };
+static const symbol s_0_1[6] = { 'c', 'o', 'm', 'm', 'u', 'n' };
+static const symbol s_0_2[5] = { 'g', 'e', 'n', 'e', 'r' };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 5, s_0_0, -1, -1, 0},
+/*  1 */ { 6, s_0_1, -1, -1, 0},
+/*  2 */ { 5, s_0_2, -1, -1, 0}
+};
+
+static const symbol s_1_0[1] = { '\'' };
+static const symbol s_1_1[3] = { '\'', 's', '\'' };
+static const symbol s_1_2[2] = { '\'', 's' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 1, s_1_0, -1, 1, 0},
+/*  1 */ { 3, s_1_1, 0, 1, 0},
+/*  2 */ { 2, s_1_2, -1, 1, 0}
+};
+
+static const symbol s_2_0[3] = { 'i', 'e', 'd' };
+static const symbol s_2_1[1] = { 's' };
+static const symbol s_2_2[3] = { 'i', 'e', 's' };
+static const symbol s_2_3[4] = { 's', 's', 'e', 's' };
+static const symbol s_2_4[2] = { 's', 's' };
+static const symbol s_2_5[2] = { 'u', 's' };
+
+static const struct among a_2[6] =
+{
+/*  0 */ { 3, s_2_0, -1, 2, 0},
+/*  1 */ { 1, s_2_1, -1, 3, 0},
+/*  2 */ { 3, s_2_2, 1, 2, 0},
+/*  3 */ { 4, s_2_3, 1, 1, 0},
+/*  4 */ { 2, s_2_4, 1, -1, 0},
+/*  5 */ { 2, s_2_5, 1, -1, 0}
+};
+
+static const symbol s_3_1[2] = { 'b', 'b' };
+static const symbol s_3_2[2] = { 'd', 'd' };
+static const symbol s_3_3[2] = { 'f', 'f' };
+static const symbol s_3_4[2] = { 'g', 'g' };
+static const symbol s_3_5[2] = { 'b', 'l' };
+static const symbol s_3_6[2] = { 'm', 'm' };
+static const symbol s_3_7[2] = { 'n', 'n' };
+static const symbol s_3_8[2] = { 'p', 'p' };
+static const symbol s_3_9[2] = { 'r', 'r' };
+static const symbol s_3_10[2] = { 'a', 't' };
+static const symbol s_3_11[2] = { 't', 't' };
+static const symbol s_3_12[2] = { 'i', 'z' };
+
+static const struct among a_3[13] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 2, s_3_1, 0, 2, 0},
+/*  2 */ { 2, s_3_2, 0, 2, 0},
+/*  3 */ { 2, s_3_3, 0, 2, 0},
+/*  4 */ { 2, s_3_4, 0, 2, 0},
+/*  5 */ { 2, s_3_5, 0, 1, 0},
+/*  6 */ { 2, s_3_6, 0, 2, 0},
+/*  7 */ { 2, s_3_7, 0, 2, 0},
+/*  8 */ { 2, s_3_8, 0, 2, 0},
+/*  9 */ { 2, s_3_9, 0, 2, 0},
+/* 10 */ { 2, s_3_10, 0, 1, 0},
+/* 11 */ { 2, s_3_11, 0, 2, 0},
+/* 12 */ { 2, s_3_12, 0, 1, 0}
+};
+
+static const symbol s_4_0[2] = { 'e', 'd' };
+static const symbol s_4_1[3] = { 'e', 'e', 'd' };
+static const symbol s_4_2[3] = { 'i', 'n', 'g' };
+static const symbol s_4_3[4] = { 'e', 'd', 'l', 'y' };
+static const symbol s_4_4[5] = { 'e', 'e', 'd', 'l', 'y' };
+static const symbol s_4_5[5] = { 'i', 'n', 'g', 'l', 'y' };
+
+static const struct among a_4[6] =
+{
+/*  0 */ { 2, s_4_0, -1, 2, 0},
+/*  1 */ { 3, s_4_1, 0, 1, 0},
+/*  2 */ { 3, s_4_2, -1, 2, 0},
+/*  3 */ { 4, s_4_3, -1, 2, 0},
+/*  4 */ { 5, s_4_4, 3, 1, 0},
+/*  5 */ { 5, s_4_5, -1, 2, 0}
+};
+
+static const symbol s_5_0[4] = { 'a', 'n', 'c', 'i' };
+static const symbol s_5_1[4] = { 'e', 'n', 'c', 'i' };
+static const symbol s_5_2[3] = { 'o', 'g', 'i' };
+static const symbol s_5_3[2] = { 'l', 'i' };
+static const symbol s_5_4[3] = { 'b', 'l', 'i' };
+static const symbol s_5_5[4] = { 'a', 'b', 'l', 'i' };
+static const symbol s_5_6[4] = { 'a', 'l', 'l', 'i' };
+static const symbol s_5_7[5] = { 'f', 'u', 'l', 'l', 'i' };
+static const symbol s_5_8[6] = { 'l', 'e', 's', 's', 'l', 'i' };
+static const symbol s_5_9[5] = { 'o', 'u', 's', 'l', 'i' };
+static const symbol s_5_10[5] = { 'e', 'n', 't', 'l', 'i' };
+static const symbol s_5_11[5] = { 'a', 'l', 'i', 't', 'i' };
+static const symbol s_5_12[6] = { 'b', 'i', 'l', 'i', 't', 'i' };
+static const symbol s_5_13[5] = { 'i', 'v', 'i', 't', 'i' };
+static const symbol s_5_14[6] = { 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_5_15[7] = { 'a', 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_5_16[5] = { 'a', 'l', 'i', 's', 'm' };
+static const symbol s_5_17[5] = { 'a', 't', 'i', 'o', 'n' };
+static const symbol s_5_18[7] = { 'i', 'z', 'a', 't', 'i', 'o', 'n' };
+static const symbol s_5_19[4] = { 'i', 'z', 'e', 'r' };
+static const symbol s_5_20[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_5_21[7] = { 'i', 'v', 'e', 'n', 'e', 's', 's' };
+static const symbol s_5_22[7] = { 'f', 'u', 'l', 'n', 'e', 's', 's' };
+static const symbol s_5_23[7] = { 'o', 'u', 's', 'n', 'e', 's', 's' };
+
+static const struct among a_5[24] =
+{
+/*  0 */ { 4, s_5_0, -1, 3, 0},
+/*  1 */ { 4, s_5_1, -1, 2, 0},
+/*  2 */ { 3, s_5_2, -1, 13, 0},
+/*  3 */ { 2, s_5_3, -1, 16, 0},
+/*  4 */ { 3, s_5_4, 3, 12, 0},
+/*  5 */ { 4, s_5_5, 4, 4, 0},
+/*  6 */ { 4, s_5_6, 3, 8, 0},
+/*  7 */ { 5, s_5_7, 3, 14, 0},
+/*  8 */ { 6, s_5_8, 3, 15, 0},
+/*  9 */ { 5, s_5_9, 3, 10, 0},
+/* 10 */ { 5, s_5_10, 3, 5, 0},
+/* 11 */ { 5, s_5_11, -1, 8, 0},
+/* 12 */ { 6, s_5_12, -1, 12, 0},
+/* 13 */ { 5, s_5_13, -1, 11, 0},
+/* 14 */ { 6, s_5_14, -1, 1, 0},
+/* 15 */ { 7, s_5_15, 14, 7, 0},
+/* 16 */ { 5, s_5_16, -1, 8, 0},
+/* 17 */ { 5, s_5_17, -1, 7, 0},
+/* 18 */ { 7, s_5_18, 17, 6, 0},
+/* 19 */ { 4, s_5_19, -1, 6, 0},
+/* 20 */ { 4, s_5_20, -1, 7, 0},
+/* 21 */ { 7, s_5_21, -1, 11, 0},
+/* 22 */ { 7, s_5_22, -1, 9, 0},
+/* 23 */ { 7, s_5_23, -1, 10, 0}
+};
+
+static const symbol s_6_0[5] = { 'i', 'c', 'a', 't', 'e' };
+static const symbol s_6_1[5] = { 'a', 't', 'i', 'v', 'e' };
+static const symbol s_6_2[5] = { 'a', 'l', 'i', 'z', 'e' };
+static const symbol s_6_3[5] = { 'i', 'c', 'i', 't', 'i' };
+static const symbol s_6_4[4] = { 'i', 'c', 'a', 'l' };
+static const symbol s_6_5[6] = { 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_6_6[7] = { 'a', 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_6_7[3] = { 'f', 'u', 'l' };
+static const symbol s_6_8[4] = { 'n', 'e', 's', 's' };
+
+static const struct among a_6[9] =
+{
+/*  0 */ { 5, s_6_0, -1, 4, 0},
+/*  1 */ { 5, s_6_1, -1, 6, 0},
+/*  2 */ { 5, s_6_2, -1, 3, 0},
+/*  3 */ { 5, s_6_3, -1, 4, 0},
+/*  4 */ { 4, s_6_4, -1, 4, 0},
+/*  5 */ { 6, s_6_5, -1, 1, 0},
+/*  6 */ { 7, s_6_6, 5, 2, 0},
+/*  7 */ { 3, s_6_7, -1, 5, 0},
+/*  8 */ { 4, s_6_8, -1, 5, 0}
+};
+
+static const symbol s_7_0[2] = { 'i', 'c' };
+static const symbol s_7_1[4] = { 'a', 'n', 'c', 'e' };
+static const symbol s_7_2[4] = { 'e', 'n', 'c', 'e' };
+static const symbol s_7_3[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_7_4[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_7_5[3] = { 'a', 't', 'e' };
+static const symbol s_7_6[3] = { 'i', 'v', 'e' };
+static const symbol s_7_7[3] = { 'i', 'z', 'e' };
+static const symbol s_7_8[3] = { 'i', 't', 'i' };
+static const symbol s_7_9[2] = { 'a', 'l' };
+static const symbol s_7_10[3] = { 'i', 's', 'm' };
+static const symbol s_7_11[3] = { 'i', 'o', 'n' };
+static const symbol s_7_12[2] = { 'e', 'r' };
+static const symbol s_7_13[3] = { 'o', 'u', 's' };
+static const symbol s_7_14[3] = { 'a', 'n', 't' };
+static const symbol s_7_15[3] = { 'e', 'n', 't' };
+static const symbol s_7_16[4] = { 'm', 'e', 'n', 't' };
+static const symbol s_7_17[5] = { 'e', 'm', 'e', 'n', 't' };
+
+static const struct among a_7[18] =
+{
+/*  0 */ { 2, s_7_0, -1, 1, 0},
+/*  1 */ { 4, s_7_1, -1, 1, 0},
+/*  2 */ { 4, s_7_2, -1, 1, 0},
+/*  3 */ { 4, s_7_3, -1, 1, 0},
+/*  4 */ { 4, s_7_4, -1, 1, 0},
+/*  5 */ { 3, s_7_5, -1, 1, 0},
+/*  6 */ { 3, s_7_6, -1, 1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 3, s_7_8, -1, 1, 0},
+/*  9 */ { 2, s_7_9, -1, 1, 0},
+/* 10 */ { 3, s_7_10, -1, 1, 0},
+/* 11 */ { 3, s_7_11, -1, 2, 0},
+/* 12 */ { 2, s_7_12, -1, 1, 0},
+/* 13 */ { 3, s_7_13, -1, 1, 0},
+/* 14 */ { 3, s_7_14, -1, 1, 0},
+/* 15 */ { 3, s_7_15, -1, 1, 0},
+/* 16 */ { 4, s_7_16, 15, 1, 0},
+/* 17 */ { 5, s_7_17, 16, 1, 0}
+};
+
+static const symbol s_8_0[1] = { 'e' };
+static const symbol s_8_1[1] = { 'l' };
+
+static const struct among a_8[2] =
+{
+/*  0 */ { 1, s_8_0, -1, 1, 0},
+/*  1 */ { 1, s_8_1, -1, 2, 0}
+};
+
+static const symbol s_9_0[7] = { 's', 'u', 'c', 'c', 'e', 'e', 'd' };
+static const symbol s_9_1[7] = { 'p', 'r', 'o', 'c', 'e', 'e', 'd' };
+static const symbol s_9_2[6] = { 'e', 'x', 'c', 'e', 'e', 'd' };
+static const symbol s_9_3[7] = { 'c', 'a', 'n', 'n', 'i', 'n', 'g' };
+static const symbol s_9_4[6] = { 'i', 'n', 'n', 'i', 'n', 'g' };
+static const symbol s_9_5[7] = { 'e', 'a', 'r', 'r', 'i', 'n', 'g' };
+static const symbol s_9_6[7] = { 'h', 'e', 'r', 'r', 'i', 'n', 'g' };
+static const symbol s_9_7[6] = { 'o', 'u', 't', 'i', 'n', 'g' };
+
+static const struct among a_9[8] =
+{
+/*  0 */ { 7, s_9_0, -1, -1, 0},
+/*  1 */ { 7, s_9_1, -1, -1, 0},
+/*  2 */ { 6, s_9_2, -1, -1, 0},
+/*  3 */ { 7, s_9_3, -1, -1, 0},
+/*  4 */ { 6, s_9_4, -1, -1, 0},
+/*  5 */ { 7, s_9_5, -1, -1, 0},
+/*  6 */ { 7, s_9_6, -1, -1, 0},
+/*  7 */ { 6, s_9_7, -1, -1, 0}
+};
+
+static const symbol s_10_0[5] = { 'a', 'n', 'd', 'e', 's' };
+static const symbol s_10_1[5] = { 'a', 't', 'l', 'a', 's' };
+static const symbol s_10_2[4] = { 'b', 'i', 'a', 's' };
+static const symbol s_10_3[6] = { 'c', 'o', 's', 'm', 'o', 's' };
+static const symbol s_10_4[5] = { 'd', 'y', 'i', 'n', 'g' };
+static const symbol s_10_5[5] = { 'e', 'a', 'r', 'l', 'y' };
+static const symbol s_10_6[6] = { 'g', 'e', 'n', 't', 'l', 'y' };
+static const symbol s_10_7[4] = { 'h', 'o', 'w', 'e' };
+static const symbol s_10_8[4] = { 'i', 'd', 'l', 'y' };
+static const symbol s_10_9[5] = { 'l', 'y', 'i', 'n', 'g' };
+static const symbol s_10_10[4] = { 'n', 'e', 'w', 's' };
+static const symbol s_10_11[4] = { 'o', 'n', 'l', 'y' };
+static const symbol s_10_12[6] = { 's', 'i', 'n', 'g', 'l', 'y' };
+static const symbol s_10_13[5] = { 's', 'k', 'i', 'e', 's' };
+static const symbol s_10_14[4] = { 's', 'k', 'i', 's' };
+static const symbol s_10_15[3] = { 's', 'k', 'y' };
+static const symbol s_10_16[5] = { 't', 'y', 'i', 'n', 'g' };
+static const symbol s_10_17[4] = { 'u', 'g', 'l', 'y' };
+
+static const struct among a_10[18] =
+{
+/*  0 */ { 5, s_10_0, -1, -1, 0},
+/*  1 */ { 5, s_10_1, -1, -1, 0},
+/*  2 */ { 4, s_10_2, -1, -1, 0},
+/*  3 */ { 6, s_10_3, -1, -1, 0},
+/*  4 */ { 5, s_10_4, -1, 3, 0},
+/*  5 */ { 5, s_10_5, -1, 9, 0},
+/*  6 */ { 6, s_10_6, -1, 7, 0},
+/*  7 */ { 4, s_10_7, -1, -1, 0},
+/*  8 */ { 4, s_10_8, -1, 6, 0},
+/*  9 */ { 5, s_10_9, -1, 4, 0},
+/* 10 */ { 4, s_10_10, -1, -1, 0},
+/* 11 */ { 4, s_10_11, -1, 10, 0},
+/* 12 */ { 6, s_10_12, -1, 11, 0},
+/* 13 */ { 5, s_10_13, -1, 2, 0},
+/* 14 */ { 4, s_10_14, -1, 1, 0},
+/* 15 */ { 3, s_10_15, -1, -1, 0},
+/* 16 */ { 5, s_10_16, -1, 5, 0},
+/* 17 */ { 4, s_10_17, -1, 8, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1 };
+
+static const unsigned char g_v_WXY[] = { 1, 17, 65, 208, 1 };
+
+static const unsigned char g_valid_LI[] = { 55, 141, 2 };
+
+static const symbol s_0[] = { '\'' };
+static const symbol s_1[] = { 'y' };
+static const symbol s_2[] = { 'Y' };
+static const symbol s_3[] = { 'y' };
+static const symbol s_4[] = { 'Y' };
+static const symbol s_5[] = { 's', 's' };
+static const symbol s_6[] = { 'i' };
+static const symbol s_7[] = { 'i', 'e' };
+static const symbol s_8[] = { 'e', 'e' };
+static const symbol s_9[] = { 'e' };
+static const symbol s_10[] = { 'e' };
+static const symbol s_11[] = { 'y' };
+static const symbol s_12[] = { 'Y' };
+static const symbol s_13[] = { 'i' };
+static const symbol s_14[] = { 't', 'i', 'o', 'n' };
+static const symbol s_15[] = { 'e', 'n', 'c', 'e' };
+static const symbol s_16[] = { 'a', 'n', 'c', 'e' };
+static const symbol s_17[] = { 'a', 'b', 'l', 'e' };
+static const symbol s_18[] = { 'e', 'n', 't' };
+static const symbol s_19[] = { 'i', 'z', 'e' };
+static const symbol s_20[] = { 'a', 't', 'e' };
+static const symbol s_21[] = { 'a', 'l' };
+static const symbol s_22[] = { 'f', 'u', 'l' };
+static const symbol s_23[] = { 'o', 'u', 's' };
+static const symbol s_24[] = { 'i', 'v', 'e' };
+static const symbol s_25[] = { 'b', 'l', 'e' };
+static const symbol s_26[] = { 'l' };
+static const symbol s_27[] = { 'o', 'g' };
+static const symbol s_28[] = { 'f', 'u', 'l' };
+static const symbol s_29[] = { 'l', 'e', 's', 's' };
+static const symbol s_30[] = { 't', 'i', 'o', 'n' };
+static const symbol s_31[] = { 'a', 't', 'e' };
+static const symbol s_32[] = { 'a', 'l' };
+static const symbol s_33[] = { 'i', 'c' };
+static const symbol s_34[] = { 's' };
+static const symbol s_35[] = { 't' };
+static const symbol s_36[] = { 'l' };
+static const symbol s_37[] = { 's', 'k', 'i' };
+static const symbol s_38[] = { 's', 'k', 'y' };
+static const symbol s_39[] = { 'd', 'i', 'e' };
+static const symbol s_40[] = { 'l', 'i', 'e' };
+static const symbol s_41[] = { 't', 'i', 'e' };
+static const symbol s_42[] = { 'i', 'd', 'l' };
+static const symbol s_43[] = { 'g', 'e', 'n', 't', 'l' };
+static const symbol s_44[] = { 'u', 'g', 'l', 'i' };
+static const symbol s_45[] = { 'e', 'a', 'r', 'l', 'i' };
+static const symbol s_46[] = { 'o', 'n', 'l', 'i' };
+static const symbol s_47[] = { 's', 'i', 'n', 'g', 'l' };
+static const symbol s_48[] = { 'Y' };
+static const symbol s_49[] = { 'y' };
+
+static int r_prelude(struct SN_env * z) {
+    z->B[0] = 0; /* unset Y_found, line 26 */
+    {   int c1 = z->c; /* do, line 27 */
+        z->bra = z->c; /* [, line 27 */
+        if (!(eq_s(z, 1, s_0))) goto lab0;
+        z->ket = z->c; /* ], line 27 */
+        {   int ret = slice_del(z); /* delete, line 27 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 28 */
+        z->bra = z->c; /* [, line 28 */
+        if (!(eq_s(z, 1, s_1))) goto lab1;
+        z->ket = z->c; /* ], line 28 */
+        {   int ret = slice_from_s(z, 1, s_2); /* <-, line 28 */
+            if (ret < 0) return ret;
+        }
+        z->B[0] = 1; /* set Y_found, line 28 */
+    lab1:
+        z->c = c2;
+    }
+    {   int c3 = z->c; /* do, line 29 */
+        while(1) { /* repeat, line 29 */
+            int c4 = z->c;
+            while(1) { /* goto, line 29 */
+                int c5 = z->c;
+                if (in_grouping(z, g_v, 97, 121, 0)) goto lab4;
+                z->bra = z->c; /* [, line 29 */
+                if (!(eq_s(z, 1, s_3))) goto lab4;
+                z->ket = z->c; /* ], line 29 */
+                z->c = c5;
+                break;
+            lab4:
+                z->c = c5;
+                if (z->c >= z->l) goto lab3;
+                z->c++; /* goto, line 29 */
+            }
+            {   int ret = slice_from_s(z, 1, s_4); /* <-, line 29 */
+                if (ret < 0) return ret;
+            }
+            z->B[0] = 1; /* set Y_found, line 29 */
+            continue;
+        lab3:
+            z->c = c4;
+            break;
+        }
+        z->c = c3;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c1 = z->c; /* do, line 35 */
+        {   int c2 = z->c; /* or, line 41 */
+            if (z->c + 4 >= z->l || z->p[z->c + 4] >> 5 != 3 || !((2375680 >> (z->p[z->c + 4] & 0x1f)) & 1)) goto lab2;
+            if (!(find_among(z, a_0, 3))) goto lab2; /* among, line 36 */
+            goto lab1;
+        lab2:
+            z->c = c2;
+            {    /* gopast */ /* grouping v, line 41 */
+                int ret = out_grouping(z, g_v, 97, 121, 1);
+                if (ret < 0) goto lab0;
+                z->c += ret;
+            }
+            {    /* gopast */ /* non v, line 41 */
+                int ret = in_grouping(z, g_v, 97, 121, 1);
+                if (ret < 0) goto lab0;
+                z->c += ret;
+            }
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark p1, line 42 */
+        {    /* gopast */ /* grouping v, line 43 */
+            int ret = out_grouping(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 43 */
+            int ret = in_grouping(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p2, line 43 */
+    lab0:
+        z->c = c1;
+    }
+    return 1;
+}
+
+static int r_shortv(struct SN_env * z) {
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 51 */
+        if (out_grouping_b(z, g_v_WXY, 89, 121, 0)) goto lab1;
+        if (in_grouping_b(z, g_v, 97, 121, 0)) goto lab1;
+        if (out_grouping_b(z, g_v, 97, 121, 0)) goto lab1;
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        if (out_grouping_b(z, g_v, 97, 121, 0)) return 0;
+        if (in_grouping_b(z, g_v, 97, 121, 0)) return 0;
+        if (z->c > z->lb) return 0; /* atlimit, line 52 */
+    }
+lab0:
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_Step_1a(struct SN_env * z) {
+    int among_var;
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 59 */
+        z->ket = z->c; /* [, line 60 */
+        if (z->c <= z->lb || (z->p[z->c - 1] != 39 && z->p[z->c - 1] != 115)) { z->c = z->l - m_keep; goto lab0; }
+        among_var = find_among_b(z, a_1, 3); /* substring, line 60 */
+        if (!(among_var)) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 60 */
+        switch(among_var) {
+            case 0: { z->c = z->l - m_keep; goto lab0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 62 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        ;
+    }
+    z->ket = z->c; /* [, line 65 */
+    if (z->c <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 115)) return 0;
+    among_var = find_among_b(z, a_2, 6); /* substring, line 65 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 65 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 2, s_5); /* <-, line 66 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 68 */
+                {   int ret = z->c - 2;
+                    if (z->lb > ret || ret > z->l) goto lab2;
+                    z->c = ret; /* hop, line 68 */
+                }
+                {   int ret = slice_from_s(z, 1, s_6); /* <-, line 68 */
+                    if (ret < 0) return ret;
+                }
+                goto lab1;
+            lab2:
+                z->c = z->l - m1;
+                {   int ret = slice_from_s(z, 2, s_7); /* <-, line 68 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab1:
+            break;
+        case 3:
+            if (z->c <= z->lb) return 0;
+            z->c--; /* next, line 69 */
+            {    /* gopast */ /* grouping v, line 69 */
+                int ret = out_grouping_b(z, g_v, 97, 121, 1);
+                if (ret < 0) return 0;
+                z->c -= ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 69 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1b(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 75 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((33554576 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_4, 6); /* substring, line 75 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 75 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 77 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 2, s_8); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m_test = z->l - z->c; /* test, line 80 */
+                {    /* gopast */ /* grouping v, line 80 */
+                    int ret = out_grouping_b(z, g_v, 97, 121, 1);
+                    if (ret < 0) return 0;
+                    z->c -= ret;
+                }
+                z->c = z->l - m_test;
+            }
+            {   int ret = slice_del(z); /* delete, line 80 */
+                if (ret < 0) return ret;
+            }
+            {   int m_test = z->l - z->c; /* test, line 81 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((68514004 >> (z->p[z->c - 1] & 0x1f)) & 1)) among_var = 3; else
+                among_var = find_among_b(z, a_3, 13); /* substring, line 81 */
+                if (!(among_var)) return 0;
+                z->c = z->l - m_test;
+            }
+            switch(among_var) {
+                case 0: return 0;
+                case 1:
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_9); /* <+, line 83 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    z->ket = z->c; /* [, line 86 */
+                    if (z->c <= z->lb) return 0;
+                    z->c--; /* next, line 86 */
+                    z->bra = z->c; /* ], line 86 */
+                    {   int ret = slice_del(z); /* delete, line 86 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    if (z->c != z->I[0]) return 0; /* atmark, line 87 */
+                    {   int m_test = z->l - z->c; /* test, line 87 */
+                        {   int ret = r_shortv(z);
+                            if (ret == 0) return 0; /* call shortv, line 87 */
+                            if (ret < 0) return ret;
+                        }
+                        z->c = z->l - m_test;
+                    }
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_10); /* <+, line 87 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1c(struct SN_env * z) {
+    z->ket = z->c; /* [, line 94 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 94 */
+        if (!(eq_s_b(z, 1, s_11))) goto lab1;
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        if (!(eq_s_b(z, 1, s_12))) return 0;
+    }
+lab0:
+    z->bra = z->c; /* ], line 94 */
+    if (out_grouping_b(z, g_v, 97, 121, 0)) return 0;
+    {   int m2 = z->l - z->c; (void)m2; /* not, line 95 */
+        if (z->c > z->lb) goto lab2; /* atlimit, line 95 */
+        return 0;
+    lab2:
+        z->c = z->l - m2;
+    }
+    {   int ret = slice_from_s(z, 1, s_13); /* <-, line 96 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_Step_2(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 100 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((815616 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_5, 24); /* substring, line 100 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 100 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 100 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 4, s_14); /* <-, line 101 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 4, s_15); /* <-, line 102 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 4, s_16); /* <-, line 103 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 4, s_17); /* <-, line 104 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 3, s_18); /* <-, line 105 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 3, s_19); /* <-, line 107 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 3, s_20); /* <-, line 109 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 2, s_21); /* <-, line 111 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 3, s_22); /* <-, line 112 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 3, s_23); /* <-, line 114 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 3, s_24); /* <-, line 116 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_from_s(z, 3, s_25); /* <-, line 118 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            if (!(eq_s_b(z, 1, s_26))) return 0;
+            {   int ret = slice_from_s(z, 2, s_27); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_from_s(z, 3, s_28); /* <-, line 120 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 15:
+            {   int ret = slice_from_s(z, 4, s_29); /* <-, line 121 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 16:
+            if (in_grouping_b(z, g_valid_LI, 99, 116, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 122 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_3(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 127 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((528928 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_6, 9); /* substring, line 127 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 127 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 127 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 4, s_30); /* <-, line 128 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 3, s_31); /* <-, line 129 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 2, s_32); /* <-, line 130 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 2, s_33); /* <-, line 132 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_del(z); /* delete, line 134 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 136 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 136 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_4(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 141 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1864232 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_7, 18); /* substring, line 141 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 141 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 141 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 144 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 145 */
+                if (!(eq_s_b(z, 1, s_34))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_35))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 145 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_5(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 150 */
+    if (z->c <= z->lb || (z->p[z->c - 1] != 101 && z->p[z->c - 1] != 108)) return 0;
+    among_var = find_among_b(z, a_8, 2); /* substring, line 150 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 150 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 151 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab1; /* call R2, line 151 */
+                    if (ret < 0) return ret;
+                }
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                {   int ret = r_R1(z);
+                    if (ret == 0) return 0; /* call R1, line 151 */
+                    if (ret < 0) return ret;
+                }
+                {   int m2 = z->l - z->c; (void)m2; /* not, line 151 */
+                    {   int ret = r_shortv(z);
+                        if (ret == 0) goto lab2; /* call shortv, line 151 */
+                        if (ret < 0) return ret;
+                    }
+                    return 0;
+                lab2:
+                    z->c = z->l - m2;
+                }
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 151 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 152 */
+                if (ret < 0) return ret;
+            }
+            if (!(eq_s_b(z, 1, s_36))) return 0;
+            {   int ret = slice_del(z); /* delete, line 152 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_exception2(struct SN_env * z) {
+    z->ket = z->c; /* [, line 158 */
+    if (z->c - 5 <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 103)) return 0;
+    if (!(find_among_b(z, a_9, 8))) return 0; /* substring, line 158 */
+    z->bra = z->c; /* ], line 158 */
+    if (z->c > z->lb) return 0; /* atlimit, line 158 */
+    return 1;
+}
+
+static int r_exception1(struct SN_env * z) {
+    int among_var;
+    z->bra = z->c; /* [, line 170 */
+    if (z->c + 2 >= z->l || z->p[z->c + 2] >> 5 != 3 || !((42750482 >> (z->p[z->c + 2] & 0x1f)) & 1)) return 0;
+    among_var = find_among(z, a_10, 18); /* substring, line 170 */
+    if (!(among_var)) return 0;
+    z->ket = z->c; /* ], line 170 */
+    if (z->c < z->l) return 0; /* atlimit, line 170 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 3, s_37); /* <-, line 174 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 3, s_38); /* <-, line 175 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 3, s_39); /* <-, line 176 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 3, s_40); /* <-, line 177 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 3, s_41); /* <-, line 178 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 3, s_42); /* <-, line 182 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 5, s_43); /* <-, line 183 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 4, s_44); /* <-, line 184 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 5, s_45); /* <-, line 185 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 4, s_46); /* <-, line 186 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 5, s_47); /* <-, line 187 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    if (!(z->B[0])) return 0; /* Boolean test Y_found, line 203 */
+    while(1) { /* repeat, line 203 */
+        int c1 = z->c;
+        while(1) { /* goto, line 203 */
+            int c2 = z->c;
+            z->bra = z->c; /* [, line 203 */
+            if (!(eq_s(z, 1, s_48))) goto lab1;
+            z->ket = z->c; /* ], line 203 */
+            z->c = c2;
+            break;
+        lab1:
+            z->c = c2;
+            if (z->c >= z->l) goto lab0;
+            z->c++; /* goto, line 203 */
+        }
+        {   int ret = slice_from_s(z, 1, s_49); /* <-, line 203 */
+            if (ret < 0) return ret;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+extern int english_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* or, line 207 */
+        {   int ret = r_exception1(z);
+            if (ret == 0) goto lab1; /* call exception1, line 207 */
+            if (ret < 0) return ret;
+        }
+        goto lab0;
+    lab1:
+        z->c = c1;
+        {   int c2 = z->c; /* not, line 208 */
+            {   int ret = z->c + 3;
+                if (0 > ret || ret > z->l) goto lab3;
+                z->c = ret; /* hop, line 208 */
+            }
+            goto lab2;
+        lab3:
+            z->c = c2;
+        }
+        goto lab0;
+    lab2:
+        z->c = c1;
+        {   int c3 = z->c; /* do, line 209 */
+            {   int ret = r_prelude(z);
+                if (ret == 0) goto lab4; /* call prelude, line 209 */
+                if (ret < 0) return ret;
+            }
+        lab4:
+            z->c = c3;
+        }
+        {   int c4 = z->c; /* do, line 210 */
+            {   int ret = r_mark_regions(z);
+                if (ret == 0) goto lab5; /* call mark_regions, line 210 */
+                if (ret < 0) return ret;
+            }
+        lab5:
+            z->c = c4;
+        }
+        z->lb = z->c; z->c = z->l; /* backwards, line 211 */
+
+        {   int m5 = z->l - z->c; (void)m5; /* do, line 213 */
+            {   int ret = r_Step_1a(z);
+                if (ret == 0) goto lab6; /* call Step_1a, line 213 */
+                if (ret < 0) return ret;
+            }
+        lab6:
+            z->c = z->l - m5;
+        }
+        {   int m6 = z->l - z->c; (void)m6; /* or, line 215 */
+            {   int ret = r_exception2(z);
+                if (ret == 0) goto lab8; /* call exception2, line 215 */
+                if (ret < 0) return ret;
+            }
+            goto lab7;
+        lab8:
+            z->c = z->l - m6;
+            {   int m7 = z->l - z->c; (void)m7; /* do, line 217 */
+                {   int ret = r_Step_1b(z);
+                    if (ret == 0) goto lab9; /* call Step_1b, line 217 */
+                    if (ret < 0) return ret;
+                }
+            lab9:
+                z->c = z->l - m7;
+            }
+            {   int m8 = z->l - z->c; (void)m8; /* do, line 218 */
+                {   int ret = r_Step_1c(z);
+                    if (ret == 0) goto lab10; /* call Step_1c, line 218 */
+                    if (ret < 0) return ret;
+                }
+            lab10:
+                z->c = z->l - m8;
+            }
+            {   int m9 = z->l - z->c; (void)m9; /* do, line 220 */
+                {   int ret = r_Step_2(z);
+                    if (ret == 0) goto lab11; /* call Step_2, line 220 */
+                    if (ret < 0) return ret;
+                }
+            lab11:
+                z->c = z->l - m9;
+            }
+            {   int m10 = z->l - z->c; (void)m10; /* do, line 221 */
+                {   int ret = r_Step_3(z);
+                    if (ret == 0) goto lab12; /* call Step_3, line 221 */
+                    if (ret < 0) return ret;
+                }
+            lab12:
+                z->c = z->l - m10;
+            }
+            {   int m11 = z->l - z->c; (void)m11; /* do, line 222 */
+                {   int ret = r_Step_4(z);
+                    if (ret == 0) goto lab13; /* call Step_4, line 222 */
+                    if (ret < 0) return ret;
+                }
+            lab13:
+                z->c = z->l - m11;
+            }
+            {   int m12 = z->l - z->c; (void)m12; /* do, line 224 */
+                {   int ret = r_Step_5(z);
+                    if (ret == 0) goto lab14; /* call Step_5, line 224 */
+                    if (ret < 0) return ret;
+                }
+            lab14:
+                z->c = z->l - m12;
+            }
+        }
+    lab7:
+        z->c = z->lb;
+        {   int c13 = z->c; /* do, line 227 */
+            {   int ret = r_postlude(z);
+                if (ret == 0) goto lab15; /* call postlude, line 227 */
+                if (ret < 0) return ret;
+            }
+        lab15:
+            z->c = c13;
+        }
+    }
+lab0:
+    return 1;
+}
+
+extern struct SN_env * english_ISO_8859_1_create_env(void) { return SN_create_env(0, 2, 1); }
+
+extern void english_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_finnish.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_finnish.c
new file mode 100644
index 000000000000..9621771d2821
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_finnish.c
@@ -0,0 +1,762 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int finnish_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_tidy(struct SN_env * z);
+static int r_other_endings(struct SN_env * z);
+static int r_t_plural(struct SN_env * z);
+static int r_i_plural(struct SN_env * z);
+static int r_case_ending(struct SN_env * z);
+static int r_VI(struct SN_env * z);
+static int r_LONG(struct SN_env * z);
+static int r_possessive(struct SN_env * z);
+static int r_particle_etc(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * finnish_ISO_8859_1_create_env(void);
+extern void finnish_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[2] = { 'p', 'a' };
+static const symbol s_0_1[3] = { 's', 't', 'i' };
+static const symbol s_0_2[4] = { 'k', 'a', 'a', 'n' };
+static const symbol s_0_3[3] = { 'h', 'a', 'n' };
+static const symbol s_0_4[3] = { 'k', 'i', 'n' };
+static const symbol s_0_5[3] = { 'h', 0xE4, 'n' };
+static const symbol s_0_6[4] = { 'k', 0xE4, 0xE4, 'n' };
+static const symbol s_0_7[2] = { 'k', 'o' };
+static const symbol s_0_8[2] = { 'p', 0xE4 };
+static const symbol s_0_9[2] = { 'k', 0xF6 };
+
+static const struct among a_0[10] =
+{
+/*  0 */ { 2, s_0_0, -1, 1, 0},
+/*  1 */ { 3, s_0_1, -1, 2, 0},
+/*  2 */ { 4, s_0_2, -1, 1, 0},
+/*  3 */ { 3, s_0_3, -1, 1, 0},
+/*  4 */ { 3, s_0_4, -1, 1, 0},
+/*  5 */ { 3, s_0_5, -1, 1, 0},
+/*  6 */ { 4, s_0_6, -1, 1, 0},
+/*  7 */ { 2, s_0_7, -1, 1, 0},
+/*  8 */ { 2, s_0_8, -1, 1, 0},
+/*  9 */ { 2, s_0_9, -1, 1, 0}
+};
+
+static const symbol s_1_0[3] = { 'l', 'l', 'a' };
+static const symbol s_1_1[2] = { 'n', 'a' };
+static const symbol s_1_2[3] = { 's', 's', 'a' };
+static const symbol s_1_3[2] = { 't', 'a' };
+static const symbol s_1_4[3] = { 'l', 't', 'a' };
+static const symbol s_1_5[3] = { 's', 't', 'a' };
+
+static const struct among a_1[6] =
+{
+/*  0 */ { 3, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0},
+/*  2 */ { 3, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0},
+/*  4 */ { 3, s_1_4, 3, -1, 0},
+/*  5 */ { 3, s_1_5, 3, -1, 0}
+};
+
+static const symbol s_2_0[3] = { 'l', 'l', 0xE4 };
+static const symbol s_2_1[2] = { 'n', 0xE4 };
+static const symbol s_2_2[3] = { 's', 's', 0xE4 };
+static const symbol s_2_3[2] = { 't', 0xE4 };
+static const symbol s_2_4[3] = { 'l', 't', 0xE4 };
+static const symbol s_2_5[3] = { 's', 't', 0xE4 };
+
+static const struct among a_2[6] =
+{
+/*  0 */ { 3, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 3, s_2_2, -1, -1, 0},
+/*  3 */ { 2, s_2_3, -1, -1, 0},
+/*  4 */ { 3, s_2_4, 3, -1, 0},
+/*  5 */ { 3, s_2_5, 3, -1, 0}
+};
+
+static const symbol s_3_0[3] = { 'l', 'l', 'e' };
+static const symbol s_3_1[3] = { 'i', 'n', 'e' };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 3, s_3_0, -1, -1, 0},
+/*  1 */ { 3, s_3_1, -1, -1, 0}
+};
+
+static const symbol s_4_0[3] = { 'n', 's', 'a' };
+static const symbol s_4_1[3] = { 'm', 'm', 'e' };
+static const symbol s_4_2[3] = { 'n', 'n', 'e' };
+static const symbol s_4_3[2] = { 'n', 'i' };
+static const symbol s_4_4[2] = { 's', 'i' };
+static const symbol s_4_5[2] = { 'a', 'n' };
+static const symbol s_4_6[2] = { 'e', 'n' };
+static const symbol s_4_7[2] = { 0xE4, 'n' };
+static const symbol s_4_8[3] = { 'n', 's', 0xE4 };
+
+static const struct among a_4[9] =
+{
+/*  0 */ { 3, s_4_0, -1, 3, 0},
+/*  1 */ { 3, s_4_1, -1, 3, 0},
+/*  2 */ { 3, s_4_2, -1, 3, 0},
+/*  3 */ { 2, s_4_3, -1, 2, 0},
+/*  4 */ { 2, s_4_4, -1, 1, 0},
+/*  5 */ { 2, s_4_5, -1, 4, 0},
+/*  6 */ { 2, s_4_6, -1, 6, 0},
+/*  7 */ { 2, s_4_7, -1, 5, 0},
+/*  8 */ { 3, s_4_8, -1, 3, 0}
+};
+
+static const symbol s_5_0[2] = { 'a', 'a' };
+static const symbol s_5_1[2] = { 'e', 'e' };
+static const symbol s_5_2[2] = { 'i', 'i' };
+static const symbol s_5_3[2] = { 'o', 'o' };
+static const symbol s_5_4[2] = { 'u', 'u' };
+static const symbol s_5_5[2] = { 0xE4, 0xE4 };
+static const symbol s_5_6[2] = { 0xF6, 0xF6 };
+
+static const struct among a_5[7] =
+{
+/*  0 */ { 2, s_5_0, -1, -1, 0},
+/*  1 */ { 2, s_5_1, -1, -1, 0},
+/*  2 */ { 2, s_5_2, -1, -1, 0},
+/*  3 */ { 2, s_5_3, -1, -1, 0},
+/*  4 */ { 2, s_5_4, -1, -1, 0},
+/*  5 */ { 2, s_5_5, -1, -1, 0},
+/*  6 */ { 2, s_5_6, -1, -1, 0}
+};
+
+static const symbol s_6_0[1] = { 'a' };
+static const symbol s_6_1[3] = { 'l', 'l', 'a' };
+static const symbol s_6_2[2] = { 'n', 'a' };
+static const symbol s_6_3[3] = { 's', 's', 'a' };
+static const symbol s_6_4[2] = { 't', 'a' };
+static const symbol s_6_5[3] = { 'l', 't', 'a' };
+static const symbol s_6_6[3] = { 's', 't', 'a' };
+static const symbol s_6_7[3] = { 't', 't', 'a' };
+static const symbol s_6_8[3] = { 'l', 'l', 'e' };
+static const symbol s_6_9[3] = { 'i', 'n', 'e' };
+static const symbol s_6_10[3] = { 'k', 's', 'i' };
+static const symbol s_6_11[1] = { 'n' };
+static const symbol s_6_12[3] = { 'h', 'a', 'n' };
+static const symbol s_6_13[3] = { 'd', 'e', 'n' };
+static const symbol s_6_14[4] = { 's', 'e', 'e', 'n' };
+static const symbol s_6_15[3] = { 'h', 'e', 'n' };
+static const symbol s_6_16[4] = { 't', 't', 'e', 'n' };
+static const symbol s_6_17[3] = { 'h', 'i', 'n' };
+static const symbol s_6_18[4] = { 's', 'i', 'i', 'n' };
+static const symbol s_6_19[3] = { 'h', 'o', 'n' };
+static const symbol s_6_20[3] = { 'h', 0xE4, 'n' };
+static const symbol s_6_21[3] = { 'h', 0xF6, 'n' };
+static const symbol s_6_22[1] = { 0xE4 };
+static const symbol s_6_23[3] = { 'l', 'l', 0xE4 };
+static const symbol s_6_24[2] = { 'n', 0xE4 };
+static const symbol s_6_25[3] = { 's', 's', 0xE4 };
+static const symbol s_6_26[2] = { 't', 0xE4 };
+static const symbol s_6_27[3] = { 'l', 't', 0xE4 };
+static const symbol s_6_28[3] = { 's', 't', 0xE4 };
+static const symbol s_6_29[3] = { 't', 't', 0xE4 };
+
+static const struct among a_6[30] =
+{
+/*  0 */ { 1, s_6_0, -1, 8, 0},
+/*  1 */ { 3, s_6_1, 0, -1, 0},
+/*  2 */ { 2, s_6_2, 0, -1, 0},
+/*  3 */ { 3, s_6_3, 0, -1, 0},
+/*  4 */ { 2, s_6_4, 0, -1, 0},
+/*  5 */ { 3, s_6_5, 4, -1, 0},
+/*  6 */ { 3, s_6_6, 4, -1, 0},
+/*  7 */ { 3, s_6_7, 4, 9, 0},
+/*  8 */ { 3, s_6_8, -1, -1, 0},
+/*  9 */ { 3, s_6_9, -1, -1, 0},
+/* 10 */ { 3, s_6_10, -1, -1, 0},
+/* 11 */ { 1, s_6_11, -1, 7, 0},
+/* 12 */ { 3, s_6_12, 11, 1, 0},
+/* 13 */ { 3, s_6_13, 11, -1, r_VI},
+/* 14 */ { 4, s_6_14, 11, -1, r_LONG},
+/* 15 */ { 3, s_6_15, 11, 2, 0},
+/* 16 */ { 4, s_6_16, 11, -1, r_VI},
+/* 17 */ { 3, s_6_17, 11, 3, 0},
+/* 18 */ { 4, s_6_18, 11, -1, r_VI},
+/* 19 */ { 3, s_6_19, 11, 4, 0},
+/* 20 */ { 3, s_6_20, 11, 5, 0},
+/* 21 */ { 3, s_6_21, 11, 6, 0},
+/* 22 */ { 1, s_6_22, -1, 8, 0},
+/* 23 */ { 3, s_6_23, 22, -1, 0},
+/* 24 */ { 2, s_6_24, 22, -1, 0},
+/* 25 */ { 3, s_6_25, 22, -1, 0},
+/* 26 */ { 2, s_6_26, 22, -1, 0},
+/* 27 */ { 3, s_6_27, 26, -1, 0},
+/* 28 */ { 3, s_6_28, 26, -1, 0},
+/* 29 */ { 3, s_6_29, 26, 9, 0}
+};
+
+static const symbol s_7_0[3] = { 'e', 'j', 'a' };
+static const symbol s_7_1[3] = { 'm', 'm', 'a' };
+static const symbol s_7_2[4] = { 'i', 'm', 'm', 'a' };
+static const symbol s_7_3[3] = { 'm', 'p', 'a' };
+static const symbol s_7_4[4] = { 'i', 'm', 'p', 'a' };
+static const symbol s_7_5[3] = { 'm', 'm', 'i' };
+static const symbol s_7_6[4] = { 'i', 'm', 'm', 'i' };
+static const symbol s_7_7[3] = { 'm', 'p', 'i' };
+static const symbol s_7_8[4] = { 'i', 'm', 'p', 'i' };
+static const symbol s_7_9[3] = { 'e', 'j', 0xE4 };
+static const symbol s_7_10[3] = { 'm', 'm', 0xE4 };
+static const symbol s_7_11[4] = { 'i', 'm', 'm', 0xE4 };
+static const symbol s_7_12[3] = { 'm', 'p', 0xE4 };
+static const symbol s_7_13[4] = { 'i', 'm', 'p', 0xE4 };
+
+static const struct among a_7[14] =
+{
+/*  0 */ { 3, s_7_0, -1, -1, 0},
+/*  1 */ { 3, s_7_1, -1, 1, 0},
+/*  2 */ { 4, s_7_2, 1, -1, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 4, s_7_4, 3, -1, 0},
+/*  5 */ { 3, s_7_5, -1, 1, 0},
+/*  6 */ { 4, s_7_6, 5, -1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 4, s_7_8, 7, -1, 0},
+/*  9 */ { 3, s_7_9, -1, -1, 0},
+/* 10 */ { 3, s_7_10, -1, 1, 0},
+/* 11 */ { 4, s_7_11, 10, -1, 0},
+/* 12 */ { 3, s_7_12, -1, 1, 0},
+/* 13 */ { 4, s_7_13, 12, -1, 0}
+};
+
+static const symbol s_8_0[1] = { 'i' };
+static const symbol s_8_1[1] = { 'j' };
+
+static const struct among a_8[2] =
+{
+/*  0 */ { 1, s_8_0, -1, -1, 0},
+/*  1 */ { 1, s_8_1, -1, -1, 0}
+};
+
+static const symbol s_9_0[3] = { 'm', 'm', 'a' };
+static const symbol s_9_1[4] = { 'i', 'm', 'm', 'a' };
+
+static const struct among a_9[2] =
+{
+/*  0 */ { 3, s_9_0, -1, 1, 0},
+/*  1 */ { 4, s_9_1, 0, -1, 0}
+};
+
+static const unsigned char g_AEI[] = { 17, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8 };
+
+static const unsigned char g_V1[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32 };
+
+static const unsigned char g_V2[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32 };
+
+static const unsigned char g_particle_end[] = { 17, 97, 24, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32 };
+
+static const symbol s_0[] = { 'k' };
+static const symbol s_1[] = { 'k', 's', 'e' };
+static const symbol s_2[] = { 'k', 's', 'i' };
+static const symbol s_3[] = { 'i' };
+static const symbol s_4[] = { 'a' };
+static const symbol s_5[] = { 'e' };
+static const symbol s_6[] = { 'i' };
+static const symbol s_7[] = { 'o' };
+static const symbol s_8[] = { 0xE4 };
+static const symbol s_9[] = { 0xF6 };
+static const symbol s_10[] = { 'i', 'e' };
+static const symbol s_11[] = { 'e' };
+static const symbol s_12[] = { 'p', 'o' };
+static const symbol s_13[] = { 't' };
+static const symbol s_14[] = { 'p', 'o' };
+static const symbol s_15[] = { 'j' };
+static const symbol s_16[] = { 'o' };
+static const symbol s_17[] = { 'u' };
+static const symbol s_18[] = { 'o' };
+static const symbol s_19[] = { 'j' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    if (out_grouping(z, g_V1, 97, 246, 1) < 0) return 0; /* goto */ /* grouping V1, line 46 */
+    {    /* gopast */ /* non V1, line 46 */
+        int ret = in_grouping(z, g_V1, 97, 246, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 46 */
+    if (out_grouping(z, g_V1, 97, 246, 1) < 0) return 0; /* goto */ /* grouping V1, line 47 */
+    {    /* gopast */ /* non V1, line 47 */
+        int ret = in_grouping(z, g_V1, 97, 246, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[1] = z->c; /* setmark p2, line 47 */
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_particle_etc(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 55 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 55 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 55 */
+        among_var = find_among_b(z, a_0, 10); /* substring, line 55 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 55 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            if (in_grouping_b(z, g_particle_end, 97, 246, 0)) return 0;
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 64 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 66 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_possessive(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 69 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 69 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 69 */
+        among_var = find_among_b(z, a_4, 9); /* substring, line 69 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 69 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m2 = z->l - z->c; (void)m2; /* not, line 72 */
+                if (!(eq_s_b(z, 1, s_0))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m2;
+            }
+            {   int ret = slice_del(z); /* delete, line 72 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 74 */
+                if (ret < 0) return ret;
+            }
+            z->ket = z->c; /* [, line 74 */
+            if (!(eq_s_b(z, 3, s_1))) return 0;
+            z->bra = z->c; /* ], line 74 */
+            {   int ret = slice_from_s(z, 3, s_2); /* <-, line 74 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 78 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] != 97) return 0;
+            if (!(find_among_b(z, a_1, 6))) return 0; /* among, line 81 */
+            {   int ret = slice_del(z); /* delete, line 81 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] != 228) return 0;
+            if (!(find_among_b(z, a_2, 6))) return 0; /* among, line 83 */
+            {   int ret = slice_del(z); /* delete, line 84 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            if (z->c - 2 <= z->lb || z->p[z->c - 1] != 101) return 0;
+            if (!(find_among_b(z, a_3, 2))) return 0; /* among, line 86 */
+            {   int ret = slice_del(z); /* delete, line 86 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_LONG(struct SN_env * z) {
+    if (!(find_among_b(z, a_5, 7))) return 0; /* among, line 91 */
+    return 1;
+}
+
+static int r_VI(struct SN_env * z) {
+    if (!(eq_s_b(z, 1, s_3))) return 0;
+    if (in_grouping_b(z, g_V2, 97, 246, 0)) return 0;
+    return 1;
+}
+
+static int r_case_ending(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 96 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 96 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 96 */
+        among_var = find_among_b(z, a_6, 30); /* substring, line 96 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 96 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            if (!(eq_s_b(z, 1, s_4))) return 0;
+            break;
+        case 2:
+            if (!(eq_s_b(z, 1, s_5))) return 0;
+            break;
+        case 3:
+            if (!(eq_s_b(z, 1, s_6))) return 0;
+            break;
+        case 4:
+            if (!(eq_s_b(z, 1, s_7))) return 0;
+            break;
+        case 5:
+            if (!(eq_s_b(z, 1, s_8))) return 0;
+            break;
+        case 6:
+            if (!(eq_s_b(z, 1, s_9))) return 0;
+            break;
+        case 7:
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 111 */
+                {   int m2 = z->l - z->c; (void)m2; /* and, line 113 */
+                    {   int m3 = z->l - z->c; (void)m3; /* or, line 112 */
+                        {   int ret = r_LONG(z);
+                            if (ret == 0) goto lab2; /* call LONG, line 111 */
+                            if (ret < 0) return ret;
+                        }
+                        goto lab1;
+                    lab2:
+                        z->c = z->l - m3;
+                        if (!(eq_s_b(z, 2, s_10))) { z->c = z->l - m_keep; goto lab0; }
+                    }
+                lab1:
+                    z->c = z->l - m2;
+                    if (z->c <= z->lb) { z->c = z->l - m_keep; goto lab0; }
+                    z->c--; /* next, line 113 */
+                }
+                z->bra = z->c; /* ], line 113 */
+            lab0:
+                ;
+            }
+            break;
+        case 8:
+            if (in_grouping_b(z, g_V1, 97, 246, 0)) return 0;
+            if (out_grouping_b(z, g_V1, 97, 246, 0)) return 0;
+            break;
+        case 9:
+            if (!(eq_s_b(z, 1, s_11))) return 0;
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 138 */
+        if (ret < 0) return ret;
+    }
+    z->B[0] = 1; /* set ending_removed, line 139 */
+    return 1;
+}
+
+static int r_other_endings(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 142 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[1]) return 0;
+        z->c = z->I[1]; /* tomark, line 142 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 142 */
+        among_var = find_among_b(z, a_7, 14); /* substring, line 142 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 142 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m2 = z->l - z->c; (void)m2; /* not, line 146 */
+                if (!(eq_s_b(z, 2, s_12))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m2;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 151 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_i_plural(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 154 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 154 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 154 */
+        if (z->c <= z->lb || (z->p[z->c - 1] != 105 && z->p[z->c - 1] != 106)) { z->lb = mlimit; return 0; }
+        if (!(find_among_b(z, a_8, 2))) { z->lb = mlimit; return 0; } /* substring, line 154 */
+        z->bra = z->c; /* ], line 154 */
+        z->lb = mlimit;
+    }
+    {   int ret = slice_del(z); /* delete, line 158 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_t_plural(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 161 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 161 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 162 */
+        if (!(eq_s_b(z, 1, s_13))) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 162 */
+        {   int m_test = z->l - z->c; /* test, line 162 */
+            if (in_grouping_b(z, g_V1, 97, 246, 0)) { z->lb = mlimit; return 0; }
+            z->c = z->l - m_test;
+        }
+        {   int ret = slice_del(z); /* delete, line 163 */
+            if (ret < 0) return ret;
+        }
+        z->lb = mlimit;
+    }
+    {   int mlimit; /* setlimit, line 165 */
+        int m2 = z->l - z->c; (void)m2;
+        if (z->c < z->I[1]) return 0;
+        z->c = z->I[1]; /* tomark, line 165 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m2;
+        z->ket = z->c; /* [, line 165 */
+        if (z->c - 2 <= z->lb || z->p[z->c - 1] != 97) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_9, 2); /* substring, line 165 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 165 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m3 = z->l - z->c; (void)m3; /* not, line 167 */
+                if (!(eq_s_b(z, 2, s_14))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m3;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 170 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_tidy(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 173 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 173 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* do, line 174 */
+            {   int m3 = z->l - z->c; (void)m3; /* and, line 174 */
+                {   int ret = r_LONG(z);
+                    if (ret == 0) goto lab0; /* call LONG, line 174 */
+                    if (ret < 0) return ret;
+                }
+                z->c = z->l - m3;
+                z->ket = z->c; /* [, line 174 */
+                if (z->c <= z->lb) goto lab0;
+                z->c--; /* next, line 174 */
+                z->bra = z->c; /* ], line 174 */
+                {   int ret = slice_del(z); /* delete, line 174 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab0:
+            z->c = z->l - m2;
+        }
+        {   int m4 = z->l - z->c; (void)m4; /* do, line 175 */
+            z->ket = z->c; /* [, line 175 */
+            if (in_grouping_b(z, g_AEI, 97, 228, 0)) goto lab1;
+            z->bra = z->c; /* ], line 175 */
+            if (out_grouping_b(z, g_V1, 97, 246, 0)) goto lab1;
+            {   int ret = slice_del(z); /* delete, line 175 */
+                if (ret < 0) return ret;
+            }
+        lab1:
+            z->c = z->l - m4;
+        }
+        {   int m5 = z->l - z->c; (void)m5; /* do, line 176 */
+            z->ket = z->c; /* [, line 176 */
+            if (!(eq_s_b(z, 1, s_15))) goto lab2;
+            z->bra = z->c; /* ], line 176 */
+            {   int m6 = z->l - z->c; (void)m6; /* or, line 176 */
+                if (!(eq_s_b(z, 1, s_16))) goto lab4;
+                goto lab3;
+            lab4:
+                z->c = z->l - m6;
+                if (!(eq_s_b(z, 1, s_17))) goto lab2;
+            }
+        lab3:
+            {   int ret = slice_del(z); /* delete, line 176 */
+                if (ret < 0) return ret;
+            }
+        lab2:
+            z->c = z->l - m5;
+        }
+        {   int m7 = z->l - z->c; (void)m7; /* do, line 177 */
+            z->ket = z->c; /* [, line 177 */
+            if (!(eq_s_b(z, 1, s_18))) goto lab5;
+            z->bra = z->c; /* ], line 177 */
+            if (!(eq_s_b(z, 1, s_19))) goto lab5;
+            {   int ret = slice_del(z); /* delete, line 177 */
+                if (ret < 0) return ret;
+            }
+        lab5:
+            z->c = z->l - m7;
+        }
+        z->lb = mlimit;
+    }
+    if (in_grouping_b(z, g_V1, 97, 246, 1) < 0) return 0; /* goto */ /* non V1, line 179 */
+    z->ket = z->c; /* [, line 179 */
+    if (z->c <= z->lb) return 0;
+    z->c--; /* next, line 179 */
+    z->bra = z->c; /* ], line 179 */
+    z->S[0] = slice_to(z, z->S[0]); /* -> x, line 179 */
+    if (z->S[0] == 0) return -1; /* -> x, line 179 */
+    if (!(eq_v_b(z, z->S[0]))) return 0; /* name x, line 179 */
+    {   int ret = slice_del(z); /* delete, line 179 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int finnish_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 185 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 185 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->B[0] = 0; /* unset ending_removed, line 186 */
+    z->lb = z->c; z->c = z->l; /* backwards, line 187 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 188 */
+        {   int ret = r_particle_etc(z);
+            if (ret == 0) goto lab1; /* call particle_etc, line 188 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 189 */
+        {   int ret = r_possessive(z);
+            if (ret == 0) goto lab2; /* call possessive, line 189 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 190 */
+        {   int ret = r_case_ending(z);
+            if (ret == 0) goto lab3; /* call case_ending, line 190 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 191 */
+        {   int ret = r_other_endings(z);
+            if (ret == 0) goto lab4; /* call other_endings, line 191 */
+            if (ret < 0) return ret;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m6 = z->l - z->c; (void)m6; /* or, line 192 */
+        if (!(z->B[0])) goto lab6; /* Boolean test ending_removed, line 192 */
+        {   int m7 = z->l - z->c; (void)m7; /* do, line 192 */
+            {   int ret = r_i_plural(z);
+                if (ret == 0) goto lab7; /* call i_plural, line 192 */
+                if (ret < 0) return ret;
+            }
+        lab7:
+            z->c = z->l - m7;
+        }
+        goto lab5;
+    lab6:
+        z->c = z->l - m6;
+        {   int m8 = z->l - z->c; (void)m8; /* do, line 192 */
+            {   int ret = r_t_plural(z);
+                if (ret == 0) goto lab8; /* call t_plural, line 192 */
+                if (ret < 0) return ret;
+            }
+        lab8:
+            z->c = z->l - m8;
+        }
+    }
+lab5:
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 193 */
+        {   int ret = r_tidy(z);
+            if (ret == 0) goto lab9; /* call tidy, line 193 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m9;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * finnish_ISO_8859_1_create_env(void) { return SN_create_env(1, 2, 1); }
+
+extern void finnish_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 1); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_french.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_french.c
new file mode 100644
index 000000000000..fc79c0a24dc1
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_french.c
@@ -0,0 +1,1246 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int french_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_un_accent(struct SN_env * z);
+static int r_un_double(struct SN_env * z);
+static int r_residual_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_i_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * french_ISO_8859_1_create_env(void);
+extern void french_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[3] = { 'c', 'o', 'l' };
+static const symbol s_0_1[3] = { 'p', 'a', 'r' };
+static const symbol s_0_2[3] = { 't', 'a', 'p' };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 3, s_0_0, -1, -1, 0},
+/*  1 */ { 3, s_0_1, -1, -1, 0},
+/*  2 */ { 3, s_0_2, -1, -1, 0}
+};
+
+static const symbol s_1_1[1] = { 'I' };
+static const symbol s_1_2[1] = { 'U' };
+static const symbol s_1_3[1] = { 'Y' };
+
+static const struct among a_1[4] =
+{
+/*  0 */ { 0, 0, -1, 4, 0},
+/*  1 */ { 1, s_1_1, 0, 1, 0},
+/*  2 */ { 1, s_1_2, 0, 2, 0},
+/*  3 */ { 1, s_1_3, 0, 3, 0}
+};
+
+static const symbol s_2_0[3] = { 'i', 'q', 'U' };
+static const symbol s_2_1[3] = { 'a', 'b', 'l' };
+static const symbol s_2_2[3] = { 'I', 0xE8, 'r' };
+static const symbol s_2_3[3] = { 'i', 0xE8, 'r' };
+static const symbol s_2_4[3] = { 'e', 'u', 's' };
+static const symbol s_2_5[2] = { 'i', 'v' };
+
+static const struct among a_2[6] =
+{
+/*  0 */ { 3, s_2_0, -1, 3, 0},
+/*  1 */ { 3, s_2_1, -1, 3, 0},
+/*  2 */ { 3, s_2_2, -1, 4, 0},
+/*  3 */ { 3, s_2_3, -1, 4, 0},
+/*  4 */ { 3, s_2_4, -1, 2, 0},
+/*  5 */ { 2, s_2_5, -1, 1, 0}
+};
+
+static const symbol s_3_0[2] = { 'i', 'c' };
+static const symbol s_3_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_3_2[2] = { 'i', 'v' };
+
+static const struct among a_3[3] =
+{
+/*  0 */ { 2, s_3_0, -1, 2, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0},
+/*  2 */ { 2, s_3_2, -1, 3, 0}
+};
+
+static const symbol s_4_0[4] = { 'i', 'q', 'U', 'e' };
+static const symbol s_4_1[6] = { 'a', 't', 'r', 'i', 'c', 'e' };
+static const symbol s_4_2[4] = { 'a', 'n', 'c', 'e' };
+static const symbol s_4_3[4] = { 'e', 'n', 'c', 'e' };
+static const symbol s_4_4[5] = { 'l', 'o', 'g', 'i', 'e' };
+static const symbol s_4_5[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_4_6[4] = { 'i', 's', 'm', 'e' };
+static const symbol s_4_7[4] = { 'e', 'u', 's', 'e' };
+static const symbol s_4_8[4] = { 'i', 's', 't', 'e' };
+static const symbol s_4_9[3] = { 'i', 'v', 'e' };
+static const symbol s_4_10[2] = { 'i', 'f' };
+static const symbol s_4_11[5] = { 'u', 's', 'i', 'o', 'n' };
+static const symbol s_4_12[5] = { 'a', 't', 'i', 'o', 'n' };
+static const symbol s_4_13[5] = { 'u', 't', 'i', 'o', 'n' };
+static const symbol s_4_14[5] = { 'a', 't', 'e', 'u', 'r' };
+static const symbol s_4_15[5] = { 'i', 'q', 'U', 'e', 's' };
+static const symbol s_4_16[7] = { 'a', 't', 'r', 'i', 'c', 'e', 's' };
+static const symbol s_4_17[5] = { 'a', 'n', 'c', 'e', 's' };
+static const symbol s_4_18[5] = { 'e', 'n', 'c', 'e', 's' };
+static const symbol s_4_19[6] = { 'l', 'o', 'g', 'i', 'e', 's' };
+static const symbol s_4_20[5] = { 'a', 'b', 'l', 'e', 's' };
+static const symbol s_4_21[5] = { 'i', 's', 'm', 'e', 's' };
+static const symbol s_4_22[5] = { 'e', 'u', 's', 'e', 's' };
+static const symbol s_4_23[5] = { 'i', 's', 't', 'e', 's' };
+static const symbol s_4_24[4] = { 'i', 'v', 'e', 's' };
+static const symbol s_4_25[3] = { 'i', 'f', 's' };
+static const symbol s_4_26[6] = { 'u', 's', 'i', 'o', 'n', 's' };
+static const symbol s_4_27[6] = { 'a', 't', 'i', 'o', 'n', 's' };
+static const symbol s_4_28[6] = { 'u', 't', 'i', 'o', 'n', 's' };
+static const symbol s_4_29[6] = { 'a', 't', 'e', 'u', 'r', 's' };
+static const symbol s_4_30[5] = { 'm', 'e', 'n', 't', 's' };
+static const symbol s_4_31[6] = { 'e', 'm', 'e', 'n', 't', 's' };
+static const symbol s_4_32[9] = { 'i', 's', 's', 'e', 'm', 'e', 'n', 't', 's' };
+static const symbol s_4_33[4] = { 'i', 't', 0xE9, 's' };
+static const symbol s_4_34[4] = { 'm', 'e', 'n', 't' };
+static const symbol s_4_35[5] = { 'e', 'm', 'e', 'n', 't' };
+static const symbol s_4_36[8] = { 'i', 's', 's', 'e', 'm', 'e', 'n', 't' };
+static const symbol s_4_37[6] = { 'a', 'm', 'm', 'e', 'n', 't' };
+static const symbol s_4_38[6] = { 'e', 'm', 'm', 'e', 'n', 't' };
+static const symbol s_4_39[3] = { 'a', 'u', 'x' };
+static const symbol s_4_40[4] = { 'e', 'a', 'u', 'x' };
+static const symbol s_4_41[3] = { 'e', 'u', 'x' };
+static const symbol s_4_42[3] = { 'i', 't', 0xE9 };
+
+static const struct among a_4[43] =
+{
+/*  0 */ { 4, s_4_0, -1, 1, 0},
+/*  1 */ { 6, s_4_1, -1, 2, 0},
+/*  2 */ { 4, s_4_2, -1, 1, 0},
+/*  3 */ { 4, s_4_3, -1, 5, 0},
+/*  4 */ { 5, s_4_4, -1, 3, 0},
+/*  5 */ { 4, s_4_5, -1, 1, 0},
+/*  6 */ { 4, s_4_6, -1, 1, 0},
+/*  7 */ { 4, s_4_7, -1, 11, 0},
+/*  8 */ { 4, s_4_8, -1, 1, 0},
+/*  9 */ { 3, s_4_9, -1, 8, 0},
+/* 10 */ { 2, s_4_10, -1, 8, 0},
+/* 11 */ { 5, s_4_11, -1, 4, 0},
+/* 12 */ { 5, s_4_12, -1, 2, 0},
+/* 13 */ { 5, s_4_13, -1, 4, 0},
+/* 14 */ { 5, s_4_14, -1, 2, 0},
+/* 15 */ { 5, s_4_15, -1, 1, 0},
+/* 16 */ { 7, s_4_16, -1, 2, 0},
+/* 17 */ { 5, s_4_17, -1, 1, 0},
+/* 18 */ { 5, s_4_18, -1, 5, 0},
+/* 19 */ { 6, s_4_19, -1, 3, 0},
+/* 20 */ { 5, s_4_20, -1, 1, 0},
+/* 21 */ { 5, s_4_21, -1, 1, 0},
+/* 22 */ { 5, s_4_22, -1, 11, 0},
+/* 23 */ { 5, s_4_23, -1, 1, 0},
+/* 24 */ { 4, s_4_24, -1, 8, 0},
+/* 25 */ { 3, s_4_25, -1, 8, 0},
+/* 26 */ { 6, s_4_26, -1, 4, 0},
+/* 27 */ { 6, s_4_27, -1, 2, 0},
+/* 28 */ { 6, s_4_28, -1, 4, 0},
+/* 29 */ { 6, s_4_29, -1, 2, 0},
+/* 30 */ { 5, s_4_30, -1, 15, 0},
+/* 31 */ { 6, s_4_31, 30, 6, 0},
+/* 32 */ { 9, s_4_32, 31, 12, 0},
+/* 33 */ { 4, s_4_33, -1, 7, 0},
+/* 34 */ { 4, s_4_34, -1, 15, 0},
+/* 35 */ { 5, s_4_35, 34, 6, 0},
+/* 36 */ { 8, s_4_36, 35, 12, 0},
+/* 37 */ { 6, s_4_37, 34, 13, 0},
+/* 38 */ { 6, s_4_38, 34, 14, 0},
+/* 39 */ { 3, s_4_39, -1, 10, 0},
+/* 40 */ { 4, s_4_40, 39, 9, 0},
+/* 41 */ { 3, s_4_41, -1, 1, 0},
+/* 42 */ { 3, s_4_42, -1, 7, 0}
+};
+
+static const symbol s_5_0[3] = { 'i', 'r', 'a' };
+static const symbol s_5_1[2] = { 'i', 'e' };
+static const symbol s_5_2[4] = { 'i', 's', 's', 'e' };
+static const symbol s_5_3[7] = { 'i', 's', 's', 'a', 'n', 't', 'e' };
+static const symbol s_5_4[1] = { 'i' };
+static const symbol s_5_5[4] = { 'i', 'r', 'a', 'i' };
+static const symbol s_5_6[2] = { 'i', 'r' };
+static const symbol s_5_7[4] = { 'i', 'r', 'a', 's' };
+static const symbol s_5_8[3] = { 'i', 'e', 's' };
+static const symbol s_5_9[4] = { 0xEE, 'm', 'e', 's' };
+static const symbol s_5_10[5] = { 'i', 's', 's', 'e', 's' };
+static const symbol s_5_11[8] = { 'i', 's', 's', 'a', 'n', 't', 'e', 's' };
+static const symbol s_5_12[4] = { 0xEE, 't', 'e', 's' };
+static const symbol s_5_13[2] = { 'i', 's' };
+static const symbol s_5_14[5] = { 'i', 'r', 'a', 'i', 's' };
+static const symbol s_5_15[6] = { 'i', 's', 's', 'a', 'i', 's' };
+static const symbol s_5_16[6] = { 'i', 'r', 'i', 'o', 'n', 's' };
+static const symbol s_5_17[7] = { 'i', 's', 's', 'i', 'o', 'n', 's' };
+static const symbol s_5_18[5] = { 'i', 'r', 'o', 'n', 's' };
+static const symbol s_5_19[6] = { 'i', 's', 's', 'o', 'n', 's' };
+static const symbol s_5_20[7] = { 'i', 's', 's', 'a', 'n', 't', 's' };
+static const symbol s_5_21[2] = { 'i', 't' };
+static const symbol s_5_22[5] = { 'i', 'r', 'a', 'i', 't' };
+static const symbol s_5_23[6] = { 'i', 's', 's', 'a', 'i', 't' };
+static const symbol s_5_24[6] = { 'i', 's', 's', 'a', 'n', 't' };
+static const symbol s_5_25[7] = { 'i', 'r', 'a', 'I', 'e', 'n', 't' };
+static const symbol s_5_26[8] = { 'i', 's', 's', 'a', 'I', 'e', 'n', 't' };
+static const symbol s_5_27[5] = { 'i', 'r', 'e', 'n', 't' };
+static const symbol s_5_28[6] = { 'i', 's', 's', 'e', 'n', 't' };
+static const symbol s_5_29[5] = { 'i', 'r', 'o', 'n', 't' };
+static const symbol s_5_30[2] = { 0xEE, 't' };
+static const symbol s_5_31[5] = { 'i', 'r', 'i', 'e', 'z' };
+static const symbol s_5_32[6] = { 'i', 's', 's', 'i', 'e', 'z' };
+static const symbol s_5_33[4] = { 'i', 'r', 'e', 'z' };
+static const symbol s_5_34[5] = { 'i', 's', 's', 'e', 'z' };
+
+static const struct among a_5[35] =
+{
+/*  0 */ { 3, s_5_0, -1, 1, 0},
+/*  1 */ { 2, s_5_1, -1, 1, 0},
+/*  2 */ { 4, s_5_2, -1, 1, 0},
+/*  3 */ { 7, s_5_3, -1, 1, 0},
+/*  4 */ { 1, s_5_4, -1, 1, 0},
+/*  5 */ { 4, s_5_5, 4, 1, 0},
+/*  6 */ { 2, s_5_6, -1, 1, 0},
+/*  7 */ { 4, s_5_7, -1, 1, 0},
+/*  8 */ { 3, s_5_8, -1, 1, 0},
+/*  9 */ { 4, s_5_9, -1, 1, 0},
+/* 10 */ { 5, s_5_10, -1, 1, 0},
+/* 11 */ { 8, s_5_11, -1, 1, 0},
+/* 12 */ { 4, s_5_12, -1, 1, 0},
+/* 13 */ { 2, s_5_13, -1, 1, 0},
+/* 14 */ { 5, s_5_14, 13, 1, 0},
+/* 15 */ { 6, s_5_15, 13, 1, 0},
+/* 16 */ { 6, s_5_16, -1, 1, 0},
+/* 17 */ { 7, s_5_17, -1, 1, 0},
+/* 18 */ { 5, s_5_18, -1, 1, 0},
+/* 19 */ { 6, s_5_19, -1, 1, 0},
+/* 20 */ { 7, s_5_20, -1, 1, 0},
+/* 21 */ { 2, s_5_21, -1, 1, 0},
+/* 22 */ { 5, s_5_22, 21, 1, 0},
+/* 23 */ { 6, s_5_23, 21, 1, 0},
+/* 24 */ { 6, s_5_24, -1, 1, 0},
+/* 25 */ { 7, s_5_25, -1, 1, 0},
+/* 26 */ { 8, s_5_26, -1, 1, 0},
+/* 27 */ { 5, s_5_27, -1, 1, 0},
+/* 28 */ { 6, s_5_28, -1, 1, 0},
+/* 29 */ { 5, s_5_29, -1, 1, 0},
+/* 30 */ { 2, s_5_30, -1, 1, 0},
+/* 31 */ { 5, s_5_31, -1, 1, 0},
+/* 32 */ { 6, s_5_32, -1, 1, 0},
+/* 33 */ { 4, s_5_33, -1, 1, 0},
+/* 34 */ { 5, s_5_34, -1, 1, 0}
+};
+
+static const symbol s_6_0[1] = { 'a' };
+static const symbol s_6_1[3] = { 'e', 'r', 'a' };
+static const symbol s_6_2[4] = { 'a', 's', 's', 'e' };
+static const symbol s_6_3[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_6_4[2] = { 0xE9, 'e' };
+static const symbol s_6_5[2] = { 'a', 'i' };
+static const symbol s_6_6[4] = { 'e', 'r', 'a', 'i' };
+static const symbol s_6_7[2] = { 'e', 'r' };
+static const symbol s_6_8[2] = { 'a', 's' };
+static const symbol s_6_9[4] = { 'e', 'r', 'a', 's' };
+static const symbol s_6_10[4] = { 0xE2, 'm', 'e', 's' };
+static const symbol s_6_11[5] = { 'a', 's', 's', 'e', 's' };
+static const symbol s_6_12[5] = { 'a', 'n', 't', 'e', 's' };
+static const symbol s_6_13[4] = { 0xE2, 't', 'e', 's' };
+static const symbol s_6_14[3] = { 0xE9, 'e', 's' };
+static const symbol s_6_15[3] = { 'a', 'i', 's' };
+static const symbol s_6_16[5] = { 'e', 'r', 'a', 'i', 's' };
+static const symbol s_6_17[4] = { 'i', 'o', 'n', 's' };
+static const symbol s_6_18[6] = { 'e', 'r', 'i', 'o', 'n', 's' };
+static const symbol s_6_19[7] = { 'a', 's', 's', 'i', 'o', 'n', 's' };
+static const symbol s_6_20[5] = { 'e', 'r', 'o', 'n', 's' };
+static const symbol s_6_21[4] = { 'a', 'n', 't', 's' };
+static const symbol s_6_22[2] = { 0xE9, 's' };
+static const symbol s_6_23[3] = { 'a', 'i', 't' };
+static const symbol s_6_24[5] = { 'e', 'r', 'a', 'i', 't' };
+static const symbol s_6_25[3] = { 'a', 'n', 't' };
+static const symbol s_6_26[5] = { 'a', 'I', 'e', 'n', 't' };
+static const symbol s_6_27[7] = { 'e', 'r', 'a', 'I', 'e', 'n', 't' };
+static const symbol s_6_28[5] = { 0xE8, 'r', 'e', 'n', 't' };
+static const symbol s_6_29[6] = { 'a', 's', 's', 'e', 'n', 't' };
+static const symbol s_6_30[5] = { 'e', 'r', 'o', 'n', 't' };
+static const symbol s_6_31[2] = { 0xE2, 't' };
+static const symbol s_6_32[2] = { 'e', 'z' };
+static const symbol s_6_33[3] = { 'i', 'e', 'z' };
+static const symbol s_6_34[5] = { 'e', 'r', 'i', 'e', 'z' };
+static const symbol s_6_35[6] = { 'a', 's', 's', 'i', 'e', 'z' };
+static const symbol s_6_36[4] = { 'e', 'r', 'e', 'z' };
+static const symbol s_6_37[1] = { 0xE9 };
+
+static const struct among a_6[38] =
+{
+/*  0 */ { 1, s_6_0, -1, 3, 0},
+/*  1 */ { 3, s_6_1, 0, 2, 0},
+/*  2 */ { 4, s_6_2, -1, 3, 0},
+/*  3 */ { 4, s_6_3, -1, 3, 0},
+/*  4 */ { 2, s_6_4, -1, 2, 0},
+/*  5 */ { 2, s_6_5, -1, 3, 0},
+/*  6 */ { 4, s_6_6, 5, 2, 0},
+/*  7 */ { 2, s_6_7, -1, 2, 0},
+/*  8 */ { 2, s_6_8, -1, 3, 0},
+/*  9 */ { 4, s_6_9, 8, 2, 0},
+/* 10 */ { 4, s_6_10, -1, 3, 0},
+/* 11 */ { 5, s_6_11, -1, 3, 0},
+/* 12 */ { 5, s_6_12, -1, 3, 0},
+/* 13 */ { 4, s_6_13, -1, 3, 0},
+/* 14 */ { 3, s_6_14, -1, 2, 0},
+/* 15 */ { 3, s_6_15, -1, 3, 0},
+/* 16 */ { 5, s_6_16, 15, 2, 0},
+/* 17 */ { 4, s_6_17, -1, 1, 0},
+/* 18 */ { 6, s_6_18, 17, 2, 0},
+/* 19 */ { 7, s_6_19, 17, 3, 0},
+/* 20 */ { 5, s_6_20, -1, 2, 0},
+/* 21 */ { 4, s_6_21, -1, 3, 0},
+/* 22 */ { 2, s_6_22, -1, 2, 0},
+/* 23 */ { 3, s_6_23, -1, 3, 0},
+/* 24 */ { 5, s_6_24, 23, 2, 0},
+/* 25 */ { 3, s_6_25, -1, 3, 0},
+/* 26 */ { 5, s_6_26, -1, 3, 0},
+/* 27 */ { 7, s_6_27, 26, 2, 0},
+/* 28 */ { 5, s_6_28, -1, 2, 0},
+/* 29 */ { 6, s_6_29, -1, 3, 0},
+/* 30 */ { 5, s_6_30, -1, 2, 0},
+/* 31 */ { 2, s_6_31, -1, 3, 0},
+/* 32 */ { 2, s_6_32, -1, 2, 0},
+/* 33 */ { 3, s_6_33, 32, 2, 0},
+/* 34 */ { 5, s_6_34, 33, 2, 0},
+/* 35 */ { 6, s_6_35, 33, 3, 0},
+/* 36 */ { 4, s_6_36, 32, 2, 0},
+/* 37 */ { 1, s_6_37, -1, 2, 0}
+};
+
+static const symbol s_7_0[1] = { 'e' };
+static const symbol s_7_1[4] = { 'I', 0xE8, 'r', 'e' };
+static const symbol s_7_2[4] = { 'i', 0xE8, 'r', 'e' };
+static const symbol s_7_3[3] = { 'i', 'o', 'n' };
+static const symbol s_7_4[3] = { 'I', 'e', 'r' };
+static const symbol s_7_5[3] = { 'i', 'e', 'r' };
+static const symbol s_7_6[1] = { 0xEB };
+
+static const struct among a_7[7] =
+{
+/*  0 */ { 1, s_7_0, -1, 3, 0},
+/*  1 */ { 4, s_7_1, 0, 2, 0},
+/*  2 */ { 4, s_7_2, 0, 2, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 3, s_7_4, -1, 2, 0},
+/*  5 */ { 3, s_7_5, -1, 2, 0},
+/*  6 */ { 1, s_7_6, -1, 4, 0}
+};
+
+static const symbol s_8_0[3] = { 'e', 'l', 'l' };
+static const symbol s_8_1[4] = { 'e', 'i', 'l', 'l' };
+static const symbol s_8_2[3] = { 'e', 'n', 'n' };
+static const symbol s_8_3[3] = { 'o', 'n', 'n' };
+static const symbol s_8_4[3] = { 'e', 't', 't' };
+
+static const struct among a_8[5] =
+{
+/*  0 */ { 3, s_8_0, -1, -1, 0},
+/*  1 */ { 4, s_8_1, -1, -1, 0},
+/*  2 */ { 3, s_8_2, -1, -1, 0},
+/*  3 */ { 3, s_8_3, -1, -1, 0},
+/*  4 */ { 3, s_8_4, -1, -1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 130, 103, 8, 5 };
+
+static const unsigned char g_keep_with_s[] = { 1, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const symbol s_0[] = { 'u' };
+static const symbol s_1[] = { 'U' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'I' };
+static const symbol s_4[] = { 'y' };
+static const symbol s_5[] = { 'Y' };
+static const symbol s_6[] = { 'y' };
+static const symbol s_7[] = { 'Y' };
+static const symbol s_8[] = { 'q' };
+static const symbol s_9[] = { 'u' };
+static const symbol s_10[] = { 'U' };
+static const symbol s_11[] = { 'i' };
+static const symbol s_12[] = { 'u' };
+static const symbol s_13[] = { 'y' };
+static const symbol s_14[] = { 'i', 'c' };
+static const symbol s_15[] = { 'i', 'q', 'U' };
+static const symbol s_16[] = { 'l', 'o', 'g' };
+static const symbol s_17[] = { 'u' };
+static const symbol s_18[] = { 'e', 'n', 't' };
+static const symbol s_19[] = { 'a', 't' };
+static const symbol s_20[] = { 'e', 'u', 'x' };
+static const symbol s_21[] = { 'i' };
+static const symbol s_22[] = { 'a', 'b', 'l' };
+static const symbol s_23[] = { 'i', 'q', 'U' };
+static const symbol s_24[] = { 'a', 't' };
+static const symbol s_25[] = { 'i', 'c' };
+static const symbol s_26[] = { 'i', 'q', 'U' };
+static const symbol s_27[] = { 'e', 'a', 'u' };
+static const symbol s_28[] = { 'a', 'l' };
+static const symbol s_29[] = { 'e', 'u', 'x' };
+static const symbol s_30[] = { 'a', 'n', 't' };
+static const symbol s_31[] = { 'e', 'n', 't' };
+static const symbol s_32[] = { 'e' };
+static const symbol s_33[] = { 's' };
+static const symbol s_34[] = { 's' };
+static const symbol s_35[] = { 't' };
+static const symbol s_36[] = { 'i' };
+static const symbol s_37[] = { 'g', 'u' };
+static const symbol s_38[] = { 0xE9 };
+static const symbol s_39[] = { 0xE8 };
+static const symbol s_40[] = { 'e' };
+static const symbol s_41[] = { 'Y' };
+static const symbol s_42[] = { 'i' };
+static const symbol s_43[] = { 0xE7 };
+static const symbol s_44[] = { 'c' };
+
+static int r_prelude(struct SN_env * z) {
+    while(1) { /* repeat, line 38 */
+        int c1 = z->c;
+        while(1) { /* goto, line 38 */
+            int c2 = z->c;
+            {   int c3 = z->c; /* or, line 44 */
+                if (in_grouping(z, g_v, 97, 251, 0)) goto lab3;
+                z->bra = z->c; /* [, line 40 */
+                {   int c4 = z->c; /* or, line 40 */
+                    if (!(eq_s(z, 1, s_0))) goto lab5;
+                    z->ket = z->c; /* ], line 40 */
+                    if (in_grouping(z, g_v, 97, 251, 0)) goto lab5;
+                    {   int ret = slice_from_s(z, 1, s_1); /* <-, line 40 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab4;
+                lab5:
+                    z->c = c4;
+                    if (!(eq_s(z, 1, s_2))) goto lab6;
+                    z->ket = z->c; /* ], line 41 */
+                    if (in_grouping(z, g_v, 97, 251, 0)) goto lab6;
+                    {   int ret = slice_from_s(z, 1, s_3); /* <-, line 41 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab4;
+                lab6:
+                    z->c = c4;
+                    if (!(eq_s(z, 1, s_4))) goto lab3;
+                    z->ket = z->c; /* ], line 42 */
+                    {   int ret = slice_from_s(z, 1, s_5); /* <-, line 42 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab4:
+                goto lab2;
+            lab3:
+                z->c = c3;
+                z->bra = z->c; /* [, line 45 */
+                if (!(eq_s(z, 1, s_6))) goto lab7;
+                z->ket = z->c; /* ], line 45 */
+                if (in_grouping(z, g_v, 97, 251, 0)) goto lab7;
+                {   int ret = slice_from_s(z, 1, s_7); /* <-, line 45 */
+                    if (ret < 0) return ret;
+                }
+                goto lab2;
+            lab7:
+                z->c = c3;
+                if (!(eq_s(z, 1, s_8))) goto lab1;
+                z->bra = z->c; /* [, line 47 */
+                if (!(eq_s(z, 1, s_9))) goto lab1;
+                z->ket = z->c; /* ], line 47 */
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 47 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab2:
+            z->c = c2;
+            break;
+        lab1:
+            z->c = c2;
+            if (z->c >= z->l) goto lab0;
+            z->c++; /* goto, line 38 */
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 56 */
+        {   int c2 = z->c; /* or, line 58 */
+            if (in_grouping(z, g_v, 97, 251, 0)) goto lab2;
+            if (in_grouping(z, g_v, 97, 251, 0)) goto lab2;
+            if (z->c >= z->l) goto lab2;
+            z->c++; /* next, line 57 */
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (z->c + 2 >= z->l || z->p[z->c + 2] >> 5 != 3 || !((331776 >> (z->p[z->c + 2] & 0x1f)) & 1)) goto lab3;
+            if (!(find_among(z, a_0, 3))) goto lab3; /* among, line 59 */
+            goto lab1;
+        lab3:
+            z->c = c2;
+            if (z->c >= z->l) goto lab0;
+            z->c++; /* next, line 66 */
+            {    /* gopast */ /* grouping v, line 66 */
+                int ret = out_grouping(z, g_v, 97, 251, 1);
+                if (ret < 0) goto lab0;
+                z->c += ret;
+            }
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 67 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c3 = z->c; /* do, line 69 */
+        {    /* gopast */ /* grouping v, line 70 */
+            int ret = out_grouping(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 70 */
+            int ret = in_grouping(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 70 */
+        {    /* gopast */ /* grouping v, line 71 */
+            int ret = out_grouping(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 71 */
+            int ret = in_grouping(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 71 */
+    lab4:
+        z->c = c3;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 75 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 77 */
+        if (z->c >= z->l || z->p[z->c + 0] >> 5 != 2 || !((35652096 >> (z->p[z->c + 0] & 0x1f)) & 1)) among_var = 4; else
+        among_var = find_among(z, a_1, 4); /* substring, line 77 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 77 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 1, s_13); /* <-, line 80 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 81 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 92 */
+    among_var = find_among_b(z, a_4, 43); /* substring, line 92 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 92 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 96 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 96 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 99 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 99 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 100 */
+                z->ket = z->c; /* [, line 100 */
+                if (!(eq_s_b(z, 2, s_14))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 100 */
+                {   int m1 = z->l - z->c; (void)m1; /* or, line 100 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) goto lab2; /* call R2, line 100 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 100 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab1;
+                lab2:
+                    z->c = z->l - m1;
+                    {   int ret = slice_from_s(z, 3, s_15); /* <-, line 100 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab1:
+            lab0:
+                ;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 104 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_16); /* <-, line 104 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 107 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_17); /* <-, line 107 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 110 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_18); /* <-, line 110 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 114 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 114 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 115 */
+                z->ket = z->c; /* [, line 116 */
+                among_var = find_among_b(z, a_2, 6); /* substring, line 116 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 116 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab3; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        z->ket = z->c; /* [, line 117 */
+                        if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m_keep; goto lab3; }
+                        z->bra = z->c; /* ], line 117 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                    case 2:
+                        {   int m2 = z->l - z->c; (void)m2; /* or, line 118 */
+                            {   int ret = r_R2(z);
+                                if (ret == 0) goto lab5; /* call R2, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_del(z); /* delete, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                            goto lab4;
+                        lab5:
+                            z->c = z->l - m2;
+                            {   int ret = r_R1(z);
+                                if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R1, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_from_s(z, 3, s_20); /* <-, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                        }
+                    lab4:
+                        break;
+                    case 3:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 120 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 120 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                    case 4:
+                        {   int ret = r_RV(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call RV, line 122 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_from_s(z, 1, s_21); /* <-, line 122 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab3:
+                ;
+            }
+            break;
+        case 7:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 129 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 129 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 130 */
+                z->ket = z->c; /* [, line 131 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab6; }
+                among_var = find_among_b(z, a_3, 3); /* substring, line 131 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab6; }
+                z->bra = z->c; /* ], line 131 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab6; }
+                    case 1:
+                        {   int m3 = z->l - z->c; (void)m3; /* or, line 132 */
+                            {   int ret = r_R2(z);
+                                if (ret == 0) goto lab8; /* call R2, line 132 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_del(z); /* delete, line 132 */
+                                if (ret < 0) return ret;
+                            }
+                            goto lab7;
+                        lab8:
+                            z->c = z->l - m3;
+                            {   int ret = slice_from_s(z, 3, s_22); /* <-, line 132 */
+                                if (ret < 0) return ret;
+                            }
+                        }
+                    lab7:
+                        break;
+                    case 2:
+                        {   int m4 = z->l - z->c; (void)m4; /* or, line 133 */
+                            {   int ret = r_R2(z);
+                                if (ret == 0) goto lab10; /* call R2, line 133 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_del(z); /* delete, line 133 */
+                                if (ret < 0) return ret;
+                            }
+                            goto lab9;
+                        lab10:
+                            z->c = z->l - m4;
+                            {   int ret = slice_from_s(z, 3, s_23); /* <-, line 133 */
+                                if (ret < 0) return ret;
+                            }
+                        }
+                    lab9:
+                        break;
+                    case 3:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab6; } /* call R2, line 134 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 134 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab6:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 141 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 141 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 142 */
+                z->ket = z->c; /* [, line 142 */
+                if (!(eq_s_b(z, 2, s_24))) { z->c = z->l - m_keep; goto lab11; }
+                z->bra = z->c; /* ], line 142 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab11; } /* call R2, line 142 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 142 */
+                    if (ret < 0) return ret;
+                }
+                z->ket = z->c; /* [, line 142 */
+                if (!(eq_s_b(z, 2, s_25))) { z->c = z->l - m_keep; goto lab11; }
+                z->bra = z->c; /* ], line 142 */
+                {   int m5 = z->l - z->c; (void)m5; /* or, line 142 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) goto lab13; /* call R2, line 142 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 142 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab12;
+                lab13:
+                    z->c = z->l - m5;
+                    {   int ret = slice_from_s(z, 3, s_26); /* <-, line 142 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab12:
+            lab11:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 3, s_27); /* <-, line 144 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 145 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 2, s_28); /* <-, line 145 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int m6 = z->l - z->c; (void)m6; /* or, line 147 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab15; /* call R2, line 147 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 147 */
+                    if (ret < 0) return ret;
+                }
+                goto lab14;
+            lab15:
+                z->c = z->l - m6;
+                {   int ret = r_R1(z);
+                    if (ret == 0) return 0; /* call R1, line 147 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_from_s(z, 3, s_29); /* <-, line 147 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab14:
+            break;
+        case 12:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 150 */
+                if (ret < 0) return ret;
+            }
+            if (out_grouping_b(z, g_v, 97, 251, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 150 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 155 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_30); /* <-, line 155 */
+                if (ret < 0) return ret;
+            }
+            return 0; /* fail, line 155 */
+            break;
+        case 14:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 156 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_31); /* <-, line 156 */
+                if (ret < 0) return ret;
+            }
+            return 0; /* fail, line 156 */
+            break;
+        case 15:
+            {   int m_test = z->l - z->c; /* test, line 158 */
+                if (in_grouping_b(z, g_v, 97, 251, 0)) return 0;
+                {   int ret = r_RV(z);
+                    if (ret == 0) return 0; /* call RV, line 158 */
+                    if (ret < 0) return ret;
+                }
+                z->c = z->l - m_test;
+            }
+            {   int ret = slice_del(z); /* delete, line 158 */
+                if (ret < 0) return ret;
+            }
+            return 0; /* fail, line 158 */
+            break;
+    }
+    return 1;
+}
+
+static int r_i_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 163 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 163 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 164 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((68944418 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_5, 35); /* substring, line 164 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 164 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                if (out_grouping_b(z, g_v, 97, 251, 0)) { z->lb = mlimit; return 0; }
+                {   int ret = slice_del(z); /* delete, line 170 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 174 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 174 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 175 */
+        among_var = find_among_b(z, a_6, 38); /* substring, line 175 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 175 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->lb = mlimit; return 0; } /* call R2, line 177 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 177 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_del(z); /* delete, line 185 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_del(z); /* delete, line 190 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 191 */
+                    z->ket = z->c; /* [, line 191 */
+                    if (!(eq_s_b(z, 1, s_32))) { z->c = z->l - m_keep; goto lab0; }
+                    z->bra = z->c; /* ], line 191 */
+                    {   int ret = slice_del(z); /* delete, line 191 */
+                        if (ret < 0) return ret;
+                    }
+                lab0:
+                    ;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_residual_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 199 */
+        z->ket = z->c; /* [, line 199 */
+        if (!(eq_s_b(z, 1, s_33))) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 199 */
+        {   int m_test = z->l - z->c; /* test, line 199 */
+            if (out_grouping_b(z, g_keep_with_s, 97, 232, 0)) { z->c = z->l - m_keep; goto lab0; }
+            z->c = z->l - m_test;
+        }
+        {   int ret = slice_del(z); /* delete, line 199 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        ;
+    }
+    {   int mlimit; /* setlimit, line 200 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 200 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 201 */
+        among_var = find_among_b(z, a_7, 7); /* substring, line 201 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 201 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->lb = mlimit; return 0; } /* call R2, line 202 */
+                    if (ret < 0) return ret;
+                }
+                {   int m2 = z->l - z->c; (void)m2; /* or, line 202 */
+                    if (!(eq_s_b(z, 1, s_34))) goto lab2;
+                    goto lab1;
+                lab2:
+                    z->c = z->l - m2;
+                    if (!(eq_s_b(z, 1, s_35))) { z->lb = mlimit; return 0; }
+                }
+            lab1:
+                {   int ret = slice_del(z); /* delete, line 202 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_36); /* <-, line 204 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_del(z); /* delete, line 205 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                if (!(eq_s_b(z, 2, s_37))) { z->lb = mlimit; return 0; }
+                {   int ret = slice_del(z); /* delete, line 206 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_un_double(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 212 */
+        if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1069056 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+        if (!(find_among_b(z, a_8, 5))) return 0; /* among, line 212 */
+        z->c = z->l - m_test;
+    }
+    z->ket = z->c; /* [, line 212 */
+    if (z->c <= z->lb) return 0;
+    z->c--; /* next, line 212 */
+    z->bra = z->c; /* ], line 212 */
+    {   int ret = slice_del(z); /* delete, line 212 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_un_accent(struct SN_env * z) {
+    {   int i = 1;
+        while(1) { /* atleast, line 216 */
+            if (out_grouping_b(z, g_v, 97, 251, 0)) goto lab0;
+            i--;
+            continue;
+        lab0:
+            break;
+        }
+        if (i > 0) return 0;
+    }
+    z->ket = z->c; /* [, line 217 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 217 */
+        if (!(eq_s_b(z, 1, s_38))) goto lab2;
+        goto lab1;
+    lab2:
+        z->c = z->l - m1;
+        if (!(eq_s_b(z, 1, s_39))) return 0;
+    }
+lab1:
+    z->bra = z->c; /* ], line 217 */
+    {   int ret = slice_from_s(z, 1, s_40); /* <-, line 217 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int french_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 223 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 223 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 224 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 224 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 225 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 227 */
+        {   int m4 = z->l - z->c; (void)m4; /* or, line 237 */
+            {   int m5 = z->l - z->c; (void)m5; /* and, line 233 */
+                {   int m6 = z->l - z->c; (void)m6; /* or, line 229 */
+                    {   int ret = r_standard_suffix(z);
+                        if (ret == 0) goto lab6; /* call standard_suffix, line 229 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m6;
+                    {   int ret = r_i_verb_suffix(z);
+                        if (ret == 0) goto lab7; /* call i_verb_suffix, line 230 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab7:
+                    z->c = z->l - m6;
+                    {   int ret = r_verb_suffix(z);
+                        if (ret == 0) goto lab4; /* call verb_suffix, line 231 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                z->c = z->l - m5;
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 234 */
+                    z->ket = z->c; /* [, line 234 */
+                    {   int m7 = z->l - z->c; (void)m7; /* or, line 234 */
+                        if (!(eq_s_b(z, 1, s_41))) goto lab10;
+                        z->bra = z->c; /* ], line 234 */
+                        {   int ret = slice_from_s(z, 1, s_42); /* <-, line 234 */
+                            if (ret < 0) return ret;
+                        }
+                        goto lab9;
+                    lab10:
+                        z->c = z->l - m7;
+                        if (!(eq_s_b(z, 1, s_43))) { z->c = z->l - m_keep; goto lab8; }
+                        z->bra = z->c; /* ], line 235 */
+                        {   int ret = slice_from_s(z, 1, s_44); /* <-, line 235 */
+                            if (ret < 0) return ret;
+                        }
+                    }
+                lab9:
+                lab8:
+                    ;
+                }
+            }
+            goto lab3;
+        lab4:
+            z->c = z->l - m4;
+            {   int ret = r_residual_suffix(z);
+                if (ret == 0) goto lab2; /* call residual_suffix, line 238 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab3:
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 243 */
+        {   int ret = r_un_double(z);
+            if (ret == 0) goto lab11; /* call un_double, line 243 */
+            if (ret < 0) return ret;
+        }
+    lab11:
+        z->c = z->l - m8;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 244 */
+        {   int ret = r_un_accent(z);
+            if (ret == 0) goto lab12; /* call un_accent, line 244 */
+            if (ret < 0) return ret;
+        }
+    lab12:
+        z->c = z->l - m9;
+    }
+    z->c = z->lb;
+    {   int c10 = z->c; /* do, line 246 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab13; /* call postlude, line 246 */
+            if (ret < 0) return ret;
+        }
+    lab13:
+        z->c = c10;
+    }
+    return 1;
+}
+
+extern struct SN_env * french_ISO_8859_1_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void french_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_german.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_german.c
new file mode 100644
index 000000000000..13c242309234
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_german.c
@@ -0,0 +1,503 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int german_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_standard_suffix(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * german_ISO_8859_1_create_env(void);
+extern void german_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 'U' };
+static const symbol s_0_2[1] = { 'Y' };
+static const symbol s_0_3[1] = { 0xE4 };
+static const symbol s_0_4[1] = { 0xF6 };
+static const symbol s_0_5[1] = { 0xFC };
+
+static const struct among a_0[6] =
+{
+/*  0 */ { 0, 0, -1, 6, 0},
+/*  1 */ { 1, s_0_1, 0, 2, 0},
+/*  2 */ { 1, s_0_2, 0, 1, 0},
+/*  3 */ { 1, s_0_3, 0, 3, 0},
+/*  4 */ { 1, s_0_4, 0, 4, 0},
+/*  5 */ { 1, s_0_5, 0, 5, 0}
+};
+
+static const symbol s_1_0[1] = { 'e' };
+static const symbol s_1_1[2] = { 'e', 'm' };
+static const symbol s_1_2[2] = { 'e', 'n' };
+static const symbol s_1_3[3] = { 'e', 'r', 'n' };
+static const symbol s_1_4[2] = { 'e', 'r' };
+static const symbol s_1_5[1] = { 's' };
+static const symbol s_1_6[2] = { 'e', 's' };
+
+static const struct among a_1[7] =
+{
+/*  0 */ { 1, s_1_0, -1, 1, 0},
+/*  1 */ { 2, s_1_1, -1, 1, 0},
+/*  2 */ { 2, s_1_2, -1, 1, 0},
+/*  3 */ { 3, s_1_3, -1, 1, 0},
+/*  4 */ { 2, s_1_4, -1, 1, 0},
+/*  5 */ { 1, s_1_5, -1, 2, 0},
+/*  6 */ { 2, s_1_6, 5, 1, 0}
+};
+
+static const symbol s_2_0[2] = { 'e', 'n' };
+static const symbol s_2_1[2] = { 'e', 'r' };
+static const symbol s_2_2[2] = { 's', 't' };
+static const symbol s_2_3[3] = { 'e', 's', 't' };
+
+static const struct among a_2[4] =
+{
+/*  0 */ { 2, s_2_0, -1, 1, 0},
+/*  1 */ { 2, s_2_1, -1, 1, 0},
+/*  2 */ { 2, s_2_2, -1, 2, 0},
+/*  3 */ { 3, s_2_3, 2, 1, 0}
+};
+
+static const symbol s_3_0[2] = { 'i', 'g' };
+static const symbol s_3_1[4] = { 'l', 'i', 'c', 'h' };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 2, s_3_0, -1, 1, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0}
+};
+
+static const symbol s_4_0[3] = { 'e', 'n', 'd' };
+static const symbol s_4_1[2] = { 'i', 'g' };
+static const symbol s_4_2[3] = { 'u', 'n', 'g' };
+static const symbol s_4_3[4] = { 'l', 'i', 'c', 'h' };
+static const symbol s_4_4[4] = { 'i', 's', 'c', 'h' };
+static const symbol s_4_5[2] = { 'i', 'k' };
+static const symbol s_4_6[4] = { 'h', 'e', 'i', 't' };
+static const symbol s_4_7[4] = { 'k', 'e', 'i', 't' };
+
+static const struct among a_4[8] =
+{
+/*  0 */ { 3, s_4_0, -1, 1, 0},
+/*  1 */ { 2, s_4_1, -1, 2, 0},
+/*  2 */ { 3, s_4_2, -1, 1, 0},
+/*  3 */ { 4, s_4_3, -1, 3, 0},
+/*  4 */ { 4, s_4_4, -1, 2, 0},
+/*  5 */ { 2, s_4_5, -1, 2, 0},
+/*  6 */ { 4, s_4_6, -1, 3, 0},
+/*  7 */ { 4, s_4_7, -1, 4, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32, 8 };
+
+static const unsigned char g_s_ending[] = { 117, 30, 5 };
+
+static const unsigned char g_st_ending[] = { 117, 30, 4 };
+
+static const symbol s_0[] = { 0xDF };
+static const symbol s_1[] = { 's', 's' };
+static const symbol s_2[] = { 'u' };
+static const symbol s_3[] = { 'U' };
+static const symbol s_4[] = { 'y' };
+static const symbol s_5[] = { 'Y' };
+static const symbol s_6[] = { 'y' };
+static const symbol s_7[] = { 'u' };
+static const symbol s_8[] = { 'a' };
+static const symbol s_9[] = { 'o' };
+static const symbol s_10[] = { 'u' };
+static const symbol s_11[] = { 'i', 'g' };
+static const symbol s_12[] = { 'e' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'e', 'r' };
+static const symbol s_15[] = { 'e', 'n' };
+
+static int r_prelude(struct SN_env * z) {
+    {   int c_test = z->c; /* test, line 30 */
+        while(1) { /* repeat, line 30 */
+            int c1 = z->c;
+            {   int c2 = z->c; /* or, line 33 */
+                z->bra = z->c; /* [, line 32 */
+                if (!(eq_s(z, 1, s_0))) goto lab2;
+                z->ket = z->c; /* ], line 32 */
+                {   int ret = slice_from_s(z, 2, s_1); /* <-, line 32 */
+                    if (ret < 0) return ret;
+                }
+                goto lab1;
+            lab2:
+                z->c = c2;
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 33 */
+            }
+        lab1:
+            continue;
+        lab0:
+            z->c = c1;
+            break;
+        }
+        z->c = c_test;
+    }
+    while(1) { /* repeat, line 36 */
+        int c3 = z->c;
+        while(1) { /* goto, line 36 */
+            int c4 = z->c;
+            if (in_grouping(z, g_v, 97, 252, 0)) goto lab4;
+            z->bra = z->c; /* [, line 37 */
+            {   int c5 = z->c; /* or, line 37 */
+                if (!(eq_s(z, 1, s_2))) goto lab6;
+                z->ket = z->c; /* ], line 37 */
+                if (in_grouping(z, g_v, 97, 252, 0)) goto lab6;
+                {   int ret = slice_from_s(z, 1, s_3); /* <-, line 37 */
+                    if (ret < 0) return ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c5;
+                if (!(eq_s(z, 1, s_4))) goto lab4;
+                z->ket = z->c; /* ], line 38 */
+                if (in_grouping(z, g_v, 97, 252, 0)) goto lab4;
+                {   int ret = slice_from_s(z, 1, s_5); /* <-, line 38 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab5:
+            z->c = c4;
+            break;
+        lab4:
+            z->c = c4;
+            if (z->c >= z->l) goto lab3;
+            z->c++; /* goto, line 36 */
+        }
+        continue;
+    lab3:
+        z->c = c3;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c_test = z->c; /* test, line 47 */
+        {   int ret = z->c + 3;
+            if (0 > ret || ret > z->l) return 0;
+            z->c = ret; /* hop, line 47 */
+        }
+        z->I[2] = z->c; /* setmark x, line 47 */
+        z->c = c_test;
+    }
+    {    /* gopast */ /* grouping v, line 49 */
+        int ret = out_grouping(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 49 */
+        int ret = in_grouping(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 49 */
+     /* try, line 50 */
+    if (!(z->I[0] < z->I[2])) goto lab0;
+    z->I[0] = z->I[2];
+lab0:
+    {    /* gopast */ /* grouping v, line 51 */
+        int ret = out_grouping(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 51 */
+        int ret = in_grouping(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[1] = z->c; /* setmark p2, line 51 */
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 55 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 57 */
+        among_var = find_among(z, a_0, 6); /* substring, line 57 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 57 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_6); /* <-, line 58 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_7); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 1, s_8); /* <-, line 60 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = slice_from_s(z, 1, s_9); /* <-, line 61 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 62 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 6:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 63 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 74 */
+        z->ket = z->c; /* [, line 75 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((811040 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab0;
+        among_var = find_among_b(z, a_1, 7); /* substring, line 75 */
+        if (!(among_var)) goto lab0;
+        z->bra = z->c; /* ], line 75 */
+        {   int ret = r_R1(z);
+            if (ret == 0) goto lab0; /* call R1, line 75 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 77 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                if (in_grouping_b(z, g_s_ending, 98, 116, 0)) goto lab0;
+                {   int ret = slice_del(z); /* delete, line 80 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        z->c = z->l - m1;
+    }
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 84 */
+        z->ket = z->c; /* [, line 85 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1327104 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab1;
+        among_var = find_among_b(z, a_2, 4); /* substring, line 85 */
+        if (!(among_var)) goto lab1;
+        z->bra = z->c; /* ], line 85 */
+        {   int ret = r_R1(z);
+            if (ret == 0) goto lab1; /* call R1, line 85 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: goto lab1;
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 87 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                if (in_grouping_b(z, g_st_ending, 98, 116, 0)) goto lab1;
+                {   int ret = z->c - 3;
+                    if (z->lb > ret || ret > z->l) goto lab1;
+                    z->c = ret; /* hop, line 90 */
+                }
+                {   int ret = slice_del(z); /* delete, line 90 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 94 */
+        z->ket = z->c; /* [, line 95 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1051024 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab2;
+        among_var = find_among_b(z, a_4, 8); /* substring, line 95 */
+        if (!(among_var)) goto lab2;
+        z->bra = z->c; /* ], line 95 */
+        {   int ret = r_R2(z);
+            if (ret == 0) goto lab2; /* call R2, line 95 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: goto lab2;
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 97 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 98 */
+                    z->ket = z->c; /* [, line 98 */
+                    if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m_keep; goto lab3; }
+                    z->bra = z->c; /* ], line 98 */
+                    {   int m4 = z->l - z->c; (void)m4; /* not, line 98 */
+                        if (!(eq_s_b(z, 1, s_12))) goto lab4;
+                        { z->c = z->l - m_keep; goto lab3; }
+                    lab4:
+                        z->c = z->l - m4;
+                    }
+                    {   int ret = r_R2(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 98 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 98 */
+                        if (ret < 0) return ret;
+                    }
+                lab3:
+                    ;
+                }
+                break;
+            case 2:
+                {   int m5 = z->l - z->c; (void)m5; /* not, line 101 */
+                    if (!(eq_s_b(z, 1, s_13))) goto lab5;
+                    goto lab2;
+                lab5:
+                    z->c = z->l - m5;
+                }
+                {   int ret = slice_del(z); /* delete, line 101 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_del(z); /* delete, line 104 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 105 */
+                    z->ket = z->c; /* [, line 106 */
+                    {   int m6 = z->l - z->c; (void)m6; /* or, line 106 */
+                        if (!(eq_s_b(z, 2, s_14))) goto lab8;
+                        goto lab7;
+                    lab8:
+                        z->c = z->l - m6;
+                        if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m_keep; goto lab6; }
+                    }
+                lab7:
+                    z->bra = z->c; /* ], line 106 */
+                    {   int ret = r_R1(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab6; } /* call R1, line 106 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 106 */
+                        if (ret < 0) return ret;
+                    }
+                lab6:
+                    ;
+                }
+                break;
+            case 4:
+                {   int ret = slice_del(z); /* delete, line 110 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 111 */
+                    z->ket = z->c; /* [, line 112 */
+                    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 103 && z->p[z->c - 1] != 104)) { z->c = z->l - m_keep; goto lab9; }
+                    among_var = find_among_b(z, a_3, 2); /* substring, line 112 */
+                    if (!(among_var)) { z->c = z->l - m_keep; goto lab9; }
+                    z->bra = z->c; /* ], line 112 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab9; } /* call R2, line 112 */
+                        if (ret < 0) return ret;
+                    }
+                    switch(among_var) {
+                        case 0: { z->c = z->l - m_keep; goto lab9; }
+                        case 1:
+                            {   int ret = slice_del(z); /* delete, line 114 */
+                                if (ret < 0) return ret;
+                            }
+                            break;
+                    }
+                lab9:
+                    ;
+                }
+                break;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    return 1;
+}
+
+extern int german_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 125 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 125 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 126 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 126 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 127 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 128 */
+        {   int ret = r_standard_suffix(z);
+            if (ret == 0) goto lab2; /* call standard_suffix, line 128 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    z->c = z->lb;
+    {   int c4 = z->c; /* do, line 129 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab3; /* call postlude, line 129 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = c4;
+    }
+    return 1;
+}
+
+extern struct SN_env * german_ISO_8859_1_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void german_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_hungarian.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_hungarian.c
new file mode 100644
index 000000000000..ff4b23e06059
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_hungarian.c
@@ -0,0 +1,1230 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int hungarian_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_double(struct SN_env * z);
+static int r_undouble(struct SN_env * z);
+static int r_factive(struct SN_env * z);
+static int r_instrum(struct SN_env * z);
+static int r_plur_owner(struct SN_env * z);
+static int r_sing_owner(struct SN_env * z);
+static int r_owned(struct SN_env * z);
+static int r_plural(struct SN_env * z);
+static int r_case_other(struct SN_env * z);
+static int r_case_special(struct SN_env * z);
+static int r_case(struct SN_env * z);
+static int r_v_ending(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * hungarian_ISO_8859_1_create_env(void);
+extern void hungarian_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[2] = { 'c', 's' };
+static const symbol s_0_1[3] = { 'd', 'z', 's' };
+static const symbol s_0_2[2] = { 'g', 'y' };
+static const symbol s_0_3[2] = { 'l', 'y' };
+static const symbol s_0_4[2] = { 'n', 'y' };
+static const symbol s_0_5[2] = { 's', 'z' };
+static const symbol s_0_6[2] = { 't', 'y' };
+static const symbol s_0_7[2] = { 'z', 's' };
+
+static const struct among a_0[8] =
+{
+/*  0 */ { 2, s_0_0, -1, -1, 0},
+/*  1 */ { 3, s_0_1, -1, -1, 0},
+/*  2 */ { 2, s_0_2, -1, -1, 0},
+/*  3 */ { 2, s_0_3, -1, -1, 0},
+/*  4 */ { 2, s_0_4, -1, -1, 0},
+/*  5 */ { 2, s_0_5, -1, -1, 0},
+/*  6 */ { 2, s_0_6, -1, -1, 0},
+/*  7 */ { 2, s_0_7, -1, -1, 0}
+};
+
+static const symbol s_1_0[1] = { 0xE1 };
+static const symbol s_1_1[1] = { 0xE9 };
+
+static const struct among a_1[2] =
+{
+/*  0 */ { 1, s_1_0, -1, 1, 0},
+/*  1 */ { 1, s_1_1, -1, 2, 0}
+};
+
+static const symbol s_2_0[2] = { 'b', 'b' };
+static const symbol s_2_1[2] = { 'c', 'c' };
+static const symbol s_2_2[2] = { 'd', 'd' };
+static const symbol s_2_3[2] = { 'f', 'f' };
+static const symbol s_2_4[2] = { 'g', 'g' };
+static const symbol s_2_5[2] = { 'j', 'j' };
+static const symbol s_2_6[2] = { 'k', 'k' };
+static const symbol s_2_7[2] = { 'l', 'l' };
+static const symbol s_2_8[2] = { 'm', 'm' };
+static const symbol s_2_9[2] = { 'n', 'n' };
+static const symbol s_2_10[2] = { 'p', 'p' };
+static const symbol s_2_11[2] = { 'r', 'r' };
+static const symbol s_2_12[3] = { 'c', 'c', 's' };
+static const symbol s_2_13[2] = { 's', 's' };
+static const symbol s_2_14[3] = { 'z', 'z', 's' };
+static const symbol s_2_15[2] = { 't', 't' };
+static const symbol s_2_16[2] = { 'v', 'v' };
+static const symbol s_2_17[3] = { 'g', 'g', 'y' };
+static const symbol s_2_18[3] = { 'l', 'l', 'y' };
+static const symbol s_2_19[3] = { 'n', 'n', 'y' };
+static const symbol s_2_20[3] = { 't', 't', 'y' };
+static const symbol s_2_21[3] = { 's', 's', 'z' };
+static const symbol s_2_22[2] = { 'z', 'z' };
+
+static const struct among a_2[23] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 2, s_2_2, -1, -1, 0},
+/*  3 */ { 2, s_2_3, -1, -1, 0},
+/*  4 */ { 2, s_2_4, -1, -1, 0},
+/*  5 */ { 2, s_2_5, -1, -1, 0},
+/*  6 */ { 2, s_2_6, -1, -1, 0},
+/*  7 */ { 2, s_2_7, -1, -1, 0},
+/*  8 */ { 2, s_2_8, -1, -1, 0},
+/*  9 */ { 2, s_2_9, -1, -1, 0},
+/* 10 */ { 2, s_2_10, -1, -1, 0},
+/* 11 */ { 2, s_2_11, -1, -1, 0},
+/* 12 */ { 3, s_2_12, -1, -1, 0},
+/* 13 */ { 2, s_2_13, -1, -1, 0},
+/* 14 */ { 3, s_2_14, -1, -1, 0},
+/* 15 */ { 2, s_2_15, -1, -1, 0},
+/* 16 */ { 2, s_2_16, -1, -1, 0},
+/* 17 */ { 3, s_2_17, -1, -1, 0},
+/* 18 */ { 3, s_2_18, -1, -1, 0},
+/* 19 */ { 3, s_2_19, -1, -1, 0},
+/* 20 */ { 3, s_2_20, -1, -1, 0},
+/* 21 */ { 3, s_2_21, -1, -1, 0},
+/* 22 */ { 2, s_2_22, -1, -1, 0}
+};
+
+static const symbol s_3_0[2] = { 'a', 'l' };
+static const symbol s_3_1[2] = { 'e', 'l' };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 2, s_3_0, -1, 1, 0},
+/*  1 */ { 2, s_3_1, -1, 2, 0}
+};
+
+static const symbol s_4_0[2] = { 'b', 'a' };
+static const symbol s_4_1[2] = { 'r', 'a' };
+static const symbol s_4_2[2] = { 'b', 'e' };
+static const symbol s_4_3[2] = { 'r', 'e' };
+static const symbol s_4_4[2] = { 'i', 'g' };
+static const symbol s_4_5[3] = { 'n', 'a', 'k' };
+static const symbol s_4_6[3] = { 'n', 'e', 'k' };
+static const symbol s_4_7[3] = { 'v', 'a', 'l' };
+static const symbol s_4_8[3] = { 'v', 'e', 'l' };
+static const symbol s_4_9[2] = { 'u', 'l' };
+static const symbol s_4_10[3] = { 'n', 0xE1, 'l' };
+static const symbol s_4_11[3] = { 'n', 0xE9, 'l' };
+static const symbol s_4_12[3] = { 'b', 0xF3, 'l' };
+static const symbol s_4_13[3] = { 'r', 0xF3, 'l' };
+static const symbol s_4_14[3] = { 't', 0xF3, 'l' };
+static const symbol s_4_15[3] = { 'b', 0xF5, 'l' };
+static const symbol s_4_16[3] = { 'r', 0xF5, 'l' };
+static const symbol s_4_17[3] = { 't', 0xF5, 'l' };
+static const symbol s_4_18[2] = { 0xFC, 'l' };
+static const symbol s_4_19[1] = { 'n' };
+static const symbol s_4_20[2] = { 'a', 'n' };
+static const symbol s_4_21[3] = { 'b', 'a', 'n' };
+static const symbol s_4_22[2] = { 'e', 'n' };
+static const symbol s_4_23[3] = { 'b', 'e', 'n' };
+static const symbol s_4_24[6] = { 'k', 0xE9, 'p', 'p', 'e', 'n' };
+static const symbol s_4_25[2] = { 'o', 'n' };
+static const symbol s_4_26[2] = { 0xF6, 'n' };
+static const symbol s_4_27[4] = { 'k', 0xE9, 'p', 'p' };
+static const symbol s_4_28[3] = { 'k', 'o', 'r' };
+static const symbol s_4_29[1] = { 't' };
+static const symbol s_4_30[2] = { 'a', 't' };
+static const symbol s_4_31[2] = { 'e', 't' };
+static const symbol s_4_32[4] = { 'k', 0xE9, 'n', 't' };
+static const symbol s_4_33[6] = { 'a', 'n', 'k', 0xE9, 'n', 't' };
+static const symbol s_4_34[6] = { 'e', 'n', 'k', 0xE9, 'n', 't' };
+static const symbol s_4_35[6] = { 'o', 'n', 'k', 0xE9, 'n', 't' };
+static const symbol s_4_36[2] = { 'o', 't' };
+static const symbol s_4_37[3] = { 0xE9, 'r', 't' };
+static const symbol s_4_38[2] = { 0xF6, 't' };
+static const symbol s_4_39[3] = { 'h', 'e', 'z' };
+static const symbol s_4_40[3] = { 'h', 'o', 'z' };
+static const symbol s_4_41[3] = { 'h', 0xF6, 'z' };
+static const symbol s_4_42[2] = { 'v', 0xE1 };
+static const symbol s_4_43[2] = { 'v', 0xE9 };
+
+static const struct among a_4[44] =
+{
+/*  0 */ { 2, s_4_0, -1, -1, 0},
+/*  1 */ { 2, s_4_1, -1, -1, 0},
+/*  2 */ { 2, s_4_2, -1, -1, 0},
+/*  3 */ { 2, s_4_3, -1, -1, 0},
+/*  4 */ { 2, s_4_4, -1, -1, 0},
+/*  5 */ { 3, s_4_5, -1, -1, 0},
+/*  6 */ { 3, s_4_6, -1, -1, 0},
+/*  7 */ { 3, s_4_7, -1, -1, 0},
+/*  8 */ { 3, s_4_8, -1, -1, 0},
+/*  9 */ { 2, s_4_9, -1, -1, 0},
+/* 10 */ { 3, s_4_10, -1, -1, 0},
+/* 11 */ { 3, s_4_11, -1, -1, 0},
+/* 12 */ { 3, s_4_12, -1, -1, 0},
+/* 13 */ { 3, s_4_13, -1, -1, 0},
+/* 14 */ { 3, s_4_14, -1, -1, 0},
+/* 15 */ { 3, s_4_15, -1, -1, 0},
+/* 16 */ { 3, s_4_16, -1, -1, 0},
+/* 17 */ { 3, s_4_17, -1, -1, 0},
+/* 18 */ { 2, s_4_18, -1, -1, 0},
+/* 19 */ { 1, s_4_19, -1, -1, 0},
+/* 20 */ { 2, s_4_20, 19, -1, 0},
+/* 21 */ { 3, s_4_21, 20, -1, 0},
+/* 22 */ { 2, s_4_22, 19, -1, 0},
+/* 23 */ { 3, s_4_23, 22, -1, 0},
+/* 24 */ { 6, s_4_24, 22, -1, 0},
+/* 25 */ { 2, s_4_25, 19, -1, 0},
+/* 26 */ { 2, s_4_26, 19, -1, 0},
+/* 27 */ { 4, s_4_27, -1, -1, 0},
+/* 28 */ { 3, s_4_28, -1, -1, 0},
+/* 29 */ { 1, s_4_29, -1, -1, 0},
+/* 30 */ { 2, s_4_30, 29, -1, 0},
+/* 31 */ { 2, s_4_31, 29, -1, 0},
+/* 32 */ { 4, s_4_32, 29, -1, 0},
+/* 33 */ { 6, s_4_33, 32, -1, 0},
+/* 34 */ { 6, s_4_34, 32, -1, 0},
+/* 35 */ { 6, s_4_35, 32, -1, 0},
+/* 36 */ { 2, s_4_36, 29, -1, 0},
+/* 37 */ { 3, s_4_37, 29, -1, 0},
+/* 38 */ { 2, s_4_38, 29, -1, 0},
+/* 39 */ { 3, s_4_39, -1, -1, 0},
+/* 40 */ { 3, s_4_40, -1, -1, 0},
+/* 41 */ { 3, s_4_41, -1, -1, 0},
+/* 42 */ { 2, s_4_42, -1, -1, 0},
+/* 43 */ { 2, s_4_43, -1, -1, 0}
+};
+
+static const symbol s_5_0[2] = { 0xE1, 'n' };
+static const symbol s_5_1[2] = { 0xE9, 'n' };
+static const symbol s_5_2[6] = { 0xE1, 'n', 'k', 0xE9, 'n', 't' };
+
+static const struct among a_5[3] =
+{
+/*  0 */ { 2, s_5_0, -1, 2, 0},
+/*  1 */ { 2, s_5_1, -1, 1, 0},
+/*  2 */ { 6, s_5_2, -1, 3, 0}
+};
+
+static const symbol s_6_0[4] = { 's', 't', 'u', 'l' };
+static const symbol s_6_1[5] = { 'a', 's', 't', 'u', 'l' };
+static const symbol s_6_2[5] = { 0xE1, 's', 't', 'u', 'l' };
+static const symbol s_6_3[4] = { 's', 't', 0xFC, 'l' };
+static const symbol s_6_4[5] = { 'e', 's', 't', 0xFC, 'l' };
+static const symbol s_6_5[5] = { 0xE9, 's', 't', 0xFC, 'l' };
+
+static const struct among a_6[6] =
+{
+/*  0 */ { 4, s_6_0, -1, 2, 0},
+/*  1 */ { 5, s_6_1, 0, 1, 0},
+/*  2 */ { 5, s_6_2, 0, 3, 0},
+/*  3 */ { 4, s_6_3, -1, 2, 0},
+/*  4 */ { 5, s_6_4, 3, 1, 0},
+/*  5 */ { 5, s_6_5, 3, 4, 0}
+};
+
+static const symbol s_7_0[1] = { 0xE1 };
+static const symbol s_7_1[1] = { 0xE9 };
+
+static const struct among a_7[2] =
+{
+/*  0 */ { 1, s_7_0, -1, 1, 0},
+/*  1 */ { 1, s_7_1, -1, 2, 0}
+};
+
+static const symbol s_8_0[1] = { 'k' };
+static const symbol s_8_1[2] = { 'a', 'k' };
+static const symbol s_8_2[2] = { 'e', 'k' };
+static const symbol s_8_3[2] = { 'o', 'k' };
+static const symbol s_8_4[2] = { 0xE1, 'k' };
+static const symbol s_8_5[2] = { 0xE9, 'k' };
+static const symbol s_8_6[2] = { 0xF6, 'k' };
+
+static const struct among a_8[7] =
+{
+/*  0 */ { 1, s_8_0, -1, 7, 0},
+/*  1 */ { 2, s_8_1, 0, 4, 0},
+/*  2 */ { 2, s_8_2, 0, 6, 0},
+/*  3 */ { 2, s_8_3, 0, 5, 0},
+/*  4 */ { 2, s_8_4, 0, 1, 0},
+/*  5 */ { 2, s_8_5, 0, 2, 0},
+/*  6 */ { 2, s_8_6, 0, 3, 0}
+};
+
+static const symbol s_9_0[2] = { 0xE9, 'i' };
+static const symbol s_9_1[3] = { 0xE1, 0xE9, 'i' };
+static const symbol s_9_2[3] = { 0xE9, 0xE9, 'i' };
+static const symbol s_9_3[1] = { 0xE9 };
+static const symbol s_9_4[2] = { 'k', 0xE9 };
+static const symbol s_9_5[3] = { 'a', 'k', 0xE9 };
+static const symbol s_9_6[3] = { 'e', 'k', 0xE9 };
+static const symbol s_9_7[3] = { 'o', 'k', 0xE9 };
+static const symbol s_9_8[3] = { 0xE1, 'k', 0xE9 };
+static const symbol s_9_9[3] = { 0xE9, 'k', 0xE9 };
+static const symbol s_9_10[3] = { 0xF6, 'k', 0xE9 };
+static const symbol s_9_11[2] = { 0xE9, 0xE9 };
+
+static const struct among a_9[12] =
+{
+/*  0 */ { 2, s_9_0, -1, 7, 0},
+/*  1 */ { 3, s_9_1, 0, 6, 0},
+/*  2 */ { 3, s_9_2, 0, 5, 0},
+/*  3 */ { 1, s_9_3, -1, 9, 0},
+/*  4 */ { 2, s_9_4, 3, 4, 0},
+/*  5 */ { 3, s_9_5, 4, 1, 0},
+/*  6 */ { 3, s_9_6, 4, 1, 0},
+/*  7 */ { 3, s_9_7, 4, 1, 0},
+/*  8 */ { 3, s_9_8, 4, 3, 0},
+/*  9 */ { 3, s_9_9, 4, 2, 0},
+/* 10 */ { 3, s_9_10, 4, 1, 0},
+/* 11 */ { 2, s_9_11, 3, 8, 0}
+};
+
+static const symbol s_10_0[1] = { 'a' };
+static const symbol s_10_1[2] = { 'j', 'a' };
+static const symbol s_10_2[1] = { 'd' };
+static const symbol s_10_3[2] = { 'a', 'd' };
+static const symbol s_10_4[2] = { 'e', 'd' };
+static const symbol s_10_5[2] = { 'o', 'd' };
+static const symbol s_10_6[2] = { 0xE1, 'd' };
+static const symbol s_10_7[2] = { 0xE9, 'd' };
+static const symbol s_10_8[2] = { 0xF6, 'd' };
+static const symbol s_10_9[1] = { 'e' };
+static const symbol s_10_10[2] = { 'j', 'e' };
+static const symbol s_10_11[2] = { 'n', 'k' };
+static const symbol s_10_12[3] = { 'u', 'n', 'k' };
+static const symbol s_10_13[3] = { 0xE1, 'n', 'k' };
+static const symbol s_10_14[3] = { 0xE9, 'n', 'k' };
+static const symbol s_10_15[3] = { 0xFC, 'n', 'k' };
+static const symbol s_10_16[2] = { 'u', 'k' };
+static const symbol s_10_17[3] = { 'j', 'u', 'k' };
+static const symbol s_10_18[4] = { 0xE1, 'j', 'u', 'k' };
+static const symbol s_10_19[2] = { 0xFC, 'k' };
+static const symbol s_10_20[3] = { 'j', 0xFC, 'k' };
+static const symbol s_10_21[4] = { 0xE9, 'j', 0xFC, 'k' };
+static const symbol s_10_22[1] = { 'm' };
+static const symbol s_10_23[2] = { 'a', 'm' };
+static const symbol s_10_24[2] = { 'e', 'm' };
+static const symbol s_10_25[2] = { 'o', 'm' };
+static const symbol s_10_26[2] = { 0xE1, 'm' };
+static const symbol s_10_27[2] = { 0xE9, 'm' };
+static const symbol s_10_28[1] = { 'o' };
+static const symbol s_10_29[1] = { 0xE1 };
+static const symbol s_10_30[1] = { 0xE9 };
+
+static const struct among a_10[31] =
+{
+/*  0 */ { 1, s_10_0, -1, 18, 0},
+/*  1 */ { 2, s_10_1, 0, 17, 0},
+/*  2 */ { 1, s_10_2, -1, 16, 0},
+/*  3 */ { 2, s_10_3, 2, 13, 0},
+/*  4 */ { 2, s_10_4, 2, 13, 0},
+/*  5 */ { 2, s_10_5, 2, 13, 0},
+/*  6 */ { 2, s_10_6, 2, 14, 0},
+/*  7 */ { 2, s_10_7, 2, 15, 0},
+/*  8 */ { 2, s_10_8, 2, 13, 0},
+/*  9 */ { 1, s_10_9, -1, 18, 0},
+/* 10 */ { 2, s_10_10, 9, 17, 0},
+/* 11 */ { 2, s_10_11, -1, 4, 0},
+/* 12 */ { 3, s_10_12, 11, 1, 0},
+/* 13 */ { 3, s_10_13, 11, 2, 0},
+/* 14 */ { 3, s_10_14, 11, 3, 0},
+/* 15 */ { 3, s_10_15, 11, 1, 0},
+/* 16 */ { 2, s_10_16, -1, 8, 0},
+/* 17 */ { 3, s_10_17, 16, 7, 0},
+/* 18 */ { 4, s_10_18, 17, 5, 0},
+/* 19 */ { 2, s_10_19, -1, 8, 0},
+/* 20 */ { 3, s_10_20, 19, 7, 0},
+/* 21 */ { 4, s_10_21, 20, 6, 0},
+/* 22 */ { 1, s_10_22, -1, 12, 0},
+/* 23 */ { 2, s_10_23, 22, 9, 0},
+/* 24 */ { 2, s_10_24, 22, 9, 0},
+/* 25 */ { 2, s_10_25, 22, 9, 0},
+/* 26 */ { 2, s_10_26, 22, 10, 0},
+/* 27 */ { 2, s_10_27, 22, 11, 0},
+/* 28 */ { 1, s_10_28, -1, 18, 0},
+/* 29 */ { 1, s_10_29, -1, 19, 0},
+/* 30 */ { 1, s_10_30, -1, 20, 0}
+};
+
+static const symbol s_11_0[2] = { 'i', 'd' };
+static const symbol s_11_1[3] = { 'a', 'i', 'd' };
+static const symbol s_11_2[4] = { 'j', 'a', 'i', 'd' };
+static const symbol s_11_3[3] = { 'e', 'i', 'd' };
+static const symbol s_11_4[4] = { 'j', 'e', 'i', 'd' };
+static const symbol s_11_5[3] = { 0xE1, 'i', 'd' };
+static const symbol s_11_6[3] = { 0xE9, 'i', 'd' };
+static const symbol s_11_7[1] = { 'i' };
+static const symbol s_11_8[2] = { 'a', 'i' };
+static const symbol s_11_9[3] = { 'j', 'a', 'i' };
+static const symbol s_11_10[2] = { 'e', 'i' };
+static const symbol s_11_11[3] = { 'j', 'e', 'i' };
+static const symbol s_11_12[2] = { 0xE1, 'i' };
+static const symbol s_11_13[2] = { 0xE9, 'i' };
+static const symbol s_11_14[4] = { 'i', 't', 'e', 'k' };
+static const symbol s_11_15[5] = { 'e', 'i', 't', 'e', 'k' };
+static const symbol s_11_16[6] = { 'j', 'e', 'i', 't', 'e', 'k' };
+static const symbol s_11_17[5] = { 0xE9, 'i', 't', 'e', 'k' };
+static const symbol s_11_18[2] = { 'i', 'k' };
+static const symbol s_11_19[3] = { 'a', 'i', 'k' };
+static const symbol s_11_20[4] = { 'j', 'a', 'i', 'k' };
+static const symbol s_11_21[3] = { 'e', 'i', 'k' };
+static const symbol s_11_22[4] = { 'j', 'e', 'i', 'k' };
+static const symbol s_11_23[3] = { 0xE1, 'i', 'k' };
+static const symbol s_11_24[3] = { 0xE9, 'i', 'k' };
+static const symbol s_11_25[3] = { 'i', 'n', 'k' };
+static const symbol s_11_26[4] = { 'a', 'i', 'n', 'k' };
+static const symbol s_11_27[5] = { 'j', 'a', 'i', 'n', 'k' };
+static const symbol s_11_28[4] = { 'e', 'i', 'n', 'k' };
+static const symbol s_11_29[5] = { 'j', 'e', 'i', 'n', 'k' };
+static const symbol s_11_30[4] = { 0xE1, 'i', 'n', 'k' };
+static const symbol s_11_31[4] = { 0xE9, 'i', 'n', 'k' };
+static const symbol s_11_32[5] = { 'a', 'i', 't', 'o', 'k' };
+static const symbol s_11_33[6] = { 'j', 'a', 'i', 't', 'o', 'k' };
+static const symbol s_11_34[5] = { 0xE1, 'i', 't', 'o', 'k' };
+static const symbol s_11_35[2] = { 'i', 'm' };
+static const symbol s_11_36[3] = { 'a', 'i', 'm' };
+static const symbol s_11_37[4] = { 'j', 'a', 'i', 'm' };
+static const symbol s_11_38[3] = { 'e', 'i', 'm' };
+static const symbol s_11_39[4] = { 'j', 'e', 'i', 'm' };
+static const symbol s_11_40[3] = { 0xE1, 'i', 'm' };
+static const symbol s_11_41[3] = { 0xE9, 'i', 'm' };
+
+static const struct among a_11[42] =
+{
+/*  0 */ { 2, s_11_0, -1, 10, 0},
+/*  1 */ { 3, s_11_1, 0, 9, 0},
+/*  2 */ { 4, s_11_2, 1, 6, 0},
+/*  3 */ { 3, s_11_3, 0, 9, 0},
+/*  4 */ { 4, s_11_4, 3, 6, 0},
+/*  5 */ { 3, s_11_5, 0, 7, 0},
+/*  6 */ { 3, s_11_6, 0, 8, 0},
+/*  7 */ { 1, s_11_7, -1, 15, 0},
+/*  8 */ { 2, s_11_8, 7, 14, 0},
+/*  9 */ { 3, s_11_9, 8, 11, 0},
+/* 10 */ { 2, s_11_10, 7, 14, 0},
+/* 11 */ { 3, s_11_11, 10, 11, 0},
+/* 12 */ { 2, s_11_12, 7, 12, 0},
+/* 13 */ { 2, s_11_13, 7, 13, 0},
+/* 14 */ { 4, s_11_14, -1, 24, 0},
+/* 15 */ { 5, s_11_15, 14, 21, 0},
+/* 16 */ { 6, s_11_16, 15, 20, 0},
+/* 17 */ { 5, s_11_17, 14, 23, 0},
+/* 18 */ { 2, s_11_18, -1, 29, 0},
+/* 19 */ { 3, s_11_19, 18, 26, 0},
+/* 20 */ { 4, s_11_20, 19, 25, 0},
+/* 21 */ { 3, s_11_21, 18, 26, 0},
+/* 22 */ { 4, s_11_22, 21, 25, 0},
+/* 23 */ { 3, s_11_23, 18, 27, 0},
+/* 24 */ { 3, s_11_24, 18, 28, 0},
+/* 25 */ { 3, s_11_25, -1, 20, 0},
+/* 26 */ { 4, s_11_26, 25, 17, 0},
+/* 27 */ { 5, s_11_27, 26, 16, 0},
+/* 28 */ { 4, s_11_28, 25, 17, 0},
+/* 29 */ { 5, s_11_29, 28, 16, 0},
+/* 30 */ { 4, s_11_30, 25, 18, 0},
+/* 31 */ { 4, s_11_31, 25, 19, 0},
+/* 32 */ { 5, s_11_32, -1, 21, 0},
+/* 33 */ { 6, s_11_33, 32, 20, 0},
+/* 34 */ { 5, s_11_34, -1, 22, 0},
+/* 35 */ { 2, s_11_35, -1, 5, 0},
+/* 36 */ { 3, s_11_36, 35, 4, 0},
+/* 37 */ { 4, s_11_37, 36, 1, 0},
+/* 38 */ { 3, s_11_38, 35, 4, 0},
+/* 39 */ { 4, s_11_39, 38, 1, 0},
+/* 40 */ { 3, s_11_40, 35, 2, 0},
+/* 41 */ { 3, s_11_41, 35, 3, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 52, 14 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 'e' };
+static const symbol s_3[] = { 'a' };
+static const symbol s_4[] = { 'a' };
+static const symbol s_5[] = { 'a' };
+static const symbol s_6[] = { 'e' };
+static const symbol s_7[] = { 'a' };
+static const symbol s_8[] = { 'e' };
+static const symbol s_9[] = { 'e' };
+static const symbol s_10[] = { 'a' };
+static const symbol s_11[] = { 'e' };
+static const symbol s_12[] = { 'a' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'a' };
+static const symbol s_15[] = { 'e' };
+static const symbol s_16[] = { 'a' };
+static const symbol s_17[] = { 'e' };
+static const symbol s_18[] = { 'a' };
+static const symbol s_19[] = { 'e' };
+static const symbol s_20[] = { 'a' };
+static const symbol s_21[] = { 'e' };
+static const symbol s_22[] = { 'a' };
+static const symbol s_23[] = { 'e' };
+static const symbol s_24[] = { 'a' };
+static const symbol s_25[] = { 'e' };
+static const symbol s_26[] = { 'a' };
+static const symbol s_27[] = { 'e' };
+static const symbol s_28[] = { 'a' };
+static const symbol s_29[] = { 'e' };
+static const symbol s_30[] = { 'a' };
+static const symbol s_31[] = { 'e' };
+static const symbol s_32[] = { 'a' };
+static const symbol s_33[] = { 'e' };
+static const symbol s_34[] = { 'a' };
+static const symbol s_35[] = { 'e' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c1 = z->c; /* or, line 51 */
+        if (in_grouping(z, g_v, 97, 252, 0)) goto lab1;
+        if (in_grouping(z, g_v, 97, 252, 1) < 0) goto lab1; /* goto */ /* non v, line 48 */
+        {   int c2 = z->c; /* or, line 49 */
+            if (z->c + 1 >= z->l || z->p[z->c + 1] >> 5 != 3 || !((101187584 >> (z->p[z->c + 1] & 0x1f)) & 1)) goto lab3;
+            if (!(find_among(z, a_0, 8))) goto lab3; /* among, line 49 */
+            goto lab2;
+        lab3:
+            z->c = c2;
+            if (z->c >= z->l) goto lab1;
+            z->c++; /* next, line 49 */
+        }
+    lab2:
+        z->I[0] = z->c; /* setmark p1, line 50 */
+        goto lab0;
+    lab1:
+        z->c = c1;
+        if (out_grouping(z, g_v, 97, 252, 0)) return 0;
+        {    /* gopast */ /* grouping v, line 53 */
+            int ret = out_grouping(z, g_v, 97, 252, 1);
+            if (ret < 0) return 0;
+            z->c += ret;
+        }
+        z->I[0] = z->c; /* setmark p1, line 53 */
+    }
+lab0:
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_v_ending(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 61 */
+    if (z->c <= z->lb || (z->p[z->c - 1] != 225 && z->p[z->c - 1] != 233)) return 0;
+    among_var = find_among_b(z, a_1, 2); /* substring, line 61 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 61 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 61 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 1, s_0); /* <-, line 62 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_1); /* <-, line 63 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_double(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 68 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((106790108 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+        if (!(find_among_b(z, a_2, 23))) return 0; /* among, line 68 */
+        z->c = z->l - m_test;
+    }
+    return 1;
+}
+
+static int r_undouble(struct SN_env * z) {
+    if (z->c <= z->lb) return 0;
+    z->c--; /* next, line 73 */
+    z->ket = z->c; /* [, line 73 */
+    {   int ret = z->c - 1;
+        if (z->lb > ret || ret > z->l) return 0;
+        z->c = ret; /* hop, line 73 */
+    }
+    z->bra = z->c; /* ], line 73 */
+    {   int ret = slice_del(z); /* delete, line 73 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_instrum(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 77 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] != 108) return 0;
+    among_var = find_among_b(z, a_3, 2); /* substring, line 77 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 77 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 77 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 78 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 79 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 81 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 82 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_case(struct SN_env * z) {
+    z->ket = z->c; /* [, line 87 */
+    if (!(find_among_b(z, a_4, 44))) return 0; /* substring, line 87 */
+    z->bra = z->c; /* ], line 87 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 87 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = slice_del(z); /* delete, line 111 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_v_ending(z);
+        if (ret == 0) return 0; /* call v_ending, line 112 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_case_special(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 116 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 110 && z->p[z->c - 1] != 116)) return 0;
+    among_var = find_among_b(z, a_5, 3); /* substring, line 116 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 116 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 116 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 1, s_2); /* <-, line 117 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_3); /* <-, line 118 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_4); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_case_other(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 124 */
+    if (z->c - 3 <= z->lb || z->p[z->c - 1] != 108) return 0;
+    among_var = find_among_b(z, a_6, 6); /* substring, line 124 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 124 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 124 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 125 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 126 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_5); /* <-, line 127 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 1, s_6); /* <-, line 128 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_factive(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 133 */
+    if (z->c <= z->lb || (z->p[z->c - 1] != 225 && z->p[z->c - 1] != 233)) return 0;
+    among_var = find_among_b(z, a_7, 2); /* substring, line 133 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 133 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 133 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 134 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 135 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 137 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 138 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_plural(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 142 */
+    if (z->c <= z->lb || z->p[z->c - 1] != 107) return 0;
+    among_var = find_among_b(z, a_8, 7); /* substring, line 142 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 142 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 142 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 1, s_7); /* <-, line 143 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_8); /* <-, line 144 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 145 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 146 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_del(z); /* delete, line 147 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_del(z); /* delete, line 148 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_del(z); /* delete, line 149 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_owned(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 154 */
+    if (z->c <= z->lb || (z->p[z->c - 1] != 105 && z->p[z->c - 1] != 233)) return 0;
+    among_var = find_among_b(z, a_9, 12); /* substring, line 154 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 154 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 154 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 155 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_9); /* <-, line 156 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_10); /* <-, line 157 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 158 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 1, s_11); /* <-, line 159 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 1, s_12); /* <-, line 160 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_del(z); /* delete, line 161 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 162 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_del(z); /* delete, line 163 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_sing_owner(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 168 */
+    among_var = find_among_b(z, a_10, 31); /* substring, line 168 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 168 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 168 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 169 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_14); /* <-, line 170 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_15); /* <-, line 171 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 172 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 1, s_16); /* <-, line 173 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 1, s_17); /* <-, line 174 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_del(z); /* delete, line 175 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_del(z); /* delete, line 176 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_del(z); /* delete, line 177 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 1, s_18); /* <-, line 178 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 1, s_19); /* <-, line 179 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_del(z); /* delete, line 180 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = slice_del(z); /* delete, line 181 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_from_s(z, 1, s_20); /* <-, line 182 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 15:
+            {   int ret = slice_from_s(z, 1, s_21); /* <-, line 183 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 16:
+            {   int ret = slice_del(z); /* delete, line 184 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 17:
+            {   int ret = slice_del(z); /* delete, line 185 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 18:
+            {   int ret = slice_del(z); /* delete, line 186 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 19:
+            {   int ret = slice_from_s(z, 1, s_22); /* <-, line 187 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 20:
+            {   int ret = slice_from_s(z, 1, s_23); /* <-, line 188 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_plur_owner(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 193 */
+    if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((10768 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_11, 42); /* substring, line 193 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 193 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 193 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 194 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_24); /* <-, line 195 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_25); /* <-, line 196 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 197 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_del(z); /* delete, line 198 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_del(z); /* delete, line 199 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 1, s_26); /* <-, line 200 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 1, s_27); /* <-, line 201 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_del(z); /* delete, line 202 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_del(z); /* delete, line 203 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_del(z); /* delete, line 204 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_from_s(z, 1, s_28); /* <-, line 205 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = slice_from_s(z, 1, s_29); /* <-, line 206 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_del(z); /* delete, line 207 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 15:
+            {   int ret = slice_del(z); /* delete, line 208 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 16:
+            {   int ret = slice_del(z); /* delete, line 209 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 17:
+            {   int ret = slice_del(z); /* delete, line 210 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 18:
+            {   int ret = slice_from_s(z, 1, s_30); /* <-, line 211 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 19:
+            {   int ret = slice_from_s(z, 1, s_31); /* <-, line 212 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 20:
+            {   int ret = slice_del(z); /* delete, line 214 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 21:
+            {   int ret = slice_del(z); /* delete, line 215 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 22:
+            {   int ret = slice_from_s(z, 1, s_32); /* <-, line 216 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 23:
+            {   int ret = slice_from_s(z, 1, s_33); /* <-, line 217 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 24:
+            {   int ret = slice_del(z); /* delete, line 218 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 25:
+            {   int ret = slice_del(z); /* delete, line 219 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 26:
+            {   int ret = slice_del(z); /* delete, line 220 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 27:
+            {   int ret = slice_from_s(z, 1, s_34); /* <-, line 221 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 28:
+            {   int ret = slice_from_s(z, 1, s_35); /* <-, line 222 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 29:
+            {   int ret = slice_del(z); /* delete, line 223 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int hungarian_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 229 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 229 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 230 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 231 */
+        {   int ret = r_instrum(z);
+            if (ret == 0) goto lab1; /* call instrum, line 231 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 232 */
+        {   int ret = r_case(z);
+            if (ret == 0) goto lab2; /* call case, line 232 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 233 */
+        {   int ret = r_case_special(z);
+            if (ret == 0) goto lab3; /* call case_special, line 233 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 234 */
+        {   int ret = r_case_other(z);
+            if (ret == 0) goto lab4; /* call case_other, line 234 */
+            if (ret < 0) return ret;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m6 = z->l - z->c; (void)m6; /* do, line 235 */
+        {   int ret = r_factive(z);
+            if (ret == 0) goto lab5; /* call factive, line 235 */
+            if (ret < 0) return ret;
+        }
+    lab5:
+        z->c = z->l - m6;
+    }
+    {   int m7 = z->l - z->c; (void)m7; /* do, line 236 */
+        {   int ret = r_owned(z);
+            if (ret == 0) goto lab6; /* call owned, line 236 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m7;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 237 */
+        {   int ret = r_sing_owner(z);
+            if (ret == 0) goto lab7; /* call sing_owner, line 237 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = z->l - m8;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 238 */
+        {   int ret = r_plur_owner(z);
+            if (ret == 0) goto lab8; /* call plur_owner, line 238 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = z->l - m9;
+    }
+    {   int m10 = z->l - z->c; (void)m10; /* do, line 239 */
+        {   int ret = r_plural(z);
+            if (ret == 0) goto lab9; /* call plural, line 239 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m10;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * hungarian_ISO_8859_1_create_env(void) { return SN_create_env(0, 1, 0); }
+
+extern void hungarian_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_italian.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_italian.c
new file mode 100644
index 000000000000..d941b0f03632
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_italian.c
@@ -0,0 +1,1065 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int italian_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_vowel_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_attached_pronoun(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * italian_ISO_8859_1_create_env(void);
+extern void italian_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[2] = { 'q', 'u' };
+static const symbol s_0_2[1] = { 0xE1 };
+static const symbol s_0_3[1] = { 0xE9 };
+static const symbol s_0_4[1] = { 0xED };
+static const symbol s_0_5[1] = { 0xF3 };
+static const symbol s_0_6[1] = { 0xFA };
+
+static const struct among a_0[7] =
+{
+/*  0 */ { 0, 0, -1, 7, 0},
+/*  1 */ { 2, s_0_1, 0, 6, 0},
+/*  2 */ { 1, s_0_2, 0, 1, 0},
+/*  3 */ { 1, s_0_3, 0, 2, 0},
+/*  4 */ { 1, s_0_4, 0, 3, 0},
+/*  5 */ { 1, s_0_5, 0, 4, 0},
+/*  6 */ { 1, s_0_6, 0, 5, 0}
+};
+
+static const symbol s_1_1[1] = { 'I' };
+static const symbol s_1_2[1] = { 'U' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 1, s_1_1, 0, 1, 0},
+/*  2 */ { 1, s_1_2, 0, 2, 0}
+};
+
+static const symbol s_2_0[2] = { 'l', 'a' };
+static const symbol s_2_1[4] = { 'c', 'e', 'l', 'a' };
+static const symbol s_2_2[6] = { 'g', 'l', 'i', 'e', 'l', 'a' };
+static const symbol s_2_3[4] = { 'm', 'e', 'l', 'a' };
+static const symbol s_2_4[4] = { 't', 'e', 'l', 'a' };
+static const symbol s_2_5[4] = { 'v', 'e', 'l', 'a' };
+static const symbol s_2_6[2] = { 'l', 'e' };
+static const symbol s_2_7[4] = { 'c', 'e', 'l', 'e' };
+static const symbol s_2_8[6] = { 'g', 'l', 'i', 'e', 'l', 'e' };
+static const symbol s_2_9[4] = { 'm', 'e', 'l', 'e' };
+static const symbol s_2_10[4] = { 't', 'e', 'l', 'e' };
+static const symbol s_2_11[4] = { 'v', 'e', 'l', 'e' };
+static const symbol s_2_12[2] = { 'n', 'e' };
+static const symbol s_2_13[4] = { 'c', 'e', 'n', 'e' };
+static const symbol s_2_14[6] = { 'g', 'l', 'i', 'e', 'n', 'e' };
+static const symbol s_2_15[4] = { 'm', 'e', 'n', 'e' };
+static const symbol s_2_16[4] = { 's', 'e', 'n', 'e' };
+static const symbol s_2_17[4] = { 't', 'e', 'n', 'e' };
+static const symbol s_2_18[4] = { 'v', 'e', 'n', 'e' };
+static const symbol s_2_19[2] = { 'c', 'i' };
+static const symbol s_2_20[2] = { 'l', 'i' };
+static const symbol s_2_21[4] = { 'c', 'e', 'l', 'i' };
+static const symbol s_2_22[6] = { 'g', 'l', 'i', 'e', 'l', 'i' };
+static const symbol s_2_23[4] = { 'm', 'e', 'l', 'i' };
+static const symbol s_2_24[4] = { 't', 'e', 'l', 'i' };
+static const symbol s_2_25[4] = { 'v', 'e', 'l', 'i' };
+static const symbol s_2_26[3] = { 'g', 'l', 'i' };
+static const symbol s_2_27[2] = { 'm', 'i' };
+static const symbol s_2_28[2] = { 's', 'i' };
+static const symbol s_2_29[2] = { 't', 'i' };
+static const symbol s_2_30[2] = { 'v', 'i' };
+static const symbol s_2_31[2] = { 'l', 'o' };
+static const symbol s_2_32[4] = { 'c', 'e', 'l', 'o' };
+static const symbol s_2_33[6] = { 'g', 'l', 'i', 'e', 'l', 'o' };
+static const symbol s_2_34[4] = { 'm', 'e', 'l', 'o' };
+static const symbol s_2_35[4] = { 't', 'e', 'l', 'o' };
+static const symbol s_2_36[4] = { 'v', 'e', 'l', 'o' };
+
+static const struct among a_2[37] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 4, s_2_1, 0, -1, 0},
+/*  2 */ { 6, s_2_2, 0, -1, 0},
+/*  3 */ { 4, s_2_3, 0, -1, 0},
+/*  4 */ { 4, s_2_4, 0, -1, 0},
+/*  5 */ { 4, s_2_5, 0, -1, 0},
+/*  6 */ { 2, s_2_6, -1, -1, 0},
+/*  7 */ { 4, s_2_7, 6, -1, 0},
+/*  8 */ { 6, s_2_8, 6, -1, 0},
+/*  9 */ { 4, s_2_9, 6, -1, 0},
+/* 10 */ { 4, s_2_10, 6, -1, 0},
+/* 11 */ { 4, s_2_11, 6, -1, 0},
+/* 12 */ { 2, s_2_12, -1, -1, 0},
+/* 13 */ { 4, s_2_13, 12, -1, 0},
+/* 14 */ { 6, s_2_14, 12, -1, 0},
+/* 15 */ { 4, s_2_15, 12, -1, 0},
+/* 16 */ { 4, s_2_16, 12, -1, 0},
+/* 17 */ { 4, s_2_17, 12, -1, 0},
+/* 18 */ { 4, s_2_18, 12, -1, 0},
+/* 19 */ { 2, s_2_19, -1, -1, 0},
+/* 20 */ { 2, s_2_20, -1, -1, 0},
+/* 21 */ { 4, s_2_21, 20, -1, 0},
+/* 22 */ { 6, s_2_22, 20, -1, 0},
+/* 23 */ { 4, s_2_23, 20, -1, 0},
+/* 24 */ { 4, s_2_24, 20, -1, 0},
+/* 25 */ { 4, s_2_25, 20, -1, 0},
+/* 26 */ { 3, s_2_26, 20, -1, 0},
+/* 27 */ { 2, s_2_27, -1, -1, 0},
+/* 28 */ { 2, s_2_28, -1, -1, 0},
+/* 29 */ { 2, s_2_29, -1, -1, 0},
+/* 30 */ { 2, s_2_30, -1, -1, 0},
+/* 31 */ { 2, s_2_31, -1, -1, 0},
+/* 32 */ { 4, s_2_32, 31, -1, 0},
+/* 33 */ { 6, s_2_33, 31, -1, 0},
+/* 34 */ { 4, s_2_34, 31, -1, 0},
+/* 35 */ { 4, s_2_35, 31, -1, 0},
+/* 36 */ { 4, s_2_36, 31, -1, 0}
+};
+
+static const symbol s_3_0[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_3_1[4] = { 'e', 'n', 'd', 'o' };
+static const symbol s_3_2[2] = { 'a', 'r' };
+static const symbol s_3_3[2] = { 'e', 'r' };
+static const symbol s_3_4[2] = { 'i', 'r' };
+
+static const struct among a_3[5] =
+{
+/*  0 */ { 4, s_3_0, -1, 1, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0},
+/*  2 */ { 2, s_3_2, -1, 2, 0},
+/*  3 */ { 2, s_3_3, -1, 2, 0},
+/*  4 */ { 2, s_3_4, -1, 2, 0}
+};
+
+static const symbol s_4_0[2] = { 'i', 'c' };
+static const symbol s_4_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_4_2[2] = { 'o', 's' };
+static const symbol s_4_3[2] = { 'i', 'v' };
+
+static const struct among a_4[4] =
+{
+/*  0 */ { 2, s_4_0, -1, -1, 0},
+/*  1 */ { 4, s_4_1, -1, -1, 0},
+/*  2 */ { 2, s_4_2, -1, -1, 0},
+/*  3 */ { 2, s_4_3, -1, 1, 0}
+};
+
+static const symbol s_5_0[2] = { 'i', 'c' };
+static const symbol s_5_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_5_2[2] = { 'i', 'v' };
+
+static const struct among a_5[3] =
+{
+/*  0 */ { 2, s_5_0, -1, 1, 0},
+/*  1 */ { 4, s_5_1, -1, 1, 0},
+/*  2 */ { 2, s_5_2, -1, 1, 0}
+};
+
+static const symbol s_6_0[3] = { 'i', 'c', 'a' };
+static const symbol s_6_1[5] = { 'l', 'o', 'g', 'i', 'a' };
+static const symbol s_6_2[3] = { 'o', 's', 'a' };
+static const symbol s_6_3[4] = { 'i', 's', 't', 'a' };
+static const symbol s_6_4[3] = { 'i', 'v', 'a' };
+static const symbol s_6_5[4] = { 'a', 'n', 'z', 'a' };
+static const symbol s_6_6[4] = { 'e', 'n', 'z', 'a' };
+static const symbol s_6_7[3] = { 'i', 'c', 'e' };
+static const symbol s_6_8[6] = { 'a', 't', 'r', 'i', 'c', 'e' };
+static const symbol s_6_9[4] = { 'i', 'c', 'h', 'e' };
+static const symbol s_6_10[5] = { 'l', 'o', 'g', 'i', 'e' };
+static const symbol s_6_11[5] = { 'a', 'b', 'i', 'l', 'e' };
+static const symbol s_6_12[5] = { 'i', 'b', 'i', 'l', 'e' };
+static const symbol s_6_13[6] = { 'u', 's', 'i', 'o', 'n', 'e' };
+static const symbol s_6_14[6] = { 'a', 'z', 'i', 'o', 'n', 'e' };
+static const symbol s_6_15[6] = { 'u', 'z', 'i', 'o', 'n', 'e' };
+static const symbol s_6_16[5] = { 'a', 't', 'o', 'r', 'e' };
+static const symbol s_6_17[3] = { 'o', 's', 'e' };
+static const symbol s_6_18[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_6_19[5] = { 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_20[6] = { 'a', 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_21[4] = { 'i', 's', 't', 'e' };
+static const symbol s_6_22[3] = { 'i', 'v', 'e' };
+static const symbol s_6_23[4] = { 'a', 'n', 'z', 'e' };
+static const symbol s_6_24[4] = { 'e', 'n', 'z', 'e' };
+static const symbol s_6_25[3] = { 'i', 'c', 'i' };
+static const symbol s_6_26[6] = { 'a', 't', 'r', 'i', 'c', 'i' };
+static const symbol s_6_27[4] = { 'i', 'c', 'h', 'i' };
+static const symbol s_6_28[5] = { 'a', 'b', 'i', 'l', 'i' };
+static const symbol s_6_29[5] = { 'i', 'b', 'i', 'l', 'i' };
+static const symbol s_6_30[4] = { 'i', 's', 'm', 'i' };
+static const symbol s_6_31[6] = { 'u', 's', 'i', 'o', 'n', 'i' };
+static const symbol s_6_32[6] = { 'a', 'z', 'i', 'o', 'n', 'i' };
+static const symbol s_6_33[6] = { 'u', 'z', 'i', 'o', 'n', 'i' };
+static const symbol s_6_34[5] = { 'a', 't', 'o', 'r', 'i' };
+static const symbol s_6_35[3] = { 'o', 's', 'i' };
+static const symbol s_6_36[4] = { 'a', 'n', 't', 'i' };
+static const symbol s_6_37[6] = { 'a', 'm', 'e', 'n', 't', 'i' };
+static const symbol s_6_38[6] = { 'i', 'm', 'e', 'n', 't', 'i' };
+static const symbol s_6_39[4] = { 'i', 's', 't', 'i' };
+static const symbol s_6_40[3] = { 'i', 'v', 'i' };
+static const symbol s_6_41[3] = { 'i', 'c', 'o' };
+static const symbol s_6_42[4] = { 'i', 's', 'm', 'o' };
+static const symbol s_6_43[3] = { 'o', 's', 'o' };
+static const symbol s_6_44[6] = { 'a', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_6_45[6] = { 'i', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_6_46[3] = { 'i', 'v', 'o' };
+static const symbol s_6_47[3] = { 'i', 't', 0xE0 };
+static const symbol s_6_48[4] = { 'i', 's', 't', 0xE0 };
+static const symbol s_6_49[4] = { 'i', 's', 't', 0xE8 };
+static const symbol s_6_50[4] = { 'i', 's', 't', 0xEC };
+
+static const struct among a_6[51] =
+{
+/*  0 */ { 3, s_6_0, -1, 1, 0},
+/*  1 */ { 5, s_6_1, -1, 3, 0},
+/*  2 */ { 3, s_6_2, -1, 1, 0},
+/*  3 */ { 4, s_6_3, -1, 1, 0},
+/*  4 */ { 3, s_6_4, -1, 9, 0},
+/*  5 */ { 4, s_6_5, -1, 1, 0},
+/*  6 */ { 4, s_6_6, -1, 5, 0},
+/*  7 */ { 3, s_6_7, -1, 1, 0},
+/*  8 */ { 6, s_6_8, 7, 1, 0},
+/*  9 */ { 4, s_6_9, -1, 1, 0},
+/* 10 */ { 5, s_6_10, -1, 3, 0},
+/* 11 */ { 5, s_6_11, -1, 1, 0},
+/* 12 */ { 5, s_6_12, -1, 1, 0},
+/* 13 */ { 6, s_6_13, -1, 4, 0},
+/* 14 */ { 6, s_6_14, -1, 2, 0},
+/* 15 */ { 6, s_6_15, -1, 4, 0},
+/* 16 */ { 5, s_6_16, -1, 2, 0},
+/* 17 */ { 3, s_6_17, -1, 1, 0},
+/* 18 */ { 4, s_6_18, -1, 1, 0},
+/* 19 */ { 5, s_6_19, -1, 1, 0},
+/* 20 */ { 6, s_6_20, 19, 7, 0},
+/* 21 */ { 4, s_6_21, -1, 1, 0},
+/* 22 */ { 3, s_6_22, -1, 9, 0},
+/* 23 */ { 4, s_6_23, -1, 1, 0},
+/* 24 */ { 4, s_6_24, -1, 5, 0},
+/* 25 */ { 3, s_6_25, -1, 1, 0},
+/* 26 */ { 6, s_6_26, 25, 1, 0},
+/* 27 */ { 4, s_6_27, -1, 1, 0},
+/* 28 */ { 5, s_6_28, -1, 1, 0},
+/* 29 */ { 5, s_6_29, -1, 1, 0},
+/* 30 */ { 4, s_6_30, -1, 1, 0},
+/* 31 */ { 6, s_6_31, -1, 4, 0},
+/* 32 */ { 6, s_6_32, -1, 2, 0},
+/* 33 */ { 6, s_6_33, -1, 4, 0},
+/* 34 */ { 5, s_6_34, -1, 2, 0},
+/* 35 */ { 3, s_6_35, -1, 1, 0},
+/* 36 */ { 4, s_6_36, -1, 1, 0},
+/* 37 */ { 6, s_6_37, -1, 6, 0},
+/* 38 */ { 6, s_6_38, -1, 6, 0},
+/* 39 */ { 4, s_6_39, -1, 1, 0},
+/* 40 */ { 3, s_6_40, -1, 9, 0},
+/* 41 */ { 3, s_6_41, -1, 1, 0},
+/* 42 */ { 4, s_6_42, -1, 1, 0},
+/* 43 */ { 3, s_6_43, -1, 1, 0},
+/* 44 */ { 6, s_6_44, -1, 6, 0},
+/* 45 */ { 6, s_6_45, -1, 6, 0},
+/* 46 */ { 3, s_6_46, -1, 9, 0},
+/* 47 */ { 3, s_6_47, -1, 8, 0},
+/* 48 */ { 4, s_6_48, -1, 1, 0},
+/* 49 */ { 4, s_6_49, -1, 1, 0},
+/* 50 */ { 4, s_6_50, -1, 1, 0}
+};
+
+static const symbol s_7_0[4] = { 'i', 's', 'c', 'a' };
+static const symbol s_7_1[4] = { 'e', 'n', 'd', 'a' };
+static const symbol s_7_2[3] = { 'a', 't', 'a' };
+static const symbol s_7_3[3] = { 'i', 't', 'a' };
+static const symbol s_7_4[3] = { 'u', 't', 'a' };
+static const symbol s_7_5[3] = { 'a', 'v', 'a' };
+static const symbol s_7_6[3] = { 'e', 'v', 'a' };
+static const symbol s_7_7[3] = { 'i', 'v', 'a' };
+static const symbol s_7_8[6] = { 'e', 'r', 'e', 'b', 'b', 'e' };
+static const symbol s_7_9[6] = { 'i', 'r', 'e', 'b', 'b', 'e' };
+static const symbol s_7_10[4] = { 'i', 's', 'c', 'e' };
+static const symbol s_7_11[4] = { 'e', 'n', 'd', 'e' };
+static const symbol s_7_12[3] = { 'a', 'r', 'e' };
+static const symbol s_7_13[3] = { 'e', 'r', 'e' };
+static const symbol s_7_14[3] = { 'i', 'r', 'e' };
+static const symbol s_7_15[4] = { 'a', 's', 's', 'e' };
+static const symbol s_7_16[3] = { 'a', 't', 'e' };
+static const symbol s_7_17[5] = { 'a', 'v', 'a', 't', 'e' };
+static const symbol s_7_18[5] = { 'e', 'v', 'a', 't', 'e' };
+static const symbol s_7_19[5] = { 'i', 'v', 'a', 't', 'e' };
+static const symbol s_7_20[3] = { 'e', 't', 'e' };
+static const symbol s_7_21[5] = { 'e', 'r', 'e', 't', 'e' };
+static const symbol s_7_22[5] = { 'i', 'r', 'e', 't', 'e' };
+static const symbol s_7_23[3] = { 'i', 't', 'e' };
+static const symbol s_7_24[6] = { 'e', 'r', 'e', 's', 't', 'e' };
+static const symbol s_7_25[6] = { 'i', 'r', 'e', 's', 't', 'e' };
+static const symbol s_7_26[3] = { 'u', 't', 'e' };
+static const symbol s_7_27[4] = { 'e', 'r', 'a', 'i' };
+static const symbol s_7_28[4] = { 'i', 'r', 'a', 'i' };
+static const symbol s_7_29[4] = { 'i', 's', 'c', 'i' };
+static const symbol s_7_30[4] = { 'e', 'n', 'd', 'i' };
+static const symbol s_7_31[4] = { 'e', 'r', 'e', 'i' };
+static const symbol s_7_32[4] = { 'i', 'r', 'e', 'i' };
+static const symbol s_7_33[4] = { 'a', 's', 's', 'i' };
+static const symbol s_7_34[3] = { 'a', 't', 'i' };
+static const symbol s_7_35[3] = { 'i', 't', 'i' };
+static const symbol s_7_36[6] = { 'e', 'r', 'e', 's', 't', 'i' };
+static const symbol s_7_37[6] = { 'i', 'r', 'e', 's', 't', 'i' };
+static const symbol s_7_38[3] = { 'u', 't', 'i' };
+static const symbol s_7_39[3] = { 'a', 'v', 'i' };
+static const symbol s_7_40[3] = { 'e', 'v', 'i' };
+static const symbol s_7_41[3] = { 'i', 'v', 'i' };
+static const symbol s_7_42[4] = { 'i', 's', 'c', 'o' };
+static const symbol s_7_43[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_7_44[4] = { 'e', 'n', 'd', 'o' };
+static const symbol s_7_45[4] = { 'Y', 'a', 'm', 'o' };
+static const symbol s_7_46[4] = { 'i', 'a', 'm', 'o' };
+static const symbol s_7_47[5] = { 'a', 'v', 'a', 'm', 'o' };
+static const symbol s_7_48[5] = { 'e', 'v', 'a', 'm', 'o' };
+static const symbol s_7_49[5] = { 'i', 'v', 'a', 'm', 'o' };
+static const symbol s_7_50[5] = { 'e', 'r', 'e', 'm', 'o' };
+static const symbol s_7_51[5] = { 'i', 'r', 'e', 'm', 'o' };
+static const symbol s_7_52[6] = { 'a', 's', 's', 'i', 'm', 'o' };
+static const symbol s_7_53[4] = { 'a', 'm', 'm', 'o' };
+static const symbol s_7_54[4] = { 'e', 'm', 'm', 'o' };
+static const symbol s_7_55[6] = { 'e', 'r', 'e', 'm', 'm', 'o' };
+static const symbol s_7_56[6] = { 'i', 'r', 'e', 'm', 'm', 'o' };
+static const symbol s_7_57[4] = { 'i', 'm', 'm', 'o' };
+static const symbol s_7_58[3] = { 'a', 'n', 'o' };
+static const symbol s_7_59[6] = { 'i', 's', 'c', 'a', 'n', 'o' };
+static const symbol s_7_60[5] = { 'a', 'v', 'a', 'n', 'o' };
+static const symbol s_7_61[5] = { 'e', 'v', 'a', 'n', 'o' };
+static const symbol s_7_62[5] = { 'i', 'v', 'a', 'n', 'o' };
+static const symbol s_7_63[6] = { 'e', 'r', 'a', 'n', 'n', 'o' };
+static const symbol s_7_64[6] = { 'i', 'r', 'a', 'n', 'n', 'o' };
+static const symbol s_7_65[3] = { 'o', 'n', 'o' };
+static const symbol s_7_66[6] = { 'i', 's', 'c', 'o', 'n', 'o' };
+static const symbol s_7_67[5] = { 'a', 'r', 'o', 'n', 'o' };
+static const symbol s_7_68[5] = { 'e', 'r', 'o', 'n', 'o' };
+static const symbol s_7_69[5] = { 'i', 'r', 'o', 'n', 'o' };
+static const symbol s_7_70[8] = { 'e', 'r', 'e', 'b', 'b', 'e', 'r', 'o' };
+static const symbol s_7_71[8] = { 'i', 'r', 'e', 'b', 'b', 'e', 'r', 'o' };
+static const symbol s_7_72[6] = { 'a', 's', 's', 'e', 'r', 'o' };
+static const symbol s_7_73[6] = { 'e', 's', 's', 'e', 'r', 'o' };
+static const symbol s_7_74[6] = { 'i', 's', 's', 'e', 'r', 'o' };
+static const symbol s_7_75[3] = { 'a', 't', 'o' };
+static const symbol s_7_76[3] = { 'i', 't', 'o' };
+static const symbol s_7_77[3] = { 'u', 't', 'o' };
+static const symbol s_7_78[3] = { 'a', 'v', 'o' };
+static const symbol s_7_79[3] = { 'e', 'v', 'o' };
+static const symbol s_7_80[3] = { 'i', 'v', 'o' };
+static const symbol s_7_81[2] = { 'a', 'r' };
+static const symbol s_7_82[2] = { 'i', 'r' };
+static const symbol s_7_83[3] = { 'e', 'r', 0xE0 };
+static const symbol s_7_84[3] = { 'i', 'r', 0xE0 };
+static const symbol s_7_85[3] = { 'e', 'r', 0xF2 };
+static const symbol s_7_86[3] = { 'i', 'r', 0xF2 };
+
+static const struct among a_7[87] =
+{
+/*  0 */ { 4, s_7_0, -1, 1, 0},
+/*  1 */ { 4, s_7_1, -1, 1, 0},
+/*  2 */ { 3, s_7_2, -1, 1, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 3, s_7_4, -1, 1, 0},
+/*  5 */ { 3, s_7_5, -1, 1, 0},
+/*  6 */ { 3, s_7_6, -1, 1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 6, s_7_8, -1, 1, 0},
+/*  9 */ { 6, s_7_9, -1, 1, 0},
+/* 10 */ { 4, s_7_10, -1, 1, 0},
+/* 11 */ { 4, s_7_11, -1, 1, 0},
+/* 12 */ { 3, s_7_12, -1, 1, 0},
+/* 13 */ { 3, s_7_13, -1, 1, 0},
+/* 14 */ { 3, s_7_14, -1, 1, 0},
+/* 15 */ { 4, s_7_15, -1, 1, 0},
+/* 16 */ { 3, s_7_16, -1, 1, 0},
+/* 17 */ { 5, s_7_17, 16, 1, 0},
+/* 18 */ { 5, s_7_18, 16, 1, 0},
+/* 19 */ { 5, s_7_19, 16, 1, 0},
+/* 20 */ { 3, s_7_20, -1, 1, 0},
+/* 21 */ { 5, s_7_21, 20, 1, 0},
+/* 22 */ { 5, s_7_22, 20, 1, 0},
+/* 23 */ { 3, s_7_23, -1, 1, 0},
+/* 24 */ { 6, s_7_24, -1, 1, 0},
+/* 25 */ { 6, s_7_25, -1, 1, 0},
+/* 26 */ { 3, s_7_26, -1, 1, 0},
+/* 27 */ { 4, s_7_27, -1, 1, 0},
+/* 28 */ { 4, s_7_28, -1, 1, 0},
+/* 29 */ { 4, s_7_29, -1, 1, 0},
+/* 30 */ { 4, s_7_30, -1, 1, 0},
+/* 31 */ { 4, s_7_31, -1, 1, 0},
+/* 32 */ { 4, s_7_32, -1, 1, 0},
+/* 33 */ { 4, s_7_33, -1, 1, 0},
+/* 34 */ { 3, s_7_34, -1, 1, 0},
+/* 35 */ { 3, s_7_35, -1, 1, 0},
+/* 36 */ { 6, s_7_36, -1, 1, 0},
+/* 37 */ { 6, s_7_37, -1, 1, 0},
+/* 38 */ { 3, s_7_38, -1, 1, 0},
+/* 39 */ { 3, s_7_39, -1, 1, 0},
+/* 40 */ { 3, s_7_40, -1, 1, 0},
+/* 41 */ { 3, s_7_41, -1, 1, 0},
+/* 42 */ { 4, s_7_42, -1, 1, 0},
+/* 43 */ { 4, s_7_43, -1, 1, 0},
+/* 44 */ { 4, s_7_44, -1, 1, 0},
+/* 45 */ { 4, s_7_45, -1, 1, 0},
+/* 46 */ { 4, s_7_46, -1, 1, 0},
+/* 47 */ { 5, s_7_47, -1, 1, 0},
+/* 48 */ { 5, s_7_48, -1, 1, 0},
+/* 49 */ { 5, s_7_49, -1, 1, 0},
+/* 50 */ { 5, s_7_50, -1, 1, 0},
+/* 51 */ { 5, s_7_51, -1, 1, 0},
+/* 52 */ { 6, s_7_52, -1, 1, 0},
+/* 53 */ { 4, s_7_53, -1, 1, 0},
+/* 54 */ { 4, s_7_54, -1, 1, 0},
+/* 55 */ { 6, s_7_55, 54, 1, 0},
+/* 56 */ { 6, s_7_56, 54, 1, 0},
+/* 57 */ { 4, s_7_57, -1, 1, 0},
+/* 58 */ { 3, s_7_58, -1, 1, 0},
+/* 59 */ { 6, s_7_59, 58, 1, 0},
+/* 60 */ { 5, s_7_60, 58, 1, 0},
+/* 61 */ { 5, s_7_61, 58, 1, 0},
+/* 62 */ { 5, s_7_62, 58, 1, 0},
+/* 63 */ { 6, s_7_63, -1, 1, 0},
+/* 64 */ { 6, s_7_64, -1, 1, 0},
+/* 65 */ { 3, s_7_65, -1, 1, 0},
+/* 66 */ { 6, s_7_66, 65, 1, 0},
+/* 67 */ { 5, s_7_67, 65, 1, 0},
+/* 68 */ { 5, s_7_68, 65, 1, 0},
+/* 69 */ { 5, s_7_69, 65, 1, 0},
+/* 70 */ { 8, s_7_70, -1, 1, 0},
+/* 71 */ { 8, s_7_71, -1, 1, 0},
+/* 72 */ { 6, s_7_72, -1, 1, 0},
+/* 73 */ { 6, s_7_73, -1, 1, 0},
+/* 74 */ { 6, s_7_74, -1, 1, 0},
+/* 75 */ { 3, s_7_75, -1, 1, 0},
+/* 76 */ { 3, s_7_76, -1, 1, 0},
+/* 77 */ { 3, s_7_77, -1, 1, 0},
+/* 78 */ { 3, s_7_78, -1, 1, 0},
+/* 79 */ { 3, s_7_79, -1, 1, 0},
+/* 80 */ { 3, s_7_80, -1, 1, 0},
+/* 81 */ { 2, s_7_81, -1, 1, 0},
+/* 82 */ { 2, s_7_82, -1, 1, 0},
+/* 83 */ { 3, s_7_83, -1, 1, 0},
+/* 84 */ { 3, s_7_84, -1, 1, 0},
+/* 85 */ { 3, s_7_85, -1, 1, 0},
+/* 86 */ { 3, s_7_86, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 8, 2, 1 };
+
+static const unsigned char g_AEIO[] = { 17, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 8, 2 };
+
+static const unsigned char g_CG[] = { 17 };
+
+static const symbol s_0[] = { 0xE0 };
+static const symbol s_1[] = { 0xE8 };
+static const symbol s_2[] = { 0xEC };
+static const symbol s_3[] = { 0xF2 };
+static const symbol s_4[] = { 0xF9 };
+static const symbol s_5[] = { 'q', 'U' };
+static const symbol s_6[] = { 'u' };
+static const symbol s_7[] = { 'U' };
+static const symbol s_8[] = { 'i' };
+static const symbol s_9[] = { 'I' };
+static const symbol s_10[] = { 'i' };
+static const symbol s_11[] = { 'u' };
+static const symbol s_12[] = { 'e' };
+static const symbol s_13[] = { 'i', 'c' };
+static const symbol s_14[] = { 'l', 'o', 'g' };
+static const symbol s_15[] = { 'u' };
+static const symbol s_16[] = { 'e', 'n', 't', 'e' };
+static const symbol s_17[] = { 'a', 't' };
+static const symbol s_18[] = { 'a', 't' };
+static const symbol s_19[] = { 'i', 'c' };
+static const symbol s_20[] = { 'i' };
+static const symbol s_21[] = { 'h' };
+
+static int r_prelude(struct SN_env * z) {
+    int among_var;
+    {   int c_test = z->c; /* test, line 35 */
+        while(1) { /* repeat, line 35 */
+            int c1 = z->c;
+            z->bra = z->c; /* [, line 36 */
+            among_var = find_among(z, a_0, 7); /* substring, line 36 */
+            if (!(among_var)) goto lab0;
+            z->ket = z->c; /* ], line 36 */
+            switch(among_var) {
+                case 0: goto lab0;
+                case 1:
+                    {   int ret = slice_from_s(z, 1, s_0); /* <-, line 37 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    {   int ret = slice_from_s(z, 1, s_1); /* <-, line 38 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    {   int ret = slice_from_s(z, 1, s_2); /* <-, line 39 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 4:
+                    {   int ret = slice_from_s(z, 1, s_3); /* <-, line 40 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 5:
+                    {   int ret = slice_from_s(z, 1, s_4); /* <-, line 41 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 6:
+                    {   int ret = slice_from_s(z, 2, s_5); /* <-, line 42 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 7:
+                    if (z->c >= z->l) goto lab0;
+                    z->c++; /* next, line 43 */
+                    break;
+            }
+            continue;
+        lab0:
+            z->c = c1;
+            break;
+        }
+        z->c = c_test;
+    }
+    while(1) { /* repeat, line 46 */
+        int c2 = z->c;
+        while(1) { /* goto, line 46 */
+            int c3 = z->c;
+            if (in_grouping(z, g_v, 97, 249, 0)) goto lab2;
+            z->bra = z->c; /* [, line 47 */
+            {   int c4 = z->c; /* or, line 47 */
+                if (!(eq_s(z, 1, s_6))) goto lab4;
+                z->ket = z->c; /* ], line 47 */
+                if (in_grouping(z, g_v, 97, 249, 0)) goto lab4;
+                {   int ret = slice_from_s(z, 1, s_7); /* <-, line 47 */
+                    if (ret < 0) return ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c4;
+                if (!(eq_s(z, 1, s_8))) goto lab2;
+                z->ket = z->c; /* ], line 48 */
+                if (in_grouping(z, g_v, 97, 249, 0)) goto lab2;
+                {   int ret = slice_from_s(z, 1, s_9); /* <-, line 48 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab3:
+            z->c = c3;
+            break;
+        lab2:
+            z->c = c3;
+            if (z->c >= z->l) goto lab1;
+            z->c++; /* goto, line 46 */
+        }
+        continue;
+    lab1:
+        z->c = c2;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 58 */
+        {   int c2 = z->c; /* or, line 60 */
+            if (in_grouping(z, g_v, 97, 249, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 59 */
+                if (out_grouping(z, g_v, 97, 249, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 59 */
+                    int ret = out_grouping(z, g_v, 97, 249, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping(z, g_v, 97, 249, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 59 */
+                    int ret = in_grouping(z, g_v, 97, 249, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping(z, g_v, 97, 249, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 61 */
+                if (out_grouping(z, g_v, 97, 249, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 61 */
+                    int ret = out_grouping(z, g_v, 97, 249, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping(z, g_v, 97, 249, 0)) goto lab0;
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 61 */
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 62 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 64 */
+        {    /* gopast */ /* grouping v, line 65 */
+            int ret = out_grouping(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 65 */
+            int ret = in_grouping(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 65 */
+        {    /* gopast */ /* grouping v, line 66 */
+            int ret = out_grouping(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 66 */
+            int ret = in_grouping(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 66 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 70 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 72 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 73 && z->p[z->c + 0] != 85)) among_var = 3; else
+        among_var = find_among(z, a_1, 3); /* substring, line 72 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 72 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 73 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_11); /* <-, line 74 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 75 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_attached_pronoun(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 87 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((33314 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    if (!(find_among_b(z, a_2, 37))) return 0; /* substring, line 87 */
+    z->bra = z->c; /* ], line 87 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 111 && z->p[z->c - 1] != 114)) return 0;
+    among_var = find_among_b(z, a_3, 5); /* among, line 97 */
+    if (!(among_var)) return 0;
+    {   int ret = r_RV(z);
+        if (ret == 0) return 0; /* call RV, line 97 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 98 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_12); /* <-, line 99 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 104 */
+    among_var = find_among_b(z, a_6, 51); /* substring, line 104 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 104 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 111 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 111 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 113 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 113 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 114 */
+                z->ket = z->c; /* [, line 114 */
+                if (!(eq_s_b(z, 2, s_13))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 114 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 114 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 114 */
+                    if (ret < 0) return ret;
+                }
+            lab0:
+                ;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 117 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_14); /* <-, line 117 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 119 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_15); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 121 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 4, s_16); /* <-, line 121 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 123 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 123 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 125 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 125 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 126 */
+                z->ket = z->c; /* [, line 127 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4722696 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab1; }
+                among_var = find_among_b(z, a_4, 4); /* substring, line 127 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab1; }
+                z->bra = z->c; /* ], line 127 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 127 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 127 */
+                    if (ret < 0) return ret;
+                }
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab1; }
+                    case 1:
+                        z->ket = z->c; /* [, line 128 */
+                        if (!(eq_s_b(z, 2, s_17))) { z->c = z->l - m_keep; goto lab1; }
+                        z->bra = z->c; /* ], line 128 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 128 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 128 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab1:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 135 */
+                z->ket = z->c; /* [, line 136 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab2; }
+                among_var = find_among_b(z, a_5, 3); /* substring, line 136 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab2; }
+                z->bra = z->c; /* ], line 136 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab2; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call R2, line 137 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 137 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab2:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 142 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 142 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 143 */
+                z->ket = z->c; /* [, line 143 */
+                if (!(eq_s_b(z, 2, s_18))) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 143 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 143 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 143 */
+                    if (ret < 0) return ret;
+                }
+                z->ket = z->c; /* [, line 143 */
+                if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 143 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 143 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 143 */
+                    if (ret < 0) return ret;
+                }
+            lab3:
+                ;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 148 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 148 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 149 */
+        among_var = find_among_b(z, a_7, 87); /* substring, line 149 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 149 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 163 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_vowel_suffix(struct SN_env * z) {
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 171 */
+        z->ket = z->c; /* [, line 172 */
+        if (in_grouping_b(z, g_AEIO, 97, 242, 0)) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 172 */
+        {   int ret = r_RV(z);
+            if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call RV, line 172 */
+            if (ret < 0) return ret;
+        }
+        {   int ret = slice_del(z); /* delete, line 172 */
+            if (ret < 0) return ret;
+        }
+        z->ket = z->c; /* [, line 173 */
+        if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 173 */
+        {   int ret = r_RV(z);
+            if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call RV, line 173 */
+            if (ret < 0) return ret;
+        }
+        {   int ret = slice_del(z); /* delete, line 173 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        ;
+    }
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 175 */
+        z->ket = z->c; /* [, line 176 */
+        if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m_keep; goto lab1; }
+        z->bra = z->c; /* ], line 176 */
+        if (in_grouping_b(z, g_CG, 99, 103, 0)) { z->c = z->l - m_keep; goto lab1; }
+        {   int ret = r_RV(z);
+            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call RV, line 176 */
+            if (ret < 0) return ret;
+        }
+        {   int ret = slice_del(z); /* delete, line 176 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        ;
+    }
+    return 1;
+}
+
+extern int italian_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 182 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 182 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 183 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 183 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 184 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 185 */
+        {   int ret = r_attached_pronoun(z);
+            if (ret == 0) goto lab2; /* call attached_pronoun, line 185 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 186 */
+        {   int m5 = z->l - z->c; (void)m5; /* or, line 186 */
+            {   int ret = r_standard_suffix(z);
+                if (ret == 0) goto lab5; /* call standard_suffix, line 186 */
+                if (ret < 0) return ret;
+            }
+            goto lab4;
+        lab5:
+            z->c = z->l - m5;
+            {   int ret = r_verb_suffix(z);
+                if (ret == 0) goto lab3; /* call verb_suffix, line 186 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab4:
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m6 = z->l - z->c; (void)m6; /* do, line 187 */
+        {   int ret = r_vowel_suffix(z);
+            if (ret == 0) goto lab6; /* call vowel_suffix, line 187 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m6;
+    }
+    z->c = z->lb;
+    {   int c7 = z->c; /* do, line 189 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab7; /* call postlude, line 189 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = c7;
+    }
+    return 1;
+}
+
+extern struct SN_env * italian_ISO_8859_1_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void italian_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_norwegian.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_norwegian.c
new file mode 100644
index 000000000000..2debf1082d80
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_norwegian.c
@@ -0,0 +1,297 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int norwegian_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_other_suffix(struct SN_env * z);
+static int r_consonant_pair(struct SN_env * z);
+static int r_main_suffix(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * norwegian_ISO_8859_1_create_env(void);
+extern void norwegian_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[1] = { 'a' };
+static const symbol s_0_1[1] = { 'e' };
+static const symbol s_0_2[3] = { 'e', 'd', 'e' };
+static const symbol s_0_3[4] = { 'a', 'n', 'd', 'e' };
+static const symbol s_0_4[4] = { 'e', 'n', 'd', 'e' };
+static const symbol s_0_5[3] = { 'a', 'n', 'e' };
+static const symbol s_0_6[3] = { 'e', 'n', 'e' };
+static const symbol s_0_7[6] = { 'h', 'e', 't', 'e', 'n', 'e' };
+static const symbol s_0_8[4] = { 'e', 'r', 't', 'e' };
+static const symbol s_0_9[2] = { 'e', 'n' };
+static const symbol s_0_10[5] = { 'h', 'e', 't', 'e', 'n' };
+static const symbol s_0_11[2] = { 'a', 'r' };
+static const symbol s_0_12[2] = { 'e', 'r' };
+static const symbol s_0_13[5] = { 'h', 'e', 't', 'e', 'r' };
+static const symbol s_0_14[1] = { 's' };
+static const symbol s_0_15[2] = { 'a', 's' };
+static const symbol s_0_16[2] = { 'e', 's' };
+static const symbol s_0_17[4] = { 'e', 'd', 'e', 's' };
+static const symbol s_0_18[5] = { 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_19[4] = { 'e', 'n', 'e', 's' };
+static const symbol s_0_20[7] = { 'h', 'e', 't', 'e', 'n', 'e', 's' };
+static const symbol s_0_21[3] = { 'e', 'n', 's' };
+static const symbol s_0_22[6] = { 'h', 'e', 't', 'e', 'n', 's' };
+static const symbol s_0_23[3] = { 'e', 'r', 's' };
+static const symbol s_0_24[3] = { 'e', 't', 's' };
+static const symbol s_0_25[2] = { 'e', 't' };
+static const symbol s_0_26[3] = { 'h', 'e', 't' };
+static const symbol s_0_27[3] = { 'e', 'r', 't' };
+static const symbol s_0_28[3] = { 'a', 's', 't' };
+
+static const struct among a_0[29] =
+{
+/*  0 */ { 1, s_0_0, -1, 1, 0},
+/*  1 */ { 1, s_0_1, -1, 1, 0},
+/*  2 */ { 3, s_0_2, 1, 1, 0},
+/*  3 */ { 4, s_0_3, 1, 1, 0},
+/*  4 */ { 4, s_0_4, 1, 1, 0},
+/*  5 */ { 3, s_0_5, 1, 1, 0},
+/*  6 */ { 3, s_0_6, 1, 1, 0},
+/*  7 */ { 6, s_0_7, 6, 1, 0},
+/*  8 */ { 4, s_0_8, 1, 3, 0},
+/*  9 */ { 2, s_0_9, -1, 1, 0},
+/* 10 */ { 5, s_0_10, 9, 1, 0},
+/* 11 */ { 2, s_0_11, -1, 1, 0},
+/* 12 */ { 2, s_0_12, -1, 1, 0},
+/* 13 */ { 5, s_0_13, 12, 1, 0},
+/* 14 */ { 1, s_0_14, -1, 2, 0},
+/* 15 */ { 2, s_0_15, 14, 1, 0},
+/* 16 */ { 2, s_0_16, 14, 1, 0},
+/* 17 */ { 4, s_0_17, 16, 1, 0},
+/* 18 */ { 5, s_0_18, 16, 1, 0},
+/* 19 */ { 4, s_0_19, 16, 1, 0},
+/* 20 */ { 7, s_0_20, 19, 1, 0},
+/* 21 */ { 3, s_0_21, 14, 1, 0},
+/* 22 */ { 6, s_0_22, 21, 1, 0},
+/* 23 */ { 3, s_0_23, 14, 1, 0},
+/* 24 */ { 3, s_0_24, 14, 1, 0},
+/* 25 */ { 2, s_0_25, -1, 1, 0},
+/* 26 */ { 3, s_0_26, 25, 1, 0},
+/* 27 */ { 3, s_0_27, -1, 3, 0},
+/* 28 */ { 3, s_0_28, -1, 1, 0}
+};
+
+static const symbol s_1_0[2] = { 'd', 't' };
+static const symbol s_1_1[2] = { 'v', 't' };
+
+static const struct among a_1[2] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0}
+};
+
+static const symbol s_2_0[3] = { 'l', 'e', 'g' };
+static const symbol s_2_1[4] = { 'e', 'l', 'e', 'g' };
+static const symbol s_2_2[2] = { 'i', 'g' };
+static const symbol s_2_3[3] = { 'e', 'i', 'g' };
+static const symbol s_2_4[3] = { 'l', 'i', 'g' };
+static const symbol s_2_5[4] = { 'e', 'l', 'i', 'g' };
+static const symbol s_2_6[3] = { 'e', 'l', 's' };
+static const symbol s_2_7[3] = { 'l', 'o', 'v' };
+static const symbol s_2_8[4] = { 'e', 'l', 'o', 'v' };
+static const symbol s_2_9[4] = { 's', 'l', 'o', 'v' };
+static const symbol s_2_10[7] = { 'h', 'e', 't', 's', 'l', 'o', 'v' };
+
+static const struct among a_2[11] =
+{
+/*  0 */ { 3, s_2_0, -1, 1, 0},
+/*  1 */ { 4, s_2_1, 0, 1, 0},
+/*  2 */ { 2, s_2_2, -1, 1, 0},
+/*  3 */ { 3, s_2_3, 2, 1, 0},
+/*  4 */ { 3, s_2_4, 2, 1, 0},
+/*  5 */ { 4, s_2_5, 4, 1, 0},
+/*  6 */ { 3, s_2_6, -1, 1, 0},
+/*  7 */ { 3, s_2_7, -1, 1, 0},
+/*  8 */ { 4, s_2_8, 7, 1, 0},
+/*  9 */ { 4, s_2_9, 7, 1, 0},
+/* 10 */ { 7, s_2_10, 9, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 128 };
+
+static const unsigned char g_s_ending[] = { 119, 125, 149, 1 };
+
+static const symbol s_0[] = { 'k' };
+static const symbol s_1[] = { 'e', 'r' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c_test = z->c; /* test, line 30 */
+        {   int ret = z->c + 3;
+            if (0 > ret || ret > z->l) return 0;
+            z->c = ret; /* hop, line 30 */
+        }
+        z->I[1] = z->c; /* setmark x, line 30 */
+        z->c = c_test;
+    }
+    if (out_grouping(z, g_v, 97, 248, 1) < 0) return 0; /* goto */ /* grouping v, line 31 */
+    {    /* gopast */ /* non v, line 31 */
+        int ret = in_grouping(z, g_v, 97, 248, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 31 */
+     /* try, line 32 */
+    if (!(z->I[0] < z->I[1])) goto lab0;
+    z->I[0] = z->I[1];
+lab0:
+    return 1;
+}
+
+static int r_main_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 38 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 38 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 38 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851426 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_0, 29); /* substring, line 38 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 38 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 44 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m2 = z->l - z->c; (void)m2; /* or, line 46 */
+                if (in_grouping_b(z, g_s_ending, 98, 122, 0)) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m2;
+                if (!(eq_s_b(z, 1, s_0))) return 0;
+                if (out_grouping_b(z, g_v, 97, 248, 0)) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 46 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 2, s_1); /* <-, line 48 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_consonant_pair(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 53 */
+        {   int mlimit; /* setlimit, line 54 */
+            int m1 = z->l - z->c; (void)m1;
+            if (z->c < z->I[0]) return 0;
+            z->c = z->I[0]; /* tomark, line 54 */
+            mlimit = z->lb; z->lb = z->c;
+            z->c = z->l - m1;
+            z->ket = z->c; /* [, line 54 */
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] != 116) { z->lb = mlimit; return 0; }
+            if (!(find_among_b(z, a_1, 2))) { z->lb = mlimit; return 0; } /* substring, line 54 */
+            z->bra = z->c; /* ], line 54 */
+            z->lb = mlimit;
+        }
+        z->c = z->l - m_test;
+    }
+    if (z->c <= z->lb) return 0;
+    z->c--; /* next, line 59 */
+    z->bra = z->c; /* ], line 59 */
+    {   int ret = slice_del(z); /* delete, line 59 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_other_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 63 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 63 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 63 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4718720 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_2, 11); /* substring, line 63 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 63 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 67 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int norwegian_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 74 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 74 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 75 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 76 */
+        {   int ret = r_main_suffix(z);
+            if (ret == 0) goto lab1; /* call main_suffix, line 76 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 77 */
+        {   int ret = r_consonant_pair(z);
+            if (ret == 0) goto lab2; /* call consonant_pair, line 77 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 78 */
+        {   int ret = r_other_suffix(z);
+            if (ret == 0) goto lab3; /* call other_suffix, line 78 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * norwegian_ISO_8859_1_create_env(void) { return SN_create_env(0, 2, 0); }
+
+extern void norwegian_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_porter.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_porter.c
new file mode 100644
index 000000000000..69e4fc4c1f22
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_porter.c
@@ -0,0 +1,749 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int porter_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_Step_5b(struct SN_env * z);
+static int r_Step_5a(struct SN_env * z);
+static int r_Step_4(struct SN_env * z);
+static int r_Step_3(struct SN_env * z);
+static int r_Step_2(struct SN_env * z);
+static int r_Step_1c(struct SN_env * z);
+static int r_Step_1b(struct SN_env * z);
+static int r_Step_1a(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_shortv(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * porter_ISO_8859_1_create_env(void);
+extern void porter_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[1] = { 's' };
+static const symbol s_0_1[3] = { 'i', 'e', 's' };
+static const symbol s_0_2[4] = { 's', 's', 'e', 's' };
+static const symbol s_0_3[2] = { 's', 's' };
+
+static const struct among a_0[4] =
+{
+/*  0 */ { 1, s_0_0, -1, 3, 0},
+/*  1 */ { 3, s_0_1, 0, 2, 0},
+/*  2 */ { 4, s_0_2, 0, 1, 0},
+/*  3 */ { 2, s_0_3, 0, -1, 0}
+};
+
+static const symbol s_1_1[2] = { 'b', 'b' };
+static const symbol s_1_2[2] = { 'd', 'd' };
+static const symbol s_1_3[2] = { 'f', 'f' };
+static const symbol s_1_4[2] = { 'g', 'g' };
+static const symbol s_1_5[2] = { 'b', 'l' };
+static const symbol s_1_6[2] = { 'm', 'm' };
+static const symbol s_1_7[2] = { 'n', 'n' };
+static const symbol s_1_8[2] = { 'p', 'p' };
+static const symbol s_1_9[2] = { 'r', 'r' };
+static const symbol s_1_10[2] = { 'a', 't' };
+static const symbol s_1_11[2] = { 't', 't' };
+static const symbol s_1_12[2] = { 'i', 'z' };
+
+static const struct among a_1[13] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 2, s_1_1, 0, 2, 0},
+/*  2 */ { 2, s_1_2, 0, 2, 0},
+/*  3 */ { 2, s_1_3, 0, 2, 0},
+/*  4 */ { 2, s_1_4, 0, 2, 0},
+/*  5 */ { 2, s_1_5, 0, 1, 0},
+/*  6 */ { 2, s_1_6, 0, 2, 0},
+/*  7 */ { 2, s_1_7, 0, 2, 0},
+/*  8 */ { 2, s_1_8, 0, 2, 0},
+/*  9 */ { 2, s_1_9, 0, 2, 0},
+/* 10 */ { 2, s_1_10, 0, 1, 0},
+/* 11 */ { 2, s_1_11, 0, 2, 0},
+/* 12 */ { 2, s_1_12, 0, 1, 0}
+};
+
+static const symbol s_2_0[2] = { 'e', 'd' };
+static const symbol s_2_1[3] = { 'e', 'e', 'd' };
+static const symbol s_2_2[3] = { 'i', 'n', 'g' };
+
+static const struct among a_2[3] =
+{
+/*  0 */ { 2, s_2_0, -1, 2, 0},
+/*  1 */ { 3, s_2_1, 0, 1, 0},
+/*  2 */ { 3, s_2_2, -1, 2, 0}
+};
+
+static const symbol s_3_0[4] = { 'a', 'n', 'c', 'i' };
+static const symbol s_3_1[4] = { 'e', 'n', 'c', 'i' };
+static const symbol s_3_2[4] = { 'a', 'b', 'l', 'i' };
+static const symbol s_3_3[3] = { 'e', 'l', 'i' };
+static const symbol s_3_4[4] = { 'a', 'l', 'l', 'i' };
+static const symbol s_3_5[5] = { 'o', 'u', 's', 'l', 'i' };
+static const symbol s_3_6[5] = { 'e', 'n', 't', 'l', 'i' };
+static const symbol s_3_7[5] = { 'a', 'l', 'i', 't', 'i' };
+static const symbol s_3_8[6] = { 'b', 'i', 'l', 'i', 't', 'i' };
+static const symbol s_3_9[5] = { 'i', 'v', 'i', 't', 'i' };
+static const symbol s_3_10[6] = { 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_3_11[7] = { 'a', 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_3_12[5] = { 'a', 'l', 'i', 's', 'm' };
+static const symbol s_3_13[5] = { 'a', 't', 'i', 'o', 'n' };
+static const symbol s_3_14[7] = { 'i', 'z', 'a', 't', 'i', 'o', 'n' };
+static const symbol s_3_15[4] = { 'i', 'z', 'e', 'r' };
+static const symbol s_3_16[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_3_17[7] = { 'i', 'v', 'e', 'n', 'e', 's', 's' };
+static const symbol s_3_18[7] = { 'f', 'u', 'l', 'n', 'e', 's', 's' };
+static const symbol s_3_19[7] = { 'o', 'u', 's', 'n', 'e', 's', 's' };
+
+static const struct among a_3[20] =
+{
+/*  0 */ { 4, s_3_0, -1, 3, 0},
+/*  1 */ { 4, s_3_1, -1, 2, 0},
+/*  2 */ { 4, s_3_2, -1, 4, 0},
+/*  3 */ { 3, s_3_3, -1, 6, 0},
+/*  4 */ { 4, s_3_4, -1, 9, 0},
+/*  5 */ { 5, s_3_5, -1, 12, 0},
+/*  6 */ { 5, s_3_6, -1, 5, 0},
+/*  7 */ { 5, s_3_7, -1, 10, 0},
+/*  8 */ { 6, s_3_8, -1, 14, 0},
+/*  9 */ { 5, s_3_9, -1, 13, 0},
+/* 10 */ { 6, s_3_10, -1, 1, 0},
+/* 11 */ { 7, s_3_11, 10, 8, 0},
+/* 12 */ { 5, s_3_12, -1, 10, 0},
+/* 13 */ { 5, s_3_13, -1, 8, 0},
+/* 14 */ { 7, s_3_14, 13, 7, 0},
+/* 15 */ { 4, s_3_15, -1, 7, 0},
+/* 16 */ { 4, s_3_16, -1, 8, 0},
+/* 17 */ { 7, s_3_17, -1, 13, 0},
+/* 18 */ { 7, s_3_18, -1, 11, 0},
+/* 19 */ { 7, s_3_19, -1, 12, 0}
+};
+
+static const symbol s_4_0[5] = { 'i', 'c', 'a', 't', 'e' };
+static const symbol s_4_1[5] = { 'a', 't', 'i', 'v', 'e' };
+static const symbol s_4_2[5] = { 'a', 'l', 'i', 'z', 'e' };
+static const symbol s_4_3[5] = { 'i', 'c', 'i', 't', 'i' };
+static const symbol s_4_4[4] = { 'i', 'c', 'a', 'l' };
+static const symbol s_4_5[3] = { 'f', 'u', 'l' };
+static const symbol s_4_6[4] = { 'n', 'e', 's', 's' };
+
+static const struct among a_4[7] =
+{
+/*  0 */ { 5, s_4_0, -1, 2, 0},
+/*  1 */ { 5, s_4_1, -1, 3, 0},
+/*  2 */ { 5, s_4_2, -1, 1, 0},
+/*  3 */ { 5, s_4_3, -1, 2, 0},
+/*  4 */ { 4, s_4_4, -1, 2, 0},
+/*  5 */ { 3, s_4_5, -1, 3, 0},
+/*  6 */ { 4, s_4_6, -1, 3, 0}
+};
+
+static const symbol s_5_0[2] = { 'i', 'c' };
+static const symbol s_5_1[4] = { 'a', 'n', 'c', 'e' };
+static const symbol s_5_2[4] = { 'e', 'n', 'c', 'e' };
+static const symbol s_5_3[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_5_4[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_5_5[3] = { 'a', 't', 'e' };
+static const symbol s_5_6[3] = { 'i', 'v', 'e' };
+static const symbol s_5_7[3] = { 'i', 'z', 'e' };
+static const symbol s_5_8[3] = { 'i', 't', 'i' };
+static const symbol s_5_9[2] = { 'a', 'l' };
+static const symbol s_5_10[3] = { 'i', 's', 'm' };
+static const symbol s_5_11[3] = { 'i', 'o', 'n' };
+static const symbol s_5_12[2] = { 'e', 'r' };
+static const symbol s_5_13[3] = { 'o', 'u', 's' };
+static const symbol s_5_14[3] = { 'a', 'n', 't' };
+static const symbol s_5_15[3] = { 'e', 'n', 't' };
+static const symbol s_5_16[4] = { 'm', 'e', 'n', 't' };
+static const symbol s_5_17[5] = { 'e', 'm', 'e', 'n', 't' };
+static const symbol s_5_18[2] = { 'o', 'u' };
+
+static const struct among a_5[19] =
+{
+/*  0 */ { 2, s_5_0, -1, 1, 0},
+/*  1 */ { 4, s_5_1, -1, 1, 0},
+/*  2 */ { 4, s_5_2, -1, 1, 0},
+/*  3 */ { 4, s_5_3, -1, 1, 0},
+/*  4 */ { 4, s_5_4, -1, 1, 0},
+/*  5 */ { 3, s_5_5, -1, 1, 0},
+/*  6 */ { 3, s_5_6, -1, 1, 0},
+/*  7 */ { 3, s_5_7, -1, 1, 0},
+/*  8 */ { 3, s_5_8, -1, 1, 0},
+/*  9 */ { 2, s_5_9, -1, 1, 0},
+/* 10 */ { 3, s_5_10, -1, 1, 0},
+/* 11 */ { 3, s_5_11, -1, 2, 0},
+/* 12 */ { 2, s_5_12, -1, 1, 0},
+/* 13 */ { 3, s_5_13, -1, 1, 0},
+/* 14 */ { 3, s_5_14, -1, 1, 0},
+/* 15 */ { 3, s_5_15, -1, 1, 0},
+/* 16 */ { 4, s_5_16, 15, 1, 0},
+/* 17 */ { 5, s_5_17, 16, 1, 0},
+/* 18 */ { 2, s_5_18, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1 };
+
+static const unsigned char g_v_WXY[] = { 1, 17, 65, 208, 1 };
+
+static const symbol s_0[] = { 's', 's' };
+static const symbol s_1[] = { 'i' };
+static const symbol s_2[] = { 'e', 'e' };
+static const symbol s_3[] = { 'e' };
+static const symbol s_4[] = { 'e' };
+static const symbol s_5[] = { 'y' };
+static const symbol s_6[] = { 'Y' };
+static const symbol s_7[] = { 'i' };
+static const symbol s_8[] = { 't', 'i', 'o', 'n' };
+static const symbol s_9[] = { 'e', 'n', 'c', 'e' };
+static const symbol s_10[] = { 'a', 'n', 'c', 'e' };
+static const symbol s_11[] = { 'a', 'b', 'l', 'e' };
+static const symbol s_12[] = { 'e', 'n', 't' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'i', 'z', 'e' };
+static const symbol s_15[] = { 'a', 't', 'e' };
+static const symbol s_16[] = { 'a', 'l' };
+static const symbol s_17[] = { 'a', 'l' };
+static const symbol s_18[] = { 'f', 'u', 'l' };
+static const symbol s_19[] = { 'o', 'u', 's' };
+static const symbol s_20[] = { 'i', 'v', 'e' };
+static const symbol s_21[] = { 'b', 'l', 'e' };
+static const symbol s_22[] = { 'a', 'l' };
+static const symbol s_23[] = { 'i', 'c' };
+static const symbol s_24[] = { 's' };
+static const symbol s_25[] = { 't' };
+static const symbol s_26[] = { 'e' };
+static const symbol s_27[] = { 'l' };
+static const symbol s_28[] = { 'l' };
+static const symbol s_29[] = { 'y' };
+static const symbol s_30[] = { 'Y' };
+static const symbol s_31[] = { 'y' };
+static const symbol s_32[] = { 'Y' };
+static const symbol s_33[] = { 'Y' };
+static const symbol s_34[] = { 'y' };
+
+static int r_shortv(struct SN_env * z) {
+    if (out_grouping_b(z, g_v_WXY, 89, 121, 0)) return 0;
+    if (in_grouping_b(z, g_v, 97, 121, 0)) return 0;
+    if (out_grouping_b(z, g_v, 97, 121, 0)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_Step_1a(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 25 */
+    if (z->c <= z->lb || z->p[z->c - 1] != 115) return 0;
+    among_var = find_among_b(z, a_0, 4); /* substring, line 25 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 25 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 2, s_0); /* <-, line 26 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_1); /* <-, line 27 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 29 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1b(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 34 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 103)) return 0;
+    among_var = find_among_b(z, a_2, 3); /* substring, line 34 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 34 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 35 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 2, s_2); /* <-, line 35 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m_test = z->l - z->c; /* test, line 38 */
+                {    /* gopast */ /* grouping v, line 38 */
+                    int ret = out_grouping_b(z, g_v, 97, 121, 1);
+                    if (ret < 0) return 0;
+                    z->c -= ret;
+                }
+                z->c = z->l - m_test;
+            }
+            {   int ret = slice_del(z); /* delete, line 38 */
+                if (ret < 0) return ret;
+            }
+            {   int m_test = z->l - z->c; /* test, line 39 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((68514004 >> (z->p[z->c - 1] & 0x1f)) & 1)) among_var = 3; else
+                among_var = find_among_b(z, a_1, 13); /* substring, line 39 */
+                if (!(among_var)) return 0;
+                z->c = z->l - m_test;
+            }
+            switch(among_var) {
+                case 0: return 0;
+                case 1:
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_3); /* <+, line 41 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    z->ket = z->c; /* [, line 44 */
+                    if (z->c <= z->lb) return 0;
+                    z->c--; /* next, line 44 */
+                    z->bra = z->c; /* ], line 44 */
+                    {   int ret = slice_del(z); /* delete, line 44 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    if (z->c != z->I[0]) return 0; /* atmark, line 45 */
+                    {   int m_test = z->l - z->c; /* test, line 45 */
+                        {   int ret = r_shortv(z);
+                            if (ret == 0) return 0; /* call shortv, line 45 */
+                            if (ret < 0) return ret;
+                        }
+                        z->c = z->l - m_test;
+                    }
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_4); /* <+, line 45 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1c(struct SN_env * z) {
+    z->ket = z->c; /* [, line 52 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 52 */
+        if (!(eq_s_b(z, 1, s_5))) goto lab1;
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        if (!(eq_s_b(z, 1, s_6))) return 0;
+    }
+lab0:
+    z->bra = z->c; /* ], line 52 */
+    {    /* gopast */ /* grouping v, line 53 */
+        int ret = out_grouping_b(z, g_v, 97, 121, 1);
+        if (ret < 0) return 0;
+        z->c -= ret;
+    }
+    {   int ret = slice_from_s(z, 1, s_7); /* <-, line 54 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_Step_2(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 58 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((815616 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_3, 20); /* substring, line 58 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 58 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 58 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 4, s_8); /* <-, line 59 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 4, s_9); /* <-, line 60 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 4, s_10); /* <-, line 61 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 4, s_11); /* <-, line 62 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 3, s_12); /* <-, line 63 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 64 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 3, s_14); /* <-, line 66 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 3, s_15); /* <-, line 68 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 2, s_16); /* <-, line 69 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 2, s_17); /* <-, line 71 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 3, s_18); /* <-, line 72 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_from_s(z, 3, s_19); /* <-, line 74 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = slice_from_s(z, 3, s_20); /* <-, line 76 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_from_s(z, 3, s_21); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_3(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 82 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((528928 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_4, 7); /* substring, line 82 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 82 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 82 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 2, s_22); /* <-, line 83 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 2, s_23); /* <-, line 85 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 87 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_4(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 92 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((3961384 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_5, 19); /* substring, line 92 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 92 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 92 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 95 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 96 */
+                if (!(eq_s_b(z, 1, s_24))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_25))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 96 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_5a(struct SN_env * z) {
+    z->ket = z->c; /* [, line 101 */
+    if (!(eq_s_b(z, 1, s_26))) return 0;
+    z->bra = z->c; /* ], line 101 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 102 */
+        {   int ret = r_R2(z);
+            if (ret == 0) goto lab1; /* call R2, line 102 */
+            if (ret < 0) return ret;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int ret = r_R1(z);
+            if (ret == 0) return 0; /* call R1, line 102 */
+            if (ret < 0) return ret;
+        }
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 102 */
+            {   int ret = r_shortv(z);
+                if (ret == 0) goto lab2; /* call shortv, line 102 */
+                if (ret < 0) return ret;
+            }
+            return 0;
+        lab2:
+            z->c = z->l - m2;
+        }
+    }
+lab0:
+    {   int ret = slice_del(z); /* delete, line 103 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_Step_5b(struct SN_env * z) {
+    z->ket = z->c; /* [, line 107 */
+    if (!(eq_s_b(z, 1, s_27))) return 0;
+    z->bra = z->c; /* ], line 107 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 108 */
+        if (ret < 0) return ret;
+    }
+    if (!(eq_s_b(z, 1, s_28))) return 0;
+    {   int ret = slice_del(z); /* delete, line 109 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int porter_ISO_8859_1_stem(struct SN_env * z) {
+    z->B[0] = 0; /* unset Y_found, line 115 */
+    {   int c1 = z->c; /* do, line 116 */
+        z->bra = z->c; /* [, line 116 */
+        if (!(eq_s(z, 1, s_29))) goto lab0;
+        z->ket = z->c; /* ], line 116 */
+        {   int ret = slice_from_s(z, 1, s_30); /* <-, line 116 */
+            if (ret < 0) return ret;
+        }
+        z->B[0] = 1; /* set Y_found, line 116 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 117 */
+        while(1) { /* repeat, line 117 */
+            int c3 = z->c;
+            while(1) { /* goto, line 117 */
+                int c4 = z->c;
+                if (in_grouping(z, g_v, 97, 121, 0)) goto lab3;
+                z->bra = z->c; /* [, line 117 */
+                if (!(eq_s(z, 1, s_31))) goto lab3;
+                z->ket = z->c; /* ], line 117 */
+                z->c = c4;
+                break;
+            lab3:
+                z->c = c4;
+                if (z->c >= z->l) goto lab2;
+                z->c++; /* goto, line 117 */
+            }
+            {   int ret = slice_from_s(z, 1, s_32); /* <-, line 117 */
+                if (ret < 0) return ret;
+            }
+            z->B[0] = 1; /* set Y_found, line 117 */
+            continue;
+        lab2:
+            z->c = c3;
+            break;
+        }
+        z->c = c2;
+    }
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c5 = z->c; /* do, line 121 */
+        {    /* gopast */ /* grouping v, line 122 */
+            int ret = out_grouping(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 122 */
+            int ret = in_grouping(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[0] = z->c; /* setmark p1, line 122 */
+        {    /* gopast */ /* grouping v, line 123 */
+            int ret = out_grouping(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 123 */
+            int ret = in_grouping(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p2, line 123 */
+    lab4:
+        z->c = c5;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 126 */
+
+    {   int m6 = z->l - z->c; (void)m6; /* do, line 127 */
+        {   int ret = r_Step_1a(z);
+            if (ret == 0) goto lab5; /* call Step_1a, line 127 */
+            if (ret < 0) return ret;
+        }
+    lab5:
+        z->c = z->l - m6;
+    }
+    {   int m7 = z->l - z->c; (void)m7; /* do, line 128 */
+        {   int ret = r_Step_1b(z);
+            if (ret == 0) goto lab6; /* call Step_1b, line 128 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m7;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 129 */
+        {   int ret = r_Step_1c(z);
+            if (ret == 0) goto lab7; /* call Step_1c, line 129 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = z->l - m8;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 130 */
+        {   int ret = r_Step_2(z);
+            if (ret == 0) goto lab8; /* call Step_2, line 130 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = z->l - m9;
+    }
+    {   int m10 = z->l - z->c; (void)m10; /* do, line 131 */
+        {   int ret = r_Step_3(z);
+            if (ret == 0) goto lab9; /* call Step_3, line 131 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m10;
+    }
+    {   int m11 = z->l - z->c; (void)m11; /* do, line 132 */
+        {   int ret = r_Step_4(z);
+            if (ret == 0) goto lab10; /* call Step_4, line 132 */
+            if (ret < 0) return ret;
+        }
+    lab10:
+        z->c = z->l - m11;
+    }
+    {   int m12 = z->l - z->c; (void)m12; /* do, line 133 */
+        {   int ret = r_Step_5a(z);
+            if (ret == 0) goto lab11; /* call Step_5a, line 133 */
+            if (ret < 0) return ret;
+        }
+    lab11:
+        z->c = z->l - m12;
+    }
+    {   int m13 = z->l - z->c; (void)m13; /* do, line 134 */
+        {   int ret = r_Step_5b(z);
+            if (ret == 0) goto lab12; /* call Step_5b, line 134 */
+            if (ret < 0) return ret;
+        }
+    lab12:
+        z->c = z->l - m13;
+    }
+    z->c = z->lb;
+    {   int c14 = z->c; /* do, line 137 */
+        if (!(z->B[0])) goto lab13; /* Boolean test Y_found, line 137 */
+        while(1) { /* repeat, line 137 */
+            int c15 = z->c;
+            while(1) { /* goto, line 137 */
+                int c16 = z->c;
+                z->bra = z->c; /* [, line 137 */
+                if (!(eq_s(z, 1, s_33))) goto lab15;
+                z->ket = z->c; /* ], line 137 */
+                z->c = c16;
+                break;
+            lab15:
+                z->c = c16;
+                if (z->c >= z->l) goto lab14;
+                z->c++; /* goto, line 137 */
+            }
+            {   int ret = slice_from_s(z, 1, s_34); /* <-, line 137 */
+                if (ret < 0) return ret;
+            }
+            continue;
+        lab14:
+            z->c = c15;
+            break;
+        }
+    lab13:
+        z->c = c14;
+    }
+    return 1;
+}
+
+extern struct SN_env * porter_ISO_8859_1_create_env(void) { return SN_create_env(0, 2, 1); }
+
+extern void porter_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_portuguese.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_portuguese.c
new file mode 100644
index 000000000000..06d425d008f8
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_portuguese.c
@@ -0,0 +1,1017 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int portuguese_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_residual_form(struct SN_env * z);
+static int r_residual_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * portuguese_ISO_8859_1_create_env(void);
+extern void portuguese_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 0xE3 };
+static const symbol s_0_2[1] = { 0xF5 };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 1, s_0_1, 0, 1, 0},
+/*  2 */ { 1, s_0_2, 0, 2, 0}
+};
+
+static const symbol s_1_1[2] = { 'a', '~' };
+static const symbol s_1_2[2] = { 'o', '~' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 2, s_1_1, 0, 1, 0},
+/*  2 */ { 2, s_1_2, 0, 2, 0}
+};
+
+static const symbol s_2_0[2] = { 'i', 'c' };
+static const symbol s_2_1[2] = { 'a', 'd' };
+static const symbol s_2_2[2] = { 'o', 's' };
+static const symbol s_2_3[2] = { 'i', 'v' };
+
+static const struct among a_2[4] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 2, s_2_2, -1, -1, 0},
+/*  3 */ { 2, s_2_3, -1, 1, 0}
+};
+
+static const symbol s_3_0[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_3_1[4] = { 'a', 'v', 'e', 'l' };
+static const symbol s_3_2[4] = { 0xED, 'v', 'e', 'l' };
+
+static const struct among a_3[3] =
+{
+/*  0 */ { 4, s_3_0, -1, 1, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0},
+/*  2 */ { 4, s_3_2, -1, 1, 0}
+};
+
+static const symbol s_4_0[2] = { 'i', 'c' };
+static const symbol s_4_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_4_2[2] = { 'i', 'v' };
+
+static const struct among a_4[3] =
+{
+/*  0 */ { 2, s_4_0, -1, 1, 0},
+/*  1 */ { 4, s_4_1, -1, 1, 0},
+/*  2 */ { 2, s_4_2, -1, 1, 0}
+};
+
+static const symbol s_5_0[3] = { 'i', 'c', 'a' };
+static const symbol s_5_1[5] = { 0xE2, 'n', 'c', 'i', 'a' };
+static const symbol s_5_2[5] = { 0xEA, 'n', 'c', 'i', 'a' };
+static const symbol s_5_3[3] = { 'i', 'r', 'a' };
+static const symbol s_5_4[5] = { 'a', 'd', 'o', 'r', 'a' };
+static const symbol s_5_5[3] = { 'o', 's', 'a' };
+static const symbol s_5_6[4] = { 'i', 's', 't', 'a' };
+static const symbol s_5_7[3] = { 'i', 'v', 'a' };
+static const symbol s_5_8[3] = { 'e', 'z', 'a' };
+static const symbol s_5_9[5] = { 'l', 'o', 'g', 0xED, 'a' };
+static const symbol s_5_10[5] = { 'i', 'd', 'a', 'd', 'e' };
+static const symbol s_5_11[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_5_12[5] = { 'm', 'e', 'n', 't', 'e' };
+static const symbol s_5_13[6] = { 'a', 'm', 'e', 'n', 't', 'e' };
+static const symbol s_5_14[4] = { 0xE1, 'v', 'e', 'l' };
+static const symbol s_5_15[4] = { 0xED, 'v', 'e', 'l' };
+static const symbol s_5_16[5] = { 'u', 'c', 'i', 0xF3, 'n' };
+static const symbol s_5_17[3] = { 'i', 'c', 'o' };
+static const symbol s_5_18[4] = { 'i', 's', 'm', 'o' };
+static const symbol s_5_19[3] = { 'o', 's', 'o' };
+static const symbol s_5_20[6] = { 'a', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_5_21[6] = { 'i', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_5_22[3] = { 'i', 'v', 'o' };
+static const symbol s_5_23[5] = { 'a', 0xE7, 'a', '~', 'o' };
+static const symbol s_5_24[4] = { 'a', 'd', 'o', 'r' };
+static const symbol s_5_25[4] = { 'i', 'c', 'a', 's' };
+static const symbol s_5_26[6] = { 0xEA, 'n', 'c', 'i', 'a', 's' };
+static const symbol s_5_27[4] = { 'i', 'r', 'a', 's' };
+static const symbol s_5_28[6] = { 'a', 'd', 'o', 'r', 'a', 's' };
+static const symbol s_5_29[4] = { 'o', 's', 'a', 's' };
+static const symbol s_5_30[5] = { 'i', 's', 't', 'a', 's' };
+static const symbol s_5_31[4] = { 'i', 'v', 'a', 's' };
+static const symbol s_5_32[4] = { 'e', 'z', 'a', 's' };
+static const symbol s_5_33[6] = { 'l', 'o', 'g', 0xED, 'a', 's' };
+static const symbol s_5_34[6] = { 'i', 'd', 'a', 'd', 'e', 's' };
+static const symbol s_5_35[7] = { 'u', 'c', 'i', 'o', 'n', 'e', 's' };
+static const symbol s_5_36[6] = { 'a', 'd', 'o', 'r', 'e', 's' };
+static const symbol s_5_37[5] = { 'a', 'n', 't', 'e', 's' };
+static const symbol s_5_38[6] = { 'a', 0xE7, 'o', '~', 'e', 's' };
+static const symbol s_5_39[4] = { 'i', 'c', 'o', 's' };
+static const symbol s_5_40[5] = { 'i', 's', 'm', 'o', 's' };
+static const symbol s_5_41[4] = { 'o', 's', 'o', 's' };
+static const symbol s_5_42[7] = { 'a', 'm', 'e', 'n', 't', 'o', 's' };
+static const symbol s_5_43[7] = { 'i', 'm', 'e', 'n', 't', 'o', 's' };
+static const symbol s_5_44[4] = { 'i', 'v', 'o', 's' };
+
+static const struct among a_5[45] =
+{
+/*  0 */ { 3, s_5_0, -1, 1, 0},
+/*  1 */ { 5, s_5_1, -1, 1, 0},
+/*  2 */ { 5, s_5_2, -1, 4, 0},
+/*  3 */ { 3, s_5_3, -1, 9, 0},
+/*  4 */ { 5, s_5_4, -1, 1, 0},
+/*  5 */ { 3, s_5_5, -1, 1, 0},
+/*  6 */ { 4, s_5_6, -1, 1, 0},
+/*  7 */ { 3, s_5_7, -1, 8, 0},
+/*  8 */ { 3, s_5_8, -1, 1, 0},
+/*  9 */ { 5, s_5_9, -1, 2, 0},
+/* 10 */ { 5, s_5_10, -1, 7, 0},
+/* 11 */ { 4, s_5_11, -1, 1, 0},
+/* 12 */ { 5, s_5_12, -1, 6, 0},
+/* 13 */ { 6, s_5_13, 12, 5, 0},
+/* 14 */ { 4, s_5_14, -1, 1, 0},
+/* 15 */ { 4, s_5_15, -1, 1, 0},
+/* 16 */ { 5, s_5_16, -1, 3, 0},
+/* 17 */ { 3, s_5_17, -1, 1, 0},
+/* 18 */ { 4, s_5_18, -1, 1, 0},
+/* 19 */ { 3, s_5_19, -1, 1, 0},
+/* 20 */ { 6, s_5_20, -1, 1, 0},
+/* 21 */ { 6, s_5_21, -1, 1, 0},
+/* 22 */ { 3, s_5_22, -1, 8, 0},
+/* 23 */ { 5, s_5_23, -1, 1, 0},
+/* 24 */ { 4, s_5_24, -1, 1, 0},
+/* 25 */ { 4, s_5_25, -1, 1, 0},
+/* 26 */ { 6, s_5_26, -1, 4, 0},
+/* 27 */ { 4, s_5_27, -1, 9, 0},
+/* 28 */ { 6, s_5_28, -1, 1, 0},
+/* 29 */ { 4, s_5_29, -1, 1, 0},
+/* 30 */ { 5, s_5_30, -1, 1, 0},
+/* 31 */ { 4, s_5_31, -1, 8, 0},
+/* 32 */ { 4, s_5_32, -1, 1, 0},
+/* 33 */ { 6, s_5_33, -1, 2, 0},
+/* 34 */ { 6, s_5_34, -1, 7, 0},
+/* 35 */ { 7, s_5_35, -1, 3, 0},
+/* 36 */ { 6, s_5_36, -1, 1, 0},
+/* 37 */ { 5, s_5_37, -1, 1, 0},
+/* 38 */ { 6, s_5_38, -1, 1, 0},
+/* 39 */ { 4, s_5_39, -1, 1, 0},
+/* 40 */ { 5, s_5_40, -1, 1, 0},
+/* 41 */ { 4, s_5_41, -1, 1, 0},
+/* 42 */ { 7, s_5_42, -1, 1, 0},
+/* 43 */ { 7, s_5_43, -1, 1, 0},
+/* 44 */ { 4, s_5_44, -1, 8, 0}
+};
+
+static const symbol s_6_0[3] = { 'a', 'd', 'a' };
+static const symbol s_6_1[3] = { 'i', 'd', 'a' };
+static const symbol s_6_2[2] = { 'i', 'a' };
+static const symbol s_6_3[4] = { 'a', 'r', 'i', 'a' };
+static const symbol s_6_4[4] = { 'e', 'r', 'i', 'a' };
+static const symbol s_6_5[4] = { 'i', 'r', 'i', 'a' };
+static const symbol s_6_6[3] = { 'a', 'r', 'a' };
+static const symbol s_6_7[3] = { 'e', 'r', 'a' };
+static const symbol s_6_8[3] = { 'i', 'r', 'a' };
+static const symbol s_6_9[3] = { 'a', 'v', 'a' };
+static const symbol s_6_10[4] = { 'a', 's', 's', 'e' };
+static const symbol s_6_11[4] = { 'e', 's', 's', 'e' };
+static const symbol s_6_12[4] = { 'i', 's', 's', 'e' };
+static const symbol s_6_13[4] = { 'a', 's', 't', 'e' };
+static const symbol s_6_14[4] = { 'e', 's', 't', 'e' };
+static const symbol s_6_15[4] = { 'i', 's', 't', 'e' };
+static const symbol s_6_16[2] = { 'e', 'i' };
+static const symbol s_6_17[4] = { 'a', 'r', 'e', 'i' };
+static const symbol s_6_18[4] = { 'e', 'r', 'e', 'i' };
+static const symbol s_6_19[4] = { 'i', 'r', 'e', 'i' };
+static const symbol s_6_20[2] = { 'a', 'm' };
+static const symbol s_6_21[3] = { 'i', 'a', 'm' };
+static const symbol s_6_22[5] = { 'a', 'r', 'i', 'a', 'm' };
+static const symbol s_6_23[5] = { 'e', 'r', 'i', 'a', 'm' };
+static const symbol s_6_24[5] = { 'i', 'r', 'i', 'a', 'm' };
+static const symbol s_6_25[4] = { 'a', 'r', 'a', 'm' };
+static const symbol s_6_26[4] = { 'e', 'r', 'a', 'm' };
+static const symbol s_6_27[4] = { 'i', 'r', 'a', 'm' };
+static const symbol s_6_28[4] = { 'a', 'v', 'a', 'm' };
+static const symbol s_6_29[2] = { 'e', 'm' };
+static const symbol s_6_30[4] = { 'a', 'r', 'e', 'm' };
+static const symbol s_6_31[4] = { 'e', 'r', 'e', 'm' };
+static const symbol s_6_32[4] = { 'i', 'r', 'e', 'm' };
+static const symbol s_6_33[5] = { 'a', 's', 's', 'e', 'm' };
+static const symbol s_6_34[5] = { 'e', 's', 's', 'e', 'm' };
+static const symbol s_6_35[5] = { 'i', 's', 's', 'e', 'm' };
+static const symbol s_6_36[3] = { 'a', 'd', 'o' };
+static const symbol s_6_37[3] = { 'i', 'd', 'o' };
+static const symbol s_6_38[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_6_39[4] = { 'e', 'n', 'd', 'o' };
+static const symbol s_6_40[4] = { 'i', 'n', 'd', 'o' };
+static const symbol s_6_41[5] = { 'a', 'r', 'a', '~', 'o' };
+static const symbol s_6_42[5] = { 'e', 'r', 'a', '~', 'o' };
+static const symbol s_6_43[5] = { 'i', 'r', 'a', '~', 'o' };
+static const symbol s_6_44[2] = { 'a', 'r' };
+static const symbol s_6_45[2] = { 'e', 'r' };
+static const symbol s_6_46[2] = { 'i', 'r' };
+static const symbol s_6_47[2] = { 'a', 's' };
+static const symbol s_6_48[4] = { 'a', 'd', 'a', 's' };
+static const symbol s_6_49[4] = { 'i', 'd', 'a', 's' };
+static const symbol s_6_50[3] = { 'i', 'a', 's' };
+static const symbol s_6_51[5] = { 'a', 'r', 'i', 'a', 's' };
+static const symbol s_6_52[5] = { 'e', 'r', 'i', 'a', 's' };
+static const symbol s_6_53[5] = { 'i', 'r', 'i', 'a', 's' };
+static const symbol s_6_54[4] = { 'a', 'r', 'a', 's' };
+static const symbol s_6_55[4] = { 'e', 'r', 'a', 's' };
+static const symbol s_6_56[4] = { 'i', 'r', 'a', 's' };
+static const symbol s_6_57[4] = { 'a', 'v', 'a', 's' };
+static const symbol s_6_58[2] = { 'e', 's' };
+static const symbol s_6_59[5] = { 'a', 'r', 'd', 'e', 's' };
+static const symbol s_6_60[5] = { 'e', 'r', 'd', 'e', 's' };
+static const symbol s_6_61[5] = { 'i', 'r', 'd', 'e', 's' };
+static const symbol s_6_62[4] = { 'a', 'r', 'e', 's' };
+static const symbol s_6_63[4] = { 'e', 'r', 'e', 's' };
+static const symbol s_6_64[4] = { 'i', 'r', 'e', 's' };
+static const symbol s_6_65[5] = { 'a', 's', 's', 'e', 's' };
+static const symbol s_6_66[5] = { 'e', 's', 's', 'e', 's' };
+static const symbol s_6_67[5] = { 'i', 's', 's', 'e', 's' };
+static const symbol s_6_68[5] = { 'a', 's', 't', 'e', 's' };
+static const symbol s_6_69[5] = { 'e', 's', 't', 'e', 's' };
+static const symbol s_6_70[5] = { 'i', 's', 't', 'e', 's' };
+static const symbol s_6_71[2] = { 'i', 's' };
+static const symbol s_6_72[3] = { 'a', 'i', 's' };
+static const symbol s_6_73[3] = { 'e', 'i', 's' };
+static const symbol s_6_74[5] = { 'a', 'r', 'e', 'i', 's' };
+static const symbol s_6_75[5] = { 'e', 'r', 'e', 'i', 's' };
+static const symbol s_6_76[5] = { 'i', 'r', 'e', 'i', 's' };
+static const symbol s_6_77[5] = { 0xE1, 'r', 'e', 'i', 's' };
+static const symbol s_6_78[5] = { 0xE9, 'r', 'e', 'i', 's' };
+static const symbol s_6_79[5] = { 0xED, 'r', 'e', 'i', 's' };
+static const symbol s_6_80[6] = { 0xE1, 's', 's', 'e', 'i', 's' };
+static const symbol s_6_81[6] = { 0xE9, 's', 's', 'e', 'i', 's' };
+static const symbol s_6_82[6] = { 0xED, 's', 's', 'e', 'i', 's' };
+static const symbol s_6_83[5] = { 0xE1, 'v', 'e', 'i', 's' };
+static const symbol s_6_84[4] = { 0xED, 'e', 'i', 's' };
+static const symbol s_6_85[6] = { 'a', 'r', 0xED, 'e', 'i', 's' };
+static const symbol s_6_86[6] = { 'e', 'r', 0xED, 'e', 'i', 's' };
+static const symbol s_6_87[6] = { 'i', 'r', 0xED, 'e', 'i', 's' };
+static const symbol s_6_88[4] = { 'a', 'd', 'o', 's' };
+static const symbol s_6_89[4] = { 'i', 'd', 'o', 's' };
+static const symbol s_6_90[4] = { 'a', 'm', 'o', 's' };
+static const symbol s_6_91[6] = { 0xE1, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_6_92[6] = { 0xE9, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_6_93[6] = { 0xED, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_6_94[6] = { 0xE1, 'v', 'a', 'm', 'o', 's' };
+static const symbol s_6_95[5] = { 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_6_96[7] = { 'a', 'r', 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_6_97[7] = { 'e', 'r', 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_6_98[7] = { 'i', 'r', 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_6_99[4] = { 'e', 'm', 'o', 's' };
+static const symbol s_6_100[6] = { 'a', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_6_101[6] = { 'e', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_6_102[6] = { 'i', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_6_103[7] = { 0xE1, 's', 's', 'e', 'm', 'o', 's' };
+static const symbol s_6_104[7] = { 0xEA, 's', 's', 'e', 'm', 'o', 's' };
+static const symbol s_6_105[7] = { 0xED, 's', 's', 'e', 'm', 'o', 's' };
+static const symbol s_6_106[4] = { 'i', 'm', 'o', 's' };
+static const symbol s_6_107[5] = { 'a', 'r', 'm', 'o', 's' };
+static const symbol s_6_108[5] = { 'e', 'r', 'm', 'o', 's' };
+static const symbol s_6_109[5] = { 'i', 'r', 'm', 'o', 's' };
+static const symbol s_6_110[4] = { 0xE1, 'm', 'o', 's' };
+static const symbol s_6_111[4] = { 'a', 'r', 0xE1, 's' };
+static const symbol s_6_112[4] = { 'e', 'r', 0xE1, 's' };
+static const symbol s_6_113[4] = { 'i', 'r', 0xE1, 's' };
+static const symbol s_6_114[2] = { 'e', 'u' };
+static const symbol s_6_115[2] = { 'i', 'u' };
+static const symbol s_6_116[2] = { 'o', 'u' };
+static const symbol s_6_117[3] = { 'a', 'r', 0xE1 };
+static const symbol s_6_118[3] = { 'e', 'r', 0xE1 };
+static const symbol s_6_119[3] = { 'i', 'r', 0xE1 };
+
+static const struct among a_6[120] =
+{
+/*  0 */ { 3, s_6_0, -1, 1, 0},
+/*  1 */ { 3, s_6_1, -1, 1, 0},
+/*  2 */ { 2, s_6_2, -1, 1, 0},
+/*  3 */ { 4, s_6_3, 2, 1, 0},
+/*  4 */ { 4, s_6_4, 2, 1, 0},
+/*  5 */ { 4, s_6_5, 2, 1, 0},
+/*  6 */ { 3, s_6_6, -1, 1, 0},
+/*  7 */ { 3, s_6_7, -1, 1, 0},
+/*  8 */ { 3, s_6_8, -1, 1, 0},
+/*  9 */ { 3, s_6_9, -1, 1, 0},
+/* 10 */ { 4, s_6_10, -1, 1, 0},
+/* 11 */ { 4, s_6_11, -1, 1, 0},
+/* 12 */ { 4, s_6_12, -1, 1, 0},
+/* 13 */ { 4, s_6_13, -1, 1, 0},
+/* 14 */ { 4, s_6_14, -1, 1, 0},
+/* 15 */ { 4, s_6_15, -1, 1, 0},
+/* 16 */ { 2, s_6_16, -1, 1, 0},
+/* 17 */ { 4, s_6_17, 16, 1, 0},
+/* 18 */ { 4, s_6_18, 16, 1, 0},
+/* 19 */ { 4, s_6_19, 16, 1, 0},
+/* 20 */ { 2, s_6_20, -1, 1, 0},
+/* 21 */ { 3, s_6_21, 20, 1, 0},
+/* 22 */ { 5, s_6_22, 21, 1, 0},
+/* 23 */ { 5, s_6_23, 21, 1, 0},
+/* 24 */ { 5, s_6_24, 21, 1, 0},
+/* 25 */ { 4, s_6_25, 20, 1, 0},
+/* 26 */ { 4, s_6_26, 20, 1, 0},
+/* 27 */ { 4, s_6_27, 20, 1, 0},
+/* 28 */ { 4, s_6_28, 20, 1, 0},
+/* 29 */ { 2, s_6_29, -1, 1, 0},
+/* 30 */ { 4, s_6_30, 29, 1, 0},
+/* 31 */ { 4, s_6_31, 29, 1, 0},
+/* 32 */ { 4, s_6_32, 29, 1, 0},
+/* 33 */ { 5, s_6_33, 29, 1, 0},
+/* 34 */ { 5, s_6_34, 29, 1, 0},
+/* 35 */ { 5, s_6_35, 29, 1, 0},
+/* 36 */ { 3, s_6_36, -1, 1, 0},
+/* 37 */ { 3, s_6_37, -1, 1, 0},
+/* 38 */ { 4, s_6_38, -1, 1, 0},
+/* 39 */ { 4, s_6_39, -1, 1, 0},
+/* 40 */ { 4, s_6_40, -1, 1, 0},
+/* 41 */ { 5, s_6_41, -1, 1, 0},
+/* 42 */ { 5, s_6_42, -1, 1, 0},
+/* 43 */ { 5, s_6_43, -1, 1, 0},
+/* 44 */ { 2, s_6_44, -1, 1, 0},
+/* 45 */ { 2, s_6_45, -1, 1, 0},
+/* 46 */ { 2, s_6_46, -1, 1, 0},
+/* 47 */ { 2, s_6_47, -1, 1, 0},
+/* 48 */ { 4, s_6_48, 47, 1, 0},
+/* 49 */ { 4, s_6_49, 47, 1, 0},
+/* 50 */ { 3, s_6_50, 47, 1, 0},
+/* 51 */ { 5, s_6_51, 50, 1, 0},
+/* 52 */ { 5, s_6_52, 50, 1, 0},
+/* 53 */ { 5, s_6_53, 50, 1, 0},
+/* 54 */ { 4, s_6_54, 47, 1, 0},
+/* 55 */ { 4, s_6_55, 47, 1, 0},
+/* 56 */ { 4, s_6_56, 47, 1, 0},
+/* 57 */ { 4, s_6_57, 47, 1, 0},
+/* 58 */ { 2, s_6_58, -1, 1, 0},
+/* 59 */ { 5, s_6_59, 58, 1, 0},
+/* 60 */ { 5, s_6_60, 58, 1, 0},
+/* 61 */ { 5, s_6_61, 58, 1, 0},
+/* 62 */ { 4, s_6_62, 58, 1, 0},
+/* 63 */ { 4, s_6_63, 58, 1, 0},
+/* 64 */ { 4, s_6_64, 58, 1, 0},
+/* 65 */ { 5, s_6_65, 58, 1, 0},
+/* 66 */ { 5, s_6_66, 58, 1, 0},
+/* 67 */ { 5, s_6_67, 58, 1, 0},
+/* 68 */ { 5, s_6_68, 58, 1, 0},
+/* 69 */ { 5, s_6_69, 58, 1, 0},
+/* 70 */ { 5, s_6_70, 58, 1, 0},
+/* 71 */ { 2, s_6_71, -1, 1, 0},
+/* 72 */ { 3, s_6_72, 71, 1, 0},
+/* 73 */ { 3, s_6_73, 71, 1, 0},
+/* 74 */ { 5, s_6_74, 73, 1, 0},
+/* 75 */ { 5, s_6_75, 73, 1, 0},
+/* 76 */ { 5, s_6_76, 73, 1, 0},
+/* 77 */ { 5, s_6_77, 73, 1, 0},
+/* 78 */ { 5, s_6_78, 73, 1, 0},
+/* 79 */ { 5, s_6_79, 73, 1, 0},
+/* 80 */ { 6, s_6_80, 73, 1, 0},
+/* 81 */ { 6, s_6_81, 73, 1, 0},
+/* 82 */ { 6, s_6_82, 73, 1, 0},
+/* 83 */ { 5, s_6_83, 73, 1, 0},
+/* 84 */ { 4, s_6_84, 73, 1, 0},
+/* 85 */ { 6, s_6_85, 84, 1, 0},
+/* 86 */ { 6, s_6_86, 84, 1, 0},
+/* 87 */ { 6, s_6_87, 84, 1, 0},
+/* 88 */ { 4, s_6_88, -1, 1, 0},
+/* 89 */ { 4, s_6_89, -1, 1, 0},
+/* 90 */ { 4, s_6_90, -1, 1, 0},
+/* 91 */ { 6, s_6_91, 90, 1, 0},
+/* 92 */ { 6, s_6_92, 90, 1, 0},
+/* 93 */ { 6, s_6_93, 90, 1, 0},
+/* 94 */ { 6, s_6_94, 90, 1, 0},
+/* 95 */ { 5, s_6_95, 90, 1, 0},
+/* 96 */ { 7, s_6_96, 95, 1, 0},
+/* 97 */ { 7, s_6_97, 95, 1, 0},
+/* 98 */ { 7, s_6_98, 95, 1, 0},
+/* 99 */ { 4, s_6_99, -1, 1, 0},
+/*100 */ { 6, s_6_100, 99, 1, 0},
+/*101 */ { 6, s_6_101, 99, 1, 0},
+/*102 */ { 6, s_6_102, 99, 1, 0},
+/*103 */ { 7, s_6_103, 99, 1, 0},
+/*104 */ { 7, s_6_104, 99, 1, 0},
+/*105 */ { 7, s_6_105, 99, 1, 0},
+/*106 */ { 4, s_6_106, -1, 1, 0},
+/*107 */ { 5, s_6_107, -1, 1, 0},
+/*108 */ { 5, s_6_108, -1, 1, 0},
+/*109 */ { 5, s_6_109, -1, 1, 0},
+/*110 */ { 4, s_6_110, -1, 1, 0},
+/*111 */ { 4, s_6_111, -1, 1, 0},
+/*112 */ { 4, s_6_112, -1, 1, 0},
+/*113 */ { 4, s_6_113, -1, 1, 0},
+/*114 */ { 2, s_6_114, -1, 1, 0},
+/*115 */ { 2, s_6_115, -1, 1, 0},
+/*116 */ { 2, s_6_116, -1, 1, 0},
+/*117 */ { 3, s_6_117, -1, 1, 0},
+/*118 */ { 3, s_6_118, -1, 1, 0},
+/*119 */ { 3, s_6_119, -1, 1, 0}
+};
+
+static const symbol s_7_0[1] = { 'a' };
+static const symbol s_7_1[1] = { 'i' };
+static const symbol s_7_2[1] = { 'o' };
+static const symbol s_7_3[2] = { 'o', 's' };
+static const symbol s_7_4[1] = { 0xE1 };
+static const symbol s_7_5[1] = { 0xED };
+static const symbol s_7_6[1] = { 0xF3 };
+
+static const struct among a_7[7] =
+{
+/*  0 */ { 1, s_7_0, -1, 1, 0},
+/*  1 */ { 1, s_7_1, -1, 1, 0},
+/*  2 */ { 1, s_7_2, -1, 1, 0},
+/*  3 */ { 2, s_7_3, -1, 1, 0},
+/*  4 */ { 1, s_7_4, -1, 1, 0},
+/*  5 */ { 1, s_7_5, -1, 1, 0},
+/*  6 */ { 1, s_7_6, -1, 1, 0}
+};
+
+static const symbol s_8_0[1] = { 'e' };
+static const symbol s_8_1[1] = { 0xE7 };
+static const symbol s_8_2[1] = { 0xE9 };
+static const symbol s_8_3[1] = { 0xEA };
+
+static const struct among a_8[4] =
+{
+/*  0 */ { 1, s_8_0, -1, 1, 0},
+/*  1 */ { 1, s_8_1, -1, 2, 0},
+/*  2 */ { 1, s_8_2, -1, 1, 0},
+/*  3 */ { 1, s_8_3, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 19, 12, 2 };
+
+static const symbol s_0[] = { 'a', '~' };
+static const symbol s_1[] = { 'o', '~' };
+static const symbol s_2[] = { 0xE3 };
+static const symbol s_3[] = { 0xF5 };
+static const symbol s_4[] = { 'l', 'o', 'g' };
+static const symbol s_5[] = { 'u' };
+static const symbol s_6[] = { 'e', 'n', 't', 'e' };
+static const symbol s_7[] = { 'a', 't' };
+static const symbol s_8[] = { 'a', 't' };
+static const symbol s_9[] = { 'e' };
+static const symbol s_10[] = { 'i', 'r' };
+static const symbol s_11[] = { 'u' };
+static const symbol s_12[] = { 'g' };
+static const symbol s_13[] = { 'i' };
+static const symbol s_14[] = { 'c' };
+static const symbol s_15[] = { 'c' };
+static const symbol s_16[] = { 'i' };
+static const symbol s_17[] = { 'c' };
+
+static int r_prelude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 36 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 37 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 227 && z->p[z->c + 0] != 245)) among_var = 3; else
+        among_var = find_among(z, a_0, 3); /* substring, line 37 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 37 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 2, s_0); /* <-, line 38 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 2, s_1); /* <-, line 39 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 40 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 50 */
+        {   int c2 = z->c; /* or, line 52 */
+            if (in_grouping(z, g_v, 97, 250, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 51 */
+                if (out_grouping(z, g_v, 97, 250, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 51 */
+                    int ret = out_grouping(z, g_v, 97, 250, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping(z, g_v, 97, 250, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 51 */
+                    int ret = in_grouping(z, g_v, 97, 250, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping(z, g_v, 97, 250, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 53 */
+                if (out_grouping(z, g_v, 97, 250, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 53 */
+                    int ret = out_grouping(z, g_v, 97, 250, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping(z, g_v, 97, 250, 0)) goto lab0;
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 53 */
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 54 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 56 */
+        {    /* gopast */ /* grouping v, line 57 */
+            int ret = out_grouping(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 57 */
+            int ret = in_grouping(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 57 */
+        {    /* gopast */ /* grouping v, line 58 */
+            int ret = out_grouping(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 58 */
+            int ret = in_grouping(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 58 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 62 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 63 */
+        if (z->c + 1 >= z->l || z->p[z->c + 1] != 126) among_var = 3; else
+        among_var = find_among(z, a_1, 3); /* substring, line 63 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 63 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_2); /* <-, line 64 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_3); /* <-, line 65 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 66 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 77 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((839714 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_5, 45); /* substring, line 77 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 77 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 93 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 93 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 98 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_4); /* <-, line 98 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 102 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_5); /* <-, line 102 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 106 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 4, s_6); /* <-, line 106 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 110 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 110 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 111 */
+                z->ket = z->c; /* [, line 112 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4718616 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab0; }
+                among_var = find_among_b(z, a_2, 4); /* substring, line 112 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 112 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 112 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 112 */
+                    if (ret < 0) return ret;
+                }
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab0; }
+                    case 1:
+                        z->ket = z->c; /* [, line 113 */
+                        if (!(eq_s_b(z, 2, s_7))) { z->c = z->l - m_keep; goto lab0; }
+                        z->bra = z->c; /* ], line 113 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 113 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 113 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab0:
+                ;
+            }
+            break;
+        case 6:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 122 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 122 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 123 */
+                z->ket = z->c; /* [, line 124 */
+                if (z->c - 3 <= z->lb || (z->p[z->c - 1] != 101 && z->p[z->c - 1] != 108)) { z->c = z->l - m_keep; goto lab1; }
+                among_var = find_among_b(z, a_3, 3); /* substring, line 124 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab1; }
+                z->bra = z->c; /* ], line 124 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab1; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 127 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 127 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab1:
+                ;
+            }
+            break;
+        case 7:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 135 */
+                z->ket = z->c; /* [, line 136 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab2; }
+                among_var = find_among_b(z, a_4, 3); /* substring, line 136 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab2; }
+                z->bra = z->c; /* ], line 136 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab2; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call R2, line 139 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 139 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab2:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 146 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 146 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 147 */
+                z->ket = z->c; /* [, line 148 */
+                if (!(eq_s_b(z, 2, s_8))) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 148 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 148 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 148 */
+                    if (ret < 0) return ret;
+                }
+            lab3:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 153 */
+                if (ret < 0) return ret;
+            }
+            if (!(eq_s_b(z, 1, s_9))) return 0;
+            {   int ret = slice_from_s(z, 2, s_10); /* <-, line 154 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 159 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 159 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 160 */
+        among_var = find_among_b(z, a_6, 120); /* substring, line 160 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 160 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 179 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_residual_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 184 */
+    among_var = find_among_b(z, a_7, 7); /* substring, line 184 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 184 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 187 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 187 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_residual_form(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 192 */
+    among_var = find_among_b(z, a_8, 4); /* substring, line 192 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 192 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 194 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 194 */
+                if (ret < 0) return ret;
+            }
+            z->ket = z->c; /* [, line 194 */
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 194 */
+                if (!(eq_s_b(z, 1, s_11))) goto lab1;
+                z->bra = z->c; /* ], line 194 */
+                {   int m_test = z->l - z->c; /* test, line 194 */
+                    if (!(eq_s_b(z, 1, s_12))) goto lab1;
+                    z->c = z->l - m_test;
+                }
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_13))) return 0;
+                z->bra = z->c; /* ], line 195 */
+                {   int m_test = z->l - z->c; /* test, line 195 */
+                    if (!(eq_s_b(z, 1, s_14))) return 0;
+                    z->c = z->l - m_test;
+                }
+            }
+        lab0:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 195 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 195 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_15); /* <-, line 196 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int portuguese_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 202 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 202 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 203 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 203 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 204 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 205 */
+        {   int m4 = z->l - z->c; (void)m4; /* or, line 209 */
+            {   int m5 = z->l - z->c; (void)m5; /* and, line 207 */
+                {   int m6 = z->l - z->c; (void)m6; /* or, line 206 */
+                    {   int ret = r_standard_suffix(z);
+                        if (ret == 0) goto lab6; /* call standard_suffix, line 206 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m6;
+                    {   int ret = r_verb_suffix(z);
+                        if (ret == 0) goto lab4; /* call verb_suffix, line 206 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                z->c = z->l - m5;
+                {   int m7 = z->l - z->c; (void)m7; /* do, line 207 */
+                    z->ket = z->c; /* [, line 207 */
+                    if (!(eq_s_b(z, 1, s_16))) goto lab7;
+                    z->bra = z->c; /* ], line 207 */
+                    {   int m_test = z->l - z->c; /* test, line 207 */
+                        if (!(eq_s_b(z, 1, s_17))) goto lab7;
+                        z->c = z->l - m_test;
+                    }
+                    {   int ret = r_RV(z);
+                        if (ret == 0) goto lab7; /* call RV, line 207 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 207 */
+                        if (ret < 0) return ret;
+                    }
+                lab7:
+                    z->c = z->l - m7;
+                }
+            }
+            goto lab3;
+        lab4:
+            z->c = z->l - m4;
+            {   int ret = r_residual_suffix(z);
+                if (ret == 0) goto lab2; /* call residual_suffix, line 209 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab3:
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 211 */
+        {   int ret = r_residual_form(z);
+            if (ret == 0) goto lab8; /* call residual_form, line 211 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = z->l - m8;
+    }
+    z->c = z->lb;
+    {   int c9 = z->c; /* do, line 213 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab9; /* call postlude, line 213 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = c9;
+    }
+    return 1;
+}
+
+extern struct SN_env * portuguese_ISO_8859_1_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void portuguese_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_spanish.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_spanish.c
new file mode 100644
index 000000000000..27f26e7865e8
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_spanish.c
@@ -0,0 +1,1093 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int spanish_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_residual_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_y_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_attached_pronoun(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * spanish_ISO_8859_1_create_env(void);
+extern void spanish_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 0xE1 };
+static const symbol s_0_2[1] = { 0xE9 };
+static const symbol s_0_3[1] = { 0xED };
+static const symbol s_0_4[1] = { 0xF3 };
+static const symbol s_0_5[1] = { 0xFA };
+
+static const struct among a_0[6] =
+{
+/*  0 */ { 0, 0, -1, 6, 0},
+/*  1 */ { 1, s_0_1, 0, 1, 0},
+/*  2 */ { 1, s_0_2, 0, 2, 0},
+/*  3 */ { 1, s_0_3, 0, 3, 0},
+/*  4 */ { 1, s_0_4, 0, 4, 0},
+/*  5 */ { 1, s_0_5, 0, 5, 0}
+};
+
+static const symbol s_1_0[2] = { 'l', 'a' };
+static const symbol s_1_1[4] = { 's', 'e', 'l', 'a' };
+static const symbol s_1_2[2] = { 'l', 'e' };
+static const symbol s_1_3[2] = { 'm', 'e' };
+static const symbol s_1_4[2] = { 's', 'e' };
+static const symbol s_1_5[2] = { 'l', 'o' };
+static const symbol s_1_6[4] = { 's', 'e', 'l', 'o' };
+static const symbol s_1_7[3] = { 'l', 'a', 's' };
+static const symbol s_1_8[5] = { 's', 'e', 'l', 'a', 's' };
+static const symbol s_1_9[3] = { 'l', 'e', 's' };
+static const symbol s_1_10[3] = { 'l', 'o', 's' };
+static const symbol s_1_11[5] = { 's', 'e', 'l', 'o', 's' };
+static const symbol s_1_12[3] = { 'n', 'o', 's' };
+
+static const struct among a_1[13] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 4, s_1_1, 0, -1, 0},
+/*  2 */ { 2, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0},
+/*  4 */ { 2, s_1_4, -1, -1, 0},
+/*  5 */ { 2, s_1_5, -1, -1, 0},
+/*  6 */ { 4, s_1_6, 5, -1, 0},
+/*  7 */ { 3, s_1_7, -1, -1, 0},
+/*  8 */ { 5, s_1_8, 7, -1, 0},
+/*  9 */ { 3, s_1_9, -1, -1, 0},
+/* 10 */ { 3, s_1_10, -1, -1, 0},
+/* 11 */ { 5, s_1_11, 10, -1, 0},
+/* 12 */ { 3, s_1_12, -1, -1, 0}
+};
+
+static const symbol s_2_0[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_2_1[5] = { 'i', 'e', 'n', 'd', 'o' };
+static const symbol s_2_2[5] = { 'y', 'e', 'n', 'd', 'o' };
+static const symbol s_2_3[4] = { 0xE1, 'n', 'd', 'o' };
+static const symbol s_2_4[5] = { 'i', 0xE9, 'n', 'd', 'o' };
+static const symbol s_2_5[2] = { 'a', 'r' };
+static const symbol s_2_6[2] = { 'e', 'r' };
+static const symbol s_2_7[2] = { 'i', 'r' };
+static const symbol s_2_8[2] = { 0xE1, 'r' };
+static const symbol s_2_9[2] = { 0xE9, 'r' };
+static const symbol s_2_10[2] = { 0xED, 'r' };
+
+static const struct among a_2[11] =
+{
+/*  0 */ { 4, s_2_0, -1, 6, 0},
+/*  1 */ { 5, s_2_1, -1, 6, 0},
+/*  2 */ { 5, s_2_2, -1, 7, 0},
+/*  3 */ { 4, s_2_3, -1, 2, 0},
+/*  4 */ { 5, s_2_4, -1, 1, 0},
+/*  5 */ { 2, s_2_5, -1, 6, 0},
+/*  6 */ { 2, s_2_6, -1, 6, 0},
+/*  7 */ { 2, s_2_7, -1, 6, 0},
+/*  8 */ { 2, s_2_8, -1, 3, 0},
+/*  9 */ { 2, s_2_9, -1, 4, 0},
+/* 10 */ { 2, s_2_10, -1, 5, 0}
+};
+
+static const symbol s_3_0[2] = { 'i', 'c' };
+static const symbol s_3_1[2] = { 'a', 'd' };
+static const symbol s_3_2[2] = { 'o', 's' };
+static const symbol s_3_3[2] = { 'i', 'v' };
+
+static const struct among a_3[4] =
+{
+/*  0 */ { 2, s_3_0, -1, -1, 0},
+/*  1 */ { 2, s_3_1, -1, -1, 0},
+/*  2 */ { 2, s_3_2, -1, -1, 0},
+/*  3 */ { 2, s_3_3, -1, 1, 0}
+};
+
+static const symbol s_4_0[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_4_1[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_4_2[4] = { 'a', 'n', 't', 'e' };
+
+static const struct among a_4[3] =
+{
+/*  0 */ { 4, s_4_0, -1, 1, 0},
+/*  1 */ { 4, s_4_1, -1, 1, 0},
+/*  2 */ { 4, s_4_2, -1, 1, 0}
+};
+
+static const symbol s_5_0[2] = { 'i', 'c' };
+static const symbol s_5_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_5_2[2] = { 'i', 'v' };
+
+static const struct among a_5[3] =
+{
+/*  0 */ { 2, s_5_0, -1, 1, 0},
+/*  1 */ { 4, s_5_1, -1, 1, 0},
+/*  2 */ { 2, s_5_2, -1, 1, 0}
+};
+
+static const symbol s_6_0[3] = { 'i', 'c', 'a' };
+static const symbol s_6_1[5] = { 'a', 'n', 'c', 'i', 'a' };
+static const symbol s_6_2[5] = { 'e', 'n', 'c', 'i', 'a' };
+static const symbol s_6_3[5] = { 'a', 'd', 'o', 'r', 'a' };
+static const symbol s_6_4[3] = { 'o', 's', 'a' };
+static const symbol s_6_5[4] = { 'i', 's', 't', 'a' };
+static const symbol s_6_6[3] = { 'i', 'v', 'a' };
+static const symbol s_6_7[4] = { 'a', 'n', 'z', 'a' };
+static const symbol s_6_8[5] = { 'l', 'o', 'g', 0xED, 'a' };
+static const symbol s_6_9[4] = { 'i', 'd', 'a', 'd' };
+static const symbol s_6_10[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_6_11[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_6_12[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_6_13[5] = { 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_14[6] = { 'a', 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_15[5] = { 'a', 'c', 'i', 0xF3, 'n' };
+static const symbol s_6_16[5] = { 'u', 'c', 'i', 0xF3, 'n' };
+static const symbol s_6_17[3] = { 'i', 'c', 'o' };
+static const symbol s_6_18[4] = { 'i', 's', 'm', 'o' };
+static const symbol s_6_19[3] = { 'o', 's', 'o' };
+static const symbol s_6_20[7] = { 'a', 'm', 'i', 'e', 'n', 't', 'o' };
+static const symbol s_6_21[7] = { 'i', 'm', 'i', 'e', 'n', 't', 'o' };
+static const symbol s_6_22[3] = { 'i', 'v', 'o' };
+static const symbol s_6_23[4] = { 'a', 'd', 'o', 'r' };
+static const symbol s_6_24[4] = { 'i', 'c', 'a', 's' };
+static const symbol s_6_25[6] = { 'a', 'n', 'c', 'i', 'a', 's' };
+static const symbol s_6_26[6] = { 'e', 'n', 'c', 'i', 'a', 's' };
+static const symbol s_6_27[6] = { 'a', 'd', 'o', 'r', 'a', 's' };
+static const symbol s_6_28[4] = { 'o', 's', 'a', 's' };
+static const symbol s_6_29[5] = { 'i', 's', 't', 'a', 's' };
+static const symbol s_6_30[4] = { 'i', 'v', 'a', 's' };
+static const symbol s_6_31[5] = { 'a', 'n', 'z', 'a', 's' };
+static const symbol s_6_32[6] = { 'l', 'o', 'g', 0xED, 'a', 's' };
+static const symbol s_6_33[6] = { 'i', 'd', 'a', 'd', 'e', 's' };
+static const symbol s_6_34[5] = { 'a', 'b', 'l', 'e', 's' };
+static const symbol s_6_35[5] = { 'i', 'b', 'l', 'e', 's' };
+static const symbol s_6_36[7] = { 'a', 'c', 'i', 'o', 'n', 'e', 's' };
+static const symbol s_6_37[7] = { 'u', 'c', 'i', 'o', 'n', 'e', 's' };
+static const symbol s_6_38[6] = { 'a', 'd', 'o', 'r', 'e', 's' };
+static const symbol s_6_39[5] = { 'a', 'n', 't', 'e', 's' };
+static const symbol s_6_40[4] = { 'i', 'c', 'o', 's' };
+static const symbol s_6_41[5] = { 'i', 's', 'm', 'o', 's' };
+static const symbol s_6_42[4] = { 'o', 's', 'o', 's' };
+static const symbol s_6_43[8] = { 'a', 'm', 'i', 'e', 'n', 't', 'o', 's' };
+static const symbol s_6_44[8] = { 'i', 'm', 'i', 'e', 'n', 't', 'o', 's' };
+static const symbol s_6_45[4] = { 'i', 'v', 'o', 's' };
+
+static const struct among a_6[46] =
+{
+/*  0 */ { 3, s_6_0, -1, 1, 0},
+/*  1 */ { 5, s_6_1, -1, 2, 0},
+/*  2 */ { 5, s_6_2, -1, 5, 0},
+/*  3 */ { 5, s_6_3, -1, 2, 0},
+/*  4 */ { 3, s_6_4, -1, 1, 0},
+/*  5 */ { 4, s_6_5, -1, 1, 0},
+/*  6 */ { 3, s_6_6, -1, 9, 0},
+/*  7 */ { 4, s_6_7, -1, 1, 0},
+/*  8 */ { 5, s_6_8, -1, 3, 0},
+/*  9 */ { 4, s_6_9, -1, 8, 0},
+/* 10 */ { 4, s_6_10, -1, 1, 0},
+/* 11 */ { 4, s_6_11, -1, 1, 0},
+/* 12 */ { 4, s_6_12, -1, 2, 0},
+/* 13 */ { 5, s_6_13, -1, 7, 0},
+/* 14 */ { 6, s_6_14, 13, 6, 0},
+/* 15 */ { 5, s_6_15, -1, 2, 0},
+/* 16 */ { 5, s_6_16, -1, 4, 0},
+/* 17 */ { 3, s_6_17, -1, 1, 0},
+/* 18 */ { 4, s_6_18, -1, 1, 0},
+/* 19 */ { 3, s_6_19, -1, 1, 0},
+/* 20 */ { 7, s_6_20, -1, 1, 0},
+/* 21 */ { 7, s_6_21, -1, 1, 0},
+/* 22 */ { 3, s_6_22, -1, 9, 0},
+/* 23 */ { 4, s_6_23, -1, 2, 0},
+/* 24 */ { 4, s_6_24, -1, 1, 0},
+/* 25 */ { 6, s_6_25, -1, 2, 0},
+/* 26 */ { 6, s_6_26, -1, 5, 0},
+/* 27 */ { 6, s_6_27, -1, 2, 0},
+/* 28 */ { 4, s_6_28, -1, 1, 0},
+/* 29 */ { 5, s_6_29, -1, 1, 0},
+/* 30 */ { 4, s_6_30, -1, 9, 0},
+/* 31 */ { 5, s_6_31, -1, 1, 0},
+/* 32 */ { 6, s_6_32, -1, 3, 0},
+/* 33 */ { 6, s_6_33, -1, 8, 0},
+/* 34 */ { 5, s_6_34, -1, 1, 0},
+/* 35 */ { 5, s_6_35, -1, 1, 0},
+/* 36 */ { 7, s_6_36, -1, 2, 0},
+/* 37 */ { 7, s_6_37, -1, 4, 0},
+/* 38 */ { 6, s_6_38, -1, 2, 0},
+/* 39 */ { 5, s_6_39, -1, 2, 0},
+/* 40 */ { 4, s_6_40, -1, 1, 0},
+/* 41 */ { 5, s_6_41, -1, 1, 0},
+/* 42 */ { 4, s_6_42, -1, 1, 0},
+/* 43 */ { 8, s_6_43, -1, 1, 0},
+/* 44 */ { 8, s_6_44, -1, 1, 0},
+/* 45 */ { 4, s_6_45, -1, 9, 0}
+};
+
+static const symbol s_7_0[2] = { 'y', 'a' };
+static const symbol s_7_1[2] = { 'y', 'e' };
+static const symbol s_7_2[3] = { 'y', 'a', 'n' };
+static const symbol s_7_3[3] = { 'y', 'e', 'n' };
+static const symbol s_7_4[5] = { 'y', 'e', 'r', 'o', 'n' };
+static const symbol s_7_5[5] = { 'y', 'e', 'n', 'd', 'o' };
+static const symbol s_7_6[2] = { 'y', 'o' };
+static const symbol s_7_7[3] = { 'y', 'a', 's' };
+static const symbol s_7_8[3] = { 'y', 'e', 's' };
+static const symbol s_7_9[4] = { 'y', 'a', 'i', 's' };
+static const symbol s_7_10[5] = { 'y', 'a', 'm', 'o', 's' };
+static const symbol s_7_11[2] = { 'y', 0xF3 };
+
+static const struct among a_7[12] =
+{
+/*  0 */ { 2, s_7_0, -1, 1, 0},
+/*  1 */ { 2, s_7_1, -1, 1, 0},
+/*  2 */ { 3, s_7_2, -1, 1, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 5, s_7_4, -1, 1, 0},
+/*  5 */ { 5, s_7_5, -1, 1, 0},
+/*  6 */ { 2, s_7_6, -1, 1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 3, s_7_8, -1, 1, 0},
+/*  9 */ { 4, s_7_9, -1, 1, 0},
+/* 10 */ { 5, s_7_10, -1, 1, 0},
+/* 11 */ { 2, s_7_11, -1, 1, 0}
+};
+
+static const symbol s_8_0[3] = { 'a', 'b', 'a' };
+static const symbol s_8_1[3] = { 'a', 'd', 'a' };
+static const symbol s_8_2[3] = { 'i', 'd', 'a' };
+static const symbol s_8_3[3] = { 'a', 'r', 'a' };
+static const symbol s_8_4[4] = { 'i', 'e', 'r', 'a' };
+static const symbol s_8_5[2] = { 0xED, 'a' };
+static const symbol s_8_6[4] = { 'a', 'r', 0xED, 'a' };
+static const symbol s_8_7[4] = { 'e', 'r', 0xED, 'a' };
+static const symbol s_8_8[4] = { 'i', 'r', 0xED, 'a' };
+static const symbol s_8_9[2] = { 'a', 'd' };
+static const symbol s_8_10[2] = { 'e', 'd' };
+static const symbol s_8_11[2] = { 'i', 'd' };
+static const symbol s_8_12[3] = { 'a', 's', 'e' };
+static const symbol s_8_13[4] = { 'i', 'e', 's', 'e' };
+static const symbol s_8_14[4] = { 'a', 's', 't', 'e' };
+static const symbol s_8_15[4] = { 'i', 's', 't', 'e' };
+static const symbol s_8_16[2] = { 'a', 'n' };
+static const symbol s_8_17[4] = { 'a', 'b', 'a', 'n' };
+static const symbol s_8_18[4] = { 'a', 'r', 'a', 'n' };
+static const symbol s_8_19[5] = { 'i', 'e', 'r', 'a', 'n' };
+static const symbol s_8_20[3] = { 0xED, 'a', 'n' };
+static const symbol s_8_21[5] = { 'a', 'r', 0xED, 'a', 'n' };
+static const symbol s_8_22[5] = { 'e', 'r', 0xED, 'a', 'n' };
+static const symbol s_8_23[5] = { 'i', 'r', 0xED, 'a', 'n' };
+static const symbol s_8_24[2] = { 'e', 'n' };
+static const symbol s_8_25[4] = { 'a', 's', 'e', 'n' };
+static const symbol s_8_26[5] = { 'i', 'e', 's', 'e', 'n' };
+static const symbol s_8_27[4] = { 'a', 'r', 'o', 'n' };
+static const symbol s_8_28[5] = { 'i', 'e', 'r', 'o', 'n' };
+static const symbol s_8_29[4] = { 'a', 'r', 0xE1, 'n' };
+static const symbol s_8_30[4] = { 'e', 'r', 0xE1, 'n' };
+static const symbol s_8_31[4] = { 'i', 'r', 0xE1, 'n' };
+static const symbol s_8_32[3] = { 'a', 'd', 'o' };
+static const symbol s_8_33[3] = { 'i', 'd', 'o' };
+static const symbol s_8_34[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_8_35[5] = { 'i', 'e', 'n', 'd', 'o' };
+static const symbol s_8_36[2] = { 'a', 'r' };
+static const symbol s_8_37[2] = { 'e', 'r' };
+static const symbol s_8_38[2] = { 'i', 'r' };
+static const symbol s_8_39[2] = { 'a', 's' };
+static const symbol s_8_40[4] = { 'a', 'b', 'a', 's' };
+static const symbol s_8_41[4] = { 'a', 'd', 'a', 's' };
+static const symbol s_8_42[4] = { 'i', 'd', 'a', 's' };
+static const symbol s_8_43[4] = { 'a', 'r', 'a', 's' };
+static const symbol s_8_44[5] = { 'i', 'e', 'r', 'a', 's' };
+static const symbol s_8_45[3] = { 0xED, 'a', 's' };
+static const symbol s_8_46[5] = { 'a', 'r', 0xED, 'a', 's' };
+static const symbol s_8_47[5] = { 'e', 'r', 0xED, 'a', 's' };
+static const symbol s_8_48[5] = { 'i', 'r', 0xED, 'a', 's' };
+static const symbol s_8_49[2] = { 'e', 's' };
+static const symbol s_8_50[4] = { 'a', 's', 'e', 's' };
+static const symbol s_8_51[5] = { 'i', 'e', 's', 'e', 's' };
+static const symbol s_8_52[5] = { 'a', 'b', 'a', 'i', 's' };
+static const symbol s_8_53[5] = { 'a', 'r', 'a', 'i', 's' };
+static const symbol s_8_54[6] = { 'i', 'e', 'r', 'a', 'i', 's' };
+static const symbol s_8_55[4] = { 0xED, 'a', 'i', 's' };
+static const symbol s_8_56[6] = { 'a', 'r', 0xED, 'a', 'i', 's' };
+static const symbol s_8_57[6] = { 'e', 'r', 0xED, 'a', 'i', 's' };
+static const symbol s_8_58[6] = { 'i', 'r', 0xED, 'a', 'i', 's' };
+static const symbol s_8_59[5] = { 'a', 's', 'e', 'i', 's' };
+static const symbol s_8_60[6] = { 'i', 'e', 's', 'e', 'i', 's' };
+static const symbol s_8_61[6] = { 'a', 's', 't', 'e', 'i', 's' };
+static const symbol s_8_62[6] = { 'i', 's', 't', 'e', 'i', 's' };
+static const symbol s_8_63[3] = { 0xE1, 'i', 's' };
+static const symbol s_8_64[3] = { 0xE9, 'i', 's' };
+static const symbol s_8_65[5] = { 'a', 'r', 0xE9, 'i', 's' };
+static const symbol s_8_66[5] = { 'e', 'r', 0xE9, 'i', 's' };
+static const symbol s_8_67[5] = { 'i', 'r', 0xE9, 'i', 's' };
+static const symbol s_8_68[4] = { 'a', 'd', 'o', 's' };
+static const symbol s_8_69[4] = { 'i', 'd', 'o', 's' };
+static const symbol s_8_70[4] = { 'a', 'm', 'o', 's' };
+static const symbol s_8_71[6] = { 0xE1, 'b', 'a', 'm', 'o', 's' };
+static const symbol s_8_72[6] = { 0xE1, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_8_73[7] = { 'i', 0xE9, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_8_74[5] = { 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_8_75[7] = { 'a', 'r', 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_8_76[7] = { 'e', 'r', 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_8_77[7] = { 'i', 'r', 0xED, 'a', 'm', 'o', 's' };
+static const symbol s_8_78[4] = { 'e', 'm', 'o', 's' };
+static const symbol s_8_79[6] = { 'a', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_8_80[6] = { 'e', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_8_81[6] = { 'i', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_8_82[6] = { 0xE1, 's', 'e', 'm', 'o', 's' };
+static const symbol s_8_83[7] = { 'i', 0xE9, 's', 'e', 'm', 'o', 's' };
+static const symbol s_8_84[4] = { 'i', 'm', 'o', 's' };
+static const symbol s_8_85[4] = { 'a', 'r', 0xE1, 's' };
+static const symbol s_8_86[4] = { 'e', 'r', 0xE1, 's' };
+static const symbol s_8_87[4] = { 'i', 'r', 0xE1, 's' };
+static const symbol s_8_88[2] = { 0xED, 's' };
+static const symbol s_8_89[3] = { 'a', 'r', 0xE1 };
+static const symbol s_8_90[3] = { 'e', 'r', 0xE1 };
+static const symbol s_8_91[3] = { 'i', 'r', 0xE1 };
+static const symbol s_8_92[3] = { 'a', 'r', 0xE9 };
+static const symbol s_8_93[3] = { 'e', 'r', 0xE9 };
+static const symbol s_8_94[3] = { 'i', 'r', 0xE9 };
+static const symbol s_8_95[2] = { 'i', 0xF3 };
+
+static const struct among a_8[96] =
+{
+/*  0 */ { 3, s_8_0, -1, 2, 0},
+/*  1 */ { 3, s_8_1, -1, 2, 0},
+/*  2 */ { 3, s_8_2, -1, 2, 0},
+/*  3 */ { 3, s_8_3, -1, 2, 0},
+/*  4 */ { 4, s_8_4, -1, 2, 0},
+/*  5 */ { 2, s_8_5, -1, 2, 0},
+/*  6 */ { 4, s_8_6, 5, 2, 0},
+/*  7 */ { 4, s_8_7, 5, 2, 0},
+/*  8 */ { 4, s_8_8, 5, 2, 0},
+/*  9 */ { 2, s_8_9, -1, 2, 0},
+/* 10 */ { 2, s_8_10, -1, 2, 0},
+/* 11 */ { 2, s_8_11, -1, 2, 0},
+/* 12 */ { 3, s_8_12, -1, 2, 0},
+/* 13 */ { 4, s_8_13, -1, 2, 0},
+/* 14 */ { 4, s_8_14, -1, 2, 0},
+/* 15 */ { 4, s_8_15, -1, 2, 0},
+/* 16 */ { 2, s_8_16, -1, 2, 0},
+/* 17 */ { 4, s_8_17, 16, 2, 0},
+/* 18 */ { 4, s_8_18, 16, 2, 0},
+/* 19 */ { 5, s_8_19, 16, 2, 0},
+/* 20 */ { 3, s_8_20, 16, 2, 0},
+/* 21 */ { 5, s_8_21, 20, 2, 0},
+/* 22 */ { 5, s_8_22, 20, 2, 0},
+/* 23 */ { 5, s_8_23, 20, 2, 0},
+/* 24 */ { 2, s_8_24, -1, 1, 0},
+/* 25 */ { 4, s_8_25, 24, 2, 0},
+/* 26 */ { 5, s_8_26, 24, 2, 0},
+/* 27 */ { 4, s_8_27, -1, 2, 0},
+/* 28 */ { 5, s_8_28, -1, 2, 0},
+/* 29 */ { 4, s_8_29, -1, 2, 0},
+/* 30 */ { 4, s_8_30, -1, 2, 0},
+/* 31 */ { 4, s_8_31, -1, 2, 0},
+/* 32 */ { 3, s_8_32, -1, 2, 0},
+/* 33 */ { 3, s_8_33, -1, 2, 0},
+/* 34 */ { 4, s_8_34, -1, 2, 0},
+/* 35 */ { 5, s_8_35, -1, 2, 0},
+/* 36 */ { 2, s_8_36, -1, 2, 0},
+/* 37 */ { 2, s_8_37, -1, 2, 0},
+/* 38 */ { 2, s_8_38, -1, 2, 0},
+/* 39 */ { 2, s_8_39, -1, 2, 0},
+/* 40 */ { 4, s_8_40, 39, 2, 0},
+/* 41 */ { 4, s_8_41, 39, 2, 0},
+/* 42 */ { 4, s_8_42, 39, 2, 0},
+/* 43 */ { 4, s_8_43, 39, 2, 0},
+/* 44 */ { 5, s_8_44, 39, 2, 0},
+/* 45 */ { 3, s_8_45, 39, 2, 0},
+/* 46 */ { 5, s_8_46, 45, 2, 0},
+/* 47 */ { 5, s_8_47, 45, 2, 0},
+/* 48 */ { 5, s_8_48, 45, 2, 0},
+/* 49 */ { 2, s_8_49, -1, 1, 0},
+/* 50 */ { 4, s_8_50, 49, 2, 0},
+/* 51 */ { 5, s_8_51, 49, 2, 0},
+/* 52 */ { 5, s_8_52, -1, 2, 0},
+/* 53 */ { 5, s_8_53, -1, 2, 0},
+/* 54 */ { 6, s_8_54, -1, 2, 0},
+/* 55 */ { 4, s_8_55, -1, 2, 0},
+/* 56 */ { 6, s_8_56, 55, 2, 0},
+/* 57 */ { 6, s_8_57, 55, 2, 0},
+/* 58 */ { 6, s_8_58, 55, 2, 0},
+/* 59 */ { 5, s_8_59, -1, 2, 0},
+/* 60 */ { 6, s_8_60, -1, 2, 0},
+/* 61 */ { 6, s_8_61, -1, 2, 0},
+/* 62 */ { 6, s_8_62, -1, 2, 0},
+/* 63 */ { 3, s_8_63, -1, 2, 0},
+/* 64 */ { 3, s_8_64, -1, 1, 0},
+/* 65 */ { 5, s_8_65, 64, 2, 0},
+/* 66 */ { 5, s_8_66, 64, 2, 0},
+/* 67 */ { 5, s_8_67, 64, 2, 0},
+/* 68 */ { 4, s_8_68, -1, 2, 0},
+/* 69 */ { 4, s_8_69, -1, 2, 0},
+/* 70 */ { 4, s_8_70, -1, 2, 0},
+/* 71 */ { 6, s_8_71, 70, 2, 0},
+/* 72 */ { 6, s_8_72, 70, 2, 0},
+/* 73 */ { 7, s_8_73, 70, 2, 0},
+/* 74 */ { 5, s_8_74, 70, 2, 0},
+/* 75 */ { 7, s_8_75, 74, 2, 0},
+/* 76 */ { 7, s_8_76, 74, 2, 0},
+/* 77 */ { 7, s_8_77, 74, 2, 0},
+/* 78 */ { 4, s_8_78, -1, 1, 0},
+/* 79 */ { 6, s_8_79, 78, 2, 0},
+/* 80 */ { 6, s_8_80, 78, 2, 0},
+/* 81 */ { 6, s_8_81, 78, 2, 0},
+/* 82 */ { 6, s_8_82, 78, 2, 0},
+/* 83 */ { 7, s_8_83, 78, 2, 0},
+/* 84 */ { 4, s_8_84, -1, 2, 0},
+/* 85 */ { 4, s_8_85, -1, 2, 0},
+/* 86 */ { 4, s_8_86, -1, 2, 0},
+/* 87 */ { 4, s_8_87, -1, 2, 0},
+/* 88 */ { 2, s_8_88, -1, 2, 0},
+/* 89 */ { 3, s_8_89, -1, 2, 0},
+/* 90 */ { 3, s_8_90, -1, 2, 0},
+/* 91 */ { 3, s_8_91, -1, 2, 0},
+/* 92 */ { 3, s_8_92, -1, 2, 0},
+/* 93 */ { 3, s_8_93, -1, 2, 0},
+/* 94 */ { 3, s_8_94, -1, 2, 0},
+/* 95 */ { 2, s_8_95, -1, 2, 0}
+};
+
+static const symbol s_9_0[1] = { 'a' };
+static const symbol s_9_1[1] = { 'e' };
+static const symbol s_9_2[1] = { 'o' };
+static const symbol s_9_3[2] = { 'o', 's' };
+static const symbol s_9_4[1] = { 0xE1 };
+static const symbol s_9_5[1] = { 0xE9 };
+static const symbol s_9_6[1] = { 0xED };
+static const symbol s_9_7[1] = { 0xF3 };
+
+static const struct among a_9[8] =
+{
+/*  0 */ { 1, s_9_0, -1, 1, 0},
+/*  1 */ { 1, s_9_1, -1, 2, 0},
+/*  2 */ { 1, s_9_2, -1, 1, 0},
+/*  3 */ { 2, s_9_3, -1, 1, 0},
+/*  4 */ { 1, s_9_4, -1, 1, 0},
+/*  5 */ { 1, s_9_5, -1, 2, 0},
+/*  6 */ { 1, s_9_6, -1, 1, 0},
+/*  7 */ { 1, s_9_7, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 4, 10 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'o' };
+static const symbol s_4[] = { 'u' };
+static const symbol s_5[] = { 'i', 'e', 'n', 'd', 'o' };
+static const symbol s_6[] = { 'a', 'n', 'd', 'o' };
+static const symbol s_7[] = { 'a', 'r' };
+static const symbol s_8[] = { 'e', 'r' };
+static const symbol s_9[] = { 'i', 'r' };
+static const symbol s_10[] = { 'u' };
+static const symbol s_11[] = { 'i', 'c' };
+static const symbol s_12[] = { 'l', 'o', 'g' };
+static const symbol s_13[] = { 'u' };
+static const symbol s_14[] = { 'e', 'n', 't', 'e' };
+static const symbol s_15[] = { 'a', 't' };
+static const symbol s_16[] = { 'a', 't' };
+static const symbol s_17[] = { 'u' };
+static const symbol s_18[] = { 'u' };
+static const symbol s_19[] = { 'g' };
+static const symbol s_20[] = { 'u' };
+static const symbol s_21[] = { 'g' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 37 */
+        {   int c2 = z->c; /* or, line 39 */
+            if (in_grouping(z, g_v, 97, 252, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 38 */
+                if (out_grouping(z, g_v, 97, 252, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 38 */
+                    int ret = out_grouping(z, g_v, 97, 252, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping(z, g_v, 97, 252, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 38 */
+                    int ret = in_grouping(z, g_v, 97, 252, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping(z, g_v, 97, 252, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 40 */
+                if (out_grouping(z, g_v, 97, 252, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 40 */
+                    int ret = out_grouping(z, g_v, 97, 252, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping(z, g_v, 97, 252, 0)) goto lab0;
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 40 */
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 41 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 43 */
+        {    /* gopast */ /* grouping v, line 44 */
+            int ret = out_grouping(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 44 */
+            int ret = in_grouping(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 44 */
+        {    /* gopast */ /* grouping v, line 45 */
+            int ret = out_grouping(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 45 */
+            int ret = in_grouping(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 45 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 49 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 50 */
+        if (z->c >= z->l || z->p[z->c + 0] >> 5 != 7 || !((67641858 >> (z->p[z->c + 0] & 0x1f)) & 1)) among_var = 6; else
+        among_var = find_among(z, a_0, 6); /* substring, line 50 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 50 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_0); /* <-, line 51 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_1); /* <-, line 52 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 1, s_2); /* <-, line 53 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = slice_from_s(z, 1, s_3); /* <-, line 54 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = slice_from_s(z, 1, s_4); /* <-, line 55 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 6:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 57 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_attached_pronoun(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 68 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((557090 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    if (!(find_among_b(z, a_1, 13))) return 0; /* substring, line 68 */
+    z->bra = z->c; /* ], line 68 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 111 && z->p[z->c - 1] != 114)) return 0;
+    among_var = find_among_b(z, a_2, 11); /* substring, line 72 */
+    if (!(among_var)) return 0;
+    {   int ret = r_RV(z);
+        if (ret == 0) return 0; /* call RV, line 72 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            z->bra = z->c; /* ], line 73 */
+            {   int ret = slice_from_s(z, 5, s_5); /* <-, line 73 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            z->bra = z->c; /* ], line 74 */
+            {   int ret = slice_from_s(z, 4, s_6); /* <-, line 74 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            z->bra = z->c; /* ], line 75 */
+            {   int ret = slice_from_s(z, 2, s_7); /* <-, line 75 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            z->bra = z->c; /* ], line 76 */
+            {   int ret = slice_from_s(z, 2, s_8); /* <-, line 76 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            z->bra = z->c; /* ], line 77 */
+            {   int ret = slice_from_s(z, 2, s_9); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_del(z); /* delete, line 81 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            if (!(eq_s_b(z, 1, s_10))) return 0;
+            {   int ret = slice_del(z); /* delete, line 82 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 87 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((835634 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_6, 46); /* substring, line 87 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 87 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 99 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 99 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 105 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 105 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 106 */
+                z->ket = z->c; /* [, line 106 */
+                if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 106 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 106 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 106 */
+                    if (ret < 0) return ret;
+                }
+            lab0:
+                ;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 111 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_12); /* <-, line 111 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 115 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 115 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 119 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 4, s_14); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 123 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 123 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 124 */
+                z->ket = z->c; /* [, line 125 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4718616 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab1; }
+                among_var = find_among_b(z, a_3, 4); /* substring, line 125 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab1; }
+                z->bra = z->c; /* ], line 125 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 125 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 125 */
+                    if (ret < 0) return ret;
+                }
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab1; }
+                    case 1:
+                        z->ket = z->c; /* [, line 126 */
+                        if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m_keep; goto lab1; }
+                        z->bra = z->c; /* ], line 126 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 126 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 126 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab1:
+                ;
+            }
+            break;
+        case 7:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 135 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 135 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 136 */
+                z->ket = z->c; /* [, line 137 */
+                if (z->c - 3 <= z->lb || z->p[z->c - 1] != 101) { z->c = z->l - m_keep; goto lab2; }
+                among_var = find_among_b(z, a_4, 3); /* substring, line 137 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab2; }
+                z->bra = z->c; /* ], line 137 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab2; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call R2, line 140 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 140 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab2:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 147 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 147 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 148 */
+                z->ket = z->c; /* [, line 149 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab3; }
+                among_var = find_among_b(z, a_5, 3); /* substring, line 149 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 149 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab3; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 152 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 152 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab3:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 159 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 159 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 160 */
+                z->ket = z->c; /* [, line 161 */
+                if (!(eq_s_b(z, 2, s_16))) { z->c = z->l - m_keep; goto lab4; }
+                z->bra = z->c; /* ], line 161 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab4; } /* call R2, line 161 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 161 */
+                    if (ret < 0) return ret;
+                }
+            lab4:
+                ;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_y_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 168 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 168 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 168 */
+        among_var = find_among_b(z, a_7, 12); /* substring, line 168 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 168 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            if (!(eq_s_b(z, 1, s_17))) return 0;
+            {   int ret = slice_del(z); /* delete, line 171 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 176 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 176 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 176 */
+        among_var = find_among_b(z, a_8, 96); /* substring, line 176 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 176 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 179 */
+                if (!(eq_s_b(z, 1, s_18))) { z->c = z->l - m_keep; goto lab0; }
+                {   int m_test = z->l - z->c; /* test, line 179 */
+                    if (!(eq_s_b(z, 1, s_19))) { z->c = z->l - m_keep; goto lab0; }
+                    z->c = z->l - m_test;
+                }
+            lab0:
+                ;
+            }
+            z->bra = z->c; /* ], line 179 */
+            {   int ret = slice_del(z); /* delete, line 179 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 200 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_residual_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 205 */
+    among_var = find_among_b(z, a_9, 8); /* substring, line 205 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 205 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 208 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 208 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 210 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 210 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 210 */
+                z->ket = z->c; /* [, line 210 */
+                if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 210 */
+                {   int m_test = z->l - z->c; /* test, line 210 */
+                    if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m_keep; goto lab0; }
+                    z->c = z->l - m_test;
+                }
+                {   int ret = r_RV(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call RV, line 210 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 210 */
+                    if (ret < 0) return ret;
+                }
+            lab0:
+                ;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int spanish_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 216 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 216 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 217 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 218 */
+        {   int ret = r_attached_pronoun(z);
+            if (ret == 0) goto lab1; /* call attached_pronoun, line 218 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 219 */
+        {   int m4 = z->l - z->c; (void)m4; /* or, line 219 */
+            {   int ret = r_standard_suffix(z);
+                if (ret == 0) goto lab4; /* call standard_suffix, line 219 */
+                if (ret < 0) return ret;
+            }
+            goto lab3;
+        lab4:
+            z->c = z->l - m4;
+            {   int ret = r_y_verb_suffix(z);
+                if (ret == 0) goto lab5; /* call y_verb_suffix, line 220 */
+                if (ret < 0) return ret;
+            }
+            goto lab3;
+        lab5:
+            z->c = z->l - m4;
+            {   int ret = r_verb_suffix(z);
+                if (ret == 0) goto lab2; /* call verb_suffix, line 221 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab3:
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 223 */
+        {   int ret = r_residual_suffix(z);
+            if (ret == 0) goto lab6; /* call residual_suffix, line 223 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m5;
+    }
+    z->c = z->lb;
+    {   int c6 = z->c; /* do, line 225 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab7; /* call postlude, line 225 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = c6;
+    }
+    return 1;
+}
+
+extern struct SN_env * spanish_ISO_8859_1_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void spanish_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_1_swedish.c b/src/backend/snowball/libstemmer/stem_ISO_8859_1_swedish.c
new file mode 100644
index 000000000000..f9bef1ada564
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_1_swedish.c
@@ -0,0 +1,307 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int swedish_ISO_8859_1_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_other_suffix(struct SN_env * z);
+static int r_consonant_pair(struct SN_env * z);
+static int r_main_suffix(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * swedish_ISO_8859_1_create_env(void);
+extern void swedish_ISO_8859_1_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[1] = { 'a' };
+static const symbol s_0_1[4] = { 'a', 'r', 'n', 'a' };
+static const symbol s_0_2[4] = { 'e', 'r', 'n', 'a' };
+static const symbol s_0_3[7] = { 'h', 'e', 't', 'e', 'r', 'n', 'a' };
+static const symbol s_0_4[4] = { 'o', 'r', 'n', 'a' };
+static const symbol s_0_5[2] = { 'a', 'd' };
+static const symbol s_0_6[1] = { 'e' };
+static const symbol s_0_7[3] = { 'a', 'd', 'e' };
+static const symbol s_0_8[4] = { 'a', 'n', 'd', 'e' };
+static const symbol s_0_9[4] = { 'a', 'r', 'n', 'e' };
+static const symbol s_0_10[3] = { 'a', 'r', 'e' };
+static const symbol s_0_11[4] = { 'a', 's', 't', 'e' };
+static const symbol s_0_12[2] = { 'e', 'n' };
+static const symbol s_0_13[5] = { 'a', 'n', 'd', 'e', 'n' };
+static const symbol s_0_14[4] = { 'a', 'r', 'e', 'n' };
+static const symbol s_0_15[5] = { 'h', 'e', 't', 'e', 'n' };
+static const symbol s_0_16[3] = { 'e', 'r', 'n' };
+static const symbol s_0_17[2] = { 'a', 'r' };
+static const symbol s_0_18[2] = { 'e', 'r' };
+static const symbol s_0_19[5] = { 'h', 'e', 't', 'e', 'r' };
+static const symbol s_0_20[2] = { 'o', 'r' };
+static const symbol s_0_21[1] = { 's' };
+static const symbol s_0_22[2] = { 'a', 's' };
+static const symbol s_0_23[5] = { 'a', 'r', 'n', 'a', 's' };
+static const symbol s_0_24[5] = { 'e', 'r', 'n', 'a', 's' };
+static const symbol s_0_25[5] = { 'o', 'r', 'n', 'a', 's' };
+static const symbol s_0_26[2] = { 'e', 's' };
+static const symbol s_0_27[4] = { 'a', 'd', 'e', 's' };
+static const symbol s_0_28[5] = { 'a', 'n', 'd', 'e', 's' };
+static const symbol s_0_29[3] = { 'e', 'n', 's' };
+static const symbol s_0_30[5] = { 'a', 'r', 'e', 'n', 's' };
+static const symbol s_0_31[6] = { 'h', 'e', 't', 'e', 'n', 's' };
+static const symbol s_0_32[4] = { 'e', 'r', 'n', 's' };
+static const symbol s_0_33[2] = { 'a', 't' };
+static const symbol s_0_34[5] = { 'a', 'n', 'd', 'e', 't' };
+static const symbol s_0_35[3] = { 'h', 'e', 't' };
+static const symbol s_0_36[3] = { 'a', 's', 't' };
+
+static const struct among a_0[37] =
+{
+/*  0 */ { 1, s_0_0, -1, 1, 0},
+/*  1 */ { 4, s_0_1, 0, 1, 0},
+/*  2 */ { 4, s_0_2, 0, 1, 0},
+/*  3 */ { 7, s_0_3, 2, 1, 0},
+/*  4 */ { 4, s_0_4, 0, 1, 0},
+/*  5 */ { 2, s_0_5, -1, 1, 0},
+/*  6 */ { 1, s_0_6, -1, 1, 0},
+/*  7 */ { 3, s_0_7, 6, 1, 0},
+/*  8 */ { 4, s_0_8, 6, 1, 0},
+/*  9 */ { 4, s_0_9, 6, 1, 0},
+/* 10 */ { 3, s_0_10, 6, 1, 0},
+/* 11 */ { 4, s_0_11, 6, 1, 0},
+/* 12 */ { 2, s_0_12, -1, 1, 0},
+/* 13 */ { 5, s_0_13, 12, 1, 0},
+/* 14 */ { 4, s_0_14, 12, 1, 0},
+/* 15 */ { 5, s_0_15, 12, 1, 0},
+/* 16 */ { 3, s_0_16, -1, 1, 0},
+/* 17 */ { 2, s_0_17, -1, 1, 0},
+/* 18 */ { 2, s_0_18, -1, 1, 0},
+/* 19 */ { 5, s_0_19, 18, 1, 0},
+/* 20 */ { 2, s_0_20, -1, 1, 0},
+/* 21 */ { 1, s_0_21, -1, 2, 0},
+/* 22 */ { 2, s_0_22, 21, 1, 0},
+/* 23 */ { 5, s_0_23, 22, 1, 0},
+/* 24 */ { 5, s_0_24, 22, 1, 0},
+/* 25 */ { 5, s_0_25, 22, 1, 0},
+/* 26 */ { 2, s_0_26, 21, 1, 0},
+/* 27 */ { 4, s_0_27, 26, 1, 0},
+/* 28 */ { 5, s_0_28, 26, 1, 0},
+/* 29 */ { 3, s_0_29, 21, 1, 0},
+/* 30 */ { 5, s_0_30, 29, 1, 0},
+/* 31 */ { 6, s_0_31, 29, 1, 0},
+/* 32 */ { 4, s_0_32, 21, 1, 0},
+/* 33 */ { 2, s_0_33, -1, 1, 0},
+/* 34 */ { 5, s_0_34, -1, 1, 0},
+/* 35 */ { 3, s_0_35, -1, 1, 0},
+/* 36 */ { 3, s_0_36, -1, 1, 0}
+};
+
+static const symbol s_1_0[2] = { 'd', 'd' };
+static const symbol s_1_1[2] = { 'g', 'd' };
+static const symbol s_1_2[2] = { 'n', 'n' };
+static const symbol s_1_3[2] = { 'd', 't' };
+static const symbol s_1_4[2] = { 'g', 't' };
+static const symbol s_1_5[2] = { 'k', 't' };
+static const symbol s_1_6[2] = { 't', 't' };
+
+static const struct among a_1[7] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0},
+/*  2 */ { 2, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0},
+/*  4 */ { 2, s_1_4, -1, -1, 0},
+/*  5 */ { 2, s_1_5, -1, -1, 0},
+/*  6 */ { 2, s_1_6, -1, -1, 0}
+};
+
+static const symbol s_2_0[2] = { 'i', 'g' };
+static const symbol s_2_1[3] = { 'l', 'i', 'g' };
+static const symbol s_2_2[3] = { 'e', 'l', 's' };
+static const symbol s_2_3[5] = { 'f', 'u', 'l', 'l', 't' };
+static const symbol s_2_4[4] = { 'l', 0xF6, 's', 't' };
+
+static const struct among a_2[5] =
+{
+/*  0 */ { 2, s_2_0, -1, 1, 0},
+/*  1 */ { 3, s_2_1, 0, 1, 0},
+/*  2 */ { 3, s_2_2, -1, 1, 0},
+/*  3 */ { 5, s_2_3, -1, 3, 0},
+/*  4 */ { 4, s_2_4, -1, 2, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 32 };
+
+static const unsigned char g_s_ending[] = { 119, 127, 149 };
+
+static const symbol s_0[] = { 'l', 0xF6, 's' };
+static const symbol s_1[] = { 'f', 'u', 'l', 'l' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c_test = z->c; /* test, line 29 */
+        {   int ret = z->c + 3;
+            if (0 > ret || ret > z->l) return 0;
+            z->c = ret; /* hop, line 29 */
+        }
+        z->I[1] = z->c; /* setmark x, line 29 */
+        z->c = c_test;
+    }
+    if (out_grouping(z, g_v, 97, 246, 1) < 0) return 0; /* goto */ /* grouping v, line 30 */
+    {    /* gopast */ /* non v, line 30 */
+        int ret = in_grouping(z, g_v, 97, 246, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 30 */
+     /* try, line 31 */
+    if (!(z->I[0] < z->I[1])) goto lab0;
+    z->I[0] = z->I[1];
+lab0:
+    return 1;
+}
+
+static int r_main_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 37 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 37 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 37 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851442 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_0, 37); /* substring, line 37 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 37 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 44 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (in_grouping_b(z, g_s_ending, 98, 121, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 46 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_consonant_pair(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 50 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 50 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* and, line 52 */
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1064976 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+            if (!(find_among_b(z, a_1, 7))) { z->lb = mlimit; return 0; } /* among, line 51 */
+            z->c = z->l - m2;
+            z->ket = z->c; /* [, line 52 */
+            if (z->c <= z->lb) { z->lb = mlimit; return 0; }
+            z->c--; /* next, line 52 */
+            z->bra = z->c; /* ], line 52 */
+            {   int ret = slice_del(z); /* delete, line 52 */
+                if (ret < 0) return ret;
+            }
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_other_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 55 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 55 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 56 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1572992 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_2, 5); /* substring, line 56 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 56 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 57 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 3, s_0); /* <-, line 58 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 4, s_1); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+extern int swedish_ISO_8859_1_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 66 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 66 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 67 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 68 */
+        {   int ret = r_main_suffix(z);
+            if (ret == 0) goto lab1; /* call main_suffix, line 68 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 69 */
+        {   int ret = r_consonant_pair(z);
+            if (ret == 0) goto lab2; /* call consonant_pair, line 69 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 70 */
+        {   int ret = r_other_suffix(z);
+            if (ret == 0) goto lab3; /* call other_suffix, line 70 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * swedish_ISO_8859_1_create_env(void) { return SN_create_env(0, 2, 0); }
+
+extern void swedish_ISO_8859_1_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_ISO_8859_2_romanian.c b/src/backend/snowball/libstemmer/stem_ISO_8859_2_romanian.c
new file mode 100644
index 000000000000..d5cc2bec3fca
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_ISO_8859_2_romanian.c
@@ -0,0 +1,998 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int romanian_ISO_8859_2_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_vowel_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_combo_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_step_0(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * romanian_ISO_8859_2_create_env(void);
+extern void romanian_ISO_8859_2_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 'I' };
+static const symbol s_0_2[1] = { 'U' };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 1, s_0_1, 0, 1, 0},
+/*  2 */ { 1, s_0_2, 0, 2, 0}
+};
+
+static const symbol s_1_0[2] = { 'e', 'a' };
+static const symbol s_1_1[4] = { 'a', 0xFE, 'i', 'a' };
+static const symbol s_1_2[3] = { 'a', 'u', 'a' };
+static const symbol s_1_3[3] = { 'i', 'u', 'a' };
+static const symbol s_1_4[4] = { 'a', 0xFE, 'i', 'e' };
+static const symbol s_1_5[3] = { 'e', 'l', 'e' };
+static const symbol s_1_6[3] = { 'i', 'l', 'e' };
+static const symbol s_1_7[4] = { 'i', 'i', 'l', 'e' };
+static const symbol s_1_8[3] = { 'i', 'e', 'i' };
+static const symbol s_1_9[4] = { 'a', 't', 'e', 'i' };
+static const symbol s_1_10[2] = { 'i', 'i' };
+static const symbol s_1_11[4] = { 'u', 'l', 'u', 'i' };
+static const symbol s_1_12[2] = { 'u', 'l' };
+static const symbol s_1_13[4] = { 'e', 'l', 'o', 'r' };
+static const symbol s_1_14[4] = { 'i', 'l', 'o', 'r' };
+static const symbol s_1_15[5] = { 'i', 'i', 'l', 'o', 'r' };
+
+static const struct among a_1[16] =
+{
+/*  0 */ { 2, s_1_0, -1, 3, 0},
+/*  1 */ { 4, s_1_1, -1, 7, 0},
+/*  2 */ { 3, s_1_2, -1, 2, 0},
+/*  3 */ { 3, s_1_3, -1, 4, 0},
+/*  4 */ { 4, s_1_4, -1, 7, 0},
+/*  5 */ { 3, s_1_5, -1, 3, 0},
+/*  6 */ { 3, s_1_6, -1, 5, 0},
+/*  7 */ { 4, s_1_7, 6, 4, 0},
+/*  8 */ { 3, s_1_8, -1, 4, 0},
+/*  9 */ { 4, s_1_9, -1, 6, 0},
+/* 10 */ { 2, s_1_10, -1, 4, 0},
+/* 11 */ { 4, s_1_11, -1, 1, 0},
+/* 12 */ { 2, s_1_12, -1, 1, 0},
+/* 13 */ { 4, s_1_13, -1, 3, 0},
+/* 14 */ { 4, s_1_14, -1, 4, 0},
+/* 15 */ { 5, s_1_15, 14, 4, 0}
+};
+
+static const symbol s_2_0[5] = { 'i', 'c', 'a', 'l', 'a' };
+static const symbol s_2_1[5] = { 'i', 'c', 'i', 'v', 'a' };
+static const symbol s_2_2[5] = { 'a', 't', 'i', 'v', 'a' };
+static const symbol s_2_3[5] = { 'i', 't', 'i', 'v', 'a' };
+static const symbol s_2_4[5] = { 'i', 'c', 'a', 'l', 'e' };
+static const symbol s_2_5[6] = { 'a', 0xFE, 'i', 'u', 'n', 'e' };
+static const symbol s_2_6[6] = { 'i', 0xFE, 'i', 'u', 'n', 'e' };
+static const symbol s_2_7[6] = { 'a', 't', 'o', 'a', 'r', 'e' };
+static const symbol s_2_8[6] = { 'i', 't', 'o', 'a', 'r', 'e' };
+static const symbol s_2_9[6] = { 0xE3, 't', 'o', 'a', 'r', 'e' };
+static const symbol s_2_10[7] = { 'i', 'c', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_11[9] = { 'a', 'b', 'i', 'l', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_12[9] = { 'i', 'b', 'i', 'l', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_13[7] = { 'i', 'v', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_14[5] = { 'i', 'c', 'i', 'v', 'e' };
+static const symbol s_2_15[5] = { 'a', 't', 'i', 'v', 'e' };
+static const symbol s_2_16[5] = { 'i', 't', 'i', 'v', 'e' };
+static const symbol s_2_17[5] = { 'i', 'c', 'a', 'l', 'i' };
+static const symbol s_2_18[5] = { 'a', 't', 'o', 'r', 'i' };
+static const symbol s_2_19[7] = { 'i', 'c', 'a', 't', 'o', 'r', 'i' };
+static const symbol s_2_20[5] = { 'i', 't', 'o', 'r', 'i' };
+static const symbol s_2_21[5] = { 0xE3, 't', 'o', 'r', 'i' };
+static const symbol s_2_22[7] = { 'i', 'c', 'i', 't', 'a', 't', 'i' };
+static const symbol s_2_23[9] = { 'a', 'b', 'i', 'l', 'i', 't', 'a', 't', 'i' };
+static const symbol s_2_24[7] = { 'i', 'v', 'i', 't', 'a', 't', 'i' };
+static const symbol s_2_25[5] = { 'i', 'c', 'i', 'v', 'i' };
+static const symbol s_2_26[5] = { 'a', 't', 'i', 'v', 'i' };
+static const symbol s_2_27[5] = { 'i', 't', 'i', 'v', 'i' };
+static const symbol s_2_28[6] = { 'i', 'c', 'i', 't', 0xE3, 'i' };
+static const symbol s_2_29[8] = { 'a', 'b', 'i', 'l', 'i', 't', 0xE3, 'i' };
+static const symbol s_2_30[6] = { 'i', 'v', 'i', 't', 0xE3, 'i' };
+static const symbol s_2_31[7] = { 'i', 'c', 'i', 't', 0xE3, 0xFE, 'i' };
+static const symbol s_2_32[9] = { 'a', 'b', 'i', 'l', 'i', 't', 0xE3, 0xFE, 'i' };
+static const symbol s_2_33[7] = { 'i', 'v', 'i', 't', 0xE3, 0xFE, 'i' };
+static const symbol s_2_34[4] = { 'i', 'c', 'a', 'l' };
+static const symbol s_2_35[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_2_36[6] = { 'i', 'c', 'a', 't', 'o', 'r' };
+static const symbol s_2_37[4] = { 'i', 't', 'o', 'r' };
+static const symbol s_2_38[4] = { 0xE3, 't', 'o', 'r' };
+static const symbol s_2_39[4] = { 'i', 'c', 'i', 'v' };
+static const symbol s_2_40[4] = { 'a', 't', 'i', 'v' };
+static const symbol s_2_41[4] = { 'i', 't', 'i', 'v' };
+static const symbol s_2_42[5] = { 'i', 'c', 'a', 'l', 0xE3 };
+static const symbol s_2_43[5] = { 'i', 'c', 'i', 'v', 0xE3 };
+static const symbol s_2_44[5] = { 'a', 't', 'i', 'v', 0xE3 };
+static const symbol s_2_45[5] = { 'i', 't', 'i', 'v', 0xE3 };
+
+static const struct among a_2[46] =
+{
+/*  0 */ { 5, s_2_0, -1, 4, 0},
+/*  1 */ { 5, s_2_1, -1, 4, 0},
+/*  2 */ { 5, s_2_2, -1, 5, 0},
+/*  3 */ { 5, s_2_3, -1, 6, 0},
+/*  4 */ { 5, s_2_4, -1, 4, 0},
+/*  5 */ { 6, s_2_5, -1, 5, 0},
+/*  6 */ { 6, s_2_6, -1, 6, 0},
+/*  7 */ { 6, s_2_7, -1, 5, 0},
+/*  8 */ { 6, s_2_8, -1, 6, 0},
+/*  9 */ { 6, s_2_9, -1, 5, 0},
+/* 10 */ { 7, s_2_10, -1, 4, 0},
+/* 11 */ { 9, s_2_11, -1, 1, 0},
+/* 12 */ { 9, s_2_12, -1, 2, 0},
+/* 13 */ { 7, s_2_13, -1, 3, 0},
+/* 14 */ { 5, s_2_14, -1, 4, 0},
+/* 15 */ { 5, s_2_15, -1, 5, 0},
+/* 16 */ { 5, s_2_16, -1, 6, 0},
+/* 17 */ { 5, s_2_17, -1, 4, 0},
+/* 18 */ { 5, s_2_18, -1, 5, 0},
+/* 19 */ { 7, s_2_19, 18, 4, 0},
+/* 20 */ { 5, s_2_20, -1, 6, 0},
+/* 21 */ { 5, s_2_21, -1, 5, 0},
+/* 22 */ { 7, s_2_22, -1, 4, 0},
+/* 23 */ { 9, s_2_23, -1, 1, 0},
+/* 24 */ { 7, s_2_24, -1, 3, 0},
+/* 25 */ { 5, s_2_25, -1, 4, 0},
+/* 26 */ { 5, s_2_26, -1, 5, 0},
+/* 27 */ { 5, s_2_27, -1, 6, 0},
+/* 28 */ { 6, s_2_28, -1, 4, 0},
+/* 29 */ { 8, s_2_29, -1, 1, 0},
+/* 30 */ { 6, s_2_30, -1, 3, 0},
+/* 31 */ { 7, s_2_31, -1, 4, 0},
+/* 32 */ { 9, s_2_32, -1, 1, 0},
+/* 33 */ { 7, s_2_33, -1, 3, 0},
+/* 34 */ { 4, s_2_34, -1, 4, 0},
+/* 35 */ { 4, s_2_35, -1, 5, 0},
+/* 36 */ { 6, s_2_36, 35, 4, 0},
+/* 37 */ { 4, s_2_37, -1, 6, 0},
+/* 38 */ { 4, s_2_38, -1, 5, 0},
+/* 39 */ { 4, s_2_39, -1, 4, 0},
+/* 40 */ { 4, s_2_40, -1, 5, 0},
+/* 41 */ { 4, s_2_41, -1, 6, 0},
+/* 42 */ { 5, s_2_42, -1, 4, 0},
+/* 43 */ { 5, s_2_43, -1, 4, 0},
+/* 44 */ { 5, s_2_44, -1, 5, 0},
+/* 45 */ { 5, s_2_45, -1, 6, 0}
+};
+
+static const symbol s_3_0[3] = { 'i', 'c', 'a' };
+static const symbol s_3_1[5] = { 'a', 'b', 'i', 'l', 'a' };
+static const symbol s_3_2[5] = { 'i', 'b', 'i', 'l', 'a' };
+static const symbol s_3_3[4] = { 'o', 'a', 's', 'a' };
+static const symbol s_3_4[3] = { 'a', 't', 'a' };
+static const symbol s_3_5[3] = { 'i', 't', 'a' };
+static const symbol s_3_6[4] = { 'a', 'n', 't', 'a' };
+static const symbol s_3_7[4] = { 'i', 's', 't', 'a' };
+static const symbol s_3_8[3] = { 'u', 't', 'a' };
+static const symbol s_3_9[3] = { 'i', 'v', 'a' };
+static const symbol s_3_10[2] = { 'i', 'c' };
+static const symbol s_3_11[3] = { 'i', 'c', 'e' };
+static const symbol s_3_12[5] = { 'a', 'b', 'i', 'l', 'e' };
+static const symbol s_3_13[5] = { 'i', 'b', 'i', 'l', 'e' };
+static const symbol s_3_14[4] = { 'i', 's', 'm', 'e' };
+static const symbol s_3_15[4] = { 'i', 'u', 'n', 'e' };
+static const symbol s_3_16[4] = { 'o', 'a', 's', 'e' };
+static const symbol s_3_17[3] = { 'a', 't', 'e' };
+static const symbol s_3_18[5] = { 'i', 't', 'a', 't', 'e' };
+static const symbol s_3_19[3] = { 'i', 't', 'e' };
+static const symbol s_3_20[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_3_21[4] = { 'i', 's', 't', 'e' };
+static const symbol s_3_22[3] = { 'u', 't', 'e' };
+static const symbol s_3_23[3] = { 'i', 'v', 'e' };
+static const symbol s_3_24[3] = { 'i', 'c', 'i' };
+static const symbol s_3_25[5] = { 'a', 'b', 'i', 'l', 'i' };
+static const symbol s_3_26[5] = { 'i', 'b', 'i', 'l', 'i' };
+static const symbol s_3_27[4] = { 'i', 'u', 'n', 'i' };
+static const symbol s_3_28[5] = { 'a', 't', 'o', 'r', 'i' };
+static const symbol s_3_29[3] = { 'o', 's', 'i' };
+static const symbol s_3_30[3] = { 'a', 't', 'i' };
+static const symbol s_3_31[5] = { 'i', 't', 'a', 't', 'i' };
+static const symbol s_3_32[3] = { 'i', 't', 'i' };
+static const symbol s_3_33[4] = { 'a', 'n', 't', 'i' };
+static const symbol s_3_34[4] = { 'i', 's', 't', 'i' };
+static const symbol s_3_35[3] = { 'u', 't', 'i' };
+static const symbol s_3_36[4] = { 'i', 0xBA, 't', 'i' };
+static const symbol s_3_37[3] = { 'i', 'v', 'i' };
+static const symbol s_3_38[3] = { 'o', 0xBA, 'i' };
+static const symbol s_3_39[4] = { 'i', 't', 0xE3, 'i' };
+static const symbol s_3_40[5] = { 'i', 't', 0xE3, 0xFE, 'i' };
+static const symbol s_3_41[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_3_42[4] = { 'i', 'b', 'i', 'l' };
+static const symbol s_3_43[3] = { 'i', 's', 'm' };
+static const symbol s_3_44[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_3_45[2] = { 'o', 's' };
+static const symbol s_3_46[2] = { 'a', 't' };
+static const symbol s_3_47[2] = { 'i', 't' };
+static const symbol s_3_48[3] = { 'a', 'n', 't' };
+static const symbol s_3_49[3] = { 'i', 's', 't' };
+static const symbol s_3_50[2] = { 'u', 't' };
+static const symbol s_3_51[2] = { 'i', 'v' };
+static const symbol s_3_52[3] = { 'i', 'c', 0xE3 };
+static const symbol s_3_53[5] = { 'a', 'b', 'i', 'l', 0xE3 };
+static const symbol s_3_54[5] = { 'i', 'b', 'i', 'l', 0xE3 };
+static const symbol s_3_55[4] = { 'o', 'a', 's', 0xE3 };
+static const symbol s_3_56[3] = { 'a', 't', 0xE3 };
+static const symbol s_3_57[3] = { 'i', 't', 0xE3 };
+static const symbol s_3_58[4] = { 'a', 'n', 't', 0xE3 };
+static const symbol s_3_59[4] = { 'i', 's', 't', 0xE3 };
+static const symbol s_3_60[3] = { 'u', 't', 0xE3 };
+static const symbol s_3_61[3] = { 'i', 'v', 0xE3 };
+
+static const struct among a_3[62] =
+{
+/*  0 */ { 3, s_3_0, -1, 1, 0},
+/*  1 */ { 5, s_3_1, -1, 1, 0},
+/*  2 */ { 5, s_3_2, -1, 1, 0},
+/*  3 */ { 4, s_3_3, -1, 1, 0},
+/*  4 */ { 3, s_3_4, -1, 1, 0},
+/*  5 */ { 3, s_3_5, -1, 1, 0},
+/*  6 */ { 4, s_3_6, -1, 1, 0},
+/*  7 */ { 4, s_3_7, -1, 3, 0},
+/*  8 */ { 3, s_3_8, -1, 1, 0},
+/*  9 */ { 3, s_3_9, -1, 1, 0},
+/* 10 */ { 2, s_3_10, -1, 1, 0},
+/* 11 */ { 3, s_3_11, -1, 1, 0},
+/* 12 */ { 5, s_3_12, -1, 1, 0},
+/* 13 */ { 5, s_3_13, -1, 1, 0},
+/* 14 */ { 4, s_3_14, -1, 3, 0},
+/* 15 */ { 4, s_3_15, -1, 2, 0},
+/* 16 */ { 4, s_3_16, -1, 1, 0},
+/* 17 */ { 3, s_3_17, -1, 1, 0},
+/* 18 */ { 5, s_3_18, 17, 1, 0},
+/* 19 */ { 3, s_3_19, -1, 1, 0},
+/* 20 */ { 4, s_3_20, -1, 1, 0},
+/* 21 */ { 4, s_3_21, -1, 3, 0},
+/* 22 */ { 3, s_3_22, -1, 1, 0},
+/* 23 */ { 3, s_3_23, -1, 1, 0},
+/* 24 */ { 3, s_3_24, -1, 1, 0},
+/* 25 */ { 5, s_3_25, -1, 1, 0},
+/* 26 */ { 5, s_3_26, -1, 1, 0},
+/* 27 */ { 4, s_3_27, -1, 2, 0},
+/* 28 */ { 5, s_3_28, -1, 1, 0},
+/* 29 */ { 3, s_3_29, -1, 1, 0},
+/* 30 */ { 3, s_3_30, -1, 1, 0},
+/* 31 */ { 5, s_3_31, 30, 1, 0},
+/* 32 */ { 3, s_3_32, -1, 1, 0},
+/* 33 */ { 4, s_3_33, -1, 1, 0},
+/* 34 */ { 4, s_3_34, -1, 3, 0},
+/* 35 */ { 3, s_3_35, -1, 1, 0},
+/* 36 */ { 4, s_3_36, -1, 3, 0},
+/* 37 */ { 3, s_3_37, -1, 1, 0},
+/* 38 */ { 3, s_3_38, -1, 1, 0},
+/* 39 */ { 4, s_3_39, -1, 1, 0},
+/* 40 */ { 5, s_3_40, -1, 1, 0},
+/* 41 */ { 4, s_3_41, -1, 1, 0},
+/* 42 */ { 4, s_3_42, -1, 1, 0},
+/* 43 */ { 3, s_3_43, -1, 3, 0},
+/* 44 */ { 4, s_3_44, -1, 1, 0},
+/* 45 */ { 2, s_3_45, -1, 1, 0},
+/* 46 */ { 2, s_3_46, -1, 1, 0},
+/* 47 */ { 2, s_3_47, -1, 1, 0},
+/* 48 */ { 3, s_3_48, -1, 1, 0},
+/* 49 */ { 3, s_3_49, -1, 3, 0},
+/* 50 */ { 2, s_3_50, -1, 1, 0},
+/* 51 */ { 2, s_3_51, -1, 1, 0},
+/* 52 */ { 3, s_3_52, -1, 1, 0},
+/* 53 */ { 5, s_3_53, -1, 1, 0},
+/* 54 */ { 5, s_3_54, -1, 1, 0},
+/* 55 */ { 4, s_3_55, -1, 1, 0},
+/* 56 */ { 3, s_3_56, -1, 1, 0},
+/* 57 */ { 3, s_3_57, -1, 1, 0},
+/* 58 */ { 4, s_3_58, -1, 1, 0},
+/* 59 */ { 4, s_3_59, -1, 3, 0},
+/* 60 */ { 3, s_3_60, -1, 1, 0},
+/* 61 */ { 3, s_3_61, -1, 1, 0}
+};
+
+static const symbol s_4_0[2] = { 'e', 'a' };
+static const symbol s_4_1[2] = { 'i', 'a' };
+static const symbol s_4_2[3] = { 'e', 's', 'c' };
+static const symbol s_4_3[3] = { 0xE3, 's', 'c' };
+static const symbol s_4_4[3] = { 'i', 'n', 'd' };
+static const symbol s_4_5[3] = { 0xE2, 'n', 'd' };
+static const symbol s_4_6[3] = { 'a', 'r', 'e' };
+static const symbol s_4_7[3] = { 'e', 'r', 'e' };
+static const symbol s_4_8[3] = { 'i', 'r', 'e' };
+static const symbol s_4_9[3] = { 0xE2, 'r', 'e' };
+static const symbol s_4_10[2] = { 's', 'e' };
+static const symbol s_4_11[3] = { 'a', 's', 'e' };
+static const symbol s_4_12[4] = { 's', 'e', 's', 'e' };
+static const symbol s_4_13[3] = { 'i', 's', 'e' };
+static const symbol s_4_14[3] = { 'u', 's', 'e' };
+static const symbol s_4_15[3] = { 0xE2, 's', 'e' };
+static const symbol s_4_16[4] = { 'e', 0xBA, 't', 'e' };
+static const symbol s_4_17[4] = { 0xE3, 0xBA, 't', 'e' };
+static const symbol s_4_18[3] = { 'e', 'z', 'e' };
+static const symbol s_4_19[2] = { 'a', 'i' };
+static const symbol s_4_20[3] = { 'e', 'a', 'i' };
+static const symbol s_4_21[3] = { 'i', 'a', 'i' };
+static const symbol s_4_22[3] = { 's', 'e', 'i' };
+static const symbol s_4_23[4] = { 'e', 0xBA, 't', 'i' };
+static const symbol s_4_24[4] = { 0xE3, 0xBA, 't', 'i' };
+static const symbol s_4_25[2] = { 'u', 'i' };
+static const symbol s_4_26[3] = { 'e', 'z', 'i' };
+static const symbol s_4_27[3] = { 'a', 0xBA, 'i' };
+static const symbol s_4_28[4] = { 's', 'e', 0xBA, 'i' };
+static const symbol s_4_29[5] = { 'a', 's', 'e', 0xBA, 'i' };
+static const symbol s_4_30[6] = { 's', 'e', 's', 'e', 0xBA, 'i' };
+static const symbol s_4_31[5] = { 'i', 's', 'e', 0xBA, 'i' };
+static const symbol s_4_32[5] = { 'u', 's', 'e', 0xBA, 'i' };
+static const symbol s_4_33[5] = { 0xE2, 's', 'e', 0xBA, 'i' };
+static const symbol s_4_34[3] = { 'i', 0xBA, 'i' };
+static const symbol s_4_35[3] = { 'u', 0xBA, 'i' };
+static const symbol s_4_36[3] = { 0xE2, 0xBA, 'i' };
+static const symbol s_4_37[2] = { 0xE2, 'i' };
+static const symbol s_4_38[3] = { 'a', 0xFE, 'i' };
+static const symbol s_4_39[4] = { 'e', 'a', 0xFE, 'i' };
+static const symbol s_4_40[4] = { 'i', 'a', 0xFE, 'i' };
+static const symbol s_4_41[3] = { 'e', 0xFE, 'i' };
+static const symbol s_4_42[3] = { 'i', 0xFE, 'i' };
+static const symbol s_4_43[3] = { 0xE2, 0xFE, 'i' };
+static const symbol s_4_44[5] = { 'a', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_45[6] = { 's', 'e', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_46[7] = { 'a', 's', 'e', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_47[8] = { 's', 'e', 's', 'e', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_48[7] = { 'i', 's', 'e', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_49[7] = { 'u', 's', 'e', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_50[7] = { 0xE2, 's', 'e', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_51[5] = { 'i', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_52[5] = { 'u', 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_53[5] = { 0xE2, 'r', 0xE3, 0xFE, 'i' };
+static const symbol s_4_54[2] = { 'a', 'm' };
+static const symbol s_4_55[3] = { 'e', 'a', 'm' };
+static const symbol s_4_56[3] = { 'i', 'a', 'm' };
+static const symbol s_4_57[2] = { 'e', 'm' };
+static const symbol s_4_58[4] = { 'a', 's', 'e', 'm' };
+static const symbol s_4_59[5] = { 's', 'e', 's', 'e', 'm' };
+static const symbol s_4_60[4] = { 'i', 's', 'e', 'm' };
+static const symbol s_4_61[4] = { 'u', 's', 'e', 'm' };
+static const symbol s_4_62[4] = { 0xE2, 's', 'e', 'm' };
+static const symbol s_4_63[2] = { 'i', 'm' };
+static const symbol s_4_64[2] = { 0xE2, 'm' };
+static const symbol s_4_65[2] = { 0xE3, 'm' };
+static const symbol s_4_66[4] = { 'a', 'r', 0xE3, 'm' };
+static const symbol s_4_67[5] = { 's', 'e', 'r', 0xE3, 'm' };
+static const symbol s_4_68[6] = { 'a', 's', 'e', 'r', 0xE3, 'm' };
+static const symbol s_4_69[7] = { 's', 'e', 's', 'e', 'r', 0xE3, 'm' };
+static const symbol s_4_70[6] = { 'i', 's', 'e', 'r', 0xE3, 'm' };
+static const symbol s_4_71[6] = { 'u', 's', 'e', 'r', 0xE3, 'm' };
+static const symbol s_4_72[6] = { 0xE2, 's', 'e', 'r', 0xE3, 'm' };
+static const symbol s_4_73[4] = { 'i', 'r', 0xE3, 'm' };
+static const symbol s_4_74[4] = { 'u', 'r', 0xE3, 'm' };
+static const symbol s_4_75[4] = { 0xE2, 'r', 0xE3, 'm' };
+static const symbol s_4_76[2] = { 'a', 'u' };
+static const symbol s_4_77[3] = { 'e', 'a', 'u' };
+static const symbol s_4_78[3] = { 'i', 'a', 'u' };
+static const symbol s_4_79[4] = { 'i', 'n', 'd', 'u' };
+static const symbol s_4_80[4] = { 0xE2, 'n', 'd', 'u' };
+static const symbol s_4_81[2] = { 'e', 'z' };
+static const symbol s_4_82[5] = { 'e', 'a', 's', 'c', 0xE3 };
+static const symbol s_4_83[3] = { 'a', 'r', 0xE3 };
+static const symbol s_4_84[4] = { 's', 'e', 'r', 0xE3 };
+static const symbol s_4_85[5] = { 'a', 's', 'e', 'r', 0xE3 };
+static const symbol s_4_86[6] = { 's', 'e', 's', 'e', 'r', 0xE3 };
+static const symbol s_4_87[5] = { 'i', 's', 'e', 'r', 0xE3 };
+static const symbol s_4_88[5] = { 'u', 's', 'e', 'r', 0xE3 };
+static const symbol s_4_89[5] = { 0xE2, 's', 'e', 'r', 0xE3 };
+static const symbol s_4_90[3] = { 'i', 'r', 0xE3 };
+static const symbol s_4_91[3] = { 'u', 'r', 0xE3 };
+static const symbol s_4_92[3] = { 0xE2, 'r', 0xE3 };
+static const symbol s_4_93[4] = { 'e', 'a', 'z', 0xE3 };
+
+static const struct among a_4[94] =
+{
+/*  0 */ { 2, s_4_0, -1, 1, 0},
+/*  1 */ { 2, s_4_1, -1, 1, 0},
+/*  2 */ { 3, s_4_2, -1, 1, 0},
+/*  3 */ { 3, s_4_3, -1, 1, 0},
+/*  4 */ { 3, s_4_4, -1, 1, 0},
+/*  5 */ { 3, s_4_5, -1, 1, 0},
+/*  6 */ { 3, s_4_6, -1, 1, 0},
+/*  7 */ { 3, s_4_7, -1, 1, 0},
+/*  8 */ { 3, s_4_8, -1, 1, 0},
+/*  9 */ { 3, s_4_9, -1, 1, 0},
+/* 10 */ { 2, s_4_10, -1, 2, 0},
+/* 11 */ { 3, s_4_11, 10, 1, 0},
+/* 12 */ { 4, s_4_12, 10, 2, 0},
+/* 13 */ { 3, s_4_13, 10, 1, 0},
+/* 14 */ { 3, s_4_14, 10, 1, 0},
+/* 15 */ { 3, s_4_15, 10, 1, 0},
+/* 16 */ { 4, s_4_16, -1, 1, 0},
+/* 17 */ { 4, s_4_17, -1, 1, 0},
+/* 18 */ { 3, s_4_18, -1, 1, 0},
+/* 19 */ { 2, s_4_19, -1, 1, 0},
+/* 20 */ { 3, s_4_20, 19, 1, 0},
+/* 21 */ { 3, s_4_21, 19, 1, 0},
+/* 22 */ { 3, s_4_22, -1, 2, 0},
+/* 23 */ { 4, s_4_23, -1, 1, 0},
+/* 24 */ { 4, s_4_24, -1, 1, 0},
+/* 25 */ { 2, s_4_25, -1, 1, 0},
+/* 26 */ { 3, s_4_26, -1, 1, 0},
+/* 27 */ { 3, s_4_27, -1, 1, 0},
+/* 28 */ { 4, s_4_28, -1, 2, 0},
+/* 29 */ { 5, s_4_29, 28, 1, 0},
+/* 30 */ { 6, s_4_30, 28, 2, 0},
+/* 31 */ { 5, s_4_31, 28, 1, 0},
+/* 32 */ { 5, s_4_32, 28, 1, 0},
+/* 33 */ { 5, s_4_33, 28, 1, 0},
+/* 34 */ { 3, s_4_34, -1, 1, 0},
+/* 35 */ { 3, s_4_35, -1, 1, 0},
+/* 36 */ { 3, s_4_36, -1, 1, 0},
+/* 37 */ { 2, s_4_37, -1, 1, 0},
+/* 38 */ { 3, s_4_38, -1, 2, 0},
+/* 39 */ { 4, s_4_39, 38, 1, 0},
+/* 40 */ { 4, s_4_40, 38, 1, 0},
+/* 41 */ { 3, s_4_41, -1, 2, 0},
+/* 42 */ { 3, s_4_42, -1, 2, 0},
+/* 43 */ { 3, s_4_43, -1, 2, 0},
+/* 44 */ { 5, s_4_44, -1, 1, 0},
+/* 45 */ { 6, s_4_45, -1, 2, 0},
+/* 46 */ { 7, s_4_46, 45, 1, 0},
+/* 47 */ { 8, s_4_47, 45, 2, 0},
+/* 48 */ { 7, s_4_48, 45, 1, 0},
+/* 49 */ { 7, s_4_49, 45, 1, 0},
+/* 50 */ { 7, s_4_50, 45, 1, 0},
+/* 51 */ { 5, s_4_51, -1, 1, 0},
+/* 52 */ { 5, s_4_52, -1, 1, 0},
+/* 53 */ { 5, s_4_53, -1, 1, 0},
+/* 54 */ { 2, s_4_54, -1, 1, 0},
+/* 55 */ { 3, s_4_55, 54, 1, 0},
+/* 56 */ { 3, s_4_56, 54, 1, 0},
+/* 57 */ { 2, s_4_57, -1, 2, 0},
+/* 58 */ { 4, s_4_58, 57, 1, 0},
+/* 59 */ { 5, s_4_59, 57, 2, 0},
+/* 60 */ { 4, s_4_60, 57, 1, 0},
+/* 61 */ { 4, s_4_61, 57, 1, 0},
+/* 62 */ { 4, s_4_62, 57, 1, 0},
+/* 63 */ { 2, s_4_63, -1, 2, 0},
+/* 64 */ { 2, s_4_64, -1, 2, 0},
+/* 65 */ { 2, s_4_65, -1, 2, 0},
+/* 66 */ { 4, s_4_66, 65, 1, 0},
+/* 67 */ { 5, s_4_67, 65, 2, 0},
+/* 68 */ { 6, s_4_68, 67, 1, 0},
+/* 69 */ { 7, s_4_69, 67, 2, 0},
+/* 70 */ { 6, s_4_70, 67, 1, 0},
+/* 71 */ { 6, s_4_71, 67, 1, 0},
+/* 72 */ { 6, s_4_72, 67, 1, 0},
+/* 73 */ { 4, s_4_73, 65, 1, 0},
+/* 74 */ { 4, s_4_74, 65, 1, 0},
+/* 75 */ { 4, s_4_75, 65, 1, 0},
+/* 76 */ { 2, s_4_76, -1, 1, 0},
+/* 77 */ { 3, s_4_77, 76, 1, 0},
+/* 78 */ { 3, s_4_78, 76, 1, 0},
+/* 79 */ { 4, s_4_79, -1, 1, 0},
+/* 80 */ { 4, s_4_80, -1, 1, 0},
+/* 81 */ { 2, s_4_81, -1, 1, 0},
+/* 82 */ { 5, s_4_82, -1, 1, 0},
+/* 83 */ { 3, s_4_83, -1, 1, 0},
+/* 84 */ { 4, s_4_84, -1, 2, 0},
+/* 85 */ { 5, s_4_85, 84, 1, 0},
+/* 86 */ { 6, s_4_86, 84, 2, 0},
+/* 87 */ { 5, s_4_87, 84, 1, 0},
+/* 88 */ { 5, s_4_88, 84, 1, 0},
+/* 89 */ { 5, s_4_89, 84, 1, 0},
+/* 90 */ { 3, s_4_90, -1, 1, 0},
+/* 91 */ { 3, s_4_91, -1, 1, 0},
+/* 92 */ { 3, s_4_92, -1, 1, 0},
+/* 93 */ { 4, s_4_93, -1, 1, 0}
+};
+
+static const symbol s_5_0[1] = { 'a' };
+static const symbol s_5_1[1] = { 'e' };
+static const symbol s_5_2[2] = { 'i', 'e' };
+static const symbol s_5_3[1] = { 'i' };
+static const symbol s_5_4[1] = { 0xE3 };
+
+static const struct among a_5[5] =
+{
+/*  0 */ { 1, s_5_0, -1, 1, 0},
+/*  1 */ { 1, s_5_1, -1, 1, 0},
+/*  2 */ { 2, s_5_2, 1, 1, 0},
+/*  3 */ { 1, s_5_3, -1, 1, 0},
+/*  4 */ { 1, s_5_4, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 32 };
+
+static const symbol s_0[] = { 'u' };
+static const symbol s_1[] = { 'U' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'I' };
+static const symbol s_4[] = { 'i' };
+static const symbol s_5[] = { 'u' };
+static const symbol s_6[] = { 'a' };
+static const symbol s_7[] = { 'e' };
+static const symbol s_8[] = { 'i' };
+static const symbol s_9[] = { 'a', 'b' };
+static const symbol s_10[] = { 'i' };
+static const symbol s_11[] = { 'a', 't' };
+static const symbol s_12[] = { 'a', 0xFE, 'i' };
+static const symbol s_13[] = { 'a', 'b', 'i', 'l' };
+static const symbol s_14[] = { 'i', 'b', 'i', 'l' };
+static const symbol s_15[] = { 'i', 'v' };
+static const symbol s_16[] = { 'i', 'c' };
+static const symbol s_17[] = { 'a', 't' };
+static const symbol s_18[] = { 'i', 't' };
+static const symbol s_19[] = { 0xFE };
+static const symbol s_20[] = { 't' };
+static const symbol s_21[] = { 'i', 's', 't' };
+static const symbol s_22[] = { 'u' };
+
+static int r_prelude(struct SN_env * z) {
+    while(1) { /* repeat, line 32 */
+        int c1 = z->c;
+        while(1) { /* goto, line 32 */
+            int c2 = z->c;
+            if (in_grouping(z, g_v, 97, 238, 0)) goto lab1;
+            z->bra = z->c; /* [, line 33 */
+            {   int c3 = z->c; /* or, line 33 */
+                if (!(eq_s(z, 1, s_0))) goto lab3;
+                z->ket = z->c; /* ], line 33 */
+                if (in_grouping(z, g_v, 97, 238, 0)) goto lab3;
+                {   int ret = slice_from_s(z, 1, s_1); /* <-, line 33 */
+                    if (ret < 0) return ret;
+                }
+                goto lab2;
+            lab3:
+                z->c = c3;
+                if (!(eq_s(z, 1, s_2))) goto lab1;
+                z->ket = z->c; /* ], line 34 */
+                if (in_grouping(z, g_v, 97, 238, 0)) goto lab1;
+                {   int ret = slice_from_s(z, 1, s_3); /* <-, line 34 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab2:
+            z->c = c2;
+            break;
+        lab1:
+            z->c = c2;
+            if (z->c >= z->l) goto lab0;
+            z->c++; /* goto, line 32 */
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 44 */
+        {   int c2 = z->c; /* or, line 46 */
+            if (in_grouping(z, g_v, 97, 238, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 45 */
+                if (out_grouping(z, g_v, 97, 238, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 45 */
+                    int ret = out_grouping(z, g_v, 97, 238, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping(z, g_v, 97, 238, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 45 */
+                    int ret = in_grouping(z, g_v, 97, 238, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping(z, g_v, 97, 238, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 47 */
+                if (out_grouping(z, g_v, 97, 238, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 47 */
+                    int ret = out_grouping(z, g_v, 97, 238, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping(z, g_v, 97, 238, 0)) goto lab0;
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 47 */
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 48 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 50 */
+        {    /* gopast */ /* grouping v, line 51 */
+            int ret = out_grouping(z, g_v, 97, 238, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 51 */
+            int ret = in_grouping(z, g_v, 97, 238, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 51 */
+        {    /* gopast */ /* grouping v, line 52 */
+            int ret = out_grouping(z, g_v, 97, 238, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 52 */
+            int ret = in_grouping(z, g_v, 97, 238, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 52 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 56 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 58 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 73 && z->p[z->c + 0] != 85)) among_var = 3; else
+        among_var = find_among(z, a_0, 3); /* substring, line 58 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 58 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_4); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_5); /* <-, line 60 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                if (z->c >= z->l) goto lab0;
+                z->c++; /* next, line 61 */
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_step_0(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 73 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((266786 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_1, 16); /* substring, line 73 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 73 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 73 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 75 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_6); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_7); /* <-, line 79 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 1, s_8); /* <-, line 81 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int m1 = z->l - z->c; (void)m1; /* not, line 83 */
+                if (!(eq_s_b(z, 2, s_9))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m1;
+            }
+            {   int ret = slice_from_s(z, 1, s_10); /* <-, line 83 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 2, s_11); /* <-, line 85 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 3, s_12); /* <-, line 87 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_combo_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m_test = z->l - z->c; /* test, line 91 */
+        z->ket = z->c; /* [, line 92 */
+        among_var = find_among_b(z, a_2, 46); /* substring, line 92 */
+        if (!(among_var)) return 0;
+        z->bra = z->c; /* ], line 92 */
+        {   int ret = r_R1(z);
+            if (ret == 0) return 0; /* call R1, line 92 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: return 0;
+            case 1:
+                {   int ret = slice_from_s(z, 4, s_13); /* <-, line 101 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 4, s_14); /* <-, line 104 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 2, s_15); /* <-, line 107 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = slice_from_s(z, 2, s_16); /* <-, line 113 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = slice_from_s(z, 2, s_17); /* <-, line 118 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 6:
+                {   int ret = slice_from_s(z, 2, s_18); /* <-, line 122 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->B[0] = 1; /* set standard_suffix_removed, line 125 */
+        z->c = z->l - m_test;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->B[0] = 0; /* unset standard_suffix_removed, line 130 */
+    while(1) { /* repeat, line 131 */
+        int m1 = z->l - z->c; (void)m1;
+        {   int ret = r_combo_suffix(z);
+            if (ret == 0) goto lab0; /* call combo_suffix, line 131 */
+            if (ret < 0) return ret;
+        }
+        continue;
+    lab0:
+        z->c = z->l - m1;
+        break;
+    }
+    z->ket = z->c; /* [, line 132 */
+    among_var = find_among_b(z, a_3, 62); /* substring, line 132 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 132 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 132 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 149 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (!(eq_s_b(z, 1, s_19))) return 0;
+            z->bra = z->c; /* ], line 152 */
+            {   int ret = slice_from_s(z, 1, s_20); /* <-, line 152 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 3, s_21); /* <-, line 156 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    z->B[0] = 1; /* set standard_suffix_removed, line 160 */
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 164 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 164 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 165 */
+        among_var = find_among_b(z, a_4, 94); /* substring, line 165 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 165 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int m2 = z->l - z->c; (void)m2; /* or, line 200 */
+                    if (out_grouping_b(z, g_v, 97, 238, 0)) goto lab1;
+                    goto lab0;
+                lab1:
+                    z->c = z->l - m2;
+                    if (!(eq_s_b(z, 1, s_22))) { z->lb = mlimit; return 0; }
+                }
+            lab0:
+                {   int ret = slice_del(z); /* delete, line 200 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_del(z); /* delete, line 214 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_vowel_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 219 */
+    among_var = find_among_b(z, a_5, 5); /* substring, line 219 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 219 */
+    {   int ret = r_RV(z);
+        if (ret == 0) return 0; /* call RV, line 219 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 220 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int romanian_ISO_8859_2_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 226 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 226 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 227 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 227 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 228 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 229 */
+        {   int ret = r_step_0(z);
+            if (ret == 0) goto lab2; /* call step_0, line 229 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 230 */
+        {   int ret = r_standard_suffix(z);
+            if (ret == 0) goto lab3; /* call standard_suffix, line 230 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 231 */
+        {   int m6 = z->l - z->c; (void)m6; /* or, line 231 */
+            if (!(z->B[0])) goto lab6; /* Boolean test standard_suffix_removed, line 231 */
+            goto lab5;
+        lab6:
+            z->c = z->l - m6;
+            {   int ret = r_verb_suffix(z);
+                if (ret == 0) goto lab4; /* call verb_suffix, line 231 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab5:
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m7 = z->l - z->c; (void)m7; /* do, line 232 */
+        {   int ret = r_vowel_suffix(z);
+            if (ret == 0) goto lab7; /* call vowel_suffix, line 232 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = z->l - m7;
+    }
+    z->c = z->lb;
+    {   int c8 = z->c; /* do, line 234 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab8; /* call postlude, line 234 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = c8;
+    }
+    return 1;
+}
+
+extern struct SN_env * romanian_ISO_8859_2_create_env(void) { return SN_create_env(0, 3, 1); }
+
+extern void romanian_ISO_8859_2_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_KOI8_R_russian.c b/src/backend/snowball/libstemmer/stem_KOI8_R_russian.c
new file mode 100644
index 000000000000..be7feb752ee8
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_KOI8_R_russian.c
@@ -0,0 +1,700 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int russian_KOI8_R_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_tidy_up(struct SN_env * z);
+static int r_derivational(struct SN_env * z);
+static int r_noun(struct SN_env * z);
+static int r_verb(struct SN_env * z);
+static int r_reflexive(struct SN_env * z);
+static int r_adjectival(struct SN_env * z);
+static int r_adjective(struct SN_env * z);
+static int r_perfective_gerund(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * russian_KOI8_R_create_env(void);
+extern void russian_KOI8_R_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[3] = { 0xD7, 0xDB, 0xC9 };
+static const symbol s_0_1[4] = { 0xC9, 0xD7, 0xDB, 0xC9 };
+static const symbol s_0_2[4] = { 0xD9, 0xD7, 0xDB, 0xC9 };
+static const symbol s_0_3[1] = { 0xD7 };
+static const symbol s_0_4[2] = { 0xC9, 0xD7 };
+static const symbol s_0_5[2] = { 0xD9, 0xD7 };
+static const symbol s_0_6[5] = { 0xD7, 0xDB, 0xC9, 0xD3, 0xD8 };
+static const symbol s_0_7[6] = { 0xC9, 0xD7, 0xDB, 0xC9, 0xD3, 0xD8 };
+static const symbol s_0_8[6] = { 0xD9, 0xD7, 0xDB, 0xC9, 0xD3, 0xD8 };
+
+static const struct among a_0[9] =
+{
+/*  0 */ { 3, s_0_0, -1, 1, 0},
+/*  1 */ { 4, s_0_1, 0, 2, 0},
+/*  2 */ { 4, s_0_2, 0, 2, 0},
+/*  3 */ { 1, s_0_3, -1, 1, 0},
+/*  4 */ { 2, s_0_4, 3, 2, 0},
+/*  5 */ { 2, s_0_5, 3, 2, 0},
+/*  6 */ { 5, s_0_6, -1, 1, 0},
+/*  7 */ { 6, s_0_7, 6, 2, 0},
+/*  8 */ { 6, s_0_8, 6, 2, 0}
+};
+
+static const symbol s_1_0[2] = { 0xC0, 0xC0 };
+static const symbol s_1_1[2] = { 0xC5, 0xC0 };
+static const symbol s_1_2[2] = { 0xCF, 0xC0 };
+static const symbol s_1_3[2] = { 0xD5, 0xC0 };
+static const symbol s_1_4[2] = { 0xC5, 0xC5 };
+static const symbol s_1_5[2] = { 0xC9, 0xC5 };
+static const symbol s_1_6[2] = { 0xCF, 0xC5 };
+static const symbol s_1_7[2] = { 0xD9, 0xC5 };
+static const symbol s_1_8[2] = { 0xC9, 0xC8 };
+static const symbol s_1_9[2] = { 0xD9, 0xC8 };
+static const symbol s_1_10[3] = { 0xC9, 0xCD, 0xC9 };
+static const symbol s_1_11[3] = { 0xD9, 0xCD, 0xC9 };
+static const symbol s_1_12[2] = { 0xC5, 0xCA };
+static const symbol s_1_13[2] = { 0xC9, 0xCA };
+static const symbol s_1_14[2] = { 0xCF, 0xCA };
+static const symbol s_1_15[2] = { 0xD9, 0xCA };
+static const symbol s_1_16[2] = { 0xC5, 0xCD };
+static const symbol s_1_17[2] = { 0xC9, 0xCD };
+static const symbol s_1_18[2] = { 0xCF, 0xCD };
+static const symbol s_1_19[2] = { 0xD9, 0xCD };
+static const symbol s_1_20[3] = { 0xC5, 0xC7, 0xCF };
+static const symbol s_1_21[3] = { 0xCF, 0xC7, 0xCF };
+static const symbol s_1_22[2] = { 0xC1, 0xD1 };
+static const symbol s_1_23[2] = { 0xD1, 0xD1 };
+static const symbol s_1_24[3] = { 0xC5, 0xCD, 0xD5 };
+static const symbol s_1_25[3] = { 0xCF, 0xCD, 0xD5 };
+
+static const struct among a_1[26] =
+{
+/*  0 */ { 2, s_1_0, -1, 1, 0},
+/*  1 */ { 2, s_1_1, -1, 1, 0},
+/*  2 */ { 2, s_1_2, -1, 1, 0},
+/*  3 */ { 2, s_1_3, -1, 1, 0},
+/*  4 */ { 2, s_1_4, -1, 1, 0},
+/*  5 */ { 2, s_1_5, -1, 1, 0},
+/*  6 */ { 2, s_1_6, -1, 1, 0},
+/*  7 */ { 2, s_1_7, -1, 1, 0},
+/*  8 */ { 2, s_1_8, -1, 1, 0},
+/*  9 */ { 2, s_1_9, -1, 1, 0},
+/* 10 */ { 3, s_1_10, -1, 1, 0},
+/* 11 */ { 3, s_1_11, -1, 1, 0},
+/* 12 */ { 2, s_1_12, -1, 1, 0},
+/* 13 */ { 2, s_1_13, -1, 1, 0},
+/* 14 */ { 2, s_1_14, -1, 1, 0},
+/* 15 */ { 2, s_1_15, -1, 1, 0},
+/* 16 */ { 2, s_1_16, -1, 1, 0},
+/* 17 */ { 2, s_1_17, -1, 1, 0},
+/* 18 */ { 2, s_1_18, -1, 1, 0},
+/* 19 */ { 2, s_1_19, -1, 1, 0},
+/* 20 */ { 3, s_1_20, -1, 1, 0},
+/* 21 */ { 3, s_1_21, -1, 1, 0},
+/* 22 */ { 2, s_1_22, -1, 1, 0},
+/* 23 */ { 2, s_1_23, -1, 1, 0},
+/* 24 */ { 3, s_1_24, -1, 1, 0},
+/* 25 */ { 3, s_1_25, -1, 1, 0}
+};
+
+static const symbol s_2_0[2] = { 0xC5, 0xCD };
+static const symbol s_2_1[2] = { 0xCE, 0xCE };
+static const symbol s_2_2[2] = { 0xD7, 0xDB };
+static const symbol s_2_3[3] = { 0xC9, 0xD7, 0xDB };
+static const symbol s_2_4[3] = { 0xD9, 0xD7, 0xDB };
+static const symbol s_2_5[1] = { 0xDD };
+static const symbol s_2_6[2] = { 0xC0, 0xDD };
+static const symbol s_2_7[3] = { 0xD5, 0xC0, 0xDD };
+
+static const struct among a_2[8] =
+{
+/*  0 */ { 2, s_2_0, -1, 1, 0},
+/*  1 */ { 2, s_2_1, -1, 1, 0},
+/*  2 */ { 2, s_2_2, -1, 1, 0},
+/*  3 */ { 3, s_2_3, 2, 2, 0},
+/*  4 */ { 3, s_2_4, 2, 2, 0},
+/*  5 */ { 1, s_2_5, -1, 1, 0},
+/*  6 */ { 2, s_2_6, 5, 1, 0},
+/*  7 */ { 3, s_2_7, 6, 2, 0}
+};
+
+static const symbol s_3_0[2] = { 0xD3, 0xD1 };
+static const symbol s_3_1[2] = { 0xD3, 0xD8 };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 2, s_3_0, -1, 1, 0},
+/*  1 */ { 2, s_3_1, -1, 1, 0}
+};
+
+static const symbol s_4_0[1] = { 0xC0 };
+static const symbol s_4_1[2] = { 0xD5, 0xC0 };
+static const symbol s_4_2[2] = { 0xCC, 0xC1 };
+static const symbol s_4_3[3] = { 0xC9, 0xCC, 0xC1 };
+static const symbol s_4_4[3] = { 0xD9, 0xCC, 0xC1 };
+static const symbol s_4_5[2] = { 0xCE, 0xC1 };
+static const symbol s_4_6[3] = { 0xC5, 0xCE, 0xC1 };
+static const symbol s_4_7[3] = { 0xC5, 0xD4, 0xC5 };
+static const symbol s_4_8[3] = { 0xC9, 0xD4, 0xC5 };
+static const symbol s_4_9[3] = { 0xCA, 0xD4, 0xC5 };
+static const symbol s_4_10[4] = { 0xC5, 0xCA, 0xD4, 0xC5 };
+static const symbol s_4_11[4] = { 0xD5, 0xCA, 0xD4, 0xC5 };
+static const symbol s_4_12[2] = { 0xCC, 0xC9 };
+static const symbol s_4_13[3] = { 0xC9, 0xCC, 0xC9 };
+static const symbol s_4_14[3] = { 0xD9, 0xCC, 0xC9 };
+static const symbol s_4_15[1] = { 0xCA };
+static const symbol s_4_16[2] = { 0xC5, 0xCA };
+static const symbol s_4_17[2] = { 0xD5, 0xCA };
+static const symbol s_4_18[1] = { 0xCC };
+static const symbol s_4_19[2] = { 0xC9, 0xCC };
+static const symbol s_4_20[2] = { 0xD9, 0xCC };
+static const symbol s_4_21[2] = { 0xC5, 0xCD };
+static const symbol s_4_22[2] = { 0xC9, 0xCD };
+static const symbol s_4_23[2] = { 0xD9, 0xCD };
+static const symbol s_4_24[1] = { 0xCE };
+static const symbol s_4_25[2] = { 0xC5, 0xCE };
+static const symbol s_4_26[2] = { 0xCC, 0xCF };
+static const symbol s_4_27[3] = { 0xC9, 0xCC, 0xCF };
+static const symbol s_4_28[3] = { 0xD9, 0xCC, 0xCF };
+static const symbol s_4_29[2] = { 0xCE, 0xCF };
+static const symbol s_4_30[3] = { 0xC5, 0xCE, 0xCF };
+static const symbol s_4_31[3] = { 0xCE, 0xCE, 0xCF };
+static const symbol s_4_32[2] = { 0xC0, 0xD4 };
+static const symbol s_4_33[3] = { 0xD5, 0xC0, 0xD4 };
+static const symbol s_4_34[2] = { 0xC5, 0xD4 };
+static const symbol s_4_35[3] = { 0xD5, 0xC5, 0xD4 };
+static const symbol s_4_36[2] = { 0xC9, 0xD4 };
+static const symbol s_4_37[2] = { 0xD1, 0xD4 };
+static const symbol s_4_38[2] = { 0xD9, 0xD4 };
+static const symbol s_4_39[2] = { 0xD4, 0xD8 };
+static const symbol s_4_40[3] = { 0xC9, 0xD4, 0xD8 };
+static const symbol s_4_41[3] = { 0xD9, 0xD4, 0xD8 };
+static const symbol s_4_42[3] = { 0xC5, 0xDB, 0xD8 };
+static const symbol s_4_43[3] = { 0xC9, 0xDB, 0xD8 };
+static const symbol s_4_44[2] = { 0xCE, 0xD9 };
+static const symbol s_4_45[3] = { 0xC5, 0xCE, 0xD9 };
+
+static const struct among a_4[46] =
+{
+/*  0 */ { 1, s_4_0, -1, 2, 0},
+/*  1 */ { 2, s_4_1, 0, 2, 0},
+/*  2 */ { 2, s_4_2, -1, 1, 0},
+/*  3 */ { 3, s_4_3, 2, 2, 0},
+/*  4 */ { 3, s_4_4, 2, 2, 0},
+/*  5 */ { 2, s_4_5, -1, 1, 0},
+/*  6 */ { 3, s_4_6, 5, 2, 0},
+/*  7 */ { 3, s_4_7, -1, 1, 0},
+/*  8 */ { 3, s_4_8, -1, 2, 0},
+/*  9 */ { 3, s_4_9, -1, 1, 0},
+/* 10 */ { 4, s_4_10, 9, 2, 0},
+/* 11 */ { 4, s_4_11, 9, 2, 0},
+/* 12 */ { 2, s_4_12, -1, 1, 0},
+/* 13 */ { 3, s_4_13, 12, 2, 0},
+/* 14 */ { 3, s_4_14, 12, 2, 0},
+/* 15 */ { 1, s_4_15, -1, 1, 0},
+/* 16 */ { 2, s_4_16, 15, 2, 0},
+/* 17 */ { 2, s_4_17, 15, 2, 0},
+/* 18 */ { 1, s_4_18, -1, 1, 0},
+/* 19 */ { 2, s_4_19, 18, 2, 0},
+/* 20 */ { 2, s_4_20, 18, 2, 0},
+/* 21 */ { 2, s_4_21, -1, 1, 0},
+/* 22 */ { 2, s_4_22, -1, 2, 0},
+/* 23 */ { 2, s_4_23, -1, 2, 0},
+/* 24 */ { 1, s_4_24, -1, 1, 0},
+/* 25 */ { 2, s_4_25, 24, 2, 0},
+/* 26 */ { 2, s_4_26, -1, 1, 0},
+/* 27 */ { 3, s_4_27, 26, 2, 0},
+/* 28 */ { 3, s_4_28, 26, 2, 0},
+/* 29 */ { 2, s_4_29, -1, 1, 0},
+/* 30 */ { 3, s_4_30, 29, 2, 0},
+/* 31 */ { 3, s_4_31, 29, 1, 0},
+/* 32 */ { 2, s_4_32, -1, 1, 0},
+/* 33 */ { 3, s_4_33, 32, 2, 0},
+/* 34 */ { 2, s_4_34, -1, 1, 0},
+/* 35 */ { 3, s_4_35, 34, 2, 0},
+/* 36 */ { 2, s_4_36, -1, 2, 0},
+/* 37 */ { 2, s_4_37, -1, 2, 0},
+/* 38 */ { 2, s_4_38, -1, 2, 0},
+/* 39 */ { 2, s_4_39, -1, 1, 0},
+/* 40 */ { 3, s_4_40, 39, 2, 0},
+/* 41 */ { 3, s_4_41, 39, 2, 0},
+/* 42 */ { 3, s_4_42, -1, 1, 0},
+/* 43 */ { 3, s_4_43, -1, 2, 0},
+/* 44 */ { 2, s_4_44, -1, 1, 0},
+/* 45 */ { 3, s_4_45, 44, 2, 0}
+};
+
+static const symbol s_5_0[1] = { 0xC0 };
+static const symbol s_5_1[2] = { 0xC9, 0xC0 };
+static const symbol s_5_2[2] = { 0xD8, 0xC0 };
+static const symbol s_5_3[1] = { 0xC1 };
+static const symbol s_5_4[1] = { 0xC5 };
+static const symbol s_5_5[2] = { 0xC9, 0xC5 };
+static const symbol s_5_6[2] = { 0xD8, 0xC5 };
+static const symbol s_5_7[2] = { 0xC1, 0xC8 };
+static const symbol s_5_8[2] = { 0xD1, 0xC8 };
+static const symbol s_5_9[3] = { 0xC9, 0xD1, 0xC8 };
+static const symbol s_5_10[1] = { 0xC9 };
+static const symbol s_5_11[2] = { 0xC5, 0xC9 };
+static const symbol s_5_12[2] = { 0xC9, 0xC9 };
+static const symbol s_5_13[3] = { 0xC1, 0xCD, 0xC9 };
+static const symbol s_5_14[3] = { 0xD1, 0xCD, 0xC9 };
+static const symbol s_5_15[4] = { 0xC9, 0xD1, 0xCD, 0xC9 };
+static const symbol s_5_16[1] = { 0xCA };
+static const symbol s_5_17[2] = { 0xC5, 0xCA };
+static const symbol s_5_18[3] = { 0xC9, 0xC5, 0xCA };
+static const symbol s_5_19[2] = { 0xC9, 0xCA };
+static const symbol s_5_20[2] = { 0xCF, 0xCA };
+static const symbol s_5_21[2] = { 0xC1, 0xCD };
+static const symbol s_5_22[2] = { 0xC5, 0xCD };
+static const symbol s_5_23[3] = { 0xC9, 0xC5, 0xCD };
+static const symbol s_5_24[2] = { 0xCF, 0xCD };
+static const symbol s_5_25[2] = { 0xD1, 0xCD };
+static const symbol s_5_26[3] = { 0xC9, 0xD1, 0xCD };
+static const symbol s_5_27[1] = { 0xCF };
+static const symbol s_5_28[1] = { 0xD1 };
+static const symbol s_5_29[2] = { 0xC9, 0xD1 };
+static const symbol s_5_30[2] = { 0xD8, 0xD1 };
+static const symbol s_5_31[1] = { 0xD5 };
+static const symbol s_5_32[2] = { 0xC5, 0xD7 };
+static const symbol s_5_33[2] = { 0xCF, 0xD7 };
+static const symbol s_5_34[1] = { 0xD8 };
+static const symbol s_5_35[1] = { 0xD9 };
+
+static const struct among a_5[36] =
+{
+/*  0 */ { 1, s_5_0, -1, 1, 0},
+/*  1 */ { 2, s_5_1, 0, 1, 0},
+/*  2 */ { 2, s_5_2, 0, 1, 0},
+/*  3 */ { 1, s_5_3, -1, 1, 0},
+/*  4 */ { 1, s_5_4, -1, 1, 0},
+/*  5 */ { 2, s_5_5, 4, 1, 0},
+/*  6 */ { 2, s_5_6, 4, 1, 0},
+/*  7 */ { 2, s_5_7, -1, 1, 0},
+/*  8 */ { 2, s_5_8, -1, 1, 0},
+/*  9 */ { 3, s_5_9, 8, 1, 0},
+/* 10 */ { 1, s_5_10, -1, 1, 0},
+/* 11 */ { 2, s_5_11, 10, 1, 0},
+/* 12 */ { 2, s_5_12, 10, 1, 0},
+/* 13 */ { 3, s_5_13, 10, 1, 0},
+/* 14 */ { 3, s_5_14, 10, 1, 0},
+/* 15 */ { 4, s_5_15, 14, 1, 0},
+/* 16 */ { 1, s_5_16, -1, 1, 0},
+/* 17 */ { 2, s_5_17, 16, 1, 0},
+/* 18 */ { 3, s_5_18, 17, 1, 0},
+/* 19 */ { 2, s_5_19, 16, 1, 0},
+/* 20 */ { 2, s_5_20, 16, 1, 0},
+/* 21 */ { 2, s_5_21, -1, 1, 0},
+/* 22 */ { 2, s_5_22, -1, 1, 0},
+/* 23 */ { 3, s_5_23, 22, 1, 0},
+/* 24 */ { 2, s_5_24, -1, 1, 0},
+/* 25 */ { 2, s_5_25, -1, 1, 0},
+/* 26 */ { 3, s_5_26, 25, 1, 0},
+/* 27 */ { 1, s_5_27, -1, 1, 0},
+/* 28 */ { 1, s_5_28, -1, 1, 0},
+/* 29 */ { 2, s_5_29, 28, 1, 0},
+/* 30 */ { 2, s_5_30, 28, 1, 0},
+/* 31 */ { 1, s_5_31, -1, 1, 0},
+/* 32 */ { 2, s_5_32, -1, 1, 0},
+/* 33 */ { 2, s_5_33, -1, 1, 0},
+/* 34 */ { 1, s_5_34, -1, 1, 0},
+/* 35 */ { 1, s_5_35, -1, 1, 0}
+};
+
+static const symbol s_6_0[3] = { 0xCF, 0xD3, 0xD4 };
+static const symbol s_6_1[4] = { 0xCF, 0xD3, 0xD4, 0xD8 };
+
+static const struct among a_6[2] =
+{
+/*  0 */ { 3, s_6_0, -1, 1, 0},
+/*  1 */ { 4, s_6_1, -1, 1, 0}
+};
+
+static const symbol s_7_0[4] = { 0xC5, 0xCA, 0xDB, 0xC5 };
+static const symbol s_7_1[1] = { 0xCE };
+static const symbol s_7_2[1] = { 0xD8 };
+static const symbol s_7_3[3] = { 0xC5, 0xCA, 0xDB };
+
+static const struct among a_7[4] =
+{
+/*  0 */ { 4, s_7_0, -1, 1, 0},
+/*  1 */ { 1, s_7_1, -1, 2, 0},
+/*  2 */ { 1, s_7_2, -1, 3, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 35, 130, 34, 18 };
+
+static const symbol s_0[] = { 0xC1 };
+static const symbol s_1[] = { 0xD1 };
+static const symbol s_2[] = { 0xC1 };
+static const symbol s_3[] = { 0xD1 };
+static const symbol s_4[] = { 0xC1 };
+static const symbol s_5[] = { 0xD1 };
+static const symbol s_6[] = { 0xCE };
+static const symbol s_7[] = { 0xCE };
+static const symbol s_8[] = { 0xCE };
+static const symbol s_9[] = { 0xC9 };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c1 = z->c; /* do, line 63 */
+        {    /* gopast */ /* grouping v, line 64 */
+            int ret = out_grouping(z, g_v, 192, 220, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        z->I[0] = z->c; /* setmark pV, line 64 */
+        {    /* gopast */ /* non v, line 64 */
+            int ret = in_grouping(z, g_v, 192, 220, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        {    /* gopast */ /* grouping v, line 65 */
+            int ret = out_grouping(z, g_v, 192, 220, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 65 */
+            int ret = in_grouping(z, g_v, 192, 220, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p2, line 65 */
+    lab0:
+        z->c = c1;
+    }
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_perfective_gerund(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 74 */
+    if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 6 || !((25166336 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_0, 9); /* substring, line 74 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 74 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 78 */
+                if (!(eq_s_b(z, 1, s_0))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_1))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 78 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 85 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_adjective(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 90 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 6 || !((2271009 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_1, 26); /* substring, line 90 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 90 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 99 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_adjectival(struct SN_env * z) {
+    int among_var;
+    {   int ret = r_adjective(z);
+        if (ret == 0) return 0; /* call adjective, line 104 */
+        if (ret < 0) return ret;
+    }
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 111 */
+        z->ket = z->c; /* [, line 112 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 6 || !((671113216 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab0; }
+        among_var = find_among_b(z, a_2, 8); /* substring, line 112 */
+        if (!(among_var)) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 112 */
+        switch(among_var) {
+            case 0: { z->c = z->l - m_keep; goto lab0; }
+            case 1:
+                {   int m1 = z->l - z->c; (void)m1; /* or, line 117 */
+                    if (!(eq_s_b(z, 1, s_2))) goto lab2;
+                    goto lab1;
+                lab2:
+                    z->c = z->l - m1;
+                    if (!(eq_s_b(z, 1, s_3))) { z->c = z->l - m_keep; goto lab0; }
+                }
+            lab1:
+                {   int ret = slice_del(z); /* delete, line 117 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_del(z); /* delete, line 124 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        ;
+    }
+    return 1;
+}
+
+static int r_reflexive(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 131 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 209 && z->p[z->c - 1] != 216)) return 0;
+    among_var = find_among_b(z, a_3, 2); /* substring, line 131 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 131 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 134 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 139 */
+    if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 6 || !((51443235 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_4, 46); /* substring, line 139 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 139 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 145 */
+                if (!(eq_s_b(z, 1, s_4))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_5))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 145 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 153 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_noun(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 162 */
+    if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 6 || !((60991267 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_5, 36); /* substring, line 162 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 162 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 169 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_derivational(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 178 */
+    if (z->c - 2 <= z->lb || (z->p[z->c - 1] != 212 && z->p[z->c - 1] != 216)) return 0;
+    among_var = find_among_b(z, a_6, 2); /* substring, line 178 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 178 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 178 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 181 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_tidy_up(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 186 */
+    if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 6 || !((151011360 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_7, 4); /* substring, line 186 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 186 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 190 */
+                if (ret < 0) return ret;
+            }
+            z->ket = z->c; /* [, line 191 */
+            if (!(eq_s_b(z, 1, s_6))) return 0;
+            z->bra = z->c; /* ], line 191 */
+            if (!(eq_s_b(z, 1, s_7))) return 0;
+            {   int ret = slice_del(z); /* delete, line 191 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (!(eq_s_b(z, 1, s_8))) return 0;
+            {   int ret = slice_del(z); /* delete, line 194 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 196 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int russian_KOI8_R_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 203 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 203 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 204 */
+
+    {   int mlimit; /* setlimit, line 204 */
+        int m2 = z->l - z->c; (void)m2;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 204 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m2;
+        {   int m3 = z->l - z->c; (void)m3; /* do, line 205 */
+            {   int m4 = z->l - z->c; (void)m4; /* or, line 206 */
+                {   int ret = r_perfective_gerund(z);
+                    if (ret == 0) goto lab3; /* call perfective_gerund, line 206 */
+                    if (ret < 0) return ret;
+                }
+                goto lab2;
+            lab3:
+                z->c = z->l - m4;
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 207 */
+                    {   int ret = r_reflexive(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab4; } /* call reflexive, line 207 */
+                        if (ret < 0) return ret;
+                    }
+                lab4:
+                    ;
+                }
+                {   int m5 = z->l - z->c; (void)m5; /* or, line 208 */
+                    {   int ret = r_adjectival(z);
+                        if (ret == 0) goto lab6; /* call adjectival, line 208 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m5;
+                    {   int ret = r_verb(z);
+                        if (ret == 0) goto lab7; /* call verb, line 208 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab7:
+                    z->c = z->l - m5;
+                    {   int ret = r_noun(z);
+                        if (ret == 0) goto lab1; /* call noun, line 208 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                ;
+            }
+        lab2:
+        lab1:
+            z->c = z->l - m3;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 211 */
+            z->ket = z->c; /* [, line 211 */
+            if (!(eq_s_b(z, 1, s_9))) { z->c = z->l - m_keep; goto lab8; }
+            z->bra = z->c; /* ], line 211 */
+            {   int ret = slice_del(z); /* delete, line 211 */
+                if (ret < 0) return ret;
+            }
+        lab8:
+            ;
+        }
+        {   int m6 = z->l - z->c; (void)m6; /* do, line 214 */
+            {   int ret = r_derivational(z);
+                if (ret == 0) goto lab9; /* call derivational, line 214 */
+                if (ret < 0) return ret;
+            }
+        lab9:
+            z->c = z->l - m6;
+        }
+        {   int m7 = z->l - z->c; (void)m7; /* do, line 215 */
+            {   int ret = r_tidy_up(z);
+                if (ret == 0) goto lab10; /* call tidy_up, line 215 */
+                if (ret < 0) return ret;
+            }
+        lab10:
+            z->c = z->l - m7;
+        }
+        z->lb = mlimit;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * russian_KOI8_R_create_env(void) { return SN_create_env(0, 2, 0); }
+
+extern void russian_KOI8_R_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_danish.c b/src/backend/snowball/libstemmer/stem_UTF_8_danish.c
new file mode 100644
index 000000000000..cfd41376da25
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_danish.c
@@ -0,0 +1,339 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int danish_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_undouble(struct SN_env * z);
+static int r_other_suffix(struct SN_env * z);
+static int r_consonant_pair(struct SN_env * z);
+static int r_main_suffix(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * danish_UTF_8_create_env(void);
+extern void danish_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[3] = { 'h', 'e', 'd' };
+static const symbol s_0_1[5] = { 'e', 't', 'h', 'e', 'd' };
+static const symbol s_0_2[4] = { 'e', 'r', 'e', 'd' };
+static const symbol s_0_3[1] = { 'e' };
+static const symbol s_0_4[5] = { 'e', 'r', 'e', 'd', 'e' };
+static const symbol s_0_5[4] = { 'e', 'n', 'd', 'e' };
+static const symbol s_0_6[6] = { 'e', 'r', 'e', 'n', 'd', 'e' };
+static const symbol s_0_7[3] = { 'e', 'n', 'e' };
+static const symbol s_0_8[4] = { 'e', 'r', 'n', 'e' };
+static const symbol s_0_9[3] = { 'e', 'r', 'e' };
+static const symbol s_0_10[2] = { 'e', 'n' };
+static const symbol s_0_11[5] = { 'h', 'e', 'd', 'e', 'n' };
+static const symbol s_0_12[4] = { 'e', 'r', 'e', 'n' };
+static const symbol s_0_13[2] = { 'e', 'r' };
+static const symbol s_0_14[5] = { 'h', 'e', 'd', 'e', 'r' };
+static const symbol s_0_15[4] = { 'e', 'r', 'e', 'r' };
+static const symbol s_0_16[1] = { 's' };
+static const symbol s_0_17[4] = { 'h', 'e', 'd', 's' };
+static const symbol s_0_18[2] = { 'e', 's' };
+static const symbol s_0_19[5] = { 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_20[7] = { 'e', 'r', 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_21[4] = { 'e', 'n', 'e', 's' };
+static const symbol s_0_22[5] = { 'e', 'r', 'n', 'e', 's' };
+static const symbol s_0_23[4] = { 'e', 'r', 'e', 's' };
+static const symbol s_0_24[3] = { 'e', 'n', 's' };
+static const symbol s_0_25[6] = { 'h', 'e', 'd', 'e', 'n', 's' };
+static const symbol s_0_26[5] = { 'e', 'r', 'e', 'n', 's' };
+static const symbol s_0_27[3] = { 'e', 'r', 's' };
+static const symbol s_0_28[3] = { 'e', 't', 's' };
+static const symbol s_0_29[5] = { 'e', 'r', 'e', 't', 's' };
+static const symbol s_0_30[2] = { 'e', 't' };
+static const symbol s_0_31[4] = { 'e', 'r', 'e', 't' };
+
+static const struct among a_0[32] =
+{
+/*  0 */ { 3, s_0_0, -1, 1, 0},
+/*  1 */ { 5, s_0_1, 0, 1, 0},
+/*  2 */ { 4, s_0_2, -1, 1, 0},
+/*  3 */ { 1, s_0_3, -1, 1, 0},
+/*  4 */ { 5, s_0_4, 3, 1, 0},
+/*  5 */ { 4, s_0_5, 3, 1, 0},
+/*  6 */ { 6, s_0_6, 5, 1, 0},
+/*  7 */ { 3, s_0_7, 3, 1, 0},
+/*  8 */ { 4, s_0_8, 3, 1, 0},
+/*  9 */ { 3, s_0_9, 3, 1, 0},
+/* 10 */ { 2, s_0_10, -1, 1, 0},
+/* 11 */ { 5, s_0_11, 10, 1, 0},
+/* 12 */ { 4, s_0_12, 10, 1, 0},
+/* 13 */ { 2, s_0_13, -1, 1, 0},
+/* 14 */ { 5, s_0_14, 13, 1, 0},
+/* 15 */ { 4, s_0_15, 13, 1, 0},
+/* 16 */ { 1, s_0_16, -1, 2, 0},
+/* 17 */ { 4, s_0_17, 16, 1, 0},
+/* 18 */ { 2, s_0_18, 16, 1, 0},
+/* 19 */ { 5, s_0_19, 18, 1, 0},
+/* 20 */ { 7, s_0_20, 19, 1, 0},
+/* 21 */ { 4, s_0_21, 18, 1, 0},
+/* 22 */ { 5, s_0_22, 18, 1, 0},
+/* 23 */ { 4, s_0_23, 18, 1, 0},
+/* 24 */ { 3, s_0_24, 16, 1, 0},
+/* 25 */ { 6, s_0_25, 24, 1, 0},
+/* 26 */ { 5, s_0_26, 24, 1, 0},
+/* 27 */ { 3, s_0_27, 16, 1, 0},
+/* 28 */ { 3, s_0_28, 16, 1, 0},
+/* 29 */ { 5, s_0_29, 28, 1, 0},
+/* 30 */ { 2, s_0_30, -1, 1, 0},
+/* 31 */ { 4, s_0_31, 30, 1, 0}
+};
+
+static const symbol s_1_0[2] = { 'g', 'd' };
+static const symbol s_1_1[2] = { 'd', 't' };
+static const symbol s_1_2[2] = { 'g', 't' };
+static const symbol s_1_3[2] = { 'k', 't' };
+
+static const struct among a_1[4] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0},
+/*  2 */ { 2, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0}
+};
+
+static const symbol s_2_0[2] = { 'i', 'g' };
+static const symbol s_2_1[3] = { 'l', 'i', 'g' };
+static const symbol s_2_2[4] = { 'e', 'l', 'i', 'g' };
+static const symbol s_2_3[3] = { 'e', 'l', 's' };
+static const symbol s_2_4[5] = { 'l', 0xC3, 0xB8, 's', 't' };
+
+static const struct among a_2[5] =
+{
+/*  0 */ { 2, s_2_0, -1, 1, 0},
+/*  1 */ { 3, s_2_1, 0, 1, 0},
+/*  2 */ { 4, s_2_2, 1, 1, 0},
+/*  3 */ { 3, s_2_3, -1, 1, 0},
+/*  4 */ { 5, s_2_4, -1, 2, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 128 };
+
+static const unsigned char g_s_ending[] = { 239, 254, 42, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16 };
+
+static const symbol s_0[] = { 's', 't' };
+static const symbol s_1[] = { 'i', 'g' };
+static const symbol s_2[] = { 'l', 0xC3, 0xB8, 's' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c_test = z->c; /* test, line 33 */
+        {   int ret = skip_utf8(z->p, z->c, 0, z->l, + 3);
+            if (ret < 0) return 0;
+            z->c = ret; /* hop, line 33 */
+        }
+        z->I[1] = z->c; /* setmark x, line 33 */
+        z->c = c_test;
+    }
+    if (out_grouping_U(z, g_v, 97, 248, 1) < 0) return 0; /* goto */ /* grouping v, line 34 */
+    {    /* gopast */ /* non v, line 34 */
+        int ret = in_grouping_U(z, g_v, 97, 248, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 34 */
+     /* try, line 35 */
+    if (!(z->I[0] < z->I[1])) goto lab0;
+    z->I[0] = z->I[1];
+lab0:
+    return 1;
+}
+
+static int r_main_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 41 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 41 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 41 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851440 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_0, 32); /* substring, line 41 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 41 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 48 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (in_grouping_b_U(z, g_s_ending, 97, 229, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 50 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_consonant_pair(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 55 */
+        {   int mlimit; /* setlimit, line 56 */
+            int m1 = z->l - z->c; (void)m1;
+            if (z->c < z->I[0]) return 0;
+            z->c = z->I[0]; /* tomark, line 56 */
+            mlimit = z->lb; z->lb = z->c;
+            z->c = z->l - m1;
+            z->ket = z->c; /* [, line 56 */
+            if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 116)) { z->lb = mlimit; return 0; }
+            if (!(find_among_b(z, a_1, 4))) { z->lb = mlimit; return 0; } /* substring, line 56 */
+            z->bra = z->c; /* ], line 56 */
+            z->lb = mlimit;
+        }
+        z->c = z->l - m_test;
+    }
+    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+        if (ret < 0) return 0;
+        z->c = ret; /* next, line 62 */
+    }
+    z->bra = z->c; /* ], line 62 */
+    {   int ret = slice_del(z); /* delete, line 62 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_other_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 66 */
+        z->ket = z->c; /* [, line 66 */
+        if (!(eq_s_b(z, 2, s_0))) goto lab0;
+        z->bra = z->c; /* ], line 66 */
+        if (!(eq_s_b(z, 2, s_1))) goto lab0;
+        {   int ret = slice_del(z); /* delete, line 66 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = z->l - m1;
+    }
+    {   int mlimit; /* setlimit, line 67 */
+        int m2 = z->l - z->c; (void)m2;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 67 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m2;
+        z->ket = z->c; /* [, line 67 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1572992 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_2, 5); /* substring, line 67 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 67 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 70 */
+                if (ret < 0) return ret;
+            }
+            {   int m3 = z->l - z->c; (void)m3; /* do, line 70 */
+                {   int ret = r_consonant_pair(z);
+                    if (ret == 0) goto lab1; /* call consonant_pair, line 70 */
+                    if (ret < 0) return ret;
+                }
+            lab1:
+                z->c = z->l - m3;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 4, s_2); /* <-, line 72 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_undouble(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 76 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 76 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 76 */
+        if (out_grouping_b_U(z, g_v, 97, 248, 0)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 76 */
+        z->S[0] = slice_to(z, z->S[0]); /* -> ch, line 76 */
+        if (z->S[0] == 0) return -1; /* -> ch, line 76 */
+        z->lb = mlimit;
+    }
+    if (!(eq_v_b(z, z->S[0]))) return 0; /* name ch, line 77 */
+    {   int ret = slice_del(z); /* delete, line 78 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int danish_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 84 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 84 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 85 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 86 */
+        {   int ret = r_main_suffix(z);
+            if (ret == 0) goto lab1; /* call main_suffix, line 86 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 87 */
+        {   int ret = r_consonant_pair(z);
+            if (ret == 0) goto lab2; /* call consonant_pair, line 87 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 88 */
+        {   int ret = r_other_suffix(z);
+            if (ret == 0) goto lab3; /* call other_suffix, line 88 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 89 */
+        {   int ret = r_undouble(z);
+            if (ret == 0) goto lab4; /* call undouble, line 89 */
+            if (ret < 0) return ret;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * danish_UTF_8_create_env(void) { return SN_create_env(1, 2, 0); }
+
+extern void danish_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 1); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_dutch.c b/src/backend/snowball/libstemmer/stem_UTF_8_dutch.c
new file mode 100644
index 000000000000..f04c88d3e6a2
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_dutch.c
@@ -0,0 +1,634 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int dutch_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_standard_suffix(struct SN_env * z);
+static int r_undouble(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_en_ending(struct SN_env * z);
+static int r_e_ending(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * dutch_UTF_8_create_env(void);
+extern void dutch_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[2] = { 0xC3, 0xA1 };
+static const symbol s_0_2[2] = { 0xC3, 0xA4 };
+static const symbol s_0_3[2] = { 0xC3, 0xA9 };
+static const symbol s_0_4[2] = { 0xC3, 0xAB };
+static const symbol s_0_5[2] = { 0xC3, 0xAD };
+static const symbol s_0_6[2] = { 0xC3, 0xAF };
+static const symbol s_0_7[2] = { 0xC3, 0xB3 };
+static const symbol s_0_8[2] = { 0xC3, 0xB6 };
+static const symbol s_0_9[2] = { 0xC3, 0xBA };
+static const symbol s_0_10[2] = { 0xC3, 0xBC };
+
+static const struct among a_0[11] =
+{
+/*  0 */ { 0, 0, -1, 6, 0},
+/*  1 */ { 2, s_0_1, 0, 1, 0},
+/*  2 */ { 2, s_0_2, 0, 1, 0},
+/*  3 */ { 2, s_0_3, 0, 2, 0},
+/*  4 */ { 2, s_0_4, 0, 2, 0},
+/*  5 */ { 2, s_0_5, 0, 3, 0},
+/*  6 */ { 2, s_0_6, 0, 3, 0},
+/*  7 */ { 2, s_0_7, 0, 4, 0},
+/*  8 */ { 2, s_0_8, 0, 4, 0},
+/*  9 */ { 2, s_0_9, 0, 5, 0},
+/* 10 */ { 2, s_0_10, 0, 5, 0}
+};
+
+static const symbol s_1_1[1] = { 'I' };
+static const symbol s_1_2[1] = { 'Y' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 1, s_1_1, 0, 2, 0},
+/*  2 */ { 1, s_1_2, 0, 1, 0}
+};
+
+static const symbol s_2_0[2] = { 'd', 'd' };
+static const symbol s_2_1[2] = { 'k', 'k' };
+static const symbol s_2_2[2] = { 't', 't' };
+
+static const struct among a_2[3] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 2, s_2_2, -1, -1, 0}
+};
+
+static const symbol s_3_0[3] = { 'e', 'n', 'e' };
+static const symbol s_3_1[2] = { 's', 'e' };
+static const symbol s_3_2[2] = { 'e', 'n' };
+static const symbol s_3_3[5] = { 'h', 'e', 'd', 'e', 'n' };
+static const symbol s_3_4[1] = { 's' };
+
+static const struct among a_3[5] =
+{
+/*  0 */ { 3, s_3_0, -1, 2, 0},
+/*  1 */ { 2, s_3_1, -1, 3, 0},
+/*  2 */ { 2, s_3_2, -1, 2, 0},
+/*  3 */ { 5, s_3_3, 2, 1, 0},
+/*  4 */ { 1, s_3_4, -1, 3, 0}
+};
+
+static const symbol s_4_0[3] = { 'e', 'n', 'd' };
+static const symbol s_4_1[2] = { 'i', 'g' };
+static const symbol s_4_2[3] = { 'i', 'n', 'g' };
+static const symbol s_4_3[4] = { 'l', 'i', 'j', 'k' };
+static const symbol s_4_4[4] = { 'b', 'a', 'a', 'r' };
+static const symbol s_4_5[3] = { 'b', 'a', 'r' };
+
+static const struct among a_4[6] =
+{
+/*  0 */ { 3, s_4_0, -1, 1, 0},
+/*  1 */ { 2, s_4_1, -1, 2, 0},
+/*  2 */ { 3, s_4_2, -1, 1, 0},
+/*  3 */ { 4, s_4_3, -1, 3, 0},
+/*  4 */ { 4, s_4_4, -1, 4, 0},
+/*  5 */ { 3, s_4_5, -1, 5, 0}
+};
+
+static const symbol s_5_0[2] = { 'a', 'a' };
+static const symbol s_5_1[2] = { 'e', 'e' };
+static const symbol s_5_2[2] = { 'o', 'o' };
+static const symbol s_5_3[2] = { 'u', 'u' };
+
+static const struct among a_5[4] =
+{
+/*  0 */ { 2, s_5_0, -1, -1, 0},
+/*  1 */ { 2, s_5_1, -1, -1, 0},
+/*  2 */ { 2, s_5_2, -1, -1, 0},
+/*  3 */ { 2, s_5_3, -1, -1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const unsigned char g_v_I[] = { 1, 0, 0, 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const unsigned char g_v_j[] = { 17, 67, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'o' };
+static const symbol s_4[] = { 'u' };
+static const symbol s_5[] = { 'y' };
+static const symbol s_6[] = { 'Y' };
+static const symbol s_7[] = { 'i' };
+static const symbol s_8[] = { 'I' };
+static const symbol s_9[] = { 'y' };
+static const symbol s_10[] = { 'Y' };
+static const symbol s_11[] = { 'y' };
+static const symbol s_12[] = { 'i' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'g', 'e', 'm' };
+static const symbol s_15[] = { 'h', 'e', 'i', 'd' };
+static const symbol s_16[] = { 'h', 'e', 'i', 'd' };
+static const symbol s_17[] = { 'c' };
+static const symbol s_18[] = { 'e', 'n' };
+static const symbol s_19[] = { 'i', 'g' };
+static const symbol s_20[] = { 'e' };
+static const symbol s_21[] = { 'e' };
+
+static int r_prelude(struct SN_env * z) {
+    int among_var;
+    {   int c_test = z->c; /* test, line 42 */
+        while(1) { /* repeat, line 42 */
+            int c1 = z->c;
+            z->bra = z->c; /* [, line 43 */
+            if (z->c + 1 >= z->l || z->p[z->c + 1] >> 5 != 5 || !((340306450 >> (z->p[z->c + 1] & 0x1f)) & 1)) among_var = 6; else
+            among_var = find_among(z, a_0, 11); /* substring, line 43 */
+            if (!(among_var)) goto lab0;
+            z->ket = z->c; /* ], line 43 */
+            switch(among_var) {
+                case 0: goto lab0;
+                case 1:
+                    {   int ret = slice_from_s(z, 1, s_0); /* <-, line 45 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    {   int ret = slice_from_s(z, 1, s_1); /* <-, line 47 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    {   int ret = slice_from_s(z, 1, s_2); /* <-, line 49 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 4:
+                    {   int ret = slice_from_s(z, 1, s_3); /* <-, line 51 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 5:
+                    {   int ret = slice_from_s(z, 1, s_4); /* <-, line 53 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 6:
+                    {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                        if (ret < 0) goto lab0;
+                        z->c = ret; /* next, line 54 */
+                    }
+                    break;
+            }
+            continue;
+        lab0:
+            z->c = c1;
+            break;
+        }
+        z->c = c_test;
+    }
+    {   int c_keep = z->c; /* try, line 57 */
+        z->bra = z->c; /* [, line 57 */
+        if (!(eq_s(z, 1, s_5))) { z->c = c_keep; goto lab1; }
+        z->ket = z->c; /* ], line 57 */
+        {   int ret = slice_from_s(z, 1, s_6); /* <-, line 57 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        ;
+    }
+    while(1) { /* repeat, line 58 */
+        int c2 = z->c;
+        while(1) { /* goto, line 58 */
+            int c3 = z->c;
+            if (in_grouping_U(z, g_v, 97, 232, 0)) goto lab3;
+            z->bra = z->c; /* [, line 59 */
+            {   int c4 = z->c; /* or, line 59 */
+                if (!(eq_s(z, 1, s_7))) goto lab5;
+                z->ket = z->c; /* ], line 59 */
+                if (in_grouping_U(z, g_v, 97, 232, 0)) goto lab5;
+                {   int ret = slice_from_s(z, 1, s_8); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                goto lab4;
+            lab5:
+                z->c = c4;
+                if (!(eq_s(z, 1, s_9))) goto lab3;
+                z->ket = z->c; /* ], line 60 */
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 60 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab4:
+            z->c = c3;
+            break;
+        lab3:
+            z->c = c3;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab2;
+                z->c = ret; /* goto, line 58 */
+            }
+        }
+        continue;
+    lab2:
+        z->c = c2;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {    /* gopast */ /* grouping v, line 69 */
+        int ret = out_grouping_U(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 69 */
+        int ret = in_grouping_U(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 69 */
+     /* try, line 70 */
+    if (!(z->I[0] < 3)) goto lab0;
+    z->I[0] = 3;
+lab0:
+    {    /* gopast */ /* grouping v, line 71 */
+        int ret = out_grouping_U(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 71 */
+        int ret = in_grouping_U(z, g_v, 97, 232, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[1] = z->c; /* setmark p2, line 71 */
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 75 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 77 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 73 && z->p[z->c + 0] != 89)) among_var = 3; else
+        among_var = find_among(z, a_1, 3); /* substring, line 77 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 77 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 80 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_undouble(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 91 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1050640 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+        if (!(find_among_b(z, a_2, 3))) return 0; /* among, line 91 */
+        z->c = z->l - m_test;
+    }
+    z->ket = z->c; /* [, line 91 */
+    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+        if (ret < 0) return 0;
+        z->c = ret; /* next, line 91 */
+    }
+    z->bra = z->c; /* ], line 91 */
+    {   int ret = slice_del(z); /* delete, line 91 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_e_ending(struct SN_env * z) {
+    z->B[0] = 0; /* unset e_found, line 95 */
+    z->ket = z->c; /* [, line 96 */
+    if (!(eq_s_b(z, 1, s_13))) return 0;
+    z->bra = z->c; /* ], line 96 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 96 */
+        if (ret < 0) return ret;
+    }
+    {   int m_test = z->l - z->c; /* test, line 96 */
+        if (out_grouping_b_U(z, g_v, 97, 232, 0)) return 0;
+        z->c = z->l - m_test;
+    }
+    {   int ret = slice_del(z); /* delete, line 96 */
+        if (ret < 0) return ret;
+    }
+    z->B[0] = 1; /* set e_found, line 97 */
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 98 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_en_ending(struct SN_env * z) {
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 102 */
+        if (ret < 0) return ret;
+    }
+    {   int m1 = z->l - z->c; (void)m1; /* and, line 102 */
+        if (out_grouping_b_U(z, g_v, 97, 232, 0)) return 0;
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 102 */
+            if (!(eq_s_b(z, 3, s_14))) goto lab0;
+            return 0;
+        lab0:
+            z->c = z->l - m2;
+        }
+    }
+    {   int ret = slice_del(z); /* delete, line 102 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 103 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 107 */
+        z->ket = z->c; /* [, line 108 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((540704 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab0;
+        among_var = find_among_b(z, a_3, 5); /* substring, line 108 */
+        if (!(among_var)) goto lab0;
+        z->bra = z->c; /* ], line 108 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = r_R1(z);
+                    if (ret == 0) goto lab0; /* call R1, line 110 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_from_s(z, 4, s_15); /* <-, line 110 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = r_en_ending(z);
+                    if (ret == 0) goto lab0; /* call en_ending, line 113 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = r_R1(z);
+                    if (ret == 0) goto lab0; /* call R1, line 116 */
+                    if (ret < 0) return ret;
+                }
+                if (out_grouping_b_U(z, g_v_j, 97, 232, 0)) goto lab0;
+                {   int ret = slice_del(z); /* delete, line 116 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        z->c = z->l - m1;
+    }
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 120 */
+        {   int ret = r_e_ending(z);
+            if (ret == 0) goto lab1; /* call e_ending, line 120 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 122 */
+        z->ket = z->c; /* [, line 122 */
+        if (!(eq_s_b(z, 4, s_16))) goto lab2;
+        z->bra = z->c; /* ], line 122 */
+        {   int ret = r_R2(z);
+            if (ret == 0) goto lab2; /* call R2, line 122 */
+            if (ret < 0) return ret;
+        }
+        {   int m4 = z->l - z->c; (void)m4; /* not, line 122 */
+            if (!(eq_s_b(z, 1, s_17))) goto lab3;
+            goto lab2;
+        lab3:
+            z->c = z->l - m4;
+        }
+        {   int ret = slice_del(z); /* delete, line 122 */
+            if (ret < 0) return ret;
+        }
+        z->ket = z->c; /* [, line 123 */
+        if (!(eq_s_b(z, 2, s_18))) goto lab2;
+        z->bra = z->c; /* ], line 123 */
+        {   int ret = r_en_ending(z);
+            if (ret == 0) goto lab2; /* call en_ending, line 123 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 126 */
+        z->ket = z->c; /* [, line 127 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((264336 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab4;
+        among_var = find_among_b(z, a_4, 6); /* substring, line 127 */
+        if (!(among_var)) goto lab4;
+        z->bra = z->c; /* ], line 127 */
+        switch(among_var) {
+            case 0: goto lab4;
+            case 1:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 129 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 129 */
+                    if (ret < 0) return ret;
+                }
+                {   int m6 = z->l - z->c; (void)m6; /* or, line 130 */
+                    z->ket = z->c; /* [, line 130 */
+                    if (!(eq_s_b(z, 2, s_19))) goto lab6;
+                    z->bra = z->c; /* ], line 130 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) goto lab6; /* call R2, line 130 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int m7 = z->l - z->c; (void)m7; /* not, line 130 */
+                        if (!(eq_s_b(z, 1, s_20))) goto lab7;
+                        goto lab6;
+                    lab7:
+                        z->c = z->l - m7;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 130 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m6;
+                    {   int ret = r_undouble(z);
+                        if (ret == 0) goto lab4; /* call undouble, line 130 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                break;
+            case 2:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 133 */
+                    if (ret < 0) return ret;
+                }
+                {   int m8 = z->l - z->c; (void)m8; /* not, line 133 */
+                    if (!(eq_s_b(z, 1, s_21))) goto lab8;
+                    goto lab4;
+                lab8:
+                    z->c = z->l - m8;
+                }
+                {   int ret = slice_del(z); /* delete, line 133 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 136 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 136 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = r_e_ending(z);
+                    if (ret == 0) goto lab4; /* call e_ending, line 136 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 139 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 139 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab4; /* call R2, line 142 */
+                    if (ret < 0) return ret;
+                }
+                if (!(z->B[0])) goto lab4; /* Boolean test e_found, line 142 */
+                {   int ret = slice_del(z); /* delete, line 142 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 146 */
+        if (out_grouping_b_U(z, g_v_I, 73, 232, 0)) goto lab9;
+        {   int m_test = z->l - z->c; /* test, line 148 */
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((2129954 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab9;
+            if (!(find_among_b(z, a_5, 4))) goto lab9; /* among, line 149 */
+            if (out_grouping_b_U(z, g_v, 97, 232, 0)) goto lab9;
+            z->c = z->l - m_test;
+        }
+        z->ket = z->c; /* [, line 152 */
+        {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+            if (ret < 0) goto lab9;
+            z->c = ret; /* next, line 152 */
+        }
+        z->bra = z->c; /* ], line 152 */
+        {   int ret = slice_del(z); /* delete, line 152 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m9;
+    }
+    return 1;
+}
+
+extern int dutch_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 159 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 159 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 160 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 160 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 161 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 162 */
+        {   int ret = r_standard_suffix(z);
+            if (ret == 0) goto lab2; /* call standard_suffix, line 162 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    z->c = z->lb;
+    {   int c4 = z->c; /* do, line 163 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab3; /* call postlude, line 163 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = c4;
+    }
+    return 1;
+}
+
+extern struct SN_env * dutch_UTF_8_create_env(void) { return SN_create_env(0, 2, 1); }
+
+extern void dutch_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_english.c b/src/backend/snowball/libstemmer/stem_UTF_8_english.c
new file mode 100644
index 000000000000..c5d4c2a445dc
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_english.c
@@ -0,0 +1,1125 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int english_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_exception2(struct SN_env * z);
+static int r_exception1(struct SN_env * z);
+static int r_Step_5(struct SN_env * z);
+static int r_Step_4(struct SN_env * z);
+static int r_Step_3(struct SN_env * z);
+static int r_Step_2(struct SN_env * z);
+static int r_Step_1c(struct SN_env * z);
+static int r_Step_1b(struct SN_env * z);
+static int r_Step_1a(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_shortv(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * english_UTF_8_create_env(void);
+extern void english_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[5] = { 'a', 'r', 's', 'e', 'n' };
+static const symbol s_0_1[6] = { 'c', 'o', 'm', 'm', 'u', 'n' };
+static const symbol s_0_2[5] = { 'g', 'e', 'n', 'e', 'r' };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 5, s_0_0, -1, -1, 0},
+/*  1 */ { 6, s_0_1, -1, -1, 0},
+/*  2 */ { 5, s_0_2, -1, -1, 0}
+};
+
+static const symbol s_1_0[1] = { '\'' };
+static const symbol s_1_1[3] = { '\'', 's', '\'' };
+static const symbol s_1_2[2] = { '\'', 's' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 1, s_1_0, -1, 1, 0},
+/*  1 */ { 3, s_1_1, 0, 1, 0},
+/*  2 */ { 2, s_1_2, -1, 1, 0}
+};
+
+static const symbol s_2_0[3] = { 'i', 'e', 'd' };
+static const symbol s_2_1[1] = { 's' };
+static const symbol s_2_2[3] = { 'i', 'e', 's' };
+static const symbol s_2_3[4] = { 's', 's', 'e', 's' };
+static const symbol s_2_4[2] = { 's', 's' };
+static const symbol s_2_5[2] = { 'u', 's' };
+
+static const struct among a_2[6] =
+{
+/*  0 */ { 3, s_2_0, -1, 2, 0},
+/*  1 */ { 1, s_2_1, -1, 3, 0},
+/*  2 */ { 3, s_2_2, 1, 2, 0},
+/*  3 */ { 4, s_2_3, 1, 1, 0},
+/*  4 */ { 2, s_2_4, 1, -1, 0},
+/*  5 */ { 2, s_2_5, 1, -1, 0}
+};
+
+static const symbol s_3_1[2] = { 'b', 'b' };
+static const symbol s_3_2[2] = { 'd', 'd' };
+static const symbol s_3_3[2] = { 'f', 'f' };
+static const symbol s_3_4[2] = { 'g', 'g' };
+static const symbol s_3_5[2] = { 'b', 'l' };
+static const symbol s_3_6[2] = { 'm', 'm' };
+static const symbol s_3_7[2] = { 'n', 'n' };
+static const symbol s_3_8[2] = { 'p', 'p' };
+static const symbol s_3_9[2] = { 'r', 'r' };
+static const symbol s_3_10[2] = { 'a', 't' };
+static const symbol s_3_11[2] = { 't', 't' };
+static const symbol s_3_12[2] = { 'i', 'z' };
+
+static const struct among a_3[13] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 2, s_3_1, 0, 2, 0},
+/*  2 */ { 2, s_3_2, 0, 2, 0},
+/*  3 */ { 2, s_3_3, 0, 2, 0},
+/*  4 */ { 2, s_3_4, 0, 2, 0},
+/*  5 */ { 2, s_3_5, 0, 1, 0},
+/*  6 */ { 2, s_3_6, 0, 2, 0},
+/*  7 */ { 2, s_3_7, 0, 2, 0},
+/*  8 */ { 2, s_3_8, 0, 2, 0},
+/*  9 */ { 2, s_3_9, 0, 2, 0},
+/* 10 */ { 2, s_3_10, 0, 1, 0},
+/* 11 */ { 2, s_3_11, 0, 2, 0},
+/* 12 */ { 2, s_3_12, 0, 1, 0}
+};
+
+static const symbol s_4_0[2] = { 'e', 'd' };
+static const symbol s_4_1[3] = { 'e', 'e', 'd' };
+static const symbol s_4_2[3] = { 'i', 'n', 'g' };
+static const symbol s_4_3[4] = { 'e', 'd', 'l', 'y' };
+static const symbol s_4_4[5] = { 'e', 'e', 'd', 'l', 'y' };
+static const symbol s_4_5[5] = { 'i', 'n', 'g', 'l', 'y' };
+
+static const struct among a_4[6] =
+{
+/*  0 */ { 2, s_4_0, -1, 2, 0},
+/*  1 */ { 3, s_4_1, 0, 1, 0},
+/*  2 */ { 3, s_4_2, -1, 2, 0},
+/*  3 */ { 4, s_4_3, -1, 2, 0},
+/*  4 */ { 5, s_4_4, 3, 1, 0},
+/*  5 */ { 5, s_4_5, -1, 2, 0}
+};
+
+static const symbol s_5_0[4] = { 'a', 'n', 'c', 'i' };
+static const symbol s_5_1[4] = { 'e', 'n', 'c', 'i' };
+static const symbol s_5_2[3] = { 'o', 'g', 'i' };
+static const symbol s_5_3[2] = { 'l', 'i' };
+static const symbol s_5_4[3] = { 'b', 'l', 'i' };
+static const symbol s_5_5[4] = { 'a', 'b', 'l', 'i' };
+static const symbol s_5_6[4] = { 'a', 'l', 'l', 'i' };
+static const symbol s_5_7[5] = { 'f', 'u', 'l', 'l', 'i' };
+static const symbol s_5_8[6] = { 'l', 'e', 's', 's', 'l', 'i' };
+static const symbol s_5_9[5] = { 'o', 'u', 's', 'l', 'i' };
+static const symbol s_5_10[5] = { 'e', 'n', 't', 'l', 'i' };
+static const symbol s_5_11[5] = { 'a', 'l', 'i', 't', 'i' };
+static const symbol s_5_12[6] = { 'b', 'i', 'l', 'i', 't', 'i' };
+static const symbol s_5_13[5] = { 'i', 'v', 'i', 't', 'i' };
+static const symbol s_5_14[6] = { 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_5_15[7] = { 'a', 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_5_16[5] = { 'a', 'l', 'i', 's', 'm' };
+static const symbol s_5_17[5] = { 'a', 't', 'i', 'o', 'n' };
+static const symbol s_5_18[7] = { 'i', 'z', 'a', 't', 'i', 'o', 'n' };
+static const symbol s_5_19[4] = { 'i', 'z', 'e', 'r' };
+static const symbol s_5_20[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_5_21[7] = { 'i', 'v', 'e', 'n', 'e', 's', 's' };
+static const symbol s_5_22[7] = { 'f', 'u', 'l', 'n', 'e', 's', 's' };
+static const symbol s_5_23[7] = { 'o', 'u', 's', 'n', 'e', 's', 's' };
+
+static const struct among a_5[24] =
+{
+/*  0 */ { 4, s_5_0, -1, 3, 0},
+/*  1 */ { 4, s_5_1, -1, 2, 0},
+/*  2 */ { 3, s_5_2, -1, 13, 0},
+/*  3 */ { 2, s_5_3, -1, 16, 0},
+/*  4 */ { 3, s_5_4, 3, 12, 0},
+/*  5 */ { 4, s_5_5, 4, 4, 0},
+/*  6 */ { 4, s_5_6, 3, 8, 0},
+/*  7 */ { 5, s_5_7, 3, 14, 0},
+/*  8 */ { 6, s_5_8, 3, 15, 0},
+/*  9 */ { 5, s_5_9, 3, 10, 0},
+/* 10 */ { 5, s_5_10, 3, 5, 0},
+/* 11 */ { 5, s_5_11, -1, 8, 0},
+/* 12 */ { 6, s_5_12, -1, 12, 0},
+/* 13 */ { 5, s_5_13, -1, 11, 0},
+/* 14 */ { 6, s_5_14, -1, 1, 0},
+/* 15 */ { 7, s_5_15, 14, 7, 0},
+/* 16 */ { 5, s_5_16, -1, 8, 0},
+/* 17 */ { 5, s_5_17, -1, 7, 0},
+/* 18 */ { 7, s_5_18, 17, 6, 0},
+/* 19 */ { 4, s_5_19, -1, 6, 0},
+/* 20 */ { 4, s_5_20, -1, 7, 0},
+/* 21 */ { 7, s_5_21, -1, 11, 0},
+/* 22 */ { 7, s_5_22, -1, 9, 0},
+/* 23 */ { 7, s_5_23, -1, 10, 0}
+};
+
+static const symbol s_6_0[5] = { 'i', 'c', 'a', 't', 'e' };
+static const symbol s_6_1[5] = { 'a', 't', 'i', 'v', 'e' };
+static const symbol s_6_2[5] = { 'a', 'l', 'i', 'z', 'e' };
+static const symbol s_6_3[5] = { 'i', 'c', 'i', 't', 'i' };
+static const symbol s_6_4[4] = { 'i', 'c', 'a', 'l' };
+static const symbol s_6_5[6] = { 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_6_6[7] = { 'a', 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_6_7[3] = { 'f', 'u', 'l' };
+static const symbol s_6_8[4] = { 'n', 'e', 's', 's' };
+
+static const struct among a_6[9] =
+{
+/*  0 */ { 5, s_6_0, -1, 4, 0},
+/*  1 */ { 5, s_6_1, -1, 6, 0},
+/*  2 */ { 5, s_6_2, -1, 3, 0},
+/*  3 */ { 5, s_6_3, -1, 4, 0},
+/*  4 */ { 4, s_6_4, -1, 4, 0},
+/*  5 */ { 6, s_6_5, -1, 1, 0},
+/*  6 */ { 7, s_6_6, 5, 2, 0},
+/*  7 */ { 3, s_6_7, -1, 5, 0},
+/*  8 */ { 4, s_6_8, -1, 5, 0}
+};
+
+static const symbol s_7_0[2] = { 'i', 'c' };
+static const symbol s_7_1[4] = { 'a', 'n', 'c', 'e' };
+static const symbol s_7_2[4] = { 'e', 'n', 'c', 'e' };
+static const symbol s_7_3[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_7_4[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_7_5[3] = { 'a', 't', 'e' };
+static const symbol s_7_6[3] = { 'i', 'v', 'e' };
+static const symbol s_7_7[3] = { 'i', 'z', 'e' };
+static const symbol s_7_8[3] = { 'i', 't', 'i' };
+static const symbol s_7_9[2] = { 'a', 'l' };
+static const symbol s_7_10[3] = { 'i', 's', 'm' };
+static const symbol s_7_11[3] = { 'i', 'o', 'n' };
+static const symbol s_7_12[2] = { 'e', 'r' };
+static const symbol s_7_13[3] = { 'o', 'u', 's' };
+static const symbol s_7_14[3] = { 'a', 'n', 't' };
+static const symbol s_7_15[3] = { 'e', 'n', 't' };
+static const symbol s_7_16[4] = { 'm', 'e', 'n', 't' };
+static const symbol s_7_17[5] = { 'e', 'm', 'e', 'n', 't' };
+
+static const struct among a_7[18] =
+{
+/*  0 */ { 2, s_7_0, -1, 1, 0},
+/*  1 */ { 4, s_7_1, -1, 1, 0},
+/*  2 */ { 4, s_7_2, -1, 1, 0},
+/*  3 */ { 4, s_7_3, -1, 1, 0},
+/*  4 */ { 4, s_7_4, -1, 1, 0},
+/*  5 */ { 3, s_7_5, -1, 1, 0},
+/*  6 */ { 3, s_7_6, -1, 1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 3, s_7_8, -1, 1, 0},
+/*  9 */ { 2, s_7_9, -1, 1, 0},
+/* 10 */ { 3, s_7_10, -1, 1, 0},
+/* 11 */ { 3, s_7_11, -1, 2, 0},
+/* 12 */ { 2, s_7_12, -1, 1, 0},
+/* 13 */ { 3, s_7_13, -1, 1, 0},
+/* 14 */ { 3, s_7_14, -1, 1, 0},
+/* 15 */ { 3, s_7_15, -1, 1, 0},
+/* 16 */ { 4, s_7_16, 15, 1, 0},
+/* 17 */ { 5, s_7_17, 16, 1, 0}
+};
+
+static const symbol s_8_0[1] = { 'e' };
+static const symbol s_8_1[1] = { 'l' };
+
+static const struct among a_8[2] =
+{
+/*  0 */ { 1, s_8_0, -1, 1, 0},
+/*  1 */ { 1, s_8_1, -1, 2, 0}
+};
+
+static const symbol s_9_0[7] = { 's', 'u', 'c', 'c', 'e', 'e', 'd' };
+static const symbol s_9_1[7] = { 'p', 'r', 'o', 'c', 'e', 'e', 'd' };
+static const symbol s_9_2[6] = { 'e', 'x', 'c', 'e', 'e', 'd' };
+static const symbol s_9_3[7] = { 'c', 'a', 'n', 'n', 'i', 'n', 'g' };
+static const symbol s_9_4[6] = { 'i', 'n', 'n', 'i', 'n', 'g' };
+static const symbol s_9_5[7] = { 'e', 'a', 'r', 'r', 'i', 'n', 'g' };
+static const symbol s_9_6[7] = { 'h', 'e', 'r', 'r', 'i', 'n', 'g' };
+static const symbol s_9_7[6] = { 'o', 'u', 't', 'i', 'n', 'g' };
+
+static const struct among a_9[8] =
+{
+/*  0 */ { 7, s_9_0, -1, -1, 0},
+/*  1 */ { 7, s_9_1, -1, -1, 0},
+/*  2 */ { 6, s_9_2, -1, -1, 0},
+/*  3 */ { 7, s_9_3, -1, -1, 0},
+/*  4 */ { 6, s_9_4, -1, -1, 0},
+/*  5 */ { 7, s_9_5, -1, -1, 0},
+/*  6 */ { 7, s_9_6, -1, -1, 0},
+/*  7 */ { 6, s_9_7, -1, -1, 0}
+};
+
+static const symbol s_10_0[5] = { 'a', 'n', 'd', 'e', 's' };
+static const symbol s_10_1[5] = { 'a', 't', 'l', 'a', 's' };
+static const symbol s_10_2[4] = { 'b', 'i', 'a', 's' };
+static const symbol s_10_3[6] = { 'c', 'o', 's', 'm', 'o', 's' };
+static const symbol s_10_4[5] = { 'd', 'y', 'i', 'n', 'g' };
+static const symbol s_10_5[5] = { 'e', 'a', 'r', 'l', 'y' };
+static const symbol s_10_6[6] = { 'g', 'e', 'n', 't', 'l', 'y' };
+static const symbol s_10_7[4] = { 'h', 'o', 'w', 'e' };
+static const symbol s_10_8[4] = { 'i', 'd', 'l', 'y' };
+static const symbol s_10_9[5] = { 'l', 'y', 'i', 'n', 'g' };
+static const symbol s_10_10[4] = { 'n', 'e', 'w', 's' };
+static const symbol s_10_11[4] = { 'o', 'n', 'l', 'y' };
+static const symbol s_10_12[6] = { 's', 'i', 'n', 'g', 'l', 'y' };
+static const symbol s_10_13[5] = { 's', 'k', 'i', 'e', 's' };
+static const symbol s_10_14[4] = { 's', 'k', 'i', 's' };
+static const symbol s_10_15[3] = { 's', 'k', 'y' };
+static const symbol s_10_16[5] = { 't', 'y', 'i', 'n', 'g' };
+static const symbol s_10_17[4] = { 'u', 'g', 'l', 'y' };
+
+static const struct among a_10[18] =
+{
+/*  0 */ { 5, s_10_0, -1, -1, 0},
+/*  1 */ { 5, s_10_1, -1, -1, 0},
+/*  2 */ { 4, s_10_2, -1, -1, 0},
+/*  3 */ { 6, s_10_3, -1, -1, 0},
+/*  4 */ { 5, s_10_4, -1, 3, 0},
+/*  5 */ { 5, s_10_5, -1, 9, 0},
+/*  6 */ { 6, s_10_6, -1, 7, 0},
+/*  7 */ { 4, s_10_7, -1, -1, 0},
+/*  8 */ { 4, s_10_8, -1, 6, 0},
+/*  9 */ { 5, s_10_9, -1, 4, 0},
+/* 10 */ { 4, s_10_10, -1, -1, 0},
+/* 11 */ { 4, s_10_11, -1, 10, 0},
+/* 12 */ { 6, s_10_12, -1, 11, 0},
+/* 13 */ { 5, s_10_13, -1, 2, 0},
+/* 14 */ { 4, s_10_14, -1, 1, 0},
+/* 15 */ { 3, s_10_15, -1, -1, 0},
+/* 16 */ { 5, s_10_16, -1, 5, 0},
+/* 17 */ { 4, s_10_17, -1, 8, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1 };
+
+static const unsigned char g_v_WXY[] = { 1, 17, 65, 208, 1 };
+
+static const unsigned char g_valid_LI[] = { 55, 141, 2 };
+
+static const symbol s_0[] = { '\'' };
+static const symbol s_1[] = { 'y' };
+static const symbol s_2[] = { 'Y' };
+static const symbol s_3[] = { 'y' };
+static const symbol s_4[] = { 'Y' };
+static const symbol s_5[] = { 's', 's' };
+static const symbol s_6[] = { 'i' };
+static const symbol s_7[] = { 'i', 'e' };
+static const symbol s_8[] = { 'e', 'e' };
+static const symbol s_9[] = { 'e' };
+static const symbol s_10[] = { 'e' };
+static const symbol s_11[] = { 'y' };
+static const symbol s_12[] = { 'Y' };
+static const symbol s_13[] = { 'i' };
+static const symbol s_14[] = { 't', 'i', 'o', 'n' };
+static const symbol s_15[] = { 'e', 'n', 'c', 'e' };
+static const symbol s_16[] = { 'a', 'n', 'c', 'e' };
+static const symbol s_17[] = { 'a', 'b', 'l', 'e' };
+static const symbol s_18[] = { 'e', 'n', 't' };
+static const symbol s_19[] = { 'i', 'z', 'e' };
+static const symbol s_20[] = { 'a', 't', 'e' };
+static const symbol s_21[] = { 'a', 'l' };
+static const symbol s_22[] = { 'f', 'u', 'l' };
+static const symbol s_23[] = { 'o', 'u', 's' };
+static const symbol s_24[] = { 'i', 'v', 'e' };
+static const symbol s_25[] = { 'b', 'l', 'e' };
+static const symbol s_26[] = { 'l' };
+static const symbol s_27[] = { 'o', 'g' };
+static const symbol s_28[] = { 'f', 'u', 'l' };
+static const symbol s_29[] = { 'l', 'e', 's', 's' };
+static const symbol s_30[] = { 't', 'i', 'o', 'n' };
+static const symbol s_31[] = { 'a', 't', 'e' };
+static const symbol s_32[] = { 'a', 'l' };
+static const symbol s_33[] = { 'i', 'c' };
+static const symbol s_34[] = { 's' };
+static const symbol s_35[] = { 't' };
+static const symbol s_36[] = { 'l' };
+static const symbol s_37[] = { 's', 'k', 'i' };
+static const symbol s_38[] = { 's', 'k', 'y' };
+static const symbol s_39[] = { 'd', 'i', 'e' };
+static const symbol s_40[] = { 'l', 'i', 'e' };
+static const symbol s_41[] = { 't', 'i', 'e' };
+static const symbol s_42[] = { 'i', 'd', 'l' };
+static const symbol s_43[] = { 'g', 'e', 'n', 't', 'l' };
+static const symbol s_44[] = { 'u', 'g', 'l', 'i' };
+static const symbol s_45[] = { 'e', 'a', 'r', 'l', 'i' };
+static const symbol s_46[] = { 'o', 'n', 'l', 'i' };
+static const symbol s_47[] = { 's', 'i', 'n', 'g', 'l' };
+static const symbol s_48[] = { 'Y' };
+static const symbol s_49[] = { 'y' };
+
+static int r_prelude(struct SN_env * z) {
+    z->B[0] = 0; /* unset Y_found, line 26 */
+    {   int c1 = z->c; /* do, line 27 */
+        z->bra = z->c; /* [, line 27 */
+        if (!(eq_s(z, 1, s_0))) goto lab0;
+        z->ket = z->c; /* ], line 27 */
+        {   int ret = slice_del(z); /* delete, line 27 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 28 */
+        z->bra = z->c; /* [, line 28 */
+        if (!(eq_s(z, 1, s_1))) goto lab1;
+        z->ket = z->c; /* ], line 28 */
+        {   int ret = slice_from_s(z, 1, s_2); /* <-, line 28 */
+            if (ret < 0) return ret;
+        }
+        z->B[0] = 1; /* set Y_found, line 28 */
+    lab1:
+        z->c = c2;
+    }
+    {   int c3 = z->c; /* do, line 29 */
+        while(1) { /* repeat, line 29 */
+            int c4 = z->c;
+            while(1) { /* goto, line 29 */
+                int c5 = z->c;
+                if (in_grouping_U(z, g_v, 97, 121, 0)) goto lab4;
+                z->bra = z->c; /* [, line 29 */
+                if (!(eq_s(z, 1, s_3))) goto lab4;
+                z->ket = z->c; /* ], line 29 */
+                z->c = c5;
+                break;
+            lab4:
+                z->c = c5;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab3;
+                    z->c = ret; /* goto, line 29 */
+                }
+            }
+            {   int ret = slice_from_s(z, 1, s_4); /* <-, line 29 */
+                if (ret < 0) return ret;
+            }
+            z->B[0] = 1; /* set Y_found, line 29 */
+            continue;
+        lab3:
+            z->c = c4;
+            break;
+        }
+        z->c = c3;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c1 = z->c; /* do, line 35 */
+        {   int c2 = z->c; /* or, line 41 */
+            if (z->c + 4 >= z->l || z->p[z->c + 4] >> 5 != 3 || !((2375680 >> (z->p[z->c + 4] & 0x1f)) & 1)) goto lab2;
+            if (!(find_among(z, a_0, 3))) goto lab2; /* among, line 36 */
+            goto lab1;
+        lab2:
+            z->c = c2;
+            {    /* gopast */ /* grouping v, line 41 */
+                int ret = out_grouping_U(z, g_v, 97, 121, 1);
+                if (ret < 0) goto lab0;
+                z->c += ret;
+            }
+            {    /* gopast */ /* non v, line 41 */
+                int ret = in_grouping_U(z, g_v, 97, 121, 1);
+                if (ret < 0) goto lab0;
+                z->c += ret;
+            }
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark p1, line 42 */
+        {    /* gopast */ /* grouping v, line 43 */
+            int ret = out_grouping_U(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 43 */
+            int ret = in_grouping_U(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p2, line 43 */
+    lab0:
+        z->c = c1;
+    }
+    return 1;
+}
+
+static int r_shortv(struct SN_env * z) {
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 51 */
+        if (out_grouping_b_U(z, g_v_WXY, 89, 121, 0)) goto lab1;
+        if (in_grouping_b_U(z, g_v, 97, 121, 0)) goto lab1;
+        if (out_grouping_b_U(z, g_v, 97, 121, 0)) goto lab1;
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        if (out_grouping_b_U(z, g_v, 97, 121, 0)) return 0;
+        if (in_grouping_b_U(z, g_v, 97, 121, 0)) return 0;
+        if (z->c > z->lb) return 0; /* atlimit, line 52 */
+    }
+lab0:
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_Step_1a(struct SN_env * z) {
+    int among_var;
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 59 */
+        z->ket = z->c; /* [, line 60 */
+        if (z->c <= z->lb || (z->p[z->c - 1] != 39 && z->p[z->c - 1] != 115)) { z->c = z->l - m_keep; goto lab0; }
+        among_var = find_among_b(z, a_1, 3); /* substring, line 60 */
+        if (!(among_var)) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 60 */
+        switch(among_var) {
+            case 0: { z->c = z->l - m_keep; goto lab0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 62 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        ;
+    }
+    z->ket = z->c; /* [, line 65 */
+    if (z->c <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 115)) return 0;
+    among_var = find_among_b(z, a_2, 6); /* substring, line 65 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 65 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 2, s_5); /* <-, line 66 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 68 */
+                {   int ret = skip_utf8(z->p, z->c, z->lb, z->l, - 2);
+                    if (ret < 0) goto lab2;
+                    z->c = ret; /* hop, line 68 */
+                }
+                {   int ret = slice_from_s(z, 1, s_6); /* <-, line 68 */
+                    if (ret < 0) return ret;
+                }
+                goto lab1;
+            lab2:
+                z->c = z->l - m1;
+                {   int ret = slice_from_s(z, 2, s_7); /* <-, line 68 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab1:
+            break;
+        case 3:
+            {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                if (ret < 0) return 0;
+                z->c = ret; /* next, line 69 */
+            }
+            {    /* gopast */ /* grouping v, line 69 */
+                int ret = out_grouping_b_U(z, g_v, 97, 121, 1);
+                if (ret < 0) return 0;
+                z->c -= ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 69 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1b(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 75 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((33554576 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_4, 6); /* substring, line 75 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 75 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 77 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 2, s_8); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m_test = z->l - z->c; /* test, line 80 */
+                {    /* gopast */ /* grouping v, line 80 */
+                    int ret = out_grouping_b_U(z, g_v, 97, 121, 1);
+                    if (ret < 0) return 0;
+                    z->c -= ret;
+                }
+                z->c = z->l - m_test;
+            }
+            {   int ret = slice_del(z); /* delete, line 80 */
+                if (ret < 0) return ret;
+            }
+            {   int m_test = z->l - z->c; /* test, line 81 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((68514004 >> (z->p[z->c - 1] & 0x1f)) & 1)) among_var = 3; else
+                among_var = find_among_b(z, a_3, 13); /* substring, line 81 */
+                if (!(among_var)) return 0;
+                z->c = z->l - m_test;
+            }
+            switch(among_var) {
+                case 0: return 0;
+                case 1:
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_9); /* <+, line 83 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    z->ket = z->c; /* [, line 86 */
+                    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                        if (ret < 0) return 0;
+                        z->c = ret; /* next, line 86 */
+                    }
+                    z->bra = z->c; /* ], line 86 */
+                    {   int ret = slice_del(z); /* delete, line 86 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    if (z->c != z->I[0]) return 0; /* atmark, line 87 */
+                    {   int m_test = z->l - z->c; /* test, line 87 */
+                        {   int ret = r_shortv(z);
+                            if (ret == 0) return 0; /* call shortv, line 87 */
+                            if (ret < 0) return ret;
+                        }
+                        z->c = z->l - m_test;
+                    }
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_10); /* <+, line 87 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1c(struct SN_env * z) {
+    z->ket = z->c; /* [, line 94 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 94 */
+        if (!(eq_s_b(z, 1, s_11))) goto lab1;
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        if (!(eq_s_b(z, 1, s_12))) return 0;
+    }
+lab0:
+    z->bra = z->c; /* ], line 94 */
+    if (out_grouping_b_U(z, g_v, 97, 121, 0)) return 0;
+    {   int m2 = z->l - z->c; (void)m2; /* not, line 95 */
+        if (z->c > z->lb) goto lab2; /* atlimit, line 95 */
+        return 0;
+    lab2:
+        z->c = z->l - m2;
+    }
+    {   int ret = slice_from_s(z, 1, s_13); /* <-, line 96 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_Step_2(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 100 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((815616 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_5, 24); /* substring, line 100 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 100 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 100 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 4, s_14); /* <-, line 101 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 4, s_15); /* <-, line 102 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 4, s_16); /* <-, line 103 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 4, s_17); /* <-, line 104 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 3, s_18); /* <-, line 105 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 3, s_19); /* <-, line 107 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 3, s_20); /* <-, line 109 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 2, s_21); /* <-, line 111 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 3, s_22); /* <-, line 112 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 3, s_23); /* <-, line 114 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 3, s_24); /* <-, line 116 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_from_s(z, 3, s_25); /* <-, line 118 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            if (!(eq_s_b(z, 1, s_26))) return 0;
+            {   int ret = slice_from_s(z, 2, s_27); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_from_s(z, 3, s_28); /* <-, line 120 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 15:
+            {   int ret = slice_from_s(z, 4, s_29); /* <-, line 121 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 16:
+            if (in_grouping_b_U(z, g_valid_LI, 99, 116, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 122 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_3(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 127 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((528928 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_6, 9); /* substring, line 127 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 127 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 127 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 4, s_30); /* <-, line 128 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 3, s_31); /* <-, line 129 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 2, s_32); /* <-, line 130 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 2, s_33); /* <-, line 132 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_del(z); /* delete, line 134 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 136 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 136 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_4(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 141 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1864232 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_7, 18); /* substring, line 141 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 141 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 141 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 144 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 145 */
+                if (!(eq_s_b(z, 1, s_34))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_35))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 145 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_5(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 150 */
+    if (z->c <= z->lb || (z->p[z->c - 1] != 101 && z->p[z->c - 1] != 108)) return 0;
+    among_var = find_among_b(z, a_8, 2); /* substring, line 150 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 150 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 151 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab1; /* call R2, line 151 */
+                    if (ret < 0) return ret;
+                }
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                {   int ret = r_R1(z);
+                    if (ret == 0) return 0; /* call R1, line 151 */
+                    if (ret < 0) return ret;
+                }
+                {   int m2 = z->l - z->c; (void)m2; /* not, line 151 */
+                    {   int ret = r_shortv(z);
+                        if (ret == 0) goto lab2; /* call shortv, line 151 */
+                        if (ret < 0) return ret;
+                    }
+                    return 0;
+                lab2:
+                    z->c = z->l - m2;
+                }
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 151 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 152 */
+                if (ret < 0) return ret;
+            }
+            if (!(eq_s_b(z, 1, s_36))) return 0;
+            {   int ret = slice_del(z); /* delete, line 152 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_exception2(struct SN_env * z) {
+    z->ket = z->c; /* [, line 158 */
+    if (z->c - 5 <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 103)) return 0;
+    if (!(find_among_b(z, a_9, 8))) return 0; /* substring, line 158 */
+    z->bra = z->c; /* ], line 158 */
+    if (z->c > z->lb) return 0; /* atlimit, line 158 */
+    return 1;
+}
+
+static int r_exception1(struct SN_env * z) {
+    int among_var;
+    z->bra = z->c; /* [, line 170 */
+    if (z->c + 2 >= z->l || z->p[z->c + 2] >> 5 != 3 || !((42750482 >> (z->p[z->c + 2] & 0x1f)) & 1)) return 0;
+    among_var = find_among(z, a_10, 18); /* substring, line 170 */
+    if (!(among_var)) return 0;
+    z->ket = z->c; /* ], line 170 */
+    if (z->c < z->l) return 0; /* atlimit, line 170 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 3, s_37); /* <-, line 174 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 3, s_38); /* <-, line 175 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 3, s_39); /* <-, line 176 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 3, s_40); /* <-, line 177 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 3, s_41); /* <-, line 178 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 3, s_42); /* <-, line 182 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 5, s_43); /* <-, line 183 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 4, s_44); /* <-, line 184 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 5, s_45); /* <-, line 185 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 4, s_46); /* <-, line 186 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 5, s_47); /* <-, line 187 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    if (!(z->B[0])) return 0; /* Boolean test Y_found, line 203 */
+    while(1) { /* repeat, line 203 */
+        int c1 = z->c;
+        while(1) { /* goto, line 203 */
+            int c2 = z->c;
+            z->bra = z->c; /* [, line 203 */
+            if (!(eq_s(z, 1, s_48))) goto lab1;
+            z->ket = z->c; /* ], line 203 */
+            z->c = c2;
+            break;
+        lab1:
+            z->c = c2;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab0;
+                z->c = ret; /* goto, line 203 */
+            }
+        }
+        {   int ret = slice_from_s(z, 1, s_49); /* <-, line 203 */
+            if (ret < 0) return ret;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+extern int english_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* or, line 207 */
+        {   int ret = r_exception1(z);
+            if (ret == 0) goto lab1; /* call exception1, line 207 */
+            if (ret < 0) return ret;
+        }
+        goto lab0;
+    lab1:
+        z->c = c1;
+        {   int c2 = z->c; /* not, line 208 */
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, + 3);
+                if (ret < 0) goto lab3;
+                z->c = ret; /* hop, line 208 */
+            }
+            goto lab2;
+        lab3:
+            z->c = c2;
+        }
+        goto lab0;
+    lab2:
+        z->c = c1;
+        {   int c3 = z->c; /* do, line 209 */
+            {   int ret = r_prelude(z);
+                if (ret == 0) goto lab4; /* call prelude, line 209 */
+                if (ret < 0) return ret;
+            }
+        lab4:
+            z->c = c3;
+        }
+        {   int c4 = z->c; /* do, line 210 */
+            {   int ret = r_mark_regions(z);
+                if (ret == 0) goto lab5; /* call mark_regions, line 210 */
+                if (ret < 0) return ret;
+            }
+        lab5:
+            z->c = c4;
+        }
+        z->lb = z->c; z->c = z->l; /* backwards, line 211 */
+
+        {   int m5 = z->l - z->c; (void)m5; /* do, line 213 */
+            {   int ret = r_Step_1a(z);
+                if (ret == 0) goto lab6; /* call Step_1a, line 213 */
+                if (ret < 0) return ret;
+            }
+        lab6:
+            z->c = z->l - m5;
+        }
+        {   int m6 = z->l - z->c; (void)m6; /* or, line 215 */
+            {   int ret = r_exception2(z);
+                if (ret == 0) goto lab8; /* call exception2, line 215 */
+                if (ret < 0) return ret;
+            }
+            goto lab7;
+        lab8:
+            z->c = z->l - m6;
+            {   int m7 = z->l - z->c; (void)m7; /* do, line 217 */
+                {   int ret = r_Step_1b(z);
+                    if (ret == 0) goto lab9; /* call Step_1b, line 217 */
+                    if (ret < 0) return ret;
+                }
+            lab9:
+                z->c = z->l - m7;
+            }
+            {   int m8 = z->l - z->c; (void)m8; /* do, line 218 */
+                {   int ret = r_Step_1c(z);
+                    if (ret == 0) goto lab10; /* call Step_1c, line 218 */
+                    if (ret < 0) return ret;
+                }
+            lab10:
+                z->c = z->l - m8;
+            }
+            {   int m9 = z->l - z->c; (void)m9; /* do, line 220 */
+                {   int ret = r_Step_2(z);
+                    if (ret == 0) goto lab11; /* call Step_2, line 220 */
+                    if (ret < 0) return ret;
+                }
+            lab11:
+                z->c = z->l - m9;
+            }
+            {   int m10 = z->l - z->c; (void)m10; /* do, line 221 */
+                {   int ret = r_Step_3(z);
+                    if (ret == 0) goto lab12; /* call Step_3, line 221 */
+                    if (ret < 0) return ret;
+                }
+            lab12:
+                z->c = z->l - m10;
+            }
+            {   int m11 = z->l - z->c; (void)m11; /* do, line 222 */
+                {   int ret = r_Step_4(z);
+                    if (ret == 0) goto lab13; /* call Step_4, line 222 */
+                    if (ret < 0) return ret;
+                }
+            lab13:
+                z->c = z->l - m11;
+            }
+            {   int m12 = z->l - z->c; (void)m12; /* do, line 224 */
+                {   int ret = r_Step_5(z);
+                    if (ret == 0) goto lab14; /* call Step_5, line 224 */
+                    if (ret < 0) return ret;
+                }
+            lab14:
+                z->c = z->l - m12;
+            }
+        }
+    lab7:
+        z->c = z->lb;
+        {   int c13 = z->c; /* do, line 227 */
+            {   int ret = r_postlude(z);
+                if (ret == 0) goto lab15; /* call postlude, line 227 */
+                if (ret < 0) return ret;
+            }
+        lab15:
+            z->c = c13;
+        }
+    }
+lab0:
+    return 1;
+}
+
+extern struct SN_env * english_UTF_8_create_env(void) { return SN_create_env(0, 2, 1); }
+
+extern void english_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_finnish.c b/src/backend/snowball/libstemmer/stem_UTF_8_finnish.c
new file mode 100644
index 000000000000..55fba0a732d8
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_finnish.c
@@ -0,0 +1,768 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int finnish_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_tidy(struct SN_env * z);
+static int r_other_endings(struct SN_env * z);
+static int r_t_plural(struct SN_env * z);
+static int r_i_plural(struct SN_env * z);
+static int r_case_ending(struct SN_env * z);
+static int r_VI(struct SN_env * z);
+static int r_LONG(struct SN_env * z);
+static int r_possessive(struct SN_env * z);
+static int r_particle_etc(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * finnish_UTF_8_create_env(void);
+extern void finnish_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[2] = { 'p', 'a' };
+static const symbol s_0_1[3] = { 's', 't', 'i' };
+static const symbol s_0_2[4] = { 'k', 'a', 'a', 'n' };
+static const symbol s_0_3[3] = { 'h', 'a', 'n' };
+static const symbol s_0_4[3] = { 'k', 'i', 'n' };
+static const symbol s_0_5[4] = { 'h', 0xC3, 0xA4, 'n' };
+static const symbol s_0_6[6] = { 'k', 0xC3, 0xA4, 0xC3, 0xA4, 'n' };
+static const symbol s_0_7[2] = { 'k', 'o' };
+static const symbol s_0_8[3] = { 'p', 0xC3, 0xA4 };
+static const symbol s_0_9[3] = { 'k', 0xC3, 0xB6 };
+
+static const struct among a_0[10] =
+{
+/*  0 */ { 2, s_0_0, -1, 1, 0},
+/*  1 */ { 3, s_0_1, -1, 2, 0},
+/*  2 */ { 4, s_0_2, -1, 1, 0},
+/*  3 */ { 3, s_0_3, -1, 1, 0},
+/*  4 */ { 3, s_0_4, -1, 1, 0},
+/*  5 */ { 4, s_0_5, -1, 1, 0},
+/*  6 */ { 6, s_0_6, -1, 1, 0},
+/*  7 */ { 2, s_0_7, -1, 1, 0},
+/*  8 */ { 3, s_0_8, -1, 1, 0},
+/*  9 */ { 3, s_0_9, -1, 1, 0}
+};
+
+static const symbol s_1_0[3] = { 'l', 'l', 'a' };
+static const symbol s_1_1[2] = { 'n', 'a' };
+static const symbol s_1_2[3] = { 's', 's', 'a' };
+static const symbol s_1_3[2] = { 't', 'a' };
+static const symbol s_1_4[3] = { 'l', 't', 'a' };
+static const symbol s_1_5[3] = { 's', 't', 'a' };
+
+static const struct among a_1[6] =
+{
+/*  0 */ { 3, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0},
+/*  2 */ { 3, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0},
+/*  4 */ { 3, s_1_4, 3, -1, 0},
+/*  5 */ { 3, s_1_5, 3, -1, 0}
+};
+
+static const symbol s_2_0[4] = { 'l', 'l', 0xC3, 0xA4 };
+static const symbol s_2_1[3] = { 'n', 0xC3, 0xA4 };
+static const symbol s_2_2[4] = { 's', 's', 0xC3, 0xA4 };
+static const symbol s_2_3[3] = { 't', 0xC3, 0xA4 };
+static const symbol s_2_4[4] = { 'l', 't', 0xC3, 0xA4 };
+static const symbol s_2_5[4] = { 's', 't', 0xC3, 0xA4 };
+
+static const struct among a_2[6] =
+{
+/*  0 */ { 4, s_2_0, -1, -1, 0},
+/*  1 */ { 3, s_2_1, -1, -1, 0},
+/*  2 */ { 4, s_2_2, -1, -1, 0},
+/*  3 */ { 3, s_2_3, -1, -1, 0},
+/*  4 */ { 4, s_2_4, 3, -1, 0},
+/*  5 */ { 4, s_2_5, 3, -1, 0}
+};
+
+static const symbol s_3_0[3] = { 'l', 'l', 'e' };
+static const symbol s_3_1[3] = { 'i', 'n', 'e' };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 3, s_3_0, -1, -1, 0},
+/*  1 */ { 3, s_3_1, -1, -1, 0}
+};
+
+static const symbol s_4_0[3] = { 'n', 's', 'a' };
+static const symbol s_4_1[3] = { 'm', 'm', 'e' };
+static const symbol s_4_2[3] = { 'n', 'n', 'e' };
+static const symbol s_4_3[2] = { 'n', 'i' };
+static const symbol s_4_4[2] = { 's', 'i' };
+static const symbol s_4_5[2] = { 'a', 'n' };
+static const symbol s_4_6[2] = { 'e', 'n' };
+static const symbol s_4_7[3] = { 0xC3, 0xA4, 'n' };
+static const symbol s_4_8[4] = { 'n', 's', 0xC3, 0xA4 };
+
+static const struct among a_4[9] =
+{
+/*  0 */ { 3, s_4_0, -1, 3, 0},
+/*  1 */ { 3, s_4_1, -1, 3, 0},
+/*  2 */ { 3, s_4_2, -1, 3, 0},
+/*  3 */ { 2, s_4_3, -1, 2, 0},
+/*  4 */ { 2, s_4_4, -1, 1, 0},
+/*  5 */ { 2, s_4_5, -1, 4, 0},
+/*  6 */ { 2, s_4_6, -1, 6, 0},
+/*  7 */ { 3, s_4_7, -1, 5, 0},
+/*  8 */ { 4, s_4_8, -1, 3, 0}
+};
+
+static const symbol s_5_0[2] = { 'a', 'a' };
+static const symbol s_5_1[2] = { 'e', 'e' };
+static const symbol s_5_2[2] = { 'i', 'i' };
+static const symbol s_5_3[2] = { 'o', 'o' };
+static const symbol s_5_4[2] = { 'u', 'u' };
+static const symbol s_5_5[4] = { 0xC3, 0xA4, 0xC3, 0xA4 };
+static const symbol s_5_6[4] = { 0xC3, 0xB6, 0xC3, 0xB6 };
+
+static const struct among a_5[7] =
+{
+/*  0 */ { 2, s_5_0, -1, -1, 0},
+/*  1 */ { 2, s_5_1, -1, -1, 0},
+/*  2 */ { 2, s_5_2, -1, -1, 0},
+/*  3 */ { 2, s_5_3, -1, -1, 0},
+/*  4 */ { 2, s_5_4, -1, -1, 0},
+/*  5 */ { 4, s_5_5, -1, -1, 0},
+/*  6 */ { 4, s_5_6, -1, -1, 0}
+};
+
+static const symbol s_6_0[1] = { 'a' };
+static const symbol s_6_1[3] = { 'l', 'l', 'a' };
+static const symbol s_6_2[2] = { 'n', 'a' };
+static const symbol s_6_3[3] = { 's', 's', 'a' };
+static const symbol s_6_4[2] = { 't', 'a' };
+static const symbol s_6_5[3] = { 'l', 't', 'a' };
+static const symbol s_6_6[3] = { 's', 't', 'a' };
+static const symbol s_6_7[3] = { 't', 't', 'a' };
+static const symbol s_6_8[3] = { 'l', 'l', 'e' };
+static const symbol s_6_9[3] = { 'i', 'n', 'e' };
+static const symbol s_6_10[3] = { 'k', 's', 'i' };
+static const symbol s_6_11[1] = { 'n' };
+static const symbol s_6_12[3] = { 'h', 'a', 'n' };
+static const symbol s_6_13[3] = { 'd', 'e', 'n' };
+static const symbol s_6_14[4] = { 's', 'e', 'e', 'n' };
+static const symbol s_6_15[3] = { 'h', 'e', 'n' };
+static const symbol s_6_16[4] = { 't', 't', 'e', 'n' };
+static const symbol s_6_17[3] = { 'h', 'i', 'n' };
+static const symbol s_6_18[4] = { 's', 'i', 'i', 'n' };
+static const symbol s_6_19[3] = { 'h', 'o', 'n' };
+static const symbol s_6_20[4] = { 'h', 0xC3, 0xA4, 'n' };
+static const symbol s_6_21[4] = { 'h', 0xC3, 0xB6, 'n' };
+static const symbol s_6_22[2] = { 0xC3, 0xA4 };
+static const symbol s_6_23[4] = { 'l', 'l', 0xC3, 0xA4 };
+static const symbol s_6_24[3] = { 'n', 0xC3, 0xA4 };
+static const symbol s_6_25[4] = { 's', 's', 0xC3, 0xA4 };
+static const symbol s_6_26[3] = { 't', 0xC3, 0xA4 };
+static const symbol s_6_27[4] = { 'l', 't', 0xC3, 0xA4 };
+static const symbol s_6_28[4] = { 's', 't', 0xC3, 0xA4 };
+static const symbol s_6_29[4] = { 't', 't', 0xC3, 0xA4 };
+
+static const struct among a_6[30] =
+{
+/*  0 */ { 1, s_6_0, -1, 8, 0},
+/*  1 */ { 3, s_6_1, 0, -1, 0},
+/*  2 */ { 2, s_6_2, 0, -1, 0},
+/*  3 */ { 3, s_6_3, 0, -1, 0},
+/*  4 */ { 2, s_6_4, 0, -1, 0},
+/*  5 */ { 3, s_6_5, 4, -1, 0},
+/*  6 */ { 3, s_6_6, 4, -1, 0},
+/*  7 */ { 3, s_6_7, 4, 9, 0},
+/*  8 */ { 3, s_6_8, -1, -1, 0},
+/*  9 */ { 3, s_6_9, -1, -1, 0},
+/* 10 */ { 3, s_6_10, -1, -1, 0},
+/* 11 */ { 1, s_6_11, -1, 7, 0},
+/* 12 */ { 3, s_6_12, 11, 1, 0},
+/* 13 */ { 3, s_6_13, 11, -1, r_VI},
+/* 14 */ { 4, s_6_14, 11, -1, r_LONG},
+/* 15 */ { 3, s_6_15, 11, 2, 0},
+/* 16 */ { 4, s_6_16, 11, -1, r_VI},
+/* 17 */ { 3, s_6_17, 11, 3, 0},
+/* 18 */ { 4, s_6_18, 11, -1, r_VI},
+/* 19 */ { 3, s_6_19, 11, 4, 0},
+/* 20 */ { 4, s_6_20, 11, 5, 0},
+/* 21 */ { 4, s_6_21, 11, 6, 0},
+/* 22 */ { 2, s_6_22, -1, 8, 0},
+/* 23 */ { 4, s_6_23, 22, -1, 0},
+/* 24 */ { 3, s_6_24, 22, -1, 0},
+/* 25 */ { 4, s_6_25, 22, -1, 0},
+/* 26 */ { 3, s_6_26, 22, -1, 0},
+/* 27 */ { 4, s_6_27, 26, -1, 0},
+/* 28 */ { 4, s_6_28, 26, -1, 0},
+/* 29 */ { 4, s_6_29, 26, 9, 0}
+};
+
+static const symbol s_7_0[3] = { 'e', 'j', 'a' };
+static const symbol s_7_1[3] = { 'm', 'm', 'a' };
+static const symbol s_7_2[4] = { 'i', 'm', 'm', 'a' };
+static const symbol s_7_3[3] = { 'm', 'p', 'a' };
+static const symbol s_7_4[4] = { 'i', 'm', 'p', 'a' };
+static const symbol s_7_5[3] = { 'm', 'm', 'i' };
+static const symbol s_7_6[4] = { 'i', 'm', 'm', 'i' };
+static const symbol s_7_7[3] = { 'm', 'p', 'i' };
+static const symbol s_7_8[4] = { 'i', 'm', 'p', 'i' };
+static const symbol s_7_9[4] = { 'e', 'j', 0xC3, 0xA4 };
+static const symbol s_7_10[4] = { 'm', 'm', 0xC3, 0xA4 };
+static const symbol s_7_11[5] = { 'i', 'm', 'm', 0xC3, 0xA4 };
+static const symbol s_7_12[4] = { 'm', 'p', 0xC3, 0xA4 };
+static const symbol s_7_13[5] = { 'i', 'm', 'p', 0xC3, 0xA4 };
+
+static const struct among a_7[14] =
+{
+/*  0 */ { 3, s_7_0, -1, -1, 0},
+/*  1 */ { 3, s_7_1, -1, 1, 0},
+/*  2 */ { 4, s_7_2, 1, -1, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 4, s_7_4, 3, -1, 0},
+/*  5 */ { 3, s_7_5, -1, 1, 0},
+/*  6 */ { 4, s_7_6, 5, -1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 4, s_7_8, 7, -1, 0},
+/*  9 */ { 4, s_7_9, -1, -1, 0},
+/* 10 */ { 4, s_7_10, -1, 1, 0},
+/* 11 */ { 5, s_7_11, 10, -1, 0},
+/* 12 */ { 4, s_7_12, -1, 1, 0},
+/* 13 */ { 5, s_7_13, 12, -1, 0}
+};
+
+static const symbol s_8_0[1] = { 'i' };
+static const symbol s_8_1[1] = { 'j' };
+
+static const struct among a_8[2] =
+{
+/*  0 */ { 1, s_8_0, -1, -1, 0},
+/*  1 */ { 1, s_8_1, -1, -1, 0}
+};
+
+static const symbol s_9_0[3] = { 'm', 'm', 'a' };
+static const symbol s_9_1[4] = { 'i', 'm', 'm', 'a' };
+
+static const struct among a_9[2] =
+{
+/*  0 */ { 3, s_9_0, -1, 1, 0},
+/*  1 */ { 4, s_9_1, 0, -1, 0}
+};
+
+static const unsigned char g_AEI[] = { 17, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8 };
+
+static const unsigned char g_V1[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32 };
+
+static const unsigned char g_V2[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32 };
+
+static const unsigned char g_particle_end[] = { 17, 97, 24, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32 };
+
+static const symbol s_0[] = { 'k' };
+static const symbol s_1[] = { 'k', 's', 'e' };
+static const symbol s_2[] = { 'k', 's', 'i' };
+static const symbol s_3[] = { 'i' };
+static const symbol s_4[] = { 'a' };
+static const symbol s_5[] = { 'e' };
+static const symbol s_6[] = { 'i' };
+static const symbol s_7[] = { 'o' };
+static const symbol s_8[] = { 0xC3, 0xA4 };
+static const symbol s_9[] = { 0xC3, 0xB6 };
+static const symbol s_10[] = { 'i', 'e' };
+static const symbol s_11[] = { 'e' };
+static const symbol s_12[] = { 'p', 'o' };
+static const symbol s_13[] = { 't' };
+static const symbol s_14[] = { 'p', 'o' };
+static const symbol s_15[] = { 'j' };
+static const symbol s_16[] = { 'o' };
+static const symbol s_17[] = { 'u' };
+static const symbol s_18[] = { 'o' };
+static const symbol s_19[] = { 'j' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    if (out_grouping_U(z, g_V1, 97, 246, 1) < 0) return 0; /* goto */ /* grouping V1, line 46 */
+    {    /* gopast */ /* non V1, line 46 */
+        int ret = in_grouping_U(z, g_V1, 97, 246, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 46 */
+    if (out_grouping_U(z, g_V1, 97, 246, 1) < 0) return 0; /* goto */ /* grouping V1, line 47 */
+    {    /* gopast */ /* non V1, line 47 */
+        int ret = in_grouping_U(z, g_V1, 97, 246, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[1] = z->c; /* setmark p2, line 47 */
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_particle_etc(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 55 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 55 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 55 */
+        among_var = find_among_b(z, a_0, 10); /* substring, line 55 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 55 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            if (in_grouping_b_U(z, g_particle_end, 97, 246, 0)) return 0;
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 64 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 66 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_possessive(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 69 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 69 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 69 */
+        among_var = find_among_b(z, a_4, 9); /* substring, line 69 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 69 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m2 = z->l - z->c; (void)m2; /* not, line 72 */
+                if (!(eq_s_b(z, 1, s_0))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m2;
+            }
+            {   int ret = slice_del(z); /* delete, line 72 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 74 */
+                if (ret < 0) return ret;
+            }
+            z->ket = z->c; /* [, line 74 */
+            if (!(eq_s_b(z, 3, s_1))) return 0;
+            z->bra = z->c; /* ], line 74 */
+            {   int ret = slice_from_s(z, 3, s_2); /* <-, line 74 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 78 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] != 97) return 0;
+            if (!(find_among_b(z, a_1, 6))) return 0; /* among, line 81 */
+            {   int ret = slice_del(z); /* delete, line 81 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            if (z->c - 2 <= z->lb || z->p[z->c - 1] != 164) return 0;
+            if (!(find_among_b(z, a_2, 6))) return 0; /* among, line 83 */
+            {   int ret = slice_del(z); /* delete, line 84 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            if (z->c - 2 <= z->lb || z->p[z->c - 1] != 101) return 0;
+            if (!(find_among_b(z, a_3, 2))) return 0; /* among, line 86 */
+            {   int ret = slice_del(z); /* delete, line 86 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_LONG(struct SN_env * z) {
+    if (!(find_among_b(z, a_5, 7))) return 0; /* among, line 91 */
+    return 1;
+}
+
+static int r_VI(struct SN_env * z) {
+    if (!(eq_s_b(z, 1, s_3))) return 0;
+    if (in_grouping_b_U(z, g_V2, 97, 246, 0)) return 0;
+    return 1;
+}
+
+static int r_case_ending(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 96 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 96 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 96 */
+        among_var = find_among_b(z, a_6, 30); /* substring, line 96 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 96 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            if (!(eq_s_b(z, 1, s_4))) return 0;
+            break;
+        case 2:
+            if (!(eq_s_b(z, 1, s_5))) return 0;
+            break;
+        case 3:
+            if (!(eq_s_b(z, 1, s_6))) return 0;
+            break;
+        case 4:
+            if (!(eq_s_b(z, 1, s_7))) return 0;
+            break;
+        case 5:
+            if (!(eq_s_b(z, 2, s_8))) return 0;
+            break;
+        case 6:
+            if (!(eq_s_b(z, 2, s_9))) return 0;
+            break;
+        case 7:
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 111 */
+                {   int m2 = z->l - z->c; (void)m2; /* and, line 113 */
+                    {   int m3 = z->l - z->c; (void)m3; /* or, line 112 */
+                        {   int ret = r_LONG(z);
+                            if (ret == 0) goto lab2; /* call LONG, line 111 */
+                            if (ret < 0) return ret;
+                        }
+                        goto lab1;
+                    lab2:
+                        z->c = z->l - m3;
+                        if (!(eq_s_b(z, 2, s_10))) { z->c = z->l - m_keep; goto lab0; }
+                    }
+                lab1:
+                    z->c = z->l - m2;
+                    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                        if (ret < 0) { z->c = z->l - m_keep; goto lab0; }
+                        z->c = ret; /* next, line 113 */
+                    }
+                }
+                z->bra = z->c; /* ], line 113 */
+            lab0:
+                ;
+            }
+            break;
+        case 8:
+            if (in_grouping_b_U(z, g_V1, 97, 246, 0)) return 0;
+            if (out_grouping_b_U(z, g_V1, 97, 246, 0)) return 0;
+            break;
+        case 9:
+            if (!(eq_s_b(z, 1, s_11))) return 0;
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 138 */
+        if (ret < 0) return ret;
+    }
+    z->B[0] = 1; /* set ending_removed, line 139 */
+    return 1;
+}
+
+static int r_other_endings(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 142 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[1]) return 0;
+        z->c = z->I[1]; /* tomark, line 142 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 142 */
+        among_var = find_among_b(z, a_7, 14); /* substring, line 142 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 142 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m2 = z->l - z->c; (void)m2; /* not, line 146 */
+                if (!(eq_s_b(z, 2, s_12))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m2;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 151 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_i_plural(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 154 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 154 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 154 */
+        if (z->c <= z->lb || (z->p[z->c - 1] != 105 && z->p[z->c - 1] != 106)) { z->lb = mlimit; return 0; }
+        if (!(find_among_b(z, a_8, 2))) { z->lb = mlimit; return 0; } /* substring, line 154 */
+        z->bra = z->c; /* ], line 154 */
+        z->lb = mlimit;
+    }
+    {   int ret = slice_del(z); /* delete, line 158 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_t_plural(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 161 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 161 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 162 */
+        if (!(eq_s_b(z, 1, s_13))) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 162 */
+        {   int m_test = z->l - z->c; /* test, line 162 */
+            if (in_grouping_b_U(z, g_V1, 97, 246, 0)) { z->lb = mlimit; return 0; }
+            z->c = z->l - m_test;
+        }
+        {   int ret = slice_del(z); /* delete, line 163 */
+            if (ret < 0) return ret;
+        }
+        z->lb = mlimit;
+    }
+    {   int mlimit; /* setlimit, line 165 */
+        int m2 = z->l - z->c; (void)m2;
+        if (z->c < z->I[1]) return 0;
+        z->c = z->I[1]; /* tomark, line 165 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m2;
+        z->ket = z->c; /* [, line 165 */
+        if (z->c - 2 <= z->lb || z->p[z->c - 1] != 97) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_9, 2); /* substring, line 165 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 165 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m3 = z->l - z->c; (void)m3; /* not, line 167 */
+                if (!(eq_s_b(z, 2, s_14))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m3;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 170 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_tidy(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 173 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 173 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* do, line 174 */
+            {   int m3 = z->l - z->c; (void)m3; /* and, line 174 */
+                {   int ret = r_LONG(z);
+                    if (ret == 0) goto lab0; /* call LONG, line 174 */
+                    if (ret < 0) return ret;
+                }
+                z->c = z->l - m3;
+                z->ket = z->c; /* [, line 174 */
+                {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 174 */
+                }
+                z->bra = z->c; /* ], line 174 */
+                {   int ret = slice_del(z); /* delete, line 174 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab0:
+            z->c = z->l - m2;
+        }
+        {   int m4 = z->l - z->c; (void)m4; /* do, line 175 */
+            z->ket = z->c; /* [, line 175 */
+            if (in_grouping_b_U(z, g_AEI, 97, 228, 0)) goto lab1;
+            z->bra = z->c; /* ], line 175 */
+            if (out_grouping_b_U(z, g_V1, 97, 246, 0)) goto lab1;
+            {   int ret = slice_del(z); /* delete, line 175 */
+                if (ret < 0) return ret;
+            }
+        lab1:
+            z->c = z->l - m4;
+        }
+        {   int m5 = z->l - z->c; (void)m5; /* do, line 176 */
+            z->ket = z->c; /* [, line 176 */
+            if (!(eq_s_b(z, 1, s_15))) goto lab2;
+            z->bra = z->c; /* ], line 176 */
+            {   int m6 = z->l - z->c; (void)m6; /* or, line 176 */
+                if (!(eq_s_b(z, 1, s_16))) goto lab4;
+                goto lab3;
+            lab4:
+                z->c = z->l - m6;
+                if (!(eq_s_b(z, 1, s_17))) goto lab2;
+            }
+        lab3:
+            {   int ret = slice_del(z); /* delete, line 176 */
+                if (ret < 0) return ret;
+            }
+        lab2:
+            z->c = z->l - m5;
+        }
+        {   int m7 = z->l - z->c; (void)m7; /* do, line 177 */
+            z->ket = z->c; /* [, line 177 */
+            if (!(eq_s_b(z, 1, s_18))) goto lab5;
+            z->bra = z->c; /* ], line 177 */
+            if (!(eq_s_b(z, 1, s_19))) goto lab5;
+            {   int ret = slice_del(z); /* delete, line 177 */
+                if (ret < 0) return ret;
+            }
+        lab5:
+            z->c = z->l - m7;
+        }
+        z->lb = mlimit;
+    }
+    if (in_grouping_b_U(z, g_V1, 97, 246, 1) < 0) return 0; /* goto */ /* non V1, line 179 */
+    z->ket = z->c; /* [, line 179 */
+    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+        if (ret < 0) return 0;
+        z->c = ret; /* next, line 179 */
+    }
+    z->bra = z->c; /* ], line 179 */
+    z->S[0] = slice_to(z, z->S[0]); /* -> x, line 179 */
+    if (z->S[0] == 0) return -1; /* -> x, line 179 */
+    if (!(eq_v_b(z, z->S[0]))) return 0; /* name x, line 179 */
+    {   int ret = slice_del(z); /* delete, line 179 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int finnish_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 185 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 185 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->B[0] = 0; /* unset ending_removed, line 186 */
+    z->lb = z->c; z->c = z->l; /* backwards, line 187 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 188 */
+        {   int ret = r_particle_etc(z);
+            if (ret == 0) goto lab1; /* call particle_etc, line 188 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 189 */
+        {   int ret = r_possessive(z);
+            if (ret == 0) goto lab2; /* call possessive, line 189 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 190 */
+        {   int ret = r_case_ending(z);
+            if (ret == 0) goto lab3; /* call case_ending, line 190 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 191 */
+        {   int ret = r_other_endings(z);
+            if (ret == 0) goto lab4; /* call other_endings, line 191 */
+            if (ret < 0) return ret;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m6 = z->l - z->c; (void)m6; /* or, line 192 */
+        if (!(z->B[0])) goto lab6; /* Boolean test ending_removed, line 192 */
+        {   int m7 = z->l - z->c; (void)m7; /* do, line 192 */
+            {   int ret = r_i_plural(z);
+                if (ret == 0) goto lab7; /* call i_plural, line 192 */
+                if (ret < 0) return ret;
+            }
+        lab7:
+            z->c = z->l - m7;
+        }
+        goto lab5;
+    lab6:
+        z->c = z->l - m6;
+        {   int m8 = z->l - z->c; (void)m8; /* do, line 192 */
+            {   int ret = r_t_plural(z);
+                if (ret == 0) goto lab8; /* call t_plural, line 192 */
+                if (ret < 0) return ret;
+            }
+        lab8:
+            z->c = z->l - m8;
+        }
+    }
+lab5:
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 193 */
+        {   int ret = r_tidy(z);
+            if (ret == 0) goto lab9; /* call tidy, line 193 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m9;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * finnish_UTF_8_create_env(void) { return SN_create_env(1, 2, 1); }
+
+extern void finnish_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 1); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_french.c b/src/backend/snowball/libstemmer/stem_UTF_8_french.c
new file mode 100644
index 000000000000..fa1507f2c634
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_french.c
@@ -0,0 +1,1256 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int french_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_un_accent(struct SN_env * z);
+static int r_un_double(struct SN_env * z);
+static int r_residual_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_i_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * french_UTF_8_create_env(void);
+extern void french_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[3] = { 'c', 'o', 'l' };
+static const symbol s_0_1[3] = { 'p', 'a', 'r' };
+static const symbol s_0_2[3] = { 't', 'a', 'p' };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 3, s_0_0, -1, -1, 0},
+/*  1 */ { 3, s_0_1, -1, -1, 0},
+/*  2 */ { 3, s_0_2, -1, -1, 0}
+};
+
+static const symbol s_1_1[1] = { 'I' };
+static const symbol s_1_2[1] = { 'U' };
+static const symbol s_1_3[1] = { 'Y' };
+
+static const struct among a_1[4] =
+{
+/*  0 */ { 0, 0, -1, 4, 0},
+/*  1 */ { 1, s_1_1, 0, 1, 0},
+/*  2 */ { 1, s_1_2, 0, 2, 0},
+/*  3 */ { 1, s_1_3, 0, 3, 0}
+};
+
+static const symbol s_2_0[3] = { 'i', 'q', 'U' };
+static const symbol s_2_1[3] = { 'a', 'b', 'l' };
+static const symbol s_2_2[4] = { 'I', 0xC3, 0xA8, 'r' };
+static const symbol s_2_3[4] = { 'i', 0xC3, 0xA8, 'r' };
+static const symbol s_2_4[3] = { 'e', 'u', 's' };
+static const symbol s_2_5[2] = { 'i', 'v' };
+
+static const struct among a_2[6] =
+{
+/*  0 */ { 3, s_2_0, -1, 3, 0},
+/*  1 */ { 3, s_2_1, -1, 3, 0},
+/*  2 */ { 4, s_2_2, -1, 4, 0},
+/*  3 */ { 4, s_2_3, -1, 4, 0},
+/*  4 */ { 3, s_2_4, -1, 2, 0},
+/*  5 */ { 2, s_2_5, -1, 1, 0}
+};
+
+static const symbol s_3_0[2] = { 'i', 'c' };
+static const symbol s_3_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_3_2[2] = { 'i', 'v' };
+
+static const struct among a_3[3] =
+{
+/*  0 */ { 2, s_3_0, -1, 2, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0},
+/*  2 */ { 2, s_3_2, -1, 3, 0}
+};
+
+static const symbol s_4_0[4] = { 'i', 'q', 'U', 'e' };
+static const symbol s_4_1[6] = { 'a', 't', 'r', 'i', 'c', 'e' };
+static const symbol s_4_2[4] = { 'a', 'n', 'c', 'e' };
+static const symbol s_4_3[4] = { 'e', 'n', 'c', 'e' };
+static const symbol s_4_4[5] = { 'l', 'o', 'g', 'i', 'e' };
+static const symbol s_4_5[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_4_6[4] = { 'i', 's', 'm', 'e' };
+static const symbol s_4_7[4] = { 'e', 'u', 's', 'e' };
+static const symbol s_4_8[4] = { 'i', 's', 't', 'e' };
+static const symbol s_4_9[3] = { 'i', 'v', 'e' };
+static const symbol s_4_10[2] = { 'i', 'f' };
+static const symbol s_4_11[5] = { 'u', 's', 'i', 'o', 'n' };
+static const symbol s_4_12[5] = { 'a', 't', 'i', 'o', 'n' };
+static const symbol s_4_13[5] = { 'u', 't', 'i', 'o', 'n' };
+static const symbol s_4_14[5] = { 'a', 't', 'e', 'u', 'r' };
+static const symbol s_4_15[5] = { 'i', 'q', 'U', 'e', 's' };
+static const symbol s_4_16[7] = { 'a', 't', 'r', 'i', 'c', 'e', 's' };
+static const symbol s_4_17[5] = { 'a', 'n', 'c', 'e', 's' };
+static const symbol s_4_18[5] = { 'e', 'n', 'c', 'e', 's' };
+static const symbol s_4_19[6] = { 'l', 'o', 'g', 'i', 'e', 's' };
+static const symbol s_4_20[5] = { 'a', 'b', 'l', 'e', 's' };
+static const symbol s_4_21[5] = { 'i', 's', 'm', 'e', 's' };
+static const symbol s_4_22[5] = { 'e', 'u', 's', 'e', 's' };
+static const symbol s_4_23[5] = { 'i', 's', 't', 'e', 's' };
+static const symbol s_4_24[4] = { 'i', 'v', 'e', 's' };
+static const symbol s_4_25[3] = { 'i', 'f', 's' };
+static const symbol s_4_26[6] = { 'u', 's', 'i', 'o', 'n', 's' };
+static const symbol s_4_27[6] = { 'a', 't', 'i', 'o', 'n', 's' };
+static const symbol s_4_28[6] = { 'u', 't', 'i', 'o', 'n', 's' };
+static const symbol s_4_29[6] = { 'a', 't', 'e', 'u', 'r', 's' };
+static const symbol s_4_30[5] = { 'm', 'e', 'n', 't', 's' };
+static const symbol s_4_31[6] = { 'e', 'm', 'e', 'n', 't', 's' };
+static const symbol s_4_32[9] = { 'i', 's', 's', 'e', 'm', 'e', 'n', 't', 's' };
+static const symbol s_4_33[5] = { 'i', 't', 0xC3, 0xA9, 's' };
+static const symbol s_4_34[4] = { 'm', 'e', 'n', 't' };
+static const symbol s_4_35[5] = { 'e', 'm', 'e', 'n', 't' };
+static const symbol s_4_36[8] = { 'i', 's', 's', 'e', 'm', 'e', 'n', 't' };
+static const symbol s_4_37[6] = { 'a', 'm', 'm', 'e', 'n', 't' };
+static const symbol s_4_38[6] = { 'e', 'm', 'm', 'e', 'n', 't' };
+static const symbol s_4_39[3] = { 'a', 'u', 'x' };
+static const symbol s_4_40[4] = { 'e', 'a', 'u', 'x' };
+static const symbol s_4_41[3] = { 'e', 'u', 'x' };
+static const symbol s_4_42[4] = { 'i', 't', 0xC3, 0xA9 };
+
+static const struct among a_4[43] =
+{
+/*  0 */ { 4, s_4_0, -1, 1, 0},
+/*  1 */ { 6, s_4_1, -1, 2, 0},
+/*  2 */ { 4, s_4_2, -1, 1, 0},
+/*  3 */ { 4, s_4_3, -1, 5, 0},
+/*  4 */ { 5, s_4_4, -1, 3, 0},
+/*  5 */ { 4, s_4_5, -1, 1, 0},
+/*  6 */ { 4, s_4_6, -1, 1, 0},
+/*  7 */ { 4, s_4_7, -1, 11, 0},
+/*  8 */ { 4, s_4_8, -1, 1, 0},
+/*  9 */ { 3, s_4_9, -1, 8, 0},
+/* 10 */ { 2, s_4_10, -1, 8, 0},
+/* 11 */ { 5, s_4_11, -1, 4, 0},
+/* 12 */ { 5, s_4_12, -1, 2, 0},
+/* 13 */ { 5, s_4_13, -1, 4, 0},
+/* 14 */ { 5, s_4_14, -1, 2, 0},
+/* 15 */ { 5, s_4_15, -1, 1, 0},
+/* 16 */ { 7, s_4_16, -1, 2, 0},
+/* 17 */ { 5, s_4_17, -1, 1, 0},
+/* 18 */ { 5, s_4_18, -1, 5, 0},
+/* 19 */ { 6, s_4_19, -1, 3, 0},
+/* 20 */ { 5, s_4_20, -1, 1, 0},
+/* 21 */ { 5, s_4_21, -1, 1, 0},
+/* 22 */ { 5, s_4_22, -1, 11, 0},
+/* 23 */ { 5, s_4_23, -1, 1, 0},
+/* 24 */ { 4, s_4_24, -1, 8, 0},
+/* 25 */ { 3, s_4_25, -1, 8, 0},
+/* 26 */ { 6, s_4_26, -1, 4, 0},
+/* 27 */ { 6, s_4_27, -1, 2, 0},
+/* 28 */ { 6, s_4_28, -1, 4, 0},
+/* 29 */ { 6, s_4_29, -1, 2, 0},
+/* 30 */ { 5, s_4_30, -1, 15, 0},
+/* 31 */ { 6, s_4_31, 30, 6, 0},
+/* 32 */ { 9, s_4_32, 31, 12, 0},
+/* 33 */ { 5, s_4_33, -1, 7, 0},
+/* 34 */ { 4, s_4_34, -1, 15, 0},
+/* 35 */ { 5, s_4_35, 34, 6, 0},
+/* 36 */ { 8, s_4_36, 35, 12, 0},
+/* 37 */ { 6, s_4_37, 34, 13, 0},
+/* 38 */ { 6, s_4_38, 34, 14, 0},
+/* 39 */ { 3, s_4_39, -1, 10, 0},
+/* 40 */ { 4, s_4_40, 39, 9, 0},
+/* 41 */ { 3, s_4_41, -1, 1, 0},
+/* 42 */ { 4, s_4_42, -1, 7, 0}
+};
+
+static const symbol s_5_0[3] = { 'i', 'r', 'a' };
+static const symbol s_5_1[2] = { 'i', 'e' };
+static const symbol s_5_2[4] = { 'i', 's', 's', 'e' };
+static const symbol s_5_3[7] = { 'i', 's', 's', 'a', 'n', 't', 'e' };
+static const symbol s_5_4[1] = { 'i' };
+static const symbol s_5_5[4] = { 'i', 'r', 'a', 'i' };
+static const symbol s_5_6[2] = { 'i', 'r' };
+static const symbol s_5_7[4] = { 'i', 'r', 'a', 's' };
+static const symbol s_5_8[3] = { 'i', 'e', 's' };
+static const symbol s_5_9[5] = { 0xC3, 0xAE, 'm', 'e', 's' };
+static const symbol s_5_10[5] = { 'i', 's', 's', 'e', 's' };
+static const symbol s_5_11[8] = { 'i', 's', 's', 'a', 'n', 't', 'e', 's' };
+static const symbol s_5_12[5] = { 0xC3, 0xAE, 't', 'e', 's' };
+static const symbol s_5_13[2] = { 'i', 's' };
+static const symbol s_5_14[5] = { 'i', 'r', 'a', 'i', 's' };
+static const symbol s_5_15[6] = { 'i', 's', 's', 'a', 'i', 's' };
+static const symbol s_5_16[6] = { 'i', 'r', 'i', 'o', 'n', 's' };
+static const symbol s_5_17[7] = { 'i', 's', 's', 'i', 'o', 'n', 's' };
+static const symbol s_5_18[5] = { 'i', 'r', 'o', 'n', 's' };
+static const symbol s_5_19[6] = { 'i', 's', 's', 'o', 'n', 's' };
+static const symbol s_5_20[7] = { 'i', 's', 's', 'a', 'n', 't', 's' };
+static const symbol s_5_21[2] = { 'i', 't' };
+static const symbol s_5_22[5] = { 'i', 'r', 'a', 'i', 't' };
+static const symbol s_5_23[6] = { 'i', 's', 's', 'a', 'i', 't' };
+static const symbol s_5_24[6] = { 'i', 's', 's', 'a', 'n', 't' };
+static const symbol s_5_25[7] = { 'i', 'r', 'a', 'I', 'e', 'n', 't' };
+static const symbol s_5_26[8] = { 'i', 's', 's', 'a', 'I', 'e', 'n', 't' };
+static const symbol s_5_27[5] = { 'i', 'r', 'e', 'n', 't' };
+static const symbol s_5_28[6] = { 'i', 's', 's', 'e', 'n', 't' };
+static const symbol s_5_29[5] = { 'i', 'r', 'o', 'n', 't' };
+static const symbol s_5_30[3] = { 0xC3, 0xAE, 't' };
+static const symbol s_5_31[5] = { 'i', 'r', 'i', 'e', 'z' };
+static const symbol s_5_32[6] = { 'i', 's', 's', 'i', 'e', 'z' };
+static const symbol s_5_33[4] = { 'i', 'r', 'e', 'z' };
+static const symbol s_5_34[5] = { 'i', 's', 's', 'e', 'z' };
+
+static const struct among a_5[35] =
+{
+/*  0 */ { 3, s_5_0, -1, 1, 0},
+/*  1 */ { 2, s_5_1, -1, 1, 0},
+/*  2 */ { 4, s_5_2, -1, 1, 0},
+/*  3 */ { 7, s_5_3, -1, 1, 0},
+/*  4 */ { 1, s_5_4, -1, 1, 0},
+/*  5 */ { 4, s_5_5, 4, 1, 0},
+/*  6 */ { 2, s_5_6, -1, 1, 0},
+/*  7 */ { 4, s_5_7, -1, 1, 0},
+/*  8 */ { 3, s_5_8, -1, 1, 0},
+/*  9 */ { 5, s_5_9, -1, 1, 0},
+/* 10 */ { 5, s_5_10, -1, 1, 0},
+/* 11 */ { 8, s_5_11, -1, 1, 0},
+/* 12 */ { 5, s_5_12, -1, 1, 0},
+/* 13 */ { 2, s_5_13, -1, 1, 0},
+/* 14 */ { 5, s_5_14, 13, 1, 0},
+/* 15 */ { 6, s_5_15, 13, 1, 0},
+/* 16 */ { 6, s_5_16, -1, 1, 0},
+/* 17 */ { 7, s_5_17, -1, 1, 0},
+/* 18 */ { 5, s_5_18, -1, 1, 0},
+/* 19 */ { 6, s_5_19, -1, 1, 0},
+/* 20 */ { 7, s_5_20, -1, 1, 0},
+/* 21 */ { 2, s_5_21, -1, 1, 0},
+/* 22 */ { 5, s_5_22, 21, 1, 0},
+/* 23 */ { 6, s_5_23, 21, 1, 0},
+/* 24 */ { 6, s_5_24, -1, 1, 0},
+/* 25 */ { 7, s_5_25, -1, 1, 0},
+/* 26 */ { 8, s_5_26, -1, 1, 0},
+/* 27 */ { 5, s_5_27, -1, 1, 0},
+/* 28 */ { 6, s_5_28, -1, 1, 0},
+/* 29 */ { 5, s_5_29, -1, 1, 0},
+/* 30 */ { 3, s_5_30, -1, 1, 0},
+/* 31 */ { 5, s_5_31, -1, 1, 0},
+/* 32 */ { 6, s_5_32, -1, 1, 0},
+/* 33 */ { 4, s_5_33, -1, 1, 0},
+/* 34 */ { 5, s_5_34, -1, 1, 0}
+};
+
+static const symbol s_6_0[1] = { 'a' };
+static const symbol s_6_1[3] = { 'e', 'r', 'a' };
+static const symbol s_6_2[4] = { 'a', 's', 's', 'e' };
+static const symbol s_6_3[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_6_4[3] = { 0xC3, 0xA9, 'e' };
+static const symbol s_6_5[2] = { 'a', 'i' };
+static const symbol s_6_6[4] = { 'e', 'r', 'a', 'i' };
+static const symbol s_6_7[2] = { 'e', 'r' };
+static const symbol s_6_8[2] = { 'a', 's' };
+static const symbol s_6_9[4] = { 'e', 'r', 'a', 's' };
+static const symbol s_6_10[5] = { 0xC3, 0xA2, 'm', 'e', 's' };
+static const symbol s_6_11[5] = { 'a', 's', 's', 'e', 's' };
+static const symbol s_6_12[5] = { 'a', 'n', 't', 'e', 's' };
+static const symbol s_6_13[5] = { 0xC3, 0xA2, 't', 'e', 's' };
+static const symbol s_6_14[4] = { 0xC3, 0xA9, 'e', 's' };
+static const symbol s_6_15[3] = { 'a', 'i', 's' };
+static const symbol s_6_16[5] = { 'e', 'r', 'a', 'i', 's' };
+static const symbol s_6_17[4] = { 'i', 'o', 'n', 's' };
+static const symbol s_6_18[6] = { 'e', 'r', 'i', 'o', 'n', 's' };
+static const symbol s_6_19[7] = { 'a', 's', 's', 'i', 'o', 'n', 's' };
+static const symbol s_6_20[5] = { 'e', 'r', 'o', 'n', 's' };
+static const symbol s_6_21[4] = { 'a', 'n', 't', 's' };
+static const symbol s_6_22[3] = { 0xC3, 0xA9, 's' };
+static const symbol s_6_23[3] = { 'a', 'i', 't' };
+static const symbol s_6_24[5] = { 'e', 'r', 'a', 'i', 't' };
+static const symbol s_6_25[3] = { 'a', 'n', 't' };
+static const symbol s_6_26[5] = { 'a', 'I', 'e', 'n', 't' };
+static const symbol s_6_27[7] = { 'e', 'r', 'a', 'I', 'e', 'n', 't' };
+static const symbol s_6_28[6] = { 0xC3, 0xA8, 'r', 'e', 'n', 't' };
+static const symbol s_6_29[6] = { 'a', 's', 's', 'e', 'n', 't' };
+static const symbol s_6_30[5] = { 'e', 'r', 'o', 'n', 't' };
+static const symbol s_6_31[3] = { 0xC3, 0xA2, 't' };
+static const symbol s_6_32[2] = { 'e', 'z' };
+static const symbol s_6_33[3] = { 'i', 'e', 'z' };
+static const symbol s_6_34[5] = { 'e', 'r', 'i', 'e', 'z' };
+static const symbol s_6_35[6] = { 'a', 's', 's', 'i', 'e', 'z' };
+static const symbol s_6_36[4] = { 'e', 'r', 'e', 'z' };
+static const symbol s_6_37[2] = { 0xC3, 0xA9 };
+
+static const struct among a_6[38] =
+{
+/*  0 */ { 1, s_6_0, -1, 3, 0},
+/*  1 */ { 3, s_6_1, 0, 2, 0},
+/*  2 */ { 4, s_6_2, -1, 3, 0},
+/*  3 */ { 4, s_6_3, -1, 3, 0},
+/*  4 */ { 3, s_6_4, -1, 2, 0},
+/*  5 */ { 2, s_6_5, -1, 3, 0},
+/*  6 */ { 4, s_6_6, 5, 2, 0},
+/*  7 */ { 2, s_6_7, -1, 2, 0},
+/*  8 */ { 2, s_6_8, -1, 3, 0},
+/*  9 */ { 4, s_6_9, 8, 2, 0},
+/* 10 */ { 5, s_6_10, -1, 3, 0},
+/* 11 */ { 5, s_6_11, -1, 3, 0},
+/* 12 */ { 5, s_6_12, -1, 3, 0},
+/* 13 */ { 5, s_6_13, -1, 3, 0},
+/* 14 */ { 4, s_6_14, -1, 2, 0},
+/* 15 */ { 3, s_6_15, -1, 3, 0},
+/* 16 */ { 5, s_6_16, 15, 2, 0},
+/* 17 */ { 4, s_6_17, -1, 1, 0},
+/* 18 */ { 6, s_6_18, 17, 2, 0},
+/* 19 */ { 7, s_6_19, 17, 3, 0},
+/* 20 */ { 5, s_6_20, -1, 2, 0},
+/* 21 */ { 4, s_6_21, -1, 3, 0},
+/* 22 */ { 3, s_6_22, -1, 2, 0},
+/* 23 */ { 3, s_6_23, -1, 3, 0},
+/* 24 */ { 5, s_6_24, 23, 2, 0},
+/* 25 */ { 3, s_6_25, -1, 3, 0},
+/* 26 */ { 5, s_6_26, -1, 3, 0},
+/* 27 */ { 7, s_6_27, 26, 2, 0},
+/* 28 */ { 6, s_6_28, -1, 2, 0},
+/* 29 */ { 6, s_6_29, -1, 3, 0},
+/* 30 */ { 5, s_6_30, -1, 2, 0},
+/* 31 */ { 3, s_6_31, -1, 3, 0},
+/* 32 */ { 2, s_6_32, -1, 2, 0},
+/* 33 */ { 3, s_6_33, 32, 2, 0},
+/* 34 */ { 5, s_6_34, 33, 2, 0},
+/* 35 */ { 6, s_6_35, 33, 3, 0},
+/* 36 */ { 4, s_6_36, 32, 2, 0},
+/* 37 */ { 2, s_6_37, -1, 2, 0}
+};
+
+static const symbol s_7_0[1] = { 'e' };
+static const symbol s_7_1[5] = { 'I', 0xC3, 0xA8, 'r', 'e' };
+static const symbol s_7_2[5] = { 'i', 0xC3, 0xA8, 'r', 'e' };
+static const symbol s_7_3[3] = { 'i', 'o', 'n' };
+static const symbol s_7_4[3] = { 'I', 'e', 'r' };
+static const symbol s_7_5[3] = { 'i', 'e', 'r' };
+static const symbol s_7_6[2] = { 0xC3, 0xAB };
+
+static const struct among a_7[7] =
+{
+/*  0 */ { 1, s_7_0, -1, 3, 0},
+/*  1 */ { 5, s_7_1, 0, 2, 0},
+/*  2 */ { 5, s_7_2, 0, 2, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 3, s_7_4, -1, 2, 0},
+/*  5 */ { 3, s_7_5, -1, 2, 0},
+/*  6 */ { 2, s_7_6, -1, 4, 0}
+};
+
+static const symbol s_8_0[3] = { 'e', 'l', 'l' };
+static const symbol s_8_1[4] = { 'e', 'i', 'l', 'l' };
+static const symbol s_8_2[3] = { 'e', 'n', 'n' };
+static const symbol s_8_3[3] = { 'o', 'n', 'n' };
+static const symbol s_8_4[3] = { 'e', 't', 't' };
+
+static const struct among a_8[5] =
+{
+/*  0 */ { 3, s_8_0, -1, -1, 0},
+/*  1 */ { 4, s_8_1, -1, -1, 0},
+/*  2 */ { 3, s_8_2, -1, -1, 0},
+/*  3 */ { 3, s_8_3, -1, -1, 0},
+/*  4 */ { 3, s_8_4, -1, -1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 130, 103, 8, 5 };
+
+static const unsigned char g_keep_with_s[] = { 1, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
+
+static const symbol s_0[] = { 'u' };
+static const symbol s_1[] = { 'U' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'I' };
+static const symbol s_4[] = { 'y' };
+static const symbol s_5[] = { 'Y' };
+static const symbol s_6[] = { 'y' };
+static const symbol s_7[] = { 'Y' };
+static const symbol s_8[] = { 'q' };
+static const symbol s_9[] = { 'u' };
+static const symbol s_10[] = { 'U' };
+static const symbol s_11[] = { 'i' };
+static const symbol s_12[] = { 'u' };
+static const symbol s_13[] = { 'y' };
+static const symbol s_14[] = { 'i', 'c' };
+static const symbol s_15[] = { 'i', 'q', 'U' };
+static const symbol s_16[] = { 'l', 'o', 'g' };
+static const symbol s_17[] = { 'u' };
+static const symbol s_18[] = { 'e', 'n', 't' };
+static const symbol s_19[] = { 'a', 't' };
+static const symbol s_20[] = { 'e', 'u', 'x' };
+static const symbol s_21[] = { 'i' };
+static const symbol s_22[] = { 'a', 'b', 'l' };
+static const symbol s_23[] = { 'i', 'q', 'U' };
+static const symbol s_24[] = { 'a', 't' };
+static const symbol s_25[] = { 'i', 'c' };
+static const symbol s_26[] = { 'i', 'q', 'U' };
+static const symbol s_27[] = { 'e', 'a', 'u' };
+static const symbol s_28[] = { 'a', 'l' };
+static const symbol s_29[] = { 'e', 'u', 'x' };
+static const symbol s_30[] = { 'a', 'n', 't' };
+static const symbol s_31[] = { 'e', 'n', 't' };
+static const symbol s_32[] = { 'e' };
+static const symbol s_33[] = { 's' };
+static const symbol s_34[] = { 's' };
+static const symbol s_35[] = { 't' };
+static const symbol s_36[] = { 'i' };
+static const symbol s_37[] = { 'g', 'u' };
+static const symbol s_38[] = { 0xC3, 0xA9 };
+static const symbol s_39[] = { 0xC3, 0xA8 };
+static const symbol s_40[] = { 'e' };
+static const symbol s_41[] = { 'Y' };
+static const symbol s_42[] = { 'i' };
+static const symbol s_43[] = { 0xC3, 0xA7 };
+static const symbol s_44[] = { 'c' };
+
+static int r_prelude(struct SN_env * z) {
+    while(1) { /* repeat, line 38 */
+        int c1 = z->c;
+        while(1) { /* goto, line 38 */
+            int c2 = z->c;
+            {   int c3 = z->c; /* or, line 44 */
+                if (in_grouping_U(z, g_v, 97, 251, 0)) goto lab3;
+                z->bra = z->c; /* [, line 40 */
+                {   int c4 = z->c; /* or, line 40 */
+                    if (!(eq_s(z, 1, s_0))) goto lab5;
+                    z->ket = z->c; /* ], line 40 */
+                    if (in_grouping_U(z, g_v, 97, 251, 0)) goto lab5;
+                    {   int ret = slice_from_s(z, 1, s_1); /* <-, line 40 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab4;
+                lab5:
+                    z->c = c4;
+                    if (!(eq_s(z, 1, s_2))) goto lab6;
+                    z->ket = z->c; /* ], line 41 */
+                    if (in_grouping_U(z, g_v, 97, 251, 0)) goto lab6;
+                    {   int ret = slice_from_s(z, 1, s_3); /* <-, line 41 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab4;
+                lab6:
+                    z->c = c4;
+                    if (!(eq_s(z, 1, s_4))) goto lab3;
+                    z->ket = z->c; /* ], line 42 */
+                    {   int ret = slice_from_s(z, 1, s_5); /* <-, line 42 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab4:
+                goto lab2;
+            lab3:
+                z->c = c3;
+                z->bra = z->c; /* [, line 45 */
+                if (!(eq_s(z, 1, s_6))) goto lab7;
+                z->ket = z->c; /* ], line 45 */
+                if (in_grouping_U(z, g_v, 97, 251, 0)) goto lab7;
+                {   int ret = slice_from_s(z, 1, s_7); /* <-, line 45 */
+                    if (ret < 0) return ret;
+                }
+                goto lab2;
+            lab7:
+                z->c = c3;
+                if (!(eq_s(z, 1, s_8))) goto lab1;
+                z->bra = z->c; /* [, line 47 */
+                if (!(eq_s(z, 1, s_9))) goto lab1;
+                z->ket = z->c; /* ], line 47 */
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 47 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab2:
+            z->c = c2;
+            break;
+        lab1:
+            z->c = c2;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab0;
+                z->c = ret; /* goto, line 38 */
+            }
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 56 */
+        {   int c2 = z->c; /* or, line 58 */
+            if (in_grouping_U(z, g_v, 97, 251, 0)) goto lab2;
+            if (in_grouping_U(z, g_v, 97, 251, 0)) goto lab2;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab2;
+                z->c = ret; /* next, line 57 */
+            }
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (z->c + 2 >= z->l || z->p[z->c + 2] >> 5 != 3 || !((331776 >> (z->p[z->c + 2] & 0x1f)) & 1)) goto lab3;
+            if (!(find_among(z, a_0, 3))) goto lab3; /* among, line 59 */
+            goto lab1;
+        lab3:
+            z->c = c2;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab0;
+                z->c = ret; /* next, line 66 */
+            }
+            {    /* gopast */ /* grouping v, line 66 */
+                int ret = out_grouping_U(z, g_v, 97, 251, 1);
+                if (ret < 0) goto lab0;
+                z->c += ret;
+            }
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 67 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c3 = z->c; /* do, line 69 */
+        {    /* gopast */ /* grouping v, line 70 */
+            int ret = out_grouping_U(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 70 */
+            int ret = in_grouping_U(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 70 */
+        {    /* gopast */ /* grouping v, line 71 */
+            int ret = out_grouping_U(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 71 */
+            int ret = in_grouping_U(z, g_v, 97, 251, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 71 */
+    lab4:
+        z->c = c3;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 75 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 77 */
+        if (z->c >= z->l || z->p[z->c + 0] >> 5 != 2 || !((35652096 >> (z->p[z->c + 0] & 0x1f)) & 1)) among_var = 4; else
+        among_var = find_among(z, a_1, 4); /* substring, line 77 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 77 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_11); /* <-, line 78 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_12); /* <-, line 79 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 1, s_13); /* <-, line 80 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 81 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 92 */
+    among_var = find_among_b(z, a_4, 43); /* substring, line 92 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 92 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 96 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 96 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 99 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 99 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 100 */
+                z->ket = z->c; /* [, line 100 */
+                if (!(eq_s_b(z, 2, s_14))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 100 */
+                {   int m1 = z->l - z->c; (void)m1; /* or, line 100 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) goto lab2; /* call R2, line 100 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 100 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab1;
+                lab2:
+                    z->c = z->l - m1;
+                    {   int ret = slice_from_s(z, 3, s_15); /* <-, line 100 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab1:
+            lab0:
+                ;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 104 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_16); /* <-, line 104 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 107 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_17); /* <-, line 107 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 110 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_18); /* <-, line 110 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 114 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 114 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 115 */
+                z->ket = z->c; /* [, line 116 */
+                among_var = find_among_b(z, a_2, 6); /* substring, line 116 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 116 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab3; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        z->ket = z->c; /* [, line 117 */
+                        if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m_keep; goto lab3; }
+                        z->bra = z->c; /* ], line 117 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 117 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                    case 2:
+                        {   int m2 = z->l - z->c; (void)m2; /* or, line 118 */
+                            {   int ret = r_R2(z);
+                                if (ret == 0) goto lab5; /* call R2, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_del(z); /* delete, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                            goto lab4;
+                        lab5:
+                            z->c = z->l - m2;
+                            {   int ret = r_R1(z);
+                                if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R1, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_from_s(z, 3, s_20); /* <-, line 118 */
+                                if (ret < 0) return ret;
+                            }
+                        }
+                    lab4:
+                        break;
+                    case 3:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 120 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 120 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                    case 4:
+                        {   int ret = r_RV(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call RV, line 122 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_from_s(z, 1, s_21); /* <-, line 122 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab3:
+                ;
+            }
+            break;
+        case 7:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 129 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 129 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 130 */
+                z->ket = z->c; /* [, line 131 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab6; }
+                among_var = find_among_b(z, a_3, 3); /* substring, line 131 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab6; }
+                z->bra = z->c; /* ], line 131 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab6; }
+                    case 1:
+                        {   int m3 = z->l - z->c; (void)m3; /* or, line 132 */
+                            {   int ret = r_R2(z);
+                                if (ret == 0) goto lab8; /* call R2, line 132 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_del(z); /* delete, line 132 */
+                                if (ret < 0) return ret;
+                            }
+                            goto lab7;
+                        lab8:
+                            z->c = z->l - m3;
+                            {   int ret = slice_from_s(z, 3, s_22); /* <-, line 132 */
+                                if (ret < 0) return ret;
+                            }
+                        }
+                    lab7:
+                        break;
+                    case 2:
+                        {   int m4 = z->l - z->c; (void)m4; /* or, line 133 */
+                            {   int ret = r_R2(z);
+                                if (ret == 0) goto lab10; /* call R2, line 133 */
+                                if (ret < 0) return ret;
+                            }
+                            {   int ret = slice_del(z); /* delete, line 133 */
+                                if (ret < 0) return ret;
+                            }
+                            goto lab9;
+                        lab10:
+                            z->c = z->l - m4;
+                            {   int ret = slice_from_s(z, 3, s_23); /* <-, line 133 */
+                                if (ret < 0) return ret;
+                            }
+                        }
+                    lab9:
+                        break;
+                    case 3:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab6; } /* call R2, line 134 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 134 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab6:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 141 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 141 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 142 */
+                z->ket = z->c; /* [, line 142 */
+                if (!(eq_s_b(z, 2, s_24))) { z->c = z->l - m_keep; goto lab11; }
+                z->bra = z->c; /* ], line 142 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab11; } /* call R2, line 142 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 142 */
+                    if (ret < 0) return ret;
+                }
+                z->ket = z->c; /* [, line 142 */
+                if (!(eq_s_b(z, 2, s_25))) { z->c = z->l - m_keep; goto lab11; }
+                z->bra = z->c; /* ], line 142 */
+                {   int m5 = z->l - z->c; (void)m5; /* or, line 142 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) goto lab13; /* call R2, line 142 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 142 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab12;
+                lab13:
+                    z->c = z->l - m5;
+                    {   int ret = slice_from_s(z, 3, s_26); /* <-, line 142 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab12:
+            lab11:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 3, s_27); /* <-, line 144 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 145 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 2, s_28); /* <-, line 145 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int m6 = z->l - z->c; (void)m6; /* or, line 147 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) goto lab15; /* call R2, line 147 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 147 */
+                    if (ret < 0) return ret;
+                }
+                goto lab14;
+            lab15:
+                z->c = z->l - m6;
+                {   int ret = r_R1(z);
+                    if (ret == 0) return 0; /* call R1, line 147 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_from_s(z, 3, s_29); /* <-, line 147 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab14:
+            break;
+        case 12:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 150 */
+                if (ret < 0) return ret;
+            }
+            if (out_grouping_b_U(z, g_v, 97, 251, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 150 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 155 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_30); /* <-, line 155 */
+                if (ret < 0) return ret;
+            }
+            return 0; /* fail, line 155 */
+            break;
+        case 14:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 156 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_31); /* <-, line 156 */
+                if (ret < 0) return ret;
+            }
+            return 0; /* fail, line 156 */
+            break;
+        case 15:
+            {   int m_test = z->l - z->c; /* test, line 158 */
+                if (in_grouping_b_U(z, g_v, 97, 251, 0)) return 0;
+                {   int ret = r_RV(z);
+                    if (ret == 0) return 0; /* call RV, line 158 */
+                    if (ret < 0) return ret;
+                }
+                z->c = z->l - m_test;
+            }
+            {   int ret = slice_del(z); /* delete, line 158 */
+                if (ret < 0) return ret;
+            }
+            return 0; /* fail, line 158 */
+            break;
+    }
+    return 1;
+}
+
+static int r_i_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 163 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 163 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 164 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((68944418 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_5, 35); /* substring, line 164 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 164 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                if (out_grouping_b_U(z, g_v, 97, 251, 0)) { z->lb = mlimit; return 0; }
+                {   int ret = slice_del(z); /* delete, line 170 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 174 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 174 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 175 */
+        among_var = find_among_b(z, a_6, 38); /* substring, line 175 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 175 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->lb = mlimit; return 0; } /* call R2, line 177 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 177 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_del(z); /* delete, line 185 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_del(z); /* delete, line 190 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 191 */
+                    z->ket = z->c; /* [, line 191 */
+                    if (!(eq_s_b(z, 1, s_32))) { z->c = z->l - m_keep; goto lab0; }
+                    z->bra = z->c; /* ], line 191 */
+                    {   int ret = slice_del(z); /* delete, line 191 */
+                        if (ret < 0) return ret;
+                    }
+                lab0:
+                    ;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_residual_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 199 */
+        z->ket = z->c; /* [, line 199 */
+        if (!(eq_s_b(z, 1, s_33))) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 199 */
+        {   int m_test = z->l - z->c; /* test, line 199 */
+            if (out_grouping_b_U(z, g_keep_with_s, 97, 232, 0)) { z->c = z->l - m_keep; goto lab0; }
+            z->c = z->l - m_test;
+        }
+        {   int ret = slice_del(z); /* delete, line 199 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        ;
+    }
+    {   int mlimit; /* setlimit, line 200 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 200 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 201 */
+        among_var = find_among_b(z, a_7, 7); /* substring, line 201 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 201 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->lb = mlimit; return 0; } /* call R2, line 202 */
+                    if (ret < 0) return ret;
+                }
+                {   int m2 = z->l - z->c; (void)m2; /* or, line 202 */
+                    if (!(eq_s_b(z, 1, s_34))) goto lab2;
+                    goto lab1;
+                lab2:
+                    z->c = z->l - m2;
+                    if (!(eq_s_b(z, 1, s_35))) { z->lb = mlimit; return 0; }
+                }
+            lab1:
+                {   int ret = slice_del(z); /* delete, line 202 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_36); /* <-, line 204 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_del(z); /* delete, line 205 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                if (!(eq_s_b(z, 2, s_37))) { z->lb = mlimit; return 0; }
+                {   int ret = slice_del(z); /* delete, line 206 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_un_double(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 212 */
+        if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1069056 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+        if (!(find_among_b(z, a_8, 5))) return 0; /* among, line 212 */
+        z->c = z->l - m_test;
+    }
+    z->ket = z->c; /* [, line 212 */
+    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+        if (ret < 0) return 0;
+        z->c = ret; /* next, line 212 */
+    }
+    z->bra = z->c; /* ], line 212 */
+    {   int ret = slice_del(z); /* delete, line 212 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_un_accent(struct SN_env * z) {
+    {   int i = 1;
+        while(1) { /* atleast, line 216 */
+            if (out_grouping_b_U(z, g_v, 97, 251, 0)) goto lab0;
+            i--;
+            continue;
+        lab0:
+            break;
+        }
+        if (i > 0) return 0;
+    }
+    z->ket = z->c; /* [, line 217 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 217 */
+        if (!(eq_s_b(z, 2, s_38))) goto lab2;
+        goto lab1;
+    lab2:
+        z->c = z->l - m1;
+        if (!(eq_s_b(z, 2, s_39))) return 0;
+    }
+lab1:
+    z->bra = z->c; /* ], line 217 */
+    {   int ret = slice_from_s(z, 1, s_40); /* <-, line 217 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int french_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 223 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 223 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 224 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 224 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 225 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 227 */
+        {   int m4 = z->l - z->c; (void)m4; /* or, line 237 */
+            {   int m5 = z->l - z->c; (void)m5; /* and, line 233 */
+                {   int m6 = z->l - z->c; (void)m6; /* or, line 229 */
+                    {   int ret = r_standard_suffix(z);
+                        if (ret == 0) goto lab6; /* call standard_suffix, line 229 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m6;
+                    {   int ret = r_i_verb_suffix(z);
+                        if (ret == 0) goto lab7; /* call i_verb_suffix, line 230 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab7:
+                    z->c = z->l - m6;
+                    {   int ret = r_verb_suffix(z);
+                        if (ret == 0) goto lab4; /* call verb_suffix, line 231 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                z->c = z->l - m5;
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 234 */
+                    z->ket = z->c; /* [, line 234 */
+                    {   int m7 = z->l - z->c; (void)m7; /* or, line 234 */
+                        if (!(eq_s_b(z, 1, s_41))) goto lab10;
+                        z->bra = z->c; /* ], line 234 */
+                        {   int ret = slice_from_s(z, 1, s_42); /* <-, line 234 */
+                            if (ret < 0) return ret;
+                        }
+                        goto lab9;
+                    lab10:
+                        z->c = z->l - m7;
+                        if (!(eq_s_b(z, 2, s_43))) { z->c = z->l - m_keep; goto lab8; }
+                        z->bra = z->c; /* ], line 235 */
+                        {   int ret = slice_from_s(z, 1, s_44); /* <-, line 235 */
+                            if (ret < 0) return ret;
+                        }
+                    }
+                lab9:
+                lab8:
+                    ;
+                }
+            }
+            goto lab3;
+        lab4:
+            z->c = z->l - m4;
+            {   int ret = r_residual_suffix(z);
+                if (ret == 0) goto lab2; /* call residual_suffix, line 238 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab3:
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 243 */
+        {   int ret = r_un_double(z);
+            if (ret == 0) goto lab11; /* call un_double, line 243 */
+            if (ret < 0) return ret;
+        }
+    lab11:
+        z->c = z->l - m8;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 244 */
+        {   int ret = r_un_accent(z);
+            if (ret == 0) goto lab12; /* call un_accent, line 244 */
+            if (ret < 0) return ret;
+        }
+    lab12:
+        z->c = z->l - m9;
+    }
+    z->c = z->lb;
+    {   int c10 = z->c; /* do, line 246 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab13; /* call postlude, line 246 */
+            if (ret < 0) return ret;
+        }
+    lab13:
+        z->c = c10;
+    }
+    return 1;
+}
+
+extern struct SN_env * french_UTF_8_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void french_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_german.c b/src/backend/snowball/libstemmer/stem_UTF_8_german.c
new file mode 100644
index 000000000000..5d406e50921b
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_german.c
@@ -0,0 +1,509 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int german_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_standard_suffix(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * german_UTF_8_create_env(void);
+extern void german_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 'U' };
+static const symbol s_0_2[1] = { 'Y' };
+static const symbol s_0_3[2] = { 0xC3, 0xA4 };
+static const symbol s_0_4[2] = { 0xC3, 0xB6 };
+static const symbol s_0_5[2] = { 0xC3, 0xBC };
+
+static const struct among a_0[6] =
+{
+/*  0 */ { 0, 0, -1, 6, 0},
+/*  1 */ { 1, s_0_1, 0, 2, 0},
+/*  2 */ { 1, s_0_2, 0, 1, 0},
+/*  3 */ { 2, s_0_3, 0, 3, 0},
+/*  4 */ { 2, s_0_4, 0, 4, 0},
+/*  5 */ { 2, s_0_5, 0, 5, 0}
+};
+
+static const symbol s_1_0[1] = { 'e' };
+static const symbol s_1_1[2] = { 'e', 'm' };
+static const symbol s_1_2[2] = { 'e', 'n' };
+static const symbol s_1_3[3] = { 'e', 'r', 'n' };
+static const symbol s_1_4[2] = { 'e', 'r' };
+static const symbol s_1_5[1] = { 's' };
+static const symbol s_1_6[2] = { 'e', 's' };
+
+static const struct among a_1[7] =
+{
+/*  0 */ { 1, s_1_0, -1, 1, 0},
+/*  1 */ { 2, s_1_1, -1, 1, 0},
+/*  2 */ { 2, s_1_2, -1, 1, 0},
+/*  3 */ { 3, s_1_3, -1, 1, 0},
+/*  4 */ { 2, s_1_4, -1, 1, 0},
+/*  5 */ { 1, s_1_5, -1, 2, 0},
+/*  6 */ { 2, s_1_6, 5, 1, 0}
+};
+
+static const symbol s_2_0[2] = { 'e', 'n' };
+static const symbol s_2_1[2] = { 'e', 'r' };
+static const symbol s_2_2[2] = { 's', 't' };
+static const symbol s_2_3[3] = { 'e', 's', 't' };
+
+static const struct among a_2[4] =
+{
+/*  0 */ { 2, s_2_0, -1, 1, 0},
+/*  1 */ { 2, s_2_1, -1, 1, 0},
+/*  2 */ { 2, s_2_2, -1, 2, 0},
+/*  3 */ { 3, s_2_3, 2, 1, 0}
+};
+
+static const symbol s_3_0[2] = { 'i', 'g' };
+static const symbol s_3_1[4] = { 'l', 'i', 'c', 'h' };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 2, s_3_0, -1, 1, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0}
+};
+
+static const symbol s_4_0[3] = { 'e', 'n', 'd' };
+static const symbol s_4_1[2] = { 'i', 'g' };
+static const symbol s_4_2[3] = { 'u', 'n', 'g' };
+static const symbol s_4_3[4] = { 'l', 'i', 'c', 'h' };
+static const symbol s_4_4[4] = { 'i', 's', 'c', 'h' };
+static const symbol s_4_5[2] = { 'i', 'k' };
+static const symbol s_4_6[4] = { 'h', 'e', 'i', 't' };
+static const symbol s_4_7[4] = { 'k', 'e', 'i', 't' };
+
+static const struct among a_4[8] =
+{
+/*  0 */ { 3, s_4_0, -1, 1, 0},
+/*  1 */ { 2, s_4_1, -1, 2, 0},
+/*  2 */ { 3, s_4_2, -1, 1, 0},
+/*  3 */ { 4, s_4_3, -1, 3, 0},
+/*  4 */ { 4, s_4_4, -1, 2, 0},
+/*  5 */ { 2, s_4_5, -1, 2, 0},
+/*  6 */ { 4, s_4_6, -1, 3, 0},
+/*  7 */ { 4, s_4_7, -1, 4, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32, 8 };
+
+static const unsigned char g_s_ending[] = { 117, 30, 5 };
+
+static const unsigned char g_st_ending[] = { 117, 30, 4 };
+
+static const symbol s_0[] = { 0xC3, 0x9F };
+static const symbol s_1[] = { 's', 's' };
+static const symbol s_2[] = { 'u' };
+static const symbol s_3[] = { 'U' };
+static const symbol s_4[] = { 'y' };
+static const symbol s_5[] = { 'Y' };
+static const symbol s_6[] = { 'y' };
+static const symbol s_7[] = { 'u' };
+static const symbol s_8[] = { 'a' };
+static const symbol s_9[] = { 'o' };
+static const symbol s_10[] = { 'u' };
+static const symbol s_11[] = { 'i', 'g' };
+static const symbol s_12[] = { 'e' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'e', 'r' };
+static const symbol s_15[] = { 'e', 'n' };
+
+static int r_prelude(struct SN_env * z) {
+    {   int c_test = z->c; /* test, line 30 */
+        while(1) { /* repeat, line 30 */
+            int c1 = z->c;
+            {   int c2 = z->c; /* or, line 33 */
+                z->bra = z->c; /* [, line 32 */
+                if (!(eq_s(z, 2, s_0))) goto lab2;
+                z->ket = z->c; /* ], line 32 */
+                {   int ret = slice_from_s(z, 2, s_1); /* <-, line 32 */
+                    if (ret < 0) return ret;
+                }
+                goto lab1;
+            lab2:
+                z->c = c2;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 33 */
+                }
+            }
+        lab1:
+            continue;
+        lab0:
+            z->c = c1;
+            break;
+        }
+        z->c = c_test;
+    }
+    while(1) { /* repeat, line 36 */
+        int c3 = z->c;
+        while(1) { /* goto, line 36 */
+            int c4 = z->c;
+            if (in_grouping_U(z, g_v, 97, 252, 0)) goto lab4;
+            z->bra = z->c; /* [, line 37 */
+            {   int c5 = z->c; /* or, line 37 */
+                if (!(eq_s(z, 1, s_2))) goto lab6;
+                z->ket = z->c; /* ], line 37 */
+                if (in_grouping_U(z, g_v, 97, 252, 0)) goto lab6;
+                {   int ret = slice_from_s(z, 1, s_3); /* <-, line 37 */
+                    if (ret < 0) return ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c5;
+                if (!(eq_s(z, 1, s_4))) goto lab4;
+                z->ket = z->c; /* ], line 38 */
+                if (in_grouping_U(z, g_v, 97, 252, 0)) goto lab4;
+                {   int ret = slice_from_s(z, 1, s_5); /* <-, line 38 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab5:
+            z->c = c4;
+            break;
+        lab4:
+            z->c = c4;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab3;
+                z->c = ret; /* goto, line 36 */
+            }
+        }
+        continue;
+    lab3:
+        z->c = c3;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c_test = z->c; /* test, line 47 */
+        {   int ret = skip_utf8(z->p, z->c, 0, z->l, + 3);
+            if (ret < 0) return 0;
+            z->c = ret; /* hop, line 47 */
+        }
+        z->I[2] = z->c; /* setmark x, line 47 */
+        z->c = c_test;
+    }
+    {    /* gopast */ /* grouping v, line 49 */
+        int ret = out_grouping_U(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 49 */
+        int ret = in_grouping_U(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 49 */
+     /* try, line 50 */
+    if (!(z->I[0] < z->I[2])) goto lab0;
+    z->I[0] = z->I[2];
+lab0:
+    {    /* gopast */ /* grouping v, line 51 */
+        int ret = out_grouping_U(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    {    /* gopast */ /* non v, line 51 */
+        int ret = in_grouping_U(z, g_v, 97, 252, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[1] = z->c; /* setmark p2, line 51 */
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 55 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 57 */
+        among_var = find_among(z, a_0, 6); /* substring, line 57 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 57 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_6); /* <-, line 58 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_7); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 1, s_8); /* <-, line 60 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = slice_from_s(z, 1, s_9); /* <-, line 61 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 62 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 6:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 63 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 74 */
+        z->ket = z->c; /* [, line 75 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((811040 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab0;
+        among_var = find_among_b(z, a_1, 7); /* substring, line 75 */
+        if (!(among_var)) goto lab0;
+        z->bra = z->c; /* ], line 75 */
+        {   int ret = r_R1(z);
+            if (ret == 0) goto lab0; /* call R1, line 75 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 77 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                if (in_grouping_b_U(z, g_s_ending, 98, 116, 0)) goto lab0;
+                {   int ret = slice_del(z); /* delete, line 80 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        z->c = z->l - m1;
+    }
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 84 */
+        z->ket = z->c; /* [, line 85 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1327104 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab1;
+        among_var = find_among_b(z, a_2, 4); /* substring, line 85 */
+        if (!(among_var)) goto lab1;
+        z->bra = z->c; /* ], line 85 */
+        {   int ret = r_R1(z);
+            if (ret == 0) goto lab1; /* call R1, line 85 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: goto lab1;
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 87 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                if (in_grouping_b_U(z, g_st_ending, 98, 116, 0)) goto lab1;
+                {   int ret = skip_utf8(z->p, z->c, z->lb, z->l, - 3);
+                    if (ret < 0) goto lab1;
+                    z->c = ret; /* hop, line 90 */
+                }
+                {   int ret = slice_del(z); /* delete, line 90 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 94 */
+        z->ket = z->c; /* [, line 95 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1051024 >> (z->p[z->c - 1] & 0x1f)) & 1)) goto lab2;
+        among_var = find_among_b(z, a_4, 8); /* substring, line 95 */
+        if (!(among_var)) goto lab2;
+        z->bra = z->c; /* ], line 95 */
+        {   int ret = r_R2(z);
+            if (ret == 0) goto lab2; /* call R2, line 95 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: goto lab2;
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 97 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 98 */
+                    z->ket = z->c; /* [, line 98 */
+                    if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m_keep; goto lab3; }
+                    z->bra = z->c; /* ], line 98 */
+                    {   int m4 = z->l - z->c; (void)m4; /* not, line 98 */
+                        if (!(eq_s_b(z, 1, s_12))) goto lab4;
+                        { z->c = z->l - m_keep; goto lab3; }
+                    lab4:
+                        z->c = z->l - m4;
+                    }
+                    {   int ret = r_R2(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 98 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 98 */
+                        if (ret < 0) return ret;
+                    }
+                lab3:
+                    ;
+                }
+                break;
+            case 2:
+                {   int m5 = z->l - z->c; (void)m5; /* not, line 101 */
+                    if (!(eq_s_b(z, 1, s_13))) goto lab5;
+                    goto lab2;
+                lab5:
+                    z->c = z->l - m5;
+                }
+                {   int ret = slice_del(z); /* delete, line 101 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_del(z); /* delete, line 104 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 105 */
+                    z->ket = z->c; /* [, line 106 */
+                    {   int m6 = z->l - z->c; (void)m6; /* or, line 106 */
+                        if (!(eq_s_b(z, 2, s_14))) goto lab8;
+                        goto lab7;
+                    lab8:
+                        z->c = z->l - m6;
+                        if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m_keep; goto lab6; }
+                    }
+                lab7:
+                    z->bra = z->c; /* ], line 106 */
+                    {   int ret = r_R1(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab6; } /* call R1, line 106 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 106 */
+                        if (ret < 0) return ret;
+                    }
+                lab6:
+                    ;
+                }
+                break;
+            case 4:
+                {   int ret = slice_del(z); /* delete, line 110 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 111 */
+                    z->ket = z->c; /* [, line 112 */
+                    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 103 && z->p[z->c - 1] != 104)) { z->c = z->l - m_keep; goto lab9; }
+                    among_var = find_among_b(z, a_3, 2); /* substring, line 112 */
+                    if (!(among_var)) { z->c = z->l - m_keep; goto lab9; }
+                    z->bra = z->c; /* ], line 112 */
+                    {   int ret = r_R2(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab9; } /* call R2, line 112 */
+                        if (ret < 0) return ret;
+                    }
+                    switch(among_var) {
+                        case 0: { z->c = z->l - m_keep; goto lab9; }
+                        case 1:
+                            {   int ret = slice_del(z); /* delete, line 114 */
+                                if (ret < 0) return ret;
+                            }
+                            break;
+                    }
+                lab9:
+                    ;
+                }
+                break;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    return 1;
+}
+
+extern int german_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 125 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 125 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 126 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 126 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 127 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 128 */
+        {   int ret = r_standard_suffix(z);
+            if (ret == 0) goto lab2; /* call standard_suffix, line 128 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    z->c = z->lb;
+    {   int c4 = z->c; /* do, line 129 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab3; /* call postlude, line 129 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = c4;
+    }
+    return 1;
+}
+
+extern struct SN_env * german_UTF_8_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void german_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_hungarian.c b/src/backend/snowball/libstemmer/stem_UTF_8_hungarian.c
new file mode 100644
index 000000000000..e40df8e6c183
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_hungarian.c
@@ -0,0 +1,1234 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int hungarian_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_double(struct SN_env * z);
+static int r_undouble(struct SN_env * z);
+static int r_factive(struct SN_env * z);
+static int r_instrum(struct SN_env * z);
+static int r_plur_owner(struct SN_env * z);
+static int r_sing_owner(struct SN_env * z);
+static int r_owned(struct SN_env * z);
+static int r_plural(struct SN_env * z);
+static int r_case_other(struct SN_env * z);
+static int r_case_special(struct SN_env * z);
+static int r_case(struct SN_env * z);
+static int r_v_ending(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * hungarian_UTF_8_create_env(void);
+extern void hungarian_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[2] = { 'c', 's' };
+static const symbol s_0_1[3] = { 'd', 'z', 's' };
+static const symbol s_0_2[2] = { 'g', 'y' };
+static const symbol s_0_3[2] = { 'l', 'y' };
+static const symbol s_0_4[2] = { 'n', 'y' };
+static const symbol s_0_5[2] = { 's', 'z' };
+static const symbol s_0_6[2] = { 't', 'y' };
+static const symbol s_0_7[2] = { 'z', 's' };
+
+static const struct among a_0[8] =
+{
+/*  0 */ { 2, s_0_0, -1, -1, 0},
+/*  1 */ { 3, s_0_1, -1, -1, 0},
+/*  2 */ { 2, s_0_2, -1, -1, 0},
+/*  3 */ { 2, s_0_3, -1, -1, 0},
+/*  4 */ { 2, s_0_4, -1, -1, 0},
+/*  5 */ { 2, s_0_5, -1, -1, 0},
+/*  6 */ { 2, s_0_6, -1, -1, 0},
+/*  7 */ { 2, s_0_7, -1, -1, 0}
+};
+
+static const symbol s_1_0[2] = { 0xC3, 0xA1 };
+static const symbol s_1_1[2] = { 0xC3, 0xA9 };
+
+static const struct among a_1[2] =
+{
+/*  0 */ { 2, s_1_0, -1, 1, 0},
+/*  1 */ { 2, s_1_1, -1, 2, 0}
+};
+
+static const symbol s_2_0[2] = { 'b', 'b' };
+static const symbol s_2_1[2] = { 'c', 'c' };
+static const symbol s_2_2[2] = { 'd', 'd' };
+static const symbol s_2_3[2] = { 'f', 'f' };
+static const symbol s_2_4[2] = { 'g', 'g' };
+static const symbol s_2_5[2] = { 'j', 'j' };
+static const symbol s_2_6[2] = { 'k', 'k' };
+static const symbol s_2_7[2] = { 'l', 'l' };
+static const symbol s_2_8[2] = { 'm', 'm' };
+static const symbol s_2_9[2] = { 'n', 'n' };
+static const symbol s_2_10[2] = { 'p', 'p' };
+static const symbol s_2_11[2] = { 'r', 'r' };
+static const symbol s_2_12[3] = { 'c', 'c', 's' };
+static const symbol s_2_13[2] = { 's', 's' };
+static const symbol s_2_14[3] = { 'z', 'z', 's' };
+static const symbol s_2_15[2] = { 't', 't' };
+static const symbol s_2_16[2] = { 'v', 'v' };
+static const symbol s_2_17[3] = { 'g', 'g', 'y' };
+static const symbol s_2_18[3] = { 'l', 'l', 'y' };
+static const symbol s_2_19[3] = { 'n', 'n', 'y' };
+static const symbol s_2_20[3] = { 't', 't', 'y' };
+static const symbol s_2_21[3] = { 's', 's', 'z' };
+static const symbol s_2_22[2] = { 'z', 'z' };
+
+static const struct among a_2[23] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 2, s_2_2, -1, -1, 0},
+/*  3 */ { 2, s_2_3, -1, -1, 0},
+/*  4 */ { 2, s_2_4, -1, -1, 0},
+/*  5 */ { 2, s_2_5, -1, -1, 0},
+/*  6 */ { 2, s_2_6, -1, -1, 0},
+/*  7 */ { 2, s_2_7, -1, -1, 0},
+/*  8 */ { 2, s_2_8, -1, -1, 0},
+/*  9 */ { 2, s_2_9, -1, -1, 0},
+/* 10 */ { 2, s_2_10, -1, -1, 0},
+/* 11 */ { 2, s_2_11, -1, -1, 0},
+/* 12 */ { 3, s_2_12, -1, -1, 0},
+/* 13 */ { 2, s_2_13, -1, -1, 0},
+/* 14 */ { 3, s_2_14, -1, -1, 0},
+/* 15 */ { 2, s_2_15, -1, -1, 0},
+/* 16 */ { 2, s_2_16, -1, -1, 0},
+/* 17 */ { 3, s_2_17, -1, -1, 0},
+/* 18 */ { 3, s_2_18, -1, -1, 0},
+/* 19 */ { 3, s_2_19, -1, -1, 0},
+/* 20 */ { 3, s_2_20, -1, -1, 0},
+/* 21 */ { 3, s_2_21, -1, -1, 0},
+/* 22 */ { 2, s_2_22, -1, -1, 0}
+};
+
+static const symbol s_3_0[2] = { 'a', 'l' };
+static const symbol s_3_1[2] = { 'e', 'l' };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 2, s_3_0, -1, 1, 0},
+/*  1 */ { 2, s_3_1, -1, 2, 0}
+};
+
+static const symbol s_4_0[2] = { 'b', 'a' };
+static const symbol s_4_1[2] = { 'r', 'a' };
+static const symbol s_4_2[2] = { 'b', 'e' };
+static const symbol s_4_3[2] = { 'r', 'e' };
+static const symbol s_4_4[2] = { 'i', 'g' };
+static const symbol s_4_5[3] = { 'n', 'a', 'k' };
+static const symbol s_4_6[3] = { 'n', 'e', 'k' };
+static const symbol s_4_7[3] = { 'v', 'a', 'l' };
+static const symbol s_4_8[3] = { 'v', 'e', 'l' };
+static const symbol s_4_9[2] = { 'u', 'l' };
+static const symbol s_4_10[4] = { 'n', 0xC3, 0xA1, 'l' };
+static const symbol s_4_11[4] = { 'n', 0xC3, 0xA9, 'l' };
+static const symbol s_4_12[4] = { 'b', 0xC3, 0xB3, 'l' };
+static const symbol s_4_13[4] = { 'r', 0xC3, 0xB3, 'l' };
+static const symbol s_4_14[4] = { 't', 0xC3, 0xB3, 'l' };
+static const symbol s_4_15[4] = { 'b', 0xC3, 0xB5, 'l' };
+static const symbol s_4_16[4] = { 'r', 0xC3, 0xB5, 'l' };
+static const symbol s_4_17[4] = { 't', 0xC3, 0xB5, 'l' };
+static const symbol s_4_18[3] = { 0xC3, 0xBC, 'l' };
+static const symbol s_4_19[1] = { 'n' };
+static const symbol s_4_20[2] = { 'a', 'n' };
+static const symbol s_4_21[3] = { 'b', 'a', 'n' };
+static const symbol s_4_22[2] = { 'e', 'n' };
+static const symbol s_4_23[3] = { 'b', 'e', 'n' };
+static const symbol s_4_24[7] = { 'k', 0xC3, 0xA9, 'p', 'p', 'e', 'n' };
+static const symbol s_4_25[2] = { 'o', 'n' };
+static const symbol s_4_26[3] = { 0xC3, 0xB6, 'n' };
+static const symbol s_4_27[5] = { 'k', 0xC3, 0xA9, 'p', 'p' };
+static const symbol s_4_28[3] = { 'k', 'o', 'r' };
+static const symbol s_4_29[1] = { 't' };
+static const symbol s_4_30[2] = { 'a', 't' };
+static const symbol s_4_31[2] = { 'e', 't' };
+static const symbol s_4_32[5] = { 'k', 0xC3, 0xA9, 'n', 't' };
+static const symbol s_4_33[7] = { 'a', 'n', 'k', 0xC3, 0xA9, 'n', 't' };
+static const symbol s_4_34[7] = { 'e', 'n', 'k', 0xC3, 0xA9, 'n', 't' };
+static const symbol s_4_35[7] = { 'o', 'n', 'k', 0xC3, 0xA9, 'n', 't' };
+static const symbol s_4_36[2] = { 'o', 't' };
+static const symbol s_4_37[4] = { 0xC3, 0xA9, 'r', 't' };
+static const symbol s_4_38[3] = { 0xC3, 0xB6, 't' };
+static const symbol s_4_39[3] = { 'h', 'e', 'z' };
+static const symbol s_4_40[3] = { 'h', 'o', 'z' };
+static const symbol s_4_41[4] = { 'h', 0xC3, 0xB6, 'z' };
+static const symbol s_4_42[3] = { 'v', 0xC3, 0xA1 };
+static const symbol s_4_43[3] = { 'v', 0xC3, 0xA9 };
+
+static const struct among a_4[44] =
+{
+/*  0 */ { 2, s_4_0, -1, -1, 0},
+/*  1 */ { 2, s_4_1, -1, -1, 0},
+/*  2 */ { 2, s_4_2, -1, -1, 0},
+/*  3 */ { 2, s_4_3, -1, -1, 0},
+/*  4 */ { 2, s_4_4, -1, -1, 0},
+/*  5 */ { 3, s_4_5, -1, -1, 0},
+/*  6 */ { 3, s_4_6, -1, -1, 0},
+/*  7 */ { 3, s_4_7, -1, -1, 0},
+/*  8 */ { 3, s_4_8, -1, -1, 0},
+/*  9 */ { 2, s_4_9, -1, -1, 0},
+/* 10 */ { 4, s_4_10, -1, -1, 0},
+/* 11 */ { 4, s_4_11, -1, -1, 0},
+/* 12 */ { 4, s_4_12, -1, -1, 0},
+/* 13 */ { 4, s_4_13, -1, -1, 0},
+/* 14 */ { 4, s_4_14, -1, -1, 0},
+/* 15 */ { 4, s_4_15, -1, -1, 0},
+/* 16 */ { 4, s_4_16, -1, -1, 0},
+/* 17 */ { 4, s_4_17, -1, -1, 0},
+/* 18 */ { 3, s_4_18, -1, -1, 0},
+/* 19 */ { 1, s_4_19, -1, -1, 0},
+/* 20 */ { 2, s_4_20, 19, -1, 0},
+/* 21 */ { 3, s_4_21, 20, -1, 0},
+/* 22 */ { 2, s_4_22, 19, -1, 0},
+/* 23 */ { 3, s_4_23, 22, -1, 0},
+/* 24 */ { 7, s_4_24, 22, -1, 0},
+/* 25 */ { 2, s_4_25, 19, -1, 0},
+/* 26 */ { 3, s_4_26, 19, -1, 0},
+/* 27 */ { 5, s_4_27, -1, -1, 0},
+/* 28 */ { 3, s_4_28, -1, -1, 0},
+/* 29 */ { 1, s_4_29, -1, -1, 0},
+/* 30 */ { 2, s_4_30, 29, -1, 0},
+/* 31 */ { 2, s_4_31, 29, -1, 0},
+/* 32 */ { 5, s_4_32, 29, -1, 0},
+/* 33 */ { 7, s_4_33, 32, -1, 0},
+/* 34 */ { 7, s_4_34, 32, -1, 0},
+/* 35 */ { 7, s_4_35, 32, -1, 0},
+/* 36 */ { 2, s_4_36, 29, -1, 0},
+/* 37 */ { 4, s_4_37, 29, -1, 0},
+/* 38 */ { 3, s_4_38, 29, -1, 0},
+/* 39 */ { 3, s_4_39, -1, -1, 0},
+/* 40 */ { 3, s_4_40, -1, -1, 0},
+/* 41 */ { 4, s_4_41, -1, -1, 0},
+/* 42 */ { 3, s_4_42, -1, -1, 0},
+/* 43 */ { 3, s_4_43, -1, -1, 0}
+};
+
+static const symbol s_5_0[3] = { 0xC3, 0xA1, 'n' };
+static const symbol s_5_1[3] = { 0xC3, 0xA9, 'n' };
+static const symbol s_5_2[8] = { 0xC3, 0xA1, 'n', 'k', 0xC3, 0xA9, 'n', 't' };
+
+static const struct among a_5[3] =
+{
+/*  0 */ { 3, s_5_0, -1, 2, 0},
+/*  1 */ { 3, s_5_1, -1, 1, 0},
+/*  2 */ { 8, s_5_2, -1, 3, 0}
+};
+
+static const symbol s_6_0[4] = { 's', 't', 'u', 'l' };
+static const symbol s_6_1[5] = { 'a', 's', 't', 'u', 'l' };
+static const symbol s_6_2[6] = { 0xC3, 0xA1, 's', 't', 'u', 'l' };
+static const symbol s_6_3[5] = { 's', 't', 0xC3, 0xBC, 'l' };
+static const symbol s_6_4[6] = { 'e', 's', 't', 0xC3, 0xBC, 'l' };
+static const symbol s_6_5[7] = { 0xC3, 0xA9, 's', 't', 0xC3, 0xBC, 'l' };
+
+static const struct among a_6[6] =
+{
+/*  0 */ { 4, s_6_0, -1, 2, 0},
+/*  1 */ { 5, s_6_1, 0, 1, 0},
+/*  2 */ { 6, s_6_2, 0, 3, 0},
+/*  3 */ { 5, s_6_3, -1, 2, 0},
+/*  4 */ { 6, s_6_4, 3, 1, 0},
+/*  5 */ { 7, s_6_5, 3, 4, 0}
+};
+
+static const symbol s_7_0[2] = { 0xC3, 0xA1 };
+static const symbol s_7_1[2] = { 0xC3, 0xA9 };
+
+static const struct among a_7[2] =
+{
+/*  0 */ { 2, s_7_0, -1, 1, 0},
+/*  1 */ { 2, s_7_1, -1, 2, 0}
+};
+
+static const symbol s_8_0[1] = { 'k' };
+static const symbol s_8_1[2] = { 'a', 'k' };
+static const symbol s_8_2[2] = { 'e', 'k' };
+static const symbol s_8_3[2] = { 'o', 'k' };
+static const symbol s_8_4[3] = { 0xC3, 0xA1, 'k' };
+static const symbol s_8_5[3] = { 0xC3, 0xA9, 'k' };
+static const symbol s_8_6[3] = { 0xC3, 0xB6, 'k' };
+
+static const struct among a_8[7] =
+{
+/*  0 */ { 1, s_8_0, -1, 7, 0},
+/*  1 */ { 2, s_8_1, 0, 4, 0},
+/*  2 */ { 2, s_8_2, 0, 6, 0},
+/*  3 */ { 2, s_8_3, 0, 5, 0},
+/*  4 */ { 3, s_8_4, 0, 1, 0},
+/*  5 */ { 3, s_8_5, 0, 2, 0},
+/*  6 */ { 3, s_8_6, 0, 3, 0}
+};
+
+static const symbol s_9_0[3] = { 0xC3, 0xA9, 'i' };
+static const symbol s_9_1[5] = { 0xC3, 0xA1, 0xC3, 0xA9, 'i' };
+static const symbol s_9_2[5] = { 0xC3, 0xA9, 0xC3, 0xA9, 'i' };
+static const symbol s_9_3[2] = { 0xC3, 0xA9 };
+static const symbol s_9_4[3] = { 'k', 0xC3, 0xA9 };
+static const symbol s_9_5[4] = { 'a', 'k', 0xC3, 0xA9 };
+static const symbol s_9_6[4] = { 'e', 'k', 0xC3, 0xA9 };
+static const symbol s_9_7[4] = { 'o', 'k', 0xC3, 0xA9 };
+static const symbol s_9_8[5] = { 0xC3, 0xA1, 'k', 0xC3, 0xA9 };
+static const symbol s_9_9[5] = { 0xC3, 0xA9, 'k', 0xC3, 0xA9 };
+static const symbol s_9_10[5] = { 0xC3, 0xB6, 'k', 0xC3, 0xA9 };
+static const symbol s_9_11[4] = { 0xC3, 0xA9, 0xC3, 0xA9 };
+
+static const struct among a_9[12] =
+{
+/*  0 */ { 3, s_9_0, -1, 7, 0},
+/*  1 */ { 5, s_9_1, 0, 6, 0},
+/*  2 */ { 5, s_9_2, 0, 5, 0},
+/*  3 */ { 2, s_9_3, -1, 9, 0},
+/*  4 */ { 3, s_9_4, 3, 4, 0},
+/*  5 */ { 4, s_9_5, 4, 1, 0},
+/*  6 */ { 4, s_9_6, 4, 1, 0},
+/*  7 */ { 4, s_9_7, 4, 1, 0},
+/*  8 */ { 5, s_9_8, 4, 3, 0},
+/*  9 */ { 5, s_9_9, 4, 2, 0},
+/* 10 */ { 5, s_9_10, 4, 1, 0},
+/* 11 */ { 4, s_9_11, 3, 8, 0}
+};
+
+static const symbol s_10_0[1] = { 'a' };
+static const symbol s_10_1[2] = { 'j', 'a' };
+static const symbol s_10_2[1] = { 'd' };
+static const symbol s_10_3[2] = { 'a', 'd' };
+static const symbol s_10_4[2] = { 'e', 'd' };
+static const symbol s_10_5[2] = { 'o', 'd' };
+static const symbol s_10_6[3] = { 0xC3, 0xA1, 'd' };
+static const symbol s_10_7[3] = { 0xC3, 0xA9, 'd' };
+static const symbol s_10_8[3] = { 0xC3, 0xB6, 'd' };
+static const symbol s_10_9[1] = { 'e' };
+static const symbol s_10_10[2] = { 'j', 'e' };
+static const symbol s_10_11[2] = { 'n', 'k' };
+static const symbol s_10_12[3] = { 'u', 'n', 'k' };
+static const symbol s_10_13[4] = { 0xC3, 0xA1, 'n', 'k' };
+static const symbol s_10_14[4] = { 0xC3, 0xA9, 'n', 'k' };
+static const symbol s_10_15[4] = { 0xC3, 0xBC, 'n', 'k' };
+static const symbol s_10_16[2] = { 'u', 'k' };
+static const symbol s_10_17[3] = { 'j', 'u', 'k' };
+static const symbol s_10_18[5] = { 0xC3, 0xA1, 'j', 'u', 'k' };
+static const symbol s_10_19[3] = { 0xC3, 0xBC, 'k' };
+static const symbol s_10_20[4] = { 'j', 0xC3, 0xBC, 'k' };
+static const symbol s_10_21[6] = { 0xC3, 0xA9, 'j', 0xC3, 0xBC, 'k' };
+static const symbol s_10_22[1] = { 'm' };
+static const symbol s_10_23[2] = { 'a', 'm' };
+static const symbol s_10_24[2] = { 'e', 'm' };
+static const symbol s_10_25[2] = { 'o', 'm' };
+static const symbol s_10_26[3] = { 0xC3, 0xA1, 'm' };
+static const symbol s_10_27[3] = { 0xC3, 0xA9, 'm' };
+static const symbol s_10_28[1] = { 'o' };
+static const symbol s_10_29[2] = { 0xC3, 0xA1 };
+static const symbol s_10_30[2] = { 0xC3, 0xA9 };
+
+static const struct among a_10[31] =
+{
+/*  0 */ { 1, s_10_0, -1, 18, 0},
+/*  1 */ { 2, s_10_1, 0, 17, 0},
+/*  2 */ { 1, s_10_2, -1, 16, 0},
+/*  3 */ { 2, s_10_3, 2, 13, 0},
+/*  4 */ { 2, s_10_4, 2, 13, 0},
+/*  5 */ { 2, s_10_5, 2, 13, 0},
+/*  6 */ { 3, s_10_6, 2, 14, 0},
+/*  7 */ { 3, s_10_7, 2, 15, 0},
+/*  8 */ { 3, s_10_8, 2, 13, 0},
+/*  9 */ { 1, s_10_9, -1, 18, 0},
+/* 10 */ { 2, s_10_10, 9, 17, 0},
+/* 11 */ { 2, s_10_11, -1, 4, 0},
+/* 12 */ { 3, s_10_12, 11, 1, 0},
+/* 13 */ { 4, s_10_13, 11, 2, 0},
+/* 14 */ { 4, s_10_14, 11, 3, 0},
+/* 15 */ { 4, s_10_15, 11, 1, 0},
+/* 16 */ { 2, s_10_16, -1, 8, 0},
+/* 17 */ { 3, s_10_17, 16, 7, 0},
+/* 18 */ { 5, s_10_18, 17, 5, 0},
+/* 19 */ { 3, s_10_19, -1, 8, 0},
+/* 20 */ { 4, s_10_20, 19, 7, 0},
+/* 21 */ { 6, s_10_21, 20, 6, 0},
+/* 22 */ { 1, s_10_22, -1, 12, 0},
+/* 23 */ { 2, s_10_23, 22, 9, 0},
+/* 24 */ { 2, s_10_24, 22, 9, 0},
+/* 25 */ { 2, s_10_25, 22, 9, 0},
+/* 26 */ { 3, s_10_26, 22, 10, 0},
+/* 27 */ { 3, s_10_27, 22, 11, 0},
+/* 28 */ { 1, s_10_28, -1, 18, 0},
+/* 29 */ { 2, s_10_29, -1, 19, 0},
+/* 30 */ { 2, s_10_30, -1, 20, 0}
+};
+
+static const symbol s_11_0[2] = { 'i', 'd' };
+static const symbol s_11_1[3] = { 'a', 'i', 'd' };
+static const symbol s_11_2[4] = { 'j', 'a', 'i', 'd' };
+static const symbol s_11_3[3] = { 'e', 'i', 'd' };
+static const symbol s_11_4[4] = { 'j', 'e', 'i', 'd' };
+static const symbol s_11_5[4] = { 0xC3, 0xA1, 'i', 'd' };
+static const symbol s_11_6[4] = { 0xC3, 0xA9, 'i', 'd' };
+static const symbol s_11_7[1] = { 'i' };
+static const symbol s_11_8[2] = { 'a', 'i' };
+static const symbol s_11_9[3] = { 'j', 'a', 'i' };
+static const symbol s_11_10[2] = { 'e', 'i' };
+static const symbol s_11_11[3] = { 'j', 'e', 'i' };
+static const symbol s_11_12[3] = { 0xC3, 0xA1, 'i' };
+static const symbol s_11_13[3] = { 0xC3, 0xA9, 'i' };
+static const symbol s_11_14[4] = { 'i', 't', 'e', 'k' };
+static const symbol s_11_15[5] = { 'e', 'i', 't', 'e', 'k' };
+static const symbol s_11_16[6] = { 'j', 'e', 'i', 't', 'e', 'k' };
+static const symbol s_11_17[6] = { 0xC3, 0xA9, 'i', 't', 'e', 'k' };
+static const symbol s_11_18[2] = { 'i', 'k' };
+static const symbol s_11_19[3] = { 'a', 'i', 'k' };
+static const symbol s_11_20[4] = { 'j', 'a', 'i', 'k' };
+static const symbol s_11_21[3] = { 'e', 'i', 'k' };
+static const symbol s_11_22[4] = { 'j', 'e', 'i', 'k' };
+static const symbol s_11_23[4] = { 0xC3, 0xA1, 'i', 'k' };
+static const symbol s_11_24[4] = { 0xC3, 0xA9, 'i', 'k' };
+static const symbol s_11_25[3] = { 'i', 'n', 'k' };
+static const symbol s_11_26[4] = { 'a', 'i', 'n', 'k' };
+static const symbol s_11_27[5] = { 'j', 'a', 'i', 'n', 'k' };
+static const symbol s_11_28[4] = { 'e', 'i', 'n', 'k' };
+static const symbol s_11_29[5] = { 'j', 'e', 'i', 'n', 'k' };
+static const symbol s_11_30[5] = { 0xC3, 0xA1, 'i', 'n', 'k' };
+static const symbol s_11_31[5] = { 0xC3, 0xA9, 'i', 'n', 'k' };
+static const symbol s_11_32[5] = { 'a', 'i', 't', 'o', 'k' };
+static const symbol s_11_33[6] = { 'j', 'a', 'i', 't', 'o', 'k' };
+static const symbol s_11_34[6] = { 0xC3, 0xA1, 'i', 't', 'o', 'k' };
+static const symbol s_11_35[2] = { 'i', 'm' };
+static const symbol s_11_36[3] = { 'a', 'i', 'm' };
+static const symbol s_11_37[4] = { 'j', 'a', 'i', 'm' };
+static const symbol s_11_38[3] = { 'e', 'i', 'm' };
+static const symbol s_11_39[4] = { 'j', 'e', 'i', 'm' };
+static const symbol s_11_40[4] = { 0xC3, 0xA1, 'i', 'm' };
+static const symbol s_11_41[4] = { 0xC3, 0xA9, 'i', 'm' };
+
+static const struct among a_11[42] =
+{
+/*  0 */ { 2, s_11_0, -1, 10, 0},
+/*  1 */ { 3, s_11_1, 0, 9, 0},
+/*  2 */ { 4, s_11_2, 1, 6, 0},
+/*  3 */ { 3, s_11_3, 0, 9, 0},
+/*  4 */ { 4, s_11_4, 3, 6, 0},
+/*  5 */ { 4, s_11_5, 0, 7, 0},
+/*  6 */ { 4, s_11_6, 0, 8, 0},
+/*  7 */ { 1, s_11_7, -1, 15, 0},
+/*  8 */ { 2, s_11_8, 7, 14, 0},
+/*  9 */ { 3, s_11_9, 8, 11, 0},
+/* 10 */ { 2, s_11_10, 7, 14, 0},
+/* 11 */ { 3, s_11_11, 10, 11, 0},
+/* 12 */ { 3, s_11_12, 7, 12, 0},
+/* 13 */ { 3, s_11_13, 7, 13, 0},
+/* 14 */ { 4, s_11_14, -1, 24, 0},
+/* 15 */ { 5, s_11_15, 14, 21, 0},
+/* 16 */ { 6, s_11_16, 15, 20, 0},
+/* 17 */ { 6, s_11_17, 14, 23, 0},
+/* 18 */ { 2, s_11_18, -1, 29, 0},
+/* 19 */ { 3, s_11_19, 18, 26, 0},
+/* 20 */ { 4, s_11_20, 19, 25, 0},
+/* 21 */ { 3, s_11_21, 18, 26, 0},
+/* 22 */ { 4, s_11_22, 21, 25, 0},
+/* 23 */ { 4, s_11_23, 18, 27, 0},
+/* 24 */ { 4, s_11_24, 18, 28, 0},
+/* 25 */ { 3, s_11_25, -1, 20, 0},
+/* 26 */ { 4, s_11_26, 25, 17, 0},
+/* 27 */ { 5, s_11_27, 26, 16, 0},
+/* 28 */ { 4, s_11_28, 25, 17, 0},
+/* 29 */ { 5, s_11_29, 28, 16, 0},
+/* 30 */ { 5, s_11_30, 25, 18, 0},
+/* 31 */ { 5, s_11_31, 25, 19, 0},
+/* 32 */ { 5, s_11_32, -1, 21, 0},
+/* 33 */ { 6, s_11_33, 32, 20, 0},
+/* 34 */ { 6, s_11_34, -1, 22, 0},
+/* 35 */ { 2, s_11_35, -1, 5, 0},
+/* 36 */ { 3, s_11_36, 35, 4, 0},
+/* 37 */ { 4, s_11_37, 36, 1, 0},
+/* 38 */ { 3, s_11_38, 35, 4, 0},
+/* 39 */ { 4, s_11_39, 38, 1, 0},
+/* 40 */ { 4, s_11_40, 35, 2, 0},
+/* 41 */ { 4, s_11_41, 35, 3, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 52, 14 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 'e' };
+static const symbol s_3[] = { 'a' };
+static const symbol s_4[] = { 'a' };
+static const symbol s_5[] = { 'a' };
+static const symbol s_6[] = { 'e' };
+static const symbol s_7[] = { 'a' };
+static const symbol s_8[] = { 'e' };
+static const symbol s_9[] = { 'e' };
+static const symbol s_10[] = { 'a' };
+static const symbol s_11[] = { 'e' };
+static const symbol s_12[] = { 'a' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'a' };
+static const symbol s_15[] = { 'e' };
+static const symbol s_16[] = { 'a' };
+static const symbol s_17[] = { 'e' };
+static const symbol s_18[] = { 'a' };
+static const symbol s_19[] = { 'e' };
+static const symbol s_20[] = { 'a' };
+static const symbol s_21[] = { 'e' };
+static const symbol s_22[] = { 'a' };
+static const symbol s_23[] = { 'e' };
+static const symbol s_24[] = { 'a' };
+static const symbol s_25[] = { 'e' };
+static const symbol s_26[] = { 'a' };
+static const symbol s_27[] = { 'e' };
+static const symbol s_28[] = { 'a' };
+static const symbol s_29[] = { 'e' };
+static const symbol s_30[] = { 'a' };
+static const symbol s_31[] = { 'e' };
+static const symbol s_32[] = { 'a' };
+static const symbol s_33[] = { 'e' };
+static const symbol s_34[] = { 'a' };
+static const symbol s_35[] = { 'e' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c1 = z->c; /* or, line 51 */
+        if (in_grouping_U(z, g_v, 97, 252, 0)) goto lab1;
+        if (in_grouping_U(z, g_v, 97, 252, 1) < 0) goto lab1; /* goto */ /* non v, line 48 */
+        {   int c2 = z->c; /* or, line 49 */
+            if (z->c + 1 >= z->l || z->p[z->c + 1] >> 5 != 3 || !((101187584 >> (z->p[z->c + 1] & 0x1f)) & 1)) goto lab3;
+            if (!(find_among(z, a_0, 8))) goto lab3; /* among, line 49 */
+            goto lab2;
+        lab3:
+            z->c = c2;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab1;
+                z->c = ret; /* next, line 49 */
+            }
+        }
+    lab2:
+        z->I[0] = z->c; /* setmark p1, line 50 */
+        goto lab0;
+    lab1:
+        z->c = c1;
+        if (out_grouping_U(z, g_v, 97, 252, 0)) return 0;
+        {    /* gopast */ /* grouping v, line 53 */
+            int ret = out_grouping_U(z, g_v, 97, 252, 1);
+            if (ret < 0) return 0;
+            z->c += ret;
+        }
+        z->I[0] = z->c; /* setmark p1, line 53 */
+    }
+lab0:
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_v_ending(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 61 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 161 && z->p[z->c - 1] != 169)) return 0;
+    among_var = find_among_b(z, a_1, 2); /* substring, line 61 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 61 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 61 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 1, s_0); /* <-, line 62 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_1); /* <-, line 63 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_double(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 68 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((106790108 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+        if (!(find_among_b(z, a_2, 23))) return 0; /* among, line 68 */
+        z->c = z->l - m_test;
+    }
+    return 1;
+}
+
+static int r_undouble(struct SN_env * z) {
+    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+        if (ret < 0) return 0;
+        z->c = ret; /* next, line 73 */
+    }
+    z->ket = z->c; /* [, line 73 */
+    {   int ret = skip_utf8(z->p, z->c, z->lb, z->l, - 1);
+        if (ret < 0) return 0;
+        z->c = ret; /* hop, line 73 */
+    }
+    z->bra = z->c; /* ], line 73 */
+    {   int ret = slice_del(z); /* delete, line 73 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_instrum(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 77 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] != 108) return 0;
+    among_var = find_among_b(z, a_3, 2); /* substring, line 77 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 77 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 77 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 78 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 79 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 81 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 82 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_case(struct SN_env * z) {
+    z->ket = z->c; /* [, line 87 */
+    if (!(find_among_b(z, a_4, 44))) return 0; /* substring, line 87 */
+    z->bra = z->c; /* ], line 87 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 87 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = slice_del(z); /* delete, line 111 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_v_ending(z);
+        if (ret == 0) return 0; /* call v_ending, line 112 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_case_special(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 116 */
+    if (z->c - 2 <= z->lb || (z->p[z->c - 1] != 110 && z->p[z->c - 1] != 116)) return 0;
+    among_var = find_among_b(z, a_5, 3); /* substring, line 116 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 116 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 116 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 1, s_2); /* <-, line 117 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_3); /* <-, line 118 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_4); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_case_other(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 124 */
+    if (z->c - 3 <= z->lb || z->p[z->c - 1] != 108) return 0;
+    among_var = find_among_b(z, a_6, 6); /* substring, line 124 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 124 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 124 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 125 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 126 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_5); /* <-, line 127 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 1, s_6); /* <-, line 128 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_factive(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 133 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 161 && z->p[z->c - 1] != 169)) return 0;
+    among_var = find_among_b(z, a_7, 2); /* substring, line 133 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 133 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 133 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 134 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_double(z);
+                if (ret == 0) return 0; /* call double, line 135 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    {   int ret = slice_del(z); /* delete, line 137 */
+        if (ret < 0) return ret;
+    }
+    {   int ret = r_undouble(z);
+        if (ret == 0) return 0; /* call undouble, line 138 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_plural(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 142 */
+    if (z->c <= z->lb || z->p[z->c - 1] != 107) return 0;
+    among_var = find_among_b(z, a_8, 7); /* substring, line 142 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 142 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 142 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 1, s_7); /* <-, line 143 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_8); /* <-, line 144 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 145 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 146 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_del(z); /* delete, line 147 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_del(z); /* delete, line 148 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_del(z); /* delete, line 149 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_owned(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 154 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 105 && z->p[z->c - 1] != 169)) return 0;
+    among_var = find_among_b(z, a_9, 12); /* substring, line 154 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 154 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 154 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 155 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_9); /* <-, line 156 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_10); /* <-, line 157 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 158 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 1, s_11); /* <-, line 159 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 1, s_12); /* <-, line 160 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_del(z); /* delete, line 161 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 162 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_del(z); /* delete, line 163 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_sing_owner(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 168 */
+    among_var = find_among_b(z, a_10, 31); /* substring, line 168 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 168 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 168 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 169 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_14); /* <-, line 170 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_15); /* <-, line 171 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 172 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 1, s_16); /* <-, line 173 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 1, s_17); /* <-, line 174 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_del(z); /* delete, line 175 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_del(z); /* delete, line 176 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_del(z); /* delete, line 177 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 1, s_18); /* <-, line 178 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 1, s_19); /* <-, line 179 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_del(z); /* delete, line 180 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = slice_del(z); /* delete, line 181 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_from_s(z, 1, s_20); /* <-, line 182 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 15:
+            {   int ret = slice_from_s(z, 1, s_21); /* <-, line 183 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 16:
+            {   int ret = slice_del(z); /* delete, line 184 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 17:
+            {   int ret = slice_del(z); /* delete, line 185 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 18:
+            {   int ret = slice_del(z); /* delete, line 186 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 19:
+            {   int ret = slice_from_s(z, 1, s_22); /* <-, line 187 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 20:
+            {   int ret = slice_from_s(z, 1, s_23); /* <-, line 188 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_plur_owner(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 193 */
+    if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((10768 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_11, 42); /* substring, line 193 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 193 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 193 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 194 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_24); /* <-, line 195 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_25); /* <-, line 196 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_del(z); /* delete, line 197 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_del(z); /* delete, line 198 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_del(z); /* delete, line 199 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 1, s_26); /* <-, line 200 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 1, s_27); /* <-, line 201 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_del(z); /* delete, line 202 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_del(z); /* delete, line 203 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_del(z); /* delete, line 204 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_from_s(z, 1, s_28); /* <-, line 205 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = slice_from_s(z, 1, s_29); /* <-, line 206 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_del(z); /* delete, line 207 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 15:
+            {   int ret = slice_del(z); /* delete, line 208 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 16:
+            {   int ret = slice_del(z); /* delete, line 209 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 17:
+            {   int ret = slice_del(z); /* delete, line 210 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 18:
+            {   int ret = slice_from_s(z, 1, s_30); /* <-, line 211 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 19:
+            {   int ret = slice_from_s(z, 1, s_31); /* <-, line 212 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 20:
+            {   int ret = slice_del(z); /* delete, line 214 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 21:
+            {   int ret = slice_del(z); /* delete, line 215 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 22:
+            {   int ret = slice_from_s(z, 1, s_32); /* <-, line 216 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 23:
+            {   int ret = slice_from_s(z, 1, s_33); /* <-, line 217 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 24:
+            {   int ret = slice_del(z); /* delete, line 218 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 25:
+            {   int ret = slice_del(z); /* delete, line 219 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 26:
+            {   int ret = slice_del(z); /* delete, line 220 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 27:
+            {   int ret = slice_from_s(z, 1, s_34); /* <-, line 221 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 28:
+            {   int ret = slice_from_s(z, 1, s_35); /* <-, line 222 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 29:
+            {   int ret = slice_del(z); /* delete, line 223 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int hungarian_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 229 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 229 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 230 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 231 */
+        {   int ret = r_instrum(z);
+            if (ret == 0) goto lab1; /* call instrum, line 231 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 232 */
+        {   int ret = r_case(z);
+            if (ret == 0) goto lab2; /* call case, line 232 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 233 */
+        {   int ret = r_case_special(z);
+            if (ret == 0) goto lab3; /* call case_special, line 233 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 234 */
+        {   int ret = r_case_other(z);
+            if (ret == 0) goto lab4; /* call case_other, line 234 */
+            if (ret < 0) return ret;
+        }
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m6 = z->l - z->c; (void)m6; /* do, line 235 */
+        {   int ret = r_factive(z);
+            if (ret == 0) goto lab5; /* call factive, line 235 */
+            if (ret < 0) return ret;
+        }
+    lab5:
+        z->c = z->l - m6;
+    }
+    {   int m7 = z->l - z->c; (void)m7; /* do, line 236 */
+        {   int ret = r_owned(z);
+            if (ret == 0) goto lab6; /* call owned, line 236 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m7;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 237 */
+        {   int ret = r_sing_owner(z);
+            if (ret == 0) goto lab7; /* call sing_owner, line 237 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = z->l - m8;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 238 */
+        {   int ret = r_plur_owner(z);
+            if (ret == 0) goto lab8; /* call plur_owner, line 238 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = z->l - m9;
+    }
+    {   int m10 = z->l - z->c; (void)m10; /* do, line 239 */
+        {   int ret = r_plural(z);
+            if (ret == 0) goto lab9; /* call plural, line 239 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m10;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * hungarian_UTF_8_create_env(void) { return SN_create_env(0, 1, 0); }
+
+extern void hungarian_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_italian.c b/src/backend/snowball/libstemmer/stem_UTF_8_italian.c
new file mode 100644
index 000000000000..395e38a548ee
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_italian.c
@@ -0,0 +1,1073 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int italian_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_vowel_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_attached_pronoun(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * italian_UTF_8_create_env(void);
+extern void italian_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[2] = { 'q', 'u' };
+static const symbol s_0_2[2] = { 0xC3, 0xA1 };
+static const symbol s_0_3[2] = { 0xC3, 0xA9 };
+static const symbol s_0_4[2] = { 0xC3, 0xAD };
+static const symbol s_0_5[2] = { 0xC3, 0xB3 };
+static const symbol s_0_6[2] = { 0xC3, 0xBA };
+
+static const struct among a_0[7] =
+{
+/*  0 */ { 0, 0, -1, 7, 0},
+/*  1 */ { 2, s_0_1, 0, 6, 0},
+/*  2 */ { 2, s_0_2, 0, 1, 0},
+/*  3 */ { 2, s_0_3, 0, 2, 0},
+/*  4 */ { 2, s_0_4, 0, 3, 0},
+/*  5 */ { 2, s_0_5, 0, 4, 0},
+/*  6 */ { 2, s_0_6, 0, 5, 0}
+};
+
+static const symbol s_1_1[1] = { 'I' };
+static const symbol s_1_2[1] = { 'U' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 1, s_1_1, 0, 1, 0},
+/*  2 */ { 1, s_1_2, 0, 2, 0}
+};
+
+static const symbol s_2_0[2] = { 'l', 'a' };
+static const symbol s_2_1[4] = { 'c', 'e', 'l', 'a' };
+static const symbol s_2_2[6] = { 'g', 'l', 'i', 'e', 'l', 'a' };
+static const symbol s_2_3[4] = { 'm', 'e', 'l', 'a' };
+static const symbol s_2_4[4] = { 't', 'e', 'l', 'a' };
+static const symbol s_2_5[4] = { 'v', 'e', 'l', 'a' };
+static const symbol s_2_6[2] = { 'l', 'e' };
+static const symbol s_2_7[4] = { 'c', 'e', 'l', 'e' };
+static const symbol s_2_8[6] = { 'g', 'l', 'i', 'e', 'l', 'e' };
+static const symbol s_2_9[4] = { 'm', 'e', 'l', 'e' };
+static const symbol s_2_10[4] = { 't', 'e', 'l', 'e' };
+static const symbol s_2_11[4] = { 'v', 'e', 'l', 'e' };
+static const symbol s_2_12[2] = { 'n', 'e' };
+static const symbol s_2_13[4] = { 'c', 'e', 'n', 'e' };
+static const symbol s_2_14[6] = { 'g', 'l', 'i', 'e', 'n', 'e' };
+static const symbol s_2_15[4] = { 'm', 'e', 'n', 'e' };
+static const symbol s_2_16[4] = { 's', 'e', 'n', 'e' };
+static const symbol s_2_17[4] = { 't', 'e', 'n', 'e' };
+static const symbol s_2_18[4] = { 'v', 'e', 'n', 'e' };
+static const symbol s_2_19[2] = { 'c', 'i' };
+static const symbol s_2_20[2] = { 'l', 'i' };
+static const symbol s_2_21[4] = { 'c', 'e', 'l', 'i' };
+static const symbol s_2_22[6] = { 'g', 'l', 'i', 'e', 'l', 'i' };
+static const symbol s_2_23[4] = { 'm', 'e', 'l', 'i' };
+static const symbol s_2_24[4] = { 't', 'e', 'l', 'i' };
+static const symbol s_2_25[4] = { 'v', 'e', 'l', 'i' };
+static const symbol s_2_26[3] = { 'g', 'l', 'i' };
+static const symbol s_2_27[2] = { 'm', 'i' };
+static const symbol s_2_28[2] = { 's', 'i' };
+static const symbol s_2_29[2] = { 't', 'i' };
+static const symbol s_2_30[2] = { 'v', 'i' };
+static const symbol s_2_31[2] = { 'l', 'o' };
+static const symbol s_2_32[4] = { 'c', 'e', 'l', 'o' };
+static const symbol s_2_33[6] = { 'g', 'l', 'i', 'e', 'l', 'o' };
+static const symbol s_2_34[4] = { 'm', 'e', 'l', 'o' };
+static const symbol s_2_35[4] = { 't', 'e', 'l', 'o' };
+static const symbol s_2_36[4] = { 'v', 'e', 'l', 'o' };
+
+static const struct among a_2[37] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 4, s_2_1, 0, -1, 0},
+/*  2 */ { 6, s_2_2, 0, -1, 0},
+/*  3 */ { 4, s_2_3, 0, -1, 0},
+/*  4 */ { 4, s_2_4, 0, -1, 0},
+/*  5 */ { 4, s_2_5, 0, -1, 0},
+/*  6 */ { 2, s_2_6, -1, -1, 0},
+/*  7 */ { 4, s_2_7, 6, -1, 0},
+/*  8 */ { 6, s_2_8, 6, -1, 0},
+/*  9 */ { 4, s_2_9, 6, -1, 0},
+/* 10 */ { 4, s_2_10, 6, -1, 0},
+/* 11 */ { 4, s_2_11, 6, -1, 0},
+/* 12 */ { 2, s_2_12, -1, -1, 0},
+/* 13 */ { 4, s_2_13, 12, -1, 0},
+/* 14 */ { 6, s_2_14, 12, -1, 0},
+/* 15 */ { 4, s_2_15, 12, -1, 0},
+/* 16 */ { 4, s_2_16, 12, -1, 0},
+/* 17 */ { 4, s_2_17, 12, -1, 0},
+/* 18 */ { 4, s_2_18, 12, -1, 0},
+/* 19 */ { 2, s_2_19, -1, -1, 0},
+/* 20 */ { 2, s_2_20, -1, -1, 0},
+/* 21 */ { 4, s_2_21, 20, -1, 0},
+/* 22 */ { 6, s_2_22, 20, -1, 0},
+/* 23 */ { 4, s_2_23, 20, -1, 0},
+/* 24 */ { 4, s_2_24, 20, -1, 0},
+/* 25 */ { 4, s_2_25, 20, -1, 0},
+/* 26 */ { 3, s_2_26, 20, -1, 0},
+/* 27 */ { 2, s_2_27, -1, -1, 0},
+/* 28 */ { 2, s_2_28, -1, -1, 0},
+/* 29 */ { 2, s_2_29, -1, -1, 0},
+/* 30 */ { 2, s_2_30, -1, -1, 0},
+/* 31 */ { 2, s_2_31, -1, -1, 0},
+/* 32 */ { 4, s_2_32, 31, -1, 0},
+/* 33 */ { 6, s_2_33, 31, -1, 0},
+/* 34 */ { 4, s_2_34, 31, -1, 0},
+/* 35 */ { 4, s_2_35, 31, -1, 0},
+/* 36 */ { 4, s_2_36, 31, -1, 0}
+};
+
+static const symbol s_3_0[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_3_1[4] = { 'e', 'n', 'd', 'o' };
+static const symbol s_3_2[2] = { 'a', 'r' };
+static const symbol s_3_3[2] = { 'e', 'r' };
+static const symbol s_3_4[2] = { 'i', 'r' };
+
+static const struct among a_3[5] =
+{
+/*  0 */ { 4, s_3_0, -1, 1, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0},
+/*  2 */ { 2, s_3_2, -1, 2, 0},
+/*  3 */ { 2, s_3_3, -1, 2, 0},
+/*  4 */ { 2, s_3_4, -1, 2, 0}
+};
+
+static const symbol s_4_0[2] = { 'i', 'c' };
+static const symbol s_4_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_4_2[2] = { 'o', 's' };
+static const symbol s_4_3[2] = { 'i', 'v' };
+
+static const struct among a_4[4] =
+{
+/*  0 */ { 2, s_4_0, -1, -1, 0},
+/*  1 */ { 4, s_4_1, -1, -1, 0},
+/*  2 */ { 2, s_4_2, -1, -1, 0},
+/*  3 */ { 2, s_4_3, -1, 1, 0}
+};
+
+static const symbol s_5_0[2] = { 'i', 'c' };
+static const symbol s_5_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_5_2[2] = { 'i', 'v' };
+
+static const struct among a_5[3] =
+{
+/*  0 */ { 2, s_5_0, -1, 1, 0},
+/*  1 */ { 4, s_5_1, -1, 1, 0},
+/*  2 */ { 2, s_5_2, -1, 1, 0}
+};
+
+static const symbol s_6_0[3] = { 'i', 'c', 'a' };
+static const symbol s_6_1[5] = { 'l', 'o', 'g', 'i', 'a' };
+static const symbol s_6_2[3] = { 'o', 's', 'a' };
+static const symbol s_6_3[4] = { 'i', 's', 't', 'a' };
+static const symbol s_6_4[3] = { 'i', 'v', 'a' };
+static const symbol s_6_5[4] = { 'a', 'n', 'z', 'a' };
+static const symbol s_6_6[4] = { 'e', 'n', 'z', 'a' };
+static const symbol s_6_7[3] = { 'i', 'c', 'e' };
+static const symbol s_6_8[6] = { 'a', 't', 'r', 'i', 'c', 'e' };
+static const symbol s_6_9[4] = { 'i', 'c', 'h', 'e' };
+static const symbol s_6_10[5] = { 'l', 'o', 'g', 'i', 'e' };
+static const symbol s_6_11[5] = { 'a', 'b', 'i', 'l', 'e' };
+static const symbol s_6_12[5] = { 'i', 'b', 'i', 'l', 'e' };
+static const symbol s_6_13[6] = { 'u', 's', 'i', 'o', 'n', 'e' };
+static const symbol s_6_14[6] = { 'a', 'z', 'i', 'o', 'n', 'e' };
+static const symbol s_6_15[6] = { 'u', 'z', 'i', 'o', 'n', 'e' };
+static const symbol s_6_16[5] = { 'a', 't', 'o', 'r', 'e' };
+static const symbol s_6_17[3] = { 'o', 's', 'e' };
+static const symbol s_6_18[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_6_19[5] = { 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_20[6] = { 'a', 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_21[4] = { 'i', 's', 't', 'e' };
+static const symbol s_6_22[3] = { 'i', 'v', 'e' };
+static const symbol s_6_23[4] = { 'a', 'n', 'z', 'e' };
+static const symbol s_6_24[4] = { 'e', 'n', 'z', 'e' };
+static const symbol s_6_25[3] = { 'i', 'c', 'i' };
+static const symbol s_6_26[6] = { 'a', 't', 'r', 'i', 'c', 'i' };
+static const symbol s_6_27[4] = { 'i', 'c', 'h', 'i' };
+static const symbol s_6_28[5] = { 'a', 'b', 'i', 'l', 'i' };
+static const symbol s_6_29[5] = { 'i', 'b', 'i', 'l', 'i' };
+static const symbol s_6_30[4] = { 'i', 's', 'm', 'i' };
+static const symbol s_6_31[6] = { 'u', 's', 'i', 'o', 'n', 'i' };
+static const symbol s_6_32[6] = { 'a', 'z', 'i', 'o', 'n', 'i' };
+static const symbol s_6_33[6] = { 'u', 'z', 'i', 'o', 'n', 'i' };
+static const symbol s_6_34[5] = { 'a', 't', 'o', 'r', 'i' };
+static const symbol s_6_35[3] = { 'o', 's', 'i' };
+static const symbol s_6_36[4] = { 'a', 'n', 't', 'i' };
+static const symbol s_6_37[6] = { 'a', 'm', 'e', 'n', 't', 'i' };
+static const symbol s_6_38[6] = { 'i', 'm', 'e', 'n', 't', 'i' };
+static const symbol s_6_39[4] = { 'i', 's', 't', 'i' };
+static const symbol s_6_40[3] = { 'i', 'v', 'i' };
+static const symbol s_6_41[3] = { 'i', 'c', 'o' };
+static const symbol s_6_42[4] = { 'i', 's', 'm', 'o' };
+static const symbol s_6_43[3] = { 'o', 's', 'o' };
+static const symbol s_6_44[6] = { 'a', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_6_45[6] = { 'i', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_6_46[3] = { 'i', 'v', 'o' };
+static const symbol s_6_47[4] = { 'i', 't', 0xC3, 0xA0 };
+static const symbol s_6_48[5] = { 'i', 's', 't', 0xC3, 0xA0 };
+static const symbol s_6_49[5] = { 'i', 's', 't', 0xC3, 0xA8 };
+static const symbol s_6_50[5] = { 'i', 's', 't', 0xC3, 0xAC };
+
+static const struct among a_6[51] =
+{
+/*  0 */ { 3, s_6_0, -1, 1, 0},
+/*  1 */ { 5, s_6_1, -1, 3, 0},
+/*  2 */ { 3, s_6_2, -1, 1, 0},
+/*  3 */ { 4, s_6_3, -1, 1, 0},
+/*  4 */ { 3, s_6_4, -1, 9, 0},
+/*  5 */ { 4, s_6_5, -1, 1, 0},
+/*  6 */ { 4, s_6_6, -1, 5, 0},
+/*  7 */ { 3, s_6_7, -1, 1, 0},
+/*  8 */ { 6, s_6_8, 7, 1, 0},
+/*  9 */ { 4, s_6_9, -1, 1, 0},
+/* 10 */ { 5, s_6_10, -1, 3, 0},
+/* 11 */ { 5, s_6_11, -1, 1, 0},
+/* 12 */ { 5, s_6_12, -1, 1, 0},
+/* 13 */ { 6, s_6_13, -1, 4, 0},
+/* 14 */ { 6, s_6_14, -1, 2, 0},
+/* 15 */ { 6, s_6_15, -1, 4, 0},
+/* 16 */ { 5, s_6_16, -1, 2, 0},
+/* 17 */ { 3, s_6_17, -1, 1, 0},
+/* 18 */ { 4, s_6_18, -1, 1, 0},
+/* 19 */ { 5, s_6_19, -1, 1, 0},
+/* 20 */ { 6, s_6_20, 19, 7, 0},
+/* 21 */ { 4, s_6_21, -1, 1, 0},
+/* 22 */ { 3, s_6_22, -1, 9, 0},
+/* 23 */ { 4, s_6_23, -1, 1, 0},
+/* 24 */ { 4, s_6_24, -1, 5, 0},
+/* 25 */ { 3, s_6_25, -1, 1, 0},
+/* 26 */ { 6, s_6_26, 25, 1, 0},
+/* 27 */ { 4, s_6_27, -1, 1, 0},
+/* 28 */ { 5, s_6_28, -1, 1, 0},
+/* 29 */ { 5, s_6_29, -1, 1, 0},
+/* 30 */ { 4, s_6_30, -1, 1, 0},
+/* 31 */ { 6, s_6_31, -1, 4, 0},
+/* 32 */ { 6, s_6_32, -1, 2, 0},
+/* 33 */ { 6, s_6_33, -1, 4, 0},
+/* 34 */ { 5, s_6_34, -1, 2, 0},
+/* 35 */ { 3, s_6_35, -1, 1, 0},
+/* 36 */ { 4, s_6_36, -1, 1, 0},
+/* 37 */ { 6, s_6_37, -1, 6, 0},
+/* 38 */ { 6, s_6_38, -1, 6, 0},
+/* 39 */ { 4, s_6_39, -1, 1, 0},
+/* 40 */ { 3, s_6_40, -1, 9, 0},
+/* 41 */ { 3, s_6_41, -1, 1, 0},
+/* 42 */ { 4, s_6_42, -1, 1, 0},
+/* 43 */ { 3, s_6_43, -1, 1, 0},
+/* 44 */ { 6, s_6_44, -1, 6, 0},
+/* 45 */ { 6, s_6_45, -1, 6, 0},
+/* 46 */ { 3, s_6_46, -1, 9, 0},
+/* 47 */ { 4, s_6_47, -1, 8, 0},
+/* 48 */ { 5, s_6_48, -1, 1, 0},
+/* 49 */ { 5, s_6_49, -1, 1, 0},
+/* 50 */ { 5, s_6_50, -1, 1, 0}
+};
+
+static const symbol s_7_0[4] = { 'i', 's', 'c', 'a' };
+static const symbol s_7_1[4] = { 'e', 'n', 'd', 'a' };
+static const symbol s_7_2[3] = { 'a', 't', 'a' };
+static const symbol s_7_3[3] = { 'i', 't', 'a' };
+static const symbol s_7_4[3] = { 'u', 't', 'a' };
+static const symbol s_7_5[3] = { 'a', 'v', 'a' };
+static const symbol s_7_6[3] = { 'e', 'v', 'a' };
+static const symbol s_7_7[3] = { 'i', 'v', 'a' };
+static const symbol s_7_8[6] = { 'e', 'r', 'e', 'b', 'b', 'e' };
+static const symbol s_7_9[6] = { 'i', 'r', 'e', 'b', 'b', 'e' };
+static const symbol s_7_10[4] = { 'i', 's', 'c', 'e' };
+static const symbol s_7_11[4] = { 'e', 'n', 'd', 'e' };
+static const symbol s_7_12[3] = { 'a', 'r', 'e' };
+static const symbol s_7_13[3] = { 'e', 'r', 'e' };
+static const symbol s_7_14[3] = { 'i', 'r', 'e' };
+static const symbol s_7_15[4] = { 'a', 's', 's', 'e' };
+static const symbol s_7_16[3] = { 'a', 't', 'e' };
+static const symbol s_7_17[5] = { 'a', 'v', 'a', 't', 'e' };
+static const symbol s_7_18[5] = { 'e', 'v', 'a', 't', 'e' };
+static const symbol s_7_19[5] = { 'i', 'v', 'a', 't', 'e' };
+static const symbol s_7_20[3] = { 'e', 't', 'e' };
+static const symbol s_7_21[5] = { 'e', 'r', 'e', 't', 'e' };
+static const symbol s_7_22[5] = { 'i', 'r', 'e', 't', 'e' };
+static const symbol s_7_23[3] = { 'i', 't', 'e' };
+static const symbol s_7_24[6] = { 'e', 'r', 'e', 's', 't', 'e' };
+static const symbol s_7_25[6] = { 'i', 'r', 'e', 's', 't', 'e' };
+static const symbol s_7_26[3] = { 'u', 't', 'e' };
+static const symbol s_7_27[4] = { 'e', 'r', 'a', 'i' };
+static const symbol s_7_28[4] = { 'i', 'r', 'a', 'i' };
+static const symbol s_7_29[4] = { 'i', 's', 'c', 'i' };
+static const symbol s_7_30[4] = { 'e', 'n', 'd', 'i' };
+static const symbol s_7_31[4] = { 'e', 'r', 'e', 'i' };
+static const symbol s_7_32[4] = { 'i', 'r', 'e', 'i' };
+static const symbol s_7_33[4] = { 'a', 's', 's', 'i' };
+static const symbol s_7_34[3] = { 'a', 't', 'i' };
+static const symbol s_7_35[3] = { 'i', 't', 'i' };
+static const symbol s_7_36[6] = { 'e', 'r', 'e', 's', 't', 'i' };
+static const symbol s_7_37[6] = { 'i', 'r', 'e', 's', 't', 'i' };
+static const symbol s_7_38[3] = { 'u', 't', 'i' };
+static const symbol s_7_39[3] = { 'a', 'v', 'i' };
+static const symbol s_7_40[3] = { 'e', 'v', 'i' };
+static const symbol s_7_41[3] = { 'i', 'v', 'i' };
+static const symbol s_7_42[4] = { 'i', 's', 'c', 'o' };
+static const symbol s_7_43[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_7_44[4] = { 'e', 'n', 'd', 'o' };
+static const symbol s_7_45[4] = { 'Y', 'a', 'm', 'o' };
+static const symbol s_7_46[4] = { 'i', 'a', 'm', 'o' };
+static const symbol s_7_47[5] = { 'a', 'v', 'a', 'm', 'o' };
+static const symbol s_7_48[5] = { 'e', 'v', 'a', 'm', 'o' };
+static const symbol s_7_49[5] = { 'i', 'v', 'a', 'm', 'o' };
+static const symbol s_7_50[5] = { 'e', 'r', 'e', 'm', 'o' };
+static const symbol s_7_51[5] = { 'i', 'r', 'e', 'm', 'o' };
+static const symbol s_7_52[6] = { 'a', 's', 's', 'i', 'm', 'o' };
+static const symbol s_7_53[4] = { 'a', 'm', 'm', 'o' };
+static const symbol s_7_54[4] = { 'e', 'm', 'm', 'o' };
+static const symbol s_7_55[6] = { 'e', 'r', 'e', 'm', 'm', 'o' };
+static const symbol s_7_56[6] = { 'i', 'r', 'e', 'm', 'm', 'o' };
+static const symbol s_7_57[4] = { 'i', 'm', 'm', 'o' };
+static const symbol s_7_58[3] = { 'a', 'n', 'o' };
+static const symbol s_7_59[6] = { 'i', 's', 'c', 'a', 'n', 'o' };
+static const symbol s_7_60[5] = { 'a', 'v', 'a', 'n', 'o' };
+static const symbol s_7_61[5] = { 'e', 'v', 'a', 'n', 'o' };
+static const symbol s_7_62[5] = { 'i', 'v', 'a', 'n', 'o' };
+static const symbol s_7_63[6] = { 'e', 'r', 'a', 'n', 'n', 'o' };
+static const symbol s_7_64[6] = { 'i', 'r', 'a', 'n', 'n', 'o' };
+static const symbol s_7_65[3] = { 'o', 'n', 'o' };
+static const symbol s_7_66[6] = { 'i', 's', 'c', 'o', 'n', 'o' };
+static const symbol s_7_67[5] = { 'a', 'r', 'o', 'n', 'o' };
+static const symbol s_7_68[5] = { 'e', 'r', 'o', 'n', 'o' };
+static const symbol s_7_69[5] = { 'i', 'r', 'o', 'n', 'o' };
+static const symbol s_7_70[8] = { 'e', 'r', 'e', 'b', 'b', 'e', 'r', 'o' };
+static const symbol s_7_71[8] = { 'i', 'r', 'e', 'b', 'b', 'e', 'r', 'o' };
+static const symbol s_7_72[6] = { 'a', 's', 's', 'e', 'r', 'o' };
+static const symbol s_7_73[6] = { 'e', 's', 's', 'e', 'r', 'o' };
+static const symbol s_7_74[6] = { 'i', 's', 's', 'e', 'r', 'o' };
+static const symbol s_7_75[3] = { 'a', 't', 'o' };
+static const symbol s_7_76[3] = { 'i', 't', 'o' };
+static const symbol s_7_77[3] = { 'u', 't', 'o' };
+static const symbol s_7_78[3] = { 'a', 'v', 'o' };
+static const symbol s_7_79[3] = { 'e', 'v', 'o' };
+static const symbol s_7_80[3] = { 'i', 'v', 'o' };
+static const symbol s_7_81[2] = { 'a', 'r' };
+static const symbol s_7_82[2] = { 'i', 'r' };
+static const symbol s_7_83[4] = { 'e', 'r', 0xC3, 0xA0 };
+static const symbol s_7_84[4] = { 'i', 'r', 0xC3, 0xA0 };
+static const symbol s_7_85[4] = { 'e', 'r', 0xC3, 0xB2 };
+static const symbol s_7_86[4] = { 'i', 'r', 0xC3, 0xB2 };
+
+static const struct among a_7[87] =
+{
+/*  0 */ { 4, s_7_0, -1, 1, 0},
+/*  1 */ { 4, s_7_1, -1, 1, 0},
+/*  2 */ { 3, s_7_2, -1, 1, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 3, s_7_4, -1, 1, 0},
+/*  5 */ { 3, s_7_5, -1, 1, 0},
+/*  6 */ { 3, s_7_6, -1, 1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 6, s_7_8, -1, 1, 0},
+/*  9 */ { 6, s_7_9, -1, 1, 0},
+/* 10 */ { 4, s_7_10, -1, 1, 0},
+/* 11 */ { 4, s_7_11, -1, 1, 0},
+/* 12 */ { 3, s_7_12, -1, 1, 0},
+/* 13 */ { 3, s_7_13, -1, 1, 0},
+/* 14 */ { 3, s_7_14, -1, 1, 0},
+/* 15 */ { 4, s_7_15, -1, 1, 0},
+/* 16 */ { 3, s_7_16, -1, 1, 0},
+/* 17 */ { 5, s_7_17, 16, 1, 0},
+/* 18 */ { 5, s_7_18, 16, 1, 0},
+/* 19 */ { 5, s_7_19, 16, 1, 0},
+/* 20 */ { 3, s_7_20, -1, 1, 0},
+/* 21 */ { 5, s_7_21, 20, 1, 0},
+/* 22 */ { 5, s_7_22, 20, 1, 0},
+/* 23 */ { 3, s_7_23, -1, 1, 0},
+/* 24 */ { 6, s_7_24, -1, 1, 0},
+/* 25 */ { 6, s_7_25, -1, 1, 0},
+/* 26 */ { 3, s_7_26, -1, 1, 0},
+/* 27 */ { 4, s_7_27, -1, 1, 0},
+/* 28 */ { 4, s_7_28, -1, 1, 0},
+/* 29 */ { 4, s_7_29, -1, 1, 0},
+/* 30 */ { 4, s_7_30, -1, 1, 0},
+/* 31 */ { 4, s_7_31, -1, 1, 0},
+/* 32 */ { 4, s_7_32, -1, 1, 0},
+/* 33 */ { 4, s_7_33, -1, 1, 0},
+/* 34 */ { 3, s_7_34, -1, 1, 0},
+/* 35 */ { 3, s_7_35, -1, 1, 0},
+/* 36 */ { 6, s_7_36, -1, 1, 0},
+/* 37 */ { 6, s_7_37, -1, 1, 0},
+/* 38 */ { 3, s_7_38, -1, 1, 0},
+/* 39 */ { 3, s_7_39, -1, 1, 0},
+/* 40 */ { 3, s_7_40, -1, 1, 0},
+/* 41 */ { 3, s_7_41, -1, 1, 0},
+/* 42 */ { 4, s_7_42, -1, 1, 0},
+/* 43 */ { 4, s_7_43, -1, 1, 0},
+/* 44 */ { 4, s_7_44, -1, 1, 0},
+/* 45 */ { 4, s_7_45, -1, 1, 0},
+/* 46 */ { 4, s_7_46, -1, 1, 0},
+/* 47 */ { 5, s_7_47, -1, 1, 0},
+/* 48 */ { 5, s_7_48, -1, 1, 0},
+/* 49 */ { 5, s_7_49, -1, 1, 0},
+/* 50 */ { 5, s_7_50, -1, 1, 0},
+/* 51 */ { 5, s_7_51, -1, 1, 0},
+/* 52 */ { 6, s_7_52, -1, 1, 0},
+/* 53 */ { 4, s_7_53, -1, 1, 0},
+/* 54 */ { 4, s_7_54, -1, 1, 0},
+/* 55 */ { 6, s_7_55, 54, 1, 0},
+/* 56 */ { 6, s_7_56, 54, 1, 0},
+/* 57 */ { 4, s_7_57, -1, 1, 0},
+/* 58 */ { 3, s_7_58, -1, 1, 0},
+/* 59 */ { 6, s_7_59, 58, 1, 0},
+/* 60 */ { 5, s_7_60, 58, 1, 0},
+/* 61 */ { 5, s_7_61, 58, 1, 0},
+/* 62 */ { 5, s_7_62, 58, 1, 0},
+/* 63 */ { 6, s_7_63, -1, 1, 0},
+/* 64 */ { 6, s_7_64, -1, 1, 0},
+/* 65 */ { 3, s_7_65, -1, 1, 0},
+/* 66 */ { 6, s_7_66, 65, 1, 0},
+/* 67 */ { 5, s_7_67, 65, 1, 0},
+/* 68 */ { 5, s_7_68, 65, 1, 0},
+/* 69 */ { 5, s_7_69, 65, 1, 0},
+/* 70 */ { 8, s_7_70, -1, 1, 0},
+/* 71 */ { 8, s_7_71, -1, 1, 0},
+/* 72 */ { 6, s_7_72, -1, 1, 0},
+/* 73 */ { 6, s_7_73, -1, 1, 0},
+/* 74 */ { 6, s_7_74, -1, 1, 0},
+/* 75 */ { 3, s_7_75, -1, 1, 0},
+/* 76 */ { 3, s_7_76, -1, 1, 0},
+/* 77 */ { 3, s_7_77, -1, 1, 0},
+/* 78 */ { 3, s_7_78, -1, 1, 0},
+/* 79 */ { 3, s_7_79, -1, 1, 0},
+/* 80 */ { 3, s_7_80, -1, 1, 0},
+/* 81 */ { 2, s_7_81, -1, 1, 0},
+/* 82 */ { 2, s_7_82, -1, 1, 0},
+/* 83 */ { 4, s_7_83, -1, 1, 0},
+/* 84 */ { 4, s_7_84, -1, 1, 0},
+/* 85 */ { 4, s_7_85, -1, 1, 0},
+/* 86 */ { 4, s_7_86, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 8, 2, 1 };
+
+static const unsigned char g_AEIO[] = { 17, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 8, 2 };
+
+static const unsigned char g_CG[] = { 17 };
+
+static const symbol s_0[] = { 0xC3, 0xA0 };
+static const symbol s_1[] = { 0xC3, 0xA8 };
+static const symbol s_2[] = { 0xC3, 0xAC };
+static const symbol s_3[] = { 0xC3, 0xB2 };
+static const symbol s_4[] = { 0xC3, 0xB9 };
+static const symbol s_5[] = { 'q', 'U' };
+static const symbol s_6[] = { 'u' };
+static const symbol s_7[] = { 'U' };
+static const symbol s_8[] = { 'i' };
+static const symbol s_9[] = { 'I' };
+static const symbol s_10[] = { 'i' };
+static const symbol s_11[] = { 'u' };
+static const symbol s_12[] = { 'e' };
+static const symbol s_13[] = { 'i', 'c' };
+static const symbol s_14[] = { 'l', 'o', 'g' };
+static const symbol s_15[] = { 'u' };
+static const symbol s_16[] = { 'e', 'n', 't', 'e' };
+static const symbol s_17[] = { 'a', 't' };
+static const symbol s_18[] = { 'a', 't' };
+static const symbol s_19[] = { 'i', 'c' };
+static const symbol s_20[] = { 'i' };
+static const symbol s_21[] = { 'h' };
+
+static int r_prelude(struct SN_env * z) {
+    int among_var;
+    {   int c_test = z->c; /* test, line 35 */
+        while(1) { /* repeat, line 35 */
+            int c1 = z->c;
+            z->bra = z->c; /* [, line 36 */
+            among_var = find_among(z, a_0, 7); /* substring, line 36 */
+            if (!(among_var)) goto lab0;
+            z->ket = z->c; /* ], line 36 */
+            switch(among_var) {
+                case 0: goto lab0;
+                case 1:
+                    {   int ret = slice_from_s(z, 2, s_0); /* <-, line 37 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    {   int ret = slice_from_s(z, 2, s_1); /* <-, line 38 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    {   int ret = slice_from_s(z, 2, s_2); /* <-, line 39 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 4:
+                    {   int ret = slice_from_s(z, 2, s_3); /* <-, line 40 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 5:
+                    {   int ret = slice_from_s(z, 2, s_4); /* <-, line 41 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 6:
+                    {   int ret = slice_from_s(z, 2, s_5); /* <-, line 42 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 7:
+                    {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                        if (ret < 0) goto lab0;
+                        z->c = ret; /* next, line 43 */
+                    }
+                    break;
+            }
+            continue;
+        lab0:
+            z->c = c1;
+            break;
+        }
+        z->c = c_test;
+    }
+    while(1) { /* repeat, line 46 */
+        int c2 = z->c;
+        while(1) { /* goto, line 46 */
+            int c3 = z->c;
+            if (in_grouping_U(z, g_v, 97, 249, 0)) goto lab2;
+            z->bra = z->c; /* [, line 47 */
+            {   int c4 = z->c; /* or, line 47 */
+                if (!(eq_s(z, 1, s_6))) goto lab4;
+                z->ket = z->c; /* ], line 47 */
+                if (in_grouping_U(z, g_v, 97, 249, 0)) goto lab4;
+                {   int ret = slice_from_s(z, 1, s_7); /* <-, line 47 */
+                    if (ret < 0) return ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c4;
+                if (!(eq_s(z, 1, s_8))) goto lab2;
+                z->ket = z->c; /* ], line 48 */
+                if (in_grouping_U(z, g_v, 97, 249, 0)) goto lab2;
+                {   int ret = slice_from_s(z, 1, s_9); /* <-, line 48 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab3:
+            z->c = c3;
+            break;
+        lab2:
+            z->c = c3;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab1;
+                z->c = ret; /* goto, line 46 */
+            }
+        }
+        continue;
+    lab1:
+        z->c = c2;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 58 */
+        {   int c2 = z->c; /* or, line 60 */
+            if (in_grouping_U(z, g_v, 97, 249, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 59 */
+                if (out_grouping_U(z, g_v, 97, 249, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 59 */
+                    int ret = out_grouping_U(z, g_v, 97, 249, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping_U(z, g_v, 97, 249, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 59 */
+                    int ret = in_grouping_U(z, g_v, 97, 249, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping_U(z, g_v, 97, 249, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 61 */
+                if (out_grouping_U(z, g_v, 97, 249, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 61 */
+                    int ret = out_grouping_U(z, g_v, 97, 249, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping_U(z, g_v, 97, 249, 0)) goto lab0;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 61 */
+                }
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 62 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 64 */
+        {    /* gopast */ /* grouping v, line 65 */
+            int ret = out_grouping_U(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 65 */
+            int ret = in_grouping_U(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 65 */
+        {    /* gopast */ /* grouping v, line 66 */
+            int ret = out_grouping_U(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 66 */
+            int ret = in_grouping_U(z, g_v, 97, 249, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 66 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 70 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 72 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 73 && z->p[z->c + 0] != 85)) among_var = 3; else
+        among_var = find_among(z, a_1, 3); /* substring, line 72 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 72 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_10); /* <-, line 73 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_11); /* <-, line 74 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 75 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_attached_pronoun(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 87 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((33314 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    if (!(find_among_b(z, a_2, 37))) return 0; /* substring, line 87 */
+    z->bra = z->c; /* ], line 87 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 111 && z->p[z->c - 1] != 114)) return 0;
+    among_var = find_among_b(z, a_3, 5); /* among, line 97 */
+    if (!(among_var)) return 0;
+    {   int ret = r_RV(z);
+        if (ret == 0) return 0; /* call RV, line 97 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 98 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_12); /* <-, line 99 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 104 */
+    among_var = find_among_b(z, a_6, 51); /* substring, line 104 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 104 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 111 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 111 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 113 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 113 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 114 */
+                z->ket = z->c; /* [, line 114 */
+                if (!(eq_s_b(z, 2, s_13))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 114 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 114 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 114 */
+                    if (ret < 0) return ret;
+                }
+            lab0:
+                ;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 117 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_14); /* <-, line 117 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 119 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_15); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 121 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 4, s_16); /* <-, line 121 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 123 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 123 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 125 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 125 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 126 */
+                z->ket = z->c; /* [, line 127 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4722696 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab1; }
+                among_var = find_among_b(z, a_4, 4); /* substring, line 127 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab1; }
+                z->bra = z->c; /* ], line 127 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 127 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 127 */
+                    if (ret < 0) return ret;
+                }
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab1; }
+                    case 1:
+                        z->ket = z->c; /* [, line 128 */
+                        if (!(eq_s_b(z, 2, s_17))) { z->c = z->l - m_keep; goto lab1; }
+                        z->bra = z->c; /* ], line 128 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 128 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 128 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab1:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 135 */
+                z->ket = z->c; /* [, line 136 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab2; }
+                among_var = find_among_b(z, a_5, 3); /* substring, line 136 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab2; }
+                z->bra = z->c; /* ], line 136 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab2; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call R2, line 137 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 137 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab2:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 142 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 142 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 143 */
+                z->ket = z->c; /* [, line 143 */
+                if (!(eq_s_b(z, 2, s_18))) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 143 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 143 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 143 */
+                    if (ret < 0) return ret;
+                }
+                z->ket = z->c; /* [, line 143 */
+                if (!(eq_s_b(z, 2, s_19))) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 143 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 143 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 143 */
+                    if (ret < 0) return ret;
+                }
+            lab3:
+                ;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 148 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 148 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 149 */
+        among_var = find_among_b(z, a_7, 87); /* substring, line 149 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 149 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 163 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_vowel_suffix(struct SN_env * z) {
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 171 */
+        z->ket = z->c; /* [, line 172 */
+        if (in_grouping_b_U(z, g_AEIO, 97, 242, 0)) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 172 */
+        {   int ret = r_RV(z);
+            if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call RV, line 172 */
+            if (ret < 0) return ret;
+        }
+        {   int ret = slice_del(z); /* delete, line 172 */
+            if (ret < 0) return ret;
+        }
+        z->ket = z->c; /* [, line 173 */
+        if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 173 */
+        {   int ret = r_RV(z);
+            if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call RV, line 173 */
+            if (ret < 0) return ret;
+        }
+        {   int ret = slice_del(z); /* delete, line 173 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        ;
+    }
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 175 */
+        z->ket = z->c; /* [, line 176 */
+        if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m_keep; goto lab1; }
+        z->bra = z->c; /* ], line 176 */
+        if (in_grouping_b_U(z, g_CG, 99, 103, 0)) { z->c = z->l - m_keep; goto lab1; }
+        {   int ret = r_RV(z);
+            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call RV, line 176 */
+            if (ret < 0) return ret;
+        }
+        {   int ret = slice_del(z); /* delete, line 176 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        ;
+    }
+    return 1;
+}
+
+extern int italian_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 182 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 182 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 183 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 183 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 184 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 185 */
+        {   int ret = r_attached_pronoun(z);
+            if (ret == 0) goto lab2; /* call attached_pronoun, line 185 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 186 */
+        {   int m5 = z->l - z->c; (void)m5; /* or, line 186 */
+            {   int ret = r_standard_suffix(z);
+                if (ret == 0) goto lab5; /* call standard_suffix, line 186 */
+                if (ret < 0) return ret;
+            }
+            goto lab4;
+        lab5:
+            z->c = z->l - m5;
+            {   int ret = r_verb_suffix(z);
+                if (ret == 0) goto lab3; /* call verb_suffix, line 186 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab4:
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m6 = z->l - z->c; (void)m6; /* do, line 187 */
+        {   int ret = r_vowel_suffix(z);
+            if (ret == 0) goto lab6; /* call vowel_suffix, line 187 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m6;
+    }
+    z->c = z->lb;
+    {   int c7 = z->c; /* do, line 189 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab7; /* call postlude, line 189 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = c7;
+    }
+    return 1;
+}
+
+extern struct SN_env * italian_UTF_8_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void italian_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_norwegian.c b/src/backend/snowball/libstemmer/stem_UTF_8_norwegian.c
new file mode 100644
index 000000000000..cbb0cd4601c2
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_norwegian.c
@@ -0,0 +1,299 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int norwegian_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_other_suffix(struct SN_env * z);
+static int r_consonant_pair(struct SN_env * z);
+static int r_main_suffix(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * norwegian_UTF_8_create_env(void);
+extern void norwegian_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[1] = { 'a' };
+static const symbol s_0_1[1] = { 'e' };
+static const symbol s_0_2[3] = { 'e', 'd', 'e' };
+static const symbol s_0_3[4] = { 'a', 'n', 'd', 'e' };
+static const symbol s_0_4[4] = { 'e', 'n', 'd', 'e' };
+static const symbol s_0_5[3] = { 'a', 'n', 'e' };
+static const symbol s_0_6[3] = { 'e', 'n', 'e' };
+static const symbol s_0_7[6] = { 'h', 'e', 't', 'e', 'n', 'e' };
+static const symbol s_0_8[4] = { 'e', 'r', 't', 'e' };
+static const symbol s_0_9[2] = { 'e', 'n' };
+static const symbol s_0_10[5] = { 'h', 'e', 't', 'e', 'n' };
+static const symbol s_0_11[2] = { 'a', 'r' };
+static const symbol s_0_12[2] = { 'e', 'r' };
+static const symbol s_0_13[5] = { 'h', 'e', 't', 'e', 'r' };
+static const symbol s_0_14[1] = { 's' };
+static const symbol s_0_15[2] = { 'a', 's' };
+static const symbol s_0_16[2] = { 'e', 's' };
+static const symbol s_0_17[4] = { 'e', 'd', 'e', 's' };
+static const symbol s_0_18[5] = { 'e', 'n', 'd', 'e', 's' };
+static const symbol s_0_19[4] = { 'e', 'n', 'e', 's' };
+static const symbol s_0_20[7] = { 'h', 'e', 't', 'e', 'n', 'e', 's' };
+static const symbol s_0_21[3] = { 'e', 'n', 's' };
+static const symbol s_0_22[6] = { 'h', 'e', 't', 'e', 'n', 's' };
+static const symbol s_0_23[3] = { 'e', 'r', 's' };
+static const symbol s_0_24[3] = { 'e', 't', 's' };
+static const symbol s_0_25[2] = { 'e', 't' };
+static const symbol s_0_26[3] = { 'h', 'e', 't' };
+static const symbol s_0_27[3] = { 'e', 'r', 't' };
+static const symbol s_0_28[3] = { 'a', 's', 't' };
+
+static const struct among a_0[29] =
+{
+/*  0 */ { 1, s_0_0, -1, 1, 0},
+/*  1 */ { 1, s_0_1, -1, 1, 0},
+/*  2 */ { 3, s_0_2, 1, 1, 0},
+/*  3 */ { 4, s_0_3, 1, 1, 0},
+/*  4 */ { 4, s_0_4, 1, 1, 0},
+/*  5 */ { 3, s_0_5, 1, 1, 0},
+/*  6 */ { 3, s_0_6, 1, 1, 0},
+/*  7 */ { 6, s_0_7, 6, 1, 0},
+/*  8 */ { 4, s_0_8, 1, 3, 0},
+/*  9 */ { 2, s_0_9, -1, 1, 0},
+/* 10 */ { 5, s_0_10, 9, 1, 0},
+/* 11 */ { 2, s_0_11, -1, 1, 0},
+/* 12 */ { 2, s_0_12, -1, 1, 0},
+/* 13 */ { 5, s_0_13, 12, 1, 0},
+/* 14 */ { 1, s_0_14, -1, 2, 0},
+/* 15 */ { 2, s_0_15, 14, 1, 0},
+/* 16 */ { 2, s_0_16, 14, 1, 0},
+/* 17 */ { 4, s_0_17, 16, 1, 0},
+/* 18 */ { 5, s_0_18, 16, 1, 0},
+/* 19 */ { 4, s_0_19, 16, 1, 0},
+/* 20 */ { 7, s_0_20, 19, 1, 0},
+/* 21 */ { 3, s_0_21, 14, 1, 0},
+/* 22 */ { 6, s_0_22, 21, 1, 0},
+/* 23 */ { 3, s_0_23, 14, 1, 0},
+/* 24 */ { 3, s_0_24, 14, 1, 0},
+/* 25 */ { 2, s_0_25, -1, 1, 0},
+/* 26 */ { 3, s_0_26, 25, 1, 0},
+/* 27 */ { 3, s_0_27, -1, 3, 0},
+/* 28 */ { 3, s_0_28, -1, 1, 0}
+};
+
+static const symbol s_1_0[2] = { 'd', 't' };
+static const symbol s_1_1[2] = { 'v', 't' };
+
+static const struct among a_1[2] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0}
+};
+
+static const symbol s_2_0[3] = { 'l', 'e', 'g' };
+static const symbol s_2_1[4] = { 'e', 'l', 'e', 'g' };
+static const symbol s_2_2[2] = { 'i', 'g' };
+static const symbol s_2_3[3] = { 'e', 'i', 'g' };
+static const symbol s_2_4[3] = { 'l', 'i', 'g' };
+static const symbol s_2_5[4] = { 'e', 'l', 'i', 'g' };
+static const symbol s_2_6[3] = { 'e', 'l', 's' };
+static const symbol s_2_7[3] = { 'l', 'o', 'v' };
+static const symbol s_2_8[4] = { 'e', 'l', 'o', 'v' };
+static const symbol s_2_9[4] = { 's', 'l', 'o', 'v' };
+static const symbol s_2_10[7] = { 'h', 'e', 't', 's', 'l', 'o', 'v' };
+
+static const struct among a_2[11] =
+{
+/*  0 */ { 3, s_2_0, -1, 1, 0},
+/*  1 */ { 4, s_2_1, 0, 1, 0},
+/*  2 */ { 2, s_2_2, -1, 1, 0},
+/*  3 */ { 3, s_2_3, 2, 1, 0},
+/*  4 */ { 3, s_2_4, 2, 1, 0},
+/*  5 */ { 4, s_2_5, 4, 1, 0},
+/*  6 */ { 3, s_2_6, -1, 1, 0},
+/*  7 */ { 3, s_2_7, -1, 1, 0},
+/*  8 */ { 4, s_2_8, 7, 1, 0},
+/*  9 */ { 4, s_2_9, 7, 1, 0},
+/* 10 */ { 7, s_2_10, 9, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 128 };
+
+static const unsigned char g_s_ending[] = { 119, 125, 149, 1 };
+
+static const symbol s_0[] = { 'k' };
+static const symbol s_1[] = { 'e', 'r' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c_test = z->c; /* test, line 30 */
+        {   int ret = skip_utf8(z->p, z->c, 0, z->l, + 3);
+            if (ret < 0) return 0;
+            z->c = ret; /* hop, line 30 */
+        }
+        z->I[1] = z->c; /* setmark x, line 30 */
+        z->c = c_test;
+    }
+    if (out_grouping_U(z, g_v, 97, 248, 1) < 0) return 0; /* goto */ /* grouping v, line 31 */
+    {    /* gopast */ /* non v, line 31 */
+        int ret = in_grouping_U(z, g_v, 97, 248, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 31 */
+     /* try, line 32 */
+    if (!(z->I[0] < z->I[1])) goto lab0;
+    z->I[0] = z->I[1];
+lab0:
+    return 1;
+}
+
+static int r_main_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 38 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 38 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 38 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851426 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_0, 29); /* substring, line 38 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 38 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 44 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m2 = z->l - z->c; (void)m2; /* or, line 46 */
+                if (in_grouping_b_U(z, g_s_ending, 98, 122, 0)) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m2;
+                if (!(eq_s_b(z, 1, s_0))) return 0;
+                if (out_grouping_b_U(z, g_v, 97, 248, 0)) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 46 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 2, s_1); /* <-, line 48 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_consonant_pair(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 53 */
+        {   int mlimit; /* setlimit, line 54 */
+            int m1 = z->l - z->c; (void)m1;
+            if (z->c < z->I[0]) return 0;
+            z->c = z->I[0]; /* tomark, line 54 */
+            mlimit = z->lb; z->lb = z->c;
+            z->c = z->l - m1;
+            z->ket = z->c; /* [, line 54 */
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] != 116) { z->lb = mlimit; return 0; }
+            if (!(find_among_b(z, a_1, 2))) { z->lb = mlimit; return 0; } /* substring, line 54 */
+            z->bra = z->c; /* ], line 54 */
+            z->lb = mlimit;
+        }
+        z->c = z->l - m_test;
+    }
+    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+        if (ret < 0) return 0;
+        z->c = ret; /* next, line 59 */
+    }
+    z->bra = z->c; /* ], line 59 */
+    {   int ret = slice_del(z); /* delete, line 59 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_other_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 63 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 63 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 63 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4718720 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_2, 11); /* substring, line 63 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 63 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 67 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int norwegian_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 74 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 74 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 75 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 76 */
+        {   int ret = r_main_suffix(z);
+            if (ret == 0) goto lab1; /* call main_suffix, line 76 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 77 */
+        {   int ret = r_consonant_pair(z);
+            if (ret == 0) goto lab2; /* call consonant_pair, line 77 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 78 */
+        {   int ret = r_other_suffix(z);
+            if (ret == 0) goto lab3; /* call other_suffix, line 78 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * norwegian_UTF_8_create_env(void) { return SN_create_env(0, 2, 0); }
+
+extern void norwegian_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_porter.c b/src/backend/snowball/libstemmer/stem_UTF_8_porter.c
new file mode 100644
index 000000000000..421cc0e74a6b
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_porter.c
@@ -0,0 +1,755 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int porter_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_Step_5b(struct SN_env * z);
+static int r_Step_5a(struct SN_env * z);
+static int r_Step_4(struct SN_env * z);
+static int r_Step_3(struct SN_env * z);
+static int r_Step_2(struct SN_env * z);
+static int r_Step_1c(struct SN_env * z);
+static int r_Step_1b(struct SN_env * z);
+static int r_Step_1a(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_shortv(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * porter_UTF_8_create_env(void);
+extern void porter_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[1] = { 's' };
+static const symbol s_0_1[3] = { 'i', 'e', 's' };
+static const symbol s_0_2[4] = { 's', 's', 'e', 's' };
+static const symbol s_0_3[2] = { 's', 's' };
+
+static const struct among a_0[4] =
+{
+/*  0 */ { 1, s_0_0, -1, 3, 0},
+/*  1 */ { 3, s_0_1, 0, 2, 0},
+/*  2 */ { 4, s_0_2, 0, 1, 0},
+/*  3 */ { 2, s_0_3, 0, -1, 0}
+};
+
+static const symbol s_1_1[2] = { 'b', 'b' };
+static const symbol s_1_2[2] = { 'd', 'd' };
+static const symbol s_1_3[2] = { 'f', 'f' };
+static const symbol s_1_4[2] = { 'g', 'g' };
+static const symbol s_1_5[2] = { 'b', 'l' };
+static const symbol s_1_6[2] = { 'm', 'm' };
+static const symbol s_1_7[2] = { 'n', 'n' };
+static const symbol s_1_8[2] = { 'p', 'p' };
+static const symbol s_1_9[2] = { 'r', 'r' };
+static const symbol s_1_10[2] = { 'a', 't' };
+static const symbol s_1_11[2] = { 't', 't' };
+static const symbol s_1_12[2] = { 'i', 'z' };
+
+static const struct among a_1[13] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 2, s_1_1, 0, 2, 0},
+/*  2 */ { 2, s_1_2, 0, 2, 0},
+/*  3 */ { 2, s_1_3, 0, 2, 0},
+/*  4 */ { 2, s_1_4, 0, 2, 0},
+/*  5 */ { 2, s_1_5, 0, 1, 0},
+/*  6 */ { 2, s_1_6, 0, 2, 0},
+/*  7 */ { 2, s_1_7, 0, 2, 0},
+/*  8 */ { 2, s_1_8, 0, 2, 0},
+/*  9 */ { 2, s_1_9, 0, 2, 0},
+/* 10 */ { 2, s_1_10, 0, 1, 0},
+/* 11 */ { 2, s_1_11, 0, 2, 0},
+/* 12 */ { 2, s_1_12, 0, 1, 0}
+};
+
+static const symbol s_2_0[2] = { 'e', 'd' };
+static const symbol s_2_1[3] = { 'e', 'e', 'd' };
+static const symbol s_2_2[3] = { 'i', 'n', 'g' };
+
+static const struct among a_2[3] =
+{
+/*  0 */ { 2, s_2_0, -1, 2, 0},
+/*  1 */ { 3, s_2_1, 0, 1, 0},
+/*  2 */ { 3, s_2_2, -1, 2, 0}
+};
+
+static const symbol s_3_0[4] = { 'a', 'n', 'c', 'i' };
+static const symbol s_3_1[4] = { 'e', 'n', 'c', 'i' };
+static const symbol s_3_2[4] = { 'a', 'b', 'l', 'i' };
+static const symbol s_3_3[3] = { 'e', 'l', 'i' };
+static const symbol s_3_4[4] = { 'a', 'l', 'l', 'i' };
+static const symbol s_3_5[5] = { 'o', 'u', 's', 'l', 'i' };
+static const symbol s_3_6[5] = { 'e', 'n', 't', 'l', 'i' };
+static const symbol s_3_7[5] = { 'a', 'l', 'i', 't', 'i' };
+static const symbol s_3_8[6] = { 'b', 'i', 'l', 'i', 't', 'i' };
+static const symbol s_3_9[5] = { 'i', 'v', 'i', 't', 'i' };
+static const symbol s_3_10[6] = { 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_3_11[7] = { 'a', 't', 'i', 'o', 'n', 'a', 'l' };
+static const symbol s_3_12[5] = { 'a', 'l', 'i', 's', 'm' };
+static const symbol s_3_13[5] = { 'a', 't', 'i', 'o', 'n' };
+static const symbol s_3_14[7] = { 'i', 'z', 'a', 't', 'i', 'o', 'n' };
+static const symbol s_3_15[4] = { 'i', 'z', 'e', 'r' };
+static const symbol s_3_16[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_3_17[7] = { 'i', 'v', 'e', 'n', 'e', 's', 's' };
+static const symbol s_3_18[7] = { 'f', 'u', 'l', 'n', 'e', 's', 's' };
+static const symbol s_3_19[7] = { 'o', 'u', 's', 'n', 'e', 's', 's' };
+
+static const struct among a_3[20] =
+{
+/*  0 */ { 4, s_3_0, -1, 3, 0},
+/*  1 */ { 4, s_3_1, -1, 2, 0},
+/*  2 */ { 4, s_3_2, -1, 4, 0},
+/*  3 */ { 3, s_3_3, -1, 6, 0},
+/*  4 */ { 4, s_3_4, -1, 9, 0},
+/*  5 */ { 5, s_3_5, -1, 12, 0},
+/*  6 */ { 5, s_3_6, -1, 5, 0},
+/*  7 */ { 5, s_3_7, -1, 10, 0},
+/*  8 */ { 6, s_3_8, -1, 14, 0},
+/*  9 */ { 5, s_3_9, -1, 13, 0},
+/* 10 */ { 6, s_3_10, -1, 1, 0},
+/* 11 */ { 7, s_3_11, 10, 8, 0},
+/* 12 */ { 5, s_3_12, -1, 10, 0},
+/* 13 */ { 5, s_3_13, -1, 8, 0},
+/* 14 */ { 7, s_3_14, 13, 7, 0},
+/* 15 */ { 4, s_3_15, -1, 7, 0},
+/* 16 */ { 4, s_3_16, -1, 8, 0},
+/* 17 */ { 7, s_3_17, -1, 13, 0},
+/* 18 */ { 7, s_3_18, -1, 11, 0},
+/* 19 */ { 7, s_3_19, -1, 12, 0}
+};
+
+static const symbol s_4_0[5] = { 'i', 'c', 'a', 't', 'e' };
+static const symbol s_4_1[5] = { 'a', 't', 'i', 'v', 'e' };
+static const symbol s_4_2[5] = { 'a', 'l', 'i', 'z', 'e' };
+static const symbol s_4_3[5] = { 'i', 'c', 'i', 't', 'i' };
+static const symbol s_4_4[4] = { 'i', 'c', 'a', 'l' };
+static const symbol s_4_5[3] = { 'f', 'u', 'l' };
+static const symbol s_4_6[4] = { 'n', 'e', 's', 's' };
+
+static const struct among a_4[7] =
+{
+/*  0 */ { 5, s_4_0, -1, 2, 0},
+/*  1 */ { 5, s_4_1, -1, 3, 0},
+/*  2 */ { 5, s_4_2, -1, 1, 0},
+/*  3 */ { 5, s_4_3, -1, 2, 0},
+/*  4 */ { 4, s_4_4, -1, 2, 0},
+/*  5 */ { 3, s_4_5, -1, 3, 0},
+/*  6 */ { 4, s_4_6, -1, 3, 0}
+};
+
+static const symbol s_5_0[2] = { 'i', 'c' };
+static const symbol s_5_1[4] = { 'a', 'n', 'c', 'e' };
+static const symbol s_5_2[4] = { 'e', 'n', 'c', 'e' };
+static const symbol s_5_3[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_5_4[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_5_5[3] = { 'a', 't', 'e' };
+static const symbol s_5_6[3] = { 'i', 'v', 'e' };
+static const symbol s_5_7[3] = { 'i', 'z', 'e' };
+static const symbol s_5_8[3] = { 'i', 't', 'i' };
+static const symbol s_5_9[2] = { 'a', 'l' };
+static const symbol s_5_10[3] = { 'i', 's', 'm' };
+static const symbol s_5_11[3] = { 'i', 'o', 'n' };
+static const symbol s_5_12[2] = { 'e', 'r' };
+static const symbol s_5_13[3] = { 'o', 'u', 's' };
+static const symbol s_5_14[3] = { 'a', 'n', 't' };
+static const symbol s_5_15[3] = { 'e', 'n', 't' };
+static const symbol s_5_16[4] = { 'm', 'e', 'n', 't' };
+static const symbol s_5_17[5] = { 'e', 'm', 'e', 'n', 't' };
+static const symbol s_5_18[2] = { 'o', 'u' };
+
+static const struct among a_5[19] =
+{
+/*  0 */ { 2, s_5_0, -1, 1, 0},
+/*  1 */ { 4, s_5_1, -1, 1, 0},
+/*  2 */ { 4, s_5_2, -1, 1, 0},
+/*  3 */ { 4, s_5_3, -1, 1, 0},
+/*  4 */ { 4, s_5_4, -1, 1, 0},
+/*  5 */ { 3, s_5_5, -1, 1, 0},
+/*  6 */ { 3, s_5_6, -1, 1, 0},
+/*  7 */ { 3, s_5_7, -1, 1, 0},
+/*  8 */ { 3, s_5_8, -1, 1, 0},
+/*  9 */ { 2, s_5_9, -1, 1, 0},
+/* 10 */ { 3, s_5_10, -1, 1, 0},
+/* 11 */ { 3, s_5_11, -1, 2, 0},
+/* 12 */ { 2, s_5_12, -1, 1, 0},
+/* 13 */ { 3, s_5_13, -1, 1, 0},
+/* 14 */ { 3, s_5_14, -1, 1, 0},
+/* 15 */ { 3, s_5_15, -1, 1, 0},
+/* 16 */ { 4, s_5_16, 15, 1, 0},
+/* 17 */ { 5, s_5_17, 16, 1, 0},
+/* 18 */ { 2, s_5_18, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1 };
+
+static const unsigned char g_v_WXY[] = { 1, 17, 65, 208, 1 };
+
+static const symbol s_0[] = { 's', 's' };
+static const symbol s_1[] = { 'i' };
+static const symbol s_2[] = { 'e', 'e' };
+static const symbol s_3[] = { 'e' };
+static const symbol s_4[] = { 'e' };
+static const symbol s_5[] = { 'y' };
+static const symbol s_6[] = { 'Y' };
+static const symbol s_7[] = { 'i' };
+static const symbol s_8[] = { 't', 'i', 'o', 'n' };
+static const symbol s_9[] = { 'e', 'n', 'c', 'e' };
+static const symbol s_10[] = { 'a', 'n', 'c', 'e' };
+static const symbol s_11[] = { 'a', 'b', 'l', 'e' };
+static const symbol s_12[] = { 'e', 'n', 't' };
+static const symbol s_13[] = { 'e' };
+static const symbol s_14[] = { 'i', 'z', 'e' };
+static const symbol s_15[] = { 'a', 't', 'e' };
+static const symbol s_16[] = { 'a', 'l' };
+static const symbol s_17[] = { 'a', 'l' };
+static const symbol s_18[] = { 'f', 'u', 'l' };
+static const symbol s_19[] = { 'o', 'u', 's' };
+static const symbol s_20[] = { 'i', 'v', 'e' };
+static const symbol s_21[] = { 'b', 'l', 'e' };
+static const symbol s_22[] = { 'a', 'l' };
+static const symbol s_23[] = { 'i', 'c' };
+static const symbol s_24[] = { 's' };
+static const symbol s_25[] = { 't' };
+static const symbol s_26[] = { 'e' };
+static const symbol s_27[] = { 'l' };
+static const symbol s_28[] = { 'l' };
+static const symbol s_29[] = { 'y' };
+static const symbol s_30[] = { 'Y' };
+static const symbol s_31[] = { 'y' };
+static const symbol s_32[] = { 'Y' };
+static const symbol s_33[] = { 'Y' };
+static const symbol s_34[] = { 'y' };
+
+static int r_shortv(struct SN_env * z) {
+    if (out_grouping_b_U(z, g_v_WXY, 89, 121, 0)) return 0;
+    if (in_grouping_b_U(z, g_v, 97, 121, 0)) return 0;
+    if (out_grouping_b_U(z, g_v, 97, 121, 0)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_Step_1a(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 25 */
+    if (z->c <= z->lb || z->p[z->c - 1] != 115) return 0;
+    among_var = find_among_b(z, a_0, 4); /* substring, line 25 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 25 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 2, s_0); /* <-, line 26 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_1); /* <-, line 27 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 29 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1b(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 34 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 100 && z->p[z->c - 1] != 103)) return 0;
+    among_var = find_among_b(z, a_2, 3); /* substring, line 34 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 34 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 35 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 2, s_2); /* <-, line 35 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m_test = z->l - z->c; /* test, line 38 */
+                {    /* gopast */ /* grouping v, line 38 */
+                    int ret = out_grouping_b_U(z, g_v, 97, 121, 1);
+                    if (ret < 0) return 0;
+                    z->c -= ret;
+                }
+                z->c = z->l - m_test;
+            }
+            {   int ret = slice_del(z); /* delete, line 38 */
+                if (ret < 0) return ret;
+            }
+            {   int m_test = z->l - z->c; /* test, line 39 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((68514004 >> (z->p[z->c - 1] & 0x1f)) & 1)) among_var = 3; else
+                among_var = find_among_b(z, a_1, 13); /* substring, line 39 */
+                if (!(among_var)) return 0;
+                z->c = z->l - m_test;
+            }
+            switch(among_var) {
+                case 0: return 0;
+                case 1:
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_3); /* <+, line 41 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 2:
+                    z->ket = z->c; /* [, line 44 */
+                    {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                        if (ret < 0) return 0;
+                        z->c = ret; /* next, line 44 */
+                    }
+                    z->bra = z->c; /* ], line 44 */
+                    {   int ret = slice_del(z); /* delete, line 44 */
+                        if (ret < 0) return ret;
+                    }
+                    break;
+                case 3:
+                    if (z->c != z->I[0]) return 0; /* atmark, line 45 */
+                    {   int m_test = z->l - z->c; /* test, line 45 */
+                        {   int ret = r_shortv(z);
+                            if (ret == 0) return 0; /* call shortv, line 45 */
+                            if (ret < 0) return ret;
+                        }
+                        z->c = z->l - m_test;
+                    }
+                    {   int c_keep = z->c;
+                        int ret = insert_s(z, z->c, z->c, 1, s_4); /* <+, line 45 */
+                        z->c = c_keep;
+                        if (ret < 0) return ret;
+                    }
+                    break;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_1c(struct SN_env * z) {
+    z->ket = z->c; /* [, line 52 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 52 */
+        if (!(eq_s_b(z, 1, s_5))) goto lab1;
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        if (!(eq_s_b(z, 1, s_6))) return 0;
+    }
+lab0:
+    z->bra = z->c; /* ], line 52 */
+    {    /* gopast */ /* grouping v, line 53 */
+        int ret = out_grouping_b_U(z, g_v, 97, 121, 1);
+        if (ret < 0) return 0;
+        z->c -= ret;
+    }
+    {   int ret = slice_from_s(z, 1, s_7); /* <-, line 54 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_Step_2(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 58 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((815616 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_3, 20); /* substring, line 58 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 58 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 58 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 4, s_8); /* <-, line 59 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 4, s_9); /* <-, line 60 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 4, s_10); /* <-, line 61 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 4, s_11); /* <-, line 62 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = slice_from_s(z, 3, s_12); /* <-, line 63 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 64 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 3, s_14); /* <-, line 66 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 8:
+            {   int ret = slice_from_s(z, 3, s_15); /* <-, line 68 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 9:
+            {   int ret = slice_from_s(z, 2, s_16); /* <-, line 69 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 10:
+            {   int ret = slice_from_s(z, 2, s_17); /* <-, line 71 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 11:
+            {   int ret = slice_from_s(z, 3, s_18); /* <-, line 72 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 12:
+            {   int ret = slice_from_s(z, 3, s_19); /* <-, line 74 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 13:
+            {   int ret = slice_from_s(z, 3, s_20); /* <-, line 76 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 14:
+            {   int ret = slice_from_s(z, 3, s_21); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_3(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 82 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((528928 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_4, 7); /* substring, line 82 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 82 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 82 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 2, s_22); /* <-, line 83 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 2, s_23); /* <-, line 85 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 87 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_4(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 92 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((3961384 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_5, 19); /* substring, line 92 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 92 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 92 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 95 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 96 */
+                if (!(eq_s_b(z, 1, s_24))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_25))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 96 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_Step_5a(struct SN_env * z) {
+    z->ket = z->c; /* [, line 101 */
+    if (!(eq_s_b(z, 1, s_26))) return 0;
+    z->bra = z->c; /* ], line 101 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 102 */
+        {   int ret = r_R2(z);
+            if (ret == 0) goto lab1; /* call R2, line 102 */
+            if (ret < 0) return ret;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int ret = r_R1(z);
+            if (ret == 0) return 0; /* call R1, line 102 */
+            if (ret < 0) return ret;
+        }
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 102 */
+            {   int ret = r_shortv(z);
+                if (ret == 0) goto lab2; /* call shortv, line 102 */
+                if (ret < 0) return ret;
+            }
+            return 0;
+        lab2:
+            z->c = z->l - m2;
+        }
+    }
+lab0:
+    {   int ret = slice_del(z); /* delete, line 103 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_Step_5b(struct SN_env * z) {
+    z->ket = z->c; /* [, line 107 */
+    if (!(eq_s_b(z, 1, s_27))) return 0;
+    z->bra = z->c; /* ], line 107 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 108 */
+        if (ret < 0) return ret;
+    }
+    if (!(eq_s_b(z, 1, s_28))) return 0;
+    {   int ret = slice_del(z); /* delete, line 109 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern int porter_UTF_8_stem(struct SN_env * z) {
+    z->B[0] = 0; /* unset Y_found, line 115 */
+    {   int c1 = z->c; /* do, line 116 */
+        z->bra = z->c; /* [, line 116 */
+        if (!(eq_s(z, 1, s_29))) goto lab0;
+        z->ket = z->c; /* ], line 116 */
+        {   int ret = slice_from_s(z, 1, s_30); /* <-, line 116 */
+            if (ret < 0) return ret;
+        }
+        z->B[0] = 1; /* set Y_found, line 116 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 117 */
+        while(1) { /* repeat, line 117 */
+            int c3 = z->c;
+            while(1) { /* goto, line 117 */
+                int c4 = z->c;
+                if (in_grouping_U(z, g_v, 97, 121, 0)) goto lab3;
+                z->bra = z->c; /* [, line 117 */
+                if (!(eq_s(z, 1, s_31))) goto lab3;
+                z->ket = z->c; /* ], line 117 */
+                z->c = c4;
+                break;
+            lab3:
+                z->c = c4;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab2;
+                    z->c = ret; /* goto, line 117 */
+                }
+            }
+            {   int ret = slice_from_s(z, 1, s_32); /* <-, line 117 */
+                if (ret < 0) return ret;
+            }
+            z->B[0] = 1; /* set Y_found, line 117 */
+            continue;
+        lab2:
+            z->c = c3;
+            break;
+        }
+        z->c = c2;
+    }
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c5 = z->c; /* do, line 121 */
+        {    /* gopast */ /* grouping v, line 122 */
+            int ret = out_grouping_U(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 122 */
+            int ret = in_grouping_U(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[0] = z->c; /* setmark p1, line 122 */
+        {    /* gopast */ /* grouping v, line 123 */
+            int ret = out_grouping_U(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 123 */
+            int ret = in_grouping_U(z, g_v, 97, 121, 1);
+            if (ret < 0) goto lab4;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p2, line 123 */
+    lab4:
+        z->c = c5;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 126 */
+
+    {   int m6 = z->l - z->c; (void)m6; /* do, line 127 */
+        {   int ret = r_Step_1a(z);
+            if (ret == 0) goto lab5; /* call Step_1a, line 127 */
+            if (ret < 0) return ret;
+        }
+    lab5:
+        z->c = z->l - m6;
+    }
+    {   int m7 = z->l - z->c; (void)m7; /* do, line 128 */
+        {   int ret = r_Step_1b(z);
+            if (ret == 0) goto lab6; /* call Step_1b, line 128 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m7;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 129 */
+        {   int ret = r_Step_1c(z);
+            if (ret == 0) goto lab7; /* call Step_1c, line 129 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = z->l - m8;
+    }
+    {   int m9 = z->l - z->c; (void)m9; /* do, line 130 */
+        {   int ret = r_Step_2(z);
+            if (ret == 0) goto lab8; /* call Step_2, line 130 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = z->l - m9;
+    }
+    {   int m10 = z->l - z->c; (void)m10; /* do, line 131 */
+        {   int ret = r_Step_3(z);
+            if (ret == 0) goto lab9; /* call Step_3, line 131 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = z->l - m10;
+    }
+    {   int m11 = z->l - z->c; (void)m11; /* do, line 132 */
+        {   int ret = r_Step_4(z);
+            if (ret == 0) goto lab10; /* call Step_4, line 132 */
+            if (ret < 0) return ret;
+        }
+    lab10:
+        z->c = z->l - m11;
+    }
+    {   int m12 = z->l - z->c; (void)m12; /* do, line 133 */
+        {   int ret = r_Step_5a(z);
+            if (ret == 0) goto lab11; /* call Step_5a, line 133 */
+            if (ret < 0) return ret;
+        }
+    lab11:
+        z->c = z->l - m12;
+    }
+    {   int m13 = z->l - z->c; (void)m13; /* do, line 134 */
+        {   int ret = r_Step_5b(z);
+            if (ret == 0) goto lab12; /* call Step_5b, line 134 */
+            if (ret < 0) return ret;
+        }
+    lab12:
+        z->c = z->l - m13;
+    }
+    z->c = z->lb;
+    {   int c14 = z->c; /* do, line 137 */
+        if (!(z->B[0])) goto lab13; /* Boolean test Y_found, line 137 */
+        while(1) { /* repeat, line 137 */
+            int c15 = z->c;
+            while(1) { /* goto, line 137 */
+                int c16 = z->c;
+                z->bra = z->c; /* [, line 137 */
+                if (!(eq_s(z, 1, s_33))) goto lab15;
+                z->ket = z->c; /* ], line 137 */
+                z->c = c16;
+                break;
+            lab15:
+                z->c = c16;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab14;
+                    z->c = ret; /* goto, line 137 */
+                }
+            }
+            {   int ret = slice_from_s(z, 1, s_34); /* <-, line 137 */
+                if (ret < 0) return ret;
+            }
+            continue;
+        lab14:
+            z->c = c15;
+            break;
+        }
+    lab13:
+        z->c = c14;
+    }
+    return 1;
+}
+
+extern struct SN_env * porter_UTF_8_create_env(void) { return SN_create_env(0, 2, 1); }
+
+extern void porter_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_portuguese.c b/src/backend/snowball/libstemmer/stem_UTF_8_portuguese.c
new file mode 100644
index 000000000000..8939cfe016a7
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_portuguese.c
@@ -0,0 +1,1023 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int portuguese_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_residual_form(struct SN_env * z);
+static int r_residual_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * portuguese_UTF_8_create_env(void);
+extern void portuguese_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[2] = { 0xC3, 0xA3 };
+static const symbol s_0_2[2] = { 0xC3, 0xB5 };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 2, s_0_1, 0, 1, 0},
+/*  2 */ { 2, s_0_2, 0, 2, 0}
+};
+
+static const symbol s_1_1[2] = { 'a', '~' };
+static const symbol s_1_2[2] = { 'o', '~' };
+
+static const struct among a_1[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 2, s_1_1, 0, 1, 0},
+/*  2 */ { 2, s_1_2, 0, 2, 0}
+};
+
+static const symbol s_2_0[2] = { 'i', 'c' };
+static const symbol s_2_1[2] = { 'a', 'd' };
+static const symbol s_2_2[2] = { 'o', 's' };
+static const symbol s_2_3[2] = { 'i', 'v' };
+
+static const struct among a_2[4] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 2, s_2_2, -1, -1, 0},
+/*  3 */ { 2, s_2_3, -1, 1, 0}
+};
+
+static const symbol s_3_0[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_3_1[4] = { 'a', 'v', 'e', 'l' };
+static const symbol s_3_2[5] = { 0xC3, 0xAD, 'v', 'e', 'l' };
+
+static const struct among a_3[3] =
+{
+/*  0 */ { 4, s_3_0, -1, 1, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0},
+/*  2 */ { 5, s_3_2, -1, 1, 0}
+};
+
+static const symbol s_4_0[2] = { 'i', 'c' };
+static const symbol s_4_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_4_2[2] = { 'i', 'v' };
+
+static const struct among a_4[3] =
+{
+/*  0 */ { 2, s_4_0, -1, 1, 0},
+/*  1 */ { 4, s_4_1, -1, 1, 0},
+/*  2 */ { 2, s_4_2, -1, 1, 0}
+};
+
+static const symbol s_5_0[3] = { 'i', 'c', 'a' };
+static const symbol s_5_1[6] = { 0xC3, 0xA2, 'n', 'c', 'i', 'a' };
+static const symbol s_5_2[6] = { 0xC3, 0xAA, 'n', 'c', 'i', 'a' };
+static const symbol s_5_3[3] = { 'i', 'r', 'a' };
+static const symbol s_5_4[5] = { 'a', 'd', 'o', 'r', 'a' };
+static const symbol s_5_5[3] = { 'o', 's', 'a' };
+static const symbol s_5_6[4] = { 'i', 's', 't', 'a' };
+static const symbol s_5_7[3] = { 'i', 'v', 'a' };
+static const symbol s_5_8[3] = { 'e', 'z', 'a' };
+static const symbol s_5_9[6] = { 'l', 'o', 'g', 0xC3, 0xAD, 'a' };
+static const symbol s_5_10[5] = { 'i', 'd', 'a', 'd', 'e' };
+static const symbol s_5_11[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_5_12[5] = { 'm', 'e', 'n', 't', 'e' };
+static const symbol s_5_13[6] = { 'a', 'm', 'e', 'n', 't', 'e' };
+static const symbol s_5_14[5] = { 0xC3, 0xA1, 'v', 'e', 'l' };
+static const symbol s_5_15[5] = { 0xC3, 0xAD, 'v', 'e', 'l' };
+static const symbol s_5_16[6] = { 'u', 'c', 'i', 0xC3, 0xB3, 'n' };
+static const symbol s_5_17[3] = { 'i', 'c', 'o' };
+static const symbol s_5_18[4] = { 'i', 's', 'm', 'o' };
+static const symbol s_5_19[3] = { 'o', 's', 'o' };
+static const symbol s_5_20[6] = { 'a', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_5_21[6] = { 'i', 'm', 'e', 'n', 't', 'o' };
+static const symbol s_5_22[3] = { 'i', 'v', 'o' };
+static const symbol s_5_23[6] = { 'a', 0xC3, 0xA7, 'a', '~', 'o' };
+static const symbol s_5_24[4] = { 'a', 'd', 'o', 'r' };
+static const symbol s_5_25[4] = { 'i', 'c', 'a', 's' };
+static const symbol s_5_26[7] = { 0xC3, 0xAA, 'n', 'c', 'i', 'a', 's' };
+static const symbol s_5_27[4] = { 'i', 'r', 'a', 's' };
+static const symbol s_5_28[6] = { 'a', 'd', 'o', 'r', 'a', 's' };
+static const symbol s_5_29[4] = { 'o', 's', 'a', 's' };
+static const symbol s_5_30[5] = { 'i', 's', 't', 'a', 's' };
+static const symbol s_5_31[4] = { 'i', 'v', 'a', 's' };
+static const symbol s_5_32[4] = { 'e', 'z', 'a', 's' };
+static const symbol s_5_33[7] = { 'l', 'o', 'g', 0xC3, 0xAD, 'a', 's' };
+static const symbol s_5_34[6] = { 'i', 'd', 'a', 'd', 'e', 's' };
+static const symbol s_5_35[7] = { 'u', 'c', 'i', 'o', 'n', 'e', 's' };
+static const symbol s_5_36[6] = { 'a', 'd', 'o', 'r', 'e', 's' };
+static const symbol s_5_37[5] = { 'a', 'n', 't', 'e', 's' };
+static const symbol s_5_38[7] = { 'a', 0xC3, 0xA7, 'o', '~', 'e', 's' };
+static const symbol s_5_39[4] = { 'i', 'c', 'o', 's' };
+static const symbol s_5_40[5] = { 'i', 's', 'm', 'o', 's' };
+static const symbol s_5_41[4] = { 'o', 's', 'o', 's' };
+static const symbol s_5_42[7] = { 'a', 'm', 'e', 'n', 't', 'o', 's' };
+static const symbol s_5_43[7] = { 'i', 'm', 'e', 'n', 't', 'o', 's' };
+static const symbol s_5_44[4] = { 'i', 'v', 'o', 's' };
+
+static const struct among a_5[45] =
+{
+/*  0 */ { 3, s_5_0, -1, 1, 0},
+/*  1 */ { 6, s_5_1, -1, 1, 0},
+/*  2 */ { 6, s_5_2, -1, 4, 0},
+/*  3 */ { 3, s_5_3, -1, 9, 0},
+/*  4 */ { 5, s_5_4, -1, 1, 0},
+/*  5 */ { 3, s_5_5, -1, 1, 0},
+/*  6 */ { 4, s_5_6, -1, 1, 0},
+/*  7 */ { 3, s_5_7, -1, 8, 0},
+/*  8 */ { 3, s_5_8, -1, 1, 0},
+/*  9 */ { 6, s_5_9, -1, 2, 0},
+/* 10 */ { 5, s_5_10, -1, 7, 0},
+/* 11 */ { 4, s_5_11, -1, 1, 0},
+/* 12 */ { 5, s_5_12, -1, 6, 0},
+/* 13 */ { 6, s_5_13, 12, 5, 0},
+/* 14 */ { 5, s_5_14, -1, 1, 0},
+/* 15 */ { 5, s_5_15, -1, 1, 0},
+/* 16 */ { 6, s_5_16, -1, 3, 0},
+/* 17 */ { 3, s_5_17, -1, 1, 0},
+/* 18 */ { 4, s_5_18, -1, 1, 0},
+/* 19 */ { 3, s_5_19, -1, 1, 0},
+/* 20 */ { 6, s_5_20, -1, 1, 0},
+/* 21 */ { 6, s_5_21, -1, 1, 0},
+/* 22 */ { 3, s_5_22, -1, 8, 0},
+/* 23 */ { 6, s_5_23, -1, 1, 0},
+/* 24 */ { 4, s_5_24, -1, 1, 0},
+/* 25 */ { 4, s_5_25, -1, 1, 0},
+/* 26 */ { 7, s_5_26, -1, 4, 0},
+/* 27 */ { 4, s_5_27, -1, 9, 0},
+/* 28 */ { 6, s_5_28, -1, 1, 0},
+/* 29 */ { 4, s_5_29, -1, 1, 0},
+/* 30 */ { 5, s_5_30, -1, 1, 0},
+/* 31 */ { 4, s_5_31, -1, 8, 0},
+/* 32 */ { 4, s_5_32, -1, 1, 0},
+/* 33 */ { 7, s_5_33, -1, 2, 0},
+/* 34 */ { 6, s_5_34, -1, 7, 0},
+/* 35 */ { 7, s_5_35, -1, 3, 0},
+/* 36 */ { 6, s_5_36, -1, 1, 0},
+/* 37 */ { 5, s_5_37, -1, 1, 0},
+/* 38 */ { 7, s_5_38, -1, 1, 0},
+/* 39 */ { 4, s_5_39, -1, 1, 0},
+/* 40 */ { 5, s_5_40, -1, 1, 0},
+/* 41 */ { 4, s_5_41, -1, 1, 0},
+/* 42 */ { 7, s_5_42, -1, 1, 0},
+/* 43 */ { 7, s_5_43, -1, 1, 0},
+/* 44 */ { 4, s_5_44, -1, 8, 0}
+};
+
+static const symbol s_6_0[3] = { 'a', 'd', 'a' };
+static const symbol s_6_1[3] = { 'i', 'd', 'a' };
+static const symbol s_6_2[2] = { 'i', 'a' };
+static const symbol s_6_3[4] = { 'a', 'r', 'i', 'a' };
+static const symbol s_6_4[4] = { 'e', 'r', 'i', 'a' };
+static const symbol s_6_5[4] = { 'i', 'r', 'i', 'a' };
+static const symbol s_6_6[3] = { 'a', 'r', 'a' };
+static const symbol s_6_7[3] = { 'e', 'r', 'a' };
+static const symbol s_6_8[3] = { 'i', 'r', 'a' };
+static const symbol s_6_9[3] = { 'a', 'v', 'a' };
+static const symbol s_6_10[4] = { 'a', 's', 's', 'e' };
+static const symbol s_6_11[4] = { 'e', 's', 's', 'e' };
+static const symbol s_6_12[4] = { 'i', 's', 's', 'e' };
+static const symbol s_6_13[4] = { 'a', 's', 't', 'e' };
+static const symbol s_6_14[4] = { 'e', 's', 't', 'e' };
+static const symbol s_6_15[4] = { 'i', 's', 't', 'e' };
+static const symbol s_6_16[2] = { 'e', 'i' };
+static const symbol s_6_17[4] = { 'a', 'r', 'e', 'i' };
+static const symbol s_6_18[4] = { 'e', 'r', 'e', 'i' };
+static const symbol s_6_19[4] = { 'i', 'r', 'e', 'i' };
+static const symbol s_6_20[2] = { 'a', 'm' };
+static const symbol s_6_21[3] = { 'i', 'a', 'm' };
+static const symbol s_6_22[5] = { 'a', 'r', 'i', 'a', 'm' };
+static const symbol s_6_23[5] = { 'e', 'r', 'i', 'a', 'm' };
+static const symbol s_6_24[5] = { 'i', 'r', 'i', 'a', 'm' };
+static const symbol s_6_25[4] = { 'a', 'r', 'a', 'm' };
+static const symbol s_6_26[4] = { 'e', 'r', 'a', 'm' };
+static const symbol s_6_27[4] = { 'i', 'r', 'a', 'm' };
+static const symbol s_6_28[4] = { 'a', 'v', 'a', 'm' };
+static const symbol s_6_29[2] = { 'e', 'm' };
+static const symbol s_6_30[4] = { 'a', 'r', 'e', 'm' };
+static const symbol s_6_31[4] = { 'e', 'r', 'e', 'm' };
+static const symbol s_6_32[4] = { 'i', 'r', 'e', 'm' };
+static const symbol s_6_33[5] = { 'a', 's', 's', 'e', 'm' };
+static const symbol s_6_34[5] = { 'e', 's', 's', 'e', 'm' };
+static const symbol s_6_35[5] = { 'i', 's', 's', 'e', 'm' };
+static const symbol s_6_36[3] = { 'a', 'd', 'o' };
+static const symbol s_6_37[3] = { 'i', 'd', 'o' };
+static const symbol s_6_38[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_6_39[4] = { 'e', 'n', 'd', 'o' };
+static const symbol s_6_40[4] = { 'i', 'n', 'd', 'o' };
+static const symbol s_6_41[5] = { 'a', 'r', 'a', '~', 'o' };
+static const symbol s_6_42[5] = { 'e', 'r', 'a', '~', 'o' };
+static const symbol s_6_43[5] = { 'i', 'r', 'a', '~', 'o' };
+static const symbol s_6_44[2] = { 'a', 'r' };
+static const symbol s_6_45[2] = { 'e', 'r' };
+static const symbol s_6_46[2] = { 'i', 'r' };
+static const symbol s_6_47[2] = { 'a', 's' };
+static const symbol s_6_48[4] = { 'a', 'd', 'a', 's' };
+static const symbol s_6_49[4] = { 'i', 'd', 'a', 's' };
+static const symbol s_6_50[3] = { 'i', 'a', 's' };
+static const symbol s_6_51[5] = { 'a', 'r', 'i', 'a', 's' };
+static const symbol s_6_52[5] = { 'e', 'r', 'i', 'a', 's' };
+static const symbol s_6_53[5] = { 'i', 'r', 'i', 'a', 's' };
+static const symbol s_6_54[4] = { 'a', 'r', 'a', 's' };
+static const symbol s_6_55[4] = { 'e', 'r', 'a', 's' };
+static const symbol s_6_56[4] = { 'i', 'r', 'a', 's' };
+static const symbol s_6_57[4] = { 'a', 'v', 'a', 's' };
+static const symbol s_6_58[2] = { 'e', 's' };
+static const symbol s_6_59[5] = { 'a', 'r', 'd', 'e', 's' };
+static const symbol s_6_60[5] = { 'e', 'r', 'd', 'e', 's' };
+static const symbol s_6_61[5] = { 'i', 'r', 'd', 'e', 's' };
+static const symbol s_6_62[4] = { 'a', 'r', 'e', 's' };
+static const symbol s_6_63[4] = { 'e', 'r', 'e', 's' };
+static const symbol s_6_64[4] = { 'i', 'r', 'e', 's' };
+static const symbol s_6_65[5] = { 'a', 's', 's', 'e', 's' };
+static const symbol s_6_66[5] = { 'e', 's', 's', 'e', 's' };
+static const symbol s_6_67[5] = { 'i', 's', 's', 'e', 's' };
+static const symbol s_6_68[5] = { 'a', 's', 't', 'e', 's' };
+static const symbol s_6_69[5] = { 'e', 's', 't', 'e', 's' };
+static const symbol s_6_70[5] = { 'i', 's', 't', 'e', 's' };
+static const symbol s_6_71[2] = { 'i', 's' };
+static const symbol s_6_72[3] = { 'a', 'i', 's' };
+static const symbol s_6_73[3] = { 'e', 'i', 's' };
+static const symbol s_6_74[5] = { 'a', 'r', 'e', 'i', 's' };
+static const symbol s_6_75[5] = { 'e', 'r', 'e', 'i', 's' };
+static const symbol s_6_76[5] = { 'i', 'r', 'e', 'i', 's' };
+static const symbol s_6_77[6] = { 0xC3, 0xA1, 'r', 'e', 'i', 's' };
+static const symbol s_6_78[6] = { 0xC3, 0xA9, 'r', 'e', 'i', 's' };
+static const symbol s_6_79[6] = { 0xC3, 0xAD, 'r', 'e', 'i', 's' };
+static const symbol s_6_80[7] = { 0xC3, 0xA1, 's', 's', 'e', 'i', 's' };
+static const symbol s_6_81[7] = { 0xC3, 0xA9, 's', 's', 'e', 'i', 's' };
+static const symbol s_6_82[7] = { 0xC3, 0xAD, 's', 's', 'e', 'i', 's' };
+static const symbol s_6_83[6] = { 0xC3, 0xA1, 'v', 'e', 'i', 's' };
+static const symbol s_6_84[5] = { 0xC3, 0xAD, 'e', 'i', 's' };
+static const symbol s_6_85[7] = { 'a', 'r', 0xC3, 0xAD, 'e', 'i', 's' };
+static const symbol s_6_86[7] = { 'e', 'r', 0xC3, 0xAD, 'e', 'i', 's' };
+static const symbol s_6_87[7] = { 'i', 'r', 0xC3, 0xAD, 'e', 'i', 's' };
+static const symbol s_6_88[4] = { 'a', 'd', 'o', 's' };
+static const symbol s_6_89[4] = { 'i', 'd', 'o', 's' };
+static const symbol s_6_90[4] = { 'a', 'm', 'o', 's' };
+static const symbol s_6_91[7] = { 0xC3, 0xA1, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_6_92[7] = { 0xC3, 0xA9, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_6_93[7] = { 0xC3, 0xAD, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_6_94[7] = { 0xC3, 0xA1, 'v', 'a', 'm', 'o', 's' };
+static const symbol s_6_95[6] = { 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_6_96[8] = { 'a', 'r', 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_6_97[8] = { 'e', 'r', 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_6_98[8] = { 'i', 'r', 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_6_99[4] = { 'e', 'm', 'o', 's' };
+static const symbol s_6_100[6] = { 'a', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_6_101[6] = { 'e', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_6_102[6] = { 'i', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_6_103[8] = { 0xC3, 0xA1, 's', 's', 'e', 'm', 'o', 's' };
+static const symbol s_6_104[8] = { 0xC3, 0xAA, 's', 's', 'e', 'm', 'o', 's' };
+static const symbol s_6_105[8] = { 0xC3, 0xAD, 's', 's', 'e', 'm', 'o', 's' };
+static const symbol s_6_106[4] = { 'i', 'm', 'o', 's' };
+static const symbol s_6_107[5] = { 'a', 'r', 'm', 'o', 's' };
+static const symbol s_6_108[5] = { 'e', 'r', 'm', 'o', 's' };
+static const symbol s_6_109[5] = { 'i', 'r', 'm', 'o', 's' };
+static const symbol s_6_110[5] = { 0xC3, 0xA1, 'm', 'o', 's' };
+static const symbol s_6_111[5] = { 'a', 'r', 0xC3, 0xA1, 's' };
+static const symbol s_6_112[5] = { 'e', 'r', 0xC3, 0xA1, 's' };
+static const symbol s_6_113[5] = { 'i', 'r', 0xC3, 0xA1, 's' };
+static const symbol s_6_114[2] = { 'e', 'u' };
+static const symbol s_6_115[2] = { 'i', 'u' };
+static const symbol s_6_116[2] = { 'o', 'u' };
+static const symbol s_6_117[4] = { 'a', 'r', 0xC3, 0xA1 };
+static const symbol s_6_118[4] = { 'e', 'r', 0xC3, 0xA1 };
+static const symbol s_6_119[4] = { 'i', 'r', 0xC3, 0xA1 };
+
+static const struct among a_6[120] =
+{
+/*  0 */ { 3, s_6_0, -1, 1, 0},
+/*  1 */ { 3, s_6_1, -1, 1, 0},
+/*  2 */ { 2, s_6_2, -1, 1, 0},
+/*  3 */ { 4, s_6_3, 2, 1, 0},
+/*  4 */ { 4, s_6_4, 2, 1, 0},
+/*  5 */ { 4, s_6_5, 2, 1, 0},
+/*  6 */ { 3, s_6_6, -1, 1, 0},
+/*  7 */ { 3, s_6_7, -1, 1, 0},
+/*  8 */ { 3, s_6_8, -1, 1, 0},
+/*  9 */ { 3, s_6_9, -1, 1, 0},
+/* 10 */ { 4, s_6_10, -1, 1, 0},
+/* 11 */ { 4, s_6_11, -1, 1, 0},
+/* 12 */ { 4, s_6_12, -1, 1, 0},
+/* 13 */ { 4, s_6_13, -1, 1, 0},
+/* 14 */ { 4, s_6_14, -1, 1, 0},
+/* 15 */ { 4, s_6_15, -1, 1, 0},
+/* 16 */ { 2, s_6_16, -1, 1, 0},
+/* 17 */ { 4, s_6_17, 16, 1, 0},
+/* 18 */ { 4, s_6_18, 16, 1, 0},
+/* 19 */ { 4, s_6_19, 16, 1, 0},
+/* 20 */ { 2, s_6_20, -1, 1, 0},
+/* 21 */ { 3, s_6_21, 20, 1, 0},
+/* 22 */ { 5, s_6_22, 21, 1, 0},
+/* 23 */ { 5, s_6_23, 21, 1, 0},
+/* 24 */ { 5, s_6_24, 21, 1, 0},
+/* 25 */ { 4, s_6_25, 20, 1, 0},
+/* 26 */ { 4, s_6_26, 20, 1, 0},
+/* 27 */ { 4, s_6_27, 20, 1, 0},
+/* 28 */ { 4, s_6_28, 20, 1, 0},
+/* 29 */ { 2, s_6_29, -1, 1, 0},
+/* 30 */ { 4, s_6_30, 29, 1, 0},
+/* 31 */ { 4, s_6_31, 29, 1, 0},
+/* 32 */ { 4, s_6_32, 29, 1, 0},
+/* 33 */ { 5, s_6_33, 29, 1, 0},
+/* 34 */ { 5, s_6_34, 29, 1, 0},
+/* 35 */ { 5, s_6_35, 29, 1, 0},
+/* 36 */ { 3, s_6_36, -1, 1, 0},
+/* 37 */ { 3, s_6_37, -1, 1, 0},
+/* 38 */ { 4, s_6_38, -1, 1, 0},
+/* 39 */ { 4, s_6_39, -1, 1, 0},
+/* 40 */ { 4, s_6_40, -1, 1, 0},
+/* 41 */ { 5, s_6_41, -1, 1, 0},
+/* 42 */ { 5, s_6_42, -1, 1, 0},
+/* 43 */ { 5, s_6_43, -1, 1, 0},
+/* 44 */ { 2, s_6_44, -1, 1, 0},
+/* 45 */ { 2, s_6_45, -1, 1, 0},
+/* 46 */ { 2, s_6_46, -1, 1, 0},
+/* 47 */ { 2, s_6_47, -1, 1, 0},
+/* 48 */ { 4, s_6_48, 47, 1, 0},
+/* 49 */ { 4, s_6_49, 47, 1, 0},
+/* 50 */ { 3, s_6_50, 47, 1, 0},
+/* 51 */ { 5, s_6_51, 50, 1, 0},
+/* 52 */ { 5, s_6_52, 50, 1, 0},
+/* 53 */ { 5, s_6_53, 50, 1, 0},
+/* 54 */ { 4, s_6_54, 47, 1, 0},
+/* 55 */ { 4, s_6_55, 47, 1, 0},
+/* 56 */ { 4, s_6_56, 47, 1, 0},
+/* 57 */ { 4, s_6_57, 47, 1, 0},
+/* 58 */ { 2, s_6_58, -1, 1, 0},
+/* 59 */ { 5, s_6_59, 58, 1, 0},
+/* 60 */ { 5, s_6_60, 58, 1, 0},
+/* 61 */ { 5, s_6_61, 58, 1, 0},
+/* 62 */ { 4, s_6_62, 58, 1, 0},
+/* 63 */ { 4, s_6_63, 58, 1, 0},
+/* 64 */ { 4, s_6_64, 58, 1, 0},
+/* 65 */ { 5, s_6_65, 58, 1, 0},
+/* 66 */ { 5, s_6_66, 58, 1, 0},
+/* 67 */ { 5, s_6_67, 58, 1, 0},
+/* 68 */ { 5, s_6_68, 58, 1, 0},
+/* 69 */ { 5, s_6_69, 58, 1, 0},
+/* 70 */ { 5, s_6_70, 58, 1, 0},
+/* 71 */ { 2, s_6_71, -1, 1, 0},
+/* 72 */ { 3, s_6_72, 71, 1, 0},
+/* 73 */ { 3, s_6_73, 71, 1, 0},
+/* 74 */ { 5, s_6_74, 73, 1, 0},
+/* 75 */ { 5, s_6_75, 73, 1, 0},
+/* 76 */ { 5, s_6_76, 73, 1, 0},
+/* 77 */ { 6, s_6_77, 73, 1, 0},
+/* 78 */ { 6, s_6_78, 73, 1, 0},
+/* 79 */ { 6, s_6_79, 73, 1, 0},
+/* 80 */ { 7, s_6_80, 73, 1, 0},
+/* 81 */ { 7, s_6_81, 73, 1, 0},
+/* 82 */ { 7, s_6_82, 73, 1, 0},
+/* 83 */ { 6, s_6_83, 73, 1, 0},
+/* 84 */ { 5, s_6_84, 73, 1, 0},
+/* 85 */ { 7, s_6_85, 84, 1, 0},
+/* 86 */ { 7, s_6_86, 84, 1, 0},
+/* 87 */ { 7, s_6_87, 84, 1, 0},
+/* 88 */ { 4, s_6_88, -1, 1, 0},
+/* 89 */ { 4, s_6_89, -1, 1, 0},
+/* 90 */ { 4, s_6_90, -1, 1, 0},
+/* 91 */ { 7, s_6_91, 90, 1, 0},
+/* 92 */ { 7, s_6_92, 90, 1, 0},
+/* 93 */ { 7, s_6_93, 90, 1, 0},
+/* 94 */ { 7, s_6_94, 90, 1, 0},
+/* 95 */ { 6, s_6_95, 90, 1, 0},
+/* 96 */ { 8, s_6_96, 95, 1, 0},
+/* 97 */ { 8, s_6_97, 95, 1, 0},
+/* 98 */ { 8, s_6_98, 95, 1, 0},
+/* 99 */ { 4, s_6_99, -1, 1, 0},
+/*100 */ { 6, s_6_100, 99, 1, 0},
+/*101 */ { 6, s_6_101, 99, 1, 0},
+/*102 */ { 6, s_6_102, 99, 1, 0},
+/*103 */ { 8, s_6_103, 99, 1, 0},
+/*104 */ { 8, s_6_104, 99, 1, 0},
+/*105 */ { 8, s_6_105, 99, 1, 0},
+/*106 */ { 4, s_6_106, -1, 1, 0},
+/*107 */ { 5, s_6_107, -1, 1, 0},
+/*108 */ { 5, s_6_108, -1, 1, 0},
+/*109 */ { 5, s_6_109, -1, 1, 0},
+/*110 */ { 5, s_6_110, -1, 1, 0},
+/*111 */ { 5, s_6_111, -1, 1, 0},
+/*112 */ { 5, s_6_112, -1, 1, 0},
+/*113 */ { 5, s_6_113, -1, 1, 0},
+/*114 */ { 2, s_6_114, -1, 1, 0},
+/*115 */ { 2, s_6_115, -1, 1, 0},
+/*116 */ { 2, s_6_116, -1, 1, 0},
+/*117 */ { 4, s_6_117, -1, 1, 0},
+/*118 */ { 4, s_6_118, -1, 1, 0},
+/*119 */ { 4, s_6_119, -1, 1, 0}
+};
+
+static const symbol s_7_0[1] = { 'a' };
+static const symbol s_7_1[1] = { 'i' };
+static const symbol s_7_2[1] = { 'o' };
+static const symbol s_7_3[2] = { 'o', 's' };
+static const symbol s_7_4[2] = { 0xC3, 0xA1 };
+static const symbol s_7_5[2] = { 0xC3, 0xAD };
+static const symbol s_7_6[2] = { 0xC3, 0xB3 };
+
+static const struct among a_7[7] =
+{
+/*  0 */ { 1, s_7_0, -1, 1, 0},
+/*  1 */ { 1, s_7_1, -1, 1, 0},
+/*  2 */ { 1, s_7_2, -1, 1, 0},
+/*  3 */ { 2, s_7_3, -1, 1, 0},
+/*  4 */ { 2, s_7_4, -1, 1, 0},
+/*  5 */ { 2, s_7_5, -1, 1, 0},
+/*  6 */ { 2, s_7_6, -1, 1, 0}
+};
+
+static const symbol s_8_0[1] = { 'e' };
+static const symbol s_8_1[2] = { 0xC3, 0xA7 };
+static const symbol s_8_2[2] = { 0xC3, 0xA9 };
+static const symbol s_8_3[2] = { 0xC3, 0xAA };
+
+static const struct among a_8[4] =
+{
+/*  0 */ { 1, s_8_0, -1, 1, 0},
+/*  1 */ { 2, s_8_1, -1, 2, 0},
+/*  2 */ { 2, s_8_2, -1, 1, 0},
+/*  3 */ { 2, s_8_3, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 19, 12, 2 };
+
+static const symbol s_0[] = { 'a', '~' };
+static const symbol s_1[] = { 'o', '~' };
+static const symbol s_2[] = { 0xC3, 0xA3 };
+static const symbol s_3[] = { 0xC3, 0xB5 };
+static const symbol s_4[] = { 'l', 'o', 'g' };
+static const symbol s_5[] = { 'u' };
+static const symbol s_6[] = { 'e', 'n', 't', 'e' };
+static const symbol s_7[] = { 'a', 't' };
+static const symbol s_8[] = { 'a', 't' };
+static const symbol s_9[] = { 'e' };
+static const symbol s_10[] = { 'i', 'r' };
+static const symbol s_11[] = { 'u' };
+static const symbol s_12[] = { 'g' };
+static const symbol s_13[] = { 'i' };
+static const symbol s_14[] = { 'c' };
+static const symbol s_15[] = { 'c' };
+static const symbol s_16[] = { 'i' };
+static const symbol s_17[] = { 'c' };
+
+static int r_prelude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 36 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 37 */
+        if (z->c + 1 >= z->l || (z->p[z->c + 1] != 163 && z->p[z->c + 1] != 181)) among_var = 3; else
+        among_var = find_among(z, a_0, 3); /* substring, line 37 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 37 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 2, s_0); /* <-, line 38 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 2, s_1); /* <-, line 39 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 40 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 50 */
+        {   int c2 = z->c; /* or, line 52 */
+            if (in_grouping_U(z, g_v, 97, 250, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 51 */
+                if (out_grouping_U(z, g_v, 97, 250, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 51 */
+                    int ret = out_grouping_U(z, g_v, 97, 250, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping_U(z, g_v, 97, 250, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 51 */
+                    int ret = in_grouping_U(z, g_v, 97, 250, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping_U(z, g_v, 97, 250, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 53 */
+                if (out_grouping_U(z, g_v, 97, 250, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 53 */
+                    int ret = out_grouping_U(z, g_v, 97, 250, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping_U(z, g_v, 97, 250, 0)) goto lab0;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 53 */
+                }
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 54 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 56 */
+        {    /* gopast */ /* grouping v, line 57 */
+            int ret = out_grouping_U(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 57 */
+            int ret = in_grouping_U(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 57 */
+        {    /* gopast */ /* grouping v, line 58 */
+            int ret = out_grouping_U(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 58 */
+            int ret = in_grouping_U(z, g_v, 97, 250, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 58 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 62 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 63 */
+        if (z->c + 1 >= z->l || z->p[z->c + 1] != 126) among_var = 3; else
+        among_var = find_among(z, a_1, 3); /* substring, line 63 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 63 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 2, s_2); /* <-, line 64 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 2, s_3); /* <-, line 65 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 66 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 77 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((839714 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_5, 45); /* substring, line 77 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 77 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 93 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 93 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 98 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_4); /* <-, line 98 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 102 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_5); /* <-, line 102 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 106 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 4, s_6); /* <-, line 106 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 110 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 110 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 111 */
+                z->ket = z->c; /* [, line 112 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4718616 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab0; }
+                among_var = find_among_b(z, a_2, 4); /* substring, line 112 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 112 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 112 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 112 */
+                    if (ret < 0) return ret;
+                }
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab0; }
+                    case 1:
+                        z->ket = z->c; /* [, line 113 */
+                        if (!(eq_s_b(z, 2, s_7))) { z->c = z->l - m_keep; goto lab0; }
+                        z->bra = z->c; /* ], line 113 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 113 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 113 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab0:
+                ;
+            }
+            break;
+        case 6:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 122 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 122 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 123 */
+                z->ket = z->c; /* [, line 124 */
+                if (z->c - 3 <= z->lb || (z->p[z->c - 1] != 101 && z->p[z->c - 1] != 108)) { z->c = z->l - m_keep; goto lab1; }
+                among_var = find_among_b(z, a_3, 3); /* substring, line 124 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab1; }
+                z->bra = z->c; /* ], line 124 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab1; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 127 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 127 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab1:
+                ;
+            }
+            break;
+        case 7:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 134 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 135 */
+                z->ket = z->c; /* [, line 136 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab2; }
+                among_var = find_among_b(z, a_4, 3); /* substring, line 136 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab2; }
+                z->bra = z->c; /* ], line 136 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab2; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call R2, line 139 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 139 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab2:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 146 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 146 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 147 */
+                z->ket = z->c; /* [, line 148 */
+                if (!(eq_s_b(z, 2, s_8))) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 148 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 148 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 148 */
+                    if (ret < 0) return ret;
+                }
+            lab3:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 153 */
+                if (ret < 0) return ret;
+            }
+            if (!(eq_s_b(z, 1, s_9))) return 0;
+            {   int ret = slice_from_s(z, 2, s_10); /* <-, line 154 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 159 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 159 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 160 */
+        among_var = find_among_b(z, a_6, 120); /* substring, line 160 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 160 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 179 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_residual_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 184 */
+    among_var = find_among_b(z, a_7, 7); /* substring, line 184 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 184 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 187 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 187 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_residual_form(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 192 */
+    among_var = find_among_b(z, a_8, 4); /* substring, line 192 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 192 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 194 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 194 */
+                if (ret < 0) return ret;
+            }
+            z->ket = z->c; /* [, line 194 */
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 194 */
+                if (!(eq_s_b(z, 1, s_11))) goto lab1;
+                z->bra = z->c; /* ], line 194 */
+                {   int m_test = z->l - z->c; /* test, line 194 */
+                    if (!(eq_s_b(z, 1, s_12))) goto lab1;
+                    z->c = z->l - m_test;
+                }
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 1, s_13))) return 0;
+                z->bra = z->c; /* ], line 195 */
+                {   int m_test = z->l - z->c; /* test, line 195 */
+                    if (!(eq_s_b(z, 1, s_14))) return 0;
+                    z->c = z->l - m_test;
+                }
+            }
+        lab0:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 195 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 195 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_15); /* <-, line 196 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int portuguese_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 202 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 202 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 203 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 203 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 204 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 205 */
+        {   int m4 = z->l - z->c; (void)m4; /* or, line 209 */
+            {   int m5 = z->l - z->c; (void)m5; /* and, line 207 */
+                {   int m6 = z->l - z->c; (void)m6; /* or, line 206 */
+                    {   int ret = r_standard_suffix(z);
+                        if (ret == 0) goto lab6; /* call standard_suffix, line 206 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m6;
+                    {   int ret = r_verb_suffix(z);
+                        if (ret == 0) goto lab4; /* call verb_suffix, line 206 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                z->c = z->l - m5;
+                {   int m7 = z->l - z->c; (void)m7; /* do, line 207 */
+                    z->ket = z->c; /* [, line 207 */
+                    if (!(eq_s_b(z, 1, s_16))) goto lab7;
+                    z->bra = z->c; /* ], line 207 */
+                    {   int m_test = z->l - z->c; /* test, line 207 */
+                        if (!(eq_s_b(z, 1, s_17))) goto lab7;
+                        z->c = z->l - m_test;
+                    }
+                    {   int ret = r_RV(z);
+                        if (ret == 0) goto lab7; /* call RV, line 207 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = slice_del(z); /* delete, line 207 */
+                        if (ret < 0) return ret;
+                    }
+                lab7:
+                    z->c = z->l - m7;
+                }
+            }
+            goto lab3;
+        lab4:
+            z->c = z->l - m4;
+            {   int ret = r_residual_suffix(z);
+                if (ret == 0) goto lab2; /* call residual_suffix, line 209 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab3:
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m8 = z->l - z->c; (void)m8; /* do, line 211 */
+        {   int ret = r_residual_form(z);
+            if (ret == 0) goto lab8; /* call residual_form, line 211 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = z->l - m8;
+    }
+    z->c = z->lb;
+    {   int c9 = z->c; /* do, line 213 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab9; /* call postlude, line 213 */
+            if (ret < 0) return ret;
+        }
+    lab9:
+        z->c = c9;
+    }
+    return 1;
+}
+
+extern struct SN_env * portuguese_UTF_8_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void portuguese_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_romanian.c b/src/backend/snowball/libstemmer/stem_UTF_8_romanian.c
new file mode 100644
index 000000000000..e82ebfe95f81
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_romanian.c
@@ -0,0 +1,1004 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int romanian_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_vowel_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_combo_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_step_0(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_prelude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * romanian_UTF_8_create_env(void);
+extern void romanian_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[1] = { 'I' };
+static const symbol s_0_2[1] = { 'U' };
+
+static const struct among a_0[3] =
+{
+/*  0 */ { 0, 0, -1, 3, 0},
+/*  1 */ { 1, s_0_1, 0, 1, 0},
+/*  2 */ { 1, s_0_2, 0, 2, 0}
+};
+
+static const symbol s_1_0[2] = { 'e', 'a' };
+static const symbol s_1_1[5] = { 'a', 0xC5, 0xA3, 'i', 'a' };
+static const symbol s_1_2[3] = { 'a', 'u', 'a' };
+static const symbol s_1_3[3] = { 'i', 'u', 'a' };
+static const symbol s_1_4[5] = { 'a', 0xC5, 0xA3, 'i', 'e' };
+static const symbol s_1_5[3] = { 'e', 'l', 'e' };
+static const symbol s_1_6[3] = { 'i', 'l', 'e' };
+static const symbol s_1_7[4] = { 'i', 'i', 'l', 'e' };
+static const symbol s_1_8[3] = { 'i', 'e', 'i' };
+static const symbol s_1_9[4] = { 'a', 't', 'e', 'i' };
+static const symbol s_1_10[2] = { 'i', 'i' };
+static const symbol s_1_11[4] = { 'u', 'l', 'u', 'i' };
+static const symbol s_1_12[2] = { 'u', 'l' };
+static const symbol s_1_13[4] = { 'e', 'l', 'o', 'r' };
+static const symbol s_1_14[4] = { 'i', 'l', 'o', 'r' };
+static const symbol s_1_15[5] = { 'i', 'i', 'l', 'o', 'r' };
+
+static const struct among a_1[16] =
+{
+/*  0 */ { 2, s_1_0, -1, 3, 0},
+/*  1 */ { 5, s_1_1, -1, 7, 0},
+/*  2 */ { 3, s_1_2, -1, 2, 0},
+/*  3 */ { 3, s_1_3, -1, 4, 0},
+/*  4 */ { 5, s_1_4, -1, 7, 0},
+/*  5 */ { 3, s_1_5, -1, 3, 0},
+/*  6 */ { 3, s_1_6, -1, 5, 0},
+/*  7 */ { 4, s_1_7, 6, 4, 0},
+/*  8 */ { 3, s_1_8, -1, 4, 0},
+/*  9 */ { 4, s_1_9, -1, 6, 0},
+/* 10 */ { 2, s_1_10, -1, 4, 0},
+/* 11 */ { 4, s_1_11, -1, 1, 0},
+/* 12 */ { 2, s_1_12, -1, 1, 0},
+/* 13 */ { 4, s_1_13, -1, 3, 0},
+/* 14 */ { 4, s_1_14, -1, 4, 0},
+/* 15 */ { 5, s_1_15, 14, 4, 0}
+};
+
+static const symbol s_2_0[5] = { 'i', 'c', 'a', 'l', 'a' };
+static const symbol s_2_1[5] = { 'i', 'c', 'i', 'v', 'a' };
+static const symbol s_2_2[5] = { 'a', 't', 'i', 'v', 'a' };
+static const symbol s_2_3[5] = { 'i', 't', 'i', 'v', 'a' };
+static const symbol s_2_4[5] = { 'i', 'c', 'a', 'l', 'e' };
+static const symbol s_2_5[7] = { 'a', 0xC5, 0xA3, 'i', 'u', 'n', 'e' };
+static const symbol s_2_6[7] = { 'i', 0xC5, 0xA3, 'i', 'u', 'n', 'e' };
+static const symbol s_2_7[6] = { 'a', 't', 'o', 'a', 'r', 'e' };
+static const symbol s_2_8[6] = { 'i', 't', 'o', 'a', 'r', 'e' };
+static const symbol s_2_9[7] = { 0xC4, 0x83, 't', 'o', 'a', 'r', 'e' };
+static const symbol s_2_10[7] = { 'i', 'c', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_11[9] = { 'a', 'b', 'i', 'l', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_12[9] = { 'i', 'b', 'i', 'l', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_13[7] = { 'i', 'v', 'i', 't', 'a', 't', 'e' };
+static const symbol s_2_14[5] = { 'i', 'c', 'i', 'v', 'e' };
+static const symbol s_2_15[5] = { 'a', 't', 'i', 'v', 'e' };
+static const symbol s_2_16[5] = { 'i', 't', 'i', 'v', 'e' };
+static const symbol s_2_17[5] = { 'i', 'c', 'a', 'l', 'i' };
+static const symbol s_2_18[5] = { 'a', 't', 'o', 'r', 'i' };
+static const symbol s_2_19[7] = { 'i', 'c', 'a', 't', 'o', 'r', 'i' };
+static const symbol s_2_20[5] = { 'i', 't', 'o', 'r', 'i' };
+static const symbol s_2_21[6] = { 0xC4, 0x83, 't', 'o', 'r', 'i' };
+static const symbol s_2_22[7] = { 'i', 'c', 'i', 't', 'a', 't', 'i' };
+static const symbol s_2_23[9] = { 'a', 'b', 'i', 'l', 'i', 't', 'a', 't', 'i' };
+static const symbol s_2_24[7] = { 'i', 'v', 'i', 't', 'a', 't', 'i' };
+static const symbol s_2_25[5] = { 'i', 'c', 'i', 'v', 'i' };
+static const symbol s_2_26[5] = { 'a', 't', 'i', 'v', 'i' };
+static const symbol s_2_27[5] = { 'i', 't', 'i', 'v', 'i' };
+static const symbol s_2_28[7] = { 'i', 'c', 'i', 't', 0xC4, 0x83, 'i' };
+static const symbol s_2_29[9] = { 'a', 'b', 'i', 'l', 'i', 't', 0xC4, 0x83, 'i' };
+static const symbol s_2_30[7] = { 'i', 'v', 'i', 't', 0xC4, 0x83, 'i' };
+static const symbol s_2_31[9] = { 'i', 'c', 'i', 't', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_2_32[11] = { 'a', 'b', 'i', 'l', 'i', 't', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_2_33[9] = { 'i', 'v', 'i', 't', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_2_34[4] = { 'i', 'c', 'a', 'l' };
+static const symbol s_2_35[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_2_36[6] = { 'i', 'c', 'a', 't', 'o', 'r' };
+static const symbol s_2_37[4] = { 'i', 't', 'o', 'r' };
+static const symbol s_2_38[5] = { 0xC4, 0x83, 't', 'o', 'r' };
+static const symbol s_2_39[4] = { 'i', 'c', 'i', 'v' };
+static const symbol s_2_40[4] = { 'a', 't', 'i', 'v' };
+static const symbol s_2_41[4] = { 'i', 't', 'i', 'v' };
+static const symbol s_2_42[6] = { 'i', 'c', 'a', 'l', 0xC4, 0x83 };
+static const symbol s_2_43[6] = { 'i', 'c', 'i', 'v', 0xC4, 0x83 };
+static const symbol s_2_44[6] = { 'a', 't', 'i', 'v', 0xC4, 0x83 };
+static const symbol s_2_45[6] = { 'i', 't', 'i', 'v', 0xC4, 0x83 };
+
+static const struct among a_2[46] =
+{
+/*  0 */ { 5, s_2_0, -1, 4, 0},
+/*  1 */ { 5, s_2_1, -1, 4, 0},
+/*  2 */ { 5, s_2_2, -1, 5, 0},
+/*  3 */ { 5, s_2_3, -1, 6, 0},
+/*  4 */ { 5, s_2_4, -1, 4, 0},
+/*  5 */ { 7, s_2_5, -1, 5, 0},
+/*  6 */ { 7, s_2_6, -1, 6, 0},
+/*  7 */ { 6, s_2_7, -1, 5, 0},
+/*  8 */ { 6, s_2_8, -1, 6, 0},
+/*  9 */ { 7, s_2_9, -1, 5, 0},
+/* 10 */ { 7, s_2_10, -1, 4, 0},
+/* 11 */ { 9, s_2_11, -1, 1, 0},
+/* 12 */ { 9, s_2_12, -1, 2, 0},
+/* 13 */ { 7, s_2_13, -1, 3, 0},
+/* 14 */ { 5, s_2_14, -1, 4, 0},
+/* 15 */ { 5, s_2_15, -1, 5, 0},
+/* 16 */ { 5, s_2_16, -1, 6, 0},
+/* 17 */ { 5, s_2_17, -1, 4, 0},
+/* 18 */ { 5, s_2_18, -1, 5, 0},
+/* 19 */ { 7, s_2_19, 18, 4, 0},
+/* 20 */ { 5, s_2_20, -1, 6, 0},
+/* 21 */ { 6, s_2_21, -1, 5, 0},
+/* 22 */ { 7, s_2_22, -1, 4, 0},
+/* 23 */ { 9, s_2_23, -1, 1, 0},
+/* 24 */ { 7, s_2_24, -1, 3, 0},
+/* 25 */ { 5, s_2_25, -1, 4, 0},
+/* 26 */ { 5, s_2_26, -1, 5, 0},
+/* 27 */ { 5, s_2_27, -1, 6, 0},
+/* 28 */ { 7, s_2_28, -1, 4, 0},
+/* 29 */ { 9, s_2_29, -1, 1, 0},
+/* 30 */ { 7, s_2_30, -1, 3, 0},
+/* 31 */ { 9, s_2_31, -1, 4, 0},
+/* 32 */ { 11, s_2_32, -1, 1, 0},
+/* 33 */ { 9, s_2_33, -1, 3, 0},
+/* 34 */ { 4, s_2_34, -1, 4, 0},
+/* 35 */ { 4, s_2_35, -1, 5, 0},
+/* 36 */ { 6, s_2_36, 35, 4, 0},
+/* 37 */ { 4, s_2_37, -1, 6, 0},
+/* 38 */ { 5, s_2_38, -1, 5, 0},
+/* 39 */ { 4, s_2_39, -1, 4, 0},
+/* 40 */ { 4, s_2_40, -1, 5, 0},
+/* 41 */ { 4, s_2_41, -1, 6, 0},
+/* 42 */ { 6, s_2_42, -1, 4, 0},
+/* 43 */ { 6, s_2_43, -1, 4, 0},
+/* 44 */ { 6, s_2_44, -1, 5, 0},
+/* 45 */ { 6, s_2_45, -1, 6, 0}
+};
+
+static const symbol s_3_0[3] = { 'i', 'c', 'a' };
+static const symbol s_3_1[5] = { 'a', 'b', 'i', 'l', 'a' };
+static const symbol s_3_2[5] = { 'i', 'b', 'i', 'l', 'a' };
+static const symbol s_3_3[4] = { 'o', 'a', 's', 'a' };
+static const symbol s_3_4[3] = { 'a', 't', 'a' };
+static const symbol s_3_5[3] = { 'i', 't', 'a' };
+static const symbol s_3_6[4] = { 'a', 'n', 't', 'a' };
+static const symbol s_3_7[4] = { 'i', 's', 't', 'a' };
+static const symbol s_3_8[3] = { 'u', 't', 'a' };
+static const symbol s_3_9[3] = { 'i', 'v', 'a' };
+static const symbol s_3_10[2] = { 'i', 'c' };
+static const symbol s_3_11[3] = { 'i', 'c', 'e' };
+static const symbol s_3_12[5] = { 'a', 'b', 'i', 'l', 'e' };
+static const symbol s_3_13[5] = { 'i', 'b', 'i', 'l', 'e' };
+static const symbol s_3_14[4] = { 'i', 's', 'm', 'e' };
+static const symbol s_3_15[4] = { 'i', 'u', 'n', 'e' };
+static const symbol s_3_16[4] = { 'o', 'a', 's', 'e' };
+static const symbol s_3_17[3] = { 'a', 't', 'e' };
+static const symbol s_3_18[5] = { 'i', 't', 'a', 't', 'e' };
+static const symbol s_3_19[3] = { 'i', 't', 'e' };
+static const symbol s_3_20[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_3_21[4] = { 'i', 's', 't', 'e' };
+static const symbol s_3_22[3] = { 'u', 't', 'e' };
+static const symbol s_3_23[3] = { 'i', 'v', 'e' };
+static const symbol s_3_24[3] = { 'i', 'c', 'i' };
+static const symbol s_3_25[5] = { 'a', 'b', 'i', 'l', 'i' };
+static const symbol s_3_26[5] = { 'i', 'b', 'i', 'l', 'i' };
+static const symbol s_3_27[4] = { 'i', 'u', 'n', 'i' };
+static const symbol s_3_28[5] = { 'a', 't', 'o', 'r', 'i' };
+static const symbol s_3_29[3] = { 'o', 's', 'i' };
+static const symbol s_3_30[3] = { 'a', 't', 'i' };
+static const symbol s_3_31[5] = { 'i', 't', 'a', 't', 'i' };
+static const symbol s_3_32[3] = { 'i', 't', 'i' };
+static const symbol s_3_33[4] = { 'a', 'n', 't', 'i' };
+static const symbol s_3_34[4] = { 'i', 's', 't', 'i' };
+static const symbol s_3_35[3] = { 'u', 't', 'i' };
+static const symbol s_3_36[5] = { 'i', 0xC5, 0x9F, 't', 'i' };
+static const symbol s_3_37[3] = { 'i', 'v', 'i' };
+static const symbol s_3_38[5] = { 'i', 't', 0xC4, 0x83, 'i' };
+static const symbol s_3_39[4] = { 'o', 0xC5, 0x9F, 'i' };
+static const symbol s_3_40[7] = { 'i', 't', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_3_41[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_3_42[4] = { 'i', 'b', 'i', 'l' };
+static const symbol s_3_43[3] = { 'i', 's', 'm' };
+static const symbol s_3_44[4] = { 'a', 't', 'o', 'r' };
+static const symbol s_3_45[2] = { 'o', 's' };
+static const symbol s_3_46[2] = { 'a', 't' };
+static const symbol s_3_47[2] = { 'i', 't' };
+static const symbol s_3_48[3] = { 'a', 'n', 't' };
+static const symbol s_3_49[3] = { 'i', 's', 't' };
+static const symbol s_3_50[2] = { 'u', 't' };
+static const symbol s_3_51[2] = { 'i', 'v' };
+static const symbol s_3_52[4] = { 'i', 'c', 0xC4, 0x83 };
+static const symbol s_3_53[6] = { 'a', 'b', 'i', 'l', 0xC4, 0x83 };
+static const symbol s_3_54[6] = { 'i', 'b', 'i', 'l', 0xC4, 0x83 };
+static const symbol s_3_55[5] = { 'o', 'a', 's', 0xC4, 0x83 };
+static const symbol s_3_56[4] = { 'a', 't', 0xC4, 0x83 };
+static const symbol s_3_57[4] = { 'i', 't', 0xC4, 0x83 };
+static const symbol s_3_58[5] = { 'a', 'n', 't', 0xC4, 0x83 };
+static const symbol s_3_59[5] = { 'i', 's', 't', 0xC4, 0x83 };
+static const symbol s_3_60[4] = { 'u', 't', 0xC4, 0x83 };
+static const symbol s_3_61[4] = { 'i', 'v', 0xC4, 0x83 };
+
+static const struct among a_3[62] =
+{
+/*  0 */ { 3, s_3_0, -1, 1, 0},
+/*  1 */ { 5, s_3_1, -1, 1, 0},
+/*  2 */ { 5, s_3_2, -1, 1, 0},
+/*  3 */ { 4, s_3_3, -1, 1, 0},
+/*  4 */ { 3, s_3_4, -1, 1, 0},
+/*  5 */ { 3, s_3_5, -1, 1, 0},
+/*  6 */ { 4, s_3_6, -1, 1, 0},
+/*  7 */ { 4, s_3_7, -1, 3, 0},
+/*  8 */ { 3, s_3_8, -1, 1, 0},
+/*  9 */ { 3, s_3_9, -1, 1, 0},
+/* 10 */ { 2, s_3_10, -1, 1, 0},
+/* 11 */ { 3, s_3_11, -1, 1, 0},
+/* 12 */ { 5, s_3_12, -1, 1, 0},
+/* 13 */ { 5, s_3_13, -1, 1, 0},
+/* 14 */ { 4, s_3_14, -1, 3, 0},
+/* 15 */ { 4, s_3_15, -1, 2, 0},
+/* 16 */ { 4, s_3_16, -1, 1, 0},
+/* 17 */ { 3, s_3_17, -1, 1, 0},
+/* 18 */ { 5, s_3_18, 17, 1, 0},
+/* 19 */ { 3, s_3_19, -1, 1, 0},
+/* 20 */ { 4, s_3_20, -1, 1, 0},
+/* 21 */ { 4, s_3_21, -1, 3, 0},
+/* 22 */ { 3, s_3_22, -1, 1, 0},
+/* 23 */ { 3, s_3_23, -1, 1, 0},
+/* 24 */ { 3, s_3_24, -1, 1, 0},
+/* 25 */ { 5, s_3_25, -1, 1, 0},
+/* 26 */ { 5, s_3_26, -1, 1, 0},
+/* 27 */ { 4, s_3_27, -1, 2, 0},
+/* 28 */ { 5, s_3_28, -1, 1, 0},
+/* 29 */ { 3, s_3_29, -1, 1, 0},
+/* 30 */ { 3, s_3_30, -1, 1, 0},
+/* 31 */ { 5, s_3_31, 30, 1, 0},
+/* 32 */ { 3, s_3_32, -1, 1, 0},
+/* 33 */ { 4, s_3_33, -1, 1, 0},
+/* 34 */ { 4, s_3_34, -1, 3, 0},
+/* 35 */ { 3, s_3_35, -1, 1, 0},
+/* 36 */ { 5, s_3_36, -1, 3, 0},
+/* 37 */ { 3, s_3_37, -1, 1, 0},
+/* 38 */ { 5, s_3_38, -1, 1, 0},
+/* 39 */ { 4, s_3_39, -1, 1, 0},
+/* 40 */ { 7, s_3_40, -1, 1, 0},
+/* 41 */ { 4, s_3_41, -1, 1, 0},
+/* 42 */ { 4, s_3_42, -1, 1, 0},
+/* 43 */ { 3, s_3_43, -1, 3, 0},
+/* 44 */ { 4, s_3_44, -1, 1, 0},
+/* 45 */ { 2, s_3_45, -1, 1, 0},
+/* 46 */ { 2, s_3_46, -1, 1, 0},
+/* 47 */ { 2, s_3_47, -1, 1, 0},
+/* 48 */ { 3, s_3_48, -1, 1, 0},
+/* 49 */ { 3, s_3_49, -1, 3, 0},
+/* 50 */ { 2, s_3_50, -1, 1, 0},
+/* 51 */ { 2, s_3_51, -1, 1, 0},
+/* 52 */ { 4, s_3_52, -1, 1, 0},
+/* 53 */ { 6, s_3_53, -1, 1, 0},
+/* 54 */ { 6, s_3_54, -1, 1, 0},
+/* 55 */ { 5, s_3_55, -1, 1, 0},
+/* 56 */ { 4, s_3_56, -1, 1, 0},
+/* 57 */ { 4, s_3_57, -1, 1, 0},
+/* 58 */ { 5, s_3_58, -1, 1, 0},
+/* 59 */ { 5, s_3_59, -1, 3, 0},
+/* 60 */ { 4, s_3_60, -1, 1, 0},
+/* 61 */ { 4, s_3_61, -1, 1, 0}
+};
+
+static const symbol s_4_0[2] = { 'e', 'a' };
+static const symbol s_4_1[2] = { 'i', 'a' };
+static const symbol s_4_2[3] = { 'e', 's', 'c' };
+static const symbol s_4_3[4] = { 0xC4, 0x83, 's', 'c' };
+static const symbol s_4_4[3] = { 'i', 'n', 'd' };
+static const symbol s_4_5[4] = { 0xC3, 0xA2, 'n', 'd' };
+static const symbol s_4_6[3] = { 'a', 'r', 'e' };
+static const symbol s_4_7[3] = { 'e', 'r', 'e' };
+static const symbol s_4_8[3] = { 'i', 'r', 'e' };
+static const symbol s_4_9[4] = { 0xC3, 0xA2, 'r', 'e' };
+static const symbol s_4_10[2] = { 's', 'e' };
+static const symbol s_4_11[3] = { 'a', 's', 'e' };
+static const symbol s_4_12[4] = { 's', 'e', 's', 'e' };
+static const symbol s_4_13[3] = { 'i', 's', 'e' };
+static const symbol s_4_14[3] = { 'u', 's', 'e' };
+static const symbol s_4_15[4] = { 0xC3, 0xA2, 's', 'e' };
+static const symbol s_4_16[5] = { 'e', 0xC5, 0x9F, 't', 'e' };
+static const symbol s_4_17[6] = { 0xC4, 0x83, 0xC5, 0x9F, 't', 'e' };
+static const symbol s_4_18[3] = { 'e', 'z', 'e' };
+static const symbol s_4_19[2] = { 'a', 'i' };
+static const symbol s_4_20[3] = { 'e', 'a', 'i' };
+static const symbol s_4_21[3] = { 'i', 'a', 'i' };
+static const symbol s_4_22[3] = { 's', 'e', 'i' };
+static const symbol s_4_23[5] = { 'e', 0xC5, 0x9F, 't', 'i' };
+static const symbol s_4_24[6] = { 0xC4, 0x83, 0xC5, 0x9F, 't', 'i' };
+static const symbol s_4_25[2] = { 'u', 'i' };
+static const symbol s_4_26[3] = { 'e', 'z', 'i' };
+static const symbol s_4_27[4] = { 'a', 0xC5, 0x9F, 'i' };
+static const symbol s_4_28[5] = { 's', 'e', 0xC5, 0x9F, 'i' };
+static const symbol s_4_29[6] = { 'a', 's', 'e', 0xC5, 0x9F, 'i' };
+static const symbol s_4_30[7] = { 's', 'e', 's', 'e', 0xC5, 0x9F, 'i' };
+static const symbol s_4_31[6] = { 'i', 's', 'e', 0xC5, 0x9F, 'i' };
+static const symbol s_4_32[6] = { 'u', 's', 'e', 0xC5, 0x9F, 'i' };
+static const symbol s_4_33[7] = { 0xC3, 0xA2, 's', 'e', 0xC5, 0x9F, 'i' };
+static const symbol s_4_34[4] = { 'i', 0xC5, 0x9F, 'i' };
+static const symbol s_4_35[4] = { 'u', 0xC5, 0x9F, 'i' };
+static const symbol s_4_36[5] = { 0xC3, 0xA2, 0xC5, 0x9F, 'i' };
+static const symbol s_4_37[3] = { 0xC3, 0xA2, 'i' };
+static const symbol s_4_38[4] = { 'a', 0xC5, 0xA3, 'i' };
+static const symbol s_4_39[5] = { 'e', 'a', 0xC5, 0xA3, 'i' };
+static const symbol s_4_40[5] = { 'i', 'a', 0xC5, 0xA3, 'i' };
+static const symbol s_4_41[4] = { 'e', 0xC5, 0xA3, 'i' };
+static const symbol s_4_42[4] = { 'i', 0xC5, 0xA3, 'i' };
+static const symbol s_4_43[7] = { 'a', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_44[8] = { 's', 'e', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_45[9] = { 'a', 's', 'e', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_46[10] = { 's', 'e', 's', 'e', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_47[9] = { 'i', 's', 'e', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_48[9] = { 'u', 's', 'e', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_49[10] = { 0xC3, 0xA2, 's', 'e', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_50[7] = { 'i', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_51[7] = { 'u', 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_52[8] = { 0xC3, 0xA2, 'r', 0xC4, 0x83, 0xC5, 0xA3, 'i' };
+static const symbol s_4_53[5] = { 0xC3, 0xA2, 0xC5, 0xA3, 'i' };
+static const symbol s_4_54[2] = { 'a', 'm' };
+static const symbol s_4_55[3] = { 'e', 'a', 'm' };
+static const symbol s_4_56[3] = { 'i', 'a', 'm' };
+static const symbol s_4_57[2] = { 'e', 'm' };
+static const symbol s_4_58[4] = { 'a', 's', 'e', 'm' };
+static const symbol s_4_59[5] = { 's', 'e', 's', 'e', 'm' };
+static const symbol s_4_60[4] = { 'i', 's', 'e', 'm' };
+static const symbol s_4_61[4] = { 'u', 's', 'e', 'm' };
+static const symbol s_4_62[5] = { 0xC3, 0xA2, 's', 'e', 'm' };
+static const symbol s_4_63[2] = { 'i', 'm' };
+static const symbol s_4_64[3] = { 0xC4, 0x83, 'm' };
+static const symbol s_4_65[5] = { 'a', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_66[6] = { 's', 'e', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_67[7] = { 'a', 's', 'e', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_68[8] = { 's', 'e', 's', 'e', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_69[7] = { 'i', 's', 'e', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_70[7] = { 'u', 's', 'e', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_71[8] = { 0xC3, 0xA2, 's', 'e', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_72[5] = { 'i', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_73[5] = { 'u', 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_74[6] = { 0xC3, 0xA2, 'r', 0xC4, 0x83, 'm' };
+static const symbol s_4_75[3] = { 0xC3, 0xA2, 'm' };
+static const symbol s_4_76[2] = { 'a', 'u' };
+static const symbol s_4_77[3] = { 'e', 'a', 'u' };
+static const symbol s_4_78[3] = { 'i', 'a', 'u' };
+static const symbol s_4_79[4] = { 'i', 'n', 'd', 'u' };
+static const symbol s_4_80[5] = { 0xC3, 0xA2, 'n', 'd', 'u' };
+static const symbol s_4_81[2] = { 'e', 'z' };
+static const symbol s_4_82[6] = { 'e', 'a', 's', 'c', 0xC4, 0x83 };
+static const symbol s_4_83[4] = { 'a', 'r', 0xC4, 0x83 };
+static const symbol s_4_84[5] = { 's', 'e', 'r', 0xC4, 0x83 };
+static const symbol s_4_85[6] = { 'a', 's', 'e', 'r', 0xC4, 0x83 };
+static const symbol s_4_86[7] = { 's', 'e', 's', 'e', 'r', 0xC4, 0x83 };
+static const symbol s_4_87[6] = { 'i', 's', 'e', 'r', 0xC4, 0x83 };
+static const symbol s_4_88[6] = { 'u', 's', 'e', 'r', 0xC4, 0x83 };
+static const symbol s_4_89[7] = { 0xC3, 0xA2, 's', 'e', 'r', 0xC4, 0x83 };
+static const symbol s_4_90[4] = { 'i', 'r', 0xC4, 0x83 };
+static const symbol s_4_91[4] = { 'u', 'r', 0xC4, 0x83 };
+static const symbol s_4_92[5] = { 0xC3, 0xA2, 'r', 0xC4, 0x83 };
+static const symbol s_4_93[5] = { 'e', 'a', 'z', 0xC4, 0x83 };
+
+static const struct among a_4[94] =
+{
+/*  0 */ { 2, s_4_0, -1, 1, 0},
+/*  1 */ { 2, s_4_1, -1, 1, 0},
+/*  2 */ { 3, s_4_2, -1, 1, 0},
+/*  3 */ { 4, s_4_3, -1, 1, 0},
+/*  4 */ { 3, s_4_4, -1, 1, 0},
+/*  5 */ { 4, s_4_5, -1, 1, 0},
+/*  6 */ { 3, s_4_6, -1, 1, 0},
+/*  7 */ { 3, s_4_7, -1, 1, 0},
+/*  8 */ { 3, s_4_8, -1, 1, 0},
+/*  9 */ { 4, s_4_9, -1, 1, 0},
+/* 10 */ { 2, s_4_10, -1, 2, 0},
+/* 11 */ { 3, s_4_11, 10, 1, 0},
+/* 12 */ { 4, s_4_12, 10, 2, 0},
+/* 13 */ { 3, s_4_13, 10, 1, 0},
+/* 14 */ { 3, s_4_14, 10, 1, 0},
+/* 15 */ { 4, s_4_15, 10, 1, 0},
+/* 16 */ { 5, s_4_16, -1, 1, 0},
+/* 17 */ { 6, s_4_17, -1, 1, 0},
+/* 18 */ { 3, s_4_18, -1, 1, 0},
+/* 19 */ { 2, s_4_19, -1, 1, 0},
+/* 20 */ { 3, s_4_20, 19, 1, 0},
+/* 21 */ { 3, s_4_21, 19, 1, 0},
+/* 22 */ { 3, s_4_22, -1, 2, 0},
+/* 23 */ { 5, s_4_23, -1, 1, 0},
+/* 24 */ { 6, s_4_24, -1, 1, 0},
+/* 25 */ { 2, s_4_25, -1, 1, 0},
+/* 26 */ { 3, s_4_26, -1, 1, 0},
+/* 27 */ { 4, s_4_27, -1, 1, 0},
+/* 28 */ { 5, s_4_28, -1, 2, 0},
+/* 29 */ { 6, s_4_29, 28, 1, 0},
+/* 30 */ { 7, s_4_30, 28, 2, 0},
+/* 31 */ { 6, s_4_31, 28, 1, 0},
+/* 32 */ { 6, s_4_32, 28, 1, 0},
+/* 33 */ { 7, s_4_33, 28, 1, 0},
+/* 34 */ { 4, s_4_34, -1, 1, 0},
+/* 35 */ { 4, s_4_35, -1, 1, 0},
+/* 36 */ { 5, s_4_36, -1, 1, 0},
+/* 37 */ { 3, s_4_37, -1, 1, 0},
+/* 38 */ { 4, s_4_38, -1, 2, 0},
+/* 39 */ { 5, s_4_39, 38, 1, 0},
+/* 40 */ { 5, s_4_40, 38, 1, 0},
+/* 41 */ { 4, s_4_41, -1, 2, 0},
+/* 42 */ { 4, s_4_42, -1, 2, 0},
+/* 43 */ { 7, s_4_43, -1, 1, 0},
+/* 44 */ { 8, s_4_44, -1, 2, 0},
+/* 45 */ { 9, s_4_45, 44, 1, 0},
+/* 46 */ { 10, s_4_46, 44, 2, 0},
+/* 47 */ { 9, s_4_47, 44, 1, 0},
+/* 48 */ { 9, s_4_48, 44, 1, 0},
+/* 49 */ { 10, s_4_49, 44, 1, 0},
+/* 50 */ { 7, s_4_50, -1, 1, 0},
+/* 51 */ { 7, s_4_51, -1, 1, 0},
+/* 52 */ { 8, s_4_52, -1, 1, 0},
+/* 53 */ { 5, s_4_53, -1, 2, 0},
+/* 54 */ { 2, s_4_54, -1, 1, 0},
+/* 55 */ { 3, s_4_55, 54, 1, 0},
+/* 56 */ { 3, s_4_56, 54, 1, 0},
+/* 57 */ { 2, s_4_57, -1, 2, 0},
+/* 58 */ { 4, s_4_58, 57, 1, 0},
+/* 59 */ { 5, s_4_59, 57, 2, 0},
+/* 60 */ { 4, s_4_60, 57, 1, 0},
+/* 61 */ { 4, s_4_61, 57, 1, 0},
+/* 62 */ { 5, s_4_62, 57, 1, 0},
+/* 63 */ { 2, s_4_63, -1, 2, 0},
+/* 64 */ { 3, s_4_64, -1, 2, 0},
+/* 65 */ { 5, s_4_65, 64, 1, 0},
+/* 66 */ { 6, s_4_66, 64, 2, 0},
+/* 67 */ { 7, s_4_67, 66, 1, 0},
+/* 68 */ { 8, s_4_68, 66, 2, 0},
+/* 69 */ { 7, s_4_69, 66, 1, 0},
+/* 70 */ { 7, s_4_70, 66, 1, 0},
+/* 71 */ { 8, s_4_71, 66, 1, 0},
+/* 72 */ { 5, s_4_72, 64, 1, 0},
+/* 73 */ { 5, s_4_73, 64, 1, 0},
+/* 74 */ { 6, s_4_74, 64, 1, 0},
+/* 75 */ { 3, s_4_75, -1, 2, 0},
+/* 76 */ { 2, s_4_76, -1, 1, 0},
+/* 77 */ { 3, s_4_77, 76, 1, 0},
+/* 78 */ { 3, s_4_78, 76, 1, 0},
+/* 79 */ { 4, s_4_79, -1, 1, 0},
+/* 80 */ { 5, s_4_80, -1, 1, 0},
+/* 81 */ { 2, s_4_81, -1, 1, 0},
+/* 82 */ { 6, s_4_82, -1, 1, 0},
+/* 83 */ { 4, s_4_83, -1, 1, 0},
+/* 84 */ { 5, s_4_84, -1, 2, 0},
+/* 85 */ { 6, s_4_85, 84, 1, 0},
+/* 86 */ { 7, s_4_86, 84, 2, 0},
+/* 87 */ { 6, s_4_87, 84, 1, 0},
+/* 88 */ { 6, s_4_88, 84, 1, 0},
+/* 89 */ { 7, s_4_89, 84, 1, 0},
+/* 90 */ { 4, s_4_90, -1, 1, 0},
+/* 91 */ { 4, s_4_91, -1, 1, 0},
+/* 92 */ { 5, s_4_92, -1, 1, 0},
+/* 93 */ { 5, s_4_93, -1, 1, 0}
+};
+
+static const symbol s_5_0[1] = { 'a' };
+static const symbol s_5_1[1] = { 'e' };
+static const symbol s_5_2[2] = { 'i', 'e' };
+static const symbol s_5_3[1] = { 'i' };
+static const symbol s_5_4[2] = { 0xC4, 0x83 };
+
+static const struct among a_5[5] =
+{
+/*  0 */ { 1, s_5_0, -1, 1, 0},
+/*  1 */ { 1, s_5_1, -1, 1, 0},
+/*  2 */ { 2, s_5_2, 1, 1, 0},
+/*  3 */ { 1, s_5_3, -1, 1, 0},
+/*  4 */ { 2, s_5_4, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 32, 0, 0, 4 };
+
+static const symbol s_0[] = { 'u' };
+static const symbol s_1[] = { 'U' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'I' };
+static const symbol s_4[] = { 'i' };
+static const symbol s_5[] = { 'u' };
+static const symbol s_6[] = { 'a' };
+static const symbol s_7[] = { 'e' };
+static const symbol s_8[] = { 'i' };
+static const symbol s_9[] = { 'a', 'b' };
+static const symbol s_10[] = { 'i' };
+static const symbol s_11[] = { 'a', 't' };
+static const symbol s_12[] = { 'a', 0xC5, 0xA3, 'i' };
+static const symbol s_13[] = { 'a', 'b', 'i', 'l' };
+static const symbol s_14[] = { 'i', 'b', 'i', 'l' };
+static const symbol s_15[] = { 'i', 'v' };
+static const symbol s_16[] = { 'i', 'c' };
+static const symbol s_17[] = { 'a', 't' };
+static const symbol s_18[] = { 'i', 't' };
+static const symbol s_19[] = { 0xC5, 0xA3 };
+static const symbol s_20[] = { 't' };
+static const symbol s_21[] = { 'i', 's', 't' };
+static const symbol s_22[] = { 'u' };
+
+static int r_prelude(struct SN_env * z) {
+    while(1) { /* repeat, line 32 */
+        int c1 = z->c;
+        while(1) { /* goto, line 32 */
+            int c2 = z->c;
+            if (in_grouping_U(z, g_v, 97, 259, 0)) goto lab1;
+            z->bra = z->c; /* [, line 33 */
+            {   int c3 = z->c; /* or, line 33 */
+                if (!(eq_s(z, 1, s_0))) goto lab3;
+                z->ket = z->c; /* ], line 33 */
+                if (in_grouping_U(z, g_v, 97, 259, 0)) goto lab3;
+                {   int ret = slice_from_s(z, 1, s_1); /* <-, line 33 */
+                    if (ret < 0) return ret;
+                }
+                goto lab2;
+            lab3:
+                z->c = c3;
+                if (!(eq_s(z, 1, s_2))) goto lab1;
+                z->ket = z->c; /* ], line 34 */
+                if (in_grouping_U(z, g_v, 97, 259, 0)) goto lab1;
+                {   int ret = slice_from_s(z, 1, s_3); /* <-, line 34 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab2:
+            z->c = c2;
+            break;
+        lab1:
+            z->c = c2;
+            {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                if (ret < 0) goto lab0;
+                z->c = ret; /* goto, line 32 */
+            }
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 44 */
+        {   int c2 = z->c; /* or, line 46 */
+            if (in_grouping_U(z, g_v, 97, 259, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 45 */
+                if (out_grouping_U(z, g_v, 97, 259, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 45 */
+                    int ret = out_grouping_U(z, g_v, 97, 259, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping_U(z, g_v, 97, 259, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 45 */
+                    int ret = in_grouping_U(z, g_v, 97, 259, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping_U(z, g_v, 97, 259, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 47 */
+                if (out_grouping_U(z, g_v, 97, 259, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 47 */
+                    int ret = out_grouping_U(z, g_v, 97, 259, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping_U(z, g_v, 97, 259, 0)) goto lab0;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 47 */
+                }
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 48 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 50 */
+        {    /* gopast */ /* grouping v, line 51 */
+            int ret = out_grouping_U(z, g_v, 97, 259, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 51 */
+            int ret = in_grouping_U(z, g_v, 97, 259, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 51 */
+        {    /* gopast */ /* grouping v, line 52 */
+            int ret = out_grouping_U(z, g_v, 97, 259, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 52 */
+            int ret = in_grouping_U(z, g_v, 97, 259, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 52 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 56 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 58 */
+        if (z->c >= z->l || (z->p[z->c + 0] != 73 && z->p[z->c + 0] != 85)) among_var = 3; else
+        among_var = find_among(z, a_0, 3); /* substring, line 58 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 58 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_4); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_5); /* <-, line 60 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 61 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_step_0(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 73 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((266786 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_1, 16); /* substring, line 73 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 73 */
+    {   int ret = r_R1(z);
+        if (ret == 0) return 0; /* call R1, line 73 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 75 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 1, s_6); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_7); /* <-, line 79 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 1, s_8); /* <-, line 81 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int m1 = z->l - z->c; (void)m1; /* not, line 83 */
+                if (!(eq_s_b(z, 2, s_9))) goto lab0;
+                return 0;
+            lab0:
+                z->c = z->l - m1;
+            }
+            {   int ret = slice_from_s(z, 1, s_10); /* <-, line 83 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_from_s(z, 2, s_11); /* <-, line 85 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            {   int ret = slice_from_s(z, 4, s_12); /* <-, line 87 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_combo_suffix(struct SN_env * z) {
+    int among_var;
+    {   int m_test = z->l - z->c; /* test, line 91 */
+        z->ket = z->c; /* [, line 92 */
+        among_var = find_among_b(z, a_2, 46); /* substring, line 92 */
+        if (!(among_var)) return 0;
+        z->bra = z->c; /* ], line 92 */
+        {   int ret = r_R1(z);
+            if (ret == 0) return 0; /* call R1, line 92 */
+            if (ret < 0) return ret;
+        }
+        switch(among_var) {
+            case 0: return 0;
+            case 1:
+                {   int ret = slice_from_s(z, 4, s_13); /* <-, line 101 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 4, s_14); /* <-, line 104 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 2, s_15); /* <-, line 107 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = slice_from_s(z, 2, s_16); /* <-, line 113 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = slice_from_s(z, 2, s_17); /* <-, line 118 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 6:
+                {   int ret = slice_from_s(z, 2, s_18); /* <-, line 122 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->B[0] = 1; /* set standard_suffix_removed, line 125 */
+        z->c = z->l - m_test;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->B[0] = 0; /* unset standard_suffix_removed, line 130 */
+    while(1) { /* repeat, line 131 */
+        int m1 = z->l - z->c; (void)m1;
+        {   int ret = r_combo_suffix(z);
+            if (ret == 0) goto lab0; /* call combo_suffix, line 131 */
+            if (ret < 0) return ret;
+        }
+        continue;
+    lab0:
+        z->c = z->l - m1;
+        break;
+    }
+    z->ket = z->c; /* [, line 132 */
+    among_var = find_among_b(z, a_3, 62); /* substring, line 132 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 132 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 132 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 149 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (!(eq_s_b(z, 2, s_19))) return 0;
+            z->bra = z->c; /* ], line 152 */
+            {   int ret = slice_from_s(z, 1, s_20); /* <-, line 152 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 3, s_21); /* <-, line 156 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    z->B[0] = 1; /* set standard_suffix_removed, line 160 */
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 164 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 164 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 165 */
+        among_var = find_among_b(z, a_4, 94); /* substring, line 165 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 165 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int m2 = z->l - z->c; (void)m2; /* or, line 200 */
+                    if (out_grouping_b_U(z, g_v, 97, 259, 0)) goto lab1;
+                    goto lab0;
+                lab1:
+                    z->c = z->l - m2;
+                    if (!(eq_s_b(z, 1, s_22))) { z->lb = mlimit; return 0; }
+                }
+            lab0:
+                {   int ret = slice_del(z); /* delete, line 200 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_del(z); /* delete, line 214 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_vowel_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 219 */
+    among_var = find_among_b(z, a_5, 5); /* substring, line 219 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 219 */
+    {   int ret = r_RV(z);
+        if (ret == 0) return 0; /* call RV, line 219 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 220 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int romanian_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 226 */
+        {   int ret = r_prelude(z);
+            if (ret == 0) goto lab0; /* call prelude, line 226 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    {   int c2 = z->c; /* do, line 227 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab1; /* call mark_regions, line 227 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = c2;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 228 */
+
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 229 */
+        {   int ret = r_step_0(z);
+            if (ret == 0) goto lab2; /* call step_0, line 229 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 230 */
+        {   int ret = r_standard_suffix(z);
+            if (ret == 0) goto lab3; /* call standard_suffix, line 230 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 231 */
+        {   int m6 = z->l - z->c; (void)m6; /* or, line 231 */
+            if (!(z->B[0])) goto lab6; /* Boolean test standard_suffix_removed, line 231 */
+            goto lab5;
+        lab6:
+            z->c = z->l - m6;
+            {   int ret = r_verb_suffix(z);
+                if (ret == 0) goto lab4; /* call verb_suffix, line 231 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab5:
+    lab4:
+        z->c = z->l - m5;
+    }
+    {   int m7 = z->l - z->c; (void)m7; /* do, line 232 */
+        {   int ret = r_vowel_suffix(z);
+            if (ret == 0) goto lab7; /* call vowel_suffix, line 232 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = z->l - m7;
+    }
+    z->c = z->lb;
+    {   int c8 = z->c; /* do, line 234 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab8; /* call postlude, line 234 */
+            if (ret < 0) return ret;
+        }
+    lab8:
+        z->c = c8;
+    }
+    return 1;
+}
+
+extern struct SN_env * romanian_UTF_8_create_env(void) { return SN_create_env(0, 3, 1); }
+
+extern void romanian_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_russian.c b/src/backend/snowball/libstemmer/stem_UTF_8_russian.c
new file mode 100644
index 000000000000..fcbcc6cf4648
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_russian.c
@@ -0,0 +1,694 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int russian_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_tidy_up(struct SN_env * z);
+static int r_derivational(struct SN_env * z);
+static int r_noun(struct SN_env * z);
+static int r_verb(struct SN_env * z);
+static int r_reflexive(struct SN_env * z);
+static int r_adjectival(struct SN_env * z);
+static int r_adjective(struct SN_env * z);
+static int r_perfective_gerund(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * russian_UTF_8_create_env(void);
+extern void russian_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[10] = { 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8, 0xD1, 0x81, 0xD1, 0x8C };
+static const symbol s_0_1[12] = { 0xD1, 0x8B, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8, 0xD1, 0x81, 0xD1, 0x8C };
+static const symbol s_0_2[12] = { 0xD0, 0xB8, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8, 0xD1, 0x81, 0xD1, 0x8C };
+static const symbol s_0_3[2] = { 0xD0, 0xB2 };
+static const symbol s_0_4[4] = { 0xD1, 0x8B, 0xD0, 0xB2 };
+static const symbol s_0_5[4] = { 0xD0, 0xB8, 0xD0, 0xB2 };
+static const symbol s_0_6[6] = { 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8 };
+static const symbol s_0_7[8] = { 0xD1, 0x8B, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8 };
+static const symbol s_0_8[8] = { 0xD0, 0xB8, 0xD0, 0xB2, 0xD1, 0x88, 0xD0, 0xB8 };
+
+static const struct among a_0[9] =
+{
+/*  0 */ { 10, s_0_0, -1, 1, 0},
+/*  1 */ { 12, s_0_1, 0, 2, 0},
+/*  2 */ { 12, s_0_2, 0, 2, 0},
+/*  3 */ { 2, s_0_3, -1, 1, 0},
+/*  4 */ { 4, s_0_4, 3, 2, 0},
+/*  5 */ { 4, s_0_5, 3, 2, 0},
+/*  6 */ { 6, s_0_6, -1, 1, 0},
+/*  7 */ { 8, s_0_7, 6, 2, 0},
+/*  8 */ { 8, s_0_8, 6, 2, 0}
+};
+
+static const symbol s_1_0[6] = { 0xD0, 0xB5, 0xD0, 0xBC, 0xD1, 0x83 };
+static const symbol s_1_1[6] = { 0xD0, 0xBE, 0xD0, 0xBC, 0xD1, 0x83 };
+static const symbol s_1_2[4] = { 0xD1, 0x8B, 0xD1, 0x85 };
+static const symbol s_1_3[4] = { 0xD0, 0xB8, 0xD1, 0x85 };
+static const symbol s_1_4[4] = { 0xD1, 0x83, 0xD1, 0x8E };
+static const symbol s_1_5[4] = { 0xD1, 0x8E, 0xD1, 0x8E };
+static const symbol s_1_6[4] = { 0xD0, 0xB5, 0xD1, 0x8E };
+static const symbol s_1_7[4] = { 0xD0, 0xBE, 0xD1, 0x8E };
+static const symbol s_1_8[4] = { 0xD1, 0x8F, 0xD1, 0x8F };
+static const symbol s_1_9[4] = { 0xD0, 0xB0, 0xD1, 0x8F };
+static const symbol s_1_10[4] = { 0xD1, 0x8B, 0xD0, 0xB5 };
+static const symbol s_1_11[4] = { 0xD0, 0xB5, 0xD0, 0xB5 };
+static const symbol s_1_12[4] = { 0xD0, 0xB8, 0xD0, 0xB5 };
+static const symbol s_1_13[4] = { 0xD0, 0xBE, 0xD0, 0xB5 };
+static const symbol s_1_14[6] = { 0xD1, 0x8B, 0xD0, 0xBC, 0xD0, 0xB8 };
+static const symbol s_1_15[6] = { 0xD0, 0xB8, 0xD0, 0xBC, 0xD0, 0xB8 };
+static const symbol s_1_16[4] = { 0xD1, 0x8B, 0xD0, 0xB9 };
+static const symbol s_1_17[4] = { 0xD0, 0xB5, 0xD0, 0xB9 };
+static const symbol s_1_18[4] = { 0xD0, 0xB8, 0xD0, 0xB9 };
+static const symbol s_1_19[4] = { 0xD0, 0xBE, 0xD0, 0xB9 };
+static const symbol s_1_20[4] = { 0xD1, 0x8B, 0xD0, 0xBC };
+static const symbol s_1_21[4] = { 0xD0, 0xB5, 0xD0, 0xBC };
+static const symbol s_1_22[4] = { 0xD0, 0xB8, 0xD0, 0xBC };
+static const symbol s_1_23[4] = { 0xD0, 0xBE, 0xD0, 0xBC };
+static const symbol s_1_24[6] = { 0xD0, 0xB5, 0xD0, 0xB3, 0xD0, 0xBE };
+static const symbol s_1_25[6] = { 0xD0, 0xBE, 0xD0, 0xB3, 0xD0, 0xBE };
+
+static const struct among a_1[26] =
+{
+/*  0 */ { 6, s_1_0, -1, 1, 0},
+/*  1 */ { 6, s_1_1, -1, 1, 0},
+/*  2 */ { 4, s_1_2, -1, 1, 0},
+/*  3 */ { 4, s_1_3, -1, 1, 0},
+/*  4 */ { 4, s_1_4, -1, 1, 0},
+/*  5 */ { 4, s_1_5, -1, 1, 0},
+/*  6 */ { 4, s_1_6, -1, 1, 0},
+/*  7 */ { 4, s_1_7, -1, 1, 0},
+/*  8 */ { 4, s_1_8, -1, 1, 0},
+/*  9 */ { 4, s_1_9, -1, 1, 0},
+/* 10 */ { 4, s_1_10, -1, 1, 0},
+/* 11 */ { 4, s_1_11, -1, 1, 0},
+/* 12 */ { 4, s_1_12, -1, 1, 0},
+/* 13 */ { 4, s_1_13, -1, 1, 0},
+/* 14 */ { 6, s_1_14, -1, 1, 0},
+/* 15 */ { 6, s_1_15, -1, 1, 0},
+/* 16 */ { 4, s_1_16, -1, 1, 0},
+/* 17 */ { 4, s_1_17, -1, 1, 0},
+/* 18 */ { 4, s_1_18, -1, 1, 0},
+/* 19 */ { 4, s_1_19, -1, 1, 0},
+/* 20 */ { 4, s_1_20, -1, 1, 0},
+/* 21 */ { 4, s_1_21, -1, 1, 0},
+/* 22 */ { 4, s_1_22, -1, 1, 0},
+/* 23 */ { 4, s_1_23, -1, 1, 0},
+/* 24 */ { 6, s_1_24, -1, 1, 0},
+/* 25 */ { 6, s_1_25, -1, 1, 0}
+};
+
+static const symbol s_2_0[4] = { 0xD0, 0xB2, 0xD1, 0x88 };
+static const symbol s_2_1[6] = { 0xD1, 0x8B, 0xD0, 0xB2, 0xD1, 0x88 };
+static const symbol s_2_2[6] = { 0xD0, 0xB8, 0xD0, 0xB2, 0xD1, 0x88 };
+static const symbol s_2_3[2] = { 0xD1, 0x89 };
+static const symbol s_2_4[4] = { 0xD1, 0x8E, 0xD1, 0x89 };
+static const symbol s_2_5[6] = { 0xD1, 0x83, 0xD1, 0x8E, 0xD1, 0x89 };
+static const symbol s_2_6[4] = { 0xD0, 0xB5, 0xD0, 0xBC };
+static const symbol s_2_7[4] = { 0xD0, 0xBD, 0xD0, 0xBD };
+
+static const struct among a_2[8] =
+{
+/*  0 */ { 4, s_2_0, -1, 1, 0},
+/*  1 */ { 6, s_2_1, 0, 2, 0},
+/*  2 */ { 6, s_2_2, 0, 2, 0},
+/*  3 */ { 2, s_2_3, -1, 1, 0},
+/*  4 */ { 4, s_2_4, 3, 1, 0},
+/*  5 */ { 6, s_2_5, 4, 2, 0},
+/*  6 */ { 4, s_2_6, -1, 1, 0},
+/*  7 */ { 4, s_2_7, -1, 1, 0}
+};
+
+static const symbol s_3_0[4] = { 0xD1, 0x81, 0xD1, 0x8C };
+static const symbol s_3_1[4] = { 0xD1, 0x81, 0xD1, 0x8F };
+
+static const struct among a_3[2] =
+{
+/*  0 */ { 4, s_3_0, -1, 1, 0},
+/*  1 */ { 4, s_3_1, -1, 1, 0}
+};
+
+static const symbol s_4_0[4] = { 0xD1, 0x8B, 0xD1, 0x82 };
+static const symbol s_4_1[4] = { 0xD1, 0x8E, 0xD1, 0x82 };
+static const symbol s_4_2[6] = { 0xD1, 0x83, 0xD1, 0x8E, 0xD1, 0x82 };
+static const symbol s_4_3[4] = { 0xD1, 0x8F, 0xD1, 0x82 };
+static const symbol s_4_4[4] = { 0xD0, 0xB5, 0xD1, 0x82 };
+static const symbol s_4_5[6] = { 0xD1, 0x83, 0xD0, 0xB5, 0xD1, 0x82 };
+static const symbol s_4_6[4] = { 0xD0, 0xB8, 0xD1, 0x82 };
+static const symbol s_4_7[4] = { 0xD0, 0xBD, 0xD1, 0x8B };
+static const symbol s_4_8[6] = { 0xD0, 0xB5, 0xD0, 0xBD, 0xD1, 0x8B };
+static const symbol s_4_9[4] = { 0xD1, 0x82, 0xD1, 0x8C };
+static const symbol s_4_10[6] = { 0xD1, 0x8B, 0xD1, 0x82, 0xD1, 0x8C };
+static const symbol s_4_11[6] = { 0xD0, 0xB8, 0xD1, 0x82, 0xD1, 0x8C };
+static const symbol s_4_12[6] = { 0xD0, 0xB5, 0xD1, 0x88, 0xD1, 0x8C };
+static const symbol s_4_13[6] = { 0xD0, 0xB8, 0xD1, 0x88, 0xD1, 0x8C };
+static const symbol s_4_14[2] = { 0xD1, 0x8E };
+static const symbol s_4_15[4] = { 0xD1, 0x83, 0xD1, 0x8E };
+static const symbol s_4_16[4] = { 0xD0, 0xBB, 0xD0, 0xB0 };
+static const symbol s_4_17[6] = { 0xD1, 0x8B, 0xD0, 0xBB, 0xD0, 0xB0 };
+static const symbol s_4_18[6] = { 0xD0, 0xB8, 0xD0, 0xBB, 0xD0, 0xB0 };
+static const symbol s_4_19[4] = { 0xD0, 0xBD, 0xD0, 0xB0 };
+static const symbol s_4_20[6] = { 0xD0, 0xB5, 0xD0, 0xBD, 0xD0, 0xB0 };
+static const symbol s_4_21[6] = { 0xD0, 0xB5, 0xD1, 0x82, 0xD0, 0xB5 };
+static const symbol s_4_22[6] = { 0xD0, 0xB8, 0xD1, 0x82, 0xD0, 0xB5 };
+static const symbol s_4_23[6] = { 0xD0, 0xB9, 0xD1, 0x82, 0xD0, 0xB5 };
+static const symbol s_4_24[8] = { 0xD1, 0x83, 0xD0, 0xB9, 0xD1, 0x82, 0xD0, 0xB5 };
+static const symbol s_4_25[8] = { 0xD0, 0xB5, 0xD0, 0xB9, 0xD1, 0x82, 0xD0, 0xB5 };
+static const symbol s_4_26[4] = { 0xD0, 0xBB, 0xD0, 0xB8 };
+static const symbol s_4_27[6] = { 0xD1, 0x8B, 0xD0, 0xBB, 0xD0, 0xB8 };
+static const symbol s_4_28[6] = { 0xD0, 0xB8, 0xD0, 0xBB, 0xD0, 0xB8 };
+static const symbol s_4_29[2] = { 0xD0, 0xB9 };
+static const symbol s_4_30[4] = { 0xD1, 0x83, 0xD0, 0xB9 };
+static const symbol s_4_31[4] = { 0xD0, 0xB5, 0xD0, 0xB9 };
+static const symbol s_4_32[2] = { 0xD0, 0xBB };
+static const symbol s_4_33[4] = { 0xD1, 0x8B, 0xD0, 0xBB };
+static const symbol s_4_34[4] = { 0xD0, 0xB8, 0xD0, 0xBB };
+static const symbol s_4_35[4] = { 0xD1, 0x8B, 0xD0, 0xBC };
+static const symbol s_4_36[4] = { 0xD0, 0xB5, 0xD0, 0xBC };
+static const symbol s_4_37[4] = { 0xD0, 0xB8, 0xD0, 0xBC };
+static const symbol s_4_38[2] = { 0xD0, 0xBD };
+static const symbol s_4_39[4] = { 0xD0, 0xB5, 0xD0, 0xBD };
+static const symbol s_4_40[4] = { 0xD0, 0xBB, 0xD0, 0xBE };
+static const symbol s_4_41[6] = { 0xD1, 0x8B, 0xD0, 0xBB, 0xD0, 0xBE };
+static const symbol s_4_42[6] = { 0xD0, 0xB8, 0xD0, 0xBB, 0xD0, 0xBE };
+static const symbol s_4_43[4] = { 0xD0, 0xBD, 0xD0, 0xBE };
+static const symbol s_4_44[6] = { 0xD0, 0xB5, 0xD0, 0xBD, 0xD0, 0xBE };
+static const symbol s_4_45[6] = { 0xD0, 0xBD, 0xD0, 0xBD, 0xD0, 0xBE };
+
+static const struct among a_4[46] =
+{
+/*  0 */ { 4, s_4_0, -1, 2, 0},
+/*  1 */ { 4, s_4_1, -1, 1, 0},
+/*  2 */ { 6, s_4_2, 1, 2, 0},
+/*  3 */ { 4, s_4_3, -1, 2, 0},
+/*  4 */ { 4, s_4_4, -1, 1, 0},
+/*  5 */ { 6, s_4_5, 4, 2, 0},
+/*  6 */ { 4, s_4_6, -1, 2, 0},
+/*  7 */ { 4, s_4_7, -1, 1, 0},
+/*  8 */ { 6, s_4_8, 7, 2, 0},
+/*  9 */ { 4, s_4_9, -1, 1, 0},
+/* 10 */ { 6, s_4_10, 9, 2, 0},
+/* 11 */ { 6, s_4_11, 9, 2, 0},
+/* 12 */ { 6, s_4_12, -1, 1, 0},
+/* 13 */ { 6, s_4_13, -1, 2, 0},
+/* 14 */ { 2, s_4_14, -1, 2, 0},
+/* 15 */ { 4, s_4_15, 14, 2, 0},
+/* 16 */ { 4, s_4_16, -1, 1, 0},
+/* 17 */ { 6, s_4_17, 16, 2, 0},
+/* 18 */ { 6, s_4_18, 16, 2, 0},
+/* 19 */ { 4, s_4_19, -1, 1, 0},
+/* 20 */ { 6, s_4_20, 19, 2, 0},
+/* 21 */ { 6, s_4_21, -1, 1, 0},
+/* 22 */ { 6, s_4_22, -1, 2, 0},
+/* 23 */ { 6, s_4_23, -1, 1, 0},
+/* 24 */ { 8, s_4_24, 23, 2, 0},
+/* 25 */ { 8, s_4_25, 23, 2, 0},
+/* 26 */ { 4, s_4_26, -1, 1, 0},
+/* 27 */ { 6, s_4_27, 26, 2, 0},
+/* 28 */ { 6, s_4_28, 26, 2, 0},
+/* 29 */ { 2, s_4_29, -1, 1, 0},
+/* 30 */ { 4, s_4_30, 29, 2, 0},
+/* 31 */ { 4, s_4_31, 29, 2, 0},
+/* 32 */ { 2, s_4_32, -1, 1, 0},
+/* 33 */ { 4, s_4_33, 32, 2, 0},
+/* 34 */ { 4, s_4_34, 32, 2, 0},
+/* 35 */ { 4, s_4_35, -1, 2, 0},
+/* 36 */ { 4, s_4_36, -1, 1, 0},
+/* 37 */ { 4, s_4_37, -1, 2, 0},
+/* 38 */ { 2, s_4_38, -1, 1, 0},
+/* 39 */ { 4, s_4_39, 38, 2, 0},
+/* 40 */ { 4, s_4_40, -1, 1, 0},
+/* 41 */ { 6, s_4_41, 40, 2, 0},
+/* 42 */ { 6, s_4_42, 40, 2, 0},
+/* 43 */ { 4, s_4_43, -1, 1, 0},
+/* 44 */ { 6, s_4_44, 43, 2, 0},
+/* 45 */ { 6, s_4_45, 43, 1, 0}
+};
+
+static const symbol s_5_0[2] = { 0xD1, 0x83 };
+static const symbol s_5_1[4] = { 0xD1, 0x8F, 0xD1, 0x85 };
+static const symbol s_5_2[6] = { 0xD0, 0xB8, 0xD1, 0x8F, 0xD1, 0x85 };
+static const symbol s_5_3[4] = { 0xD0, 0xB0, 0xD1, 0x85 };
+static const symbol s_5_4[2] = { 0xD1, 0x8B };
+static const symbol s_5_5[2] = { 0xD1, 0x8C };
+static const symbol s_5_6[2] = { 0xD1, 0x8E };
+static const symbol s_5_7[4] = { 0xD1, 0x8C, 0xD1, 0x8E };
+static const symbol s_5_8[4] = { 0xD0, 0xB8, 0xD1, 0x8E };
+static const symbol s_5_9[2] = { 0xD1, 0x8F };
+static const symbol s_5_10[4] = { 0xD1, 0x8C, 0xD1, 0x8F };
+static const symbol s_5_11[4] = { 0xD0, 0xB8, 0xD1, 0x8F };
+static const symbol s_5_12[2] = { 0xD0, 0xB0 };
+static const symbol s_5_13[4] = { 0xD0, 0xB5, 0xD0, 0xB2 };
+static const symbol s_5_14[4] = { 0xD0, 0xBE, 0xD0, 0xB2 };
+static const symbol s_5_15[2] = { 0xD0, 0xB5 };
+static const symbol s_5_16[4] = { 0xD1, 0x8C, 0xD0, 0xB5 };
+static const symbol s_5_17[4] = { 0xD0, 0xB8, 0xD0, 0xB5 };
+static const symbol s_5_18[2] = { 0xD0, 0xB8 };
+static const symbol s_5_19[4] = { 0xD0, 0xB5, 0xD0, 0xB8 };
+static const symbol s_5_20[4] = { 0xD0, 0xB8, 0xD0, 0xB8 };
+static const symbol s_5_21[6] = { 0xD1, 0x8F, 0xD0, 0xBC, 0xD0, 0xB8 };
+static const symbol s_5_22[8] = { 0xD0, 0xB8, 0xD1, 0x8F, 0xD0, 0xBC, 0xD0, 0xB8 };
+static const symbol s_5_23[6] = { 0xD0, 0xB0, 0xD0, 0xBC, 0xD0, 0xB8 };
+static const symbol s_5_24[2] = { 0xD0, 0xB9 };
+static const symbol s_5_25[4] = { 0xD0, 0xB5, 0xD0, 0xB9 };
+static const symbol s_5_26[6] = { 0xD0, 0xB8, 0xD0, 0xB5, 0xD0, 0xB9 };
+static const symbol s_5_27[4] = { 0xD0, 0xB8, 0xD0, 0xB9 };
+static const symbol s_5_28[4] = { 0xD0, 0xBE, 0xD0, 0xB9 };
+static const symbol s_5_29[4] = { 0xD1, 0x8F, 0xD0, 0xBC };
+static const symbol s_5_30[6] = { 0xD0, 0xB8, 0xD1, 0x8F, 0xD0, 0xBC };
+static const symbol s_5_31[4] = { 0xD0, 0xB0, 0xD0, 0xBC };
+static const symbol s_5_32[4] = { 0xD0, 0xB5, 0xD0, 0xBC };
+static const symbol s_5_33[6] = { 0xD0, 0xB8, 0xD0, 0xB5, 0xD0, 0xBC };
+static const symbol s_5_34[4] = { 0xD0, 0xBE, 0xD0, 0xBC };
+static const symbol s_5_35[2] = { 0xD0, 0xBE };
+
+static const struct among a_5[36] =
+{
+/*  0 */ { 2, s_5_0, -1, 1, 0},
+/*  1 */ { 4, s_5_1, -1, 1, 0},
+/*  2 */ { 6, s_5_2, 1, 1, 0},
+/*  3 */ { 4, s_5_3, -1, 1, 0},
+/*  4 */ { 2, s_5_4, -1, 1, 0},
+/*  5 */ { 2, s_5_5, -1, 1, 0},
+/*  6 */ { 2, s_5_6, -1, 1, 0},
+/*  7 */ { 4, s_5_7, 6, 1, 0},
+/*  8 */ { 4, s_5_8, 6, 1, 0},
+/*  9 */ { 2, s_5_9, -1, 1, 0},
+/* 10 */ { 4, s_5_10, 9, 1, 0},
+/* 11 */ { 4, s_5_11, 9, 1, 0},
+/* 12 */ { 2, s_5_12, -1, 1, 0},
+/* 13 */ { 4, s_5_13, -1, 1, 0},
+/* 14 */ { 4, s_5_14, -1, 1, 0},
+/* 15 */ { 2, s_5_15, -1, 1, 0},
+/* 16 */ { 4, s_5_16, 15, 1, 0},
+/* 17 */ { 4, s_5_17, 15, 1, 0},
+/* 18 */ { 2, s_5_18, -1, 1, 0},
+/* 19 */ { 4, s_5_19, 18, 1, 0},
+/* 20 */ { 4, s_5_20, 18, 1, 0},
+/* 21 */ { 6, s_5_21, 18, 1, 0},
+/* 22 */ { 8, s_5_22, 21, 1, 0},
+/* 23 */ { 6, s_5_23, 18, 1, 0},
+/* 24 */ { 2, s_5_24, -1, 1, 0},
+/* 25 */ { 4, s_5_25, 24, 1, 0},
+/* 26 */ { 6, s_5_26, 25, 1, 0},
+/* 27 */ { 4, s_5_27, 24, 1, 0},
+/* 28 */ { 4, s_5_28, 24, 1, 0},
+/* 29 */ { 4, s_5_29, -1, 1, 0},
+/* 30 */ { 6, s_5_30, 29, 1, 0},
+/* 31 */ { 4, s_5_31, -1, 1, 0},
+/* 32 */ { 4, s_5_32, -1, 1, 0},
+/* 33 */ { 6, s_5_33, 32, 1, 0},
+/* 34 */ { 4, s_5_34, -1, 1, 0},
+/* 35 */ { 2, s_5_35, -1, 1, 0}
+};
+
+static const symbol s_6_0[6] = { 0xD0, 0xBE, 0xD1, 0x81, 0xD1, 0x82 };
+static const symbol s_6_1[8] = { 0xD0, 0xBE, 0xD1, 0x81, 0xD1, 0x82, 0xD1, 0x8C };
+
+static const struct among a_6[2] =
+{
+/*  0 */ { 6, s_6_0, -1, 1, 0},
+/*  1 */ { 8, s_6_1, -1, 1, 0}
+};
+
+static const symbol s_7_0[6] = { 0xD0, 0xB5, 0xD0, 0xB9, 0xD1, 0x88 };
+static const symbol s_7_1[2] = { 0xD1, 0x8C };
+static const symbol s_7_2[8] = { 0xD0, 0xB5, 0xD0, 0xB9, 0xD1, 0x88, 0xD0, 0xB5 };
+static const symbol s_7_3[2] = { 0xD0, 0xBD };
+
+static const struct among a_7[4] =
+{
+/*  0 */ { 6, s_7_0, -1, 1, 0},
+/*  1 */ { 2, s_7_1, -1, 3, 0},
+/*  2 */ { 8, s_7_2, -1, 1, 0},
+/*  3 */ { 2, s_7_3, -1, 2, 0}
+};
+
+static const unsigned char g_v[] = { 33, 65, 8, 232 };
+
+static const symbol s_0[] = { 0xD0, 0xB0 };
+static const symbol s_1[] = { 0xD1, 0x8F };
+static const symbol s_2[] = { 0xD0, 0xB0 };
+static const symbol s_3[] = { 0xD1, 0x8F };
+static const symbol s_4[] = { 0xD0, 0xB0 };
+static const symbol s_5[] = { 0xD1, 0x8F };
+static const symbol s_6[] = { 0xD0, 0xBD };
+static const symbol s_7[] = { 0xD0, 0xBD };
+static const symbol s_8[] = { 0xD0, 0xBD };
+static const symbol s_9[] = { 0xD0, 0xB8 };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    {   int c1 = z->c; /* do, line 61 */
+        {    /* gopast */ /* grouping v, line 62 */
+            int ret = out_grouping_U(z, g_v, 1072, 1103, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        z->I[0] = z->c; /* setmark pV, line 62 */
+        {    /* gopast */ /* non v, line 62 */
+            int ret = in_grouping_U(z, g_v, 1072, 1103, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        {    /* gopast */ /* grouping v, line 63 */
+            int ret = out_grouping_U(z, g_v, 1072, 1103, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 63 */
+            int ret = in_grouping_U(z, g_v, 1072, 1103, 1);
+            if (ret < 0) goto lab0;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p2, line 63 */
+    lab0:
+        z->c = c1;
+    }
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_perfective_gerund(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 72 */
+    among_var = find_among_b(z, a_0, 9); /* substring, line 72 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 72 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 76 */
+                if (!(eq_s_b(z, 2, s_0))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 2, s_1))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 76 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 83 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_adjective(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 88 */
+    among_var = find_among_b(z, a_1, 26); /* substring, line 88 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 88 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 97 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_adjectival(struct SN_env * z) {
+    int among_var;
+    {   int ret = r_adjective(z);
+        if (ret == 0) return 0; /* call adjective, line 102 */
+        if (ret < 0) return ret;
+    }
+    {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 109 */
+        z->ket = z->c; /* [, line 110 */
+        among_var = find_among_b(z, a_2, 8); /* substring, line 110 */
+        if (!(among_var)) { z->c = z->l - m_keep; goto lab0; }
+        z->bra = z->c; /* ], line 110 */
+        switch(among_var) {
+            case 0: { z->c = z->l - m_keep; goto lab0; }
+            case 1:
+                {   int m1 = z->l - z->c; (void)m1; /* or, line 115 */
+                    if (!(eq_s_b(z, 2, s_2))) goto lab2;
+                    goto lab1;
+                lab2:
+                    z->c = z->l - m1;
+                    if (!(eq_s_b(z, 2, s_3))) { z->c = z->l - m_keep; goto lab0; }
+                }
+            lab1:
+                {   int ret = slice_del(z); /* delete, line 115 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_del(z); /* delete, line 122 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+    lab0:
+        ;
+    }
+    return 1;
+}
+
+static int r_reflexive(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 129 */
+    if (z->c - 3 <= z->lb || (z->p[z->c - 1] != 140 && z->p[z->c - 1] != 143)) return 0;
+    among_var = find_among_b(z, a_3, 2); /* substring, line 129 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 129 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 132 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 137 */
+    among_var = find_among_b(z, a_4, 46); /* substring, line 137 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 137 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m1 = z->l - z->c; (void)m1; /* or, line 143 */
+                if (!(eq_s_b(z, 2, s_4))) goto lab1;
+                goto lab0;
+            lab1:
+                z->c = z->l - m1;
+                if (!(eq_s_b(z, 2, s_5))) return 0;
+            }
+        lab0:
+            {   int ret = slice_del(z); /* delete, line 143 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 151 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_noun(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 160 */
+    among_var = find_among_b(z, a_5, 36); /* substring, line 160 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 160 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 167 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_derivational(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 176 */
+    if (z->c - 5 <= z->lb || (z->p[z->c - 1] != 130 && z->p[z->c - 1] != 140)) return 0;
+    among_var = find_among_b(z, a_6, 2); /* substring, line 176 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 176 */
+    {   int ret = r_R2(z);
+        if (ret == 0) return 0; /* call R2, line 176 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 179 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_tidy_up(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 184 */
+    among_var = find_among_b(z, a_7, 4); /* substring, line 184 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 184 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 188 */
+                if (ret < 0) return ret;
+            }
+            z->ket = z->c; /* [, line 189 */
+            if (!(eq_s_b(z, 2, s_6))) return 0;
+            z->bra = z->c; /* ], line 189 */
+            if (!(eq_s_b(z, 2, s_7))) return 0;
+            {   int ret = slice_del(z); /* delete, line 189 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (!(eq_s_b(z, 2, s_8))) return 0;
+            {   int ret = slice_del(z); /* delete, line 192 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_del(z); /* delete, line 194 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int russian_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 201 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 201 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 202 */
+
+    {   int mlimit; /* setlimit, line 202 */
+        int m2 = z->l - z->c; (void)m2;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 202 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m2;
+        {   int m3 = z->l - z->c; (void)m3; /* do, line 203 */
+            {   int m4 = z->l - z->c; (void)m4; /* or, line 204 */
+                {   int ret = r_perfective_gerund(z);
+                    if (ret == 0) goto lab3; /* call perfective_gerund, line 204 */
+                    if (ret < 0) return ret;
+                }
+                goto lab2;
+            lab3:
+                z->c = z->l - m4;
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 205 */
+                    {   int ret = r_reflexive(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab4; } /* call reflexive, line 205 */
+                        if (ret < 0) return ret;
+                    }
+                lab4:
+                    ;
+                }
+                {   int m5 = z->l - z->c; (void)m5; /* or, line 206 */
+                    {   int ret = r_adjectival(z);
+                        if (ret == 0) goto lab6; /* call adjectival, line 206 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab6:
+                    z->c = z->l - m5;
+                    {   int ret = r_verb(z);
+                        if (ret == 0) goto lab7; /* call verb, line 206 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab5;
+                lab7:
+                    z->c = z->l - m5;
+                    {   int ret = r_noun(z);
+                        if (ret == 0) goto lab1; /* call noun, line 206 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab5:
+                ;
+            }
+        lab2:
+        lab1:
+            z->c = z->l - m3;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 209 */
+            z->ket = z->c; /* [, line 209 */
+            if (!(eq_s_b(z, 2, s_9))) { z->c = z->l - m_keep; goto lab8; }
+            z->bra = z->c; /* ], line 209 */
+            {   int ret = slice_del(z); /* delete, line 209 */
+                if (ret < 0) return ret;
+            }
+        lab8:
+            ;
+        }
+        {   int m6 = z->l - z->c; (void)m6; /* do, line 212 */
+            {   int ret = r_derivational(z);
+                if (ret == 0) goto lab9; /* call derivational, line 212 */
+                if (ret < 0) return ret;
+            }
+        lab9:
+            z->c = z->l - m6;
+        }
+        {   int m7 = z->l - z->c; (void)m7; /* do, line 213 */
+            {   int ret = r_tidy_up(z);
+                if (ret == 0) goto lab10; /* call tidy_up, line 213 */
+                if (ret < 0) return ret;
+            }
+        lab10:
+            z->c = z->l - m7;
+        }
+        z->lb = mlimit;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * russian_UTF_8_create_env(void) { return SN_create_env(0, 2, 0); }
+
+extern void russian_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_spanish.c b/src/backend/snowball/libstemmer/stem_UTF_8_spanish.c
new file mode 100644
index 000000000000..5ac83fdc1dff
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_spanish.c
@@ -0,0 +1,1097 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int spanish_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_residual_suffix(struct SN_env * z);
+static int r_verb_suffix(struct SN_env * z);
+static int r_y_verb_suffix(struct SN_env * z);
+static int r_standard_suffix(struct SN_env * z);
+static int r_attached_pronoun(struct SN_env * z);
+static int r_R2(struct SN_env * z);
+static int r_R1(struct SN_env * z);
+static int r_RV(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * spanish_UTF_8_create_env(void);
+extern void spanish_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_1[2] = { 0xC3, 0xA1 };
+static const symbol s_0_2[2] = { 0xC3, 0xA9 };
+static const symbol s_0_3[2] = { 0xC3, 0xAD };
+static const symbol s_0_4[2] = { 0xC3, 0xB3 };
+static const symbol s_0_5[2] = { 0xC3, 0xBA };
+
+static const struct among a_0[6] =
+{
+/*  0 */ { 0, 0, -1, 6, 0},
+/*  1 */ { 2, s_0_1, 0, 1, 0},
+/*  2 */ { 2, s_0_2, 0, 2, 0},
+/*  3 */ { 2, s_0_3, 0, 3, 0},
+/*  4 */ { 2, s_0_4, 0, 4, 0},
+/*  5 */ { 2, s_0_5, 0, 5, 0}
+};
+
+static const symbol s_1_0[2] = { 'l', 'a' };
+static const symbol s_1_1[4] = { 's', 'e', 'l', 'a' };
+static const symbol s_1_2[2] = { 'l', 'e' };
+static const symbol s_1_3[2] = { 'm', 'e' };
+static const symbol s_1_4[2] = { 's', 'e' };
+static const symbol s_1_5[2] = { 'l', 'o' };
+static const symbol s_1_6[4] = { 's', 'e', 'l', 'o' };
+static const symbol s_1_7[3] = { 'l', 'a', 's' };
+static const symbol s_1_8[5] = { 's', 'e', 'l', 'a', 's' };
+static const symbol s_1_9[3] = { 'l', 'e', 's' };
+static const symbol s_1_10[3] = { 'l', 'o', 's' };
+static const symbol s_1_11[5] = { 's', 'e', 'l', 'o', 's' };
+static const symbol s_1_12[3] = { 'n', 'o', 's' };
+
+static const struct among a_1[13] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 4, s_1_1, 0, -1, 0},
+/*  2 */ { 2, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0},
+/*  4 */ { 2, s_1_4, -1, -1, 0},
+/*  5 */ { 2, s_1_5, -1, -1, 0},
+/*  6 */ { 4, s_1_6, 5, -1, 0},
+/*  7 */ { 3, s_1_7, -1, -1, 0},
+/*  8 */ { 5, s_1_8, 7, -1, 0},
+/*  9 */ { 3, s_1_9, -1, -1, 0},
+/* 10 */ { 3, s_1_10, -1, -1, 0},
+/* 11 */ { 5, s_1_11, 10, -1, 0},
+/* 12 */ { 3, s_1_12, -1, -1, 0}
+};
+
+static const symbol s_2_0[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_2_1[5] = { 'i', 'e', 'n', 'd', 'o' };
+static const symbol s_2_2[5] = { 'y', 'e', 'n', 'd', 'o' };
+static const symbol s_2_3[5] = { 0xC3, 0xA1, 'n', 'd', 'o' };
+static const symbol s_2_4[6] = { 'i', 0xC3, 0xA9, 'n', 'd', 'o' };
+static const symbol s_2_5[2] = { 'a', 'r' };
+static const symbol s_2_6[2] = { 'e', 'r' };
+static const symbol s_2_7[2] = { 'i', 'r' };
+static const symbol s_2_8[3] = { 0xC3, 0xA1, 'r' };
+static const symbol s_2_9[3] = { 0xC3, 0xA9, 'r' };
+static const symbol s_2_10[3] = { 0xC3, 0xAD, 'r' };
+
+static const struct among a_2[11] =
+{
+/*  0 */ { 4, s_2_0, -1, 6, 0},
+/*  1 */ { 5, s_2_1, -1, 6, 0},
+/*  2 */ { 5, s_2_2, -1, 7, 0},
+/*  3 */ { 5, s_2_3, -1, 2, 0},
+/*  4 */ { 6, s_2_4, -1, 1, 0},
+/*  5 */ { 2, s_2_5, -1, 6, 0},
+/*  6 */ { 2, s_2_6, -1, 6, 0},
+/*  7 */ { 2, s_2_7, -1, 6, 0},
+/*  8 */ { 3, s_2_8, -1, 3, 0},
+/*  9 */ { 3, s_2_9, -1, 4, 0},
+/* 10 */ { 3, s_2_10, -1, 5, 0}
+};
+
+static const symbol s_3_0[2] = { 'i', 'c' };
+static const symbol s_3_1[2] = { 'a', 'd' };
+static const symbol s_3_2[2] = { 'o', 's' };
+static const symbol s_3_3[2] = { 'i', 'v' };
+
+static const struct among a_3[4] =
+{
+/*  0 */ { 2, s_3_0, -1, -1, 0},
+/*  1 */ { 2, s_3_1, -1, -1, 0},
+/*  2 */ { 2, s_3_2, -1, -1, 0},
+/*  3 */ { 2, s_3_3, -1, 1, 0}
+};
+
+static const symbol s_4_0[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_4_1[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_4_2[4] = { 'a', 'n', 't', 'e' };
+
+static const struct among a_4[3] =
+{
+/*  0 */ { 4, s_4_0, -1, 1, 0},
+/*  1 */ { 4, s_4_1, -1, 1, 0},
+/*  2 */ { 4, s_4_2, -1, 1, 0}
+};
+
+static const symbol s_5_0[2] = { 'i', 'c' };
+static const symbol s_5_1[4] = { 'a', 'b', 'i', 'l' };
+static const symbol s_5_2[2] = { 'i', 'v' };
+
+static const struct among a_5[3] =
+{
+/*  0 */ { 2, s_5_0, -1, 1, 0},
+/*  1 */ { 4, s_5_1, -1, 1, 0},
+/*  2 */ { 2, s_5_2, -1, 1, 0}
+};
+
+static const symbol s_6_0[3] = { 'i', 'c', 'a' };
+static const symbol s_6_1[5] = { 'a', 'n', 'c', 'i', 'a' };
+static const symbol s_6_2[5] = { 'e', 'n', 'c', 'i', 'a' };
+static const symbol s_6_3[5] = { 'a', 'd', 'o', 'r', 'a' };
+static const symbol s_6_4[3] = { 'o', 's', 'a' };
+static const symbol s_6_5[4] = { 'i', 's', 't', 'a' };
+static const symbol s_6_6[3] = { 'i', 'v', 'a' };
+static const symbol s_6_7[4] = { 'a', 'n', 'z', 'a' };
+static const symbol s_6_8[6] = { 'l', 'o', 'g', 0xC3, 0xAD, 'a' };
+static const symbol s_6_9[4] = { 'i', 'd', 'a', 'd' };
+static const symbol s_6_10[4] = { 'a', 'b', 'l', 'e' };
+static const symbol s_6_11[4] = { 'i', 'b', 'l', 'e' };
+static const symbol s_6_12[4] = { 'a', 'n', 't', 'e' };
+static const symbol s_6_13[5] = { 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_14[6] = { 'a', 'm', 'e', 'n', 't', 'e' };
+static const symbol s_6_15[6] = { 'a', 'c', 'i', 0xC3, 0xB3, 'n' };
+static const symbol s_6_16[6] = { 'u', 'c', 'i', 0xC3, 0xB3, 'n' };
+static const symbol s_6_17[3] = { 'i', 'c', 'o' };
+static const symbol s_6_18[4] = { 'i', 's', 'm', 'o' };
+static const symbol s_6_19[3] = { 'o', 's', 'o' };
+static const symbol s_6_20[7] = { 'a', 'm', 'i', 'e', 'n', 't', 'o' };
+static const symbol s_6_21[7] = { 'i', 'm', 'i', 'e', 'n', 't', 'o' };
+static const symbol s_6_22[3] = { 'i', 'v', 'o' };
+static const symbol s_6_23[4] = { 'a', 'd', 'o', 'r' };
+static const symbol s_6_24[4] = { 'i', 'c', 'a', 's' };
+static const symbol s_6_25[6] = { 'a', 'n', 'c', 'i', 'a', 's' };
+static const symbol s_6_26[6] = { 'e', 'n', 'c', 'i', 'a', 's' };
+static const symbol s_6_27[6] = { 'a', 'd', 'o', 'r', 'a', 's' };
+static const symbol s_6_28[4] = { 'o', 's', 'a', 's' };
+static const symbol s_6_29[5] = { 'i', 's', 't', 'a', 's' };
+static const symbol s_6_30[4] = { 'i', 'v', 'a', 's' };
+static const symbol s_6_31[5] = { 'a', 'n', 'z', 'a', 's' };
+static const symbol s_6_32[7] = { 'l', 'o', 'g', 0xC3, 0xAD, 'a', 's' };
+static const symbol s_6_33[6] = { 'i', 'd', 'a', 'd', 'e', 's' };
+static const symbol s_6_34[5] = { 'a', 'b', 'l', 'e', 's' };
+static const symbol s_6_35[5] = { 'i', 'b', 'l', 'e', 's' };
+static const symbol s_6_36[7] = { 'a', 'c', 'i', 'o', 'n', 'e', 's' };
+static const symbol s_6_37[7] = { 'u', 'c', 'i', 'o', 'n', 'e', 's' };
+static const symbol s_6_38[6] = { 'a', 'd', 'o', 'r', 'e', 's' };
+static const symbol s_6_39[5] = { 'a', 'n', 't', 'e', 's' };
+static const symbol s_6_40[4] = { 'i', 'c', 'o', 's' };
+static const symbol s_6_41[5] = { 'i', 's', 'm', 'o', 's' };
+static const symbol s_6_42[4] = { 'o', 's', 'o', 's' };
+static const symbol s_6_43[8] = { 'a', 'm', 'i', 'e', 'n', 't', 'o', 's' };
+static const symbol s_6_44[8] = { 'i', 'm', 'i', 'e', 'n', 't', 'o', 's' };
+static const symbol s_6_45[4] = { 'i', 'v', 'o', 's' };
+
+static const struct among a_6[46] =
+{
+/*  0 */ { 3, s_6_0, -1, 1, 0},
+/*  1 */ { 5, s_6_1, -1, 2, 0},
+/*  2 */ { 5, s_6_2, -1, 5, 0},
+/*  3 */ { 5, s_6_3, -1, 2, 0},
+/*  4 */ { 3, s_6_4, -1, 1, 0},
+/*  5 */ { 4, s_6_5, -1, 1, 0},
+/*  6 */ { 3, s_6_6, -1, 9, 0},
+/*  7 */ { 4, s_6_7, -1, 1, 0},
+/*  8 */ { 6, s_6_8, -1, 3, 0},
+/*  9 */ { 4, s_6_9, -1, 8, 0},
+/* 10 */ { 4, s_6_10, -1, 1, 0},
+/* 11 */ { 4, s_6_11, -1, 1, 0},
+/* 12 */ { 4, s_6_12, -1, 2, 0},
+/* 13 */ { 5, s_6_13, -1, 7, 0},
+/* 14 */ { 6, s_6_14, 13, 6, 0},
+/* 15 */ { 6, s_6_15, -1, 2, 0},
+/* 16 */ { 6, s_6_16, -1, 4, 0},
+/* 17 */ { 3, s_6_17, -1, 1, 0},
+/* 18 */ { 4, s_6_18, -1, 1, 0},
+/* 19 */ { 3, s_6_19, -1, 1, 0},
+/* 20 */ { 7, s_6_20, -1, 1, 0},
+/* 21 */ { 7, s_6_21, -1, 1, 0},
+/* 22 */ { 3, s_6_22, -1, 9, 0},
+/* 23 */ { 4, s_6_23, -1, 2, 0},
+/* 24 */ { 4, s_6_24, -1, 1, 0},
+/* 25 */ { 6, s_6_25, -1, 2, 0},
+/* 26 */ { 6, s_6_26, -1, 5, 0},
+/* 27 */ { 6, s_6_27, -1, 2, 0},
+/* 28 */ { 4, s_6_28, -1, 1, 0},
+/* 29 */ { 5, s_6_29, -1, 1, 0},
+/* 30 */ { 4, s_6_30, -1, 9, 0},
+/* 31 */ { 5, s_6_31, -1, 1, 0},
+/* 32 */ { 7, s_6_32, -1, 3, 0},
+/* 33 */ { 6, s_6_33, -1, 8, 0},
+/* 34 */ { 5, s_6_34, -1, 1, 0},
+/* 35 */ { 5, s_6_35, -1, 1, 0},
+/* 36 */ { 7, s_6_36, -1, 2, 0},
+/* 37 */ { 7, s_6_37, -1, 4, 0},
+/* 38 */ { 6, s_6_38, -1, 2, 0},
+/* 39 */ { 5, s_6_39, -1, 2, 0},
+/* 40 */ { 4, s_6_40, -1, 1, 0},
+/* 41 */ { 5, s_6_41, -1, 1, 0},
+/* 42 */ { 4, s_6_42, -1, 1, 0},
+/* 43 */ { 8, s_6_43, -1, 1, 0},
+/* 44 */ { 8, s_6_44, -1, 1, 0},
+/* 45 */ { 4, s_6_45, -1, 9, 0}
+};
+
+static const symbol s_7_0[2] = { 'y', 'a' };
+static const symbol s_7_1[2] = { 'y', 'e' };
+static const symbol s_7_2[3] = { 'y', 'a', 'n' };
+static const symbol s_7_3[3] = { 'y', 'e', 'n' };
+static const symbol s_7_4[5] = { 'y', 'e', 'r', 'o', 'n' };
+static const symbol s_7_5[5] = { 'y', 'e', 'n', 'd', 'o' };
+static const symbol s_7_6[2] = { 'y', 'o' };
+static const symbol s_7_7[3] = { 'y', 'a', 's' };
+static const symbol s_7_8[3] = { 'y', 'e', 's' };
+static const symbol s_7_9[4] = { 'y', 'a', 'i', 's' };
+static const symbol s_7_10[5] = { 'y', 'a', 'm', 'o', 's' };
+static const symbol s_7_11[3] = { 'y', 0xC3, 0xB3 };
+
+static const struct among a_7[12] =
+{
+/*  0 */ { 2, s_7_0, -1, 1, 0},
+/*  1 */ { 2, s_7_1, -1, 1, 0},
+/*  2 */ { 3, s_7_2, -1, 1, 0},
+/*  3 */ { 3, s_7_3, -1, 1, 0},
+/*  4 */ { 5, s_7_4, -1, 1, 0},
+/*  5 */ { 5, s_7_5, -1, 1, 0},
+/*  6 */ { 2, s_7_6, -1, 1, 0},
+/*  7 */ { 3, s_7_7, -1, 1, 0},
+/*  8 */ { 3, s_7_8, -1, 1, 0},
+/*  9 */ { 4, s_7_9, -1, 1, 0},
+/* 10 */ { 5, s_7_10, -1, 1, 0},
+/* 11 */ { 3, s_7_11, -1, 1, 0}
+};
+
+static const symbol s_8_0[3] = { 'a', 'b', 'a' };
+static const symbol s_8_1[3] = { 'a', 'd', 'a' };
+static const symbol s_8_2[3] = { 'i', 'd', 'a' };
+static const symbol s_8_3[3] = { 'a', 'r', 'a' };
+static const symbol s_8_4[4] = { 'i', 'e', 'r', 'a' };
+static const symbol s_8_5[3] = { 0xC3, 0xAD, 'a' };
+static const symbol s_8_6[5] = { 'a', 'r', 0xC3, 0xAD, 'a' };
+static const symbol s_8_7[5] = { 'e', 'r', 0xC3, 0xAD, 'a' };
+static const symbol s_8_8[5] = { 'i', 'r', 0xC3, 0xAD, 'a' };
+static const symbol s_8_9[2] = { 'a', 'd' };
+static const symbol s_8_10[2] = { 'e', 'd' };
+static const symbol s_8_11[2] = { 'i', 'd' };
+static const symbol s_8_12[3] = { 'a', 's', 'e' };
+static const symbol s_8_13[4] = { 'i', 'e', 's', 'e' };
+static const symbol s_8_14[4] = { 'a', 's', 't', 'e' };
+static const symbol s_8_15[4] = { 'i', 's', 't', 'e' };
+static const symbol s_8_16[2] = { 'a', 'n' };
+static const symbol s_8_17[4] = { 'a', 'b', 'a', 'n' };
+static const symbol s_8_18[4] = { 'a', 'r', 'a', 'n' };
+static const symbol s_8_19[5] = { 'i', 'e', 'r', 'a', 'n' };
+static const symbol s_8_20[4] = { 0xC3, 0xAD, 'a', 'n' };
+static const symbol s_8_21[6] = { 'a', 'r', 0xC3, 0xAD, 'a', 'n' };
+static const symbol s_8_22[6] = { 'e', 'r', 0xC3, 0xAD, 'a', 'n' };
+static const symbol s_8_23[6] = { 'i', 'r', 0xC3, 0xAD, 'a', 'n' };
+static const symbol s_8_24[2] = { 'e', 'n' };
+static const symbol s_8_25[4] = { 'a', 's', 'e', 'n' };
+static const symbol s_8_26[5] = { 'i', 'e', 's', 'e', 'n' };
+static const symbol s_8_27[4] = { 'a', 'r', 'o', 'n' };
+static const symbol s_8_28[5] = { 'i', 'e', 'r', 'o', 'n' };
+static const symbol s_8_29[5] = { 'a', 'r', 0xC3, 0xA1, 'n' };
+static const symbol s_8_30[5] = { 'e', 'r', 0xC3, 0xA1, 'n' };
+static const symbol s_8_31[5] = { 'i', 'r', 0xC3, 0xA1, 'n' };
+static const symbol s_8_32[3] = { 'a', 'd', 'o' };
+static const symbol s_8_33[3] = { 'i', 'd', 'o' };
+static const symbol s_8_34[4] = { 'a', 'n', 'd', 'o' };
+static const symbol s_8_35[5] = { 'i', 'e', 'n', 'd', 'o' };
+static const symbol s_8_36[2] = { 'a', 'r' };
+static const symbol s_8_37[2] = { 'e', 'r' };
+static const symbol s_8_38[2] = { 'i', 'r' };
+static const symbol s_8_39[2] = { 'a', 's' };
+static const symbol s_8_40[4] = { 'a', 'b', 'a', 's' };
+static const symbol s_8_41[4] = { 'a', 'd', 'a', 's' };
+static const symbol s_8_42[4] = { 'i', 'd', 'a', 's' };
+static const symbol s_8_43[4] = { 'a', 'r', 'a', 's' };
+static const symbol s_8_44[5] = { 'i', 'e', 'r', 'a', 's' };
+static const symbol s_8_45[4] = { 0xC3, 0xAD, 'a', 's' };
+static const symbol s_8_46[6] = { 'a', 'r', 0xC3, 0xAD, 'a', 's' };
+static const symbol s_8_47[6] = { 'e', 'r', 0xC3, 0xAD, 'a', 's' };
+static const symbol s_8_48[6] = { 'i', 'r', 0xC3, 0xAD, 'a', 's' };
+static const symbol s_8_49[2] = { 'e', 's' };
+static const symbol s_8_50[4] = { 'a', 's', 'e', 's' };
+static const symbol s_8_51[5] = { 'i', 'e', 's', 'e', 's' };
+static const symbol s_8_52[5] = { 'a', 'b', 'a', 'i', 's' };
+static const symbol s_8_53[5] = { 'a', 'r', 'a', 'i', 's' };
+static const symbol s_8_54[6] = { 'i', 'e', 'r', 'a', 'i', 's' };
+static const symbol s_8_55[5] = { 0xC3, 0xAD, 'a', 'i', 's' };
+static const symbol s_8_56[7] = { 'a', 'r', 0xC3, 0xAD, 'a', 'i', 's' };
+static const symbol s_8_57[7] = { 'e', 'r', 0xC3, 0xAD, 'a', 'i', 's' };
+static const symbol s_8_58[7] = { 'i', 'r', 0xC3, 0xAD, 'a', 'i', 's' };
+static const symbol s_8_59[5] = { 'a', 's', 'e', 'i', 's' };
+static const symbol s_8_60[6] = { 'i', 'e', 's', 'e', 'i', 's' };
+static const symbol s_8_61[6] = { 'a', 's', 't', 'e', 'i', 's' };
+static const symbol s_8_62[6] = { 'i', 's', 't', 'e', 'i', 's' };
+static const symbol s_8_63[4] = { 0xC3, 0xA1, 'i', 's' };
+static const symbol s_8_64[4] = { 0xC3, 0xA9, 'i', 's' };
+static const symbol s_8_65[6] = { 'a', 'r', 0xC3, 0xA9, 'i', 's' };
+static const symbol s_8_66[6] = { 'e', 'r', 0xC3, 0xA9, 'i', 's' };
+static const symbol s_8_67[6] = { 'i', 'r', 0xC3, 0xA9, 'i', 's' };
+static const symbol s_8_68[4] = { 'a', 'd', 'o', 's' };
+static const symbol s_8_69[4] = { 'i', 'd', 'o', 's' };
+static const symbol s_8_70[4] = { 'a', 'm', 'o', 's' };
+static const symbol s_8_71[7] = { 0xC3, 0xA1, 'b', 'a', 'm', 'o', 's' };
+static const symbol s_8_72[7] = { 0xC3, 0xA1, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_8_73[8] = { 'i', 0xC3, 0xA9, 'r', 'a', 'm', 'o', 's' };
+static const symbol s_8_74[6] = { 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_8_75[8] = { 'a', 'r', 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_8_76[8] = { 'e', 'r', 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_8_77[8] = { 'i', 'r', 0xC3, 0xAD, 'a', 'm', 'o', 's' };
+static const symbol s_8_78[4] = { 'e', 'm', 'o', 's' };
+static const symbol s_8_79[6] = { 'a', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_8_80[6] = { 'e', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_8_81[6] = { 'i', 'r', 'e', 'm', 'o', 's' };
+static const symbol s_8_82[7] = { 0xC3, 0xA1, 's', 'e', 'm', 'o', 's' };
+static const symbol s_8_83[8] = { 'i', 0xC3, 0xA9, 's', 'e', 'm', 'o', 's' };
+static const symbol s_8_84[4] = { 'i', 'm', 'o', 's' };
+static const symbol s_8_85[5] = { 'a', 'r', 0xC3, 0xA1, 's' };
+static const symbol s_8_86[5] = { 'e', 'r', 0xC3, 0xA1, 's' };
+static const symbol s_8_87[5] = { 'i', 'r', 0xC3, 0xA1, 's' };
+static const symbol s_8_88[3] = { 0xC3, 0xAD, 's' };
+static const symbol s_8_89[4] = { 'a', 'r', 0xC3, 0xA1 };
+static const symbol s_8_90[4] = { 'e', 'r', 0xC3, 0xA1 };
+static const symbol s_8_91[4] = { 'i', 'r', 0xC3, 0xA1 };
+static const symbol s_8_92[4] = { 'a', 'r', 0xC3, 0xA9 };
+static const symbol s_8_93[4] = { 'e', 'r', 0xC3, 0xA9 };
+static const symbol s_8_94[4] = { 'i', 'r', 0xC3, 0xA9 };
+static const symbol s_8_95[3] = { 'i', 0xC3, 0xB3 };
+
+static const struct among a_8[96] =
+{
+/*  0 */ { 3, s_8_0, -1, 2, 0},
+/*  1 */ { 3, s_8_1, -1, 2, 0},
+/*  2 */ { 3, s_8_2, -1, 2, 0},
+/*  3 */ { 3, s_8_3, -1, 2, 0},
+/*  4 */ { 4, s_8_4, -1, 2, 0},
+/*  5 */ { 3, s_8_5, -1, 2, 0},
+/*  6 */ { 5, s_8_6, 5, 2, 0},
+/*  7 */ { 5, s_8_7, 5, 2, 0},
+/*  8 */ { 5, s_8_8, 5, 2, 0},
+/*  9 */ { 2, s_8_9, -1, 2, 0},
+/* 10 */ { 2, s_8_10, -1, 2, 0},
+/* 11 */ { 2, s_8_11, -1, 2, 0},
+/* 12 */ { 3, s_8_12, -1, 2, 0},
+/* 13 */ { 4, s_8_13, -1, 2, 0},
+/* 14 */ { 4, s_8_14, -1, 2, 0},
+/* 15 */ { 4, s_8_15, -1, 2, 0},
+/* 16 */ { 2, s_8_16, -1, 2, 0},
+/* 17 */ { 4, s_8_17, 16, 2, 0},
+/* 18 */ { 4, s_8_18, 16, 2, 0},
+/* 19 */ { 5, s_8_19, 16, 2, 0},
+/* 20 */ { 4, s_8_20, 16, 2, 0},
+/* 21 */ { 6, s_8_21, 20, 2, 0},
+/* 22 */ { 6, s_8_22, 20, 2, 0},
+/* 23 */ { 6, s_8_23, 20, 2, 0},
+/* 24 */ { 2, s_8_24, -1, 1, 0},
+/* 25 */ { 4, s_8_25, 24, 2, 0},
+/* 26 */ { 5, s_8_26, 24, 2, 0},
+/* 27 */ { 4, s_8_27, -1, 2, 0},
+/* 28 */ { 5, s_8_28, -1, 2, 0},
+/* 29 */ { 5, s_8_29, -1, 2, 0},
+/* 30 */ { 5, s_8_30, -1, 2, 0},
+/* 31 */ { 5, s_8_31, -1, 2, 0},
+/* 32 */ { 3, s_8_32, -1, 2, 0},
+/* 33 */ { 3, s_8_33, -1, 2, 0},
+/* 34 */ { 4, s_8_34, -1, 2, 0},
+/* 35 */ { 5, s_8_35, -1, 2, 0},
+/* 36 */ { 2, s_8_36, -1, 2, 0},
+/* 37 */ { 2, s_8_37, -1, 2, 0},
+/* 38 */ { 2, s_8_38, -1, 2, 0},
+/* 39 */ { 2, s_8_39, -1, 2, 0},
+/* 40 */ { 4, s_8_40, 39, 2, 0},
+/* 41 */ { 4, s_8_41, 39, 2, 0},
+/* 42 */ { 4, s_8_42, 39, 2, 0},
+/* 43 */ { 4, s_8_43, 39, 2, 0},
+/* 44 */ { 5, s_8_44, 39, 2, 0},
+/* 45 */ { 4, s_8_45, 39, 2, 0},
+/* 46 */ { 6, s_8_46, 45, 2, 0},
+/* 47 */ { 6, s_8_47, 45, 2, 0},
+/* 48 */ { 6, s_8_48, 45, 2, 0},
+/* 49 */ { 2, s_8_49, -1, 1, 0},
+/* 50 */ { 4, s_8_50, 49, 2, 0},
+/* 51 */ { 5, s_8_51, 49, 2, 0},
+/* 52 */ { 5, s_8_52, -1, 2, 0},
+/* 53 */ { 5, s_8_53, -1, 2, 0},
+/* 54 */ { 6, s_8_54, -1, 2, 0},
+/* 55 */ { 5, s_8_55, -1, 2, 0},
+/* 56 */ { 7, s_8_56, 55, 2, 0},
+/* 57 */ { 7, s_8_57, 55, 2, 0},
+/* 58 */ { 7, s_8_58, 55, 2, 0},
+/* 59 */ { 5, s_8_59, -1, 2, 0},
+/* 60 */ { 6, s_8_60, -1, 2, 0},
+/* 61 */ { 6, s_8_61, -1, 2, 0},
+/* 62 */ { 6, s_8_62, -1, 2, 0},
+/* 63 */ { 4, s_8_63, -1, 2, 0},
+/* 64 */ { 4, s_8_64, -1, 1, 0},
+/* 65 */ { 6, s_8_65, 64, 2, 0},
+/* 66 */ { 6, s_8_66, 64, 2, 0},
+/* 67 */ { 6, s_8_67, 64, 2, 0},
+/* 68 */ { 4, s_8_68, -1, 2, 0},
+/* 69 */ { 4, s_8_69, -1, 2, 0},
+/* 70 */ { 4, s_8_70, -1, 2, 0},
+/* 71 */ { 7, s_8_71, 70, 2, 0},
+/* 72 */ { 7, s_8_72, 70, 2, 0},
+/* 73 */ { 8, s_8_73, 70, 2, 0},
+/* 74 */ { 6, s_8_74, 70, 2, 0},
+/* 75 */ { 8, s_8_75, 74, 2, 0},
+/* 76 */ { 8, s_8_76, 74, 2, 0},
+/* 77 */ { 8, s_8_77, 74, 2, 0},
+/* 78 */ { 4, s_8_78, -1, 1, 0},
+/* 79 */ { 6, s_8_79, 78, 2, 0},
+/* 80 */ { 6, s_8_80, 78, 2, 0},
+/* 81 */ { 6, s_8_81, 78, 2, 0},
+/* 82 */ { 7, s_8_82, 78, 2, 0},
+/* 83 */ { 8, s_8_83, 78, 2, 0},
+/* 84 */ { 4, s_8_84, -1, 2, 0},
+/* 85 */ { 5, s_8_85, -1, 2, 0},
+/* 86 */ { 5, s_8_86, -1, 2, 0},
+/* 87 */ { 5, s_8_87, -1, 2, 0},
+/* 88 */ { 3, s_8_88, -1, 2, 0},
+/* 89 */ { 4, s_8_89, -1, 2, 0},
+/* 90 */ { 4, s_8_90, -1, 2, 0},
+/* 91 */ { 4, s_8_91, -1, 2, 0},
+/* 92 */ { 4, s_8_92, -1, 2, 0},
+/* 93 */ { 4, s_8_93, -1, 2, 0},
+/* 94 */ { 4, s_8_94, -1, 2, 0},
+/* 95 */ { 3, s_8_95, -1, 2, 0}
+};
+
+static const symbol s_9_0[1] = { 'a' };
+static const symbol s_9_1[1] = { 'e' };
+static const symbol s_9_2[1] = { 'o' };
+static const symbol s_9_3[2] = { 'o', 's' };
+static const symbol s_9_4[2] = { 0xC3, 0xA1 };
+static const symbol s_9_5[2] = { 0xC3, 0xA9 };
+static const symbol s_9_6[2] = { 0xC3, 0xAD };
+static const symbol s_9_7[2] = { 0xC3, 0xB3 };
+
+static const struct among a_9[8] =
+{
+/*  0 */ { 1, s_9_0, -1, 1, 0},
+/*  1 */ { 1, s_9_1, -1, 2, 0},
+/*  2 */ { 1, s_9_2, -1, 1, 0},
+/*  3 */ { 2, s_9_3, -1, 1, 0},
+/*  4 */ { 2, s_9_4, -1, 1, 0},
+/*  5 */ { 2, s_9_5, -1, 2, 0},
+/*  6 */ { 2, s_9_6, -1, 1, 0},
+/*  7 */ { 2, s_9_7, -1, 1, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 4, 10 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 'i' };
+static const symbol s_3[] = { 'o' };
+static const symbol s_4[] = { 'u' };
+static const symbol s_5[] = { 'i', 'e', 'n', 'd', 'o' };
+static const symbol s_6[] = { 'a', 'n', 'd', 'o' };
+static const symbol s_7[] = { 'a', 'r' };
+static const symbol s_8[] = { 'e', 'r' };
+static const symbol s_9[] = { 'i', 'r' };
+static const symbol s_10[] = { 'u' };
+static const symbol s_11[] = { 'i', 'c' };
+static const symbol s_12[] = { 'l', 'o', 'g' };
+static const symbol s_13[] = { 'u' };
+static const symbol s_14[] = { 'e', 'n', 't', 'e' };
+static const symbol s_15[] = { 'a', 't' };
+static const symbol s_16[] = { 'a', 't' };
+static const symbol s_17[] = { 'u' };
+static const symbol s_18[] = { 'u' };
+static const symbol s_19[] = { 'g' };
+static const symbol s_20[] = { 'u' };
+static const symbol s_21[] = { 'g' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    z->I[1] = z->l;
+    z->I[2] = z->l;
+    {   int c1 = z->c; /* do, line 37 */
+        {   int c2 = z->c; /* or, line 39 */
+            if (in_grouping_U(z, g_v, 97, 252, 0)) goto lab2;
+            {   int c3 = z->c; /* or, line 38 */
+                if (out_grouping_U(z, g_v, 97, 252, 0)) goto lab4;
+                {    /* gopast */ /* grouping v, line 38 */
+                    int ret = out_grouping_U(z, g_v, 97, 252, 1);
+                    if (ret < 0) goto lab4;
+                    z->c += ret;
+                }
+                goto lab3;
+            lab4:
+                z->c = c3;
+                if (in_grouping_U(z, g_v, 97, 252, 0)) goto lab2;
+                {    /* gopast */ /* non v, line 38 */
+                    int ret = in_grouping_U(z, g_v, 97, 252, 1);
+                    if (ret < 0) goto lab2;
+                    z->c += ret;
+                }
+            }
+        lab3:
+            goto lab1;
+        lab2:
+            z->c = c2;
+            if (out_grouping_U(z, g_v, 97, 252, 0)) goto lab0;
+            {   int c4 = z->c; /* or, line 40 */
+                if (out_grouping_U(z, g_v, 97, 252, 0)) goto lab6;
+                {    /* gopast */ /* grouping v, line 40 */
+                    int ret = out_grouping_U(z, g_v, 97, 252, 1);
+                    if (ret < 0) goto lab6;
+                    z->c += ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = c4;
+                if (in_grouping_U(z, g_v, 97, 252, 0)) goto lab0;
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 40 */
+                }
+            }
+        lab5:
+            ;
+        }
+    lab1:
+        z->I[0] = z->c; /* setmark pV, line 41 */
+    lab0:
+        z->c = c1;
+    }
+    {   int c5 = z->c; /* do, line 43 */
+        {    /* gopast */ /* grouping v, line 44 */
+            int ret = out_grouping_U(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 44 */
+            int ret = in_grouping_U(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[1] = z->c; /* setmark p1, line 44 */
+        {    /* gopast */ /* grouping v, line 45 */
+            int ret = out_grouping_U(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        {    /* gopast */ /* non v, line 45 */
+            int ret = in_grouping_U(z, g_v, 97, 252, 1);
+            if (ret < 0) goto lab7;
+            z->c += ret;
+        }
+        z->I[2] = z->c; /* setmark p2, line 45 */
+    lab7:
+        z->c = c5;
+    }
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    int among_var;
+    while(1) { /* repeat, line 49 */
+        int c1 = z->c;
+        z->bra = z->c; /* [, line 50 */
+        if (z->c + 1 >= z->l || z->p[z->c + 1] >> 5 != 5 || !((67641858 >> (z->p[z->c + 1] & 0x1f)) & 1)) among_var = 6; else
+        among_var = find_among(z, a_0, 6); /* substring, line 50 */
+        if (!(among_var)) goto lab0;
+        z->ket = z->c; /* ], line 50 */
+        switch(among_var) {
+            case 0: goto lab0;
+            case 1:
+                {   int ret = slice_from_s(z, 1, s_0); /* <-, line 51 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 1, s_1); /* <-, line 52 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 1, s_2); /* <-, line 53 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 4:
+                {   int ret = slice_from_s(z, 1, s_3); /* <-, line 54 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 5:
+                {   int ret = slice_from_s(z, 1, s_4); /* <-, line 55 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 6:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab0;
+                    z->c = ret; /* next, line 57 */
+                }
+                break;
+        }
+        continue;
+    lab0:
+        z->c = c1;
+        break;
+    }
+    return 1;
+}
+
+static int r_RV(struct SN_env * z) {
+    if (!(z->I[0] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R1(struct SN_env * z) {
+    if (!(z->I[1] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_R2(struct SN_env * z) {
+    if (!(z->I[2] <= z->c)) return 0;
+    return 1;
+}
+
+static int r_attached_pronoun(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 68 */
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((557090 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    if (!(find_among_b(z, a_1, 13))) return 0; /* substring, line 68 */
+    z->bra = z->c; /* ], line 68 */
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 111 && z->p[z->c - 1] != 114)) return 0;
+    among_var = find_among_b(z, a_2, 11); /* substring, line 72 */
+    if (!(among_var)) return 0;
+    {   int ret = r_RV(z);
+        if (ret == 0) return 0; /* call RV, line 72 */
+        if (ret < 0) return ret;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            z->bra = z->c; /* ], line 73 */
+            {   int ret = slice_from_s(z, 5, s_5); /* <-, line 73 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            z->bra = z->c; /* ], line 74 */
+            {   int ret = slice_from_s(z, 4, s_6); /* <-, line 74 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            z->bra = z->c; /* ], line 75 */
+            {   int ret = slice_from_s(z, 2, s_7); /* <-, line 75 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            z->bra = z->c; /* ], line 76 */
+            {   int ret = slice_from_s(z, 2, s_8); /* <-, line 76 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            z->bra = z->c; /* ], line 77 */
+            {   int ret = slice_from_s(z, 2, s_9); /* <-, line 77 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = slice_del(z); /* delete, line 81 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 7:
+            if (!(eq_s_b(z, 1, s_10))) return 0;
+            {   int ret = slice_del(z); /* delete, line 82 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_standard_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 87 */
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((835634 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    among_var = find_among_b(z, a_6, 46); /* substring, line 87 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 87 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 99 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 99 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 105 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 105 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 106 */
+                z->ket = z->c; /* [, line 106 */
+                if (!(eq_s_b(z, 2, s_11))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 106 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call R2, line 106 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 106 */
+                    if (ret < 0) return ret;
+                }
+            lab0:
+                ;
+            }
+            break;
+        case 3:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 111 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 3, s_12); /* <-, line 111 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 115 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 115 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 5:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 119 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_from_s(z, 4, s_14); /* <-, line 119 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 6:
+            {   int ret = r_R1(z);
+                if (ret == 0) return 0; /* call R1, line 123 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 123 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 124 */
+                z->ket = z->c; /* [, line 125 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4718616 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab1; }
+                among_var = find_among_b(z, a_3, 4); /* substring, line 125 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab1; }
+                z->bra = z->c; /* ], line 125 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 125 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 125 */
+                    if (ret < 0) return ret;
+                }
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab1; }
+                    case 1:
+                        z->ket = z->c; /* [, line 126 */
+                        if (!(eq_s_b(z, 2, s_15))) { z->c = z->l - m_keep; goto lab1; }
+                        z->bra = z->c; /* ], line 126 */
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab1; } /* call R2, line 126 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 126 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab1:
+                ;
+            }
+            break;
+        case 7:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 135 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 135 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 136 */
+                z->ket = z->c; /* [, line 137 */
+                if (z->c - 3 <= z->lb || z->p[z->c - 1] != 101) { z->c = z->l - m_keep; goto lab2; }
+                among_var = find_among_b(z, a_4, 3); /* substring, line 137 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab2; }
+                z->bra = z->c; /* ], line 137 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab2; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call R2, line 140 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 140 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab2:
+                ;
+            }
+            break;
+        case 8:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 147 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 147 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 148 */
+                z->ket = z->c; /* [, line 149 */
+                if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((4198408 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->c = z->l - m_keep; goto lab3; }
+                among_var = find_among_b(z, a_5, 3); /* substring, line 149 */
+                if (!(among_var)) { z->c = z->l - m_keep; goto lab3; }
+                z->bra = z->c; /* ], line 149 */
+                switch(among_var) {
+                    case 0: { z->c = z->l - m_keep; goto lab3; }
+                    case 1:
+                        {   int ret = r_R2(z);
+                            if (ret == 0) { z->c = z->l - m_keep; goto lab3; } /* call R2, line 152 */
+                            if (ret < 0) return ret;
+                        }
+                        {   int ret = slice_del(z); /* delete, line 152 */
+                            if (ret < 0) return ret;
+                        }
+                        break;
+                }
+            lab3:
+                ;
+            }
+            break;
+        case 9:
+            {   int ret = r_R2(z);
+                if (ret == 0) return 0; /* call R2, line 159 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 159 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 160 */
+                z->ket = z->c; /* [, line 161 */
+                if (!(eq_s_b(z, 2, s_16))) { z->c = z->l - m_keep; goto lab4; }
+                z->bra = z->c; /* ], line 161 */
+                {   int ret = r_R2(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab4; } /* call R2, line 161 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 161 */
+                    if (ret < 0) return ret;
+                }
+            lab4:
+                ;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_y_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 168 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 168 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 168 */
+        among_var = find_among_b(z, a_7, 12); /* substring, line 168 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 168 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            if (!(eq_s_b(z, 1, s_17))) return 0;
+            {   int ret = slice_del(z); /* delete, line 171 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_verb_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 176 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 176 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 176 */
+        among_var = find_among_b(z, a_8, 96); /* substring, line 176 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 176 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 179 */
+                if (!(eq_s_b(z, 1, s_18))) { z->c = z->l - m_keep; goto lab0; }
+                {   int m_test = z->l - z->c; /* test, line 179 */
+                    if (!(eq_s_b(z, 1, s_19))) { z->c = z->l - m_keep; goto lab0; }
+                    z->c = z->l - m_test;
+                }
+            lab0:
+                ;
+            }
+            z->bra = z->c; /* ], line 179 */
+            {   int ret = slice_del(z); /* delete, line 179 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_del(z); /* delete, line 200 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_residual_suffix(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 205 */
+    among_var = find_among_b(z, a_9, 8); /* substring, line 205 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 205 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 208 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 208 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = r_RV(z);
+                if (ret == 0) return 0; /* call RV, line 210 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = slice_del(z); /* delete, line 210 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 210 */
+                z->ket = z->c; /* [, line 210 */
+                if (!(eq_s_b(z, 1, s_20))) { z->c = z->l - m_keep; goto lab0; }
+                z->bra = z->c; /* ], line 210 */
+                {   int m_test = z->l - z->c; /* test, line 210 */
+                    if (!(eq_s_b(z, 1, s_21))) { z->c = z->l - m_keep; goto lab0; }
+                    z->c = z->l - m_test;
+                }
+                {   int ret = r_RV(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab0; } /* call RV, line 210 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = slice_del(z); /* delete, line 210 */
+                    if (ret < 0) return ret;
+                }
+            lab0:
+                ;
+            }
+            break;
+    }
+    return 1;
+}
+
+extern int spanish_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 216 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 216 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 217 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 218 */
+        {   int ret = r_attached_pronoun(z);
+            if (ret == 0) goto lab1; /* call attached_pronoun, line 218 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 219 */
+        {   int m4 = z->l - z->c; (void)m4; /* or, line 219 */
+            {   int ret = r_standard_suffix(z);
+                if (ret == 0) goto lab4; /* call standard_suffix, line 219 */
+                if (ret < 0) return ret;
+            }
+            goto lab3;
+        lab4:
+            z->c = z->l - m4;
+            {   int ret = r_y_verb_suffix(z);
+                if (ret == 0) goto lab5; /* call y_verb_suffix, line 220 */
+                if (ret < 0) return ret;
+            }
+            goto lab3;
+        lab5:
+            z->c = z->l - m4;
+            {   int ret = r_verb_suffix(z);
+                if (ret == 0) goto lab2; /* call verb_suffix, line 221 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab3:
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m5 = z->l - z->c; (void)m5; /* do, line 223 */
+        {   int ret = r_residual_suffix(z);
+            if (ret == 0) goto lab6; /* call residual_suffix, line 223 */
+            if (ret < 0) return ret;
+        }
+    lab6:
+        z->c = z->l - m5;
+    }
+    z->c = z->lb;
+    {   int c6 = z->c; /* do, line 225 */
+        {   int ret = r_postlude(z);
+            if (ret == 0) goto lab7; /* call postlude, line 225 */
+            if (ret < 0) return ret;
+        }
+    lab7:
+        z->c = c6;
+    }
+    return 1;
+}
+
+extern struct SN_env * spanish_UTF_8_create_env(void) { return SN_create_env(0, 3, 0); }
+
+extern void spanish_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_swedish.c b/src/backend/snowball/libstemmer/stem_UTF_8_swedish.c
new file mode 100644
index 000000000000..1372cec1eebb
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_swedish.c
@@ -0,0 +1,309 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int swedish_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_other_suffix(struct SN_env * z);
+static int r_consonant_pair(struct SN_env * z);
+static int r_main_suffix(struct SN_env * z);
+static int r_mark_regions(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * swedish_UTF_8_create_env(void);
+extern void swedish_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[1] = { 'a' };
+static const symbol s_0_1[4] = { 'a', 'r', 'n', 'a' };
+static const symbol s_0_2[4] = { 'e', 'r', 'n', 'a' };
+static const symbol s_0_3[7] = { 'h', 'e', 't', 'e', 'r', 'n', 'a' };
+static const symbol s_0_4[4] = { 'o', 'r', 'n', 'a' };
+static const symbol s_0_5[2] = { 'a', 'd' };
+static const symbol s_0_6[1] = { 'e' };
+static const symbol s_0_7[3] = { 'a', 'd', 'e' };
+static const symbol s_0_8[4] = { 'a', 'n', 'd', 'e' };
+static const symbol s_0_9[4] = { 'a', 'r', 'n', 'e' };
+static const symbol s_0_10[3] = { 'a', 'r', 'e' };
+static const symbol s_0_11[4] = { 'a', 's', 't', 'e' };
+static const symbol s_0_12[2] = { 'e', 'n' };
+static const symbol s_0_13[5] = { 'a', 'n', 'd', 'e', 'n' };
+static const symbol s_0_14[4] = { 'a', 'r', 'e', 'n' };
+static const symbol s_0_15[5] = { 'h', 'e', 't', 'e', 'n' };
+static const symbol s_0_16[3] = { 'e', 'r', 'n' };
+static const symbol s_0_17[2] = { 'a', 'r' };
+static const symbol s_0_18[2] = { 'e', 'r' };
+static const symbol s_0_19[5] = { 'h', 'e', 't', 'e', 'r' };
+static const symbol s_0_20[2] = { 'o', 'r' };
+static const symbol s_0_21[1] = { 's' };
+static const symbol s_0_22[2] = { 'a', 's' };
+static const symbol s_0_23[5] = { 'a', 'r', 'n', 'a', 's' };
+static const symbol s_0_24[5] = { 'e', 'r', 'n', 'a', 's' };
+static const symbol s_0_25[5] = { 'o', 'r', 'n', 'a', 's' };
+static const symbol s_0_26[2] = { 'e', 's' };
+static const symbol s_0_27[4] = { 'a', 'd', 'e', 's' };
+static const symbol s_0_28[5] = { 'a', 'n', 'd', 'e', 's' };
+static const symbol s_0_29[3] = { 'e', 'n', 's' };
+static const symbol s_0_30[5] = { 'a', 'r', 'e', 'n', 's' };
+static const symbol s_0_31[6] = { 'h', 'e', 't', 'e', 'n', 's' };
+static const symbol s_0_32[4] = { 'e', 'r', 'n', 's' };
+static const symbol s_0_33[2] = { 'a', 't' };
+static const symbol s_0_34[5] = { 'a', 'n', 'd', 'e', 't' };
+static const symbol s_0_35[3] = { 'h', 'e', 't' };
+static const symbol s_0_36[3] = { 'a', 's', 't' };
+
+static const struct among a_0[37] =
+{
+/*  0 */ { 1, s_0_0, -1, 1, 0},
+/*  1 */ { 4, s_0_1, 0, 1, 0},
+/*  2 */ { 4, s_0_2, 0, 1, 0},
+/*  3 */ { 7, s_0_3, 2, 1, 0},
+/*  4 */ { 4, s_0_4, 0, 1, 0},
+/*  5 */ { 2, s_0_5, -1, 1, 0},
+/*  6 */ { 1, s_0_6, -1, 1, 0},
+/*  7 */ { 3, s_0_7, 6, 1, 0},
+/*  8 */ { 4, s_0_8, 6, 1, 0},
+/*  9 */ { 4, s_0_9, 6, 1, 0},
+/* 10 */ { 3, s_0_10, 6, 1, 0},
+/* 11 */ { 4, s_0_11, 6, 1, 0},
+/* 12 */ { 2, s_0_12, -1, 1, 0},
+/* 13 */ { 5, s_0_13, 12, 1, 0},
+/* 14 */ { 4, s_0_14, 12, 1, 0},
+/* 15 */ { 5, s_0_15, 12, 1, 0},
+/* 16 */ { 3, s_0_16, -1, 1, 0},
+/* 17 */ { 2, s_0_17, -1, 1, 0},
+/* 18 */ { 2, s_0_18, -1, 1, 0},
+/* 19 */ { 5, s_0_19, 18, 1, 0},
+/* 20 */ { 2, s_0_20, -1, 1, 0},
+/* 21 */ { 1, s_0_21, -1, 2, 0},
+/* 22 */ { 2, s_0_22, 21, 1, 0},
+/* 23 */ { 5, s_0_23, 22, 1, 0},
+/* 24 */ { 5, s_0_24, 22, 1, 0},
+/* 25 */ { 5, s_0_25, 22, 1, 0},
+/* 26 */ { 2, s_0_26, 21, 1, 0},
+/* 27 */ { 4, s_0_27, 26, 1, 0},
+/* 28 */ { 5, s_0_28, 26, 1, 0},
+/* 29 */ { 3, s_0_29, 21, 1, 0},
+/* 30 */ { 5, s_0_30, 29, 1, 0},
+/* 31 */ { 6, s_0_31, 29, 1, 0},
+/* 32 */ { 4, s_0_32, 21, 1, 0},
+/* 33 */ { 2, s_0_33, -1, 1, 0},
+/* 34 */ { 5, s_0_34, -1, 1, 0},
+/* 35 */ { 3, s_0_35, -1, 1, 0},
+/* 36 */ { 3, s_0_36, -1, 1, 0}
+};
+
+static const symbol s_1_0[2] = { 'd', 'd' };
+static const symbol s_1_1[2] = { 'g', 'd' };
+static const symbol s_1_2[2] = { 'n', 'n' };
+static const symbol s_1_3[2] = { 'd', 't' };
+static const symbol s_1_4[2] = { 'g', 't' };
+static const symbol s_1_5[2] = { 'k', 't' };
+static const symbol s_1_6[2] = { 't', 't' };
+
+static const struct among a_1[7] =
+{
+/*  0 */ { 2, s_1_0, -1, -1, 0},
+/*  1 */ { 2, s_1_1, -1, -1, 0},
+/*  2 */ { 2, s_1_2, -1, -1, 0},
+/*  3 */ { 2, s_1_3, -1, -1, 0},
+/*  4 */ { 2, s_1_4, -1, -1, 0},
+/*  5 */ { 2, s_1_5, -1, -1, 0},
+/*  6 */ { 2, s_1_6, -1, -1, 0}
+};
+
+static const symbol s_2_0[2] = { 'i', 'g' };
+static const symbol s_2_1[3] = { 'l', 'i', 'g' };
+static const symbol s_2_2[3] = { 'e', 'l', 's' };
+static const symbol s_2_3[5] = { 'f', 'u', 'l', 'l', 't' };
+static const symbol s_2_4[5] = { 'l', 0xC3, 0xB6, 's', 't' };
+
+static const struct among a_2[5] =
+{
+/*  0 */ { 2, s_2_0, -1, 1, 0},
+/*  1 */ { 3, s_2_1, 0, 1, 0},
+/*  2 */ { 3, s_2_2, -1, 1, 0},
+/*  3 */ { 5, s_2_3, -1, 3, 0},
+/*  4 */ { 5, s_2_4, -1, 2, 0}
+};
+
+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 32 };
+
+static const unsigned char g_s_ending[] = { 119, 127, 149 };
+
+static const symbol s_0[] = { 'l', 0xC3, 0xB6, 's' };
+static const symbol s_1[] = { 'f', 'u', 'l', 'l' };
+
+static int r_mark_regions(struct SN_env * z) {
+    z->I[0] = z->l;
+    {   int c_test = z->c; /* test, line 29 */
+        {   int ret = skip_utf8(z->p, z->c, 0, z->l, + 3);
+            if (ret < 0) return 0;
+            z->c = ret; /* hop, line 29 */
+        }
+        z->I[1] = z->c; /* setmark x, line 29 */
+        z->c = c_test;
+    }
+    if (out_grouping_U(z, g_v, 97, 246, 1) < 0) return 0; /* goto */ /* grouping v, line 30 */
+    {    /* gopast */ /* non v, line 30 */
+        int ret = in_grouping_U(z, g_v, 97, 246, 1);
+        if (ret < 0) return 0;
+        z->c += ret;
+    }
+    z->I[0] = z->c; /* setmark p1, line 30 */
+     /* try, line 31 */
+    if (!(z->I[0] < z->I[1])) goto lab0;
+    z->I[0] = z->I[1];
+lab0:
+    return 1;
+}
+
+static int r_main_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 37 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 37 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 37 */
+        if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1851442 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_0, 37); /* substring, line 37 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 37 */
+        z->lb = mlimit;
+    }
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_del(z); /* delete, line 44 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            if (in_grouping_b_U(z, g_s_ending, 98, 121, 0)) return 0;
+            {   int ret = slice_del(z); /* delete, line 46 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_consonant_pair(struct SN_env * z) {
+    {   int mlimit; /* setlimit, line 50 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 50 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* and, line 52 */
+            if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1064976 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+            if (!(find_among_b(z, a_1, 7))) { z->lb = mlimit; return 0; } /* among, line 51 */
+            z->c = z->l - m2;
+            z->ket = z->c; /* [, line 52 */
+            {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                if (ret < 0) { z->lb = mlimit; return 0; }
+                z->c = ret; /* next, line 52 */
+            }
+            z->bra = z->c; /* ], line 52 */
+            {   int ret = slice_del(z); /* delete, line 52 */
+                if (ret < 0) return ret;
+            }
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+static int r_other_suffix(struct SN_env * z) {
+    int among_var;
+    {   int mlimit; /* setlimit, line 55 */
+        int m1 = z->l - z->c; (void)m1;
+        if (z->c < z->I[0]) return 0;
+        z->c = z->I[0]; /* tomark, line 55 */
+        mlimit = z->lb; z->lb = z->c;
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 56 */
+        if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((1572992 >> (z->p[z->c - 1] & 0x1f)) & 1)) { z->lb = mlimit; return 0; }
+        among_var = find_among_b(z, a_2, 5); /* substring, line 56 */
+        if (!(among_var)) { z->lb = mlimit; return 0; }
+        z->bra = z->c; /* ], line 56 */
+        switch(among_var) {
+            case 0: { z->lb = mlimit; return 0; }
+            case 1:
+                {   int ret = slice_del(z); /* delete, line 57 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 2:
+                {   int ret = slice_from_s(z, 4, s_0); /* <-, line 58 */
+                    if (ret < 0) return ret;
+                }
+                break;
+            case 3:
+                {   int ret = slice_from_s(z, 4, s_1); /* <-, line 59 */
+                    if (ret < 0) return ret;
+                }
+                break;
+        }
+        z->lb = mlimit;
+    }
+    return 1;
+}
+
+extern int swedish_UTF_8_stem(struct SN_env * z) {
+    {   int c1 = z->c; /* do, line 66 */
+        {   int ret = r_mark_regions(z);
+            if (ret == 0) goto lab0; /* call mark_regions, line 66 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 67 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 68 */
+        {   int ret = r_main_suffix(z);
+            if (ret == 0) goto lab1; /* call main_suffix, line 68 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 69 */
+        {   int ret = r_consonant_pair(z);
+            if (ret == 0) goto lab2; /* call consonant_pair, line 69 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    {   int m4 = z->l - z->c; (void)m4; /* do, line 70 */
+        {   int ret = r_other_suffix(z);
+            if (ret == 0) goto lab3; /* call other_suffix, line 70 */
+            if (ret < 0) return ret;
+        }
+    lab3:
+        z->c = z->l - m4;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern struct SN_env * swedish_UTF_8_create_env(void) { return SN_create_env(0, 2, 0); }
+
+extern void swedish_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_turkish.c b/src/backend/snowball/libstemmer/stem_UTF_8_turkish.c
new file mode 100644
index 000000000000..587351d126f1
--- /dev/null
+++ b/src/backend/snowball/libstemmer/stem_UTF_8_turkish.c
@@ -0,0 +1,2205 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#include "header.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int turkish_UTF_8_stem(struct SN_env * z);
+#ifdef __cplusplus
+}
+#endif
+static int r_stem_suffix_chain_before_ki(struct SN_env * z);
+static int r_stem_noun_suffixes(struct SN_env * z);
+static int r_stem_nominal_verb_suffixes(struct SN_env * z);
+static int r_postlude(struct SN_env * z);
+static int r_post_process_last_consonants(struct SN_env * z);
+static int r_more_than_one_syllable_word(struct SN_env * z);
+static int r_mark_suffix_with_optional_s_consonant(struct SN_env * z);
+static int r_mark_suffix_with_optional_n_consonant(struct SN_env * z);
+static int r_mark_suffix_with_optional_U_vowel(struct SN_env * z);
+static int r_mark_suffix_with_optional_y_consonant(struct SN_env * z);
+static int r_mark_ysA(struct SN_env * z);
+static int r_mark_ymUs_(struct SN_env * z);
+static int r_mark_yken(struct SN_env * z);
+static int r_mark_yDU(struct SN_env * z);
+static int r_mark_yUz(struct SN_env * z);
+static int r_mark_yUm(struct SN_env * z);
+static int r_mark_yU(struct SN_env * z);
+static int r_mark_ylA(struct SN_env * z);
+static int r_mark_yA(struct SN_env * z);
+static int r_mark_possessives(struct SN_env * z);
+static int r_mark_sUnUz(struct SN_env * z);
+static int r_mark_sUn(struct SN_env * z);
+static int r_mark_sU(struct SN_env * z);
+static int r_mark_nUz(struct SN_env * z);
+static int r_mark_nUn(struct SN_env * z);
+static int r_mark_nU(struct SN_env * z);
+static int r_mark_ndAn(struct SN_env * z);
+static int r_mark_ndA(struct SN_env * z);
+static int r_mark_ncA(struct SN_env * z);
+static int r_mark_nA(struct SN_env * z);
+static int r_mark_lArI(struct SN_env * z);
+static int r_mark_lAr(struct SN_env * z);
+static int r_mark_ki(struct SN_env * z);
+static int r_mark_DUr(struct SN_env * z);
+static int r_mark_DAn(struct SN_env * z);
+static int r_mark_DA(struct SN_env * z);
+static int r_mark_cAsInA(struct SN_env * z);
+static int r_is_reserved_word(struct SN_env * z);
+static int r_check_vowel_harmony(struct SN_env * z);
+static int r_append_U_to_stems_ending_with_d_or_g(struct SN_env * z);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern struct SN_env * turkish_UTF_8_create_env(void);
+extern void turkish_UTF_8_close_env(struct SN_env * z);
+
+
+#ifdef __cplusplus
+}
+#endif
+static const symbol s_0_0[1] = { 'm' };
+static const symbol s_0_1[1] = { 'n' };
+static const symbol s_0_2[3] = { 'm', 'i', 'z' };
+static const symbol s_0_3[3] = { 'n', 'i', 'z' };
+static const symbol s_0_4[3] = { 'm', 'u', 'z' };
+static const symbol s_0_5[3] = { 'n', 'u', 'z' };
+static const symbol s_0_6[4] = { 'm', 0xC4, 0xB1, 'z' };
+static const symbol s_0_7[4] = { 'n', 0xC4, 0xB1, 'z' };
+static const symbol s_0_8[4] = { 'm', 0xC3, 0xBC, 'z' };
+static const symbol s_0_9[4] = { 'n', 0xC3, 0xBC, 'z' };
+
+static const struct among a_0[10] =
+{
+/*  0 */ { 1, s_0_0, -1, -1, 0},
+/*  1 */ { 1, s_0_1, -1, -1, 0},
+/*  2 */ { 3, s_0_2, -1, -1, 0},
+/*  3 */ { 3, s_0_3, -1, -1, 0},
+/*  4 */ { 3, s_0_4, -1, -1, 0},
+/*  5 */ { 3, s_0_5, -1, -1, 0},
+/*  6 */ { 4, s_0_6, -1, -1, 0},
+/*  7 */ { 4, s_0_7, -1, -1, 0},
+/*  8 */ { 4, s_0_8, -1, -1, 0},
+/*  9 */ { 4, s_0_9, -1, -1, 0}
+};
+
+static const symbol s_1_0[4] = { 'l', 'e', 'r', 'i' };
+static const symbol s_1_1[5] = { 'l', 'a', 'r', 0xC4, 0xB1 };
+
+static const struct among a_1[2] =
+{
+/*  0 */ { 4, s_1_0, -1, -1, 0},
+/*  1 */ { 5, s_1_1, -1, -1, 0}
+};
+
+static const symbol s_2_0[2] = { 'n', 'i' };
+static const symbol s_2_1[2] = { 'n', 'u' };
+static const symbol s_2_2[3] = { 'n', 0xC4, 0xB1 };
+static const symbol s_2_3[3] = { 'n', 0xC3, 0xBC };
+
+static const struct among a_2[4] =
+{
+/*  0 */ { 2, s_2_0, -1, -1, 0},
+/*  1 */ { 2, s_2_1, -1, -1, 0},
+/*  2 */ { 3, s_2_2, -1, -1, 0},
+/*  3 */ { 3, s_2_3, -1, -1, 0}
+};
+
+static const symbol s_3_0[2] = { 'i', 'n' };
+static const symbol s_3_1[2] = { 'u', 'n' };
+static const symbol s_3_2[3] = { 0xC4, 0xB1, 'n' };
+static const symbol s_3_3[3] = { 0xC3, 0xBC, 'n' };
+
+static const struct among a_3[4] =
+{
+/*  0 */ { 2, s_3_0, -1, -1, 0},
+/*  1 */ { 2, s_3_1, -1, -1, 0},
+/*  2 */ { 3, s_3_2, -1, -1, 0},
+/*  3 */ { 3, s_3_3, -1, -1, 0}
+};
+
+static const symbol s_4_0[1] = { 'a' };
+static const symbol s_4_1[1] = { 'e' };
+
+static const struct among a_4[2] =
+{
+/*  0 */ { 1, s_4_0, -1, -1, 0},
+/*  1 */ { 1, s_4_1, -1, -1, 0}
+};
+
+static const symbol s_5_0[2] = { 'n', 'a' };
+static const symbol s_5_1[2] = { 'n', 'e' };
+
+static const struct among a_5[2] =
+{
+/*  0 */ { 2, s_5_0, -1, -1, 0},
+/*  1 */ { 2, s_5_1, -1, -1, 0}
+};
+
+static const symbol s_6_0[2] = { 'd', 'a' };
+static const symbol s_6_1[2] = { 't', 'a' };
+static const symbol s_6_2[2] = { 'd', 'e' };
+static const symbol s_6_3[2] = { 't', 'e' };
+
+static const struct among a_6[4] =
+{
+/*  0 */ { 2, s_6_0, -1, -1, 0},
+/*  1 */ { 2, s_6_1, -1, -1, 0},
+/*  2 */ { 2, s_6_2, -1, -1, 0},
+/*  3 */ { 2, s_6_3, -1, -1, 0}
+};
+
+static const symbol s_7_0[3] = { 'n', 'd', 'a' };
+static const symbol s_7_1[3] = { 'n', 'd', 'e' };
+
+static const struct among a_7[2] =
+{
+/*  0 */ { 3, s_7_0, -1, -1, 0},
+/*  1 */ { 3, s_7_1, -1, -1, 0}
+};
+
+static const symbol s_8_0[3] = { 'd', 'a', 'n' };
+static const symbol s_8_1[3] = { 't', 'a', 'n' };
+static const symbol s_8_2[3] = { 'd', 'e', 'n' };
+static const symbol s_8_3[3] = { 't', 'e', 'n' };
+
+static const struct among a_8[4] =
+{
+/*  0 */ { 3, s_8_0, -1, -1, 0},
+/*  1 */ { 3, s_8_1, -1, -1, 0},
+/*  2 */ { 3, s_8_2, -1, -1, 0},
+/*  3 */ { 3, s_8_3, -1, -1, 0}
+};
+
+static const symbol s_9_0[4] = { 'n', 'd', 'a', 'n' };
+static const symbol s_9_1[4] = { 'n', 'd', 'e', 'n' };
+
+static const struct among a_9[2] =
+{
+/*  0 */ { 4, s_9_0, -1, -1, 0},
+/*  1 */ { 4, s_9_1, -1, -1, 0}
+};
+
+static const symbol s_10_0[2] = { 'l', 'a' };
+static const symbol s_10_1[2] = { 'l', 'e' };
+
+static const struct among a_10[2] =
+{
+/*  0 */ { 2, s_10_0, -1, -1, 0},
+/*  1 */ { 2, s_10_1, -1, -1, 0}
+};
+
+static const symbol s_11_0[2] = { 'c', 'a' };
+static const symbol s_11_1[2] = { 'c', 'e' };
+
+static const struct among a_11[2] =
+{
+/*  0 */ { 2, s_11_0, -1, -1, 0},
+/*  1 */ { 2, s_11_1, -1, -1, 0}
+};
+
+static const symbol s_12_0[2] = { 'i', 'm' };
+static const symbol s_12_1[2] = { 'u', 'm' };
+static const symbol s_12_2[3] = { 0xC4, 0xB1, 'm' };
+static const symbol s_12_3[3] = { 0xC3, 0xBC, 'm' };
+
+static const struct among a_12[4] =
+{
+/*  0 */ { 2, s_12_0, -1, -1, 0},
+/*  1 */ { 2, s_12_1, -1, -1, 0},
+/*  2 */ { 3, s_12_2, -1, -1, 0},
+/*  3 */ { 3, s_12_3, -1, -1, 0}
+};
+
+static const symbol s_13_0[3] = { 's', 'i', 'n' };
+static const symbol s_13_1[3] = { 's', 'u', 'n' };
+static const symbol s_13_2[4] = { 's', 0xC4, 0xB1, 'n' };
+static const symbol s_13_3[4] = { 's', 0xC3, 0xBC, 'n' };
+
+static const struct among a_13[4] =
+{
+/*  0 */ { 3, s_13_0, -1, -1, 0},
+/*  1 */ { 3, s_13_1, -1, -1, 0},
+/*  2 */ { 4, s_13_2, -1, -1, 0},
+/*  3 */ { 4, s_13_3, -1, -1, 0}
+};
+
+static const symbol s_14_0[2] = { 'i', 'z' };
+static const symbol s_14_1[2] = { 'u', 'z' };
+static const symbol s_14_2[3] = { 0xC4, 0xB1, 'z' };
+static const symbol s_14_3[3] = { 0xC3, 0xBC, 'z' };
+
+static const struct among a_14[4] =
+{
+/*  0 */ { 2, s_14_0, -1, -1, 0},
+/*  1 */ { 2, s_14_1, -1, -1, 0},
+/*  2 */ { 3, s_14_2, -1, -1, 0},
+/*  3 */ { 3, s_14_3, -1, -1, 0}
+};
+
+static const symbol s_15_0[5] = { 's', 'i', 'n', 'i', 'z' };
+static const symbol s_15_1[5] = { 's', 'u', 'n', 'u', 'z' };
+static const symbol s_15_2[7] = { 's', 0xC4, 0xB1, 'n', 0xC4, 0xB1, 'z' };
+static const symbol s_15_3[7] = { 's', 0xC3, 0xBC, 'n', 0xC3, 0xBC, 'z' };
+
+static const struct among a_15[4] =
+{
+/*  0 */ { 5, s_15_0, -1, -1, 0},
+/*  1 */ { 5, s_15_1, -1, -1, 0},
+/*  2 */ { 7, s_15_2, -1, -1, 0},
+/*  3 */ { 7, s_15_3, -1, -1, 0}
+};
+
+static const symbol s_16_0[3] = { 'l', 'a', 'r' };
+static const symbol s_16_1[3] = { 'l', 'e', 'r' };
+
+static const struct among a_16[2] =
+{
+/*  0 */ { 3, s_16_0, -1, -1, 0},
+/*  1 */ { 3, s_16_1, -1, -1, 0}
+};
+
+static const symbol s_17_0[3] = { 'n', 'i', 'z' };
+static const symbol s_17_1[3] = { 'n', 'u', 'z' };
+static const symbol s_17_2[4] = { 'n', 0xC4, 0xB1, 'z' };
+static const symbol s_17_3[4] = { 'n', 0xC3, 0xBC, 'z' };
+
+static const struct among a_17[4] =
+{
+/*  0 */ { 3, s_17_0, -1, -1, 0},
+/*  1 */ { 3, s_17_1, -1, -1, 0},
+/*  2 */ { 4, s_17_2, -1, -1, 0},
+/*  3 */ { 4, s_17_3, -1, -1, 0}
+};
+
+static const symbol s_18_0[3] = { 'd', 'i', 'r' };
+static const symbol s_18_1[3] = { 't', 'i', 'r' };
+static const symbol s_18_2[3] = { 'd', 'u', 'r' };
+static const symbol s_18_3[3] = { 't', 'u', 'r' };
+static const symbol s_18_4[4] = { 'd', 0xC4, 0xB1, 'r' };
+static const symbol s_18_5[4] = { 't', 0xC4, 0xB1, 'r' };
+static const symbol s_18_6[4] = { 'd', 0xC3, 0xBC, 'r' };
+static const symbol s_18_7[4] = { 't', 0xC3, 0xBC, 'r' };
+
+static const struct among a_18[8] =
+{
+/*  0 */ { 3, s_18_0, -1, -1, 0},
+/*  1 */ { 3, s_18_1, -1, -1, 0},
+/*  2 */ { 3, s_18_2, -1, -1, 0},
+/*  3 */ { 3, s_18_3, -1, -1, 0},
+/*  4 */ { 4, s_18_4, -1, -1, 0},
+/*  5 */ { 4, s_18_5, -1, -1, 0},
+/*  6 */ { 4, s_18_6, -1, -1, 0},
+/*  7 */ { 4, s_18_7, -1, -1, 0}
+};
+
+static const symbol s_19_0[7] = { 'c', 'a', 's', 0xC4, 0xB1, 'n', 'a' };
+static const symbol s_19_1[6] = { 'c', 'e', 's', 'i', 'n', 'e' };
+
+static const struct among a_19[2] =
+{
+/*  0 */ { 7, s_19_0, -1, -1, 0},
+/*  1 */ { 6, s_19_1, -1, -1, 0}
+};
+
+static const symbol s_20_0[2] = { 'd', 'i' };
+static const symbol s_20_1[2] = { 't', 'i' };
+static const symbol s_20_2[3] = { 'd', 'i', 'k' };
+static const symbol s_20_3[3] = { 't', 'i', 'k' };
+static const symbol s_20_4[3] = { 'd', 'u', 'k' };
+static const symbol s_20_5[3] = { 't', 'u', 'k' };
+static const symbol s_20_6[4] = { 'd', 0xC4, 0xB1, 'k' };
+static const symbol s_20_7[4] = { 't', 0xC4, 0xB1, 'k' };
+static const symbol s_20_8[4] = { 'd', 0xC3, 0xBC, 'k' };
+static const symbol s_20_9[4] = { 't', 0xC3, 0xBC, 'k' };
+static const symbol s_20_10[3] = { 'd', 'i', 'm' };
+static const symbol s_20_11[3] = { 't', 'i', 'm' };
+static const symbol s_20_12[3] = { 'd', 'u', 'm' };
+static const symbol s_20_13[3] = { 't', 'u', 'm' };
+static const symbol s_20_14[4] = { 'd', 0xC4, 0xB1, 'm' };
+static const symbol s_20_15[4] = { 't', 0xC4, 0xB1, 'm' };
+static const symbol s_20_16[4] = { 'd', 0xC3, 0xBC, 'm' };
+static const symbol s_20_17[4] = { 't', 0xC3, 0xBC, 'm' };
+static const symbol s_20_18[3] = { 'd', 'i', 'n' };
+static const symbol s_20_19[3] = { 't', 'i', 'n' };
+static const symbol s_20_20[3] = { 'd', 'u', 'n' };
+static const symbol s_20_21[3] = { 't', 'u', 'n' };
+static const symbol s_20_22[4] = { 'd', 0xC4, 0xB1, 'n' };
+static const symbol s_20_23[4] = { 't', 0xC4, 0xB1, 'n' };
+static const symbol s_20_24[4] = { 'd', 0xC3, 0xBC, 'n' };
+static const symbol s_20_25[4] = { 't', 0xC3, 0xBC, 'n' };
+static const symbol s_20_26[2] = { 'd', 'u' };
+static const symbol s_20_27[2] = { 't', 'u' };
+static const symbol s_20_28[3] = { 'd', 0xC4, 0xB1 };
+static const symbol s_20_29[3] = { 't', 0xC4, 0xB1 };
+static const symbol s_20_30[3] = { 'd', 0xC3, 0xBC };
+static const symbol s_20_31[3] = { 't', 0xC3, 0xBC };
+
+static const struct among a_20[32] =
+{
+/*  0 */ { 2, s_20_0, -1, -1, 0},
+/*  1 */ { 2, s_20_1, -1, -1, 0},
+/*  2 */ { 3, s_20_2, -1, -1, 0},
+/*  3 */ { 3, s_20_3, -1, -1, 0},
+/*  4 */ { 3, s_20_4, -1, -1, 0},
+/*  5 */ { 3, s_20_5, -1, -1, 0},
+/*  6 */ { 4, s_20_6, -1, -1, 0},
+/*  7 */ { 4, s_20_7, -1, -1, 0},
+/*  8 */ { 4, s_20_8, -1, -1, 0},
+/*  9 */ { 4, s_20_9, -1, -1, 0},
+/* 10 */ { 3, s_20_10, -1, -1, 0},
+/* 11 */ { 3, s_20_11, -1, -1, 0},
+/* 12 */ { 3, s_20_12, -1, -1, 0},
+/* 13 */ { 3, s_20_13, -1, -1, 0},
+/* 14 */ { 4, s_20_14, -1, -1, 0},
+/* 15 */ { 4, s_20_15, -1, -1, 0},
+/* 16 */ { 4, s_20_16, -1, -1, 0},
+/* 17 */ { 4, s_20_17, -1, -1, 0},
+/* 18 */ { 3, s_20_18, -1, -1, 0},
+/* 19 */ { 3, s_20_19, -1, -1, 0},
+/* 20 */ { 3, s_20_20, -1, -1, 0},
+/* 21 */ { 3, s_20_21, -1, -1, 0},
+/* 22 */ { 4, s_20_22, -1, -1, 0},
+/* 23 */ { 4, s_20_23, -1, -1, 0},
+/* 24 */ { 4, s_20_24, -1, -1, 0},
+/* 25 */ { 4, s_20_25, -1, -1, 0},
+/* 26 */ { 2, s_20_26, -1, -1, 0},
+/* 27 */ { 2, s_20_27, -1, -1, 0},
+/* 28 */ { 3, s_20_28, -1, -1, 0},
+/* 29 */ { 3, s_20_29, -1, -1, 0},
+/* 30 */ { 3, s_20_30, -1, -1, 0},
+/* 31 */ { 3, s_20_31, -1, -1, 0}
+};
+
+static const symbol s_21_0[2] = { 's', 'a' };
+static const symbol s_21_1[2] = { 's', 'e' };
+static const symbol s_21_2[3] = { 's', 'a', 'k' };
+static const symbol s_21_3[3] = { 's', 'e', 'k' };
+static const symbol s_21_4[3] = { 's', 'a', 'm' };
+static const symbol s_21_5[3] = { 's', 'e', 'm' };
+static const symbol s_21_6[3] = { 's', 'a', 'n' };
+static const symbol s_21_7[3] = { 's', 'e', 'n' };
+
+static const struct among a_21[8] =
+{
+/*  0 */ { 2, s_21_0, -1, -1, 0},
+/*  1 */ { 2, s_21_1, -1, -1, 0},
+/*  2 */ { 3, s_21_2, -1, -1, 0},
+/*  3 */ { 3, s_21_3, -1, -1, 0},
+/*  4 */ { 3, s_21_4, -1, -1, 0},
+/*  5 */ { 3, s_21_5, -1, -1, 0},
+/*  6 */ { 3, s_21_6, -1, -1, 0},
+/*  7 */ { 3, s_21_7, -1, -1, 0}
+};
+
+static const symbol s_22_0[4] = { 'm', 'i', 0xC5, 0x9F };
+static const symbol s_22_1[4] = { 'm', 'u', 0xC5, 0x9F };
+static const symbol s_22_2[5] = { 'm', 0xC4, 0xB1, 0xC5, 0x9F };
+static const symbol s_22_3[5] = { 'm', 0xC3, 0xBC, 0xC5, 0x9F };
+
+static const struct among a_22[4] =
+{
+/*  0 */ { 4, s_22_0, -1, -1, 0},
+/*  1 */ { 4, s_22_1, -1, -1, 0},
+/*  2 */ { 5, s_22_2, -1, -1, 0},
+/*  3 */ { 5, s_22_3, -1, -1, 0}
+};
+
+static const symbol s_23_0[1] = { 'b' };
+static const symbol s_23_1[1] = { 'c' };
+static const symbol s_23_2[1] = { 'd' };
+static const symbol s_23_3[2] = { 0xC4, 0x9F };
+
+static const struct among a_23[4] =
+{
+/*  0 */ { 1, s_23_0, -1, 1, 0},
+/*  1 */ { 1, s_23_1, -1, 2, 0},
+/*  2 */ { 1, s_23_2, -1, 3, 0},
+/*  3 */ { 2, s_23_3, -1, 4, 0}
+};
+
+static const unsigned char g_vowel[] = { 17, 65, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 8, 0, 0, 0, 0, 0, 0, 1 };
+
+static const unsigned char g_U[] = { 1, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1 };
+
+static const unsigned char g_vowel1[] = { 1, 64, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+
+static const unsigned char g_vowel2[] = { 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130 };
+
+static const unsigned char g_vowel3[] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+
+static const unsigned char g_vowel4[] = { 17 };
+
+static const unsigned char g_vowel5[] = { 65 };
+
+static const unsigned char g_vowel6[] = { 65 };
+
+static const symbol s_0[] = { 'a' };
+static const symbol s_1[] = { 'e' };
+static const symbol s_2[] = { 0xC4, 0xB1 };
+static const symbol s_3[] = { 'i' };
+static const symbol s_4[] = { 'o' };
+static const symbol s_5[] = { 0xC3, 0xB6 };
+static const symbol s_6[] = { 'u' };
+static const symbol s_7[] = { 0xC3, 0xBC };
+static const symbol s_8[] = { 'n' };
+static const symbol s_9[] = { 'n' };
+static const symbol s_10[] = { 's' };
+static const symbol s_11[] = { 's' };
+static const symbol s_12[] = { 'y' };
+static const symbol s_13[] = { 'y' };
+static const symbol s_14[] = { 'k', 'i' };
+static const symbol s_15[] = { 'k', 'e', 'n' };
+static const symbol s_16[] = { 'p' };
+static const symbol s_17[] = { 0xC3, 0xA7 };
+static const symbol s_18[] = { 't' };
+static const symbol s_19[] = { 'k' };
+static const symbol s_20[] = { 'd' };
+static const symbol s_21[] = { 'g' };
+static const symbol s_22[] = { 'a' };
+static const symbol s_23[] = { 0xC4, 0xB1 };
+static const symbol s_24[] = { 0xC4, 0xB1 };
+static const symbol s_25[] = { 'e' };
+static const symbol s_26[] = { 'i' };
+static const symbol s_27[] = { 'i' };
+static const symbol s_28[] = { 'o' };
+static const symbol s_29[] = { 'u' };
+static const symbol s_30[] = { 'u' };
+static const symbol s_31[] = { 0xC3, 0xB6 };
+static const symbol s_32[] = { 0xC3, 0xBC };
+static const symbol s_33[] = { 0xC3, 0xBC };
+static const symbol s_34[] = { 'a', 'd' };
+static const symbol s_35[] = { 's', 'o', 'y', 'a', 'd' };
+
+static int r_check_vowel_harmony(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 112 */
+        if (out_grouping_b_U(z, g_vowel, 97, 305, 1) < 0) return 0; /* goto */ /* grouping vowel, line 114 */
+        {   int m1 = z->l - z->c; (void)m1; /* or, line 116 */
+            if (!(eq_s_b(z, 1, s_0))) goto lab1;
+            if (out_grouping_b_U(z, g_vowel1, 97, 305, 1) < 0) goto lab1; /* goto */ /* grouping vowel1, line 116 */
+            goto lab0;
+        lab1:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 1, s_1))) goto lab2;
+            if (out_grouping_b_U(z, g_vowel2, 101, 252, 1) < 0) goto lab2; /* goto */ /* grouping vowel2, line 117 */
+            goto lab0;
+        lab2:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 2, s_2))) goto lab3;
+            if (out_grouping_b_U(z, g_vowel3, 97, 305, 1) < 0) goto lab3; /* goto */ /* grouping vowel3, line 118 */
+            goto lab0;
+        lab3:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 1, s_3))) goto lab4;
+            if (out_grouping_b_U(z, g_vowel4, 101, 105, 1) < 0) goto lab4; /* goto */ /* grouping vowel4, line 119 */
+            goto lab0;
+        lab4:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 1, s_4))) goto lab5;
+            if (out_grouping_b_U(z, g_vowel5, 111, 117, 1) < 0) goto lab5; /* goto */ /* grouping vowel5, line 120 */
+            goto lab0;
+        lab5:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 2, s_5))) goto lab6;
+            if (out_grouping_b_U(z, g_vowel6, 246, 252, 1) < 0) goto lab6; /* goto */ /* grouping vowel6, line 121 */
+            goto lab0;
+        lab6:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 1, s_6))) goto lab7;
+            if (out_grouping_b_U(z, g_vowel5, 111, 117, 1) < 0) goto lab7; /* goto */ /* grouping vowel5, line 122 */
+            goto lab0;
+        lab7:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 2, s_7))) return 0;
+            if (out_grouping_b_U(z, g_vowel6, 246, 252, 1) < 0) return 0; /* goto */ /* grouping vowel6, line 123 */
+        }
+    lab0:
+        z->c = z->l - m_test;
+    }
+    return 1;
+}
+
+static int r_mark_suffix_with_optional_n_consonant(struct SN_env * z) {
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 134 */
+        {   int m_test = z->l - z->c; /* test, line 133 */
+            if (!(eq_s_b(z, 1, s_8))) goto lab1;
+            z->c = z->l - m_test;
+        }
+        {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+            if (ret < 0) goto lab1;
+            z->c = ret; /* next, line 133 */
+        }
+        {   int m_test = z->l - z->c; /* test, line 133 */
+            if (in_grouping_b_U(z, g_vowel, 97, 305, 0)) goto lab1;
+            z->c = z->l - m_test;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 135 */
+            {   int m_test = z->l - z->c; /* test, line 135 */
+                if (!(eq_s_b(z, 1, s_9))) goto lab2;
+                z->c = z->l - m_test;
+            }
+            return 0;
+        lab2:
+            z->c = z->l - m2;
+        }
+        {   int m_test = z->l - z->c; /* test, line 135 */
+            {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                if (ret < 0) return 0;
+                z->c = ret; /* next, line 135 */
+            }
+            {   int m_test = z->l - z->c; /* test, line 135 */
+                if (in_grouping_b_U(z, g_vowel, 97, 305, 0)) return 0;
+                z->c = z->l - m_test;
+            }
+            z->c = z->l - m_test;
+        }
+    }
+lab0:
+    return 1;
+}
+
+static int r_mark_suffix_with_optional_s_consonant(struct SN_env * z) {
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 145 */
+        {   int m_test = z->l - z->c; /* test, line 144 */
+            if (!(eq_s_b(z, 1, s_10))) goto lab1;
+            z->c = z->l - m_test;
+        }
+        {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+            if (ret < 0) goto lab1;
+            z->c = ret; /* next, line 144 */
+        }
+        {   int m_test = z->l - z->c; /* test, line 144 */
+            if (in_grouping_b_U(z, g_vowel, 97, 305, 0)) goto lab1;
+            z->c = z->l - m_test;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 146 */
+            {   int m_test = z->l - z->c; /* test, line 146 */
+                if (!(eq_s_b(z, 1, s_11))) goto lab2;
+                z->c = z->l - m_test;
+            }
+            return 0;
+        lab2:
+            z->c = z->l - m2;
+        }
+        {   int m_test = z->l - z->c; /* test, line 146 */
+            {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                if (ret < 0) return 0;
+                z->c = ret; /* next, line 146 */
+            }
+            {   int m_test = z->l - z->c; /* test, line 146 */
+                if (in_grouping_b_U(z, g_vowel, 97, 305, 0)) return 0;
+                z->c = z->l - m_test;
+            }
+            z->c = z->l - m_test;
+        }
+    }
+lab0:
+    return 1;
+}
+
+static int r_mark_suffix_with_optional_y_consonant(struct SN_env * z) {
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 155 */
+        {   int m_test = z->l - z->c; /* test, line 154 */
+            if (!(eq_s_b(z, 1, s_12))) goto lab1;
+            z->c = z->l - m_test;
+        }
+        {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+            if (ret < 0) goto lab1;
+            z->c = ret; /* next, line 154 */
+        }
+        {   int m_test = z->l - z->c; /* test, line 154 */
+            if (in_grouping_b_U(z, g_vowel, 97, 305, 0)) goto lab1;
+            z->c = z->l - m_test;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 156 */
+            {   int m_test = z->l - z->c; /* test, line 156 */
+                if (!(eq_s_b(z, 1, s_13))) goto lab2;
+                z->c = z->l - m_test;
+            }
+            return 0;
+        lab2:
+            z->c = z->l - m2;
+        }
+        {   int m_test = z->l - z->c; /* test, line 156 */
+            {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                if (ret < 0) return 0;
+                z->c = ret; /* next, line 156 */
+            }
+            {   int m_test = z->l - z->c; /* test, line 156 */
+                if (in_grouping_b_U(z, g_vowel, 97, 305, 0)) return 0;
+                z->c = z->l - m_test;
+            }
+            z->c = z->l - m_test;
+        }
+    }
+lab0:
+    return 1;
+}
+
+static int r_mark_suffix_with_optional_U_vowel(struct SN_env * z) {
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 161 */
+        {   int m_test = z->l - z->c; /* test, line 160 */
+            if (in_grouping_b_U(z, g_U, 105, 305, 0)) goto lab1;
+            z->c = z->l - m_test;
+        }
+        {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+            if (ret < 0) goto lab1;
+            z->c = ret; /* next, line 160 */
+        }
+        {   int m_test = z->l - z->c; /* test, line 160 */
+            if (out_grouping_b_U(z, g_vowel, 97, 305, 0)) goto lab1;
+            z->c = z->l - m_test;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int m2 = z->l - z->c; (void)m2; /* not, line 162 */
+            {   int m_test = z->l - z->c; /* test, line 162 */
+                if (in_grouping_b_U(z, g_U, 105, 305, 0)) goto lab2;
+                z->c = z->l - m_test;
+            }
+            return 0;
+        lab2:
+            z->c = z->l - m2;
+        }
+        {   int m_test = z->l - z->c; /* test, line 162 */
+            {   int ret = skip_utf8(z->p, z->c, z->lb, 0, -1);
+                if (ret < 0) return 0;
+                z->c = ret; /* next, line 162 */
+            }
+            {   int m_test = z->l - z->c; /* test, line 162 */
+                if (out_grouping_b_U(z, g_vowel, 97, 305, 0)) return 0;
+                z->c = z->l - m_test;
+            }
+            z->c = z->l - m_test;
+        }
+    }
+lab0:
+    return 1;
+}
+
+static int r_mark_possessives(struct SN_env * z) {
+    if (z->c <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((67133440 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    if (!(find_among_b(z, a_0, 10))) return 0; /* among, line 167 */
+    {   int ret = r_mark_suffix_with_optional_U_vowel(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_U_vowel, line 169 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_sU(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 173 */
+        if (ret < 0) return ret;
+    }
+    if (in_grouping_b_U(z, g_U, 105, 305, 0)) return 0;
+    {   int ret = r_mark_suffix_with_optional_s_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_s_consonant, line 175 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_lArI(struct SN_env * z) {
+    if (z->c - 3 <= z->lb || (z->p[z->c - 1] != 105 && z->p[z->c - 1] != 177)) return 0;
+    if (!(find_among_b(z, a_1, 2))) return 0; /* among, line 179 */
+    return 1;
+}
+
+static int r_mark_yU(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 183 */
+        if (ret < 0) return ret;
+    }
+    if (in_grouping_b_U(z, g_U, 105, 305, 0)) return 0;
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 185 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_nU(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 189 */
+        if (ret < 0) return ret;
+    }
+    if (!(find_among_b(z, a_2, 4))) return 0; /* among, line 190 */
+    return 1;
+}
+
+static int r_mark_nUn(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 194 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] != 110) return 0;
+    if (!(find_among_b(z, a_3, 4))) return 0; /* among, line 195 */
+    {   int ret = r_mark_suffix_with_optional_n_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_n_consonant, line 196 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_yA(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 200 */
+        if (ret < 0) return ret;
+    }
+    if (z->c <= z->lb || (z->p[z->c - 1] != 97 && z->p[z->c - 1] != 101)) return 0;
+    if (!(find_among_b(z, a_4, 2))) return 0; /* among, line 201 */
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 202 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_nA(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 206 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 97 && z->p[z->c - 1] != 101)) return 0;
+    if (!(find_among_b(z, a_5, 2))) return 0; /* among, line 207 */
+    return 1;
+}
+
+static int r_mark_DA(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 211 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 97 && z->p[z->c - 1] != 101)) return 0;
+    if (!(find_among_b(z, a_6, 4))) return 0; /* among, line 212 */
+    return 1;
+}
+
+static int r_mark_ndA(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 216 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 2 <= z->lb || (z->p[z->c - 1] != 97 && z->p[z->c - 1] != 101)) return 0;
+    if (!(find_among_b(z, a_7, 2))) return 0; /* among, line 217 */
+    return 1;
+}
+
+static int r_mark_DAn(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 221 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] != 110) return 0;
+    if (!(find_among_b(z, a_8, 4))) return 0; /* among, line 222 */
+    return 1;
+}
+
+static int r_mark_ndAn(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 226 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 3 <= z->lb || z->p[z->c - 1] != 110) return 0;
+    if (!(find_among_b(z, a_9, 2))) return 0; /* among, line 227 */
+    return 1;
+}
+
+static int r_mark_ylA(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 231 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 97 && z->p[z->c - 1] != 101)) return 0;
+    if (!(find_among_b(z, a_10, 2))) return 0; /* among, line 232 */
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 233 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_ki(struct SN_env * z) {
+    if (!(eq_s_b(z, 2, s_14))) return 0;
+    return 1;
+}
+
+static int r_mark_ncA(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 241 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 97 && z->p[z->c - 1] != 101)) return 0;
+    if (!(find_among_b(z, a_11, 2))) return 0; /* among, line 242 */
+    {   int ret = r_mark_suffix_with_optional_n_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_n_consonant, line 243 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_yUm(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 247 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] != 109) return 0;
+    if (!(find_among_b(z, a_12, 4))) return 0; /* among, line 248 */
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 249 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_sUn(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 253 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] != 110) return 0;
+    if (!(find_among_b(z, a_13, 4))) return 0; /* among, line 254 */
+    return 1;
+}
+
+static int r_mark_yUz(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 258 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] != 122) return 0;
+    if (!(find_among_b(z, a_14, 4))) return 0; /* among, line 259 */
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 260 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_sUnUz(struct SN_env * z) {
+    if (z->c - 4 <= z->lb || z->p[z->c - 1] != 122) return 0;
+    if (!(find_among_b(z, a_15, 4))) return 0; /* among, line 264 */
+    return 1;
+}
+
+static int r_mark_lAr(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 268 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] != 114) return 0;
+    if (!(find_among_b(z, a_16, 2))) return 0; /* among, line 269 */
+    return 1;
+}
+
+static int r_mark_nUz(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 273 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] != 122) return 0;
+    if (!(find_among_b(z, a_17, 4))) return 0; /* among, line 274 */
+    return 1;
+}
+
+static int r_mark_DUr(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 278 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 2 <= z->lb || z->p[z->c - 1] != 114) return 0;
+    if (!(find_among_b(z, a_18, 8))) return 0; /* among, line 279 */
+    return 1;
+}
+
+static int r_mark_cAsInA(struct SN_env * z) {
+    if (z->c - 5 <= z->lb || (z->p[z->c - 1] != 97 && z->p[z->c - 1] != 101)) return 0;
+    if (!(find_among_b(z, a_19, 2))) return 0; /* among, line 283 */
+    return 1;
+}
+
+static int r_mark_yDU(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 287 */
+        if (ret < 0) return ret;
+    }
+    if (!(find_among_b(z, a_20, 32))) return 0; /* among, line 288 */
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 292 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_ysA(struct SN_env * z) {
+    if (z->c - 1 <= z->lb || z->p[z->c - 1] >> 5 != 3 || !((26658 >> (z->p[z->c - 1] & 0x1f)) & 1)) return 0;
+    if (!(find_among_b(z, a_21, 8))) return 0; /* among, line 297 */
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 298 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_ymUs_(struct SN_env * z) {
+    {   int ret = r_check_vowel_harmony(z);
+        if (ret == 0) return 0; /* call check_vowel_harmony, line 302 */
+        if (ret < 0) return ret;
+    }
+    if (z->c - 3 <= z->lb || z->p[z->c - 1] != 159) return 0;
+    if (!(find_among_b(z, a_22, 4))) return 0; /* among, line 303 */
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 304 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_mark_yken(struct SN_env * z) {
+    if (!(eq_s_b(z, 3, s_15))) return 0;
+    {   int ret = r_mark_suffix_with_optional_y_consonant(z);
+        if (ret == 0) return 0; /* call mark_suffix_with_optional_y_consonant, line 308 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_stem_nominal_verb_suffixes(struct SN_env * z) {
+    z->ket = z->c; /* [, line 312 */
+    z->B[0] = 1; /* set continue_stemming_noun_suffixes, line 313 */
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 315 */
+        {   int m2 = z->l - z->c; (void)m2; /* or, line 314 */
+            {   int ret = r_mark_ymUs_(z);
+                if (ret == 0) goto lab3; /* call mark_ymUs_, line 314 */
+                if (ret < 0) return ret;
+            }
+            goto lab2;
+        lab3:
+            z->c = z->l - m2;
+            {   int ret = r_mark_yDU(z);
+                if (ret == 0) goto lab4; /* call mark_yDU, line 314 */
+                if (ret < 0) return ret;
+            }
+            goto lab2;
+        lab4:
+            z->c = z->l - m2;
+            {   int ret = r_mark_ysA(z);
+                if (ret == 0) goto lab5; /* call mark_ysA, line 314 */
+                if (ret < 0) return ret;
+            }
+            goto lab2;
+        lab5:
+            z->c = z->l - m2;
+            {   int ret = r_mark_yken(z);
+                if (ret == 0) goto lab1; /* call mark_yken, line 314 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab2:
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int ret = r_mark_cAsInA(z);
+            if (ret == 0) goto lab6; /* call mark_cAsInA, line 316 */
+            if (ret < 0) return ret;
+        }
+        {   int m3 = z->l - z->c; (void)m3; /* or, line 316 */
+            {   int ret = r_mark_sUnUz(z);
+                if (ret == 0) goto lab8; /* call mark_sUnUz, line 316 */
+                if (ret < 0) return ret;
+            }
+            goto lab7;
+        lab8:
+            z->c = z->l - m3;
+            {   int ret = r_mark_lAr(z);
+                if (ret == 0) goto lab9; /* call mark_lAr, line 316 */
+                if (ret < 0) return ret;
+            }
+            goto lab7;
+        lab9:
+            z->c = z->l - m3;
+            {   int ret = r_mark_yUm(z);
+                if (ret == 0) goto lab10; /* call mark_yUm, line 316 */
+                if (ret < 0) return ret;
+            }
+            goto lab7;
+        lab10:
+            z->c = z->l - m3;
+            {   int ret = r_mark_sUn(z);
+                if (ret == 0) goto lab11; /* call mark_sUn, line 316 */
+                if (ret < 0) return ret;
+            }
+            goto lab7;
+        lab11:
+            z->c = z->l - m3;
+            {   int ret = r_mark_yUz(z);
+                if (ret == 0) goto lab12; /* call mark_yUz, line 316 */
+                if (ret < 0) return ret;
+            }
+            goto lab7;
+        lab12:
+            z->c = z->l - m3;
+        }
+    lab7:
+        {   int ret = r_mark_ymUs_(z);
+            if (ret == 0) goto lab6; /* call mark_ymUs_, line 316 */
+            if (ret < 0) return ret;
+        }
+        goto lab0;
+    lab6:
+        z->c = z->l - m1;
+        {   int ret = r_mark_lAr(z);
+            if (ret == 0) goto lab13; /* call mark_lAr, line 319 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 319 */
+        {   int ret = slice_del(z); /* delete, line 319 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 319 */
+            z->ket = z->c; /* [, line 319 */
+            {   int m4 = z->l - z->c; (void)m4; /* or, line 319 */
+                {   int ret = r_mark_DUr(z);
+                    if (ret == 0) goto lab16; /* call mark_DUr, line 319 */
+                    if (ret < 0) return ret;
+                }
+                goto lab15;
+            lab16:
+                z->c = z->l - m4;
+                {   int ret = r_mark_yDU(z);
+                    if (ret == 0) goto lab17; /* call mark_yDU, line 319 */
+                    if (ret < 0) return ret;
+                }
+                goto lab15;
+            lab17:
+                z->c = z->l - m4;
+                {   int ret = r_mark_ysA(z);
+                    if (ret == 0) goto lab18; /* call mark_ysA, line 319 */
+                    if (ret < 0) return ret;
+                }
+                goto lab15;
+            lab18:
+                z->c = z->l - m4;
+                {   int ret = r_mark_ymUs_(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab14; } /* call mark_ymUs_, line 319 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab15:
+        lab14:
+            ;
+        }
+        z->B[0] = 0; /* unset continue_stemming_noun_suffixes, line 320 */
+        goto lab0;
+    lab13:
+        z->c = z->l - m1;
+        {   int ret = r_mark_nUz(z);
+            if (ret == 0) goto lab19; /* call mark_nUz, line 323 */
+            if (ret < 0) return ret;
+        }
+        {   int m5 = z->l - z->c; (void)m5; /* or, line 323 */
+            {   int ret = r_mark_yDU(z);
+                if (ret == 0) goto lab21; /* call mark_yDU, line 323 */
+                if (ret < 0) return ret;
+            }
+            goto lab20;
+        lab21:
+            z->c = z->l - m5;
+            {   int ret = r_mark_ysA(z);
+                if (ret == 0) goto lab19; /* call mark_ysA, line 323 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab20:
+        goto lab0;
+    lab19:
+        z->c = z->l - m1;
+        {   int m6 = z->l - z->c; (void)m6; /* or, line 325 */
+            {   int ret = r_mark_sUnUz(z);
+                if (ret == 0) goto lab24; /* call mark_sUnUz, line 325 */
+                if (ret < 0) return ret;
+            }
+            goto lab23;
+        lab24:
+            z->c = z->l - m6;
+            {   int ret = r_mark_yUz(z);
+                if (ret == 0) goto lab25; /* call mark_yUz, line 325 */
+                if (ret < 0) return ret;
+            }
+            goto lab23;
+        lab25:
+            z->c = z->l - m6;
+            {   int ret = r_mark_sUn(z);
+                if (ret == 0) goto lab26; /* call mark_sUn, line 325 */
+                if (ret < 0) return ret;
+            }
+            goto lab23;
+        lab26:
+            z->c = z->l - m6;
+            {   int ret = r_mark_yUm(z);
+                if (ret == 0) goto lab22; /* call mark_yUm, line 325 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab23:
+        z->bra = z->c; /* ], line 325 */
+        {   int ret = slice_del(z); /* delete, line 325 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 325 */
+            z->ket = z->c; /* [, line 325 */
+            {   int ret = r_mark_ymUs_(z);
+                if (ret == 0) { z->c = z->l - m_keep; goto lab27; } /* call mark_ymUs_, line 325 */
+                if (ret < 0) return ret;
+            }
+        lab27:
+            ;
+        }
+        goto lab0;
+    lab22:
+        z->c = z->l - m1;
+        {   int ret = r_mark_DUr(z);
+            if (ret == 0) return 0; /* call mark_DUr, line 327 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 327 */
+        {   int ret = slice_del(z); /* delete, line 327 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 327 */
+            z->ket = z->c; /* [, line 327 */
+            {   int m7 = z->l - z->c; (void)m7; /* or, line 327 */
+                {   int ret = r_mark_sUnUz(z);
+                    if (ret == 0) goto lab30; /* call mark_sUnUz, line 327 */
+                    if (ret < 0) return ret;
+                }
+                goto lab29;
+            lab30:
+                z->c = z->l - m7;
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) goto lab31; /* call mark_lAr, line 327 */
+                    if (ret < 0) return ret;
+                }
+                goto lab29;
+            lab31:
+                z->c = z->l - m7;
+                {   int ret = r_mark_yUm(z);
+                    if (ret == 0) goto lab32; /* call mark_yUm, line 327 */
+                    if (ret < 0) return ret;
+                }
+                goto lab29;
+            lab32:
+                z->c = z->l - m7;
+                {   int ret = r_mark_sUn(z);
+                    if (ret == 0) goto lab33; /* call mark_sUn, line 327 */
+                    if (ret < 0) return ret;
+                }
+                goto lab29;
+            lab33:
+                z->c = z->l - m7;
+                {   int ret = r_mark_yUz(z);
+                    if (ret == 0) goto lab34; /* call mark_yUz, line 327 */
+                    if (ret < 0) return ret;
+                }
+                goto lab29;
+            lab34:
+                z->c = z->l - m7;
+            }
+        lab29:
+            {   int ret = r_mark_ymUs_(z);
+                if (ret == 0) { z->c = z->l - m_keep; goto lab28; } /* call mark_ymUs_, line 327 */
+                if (ret < 0) return ret;
+            }
+        lab28:
+            ;
+        }
+    }
+lab0:
+    z->bra = z->c; /* ], line 328 */
+    {   int ret = slice_del(z); /* delete, line 328 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+static int r_stem_suffix_chain_before_ki(struct SN_env * z) {
+    z->ket = z->c; /* [, line 333 */
+    {   int ret = r_mark_ki(z);
+        if (ret == 0) return 0; /* call mark_ki, line 334 */
+        if (ret < 0) return ret;
+    }
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 342 */
+        {   int ret = r_mark_DA(z);
+            if (ret == 0) goto lab1; /* call mark_DA, line 336 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 336 */
+        {   int ret = slice_del(z); /* delete, line 336 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 336 */
+            z->ket = z->c; /* [, line 336 */
+            {   int m2 = z->l - z->c; (void)m2; /* or, line 338 */
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) goto lab4; /* call mark_lAr, line 337 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 337 */
+                {   int ret = slice_del(z); /* delete, line 337 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 337 */
+                    {   int ret = r_stem_suffix_chain_before_ki(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab5; } /* call stem_suffix_chain_before_ki, line 337 */
+                        if (ret < 0) return ret;
+                    }
+                lab5:
+                    ;
+                }
+                goto lab3;
+            lab4:
+                z->c = z->l - m2;
+                {   int ret = r_mark_possessives(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call mark_possessives, line 339 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 339 */
+                {   int ret = slice_del(z); /* delete, line 339 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 339 */
+                    z->ket = z->c; /* [, line 339 */
+                    {   int ret = r_mark_lAr(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab6; } /* call mark_lAr, line 339 */
+                        if (ret < 0) return ret;
+                    }
+                    z->bra = z->c; /* ], line 339 */
+                    {   int ret = slice_del(z); /* delete, line 339 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = r_stem_suffix_chain_before_ki(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab6; } /* call stem_suffix_chain_before_ki, line 339 */
+                        if (ret < 0) return ret;
+                    }
+                lab6:
+                    ;
+                }
+            }
+        lab3:
+        lab2:
+            ;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        {   int ret = r_mark_nUn(z);
+            if (ret == 0) goto lab7; /* call mark_nUn, line 343 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 343 */
+        {   int ret = slice_del(z); /* delete, line 343 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 343 */
+            z->ket = z->c; /* [, line 343 */
+            {   int m3 = z->l - z->c; (void)m3; /* or, line 345 */
+                {   int ret = r_mark_lArI(z);
+                    if (ret == 0) goto lab10; /* call mark_lArI, line 344 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 344 */
+                {   int ret = slice_del(z); /* delete, line 344 */
+                    if (ret < 0) return ret;
+                }
+                goto lab9;
+            lab10:
+                z->c = z->l - m3;
+                z->ket = z->c; /* [, line 346 */
+                {   int m4 = z->l - z->c; (void)m4; /* or, line 346 */
+                    {   int ret = r_mark_possessives(z);
+                        if (ret == 0) goto lab13; /* call mark_possessives, line 346 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab12;
+                lab13:
+                    z->c = z->l - m4;
+                    {   int ret = r_mark_sU(z);
+                        if (ret == 0) goto lab11; /* call mark_sU, line 346 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab12:
+                z->bra = z->c; /* ], line 346 */
+                {   int ret = slice_del(z); /* delete, line 346 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 346 */
+                    z->ket = z->c; /* [, line 346 */
+                    {   int ret = r_mark_lAr(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab14; } /* call mark_lAr, line 346 */
+                        if (ret < 0) return ret;
+                    }
+                    z->bra = z->c; /* ], line 346 */
+                    {   int ret = slice_del(z); /* delete, line 346 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = r_stem_suffix_chain_before_ki(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab14; } /* call stem_suffix_chain_before_ki, line 346 */
+                        if (ret < 0) return ret;
+                    }
+                lab14:
+                    ;
+                }
+                goto lab9;
+            lab11:
+                z->c = z->l - m3;
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab8; } /* call stem_suffix_chain_before_ki, line 348 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab9:
+        lab8:
+            ;
+        }
+        goto lab0;
+    lab7:
+        z->c = z->l - m1;
+        {   int ret = r_mark_ndA(z);
+            if (ret == 0) return 0; /* call mark_ndA, line 351 */
+            if (ret < 0) return ret;
+        }
+        {   int m5 = z->l - z->c; (void)m5; /* or, line 353 */
+            {   int ret = r_mark_lArI(z);
+                if (ret == 0) goto lab16; /* call mark_lArI, line 352 */
+                if (ret < 0) return ret;
+            }
+            z->bra = z->c; /* ], line 352 */
+            {   int ret = slice_del(z); /* delete, line 352 */
+                if (ret < 0) return ret;
+            }
+            goto lab15;
+        lab16:
+            z->c = z->l - m5;
+            {   int ret = r_mark_sU(z);
+                if (ret == 0) goto lab17; /* call mark_sU, line 354 */
+                if (ret < 0) return ret;
+            }
+            z->bra = z->c; /* ], line 354 */
+            {   int ret = slice_del(z); /* delete, line 354 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 354 */
+                z->ket = z->c; /* [, line 354 */
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab18; } /* call mark_lAr, line 354 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 354 */
+                {   int ret = slice_del(z); /* delete, line 354 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab18; } /* call stem_suffix_chain_before_ki, line 354 */
+                    if (ret < 0) return ret;
+                }
+            lab18:
+                ;
+            }
+            goto lab15;
+        lab17:
+            z->c = z->l - m5;
+            {   int ret = r_stem_suffix_chain_before_ki(z);
+                if (ret == 0) return 0; /* call stem_suffix_chain_before_ki, line 356 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab15:
+        ;
+    }
+lab0:
+    return 1;
+}
+
+static int r_stem_noun_suffixes(struct SN_env * z) {
+    {   int m1 = z->l - z->c; (void)m1; /* or, line 363 */
+        z->ket = z->c; /* [, line 362 */
+        {   int ret = r_mark_lAr(z);
+            if (ret == 0) goto lab1; /* call mark_lAr, line 362 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 362 */
+        {   int ret = slice_del(z); /* delete, line 362 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 362 */
+            {   int ret = r_stem_suffix_chain_before_ki(z);
+                if (ret == 0) { z->c = z->l - m_keep; goto lab2; } /* call stem_suffix_chain_before_ki, line 362 */
+                if (ret < 0) return ret;
+            }
+        lab2:
+            ;
+        }
+        goto lab0;
+    lab1:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 364 */
+        {   int ret = r_mark_ncA(z);
+            if (ret == 0) goto lab3; /* call mark_ncA, line 364 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 364 */
+        {   int ret = slice_del(z); /* delete, line 364 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 365 */
+            {   int m2 = z->l - z->c; (void)m2; /* or, line 367 */
+                z->ket = z->c; /* [, line 366 */
+                {   int ret = r_mark_lArI(z);
+                    if (ret == 0) goto lab6; /* call mark_lArI, line 366 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 366 */
+                {   int ret = slice_del(z); /* delete, line 366 */
+                    if (ret < 0) return ret;
+                }
+                goto lab5;
+            lab6:
+                z->c = z->l - m2;
+                z->ket = z->c; /* [, line 368 */
+                {   int m3 = z->l - z->c; (void)m3; /* or, line 368 */
+                    {   int ret = r_mark_possessives(z);
+                        if (ret == 0) goto lab9; /* call mark_possessives, line 368 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab8;
+                lab9:
+                    z->c = z->l - m3;
+                    {   int ret = r_mark_sU(z);
+                        if (ret == 0) goto lab7; /* call mark_sU, line 368 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab8:
+                z->bra = z->c; /* ], line 368 */
+                {   int ret = slice_del(z); /* delete, line 368 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 368 */
+                    z->ket = z->c; /* [, line 368 */
+                    {   int ret = r_mark_lAr(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab10; } /* call mark_lAr, line 368 */
+                        if (ret < 0) return ret;
+                    }
+                    z->bra = z->c; /* ], line 368 */
+                    {   int ret = slice_del(z); /* delete, line 368 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = r_stem_suffix_chain_before_ki(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab10; } /* call stem_suffix_chain_before_ki, line 368 */
+                        if (ret < 0) return ret;
+                    }
+                lab10:
+                    ;
+                }
+                goto lab5;
+            lab7:
+                z->c = z->l - m2;
+                z->ket = z->c; /* [, line 370 */
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab4; } /* call mark_lAr, line 370 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 370 */
+                {   int ret = slice_del(z); /* delete, line 370 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab4; } /* call stem_suffix_chain_before_ki, line 370 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab5:
+        lab4:
+            ;
+        }
+        goto lab0;
+    lab3:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 374 */
+        {   int m4 = z->l - z->c; (void)m4; /* or, line 374 */
+            {   int ret = r_mark_ndA(z);
+                if (ret == 0) goto lab13; /* call mark_ndA, line 374 */
+                if (ret < 0) return ret;
+            }
+            goto lab12;
+        lab13:
+            z->c = z->l - m4;
+            {   int ret = r_mark_nA(z);
+                if (ret == 0) goto lab11; /* call mark_nA, line 374 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab12:
+        {   int m5 = z->l - z->c; (void)m5; /* or, line 377 */
+            {   int ret = r_mark_lArI(z);
+                if (ret == 0) goto lab15; /* call mark_lArI, line 376 */
+                if (ret < 0) return ret;
+            }
+            z->bra = z->c; /* ], line 376 */
+            {   int ret = slice_del(z); /* delete, line 376 */
+                if (ret < 0) return ret;
+            }
+            goto lab14;
+        lab15:
+            z->c = z->l - m5;
+            {   int ret = r_mark_sU(z);
+                if (ret == 0) goto lab16; /* call mark_sU, line 378 */
+                if (ret < 0) return ret;
+            }
+            z->bra = z->c; /* ], line 378 */
+            {   int ret = slice_del(z); /* delete, line 378 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 378 */
+                z->ket = z->c; /* [, line 378 */
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab17; } /* call mark_lAr, line 378 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 378 */
+                {   int ret = slice_del(z); /* delete, line 378 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab17; } /* call stem_suffix_chain_before_ki, line 378 */
+                    if (ret < 0) return ret;
+                }
+            lab17:
+                ;
+            }
+            goto lab14;
+        lab16:
+            z->c = z->l - m5;
+            {   int ret = r_stem_suffix_chain_before_ki(z);
+                if (ret == 0) goto lab11; /* call stem_suffix_chain_before_ki, line 380 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab14:
+        goto lab0;
+    lab11:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 384 */
+        {   int m6 = z->l - z->c; (void)m6; /* or, line 384 */
+            {   int ret = r_mark_ndAn(z);
+                if (ret == 0) goto lab20; /* call mark_ndAn, line 384 */
+                if (ret < 0) return ret;
+            }
+            goto lab19;
+        lab20:
+            z->c = z->l - m6;
+            {   int ret = r_mark_nU(z);
+                if (ret == 0) goto lab18; /* call mark_nU, line 384 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab19:
+        {   int m7 = z->l - z->c; (void)m7; /* or, line 384 */
+            {   int ret = r_mark_sU(z);
+                if (ret == 0) goto lab22; /* call mark_sU, line 384 */
+                if (ret < 0) return ret;
+            }
+            z->bra = z->c; /* ], line 384 */
+            {   int ret = slice_del(z); /* delete, line 384 */
+                if (ret < 0) return ret;
+            }
+            {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 384 */
+                z->ket = z->c; /* [, line 384 */
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab23; } /* call mark_lAr, line 384 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 384 */
+                {   int ret = slice_del(z); /* delete, line 384 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab23; } /* call stem_suffix_chain_before_ki, line 384 */
+                    if (ret < 0) return ret;
+                }
+            lab23:
+                ;
+            }
+            goto lab21;
+        lab22:
+            z->c = z->l - m7;
+            {   int ret = r_mark_lArI(z);
+                if (ret == 0) goto lab18; /* call mark_lArI, line 384 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab21:
+        goto lab0;
+    lab18:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 386 */
+        {   int ret = r_mark_DAn(z);
+            if (ret == 0) goto lab24; /* call mark_DAn, line 386 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 386 */
+        {   int ret = slice_del(z); /* delete, line 386 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 386 */
+            z->ket = z->c; /* [, line 386 */
+            {   int m8 = z->l - z->c; (void)m8; /* or, line 389 */
+                {   int ret = r_mark_possessives(z);
+                    if (ret == 0) goto lab27; /* call mark_possessives, line 388 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 388 */
+                {   int ret = slice_del(z); /* delete, line 388 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 388 */
+                    z->ket = z->c; /* [, line 388 */
+                    {   int ret = r_mark_lAr(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab28; } /* call mark_lAr, line 388 */
+                        if (ret < 0) return ret;
+                    }
+                    z->bra = z->c; /* ], line 388 */
+                    {   int ret = slice_del(z); /* delete, line 388 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = r_stem_suffix_chain_before_ki(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab28; } /* call stem_suffix_chain_before_ki, line 388 */
+                        if (ret < 0) return ret;
+                    }
+                lab28:
+                    ;
+                }
+                goto lab26;
+            lab27:
+                z->c = z->l - m8;
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) goto lab29; /* call mark_lAr, line 390 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 390 */
+                {   int ret = slice_del(z); /* delete, line 390 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 390 */
+                    {   int ret = r_stem_suffix_chain_before_ki(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab30; } /* call stem_suffix_chain_before_ki, line 390 */
+                        if (ret < 0) return ret;
+                    }
+                lab30:
+                    ;
+                }
+                goto lab26;
+            lab29:
+                z->c = z->l - m8;
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab25; } /* call stem_suffix_chain_before_ki, line 392 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab26:
+        lab25:
+            ;
+        }
+        goto lab0;
+    lab24:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 396 */
+        {   int m9 = z->l - z->c; (void)m9; /* or, line 396 */
+            {   int ret = r_mark_nUn(z);
+                if (ret == 0) goto lab33; /* call mark_nUn, line 396 */
+                if (ret < 0) return ret;
+            }
+            goto lab32;
+        lab33:
+            z->c = z->l - m9;
+            {   int ret = r_mark_ylA(z);
+                if (ret == 0) goto lab31; /* call mark_ylA, line 396 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab32:
+        z->bra = z->c; /* ], line 396 */
+        {   int ret = slice_del(z); /* delete, line 396 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 397 */
+            {   int m10 = z->l - z->c; (void)m10; /* or, line 399 */
+                z->ket = z->c; /* [, line 398 */
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) goto lab36; /* call mark_lAr, line 398 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 398 */
+                {   int ret = slice_del(z); /* delete, line 398 */
+                    if (ret < 0) return ret;
+                }
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) goto lab36; /* call stem_suffix_chain_before_ki, line 398 */
+                    if (ret < 0) return ret;
+                }
+                goto lab35;
+            lab36:
+                z->c = z->l - m10;
+                z->ket = z->c; /* [, line 400 */
+                {   int m11 = z->l - z->c; (void)m11; /* or, line 400 */
+                    {   int ret = r_mark_possessives(z);
+                        if (ret == 0) goto lab39; /* call mark_possessives, line 400 */
+                        if (ret < 0) return ret;
+                    }
+                    goto lab38;
+                lab39:
+                    z->c = z->l - m11;
+                    {   int ret = r_mark_sU(z);
+                        if (ret == 0) goto lab37; /* call mark_sU, line 400 */
+                        if (ret < 0) return ret;
+                    }
+                }
+            lab38:
+                z->bra = z->c; /* ], line 400 */
+                {   int ret = slice_del(z); /* delete, line 400 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 400 */
+                    z->ket = z->c; /* [, line 400 */
+                    {   int ret = r_mark_lAr(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab40; } /* call mark_lAr, line 400 */
+                        if (ret < 0) return ret;
+                    }
+                    z->bra = z->c; /* ], line 400 */
+                    {   int ret = slice_del(z); /* delete, line 400 */
+                        if (ret < 0) return ret;
+                    }
+                    {   int ret = r_stem_suffix_chain_before_ki(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab40; } /* call stem_suffix_chain_before_ki, line 400 */
+                        if (ret < 0) return ret;
+                    }
+                lab40:
+                    ;
+                }
+                goto lab35;
+            lab37:
+                z->c = z->l - m10;
+                {   int ret = r_stem_suffix_chain_before_ki(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab34; } /* call stem_suffix_chain_before_ki, line 402 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab35:
+        lab34:
+            ;
+        }
+        goto lab0;
+    lab31:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 406 */
+        {   int ret = r_mark_lArI(z);
+            if (ret == 0) goto lab41; /* call mark_lArI, line 406 */
+            if (ret < 0) return ret;
+        }
+        z->bra = z->c; /* ], line 406 */
+        {   int ret = slice_del(z); /* delete, line 406 */
+            if (ret < 0) return ret;
+        }
+        goto lab0;
+    lab41:
+        z->c = z->l - m1;
+        {   int ret = r_stem_suffix_chain_before_ki(z);
+            if (ret == 0) goto lab42; /* call stem_suffix_chain_before_ki, line 408 */
+            if (ret < 0) return ret;
+        }
+        goto lab0;
+    lab42:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 410 */
+        {   int m12 = z->l - z->c; (void)m12; /* or, line 410 */
+            {   int ret = r_mark_DA(z);
+                if (ret == 0) goto lab45; /* call mark_DA, line 410 */
+                if (ret < 0) return ret;
+            }
+            goto lab44;
+        lab45:
+            z->c = z->l - m12;
+            {   int ret = r_mark_yU(z);
+                if (ret == 0) goto lab46; /* call mark_yU, line 410 */
+                if (ret < 0) return ret;
+            }
+            goto lab44;
+        lab46:
+            z->c = z->l - m12;
+            {   int ret = r_mark_yA(z);
+                if (ret == 0) goto lab43; /* call mark_yA, line 410 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab44:
+        z->bra = z->c; /* ], line 410 */
+        {   int ret = slice_del(z); /* delete, line 410 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 410 */
+            z->ket = z->c; /* [, line 410 */
+            {   int m13 = z->l - z->c; (void)m13; /* or, line 410 */
+                {   int ret = r_mark_possessives(z);
+                    if (ret == 0) goto lab49; /* call mark_possessives, line 410 */
+                    if (ret < 0) return ret;
+                }
+                z->bra = z->c; /* ], line 410 */
+                {   int ret = slice_del(z); /* delete, line 410 */
+                    if (ret < 0) return ret;
+                }
+                {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 410 */
+                    z->ket = z->c; /* [, line 410 */
+                    {   int ret = r_mark_lAr(z);
+                        if (ret == 0) { z->c = z->l - m_keep; goto lab50; } /* call mark_lAr, line 410 */
+                        if (ret < 0) return ret;
+                    }
+                lab50:
+                    ;
+                }
+                goto lab48;
+            lab49:
+                z->c = z->l - m13;
+                {   int ret = r_mark_lAr(z);
+                    if (ret == 0) { z->c = z->l - m_keep; goto lab47; } /* call mark_lAr, line 410 */
+                    if (ret < 0) return ret;
+                }
+            }
+        lab48:
+            z->bra = z->c; /* ], line 410 */
+            {   int ret = slice_del(z); /* delete, line 410 */
+                if (ret < 0) return ret;
+            }
+            z->ket = z->c; /* [, line 410 */
+            {   int ret = r_stem_suffix_chain_before_ki(z);
+                if (ret == 0) { z->c = z->l - m_keep; goto lab47; } /* call stem_suffix_chain_before_ki, line 410 */
+                if (ret < 0) return ret;
+            }
+        lab47:
+            ;
+        }
+        goto lab0;
+    lab43:
+        z->c = z->l - m1;
+        z->ket = z->c; /* [, line 412 */
+        {   int m14 = z->l - z->c; (void)m14; /* or, line 412 */
+            {   int ret = r_mark_possessives(z);
+                if (ret == 0) goto lab52; /* call mark_possessives, line 412 */
+                if (ret < 0) return ret;
+            }
+            goto lab51;
+        lab52:
+            z->c = z->l - m14;
+            {   int ret = r_mark_sU(z);
+                if (ret == 0) return 0; /* call mark_sU, line 412 */
+                if (ret < 0) return ret;
+            }
+        }
+    lab51:
+        z->bra = z->c; /* ], line 412 */
+        {   int ret = slice_del(z); /* delete, line 412 */
+            if (ret < 0) return ret;
+        }
+        {   int m_keep = z->l - z->c;/* (void) m_keep;*/ /* try, line 412 */
+            z->ket = z->c; /* [, line 412 */
+            {   int ret = r_mark_lAr(z);
+                if (ret == 0) { z->c = z->l - m_keep; goto lab53; } /* call mark_lAr, line 412 */
+                if (ret < 0) return ret;
+            }
+            z->bra = z->c; /* ], line 412 */
+            {   int ret = slice_del(z); /* delete, line 412 */
+                if (ret < 0) return ret;
+            }
+            {   int ret = r_stem_suffix_chain_before_ki(z);
+                if (ret == 0) { z->c = z->l - m_keep; goto lab53; } /* call stem_suffix_chain_before_ki, line 412 */
+                if (ret < 0) return ret;
+            }
+        lab53:
+            ;
+        }
+    }
+lab0:
+    return 1;
+}
+
+static int r_post_process_last_consonants(struct SN_env * z) {
+    int among_var;
+    z->ket = z->c; /* [, line 416 */
+    among_var = find_among_b(z, a_23, 4); /* substring, line 416 */
+    if (!(among_var)) return 0;
+    z->bra = z->c; /* ], line 416 */
+    switch(among_var) {
+        case 0: return 0;
+        case 1:
+            {   int ret = slice_from_s(z, 1, s_16); /* <-, line 417 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 2:
+            {   int ret = slice_from_s(z, 2, s_17); /* <-, line 418 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 3:
+            {   int ret = slice_from_s(z, 1, s_18); /* <-, line 419 */
+                if (ret < 0) return ret;
+            }
+            break;
+        case 4:
+            {   int ret = slice_from_s(z, 1, s_19); /* <-, line 420 */
+                if (ret < 0) return ret;
+            }
+            break;
+    }
+    return 1;
+}
+
+static int r_append_U_to_stems_ending_with_d_or_g(struct SN_env * z) {
+    {   int m_test = z->l - z->c; /* test, line 431 */
+        {   int m1 = z->l - z->c; (void)m1; /* or, line 431 */
+            if (!(eq_s_b(z, 1, s_20))) goto lab1;
+            goto lab0;
+        lab1:
+            z->c = z->l - m1;
+            if (!(eq_s_b(z, 1, s_21))) return 0;
+        }
+    lab0:
+        z->c = z->l - m_test;
+    }
+    {   int m2 = z->l - z->c; (void)m2; /* or, line 433 */
+        {   int m_test = z->l - z->c; /* test, line 432 */
+            if (out_grouping_b_U(z, g_vowel, 97, 305, 1) < 0) goto lab3; /* goto */ /* grouping vowel, line 432 */
+            {   int m3 = z->l - z->c; (void)m3; /* or, line 432 */
+                if (!(eq_s_b(z, 1, s_22))) goto lab5;
+                goto lab4;
+            lab5:
+                z->c = z->l - m3;
+                if (!(eq_s_b(z, 2, s_23))) goto lab3;
+            }
+        lab4:
+            z->c = z->l - m_test;
+        }
+        {   int c_keep = z->c;
+            int ret = insert_s(z, z->c, z->c, 2, s_24); /* <+, line 432 */
+            z->c = c_keep;
+            if (ret < 0) return ret;
+        }
+        goto lab2;
+    lab3:
+        z->c = z->l - m2;
+        {   int m_test = z->l - z->c; /* test, line 434 */
+            if (out_grouping_b_U(z, g_vowel, 97, 305, 1) < 0) goto lab6; /* goto */ /* grouping vowel, line 434 */
+            {   int m4 = z->l - z->c; (void)m4; /* or, line 434 */
+                if (!(eq_s_b(z, 1, s_25))) goto lab8;
+                goto lab7;
+            lab8:
+                z->c = z->l - m4;
+                if (!(eq_s_b(z, 1, s_26))) goto lab6;
+            }
+        lab7:
+            z->c = z->l - m_test;
+        }
+        {   int c_keep = z->c;
+            int ret = insert_s(z, z->c, z->c, 1, s_27); /* <+, line 434 */
+            z->c = c_keep;
+            if (ret < 0) return ret;
+        }
+        goto lab2;
+    lab6:
+        z->c = z->l - m2;
+        {   int m_test = z->l - z->c; /* test, line 436 */
+            if (out_grouping_b_U(z, g_vowel, 97, 305, 1) < 0) goto lab9; /* goto */ /* grouping vowel, line 436 */
+            {   int m5 = z->l - z->c; (void)m5; /* or, line 436 */
+                if (!(eq_s_b(z, 1, s_28))) goto lab11;
+                goto lab10;
+            lab11:
+                z->c = z->l - m5;
+                if (!(eq_s_b(z, 1, s_29))) goto lab9;
+            }
+        lab10:
+            z->c = z->l - m_test;
+        }
+        {   int c_keep = z->c;
+            int ret = insert_s(z, z->c, z->c, 1, s_30); /* <+, line 436 */
+            z->c = c_keep;
+            if (ret < 0) return ret;
+        }
+        goto lab2;
+    lab9:
+        z->c = z->l - m2;
+        {   int m_test = z->l - z->c; /* test, line 438 */
+            if (out_grouping_b_U(z, g_vowel, 97, 305, 1) < 0) return 0; /* goto */ /* grouping vowel, line 438 */
+            {   int m6 = z->l - z->c; (void)m6; /* or, line 438 */
+                if (!(eq_s_b(z, 2, s_31))) goto lab13;
+                goto lab12;
+            lab13:
+                z->c = z->l - m6;
+                if (!(eq_s_b(z, 2, s_32))) return 0;
+            }
+        lab12:
+            z->c = z->l - m_test;
+        }
+        {   int c_keep = z->c;
+            int ret = insert_s(z, z->c, z->c, 2, s_33); /* <+, line 438 */
+            z->c = c_keep;
+            if (ret < 0) return ret;
+        }
+    }
+lab2:
+    return 1;
+}
+
+static int r_more_than_one_syllable_word(struct SN_env * z) {
+    {   int c_test = z->c; /* test, line 446 */
+        {   int i = 2;
+            while(1) { /* atleast, line 446 */
+                int c1 = z->c;
+                {    /* gopast */ /* grouping vowel, line 446 */
+                    int ret = out_grouping_U(z, g_vowel, 97, 305, 1);
+                    if (ret < 0) goto lab0;
+                    z->c += ret;
+                }
+                i--;
+                continue;
+            lab0:
+                z->c = c1;
+                break;
+            }
+            if (i > 0) return 0;
+        }
+        z->c = c_test;
+    }
+    return 1;
+}
+
+static int r_is_reserved_word(struct SN_env * z) {
+    {   int c1 = z->c; /* or, line 451 */
+        {   int c_test = z->c; /* test, line 450 */
+            while(1) { /* gopast, line 450 */
+                if (!(eq_s(z, 2, s_34))) goto lab2;
+                break;
+            lab2:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) goto lab1;
+                    z->c = ret; /* gopast, line 450 */
+                }
+            }
+            z->I[0] = 2;
+            if (!(z->I[0] == z->l)) goto lab1;
+            z->c = c_test;
+        }
+        goto lab0;
+    lab1:
+        z->c = c1;
+        {   int c_test = z->c; /* test, line 452 */
+            while(1) { /* gopast, line 452 */
+                if (!(eq_s(z, 5, s_35))) goto lab3;
+                break;
+            lab3:
+                {   int ret = skip_utf8(z->p, z->c, 0, z->l, 1);
+                    if (ret < 0) return 0;
+                    z->c = ret; /* gopast, line 452 */
+                }
+            }
+            z->I[0] = 5;
+            if (!(z->I[0] == z->l)) return 0;
+            z->c = c_test;
+        }
+    }
+lab0:
+    return 1;
+}
+
+static int r_postlude(struct SN_env * z) {
+    {   int c1 = z->c; /* not, line 456 */
+        {   int ret = r_is_reserved_word(z);
+            if (ret == 0) goto lab0; /* call is_reserved_word, line 456 */
+            if (ret < 0) return ret;
+        }
+        return 0;
+    lab0:
+        z->c = c1;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 457 */
+
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 458 */
+        {   int ret = r_append_U_to_stems_ending_with_d_or_g(z);
+            if (ret == 0) goto lab1; /* call append_U_to_stems_ending_with_d_or_g, line 458 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    {   int m3 = z->l - z->c; (void)m3; /* do, line 459 */
+        {   int ret = r_post_process_last_consonants(z);
+            if (ret == 0) goto lab2; /* call post_process_last_consonants, line 459 */
+            if (ret < 0) return ret;
+        }
+    lab2:
+        z->c = z->l - m3;
+    }
+    z->c = z->lb;
+    return 1;
+}
+
+extern int turkish_UTF_8_stem(struct SN_env * z) {
+    {   int ret = r_more_than_one_syllable_word(z);
+        if (ret == 0) return 0; /* call more_than_one_syllable_word, line 465 */
+        if (ret < 0) return ret;
+    }
+    z->lb = z->c; z->c = z->l; /* backwards, line 467 */
+
+    {   int m1 = z->l - z->c; (void)m1; /* do, line 468 */
+        {   int ret = r_stem_nominal_verb_suffixes(z);
+            if (ret == 0) goto lab0; /* call stem_nominal_verb_suffixes, line 468 */
+            if (ret < 0) return ret;
+        }
+    lab0:
+        z->c = z->l - m1;
+    }
+    if (!(z->B[0])) return 0; /* Boolean test continue_stemming_noun_suffixes, line 469 */
+    {   int m2 = z->l - z->c; (void)m2; /* do, line 470 */
+        {   int ret = r_stem_noun_suffixes(z);
+            if (ret == 0) goto lab1; /* call stem_noun_suffixes, line 470 */
+            if (ret < 0) return ret;
+        }
+    lab1:
+        z->c = z->l - m2;
+    }
+    z->c = z->lb;
+    {   int ret = r_postlude(z);
+        if (ret == 0) return 0; /* call postlude, line 473 */
+        if (ret < 0) return ret;
+    }
+    return 1;
+}
+
+extern struct SN_env * turkish_UTF_8_create_env(void) { return SN_create_env(0, 1, 1); }
+
+extern void turkish_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
+
diff --git a/src/backend/snowball/libstemmer/utilities.c b/src/backend/snowball/libstemmer/utilities.c
new file mode 100644
index 000000000000..8c89af1cd5cb
--- /dev/null
+++ b/src/backend/snowball/libstemmer/utilities.c
@@ -0,0 +1,473 @@
+#include "header.h"
+
+#define unless(C) if(!(C))
+
+#define CREATE_SIZE 1
+
+extern symbol * create_s(void) {
+    symbol * p;
+    void * mem = malloc(HEAD + (CREATE_SIZE + 1) * sizeof(symbol));
+    if (mem == NULL) return NULL;
+    p = (symbol *) (HEAD + (char *) mem);
+    CAPACITY(p) = CREATE_SIZE;
+    SET_SIZE(p, CREATE_SIZE);
+    return p;
+}
+
+extern void lose_s(symbol * p) {
+    if (p == NULL) return;
+    free((char *) p - HEAD);
+}
+
+/*
+   new_p = skip_utf8(p, c, lb, l, n); skips n characters forwards from p + c
+   if n +ve, or n characters backwards from p + c - 1 if n -ve. new_p is the new
+   position, or 0 on failure.
+
+   -- used to implement hop and next in the utf8 case.
+*/
+
+extern int skip_utf8(const symbol * p, int c, int lb, int l, int n) {
+    int b;
+    if (n >= 0) {
+        for (; n > 0; n--) {
+            if (c >= l) return -1;
+            b = p[c++];
+            if (b >= 0xC0) {   /* 1100 0000 */
+                while (c < l) {
+                    b = p[c];
+                    if (b >= 0xC0 || b < 0x80) break;
+                    /* break unless b is 10------ */
+                    c++;
+                }
+            }
+        }
+    } else {
+        for (; n < 0; n++) {
+            if (c <= lb) return -1;
+            b = p[--c];
+            if (b >= 0x80) {   /* 1000 0000 */
+                while (c > lb) {
+                    b = p[c];
+                    if (b >= 0xC0) break; /* 1100 0000 */
+                    c--;
+                }
+            }
+        }
+    }
+    return c;
+}
+
+/* Code for character groupings: utf8 cases */
+
+static int get_utf8(const symbol * p, int c, int l, int * slot) {
+    int b0, b1;
+    if (c >= l) return 0;
+    b0 = p[c++];
+    if (b0 < 0xC0 || c == l) {   /* 1100 0000 */
+        * slot = b0; return 1;
+    }
+    b1 = p[c++];
+    if (b0 < 0xE0 || c == l) {   /* 1110 0000 */
+        * slot = (b0 & 0x1F) << 6 | (b1 & 0x3F); return 2;
+    }
+    * slot = (b0 & 0xF) << 12 | (b1 & 0x3F) << 6 | (p[c] & 0x3F); return 3;
+}
+
+static int get_b_utf8(const symbol * p, int c, int lb, int * slot) {
+    int b0, b1;
+    if (c <= lb) return 0;
+    b0 = p[--c];
+    if (b0 < 0x80 || c == lb) {   /* 1000 0000 */
+        * slot = b0; return 1;
+    }
+    b1 = p[--c];
+    if (b1 >= 0xC0 || c == lb) {   /* 1100 0000 */
+        * slot = (b1 & 0x1F) << 6 | (b0 & 0x3F); return 2;
+    }
+    * slot = (p[c] & 0xF) << 12 | (b1 & 0x3F) << 6 | (b0 & 0x3F); return 3;
+}
+
+extern int in_grouping_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	int w = get_utf8(z->p, z->c, z->l, & ch);
+	unless (w) return -1;
+	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return w;
+	z->c += w;
+    } while (repeat);
+    return 0;
+}
+
+extern int in_grouping_b_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	int w = get_b_utf8(z->p, z->c, z->lb, & ch);
+	unless (w) return -1;
+	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return w;
+	z->c -= w;
+    } while (repeat);
+    return 0;
+}
+
+extern int out_grouping_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	int w = get_utf8(z->p, z->c, z->l, & ch);
+	unless (w) return -1;
+	unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return w;
+	z->c += w;
+    } while (repeat);
+    return 0;
+}
+
+extern int out_grouping_b_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	int w = get_b_utf8(z->p, z->c, z->lb, & ch);
+	unless (w) return -1;
+	unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return w;
+	z->c -= w;
+    } while (repeat);
+    return 0;
+}
+
+/* Code for character groupings: non-utf8 cases */
+
+extern int in_grouping(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	if (z->c >= z->l) return -1;
+	ch = z->p[z->c];
+	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return 1;
+	z->c++;
+    } while (repeat);
+    return 0;
+}
+
+extern int in_grouping_b(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	if (z->c <= z->lb) return -1;
+	ch = z->p[z->c - 1];
+	if (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return 1;
+	z->c--;
+    } while (repeat);
+    return 0;
+}
+
+extern int out_grouping(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	if (z->c >= z->l) return -1;
+	ch = z->p[z->c];
+	unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return 1;
+	z->c++;
+    } while (repeat);
+    return 0;
+}
+
+extern int out_grouping_b(struct SN_env * z, const unsigned char * s, int min, int max, int repeat) {
+    do {
+	int ch;
+	if (z->c <= z->lb) return -1;
+	ch = z->p[z->c - 1];
+	unless (ch > max || (ch -= min) < 0 || (s[ch >> 3] & (0X1 << (ch & 0X7))) == 0)
+	    return 1;
+	z->c--;
+    } while (repeat);
+    return 0;
+}
+
+extern int eq_s(struct SN_env * z, int s_size, const symbol * s) {
+    if (z->l - z->c < s_size || memcmp(z->p + z->c, s, s_size * sizeof(symbol)) != 0) return 0;
+    z->c += s_size; return 1;
+}
+
+extern int eq_s_b(struct SN_env * z, int s_size, const symbol * s) {
+    if (z->c - z->lb < s_size || memcmp(z->p + z->c - s_size, s, s_size * sizeof(symbol)) != 0) return 0;
+    z->c -= s_size; return 1;
+}
+
+extern int eq_v(struct SN_env * z, const symbol * p) {
+    return eq_s(z, SIZE(p), p);
+}
+
+extern int eq_v_b(struct SN_env * z, const symbol * p) {
+    return eq_s_b(z, SIZE(p), p);
+}
+
+extern int find_among(struct SN_env * z, const struct among * v, int v_size) {
+
+    int i = 0;
+    int j = v_size;
+
+    int c = z->c; int l = z->l;
+    symbol * q = z->p + c;
+
+    const struct among * w;
+
+    int common_i = 0;
+    int common_j = 0;
+
+    int first_key_inspected = 0;
+
+    while(1) {
+        int k = i + ((j - i) >> 1);
+        int diff = 0;
+        int common = common_i < common_j ? common_i : common_j; /* smaller */
+        w = v + k;
+        {
+            int i2; for (i2 = common; i2 < w->s_size; i2++) {
+                if (c + common == l) { diff = -1; break; }
+                diff = q[common] - w->s[i2];
+                if (diff != 0) break;
+                common++;
+            }
+        }
+        if (diff < 0) { j = k; common_j = common; }
+                 else { i = k; common_i = common; }
+        if (j - i <= 1) {
+            if (i > 0) break; /* v->s has been inspected */
+            if (j == i) break; /* only one item in v */
+
+            /* - but now we need to go round once more to get
+               v->s inspected. This looks messy, but is actually
+               the optimal approach.  */
+
+            if (first_key_inspected) break;
+            first_key_inspected = 1;
+        }
+    }
+    while(1) {
+        w = v + i;
+        if (common_i >= w->s_size) {
+            z->c = c + w->s_size;
+            if (w->function == 0) return w->result;
+            {
+                int res = w->function(z);
+                z->c = c + w->s_size;
+                if (res) return w->result;
+            }
+        }
+        i = w->substring_i;
+        if (i < 0) return 0;
+    }
+}
+
+/* find_among_b is for backwards processing. Same comments apply */
+
+extern int find_among_b(struct SN_env * z, const struct among * v, int v_size) {
+
+    int i = 0;
+    int j = v_size;
+
+    int c = z->c; int lb = z->lb;
+    symbol * q = z->p + c - 1;
+
+    const struct among * w;
+
+    int common_i = 0;
+    int common_j = 0;
+
+    int first_key_inspected = 0;
+
+    while(1) {
+        int k = i + ((j - i) >> 1);
+        int diff = 0;
+        int common = common_i < common_j ? common_i : common_j;
+        w = v + k;
+        {
+            int i2; for (i2 = w->s_size - 1 - common; i2 >= 0; i2--) {
+                if (c - common == lb) { diff = -1; break; }
+                diff = q[- common] - w->s[i2];
+                if (diff != 0) break;
+                common++;
+            }
+        }
+        if (diff < 0) { j = k; common_j = common; }
+                 else { i = k; common_i = common; }
+        if (j - i <= 1) {
+            if (i > 0) break;
+            if (j == i) break;
+            if (first_key_inspected) break;
+            first_key_inspected = 1;
+        }
+    }
+    while(1) {
+        w = v + i;
+        if (common_i >= w->s_size) {
+            z->c = c - w->s_size;
+            if (w->function == 0) return w->result;
+            {
+                int res = w->function(z);
+                z->c = c - w->s_size;
+                if (res) return w->result;
+            }
+        }
+        i = w->substring_i;
+        if (i < 0) return 0;
+    }
+}
+
+
+/* Increase the size of the buffer pointed to by p to at least n symbols.
+ * If insufficient memory, returns NULL and frees the old buffer.
+ */
+static symbol * increase_size(symbol * p, int n) {
+    symbol * q;
+    int new_size = n + 20;
+    void * mem = realloc((char *) p - HEAD,
+                         HEAD + (new_size + 1) * sizeof(symbol));
+    if (mem == NULL) {
+        lose_s(p);
+        return NULL;
+    }
+    q = (symbol *) (HEAD + (char *)mem);
+    CAPACITY(q) = new_size;
+    return q;
+}
+
+/* to replace symbols between c_bra and c_ket in z->p by the
+   s_size symbols at s.
+   Returns 0 on success, -1 on error.
+   Also, frees z->p (and sets it to NULL) on error.
+*/
+extern int replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int * adjptr)
+{
+    int adjustment;
+    int len;
+    if (z->p == NULL) {
+        z->p = create_s();
+        if (z->p == NULL) return -1;
+    }
+    adjustment = s_size - (c_ket - c_bra);
+    len = SIZE(z->p);
+    if (adjustment != 0) {
+        if (adjustment + len > CAPACITY(z->p)) {
+            z->p = increase_size(z->p, adjustment + len);
+            if (z->p == NULL) return -1;
+        }
+        memmove(z->p + c_ket + adjustment,
+                z->p + c_ket,
+                (len - c_ket) * sizeof(symbol));
+        SET_SIZE(z->p, adjustment + len);
+        z->l += adjustment;
+        if (z->c >= c_ket)
+            z->c += adjustment;
+        else
+            if (z->c > c_bra)
+                z->c = c_bra;
+    }
+    unless (s_size == 0) memmove(z->p + c_bra, s, s_size * sizeof(symbol));
+    if (adjptr != NULL)
+        *adjptr = adjustment;
+    return 0;
+}
+
+static int slice_check(struct SN_env * z) {
+
+    if (z->bra < 0 ||
+        z->bra > z->ket ||
+        z->ket > z->l ||
+        z->p == NULL ||
+        z->l > SIZE(z->p)) /* this line could be removed */
+    {
+#if 0
+        fprintf(stderr, "faulty slice operation:\n");
+        debug(z, -1, 0);
+#endif
+        return -1;
+    }
+    return 0;
+}
+
+extern int slice_from_s(struct SN_env * z, int s_size, const symbol * s) {
+    if (slice_check(z)) return -1;
+    return replace_s(z, z->bra, z->ket, s_size, s, NULL);
+}
+
+extern int slice_from_v(struct SN_env * z, const symbol * p) {
+    return slice_from_s(z, SIZE(p), p);
+}
+
+extern int slice_del(struct SN_env * z) {
+    return slice_from_s(z, 0, 0);
+}
+
+extern int insert_s(struct SN_env * z, int bra, int ket, int s_size, const symbol * s) {
+    int adjustment;
+    if (replace_s(z, bra, ket, s_size, s, &adjustment))
+        return -1;
+    if (bra <= z->bra) z->bra += adjustment;
+    if (bra <= z->ket) z->ket += adjustment;
+    return 0;
+}
+
+extern int insert_v(struct SN_env * z, int bra, int ket, const symbol * p) {
+    int adjustment;
+    if (replace_s(z, bra, ket, SIZE(p), p, &adjustment))
+        return -1;
+    if (bra <= z->bra) z->bra += adjustment;
+    if (bra <= z->ket) z->ket += adjustment;
+    return 0;
+}
+
+extern symbol * slice_to(struct SN_env * z, symbol * p) {
+    if (slice_check(z)) {
+        lose_s(p);
+        return NULL;
+    }
+    {
+        int len = z->ket - z->bra;
+        if (CAPACITY(p) < len) {
+            p = increase_size(p, len);
+            if (p == NULL)
+                return NULL;
+        }
+        memmove(p, z->p + z->bra, len * sizeof(symbol));
+        SET_SIZE(p, len);
+    }
+    return p;
+}
+
+extern symbol * assign_to(struct SN_env * z, symbol * p) {
+    int len = z->l;
+    if (CAPACITY(p) < len) {
+        p = increase_size(p, len);
+        if (p == NULL)
+            return NULL;
+    }
+    memmove(p, z->p, len * sizeof(symbol));
+    SET_SIZE(p, len);
+    return p;
+}
+
+#if 0
+extern void debug(struct SN_env * z, int number, int line_count) {
+    int i;
+    int limit = SIZE(z->p);
+    /*if (number >= 0) printf("%3d (line %4d): '", number, line_count);*/
+    if (number >= 0) printf("%3d (line %4d): [%d]'", number, line_count,limit);
+    for (i = 0; i <= limit; i++) {
+        if (z->lb == i) printf("{");
+        if (z->bra == i) printf("[");
+        if (z->c == i) printf("|");
+        if (z->ket == i) printf("]");
+        if (z->l == i) printf("}");
+        if (i < limit)
+        {   int ch = z->p[i];
+            if (ch == 0) ch = '#';
+            printf("%c", ch);
+        }
+    }
+    printf("'\n");
+}
+#endif
diff --git a/src/backend/snowball/snowball.sql.in b/src/backend/snowball/snowball.sql.in
new file mode 100644
index 000000000000..197d94faf1f3
--- /dev/null
+++ b/src/backend/snowball/snowball.sql.in
@@ -0,0 +1,27 @@
+-- $PostgreSQL: pgsql/src/backend/snowball/snowball.sql.in,v 1.6 2007/10/27 16:01:08 tgl Exp $$
+
+-- text search configuration for _LANGNAME_ language
+CREATE TEXT SEARCH DICTIONARY _DICTNAME_
+	(TEMPLATE = snowball, Language = _LANGNAME_ _STOPWORDS_);
+
+COMMENT ON TEXT SEARCH DICTIONARY _DICTNAME_ IS 'snowball stemmer for _LANGNAME_ language';
+
+CREATE TEXT SEARCH CONFIGURATION _CFGNAME_
+	(PARSER = default);
+
+COMMENT ON TEXT SEARCH CONFIGURATION _CFGNAME_ IS 'configuration for _LANGNAME_ language';
+
+ALTER TEXT SEARCH CONFIGURATION _CFGNAME_ ADD MAPPING
+	FOR email, url, url_path, host, file, version,
+	    sfloat, float, int, uint,
+	    numword, hword_numpart, numhword
+	WITH simple;
+
+ALTER TEXT SEARCH CONFIGURATION _CFGNAME_ ADD MAPPING
+    FOR asciiword, hword_asciipart, asciihword
+	WITH _ASCDICTNAME_;
+
+ALTER TEXT SEARCH CONFIGURATION _CFGNAME_ ADD MAPPING
+    FOR word, hword_part, hword
+	WITH _NONASCDICTNAME_;
+
diff --git a/src/backend/snowball/snowball_func.sql.in b/src/backend/snowball/snowball_func.sql.in
new file mode 100644
index 000000000000..f55962c7969d
--- /dev/null
+++ b/src/backend/snowball/snowball_func.sql.in
@@ -0,0 +1,18 @@
+-- $PostgreSQL: pgsql/src/backend/snowball/snowball_func.sql.in,v 1.2 2007/09/03 02:30:43 tgl Exp $$
+
+SET search_path = pg_catalog;
+
+CREATE FUNCTION dsnowball_init(INTERNAL)
+    RETURNS INTERNAL AS '$libdir/dict_snowball', 'dsnowball_init'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION dsnowball_lexize(INTERNAL, INTERNAL, INTERNAL, INTERNAL)
+    RETURNS INTERNAL AS '$libdir/dict_snowball', 'dsnowball_lexize'
+LANGUAGE C STRICT;
+
+CREATE TEXT SEARCH TEMPLATE snowball
+	(INIT = dsnowball_init,
+	LEXIZE = dsnowball_lexize);
+
+COMMENT ON TEXT SEARCH TEMPLATE snowball IS 'snowball stemmer';
+
diff --git a/src/backend/snowball/stopwords/danish.stop b/src/backend/snowball/stopwords/danish.stop
new file mode 100644
index 000000000000..d3edc6757912
--- /dev/null
+++ b/src/backend/snowball/stopwords/danish.stop
@@ -0,0 +1,94 @@
+og
+i
+jeg
+det
+at
+en
+den
+til
+er
+som
+på
+de
+med
+han
+af
+for
+ikke
+der
+var
+mig
+sig
+men
+et
+har
+om
+vi
+min
+havde
+ham
+hun
+nu
+over
+da
+fra
+du
+ud
+sin
+dem
+os
+op
+man
+hans
+hvor
+eller
+hvad
+skal
+selv
+her
+alle
+vil
+blev
+kunne
+ind
+når
+være
+dog
+noget
+ville
+jo
+deres
+efter
+ned
+skulle
+denne
+end
+dette
+mit
+også
+under
+have
+dig
+anden
+hende
+mine
+alt
+meget
+sit
+sine
+vor
+mod
+disse
+hvis
+din
+nogle
+hos
+blive
+mange
+ad
+bliver
+hendes
+været
+thi
+jer
+sådan
diff --git a/src/backend/snowball/stopwords/dutch.stop b/src/backend/snowball/stopwords/dutch.stop
new file mode 100644
index 000000000000..cafa0324b537
--- /dev/null
+++ b/src/backend/snowball/stopwords/dutch.stop
@@ -0,0 +1,101 @@
+de
+en
+van
+ik
+te
+dat
+die
+in
+een
+hij
+het
+niet
+zijn
+is
+was
+op
+aan
+met
+als
+voor
+had
+er
+maar
+om
+hem
+dan
+zou
+of
+wat
+mijn
+men
+dit
+zo
+door
+over
+ze
+zich
+bij
+ook
+tot
+je
+mij
+uit
+der
+daar
+haar
+naar
+heb
+hoe
+heeft
+hebben
+deze
+u
+want
+nog
+zal
+me
+zij
+nu
+ge
+geen
+omdat
+iets
+worden
+toch
+al
+waren
+veel
+meer
+doen
+toen
+moet
+ben
+zonder
+kan
+hun
+dus
+alles
+onder
+ja
+eens
+hier
+wie
+werd
+altijd
+doch
+wordt
+wezen
+kunnen
+ons
+zelf
+tegen
+na
+reeds
+wil
+kon
+niets
+uw
+iemand
+geweest
+andere
diff --git a/contrib/tsearch2/stopword/english.stop b/src/backend/snowball/stopwords/english.stop
similarity index 100%
rename from contrib/tsearch2/stopword/english.stop
rename to src/backend/snowball/stopwords/english.stop
diff --git a/src/backend/snowball/stopwords/finnish.stop b/src/backend/snowball/stopwords/finnish.stop
new file mode 100644
index 000000000000..47ee200f6781
--- /dev/null
+++ b/src/backend/snowball/stopwords/finnish.stop
@@ -0,0 +1,235 @@
+olla
+olen
+olet
+on
+olemme
+olette
+ovat
+ole
+oli
+olisi
+olisit
+olisin
+olisimme
+olisitte
+olisivat
+olit
+olin
+olimme
+olitte
+olivat
+ollut
+olleet
+en
+et
+ei
+emme
+ette
+eivät
+minä
+minun
+minut
+minua
+minussa
+minusta
+minuun
+minulla
+minulta
+minulle
+sinä
+sinun
+sinut
+sinua
+sinussa
+sinusta
+sinuun
+sinulla
+sinulta
+sinulle
+hän
+hänen
+hänet
+häntä
+hänessä
+hänestä
+häneen
+hänellä
+häneltä
+hänelle
+me
+meidän
+meidät
+meitä
+meissä
+meistä
+meihin
+meillä
+meiltä
+meille
+te
+teidän
+teidät
+teitä
+teissä
+teistä
+teihin
+teillä
+teiltä
+teille
+he
+heidän
+heidät
+heitä
+heissä
+heistä
+heihin
+heillä
+heiltä
+heille
+tämä
+tämän
+tätä
+tässä
+tästä
+tähän
+tallä
+tältä
+tälle
+tänä
+täksi
+tuo
+tuon
+tuotä
+tuossa
+tuosta
+tuohon
+tuolla
+tuolta
+tuolle
+tuona
+tuoksi
+se
+sen
+sitä
+siinä
+siitä
+siihen
+sillä
+siltä
+sille
+sinä
+siksi
+nämä
+näiden
+näitä
+näissä
+näistä
+näihin
+näillä
+näiltä
+näille
+näinä
+näiksi
+nuo
+noiden
+noita
+noissa
+noista
+noihin
+noilla
+noilta
+noille
+noina
+noiksi
+ne
+niiden
+niitä
+niissä
+niistä
+niihin
+niillä
+niiltä
+niille
+niinä
+niiksi
+kuka
+kenen
+kenet
+ketä
+kenessä
+kenestä
+keneen
+kenellä
+keneltä
+kenelle
+kenenä
+keneksi
+ketkä
+keiden
+ketkä
+keitä
+keissä
+keistä
+keihin
+keillä
+keiltä
+keille
+keinä
+keiksi
+mikä
+minkä
+minkä
+mitä
+missä
+mistä
+mihin
+millä
+miltä
+mille
+minä
+miksi
+mitkä
+joka
+jonka
+jota
+jossa
+josta
+johon
+jolla
+jolta
+jolle
+jona
+joksi
+jotka
+joiden
+joita
+joissa
+joista
+joihin
+joilla
+joilta
+joille
+joina
+joiksi
+että
+ja
+jos
+koska
+kuin
+mutta
+niin
+sekä
+sillä
+tai
+vaan
+vai
+vaikka
+kanssa
+mukaan
+noin
+poikki
+yli
+kun
+niin
+nyt
+itse
diff --git a/src/backend/snowball/stopwords/french.stop b/src/backend/snowball/stopwords/french.stop
new file mode 100644
index 000000000000..e7cbf4c97500
--- /dev/null
+++ b/src/backend/snowball/stopwords/french.stop
@@ -0,0 +1,155 @@
+au
+aux
+avec
+ce
+ces
+dans
+de
+des
+du
+elle
+en
+et
+eux
+il
+je
+la
+le
+leur
+lui
+ma
+mais
+me
+même
+mes
+moi
+mon
+ne
+nos
+notre
+nous
+on
+ou
+par
+pas
+pour
+qu
+que
+qui
+sa
+se
+ses
+son
+sur
+ta
+te
+tes
+toi
+ton
+tu
+un
+une
+vos
+votre
+vous
+c
+d
+j
+l
+à
+m
+n
+s
+t
+y
+été
+étée
+étées
+étés
+étant
+étante
+étants
+étantes
+suis
+es
+est
+sommes
+êtes
+sont
+serai
+seras
+sera
+serons
+serez
+seront
+serais
+serait
+serions
+seriez
+seraient
+étais
+était
+étions
+étiez
+étaient
+fus
+fut
+fûmes
+fûtes
+furent
+sois
+soit
+soyons
+soyez
+soient
+fusse
+fusses
+fût
+fussions
+fussiez
+fussent
+ayant
+ayante
+ayantes
+ayants
+eu
+eue
+eues
+eus
+ai
+as
+avons
+avez
+ont
+aurai
+auras
+aura
+aurons
+aurez
+auront
+aurais
+aurait
+aurions
+auriez
+auraient
+avais
+avait
+avions
+aviez
+avaient
+eut
+eûmes
+eûtes
+eurent
+aie
+aies
+ait
+ayons
+ayez
+aient
+eusse
+eusses
+eût
+eussions
+eussiez
+eussent
diff --git a/src/backend/snowball/stopwords/german.stop b/src/backend/snowball/stopwords/german.stop
new file mode 100644
index 000000000000..edef220b7a7d
--- /dev/null
+++ b/src/backend/snowball/stopwords/german.stop
@@ -0,0 +1,231 @@
+aber
+alle
+allem
+allen
+aller
+alles
+als
+also
+am
+an
+ander
+andere
+anderem
+anderen
+anderer
+anderes
+anderm
+andern
+anderr
+anders
+auch
+auf
+aus
+bei
+bin
+bis
+bist
+da
+damit
+dann
+der
+den
+des
+dem
+die
+das
+daß
+derselbe
+derselben
+denselben
+desselben
+demselben
+dieselbe
+dieselben
+dasselbe
+dazu
+dein
+deine
+deinem
+deinen
+deiner
+deines
+denn
+derer
+dessen
+dich
+dir
+du
+dies
+diese
+diesem
+diesen
+dieser
+dieses
+doch
+dort
+durch
+ein
+eine
+einem
+einen
+einer
+eines
+einig
+einige
+einigem
+einigen
+einiger
+einiges
+einmal
+er
+ihn
+ihm
+es
+etwas
+euer
+eure
+eurem
+euren
+eurer
+eures
+für
+gegen
+gewesen
+hab
+habe
+haben
+hat
+hatte
+hatten
+hier
+hin
+hinter
+ich
+mich
+mir
+ihr
+ihre
+ihrem
+ihren
+ihrer
+ihres
+euch
+im
+in
+indem
+ins
+ist
+jede
+jedem
+jeden
+jeder
+jedes
+jene
+jenem
+jenen
+jener
+jenes
+jetzt
+kann
+kein
+keine
+keinem
+keinen
+keiner
+keines
+können
+könnte
+machen
+man
+manche
+manchem
+manchen
+mancher
+manches
+mein
+meine
+meinem
+meinen
+meiner
+meines
+mit
+muss
+musste
+nach
+nicht
+nichts
+noch
+nun
+nur
+ob
+oder
+ohne
+sehr
+sein
+seine
+seinem
+seinen
+seiner
+seines
+selbst
+sich
+sie
+ihnen
+sind
+so
+solche
+solchem
+solchen
+solcher
+solches
+soll
+sollte
+sondern
+sonst
+über
+um
+und
+uns
+unse
+unsem
+unsen
+unser
+unses
+unter
+viel
+vom
+von
+vor
+während
+war
+waren
+warst
+was
+weg
+weil
+weiter
+welche
+welchem
+welchen
+welcher
+welches
+wenn
+werde
+werden
+wie
+wieder
+will
+wir
+wird
+wirst
+wo
+wollen
+wollte
+würde
+würden
+zu
+zum
+zur
+zwar
+zwischen
diff --git a/src/backend/snowball/stopwords/hungarian.stop b/src/backend/snowball/stopwords/hungarian.stop
new file mode 100644
index 000000000000..94e9f9a0b07a
--- /dev/null
+++ b/src/backend/snowball/stopwords/hungarian.stop
@@ -0,0 +1,199 @@
+a
+ahogy
+ahol
+aki
+akik
+akkor
+alatt
+által
+általában
+amely
+amelyek
+amelyekben
+amelyeket
+amelyet
+amelynek
+ami
+amit
+amolyan
+amíg
+amikor
+át
+abban
+ahhoz
+annak
+arra
+arról
+az
+azok
+azon
+azt
+azzal
+azért
+aztán
+azután
+azonban
+bár
+be
+belül
+benne
+cikk
+cikkek
+cikkeket
+csak
+de
+e
+eddig
+egész
+egy
+egyes
+egyetlen
+egyéb
+egyik
+egyre
+ekkor
+el
+elég
+ellen
+elõ
+elõször
+elõtt
+elsõ
+én
+éppen
+ebben
+ehhez
+emilyen
+ennek
+erre
+ez
+ezt
+ezek
+ezen
+ezzel
+ezért
+és
+fel
+felé
+hanem
+hiszen
+hogy
+hogyan
+igen
+így
+illetve
+ill.
+ill
+ilyen
+ilyenkor
+ison
+ismét
+itt
+jó
+jól
+jobban
+kell
+kellett
+keresztül
+keressünk
+ki
+kívül
+között
+közül
+legalább
+lehet
+lehetett
+legyen
+lenne
+lenni
+lesz
+lett
+maga
+magát
+majd
+majd
+már
+más
+másik
+meg
+még
+mellett
+mert
+mely
+melyek
+mi
+mit
+míg
+miért
+milyen
+mikor
+minden
+mindent
+mindenki
+mindig
+mint
+mintha
+mivel
+most
+nagy
+nagyobb
+nagyon
+ne
+néha
+nekem
+neki
+nem
+néhány
+nélkül
+nincs
+olyan
+ott
+össze
+õ
+õk
+õket
+pedig
+persze
+rá
+s
+saját
+sem
+semmi
+sok
+sokat
+sokkal
+számára
+szemben
+szerint
+szinte
+talán
+tehát
+teljes
+tovább
+továbbá
+több
+úgy
+ugyanis
+új
+újabb
+újra
+után
+utána
+utolsó
+vagy
+vagyis
+valaki
+valami
+valamint
+való
+vagyok
+van
+vannak
+volt
+voltam
+voltak
+voltunk
+vissza
+vele
+viszont
+volna
diff --git a/src/backend/snowball/stopwords/italian.stop b/src/backend/snowball/stopwords/italian.stop
new file mode 100644
index 000000000000..6ee02b51fb17
--- /dev/null
+++ b/src/backend/snowball/stopwords/italian.stop
@@ -0,0 +1,279 @@
+ad
+al
+allo
+ai
+agli
+all
+agl
+alla
+alle
+con
+col
+coi
+da
+dal
+dallo
+dai
+dagli
+dall
+dagl
+dalla
+dalle
+di
+del
+dello
+dei
+degli
+dell
+degl
+della
+delle
+in
+nel
+nello
+nei
+negli
+nell
+negl
+nella
+nelle
+su
+sul
+sullo
+sui
+sugli
+sull
+sugl
+sulla
+sulle
+per
+tra
+contro
+io
+tu
+lui
+lei
+noi
+voi
+loro
+mio
+mia
+miei
+mie
+tuo
+tua
+tuoi
+tue
+suo
+sua
+suoi
+sue
+nostro
+nostra
+nostri
+nostre
+vostro
+vostra
+vostri
+vostre
+mi
+ti
+ci
+vi
+lo
+la
+li
+le
+gli
+ne
+il
+un
+uno
+una
+ma
+ed
+se
+perché
+anche
+come
+dov
+dove
+che
+chi
+cui
+non
+più
+quale
+quanto
+quanti
+quanta
+quante
+quello
+quelli
+quella
+quelle
+questo
+questi
+questa
+queste
+si
+tutto
+tutti
+a
+c
+e
+i
+l
+o
+ho
+hai
+ha
+abbiamo
+avete
+hanno
+abbia
+abbiate
+abbiano
+avrò
+avrai
+avrà
+avremo
+avrete
+avranno
+avrei
+avresti
+avrebbe
+avremmo
+avreste
+avrebbero
+avevo
+avevi
+aveva
+avevamo
+avevate
+avevano
+ebbi
+avesti
+ebbe
+avemmo
+aveste
+ebbero
+avessi
+avesse
+avessimo
+avessero
+avendo
+avuto
+avuta
+avuti
+avute
+sono
+sei
+è
+siamo
+siete
+sia
+siate
+siano
+sarò
+sarai
+sarà
+saremo
+sarete
+saranno
+sarei
+saresti
+sarebbe
+saremmo
+sareste
+sarebbero
+ero
+eri
+era
+eravamo
+eravate
+erano
+fui
+fosti
+fu
+fummo
+foste
+furono
+fossi
+fosse
+fossimo
+fossero
+essendo
+faccio
+fai
+facciamo
+fanno
+faccia
+facciate
+facciano
+farò
+farai
+farà
+faremo
+farete
+faranno
+farei
+faresti
+farebbe
+faremmo
+fareste
+farebbero
+facevo
+facevi
+faceva
+facevamo
+facevate
+facevano
+feci
+facesti
+fece
+facemmo
+faceste
+fecero
+facessi
+facesse
+facessimo
+facessero
+facendo
+sto
+stai
+sta
+stiamo
+stanno
+stia
+stiate
+stiano
+starò
+starai
+starà
+staremo
+starete
+staranno
+starei
+staresti
+starebbe
+staremmo
+stareste
+starebbero
+stavo
+stavi
+stava
+stavamo
+stavate
+stavano
+stetti
+stesti
+stette
+stemmo
+steste
+stettero
+stessi
+stesse
+stessimo
+stessero
+stando
diff --git a/src/backend/snowball/stopwords/norwegian.stop b/src/backend/snowball/stopwords/norwegian.stop
new file mode 100644
index 000000000000..9ac1abbb6cba
--- /dev/null
+++ b/src/backend/snowball/stopwords/norwegian.stop
@@ -0,0 +1,176 @@
+og
+i
+jeg
+det
+at
+en
+et
+den
+til
+er
+som
+på
+de
+med
+han
+av
+ikke
+ikkje
+der
+så
+var
+meg
+seg
+men
+ett
+har
+om
+vi
+min
+mitt
+ha
+hadde
+hun
+nå
+over
+da
+ved
+fra
+du
+ut
+sin
+dem
+oss
+opp
+man
+kan
+hans
+hvor
+eller
+hva
+skal
+selv
+sjøl
+her
+alle
+vil
+bli
+ble
+blei
+blitt
+kunne
+inn
+når
+være
+kom
+noen
+noe
+ville
+dere
+som
+deres
+kun
+ja
+etter
+ned
+skulle
+denne
+for
+deg
+si
+sine
+sitt
+mot
+Ã¥
+meget
+hvorfor
+dette
+disse
+uten
+hvordan
+ingen
+din
+ditt
+blir
+samme
+hvilken
+hvilke
+sånn
+inni
+mellom
+vår
+hver
+hvem
+vors
+hvis
+både
+bare
+enn
+fordi
+før
+mange
+også
+slik
+vært
+være
+båe
+begge
+siden
+dykk
+dykkar
+dei
+deira
+deires
+deim
+di
+då
+eg
+ein
+eit
+eitt
+elles
+honom
+hjå
+ho
+hoe
+henne
+hennar
+hennes
+hoss
+hossen
+ikkje
+ingi
+inkje
+korleis
+korso
+kva
+kvar
+kvarhelst
+kven
+kvi
+kvifor
+me
+medan
+mi
+mine
+mykje
+no
+nokon
+noka
+nokor
+noko
+nokre
+si
+sia
+sidan
+so
+somt
+somme
+um
+upp
+vere
+vore
+verte
+vort
+varte
+vart
diff --git a/src/backend/snowball/stopwords/portuguese.stop b/src/backend/snowball/stopwords/portuguese.stop
new file mode 100644
index 000000000000..6b2477863b7b
--- /dev/null
+++ b/src/backend/snowball/stopwords/portuguese.stop
@@ -0,0 +1,203 @@
+de
+a
+o
+que
+e
+do
+da
+em
+um
+para
+com
+não
+uma
+os
+no
+se
+na
+por
+mais
+as
+dos
+como
+mas
+ao
+ele
+das
+à
+seu
+sua
+ou
+quando
+muito
+nos
+já
+eu
+também
+só
+pelo
+pela
+até
+isso
+ela
+entre
+depois
+sem
+mesmo
+aos
+seus
+quem
+nas
+me
+esse
+eles
+você
+essa
+num
+nem
+suas
+meu
+às
+minha
+numa
+pelos
+elas
+qual
+nós
+lhe
+deles
+essas
+esses
+pelas
+este
+dele
+tu
+te
+vocês
+vos
+lhes
+meus
+minhas
+teu
+tua
+teus
+tuas
+nosso
+nossa
+nossos
+nossas
+dela
+delas
+esta
+estes
+estas
+aquele
+aquela
+aqueles
+aquelas
+isto
+aquilo
+estou
+está
+estamos
+estão
+estive
+esteve
+estivemos
+estiveram
+estava
+estávamos
+estavam
+estivera
+estivéramos
+esteja
+estejamos
+estejam
+estivesse
+estivéssemos
+estivessem
+estiver
+estivermos
+estiverem
+hei
+há
+havemos
+hão
+houve
+houvemos
+houveram
+houvera
+houvéramos
+haja
+hajamos
+hajam
+houvesse
+houvéssemos
+houvessem
+houver
+houvermos
+houverem
+houverei
+houverá
+houveremos
+houverão
+houveria
+houveríamos
+houveriam
+sou
+somos
+são
+era
+éramos
+eram
+fui
+foi
+fomos
+foram
+fora
+fôramos
+seja
+sejamos
+sejam
+fosse
+fôssemos
+fossem
+for
+formos
+forem
+serei
+será
+seremos
+serão
+seria
+seríamos
+seriam
+tenho
+tem
+temos
+tém
+tinha
+tínhamos
+tinham
+tive
+teve
+tivemos
+tiveram
+tivera
+tivéramos
+tenha
+tenhamos
+tenham
+tivesse
+tivéssemos
+tivessem
+tiver
+tivermos
+tiverem
+terei
+terá
+teremos
+terão
+teria
+teríamos
+teriam
diff --git a/contrib/tsearch2/stopword/russian.stop.utf8 b/src/backend/snowball/stopwords/russian.stop
similarity index 100%
rename from contrib/tsearch2/stopword/russian.stop.utf8
rename to src/backend/snowball/stopwords/russian.stop
diff --git a/src/backend/snowball/stopwords/spanish.stop b/src/backend/snowball/stopwords/spanish.stop
new file mode 100644
index 000000000000..59bc786caa49
--- /dev/null
+++ b/src/backend/snowball/stopwords/spanish.stop
@@ -0,0 +1,313 @@
+de
+la
+que
+el
+en
+y
+a
+los
+del
+se
+las
+por
+un
+para
+con
+no
+una
+su
+al
+lo
+como
+más
+pero
+sus
+le
+ya
+o
+este
+sí
+porque
+esta
+entre
+cuando
+muy
+sin
+sobre
+también
+me
+hasta
+hay
+donde
+quien
+desde
+todo
+nos
+durante
+todos
+uno
+les
+ni
+contra
+otros
+ese
+eso
+ante
+ellos
+e
+esto
+mí
+antes
+algunos
+qué
+unos
+yo
+otro
+otras
+otra
+él
+tanto
+esa
+estos
+mucho
+quienes
+nada
+muchos
+cual
+poco
+ella
+estar
+estas
+algunas
+algo
+nosotros
+mi
+mis
+tú
+te
+ti
+tu
+tus
+ellas
+nosotras
+vosostros
+vosostras
+os
+mío
+mía
+míos
+mías
+tuyo
+tuya
+tuyos
+tuyas
+suyo
+suya
+suyos
+suyas
+nuestro
+nuestra
+nuestros
+nuestras
+vuestro
+vuestra
+vuestros
+vuestras
+esos
+esas
+estoy
+estás
+está
+estamos
+estáis
+están
+esté
+estés
+estemos
+estéis
+estén
+estaré
+estarás
+estará
+estaremos
+estaréis
+estarán
+estaría
+estarías
+estaríamos
+estaríais
+estarían
+estaba
+estabas
+estábamos
+estabais
+estaban
+estuve
+estuviste
+estuvo
+estuvimos
+estuvisteis
+estuvieron
+estuviera
+estuvieras
+estuviéramos
+estuvierais
+estuvieran
+estuviese
+estuvieses
+estuviésemos
+estuvieseis
+estuviesen
+estando
+estado
+estada
+estados
+estadas
+estad
+he
+has
+ha
+hemos
+habéis
+han
+haya
+hayas
+hayamos
+hayáis
+hayan
+habré
+habrás
+habrá
+habremos
+habréis
+habrán
+habría
+habrías
+habríamos
+habríais
+habrían
+había
+habías
+habíamos
+habíais
+habían
+hube
+hubiste
+hubo
+hubimos
+hubisteis
+hubieron
+hubiera
+hubieras
+hubiéramos
+hubierais
+hubieran
+hubiese
+hubieses
+hubiésemos
+hubieseis
+hubiesen
+habiendo
+habido
+habida
+habidos
+habidas
+soy
+eres
+es
+somos
+sois
+son
+sea
+seas
+seamos
+seáis
+sean
+seré
+serás
+será
+seremos
+seréis
+serán
+sería
+serías
+seríamos
+seríais
+serían
+era
+eras
+éramos
+erais
+eran
+fui
+fuiste
+fue
+fuimos
+fuisteis
+fueron
+fuera
+fueras
+fuéramos
+fuerais
+fueran
+fuese
+fueses
+fuésemos
+fueseis
+fuesen
+sintiendo
+sentido
+sentida
+sentidos
+sentidas
+siente
+sentid
+tengo
+tienes
+tiene
+tenemos
+tenéis
+tienen
+tenga
+tengas
+tengamos
+tengáis
+tengan
+tendré
+tendrás
+tendrá
+tendremos
+tendréis
+tendrán
+tendría
+tendrías
+tendríamos
+tendríais
+tendrían
+tenía
+tenías
+teníamos
+teníais
+tenían
+tuve
+tuviste
+tuvo
+tuvimos
+tuvisteis
+tuvieron
+tuviera
+tuvieras
+tuviéramos
+tuvierais
+tuvieran
+tuviese
+tuvieses
+tuviésemos
+tuvieseis
+tuviesen
+teniendo
+tenido
+tenida
+tenidos
+tenidas
+tened
diff --git a/src/backend/snowball/stopwords/swedish.stop b/src/backend/snowball/stopwords/swedish.stop
new file mode 100644
index 000000000000..742bb6263b99
--- /dev/null
+++ b/src/backend/snowball/stopwords/swedish.stop
@@ -0,0 +1,114 @@
+och
+det
+att
+i
+en
+jag
+hon
+som
+han
+på
+den
+med
+var
+sig
+för
+så
+till
+är
+men
+ett
+om
+hade
+de
+av
+icke
+mig
+du
+henne
+då
+sin
+nu
+har
+inte
+hans
+honom
+skulle
+hennes
+där
+min
+man
+ej
+vid
+kunde
+något
+från
+ut
+när
+efter
+upp
+vi
+dem
+vara
+vad
+över
+än
+dig
+kan
+sina
+här
+ha
+mot
+alla
+under
+någon
+eller
+allt
+mycket
+sedan
+ju
+denna
+själv
+detta
+Ã¥t
+utan
+varit
+hur
+ingen
+mitt
+ni
+bli
+blev
+oss
+din
+dessa
+några
+deras
+blir
+mina
+samma
+vilken
+er
+sådan
+vår
+blivit
+dess
+inom
+mellan
+sådant
+varför
+varje
+vilka
+ditt
+vem
+vilket
+sitta
+sådana
+vart
+dina
+vars
+vårt
+våra
+ert
+era
+vilkas
diff --git a/src/backend/snowball/stopwords/turkish.stop b/src/backend/snowball/stopwords/turkish.stop
new file mode 100644
index 000000000000..5a48ccce0737
--- /dev/null
+++ b/src/backend/snowball/stopwords/turkish.stop
@@ -0,0 +1,53 @@
+acaba
+ama
+aslında
+az
+bazı
+belki
+biri
+birkaç
+birÅŸey
+biz
+bu
+çok
+çünkü
+da
+daha
+de
+defa
+diye
+eÄŸer
+en
+gibi
+hem
+hep
+hepsi
+her
+hiç
+için
+ile
+ise
+kez
+ki
+kim
+mı
+mu
+mü
+nasıl
+ne
+neden
+nerde
+nerede
+nereye
+niçin
+niye
+o
+sanki
+ÅŸey
+siz
+ÅŸu
+tüm
+ve
+veya
+ya
+yani
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index acdb7e681180..2bf86c382407 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/buf_init.c,v 1.79 2007/01/05 22:19:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/buf_init.c,v 1.80 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,7 @@
 #include "storage/bufmgr.h"
 #include "storage/buf_internals.h"
 
-volatile BufferDesc *BufferDescriptors;
+BufferDesc *BufferDescriptors;
 char	   *BufferBlocks;
 int32	   *PrivateRefCount;
 
@@ -100,7 +100,7 @@ InitBufferPool(void)
 	bool		foundBufs,
 				foundDescs;
 
-	BufferDescriptors = (volatile BufferDesc *)
+	BufferDescriptors = (BufferDesc *)
 		ShmemInitStruct("Buffer Descriptors",
 						NBuffers * sizeof(BufferDesc), &foundDescs);
 
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index 10cdc9efa1a7..b8a7e8032d13 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/buf_table.c,v 1.48 2007/01/05 22:19:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/buf_table.c,v 1.49 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index f4f1a3d6644b..6cf0fc7bacb4 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.215 2007/02/01 19:10:27 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.228 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,18 +62,17 @@
 #define LocalBufHdrGetBlock(bufHdr) \
 	LocalBufferBlockPointers[-((bufHdr)->buf_id + 2)]
 
-/* interval for calling AbsorbFsyncRequests in BufferSync */
-#define WRITES_PER_ABSORB		1000
+/* Bits in SyncOneBuffer's return value */
+#define BUF_WRITTEN				0x01
+#define BUF_REUSABLE			0x02
 
 
 /* GUC variables */
 bool        memory_protect_buffer_pool = true;
 bool 		flush_buffer_pages_when_evicted = false;
 bool		zero_damaged_pages = false;
-double		bgwriter_lru_percent = 1.0;
-double		bgwriter_all_percent = 0.333;
-int			bgwriter_lru_maxpages = 5;
-int			bgwriter_all_maxpages = 5;
+int			bgwriter_lru_maxpages = 100;
+double		bgwriter_lru_multiplier = 2.0;
 
 
 long		NDirectFileRead;	/* some I/O's are direct file access. bypass
@@ -89,14 +88,14 @@ static bool IsForInput;
 static volatile BufferDesc *PinCountWaitBuf = NULL;
 
 static Buffer ReadBuffer_common(SMgrRelation reln, bool isLocalBuf,
-				  bool isTemp, BlockNumber blockNum,
+				  bool isTemp, BlockNumber blockNum, bool zeroPage,
+				  BufferAccessStrategy strategy,
 				  const char *relErrMsgString, bool *pHit);
-
-static bool PinBuffer(volatile BufferDesc *buf);
+static bool PinBuffer(volatile BufferDesc *buf, BufferAccessStrategy strategy);
 static void PinBuffer_Locked(volatile BufferDesc *buf);
-static void UnpinBuffer(volatile BufferDesc *buf,
-			bool fixOwner, bool normalAccess);
-static bool SyncOneBuffer(int buf_id, bool skip_pinned);
+static void UnpinBuffer(volatile BufferDesc *buf, bool fixOwner);
+static void BufferSync(int flags);
+static int	SyncOneBuffer(int buf_id, bool skip_recently_used);
 static void WaitIO(volatile BufferDesc *buf);
 static bool StartBufferIO(volatile BufferDesc *buf, bool forInput);
 static void TerminateBufferIO(volatile BufferDesc *buf, bool clear_dirty,
@@ -104,11 +103,11 @@ static void TerminateBufferIO(volatile BufferDesc *buf, bool clear_dirty,
 static void buffer_write_error_callback(void *arg);
 
 static volatile BufferDesc *BufferAlloc(SMgrRelation reln, BlockNumber blockNum,
+			BufferAccessStrategy strategy,
 			bool *foundPtr);
 
 static void FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln);
 static void AtProcExit_Buffers(int code, Datum arg);
-static Buffer ReadBuffer_Ex(Relation reln, BlockNumber blockNum, volatile BufferDesc* availBufHdr);
 
 
 #define ShouldMemoryProtect(buf) (ShouldMemoryProtectBufferPool() && ! BufferIsLocal(buf->buf_id+1) && ! BufferIsInvalid(buf->buf_id+1))
@@ -181,43 +180,6 @@ static inline bool ConditionalAcquireContentLock( volatile BufferDesc *buf, LWLo
 
 Buffer
 ReadBuffer(Relation reln, BlockNumber blockNum)
-{
-	return ReadBuffer_Ex(reln, blockNum, NULL);
-}
-
-/*
- * Read Buffer for pages to be Resynced
- */
-Buffer
-ReadBuffer_Resync(SMgrRelation reln, BlockNumber blockNum, const char *relidstr)
-{
-	bool		isHit;
-
-	return ReadBuffer_common(reln,
-							 false, /* isLocalBuf */
-							 false, /* isTemp */
-							 blockNum,
-							 relidstr,
-							 &isHit);
-}
-
-/*
- * ReadBuffer_Ex -- returns a buffer containing the requested
- *		block of the requested relation.  If the blknum
- *		requested is P_NEW, extend the relation file and
- *		allocate a new block.  (Caller is responsible for
- *		ensuring that only one backend tries to extend a
- *		relation at the same time!)
- *
- * Returns: the buffer number for the buffer containing
- *		the block read.  The returned buffer has been pinned.
- *		Does not return on error --- elog's instead.
- *
- * Assume when this function is called, that reln has been
- *		opened already.
- */
-static Buffer
-ReadBuffer_Ex(Relation reln, BlockNumber blockNum, volatile BufferDesc *availBufHdr)
 {
 	bool		isHit;
 	Buffer		returnBuffer;
@@ -232,6 +194,8 @@ ReadBuffer_Ex(Relation reln, BlockNumber blockNum, volatile BufferDesc *availBuf
 									 reln->rd_isLocalBuf,
 									 reln->rd_istemp,
 									 blockNum,
+									 false, /* zeroPage */
+									 NULL, /* strategy */
 									 NULL,
 									 &isHit);
 
@@ -241,6 +205,24 @@ ReadBuffer_Ex(Relation reln, BlockNumber blockNum, volatile BufferDesc *availBuf
 	return returnBuffer;
 }
 
+/*
+ * Read Buffer for pages to be Resynced
+ */
+Buffer
+ReadBuffer_Resync(SMgrRelation reln, BlockNumber blockNum, const char *relidstr)
+{
+	bool		isHit;
+
+	return ReadBuffer_common(reln,
+							 false, /* isLocalBuf */
+							 false, /* isTemp */
+							 blockNum,
+							 false, /* zeroPage */
+							 NULL,	/* strategy */
+							 relidstr,
+							 &isHit);
+}
+
 /*
  * ReadBuffer_common -- returns a buffer containing the requested
  *		block of the requested relation.  If the blknum
@@ -261,6 +243,8 @@ ReadBuffer_common(SMgrRelation reln,
 				  bool isLocalBuf,
 				  bool isTemp,
 				  BlockNumber blockNum,
+				  bool zeroPage,
+				  BufferAccessStrategy strategy,
 				  const char *relErrMsgString,
 				  bool *pHit)
 {
@@ -306,7 +290,7 @@ ReadBuffer_common(SMgrRelation reln,
 		 * lookup the buffer.  IO_IN_PROGRESS is set if the requested block is
 		 * not currently in memory.
 		 */
-		bufHdr = BufferAlloc(reln, blockNum, &found);
+		bufHdr = BufferAlloc(reln, blockNum, strategy, &found);
 		if (found)
 			BufferHitCount++;
 	}
@@ -400,17 +384,18 @@ ReadBuffer_common(SMgrRelation reln,
 	}
 	else
 	{
-		smgrread(reln, blockNum, (char *) bufBlock);
+		/*
+		 * Read in the page, unless the caller intends to overwrite it and
+		 * just wants us to allocate a buffer.
+		 */
+		if (zeroPage)
+			MemSet((char *) bufBlock, 0, BLCKSZ);
+		else
+			smgrread(reln, blockNum, (char *) bufBlock);
 		/* check for garbage data */
 		if (!PageHeaderIsValid((PageHeader) bufBlock))
 		{
-			/*
-			 * During WAL recovery, the first access to any data page should
-			 * overwrite the whole page from the WAL; so a clobbered page
-			 * header is not reason to fail.  Hence, when InRecovery we may
-			 * always act as though zero_damaged_pages is ON.
-			 */
-			if (zero_damaged_pages || InRecovery)
+			if (zero_damaged_pages)
 			{
 				ereport(WARNING,
 						(errcode(ERRCODE_DATA_CORRUPTED),
@@ -455,6 +440,10 @@ ReadBuffer_common(SMgrRelation reln,
  *		buffer.  If no buffer exists already, selects a replacement
  *		victim and evicts the old page, but does NOT read in new page.
  *
+ * "strategy" can be a buffer replacement strategy object, or NULL for
+ * the default strategy.  The selected buffer's usage_count is advanced when
+ * using the default strategy, but otherwise possibly not (see PinBuffer).
+ *
  * The returned buffer is pinned and is already marked as holding the
  * desired page.  If it already did have the desired page, *foundPtr is
  * set TRUE.  Otherwise, *foundPtr is set FALSE and the buffer is marked
@@ -468,6 +457,7 @@ ReadBuffer_common(SMgrRelation reln,
 static volatile BufferDesc *
 BufferAlloc(SMgrRelation smgr,
 			BlockNumber blockNum,
+			BufferAccessStrategy strategy,
 			bool *foundPtr)
 {
 	BufferTag	newTag;			/* identity of requested block */
@@ -502,7 +492,7 @@ BufferAlloc(SMgrRelation smgr,
 		 */
 		buf = &BufferDescriptors[buf_id];
 
-		valid = PinBuffer(buf);
+		valid = PinBuffer(buf, strategy);
 
 		/* Can release the mapping lock as soon as we've pinned it */
 		LWLockRelease(newPartitionLock);
@@ -540,13 +530,15 @@ BufferAlloc(SMgrRelation smgr,
 	/* Loop here in case we have to try another victim buffer */
 	for (;;)
 	{
+		bool		lock_held;
+
 		/*
 		 * Select a victim buffer.	The buffer is returned with its header
 		 * spinlock still held!  Also (in most cases) the BufFreelistLock is
 		 * still held, since it would be bad to hold the spinlock while
 		 * possibly waking up other processes.
 		 */
-		buf = StrategyGetBuffer();
+		buf = StrategyGetBuffer(strategy, &lock_held);
 
 		Assert(buf->refcount == 0);
 
@@ -557,7 +549,8 @@ BufferAlloc(SMgrRelation smgr,
 		PinBuffer_Locked(buf);
 
 		/* Now it's safe to release the freelist lock */
-		LWLockRelease(BufFreelistLock);
+		if (lock_held)
+			LWLockRelease(BufFreelistLock);
 
 		/*
 		 * If the buffer was dirty, try to write it out.  There is a race
@@ -569,6 +562,23 @@ BufferAlloc(SMgrRelation smgr,
 		if (oldFlags & BM_DIRTY ||
 				(flush_buffer_pages_when_evicted && (oldFlags & BM_VALID)))
 		{
+			/*
+			 * If using a nondefault strategy, and writing the buffer
+			 * would require a WAL flush, let the strategy decide whether
+			 * to go ahead and write/reuse the buffer or to choose another
+			 * victim.	We need lock to inspect the page LSN, so this
+			 * can't be done inside StrategyGetBuffer.
+			 */
+			if (strategy != NULL &&
+				XLogNeedsFlush(BufferGetLSN(buf)) &&
+				StrategyRejectBuffer(strategy, buf))
+			{
+				/* Drop lock/pin and loop around for another buffer */
+				LWLockRelease(buf->content_lock);
+				UnpinBuffer(buf, true);
+				continue;
+			}
+
 			/*
 			 * We need a share-lock on the buffer contents to write it out
 			 * (else we might write invalid data, eg because someone else is
@@ -592,10 +602,10 @@ BufferAlloc(SMgrRelation smgr,
 			else
 			{
 				/*
-				 * Someone else has pinned the buffer, so give it up and loop
+				 * Someone else has locked the buffer, so give it up and loop
 				 * back to get another one.
 				 */
-				UnpinBuffer(buf, true, false /* evidently recently used */ );
+				UnpinBuffer(buf, true);
 				continue;
 			}
 		}
@@ -659,10 +669,9 @@ BufferAlloc(SMgrRelation smgr,
 			 * Got a collision. Someone has already done what we were about to
 			 * do. We'll just handle this as if it were found in the buffer
 			 * pool in the first place.  First, give up the buffer we were
-			 * planning to use.  Don't allow it to be thrown in the free list
-			 * (we don't want to hold freelist and mapping locks at once).
+			 * planning to use.
 			 */
-			UnpinBuffer(buf, true, false);
+			UnpinBuffer(buf, true);
 
 			/* Can give up that buffer's mapping partition lock now */
 			if ((oldFlags & BM_TAG_VALID) &&
@@ -673,7 +682,7 @@ BufferAlloc(SMgrRelation smgr,
 
 			buf = &BufferDescriptors[buf_id];
 
-			valid = PinBuffer(buf);
+			valid = PinBuffer(buf, strategy);
 
 			/* Can release the mapping lock as soon as we've pinned it */
 			LWLockRelease(newPartitionLock);
@@ -723,7 +732,7 @@ BufferAlloc(SMgrRelation smgr,
 			oldPartitionLock != newPartitionLock)
 			LWLockRelease(oldPartitionLock);
 		LWLockRelease(newPartitionLock);
-		UnpinBuffer(buf, true, false /* evidently recently used */ );
+		UnpinBuffer(buf, true);
 	}
 
 	/*
@@ -731,12 +740,13 @@ BufferAlloc(SMgrRelation smgr,
 	 *
 	 * Clearing BM_VALID here is necessary, clearing the dirtybits is just
 	 * paranoia.  We also reset the usage_count since any recency of use of
-	 * the old content is no longer relevant.
+	 * the old content is no longer relevant.  (The usage_count starts out at
+	 * 1 so that the buffer can survive one clock-sweep pass.)
 	 */
 	buf->tag = newTag;
-	buf->flags &= ~(BM_VALID | BM_DIRTY | BM_JUST_DIRTIED | BM_IO_ERROR);
+	buf->flags &= ~(BM_VALID | BM_DIRTY | BM_JUST_DIRTIED | BM_CHECKPOINT_NEEDED | BM_IO_ERROR);
 	buf->flags |= BM_TAG_VALID;
-	buf->usage_count = 0;
+	buf->usage_count = 1;
 
 	UnlockBufHdr(buf);
 
@@ -888,7 +898,7 @@ InvalidateBuffer(volatile BufferDesc *buf, bool putInFreeList, bool spin)
 	 * Insert the buffer at the head of the list of free buffers.
 	 */
 	if (putInFreeList)
-		StrategyFreeBuffer(buf, true);
+		StrategyFreeBuffer(buf);
 
 	return true;
 }
@@ -936,6 +946,76 @@ MarkBufferDirty(Buffer buffer)
 	UnlockBufHdr(bufHdr);
 }
 
+/*
+ * ReadBufferWithStrategy -- same as ReadBuffer, except caller can specify
+ *		a nondefault buffer access strategy.  See buffer/README for details.
+ */
+Buffer
+ReadBufferWithStrategy(Relation reln, BlockNumber blockNum,
+					   BufferAccessStrategy strategy)
+{
+	bool		isHit;
+	Buffer		returnBuffer;
+
+	/* Open it at the smgr level if not already done */
+	RelationOpenSmgr(reln);
+	Assert(RelFileNodeEquals(reln->rd_node, reln->rd_smgr->smgr_rnode));
+
+	pgstat_count_buffer_read(reln);
+
+	returnBuffer = ReadBuffer_common(reln->rd_smgr,
+									 reln->rd_isLocalBuf,
+									 reln->rd_istemp,
+									 blockNum,
+									 false, /* zeroPage */
+									 strategy,
+									 NULL,
+									 &isHit);
+
+	if (isHit)
+		pgstat_count_buffer_hit(reln);
+
+	return returnBuffer;
+}
+
+/*
+ * ReadOrZeroBuffer -- like ReadBuffer, but if the page isn't in buffer
+ *		cache already, it's filled with zeros instead of reading it from
+ *		disk.  Useful when the caller intends to fill the page from scratch,
+ *		since this saves I/O and avoids unnecessary failure if the
+ *		page-on-disk has corrupt page headers.
+ *
+ *		Caution: do not use this to read a page that is beyond the relation's
+ *		current physical EOF; that is likely to cause problems in md.c when
+ *		the page is modified and written out.  P_NEW is OK, though.
+ */
+Buffer
+ReadOrZeroBuffer(Relation reln, BlockNumber blockNum)
+{
+	bool		isHit;
+	Buffer		returnBuffer;
+
+	/* Open it at the smgr level if not already done */
+	RelationOpenSmgr(reln);
+	Assert(RelFileNodeEquals(reln->rd_node, reln->rd_smgr->smgr_rnode));
+
+	pgstat_count_buffer_read(reln);
+
+	returnBuffer = ReadBuffer_common(reln->rd_smgr,
+									 reln->rd_isLocalBuf,
+									 reln->rd_istemp,
+									 blockNum,
+									 true, /* zeroPage */
+									 NULL, /* strategy */
+									 NULL,
+									 &isHit);
+
+	if (isHit)
+		pgstat_count_buffer_hit(reln);
+
+	return returnBuffer;
+}
+
 /*
  * ReleaseAndReadBuffer -- combine ReleaseBuffer() and ReadBuffer()
  *
@@ -969,9 +1049,6 @@ ReleaseAndReadBuffer(Buffer buffer,
 				return buffer;
 			ResourceOwnerForgetBuffer(CurrentResourceOwner, buffer);
 			LocalRefCount[-buffer - 1]--;
-			if (LocalRefCount[-buffer - 1] == 0 &&
-				bufHdr->usage_count < BM_MAX_USAGE_COUNT)
-				bufHdr->usage_count++;
 		}
 		else
 		{
@@ -981,7 +1058,7 @@ ReleaseAndReadBuffer(Buffer buffer,
 			if (bufHdr->tag.blockNum == blockNum &&
 				RelFileNodeEquals(bufHdr->tag.rnode, relation->rd_node))
 				return buffer;
-			UnpinBuffer(bufHdr, true, true);
+			UnpinBuffer(bufHdr, true);
 		}
 	}
 
@@ -993,58 +1070,30 @@ KillAndReadBuffer(Buffer buffer,
 					 Relation relation,
 					 BlockNumber blockNum)
 {
-	volatile BufferDesc* bufHdr;
-
 	MIRROREDLOCK_BUFMGR_MUST_ALREADY_BE_HELD;
 
-	if (!BufferIsValid(buffer) || BufferIsLocal(buffer)) 
-	{
-		return ReleaseAndReadBuffer(buffer, relation, blockNum);
-	}
-
-	/* buffer is valid and it is not local */
-	Assert(PrivateRefCount[buffer - 1] > 0);
-	bufHdr = &BufferDescriptors[buffer - 1];
-	/* we have pin, so it's ok to examine tag without spinlock */
-	if (bufHdr->tag.blockNum == blockNum 
-		&& RelFileNodeEquals(bufHdr->tag.rnode, relation->rd_node))
-		return buffer;
-
-
-	/* don't kill the buffer if someone else is using it or used it recently, 
-	   or if it's dirty */
-	UnpinBuffer(bufHdr, true, true);
-	LockBufHdr(bufHdr);
-	if (PrivateRefCount[buffer - 1] > 0 
-		|| bufHdr->refcount > 0
-		|| bufHdr->usage_count > 1 
-		|| (bufHdr->flags & (BM_IO_IN_PROGRESS | BM_DIRTY)))  
-	{
-		UnlockBufHdr(bufHdr);
-		return ReadBuffer(relation, blockNum);
-	}
-
-	/* now, invalidate the buffer, but don't put on freelist */
-	/* XXX MPP-4192. Pass down a flag saying we will not spin.  
-	 * In vanilla postgres the InvalidateBuffer assumes that the only case that 
-	 * someone else is holding a refcount on the buffer is that the other guy 
-	 * is flushing.  Therefore, it spins, to wait to become the sole owner and 
-	 * then it can invalidate the buffer.  Here is greenplum code,
-	 * which invalidate a buffer aggressively during scan.  In case of a 
-	 * some other process is blocked by a Motion (so the other guy will hold a
-	 * ref count but will not progress), the spin can possibly cause a 
-	 * dead lock.
+	/*
+	 * TODO: This used to try to reuse the same buffer. This is used for
+	 * readahead in a seqscan. Instead of trying to make that work
+	 * efficiently, we should refactor the readahead code to use a bulk
+	 * BufferAccessStrategy instead. For now, just map this to
+	 * ReleaseAndReadBuffer(), which doesn't try to do anything particularly
+	 * efficient.
 	 */
-	if (! InvalidateBuffer(bufHdr, false, false)) /* this will unlock bufhdr */
-		return ReadBuffer(relation, blockNum);
-
-	/* reuse the freed buffer to read the new page if possible */
-	return ReadBuffer_Ex(relation, blockNum, bufHdr);
+	return ReleaseAndReadBuffer(buffer, relation, blockNum);
 }
 
 /*
  * PinBuffer -- make buffer unavailable for replacement.
  *
+ * For the default access strategy, the buffer's usage_count is incremented
+ * when we first pin it; for other strategies we just make sure the usage_count
+ * isn't zero.  (The idea of the latter is that we don't want synchronized
+ * heap scans to inflate the count, but we need it to not be zero to discourage
+ * other backends from stealing buffers from our ring.	As long as we cycle
+ * through the ring faster than the global clock-sweep cycles, buffers in
+ * our ring won't be chosen as victims for replacement by other backends.)
+ *
  * This should be applied only to shared buffers, never local ones.
  *
  * Note that ResourceOwnerEnlargeBuffers must have been done already.
@@ -1053,7 +1102,7 @@ KillAndReadBuffer(Buffer buffer,
  * some callers to avoid an extra spinlock cycle.
  */
 static bool
-PinBuffer(volatile BufferDesc *buf)
+PinBuffer(volatile BufferDesc *buf, BufferAccessStrategy strategy)
 {
 	int			b = buf->buf_id;
 	bool		result;
@@ -1062,6 +1111,16 @@ PinBuffer(volatile BufferDesc *buf)
 	{
 		LockBufHdr(buf);
 		buf->refcount++;
+		if (strategy == NULL)
+		{
+			if (buf->usage_count < BM_MAX_USAGE_COUNT)
+				buf->usage_count++;
+		}
+		else
+		{
+			if (buf->usage_count == 0)
+				buf->usage_count = 1;
+		}
 		result = (buf->flags & BM_VALID) != 0;
 		BufferMProtect(buf, PROT_READ);
 		UnlockBufHdr(buf);
@@ -1082,6 +1141,11 @@ PinBuffer(volatile BufferDesc *buf)
  * PinBuffer_Locked -- as above, but caller already locked the buffer header.
  * The spinlock is released before return.
  *
+ * Currently, no callers of this function want to modify the buffer's
+ * usage_count at all, so there's no need for a strategy parameter.
+ * Also we don't bother with a BM_VALID test (the caller could check that for
+ * itself).
+ *
  * Note: use of this routine is frequently mandatory, not just an optimization
  * to save a spin lock/unlock cycle, because we need to pin a buffer before
  * its state can change under us.
@@ -1110,17 +1174,9 @@ PinBuffer_Locked(volatile BufferDesc *buf)
  *
  * Most but not all callers want CurrentResourceOwner to be adjusted.
  * Those that don't should pass fixOwner = FALSE.
- *
- * normalAccess indicates that we are finishing a "normal" page access,
- * that is, one requested by something outside the buffer subsystem.
- * Passing FALSE means it's an internal access that should not update the
- * buffer's usage count nor cause a change in the freelist.
- *
- * If we are releasing a buffer during VACUUM, and it's not been otherwise
- * used recently, and normalAccess is true, we send the buffer to the freelist.
  */
 static void
-UnpinBuffer(volatile BufferDesc *buf, bool fixOwner, bool normalAccess)
+UnpinBuffer(volatile BufferDesc *buf, bool fixOwner)
 {
 	int			b = buf->buf_id;
 
@@ -1132,8 +1188,6 @@ UnpinBuffer(volatile BufferDesc *buf, bool fixOwner, bool normalAccess)
 	PrivateRefCount[b]--;
 	if (PrivateRefCount[b] == 0)
 	{
-		bool		immed_free_buffer = false;
-
 		/* I'd better not still hold any locks on the buffer */
 		Assert(!LWLockHeldByMe(buf->content_lock));
 		Assert(!LWLockHeldByMe(buf->io_in_progress_lock));
@@ -1145,22 +1199,7 @@ UnpinBuffer(volatile BufferDesc *buf, bool fixOwner, bool normalAccess)
 		buf->refcount--;
 		BufferMProtect(buf, PROT_NONE);
 
-		/* Update buffer usage info, unless this is an internal access */
-		if (normalAccess)
-		{
-			if (!strategy_hint_vacuum)
-			{
-				if (buf->usage_count < BM_MAX_USAGE_COUNT)
-					buf->usage_count++;
-			}
-			else
-			{
-				/* VACUUM accesses don't bump usage count, instead... */
-				if (buf->refcount == 0 && buf->usage_count == 0)
-					immed_free_buffer = true;
-			}
-		}
-
+		/* Support LockBufferForCleanup() */
 		if ((buf->flags & BM_PIN_COUNT_WAITER) &&
 			buf->refcount == 1)
 		{
@@ -1173,14 +1212,6 @@ UnpinBuffer(volatile BufferDesc *buf, bool fixOwner, bool normalAccess)
 		}
 		else
 			UnlockBufHdr(buf);
-
-		/*
-		 * If VACUUM is releasing an otherwise-unused buffer, send it to the
-		 * freelist for near-term reuse.  We put it at the tail so that it
-		 * won't be used before any invalid buffers that may exist.
-		 */
-		if (immed_free_buffer)
-			StrategyFreeBuffer(buf, false);
 	}
 }
 
@@ -1188,46 +1219,126 @@ UnpinBuffer(volatile BufferDesc *buf, bool fixOwner, bool normalAccess)
  * BufferSync -- Write out all dirty buffers in the pool.
  *
  * This is called at checkpoint time to write out all dirty shared buffers.
+ * The checkpoint request flags should be passed in; currently the only one
+ * examined is CHECKPOINT_IMMEDIATE, which disables delays between writes.
  */
-void
-BufferSync(void)
+static void
+BufferSync(int flags)
 {
 	int			buf_id;
 	int			num_to_scan;
-	int			absorb_counter;
+	int			num_to_write;
+	int			num_written;
+
+	/* Make sure we can handle the pin inside SyncOneBuffer */
+	ResourceOwnerEnlargeBuffers(CurrentResourceOwner);
+
 
 	/*
-	 * Find out where to start the circular scan.
+	 * Loop over all buffers, and mark the ones that need to be written with
+	 * BM_CHECKPOINT_NEEDED.  Count them as we go (num_to_write), so that we
+	 * can estimate how much work needs to be done.
+	 *
+	 * This allows us to write only those pages that were dirty when the
+	 * checkpoint began, and not those that get dirtied while it proceeds.
+	 * Whenever a page with BM_CHECKPOINT_NEEDED is written out, either by us
+	 * later in this function, or by normal backends or the bgwriter cleaning
+	 * scan, the flag is cleared.  Any buffer dirtied after this point won't
+	 * have the flag set.
+	 *
+	 * Note that if we fail to write some buffer, we may leave buffers with
+	 * BM_CHECKPOINT_NEEDED still set.	This is OK since any such buffer would
+	 * certainly need to be written for the next checkpoint attempt, too.
 	 */
-	buf_id = StrategySyncStart();
+	num_to_write = 0;
+	for (buf_id = 0; buf_id < NBuffers; buf_id++)
+	{
+		volatile BufferDesc *bufHdr = &BufferDescriptors[buf_id];
 
-	/* Make sure we can handle the pin inside SyncOneBuffer */
-	ResourceOwnerEnlargeBuffers(CurrentResourceOwner);
+		/*
+		 * Header spinlock is enough to examine BM_DIRTY, see comment in
+		 * SyncOneBuffer.
+		 */
+		LockBufHdr(bufHdr);
+
+		if (bufHdr->flags & BM_DIRTY)
+		{
+			bufHdr->flags |= BM_CHECKPOINT_NEEDED;
+			num_to_write++;
+		}
+
+		UnlockBufHdr(bufHdr);
+	}
+
+	if (num_to_write == 0)
+		return;					/* nothing to do */
 
 	/*
-	 * Loop over all buffers.
+	 * Loop over all buffers again, and write the ones (still) marked with
+	 * BM_CHECKPOINT_NEEDED.  In this loop, we start at the clock sweep point
+	 * since we might as well dump soon-to-be-recycled buffers first.
+	 *
+	 * Note that we don't read the buffer alloc count here --- that should be
+	 * left untouched till the next BgBufferSync() call.
 	 */
+	buf_id = StrategySyncStart(NULL, NULL);
 	num_to_scan = NBuffers;
-	absorb_counter = WRITES_PER_ABSORB;
+	num_written = 0;
 	while (num_to_scan-- > 0)
 	{
-		if (SyncOneBuffer(buf_id, false))
+		volatile BufferDesc *bufHdr = &BufferDescriptors[buf_id];
+
+		/*
+		 * We don't need to acquire the lock here, because we're only looking
+		 * at a single bit. It's possible that someone else writes the buffer
+		 * and clears the flag right after we check, but that doesn't matter
+		 * since SyncOneBuffer will then do nothing.  However, there is a
+		 * further race condition: it's conceivable that between the time we
+		 * examine the bit here and the time SyncOneBuffer acquires lock,
+		 * someone else not only wrote the buffer but replaced it with another
+		 * page and dirtied it.  In that improbable case, SyncOneBuffer will
+		 * write the buffer though we didn't need to.  It doesn't seem worth
+		 * guarding against this, though.
+		 */
+		if (bufHdr->flags & BM_CHECKPOINT_NEEDED)
 		{
-			/*
-			 * If in bgwriter, absorb pending fsync requests after each
-			 * WRITES_PER_ABSORB write operations, to prevent overflow of the
-			 * fsync request queue.  If not in bgwriter process, this is a
-			 * no-op.
-			 */
-			if (--absorb_counter <= 0)
+			if (SyncOneBuffer(buf_id, false) & BUF_WRITTEN)
 			{
-				AbsorbFsyncRequests();
-				absorb_counter = WRITES_PER_ABSORB;
+				BgWriterStats.m_buf_written_checkpoints++;
+				num_written++;
+
+				/*
+				 * We know there are at most num_to_write buffers with
+				 * BM_CHECKPOINT_NEEDED set; so we can stop scanning if
+				 * num_written reaches num_to_write.
+				 *
+				 * Note that num_written doesn't include buffers written by
+				 * other backends, or by the bgwriter cleaning scan. That
+				 * means that the estimate of how much progress we've made is
+				 * conservative, and also that this test will often fail to
+				 * trigger.  But it seems worth making anyway.
+				 */
+				if (num_written >= num_to_write)
+					break;
+
+				/*
+				 * Perform normal bgwriter duties and sleep to throttle our
+				 * I/O rate.
+				 */
+				CheckpointWriteDelay(flags,
+									 (double) num_written / num_to_write);
 			}
 		}
+
 		if (++buf_id >= NBuffers)
 			buf_id = 0;
 	}
+
+	/*
+	 * Update checkpoint statistics. As noted above, this doesn't include
+	 * buffers written by other backends or bgwriter scan.
+	 */
+	CheckpointStats.ckpt_bufs_written += num_written;
 }
 
 /*
@@ -1238,91 +1349,304 @@ BufferSync(void)
 void
 BgBufferSync(void)
 {
-	static int	buf_id1 = 0;
-	int			buf_id2;
+	/* info obtained from freelist.c */
+	int			strategy_buf_id;
+	uint32		strategy_passes;
+	uint32		recent_alloc;
+
+	/*
+	 * Information saved between calls so we can determine the strategy
+	 * point's advance rate and avoid scanning already-cleaned buffers.
+	 */
+	static bool saved_info_valid = false;
+	static int	prev_strategy_buf_id;
+	static uint32 prev_strategy_passes;
+	static int	next_to_clean;
+	static uint32 next_passes;
+
+	/* Moving averages of allocation rate and clean-buffer density */
+	static float smoothed_alloc = 0;
+	static float smoothed_density = 10.0;
+
+	/* Potentially these could be tunables, but for now, not */
+	float		smoothing_samples = 16;
+	float		scan_whole_pool_milliseconds = 120000.0;
+
+	/* Used to compute how far we scan ahead */
+	long		strategy_delta;
+	int			bufs_to_lap;
+	int			bufs_ahead;
+	float		scans_per_alloc;
+	int			reusable_buffers_est;
+	int			upcoming_alloc_est;
+	int			min_scan_buffers;
+
+	/* Variables for the scanning loop proper */
 	int			num_to_scan;
 	int			num_written;
+	int			reusable_buffers;
 
-	/* Make sure we can handle the pin inside SyncOneBuffer */
-	ResourceOwnerEnlargeBuffers(CurrentResourceOwner);
+	/*
+	 * Find out where the freelist clock sweep currently is, and how many
+	 * buffer allocations have happened since our last call.
+	 */
+	strategy_buf_id = StrategySyncStart(&strategy_passes, &recent_alloc);
+
+	/* Report buffer alloc counts to pgstat */
+	BgWriterStats.m_buf_alloc += recent_alloc;
 
 	/*
-	 * To minimize work at checkpoint time, we want to try to keep all the
-	 * buffers clean; this motivates a scan that proceeds sequentially through
-	 * all buffers.  But we are also charged with ensuring that buffers that
-	 * will be recycled soon are clean when needed; these buffers are the ones
-	 * just ahead of the StrategySyncStart point.  We make a separate scan
-	 * through those.
+	 * If we're not running the LRU scan, just stop after doing the stats
+	 * stuff.  We mark the saved state invalid so that we can recover sanely
+	 * if LRU scan is turned back on later.
 	 */
+	if (bgwriter_lru_maxpages <= 0)
+	{
+		saved_info_valid = false;
+		return;
+	}
 
 	/*
-	 * This loop runs over all buffers, including pinned ones.	The starting
-	 * point advances through the buffer pool on successive calls.
-	 *
-	 * Note that we advance the static counter *before* trying to write. This
-	 * ensures that, if we have a persistent write failure on a dirty buffer,
-	 * we'll still be able to make progress writing other buffers. (The
-	 * bgwriter will catch the error and just call us again later.)
+	 * Compute strategy_delta = how many buffers have been scanned by the
+	 * clock sweep since last time.  If first time through, assume none. Then
+	 * see if we are still ahead of the clock sweep, and if so, how many
+	 * buffers we could scan before we'd catch up with it and "lap" it. Note:
+	 * weird-looking coding of xxx_passes comparisons are to avoid bogus
+	 * behavior when the passes counts wrap around.
 	 */
-	if (bgwriter_all_percent > 0.0 && bgwriter_all_maxpages > 0)
+	if (saved_info_valid)
 	{
-		num_to_scan = (int) ((NBuffers * bgwriter_all_percent + 99) / 100);
-		num_written = 0;
+		int32		passes_delta = strategy_passes - prev_strategy_passes;
+
+		strategy_delta = strategy_buf_id - prev_strategy_buf_id;
+		strategy_delta += (long) passes_delta *NBuffers;
 
-		while (num_to_scan-- > 0)
+		Assert(strategy_delta >= 0);
+
+		if ((int32) (next_passes - strategy_passes) > 0)
 		{
-			if (++buf_id1 >= NBuffers)
-				buf_id1 = 0;
-			if (SyncOneBuffer(buf_id1, false))
-			{
-				if (++num_written >= bgwriter_all_maxpages)
-					break;
-			}
+			/* we're one pass ahead of the strategy point */
+			bufs_to_lap = strategy_buf_id - next_to_clean;
+#ifdef BGW_DEBUG
+			elog(DEBUG2, "bgwriter ahead: bgw %u-%u strategy %u-%u delta=%ld lap=%d",
+				 next_passes, next_to_clean,
+				 strategy_passes, strategy_buf_id,
+				 strategy_delta, bufs_to_lap);
+#endif
 		}
+		else if (next_passes == strategy_passes &&
+				 next_to_clean >= strategy_buf_id)
+		{
+			/* on same pass, but ahead or at least not behind */
+			bufs_to_lap = NBuffers - (next_to_clean - strategy_buf_id);
+#ifdef BGW_DEBUG
+			elog(DEBUG2, "bgwriter ahead: bgw %u-%u strategy %u-%u delta=%ld lap=%d",
+				 next_passes, next_to_clean,
+				 strategy_passes, strategy_buf_id,
+				 strategy_delta, bufs_to_lap);
+#endif
+		}
+		else
+		{
+			/*
+			 * We're behind, so skip forward to the strategy point and start
+			 * cleaning from there.
+			 */
+#ifdef BGW_DEBUG
+			elog(DEBUG2, "bgwriter behind: bgw %u-%u strategy %u-%u delta=%ld",
+				 next_passes, next_to_clean,
+				 strategy_passes, strategy_buf_id,
+				 strategy_delta);
+#endif
+			next_to_clean = strategy_buf_id;
+			next_passes = strategy_passes;
+			bufs_to_lap = NBuffers;
+		}
+	}
+	else
+	{
+		/*
+		 * Initializing at startup or after LRU scanning had been off. Always
+		 * start at the strategy point.
+		 */
+#ifdef BGW_DEBUG
+		elog(DEBUG2, "bgwriter initializing: strategy %u-%u",
+			 strategy_passes, strategy_buf_id);
+#endif
+		strategy_delta = 0;
+		next_to_clean = strategy_buf_id;
+		next_passes = strategy_passes;
+		bufs_to_lap = NBuffers;
+	}
+
+	/* Update saved info for next time */
+	prev_strategy_buf_id = strategy_buf_id;
+	prev_strategy_passes = strategy_passes;
+	saved_info_valid = true;
+
+	/*
+	 * Compute how many buffers had to be scanned for each new allocation, ie,
+	 * 1/density of reusable buffers, and track a moving average of that.
+	 *
+	 * If the strategy point didn't move, we don't update the density estimate
+	 */
+	if (strategy_delta > 0 && recent_alloc > 0)
+	{
+		scans_per_alloc = (float) strategy_delta / (float) recent_alloc;
+		smoothed_density += (scans_per_alloc - smoothed_density) /
+			smoothing_samples;
+	}
+
+	/*
+	 * Estimate how many reusable buffers there are between the current
+	 * strategy point and where we've scanned ahead to, based on the smoothed
+	 * density estimate.
+	 */
+	bufs_ahead = NBuffers - bufs_to_lap;
+	reusable_buffers_est = (float) bufs_ahead / smoothed_density;
+
+	/*
+	 * Track a moving average of recent buffer allocations.  Here, rather than
+	 * a true average we want a fast-attack, slow-decline behavior: we
+	 * immediately follow any increase.
+	 */
+	if (smoothed_alloc <= (float) recent_alloc)
+		smoothed_alloc = recent_alloc;
+	else
+		smoothed_alloc += ((float) recent_alloc - smoothed_alloc) /
+			smoothing_samples;
+
+	/* Scale the estimate by a GUC to allow more aggressive tuning. */
+	upcoming_alloc_est = (int) (smoothed_alloc * bgwriter_lru_multiplier);
+
+	/*
+	 * If recent_alloc remains at zero for many cycles, smoothed_alloc will
+	 * eventually underflow to zero, and the underflows produce annoying
+	 * kernel warnings on some platforms.  Once upcoming_alloc_est has gone
+	 * to zero, there's no point in tracking smaller and smaller values of
+	 * smoothed_alloc, so just reset it to exactly zero to avoid this
+	 * syndrome.  It will pop back up as soon as recent_alloc increases.
+	 */
+	if (upcoming_alloc_est == 0)
+		smoothed_alloc = 0;
+
+	/*
+	 * Even in cases where there's been little or no buffer allocation
+	 * activity, we want to make a small amount of progress through the buffer
+	 * cache so that as many reusable buffers as possible are clean after an
+	 * idle period.
+	 *
+	 * (scan_whole_pool_milliseconds / BgWriterDelay) computes how many times
+	 * the BGW will be called during the scan_whole_pool time; slice the
+	 * buffer pool into that many sections.
+	 */
+	min_scan_buffers = (int) (NBuffers / (scan_whole_pool_milliseconds / BgWriterDelay));
+
+	if (upcoming_alloc_est < (min_scan_buffers + reusable_buffers_est))
+	{
+#ifdef BGW_DEBUG
+		elog(DEBUG2, "bgwriter: alloc_est=%d too small, using min=%d + reusable_est=%d",
+			 upcoming_alloc_est, min_scan_buffers, reusable_buffers_est);
+#endif
+		upcoming_alloc_est = min_scan_buffers + reusable_buffers_est;
 	}
 
 	/*
-	 * This loop considers only unpinned buffers close to the clock sweep
-	 * point.
+	 * Now write out dirty reusable buffers, working forward from the
+	 * next_to_clean point, until we have lapped the strategy scan, or cleaned
+	 * enough buffers to match our estimate of the next cycle's allocation
+	 * requirements, or hit the bgwriter_lru_maxpages limit.
 	 */
-	if (bgwriter_lru_percent > 0.0 && bgwriter_lru_maxpages > 0)
+
+	/* Make sure we can handle the pin inside SyncOneBuffer */
+	ResourceOwnerEnlargeBuffers(CurrentResourceOwner);
+
+	num_to_scan = bufs_to_lap;
+	num_written = 0;
+	reusable_buffers = reusable_buffers_est;
+
+	/* Execute the LRU scan */
+	while (num_to_scan > 0 && reusable_buffers < upcoming_alloc_est)
 	{
-		num_to_scan = (int) ((NBuffers * bgwriter_lru_percent + 99) / 100);
-		num_written = 0;
+		int			buffer_state = SyncOneBuffer(next_to_clean, true);
 
-		buf_id2 = StrategySyncStart();
+		if (++next_to_clean >= NBuffers)
+		{
+			next_to_clean = 0;
+			next_passes++;
+		}
+		num_to_scan--;
 
-		while (num_to_scan-- > 0)
+		if (buffer_state & BUF_WRITTEN)
 		{
-			if (SyncOneBuffer(buf_id2, true))
+			reusable_buffers++;
+			if (++num_written >= bgwriter_lru_maxpages)
 			{
-				if (++num_written >= bgwriter_lru_maxpages)
-					break;
+				BgWriterStats.m_maxwritten_clean++;
+				break;
 			}
-			if (++buf_id2 >= NBuffers)
-				buf_id2 = 0;
 		}
+		else if (buffer_state & BUF_REUSABLE)
+			reusable_buffers++;
+	}
+
+	BgWriterStats.m_buf_written_clean += num_written;
+
+#ifdef BGW_DEBUG
+	elog(DEBUG1, "bgwriter: recent_alloc=%u smoothed=%.2f delta=%ld ahead=%d density=%.2f reusable_est=%d upcoming_est=%d scanned=%d wrote=%d reusable=%d",
+		 recent_alloc, smoothed_alloc, strategy_delta, bufs_ahead,
+		 smoothed_density, reusable_buffers_est, upcoming_alloc_est,
+		 bufs_to_lap - num_to_scan,
+		 num_written,
+		 reusable_buffers - reusable_buffers_est);
+#endif
+
+	/*
+	 * Consider the above scan as being like a new allocation scan.
+	 * Characterize its density and update the smoothed one based on it. This
+	 * effectively halves the moving average period in cases where both the
+	 * strategy and the background writer are doing some useful scanning,
+	 * which is helpful because a long memory isn't as desirable on the
+	 * density estimates.
+	 */
+	strategy_delta = bufs_to_lap - num_to_scan;
+	recent_alloc = reusable_buffers - reusable_buffers_est;
+	if (strategy_delta > 0 && recent_alloc > 0)
+	{
+		scans_per_alloc = (float) strategy_delta / (float) recent_alloc;
+		smoothed_density += (scans_per_alloc - smoothed_density) /
+			smoothing_samples;
+
+#ifdef BGW_DEBUG
+		elog(DEBUG2, "bgwriter: cleaner density alloc=%u scan=%ld density=%.2f new smoothed=%.2f",
+			 recent_alloc, strategy_delta, scans_per_alloc, smoothed_density);
+#endif
 	}
 }
 
 /*
  * SyncOneBuffer -- process a single buffer during syncing.
  *
- * If skip_pinned is true, we don't write currently-pinned buffers, nor
+ * If skip_recently_used is true, we don't write currently-pinned buffers, nor
  * buffers marked recently used, as these are not replacement candidates.
  *
- * Returns true if buffer was written, else false.	(This could be in error
- * if FlushBuffers finds the buffer clean after locking it, but we don't
- * care all that much.)
+ * Returns a bitmask containing the following flag bits:
+ *	BUF_WRITTEN: we wrote the buffer.
+ *	BUF_REUSABLE: buffer is available for replacement, ie, it has
+ *		pin count 0 and usage count 0.
+ *
+ * (BUF_WRITTEN could be set in error if FlushBuffers finds the buffer clean
+ * after locking it, but we don't care all that much.)
  *
  * Note: caller must have done ResourceOwnerEnlargeBuffers.
  */
-static bool
-SyncOneBuffer(int buf_id, bool skip_pinned)
+static int
+SyncOneBuffer(int buf_id, bool skip_recently_used)
 {
 	MIRROREDLOCK_BUFMGR_DECLARE;
 	
 	volatile BufferDesc *bufHdr = &BufferDescriptors[buf_id];
+	int			result = 0;
 
 	// -------- MirroredLock ----------
 	MIRROREDLOCK_BUFMGR_LOCK;
@@ -1337,21 +1661,26 @@ SyncOneBuffer(int buf_id, bool skip_pinned)
 	 * upcoming changes and so we are not required to write such dirty buffer.
 	 */
 	LockBufHdr(bufHdr);
-	if (!(bufHdr->flags & BM_VALID) || !(bufHdr->flags & BM_DIRTY))
+
+	if (bufHdr->refcount == 0 && bufHdr->usage_count == 0)
+		result |= BUF_REUSABLE;
+	else if (skip_recently_used)
 	{
+		/* Caller told us not to write recently-used buffers */
 		UnlockBufHdr(bufHdr);
 		MIRROREDLOCK_BUFMGR_UNLOCK;
 		// -------- MirroredLock ----------
-		return false;
+		return result;
 	}
-	if (skip_pinned &&
-		(bufHdr->refcount != 0 || bufHdr->usage_count != 0))
+
+	if (!(bufHdr->flags & BM_VALID) || !(bufHdr->flags & BM_DIRTY))
 	{
+		/* It's clean, so nothing to do */
 		UnlockBufHdr(bufHdr);
 		MIRROREDLOCK_BUFMGR_UNLOCK;
 		// -------- MirroredLock ----------
 
-		return false;
+		return result;
 	}
 	
 	/*
@@ -1364,12 +1693,12 @@ SyncOneBuffer(int buf_id, bool skip_pinned)
 	FlushBuffer(bufHdr, NULL);
 
 	ReleaseContentLock(bufHdr);
-	UnpinBuffer(bufHdr, true, false /* don't change freelist */ );
+	UnpinBuffer(bufHdr, true);
 
 	MIRROREDLOCK_BUFMGR_UNLOCK;
 	// -------- MirroredLock ----------
 
-	return true;
+	return result | BUF_WRITTEN;
 }
 
 
@@ -1483,7 +1812,7 @@ AtProcExit_Buffers(int code, Datum arg)
 			 * here, it suggests that ResourceOwners are messed up.
 			 */
 			PrivateRefCount[i] = 1;		/* make sure we release shared pin */
-			UnpinBuffer(buf, false, false /* don't change freelist */ );
+			UnpinBuffer(buf, false);
 			Assert(PrivateRefCount[i] == 0);
 		}
 	}
@@ -1525,17 +1854,21 @@ PrintBufferLeakWarning(Buffer buffer)
 }
 
 /*
- * FlushBufferPool
+ * CheckPointBuffers
+ *
+ * Flush all dirty blocks in buffer pool to disk at checkpoint time.
  *
- * Flush all dirty blocks in buffer pool to disk at the checkpoint time.
- * Local relations do not participate in checkpoints, so they don't need to be
- * flushed.
+ * Note: temporary relations do not participate in checkpoints, so they don't
+ * need to be flushed.
  */
 void
-FlushBufferPool(void)
+CheckPointBuffers(int flags)
 {
-	BufferSync();
+	CheckpointStats.ckpt_write_t = GetCurrentTimestamp();
+	BufferSync(flags);
+	CheckpointStats.ckpt_sync_t = GetCurrentTimestamp();
 	smgrsync();
+	CheckpointStats.ckpt_sync_end_t = GetCurrentTimestamp();
 }
 
 
@@ -2004,7 +2337,7 @@ FlushRelationBuffers(Relation rel)
 			AcquireContentLock(bufHdr, LW_SHARED);
 			FlushBuffer(bufHdr, rel->rd_smgr);
 			ReleaseContentLock(bufHdr);
-			UnpinBuffer(bufHdr, true, false /* no freelist change */ );
+			UnpinBuffer(bufHdr, true);
 		}
 		else
 			UnlockBufHdr(bufHdr);
@@ -2015,6 +2348,48 @@ FlushRelationBuffers(Relation rel)
 	}
 }
 
+/* ---------------------------------------------------------------------
+ *		FlushDatabaseBuffers
+ *
+ *		This function writes all dirty pages of a database out to disk
+ *		(or more accurately, out to kernel disk buffers), ensuring that the
+ *		kernel has an up-to-date view of the database.
+ *
+ *		Generally, the caller should be holding an appropriate lock to ensure
+ *		no other backend is active in the target database; otherwise more
+ *		pages could get dirtied.
+ *
+ *		Note we don't worry about flushing any pages of temporary relations.
+ *		It's assumed these wouldn't be interesting.
+ * --------------------------------------------------------------------
+ */
+void
+FlushDatabaseBuffers(Oid dbid)
+{
+	int			i;
+	volatile BufferDesc *bufHdr;
+
+	/* Make sure we can handle the pin inside the loop */
+	ResourceOwnerEnlargeBuffers(CurrentResourceOwner);
+
+	for (i = 0; i < NBuffers; i++)
+	{
+		bufHdr = &BufferDescriptors[i];
+		LockBufHdr(bufHdr);
+		if (bufHdr->tag.rnode.dbNode == dbid &&
+			(bufHdr->flags & BM_VALID) && (bufHdr->flags & BM_DIRTY))
+		{
+			PinBuffer_Locked(bufHdr);
+			LWLockAcquire(bufHdr->content_lock, LW_SHARED);
+			FlushBuffer(bufHdr, NULL);
+			LWLockRelease(bufHdr->content_lock);
+			UnpinBuffer(bufHdr, true);
+		}
+		else
+			UnlockBufHdr(bufHdr);
+	}
+}
+
 /*
  * ReleaseBuffer -- release the pin on a buffer
  */
@@ -2030,11 +2405,7 @@ ReleaseBuffer(Buffer buffer)
 	if (BufferIsLocal(buffer))
 	{
 		Assert(LocalRefCount[-buffer - 1] > 0);
-		bufHdr = &LocalBufferDescriptors[-buffer - 1];
 		LocalRefCount[-buffer - 1]--;
-		if (LocalRefCount[-buffer - 1] == 0 &&
-			bufHdr->usage_count < BM_MAX_USAGE_COUNT)
-			bufHdr->usage_count++;
 		return;
 	}
 
@@ -2045,7 +2416,7 @@ ReleaseBuffer(Buffer buffer)
 	if (PrivateRefCount[buffer - 1] > 1)
 		PrivateRefCount[buffer - 1]--;
 	else
-		UnpinBuffer(bufHdr, false, true);
+		UnpinBuffer(bufHdr, false);
 }
 
 
@@ -2285,6 +2656,55 @@ LockBufferForCleanup(Buffer buffer)
 	}
 }
 
+/*
+ * ConditionalLockBufferForCleanup - as above, but don't wait to get the lock
+ *
+ * We won't loop, but just check once to see if the pin count is OK.  If
+ * not, return FALSE with no lock held.
+ */
+bool
+ConditionalLockBufferForCleanup(Buffer buffer)
+{
+	volatile BufferDesc *bufHdr;
+
+	Assert(BufferIsValid(buffer));
+
+	if (BufferIsLocal(buffer))
+	{
+		/* There should be exactly one pin */
+		Assert(LocalRefCount[-buffer - 1] > 0);
+		if (LocalRefCount[-buffer - 1] != 1)
+			return false;
+		/* Nobody else to wait for */
+		return true;
+	}
+
+	/* There should be exactly one local pin */
+	Assert(PrivateRefCount[buffer - 1] > 0);
+	if (PrivateRefCount[buffer - 1] != 1)
+		return false;
+
+	/* Try to acquire lock */
+	if (!ConditionalLockBuffer(buffer))
+		return false;
+
+	bufHdr = &BufferDescriptors[buffer - 1];
+	LockBufHdr(bufHdr);
+	Assert(bufHdr->refcount > 0);
+	if (bufHdr->refcount == 1)
+	{
+		/* Successfully acquired exclusive lock with pincount 1 */
+		UnlockBufHdr(bufHdr);
+		return true;
+	}
+
+	/* Failed, so release the lock */
+	UnlockBufHdr(bufHdr);
+	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
+	return false;
+}
+
+
 /*
  *	Functions for buffer I/O handling
  *
@@ -2441,7 +2861,7 @@ TerminateBufferIO(volatile BufferDesc *buf, bool clear_dirty,
 	Assert(buf->flags & BM_IO_IN_PROGRESS);
 	buf->flags &= ~(BM_IO_IN_PROGRESS | BM_IO_ERROR);
 	if (clear_dirty && !(buf->flags & BM_JUST_DIRTIED))
-		buf->flags &= ~BM_DIRTY;
+		buf->flags &= ~(BM_DIRTY | BM_CHECKPOINT_NEEDED);
 	buf->flags |= set_flag_bits;
 
 	UnlockBufHdr(buf);
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 2c4858774d85..e6a9d0961c83 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/freelist.c,v 1.58 2007/01/05 22:19:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/freelist.c,v 1.64 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,13 +34,56 @@ typedef struct
 	 * NOTE: lastFreeBuffer is undefined when firstFreeBuffer is -1 (that is,
 	 * when the list is empty)
 	 */
+
+	/*
+	 * Statistics.	These counters should be wide enough that they can't
+	 * overflow during a single bgwriter cycle.
+	 */
+	uint32		completePasses; /* Complete cycles of the clock sweep */
+	uint32		numBufferAllocs;	/* Buffers allocated since last reset */
 } BufferStrategyControl;
 
 /* Pointers to shared state */
 static BufferStrategyControl *StrategyControl = NULL;
 
-/* Backend-local state about whether currently vacuuming */
-bool		strategy_hint_vacuum = false;
+/*
+ * Private (non-shared) state for managing a ring of shared buffers to re-use.
+ * This is currently the only kind of BufferAccessStrategy object, but someday
+ * we might have more kinds.
+ */
+typedef struct BufferAccessStrategyData
+{
+	/* Overall strategy type */
+	BufferAccessStrategyType btype;
+	/* Number of elements in buffers[] array */
+	int			ring_size;
+
+	/*
+	 * Index of the "current" slot in the ring, ie, the one most recently
+	 * returned by GetBufferFromRing.
+	 */
+	int			current;
+
+	/*
+	 * True if the buffer just returned by StrategyGetBuffer had been in the
+	 * ring already.
+	 */
+	bool		current_was_in_ring;
+
+	/*
+	 * Array of buffer numbers.  InvalidBuffer (that is, zero) indicates we
+	 * have not yet selected a buffer for this ring slot.  For allocation
+	 * simplicity this is palloc'd together with the fixed fields of the
+	 * struct.
+	 */
+	Buffer		buffers[1];		/* VARIABLE SIZE ARRAY */
+} BufferAccessStrategyData;
+
+
+/* Prototypes for internal functions */
+static volatile BufferDesc *GetBufferFromRing(BufferAccessStrategy strategy);
+static void AddBufferToRing(BufferAccessStrategy strategy,
+				volatile BufferDesc *buf);
 
 
 /*
@@ -50,19 +93,47 @@ bool		strategy_hint_vacuum = false;
  *	BufferAlloc(). The only hard requirement BufferAlloc() has is that
  *	the selected buffer must not currently be pinned by anyone.
  *
+ *	strategy is a BufferAccessStrategy object, or NULL for default strategy.
+ *
  *	To ensure that no one else can pin the buffer before we do, we must
- *	return the buffer with the buffer header spinlock still held.  That
- *	means that we return with the BufFreelistLock still held, as well;
- *	the caller must release that lock once the spinlock is dropped.
+ *	return the buffer with the buffer header spinlock still held.  If
+ *	*lock_held is set on exit, we have returned with the BufFreelistLock
+ *	still held, as well; the caller must release that lock once the spinlock
+ *	is dropped.  We do it that way because releasing the BufFreelistLock
+ *	might awaken other processes, and it would be bad to do the associated
+ *	kernel calls while holding the buffer header spinlock.
  */
 volatile BufferDesc *
-StrategyGetBuffer(void)
+StrategyGetBuffer(BufferAccessStrategy strategy, bool *lock_held)
 {
 	volatile BufferDesc *buf;
 	int			trycounter;
 
+	/*
+	 * If given a strategy object, see whether it can select a buffer. We
+	 * assume strategy objects don't need the BufFreelistLock.
+	 */
+	if (strategy != NULL)
+	{
+		buf = GetBufferFromRing(strategy);
+		if (buf != NULL)
+		{
+			*lock_held = false;
+			return buf;
+		}
+	}
+
+	/* Nope, so lock the freelist */
+	*lock_held = true;
 	LWLockAcquire(BufFreelistLock, LW_EXCLUSIVE);
 
+	/*
+	 * We count buffer allocation requests so that the bgwriter can estimate
+	 * the rate of buffer consumption.	Note that buffers recycled by a
+	 * strategy object are intentionally not counted here.
+	 */
+	StrategyControl->numBufferAllocs++;
+
 	/*
 	 * Try to get a buffer from the freelist.  Note that the freeNext fields
 	 * are considered to be protected by the BufFreelistLock not the
@@ -82,11 +153,16 @@ StrategyGetBuffer(void)
 		 * If the buffer is pinned or has a nonzero usage_count, we cannot use
 		 * it; discard it and retry.  (This can only happen if VACUUM put a
 		 * valid buffer in the freelist and then someone else used it before
-		 * we got to it.)
+		 * we got to it.  It's probably impossible altogether as of 8.3, but
+		 * we'd better check anyway.)
 		 */
 		LockBufHdr(buf);
 		if (buf->refcount == 0 && buf->usage_count == 0)
+		{
+			if (strategy != NULL)
+				AddBufferToRing(strategy, buf);
 			return buf;
+		}
 		UnlockBufHdr(buf);
 	}
 
@@ -97,19 +173,30 @@ StrategyGetBuffer(void)
 		buf = &BufferDescriptors[StrategyControl->nextVictimBuffer];
 
 		if (++StrategyControl->nextVictimBuffer >= NBuffers)
+		{
 			StrategyControl->nextVictimBuffer = 0;
+			StrategyControl->completePasses++;
+		}
 
 		/*
 		 * If the buffer is pinned or has a nonzero usage_count, we cannot use
-		 * it; decrement the usage_count and keep scanning.
+		 * it; decrement the usage_count (unless pinned) and keep scanning.
 		 */
 		LockBufHdr(buf);
-		if (buf->refcount == 0 && buf->usage_count == 0)
-			return buf;
-		if (buf->usage_count > 0)
+		if (buf->refcount == 0)
 		{
-			buf->usage_count--;
-			trycounter = NBuffers;
+			if (buf->usage_count > 0)
+			{
+				buf->usage_count--;
+				trycounter = NBuffers;
+			}
+			else
+			{
+				/* Found a usable buffer */
+				if (strategy != NULL)
+					AddBufferToRing(strategy, buf);
+				return buf;
+			}
 		}
 		else if (--trycounter == 0)
 		{
@@ -138,13 +225,9 @@ StrategyGetBuffer(void)
 
 /*
  * StrategyFreeBuffer: put a buffer on the freelist
- *
- * The buffer is added either at the head or the tail, according to the
- * at_head parameter.  This allows a small amount of control over how
- * quickly the buffer is reused.
  */
 void
-StrategyFreeBuffer(volatile BufferDesc *buf, bool at_head)
+StrategyFreeBuffer(volatile BufferDesc *buf)
 {
 	LWLockAcquire(BufFreelistLock, LW_EXCLUSIVE);
 
@@ -154,22 +237,10 @@ StrategyFreeBuffer(volatile BufferDesc *buf, bool at_head)
 	 */
 	if (buf->freeNext == FREENEXT_NOT_IN_LIST)
 	{
-		if (at_head)
-		{
-			buf->freeNext = StrategyControl->firstFreeBuffer;
-			if (buf->freeNext < 0)
-				StrategyControl->lastFreeBuffer = buf->buf_id;
-			StrategyControl->firstFreeBuffer = buf->buf_id;
-		}
-		else
-		{
-			buf->freeNext = FREENEXT_END_OF_LIST;
-			if (StrategyControl->firstFreeBuffer < 0)
-				StrategyControl->firstFreeBuffer = buf->buf_id;
-			else
-				BufferDescriptors[StrategyControl->lastFreeBuffer].freeNext = buf->buf_id;
+		buf->freeNext = StrategyControl->firstFreeBuffer;
+		if (buf->freeNext < 0)
 			StrategyControl->lastFreeBuffer = buf->buf_id;
-		}
+		StrategyControl->firstFreeBuffer = buf->buf_id;
 	}
 
 	LWLockRelease(BufFreelistLock);
@@ -180,31 +251,30 @@ StrategyFreeBuffer(volatile BufferDesc *buf, bool at_head)
  *
  * The result is the buffer index of the best buffer to sync first.
  * BufferSync() will proceed circularly around the buffer array from there.
+ *
+ * In addition, we return the completed-pass count (which is effectively
+ * the higher-order bits of nextVictimBuffer) and the count of recent buffer
+ * allocs if non-NULL pointers are passed.	The alloc count is reset after
+ * being read.
  */
 int
-StrategySyncStart(void)
+StrategySyncStart(uint32 *complete_passes, uint32 *num_buf_alloc)
 {
 	int			result;
 
-	/*
-	 * We could probably dispense with the locking here, but just to be safe
-	 * ...
-	 */
 	LWLockAcquire(BufFreelistLock, LW_EXCLUSIVE);
 	result = StrategyControl->nextVictimBuffer;
+	if (complete_passes)
+		*complete_passes = StrategyControl->completePasses;
+	if (num_buf_alloc)
+	{
+		*num_buf_alloc = StrategyControl->numBufferAllocs;
+		StrategyControl->numBufferAllocs = 0;
+	}
 	LWLockRelease(BufFreelistLock);
 	return result;
 }
 
-/*
- * StrategyHintVacuum -- tell us whether VACUUM is active
- */
-void
-StrategyHintVacuum(bool vacuum_active)
-{
-	strategy_hint_vacuum = vacuum_active;
-}
-
 
 /*
  * StrategyShmemSize
@@ -276,7 +346,183 @@ StrategyInitialize(bool init)
 
 		/* Initialize the clock sweep pointer */
 		StrategyControl->nextVictimBuffer = 0;
+
+		/* Clear statistics */
+		StrategyControl->completePasses = 0;
+		StrategyControl->numBufferAllocs = 0;
 	}
 	else
 		Assert(!init);
 }
+
+
+/* ----------------------------------------------------------------
+ *				Backend-private buffer ring management
+ * ----------------------------------------------------------------
+ */
+
+
+/*
+ * GetAccessStrategy -- create a BufferAccessStrategy object
+ *
+ * The object is allocated in the current memory context.
+ */
+BufferAccessStrategy
+GetAccessStrategy(BufferAccessStrategyType btype)
+{
+	BufferAccessStrategy strategy;
+	int			ring_size;
+
+	/*
+	 * Select ring size to use.  See buffer/README for rationales. (Currently
+	 * all cases are the same size, but keep this code structure for
+	 * flexibility.)
+	 *
+	 * Note: if you change the ring size for BAS_BULKREAD, see also
+	 * SYNC_SCAN_REPORT_INTERVAL in access/heap/syncscan.c.
+	 */
+	switch (btype)
+	{
+		case BAS_NORMAL:
+			/* if someone asks for NORMAL, just give 'em a "default" object */
+			return NULL;
+
+		case BAS_BULKREAD:
+			ring_size = 256 * 1024 / BLCKSZ;
+			break;
+		case BAS_VACUUM:
+			ring_size = 256 * 1024 / BLCKSZ;
+			break;
+
+		default:
+			elog(ERROR, "unrecognized buffer access strategy: %d",
+				 (int) btype);
+			return NULL;		/* keep compiler quiet */
+	}
+
+	/* Make sure ring isn't an undue fraction of shared buffers */
+	ring_size = Min(NBuffers / 8, ring_size);
+
+	/* Allocate the object and initialize all elements to zeroes */
+	strategy = (BufferAccessStrategy)
+		palloc0(offsetof(BufferAccessStrategyData, buffers) +
+				ring_size * sizeof(Buffer));
+
+	/* Set fields that don't start out zero */
+	strategy->btype = btype;
+	strategy->ring_size = ring_size;
+
+	return strategy;
+}
+
+/*
+ * FreeAccessStrategy -- release a BufferAccessStrategy object
+ *
+ * A simple pfree would do at the moment, but we would prefer that callers
+ * don't assume that much about the representation of BufferAccessStrategy.
+ */
+void
+FreeAccessStrategy(BufferAccessStrategy strategy)
+{
+	/* don't crash if called on a "default" strategy */
+	if (strategy != NULL)
+		pfree(strategy);
+}
+
+/*
+ * GetBufferFromRing -- returns a buffer from the ring, or NULL if the
+ *		ring is empty.
+ *
+ * The bufhdr spin lock is held on the returned buffer.
+ */
+static volatile BufferDesc *
+GetBufferFromRing(BufferAccessStrategy strategy)
+{
+	volatile BufferDesc *buf;
+	Buffer		bufnum;
+
+	/* Advance to next ring slot */
+	if (++strategy->current >= strategy->ring_size)
+		strategy->current = 0;
+
+	/*
+	 * If the slot hasn't been filled yet, tell the caller to allocate a new
+	 * buffer with the normal allocation strategy.	He will then fill this
+	 * slot by calling AddBufferToRing with the new buffer.
+	 */
+	bufnum = strategy->buffers[strategy->current];
+	if (bufnum == InvalidBuffer)
+	{
+		strategy->current_was_in_ring = false;
+		return NULL;
+	}
+
+	/*
+	 * If the buffer is pinned we cannot use it under any circumstances.
+	 *
+	 * If usage_count is 0 or 1 then the buffer is fair game (we expect 1,
+	 * since our own previous usage of the ring element would have left it
+	 * there, but it might've been decremented by clock sweep since then). A
+	 * higher usage_count indicates someone else has touched the buffer, so we
+	 * shouldn't re-use it.
+	 */
+	buf = &BufferDescriptors[bufnum - 1];
+	LockBufHdr(buf);
+	if (buf->refcount == 0 && buf->usage_count <= 1)
+	{
+		strategy->current_was_in_ring = true;
+		return buf;
+	}
+	UnlockBufHdr(buf);
+
+	/*
+	 * Tell caller to allocate a new buffer with the normal allocation
+	 * strategy.  He'll then replace this ring element via AddBufferToRing.
+	 */
+	strategy->current_was_in_ring = false;
+	return NULL;
+}
+
+/*
+ * AddBufferToRing -- add a buffer to the buffer ring
+ *
+ * Caller must hold the buffer header spinlock on the buffer.  Since this
+ * is called with the spinlock held, it had better be quite cheap.
+ */
+static void
+AddBufferToRing(BufferAccessStrategy strategy, volatile BufferDesc *buf)
+{
+	strategy->buffers[strategy->current] = BufferDescriptorGetBuffer(buf);
+}
+
+/*
+ * StrategyRejectBuffer -- consider rejecting a dirty buffer
+ *
+ * When a nondefault strategy is used, the buffer manager calls this function
+ * when it turns out that the buffer selected by StrategyGetBuffer needs to
+ * be written out and doing so would require flushing WAL too.	This gives us
+ * a chance to choose a different victim.
+ *
+ * Returns true if buffer manager should ask for a new victim, and false
+ * if this buffer should be written and re-used.
+ */
+bool
+StrategyRejectBuffer(BufferAccessStrategy strategy, volatile BufferDesc *buf)
+{
+	/* We only do this in bulkread mode */
+	if (strategy->btype != BAS_BULKREAD)
+		return false;
+
+	/* Don't muck with behavior of normal buffer-replacement strategy */
+	if (!strategy->current_was_in_ring ||
+	  strategy->buffers[strategy->current] != BufferDescriptorGetBuffer(buf))
+		return false;
+
+	/*
+	 * Remove the dirty buffer from the ring; necessary to prevent infinite
+	 * loop if all ring members are dirty.
+	 */
+	strategy->buffers[strategy->current] = InvalidBuffer;
+
+	return true;
+}
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index b091c28cef24..9bb612b144c0 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/localbuf.c,v 1.76 2007/01/05 22:19:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/localbuf.c,v 1.79 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,8 @@ static Block GetLocalBufferStorage(void);
  *
  * API is similar to bufmgr.c's BufferAlloc, except that we do not need
  * to do any locking since this is all local.	Also, IO_IN_PROGRESS
- * does not get set.
+ * does not get set.  Lastly, we support only default access strategy
+ * (hence, usage_count is always advanced).
  */
 BufferDesc *
 LocalBufferAlloc(SMgrRelation smgr, BlockNumber blockNum, bool *foundPtr)
@@ -90,7 +91,12 @@ LocalBufferAlloc(SMgrRelation smgr, BlockNumber blockNum, bool *foundPtr)
 		fprintf(stderr, "LB ALLOC (%u,%d) %d\n",
 				RelationGetRelid(reln), blockNum, -b - 1);
 #endif
-
+		/* this part is equivalent to PinBuffer for a shared buffer */
+		if (LocalRefCount[b] == 0)
+		{
+			if (bufHdr->usage_count < BM_MAX_USAGE_COUNT)
+				bufHdr->usage_count++;
+		}
 		LocalRefCount[b]++;
 		ResourceOwnerRememberBuffer(CurrentResourceOwner,
 									BufferDescriptorGetBuffer(bufHdr));
@@ -123,18 +129,21 @@ LocalBufferAlloc(SMgrRelation smgr, BlockNumber blockNum, bool *foundPtr)
 
 		bufHdr = &LocalBufferDescriptors[b];
 
-		if (LocalRefCount[b] == 0 && bufHdr->usage_count == 0)
-		{
-			LocalRefCount[b]++;
-			ResourceOwnerRememberBuffer(CurrentResourceOwner,
-										BufferDescriptorGetBuffer(bufHdr));
-			break;
-		}
-
-		if (bufHdr->usage_count > 0)
+		if (LocalRefCount[b] == 0)
 		{
-			bufHdr->usage_count--;
-			trycounter = NLocBuffer;
+			if (bufHdr->usage_count > 0)
+			{
+				bufHdr->usage_count--;
+				trycounter = NLocBuffer;
+			}
+			else
+			{
+				/* Found a usable buffer */
+				LocalRefCount[b]++;
+				ResourceOwnerRememberBuffer(CurrentResourceOwner,
+										  BufferDescriptorGetBuffer(bufHdr));
+				break;
+			}
 		}
 		else if (--trycounter == 0)
 			ereport(ERROR,
@@ -206,7 +215,7 @@ LocalBufferAlloc(SMgrRelation smgr, BlockNumber blockNum, bool *foundPtr)
 	bufHdr->tag = newTag;
 	bufHdr->flags &= ~(BM_VALID | BM_DIRTY | BM_JUST_DIRTIED | BM_IO_ERROR);
 	bufHdr->flags |= BM_TAG_VALID;
-	bufHdr->usage_count = 0;
+	bufHdr->usage_count = 1;
 
 	*foundPtr = FALSE;
 	return bufHdr;
@@ -360,7 +369,7 @@ GetLocalBufferStorage(void)
 	if (next_buf_in_block >= num_bufs_in_block)
 	{
 		/* Need to make a new request to memmgr */
-		int		num_bufs;
+		int			num_bufs;
 
 		/* Start with a 16-buffer request; subsequent ones double each time */
 		num_bufs = Max(num_bufs_in_block * 2, 16);
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index 937528ab959f..aa014830b1e8 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/file/buffile.c,v 1.24.2.1 2007/06/01 23:43:17 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/file/buffile.c,v 1.29 2008/01/01 19:45:51 momjian Exp $
  *
  * NOTES:
  *
@@ -64,7 +64,7 @@ static void BufFileUpdateSize(BufFile *buffile);
 
 /*
  * Create a BufFile given the first underlying physical file.
- * NOTE: caller must set isTemp true if appropriate.
+ * NOTE: caller must set isTemp if appropriate.
  */
 static BufFile *
 makeBufFile(File firstfile)
@@ -123,6 +123,11 @@ BufFileCreateTemp(const char *filePrefix, bool interXact)
  *
  * Does not add the pgsql_tmp/ prefix to the file path before creating.
  *
+ * If interXact is true, the temp file will not be automatically deleted
+ * at end of transaction.
+ *
+ * Note: if interXact is true, the caller had better be calling us in a
+ * memory context that will survive across transaction boundaries.
  */
 BufFile *
 BufFileCreateFile(const char *fileName, bool delOnClose, bool interXact)
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 750480fc9619..5f241835d3e8 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.134 2007/01/09 22:03:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.143.2.1 2009/12/03 11:03:44 heikki Exp $
  *
  * NOTES:
  *
@@ -49,10 +49,12 @@
 
 #include "miscadmin.h"
 #include "access/xact.h"
+#include "catalog/pg_tablespace.h"
 #include "cdb/cdbfilerep.h"
 #include "storage/fd.h"
 #include "storage/ipc.h"
 #include "utils/guc.h"
+#include "utils/resowner.h"
 #include "utils/workfile_mgr.h"
 #include "utils/faultinjector.h"
 
@@ -132,7 +134,7 @@ typedef struct vfd
 {
 	int fd;			/* current FD, or VFD_CLOSED if none */
 	unsigned short fdstate;		/* bitflags for VFD's state */
-	SubTransactionId create_subid;		/* for TEMPORARY fds, creating subxact */
+	ResourceOwner resowner;		/* owner, for automatic cleanup */
 	File		nextFree;		/* link to next free VFD, if in freelist */
 	File		lruMoreRecently;	/* doubly linked recency-of-use list */
 	File		lruLessRecently;
@@ -192,6 +194,14 @@ static AllocateDesc allocatedDescs[MAX_ALLOCATED_DESCS];
  */
 static long tempFileCounter = 0;
 
+/*
+ * Array of OIDs of temp tablespaces.  When numTempTableSpaces is -1,
+ * this has not been set in the current transaction.
+ */
+static Oid *tempTableSpaces = NULL;
+static int	numTempTableSpaces = -1;
+static int	nextTempTableSpace = 0;
+
 
 /*--------------------
  *
@@ -246,12 +256,13 @@ static bool HasTempFilePrefix(char * fileName);
 int
 pg_fsync(int fd)
 {
-#ifndef HAVE_FSYNC_WRITETHROUGH_ONLY
-	if (sync_method != SYNC_METHOD_FSYNC_WRITETHROUGH)
-		return pg_fsync_no_writethrough(fd);
+	/* #if is to skip the sync_method test if there's no need for it */
+#if defined(HAVE_FSYNC_WRITETHROUGH) && !defined(FSYNC_WRITETHROUGH_IS_FSYNC)
+	if (sync_method == SYNC_METHOD_FSYNC_WRITETHROUGH)
+		return pg_fsync_writethrough(fd);
 	else
 #endif
-		return pg_fsync_writethrough(fd);
+		return pg_fsync_no_writethrough(fd);
 }
 
 
@@ -870,6 +881,7 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	vfdP->fileMode = fileMode;
 	vfdP->seekPos = INT64CONST(0);
 	vfdP->fdstate = 0x0;
+	vfdP->resowner = NULL;
 
 	return file;
 }
@@ -883,7 +895,7 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
  * prepends DatabasePath or path of the filespace to it and then
  * acts like PathNameOpenFile.
  */
-File
+static File
 FileNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 {
 	File		fd;
@@ -895,6 +907,16 @@ FileNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	return fd;
 }
 
+/* GPDB_83_MERGE_FIXME: Commit acfce502 changed things so that PostgreSQL
+ * no longer stores temporary files in the database directories, but in
+ * $PGDATA/pgsql_tmp, or within a tablespace's pgsql_tmp dir. But
+ * GPDB also has a concept of "temp filespaces", and there's something
+ * funny going on with mirroring, as we used "getCurrentTempFilePath"
+ * (which is a macro!) instead of straight DatabasePath in GPDB.
+ *
+ * So I just left this code as it was, i.e. I didn't merge the upstream
+ * changes. This will need to be investigated.
+ */
 /*
  * Open a temporary file that will (optionally) disappear when we close it.
  *
@@ -980,6 +1002,8 @@ OpenNamedFile(const char   *fileName,
 	File		file;
 	int			fileFlags;
 
+	ResourceOwnerEnlargeFiles(CurrentResourceOwner);
+
 	strncpy(tempfilepath, fileName, sizeof(tempfilepath));
 
 	/*
@@ -1029,7 +1053,9 @@ OpenNamedFile(const char   *fileName,
 	if (closeAtEOXact)
 	{
 		VfdCache[file].fdstate |= FD_CLOSE_AT_EOXACT;
-		VfdCache[file].create_subid = GetCurrentSubTransactionId();
+
+		ResourceOwnerRememberFile(CurrentResourceOwner, file);
+		VfdCache[file].resowner = CurrentResourceOwner;
 	}
 
 	return file;
@@ -1042,8 +1068,7 @@ OpenNamedFile(const char   *fileName,
 void
 FileClose(File file)
 {
-	Vfd			*vfdP;
-	struct stat	filestats;
+	Vfd		   *vfdP;
 
 	Assert(FileIsValid(file));
 
@@ -1059,60 +1084,73 @@ FileClose(File file)
 
 		/* close the file */
 		if (gp_retry_close(vfdP->fd))
-			elog(ERROR, "could not close file \"%s\": %m",
-				 vfdP->fileName);
+			elog(ERROR, "could not close file \"%s\": %m", vfdP->fileName);
 
 		--nfile;
 		vfdP->fd = VFD_CLOSED;
 	}
 
 	/*
-	 * Delete the file if it was temporary
+	 * Delete the file if it was temporary, and make a log entry if wanted
 	 */
 	if (vfdP->fdstate & FD_TEMPORARY)
 	{
-		/* reset flag so that die() interrupt won't cause problems */
+		/*
+		 * If we get an error, as could happen within the ereport/elog calls,
+		 * we'll come right back here during transaction abort.  Reset the
+		 * flag to ensure that we can't get into an infinite loop.  This code
+		 * is arranged to ensure that the worst-case consequence is failing
+		 * to emit log message(s), not failing to attempt the unlink.
+		 */
 		vfdP->fdstate &= ~FD_TEMPORARY;
 		if (log_temp_files >= 0)
 		{
-			if (stat(vfdP->fileName, &filestats) == 0)
+			struct stat filestats;
+			int		stat_errno;
+
+			/* first try the stat() */
+			if (stat(vfdP->fileName, &filestats))
+				stat_errno = errno;
+			else
+				stat_errno = 0;
+
+			/* in any case do the unlink */
+			if (unlink(vfdP->fileName))
+				elog(LOG, "could not unlink file \"%s\": %m", vfdP->fileName);
+
+			/* and last report the stat results */
+			if (stat_errno == 0)
 			{
 				if (filestats.st_size >= log_temp_files)
 					ereport(LOG,
-						(errmsg("temp file: path \"%s\" size %lu",
-						 vfdP->fileName, (unsigned long)filestats.st_size)));
+							(errmsg("temporary file: path \"%s\", size %lu",
+									vfdP->fileName,
+									(unsigned long) filestats.st_size)));
 			}
 			else
-				elog(LOG, "Could not stat \"%s\": %m", vfdP->fileName);
+			{
+				errno = stat_errno;
+				elog(LOG, "could not stat file \"%s\": %m", vfdP->fileName);
+			}
+		}
+		else
+		{
+			/* easy case, just do the unlink */
+			if (unlink(vfdP->fileName))
+				elog(LOG, "could not unlink file \"%s\": %m", vfdP->fileName);
 		}
-		if (unlink(vfdP->fileName))
-			elog(DEBUG1, "failed to unlink \"%s\": %m",
-				 vfdP->fileName);
 	}
 
+	/* Unregister it from the resource owner */
+	if (vfdP->resowner)
+		ResourceOwnerForgetFile(vfdP->resowner, file);
+
 	/*
 	 * Return the Vfd slot to the free list
 	 */
 	FreeVfd(file);
 }
 
-/*
- * close a file and forcibly delete the underlying Unix file
- */
-void
-FileUnlink(File file)
-{
-	Assert(FileIsValid(file));
-
-	DO_DB(elog(LOG, "FileUnlink: %d (%s)",
-	     file, VfdCache[file].fileName));
-
-	/* force FileClose to delete it */
-	VfdCache[file].fdstate |= FD_TEMPORARY;
-
-	FileClose(file);
-}
-
 int
 FileRead(File file, char *buffer, int amount)
 {
@@ -1772,6 +1810,70 @@ closeAllVfds(void)
 	}
 }
 
+
+/*
+ * SetTempTablespaces
+ *
+ * Define a list (actually an array) of OIDs of tablespaces to use for
+ * temporary files.  This list will be used until end of transaction,
+ * unless this function is called again before then.  It is caller's
+ * responsibility that the passed-in array has adequate lifespan (typically
+ * it'd be allocated in TopTransactionContext).
+ */
+void
+SetTempTablespaces(Oid *tableSpaces, int numSpaces)
+{
+	Assert(numSpaces >= 0);
+	tempTableSpaces = tableSpaces;
+	numTempTableSpaces = numSpaces;
+
+	/*
+	 * Select a random starting point in the list.	This is to minimize
+	 * conflicts between backends that are most likely sharing the same list
+	 * of temp tablespaces.  Note that if we create multiple temp files in the
+	 * same transaction, we'll advance circularly through the list --- this
+	 * ensures that large temporary sort files are nicely spread across all
+	 * available tablespaces.
+	 */
+	if (numSpaces > 1)
+		nextTempTableSpace = random() % numSpaces;
+	else
+		nextTempTableSpace = 0;
+}
+
+/*
+ * TempTablespacesAreSet
+ *
+ * Returns TRUE if SetTempTablespaces has been called in current transaction.
+ * (This is just so that tablespaces.c doesn't need its own per-transaction
+ * state.)
+ */
+bool
+TempTablespacesAreSet(void)
+{
+	return (numTempTableSpaces >= 0);
+}
+
+/*
+ * GetNextTempTableSpace
+ *
+ * Select the next temp tablespace to use.	A result of InvalidOid means
+ * to use the current database's default tablespace.
+ */
+Oid
+GetNextTempTableSpace(void)
+{
+	if (numTempTableSpaces > 0)
+	{
+		/* Advance nextTempTableSpace counter with wraparound */
+		if (++nextTempTableSpace >= numTempTableSpaces)
+			nextTempTableSpace = 0;
+		return tempTableSpaces[nextTempTableSpace];
+	}
+	return InvalidOid;
+}
+
+
 /*
  * AtEOSubXact_Files
  *
@@ -1785,24 +1887,6 @@ AtEOSubXact_Files(bool isCommit, SubTransactionId mySubid,
 {
 	Index		i;
 
-	if (SizeVfdCache > 0)
-	{
-		Assert(FileIsNotOpen(0));		/* Make sure ring not corrupted */
-		for (i = 1; i < SizeVfdCache; i++)
-		{
-			unsigned short fdstate = VfdCache[i].fdstate;
-
-			if ((fdstate & FD_CLOSE_AT_EOXACT) &&
-				VfdCache[i].create_subid == mySubid)
-			{
-				if (isCommit)
-					VfdCache[i].create_subid = parentSubid;
-				else if (VfdCache[i].fileName != NULL)
-					FileClose(i);
-			}
-		}
-	}
-
 	for (i = 0; i < numAllocatedDescs; i++)
 	{
 		if (allocatedDescs[i].create_subid == mySubid)
@@ -1823,13 +1907,17 @@ AtEOSubXact_Files(bool isCommit, SubTransactionId mySubid,
  *
  * This routine is called during transaction commit or abort (it doesn't
  * particularly care which).  All still-open per-transaction temporary file
- * VFDs are closed, which also causes the underlying files to be
- * deleted. Furthermore, all "allocated" stdio files are closed.
+ * VFDs are closed, which also causes the underlying files to be deleted
+ * (although they should've been closed already by the ResourceOwner
+ * cleanup). Furthermore, all "allocated" stdio files are closed. We also
+ * forget any transaction-local temp tablespace list.
  */
 void
 AtEOXact_Files(void)
 {
 	CleanupTempFiles(false);
+	tempTableSpaces = NULL;
+	numTempTableSpaces = -1;
 }
 
 /*
@@ -1865,18 +1953,24 @@ CleanupTempFiles(bool isProcExit)
 		{
 			unsigned short fdstate = VfdCache[i].fdstate;
 
-			/*
-			 * If we're in the process of exiting a backend process, close
-			 * all temporary files. Otherwise, only close temporary files
-			 * local to the current transaction.
-			 */
-			if((fdstate & FD_CLOSE_AT_EOXACT)
-			  	||
-			   (isProcExit && (fdstate & FD_TEMPORARY))
-			  )
+			if ((fdstate & (FD_TEMPORARY | FD_CLOSE_AT_EOXACT)) && VfdCache[i].fileName != NULL)
 			{
-				AssertImply( (fdstate & FD_TEMPORARY), VfdCache[i].fileName != NULL);
-				FileClose(i);
+				/*
+				 * If we're in the process of exiting a backend process, close
+				 * all temporary files. Otherwise, only close temporary files
+				 * local to the current transaction. They should be closed
+				 * by the ResourceOwner mechanism already, so this is just
+				 * a debugging cross-check.
+				 */
+				if (isProcExit)
+					FileClose(i);
+				else if (fdstate & FD_CLOSE_AT_EOXACT)
+				{
+					elog(WARNING,
+						 "temporary file %s not closed at end-of-transaction",
+						 VfdCache[i].fileName);
+					FileClose(i);
+				}
 			}
 		}
 	}
@@ -2044,3 +2138,16 @@ static bool HasTempFilePrefix(char * fileName)
 
 	return matching_dir;
 }
+
+/*
+ * Set the file as temporary to ensure that FileClose() removes it on exit.
+ * This mimics the old FileUnlin() behavior that was removed in PostgreSQL
+ * 8.3 but that Greenplum still use.
+ */
+void
+SetDeleteOnExit(File file)
+{
+	Assert(FileIsValid(file));
+
+	VfdCache[file].fdstate |= FD_TEMPORARY;
+}
diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c
index a905b44b4220..e536d0fb6906 100644
--- a/src/backend/storage/freespace/freespace.c
+++ b/src/backend/storage/freespace/freespace.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.58 2007/01/05 22:19:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.59 2008/01/01 19:45:51 momjian Exp $
  *
  *
  * NOTES:
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index ecc80fa14aff..a69d99c68dc0 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -24,12 +24,13 @@
 #include <sys/stat.h>
 
 #include "cdb/cdbdisp_thread.h"
+#include "libpq/pqsignal.h"
 #include "miscadmin.h"
 #ifdef PROFILE_PID_DIR
 #include "postmaster/autovacuum.h"
 #endif
 #include "storage/ipc.h"
-#include "libpq/pqsignal.h"
+#include "tcop/tcopprot.h"
 
 
 /*
@@ -184,6 +185,8 @@ proc_exit_prepare(int code)
 	 * case of elog(FATAL) for example.)
 	 */
 	error_context_stack = NULL;
+	/* For the same reason, reset debug_query_string before it's clobbered */
+	debug_query_string = NULL;
 
 	/*
 	 * Make sure threads get cleaned up: there might be still ongoing
@@ -212,6 +215,8 @@ proc_exit_prepare(int code)
 	*/
 	WaitInterconnectQuit();
 
+	elog(DEBUG3, "proc_exit(%d)", code);
+
 	/* do our shared memory exits first */
 	shmem_exit(code);
 
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index edccca55aa3e..a9a197468275 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -216,6 +216,9 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
 			 (unsigned long) size);
 
 		size = add_size(size, BgWriterShmemSize());
+		size = add_size(size, AutoVacuumShmemSize());
+		size = add_size(size, BTreeShmemSize());
+		size = add_size(size, SyncScanShmemSize());
 		size = add_size(size, CheckpointShmemSize());
 
 		size = add_size(size, WalSndShmemSize());
@@ -408,6 +411,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
 	 * Set up other modules that need some shared memory space
 	 */
 	BTreeShmemInit();
+	SyncScanShmemInit();
 	workfile_mgr_cache_init();
 
 #ifdef EXEC_BACKEND
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index abbbca5f1338..bda31078ced8 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -23,7 +23,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.21 2007/01/16 13:28:56 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.40.2.2 2009/07/29 15:57:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,13 +70,19 @@ static ProcArrayStruct *procArray;
 
 /* counters for XidCache measurement */
 static long xc_by_recent_xmin = 0;
+static long xc_by_my_xact = 0;
+static long xc_by_latest_xid = 0;
 static long xc_by_main_xid = 0;
 static long xc_by_child_xid = 0;
+static long xc_no_overflow = 0;
 static long xc_slow_answer = 0;
 
 #define xc_by_recent_xmin_inc()		(xc_by_recent_xmin++)
+#define xc_by_my_xact_inc()			(xc_by_my_xact++)
+#define xc_by_latest_xid_inc()		(xc_by_latest_xid++)
 #define xc_by_main_xid_inc()		(xc_by_main_xid++)
 #define xc_by_child_xid_inc()		(xc_by_child_xid++)
+#define xc_no_overflow_inc()		(xc_no_overflow++)
 #define xc_slow_answer_inc()		(xc_slow_answer++)
 
 static void DisplayXidCache(void);
@@ -84,8 +90,11 @@ static void DisplayXidCache(void);
 #else							/* !XIDCACHE_DEBUG */
 
 #define xc_by_recent_xmin_inc()		((void) 0)
+#define xc_by_my_xact_inc()			((void) 0)
+#define xc_by_latest_xid_inc()		((void) 0)
 #define xc_by_main_xid_inc()		((void) 0)
 #define xc_by_child_xid_inc()		((void) 0)
+#define xc_no_overflow_inc()		((void) 0)
 #define xc_slow_answer_inc()		((void) 0)
 #endif   /* XIDCACHE_DEBUG */
 
@@ -165,9 +174,16 @@ ProcArrayAdd(PGPROC *proc)
 
 /*
  * Remove the specified PGPROC from the shared array.
+ *
+ * When latestXid is a valid XID, we are removing a live 2PC gxact from the
+ * array, and thus causing it to appear as "not running" anymore.  In this
+ * case we must advance latestCompletedXid.  (This is essentially the same
+ * as ProcArrayEndTransaction followed by removal of the PGPROC, but we take
+ * the ProcArrayLock only once, and don't damage the content of the PGPROC;
+ * twophase.c depends on the latter.)
  */
 void
-ProcArrayRemove(PGPROC *proc, bool forPrepare, bool isCommit)
+ProcArrayRemove(PGPROC *proc, TransactionId latestXid, bool forPrepare, bool isCommit)
 {
 	ProcArrayStruct *arrayP = procArray;
 	int			index;
@@ -180,11 +196,27 @@ ProcArrayRemove(PGPROC *proc, bool forPrepare, bool isCommit)
 
 	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
 
+	if (TransactionIdIsValid(latestXid))
+	{
+		Assert(TransactionIdIsValid(proc->xid));
+
+		/* Advance global latestCompletedXid while holding the lock */
+		if (TransactionIdPrecedes(ShmemVariableCache->latestCompletedXid,
+								  latestXid))
+			ShmemVariableCache->latestCompletedXid = latestXid;
+	}
+	else
+	{
+		/* Shouldn't be trying to remove a live transaction here */
+		Assert(!TransactionIdIsValid(proc->xid));
+	}
+
 	for (index = 0; index < arrayP->numProcs; index++)
 	{
 		if (arrayP->procs[index] == proc)
 		{
 			arrayP->procs[index] = arrayP->procs[arrayP->numProcs - 1];
+			arrayP->procs[arrayP->numProcs - 1] = NULL; /* for debugging */
 			arrayP->numProcs--;
 
 			if (forPrepare)
@@ -211,6 +243,203 @@ ProcArrayRemove(PGPROC *proc, bool forPrepare, bool isCommit)
 }
 
 
+/*
+ * ProcArrayEndTransaction -- mark a transaction as no longer running
+ *
+ * This is used interchangeably for commit and abort cases.  The transaction
+ * commit/abort must already be reported to WAL and pg_clog.
+ *
+ * proc is currently always MyProc, but we pass it explicitly for flexibility.
+ * latestXid is the latest Xid among the transaction's main XID and
+ * subtransactions, or InvalidTransactionId if it has no XID.  (We must ask
+ * the caller to pass latestXid, instead of computing it from the PGPROC's
+ * contents, because the subxid information in the PGPROC might be
+ * incomplete.)
+ *
+ * GPDB: If this is a global transaction, we might need to do this action
+ * later, rather than now. In that case, this function sets *needNotifyCommittedDtxTransaction,
+ * and does *not* change the state of the PGPROC entry. This can only happen
+ * for commit; when !isCommit, this always clears the PGPROC entry.
+ */
+void
+ProcArrayEndTransaction(PGPROC *proc, TransactionId latestXid, bool isCommit,
+						bool *needStateChangeFromDistributed,
+						bool *needNotifyCommittedDtxTransaction,
+						LocalDistribXactRef *localDistribXactRef)
+{
+	if (needStateChangeFromDistributed)
+		*needStateChangeFromDistributed = false;
+	if (needNotifyCommittedDtxTransaction)
+		*needNotifyCommittedDtxTransaction = false;
+
+	if (TransactionIdIsValid(latestXid))
+	{
+		/*
+		 * We must lock ProcArrayLock while clearing proc->xid, so that we do
+		 * not exit the set of "running" transactions while someone else is
+		 * taking a snapshot.  See discussion in
+		 * src/backend/access/transam/README.
+		 */
+		Assert(TransactionIdIsValid(proc->xid) ||
+			   (IsBootstrapProcessingMode() && latestXid == BootstrapTransactionId));
+
+		LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+
+		if (!LocalDistribXactRef_IsNil(&MyProc->localDistribXactRef))
+		{
+			switch (DistributedTransactionContext)
+			{
+				case DTX_CONTEXT_QD_DISTRIBUTED_CAPABLE:
+					LocalDistribXact_ChangeStateUnderLock(
+						MyProc->xid,
+						&MyProc->localDistribXactRef,
+						isCommit ? 
+							LOCALDISTRIBXACT_STATE_COMMITDELIVERY :
+							LOCALDISTRIBXACT_STATE_ABORTDELIVERY);
+					if (needStateChangeFromDistributed)
+						*needStateChangeFromDistributed = true;
+					break;
+				
+				case DTX_CONTEXT_QE_TWO_PHASE_EXPLICIT_WRITER:
+				case DTX_CONTEXT_QE_TWO_PHASE_IMPLICIT_WRITER:
+				case DTX_CONTEXT_QE_AUTO_COMMIT_IMPLICIT:
+					LocalDistribXact_ChangeStateUnderLock(
+						MyProc->xid,
+						&MyProc->localDistribXactRef,
+						isCommit ?
+							LOCALDISTRIBXACT_STATE_COMMITTED :
+							LOCALDISTRIBXACT_STATE_ABORTED);
+					break;
+				
+				case DTX_CONTEXT_QE_READER:
+				case DTX_CONTEXT_QE_ENTRY_DB_SINGLETON:
+					// QD or QE Writer will handle it.
+					break;
+
+				case DTX_CONTEXT_QD_RETRY_PHASE_2:
+				case DTX_CONTEXT_QE_PREPARED:
+				case DTX_CONTEXT_QE_FINISH_PREPARED:
+					elog(PANIC, "Unexpected distribute transaction context: '%s'",
+						 DtxContextToString(DistributedTransactionContext));
+
+				default:
+					elog(PANIC, "Unrecognized DTX transaction context: %d",
+						 (int) DistributedTransactionContext);
+			}
+
+			/*
+			 * We need to transfer the disributed ref for processing in the caller.
+			 */
+			LocalDistribXactRef_Transfer(
+				localDistribXactRef,
+				&MyProc->localDistribXactRef);
+		}
+
+		if (isCommit && notifyCommittedDtxTransactionIsNeeded())
+		{
+			Assert(needNotifyCommittedDtxTransaction);
+			*needNotifyCommittedDtxTransaction = true;
+		}
+		else
+		{
+			proc->xid = InvalidTransactionId;
+			proc->lxid = InvalidLocalTransactionId;
+			proc->xmin = InvalidTransactionId;
+			/* must be cleared with xid/xmin: */
+			proc->vacuumFlags &= ~PROC_VACUUM_STATE_MASK;
+			proc->inCommit = false; /* be sure this is cleared in abort */
+			proc->serializableIsoLevel = false;
+			proc->inDropTransaction = false;
+
+			/* Clear the subtransaction-XID cache too while holding the lock */
+			proc->subxids.nxids = 0;
+			proc->subxids.overflowed = false;
+		}
+
+		/* Also advance global latestCompletedXid while holding the lock */
+		/*
+		 * Note: we do this in GPDB even if we didn't clear our XID entry
+		 * just yet. There is no harm in advancing latestCompletedXid a
+		 * little bit earlier than strictly necessary, and this way we don't
+		 * need to remember out latest XID when we later actually clear the
+		 * entry.
+		 */
+		if (TransactionIdPrecedes(ShmemVariableCache->latestCompletedXid,
+								  latestXid))
+			ShmemVariableCache->latestCompletedXid = latestXid;
+
+		LWLockRelease(ProcArrayLock);
+	}
+	else
+	{
+		/*
+		 * If we have no XID, we don't need to lock, since we won't affect
+		 * anyone else's calculation of a snapshot.  We might change their
+		 * estimate of global xmin, but that's OK.
+		 */
+		Assert(!TransactionIdIsValid(proc->xid));
+
+		proc->lxid = InvalidLocalTransactionId;
+		proc->xmin = InvalidTransactionId;
+		/* must be cleared with xid/xmin: */
+		proc->vacuumFlags &= ~PROC_VACUUM_STATE_MASK;
+		proc->inCommit = false; /* be sure this is cleared in abort */
+		proc->serializableIsoLevel = false;
+		proc->inDropTransaction = false;
+
+		Assert(proc->subxids.nxids == 0);
+		Assert(proc->subxids.overflowed == false);
+	}
+}
+
+
+/*
+ * ProcArrayClearTransaction -- clear the transaction fields
+ *
+ * This is used after successfully preparing a 2-phase transaction.  We are
+ * not actually reporting the transaction's XID as no longer running --- it
+ * will still appear as running because the 2PC's gxact is in the ProcArray
+ * too.  We just have to clear out our own PGPROC.
+ */
+void
+ProcArrayClearTransaction(PGPROC *proc)
+{
+	/*
+	 * We can skip locking ProcArrayLock here, because this action does not
+	 * actually change anyone's view of the set of running XIDs: our entry is
+	 * duplicate with the gxact that has already been inserted into the
+	 * ProcArray.
+	 */
+	proc->xid = InvalidTransactionId;
+	proc->lxid = InvalidLocalTransactionId;
+	proc->xmin = InvalidTransactionId;
+
+	/* redundant, but just in case */
+	proc->vacuumFlags &= ~PROC_VACUUM_STATE_MASK;
+	proc->inCommit = false;
+	proc->serializableIsoLevel = false;
+	proc->inDropTransaction = false;
+
+	/* Clear the subtransaction-XID cache too */
+	proc->subxids.nxids = 0;
+	proc->subxids.overflowed = false;
+}
+
+/*
+ * Clears the current transaction from PGPROC.
+ *
+ * Must be called while holding the ProcArrayLock.
+ */
+void
+ClearTransactionFromPgProc_UnderLock(PGPROC *proc)
+{
+	/*
+	 * ProcArrayClearTransaction() doesn't take the lock, so we can just call it
+	 * directly.
+	 */
+	ProcArrayClearTransaction(proc);
+}
+
 /*
  * TransactionIdIsInProgress -- is given transaction running in some backend
  *
@@ -236,14 +465,12 @@ ProcArrayRemove(PGPROC *proc, bool forPrepare, bool isCommit)
 bool
 TransactionIdIsInProgress(TransactionId xid)
 {
-	bool		result = false;
+	static TransactionId *xids = NULL;
+	int			nxids = 0;
 	ProcArrayStruct *arrayP = procArray;
+	TransactionId topxid;
 	int			i,
 				j;
-	int			nxids = 0;
-	TransactionId *xids;
-	TransactionId topxid;
-	bool		locked;
 
 	/*
 	 * Don't bother checking a transaction older than RecentXmin; it could not
@@ -257,18 +484,55 @@ TransactionIdIsInProgress(TransactionId xid)
 		return false;
 	}
 
-	/* Get workspace to remember main XIDs in */
-	xids = (TransactionId *) palloc(sizeof(TransactionId) * arrayP->maxProcs);
+	/*
+	 * Also, we can handle our own transaction (and subtransactions) without
+	 * any access to shared memory.
+	 */
+	if (TransactionIdIsCurrentTransactionId(xid))
+	{
+		xc_by_my_xact_inc();
+		return true;
+	}
+
+	/*
+	 * If not first time through, get workspace to remember main XIDs in. We
+	 * malloc it permanently to avoid repeated palloc/pfree overhead.
+	 */
+	if (xids == NULL)
+	{
+		xids = (TransactionId *)
+			malloc(arrayP->maxProcs * sizeof(TransactionId));
+		if (xids == NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory")));
+	}
 
 	LWLockAcquire(ProcArrayLock, LW_SHARED);
-	locked = true;
 
+	/*
+	 * Now that we have the lock, we can check latestCompletedXid; if the
+	 * target Xid is after that, it's surely still running.
+	 */
+	if (TransactionIdPrecedes(ShmemVariableCache->latestCompletedXid, xid))
+	{
+		LWLockRelease(ProcArrayLock);
+		xc_by_latest_xid_inc();
+		return true;
+	}
+
+	/* No shortcuts, gotta grovel through the array */
 	for (i = 0; i < arrayP->numProcs; i++)
 	{
 		volatile PGPROC *proc = arrayP->procs[i];
+		TransactionId pxid;
+
+		/* Ignore my own proc --- dealt with it above */
+		if (proc == MyProc)
+			continue;
 
 		/* Fetch xid just once - see GetNewTransactionId */
-		TransactionId pxid = proc->xid;
+		pxid = proc->xid;
 
 		if (!TransactionIdIsValid(pxid))
 			continue;
@@ -278,9 +542,9 @@ TransactionIdIsInProgress(TransactionId xid)
 		 */
 		if (TransactionIdEquals(pxid, xid))
 		{
+			LWLockRelease(ProcArrayLock);
 			xc_by_main_xid_inc();
-			result = true;
-			goto result_known;
+			return true;
 		}
 
 		/*
@@ -300,9 +564,9 @@ TransactionIdIsInProgress(TransactionId xid)
 
 			if (TransactionIdEquals(cxid, xid))
 			{
+				LWLockRelease(ProcArrayLock);
 				xc_by_child_xid_inc();
-				result = true;
-				goto result_known;
+				return true;
 			}
 		}
 
@@ -318,14 +582,16 @@ TransactionIdIsInProgress(TransactionId xid)
 	}
 
 	LWLockRelease(ProcArrayLock);
-	locked = false;
 
 	/*
 	 * If none of the relevant caches overflowed, we know the Xid is not
 	 * running without looking at pg_subtrans.
 	 */
 	if (nxids == 0)
-		goto result_known;
+	{
+		xc_no_overflow_inc();
+		return false;
+	}
 
 	/*
 	 * Step 3: have to check pg_subtrans.
@@ -338,7 +604,7 @@ TransactionIdIsInProgress(TransactionId xid)
 	xc_slow_answer_inc();
 
 	if (TransactionIdDidAbort(xid))
-		goto result_known;
+		return false;
 
 	/*
 	 * It isn't aborted, so check whether the transaction tree it belongs to
@@ -352,20 +618,11 @@ TransactionIdIsInProgress(TransactionId xid)
 		for (i = 0; i < nxids; i++)
 		{
 			if (TransactionIdEquals(xids[i], topxid))
-			{
-				result = true;
-				break;
-			}
+				return true;
 		}
 	}
 
-result_known:
-	if (locked)
-		LWLockRelease(ProcArrayLock);
-
-	pfree(xids);
-
-	return result;
+	return false;
 }
 
 /*
@@ -511,31 +768,31 @@ HasSerializableBackends(bool allDbs)
  * This is also used to determine where to truncate pg_subtrans.  allDbs
  * must be TRUE for that case, and ignoreVacuum FALSE.
  *
+ * GPDB: ignoreVacuum is ignored.
+ *
  * Note: we include all currently running xids in the set of considered xids.
  * This ensures that if a just-started xact has not yet set its snapshot,
  * when it does set the snapshot it cannot set xmin less than what we compute.
  * See notes in src/backend/access/transam/README.
  */
 TransactionId
-GetOldestXmin(bool allDbs)
+GetOldestXmin(bool allDbs, bool ignoreVacuum)
 {
 	ProcArrayStruct *arrayP = procArray;
 	TransactionId result;
 	int			index;
 
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
+
 	/*
-	 * Normally we start the min() calculation with our own XID.  But if
-	 * called by checkpointer, we will not be inside a transaction, so use
-	 * next XID as starting point for min() calculation.  (Note that if there
-	 * are no xacts running at all, that will be the subtrans truncation
-	 * point!)
+	 * We initialize the MIN() calculation with latestCompletedXid + 1. This
+	 * is a lower bound for the XIDs that might appear in the ProcArray later,
+	 * and so protects us against overestimating the result due to future
+	 * additions.
 	 */
-	if (IsTransactionState())
-		result = GetTopTransactionId();
-	else
-		result = ReadNewTransactionId();
-
-	LWLockAcquire(ProcArrayLock, LW_SHARED);
+	result = ShmemVariableCache->latestCompletedXid;
+	Assert(TransactionIdIsNormal(result));
+	TransactionIdAdvance(result);
 
 	for (index = 0; index < arrayP->numProcs; index++)
 	{
@@ -546,23 +803,22 @@ GetOldestXmin(bool allDbs)
 			/* Fetch xid just once - see GetNewTransactionId */
 			TransactionId xid = proc->xid;
 
-			if (TransactionIdIsNormal(xid))
-			{
-				/* First consider the transaction own's Xid */
-				if (TransactionIdPrecedes(xid, result))
-					result = xid;
-
-				/*
-				 * Also consider the transaction's Xmin, if set.
-				 *
-				 * We must check both Xid and Xmin because there is a window
-				 * where an xact's Xid is set but Xmin isn't yet.
-				 */
-				xid = proc->xmin;
-				if (TransactionIdIsNormal(xid))
-					if (TransactionIdPrecedes(xid, result))
-						result = xid;
-			}
+			/* First consider the transaction's own Xid, if any */
+			if (TransactionIdIsNormal(xid) &&
+				TransactionIdPrecedes(xid, result))
+				result = xid;
+
+			/*
+			 * Also consider the transaction's Xmin, if set.
+			 *
+			 * We must check both Xid and Xmin because a transaction might
+			 * have an Xmin but not (yet) an Xid; conversely, if it has an
+			 * Xid, that could determine some not-yet-set Xmin.
+			 */
+			xid = proc->xmin;	/* Fetch just once */
+			if (TransactionIdIsNormal(xid) &&
+				TransactionIdPrecedes(xid, result))
+				result = xid;
 		}
 	}
 
@@ -823,7 +1079,7 @@ QEwriterSnapshotUpToDate(void)
  * GetSnapshotData -- returns information about running transactions.
  *
  * The returned snapshot includes xmin (lowest still-running xact ID),
- * xmax (next xact ID to be assigned), and a list of running xact IDs
+ * xmax (highest completed xact ID + 1), and a list of running xact IDs
  * in the range xmin <= xid < xmax.  It is used as follows:
  *		All xact IDs < xmin are considered finished.
  *		All xact IDs >= xmax are considered still running.
@@ -832,12 +1088,13 @@ QEwriterSnapshotUpToDate(void)
  * This ensures that the set of transactions seen as "running" by the
  * current xact will not change after it takes the snapshot.
  *
- * All running top-level XIDs are included in the snapshot.  We also try
- * to include running subtransaction XIDs, but since PGPROC has only a
- * limited cache area for subxact XIDs, full information may not be
- * available.  If we find any overflowed subxid arrays, we have to mark
- * the snapshot's subxid data as overflowed, and extra work will need to
- * be done to determine what's running (see XidInSnapshot() in tqual.c).
+ * All running top-level XIDs are included in the snapshot, except for lazy
+ * VACUUM processes.  We also try to include running subtransaction XIDs,
+ * but since PGPROC has only a limited cache area for subxact XIDs, full
+ * information may not be available.  If we find any overflowed subxid arrays,
+ * we have to mark the snapshot's subxid data as overflowed, and extra work
+ * will need to be done to determine what's running (see XidInMVCCSnapshot()
+ * in tqual.c).
  *
  * We also update the following backend-global variables:
  *		TransactionXmin: the oldest xmin of any snapshot in use in the
@@ -848,7 +1105,6 @@ QEwriterSnapshotUpToDate(void)
  *		RecentGlobalXmin: the global xmin (oldest TransactionXmin across all
  *			running transactions, except those running LAZY VACUUM).  This is
  *			the same computation done by GetOldestXmin(true, true).
- *----------
  */
 Snapshot
 GetSnapshotData(Snapshot snapshot, bool serializable)
@@ -1045,7 +1301,7 @@ GetSnapshotData(Snapshot snapshot, bool serializable)
 
 				elog((Debug_print_snapshot_dtm ? LOG : DEBUG5),
 					 "GetSnapshotData(): READER currentcommandid %d curcid %d segmatesync %d",
-					 GetCurrentCommandId(), snapshot->curcid, SharedLocalSnapshotSlot->segmateSync);
+					 GetCurrentCommandId(false), snapshot->curcid, SharedLocalSnapshotSlot->segmateSync);
 
 				return snapshot;
 			}
@@ -1129,54 +1385,23 @@ GetSnapshotData(Snapshot snapshot, bool serializable)
 		   !TransactionIdIsValid(MyProc->xmin) :
 		   TransactionIdIsValid(MyProc->xmin));
 
-	globalxmin = xmin = GetTopTransactionId();
-
-	elog((Debug_print_full_dtm ? LOG : DEBUG5),
-		 "GetSnapshotData setting globalxmin and xmin to %u", 
-	 	 xmin);
-
 	/*
-	 * It is sufficient to get shared lock on ProcArrayLock, even if
-	 * we are computing a serializable snapshot and therefore will be
-	 * setting MyProc->xmin.  This is because any two backends that
-	 * have overlapping shared holds on ProcArrayLock will certainly
-	 * compute the same xmin (since no xact, in particular not the
-	 * oldest, can exit the set of running transactions while we hold
-	 * ProcArrayLock --- see further discussion just below). So it
-	 * doesn't matter whether another backend concurrently doing
-	 * GetSnapshotData or GetOldestXmin sees our xmin as set or not;
-	 * he'd compute the same xmin for himself either way.
+	 * It is sufficient to get shared lock on ProcArrayLock, even if we are
+	 * going to set MyProc->xmin.
 	 */
 	LWLockAcquire(ProcArrayLock, LW_SHARED);
 
-	/*--------------------
-	 * Unfortunately, we have to call ReadNewTransactionId() after acquiring
-	 * ProcArrayLock above.  It's not good because ReadNewTransactionId() does
-	 * LWLockAcquire(XidGenLock), but *necessary*.	We need to be sure that
-	 * no transactions exit the set of currently-running transactions
-	 * between the time we fetch xmax and the time we finish building our
-	 * snapshot.  Otherwise we could have a situation like this:
-	 *
-	 *		1. Tx Old is running (in Read Committed mode).
-	 *		2. Tx S reads new transaction ID into xmax, then
-	 *		   is swapped out before acquiring ProcArrayLock.
-	 *		3. Tx New gets new transaction ID (>= S' xmax),
-	 *		   makes changes and commits.
-	 *		4. Tx Old changes some row R changed by Tx New and commits.
-	 *		5. Tx S finishes getting its snapshot data.  It sees Tx Old as
-	 *		   done, but sees Tx New as still running (since New >= xmax).
-	 *
-	 * Now S will see R changed by both Tx Old and Tx New, *but* does not
-	 * see other changes made by Tx New.  If S is supposed to be in
-	 * Serializable mode, this is wrong.
-	 *
-	 * By locking ProcArrayLock before we read xmax, we ensure that TX Old
-	 * cannot exit the set of running transactions seen by Tx S.  Therefore
-	 * both Old and New will be seen as still running => no inconsistency.
-	 *--------------------
-	 */
+	/* xmax is always latestCompletedXid + 1 */
+	xmax = ShmemVariableCache->latestCompletedXid;
+	Assert(TransactionIdIsNormal(xmax));
+	TransactionIdAdvance(xmax);
+
+	/* initialize xmin calculation with xmax */
+	globalxmin = xmin = xmax;
 
-	xmax = ReadNewTransactionId();
+	elog((Debug_print_full_dtm ? LOG : DEBUG5),
+		 "GetSnapshotData setting globalxmin and xmin to %u", 
+	 	 xmin);
 
 	/*
 	 * Get the distributed snapshot if needed and copy it into the field 
@@ -1217,54 +1442,62 @@ GetSnapshotData(Snapshot snapshot, bool serializable)
 	FillInDistributedSnapshot(snapshot);
 
 	/*
-	 * Scan the PGPROC array to fill in the local snapshot.
+	 * Spin over procArray checking xid, xmin, and subxids.  The goal is to
+	 * gather all active xids, find the lowest xmin, and try to record
+	 * subxids.
 	 */
 	for (index = 0; index < arrayP->numProcs; index++)
 	{
 		volatile PGPROC *proc = arrayP->procs[index];
+		TransactionId xid;
+
+		/* Ignore procs running LAZY VACUUM */
+		if (proc->vacuumFlags & PROC_IN_VACUUM)
+			continue;
+
+		/* Update globalxmin to be the smallest valid xmin */
+		xid = proc->xmin;               /* fetch just once */
+		if (TransactionIdIsNormal(xid) &&
+			TransactionIdPrecedes(xid, globalxmin))
+			globalxmin = xid;
 
 		/* Fetch xid just once - see GetNewTransactionId */
-		TransactionId xid = proc->xid;
+		xid = proc->xid;
 
 		/*
-		 * Ignore my own proc (dealt with my xid above), procs not running a
-		 * transaction, xacts started since we read the next transaction ID,
-		 * and xacts executing LAZY VACUUM. There's no need to store XIDs
-		 * above what we got from ReadNewTransactionId, since we'll treat them
-		 * as running anyway.  We also assume that such xacts can't compute an
-		 * xmin older than ours, so they needn't be considered in computing
-		 * globalxmin.
+		 * If the transaction has been assigned an xid < xmax we add it to the
+		 * snapshot, and update xmin if necessary.	There's no need to store
+		 * XIDs >= xmax, since we'll treat them as running anyway.  We don't
+		 * bother to examine their subxids either.
+		 *
+		 * We don't include our own XID (if any) in the snapshot, but we must
+		 * include it into xmin.
 		 */
-		if (proc == MyProc ||
-			!TransactionIdIsNormal(xid) ||
-			TransactionIdFollowsOrEquals(xid, xmax))
+		if (TransactionIdIsNormal(xid))
 		{
-			continue;
+			if (TransactionIdFollowsOrEquals(xid, xmax))
+				continue;
+			if (proc != MyProc)
+				snapshot->xip[count++] = xid;
+			if (TransactionIdPrecedes(xid, xmin))
+				xmin = xid;
 		}
-		
-		if (TransactionIdPrecedes(xid, xmin))
-			xmin = xid;
-		
-		snapshot->xip[count] = xid;
-		count++;
-
-		/* Update globalxmin to be the smallest valid xmin */
-		xid = proc->xmin;
-		if (TransactionIdIsNormal(xid))
-			if (TransactionIdPrecedes(xid, globalxmin))
-				globalxmin = xid;
 
 		/*
 		 * Save subtransaction XIDs if possible (if we've already overflowed,
 		 * there's no point).  Note that the subxact XIDs must be later than
-		 * their parent, so no need to check them against xmin.
+		 * their parent, so no need to check them against xmin.  We could
+		 * filter against xmax, but it seems better not to do that much work
+		 * while holding the ProcArrayLock.
 		 *
 		 * The other backend can add more subxids concurrently, but cannot
 		 * remove any.	Hence it's important to fetch nxids just once. Should
 		 * be safe to use memcpy, though.  (We needn't worry about missing any
 		 * xids added concurrently, because they must postdate xmax.)
+		 *
+		 * Again, our own XIDs are not included in the snapshot.
 		 */
-		if (subcount >= 0)
+		if (subcount >= 0 && proc != MyProc)
 		{
 			if (proc->subxids.overflowed)
 				subcount = -1;	/* overflowed */
@@ -1275,7 +1508,7 @@ GetSnapshotData(Snapshot snapshot, bool serializable)
 				if (nxids > 0)
 				{
 					memcpy(snapshot->subxip + subcount,
-						   ((PGPROC *)proc)->subxids.xids,
+						   (void *) proc->subxids.xids,
 						   nxids * sizeof(TransactionId));
 					subcount += nxids;
 				}
@@ -1317,7 +1550,7 @@ GetSnapshotData(Snapshot snapshot, bool serializable)
 	snapshot->xcnt = count;
 	snapshot->subxcnt = subcount;
 
-	snapshot->curcid = GetCurrentCommandId();
+	snapshot->curcid = GetCurrentCommandId(false);
 
 	/*
 	 * MPP Addition.  If we are the chief then we'll save our local snapshot
@@ -1335,11 +1568,105 @@ GetSnapshotData(Snapshot snapshot, bool serializable)
 
 	elog((Debug_print_snapshot_dtm ? LOG : DEBUG5),
 		 "GetSnapshotData(): WRITER currentcommandid %d curcid %d segmatesync %d",
-		 GetCurrentCommandId(), snapshot->curcid, QEDtxContextInfo.segmateSync);
+		 GetCurrentCommandId(false), snapshot->curcid, QEDtxContextInfo.segmateSync);
 
 	return snapshot;
 }
 
+/*
+ * GetTransactionsInCommit -- Get the XIDs of transactions that are committing
+ *
+ * Constructs an array of XIDs of transactions that are currently in commit
+ * critical sections, as shown by having inCommit set in their PGPROC entries.
+ *
+ * *xids_p is set to a palloc'd array that should be freed by the caller.
+ * The return value is the number of valid entries.
+ *
+ * Note that because backends set or clear inCommit without holding any lock,
+ * the result is somewhat indeterminate, but we don't really care.  Even in
+ * a multiprocessor with delayed writes to shared memory, it should be certain
+ * that setting of inCommit will propagate to shared memory when the backend
+ * takes the WALInsertLock, so we cannot fail to see an xact as inCommit if
+ * it's already inserted its commit record.  Whether it takes a little while
+ * for clearing of inCommit to propagate is unimportant for correctness.
+ */
+int
+GetTransactionsInCommit(TransactionId **xids_p)
+{
+	ProcArrayStruct *arrayP = procArray;
+	TransactionId *xids;
+	int			nxids;
+	int			index;
+
+	xids = (TransactionId *) palloc(arrayP->maxProcs * sizeof(TransactionId));
+	nxids = 0;
+
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
+
+	for (index = 0; index < arrayP->numProcs; index++)
+	{
+		volatile PGPROC *proc = arrayP->procs[index];
+
+		/* Fetch xid just once - see GetNewTransactionId */
+		TransactionId pxid = proc->xid;
+
+		if (proc->inCommit && TransactionIdIsValid(pxid))
+			xids[nxids++] = pxid;
+	}
+
+	LWLockRelease(ProcArrayLock);
+
+	*xids_p = xids;
+	return nxids;
+}
+
+/*
+ * HaveTransactionsInCommit -- Are any of the specified XIDs in commit?
+ *
+ * This is used with the results of GetTransactionsInCommit to see if any
+ * of the specified XIDs are still in their commit critical sections.
+ *
+ * Note: this is O(N^2) in the number of xacts that are/were in commit, but
+ * those numbers should be small enough for it not to be a problem.
+ */
+bool
+HaveTransactionsInCommit(TransactionId *xids, int nxids)
+{
+	bool		result = false;
+	ProcArrayStruct *arrayP = procArray;
+	int			index;
+
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
+
+	for (index = 0; index < arrayP->numProcs; index++)
+	{
+		volatile PGPROC *proc = arrayP->procs[index];
+
+		/* Fetch xid just once - see GetNewTransactionId */
+		TransactionId pxid = proc->xid;
+
+		if (proc->inCommit && TransactionIdIsValid(pxid))
+		{
+			int			i;
+
+			for (i = 0; i < nxids; i++)
+			{
+				if (xids[i] == pxid)
+				{
+					result = true;
+					break;
+				}
+			}
+			if (result)
+				break;
+		}
+	}
+
+	LWLockRelease(ProcArrayLock);
+
+	return result;
+}
+
 /*
  * MPP: Special code to update the command id in the SharedLocalSnapshot
  * when we are in SERIALIZABLE isolation mode.
@@ -1436,6 +1763,9 @@ BackendPidGetProc(int pid)
  *
  * Only main transaction Ids are considered.  This function is mainly
  * useful for determining what backend owns a lock.
+ *
+ * Beware that not every xact has an XID assigned.	However, as long as you
+ * only call this using an XID found on disk, you're safe.
  */
 int
 BackendXidGetPid(TransactionId xid)
@@ -1474,6 +1804,73 @@ IsBackendPid(int pid)
 	return (BackendPidGetProc(pid) != NULL);
 }
 
+
+/*
+ * GetCurrentVirtualXIDs -- returns an array of currently active VXIDs.
+ *
+ * The array is palloc'd and is terminated with an invalid VXID.
+ *
+ * If limitXmin is not InvalidTransactionId, we skip any backends
+ * with xmin >= limitXmin.	If allDbs is false, we skip backends attached
+ * to other databases.  If excludeVacuum isn't zero, we skip processes for
+ * which (excludeVacuum & vacuumFlags) is not zero.  Also, our own process
+ * is always skipped.
+ */
+VirtualTransactionId *
+GetCurrentVirtualXIDs(TransactionId limitXmin, bool allDbs, int excludeVacuum)
+{
+	VirtualTransactionId *vxids;
+	ProcArrayStruct *arrayP = procArray;
+	int			count = 0;
+	int			index;
+
+	/* allocate result space with room for a terminator */
+	vxids = (VirtualTransactionId *)
+		palloc(sizeof(VirtualTransactionId) * (arrayP->maxProcs + 1));
+
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
+
+	for (index = 0; index < arrayP->numProcs; index++)
+	{
+		volatile PGPROC *proc = arrayP->procs[index];
+
+		if (proc == MyProc)
+			continue;
+
+		if (excludeVacuum & proc->vacuumFlags)
+			continue;
+
+		if (allDbs || proc->databaseId == MyDatabaseId)
+		{
+			/* Fetch xmin just once - might change on us? */
+			TransactionId pxmin = proc->xmin;
+
+			/*
+			 * Note that InvalidTransactionId precedes all other XIDs, so a
+			 * proc that hasn't set xmin yet will always be included.
+			 */
+			if (!TransactionIdIsValid(limitXmin) ||
+				TransactionIdPrecedes(pxmin, limitXmin))
+			{
+				VirtualTransactionId vxid;
+
+				GET_VXID_FROM_PGPROC(vxid, *proc);
+				if (VirtualTransactionIdIsValid(vxid))
+					vxids[count++] = vxid;
+			}
+		}
+	}
+
+	LWLockRelease(ProcArrayLock);
+
+	/* add the terminator */
+	vxids[count].backendId = InvalidBackendId;
+	vxids[count].localTransactionId = InvalidLocalTransactionId;
+
+	return vxids;
+}
+
+
 /*
  * CountActiveBackends --- count backends (other than myself) that are in
  *		active transactions.  This is used as a heuristic to decide if
@@ -1505,9 +1902,9 @@ CountActiveBackends(void)
 		 *
 		 * If someone just decremented numProcs, 'proc' could also point to a
 		 * PGPROC entry that's no longer in the array. It still points to a
-		 * PGPROC struct, though, because freed PGPPROC entries just go to the
-		 * free list and are recycled. Its contents are nonsense in that case,
-		 * but that's acceptable for this function.
+		 * PGPROC struct, though, because freed PGPPROC entries just go to
+		 * the free list and are recycled. Its contents are nonsense in that
+		 * case, but that's acceptable for this function.
 		 */
 		if (proc == NULL)
 			continue;
@@ -1628,7 +2025,7 @@ CheckOtherDBBackends(Oid databaseId)
 
 			found = true;
 
-			if (proc->isAutovacuum)
+			if (proc->vacuumFlags & PROC_IS_AUTOVACUUM)
 			{
 				/* an autovacuum --- send it SIGTERM before sleeping */
 				int			autopid = proc->pid;
@@ -1679,9 +2076,12 @@ CheckOtherDBBackends(Oid databaseId)
  * Remove a bunch of TransactionIds from the list of known-running
  * subtransactions for my backend.	Both the specified xid and those in
  * the xids[] array (of length nxids) are removed from the subxids cache.
+ * latestXid must be the latest XID among the group.
  */
 void
-XidCacheRemoveRunningXids(TransactionId xid, int nxids, TransactionId *xids)
+XidCacheRemoveRunningXids(TransactionId xid,
+						  int nxids, const TransactionId *xids,
+						  TransactionId latestXid)
 {
 	int			i,
 				j;
@@ -1690,9 +2090,10 @@ XidCacheRemoveRunningXids(TransactionId xid, int nxids, TransactionId *xids)
 
 	/*
 	 * We must hold ProcArrayLock exclusively in order to remove transactions
-	 * from the PGPROC array.  (See notes in GetSnapshotData.)	It's possible
-	 * this could be relaxed since we know this routine is only used to abort
-	 * subtransactions, but pending closer analysis we'd best be conservative.
+	 * from the PGPROC array.  (See src/backend/access/transam/README.)  It's
+	 * possible this could be relaxed since we know this routine is only used
+	 * to abort subtransactions, but pending closer analysis we'd best be
+	 * conservative.
 	 */
 	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
 
@@ -1737,6 +2138,11 @@ XidCacheRemoveRunningXids(TransactionId xid, int nxids, TransactionId *xids)
 	if (j < 0 && !MyProc->subxids.overflowed)
 		elog(WARNING, "did not find subXID %u in MyProc", xid);
 
+	/* Also advance global latestCompletedXid while holding the lock */
+	if (TransactionIdPrecedes(ShmemVariableCache->latestCompletedXid,
+							  latestXid))
+		ShmemVariableCache->latestCompletedXid = latestXid;
+
 	LWLockRelease(ProcArrayLock);
 }
 
@@ -1749,10 +2155,13 @@ static void
 DisplayXidCache(void)
 {
 	fprintf(stderr,
-			"XidCache: xmin: %ld, mainxid: %ld, childxid: %ld, slow: %ld\n",
+			"XidCache: xmin: %ld, myxact: %ld, latest: %ld, mainxid: %ld, childxid: %ld, nooflo: %ld, slow: %ld\n",
 			xc_by_recent_xmin,
+			xc_by_my_xact,
+			xc_by_latest_xid,
 			xc_by_main_xid,
 			xc_by_child_xid,
+			xc_no_overflow,
 			xc_slow_answer);
 }
 
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index d391444d5244..ad43d47ffafe 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/shmem.c,v 1.99 2007/01/05 22:19:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/shmem.c,v 1.100 2008/01/01 19:45:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 0fd01798366b..35562831e71e 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/shmqueue.c,v 1.30 2007/01/05 22:19:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/shmqueue.c,v 1.31 2008/01/01 19:45:51 momjian Exp $
  *
  * NOTES
  *
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index d097839e51dc..f4c2adb4c1e1 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -20,7 +20,9 @@
 #include "miscadmin.h"
 #include "storage/backendid.h"
 #include "storage/ipc.h"
+#include "storage/lock.h"
 #include "storage/lwlock.h"
+#include "storage/proc.h"
 #include "storage/procsignal.h"
 #include "storage/shmem.h"
 #include "storage/sinvaladt.h"
@@ -152,6 +154,14 @@ typedef struct ProcState
 	 * schema changes.
 	 */
 	bool		sendOnly;		/* backend only sends, never receives */
+
+	/*
+	 * Next LocalTransactionId to use for each idle backend slot.  We keep
+	 * this here because it is indexed by BackendId and it is convenient to
+	 * copy the value to and from local memory when MyBackendId is set. It's
+	 * meaningless in an active ProcState entry.
+	 */
+	LocalTransactionId nextLXID;
 } ProcState;
 
 /* Shared cache invalidation memory segment */
@@ -185,6 +195,8 @@ typedef struct SISeg
 static SISeg *shmInvalBuffer;	/* pointer to the shared inval buffer */
 
 
+static LocalTransactionId nextLocalTransactionId;
+
 static void CleanupInvalidationState(int status, Datum arg);
 
 
@@ -232,7 +244,7 @@ CreateSharedInvalidationState(void)
 
 	/* The buffer[] array is initially all unused, so we need not fill it */
 
-	/* Mark all backends inactive */
+	/* Mark all backends inactive, and initialize nextLXID */
 	for (i = 0; i < shmInvalBuffer->maxBackends; i++)
 	{
 		shmInvalBuffer->procState[i].procPid = 0;		/* inactive */
@@ -240,6 +252,7 @@ CreateSharedInvalidationState(void)
 		shmInvalBuffer->procState[i].resetState = false;
 		shmInvalBuffer->procState[i].signaled = false;
 		shmInvalBuffer->procState[i].hasMessages = false;
+		shmInvalBuffer->procState[i].nextLXID = InvalidLocalTransactionId;
 	}
 }
 
@@ -294,6 +307,12 @@ SharedInvalBackendInit(bool sendOnly)
 
 	MyBackendId = (stateP - &segP->procState[0]) + 1;
 
+	/* Advertise assigned backend ID in MyProc */
+	MyProc->backendId = MyBackendId;
+
+	/* Fetch next local transaction ID into local memory */
+	nextLocalTransactionId = stateP->nextLXID;
+
 	/* mark myself active, with all extant messages already read */
 	stateP->procPid = MyProcPid;
 	stateP->nextMsgNum = segP->maxMsgNum;
@@ -331,6 +350,9 @@ CleanupInvalidationState(int status, Datum arg)
 
 	stateP = &segP->procState[MyBackendId - 1];
 
+	/* Update next local transaction ID for next holder of this backendID */
+	nextLocalTransactionId = stateP->nextLXID;
+
 	/* Mark myself inactive */
 	stateP->procPid = 0;
 	stateP->nextMsgNum = 0;
@@ -680,3 +702,31 @@ SICleanupQueue(bool callerHasWriteLock, int minFree)
 			LWLockRelease(SInvalWriteLock);
 	}
 }
+
+
+/*
+ * GetNextLocalTransactionId --- allocate a new LocalTransactionId
+ *
+ * We split VirtualTransactionIds into two parts so that it is possible
+ * to allocate a new one without any contention for shared memory, except
+ * for a bit of additional overhead during backend startup/shutdown.
+ * The high-order part of a VirtualTransactionId is a BackendId, and the
+ * low-order part is a LocalTransactionId, which we assign from a local
+ * counter.  To avoid the risk of a VirtualTransactionId being reused
+ * within a short interval, successive procs occupying the same backend ID
+ * slot should use a consecutive sequence of local IDs, which is implemented
+ * by copying nextLocalTransactionId as seen above.
+ */
+LocalTransactionId
+GetNextLocalTransactionId(void)
+{
+	LocalTransactionId result;
+
+	/* loop to avoid returning InvalidLocalTransactionId at wraparound */
+	do
+	{
+		result = nextLocalTransactionId++;
+	} while (!LocalTransactionIdIsValid(result));
+
+	return result;
+}
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 06a18d80590a..1b1c5b09b623 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -35,7 +35,6 @@
 #include "access/tuptoaster.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
-#include "catalog/catquery.h" 
 #include "catalog/indexing.h"
 #include "catalog/pg_largeobject.h"
 #include "commands/comment.h"
@@ -146,11 +145,6 @@ myLargeObjectExists(Oid loid, Snapshot snapshot)
 	/*
 	 * See if we can find any tuples belonging to the specified LO
 	 */
-	/* ARD-13: defer conversion for now */
-	cql0("SELECT COUNT(*) FROM pg_largeobject "
-		 " WHERE loid = :1 ",
-		 ObjectIdGetDatum(loid));
-	
 	ScanKeyInit(&skey[0],
 				Anum_pg_largeobject_loid,
 				BTEqualStrategyNumber, F_OIDEQ,
@@ -322,12 +316,6 @@ inv_getsize(LargeObjectDesc *obj_desc)
 	Assert(PointerIsValid(obj_desc));
 
 	open_lo_relation();
-	/* XXX XXX: index backward scan */
-	/* ORDER BY ... DESCENDING */
-	cql0("SELECT * FROM pg_largeobject "
-		 " WHERE loid = :1 "
-		 " ORDER BY loid, pageno ",
-		 ObjectIdGetDatum(obj_desc->id));
 
 	ScanKeyInit(&skey[0],
 				Anum_pg_largeobject_loid,
@@ -358,7 +346,7 @@ inv_getsize(LargeObjectDesc *obj_desc)
 		if (VARATT_IS_EXTENDED(datafield))
 		{
 			datafield = (bytea *)
-				heap_tuple_untoast_attr(datafield);
+				heap_tuple_untoast_attr((struct varlena *) datafield);
 			pfreeit = true;
 		}
 		lastbyte = data->pageno * LOBLKSIZE + getbytealen(datafield);
@@ -437,14 +425,6 @@ inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes)
 
 	open_lo_relation();
 
-	/* XXX XXX: index scan ORDER BY */
-	cql0("SELECT * FROM pg_largeobject "
-		 " WHERE loid = :1 "
-		 " AND pageno >= :2 "
-		 " ORDER BY loid, pageno ",
-		 ObjectIdGetDatum(obj_desc->id),
-		 Int32GetDatum(pageno));
-
 	ScanKeyInit(&skey[0],
 				Anum_pg_largeobject_loid,
 				BTEqualStrategyNumber, F_OIDEQ,
@@ -494,7 +474,7 @@ inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes)
 			if (VARATT_IS_EXTENDED(datafield))
 			{
 				datafield = (bytea *)
-					heap_tuple_untoast_attr(datafield);
+					heap_tuple_untoast_attr((struct varlena *) datafield);
 				pfreeit = true;
 			}
 			len = getbytealen(datafield);
@@ -563,14 +543,6 @@ inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes)
 	open_lo_relation();
 
 	indstate = CatalogOpenIndexes(lo_heap_r);
-	/* XXX XXX: index scan ORDER BY */
-	cql0("SELECT * FROM pg_largeobject "
-		 " WHERE loid = :1 "
-		 " AND pageno >= :2 "
-		 " ORDER BY loid, pageno "
-		 " FOR UPDATE ",
-		 ObjectIdGetDatum(obj_desc->id),
-		 Int32GetDatum(pageno));
 
 	ScanKeyInit(&skey[0],
 				Anum_pg_largeobject_loid,
@@ -623,7 +595,7 @@ inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes)
 			if (VARATT_IS_EXTENDED(datafield))
 			{
 				datafield = (bytea *)
-					heap_tuple_untoast_attr(datafield);
+					heap_tuple_untoast_attr((struct varlena *) datafield);
 				pfreeit = true;
 			}
 			len = getbytealen(datafield);
@@ -759,14 +731,6 @@ inv_truncate(LargeObjectDesc *obj_desc, int len)
 	open_lo_relation();
 
 	indstate = CatalogOpenIndexes(lo_heap_r);
-	/* XXX XXX: index scan ORDER BY */
-	cql0("SELECT * FROM pg_largeobject "
-		 " WHERE loid = :1 "
-		 " AND pageno >= :2 "
-		 " ORDER BY loid, pageno "
-		 " FOR UPDATE ",
-		 ObjectIdGetDatum(obj_desc->id),
-		 Int32GetDatum(pageno));
 
 	ScanKeyInit(&skey[0],
 				Anum_pg_largeobject_loid,
@@ -810,7 +774,7 @@ inv_truncate(LargeObjectDesc *obj_desc, int len)
 		if (VARATT_IS_EXTENDED(datafield))
 		{
 			datafield = (bytea *)
-				heap_tuple_untoast_attr(datafield);
+				heap_tuple_untoast_attr((struct varlena *) datafield);
 			pfreeit = true;
 		}
 		pagelen = getbytealen(datafield);
diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c
index 55899ad77d7e..d448ed3416d7 100644
--- a/src/backend/storage/lmgr/deadlock.c
+++ b/src/backend/storage/lmgr/deadlock.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/deadlock.c,v 1.44 2007/01/05 22:19:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/deadlock.c,v 1.51 2008/01/01 19:45:52 momjian Exp $
  *
  *	Interface:
  *
@@ -25,8 +25,8 @@
  */
 #include "postgres.h"
 
-#include "lib/stringinfo.h"
 #include "miscadmin.h"
+#include "storage/lmgr.h"
 #include "storage/proc.h"
 #include "utils/memutils.h"
 #include "executor/execdesc.h"
@@ -111,6 +111,9 @@ static int	maxPossibleConstraints;
 static DEADLOCK_INFO *deadlockDetails;
 static int	nDeadlockDetails;
 
+/* PGPROC pointer of any blocking autovacuum worker found */
+static PGPROC *blocking_autovacuum_proc = NULL;
+
 
 /*
  * InitDeadLockChecking -- initialize deadlock checker during backend startup
@@ -119,8 +122,9 @@ static int	nDeadlockDetails;
  * allocation of working memory for DeadLockCheck.	We do this per-backend
  * since there's no percentage in making the kernel do copy-on-write
  * inheritance of workspace from the postmaster.  We want to allocate the
- * space at startup because the deadlock checker might be invoked when there's
- * no free memory left.
+ * space at startup because (a) the deadlock checker might be invoked when
+ * there's no free memory left, and (b) the checker is normally run inside a
+ * signal handler, which is a very dangerous place to invoke palloc from.
  */
 void
 InitDeadLockChecking(void)
@@ -186,16 +190,17 @@ InitDeadLockChecking(void)
  *
  * This code looks for deadlocks involving the given process.  If any
  * are found, it tries to rearrange lock wait queues to resolve the
- * deadlock.  If resolution is impossible, return TRUE --- the caller
- * is then expected to abort the given proc's transaction.
+ * deadlock.  If resolution is impossible, return DS_HARD_DEADLOCK ---
+ * the caller is then expected to abort the given proc's transaction.
  *
  * Caller must already have locked all partitions of the lock tables.
  *
  * On failure, deadlock details are recorded in deadlockDetails[] for
  * subsequent printing by DeadLockReport().  That activity is separate
- * because we don't want to do it while holding all those LWLocks.
+ * because (a) we don't want to do it while holding all those LWLocks,
+ * and (b) we are typically invoked inside a signal handler.
  */
-bool
+DeadLockState
 DeadLockCheck(PGPROC *proc)
 {
 	int			i,
@@ -206,6 +211,9 @@ DeadLockCheck(PGPROC *proc)
 	nPossibleConstraints = 0;
 	nWaitOrders = 0;
 
+	/* Initialize to not blocked by an autovacuum worker */
+	blocking_autovacuum_proc = NULL;
+
 	/* Search for deadlocks and possible fixes */
 	if (DeadLockCheckRecurse(proc))
 	{
@@ -219,7 +227,7 @@ DeadLockCheck(PGPROC *proc)
 		if (!FindLockCycle(proc, possibleConstraints, &nSoftEdges))
 			elog(FATAL, "deadlock seems to have disappeared");
 
-		return true;			/* cannot find a non-deadlocked state */
+		return DS_HARD_DEADLOCK;	/* cannot find a non-deadlocked state */
 	}
 
 	/* Apply any needed rearrangements of wait queues */
@@ -254,7 +262,30 @@ DeadLockCheck(PGPROC *proc)
 		if (lock->tag.locktag_type != LOCKTAG_RESOURCE_QUEUE)
 			ProcLockWakeup(GetLocksMethodTable(lock), lock);
 	}
-	return false;
+
+	/* Return code tells caller if we had to escape a deadlock or not */
+	if (nWaitOrders > 0)
+		return DS_SOFT_DEADLOCK;
+	else if (blocking_autovacuum_proc != NULL)
+		return DS_BLOCKED_BY_AUTOVACUUM;
+	else
+		return DS_NO_DEADLOCK;
+}
+
+/*
+ * Return the PGPROC of the autovacuum that's blocking a process.
+ *
+ * We reset the saved pointer as soon as we pass it back.
+ */
+PGPROC *
+GetBlockingAutoVacuumPgproc(void)
+{
+	PGPROC	   *ptr;
+
+	ptr = blocking_autovacuum_proc;
+	blocking_autovacuum_proc = NULL;
+
+	return ptr;
 }
 
 /*
@@ -508,7 +539,34 @@ FindLockCycleRecurse(PGPROC *checkProc,
 
 						return true;
 					}
-					/* If no deadlock, we're done looking at this proclock */
+
+					/*
+					 * No deadlock here, but see if this proc is an autovacuum
+					 * that is directly hard-blocking our own proc.  If so,
+					 * report it so that the caller can send a cancel signal
+					 * to it, if appropriate.  If there's more than one such
+					 * proc, it's indeterminate which one will be reported.
+					 *
+					 * We don't touch autovacuums that are indirectly blocking
+					 * us; it's up to the direct blockee to take action.  This
+					 * rule simplifies understanding the behavior and ensures
+					 * that an autovacuum won't be canceled with less than
+					 * deadlock_timeout grace period.
+					 *
+					 * Note we read vacuumFlags without any locking.  This is
+					 * OK only for checking the PROC_IS_AUTOVACUUM flag,
+					 * because that flag is set at process start and never
+					 * reset.  There is logic elsewhere to avoid canceling an
+					 * autovacuum that is working to prevent XID wraparound
+					 * problems (which needs to read a different vacuumFlag
+					 * bit), but we don't do that here to avoid grabbing
+					 * ProcArrayLock.
+					 */
+					if (checkProc == MyProc &&
+						proc->vacuumFlags & PROC_IS_AUTOVACUUM)
+						blocking_autovacuum_proc = proc;
+
+					/* We're done looking at this proclock */
 					break;
 				}
 			}
@@ -827,97 +885,6 @@ PrintLockQueue(LOCK *lock, const char *info)
 }
 #endif
 
-/*
- * Append a description of a lockable object to buf.
- *
- * XXX probably this should be exported from lmgr.c or some such place.
- */
-static void
-DescribeLockTag(StringInfo buf, const LOCKTAG *lock)
-{
-	switch (lock->locktag_type)
-	{
-		case LOCKTAG_RELATION:
-			appendStringInfo(buf,
-							 _("relation %u of database %u"),
-							 lock->locktag_field2,
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_RELATION_EXTEND:
-			appendStringInfo(buf,
-							 _("extension of relation %u of database %u"),
-							 lock->locktag_field2,
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_PAGE:
-			appendStringInfo(buf,
-							 _("page %u of relation %u of database %u"),
-							 lock->locktag_field3,
-							 lock->locktag_field2,
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_TUPLE:
-			appendStringInfo(buf,
-							 _("tuple (%u,%u) of relation %u of database %u"),
-							 lock->locktag_field3,
-							 lock->locktag_field4,
-							 lock->locktag_field2,
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_TRANSACTION:
-			appendStringInfo(buf,
-							 _("transaction %u"),
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_RELATION_RESYNCHRONIZE:
-			appendStringInfo(buf,
-							 _("resynchronize of relation %u of database %u"),
-							 lock->locktag_field2,
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_RELATION_APPENDONLY_SEGMENT_FILE:
-			appendStringInfo(buf,
-							 _("append-only segment file #%d in relation %u of database %u"),
-							 lock->locktag_field3,
-							 lock->locktag_field2,
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_OBJECT:
-			appendStringInfo(buf,
-							 _("object %u of class %u of database %u"),
-							 lock->locktag_field3,
-							 lock->locktag_field2,
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_RESOURCE_QUEUE:
-			appendStringInfo(buf,
-							 _("resource queue %u"),
-							 lock->locktag_field1);
-			break;
-		case LOCKTAG_USERLOCK:
-			/* reserved for old contrib code, now on pgfoundry */
-			appendStringInfo(buf,
-							 _("user lock [%u,%u,%u]"),
-							 lock->locktag_field1,
-							 lock->locktag_field2,
-							 lock->locktag_field3);
-			break;
-		case LOCKTAG_ADVISORY:
-			appendStringInfo(buf,
-							 _("advisory lock [%u,%u,%u,%u]"),
-							 lock->locktag_field1,
-							 lock->locktag_field2,
-							 lock->locktag_field3,
-							 lock->locktag_field4);
-			break;
-		default:
-			appendStringInfo(buf,
-							 _("unrecognized locktag type %d"),
-							 lock->locktag_type);
-			break;
-	}
-}
-
 /*
  * Report a detected deadlock, with available details.
  */
@@ -946,8 +913,7 @@ DeadLockReport(void)
 			appendStringInfoChar(&buf, '\n');
 
 		/* reset buf2 to hold next object description */
-		buf2.len = 0;
-		buf2.data[0] = '\0';
+		resetStringInfo(&buf2);
 
 		DescribeLockTag(&buf2, &info->locktag);
 
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index c64340fcf2e9..236d5fca19e4 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.90 2007/01/05 22:19:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.96.2.1 2008/03/04 19:54:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,12 +21,10 @@
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/gp_policy.h"     /* CDB: POLICYTYPE_PARTiITIONED */
-#include "catalog/namespace.h"
 #include "miscadmin.h"
 #include "storage/lmgr.h"
 #include "storage/procarray.h"
 #include "utils/inval.h"
-#include "utils/lsyscache.h"        /* CDB: get_rel_name() */
 #include "cdb/cdbvars.h"
 
 
@@ -534,8 +532,8 @@ UnlockTuple(Relation relation, ItemPointer tid, LOCKMODE lockmode)
  *		XactLockTableInsert
  *
  * Insert a lock showing that the given transaction ID is running ---
- * this is done during xact startup.  The lock can then be used to wait
- * for the transaction to finish.
+ * this is done when an XID is acquired by a transaction or subtransaction.
+ * The lock can then be used to wait for the transaction to finish.
  */
 void
 XactLockTableInsert(TransactionId xid)
@@ -559,8 +557,7 @@ XactLockTableInsert(TransactionId xid)
  *
  * Delete the lock showing that the given transaction ID is running.
  * (This is never used for main transaction IDs; those locks are only
- * released implicitly at transaction end.	But we do use it for subtrans
- * IDs.)
+ * released implicitly at transaction end.	But we do use it for subtrans IDs.)
  */
 void
 XactLockTableDelete(TransactionId xid)
@@ -592,7 +589,7 @@ XactLockTableWait(TransactionId xid)
 	for (;;)
 	{
 		Assert(TransactionIdIsValid(xid));
-		Assert(!TransactionIdEquals(xid, GetTopTransactionId()));
+		Assert(!TransactionIdEquals(xid, GetTopTransactionIdIfAny()));
 
 		SET_LOCKTAG_TRANSACTION(tag, xid);
 
@@ -620,7 +617,7 @@ ConditionalXactLockTableWait(TransactionId xid)
 	for (;;)
 	{
 		Assert(TransactionIdIsValid(xid));
-		Assert(!TransactionIdEquals(xid, GetTopTransactionId()));
+		Assert(!TransactionIdEquals(xid, GetTopTransactionIdIfAny()));
 
 		SET_LOCKTAG_TRANSACTION(tag, xid);
 
@@ -637,6 +634,70 @@ ConditionalXactLockTableWait(TransactionId xid)
 	return true;
 }
 
+
+/*
+ *		VirtualXactLockTableInsert
+ *
+ * Insert a lock showing that the given virtual transaction ID is running ---
+ * this is done at main transaction start when its VXID is assigned.
+ * The lock can then be used to wait for the transaction to finish.
+ */
+void
+VirtualXactLockTableInsert(VirtualTransactionId vxid)
+{
+	LOCKTAG		tag;
+
+	Assert(VirtualTransactionIdIsValid(vxid));
+
+	SET_LOCKTAG_VIRTUALTRANSACTION(tag, vxid);
+
+	(void) LockAcquire(&tag, ExclusiveLock, false, false);
+}
+
+/*
+ *		VirtualXactLockTableWait
+ *
+ * Waits until the lock on the given VXID is released, which shows that
+ * the top-level transaction owning the VXID has ended.
+ */
+void
+VirtualXactLockTableWait(VirtualTransactionId vxid)
+{
+	LOCKTAG		tag;
+
+	Assert(VirtualTransactionIdIsValid(vxid));
+
+	SET_LOCKTAG_VIRTUALTRANSACTION(tag, vxid);
+
+	(void) LockAcquire(&tag, ShareLock, false, false);
+
+	LockRelease(&tag, ShareLock, false);
+}
+
+/*
+ *		ConditionalVirtualXactLockTableWait
+ *
+ * As above, but only lock if we can get the lock without blocking.
+ * Returns TRUE if the lock was acquired.
+ */
+bool
+ConditionalVirtualXactLockTableWait(VirtualTransactionId vxid)
+{
+	LOCKTAG		tag;
+
+	Assert(VirtualTransactionIdIsValid(vxid));
+
+	SET_LOCKTAG_VIRTUALTRANSACTION(tag, vxid);
+
+	if (LockAcquire(&tag, ShareLock, false, true) == LOCKACQUIRE_NOT_AVAIL)
+		return false;
+
+	LockRelease(&tag, ShareLock, false);
+
+	return true;
+}
+
+
 /*
  *		LockDatabaseObject
  *
@@ -721,39 +782,95 @@ UnlockSharedObject(Oid classid, Oid objid, uint16 objsubid,
 
 
 /*
- * LockTagIsTemp
- *		Determine whether a locktag is for a lock on a temporary object
+ * Append a description of a lockable object to buf.
  *
- * We need this because 2PC cannot deal with temp objects
+ * Ideally we would print names for the numeric values, but that requires
+ * getting locks on system tables, which might cause problems since this is
+ * typically used to report deadlock situations.
  */
-bool
-LockTagIsTemp(const LOCKTAG *tag)
+void
+DescribeLockTag(StringInfo buf, const LOCKTAG *tag)
 {
-	switch (tag->locktag_type)
+	switch ((LockTagType) tag->locktag_type)
 	{
 		case LOCKTAG_RELATION:
+			appendStringInfo(buf,
+							 _("relation %u of database %u"),
+							 tag->locktag_field2,
+							 tag->locktag_field1);
+			break;
 		case LOCKTAG_RELATION_EXTEND:
+			appendStringInfo(buf,
+							 _("extension of relation %u of database %u"),
+							 tag->locktag_field2,
+							 tag->locktag_field1);
+			break;
 		case LOCKTAG_PAGE:
+			appendStringInfo(buf,
+							 _("page %u of relation %u of database %u"),
+							 tag->locktag_field3,
+							 tag->locktag_field2,
+							 tag->locktag_field1);
+			break;
 		case LOCKTAG_TUPLE:
+			appendStringInfo(buf,
+							 _("tuple (%u,%u) of relation %u of database %u"),
+							 tag->locktag_field3,
+							 tag->locktag_field4,
+							 tag->locktag_field2,
+							 tag->locktag_field1);
+			break;
 		case LOCKTAG_RELATION_RESYNCHRONIZE:
+			appendStringInfo(buf,
+							 _("resynchronize relation %u of database %u"),
+							 tag->locktag_field1,
+							 tag->locktag_field2);
+			break;
 		case LOCKTAG_RELATION_APPENDONLY_SEGMENT_FILE:
-			/* check for lock on a temp relation */
-			/* field1 is dboid, field2 is reloid for all of these */
-			if ((Oid) tag->locktag_field1 == InvalidOid)
-				return false;	/* shared, so not temp */
-			if (isTempNamespace(get_rel_namespace((Oid) tag->locktag_field2)))
-				return true;
+			appendStringInfo(buf,
+							 _("segment file %u of appendonly relation %u of database %u"),
+							 tag->locktag_field3,
+							 tag->locktag_field2,
+							 tag->locktag_field1);
 			break;
 		case LOCKTAG_TRANSACTION:
-			/* there are no temp transactions */
+			appendStringInfo(buf,
+							 _("transaction %u"),
+							 tag->locktag_field1);
+			break;
+		case LOCKTAG_VIRTUALTRANSACTION:
+			appendStringInfo(buf,
+							 _("virtual transaction %d/%u"),
+							 tag->locktag_field1,
+							 tag->locktag_field2);
 			break;
 		case LOCKTAG_OBJECT:
-			/* there are currently no non-table temp objects */
+			appendStringInfo(buf,
+							 _("object %u of class %u of database %u"),
+							 tag->locktag_field3,
+							 tag->locktag_field2,
+							 tag->locktag_field1);
 			break;
 		case LOCKTAG_USERLOCK:
+			/* reserved for old contrib code, now on pgfoundry */
+			appendStringInfo(buf,
+							 _("user lock [%u,%u,%u]"),
+							 tag->locktag_field1,
+							 tag->locktag_field2,
+							 tag->locktag_field3);
+			break;
 		case LOCKTAG_ADVISORY:
-			/* assume these aren't temp */
+			appendStringInfo(buf,
+							 _("advisory lock [%u,%u,%u,%u]"),
+							 tag->locktag_field1,
+							 tag->locktag_field2,
+							 tag->locktag_field3,
+							 tag->locktag_field4);
+			break;
+		default:
+			appendStringInfo(buf,
+							 _("unrecognized locktag type %d"),
+							 (int) tag->locktag_type);
 			break;
 	}
-	return false;				/* default case */
 }
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 8d4d9d2e321e..e2f850e80f71 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.176 2007/02/01 19:10:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.181.2.2 2009/03/11 00:08:06 alvherre Exp $
  *
  * NOTES
  *	  A lock table is a shared memory hash table.  When
@@ -38,7 +38,6 @@
 #include "miscadmin.h"
 #include "pg_trace.h"
 #include "pgstat.h"
-#include "storage/lmgr.h"
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/testutils.h"
@@ -642,7 +641,7 @@ LockAcquire(const LOCKTAG *locktag,
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of shared memory"),
-			errhint("You might need to increase max_locks_per_transaction.")));
+		  errhint("You might need to increase max_locks_per_transaction.")));
 	}
 	locallock->lock = lock;
 
@@ -710,7 +709,7 @@ LockAcquire(const LOCKTAG *locktag,
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of shared memory"),
-			errhint("You might need to increase max_locks_per_transaction.")));
+		  errhint("You might need to increase max_locks_per_transaction.")));
 	}
 	locallock->proclock = proclock;
 
@@ -1838,20 +1837,24 @@ LockReassignCurrentOwner(void)
 
 /*
  * GetLockConflicts
- *		Get a list of TransactionIds of xacts currently holding locks
+ *		Get an array of VirtualTransactionIds of xacts currently holding locks
  *		that would conflict with the specified lock/lockmode.
  *		xacts merely awaiting such a lock are NOT reported.
  *
+ * The result array is palloc'd and is terminated with an invalid VXID.
+ *
  * Of course, the result could be out of date by the time it's returned,
  * so use of this function has to be thought about carefully.
  *
- * Only top-level XIDs are reported.  Note we never include the current xact
- * in the result list, since an xact never blocks itself.
+ * Note we never include the current xact's vxid in the result array,
+ * since an xact never blocks itself.  Also, prepared transactions are
+ * ignored, which is a bit more debatable but is appropriate for current
+ * uses of the result.
  */
-List *
+VirtualTransactionId *
 GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 {
-	List	   *result = NIL;
+	VirtualTransactionId *vxids;
 	LOCKMETHODID lockmethodid = locktag->locktag_lockmethodid;
 	LockMethod	lockMethodTable;
 	LOCK	   *lock;
@@ -1860,6 +1863,7 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 	PROCLOCK   *proclock;
 	uint32		hashcode;
 	LWLockId	partitionLock;
+	int			count = 0;
 
 	if (lockmethodid <= 0 || lockmethodid >= lengthof(LockMethods))
 		elog(ERROR, "unrecognized lock method: %d", lockmethodid);
@@ -1867,6 +1871,14 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 	if (lockmode <= 0 || lockmode > lockMethodTable->numLockModes)
 		elog(ERROR, "unrecognized lock mode: %d", lockmode);
 
+	/*
+	 * Allocate memory to store results, and fill with InvalidVXID.  We only
+	 * need enough space for MaxBackends + a terminator, since prepared xacts
+	 * don't count.
+	 */
+	vxids = (VirtualTransactionId *)
+		palloc0(sizeof(VirtualTransactionId) * (MaxBackends + 1));
+
 	/*
 	 * Look up the lock object matching the tag.
 	 */
@@ -1887,7 +1899,7 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 		 * on this lockable object.
 		 */
 		LWLockRelease(partitionLock);
-		return NIL;
+		return vxids;
 	}
 
 	/*
@@ -1909,18 +1921,17 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 			/* A backend never blocks itself */
 			if (proc != MyProc)
 			{
-				/* Fetch xid just once - see GetNewTransactionId */
-				TransactionId xid = proc->xid;
+				VirtualTransactionId vxid;
+
+				GET_VXID_FROM_PGPROC(vxid, *proc);
 
 				/*
-				 * Race condition: during xact commit/abort we zero out
-				 * PGPROC's xid before we mark its locks released.  If we see
-				 * zero in the xid field, assume the xact is in process of
-				 * shutting down and act as though the lock is already
-				 * released.
+				 * If we see an invalid VXID, then either the xact has already
+				 * committed (or aborted), or it's a prepared xact.  In either
+				 * case we may ignore it.
 				 */
-				if (TransactionIdIsValid(xid))
-					result = lappend_xid(result, xid);
+				if (VirtualTransactionIdIsValid(vxid))
+					vxids[count++] = vxid;
 			}
 		}
 
@@ -1930,7 +1941,10 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
 
 	LWLockRelease(partitionLock);
 
-	return result;
+	if (count > MaxBackends)	/* should never happen */
+		elog(PANIC, "too many conflicting locks found");
+
+	return vxids;
 }
 
 
@@ -1939,7 +1953,7 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
  *		Do the preparatory work for a PREPARE: make 2PC state file records
  *		for all locks currently held.
  *
- * Non-transactional locks are ignored.
+ * Non-transactional locks are ignored, as are VXID locks.
  *
  * There are some special cases that we error out on: we can't be holding
  * any session locks (should be OK since only VACUUM uses those) and we
@@ -1969,6 +1983,13 @@ AtPrepare_Locks(void)
 		if (!LockMethods[LOCALLOCK_LOCKMETHOD(*locallock)]->transactional)
 			continue;
 
+		/*
+		 * Ignore VXID locks.  We don't want those to be held by prepared
+		 * transactions, since they aren't meaningful after a restart.
+		 */
+		if (locallock->tag.lock.locktag_type == LOCKTAG_VIRTUALTRANSACTION)
+			continue;
+
 		/* Ignore it if we don't actually hold the lock */
 		if (locallock->nLocks <= 0)
 			continue;
@@ -1981,7 +2002,6 @@ AtPrepare_Locks(void)
 				elog(ERROR, "cannot PREPARE when session locks exist");
 		}
 
-		
 		/* gp-change 
 		 *
 		 * We allow 2PC commit transactions to include temp objects.  
@@ -1995,8 +2015,11 @@ AtPrepare_Locks(void)
 		 * destroyed at the end of the session, while the transaction will be
 		 * committed from another session.
 		 */
+		/* GPDB_83MERGE_FIXME: see previous comments on removing LockTagIsTemp */
+#if 0
 		if (LockTagIsTemp(&locallock->tag.lock))
 			continue;
+#endif
 
 		/*
 		 * Create a 2PC record.
@@ -2075,12 +2098,25 @@ PostPrepare_Locks(TransactionId xid)
 		if (!LockMethods[LOCALLOCK_LOCKMETHOD(*locallock)]->transactional)
 			continue;
 
+		/* Ignore VXID locks */
+		if (locallock->tag.lock.locktag_type == LOCKTAG_VIRTUALTRANSACTION)
+			continue;
+
 		/* MPP change for temp objects in 2PC.  we skip over temp
 		 * objects. MPP-1094: NOTE THIS CALL MAY ADD LOCKS TO OUR
 		 * TABLE!
 		 */
+		/* GPDB_83MERGE_FIXME: LockTagIsTemp() was removed in the merge,
+		 * by upstream commit f3032cbe377ecc570989e1bd2fe1aea455c12cc3. It's
+		 * not clear to me if it's still safe to skip over temp objects. I'm
+		 * pretty sure we must allow modifying temp tables in GPDB, because
+		 * every transaction uses 2PC, but how? Do we need to resurrect
+		 * LockTagIsTemp? Needs investigation...
+		 */
+#if 0
 		if (LockTagIsTemp(&locallock->tag.lock))
 			continue;
+#endif
 
 		/* since our temp-check may be modifying our lock table, we
 		 * just mark these as requiring more work */
@@ -2149,6 +2185,10 @@ PostPrepare_Locks(TransactionId xid)
 			if (!LockMethods[LOCK_LOCKMETHOD(*lock)]->transactional)
 				goto next_item;
 
+			/* Ignore VXID locks */
+			if (lock->tag.locktag_type == LOCKTAG_VIRTUALTRANSACTION)
+				goto next_item;
+
 			PROCLOCK_PRINT("PostPrepare_Locks", proclock);
 			LOCK_PRINT("PostPrepare_Locks", lock, 0);
 			Assert(lock->nRequested >= 0);
@@ -2669,7 +2709,7 @@ lock_twophase_recover(TransactionId xid, uint16 info,
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of shared memory"),
-			errhint("You might need to increase max_locks_per_transaction.")));
+		  errhint("You might need to increase max_locks_per_transaction.")));
 	}
 
 	/*
@@ -2734,7 +2774,7 @@ lock_twophase_recover(TransactionId xid, uint16 info,
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of shared memory"),
-			errhint("You might need to increase max_locks_per_transaction.")));
+		  errhint("You might need to increase max_locks_per_transaction.")));
 	}
 
 	/*
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index 2230e26ab7ec..97632b2c912e 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.48 2007/01/05 22:19:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.50.2.1 2009/03/11 00:08:07 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -214,7 +214,7 @@ NumLWLocks(void)
  *		a loadable module.
  *
  * This is only useful if called from the _PG_init hook of a library that
- * is loaded into the postmaster via shared_preload_libraries.  Once
+ * is loaded into the postmaster via shared_preload_libraries.	Once
  * shared memory has been allocated, calls will be ignored.  (We could
  * raise an error, but it seems better to make it a no-op, so that
  * libraries containing such calls can be reloaded if needed.)
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index f797f141bae8..289082dec4ff 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	    $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.188 2007/04/16 18:29:53 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.199 2008/01/26 19:55:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,6 +44,7 @@
 #include "replication/syncrep.h"
 #include "storage/ipc.h"
 #include "storage/spin.h"
+#include "storage/lmgr.h"
 #include "storage/proc.h"
 #include "storage/procarray.h"
 #include "storage/pmsignal.h"
@@ -64,6 +65,7 @@
 int			DeadlockTimeout = 1000;
 int			StatementTimeout = 0;
 int			IdleSessionGangTimeout = 18000;
+bool		log_lock_waits = false;
 
 /* Pointer to this process's PGPROC struct, if any */
 PGPROC	   *MyProc = NULL;
@@ -90,8 +92,12 @@ static LOCALLOCK *lockAwaited = NULL;
 /* Mark these volatile because they can be changed by signal handler */
 static volatile bool statement_timeout_active = false;
 static volatile bool deadlock_timeout_active = false;
+static volatile DeadLockState deadlock_state = DS_NOT_YET_CHECKED;
 volatile bool cancel_from_timeout = false;
 
+/* timeout_start_time is set when log_lock_waits is true */
+static TimestampTz timeout_start_time;
+
 /* statement_fin_time is valid only if statement_timeout_active is true */
 static TimestampTz statement_fin_time;
 
@@ -341,17 +347,21 @@ InitProcess(void)
 	 */
 	SHMQueueElemInit(&(MyProc->links));
 	MyProc->waitStatus = STATUS_OK;
+	MyProc->lxid = InvalidLocalTransactionId;
 	MyProc->xid = InvalidTransactionId;
 	LocalDistribXactRef_Init(&MyProc->localDistribXactRef);
 	MyProc->xmin = InvalidTransactionId;
 	MyProc->serializableIsoLevel = false;
 	MyProc->inDropTransaction = false;
 	MyProc->pid = MyProcPid;
-	/* databaseId and roleId will be filled in later */
+	/* backendId, databaseId and roleId will be filled in later */
+	MyProc->backendId = InvalidBackendId;
 	MyProc->databaseId = InvalidOid;
 	MyProc->roleId = InvalidOid;
-	MyProc->inVacuum = false;
-	MyProc->isAutovacuum = IsAutoVacuumWorkerProcess();
+	MyProc->inCommit = false;
+	MyProc->vacuumFlags = 0;
+	if (IsAutoVacuumWorkerProcess())
+		MyProc->vacuumFlags |= PROC_IS_AUTOVACUUM;
 	MyProc->lwWaiting = false;
 	MyProc->lwExclusive = false;
 	MyProc->lwWaitLink = NULL;
@@ -525,6 +535,7 @@ InitAuxiliaryProcess(void)
 	 */
 	SHMQueueElemInit(&(MyProc->links));
 	MyProc->waitStatus = STATUS_OK;
+	MyProc->lxid = InvalidLocalTransactionId;
 	MyProc->xid = InvalidTransactionId;
 	LocalDistribXactRef_Init(&MyProc->localDistribXactRef);
 	MyProc->xmin = InvalidTransactionId;
@@ -535,8 +546,8 @@ InitAuxiliaryProcess(void)
     MyProc->mppLocalProcessSerial = 0;
     MyProc->mppSessionId = 0;
     MyProc->mppIsWriter = false;
-	MyProc->inVacuum = false;
-	MyProc->isAutovacuum = false;
+	MyProc->inCommit = false;
+	MyProc->vacuumFlags = 0;
 	MyProc->lwWaiting = false;
 	MyProc->lwExclusive = false;
 	MyProc->lwWaitLink = NULL;
@@ -587,25 +598,23 @@ HaveNFreeProcs(int n)
 /*
  * Cancel any pending wait for lock, when aborting a transaction.
  *
- * Returns true if we had been waiting for a lock, else false.
- *
  * (Normally, this would only happen if we accept a cancel/die
  * interrupt while waiting; but an ereport(ERROR) while waiting is
  * within the realm of possibility, too.)
  */
-bool
+void
 LockWaitCancel(void)
 {
 	LWLockId	partitionLock;
 
 	/* Nothing to do if we weren't waiting for a lock */
 	if (lockAwaited == NULL)
-		return false;
+		return;
 
 	/* Don't try to cancel resource locks.*/
 	if (Gp_role == GP_ROLE_DISPATCH && ResourceScheduler &&
 		LOCALLOCK_LOCKMETHOD(*lockAwaited) == RESOURCE_LOCKMETHOD)
-		return false;
+		return;
 
 	/* Turn off the deadlock timer, if it's still running (see ProcSleep) */
 	disable_sig_alarm(false);
@@ -644,12 +653,6 @@ LockWaitCancel(void)
 	 * wakeup signal isn't harmful, and it seems not worth expending cycles to
 	 * get rid of a signal that most likely isn't there.
 	 */
-
-	/*
-	 * Return true even if we were kicked off the lock before we were able to
-	 * remove ourselves.
-	 */
-	return true;
 }
 
 
@@ -688,7 +691,8 @@ static void
 RemoveProcFromArray(int code, Datum arg)
 {
 	Assert(MyProc != NULL);
-	ProcArrayRemove(MyProc, /* forPrepare */ false, /* (not used) isCommit */ false);
+	ProcArrayRemove(MyProc, InvalidTransactionId,
+					/* forPrepare */ false, /* (not used) isCommit */ false);
 }
 
 /*
@@ -931,6 +935,8 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
 	PROC_QUEUE *waitQueue = &(lock->waitProcs);
 	LOCKMASK	myHeldLocks = MyProc->heldLocks;
 	bool		early_deadlock = false;
+	bool		allow_autovacuum_cancel = true;
+	int			myWaitStatus;
 	PGPROC	   *proc;
 	int			i;
 
@@ -1046,6 +1052,9 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
 	 */
 	LWLockRelease(partitionLock);
 
+	/* Reset deadlock_state before enabling the signal handler */
+	deadlock_state = DS_NOT_YET_CHECKED;
+
 	/*
 	 * Set timer so we can wake up after awhile and check for a deadlock. If a
 	 * deadlock is detected, the handler releases the process's semaphore and
@@ -1078,7 +1087,147 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
 	do
 	{
 		PGSemaphoreLock(&MyProc->sem, true);
-	} while (MyProc->waitStatus == STATUS_WAITING);
+
+		/*
+		 * waitStatus could change from STATUS_WAITING to something else
+		 * asynchronously.	Read it just once per loop to prevent surprising
+		 * behavior (such as missing log messages).
+		 */
+		myWaitStatus = MyProc->waitStatus;
+
+		/*
+		 * If we are not deadlocked, but are waiting on an autovacuum-induced
+		 * task, send a signal to interrupt it.
+		 */
+		if (deadlock_state == DS_BLOCKED_BY_AUTOVACUUM && allow_autovacuum_cancel)
+		{
+			PGPROC	   *autovac = GetBlockingAutoVacuumPgproc();
+
+			LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+
+			/*
+			 * Only do it if the worker is not working to protect against Xid
+			 * wraparound.
+			 */
+			if ((autovac != NULL) &&
+				(autovac->vacuumFlags & PROC_IS_AUTOVACUUM) &&
+				!(autovac->vacuumFlags & PROC_VACUUM_FOR_WRAPAROUND))
+			{
+				int			pid = autovac->pid;
+				StringInfoData locktagbuf;
+				StringInfoData logbuf;		/* errdetail for server log */
+
+				initStringInfo(&locktagbuf);
+				initStringInfo(&logbuf);
+				DescribeLockTag(&locktagbuf, &lock->tag);
+				appendStringInfo(&logbuf,
+					  _("Process %d waits for %s on %s."),
+						 MyProcPid,
+						 GetLockmodeName(lock->tag.locktag_lockmethodid,
+										 lockmode),
+						 locktagbuf.data);
+
+				/* release lock as quickly as possible */
+				LWLockRelease(ProcArrayLock);
+
+				ereport(LOG,
+						(errmsg("sending cancel to blocking autovacuum PID %d",
+							pid),
+						 errdetail("%s", logbuf.data)));
+
+				pfree(logbuf.data);
+				pfree(locktagbuf.data);
+
+				/* send the autovacuum worker Back to Old Kent Road */
+				if (kill(pid, SIGINT) < 0)
+				{
+					/* Just a warning to allow multiple callers */
+					ereport(WARNING,
+							(errmsg("could not send signal to process %d: %m",
+									pid)));
+				}
+			}
+			else
+				LWLockRelease(ProcArrayLock);
+
+			/* prevent signal from being resent more than once */
+			allow_autovacuum_cancel = false;
+		}
+
+		/*
+		 * If awoken after the deadlock check interrupt has run, and
+		 * log_lock_waits is on, then report about the wait.
+		 */
+		if (log_lock_waits && deadlock_state != DS_NOT_YET_CHECKED)
+		{
+			StringInfoData buf;
+			const char *modename;
+			long		secs;
+			int			usecs;
+			long		msecs;
+
+			initStringInfo(&buf);
+			DescribeLockTag(&buf, &locallock->tag.lock);
+			modename = GetLockmodeName(locallock->tag.lock.locktag_lockmethodid,
+									   lockmode);
+			TimestampDifference(timeout_start_time, GetCurrentTimestamp(),
+								&secs, &usecs);
+			msecs = secs * 1000 + usecs / 1000;
+			usecs = usecs % 1000;
+
+			if (deadlock_state == DS_SOFT_DEADLOCK)
+				ereport(LOG,
+						(errmsg("process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms",
+							  MyProcPid, modename, buf.data, msecs, usecs)));
+			else if (deadlock_state == DS_HARD_DEADLOCK)
+			{
+				/*
+				 * This message is a bit redundant with the error that will be
+				 * reported subsequently, but in some cases the error report
+				 * might not make it to the log (eg, if it's caught by an
+				 * exception handler), and we want to ensure all long-wait
+				 * events get logged.
+				 */
+				ereport(LOG,
+						(errmsg("process %d detected deadlock while waiting for %s on %s after %ld.%03d ms",
+							  MyProcPid, modename, buf.data, msecs, usecs)));
+			}
+
+			if (myWaitStatus == STATUS_WAITING)
+				ereport(LOG,
+						(errmsg("process %d still waiting for %s on %s after %ld.%03d ms",
+							  MyProcPid, modename, buf.data, msecs, usecs)));
+			else if (myWaitStatus == STATUS_OK)
+				ereport(LOG,
+					(errmsg("process %d acquired %s on %s after %ld.%03d ms",
+							MyProcPid, modename, buf.data, msecs, usecs)));
+			else
+			{
+				Assert(myWaitStatus == STATUS_ERROR);
+
+				/*
+				 * Currently, the deadlock checker always kicks its own
+				 * process, which means that we'll only see STATUS_ERROR when
+				 * deadlock_state == DS_HARD_DEADLOCK, and there's no need to
+				 * print redundant messages.  But for completeness and
+				 * future-proofing, print a message if it looks like someone
+				 * else kicked us off the lock.
+				 */
+				if (deadlock_state != DS_HARD_DEADLOCK)
+					ereport(LOG,
+							(errmsg("process %d failed to acquire %s on %s after %ld.%03d ms",
+							  MyProcPid, modename, buf.data, msecs, usecs)));
+			}
+
+			/*
+			 * At this point we might still need to wait for the lock. Reset
+			 * state so we don't print the above messages again.
+			 */
+			deadlock_state = DS_NO_DEADLOCK;
+
+			pfree(buf.data);
+		}
+	} while (myWaitStatus == STATUS_WAITING);
 
 	/*
 	 * Disable the timer, if it's still running
@@ -1265,57 +1414,72 @@ CheckDeadLock(void)
 		DumpAllLocks();
 #endif
 
-	if (!DeadLockCheck(MyProc))
-	{
-		/* No deadlock, so keep waiting */
-		goto check_done;
-	}
+	/* Run the deadlock check, and set deadlock_state for use by ProcSleep */
+	deadlock_state = DeadLockCheck(MyProc);
 
-	/*
-	 * Oops.  We have a deadlock.
-	 *
-	 * Get this process out of wait state.	(Note: we could do this more
-	 * efficiently by relying on lockAwaited, but use this coding to
-	 * preserve the flexibility to kill some other transaction than the
-	 * one detecting the deadlock.)
-	 *
-	 * RemoveFromWaitQueue sets MyProc->waitStatus to STATUS_ERROR, so
-	 * ProcSleep will report an error after we return from the signal
-	 * handler.
-	 */
-	Assert(MyProc->waitLock != NULL);
-	if (Gp_role == GP_ROLE_DISPATCH && ResourceScheduler && 
-		LOCK_LOCKMETHOD(*(MyProc->waitLock)) == RESOURCE_LOCKMETHOD)
+	if (deadlock_state == DS_HARD_DEADLOCK)
 	{
-		ResRemoveFromWaitQueue(MyProc, 
-							   LockTagHashCode(&(MyProc->waitLock->tag)));
+		/*
+		 * Oops.  We have a deadlock.
+		 *
+		 * Get this process out of wait state.	(Note: we could do this more
+		 * efficiently by relying on lockAwaited, but use this coding to
+		 * preserve the flexibility to kill some other transaction than the
+		 * one detecting the deadlock.)
+		 *
+		 * RemoveFromWaitQueue sets MyProc->waitStatus to STATUS_ERROR, so
+		 * ProcSleep will report an error after we return from the signal
+		 * handler.
+		 */
+		Assert(MyProc->waitLock != NULL);
+		if (Gp_role == GP_ROLE_DISPATCH && ResourceScheduler && 
+			LOCK_LOCKMETHOD(*(MyProc->waitLock)) == RESOURCE_LOCKMETHOD)
+		{
+			ResRemoveFromWaitQueue(MyProc, 
+								   LockTagHashCode(&(MyProc->waitLock->tag)));
+		}
+		else
+		{
+			RemoveFromWaitQueue(MyProc, LockTagHashCode(&(MyProc->waitLock->tag)), true);
+		}
+
+		/*
+		 * Unlock my semaphore so that the interrupted ProcSleep() call can
+		 * finish.
+		 */
+		PGSemaphoreUnlock(&MyProc->sem);
+
+		/*
+		 * We're done here.  Transaction abort caused by the error that
+		 * ProcSleep will raise will cause any other locks we hold to be
+		 * released, thus allowing other processes to wake up; we don't need
+		 * to do that here.  NOTE: an exception is that releasing locks we
+		 * hold doesn't consider the possibility of waiters that were blocked
+		 * behind us on the lock we just failed to get, and might now be
+		 * wakable because we're not in front of them anymore.  However,
+		 * RemoveFromWaitQueue took care of waking up any such processes.
+		 */
 	}
-	else
+	else if (log_lock_waits || deadlock_state == DS_BLOCKED_BY_AUTOVACUUM)
 	{
-		RemoveFromWaitQueue(MyProc, LockTagHashCode(&(MyProc->waitLock->tag)), true);
+		/*
+		 * Unlock my semaphore so that the interrupted ProcSleep() call can
+		 * print the log message (we daren't do it here because we are inside
+		 * a signal handler).  It will then sleep again until someone releases
+		 * the lock.
+		 *
+		 * If blocked by autovacuum, this wakeup will enable ProcSleep to send
+		 * the cancelling signal to the autovacuum worker.
+		 */
+		PGSemaphoreUnlock(&MyProc->sem);
 	}
 
 	/*
-	 * Unlock my semaphore so that the interrupted ProcSleep() call can
-	 * finish.
-	 */
-	PGSemaphoreUnlock(&MyProc->sem);
-
-	/*
-	 * We're done here.  Transaction abort caused by the error that ProcSleep
-	 * will raise will cause any other locks we hold to be released, thus
-	 * allowing other processes to wake up; we don't need to do that here.
-	 * NOTE: an exception is that releasing locks we hold doesn't consider the
-	 * possibility of waiters that were blocked behind us on the lock we just
-	 * failed to get, and might now be wakable because we're not in front of
-	 * them anymore.  However, RemoveFromWaitQueue took care of waking up any
-	 * such processes.
-	 */
-
-	/*
-	 * Release locks acquired at head of routine.  Order is not critical, so
-	 * do it back-to-front to avoid waking another CheckDeadLock instance
-	 * before it can get all the locks.
+	 * And release locks.  We do this in reverse order for two reasons: (1)
+	 * Anyone else who needs more than one of the locks will be trying to lock
+	 * them in increasing order; we don't want to release the other process
+	 * until it can get all the locks it needs. (2) This avoids O(N^2)
+	 * behavior inside LWLockRelease.
 	 */
 check_done:
 	for (i = NUM_LOCK_PARTITIONS; --i >= 0;)
@@ -1416,8 +1580,8 @@ enable_sig_alarm(int delayms, bool is_statement_timeout)
 		 * to the state variables.	The deadlock checker may get run earlier
 		 * than normal, but that does no harm.
 		 */
-		fin_time = GetCurrentTimestamp();
-		fin_time = TimestampTzPlusMilliseconds(fin_time, delayms);
+		timeout_start_time = GetCurrentTimestamp();
+		fin_time = TimestampTzPlusMilliseconds(timeout_start_time, delayms);
 		deadlock_timeout_active = true;
 		if (fin_time >= statement_fin_time)
 			return true;
@@ -1426,6 +1590,9 @@ enable_sig_alarm(int delayms, bool is_statement_timeout)
 	{
 		/* Begin deadlock timeout with no statement-level timeout */
 		deadlock_timeout_active = true;
+		/* GetCurrentTimestamp can be expensive, so only do it if we must */
+		if (log_lock_waits)
+			timeout_start_time = GetCurrentTimestamp();
 	}
 
 	/* If we reach here, okay to set the timer interrupt */
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 23ccf4cd1edf..c7737b149e5e 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -8,12 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/page/bufpage.c,v 1.71 2007/02/21 20:02:17 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/page/bufpage.c,v 1.78 2008/02/10 20:39:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "access/htup.h"
 #include "storage/bufpage.h"
 
 
@@ -44,6 +45,7 @@ PageInit(Page page, Size pageSize, Size specialSize)
 	p->pd_upper = pageSize - specialSize;
 	p->pd_special = pageSize - specialSize;
 	PageSetPageSizeAndVersion(page, pageSize, PG_PAGE_LAYOUT_VERSION);
+	/* p->pd_prune_xid = InvalidTransactionId;		done by above MemSet */
 }
 
 
@@ -99,12 +101,18 @@ PageHeaderIsValid(PageHeader page)
  *	Add an item to a page.	Return value is offset at which it was
  *	inserted, or InvalidOffsetNumber if there's not room to insert.
  *
- *	If offsetNumber is valid and <= current max offset in the page,
+ *	If overwrite is true, we just store the item at the specified
+ *	offsetNumber (which must be either a currently-unused item pointer,
+ *	or one past the last existing item).  Otherwise,
+ *	if offsetNumber is valid and <= current max offset in the page,
  *	insert item into the array at that position by shuffling ItemId's
  *	down to make room.
  *	If offsetNumber is not valid, then assign one by finding the first
  *	one that is both unused and deallocated.
  *
+ *	If is_heap is true, we enforce that there can't be more than
+ *	MaxHeapTuplesPerPage line pointers on the page.
+ *
  *	!!! EREPORT(ERROR) IS DISALLOWED HERE !!!
  */
 OffsetNumber
@@ -112,7 +120,8 @@ PageAddItem(Page page,
 			Item item,
 			Size size,
 			OffsetNumber offsetNumber,
-			ItemIdFlags flags)
+			bool overwrite,
+			bool is_heap)
 {
 	PageHeader	phdr = (PageHeader) page;
 	Size		alignedSize;
@@ -121,9 +130,6 @@ PageAddItem(Page page,
 	ItemId		itemId;
 	OffsetNumber limit;
 	bool		needshuffle = false;
-	bool		overwritemode = (flags & OverwritePageMode) != 0;
-
-	flags &= ~OverwritePageMode;
 
 	/*
 	 * Be wary about corrupted page pointers
@@ -146,12 +152,12 @@ PageAddItem(Page page,
 	if (OffsetNumberIsValid(offsetNumber))
 	{
 		/* yes, check it */
-		if (overwritemode)
+		if (overwrite)
 		{
 			if (offsetNumber < limit)
 			{
 				itemId = PageGetItemId(phdr, offsetNumber);
-				if (ItemIdIsUsed(itemId) || ItemIdGetLength(itemId) != 0)
+				if (ItemIdIsUsed(itemId) || ItemIdHasStorage(itemId))
 				{
 					elog(WARNING, "will not overwrite a used ItemId");
 					return InvalidOffsetNumber;
@@ -170,11 +176,15 @@ PageAddItem(Page page,
 		/* if no free slot, we'll put it at limit (1st open slot) */
 		if (PageHasFreeLinePointers(phdr))
 		{
-			/* look for "recyclable" (unused & deallocated) ItemId */
+			/*
+			 * Look for "recyclable" (unused) ItemId.  We check for no storage
+			 * as well, just to be paranoid --- unused items should never have
+			 * storage.
+			 */
 			for (offsetNumber = 1; offsetNumber < limit; offsetNumber++)
 			{
 				itemId = PageGetItemId(phdr, offsetNumber);
-				if (!ItemIdIsUsed(itemId) && ItemIdGetLength(itemId) == 0)
+				if (!ItemIdIsUsed(itemId) && !ItemIdHasStorage(itemId))
 					break;
 			}
 			if (offsetNumber >= limit)
@@ -196,6 +206,12 @@ PageAddItem(Page page,
 		return InvalidOffsetNumber;
 	}
 
+	if (is_heap && offsetNumber > MaxHeapTuplesPerPage)
+	{
+		elog(WARNING, "can't put more than MaxHeapTuplesPerPage items in a heap page");
+		return InvalidOffsetNumber;
+	}
+
 	/*
 	 * Compute new lower and upper pointers for page, see if it'll fit.
 	 *
@@ -224,9 +240,7 @@ PageAddItem(Page page,
 				(limit - offsetNumber) * sizeof(ItemIdData));
 
 	/* set the item pointer */
-	itemId->lp_off = upper;
-	itemId->lp_len = size;
-	itemId->lp_flags = flags;
+	ItemIdSetNormal(itemId, upper, size);
 
 	/* copy the item's data onto the page */
 	memcpy((char *) page + upper, item, size);
@@ -313,11 +327,10 @@ itemoffcompare(const void *itemidp1, const void *itemidp2)
  *
  * This routine is usable for heap pages only, but see PageIndexMultiDelete.
  *
- * Returns number of unused line pointers on page.	If "unused" is not NULL
- * then the unused[] array is filled with indexes of unused line pointers.
+ * As a side effect, the page's PD_HAS_FREE_LINES hint bit is updated.
  */
-int
-PageRepairFragmentation(Page page, OffsetNumber *unused)
+void
+PageRepairFragmentation(Page page)
 {
 	Offset		pd_lower = ((PageHeader) page)->pd_lower;
 	Offset		pd_upper = ((PageHeader) page)->pd_upper;
@@ -326,7 +339,8 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
 				itemidptr;
 	ItemId		lp;
 	int			nline,
-				nused;
+				nstorage,
+				nunused;
 	int			i;
 	Size		totallen;
 	Offset		upper;
@@ -350,38 +364,38 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
 				 errSendAlert(true)));
 
 	nline = PageGetMaxOffsetNumber(page);
-	nused = 0;
-	for (i = 0; i < nline; i++)
+	nunused = nstorage = 0;
+	for (i = FirstOffsetNumber; i <= nline; i++)
 	{
-		lp = PageGetItemId(page, i + 1);
-		if (ItemIdDeleted(lp))	/* marked for deletion */
-			lp->lp_flags &= ~(LP_USED | LP_DELETE);
+		lp = PageGetItemId(page, i);
 		if (ItemIdIsUsed(lp))
-			nused++;
-		else if (unused)
-			unused[i - nused] = (OffsetNumber) i;
+		{
+			if (ItemIdHasStorage(lp))
+				nstorage++;
+		}
+		else
+		{
+			/* Unused entries should have lp_len = 0, but make sure */
+			ItemIdSetUnused(lp);
+			nunused++;
+		}
 	}
 
-	if (nused == 0)
+	if (nstorage == 0)
 	{
 		/* Page is completely empty, so just reset it quickly */
-		for (i = 0; i < nline; i++)
-		{
-			lp = PageGetItemId(page, i + 1);
-			lp->lp_len = 0;		/* indicate unused & deallocated */
-		}
 		((PageHeader) page)->pd_upper = pd_special;
 	}
 	else
-	{							/* nused != 0 */
+	{							/* nstorage != 0 */
 		/* Need to compact the page the hard way */
-		itemidbase = (itemIdSort) palloc(sizeof(itemIdSortData) * nused);
+		itemidbase = (itemIdSort) palloc(sizeof(itemIdSortData) * nstorage);
 		itemidptr = itemidbase;
 		totallen = 0;
 		for (i = 0; i < nline; i++)
 		{
 			lp = PageGetItemId(page, i + 1);
-			if (ItemIdIsUsed(lp))
+			if (ItemIdHasStorage(lp))
 			{
 				itemidptr->offsetindex = i;
 				itemidptr->itemoff = ItemIdGetOffset(lp);
@@ -396,10 +410,6 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
 				totallen += itemidptr->alignedlen;
 				itemidptr++;
 			}
-			else
-			{
-				lp->lp_len = 0; /* indicate unused & deallocated */
-			}
 		}
 
 		if (totallen > (Size) (pd_special - pd_lower))
@@ -410,13 +420,13 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
 			   errSendAlert(true)));
 
 		/* sort itemIdSortData array into decreasing itemoff order */
-		qsort((char *) itemidbase, nused, sizeof(itemIdSortData),
+		qsort((char *) itemidbase, nstorage, sizeof(itemIdSortData),
 			  itemoffcompare);
 
 		/* compactify page */
 		upper = pd_special;
 
-		for (i = 0, itemidptr = itemidbase; i < nused; i++, itemidptr++)
+		for (i = 0, itemidptr = itemidbase; i < nstorage; i++, itemidptr++)
 		{
 			lp = PageGetItemId(page, itemidptr->offsetindex + 1);
 			upper -= itemidptr->alignedlen;
@@ -432,18 +442,19 @@ PageRepairFragmentation(Page page, OffsetNumber *unused)
 	}
 
 	/* Set hint bit for PageAddItem */
-	if (nused < nline)
+	if (nunused > 0)
 		PageSetHasFreeLinePointers(page);
 	else
 		PageClearHasFreeLinePointers(page);
-
-	return (nline - nused);
 }
 
 /*
  * PageGetFreeSpace
  *		Returns the size of the free (allocatable) space on a page,
- *		deducted by the space needed for a new line pointer.
+ *		reduced by the space needed for a new line pointer.
+ *
+ * Note: this should usually only be used on index pages.  Use
+ * PageGetHeapFreeSpace on heap pages.
  */
 Size
 PageGetFreeSpace(Page page)
@@ -466,7 +477,8 @@ PageGetFreeSpace(Page page)
 
 /*
  * PageGetExactFreeSpace
- *		Returns the size of the free (allocatable) space on a page.
+ *		Returns the size of the free (allocatable) space on a page,
+ *		without any consideration for adding/removing line pointers.
  */
 Size
 PageGetExactFreeSpace(Page page)
@@ -480,10 +492,81 @@ PageGetExactFreeSpace(Page page)
 	space = (int) ((PageHeader) page)->pd_upper -
 		(int) ((PageHeader) page)->pd_lower;
 
+	if (space < 0)
+		return 0;
+
 	return (Size) space;
 }
 
 
+/*
+ * PageGetHeapFreeSpace
+ *		Returns the size of the free (allocatable) space on a page,
+ *		reduced by the space needed for a new line pointer.
+ *
+ * The difference between this and PageGetFreeSpace is that this will return
+ * zero if there are already MaxHeapTuplesPerPage line pointers in the page
+ * and none are free.  We use this to enforce that no more than
+ * MaxHeapTuplesPerPage line pointers are created on a heap page.  (Although
+ * no more tuples than that could fit anyway, in the presence of redirected
+ * or dead line pointers it'd be possible to have too many line pointers.
+ * To avoid breaking code that assumes MaxHeapTuplesPerPage is a hard limit
+ * on the number of line pointers, we make this extra check.)
+ */
+Size
+PageGetHeapFreeSpace(Page page)
+{
+	Size		space;
+
+	space = PageGetFreeSpace(page);
+	if (space > 0)
+	{
+		OffsetNumber offnum,
+					nline;
+
+		/*
+		 * Are there already MaxHeapTuplesPerPage line pointers in the page?
+		 */
+		nline = PageGetMaxOffsetNumber(page);
+		if (nline >= MaxHeapTuplesPerPage)
+		{
+			if (PageHasFreeLinePointers((PageHeader) page))
+			{
+				/*
+				 * Since this is just a hint, we must confirm that there is
+				 * indeed a free line pointer
+				 */
+				for (offnum = FirstOffsetNumber; offnum <= nline; offnum++)
+				{
+					ItemId		lp = PageGetItemId(page, offnum);
+
+					if (!ItemIdIsUsed(lp))
+						break;
+				}
+
+				if (offnum > nline)
+				{
+					/*
+					 * The hint is wrong, but we can't clear it here since we
+					 * don't have the ability to mark the page dirty.
+					 */
+					space = 0;
+				}
+			}
+			else
+			{
+				/*
+				 * Although the hint might be wrong, PageAddItem will believe
+				 * it anyway, so we must believe it too.
+				 */
+				space = 0;
+			}
+		}
+	}
+	return space;
+}
+
+
 /*
  * PageIndexTupleDelete
  *
@@ -524,6 +607,7 @@ PageIndexTupleDelete(Page page, OffsetNumber offnum)
 	offidx = offnum - 1;
 
 	tup = PageGetItemId(page, offnum);
+	Assert(ItemIdHasStorage(tup));
 	size = ItemIdGetLength(tup);
 	offset = ItemIdGetOffset(tup);
 
@@ -582,6 +666,7 @@ PageIndexTupleDelete(Page page, OffsetNumber offnum)
 		{
 			ItemId		ii = PageGetItemId(phdr, i);
 
+			Assert(ItemIdHasStorage(ii));
 			if (ItemIdGetOffset(ii) <= offset)
 				ii->lp_off += size;
 		}
@@ -660,6 +745,7 @@ PageIndexMultiDelete(Page page, OffsetNumber *itemnos, int nitems)
 	for (offnum = 1; offnum <= nline; offnum++)
 	{
 		lp = PageGetItemId(page, offnum);
+		Assert(ItemIdHasStorage(lp));
 		size = ItemIdGetLength(lp);
 		offset = ItemIdGetOffset(lp);
 		if (offset < pd_upper ||
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 8c956bd85742..8649b2579e83 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.125 2007/01/05 22:19:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.135.2.1 2008/04/18 06:48:50 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,9 +37,16 @@
 /* interval for calling AbsorbFsyncRequests in mdsync */
 #define FSYNCS_PER_ABSORB		10
 
-/* special values for the segno arg to RememberFsyncRequest */
+/*
+ * Special values for the segno arg to RememberFsyncRequest.
+ *
+ * Note that CompactBgwriterRequestQueue assumes that it's OK to remove an
+ * fsync request from the queue if an identical, subsequent request is found.
+ * See comments there before making changes here.
+ */
 #define FORGET_RELATION_FSYNC	(InvalidBlockNumber)
 #define FORGET_DATABASE_FSYNC	(InvalidBlockNumber-1)
+#define UNLINK_RELATION_REQUEST (InvalidBlockNumber-2)
 
 /*
  * On Windows, we have to interpret EACCES as possibly meaning the same as
@@ -49,9 +56,9 @@
  * a pending fsync request getting revoked ... see mdsync).
  */
 #ifndef WIN32
-#define FILE_POSSIBLY_DELETED(err)  ((err) == ENOENT)
+#define FILE_POSSIBLY_DELETED(err)	((err) == ENOENT)
 #else
-#define FILE_POSSIBLY_DELETED(err)  ((err) == ENOENT || (err) == EACCES)
+#define FILE_POSSIBLY_DELETED(err)	((err) == ENOENT || (err) == EACCES)
 #endif
 
 /*
@@ -73,7 +80,7 @@
  *	not needed because of an mdtruncate() operation.  The reason for leaving
  *	them present at size zero, rather than unlinking them, is that other
  *	backends and/or the bgwriter might be holding open file references to
- *	such segments.  If the relation expands again after mdtruncate(), such
+ *	such segments.	If the relation expands again after mdtruncate(), such
  *	that a deactivated segment becomes active again, it is important that
  *	such file references still be valid --- else data might get written
  *	out to an unlinked old copy of a segment file that will eventually
@@ -120,6 +127,10 @@ static MemoryContext MdCxt;		/* context for all md.c allocations */
  * table remembers the pending operations.	We use a hash table mostly as
  * a convenient way of eliminating duplicate requests.
  *
+ * We use a similar mechanism to remember no-longer-needed files that can
+ * be deleted after the next checkpoint, but we use a linked list instead of
+ * a hash table, because we don't expect there to be any duplicate requests.
+ *
  * (Regular backends do not track pending operations locally, but forward
  * them to the bgwriter.)
  */
@@ -138,9 +149,17 @@ typedef struct
 	CycleCtr	cycle_ctr;		/* mdsync_cycle_ctr when request was made */
 } PendingOperationEntry;
 
+typedef struct
+{
+	RelFileNode rnode;			/* the dead relation to delete */
+	CycleCtr	cycle_ctr;		/* mdckpt_cycle_ctr when request was made */
+} PendingUnlinkEntry;
+
 static HTAB *pendingOpsTable = NULL;
+static List *pendingUnlinks = NIL;
 
 static CycleCtr mdsync_cycle_ctr = 0;
+static CycleCtr mdckpt_cycle_ctr = 0;
 
 typedef enum					/* behavior for mdopen & _mdfd_getseg */
 {
@@ -152,6 +171,7 @@ typedef enum					/* behavior for mdopen & _mdfd_getseg */
 /* local routines */
 static MdMirVec *mdopen(SMgrRelation reln, ExtensionBehavior behavior);
 static void register_dirty_segment(SMgrRelation reln, MdMirVec *seg);
+static void register_unlink(RelFileNode rnode);
 static MdMirVec *_mirvec_alloc(void);
 
 #ifndef LET_OS_MANAGE_FILESIZE
@@ -159,7 +179,7 @@ static MdMirVec *_mdmir_openseg(SMgrRelation reln, BlockNumber segno,
 			  bool createIfDoesntExist);
 #endif
 static MdMirVec *_mdmir_getseg(SMgrRelation reln, BlockNumber blkno,
-							 bool isTemp, ExtensionBehavior behavior);
+			  bool isTemp, ExtensionBehavior behavior);
 static BlockNumber _mdnblocks(SMgrRelation reln, MdMirVec *seg);
 
 
@@ -194,6 +214,7 @@ mdinit(void)
 									  100L,
 									  &hash_ctl,
 								   HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT);
+		pendingUnlinks = NIL;
 	}
 }
 
@@ -783,8 +804,30 @@ mdcreate(
  * Note that we're passed a RelFileNode --- by the time this is called,
  * there won't be an SMgrRelation hashtable entry anymore.
  *
+ * Actually, we don't unlink the first segment file of the relation, but
+ * just truncate it to zero length, and record a request to unlink it after
+ * the next checkpoint.  Additional segments can be unlinked immediately,
+ * however.  Leaving the empty file in place prevents that relfilenode
+ * number from being reused.  The scenario this protects us from is:
+ * 1. We delete a relation (and commit, and actually remove its file).
+ * 2. We create a new relation, which by chance gets the same relfilenode as
+ *	  the just-deleted one (OIDs must've wrapped around for that to happen).
+ * 3. We crash before another checkpoint occurs.
+ * During replay, we would delete the file and then recreate it, which is fine
+ * if the contents of the file were repopulated by subsequent WAL entries.
+ * But if we didn't WAL-log insertions, but instead relied on fsyncing the
+ * file after populating it (as for instance CLUSTER and CREATE INDEX do),
+ * the contents of the file would be lost forever.	By leaving the empty file
+ * until after the next checkpoint, we prevent reassignment of the relfilenode
+ * number until it's safe, because relfilenode assignment skips over any
+ * existing file.
+ *
  * If isRedo is true, it's okay for the relation to be already gone.
- * Also, any failure should be reported as WARNING not ERROR, because
+ * Also, we should remove the file immediately instead of queuing a request
+ * for later, since during redo there's no possibility of creating a
+ * conflicting relation.
+ *
+ * Note: any failure should be reported as WARNING not ERROR, because
  * we are usually not in a transaction anymore when this is called.
  */
 void
@@ -804,12 +847,12 @@ mdunlink(
 {
 	int			 primaryError = 0;
 	char		 tmp[MAXPGPATH];
-	char		*path;
+	char	   *path;
 	int			 segmentFileNum;
 
 	/*
-	 * We have to clean out any pending fsync requests for the doomed relation,
-	 * else the next mdsync() will fail.
+	 * We have to clean out any pending fsync requests for the doomed
+	 * relation, else the next mdsync() will fail.
 	 */
 	ForgetRelationFsyncRequests(rnode);
 
@@ -919,6 +962,10 @@ mdunlink(
 			break;
 		}
 	}
+
+	/* Register request to unlink first segment later */
+	if (!isRedo)
+		register_unlink(rnode);
 }
 
 static void mdsetupdropobjmirroraccess(	
@@ -1289,7 +1336,7 @@ mdextend(SMgrRelation reln, BlockNumber blocknum, char *buffer, bool isTemp)
 	/*
 	 * Note: because caller usually obtained blocknum by calling mdnblocks,
 	 * which did a seek(SEEK_END), this seek is often redundant and will be
-	 * optimized away by fd.c.  It's not redundant, however, if there is a
+	 * optimized away by fd.c.	It's not redundant, however, if there is a
 	 * partial page at the end of the file. In that case we want to try to
 	 * overwrite the partial page with a full page.  It's also not redundant
 	 * if bufmgr.c had to dump another buffer of the same file to make room
@@ -1507,16 +1554,17 @@ mdread(SMgrRelation reln, BlockNumber blocknum, char *buffer)
 		if (nbytes < 0)
 			ereport(ERROR,
 					(errcode_for_file_access(),
-					 errmsg("could not read block %u of relation %u/%u/%u: %m",
-							blocknum,
-							reln->smgr_rnode.spcNode,
-							reln->smgr_rnode.dbNode,
-							reln->smgr_rnode.relNode)));
+				   errmsg("could not read block %u of relation %u/%u/%u: %m",
+						  blocknum,
+						  reln->smgr_rnode.spcNode,
+						  reln->smgr_rnode.dbNode,
+						  reln->smgr_rnode.relNode)));
+
 		/*
 		 * Short read: we are at or past EOF, or we read a partial block at
 		 * EOF.  Normally this is an error; upper levels should never try to
-		 * read a nonexistent block.  However, if zero_damaged_pages is ON
-		 * or we are InRecovery, we should instead return zeroes without
+		 * read a nonexistent block.  However, if zero_damaged_pages is ON or
+		 * we are InRecovery, we should instead return zeroes without
 		 * complaining.  This allows, for example, the case of trying to
 		 * update a block that was later truncated away.
 		 */
@@ -1603,7 +1651,7 @@ mdnblocks(SMgrRelation reln)
 	 * NOTE: this assumption could only be wrong if another backend has
 	 * truncated the relation.	We rely on higher code levels to handle that
 	 * scenario by closing and re-opening the md fd, which is handled via
-	 * relcache flush.  (Since the bgwriter doesn't participate in relcache
+	 * relcache flush.	(Since the bgwriter doesn't participate in relcache
 	 * flush, it could have segment chain entries for inactive segments;
 	 * that's OK because the bgwriter never needs to compute relation size.)
 	 */
@@ -1640,11 +1688,11 @@ mdnblocks(SMgrRelation reln)
 			if (v->mdmir_chain == NULL)
 				ereport(ERROR,
 						(errcode_for_file_access(),
-						 errmsg("could not open segment %u of relation %u/%u/%u: %m",
-								segno,
-								reln->smgr_rnode.spcNode,
-								reln->smgr_rnode.dbNode,
-								reln->smgr_rnode.relNode)));
+				 errmsg("could not open segment %u of relation %u/%u/%u: %m",
+						segno,
+						reln->smgr_rnode.spcNode,
+						reln->smgr_rnode.dbNode,
+						reln->smgr_rnode.relNode)));
 		}
 
 		v = v->mdmir_chain;
@@ -1674,8 +1722,8 @@ mdtruncate(SMgrRelation reln, BlockNumber nblocks, bool isTemp, bool allowNotFou
 	}
 
 	/*
-	 * NOTE: mdnblocks makes sure we have opened all active segments, so
-	 * that truncation loop will get them all!
+	 * NOTE: mdnblocks makes sure we have opened all active segments, so that
+	 * truncation loop will get them all!
 	 */
 	curnblk = mdnblocks(reln);
 	if (nblocks > curnblk)
@@ -1710,9 +1758,9 @@ mdtruncate(SMgrRelation reln, BlockNumber nblocks, bool isTemp, bool allowNotFou
 		if (priorblocks > nblocks)
 		{
 			/*
-			 * This segment is no longer active (and has already been
-			 * unlinked from the mdmir_chain). We truncate the file, but do
-			 * not delete it, for reasons explained in the header comments.
+			 * This segment is no longer active (and has already been unlinked
+			 * from the mdfd_chain). We truncate the file, but do not delete
+			 * it, for reasons explained in the header comments.
 			 */
 			if (!MirroredBufferPool_Truncate(&v->mdmir_open, 0))
 				ereport(ERROR,
@@ -1790,8 +1838,8 @@ mdimmedsync(SMgrRelation reln)
 	BlockNumber curnblk;
 
 	/*
-	 * NOTE: mdnblocks makes sure we have opened all active segments, so
-	 * that fsync loop will get them all!
+	 * NOTE: mdnblocks makes sure we have opened all active segments, so that
+	 * fsync loop will get them all!
 	 */
 	curnblk = mdnblocks(reln);
 	v = mdopen(reln, EXTENSION_FAIL);
@@ -1802,11 +1850,11 @@ mdimmedsync(SMgrRelation reln)
 		if (!MirroredBufferPool_Flush(&v->mdmir_open))
 			ereport(ERROR,
 					(errcode_for_file_access(),
-					 errmsg("could not fsync segment %u of relation %u/%u/%u: %m",
-							v->mdmir_segno,
-							reln->smgr_rnode.spcNode,
-							reln->smgr_rnode.dbNode,
-							reln->smgr_rnode.relNode)));
+				errmsg("could not fsync segment %u of relation %u/%u/%u: %m",
+					   v->mdmir_segno,
+					   reln->smgr_rnode.spcNode,
+					   reln->smgr_rnode.dbNode,
+					   reln->smgr_rnode.relNode)));
 		v = v->mdmir_chain;
 	}
 #else
@@ -1842,9 +1890,12 @@ mdsync(void)
 
 	/*
 	 * If we are in the bgwriter, the sync had better include all fsync
-	 * requests that were queued by backends before the checkpoint REDO
-	 * point was determined.  We go that a little better by accepting all
-	 * requests queued up to the point where we start fsync'ing.
+	 * requests that were queued by backends up to this point.	The tightest
+	 * race condition that could occur is that a buffer that must be written
+	 * and fsync'd for the checkpoint could have been dumped by a backend just
+	 * before it was visited by BufferSync().  We know the backend will have
+	 * queued an fsync request before clearing the buffer's dirtybit, so we
+	 * are safe as long as we do an Absorb after completing BufferSync().
 	 */
 	AbsorbFsyncRequests();
 
@@ -1856,21 +1907,21 @@ mdsync(void)
 	 * ones: new ones will have cycle_ctr equal to the incremented value of
 	 * mdsync_cycle_ctr.
 	 *
-	 * In normal circumstances, all entries present in the table at this
-	 * point will have cycle_ctr exactly equal to the current (about to be old)
+	 * In normal circumstances, all entries present in the table at this point
+	 * will have cycle_ctr exactly equal to the current (about to be old)
 	 * value of mdsync_cycle_ctr.  However, if we fail partway through the
 	 * fsync'ing loop, then older values of cycle_ctr might remain when we
 	 * come back here to try again.  Repeated checkpoint failures would
 	 * eventually wrap the counter around to the point where an old entry
 	 * might appear new, causing us to skip it, possibly allowing a checkpoint
-	 * to succeed that should not have.  To forestall wraparound, any time
-	 * the previous mdsync() failed to complete, run through the table and
+	 * to succeed that should not have.  To forestall wraparound, any time the
+	 * previous mdsync() failed to complete, run through the table and
 	 * forcibly set cycle_ctr = mdsync_cycle_ctr.
 	 *
 	 * Think not to merge this loop with the main loop, as the problem is
 	 * exactly that that loop may fail before having visited all the entries.
-	 * From a performance point of view it doesn't matter anyway, as this
-	 * path will never be taken in a system that's functioning normally.
+	 * From a performance point of view it doesn't matter anyway, as this path
+	 * will never be taken in a system that's functioning normally.
 	 */
 	if (mdsync_in_progress)
 	{
@@ -1904,10 +1955,10 @@ mdsync(void)
 		Assert((CycleCtr) (entry->cycle_ctr + 1) == mdsync_cycle_ctr);
 
 		/*
-		 * If fsync is off then we don't have to bother opening the file
-		 * at all.  (We delay checking until this point so that changing
-		 * fsync on the fly behaves sensibly.)  Also, if the entry is
-		 * marked canceled, fall through to delete it.
+		 * If fsync is off then we don't have to bother opening the file at
+		 * all.  (We delay checking until this point so that changing fsync on
+		 * the fly behaves sensibly.)  Also, if the entry is marked canceled,
+		 * fall through to delete it.
 		 */
 		if (enableFsync && !entry->canceled)
 		{
@@ -1928,16 +1979,16 @@ mdsync(void)
 
 			/*
 			 * The fsync table could contain requests to fsync segments that
-			 * have been deleted (unlinked) by the time we get to them.
-			 * Rather than just hoping an ENOENT (or EACCES on Windows) error
-			 * can be ignored, what we do on error is absorb pending requests
-			 * and then retry.  Since mdunlink() queues a "revoke" message
-			 * before actually unlinking, the fsync request is guaranteed to
-			 * be marked canceled after the absorb if it really was this case.
+			 * have been deleted (unlinked) by the time we get to them. Rather
+			 * than just hoping an ENOENT (or EACCES on Windows) error can be
+			 * ignored, what we do on error is absorb pending requests and
+			 * then retry.	Since mdunlink() queues a "revoke" message before
+			 * actually unlinking, the fsync request is guaranteed to be
+			 * marked canceled after the absorb if it really was this case.
 			 * DROP DATABASE likewise has to tell us to forget fsync requests
 			 * before it starts deletions.
 			 */
-			for (failures = 0; ; failures++)	/* loop exits at "break" */
+			for (failures = 0;; failures++)		/* loop exits at "break" */
 			{
 				SMgrRelation reln;
 				MdMirVec    *seg;
@@ -1962,13 +2013,13 @@ mdsync(void)
 				/*
 				 * It is possible that the relation has been dropped or
 				 * truncated since the fsync request was entered.  Therefore,
-				 * allow ENOENT, but only if we didn't fail already on
-				 * this file.  This applies both during _mdfd_getseg() and
-				 * during FileSync, since fd.c might have closed the file
-				 * behind our back.
+				 * allow ENOENT, but only if we didn't fail already on this
+				 * file.  This applies both during _mdfd_getseg() and during
+				 * FileSync, since fd.c might have closed the file behind our
+				 * back.
 				 */
 				seg = _mdmir_getseg(reln,
-								   entry->tag.segno * ((BlockNumber) RELSEG_SIZE),
+							  entry->tag.segno * ((BlockNumber) RELSEG_SIZE),
 								   false, EXTENSION_RETURN_NULL);
 				if (seg != NULL &&
 					MirroredBufferPool_Flush(&seg->mdmir_open))
@@ -1976,12 +2027,11 @@ mdsync(void)
 
 				/*
 				 * XXX is there any point in allowing more than one retry?
-				 * Don't see one at the moment, but easy to change the
-				 * test here if so.
+				 * Don't see one at the moment, but easy to change the test
+				 * here if so.
 				 */
 				if (!FILE_POSSIBLY_DELETED(errno) ||
 					failures > 0)
-				{
 					ereport(ERROR,
 							(errcode_for_file_access(),
 							 errmsg("could not fsync segment %u of relation %u/%u/%u: %m",
@@ -1989,7 +2039,6 @@ mdsync(void)
 									entry->tag.rnode.spcNode,
 									entry->tag.rnode.dbNode,
 									entry->tag.rnode.relNode)));
-				}
 				else
 					ereport(DEBUG1,
 							(errcode_for_file_access(),
@@ -2003,27 +2052,115 @@ mdsync(void)
 				 * Absorb incoming requests and check to see if canceled.
 				 */
 				AbsorbFsyncRequests();
-				absorb_counter = FSYNCS_PER_ABSORB;	/* might as well... */
+				absorb_counter = FSYNCS_PER_ABSORB;		/* might as well... */
 
 				if (entry->canceled)
 					break;
-			}	/* end retry loop */
+			}					/* end retry loop */
 		}
 
 		/*
-		 * If we get here, either we fsync'd successfully, or we don't have
-		 * to because enableFsync is off, or the entry is (now) marked
-		 * canceled.  Okay to delete it.
+		 * If we get here, either we fsync'd successfully, or we don't have to
+		 * because enableFsync is off, or the entry is (now) marked canceled.
+		 * Okay to delete it.
 		 */
 		if (hash_search(pendingOpsTable, &entry->tag,
 						HASH_REMOVE, NULL) == NULL)
 			elog(ERROR, "pendingOpsTable corrupted");
-	}	/* end loop over hashtable entries */
+	}							/* end loop over hashtable entries */
 
 	/* Flag successful completion of mdsync */
 	mdsync_in_progress = false;
 }
 
+/*
+ * mdpreckpt() -- Do pre-checkpoint work
+ *
+ * To distinguish unlink requests that arrived before this checkpoint
+ * started from those that arrived during the checkpoint, we use a cycle
+ * counter similar to the one we use for fsync requests. That cycle
+ * counter is incremented here.
+ *
+ * This must be called *before* the checkpoint REDO point is determined.
+ * That ensures that we won't delete files too soon.
+ *
+ * Note that we can't do anything here that depends on the assumption
+ * that the checkpoint will be completed.
+ */
+void
+mdpreckpt(void)
+{
+	ListCell   *cell;
+
+	/*
+	 * In case the prior checkpoint wasn't completed, stamp all entries in the
+	 * list with the current cycle counter.  Anything that's in the list at
+	 * the start of checkpoint can surely be deleted after the checkpoint is
+	 * finished, regardless of when the request was made.
+	 */
+	foreach(cell, pendingUnlinks)
+	{
+		PendingUnlinkEntry *entry = (PendingUnlinkEntry *) lfirst(cell);
+
+		entry->cycle_ctr = mdckpt_cycle_ctr;
+	}
+
+	/*
+	 * Any unlink requests arriving after this point will be assigned the next
+	 * cycle counter, and won't be unlinked until next checkpoint.
+	 */
+	mdckpt_cycle_ctr++;
+}
+
+/*
+ * mdpostckpt() -- Do post-checkpoint work
+ *
+ * Remove any lingering files that can now be safely removed.
+ */
+void
+mdpostckpt(void)
+{
+	while (pendingUnlinks != NIL)
+	{
+		PendingUnlinkEntry *entry = (PendingUnlinkEntry *) linitial(pendingUnlinks);
+		char	   *path;
+
+		/*
+		 * New entries are appended to the end, so if the entry is new we've
+		 * reached the end of old entries.
+		 */
+		if (entry->cycle_ctr == mdckpt_cycle_ctr)
+			break;
+
+		/* Else assert we haven't missed it */
+		Assert((CycleCtr) (entry->cycle_ctr + 1) == mdckpt_cycle_ctr);
+
+		/* Unlink the file */
+		path = relpath(entry->rnode);
+		if (unlink(path) < 0)
+		{
+			/*
+			 * There's a race condition, when the database is dropped at the
+			 * same time that we process the pending unlink requests. If the
+			 * DROP DATABASE deletes the file before we do, we will get ENOENT
+			 * here. rmtree() also has to ignore ENOENT errors, to deal with
+			 * the possibility that we delete the file first.
+			 */
+			if (errno != ENOENT)
+				ereport(WARNING,
+						(errcode_for_file_access(),
+						 errmsg("could not remove relation %u/%u/%u: %m",
+								entry->rnode.spcNode,
+								entry->rnode.dbNode,
+								entry->rnode.relNode)));
+		}
+		pfree(path);
+
+		pendingUnlinks = list_delete_first(pendingUnlinks);
+		pfree(entry);
+	}
+}
+
 /*
  * register_dirty_segment() -- Mark a relation segment as needing fsync
  *
@@ -2046,7 +2183,6 @@ register_dirty_segment(SMgrRelation reln, MdMirVec *seg)
 		if (ForwardFsyncRequest(reln->smgr_rnode, seg->mdmir_segno))
 			return;				/* passed it off successfully */
 	}
-
 	if (!MirroredBufferPool_Flush(&seg->mdmir_open))
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -2057,19 +2193,53 @@ register_dirty_segment(SMgrRelation reln, MdMirVec *seg)
 				   reln->smgr_rnode.relNode)));
 }
 
+/*
+ * register_unlink() -- Schedule a file to be deleted after next checkpoint
+ *
+ * As with register_dirty_segment, this could involve either a local or
+ * a remote pending-ops table.
+ */
+static void
+register_unlink(RelFileNode rnode)
+{
+	if (pendingOpsTable)
+	{
+		/* push it into local pending-ops table */
+		RememberFsyncRequest(rnode, UNLINK_RELATION_REQUEST);
+	}
+	else
+	{
+		/*
+		 * Notify the bgwriter about it.  If we fail to queue the request
+		 * message, we have to sleep and try again, because we can't simply
+		 * delete the file now.  Ugly, but hopefully won't happen often.
+		 *
+		 * XXX should we just leave the file orphaned instead?
+		 */
+		Assert(IsUnderPostmaster);
+		while (!ForwardFsyncRequest(rnode, UNLINK_RELATION_REQUEST))
+			pg_usleep(10000L);	/* 10 msec seems a good number */
+	}
+}
+
 /*
  * RememberFsyncRequest() -- callback from bgwriter side of fsync request
  *
- * We stuff the fsync request into the local hash table for execution
- * during the bgwriter's next checkpoint.
+ * We stuff most fsync requests into the local hash table for execution
+ * during the bgwriter's next checkpoint.  UNLINK requests go into a
+ * separate linked list, however, because they get processed separately.
  *
  * The range of possible segment numbers is way less than the range of
  * BlockNumber, so we can reserve high values of segno for special purposes.
- * We define two: FORGET_RELATION_FSYNC means to cancel pending fsyncs for
- * a relation, and FORGET_DATABASE_FSYNC means to cancel pending fsyncs for
- * a whole database.  (These are a tad slow because the hash table has to be
- * searched linearly, but it doesn't seem worth rethinking the table structure
- * for them.)
+ * We define three:
+ * - FORGET_RELATION_FSYNC means to cancel pending fsyncs for a relation
+ * - FORGET_DATABASE_FSYNC means to cancel pending fsyncs for a whole database
+ * - UNLINK_RELATION_REQUEST is a request to delete the file after the next
+ *	 checkpoint.
+ *
+ * (Handling the FORGET_* requests is a tad slow because the hash table has
+ * to be searched linearly, but it doesn't seem worth rethinking the table
+ * structure for them.)
  */
 void
 RememberFsyncRequest(RelFileNode rnode, BlockNumber segno)
@@ -2104,7 +2274,11 @@ RememberFsyncRequest(RelFileNode rnode, BlockNumber segno)
 		/* Remove any pending requests for the entire database */
 		HASH_SEQ_STATUS hstat;
 		PendingOperationEntry *entry;
+		ListCell   *cell, 
+				   *prev,
+				   *next;
 
+		/* Remove fsync requests */
 		hash_seq_init(&hstat, pendingOpsTable);
 		while ((entry = (PendingOperationEntry *) hash_seq_search(&hstat)) != NULL)
 		{
@@ -2118,6 +2292,36 @@ RememberFsyncRequest(RelFileNode rnode, BlockNumber segno)
 				}
 			}
 		}
+	
+		/* Remove unlink requests */
+		prev = NULL;
+		for (cell = list_head(pendingUnlinks); cell; cell = next)
+		{
+			PendingUnlinkEntry *entry = (PendingUnlinkEntry *) lfirst(cell);
+
+			next = lnext(cell);
+			if (entry->rnode.dbNode == rnode.dbNode) 
+			{
+				pendingUnlinks = list_delete_cell(pendingUnlinks, cell, prev);
+				pfree(entry);
+			}
+			else
+				prev = cell;
+		}
+	}
+	else if (segno == UNLINK_RELATION_REQUEST)
+	{
+		/* Unlink request: put it in the linked list */
+		MemoryContext oldcxt = MemoryContextSwitchTo(MdCxt);
+		PendingUnlinkEntry *entry;
+
+		entry = palloc(sizeof(PendingUnlinkEntry));
+		entry->rnode = rnode;
+		entry->cycle_ctr = mdckpt_cycle_ctr;
+
+		pendingUnlinks = lappend(pendingUnlinks, entry);
+
+		MemoryContextSwitchTo(oldcxt);
 	}
 	else
 	{
@@ -2141,9 +2345,10 @@ RememberFsyncRequest(RelFileNode rnode, BlockNumber segno)
 			entry->canceled = false;
 			entry->cycle_ctr = mdsync_cycle_ctr;
 		}
+
 		/*
 		 * NB: it's intentional that we don't change cycle_ctr if the entry
-		 * already exists.  The fsync request must be treated as old, even
+		 * already exists.	The fsync request must be treated as old, even
 		 * though the new request will be satisfied too by any subsequent
 		 * fsync.
 		 *
@@ -2151,14 +2356,14 @@ RememberFsyncRequest(RelFileNode rnode, BlockNumber segno)
 		 * act just as though it wasn't there.  The only case where this could
 		 * happen would be if a file had been deleted, we received but did not
 		 * yet act on the cancel request, and the same relfilenode was then
-		 * assigned to a new file.  We mustn't lose the new request, but
-		 * it should be considered new not old.
+		 * assigned to a new file.	We mustn't lose the new request, but it
+		 * should be considered new not old.
 		 */
 	}
 }
 
 /*
- * ForgetRelationFsyncRequests -- ensure any fsyncs for a rel are forgotten
+ * ForgetRelationFsyncRequests -- forget any fsyncs for a rel
  */
 void
 ForgetRelationFsyncRequests(RelFileNode rnode)
@@ -2175,22 +2380,23 @@ ForgetRelationFsyncRequests(RelFileNode rnode)
 		 * message, we have to sleep and try again ... ugly, but hopefully
 		 * won't happen often.
 		 *
-		 * XXX should we CHECK_FOR_INTERRUPTS in this loop?  Escaping with
-		 * an error would leave the no-longer-used file still present on
-		 * disk, which would be bad, so I'm inclined to assume that the
-		 * bgwriter will always empty the queue soon.
+		 * XXX should we CHECK_FOR_INTERRUPTS in this loop?  Escaping with an
+		 * error would leave the no-longer-used file still present on disk,
+		 * which would be bad, so I'm inclined to assume that the bgwriter
+		 * will always empty the queue soon.
 		 */
 		while (!ForwardFsyncRequest(rnode, FORGET_RELATION_FSYNC))
 			pg_usleep(10000L);	/* 10 msec seems a good number */
+
 		/*
-		 * Note we don't wait for the bgwriter to actually absorb the
-		 * revoke message; see mdsync() for the implications.
+		 * Note we don't wait for the bgwriter to actually absorb the revoke
+		 * message; see mdsync() for the implications.
 		 */
 	}
 }
 
 /*
- * ForgetDatabaseFsyncRequests -- ensure any fsyncs for a DB are forgotten
+ * ForgetDatabaseFsyncRequests -- forget any fsyncs and unlinks for a DB
  */
 void
 ForgetDatabaseFsyncRequests(Oid tblspc, Oid dbid)
@@ -2322,18 +2528,18 @@ _mdmir_getseg(SMgrRelation reln, BlockNumber blkno, bool isTemp,
 		if (v->mdmir_chain == NULL)
 		{
 			/*
-			 * Normally we will create new segments only if authorized by
-			 * the caller (i.e., we are doing mdextend()).  But when doing
-			 * WAL recovery, create segments anyway; this allows cases such as
+			 * Normally we will create new segments only if authorized by the
+			 * caller (i.e., we are doing mdextend()).	But when doing WAL
+			 * recovery, create segments anyway; this allows cases such as
 			 * replaying WAL data that has a write into a high-numbered
 			 * segment of a relation that was later deleted.  We want to go
 			 * ahead and create the segments so we can finish out the replay.
 			 *
-			 * We have to maintain the invariant that segments before the
-			 * last active segment are of size RELSEG_SIZE; therefore, pad
-			 * them out with zeroes if needed.  (This only matters if caller
-			 * is extending the relation discontiguously, but that can happen
-			 * in hash indexes.)
+			 * We have to maintain the invariant that segments before the last
+			 * active segment are of size RELSEG_SIZE; therefore, pad them out
+			 * with zeroes if needed.  (This only matters if caller is
+			 * extending the relation discontiguously, but that can happen in
+			 * hash indexes.)
 			 */
 			if (behavior == EXTENSION_CREATE || InRecovery)
 			{
@@ -2395,11 +2601,11 @@ _mdnblocks(SMgrRelation reln, MdMirVec *seg)
 	if (len < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
-				 errmsg("could not seek to end of segment %u of relation %u/%u/%u: %m",
-						seg->mdmir_segno,
-						reln->smgr_rnode.spcNode,
-						reln->smgr_rnode.dbNode,
-						reln->smgr_rnode.relNode)));
+		errmsg("could not seek to end of segment %u of relation %u/%u/%u: %m",
+			   seg->mdmir_segno,
+			   reln->smgr_rnode.spcNode,
+			   reln->smgr_rnode.dbNode,
+			   reln->smgr_rnode.relNode)));
 	/* note that this calculation will ignore any partial block at EOF */
 	return (BlockNumber) (len / BLCKSZ);
 }
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 10c99673876c..a3cae49f04e2 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.103 2007/01/05 22:19:39 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.109 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1379,10 +1379,7 @@ smgrtruncate(SMgrRelation reln, BlockNumber nblocks, bool isTemp, bool isLocalBu
 	if (!isTemp)
 	{
 		/*
-		 * Make a non-transactional XLOG entry showing the file truncation.
-		 * It's non-transactional because we should replay it whether the
-		 * transaction commits or not; the underlying file change is certainly
-		 * not reversible.
+		 * Make an XLOG entry showing the file truncation.
 		 */
 		XLogRecPtr	lsn;
 		XLogRecData rdata;
@@ -1398,8 +1395,7 @@ smgrtruncate(SMgrRelation reln, BlockNumber nblocks, bool isTemp, bool isLocalBu
 		rdata.buffer = InvalidBuffer;
 		rdata.next = NULL;
 
-		lsn = XLogInsert(RM_SMGR_ID, XLOG_SMGR_TRUNCATE | XLOG_NO_TRAN,
-						 &rdata);
+		lsn = XLogInsert(RM_SMGR_ID, XLOG_SMGR_TRUNCATE, &rdata);
 	}
 }
 
@@ -1766,8 +1762,6 @@ smgrDoDeleteActions(
 {
 	MIRRORED_LOCK_DECLARE;
 
-	CHECKPOINT_START_LOCK_DECLARE;
-
 	PendingDelete *current;
 	int entryIndex;
 
@@ -1805,15 +1799,6 @@ smgrDoDeleteActions(
 	 */
 	MIRRORED_LOCK;
 
-	/*
-	 * The logic will eventually obtain a CheckpointStartLock in PersistentRelation_Dropped(),
-	 * but functions called from this function my obtain Exclusive locks before the
-	 * CheckpointStartLock is obtained. This could cause a potential deadlock in the future.
-	 * We need to take a CheckpointStartLock here to maintain proper lock ordering
-	 * (i.e. MirrorLock -> CheckpointStartLock ).
-	 */
-	CHECKPOINT_START_LOCK;
-
 	/*
 	 * First pass does the initial State-Changes.
 	 */
@@ -2074,8 +2059,6 @@ smgrDoDeleteActions(
 
 	PersistentFileSysObj_FlushXLog();
 
-	CHECKPOINT_START_UNLOCK;
-
 	MIRRORED_UNLOCK;
 
 	if (stateChangeResults != NULL)
@@ -2568,14 +2551,16 @@ smgrSubTransAbort(void)
  * *ptr is set to point to a freshly-palloc'd array of RelFileNodes.
  * If there are no relations to be deleted, *ptr is set to NULL.
  *
+ * If haveNonTemp isn't NULL, the bool it points to gets set to true if
+ * there is any non-temp table pending to be deleted; false if not.
+ *
  * Note that the list does not include anything scheduled for termination
  * by upper-level transactions.
  */
 int
-smgrGetPendingFileSysWork(
-	EndXactRecKind						endXactRecKind,
-
-	PersistentEndXactFileSysActionInfo 	**ptr)
+smgrGetPendingFileSysWork(EndXactRecKind endXactRecKind,
+						  PersistentEndXactFileSysActionInfo **ptr,
+						  bool *haveNonTemp)
 {
 	int			nestLevel = GetCurrentTransactionNestLevel();
 	int			nrels;
@@ -2587,6 +2572,9 @@ smgrGetPendingFileSysWork(
 
 	PersistentEndXactFileSysAction action;
 
+	if (haveNonTemp)
+		*haveNonTemp = false;
+
 	Assert(endXactRecKind == EndXactRecKind_Commit ||
 		   endXactRecKind == EndXactRecKind_Abort ||
 		   endXactRecKind == EndXactRecKind_Prepare);
@@ -2606,6 +2594,8 @@ smgrGetPendingFileSysWork(
 	}
 
 	nrels = 0;
+	if (haveNonTemp)
+		*haveNonTemp = false;
 	for (pending = pendingDeletes; pending != NULL; pending = pending->next)
 	{
 		action = PendingDelete_Action(pending);
@@ -2650,6 +2640,9 @@ smgrGetPendingFileSysWork(
 
 			rptr++;
 			returned = true;
+
+			if (haveNonTemp && !pending->isLocalBuf)
+				*haveNonTemp = true;
 		}
 
 		if (Debug_persistent_print)
@@ -3096,7 +3089,16 @@ smgrabort(void)
 }
 
 /*
- *	smgrsync() -- Sync files to disk at checkpoint time.
+ *     smgrpreckpt() -- Prepare for checkpoint.
+ */
+void
+smgrpreckpt(void)
+{
+	mdpreckpt();
+}
+
+/*
+ *     smgrsync() -- Sync files to disk during checkpoint.
  */
 void
 smgrsync(void)
@@ -3104,6 +3106,15 @@ smgrsync(void)
 	mdsync();
 }
 
+/*
+ *	smgrpostckpt() -- Post-checkpoint cleanup.
+ */
+void
+smgrpostckpt(void)
+{
+	mdpostckpt();
+}
+
 
 void
 smgr_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
@@ -3135,11 +3146,32 @@ smgr_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record)
 	}
 	else if (info == XLOG_SMGR_TRUNCATE)
 	{
+		MirrorDataLossTrackingState mirrorDataLossTrackingState;
+		int64 mirrorDataLossTrackingSessionNum;
+
 		xl_smgr_truncate *xlrec = (xl_smgr_truncate *) XLogRecGetData(record);
 		SMgrRelation reln;
 
 		reln = smgropen(xlrec->rnode);
 
+		/*
+		 * Forcibly create relation if it doesn't exist (which suggests that
+		 * it was dropped somewhere later in the WAL sequence).  As in
+		 * XLogOpenRelation, we prefer to recreate the rel and replay the log
+		 * as best we can until the drop is seen.
+		 */
+		mirrorDataLossTrackingState =
+					FileRepPrimary_GetMirrorDataLossTrackingSessionNum(
+													&mirrorDataLossTrackingSessionNum);
+		smgrcreate(
+				reln,
+				/* isLocalBuf */ false,
+				/* relationName */ NULL,		// Ok to be NULL -- we don't know the name here.
+				mirrorDataLossTrackingState,
+				mirrorDataLossTrackingSessionNum,
+				/* ignoreAlreadyExists */ true,
+				&mirrorDataLossOccurred);
+
 		/* Can't use smgrtruncate because it would try to xlog */
 
 		/*
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index ffcb67813c6a..ba17ec21d7ad 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/dest.c,v 1.71 2007/01/05 22:19:39 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/dest.c,v 1.72.2.1 2010/01/30 20:10:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -166,6 +166,10 @@ EndCommand(const char *commandTag, CommandDest dest)
 	{
 		case DestRemote:
 		case DestRemoteExecute:
+			/*
+			 * We assume the commandTag is plain ASCII and therefore
+			 * requires no encoding conversion.
+			 */
 			if (Gp_role == GP_ROLE_EXECUTE && Gp_is_writer)
 			{
 				/*
@@ -175,7 +179,7 @@ EndCommand(const char *commandTag, CommandDest dest)
 				sendQEDetails();
 
 				pq_beginmessage(&buf, 'g');
-				pq_sendstring(&buf, commandTag);
+				pq_send_ascii_string(&buf, commandTag);
 
 				AddQEWriterTransactionInfo(&buf);
 
@@ -186,11 +190,11 @@ EndCommand(const char *commandTag, CommandDest dest)
 				sendQEDetails();
 
 				pq_beginmessage(&buf, 'C');
-				pq_sendstring(&buf, commandTag);
+				pq_send_ascii_string(&buf, commandTag);
 				pq_endmessage(&buf);
 			}
 			else
-				pq_puttextmessage('C', commandTag);
+				pq_putmessage('C', commandTag, strlen(commandTag) + 1);
 			break;
 		case DestNone:
 		case DestDebug:
@@ -229,7 +233,7 @@ NullCommand(CommandDest dest)
 			if (PG_PROTOCOL_MAJOR(FrontendProtocol) >= 3)
 				pq_putemptymessage('I');
 			else
-				pq_puttextmessage('I', "");
+				pq_putmessage('I', "", 1);
 			break;
 
 		case DestNone:
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 651cf1e4f201..d1e2913be33b 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.97 2008/01/01 19:45:52 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.97.2.1 2010/06/30 18:10:51 heikki Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -29,6 +29,7 @@
 #include "tcop/fastpath.h"
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
+#include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
@@ -348,6 +349,16 @@ HandleFunctionRequest(StringInfo msgBuf)
 		aclcheck_error(aclresult, ACL_KIND_PROC,
 					   get_func_name(fid));
 
+	/*
+	 * Restrict access to pg_get_expr(). This reflects the hack in
+	 * transformFuncCall() in parse_expr.c, see comments there for an
+	 * explanation.
+	 */
+	if ((fid == F_PG_GET_EXPR || fid == F_PG_GET_EXPR_EXT) && !superuser())
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("argument to pg_get_expr() must come from system catalogs")));
+
 	/*
 	 * Prepare function call info block and insert arguments.
 	 */
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index c09f8ffc5b98..0909b880ff1d 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.524 2007/02/17 19:33:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.542.2.5 2009/06/18 10:09:34 heikki Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -21,7 +21,6 @@
 #include "postgres.h"
 #include "gpmon/gpmon.h"
 
-#include <time.h>
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -58,6 +57,7 @@
 #include "pg_trace.h"
 #include "parser/analyze.h"
 #include "parser/parser.h"
+#include "postmaster/autovacuum.h"
 #include "postmaster/postmaster.h"
 #include "replication/walsender.h"
 #include "rewrite/rewriteHandler.h"
@@ -115,7 +115,7 @@ CommandDest whereToSendOutput = DestDebug;
 /* flag for logging end of session */
 bool		Log_disconnections = false;
 
-int			log_statement = LOGSTMT_NONE;
+LogStmtLevel log_statement = LOGSTMT_NONE;
 
 /* GUC variable for maximum stack depth (measured in kilobytes) */
 int			max_stack_depth = 100;
@@ -137,11 +137,19 @@ static int PostmasterPriority = 0;
 static long max_stack_depth_bytes = 100 * 1024L;
 
 /*
- * Stack base pointer -- initialized by PostgresMain. This is not static
- * so that PL/Java can modify it.
+ * Stack base pointer -- initialized by PostmasterMain and inherited by
+ * subprocesses. This is not static because old versions of PL/Java modify
+ * it directly. Newer versions use set_stack_base(), but we want to stay
+ * binary-compatible for the time being.
  */
 char	   *stack_base_ptr = NULL;
 
+/*
+ * On IA64 we also have to remember the register stack base.
+ */
+#if defined(__ia64__) || defined(__ia64)
+char	   *register_stack_base_ptr = NULL;
+#endif
 
 /*
  * Flag to mark SIGHUP. Whenever the main loop comes around it
@@ -179,8 +187,10 @@ static bool ignore_till_sync = false;
  * We keep it separate from the hashtable kept by commands/prepare.c
  * in order to reduce overhead for short-lived queries.
  */
+static CachedPlanSource *unnamed_stmt_psrc = NULL;
+
+/* workspace for building a new unnamed statement in */
 static MemoryContext unnamed_stmt_context = NULL;
-static PreparedStatement *unnamed_stmt_pstmt = NULL;
 
 /* assorted command-line switches */
 static const char *userDoption = NULL;	/* -D switch */
@@ -223,10 +233,11 @@ extern bool ResourceScheduler;
  * ----------------------------------------------------------------
  */
 static int	InteractiveBackend(StringInfo inBuf);
+static int	interactive_getc(void);
 static int	SocketBackend(StringInfo inBuf);
 static int	ReadCommand(StringInfo inBuf);
 static void forbidden_in_wal_sender(char firstchar);
-static List *pg_rewrite_queries(List *querytree_list);
+static List *pg_rewrite_query(Query *query);
 static bool check_log_statement(List *stmt_list);
 static int	errdetail_execute(List *raw_parsetree_list);
 static int	errdetail_params(ParamListInfo params);
@@ -234,7 +245,8 @@ static void start_xact_command(void);
 static void finish_xact_command(void);
 static bool IsTransactionExitStmt(Node *parsetree);
 static bool IsTransactionExitStmtList(List *parseTrees);
-static bool IsTransactionStmtList(List *nodes);
+static bool IsTransactionStmtList(List *parseTrees);
+static void drop_unnamed_stmt(void);
 static void SigHupHandler(SIGNAL_ARGS);
 static void log_disconnections(int code, Datum arg);
 static bool CheckDebugDtmActionSqlCommandTag(const char *sqlCommandTag);
@@ -305,69 +317,63 @@ InteractiveBackend(StringInfo inBuf)
 	printf("backend> ");
 	fflush(stdout);
 
-	/* Reset inBuf to empty */
-	inBuf->len = 0;
-	inBuf->data[0] = '\0';
-	inBuf->cursor = 0;
+	resetStringInfo(inBuf);
 
-	for (;;)
+	if (UseNewLine)
 	{
-		if (UseNewLine)
+		/*
+		 * if we are using \n as a delimiter, then read characters until the
+		 * \n.
+		 */
+		while ((c = interactive_getc()) != EOF)
 		{
-			/*
-			 * if we are using \n as a delimiter, then read characters until
-			 * the \n.
-			 */
-			while ((c = getc(stdin)) != EOF)
+			if (c == '\n')
 			{
-				if (c == '\n')
+				if (backslashSeen)
 				{
-					if (backslashSeen)
-					{
-						/* discard backslash from inBuf */
-						inBuf->data[--inBuf->len] = '\0';
-						backslashSeen = false;
-						continue;
-					}
-					else
-					{
-						/* keep the newline character */
-						appendStringInfoChar(inBuf, '\n');
-						break;
-					}
+					/* discard backslash from inBuf */
+					inBuf->data[--inBuf->len] = '\0';
+					backslashSeen = false;
+					continue;
 				}
-				else if (c == '\\')
-					backslashSeen = true;
 				else
-					backslashSeen = false;
-
-				appendStringInfoChar(inBuf, (char) c);
+				{
+					/* keep the newline character */
+					appendStringInfoChar(inBuf, '\n');
+					break;
+				}
 			}
+			else if (c == '\\')
+				backslashSeen = true;
+			else
+				backslashSeen = false;
 
-			if (c == EOF)
-				end = true;
-		}
-		else
-		{
-			/*
-			 * otherwise read characters until EOF.
-			 */
-			while ((c = getc(stdin)) != EOF)
-				appendStringInfoChar(inBuf, (char) c);
-
-			if (inBuf->len == 0)
-				end = true;
+			appendStringInfoChar(inBuf, (char) c);
 		}
 
-		if (end)
-			return EOF;
-
+		if (c == EOF)
+			end = true;
+	}
+	else
+	{
 		/*
-		 * otherwise we have a user query so process it.
+		 * otherwise read characters until EOF.
 		 */
-		break;
+		while ((c = interactive_getc()) != EOF)
+			appendStringInfoChar(inBuf, (char) c);
+
+		/* No input before EOF signal means time to quit. */
+		if (inBuf->len == 0)
+			end = true;
 	}
 
+	if (end)
+		return EOF;
+
+	/*
+	 * otherwise we have a user query so process it.
+	 */
+
 	/* Add '\0' to make it look the same as message case. */
 	appendStringInfoChar(inBuf, (char) '\0');
 
@@ -381,6 +387,24 @@ InteractiveBackend(StringInfo inBuf)
 	return 'Q';
 }
 
+/*
+ * interactive_getc -- collect one character from stdin
+ *
+ * Even though we are not reading from a "client" process, we still want to
+ * respond to signals, particularly SIGTERM/SIGQUIT.  Hence we must use
+ * prepare_for_client_read and client_read_ended.
+ */
+static int
+interactive_getc(void)
+{
+	int			c;
+
+	prepare_for_client_read();
+	c = getc(stdin);
+	client_read_ended();
+	return c;
+}
+
 /* ----------------
  *	SocketBackend()		Is called for frontend-backend connections
  *
@@ -769,6 +793,7 @@ List *
 pg_analyze_and_rewrite(Node *parsetree, const char *query_string,
 					   Oid *paramTypes, int numParams)
 {
+	Query	   *query;
 	List	   *querytree_list;
 
 	/*
@@ -777,8 +802,7 @@ pg_analyze_and_rewrite(Node *parsetree, const char *query_string,
 	if (log_parser_stats)
 		ResetUsage();
 
-	querytree_list = parse_analyze(parsetree, query_string,
-								   paramTypes, numParams);
+	query = parse_analyze(parsetree, query_string, paramTypes, numParams);
 
 	if (log_parser_stats)
 		ShowUsage("PARSE ANALYSIS STATISTICS");
@@ -786,68 +810,55 @@ pg_analyze_and_rewrite(Node *parsetree, const char *query_string,
 	/*
 	 * (2) Rewrite the queries, as necessary
 	 */
-	querytree_list = pg_rewrite_queries(querytree_list);
+	querytree_list = pg_rewrite_query(query);
 
 	return querytree_list;
 }
 
 /*
- * Perform rewriting of a list of queries produced by parse analysis.
+ * Perform rewriting of a query produced by parse analysis.
  *
- * Note: queries must just have come from the parser, because we do not do
- * AcquireRewriteLocks() on them.
+ * Note: query must just have come from the parser, because we do not do
+ * AcquireRewriteLocks() on it.
  */
 static List *
-pg_rewrite_queries(List *querytree_list)
+pg_rewrite_query(Query *query)
 {
-	List	   *new_list = NIL;
-	ListCell   *list_item;
+	List	   *querytree_list;
 
 	if (log_parser_stats)
 		ResetUsage();
 
-	/*
-	 * rewritten queries are collected in new_list.  Note there may be more or
-	 * fewer than in the original list.
-	 */
-	foreach(list_item, querytree_list)
-	{
-		Query	   *querytree = (Query *) lfirst(list_item);
-
-		if (Debug_print_parse)
-			elog_node_display(DEBUG1, "parse tree", querytree,
-							  Debug_pretty_print);
-
-		if (querytree->commandType == CMD_UTILITY)
-		{
-			/* don't rewrite utilities, just dump 'em into new_list */
-			new_list = lappend(new_list, querytree);
-		}
-		else
-		{
-			/* rewrite regular queries */
-			List	   *rewritten = QueryRewrite(querytree);
+	if (Debug_print_parse)
+		elog_node_display(DEBUG1, "parse tree", query,
+						  Debug_pretty_print);
 
-			new_list = list_concat(new_list, rewritten);
-		}
+	if (query->commandType == CMD_UTILITY)
+	{
+		/* don't rewrite utilities, just dump 'em into result list */
+		querytree_list = list_make1(query);
+	}
+	else
+	{
+		/* rewrite regular queries */
+		querytree_list = QueryRewrite(query);
 	}
-
-	querytree_list = new_list;
 
 	if (log_parser_stats)
 		ShowUsage("REWRITER STATISTICS");
 
 #ifdef COPY_PARSE_PLAN_TREES
+	/* Optional debugging check: pass querytree output through copyObject() */
+	{
+		List	   *new_list;
 
-	/*
-	 * Optional debugging check: pass querytree output through copyObject()
-	 */
-	new_list = (List *) copyObject(querytree_list);
-	/* This checks both copyObject() and the equal() routines... */
-	if (!equal(new_list, querytree_list))
-		elog(WARNING, "copyObject() failed to produce an equal parse tree");
-	else
-		querytree_list = new_list;
+		new_list = (List *) copyObject(querytree_list);
+		/* This checks both copyObject() and the equal() routines... */
+		if (!equal(new_list, querytree_list))
+			elog(WARNING, "copyObject() failed to produce equal parse tree");
+		else
+			querytree_list = new_list;
+	}
 #endif
 
 	if (Debug_print_rewritten)
@@ -858,22 +869,27 @@ pg_rewrite_queries(List *querytree_list)
 }
 
 
-/* Generate a plan for a single already-rewritten query. */
+/*
+ * Generate a plan for a single already-rewritten query.
+ * This is a thin wrapper around planner() and takes the same parameters.
+ */
 PlannedStmt *
-pg_plan_query(Query *querytree, ParamListInfo boundParams)
+pg_plan_query(Query *querytree, int cursorOptions, ParamListInfo boundParams)
 {
-	PlannedStmt	*stmt;
+	PlannedStmt *plan;
 
 	/* Utility commands have no plans. */
 	if (querytree->commandType == CMD_UTILITY)
 		return NULL;
-	
+
+	/* Planner must have a snapshot in case it calls user-defined functions. */
+	Assert(ActiveSnapshot != NULL);
 
 	if (log_planner_stats)
 		ResetUsage();
 
 	/* call the optimizer */
-	stmt = planner(querytree, 0, boundParams);
+	plan = planner(querytree, cursorOptions, boundParams);
 
 	if (log_planner_stats)
 		ShowUsage("PLANNER STATISTICS");
@@ -881,7 +897,7 @@ pg_plan_query(Query *querytree, ParamListInfo boundParams)
 #ifdef COPY_PARSE_PLAN_TREES
 	/* Optional debugging check: pass plan output through copyObject() */
 	{
-		Plan	   *new_plan = (Plan *) copyObject(stmt->planTree);
+		PlannedStmt *new_plan = (PlannedStmt *) copyObject(plan);
 
 		/*
 		 * equal() currently does not have routines to compare Plan nodes, so
@@ -889,11 +905,11 @@ pg_plan_query(Query *querytree, ParamListInfo boundParams)
 		 */
 #ifdef NOT_USED
 		/* This checks both copyObject() and the equal() routines... */
-		if (!equal(new_plan, stmt->planTree))
+		if (!equal(new_plan, plan))
 			elog(WARNING, "copyObject() failed to produce an equal plan tree");
 		else
 #endif
-			stmt->planTree = new_plan;
+			plan = new_plan;
 	}
 #endif
 
@@ -901,11 +917,9 @@ pg_plan_query(Query *querytree, ParamListInfo boundParams)
 	 * Print plan if debugging.
 	 */
 	if (Debug_print_plan)
-		elog_node_display(DEBUG1, "plan", stmt->planTree, Debug_pretty_print);
-	if (Debug_print_plannedstmt)
-		elog_node_display(DEBUG1, "plannedstmt", stmt, Debug_pretty_print);
+		elog_node_display(DEBUG1, "plan", plan, Debug_pretty_print);
 
-	return stmt;
+	return plan;
 }
 
 /*
@@ -923,34 +937,52 @@ pg_plan_query(Query *querytree, ParamListInfo boundParams)
  * list.  Utility statements are simply represented by their statement nodes.
  */
 List *
-pg_plan_queries(List *querytrees, ParamListInfo boundParams,
+pg_plan_queries(List *querytrees, int cursorOptions, ParamListInfo boundParams,
 				bool needSnapshot)
 {
-	List	   *stmt_list = NIL;
-	ListCell   *query_list;
+	List	   * volatile stmt_list = NIL;
+	Snapshot	saveActiveSnapshot = ActiveSnapshot;
 
-	foreach(query_list, querytrees)
+	/* PG_TRY to ensure previous ActiveSnapshot is restored on error */
+	PG_TRY();
 	{
-		Query	   *query = (Query *) lfirst(query_list);
-		Node *stmt;
+		Snapshot	mySnapshot = NULL;
+		ListCell   *query_list;
 
-		if (query->commandType == CMD_UTILITY)
-		{
-			/* Utility commands have no plans. */
-			stmt = query->utilityStmt;
-		}
-		else
+		foreach(query_list, querytrees)
 		{
-			if (needSnapshot)
+			Query	   *query = (Query *) lfirst(query_list);
+			Node	   *stmt;
+
+			if (query->commandType == CMD_UTILITY)
 			{
-				ActiveSnapshot = CopySnapshot(GetTransactionSnapshot());
-				needSnapshot = false;
+				/* Utility commands have no plans. */
+				stmt = query->utilityStmt;
+			}
+			else
+			{
+				if (needSnapshot && mySnapshot == NULL)
+				{
+					mySnapshot = CopySnapshot(GetTransactionSnapshot());
+					ActiveSnapshot = mySnapshot;
+				}
+				stmt = (Node *) pg_plan_query(query, cursorOptions,
+											  boundParams);
 			}
-			stmt = (Node *) pg_plan_query(query, boundParams);
+
+			stmt_list = lappend(stmt_list, stmt);
 		}
 
-		stmt_list = lappend(stmt_list, stmt);
+		if (mySnapshot)
+			FreeSnapshot(mySnapshot);
 	}
+	PG_CATCH();
+	{
+		ActiveSnapshot = saveActiveSnapshot;
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+	ActiveSnapshot = saveActiveSnapshot;
 
 	return stmt_list;
 }
@@ -1030,21 +1062,13 @@ exec_mpp_query(const char *query_string,
 	 * statement and portal; this ensures we recover any storage used by prior
 	 * unnamed operations.)
 	 */
-	unnamed_stmt_pstmt = NULL;
-	if (unnamed_stmt_context)
-	{
-		DropDependentPortals(unnamed_stmt_context);
-		MemoryContextDelete(unnamed_stmt_context);
-	}
-	unnamed_stmt_context = NULL;
-	
+	drop_unnamed_stmt();
+
 	/*
 	 * Switch to appropriate context for constructing parsetrees.
 	 */
 	oldcontext = MemoryContextSwitchTo(MessageContext);
-	
-	QueryContext = CurrentMemoryContext;
-	
+
 	/* 
 	 * Deserialize the Query node, if there is one.  If this is a planned stmt, then
 	 * there isn't one, but there must be a PlannedStmt later on.
@@ -1308,18 +1332,18 @@ exec_mpp_query(const char *query_string,
 		/* Don't display the portal in pg_cursors */
 		portal->visible = false;
 
-		/* Copy the plan's query string into the portal */
-		Assert(query_string != NULL); 
-		char *portal_query_string = MemoryContextStrdup(PortalGetHeapMemory(portal),
-				query_string);
-		
+		/*
+		 * We don't have to copy anything into the portal, because everything
+		 * we are passing here is in MessageContext, which will outlive the
+		 * portal anyway.
+		 */
 		PortalDefineQuery(portal,
 						  NULL,
-						  portal_query_string,
+						  query_string,
 						  T_Query, /* not a parsed statement, so not T_SelectStmt */
 						  commandTag,
 						  list_make1(plan ? (Node*)plan : (Node*)utilityStmt),
-						  MessageContext);
+						  NULL);
 
 		/* 
 		 * Start the portal.
@@ -1387,8 +1411,6 @@ exec_mpp_query(const char *query_string,
 	 */
 	finish_xact_command();
 		
-	QueryContext = NULL;
-	
 	/*
 	 * Emit duration logging if appropriate.
 	 */
@@ -1514,7 +1536,6 @@ CheckDebugDtmActionSqlCommandTag(const char *sqlCommandTag)
 	return result;
 }
 
-
 /*
  * exec_simple_query
  *
@@ -1529,7 +1550,7 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 	ListCell   *parsetree_item;
 	bool		save_log_statement_stats = log_statement_stats;
 	bool		was_logged = false;
-	bool		isTopLevel = false;
+	bool		isTopLevel;
 	char		msec_str[32];
 
 	if (Gp_role != GP_ROLE_EXECUTE)
@@ -1573,21 +1594,13 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 	 * statement and portal; this ensures we recover any storage used by prior
 	 * unnamed operations.)
 	 */
-	unnamed_stmt_pstmt = NULL;
-	if (unnamed_stmt_context)
-	{
-		DropDependentPortals(unnamed_stmt_context);
-		MemoryContextDelete(unnamed_stmt_context);
-	}
-	unnamed_stmt_context = NULL;
+	drop_unnamed_stmt();
 
 	/*
 	 * Switch to appropriate context for constructing parsetrees.
 	 */
 	oldcontext = MemoryContextSwitchTo(MessageContext);
 
-	QueryContext = CurrentMemoryContext;
-	
 	/*
 	 * Do basic parsing of the query or queries (this should be safe even if
 	 * we are in aborted transaction state!)
@@ -1608,7 +1621,7 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 	 * Switch back to transaction context to enter the loop.
 	 */
 	MemoryContextSwitchTo(oldcontext);
-	
+
 	/*
 	 * We'll tell PortalRun it's a top-level command iff there's exactly one
 	 * raw parsetree.  If more than one, it's effectively a transaction block
@@ -1617,14 +1630,14 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 	 * significant to PreventTransactionChain.)
 	 */
 	isTopLevel = (list_length(parsetree_list) == 1);
-	
+
 	/*
 	 * Run through the raw parsetree(s) and process each one.
 	 */
 	foreach(parsetree_item, parsetree_list)
 	{
 		Node	   *parsetree = (Node *) lfirst(parsetree_item);
-		Snapshot        mySnapshot = NULL;
+		Snapshot	mySnapshot = NULL;
 		const char *commandTag;
 		char		completionTag[COMPLETION_TAG_BUFSIZE];
 		List	   *querytree_list,
@@ -1684,7 +1697,7 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 
 		/* If we got a cancel signal in parsing or prior command, quit */
 		CHECK_FOR_INTERRUPTS();
-		
+
 		/*
 		 * Set up a snapshot if parse analysis/planning will need one.
 		 */
@@ -1705,7 +1718,7 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 		querytree_list = pg_analyze_and_rewrite(parsetree, query_string,
 												NULL, 0);
 
-		plantree_list = pg_plan_queries(querytree_list, NULL, false);
+		plantree_list = pg_plan_queries(querytree_list, 0, NULL, false);
 
 		/* Done with the snapshot used for parsing/planning */
 		ActiveSnapshot = NULL;
@@ -1723,20 +1736,20 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 		/* Don't display the portal in pg_cursors */
 		portal->visible = false;
 
-		/* Copy the plan's query string into the portal */
-		Assert(query_string != NULL); 
-		char *portal_query_string = MemoryContextStrdup(PortalGetHeapMemory(portal),
-				query_string);
-
+		/*
+		 * We don't have to copy anything into the portal, because everything
+		 * we are passing here is in MessageContext, which will outlive the
+		 * portal anyway.
+		 */
 		PortalDefineQuery(portal,
 						  NULL,
-						  portal_query_string,
+						  query_string,
 						  nodeTag(parsetree),
 						  commandTag,
 						  plantree_list,
-						  MessageContext);
+						  NULL);
 
-		/* 
+		/*
 		 * Start the portal.  No parameters here.
 		 */
 		PortalStart(portal, NULL, InvalidSnapshot,
@@ -1848,8 +1861,6 @@ exec_simple_query(const char *query_string, const char *seqServerHost, int seqSe
 	if (!parsetree_list)
 		NullCommand(dest);
 
-	QueryContext = NULL;
-
 	/*
 	 * Emit duration logging if appropriate.
 	 */
@@ -1888,10 +1899,12 @@ exec_parse_message(const char *query_string,	/* string to execute */
 {
 	MemoryContext oldcontext;
 	List	   *parsetree_list;
+	Node	   *raw_parse_tree;
 	const char *commandTag;
-	List		*querytree_list = NIL;
-	List		*param_list = NIL;
+	List	   *querytree_list,
+			   *stmt_list;
 	bool		is_named;
+	bool		fully_planned;
 	bool		save_log_statement_stats = log_statement_stats;
 	char		msec_str[32];
 	NodeTag		sourceTag = T_Query;
@@ -1926,12 +1939,12 @@ exec_parse_message(const char *query_string,	/* string to execute */
 	 * We have two strategies depending on whether the prepared statement is
 	 * named or not.  For a named prepared statement, we do parsing in
 	 * MessageContext and copy the finished trees into the prepared
-	 * statement's private context; then the reset of MessageContext releases
+	 * statement's plancache entry; then the reset of MessageContext releases
 	 * temporary space used by parsing and planning.  For an unnamed prepared
 	 * statement, we assume the statement isn't going to hang around long, so
 	 * getting rid of temp space quickly is probably not worth the costs of
-	 * copying parse/plan trees.  So in this case, we set up a special context
-	 * for the unnamed statement, and do all the parsing work therein.
+	 * copying parse/plan trees.  So in this case, we create the plancache
+	 * entry's context here, and do all the parsing work therein.
 	 */
 	is_named = (stmt_name[0] != '\0');
 	if (is_named)
@@ -1942,16 +1955,10 @@ exec_parse_message(const char *query_string,	/* string to execute */
 	else
 	{
 		/* Unnamed prepared statement --- release any prior unnamed stmt */
-		unnamed_stmt_pstmt = NULL;
-		if (unnamed_stmt_context)
-		{
-			DropDependentPortals(unnamed_stmt_context);
-			MemoryContextDelete(unnamed_stmt_context);
-		}
-		unnamed_stmt_context = NULL;
-		/* create context for parsing/planning */
+		drop_unnamed_stmt();
+		/* Create context for parsing/planning */
 		unnamed_stmt_context =
-			AllocSetContextCreate(TopMemoryContext,
+			AllocSetContextCreate(CacheMemoryContext,
 								  "unnamed prepared statement",
 								  ALLOCSET_DEFAULT_MINSIZE,
 								  ALLOCSET_DEFAULT_INITSIZE,
@@ -1959,13 +1966,12 @@ exec_parse_message(const char *query_string,	/* string to execute */
 		oldcontext = MemoryContextSwitchTo(unnamed_stmt_context);
 	}
 
-	QueryContext = CurrentMemoryContext;
-
 	/*
 	 * Do basic parsing of the query or queries (this should be safe even if
 	 * we are in aborted transaction state!)
 	 */
 	parsetree_list = pg_parse_query(query_string);
+
 	/*
 	 * We only allow a single user statement in a prepared statement. This is
 	 * mainly to keep the protocol simple --- otherwise we'd need to worry
@@ -1978,14 +1984,16 @@ exec_parse_message(const char *query_string,	/* string to execute */
 
 	if (parsetree_list != NIL)
 	{
-		Node	   *parsetree = (Node *) linitial(parsetree_list);
-		Snapshot        mySnapshot = NULL;
+		Query	   *query;
+		Snapshot	mySnapshot = NULL;
 		int			i;
 
+		raw_parse_tree = (Node *) linitial(parsetree_list);
+
 		/*
 		 * Get the command name for possible use in status display.
 		 */
-		commandTag = CreateCommandTag(parsetree);
+		commandTag = CreateCommandTag(raw_parse_tree);
 
 		/*
 		 * If we are in an aborted transaction, reject all commands except
@@ -1996,7 +2004,7 @@ exec_parse_message(const char *query_string,	/* string to execute */
 		 * state, but not many...)
 		 */
 		if (IsAbortedTransactionBlockState() &&
-			!IsTransactionExitStmt(parsetree))
+			!IsTransactionExitStmt(raw_parse_tree))
 			ereport(ERROR,
 					(errcode(ERRCODE_IN_FAILED_SQL_TRANSACTION),
 					 errmsg("current transaction is aborted, "
@@ -2005,7 +2013,7 @@ exec_parse_message(const char *query_string,	/* string to execute */
 		/*
 		 * Set up a snapshot if parse analysis/planning will need one.
 		 */
-		if (analyze_requires_snapshot(parsetree))
+		if (analyze_requires_snapshot(raw_parse_tree))
 		{
 			mySnapshot = CopySnapshot(GetTransactionSnapshot());
 			ActiveSnapshot = mySnapshot;
@@ -2015,20 +2023,22 @@ exec_parse_message(const char *query_string,	/* string to execute */
 		 * OK to analyze, rewrite, and plan this query.  Note that the
 		 * originally specified parameter set is not required to be complete,
 		 * so we have to use parse_analyze_varparams().
+		 *
+		 * XXX must use copyObject here since parse analysis scribbles on its
+		 * input, and we need the unmodified raw parse tree for possible
+		 * replanning later.
 		 */
 		if (log_parser_stats)
 			ResetUsage();
 
-		querytree_list = parse_analyze_varparams(parsetree,
-												 query_string,
-												 &paramTypes,
-												 &numParams);
+		query = parse_analyze_varparams(copyObject(raw_parse_tree),
+										query_string,
+										&paramTypes,
+										&numParams);
 
 		/*
-		 * Check all parameter types got determined, and convert array
-		 * representation to a list for storage.
+		 * Check all parameter types got determined.
 		 */
-		param_list = NIL;
 		for (i = 0; i < numParams; i++)
 		{
 			Oid			ptype = paramTypes[i];
@@ -2038,13 +2048,12 @@ exec_parse_message(const char *query_string,	/* string to execute */
 						(errcode(ERRCODE_INDETERMINATE_DATATYPE),
 					 errmsg("could not determine data type of parameter $%d",
 							i + 1)));
-			param_list = lappend_oid(param_list, ptype);
 		}
 
 		if (log_parser_stats)
 			ShowUsage("PARSE ANALYSIS STATISTICS");
 
-		querytree_list = pg_rewrite_queries(querytree_list);
+		querytree_list = pg_rewrite_query(query);
 
 		if (parsetree_list)
 		{
@@ -2052,16 +2061,19 @@ exec_parse_message(const char *query_string,	/* string to execute */
 			sourceTag = nodeTag(parsetree);
 		}
 
-		/**
-		 * Even though we do not store the plan, we want to perform planning
-		 * to know if SQL syntax is supported.
+		/*
+		 * If this is the unnamed statement and it has parameters, defer query
+		 * planning until Bind.  Otherwise do it now.
 		 */
-		if (sourceTag == T_SelectStmt)
+		if (!is_named && numParams > 0)
 		{
-			List *ql = (List *) copyObject(querytree_list);
-			List *pstmt = pg_plan_queries(ql, NULL, false);
-			list_free(ql);
-			list_free(pstmt);
+			stmt_list = querytree_list;
+			fully_planned = false;
+		}
+		else
+		{
+			stmt_list = pg_plan_queries(querytree_list, 0, NULL, false);
+			fully_planned = true;
 		}
 
 		/* Done with the snapshot used for parsing/planning */
@@ -2072,9 +2084,10 @@ exec_parse_message(const char *query_string,	/* string to execute */
 	else
 	{
 		/* Empty input string.	This is legal. */
+		raw_parse_tree = NULL;
 		commandTag = NULL;
-		querytree_list = NIL;
-		param_list = NIL;
+		stmt_list = NIL;
+		fully_planned = true;
 	}
 
 	/* If we got a cancel signal in analysis or planning, quit */
@@ -2087,36 +2100,48 @@ exec_parse_message(const char *query_string,	/* string to execute */
 	{
 
 		StorePreparedStatement(stmt_name,
+							   raw_parse_tree,
 							   query_string,
 							   sourceTag,
 							   commandTag,
-							   querytree_list,
-							   param_list,
+							   paramTypes,
+							   numParams,
+							   0,		/* default cursor options */
+							   stmt_list,
 							   false);
 	}
 	else
 	{
-		PreparedStatement	*pstmt;
-
-		pstmt = (PreparedStatement *) palloc0(sizeof(PreparedStatement));
-		/* query_string needs to be copied into unnamed_stmt_context */
-		pstmt->query_string = pstrdup(query_string);
-		/* the rest is there already */
-		pstmt->commandTag = commandTag;
-		pstmt->sourceTag = sourceTag;
-		pstmt->query_list = querytree_list;
-		pstmt->argtype_list = param_list;
-		pstmt->from_sql = false;
-		pstmt->context = unnamed_stmt_context;
-		/* XXX prepare_time and from_sql default to 0! Correct? */
-		/* Now the unnamed statement is complete and valid */
-		unnamed_stmt_pstmt = pstmt;
+		/*
+		 * paramTypes and query_string need to be copied into
+		 * unnamed_stmt_context.  The rest is there already
+		 */
+		Oid		   *newParamTypes;
+
+		if (numParams > 0)
+		{
+			newParamTypes = (Oid *) palloc(numParams * sizeof(Oid));
+			memcpy(newParamTypes, paramTypes, numParams * sizeof(Oid));
+		}
+		else
+			newParamTypes = NULL;
+
+		unnamed_stmt_psrc = FastCreateCachedPlan(raw_parse_tree,
+												 pstrdup(query_string),
+												 commandTag,
+												 newParamTypes,
+												 numParams,
+												 0,		/* cursor options */
+												 stmt_list,
+												 fully_planned,
+												 true,
+												 unnamed_stmt_context);
+		/* context now belongs to the plancache entry */
+		unnamed_stmt_context = NULL;
 	}
 
 	MemoryContextSwitchTo(oldcontext);
 
-	QueryContext = NULL;
-
 	/*
 	 * We do NOT close the open transaction command here; that only happens
 	 * when the client sends Sync.	Instead, do CommandCounterIncrement just
@@ -2171,12 +2196,16 @@ exec_bind_message(StringInfo input_message)
 	int			numParams;
 	int			numRFormats;
 	int16	   *rformats = NULL;
-	PreparedStatement *pstmt;
+	CachedPlanSource *psrc;
+	CachedPlan *cplan;
 	Portal		portal;
+	char	   *query_string;
+	char	   *saved_stmt_name;
 	ParamListInfo params;
-	List	   *stmt_list;
-	MemoryContext qContext = NULL;
+	List	   *plan_list;
+	MemoryContext oldContext;
 	bool		save_log_statement_stats = log_statement_stats;
+	Snapshot	mySnapshot = NULL;
 	char		msec_str[32];
 
 
@@ -2193,12 +2222,17 @@ exec_bind_message(StringInfo input_message)
 
 	/* Find prepared statement */
 	if (stmt_name[0] != '\0')
+	{
+		PreparedStatement *pstmt;
+
 		pstmt = FetchPreparedStatement(stmt_name, true);
+		psrc = pstmt->plansource;
+	}
 	else
 	{
 		/* special-case the unnamed statement */
-		pstmt = unnamed_stmt_pstmt;
-		if (!pstmt)
+		psrc = unnamed_stmt_psrc;
+		if (!psrc)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_PSTATEMENT),
 					 errmsg("unnamed prepared statement does not exist")));
@@ -2207,7 +2241,7 @@ exec_bind_message(StringInfo input_message)
 	/*
 	 * Report query to various monitoring facilities.
 	 */
-	debug_query_string = pstmt->query_string ? pstmt->query_string : "<BIND>";
+	debug_query_string = psrc->query_string ? psrc->query_string : "<BIND>";
 
 	pgstat_report_activity(debug_query_string);
 
@@ -2246,11 +2280,11 @@ exec_bind_message(StringInfo input_message)
 			errmsg("bind message has %d parameter formats but %d parameters",
 				   numPFormats, numParams)));
 
-	if (numParams != list_length(pstmt->argtype_list))
+	if (numParams != psrc->num_params)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("bind message supplies %d parameters, but prepared statement \"%s\" requires %d",
-				   numParams, stmt_name, list_length(pstmt->argtype_list))));
+						numParams, stmt_name, psrc->num_params)));
 
 	/*
 	 * If we are in aborted transaction state, the only portals we can
@@ -2261,7 +2295,7 @@ exec_bind_message(StringInfo input_message)
 	 * functions.
 	 */
 	if (IsAbortedTransactionBlockState() &&
-		(!IsTransactionExitStmtList(pstmt->query_list) ||
+		(!IsTransactionExitStmt(psrc->raw_parse_tree) ||
 		 numParams != 0))
 		ereport(ERROR,
 				(errcode(ERRCODE_IN_FAILED_SQL_TRANSACTION),
@@ -2279,14 +2313,42 @@ exec_bind_message(StringInfo input_message)
 
 	portal->is_extended_query = true;
 
+	/*
+	 * Prepare to copy stuff into the portal's memory context.  We do all this
+	 * copying first, because it could possibly fail (out-of-memory) and we
+	 * don't want a failure to occur between RevalidateCachedPlan and
+	 * PortalDefineQuery; that would result in leaking our plancache refcount.
+	 */
+	oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+
+	/* Copy the plan's query string, if available, into the portal */
+	query_string = psrc->query_string;
+	if (query_string)
+		query_string = pstrdup(query_string);
+
+	/* Likewise make a copy of the statement name, unless it's unnamed */
+	if (stmt_name[0])
+		saved_stmt_name = pstrdup(stmt_name);
+	else
+		saved_stmt_name = NULL;
+
+	/*
+	 * Set a snapshot if we have parameters to fetch (since the input
+	 * functions might need it) or the query isn't a utility command (and
+	 * hence could require redoing parse analysis and planning).
+	 */
+	if (numParams > 0 || analyze_requires_snapshot(psrc->raw_parse_tree))
+	{
+		mySnapshot = CopySnapshot(GetTransactionSnapshot());
+		ActiveSnapshot = mySnapshot;
+	}
+
 	/*
 	 * Fetch parameters, if any, and store in the portal's memory context.
 	 */
 	if (numParams > 0)
 	{
 		Snapshot        mySnapshot;
-		ListCell   *l;
-		MemoryContext oldContext;
 		int			paramno;
 		
 		 /*
@@ -2296,17 +2358,14 @@ exec_bind_message(StringInfo input_message)
 		mySnapshot = CopySnapshot(GetTransactionSnapshot());
 		ActiveSnapshot = mySnapshot;
 
-		oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
-
 		/* sizeof(ParamListInfoData) includes the first array element */
 		params = (ParamListInfo) palloc(sizeof(ParamListInfoData) +
 								   (numParams - 1) *sizeof(ParamExternData));
 		params->numParams = numParams;
 
-		paramno = 0;
-		foreach(l, pstmt->argtype_list)
+		for (paramno = 0; paramno < numParams; paramno++)
 		{
-			Oid			ptype = lfirst_oid(l);
+			Oid			ptype = psrc->param_types[paramno];
 			int32		plength;
 			Datum		pval;
 			bool		isNull;
@@ -2422,8 +2481,6 @@ exec_bind_message(StringInfo input_message)
 			 */
 			params->params[paramno].pflags = PARAM_FLAG_CONST;
 			params->params[paramno].ptype = ptype;
-
-			paramno++;
 		}
 
 		MemoryContextSwitchTo(oldContext);
@@ -2435,6 +2492,9 @@ exec_bind_message(StringInfo input_message)
 	else
 		params = NULL;
 
+	/* Done storing stuff in portal's context */
+	MemoryContextSwitchTo(oldContext);
+
 	/* Get the result format codes */
 	numRFormats = pq_getmsgint(input_message, 2);
 	if (numRFormats > 0)
@@ -2448,51 +2508,74 @@ exec_bind_message(StringInfo input_message)
 
 	pq_getmsgend(input_message);
 
-	/*
-	 * If we didn't plan the query before, do it now.  This allows the planner
-	 * to make use of the concrete parameter values we now have.  Because we
-	 * use PARAM_FLAG_CONST, the plan is good only for this set of param
-	 * values, and so we generate the plan in the portal's own memory context
-	 * where it will be thrown away after use.	As in exec_parse_message, we
-	 * make no attempt to recover planner temporary memory until the end of
-	 * the operation.
-	 *
-	 * XXX because the planner has a bad habit of scribbling on its input, we
-	 * have to make a copy of the parse trees, just in case someone binds and
-	 * executes an unnamed statement multiple times; this also means that the
-	 * portal's queryContext becomes its own heap context rather than the
-	 * prepared statement's context.  FIXME someday
-	 */
-	
+	if (psrc->fully_planned)
 	{
-		List	   *query_list_copy = NIL;
-		Assert(portal);
-		MemoryContext oldContext = NULL;
-		qContext = PortalGetHeapMemory(portal);
-		oldContext = MemoryContextSwitchTo(qContext);
-		query_list_copy = copyObject(pstmt->query_list); /* planner scribbles on query tree */
-		stmt_list = pg_plan_queries(query_list_copy, params, true);
-		MemoryContextSwitchTo(oldContext);
+		/*
+		 * Revalidate the cached plan; this may result in replanning.  Any
+		 * cruft will be generated in MessageContext.  The plan refcount will
+		 * be assigned to the Portal, so it will be released at portal
+		 * destruction.
+		 */
+		cplan = RevalidateCachedPlan(psrc, false);
+		plan_list = cplan->stmt_list;
 	}
+	else
+	{
+		List	   *query_list;
 
-	Assert(qContext);
+		/*
+		 * Revalidate the cached plan; this may result in redoing parse
+		 * analysis and rewriting (but not planning).  Any cruft will be
+		 * generated in MessageContext.  The plan refcount is assigned to
+		 * CurrentResourceOwner.
+		 */
+		cplan = RevalidateCachedPlan(psrc, true);
+
+		/*
+		 * We didn't plan the query before, so do it now.  This allows the
+		 * planner to make use of the concrete parameter values we now have.
+		 * Because we use PARAM_FLAG_CONST, the plan is good only for this set
+		 * of param values, and so we generate the plan in the portal's own
+		 * memory context where it will be thrown away after use. As in
+		 * exec_parse_message, we make no attempt to recover planner temporary
+		 * memory until the end of the operation.
+		 *
+		 * XXX because the planner has a bad habit of scribbling on its input,
+		 * we have to make a copy of the parse trees.  FIXME someday.
+		 */
+		oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+		query_list = copyObject(cplan->stmt_list);
+		plan_list = pg_plan_queries(query_list, 0, params, false);
+		MemoryContextSwitchTo(oldContext);
 
-	/* Copy the plan's query string into the portal */
-	Assert(debug_query_string != NULL); 
-	char *query_string = MemoryContextStrdup(PortalGetHeapMemory(portal),
-						 debug_query_string);
+		/* We no longer need the cached plan refcount ... */
+		ReleaseCachedPlan(cplan, true);
+		/* ... and we don't want the portal to depend on it, either */
+		cplan = NULL;
+	}
 
 	/*
-	 * Define portal and start execution.
+	 * Now we can define the portal.
+	 *
+	 * DO NOT put any code that could possibly throw an error between the
+	 * above "RevalidateCachedPlan(psrc, false)" call and here.
 	 */
 	PortalDefineQuery(portal,
-					  *pstmt->stmt_name ? pstmt->stmt_name : NULL,
+					  saved_stmt_name,
 					  query_string,
-					  pstmt->sourceTag,
-					  pstmt->commandTag,
-					  stmt_list,
-					  qContext);
+					  psrc->sourceTag,
+					  psrc->commandTag,
+					  plan_list,
+					  cplan);
+
+	/* Done with the snapshot used for parameter I/O and parsing/planning */
+	ActiveSnapshot = NULL;
+	if (mySnapshot)
+		FreeSnapshot(mySnapshot);
 
+	/*
+	 * And we're ready to start portal execution.
+	 */
 	PortalStart(portal, params, InvalidSnapshot,
 				savedSeqServerHost, savedSeqServerPort, NULL);
 
@@ -2524,9 +2607,9 @@ exec_bind_message(StringInfo input_message)
 							*stmt_name ? stmt_name : "<unnamed>",
 							*portal_name ? "/" : "",
 							*portal_name ? portal_name : "",
-							pstmt->query_string ? pstmt->query_string : "<source not stored>"),
-					 errdetail_params(params),
-					 errhidestmt(true)));
+			psrc->query_string ? psrc->query_string : "<source not stored>"),
+					 errhidestmt(true),
+					 errdetail_params(params)));
 			break;
 	}
 
@@ -2699,8 +2782,8 @@ exec_execute_message(const char *portal_name, int64 max_rows)
 						*portal_name ? portal_name : "",
 						sourceText ? ": " : "",
 						sourceText ? sourceText : ""),
-				 errdetail_params(portalParams),
-				 errhidestmt(true)));
+				 errhidestmt(true),
+				 errdetail_params(portalParams)));
 		was_logged = true;
 	}
 
@@ -2784,8 +2867,8 @@ exec_execute_message(const char *portal_name, int64 max_rows)
 							*portal_name ? portal_name : "",
 							sourceText ? ": " : "",
 							sourceText ? sourceText : ""),
-					 errdetail_params(portalParams),
-					 errhidestmt(true)));
+					 errhidestmt(true),
+					 errdetail_params(portalParams)));
 			break;
 	}
 
@@ -2907,9 +2990,9 @@ errdetail_execute(List *raw_parsetree_list)
 			PreparedStatement *pstmt;
 
 			pstmt = FetchPreparedStatement(stmt->name, false);
-			if (pstmt && pstmt->query_string)
+			if (pstmt && pstmt->plansource->query_string)
 			{
-				errdetail("prepare: %s", pstmt->query_string);
+				errdetail("prepare: %s", pstmt->plansource->query_string);
 				return 0;
 			}
 		}
@@ -2990,10 +3073,9 @@ errdetail_params(ParamListInfo params)
 static void
 exec_describe_statement_message(const char *stmt_name)
 {
-	PreparedStatement *pstmt;
-	TupleDesc	tupdesc;
-	ListCell   *l;
+	CachedPlanSource *psrc;
 	StringInfoData buf;
+	int			i;
 
 	/*
 	 * Start up a transaction command. (Note that this will normally change
@@ -3006,28 +3088,37 @@ exec_describe_statement_message(const char *stmt_name)
 
 	/* Find prepared statement */
 	if (stmt_name[0] != '\0')
+	{
+		PreparedStatement *pstmt;
+
 		pstmt = FetchPreparedStatement(stmt_name, true);
+		psrc = pstmt->plansource;
+	}
 	else
 	{
 		/* special-case the unnamed statement */
-		pstmt = unnamed_stmt_pstmt;
-		if (!pstmt)
+		psrc = unnamed_stmt_psrc;
+		if (!psrc)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_PSTATEMENT),
 					 errmsg("unnamed prepared statement does not exist")));
 	}
 
+	/* Prepared statements shouldn't have changeable result descs */
+	Assert(psrc->fixed_result);
+
 	/*
-	 * If we are in aborted transaction state, we can't safely create a result
-	 * tupledesc, because that needs catalog accesses.	Hence, refuse to
-	 * Describe statements that return data.  (We shouldn't just refuse all
-	 * Describes, since that might break the ability of some clients to issue
-	 * COMMIT or ROLLBACK commands, if they use code that blindly Describes
-	 * whatever it does.)  We can Describe parameters without doing anything
-	 * dangerous, so we don't restrict that.
+	 * If we are in aborted transaction state, we can't run
+	 * SendRowDescriptionMessage(), because that needs catalog accesses. (We
+	 * can't do RevalidateCachedPlan, either, but that's a lesser problem.)
+	 * Hence, refuse to Describe statements that return data.  (We shouldn't
+	 * just refuse all Describes, since that might break the ability of some
+	 * clients to issue COMMIT or ROLLBACK commands, if they use code that
+	 * blindly Describes whatever it does.)  We can Describe parameters
+	 * without doing anything dangerous, so we don't restrict that.
 	 */
 	if (IsAbortedTransactionBlockState() &&
-		PreparedStatementReturnsTuples(pstmt))
+		psrc->resultDesc)
 		ereport(ERROR,
 				(errcode(ERRCODE_IN_FAILED_SQL_TRANSACTION),
 				 errmsg("current transaction is aborted, "
@@ -3040,11 +3131,11 @@ exec_describe_statement_message(const char *stmt_name)
 	 * First describe the parameters...
 	 */
 	pq_beginmessage(&buf, 't'); /* parameter description message type */
-	pq_sendint(&buf, list_length(pstmt->argtype_list), 2);
+	pq_sendint(&buf, psrc->num_params, 2);
 
-	foreach(l, pstmt->argtype_list)
+	for (i = 0; i < psrc->num_params; i++)
 	{
-		Oid			ptype = lfirst_oid(l);
+		Oid			ptype = psrc->param_types[i];
 
 		pq_sendint(&buf, (int) ptype, 4);
 	}
@@ -3053,11 +3144,21 @@ exec_describe_statement_message(const char *stmt_name)
 	/*
 	 * Next send RowDescription or NoData to describe the result...
 	 */
-	tupdesc = FetchPreparedStatementResultDesc(pstmt);
-	if (tupdesc)
-		SendRowDescriptionMessage(tupdesc,
-								  FetchPreparedStatementTargetList(pstmt),
-								  NULL);
+	if (psrc->resultDesc)
+	{
+		CachedPlan *cplan;
+		List	   *tlist;
+
+		/* Make sure the plan is up to date */
+		cplan = RevalidateCachedPlan(psrc, true);
+
+		/* Get the primary statement and find out what it returns */
+		tlist = FetchStatementTargetList(PortalListGetPrimaryStmt(cplan->stmt_list));
+
+		SendRowDescriptionMessage(psrc->resultDesc, tlist, NULL);
+
+		ReleaseCachedPlan(cplan, true);
+	}
 	else
 		pq_putemptymessage('n');	/* NoData */
 
@@ -3194,50 +3295,70 @@ IsTransactionExitStmt(Node *parsetree)
 	return false;
 }
 
-/*
- * IsTransactionExitStmtList
- *    Return true if this is a singleton list of Query wrapping a transaction
- * ending statement, or a singleton list of transaction ending statement.
- */
+/* Test a list that might contain Query nodes or bare parsetrees */
 static bool
 IsTransactionExitStmtList(List *parseTrees)
 {
 	if (list_length(parseTrees) == 1)
 	{
-		Node *node = linitial(parseTrees);
-		
-		if (IsTransactionExitStmt(node))
-		{
-			return true;
-		}
+		Node	   *stmt = (Node *) linitial(parseTrees);
 
-		if (IsA(node, Query))
+		if (IsA(stmt, Query))
 		{
-			Query *query = (Query *)node;
+			Query	   *query = (Query *) stmt;
+
 			if (query->commandType == CMD_UTILITY &&
 				IsTransactionExitStmt(query->utilityStmt))
-			{
 				return true;
-			}
 		}
+		else if (IsTransactionExitStmt(stmt))
+			return true;
 	}
 	return false;
 }
 
+/* Test a list that might contain Query nodes or bare parsetrees */
 static bool
-IsTransactionStmtList(List *nodes)
+IsTransactionStmtList(List *parseTrees)
 {
-	if (list_length(nodes) == 1)
+	if (list_length(parseTrees) == 1)
 	{
-		Node	   *stmt = (Node *) linitial(nodes);
+		Node	   *stmt = (Node *) linitial(parseTrees);
 
-		if (IsA(stmt, TransactionStmt))
-			return true;
+		if (IsA(stmt, Query))
+		{
+			Query	   *query = (Query *) stmt;
 
+			if (query->commandType == CMD_UTILITY &&
+				IsA(query->utilityStmt, TransactionStmt))
+				return true;
+		}
+		else if (IsA(stmt, TransactionStmt))
+			return true;
 	}
 	return false;
 }
 
+/* Release any existing unnamed prepared statement */
+static void
+drop_unnamed_stmt(void)
+{
+	/* Release any completed unnamed statement */
+	if (unnamed_stmt_psrc)
+		DropCachedPlan(unnamed_stmt_psrc);
+	unnamed_stmt_psrc = NULL;
+
+	/*
+	 * If we failed while trying to build a prior unnamed statement, we may
+	 * have a memory context that wasn't assigned to a completed plancache
+	 * entry.  If so, drop it to avoid a permanent memory leak.
+	 */
+	if (unnamed_stmt_context)
+		MemoryContextDelete(unnamed_stmt_context);
+	unnamed_stmt_context = NULL;
+}
+
+
 /* --------------------------------
  *		signal handler routines used in PostgresMain()
  * --------------------------------
@@ -3351,10 +3472,9 @@ die(SIGNAL_ARGS)
 			/* bump holdoff count to make ProcessInterrupts() a no-op */
 			/* until we are done getting ready for it */
 			InterruptHoldoffCount++;
+			LockWaitCancel();	/* prevent CheckDeadLock from running */
 			DisableNotifyInterrupt();
 			DisableCatchupInterrupt();
-			/* Make sure CheckDeadLock won't run while shutting down... */
-			LockWaitCancel();
 			InterruptHoldoffCount--;
 			ProcessInterrupts();
 		}
@@ -3405,20 +3525,16 @@ StatementCancelHandler(SIGNAL_ARGS)
 		 * waiting for input, however.
 		 */
 		if (ImmediateInterruptOK && InterruptHoldoffCount == 0 &&
-			CritSectionCount == 0)
+			CritSectionCount == 0 && !DoingCommandRead)
 		{
 			/* bump holdoff count to make ProcessInterrupts() a no-op */
 			/* until we are done getting ready for it */
 			InterruptHoldoffCount++;
-			if (LockWaitCancel())
-			{
-				DisableNotifyInterrupt();
-				DisableCatchupInterrupt();
-				InterruptHoldoffCount--;
-				ProcessInterrupts();
-			}
-			else
-				InterruptHoldoffCount--;
+			LockWaitCancel();	/* prevent CheckDeadLock from running */
+			DisableNotifyInterrupt();
+			DisableCatchupInterrupt();
+			InterruptHoldoffCount--;
+			ProcessInterrupts();
 		}
 	}
 
@@ -3543,11 +3659,16 @@ ProcessInterrupts(void)
 		ImmediateDieOK = false;		/* prevent re-entry */
 		DisableNotifyInterrupt();
 		DisableCatchupInterrupt();
-
-		ereport(FATAL,
-				(errcode(ERRCODE_ADMIN_SHUTDOWN),
-			 errmsg("terminating connection due to administrator command"),
-			 errSendAlert(false)));
+		if (IsAutoVacuumWorkerProcess())
+			ereport(FATAL,
+					(errcode(ERRCODE_ADMIN_SHUTDOWN),
+					 errmsg("terminating autovacuum process due to administrator command"),
+					 errSendAlert(false)));
+		else
+			ereport(FATAL,
+					(errcode(ERRCODE_ADMIN_SHUTDOWN),
+					 errmsg("terminating connection due to administrator command"),
+					 errSendAlert(false)));
 	}
 
 	if (ClientConnectionLost)
@@ -3587,6 +3708,10 @@ ProcessInterrupts(void)
 				ereport(ERROR,
 						(errcode(ERRCODE_QUERY_CANCELED),
 						 errmsg("canceling statement due to statement timeout")));
+			else if (IsAutoVacuumWorkerProcess())
+				ereport(ERROR,
+						(errcode(ERRCODE_QUERY_CANCELED),
+						 errmsg("canceling autovacuum task")));
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_QUERY_CANCELED),
@@ -3637,6 +3762,89 @@ gp_set_thread_sigmasks(void)
 	return;
 }
 
+/*
+ * IA64-specific code to fetch the AR.BSP register for stack depth checks.
+ *
+ * We currently support gcc, icc, and HP-UX inline assembly here.
+ */
+#if defined(__ia64__) || defined(__ia64)
+
+#if defined(__hpux) && !defined(__GNUC__) && !defined __INTEL_COMPILER
+#include <ia64/sys/inline.h>
+#define ia64_get_bsp() ((char *) (_Asm_mov_from_ar(_AREG_BSP, _NO_FENCE)))
+#else
+
+#ifdef __INTEL_COMPILER
+#include <asm/ia64regs.h>
+#endif
+
+static __inline__ char *
+ia64_get_bsp(void)
+{
+	char	   *ret;
+
+#ifndef __INTEL_COMPILER
+	/* the ;; is a "stop", seems to be required before fetching BSP */
+	__asm__ __volatile__(
+		";;\n"
+		"	mov	%0=ar.bsp	\n"
+:		"=r"(ret));
+#else
+  ret = (char *) __getReg(_IA64_REG_AR_BSP);
+#endif
+  return ret;
+}
+#endif
+#endif /* IA64 */
+
+
+/*
+ * set_stack_base: set up reference point for stack depth checking
+ *
+ * Returns the old reference point, if any.
+ */
+pg_stack_base_t
+set_stack_base(void)
+{
+	char		stack_base;
+	pg_stack_base_t old;
+
+#if defined(__ia64__) || defined(__ia64)
+	old.stack_base_ptr = stack_base_ptr;
+	old.register_stack_base_ptr = register_stack_base_ptr;
+#else
+	old = stack_base_ptr;
+#endif
+
+	/* Set up reference point for stack depth checking */
+	stack_base_ptr = &stack_base;
+#if defined(__ia64__) || defined(__ia64)
+	register_stack_base_ptr = ia64_get_bsp();
+#endif
+
+	return old;
+}
+
+/*
+ * restore_stack_base: restore reference point for stack depth checking
+ *
+ * This can be used after set_stack_base() to restore the old value. This
+ * is currently only used in PL/Java. When PL/Java calls a backend function
+ * from different thread, the thread's stack is at a different location than
+ * the main thread's stack, so it sets the base pointer before the call, and
+ * restores it afterwards.
+ */
+void
+restore_stack_base(pg_stack_base_t base)
+{
+#if defined(__ia64__) || defined(__ia64)
+	stack_base_ptr = base.stack_base_ptr;
+	register_stack_base_ptr = base.register_stack_base_ptr;
+#else
+	stack_base_ptr = base;
+#endif
+}
+
 /*
  * check_stack_depth: check for excessively deep recursion
  *
@@ -3652,7 +3860,7 @@ check_stack_depth(void)
 	long		stack_depth;
 
 	/*
-	 * Compute distance from PostgresMain's local variables to my own
+	 * Compute distance from reference point to to my local variables
 	 */
 	stack_depth = (long) (stack_base_ptr - &stack_top_loc);
 
@@ -3676,9 +3884,31 @@ check_stack_depth(void)
 		ereport(ERROR,
 				(errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
 				 errmsg("stack depth limit exceeded"),
-				 errhint("Increase the configuration parameter \"max_stack_depth\", "
-						 "after ensuring the platform's stack depth limit is adequate.")));
+		 errhint("Increase the configuration parameter \"max_stack_depth\", "
+		   "after ensuring the platform's stack depth limit is adequate.")));
 	}
+
+	/*
+	 * On IA64 there is a separate "register" stack that requires its own
+	 * independent check.  For this, we have to measure the change in the
+	 * "BSP" pointer from PostgresMain to here.  Logic is just as above,
+	 * except that we know IA64's register stack grows up.
+	 *
+	 * Note we assume that the same max_stack_depth applies to both stacks.
+	 */
+#if defined(__ia64__) || defined(__ia64)
+	stack_depth = (long) (ia64_get_bsp() - register_stack_base_ptr);
+
+	if (stack_depth > max_stack_depth_bytes &&
+		register_stack_base_ptr != NULL)
+	{
+		ereport(ERROR,
+				(errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
+				 errmsg("stack depth limit exceeded"),
+		 errhint("Increase the configuration parameter \"max_stack_depth\", "
+		   "after ensuring the platform's stack depth limit is adequate.")));
+	}
+#endif /* IA64 */
 }
 
 /* GUC assign hook for max_stack_depth */
@@ -3690,7 +3920,7 @@ assign_max_stack_depth(int newval, bool doit, GucSource source)
 
 	if (stack_rlimit > 0 && newval_bytes > stack_rlimit - STACK_DEPTH_SLOP)
 	{
-		ereport((source >= PGC_S_INTERACTIVE) ? ERROR : LOG,
+		ereport(GUC_complaint_elevel(source),
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("\"max_stack_depth\" must not exceed %ldkB",
 						(stack_rlimit - STACK_DEPTH_SLOP) / 1024L),
@@ -3852,9 +4082,9 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx,
 #endif
 
 	/*
-	 * Parse command-line options.  CAUTION: keep this in sync with
-	 * postmaster/postmaster.c (the option sets should not conflict)
-	 * and with the common help() function in main/main.c.
+	 * Parse command-line options.	CAUTION: keep this in sync with
+	 * postmaster/postmaster.c (the option sets should not conflict) and with
+	 * the common help() function in main/main.c.
 	 */
 	while ((flag = getopt(argc, argv, "A:B:b:C:c:D:d:EeFf:h:ijk:m:lN:nOo:Pp:r:S:sTt:Uv:W:x:y:z:-:")) != -1)
 	{
@@ -4244,7 +4474,16 @@ PostgresMain(int argc, char *argv[],
 	pqsignal(SIGHUP, SigHupHandler);	/* set flag to read config file */
 	pqsignal(SIGINT, StatementCancelHandler);	/* cancel current query */
 	pqsignal(SIGTERM, die);		/* cancel current query and exit */
-	pqsignal(SIGQUIT, quickdie);	/* hard crash time */
+
+	/*
+	 * In a standalone backend, SIGQUIT can be generated from the keyboard
+	 * easily, while SIGTERM cannot, so we make both signals do die() rather
+	 * than quickdie().
+	 */
+	if (IsUnderPostmaster)
+		pqsignal(SIGQUIT, quickdie);	/* hard crash time */
+	else
+		pqsignal(SIGQUIT, die); /* cancel current query and exit */
 	pqsignal(SIGALRM, handle_sig_alarm);		/* timeout conditions */
 
 	/*
@@ -4278,12 +4517,15 @@ PostgresMain(int argc, char *argv[],
 
 	pqinitmask();
 
-	/* We allow SIGQUIT (quickdie) at all times */
+	if (IsUnderPostmaster)
+	{
+		/* We allow SIGQUIT (quickdie) at all times */
 #ifdef HAVE_SIGPROCMASK
-	sigdelset(&BlockSig, SIGQUIT);
+		sigdelset(&BlockSig, SIGQUIT);
 #else
-	BlockSig &= ~(sigmask(SIGQUIT));
+		BlockSig &= ~(sigmask(SIGQUIT));
 #endif
+	}
 
 	PG_SETMASK(&BlockSig);		/* block everything except SIGQUIT */
 
@@ -4492,6 +4734,9 @@ PostgresMain(int argc, char *argv[],
 		 */
 		debug_query_string = NULL;
 
+		/* No active snapshot any more either */
+		ActiveSnapshot = NULL;
+
 		/*
 		 * Abort the current transaction in order to recover.
 		 */
@@ -4516,7 +4761,6 @@ PostgresMain(int argc, char *argv[],
 		 */
 		MemoryContextSwitchTo(TopMemoryContext);
 		FlushErrorState();
-		QueryContext = NULL;
 
 		/*
 		 * If we were handling an extended-query-protocol message, initiate
@@ -5120,13 +5364,7 @@ PostgresMain(int argc, char *argv[],
 							else
 							{
 								/* special-case the unnamed statement */
-								unnamed_stmt_pstmt = NULL;
-								if (unnamed_stmt_context)
-								{
-									DropDependentPortals(unnamed_stmt_context);
-									MemoryContextDelete(unnamed_stmt_context);
-								}
-								unnamed_stmt_context = NULL;
+								drop_unnamed_stmt();
 							}
 							break;
 						case 'P':
@@ -5295,11 +5533,11 @@ get_stack_depth_rlimit(void)
 			val = rlim.rlim_cur;
 	}
 	return val;
-#else /* no getrlimit */
+#else							/* no getrlimit */
 #if defined(WIN32) || defined(__CYGWIN__)
 	/* On Windows we set the backend stack size in src/backend/Makefile */
 	return WIN32_STACK_RLIMIT;
-#else  /* not windows ... give up */
+#else							/* not windows ... give up */
 	return -1;
 #endif
 #endif
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 0023c907a46f..7d7e5c2c65e9 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.113 2007/02/18 19:49:25 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.120 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -209,8 +209,7 @@ ProcessQuery(Portal portal,
 	Oid	relationOid = InvalidOid; 	/* relation that is modified */
 	AutoStatsCmdType cmdType = AUTOSTATS_CMDTYPE_SENTINEL; 	/* command type */
 	
-	ereport(DEBUG3,
-			(errmsg_internal("ProcessQuery")));
+	elog(DEBUG3, "ProcessQuery");
 
 	/*
 	 * Must always set snapshot for plannable queries.	Note we assume that
@@ -461,7 +460,10 @@ ProcessQuery(Portal portal,
 
 /*
  * ChoosePortalStrategy
- *		Select portal execution strategy given the intended query list.
+ *		Select portal execution strategy given the intended statement list.
+ *
+ * The list elements can be Querys, PlannedStmts, or utility statements.
+ * That's more general than portals need, but plancache.c uses this too.
  *
  * The list elements can be Querys, PlannedStmts, or utility statements.
  *
@@ -475,7 +477,7 @@ ChoosePortalStrategy(List *stmts)
 
 	/*
 	 * PORTAL_ONE_SELECT and PORTAL_UTIL_SELECT need only consider the
-	 * single-Query-struct case, since there are no rewrite rules that can add
+	 * single-statement case, since there are no rewrite rules that can add
 	 * auxiliary queries to a SELECT or a utility command.
 	 */
 	if (list_length(stmts) == 1)
@@ -484,7 +486,7 @@ ChoosePortalStrategy(List *stmts)
 
 		if (IsA(stmt, Query))
 		{
-			Query	   *query = (Query*)stmt;
+			Query	   *query = (Query*) stmt;
 			
 			if (query->canSetTag)
 			{
@@ -532,12 +534,12 @@ ChoosePortalStrategy(List *stmts)
 	nSetTag = 0;
 	foreach(lc, stmts)
 	{
-		Node	   *stmt = (Node*) lfirst(lc);
-		
+		Node	   *stmt = (Node *) lfirst(lc);
+
 		if (IsA(stmt, Query))
 		{
 			Query	   *query = (Query *) stmt;
-			
+
 			if (query->canSetTag)
 			{
 				if (++nSetTag > 1)
@@ -549,7 +551,7 @@ ChoosePortalStrategy(List *stmts)
 		else if (IsA(stmt, PlannedStmt))
 		{
 			PlannedStmt *pstmt = (PlannedStmt *) stmt;
-			
+
 			if (pstmt->canSetTag)
 			{
 				if (++nSetTag > 1)
@@ -573,9 +575,6 @@ ChoosePortalStrategy(List *stmts)
  *		Returns NIL if the portal doesn't have a determinable targetlist.
  *
  * Note: do not modify the result.
- *
- * XXX be careful to keep this in sync with FetchPreparedStatementTargetList,
- * and with UtilityReturnsTuples.
  */
 List *
 FetchPortalTargetList(Portal portal)
@@ -593,7 +592,7 @@ FetchPortalTargetList(Portal portal)
  *		Returns NIL if the statement doesn't have a determinable targetlist.
  *
  * This can be applied to a Query, a PlannedStmt, or a utility statement.
- * That's more general than portals need, but useful.
+ * That's more general than portals need, but plancache.c uses this too.
  *
  * Note: do not modify the result.
  *
@@ -607,7 +606,7 @@ FetchStatementTargetList(Node *stmt)
 	if (IsA(stmt, Query))
 	{
 		Query	   *query = (Query *) stmt;
-		
+
 		if (query->commandType == CMD_UTILITY &&
 			query->utilityStmt != NULL)
 		{
@@ -689,8 +688,7 @@ PortalStart(Portal portal, ParamListInfo params, Snapshot snapshot,
 	int			eflags;
 
 	AssertArg(PortalIsValid(portal));
-	AssertState(portal->queryContext != NULL);	/* query defined? */
-	AssertState(portal->status  == PORTAL_NEW);	/* else extra PortalStart */
+	AssertState(portal->status == PORTAL_DEFINED);
 
 	/* Set up the sequence server */
 	SetupSequenceServer(seqServerHost, seqServerPort);
@@ -872,25 +870,25 @@ PortalStart(Portal portal, ParamListInfo params, Snapshot snapshot,
 				 * We don't start the executor until we are told to run the
 				 * portal.	We do need to set up the result tupdesc.
 				 */
-			{
-				PlannedStmt *pstmt;
-				
-				pstmt = (PlannedStmt *) PortalGetPrimaryStmt(portal);
-				Assert(IsA(pstmt, PlannedStmt));
-				Assert(pstmt->returningLists);
-				portal->tupDesc =
-					ExecCleanTypeFromTL((List *) linitial(pstmt->returningLists),
-										false);
-			}
-				
-			/*
-			 * Reset cursor position data to "start of query"
-			 */
-			portal->atStart = true;
-			portal->atEnd = false;	/* allow fetches */
-			portal->portalPos = 0;
-			portal->posOverflow = false;
-			break;
+				{
+					PlannedStmt *pstmt;
+
+					pstmt = (PlannedStmt *) PortalGetPrimaryStmt(portal);
+					Assert(IsA(pstmt, PlannedStmt));
+					Assert(pstmt->returningLists);
+					portal->tupDesc =
+						ExecCleanTypeFromTL((List *) linitial(pstmt->returningLists),
+											false);
+				}
+
+				/*
+				 * Reset cursor position data to "start of query"
+				 */
+				portal->atStart = true;
+				portal->atEnd = false;	/* allow fetches */
+				portal->portalPos = 0;
+				portal->posOverflow = false;
+				break;
 
 			case PORTAL_UTIL_SELECT:
 
@@ -898,8 +896,12 @@ PortalStart(Portal portal, ParamListInfo params, Snapshot snapshot,
 				 * We don't set snapshot here, because PortalRunUtility will
 				 * take care of it if needed.
 				 */
-				portal->tupDesc =
-					UtilityTupleDescriptor(linitial(portal->stmts));
+				{
+					Node	   *ustmt = PortalGetPrimaryStmt(portal);
+
+					Assert(!IsA(ustmt, PlannedStmt));
+					portal->tupDesc = UtilityTupleDescriptor(ustmt);
+				}
 
 				/*
 				 * Reset cursor position data to "start of query"
@@ -999,6 +1001,9 @@ PortalSetResultFormat(Portal portal, int nFormats, int16 *formats)
  * interpreted as "all rows".  Note that count is ignored in multi-query
  * situations, where we always run the portal to completion.
  *
+ * isTopLevel: true if query is being executed at backend "top level"
+ * (that is, directly from a client command message)
+ *
  * dest: where to send output of primary (canSetTag) query
  *
  * altdest: where to send output of non-primary queries
@@ -1022,7 +1027,6 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 	Snapshot	saveActiveSnapshot;
 	ResourceOwner saveResourceOwner;
 	MemoryContext savePortalContext;
-	MemoryContext saveQueryContext;
 	MemoryContext saveMemoryContext;
 
 	AssertArg(PortalIsValid(portal));
@@ -1033,8 +1037,7 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 
 	if (log_executor_stats && portal->strategy != PORTAL_MULTI_QUERY)
 	{
-		ereport(DEBUG3,
-				(errmsg_internal("PortalRun")));
+		elog(DEBUG3, "PortalRun");
 		/* PORTAL_MULTI_QUERY logs its own stats per query */
 		ResetUsage();
 	}
@@ -1069,7 +1072,6 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 	saveActiveSnapshot = ActiveSnapshot;
 	saveResourceOwner = CurrentResourceOwner;
 	savePortalContext = PortalContext;
-	saveQueryContext = QueryContext;
 	saveMemoryContext = CurrentMemoryContext;
 	PG_TRY();
 	{
@@ -1078,7 +1080,6 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 		if (portal->resowner)
 			CurrentResourceOwner = portal->resowner;
 		PortalContext = PortalGetHeapMemory(portal);
-		QueryContext = portal->queryContext;
 
 		MemoryContextSwitchTo(PortalContext);
 
@@ -1102,21 +1103,22 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 
 			case PORTAL_ONE_RETURNING:
 			case PORTAL_UTIL_SELECT:
-			    /*
-			     * If we have not yet run the command, do so, storing its
-			     * results in the portal's tuplestore.
-			     */
-			    if (!portal->holdStore)
-				    FillPortalStore(portal, isTopLevel);
-
-			    /*
-			     * Now fetch desired portion of results.
-			     */
-			    (void) PortalRunSelect(portal, true, count, dest);
-
-			    /* we know the query is supposed to set the tag */
-			    if (completionTag && portal->commandTag)
-				    strcpy(completionTag, portal->commandTag);
+
+				/*
+				 * If we have not yet run the command, do so, storing its
+				 * results in the portal's tuplestore.
+				 */
+				if (!portal->holdStore)
+					FillPortalStore(portal, isTopLevel);
+
+				/*
+				 * Now fetch desired portion of results.
+				 */
+				(void) PortalRunSelect(portal, true, count, dest);
+
+				/* we know the query is supposed to set the tag */
+				if (completionTag && portal->commandTag)
+					strcpy(completionTag, portal->commandTag);
 
 				/* Mark portal not active */
 				portal->status = PORTAL_READY;
@@ -1128,7 +1130,7 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 				break;
 
 			case PORTAL_MULTI_QUERY:
-				PortalRunMulti(portal, isTopLevel, 
+				PortalRunMulti(portal, isTopLevel,
 							   dest, altdest, completionTag);
 
 				/* Prevent portal's commands from being re-executed */
@@ -1161,7 +1163,6 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 		else
 			CurrentResourceOwner = saveResourceOwner;
 		PortalContext = savePortalContext;
-		QueryContext = saveQueryContext;
 
 		TeardownSequenceServer();
 
@@ -1180,7 +1181,6 @@ PortalRun(Portal portal, int64 count, bool isTopLevel,
 	else
 		CurrentResourceOwner = saveResourceOwner;
 	PortalContext = savePortalContext;
-	QueryContext = saveQueryContext;
 
 	if (log_executor_stats && portal->strategy != PORTAL_MULTI_QUERY)
 		ShowUsage("EXECUTOR STATISTICS");
@@ -1365,12 +1365,12 @@ FillPortalStore(Portal portal, bool isTopLevel)
 			 * MULTI_QUERY case, but send the primary query's output to the
 			 * tuplestore. Auxiliary query outputs are discarded.
 			 */
-			PortalRunMulti(portal, isTopLevel, 
+			PortalRunMulti(portal, isTopLevel,
 						   treceiver, None_Receiver, completionTag);
 			break;
 
 		case PORTAL_UTIL_SELECT:
-			PortalRunUtility(portal, linitial(portal->stmts),
+			PortalRunUtility(portal, (Node *) linitial(portal->stmts),
 							 isTopLevel, treceiver, completionTag);
 			break;
 
@@ -1462,8 +1462,7 @@ static void
 PortalRunUtility(Portal portal, Node *utilityStmt, bool isTopLevel,
 				 DestReceiver *dest, char *completionTag)
 {
-	ereport(DEBUG3,
-			(errmsg_internal("ProcessUtility")));
+	elog(DEBUG3, "ProcessUtility");
 
 	/*
 	 * Set snapshot if utility stmt needs one.	Most reliable way to do this
@@ -1483,7 +1482,6 @@ PortalRunUtility(Portal portal, Node *utilityStmt, bool isTopLevel,
 		  IsA(utilityStmt, LockStmt) ||
 		  IsA(utilityStmt, VariableSetStmt) ||
 		  IsA(utilityStmt, VariableShowStmt) ||
-		  IsA(utilityStmt, VariableResetStmt) ||
 		  IsA(utilityStmt, ConstraintsSetStmt) ||
 	/* efficiency hacks from here down */
 		  IsA(utilityStmt, FetchStmt) ||
@@ -1515,28 +1513,12 @@ PortalRunUtility(Portal portal, Node *utilityStmt, bool isTopLevel,
 	 * mgmt */
 	ResHandleUtilityStmt(portal, utilityStmt);
 
-	if ( isTopLevel )
-	{
-		/* utility statement can override default tag string */
-		ProcessUtility(utilityStmt, 
-					   portal->sourceText ? portal->sourceText : "(Source text for portal is not available)",
-					   portal->portalParams,
-					   isTopLevel,
-					   dest, 
-					   completionTag);
-		if (completionTag && completionTag[0] == '\0' && portal->commandTag)
-			strcpy(completionTag, portal->commandTag);	/* use the default */
-	}
-	else
-	{
-		/* utility added by rewrite cannot set tag */
-		ProcessUtility(utilityStmt, 
-					   portal->sourceText ? portal->sourceText : "(Source text for portal is not available)",
-					   portal->portalParams, 
-					   isTopLevel,
-					   dest, 
-					   NULL);
-	}
+	ProcessUtility(utilityStmt,
+				   portal->sourceText ? portal->sourceText : "(Source text for portal is not available)",
+				   portal->portalParams,
+				   isTopLevel,
+				   dest,
+				   completionTag);
 
 	/* Some utility statements may change context on us */
 	MemoryContextSwitchTo(PortalGetHeapMemory(portal));
@@ -1585,7 +1567,7 @@ PortalRunMulti(Portal portal, bool isTopLevel,
 	 */
 	foreach(stmtlist_item, portal->stmts)
 	{
-		Node *stmt = lfirst(stmtlist_item);
+		Node	   *stmt = (Node *) lfirst(stmtlist_item);
 
 		/*
 		 * If we got a cancel signal in prior command, quit
@@ -1599,7 +1581,7 @@ PortalRunMulti(Portal portal, bool isTopLevel,
 			 * process a plannable query.
 			 */
 			PlannedStmt *pstmt = (PlannedStmt *) stmt;
-			
+
 			if (log_executor_stats)
 				ResetUsage();
 
@@ -1675,6 +1657,8 @@ PortalRunMulti(Portal portal, bool isTopLevel,
  * PortalRunFetch
  *		Variant form of PortalRun that supports SQL FETCH directions.
  *
+ * Note: we presently assume that no callers of this want isTopLevel = true.
+ *
  * Returns number of rows processed (suitable for use in result tag)
  */
 int64
@@ -1688,7 +1672,6 @@ PortalRunFetch(Portal portal,
 	Snapshot	saveActiveSnapshot;
 	ResourceOwner saveResourceOwner;
 	MemoryContext savePortalContext;
-	MemoryContext saveQueryContext;
 	MemoryContext oldContext = CurrentMemoryContext;
 
 	AssertArg(PortalIsValid(portal));
@@ -1710,7 +1693,6 @@ PortalRunFetch(Portal portal,
 	saveActiveSnapshot = ActiveSnapshot;
 	saveResourceOwner = CurrentResourceOwner;
 	savePortalContext = PortalContext;
-	saveQueryContext = QueryContext;
 	PG_TRY();
 	{
 		ActivePortal = portal;
@@ -1718,7 +1700,6 @@ PortalRunFetch(Portal portal,
 		if (portal->resowner)
 			CurrentResourceOwner = portal->resowner;
 		PortalContext = PortalGetHeapMemory(portal);
-		QueryContext = portal->queryContext;
 
 		MemoryContextSwitchTo(PortalContext);
 
@@ -1736,9 +1717,7 @@ PortalRunFetch(Portal portal,
 				 * results in the portal's tuplestore.
 				 */
 				if (!portal->holdStore)
-				{
 					FillPortalStore(portal, false /* isTopLevel */ );
-				}
 
 				/*
 				 * Now fetch desired portion of results.
@@ -1761,7 +1740,6 @@ PortalRunFetch(Portal portal,
 		ActiveSnapshot = saveActiveSnapshot;
 		CurrentResourceOwner = saveResourceOwner;
 		PortalContext = savePortalContext;
-		QueryContext = saveQueryContext;
 
 		PG_RE_THROW();
 	}
@@ -1776,7 +1754,6 @@ PortalRunFetch(Portal portal,
 	ActiveSnapshot = saveActiveSnapshot;
 	CurrentResourceOwner = saveResourceOwner;
 	PortalContext = savePortalContext;
-	QueryContext = saveQueryContext;
 
 	return result;
 }
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 348cd0e0ce04..138afc4561eb 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.272 2007/02/14 01:58:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.289.2.3 2009/12/09 21:58:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,6 +33,7 @@
 #include "commands/copy.h"
 #include "commands/dbcommands.h"
 #include "commands/defrem.h"
+#include "commands/discard.h"
 #include "commands/explain.h"
 #include "commands/extprotocolcmds.h"
 #include "commands/filespace.h"
@@ -52,6 +53,7 @@
 #include "commands/view.h"
 #include "miscadmin.h"
 #include "optimizer/planmain.h"
+#include "parser/parse_utilcmd.h"
 #include "postmaster/bgwriter.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteRemove.h"
@@ -346,42 +348,6 @@ CheckRelationOwnership(RangeVar *rel, bool noCatalogs)
 }
 
 
-/*
- * QueryIsReadOnly: is an analyzed/rewritten query read-only?
- *
- *** You should probably use CommandIsReadOnly instead.
- *** This routine retained for use by SPI
- *
- * This is a much stricter test than we apply for XactReadOnly mode; * the query must be *in truth* read-only, because the caller wishes
- * not to do CommandCounterIncrement for it.
- */
-bool
-QueryIsReadOnly(Query *parsetree)
-{
-	switch (parsetree->commandType)
-	{
-		case CMD_SELECT:
-			if (parsetree->intoClause != NULL)
-				return false;	/* SELECT INTO */
-			else if (parsetree->rowMarks != NIL)
-				return false;	/* SELECT FOR UPDATE/SHARE */
-			else
-				return true;
-		case CMD_UPDATE:
-		case CMD_INSERT:
-		case CMD_DELETE:
-			return false;
-		case CMD_UTILITY:
-			/* For now, treat all utility commands as read/write */
-			return false;
-		default:
-			elog(WARNING, "unrecognized commandType: %d",
-				 (int) parsetree->commandType);
-			break;
-	}
-	return false;
-}
-
 /*
  * CommandIsReadOnly: is an executable query read-only?
  *
@@ -516,6 +482,7 @@ check_xact_readonly(Node *parsetree)
 		case T_CreateTableSpaceStmt:
 		case T_CreateTrigStmt:
 		case T_CompositeTypeStmt:
+		case T_CreateEnumStmt:
 		case T_ViewStmt:
 		case T_DropCastStmt:
 		case T_DropdbStmt:
@@ -531,6 +498,8 @@ check_xact_readonly(Node *parsetree)
 		case T_TruncateStmt:
 		case T_DropOwnedStmt:
 		case T_ReassignOwnedStmt:
+		case T_AlterTSDictionaryStmt:
+		case T_AlterTSConfigurationStmt:
 			ereport(ERROR,
 					(errcode(ERRCODE_READ_ONLY_SQL_TRANSACTION),
 					 errmsg("transaction is read-only")));
@@ -700,7 +669,7 @@ CheckRestrictedOperation(const char *cmdname)
  *		general utility function invoker
  *
  *	parsetree: the parse tree for the utility statement
- *	queryString: original source text of command
+ *	queryString: original source text of command (NULL if not available)
  *	params: parameters to use during execution
  *	isTopLevel: true if executing a "top level" (interactively issued) command
  *	dest: where to send results
@@ -756,12 +725,12 @@ ProcessUtility(Node *parsetree,
 								DefElem    *item = (DefElem *) lfirst(lc);
 
 								if (strcmp(item->defname, "transaction_isolation") == 0)
-									SetPGVariable("transaction_isolation",
+									SetPGVariableOptDispatch("transaction_isolation",
 												  list_make1(item->arg),
 												  true,
 												  /* gp_dispatch */ false);
 								else if (strcmp(item->defname, "transaction_read_only") == 0)
-									SetPGVariable("transaction_read_only",
+									SetPGVariableOptDispatch("transaction_read_only",
 												  list_make1(item->arg),
 												  true,
 												  /* gp_dispatch */ false);
@@ -806,7 +775,7 @@ ProcessUtility(Node *parsetree,
 											));
 
 						}
-						PreventTransactionChain(stmt, "COMMIT PREPARED");
+						PreventTransactionChain(isTopLevel, "COMMIT PREPARED");
 						FinishPreparedTransaction(stmt->gid, /* isCommit */ true, /* raiseErrorIfNotFound */ true);
 						break;
 
@@ -819,7 +788,7 @@ ProcessUtility(Node *parsetree,
 											));
 
 						}
-						PreventTransactionChain(stmt, "ROLLBACK PREPARED");
+						PreventTransactionChain(isTopLevel, "ROLLBACK PREPARED");
 						FinishPreparedTransaction(stmt->gid, /* isCommit */ false, /* raiseErrorIfNotFound */ true);
 						break;
 
@@ -832,7 +801,7 @@ ProcessUtility(Node *parsetree,
 							ListCell   *cell;
 							char	   *name = NULL;
 
-							RequireTransactionChain((void *) stmt, "SAVEPOINT");
+							RequireTransactionChain(isTopLevel, "SAVEPOINT");
 
 							foreach(cell, stmt->options)
 							{
@@ -860,12 +829,12 @@ ProcessUtility(Node *parsetree,
 						break;
 
 					case TRANS_STMT_RELEASE:
-						RequireTransactionChain((void *) stmt, "RELEASE SAVEPOINT");
+						RequireTransactionChain(isTopLevel, "RELEASE SAVEPOINT");
 						ReleaseSavepoint(stmt->options);
 						break;
 
 					case TRANS_STMT_ROLLBACK_TO:
-						RequireTransactionChain((void *) stmt, "ROLLBACK TO SAVEPOINT");
+						RequireTransactionChain(isTopLevel, "ROLLBACK TO SAVEPOINT");
 						RollbackToSavepoint(stmt->options);
 
 						/*
@@ -885,14 +854,14 @@ ProcessUtility(Node *parsetree,
 			 * DeclareCursorStmt.
 			 */
 		case T_PlannedStmt:
-		{
-			PlannedStmt *stmt = (PlannedStmt *) parsetree;
+			{
+				PlannedStmt *stmt = (PlannedStmt *) parsetree;
 
-			if (stmt->utilityStmt == NULL ||
-				!IsA(stmt->utilityStmt, DeclareCursorStmt))
-				elog(ERROR, "non-DECLARE CURSOR PlannedStmt passed to ProcessUtility");
-			PerformCursorOpen(stmt, params, queryString, isTopLevel);
-		}
+				if (stmt->utilityStmt == NULL ||
+					!IsA(stmt->utilityStmt, DeclareCursorStmt))
+					elog(ERROR, "non-DECLARE CURSOR PlannedStmt passed to ProcessUtility");
+				PerformCursorOpen(stmt, params, queryString, isTopLevel);
+			}
 			break;
 
 		case T_ClosePortalStmt:
@@ -913,104 +882,155 @@ ProcessUtility(Node *parsetree,
 			 * relation and attribute manipulation
 			 */
 		case T_CreateSchemaStmt:
-			CreateSchemaCommand((CreateSchemaStmt *) parsetree, queryString);
+			CreateSchemaCommand((CreateSchemaStmt *) parsetree,
+								queryString);
 			break;
 
 		case T_CreateStmt:
 			{
+				List	   *stmts;
+				ListCell   *l;
 				Oid			relOid;
-				char		relKind = RELKIND_RELATION;
-				char		relStorage = RELSTORAGE_HEAP;
 
+				/* Run parse analysis ... */
 				/*
-				 * If this T_CreateStmt was dispatched and we're a QE
-				 * receiving it, extract the relkind and relstorage from
-				 * it
+				 * GPDB: Only do parse analysis in the Query Dispatcher. The Executor
+				 * nodes receive an already-transformed statement from the QD. We only
+				 * want to process the main CreateStmt here, not any auxiliary IndexStmts
+				 * or other such statements that would be created from the main
+				 * CreateStmt by parse analysis. The QD will dispatch those other statements
+				 * separately.
+				 *
+				 * Also, when processing an ALTER TABLE ADD PARTITION, atpxPartAddList()
+				 * passes us an already-transformed statement.
 				 */
-				if (Gp_role == GP_ROLE_EXECUTE)
-				{
-					if (((CreateStmt *) parsetree)->relKind != 0)
-						relKind = ((CreateStmt *) parsetree)->relKind;
+				if (Gp_role == GP_ROLE_EXECUTE || ((CreateStmt *) parsetree)->is_add_part)
+					stmts = list_make1(parsetree);
+				else
+					stmts = transformCreateStmt((CreateStmt *) parsetree,
+												queryString, false);
 
-					if (((CreateStmt *) parsetree)->relStorage != 0)
-						relStorage = ((CreateStmt *) parsetree)->relStorage;
+				/* ... and do it */
+				foreach(l, stmts)
+				{
+					Node	   *stmt = (Node *) lfirst(l);
 
-					/* sanity check */
-					switch(relKind)
+					if (IsA(stmt, CreateStmt))
 					{
-						case RELKIND_VIEW:
-						case RELKIND_COMPOSITE_TYPE:
-							Assert(relStorage = RELSTORAGE_VIRTUAL);
-							break;
-						default:
-							Assert(relStorage == RELSTORAGE_HEAP ||
-								   relStorage == RELSTORAGE_AOROWS ||
-								   relStorage == RELSTORAGE_AOCOLS ||
-								   relStorage == RELSTORAGE_EXTERNAL ||
-								   relStorage == RELSTORAGE_FOREIGN);
-					}
-				}
+						CreateStmt *cstmt = (CreateStmt *) stmt;
+						char		relKind = RELKIND_RELATION;
+						char		relStorage = RELSTORAGE_HEAP;
 
-				relOid = DefineRelation((CreateStmt *) parsetree,
-										relKind, relStorage);
+						/*
+						 * If this T_CreateStmt was dispatched and we're a QE
+						 * receiving it, extract the relkind and relstorage from
+						 * it
+						 */
+						if (Gp_role == GP_ROLE_EXECUTE)
+						{
+							if (cstmt->relKind != 0)
+								relKind = cstmt->relKind;
 
-				/*
-				 * Let AlterTableCreateToastTable decide if this one needs a
-				 * secondary relation too.
-				 */
-				CommandCounterIncrement();
+							if (cstmt->relStorage != 0)
+								relStorage = cstmt->relStorage;
 
-				DefinePartitionedRelation((CreateStmt *) parsetree, relOid);
+							/* sanity check */
+							switch(relKind)
+							{
+								case RELKIND_VIEW:
+								case RELKIND_COMPOSITE_TYPE:
+									Assert(relStorage = RELSTORAGE_VIRTUAL);
+									break;
+								default:
+									Assert(relStorage == RELSTORAGE_HEAP ||
+										   relStorage == RELSTORAGE_AOROWS ||
+										   relStorage == RELSTORAGE_AOCOLS ||
+										   relStorage == RELSTORAGE_EXTERNAL ||
+										   relStorage == RELSTORAGE_FOREIGN);
+							}
+						}
 
-				elog(DEBUG2,"CreateStmt: rel Oid %d toast Oid %d AoSeg Oid %d"
-					 "AoBlkdir Oid %d AoVisimap Oid %d",
-					 relOid,
-					 ((CreateStmt *) parsetree)->oidInfo.toastOid,
-					 ((CreateStmt *) parsetree)->oidInfo.aosegOid,
-					 ((CreateStmt *) parsetree)->oidInfo.aoblkdirOid,
-					 ((CreateStmt *) parsetree)->oidInfo.aovisimapOid);
+						/* Create the table itself */
+						relOid = DefineRelation((CreateStmt *) stmt,
+												relKind, relStorage);
 
-				if (relKind != RELKIND_COMPOSITE_TYPE)
-				{
-					AlterTableCreateToastTableWithOid(relOid,
-						((CreateStmt *) parsetree)->oidInfo.toastOid,
-						((CreateStmt *) parsetree)->oidInfo.toastIndexOid,
-					    &(((CreateStmt *) parsetree)->oidInfo.toastComptypeOid),
-						((CreateStmt *)parsetree)->is_part_child);
-					AlterTableCreateAoSegTableWithOid(relOid,
-						((CreateStmt *) parsetree)->oidInfo.aosegOid,
-						((CreateStmt *) parsetree)->oidInfo.aosegIndexOid,
-						&(((CreateStmt *) parsetree)->oidInfo.aosegComptypeOid),
-						((CreateStmt *)parsetree)->is_part_child);
-
-					if (((CreateStmt *)parsetree)->buildAoBlkdir)
-						AlterTableCreateAoBlkdirTableWithOid(relOid,
-							((CreateStmt *) parsetree)->oidInfo.aoblkdirOid,
-							((CreateStmt *) parsetree)->oidInfo.aoblkdirIndexOid,
-							&(((CreateStmt *) parsetree)->oidInfo.aoblkdirComptypeOid),
-							((CreateStmt *)parsetree)->is_part_child);
-
-					AlterTableCreateAoVisimapTableWithOid(relOid,
-							((CreateStmt *) parsetree)->oidInfo.aovisimapOid,
-							((CreateStmt *) parsetree)->oidInfo.aovisimapIndexOid,
-							&(((CreateStmt *) parsetree)->oidInfo.aovisimapComptypeOid),
-							((CreateStmt *)parsetree)->is_part_child);
+						/*
+						 * Let AlterTableCreateToastTable decide if this one
+						 * needs a secondary relation too.
+						 */
+						CommandCounterIncrement();
+
+						DefinePartitionedRelation((CreateStmt *) parsetree, relOid);
+
+						elog(DEBUG2,"CreateStmt: rel Oid %d toast Oid %d AoSeg Oid %d"
+							 "AoBlkdir Oid %d AoVisimap Oid %d",
+							 relOid,
+							 ((CreateStmt *) parsetree)->oidInfo.toastOid,
+							 ((CreateStmt *) parsetree)->oidInfo.aosegOid,
+							 ((CreateStmt *) parsetree)->oidInfo.aoblkdirOid,
+							 ((CreateStmt *) parsetree)->oidInfo.aovisimapOid);
+
+						if (relKind != RELKIND_COMPOSITE_TYPE)
+						{
+							AlterTableCreateToastTableWithOid(relOid,
+															  cstmt->oidInfo.toastOid,
+															  cstmt->oidInfo.toastIndexOid,
+															  &(cstmt->oidInfo.toastComptypeOid),
+															  cstmt->is_part_child);
+							AlterTableCreateAoSegTableWithOid(relOid,
+															  cstmt->oidInfo.aosegOid,
+															  cstmt->oidInfo.aosegIndexOid,
+															  &(cstmt->oidInfo.aosegComptypeOid),
+															  cstmt->is_part_child);
+
+							if (cstmt->buildAoBlkdir)
+								AlterTableCreateAoBlkdirTableWithOid(relOid,
+																	 cstmt->oidInfo.aoblkdirOid,
+																	 cstmt->oidInfo.aoblkdirIndexOid,
+																	 &(cstmt->oidInfo.aoblkdirComptypeOid),
+																	 cstmt->is_part_child);
+
+							AlterTableCreateAoVisimapTableWithOid(relOid,
+																  cstmt->oidInfo.aovisimapOid,
+																  cstmt->oidInfo.aovisimapIndexOid,
+																  &(cstmt->oidInfo.aovisimapComptypeOid),
+																  cstmt->is_part_child);
+						}
+						CommandCounterIncrement();
+						/*
+						 * Deferred statements should be evaluated *after* AO tables
+						 * are updated correctly.  Otherwise, they may not have
+						 * segment information yet and operations like create_index
+						 * in the deferred statements cannot see the relfile.
+						 */
+						EvaluateDeferredStatements(cstmt->deferredStmts);
+					}
+					else
+					{
+						/* Recurse for anything else */
+						ProcessUtility(stmt,
+									   queryString,
+									   params,
+									   false,
+									   None_Receiver,
+									   NULL);
+					}
 
+					/* Need CCI between commands */
+					if (lnext(l) != NULL)
+						CommandCounterIncrement();
 				}
-				CommandCounterIncrement();
-				/*
-				 * Deferred statements should be evaluated *after* AO tables
-				 * are updated correctly.  Otherwise, they may not have
-				 * segment information yet and operations like create_index
-				 * in the deferred statements cannot see the relfile.
-				 */
-				EvaluateDeferredStatements(
-						((CreateStmt *) parsetree)->deferredStmts);
 			}
 			break;
 
 		case T_CreateExternalStmt:
-			DefineExternalRelation((CreateExternalStmt *) parsetree);
+			{
+				CreateExternalStmt *stmt = (CreateExternalStmt *) parsetree;
+
+				/* Run parse analysis ... */
+				stmt = transformCreateExternalStmt(stmt, queryString);
+				DefineExternalRelation(stmt);
+			}
 			break;
 
 		case T_CreateFileSpaceStmt:
@@ -1031,6 +1051,9 @@ ProcessUtility(Node *parsetree,
 				if_exists = stmt->missing_ok;
 				objects = stmt->objects;
 
+				/* we modify the object in the loop below, so make a copy */
+				stmt = copyObject(stmt);
+
 				foreach(arg, objects)
 				{
 					List	   *names = (List *)lfirst(arg);
@@ -1064,8 +1087,9 @@ ProcessUtility(Node *parsetree,
 
 		case T_CopyStmt:
 			{
-				uint64		processed = DoCopy((CopyStmt *) parsetree, debug_query_string);
+				uint64		processed;
 
+				processed = DoCopy((CopyStmt *) parsetree, queryString);
 				if (completionTag)
 					snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
 							 "COPY " UINT64_FORMAT, processed);
@@ -1074,11 +1098,11 @@ ProcessUtility(Node *parsetree,
 
 		case T_PrepareStmt:
 			CheckRestrictedOperation("PREPARE");
-			PrepareQuery((PrepareStmt *) parsetree, debug_query_string);
+			PrepareQuery((PrepareStmt *) parsetree, queryString);
 			break;
 
 		case T_ExecuteStmt:
-			ExecuteQuery((ExecuteStmt *) parsetree, debug_query_string, params,
+			ExecuteQuery((ExecuteStmt *) parsetree, queryString, params,
 						 dest, completionTag);
 			break;
 
@@ -1104,7 +1128,46 @@ ProcessUtility(Node *parsetree,
 			break;
 
 		case T_AlterTableStmt:
-			AlterTable((AlterTableStmt *) parsetree);
+			{
+				List	   *stmts;
+				ListCell   *l;
+
+				/* Run parse analysis ... */
+				/*
+				 * GPDB: Like for CREATE TABLE, only do parse analysis in the Query Dispatcher.
+				 */
+				if (Gp_role == GP_ROLE_EXECUTE)
+					stmts = list_make1(parsetree);
+				else
+					stmts = transformAlterTableStmt((AlterTableStmt *) parsetree,
+													queryString);
+
+				/* ... and do it */
+				foreach(l, stmts)
+				{
+					Node	   *stmt = (Node *) lfirst(l);
+
+					if (IsA(stmt, AlterTableStmt))
+					{
+						/* Do the table alteration proper */
+						AlterTable((AlterTableStmt *) stmt);
+					}
+					else
+					{
+						/* Recurse for anything else */
+						ProcessUtility(stmt,
+									   queryString,
+									   params,
+									   false,
+									   None_Receiver,
+									   NULL);
+					}
+
+					/* Need CCI between commands */
+					if (lnext(l) != NULL)
+						CommandCounterIncrement();
+				}
+			}
 			break;
 
 		case T_AlterDomainStmt:
@@ -1191,6 +1254,22 @@ ProcessUtility(Node *parsetree,
 						Assert(stmt->args == NIL);
 						DefineExtProtocol(stmt->defnames, stmt->definition, stmt->newOid, stmt->trusted);
 						break;						
+					case OBJECT_TSPARSER:
+						Assert(stmt->args == NIL);
+						DefineTSParser(stmt->defnames, stmt->definition);
+						break;
+					case OBJECT_TSDICTIONARY:
+						Assert(stmt->args == NIL);
+						DefineTSDictionary(stmt->defnames, stmt->definition);
+						break;
+					case OBJECT_TSTEMPLATE:
+						Assert(stmt->args == NIL);
+						DefineTSTemplate(stmt->defnames, stmt->definition);
+						break;
+					case OBJECT_TSCONFIGURATION:
+						Assert(stmt->args == NIL);
+						DefineTSConfiguration(stmt->defnames, stmt->definition);
+						break;
 					default:
 						elog(ERROR, "unrecognized define stmt type: %d",
 							 (int) stmt->kind);
@@ -1207,12 +1286,12 @@ ProcessUtility(Node *parsetree,
 			}
 			break;
 
-		case T_ViewStmt:		/* CREATE VIEW */
-			{
-				ViewStmt   *stmt = (ViewStmt *) parsetree;
+		case T_CreateEnumStmt:	/* CREATE TYPE (enum) */
+			DefineEnum((CreateEnumStmt *) parsetree);
+			break;
 
-				DefineView(stmt);
-			}
+		case T_ViewStmt:		/* CREATE VIEW */
+			DefineView((ViewStmt *) parsetree, queryString);
 			break;
 
 		case T_CreateFunctionStmt:		/* CREATE FUNCTION */
@@ -1224,16 +1303,24 @@ ProcessUtility(Node *parsetree,
 			break;
 
 		case T_IndexStmt:		/* CREATE INDEX */
+		{
+			IndexStmt  *stmt = (IndexStmt *) parsetree;
+			ListCell   *lc;
+			List	   *stmts;
+
+			/* Run parse analysis ... */
+			stmts = transformIndexStmt(stmt, queryString);
+			foreach(lc, stmts)
 			{
-				IndexStmt  *stmt = (IndexStmt *) parsetree;
+				IndexStmt  *stmt = (IndexStmt *) lfirst(lc);
 
 				if (stmt->concurrent)
-					PreventTransactionChain(stmt, "CREATE INDEX CONCURRENTLY");
+					PreventTransactionChain(isTopLevel,
+											"CREATE INDEX CONCURRENTLY");
 
 				CheckRelationOwnership(stmt->relation, true);
 
-				fix_opfuncids(stmt->whereClause);
-
+				/* ... and do it */
 				DefineIndex(stmt->relation,		/* relation */
 							stmt->idxname,		/* index name */
 							InvalidOid, /* no predefined OID */
@@ -1241,7 +1328,6 @@ ProcessUtility(Node *parsetree,
 							stmt->tableSpace,
 							stmt->indexParams,	/* parameters */
 							(Expr *) stmt->whereClause,
-							stmt->rangetable,
 							stmt->options,
 							stmt->unique,
 							stmt->primary,
@@ -1249,15 +1335,16 @@ ProcessUtility(Node *parsetree,
 							false,		/* is_alter_table */
 							true,		/* check_rights */
 							false,		/* skip_build */
-							false,		/* quiet */
+							stmt->is_split_part,		/* quiet */
 							stmt->concurrent,	/* concurrent */
 							false, /* expanded from partitioning? */
 							stmt);
 			}
 			break;
+		}
 
 		case T_RuleStmt:		/* CREATE RULE */
-			DefineQueryRewrite((RuleStmt *) parsetree);
+			DefineRule((RuleStmt *) parsetree, queryString);
 			if (Gp_role == GP_ROLE_DISPATCH)
 			{
 				CdbDispatchUtilityStatement((Node *) parsetree, "ProcessUtility");
@@ -1300,6 +1387,14 @@ ProcessUtility(Node *parsetree,
 			break;
 
 		case T_CreatedbStmt:
+			if (Gp_role != GP_ROLE_EXECUTE)
+			{
+				/*
+				 * Don't allow master to call this in a transaction block. Segments
+				 * are ok as distributed transaction participants. 
+				 */
+				PreventTransactionChain(isTopLevel, "CREATE DATABASE");
+			}
 			createdb((CreatedbStmt *) parsetree);
 			break;
 
@@ -1315,6 +1410,14 @@ ProcessUtility(Node *parsetree,
 			{
 				DropdbStmt *stmt = (DropdbStmt *) parsetree;
 
+				if (Gp_role != GP_ROLE_EXECUTE)
+				{
+					/*
+					 * Don't allow master tp call this in a transaction block.  Segments are ok as
+					 * distributed transaction participants. 
+					 */
+					PreventTransactionChain(isTopLevel, "DROP DATABASE");
+				}
 				dropdb(stmt->dbname, stmt->missing_ok);
 			}
 			break;
@@ -1339,10 +1442,8 @@ ProcessUtility(Node *parsetree,
 				ListenStmt *stmt = (ListenStmt *) parsetree;
 
 				if (Gp_role == GP_ROLE_EXECUTE)
-					ereport(ERROR, (
-								errcode(ERRCODE_GP_COMMAND_ERROR),
-						 errmsg("Listen command cannot run in a function running on a segDB.")
-								));
+					ereport(ERROR,(errcode(ERRCODE_GP_COMMAND_ERROR),
+							errmsg("Listen command cannot run in a function running on a segDB.")));
 
 				CheckRestrictedOperation("LISTEN");
 				Async_Listen(stmt->relation->relname);
@@ -1354,10 +1455,8 @@ ProcessUtility(Node *parsetree,
 				UnlistenStmt *stmt = (UnlistenStmt *) parsetree;
 
 				if (Gp_role == GP_ROLE_EXECUTE)
-					ereport(ERROR, (
-								errcode(ERRCODE_GP_COMMAND_ERROR),
-						 errmsg("Unlisten command cannot run in a function running on a segDB.")
-								));
+					ereport(ERROR, (errcode(ERRCODE_GP_COMMAND_ERROR),
+							errmsg("Unlisten command cannot run in a function running on a segDB.")));
 
 				CheckRestrictedOperation("UNLISTEN");
 				Async_Unlisten(stmt->relation->relname);
@@ -1386,64 +1485,15 @@ ProcessUtility(Node *parsetree,
 			break;
 
 		case T_ClusterStmt:
-			cluster((ClusterStmt *) parsetree);
+			cluster((ClusterStmt *) parsetree, isTopLevel);
 			break;
 
 		case T_VacuumStmt:
-			vacuum((VacuumStmt *) parsetree, NIL);
+			vacuum((VacuumStmt *) parsetree, NIL, NULL, false, isTopLevel);
 			break;
 
 		case T_ExplainStmt:
-			ExplainQuery((ExplainStmt *) parsetree, debug_query_string, params, dest);
-			break;
-
-		case T_VariableSetStmt:
-			{
-				VariableSetStmt *n = (VariableSetStmt *) parsetree;
-
-				/*
-				 * Special cases for special SQL syntax that effectively sets
-				 * more than one variable per statement.
-				 */
-				if (strcmp(n->name, "TRANSACTION") == 0)
-				{
-					ListCell   *head;
-
-					foreach(head, n->args)
-					{
-						DefElem    *item = (DefElem *) lfirst(head);
-
-						if (strcmp(item->defname, "transaction_isolation") == 0)
-							SetPGVariable("transaction_isolation",
-										  list_make1(item->arg), n->is_local,
-										  /* gp_dispatch */ true);
-						else if (strcmp(item->defname, "transaction_read_only") == 0)
-							SetPGVariable("transaction_read_only",
-										  list_make1(item->arg), n->is_local,
-									      /* gp_dispatch */ true);
-					}
-				}
-				else if (strcmp(n->name, "SESSION CHARACTERISTICS") == 0)
-				{
-					ListCell   *head;
-
-					foreach(head, n->args)
-					{
-						DefElem    *item = (DefElem *) lfirst(head);
-
-						if (strcmp(item->defname, "transaction_isolation") == 0)
-							SetPGVariable("default_transaction_isolation",
-										  list_make1(item->arg), n->is_local,
-									      /* gp_dispatch */ true);
-						else if (strcmp(item->defname, "transaction_read_only") == 0)
-							SetPGVariable("default_transaction_read_only",
-										  list_make1(item->arg), n->is_local,
-										  /* gp_dispatch */ true);
-					}
-				}
-				else
-					SetPGVariable(n->name, n->args, n->is_local, /* gp_dispatch */ true);
-			}
+			ExplainQuery((ExplainStmt *) parsetree, queryString, params, dest);
 			break;
 
 		case T_VariableShowStmt:
@@ -1454,29 +1504,85 @@ ProcessUtility(Node *parsetree,
 			}
 			break;
 
-		case T_VariableResetStmt:
+		case T_VariableSetStmt:
 			{
-				VariableResetStmt *n = (VariableResetStmt *) parsetree;
+				VariableSetStmt *n = (VariableSetStmt *) parsetree;
+				ExecSetVariableStmt(n);
+					
+				if (n->kind == VAR_RESET || n->kind == VAR_RESET_ALL)
+				{
+					if (Gp_role == GP_ROLE_DISPATCH)
+					{
+						/*
+						 * RESET must be dispatched different, because it can't
+						 * be in a user transaction
+						 */
+						StringInfoData buffer;
 
-				ResetPGVariable(n->name);
+						initStringInfo(&buffer);
 
-				if (Gp_role == GP_ROLE_DISPATCH)
+						if (n->kind == VAR_RESET_ALL)
+							appendStringInfo(&buffer, "RESET ALL");
+						else
+							appendStringInfo(&buffer, "RESET %s", n->name);
+
+						CdbDoCommand(buffer.data, false, /*no txn*/ false);
+					}
+				}
+				else
 				{
 					/*
-					 * RESET must be dispatched different, because it can't
-					 * be in a user transaction
+					 * Special cases for special SQL syntax that effectively sets
+					 * more than one variable per statement.
 					 */
-					StringInfoData buffer;
-
-					initStringInfo(&buffer);
+					if (strcmp(n->name, "TRANSACTION") == 0)
+					{
+						ListCell   *head;
 
-					appendStringInfo(&buffer, "RESET %s", n->name);
+						foreach(head, n->args)
+						{
+							DefElem    *item = (DefElem *) lfirst(head);
+
+							if (strcmp(item->defname, "transaction_isolation") == 0)
+								SetPGVariableOptDispatch("transaction_isolation",
+											  list_make1(item->arg), n->is_local,
+											  /* gp_dispatch */ true);
+							else if (strcmp(item->defname, "transaction_read_only") == 0)
+								SetPGVariableOptDispatch("transaction_read_only",
+											  list_make1(item->arg), n->is_local,
+										      /* gp_dispatch */ true);
+						}
+					}
+					else if (strcmp(n->name, "SESSION CHARACTERISTICS") == 0)
+					{
+						ListCell   *head;
 
-					CdbDoCommand(buffer.data, false, /*no txn*/ false);
+						foreach(head, n->args)
+						{
+							DefElem    *item = (DefElem *) lfirst(head);
+
+							if (strcmp(item->defname, "transaction_isolation") == 0)
+								SetPGVariableOptDispatch("default_transaction_isolation",
+											  list_make1(item->arg), n->is_local,
+										      /* gp_dispatch */ true);
+							else if (strcmp(item->defname, "transaction_read_only") == 0)
+								SetPGVariableOptDispatch("default_transaction_read_only",
+											  list_make1(item->arg), n->is_local,
+											  /* gp_dispatch */ true);
+						}
+					}
+					else
+						SetPGVariableOptDispatch(n->name, n->args, n->is_local, /* gp_dispatch */ true);
 				}
 			}
 			break;
 
+		case T_DiscardStmt:
+			/* should we allow DISCARD PLANS? */
+			CheckRestrictedOperation("DISCARD");
+			DiscardCommand((DiscardStmt *) parsetree, isTopLevel);
+			break;
+
 		case T_CreateTrigStmt:
 			{
 				Oid trigOid = CreateTrigger((CreateTrigStmt *) parsetree, InvalidOid);
@@ -1538,6 +1644,16 @@ ProcessUtility(Node *parsetree,
 			 * ********************* RESOOURCE QUEUE statements ****
 			 */
 		case T_CreateQueueStmt:
+
+			/*
+			 * MPP-7960: We cannot run CREATE RESOURCE QUEUE inside a user
+			 * transaction block because the shared memory structures are not
+			 * cleaned up on abort, resulting in "leaked", unreachable queues.
+			 */
+
+			if (Gp_role == GP_ROLE_DISPATCH)
+				PreventTransactionChain(isTopLevel, "CREATE RESOURCE QUEUE");
+
 			CreateQueue((CreateQueueStmt *) parsetree);
 			break;
 
@@ -1589,11 +1705,12 @@ ProcessUtility(Node *parsetree,
 				ereport(ERROR,
 						(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 						 errmsg("must be superuser to do CHECKPOINT")));
+
 			if (Gp_role == GP_ROLE_DISPATCH)
 			{
 				CdbDoCommand("CHECKPOINT", false, false);
 			}
-			RequestCheckpoint(true, false);
+			RequestCheckpoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT);
 			break;
 
 		case T_ReindexStmt:
@@ -1609,6 +1726,16 @@ ProcessUtility(Node *parsetree,
 						ReindexTable(stmt);
 						break;
 					case OBJECT_DATABASE:
+
+						/*
+						 * This cannot run inside a user transaction block; if
+						 * we were inside a transaction, then its commit- and
+						 * start-transaction-command calls would not have the
+						 * intended effect!
+						 */
+							if (Gp_role == GP_ROLE_DISPATCH)
+								PreventTransactionChain(isTopLevel,
+														"REINDEX DATABASE");
 						ReindexDatabase(stmt);
 						break;
 					default:
@@ -1655,6 +1782,14 @@ ProcessUtility(Node *parsetree,
 			AlterType((AlterTypeStmt *) parsetree);
 			break;
 
+		case T_AlterTSDictionaryStmt:
+			AlterTSDictionary((AlterTSDictionaryStmt *) parsetree);
+			break;
+
+		case T_AlterTSConfigurationStmt:
+			AlterTSConfiguration((AlterTSConfigurationStmt *) parsetree);
+			break;
+
 		default:
 			elog(ERROR, "unrecognized node type: %d",
 				 (int) nodeTag(parsetree));
@@ -1698,16 +1833,8 @@ UtilityReturnsTuples(Node *parsetree)
 				entry = FetchPreparedStatement(stmt->name, false);
 				if (!entry)
 					return false;		/* not our business to raise error */
-				switch (ChoosePortalStrategy(entry->query_list))
-				{
-					case PORTAL_ONE_SELECT:
-					case PORTAL_ONE_RETURNING:
-					case PORTAL_UTIL_SELECT:
-						return true;
-					case PORTAL_MULTI_QUERY:
-						/* will not return tuples */
-						break;
-				}
+				if (entry->plansource->resultDesc)
+					return true;
 				return false;
 			}
 
@@ -1777,40 +1904,6 @@ UtilityTupleDescriptor(Node *parsetree)
 }
 
 
-/*
- * QueryReturnsTuples
- *		Return "true" if this Query will send output to the destination.
- */
-#ifdef NOT_USED
-bool
-QueryReturnsTuples(Query *parsetree)
-{
-	switch (parsetree->commandType)
-	{
-		case CMD_SELECT:
-			/* returns tuples ... unless it's SELECT INTO */
-			if (parsetree->intoClause == NULL)
-				return true;
-			break;
-		case CMD_INSERT:
-		case CMD_UPDATE:
-		case CMD_DELETE:
-			/* the forms with RETURNING return tuples */
-			if (parsetree->returningList)
-				return true;
-			break;
-		case CMD_UTILITY:
-			return UtilityReturnsTuples(parsetree->utilityStmt);
-		case CMD_UNKNOWN:
-		case CMD_NOTHING:
-			/* probably shouldn't get here */
-			break;
-	}
-	return false;				/* default */
-}
-#endif
-
-
 /*
  * CreateCommandTag
  *		utility to get a string representation of the command operation,
@@ -1902,7 +1995,14 @@ CreateCommandTag(Node *parsetree)
 			break;
 
 		case T_ClosePortalStmt:
-			tag = "CLOSE CURSOR";
+			{
+				ClosePortalStmt *stmt = (ClosePortalStmt *) parsetree;
+
+				if (stmt->portalname == NULL)
+					tag = "CLOSE CURSOR ALL";
+				else
+					tag = "CLOSE CURSOR";
+			}
 			break;
 
 		case T_FetchStmt:
@@ -1976,6 +2076,18 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_EXTPROTOCOL:
 					tag = "DROP PROTOCOL";
 					break;					
+				case OBJECT_TSPARSER:
+					tag = "DROP TEXT SEARCH PARSER";
+					break;
+				case OBJECT_TSDICTIONARY:
+					tag = "DROP TEXT SEARCH DICTIONARY";
+					break;
+				case OBJECT_TSTEMPLATE:
+					tag = "DROP TEXT SEARCH TEMPLATE";
+					break;
+				case OBJECT_TSCONFIGURATION:
+					tag = "DROP TEXT SEARCH CONFIGURATION";
+					break;
 				default:
 					tag = "???";
 			}
@@ -2029,6 +2141,9 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_SCHEMA:
 					tag = "ALTER SCHEMA";
 					break;
+				case OBJECT_SEQUENCE:
+					tag = "ALTER SEQUENCE";
+					break;
 				case OBJECT_COLUMN:
 				case OBJECT_TABLE:
 					tag = "ALTER TABLE";
@@ -2042,6 +2157,21 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_TRIGGER:
 					tag = "ALTER TRIGGER";
 					break;
+				case OBJECT_VIEW:
+					tag = "ALTER VIEW";
+					break;
+				case OBJECT_TSPARSER:
+					tag = "ALTER TEXT SEARCH PARSER";
+					break;
+				case OBJECT_TSDICTIONARY:
+					tag = "ALTER TEXT SEARCH DICTIONARY";
+					break;
+				case OBJECT_TSTEMPLATE:
+					tag = "ALTER TEXT SEARCH TEMPLATE";
+					break;
+				case OBJECT_TSCONFIGURATION:
+					tag = "ALTER TEXT SEARCH CONFIGURATION";
+					break;
 				default:
 					tag = "???";
 					break;
@@ -2069,6 +2199,18 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_TYPE:
 					tag = "ALTER TYPE";
 					break;
+				case OBJECT_TSPARSER:
+					tag = "ALTER TEXT SEARCH PARSER";
+					break;
+				case OBJECT_TSDICTIONARY:
+					tag = "ALTER TEXT SEARCH DICTIONARY";
+					break;
+				case OBJECT_TSTEMPLATE:
+					tag = "ALTER TEXT SEARCH TEMPLATE";
+					break;
+				case OBJECT_TSCONFIGURATION:
+					tag = "ALTER TEXT SEARCH CONFIGURATION";
+					break;
 				default:
 					tag = "???";
 					break;
@@ -2093,6 +2235,9 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_FUNCTION:
 					tag = "ALTER FUNCTION";
 					break;
+				case OBJECT_LANGUAGE:
+					tag = "ALTER LANGUAGE";
+					break;
 				case OBJECT_OPERATOR:
 					tag = "ALTER OPERATOR";
 					break;
@@ -2117,6 +2262,12 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_EXTPROTOCOL:
 					tag = "ALTER PROTOCOL";
 					break;
+				case OBJECT_TSCONFIGURATION:
+					tag = "ALTER TEXT SEARCH CONFIGURATION";
+					break;
+				case OBJECT_TSDICTIONARY:
+					tag = "ALTER TEXT SEARCH DICTIONARY";
+					break;
 				default:
 					tag = "???";
 					break;
@@ -2129,8 +2280,8 @@ CreateCommandTag(Node *parsetree)
 
 				/*
 				 * We might be supporting ALTER INDEX here, so set the
-				 * completion table appropriately. Catch all other
-				 * possibilities with ALTER TABLE
+				 * completion tag appropriately. Catch all other possibilities
+				 * with ALTER TABLE
 				 */
 
 				if (stmt->relkind == OBJECT_INDEX)
@@ -2181,6 +2332,18 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_EXTPROTOCOL:
 					tag = "CREATE PROTOCOL";
 					break;
+				case OBJECT_TSPARSER:
+					tag = "CREATE TEXT SEARCH PARSER";
+					break;
+				case OBJECT_TSDICTIONARY:
+					tag = "CREATE TEXT SEARCH DICTIONARY";
+					break;
+				case OBJECT_TSTEMPLATE:
+					tag = "CREATE TEXT SEARCH TEMPLATE";
+					break;
+				case OBJECT_TSCONFIGURATION:
+					tag = "CREATE TEXT SEARCH CONFIGURATION";
+					break;
 				default:
 					tag = "???";
 			}
@@ -2190,6 +2353,10 @@ CreateCommandTag(Node *parsetree)
 			tag = "CREATE TYPE";
 			break;
 
+		case T_CreateEnumStmt:
+			tag = "CREATE TYPE";
+			break;
+
 		case T_ViewStmt:
 			tag = "CREATE VIEW";
 			break;
@@ -2283,15 +2450,42 @@ CreateCommandTag(Node *parsetree)
 			break;
 
 		case T_VariableSetStmt:
-			tag = "SET";
+			switch (((VariableSetStmt *) parsetree)->kind)
+			{
+				case VAR_SET_VALUE:
+				case VAR_SET_CURRENT:
+				case VAR_SET_DEFAULT:
+				case VAR_SET_MULTI:
+					tag = "SET";
+					break;
+				case VAR_RESET:
+				case VAR_RESET_ALL:
+					tag = "RESET";
+					break;
+				default:
+					tag = "???";
+			}
 			break;
 
 		case T_VariableShowStmt:
 			tag = "SHOW";
 			break;
 
-		case T_VariableResetStmt:
-			tag = "RESET";
+		case T_DiscardStmt:
+			switch (((DiscardStmt *) parsetree)->target)
+			{
+				case DISCARD_ALL:
+					tag = "DISCARD ALL";
+					break;
+				case DISCARD_PLANS:
+					tag = "DISCARD PLANS";
+					break;
+				case DISCARD_TEMP:
+					tag = "DISCARD TEMP";
+					break;
+				default:
+					tag = "???";
+			}
 			break;
 
 		case T_CreateTrigStmt:
@@ -2404,6 +2598,14 @@ CreateCommandTag(Node *parsetree)
 			tag = "DROP OPERATOR FAMILY";
 			break;
 
+		case T_AlterTSDictionaryStmt:
+			tag = "ALTER TEXT SEARCH DICTIONARY";
+			break;
+
+		case T_AlterTSConfigurationStmt:
+			tag = "ALTER TEXT SEARCH CONFIGURATION";
+			break;
+
 		case T_PrepareStmt:
 			tag = "PREPARE";
 			break;
@@ -2413,7 +2615,14 @@ CreateCommandTag(Node *parsetree)
 			break;
 
 		case T_DeallocateStmt:
-			tag = "DEALLOCATE";
+			{
+				DeallocateStmt *stmt = (DeallocateStmt *) parsetree;
+
+				if (stmt->name == NULL)
+					tag = "DEALLOCATE ALL";
+				else
+					tag = "DEALLOCATE";
+			}
 			break;
 		
 		case T_Query: /* used to be function CreateQueryTag */
@@ -2464,6 +2673,7 @@ CreateCommandTag(Node *parsetree)
 		case T_AlterTypeStmt:
 			tag = "ALTER TYPE";
 			break;
+
 		default:
 			Assert(false);
 			elog(WARNING, "unrecognized node type: %d",
@@ -2605,6 +2815,10 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_DDL;
 			break;
 
+		case T_CreateEnumStmt:
+			lev = LOGSTMT_DDL;
+			break;
+
 		case T_ViewStmt:
 			lev = LOGSTMT_DDL;
 			break;
@@ -2683,7 +2897,7 @@ GetCommandLogLevel(Node *parsetree)
 
 				/* Look through an EXPLAIN ANALYZE to the contained stmt */
 				if (stmt->analyze)
-					return GetCommandLogLevel((Node *) stmt->query);
+					return GetCommandLogLevel(stmt->query);
 				/* Plain EXPLAIN isn't so interesting */
 				lev = LOGSTMT_ALL;
 			}
@@ -2697,7 +2911,7 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_ALL;
 			break;
 
-		case T_VariableResetStmt:
+		case T_DiscardStmt:
 			lev = LOGSTMT_ALL;
 			break;
 
@@ -2789,35 +3003,34 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_DDL;
 			break;
 
+		case T_AlterTSDictionaryStmt:
+			lev = LOGSTMT_DDL;
+			break;
+
+		case T_AlterTSConfigurationStmt:
+			lev = LOGSTMT_DDL;
+			break;
+
 		case T_PrepareStmt:
 			{
 				PrepareStmt *stmt = (PrepareStmt *) parsetree;
 
 				/* Look through a PREPARE to the contained stmt */
-				return GetCommandLogLevel((Node *) stmt->query);
+				lev = GetCommandLogLevel(stmt->query);
 			}
 			break;
 
 		case T_ExecuteStmt:
 			{
 				ExecuteStmt *stmt = (ExecuteStmt *) parsetree;
-				PreparedStatement *pstmt;
-				ListCell   *l;
+				PreparedStatement *ps;
 
-				/* Look through an EXECUTE to the referenced stmt(s) */
-				lev = LOGSTMT_ALL;
-				pstmt = FetchPreparedStatement(stmt->name, false);
-				if (pstmt)
-				{
-					foreach(l, pstmt->query_list)
-					{
-						Query	   *query = (Query *) lfirst(l);
-						LogStmtLevel stmt_lev;
-
-						stmt_lev = GetQueryLogLevel(query);
-						lev = Min(lev, stmt_lev);
-					}
-				}
+				/* Look through an EXECUTE to the referenced stmt */
+				ps = FetchPreparedStatement(stmt->name, false);
+				if (ps)
+					lev = GetCommandLogLevel(ps->plansource->raw_parse_tree);
+				else
+					lev = LOGSTMT_ALL;
 			}
 			break;
 
@@ -2825,66 +3038,47 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_ALL;
 			break;
 
-		case T_Query:
-
-			/*
-			 * In complicated situations (eg, EXPLAIN ANALYZE in an extended
-			 * Query protocol), we might find an already-analyzed query within
-			 * a utility statement.  Cope.
-			 */
-			lev = GetQueryLogLevel((Query *) parsetree);
-			break;
-
 		case T_PlannedStmt:
 			lev = GetPlannedStmtLogLevel((PlannedStmt *) parsetree);
 			break;
 
-		default:
-			elog(WARNING, "unrecognized node type: %d",
-				 (int) nodeTag(parsetree));
-			lev = LOGSTMT_ALL;
-			break;
-	}
-
-	return lev;
-}
+			/* parsed-and-rewritten-but-not-planned queries */
+		case T_Query:
+			{
+				Query	   *stmt = (Query *) parsetree;
 
-/*
- * GetQueryLogLevel
- *		utility to get the minimum log_statement level for a Query operation.
- *
- * This is exactly like GetCommandLogLevel, except it works on a Query
- * that has already been through parse analysis (and possibly further).
- */
-LogStmtLevel
-GetQueryLogLevel(Query *parsetree)
-{
-	LogStmtLevel lev;
+				switch (stmt->commandType)
+				{
+					case CMD_SELECT:
+						if (stmt->intoClause != NULL)
+							lev = LOGSTMT_DDL;	/* CREATE AS, SELECT INTO */
+						else
+							lev = LOGSTMT_ALL;	/* SELECT or DECLARE CURSOR */
+						break;
 
-	Assert(IsA(parsetree, Query));
+					case CMD_UPDATE:
+					case CMD_INSERT:
+					case CMD_DELETE:
+						lev = LOGSTMT_MOD;
+						break;
 
-	switch (parsetree->commandType)
-	{
-		case CMD_SELECT:
-			if (parsetree->intoClause != NULL)
-				lev = LOGSTMT_DDL;		/* CREATE AS, SELECT INTO */
-			else
-				lev = LOGSTMT_ALL;
-			break;
+					case CMD_UTILITY:
+						lev = GetCommandLogLevel(stmt->utilityStmt);
+						break;
 
-		case CMD_UPDATE:
-		case CMD_INSERT:
-		case CMD_DELETE:
-			lev = LOGSTMT_MOD;
-			break;
+					default:
+						elog(WARNING, "unrecognized commandType: %d",
+							 (int) stmt->commandType);
+						lev = LOGSTMT_ALL;
+						break;
+				}
 
-		case CMD_UTILITY:
-			lev = GetCommandLogLevel(parsetree->utilityStmt);
+			}
 			break;
 
 		default:
-			elog(WARNING, "unrecognized commandType: %d",
-				 (int) parsetree->commandType);
+			elog(WARNING, "unrecognized node type: %d",
+				 (int) nodeTag(parsetree));
 			lev = LOGSTMT_ALL;
 			break;
 	}
@@ -2906,12 +3100,12 @@ GetPlannedStmtLogLevel(PlannedStmt * stmt)
 	switch (stmt->commandType)
 	{
 		case CMD_SELECT:
-			if ( stmt->utilityStmt != NULL )
+			if (stmt->utilityStmt != NULL) 
 			{
-				if ( stmt->intoClause != NULL )
+				if (stmt->intoClause != NULL)
 					elog(WARNING, "into specified on utility statement type: %d",
 						 (int) stmt->utilityStmt->type);
-				if ( ! IsA(stmt->utilityStmt, DeclareCursorStmt) )
+				if (!IsA(stmt->utilityStmt, DeclareCursorStmt))
 					elog(WARNING, "unexpected utility statement type: %d",
 						 (int) stmt->utilityStmt->type);
 				lev = LOGSTMT_ALL;
diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile
new file mode 100644
index 000000000000..900dba3460be
--- /dev/null
+++ b/src/backend/tsearch/Makefile
@@ -0,0 +1,51 @@
+#-------------------------------------------------------------------------
+#
+# Makefile for backend/tsearch
+#
+# Copyright (c) 2006-2008, PostgreSQL Global Development Group
+#
+# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.4.2.1 2008/02/18 16:04:20 petere Exp $
+#
+#-------------------------------------------------------------------------
+subdir = src/backend/tsearch
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+DICTDIR=tsearch_data
+
+DICTFILES=synonym_sample.syn thesaurus_sample.ths hunspell_sample.affix \
+	ispell_sample.affix ispell_sample.dict
+
+OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
+	dict_simple.o dict_synonym.o dict_thesaurus.o \
+	dict_ispell.o regis.o spell.o \
+	to_tsany.o ts_utils.o
+
+all: SUBSYS.o 
+
+depend dep:
+	$(CC) -MM $(CFLAGS) *.c >depend
+
+include $(top_srcdir)/src/backend/common.mk
+
+.PHONY: install-data
+install-data: $(DICTFILES) installdirs
+	for i in $(DICTFILES); \
+		do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i || exit; \
+	done
+
+installdirs:
+	$(mkinstalldirs) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
+
+.PHONY: uninstall-data
+uninstall-data:
+	for i in $(DICTFILES); \
+		do rm -rf '$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i || exit; \
+	done
+
+clean distclean maintainer-clean: 
+	rm -f SUBSYS.o $(OBJS)
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
diff --git a/src/backend/tsearch/dict.c b/src/backend/tsearch/dict.c
new file mode 100644
index 000000000000..c17194f689ce
--- /dev/null
+++ b/src/backend/tsearch/dict.c
@@ -0,0 +1,89 @@
+/*-------------------------------------------------------------------------
+ *
+ * dict.c
+ *		Standard interface to dictionary
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict.c,v 1.4 2008/01/01 19:45:52 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "catalog/pg_type.h"
+#include "tsearch/ts_cache.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+
+
+/*
+ * Lexize one word by dictionary, mostly debug function
+ */
+Datum
+ts_lexize(PG_FUNCTION_ARGS)
+{
+	Oid			dictId = PG_GETARG_OID(0);
+	text	   *in = PG_GETARG_TEXT_P(1);
+	ArrayType  *a;
+	TSDictionaryCacheEntry *dict;
+	TSLexeme   *res,
+			   *ptr;
+	Datum	   *da;
+	DictSubState dstate = {false, false, NULL};
+
+	dict = lookup_ts_dictionary_cache(dictId);
+
+	res = (TSLexeme *) DatumGetPointer(FunctionCall4(&dict->lexize,
+											 PointerGetDatum(dict->dictData),
+												PointerGetDatum(VARDATA(in)),
+									   Int32GetDatum(VARSIZE(in) - VARHDRSZ),
+												  PointerGetDatum(&dstate)));
+
+	if (dstate.getnext)
+	{
+		dstate.isend = true;
+		ptr = (TSLexeme *) DatumGetPointer(FunctionCall4(&dict->lexize,
+											 PointerGetDatum(dict->dictData),
+												PointerGetDatum(VARDATA(in)),
+									   Int32GetDatum(VARSIZE(in) - VARHDRSZ),
+												  PointerGetDatum(&dstate)));
+		if (ptr != NULL)
+			res = ptr;
+	}
+
+	if (!res)
+		PG_RETURN_NULL();
+
+	ptr = res;
+	while (ptr->lexeme)
+		ptr++;
+	da = (Datum *) palloc(sizeof(Datum) * (ptr - res));
+	ptr = res;
+	while (ptr->lexeme)
+	{
+		da[ptr - res] = DirectFunctionCall1(textin, CStringGetDatum(ptr->lexeme));
+		ptr++;
+	}
+
+	a = construct_array(da,
+						ptr - res,
+						TEXTOID,
+						-1,
+						false,
+						'i');
+
+	ptr = res;
+	while (ptr->lexeme)
+	{
+		pfree(DatumGetPointer(da[ptr - res]));
+		pfree(ptr->lexeme);
+		ptr++;
+	}
+	pfree(res);
+	pfree(da);
+
+	PG_RETURN_POINTER(a);
+}
diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c
new file mode 100644
index 000000000000..f77ce211705f
--- /dev/null
+++ b/src/backend/tsearch/dict_ispell.c
@@ -0,0 +1,149 @@
+/*-------------------------------------------------------------------------
+ *
+ * dict_ispell.c
+ *		Ispell dictionary interface
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_ispell.c,v 1.7 2008/01/01 19:45:52 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "commands/defrem.h"
+#include "tsearch/dicts/spell.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+#include "utils/memutils.h"
+
+
+typedef struct
+{
+	StopList	stoplist;
+	IspellDict	obj;
+} DictISpell;
+
+Datum
+dispell_init(PG_FUNCTION_ARGS)
+{
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
+	DictISpell *d;
+	bool		affloaded = false,
+				dictloaded = false,
+				stoploaded = false;
+	ListCell   *l;
+
+	d = (DictISpell *) palloc0(sizeof(DictISpell));
+
+	foreach(l, dictoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp(defel->defname, "DictFile") == 0)
+		{
+			if (dictloaded)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple DictFile parameters")));
+			NIImportDictionary(&(d->obj),
+							 get_tsearch_config_filename(defGetString(defel),
+														 "dict"));
+			dictloaded = true;
+		}
+		else if (pg_strcasecmp(defel->defname, "AffFile") == 0)
+		{
+			if (affloaded)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple AffFile parameters")));
+			NIImportAffixes(&(d->obj),
+							get_tsearch_config_filename(defGetString(defel),
+														"affix"));
+			affloaded = true;
+		}
+		else if (pg_strcasecmp(defel->defname, "StopWords") == 0)
+		{
+			if (stoploaded)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple StopWords parameters")));
+			readstoplist(defGetString(defel), &(d->stoplist), lowerstr);
+			stoploaded = true;
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized Ispell parameter: \"%s\"",
+							defel->defname)));
+		}
+	}
+
+	if (affloaded && dictloaded)
+	{
+		NISortDictionary(&(d->obj));
+		NISortAffixes(&(d->obj));
+	}
+	else if (!affloaded)
+	{
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("missing AffFile parameter")));
+	}
+	else
+	{
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("missing DictFile parameter")));
+	}
+
+	MemoryContextDeleteChildren(CurrentMemoryContext);
+
+	PG_RETURN_POINTER(d);
+}
+
+Datum
+dispell_lexize(PG_FUNCTION_ARGS)
+{
+	DictISpell *d = (DictISpell *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
+	int32		len = PG_GETARG_INT32(2);
+	char	   *txt;
+	TSLexeme   *res;
+	TSLexeme   *ptr,
+			   *cptr;
+
+	if (len <= 0)
+		PG_RETURN_POINTER(NULL);
+
+	txt = lowerstr_with_len(in, len);
+	res = NINormalizeWord(&(d->obj), txt);
+
+	if (res == NULL)
+		PG_RETURN_POINTER(NULL);
+
+	ptr = cptr = res;
+	while (ptr->lexeme)
+	{
+		if (searchstoplist(&(d->stoplist), ptr->lexeme))
+		{
+			pfree(ptr->lexeme);
+			ptr->lexeme = NULL;
+			ptr++;
+		}
+		else
+		{
+			memcpy(cptr, ptr, sizeof(TSLexeme));
+			cptr++;
+			ptr++;
+		}
+	}
+	cptr->lexeme = NULL;
+
+	PG_RETURN_POINTER(res);
+}
diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c
new file mode 100644
index 000000000000..885fdef31eb3
--- /dev/null
+++ b/src/backend/tsearch/dict_simple.c
@@ -0,0 +1,106 @@
+/*-------------------------------------------------------------------------
+ *
+ * dict_simple.c
+ *		Simple dictionary: just lowercase and check for stopword
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_simple.c,v 1.7 2008/01/01 19:45:52 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "commands/defrem.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+
+
+typedef struct
+{
+	StopList	stoplist;
+	bool		accept;
+} DictSimple;
+
+
+Datum
+dsimple_init(PG_FUNCTION_ARGS)
+{
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
+	DictSimple *d = (DictSimple *) palloc0(sizeof(DictSimple));
+	bool		stoploaded = false,
+				acceptloaded = false;
+	ListCell   *l;
+
+	d->accept = true;			/* default */
+
+	foreach(l, dictoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp("StopWords", defel->defname) == 0)
+		{
+			if (stoploaded)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple StopWords parameters")));
+			readstoplist(defGetString(defel), &d->stoplist, lowerstr);
+			stoploaded = true;
+		}
+		else if (pg_strcasecmp("Accept", defel->defname) == 0)
+		{
+			if (acceptloaded)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple Accept parameters")));
+			d->accept = defGetBoolean(defel);
+			acceptloaded = true;
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				   errmsg("unrecognized simple dictionary parameter: \"%s\"",
+						  defel->defname)));
+		}
+	}
+
+	PG_RETURN_POINTER(d);
+}
+
+Datum
+dsimple_lexize(PG_FUNCTION_ARGS)
+{
+	DictSimple *d = (DictSimple *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
+	int32		len = PG_GETARG_INT32(2);
+	char	   *txt;
+	TSLexeme   *res;
+
+	txt = lowerstr_with_len(in, len);
+
+	if (*txt == '\0' || searchstoplist(&(d->stoplist), txt))
+	{
+		/* reject as stopword */
+		pfree(txt);
+		res = palloc0(sizeof(TSLexeme) * 2);
+		PG_RETURN_POINTER(res);
+	}
+	else if (d->accept)
+	{
+		/* accept */
+		res = palloc0(sizeof(TSLexeme) * 2);
+		res[0].lexeme = txt;
+		PG_RETURN_POINTER(res);
+	}
+	else
+	{
+		/* report as unrecognized */
+		pfree(txt);
+		PG_RETURN_POINTER(NULL);
+	}
+}
diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c
new file mode 100644
index 000000000000..a7400e2db059
--- /dev/null
+++ b/src/backend/tsearch/dict_synonym.c
@@ -0,0 +1,200 @@
+/*-------------------------------------------------------------------------
+ *
+ * dict_synonym.c
+ *		Synonym dictionary: replace word by its synonym
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.7.2.1 2008/06/18 20:55:49 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "commands/defrem.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+
+typedef struct
+{
+	char	   *in;
+	char	   *out;
+} Syn;
+
+typedef struct
+{
+	int			len;			/* length of syn array */
+	Syn		   *syn;
+} DictSyn;
+
+/*
+ * Finds the next whitespace-delimited word within the 'in' string.
+ * Returns a pointer to the first character of the word, and a pointer
+ * to the next byte after the last character in the word (in *end).
+ */
+static char *
+findwrd(char *in, char **end)
+{
+	char	   *start;
+
+	/* Skip leading spaces */
+	while (*in && t_isspace(in))
+		in += pg_mblen(in);
+
+	/* Return NULL on empty lines */
+	if (*in == '\0')
+	{
+		*end = NULL;
+		return NULL;
+	}
+
+	start = in;
+
+	/* Find end of word */
+	while (*in && !t_isspace(in))
+		in += pg_mblen(in);
+
+	*end = in;
+	return start;
+}
+
+static int
+compareSyn(const void *a, const void *b)
+{
+	return strcmp(((Syn *) a)->in, ((Syn *) b)->in);
+}
+
+
+Datum
+dsynonym_init(PG_FUNCTION_ARGS)
+{
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
+	DictSyn    *d;
+	ListCell   *l;
+	char	   *filename = NULL;
+	tsearch_readline_state trst;
+	char	   *starti,
+			   *starto,
+			   *end = NULL;
+	int			cur = 0;
+	char	   *line = NULL;
+
+	foreach(l, dictoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp("Synonyms", defel->defname) == 0)
+			filename = defGetString(defel);
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized synonym parameter: \"%s\"",
+							defel->defname)));
+	}
+
+	if (!filename)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("missing Synonyms parameter")));
+
+	filename = get_tsearch_config_filename(filename, "syn");
+
+	if (!tsearch_readline_begin(&trst, filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open synonym file \"%s\": %m",
+						filename)));
+
+	d = (DictSyn *) palloc0(sizeof(DictSyn));
+
+	while ((line = tsearch_readline(&trst)) != NULL)
+	{
+		starti = findwrd(line, &end);
+		if (!starti)
+		{
+			/* Empty line */
+			goto skipline;
+		}
+		if (*end == '\0')
+		{
+			/* A line with only one word. Ignore silently. */
+			goto skipline;
+		}
+		*end = '\0';
+
+		starto = findwrd(end + 1, &end);
+		if (!starto)
+		{
+			/* A line with only one word (+whitespace). Ignore silently. */
+			goto skipline;
+		}
+		*end = '\0';
+
+		/*
+		 * starti now points to the first word, and starto to the second word
+		 * on the line, with a \0 terminator at the end of both words.
+		 */
+
+		if (cur >= d->len)
+		{
+			if (d->len == 0)
+			{
+				d->len = 64;
+				d->syn = (Syn *) palloc(sizeof(Syn) * d->len);
+			}
+			else
+			{
+				d->len *= 2;
+				d->syn = (Syn *) repalloc(d->syn, sizeof(Syn) * d->len);
+			}
+		}
+
+		d->syn[cur].in = lowerstr(starti);
+		d->syn[cur].out = lowerstr(starto);
+
+		cur++;
+
+skipline:
+		pfree(line);
+	}
+
+	tsearch_readline_end(&trst);
+
+	d->len = cur;
+	qsort(d->syn, d->len, sizeof(Syn), compareSyn);
+
+	PG_RETURN_POINTER(d);
+}
+
+Datum
+dsynonym_lexize(PG_FUNCTION_ARGS)
+{
+	DictSyn    *d = (DictSyn *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
+	int32		len = PG_GETARG_INT32(2);
+	Syn			key,
+			   *found;
+	TSLexeme   *res;
+
+	/* note: d->len test protects against Solaris bsearch-of-no-items bug */
+	if (len <= 0 || d->len <= 0)
+		PG_RETURN_POINTER(NULL);
+
+	key.in = lowerstr_with_len(in, len);
+	key.out = NULL;
+
+	found = (Syn *) bsearch(&key, d->syn, d->len, sizeof(Syn), compareSyn);
+	pfree(key.in);
+
+	if (!found)
+		PG_RETURN_POINTER(NULL);
+
+	res = palloc0(sizeof(TSLexeme) * 2);
+	res[0].lexeme = pstrdup(found->out);
+
+	PG_RETURN_POINTER(res);
+}
diff --git a/contrib/tsearch2/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c
similarity index 59%
rename from contrib/tsearch2/dict_thesaurus.c
rename to src/backend/tsearch/dict_thesaurus.c
index 542daae4d0d7..86cf11549029 100644
--- a/contrib/tsearch2/dict_thesaurus.c
+++ b/src/backend/tsearch/dict_thesaurus.c
@@ -1,17 +1,26 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict_thesaurus.c,v 1.8 2007/02/01 19:10:23 momjian Exp $ */
-
-/*
- * thesaurus
- * Teodor Sigaev <teodor@sigaev.ru>
+/*-------------------------------------------------------------------------
+ *
+ * dict_thesaurus.c
+ *		Thesaurus dictionary: phrase to phrase substitution
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.11.2.2 2009/11/30 16:38:46 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "executor/spi.h"
 
-#include <ctype.h>
+#include "catalog/namespace.h"
+#include "commands/defrem.h"
+#include "tsearch/ts_cache.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
 
-#include "dict.h"
-#include "common.h"
-#include "ts_locale.h"
 
 /*
  * Temporay we use TSLexeme.flags for inner use...
@@ -25,52 +34,42 @@ typedef struct LexemeInfo
 	uint16		tnvariant;		/* total num lexemes in one variant */
 	struct LexemeInfo *nextentry;
 	struct LexemeInfo *nextvariant;
-}	LexemeInfo;
+} LexemeInfo;
 
 typedef struct
 {
 	char	   *lexeme;
 	LexemeInfo *entries;
-}	TheLexeme;
+} TheLexeme;
 
 typedef struct
 {
 	uint16		lastlexeme;		/* number lexemes to substitute */
 	uint16		reslen;
 	TSLexeme   *res;			/* prepared substituted result */
-}	TheSubstitute;
+} TheSubstitute;
 
 typedef struct
 {
 	/* subdictionary to normalize lexemes */
-	DictInfo	subdict;
+	Oid			subdictOid;
+	TSDictionaryCacheEntry *subdict;
 
 	/* Array to search lexeme by exact match */
 	TheLexeme  *wrds;
-	int			nwrds;
-	int			ntwrds;
+	int			nwrds;			/* current number of words */
+	int			ntwrds;			/* allocated array length */
 
 	/*
 	 * Storage of substituted result, n-th element is for n-th expression
 	 */
 	TheSubstitute *subst;
 	int			nsubst;
-}	DictThesaurus;
-
-PG_FUNCTION_INFO_V1(thesaurus_init);
-Datum		thesaurus_init(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(thesaurus_lexize);
-Datum		thesaurus_lexize(PG_FUNCTION_ARGS);
+} DictThesaurus;
 
-static void
-freeDictThesaurus(DictThesaurus * d)
-{
-	free(d);
-}
 
 static void
-newLexeme(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 posinsubst)
+newLexeme(DictThesaurus *d, char *b, char *e, uint16 idsubst, uint16 posinsubst)
 {
 	TheLexeme  *ptr;
 
@@ -79,28 +78,24 @@ newLexeme(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 posinsubst
 		if (d->ntwrds == 0)
 		{
 			d->ntwrds = 16;
-			d->wrds = (TheLexeme *) malloc(sizeof(TheLexeme) * d->ntwrds);
+			d->wrds = (TheLexeme *) palloc(sizeof(TheLexeme) * d->ntwrds);
 		}
 		else
 		{
 			d->ntwrds *= 2;
-			d->wrds = (TheLexeme *) realloc(d->wrds, sizeof(TheLexeme) * d->ntwrds);
+			d->wrds = (TheLexeme *) repalloc(d->wrds, sizeof(TheLexeme) * d->ntwrds);
 		}
-		if (!d->wrds)
-			elog(ERROR, "Out of memory");
 	}
 
 	ptr = d->wrds + d->nwrds;
 	d->nwrds++;
 
-	if ((ptr->lexeme = malloc(e - b + 1)) == NULL)
-		elog(ERROR, "Out of memory");
+	ptr->lexeme = palloc(e - b + 1);
 
 	memcpy(ptr->lexeme, b, e - b);
 	ptr->lexeme[e - b] = '\0';
 
-	if ((ptr->entries = (LexemeInfo *) malloc(sizeof(LexemeInfo))) == NULL)
-		elog(ERROR, "Out of memory");
+	ptr->entries = (LexemeInfo *) palloc(sizeof(LexemeInfo));
 
 	ptr->entries->nextentry = NULL;
 	ptr->entries->idsubst = idsubst;
@@ -108,7 +103,7 @@ newLexeme(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 posinsubst
 }
 
 static void
-addWrd(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16 posinsubst, bool useasis)
+addWrd(DictThesaurus *d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16 posinsubst, bool useasis)
 {
 	static int	nres = 0;
 	static int	ntres = 0;
@@ -123,15 +118,13 @@ addWrd(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16
 			if (d->nsubst == 0)
 			{
 				d->nsubst = 16;
-				d->subst = (TheSubstitute *) malloc(sizeof(TheSubstitute) * d->nsubst);
+				d->subst = (TheSubstitute *) palloc(sizeof(TheSubstitute) * d->nsubst);
 			}
 			else
 			{
 				d->nsubst *= 2;
-				d->subst = (TheSubstitute *) realloc(d->subst, sizeof(TheSubstitute) * d->nsubst);
+				d->subst = (TheSubstitute *) repalloc(d->subst, sizeof(TheSubstitute) * d->nsubst);
 			}
-			if (!d->subst)
-				elog(ERROR, "Out of memory");
 		}
 	}
 
@@ -144,20 +137,17 @@ addWrd(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16
 		if (ntres == 0)
 		{
 			ntres = 2;
-			ptr->res = (TSLexeme *) malloc(sizeof(TSLexeme) * ntres);
+			ptr->res = (TSLexeme *) palloc(sizeof(TSLexeme) * ntres);
 		}
 		else
 		{
 			ntres *= 2;
-			ptr->res = (TSLexeme *) realloc(ptr->res, sizeof(TSLexeme) * ntres);
+			ptr->res = (TSLexeme *) repalloc(ptr->res, sizeof(TSLexeme) * ntres);
 		}
 
-		if (!ptr->res)
-			elog(ERROR, "Out of memory");
 	}
 
-	if ((ptr->res[nres].lexeme = malloc(e - b + 1)) == 0)
-		elog(ERROR, "Out of memory");
+	ptr->res[nres].lexeme = palloc(e - b + 1);
 	memcpy(ptr->res[nres].lexeme, b, e - b);
 	ptr->res[nres].lexeme[e - b] = '\0';
 
@@ -176,35 +166,41 @@ addWrd(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16
 #define TR_INSUBS	4
 
 static void
-thesaurusRead(char *filename, DictThesaurus * d)
+thesaurusRead(char *filename, DictThesaurus *d)
 {
-	FILE	   *fh;
-	char		str[BUFSIZ];
-	int			lineno = 0;
+	tsearch_readline_state trst;
 	uint16		idsubst = 0;
 	bool		useasis = false;
+	char	   *line;
 
-	fh = fopen(to_absfilename(filename), "r");
-	if (!fh)
-		elog(ERROR, "Thesaurus: cannot open '%s' file", filename);
+	filename = get_tsearch_config_filename(filename, "ths");
+	if (!tsearch_readline_begin(&trst, filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open thesaurus file \"%s\": %m",
+						filename)));
 
-	while (fgets(str, sizeof(str), fh))
+	while ((line = tsearch_readline(&trst)) != NULL)
 	{
-		char	   *ptr = str;
+		char	   *ptr;
 		int			state = TR_WAITLEX;
 		char	   *beginwrd = NULL;
 		uint16		posinsubst = 0;
 		uint16		nwrd = 0;
 
-		lineno++;
+		ptr = line;
 
-		/* is it comment ? */
-		while (t_isspace(ptr))
+		/* is it a comment? */
+		while (*ptr && t_isspace(ptr))
 			ptr += pg_mblen(ptr);
-		if (t_iseq(str, '#') || *str == '\0' || t_iseq(str, '\n') || t_iseq(str, '\r'))
+
+		if (t_iseq(ptr, '#') || *ptr == '\0' ||
+			t_iseq(ptr, '\n') || t_iseq(ptr, '\r'))
+		{
+			pfree(line);
 			continue;
+		}
 
-		pg_verifymbstr(ptr, strlen(ptr), false);
 		while (*ptr)
 		{
 			if (state == TR_WAITLEX)
@@ -212,10 +208,9 @@ thesaurusRead(char *filename, DictThesaurus * d)
 				if (t_iseq(ptr, ':'))
 				{
 					if (posinsubst == 0)
-					{
-						fclose(fh);
-						elog(ERROR, "Thesaurus: Unexpected delimiter at %d line", lineno);
-					}
+						ereport(ERROR,
+								(errcode(ERRCODE_CONFIG_FILE_ERROR),
+								 errmsg("unexpected delimiter")));
 					state = TR_WAITSUBS;
 				}
 				else if (!t_isspace(ptr))
@@ -263,13 +258,15 @@ thesaurusRead(char *filename, DictThesaurus * d)
 				if (t_isspace(ptr))
 				{
 					if (ptr == beginwrd)
-						elog(ERROR, "Thesaurus: Unexpected end of line or lexeme at %d line", lineno);
+						ereport(ERROR,
+								(errcode(ERRCODE_CONFIG_FILE_ERROR),
+								 errmsg("unexpected end of line or lexeme")));
 					addWrd(d, beginwrd, ptr, idsubst, nwrd++, posinsubst, useasis);
 					state = TR_WAITSUBS;
 				}
 			}
 			else
-				elog(ERROR, "Thesaurus: Unknown state: %d", state);
+				elog(ERROR, "unrecognized thesaurus state: %d", state);
 
 			ptr += pg_mblen(ptr);
 		}
@@ -277,47 +274,41 @@ thesaurusRead(char *filename, DictThesaurus * d)
 		if (state == TR_INSUBS)
 		{
 			if (ptr == beginwrd)
-				elog(ERROR, "Thesaurus: Unexpected end of line or lexeme at %d line", lineno);
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("unexpected end of line or lexeme")));
 			addWrd(d, beginwrd, ptr, idsubst, nwrd++, posinsubst, useasis);
 		}
 
 		idsubst++;
 
 		if (!(nwrd && posinsubst))
-		{
-			fclose(fh);
-			elog(ERROR, "Thesaurus: Unexpected end of line at %d line", lineno);
-		}
+			ereport(ERROR,
+					(errcode(ERRCODE_CONFIG_FILE_ERROR),
+					 errmsg("unexpected end of line")));
 
+		pfree(line);
 	}
 
 	d->nsubst = idsubst;
 
-	fclose(fh);
+	tsearch_readline_end(&trst);
 }
 
 static TheLexeme *
-addCompiledLexeme(TheLexeme * newwrds, int *nnw, int *tnm, TSLexeme * lexeme, LexemeInfo * src, uint16 tnvariant)
+addCompiledLexeme(TheLexeme *newwrds, int *nnw, int *tnm, TSLexeme *lexeme, LexemeInfo *src, uint16 tnvariant)
 {
-
 	if (*nnw >= *tnm)
 	{
 		*tnm *= 2;
-		newwrds = (TheLexeme *) realloc(newwrds, sizeof(TheLexeme) * *tnm);
-		if (!newwrds)
-			elog(ERROR, "Out of memory");
+		newwrds = (TheLexeme *) repalloc(newwrds, sizeof(TheLexeme) * *tnm);
 	}
 
-	newwrds[*nnw].entries = (LexemeInfo *) malloc(sizeof(LexemeInfo));
-	if (!newwrds[*nnw].entries)
-		elog(ERROR, "Out of memory");
+	newwrds[*nnw].entries = (LexemeInfo *) palloc(sizeof(LexemeInfo));
 
 	if (lexeme && lexeme->lexeme)
 	{
-		newwrds[*nnw].lexeme = strdup(lexeme->lexeme);
-		if (!newwrds[*nnw].lexeme)
-			elog(ERROR, "Out of memory");
-
+		newwrds[*nnw].lexeme = pstrdup(lexeme->lexeme);
 		newwrds[*nnw].entries->tnvariant = tnvariant;
 	}
 	else
@@ -336,7 +327,7 @@ addCompiledLexeme(TheLexeme * newwrds, int *nnw, int *tnm, TSLexeme * lexeme, Le
 }
 
 static int
-cmpLexemeInfo(LexemeInfo * a, LexemeInfo * b)
+cmpLexemeInfo(LexemeInfo *a, LexemeInfo *b)
 {
 	if (a == NULL || b == NULL)
 		return 0;
@@ -358,7 +349,7 @@ cmpLexemeInfo(LexemeInfo * a, LexemeInfo * b)
 }
 
 static int
-cmpLexeme(TheLexeme * a, TheLexeme * b)
+cmpLexeme(TheLexeme *a, TheLexeme *b)
 {
 	if (a->lexeme == NULL)
 	{
@@ -393,75 +384,76 @@ cmpTheLexeme(const void *a, const void *b)
 }
 
 static void
-compileTheLexeme(DictThesaurus * d)
+compileTheLexeme(DictThesaurus *d)
 {
 	int			i,
 				nnw = 0,
 				tnm = 16;
-	TheLexeme  *newwrds = (TheLexeme *) malloc(sizeof(TheLexeme) * tnm),
+	TheLexeme  *newwrds = (TheLexeme *) palloc(sizeof(TheLexeme) * tnm),
 			   *ptrwrds;
 
-	if (!newwrds)
-		elog(ERROR, "Out of memory");
-
 	for (i = 0; i < d->nwrds; i++)
 	{
 		TSLexeme   *ptr;
 
-		ptr = (TSLexeme *) DatumGetPointer(
-										   FunctionCall4(
-												   &(d->subdict.lexize_info),
-									  PointerGetDatum(d->subdict.dictionary),
+		if (strcmp(d->wrds[i].lexeme, "?") == 0)		/* Is stop word marker? */
+			newwrds = addCompiledLexeme(newwrds, &nnw, &tnm, NULL, d->wrds[i].entries, 0);
+		else
+		{
+			ptr = (TSLexeme *) DatumGetPointer(FunctionCall4(&(d->subdict->lexize),
+									   PointerGetDatum(d->subdict->dictData),
 										  PointerGetDatum(d->wrds[i].lexeme),
 									Int32GetDatum(strlen(d->wrds[i].lexeme)),
-														 PointerGetDatum(NULL)
-														 )
-			);
+													 PointerGetDatum(NULL)));
 
-		if (!(ptr && ptr->lexeme))
-		{
 			if (!ptr)
-				elog(ERROR, "Thesaurus: word-sample '%s' isn't recognized by subdictionary (rule %d)",
-					 d->wrds[i].lexeme, d->wrds[i].entries->idsubst + 1);
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)",
+								d->wrds[i].lexeme,
+								d->wrds[i].entries->idsubst + 1)));
+			else if (!(ptr->lexeme))
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("thesaurus sample word \"%s\" is a stop word (rule %d)",
+								d->wrds[i].lexeme,
+								d->wrds[i].entries->idsubst + 1),
+						 errhint("Use \"?\" to represent a stop word within a sample phrase.")));
 			else
-				elog(NOTICE, "Thesaurus: word-sample '%s' is recognized as stop-word, assign any stop-word (rule %d)",
-					 d->wrds[i].lexeme, d->wrds[i].entries->idsubst + 1);
-
-			newwrds = addCompiledLexeme(newwrds, &nnw, &tnm, NULL, d->wrds[i].entries, 0);
-		}
-		else
-		{
-			while (ptr->lexeme)
 			{
-				TSLexeme   *remptr = ptr + 1;
-				int			tnvar = 1;
-				int			curvar = ptr->nvariant;
-
-				/* compute n words in one variant */
-				while (remptr->lexeme)
+				while (ptr->lexeme)
 				{
-					if (remptr->nvariant != (remptr - 1)->nvariant)
-						break;
-					tnvar++;
-					remptr++;
-				}
+					TSLexeme   *remptr = ptr + 1;
+					int			tnvar = 1;
+					int			curvar = ptr->nvariant;
 
-				remptr = ptr;
-				while (remptr->lexeme && remptr->nvariant == curvar)
-				{
-					newwrds = addCompiledLexeme(newwrds, &nnw, &tnm, remptr, d->wrds[i].entries, tnvar);
-					remptr++;
-				}
+					/* compute n words in one variant */
+					while (remptr->lexeme)
+					{
+						if (remptr->nvariant != (remptr - 1)->nvariant)
+							break;
+						tnvar++;
+						remptr++;
+					}
+
+					remptr = ptr;
+					while (remptr->lexeme && remptr->nvariant == curvar)
+					{
+						newwrds = addCompiledLexeme(newwrds, &nnw, &tnm, remptr, d->wrds[i].entries, tnvar);
+						remptr++;
+					}
 
-				ptr = remptr;
+					ptr = remptr;
+				}
 			}
 		}
 
-		free(d->wrds[i].lexeme);
-		free(d->wrds[i].entries);
+		pfree(d->wrds[i].lexeme);
+		pfree(d->wrds[i].entries);
 	}
 
-	free(d->wrds);
+	if (d->wrds)
+		pfree(d->wrds);
 	d->wrds = newwrds;
 	d->nwrds = nnw;
 	d->ntwrds = tnm;
@@ -483,10 +475,10 @@ compileTheLexeme(DictThesaurus * d)
 					newwrds->entries = ptrwrds->entries;
 				}
 				else
-					free(ptrwrds->entries);
+					pfree(ptrwrds->entries);
 
 				if (ptrwrds->lexeme)
-					free(ptrwrds->lexeme);
+					pfree(ptrwrds->lexeme);
 			}
 			else
 			{
@@ -498,12 +490,12 @@ compileTheLexeme(DictThesaurus * d)
 		}
 
 		d->nwrds = newwrds - d->wrds + 1;
-		d->wrds = (TheLexeme *) realloc(d->wrds, sizeof(TheLexeme) * d->nwrds);
+		d->wrds = (TheLexeme *) repalloc(d->wrds, sizeof(TheLexeme) * d->nwrds);
 	}
 }
 
 static void
-compileTheSubstitute(DictThesaurus * d)
+compileTheSubstitute(DictThesaurus *d)
 {
 	int			i;
 
@@ -514,9 +506,7 @@ compileTheSubstitute(DictThesaurus * d)
 				   *inptr;
 		int			n = 2;
 
-		outptr = d->subst[i].res = (TSLexeme *) malloc(sizeof(TSLexeme) * n);
-		if (d->subst[i].res == NULL)
-			elog(ERROR, "Out of Memory");
+		outptr = d->subst[i].res = (TSLexeme *) palloc(sizeof(TSLexeme) * n);
 		outptr->lexeme = NULL;
 		inptr = rem;
 
@@ -536,8 +526,8 @@ compileTheSubstitute(DictThesaurus * d)
 			{
 				lexized = (TSLexeme *) DatumGetPointer(
 													   FunctionCall4(
-												   &(d->subdict.lexize_info),
-									  PointerGetDatum(d->subdict.dictionary),
+													   &(d->subdict->lexize),
+									   PointerGetDatum(d->subdict->dictData),
 											  PointerGetDatum(inptr->lexeme),
 										Int32GetDatum(strlen(inptr->lexeme)),
 														PointerGetDatum(NULL)
@@ -556,15 +546,12 @@ compileTheSubstitute(DictThesaurus * d)
 						int			diff = outptr - d->subst[i].res;
 
 						n *= 2;
-						d->subst[i].res = (TSLexeme *) realloc(d->subst[i].res, sizeof(TSLexeme) * n);
-						if (d->subst[i].res == NULL)
-							elog(ERROR, "Out of Memory");
+						d->subst[i].res = (TSLexeme *) repalloc(d->subst[i].res, sizeof(TSLexeme) * n);
 						outptr = d->subst[i].res + diff;
 					}
 
 					*outptr = *lexized;
-					if ((outptr->lexeme = strdup(lexized->lexeme)) == NULL)
-						elog(ERROR, "Out of Memory");
+					outptr->lexeme = pstrdup(lexized->lexeme);
 
 					outptr++;
 					lexized++;
@@ -575,117 +562,88 @@ compileTheSubstitute(DictThesaurus * d)
 			}
 			else if (lexized)
 			{
-				elog(NOTICE, "Thesaurus: word '%s' in substition is a stop-word, ignored (rule %d)", inptr->lexeme, i + 1);
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("thesaurus substitute word \"%s\" is a stop word (rule %d)",
+								inptr->lexeme, i + 1)));
 			}
 			else
 			{
-				elog(ERROR, "Thesaurus: word '%s' in substition isn't recognized (rule %d)", inptr->lexeme, i + 1);
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)",
+								inptr->lexeme, i + 1)));
 			}
 
 			if (inptr->lexeme)
-				free(inptr->lexeme);
+				pfree(inptr->lexeme);
 			inptr++;
 		}
 
 		if (outptr == d->subst[i].res)
-			elog(ERROR, "Thesaurus: all words in subsitution are stop word (rule %d)", i + 1);
+			ereport(ERROR,
+					(errcode(ERRCODE_CONFIG_FILE_ERROR),
+					 errmsg("thesaurus substitute phrase is empty (rule %d)",
+							i + 1)));
 
 		d->subst[i].reslen = outptr - d->subst[i].res;
 
-		free(rem);
+		pfree(rem);
 	}
 }
 
 Datum
 thesaurus_init(PG_FUNCTION_ARGS)
 {
+	List	   *dictoptions = (List *) PG_GETARG_POINTER(0);
 	DictThesaurus *d;
-	Map		   *cfg,
-			   *pcfg;
-	text	   *in,
-			   *subdictname = NULL;
+	char	   *subdictname = NULL;
 	bool		fileloaded = false;
+	ListCell   *l;
 
-	if (PG_ARGISNULL(0) || PG_GETARG_POINTER(0) == NULL)
-		ereport(ERROR,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("Thesaurus confguration error")));
+	d = (DictThesaurus *) palloc0(sizeof(DictThesaurus));
 
-	d = (DictThesaurus *) malloc(sizeof(DictThesaurus));
-	if (!d)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-	memset(d, 0, sizeof(DictThesaurus));
-
-	in = PG_GETARG_TEXT_P(0);
-	parse_cfgdict(in, &cfg);
-	PG_FREE_IF_COPY(in, 0);
-	pcfg = cfg;
-	while (pcfg->key)
+	foreach(l, dictoptions)
 	{
-		if (pg_strcasecmp("DictFile", pcfg->key) == 0)
+		DefElem    *defel = (DefElem *) lfirst(l);
+
+		if (pg_strcasecmp("DictFile", defel->defname) == 0)
 		{
 			if (fileloaded)
-			{
-				freeDictThesaurus(d);
 				ereport(ERROR,
-						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-						 errmsg("Thesaurus file is already loaded")));
-			}
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple DictFile parameters")));
+			thesaurusRead(defGetString(defel), d);
 			fileloaded = true;
-			thesaurusRead(pcfg->value, d);
 		}
-		else if (pg_strcasecmp("Dictionary", pcfg->key) == 0)
+		else if (pg_strcasecmp("Dictionary", defel->defname) == 0)
 		{
 			if (subdictname)
-			{
-				freeDictThesaurus(d);
 				ereport(ERROR,
-						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-					 errmsg("Thesaurus: SubDictionary is already defined")));
-			}
-			subdictname = char2text(pcfg->value);
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("multiple Dictionary parameters")));
+			subdictname = pstrdup(defGetString(defel));
 		}
 		else
 		{
-			freeDictThesaurus(d);
 			ereport(ERROR,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized option: %s => %s",
-							pcfg->key, pcfg->value)));
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized Thesaurus parameter: \"%s\"",
+							defel->defname)));
 		}
-		pfree(pcfg->key);
-		pfree(pcfg->value);
-		pcfg++;
 	}
-	pfree(cfg);
 
 	if (!fileloaded)
 		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("Thesaurus file  isn't defined")));
-
-	if (subdictname)
-	{
-		DictInfo   *subdictptr;
-
-		/*
-		 * we already in SPI, but name2id_dict()/finddict() invoke
-		 * SPI_connect()
-		 */
-		SPI_push();
-
-		subdictptr = finddict(name2id_dict(subdictname));
-
-		SPI_pop();
-
-		d->subdict = *subdictptr;
-	}
-	else
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("missing DictFile parameter")));
+	if (!subdictname)
 		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("Thesaurus: SubDictionary isn't defined")));
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("missing Dictionary parameter")));
+
+	d->subdictOid = TSDictionaryGetDictid(stringToQualifiedNameList(subdictname), false);
+	d->subdict = lookup_ts_dictionary_cache(d->subdictOid);
 
 	compileTheLexeme(d);
 	compileTheSubstitute(d);
@@ -694,9 +652,10 @@ thesaurus_init(PG_FUNCTION_ARGS)
 }
 
 static LexemeInfo *
-findTheLexeme(DictThesaurus * d, char *lexeme)
+findTheLexeme(DictThesaurus *d, char *lexeme)
 {
-	TheLexeme	key, *res;
+	TheLexeme	key,
+			   *res;
 
 	if (d->nwrds == 0)
 		return NULL;
@@ -712,7 +671,7 @@ findTheLexeme(DictThesaurus * d, char *lexeme)
 }
 
 static bool
-matchIdSubst(LexemeInfo * stored, uint16 idsubst)
+matchIdSubst(LexemeInfo *stored, uint16 idsubst)
 {
 	bool		res = true;
 
@@ -732,7 +691,7 @@ matchIdSubst(LexemeInfo * stored, uint16 idsubst)
 }
 
 static LexemeInfo *
-findVariant(LexemeInfo * in, LexemeInfo * stored, uint16 curpos, LexemeInfo ** newin, int newn)
+findVariant(LexemeInfo *in, LexemeInfo *stored, uint16 curpos, LexemeInfo **newin, int newn)
 {
 	for (;;)
 	{
@@ -791,7 +750,7 @@ findVariant(LexemeInfo * in, LexemeInfo * stored, uint16 curpos, LexemeInfo ** n
 }
 
 static TSLexeme *
-copyTSLexeme(TheSubstitute * ts)
+copyTSLexeme(TheSubstitute *ts)
 {
 	TSLexeme   *res;
 	uint16		i;
@@ -809,7 +768,7 @@ copyTSLexeme(TheSubstitute * ts)
 }
 
 static TSLexeme *
-checkMatch(DictThesaurus * d, LexemeInfo * info, uint16 curpos, bool *moreres)
+checkMatch(DictThesaurus *d, LexemeInfo *info, uint16 curpos, bool *moreres)
 {
 	*moreres = false;
 	while (info)
@@ -836,8 +795,8 @@ thesaurus_lexize(PG_FUNCTION_ARGS)
 	uint16		curpos = 0;
 	bool		moreres = false;
 
-	if (dstate == NULL || PG_NARGS() < 4)
-		elog(ERROR, "Forbidden call of thesaurus or nested call");
+	if (PG_NARGS() != 4 || dstate == NULL)
+		elog(ERROR, "forbidden call of thesaurus or nested call");
 
 	if (dstate->isend)
 		PG_RETURN_POINTER(NULL);
@@ -846,15 +805,14 @@ thesaurus_lexize(PG_FUNCTION_ARGS)
 	if (stored)
 		curpos = stored->posinsubst + 1;
 
-	res = (TSLexeme *) DatumGetPointer(
-									   FunctionCall4(
-												   &(d->subdict.lexize_info),
-									  PointerGetDatum(d->subdict.dictionary),
+	if (!d->subdict->isvalid)
+		d->subdict = lookup_ts_dictionary_cache(d->subdictOid);
+
+	res = (TSLexeme *) DatumGetPointer(FunctionCall4(&(d->subdict->lexize),
+									   PointerGetDatum(d->subdict->dictData),
 													 PG_GETARG_DATUM(1),
-													 PG_GETARG_INT32(2),
-													 PointerGetDatum(NULL)
-													 )
-		);
+													 PG_GETARG_DATUM(2),
+													 PointerGetDatum(NULL)));
 
 	if (res && res->lexeme)
 	{
diff --git a/src/backend/tsearch/hunspell_sample.affix b/src/backend/tsearch/hunspell_sample.affix
new file mode 100644
index 000000000000..d1984c295fbf
--- /dev/null
+++ b/src/backend/tsearch/hunspell_sample.affix
@@ -0,0 +1,24 @@
+COMPOUNDFLAG Z
+ONLYINCOMPOUND L
+
+PFX B Y 1
+PFX B   0	re	.
+
+PFX U N 1
+PFX U   0	un	.
+
+SFX J Y 1
+SFX J   0	INGS	[^E]
+
+SFX G Y 1
+SFX G   0	ING		[^E]
+
+SFX S Y 1
+SFX S   0	S	[^SXZHY]
+
+SFX A Y 1
+SFX A   Y	IES	[^AEIOU]Y
+
+SFX \ N 1
+SFX \   0	Y/L	[^Y]
+
diff --git a/src/backend/tsearch/ispell_sample.affix b/src/backend/tsearch/ispell_sample.affix
new file mode 100644
index 000000000000..f29004ff1da7
--- /dev/null
+++ b/src/backend/tsearch/ispell_sample.affix
@@ -0,0 +1,26 @@
+compoundwords controlled Z
+
+prefixes
+
+flag *B:
+	.       >   RE      # As in enter > reenter
+
+flag U:
+    .       >   UN      # As in natural > unnatural
+
+suffixes
+
+flag *J:
+	[^E]    >   INGS        # As in cross > crossings
+
+flag *G:
+	[^E]    >   ING     # As in cross > crossing
+
+flag *S:
+	[^SXZHY]    >   S       # As in bat > bats
+
+flag *A:
+	[^AEIOU]Y   >   -Y,IES      # As in imply > implies
+
+flag ~\\:
+	[^Y]        >   Y              #~ advarsel > advarsely-
diff --git a/src/backend/tsearch/ispell_sample.dict b/src/backend/tsearch/ispell_sample.dict
new file mode 100644
index 000000000000..44df1967a6c7
--- /dev/null
+++ b/src/backend/tsearch/ispell_sample.dict
@@ -0,0 +1,8 @@
+book/GJUS
+booking/SB
+footballklubber
+foot/ZS
+football/Z
+ball/SZ\
+klubber/Z
+sky/A
diff --git a/contrib/tsearch2/ispell/regis.c b/src/backend/tsearch/regis.c
similarity index 56%
rename from contrib/tsearch2/ispell/regis.c
rename to src/backend/tsearch/regis.c
index 8737bd4ccc78..9ba47531437c 100644
--- a/contrib/tsearch2/ispell/regis.c
+++ b/src/backend/tsearch/regis.c
@@ -1,48 +1,92 @@
-#include "regis.h"
-#include "ts_locale.h"
-#include "common.h"
+/*-------------------------------------------------------------------------
+ *
+ * regis.c
+ *		Fast regex subset
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.4.2.1 2009/08/30 16:53:45 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
 
+#include "postgres.h"
+
+#include "tsearch/dicts/regis.h"
+#include "tsearch/ts_locale.h"
+
+#define RS_IN_ONEOF 1
+#define RS_IN_ONEOF_IN	2
+#define RS_IN_NONEOF	3
+#define RS_IN_WAIT	4
+
+
+/*
+ * Test whether a regex is of the subset supported here.
+ * Keep this in sync with RS_compile!
+ */
 bool
 RS_isRegis(const char *str)
 {
-	while (str && *str)
+	int			state = RS_IN_WAIT;
+	const char *c = str;
+
+	while (*c)
 	{
-		if (t_isalpha(str) ||
-			t_iseq(str, '[') ||
-			t_iseq(str, ']') ||
-			t_iseq(str, '^'))
-			str += pg_mblen(str);
+		if (state == RS_IN_WAIT)
+		{
+			if (t_isalpha(c))
+				/* okay */ ;
+			else if (t_iseq(c, '['))
+				state = RS_IN_ONEOF;
+			else
+				return false;
+		}
+		else if (state == RS_IN_ONEOF)
+		{
+			if (t_iseq(c, '^'))
+				state = RS_IN_NONEOF;
+			else if (t_isalpha(c))
+				state = RS_IN_ONEOF_IN;
+			else
+				return false;
+		}
+		else if (state == RS_IN_ONEOF_IN || state == RS_IN_NONEOF)
+		{
+			if (t_isalpha(c))
+				/* okay */ ;
+			else if (t_iseq(c, ']'))
+				state = RS_IN_WAIT;
+			else
+				return false;
+		}
 		else
-			return false;
+			elog(ERROR, "internal error in RS_isRegis: state %d", state);
+		c += pg_mblen(c);
 	}
-	return true;
-}
 
-#define RS_IN_ONEOF 1
-#define RS_IN_ONEOF_IN	2
-#define RS_IN_NONEOF	3
-#define RS_IN_WAIT	4
+	return (state == RS_IN_WAIT);
+}
 
 static RegisNode *
-newRegisNode(RegisNode * prev, int len)
+newRegisNode(RegisNode *prev, int len)
 {
 	RegisNode  *ptr;
 
-	ptr = (RegisNode *) malloc(RNHDRSZ + len + 1);
-	if (!ptr)
-		ts_error(ERROR, "No memory");
-	memset(ptr, 0, RNHDRSZ + len + 1);
+	ptr = (RegisNode *) palloc0(RNHDRSZ + len + 1);
 	if (prev)
 		prev->next = ptr;
 	return ptr;
 }
 
 void
-RS_compile(Regis * r, bool issuffix, char *str)
+RS_compile(Regis *r, bool issuffix, const char *str)
 {
 	int			len = strlen(str);
 	int			state = RS_IN_WAIT;
-	char	   *c = (char *) str;
+	const char *c = str;
 	RegisNode  *ptr = NULL;
 
 	memset(r, 0, sizeof(Regis));
@@ -71,8 +115,8 @@ RS_compile(Regis * r, bool issuffix, char *str)
 				ptr->type = RSF_ONEOF;
 				state = RS_IN_ONEOF;
 			}
-			else
-				ts_error(ERROR, "Error in regis: %s", str);
+			else				/* shouldn't get here */
+				elog(ERROR, "invalid regis pattern: \"%s\"", str);
 		}
 		else if (state == RS_IN_ONEOF)
 		{
@@ -87,8 +131,8 @@ RS_compile(Regis * r, bool issuffix, char *str)
 				ptr->len = pg_mblen(c);
 				state = RS_IN_ONEOF_IN;
 			}
-			else
-				ts_error(ERROR, "Error in regis: %s", str);
+			else				/* shouldn't get here */
+				elog(ERROR, "invalid regis pattern: \"%s\"", str);
 		}
 		else if (state == RS_IN_ONEOF_IN || state == RS_IN_NONEOF)
 		{
@@ -99,14 +143,17 @@ RS_compile(Regis * r, bool issuffix, char *str)
 			}
 			else if (t_iseq(c, ']'))
 				state = RS_IN_WAIT;
-			else
-				ts_error(ERROR, "Error in regis: %s", str);
+			else				/* shouldn't get here */
+				elog(ERROR, "invalid regis pattern: \"%s\"", str);
 		}
 		else
-			ts_error(ERROR, "Internal error in RS_compile: %d", state);
+			elog(ERROR, "internal error in RS_compile: state %d", state);
 		c += pg_mblen(c);
 	}
 
+	if (state != RS_IN_WAIT)		/* shouldn't get here */
+		elog(ERROR, "invalid regis pattern: \"%s\"", str);
+
 	ptr = r->node;
 	while (ptr)
 	{
@@ -116,7 +163,7 @@ RS_compile(Regis * r, bool issuffix, char *str)
 }
 
 void
-RS_free(Regis * r)
+RS_free(Regis *r)
 {
 	RegisNode  *ptr = r->node,
 			   *tmp;
@@ -124,7 +171,7 @@ RS_free(Regis * r)
 	while (ptr)
 	{
 		tmp = ptr->next;
-		free(ptr);
+		pfree(ptr);
 		ptr = tmp;
 	}
 
@@ -135,7 +182,7 @@ RS_free(Regis * r)
 static bool
 mb_strchr(char *str, char *c)
 {
-	int			clen = pg_mblen(c),
+	int			clen,
 				plen,
 				i;
 	char	   *ptr = str;
@@ -168,7 +215,7 @@ mb_strchr(char *str, char *c)
 
 
 bool
-RS_execute(Regis * r, char *str)
+RS_execute(Regis *r, char *str)
 {
 	RegisNode  *ptr = r->node;
 	char	   *c = str;
@@ -181,7 +228,7 @@ RS_execute(Regis * r, char *str)
 	}
 
 	if (len < r->nchar)
-		return false;
+		return 0;
 
 	c = str;
 	if (r->issuffix)
@@ -205,7 +252,7 @@ RS_execute(Regis * r, char *str)
 					return false;
 				break;
 			default:
-				ts_error(ERROR, "RS_execute: Unknown type node: %d\n", ptr->type);
+				elog(ERROR, "unrecognized regis node type: %d", ptr->type);
 		}
 		ptr = ptr->next;
 		c += pg_mblen(c);
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
new file mode 100644
index 000000000000..ac8dd429cd58
--- /dev/null
+++ b/src/backend/tsearch/spell.c
@@ -0,0 +1,1739 @@
+/*-------------------------------------------------------------------------
+ *
+ * spell.c
+ *		Normalizing word with ISpell
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.11.2.3 2009/01/29 16:09:12 teodor Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "tsearch/dicts/spell.h"
+#include "tsearch/ts_locale.h"
+#include "utils/memutils.h"
+
+
+/*
+ * Initialization requires a lot of memory that's not needed
+ * after the initialization is done.  In init function,
+ * CurrentMemoryContext is a long lived memory context associated
+ * with the dictionary cache entry, so we use a temporary context
+ * for the short-lived stuff.
+ */
+static MemoryContext tmpCtx = NULL;
+
+#define tmpalloc(sz)  MemoryContextAlloc(tmpCtx, (sz))
+#define tmpalloc0(sz)  MemoryContextAllocZero(tmpCtx, (sz))
+
+static void
+checkTmpCtx(void)
+{
+	/*
+	 * XXX: This assumes that CurrentMemoryContext doesn't have any children
+	 * other than the one we create here.
+	 */
+	if (CurrentMemoryContext->firstchild == NULL)
+	{
+		tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
+									   "Ispell dictionary init context",
+									   ALLOCSET_DEFAULT_MINSIZE,
+									   ALLOCSET_DEFAULT_INITSIZE,
+									   ALLOCSET_DEFAULT_MAXSIZE);
+	}
+	else
+		tmpCtx = CurrentMemoryContext->firstchild;
+}
+
+static char *
+lowerstr_ctx(char *src)
+{
+	MemoryContext saveCtx;
+	char	   *dst;
+
+	saveCtx = MemoryContextSwitchTo(tmpCtx);
+	dst = lowerstr(src);
+	MemoryContextSwitchTo(saveCtx);
+
+	return dst;
+}
+
+#define MAX_NORM 1024
+#define MAXNORMLEN 256
+
+#define STRNCMP(s,p)	strncmp( (s), (p), strlen(p) )
+#define GETWCHAR(W,L,N,T) ( ((uint8*)(W))[ ((T)==FF_PREFIX) ? (N) : ( (L) - 1 - (N) ) ] )
+#define GETCHAR(A,N,T)	  GETWCHAR( (A)->repl, (A)->replen, N, T )
+
+static char *VoidString = "";
+
+static int
+cmpspell(const void *s1, const void *s2)
+{
+	return (strcmp((*(const SPELL **) s1)->word, (*(const SPELL **) s2)->word));
+}
+static int
+cmpspellaffix(const void *s1, const void *s2)
+{
+	return (strncmp((*(const SPELL **) s1)->p.flag, (*(const SPELL **) s2)->p.flag, MAXFLAGLEN));
+}
+
+static char *
+findchar(char *str, int c)
+{
+	while (*str)
+	{
+		if (t_iseq(str, c))
+			return str;
+		str += pg_mblen(str);
+	}
+
+	return NULL;
+}
+
+
+/* backward string compare for suffix tree operations */
+static int
+strbcmp(const unsigned char *s1, const unsigned char *s2)
+{
+	int			l1 = strlen((const char *) s1) - 1,
+				l2 = strlen((const char *) s2) - 1;
+
+	while (l1 >= 0 && l2 >= 0)
+	{
+		if (s1[l1] < s2[l2])
+			return -1;
+		if (s1[l1] > s2[l2])
+			return 1;
+		l1--;
+		l2--;
+	}
+	if (l1 < l2)
+		return -1;
+	if (l1 > l2)
+		return 1;
+
+	return 0;
+}
+static int
+strbncmp(const unsigned char *s1, const unsigned char *s2, size_t count)
+{
+	int			l1 = strlen((const char *) s1) - 1,
+				l2 = strlen((const char *) s2) - 1,
+				l = count;
+
+	while (l1 >= 0 && l2 >= 0 && l > 0)
+	{
+		if (s1[l1] < s2[l2])
+			return -1;
+		if (s1[l1] > s2[l2])
+			return 1;
+		l1--;
+		l2--;
+		l--;
+	}
+	if (l == 0)
+		return 0;
+	if (l1 < l2)
+		return -1;
+	if (l1 > l2)
+		return 1;
+	return 0;
+}
+
+static int
+cmpaffix(const void *s1, const void *s2)
+{
+	const AFFIX *a1 = (const AFFIX *) s1;
+	const AFFIX *a2 = (const AFFIX *) s2;
+
+	if (a1->type < a2->type)
+		return -1;
+	if (a1->type > a2->type)
+		return 1;
+	if (a1->type == FF_PREFIX)
+		return strcmp(a1->repl, a2->repl);
+	else
+		return strbcmp((const unsigned char *) a1->repl,
+					   (const unsigned char *) a2->repl);
+}
+
+static void
+NIAddSpell(IspellDict *Conf, const char *word, const char *flag)
+{
+	if (Conf->nspell >= Conf->mspell)
+	{
+		if (Conf->mspell)
+		{
+			Conf->mspell += 1024 * 20;
+			Conf->Spell = (SPELL **) repalloc(Conf->Spell, Conf->mspell * sizeof(SPELL *));
+		}
+		else
+		{
+			Conf->mspell = 1024 * 20;
+			Conf->Spell = (SPELL **) tmpalloc(Conf->mspell * sizeof(SPELL *));
+		}
+	}
+	Conf->Spell[Conf->nspell] = (SPELL *) tmpalloc(SPELLHDRSZ + strlen(word) + 1);
+	strcpy(Conf->Spell[Conf->nspell]->word, word);
+	strncpy(Conf->Spell[Conf->nspell]->p.flag, flag, MAXFLAGLEN);
+	Conf->nspell++;
+}
+
+/*
+ * import dictionary
+ *
+ * Note caller must already have applied get_tsearch_config_filename
+ */
+void
+NIImportDictionary(IspellDict *Conf, const char *filename)
+{
+	tsearch_readline_state trst;
+	char	   *line;
+
+	checkTmpCtx();
+
+	if (!tsearch_readline_begin(&trst, filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open dictionary file \"%s\": %m",
+						filename)));
+
+	while ((line = tsearch_readline(&trst)) != NULL)
+	{
+		char	   *s,
+				   *pstr;
+		const char *flag;
+
+		/* Extract flag from the line */
+		flag = NULL;
+		if ((s = findchar(line, '/')))
+		{
+			*s++ = '\0';
+			flag = s;
+			while (*s)
+			{
+				/* we allow only single encoded flags for faster works */
+				if (pg_mblen(s) == 1 && t_isprint(s) && !t_isspace(s))
+					s++;
+				else
+				{
+					*s = '\0';
+					break;
+				}
+			}
+		}
+		else
+			flag = "";
+
+		/* Remove trailing spaces */
+		s = line;
+		while (*s)
+		{
+			if (t_isspace(s))
+			{
+				*s = '\0';
+				break;
+			}
+			s += pg_mblen(s);
+		}
+		pstr = lowerstr_ctx(line);
+
+		NIAddSpell(Conf, pstr, flag);
+		pfree(pstr);
+
+		pfree(line);
+	}
+	tsearch_readline_end(&trst);
+}
+
+
+static int
+FindWord(IspellDict *Conf, const char *word, int affixflag, int flag)
+{
+	SPNode	   *node = Conf->Dictionary;
+	SPNodeData *StopLow,
+			   *StopHigh,
+			   *StopMiddle;
+	uint8	   *ptr = (uint8 *) word;
+
+	flag &= FF_DICTFLAGMASK;
+
+	while (node && *ptr)
+	{
+		StopLow = node->data;
+		StopHigh = node->data + node->length;
+		while (StopLow < StopHigh)
+		{
+			StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
+			if (StopMiddle->val == *ptr)
+			{
+				if (*(ptr + 1) == '\0' && StopMiddle->isword)
+				{
+					if (flag == 0)
+					{
+						if (StopMiddle->compoundflag & FF_COMPOUNDONLY)
+							return 0;
+					}
+					else if ((flag & StopMiddle->compoundflag) == 0)
+						return 0;
+
+					if ((affixflag == 0) || (strchr(Conf->AffixData[StopMiddle->affix], affixflag) != NULL))
+						return 1;
+				}
+				node = StopMiddle->node;
+				ptr++;
+				break;
+			}
+			else if (StopMiddle->val < *ptr)
+				StopLow = StopMiddle + 1;
+			else
+				StopHigh = StopMiddle;
+		}
+		if (StopLow >= StopHigh)
+			break;
+	}
+	return 0;
+}
+
+static void
+NIAddAffix(IspellDict *Conf, int flag, char flagflags, const char *mask, const char *find, const char *repl, int type)
+{
+	AFFIX	   *Affix;
+
+	if (Conf->naffixes >= Conf->maffixes)
+	{
+		if (Conf->maffixes)
+		{
+			Conf->maffixes += 16;
+			Conf->Affix = (AFFIX *) repalloc((void *) Conf->Affix, Conf->maffixes * sizeof(AFFIX));
+		}
+		else
+		{
+			Conf->maffixes = 16;
+			Conf->Affix = (AFFIX *) palloc(Conf->maffixes * sizeof(AFFIX));
+		}
+	}
+
+	Affix = Conf->Affix + Conf->naffixes;
+
+	if (strcmp(mask, ".") == 0)
+	{
+		Affix->issimple = 1;
+		Affix->isregis = 0;
+	}
+	else if (RS_isRegis(mask))
+	{
+		Affix->issimple = 0;
+		Affix->isregis = 1;
+		RS_compile(&(Affix->reg.regis), (type == FF_SUFFIX) ? true : false,
+				   (mask && *mask) ? mask : VoidString);
+	}
+	else
+	{
+		int			masklen;
+		int			wmasklen;
+		int			err;
+		pg_wchar   *wmask;
+		char	   *tmask;
+
+		Affix->issimple = 0;
+		Affix->isregis = 0;
+		tmask = (char *) tmpalloc(strlen(mask) + 3);
+		if (type == FF_SUFFIX)
+			sprintf(tmask, "%s$", mask);
+		else
+			sprintf(tmask, "^%s", mask);
+
+		masklen = strlen(tmask);
+		wmask = (pg_wchar *) tmpalloc((masklen + 1) * sizeof(pg_wchar));
+		wmasklen = pg_mb2wchar_with_len(tmask, wmask, masklen);
+
+		err = pg_regcomp(&(Affix->reg.regex), wmask, wmasklen, REG_ADVANCED | REG_NOSUB);
+		if (err)
+		{
+			char		errstr[100];
+
+			pg_regerror(err, &(Affix->reg.regex), errstr, sizeof(errstr));
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),
+					 errmsg("invalid regular expression: %s", errstr)));
+		}
+	}
+
+	Affix->flagflags = flagflags;
+	if ((Affix->flagflags & FF_COMPOUNDONLY) || (Affix->flagflags & FF_COMPOUNDPERMITFLAG))
+	{
+		if ((Affix->flagflags & FF_COMPOUNDFLAG) == 0)
+			Affix->flagflags |= FF_COMPOUNDFLAG;
+	}
+	Affix->flag = flag;
+	Affix->type = type;
+
+	Affix->find = (find && *find) ? pstrdup(find) : VoidString;
+	if ((Affix->replen = strlen(repl)) > 0)
+		Affix->repl = pstrdup(repl);
+	else
+		Affix->repl = VoidString;
+	Conf->naffixes++;
+}
+
+#define PAE_WAIT_MASK	0
+#define PAE_INMASK	1
+#define PAE_WAIT_FIND	2
+#define PAE_INFIND	3
+#define PAE_WAIT_REPL	4
+#define PAE_INREPL	5
+
+static bool
+parse_affentry(char *str, char *mask, char *find, char *repl)
+{
+	int			state = PAE_WAIT_MASK;
+	char	   *pmask = mask,
+			   *pfind = find,
+			   *prepl = repl;
+
+	*mask = *find = *repl = '\0';
+
+	while (*str)
+	{
+		if (state == PAE_WAIT_MASK)
+		{
+			if (t_iseq(str, '#'))
+				return false;
+			else if (!t_isspace(str))
+			{
+				COPYCHAR(pmask, str);
+				pmask += pg_mblen(str);
+				state = PAE_INMASK;
+			}
+		}
+		else if (state == PAE_INMASK)
+		{
+			if (t_iseq(str, '>'))
+			{
+				*pmask = '\0';
+				state = PAE_WAIT_FIND;
+			}
+			else if (!t_isspace(str))
+			{
+				COPYCHAR(pmask, str);
+				pmask += pg_mblen(str);
+			}
+		}
+		else if (state == PAE_WAIT_FIND)
+		{
+			if (t_iseq(str, '-'))
+			{
+				state = PAE_INFIND;
+			}
+			else if (t_isalpha(str) || t_iseq(str, '\'') /* english 's */ )
+			{
+				COPYCHAR(prepl, str);
+				prepl += pg_mblen(str);
+				state = PAE_INREPL;
+			}
+			else if (!t_isspace(str))
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("syntax error")));
+		}
+		else if (state == PAE_INFIND)
+		{
+			if (t_iseq(str, ','))
+			{
+				*pfind = '\0';
+				state = PAE_WAIT_REPL;
+			}
+			else if (t_isalpha(str))
+			{
+				COPYCHAR(pfind, str);
+				pfind += pg_mblen(str);
+			}
+			else if (!t_isspace(str))
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("syntax error")));
+		}
+		else if (state == PAE_WAIT_REPL)
+		{
+			if (t_iseq(str, '-'))
+			{
+				break;			/* void repl */
+			}
+			else if (t_isalpha(str))
+			{
+				COPYCHAR(prepl, str);
+				prepl += pg_mblen(str);
+				state = PAE_INREPL;
+			}
+			else if (!t_isspace(str))
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("syntax error")));
+		}
+		else if (state == PAE_INREPL)
+		{
+			if (t_iseq(str, '#'))
+			{
+				*prepl = '\0';
+				break;
+			}
+			else if (t_isalpha(str))
+			{
+				COPYCHAR(prepl, str);
+				prepl += pg_mblen(str);
+			}
+			else if (!t_isspace(str))
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("syntax error")));
+		}
+		else
+			elog(ERROR, "unrecognized state in parse_affentry: %d", state);
+
+		str += pg_mblen(str);
+	}
+
+	*pmask = *pfind = *prepl = '\0';
+
+	return (*mask && (*find || *repl)) ? true : false;
+}
+
+static void
+addFlagValue(IspellDict *Conf, char *s, uint32 val)
+{
+	while (*s && t_isspace(s))
+		s += pg_mblen(s);
+
+	if (!*s)
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("syntax error")));
+
+	if (pg_mblen(s) != 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("multibyte flag character is not allowed")));
+
+	Conf->flagval[*(unsigned char*) s] = (unsigned char) val;
+	Conf->usecompound = true;
+}
+
+static void
+NIImportOOAffixes(IspellDict *Conf, const char *filename)
+{
+	char		type[BUFSIZ],
+			   *ptype = NULL;
+	char		sflag[BUFSIZ];
+	char		mask[BUFSIZ],
+			   *pmask;
+	char		find[BUFSIZ],
+			   *pfind;
+	char		repl[BUFSIZ],
+			   *prepl;
+	bool		isSuffix = false;
+	int			flag = 0;
+	char		flagflags = 0;
+	tsearch_readline_state trst;
+	int			scanread = 0;
+	char		scanbuf[BUFSIZ];
+	char	   *recoded;
+
+	checkTmpCtx();
+
+	/* read file to find any flag */
+	memset(Conf->flagval, 0, sizeof(Conf->flagval));
+	Conf->usecompound = false;
+
+	if (!tsearch_readline_begin(&trst, filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open affix file \"%s\": %m",
+						filename)));
+
+	while ((recoded = tsearch_readline(&trst)) != NULL)
+	{
+		if (*recoded == '\0' || t_isspace(recoded) || t_iseq(recoded, '#'))
+		{
+			pfree(recoded);
+			continue;
+		}
+
+		if (STRNCMP(recoded, "COMPOUNDFLAG") == 0)
+			addFlagValue(Conf, recoded + strlen("COMPOUNDFLAG"),
+						 FF_COMPOUNDFLAG);
+		else if (STRNCMP(recoded, "COMPOUNDBEGIN") == 0)
+			addFlagValue(Conf, recoded + strlen("COMPOUNDBEGIN"),
+						 FF_COMPOUNDBEGIN);
+		else if (STRNCMP(recoded, "COMPOUNDLAST") == 0)
+			addFlagValue(Conf, recoded + strlen("COMPOUNDLAST"),
+						 FF_COMPOUNDLAST);
+		/* COMPOUNDLAST and COMPOUNDEND are synonyms */
+		else if (STRNCMP(recoded, "COMPOUNDEND") == 0)
+			addFlagValue(Conf, recoded + strlen("COMPOUNDEND"),
+						 FF_COMPOUNDLAST);
+		else if (STRNCMP(recoded, "COMPOUNDMIDDLE") == 0)
+			addFlagValue(Conf, recoded + strlen("COMPOUNDMIDDLE"),
+						 FF_COMPOUNDMIDDLE);
+		else if (STRNCMP(recoded, "ONLYINCOMPOUND") == 0)
+			addFlagValue(Conf, recoded + strlen("ONLYINCOMPOUND"),
+						 FF_COMPOUNDONLY);
+		else if (STRNCMP(recoded, "COMPOUNDPERMITFLAG") == 0)
+			addFlagValue(Conf, recoded + strlen("COMPOUNDPERMITFLAG"),
+						 FF_COMPOUNDPERMITFLAG);
+		else if (STRNCMP(recoded, "COMPOUNDFORBIDFLAG") == 0)
+			addFlagValue(Conf, recoded + strlen("COMPOUNDFORBIDFLAG"),
+						 FF_COMPOUNDFORBIDFLAG);
+		else if (STRNCMP(recoded, "FLAG") == 0)
+		{
+			char	   *s = recoded + strlen("FLAG");
+
+			while (*s && t_isspace(s))
+				s += pg_mblen(s);
+
+			if (*s && STRNCMP(s, "default") != 0)
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("Ispell dictionary supports only default flag value")));
+		}
+
+		pfree(recoded);
+	}
+	tsearch_readline_end(&trst);
+
+	sprintf(scanbuf, "%%6s %%%ds %%%ds %%%ds %%%ds", BUFSIZ / 5, BUFSIZ / 5, BUFSIZ / 5, BUFSIZ / 5);
+
+	if (!tsearch_readline_begin(&trst, filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open affix file \"%s\": %m",
+						filename)));
+
+	while ((recoded = tsearch_readline(&trst)) != NULL)
+	{
+		if (*recoded == '\0' || t_isspace(recoded) || t_iseq(recoded, '#'))
+			goto nextline;
+
+		scanread = sscanf(recoded, scanbuf, type, sflag, find, repl, mask);
+
+		if (ptype)
+			pfree(ptype);
+		ptype = lowerstr_ctx(type);
+		if (scanread < 4 || (STRNCMP(ptype, "sfx") && STRNCMP(ptype, "pfx")))
+			goto nextline;
+
+		if (scanread == 4)
+		{
+			if (strlen(sflag) != 1)
+				goto nextline;
+			flag = *sflag;
+			isSuffix = (STRNCMP(ptype, "sfx") == 0) ? true : false;
+			if (t_iseq(find, 'y') || t_iseq(find, 'Y'))
+				flagflags = FF_CROSSPRODUCT;
+			else
+				flagflags = 0;
+		}
+		else
+		{
+			char	   *ptr;
+			int			aflg = 0;
+
+			if (strlen(sflag) != 1 || flag != *sflag || flag == 0)
+				goto nextline;
+			prepl = lowerstr_ctx(repl);
+			/* affix flag */
+			if ((ptr = strchr(prepl, '/')) != NULL)
+			{
+				*ptr = '\0';
+				ptr = repl + (ptr - prepl) + 1;
+				while (*ptr)
+				{
+					aflg |= Conf->flagval[*(unsigned char*) ptr];
+					ptr++;
+				}
+			}
+			pfind = lowerstr_ctx(find);
+			pmask = lowerstr_ctx(mask);
+			if (t_iseq(find, '0'))
+				*pfind = '\0';
+			if (t_iseq(repl, '0'))
+				*prepl = '\0';
+
+			NIAddAffix(Conf, flag, flagflags | aflg, pmask, pfind, prepl,
+					   isSuffix ? FF_SUFFIX : FF_PREFIX);
+			pfree(prepl);
+			pfree(pfind);
+			pfree(pmask);
+		}
+
+nextline:
+		pfree(recoded);
+	}
+
+	tsearch_readline_end(&trst);
+	if (ptype)
+		pfree(ptype);
+}
+
+/*
+ * import affixes
+ *
+ * Note caller must already have applied get_tsearch_config_filename
+ */
+void
+NIImportAffixes(IspellDict *Conf, const char *filename)
+{
+	char	   *pstr = NULL;
+	char		mask[BUFSIZ];
+	char		find[BUFSIZ];
+	char		repl[BUFSIZ];
+	char	   *s;
+	bool		suffixes = false;
+	bool		prefixes = false;
+	int			flag = 0;
+	char		flagflags = 0;
+	tsearch_readline_state trst;
+	bool		oldformat = false;
+	char	   *recoded = NULL;
+
+	checkTmpCtx();
+
+	if (!tsearch_readline_begin(&trst, filename))
+		ereport(ERROR,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("could not open affix file \"%s\": %m",
+						filename)));
+
+	memset(Conf->flagval, 0, sizeof(Conf->flagval));
+	Conf->usecompound = false;
+
+	while ((recoded = tsearch_readline(&trst)) != NULL)
+	{
+		pstr = lowerstr(recoded);
+
+		/* Skip comments and empty lines */
+		if (*pstr == '#' || *pstr == '\n')
+			goto nextline;
+
+		if (STRNCMP(pstr, "compoundwords") == 0)
+		{
+			s = findchar(pstr, 'l');
+			if (s)
+			{
+				s = recoded + (s - pstr);		/* we need non-lowercased
+												 * string */
+				while (*s && !t_isspace(s))
+					s += pg_mblen(s);
+				while (*s && t_isspace(s))
+					s += pg_mblen(s);
+
+				if (*s && pg_mblen(s) == 1)
+				{
+					Conf->flagval[*(unsigned char*) s] = FF_COMPOUNDFLAG;
+					Conf->usecompound = true;
+				}
+				oldformat = true;
+				goto nextline;
+			}
+		}
+		if (STRNCMP(pstr, "suffixes") == 0)
+		{
+			suffixes = true;
+			prefixes = false;
+			oldformat = true;
+			goto nextline;
+		}
+		if (STRNCMP(pstr, "prefixes") == 0)
+		{
+			suffixes = false;
+			prefixes = true;
+			oldformat = true;
+			goto nextline;
+		}
+		if (STRNCMP(pstr, "flag") == 0)
+		{
+			s = recoded + 4;	/* we need non-lowercased string */
+			flagflags = 0;
+
+			while (*s && t_isspace(s))
+				s += pg_mblen(s);
+			oldformat = true;
+
+			/* allow only single-encoded flags */
+			if (pg_mblen(s) != 1)
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("multibyte flag character is not allowed")));
+
+			if (*s == '*')
+			{
+				flagflags |= FF_CROSSPRODUCT;
+				s++;
+			}
+			else if (*s == '~')
+			{
+				flagflags |= FF_COMPOUNDONLY;
+				s++;
+			}
+
+			if (*s == '\\')
+				s++;
+
+			/* allow only single-encoded flags */
+			if (pg_mblen(s) != 1)
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("multibyte flag character is not allowed")));
+
+			flag = *(unsigned char*) s;
+			goto nextline;
+		}
+		if (STRNCMP(recoded, "COMPOUNDFLAG") == 0 || STRNCMP(recoded, "COMPOUNDMIN") == 0 ||
+			STRNCMP(recoded, "PFX") == 0 || STRNCMP(recoded, "SFX") == 0)
+		{
+			if (oldformat)
+				ereport(ERROR,
+						(errcode(ERRCODE_CONFIG_FILE_ERROR),
+						 errmsg("wrong affix file format for flag")));
+			tsearch_readline_end(&trst);
+			NIImportOOAffixes(Conf, filename);
+			return;
+		}
+		if ((!suffixes) && (!prefixes))
+			goto nextline;
+
+		if (!parse_affentry(pstr, mask, find, repl))
+			goto nextline;
+
+		NIAddAffix(Conf, flag, flagflags, mask, find, repl, suffixes ? FF_SUFFIX : FF_PREFIX);
+
+nextline:
+		pfree(recoded);
+		pfree(pstr);
+	}
+	tsearch_readline_end(&trst);
+}
+
+static int
+MergeAffix(IspellDict *Conf, int a1, int a2)
+{
+	char	  **ptr;
+
+	while (Conf->nAffixData + 1 >= Conf->lenAffixData)
+	{
+		Conf->lenAffixData *= 2;
+		Conf->AffixData = (char **) repalloc(Conf->AffixData,
+										sizeof(char *) * Conf->lenAffixData);
+	}
+
+	ptr = Conf->AffixData + Conf->nAffixData;
+	*ptr = palloc(strlen(Conf->AffixData[a1]) + strlen(Conf->AffixData[a2]) +
+				  1 /* space */ + 1 /* \0 */ );
+	sprintf(*ptr, "%s %s", Conf->AffixData[a1], Conf->AffixData[a2]);
+	ptr++;
+	*ptr = NULL;
+	Conf->nAffixData++;
+
+	return Conf->nAffixData - 1;
+}
+
+static uint32
+makeCompoundFlags(IspellDict *Conf, int affix)
+{
+	uint32		flag = 0;
+	char	   *str = Conf->AffixData[affix];
+
+	while (str && *str)
+	{
+		flag |= Conf->flagval[*(unsigned char*) str];
+		str++;
+	}
+
+	return (flag & FF_DICTFLAGMASK);
+}
+
+static SPNode *
+mkSPNode(IspellDict *Conf, int low, int high, int level)
+{
+	int			i;
+	int			nchar = 0;
+	char		lastchar = '\0';
+	SPNode	   *rs;
+	SPNodeData *data;
+	int			lownew = low;
+
+	for (i = low; i < high; i++)
+		if (Conf->Spell[i]->p.d.len > level && lastchar != Conf->Spell[i]->word[level])
+		{
+			nchar++;
+			lastchar = Conf->Spell[i]->word[level];
+		}
+
+	if (!nchar)
+		return NULL;
+
+	rs = (SPNode *) palloc0(SPNHDRSZ + nchar * sizeof(SPNodeData));
+	rs->length = nchar;
+	data = rs->data;
+
+	lastchar = '\0';
+	for (i = low; i < high; i++)
+		if (Conf->Spell[i]->p.d.len > level)
+		{
+			if (lastchar != Conf->Spell[i]->word[level])
+			{
+				if (lastchar)
+				{
+					data->node = mkSPNode(Conf, lownew, i, level + 1);
+					lownew = i;
+					data++;
+				}
+				lastchar = Conf->Spell[i]->word[level];
+			}
+			data->val = ((uint8 *) (Conf->Spell[i]->word))[level];
+			if (Conf->Spell[i]->p.d.len == level + 1)
+			{
+				bool		clearCompoundOnly = false;
+
+				if (data->isword && data->affix != Conf->Spell[i]->p.d.affix)
+				{
+					/*
+					 * MergeAffix called a few times. If one of word is
+					 * allowed to be in compound word and another isn't, then
+					 * clear FF_COMPOUNDONLY flag.
+					 */
+
+					clearCompoundOnly = (FF_COMPOUNDONLY & data->compoundflag
+						& makeCompoundFlags(Conf, Conf->Spell[i]->p.d.affix))
+						? false : true;
+					data->affix = MergeAffix(Conf, data->affix, Conf->Spell[i]->p.d.affix);
+				}
+				else
+					data->affix = Conf->Spell[i]->p.d.affix;
+				data->isword = 1;
+
+				data->compoundflag = makeCompoundFlags(Conf, data->affix);
+
+				if ((data->compoundflag & FF_COMPOUNDONLY) &&
+					(data->compoundflag & FF_COMPOUNDFLAG) == 0)
+					data->compoundflag |= FF_COMPOUNDFLAG;
+
+				if (clearCompoundOnly)
+					data->compoundflag &= ~FF_COMPOUNDONLY;
+			}
+		}
+
+	data->node = mkSPNode(Conf, lownew, high, level + 1);
+
+	return rs;
+}
+
+/*
+ * Builds the Conf->Dictionary tree and AffixData from the imported dictionary
+ * and affixes.
+ */
+void
+NISortDictionary(IspellDict *Conf)
+{
+	int			i;
+	int			naffix = 0;
+	int			curaffix;
+
+	checkTmpCtx();
+
+	/* compress affixes */
+
+	/* Count the number of different flags used in the dictionary */
+
+	qsort((void *) Conf->Spell, Conf->nspell, sizeof(SPELL *), cmpspellaffix);
+
+	naffix = 0;
+	for (i = 0; i < Conf->nspell; i++)
+	{
+		if (i == 0 || strncmp(Conf->Spell[i]->p.flag, Conf->Spell[i - 1]->p.flag, MAXFLAGLEN))
+			naffix++;
+	}
+
+	/*
+	 * Fill in Conf->AffixData with the affixes that were used in the
+	 * dictionary. Replace textual flag-field of Conf->Spell entries with
+	 * indexes into Conf->AffixData array.
+	 */
+	Conf->AffixData = (char **) palloc0(naffix * sizeof(char *));
+
+	curaffix = -1;
+	for (i = 0; i < Conf->nspell; i++)
+	{
+		if (i == 0 || strncmp(Conf->Spell[i]->p.flag, Conf->AffixData[curaffix], MAXFLAGLEN))
+		{
+			curaffix++;
+			Assert(curaffix < naffix);
+			Conf->AffixData[curaffix] = pstrdup(Conf->Spell[i]->p.flag);
+		}
+
+		Conf->Spell[i]->p.d.affix = curaffix;
+		Conf->Spell[i]->p.d.len = strlen(Conf->Spell[i]->word);
+	}
+
+	Conf->lenAffixData = Conf->nAffixData = naffix;
+
+	qsort((void *) Conf->Spell, Conf->nspell, sizeof(SPELL *), cmpspell);
+	Conf->Dictionary = mkSPNode(Conf, 0, Conf->nspell, 0);
+
+	Conf->Spell = NULL;
+}
+
+static AffixNode *
+mkANode(IspellDict *Conf, int low, int high, int level, int type)
+{
+	int			i;
+	int			nchar = 0;
+	uint8		lastchar = '\0';
+	AffixNode  *rs;
+	AffixNodeData *data;
+	int			lownew = low;
+	int			naff;
+	AFFIX	  **aff;
+
+	for (i = low; i < high; i++)
+		if (Conf->Affix[i].replen > level && lastchar != GETCHAR(Conf->Affix + i, level, type))
+		{
+			nchar++;
+			lastchar = GETCHAR(Conf->Affix + i, level, type);
+		}
+
+	if (!nchar)
+		return NULL;
+
+	aff = (AFFIX **) tmpalloc(sizeof(AFFIX *) * (high - low + 1));
+	naff = 0;
+
+	rs = (AffixNode *) palloc0(ANHRDSZ + nchar * sizeof(AffixNodeData));
+	rs->length = nchar;
+	data = rs->data;
+
+	lastchar = '\0';
+	for (i = low; i < high; i++)
+		if (Conf->Affix[i].replen > level)
+		{
+			if (lastchar != GETCHAR(Conf->Affix + i, level, type))
+			{
+				if (lastchar)
+				{
+					data->node = mkANode(Conf, lownew, i, level + 1, type);
+					if (naff)
+					{
+						data->naff = naff;
+						data->aff = (AFFIX **) palloc(sizeof(AFFIX *) * naff);
+						memcpy(data->aff, aff, sizeof(AFFIX *) * naff);
+						naff = 0;
+					}
+					data++;
+					lownew = i;
+				}
+				lastchar = GETCHAR(Conf->Affix + i, level, type);
+			}
+			data->val = GETCHAR(Conf->Affix + i, level, type);
+			if (Conf->Affix[i].replen == level + 1)
+			{					/* affix stopped */
+				aff[naff++] = Conf->Affix + i;
+			}
+		}
+
+	data->node = mkANode(Conf, lownew, high, level + 1, type);
+	if (naff)
+	{
+		data->naff = naff;
+		data->aff = (AFFIX **) palloc(sizeof(AFFIX *) * naff);
+		memcpy(data->aff, aff, sizeof(AFFIX *) * naff);
+		naff = 0;
+	}
+
+	pfree(aff);
+
+	return rs;
+}
+
+static void
+mkVoidAffix(IspellDict *Conf, bool issuffix, int startsuffix)
+{
+	int			i,
+				cnt = 0;
+	int			start = (issuffix) ? startsuffix : 0;
+	int			end = (issuffix) ? Conf->naffixes : startsuffix;
+	AffixNode  *Affix = (AffixNode *) palloc0(ANHRDSZ + sizeof(AffixNodeData));
+
+	Affix->length = 1;
+	Affix->isvoid = 1;
+
+	if (issuffix)
+	{
+		Affix->data->node = Conf->Suffix;
+		Conf->Suffix = Affix;
+	}
+	else
+	{
+		Affix->data->node = Conf->Prefix;
+		Conf->Prefix = Affix;
+	}
+
+
+	for (i = start; i < end; i++)
+		if (Conf->Affix[i].replen == 0)
+			cnt++;
+
+	if (cnt == 0)
+		return;
+
+	Affix->data->aff = (AFFIX **) palloc(sizeof(AFFIX *) * cnt);
+	Affix->data->naff = (uint32) cnt;
+
+	cnt = 0;
+	for (i = start; i < end; i++)
+		if (Conf->Affix[i].replen == 0)
+		{
+			Affix->data->aff[cnt] = Conf->Affix + i;
+			cnt++;
+		}
+}
+
+static bool
+isAffixInUse(IspellDict *Conf, char flag)
+{
+	int			i;
+
+	for (i = 0; i < Conf->nAffixData; i++)
+		if (strchr(Conf->AffixData[i], flag) != NULL)
+			return true;
+
+	return false;
+}
+
+void
+NISortAffixes(IspellDict *Conf)
+{
+	AFFIX	   *Affix;
+	size_t		i;
+	CMPDAffix  *ptr;
+	int			firstsuffix = Conf->naffixes;
+
+	checkTmpCtx();
+
+	if (Conf->naffixes == 0)
+		return;
+
+	if (Conf->naffixes > 1)
+		qsort((void *) Conf->Affix, Conf->naffixes, sizeof(AFFIX), cmpaffix);
+	Conf->CompoundAffix = ptr = (CMPDAffix *) palloc(sizeof(CMPDAffix) * Conf->naffixes);
+	ptr->affix = NULL;
+
+	for (i = 0; i < Conf->naffixes; i++)
+	{
+		Affix = &(((AFFIX *) Conf->Affix)[i]);
+		if (Affix->type == FF_SUFFIX && i < firstsuffix)
+			firstsuffix = i;
+
+		if ((Affix->flagflags & FF_COMPOUNDFLAG) && Affix->replen > 0 &&
+			isAffixInUse(Conf, (char) Affix->flag))
+		{
+			if (ptr == Conf->CompoundAffix ||
+				ptr->issuffix != (ptr - 1)->issuffix ||
+				strbncmp((const unsigned char *) (ptr - 1)->affix,
+						 (const unsigned char *) Affix->repl,
+						 (ptr - 1)->len))
+			{
+				/* leave only unique and minimals suffixes */
+				ptr->affix = Affix->repl;
+				ptr->len = Affix->replen;
+				ptr->issuffix = (Affix->type == FF_SUFFIX) ? true : false;
+				ptr++;
+			}
+		}
+	}
+	ptr->affix = NULL;
+	Conf->CompoundAffix = (CMPDAffix *) repalloc(Conf->CompoundAffix, sizeof(CMPDAffix) * (ptr - Conf->CompoundAffix + 1));
+
+	Conf->Prefix = mkANode(Conf, 0, firstsuffix, 0, FF_PREFIX);
+	Conf->Suffix = mkANode(Conf, firstsuffix, Conf->naffixes, 0, FF_SUFFIX);
+	mkVoidAffix(Conf, true, firstsuffix);
+	mkVoidAffix(Conf, false, firstsuffix);
+}
+
+static AffixNodeData *
+FindAffixes(AffixNode *node, const char *word, int wrdlen, int *level, int type)
+{
+	AffixNodeData *StopLow,
+			   *StopHigh,
+			   *StopMiddle;
+	uint8 symbol;
+
+	if (node->isvoid)
+	{							/* search void affixes */
+		if (node->data->naff)
+			return node->data;
+		node = node->data->node;
+	}
+
+	while (node && *level < wrdlen)
+	{
+		StopLow = node->data;
+		StopHigh = node->data + node->length;
+		while (StopLow < StopHigh)
+		{
+			StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
+			symbol = GETWCHAR(word, wrdlen, *level, type);
+
+			if (StopMiddle->val == symbol)
+			{
+				(*level)++;
+				if (StopMiddle->naff)
+					return StopMiddle;
+				node = StopMiddle->node;
+				break;
+			}
+			else if (StopMiddle->val < symbol)
+				StopLow = StopMiddle + 1;
+			else
+				StopHigh = StopMiddle;
+		}
+		if (StopLow >= StopHigh)
+			break;
+	}
+	return NULL;
+}
+
+static char *
+CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *newword, int *baselen)
+{
+	/*
+	 * Check compound allow flags
+	 */
+
+	if (flagflags == 0)
+	{
+		if (Affix->flagflags & FF_COMPOUNDONLY)
+			return NULL;
+	}
+	else if (flagflags & FF_COMPOUNDBEGIN)
+	{
+		if (Affix->flagflags & FF_COMPOUNDFORBIDFLAG)
+			return NULL;
+		if ((Affix->flagflags & FF_COMPOUNDBEGIN) == 0)
+			if (Affix->type == FF_SUFFIX)
+				return NULL;
+	}
+	else if (flagflags & FF_COMPOUNDMIDDLE)
+	{
+		if ((Affix->flagflags & FF_COMPOUNDMIDDLE) == 0 ||
+			(Affix->flagflags & FF_COMPOUNDFORBIDFLAG))
+			return NULL;
+	}
+	else if (flagflags & FF_COMPOUNDLAST)
+	{
+		if (Affix->flagflags & FF_COMPOUNDFORBIDFLAG)
+			return NULL;
+		if ((Affix->flagflags & FF_COMPOUNDLAST) == 0)
+			if (Affix->type == FF_PREFIX)
+				return NULL;
+	}
+
+	/*
+	 * make replace pattern of affix
+	 */
+	if (Affix->type == FF_SUFFIX)
+	{
+		strcpy(newword, word);
+		strcpy(newword + len - Affix->replen, Affix->find);
+		if (baselen)			/* store length of non-changed part of word */
+			*baselen = len - Affix->replen;
+	}
+	else
+	{
+		/*
+		 * if prefix is a all non-chaged part's length then all word contains
+		 * only prefix and suffix, so out
+		 */
+		if (baselen && *baselen + strlen(Affix->find) <= Affix->replen)
+			return NULL;
+		strcpy(newword, Affix->find);
+		strcat(newword, word + Affix->replen);
+	}
+
+	/*
+	 * check resulting word
+	 */
+	if (Affix->issimple)
+		return newword;
+	else if (Affix->isregis)
+	{
+		if (RS_execute(&(Affix->reg.regis), newword))
+			return newword;
+	}
+	else
+	{
+		int			err;
+		pg_wchar   *data;
+		size_t		data_len;
+		int			newword_len;
+
+		/* Convert data string to wide characters */
+		newword_len = strlen(newword);
+		data = (pg_wchar *) palloc((newword_len + 1) * sizeof(pg_wchar));
+		data_len = pg_mb2wchar_with_len(newword, data, newword_len);
+
+		if (!(err = pg_regexec(&(Affix->reg.regex), data, data_len, 0, NULL, 0, NULL, 0)))
+		{
+			pfree(data);
+			return newword;
+		}
+		pfree(data);
+	}
+
+	return NULL;
+}
+
+static int
+addToResult(char **forms, char **cur, char *word)
+{
+	if (cur - forms >= MAX_NORM - 1)
+		return 0;
+	if (forms == cur || strcmp(word, *(cur - 1)) != 0)
+	{
+		*cur = pstrdup(word);
+		*(cur+1) = NULL;
+		return 1;
+	}
+
+	return 0;
+}
+
+static char **
+NormalizeSubWord(IspellDict *Conf, char *word, int flag)
+{
+	AffixNodeData *suffix = NULL,
+			   *prefix = NULL;
+	int			slevel = 0,
+				plevel = 0;
+	int			wrdlen = strlen(word),
+				swrdlen;
+	char	  **forms;
+	char	  **cur;
+	char		newword[2 * MAXNORMLEN] = "";
+	char		pnewword[2 * MAXNORMLEN] = "";
+	AffixNode  *snode = Conf->Suffix,
+			   *pnode;
+	int			i,
+				j;
+
+	if (wrdlen > MAXNORMLEN)
+		return NULL;
+	cur = forms = (char **) palloc(MAX_NORM * sizeof(char *));
+	*cur = NULL;
+
+
+	/* Check that the word itself is normal form */
+	if (FindWord(Conf, word, 0, flag))
+	{
+		*cur = pstrdup(word);
+		cur++;
+		*cur = NULL;
+	}
+
+	/* Find all other NORMAL forms of the 'word' (check only prefix) */
+	pnode = Conf->Prefix;
+	plevel = 0;
+	while (pnode)
+	{
+		prefix = FindAffixes(pnode, word, wrdlen, &plevel, FF_PREFIX);
+		if (!prefix)
+			break;
+		for (j = 0; j < prefix->naff; j++)
+		{
+			if (CheckAffix(word, wrdlen, prefix->aff[j], flag, newword, NULL))
+			{
+				/* prefix success */
+				if (FindWord(Conf, newword, prefix->aff[j]->flag, flag))
+					cur += addToResult(forms, cur, newword);
+			}
+		}
+		pnode = prefix->node;
+	}
+
+	/*
+	 * Find all other NORMAL forms of the 'word' (check suffix and then
+	 * prefix)
+	 */
+	while (snode)
+	{
+		int			baselen = 0;
+
+		/* find possible suffix */
+		suffix = FindAffixes(snode, word, wrdlen, &slevel, FF_SUFFIX);
+		if (!suffix)
+			break;
+		/* foreach suffix check affix */
+		for (i = 0; i < suffix->naff; i++)
+		{
+			if (CheckAffix(word, wrdlen, suffix->aff[i], flag, newword, &baselen))
+			{
+				/* suffix success */
+				if (FindWord(Conf, newword, suffix->aff[i]->flag, flag))
+					cur += addToResult(forms, cur, newword);
+
+				/* now we will look changed word with prefixes */
+				pnode = Conf->Prefix;
+				plevel = 0;
+				swrdlen = strlen(newword);
+				while (pnode)
+				{
+					prefix = FindAffixes(pnode, newword, swrdlen, &plevel, FF_PREFIX);
+					if (!prefix)
+						break;
+					for (j = 0; j < prefix->naff; j++)
+					{
+						if (CheckAffix(newword, swrdlen, prefix->aff[j], flag, pnewword, &baselen))
+						{
+							/* prefix success */
+							int			ff = (prefix->aff[j]->flagflags & suffix->aff[i]->flagflags & FF_CROSSPRODUCT) ?
+							0 : prefix->aff[j]->flag;
+
+							if (FindWord(Conf, pnewword, ff, flag))
+								cur += addToResult(forms, cur, pnewword);
+						}
+					}
+					pnode = prefix->node;
+				}
+			}
+		}
+
+		snode = suffix->node;
+	}
+
+	if (cur == forms)
+	{
+		pfree(forms);
+		return (NULL);
+	}
+	return (forms);
+}
+
+typedef struct SplitVar
+{
+	int			nstem;
+	int			lenstem;
+	char	  **stem;
+	struct SplitVar *next;
+} SplitVar;
+
+static int
+CheckCompoundAffixes(CMPDAffix **ptr, char *word, int len, bool CheckInPlace)
+{
+	bool		issuffix;
+
+	if (CheckInPlace)
+	{
+		while ((*ptr)->affix)
+		{
+			if (len > (*ptr)->len && strncmp((*ptr)->affix, word, (*ptr)->len) == 0)
+			{
+				len = (*ptr)->len;
+				issuffix = (*ptr)->issuffix;
+				(*ptr)++;
+				return (issuffix) ? len : 0;
+			}
+			(*ptr)++;
+		}
+	}
+	else
+	{
+		char	   *affbegin;
+
+		while ((*ptr)->affix)
+		{
+			if (len > (*ptr)->len && (affbegin = strstr(word, (*ptr)->affix)) != NULL)
+			{
+				len = (*ptr)->len + (affbegin - word);
+				issuffix = (*ptr)->issuffix;
+				(*ptr)++;
+				return (issuffix) ? len : 0;
+			}
+			(*ptr)++;
+		}
+	}
+	return -1;
+}
+
+static SplitVar *
+CopyVar(SplitVar *s, int makedup)
+{
+	SplitVar   *v = (SplitVar *) palloc(sizeof(SplitVar));
+
+	v->next = NULL;
+	if (s)
+	{
+		int			i;
+
+		v->lenstem = s->lenstem;
+		v->stem = (char **) palloc(sizeof(char *) * v->lenstem);
+		v->nstem = s->nstem;
+		for (i = 0; i < s->nstem; i++)
+			v->stem[i] = (makedup) ? pstrdup(s->stem[i]) : s->stem[i];
+	}
+	else
+	{
+		v->lenstem = 16;
+		v->stem = (char **) palloc(sizeof(char *) * v->lenstem);
+		v->nstem = 0;
+	}
+	return v;
+}
+
+static void
+AddStem(SplitVar *v, char *word)
+{
+	if ( v->nstem >= v->lenstem )
+	{
+		v->lenstem *= 2;
+		v->stem = (char **) repalloc(v->stem, sizeof(char *) * v->lenstem);
+	}
+
+	v->stem[v->nstem] = word;
+	v->nstem++;
+}
+
+static SplitVar *
+SplitToVariants(IspellDict *Conf, SPNode *snode, SplitVar *orig, char *word, int wordlen, int startpos, int minpos)
+{
+	SplitVar   *var = NULL;
+	SPNodeData *StopLow,
+			   *StopHigh,
+			   *StopMiddle = NULL;
+	SPNode	   *node = (snode) ? snode : Conf->Dictionary;
+	int			level = (snode) ? minpos : startpos;	/* recursive
+														 * minpos==level */
+	int			lenaff;
+	CMPDAffix  *caff;
+	char	   *notprobed;
+	int			compoundflag = 0;
+
+	notprobed = (char *) palloc(wordlen);
+	memset(notprobed, 1, wordlen);
+	var = CopyVar(orig, 1);
+
+	while (level < wordlen)
+	{
+		/* find word with epenthetic or/and compound affix */
+		caff = Conf->CompoundAffix;
+		while (level > startpos && (lenaff = CheckCompoundAffixes(&caff, word + level, wordlen - level, (node) ? true : false)) >= 0)
+		{
+			/*
+			 * there is one of compound affixes, so check word for existings
+			 */
+			char		buf[MAXNORMLEN];
+			char	  **subres;
+
+			lenaff = level - startpos + lenaff;
+
+			if (!notprobed[startpos + lenaff - 1])
+				continue;
+
+			if (level + lenaff - 1 <= minpos)
+				continue;
+
+			if ( lenaff >= MAXNORMLEN )
+				continue; /* skip too big value */
+			if (lenaff > 0)
+				memcpy(buf, word + startpos, lenaff);
+			buf[lenaff] = '\0';
+
+			if (level == 0)
+				compoundflag = FF_COMPOUNDBEGIN;
+			else if (level == wordlen - 1)
+				compoundflag = FF_COMPOUNDLAST;
+			else
+				compoundflag = FF_COMPOUNDMIDDLE;
+			subres = NormalizeSubWord(Conf, buf, compoundflag);
+			if (subres)
+			{
+				/* Yes, it was a word from dictionary */
+				SplitVar   *new = CopyVar(var, 0);
+				SplitVar   *ptr = var;
+				char	  **sptr = subres;
+
+				notprobed[startpos + lenaff - 1] = 0;
+
+				while (*sptr)
+				{
+					AddStem( new, *sptr ); 
+					sptr++;
+				}
+				pfree(subres);
+
+				while (ptr->next)
+					ptr = ptr->next;
+				ptr->next = SplitToVariants(Conf, NULL, new, word, wordlen, startpos + lenaff, startpos + lenaff);
+
+				pfree(new->stem);
+				pfree(new);
+			}
+		}
+
+		if (!node)
+			break;
+
+		StopLow = node->data;
+		StopHigh = node->data + node->length;
+		while (StopLow < StopHigh)
+		{
+			StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
+			if (StopMiddle->val == ((uint8 *) (word))[level])
+				break;
+			else if (StopMiddle->val < ((uint8 *) (word))[level])
+				StopLow = StopMiddle + 1;
+			else
+				StopHigh = StopMiddle;
+		}
+
+		if (StopLow < StopHigh)
+		{
+			if (level == FF_COMPOUNDBEGIN)
+				compoundflag = FF_COMPOUNDBEGIN;
+			else if (level == wordlen - 1)
+				compoundflag = FF_COMPOUNDLAST;
+			else
+				compoundflag = FF_COMPOUNDMIDDLE;
+
+			/* find infinitive */
+			if (StopMiddle->isword &&
+				(StopMiddle->compoundflag & compoundflag) &&
+				notprobed[level])
+			{
+				/* ok, we found full compoundallowed word */
+				if (level > minpos)
+				{
+					/* and its length more than minimal */
+					if (wordlen == level + 1)
+					{
+						/* well, it was last word */
+						AddStem( var, pnstrdup(word + startpos, wordlen - startpos) );
+						pfree(notprobed);
+						return var;
+					}
+					else
+					{
+						/* then we will search more big word at the same point */
+						SplitVar   *ptr = var;
+
+						while (ptr->next)
+							ptr = ptr->next;
+						ptr->next = SplitToVariants(Conf, node, var, word, wordlen, startpos, level);
+						/* we can find next word */
+						level++;
+						AddStem( var, pnstrdup(word + startpos, level - startpos) );
+						node = Conf->Dictionary;
+						startpos = level;
+						continue;
+					}
+				}
+			}
+			node = StopMiddle->node;
+		}
+		else
+			node = NULL;
+		level++;
+	}
+
+	AddStem( var, pnstrdup(word + startpos, wordlen - startpos) );
+	pfree(notprobed);
+	return var;
+}
+
+static void
+addNorm( TSLexeme **lres, TSLexeme **lcur, char *word, int flags, uint16 NVariant)
+{
+	if ( *lres == NULL ) 
+		*lcur = *lres = (TSLexeme *) palloc(MAX_NORM * sizeof(TSLexeme));
+
+	if ( *lcur - *lres < MAX_NORM-1 ) { 
+		(*lcur)->lexeme = word;
+		(*lcur)->flags = flags;
+		(*lcur)->nvariant = NVariant;
+		(*lcur)++;
+		(*lcur)->lexeme = NULL;
+	}
+}
+
+TSLexeme *
+NINormalizeWord(IspellDict *Conf, char *word)
+{
+	char	  **res;
+	TSLexeme   *lcur = NULL,
+			   *lres = NULL;
+	uint16		NVariant = 1;
+
+	res = NormalizeSubWord(Conf, word, 0);
+
+	if (res)
+	{
+		char	  **ptr = res;
+
+		while (*ptr && (lcur-lres) < MAX_NORM)
+		{
+			addNorm( &lres, &lcur, *ptr, 0, NVariant++);
+			ptr++;
+		}
+		pfree(res);
+	}
+
+	if (Conf->usecompound)
+	{
+		int			wordlen = strlen(word);
+		SplitVar   *ptr,
+				   *var = SplitToVariants(Conf, NULL, NULL, word, wordlen, 0, -1);
+		int			i;
+
+		while (var)
+		{
+			if (var->nstem > 1)
+			{
+				char	  **subres = NormalizeSubWord(Conf, var->stem[var->nstem - 1], FF_COMPOUNDLAST);
+
+				if (subres)
+				{
+					char	  **subptr = subres;
+
+					while (*subptr)
+					{
+						for (i = 0; i < var->nstem - 1; i++)
+						{
+							addNorm( &lres, &lcur, (subptr == subres) ? var->stem[i] : pstrdup(var->stem[i]), 0, NVariant); 
+						}
+
+						addNorm( &lres, &lcur, *subptr, 0, NVariant); 
+						subptr++;
+						NVariant++;
+					}
+
+					pfree(subres);
+					var->stem[0] = NULL;
+					pfree(var->stem[var->nstem - 1]);
+				}
+			}
+
+			for (i = 0; i < var->nstem && var->stem[i]; i++)
+				pfree(var->stem[i]);
+			ptr = var->next;
+			pfree(var->stem);
+			pfree(var);
+			var = ptr;
+		}
+	}
+
+	return lres;
+}
diff --git a/src/backend/tsearch/synonym_sample.syn b/src/backend/tsearch/synonym_sample.syn
new file mode 100644
index 000000000000..4e2eaeec0c1a
--- /dev/null
+++ b/src/backend/tsearch/synonym_sample.syn
@@ -0,0 +1,4 @@
+postgres	pgsql
+postgresql	pgsql
+postgre	pgsql
+gogle	googl
diff --git a/src/backend/tsearch/thesaurus_sample.ths b/src/backend/tsearch/thesaurus_sample.ths
new file mode 100644
index 000000000000..0b4857ec3340
--- /dev/null
+++ b/src/backend/tsearch/thesaurus_sample.ths
@@ -0,0 +1,18 @@
+#
+# Theasurus config file. Character ':' separates string from replacement, eg
+# sample-words : substitute-words
+#
+# Any substitute-word can be marked by preceding '*' character,
+# which means do not lexize this word
+# Docs: http://www.sai.msu.su/~megera/oddmuse/index.cgi/Thesaurus_dictionary
+
+one two three : *123
+one two : *12
+one : *1
+two : *2
+
+supernovae stars : *sn
+supernovae : *sn
+booking tickets : order invitation cards
+booking ? tickets : order invitation Cards
+
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
new file mode 100644
index 000000000000..cade548e636b
--- /dev/null
+++ b/src/backend/tsearch/to_tsany.c
@@ -0,0 +1,434 @@
+/*-------------------------------------------------------------------------
+ *
+ * to_tsany.c
+ *		to_ts* function definitions
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.8.2.1 2008/03/07 15:29:27 teodor Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "catalog/namespace.h"
+#include "tsearch/ts_cache.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
+
+
+Datum
+get_current_ts_config(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_OID(getTSCurrentConfig(true));
+}
+
+/*
+ * to_tsvector
+ */
+static int
+compareWORD(const void *a, const void *b)
+{
+	if (((ParsedWord *) a)->len == ((ParsedWord *) b)->len)
+	{
+		int			res = strncmp(
+								  ((ParsedWord *) a)->word,
+								  ((ParsedWord *) b)->word,
+								  ((ParsedWord *) b)->len);
+
+		if (res == 0)
+		{
+			if (((ParsedWord *) a)->pos.pos == ((ParsedWord *) b)->pos.pos)
+				return 0;
+
+			return (((ParsedWord *) a)->pos.pos > ((ParsedWord *) b)->pos.pos) ? 1 : -1;
+		}
+		return res;
+	}
+	return (((ParsedWord *) a)->len > ((ParsedWord *) b)->len) ? 1 : -1;
+}
+
+static int
+uniqueWORD(ParsedWord *a, int4 l)
+{
+	ParsedWord *ptr,
+			   *res;
+	int			tmppos;
+
+	if (l == 1)
+	{
+		tmppos = LIMITPOS(a->pos.pos);
+		a->alen = 2;
+		a->pos.apos = (uint16 *) palloc(sizeof(uint16) * a->alen);
+		a->pos.apos[0] = 1;
+		a->pos.apos[1] = tmppos;
+		return l;
+	}
+
+	res = a;
+	ptr = a + 1;
+
+	/*
+	 * Sort words with its positions
+	 */
+	qsort((void *) a, l, sizeof(ParsedWord), compareWORD);
+
+	/*
+	 * Initialize first word and its first position
+	 */
+	tmppos = LIMITPOS(a->pos.pos);
+	a->alen = 2;
+	a->pos.apos = (uint16 *) palloc(sizeof(uint16) * a->alen);
+	a->pos.apos[0] = 1;
+	a->pos.apos[1] = tmppos;
+
+	/*
+	 * Summarize position information for each word
+	 */
+	while (ptr - a < l)
+	{
+		if (!(ptr->len == res->len &&
+			  strncmp(ptr->word, res->word, res->len) == 0))
+		{
+			/*
+			 * Got a new word, so put it in result
+			 */
+			res++;
+			res->len = ptr->len;
+			res->word = ptr->word;
+			tmppos = LIMITPOS(ptr->pos.pos);
+			res->alen = 2;
+			res->pos.apos = (uint16 *) palloc(sizeof(uint16) * res->alen);
+			res->pos.apos[0] = 1;
+			res->pos.apos[1] = tmppos;
+		}
+		else
+		{
+			/*
+			 * The word already exists, so adjust position information. But
+			 * before we should check size of position's array, max allowed
+			 * value for position and uniqueness of position
+			 */
+			pfree(ptr->word);
+			if (res->pos.apos[0] < MAXNUMPOS - 1 && res->pos.apos[res->pos.apos[0]] != MAXENTRYPOS - 1 &&
+				res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos))
+			{
+				if (res->pos.apos[0] + 1 >= res->alen)
+				{
+					res->alen *= 2;
+					res->pos.apos = (uint16 *) repalloc(res->pos.apos, sizeof(uint16) * res->alen);
+				}
+				if (res->pos.apos[0] == 0 || res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos))
+				{
+					res->pos.apos[res->pos.apos[0] + 1] = LIMITPOS(ptr->pos.pos);
+					res->pos.apos[0]++;
+				}
+			}
+		}
+		ptr++;
+	}
+
+	return res + 1 - a;
+}
+
+/*
+ * make value of tsvector, given parsed text
+ */
+TSVector
+make_tsvector(ParsedText *prs)
+{
+	int			i,
+				j,
+				lenstr = 0,
+				totallen;
+	TSVector	in;
+	WordEntry  *ptr;
+	char	   *str;
+	int			stroff;
+
+	prs->curwords = uniqueWORD(prs->words, prs->curwords);
+	for (i = 0; i < prs->curwords; i++)
+	{
+		lenstr += prs->words[i].len;
+		if (prs->words[i].alen)
+		{
+			lenstr = SHORTALIGN(lenstr);
+			lenstr += sizeof(uint16) + prs->words[i].pos.apos[0] * sizeof(WordEntryPos);
+		}
+	}
+
+	if (lenstr > MAXSTRPOS)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("string is too long for tsvector")));
+
+	totallen = CALCDATASIZE(prs->curwords, lenstr);
+	in = (TSVector) palloc0(totallen);
+	SET_VARSIZE(in, totallen);
+	in->size = prs->curwords;
+
+	ptr = ARRPTR(in);
+	str = STRPTR(in);
+	stroff = 0;
+	for (i = 0; i < prs->curwords; i++)
+	{
+		ptr->len = prs->words[i].len;
+		ptr->pos = stroff;
+		memcpy(str + stroff, prs->words[i].word, prs->words[i].len);
+		stroff += prs->words[i].len;
+		pfree(prs->words[i].word);
+		if (prs->words[i].alen)
+		{
+			int			k = prs->words[i].pos.apos[0];
+			WordEntryPos *wptr;
+
+			if (k > 0xFFFF)
+				elog(ERROR, "positions array too long");
+
+			ptr->haspos = 1;
+			stroff = SHORTALIGN(stroff);
+			*(uint16 *) (str + stroff) = (uint16) k;
+			wptr = POSDATAPTR(in, ptr);
+			for (j = 0; j < k; j++)
+			{
+				WEP_SETWEIGHT(wptr[j], 0);
+				WEP_SETPOS(wptr[j], prs->words[i].pos.apos[j + 1]);
+			}
+			stroff += sizeof(uint16) + k * sizeof(WordEntryPos);
+			pfree(prs->words[i].pos.apos);
+		}
+		else
+			ptr->haspos = 0;
+		ptr++;
+	}
+	pfree(prs->words);
+	return in;
+}
+
+Datum
+to_tsvector_byid(PG_FUNCTION_ARGS)
+{
+	Oid			cfgId = PG_GETARG_OID(0);
+	text	   *in = PG_GETARG_TEXT_P(1);
+	ParsedText	prs;
+	TSVector	out;
+
+	prs.lenwords = (VARSIZE(in) - VARHDRSZ) / 6;		/* just estimation of
+														 * word's number */
+	if (prs.lenwords == 0)
+		prs.lenwords = 2;
+	prs.curwords = 0;
+	prs.pos = 0;
+	prs.words = (ParsedWord *) palloc(sizeof(ParsedWord) * prs.lenwords);
+
+	parsetext(cfgId, &prs, VARDATA(in), VARSIZE(in) - VARHDRSZ);
+	PG_FREE_IF_COPY(in, 1);
+
+	if (prs.curwords)
+		out = make_tsvector(&prs);
+	else
+	{
+		pfree(prs.words);
+		out = palloc(CALCDATASIZE(0, 0));
+		SET_VARSIZE(out, CALCDATASIZE(0, 0));
+		out->size = 0;
+	}
+
+	PG_RETURN_POINTER(out);
+}
+
+Datum
+to_tsvector(PG_FUNCTION_ARGS)
+{
+	text	   *in = PG_GETARG_TEXT_P(0);
+	Oid			cfgId;
+
+	cfgId = getTSCurrentConfig(true);
+	PG_RETURN_DATUM(DirectFunctionCall2(to_tsvector_byid,
+										ObjectIdGetDatum(cfgId),
+										PointerGetDatum(in)));
+}
+
+/*
+ * to_tsquery
+ */
+
+
+/*
+ * This function is used for morph parsing.
+ *
+ * The value is passed to parsetext which will call the right dictionary to
+ * lexize the word. If it turns out to be a stopword, we push a QI_VALSTOP
+ * to the stack.
+ *
+ * All words belonging to the same variant are pushed as an ANDed list,
+ * and different variants are ORred together.
+ */
+static void
+pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval, int2 weight)
+{
+	int4		count = 0;
+	ParsedText	prs;
+	uint32		variant,
+				pos,
+				cntvar = 0,
+				cntpos = 0,
+				cnt = 0;
+	Oid			cfg_id = DatumGetObjectId(opaque);		/* the input is actually
+														 * an Oid, not a pointer */
+
+	prs.lenwords = 4;
+	prs.curwords = 0;
+	prs.pos = 0;
+	prs.words = (ParsedWord *) palloc(sizeof(ParsedWord) * prs.lenwords);
+
+	parsetext(cfg_id, &prs, strval, lenval);
+
+	if (prs.curwords > 0)
+	{
+
+		while (count < prs.curwords)
+		{
+			pos = prs.words[count].pos.pos;
+			cntvar = 0;
+			while (count < prs.curwords && pos == prs.words[count].pos.pos)
+			{
+				variant = prs.words[count].nvariant;
+
+				cnt = 0;
+				while (count < prs.curwords && pos == prs.words[count].pos.pos && variant == prs.words[count].nvariant)
+				{
+
+					pushValue(state, prs.words[count].word, prs.words[count].len, weight);
+					pfree(prs.words[count].word);
+					if (cnt)
+						pushOperator(state, OP_AND);
+					cnt++;
+					count++;
+				}
+
+				if (cntvar)
+					pushOperator(state, OP_OR);
+				cntvar++;
+			}
+
+			if (cntpos)
+				pushOperator(state, OP_AND);
+
+			cntpos++;
+		}
+
+		pfree(prs.words);
+
+	}
+	else
+		pushStop(state);
+}
+
+Datum
+to_tsquery_byid(PG_FUNCTION_ARGS)
+{
+	Oid			cfgid = PG_GETARG_OID(0);
+	text	   *in = PG_GETARG_TEXT_P(1);
+	TSQuery		query;
+	QueryItem  *res;
+	int4		len;
+
+	query = parse_tsquery(TextPGetCString(in), pushval_morph, ObjectIdGetDatum(cfgid), false);
+
+	if (query->size == 0)
+		PG_RETURN_TSQUERY(query);
+
+	/* clean out any stopword placeholders from the tree */
+	res = clean_fakeval(GETQUERY(query), &len);
+	if (!res)
+	{
+		SET_VARSIZE(query, HDRSIZETQ);
+		query->size = 0;
+		PG_RETURN_POINTER(query);
+	}
+	memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem));
+
+	/*
+	 * Removing the stopword placeholders might've resulted in fewer
+	 * QueryItems. If so, move the operands up accordingly.
+	 */
+	if ( len != query->size ) {
+		char 		*oldoperand = GETOPERAND(query);
+		int4 lenoperand = VARSIZE(query) - (oldoperand - (char*)query);
+
+		Assert( len < query->size );
+
+		query->size = len;
+		memmove((void *) GETOPERAND(query), oldoperand, VARSIZE(query) - (oldoperand - (char*)query) );
+		SET_VARSIZE(query, COMPUTESIZE( len, lenoperand )); 
+	}
+
+	pfree(res);
+	PG_RETURN_TSQUERY(query);
+}
+
+Datum
+to_tsquery(PG_FUNCTION_ARGS)
+{
+	text	   *in = PG_GETARG_TEXT_P(0);
+	Oid			cfgId;
+
+	cfgId = getTSCurrentConfig(true);
+	PG_RETURN_DATUM(DirectFunctionCall2(to_tsquery_byid,
+										ObjectIdGetDatum(cfgId),
+										PointerGetDatum(in)));
+}
+
+Datum
+plainto_tsquery_byid(PG_FUNCTION_ARGS)
+{
+	Oid			cfgid = PG_GETARG_OID(0);
+	text	   *in = PG_GETARG_TEXT_P(1);
+	TSQuery		query;
+	QueryItem  *res;
+	int4		len;
+
+	query = parse_tsquery(TextPGetCString(in), pushval_morph, ObjectIdGetDatum(cfgid), true);
+
+	if (query->size == 0)
+		PG_RETURN_TSQUERY(query);
+
+	res = clean_fakeval(GETQUERY(query), &len);
+	if (!res)
+	{
+		SET_VARSIZE(query, HDRSIZETQ);
+		query->size = 0;
+		PG_RETURN_POINTER(query);
+	}
+	memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem));
+
+	if ( len != query->size ) {
+		char 		*oldoperand = GETOPERAND(query);
+		int4 lenoperand = VARSIZE(query) - (oldoperand - (char*)query);
+
+		Assert( len < query->size );
+
+		query->size = len;
+		memcpy((void *) GETOPERAND(query), oldoperand, lenoperand );
+		SET_VARSIZE(query, COMPUTESIZE( len, lenoperand )); 
+	}
+
+	pfree(res);
+	PG_RETURN_POINTER(query);
+}
+
+Datum
+plainto_tsquery(PG_FUNCTION_ARGS)
+{
+	text	   *in = PG_GETARG_TEXT_P(0);
+	Oid			cfgId;
+
+	cfgId = getTSCurrentConfig(true);
+	PG_RETURN_DATUM(DirectFunctionCall2(plainto_tsquery_byid,
+										ObjectIdGetDatum(cfgId),
+										PointerGetDatum(in)));
+}
diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c
new file mode 100644
index 000000000000..60c1e1e6a5ad
--- /dev/null
+++ b/src/backend/tsearch/ts_locale.c
@@ -0,0 +1,311 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_locale.c
+ *		locale compatibility layer for tsearch
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.7.2.2 2009/03/02 15:11:25 teodor Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "storage/fd.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+
+static void tsearch_readline_callback(void *arg);
+
+
+#ifdef TS_USE_WIDE
+
+int
+t_isdigit(const char *ptr)
+{
+	int			clen = pg_mblen(ptr);
+	wchar_t		character[2];
+
+	if (clen == 1 || lc_ctype_is_c())
+		return isdigit(TOUCHAR(ptr));
+
+	char2wchar(character, 2, ptr, clen);
+
+	return iswdigit((wint_t) character[0]);
+}
+
+int
+t_isspace(const char *ptr)
+{
+	int			clen = pg_mblen(ptr);
+	wchar_t		character[2];
+
+	if (clen == 1 || lc_ctype_is_c())
+		return isspace(TOUCHAR(ptr));
+
+	char2wchar(character, 2, ptr, clen);
+
+	return iswspace((wint_t) character[0]);
+}
+
+int
+t_isalpha(const char *ptr)
+{
+	int			clen = pg_mblen(ptr);
+	wchar_t		character[2];
+
+	if (clen == 1 || lc_ctype_is_c())
+		return isalpha(TOUCHAR(ptr));
+
+	char2wchar(character, 2, ptr, clen);
+
+	return iswalpha((wint_t) character[0]);
+}
+
+int
+t_isprint(const char *ptr)
+{
+	int			clen = pg_mblen(ptr);
+	wchar_t		character[2];
+
+	if (clen == 1 || lc_ctype_is_c())
+		return isprint(TOUCHAR(ptr));
+
+	char2wchar(character, 2, ptr, clen);
+
+	return iswprint((wint_t) character[0]);
+}
+#endif   /* TS_USE_WIDE */
+
+
+/*
+ * Set up to read a file using tsearch_readline().  This facility is
+ * better than just reading the file directly because it provides error
+ * context pointing to the specific line where a problem is detected.
+ *
+ * Expected usage is:
+ *
+ *		tsearch_readline_state trst;
+ *
+ *		if (!tsearch_readline_begin(&trst, filename))
+ *			ereport(ERROR,
+ *					(errcode(ERRCODE_CONFIG_FILE_ERROR),
+ *					 errmsg("could not open stop-word file \"%s\": %m",
+ *							filename)));
+ *		while ((line = tsearch_readline(&trst)) != NULL)
+ *			process line;
+ *		tsearch_readline_end(&trst);
+ *
+ * Note that the caller supplies the ereport() for file open failure;
+ * this is so that a custom message can be provided.  The filename string
+ * passed to tsearch_readline_begin() must remain valid through
+ * tsearch_readline_end().
+ */
+bool
+tsearch_readline_begin(tsearch_readline_state *stp,
+					   const char *filename)
+{
+	if ((stp->fp = AllocateFile(filename, "r")) == NULL)
+		return false;
+	stp->filename = filename;
+	stp->lineno = 0;
+	stp->curline = NULL;
+	/* Setup error traceback support for ereport() */
+	stp->cb.callback = tsearch_readline_callback;
+	stp->cb.arg = (void *) stp;
+	stp->cb.previous = error_context_stack;
+	error_context_stack = &stp->cb;
+	return true;
+}
+
+/*
+ * Read the next line from a tsearch data file (expected to be in UTF-8), and
+ * convert it to database encoding if needed. The returned string is palloc'd.
+ * NULL return means EOF.
+ */
+char *
+tsearch_readline(tsearch_readline_state *stp)
+{
+	char	   *result;
+
+	stp->lineno++;
+	stp->curline = NULL;
+	result = t_readline(stp->fp);
+	stp->curline = result;
+	return result;
+}
+
+/*
+ * Close down after reading a file with tsearch_readline()
+ */
+void
+tsearch_readline_end(tsearch_readline_state *stp)
+{
+	FreeFile(stp->fp);
+	/* Pop the error context stack */
+	error_context_stack = stp->cb.previous;
+}
+
+/*
+ * Error context callback for errors occurring while reading a tsearch
+ * configuration file.
+ */
+static void
+tsearch_readline_callback(void *arg)
+{
+	tsearch_readline_state *stp = (tsearch_readline_state *) arg;
+
+	/*
+	 * We can't include the text of the config line for errors that occur
+	 * during t_readline() itself.  This is only partly a consequence of
+	 * our arms-length use of that routine: the major cause of such
+	 * errors is encoding violations, and we daren't try to print error
+	 * messages containing badly-encoded data.
+	 */
+	if (stp->curline)
+		errcontext("line %d of configuration file \"%s\": \"%s\"",
+				   stp->lineno,
+				   stp->filename,
+				   stp->curline);
+	else
+		errcontext("line %d of configuration file \"%s\"",
+				   stp->lineno,
+				   stp->filename);
+}
+
+
+/*
+ * Read the next line from a tsearch data file (expected to be in UTF-8), and
+ * convert it to database encoding if needed. The returned string is palloc'd.
+ * NULL return means EOF.
+ *
+ * Note: direct use of this function is now deprecated.  Go through
+ * tsearch_readline() to provide better error reporting.
+ */
+char *
+t_readline(FILE *fp)
+{
+	int			len;
+	char	   *recoded;
+	char		buf[4096];		/* lines must not be longer than this */
+
+	if (fgets(buf, sizeof(buf), fp) == NULL)
+		return NULL;
+
+	len = strlen(buf);
+
+	/* Make sure the input is valid UTF-8 */
+	(void) pg_verify_mbstr(PG_UTF8, buf, len, false);
+
+	/* And convert */
+	recoded = (char *) pg_do_encoding_conversion((unsigned char *) buf,
+												 len,
+												 PG_UTF8,
+												 GetDatabaseEncoding());
+
+	if (recoded == NULL)		/* should not happen */
+		elog(ERROR, "encoding conversion failed");
+
+	if (recoded == buf)
+	{
+		/*
+		 * conversion didn't pstrdup, so we must. We can use the length of the
+		 * original string, because no conversion was done.
+		 */
+		recoded = pnstrdup(recoded, len);
+	}
+
+	return recoded;
+}
+
+/*
+ * lowerstr --- fold null-terminated string to lower case
+ *
+ * Returned string is palloc'd
+ */
+char *
+lowerstr(const char *str)
+{
+	return lowerstr_with_len(str, strlen(str));
+}
+
+/*
+ * lowerstr_with_len --- fold string to lower case
+ *
+ * Input string need not be null-terminated.
+ *
+ * Returned string is palloc'd
+ */
+char *
+lowerstr_with_len(const char *str, int len)
+{
+	char	   *out;
+
+	if (len == 0)
+		return pstrdup("");
+
+#ifdef TS_USE_WIDE
+
+	/*
+	 * Use wide char code only when max encoding length > 1 and ctype != C.
+	 * Some operating systems fail with multi-byte encodings and a C locale.
+	 * Also, for a C locale there is no need to process as multibyte. From
+	 * backend/utils/adt/oracle_compat.c Teodor
+	 */
+	if (pg_database_encoding_max_length() > 1 && !lc_ctype_is_c())
+	{
+		wchar_t    *wstr,
+				   *wptr;
+		int			wlen;
+
+		/*
+		 * alloc number of wchar_t for worst case, len contains number of
+		 * bytes >= number of characters and alloc 1 wchar_t for 0, because
+		 * wchar2char wants zero-terminated string
+		 */
+		wptr = wstr = (wchar_t *) palloc(sizeof(wchar_t) * (len + 1));
+
+		wlen = char2wchar(wstr, len + 1, str, len);
+		Assert(wlen <= len);
+
+		while (*wptr)
+		{
+			*wptr = towlower((wint_t) *wptr);
+			wptr++;
+		}
+
+		/*
+		 * Alloc result string for worst case + '\0'
+		 */
+		len = pg_database_encoding_max_length() * wlen + 1;
+		out = (char *) palloc(len);
+
+		wlen = wchar2char(out, wstr, len);
+
+		pfree(wstr);
+
+		if (wlen < 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
+					 errmsg("conversion from wchar_t to server encoding failed: %m")));
+		Assert(wlen < len);
+	}
+	else
+#endif   /* TS_USE_WIDE */
+	{
+		const char *ptr = str;
+		char	   *outptr;
+
+		outptr = out = (char *) palloc(sizeof(char) * (len + 1));
+		while ((ptr - str) < len && *ptr)
+		{
+			*outptr++ = tolower(TOUCHAR(ptr));
+			ptr++;
+		}
+		*outptr = '\0';
+	}
+
+	return out;
+}
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
new file mode 100644
index 000000000000..f77f5f22e893
--- /dev/null
+++ b/src/backend/tsearch/ts_parse.c
@@ -0,0 +1,633 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_parse.c
+ *		main parse functions for tsearch
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.7.2.2 2009/08/30 16:53:45 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "tsearch/ts_cache.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+
+#define IGNORE_LONGLEXEME	1
+
+/*
+ * Lexize subsystem
+ */
+
+typedef struct ParsedLex
+{
+	int			type;
+	char	   *lemm;
+	int			lenlemm;
+	bool		resfollow;
+	struct ParsedLex *next;
+} ParsedLex;
+
+typedef struct ListParsedLex
+{
+	ParsedLex  *head;
+	ParsedLex  *tail;
+} ListParsedLex;
+
+typedef struct
+{
+	TSConfigCacheEntry *cfg;
+	Oid			curDictId;
+	int			posDict;
+	DictSubState dictState;
+	ParsedLex  *curSub;
+	ListParsedLex towork;		/* current list to work */
+	ListParsedLex waste;		/* list of lexemes that already lexized */
+
+	/*
+	 * fields to store last variant to lexize (basically, thesaurus or similar
+	 * to, which wants	several lexemes
+	 */
+
+	ParsedLex  *lastRes;
+	TSLexeme   *tmpRes;
+} LexizeData;
+
+static void
+LexizeInit(LexizeData *ld, TSConfigCacheEntry *cfg)
+{
+	ld->cfg = cfg;
+	ld->curDictId = InvalidOid;
+	ld->posDict = 0;
+	ld->towork.head = ld->towork.tail = ld->curSub = NULL;
+	ld->waste.head = ld->waste.tail = NULL;
+	ld->lastRes = NULL;
+	ld->tmpRes = NULL;
+}
+
+static void
+LPLAddTail(ListParsedLex *list, ParsedLex *newpl)
+{
+	if (list->tail)
+	{
+		list->tail->next = newpl;
+		list->tail = newpl;
+	}
+	else
+		list->head = list->tail = newpl;
+	newpl->next = NULL;
+}
+
+static ParsedLex *
+LPLRemoveHead(ListParsedLex *list)
+{
+	ParsedLex  *res = list->head;
+
+	if (list->head)
+		list->head = list->head->next;
+
+	if (list->head == NULL)
+		list->tail = NULL;
+
+	return res;
+}
+
+static void
+LexizeAddLemm(LexizeData *ld, int type, char *lemm, int lenlemm)
+{
+	ParsedLex  *newpl = (ParsedLex *) palloc(sizeof(ParsedLex));
+
+	newpl->type = type;
+	newpl->lemm = lemm;
+	newpl->lenlemm = lenlemm;
+	LPLAddTail(&ld->towork, newpl);
+	ld->curSub = ld->towork.tail;
+}
+
+static void
+RemoveHead(LexizeData *ld)
+{
+	LPLAddTail(&ld->waste, LPLRemoveHead(&ld->towork));
+
+	ld->posDict = 0;
+}
+
+static void
+setCorrLex(LexizeData *ld, ParsedLex **correspondLexem)
+{
+	if (correspondLexem)
+	{
+		*correspondLexem = ld->waste.head;
+	}
+	else
+	{
+		ParsedLex  *tmp,
+				   *ptr = ld->waste.head;
+
+		while (ptr)
+		{
+			tmp = ptr->next;
+			pfree(ptr);
+			ptr = tmp;
+		}
+	}
+	ld->waste.head = ld->waste.tail = NULL;
+}
+
+static void
+moveToWaste(LexizeData *ld, ParsedLex *stop)
+{
+	bool		go = true;
+
+	while (ld->towork.head && go)
+	{
+		if (ld->towork.head == stop)
+		{
+			ld->curSub = stop->next;
+			go = false;
+		}
+		RemoveHead(ld);
+	}
+}
+
+static void
+setNewTmpRes(LexizeData *ld, ParsedLex *lex, TSLexeme *res)
+{
+	if (ld->tmpRes)
+	{
+		TSLexeme   *ptr;
+
+		for (ptr = ld->tmpRes; ptr->lexeme; ptr++)
+			pfree(ptr->lexeme);
+		pfree(ld->tmpRes);
+	}
+	ld->tmpRes = res;
+	ld->lastRes = lex;
+}
+
+static TSLexeme *
+LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
+{
+	int			i;
+	ListDictionary *map;
+	TSDictionaryCacheEntry *dict;
+	TSLexeme   *res;
+
+	if (ld->curDictId == InvalidOid)
+	{
+		/*
+		 * usial mode: dictionary wants only one word, but we should keep in
+		 * mind that we should go through all stack
+		 */
+
+		while (ld->towork.head)
+		{
+			ParsedLex  *curVal = ld->towork.head;
+
+			map = ld->cfg->map + curVal->type;
+
+			if (curVal->type == 0 || curVal->type >= ld->cfg->lenmap || map->len == 0)
+			{
+				/* skip this type of lexeme */
+				RemoveHead(ld);
+				continue;
+			}
+
+			for (i = ld->posDict; i < map->len; i++)
+			{
+				dict = lookup_ts_dictionary_cache(map->dictIds[i]);
+
+				ld->dictState.isend = ld->dictState.getnext = false;
+				ld->dictState.private = NULL;
+				res = (TSLexeme *) DatumGetPointer(FunctionCall4(
+															 &(dict->lexize),
+											 PointerGetDatum(dict->dictData),
+											   PointerGetDatum(curVal->lemm),
+											  Int32GetDatum(curVal->lenlemm),
+											  PointerGetDatum(&ld->dictState)
+																 ));
+
+				if (ld->dictState.getnext)
+				{
+					/*
+					 * dictionary wants next word, so setup and store current
+					 * position and go to multiword mode
+					 */
+
+					ld->curDictId = DatumGetObjectId(map->dictIds[i]);
+					ld->posDict = i + 1;
+					ld->curSub = curVal->next;
+					if (res)
+						setNewTmpRes(ld, curVal, res);
+					return LexizeExec(ld, correspondLexem);
+				}
+
+				if (!res)		/* dictionary doesn't know this lexeme */
+					continue;
+
+				RemoveHead(ld);
+				setCorrLex(ld, correspondLexem);
+				return res;
+			}
+
+			RemoveHead(ld);
+		}
+	}
+	else
+	{							/* curDictId is valid */
+		dict = lookup_ts_dictionary_cache(ld->curDictId);
+
+		/*
+		 * Dictionary ld->curDictId asks  us about following words
+		 */
+
+		while (ld->curSub)
+		{
+			ParsedLex  *curVal = ld->curSub;
+
+			map = ld->cfg->map + curVal->type;
+
+			if (curVal->type != 0)
+			{
+				bool		dictExists = false;
+
+				if (curVal->type >= ld->cfg->lenmap || map->len == 0)
+				{
+					/* skip this type of lexeme */
+					ld->curSub = curVal->next;
+					continue;
+				}
+
+				/*
+				 * We should be sure that current type of lexeme is recognized
+				 * by our dictinonary: we just check is it exist in list of
+				 * dictionaries ?
+				 */
+				for (i = 0; i < map->len && !dictExists; i++)
+					if (ld->curDictId == DatumGetObjectId(map->dictIds[i]))
+						dictExists = true;
+
+				if (!dictExists)
+				{
+					/*
+					 * Dictionary can't work with current tpe of lexeme,
+					 * return to basic mode and redo all stored lexemes
+					 */
+					ld->curDictId = InvalidOid;
+					return LexizeExec(ld, correspondLexem);
+				}
+			}
+
+			ld->dictState.isend = (curVal->type == 0) ? true : false;
+			ld->dictState.getnext = false;
+
+			res = (TSLexeme *) DatumGetPointer(FunctionCall4(
+															 &(dict->lexize),
+											 PointerGetDatum(dict->dictData),
+											   PointerGetDatum(curVal->lemm),
+											  Int32GetDatum(curVal->lenlemm),
+											  PointerGetDatum(&ld->dictState)
+															 ));
+
+			if (ld->dictState.getnext)
+			{
+				/* Dictionary wants one more */
+				ld->curSub = curVal->next;
+				if (res)
+					setNewTmpRes(ld, curVal, res);
+				continue;
+			}
+
+			if (res || ld->tmpRes)
+			{
+				/*
+				 * Dictionary normalizes lexemes, so we remove from stack all
+				 * used lexemes, return to basic mode and redo end of stack
+				 * (if it exists)
+				 */
+				if (res)
+				{
+					moveToWaste(ld, ld->curSub);
+				}
+				else
+				{
+					res = ld->tmpRes;
+					moveToWaste(ld, ld->lastRes);
+				}
+
+				/* reset to initial state */
+				ld->curDictId = InvalidOid;
+				ld->posDict = 0;
+				ld->lastRes = NULL;
+				ld->tmpRes = NULL;
+				setCorrLex(ld, correspondLexem);
+				return res;
+			}
+
+			/*
+			 * Dict don't want next lexem and didn't recognize anything, redo
+			 * from ld->towork.head
+			 */
+			ld->curDictId = InvalidOid;
+			return LexizeExec(ld, correspondLexem);
+		}
+	}
+
+	setCorrLex(ld, correspondLexem);
+	return NULL;
+}
+
+/*
+ * Parse string and lexize words.
+ *
+ * prs will be filled in.
+ */
+void
+parsetext(Oid cfgId, ParsedText *prs, char *buf, int buflen)
+{
+	int			type,
+				lenlemm;
+	char	   *lemm = NULL;
+	LexizeData	ldata;
+	TSLexeme   *norms;
+	TSConfigCacheEntry *cfg;
+	TSParserCacheEntry *prsobj;
+	void	   *prsdata;
+
+	cfg = lookup_ts_config_cache(cfgId);
+	prsobj = lookup_ts_parser_cache(cfg->prsId);
+
+	prsdata = (void *) DatumGetPointer(FunctionCall2(&prsobj->prsstart,
+													 PointerGetDatum(buf),
+													 Int32GetDatum(buflen)));
+
+	LexizeInit(&ldata, cfg);
+
+	do
+	{
+		type = DatumGetInt32(FunctionCall3(&(prsobj->prstoken),
+										   PointerGetDatum(prsdata),
+										   PointerGetDatum(&lemm),
+										   PointerGetDatum(&lenlemm)));
+
+		if (type > 0 && lenlemm >= MAXSTRLEN)
+		{
+#ifdef IGNORE_LONGLEXEME
+			ereport(NOTICE,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("word is too long to be indexed"),
+					 errdetail("Words longer than %d characters are ignored.",
+							   MAXSTRLEN)));
+			continue;
+#else
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("word is too long to be indexed"),
+					 errdetail("Words longer than %d characters are ignored.",
+							   MAXSTRLEN)));
+#endif
+		}
+
+		LexizeAddLemm(&ldata, type, lemm, lenlemm);
+
+		while ((norms = LexizeExec(&ldata, NULL)) != NULL)
+		{
+			TSLexeme   *ptr = norms;
+
+			prs->pos++;			/* set pos */
+
+			while (ptr->lexeme)
+			{
+				if (prs->curwords == prs->lenwords)
+				{
+					prs->lenwords *= 2;
+					prs->words = (ParsedWord *) repalloc((void *) prs->words, prs->lenwords * sizeof(ParsedWord));
+				}
+
+				if (ptr->flags & TSL_ADDPOS)
+					prs->pos++;
+				prs->words[prs->curwords].len = strlen(ptr->lexeme);
+				prs->words[prs->curwords].word = ptr->lexeme;
+				prs->words[prs->curwords].nvariant = ptr->nvariant;
+				prs->words[prs->curwords].alen = 0;
+				prs->words[prs->curwords].pos.pos = LIMITPOS(prs->pos);
+				ptr++;
+				prs->curwords++;
+			}
+			pfree(norms);
+		}
+	} while (type > 0);
+
+	FunctionCall1(&(prsobj->prsend), PointerGetDatum(prsdata));
+}
+
+/*
+ * Headline framework
+ */
+static void
+hladdword(HeadlineParsedText *prs, char *buf, int buflen, int type)
+{
+	while (prs->curwords >= prs->lenwords)
+	{
+		prs->lenwords *= 2;
+		prs->words = (HeadlineWordEntry *) repalloc((void *) prs->words, prs->lenwords * sizeof(HeadlineWordEntry));
+	}
+	memset(&(prs->words[prs->curwords]), 0, sizeof(HeadlineWordEntry));
+	prs->words[prs->curwords].type = (uint8) type;
+	prs->words[prs->curwords].len = buflen;
+	prs->words[prs->curwords].word = palloc(buflen);
+	memcpy(prs->words[prs->curwords].word, buf, buflen);
+	prs->curwords++;
+}
+
+static void
+hlfinditem(HeadlineParsedText *prs, TSQuery query, char *buf, int buflen)
+{
+	int			i;
+	QueryItem  *item = GETQUERY(query);
+	HeadlineWordEntry *word;
+
+	while (prs->curwords + query->size >= prs->lenwords)
+	{
+		prs->lenwords *= 2;
+		prs->words = (HeadlineWordEntry *) repalloc((void *) prs->words, prs->lenwords * sizeof(HeadlineWordEntry));
+	}
+
+	word = &(prs->words[prs->curwords - 1]);
+	for (i = 0; i < query->size; i++)
+	{
+		if (item->type == QI_VAL &&
+			item->operand.length == buflen &&
+		strncmp(GETOPERAND(query) + item->operand.distance, buf, buflen) == 0)
+		{
+			if (word->item)
+			{
+				memcpy(&(prs->words[prs->curwords]), word, sizeof(HeadlineWordEntry));
+				prs->words[prs->curwords].item = &item->operand;
+				prs->words[prs->curwords].repeated = 1;
+				prs->curwords++;
+			}
+			else
+				word->item = &item->operand;
+		}
+		item++;
+	}
+}
+
+static void
+addHLParsedLex(HeadlineParsedText *prs, TSQuery query, ParsedLex *lexs, TSLexeme *norms)
+{
+	ParsedLex  *tmplexs;
+	TSLexeme   *ptr;
+
+	while (lexs)
+	{
+
+		if (lexs->type > 0)
+			hladdword(prs, lexs->lemm, lexs->lenlemm, lexs->type);
+
+		ptr = norms;
+		while (ptr && ptr->lexeme)
+		{
+			hlfinditem(prs, query, ptr->lexeme, strlen(ptr->lexeme));
+			ptr++;
+		}
+
+		tmplexs = lexs->next;
+		pfree(lexs);
+		lexs = tmplexs;
+	}
+
+	if (norms)
+	{
+		ptr = norms;
+		while (ptr->lexeme)
+		{
+			pfree(ptr->lexeme);
+			ptr++;
+		}
+		pfree(norms);
+	}
+}
+
+void
+hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query, char *buf, int buflen)
+{
+	int			type,
+				lenlemm;
+	char	   *lemm = NULL;
+	LexizeData	ldata;
+	TSLexeme   *norms;
+	ParsedLex  *lexs;
+	TSConfigCacheEntry *cfg;
+	TSParserCacheEntry *prsobj;
+	void	   *prsdata;
+
+	cfg = lookup_ts_config_cache(cfgId);
+	prsobj = lookup_ts_parser_cache(cfg->prsId);
+
+	prsdata = (void *) DatumGetPointer(FunctionCall2(&(prsobj->prsstart),
+													 PointerGetDatum(buf),
+													 Int32GetDatum(buflen)));
+
+	LexizeInit(&ldata, cfg);
+
+	do
+	{
+		type = DatumGetInt32(FunctionCall3(&(prsobj->prstoken),
+										   PointerGetDatum(prsdata),
+										   PointerGetDatum(&lemm),
+										   PointerGetDatum(&lenlemm)));
+
+		if (type > 0 && lenlemm >= MAXSTRLEN)
+		{
+#ifdef IGNORE_LONGLEXEME
+			ereport(NOTICE,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("word is too long to be indexed"),
+					 errdetail("Words longer than %d characters are ignored.",
+							   MAXSTRLEN)));
+			continue;
+#else
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("word is too long to be indexed"),
+					 errdetail("Words longer than %d characters are ignored.",
+							   MAXSTRLEN)));
+#endif
+		}
+
+		LexizeAddLemm(&ldata, type, lemm, lenlemm);
+
+		do
+		{
+			if ((norms = LexizeExec(&ldata, &lexs)) != NULL)
+				addHLParsedLex(prs, query, lexs, norms);
+			else
+				addHLParsedLex(prs, query, lexs, NULL);
+		} while (norms);
+
+	} while (type > 0);
+
+	FunctionCall1(&(prsobj->prsend), PointerGetDatum(prsdata));
+}
+
+text *
+generateHeadline(HeadlineParsedText *prs)
+{
+	text	   *out;
+	int			len = 128;
+	char	   *ptr;
+	HeadlineWordEntry *wrd = prs->words;
+
+	out = (text *) palloc(len);
+	ptr = ((char *) out) + VARHDRSZ;
+
+	while (wrd - prs->words < prs->curwords)
+	{
+		while (wrd->len + prs->stopsellen + prs->startsellen + (ptr - ((char *) out)) >= len)
+		{
+			int			dist = ptr - ((char *) out);
+
+			len *= 2;
+			out = (text *) repalloc(out, len);
+			ptr = ((char *) out) + dist;
+		}
+
+		if (wrd->in && !wrd->repeated)
+		{
+			if (wrd->replace)
+			{
+				*ptr = ' ';
+				ptr++;
+			}
+			else if (!wrd->skip)
+			{
+				if (wrd->selected)
+				{
+					memcpy(ptr, prs->startsel, prs->startsellen);
+					ptr += prs->startsellen;
+				}
+				memcpy(ptr, wrd->word, wrd->len);
+				ptr += wrd->len;
+				if (wrd->selected)
+				{
+					memcpy(ptr, prs->stopsel, prs->stopsellen);
+					ptr += prs->stopsellen;
+				}
+			}
+		}
+		else if (!wrd->repeated)
+			pfree(wrd->word);
+
+		wrd++;
+	}
+
+	SET_VARSIZE(out, ptr - ((char *) out));
+	return out;
+}
diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c
new file mode 100644
index 000000000000..913aff6e1f93
--- /dev/null
+++ b/src/backend/tsearch/ts_utils.c
@@ -0,0 +1,154 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_utils.c
+ *		various support functions
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.9.2.2 2008/06/19 16:52:31 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include <ctype.h>
+
+#include "miscadmin.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+
+
+/*
+ * Given the base name and extension of a tsearch config file, return
+ * its full path name.	The base name is assumed to be user-supplied,
+ * and is checked to prevent pathname attacks.	The extension is assumed
+ * to be safe.
+ *
+ * The result is a palloc'd string.
+ */
+char *
+get_tsearch_config_filename(const char *basename,
+							const char *extension)
+{
+	char		sharepath[MAXPGPATH];
+	char	   *result;
+
+	/*
+	 * We limit the basename to contain a-z, 0-9, and underscores.	This may
+	 * be overly restrictive, but we don't want to allow access to anything
+	 * outside the tsearch_data directory, so for instance '/' *must* be
+	 * rejected, and on some platforms '\' and ':' are risky as well. Allowing
+	 * uppercase might result in incompatible behavior between case-sensitive
+	 * and case-insensitive filesystems, and non-ASCII characters create other
+	 * interesting risks, so on the whole a tight policy seems best.
+	 */
+	if (strspn(basename, "abcdefghijklmnopqrstuvwxyz0123456789_") != strlen(basename))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("invalid text search configuration file name \"%s\"",
+						basename)));
+
+	get_share_path(my_exec_path, sharepath);
+	result = palloc(MAXPGPATH);
+	snprintf(result, MAXPGPATH, "%s/tsearch_data/%s.%s",
+			 sharepath, basename, extension);
+
+	return result;
+}
+
+static int
+comparestr(const void *a, const void *b)
+{
+	return strcmp(*(char **) a, *(char **) b);
+}
+
+/*
+ * Reads a stop-word file. Each word is run through 'wordop'
+ * function, if given.	wordop may either modify the input in-place,
+ * or palloc a new version.
+ */
+void
+readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *))
+{
+	char	  **stop = NULL;
+
+	s->len = 0;
+	if (fname && *fname)
+	{
+		char	   *filename = get_tsearch_config_filename(fname, "stop");
+		tsearch_readline_state trst;
+		char	   *line;
+		int			reallen = 0;
+
+		if (!tsearch_readline_begin(&trst, filename))
+			ereport(ERROR,
+					(errcode(ERRCODE_CONFIG_FILE_ERROR),
+					 errmsg("could not open stop-word file \"%s\": %m",
+							filename)));
+
+		while ((line = tsearch_readline(&trst)) != NULL)
+		{
+			char	   *pbuf = line;
+
+			/* Trim trailing space */
+			while (*pbuf && !t_isspace(pbuf))
+				pbuf += pg_mblen(pbuf);
+			*pbuf = '\0';
+
+			/* Skip empty lines */
+			if (*line == '\0')
+			{
+				pfree(line);
+				continue;
+			}
+
+			if (s->len >= reallen)
+			{
+				if (reallen == 0)
+				{
+					reallen = 64;
+					stop = (char **) palloc(sizeof(char *) * reallen);
+				}
+				else
+				{
+					reallen *= 2;
+					stop = (char **) repalloc((void *) stop,
+											  sizeof(char *) * reallen);
+				}
+			}
+
+			if (wordop)
+			{
+				stop[s->len] = wordop(line);
+				if (stop[s->len] != line)
+					pfree(line);
+			}
+			else
+				stop[s->len] = line;
+
+			(s->len)++;
+		}
+
+		tsearch_readline_end(&trst);
+		pfree(filename);
+	}
+
+	s->stop = stop;
+
+	/* Sort to allow binary searching */
+	if (s->stop && s->len > 0)
+		qsort(s->stop, s->len, sizeof(char *), comparestr);
+}
+
+bool
+searchstoplist(StopList *s, char *key)
+{
+	return (s->stop && s->len > 0 &&
+			bsearch(&key, s->stop, s->len,
+					sizeof(char *), comparestr)) ? true : false;
+}
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
new file mode 100644
index 000000000000..7a16d39fbe9b
--- /dev/null
+++ b/src/backend/tsearch/wparser.c
@@ -0,0 +1,372 @@
+/*-------------------------------------------------------------------------
+ *
+ * wparser.c
+ *		Standard interface to word parser
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.8 2008/01/15 18:22:47 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "funcapi.h"
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/skey.h"
+#include "catalog/indexing.h"
+#include "catalog/namespace.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_type.h"
+#include "commands/defrem.h"
+#include "tsearch/ts_cache.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+#include "utils/fmgroids.h"
+#include "utils/rel.h"
+#include "utils/syscache.h"
+
+
+/******sql-level interface******/
+
+typedef struct
+{
+	int			cur;
+	LexDescr   *list;
+} TSTokenTypeStorage;
+
+static void
+tt_setup_firstcall(FuncCallContext *funcctx, Oid prsid)
+{
+	TupleDesc	tupdesc;
+	MemoryContext oldcontext;
+	TSTokenTypeStorage *st;
+	TSParserCacheEntry *prs = lookup_ts_parser_cache(prsid);
+
+	if (!OidIsValid(prs->lextypeOid))
+		elog(ERROR, "method lextype isn't defined for text search parser %u",
+			 prsid);
+
+	oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+
+	st = (TSTokenTypeStorage *) palloc(sizeof(TSTokenTypeStorage));
+	st->cur = 0;
+	/* OidFunctionCall0 is absent */
+	st->list = (LexDescr *) DatumGetPointer(OidFunctionCall1(prs->lextypeOid,
+															 (Datum) 0));
+	funcctx->user_fctx = (void *) st;
+
+	tupdesc = CreateTemplateTupleDesc(3, false);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "tokid",
+					   INT4OID, -1, 0);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "alias",
+					   TEXTOID, -1, 0);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "description",
+					   TEXTOID, -1, 0);
+
+	funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
+	MemoryContextSwitchTo(oldcontext);
+}
+
+static Datum
+tt_process_call(FuncCallContext *funcctx)
+{
+	TSTokenTypeStorage *st;
+
+	st = (TSTokenTypeStorage *) funcctx->user_fctx;
+	if (st->list && st->list[st->cur].lexid)
+	{
+		Datum		result;
+		char	   *values[3];
+		char		txtid[16];
+		HeapTuple	tuple;
+
+		sprintf(txtid, "%d", st->list[st->cur].lexid);
+		values[0] = txtid;
+		values[1] = st->list[st->cur].alias;
+		values[2] = st->list[st->cur].descr;
+
+		tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
+		result = HeapTupleGetDatum(tuple);
+
+		pfree(values[1]);
+		pfree(values[2]);
+		st->cur++;
+		return result;
+	}
+	if (st->list)
+		pfree(st->list);
+	pfree(st);
+	return (Datum) 0;
+}
+
+Datum
+ts_token_type_byid(PG_FUNCTION_ARGS)
+{
+	FuncCallContext *funcctx;
+	Datum		result;
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		funcctx = SRF_FIRSTCALL_INIT();
+		tt_setup_firstcall(funcctx, PG_GETARG_OID(0));
+	}
+
+	funcctx = SRF_PERCALL_SETUP();
+
+	if ((result = tt_process_call(funcctx)) != (Datum) 0)
+		SRF_RETURN_NEXT(funcctx, result);
+	SRF_RETURN_DONE(funcctx);
+}
+
+Datum
+ts_token_type_byname(PG_FUNCTION_ARGS)
+{
+	FuncCallContext *funcctx;
+	Datum		result;
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		text	   *prsname = PG_GETARG_TEXT_P(0);
+		Oid			prsId;
+
+		funcctx = SRF_FIRSTCALL_INIT();
+		prsId = TSParserGetPrsid(textToQualifiedNameList(prsname), false);
+		tt_setup_firstcall(funcctx, prsId);
+	}
+
+	funcctx = SRF_PERCALL_SETUP();
+
+	if ((result = tt_process_call(funcctx)) != (Datum) 0)
+		SRF_RETURN_NEXT(funcctx, result);
+	SRF_RETURN_DONE(funcctx);
+}
+
+typedef struct
+{
+	int			type;
+	char	   *lexeme;
+} LexemeEntry;
+
+typedef struct
+{
+	int			cur;
+	int			len;
+	LexemeEntry *list;
+} PrsStorage;
+
+
+static void
+prs_setup_firstcall(FuncCallContext *funcctx, Oid prsid, text *txt)
+{
+	TupleDesc	tupdesc;
+	MemoryContext oldcontext;
+	PrsStorage *st;
+	TSParserCacheEntry *prs = lookup_ts_parser_cache(prsid);
+	char	   *lex = NULL;
+	int			llen = 0,
+				type = 0;
+	void	   *prsdata;
+
+	oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+
+	st = (PrsStorage *) palloc(sizeof(PrsStorage));
+	st->cur = 0;
+	st->len = 16;
+	st->list = (LexemeEntry *) palloc(sizeof(LexemeEntry) * st->len);
+
+	prsdata = (void *) DatumGetPointer(FunctionCall2(&prs->prsstart,
+											   PointerGetDatum(VARDATA(txt)),
+									Int32GetDatum(VARSIZE(txt) - VARHDRSZ)));
+
+	while ((type = DatumGetInt32(FunctionCall3(&prs->prstoken,
+											   PointerGetDatum(prsdata),
+											   PointerGetDatum(&lex),
+											   PointerGetDatum(&llen)))) != 0)
+	{
+		if (st->cur >= st->len)
+		{
+			st->len = 2 * st->len;
+			st->list = (LexemeEntry *) repalloc(st->list, sizeof(LexemeEntry) * st->len);
+		}
+		st->list[st->cur].lexeme = palloc(llen + 1);
+		memcpy(st->list[st->cur].lexeme, lex, llen);
+		st->list[st->cur].lexeme[llen] = '\0';
+		st->list[st->cur].type = type;
+		st->cur++;
+	}
+
+	FunctionCall1(&prs->prsend, PointerGetDatum(prsdata));
+
+	st->len = st->cur;
+	st->cur = 0;
+
+	funcctx->user_fctx = (void *) st;
+	tupdesc = CreateTemplateTupleDesc(2, false);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "tokid",
+					   INT4OID, -1, 0);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "token",
+					   TEXTOID, -1, 0);
+
+	funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
+	MemoryContextSwitchTo(oldcontext);
+}
+
+static Datum
+prs_process_call(FuncCallContext *funcctx)
+{
+	PrsStorage *st;
+
+	st = (PrsStorage *) funcctx->user_fctx;
+	if (st->cur < st->len)
+	{
+		Datum		result;
+		char	   *values[2];
+		char		tid[16];
+		HeapTuple	tuple;
+
+		values[0] = tid;
+		sprintf(tid, "%d", st->list[st->cur].type);
+		values[1] = st->list[st->cur].lexeme;
+		tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
+		result = HeapTupleGetDatum(tuple);
+
+		pfree(values[1]);
+		st->cur++;
+		return result;
+	}
+	else
+	{
+		if (st->list)
+			pfree(st->list);
+		pfree(st);
+	}
+	return (Datum) 0;
+}
+
+Datum
+ts_parse_byid(PG_FUNCTION_ARGS)
+{
+	FuncCallContext *funcctx;
+	Datum		result;
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		text	   *txt = PG_GETARG_TEXT_P(1);
+
+		funcctx = SRF_FIRSTCALL_INIT();
+		prs_setup_firstcall(funcctx, PG_GETARG_OID(0), txt);
+		PG_FREE_IF_COPY(txt, 1);
+	}
+
+	funcctx = SRF_PERCALL_SETUP();
+
+	if ((result = prs_process_call(funcctx)) != (Datum) 0)
+		SRF_RETURN_NEXT(funcctx, result);
+	SRF_RETURN_DONE(funcctx);
+}
+
+Datum
+ts_parse_byname(PG_FUNCTION_ARGS)
+{
+	FuncCallContext *funcctx;
+	Datum		result;
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		text	   *prsname = PG_GETARG_TEXT_P(0);
+		text	   *txt = PG_GETARG_TEXT_P(1);
+		Oid			prsId;
+
+		funcctx = SRF_FIRSTCALL_INIT();
+		prsId = TSParserGetPrsid(textToQualifiedNameList(prsname), false);
+		prs_setup_firstcall(funcctx, prsId, txt);
+	}
+
+	funcctx = SRF_PERCALL_SETUP();
+
+	if ((result = prs_process_call(funcctx)) != (Datum) 0)
+		SRF_RETURN_NEXT(funcctx, result);
+	SRF_RETURN_DONE(funcctx);
+}
+
+Datum
+ts_headline_byid_opt(PG_FUNCTION_ARGS)
+{
+	text	   *in = PG_GETARG_TEXT_P(1);
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+	text	   *opt = (PG_NARGS() > 3 && PG_GETARG_POINTER(3)) ? PG_GETARG_TEXT_P(3) : NULL;
+	HeadlineParsedText prs;
+	List	   *prsoptions;
+	text	   *out;
+	TSConfigCacheEntry *cfg;
+	TSParserCacheEntry *prsobj;
+
+	cfg = lookup_ts_config_cache(PG_GETARG_OID(0));
+	prsobj = lookup_ts_parser_cache(cfg->prsId);
+
+	if (!OidIsValid(prsobj->headlineOid))
+		ereport(ERROR, 
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("text search parser does not support headline creation")));
+
+	memset(&prs, 0, sizeof(HeadlineParsedText));
+	prs.lenwords = 32;
+	prs.words = (HeadlineWordEntry *) palloc(sizeof(HeadlineWordEntry) * prs.lenwords);
+
+	hlparsetext(cfg->cfgId, &prs, query, VARDATA(in), VARSIZE(in) - VARHDRSZ);
+
+	if (opt)
+		prsoptions = deserialize_deflist(PointerGetDatum(opt));
+	else
+		prsoptions = NIL;
+
+	FunctionCall3(&(prsobj->prsheadline),
+				  PointerGetDatum(&prs),
+				  PointerGetDatum(prsoptions),
+				  PointerGetDatum(query));
+
+	out = generateHeadline(&prs);
+
+	PG_FREE_IF_COPY(in, 1);
+	PG_FREE_IF_COPY(query, 2);
+	if (opt)
+		PG_FREE_IF_COPY(opt, 3);
+	pfree(prs.words);
+	pfree(prs.startsel);
+	pfree(prs.stopsel);
+
+	PG_RETURN_POINTER(out);
+}
+
+Datum
+ts_headline_byid(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall3(ts_headline_byid_opt,
+										PG_GETARG_DATUM(0),
+										PG_GETARG_DATUM(1),
+										PG_GETARG_DATUM(2)));
+}
+
+Datum
+ts_headline(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall3(ts_headline_byid_opt,
+								  ObjectIdGetDatum(getTSCurrentConfig(true)),
+										PG_GETARG_DATUM(0),
+										PG_GETARG_DATUM(1)));
+}
+
+Datum
+ts_headline_opt(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall4(ts_headline_byid_opt,
+								  ObjectIdGetDatum(getTSCurrentConfig(true)),
+										PG_GETARG_DATUM(0),
+										PG_GETARG_DATUM(1),
+										PG_GETARG_DATUM(2)));
+}
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
new file mode 100644
index 000000000000..5c76b0cfdad6
--- /dev/null
+++ b/src/backend/tsearch/wparser_def.c
@@ -0,0 +1,1912 @@
+/*-------------------------------------------------------------------------
+ *
+ * wparser_def.c
+ *		Default text search parser
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.14.2.6 2009/11/15 13:54:22 petere Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "commands/defrem.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_public.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+
+
+/* Define me to enable tracing of parser behavior */
+/* #define WPARSER_TRACE */
+
+
+/* Output token categories */
+
+#define ASCIIWORD		1
+#define WORD_T			2
+#define NUMWORD			3
+#define EMAIL			4
+#define URL_T			5
+#define HOST			6
+#define SCIENTIFIC		7
+#define VERSIONNUMBER	8
+#define NUMPARTHWORD	9
+#define PARTHWORD		10
+#define ASCIIPARTHWORD	11
+#define SPACE			12
+#define TAG_T			13
+#define PROTOCOL		14
+#define NUMHWORD		15
+#define ASCIIHWORD		16
+#define HWORD			17
+#define URLPATH			18
+#define FILEPATH		19
+#define DECIMAL			20
+#define SIGNEDINT		21
+#define UNSIGNEDINT		22
+#define XMLENTITY		23
+
+#define LASTNUM			23
+
+static const char *const tok_alias[] = {
+	"",
+	"asciiword",
+	"word",
+	"numword",
+	"email",
+	"url",
+	"host",
+	"sfloat",
+	"version",
+	"hword_numpart",
+	"hword_part",
+	"hword_asciipart",
+	"blank",
+	"tag",
+	"protocol",
+	"numhword",
+	"asciihword",
+	"hword",
+	"url_path",
+	"file",
+	"float",
+	"int",
+	"uint",
+	"entity"
+};
+
+static const char *const lex_descr[] = {
+	"",
+	"Word, all ASCII",
+	"Word, all letters",
+	"Word, letters and digits",
+	"Email address",
+	"URL",
+	"Host",
+	"Scientific notation",
+	"Version number",
+	"Hyphenated word part, letters and digits",
+	"Hyphenated word part, all letters",
+	"Hyphenated word part, all ASCII",
+	"Space symbols",
+	"XML tag",
+	"Protocol head",
+	"Hyphenated word, letters and digits",
+	"Hyphenated word, all ASCII",
+	"Hyphenated word, all letters",
+	"URL path",
+	"File or path name",
+	"Decimal notation",
+	"Signed integer",
+	"Unsigned integer",
+	"XML entity"
+};
+
+
+/* Parser states */
+
+typedef enum
+{
+	TPS_Base = 0,
+	TPS_InNumWord,
+	TPS_InAsciiWord,
+	TPS_InWord,
+	TPS_InUnsignedInt,
+	TPS_InSignedIntFirst,
+	TPS_InSignedInt,
+	TPS_InSpace,
+	TPS_InUDecimalFirst,
+	TPS_InUDecimal,
+	TPS_InDecimalFirst,
+	TPS_InDecimal,
+	TPS_InVerVersion,
+	TPS_InSVerVersion,
+	TPS_InVersionFirst,
+	TPS_InVersion,
+	TPS_InMantissaFirst,
+	TPS_InMantissaSign,
+	TPS_InMantissa,
+	TPS_InXMLEntityFirst,
+	TPS_InXMLEntity,
+	TPS_InXMLEntityNumFirst,
+	TPS_InXMLEntityNum,
+	TPS_InXMLEntityHexNumFirst,
+	TPS_InXMLEntityHexNum,
+	TPS_InXMLEntityEnd,
+	TPS_InTagFirst,
+	TPS_InXMLBegin,
+	TPS_InTagCloseFirst,
+	TPS_InTagName,
+	TPS_InTagBeginEnd,
+	TPS_InTag,
+	TPS_InTagEscapeK,
+	TPS_InTagEscapeKK,
+	TPS_InTagBackSleshed,
+	TPS_InTagEnd,
+	TPS_InCommentFirst,
+	TPS_InCommentLast,
+	TPS_InComment,
+	TPS_InCloseCommentFirst,
+	TPS_InCloseCommentLast,
+	TPS_InCommentEnd,
+	TPS_InHostFirstDomain,
+	TPS_InHostDomainSecond,
+	TPS_InHostDomain,
+	TPS_InPortFirst,
+	TPS_InPort,
+	TPS_InHostFirstAN,
+	TPS_InHost,
+	TPS_InEmail,
+	TPS_InFileFirst,
+	TPS_InFileTwiddle,
+	TPS_InPathFirst,
+	TPS_InPathFirstFirst,
+	TPS_InPathSecond,
+	TPS_InFile,
+	TPS_InFileNext,
+	TPS_InURLPathFirst,
+	TPS_InURLPathStart,
+	TPS_InURLPath,
+	TPS_InFURL,
+	TPS_InProtocolFirst,
+	TPS_InProtocolSecond,
+	TPS_InProtocolEnd,
+	TPS_InHyphenAsciiWordFirst,
+	TPS_InHyphenAsciiWord,
+	TPS_InHyphenWordFirst,
+	TPS_InHyphenWord,
+	TPS_InHyphenNumWordFirst,
+	TPS_InHyphenNumWord,
+	TPS_InHyphenDigitLookahead,
+	TPS_InParseHyphen,
+	TPS_InParseHyphenHyphen,
+	TPS_InHyphenWordPart,
+	TPS_InHyphenAsciiWordPart,
+	TPS_InHyphenNumWordPart,
+	TPS_InHyphenUnsignedInt,
+	TPS_Null					/* last state (fake value) */
+} TParserState;
+
+/* forward declaration */
+struct TParser;
+
+typedef int (*TParserCharTest) (struct TParser *);		/* any p_is* functions
+														 * except p_iseq */
+typedef void (*TParserSpecial) (struct TParser *);		/* special handler for
+														 * special cases... */
+
+typedef struct
+{
+	TParserCharTest isclass;
+	char		c;
+	uint16		flags;
+	TParserState tostate;
+	int			type;
+	TParserSpecial special;
+} TParserStateActionItem;
+
+/* Flag bits in TParserStateActionItem.flags */
+#define A_NEXT		0x0000
+#define A_BINGO		0x0001
+#define A_POP		0x0002
+#define A_PUSH		0x0004
+#define A_RERUN		0x0008
+#define A_CLEAR		0x0010
+#define A_MERGE		0x0020
+#define A_CLRALL	0x0040
+
+typedef struct TParserPosition
+{
+	int			posbyte;		/* position of parser in bytes */
+	int			poschar;		/* position of parser in characters */
+	int			charlen;		/* length of current char */
+	int			lenbytetoken;	/* length of token-so-far in bytes */
+	int			lenchartoken;	/* and in chars */
+	TParserState state;
+	struct TParserPosition *prev;
+	const TParserStateActionItem *pushedAtAction;
+} TParserPosition;
+
+typedef struct TParser
+{
+	/* string and position information */
+	char	   *str;			/* multibyte string */
+	int			lenstr;			/* length of mbstring */
+#ifdef TS_USE_WIDE
+	wchar_t    *wstr;			/* wide character string */
+	pg_wchar   *pgwstr;			/* wide character string for C-locale */
+	bool		usewide;
+#endif
+
+	/* State of parse */
+	int			charmaxlen;
+	TParserPosition *state;
+	bool		ignore;
+	bool		wanthost;
+
+	/* silly char */
+	char		c;
+
+	/* out */
+	char	   *token;
+	int			lenbytetoken;
+	int			lenchartoken;
+	int			type;
+} TParser;
+
+
+/* forward decls here */
+static bool TParserGet(TParser *prs);
+
+
+static TParserPosition *
+newTParserPosition(TParserPosition *prev)
+{
+	TParserPosition *res = (TParserPosition *) palloc(sizeof(TParserPosition));
+
+	if (prev)
+		memcpy(res, prev, sizeof(TParserPosition));
+	else
+		memset(res, 0, sizeof(TParserPosition));
+
+	res->prev = prev;
+
+	res->pushedAtAction = NULL;
+
+	return res;
+}
+
+static TParser *
+TParserInit(char *str, int len)
+{
+	TParser    *prs = (TParser *) palloc0(sizeof(TParser));
+
+	prs->charmaxlen = pg_database_encoding_max_length();
+	prs->str = str;
+	prs->lenstr = len;
+
+#ifdef TS_USE_WIDE
+
+	/*
+	 * Use wide char code only when max encoding length > 1.
+	 */
+	if (prs->charmaxlen > 1)
+	{
+		prs->usewide = true;
+		if ( lc_ctype_is_c() )
+		{
+			/*
+			 * char2wchar doesn't work for C-locale and
+			 * sizeof(pg_wchar) could be not equal to sizeof(wchar_t)
+			 */
+			prs->pgwstr = (pg_wchar*) palloc(sizeof(pg_wchar) * (prs->lenstr + 1));
+			pg_mb2wchar_with_len(prs->str, prs->pgwstr, prs->lenstr);
+		}
+		else
+		{
+			prs->wstr = (wchar_t *) palloc(sizeof(wchar_t) * (prs->lenstr + 1));
+			char2wchar(prs->wstr, prs->lenstr + 1, prs->str, prs->lenstr);
+		}
+	}
+	else
+		prs->usewide = false;
+#endif
+
+	prs->state = newTParserPosition(NULL);
+	prs->state->state = TPS_Base;
+
+#ifdef WPARSER_TRACE
+	fprintf(stderr, "parsing \"%.*s\"\n", len, str);
+#endif
+
+	return prs;
+}
+
+static void
+TParserClose(TParser *prs)
+{
+	while (prs->state)
+	{
+		TParserPosition *ptr = prs->state->prev;
+
+		pfree(prs->state);
+		prs->state = ptr;
+	}
+
+#ifdef TS_USE_WIDE
+	if (prs->wstr)
+		pfree(prs->wstr);
+	if (prs->pgwstr)
+		pfree(prs->pgwstr);
+#endif
+
+	pfree(prs);
+}
+
+/*
+ * Character-type support functions, equivalent to is* macros, but
+ * working with any possible encodings and locales. Notes:
+ *  - with multibyte encoding and C-locale isw* function may fail
+ *    or give wrong result. 
+ *  - multibyte encoding and C-locale often are used for 
+ *    Asian languages.
+ *  - if locale is C the we use pgwstr instead of wstr
+ */
+
+#ifdef TS_USE_WIDE
+
+#define p_iswhat(type)														\
+static int																	\
+p_is##type(TParser *prs) {													\
+	Assert( prs->state );													\
+	if ( prs->usewide )														\
+	{																		\
+		if ( prs->pgwstr )													\
+			return is##type( 0xff & *( prs->pgwstr + prs->state->poschar) );\
+																			\
+		return isw##type( *(wint_t*)( prs->wstr + prs->state->poschar ) );	\
+	}																		\
+																			\
+	return is##type( *(unsigned char*)( prs->str + prs->state->posbyte ) ); \
+}																			\
+																			\
+static int																	\
+p_isnot##type(TParser *prs) {												\
+	return !p_is##type(prs);												\
+}
+
+static int
+p_isalnum(TParser *prs)
+{
+	Assert(prs->state);
+
+	if (prs->usewide)
+	{
+		if (prs->pgwstr)
+		{
+			unsigned int c = *(prs->pgwstr + prs->state->poschar);
+
+			/*
+			 * any non-ascii symbol with multibyte encoding with C-locale is
+			 * an alpha character
+			 */
+			if (c > 0x7f)
+				return 1;
+
+			return isalnum(0xff & c);
+		}
+
+		return iswalnum((wint_t) *(prs->wstr + prs->state->poschar));
+	}
+
+	return isalnum(*(unsigned char *) (prs->str + prs->state->posbyte));
+}
+static int
+p_isnotalnum(TParser *prs)
+{
+	return !p_isalnum(prs);
+}
+
+static int
+p_isalpha(TParser *prs)
+{
+	Assert(prs->state);
+
+	if (prs->usewide)
+	{
+		if (prs->pgwstr)
+		{
+			unsigned int c = *(prs->pgwstr + prs->state->poschar);
+
+			/*
+			 * any non-ascii symbol with multibyte encoding with C-locale is
+			 * an alpha character
+			 */
+			if (c > 0x7f)
+				return 1;
+
+			return isalpha(0xff & c);
+		}
+
+		return iswalpha((wint_t) *(prs->wstr + prs->state->poschar));
+	}
+
+	return isalpha(*(unsigned char *) (prs->str + prs->state->posbyte));
+}
+
+static int
+p_isnotalpha(TParser *prs)
+{
+	return !p_isalpha(prs);
+}
+
+/* p_iseq should be used only for ascii symbols */
+
+static int
+p_iseq(TParser *prs, char c)
+{
+	Assert(prs->state);
+	return ((prs->state->charlen == 1 && *(prs->str + prs->state->posbyte) == c)) ? 1 : 0;
+}
+#else							/* TS_USE_WIDE */
+
+#define p_iswhat(type)														\
+static int																	\
+p_is##type(TParser *prs) {													\
+	Assert( prs->state );													\
+	return is##type( (unsigned char)*( prs->str + prs->state->posbyte ) );	\
+}	\
+																			\
+static int																	\
+p_isnot##type(TParser *prs) {												\
+	return !p_is##type(prs);												\
+}
+
+
+static int
+p_iseq(TParser *prs, char c)
+{
+	Assert(prs->state);
+	return (*(prs->str + prs->state->posbyte) == c) ? 1 : 0;
+}
+
+p_iswhat(alnum)
+p_iswhat(alpha)
+#endif   /* TS_USE_WIDE */
+
+p_iswhat(digit)
+p_iswhat(lower)
+p_iswhat(print)
+p_iswhat(punct)
+p_iswhat(space)
+p_iswhat(upper)
+p_iswhat(xdigit)
+
+static int
+p_isEOF(TParser *prs)
+{
+	Assert(prs->state);
+	return (prs->state->posbyte == prs->lenstr || prs->state->charlen == 0) ? 1 : 0;
+}
+
+static int
+p_iseqC(TParser *prs)
+{
+	return p_iseq(prs, prs->c);
+}
+
+static int
+p_isneC(TParser *prs)
+{
+	return !p_iseq(prs, prs->c);
+}
+
+static int
+p_isascii(TParser *prs)
+{
+	return (prs->state->charlen == 1 && isascii((unsigned char) *(prs->str + prs->state->posbyte))) ? 1 : 0;
+}
+
+static int
+p_isasclet(TParser *prs)
+{
+	return (p_isascii(prs) && p_isalpha(prs)) ? 1 : 0;
+}
+
+
+/* deliberately suppress unused-function complaints for the above */
+void		_make_compiler_happy(void);
+void
+_make_compiler_happy(void)
+{
+	p_isalnum(NULL);
+	p_isnotalnum(NULL);
+	p_isalpha(NULL);
+	p_isnotalpha(NULL);
+	p_isdigit(NULL);
+	p_isnotdigit(NULL);
+	p_islower(NULL);
+	p_isnotlower(NULL);
+	p_isprint(NULL);
+	p_isnotprint(NULL);
+	p_ispunct(NULL);
+	p_isnotpunct(NULL);
+	p_isspace(NULL);
+	p_isnotspace(NULL);
+	p_isupper(NULL);
+	p_isnotupper(NULL);
+	p_isxdigit(NULL);
+	p_isnotxdigit(NULL);
+	p_isEOF(NULL);
+	p_iseqC(NULL);
+	p_isneC(NULL);
+}
+
+
+static void
+SpecialTags(TParser *prs)
+{
+	switch (prs->state->lenchartoken)
+	{
+		case 8:			/* </script */
+			if (pg_strncasecmp(prs->token, "</script", 8) == 0)
+				prs->ignore = false;
+			break;
+		case 7:			/* <script || </style */
+			if (pg_strncasecmp(prs->token, "</style", 7) == 0)
+				prs->ignore = false;
+			else if (pg_strncasecmp(prs->token, "<script", 7) == 0)
+				prs->ignore = true;
+			break;
+		case 6:			/* <style */
+			if (pg_strncasecmp(prs->token, "<style", 6) == 0)
+				prs->ignore = true;
+			break;
+		default:
+			break;
+	}
+}
+
+static void
+SpecialFURL(TParser *prs)
+{
+	prs->wanthost = true;
+	prs->state->posbyte -= prs->state->lenbytetoken;
+	prs->state->poschar -= prs->state->lenchartoken;
+}
+
+static void
+SpecialHyphen(TParser *prs)
+{
+	prs->state->posbyte -= prs->state->lenbytetoken;
+	prs->state->poschar -= prs->state->lenchartoken;
+}
+
+static void
+SpecialVerVersion(TParser *prs)
+{
+	prs->state->posbyte -= prs->state->lenbytetoken;
+	prs->state->poschar -= prs->state->lenchartoken;
+	prs->state->lenbytetoken = 0;
+	prs->state->lenchartoken = 0;
+}
+
+static int
+p_isstophost(TParser *prs)
+{
+	if (prs->wanthost)
+	{
+		prs->wanthost = false;
+		return 1;
+	}
+	return 0;
+}
+
+static int
+p_isignore(TParser *prs)
+{
+	return (prs->ignore) ? 1 : 0;
+}
+
+static int
+p_ishost(TParser *prs)
+{
+	TParser    *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte);
+	int			res = 0;
+
+	tmpprs->wanthost = true;
+
+	if (TParserGet(tmpprs) && tmpprs->type == HOST)
+	{
+		prs->state->posbyte += tmpprs->lenbytetoken;
+		prs->state->poschar += tmpprs->lenchartoken;
+		prs->state->lenbytetoken += tmpprs->lenbytetoken;
+		prs->state->lenchartoken += tmpprs->lenchartoken;
+		prs->state->charlen = tmpprs->state->charlen;
+		res = 1;
+	}
+	TParserClose(tmpprs);
+
+	return res;
+}
+
+static int
+p_isURLPath(TParser *prs)
+{
+	TParser    *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte);
+	int			res = 0;
+
+	tmpprs->state = newTParserPosition(tmpprs->state);
+	tmpprs->state->state = TPS_InFileFirst;
+
+	if (TParserGet(tmpprs) && (tmpprs->type == URLPATH || tmpprs->type == FILEPATH))
+	{
+		prs->state->posbyte += tmpprs->lenbytetoken;
+		prs->state->poschar += tmpprs->lenchartoken;
+		prs->state->lenbytetoken += tmpprs->lenbytetoken;
+		prs->state->lenchartoken += tmpprs->lenchartoken;
+		prs->state->charlen = tmpprs->state->charlen;
+		res = 1;
+	}
+	TParserClose(tmpprs);
+
+	return res;
+}
+
+/*
+ * Table of state/action of parser
+ */
+
+static const TParserStateActionItem actionTPS_Base[] = {
+	{p_isEOF, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '<', A_PUSH, TPS_InTagFirst, 0, NULL},
+	{p_isignore, 0, A_NEXT, TPS_InSpace, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InAsciiWord, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InWord, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InUnsignedInt, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InSignedIntFirst, 0, NULL},
+	{p_iseqC, '+', A_PUSH, TPS_InSignedIntFirst, 0, NULL},
+	{p_iseqC, '&', A_PUSH, TPS_InXMLEntityFirst, 0, NULL},
+	{p_iseqC, '~', A_PUSH, TPS_InFileTwiddle, 0, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InPathFirstFirst, 0, NULL},
+	{NULL, 0, A_NEXT, TPS_InSpace, 0, NULL}
+};
+
+
+static const TParserStateActionItem actionTPS_InNumWord[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, NUMWORD, NULL},
+	{p_isalnum, 0, A_NEXT, TPS_InNumWord, 0, NULL},
+	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InFileNext, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHyphenNumWordFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, NUMWORD, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InAsciiWord[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, ASCIIWORD, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InFileNext, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHyphenAsciiWordFirst, 0, NULL},
+	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
+	{p_iseqC, ':', A_PUSH, TPS_InProtocolFirst, 0, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
+	{p_isdigit, 0, A_PUSH, TPS_InHost, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InNumWord, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InWord, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, ASCIIWORD, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InWord[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, WORD_T, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InNumWord, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHyphenWordFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, WORD_T, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InUnsignedInt[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, UNSIGNEDINT, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InUDecimalFirst, 0, NULL},
+	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{p_isasclet, 0, A_PUSH, TPS_InHost, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InNumWord, 0, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, UNSIGNEDINT, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InSignedIntFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT | A_CLEAR, TPS_InSignedInt, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InSignedInt[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, SIGNEDINT, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InDecimalFirst, 0, NULL},
+	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, SIGNEDINT, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InSpace[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, SPACE, NULL},
+	{p_iseqC, '<', A_BINGO, TPS_Base, SPACE, NULL},
+	{p_isignore, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_BINGO, TPS_Base, SPACE, NULL},
+	{p_iseqC, '+', A_BINGO, TPS_Base, SPACE, NULL},
+	{p_iseqC, '&', A_BINGO, TPS_Base, SPACE, NULL},
+	{p_iseqC, '/', A_BINGO, TPS_Base, SPACE, NULL},
+	{p_isnotalnum, 0, A_NEXT, TPS_InSpace, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, SPACE, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InUDecimalFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_CLEAR, TPS_InUDecimal, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InUDecimal[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InUDecimal, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InVersionFirst, 0, NULL},
+	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, DECIMAL, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InDecimalFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_CLEAR, TPS_InDecimal, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InDecimal[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InDecimal, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InVerVersion, 0, NULL},
+	{p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, DECIMAL, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InVerVersion[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_RERUN, TPS_InSVerVersion, 0, SpecialVerVersion},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InSVerVersion[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_BINGO | A_CLRALL, TPS_InUnsignedInt, SPACE, NULL},
+	{NULL, 0, A_NEXT, TPS_Null, 0, NULL}
+};
+
+
+static const TParserStateActionItem actionTPS_InVersionFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_CLEAR, TPS_InVersion, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InVersion[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, VERSIONNUMBER, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InVersion, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InVersionFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, VERSIONNUMBER, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InMantissaFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_CLEAR, TPS_InMantissa, 0, NULL},
+	{p_iseqC, '+', A_NEXT, TPS_InMantissaSign, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_InMantissaSign, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InMantissaSign[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_CLEAR, TPS_InMantissa, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InMantissa[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, SCIENTIFIC, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InMantissa, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, SCIENTIFIC, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLEntityFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '#', A_NEXT, TPS_InXMLEntityNumFirst, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{p_iseqC, ':', A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLEntity[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isalnum, 0, A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{p_iseqC, ':', A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{p_iseqC, '.', A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_InXMLEntity, 0, NULL},
+	{p_iseqC, ';', A_NEXT, TPS_InXMLEntityEnd, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLEntityNumFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, 'x', A_NEXT, TPS_InXMLEntityHexNumFirst, 0, NULL},
+	{p_iseqC, 'X', A_NEXT, TPS_InXMLEntityHexNumFirst, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InXMLEntityNum, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLEntityHexNumFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isxdigit, 0, A_NEXT, TPS_InXMLEntityHexNum, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLEntityNum[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InXMLEntityNum, 0, NULL},
+	{p_iseqC, ';', A_NEXT, TPS_InXMLEntityEnd, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLEntityHexNum[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isxdigit, 0, A_NEXT, TPS_InXMLEntityHexNum, 0, NULL},
+	{p_iseqC, ';', A_NEXT, TPS_InXMLEntityEnd, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLEntityEnd[] = {
+	{NULL, 0, A_BINGO | A_CLEAR, TPS_Base, XMLENTITY, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InTagCloseFirst, 0, NULL},
+	{p_iseqC, '!', A_PUSH, TPS_InCommentFirst, 0, NULL},
+	{p_iseqC, '?', A_PUSH, TPS_InXMLBegin, 0, NULL},
+	{p_isasclet, 0, A_PUSH, TPS_InTagName, 0, NULL},
+	{p_iseqC, ':', A_PUSH, TPS_InTagName, 0, NULL},
+	{p_iseqC, '_', A_PUSH, TPS_InTagName, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InXMLBegin[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	/* <?xml ... */
+    /* XXX do we wants states for the m and l ?  Right now this accepts <?xZ */
+	{p_iseqC, 'x', A_NEXT, TPS_InTag, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagCloseFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InTagName, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagName[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	/* <br/> case */
+	{p_iseqC, '/', A_NEXT, TPS_InTagBeginEnd, 0, NULL},
+	{p_iseqC, '>', A_NEXT, TPS_InTagEnd, 0, SpecialTags},
+	{p_isspace, 0, A_NEXT, TPS_InTag, 0, SpecialTags},
+	{p_isalnum, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, ':', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '.', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_Null, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagBeginEnd[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '>', A_NEXT, TPS_InTagEnd, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTag[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '>', A_NEXT, TPS_InTagEnd, 0, SpecialTags},
+	{p_iseqC, '\'', A_NEXT, TPS_InTagEscapeK, 0, NULL},
+	{p_iseqC, '"', A_NEXT, TPS_InTagEscapeKK, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '=', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '#', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '/', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, ':', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '.', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '&', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '?', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '%', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '~', A_NEXT, TPS_Null, 0, NULL},
+	{p_isspace, 0, A_NEXT, TPS_Null, 0, SpecialTags},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagEscapeK[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '\\', A_PUSH, TPS_InTagBackSleshed, 0, NULL},
+	{p_iseqC, '\'', A_NEXT, TPS_InTag, 0, NULL},
+	{NULL, 0, A_NEXT, TPS_InTagEscapeK, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagEscapeKK[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '\\', A_PUSH, TPS_InTagBackSleshed, 0, NULL},
+	{p_iseqC, '"', A_NEXT, TPS_InTag, 0, NULL},
+	{NULL, 0, A_NEXT, TPS_InTagEscapeKK, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagBackSleshed[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{NULL, 0, A_MERGE, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InTagEnd[] = {
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, TAG_T, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InCommentFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_InCommentLast, 0, NULL},
+	/* <!DOCTYPE ...> */
+	{p_iseqC, 'D', A_NEXT, TPS_InTag, 0, NULL},
+	{p_iseqC, 'd', A_NEXT, TPS_InTag, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InCommentLast[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_InComment, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InComment[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_InCloseCommentFirst, 0, NULL},
+	{NULL, 0, A_NEXT, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InCloseCommentFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_InCloseCommentLast, 0, NULL},
+	{NULL, 0, A_NEXT, TPS_InComment, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InCloseCommentLast[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_Null, 0, NULL},
+	{p_iseqC, '>', A_NEXT, TPS_InCommentEnd, 0, NULL},
+	{NULL, 0, A_NEXT, TPS_InComment, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InCommentEnd[] = {
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, TAG_T, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHostFirstDomain[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHostDomainSecond, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHost, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHostDomainSecond[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHostDomain, 0, NULL},
+	{p_isdigit, 0, A_PUSH, TPS_InHost, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
+	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHostDomain[] = {
+	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHostDomain, 0, NULL},
+	{p_isdigit, 0, A_PUSH, TPS_InHost, 0, NULL},
+	{p_iseqC, ':', A_PUSH, TPS_InPortFirst, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
+	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
+	{p_isdigit, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isstophost, 0, A_BINGO | A_CLRALL, TPS_InURLPathStart, HOST, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InFURL, 0, NULL},
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InPortFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InPort, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InPort[] = {
+	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InPort, 0, NULL},
+	{p_isstophost, 0, A_BINGO | A_CLRALL, TPS_InURLPathStart, HOST, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InFURL, 0, NULL},
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, HOST, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHostFirstAN[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHost, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHost, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHost[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHost, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHost, 0, NULL},
+	{p_iseqC, '@', A_PUSH, TPS_InEmail, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InHostFirstDomain, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHostFirstAN, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InEmail[] = {
+	{p_isstophost, 0, A_POP, TPS_Null, 0, NULL},
+	{p_ishost, 0, A_BINGO | A_CLRALL, TPS_Base, EMAIL, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InFileFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '.', A_NEXT, TPS_InPathFirst, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '?', A_PUSH, TPS_InURLPathFirst, 0, NULL},
+	{p_iseqC, '~', A_PUSH, TPS_InFileTwiddle, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InFileTwiddle[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '/', A_NEXT, TPS_InFileFirst, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InPathFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '.', A_NEXT, TPS_InPathSecond, 0, NULL},
+	{p_iseqC, '/', A_NEXT, TPS_InFileFirst, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InPathFirstFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '.', A_NEXT, TPS_InPathSecond, 0, NULL},
+	{p_iseqC, '/', A_NEXT, TPS_InFileFirst, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InPathSecond[] = {
+	{p_isEOF, 0, A_BINGO | A_CLEAR, TPS_Base, FILEPATH, NULL},
+	{p_iseqC, '/', A_NEXT | A_PUSH, TPS_InFileFirst, 0, NULL},
+	{p_iseqC, '/', A_BINGO | A_CLEAR, TPS_Base, FILEPATH, NULL},
+	{p_isspace, 0, A_BINGO | A_CLEAR, TPS_Base, FILEPATH, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InFile[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, FILEPATH, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InFileNext, 0, NULL},
+	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '-', A_NEXT, TPS_InFile, 0, NULL},
+	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
+	{p_iseqC, '?', A_PUSH, TPS_InURLPathFirst, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, FILEPATH, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InFileNext[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_CLEAR, TPS_InFile, 0, NULL},
+	{p_isdigit, 0, A_CLEAR, TPS_InFile, 0, NULL},
+	{p_iseqC, '_', A_CLEAR, TPS_InFile, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InURLPathFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '"', A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '\'', A_POP, TPS_Null, 0, NULL},
+	{p_isnotspace, 0, A_CLEAR, TPS_InURLPath, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL},
+};
+
+static const TParserStateActionItem actionTPS_InURLPathStart[] = {
+	{NULL, 0, A_NEXT, TPS_InURLPath, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InURLPath[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, URLPATH, NULL},
+	{p_iseqC, '"', A_BINGO, TPS_Base, URLPATH, NULL},
+	{p_iseqC, '\'', A_BINGO, TPS_Base, URLPATH, NULL},
+	{p_isnotspace, 0, A_NEXT, TPS_InURLPath, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_Base, URLPATH, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InFURL[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isURLPath, 0, A_BINGO | A_CLRALL, TPS_Base, URL_T, SpecialFURL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InProtocolFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '/', A_NEXT, TPS_InProtocolSecond, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InProtocolSecond[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_iseqC, '/', A_NEXT, TPS_InProtocolEnd, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InProtocolEnd[] = {
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_Base, PROTOCOL, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenAsciiWordFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHyphenAsciiWord, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenWord, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenDigitLookahead, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenAsciiWord[] = {
+	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, ASCIIHWORD, SpecialHyphen},
+	{p_isasclet, 0, A_NEXT, TPS_InHyphenAsciiWord, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenWord, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHyphenAsciiWordFirst, 0, NULL},
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, ASCIIHWORD, SpecialHyphen}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenWordFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenWord, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenDigitLookahead, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenWord[] = {
+	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HWORD, SpecialHyphen},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenWord, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHyphenWordFirst, 0, NULL},
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, HWORD, SpecialHyphen}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenNumWordFirst[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenDigitLookahead, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenNumWord[] = {
+	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, NUMHWORD, SpecialHyphen},
+	{p_isalnum, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InHyphenNumWordFirst, 0, NULL},
+	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, NUMHWORD, SpecialHyphen}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenDigitLookahead[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenDigitLookahead, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InParseHyphen[] = {
+	{p_isEOF, 0, A_RERUN, TPS_Base, 0, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHyphenAsciiWordPart, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenWordPart, 0, NULL},
+	{p_isdigit, 0, A_PUSH, TPS_InHyphenUnsignedInt, 0, NULL},
+	{p_iseqC, '-', A_PUSH, TPS_InParseHyphenHyphen, 0, NULL},
+	{NULL, 0, A_RERUN, TPS_Base, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InParseHyphenHyphen[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isalnum, 0, A_BINGO | A_CLEAR, TPS_InParseHyphen, SPACE, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenWordPart[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, PARTHWORD, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenWordPart, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenNumWordPart, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_InParseHyphen, PARTHWORD, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenAsciiWordPart[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, ASCIIPARTHWORD, NULL},
+	{p_isasclet, 0, A_NEXT, TPS_InHyphenAsciiWordPart, 0, NULL},
+	{p_isalpha, 0, A_NEXT, TPS_InHyphenWordPart, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenNumWordPart, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_InParseHyphen, ASCIIPARTHWORD, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenNumWordPart[] = {
+	{p_isEOF, 0, A_BINGO, TPS_Base, NUMPARTHWORD, NULL},
+	{p_isalnum, 0, A_NEXT, TPS_InHyphenNumWordPart, 0, NULL},
+	{NULL, 0, A_BINGO, TPS_InParseHyphen, NUMPARTHWORD, NULL}
+};
+
+static const TParserStateActionItem actionTPS_InHyphenUnsignedInt[] = {
+	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_Null, 0, NULL},
+	{p_isalpha, 0, A_CLEAR, TPS_InHyphenNumWordPart, 0, NULL},
+	{NULL, 0, A_POP, TPS_Null, 0, NULL}
+};
+
+
+/*
+ * main table of per-state parser actions
+ */
+typedef struct
+{
+	const TParserStateActionItem *action;		/* the actual state info */
+	TParserState state;			/* only for Assert crosscheck */
+#ifdef WPARSER_TRACE
+	const char *state_name;		/* only for debug printout */
+#endif
+} TParserStateAction;
+
+#ifdef WPARSER_TRACE
+#define TPARSERSTATEACTION(state) \
+	{ CppConcat(action,state), state, CppAsString(state) }
+#else
+#define TPARSERSTATEACTION(state) \
+	{ CppConcat(action,state), state }
+#endif
+
+/*
+ * order must be the same as in typedef enum {} TParserState!!
+ */
+
+static const TParserStateAction Actions[] = {
+	TPARSERSTATEACTION(TPS_Base),
+	TPARSERSTATEACTION(TPS_InNumWord),
+	TPARSERSTATEACTION(TPS_InAsciiWord),
+	TPARSERSTATEACTION(TPS_InWord),
+	TPARSERSTATEACTION(TPS_InUnsignedInt),
+	TPARSERSTATEACTION(TPS_InSignedIntFirst),
+	TPARSERSTATEACTION(TPS_InSignedInt),
+	TPARSERSTATEACTION(TPS_InSpace),
+	TPARSERSTATEACTION(TPS_InUDecimalFirst),
+	TPARSERSTATEACTION(TPS_InUDecimal),
+	TPARSERSTATEACTION(TPS_InDecimalFirst),
+	TPARSERSTATEACTION(TPS_InDecimal),
+	TPARSERSTATEACTION(TPS_InVerVersion),
+	TPARSERSTATEACTION(TPS_InSVerVersion),
+	TPARSERSTATEACTION(TPS_InVersionFirst),
+	TPARSERSTATEACTION(TPS_InVersion),
+	TPARSERSTATEACTION(TPS_InMantissaFirst),
+	TPARSERSTATEACTION(TPS_InMantissaSign),
+	TPARSERSTATEACTION(TPS_InMantissa),
+	TPARSERSTATEACTION(TPS_InXMLEntityFirst),
+	TPARSERSTATEACTION(TPS_InXMLEntity),
+	TPARSERSTATEACTION(TPS_InXMLEntityNumFirst),
+	TPARSERSTATEACTION(TPS_InXMLEntityNum),
+	TPARSERSTATEACTION(TPS_InXMLEntityHexNumFirst),
+	TPARSERSTATEACTION(TPS_InXMLEntityHexNum),
+	TPARSERSTATEACTION(TPS_InXMLEntityEnd),
+	TPARSERSTATEACTION(TPS_InTagFirst),
+	TPARSERSTATEACTION(TPS_InXMLBegin),
+	TPARSERSTATEACTION(TPS_InTagCloseFirst),
+	TPARSERSTATEACTION(TPS_InTagName),
+	TPARSERSTATEACTION(TPS_InTagBeginEnd),
+	TPARSERSTATEACTION(TPS_InTag),
+	TPARSERSTATEACTION(TPS_InTagEscapeK),
+	TPARSERSTATEACTION(TPS_InTagEscapeKK),
+	TPARSERSTATEACTION(TPS_InTagBackSleshed),
+	TPARSERSTATEACTION(TPS_InTagEnd),
+	TPARSERSTATEACTION(TPS_InCommentFirst),
+	TPARSERSTATEACTION(TPS_InCommentLast),
+	TPARSERSTATEACTION(TPS_InComment),
+	TPARSERSTATEACTION(TPS_InCloseCommentFirst),
+	TPARSERSTATEACTION(TPS_InCloseCommentLast),
+	TPARSERSTATEACTION(TPS_InCommentEnd),
+	TPARSERSTATEACTION(TPS_InHostFirstDomain),
+	TPARSERSTATEACTION(TPS_InHostDomainSecond),
+	TPARSERSTATEACTION(TPS_InHostDomain),
+	TPARSERSTATEACTION(TPS_InPortFirst),
+	TPARSERSTATEACTION(TPS_InPort),
+	TPARSERSTATEACTION(TPS_InHostFirstAN),
+	TPARSERSTATEACTION(TPS_InHost),
+	TPARSERSTATEACTION(TPS_InEmail),
+	TPARSERSTATEACTION(TPS_InFileFirst),
+	TPARSERSTATEACTION(TPS_InFileTwiddle),
+	TPARSERSTATEACTION(TPS_InPathFirst),
+	TPARSERSTATEACTION(TPS_InPathFirstFirst),
+	TPARSERSTATEACTION(TPS_InPathSecond),
+	TPARSERSTATEACTION(TPS_InFile),
+	TPARSERSTATEACTION(TPS_InFileNext),
+	TPARSERSTATEACTION(TPS_InURLPathFirst),
+	TPARSERSTATEACTION(TPS_InURLPathStart),
+	TPARSERSTATEACTION(TPS_InURLPath),
+	TPARSERSTATEACTION(TPS_InFURL),
+	TPARSERSTATEACTION(TPS_InProtocolFirst),
+	TPARSERSTATEACTION(TPS_InProtocolSecond),
+	TPARSERSTATEACTION(TPS_InProtocolEnd),
+	TPARSERSTATEACTION(TPS_InHyphenAsciiWordFirst),
+	TPARSERSTATEACTION(TPS_InHyphenAsciiWord),
+	TPARSERSTATEACTION(TPS_InHyphenWordFirst),
+	TPARSERSTATEACTION(TPS_InHyphenWord),
+	TPARSERSTATEACTION(TPS_InHyphenNumWordFirst),
+	TPARSERSTATEACTION(TPS_InHyphenNumWord),
+	TPARSERSTATEACTION(TPS_InHyphenDigitLookahead),
+	TPARSERSTATEACTION(TPS_InParseHyphen),
+	TPARSERSTATEACTION(TPS_InParseHyphenHyphen),
+	TPARSERSTATEACTION(TPS_InHyphenWordPart),
+	TPARSERSTATEACTION(TPS_InHyphenAsciiWordPart),
+	TPARSERSTATEACTION(TPS_InHyphenNumWordPart),
+	TPARSERSTATEACTION(TPS_InHyphenUnsignedInt)
+};
+
+
+static bool
+TParserGet(TParser *prs)
+{
+	const TParserStateActionItem *item = NULL;
+
+	Assert(prs->state);
+
+	if (prs->state->posbyte >= prs->lenstr)
+		return false;
+
+	prs->token = prs->str + prs->state->posbyte;
+	prs->state->pushedAtAction = NULL;
+
+	/* look at string */
+	while (prs->state->posbyte <= prs->lenstr)
+	{
+		if (prs->state->posbyte == prs->lenstr)
+			prs->state->charlen = 0;
+		else
+			prs->state->charlen = (prs->charmaxlen == 1) ? prs->charmaxlen :
+				pg_mblen(prs->str + prs->state->posbyte);
+
+		Assert(prs->state->posbyte + prs->state->charlen <= prs->lenstr);
+		Assert(prs->state->state >= TPS_Base && prs->state->state < TPS_Null);
+		Assert(Actions[prs->state->state].state == prs->state->state);
+
+		if (prs->state->pushedAtAction)
+		{
+			/* After a POP, pick up at the next test */
+			item = prs->state->pushedAtAction + 1;
+			prs->state->pushedAtAction = NULL;
+		}
+		else
+		{
+			item = Actions[prs->state->state].action;
+			Assert(item != NULL);
+		}
+
+		/* find action by character class */
+		while (item->isclass)
+		{
+			prs->c = item->c;
+			if (item->isclass(prs) != 0)
+				break;
+			item++;
+		}
+
+#ifdef WPARSER_TRACE
+		{
+			TParserPosition *ptr;
+
+			fprintf(stderr, "state ");
+			/* indent according to stack depth */
+			for (ptr = prs->state->prev; ptr; ptr = ptr->prev)
+				fprintf(stderr, "  ");
+			fprintf(stderr, "%s ", Actions[prs->state->state].state_name);
+			if (prs->state->posbyte < prs->lenstr)
+				fprintf(stderr, "at %c", *(prs->str + prs->state->posbyte));
+			else
+				fprintf(stderr, "at EOF");
+			fprintf(stderr, " matched rule %d flags%s%s%s%s%s%s%s%s%s%s%s\n",
+					(int) (item - Actions[prs->state->state].action),
+					(item->flags & A_BINGO) ? " BINGO" : "",
+					(item->flags & A_POP) ? " POP" : "",
+					(item->flags & A_PUSH) ? " PUSH" : "",
+					(item->flags & A_RERUN) ? " RERUN" : "",
+					(item->flags & A_CLEAR) ? " CLEAR" : "",
+					(item->flags & A_MERGE) ? " MERGE" : "",
+					(item->flags & A_CLRALL) ? " CLRALL" : "",
+					(item->tostate != TPS_Null) ? " tostate " : "",
+					(item->tostate != TPS_Null) ? Actions[item->tostate].state_name : "",
+					(item->type > 0) ? " type " : "",
+					tok_alias[item->type]);
+		}
+#endif
+
+		/* call special handler if exists */
+		if (item->special)
+			item->special(prs);
+
+		/* BINGO, token is found */
+		if (item->flags & A_BINGO)
+		{
+			Assert(item->type > 0);
+			prs->lenbytetoken = prs->state->lenbytetoken;
+			prs->lenchartoken = prs->state->lenchartoken;
+			prs->state->lenbytetoken = prs->state->lenchartoken = 0;
+			prs->type = item->type;
+		}
+
+		/* do various actions by flags */
+		if (item->flags & A_POP)
+		{						/* pop stored state in stack */
+			TParserPosition *ptr = prs->state->prev;
+
+			pfree(prs->state);
+			prs->state = ptr;
+			Assert(prs->state);
+		}
+		else if (item->flags & A_PUSH)
+		{						/* push (store) state in stack */
+			prs->state->pushedAtAction = item;	/* remember where we push */
+			prs->state = newTParserPosition(prs->state);
+		}
+		else if (item->flags & A_CLEAR)
+		{						/* clear previous pushed state */
+			TParserPosition *ptr;
+
+			Assert(prs->state->prev);
+			ptr = prs->state->prev->prev;
+			pfree(prs->state->prev);
+			prs->state->prev = ptr;
+		}
+		else if (item->flags & A_CLRALL)
+		{						/* clear all previous pushed state */
+			TParserPosition *ptr;
+
+			while (prs->state->prev)
+			{
+				ptr = prs->state->prev->prev;
+				pfree(prs->state->prev);
+				prs->state->prev = ptr;
+			}
+		}
+		else if (item->flags & A_MERGE)
+		{						/* merge posinfo with current and pushed state */
+			TParserPosition *ptr = prs->state;
+
+			Assert(prs->state->prev);
+			prs->state = prs->state->prev;
+
+			prs->state->posbyte = ptr->posbyte;
+			prs->state->poschar = ptr->poschar;
+			prs->state->charlen = ptr->charlen;
+			prs->state->lenbytetoken = ptr->lenbytetoken;
+			prs->state->lenchartoken = ptr->lenchartoken;
+			pfree(ptr);
+		}
+
+		/* set new state if pointed */
+		if (item->tostate != TPS_Null)
+			prs->state->state = item->tostate;
+
+		/* check for go away */
+		if ((item->flags & A_BINGO) ||
+			(prs->state->posbyte >= prs->lenstr &&
+			 (item->flags & A_RERUN) == 0))
+			break;
+
+		/* go to beginning of loop if we should rerun or we just restore state */
+		if (item->flags & (A_RERUN | A_POP))
+			continue;
+
+		/* move forward */
+		if (prs->state->charlen)
+		{
+			prs->state->posbyte += prs->state->charlen;
+			prs->state->lenbytetoken += prs->state->charlen;
+			prs->state->poschar++;
+			prs->state->lenchartoken++;
+		}
+	}
+
+	return (item && (item->flags & A_BINGO)) ? true : false;
+}
+
+Datum
+prsd_lextype(PG_FUNCTION_ARGS)
+{
+	LexDescr   *descr = (LexDescr *) palloc(sizeof(LexDescr) * (LASTNUM + 1));
+	int			i;
+
+	for (i = 1; i <= LASTNUM; i++)
+	{
+		descr[i - 1].lexid = i;
+		descr[i - 1].alias = pstrdup(tok_alias[i]);
+		descr[i - 1].descr = pstrdup(lex_descr[i]);
+	}
+
+	descr[LASTNUM].lexid = 0;
+
+	PG_RETURN_POINTER(descr);
+}
+
+Datum
+prsd_start(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_POINTER(TParserInit((char *) PG_GETARG_POINTER(0), PG_GETARG_INT32(1)));
+}
+
+Datum
+prsd_nexttoken(PG_FUNCTION_ARGS)
+{
+	TParser    *p = (TParser *) PG_GETARG_POINTER(0);
+	char	  **t = (char **) PG_GETARG_POINTER(1);
+	int		   *tlen = (int *) PG_GETARG_POINTER(2);
+
+	if (!TParserGet(p))
+		PG_RETURN_INT32(0);
+
+	*t = p->token;
+	*tlen = p->lenbytetoken;
+
+	PG_RETURN_INT32(p->type);
+}
+
+Datum
+prsd_end(PG_FUNCTION_ARGS)
+{
+	TParser    *p = (TParser *) PG_GETARG_POINTER(0);
+
+	TParserClose(p);
+	PG_RETURN_VOID();
+}
+
+#define LEAVETOKEN(x)	( (x)==SPACE )
+#define COMPLEXTOKEN(x) ( (x)==URL_T || (x)==NUMHWORD || (x)==ASCIIHWORD || (x)==HWORD )
+#define ENDPUNCTOKEN(x) ( (x)==SPACE )
+
+#define TS_IDIGNORE(x)  ( (x)==TAG_T || (x)==PROTOCOL || (x)==SPACE || (x)==XMLENTITY )
+#define HLIDREPLACE(x)  ( (x)==TAG_T )
+#define HLIDSKIP(x)     ( (x)==URL_T || (x)==NUMHWORD || (x)==ASCIIHWORD || (x)==HWORD )
+#define XMLHLIDSKIP(x)  ( (x)==URL_T || (x)==NUMHWORD || (x)==ASCIIHWORD || (x)==HWORD )
+#define NONWORDTOKEN(x) ( (x)==SPACE || HLIDREPLACE(x) || HLIDSKIP(x) )
+#define NOENDTOKEN(x)	( NONWORDTOKEN(x) || (x)==SCIENTIFIC || (x)==VERSIONNUMBER || (x)==DECIMAL || (x)==SIGNEDINT || (x)==UNSIGNEDINT || TS_IDIGNORE(x) )
+
+typedef struct
+{
+	HeadlineWordEntry *words;
+	int			len;
+} hlCheck;
+
+static bool
+checkcondition_HL(void *checkval, QueryOperand *val)
+{
+	int			i;
+
+	for (i = 0; i < ((hlCheck *) checkval)->len; i++)
+	{
+		if (((hlCheck *) checkval)->words[i].item == val)
+			return true;
+	}
+	return false;
+}
+
+
+static bool
+hlCover(HeadlineParsedText *prs, TSQuery query, int *p, int *q)
+{
+	int			i,
+				j;
+	QueryItem  *item = GETQUERY(query);
+	int			pos = *p;
+
+	*q = -1;
+	*p = 0x7fffffff;
+
+	for (j = 0; j < query->size; j++)
+	{
+		if (item->type != QI_VAL)
+		{
+			item++;
+			continue;
+		}
+		for (i = pos; i < prs->curwords; i++)
+		{
+			if (prs->words[i].item == &item->operand)
+			{
+				if (i > *q)
+					*q = i;
+				break;
+			}
+		}
+		item++;
+	}
+
+	if (*q < 0)
+		return false;
+
+	item = GETQUERY(query);
+	for (j = 0; j < query->size; j++)
+	{
+		if (item->type != QI_VAL)
+		{
+			item++;
+			continue;
+		}
+		for (i = *q; i >= pos; i--)
+		{
+			if (prs->words[i].item == &item->operand)
+			{
+				if (i < *p)
+					*p = i;
+				break;
+			}
+		}
+		item++;
+	}
+
+	if (*p <= *q)
+	{
+		hlCheck		ch;
+
+		ch.words = &(prs->words[*p]);
+		ch.len = *q - *p + 1;
+		if (TS_execute(GETQUERY(query), &ch, false, checkcondition_HL))
+			return true;
+		else
+		{
+			(*p)++;
+			return hlCover(prs, query, p, q);
+		}
+	}
+
+	return false;
+}
+
+Datum
+prsd_headline(PG_FUNCTION_ARGS)
+{
+	HeadlineParsedText *prs = (HeadlineParsedText *) PG_GETARG_POINTER(0);
+	List	   *prsoptions = (List *) PG_GETARG_POINTER(1);
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+
+	/* from opt + start and and tag */
+	int			min_words = 15;
+	int			max_words = 35;
+	int			shortword = 3;
+
+	int			p = 0,
+				q = 0;
+	int			bestb = -1,
+				beste = -1;
+	int			bestlen = -1;
+	int			pose = 0,
+				posb,
+				poslen,
+				curlen;
+
+	int			i;
+	int			highlight = 0;
+	ListCell   *l;
+
+	/* config */
+	prs->startsel = NULL;
+	prs->stopsel = NULL;
+	foreach(l, prsoptions)
+	{
+		DefElem    *defel = (DefElem *) lfirst(l);
+		char	   *val = defGetString(defel);
+
+		if (pg_strcasecmp(defel->defname, "MaxWords") == 0)
+			max_words = pg_atoi(val, sizeof(int32), 0);
+		else if (pg_strcasecmp(defel->defname, "MinWords") == 0)
+			min_words = pg_atoi(val, sizeof(int32), 0);
+		else if (pg_strcasecmp(defel->defname, "ShortWord") == 0)
+			shortword = pg_atoi(val, sizeof(int32), 0);
+		else if (pg_strcasecmp(defel->defname, "StartSel") == 0)
+			prs->startsel = pstrdup(val);
+		else if (pg_strcasecmp(defel->defname, "StopSel") == 0)
+			prs->stopsel = pstrdup(val);
+		else if (pg_strcasecmp(defel->defname, "HighlightAll") == 0)
+			highlight = (pg_strcasecmp(val, "1") == 0 ||
+						 pg_strcasecmp(val, "on") == 0 ||
+						 pg_strcasecmp(val, "true") == 0 ||
+						 pg_strcasecmp(val, "t") == 0 ||
+						 pg_strcasecmp(val, "y") == 0 ||
+						 pg_strcasecmp(val, "yes") == 0);
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("unrecognized headline parameter: \"%s\"",
+							defel->defname)));
+	}
+
+	if (highlight == 0)
+	{
+		if (min_words >= max_words)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("MinWords should be less than MaxWords")));
+		if (min_words <= 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("MinWords should be positive")));
+		if (shortword < 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("ShortWord should be >= 0")));
+
+		while (hlCover(prs, query, &p, &q))
+		{
+			/* find cover len in words */
+			curlen = 0;
+			poslen = 0;
+			for (i = p; i <= q && curlen < max_words; i++)
+			{
+				if (!NONWORDTOKEN(prs->words[i].type))
+					curlen++;
+				if (prs->words[i].item && !prs->words[i].repeated)
+					poslen++;
+				pose = i;
+			}
+
+			if (poslen < bestlen && !(NOENDTOKEN(prs->words[beste].type) || prs->words[beste].len <= shortword))
+			{
+				/* best already finded, so try one more cover */
+				p++;
+				continue;
+			}
+
+			posb = p;
+			if (curlen < max_words)
+			{					/* find good end */
+				for (i = i - 1; i < prs->curwords && curlen < max_words; i++)
+				{
+					if (i != q)
+					{
+						if (!NONWORDTOKEN(prs->words[i].type))
+							curlen++;
+						if (prs->words[i].item && !prs->words[i].repeated)
+							poslen++;
+					}
+					pose = i;
+					if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword)
+						continue;
+					if (curlen >= min_words)
+						break;
+				}
+				if (curlen < min_words && i >= prs->curwords)
+				{				/* got end of text and our cover is shoter
+								 * than min_words */
+					for (i = p - 1; i >= 0; i--)
+					{
+						if (!NONWORDTOKEN(prs->words[i].type))
+							curlen++;
+						if (prs->words[i].item && !prs->words[i].repeated)
+							poslen++;
+						if ( curlen >= max_words )
+							break;
+						if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword)
+							continue;
+						if (curlen >= min_words)
+							break;
+					}
+					posb = (i >= 0) ? i : 0;
+				}
+			}
+			else
+			{					/* shorter cover :((( */
+				for (; curlen > min_words; i--)
+				{
+					if (!NONWORDTOKEN(prs->words[i].type))
+						curlen--;
+					if (prs->words[i].item && !prs->words[i].repeated)
+						poslen--;
+					pose = i;
+					if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword)
+						continue;
+					break;
+				}
+			}
+
+			if (bestlen < 0 || (poslen > bestlen && !(NOENDTOKEN(prs->words[pose].type) || prs->words[pose].len <= shortword)) ||
+				(bestlen >= 0 && !(NOENDTOKEN(prs->words[pose].type) || prs->words[pose].len <= shortword) &&
+				 (NOENDTOKEN(prs->words[beste].type) || prs->words[beste].len <= shortword)))
+			{
+				bestb = posb;
+				beste = pose;
+				bestlen = poslen;
+			}
+
+			p++;
+		}
+
+		if (bestlen < 0)
+		{
+			curlen = 0;
+			for (i = 0; i < prs->curwords && curlen < min_words; i++)
+			{
+				if (!NONWORDTOKEN(prs->words[i].type))
+					curlen++;
+				pose = i;
+			}
+			bestb = 0;
+			beste = pose;
+		}
+	}
+	else
+	{
+		bestb = 0;
+		beste = prs->curwords - 1;
+	}
+
+	for (i = bestb; i <= beste; i++)
+	{
+		if (prs->words[i].item)
+			prs->words[i].selected = 1;
+		if (highlight == 0)
+		{
+			if (HLIDREPLACE(prs->words[i].type))
+				prs->words[i].replace = 1;
+			else if ( HLIDSKIP(prs->words[i].type) )
+				prs->words[i].skip = 1;
+		}
+		else
+		{
+			if (XMLHLIDSKIP(prs->words[i].type))
+				prs->words[i].skip = 1;
+		}
+
+		prs->words[i].in = (prs->words[i].repeated) ? 0 : 1;
+	}
+
+	if (!prs->startsel)
+		prs->startsel = pstrdup("<b>");
+	if (!prs->stopsel)
+		prs->stopsel = pstrdup("</b>");
+	prs->startsellen = strlen(prs->startsel);
+	prs->stopsellen = strlen(prs->stopsel);
+
+	PG_RETURN_POINTER(prs);
+}
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 7f557398fa06..33a3720f73fa 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for utils/adt
 #
-# $PostgreSQL: pgsql/src/backend/utils/adt/Makefile,v 1.63 2007/01/28 16:16:52 neilc Exp $
+# $PostgreSQL: pgsql/src/backend/utils/adt/Makefile,v 1.68 2007/10/13 23:06:26 tgl Exp $
 #
 
 subdir = src/backend/utils/adt
@@ -18,15 +18,18 @@ endif
 
 OBJS = acl.o array_userfuncs.o arrayfuncs.o arrayutils.o ascii.o \
 	bool.o cash.o char.o complex_type.o date.o datetime.o datum.o dbsize.o \
-	domains.o encode.o float.o format_type.o formatting.o genfile.o \
+	domains.o encode.o enum.o float.o format_type.o formatting.o genfile.o \
 	geo_ops.o geo_selfuncs.o gp_optimizer_functions.o \
 	gp_partition_functions.o inet_cidr_ntop.o inet_net_pton.o int.o \
 	int8.o interpolate.o like.o lockfuncs.o mac.o matrix.o misc.o nabstime.o name.o \
-	network.o not_in.o numeric.o numutils.o oid.o oracle_compat.o \
+	network.o numeric.o numutils.o oid.o oracle_compat.o \
 	percentile.o pg_locale.o pg_lzcompress.o pgstatfuncs.o pivot.o \
 	pseudotypes.o quote.o regexp.o regproc.o ri_triggers.o rowtypes.o \
-	ruleutils.o selfuncs.o tid.o timestamp.o uuid.o varbit.o varchar.o varlena.o \
-	version.o xid.o xml.o
+	ruleutils.o selfuncs.o tid.o timestamp.o varbit.o varchar.o varlena.o version.o \
+	tsginidx.o tsgistidx.o tsquery.o tsquery_cleanup.o tsquery_gist.o \
+	tsquery_op.o tsquery_rewrite.o tsquery_util.o tsrank.o \
+	tsvector.o tsvector_op.o tsvector_parser.o \
+	txid.o uuid.o xid.o xml.o
 
 like.o: like.c like_match.c
 
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 22b8c9ed463b..24e8d7542a28 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -99,7 +99,7 @@ static AclMode convert_tablespace_priv_string(text *priv_type_text);
 static AclMode convert_role_priv_string(text *priv_type_text);
 static AclResult pg_role_aclcheck(Oid role_oid, Oid roleid, AclMode mode);
 
-static void RoleMembershipCacheCallback(Datum arg, Oid relid);
+static void RoleMembershipCacheCallback(Datum arg, int cacheid, ItemPointer tuplePtr);
 
 
 /*
@@ -1002,11 +1002,11 @@ recursive_revoke(Acl *acl,
 	if (grantee == ownerId)
 		return acl;
 
-	/* The grantee might still have the privileges via another grantor */
+	/* The grantee might still have some grant options via another grantor */
 	still_has = aclmask(acl, grantee, ownerId,
 						ACL_GRANT_OPTION_FOR(revoke_privs),
 						ACLMASK_ALL);
-	revoke_privs &= ~still_has;
+	revoke_privs &= ~ACL_OPTION_TO_PRIVS(still_has);
 	if (revoke_privs == ACL_NO_RIGHTS)
 		return acl;
 
@@ -3054,7 +3054,7 @@ initialize_acl(void)
  *		Syscache inval callback function
  */
 static void
-RoleMembershipCacheCallback(Datum arg, Oid relid)
+RoleMembershipCacheCallback(Datum arg, int cacheid, ItemPointer tuplePtr)
 {
 	/* Force membership caches to be recomputed on next use */
 	cached_privs_role = InvalidOid;
diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c
index d7f0c5cac89b..a28b501555ad 100644
--- a/src/backend/utils/adt/array_userfuncs.c
+++ b/src/backend/utils/adt/array_userfuncs.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2003-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.21 2007/01/05 22:19:39 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.23 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -376,7 +376,7 @@ array_cat(PG_FUNCTION_ARGS)
 		dataoffset = 0;			/* marker for no null bitmap */
 		nbytes = ndatabytes + ARR_OVERHEAD_NONULLS(ndims);
 	}
-	result = (ArrayType *) palloc(nbytes);
+	result = (ArrayType *) palloc0(nbytes);
 	SET_VARSIZE(result, nbytes);
 	result->ndim = ndims;
 	result->dataoffset = dataoffset;
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index d3d08c14bbbe..14b8d3f84f96 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -102,10 +102,6 @@ static ArrayType *create_array_envelope(int ndims, int *dimv, int *lbv, int nbyt
 static ArrayType *array_fill_internal(ArrayType *dims, ArrayType *lbs,
 					Datum value, bool isnull, Oid elmtype,
 					FunctionCallInfo fcinfo);
-static Datum array_type_length_coerce_internal(ArrayType *src,
-								  int32 desttypmod,
-								  bool isExplicit,
-								  FmgrInfo *fmgr_info);
 
 /*
  * array_in :
@@ -206,7 +202,7 @@ array_in(PG_FUNCTION_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 					 errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-							ndim, MAXDIM)));
+							ndim + 1, MAXDIM)));
 
 		for (q = p; isdigit((unsigned char) *q) || (*q == '-') || (*q == '+'); q++);
 		if (q == p)				/* no digits? */
@@ -458,7 +454,7 @@ ArrayCount(const char *str, int *dim, char typdelim)
 							ereport(ERROR,
 									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 									 errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
-											nest_level, MAXDIM)));
+											nest_level + 1, MAXDIM)));
 						temp[nest_level] = 0;
 						nest_level++;
 						if (ndim < nest_level)
@@ -1278,7 +1274,7 @@ array_recv(PG_FUNCTION_ARGS)
 		dataoffset = 0;			/* marker for no null bitmap */
 		nbytes += ARR_OVERHEAD_NONULLS(ndim);
 	}
-	retval = (ArrayType *) palloc(nbytes);
+	retval = (ArrayType *) palloc0(nbytes);
 	SET_VARSIZE(retval, nbytes);
 	retval->ndim = ndim;
 	retval->dataoffset = dataoffset;
@@ -1916,7 +1912,7 @@ array_get_slice(ArrayType *array,
 		bytes += ARR_OVERHEAD_NONULLS(ndim);
 	}
 
-	newarray = (ArrayType *) palloc(bytes);
+	newarray = (ArrayType *) palloc0(bytes);
 	SET_VARSIZE(newarray, bytes);
 	newarray->ndim = ndim;
 	newarray->dataoffset = dataoffset;
@@ -2169,7 +2165,7 @@ array_set(ArrayType *array,
 	/*
 	 * OK, create the new array and fill in header/dimensions
 	 */
-	newarray = (ArrayType *) palloc(newsize);
+	newarray = (ArrayType *) palloc0(newsize);
 	SET_VARSIZE(newarray, newsize);
 	newarray->ndim = ndim;
 	newarray->dataoffset = newhasnulls ? overheadlen : 0;
@@ -2464,6 +2460,7 @@ array_set_slice(ArrayType *array,
 	{
 		/*
 		 * here we must allow for possibility of slice larger than orig array
+		 * and/or not adjacent to orig array subscripts
 		 */
 		int			oldlb = ARR_LBOUND(array)[0];
 		int			oldub = oldlb + ARR_DIMS(array)[0] - 1;
@@ -2472,10 +2469,12 @@ array_set_slice(ArrayType *array,
 		char	   *oldarraydata = ARR_DATA_PTR(array);
 		bits8	   *oldarraybitmap = ARR_NULLBITMAP(array);
 
+		/* count/size of old array entries that will go before the slice */
 		itemsbefore = Min(slicelb, oldub + 1) - oldlb;
 		lenbefore = array_nelems_size(oldarraydata, 0, oldarraybitmap,
 									  itemsbefore,
 									  elmlen, elmbyval, elmalign);
+		/* count/size of old array entries that will be replaced by slice */
 		if (slicelb > sliceub)
 		{
 			nolditems = 0;
@@ -2489,13 +2488,14 @@ array_set_slice(ArrayType *array,
 											nolditems,
 											elmlen, elmbyval, elmalign);
 		}
-		itemsafter = oldub - sliceub;
+		/* count/size of old array entries that will go after the slice */
+		itemsafter = oldub + 1 - Max(sliceub + 1, oldlb);
 		lenafter = olddatasize - lenbefore - olditemsize;
 	}
 
 	newsize = overheadlen + olddatasize - olditemsize + newitemsize;
 
-	newarray = (ArrayType *) palloc(newsize);
+	newarray = (ArrayType *) palloc0(newsize);
 	SET_VARSIZE(newarray, newsize);
 	newarray->ndim = ndim;
 	newarray->dataoffset = newhasnulls ? overheadlen : 0;
@@ -2754,7 +2754,7 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType,
 		dataoffset = 0;			/* marker for no null bitmap */
 		nbytes += ARR_OVERHEAD_NONULLS(ndim);
 	}
-	result = (ArrayType *) palloc(nbytes);
+	result = (ArrayType *) palloc0(nbytes);
 	SET_VARSIZE(result, nbytes);
 	result->ndim = ndim;
 	result->dataoffset = dataoffset;
@@ -2896,7 +2896,7 @@ construct_md_array(Datum *elems,
 			}
 		}
 
-		nbytes = att_align(nbytes, elmalign);
+		nbytes = att_align_nominal(nbytes, elmalign);
 	} 
 	else 
 	{
@@ -2963,7 +2963,7 @@ construct_empty_array(Oid elmtype)
 {
 	ArrayType  *result;
 
-	result = (ArrayType *) palloc(sizeof(ArrayType));
+	result = (ArrayType *) palloc0(sizeof(ArrayType));
 	SET_VARSIZE(result, sizeof(ArrayType));
 	result->ndim = 0;
 	result->dataoffset = 0;
@@ -4221,222 +4221,6 @@ array_insert_slice(ArrayType *destArray,
 						  orignitems - orig_offset);
 }
 
-/*
- * array_type_coerce -- allow explicit or assignment coercion from
- * one array type to another.
- *
- * array_type_length_coerce -- the same, for cases where both type and length
- * coercion are done by a single function on the element type.
- *
- * Caller should have already verified that the source element type can be
- * coerced into the target element type.
- */
-Datum
-array_type_coerce(PG_FUNCTION_ARGS)
-{
-	ArrayType  *src = PG_GETARG_ARRAYTYPE_P(0);
-	FmgrInfo   *fmgr_info = fcinfo->flinfo;
-
-	return array_type_length_coerce_internal(src, -1, false, fmgr_info);
-}
-
-Datum
-array_type_length_coerce(PG_FUNCTION_ARGS)
-{
-	ArrayType  *src = PG_GETARG_ARRAYTYPE_P(0);
-	int32		desttypmod = PG_GETARG_INT32(1);
-	bool		isExplicit = PG_GETARG_BOOL(2);
-	FmgrInfo   *fmgr_info = fcinfo->flinfo;
-
-	return array_type_length_coerce_internal(src, desttypmod,
-											 isExplicit, fmgr_info);
-}
-
-static Datum
-array_type_length_coerce_internal(ArrayType *src,
-								  int32 desttypmod,
-								  bool isExplicit,
-								  FmgrInfo *fmgr_info)
-{
-	Oid			src_elem_type = ARR_ELEMTYPE(src);
-	typedef struct
-	{
-		Oid			srctype;
-		Oid			desttype;
-		FmgrInfo	coerce_finfo;
-		ArrayMapState amstate;
-	} atc_extra;
-	atc_extra  *my_extra;
-	FunctionCallInfoData locfcinfo;
-
-	/*
-	 * We arrange to look up the coercion function only once per series of
-	 * calls, assuming the input data type doesn't change underneath us.
-	 * (Output type can't change.)
-	 */
-	my_extra = (atc_extra *) fmgr_info->fn_extra;
-	if (my_extra == NULL)
-	{
-		fmgr_info->fn_extra = MemoryContextAllocZero(fmgr_info->fn_mcxt,
-													 sizeof(atc_extra));
-		my_extra = (atc_extra *) fmgr_info->fn_extra;
-	}
-
-	if (my_extra->srctype != src_elem_type)
-	{
-		Oid			tgt_type = get_fn_expr_rettype(fmgr_info);
-		Oid			tgt_elem_type;
-		Oid			funcId;
-
-		if (tgt_type == InvalidOid)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine target array type")));
-
-		tgt_elem_type = get_element_type(tgt_type);
-		if (tgt_elem_type == InvalidOid)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("target type is not an array")));
-
-		/*
-		 * We don't deal with domain constraints yet, so bail out. This isn't
-		 * currently a problem, because we also don't support arrays of domain
-		 * type elements either. But in the future we might. At that point
-		 * consideration should be given to removing the check below and
-		 * adding a domain constraints check to the coercion.
-		 */
-		if (getBaseType(tgt_elem_type) != tgt_elem_type)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("array coercion to domain type elements not "
-							"currently supported")));
-
-		if (COERCION_PATH_NONE == find_coercion_pathway(tgt_elem_type, src_elem_type,
-								   COERCION_EXPLICIT, &funcId))
-		{
-			/* should never happen, but check anyway */
-			elog(ERROR, "no conversion function from %s to %s",
-				 format_type_be(src_elem_type),
-				 format_type_be(tgt_elem_type));
-		}
-		if (OidIsValid(funcId))
-			fmgr_info_cxt(funcId, &my_extra->coerce_finfo, fmgr_info->fn_mcxt);
-		else
-			my_extra->coerce_finfo.fn_oid = InvalidOid;
-		my_extra->srctype = src_elem_type;
-		my_extra->desttype = tgt_elem_type;
-	}
-
-	/*
-	 * If it's binary-compatible, modify the element type in the array header,
-	 * but otherwise leave the array as we received it.
-	 */
-	if (my_extra->coerce_finfo.fn_oid == InvalidOid)
-	{
-		ArrayType  *result;
-
-		result = (ArrayType *) DatumGetPointer(datumCopy(PointerGetDatum(src),
-														 false, -1));
-		ARR_ELEMTYPE(result) = my_extra->desttype;
-		PG_RETURN_ARRAYTYPE_P(result);
-	}
-
-	/*
-	 * Use array_map to apply the function to each array element.
-	 *
-	 * We pass on the desttypmod and isExplicit flags whether or not the
-	 * function wants them.
-	 */
-	InitFunctionCallInfoData(locfcinfo, &my_extra->coerce_finfo, 3,
-							 NULL, NULL);
-	locfcinfo.arg[0] = PointerGetDatum(src);
-	locfcinfo.arg[1] = Int32GetDatum(desttypmod);
-	locfcinfo.arg[2] = BoolGetDatum(isExplicit);
-	locfcinfo.argnull[0] = false;
-	locfcinfo.argnull[1] = false;
-	locfcinfo.argnull[2] = false;
-
-	return array_map(&locfcinfo, my_extra->srctype, my_extra->desttype,
-					 &my_extra->amstate);
-}
-
-/*
- * array_length_coerce -- apply the element type's length-coercion routine
- *		to each element of the given array.
- */
-Datum
-array_length_coerce(PG_FUNCTION_ARGS)
-{
-	ArrayType  *v = PG_GETARG_ARRAYTYPE_P(0);
-	int32		desttypmod = PG_GETARG_INT32(1);
-	bool		isExplicit = PG_GETARG_BOOL(2);
-	FmgrInfo   *fmgr_info = fcinfo->flinfo;
-	typedef struct
-	{
-		Oid			elemtype;
-		FmgrInfo	coerce_finfo;
-		ArrayMapState amstate;
-	} alc_extra;
-	alc_extra  *my_extra;
-	FunctionCallInfoData locfcinfo;
-
-	/* If no typmod is provided, shortcircuit the whole thing */
-	if (desttypmod < 0)
-		PG_RETURN_ARRAYTYPE_P(v);
-
-	/*
-	 * We arrange to look up the element type's coercion function only once
-	 * per series of calls, assuming the element type doesn't change
-	 * underneath us.
-	 */
-	my_extra = (alc_extra *) fmgr_info->fn_extra;
-	if (my_extra == NULL)
-	{
-		fmgr_info->fn_extra = MemoryContextAllocZero(fmgr_info->fn_mcxt,
-													 sizeof(alc_extra));
-		my_extra = (alc_extra *) fmgr_info->fn_extra;
-	}
-
-	if (my_extra->elemtype != ARR_ELEMTYPE(v))
-	{
-		Oid			funcId;
-
-		find_typmod_coercion_function(ARR_ELEMTYPE(v), &funcId);
-
-		if (OidIsValid(funcId))
-			fmgr_info_cxt(funcId, &my_extra->coerce_finfo, fmgr_info->fn_mcxt);
-		else
-			my_extra->coerce_finfo.fn_oid = InvalidOid;
-		my_extra->elemtype = ARR_ELEMTYPE(v);
-	}
-
-	/*
-	 * If we didn't find a coercion function, return the array unmodified
-	 * (this should not happen in the normal course of things, but might
-	 * happen if this function is called manually).
-	 */
-	if (my_extra->coerce_finfo.fn_oid == InvalidOid)
-		PG_RETURN_ARRAYTYPE_P(v);
-
-	/*
-	 * Use array_map to apply the function to each array element.
-	 *
-	 * Note: we pass isExplicit whether or not the function wants it ...
-	 */
-	InitFunctionCallInfoData(locfcinfo, &my_extra->coerce_finfo, 3,
-							 NULL, NULL);
-	locfcinfo.arg[0] = PointerGetDatum(v);
-	locfcinfo.arg[1] = Int32GetDatum(desttypmod);
-	locfcinfo.arg[2] = BoolGetDatum(isExplicit);
-	locfcinfo.argnull[0] = false;
-	locfcinfo.argnull[1] = false;
-	locfcinfo.argnull[2] = false;
-
-	return array_map(&locfcinfo, ARR_ELEMTYPE(v), ARR_ELEMTYPE(v),
-					 &my_extra->amstate);
-}
-
 /*
  * accumArrayResult - accumulate one (more) Datum for an array result
  *
diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c
index b7f0a4e97037..5d6be2c5424b 100644
--- a/src/backend/utils/adt/arrayutils.c
+++ b/src/backend/utils/adt/arrayutils.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/arrayutils.c,v 1.23 2007/01/05 22:19:40 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/arrayutils.c,v 1.26 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index d6baaba54f0c..aed579da6759 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -257,7 +257,6 @@ booltext(PG_FUNCTION_ARGS)
 }
 
 
-
 /*****************************************************************************
  *	 PUBLIC ROUTINES														 *
  *****************************************************************************/
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index ae41d6694c36..891088c180f3 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -13,7 +13,7 @@
  * this version handles 64 bit numbers and so can hold values up to
  * $92,233,720,368,547,758.07.
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.69 2007/01/03 01:19:50 darcy Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.77.2.2 2009/06/10 16:31:38 tgl Exp $
  */
 
 #include "postgres.h"
@@ -27,12 +27,6 @@
 #include "utils/cash.h"
 #include "utils/pg_locale.h"
 
-#define CASH_BUFSZ		36
-
-#define TERMINATOR		(CASH_BUFSZ - 1)
-#define LAST_PAREN		(TERMINATOR - 1)
-#define LAST_DIGIT		(LAST_PAREN - 1)
-
 /*
  * Cash is a pass-by-ref SQL type, so we must pass and return pointers.
  * These macros and support routine hide the pass-by-refness.
@@ -83,7 +77,6 @@ num_word(Cash value)
 		else
 			sprintf(buf, "%s hundred %s %s",
 					small[value / 100], big[tu / 10], small[tu % 10]);
-
 	}
 	else
 	{
@@ -123,13 +116,13 @@ cash_in(PG_FUNCTION_ARGS)
 	Cash		value = 0;
 	Cash		dec = 0;
 	Cash		sgn = 1;
-	int			seen_dot = 0;
+	bool		seen_dot = false;
 	const char *s = str;
 	int			fpoint;
-	char		dsymbol,
-				ssymbol,
-				psymbol;
-	const char *nsymbol,
+	char		dsymbol;
+	const char *ssymbol,
+			   *psymbol,
+			   *nsymbol,
 			   *csymbol;
 
 	struct lconv *lconvert = PGLC_localeconv();
@@ -148,14 +141,22 @@ cash_in(PG_FUNCTION_ARGS)
 	if (fpoint < 0 || fpoint > 10)
 		fpoint = 2;				/* best guess in this case, I think */
 
-	dsymbol = ((*lconvert->mon_decimal_point != '\0') ? *lconvert->mon_decimal_point : '.');
-	ssymbol = ((*lconvert->mon_thousands_sep != '\0') ? *lconvert->mon_thousands_sep : ',');
-	csymbol = ((*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$");
-	psymbol = ((*lconvert->positive_sign != '\0') ? *lconvert->positive_sign : '+');
-	nsymbol = ((*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-");
+	/* we restrict dsymbol to be a single byte, but not the other symbols */
+	if (*lconvert->mon_decimal_point != '\0' &&
+		lconvert->mon_decimal_point[1] == '\0')
+		dsymbol = *lconvert->mon_decimal_point;
+	else
+		dsymbol = '.';
+	if (*lconvert->mon_thousands_sep != '\0')
+		ssymbol = lconvert->mon_thousands_sep;
+	else						/* ssymbol should not equal dsymbol */
+		ssymbol = (dsymbol != ',') ? "," : ".";
+	csymbol = (*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$";
+	psymbol = (*lconvert->positive_sign != '\0') ? lconvert->positive_sign : "+";
+	nsymbol = (*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-";
 
 #ifdef CASHDEBUG
-	printf("cashin- precision '%d'; decimal '%c'; thousands '%c'; currency '%s'; positive '%c'; negative '%s'\n",
+	printf("cashin- precision '%d'; decimal '%c'; thousands '%s'; currency '%s'; positive '%s'; negative '%s'\n",
 		   fpoint, dsymbol, ssymbol, csymbol, psymbol, nsymbol);
 #endif
 
@@ -177,23 +178,20 @@ cash_in(PG_FUNCTION_ARGS)
 	{
 		sgn = -1;
 		s += strlen(nsymbol);
-#ifdef CASHDEBUG
-		printf("cashin- negative symbol; string is '%s'\n", s);
-#endif
 	}
 	else if (*s == '(')
 	{
 		sgn = -1;
 		s++;
-
 	}
-	else if (*s == psymbol)
-		s++;
+	else if (strncmp(s, psymbol, strlen(psymbol)) == 0)
+		s += strlen(psymbol);
 
 #ifdef CASHDEBUG
 	printf("cashin- string is '%s'\n", s);
 #endif
 
+	/* allow whitespace and currency symbol after the sign, too */
 	while (isspace((unsigned char) *s))
 		s++;
 	if (strncmp(s, csymbol, strlen(csymbol)) == 0)
@@ -203,57 +201,63 @@ cash_in(PG_FUNCTION_ARGS)
 	printf("cashin- string is '%s'\n", s);
 #endif
 
-	for (;; s++)
+	for (; *s; s++)
 	{
-		/* we look for digits as int8 as we have less */
+		/* we look for digits as long as we have found less */
 		/* than the required number of decimal places */
-		if (isdigit((unsigned char) *s) && dec < fpoint)
+		if (isdigit((unsigned char) *s) && (!seen_dot || dec < fpoint))
 		{
-			value = (value * 10) + *s - '0';
+			value = (value * 10) + (*s - '0');
 
 			if (seen_dot)
 				dec++;
-
 		}
 		/* decimal point? then start counting fractions... */
 		else if (*s == dsymbol && !seen_dot)
 		{
-			seen_dot = 1;
-
-		}
-		/* "thousands" separator? then skip... */
-		else if (*s == ssymbol)
-		{
-
+			seen_dot = true;
 		}
+		/* ignore if "thousands" separator, else we're done */
+		else if (strncmp(s, ssymbol, strlen(ssymbol)) == 0)
+			s += strlen(ssymbol) - 1;
 		else
-		{
-			/* round off */
-			if (isdigit((unsigned char) *s) && *s >= '5')
-				value++;
-
-			/* adjust for less than required decimal places */
-			for (; dec < fpoint; dec++)
-				value *= 10;
-
 			break;
-		}
 	}
 
-	/* should only be trailing digits followed by whitespace or closing paren */
-	while (isdigit(*s)) s++;
-	while (isspace((unsigned char) *s) || *s == ')')
-		s++;
+	/* round off if there's another digit */
+	if (isdigit((unsigned char) *s) && *s >= '5')
+		value++;
 
-	if (*s != '\0')
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for type money: \"%s\"", str)));
+	/* adjust for less than required decimal places */
+	for (; dec < fpoint; dec++)
+		value *= 10;
+
+	/*
+	 * should only be trailing digits followed by whitespace, right paren,
+	 * or possibly a trailing minus sign
+	 */
+	while (isdigit((unsigned char) *s))
+		s++;
+	while (*s)
+	{
+		if (isspace((unsigned char) *s) || *s == ')')
+			s++;
+		else if (strncmp(s, nsymbol, strlen(nsymbol)) == 0)
+		{
+			sgn = -1;
+			s += strlen(nsymbol);
+		}
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+					 errmsg("invalid input syntax for type money: \"%s\"",
+							str)));
+	}
 
 	result = value * sgn;
 
 #ifdef CASHDEBUG
-	printf("cashin- result is %d\n", result);
+	printf("cashin- result is " INT64_FORMAT "\n", result);
 #endif
 
 	PG_RETURN_CASH(result);
@@ -261,26 +265,24 @@ cash_in(PG_FUNCTION_ARGS)
 
 
 /* cash_out()
- * Function to convert cash to a dollars and cents representation.
- * XXX HACK This code appears to assume US conventions for
- *	positive-valued amounts. - tgl 97/04/14
+ * Function to convert cash to a dollars and cents representation, using
+ * the lc_monetary locale's formatting.
  */
 Datum
 cash_out(PG_FUNCTION_ARGS)
 {
 	Cash		value = PG_GETARG_CASH(0);
 	char	   *result;
-	char		buf[CASH_BUFSZ];
-	int			minus = 0;
-	int			count = LAST_DIGIT;
-	int			point_pos;
-	int			comma_position = 0;
+	char		buf[128];
+	char	   *bufptr;
+	bool		minus = false;
+	int			digit_pos;
 	int			points,
 				mon_group;
-	char		comma;
-	const char *csymbol,
-			   *nsymbol;
 	char		dsymbol;
+	const char *ssymbol,
+			   *csymbol,
+			   *nsymbol;
 	char		convention;
 
 	struct lconv *lconvert = PGLC_localeconv();
@@ -298,66 +300,79 @@ cash_out(PG_FUNCTION_ARGS)
 	if (mon_group <= 0 || mon_group > 6)
 		mon_group = 3;
 
-	comma = ((*lconvert->mon_thousands_sep != '\0') ? *lconvert->mon_thousands_sep : ',');
 	convention = lconvert->n_sign_posn;
-	dsymbol = ((*lconvert->mon_decimal_point != '\0') ? *lconvert->mon_decimal_point : '.');
-	csymbol = ((*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$");
-	nsymbol = ((*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-");
-
-	point_pos = LAST_DIGIT - points;
 
-	/* allow more than three decimal points and separate them */
-	if (comma)
-	{
-		point_pos -= (points - 1) / mon_group;
-		comma_position = point_pos % (mon_group + 1);
-	}
+	/* we restrict dsymbol to be a single byte, but not the other symbols */
+	if (*lconvert->mon_decimal_point != '\0' &&
+		lconvert->mon_decimal_point[1] == '\0')
+		dsymbol = *lconvert->mon_decimal_point;
+	else
+		dsymbol = '.';
+	if (*lconvert->mon_thousands_sep != '\0')
+		ssymbol = lconvert->mon_thousands_sep;
+	else						/* ssymbol should not equal dsymbol */
+		ssymbol = (dsymbol != ',') ? "," : ".";
+	csymbol = (*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$";
+	nsymbol = (*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-";
 
 	/* we work with positive amounts and add the minus sign at the end */
 	if (value < 0)
 	{
-		minus = 1;
+		minus = true;
 		value = -value;
 	}
 
-	/* allow for trailing negative strings */
-	MemSet(buf, ' ', CASH_BUFSZ);
-	buf[TERMINATOR] = buf[LAST_PAREN] = '\0';
+	/* we build the result string right-to-left in buf[] */
+	bufptr = buf + sizeof(buf) - 1;
+	*bufptr = '\0';
 
-	while (value || count > (point_pos - 2))
+	/*
+	 * Generate digits till there are no non-zero digits left and we emitted
+	 * at least one to the left of the decimal point.  digit_pos is the
+	 * current digit position, with zero as the digit just left of the decimal
+	 * point, increasing to the right.
+	 */
+	digit_pos = points;
+	do
 	{
-		if (points && count == point_pos)
-			buf[count--] = dsymbol;
-		else if (comma && count % (mon_group + 1) == comma_position)
-			buf[count--] = comma;
+		if (points && digit_pos == 0)
+		{
+			/* insert decimal point */
+			*(--bufptr) = dsymbol;
+		}
+		else if (digit_pos < points && (digit_pos % mon_group) == 0)
+		{
+			/* insert thousands sep */
+			bufptr -= strlen(ssymbol);
+			memcpy(bufptr, ssymbol, strlen(ssymbol));
+		}
 
-		buf[count--] = ((uint64) value % 10) + '0';
+		*(--bufptr) = ((uint64) value % 10) + '0';
 		value = ((uint64) value) / 10;
-	}
-
-	strncpy((buf + count - strlen(csymbol) + 1), csymbol, strlen(csymbol));
-	count -= strlen(csymbol) - 1;
+		digit_pos--;
+	} while (value || digit_pos >= 0);
 
-	if (buf[LAST_DIGIT] == ',')
-		buf[LAST_DIGIT] = buf[LAST_PAREN];
+	/* prepend csymbol */
+	bufptr -= strlen(csymbol);
+	memcpy(bufptr, csymbol, strlen(csymbol));
 
 	/* see if we need to signify negative amount */
 	if (minus)
 	{
-		result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol));
+		result = palloc(strlen(bufptr) + strlen(nsymbol) + 3);
 
 		/* Position code of 0 means use parens */
 		if (convention == 0)
-			sprintf(result, "(%s)", buf + count);
+			sprintf(result, "(%s)", bufptr);
 		else if (convention == 2)
-			sprintf(result, "%s%s", buf + count, nsymbol);
+			sprintf(result, "%s%s", bufptr, nsymbol);
 		else
-			sprintf(result, "%s%s", nsymbol, buf + count);
+			sprintf(result, "%s%s", nsymbol, bufptr);
 	}
 	else
 	{
-		result = palloc(CASH_BUFSZ + 2 - count);
-		strcpy(result, buf + count);
+		/* just emit what we have */
+		result = pstrdup(bufptr);
 	}
 
 	PG_RETURN_CSTRING(result);
@@ -371,7 +386,7 @@ cash_recv(PG_FUNCTION_ARGS)
 {
 	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
 
-	PG_RETURN_CASH((Cash) pq_getmsgint(buf, sizeof(Cash)));
+	PG_RETURN_CASH((Cash) pq_getmsgint64(buf));
 }
 
 /*
@@ -384,7 +399,7 @@ cash_send(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, arg1, sizeof(Cash));
+	pq_sendint64(&buf, arg1);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -651,7 +666,7 @@ Datum
 cash_mul_int4(PG_FUNCTION_ARGS)
 {
 	Cash		c = PG_GETARG_CASH(0);
-	int64		i = PG_GETARG_INT64(1);
+	int32		i = PG_GETARG_INT32(1);
 	Cash		result;
 
 	result = c * i;
@@ -682,7 +697,7 @@ Datum
 cash_div_int4(PG_FUNCTION_ARGS)
 {
 	Cash		c = PG_GETARG_CASH(0);
-	int64		i = PG_GETARG_INT64(1);
+	int32		i = PG_GETARG_INT32(1);
 	Cash		result;
 
 	if (i == 0)
@@ -782,7 +797,7 @@ Datum
 cash_words(PG_FUNCTION_ARGS)
 {
 	Cash		value = PG_GETARG_CASH(0);
-	uint64 val;
+	uint64		val;
 	char		buf[256];
 	char	   *p = buf;
 	Cash		m0;
@@ -807,13 +822,13 @@ cash_words(PG_FUNCTION_ARGS)
 	/* Now treat as unsigned, to avoid trouble at INT_MIN */
 	val = (uint64) value;
 
-	m0 = val % 100ll;				/* cents */
-	m1 = (val / 100ll) % 1000;	/* hundreds */
-	m2 = (val / 100000ll) % 1000; /* thousands */
-	m3 = val / 100000000ll % 1000;	/* millions */
-	m4 = val / 100000000000ll % 1000;	/* billions */
-	m5 = val / 100000000000000ll % 1000;	/* trillions */
-	m6 = val / 100000000000000000ll % 1000;	/* quadrillions */
+	m0 = val % INT64CONST(100);							/* cents */
+	m1 = (val / INT64CONST(100)) % 1000;				/* hundreds */
+	m2 = (val / INT64CONST(100000)) % 1000;				/* thousands */
+	m3 = (val / INT64CONST(100000000)) % 1000;			/* millions */
+	m4 = (val / INT64CONST(100000000000)) % 1000;		/* billions */
+	m5 = (val / INT64CONST(100000000000000)) % 1000;	/* trillions */
+	m6 = (val / INT64CONST(100000000000000000)) % 1000;	/* quadrillions */
 
 	if (m6)
 	{
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index fc3ffab633ff..9ed7a08905c2 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/char.c,v 1.46 2007/01/05 22:19:40 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/char.c,v 1.48 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 1c16d4d11543..fccfedc2a323 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.128 2007/02/16 03:39:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.138.2.1 2008/07/07 18:09:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,9 +49,9 @@ static void AdjustTimeForTypmod(TimeADT *time, int32 typmod);
 static int32
 anytime_typmodin(bool istz, ArrayType *ta)
 {
-	int32	typmod;
-	int32	*tl;
-	int		n;
+	int32		typmod;
+	int32	   *tl;
+	int			n;
 
 	tl = ArrayGetIntegerTypmods(ta, &n);
 
@@ -74,10 +74,11 @@ anytime_typmodin(bool istz, ArrayType *ta)
 		ereport(WARNING,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("TIME(%d)%s precision reduced to maximum allowed, %d",
-						*tl, (istz ? " WITH TIME ZONE" : "" ),
+						*tl, (istz ? " WITH TIME ZONE" : ""),
 						MAX_TIME_PRECISION)));
 		typmod = MAX_TIME_PRECISION;
-	} else
+	}
+	else
 		typmod = *tl;
 
 	return typmod;
@@ -87,7 +88,7 @@ anytime_typmodin(bool istz, ArrayType *ta)
 static char *
 anytime_typmodout(bool istz, int32 typmod)
 {
-	char    *res = (char *) palloc(64);
+	char	   *res = (char *) palloc(64);
 	const char *tz = istz ? " with time zone" : " without time zone";
 
 	if (typmod >= 0)
@@ -339,12 +340,12 @@ date_mii(PG_FUNCTION_ARGS)
 static Timestamp
 date2timestamp(DateADT dateVal)
 {
-	Timestamp result;
+	Timestamp	result;
 
 #ifdef HAVE_INT64_TIMESTAMP
 	/* date is days since 2000, timestamp is microseconds since same... */
 	result = dateVal * USECS_PER_DAY;
-		/* Date's range is wider than timestamp's, so check for overflow */
+	/* Date's range is wider than timestamp's, so must check for overflow */
 	if (result / USECS_PER_DAY != dateVal)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
@@ -375,7 +376,7 @@ date2timestamptz(DateADT dateVal)
 
 #ifdef HAVE_INT64_TIMESTAMP
 	result = dateVal * USECS_PER_DAY + tz * USECS_PER_SEC;
-		/* Date's range is wider than timestamp's, so check for overflow */
+	/* Date's range is wider than timestamp's, so must check for overflow */
 	if ((result - tz * USECS_PER_SEC) / USECS_PER_DAY != dateVal)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
@@ -387,6 +388,32 @@ date2timestamptz(DateADT dateVal)
 	return result;
 }
 
+/*
+ * date2timestamp_no_overflow
+ *
+ * This is chartered to produce a double value that is numerically
+ * equivalent to the corresponding Timestamp value, if the date is in the
+ * valid range of Timestamps, but in any case not throw an overflow error.
+ * We can do this since the numerical range of double is greater than
+ * that of non-erroneous timestamps.  The results are currently only
+ * used for statistical estimation purposes.
+ */
+double
+date2timestamp_no_overflow(DateADT dateVal)
+{
+	double	result;
+
+#ifdef HAVE_INT64_TIMESTAMP
+	/* date is days since 2000, timestamp is microseconds since same... */
+	result = dateVal * (double) USECS_PER_DAY;
+#else
+	/* date is days since 2000, timestamp is seconds since same... */
+	result = dateVal * (double) SECS_PER_DAY;
+#endif
+
+	return result;
+}
+
 
 /*
  * Crosstype comparison functions for dates
@@ -889,64 +916,6 @@ abstime_date(PG_FUNCTION_ARGS)
 }
 
 
-/* date_text()
- * Convert date to text data type.
- */
-Datum
-date_text(PG_FUNCTION_ARGS)
-{
-	/* Input is a Date, but may as well leave it in Datum form */
-	Datum		date = PG_GETARG_DATUM(0);
-	text	   *result;
-	char	   *str;
-	int			len;
-
-	str = DatumGetCString(DirectFunctionCall1(date_out, date));
-
-	len = strlen(str) + VARHDRSZ;
-
-	result = palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
-/* text_date()
- * Convert text string to date.
- * Text type is not null terminated, so use temporary string
- *	then call the standard input routine.
- */
-Datum
-text_date(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			i;
-	char	   *sp,
-			   *dp,
-				dstr[MAXDATELEN + 1];
-
-	if (VARSIZE(str) - VARHDRSZ > MAXDATELEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
-				 errmsg("invalid input syntax for type date: \"%s\"",
-						DatumGetCString(DirectFunctionCall1(textout,
-													PointerGetDatum(str))))));
-	sp = VARDATA(str);
-	dp = dstr;
-	for (i = 0; i < (VARSIZE(str) - VARHDRSZ); i++)
-		*dp++ = *sp++;
-	*dp = '\0';
-
-	return DirectFunctionCall1(date_in,
-							   CStringGetDatum(dstr));
-}
-
-
 /*****************************************************************************
  *	 Time ADT
  *****************************************************************************/
@@ -1105,7 +1074,7 @@ time_send(PG_FUNCTION_ARGS)
 Datum
 timetypmodin(PG_FUNCTION_ARGS)
 {
-	ArrayType *ta = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *ta = PG_GETARG_ARRAYTYPE_P(0);
 
 	PG_RETURN_INT32(anytime_typmodin(false, ta));
 }
@@ -1113,7 +1082,7 @@ timetypmodin(PG_FUNCTION_ARGS)
 Datum
 timetypmodout(PG_FUNCTION_ARGS)
 {
-	int32 typmod = PG_GETARG_INT32(0);
+	int32		typmod = PG_GETARG_INT32(0);
 
 	PG_RETURN_CSTRING(anytime_typmodout(false, typmod));
 }
@@ -1273,6 +1242,17 @@ time_cmp(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32(0);
 }
 
+Datum
+time_hash(PG_FUNCTION_ARGS)
+{
+	/* We can use either hashint8 or hashfloat8 directly */
+#ifdef HAVE_INT64_TIMESTAMP
+	return hashint8(fcinfo);
+#else
+	return hashfloat8(fcinfo);
+#endif
+}
+
 Datum
 time_larger(PG_FUNCTION_ARGS)
 {
@@ -1708,66 +1688,6 @@ time_mi_interval(PG_FUNCTION_ARGS)
 }
 
 
-/* time_text()
- * Convert time to text data type.
- */
-Datum
-time_text(PG_FUNCTION_ARGS)
-{
-	/* Input is a Time, but may as well leave it in Datum form */
-	Datum		time = PG_GETARG_DATUM(0);
-	text	   *result;
-	char	   *str;
-	int			len;
-
-	str = DatumGetCString(DirectFunctionCall1(time_out, time));
-
-	len = strlen(str) + VARHDRSZ;
-
-	result = palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
-/* text_time()
- * Convert text string to time.
- * Text type is not null terminated, so use temporary string
- *	then call the standard input routine.
- */
-Datum
-text_time(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			i;
-	char	   *sp,
-			   *dp,
-				dstr[MAXDATELEN + 1];
-
-	if (VARSIZE(str) - VARHDRSZ > MAXDATELEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
-				 errmsg("invalid input syntax for type time: \"%s\"",
-						DatumGetCString(DirectFunctionCall1(textout, 
-													PointerGetDatum(str))))));
-
-	sp = VARDATA(str);
-	dp = dstr;
-	for (i = 0; i < (VARSIZE(str) - VARHDRSZ); i++)
-		*dp++ = *sp++;
-	*dp = '\0';
-
-	return DirectFunctionCall3(time_in,
-							   CStringGetDatum(dstr),
-							   ObjectIdGetDatum(InvalidOid),
-							   Int32GetDatum(-1));
-}
-
 /* time_part()
  * Extract specified field from time type.
  */
@@ -1998,7 +1918,7 @@ timetz_send(PG_FUNCTION_ARGS)
 Datum
 timetztypmodin(PG_FUNCTION_ARGS)
 {
-	ArrayType *ta = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *ta = PG_GETARG_ARRAYTYPE_P(0);
 
 	PG_RETURN_INT32(anytime_typmodin(true, ta));
 }
@@ -2006,7 +1926,7 @@ timetztypmodin(PG_FUNCTION_ARGS)
 Datum
 timetztypmodout(PG_FUNCTION_ARGS)
 {
-	int32 typmod = PG_GETARG_INT32(0);
+	int32		typmod = PG_GETARG_INT32(0);
 
 	PG_RETURN_CSTRING(anytime_typmodout(true, typmod));
 }
@@ -2170,20 +2090,27 @@ timetz_cmp(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32(timetz_cmp_internal(time1, time2));
 }
 
-/*
- * timetz, being an unusual size, needs a specialized hash function.
- */
 Datum
 timetz_hash(PG_FUNCTION_ARGS)
 {
 	TimeTzADT  *key = PG_GETARG_TIMETZADT_P(0);
+	uint32		thash;
 
 	/*
-	 * Specify hash length as sizeof(double) + sizeof(int4), not as
-	 * sizeof(TimeTzADT), so that any garbage pad bytes in the structure won't
-	 * be included in the hash!
+	 * To avoid any problems with padding bytes in the struct, we figure the
+	 * field hashes separately and XOR them.  This also provides a convenient
+	 * framework for dealing with the fact that the time field might be either
+	 * double or int64.
 	 */
-	return hash_any((unsigned char *) key, sizeof(key->time) + sizeof(key->zone));
+#ifdef HAVE_INT64_TIMESTAMP
+	thash = DatumGetUInt32(DirectFunctionCall1(hashint8,
+											   Int64GetDatumFast(key->time)));
+#else
+	thash = DatumGetUInt32(DirectFunctionCall1(hashfloat8,
+											 Float8GetDatumFast(key->time)));
+#endif
+	thash ^= DatumGetUInt32(hash_uint32(key->zone));
+	PG_RETURN_UINT32(thash);
 }
 
 Datum
@@ -2495,66 +2422,6 @@ datetimetz_timestamptz(PG_FUNCTION_ARGS)
 }
 
 
-/* timetz_text()
- * Convert timetz to text data type.
- */
-Datum
-timetz_text(PG_FUNCTION_ARGS)
-{
-	/* Input is a Timetz, but may as well leave it in Datum form */
-	Datum		timetz = PG_GETARG_DATUM(0);
-	text	   *result;
-	char	   *str;
-	int			len;
-
-	str = DatumGetCString(DirectFunctionCall1(timetz_out, timetz));
-
-	len = strlen(str) + VARHDRSZ;
-
-	result = palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
-/* text_timetz()
- * Convert text string to timetz.
- * Text type is not null terminated, so use temporary string
- *	then call the standard input routine.
- */
-Datum
-text_timetz(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			i;
-	char	   *sp,
-			   *dp,
-				dstr[MAXDATELEN + 1];
-
-	if (VARSIZE(str) - VARHDRSZ > MAXDATELEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
-		  errmsg("invalid input syntax for type time with time zone: \"%s\"",
-				 DatumGetCString(DirectFunctionCall1(textout, 
-													 PointerGetDatum(str))))));
-
-	sp = VARDATA(str);
-	dp = dstr;
-	for (i = 0; i < (VARSIZE(str) - VARHDRSZ); i++)
-		*dp++ = *sp++;
-	*dp = '\0';
-
-	return DirectFunctionCall3(timetz_in,
-							   CStringGetDatum(dstr),
-							   ObjectIdGetDatum(InvalidOid),
-							   Int32GetDatum(-1));
-}
-
 /* timetz_part()
  * Extract specified field from time type.
  */
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index f9f91cc8195c..5c181e9ecc65 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -276,7 +276,6 @@ static const datetkn *deltacache[MAXDATEFIELDS] = {NULL};
 /*
  * strtoi --- just like strtol, but returns int not long
  */
-
 static inline int strtoi(const char *nptr, char **endptr, __attribute__((unused)) int base)
 {
 	/* Assume base = 10 */
@@ -743,7 +742,7 @@ ParseDateTime(const char *timestr, char *workbuf, size_t buflen,
 		 */
 		else if (isalpha((unsigned char) *cp))
 		{
-			bool	is_date;
+			bool		is_date;
 
 			ftype[nf] = DTK_STRING;
 			APPEND_CHAR(bufp, bufend, pg_tolower((unsigned char) *cp++));
@@ -2337,12 +2336,12 @@ ValidateDate(int fmask, bool is2digits, bool bc, struct pg_tm * tm)
 			if (tm->tm_year <= 0)
 				return DTERR_FIELD_OVERFLOW;
 			/* internally, we represent 1 BC as year zero, 2 BC as -1, etc */
-				tm->tm_year = -(tm->tm_year - 1);
+			tm->tm_year = -(tm->tm_year - 1);
 		}
 		else if (is2digits)
 		{
 			/* process 1 or 2-digit input as 1970-2069 AD, allow '0' and '00' */
-			if (tm->tm_year < 0)				/* just paranoia */
+			if (tm->tm_year < 0)	/* just paranoia */
 				return DTERR_FIELD_OVERFLOW;
 			if (tm->tm_year < 70)
 				tm->tm_year += 2000;
@@ -2790,9 +2789,6 @@ DecodeNumberField(int len, char *str, int fmask,
  * Return 0 if okay (and set *tzp), a DTERR code if not okay.
  *
  * NB: this must *not* ereport on failure; see commands/variable.c.
- *
- * Note: we allow timezone offsets up to 13:59.  There are places that
- * use +1300 summer time.
  */
 static int
 DecodeTimezone(char *str, int *tzp)
@@ -2837,7 +2833,8 @@ DecodeTimezone(char *str, int *tzp)
 	else
 		min = 0;
 
-	if (hr < 0 || hr > 14)
+	/* Range-check the values; see notes in utils/timestamp.h */
+	if (hr < 0 || hr > MAX_TZDISP_HOUR)
 		return DTERR_TZDISP_OVERFLOW;
 	if (min < 0 || min >= 60)
 		return DTERR_TZDISP_OVERFLOW;
@@ -3892,7 +3889,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
 			if (tm->tm_year <= 0)
 				sprintf(str + strlen(str), " BC");
 			break;
-			
+
 		case USE_SQL_DATES:
 			/* Compatible with Oracle/Ingres date formats */
 
@@ -4075,14 +4072,14 @@ void
 EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)
 {
 	char	   *cp = str;
-		int			year = tm->tm_year;
-		int			mon  = tm->tm_mon;
-		int			mday = tm->tm_mday;
-		int			hour = tm->tm_hour;
-		int			min  = tm->tm_min;
-		int			sec  = tm->tm_sec;
-		bool		is_before = FALSE;
-		bool		is_zero = TRUE;
+	int			year = tm->tm_year;
+	int			mon = tm->tm_mon;
+	int			mday = tm->tm_mday;
+	int			hour = tm->tm_hour;
+	int			min = tm->tm_min;
+	int			sec = tm->tm_sec;
+	bool		is_before = FALSE;
+	bool		is_zero = TRUE;
 
 	/*
 	 * The sign of year and month are guaranteed to match, since they are
@@ -4092,8 +4089,8 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)
 	 */
 	switch (style)
 	{
-	/* SQL Standard interval format */
-	case INTSTYLE_SQL_STANDARD:
+		/* SQL Standard interval format */
+		case INTSTYLE_SQL_STANDARD:
 		{
 			bool has_negative = year < 0 || mon  < 0 ||
 								mday < 0 || hour < 0 ||
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
index f0a59212cac7..1921c5822546 100644
--- a/src/backend/utils/adt/dbsize.c
+++ b/src/backend/utils/adt/dbsize.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2002-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.9.2.1 2007/03/11 06:44:11 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.16.2.2 2010/01/23 21:29:12 tgl Exp $
  *
  */
 
@@ -129,6 +129,8 @@ db_dir_size(const char *path)
 	{
 		struct stat fst;
 
+		CHECK_FOR_INTERRUPTS();
+
 		if (strcmp(direntry->d_name, ".") == 0 ||
 			strcmp(direntry->d_name, "..") == 0)
 			continue;
@@ -157,12 +159,12 @@ db_dir_size(const char *path)
 static int64
 calculate_database_size(Oid dbOid)
 {
-	int64		 totalsize = 0;
-	char		 pathname[MAXPGPATH];
-	Relation     rel;
+	int64		totalsize;
+	char		pathname[MAXPGPATH];
+	Relation    rel;
 	HeapScanDesc scandesc;
-	HeapTuple    tuple;
-	AclResult	 aclresult;
+	HeapTuple   tuple;
+	AclResult	aclresult;
 
 	/* User must have connect privilege for target database */
 	aclresult = pg_database_aclcheck(dbOid, GetUserId(), ACL_CONNECT);
@@ -174,6 +176,7 @@ calculate_database_size(Oid dbOid)
 	rel = heap_open(TableSpaceRelationId, AccessShareLock);
 	scandesc = heap_beginscan(rel, SnapshotNow, 0, NULL);
 	tuple = heap_getnext(scandesc, ForwardScanDirection);
+	totalsize = 0;
 	while (HeapTupleIsValid(tuple))
 	{
 		char *priFilespace, *mirFilespace;
@@ -304,6 +307,8 @@ calculate_tablespace_size(Oid tblspcOid)
 	{
 		struct stat fst;
 
+		CHECK_FOR_INTERRUPTS();
+
 		if (strcmp(direntry->d_name, ".") == 0 ||
 			strcmp(direntry->d_name, "..") == 0)
 			continue;
@@ -775,33 +780,33 @@ pg_size_pretty(PG_FUNCTION_ARGS)
 	int64		size = PG_GETARG_INT64(0);
 	char	   *result = palloc(50 + VARHDRSZ);
 	int64		limit = 10 * 1024;
-	int64		mult = 1;
+	int64		limit2 = limit * 2 - 1;
 
-	if (size < limit * mult)
+	if (size < limit)
 		snprintf(VARDATA(result), 50, INT64_FORMAT " bytes", size);
 	else
 	{
-		mult *= 1024;
-		if (size < limit * mult)
+		size >>= 9;				/* keep one extra bit for rounding */
+		if (size < limit2)
 			snprintf(VARDATA(result), 50, INT64_FORMAT " kB",
-					 (size + mult / 2) / mult);
+					 (size + 1) / 2);
 		else
 		{
-			mult *= 1024;
-			if (size < limit * mult)
+			size >>= 10;
+			if (size < limit2)
 				snprintf(VARDATA(result), 50, INT64_FORMAT " MB",
-						 (size + mult / 2) / mult);
+						 (size + 1) / 2);
 			else
 			{
-				mult *= 1024;
-				if (size < limit * mult)
+				size >>= 10;
+				if (size < limit2)
 					snprintf(VARDATA(result), 50, INT64_FORMAT " GB",
-							 (size + mult / 2) / mult);
+							 (size + 1) / 2);
 				else
 				{
-					mult *= 1024;
+					size >>= 10;
 					snprintf(VARDATA(result), 50, INT64_FORMAT " TB",
-							 (size + mult / 2) / mult);
+							 (size + 1) / 2);
 				}
 			}
 		}
diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c
index 17a62705cd50..d416a2adb999 100644
--- a/src/backend/utils/adt/domains.c
+++ b/src/backend/utils/adt/domains.c
@@ -25,7 +25,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/domains.c,v 1.5 2007/01/05 22:19:40 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/domains.c,v 1.6 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c
new file mode 100644
index 000000000000..40cf15f097f9
--- /dev/null
+++ b/src/backend/utils/adt/enum.c
@@ -0,0 +1,441 @@
+/*-------------------------------------------------------------------------
+ *
+ * enum.c
+ *	  I/O functions, operators, aggregates etc for enum types
+ *
+ * Copyright (c) 2006-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/enum.c,v 1.6 2008/01/01 19:45:52 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "catalog/pg_enum.h"
+#include "catalog/pg_type.h"
+#include "fmgr.h"
+#include "libpq/pqformat.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
+#include "libpq/pqformat.h"
+#include "miscadmin.h"
+
+
+static ArrayType *enum_range_internal(Oid enumtypoid, Oid lower, Oid upper);
+static int	enum_elem_cmp(const void *left, const void *right);
+
+
+/* Basic I/O support */
+
+Datum
+enum_in(PG_FUNCTION_ARGS)
+{
+	char	   *name = PG_GETARG_CSTRING(0);
+	Oid			enumtypoid = PG_GETARG_OID(1);
+	Oid			enumoid;
+	HeapTuple	tup;
+
+	/* must check length to prevent Assert failure within SearchSysCache */
+	if (strlen(name) >= NAMEDATALEN)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("invalid input value for enum %s: \"%s\"",
+						format_type_be(enumtypoid),
+						name)));
+
+	tup = SearchSysCache(ENUMTYPOIDNAME,
+						 ObjectIdGetDatum(enumtypoid),
+						 CStringGetDatum(name),
+						 0, 0);
+	if (!HeapTupleIsValid(tup))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("invalid input value for enum %s: \"%s\"",
+						format_type_be(enumtypoid),
+						name)));
+
+	enumoid = HeapTupleGetOid(tup);
+
+	ReleaseSysCache(tup);
+
+	PG_RETURN_OID(enumoid);
+}
+
+Datum
+enum_out(PG_FUNCTION_ARGS)
+{
+	Oid			enumval = PG_GETARG_OID(0);
+	char	   *result;
+	HeapTuple	tup;
+	Form_pg_enum en;
+
+	tup = SearchSysCache(ENUMOID,
+						 ObjectIdGetDatum(enumval),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
+				 errmsg("invalid internal value for enum: %u",
+						enumval)));
+	en = (Form_pg_enum) GETSTRUCT(tup);
+
+	result = pstrdup(NameStr(en->enumlabel));
+
+	ReleaseSysCache(tup);
+
+	PG_RETURN_CSTRING(result);
+}
+
+/* Binary I/O support */
+Datum
+enum_recv(PG_FUNCTION_ARGS)
+{
+	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
+	Oid			enumtypoid = PG_GETARG_OID(1);
+	Oid			enumoid;
+	HeapTuple	tup;
+	char	   *name;
+	int			nbytes;
+
+	/* guard against pre-9.3 misdeclaration of enum_recv */
+	if (get_fn_expr_argtype(fcinfo->flinfo, 0) == CSTRINGOID)
+		elog(ERROR, "invalid argument for enum_recv");
+
+	name = pq_getmsgtext(buf, buf->len - buf->cursor, &nbytes);
+
+	/* must check length to prevent Assert failure within SearchSysCache */
+	if (strlen(name) >= NAMEDATALEN)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("invalid input value for enum %s: \"%s\"",
+						format_type_be(enumtypoid),
+						name)));
+
+	tup = SearchSysCache(ENUMTYPOIDNAME,
+						 ObjectIdGetDatum(enumtypoid),
+						 CStringGetDatum(name),
+						 0, 0);
+	if (!HeapTupleIsValid(tup))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("invalid input value for enum %s: \"%s\"",
+						format_type_be(enumtypoid),
+						name)));
+
+	enumoid = HeapTupleGetOid(tup);
+
+	ReleaseSysCache(tup);
+
+	pfree(name);
+
+	PG_RETURN_OID(enumoid);
+}
+
+Datum
+enum_send(PG_FUNCTION_ARGS)
+{
+	Oid			enumval = PG_GETARG_OID(0);
+	StringInfoData buf;
+	HeapTuple	tup;
+	Form_pg_enum en;
+
+	tup = SearchSysCache(ENUMOID,
+						 ObjectIdGetDatum(enumval),
+						 0, 0, 0);
+	if (!HeapTupleIsValid(tup))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
+				 errmsg("invalid internal value for enum: %u",
+						enumval)));
+	en = (Form_pg_enum) GETSTRUCT(tup);
+
+	pq_begintypsend(&buf);
+	pq_sendtext(&buf, NameStr(en->enumlabel), strlen(NameStr(en->enumlabel)));
+
+	ReleaseSysCache(tup);
+
+	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
+}
+
+/* Comparison functions and related */
+
+Datum
+enum_lt(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_BOOL(a < b);
+}
+
+Datum
+enum_le(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_BOOL(a <= b);
+}
+
+Datum
+enum_eq(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_BOOL(a == b);
+}
+
+Datum
+enum_ne(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_BOOL(a != b);
+}
+
+Datum
+enum_ge(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_BOOL(a >= b);
+}
+
+Datum
+enum_gt(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_BOOL(a > b);
+}
+
+Datum
+enum_smaller(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_OID(a <= b ? a : b);
+}
+
+Datum
+enum_larger(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	PG_RETURN_OID(a >= b ? a : b);
+}
+
+Datum
+enum_cmp(PG_FUNCTION_ARGS)
+{
+	Oid			a = PG_GETARG_OID(0);
+	Oid			b = PG_GETARG_OID(1);
+
+	if (a > b)
+		PG_RETURN_INT32(1);
+	else if (a == b)
+		PG_RETURN_INT32(0);
+	else
+		PG_RETURN_INT32(-1);
+}
+
+/* Enum programming support functions */
+
+Datum
+enum_first(PG_FUNCTION_ARGS)
+{
+	Oid			enumtypoid;
+	Oid			min = InvalidOid;
+	CatCList   *list;
+	int			num,
+				i;
+
+	/*
+	 * We rely on being able to get the specific enum type from the calling
+	 * expression tree.  Notice that the actual value of the argument isn't
+	 * examined at all; in particular it might be NULL.
+	 */
+	enumtypoid = get_fn_expr_argtype(fcinfo->flinfo, 0);
+	if (enumtypoid == InvalidOid)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("could not determine actual enum type")));
+
+	list = SearchSysCacheList(ENUMTYPOIDNAME, 1,
+							  ObjectIdGetDatum(enumtypoid),
+							  0, 0, 0);
+	num = list->n_members;
+	for (i = 0; i < num; i++)
+	{
+		Oid			valoid = HeapTupleHeaderGetOid(list->members[i]->tuple.t_data);
+
+		if (!OidIsValid(min) || valoid < min)
+			min = valoid;
+	}
+
+	ReleaseCatCacheList(list);
+
+	if (!OidIsValid(min))		/* should not happen */
+		elog(ERROR, "no values found for enum %s",
+			 format_type_be(enumtypoid));
+
+	PG_RETURN_OID(min);
+}
+
+Datum
+enum_last(PG_FUNCTION_ARGS)
+{
+	Oid			enumtypoid;
+	Oid			max = InvalidOid;
+	CatCList   *list;
+	int			num,
+				i;
+
+	/*
+	 * We rely on being able to get the specific enum type from the calling
+	 * expression tree.  Notice that the actual value of the argument isn't
+	 * examined at all; in particular it might be NULL.
+	 */
+	enumtypoid = get_fn_expr_argtype(fcinfo->flinfo, 0);
+	if (enumtypoid == InvalidOid)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("could not determine actual enum type")));
+
+	list = SearchSysCacheList(ENUMTYPOIDNAME, 1,
+							  ObjectIdGetDatum(enumtypoid),
+							  0, 0, 0);
+	num = list->n_members;
+	for (i = 0; i < num; i++)
+	{
+		Oid			valoid = HeapTupleHeaderGetOid(list->members[i]->tuple.t_data);
+
+		if (!OidIsValid(max) || valoid > max)
+			max = valoid;
+	}
+
+	ReleaseCatCacheList(list);
+
+	if (!OidIsValid(max))		/* should not happen */
+		elog(ERROR, "no values found for enum %s",
+			 format_type_be(enumtypoid));
+
+	PG_RETURN_OID(max);
+}
+
+/* 2-argument variant of enum_range */
+Datum
+enum_range_bounds(PG_FUNCTION_ARGS)
+{
+	Oid			lower;
+	Oid			upper;
+	Oid			enumtypoid;
+
+	if (PG_ARGISNULL(0))
+		lower = InvalidOid;
+	else
+		lower = PG_GETARG_OID(0);
+	if (PG_ARGISNULL(1))
+		upper = InvalidOid;
+	else
+		upper = PG_GETARG_OID(1);
+
+	/*
+	 * We rely on being able to get the specific enum type from the calling
+	 * expression tree.  The generic type mechanism should have ensured that
+	 * both are of the same type.
+	 */
+	enumtypoid = get_fn_expr_argtype(fcinfo->flinfo, 0);
+	if (enumtypoid == InvalidOid)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("could not determine actual enum type")));
+
+	PG_RETURN_ARRAYTYPE_P(enum_range_internal(enumtypoid, lower, upper));
+}
+
+/* 1-argument variant of enum_range */
+Datum
+enum_range_all(PG_FUNCTION_ARGS)
+{
+	Oid			enumtypoid;
+
+	/*
+	 * We rely on being able to get the specific enum type from the calling
+	 * expression tree.  Notice that the actual value of the argument isn't
+	 * examined at all; in particular it might be NULL.
+	 */
+	enumtypoid = get_fn_expr_argtype(fcinfo->flinfo, 0);
+	if (enumtypoid == InvalidOid)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("could not determine actual enum type")));
+
+	PG_RETURN_ARRAYTYPE_P(enum_range_internal(enumtypoid,
+											  InvalidOid, InvalidOid));
+}
+
+static ArrayType *
+enum_range_internal(Oid enumtypoid, Oid lower, Oid upper)
+{
+	ArrayType  *result;
+	CatCList   *list;
+	int			total,
+				i,
+				j;
+	Datum	   *elems;
+
+	list = SearchSysCacheList(ENUMTYPOIDNAME, 1,
+							  ObjectIdGetDatum(enumtypoid),
+							  0, 0, 0);
+	total = list->n_members;
+
+	elems = (Datum *) palloc(total * sizeof(Datum));
+
+	j = 0;
+	for (i = 0; i < total; i++)
+	{
+		Oid			val = HeapTupleGetOid(&(list->members[i]->tuple));
+
+		if ((!OidIsValid(lower) || lower <= val) &&
+			(!OidIsValid(upper) || val <= upper))
+			elems[j++] = ObjectIdGetDatum(val);
+	}
+
+	/* shouldn't need the cache anymore */
+	ReleaseCatCacheList(list);
+
+	/* sort results into OID order */
+	qsort(elems, j, sizeof(Datum), enum_elem_cmp);
+
+	/* note this hardwires some details about the representation of Oid */
+	result = construct_array(elems, j, enumtypoid, sizeof(Oid), true, 'i');
+
+	pfree(elems);
+
+	return result;
+}
+
+/* qsort comparison function for Datums that are OIDs */
+static int
+enum_elem_cmp(const void *left, const void *right)
+{
+	Oid			l = DatumGetObjectId(*((const Datum *) left));
+	Oid			r = DatumGetObjectId(*((const Datum *) right));
+
+	if (l < r)
+		return -1;
+	if (l > r)
+		return 1;
+	return 0;
+}
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 7a76300d20d3..e87c6376c42a 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.148 2007/01/20 21:47:10 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.153.2.1 2009/03/04 22:08:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1216,108 +1216,6 @@ i2tof(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT4((float4) num);
 }
 
-
-/*
- *		float8_text		- converts a float8 number to a text string
- */
-Datum
-float8_text(PG_FUNCTION_ARGS)
-{
-	float8		num = PG_GETARG_FLOAT8(0);
-	text	   *result;
-	int			len;
-	char	   *str;
-
-	str = DatumGetCString(DirectFunctionCall1(float8out,
-											  Float8GetDatum(num)));
-
-	len = strlen(str) + VARHDRSZ;
-
-	result = (text *) palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
-/*
- *		text_float8		- converts a text string to a float8 number
- */
-Datum
-text_float8(PG_FUNCTION_ARGS)
-{
-	text	   *string = PG_GETARG_TEXT_P(0);
-	Datum		result;
-	int			len;
-	char	   *str;
-
-	len = (VARSIZE(string) - VARHDRSZ);
-	str = palloc(len + 1);
-	memcpy(str, VARDATA(string), len);
-	*(str + len) = '\0';
-
-	result = DirectFunctionCall1(float8in, CStringGetDatum(str));
-
-	pfree(str);
-
-	PG_RETURN_DATUM(result);
-}
-
-
-/*
- *		float4_text		- converts a float4 number to a text string
- */
-Datum
-float4_text(PG_FUNCTION_ARGS)
-{
-	float4		num = PG_GETARG_FLOAT4(0);
-	text	   *result;
-	int			len;
-	char	   *str;
-
-	str = DatumGetCString(DirectFunctionCall1(float4out,
-											  Float4GetDatum(num)));
-
-	len = strlen(str) + VARHDRSZ;
-
-	result = (text *) palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
-/*
- *		text_float4		- converts a text string to a float4 number
- */
-Datum
-text_float4(PG_FUNCTION_ARGS)
-{
-	text	   *string = PG_GETARG_TEXT_P(0);
-	Datum		result;
-	int			len;
-	char	   *str;
-
-	len = (VARSIZE(string) - VARHDRSZ);
-	str = palloc(len + 1);
-	memcpy(str, VARDATA(string), len);
-	*(str + len) = '\0';
-
-	result = DirectFunctionCall1(float4in, CStringGetDatum(str));
-
-	pfree(str);
-
-	PG_RETURN_DATUM(result);
-}
-
 /*
  *		=======================
  *		RANDOM FLOAT8 OPERATORS
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 40b38b58f369..8e12ec99812e 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/format_type.c,v 1.46 2007/01/05 22:19:40 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/format_type.c,v 1.49 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -123,24 +123,15 @@ format_type_internal(Oid type_oid, int32 typemod,
 	Oid			array_base_type;
 	bool		is_array;
 	char	   *buf;
-	cqContext  *typcqCtx;
-	cqContext  *basecqCtx;
 
 	if (type_oid == InvalidOid && allow_invalid)
 		return pstrdup("-");
 
-	typcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_type "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(type_oid)));
-
-	tuple = caql_getnext(typcqCtx);
-
+	tuple = SearchSysCache(TYPEOID,
+						   ObjectIdGetDatum(type_oid),
+						   0, 0, 0);
 	if (!HeapTupleIsValid(tuple))
 	{
-		caql_endscan(typcqCtx);
-
 		if (allow_invalid)
 			return pstrdup("???");
 		else
@@ -155,98 +146,31 @@ format_type_internal(Oid type_oid, int32 typemod,
 	 * than checking typlen we check the toast property, and don't deconstruct
 	 * "plain storage" array types --- this is because we don't want to show
 	 * oidvector as oid[].
-	 *
-	 * *** MPP-5137 patch ***
-	 * The intent of this routine is to replace an array type reference with
-	 * an array of the underlying base type if, and only if, the array
-	 * reference is to the system-defined array type over a base type.
-	 *
-	 * Checking only typstorage = 'p' causes format_type failures when
-	 * processing user-defined array types having typstorage != 'p'.
-	 *
-	 * To avoid this, at least until 8.3, different checking is in order.
-	 * Until 8.3, all system-defined array types have names beginning with an
-	 * underscore ('_') with the remainder of the name the same as the base
-	 * element type name and have a typinput value of array_in.  Base type
-	 * array replacement will occur only if both conditions are met.  All
-	 * other references are left intact.
-	 *
-	 * User-defined and system-defined fixed-length types (like "name" and
-	 * "oidvector") can not use array_in; all of the system-defined
-	 * fixed-length types use specialized typinput routines, not array_in, so
-	 * checking for array_in clears the system types. (See comments in array.h
-	 * about fixed-length arrays.)
 	 */
 	array_base_type = typeform->typelem;
 
-	if (OidIsValid(array_base_type) &&
-		typeform->typtype != TYPTYPE_DOMAIN &&
-		/* TODO: Change test to use pg_type.typarray when introducing 8.3 updates */
-		NameStr(typeform->typname)[0] == '_' &&
-		typeform->typinput == F_ARRAY_IN)
+	if (array_base_type != InvalidOid &&
+		typeform->typstorage != 'p' &&
+		typeform->typtype != TYPTYPE_DOMAIN)
 	{
-		HeapTuple base_tuple;
-		Form_pg_type base_typeform;
-
 		/* Switch our attention to the array element type */
-		basecqCtx = caql_beginscan(
-				NULL,
-				cql("SELECT * FROM pg_type "
-					" WHERE oid = :1 ",
-					ObjectIdGetDatum(array_base_type)));
-
-		base_tuple = caql_getnext(basecqCtx);
-
-		if (!HeapTupleIsValid(base_tuple))
+		ReleaseSysCache(tuple);
+		tuple = SearchSysCache(TYPEOID,
+							   ObjectIdGetDatum(array_base_type),
+							   0, 0, 0);
+		if (!HeapTupleIsValid(tuple))
 		{
 			if (allow_invalid)
-			{
-				caql_endscan(basecqCtx);
-				caql_endscan(typcqCtx);
 				return pstrdup("???[]");
-			}
 			else
-			{
 				elog(ERROR, "cache lookup failed for type %u", type_oid);
-			}
-		}
-		base_typeform = (Form_pg_type) GETSTRUCT(base_tuple);
-
-		/*
-		 * Now make final checks for system-defined array type before
-		 * substituting the array form of a base type for an array type
-		 * reference.
-		 *
-		 * TODO: Eliminate the name check when merging 8.3 updates and typarray checked
-		 */
-		if (strcmp(NameStr(base_typeform->typname), NameStr(typeform->typname)+1) == 0)
-		{
-			/* NOTE: a little grotesque, but since we are switching
-			 * the base tuple for the type tuple, free the typcqctx,
-			 * then switch the caql context for the base tuple as well
-			 * so it gets freed at the end
-			 */
-
-			caql_endscan(typcqCtx);
-
-			tuple = base_tuple;
-
-			typcqCtx = basecqCtx; /* NOTE: switch the caql ctx */
-
-			typeform = base_typeform;
-			type_oid = array_base_type;
-			is_array = true;
-		}
-		else
-		{
-			caql_endscan(basecqCtx);
-			is_array = false;
 		}
+		typeform = (Form_pg_type) GETSTRUCT(tuple);
+		type_oid = array_base_type;
+		is_array = true;
 	}
 	else
-	{
 		is_array = false;
-	}
 
 	/*
 	 * See if we want to special-case the output for certain built-in types.
@@ -401,9 +325,7 @@ format_type_internal(Oid type_oid, int32 typemod,
 	if (is_array)
 		buf = psnprintf(strlen(buf) + 3, "%s[]", buf);
 
-	caql_endscan(typcqCtx); /* NOTE: this could be the base tuple ctx
-							 * if it was an array 
-							 */
+	ReleaseSysCache(tuple);
 
 	return buf;
 }
@@ -415,7 +337,7 @@ format_type_internal(Oid type_oid, int32 typemod,
 static char *
 printTypmod(const char *typname, int32 typmod, Oid typmodout)
 {
-	char	*res;
+	char	   *res;
 
 	/* Shouldn't be called if typmod is -1 */
 	Assert(typmod >= 0);
@@ -429,7 +351,7 @@ printTypmod(const char *typname, int32 typmod, Oid typmodout)
 	else
 	{
 		/* Use the type-specific typmodout procedure */
-		char *tmstr;
+		char	   *tmstr;
 
 		tmstr = DatumGetCString(OidFunctionCall1(typmodout,
 												 Int32GetDatum(typmod)));
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index f9089662cd1f..3b0e70055f58 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.128 2007/02/17 03:11:32 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.137.2.2 2009/07/06 19:11:53 heikki Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group
@@ -70,7 +70,7 @@
 #include <math.h>
 #include <float.h>
 #include <limits.h>
-#include <locale.h>
+
 /*
  * towlower() and friends should be in <wctype.h>, but some pre-C99 systems
  * declare them in <wchar.h>.
@@ -124,7 +124,6 @@
 #define MAXDOUBLEWIDTH	500
 
 
-
 /* ----------
  * External (defined in PgSQL datetime.c (timestamp utils))
  * ----------
@@ -169,13 +168,6 @@ typedef struct
 	FromCharDateMode date_mode;
 } KeyWord;
 
-typedef enum
-{
-	FORMAT_TOCHAR,
-	FORMAT_TONUMBER,
-	FORMAT_TOTIMESTAMP
-} FormatFunction;
-
 struct FormatNode
 {
 	int			type;			/* node type			*/
@@ -548,7 +540,6 @@ static KeySuffix DCH_suff[] = {
 	{NULL, 0, 0, 0}
 };
 
-
 /* ----------
  * Format-pictures (KeyWord).
  *
@@ -2207,7 +2198,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
 						tm->tm_hour % (HOURS_PER_DAY / 2) == 0 ? 12 :
 						tm->tm_hour % (HOURS_PER_DAY / 2));
 				if (S_THth(n->suffix))
-					str_numth(s, s, 0);
+					str_numth(s, s, S_TH_TYPE(n->suffix));
 				s += strlen(s);
 				break;
 			case DCH_HH24:
@@ -2319,7 +2310,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
 				}
 				else
 					sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
-						asc_toupper_z(months_full[tm->tm_mon - 1]));
+							asc_toupper_z(months_full[tm->tm_mon - 1]));
 				s += strlen(s);
 				break;
 			case DCH_Month:
@@ -2905,7 +2896,7 @@ DCH_from_char(FormatNode *node, char *in, TmFromChar *out)
 					if (matched != 2)
 						ereport(ERROR,
 								(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
-								 errmsg("invalid input string for \"Y,YYY\" in function \"to_date\"")));
+							 errmsg("invalid input string for \"Y,YYY\" in function \"to_date\"")));
 					years += (millenia * 1000);
 					from_char_set_int(&out->year, years, n);
 					out->yysz = 4;
@@ -3331,7 +3322,7 @@ do_to_timestamp(text *date_txt, text *fmt,
 	ZERO_tm(tm);
 	*fsec = 0;
 
-	fmt_len = VARSIZE(fmt) - VARHDRSZ;
+	fmt_len = VARSIZE_ANY_EXHDR(fmt);
 
 	if (fmt_len)
 	{
@@ -3883,7 +3874,7 @@ NUM_prepare_locale(NUMProc *Np)
 		if (lconv->thousands_sep && *lconv->thousands_sep)
 			Np->L_thousands_sep = lconv->thousands_sep;
 		/* Make sure thousands separator doesn't match decimal point symbol. */
-		else if (strcmp(Np->decimal, ",") !=0)
+		else if (strcmp(Np->decimal, ",") != 0)
 			Np->L_thousands_sep = ",";
 		else
 			Np->L_thousands_sep = ".";
@@ -3904,6 +3895,7 @@ NUM_prepare_locale(NUMProc *Np)
 		Np->L_negative_sign = "-";
 		Np->L_positive_sign = "+";
 		Np->decimal = ".";
+
 		Np->L_thousands_sep = ",";
 		Np->L_currency_symbol = " ";
 	}
@@ -4772,7 +4764,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
  */
 #define NUM_TOCHAR_prepare \
 do { \
-	len = VARSIZE(fmt) - VARHDRSZ;					\
+	len = VARSIZE_ANY_EXHDR(fmt);					\
 	if (len <= 0 || len >= (INT_MAX-VARHDRSZ)/NUM_MAX_ITEM_SIZ)		\
 		PG_RETURN_TEXT_P(cstring_to_text("")); \
 	result	= (text *) palloc0((len * NUM_MAX_ITEM_SIZ) + 1 + VARHDRSZ);	\
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
index 3d3f2c50913b..7f1a4a5e87f1 100644
--- a/src/backend/utils/adt/genfile.c
+++ b/src/backend/utils/adt/genfile.c
@@ -9,7 +9,7 @@
  * Author: Andreas Pflug <pgadmin@pse-consulting.de>
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.15 2007/02/01 19:10:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.17.2.1 2008/03/31 01:32:01 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 10abe12c7690..5ff27c3685a2 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -1072,13 +1072,20 @@ line_construct_pm(Point *pt, double m)
 {
 	LINE	   *result = (LINE *) palloc(sizeof(LINE));
 
-	/* use "mx - y + yinter = 0" */
-	result->A = m;
-	result->B = -1.0;
 	if (m == DBL_MAX)
-		result->C = pt->y;
+	{
+		/* vertical - use "x = C" */
+		result->A = -1;
+		result->B = 0;
+		result->C = pt->x;
+	}
 	else
+	{
+		/* use "mx - y + yinter = 0" */
+		result->A = m;
+		result->B = -1.0;
 		result->C = pt->y - m * pt->x;
+	}
 
 #ifdef NOT_USED
 	result->m = m;
@@ -1480,6 +1487,8 @@ path_recv(PG_FUNCTION_ARGS)
 	SET_VARSIZE(path, size);
 	path->npts = npts;
 	path->closed = (closed ? 1 : 0);
+	/* prevent instability in unused pad bytes */
+	path->dummy = 0;
 
 	for (i = 0; i < npts; i++)
 	{
@@ -4103,6 +4112,8 @@ path_add(PG_FUNCTION_ARGS)
 	SET_VARSIZE(result, size);
 	result->npts = (p1->npts + p2->npts);
 	result->closed = p1->closed;
+	/* prevent instability in unused pad bytes */
+	result->dummy = 0;
 
 	for (i = 0; i < p1->npts; i++)
 	{
@@ -4344,6 +4355,8 @@ poly_path(PG_FUNCTION_ARGS)
 	SET_VARSIZE(path, size);
 	path->npts = poly->npts;
 	path->closed = TRUE;
+	/* prevent instability in unused pad bytes */
+	path->dummy = 0;
 
 	for (i = 0; i < poly->npts; i++)
 	{
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 86058360b567..486e0a86a5a9 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -18,8 +18,6 @@
  *		 int2in, int2out, int2recv, int2send
  *		 int4in, int4out, int4recv, int4send
  *		 int2vectorin, int2vectorout, int2vectorrecv, int2vectorsend
- *		Conversion routines:
- *		 itoi, int2_text, int4_text
  *		Boolean operators:
  *		 inteq, intne, intlt, intle, intgt, intge
  *		Arithmetic operators:
@@ -342,68 +340,6 @@ i4toi2(PG_FUNCTION_ARGS)
 	PG_RETURN_INT16((int16) arg1);
 }
 
-Datum
-int2_text(PG_FUNCTION_ARGS)
-{
-	int16		arg1 = PG_GETARG_INT16(0);
-	text	   *result = (text *) palloc(7 + VARHDRSZ); /* sign,5 digits, '\0' */
-
-	pg_itoa(arg1, VARDATA(result));
-	SET_VARSIZE(result, strlen(VARDATA(result)) + VARHDRSZ);
-	PG_RETURN_TEXT_P(result);
-}
-
-Datum
-text_int2(PG_FUNCTION_ARGS)
-{
-	text	   *string = PG_GETARG_TEXT_P(0);
-	Datum		result;
-	int			len;
-	char	   *str;
-
-	len = VARSIZE(string) - VARHDRSZ;
-
-	str = palloc(len + 1);
-	memcpy(str, VARDATA(string), len);
-	*(str + len) = '\0';
-
-	result = DirectFunctionCall1(int2in, CStringGetDatum(str));
-	pfree(str);
-
-	return result;
-}
-
-Datum
-int4_text(PG_FUNCTION_ARGS)
-{
-	int32		arg1 = PG_GETARG_INT32(0);
-	text	   *result = (text *) palloc(12 + VARHDRSZ);		/* sign,10 digits,'\0' */
-
-	pg_ltoa(arg1, VARDATA(result));
-	SET_VARSIZE(result, strlen(VARDATA(result)) + VARHDRSZ);
-	PG_RETURN_TEXT_P(result);
-}
-
-Datum
-text_int4(PG_FUNCTION_ARGS)
-{
-	text	   *string = PG_GETARG_TEXT_P(0);
-	Datum		result;
-	int			len;
-	char	   *str;
-
-	len = VARSIZE(string) - VARHDRSZ;
-
-	str = palloc(len + 1);
-	memcpy(str, VARDATA(string), len);
-	*(str + len) = '\0';
-
-	result = DirectFunctionCall1(int4in, CStringGetDatum(str));
-	pfree(str);
-
-	return result;
-}
-
 /* Cast int4 -> bool */
 Datum
 int4_bool(PG_FUNCTION_ARGS)
@@ -734,18 +670,6 @@ int4mul(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int32		result;
 
-#ifdef WIN32
-
-	/*
-	 * Win32 doesn't throw a catchable exception for SELECT -2147483648 *
-	 * (-1);  -- INT_MIN
-	 */
-	if (arg2 == -1 && arg1 == INT_MIN)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("integer out of range")));
-#endif
-
 	result = arg1 * arg2;
 
 	/*
@@ -762,7 +686,8 @@ int4mul(PG_FUNCTION_ARGS)
 	if (!(arg1 >= (int32) SHRT_MIN && arg1 <= (int32) SHRT_MAX &&
 		  arg2 >= (int32) SHRT_MIN && arg2 <= (int32) SHRT_MAX) &&
 		arg2 != 0 &&
-		(result / arg2 != arg1 || (arg2 == -1 && arg1 < 0 && result < 0)))
+		((arg2 == -1 && arg1 < 0 && result < 0) ||
+		 result / arg2 != arg1))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -777,34 +702,35 @@ int4div(PG_FUNCTION_ARGS)
 	int32		result;
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
-
-#ifdef WIN32
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
 
 	/*
-	 * Win32 doesn't throw a catchable exception for SELECT -2147483648 /
-	 * (-1); -- INT_MIN
+	 * INT_MIN / -1 is problematic, since the result can't be represented on a
+	 * two's-complement machine.  Some machines produce INT_MIN, some produce
+	 * zero, some throw an exception.  We can dodge the problem by recognizing
+	 * that division by -1 is the same as negation.
 	 */
-	if (arg2 == -1 && arg1 == INT_MIN)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("integer out of range")));
-#endif
+	if (arg2 == -1)
+	{
+		result = -arg1;
+		/* overflow check (needed for INT_MIN) */
+		if (arg1 != 0 && SAMESIGN(result, arg1))
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("integer out of range")));
+		PG_RETURN_INT32(result);
+	}
+
+	/* No overflow is possible */
 
 	result = arg1 / arg2;
 
-	/*
-	 * Overflow check.	The only possible overflow case is for arg1 = INT_MIN,
-	 * arg2 = -1, where the correct result is -INT_MIN, which can't be
-	 * represented on a two's-complement machine.  Most machines produce
-	 * INT_MIN but it seems some produce zero.
-	 */
-	if (arg2 == -1 && arg1 < 0 && result <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("integer out of range")));
 	PG_RETURN_INT32(result);
 }
 
@@ -918,22 +844,35 @@ int2div(PG_FUNCTION_ARGS)
 	int16		result;
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
-
-	result = arg1 / arg2;
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
 
 	/*
-	 * Overflow check.	The only possible overflow case is for arg1 =
-	 * SHRT_MIN, arg2 = -1, where the correct result is -SHRT_MIN, which can't
-	 * be represented on a two's-complement machine.  Most machines produce
-	 * SHRT_MIN but it seems some produce zero.
+	 * SHRT_MIN / -1 is problematic, since the result can't be represented on
+	 * a two's-complement machine.  Some machines produce SHRT_MIN, some
+	 * produce zero, some throw an exception.  We can dodge the problem by
+	 * recognizing that division by -1 is the same as negation.
 	 */
-	if (arg2 == -1 && arg1 < 0 && result <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("smallint out of range")));
+	if (arg2 == -1)
+	{
+		result = -arg1;
+		/* overflow check (needed for SHRT_MIN) */
+		if (arg1 != 0 && SAMESIGN(result, arg1))
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("smallint out of range")));
+		PG_RETURN_INT16(result);
+	}
+
+	/* No overflow is possible */
+
+	result = arg1 / arg2;
+
 	PG_RETURN_INT16(result);
 }
 
@@ -1102,22 +1041,35 @@ int42div(PG_FUNCTION_ARGS)
 	int32		result;
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
-
-	result = arg1 / arg2;
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
 
 	/*
-	 * Overflow check.	The only possible overflow case is for arg1 = INT_MIN,
-	 * arg2 = -1, where the correct result is -INT_MIN, which can't be
-	 * represented on a two's-complement machine.  Most machines produce
-	 * INT_MIN but it seems some produce zero.
+	 * INT_MIN / -1 is problematic, since the result can't be represented on a
+	 * two's-complement machine.  Some machines produce INT_MIN, some produce
+	 * zero, some throw an exception.  We can dodge the problem by recognizing
+	 * that division by -1 is the same as negation.
 	 */
-	if (arg2 == -1 && arg1 < 0 && result <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("integer out of range")));
+	if (arg2 == -1)
+	{
+		result = -arg1;
+		/* overflow check (needed for INT_MIN) */
+		if (arg1 != 0 && SAMESIGN(result, arg1))
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("integer out of range")));
+		PG_RETURN_INT32(result);
+	}
+
+	/* No overflow is possible */
+
+	result = arg1 / arg2;
+
 	PG_RETURN_INT32(result);
 }
 
@@ -1128,12 +1080,20 @@ int4mod(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
 
-	/* SELECT ((-2147483648)::int4) % (-1); causes a floating point exception */
-	if (arg1 == INT_MIN && arg2 == -1)
+	/*
+	 * Some machines throw a floating-point exception for INT_MIN % -1, which
+	 * is a bit silly since the correct answer is perfectly well-defined,
+	 * namely zero.
+	 */
+	if (arg2 == -1)
 		PG_RETURN_INT32(0);
 
 	/* No overflow is possible */
@@ -1148,9 +1108,23 @@ int2mod(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
+
+	/*
+	 * Some machines throw a floating-point exception for INT_MIN % -1, which
+	 * is a bit silly since the correct answer is perfectly well-defined,
+	 * namely zero.  (It's not clear this ever happens when dealing with
+	 * int16, but we might as well have the test for safety.)
+	 */
+	if (arg2 == -1)
+		PG_RETURN_INT16(0);
+
 	/* No overflow is possible */
 
 	PG_RETURN_INT16(arg1 % arg2);
@@ -1163,9 +1137,14 @@ int24mod(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
+
 	/* No overflow is possible */
 
 	PG_RETURN_INT32(arg1 % arg2);
@@ -1178,9 +1157,22 @@ int42mod(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
+
+	/*
+	 * Some machines throw a floating-point exception for INT_MIN % -1, which
+	 * is a bit silly since the correct answer is perfectly well-defined,
+	 * namely zero.
+	 */
+	if (arg2 == -1)
+		PG_RETURN_INT32(0);
+
 	/* No overflow is possible */
 
 	PG_RETURN_INT32(arg1 % arg2);
@@ -1444,6 +1436,10 @@ generate_series_step_int4(PG_FUNCTION_ARGS)
 		/* increment current in preparation for next iteration */
 		fctx->current += fctx->step;
 
+		/* if next-value computation overflows, this is the final result */
+		if (SAMESIGN(result, fctx->step) && !SAMESIGN(result, fctx->current))
+			fctx->step = 0;
+
 		/* do when there is more left to send */
 		SRF_RETURN_NEXT(funcctx, Int32GetDatum(result));
 	}
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index bbf6010b49a0..0289f267e873 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.64 2007/02/01 19:10:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.68 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,7 +98,8 @@ scanint8(const char *str, bool errorOK, int64 *result)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for integer: \"%s\"",str)));
+					 errmsg("invalid input syntax for integer: \"%s\"",
+							str)));
 	}
 
 	/* process digits */
@@ -113,7 +114,8 @@ scanint8(const char *str, bool errorOK, int64 *result)
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-					   errmsg("value \"%s\" is out of range for type bigint",str)));
+					   errmsg("value \"%s\" is out of range for type bigint",
+							  str)));
 		}
 		tmp = newtmp;
 	}
@@ -576,12 +578,17 @@ int8mul(PG_FUNCTION_ARGS)
 	 * range; if so, no overflow is possible.  (But that only works if we
 	 * really have a 64-bit int64 datatype...)
 	 */
-
-	if (arg2 != 0 &&
-		(result / arg2 != arg1 || (arg2 == -1 && arg1 < 0 && result < 0)))
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("bigint out of range")));
+#ifndef INT64_IS_BUSTED
+	if (arg1 != (int64) ((int32) arg1) || arg2 != (int64) ((int32) arg2))
+#endif
+	{
+		if (arg2 != 0 &&
+			((arg2 == -1 && arg1 < 0 && result < 0) ||
+			 result / arg2 != arg1))
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("bigint out of range")));
+	}
 	PG_RETURN_INT64(result);
 }
 
@@ -593,22 +600,35 @@ int8div(PG_FUNCTION_ARGS)
 	int64		result;
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
-
-	result = arg1 / arg2;
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
 
 	/*
-	 * Overflow check.	The only possible overflow case is for arg1 =
-	 * INT64_MIN, arg2 = -1, where the correct result is -INT64_MIN, which
-	 * can't be represented on a two's-complement machine.	Most machines
-	 * produce INT64_MIN but it seems some produce zero.
+	 * INT64_MIN / -1 is problematic, since the result can't be represented on
+	 * a two's-complement machine.  Some machines produce INT64_MIN, some
+	 * produce zero, some throw an exception.  We can dodge the problem by
+	 * recognizing that division by -1 is the same as negation.
 	 */
-	if (arg2 == -1 && arg1 < 0 && result <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("bigint out of range")));
+	if (arg2 == -1)
+	{
+		result = -arg1;
+		/* overflow check (needed for INT64_MIN) */
+		if (arg1 != 0 && SAMESIGN(result, arg1))
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("bigint out of range")));
+		PG_RETURN_INT64(result);
+	}
+
+	/* No overflow is possible */
+
+	result = arg1 / arg2;
+
 	PG_RETURN_INT64(result);
 }
 
@@ -640,9 +660,22 @@ int8mod(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
+
+	/*
+	 * Some machines throw a floating-point exception for INT64_MIN % -1,
+	 * which is a bit silly since the correct answer is perfectly
+	 * well-defined, namely zero.
+	 */
+	if (arg2 == -1)
+		PG_RETURN_INT64(0);
+
 	/* No overflow is possible */
 
 	PG_RETURN_INT64(arg1 % arg2);
@@ -805,22 +838,35 @@ int84div(PG_FUNCTION_ARGS)
 	int64		result;
 
 	if (arg2 == 0)
+	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
 				 errmsg("division by zero")));
-
-	result = arg1 / arg2;
+		/* ensure compiler realizes we mustn't reach the division (gcc bug) */
+		PG_RETURN_NULL();
+	}
 
 	/*
-	 * Overflow check.	The only possible overflow case is for arg1 =
-	 * INT64_MIN, arg2 = -1, where the correct result is -INT64_MIN, which
-	 * can't be represented on a two's-complement machine.	Most machines
-	 * produce INT64_MIN but it seems some produce zero.
+	 * INT64_MIN / -1 is problematic, since the result can't be represented on
+	 * a two's-complement machine.  Some machines produce INT64_MIN, some
+	 * produce zero, some throw an exception.  We can dodge the problem by
+	 * recognizing that division by -1 is the same as negation.
 	 */
-	if (arg2 == -1 && arg1 < 0 && result <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("bigint out of range")));
+	if (arg2 == -1)
+	{
+		result = -arg1;
+		/* overflow check (needed for INT64_MIN) */
+		if (arg1 != 0 && SAMESIGN(result, arg1))
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("bigint out of range")));
+		PG_RETURN_INT64(result);
+	}
+
+	/* No overflow is possible */
+
+	result = arg1 / arg2;
+
 	PG_RETURN_INT64(result);
 }
 
@@ -1315,48 +1361,6 @@ oidtoi8(PG_FUNCTION_ARGS)
 	PG_RETURN_INT64((int64) arg);
 }
 
-Datum
-text_int8(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			len;
-	char	   *s;
-	Datum		result;
-
-	len = (VARSIZE(str) - VARHDRSZ);
-	s = palloc(len + 1);
-	memcpy(s, VARDATA(str), len);
-	*(s + len) = '\0';
-
-	result = DirectFunctionCall1(int8in, CStringGetDatum(s));
-
-	pfree(s);
-
-	return result;
-}
-
-Datum
-int8_text(PG_FUNCTION_ARGS)
-{
-	/* arg is int64, but easier to leave it as Datum */
-	Datum		arg = PG_GETARG_DATUM(0);
-	char	   *s;
-	int			len;
-	text	   *result;
-
-	s = DatumGetCString(DirectFunctionCall1(int8out, arg));
-	len = strlen(s);
-
-	result = (text *) palloc(VARHDRSZ + len);
-
-	SET_VARSIZE(result, VARHDRSZ + len);
-	memcpy(VARDATA(result), s, len);
-
-	pfree(s);
-
-	PG_RETURN_TEXT_P(result);
-}
-
 /*
  * non-persistent numeric series generator
  */
@@ -1427,6 +1431,10 @@ generate_series_step_int8(PG_FUNCTION_ARGS)
 		/* increment current in preparation for next iteration */
 		fctx->current += fctx->step;
 
+		/* if next-value computation overflows, this is the final result */
+		if (SAMESIGN(result, fctx->step) && !SAMESIGN(result, fctx->current))
+			fctx->step = 0;
+
 		/* do when there is more left to send */
 		SRF_RETURN_NEXT(funcctx, Int64GetDatum(result));
 	}
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index b82d3f72730c..4acb4d26f632 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	$PostgreSQL: pgsql/src/backend/utils/adt/like.c,v 1.67 2007/01/05 22:19:41 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/utils/adt/like.c,v 1.73 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,21 +28,25 @@
 #define LIKE_ABORT						(-1)
 
 
-static int	MatchText(char *t, int tlen, char *p, int plen);
-static int	MatchTextIC(char *t, int tlen, char *p, int plen);
-static int	MatchBytea(char *t, int tlen, char *p, int plen);
-static text *do_like_escape(text *, text *);
+static int	SB_MatchText(char *t, int tlen, char *p, int plen);
+static text *SB_do_like_escape(text *, text *);
 
-static int	MBMatchText(char *t, int tlen, char *p, int plen);
-static int	MBMatchTextIC(char *t, int tlen, char *p, int plen);
+static int	MB_MatchText(char *t, int tlen, char *p, int plen);
 static text *MB_do_like_escape(text *, text *);
 
+static int	UTF8_MatchText(char *t, int tlen, char *p, int plen);
+
+static int	SB_IMatchText(char *t, int tlen, char *p, int plen);
+
+static int	GenericMatchText(char *s, int slen, char *p, int plen);
+static int	Generic_Text_IC_like(text *str, text *pat);
+
 /*--------------------
  * Support routine for MatchText. Compares given multibyte streams
  * as wide characters. If they match, returns 1 otherwise returns 0.
  *--------------------
  */
-static int
+static inline int
 wchareq(char *p1, char *p2)
 {
 	int			p1_len;
@@ -72,15 +76,12 @@ wchareq(char *p1, char *p2)
  * of getting a single character transformed to the system's wchar_t format.
  * So now, we just downcase the strings using lower() and apply regular LIKE
  * comparison.	This should be revisited when we install better locale support.
- *
- * Note that MBMatchText and MBMatchTextIC do exactly the same thing now.
- * Is it worth refactoring to avoid duplicated code?  They might become
- * different again in the future.
  */
 
+#define NextByte(p, plen)	((p)++, (plen)--)
+
 /* Set up to compile like_match.c for multibyte characters */
-#define CHAREQ(p1, p2) wchareq(p1, p2)
-#define ICHAREQ(p1, p2) wchareq(p1, p2)
+#define CHAREQ(p1, p2) wchareq((p1), (p2))
 #define NextChar(p, plen) \
 	do { int __l = pg_mblen(p); (p) +=__l; (plen) -=__l; } while (0)
 #define CopyAdvChar(dst, src, srclen) \
@@ -90,33 +91,84 @@ wchareq(char *p1, char *p2)
 			 *(dst)++ = *(src)++; \
 	   } while (0)
 
-#define MatchText	MBMatchText
-#define MatchTextIC MBMatchTextIC
+#define MatchText	MB_MatchText
 #define do_like_escape	MB_do_like_escape
 
 #include "like_match.c"
 
-#undef CHAREQ
-#undef ICHAREQ
-#undef NextChar
-#undef CopyAdvChar
-#undef MatchText
-#undef MatchTextIC
-#undef do_like_escape
-
 /* Set up to compile like_match.c for single-byte characters */
 #define CHAREQ(p1, p2) (*(p1) == *(p2))
-#define ICHAREQ(p1, p2) (tolower((unsigned char) *(p1)) == tolower((unsigned char) *(p2)))
-#define NextChar(p, plen) ((p)++, (plen)--)
+#define NextChar(p, plen) NextByte((p), (plen))
 #define CopyAdvChar(dst, src, srclen) (*(dst)++ = *(src)++, (srclen)--)
 
+#define MatchText	SB_MatchText
+#define do_like_escape	SB_do_like_escape
+
 #include "like_match.c"
 
-/* And some support for BYTEA */
-#define BYTEA_CHAREQ(p1, p2) (*(p1) == *(p2))
-#define BYTEA_NextChar(p, plen) ((p)++, (plen)--)
-#define BYTEA_CopyAdvChar(dst, src, srclen) (*(dst)++ = *(src)++, (srclen)--)
+/* setup to compile like_match.c for single byte case insensitive matches */
+#define MATCH_LOWER
+#define NextChar(p, plen) NextByte((p), (plen))
+#define MatchText SB_IMatchText
+
+#include "like_match.c"
 
+/* setup to compile like_match.c for UTF8 encoding, using fast NextChar */
+
+#define NextChar(p, plen) \
+	do { (p)++; (plen)--; } while ((plen) > 0 && (*(p) & 0xC0) == 0x80 )
+#define MatchText	UTF8_MatchText
+
+#include "like_match.c"
+
+static inline int
+GenericMatchText(char *s, int slen, char *p, int plen)
+{
+	if (pg_database_encoding_max_length() == 1)
+		return SB_MatchText(s, slen, p, plen);
+	else if (GetDatabaseEncoding() == PG_UTF8)
+		return UTF8_MatchText(s, slen, p, plen);
+	else
+		return MB_MatchText(s, slen, p, plen);
+}
+
+static inline int
+Generic_Text_IC_like(text *str, text *pat)
+{
+	char	   *s,
+			   *p;
+	int			slen,
+				plen;
+
+	/*
+	 * For efficiency reasons, in the single byte case we don't call lower()
+	 * on the pattern and text, but instead call to_lower on each character.
+	 * In the multi-byte case we don't have much choice :-(
+	 */
+
+	if (pg_database_encoding_max_length() > 1)
+	{
+		/* lower's result is never packed, so OK to use old macros here */
+		pat = DatumGetTextP(DirectFunctionCall1(lower, PointerGetDatum(pat)));
+		p = VARDATA(pat);
+		plen = (VARSIZE(pat) - VARHDRSZ);
+		str = DatumGetTextP(DirectFunctionCall1(lower, PointerGetDatum(str)));
+		s = VARDATA(str);
+		slen = (VARSIZE(str) - VARHDRSZ);
+		if (GetDatabaseEncoding() == PG_UTF8)
+			return UTF8_MatchText(s, slen, p, plen);
+		else
+			return MB_MatchText(s, slen, p, plen);
+	}
+	else
+	{
+		p = VARDATA_ANY(pat);
+		plen = VARSIZE_ANY_EXHDR(pat);
+		s = VARDATA_ANY(str);
+		slen = VARSIZE_ANY_EXHDR(str);
+		return SB_IMatchText(s, slen, p, plen);
+	}
+}
 
 /*
  *	interface routines called by the function manager
@@ -126,7 +178,7 @@ Datum
 namelike(PG_FUNCTION_ARGS)
 {
 	Name		str = PG_GETARG_NAME(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
 	char	   *s,
 			   *p;
@@ -135,13 +187,10 @@ namelike(PG_FUNCTION_ARGS)
 
 	s = NameStr(*str);
 	slen = strlen(s);
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
+	p = VARDATA_ANY(pat);
+	plen = VARSIZE_ANY_EXHDR(pat);
 
-	if (pg_database_encoding_max_length() == 1)
-		result = (MatchText(s, slen, p, plen) == LIKE_TRUE);
-	else
-		result = (MBMatchText(s, slen, p, plen) == LIKE_TRUE);
+	result = (GenericMatchText(s, slen, p, plen) == LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -150,7 +199,7 @@ Datum
 namenlike(PG_FUNCTION_ARGS)
 {
 	Name		str = PG_GETARG_NAME(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
 	char	   *s,
 			   *p;
@@ -159,13 +208,10 @@ namenlike(PG_FUNCTION_ARGS)
 
 	s = NameStr(*str);
 	slen = strlen(s);
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
+	p = VARDATA_ANY(pat);
+	plen = VARSIZE_ANY_EXHDR(pat);
 
-	if (pg_database_encoding_max_length() == 1)
-		result = (MatchText(s, slen, p, plen) != LIKE_TRUE);
-	else
-		result = (MBMatchText(s, slen, p, plen) != LIKE_TRUE);
+	result = (GenericMatchText(s, slen, p, plen) != LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -173,23 +219,20 @@ namenlike(PG_FUNCTION_ARGS)
 Datum
 textlike(PG_FUNCTION_ARGS)
 {
-	text	   *str = PG_GETARG_TEXT_P(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *str = PG_GETARG_TEXT_PP(0);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
 	char	   *s,
 			   *p;
 	int			slen,
 				plen;
 
-	s = VARDATA(str);
-	slen = (VARSIZE(str) - VARHDRSZ);
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
+	s = VARDATA_ANY(str);
+	slen = VARSIZE_ANY_EXHDR(str);
+	p = VARDATA_ANY(pat);
+	plen = VARSIZE_ANY_EXHDR(pat);
 
-	if (pg_database_encoding_max_length() == 1)
-		result = (MatchText(s, slen, p, plen) == LIKE_TRUE);
-	else
-		result = (MBMatchText(s, slen, p, plen) == LIKE_TRUE);
+	result = (GenericMatchText(s, slen, p, plen) == LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -197,23 +240,20 @@ textlike(PG_FUNCTION_ARGS)
 Datum
 textnlike(PG_FUNCTION_ARGS)
 {
-	text	   *str = PG_GETARG_TEXT_P(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *str = PG_GETARG_TEXT_PP(0);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
 	char	   *s,
 			   *p;
 	int			slen,
 				plen;
 
-	s = VARDATA(str);
-	slen = (VARSIZE(str) - VARHDRSZ);
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
+	s = VARDATA_ANY(str);
+	slen = VARSIZE_ANY_EXHDR(str);
+	p = VARDATA_ANY(pat);
+	plen = VARSIZE_ANY_EXHDR(pat);
 
-	if (pg_database_encoding_max_length() == 1)
-		result = (MatchText(s, slen, p, plen) != LIKE_TRUE);
-	else
-		result = (MBMatchText(s, slen, p, plen) != LIKE_TRUE);
+	result = (GenericMatchText(s, slen, p, plen) != LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -221,20 +261,20 @@ textnlike(PG_FUNCTION_ARGS)
 Datum
 bytealike(PG_FUNCTION_ARGS)
 {
-	bytea	   *str = PG_GETARG_BYTEA_P(0);
-	bytea	   *pat = PG_GETARG_BYTEA_P(1);
+	bytea	   *str = PG_GETARG_BYTEA_PP(0);
+	bytea	   *pat = PG_GETARG_BYTEA_PP(1);
 	bool		result;
 	char	   *s,
 			   *p;
 	int			slen,
 				plen;
 
-	s = VARDATA(str);
-	slen = (VARSIZE(str) - VARHDRSZ);
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
+	s = VARDATA_ANY(str);
+	slen = VARSIZE_ANY_EXHDR(str);
+	p = VARDATA_ANY(pat);
+	plen = VARSIZE_ANY_EXHDR(pat);
 
-	result = (MatchBytea(s, slen, p, plen) == LIKE_TRUE);
+	result = (SB_MatchText(s, slen, p, plen) == LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -242,20 +282,20 @@ bytealike(PG_FUNCTION_ARGS)
 Datum
 byteanlike(PG_FUNCTION_ARGS)
 {
-	bytea	   *str = PG_GETARG_BYTEA_P(0);
-	bytea	   *pat = PG_GETARG_BYTEA_P(1);
+	bytea	   *str = PG_GETARG_BYTEA_PP(0);
+	bytea	   *pat = PG_GETARG_BYTEA_PP(1);
 	bool		result;
 	char	   *s,
 			   *p;
 	int			slen,
 				plen;
 
-	s = VARDATA(str);
-	slen = (VARSIZE(str) - VARHDRSZ);
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
+	s = VARDATA_ANY(str);
+	slen = VARSIZE_ANY_EXHDR(str);
+	p = VARDATA_ANY(pat);
+	plen = VARSIZE_ANY_EXHDR(pat);
 
-	result = (MatchBytea(s, slen, p, plen) != LIKE_TRUE);
+	result = (SB_MatchText(s, slen, p, plen) != LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -268,39 +308,13 @@ Datum
 nameiclike(PG_FUNCTION_ARGS)
 {
 	Name		str = PG_GETARG_NAME(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
-	char	   *s,
-			   *p;
-	int			slen,
-				plen;
+	text	   *strtext;
 
-	if (pg_database_encoding_max_length() == 1)
-	{
-		s = NameStr(*str);
-		slen = strlen(s);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE);
-	}
-	else
-	{
-		/* Force inputs to lower case to achieve case insensitivity */
-		text	   *strtext;
-
-		strtext = DatumGetTextP(DirectFunctionCall1(name_text,
-													NameGetDatum(str)));
-		strtext = DatumGetTextP(DirectFunctionCall1(lower,
-												  PointerGetDatum(strtext)));
-		pat = DatumGetTextP(DirectFunctionCall1(lower,
-												PointerGetDatum(pat)));
-
-		s = VARDATA(strtext);
-		slen = (VARSIZE(strtext) - VARHDRSZ);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MBMatchTextIC(s, slen, p, plen) == LIKE_TRUE);
-	}
+	strtext = DatumGetTextP(DirectFunctionCall1(name_text,
+												NameGetDatum(str)));
+	result = (Generic_Text_IC_like(strtext, pat) == LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -309,39 +323,13 @@ Datum
 nameicnlike(PG_FUNCTION_ARGS)
 {
 	Name		str = PG_GETARG_NAME(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
-	char	   *s,
-			   *p;
-	int			slen,
-				plen;
+	text	   *strtext;
 
-	if (pg_database_encoding_max_length() == 1)
-	{
-		s = NameStr(*str);
-		slen = strlen(s);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE);
-	}
-	else
-	{
-		/* Force inputs to lower case to achieve case insensitivity */
-		text	   *strtext;
-
-		strtext = DatumGetTextP(DirectFunctionCall1(name_text,
-													NameGetDatum(str)));
-		strtext = DatumGetTextP(DirectFunctionCall1(lower,
-												  PointerGetDatum(strtext)));
-		pat = DatumGetTextP(DirectFunctionCall1(lower,
-												PointerGetDatum(pat)));
-
-		s = VARDATA(strtext);
-		slen = (VARSIZE(strtext) - VARHDRSZ);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MBMatchTextIC(s, slen, p, plen) != LIKE_TRUE);
-	}
+	strtext = DatumGetTextP(DirectFunctionCall1(name_text,
+												NameGetDatum(str)));
+	result = (Generic_Text_IC_like(strtext, pat) != LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -349,35 +337,11 @@ nameicnlike(PG_FUNCTION_ARGS)
 Datum
 texticlike(PG_FUNCTION_ARGS)
 {
-	text	   *str = PG_GETARG_TEXT_P(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *str = PG_GETARG_TEXT_PP(0);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
-	char	   *s,
-			   *p;
-	int			slen,
-				plen;
 
-	if (pg_database_encoding_max_length() == 1)
-	{
-		s = VARDATA(str);
-		slen = (VARSIZE(str) - VARHDRSZ);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE);
-	}
-	else
-	{
-		/* Force inputs to lower case to achieve case insensitivity */
-		str = DatumGetTextP(DirectFunctionCall1(lower,
-												PointerGetDatum(str)));
-		pat = DatumGetTextP(DirectFunctionCall1(lower,
-												PointerGetDatum(pat)));
-		s = VARDATA(str);
-		slen = (VARSIZE(str) - VARHDRSZ);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MBMatchTextIC(s, slen, p, plen) == LIKE_TRUE);
-	}
+	result = (Generic_Text_IC_like(str, pat) == LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -385,35 +349,11 @@ texticlike(PG_FUNCTION_ARGS)
 Datum
 texticnlike(PG_FUNCTION_ARGS)
 {
-	text	   *str = PG_GETARG_TEXT_P(0);
-	text	   *pat = PG_GETARG_TEXT_P(1);
+	text	   *str = PG_GETARG_TEXT_PP(0);
+	text	   *pat = PG_GETARG_TEXT_PP(1);
 	bool		result;
-	char	   *s,
-			   *p;
-	int			slen,
-				plen;
 
-	if (pg_database_encoding_max_length() == 1)
-	{
-		s = VARDATA(str);
-		slen = (VARSIZE(str) - VARHDRSZ);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE);
-	}
-	else
-	{
-		/* Force inputs to lower case to achieve case insensitivity */
-		str = DatumGetTextP(DirectFunctionCall1(lower,
-												PointerGetDatum(str)));
-		pat = DatumGetTextP(DirectFunctionCall1(lower,
-												PointerGetDatum(pat)));
-		s = VARDATA(str);
-		slen = (VARSIZE(str) - VARHDRSZ);
-		p = VARDATA(pat);
-		plen = (VARSIZE(pat) - VARHDRSZ);
-		result = (MBMatchTextIC(s, slen, p, plen) != LIKE_TRUE);
-	}
+	result = (Generic_Text_IC_like(str, pat) != LIKE_TRUE);
 
 	PG_RETURN_BOOL(result);
 }
@@ -425,12 +365,12 @@ texticnlike(PG_FUNCTION_ARGS)
 Datum
 like_escape(PG_FUNCTION_ARGS)
 {
-	text	   *pat = PG_GETARG_TEXT_P(0);
-	text	   *esc = PG_GETARG_TEXT_P(1);
+	text	   *pat = PG_GETARG_TEXT_PP(0);
+	text	   *esc = PG_GETARG_TEXT_PP(1);
 	text	   *result;
 
 	if (pg_database_encoding_max_length() == 1)
-		result = do_like_escape(pat, esc);
+		result = SB_do_like_escape(pat, esc);
 	else
 		result = MB_do_like_escape(pat, esc);
 
@@ -444,181 +384,9 @@ like_escape(PG_FUNCTION_ARGS)
 Datum
 like_escape_bytea(PG_FUNCTION_ARGS)
 {
-	bytea	   *pat = PG_GETARG_BYTEA_P(0);
-	bytea	   *esc = PG_GETARG_BYTEA_P(1);
-	bytea	   *result;
-	char	   *p,
-			   *e,
-			   *r;
-	int			plen,
-				elen;
-	bool		afterescape;
-
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
-	e = VARDATA(esc);
-	elen = (VARSIZE(esc) - VARHDRSZ);
-
-	/*
-	 * Worst-case pattern growth is 2x --- unlikely, but it's hardly worth
-	 * trying to calculate the size more accurately than that.
-	 */
-	result = (text *) palloc(plen * 2 + VARHDRSZ);
-	r = VARDATA(result);
+	bytea	   *pat = PG_GETARG_BYTEA_PP(0);
+	bytea	   *esc = PG_GETARG_BYTEA_PP(1);
+	bytea	   *result = SB_do_like_escape((text *) pat, (text *) esc);
 
-	if (elen == 0)
-	{
-		/*
-		 * No escape character is wanted.  Double any backslashes in the
-		 * pattern to make them act like ordinary characters.
-		 */
-		while (plen > 0)
-		{
-			if (*p == '\\')
-				*r++ = '\\';
-			BYTEA_CopyAdvChar(r, p, plen);
-		}
-	}
-	else
-	{
-		/*
-		 * The specified escape must be only a single character.
-		 */
-		BYTEA_NextChar(e, elen);
-		if (elen != 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_ESCAPE_SEQUENCE),
-					 errmsg("invalid escape string"),
-				  errhint("Escape string must be empty or one character.")));
-
-		e = VARDATA(esc);
-
-		/*
-		 * If specified escape is '\', just copy the pattern as-is.
-		 */
-		if (*e == '\\')
-		{
-			memcpy(result, pat, VARSIZE(pat));
-			PG_RETURN_BYTEA_P(result);
-		}
-
-		/*
-		 * Otherwise, convert occurrences of the specified escape character to
-		 * '\', and double occurrences of '\' --- unless they immediately
-		 * follow an escape character!
-		 */
-		afterescape = false;
-		while (plen > 0)
-		{
-			if (BYTEA_CHAREQ(p, e) && !afterescape)
-			{
-				*r++ = '\\';
-				BYTEA_NextChar(p, plen);
-				afterescape = true;
-			}
-			else if (*p == '\\')
-			{
-				*r++ = '\\';
-				if (!afterescape)
-					*r++ = '\\';
-				BYTEA_NextChar(p, plen);
-				afterescape = false;
-			}
-			else
-			{
-				BYTEA_CopyAdvChar(r, p, plen);
-				afterescape = false;
-			}
-		}
-	}
-
-	SET_VARSIZE(result, r - ((char *) result));
-
-	PG_RETURN_BYTEA_P(result);
+	PG_RETURN_BYTEA_P((bytea *) result);
 }
-
-/*
- * Same as above, but specifically for bytea (binary) datatype
- */
-static int
-MatchBytea(char *t, int tlen, char *p, int plen)
-{
-	/* Fast path for match-everything pattern */
-	if ((plen == 1) && (*p == '%'))
-		return LIKE_TRUE;
-
-	while ((tlen > 0) && (plen > 0))
-	{
-		if (*p == '\\')
-		{
-			/* Next pattern char must match literally, whatever it is */
-			BYTEA_NextChar(p, plen);
-			if ((plen <= 0) || !BYTEA_CHAREQ(t, p))
-				return LIKE_FALSE;
-		}
-		else if (*p == '%')
-		{
-			/* %% is the same as % according to the SQL standard */
-			/* Advance past all %'s */
-			while ((plen > 0) && (*p == '%'))
-				BYTEA_NextChar(p, plen);
-			/* Trailing percent matches everything. */
-			if (plen <= 0)
-				return LIKE_TRUE;
-
-			/*
-			 * Otherwise, scan for a text position at which we can match the
-			 * rest of the pattern.
-			 */
-			while (tlen > 0)
-			{
-				/*
-				 * Optimization to prevent most recursion: don't recurse
-				 * unless first pattern char might match this text char.
-				 */
-				if (BYTEA_CHAREQ(t, p) || (*p == '\\') || (*p == '_'))
-				{
-					int			matched = MatchBytea(t, tlen, p, plen);
-
-					if (matched != LIKE_FALSE)
-						return matched; /* TRUE or ABORT */
-				}
-
-				BYTEA_NextChar(t, tlen);
-			}
-
-			/*
-			 * End of text with no match, so no point in trying later places
-			 * to start matching this pattern.
-			 */
-			return LIKE_ABORT;
-		}
-		else if ((*p != '_') && !BYTEA_CHAREQ(t, p))
-		{
-			/*
-			 * Not the single-character wildcard and no explicit match? Then
-			 * time to quit...
-			 */
-			return LIKE_FALSE;
-		}
-
-		BYTEA_NextChar(t, tlen);
-		BYTEA_NextChar(p, plen);
-	}
-
-	if (tlen > 0)
-		return LIKE_FALSE;		/* end of pattern, but not of text */
-
-	/* End of input string.  Do we have matching pattern remaining? */
-	while ((plen > 0) && (*p == '%'))	/* allow multiple %'s at end of
-										 * pattern */
-		BYTEA_NextChar(p, plen);
-	if (plen <= 0)
-		return LIKE_TRUE;
-
-	/*
-	 * End of text with no match, so no point in trying later places to start
-	 * matching this pattern.
-	 */
-	return LIKE_ABORT;
-}	/* MatchBytea() */
diff --git a/src/backend/utils/adt/like_match.c b/src/backend/utils/adt/like_match.c
index 8be398f53b7a..90b58525b060 100644
--- a/src/backend/utils/adt/like_match.c
+++ b/src/backend/utils/adt/like_match.c
@@ -1,65 +1,64 @@
 /*-------------------------------------------------------------------------
  *
  * like_match.c
- *	  like expression handling internal code.
+ *	  LIKE pattern matching internal code.
  *
- * This file is included by like.c *twice*, to provide an optimization
- * for single-byte encodings.
+ * This file is included by like.c four times, to provide matching code for
+ * (1) single-byte encodings, (2) UTF8, (3) other multi-byte encodings,
+ * and (4) case insensitive matches in single byte encodings.
+ * (UTF8 is a special case because we can use a much more efficient version
+ * of NextChar than can be used for general multi-byte encodings.)
  *
- * Before the inclusion, we need to define following macros:
+ * Before the inclusion, we need to define the following macros:
  *
- * CHAREQ
- * ICHAREQ
  * NextChar
- * CopyAdvChar
- * MatchText (MBMatchText)
- * MatchTextIC (MBMatchTextIC)
- * do_like_escape (MB_do_like_escape)
+ * MatchText - to name of function wanted
+ * do_like_escape - name of function if wanted - needs CHAREQ and CopyAdvChar
+ * MATCH_LOWER - define for case (4), using to_lower on single-byte chars
  *
  * Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	$PostgreSQL: pgsql/src/backend/utils/adt/like_match.c,v 1.14 2007/01/05 22:19:41 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/utils/adt/like_match.c,v 1.20.2.4 2010/05/28 17:35:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 /*
-**	Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
-**	Rich $alz is now <rsalz@bbn.com>.
-**	Special thanks to Lars Mathiesen <thorinn@diku.dk> for the LABORT code.
-**
-**	This code was shamelessly stolen from the "pql" code by myself and
-**	slightly modified :)
-**
-**	All references to the word "star" were replaced by "percent"
-**	All references to the word "wild" were replaced by "like"
-**
-**	All the nice shell RE matching stuff was replaced by just "_" and "%"
-**
-**	As I don't have a copy of the SQL standard handy I wasn't sure whether
-**	to leave in the '\' escape character handling.
-**
-**	Keith Parks. <keith@mtcc.demon.co.uk>
-**
-**	SQL92 lets you specify the escape character by saying
-**	LIKE <pattern> ESCAPE <escape character>. We are a small operation
-**	so we force you to use '\'. - ay 7/95
-**
-**	Now we have the like_escape() function that converts patterns with
-**	any specified escape character (or none at all) to the internal
-**	default escape character, which is still '\'. - tgl 9/2000
-**
-** The code is rewritten to avoid requiring null-terminated strings,
-** which in turn allows us to leave out some memcpy() operations.
-** This code should be faster and take less memory, but no promises...
-** - thomas 2000-08-06
-**
-*/
+ *	Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
+ *	Rich $alz is now <rsalz@bbn.com>.
+ *	Special thanks to Lars Mathiesen <thorinn@diku.dk> for the LABORT code.
+ *
+ *	This code was shamelessly stolen from the "pql" code by myself and
+ *	slightly modified :)
+ *
+ *	All references to the word "star" were replaced by "percent"
+ *	All references to the word "wild" were replaced by "like"
+ *
+ *	All the nice shell RE matching stuff was replaced by just "_" and "%"
+ *
+ *	As I don't have a copy of the SQL standard handy I wasn't sure whether
+ *	to leave in the '\' escape character handling.
+ *
+ *	Keith Parks. <keith@mtcc.demon.co.uk>
+ *
+ *	SQL92 lets you specify the escape character by saying
+ *	LIKE <pattern> ESCAPE <escape character>. We are a small operation
+ *	so we force you to use '\'. - ay 7/95
+ *
+ *	Now we have the like_escape() function that converts patterns with
+ *	any specified escape character (or none at all) to the internal
+ *	default escape character, which is still '\'. - tgl 9/2000
+ *
+ * The code is rewritten to avoid requiring null-terminated strings,
+ * which in turn allows us to leave out some memcpy() operations.
+ * This code should be faster and take less memory, but no promises...
+ * - thomas 2000-08-06
+ */
 
 
 /*--------------------
- *	Match text and p, return LIKE_TRUE, LIKE_FALSE, or LIKE_ABORT.
+ *	Match text and pattern, return LIKE_TRUE, LIKE_FALSE, or LIKE_ABORT.
  *
  *	LIKE_TRUE: they match
  *	LIKE_FALSE: they don't match
@@ -70,134 +69,104 @@
  *--------------------
  */
 
+#ifdef MATCH_LOWER
+#define GETCHAR(t) ((char) tolower((unsigned char) (t)))
+#else
+#define GETCHAR(t) (t)
+#endif
+
 static int
 MatchText(char *t, int tlen, char *p, int plen)
 {
 	/* Fast path for match-everything pattern */
-	if ((plen == 1) && (*p == '%'))
+	if (plen == 1 && *p == '%')
 		return LIKE_TRUE;
 
-	while ((tlen > 0) && (plen > 0))
+	/*
+	 * In this loop, we advance by char when matching wildcards (and thus on
+	 * recursive entry to this function we are properly char-synced). On other
+	 * occasions it is safe to advance by byte, as the text and pattern will
+	 * be in lockstep. This allows us to perform all comparisons between the
+	 * text and pattern on a byte by byte basis, even for multi-byte
+	 * encodings.
+	 */
+	while (tlen > 0 && plen > 0)
 	{
 		if (*p == '\\')
 		{
-			/* Next pattern char must match literally, whatever it is */
-			NextChar(p, plen);
-			if ((plen <= 0) || !CHAREQ(t, p))
+			/* Next pattern byte must match literally, whatever it is */
+			NextByte(p, plen);
+			if (plen <= 0 || GETCHAR(*p) != GETCHAR(*t))
 				return LIKE_FALSE;
 		}
 		else if (*p == '%')
 		{
-			/* %% is the same as % according to the SQL standard */
-			/* Advance past all %'s */
-			while ((plen > 0) && (*p == '%'))
-				NextChar(p, plen);
-			/* Trailing percent matches everything. */
-			if (plen <= 0)
-				return LIKE_TRUE;
+			char		firstpat;
 
 			/*
-			 * Otherwise, scan for a text position at which we can match the
-			 * rest of the pattern.
+			 * % processing is essentially a search for a text position at
+			 * which the remainder of the text matches the remainder of the
+			 * pattern, using a recursive call to check each potential match.
+			 *
+			 * If there are wildcards immediately following the %, we can skip
+			 * over them first, using the idea that any sequence of N _'s and
+			 * one or more %'s is equivalent to N _'s and one % (ie, it will
+			 * match any sequence of at least N text characters).  In this
+			 * way we will always run the recursive search loop using a
+			 * pattern fragment that begins with a literal character-to-match,
+			 * thereby not recursing more than we have to.
 			 */
-			while (tlen > 0)
+			NextByte(p, plen);
+
+			while (plen > 0)
 			{
-				/*
-				 * Optimization to prevent most recursion: don't recurse
-				 * unless first pattern char might match this text char.
-				 */
-				if (CHAREQ(t, p) || (*p == '\\') || (*p == '_'))
+				if (*p == '%')
+					NextByte(p, plen);
+				else if (*p == '_')
 				{
-					int			matched = MatchText(t, tlen, p, plen);
-
-					if (matched != LIKE_FALSE)
-						return matched; /* TRUE or ABORT */
+					/* If not enough text left to match the pattern, ABORT */
+					if (tlen <= 0)
+						return LIKE_ABORT;
+					NextChar(t, tlen);
+					NextByte(p, plen);
 				}
-
-				NextChar(t, tlen);
+				else
+					break;		/* Reached a non-wildcard pattern char */
 			}
 
 			/*
-			 * End of text with no match, so no point in trying later places
-			 * to start matching this pattern.
+			 * If we're at end of pattern, match: we have a trailing % which
+			 * matches any remaining text string.
 			 */
-			return LIKE_ABORT;
-		}
-		else if ((*p != '_') && !CHAREQ(t, p))
-		{
-			/*
-			 * Not the single-character wildcard and no explicit match? Then
-			 * time to quit...
-			 */
-			return LIKE_FALSE;
-		}
-
-		NextChar(t, tlen);
-		NextChar(p, plen);
-	}
-
-	if (tlen > 0)
-		return LIKE_FALSE;		/* end of pattern, but not of text */
-
-	/* End of input string.  Do we have matching pattern remaining? */
-	while ((plen > 0) && (*p == '%'))	/* allow multiple %'s at end of
-										 * pattern */
-		NextChar(p, plen);
-	if (plen <= 0)
-		return LIKE_TRUE;
-
-	/*
-	 * End of text with no match, so no point in trying later places to start
-	 * matching this pattern.
-	 */
-	return LIKE_ABORT;
-}	/* MatchText() */
-
-/*
- * Same as above, but ignore case
- */
-static int
-MatchTextIC(char *t, int tlen, char *p, int plen)
-{
-	/* Fast path for match-everything pattern */
-	if ((plen == 1) && (*p == '%'))
-		return LIKE_TRUE;
-
-	while ((tlen > 0) && (plen > 0))
-	{
-		if (*p == '\\')
-		{
-			/* Next pattern char must match literally, whatever it is */
-			NextChar(p, plen);
-			if ((plen <= 0) || !ICHAREQ(t, p))
-				return LIKE_FALSE;
-		}
-		else if (*p == '%')
-		{
-			/* %% is the same as % according to the SQL standard */
-			/* Advance past all %'s */
-			while ((plen > 0) && (*p == '%'))
-				NextChar(p, plen);
-			/* Trailing percent matches everything. */
 			if (plen <= 0)
 				return LIKE_TRUE;
 
 			/*
 			 * Otherwise, scan for a text position at which we can match the
-			 * rest of the pattern.
+			 * rest of the pattern.  The first remaining pattern char is known
+			 * to be a regular or escaped literal character, so we can compare
+			 * the first pattern byte to each text byte to avoid recursing
+			 * more than we have to.  This fact also guarantees that we don't
+			 * have to consider a match to the zero-length substring at the
+			 * end of the text.
 			 */
+			if (*p == '\\')
+			{
+				if (plen < 2)
+					return LIKE_FALSE; /* XXX should throw error */
+				firstpat = GETCHAR(p[1]);
+			}
+			else
+				firstpat = GETCHAR(*p);
+
 			while (tlen > 0)
 			{
-				/*
-				 * Optimization to prevent most recursion: don't recurse
-				 * unless first pattern char might match this text char.
-				 */
-				if (ICHAREQ(t, p) || (*p == '\\') || (*p == '_'))
+				if (GETCHAR(*t) == firstpat)
 				{
-					int			matched = MatchTextIC(t, tlen, p, plen);
+					int			matched = MatchText(t, tlen, p, plen);
 
 					if (matched != LIKE_FALSE)
-						return matched; /* TRUE or ABORT */
+						return matched;		/* TRUE or ABORT */
 				}
 
 				NextChar(t, tlen);
@@ -209,26 +178,44 @@ MatchTextIC(char *t, int tlen, char *p, int plen)
 			 */
 			return LIKE_ABORT;
 		}
-		else if ((*p != '_') && !ICHAREQ(t, p))
+		else if (*p == '_')
 		{
-			/*
-			 * Not the single-character wildcard and no explicit match? Then
-			 * time to quit...
-			 */
+			/* _ matches any single character, and we know there is one */
+			NextChar(t, tlen);
+			NextByte(p, plen);
+			continue;
+		}
+		else if (GETCHAR(*p) != GETCHAR(*t))
+		{
+			/* non-wildcard pattern char fails to match text char */
 			return LIKE_FALSE;
 		}
 
-		NextChar(t, tlen);
-		NextChar(p, plen);
+		/*
+		 * Pattern and text match, so advance.
+		 *
+		 * It is safe to use NextByte instead of NextChar here, even for
+		 * multi-byte character sets, because we are not following immediately
+		 * after a wildcard character. If we are in the middle of a multibyte
+		 * character, we must already have matched at least one byte of the
+		 * character from both text and pattern; so we cannot get out-of-sync
+		 * on character boundaries.  And we know that no backend-legal
+		 * encoding allows ASCII characters such as '%' to appear as non-first
+		 * bytes of characters, so we won't mistakenly detect a new wildcard.
+		 */
+		NextByte(t, tlen);
+		NextByte(p, plen);
 	}
 
 	if (tlen > 0)
 		return LIKE_FALSE;		/* end of pattern, but not of text */
 
-	/* End of input string.  Do we have matching pattern remaining? */
-	while ((plen > 0) && (*p == '%'))	/* allow multiple %'s at end of
-										 * pattern */
-		NextChar(p, plen);
+	/*
+	 * End of text, but perhaps not of pattern.  Match iff the remaining
+	 * pattern can match a zero-length string, ie, it's zero or more %'s.
+	 */
+	while (plen > 0 && *p == '%')
+		NextByte(p, plen);
 	if (plen <= 0)
 		return LIKE_TRUE;
 
@@ -237,12 +224,14 @@ MatchTextIC(char *t, int tlen, char *p, int plen)
 	 * matching this pattern.
 	 */
 	return LIKE_ABORT;
-}	/* MatchTextIC() */
+}	/* MatchText() */
 
 /*
  * like_escape() --- given a pattern and an ESCAPE string,
  * convert the pattern to use Postgres' standard backslash escape convention.
  */
+#ifdef do_like_escape
+
 static text *
 do_like_escape(text *pat, text *esc)
 {
@@ -254,10 +243,10 @@ do_like_escape(text *pat, text *esc)
 				elen;
 	bool		afterescape;
 
-	p = VARDATA(pat);
-	plen = (VARSIZE(pat) - VARHDRSZ);
-	e = VARDATA(esc);
-	elen = (VARSIZE(esc) - VARHDRSZ);
+	p = VARDATA_ANY(pat);
+	plen = VARSIZE_ANY_EXHDR(pat);
+	e = VARDATA_ANY(esc);
+	elen = VARSIZE_ANY_EXHDR(esc);
 
 	/*
 	 * Worst-case pattern growth is 2x --- unlikely, but it's hardly worth
@@ -291,14 +280,14 @@ do_like_escape(text *pat, text *esc)
 					 errmsg("invalid escape string"),
 				  errhint("Escape string must be empty or one character.")));
 
-		e = VARDATA(esc);
+		e = VARDATA_ANY(esc);
 
 		/*
 		 * If specified escape is '\', just copy the pattern as-is.
 		 */
 		if (*e == '\\')
 		{
-			memcpy(result, pat, VARSIZE(pat));
+			memcpy(result, pat, VARSIZE_ANY(pat));
 			return result;
 		}
 
@@ -336,3 +325,23 @@ do_like_escape(text *pat, text *esc)
 
 	return result;
 }
+#endif   /* do_like_escape */
+
+#ifdef CHAREQ
+#undef CHAREQ
+#endif
+
+#undef NextChar
+#undef CopyAdvChar
+#undef MatchText
+
+#ifdef do_like_escape
+#undef do_like_escape
+#endif
+
+#undef GETCHAR
+
+#ifdef MATCH_LOWER
+#undef MATCH_LOWER
+
+#endif
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c
index 41b07d1f71dc..6553b02c05e1 100644
--- a/src/backend/utils/adt/lockfuncs.c
+++ b/src/backend/utils/adt/lockfuncs.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2002-2009, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.28 2007/01/05 22:19:41 momjian Exp $
+ *		$PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.32 2008/01/08 23:18:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,7 @@ static const char *const LockTagTypeNames[] = {
 	"page",
 	"tuple",
 	"transactionid",
+	"virtualxid",
 	"resynchronize",
 	"append-only segment file",
 	"object",
@@ -50,6 +51,26 @@ typedef struct
 } PG_Lock_Status;
 
 
+/*
+ * VXIDGetDatum - Construct a text representation of a VXID
+ *
+ * This is currently only used in pg_lock_status, so we put it here.
+ */
+static Datum
+VXIDGetDatum(BackendId bid, LocalTransactionId lxid)
+{
+	/*
+	 * The representation is "<bid>/<lxid>", decimal and unsigned decimal
+	 * respectively.  Note that elog.c also knows how to format a vxid.
+	 */
+	char		vxidstr[32];
+
+	snprintf(vxidstr, sizeof(vxidstr), "%d/%u", bid, lxid);
+
+	return DirectFunctionCall1(textin, CStringGetDatum(vxidstr));
+}
+
+
 /*
  * pg_lock_status - produce a view with one row per held or awaited lock mode
  */
@@ -75,7 +96,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
 
 		/* build tupdesc for result tuples */
 		/* this had better match pg_locks view in system_views.sql */
-		tupdesc = CreateTemplateTupleDesc(16, false);
+		tupdesc = CreateTemplateTupleDesc(17, false);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "locktype",
 						   TEXTOID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 2, "database",
@@ -86,30 +107,32 @@ pg_lock_status(PG_FUNCTION_ARGS)
 						   INT4OID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 5, "tuple",
 						   INT2OID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 6, "transactionid",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 6, "virtualxid",
+						   TEXTOID, -1, 0);
+		TupleDescInitEntry(tupdesc, (AttrNumber) 7, "transactionid",
 						   XIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 7, "classid",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 8, "classid",
 						   OIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 8, "objid",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 9, "objid",
 						   OIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 9, "objsubid",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 10, "objsubid",
 						   INT2OID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 10, "transaction",
-						   XIDOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 11, "pid",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 11, "virtualtransaction",
+						   TEXTOID, -1, 0);
+		TupleDescInitEntry(tupdesc, (AttrNumber) 12, "pid",
 						   INT4OID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 12, "mode",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 13, "mode",
 						   TEXTOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 13, "granted",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 14, "granted",
 						   BOOLOID, -1, 0);
 		/*
 		 * These next columns are specific to GPDB
 		 */
-		TupleDescInitEntry(tupdesc, (AttrNumber) 14, "mppSessionId",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 15, "mppSessionId",
 						   INT4OID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 15, "mppIsWriter",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 16, "mppIsWriter",
 						   BOOLOID, -1, 0);
-		TupleDescInitEntry(tupdesc, (AttrNumber) 16, "gp_segment_id",
+		TupleDescInitEntry(tupdesc, (AttrNumber) 17, "gp_segment_id",
 						   INT4OID, -1, 0);
 
 		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
@@ -155,8 +178,8 @@ pg_lock_status(PG_FUNCTION_ARGS)
 			appendStringInfo(&buffer,
 					"SELECT * FROM  pg_lock_status() L "
 					 " (locktype text, database oid, relation oid, page int4, tuple int2,"
-					 " transactionid xid, classid oid, objid oid, objsubid int2,"
-					 " transaction xid, pid int4, mode text, granted boolean, "
+					 " virtualxid text, transactionid xid, classid oid, objid oid, objsubid int2,"
+					 " virtualtransaction text, pid int4, mode text, granted boolean, "
 					 " mppSessionId int4, mppIsWriter boolean, gp_segment_id int4) ");
 
 			initStringInfo(&errbuf);
@@ -242,9 +265,9 @@ pg_lock_status(PG_FUNCTION_ARGS)
 			 * will still exist on the subsequent calls.
 			 */
 			mystatus->segresults = results;
-
-			MemoryContextSwitchTo(oldcontext);
 		}
+
+		MemoryContextSwitchTo(oldcontext);
 	}
 
 	funcctx = SRF_PERCALL_SETUP();
@@ -264,8 +287,8 @@ pg_lock_status(PG_FUNCTION_ARGS)
 		LOCKMODE	mode = 0;
 		const char *locktypename;
 		char		tnbuf[32];
-		Datum		values[16];
-		bool		nulls[16];
+		Datum		values[17];
+		bool		nulls[17];
 		HeapTuple	tuple;
 		Datum		result;
 
@@ -326,7 +349,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
 		MemSet(values, 0, sizeof(values));
 		MemSet(nulls, false, sizeof(nulls));
 
-		if (lock->tag.locktag_type <= LOCKTAG_ADVISORY)
+		if (lock->tag.locktag_type <= LOCKTAG_LAST_TYPE)
 			locktypename = LockTagTypeNames[lock->tag.locktag_type];
 		else
 		{
@@ -349,6 +372,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
 				nulls[6] = true;
 				nulls[7] = true;
 				nulls[8] = true;
+				nulls[9] = true;
 				break;
 			case LOCKTAG_PAGE:
 				values[1] = ObjectIdGetDatum(lock->tag.locktag_field1);
@@ -359,6 +383,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
 				nulls[6] = true;
 				nulls[7] = true;
 				nulls[8] = true;
+				nulls[9] = true;
 				break;
 			case LOCKTAG_TUPLE:
 				values[1] = ObjectIdGetDatum(lock->tag.locktag_field1);
@@ -369,17 +394,30 @@ pg_lock_status(PG_FUNCTION_ARGS)
 				nulls[6] = true;
 				nulls[7] = true;
 				nulls[8] = true;
+				nulls[9] = true;
 				break;
 			case LOCKTAG_TRANSACTION:
-				values[5] = TransactionIdGetDatum(lock->tag.locktag_field1);
+				values[6] = TransactionIdGetDatum(lock->tag.locktag_field1);
 				nulls[1] = true;
 				nulls[2] = true;
 				nulls[3] = true;
 				nulls[4] = true;
-				nulls[6] = true;
+				nulls[5] = true;
 				nulls[7] = true;
 				nulls[8] = true;
+				nulls[9] = true;
 				break;
+			case LOCKTAG_VIRTUALTRANSACTION:
+				values[5] = VXIDGetDatum(lock->tag.locktag_field1,
+										 lock->tag.locktag_field2);
+				nulls[1] = true;
+				nulls[2] = true;
+				nulls[3] = true;
+				nulls[4] = true;
+				nulls[6] = true;
+				nulls[7] = true;
+				nulls[8] = true;
+				nulls[9] = true;
 			case LOCKTAG_RELATION_APPENDONLY_SEGMENT_FILE:
 				values[1] = ObjectIdGetDatum(lock->tag.locktag_field1);
 				values[2] = ObjectIdGetDatum(lock->tag.locktag_field2);
@@ -389,47 +427,50 @@ pg_lock_status(PG_FUNCTION_ARGS)
 				nulls[5] = true;
 				nulls[6] = true;
 				nulls[8] = true;
+				nulls[9] = true;
 				break;
 			case LOCKTAG_RESOURCE_QUEUE:
 				values[1] = ObjectIdGetDatum(proc->databaseId);
-				values[7] = ObjectIdGetDatum(lock->tag.locktag_field1);
+				values[8] = ObjectIdGetDatum(lock->tag.locktag_field1);
 				nulls[2] = true;
 				nulls[3] = true;
 				nulls[4] = true;
 				nulls[5] = true;
 				nulls[6] = true;
-				nulls[8] = true;
+				nulls[7] = true;
+				nulls[9] = true;
 				break;
 			case LOCKTAG_OBJECT:
 			case LOCKTAG_USERLOCK:
 			case LOCKTAG_ADVISORY:
 			default:			/* treat unknown locktags like OBJECT */
 				values[1] = ObjectIdGetDatum(lock->tag.locktag_field1);
-				values[6] = ObjectIdGetDatum(lock->tag.locktag_field2);
-				values[7] = ObjectIdGetDatum(lock->tag.locktag_field3);
-				values[8] = Int16GetDatum(lock->tag.locktag_field4);
+				values[7] = ObjectIdGetDatum(lock->tag.locktag_field2);
+				values[8] = ObjectIdGetDatum(lock->tag.locktag_field3);
+				values[9] = Int16GetDatum(lock->tag.locktag_field4);
 				nulls[2] = true;
 				nulls[3] = true;
 				nulls[4] = true;
 				nulls[5] = true;
+				nulls[6] = true;
 				break;
 		}
 
-		values[9] = TransactionIdGetDatum(proc->xid);
+		values[10] = VXIDGetDatum(proc->backendId, proc->lxid);
 		if (proc->pid != 0)
-			values[10] = Int32GetDatum(proc->pid);
+			values[11] = Int32GetDatum(proc->pid);
 		else
-			nulls[10] = true;
-		values[11] = DirectFunctionCall1(textin,
+			nulls[11] = true;
+		values[12] = DirectFunctionCall1(textin,
 					  CStringGetDatum((char *) GetLockmodeName(LOCK_LOCKMETHOD(*lock),
 													  mode)));
-		values[12] = BoolGetDatum(granted);
-		
-		values[13] = Int32GetDatum(proc->mppSessionId);
+		values[13] = BoolGetDatum(granted);
 		
-		values[14] = Int32GetDatum(proc->mppIsWriter);
+		values[14] = Int32GetDatum(proc->mppSessionId);
+
+		values[15] = BoolGetDatum(proc->mppIsWriter);
 
-		values[15] = Int32GetDatum(Gp_segment);
+		values[16] = Int32GetDatum(Gp_segment);
 
 		tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls);
 		result = HeapTupleGetDatum(tuple);
@@ -445,8 +486,8 @@ pg_lock_status(PG_FUNCTION_ARGS)
 	{
 		HeapTuple	tuple;
 		Datum		result;
-		Datum		values[16];
-		bool		nulls[16];
+		Datum		values[17];
+		bool		nulls[17];
 		int i;
 		int whichresultset = 0;
 		int whichelement = mystatus->currIdx - lockData->nelements;
@@ -503,23 +544,24 @@ pg_lock_status(PG_FUNCTION_ARGS)
 		values[3] = UInt32GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 3)));
 		values[4] = UInt16GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 4)));
 
-		values[5] = TransactionIdGetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 5)));
-		values[6] = ObjectIdGetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 6)));
+		values[5] = CStringGetTextDatum(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 5));
+		values[6] = TransactionIdGetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 6)));
 		values[7] = ObjectIdGetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 7)));
-		values[8] = UInt16GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 8)));
+		values[8] = ObjectIdGetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 8)));
+		values[9] = UInt16GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 9)));
 
-		values[9] = TransactionIdGetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 9)));
-		values[10] = UInt32GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow,10)));
-		values[11] = CStringGetTextDatum(PQgetvalue(mystatus->segresults[whichresultset], whichrow,11));
-		values[12] = BoolGetDatum(strncmp(PQgetvalue(mystatus->segresults[whichresultset], whichrow,12),"t",1)==0);
-		values[13] = Int32GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow,13)));
-		values[14] = BoolGetDatum(strncmp(PQgetvalue(mystatus->segresults[whichresultset], whichrow,14),"t",1)==0);
-		values[15] = Int32GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow,15)));
+		values[10] = CStringGetTextDatum(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 10));
+		values[11] = UInt32GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 11)));
+		values[12] = CStringGetTextDatum(PQgetvalue(mystatus->segresults[whichresultset], whichrow, 12));
+		values[13] = BoolGetDatum(strncmp(PQgetvalue(mystatus->segresults[whichresultset], whichrow,13),"t",1)==0);
+		values[14] = Int32GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow,14)));
+		values[15] = BoolGetDatum(strncmp(PQgetvalue(mystatus->segresults[whichresultset], whichrow,15),"t",1)==0);
+		values[16] = Int32GetDatum(atoi(PQgetvalue(mystatus->segresults[whichresultset], whichrow,16)));
 
 		/*
 		 * Copy the null info over.  It should all match properly.
 		 */
-		for (i=0; i<16; i++)
+		for (i=0; i<17; i++)
 		{
 			nulls[i] = PQgetisnull(mystatus->segresults[whichresultset], whichrow, i);
 		}
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index f3742d515060..aa13589b8a62 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -144,59 +144,6 @@ macaddr_send(PG_FUNCTION_ARGS)
 }
 
 
-/*
- * Convert macaddr to text data type.
- */
-
-Datum
-macaddr_text(PG_FUNCTION_ARGS)
-{
-	/* Input is a macaddr, but may as well leave it in Datum form */
-	Datum		addr = PG_GETARG_DATUM(0);
-	text	   *result;
-	char	   *str;
-	int			len;
-
-	str = DatumGetCString(DirectFunctionCall1(macaddr_out, addr));
-
-	len = (strlen(str) + VARHDRSZ);
-
-	result = palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-/*
- * Convert text to macaddr data type.
- */
-
-Datum
-text_macaddr(PG_FUNCTION_ARGS)
-{
-	text	   *addr = PG_GETARG_TEXT_P(0);
-	Datum		result;
-	char		str[100];
-	int			len;
-
-	len = (VARSIZE(addr) - VARHDRSZ);
-	if (len >= sizeof(str))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("text too long to convert to MAC address")));
-
-	memcpy(str, VARDATA(addr), len);
-	*(str + len) = '\0';
-
-	result = DirectFunctionCall1(macaddr_in, CStringGetDatum(str));
-
-	return (result);
-}
-
 /*
  *	Comparison function for sorting:
  */
diff --git a/src/backend/utils/adt/matrix.c b/src/backend/utils/adt/matrix.c
index f91b5c5b6b43..a5d667af381e 100644
--- a/src/backend/utils/adt/matrix.c
+++ b/src/backend/utils/adt/matrix.c
@@ -127,7 +127,7 @@ matrix_transpose(PG_FUNCTION_ARGS)
 	
 	/* Otherwise we have a more complicated data reshuffle */
 	get_typlenbyvalalign(eltype, &typlen, &typbyval, &typalign);
-	elsize = att_align(typlen, typalign);
+	elsize = att_align_nominal(typlen, typalign);
 	data_m = ARR_DATA_PTR(m);
 	data_r = ARR_DATA_PTR(result);
 	for (i = 0; i < ARR_DIMS(m)[1]; i++)
@@ -139,7 +139,7 @@ matrix_transpose(PG_FUNCTION_ARGS)
 			{
 				char *seek = data_m + (elsize * index_m);
 				memcpy(data_r, seek, elsize);
-				data_r = (char *) att_align(data_r+elsize, typalign);
+				data_r = (char *) att_align_nominal(data_r+elsize, typalign);
 			}
 			else 
 			{
@@ -148,10 +148,10 @@ matrix_transpose(PG_FUNCTION_ARGS)
 				for (k = 0; k < index_m; k++) 
 				{
 					seek += VARSIZE(seek);
-					seek = (char*) att_align(seek, typalign);
+					seek = (char*) att_align_nominal(seek, typalign);
 				}
 				memcpy(data_r, seek, VARSIZE(seek));
-				data_r = (char *) att_align(data_r+VARSIZE(seek), typalign);
+				data_r = (char *) att_align_nominal(data_r+VARSIZE(seek), typalign);
 			}
 		}
 	}
@@ -208,7 +208,7 @@ Datum matrix_multiply(PG_FUNCTION_ARGS)
 	
 	/* datatype and size of input matrix */
 	get_typlenbyvalalign(eltype, &typlen, &typbyval, &typalign);
-	elsize = att_align(typlen, typalign);
+	elsize = att_align_nominal(typlen, typalign);
 	
 	/* Output array is always either int8[] or float8[] */
 	size = ARR_OVERHEAD_NONULLS(2);  /* overhead for two dimensional array */
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 0fee6564a990..028449099d4b 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -222,10 +222,10 @@ pg_rotate_logfile(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 (errmsg("must be superuser to rotate log files"))));
 
-	if (!Redirect_stderr)
+	if (!Logging_collector)
 	{
 		ereport(WARNING,
-		(errmsg("rotation not possible because log redirection not active")));
+		(errmsg("rotation not possible because log collection not active")));
 		PG_RETURN_BOOL(false);
 	}
 
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index 9eedff6467d0..1a003d9f1ba2 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/name.c,v 1.60 2007/01/05 22:19:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/name.c,v 1.61 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,13 +46,17 @@ Datum
 namein(PG_FUNCTION_ARGS)
 {
 	char	   *s = PG_GETARG_CSTRING(0);
-	NameData   *result;
+	Name		result;
 	int			len;
 
 	len = strlen(s);
-	len = pg_mbcliplen(s, len, NAMEDATALEN - 1);
 
-	result = (NameData *) palloc0(NAMEDATALEN);
+	/* Truncate oversize input */
+	if (len >= NAMEDATALEN)
+		len = pg_mbcliplen(s, len, NAMEDATALEN - 1);
+
+	/* We use palloc0 here to ensure result is zero-padded */
+	result = (Name) palloc0(NAMEDATALEN);
 	memcpy(NameStr(*result), s, len);
 
 	PG_RETURN_NAME(result);
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index a5fd5cb2a33d..49ef8d9abe0f 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -22,7 +22,6 @@
 #include "utils/inet.h"
 
 
-static inet *text_network(text *src, bool is_cidr);
 static int32 network_cmp_internal(inet *a1, inet *a2);
 static int	bitncmp(void *l, void *r, int n);
 static bool addressOK(unsigned char *a, int bits, int family);
@@ -173,7 +172,7 @@ network_out(inet *src, bool is_cidr)
 Datum
 inet_out(PG_FUNCTION_ARGS)
 {
-	inet	   *src = PG_GETARG_INET_P(0);
+	inet	   *src = PG_GETARG_INET_PP(0);
 
 	PG_RETURN_CSTRING(network_out(src, false));
 }
@@ -181,7 +180,7 @@ inet_out(PG_FUNCTION_ARGS)
 Datum
 cidr_out(PG_FUNCTION_ARGS)
 {
-	inet	   *src = PG_GETARG_INET_P(0);
+	inet	   *src = PG_GETARG_INET_PP(0);
 
 	PG_RETURN_CSTRING(network_out(src, true));
 }
@@ -300,7 +299,7 @@ network_send(inet *addr, bool is_cidr)
 Datum
 inet_send(PG_FUNCTION_ARGS)
 {
-	inet	   *addr = PG_GETARG_INET_P(0);
+	inet	   *addr = PG_GETARG_INET_PP(0);
 
 	PG_RETURN_BYTEA_P(network_send(addr, false));
 }
@@ -308,46 +307,16 @@ inet_send(PG_FUNCTION_ARGS)
 Datum
 cidr_send(PG_FUNCTION_ARGS)
 {
-	inet	   *addr = PG_GETARG_INET_P(0);
+	inet	   *addr = PG_GETARG_INET_PP(0);
 
 	PG_RETURN_BYTEA_P(network_send(addr, true));
 }
 
 
-static inet *
-text_network(text *src, bool is_cidr)
-{
-	int			len = VARSIZE(src) - VARHDRSZ;
-	char	   *str = palloc(len + 1);
-
-	memcpy(str, VARDATA(src), len);
-	str[len] = '\0';
-
-	//elog(LOG,"text_network leaks %d bytes",len+1);
-	return network_in(str, is_cidr);
-}
-
-Datum
-text_inet(PG_FUNCTION_ARGS)
-{
-	text	   *src = PG_GETARG_TEXT_P(0);
-
-	PG_RETURN_INET_P(text_network(src, false));
-}
-
-Datum
-text_cidr(PG_FUNCTION_ARGS)
-{
-	text	   *src = PG_GETARG_TEXT_P(0);
-
-	PG_RETURN_INET_P(text_network(src, true));
-}
-
-
 Datum
 inet_to_cidr(PG_FUNCTION_ARGS)
 {
-	inet	   *src = PG_GETARG_INET_P(0);
+	inet	   *src = PG_GETARG_INET_PP(0);
 	inet	   *dst;
 	int			bits;
 	int			byte;
@@ -387,7 +356,7 @@ inet_to_cidr(PG_FUNCTION_ARGS)
 Datum
 inet_set_masklen(PG_FUNCTION_ARGS)
 {
-	inet	   *src = PG_GETARG_INET_P(0);
+	inet	   *src = PG_GETARG_INET_PP(0);
 	int			bits = PG_GETARG_INT32(1);
 	inet	   *dst;
 
@@ -411,7 +380,7 @@ inet_set_masklen(PG_FUNCTION_ARGS)
 Datum
 cidr_set_masklen(PG_FUNCTION_ARGS)
 {
-	inet	   *src = PG_GETARG_INET_P(0);
+	inet	   *src = PG_GETARG_INET_PP(0);
 	int			bits = PG_GETARG_INT32(1);
 	inet	   *dst;
 	int			byte;
@@ -486,8 +455,8 @@ network_cmp_internal(inet *a1, inet *a2)
 Datum
 network_cmp(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	PG_RETURN_INT32(network_cmp_internal(a1, a2));
 }
@@ -498,8 +467,8 @@ network_cmp(PG_FUNCTION_ARGS)
 Datum
 network_lt(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	PG_RETURN_BOOL(network_cmp_internal(a1, a2) < 0);
 }
@@ -507,8 +476,8 @@ network_lt(PG_FUNCTION_ARGS)
 Datum
 network_le(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	PG_RETURN_BOOL(network_cmp_internal(a1, a2) <= 0);
 }
@@ -516,8 +485,8 @@ network_le(PG_FUNCTION_ARGS)
 Datum
 network_eq(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	PG_RETURN_BOOL(network_cmp_internal(a1, a2) == 0);
 }
@@ -525,8 +494,8 @@ network_eq(PG_FUNCTION_ARGS)
 Datum
 network_ge(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	PG_RETURN_BOOL(network_cmp_internal(a1, a2) >= 0);
 }
@@ -534,8 +503,8 @@ network_ge(PG_FUNCTION_ARGS)
 Datum
 network_gt(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	PG_RETURN_BOOL(network_cmp_internal(a1, a2) > 0);
 }
@@ -543,8 +512,8 @@ network_gt(PG_FUNCTION_ARGS)
 Datum
 network_ne(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	PG_RETURN_BOOL(network_cmp_internal(a1, a2) != 0);
 }
@@ -555,7 +524,7 @@ network_ne(PG_FUNCTION_ARGS)
 Datum
 hashinet(PG_FUNCTION_ARGS)
 {
-	inet	   *addr = PG_GETARG_INET_P(0);
+	inet	   *addr = PG_GETARG_INET_PP(0);
 	int			addrsize = ip_addrsize(addr);
 
 	/* XXX this assumes there are no pad bytes in the data structure */
@@ -568,8 +537,8 @@ hashinet(PG_FUNCTION_ARGS)
 Datum
 network_sub(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	if (ip_family(a1) == ip_family(a2))
 	{
@@ -583,8 +552,8 @@ network_sub(PG_FUNCTION_ARGS)
 Datum
 network_subeq(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	if (ip_family(a1) == ip_family(a2))
 	{
@@ -598,8 +567,8 @@ network_subeq(PG_FUNCTION_ARGS)
 Datum
 network_sup(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	if (ip_family(a1) == ip_family(a2))
 	{
@@ -613,8 +582,8 @@ network_sup(PG_FUNCTION_ARGS)
 Datum
 network_supeq(PG_FUNCTION_ARGS)
 {
-	inet	   *a1 = PG_GETARG_INET_P(0);
-	inet	   *a2 = PG_GETARG_INET_P(1);
+	inet	   *a1 = PG_GETARG_INET_PP(0);
+	inet	   *a2 = PG_GETARG_INET_PP(1);
 
 	if (ip_family(a1) == ip_family(a2))
 	{
@@ -631,7 +600,7 @@ network_supeq(PG_FUNCTION_ARGS)
 Datum
 network_host(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	char	   *ptr;
 	char		tmp[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")];
 
@@ -657,7 +626,7 @@ network_host(PG_FUNCTION_ARGS)
 Datum
 network_show(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	int			len;
 	char		tmp[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")];
 
@@ -698,7 +667,7 @@ inet_abbrev(PG_FUNCTION_ARGS)
 Datum
 cidr_abbrev(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	char	   *dst;
 	char		tmp[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")];
 
@@ -716,7 +685,7 @@ cidr_abbrev(PG_FUNCTION_ARGS)
 Datum
 network_masklen(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 
 	PG_RETURN_INT32(ip_bits(ip));
 }
@@ -724,7 +693,7 @@ network_masklen(PG_FUNCTION_ARGS)
 Datum
 network_family(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 
 	switch (ip_family(ip))
 	{
@@ -743,7 +712,7 @@ network_family(PG_FUNCTION_ARGS)
 Datum
 network_broadcast(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	inet	   *dst;
 	int			byte;
 	int			bits;
@@ -792,7 +761,7 @@ network_broadcast(PG_FUNCTION_ARGS)
 Datum
 network_network(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	inet	   *dst;
 	int			byte;
 	int			bits;
@@ -835,7 +804,7 @@ network_network(PG_FUNCTION_ARGS)
 Datum
 network_netmask(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	inet	   *dst;
 	int			byte;
 	int			bits;
@@ -876,7 +845,7 @@ network_netmask(PG_FUNCTION_ARGS)
 Datum
 network_hostmask(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	inet	   *dst;
 	int			byte;
 	int			bits;
@@ -933,7 +902,7 @@ convert_network_to_scalar(Datum value, Oid typid)
 		case INETOID:
 		case CIDROID:
 			{
-				inet	   *ip = DatumGetInetP(value);
+				inet	   *ip = DatumGetInetPP(value);
 				int			len;
 				double		res;
 				int			i;
@@ -998,7 +967,7 @@ bitncmp(void *l, void *r, int n)
 
 	b = n / 8;
 	x = memcmp(l, r, b);
-	if (x)
+	if (x || (n % 8) == 0)
 		return x;
 
 	lb = ((const u_char *) l)[b];
@@ -1243,7 +1212,7 @@ inet_server_port(PG_FUNCTION_ARGS)
 Datum
 inetnot(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	inet	   *dst;
 
 	dst = (inet *) palloc0(sizeof(inet));
@@ -1268,8 +1237,8 @@ inetnot(PG_FUNCTION_ARGS)
 Datum
 inetand(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
-	inet	   *ip2 = PG_GETARG_INET_P(1);
+	inet	   *ip = PG_GETARG_INET_PP(0);
+	inet	   *ip2 = PG_GETARG_INET_PP(1);
 	inet	   *dst;
 
 	dst = (inet *) palloc0(sizeof(inet));
@@ -1300,8 +1269,8 @@ inetand(PG_FUNCTION_ARGS)
 Datum
 inetor(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
-	inet	   *ip2 = PG_GETARG_INET_P(1);
+	inet	   *ip = PG_GETARG_INET_PP(0);
+	inet	   *ip2 = PG_GETARG_INET_PP(1);
 	inet	   *dst;
 
 	dst = (inet *) palloc0(sizeof(inet));
@@ -1372,8 +1341,8 @@ internal_inetpl(inet *ip, int64 addend)
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("result is out of range")));
 	}
-	ip_bits(dst) = ip_bits(ip);
 
+	ip_bits(dst) = ip_bits(ip);
 	ip_family(dst) = ip_family(ip);
 	SET_INET_VARSIZE(dst);
 
@@ -1384,7 +1353,7 @@ internal_inetpl(inet *ip, int64 addend)
 Datum
 inetpl(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	int64		addend = PG_GETARG_INT64(1);
 
 	PG_RETURN_INET_P(internal_inetpl(ip, addend));
@@ -1394,7 +1363,7 @@ inetpl(PG_FUNCTION_ARGS)
 Datum
 inetmi_int8(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
+	inet	   *ip = PG_GETARG_INET_PP(0);
 	int64		addend = PG_GETARG_INT64(1);
 
 	PG_RETURN_INET_P(internal_inetpl(ip, -addend));
@@ -1404,8 +1373,8 @@ inetmi_int8(PG_FUNCTION_ARGS)
 Datum
 inetmi(PG_FUNCTION_ARGS)
 {
-	inet	   *ip = PG_GETARG_INET_P(0);
-	inet	   *ip2 = PG_GETARG_INET_P(1);
+	inet	   *ip = PG_GETARG_INET_PP(0);
+	inet	   *ip2 = PG_GETARG_INET_PP(1);
 	int64		res = 0;
 
 	if (ip_family(ip) != ip_family(ip2))
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
deleted file mode 100644
index 846464a4351a..000000000000
--- a/src/backend/utils/adt/not_in.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * not_in.c
- *	  Executes the "not_in" operator for any data type
- *
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/not_in.c,v 1.46 2007/01/05 22:19:41 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-/*
- *
- * XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- * X HACK WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! X
- * XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- *
- * This code is the OLD not-in code that is HACKED
- * into place until operators that can have arguments as
- * columns are ******REALLY****** implemented!!!!!!!!!!!
- *
- */
-
-#include "postgres.h"
-
-#include "access/heapam.h"
-#include "catalog/namespace.h"
-#include "parser/parse_relation.h"
-#include "utils/builtins.h"
-
-
-/* ----------------------------------------------------------------
- *
- * ----------------------------------------------------------------
- */
-Datum
-int4notin(PG_FUNCTION_ARGS)
-{
-	int32		not_in_arg = PG_GETARG_INT32(0);
-	text	   *relation_and_attr = PG_GETARG_TEXT_P(1);
-	List	   *names;
-	int			nnames;
-	RangeVar   *relrv;
-	char	   *attribute;
-	Relation	relation_to_scan;
-	int32		integer_value;
-	HeapTuple	current_tuple;
-	HeapScanDesc scan_descriptor;
-	bool		isNull,
-				retval;
-	int			attrid;
-	Datum		value;
-
-	/* Parse the argument */
-
-	names = textToQualifiedNameList(relation_and_attr);
-	nnames = list_length(names);
-	if (nnames < 2)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_NAME),
-				 errmsg("invalid name syntax"),
-				 errhint("Must provide \"relationname.columnname\".")));
-	attribute = strVal(llast(names));
-	names = list_truncate(names, nnames - 1);
-	relrv = makeRangeVarFromNameList(names);
-
-	/* Open the relation and get a relation descriptor */
-	relation_to_scan = heap_openrv(relrv, AccessShareLock);
-
-	/* Find the column to search */
-	attrid = attnameAttNum(relation_to_scan, attribute, true);
-	if (attrid == InvalidAttrNumber)
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						attribute,
-						RelationGetRelationName(relation_to_scan))));
-
-	scan_descriptor = heap_beginscan(relation_to_scan, SnapshotNow,
-									 0, (ScanKey) NULL);
-
-	retval = true;
-
-	/* do a scan of the relation, and do the check */
-	while ((current_tuple = heap_getnext(scan_descriptor, ForwardScanDirection)) != NULL)
-	{
-		value = heap_getattr(current_tuple,
-							 (AttrNumber) attrid,
-							 RelationGetDescr(relation_to_scan),
-							 &isNull);
-		if (isNull)
-			continue;
-		integer_value = DatumGetInt32(value);
-		if (not_in_arg == integer_value)
-		{
-			retval = false;
-			break;				/* can stop scanning now */
-		}
-	}
-
-	/* close the relation */
-	heap_endscan(scan_descriptor);
-	heap_close(relation_to_scan, AccessShareLock);
-
-	PG_RETURN_BOOL(retval);
-}
-
-Datum
-oidnotin(PG_FUNCTION_ARGS)
-{
-	Oid			the_oid = PG_GETARG_OID(0);
-
-#ifdef NOT_USED
-	text	   *relation_and_attr = PG_GETARG_TEXT_P(1);
-#endif
-
-	if (the_oid == InvalidOid)
-		PG_RETURN_BOOL(false);
-	/* XXX assume oid maps to int4 */
-	return int4notin(fcinfo);
-}
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 1e2a262ec62e..587a492ad3b6 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -14,7 +14,7 @@
  * Copyright (c) 1998-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.100 2007/02/17 00:55:57 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.108 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -517,7 +517,7 @@ numeric_send(PG_FUNCTION_ARGS)
  *	scale of the attribute have to be applied on the value.
  */
 Datum
-numeric(PG_FUNCTION_ARGS)
+numeric		(PG_FUNCTION_ARGS)
 {
 	Numeric		num = PG_GETARG_NUMERIC(0);
 	int32		typmod = PG_GETARG_INT32(1);
@@ -564,7 +564,7 @@ numeric(PG_FUNCTION_ARGS)
 	{
 		new = (Numeric) palloc(VARSIZE(num));
 		memcpy(new, num, VARSIZE(num));
-		NUMERIC_SIGN_DSCALE(new) = NUMERIC_SIGN(new) |
+		new->n_sign_dscale = NUMERIC_SIGN(new) |
 			((uint16) scale & NUMERIC_DSCALE_MASK);
 		PG_RETURN_NUMERIC(new);
 	}
@@ -584,8 +584,8 @@ numeric(PG_FUNCTION_ARGS)
 Datum
 numerictypmodin(PG_FUNCTION_ARGS)
 {
-	ArrayType   *ta = PG_GETARG_ARRAYTYPE_P(0);
-	int32    	*tl;
+	ArrayType  *ta = PG_GETARG_ARRAYTYPE_P(0);
+	int32	   *tl;
 	int			n;
 	int32		typmod;
 
@@ -601,8 +601,8 @@ numerictypmodin(PG_FUNCTION_ARGS)
 		if (tl[1] < 0 || tl[1] > tl[0])
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("NUMERIC scale %d must be between 0 and precision %d",
-							tl[1], tl[0])));
+				errmsg("NUMERIC scale %d must be between 0 and precision %d",
+					   tl[1], tl[0])));
 		typmod = ((tl[0] << 16) | tl[1]) + VARHDRSZ;
 	}
 	else if (n == 1)
@@ -619,7 +619,7 @@ numerictypmodin(PG_FUNCTION_ARGS)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						errmsg("invalid NUMERIC type modifier")));
+				 errmsg("invalid NUMERIC type modifier")));
 		typmod = 0;				/* keep compiler quiet */
 	}
 
@@ -629,8 +629,8 @@ numerictypmodin(PG_FUNCTION_ARGS)
 Datum
 numerictypmodout(PG_FUNCTION_ARGS)
 {
-	int32	typmod = PG_GETARG_INT32(0);
-	char   *res = (char *) palloc(64);
+	int32		typmod = PG_GETARG_INT32(0);
+	char	   *res = (char *) palloc(64);
 
 	if (typmod >= 0)
 		snprintf(res, 64, "(%d,%d)",
@@ -938,7 +938,7 @@ width_bucket_numeric(PG_FUNCTION_ARGS)
 		NUMERIC_IS_NAN(bound2))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_ARGUMENT_FOR_WIDTH_BUCKET_FUNCTION),
-				 errmsg("operand, lower bound and upper bound cannot be NaN")));
+			  errmsg("operand, lower bound and upper bound cannot be NaN")));
 
 	quick_init_var(&result_var);
 	quick_init_var(&count_var);
@@ -1179,29 +1179,28 @@ cmp_numerics(Numeric num1, Numeric num2)
 Datum
 hash_numeric(PG_FUNCTION_ARGS)
 {
-	Numeric 	key = PG_GETARG_NUMERIC(0);
-	Datum 		digit_hash;
-	Datum 		result;
-	int 		weight;
-	int 		start_offset;
-	int 		end_offset;
-	int 		i;
-	int 		hash_len;
+	Numeric		key = PG_GETARG_NUMERIC(0);
+	Datum		digit_hash;
+	Datum		result;
+	int			weight;
+	int			start_offset;
+	int			end_offset;
+	int			i;
+	int			hash_len;
 
 	/* If it's NaN, don't try to hash the rest of the fields */
 	if (NUMERIC_IS_NAN(key))
 		PG_RETURN_UINT32(0);
 
-	weight 		 = key->n_weight;
+	weight = key->n_weight;
 	start_offset = 0;
-	end_offset 	 = 0;
+	end_offset = 0;
 
 	/*
-	 * Omit any leading or trailing zeros from the input to the
-	 * hash. The numeric implementation *should* guarantee that
-	 * leading and trailing zeros are suppressed, but we're
-	 * paranoid. Note that we measure the starting and ending offsets
-	 * in units of NumericDigits, not bytes.
+	 * Omit any leading or trailing zeros from the input to the hash. The
+	 * numeric implementation *should* guarantee that leading and trailing
+	 * zeros are suppressed, but we're paranoid. Note that we measure the
+	 * starting and ending offsets in units of NumericDigits, not bytes.
 	 */
 	for (i = 0; i < NUMERIC_NDIGITS(key); i++)
 	{
@@ -1209,17 +1208,17 @@ hash_numeric(PG_FUNCTION_ARGS)
 			break;
 
 		start_offset++;
+
 		/*
-		 * The weight is effectively the # of digits before the
-		 * decimal point, so decrement it for each leading zero we
-		 * skip.
+		 * The weight is effectively the # of digits before the decimal point,
+		 * so decrement it for each leading zero we skip.
 		 */
 		weight--;
 	}
 
 	/*
-	 * If there are no non-zero digits, then the value of the number
-	 * is zero, regardless of any other fields.
+	 * If there are no non-zero digits, then the value of the number is zero,
+	 * regardless of any other fields.
 	 */
 	if (NUMERIC_NDIGITS(key) == start_offset)
 		PG_RETURN_UINT32(-1);
@@ -1236,14 +1235,14 @@ hash_numeric(PG_FUNCTION_ARGS)
 	Assert(start_offset + end_offset < NUMERIC_NDIGITS(key));
 
 	/*
-	 * Note that we don't hash on the Numeric's scale, since two
-	 * numerics can compare equal but have different scales. We also
-	 * don't hash on the sign, although we could: since a sign
-	 * difference implies inequality, this shouldn't affect correctness.
+	 * Note that we don't hash on the Numeric's scale, since two numerics can
+	 * compare equal but have different scales. We also don't hash on the
+	 * sign, although we could: since a sign difference implies inequality,
+	 * this shouldn't affect correctness.
 	 */
 	hash_len = NUMERIC_NDIGITS(key) - start_offset - end_offset;
 	digit_hash = hash_any((unsigned char *) (NUMERIC_DIGITS(key) + start_offset),
-                          hash_len * sizeof(NumericDigit));
+						  hash_len * sizeof(NumericDigit));
 
 	/* Mix in the weight, via XOR */
 	result = digit_hash ^ weight;
@@ -1592,6 +1591,11 @@ numeric_fac(PG_FUNCTION_ARGS)
 		res = make_result(&const_one);
 		PG_RETURN_NUMERIC(res);
 	}
+	/* Fail immediately if the result would overflow */
+	if (num > 32177)
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("value overflows numeric format")));
 
 	/* Fail immediately if the result will overflow */
 	if (num > 32177)
@@ -1606,7 +1610,7 @@ numeric_fac(PG_FUNCTION_ARGS)
 
 	for (num = num - 1; num > 1; num--)
 	{
-		/* This loop can take a while so allow it to be interrupted */
+		/* this loop can take awhile, so allow it to be interrupted */
 		CHECK_FOR_INTERRUPTS();
 
 		int8_to_numericvar(num, &fact);
@@ -2387,56 +2391,6 @@ numeric_float4(PG_FUNCTION_ARGS)
 }
 
 
-Datum
-text_numeric(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			len;
-	char	   *s;
-	Datum		result;
-	char		ts[NUMERIC_LOCAL_DTXT];
-
-	len = (VARSIZE(str) - VARHDRSZ);
-	if (len > NUMERIC_LOCAL_DMAX)
-		s = palloc(len + 1);
-	else
-		s = ts;
-
-	memcpy(s, VARDATA(str), len);
-	*(s + len) = '\0';
-
-	result = DirectFunctionCall3(numeric_in, CStringGetDatum(s),
-								 ObjectIdGetDatum(0), Int32GetDatum(-1));
-
-	if (s != ts)
-		pfree(s);
-
-	return result;
-}
-
-Datum
-numeric_text(PG_FUNCTION_ARGS)
-{
-	/* val is numeric, but easier to leave it as Datum */
-	Datum		val = PG_GETARG_DATUM(0);
-	char	   *s;
-	int			len;
-	text	   *result;
-
-	s = DatumGetCString(DirectFunctionCall1(numeric_out, val));
-	len = strlen(s);
-
-	result = (text *) palloc(VARHDRSZ + len);
-
-	SET_VARSIZE(result, VARHDRSZ + len);
-	memcpy(VARDATA(result), s, len);
-
-	pfree(s);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
 /* ----------------------------------------------------------------------
  *
  * Aggregate functions
@@ -2688,9 +2642,9 @@ numeric_stddev_internal(ArrayType *transarray,
 	else
 	{
 		if (sample)
-			mul_var(&vN, &vNminus1, &vNminus1, 0);	/* N * (N - 1) */
+			mul_var(&vN, &vNminus1, &vNminus1, 0);		/* N * (N - 1) */
 		else
-			mul_var(&vN, &vN, &vNminus1, 0);		/* N * N */
+			mul_var(&vN, &vN, &vNminus1, 0);	/* N * N */
 		rscale = select_div_scale(&vsumX2, &vNminus1);
 		div_var(&vsumX2, &vNminus1, &vsumX, rscale, true);		/* variance */
 		if (!variance)
@@ -4016,8 +3970,8 @@ make_result(NumericVar *var)
 		result = (Numeric) palloc(NUMERIC_HDRSZ);
 
 		SET_VARSIZE(result, NUMERIC_HDRSZ);
-		NUMERIC_WEIGHT(result) = 0;
-		NUMERIC_SIGN_DSCALE(result) = NUMERIC_NAN;
+		result->n_weight = 0;
+		result->n_sign_dscale = NUMERIC_NAN;
 
 		dump_numeric("make_result()", result);
 		return result;
@@ -4047,8 +4001,8 @@ make_result(NumericVar *var)
 	len = NUMERIC_HDRSZ + n * sizeof(NumericDigit);
 	result = (Numeric) palloc(len);
 	SET_VARSIZE(result, len);
-	NUMERIC_WEIGHT(result) = weight;
-	NUMERIC_SIGN_DSCALE(result) = sign | (var->dscale & NUMERIC_DSCALE_MASK);
+	result->n_weight = weight;
+	result->n_sign_dscale = sign | (var->dscale & NUMERIC_DSCALE_MASK);
 
 	memcpy(NUMERIC_DIGITS(result), digits, n * sizeof(NumericDigit));
 
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 1bb2e434fe23..228987df0047 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/oid.c,v 1.70 2007/01/05 22:19:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/oid.c,v 1.73 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -415,45 +415,3 @@ oidvectorgt(PG_FUNCTION_ARGS)
 
 	PG_RETURN_BOOL(cmp > 0);
 }
-
-Datum
-oid_text(PG_FUNCTION_ARGS)
-{
-	Oid			oid = PG_GETARG_OID(0);
-	text	   *result;
-	int			len;
-	char	   *str;
-
-	str = DatumGetCString(DirectFunctionCall1(oidout,
-											  ObjectIdGetDatum(oid)));
-	len = strlen(str) + VARHDRSZ;
-
-	result = (text *) palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-Datum
-text_oid(PG_FUNCTION_ARGS)
-{
-	text	   *string = PG_GETARG_TEXT_P(0);
-	Oid			result;
-	int			len;
-	char	   *str;
-
-	len = (VARSIZE(string) - VARHDRSZ);
-
-	str = palloc(len + 1);
-	memcpy(str, VARDATA(string), len);
-	*(str + len) = '\0';
-
-	result = oidin_subr(str, NULL);
-
-	pfree(str);
-
-	PG_RETURN_OID(result);
-}
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 5120e54f374d..588cf5941dbd 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	$PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.69 2007/02/08 18:19:33 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.77 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,8 +46,8 @@
  */
 #if defined(HAVE_WCSTOMBS) && defined(HAVE_TOWLOWER)
 #define USE_WIDE_UPPER_LOWER
-char *wstring_lower (char *str);
-char *wstring_upper(char *str);
+char	   *wstring_lower(char *str);
+char	   *wstring_upper(char *str);
 #endif
 
 static text *dotrim(const char *string, int stringlen,
@@ -63,7 +63,7 @@ static text *dotrim(const char *string, int stringlen,
 static wchar_t *
 texttowcs(const text *txt)
 {
-	int			nbytes = VARSIZE(txt) - VARHDRSZ;
+	int			nbytes = VARSIZE_ANY_EXHDR(txt);
 	char	   *workstr;
 	wchar_t    *result;
 	size_t		ncodes;
@@ -77,7 +77,7 @@ texttowcs(const text *txt)
 
 	/* Need a null-terminated version of the input */
 	workstr = (char *) palloc(nbytes + 1);
-	memcpy(workstr, VARDATA(txt), nbytes);
+	memcpy(workstr, VARDATA_ANY(txt), nbytes);
 	workstr[nbytes] = '\0';
 
 	/* Output workspace cannot have more codes than input bytes */
@@ -164,7 +164,7 @@ wcstotext(const wchar_t *str, int ncodes)
 static wchar_t *
 win32_utf8_texttowcs(const text *txt)
 {
-	int			nbytes = VARSIZE(txt) - VARHDRSZ;
+	int			nbytes = VARSIZE_ANY_EXHDR(txt);
 	wchar_t    *result;
 	int			r;
 
@@ -184,13 +184,13 @@ win32_utf8_texttowcs(const text *txt)
 	else
 	{
 		/* Do the conversion */
-		r = MultiByteToWideChar(CP_UTF8, 0, VARDATA(txt), nbytes,
+		r = MultiByteToWideChar(CP_UTF8, 0, VARDATA_ANY(txt), nbytes,
 								result, nbytes);
 
-		if (!r)					/* assume it's NO_UNICODE_TRANSLATION */
+		if (r <= 0)				/* assume it's NO_UNICODE_TRANSLATION */
 		{
 			/* see notes above about error reporting */
-			pg_verifymbstr(VARDATA(txt), nbytes, false);
+			pg_verifymbstr(VARDATA_ANY(txt), nbytes, false);
 			ereport(ERROR,
 					(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
 					 errmsg("invalid multibyte character for locale"),
@@ -198,6 +198,7 @@ win32_utf8_texttowcs(const text *txt)
 		}
 	}
 
+	/* Append trailing null wchar (MultiByteToWideChar won't have) */
 	Assert(r <= nbytes);
 	result[r] = 0;
 
@@ -212,8 +213,9 @@ win32_utf8_wcstotext(const wchar_t *str)
 	int			nbytes;
 	int			r;
 
+	/* Compute size of output string (this *will* include trailing null) */
 	nbytes = WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL);
-	if (nbytes == 0)			/* shouldn't happen */
+	if (nbytes <= 0)			/* shouldn't happen */
 		ereport(ERROR,
 				(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
 				 errmsg("UTF-16 to UTF-8 translation failed: %lu",
@@ -223,13 +225,13 @@ win32_utf8_wcstotext(const wchar_t *str)
 
 	r = WideCharToMultiByte(CP_UTF8, 0, str, -1, VARDATA(result), nbytes,
 							NULL, NULL);
-	if (r == 0)					/* shouldn't happen */
+	if (r != nbytes)			/* shouldn't happen */
 		ereport(ERROR,
 				(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
 				 errmsg("UTF-16 to UTF-8 translation failed: %lu",
 						GetLastError())));
 
-	SET_VARSIZE(result, nbytes + VARHDRSZ - 1);		/* -1 to ignore null */
+	SET_VARSIZE(result, nbytes + VARHDRSZ - 1); /* -1 to ignore null */
 
 	return result;
 }
@@ -261,21 +263,21 @@ win32_wcstotext(const wchar_t *str, int ncodes)
 #endif   /* WIN32 */
 
 #ifdef USE_WIDE_UPPER_LOWER
-/* 
- * string_upper and string_lower are used for correct multibyte upper/lower 
+/*
+ * string_upper and string_lower are used for correct multibyte upper/lower
  * transformations localized strings. Returns pointers to transformated
  * string.
  */
 char *
 wstring_upper(char *str)
 {
-	wchar_t		*workspace;
-	text		*in_text;
-	text		*out_text;
-	char		*result;    
-	int 	nbytes = strlen(str);
-	int	i;
-	
+	wchar_t    *workspace;
+	text	   *in_text;
+	text	   *out_text;
+	char	   *result;
+	int			nbytes = strlen(str);
+	int			i;
+
 	in_text = palloc(nbytes + VARHDRSZ);
 	memcpy(VARDATA(in_text), str, nbytes);
 	SET_VARSIZE(in_text, nbytes + VARHDRSZ);
@@ -286,8 +288,8 @@ wstring_upper(char *str)
 		workspace[i] = towupper(workspace[i]);
 
 	out_text = wcstotext(workspace, i);
-	
-    	nbytes = VARSIZE(out_text) - VARHDRSZ;
+
+	nbytes = VARSIZE(out_text) - VARHDRSZ;
 	result = palloc(nbytes + 1);
 	memcpy(result, VARDATA(out_text), nbytes);
 
@@ -296,20 +298,20 @@ wstring_upper(char *str)
 	pfree(workspace);
 	pfree(in_text);
 	pfree(out_text);
-	
+
 	return result;
 }
 
 char *
 wstring_lower(char *str)
 {
-	wchar_t		*workspace;
-	text		*in_text;
-	text		*out_text;
-	char		*result;    
-	int 	nbytes = strlen(str);
-	int	i;
-	
+	wchar_t    *workspace;
+	text	   *in_text;
+	text	   *out_text;
+	char	   *result;
+	int			nbytes = strlen(str);
+	int			i;
+
 	in_text = palloc(nbytes + VARHDRSZ);
 	memcpy(VARDATA(in_text), str, nbytes);
 	SET_VARSIZE(in_text, nbytes + VARHDRSZ);
@@ -320,7 +322,7 @@ wstring_lower(char *str)
 		workspace[i] = towlower(workspace[i]);
 
 	out_text = wcstotext(workspace, i);
-	
+
 	nbytes = VARSIZE(out_text) - VARHDRSZ;
 	result = palloc(nbytes + 1);
 	memcpy(result, VARDATA(out_text), nbytes);
@@ -330,10 +332,10 @@ wstring_lower(char *str)
 	pfree(workspace);
 	pfree(in_text);
 	pfree(out_text);
-	
+
 	return result;
 }
-#endif	/* USE_WIDE_UPPER_LOWER */
+#endif   /* USE_WIDE_UPPER_LOWER */
 
 /********************************************************************
  *
@@ -361,7 +363,7 @@ lower(PG_FUNCTION_ARGS)
 	 */
 	if (pg_database_encoding_max_length() > 1 && !lc_ctype_is_c())
 	{
-		text	   *string = PG_GETARG_TEXT_P(0);
+		text	   *string = PG_GETARG_TEXT_PP(0);
 		text	   *result;
 		wchar_t    *workspace;
 		int			i;
@@ -427,7 +429,7 @@ upper(PG_FUNCTION_ARGS)
 	 */
 	if (pg_database_encoding_max_length() > 1 && !lc_ctype_is_c())
 	{
-		text	   *string = PG_GETARG_TEXT_P(0);
+		text	   *string = PG_GETARG_TEXT_PP(0);
 		text	   *result;
 		wchar_t    *workspace;
 		int			i;
@@ -496,7 +498,7 @@ initcap(PG_FUNCTION_ARGS)
 	 */
 	if (pg_database_encoding_max_length() > 1 && !lc_ctype_is_c())
 	{
-		text	   *string = PG_GETARG_TEXT_P(0);
+		text	   *string = PG_GETARG_TEXT_PP(0);
 		text	   *result;
 		wchar_t    *workspace;
 		int			wasalnum = 0;
@@ -567,12 +569,13 @@ initcap(PG_FUNCTION_ARGS)
 Datum
 lpad(PG_FUNCTION_ARGS)
 {
-	text	   *string1 = PG_GETARG_TEXT_P(0);
+	text	   *string1 = PG_GETARG_TEXT_PP(0);
 	int32		len = PG_GETARG_INT32(1);
-	text	   *string2 = PG_GETARG_TEXT_P(2);
+	text	   *string2 = PG_GETARG_TEXT_PP(2);
 	text	   *ret;
 	char	   *ptr1,
 			   *ptr2,
+			   *ptr2start,
 			   *ptr2end,
 			   *ptr_ret;
 	int			m,
@@ -585,15 +588,15 @@ lpad(PG_FUNCTION_ARGS)
 	if (len < 0)
 		len = 0;
 
-	s1len = VARSIZE(string1) - VARHDRSZ;
+	s1len = VARSIZE_ANY_EXHDR(string1);
 	if (s1len < 0)
 		s1len = 0;				/* shouldn't happen */
 
-	s2len = VARSIZE(string2) - VARHDRSZ;
+	s2len = VARSIZE_ANY_EXHDR(string2);
 	if (s2len < 0)
 		s2len = 0;				/* shouldn't happen */
 
-	s1len = pg_mbstrlen_with_len(VARDATA(string1), s1len);
+	s1len = pg_mbstrlen_with_len(VARDATA_ANY(string1), s1len);
 
 	if (s1len > len)
 		s1len = len;			/* truncate string1 to len chars */
@@ -613,7 +616,7 @@ lpad(PG_FUNCTION_ARGS)
 
 	m = len - s1len;
 
-	ptr2 = VARDATA(string2);
+	ptr2 = ptr2start = VARDATA_ANY(string2);
 	ptr2end = ptr2 + s2len;
 	ptr_ret = VARDATA(ret);
 
@@ -625,10 +628,10 @@ lpad(PG_FUNCTION_ARGS)
 		ptr_ret += mlen;
 		ptr2 += mlen;
 		if (ptr2 == ptr2end)	/* wrap around at end of s2 */
-			ptr2 = VARDATA(string2);
+			ptr2 = ptr2start;
 	}
 
-	ptr1 = VARDATA(string1);
+	ptr1 = VARDATA_ANY(string1);
 
 	while (s1len--)
 	{
@@ -664,12 +667,13 @@ lpad(PG_FUNCTION_ARGS)
 Datum
 rpad(PG_FUNCTION_ARGS)
 {
-	text	   *string1 = PG_GETARG_TEXT_P(0);
+	text	   *string1 = PG_GETARG_TEXT_PP(0);
 	int32		len = PG_GETARG_INT32(1);
-	text	   *string2 = PG_GETARG_TEXT_P(2);
+	text	   *string2 = PG_GETARG_TEXT_PP(2);
 	text	   *ret;
 	char	   *ptr1,
 			   *ptr2,
+			   *ptr2start,
 			   *ptr2end,
 			   *ptr_ret;
 	int			m,
@@ -682,15 +686,15 @@ rpad(PG_FUNCTION_ARGS)
 	if (len < 0)
 		len = 0;
 
-	s1len = VARSIZE(string1) - VARHDRSZ;
+	s1len = VARSIZE_ANY_EXHDR(string1);
 	if (s1len < 0)
 		s1len = 0;				/* shouldn't happen */
 
-	s2len = VARSIZE(string2) - VARHDRSZ;
+	s2len = VARSIZE_ANY_EXHDR(string2);
 	if (s2len < 0)
 		s2len = 0;				/* shouldn't happen */
 
-	s1len = pg_mbstrlen_with_len(VARDATA(string1), s1len);
+	s1len = pg_mbstrlen_with_len(VARDATA_ANY(string1), s1len);
 
 	if (s1len > len)
 		s1len = len;			/* truncate string1 to len chars */
@@ -709,7 +713,7 @@ rpad(PG_FUNCTION_ARGS)
 	ret = (text *) palloc(VARHDRSZ + bytelen);
 	m = len - s1len;
 
-	ptr1 = VARDATA(string1);
+	ptr1 = VARDATA_ANY(string1);
 	ptr_ret = VARDATA(ret);
 
 	while (s1len--)
@@ -721,7 +725,7 @@ rpad(PG_FUNCTION_ARGS)
 		ptr1 += mlen;
 	}
 
-	ptr2 = VARDATA(string2);
+	ptr2 = ptr2start = VARDATA_ANY(string2);
 	ptr2end = ptr2 + s2len;
 
 	while (m--)
@@ -732,7 +736,7 @@ rpad(PG_FUNCTION_ARGS)
 		ptr_ret += mlen;
 		ptr2 += mlen;
 		if (ptr2 == ptr2end)	/* wrap around at end of s2 */
-			ptr2 = VARDATA(string2);
+			ptr2 = ptr2start;
 	}
 
 	SET_VARSIZE(ret, ptr_ret - (char *) ret);
@@ -759,12 +763,12 @@ rpad(PG_FUNCTION_ARGS)
 Datum
 btrim(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
-	text	   *set = PG_GETARG_TEXT_P(1);
+	text	   *string = PG_GETARG_TEXT_PP(0);
+	text	   *set = PG_GETARG_TEXT_PP(1);
 	text	   *ret;
 
-	ret = dotrim(VARDATA(string), VARSIZE(string) - VARHDRSZ,
-				 VARDATA(set), VARSIZE(set) - VARHDRSZ,
+	ret = dotrim(VARDATA_ANY(string), VARSIZE_ANY_EXHDR(string),
+				 VARDATA_ANY(set), VARSIZE_ANY_EXHDR(set),
 				 true, true);
 
 	PG_RETURN_TEXT_P(ret);
@@ -779,10 +783,10 @@ btrim(PG_FUNCTION_ARGS)
 Datum
 btrim1(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
+	text	   *string = PG_GETARG_TEXT_PP(0);
 	text	   *ret;
 
-	ret = dotrim(VARDATA(string), VARSIZE(string) - VARHDRSZ,
+	ret = dotrim(VARDATA_ANY(string), VARSIZE_ANY_EXHDR(string),
 				 " ", 1,
 				 true, true);
 
@@ -895,9 +899,9 @@ dotrim(const char *string, int stringlen,
 				}
 			}
 
-			pfree((void *)stringchars);
+			pfree(stringchars);
 			pfree(stringmblen);
-			pfree((void *)setchars);
+			pfree(setchars);
 			pfree(setmblen);
 		}
 		else
@@ -969,26 +973,33 @@ dotrim(const char *string, int stringlen,
 Datum
 byteatrim(PG_FUNCTION_ARGS)
 {
-	bytea	   *string = PG_GETARG_BYTEA_P(0);
-	bytea	   *set = PG_GETARG_BYTEA_P(1);
+	bytea	   *string = PG_GETARG_BYTEA_PP(0);
+	bytea	   *set = PG_GETARG_BYTEA_PP(1);
 	bytea	   *ret;
 	char	   *ptr,
 			   *end,
 			   *ptr2,
+			   *ptr2start,
 			   *end2;
-	int			m;
+	int			m,
+				stringlen,
+				setlen;
 
-	if ((m = VARSIZE(string) - VARHDRSZ) <= 0 ||
-		(VARSIZE(set) - VARHDRSZ) <= 0)
+	stringlen = VARSIZE_ANY_EXHDR(string);
+	setlen = VARSIZE_ANY_EXHDR(set);
+
+	if (stringlen <= 0 || setlen <= 0)
 		PG_RETURN_BYTEA_P(string);
 
-	ptr = VARDATA(string);
-	end = VARDATA(string) + VARSIZE(string) - VARHDRSZ - 1;
-	end2 = VARDATA(set) + VARSIZE(set) - VARHDRSZ - 1;
+	m = stringlen;
+	ptr = VARDATA_ANY(string);
+	end = ptr + stringlen - 1;
+	ptr2start = VARDATA_ANY(set);
+	end2 = ptr2start + setlen - 1;
 
 	while (m > 0)
 	{
-		ptr2 = VARDATA(set);
+		ptr2 = ptr2start;
 		while (ptr2 <= end2)
 		{
 			if (*ptr == *ptr2)
@@ -1003,7 +1014,7 @@ byteatrim(PG_FUNCTION_ARGS)
 
 	while (m > 0)
 	{
-		ptr2 = VARDATA(set);
+		ptr2 = ptr2start;
 		while (ptr2 <= end2)
 		{
 			if (*end == *ptr2)
@@ -1041,12 +1052,12 @@ byteatrim(PG_FUNCTION_ARGS)
 Datum
 ltrim(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
-	text	   *set = PG_GETARG_TEXT_P(1);
+	text	   *string = PG_GETARG_TEXT_PP(0);
+	text	   *set = PG_GETARG_TEXT_PP(1);
 	text	   *ret;
 
-	ret = dotrim(VARDATA(string), VARSIZE(string) - VARHDRSZ,
-				 VARDATA(set), VARSIZE(set) - VARHDRSZ,
+	ret = dotrim(VARDATA_ANY(string), VARSIZE_ANY_EXHDR(string),
+				 VARDATA_ANY(set), VARSIZE_ANY_EXHDR(set),
 				 true, false);
 
 	PG_RETURN_TEXT_P(ret);
@@ -1061,10 +1072,10 @@ ltrim(PG_FUNCTION_ARGS)
 Datum
 ltrim1(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
+	text	   *string = PG_GETARG_TEXT_PP(0);
 	text	   *ret;
 
-	ret = dotrim(VARDATA(string), VARSIZE(string) - VARHDRSZ,
+	ret = dotrim(VARDATA_ANY(string), VARSIZE_ANY_EXHDR(string),
 				 " ", 1,
 				 true, false);
 
@@ -1089,12 +1100,12 @@ ltrim1(PG_FUNCTION_ARGS)
 Datum
 rtrim(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
-	text	   *set = PG_GETARG_TEXT_P(1);
+	text	   *string = PG_GETARG_TEXT_PP(0);
+	text	   *set = PG_GETARG_TEXT_PP(1);
 	text	   *ret;
 
-	ret = dotrim(VARDATA(string), VARSIZE(string) - VARHDRSZ,
-				 VARDATA(set), VARSIZE(set) - VARHDRSZ,
+	ret = dotrim(VARDATA_ANY(string), VARSIZE_ANY_EXHDR(string),
+				 VARDATA_ANY(set), VARSIZE_ANY_EXHDR(set),
 				 false, true);
 
 	PG_RETURN_TEXT_P(ret);
@@ -1109,10 +1120,10 @@ rtrim(PG_FUNCTION_ARGS)
 Datum
 rtrim1(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
+	text	   *string = PG_GETARG_TEXT_PP(0);
 	text	   *ret;
 
-	ret = dotrim(VARDATA(string), VARSIZE(string) - VARHDRSZ,
+	ret = dotrim(VARDATA_ANY(string), VARSIZE_ANY_EXHDR(string),
 				 " ", 1,
 				 false, true);
 
@@ -1140,9 +1151,9 @@ rtrim1(PG_FUNCTION_ARGS)
 Datum
 translate(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
-	text	   *from = PG_GETARG_TEXT_P(1);
-	text	   *to = PG_GETARG_TEXT_P(2);
+	text	   *string = PG_GETARG_TEXT_PP(0);
+	text	   *from = PG_GETARG_TEXT_PP(1);
+	text	   *to = PG_GETARG_TEXT_PP(2);
 	text	   *result;
 	char	   *from_ptr,
 			   *to_ptr;
@@ -1158,19 +1169,19 @@ translate(PG_FUNCTION_ARGS)
 	int			source_len;
 	int			from_index;
 
-	m = VARSIZE(string) - VARHDRSZ;
+	m = VARSIZE_ANY_EXHDR(string);
 	if (m <= 0)
 		PG_RETURN_TEXT_P(string);
-	source = VARDATA(string);
+	source = VARDATA_ANY(string);
 
-	fromlen = VARSIZE(from) - VARHDRSZ;
-	from_ptr = VARDATA(from);
-	tolen = VARSIZE(to) - VARHDRSZ;
-	to_ptr = VARDATA(to);
+	fromlen = VARSIZE_ANY_EXHDR(from);
+	from_ptr = VARDATA_ANY(from);
+	tolen = VARSIZE_ANY_EXHDR(to);
+	to_ptr = VARDATA_ANY(to);
 
 	/*
-	 * The worst-case expansion is to substitute a max-length character for
-	 * a single-byte character at each position of the string.
+	 * The worst-case expansion is to substitute a max-length character for a
+	 * single-byte character at each position of the string.
 	 */
 	worst_len = pg_database_encoding_max_length() * m;
 
@@ -1233,9 +1244,9 @@ translate(PG_FUNCTION_ARGS)
 	SET_VARSIZE(result, retlen + VARHDRSZ);
 
 	/*
-	 * The function result is probably much bigger than needed, if we're
-	 * using a multibyte encoding, but it's not worth reallocating it;
-	 * the result probably won't live long anyway.
+	 * The function result is probably much bigger than needed, if we're using
+	 * a multibyte encoding, but it's not worth reallocating it; the result
+	 * probably won't live long anyway.
 	 */
 
 	PG_RETURN_TEXT_P(result);
@@ -1345,7 +1356,7 @@ ascii(PG_FUNCTION_ARGS)
  ********************************************************************/
 
 Datum
-chr(PG_FUNCTION_ARGS)
+chr			(PG_FUNCTION_ARGS)
 {
 	uint32		cvalue = PG_GETARG_UINT32(0);
 	text	   *result;
@@ -1419,9 +1430,9 @@ chr(PG_FUNCTION_ARGS)
 							cvalue)));
 
 
-	result = (text *) palloc(VARHDRSZ + 1);
-	SET_VARSIZE(result, VARHDRSZ + 1);
-	*VARDATA(result) = (char) cvalue;
+		result = (text *) palloc(VARHDRSZ + 1);
+		SET_VARSIZE(result, VARHDRSZ + 1);
+		*VARDATA(result) = (char) cvalue;
 	}
 
 	PG_RETURN_TEXT_P(result);
@@ -1444,19 +1455,20 @@ chr(PG_FUNCTION_ARGS)
 Datum
 repeat(PG_FUNCTION_ARGS)
 {
-	text	   *string = PG_GETARG_TEXT_P(0);
+	text	   *string = PG_GETARG_TEXT_PP(0);
 	int32		count = PG_GETARG_INT32(1);
 	text	   *result;
 	int			slen,
 				tlen;
 	int			i;
-	char	   *cp;
+	char	   *cp,
+			   *sp;
 
 	if (count < 0)
 		count = 0;
 
-	slen = (VARSIZE(string) - VARHDRSZ);
-	tlen = (VARHDRSZ + (count * slen));
+	slen = VARSIZE_ANY_EXHDR(string);
+	tlen = VARHDRSZ + (count * slen);
 
 	/* Check for integer overflow */
 	if (slen != 0 && count != 0)
@@ -1474,9 +1486,10 @@ repeat(PG_FUNCTION_ARGS)
 
 	SET_VARSIZE(result, tlen);
 	cp = VARDATA(result);
+	sp = VARDATA_ANY(string);
 	for (i = 0; i < count; i++)
 	{
-		memcpy(cp, VARDATA(string), slen);
+		memcpy(cp, sp, slen);
 		cp += slen;
 	}
 
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 85c8ec015d7f..6c517c00cd9c 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -218,38 +218,6 @@ check_locale(int category, const char *value)
 	return ret;
 }
 
-/*
- * check if the chosen encoding matches the encoding required by the locale
- *
- */
-bool check_locale_encoding(const char *locale, int user_enc)
-{
-	int			locale_enc;
-
-	/* get the encoding for the specified locale, or SQL_ASCII if locale is C/POSIX*/
-	locale_enc = pg_get_encoding_from_locale(locale);
-
-	/* We allow selection of SQL_ASCII encoding or C/POSIX locale */
-	if (!(locale_enc == user_enc ||
-		  locale_enc == PG_SQL_ASCII ||
-		  user_enc == PG_SQL_ASCII
-#ifdef WIN32
-
-	/*
-	 * On win32, if the encoding chosen is UTF8, all locales are OK (assuming
-	 * the actual locale name passed the checks above). This is because UTF8
-	 * is a pseudo-codepage, that we convert to UTF16 before doing any
-	 * operations on, and UTF16 supports all locales.
-	 */
-		  || user_enc == PG_UTF8
-#endif
-		  ))
-	{
-		return false;
-	}
-	return true;
-}
-
 /* GUC assign hooks */
 
 /*
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index d43bacc38cbb..d276edc117e3 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.38 2007/02/07 23:11:29 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.48 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,6 +33,7 @@ extern Datum pg_stat_get_tuples_fetched(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_tuples_inserted(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_tuples_updated(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_tuples_deleted(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_tuples_hot_updated(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_live_tuples(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_dead_tuples(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_blocks_fetched(PG_FUNCTION_ARGS);
@@ -63,6 +64,19 @@ extern Datum pg_stat_get_db_xact_commit(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_db_xact_rollback(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_db_blocks_fetched(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_db_blocks_hit(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_db_tuples_returned(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_db_tuples_fetched(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_db_tuples_inserted(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_db_tuples_updated(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_db_tuples_deleted(PG_FUNCTION_ARGS);
+
+extern Datum pg_stat_get_bgwriter_timed_checkpoints(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_bgwriter_requested_checkpoints(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_bgwriter_buf_written_checkpoints(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_bgwriter_buf_written_clean(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_bgwriter_maxwritten_clean(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_buf_written_backend(PG_FUNCTION_ARGS);
+extern Datum pg_stat_get_buf_alloc(PG_FUNCTION_ARGS);
 
 extern Datum pg_stat_get_queue_num_exec(PG_FUNCTION_ARGS);
 extern Datum pg_stat_get_queue_num_wait(PG_FUNCTION_ARGS);
@@ -187,34 +201,50 @@ pg_stat_get_tuples_deleted(PG_FUNCTION_ARGS)
 }
 
 
+Datum
+pg_stat_get_tuples_hot_updated(PG_FUNCTION_ARGS)
+{
+	Oid			relid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatTabEntry *tabentry;
+
+	if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL)
+		result = 0;
+	else
+		result = (int64) (tabentry->tuples_hot_updated);
+
+	PG_RETURN_INT64(result);
+}
+
+
 Datum
 pg_stat_get_live_tuples(PG_FUNCTION_ARGS)
-{ 
-	Oid		relid = PG_GETARG_OID(0);
-	int64	result;
-	PgStat_StatTabEntry	*tabentry;
- 
+{
+	Oid			relid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatTabEntry *tabentry;
+
 	if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL)
 		result = 0;
 	else
 		result = (int64) (tabentry->n_live_tuples);
-        
+
 	PG_RETURN_INT64(result);
 }
 
-        
+
 Datum
 pg_stat_get_dead_tuples(PG_FUNCTION_ARGS)
 {
-	Oid		relid = PG_GETARG_OID(0);
-	int64	result;
-	PgStat_StatTabEntry	*tabentry;
+	Oid			relid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatTabEntry *tabentry;
 
 	if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL)
 		result = 0;
 	else
 		result = (int64) (tabentry->n_dead_tuples);
-        
+
 	PG_RETURN_INT64(result);
 }
 
@@ -986,6 +1016,128 @@ pg_stat_get_db_blocks_hit(PG_FUNCTION_ARGS)
 }
 
 
+Datum
+pg_stat_get_db_tuples_returned(PG_FUNCTION_ARGS)
+{
+	Oid			dbid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatDBEntry *dbentry;
+
+	if ((dbentry = pgstat_fetch_stat_dbentry(dbid)) == NULL)
+		result = 0;
+	else
+		result = (int64) (dbentry->n_tuples_returned);
+
+	PG_RETURN_INT64(result);
+}
+
+
+Datum
+pg_stat_get_db_tuples_fetched(PG_FUNCTION_ARGS)
+{
+	Oid			dbid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatDBEntry *dbentry;
+
+	if ((dbentry = pgstat_fetch_stat_dbentry(dbid)) == NULL)
+		result = 0;
+	else
+		result = (int64) (dbentry->n_tuples_fetched);
+
+	PG_RETURN_INT64(result);
+}
+
+
+Datum
+pg_stat_get_db_tuples_inserted(PG_FUNCTION_ARGS)
+{
+	Oid			dbid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatDBEntry *dbentry;
+
+	if ((dbentry = pgstat_fetch_stat_dbentry(dbid)) == NULL)
+		result = 0;
+	else
+		result = (int64) (dbentry->n_tuples_inserted);
+
+	PG_RETURN_INT64(result);
+}
+
+
+Datum
+pg_stat_get_db_tuples_updated(PG_FUNCTION_ARGS)
+{
+	Oid			dbid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatDBEntry *dbentry;
+
+	if ((dbentry = pgstat_fetch_stat_dbentry(dbid)) == NULL)
+		result = 0;
+	else
+		result = (int64) (dbentry->n_tuples_updated);
+
+	PG_RETURN_INT64(result);
+}
+
+
+Datum
+pg_stat_get_db_tuples_deleted(PG_FUNCTION_ARGS)
+{
+	Oid			dbid = PG_GETARG_OID(0);
+	int64		result;
+	PgStat_StatDBEntry *dbentry;
+
+	if ((dbentry = pgstat_fetch_stat_dbentry(dbid)) == NULL)
+		result = 0;
+	else
+		result = (int64) (dbentry->n_tuples_deleted);
+
+	PG_RETURN_INT64(result);
+}
+
+Datum
+pg_stat_get_bgwriter_timed_checkpoints(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(pgstat_fetch_global()->timed_checkpoints);
+}
+
+Datum
+pg_stat_get_bgwriter_requested_checkpoints(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(pgstat_fetch_global()->requested_checkpoints);
+}
+
+Datum
+pg_stat_get_bgwriter_buf_written_checkpoints(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(pgstat_fetch_global()->buf_written_checkpoints);
+}
+
+Datum
+pg_stat_get_bgwriter_buf_written_clean(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(pgstat_fetch_global()->buf_written_clean);
+}
+
+Datum
+pg_stat_get_bgwriter_maxwritten_clean(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(pgstat_fetch_global()->maxwritten_clean);
+}
+
+Datum
+pg_stat_get_buf_written_backend(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(pgstat_fetch_global()->buf_written_backend);
+}
+
+Datum
+pg_stat_get_buf_alloc(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(pgstat_fetch_global()->buf_alloc);
+}
+
+
 /* Discard the active statistics snapshot */
 Datum
 pg_stat_clear_snapshot(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/adt/pivot.c b/src/backend/utils/adt/pivot.c
index 7067bf1d751e..87a4c4f3ca03 100644
--- a/src/backend/utils/adt/pivot.c
+++ b/src/backend/utils/adt/pivot.c
@@ -140,7 +140,7 @@ bool array_next(array_iter *iter, Datum *value, bool *isna)
 		*value = PointerGetDatum(iter->ptr);
 		iter->ptr += VARSIZE(iter->ptr);
 	}
-	iter->ptr = (char*) att_align(iter->ptr, iter->typalign);
+	iter->ptr = (char*) att_align_nominal(iter->ptr, iter->typalign);
 	iter->index++;
 	return true;
 }
@@ -187,7 +187,7 @@ static int pivot_find(ArrayType *labels, text *attr)
 		if (asize == lsize && !memcmp(attr, labelsp, lsize))
 			return i;  /* Found */
 		labelsp  = labelsp + lsize;
-		labelsp  = (char*) att_align(labelsp, typalign); 
+		labelsp  = (char*) att_align_nominal(labelsp, typalign);
 	}
 	return -1;  /* Not found */
 }
diff --git a/src/backend/utils/adt/pseudotypes.c b/src/backend/utils/adt/pseudotypes.c
index 560a7195e657..4bdf136fe0f6 100644
--- a/src/backend/utils/adt/pseudotypes.c
+++ b/src/backend/utils/adt/pseudotypes.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/pseudotypes.c,v 1.18 2007/01/05 22:19:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/pseudotypes.c,v 1.21 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -163,6 +163,31 @@ anyarray_send(PG_FUNCTION_ARGS)
 }
 
 
+/*
+ * anyenum_in		- input routine for pseudo-type ANYENUM.
+ */
+Datum
+anyenum_in(PG_FUNCTION_ARGS)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot accept a value of type anyenum")));
+
+	PG_RETURN_VOID();			/* keep compiler quiet */
+}
+
+/*
+ * anyenum_out		- output routine for pseudo-type ANYENUM.
+ *
+ * We may as well allow this, since enum_out will in fact work.
+ */
+Datum
+anyenum_out(PG_FUNCTION_ARGS)
+{
+	return enum_out(fcinfo);
+}
+
+
 /*
  * void_in		- input routine for pseudo-type VOID.
  *
@@ -322,6 +347,32 @@ anyelement_out(PG_FUNCTION_ARGS)
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
 
+/*
+ * anynonarray_in		- input routine for pseudo-type ANYNONARRAY.
+ */
+Datum
+anynonarray_in(PG_FUNCTION_ARGS)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot accept a value of type anynonarray")));
+
+	PG_RETURN_VOID();			/* keep compiler quiet */
+}
+
+/*
+ * anynonarray_out		- output routine for pseudo-type ANYNONARRAY.
+ */
+Datum
+anynonarray_out(PG_FUNCTION_ARGS)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot display a value of type anynonarray")));
+
+	PG_RETURN_VOID();			/* keep compiler quiet */
+}
+
 /*
  * shell_in		- input routine for "shell" types (those not yet filled in).
  */
diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c
index ad5acf9c88c3..a6c2ed88ea84 100644
--- a/src/backend/utils/adt/quote.c
+++ b/src/backend/utils/adt/quote.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/quote.c,v 1.21 2007/01/05 22:19:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/quote.c,v 1.23 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 9545bc3aa62e..4eba270708e6 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.79 2008/03/19 02:40:37 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.78.2.1 2008/03/19 02:40:43 tgl Exp $
  *
  *		Alistair Crooks added the code for the regex caching
  *		agc - cached the regular expressions used - there's a good chance
@@ -35,12 +35,12 @@
 #include "utils/builtins.h"
 #include "utils/guc.h"
 
-#define PG_GETARG_TEXT_P_IF_EXISTS(_n) \
-	(PG_NARGS() > (_n) ? PG_GETARG_TEXT_P(_n) : NULL)
+#define PG_GETARG_TEXT_PP_IF_EXISTS(_n) \
+	(PG_NARGS() > (_n) ? PG_GETARG_TEXT_PP(_n) : NULL)
 
 
 /* GUC-settable flavor parameter */
-int	regex_flavor = REG_ADVANCED;
+static int	regex_flavor = REG_ADVANCED;
 
 
 /* all the options of interest for regex functions */
@@ -186,9 +186,8 @@ RE_compile_and_cache(text *text_re, int cflags)
 
 	if (regcomp_result != REG_OKAY)
 	{
-		/* re didn't compile */
+		/* re didn't compile (no need for pg_regfree, if so) */
 		pg_regerror(regcomp_result, &re_temp.cre_re, errMsg, sizeof(errMsg));
-		/* XXX should we pg_regfree here? */
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),
 				 errmsg("invalid regular expression: %s", errMsg)));
@@ -334,32 +333,6 @@ RE_compile_and_execute(text *text_re, char *dat, int dat_len,
 	return RE_execute(re, dat, dat_len, nmatch, pmatch);
 }
 
-/*
- * assign_regex_flavor - GUC hook to validate and set REGEX_FLAVOR
- */
-const char *
-assign_regex_flavor(const char *value,
-					bool doit, GucSource source)
-{
-	if (pg_strcasecmp(value, "advanced") == 0)
-	{
-		if (doit)
-			regex_flavor = REG_ADVANCED;
-	}
-	else if (pg_strcasecmp(value, "extended") == 0)
-	{
-		if (doit)
-			regex_flavor = REG_EXTENDED;
-	}
-	else if (pg_strcasecmp(value, "basic") == 0)
-	{
-		if (doit)
-			regex_flavor = REG_BASIC;
-	}
-	else
-		return NULL;			/* fail */
-	return value;			   /* OK */
-}
 
 /*
  * parse_re_flags - parse the options argument of regexp_matches and friends
@@ -440,6 +413,33 @@ parse_re_flags(pg_re_flags *flags, text *opts)
 }
 
 
+/*
+ * assign_regex_flavor - GUC hook to validate and set REGEX_FLAVOR
+ */
+const char *
+assign_regex_flavor(const char *value, bool doit, GucSource source)
+{
+	if (pg_strcasecmp(value, "advanced") == 0)
+	{
+		if (doit)
+			regex_flavor = REG_ADVANCED;
+	}
+	else if (pg_strcasecmp(value, "extended") == 0)
+	{
+		if (doit)
+			regex_flavor = REG_EXTENDED;
+	}
+	else if (pg_strcasecmp(value, "basic") == 0)
+	{
+		if (doit)
+			regex_flavor = REG_BASIC;
+	}
+	else
+		return NULL;			/* fail */
+	return value;			   /* OK */
+}
+
+
 /*
  * report whether regex_flavor is currently BASIC
  */
@@ -458,7 +458,7 @@ Datum
 nameregexeq(PG_FUNCTION_ARGS)
 {
 	Name		n = PG_GETARG_NAME(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(RE_compile_and_execute(p,
 										  NameStr(*n),
@@ -471,7 +471,7 @@ Datum
 nameregexne(PG_FUNCTION_ARGS)
 {
 	Name		n = PG_GETARG_NAME(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(!RE_compile_and_execute(p,
 										   NameStr(*n),
@@ -483,8 +483,8 @@ nameregexne(PG_FUNCTION_ARGS)
 Datum
 textregexeq(PG_FUNCTION_ARGS)
 {
-	text	   *s = PG_GETARG_TEXT_P(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *s = PG_GETARG_TEXT_PP(0);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(RE_compile_and_execute(p,
 										  VARDATA_ANY(s),
@@ -496,8 +496,8 @@ textregexeq(PG_FUNCTION_ARGS)
 Datum
 textregexne(PG_FUNCTION_ARGS)
 {
-	text	   *s = PG_GETARG_TEXT_P(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *s = PG_GETARG_TEXT_PP(0);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(!RE_compile_and_execute(p,
 										   VARDATA_ANY(s),
@@ -517,7 +517,7 @@ Datum
 nameicregexeq(PG_FUNCTION_ARGS)
 {
 	Name		n = PG_GETARG_NAME(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(RE_compile_and_execute(p,
 										  NameStr(*n),
@@ -530,7 +530,7 @@ Datum
 nameicregexne(PG_FUNCTION_ARGS)
 {
 	Name		n = PG_GETARG_NAME(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(!RE_compile_and_execute(p,
 										   NameStr(*n),
@@ -542,8 +542,8 @@ nameicregexne(PG_FUNCTION_ARGS)
 Datum
 texticregexeq(PG_FUNCTION_ARGS)
 {
-	text	   *s = PG_GETARG_TEXT_P(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *s = PG_GETARG_TEXT_PP(0);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(RE_compile_and_execute(p,
 										  VARDATA_ANY(s),
@@ -555,8 +555,8 @@ texticregexeq(PG_FUNCTION_ARGS)
 Datum
 texticregexne(PG_FUNCTION_ARGS)
 {
-	text	   *s = PG_GETARG_TEXT_P(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *s = PG_GETARG_TEXT_PP(0);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 
 	PG_RETURN_BOOL(!RE_compile_and_execute(p,
 										   VARDATA_ANY(s),
@@ -573,8 +573,8 @@ texticregexne(PG_FUNCTION_ARGS)
 Datum
 textregexsubstr(PG_FUNCTION_ARGS)
 {
-	text	   *s = PG_GETARG_TEXT_P(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
+	text	   *s = PG_GETARG_TEXT_PP(0);
+	text	   *p = PG_GETARG_TEXT_PP(1);
 	regex_t    *re;
 	regmatch_t	pmatch[2];
 	int			so,
@@ -632,9 +632,9 @@ textregexsubstr(PG_FUNCTION_ARGS)
 Datum
 textregexreplace_noopt(PG_FUNCTION_ARGS)
 {
-	text	   *s = PG_GETARG_TEXT_P(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
-	text	   *r = PG_GETARG_TEXT_P(2);
+	text	   *s = PG_GETARG_TEXT_PP(0);
+	text	   *p = PG_GETARG_TEXT_PP(1);
+	text	   *r = PG_GETARG_TEXT_PP(2);
 	regex_t    *re;
 
 	re = RE_compile_and_cache(p, regex_flavor);
@@ -649,10 +649,10 @@ textregexreplace_noopt(PG_FUNCTION_ARGS)
 Datum
 textregexreplace(PG_FUNCTION_ARGS)
 {
-	text	   *s = PG_GETARG_TEXT_P(0);
-	text	   *p = PG_GETARG_TEXT_P(1);
-	text	   *r = PG_GETARG_TEXT_P(2);
-	text	   *opt = PG_GETARG_TEXT_P(3);
+	text	   *s = PG_GETARG_TEXT_PP(0);
+	text	   *p = PG_GETARG_TEXT_PP(1);
+	text	   *r = PG_GETARG_TEXT_PP(2);
+	text	   *opt = PG_GETARG_TEXT_PP(3);
 	regex_t    *re;
 	pg_re_flags flags;
 
@@ -685,7 +685,7 @@ similar_escape(PG_FUNCTION_ARGS)
 	/* This function is not strict, so must test explicitly */
 	if (PG_ARGISNULL(0))
 		PG_RETURN_NULL();
-	pat_text = PG_GETARG_TEXT_P(0);
+	pat_text = PG_GETARG_TEXT_PP(0);
 	p = VARDATA_ANY(pat_text);
 	plen = VARSIZE_ANY_EXHDR(pat_text);
 	if (PG_ARGISNULL(1))
@@ -696,7 +696,7 @@ similar_escape(PG_FUNCTION_ARGS)
 	}
 	else
 	{
-		esc_text = PG_GETARG_TEXT_P(1);
+		esc_text = PG_GETARG_TEXT_PP(1);
 		e = VARDATA_ANY(esc_text);
 		elen = VARSIZE_ANY_EXHDR(esc_text);
 		if (elen == 0)
@@ -797,8 +797,8 @@ regexp_matches(PG_FUNCTION_ARGS)
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		text	   *pattern = PG_GETARG_TEXT_P(1);
-		text	   *flags = PG_GETARG_TEXT_P_IF_EXISTS(2);
+		text	   *pattern = PG_GETARG_TEXT_PP(1);
+		text	   *flags = PG_GETARG_TEXT_PP_IF_EXISTS(2);
 		MemoryContext oldcontext;
 
 		funcctx = SRF_FIRSTCALL_INIT();
@@ -1055,8 +1055,8 @@ regexp_split_to_table(PG_FUNCTION_ARGS)
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		text	   *pattern = PG_GETARG_TEXT_P(1);
-		text	   *flags = PG_GETARG_TEXT_P_IF_EXISTS(2);
+		text	   *pattern = PG_GETARG_TEXT_PP(1);
+		text	   *flags = PG_GETARG_TEXT_PP_IF_EXISTS(2);
 		MemoryContext oldcontext;
 
 		funcctx = SRF_FIRSTCALL_INIT();
@@ -1105,9 +1105,9 @@ regexp_split_to_array(PG_FUNCTION_ARGS)
 	ArrayBuildState *astate = NULL;
 	regexp_matches_ctx *splitctx;
 
-	splitctx = setup_regexp_matches(PG_GETARG_TEXT_P(0),
-									PG_GETARG_TEXT_P(1),
-									PG_GETARG_TEXT_P_IF_EXISTS(2),
+	splitctx = setup_regexp_matches(PG_GETARG_TEXT_PP(0),
+									PG_GETARG_TEXT_PP(1),
+									PG_GETARG_TEXT_PP_IF_EXISTS(2),
 									true, false, true);
 
 	while (splitctx->next_match <= splitctx->nmatches)
@@ -1173,3 +1173,68 @@ build_regexp_split_result(regexp_matches_ctx *splitctx)
 								   Int32GetDatum(startpos + 1));
 	}
 }
+
+/*
+ * regexp_fixed_prefix - extract fixed prefix, if any, for a regexp
+ *
+ * The result is NULL if there is no fixed prefix, else a palloc'd string.
+ * If it is an exact match, not just a prefix, *exact is returned as TRUE.
+ */
+char *
+regexp_fixed_prefix(text *text_re, bool case_insensitive,
+					bool *exact)
+{
+	char	   *result;
+	regex_t    *re;
+	int			cflags;
+	int			re_result;
+	pg_wchar   *str;
+	size_t		slen;
+	size_t		maxlen;
+	char		errMsg[100];
+
+	*exact = false;				/* default result */
+
+	/* Compile RE */
+	cflags = REG_ADVANCED;
+	if (case_insensitive)
+		cflags |= REG_ICASE;
+
+	re = RE_compile_and_cache(text_re, cflags);
+
+	/* Examine it to see if there's a fixed prefix */
+	re_result = pg_regprefix(re, &str, &slen);
+
+	switch (re_result)
+	{
+		case REG_NOMATCH:
+			return NULL;
+
+		case REG_PREFIX:
+			/* continue with wchar conversion */
+			break;
+
+		case REG_EXACT:
+			*exact = true;
+			/* continue with wchar conversion */
+			break;
+
+		default:
+			/* re failed??? */
+			pg_regerror(re_result, re, errMsg, sizeof(errMsg));
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),
+					 errmsg("regular expression failed: %s", errMsg)));
+			break;
+	}
+
+	/* Convert pg_wchar result back to database encoding */
+	maxlen = pg_database_encoding_max_length() * slen + 1;
+	result = (char *) palloc(maxlen);
+	slen = pg_wchar2mb_with_len(str, result, slen);
+	Assert(slen < maxlen);
+
+	free(str);
+
+	return result;
+}
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 39a58401a62e..8907303155a1 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.100 2007/01/05 22:19:41 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.105 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,6 +28,8 @@
 #include "catalog/namespace.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_dict.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "parser/parse_type.h"
@@ -36,8 +38,7 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
-static void parseNameAndArgTypes(const char *string, const char *caller,
-					 bool allowNone,
+static void parseNameAndArgTypes(const char *string, bool allowNone,
 					 List **names, int *nargs, Oid *argtypes);
 
 
@@ -114,7 +115,7 @@ regprocin(PG_FUNCTION_ARGS)
 	 * Normal case: parse the name into components and see if it matches any
 	 * pg_proc entries in the current search path.
 	 */
-	names = stringToQualifiedNameList(pro_name_or_oid, "regprocin");
+	names = stringToQualifiedNameList(pro_name_or_oid);
 	clist = FuncnameGetCandidates(names, -1, false, false);
 
 	if (clist == NULL)
@@ -264,8 +265,7 @@ regprocedurein(PG_FUNCTION_ARGS)
 	 * datatype cannot be used for any system column that needs to receive
 	 * data during bootstrap.
 	 */
-	parseNameAndArgTypes(pro_name_or_oid, "regprocedurein", false,
-						 &names, &nargs, argtypes);
+	parseNameAndArgTypes(pro_name_or_oid, false, &names, &nargs, argtypes);
 
 	clist = FuncnameGetCandidates(names, nargs, false, false);
 
@@ -462,7 +462,7 @@ regoperin(PG_FUNCTION_ARGS)
 	 * Normal case: parse the name into components and see if it matches any
 	 * pg_operator entries in the current search path.
 	 */
-	names = stringToQualifiedNameList(opr_name_or_oid, "regoperin");
+	names = stringToQualifiedNameList(opr_name_or_oid);
 	clist = OpernameGetCandidates(names, '\0');
 
 	if (clist == NULL)
@@ -618,8 +618,7 @@ regoperatorin(PG_FUNCTION_ARGS)
 	 * datatype cannot be used for any system column that needs to receive
 	 * data during bootstrap.
 	 */
-	parseNameAndArgTypes(opr_name_or_oid, "regoperatorin", true,
-						 &names, &nargs, argtypes);
+	parseNameAndArgTypes(opr_name_or_oid, true, &names, &nargs, argtypes);
 	if (nargs == 1)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_PARAMETER),
@@ -818,7 +817,7 @@ regclassin(PG_FUNCTION_ARGS)
 	 * Normal case: parse the name into components and see if it matches any
 	 * pg_class entries in the current search path.
 	 */
-	names = stringToQualifiedNameList(class_name_or_oid, "regclassin");
+	names = stringToQualifiedNameList(class_name_or_oid);
 
 	result = RangeVarGetRelid(makeRangeVarFromNameList(names), false);
 
@@ -1054,8 +1053,234 @@ regtypesend(PG_FUNCTION_ARGS)
 	return oidsend(fcinfo);
 }
 
+/*
+ * regconfigin		- converts "tsconfigname" to tsconfig OID
+ *
+ * We also accept a numeric OID, for symmetry with the output routine.
+ *
+ * '-' signifies unknown (OID 0).  In all other cases, the input must
+ * match an existing pg_ts_config entry.
+ *
+ * This function is not needed in bootstrap mode, so we don't worry about
+ * making it work then.
+ */
+Datum
+regconfigin(PG_FUNCTION_ARGS)
+{
+	char	   *cfg_name_or_oid = PG_GETARG_CSTRING(0);
+	Oid			result;
+	List	   *names;
+
+	/* '-' ? */
+	if (strcmp(cfg_name_or_oid, "-") == 0)
+		PG_RETURN_OID(InvalidOid);
+
+	/* Numeric OID? */
+	if (cfg_name_or_oid[0] >= '0' &&
+		cfg_name_or_oid[0] <= '9' &&
+		strspn(cfg_name_or_oid, "0123456789") == strlen(cfg_name_or_oid))
+	{
+		result = DatumGetObjectId(DirectFunctionCall1(oidin,
+										  CStringGetDatum(cfg_name_or_oid)));
+		PG_RETURN_OID(result);
+	}
+
+	/*
+	 * Normal case: parse the name into components and see if it matches any
+	 * pg_ts_config entries in the current search path.
+	 */
+	names = stringToQualifiedNameList(cfg_name_or_oid);
+
+	result = TSConfigGetCfgid(names, false);
+
+	PG_RETURN_OID(result);
+}
+
+/*
+ * regconfigout		- converts tsconfig OID to "tsconfigname"
+ */
+Datum
+regconfigout(PG_FUNCTION_ARGS)
+{
+	Oid			cfgid = PG_GETARG_OID(0);
+	char	   *result;
+	HeapTuple	cfgtup;
+
+	if (cfgid == InvalidOid)
+	{
+		result = pstrdup("-");
+		PG_RETURN_CSTRING(result);
+	}
+
+	cfgtup = SearchSysCache(TSCONFIGOID,
+							ObjectIdGetDatum(cfgid),
+							0, 0, 0);
+
+	if (HeapTupleIsValid(cfgtup))
+	{
+		Form_pg_ts_config cfgform = (Form_pg_ts_config) GETSTRUCT(cfgtup);
+		char	   *cfgname = NameStr(cfgform->cfgname);
+		char	   *nspname;
+
+		/*
+		 * Would this config be found by regconfigin? If not, qualify it.
+		 */
+		if (TSConfigIsVisible(cfgid))
+			nspname = NULL;
+		else
+			nspname = get_namespace_name(cfgform->cfgnamespace);
+
+		result = quote_qualified_identifier(nspname, cfgname);
+
+		ReleaseSysCache(cfgtup);
+	}
+	else
+	{
+		/* If OID doesn't match any pg_ts_config row, return it numerically */
+		result = (char *) palloc(NAMEDATALEN);
+		snprintf(result, NAMEDATALEN, "%u", cfgid);
+	}
+
+	PG_RETURN_CSTRING(result);
+}
+
+/*
+ *		regconfigrecv			- converts external binary format to regconfig
+ */
+Datum
+regconfigrecv(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidrecv, so share code */
+	return oidrecv(fcinfo);
+}
+
+/*
+ *		regconfigsend			- converts regconfig to binary format
+ */
+Datum
+regconfigsend(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidsend, so share code */
+	return oidsend(fcinfo);
+}
+
+
+/*
+ * regdictionaryin		- converts "tsdictionaryname" to tsdictionary OID
+ *
+ * We also accept a numeric OID, for symmetry with the output routine.
+ *
+ * '-' signifies unknown (OID 0).  In all other cases, the input must
+ * match an existing pg_ts_dict entry.
+ *
+ * This function is not needed in bootstrap mode, so we don't worry about
+ * making it work then.
+ */
+Datum
+regdictionaryin(PG_FUNCTION_ARGS)
+{
+	char	   *dict_name_or_oid = PG_GETARG_CSTRING(0);
+	Oid			result;
+	List	   *names;
+
+	/* '-' ? */
+	if (strcmp(dict_name_or_oid, "-") == 0)
+		PG_RETURN_OID(InvalidOid);
+
+	/* Numeric OID? */
+	if (dict_name_or_oid[0] >= '0' &&
+		dict_name_or_oid[0] <= '9' &&
+		strspn(dict_name_or_oid, "0123456789") == strlen(dict_name_or_oid))
+	{
+		result = DatumGetObjectId(DirectFunctionCall1(oidin,
+										 CStringGetDatum(dict_name_or_oid)));
+		PG_RETURN_OID(result);
+	}
+
+	/*
+	 * Normal case: parse the name into components and see if it matches any
+	 * pg_ts_dict entries in the current search path.
+	 */
+	names = stringToQualifiedNameList(dict_name_or_oid);
+
+	result = TSDictionaryGetDictid(names, false);
+
+	PG_RETURN_OID(result);
+}
+
+/*
+ * regdictionaryout		- converts tsdictionary OID to "tsdictionaryname"
+ */
+Datum
+regdictionaryout(PG_FUNCTION_ARGS)
+{
+	Oid			dictid = PG_GETARG_OID(0);
+	char	   *result;
+	HeapTuple	dicttup;
+
+	if (dictid == InvalidOid)
+	{
+		result = pstrdup("-");
+		PG_RETURN_CSTRING(result);
+	}
+
+	dicttup = SearchSysCache(TSDICTOID,
+							 ObjectIdGetDatum(dictid),
+							 0, 0, 0);
+
+	if (HeapTupleIsValid(dicttup))
+	{
+		Form_pg_ts_dict dictform = (Form_pg_ts_dict) GETSTRUCT(dicttup);
+		char	   *dictname = NameStr(dictform->dictname);
+		char	   *nspname;
+
+		/*
+		 * Would this dictionary be found by regdictionaryin? If not, qualify
+		 * it.
+		 */
+		if (TSDictionaryIsVisible(dictid))
+			nspname = NULL;
+		else
+			nspname = get_namespace_name(dictform->dictnamespace);
+
+		result = quote_qualified_identifier(nspname, dictname);
+
+		ReleaseSysCache(dicttup);
+	}
+	else
+	{
+		/* If OID doesn't match any pg_ts_dict row, return it numerically */
+		result = (char *) palloc(NAMEDATALEN);
+		snprintf(result, NAMEDATALEN, "%u", dictid);
+	}
+
+	PG_RETURN_CSTRING(result);
+}
+
+/*
+ *		regdictionaryrecv	- converts external binary format to regdictionary
+ */
+Datum
+regdictionaryrecv(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidrecv, so share code */
+	return oidrecv(fcinfo);
+}
+
+/*
+ *		regdictionarysend	- converts regdictionary to binary format
+ */
+Datum
+regdictionarysend(PG_FUNCTION_ARGS)
+{
+	/* Exactly the same as oidsend, so share code */
+	return oidsend(fcinfo);
+}
+
+
 /*
  * text_regclass: convert text to regclass
+ *
  * This could be replaced by CoerceViaIO, except that we need to treat
  * text-to-regclass as an implicit cast to support legacy forms of nextval()
  * and related functions.
@@ -1078,7 +1303,7 @@ text_regclass(PG_FUNCTION_ARGS)
  * Given a C string, parse it into a qualified-name list.
  */
 List *
-stringToQualifiedNameList(const char *string, const char *caller)
+stringToQualifiedNameList(const char *string)
 {
 	char	   *rawname;
 	List	   *result = NIL;
@@ -1126,9 +1351,8 @@ stringToQualifiedNameList(const char *string, const char *caller)
  * for unary operators).
  */
 static void
-parseNameAndArgTypes(const char *string, const char *caller,
-					 bool allowNone,
-					 List **names, int *nargs, Oid *argtypes)
+parseNameAndArgTypes(const char *string, bool allowNone, List **names,
+					 int *nargs, Oid *argtypes)
 {
 	char	   *rawname;
 	char	   *ptr;
@@ -1159,7 +1383,7 @@ parseNameAndArgTypes(const char *string, const char *caller,
 
 	/* Separate the name and parse it into a list */
 	*ptr++ = '\0';
-	*names = stringToQualifiedNameList(rawname, caller);
+	*names = stringToQualifiedNameList(rawname);
 
 	/* Check for the trailing right parenthesis and remove it */
 	ptr2 = ptr + strlen(ptr);
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index 6ef6ca31f95b..3a5e0822bb36 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -8,14 +8,12 @@
  *	across query and transaction boundaries, in fact they live as long as
  *	the backend does.  This works because the hashtable structures
  *	themselves are allocated by dynahash.c in its permanent DynaHashCxt,
- *	and the parse/plan node trees they point to are copied into
- *	TopMemoryContext using SPI_saveplan().	This is pretty ugly, since there
- *	is no way to free a no-longer-needed plan tree, but then again we don't
- *	yet have any bookkeeping that would allow us to detect that a plan isn't
- *	needed anymore.  Improve it someday.
+ *	and the SPI plans they point to are saved using SPI_saveplan().
+ *	There is not currently any provision for throwing away a no-longer-needed
+ *	plan --- consider improving this someday.
  *
  *
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  *
  * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.114 2009/08/01 19:59:41 tgl Exp $
  *
@@ -35,7 +33,7 @@
 #include "catalog/pg_constraint.h"
 #include "catalog/pg_operator.h"
 #include "commands/trigger.h"
-#include "executor/spi_priv.h"
+#include "executor/spi.h"
 #include "parser/parse_coerce.h"
 #include "parser/parse_relation.h"
 #include "miscadmin.h"
@@ -69,13 +67,12 @@
 #define RI_PLAN_RESTRICT_UPD_CHECKREF	8
 #define RI_PLAN_SETNULL_DEL_DOUPDATE	9
 #define RI_PLAN_SETNULL_UPD_DOUPDATE	10
-#define RI_PLAN_KEYEQUAL_UPD			11
 
 #define MAX_QUOTED_NAME_LEN  (NAMEDATALEN*2+3)
 #define MAX_QUOTED_REL_NAME_LEN  (MAX_QUOTED_NAME_LEN*2)
 
-#define RIAttName(rel, attnum)  NameStr(*attnumAttName(rel, attnum))
-#define RIAttType(rel, attnum)  SPI_gettypeid(RelationGetDescr(rel), attnum)
+#define RIAttName(rel, attnum)	NameStr(*attnumAttName(rel, attnum))
+#define RIAttType(rel, attnum)	attnumTypeId(rel, attnum)
 
 #define RI_TRIGTYPE_INSERT 1
 #define RI_TRIGTYPE_UPDATE 2
@@ -102,11 +99,14 @@ typedef struct RI_ConstraintInfo
 	char		confdeltype;	/* foreign key's ON DELETE action */
 	char		confmatchtype;	/* foreign key's match type */
 	int			nkeys;			/* number of key columns */
-	int16		pk_attnums[RI_MAX_NUMKEYS];	/* attnums of referenced cols */
-	int16		fk_attnums[RI_MAX_NUMKEYS];	/* attnums of referencing cols */
-	Oid			pf_eq_oprs[RI_MAX_NUMKEYS];	/* equality operators (PK = FK) */
-	Oid			pp_eq_oprs[RI_MAX_NUMKEYS];	/* equality operators (PK = PK) */
-	Oid			ff_eq_oprs[RI_MAX_NUMKEYS];	/* equality operators (FK = FK) */
+	int16		pk_attnums[RI_MAX_NUMKEYS];		/* attnums of referenced cols */
+	int16		fk_attnums[RI_MAX_NUMKEYS];		/* attnums of referencing cols */
+	Oid			pf_eq_oprs[RI_MAX_NUMKEYS];		/* equality operators (PK =
+												 * FK) */
+	Oid			pp_eq_oprs[RI_MAX_NUMKEYS];		/* equality operators (PK =
+												 * PK) */
+	Oid			ff_eq_oprs[RI_MAX_NUMKEYS];		/* equality operators (FK =
+												 * FK) */
 } RI_ConstraintInfo;
 
 
@@ -135,7 +135,7 @@ typedef struct RI_QueryKey
 typedef struct RI_QueryHashEntry
 {
 	RI_QueryKey key;
-	void	   *plan;
+	SPIPlanPtr	plan;
 } RI_QueryHashEntry;
 
 
@@ -159,8 +159,8 @@ typedef struct RI_CompareKey
 typedef struct RI_CompareHashEntry
 {
 	RI_CompareKey key;
-	bool		valid;				/* successfully initialized? */
-	FmgrInfo	eq_opr_finfo;		/* call info for equality fn */
+	bool		valid;			/* successfully initialized? */
+	FmgrInfo	eq_opr_finfo;	/* call info for equality fn */
 	FmgrInfo	cast_func_finfo;	/* in case we must coerce input */
 } RI_CompareHashEntry;
 
@@ -180,44 +180,45 @@ static HTAB *ri_compare_cache = NULL;
 static void quoteOneName(char *buffer, const char *name);
 static void quoteRelationName(char *buffer, Relation rel);
 static void ri_GenerateQual(StringInfo buf,
-							const char *sep,
-							const char *leftop, Oid leftoptype,
-							Oid opoid,
-							const char *rightop, Oid rightoptype);
+				const char *sep,
+				const char *leftop, Oid leftoptype,
+				Oid opoid,
+				const char *rightop, Oid rightoptype);
+static void ri_add_cast_to(StringInfo buf, Oid typid);
 static int ri_NullCheck(Relation rel, HeapTuple tup,
 			 RI_QueryKey *key, int pairidx);
 static void ri_BuildQueryKeyFull(RI_QueryKey *key,
-								 const RI_ConstraintInfo *riinfo,
-								 int32 constr_queryno);
+					 const RI_ConstraintInfo *riinfo,
+					 int32 constr_queryno);
 static void ri_BuildQueryKeyPkCheck(RI_QueryKey *key,
-									const RI_ConstraintInfo *riinfo,
-									int32 constr_queryno);
+						const RI_ConstraintInfo *riinfo,
+						int32 constr_queryno);
 static bool ri_KeysEqual(Relation rel, HeapTuple oldtup, HeapTuple newtup,
-						 const RI_ConstraintInfo *riinfo, bool rel_is_pk);
+			 const RI_ConstraintInfo *riinfo, bool rel_is_pk);
 static bool ri_AllKeysUnequal(Relation rel, HeapTuple oldtup, HeapTuple newtup,
 				  const RI_ConstraintInfo *riinfo, bool rel_is_pk);
 static bool ri_OneKeyEqual(Relation rel, int column,
 			   HeapTuple oldtup, HeapTuple newtup,
 			   const RI_ConstraintInfo *riinfo, bool rel_is_pk);
 static bool ri_AttributesEqual(Oid eq_opr, Oid typeid,
-							   Datum oldvalue, Datum newvalue);
+				   Datum oldvalue, Datum newvalue);
 static bool ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel,
 				  HeapTuple old_row,
 				  const RI_ConstraintInfo *riinfo);
 
 static void ri_InitHashTables(void);
-static void *ri_FetchPreparedPlan(RI_QueryKey *key);
-static void ri_HashPreparedPlan(RI_QueryKey *key, void *plan);
+static SPIPlanPtr ri_FetchPreparedPlan(RI_QueryKey *key);
+static void ri_HashPreparedPlan(RI_QueryKey *key, SPIPlanPtr plan);
 static RI_CompareHashEntry *ri_HashCompareOp(Oid eq_opr, Oid typeid);
 
 static void ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname,
 				int tgkind);
 static void ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 					   Trigger *trigger, Relation trig_rel, bool rel_is_pk);
-static void *ri_PlanCheck(const char *querystr, int nargs, Oid *argtypes,
+static SPIPlanPtr ri_PlanCheck(const char *querystr, int nargs, Oid *argtypes,
 			 RI_QueryKey *qkey, Relation fk_rel, Relation pk_rel,
 			 bool cache_plan);
-static bool ri_PerformCheck(RI_QueryKey *qkey, void *qplan,
+static bool ri_PerformCheck(RI_QueryKey *qkey, SPIPlanPtr qplan,
 				Relation fk_rel, Relation pk_rel,
 				HeapTuple old_tuple, HeapTuple new_tuple,
 				bool detectNewRows,
@@ -248,7 +249,7 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 	HeapTuple	old_row;
 	Buffer		new_row_buf;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 
 	/*
@@ -260,7 +261,7 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 	 * Get arguments.
 	 */
 	ri_FetchConstraintInfo(&riinfo,
-						   trigdata->tg_trigger, trigdata->tg_relation, false);
+						 trigdata->tg_trigger, trigdata->tg_relation, false);
 
 	if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
 	{
@@ -279,19 +280,19 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 	 * We should not even consider checking the row if it is no longer valid,
 	 * since it was either deleted (so the deferred check should be skipped)
 	 * or updated (in which case only the latest version of the row should be
-	 * checked).  Test its liveness with HeapTupleSatisfiesItself.
+	 * checked).  Test its liveness according to SnapshotSelf.
 	 *
 	 * NOTE: The normal coding rule is that one must acquire the buffer
-	 * content lock to call HeapTupleSatisfiesFOO.	We can skip that here
-	 * because we know that AfterTriggerExecute just fetched the tuple
+	 * content lock to call HeapTupleSatisfiesVisibility.  We can skip that
+	 * here because we know that AfterTriggerExecute just fetched the tuple
 	 * successfully, so there cannot be a VACUUM compaction in progress on the
 	 * page (either heap_fetch would have waited for the VACUUM, or the
-	 * VACUUM's LockBufferForCleanup would be waiting for us to drop pin).
-	 * And since this is a row inserted by our open transaction, no one else
-	 * can be entitled to change its xmin/xmax.
+	 * VACUUM's LockBufferForCleanup would be waiting for us to drop pin). And
+	 * since this is a row inserted by our open transaction, no one else can
+	 * be entitled to change its xmin/xmax.
 	 */
 	Assert(new_row_buf != InvalidBuffer);
-	if (!HeapTupleSatisfiesItself( /* relation = ??? */ NULL, new_row->t_data, new_row_buf))
+	if (!HeapTupleSatisfiesVisibility( /* relation = ??? */ NULL, new_row, SnapshotSelf, new_row_buf))
 		return PointerGetDatum(NULL);
 
 	/*
@@ -464,8 +465,8 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 		querysep = "WHERE";
 		for (i = 0; i < riinfo.nkeys; i++)
 		{
-			Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-			Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+			Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+			Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 			quoteOneName(attname,
 						 RIAttName(pk_rel, riinfo.pk_attnums[i]));
@@ -542,7 +543,7 @@ ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel,
 				  HeapTuple old_row,
 				  const RI_ConstraintInfo *riinfo)
 {
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	RI_QueryKey qkey;
 	int			i;
 	bool		result;
@@ -626,7 +627,7 @@ ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel,
 		querysep = "WHERE";
 		for (i = 0; i < riinfo->nkeys; i++)
 		{
-			Oid		pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
+			Oid			pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
 
 			quoteOneName(attname,
 						 RIAttName(pk_rel, riinfo->pk_attnums[i]));
@@ -678,7 +679,7 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
 	Relation	pk_rel;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 
 	/*
@@ -782,8 +783,8 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
 				querysep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -855,7 +856,7 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
 	HeapTuple	new_row;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 
 	/*
@@ -970,8 +971,8 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
 				querysep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -1040,7 +1041,7 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
 	Relation	pk_rel;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 
 	/*
@@ -1132,8 +1133,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
 				querysep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -1203,7 +1204,7 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
 	HeapTuple	new_row;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 	int			j;
 
@@ -1315,8 +1316,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
 				qualsep = "WHERE";
 				for (i = 0, j = riinfo.nkeys; i < riinfo.nkeys; i++, j++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -1397,7 +1398,7 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
 	Relation	pk_rel;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 
 	/*
@@ -1491,8 +1492,8 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
 				querysep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -1569,7 +1570,7 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
 	HeapTuple	new_row;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 
 	/*
@@ -1674,8 +1675,8 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
 				querysep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -1744,7 +1745,7 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 	Relation	pk_rel;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 
 	/*
@@ -1841,8 +1842,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 				qualsep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -1916,7 +1917,7 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 	HeapTuple	new_row;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	int			i;
 	bool		use_cached_query;
 
@@ -2043,11 +2044,12 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 				qualsep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
+
 					/*
 					 * MATCH <unspecified> - only change columns corresponding
 					 * to changed columns in pk_rel's key
@@ -2130,7 +2132,7 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 	Relation	pk_rel;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 
 	/*
 	 * Check that this is a valid trigger call on the right time and event.
@@ -2228,8 +2230,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 				qualsep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -2313,7 +2315,7 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 	HeapTuple	new_row;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 
 	/*
 	 * Check that this is a valid trigger call on the right time and event.
@@ -2421,8 +2423,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 				qualsep = "WHERE";
 				for (i = 0; i < riinfo.nkeys; i++)
 				{
-					Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-					Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+					Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+					Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo.fk_attnums[i]));
@@ -2513,8 +2515,6 @@ RI_FKey_keyequal_upd_pk(Trigger *trigger, Relation pk_rel,
 						HeapTuple old_row, HeapTuple new_row)
 {
 	RI_ConstraintInfo riinfo;
-	Relation	fk_rel;
-	RI_QueryKey qkey;
 
 	/*
 	 * Get arguments.
@@ -2527,18 +2527,11 @@ RI_FKey_keyequal_upd_pk(Trigger *trigger, Relation pk_rel,
 	if (riinfo.nkeys == 0)
 		return true;
 
-	fk_rel = heap_open(riinfo.fk_relid, AccessShareLock);
-
 	switch (riinfo.confmatchtype)
 	{
 		case FKCONSTR_MATCH_UNSPECIFIED:
 		case FKCONSTR_MATCH_FULL:
-			ri_BuildQueryKeyFull(&qkey, &riinfo,
-								 RI_PLAN_KEYEQUAL_UPD);
-
-			heap_close(fk_rel, AccessShareLock);
-
-			/* Return if key's are equal */
+			/* Return true if keys are equal */
 			return ri_KeysEqual(pk_rel, old_row, new_row, &riinfo, true);
 
 			/* Handle MATCH PARTIAL set null delete. */
@@ -2567,8 +2560,6 @@ RI_FKey_keyequal_upd_fk(Trigger *trigger, Relation fk_rel,
 						HeapTuple old_row, HeapTuple new_row)
 {
 	RI_ConstraintInfo riinfo;
-	Relation	pk_rel;
-	RI_QueryKey qkey;
 
 	/*
 	 * Get arguments.
@@ -2581,17 +2572,11 @@ RI_FKey_keyequal_upd_fk(Trigger *trigger, Relation fk_rel,
 	if (riinfo.nkeys == 0)
 		return true;
 
-	pk_rel = heap_open(riinfo.pk_relid, AccessShareLock);
-
 	switch (riinfo.confmatchtype)
 	{
 		case FKCONSTR_MATCH_UNSPECIFIED:
 		case FKCONSTR_MATCH_FULL:
-			ri_BuildQueryKeyFull(&qkey, &riinfo,
-								 RI_PLAN_KEYEQUAL_UPD);
-			heap_close(pk_rel, AccessShareLock);
-
-			/* Return if key's are equal */
+			/* Return true if keys are equal */
 			return ri_KeysEqual(fk_rel, old_row, new_row, &riinfo, false);
 
 			/* Handle MATCH PARTIAL set null delete. */
@@ -2637,7 +2622,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 	int			old_work_mem;
 	char		workmembuf[32];
 	int			spi_result;
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 
 	/*
 	 * Check to make sure current user has enough permissions to do the test
@@ -2687,8 +2672,8 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 	sep = "(";
 	for (i = 0; i < riinfo.nkeys; i++)
 	{
-		Oid		pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
-		Oid		fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
+		Oid			pk_type = RIAttType(pk_rel, riinfo.pk_attnums[i]);
+		Oid			fk_type = RIAttType(fk_rel, riinfo.fk_attnums[i]);
 
 		quoteOneName(pkattname + 3,
 					 RIAttName(pk_rel, riinfo.pk_attnums[i]));
@@ -2751,7 +2736,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 	snprintf(workmembuf, sizeof(workmembuf), "%d", maintenance_work_mem);
 	(void) set_config_option("work_mem", workmembuf,
 							 PGC_USERSET, PGC_S_SESSION,
-							 true, true);
+							 GUC_ACTION_LOCAL, true);
 
 	if (SPI_connect() != SPI_OK_CONNECT)
 		elog(ERROR, "SPI_connect failed");
@@ -2834,13 +2819,12 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 
 	/*
 	 * Restore work_mem for the remainder of the current transaction. This is
-	 * another SET LOCAL, so it won't affect the session value, nor any
-	 * tentative value if there is one.
+	 * another SET LOCAL, so it won't affect the session value.
 	 */
 	snprintf(workmembuf, sizeof(workmembuf), "%d", old_work_mem);
 	(void) set_config_option("work_mem", workmembuf,
 							 PGC_USERSET, PGC_S_SESSION,
-							 true, true);
+							 GUC_ACTION_LOCAL, true);
 
 	return true;
 }
@@ -2892,8 +2876,10 @@ quoteRelationName(char *buffer, Relation rel)
  * The idea is to append " sep leftop op rightop" to buf.  The complexity
  * comes from needing to be sure that the parser will select the desired
  * operator.  We always name the operator using OPERATOR(schema.op) syntax
- * (readability isn't a big priority here).  We have to emit casts too,
- * if either input isn't already the input type of the operator.
+ * (readability isn't a big priority here), so as to avoid search-path
+ * uncertainties.  We have to emit casts too, if either input isn't already
+ * the input type of the operator; else we are at the mercy of the parser's
+ * heuristics for ambiguous-operator resolution.
  */
 static void
 ri_GenerateQual(StringInfo buf,
@@ -2920,16 +2906,48 @@ ri_GenerateQual(StringInfo buf,
 
 	appendStringInfo(buf, " %s %s", sep, leftop);
 	if (leftoptype != operform->oprleft)
-		appendStringInfo(buf, "::%s", format_type_be(operform->oprleft));
+		ri_add_cast_to(buf, operform->oprleft);
 	appendStringInfo(buf, " OPERATOR(%s.", quote_identifier(nspname));
 	appendStringInfoString(buf, oprname);
 	appendStringInfo(buf, ") %s", rightop);
 	if (rightoptype != operform->oprright)
-		appendStringInfo(buf, "::%s", format_type_be(operform->oprright));
+		ri_add_cast_to(buf, operform->oprright);
 
 	ReleaseSysCache(opertup);
 }
 
+/*
+ * Add a cast specification to buf.  We spell out the type name the hard way,
+ * intentionally not using format_type_be().  This is to avoid corner cases
+ * for CHARACTER, BIT, and perhaps other types, where specifying the type
+ * using SQL-standard syntax results in undesirable data truncation.  By
+ * doing it this way we can be certain that the cast will have default (-1)
+ * target typmod.
+ */
+static void
+ri_add_cast_to(StringInfo buf, Oid typid)
+{
+	HeapTuple	typetup;
+	Form_pg_type typform;
+	char	   *typname;
+	char	   *nspname;
+
+	typetup = SearchSysCache(TYPEOID,
+							 ObjectIdGetDatum(typid),
+							 0, 0, 0);
+	if (!HeapTupleIsValid(typetup))
+		elog(ERROR, "cache lookup failed for type %u", typid);
+	typform = (Form_pg_type) GETSTRUCT(typetup);
+
+	typname = NameStr(typform->typname);
+	nspname = get_namespace_name(typform->typnamespace);
+
+	appendStringInfo(buf, "::%s.%s",
+					 quote_identifier(nspname), quote_identifier(typname));
+
+	ReleaseSysCache(typetup);
+}
+
 /* ----------
  * ri_BuildQueryKeyFull -
  *
@@ -3033,15 +3051,15 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 	int			numkeys;
 
 	/*
-	 * Check that the FK constraint's OID is available; it might not be
-	 * if we've been invoked via an ordinary trigger or an old-style
-	 * "constraint trigger".
+	 * Check that the FK constraint's OID is available; it might not be if
+	 * we've been invoked via an ordinary trigger or an old-style "constraint
+	 * trigger".
 	 */
 	if (!OidIsValid(constraintOid))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-		   errmsg("no pg_constraint entry for trigger \"%s\" on table \"%s\"",
-				  trigger->tgname, RelationGetRelationName(trig_rel)),
+		  errmsg("no pg_constraint entry for trigger \"%s\" on table \"%s\"",
+				 trigger->tgname, RelationGetRelationName(trig_rel)),
 				 errhint("Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT.")));
 
 	/* OK, fetch the tuple */
@@ -3081,14 +3099,14 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 
 	/*
 	 * We expect the arrays to be 1-D arrays of the right types; verify that.
-	 * We don't need to use deconstruct_array() since the array data is
-	 * just going to look like a C array of values.
+	 * We don't need to use deconstruct_array() since the array data is just
+	 * going to look like a C array of values.
 	 */
 	adatum = SysCacheGetAttr(CONSTROID, tup,
 							 Anum_pg_constraint_conkey, &isNull);
 	if (isNull)
 		elog(ERROR, "null conkey for constraint %u", constraintOid);
-	arr = DatumGetArrayTypeP(adatum);			/* ensure not toasted */
+	arr = DatumGetArrayTypeP(adatum);	/* ensure not toasted */
 	numkeys = ARR_DIMS(arr)[0];
 	if (ARR_NDIM(arr) != 1 ||
 		numkeys < 0 ||
@@ -3098,12 +3116,14 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 		elog(ERROR, "conkey is not a 1-D smallint array");
 	riinfo->nkeys = numkeys;
 	memcpy(riinfo->fk_attnums, ARR_DATA_PTR(arr), numkeys * sizeof(int16));
+	if ((Pointer) arr != DatumGetPointer(adatum))
+		pfree(arr);				/* free de-toasted copy, if any */
 
 	adatum = SysCacheGetAttr(CONSTROID, tup,
 							 Anum_pg_constraint_confkey, &isNull);
 	if (isNull)
 		elog(ERROR, "null confkey for constraint %u", constraintOid);
-	arr = DatumGetArrayTypeP(adatum);			/* ensure not toasted */
+	arr = DatumGetArrayTypeP(adatum);	/* ensure not toasted */
 	numkeys = ARR_DIMS(arr)[0];
 	if (ARR_NDIM(arr) != 1 ||
 		numkeys != riinfo->nkeys ||
@@ -3112,12 +3132,14 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 		ARR_ELEMTYPE(arr) != INT2OID)
 		elog(ERROR, "confkey is not a 1-D smallint array");
 	memcpy(riinfo->pk_attnums, ARR_DATA_PTR(arr), numkeys * sizeof(int16));
+	if ((Pointer) arr != DatumGetPointer(adatum))
+		pfree(arr);				/* free de-toasted copy, if any */
 
 	adatum = SysCacheGetAttr(CONSTROID, tup,
 							 Anum_pg_constraint_conpfeqop, &isNull);
 	if (isNull)
 		elog(ERROR, "null conpfeqop for constraint %u", constraintOid);
-	arr = DatumGetArrayTypeP(adatum);			/* ensure not toasted */
+	arr = DatumGetArrayTypeP(adatum);	/* ensure not toasted */
 	numkeys = ARR_DIMS(arr)[0];
 	if (ARR_NDIM(arr) != 1 ||
 		numkeys != riinfo->nkeys ||
@@ -3126,12 +3148,14 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 		ARR_ELEMTYPE(arr) != OIDOID)
 		elog(ERROR, "conpfeqop is not a 1-D Oid array");
 	memcpy(riinfo->pf_eq_oprs, ARR_DATA_PTR(arr), numkeys * sizeof(Oid));
+	if ((Pointer) arr != DatumGetPointer(adatum))
+		pfree(arr);				/* free de-toasted copy, if any */
 
 	adatum = SysCacheGetAttr(CONSTROID, tup,
 							 Anum_pg_constraint_conppeqop, &isNull);
 	if (isNull)
 		elog(ERROR, "null conppeqop for constraint %u", constraintOid);
-	arr = DatumGetArrayTypeP(adatum);			/* ensure not toasted */
+	arr = DatumGetArrayTypeP(adatum);	/* ensure not toasted */
 	numkeys = ARR_DIMS(arr)[0];
 	if (ARR_NDIM(arr) != 1 ||
 		numkeys != riinfo->nkeys ||
@@ -3140,12 +3164,14 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 		ARR_ELEMTYPE(arr) != OIDOID)
 		elog(ERROR, "conppeqop is not a 1-D Oid array");
 	memcpy(riinfo->pp_eq_oprs, ARR_DATA_PTR(arr), numkeys * sizeof(Oid));
+	if ((Pointer) arr != DatumGetPointer(adatum))
+		pfree(arr);				/* free de-toasted copy, if any */
 
 	adatum = SysCacheGetAttr(CONSTROID, tup,
 							 Anum_pg_constraint_conffeqop, &isNull);
 	if (isNull)
 		elog(ERROR, "null conffeqop for constraint %u", constraintOid);
-	arr = DatumGetArrayTypeP(adatum);			/* ensure not toasted */
+	arr = DatumGetArrayTypeP(adatum);	/* ensure not toasted */
 	numkeys = ARR_DIMS(arr)[0];
 	if (ARR_NDIM(arr) != 1 ||
 		numkeys != riinfo->nkeys ||
@@ -3154,6 +3180,8 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
 		ARR_ELEMTYPE(arr) != OIDOID)
 		elog(ERROR, "conffeqop is not a 1-D Oid array");
 	memcpy(riinfo->ff_eq_oprs, ARR_DATA_PTR(arr), numkeys * sizeof(Oid));
+	if ((Pointer) arr != DatumGetPointer(adatum))
+		pfree(arr);				/* free de-toasted copy, if any */
 
 	ReleaseSysCache(tup);
 }
@@ -3165,12 +3193,12 @@ ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo,
  * If cache_plan is true, the plan is saved into our plan hashtable
  * so that we don't need to plan it again.
  */
-static void *
+static SPIPlanPtr
 ri_PlanCheck(const char *querystr, int nargs, Oid *argtypes,
 			 RI_QueryKey *qkey, Relation fk_rel, Relation pk_rel,
 			 bool cache_plan)
 {
-	void	   *qplan;
+	SPIPlanPtr	qplan;
 	Relation	query_rel;
 	Oid			save_userid;
 	int			save_sec_context;
@@ -3214,7 +3242,7 @@ ri_PlanCheck(const char *querystr, int nargs, Oid *argtypes,
  * Perform a query to enforce an RI restriction
  */
 static bool
-ri_PerformCheck(RI_QueryKey *qkey, void *qplan,
+ri_PerformCheck(RI_QueryKey *qkey, SPIPlanPtr qplan,
 				Relation fk_rel, Relation pk_rel,
 				HeapTuple old_tuple, HeapTuple new_tuple,
 				bool detectNewRows,
@@ -3572,10 +3600,11 @@ ri_InitHashTables(void)
  *	and saved SPI execution plans. Return the plan if found or NULL.
  * ----------
  */
-static void *
+static SPIPlanPtr
 ri_FetchPreparedPlan(RI_QueryKey *key)
 {
 	RI_QueryHashEntry *entry;
+	SPIPlanPtr		plan;
 
 	/*
 	 * On the first call initialize the hashtable
@@ -3591,7 +3620,30 @@ ri_FetchPreparedPlan(RI_QueryKey *key)
 											  HASH_FIND, NULL);
 	if (entry == NULL)
 		return NULL;
-	return entry->plan;
+
+	/*
+	 * Check whether the plan is still valid.  If it isn't, we don't want
+	 * to simply rely on plancache.c to regenerate it; rather we should
+	 * start from scratch and rebuild the query text too.  This is to cover
+	 * cases such as table/column renames.  We depend on the plancache
+	 * machinery to detect possible invalidations, though.
+	 *
+	 * CAUTION: this check is only trustworthy if the caller has already
+	 * locked both FK and PK rels.
+	 */
+	plan = entry->plan;
+	if (plan && SPI_plan_is_valid(plan))
+		return plan;
+
+	/*
+	 * Otherwise we might as well flush the cached plan now, to free a
+	 * little memory space before we make a new one.
+	 */
+	entry->plan = NULL;
+	if (plan)
+		SPI_freeplan(plan);
+
+	return NULL;
 }
 
 
@@ -3602,7 +3654,7 @@ ri_FetchPreparedPlan(RI_QueryKey *key)
  * ----------
  */
 static void
-ri_HashPreparedPlan(RI_QueryKey *key, void *plan)
+ri_HashPreparedPlan(RI_QueryKey *key, SPIPlanPtr plan)
 {
 	RI_QueryHashEntry *entry;
 	bool		found;
@@ -3614,11 +3666,13 @@ ri_HashPreparedPlan(RI_QueryKey *key, void *plan)
 		ri_InitHashTables();
 
 	/*
-	 * Add the new plan.
+	 * Add the new plan.  We might be overwriting an entry previously
+	 * found invalid by ri_FetchPreparedPlan.
 	 */
 	entry = (RI_QueryHashEntry *) hash_search(ri_query_cache,
 											  (void *) key,
 											  HASH_ENTER, &found);
+	Assert(!found || entry->plan == NULL);
 	entry->plan = plan;
 }
 
@@ -3866,30 +3920,49 @@ ri_HashCompareOp(Oid eq_opr, Oid typeid)
 	 */
 	if (!entry->valid)
 	{
-		Oid		lefttype,
-				righttype,
-				castfunc;
+		Oid			lefttype,
+					righttype,
+					castfunc;
+		CoercionPathType pathtype;
 
 		/* We always need to know how to call the equality operator */
 		fmgr_info_cxt(get_opcode(eq_opr), &entry->eq_opr_finfo,
 					  TopMemoryContext);
 
 		/*
-		 * If we chose to use a cast from FK to PK type, we may have to
-		 * apply the cast function to get to the operator's input type.
+		 * If we chose to use a cast from FK to PK type, we may have to apply
+		 * the cast function to get to the operator's input type.
+		 *
+		 * XXX eventually it would be good to support array-coercion cases
+		 * here and in ri_AttributesEqual().  At the moment there is no point
+		 * because cases involving nonidentical array types will be rejected
+		 * at constraint creation time.
+		 *
+		 * XXX perhaps also consider supporting CoerceViaIO?  No need at the
+		 * moment since that will never be generated for implicit coercions.
 		 */
 		op_input_types(eq_opr, &lefttype, &righttype);
 		Assert(lefttype == righttype);
 		if (typeid == lefttype)
-			castfunc = InvalidOid;				/* simplest case */
-		else if (!find_coercion_pathway(lefttype, typeid, COERCION_IMPLICIT,
-										&castfunc))
+			castfunc = InvalidOid;		/* simplest case */
+		else
 		{
-			/* If target is ANYARRAY, assume it's OK, else punt. */
-			if (lefttype != ANYARRAYOID)
-				elog(ERROR, "no conversion function from %s to %s",
-					 format_type_be(typeid),
-					 format_type_be(lefttype));
+			pathtype = find_coercion_pathway(lefttype, typeid,
+											 COERCION_IMPLICIT,
+											 &castfunc);
+			if (pathtype != COERCION_PATH_FUNC &&
+				pathtype != COERCION_PATH_RELABELTYPE)
+			{
+				/*
+				 * The declared input type of the eq_opr might be a
+				 * polymorphic type such as ANYARRAY or ANYENUM.  If so,
+				 * assume the coercion is valid; otherwise complain.
+				 */
+				if (!IsPolymorphicType(lefttype))
+					elog(ERROR, "no conversion function from %s to %s",
+						 format_type_be(typeid),
+						 format_type_be(lefttype));
+			}
 		}
 		if (OidIsValid(castfunc))
 			fmgr_info_cxt(castfunc, &entry->cast_func_finfo,
diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c
index 047df07a2bdd..bd2f8fe84ac4 100644
--- a/src/backend/utils/adt/rowtypes.c
+++ b/src/backend/utils/adt/rowtypes.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.18 2007/01/05 22:19:42 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.20 2008/01/01 19:45:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,6 +32,7 @@ typedef struct ColumnIOData
 	Oid			column_type;
 	Oid			typiofunc;
 	Oid			typioparam;
+	bool		typisvarlena;
 	FmgrInfo	proc;
 } ColumnIOData;
 
@@ -174,8 +175,7 @@ record_in(PG_FUNCTION_ARGS)
 			/* Extract string for this column */
 			bool		inquote = false;
 
-			buf.len = 0;
-			buf.data[0] = '\0';
+			resetStringInfo(&buf);
 			while (inquote || !(*ptr == ',' || *ptr == ')'))
 			{
 				char		ch = *ptr++;
@@ -357,6 +357,7 @@ record_out(PG_FUNCTION_ARGS)
 	{
 		ColumnIOData *column_info = &my_extra->columns[i];
 		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Datum		attr;
 		char	   *value;
 		char	   *tmp;
 		bool		nq;
@@ -380,17 +381,24 @@ record_out(PG_FUNCTION_ARGS)
 		 */
 		if (column_info->column_type != column_type)
 		{
-			bool		typIsVarlena;
-
 			getTypeOutputInfo(column_type,
 							  &column_info->typiofunc,
-							  &typIsVarlena);
+							  &column_info->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]);
+		/*
+		 * If we have a toasted datum, forcibly detoast it here to avoid
+		 * memory leakage inside the type's output routine.
+		 */
+		if (column_info->typisvarlena)
+			attr = PointerGetDatum(PG_DETOAST_DATUM(values[i]));
+		else
+			attr = values[i];
+
+		value = OutputFunctionCall(&column_info->proc, attr);
 
 		/* Detect whether we need double quotes for this value */
 		nq = (value[0] == '\0');	/* force quotes for empty string */
@@ -409,17 +417,23 @@ record_out(PG_FUNCTION_ARGS)
 
 		/* And emit the string */
 		if (nq)
-			appendStringInfoChar(&buf, '"');
+			appendStringInfoCharMacro(&buf, '"');
 		for (tmp = value; *tmp; tmp++)
 		{
 			char		ch = *tmp;
 
 			if (ch == '"' || ch == '\\')
-				appendStringInfoChar(&buf, ch);
-			appendStringInfoChar(&buf, ch);
+				appendStringInfoCharMacro(&buf, ch);
+			appendStringInfoCharMacro(&buf, ch);
 		}
 		if (nq)
-			appendStringInfoChar(&buf, '"');
+			appendStringInfoCharMacro(&buf, '"');
+
+		pfree(value);
+
+		/* Clean up detoasted copy, if any */
+		if (DatumGetPointer(attr) != DatumGetPointer(values[i]))
+			pfree(DatumGetPointer(attr));
 	}
 
 	appendStringInfoChar(&buf, ')');
@@ -706,6 +720,7 @@ record_send(PG_FUNCTION_ARGS)
 	{
 		ColumnIOData *column_info = &my_extra->columns[i];
 		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Datum		attr;
 		bytea	   *outputbytes;
 
 		/* Ignore dropped columns in datatype */
@@ -726,23 +741,35 @@ record_send(PG_FUNCTION_ARGS)
 		 */
 		if (column_info->column_type != column_type)
 		{
-			bool		typIsVarlena;
-
 			getTypeBinaryOutputInfo(column_type,
 									&column_info->typiofunc,
-									&typIsVarlena);
+									&column_info->typisvarlena);
 			fmgr_info_cxt(column_info->typiofunc, &column_info->proc,
 						  fcinfo->flinfo->fn_mcxt);
 			column_info->column_type = column_type;
 		}
 
-		outputbytes = SendFunctionCall(&column_info->proc, values[i]);
+		/*
+		 * If we have a toasted datum, forcibly detoast it here to avoid
+		 * memory leakage inside the type's output routine.
+		 */
+		if (column_info->typisvarlena)
+			attr = PointerGetDatum(PG_DETOAST_DATUM(values[i]));
+		else
+			attr = values[i];
+
+		outputbytes = SendFunctionCall(&column_info->proc, attr);
 
 		/* We assume the result will not have been toasted */
 		pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
 		pq_sendbytes(&buf, VARDATA(outputbytes),
 					 VARSIZE(outputbytes) - VARHDRSZ);
+
 		pfree(outputbytes);
+
+		/* Clean up detoasted copy, if any */
+		if (DatumGetPointer(attr) != DatumGetPointer(values[i]))
+			pfree(DatumGetPointer(attr));
 	}
 
 	pfree(values);
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index a01f86f77f70..d9f8c759b83e 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -4,7 +4,7 @@
  *	  Functions to convert stored expressions/querytrees back to
  *	  source text
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -102,18 +102,15 @@ typedef struct
  *
  * The rangetable is the list of actual RTEs from the query tree.
  *
- * For deparsing plan trees, we allow two special RTE entries that are not
- * part of the rtable list (partly because they don't have consecutively
- * allocated varnos).
+ * For deparsing plan trees, we provide for outer and inner subplan nodes.
+ * The tlists of these nodes are used to resolve OUTER and INNER varnos.
  */
 typedef struct
 {
 	List	   *rtable;			/* List of RangeTblEntry nodes */
 	List	   *ctes;			/* List of CommonTableExpr nodes */
-	int			outer_varno;	/* varno for outer_rte */
-	RangeTblEntry *outer_rte;	/* special RangeTblEntry, or NULL */
-	int			inner_varno;	/* varno for inner_rte */
-	RangeTblEntry *inner_rte;	/* special RangeTblEntry, or NULL */
+	Plan	   *outer_plan;		/* OUTER subplan, or NULL if none */
+	Plan	   *inner_plan;		/* INNER subplan, or NULL if none */
 } deparse_namespace;
 
 /* ----------
@@ -178,10 +175,8 @@ static void get_rule_groupingclause(GroupingClause *grp, List *tlist,
 static Node *get_rule_sortgroupclause(SortClause *srt, List *tlist,
 						 bool force_colno,
 						 deparse_context *context);
-static void get_names_for_var(Var *var, int levelsup, deparse_context *context,
-				  const char **schemaname,
-                  const char **refname,
-                  const char **attname);
+static char *get_variable(Var *var, int levelsup, bool istoplevel,
+			 deparse_context *context);
 static RangeTblEntry *find_rte_by_refname(const char *refname,
 					deparse_context *context);
 static const char *get_simple_binary_op_name(OpExpr *expr);
@@ -204,10 +199,10 @@ static void get_sortlist_expr(List *l, List *targetList, bool force_colno,
 static void get_windowspec_expr(WindowSpec *spec, deparse_context *context);
 static void get_windowref_expr(WindowRef *wref, deparse_context *context);
 static void get_coercion_expr(Node *arg, deparse_context *context,
-							Oid resulttype, int32 resulttypmod,
-							Node *parentNode);
+				  Oid resulttype, int32 resulttypmod,
+				  Node *parentNode);
 static void get_const_expr(Const *constval, deparse_context *context,
-						   int showtype);
+			   int showtype);
 static void get_sublink_expr(SubLink *sublink, deparse_context *context);
 static void get_from_clause(Query *query, const char *prefix,
 				deparse_context *context);
@@ -222,6 +217,7 @@ static void get_opclass_name(Oid opclass, Oid actual_datatype,
 static Node *processIndirection(Node *node, deparse_context *context,
 				   bool printit);
 static void printSubscripts(ArrayRef *aref, deparse_context *context);
+static char *get_relation_name(Oid relid);
 static char *generate_relation_name(Oid relid, List *namespaces);
 static char *generate_function_name(Oid funcid, int nargs, Oid *argtypes,
 									bool *is_variadic);
@@ -564,8 +560,8 @@ pg_get_triggerdef(PG_FUNCTION_ARGS)
 		int			i;
 
 		val = DatumGetByteaP(fastgetattr(ht_trig,
-										Anum_pg_trigger_tgargs,
-										tgrel->rd_att, &isnull));
+										 Anum_pg_trigger_tgargs,
+										 tgrel->rd_att, &isnull));
 		if (isnull)
 			elog(ERROR, "tgargs is null for trigger %u", trigid);
 		p = (char *) VARDATA(val);
@@ -754,7 +750,7 @@ pg_get_indexdef_worker(Oid indexrelid, int colno,
 
 	indexpr_item = list_head(indexprs);
 
-	context = deparse_context_for(get_rel_name(indrelid), indrelid);
+	context = deparse_context_for(get_relation_name(indrelid), indrelid);
 
 	/*
 	 * Start the index definition.	Note that the index's name should never be
@@ -865,7 +861,7 @@ pg_get_indexdef_worker(Oid indexrelid, int colno,
 			tblspc = get_rel_tablespace(indexrelid);
 			if (OidIsValid(tblspc))
 				appendStringInfo(&buf, " TABLESPACE %s",
-								 quote_identifier(get_tablespace_name(tblspc)));
+							  quote_identifier(get_tablespace_name(tblspc)));
 		}
 
 		/*
@@ -1123,7 +1119,7 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand,
 					tblspc = get_rel_tablespace(indexId);
 					if (OidIsValid(tblspc))
 						appendStringInfo(&buf, " USING INDEX TABLESPACE %s",
-										 quote_identifier(get_tablespace_name(tblspc)));
+							  quote_identifier(get_tablespace_name(tblspc)));
 				}
 
 				break;
@@ -1151,7 +1147,7 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand,
 				if (conForm->conrelid != InvalidOid)
 				{
 					/* relation constraint */
-					context = deparse_context_for(get_rel_name(conForm->conrelid),
+					context = deparse_context_for(get_relation_name(conForm->conrelid),
 												  conForm->conrelid);
 				}
 				else
@@ -1663,7 +1659,7 @@ print_function_arguments(StringInfo buf, HeapTuple proctup,
 	return argsprinted;
 }
 
-/* ----------
+/*
  * deparse_expression			- General utility for deparsing expressions
  *
  * calls deparse_expression_pretty with all prettyPrinting disabled
@@ -1755,8 +1751,7 @@ deparse_context_for(const char *aliasname, Oid relid)
 	/* Build one-element rtable */
 	dpns->rtable = list_make1(rte);
 	dpns->ctes = NIL;
-	dpns->outer_varno = dpns->inner_varno = 0;
-	dpns->outer_rte = dpns->inner_rte = NULL;
+	dpns->outer_plan = dpns->inner_plan = NULL;
 
 	/* Return a one-deep namespace stack */
 	return list_make1(dpns);
@@ -1765,17 +1760,21 @@ deparse_context_for(const char *aliasname, Oid relid)
 /*
  * deparse_context_for_plan		- Build deparse context for a plan node
  *
- * The plan node may contain references to one or two subplans or outer
- * join plan nodes.  For these, pass the varno used plus a context node
- * made with deparse_context_for_subplan.  (Pass 0/NULL for unused inputs.)
+ * When deparsing an expression in a Plan tree, we might have to resolve
+ * OUTER or INNER references.  Pass the plan nodes whose targetlists define
+ * such references, or NULL when none are expected.  (outer_plan and
+ * inner_plan really ought to be declared as "Plan *", but we use "Node *"
+ * to avoid having to include plannodes.h in builtins.h.)
+ *
+ * As a special case, when deparsing a SubqueryScan plan, pass the subplan
+ * as inner_plan (there won't be any regular innerPlan() in this case).
  *
  * The plan's rangetable list must also be passed.  We actually prefer to use
  * the rangetable to resolve simple Vars, but the subplan inputs are needed
  * for Vars that reference expressions computed in subplan target lists.
  */
 List *
-deparse_context_for_plan(int outer_varno, Node *outercontext,
-						 int inner_varno, Node *innercontext,
+deparse_context_for_plan(Node *outer_plan, Node *inner_plan,
 						 List *rtable)
 {
 	deparse_namespace *dpns;
@@ -1784,47 +1783,13 @@ deparse_context_for_plan(int outer_varno, Node *outercontext,
 
 	dpns->rtable = rtable;
 	dpns->ctes = NIL;
-	dpns->outer_varno = outer_varno;
-	dpns->outer_rte = (RangeTblEntry *) outercontext;
-	dpns->inner_varno = inner_varno;
-	dpns->inner_rte = (RangeTblEntry *) innercontext;
+	dpns->outer_plan = (Plan *) outer_plan;
+	dpns->inner_plan = (Plan *) inner_plan;
 
 	/* Return a one-deep namespace stack */
 	return list_make1(dpns);
 }
 
-/*
- * deparse_context_for_subplan	- Build deparse context for a plan node
- *
- * Helper routine to build one of the inputs for deparse_context_for_plan.
- * Pass the name to be used to reference the subplan, plus the Plan node.
- * (subplan really ought to be declared as "Plan *", but we use "Node *"
- * to avoid having to include plannodes.h in builtins.h.)
- *
- * The returned node is actually a RangeTblEntry, but we declare it as just
- * Node to discourage callers from assuming anything.
- */
-Node *
-deparse_context_for_subplan(const char *name, Node *subplan)
-{
-	RangeTblEntry *rte = makeNode(RangeTblEntry);
-
-	/*
-	 * We create an RTE_SPECIAL RangeTblEntry, and store the subplan in its
-	 * funcexpr field.	RTE_SPECIAL nodes shouldn't appear in deparse contexts
-	 * otherwise.
-	 */
-	rte->rtekind = RTE_SPECIAL;
-	rte->relid = InvalidOid;
-	rte->funcexpr = subplan;
-	rte->alias = NULL;
-    rte->eref = name ? makeAlias(name, NIL) : NULL;     /*CDB*/
-	rte->inh = false;
-	rte->inFromCl = true;
-
-	return (Node *) rte;
-}
-
 /* ----------
  * make_ruledef			- reconstruct the CREATE RULE command
  *				  for a given pg_rewrite tuple
@@ -1968,8 +1933,7 @@ make_ruledef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 		context.indentLevel = PRETTYINDENT_STD;
 		dpns.rtable = query->rtable;
 		dpns.ctes = query->cteList;
-		dpns.outer_varno = dpns.inner_varno = 0;
-		dpns.outer_rte = dpns.inner_rte = NULL;
+		dpns.outer_plan = dpns.inner_plan = NULL;
 
 		get_rule_expr(qual, &context, false);
 	}
@@ -2122,8 +2086,7 @@ get_query_def(Query *query, StringInfo buf, List *parentnamespace,
 
 	dpns.rtable = query->rtable;
 	dpns.ctes = query->cteList;
-	dpns.outer_varno = dpns.inner_varno = 0;
-	dpns.outer_rte = dpns.inner_rte = NULL;
+	dpns.outer_plan = dpns.inner_plan = NULL;
 
 	switch (query->commandType)
 	{
@@ -2535,42 +2498,12 @@ get_target_list(List *targetList, deparse_context *context,
 		 * "foo.*", which is the preferred notation in most contexts, but at
 		 * the top level of a SELECT list it's not right (the parser will
 		 * expand that notation into multiple columns, yielding behavior
-		 * different from a whole-row Var).  We want just "foo", instead.
+		 * different from a whole-row Var).  We need to call get_variable
+		 * directly so that we can tell it to do the right thing.
 		 */
 		if (tle->expr && IsA(tle->expr, Var))
 		{
-			Var		   *var = (Var *) (tle->expr);
-			const char *schemaname;
-			const char *refname;
-
-			get_names_for_var(var, 0, context,
-							  &schemaname, &refname, &attname);
-			if (refname && (context->varprefix || attname == NULL))
-			{
-				if (schemaname)
-					appendStringInfo(buf, "%s.",
-									 quote_identifier(schemaname));
-
-				if (strcmp(refname, "*NEW*") == 0)
-					appendStringInfoString(buf, "new");
-				else if (strcmp(refname, "*OLD*") == 0)
-					appendStringInfoString(buf, "old");
-				else
-					appendStringInfoString(buf, quote_identifier(refname));
-
-				if (attname)
-					appendStringInfoChar(buf, '.');
-			}
-			if (attname)
-				appendStringInfoString(buf, quote_identifier(attname));
-			else
-			{
-				/*
-				 * In the whole-row Var case, refname is what the default AS
-				 * name would be.
-				 */
-				attname = refname;
-			}
+			attname = get_variable((Var *) tle->expr, 0, true, context);
 		}
 		else
 		{
@@ -2832,8 +2765,8 @@ get_insert_query_def(Query *query, deparse_context *context)
 	List	   *strippedexprs;
 
 	/*
-	 * If it's an INSERT ... SELECT or VALUES (...), (...), ... there will be
-	 * a single RTE for the SELECT or VALUES.
+	 * If it's an INSERT ... SELECT or multi-row VALUES, there will be a
+	 * single RTE for the SELECT or VALUES.  Plain VALUES has neither.
 	 */
 	foreach(l, query->rtable)
 	{
@@ -2867,7 +2800,7 @@ get_insert_query_def(Query *query, deparse_context *context)
 		context->indentLevel += PRETTYINDENT_STD;
 		appendStringInfoChar(buf, ' ');
 	}
-	appendStringInfo(buf, "INSERT INTO %s (",
+	appendStringInfo(buf, "INSERT INTO %s ",
 					 generate_relation_name(rte->relid, NIL));
 
 	/*
@@ -2884,6 +2817,8 @@ get_insert_query_def(Query *query, deparse_context *context)
 		values_cell = NULL;
 	strippedexprs = NIL;
 	sep = "";
+	if (query->targetList)
+		appendStringInfoChar(buf, '(');
 	foreach(l, query->targetList)
 	{
 		TargetEntry *tle = (TargetEntry *) lfirst(l);
@@ -2920,7 +2855,8 @@ get_insert_query_def(Query *query, deparse_context *context)
 													   context, true));
 		}
 	}
-	appendStringInfo(buf, ") ");
+	if (query->targetList)
+		appendStringInfo(buf, ") ");
 
 	if (select_rte)
 	{
@@ -2933,7 +2869,7 @@ get_insert_query_def(Query *query, deparse_context *context)
 		/* Add the multi-VALUES expression lists */
 		get_values_def(values_rte->values_lists, context);
 	}
-	else
+	else if (strippedexprs)
 	{
 		/* Add the single-VALUES expression list */
 		appendContextKeyword(context, "VALUES (",
@@ -2941,6 +2877,11 @@ get_insert_query_def(Query *query, deparse_context *context)
 		get_rule_expr((Node *) strippedexprs, context, false);
 		appendStringInfoChar(buf, ')');
 	}
+	else
+	{
+		/* No expressions, so it must be DEFAULT VALUES */
+		appendStringInfo(buf, "DEFAULT VALUES");
+	}
 
 	/* Add RETURNING if present */
 	if (query->returningList)
@@ -3111,25 +3052,95 @@ get_utility_query_def(Query *query, deparse_context *context)
 
 
 /*
- * Get the RTE referenced by a (possibly nonlocal) Var.
+ * push_plan: set up deparse_namespace to recurse into the tlist of a subplan
  *
- * The appropriate attribute number is stored into *attno
- * (do not assume that var->varattno is what to use).
+ * When expanding an OUTER or INNER reference, we must push new outer/inner
+ * subplans in case the referenced expression itself uses OUTER/INNER.	We
+ * modify the top stack entry in-place to avoid affecting levelsup issues
+ * (although in a Plan tree there really shouldn't be any).
+ *
+ * Caller must save and restore outer_plan and inner_plan around this.
+ */
+static void
+push_plan(deparse_namespace *dpns, Plan *subplan)
+{
+	/*
+	 * We special-case Append to pretend that the first child plan is the
+	 * OUTER referent; otherwise normal.
+	 */
+	if (IsA(subplan, Append))
+		dpns->outer_plan = (Plan *) linitial(((Append *) subplan)->appendplans);
+	else if (IsA(subplan, Sequence))
+	{
+		ListCell *child;
+
+		/*
+		 * A Sequence node often has a PartitionSelector node as its first
+		 * subplan. A PartitionSelector is special, because it doesn't return
+		 * any tuples. Instead, it tells its sibling subplans which partitions
+		 * they need to scan. The PartitionSelector doesn't have a proper
+		 * target list so look at the first regular subplan instead.
+		 */
+		child = list_head(((Sequence *) subplan)->subplans);
+		if (child != NULL && IsA(lfirst(child), PartitionSelector))
+			child = lnext(child);
+
+		if (child)
+			dpns->outer_plan = (Plan *) lfirst(child);
+		else
+		{
+			/*
+			 * ORCA probably never produces Sequence plans with no children, other
+			 * than the PartitionSelector, but cope with it just in case. (Only
+			 * ORCA produces Sequence nodes in the first place.)
+			 */
+			dpns->outer_plan = NULL;
+		}
+	}
+	else
+		dpns->outer_plan = outerPlan(subplan);
+
+	/*
+	 * For a SubqueryScan, pretend the subplan is INNER referent.  (We don't
+	 * use OUTER because that could someday conflict with the normal meaning.)
+	 */
+	if (IsA(subplan, SubqueryScan))
+		dpns->inner_plan = ((SubqueryScan *) subplan)->subplan;
+	else
+		dpns->inner_plan = innerPlan(subplan);
+}
+
+
+/*
+ * Display a Var appropriately.
  *
  * In some cases (currently only when recursing into an unnamed join)
  * the Var's varlevelsup has to be interpreted with respect to a context
  * above the current one; levelsup indicates the offset.
+ *
+ * If istoplevel is TRUE, the Var is at the top level of a SELECT's
+ * targetlist, which means we need special treatment of whole-row Vars.
+ * Instead of the normal "tab.*", we'll print "tab.*::typename", which is a
+ * dirty hack to prevent "tab.*" from being expanded into multiple columns.
+ * (The parser will strip the useless coercion, so no inefficiency is added in
+ * dump and reload.)  We used to print just "tab" in such cases, but that is
+ * ambiguous and will yield the wrong result if "tab" is also a plain column
+ * name in the query.
+ *
+ * Returns the attname of the Var, or NULL if the Var has no attname (because
+ * it is a whole-row Var).
  */
-static RangeTblEntry *
-get_rte_for_var(Var *var, int levelsup, deparse_context *context,
-				AttrNumber *attno)
+static char *
+get_variable(Var *var, int levelsup, bool istoplevel, deparse_context *context)
 {
+	StringInfo	buf = context->buf;
 	RangeTblEntry *rte;
+	AttrNumber	attnum;
 	int			netlevelsup;
 	deparse_namespace *dpns;
-
-	/* default assumption */
-	*attno = var->varattno;
+	char	   *schemaname;
+	char	   *refname;
+	char	   *attname;
 
 	/* Find appropriate nesting depth */
 	netlevelsup = var->varlevelsup + levelsup;
@@ -3141,76 +3152,81 @@ get_rte_for_var(Var *var, int levelsup, deparse_context *context,
 
 	/*
 	 * Try to find the relevant RTE in this rtable.  In a plan tree, it's
-	 * likely that varno is OUTER, INNER, or 0, in which case we try to use
-	 * varnoold instead.  If the Var references an expression computed by a
-	 * subplan, varnoold will be 0, and we fall back to looking at the special
-	 * subplan RTEs.
+	 * likely that varno is OUTER or INNER, in which case we must dig down
+	 * into the subplans.
 	 */
 	if (var->varno >= 1 && var->varno <= list_length(dpns->rtable))
-		rte = rt_fetch(var->varno, dpns->rtable);
-	else if (var->varnoold >= 1 && var->varnoold <= list_length(dpns->rtable))
 	{
-		rte = rt_fetch(var->varnoold, dpns->rtable);
-		*attno = var->varoattno;
+		rte = rt_fetch(var->varno, dpns->rtable);
+		attnum = var->varattno;
 	}
-	else if (var->varno == dpns->outer_varno || var->varno == 0)
-		rte = dpns->outer_rte;
-	else if (var->varno == dpns->inner_varno)
-		rte = dpns->inner_rte;
-	else
-		rte = NULL;
-	return rte;
-}
+	else if (var->varno == OUTER && dpns->outer_plan)
+	{
+		TargetEntry *tle;
+		Plan	   *save_outer;
+		Plan	   *save_inner;
 
+		tle = get_tle_by_resno(dpns->outer_plan->targetlist, var->varattno);
+		if (!tle)
+			elog(ERROR, "bogus varattno for OUTER var: %d", var->varattno);
 
-/*
- * Get the schemaname, refname and attname for a (possibly nonlocal) Var.
- *
- * In some cases (currently only when recursing into an unnamed join)
- * the Var's varlevelsup has to be interpreted with respect to a context
- * above the current one; levelsup indicates the offset.
- *
- * schemaname is usually returned as NULL.	It will be non-null only if
- * use of the unqualified refname would find the wrong RTE.
- *
- * refname will be returned as NULL if the Var references an unnamed join.
- * In this case the Var *must* be displayed without any qualification.
- *
- * attname will be returned as NULL if the Var represents a whole tuple
- * of the relation.  (Typically we'd want to display the Var as "foo.*",
- * but it's convenient to return NULL to make it easier for callers to
- * distinguish this case.)
- */
-static void
-get_names_for_var(Var *var, int levelsup, deparse_context *context,
-				  const char  **schemaname,
-                  const char  **refname,
-                  const char  **attname)
-{
-	RangeTblEntry *rte;
-	AttrNumber	attnum;
+		Assert(netlevelsup == 0);
+		save_outer = dpns->outer_plan;
+		save_inner = dpns->inner_plan;
+		push_plan(dpns, dpns->outer_plan);
 
-	/* Find appropriate RTE */
-	rte = get_rte_for_var(var, levelsup, context, &attnum);
+		/*
+		 * Force parentheses because our caller probably assumed a Var is a
+		 * simple expression.
+		 */
+		if (!IsA(tle->expr, Var))
+			appendStringInfoChar(buf, '(');
+		get_rule_expr((Node *) tle->expr, context, true);
+		if (!IsA(tle->expr, Var))
+			appendStringInfoChar(buf, ')');
 
-	/* Emit results */
-	*schemaname = NULL;			/* default assumptions */
+		dpns->outer_plan = save_outer;
+		dpns->inner_plan = save_inner;
+		return NULL;
+	}
+	else if (var->varno == INNER && dpns->inner_plan)
+	{
+		TargetEntry *tle;
+		Plan	   *save_outer;
+		Plan	   *save_inner;
 
-    if (rte == NULL ||
-        rte->rtekind == RTE_VOID)
-    {
-        *attname = NULL;
-        *refname = "*BOGUS*";
-        ereport(WARNING, (errcode(ERRCODE_INTERNAL_ERROR),
-                          errmsg_internal("bogus var: varno=%d varattno=%d",
-                                          var->varno, var->varattno) ));
-        return;
-    }
+		tle = get_tle_by_resno(dpns->inner_plan->targetlist, var->varattno);
+		if (!tle)
+			elog(ERROR, "bogus varattno for INNER var: %d", var->varattno);
 
-    if (rte->eref)
-        *refname = rte->eref->aliasname;
-    else
-        *refname = NULL;
+		Assert(netlevelsup == 0);
+		save_outer = dpns->outer_plan;
+		save_inner = dpns->inner_plan;
+		push_plan(dpns, dpns->inner_plan);
+
+		/*
+		 * Force parentheses because our caller probably assumed a Var is a
+		 * simple expression.
+		 */
+		if (!IsA(tle->expr, Var))
+			appendStringInfoChar(buf, '(');
+		get_rule_expr((Node *) tle->expr, context, true);
+		if (!IsA(tle->expr, Var))
+			appendStringInfoChar(buf, ')');
+
+		dpns->outer_plan = save_outer;
+		dpns->inner_plan = save_inner;
+		return NULL;
+	}
+	else
+	{
+		elog(ERROR, "bogus varno: %d", var->varno);
+		return NULL;			/* keep compiler quiet */
+	}
+
+	/* Identify names to use */
+	schemaname = NULL;                      /* default assumptions */
+	refname = rte->eref->aliasname;
 
 	/* Exceptions occur only if the RTE is alias-less */
 	if (rte->alias == NULL)
@@ -3222,23 +3238,27 @@ get_names_for_var(Var *var, int levelsup, deparse_context *context,
 			 * more-closely-nested RTE, or be ambiguous, in which case we need
 			 * to specify the schemaname to avoid these errors.
 			 */
-			if (rte->eref &&
-                find_rte_by_refname(rte->eref->aliasname, context) != rte)
-				*schemaname =
-					get_namespace_name(get_rel_namespace(rte->relid));
+			if (find_rte_by_refname(rte->eref->aliasname, context) != rte)
+				schemaname = get_namespace_name(get_rel_namespace(rte->relid));
 		}
 		else if (rte->rtekind == RTE_JOIN)
 		{
 			/*
 			 * If it's an unnamed join, look at the expansion of the alias
 			 * variable.  If it's a simple reference to one of the input vars
-			 * then recursively find the name of that var, instead. (This
+			 * then recursively print the name of that var, instead. (This
 			 * allows correct decompiling of cases where there are identically
 			 * named columns on both sides of the join.) When it's not a
-			 * simple reference, we have to just return the unqualified
+			 * simple reference, we have to just print the unqualified
 			 * variable name (this can only happen with columns that were
 			 * merged by USING or NATURAL clauses).
+			 *
+			 * This wouldn't work in decompiling plan trees, because we don't
+			 * store joinaliasvars lists after planning; but a plan tree
+			 * should never contain a join alias variable.
 			 */
+			if (rte->joinaliasvars == NIL)
+				elog(ERROR, "cannot decompile join alias var in plan tree");
 			if (attnum > 0)
 			{
 				Var		   *aliasvar;
@@ -3246,65 +3266,66 @@ get_names_for_var(Var *var, int levelsup, deparse_context *context,
 				aliasvar = (Var *) list_nth(rte->joinaliasvars, attnum - 1);
 				if (IsA(aliasvar, Var))
 				{
-					get_names_for_var(aliasvar,
-									  var->varlevelsup + levelsup, context,
-									  schemaname, refname, attname);
-					return;
+					return get_variable(aliasvar, var->varlevelsup + levelsup,
+										istoplevel, context);
 				}
 			}
-			/* Unnamed join has neither schemaname nor refname */
-			*refname = NULL;
-		}
-		else if (rte->rtekind == RTE_SPECIAL)
-		{
+
 			/*
-			 * This case occurs during EXPLAIN when we are looking at a
-			 * deparse context node set up by deparse_context_for_subplan().
-			 * If the subplan tlist provides a name, use it, but usually we'll
-			 * end up with "?columnN?".
+			 * Unnamed join has neither schemaname nor refname.  (Note: since
+			 * it's unnamed, there is no way the user could have referenced it
+			 * to create a whole-row Var for it.  So we don't have to cover
+			 * that case below.)
 			 */
-			TargetEntry    *tle = NULL;
-
-			if (rte->funcexpr)
-				tle = get_tle_by_resno(((Plan *)rte->funcexpr)->targetlist, attnum);
-
-			if (tle && tle->resname)
-			{
-				*attname = tle->resname;
-			}
-			else
-			{
-				char		buf[32];
-
-				snprintf(buf, sizeof(buf), "?column%d?", attnum);
-				*attname = pstrdup(buf);
-			}
-			return;
+			refname = NULL;
 		}
 	}
 
 	if (attnum == InvalidAttrNumber)
-		*attname = NULL;
+		attname = NULL;
 	else
-		*attname = get_rte_attribute_name(rte, attnum);
+		attname = get_rte_attribute_name(rte, attnum);
+
+	if (refname && (context->varprefix || attname == NULL))
+	{
+		if (schemaname)
+			appendStringInfo(buf, "%s.",
+							 quote_identifier(schemaname));
+
+		if (strcmp(refname, "*NEW*") == 0)
+			appendStringInfoString(buf, "new");
+		else if (strcmp(refname, "*OLD*") == 0)
+			appendStringInfoString(buf, "old");
+		else
+			appendStringInfoString(buf, quote_identifier(refname));
+
+		appendStringInfoChar(buf, '.');
+	}
+	if (attname)
+		appendStringInfoString(buf, quote_identifier(attname));
+	else
+	{
+		appendStringInfoChar(buf, '*');
+		if (istoplevel)
+			appendStringInfo(buf, "::%s",
+							 format_type_with_typemod(var->vartype,
+													  var->vartypmod));
+	}
+
+	return attname;
 }
 
 
 /*
- * Get the name of a field of a Var of type RECORD.
+ * Get the name of a field of an expression of composite type.
  *
+ * This is fairly straightforward except for the case of a Var of type RECORD.
  * Since no actual table or view column is allowed to have type RECORD, such
  * a Var must refer to a JOIN or FUNCTION RTE or to a subquery output.	We
  * drill down to find the ultimate defining expression and attempt to infer
  * the field name from it.	We ereport if we can't determine the name.
  *
  * levelsup is an extra offset to interpret the Var's varlevelsup correctly.
- *
- * Note: this has essentially the same logic as the parser's
- * expandRecordVariable() function, but we are dealing with a different
- * representation of the input context, and we only need one field name not
- * a TupleDesc.  Also, we have a special case for RTE_SPECIAL so that we can
- * deal with displaying RECORD-returning functions in subplan targetlists.
  */
 static const char *
 get_name_for_var_field(Var *var, int fieldno,
@@ -3312,15 +3333,98 @@ get_name_for_var_field(Var *var, int fieldno,
 {
 	RangeTblEntry *rte;
 	AttrNumber	attnum;
+	int			netlevelsup;
+	deparse_namespace *dpns;
 	TupleDesc	tupleDesc;
 	Node	   *expr;
 
-	/* Check my caller didn't mess up */
-	Assert(IsA(var, Var));
-	Assert(var->vartype == RECORDOID);
+	/*
+	 * If it's a Var of type RECORD, we have to find what the Var refers to;
+	 * if not, we can use get_expr_result_type. If that fails, we try
+	 * lookup_rowtype_tupdesc, which will probably fail too, but will ereport
+	 * an acceptable message.
+	 */
+	if (!IsA(var, Var) ||
+		var->vartype != RECORDOID)
+	{
+		if (get_expr_result_type((Node *) var, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
+			tupleDesc = lookup_rowtype_tupdesc_copy(exprType((Node *) var),
+													exprTypmod((Node *) var));
+		Assert(tupleDesc);
+		/* Got the tupdesc, so we can extract the field name */
+		Assert(fieldno >= 1 && fieldno <= tupleDesc->natts);
+		return NameStr(tupleDesc->attrs[fieldno - 1]->attname);
+	}
+
+	/* Find appropriate nesting depth */
+	netlevelsup = var->varlevelsup + levelsup;
+	if (netlevelsup >= list_length(context->namespaces))
+		elog(ERROR, "bogus varlevelsup: %d offset %d",
+			 var->varlevelsup, levelsup);
+	dpns = (deparse_namespace *) list_nth(context->namespaces,
+										  netlevelsup);
+
+	/*
+	 * Try to find the relevant RTE in this rtable.  In a plan tree, it's
+	 * likely that varno is OUTER or INNER, in which case we must dig down
+	 * into the subplans.
+	 */
+	if (var->varno >= 1 && var->varno <= list_length(dpns->rtable))
+	{
+		rte = rt_fetch(var->varno, dpns->rtable);
+		attnum = var->varattno;
+	}
+	else if (var->varno == OUTER && dpns->outer_plan)
+	{
+		TargetEntry *tle;
+		Plan	   *save_outer;
+		Plan	   *save_inner;
+		const char *result;
+
+		tle = get_tle_by_resno(dpns->outer_plan->targetlist, var->varattno);
+		if (!tle)
+			elog(ERROR, "bogus varattno for OUTER var: %d", var->varattno);
+
+		Assert(netlevelsup == 0);
+		save_outer = dpns->outer_plan;
+		save_inner = dpns->inner_plan;
+		push_plan(dpns, dpns->outer_plan);
+
+		result = get_name_for_var_field((Var *) tle->expr, fieldno,
+										levelsup, context);
+
+		dpns->outer_plan = save_outer;
+		dpns->inner_plan = save_inner;
+		return result;
+	}
+	else if (var->varno == INNER && dpns->inner_plan)
+	{
+		TargetEntry *tle;
+		Plan	   *save_outer;
+		Plan	   *save_inner;
+		const char *result;
+
+		tle = get_tle_by_resno(dpns->inner_plan->targetlist, var->varattno);
+		if (!tle)
+			elog(ERROR, "bogus varattno for INNER var: %d", var->varattno);
 
-	/* Find appropriate RTE */
-	rte = get_rte_for_var(var, levelsup, context, &attnum);
+		Assert(netlevelsup == 0);
+		save_outer = dpns->outer_plan;
+		save_inner = dpns->inner_plan;
+		push_plan(dpns, dpns->inner_plan);
+
+		result = get_name_for_var_field((Var *) tle->expr, fieldno,
+										levelsup, context);
+
+		dpns->outer_plan = save_outer;
+		dpns->inner_plan = save_inner;
+		return result;
+	}
+	else
+	{
+		elog(ERROR, "bogus varno: %d", var->varno);
+		return NULL;			/* keep compiler quiet */
+	}
 
     if (rte == NULL)
     {
@@ -3336,11 +3440,19 @@ get_name_for_var_field(Var *var, int fieldno,
 		return get_rte_attribute_name(rte, fieldno);
 	}
 
+	/*
+	 * This part has essentially the same logic as the parser's
+	 * expandRecordVariable() function, but we are dealing with a different
+	 * representation of the input context, and we only need one field name
+	 * not a TupleDesc.  Also, we need a special case for deparsing Plan
+	 * trees, because the subquery field has been removed from SUBQUERY RTEs.
+	 */
 	expr = (Node *) var;		/* default if we can't drill down */
 
 	switch (rte->rtekind)
 	{
 		case RTE_RELATION:
+		case RTE_SPECIAL:
 		case RTE_VALUES:
 
 			/*
@@ -3351,46 +3463,77 @@ get_name_for_var_field(Var *var, int fieldno,
 			break;
 		case RTE_SUBQUERY:
 			{
-				/* Subselect-in-FROM: examine sub-select's output expr */
-				TargetEntry *ste = get_tle_by_resno(rte->subquery->targetList,
-													attnum);
-
-				if (ste == NULL || ste->resjunk)
-                {
-                    ereport(WARNING, (errcode(ERRCODE_INTERNAL_ERROR),
-                                      errmsg_internal("bogus var: varno=%d varattno=%d",
-                                                      var->varno, var->varattno) ));
-                    return "*BOGUS*";
-                }
-				expr = (Node *) ste->expr;
-				if (IsA(expr, Var))
+				if (rte->subquery)
 				{
-					const char *result = NULL;
+					/* Subselect-in-FROM: examine sub-select's output expr */
+					TargetEntry *ste = get_tle_by_resno(rte->subquery->targetList,
+														attnum);
 
-					/*
-					 * Recurse into the sub-select to see what its Var
-					 * refers to. We have to build an additional level of
-					 * namespace to keep in step with varlevelsup in the
-					 * subselect.
-					 */
-					deparse_namespace mydpns;
-					memset(&mydpns, 0, sizeof(mydpns));
-					Assert(rte->subquery != NULL);
-					mydpns.rtable = rte->subquery->rtable;
-					mydpns.ctes = rte->subquery->cteList;
-					
-					context->namespaces = lcons(&mydpns,
-												context->namespaces);
+					if (ste == NULL || ste->resjunk)
+						elog(ERROR, "subquery %s does not have attribute %d",
+							 rte->eref->aliasname, attnum);
+					expr = (Node *) ste->expr;
+					if (IsA(expr, Var))
+					{
+						/*
+						 * Recurse into the sub-select to see what its Var
+						 * refers to. We have to build an additional level of
+						 * namespace to keep in step with varlevelsup in the
+						 * subselect.
+						 */
+						deparse_namespace mydpns;
+						const char *result;
 
-					result = get_name_for_var_field((Var *) expr, fieldno,
-													0, context);
+						mydpns.rtable = rte->subquery->rtable;
+						mydpns.outer_plan = mydpns.inner_plan = NULL;
 
-					context->namespaces =
-						list_delete_first(context->namespaces);
+						context->namespaces = lcons(&mydpns,
+													context->namespaces);
 
+						result = get_name_for_var_field((Var *) expr, fieldno,
+														0, context);
+
+						context->namespaces =
+							list_delete_first(context->namespaces);
+
+						return result;
+					}
+					/* else fall through to inspect the expression */
+				}
+				else
+				{
+					/*
+					 * We're deparsing a Plan tree so we don't have complete
+					 * RTE entries.  But the only place we'd see a Var
+					 * directly referencing a SUBQUERY RTE is in a
+					 * SubqueryScan plan node, and we can look into the child
+					 * plan's tlist instead.
+					 */
+					TargetEntry *tle;
+					Plan	   *save_outer;
+					Plan	   *save_inner;
+					const char *result;
+
+					if (!dpns->inner_plan)
+						elog(ERROR, "failed to find plan for subquery %s",
+							 rte->eref->aliasname);
+					tle = get_tle_by_resno(dpns->inner_plan->targetlist,
+										   attnum);
+					if (!tle)
+						elog(ERROR, "bogus varattno for subquery var: %d",
+							 attnum);
+					Assert(netlevelsup == 0);
+					save_outer = dpns->outer_plan;
+					save_inner = dpns->inner_plan;
+					push_plan(dpns, dpns->inner_plan);
+
+					result = get_name_for_var_field((Var *) tle->expr, fieldno,
+													levelsup, context);
+
+					dpns->outer_plan = save_outer;
+					dpns->inner_plan = save_inner;
 					return result;
 				}
-				/* else fall through to inspect the expression */
 			}
 			break;
 		case RTE_CTE:
@@ -3469,6 +3612,8 @@ get_name_for_var_field(Var *var, int fieldno,
 			break;
 		case RTE_JOIN:
 			/* Join RTE --- recursively inspect the alias variable */
+			if (rte->joinaliasvars == NIL)
+				elog(ERROR, "cannot decompile join alias var in plan tree");
 			Assert(attnum > 0 && attnum <= list_length(rte->joinaliasvars));
 			expr = (Node *) list_nth(rte->joinaliasvars, attnum - 1);
 			if (IsA(expr, Var))
@@ -3485,62 +3630,9 @@ get_name_for_var_field(Var *var, int fieldno,
 			 * its result columns as RECORD, which is not allowed.
 			 */
 			break;
-		case RTE_SPECIAL:
-			{
-				/*
-				 * We are looking at a deparse context node set up by
-				 * deparse_context_for_subplan().  The Var must refer to an
-				 * expression computed by this subplan (or possibly one of its
-				 * inputs), rather than any simple attribute of an RTE entry.
-				 * Look into the subplan's target list to get the referenced
-				 * expression, digging down as far as needed to find something
-				 * that's not a Var, and then pass it to
-				 * get_expr_result_type().
-				 */
-				Plan	   *subplan = (Plan *) rte->funcexpr;
-
-				while (subplan)
-				{
-					TargetEntry *ste;
-
-					ste = get_tle_by_resno(subplan->targetlist,
-										   ((Var *) expr)->varattno);
-					if (!ste || !ste->expr)
-						break;
-					expr = (Node *) ste->expr;
-					if (!IsA(expr, Var))
-						break;
-					switch (((Var *)expr)->varno)
-                    {
-                        case 0:
-                        case OUTER:
-						    subplan = outerPlan(subplan);
-                            break;
-                        case INNER:
-						    subplan = innerPlan(subplan);
-                            break;
-                        default:
-                            ereport(WARNING, (errcode(ERRCODE_INTERNAL_ERROR),
-                                errmsg_internal("bogus var: varno=%d varattno=%d "
-                                                "subvarno=%d subattno=%d",
-                                                var->varno, var->varattno,
-                                                ((Var *)expr)->varno,
-                                                ((Var *)expr)->varattno) ));
-                            return "*BOGUS*";
-                    }
-				}
-				if (!subplan)
-                {
-                    ereport(WARNING, (errcode(ERRCODE_INTERNAL_ERROR),
-                        errmsg_internal("bogus var: varno=%d varattno=%d",
-                                        var->varno, var->varattno) ));
-                    return "*BOGUS*";
-                }
-			}
-			break;
-        case RTE_VOID:
+		case RTE_VOID:
             /* No references should exist to a deleted RTE. */
-            break;
+			break;
 	}
 
 	/*
@@ -3552,7 +3644,7 @@ get_name_for_var_field(Var *var, int fieldno,
 	if (get_expr_result_type(expr, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
 		tupleDesc = lookup_rowtype_tupdesc_copy(exprType(expr),
 												exprTypmod(expr));
-
+	Assert(tupleDesc);
 	/* Got the tupdesc, so we can extract the field name */
 	Assert(fieldno >= 1 && fieldno <= tupleDesc->natts);
 	return NameStr(tupleDesc->attrs[fieldno - 1]->attname);
@@ -3594,22 +3686,6 @@ find_rte_by_refname(const char *refname, deparse_context *context)
 				result = rte;
 			}
 		}
-		if (dpns->outer_rte &&
-            dpns->outer_rte->eref &&
-			strcmp(dpns->outer_rte->eref->aliasname, refname) == 0)
-		{
-			if (result)
-				return NULL;	/* it's ambiguous */
-			result = dpns->outer_rte;
-		}
-		if (dpns->inner_rte &&
-			dpns->inner_rte->eref &&
-			strcmp(dpns->inner_rte->eref->aliasname, refname) == 0)
-		{
-			if (result)
-				return NULL;	/* it's ambiguous */
-			result = dpns->inner_rte;
-		}
 		if (result)
 			break;
 	}
@@ -3787,8 +3863,8 @@ isSimpleNode(Node *node, Node *parentNode, int prettyFlags)
 				case T_RowExpr:	/* other separators */
 				case T_CoalesceExpr:	/* own parentheses */
 				case T_MinMaxExpr:		/* own parentheses */
+				case T_XmlExpr:	/* own parentheses */
 				case T_NullIfExpr:		/* other separators */
-				case T_XmlExpr:			/* own parentheses */
 				case T_Aggref:	/* own parentheses */
 				case T_CaseExpr:		/* other separators */
 					return true;
@@ -3836,8 +3912,8 @@ isSimpleNode(Node *node, Node *parentNode, int prettyFlags)
 				case T_RowExpr:	/* other separators */
 				case T_CoalesceExpr:	/* own parentheses */
 				case T_MinMaxExpr:		/* own parentheses */
+				case T_XmlExpr:	/* own parentheses */
 				case T_NullIfExpr:		/* other separators */
-				case T_XmlExpr:			/* own parentheses */
 				case T_Aggref:	/* own parentheses */
 				case T_CaseExpr:		/* other separators */
 					return true;
@@ -3948,39 +4024,11 @@ get_rule_expr(Node *node, deparse_context *context,
 	 * expression tree.  The only exception is that when the input is a List,
 	 * we emit the component items comma-separated with no surrounding
 	 * decoration; this is convenient for most callers.
-	 *
-	 * There might be some work left here to support additional node types.
 	 */
 	switch (nodeTag(node))
 	{
 		case T_Var:
-			{
-				Var		   *var = (Var *) node;
-				const char *schemaname;
-				const char *refname;
-				const char *attname;
-
-				get_names_for_var(var, 0, context,
-								  &schemaname, &refname, &attname);
-				if (refname && (context->varprefix || attname == NULL))
-				{
-					if (schemaname)
-						appendStringInfo(buf, "%s.",
-										 quote_identifier(schemaname));
-
-					if (strcmp(refname, "*NEW*") == 0)
-						appendStringInfoString(buf, "new.");
-					else if (strcmp(refname, "*OLD*") == 0)
-						appendStringInfoString(buf, "old.");
-					else
-						appendStringInfo(buf, "%s.",
-										 quote_identifier(refname));
-				}
-				if (attname)
-					appendStringInfoString(buf, quote_identifier(attname));
-				else
-					appendStringInfoString(buf, "*");
-			}
+			(void) get_variable((Var *) node, 0, false, context);
 			break;
 
 		case T_Const:
@@ -4183,28 +4231,10 @@ get_rule_expr(Node *node, deparse_context *context,
 					appendStringInfoChar(buf, ')');
 
 				/*
-				 * If it's a Var of type RECORD, we have to find what the Var
-				 * refers to; otherwise we can use get_expr_result_type. If
-				 * that fails, we try lookup_rowtype_tupdesc, which will
-				 * probably fail too, but will ereport an acceptable message.
+				 * Get and print the field name.
 				 */
-				if (IsA(arg, Var) &&
-					((Var *) arg)->vartype == RECORDOID)
-					fieldname = get_name_for_var_field((Var *) arg, fno,
-													   0, context);
-				else
-				{
-					TupleDesc	tupdesc;
-
-					if (get_expr_result_type(arg, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-						tupdesc = lookup_rowtype_tupdesc_copy(exprType(arg),
-															exprTypmod(arg));
-					Assert(tupdesc);
-					/* Got the tupdesc, so we can extract the field name */
-					Assert(fno >= 1 && fno <= tupdesc->natts);
-					fieldname = NameStr(tupdesc->attrs[fno - 1]->attname);
-				}
-
+				fieldname = get_name_for_var_field((Var *) arg, fno,
+												   0, context);
 				appendStringInfo(buf, ".%s", quote_identifier(fieldname));
 			}
 			break;
@@ -4231,14 +4261,10 @@ get_rule_expr(Node *node, deparse_context *context,
 				}
 				else
 				{
-					if (!PRETTY_PAREN(context))
-						appendStringInfoChar(buf, '(');
-					get_rule_expr_paren(arg, context, false, node);
-					if (!PRETTY_PAREN(context))
-						appendStringInfoChar(buf, ')');
-					appendStringInfo(buf, "::%s",
-								format_type_with_typemod(relabel->resulttype,
-													 relabel->resulttypmod));
+					get_coercion_expr(arg, context,
+									  relabel->resulttype,
+									  relabel->resulttypmod,
+									  node);
 				}
 			}
 			break;
@@ -4298,13 +4324,9 @@ get_rule_expr(Node *node, deparse_context *context,
 				}
 				else
 				{
-					if (!PRETTY_PAREN(context))
-						appendStringInfoChar(buf, '(');
-					get_rule_expr_paren(arg, context, false, node);
-					if (!PRETTY_PAREN(context))
-						appendStringInfoChar(buf, ')');
-					appendStringInfo(buf, "::%s",
-						  format_type_with_typemod(convert->resulttype, -1));
+					get_coercion_expr(arg, context,
+									  convert->resulttype, -1,
+									  node);
 				}
 			}
 			break;
@@ -4326,59 +4348,54 @@ get_rule_expr(Node *node, deparse_context *context,
 					CaseWhen   *when = (CaseWhen *) lfirst(temp);
 					Node	   *w = (Node *) when->expr;
 
-					if (!PRETTY_INDENT(context))
-						appendStringInfoChar(buf, ' ');
-					appendContextKeyword(context, "WHEN ",
-										 0, 0, 0);
 					if (caseexpr->arg)
 					{
 						/*
-						 * The parser should have produced WHEN clauses of the
-						 * form "CaseTestExpr = RHS"; we want to show just the
-						 * RHS.  If the user wrote something silly like "CASE
-						 * boolexpr WHEN TRUE THEN ...", then the optimizer's
-						 * simplify_boolean_equality() may have reduced this
-						 * to just "CaseTestExpr" or "NOT CaseTestExpr", for
-						 * which we have to show "TRUE" or "FALSE".  Also,
-						 * depending on context the original CaseTestExpr
-						 * might have been reduced to a Const (but we won't
-						 * see "WHEN Const").
+						 * The parser should have produced WHEN clauses of
+						 * the form "CaseTestExpr = RHS", possibly with an
+						 * implicit coercion inserted above the CaseTestExpr.
+						 * For accurate decompilation of rules it's essential
+						 * that we show just the RHS.  However in an
+						 * expression that's been through the optimizer, the
+						 * WHEN clause could be almost anything (since the
+						 * equality operator could have been expanded into an
+						 * inline function).  If we don't recognize the form
+						 * of the WHEN clause, just punt and display it as-is.
 						 */
 						if (IsA(w, OpExpr))
 						{
-                            OpExpr     *opexpr = (OpExpr *)w;
-						    Node	   *rhs;
-
-                            Assert(IsA(linitial(opexpr->args), CaseTestExpr) ||
-								   IsA(linitial(opexpr->args), Const) ||
-                                   IsA(linitial(opexpr->args), RelabelType));
-							rhs = (Node *) lsecond(opexpr->args);
-						    get_rule_expr(rhs, context, false);
-					    }
-						else if (IsA(w, CaseTestExpr))
-							appendStringInfo(buf, "TRUE");
-						else if (not_clause(w))
-						{
-							Expr *arg = get_notclausearg((Expr *) w);
-							if (IsA(arg, CaseTestExpr))
-								appendStringInfo(buf, "FALSE");
-							else
-							{
-								/* WHEN IS NOT DISTINCT FROM */
-								DistinctExpr 	*dexpr;
-								Node			*rhs;
+							List	   *args = ((OpExpr *) w)->args;
 
-								Insist(IsA(arg, DistinctExpr));
-								dexpr = (DistinctExpr *) arg;
+							if (list_length(args) == 2 &&
+								IsA(strip_implicit_coercions(linitial(args)),
+									CaseTestExpr))
+								w = (Node *) lsecond(args);
 
-								appendStringInfo(buf, "IS NOT DISTINCT FROM ");
-								rhs = (Node *) lsecond(dexpr->args);
-								get_rule_expr(rhs, context, false);
-							}
+						}
+					}
+
+					if (!PRETTY_INDENT(context))
+						appendStringInfoChar(buf, ' ');
+					appendContextKeyword(context, "WHEN ",
+										 0, 0, 0);
+
+
+					/* WHEN IS NOT DISTINCT FROM */
+					if (not_clause(w))
+					{
+						Expr *arg = get_notclausearg((Expr *) w);
+
+						if (IsA(arg, DistinctExpr))
+						{
+							DistinctExpr 	*dexpr = (DistinctExpr *) arg;
+							Node			*rhs;
+
+							appendStringInfo(buf, "IS NOT DISTINCT FROM ");
+							rhs = (Node *) lsecond(dexpr->args);
+							get_rule_expr(rhs, context, false);
 						}
 						else
-							elog(ERROR, "unexpected CASE WHEN clause: %d",
-								 (int) nodeTag(w));
+							get_rule_expr(w, context, false);
 					}
 					else
 						get_rule_expr(w, context, false);
@@ -4397,6 +4414,19 @@ get_rule_expr(Node *node, deparse_context *context,
 			}
 			break;
 
+		case T_CaseTestExpr:
+			{
+				/*
+				 * Normally we should never get here, since for expressions
+				 * that can contain this node type we attempt to avoid
+				 * recursing to it.  But in an optimized expression we might
+				 * be unable to avoid that (see comments for CaseExpr).  If we
+				 * do see one, print it as CASE_TEST_EXPR.
+				 */
+				appendStringInfo(buf, "CASE_TEST_EXPR");
+			}
+			break;
+
 		case T_ArrayExpr:
 			{
 				ArrayExpr  *arrayexpr = (ArrayExpr *) node;
@@ -4750,22 +4780,22 @@ get_rule_expr(Node *node, deparse_context *context,
 							con = (Const *) lthird(xexpr->args);
 							Assert(IsA(con, Const));
 							if (con->constisnull)
-								/* suppress STANDALONE NO VALUE */ ;
+								 /* suppress STANDALONE NO VALUE */ ;
 							else
 							{
 								switch (DatumGetInt32(con->constvalue))
 								{
 									case XML_STANDALONE_YES:
 										appendStringInfoString(buf,
-															   ", STANDALONE YES");
+														 ", STANDALONE YES");
 										break;
 									case XML_STANDALONE_NO:
 										appendStringInfoString(buf,
-															   ", STANDALONE NO");
+														  ", STANDALONE NO");
 										break;
 									case XML_STANDALONE_NO_VALUE:
 										appendStringInfoString(buf,
-															   ", STANDALONE NO VALUE");
+													", STANDALONE NO VALUE");
 										break;
 									default:
 										break;
@@ -4779,9 +4809,8 @@ get_rule_expr(Node *node, deparse_context *context,
 
 				}
 				if (xexpr->op == IS_XMLSERIALIZE)
-					appendStringInfo(buf, " AS %s",
-									 format_type_with_typemod(xexpr->type,
-															  xexpr->typmod));
+					appendStringInfo(buf, " AS %s", format_type_with_typemod(xexpr->type,
+															 xexpr->typmod));
 				if (xexpr->op == IS_DOCUMENT)
 					appendStringInfoString(buf, " IS DOCUMENT");
 				else
@@ -4802,31 +4831,14 @@ get_rule_expr(Node *node, deparse_context *context,
 				}
 				else
 				{
-					if (!PRETTY_PAREN(context))
-						appendStringInfoChar(buf, '(');
-					get_rule_expr_paren(arg, context, false, node);
-					if (!PRETTY_PAREN(context))
-						appendStringInfoChar(buf, ')');
-					appendStringInfo(buf, "::%s",
-								  format_type_with_typemod(ctest->resulttype,
-													   ctest->resulttypmod));
+					get_coercion_expr(arg, context,
+									  ctest->resulttype,
+									  ctest->resulttypmod,
+									  node);
 				}
 			}
 			break;
 
-		case T_CoerceToDomainValue:
-			appendStringInfo(buf, "VALUE");
-			break;
-
-		case T_SetToDefault:
-			appendStringInfo(buf, "DEFAULT");
-			break;
-
-		case T_CurrentOfExpr:
-			appendStringInfo(buf, "CURRENT OF %s",
-			quote_identifier(((CurrentOfExpr *) node)->cursor_name));
-			break;
-
 		case T_PercentileExpr:
 			{
 				PercentileExpr *p = (PercentileExpr *) node;
@@ -4862,6 +4874,27 @@ get_rule_expr(Node *node, deparse_context *context,
 			}
 			break;
 
+		case T_CoerceToDomainValue:
+			appendStringInfo(buf, "VALUE");
+			break;
+
+		case T_SetToDefault:
+			appendStringInfo(buf, "DEFAULT");
+			break;
+
+		case T_CurrentOfExpr:
+			{
+				CurrentOfExpr *cexpr = (CurrentOfExpr *) node;
+
+				if (cexpr->cursor_name)
+					appendStringInfo(buf, "CURRENT OF %s",
+									 quote_identifier(cexpr->cursor_name));
+				else
+					appendStringInfo(buf, "CURRENT OF $%d",
+									 cexpr->cursor_param);
+			}
+			break;
+
 		case T_List:
 			{
 				char	   *sep;
@@ -4992,13 +5025,9 @@ get_func_expr(FuncExpr *expr, deparse_context *context,
 		/* Get the typmod if this is a length-coercion function */
 		(void) exprIsLengthCoercion((Node *) expr, &coercedTypmod);
 
-		if (!PRETTY_PAREN(context))
-			appendStringInfoChar(buf, '(');
-		get_rule_expr_paren(arg, context, false, (Node *) expr);
-		if (!PRETTY_PAREN(context))
-			appendStringInfoChar(buf, ')');
-		appendStringInfo(buf, "::%s",
-						 format_type_with_typemod(rettype, coercedTypmod));
+		get_coercion_expr(arg, context,
+						  rettype, coercedTypmod,
+						  (Node *) expr);
 
 		return;
 	}
@@ -5475,7 +5504,7 @@ get_const_expr(Const *constval, deparse_context *context, int showtype)
 		if (showtype >= 0)
 			appendStringInfo(buf, "::%s",
 							 format_type_with_typemod(constval->consttype,
-													  -1));
+													  constval->consttypmod));
 		return;
 	}
 
@@ -5576,8 +5605,12 @@ get_const_expr(Const *constval, deparse_context *context, int showtype)
 			needlabel = false;
 			break;
 		case NUMERICOID:
-			/* Float-looking constants will be typed as numeric */
-			needlabel = !isfloat;
+
+			/*
+			 * Float-looking constants will be typed as numeric, but if
+			 * there's a specific typmod we need to show it.
+			 */
+			needlabel = !isfloat || (constval->consttypmod >= 0);
 			break;
 		default:
 			needlabel = true;
@@ -5585,7 +5618,8 @@ get_const_expr(Const *constval, deparse_context *context, int showtype)
 	}
 	if (needlabel || showtype > 0)
 		appendStringInfo(buf, "::%s",
-						 format_type_with_typemod(constval->consttype, -1));
+						 format_type_with_typemod(constval->consttype,
+												  constval->consttypmod));
 }
 
 
@@ -5812,7 +5846,7 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
 			gavealias = true;
 		}
 		else if (rte->rtekind == RTE_RELATION &&
-				 strcmp(rte->eref->aliasname, get_rel_name(rte->relid)) != 0)
+				 strcmp(rte->eref->aliasname, get_relation_name(rte->relid)) != 0)
 		{
 			/*
 			 * Apparently the rel has been renamed since the rule was made.
@@ -6370,6 +6404,23 @@ quote_qualified_identifier(const char *qualifier,
 	return buf.data;
 }
 
+/*
+ * get_relation_name
+ *		Get the unqualified name of a relation specified by OID
+ *
+ * This differs from the underlying get_rel_name() function in that it will
+ * throw error instead of silently returning NULL if the OID is bad.
+ */
+static char *
+get_relation_name(Oid relid)
+{
+	char	   *relname = get_rel_name(relid);
+
+	if (!relname)
+		elog(ERROR, "cache lookup failed for relation %u", relid);
+	return relname;
+}
+
 /*
  * generate_relation_name
  *		Compute the name to display for a relation specified by OID
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 55d95cb5f624..207028247c1a 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.226 2007/02/19 07:03:31 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.243.2.1 2008/07/07 20:25:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -89,6 +89,7 @@
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/plancat.h"
+#include "optimizer/predtest.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/var.h"
 #include "parser/parse_coerce.h"
@@ -121,11 +122,15 @@ static void convert_bytea_to_scalar(Datum value,
 						double *scaledhibound);
 static double convert_one_bytea_to_scalar(unsigned char *value, int valuelen,
 							int rangelo, int rangehi);
-static bool get_variable_maximum(PlannerInfo *root, VariableStatData *vardata,
-					 Oid sortop, Datum *max);
+static bool get_variable_range(PlannerInfo *root, VariableStatData *vardata,
+					 Oid sortop, Datum *min, Datum *max);
 static Selectivity prefix_selectivity(VariableStatData *vardata,
 				   Oid vartype, Oid opfamily, Const *prefixcon);
-static Selectivity pattern_selectivity(Const *patt, Pattern_Type ptype);
+static Selectivity like_selectivity(const char *patt, int pattlen,
+									bool case_insensitive);
+static Selectivity regex_selectivity(const char *patt, int pattlen,
+									 bool case_insensitive,
+									 int fixed_prefix_len);
 static Datum string_to_datum(const char *str, Oid datatype);
 static Const *string_to_const(const char *str, Oid datatype);
 static Const *string_to_bytea_const(const char *str, size_t str_len);
@@ -939,15 +944,15 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype, bool negate)
 	Oid			vartype;
 	Oid			opfamily;
 	Pattern_Prefix_Status pstatus;
-	Const	   *patt = NULL;
+	Const	   *patt;
 	Const	   *prefix = NULL;
-	Const	   *rest = NULL;
+	Selectivity	rest_selec = 0;
 	double		result;
 
 	/*
 	 * If this is for a NOT LIKE or similar operator, get the corresponding
-	 * positive-match operator and work with that.  Set result to the
-	 * correct default estimate, too.
+	 * positive-match operator and work with that.	Set result to the correct
+	 * default estimate, too.
 	 */
 	if (negate)
 	{
@@ -1031,13 +1036,15 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype, bool negate)
 			return result;
 	}
 
-	/* divide pattern into fixed prefix and remainder */
+	/*
+	 * Pull out any fixed prefix implied by the pattern, and estimate the
+	 * fractional selectivity of the remainder of the pattern.
+	 */
 	patt = (Const *) other;
-	pstatus = pattern_fixed_prefix(patt, ptype, &prefix, &rest);
+	pstatus = pattern_fixed_prefix(patt, ptype, &prefix, &rest_selec);
 
 	/*
-	 * If necessary, coerce the prefix constant to the right type. (The "rest"
-	 * constant need not be changed.)
+	 * If necessary, coerce the prefix constant to the right type.
 	 */
 	if (prefix && prefix->consttype != vartype)
 	{
@@ -1128,7 +1135,7 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype, bool negate)
 		if (selec < 0)
 		{
 			/* Nope, so fake it with the heuristic method */
-            selec = pattern_selectivity(rest, ptype);
+			Selectivity prefixsel;
 
 			if (pstatus == Pattern_Prefix_Partial)
             {
@@ -1144,7 +1151,16 @@ patternsel(PG_FUNCTION_ARGS, Pattern_Type ptype, bool negate)
                 selec *= prefixsel;
             }
 			else
-                fewvalues = DEFAULT_MATCH_SEL / DEFAULT_EQ_SEL;
+				prefixsel = 1.0;
+			selec = prefixsel * rest_selec;
+		}
+		else
+		{
+			/* Yes, but don't believe extremely small or large estimates. */
+			if (selec < 0.0001)
+				selec = 0.0001;
+			else if (selec > 0.9999)
+				selec = 0.9999;
 		}
 
         /* CDB: Assume whole pattern matches at least a few distinct values. */
@@ -1438,7 +1454,7 @@ nulltestsel(PlannerInfo *root, NullTestType nulltesttype,
 	 * be taken at face value, since it's very likely being used to select the
 	 * outer-side rows that don't have a match, and thus its selectivity has
 	 * nothing whatever to do with the statistics of the original table
-	 * column.  We do not have nearly enough context here to determine its
+	 * column.	We do not have nearly enough context here to determine its
 	 * true selectivity, so for the moment punt and guess at 0.5.  Eventually
 	 * the planner should be made to provide enough info about the clause's
 	 * context to let us do better.
@@ -1519,22 +1535,22 @@ nulltestsel(PlannerInfo *root, NullTestType nulltesttype,
 static Node *
 strip_array_coercion(Node *node)
 {
-    for (;;)
-    {
-        if (node && IsA(node, ArrayCoerceExpr) &&
-            ((ArrayCoerceExpr *) node)->elemfuncid == InvalidOid)
-        {
-            node = (Node *) ((ArrayCoerceExpr *) node)->arg;
-        }
-        else if (node && IsA(node, RelabelType))
-        {
-            /* We don't really expect this case, but may as well cope */
-            node = (Node *) ((RelabelType *) node)->arg;
-        }
-        else
-            break;
-    }
-    return node;
+	for (;;)
+	{
+		if (node && IsA(node, ArrayCoerceExpr) &&
+			((ArrayCoerceExpr *) node)->elemfuncid == InvalidOid)
+		{
+			node = (Node *) ((ArrayCoerceExpr *) node)->arg;
+		}
+		else if (node && IsA(node, RelabelType))
+		{
+			/* We don't really expect this case, but may as well cope */
+			node = (Node *) ((RelabelType *) node)->arg;
+		}
+		else
+			break;
+	}
+	return node;
 }
 
 /*
@@ -1582,7 +1598,7 @@ scalararraysel(PlannerInfo *root,
 	/* get nominal (after relabeling) element type of rightop */
 	nominal_element_type = get_element_type(exprType(rightop));
 	if (!OidIsValid(nominal_element_type))
-		return (Selectivity) 0.5;			/* probably shouldn't happen */
+		return (Selectivity) 0.5;		/* probably shouldn't happen */
 
 	/* look through any binary-compatible relabeling of rightop */
 	rightop = strip_array_coercion(rightop);
@@ -1628,7 +1644,8 @@ scalararraysel(PlannerInfo *root,
 			Selectivity s2;
 
 			args = list_make2(leftop,
-							  makeConst(nominal_element_type, -1,
+							  makeConst(nominal_element_type,
+										-1,
 										elmlen,
 										elem_values[i],
 										elem_nulls[i],
@@ -2213,18 +2230,24 @@ icnlikejoinsel(PG_FUNCTION_ARGS)
  * we can estimate how much of the input will actually be read.  This
  * can have a considerable impact on the cost when using indexscans.
  *
+ * Also, we can estimate how much of each input has to be read before the
+ * first join pair is found, which will affect the join's startup time.
+ *
  * clause should be a clause already known to be mergejoinable.  opfamily,
  * strategy, and nulls_first specify the sort ordering being used.
  *
- * *leftscan is set to the fraction of the left-hand variable expected
- * to be scanned (0 to 1), and similarly *rightscan for the right-hand
- * variable.
+ * The outputs are:
+ *		*leftstart is set to the fraction of the left-hand variable expected
+ *		 to be scanned before the first join pair is found (0 to 1).
+ *		*leftend is set to the fraction of the left-hand variable expected
+ *		 to be scanned before the join terminates (0 to 1).
+ *		*rightstart, *rightend similarly for the right-hand variable.
  */
 void
 mergejoinscansel(PlannerInfo *root, Node *clause,
 				 Oid opfamily, int strategy, bool nulls_first,
-				 Selectivity *leftscan,
-				 Selectivity *rightscan)
+				 Selectivity *leftstart, Selectivity *leftend,
+				 Selectivity *rightstart, Selectivity *rightend)
 {
 	Node	   *left,
 			   *right;
@@ -2237,14 +2260,23 @@ mergejoinscansel(PlannerInfo *root, Node *clause,
 	Oid			opno,
 				lsortop,
 				rsortop,
+				lstatop,
+				rstatop,
+				ltop,
 				leop,
+				revltop,
 				revleop;
-	Datum		leftmax = 0,
-				rightmax = 0;
+	bool		isgt;
+	Datum		leftmin,
+				leftmax,
+				rightmin,
+				rightmax;
 	double		selec;
 
 	/* Set default results if we can't figure anything out. */
-	*leftscan = *rightscan = 1.0;
+	/* XXX should default "start" fraction be a bit more than 0? */
+	*leftstart = *rightstart = 0.0;
+	*leftend = *rightend = 1.0;
 
 	/* Deconstruct the merge clause */
 	if (!is_opclause(clause))
@@ -2269,31 +2301,104 @@ mergejoinscansel(PlannerInfo *root, Node *clause,
 	Assert(!op_recheck);
 
 	/*
-	 * Look up the various operators we need.  If we don't find them all,
-	 * it probably means the opfamily is broken, but we cope anyway.
+	 * Look up the various operators we need.  If we don't find them all, it
+	 * probably means the opfamily is broken, but we just fail silently.
+	 *
+	 * Note: we expect that pg_statistic histograms will be sorted by the
+	 * '<' operator, regardless of which sort direction we are considering.
 	 */
 	switch (strategy)
 	{
 		case BTLessStrategyNumber:
-			lsortop = get_opfamily_member(opfamily, op_lefttype, op_lefttype,
-										  BTLessStrategyNumber);
-			rsortop = get_opfamily_member(opfamily, op_righttype, op_righttype,
-										  BTLessStrategyNumber);
-			leop = get_opfamily_member(opfamily, op_lefttype, op_righttype,
-									   BTLessEqualStrategyNumber);
-			revleop = get_opfamily_member(opfamily, op_righttype, op_lefttype,
-										  BTLessEqualStrategyNumber);
+			isgt = false;
+			if (op_lefttype == op_righttype)
+			{
+				/* easy case */
+				ltop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTLessStrategyNumber);
+				leop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTLessEqualStrategyNumber);
+				lsortop = ltop;
+				rsortop = ltop;
+				lstatop = lsortop;
+				rstatop = rsortop;
+				revltop = ltop;
+				revleop = leop;
+			}
+			else
+			{
+				ltop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTLessStrategyNumber);
+				leop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTLessEqualStrategyNumber);
+				lsortop = get_opfamily_member(opfamily,
+											  op_lefttype, op_lefttype,
+											  BTLessStrategyNumber);
+				rsortop = get_opfamily_member(opfamily,
+											  op_righttype, op_righttype,
+											  BTLessStrategyNumber);
+				lstatop = lsortop;
+				rstatop = rsortop;
+				revltop = get_opfamily_member(opfamily,
+											  op_righttype, op_lefttype,
+											  BTLessStrategyNumber);
+				revleop = get_opfamily_member(opfamily,
+											  op_righttype, op_lefttype,
+											  BTLessEqualStrategyNumber);
+			}
 			break;
 		case BTGreaterStrategyNumber:
 			/* descending-order case */
-			lsortop = get_opfamily_member(opfamily, op_lefttype, op_lefttype,
-										  BTGreaterStrategyNumber);
-			rsortop = get_opfamily_member(opfamily, op_righttype, op_righttype,
-										  BTGreaterStrategyNumber);
-			leop = get_opfamily_member(opfamily, op_lefttype, op_righttype,
-									   BTGreaterEqualStrategyNumber);
-			revleop = get_opfamily_member(opfamily, op_righttype, op_lefttype,
-										  BTGreaterEqualStrategyNumber);
+			isgt = true;
+			if (op_lefttype == op_righttype)
+			{
+				/* easy case */
+				ltop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTGreaterStrategyNumber);
+				leop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTGreaterEqualStrategyNumber);
+				lsortop = ltop;
+				rsortop = ltop;
+				lstatop = get_opfamily_member(opfamily,
+											  op_lefttype, op_lefttype,
+											  BTLessStrategyNumber);
+				rstatop = lstatop;
+				revltop = ltop;
+				revleop = leop;
+			}
+			else
+			{
+				ltop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTGreaterStrategyNumber);
+				leop = get_opfamily_member(opfamily,
+										   op_lefttype, op_righttype,
+										   BTGreaterEqualStrategyNumber);
+				lsortop = get_opfamily_member(opfamily,
+											  op_lefttype, op_lefttype,
+											  BTGreaterStrategyNumber);
+				rsortop = get_opfamily_member(opfamily,
+											  op_righttype, op_righttype,
+											  BTGreaterStrategyNumber);
+				lstatop = get_opfamily_member(opfamily,
+											  op_lefttype, op_lefttype,
+											  BTLessStrategyNumber);
+				rstatop = get_opfamily_member(opfamily,
+											  op_righttype, op_righttype,
+											  BTLessStrategyNumber);
+				revltop = get_opfamily_member(opfamily,
+											  op_righttype, op_lefttype,
+											  BTGreaterStrategyNumber);
+				revleop = get_opfamily_member(opfamily,
+											  op_righttype, op_lefttype,
+											  BTGreaterEqualStrategyNumber);
+			}
 			break;
 		default:
 			goto fail;			/* shouldn't get here */
@@ -2301,76 +2406,137 @@ mergejoinscansel(PlannerInfo *root, Node *clause,
 
 	if (!OidIsValid(lsortop) ||
 		!OidIsValid(rsortop) ||
+		!OidIsValid(lstatop) ||
+		!OidIsValid(rstatop) ||
+		!OidIsValid(ltop) ||
 		!OidIsValid(leop) ||
+		!OidIsValid(revltop) ||
 		!OidIsValid(revleop))
 		goto fail;				/* insufficient info in catalogs */
 
-	/* Try to get maximum values of both inputs */
-	if (!get_variable_maximum(root, &leftvar, lsortop, &leftmax))
-		goto fail;				/* no max available from stats */
-
-	if (!get_variable_maximum(root, &rightvar, rsortop, &rightmax))
-		goto fail;				/* no max available from stats */
+	/* Try to get ranges of both inputs */
+	if (!isgt)
+	{
+		if (!get_variable_range(root, &leftvar, lstatop,
+								&leftmin, &leftmax))
+			goto fail;			/* no range available from stats */
+		if (!get_variable_range(root, &rightvar, rstatop,
+								&rightmin, &rightmax))
+			goto fail;			/* no range available from stats */
+	}
+	else
+	{
+		/* need to swap the max and min */
+		if (!get_variable_range(root, &leftvar, lstatop,
+								&leftmax, &leftmin))
+			goto fail;			/* no range available from stats */
+		if (!get_variable_range(root, &rightvar, rstatop,
+								&rightmax, &rightmin))
+			goto fail;			/* no range available from stats */
+	}
 
 	/*
 	 * Now, the fraction of the left variable that will be scanned is the
 	 * fraction that's <= the right-side maximum value.  But only believe
-	 * non-default estimates, else stick with our 1.0.  Also, if the sort
-	 * order is nulls-first, we're going to have to read over any nulls too.
+	 * non-default estimates, else stick with our 1.0.
 	 */
-	selec = scalarineqsel(root, leop, false, &leftvar,
+	selec = scalarineqsel(root, leop, isgt, &leftvar,
 						  rightmax, op_righttype);
 	if (selec != DEFAULT_INEQ_SEL)
-	{
-		HeapTuple leftStatsTuple = NULL;
+		*leftend = selec;
 
-		if (nulls_first)
-			leftStatsTuple = getStatsTuple(&leftvar);
+	/* And similarly for the right variable. */
+	selec = scalarineqsel(root, revleop, isgt, &rightvar,
+						  leftmax, op_lefttype);
+	if (selec != DEFAULT_INEQ_SEL)
+		*rightend = selec;
 
-		if (nulls_first && HeapTupleIsValid(leftStatsTuple))
-		{
-			Form_pg_statistic stats;
+	/*
+	 * Only one of the two "end" fractions can really be less than 1.0;
+	 * believe the smaller estimate and reset the other one to exactly 1.0.
+	 * If we get exactly equal estimates (as can easily happen with
+	 * self-joins), believe neither.
+	 */
+	if (*leftend > *rightend)
+		*leftend = 1.0;
+	else if (*leftend < *rightend)
+		*rightend = 1.0;
+	else
+		*leftend = *rightend = 1.0;
 
-			stats = (Form_pg_statistic) GETSTRUCT(leftStatsTuple);
-			selec += stats->stanullfrac;
-			CLAMP_PROBABILITY(selec);
-		}
-		*leftscan = selec;
-	}
+	/*
+	 * Also, the fraction of the left variable that will be scanned before
+	 * the first join pair is found is the fraction that's < the right-side
+	 * minimum value.  But only believe non-default estimates, else stick with
+	 * our own default.
+	 */
+	selec = scalarineqsel(root, ltop, isgt, &leftvar,
+						  rightmin, op_righttype);
+	if (selec != DEFAULT_INEQ_SEL)
+		*leftstart = selec;
 
 	/* And similarly for the right variable. */
-	selec = scalarineqsel(root, revleop, false, &rightvar,
-						  leftmax, op_lefttype);
+	selec = scalarineqsel(root, revltop, isgt, &rightvar,
+						  leftmin, op_lefttype);
 	if (selec != DEFAULT_INEQ_SEL)
-	{
-		HeapTuple rightStatsTuple = NULL;
+		*rightstart = selec;
 
-		if (nulls_first)
-			rightStatsTuple = getStatsTuple(&rightvar);
+	/*
+	 * Only one of the two "start" fractions can really be more than zero;
+	 * believe the larger estimate and reset the other one to exactly 0.0.
+	 * If we get exactly equal estimates (as can easily happen with
+	 * self-joins), believe neither.
+	 */
+	if (*leftstart < *rightstart)
+		*leftstart = 0.0;
+	else if (*leftstart > *rightstart)
+		*rightstart = 0.0;
+	else
+		*leftstart = *rightstart = 0.0;
 
-		if (nulls_first && HeapTupleIsValid(rightStatsTuple))
-		{
-			Form_pg_statistic stats;
+	/*
+	 * If the sort order is nulls-first, we're going to have to skip over any
+	 * nulls too.  These would not have been counted by scalarineqsel, and
+	 * we can safely add in this fraction regardless of whether we believe
+	 * scalarineqsel's results or not.  But be sure to clamp the sum to 1.0!
+	 */
+	if (nulls_first)
+	{
+		Form_pg_statistic stats;
+		HeapTuple leftStatsTuple;
+		HeapTuple rightStatsTuple;
 
+		leftStatsTuple = getStatsTuple(&leftvar);
+		if (HeapTupleIsValid(leftStatsTuple))
+		{
+			stats = (Form_pg_statistic) GETSTRUCT(leftStatsTuple);
+			*leftstart += stats->stanullfrac;
+			CLAMP_PROBABILITY(*leftstart);
+			*leftend += stats->stanullfrac;
+			CLAMP_PROBABILITY(*leftend);
+		}
+		rightStatsTuple = getStatsTuple(&rightvar);
+		if (HeapTupleIsValid(rightStatsTuple))
+		{
 			stats = (Form_pg_statistic) GETSTRUCT(rightStatsTuple);
-			selec += stats->stanullfrac;
-			CLAMP_PROBABILITY(selec);
+			*rightstart += stats->stanullfrac;
+			CLAMP_PROBABILITY(*rightstart);
+			*rightend += stats->stanullfrac;
+			CLAMP_PROBABILITY(*rightend);
 		}
-		*rightscan = selec;
 	}
 
-	/*
-	 * Only one of the two fractions can really be less than 1.0; believe the
-	 * smaller estimate and reset the other one to exactly 1.0.  If we get
-	 * exactly equal estimates (as can easily happen with self-joins), believe
-	 * neither.
-	 */
-	if (*leftscan > *rightscan)
-		*leftscan = 1.0;
-	else if (*leftscan < *rightscan)
-		*rightscan = 1.0;
-	else
-		*leftscan = *rightscan = 1.0;
+	/* Disbelieve start >= end, just in case that can happen */
+	if (*leftstart >= *leftend)
+	{
+		*leftstart = 0.0;
+		*leftend = 1.0;
+	}
+	if (*rightstart >= *rightend)
+	{
+		*rightstart = 0.0;
+		*rightend = 1.0;
+	}
 
 fail:
 	ReleaseVariableStats(leftvar);
@@ -2466,7 +2632,11 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
  * case (all possible cross-product terms actually appear as groups) since
  * very often the grouped-by Vars are highly correlated.  Our current approach
  * is as follows:
- *	1.	Reduce the given expressions to a list of unique Vars used.  For
+ *	1.	Expressions yielding boolean are assumed to contribute two groups,
+ *		independently of their content, and are ignored in the subsequent
+ *		steps.  This is mainly because tests like "col IS NULL" break the
+ *		heuristic used in step 2 especially badly.
+ *	2.	Reduce the given expressions to a list of unique Vars used.  For
  *		example, GROUP BY a, a + b is treated the same as GROUP BY a, b.
  *		It is clearly correct not to count the same Var more than once.
  *		It is also reasonable to treat f(x) the same as x: f() cannot
@@ -2476,14 +2646,14 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
  *		As a special case, if a GROUP BY expression can be matched to an
  *		expressional index for which we have statistics, then we treat the
  *		whole expression as though it were just a Var.
- *	2.	If the list contains Vars of different relations that are known equal
+ *	3.	If the list contains Vars of different relations that are known equal
  *		due to equivalence classes, then drop all but one of the Vars from each
  *		known-equal set, keeping the one with smallest estimated # of values
  *		(since the extra values of the others can't appear in joined rows).
  *		Note the reason we only consider Vars of different relations is that
  *		if we considered ones of the same rel, we'd be double-counting the
  *		restriction selectivity of the equality in the next step.
- *	3.	For Vars within a single source rel, we multiply together the numbers
+ *	4.	For Vars within a single source rel, we multiply together the numbers
  *		of values, clamp to the number of rows in the rel (divided by 10 if
  *		more than one Var), and then multiply by the selectivity of the
  *		restriction clauses for that rel.  When there's more than one Var,
@@ -2494,7 +2664,7 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
  *		by the restriction selectivity is effectively assuming that the
  *		restriction clauses are independent of the grouping, which is a crummy
  *		assumption, but it's hard to do better.
- *	4.	If there are Vars from multiple rels, we repeat step 3 for each such
+ *	5.	If there are Vars from multiple rels, we repeat step 4 for each such
  *		rel, and multiply the results together.
  * Note that rels not containing grouped Vars are ignored completely, as are
  * join clauses.  Such rels cannot increase the number of groups, and we
@@ -2508,15 +2678,23 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
 	double		numdistinct;
 	ListCell   *l;
 
-	/* We should not be called unless query has GROUP BY (or DISTINCT) */
-	Assert(groupExprs != NIL);
+	/*
+	 * If no grouping columns, there's exactly one group.  (This can't happen
+	 * for normal cases with GROUP BY or DISTINCT, but it is possible for
+	 * corner cases with set operations.)
+	 */
+	if (groupExprs == NIL)
+		return 1.0;
 
 	/*
-	 * Steps 1/2: find the unique Vars used, treating an expression as a Var
+	 * Count groups derived from boolean grouping expressions.  For other
+	 * expressions, find the unique Vars used, treating an expression as a Var
 	 * if we can find stats for it.  For each one, record the statistical
 	 * estimate of number of distinct values (total in its table, without
 	 * regard for filtering).
 	 */
+	numdistinct = 1.0;
+
 	foreach(l, groupExprs)
 	{
 		Node	   *groupexpr = (Node *) lfirst(l);
@@ -2524,6 +2702,13 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
 		List	   *varshere;
 		ListCell   *l2;
 
+		/* Short-circuit for expressions returning boolean */
+		if (exprType(groupexpr) == BOOLOID)
+		{
+			numdistinct *= 2.0;
+			continue;
+		}
+
 		/*
 		 * If examine_variable is able to deduce anything about the GROUP BY
 		 * expression, treat it as a single variable even if it's really more
@@ -2572,20 +2757,26 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
 		}
 	}
 
-	/* If now no Vars, we must have an all-constant GROUP BY list. */
+	/*
+	 * If now no Vars, we must have an all-constant or all-boolean GROUP BY
+	 * list.
+	 */
 	if (varinfos == NIL)
-		return 1.0;
+	{
+		/* Guard against out-of-range answers */
+		if (numdistinct > input_rows)
+			numdistinct = input_rows;
+		return numdistinct;
+	}
 
 	/*
-	 * Steps 3/4: group Vars by relation and estimate total numdistinct.
+	 * Group Vars by relation and estimate total numdistinct.
 	 *
 	 * For each iteration of the outer loop, we process the frontmost Var in
 	 * varinfos, plus all other Vars in the same relation.	We remove these
 	 * Vars from the newvarinfos list for the next iteration. This is the
 	 * easiest way to group Vars of same rel together.
 	 */
-	numdistinct = 1.0;
-
 	do
 	{
 		GroupVarInfo *varinfo1 = (GroupVarInfo *) linitial(varinfos);
@@ -2894,6 +3085,8 @@ convert_to_scalar(Datum value, Oid valuetypid, double *scaledvalue,
 		case REGOPERATOROID:
 		case REGCLASSOID:
 		case REGTYPEOID:
+		case REGCONFIGOID:
+		case REGDICTIONARYOID:
 			*scaledvalue = convert_numeric_to_scalar(value, valuetypid);
 			*scaledlobound = convert_numeric_to_scalar(lobound, boundstypid);
 			*scaledhibound = convert_numeric_to_scalar(hibound, boundstypid);
@@ -2990,6 +3183,8 @@ convert_numeric_to_scalar(Datum value, Oid typid)
 		case REGOPERATOROID:
 		case REGCLASSOID:
 		case REGTYPEOID:
+		case REGCONFIGOID:
+		case REGDICTIONARYOID:
 			/* we can treat OIDs as integers... */
 			return (double) DatumGetObjectId(value);
 	}
@@ -3111,8 +3306,7 @@ convert_timevalue_to_scalar(Datum value, Oid typid)
 			return DatumGetTimestamp(DirectFunctionCall1(abstime_timestamp,
 														 value));
 		case DATEOID:
-			return DatumGetTimestamp(DirectFunctionCall1(date_timestamp,
-														 value));
+			return date2timestamp_no_overflow(DatumGetDateADT(value));
 		case INTERVALOID:
 			{
 				Interval   *interval = DatumGetIntervalP(value);
@@ -3425,7 +3619,7 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 		vardata->atttype = var->vartype;
 		vardata->atttypmod = var->vartypmod;
 
-		rte = rt_fetch(var->varno, root->parse->rtable);
+		rte = root->simple_rte_array[var->varno];
 
 		/*
 		 * If this attribute has a foreign key relationship, then first look
@@ -3798,20 +3992,21 @@ get_variable_numdistinct(VariableStatData *vardata)
 }
 
 /*
- * get_variable_maximum
- *		Estimate the maximum value of the specified variable.
- *		If successful, store value in *max and return TRUE.
+ * get_variable_range
+ *		Estimate the minimum and maximum value of the specified variable.
+ *		If successful, store values in *min and *max, and return TRUE.
  *		If no data available, return FALSE.
  *
- * sortop is the "<" comparison operator to use.  (To extract the
- * minimum instead of the maximum, just pass the ">" operator instead.)
+ * sortop is the "<" comparison operator to use.  This should generally
+ * be "<" not ">", as only the former is likely to be found in pg_statistic.
  */
 static bool
-get_variable_maximum(PlannerInfo *root, VariableStatData *vardata,
-					 Oid sortop, Datum *max)
+get_variable_range(PlannerInfo *root, VariableStatData *vardata, Oid sortop,
+				   Datum *min, Datum *max)
 {
+	Datum		tmin = 0;
 	Datum		tmax = 0;
-	bool		have_max = false;
+	bool		have_data = false;
 	Form_pg_statistic stats;
 	int16		typLen;
 	bool		typByVal;
@@ -3830,7 +4025,7 @@ get_variable_maximum(PlannerInfo *root, VariableStatData *vardata,
 	get_typlenbyval(vardata->atttype, &typLen, &typByVal);
 
 	/*
-	 * If there is a histogram, grab the last or first value as appropriate.
+	 * If there is a histogram, grab the first and last values.
 	 *
 	 * If there is a histogram that is sorted with some other operator than
 	 * the one we want, fail --- this suggests that there is data we can't
@@ -3844,42 +4039,24 @@ get_variable_maximum(PlannerInfo *root, VariableStatData *vardata,
 	{
 		if (nvalues > 0)
 		{
+			tmin = datumCopy(values[0], typByVal, typLen);
 			tmax = datumCopy(values[nvalues - 1], typByVal, typLen);
-			have_max = true;
+			have_data = true;
 		}
 		free_attstatsslot(vardata->atttype, values, nvalues, NULL, 0);
 	}
-	else
+	else if (get_attstatsslot(tp,
+							  vardata->atttype, vardata->atttypmod,
+							  STATISTIC_KIND_HISTOGRAM, InvalidOid,
+							  &values, &nvalues,
+							  NULL, NULL))
 	{
-		Oid			rsortop = get_commutator(sortop);
-
-		if (OidIsValid(rsortop) &&
-			get_attstatsslot(tp,
-							 vardata->atttype, vardata->atttypmod,
-							 STATISTIC_KIND_HISTOGRAM, rsortop,
-							 &values, &nvalues,
-							 NULL, NULL))
-		{
-			if (nvalues > 0)
-			{
-				tmax = datumCopy(values[0], typByVal, typLen);
-				have_max = true;
-			}
-			free_attstatsslot(vardata->atttype, values, nvalues, NULL, 0);
-		}
-		else if (get_attstatsslot(tp,
-								  vardata->atttype, vardata->atttypmod,
-								  STATISTIC_KIND_HISTOGRAM, InvalidOid,
-								  &values, &nvalues,
-								  NULL, NULL))
-		{
-			free_attstatsslot(vardata->atttype, values, nvalues, NULL, 0);
-			return false;
-		}
+		free_attstatsslot(vardata->atttype, values, nvalues, NULL, 0);
+		return false;
 	}
 
 	/*
-	 * If we have most-common-values info, look for a large MCV.  This is
+	 * If we have most-common-values info, look for extreme MCVs.  This is
 	 * needed even if we also have a histogram, since the histogram excludes
 	 * the MCVs.  However, usually the MCVs will not be the extreme values, so
 	 * avoid unnecessary data copying.
@@ -3890,31 +4067,41 @@ get_variable_maximum(PlannerInfo *root, VariableStatData *vardata,
 						 &values, &nvalues,
 						 NULL, NULL))
 	{
-		bool		large_mcv = false;
+		bool		tmin_is_mcv = false;
+		bool		tmax_is_mcv = false;
 		FmgrInfo	opproc;
 
 		fmgr_info(get_opcode(sortop), &opproc);
 
 		for (i = 0; i < nvalues; i++)
 		{
-			if (!have_max)
+			if (!have_data)
 			{
-				tmax = values[i];
-				large_mcv = have_max = true;
+				tmin = tmax = values[i];
+				tmin_is_mcv = tmax_is_mcv = have_data = true;
+				continue;
+			}
+			if (DatumGetBool(FunctionCall2(&opproc, values[i], tmin)))
+			{
+				tmin = values[i];
+				tmin_is_mcv = true;
 			}
-			else if (DatumGetBool(FunctionCall2(&opproc, tmax, values[i])))
+			if (DatumGetBool(FunctionCall2(&opproc, tmax, values[i])))
 			{
 				tmax = values[i];
-				large_mcv = true;
+				tmax_is_mcv = true;
 			}
 		}
-		if (large_mcv)
+		if (tmin_is_mcv)
+			tmin = datumCopy(tmin, typByVal, typLen);
+		if (tmax_is_mcv)
 			tmax = datumCopy(tmax, typByVal, typLen);
 		free_attstatsslot(vardata->atttype, values, nvalues, NULL, 0);
 	}
 
+	*min = tmin;
 	*max = tmax;
-	return have_max;
+	return have_data;
 }
 
 
@@ -3941,9 +4128,9 @@ get_variable_maximum(PlannerInfo *root, VariableStatData *vardata,
  *
  * *prefix is set to a palloc'd prefix string (in the form of a Const node),
  *	or to NULL if no fixed prefix exists for the pattern.
- * *rest is set to a palloc'd Const representing the remainder of the pattern
- *	after the portion describing the fixed prefix.
- * Each of these has the same type (TEXT or BYTEA) as the given pattern Const.
+ * If rest_selec is not NULL, *rest_selec is set to an estimate of the
+ *	selectivity of the remainder of the pattern (without any fixed prefix).
+ * The prefix Const has the same type (TEXT or BYTEA) as the input pattern.
  *
  * The return value distinguishes no fixed prefix, a partial prefix,
  * or an exact-match-only pattern.
@@ -3951,12 +4138,11 @@ get_variable_maximum(PlannerInfo *root, VariableStatData *vardata,
 
 static Pattern_Prefix_Status
 like_fixed_prefix(Const *patt_const, bool case_insensitive,
-				  Const **prefix_const, Const **rest_const)
+				  Const **prefix_const, Selectivity *rest_selec)
 {
 	char	   *match;
 	char	   *patt;
 	int			pattlen;
-	char	   *rest;
 	Oid			typeid = patt_const->consttype;
 	int			pos,
 				match_pos;
@@ -4024,18 +4210,15 @@ like_fixed_prefix(Const *patt_const, bool case_insensitive,
 	}
 
 	match[match_pos] = '\0';
-	rest = &patt[pos];
 
 	if (typeid != BYTEAOID)
-	{
 		*prefix_const = string_to_const(match, typeid);
-		*rest_const = string_to_const(rest, typeid);
-	}
 	else
-	{
 		*prefix_const = string_to_bytea_const(match, match_pos);
-		*rest_const = string_to_bytea_const(rest, pattlen - pos);
-	}
+
+	if (rest_selec != NULL)
+		*rest_selec = like_selectivity(&patt[pos], pattlen - pos,
+									   case_insensitive);
 
 	pfree(patt);
 	pfree(match);
@@ -4052,19 +4235,11 @@ like_fixed_prefix(Const *patt_const, bool case_insensitive,
 
 static Pattern_Prefix_Status
 regex_fixed_prefix(Const *patt_const, bool case_insensitive,
-				   Const **prefix_const, Const **rest_const)
+				   Const **prefix_const, Selectivity *rest_selec)
 {
-	char	   *match;
-	int			pos,
-				match_pos,
-				prev_pos,
-				prev_match_pos;
-	bool		have_leading_paren;
-	char	   *patt;
-	char	   *rest;
 	Oid			typeid = patt_const->consttype;
-	bool		is_basic = regex_flavor_is_basic();
-	bool		is_multibyte = (pg_database_encoding_max_length() > 1);
+	char	   *prefix;
+	bool		exact;
 
 	/*
 	 * Should be unnecessary, there are no bytea regex operators defined. As
@@ -4076,197 +4251,75 @@ regex_fixed_prefix(Const *patt_const, bool case_insensitive,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 		 errmsg("regular-expression matching not supported on type bytea")));
 
-	/* the right-hand const is type text for all of these */
-	patt = DatumGetCString(DirectFunctionCall1(textout, patt_const->constvalue));
+	/* Use the regexp machinery to extract the prefix, if any */
+	prefix = regexp_fixed_prefix(DatumGetTextPP(patt_const->constvalue),
+								 case_insensitive,
+								 &exact);
 
-	/*
-	 * Check for ARE director prefix.  It's worth our trouble to recognize
-	 * this because similar_escape() uses it.
-	 */
-	pos = 0;
-	if (strncmp(patt, "***:", 4) == 0)
-	{
-		pos = 4;
-		is_basic = false;
-	}
-
-	/* Pattern must be anchored left */
-	if (patt[pos] != '^')
+	if (prefix == NULL)
 	{
-		rest = patt;
-
 		*prefix_const = NULL;
-		*rest_const = string_to_const(rest, typeid);
-
-		return Pattern_Prefix_None;
-	}
-	pos++;
 
-	/*
-	 * If '|' is present in pattern, then there may be multiple alternatives
-	 * for the start of the string.  (There are cases where this isn't so,
-	 * for instance if the '|' is inside parens, but detecting that reliably
-	 * is too hard.)
-	 */
-	if (strchr(patt + pos, '|') != NULL)
-	{
-		rest = patt;
+		if (rest_selec != NULL)
+		{
+			char   *patt = DatumGetCString(DirectFunctionCall1(textout, patt_const->constvalue));
 
-		*prefix_const = NULL;
-		*rest_const = string_to_const(rest, typeid);
+			*rest_selec = regex_selectivity(patt, strlen(patt),
+											case_insensitive,
+											0);
+			pfree(patt);
+		}
 
 		return Pattern_Prefix_None;
 	}
 
-	/* OK, allocate space for pattern */
-	match = palloc(strlen(patt) + 1);
-	prev_match_pos = match_pos = 0;
+	*prefix_const = string_to_const(prefix, typeid);
 
-	/*
-	 * We special-case the syntax '^(...)$' because psql uses it.  But beware:
-	 * in BRE mode these parentheses are just ordinary characters.  Also,
-	 * sequences beginning "(?" are not what they seem, unless they're "(?:".
-	 * (We should recognize that, too, because of similar_escape().)
-	 *
-	 * Note: it's a bit bogus to be depending on the current regex_flavor
-	 * setting here, because the setting could change before the pattern is
-	 * used.  We minimize the risk by trusting the flavor as little as we can,
-	 * but perhaps it would be a good idea to get rid of the "basic" setting.
-	 */
-	have_leading_paren = false;
-	if (patt[pos] == '(' && !is_basic &&
-		(patt[pos + 1] != '?' || patt[pos + 2] == ':'))
-	{
-		have_leading_paren = true;
-		pos += (patt[pos + 1] != '?' ? 1 : 3);
-	}
-
-	/* Scan remainder of pattern */
-	prev_pos = pos;
-	while (patt[pos])
+	if (rest_selec != NULL)
 	{
-		int			len;
-
-		/*
-		 * Check for characters that indicate multiple possible matches here.
-		 * Also, drop out at ')' or '$' so the termination test works right.
-		 */
-		if (patt[pos] == '.' ||
-			patt[pos] == '(' ||
-			patt[pos] == ')' ||
-			patt[pos] == '[' ||
-			patt[pos] == '^' ||
-			patt[pos] == '$')
-			break;
-
-		/*
-		 * XXX In multibyte character sets, we can't trust isalpha, so assume
-		 * any multibyte char is potentially case-varying.
-		 */
-		if (case_insensitive)
-		{
-			if (is_multibyte && (unsigned char) patt[pos] >= 0x80)
-				break;
-			if (isalpha((unsigned char) patt[pos]))
-				break;
-		}
-
-		/*
-		 * Check for quantifiers.  Except for +, this means the preceding
-		 * character is optional, so we must remove it from the prefix too!
-		 * Note: in BREs, \{ is a quantifier.
-		 */
-		if (patt[pos] == '*' ||
-			patt[pos] == '?' ||
-			patt[pos] == '{' ||
-			(patt[pos] == '\\' && patt[pos + 1] == '{'))
+		if (exact)
 		{
-			match_pos = prev_match_pos;
-			pos = prev_pos;
-			break;
+			/* Exact match, so there's no additional selectivity */
+			*rest_selec = 1.0;
 		}
-		if (patt[pos] == '+')
+		else
 		{
-			pos = prev_pos;
-			break;
-		}
+			char   *patt = DatumGetCString(DirectFunctionCall1(textout, patt_const->constvalue));
 
-		/*
-		 * Normally, backslash quotes the next character.  But in AREs,
-		 * backslash followed by alphanumeric is an escape, not a quoted
-		 * character.  Must treat it as having multiple possible matches.
-		 * In BREs, \( is a parenthesis, so don't trust that either.
-		 * Note: since only ASCII alphanumerics are escapes, we don't have
-		 * to be paranoid about multibyte here.
-		 */
-		if (patt[pos] == '\\')
-		{
-			if (isalnum((unsigned char) patt[pos + 1]) || patt[pos + 1] == '(')
-				break;
-			pos++;
-			if (patt[pos] == '\0')
-				break;
+			*rest_selec = regex_selectivity(patt, strlen(patt),
+											case_insensitive,
+											strlen(prefix));
+			pfree(patt);
 		}
-		/* save position in case we need to back up on next loop cycle */
-		prev_match_pos = match_pos;
-		prev_pos = pos;
-		/* must use encoding-aware processing here */
-		len = pg_mblen(&patt[pos]);
-		memcpy(&match[match_pos], &patt[pos], len);
-		match_pos += len;
-		pos += len;
 	}
 
-	match[match_pos] = '\0';
-	rest = &patt[pos];
-
-	if (have_leading_paren && patt[pos] == ')')
-		pos++;
-
-	if (patt[pos] == '$' && patt[pos + 1] == '\0')
-	{
-		rest = &patt[pos + 1];
-
-		*prefix_const = string_to_const(match, typeid);
-		*rest_const = string_to_const(rest, typeid);
-
-		pfree(patt);
-		pfree(match);
+	pfree(prefix);
 
+	if (exact)
 		return Pattern_Prefix_Exact;	/* pattern specifies exact match */
-	}
-
-	*prefix_const = string_to_const(match, typeid);
-	*rest_const = string_to_const(rest, typeid);
-
-	pfree(patt);
-	pfree(match);
-
-	if (match_pos > 0)
+	else
 		return Pattern_Prefix_Partial;
-
-	return Pattern_Prefix_None;
 }
 
 Pattern_Prefix_Status
 pattern_fixed_prefix(Const *patt, Pattern_Type ptype,
-					 Const **prefix, Const **rest)
+					 Const **prefix, Selectivity *rest_selec)
 {
 	Pattern_Prefix_Status result;
 
 	switch (ptype)
 	{
 		case Pattern_Type_Like:
-			result = like_fixed_prefix(patt, false, prefix, rest);
+			result = like_fixed_prefix(patt, false, prefix, rest_selec);
 			break;
 		case Pattern_Type_Like_IC:
-			result = like_fixed_prefix(patt, true, prefix, rest);
+			result = like_fixed_prefix(patt, true, prefix, rest_selec);
 			break;
 		case Pattern_Type_Regex:
-			result = regex_fixed_prefix(patt, false, prefix, rest);
+			result = regex_fixed_prefix(patt, false, prefix, rest_selec);
 			break;
 		case Pattern_Type_Regex_IC:
-			result = regex_fixed_prefix(patt, true, prefix, rest);
+			result = regex_fixed_prefix(patt, true, prefix, rest_selec);
 			break;
 		default:
 			elog(ERROR, "unrecognized ptype: %d", (int) ptype);
@@ -4326,7 +4379,7 @@ prefix_selectivity(VariableStatData *vardata,
 	 *-------
 	 */
 	cmpopr = get_opfamily_member(opfamily, vartype, vartype,
-								BTLessStrategyNumber);
+								 BTLessStrategyNumber);
 	if (cmpopr == InvalidOid)
 		elog(ERROR, "no < operator for opfamily %u", opfamily);
 	fmgr_info(get_opcode(cmpopr), &opproc);
@@ -4366,7 +4419,8 @@ prefix_selectivity(VariableStatData *vardata,
 
 /*
  * Estimate the selectivity of a pattern of the specified type.
- * Note that any fixed prefix of the pattern will have been removed already.
+ * Note that any fixed prefix of the pattern will have been removed already,
+ * so actually we may be looking at just a fragment of the pattern.
  *
  * For now, we use a very simplistic approach: fixed characters reduce the
  * selectivity a good deal, character ranges reduce it a little,
@@ -4379,42 +4433,16 @@ prefix_selectivity(VariableStatData *vardata,
 #define FIXED_CHAR_SEL	0.20	/* about 1/5 */
 #define CHAR_RANGE_SEL	0.25
 #define ANY_CHAR_SEL	0.99	/* not 1, since it won't match end-of-string */
+#define FULL_WILDCARD_SEL 5.0
 #define CDB_RANCHOR_SEL 0.95
 #define CDB_ROLLOFF_SEL 0.14
 
 static Selectivity
-like_selectivity(Const *patt_const, bool case_insensitive)
+like_selectivity(const char *patt, int pattlen, bool case_insensitive)
 {
 	Selectivity sel = 1.0;
     Selectivity fixed_char_sel = FIXED_CHAR_SEL;
 	int			pos;
-	Oid			typeid = patt_const->consttype;
-	char	   *patt;
-	int			pattlen;
-
-	/* the right-hand const is type text or bytea */
-	Assert(typeid == BYTEAOID || typeid == TEXTOID);
-
-	if (typeid == BYTEAOID && case_insensitive)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-		   errmsg("case insensitive matching not supported on type bytea")));
-
-	if (typeid != BYTEAOID)
-	{
-		patt = DatumGetCString(DirectFunctionCall1(textout, patt_const->constvalue));
-		pattlen = strlen(patt);
-	}
-	else
-	{
-		bytea	   *bstr = DatumGetByteaP(patt_const->constvalue);
-
-		pattlen = VARSIZE(bstr) - VARHDRSZ;
-		patt = (char *) palloc(pattlen);
-		memcpy(patt, VARDATA(bstr), pattlen);
-		if ((Pointer) bstr != DatumGetPointer(patt_const->constvalue))
-			pfree(bstr);
-	}
 
 	/* Skip any leading %; it's already factored into initial sel */
 	for (pos = 0; pos < pattlen; pos++)
@@ -4457,7 +4485,7 @@ like_selectivity(Const *patt_const, bool case_insensitive)
 }
 
 static Selectivity
-regex_selectivity_sub(char *patt, int pattlen, bool case_insensitive)
+regex_selectivity_sub(const char *patt, int pattlen, bool case_insensitive)
 {
 	Selectivity sel = 1.0;
     Selectivity fixed_char_sel = FIXED_CHAR_SEL;
@@ -4550,26 +4578,10 @@ regex_selectivity_sub(char *patt, int pattlen, bool case_insensitive)
 }
 
 static Selectivity
-regex_selectivity(Const *patt_const, bool case_insensitive)
+regex_selectivity(const char *patt, int pattlen, bool case_insensitive,
+				  int fixed_prefix_len)
 {
 	Selectivity sel;
-	char	   *patt;
-	int			pattlen;
-	Oid			typeid = patt_const->consttype;
-
-	/*
-	 * Should be unnecessary, there are no bytea regex operators defined. As
-	 * such, it should be noted that the rest of this function has *not* been
-	 * made safe for binary (possibly NULL containing) strings.
-	 */
-	if (typeid == BYTEAOID)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-		 errmsg("regular-expression matching not supported on type bytea")));
-
-	/* the right-hand const is type text for all of these */
-	patt = DatumGetCString(DirectFunctionCall1(textout, patt_const->constvalue));
-	pattlen = strlen(patt);
 
 	/* If patt doesn't end with $, consider it to have a trailing wildcard */
 	if (pattlen > 0 && patt[pattlen - 1] == '$' &&
@@ -4583,35 +4595,16 @@ regex_selectivity(Const *patt_const, bool case_insensitive)
 	{
 		/* no trailing $ */
 		sel = regex_selectivity_sub(patt, pattlen, case_insensitive);
+		sel *= FULL_WILDCARD_SEL;
 	}
-	return sel;
-}
 
-static Selectivity
-pattern_selectivity(Const *patt, Pattern_Type ptype)
-{
-	Selectivity result;
+	/* If there's a fixed prefix, discount its selectivity */
+	if (fixed_prefix_len > 0)
+		sel /= pow(FIXED_CHAR_SEL, fixed_prefix_len);
 
-	switch (ptype)
-	{
-		case Pattern_Type_Like:
-			result = like_selectivity(patt, false);
-			break;
-		case Pattern_Type_Like_IC:
-			result = like_selectivity(patt, true);
-			break;
-		case Pattern_Type_Regex:
-			result = regex_selectivity(patt, false);
-			break;
-		case Pattern_Type_Regex_IC:
-			result = regex_selectivity(patt, true);
-			break;
-		default:
-			elog(ERROR, "unrecognized ptype: %d", (int) ptype);
-			result = 1.0;		/* keep compiler quiet */
-			break;
-	}
-	return result;
+	/* Make sure result stays in range */
+	CLAMP_PROBABILITY(sel);
+	return sel;
 }
 
 
@@ -4630,7 +4623,7 @@ pattern_selectivity(Const *patt, Pattern_Type ptype)
  * that is not a bulletproof guarantee that an extension of the string might
  * not sort after it; an example is that "foo " is less than "foo!", but it
  * is not clear that a "dictionary" sort ordering will consider "foo!" less
- * than "foo bar".  CAUTION: Therefore, this function should be used only for
+ * than "foo bar".	CAUTION: Therefore, this function should be used only for
  * estimation purposes when working in a non-C locale.
  *
  * To try to catch most cases where an extended string might otherwise sort
@@ -4656,11 +4649,10 @@ make_greater_string(const Const *str_const, FmgrInfo *ltproc)
 	text	   *cmptxt = NULL;
 
 	/*
-	 * Get a modifiable copy of the prefix string in C-string format,
-	 * and set up the string we will compare to as a Datum.  In C locale
-	 * this can just be the given prefix string, otherwise we need to add
-	 * a suffix.  Types NAME and BYTEA sort bytewise so they don't need
-	 * a suffix either.
+	 * Get a modifiable copy of the prefix string in C-string format, and set
+	 * up the string we will compare to as a Datum.  In C locale this can just
+	 * be the given prefix string, otherwise we need to add a suffix.  Types
+	 * NAME and BYTEA sort bytewise so they don't need a suffix either.
 	 */
 	if (datatype == NAMEOID)
 	{
@@ -4694,7 +4686,7 @@ make_greater_string(const Const *str_const, FmgrInfo *ltproc)
 
 			if (!suffixchar)
 			{
-				char *best;
+				char	   *best;
 
 				best = "Z";
 				if (varstr_cmp(best, 1, "z", 1) < 0)
@@ -4809,7 +4801,8 @@ string_to_const(const char *str, Oid datatype)
 {
 	Datum		conval = string_to_datum(str, datatype);
 
-	return makeConst(datatype, -1, ((datatype == NAMEOID) ? NAMEDATALEN : -1),
+	return makeConst(datatype, -1,
+					 ((datatype == NAMEOID) ? NAMEDATALEN : -1),
 					 conval, false, false);
 }
 
@@ -4865,36 +4858,38 @@ genericcostestimate(PlannerInfo *root,
 	List	   *selectivityQuals;
 	ListCell   *l;
 
-	/*
+	/*----------
 	 * If the index is partial, AND the index predicate with the explicitly
 	 * given indexquals to produce a more accurate idea of the index
-	 * selectivity.  This may produce redundant clauses.  We get rid of exact
-	 * duplicates in the code below.  We expect that most cases of partial
-	 * redundancy (such as "x < 4" from the qual and "x < 5" from the
-	 * predicate) will be recognized and handled correctly by
-	 * clauselist_selectivity().  This assumption is somewhat fragile, since
-	 * it depends on predicate_implied_by() and clauselist_selectivity()
-	 * having similar capabilities, and there are certainly many cases where
-	 * we will end up with a too-low selectivity estimate.	This will bias the
-	 * system in favor of using partial indexes where possible, which is not
-	 * necessarily a bad thing. But it'd be nice to do better someday.
+	 * selectivity.  However, we need to be careful not to insert redundant
+	 * clauses, because clauselist_selectivity() is easily fooled into
+	 * computing a too-low selectivity estimate.  Our approach is to add
+	 * only the index predicate clause(s) that cannot be proven to be implied
+	 * by the given indexquals.  This successfully handles cases such as a
+	 * qual "x = 42" used with a partial index "WHERE x >= 40 AND x < 50".
+	 * There are many other cases where we won't detect redundancy, leading
+	 * to a too-low selectivity estimate, which will bias the system in favor
+	 * of using partial indexes where possible.  That is not necessarily bad
+	 * though.
 	 *
-	 * Note that index->indpred and indexQuals are both in implicit-AND form,
-	 * so ANDing them together just takes merging the lists.  However,
-	 * eliminating duplicates is a bit trickier because indexQuals contains
-	 * RestrictInfo nodes and the indpred does not.  It is okay to pass a
-	 * mixed list to clauselist_selectivity, but we have to work a bit to
-	 * generate a list without logical duplicates.	(We could just list_union
-	 * indpred and strippedQuals, but then we'd not get caching of per-qual
-	 * selectivity estimates.)
+	 * Note that indexQuals contains RestrictInfo nodes while the indpred
+	 * does not.  This is OK for both predicate_implied_by() and
+	 * clauselist_selectivity().
+	 *----------
 	 */
 	if (index->indpred != NIL)
 	{
-		List	   *strippedQuals;
-		List	   *predExtraQuals;
+		List	   *predExtraQuals = NIL;
 
-		strippedQuals = get_actual_clauses(indexQuals);
-		predExtraQuals = list_difference(index->indpred, strippedQuals);
+		foreach(l, index->indpred)
+		{
+			Node	   *predQual = (Node *) lfirst(l);
+			List	   *oneQual = list_make1(predQual);
+
+			if (!predicate_implied_by(oneQual, indexQuals))
+				predExtraQuals = list_concat(predExtraQuals, oneQual);
+		}
+		/* list_concat avoids modifying the passed-in indexQuals list */
 		selectivityQuals = list_concat(predExtraQuals, indexQuals);
 	}
 	else
@@ -5048,7 +5043,7 @@ genericcostestimate(PlannerInfo *root,
 	 * evaluated once at the start of the scan to reduce them to runtime keys
 	 * to pass to the index AM (see nodeIndexscan.c).  We model the per-tuple
 	 * CPU costs as cpu_index_tuple_cost plus one cpu_operator_cost per
-	 * indexqual operator.  Because we have numIndexTuples as a per-scan
+	 * indexqual operator.	Because we have numIndexTuples as a per-scan
 	 * number, we have to multiply by num_sa_scans to get the correct result
 	 * for ScalarArrayOpExpr cases.
 	 *
@@ -5068,17 +5063,17 @@ genericcostestimate(PlannerInfo *root,
 	*indexTotalCost += numIndexTuples * num_sa_scans * (cpu_index_tuple_cost + qual_op_cost);
 
 	/*
-	 * We also add a CPU-cost component to represent the general costs of 
-	 * starting an indexscan, such as analysis of btree index keys and
-	 * initial tree descent.  This is estimated at 100x cpu_operator_cost,
-	 * which is a bit arbitrary but seems the right order of magnitude.
-	 * (As noted above, we don't charge any I/O for touching upper tree
-	 * levels, but charging nothing at all has been found too optimistic.)
+	 * We also add a CPU-cost component to represent the general costs of
+	 * starting an indexscan, such as analysis of btree index keys and initial
+	 * tree descent.  This is estimated at 100x cpu_operator_cost, which is a
+	 * bit arbitrary but seems the right order of magnitude. (As noted above,
+	 * we don't charge any I/O for touching upper tree levels, but charging
+	 * nothing at all has been found too optimistic.)
 	 *
-	 * Although this is startup cost with respect to any one scan, we add
-	 * it to the "total" cost component because it's only very interesting
-	 * in the many-ScalarArrayOpExpr-scan case, and there it will be paid
-	 * over the life of the scan node.
+	 * Although this is startup cost with respect to any one scan, we add it
+	 * to the "total" cost component because it's only very interesting in the
+	 * many-ScalarArrayOpExpr-scan case, and there it will be paid over the
+	 * life of the scan node.
 	 */
 	*indexTotalCost += num_sa_scans * 100.0 * cpu_operator_cost;
 
@@ -5108,9 +5103,9 @@ btcostestimate(PG_FUNCTION_ARGS)
 	int			indexcol;
 	bool		eqQualHere;
 	bool		found_saop;
+	bool		found_null_op;
 	double		num_sa_scans;
 	ListCell   *l;
-	cqContext  *stacqCtx;
 
     /*
      * CDB: Tell caller how many leading indexcols are matched by '=' quals.
@@ -5142,6 +5137,7 @@ btcostestimate(PG_FUNCTION_ARGS)
 	indexcol = 0;
 	eqQualHere = false;
 	found_saop = false;
+	found_null_op = false;
 	num_sa_scans = 1;
 	foreach(l, indexQuals)
 	{
@@ -5151,6 +5147,7 @@ btcostestimate(PG_FUNCTION_ARGS)
 				   *rightop;
 		Oid			clause_op;
 		int			op_strategy;
+		bool		is_null_op = false;
 
 		Assert(IsA(rinfo, RestrictInfo));
 		clause = rinfo->clause;
@@ -5177,6 +5174,17 @@ btcostestimate(PG_FUNCTION_ARGS)
 			clause_op = saop->opno;
 			found_saop = true;
 		}
+		else if (IsA(clause, NullTest))
+		{
+			NullTest   *nt = (NullTest *) clause;
+
+			Assert(nt->nulltesttype == IS_NULL);
+			leftop = (Node *) nt->arg;
+			rightop = NULL;
+			clause_op = InvalidOid;
+			found_null_op = true;
+			is_null_op = true;
+		}
 		else
 		{
 			elog(ERROR, "unsupported indexqual type: %d",
@@ -5214,18 +5222,30 @@ btcostestimate(PG_FUNCTION_ARGS)
 				break;
 			}
 		}
-		op_strategy = get_op_opfamily_strategy(clause_op,
-											   index->opfamily[indexcol]);
-		Assert(op_strategy != 0);		/* not a member of opfamily?? */
-		if (op_strategy == BTEqualStrategyNumber)
-        {
+		/* check for equality operator */
+		if (is_null_op)
+		{
+			/* IS NULL is like = for purposes of selectivity determination */
 			eqQualHere = true;
 
             /* CDB: Count leading indexcols having '=' quals. */
             if (!IsA(clause, ScalarArrayOpExpr))
                 index->num_leading_eq = indexcol + 1;
-        }
+		}
+		else
+		{
+			op_strategy = get_op_opfamily_strategy(clause_op,
+												   index->opfamily[indexcol]);
+			Assert(op_strategy != 0);	/* not a member of opfamily?? */
+			if (op_strategy == BTEqualStrategyNumber)
+			{
+				eqQualHere = true;
 
+				/* CDB: Count leading indexcols having '=' quals. */
+				if (!IsA(clause, ScalarArrayOpExpr))
+					index->num_leading_eq = indexcol + 1;
+			}
+		}
 		/* count up number of SA scans induced by indexBoundQuals only */
 		if (IsA(clause, ScalarArrayOpExpr))
 		{
@@ -5241,10 +5261,14 @@ btcostestimate(PG_FUNCTION_ARGS)
 	/*
 	 * If index is unique and we found an '=' clause for each column, we can
 	 * just assume numIndexTuples = 1 and skip the expensive
-	 * clauselist_selectivity calculations.
+	 * clauselist_selectivity calculations.  However, a ScalarArrayOp or
+	 * NullTest invalidates that theory, even though it sets eqQualHere.
 	 */
 	if (index->unique &&
-        index->num_leading_eq == index->ncolumns)
+        index->num_leading_eq == index->ncolumns &&
+		eqQualHere &&
+		!found_saop &&
+		!found_null_op)
 		numIndexTuples = 1.0;
 	else
 	{
@@ -5255,10 +5279,11 @@ btcostestimate(PG_FUNCTION_ARGS)
 												  JOIN_INNER,
 												  false /* use_damping */);
 		numIndexTuples = btreeSelectivity * index->rel->tuples;
+
 		/*
 		 * As in genericcostestimate(), we have to adjust for any
-		 * ScalarArrayOpExpr quals included in indexBoundQuals, and then
-		 * round to integer.
+		 * ScalarArrayOpExpr quals included in indexBoundQuals, and then round
+		 * to integer.
 		 */
 		numIndexTuples = rint(numIndexTuples / num_sa_scans);
 	}
@@ -5296,15 +5321,10 @@ btcostestimate(PG_FUNCTION_ARGS)
 		colnum = 1;
 	}
 
-	stacqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_statistic "
-				" WHERE starelid = :1 "
-				" AND staattnum = :2 ",
-				ObjectIdGetDatum(relid),
-				Int16GetDatum(colnum)));
-
-	tuple = caql_getnext(stacqCtx);
+	tuple = SearchSysCache(STATRELATT,
+						   ObjectIdGetDatum(relid),
+						   Int16GetDatum(colnum),
+						   0, 0);
 
 	if (HeapTupleIsValid(tuple))
 	{
@@ -5328,8 +5348,25 @@ btcostestimate(PG_FUNCTION_ARGS)
 
 			free_attstatsslot(InvalidOid, NULL, 0, numbers, nnumbers);
 		}
+		else if (get_attstatsslot(tuple, InvalidOid, 0,
+								  STATISTIC_KIND_CORRELATION,
+								  index->revsortop[0],
+								  NULL, NULL, &numbers, &nnumbers))
+		{
+			double		varCorrelation;
+
+			Assert(nnumbers == 1);
+			varCorrelation = numbers[0];
+
+			if (index->ncolumns > 1)
+				*indexCorrelation = -varCorrelation * 0.75;
+			else
+				*indexCorrelation = -varCorrelation;
+
+			free_attstatsslot(InvalidOid, NULL, 0, numbers, nnumbers);
+		}
+		ReleaseSysCache(tuple);
 	}
-	caql_endscan(stacqCtx);
 
 	PG_RETURN_VOID();
 }
@@ -5383,7 +5420,7 @@ gincostestimate(PG_FUNCTION_ARGS)
 	Cost	   *indexTotalCost = (Cost *) PG_GETARG_POINTER(5);
 	Selectivity *indexSelectivity = (Selectivity *) PG_GETARG_POINTER(6);
 	double	   *indexCorrelation = (double *) PG_GETARG_POINTER(7);
-	
+
 	genericcostestimate(root, index, indexQuals, outer_rel, 0.0,
 						indexStartupCost, indexTotalCost,
 						indexSelectivity, indexCorrelation);
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 6b8be6215630..36fea6efd97b 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -363,10 +363,8 @@ currtid_byreloid(PG_FUNCTION_ARGS)
 	/*
 	 * Immediately inform client that the function is not supported
 	 */
-
 	elog(ERROR, "Function currtid is not supported by GPDB");
 
-
 	result = (ItemPointer) palloc(sizeof(ItemPointerData));
 	if (!reloid)
 	{
@@ -415,7 +413,6 @@ currtid_byrelname(PG_FUNCTION_ARGS)
 	/*
 	 * Immediately inform client that the function is not supported
 	 */
-
 	elog(ERROR, "Function currtid2 is not supported by GPDB");
 
 	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 9d5e92b2268d..af67ec9a223c 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.173 2007/02/19 17:41:39 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.184.2.2 2009/04/04 04:53:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2717,12 +2717,17 @@ interval_hash(PG_FUNCTION_ARGS)
 {
 	Interval   *interval = PG_GETARG_INTERVAL_P(0);
 	TimeOffset	span = interval_cmp_value(interval);
+	uint32		thash;
 
 #ifdef HAVE_INT64_TIMESTAMP
-	return DirectFunctionCall1(hashint8, Int64GetDatumFast(span));
+	thash = DatumGetUInt32(DirectFunctionCall1(hashint8,
+											   Int64GetDatumFast(span)));
 #else
-	return DirectFunctionCall1(hashfloat8, Float8GetDatumFast(span));
+	thash = DatumGetUInt32(DirectFunctionCall1(hashfloat8,
+											   Float8GetDatumFast(span)));
 #endif
+
+	PG_RETURN_UINT32(thash);
 }
 
 /* overlaps_timestamp() --- implements the SQL92 OVERLAPS operator.
@@ -3952,187 +3957,6 @@ timestamptz_li_value(float8 f, TimestampTz y0, TimestampTz y1)
  *	Conversion operators.
  *---------------------------------------------------------*/
 
-/* timestamp_text()
- * Convert timestamp to text data type.
- */
-Datum
-timestamp_text(PG_FUNCTION_ARGS)
-{
-	/* Input is a Timestamp, but may as well leave it in Datum form */
-	Datum		timestamp = PG_GETARG_DATUM(0);
-	text	   *result;
-	char	   *str;
-	int			len;
-
-	str = DatumGetCString(DirectFunctionCall1(timestamp_out, timestamp));
-
-	len = (strlen(str) + VARHDRSZ);
-
-	result = palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
-/* text_timestamp()
- * Convert text string to timestamp.
- * Text type is not null terminated, so use temporary string
- *	then call the standard input routine.
- */
-Datum
-text_timestamp(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			i;
-	char	   *sp,
-			   *dp,
-				dstr[MAXDATELEN + 1];
-
-	if (VARSIZE(str) - VARHDRSZ > MAXDATELEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
-				 errmsg("invalid input syntax for type timestamp: \"%s\"",
-						DatumGetCString(DirectFunctionCall1(textout,
-												   PointerGetDatum(str))))));
-
-	sp = VARDATA(str);
-	dp = dstr;
-	for (i = 0; i < VARSIZE(str) - VARHDRSZ; i++)
-		*dp++ = *sp++;
-	*dp = '\0';
-
-	return DirectFunctionCall3(timestamp_in,
-							   CStringGetDatum(dstr),
-							   ObjectIdGetDatum(InvalidOid),
-							   Int32GetDatum(-1));
-}
-
-
-/* timestamptz_text()
- * Convert timestamp with time zone to text data type.
- */
-Datum
-timestamptz_text(PG_FUNCTION_ARGS)
-{
-	/* Input is a Timestamp, but may as well leave it in Datum form */
-	Datum		timestamp = PG_GETARG_DATUM(0);
-	text	   *result;
-	char	   *str;
-	int			len;
-
-	str = DatumGetCString(DirectFunctionCall1(timestamptz_out, timestamp));
-
-	len = strlen(str) + VARHDRSZ;
-
-	result = palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, (len - VARHDRSZ));
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-/* text_timestamptz()
- * Convert text string to timestamp with time zone.
- * Text type is not null terminated, so use temporary string
- *	then call the standard input routine.
- */
-Datum
-text_timestamptz(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			i;
-	char	   *sp,
-			   *dp,
-				dstr[MAXDATELEN + 1];
-
-	if (VARSIZE(str) - VARHDRSZ > MAXDATELEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
-				 errmsg("invalid input syntax for type timestamp with time zone: \"%s\"",
-						DatumGetCString(DirectFunctionCall1(textout,
-												   PointerGetDatum(str))))));
-
-	sp = VARDATA(str);
-	dp = dstr;
-	for (i = 0; i < VARSIZE(str) - VARHDRSZ; i++)
-		*dp++ = *sp++;
-	*dp = '\0';
-
-	return DirectFunctionCall3(timestamptz_in,
-							   CStringGetDatum(dstr),
-							   ObjectIdGetDatum(InvalidOid),
-							   Int32GetDatum(-1));
-}
-
-
-/* interval_text()
- * Convert interval to text data type.
- */
-Datum
-interval_text(PG_FUNCTION_ARGS)
-{
-	Interval   *interval = PG_GETARG_INTERVAL_P(0);
-	text	   *result;
-	char	   *str;
-	int			len;
-
-	str = DatumGetCString(DirectFunctionCall1(interval_out,
-											  IntervalPGetDatum(interval)));
-
-	len = strlen(str) + VARHDRSZ;
-
-	result = palloc(len);
-
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), str, len - VARHDRSZ);
-
-	pfree(str);
-
-	PG_RETURN_TEXT_P(result);
-}
-
-
-/* text_interval()
- * Convert text string to interval.
- * Text type may not be null terminated, so copy to temporary string
- *	then call the standard input routine.
- */
-Datum
-text_interval(PG_FUNCTION_ARGS)
-{
-	text	   *str = PG_GETARG_TEXT_P(0);
-	int			i;
-	char	   *sp,
-			   *dp,
-				dstr[MAXDATELEN + 1];
-
-	if (VARSIZE(str) - VARHDRSZ > MAXDATELEN)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_DATETIME_FORMAT),
-				 errmsg("invalid input syntax for type interval: \"%s\"",
-						DatumGetCString(DirectFunctionCall1(textout,
-												   PointerGetDatum(str))))));
-
-	sp = VARDATA(str);
-	dp = dstr;
-	for (i = 0; i < (VARSIZE(str) - VARHDRSZ); i++)
-		*dp++ = *sp++;
-	*dp = '\0';
-
-	return DirectFunctionCall3(interval_in,
-							   CStringGetDatum(dstr),
-							   ObjectIdGetDatum(InvalidOid),
-							   Int32GetDatum(-1));
-}
-
 
 /* timestamp_trunc()
  * Truncate timestamp to specified units.
diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c
new file mode 100644
index 000000000000..96510021f6de
--- /dev/null
+++ b/src/backend/utils/adt/tsginidx.c
@@ -0,0 +1,165 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsginidx.c
+ *	 GIN support functions for tsvector_ops
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.9 2008/01/01 19:45:52 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/skey.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+
+
+Datum
+gin_extract_tsvector(PG_FUNCTION_ARGS)
+{
+	TSVector	vector = PG_GETARG_TSVECTOR(0);
+	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
+	Datum	   *entries = NULL;
+
+	*nentries = vector->size;
+	if (vector->size > 0)
+	{
+		int			i;
+		WordEntry  *we = ARRPTR(vector);
+
+		entries = (Datum *) palloc(sizeof(Datum) * vector->size);
+
+		for (i = 0; i < vector->size; i++)
+		{
+			text	   *txt = (text *) palloc(VARHDRSZ + we->len);
+
+			SET_VARSIZE(txt, VARHDRSZ + we->len);
+			memcpy(VARDATA(txt), STRPTR(vector) + we->pos, we->len);
+
+			entries[i] = PointerGetDatum(txt);
+
+			we++;
+		}
+	}
+
+	PG_FREE_IF_COPY(vector, 0);
+	PG_RETURN_POINTER(entries);
+}
+
+Datum
+gin_extract_tsquery(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY(0);
+	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
+	StrategyNumber strategy = PG_GETARG_UINT16(2);
+	Datum	   *entries = NULL;
+
+	*nentries = 0;
+
+	if (query->size > 0)
+	{
+		int4		i,
+					j = 0,
+					len;
+		QueryItem  *item;
+
+		item = clean_NOT(GETQUERY(query), &len);
+		if (!item)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("query requires full scan, which is not supported by GIN indexes")));
+
+		item = GETQUERY(query);
+
+		for (i = 0; i < query->size; i++)
+			if (item[i].type == QI_VAL)
+				(*nentries)++;
+
+		entries = (Datum *) palloc(sizeof(Datum) * (*nentries));
+
+		for (i = 0; i < query->size; i++)
+			if (item[i].type == QI_VAL)
+			{
+				text	   *txt;
+				QueryOperand *val = &item[i].operand;
+
+				txt = (text *) palloc(VARHDRSZ + val->length);
+
+				SET_VARSIZE(txt, VARHDRSZ + val->length);
+				memcpy(VARDATA(txt), GETOPERAND(query) + val->distance, val->length);
+
+				entries[j++] = PointerGetDatum(txt);
+
+				if (strategy != TSearchWithClassStrategyNumber && val->weight != 0)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("@@ operator does not support lexeme weight restrictions in GIN index searches"),
+							 errhint("Use the @@@ operator instead.")));
+			}
+	}
+	else
+		*nentries = -1;			/* nothing can be found */
+
+	PG_FREE_IF_COPY(query, 0);
+
+	PG_RETURN_POINTER(entries);
+}
+
+typedef struct
+{
+	QueryItem  *frst;
+	bool	   *mapped_check;
+} GinChkVal;
+
+static bool
+checkcondition_gin(void *checkval, QueryOperand *val)
+{
+	GinChkVal  *gcv = (GinChkVal *) checkval;
+
+	return gcv->mapped_check[((QueryItem *) val) - gcv->frst];
+}
+
+Datum
+gin_tsquery_consistent(PG_FUNCTION_ARGS)
+{
+	bool	   *check = (bool *) PG_GETARG_POINTER(0);
+	/* StrategyNumber strategy = PG_GETARG_UINT16(1); */
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+	bool		res = FALSE;
+
+	if (query->size > 0)
+	{
+		int			i,
+					j = 0;
+		QueryItem  *item;
+		GinChkVal	gcv;
+
+		/*
+		 * check-parameter array has one entry for each value (operand) in the
+		 * query. We expand that array into mapped_check, so that there's one
+		 * entry in mapped_check for every node in the query, including
+		 * operators, to allow quick lookups in checkcondition_gin. Only the
+		 * entries corresponding operands are actually used.
+		 */
+
+		gcv.frst = item = GETQUERY(query);
+		gcv.mapped_check = (bool *) palloc(sizeof(bool) * query->size);
+
+		for (i = 0; i < query->size; i++)
+			if (item[i].type == QI_VAL)
+				gcv.mapped_check[i] = check[j++];
+
+		res = TS_execute(
+						 GETQUERY(query),
+						 &gcv,
+						 true,
+						 checkcondition_gin
+			);
+	}
+
+	PG_RETURN_BOOL(res);
+}
diff --git a/contrib/tsearch2/gistidx.c b/src/backend/utils/adt/tsgistidx.c
similarity index 72%
rename from contrib/tsearch2/gistidx.c
rename to src/backend/utils/adt/tsgistidx.c
index c32f6ee87348..72f3d77f274a 100644
--- a/contrib/tsearch2/gistidx.c
+++ b/src/backend/utils/adt/tsgistidx.c
@@ -1,49 +1,74 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/gistidx.c,v 1.16 2007/02/28 22:44:38 tgl Exp $ */
+/*-------------------------------------------------------------------------
+ *
+ * tsgistidx.c
+ *	  GiST support functions for tsvector_ops
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsgistidx.c,v 1.7 2008/01/01 19:45:52 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
 
 #include "postgres.h"
 
-#include <float.h>
-
 #include "access/gist.h"
-#include "access/itup.h"
 #include "access/tuptoaster.h"
-#include "storage/bufpage.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "utils/pg_crc.h"
+
+
+#define SIGLENINT  31			/* >121 => key will toast, so it will not work
+								 * !!! */
 
-#include "tsvector.h"
-#include "query.h"
-#include "gistidx.h"
-#include "crc32.h"
+#define SIGLEN	( sizeof(int4) * SIGLENINT )
+#define SIGLENBIT (SIGLEN * BITS_PER_BYTE)
 
-PG_FUNCTION_INFO_V1(gtsvector_in);
-Datum		gtsvector_in(PG_FUNCTION_ARGS);
+typedef char BITVEC[SIGLEN];
+typedef char *BITVECP;
 
-PG_FUNCTION_INFO_V1(gtsvector_out);
-Datum		gtsvector_out(PG_FUNCTION_ARGS);
+#define LOOPBYTE \
+			for(i=0;i<SIGLEN;i++)
 
-PG_FUNCTION_INFO_V1(gtsvector_compress);
-Datum		gtsvector_compress(PG_FUNCTION_ARGS);
+#define GETBYTE(x,i) ( *( (BITVECP)(x) + (int)( (i) / BITS_PER_BYTE ) ) )
+#define GETBITBYTE(x,i) ( ((char)(x)) >> (i) & 0x01 )
+#define CLRBIT(x,i)   GETBYTE(x,i) &= ~( 0x01 << ( (i) % BITS_PER_BYTE ) )
+#define SETBIT(x,i)   GETBYTE(x,i) |=  ( 0x01 << ( (i) % BITS_PER_BYTE ) )
+#define GETBIT(x,i) ( (GETBYTE(x,i) >> ( (i) % BITS_PER_BYTE )) & 0x01 )
 
-PG_FUNCTION_INFO_V1(gtsvector_decompress);
-Datum		gtsvector_decompress(PG_FUNCTION_ARGS);
+#define HASHVAL(val) (((unsigned int)(val)) % SIGLENBIT)
+#define HASH(sign, val) SETBIT((sign), HASHVAL(val))
 
-PG_FUNCTION_INFO_V1(gtsvector_consistent);
-Datum		gtsvector_consistent(PG_FUNCTION_ARGS);
+#define GETENTRY(vec,pos) ((SignTSVector *) DatumGetPointer((vec)->vector[(pos)].key))
+
+/*
+ * type of GiST index key
+ */
 
-PG_FUNCTION_INFO_V1(gtsvector_union);
-Datum		gtsvector_union(PG_FUNCTION_ARGS);
+typedef struct
+{
+	int32		vl_len_;		/* varlena header (do not touch directly!) */
+	int4		flag;
+	char		data[1];
+} SignTSVector;
 
-PG_FUNCTION_INFO_V1(gtsvector_same);
-Datum		gtsvector_same(PG_FUNCTION_ARGS);
+#define ARRKEY		0x01
+#define SIGNKEY		0x02
+#define ALLISTRUE	0x04
 
-PG_FUNCTION_INFO_V1(gtsvector_penalty);
-Datum		gtsvector_penalty(PG_FUNCTION_ARGS);
+#define ISARRKEY(x) ( ((SignTSVector*)(x))->flag & ARRKEY )
+#define ISSIGNKEY(x)	( ((SignTSVector*)(x))->flag & SIGNKEY )
+#define ISALLTRUE(x)	( ((SignTSVector*)(x))->flag & ALLISTRUE )
 
-PG_FUNCTION_INFO_V1(gtsvector_picksplit);
-Datum		gtsvector_picksplit(PG_FUNCTION_ARGS);
+#define GTHDRSIZE	( VARHDRSZ + sizeof(int4) )
+#define CALCGTSIZE(flag, len) ( GTHDRSIZE + ( ( (flag) & ARRKEY ) ? ((len)*sizeof(int4)) : (((flag) & ALLISTRUE) ? 0 : SIGLEN) ) )
 
-#define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
+#define GETSIGN(x)	( (BITVECP)( (char*)(x)+GTHDRSIZE ) )
+#define GETARR(x)	( (int4*)( (char*)(x)+GTHDRSIZE ) )
+#define ARRNELEM(x) ( ( VARSIZE(x) - GTHDRSIZE )/sizeof(int4) )
 
 /* Number of one-bits in an unsigned byte */
 static const uint8 number_of_ones[256] = {
@@ -68,7 +93,7 @@ static const uint8 number_of_ones[256] = {
 static int4 sizebitvec(BITVECP sign);
 
 Datum
-gtsvector_in(PG_FUNCTION_ARGS)
+gtsvectorin(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -83,9 +108,9 @@ gtsvector_in(PG_FUNCTION_ARGS)
 static int	outbuf_maxlen = 0;
 
 Datum
-gtsvector_out(PG_FUNCTION_ARGS)
+gtsvectorout(PG_FUNCTION_ARGS)
 {
-	GISTTYPE   *key = (GISTTYPE *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	SignTSVector *key = (SignTSVector *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
 	char	   *outbuf;
 
 	if (outbuf_maxlen == 0)
@@ -106,20 +131,27 @@ gtsvector_out(PG_FUNCTION_ARGS)
 }
 
 static int
-compareint(const void *a, const void *b)
+compareint(const void *va, const void *vb)
 {
-	if (*((int4 *) a) == *((int4 *) b))
+	int4		a = *((int4 *) va);
+	int4		b = *((int4 *) vb);
+
+	if (a == b)
 		return 0;
-	return (*((int4 *) a) > *((int4 *) b)) ? 1 : -1;
+	return (a > b) ? 1 : -1;
 }
 
+/*
+ * Removes duplicates from an array of int4. 'l' is
+ * size of the input array. Returns the new size of the array.
+ */
 static int
 uniqueint(int4 *a, int4 l)
 {
 	int4	   *ptr,
 			   *res;
 
-	if (l == 1)
+	if (l <= 1)
 		return l;
 
 	ptr = res = a;
@@ -135,7 +167,7 @@ uniqueint(int4 *a, int4 l)
 }
 
 static void
-makesign(BITVECP sign, GISTTYPE * a)
+makesign(BITVECP sign, SignTSVector *a)
 {
 	int4		k,
 				len = ARRNELEM(a);
@@ -154,22 +186,28 @@ gtsvector_compress(PG_FUNCTION_ARGS)
 
 	if (entry->leafkey)
 	{							/* tsvector */
-		GISTTYPE   *res;
-		tsvector   *val = (tsvector *) PG_DETOAST_DATUM(entry->key);
+		SignTSVector *res;
+		TSVector	val = DatumGetTSVector(entry->key);
 		int4		len;
 		int4	   *arr;
 		WordEntry  *ptr = ARRPTR(val);
 		char	   *words = STRPTR(val);
 
 		len = CALCGTSIZE(ARRKEY, val->size);
-		res = (GISTTYPE *) palloc(len);
+		res = (SignTSVector *) palloc(len);
 		SET_VARSIZE(res, len);
 		res->flag = ARRKEY;
 		arr = GETARR(res);
 		len = val->size;
 		while (len--)
 		{
-			*arr = crc32_sz(&words[ptr->pos], ptr->len);
+			pg_crc32	c;
+
+			INIT_LEGACY_CRC32(c);
+			COMP_LEGACY_CRC32(c, words + ptr->pos, ptr->len);
+			FIN_LEGACY_CRC32(c);
+
+			*arr = *(int4 *) &c;
 			arr++;
 			ptr++;
 		}
@@ -182,17 +220,17 @@ gtsvector_compress(PG_FUNCTION_ARGS)
 			 * val->size
 			 */
 			len = CALCGTSIZE(ARRKEY, len);
-			res = (GISTTYPE *) repalloc((void *) res, len);
+			res = (SignTSVector *) repalloc((void *) res, len);
 			SET_VARSIZE(res, len);
 		}
 
 		/* make signature, if array is too long */
 		if (VARSIZE(res) > TOAST_INDEX_TARGET)
 		{
-			GISTTYPE   *ressign;
+			SignTSVector *ressign;
 
 			len = CALCGTSIZE(SIGNKEY, 0);
-			ressign = (GISTTYPE *) palloc(len);
+			ressign = (SignTSVector *) palloc(len);
 			SET_VARSIZE(ressign, len);
 			ressign->flag = SIGNKEY;
 			makesign(GETSIGN(ressign), res);
@@ -209,16 +247,17 @@ gtsvector_compress(PG_FUNCTION_ARGS)
 	{
 		int4		i,
 					len;
-		GISTTYPE   *res;
+		SignTSVector *res;
 		BITVECP		sign = GETSIGN(DatumGetPointer(entry->key));
 
-		LOOPBYTE(
-				 if ((sign[i] & 0xff) != 0xff)
-				 PG_RETURN_POINTER(retval);
-		);
+		LOOPBYTE
+		{
+			if ((sign[i] & 0xff) != 0xff)
+				PG_RETURN_POINTER(retval);
+		}
 
 		len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0);
-		res = (GISTTYPE *) palloc(len);
+		res = (SignTSVector *) palloc(len);
 		SET_VARSIZE(res, len);
 		res->flag = SIGNKEY | ALLISTRUE;
 
@@ -234,9 +273,9 @@ Datum
 gtsvector_decompress(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GISTTYPE   *key = (GISTTYPE *) PG_DETOAST_DATUM(entry->key);
+	SignTSVector *key = (SignTSVector *) PG_DETOAST_DATUM(entry->key);
 
-	if (key != (GISTTYPE *) DatumGetPointer(entry->key))
+	if (key != (SignTSVector *) DatumGetPointer(entry->key))
 	{
 		GISTENTRY  *retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 
@@ -254,13 +293,13 @@ typedef struct
 {
 	int4	   *arrb;
 	int4	   *arre;
-}	CHKVAL;
+} CHKVAL;
 
 /*
  * is there value 'val' in array or not ?
  */
 static bool
-checkcondition_arr(void *checkval, ITEM * val)
+checkcondition_arr(void *checkval, QueryOperand *val)
 {
 	int4	   *StopLow = ((CHKVAL *) checkval)->arrb;
 	int4	   *StopHigh = ((CHKVAL *) checkval)->arre;
@@ -271,9 +310,9 @@ checkcondition_arr(void *checkval, ITEM * val)
 	while (StopLow < StopHigh)
 	{
 		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
-		if (*StopMiddle == val->val)
+		if (*StopMiddle == val->valcrc)
 			return (true);
-		else if (*StopMiddle < val->val)
+		else if (*StopMiddle < val->valcrc)
 			StopLow = StopMiddle + 1;
 		else
 			StopHigh = StopMiddle;
@@ -283,16 +322,16 @@ checkcondition_arr(void *checkval, ITEM * val)
 }
 
 static bool
-checkcondition_bit(void *checkval, ITEM * val)
+checkcondition_bit(void *checkval, QueryOperand *val)
 {
-	return GETBIT(checkval, HASHVAL(val->val));
+	return GETBIT(checkval, HASHVAL(val->valcrc));
 }
 
 Datum
 gtsvector_consistent(PG_FUNCTION_ARGS)
 {
-	QUERYTYPE  *query = (QUERYTYPE *) PG_GETARG_POINTER(1);
-	GISTTYPE   *key = (GISTTYPE *) DatumGetPointer(
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	SignTSVector *key = (SignTSVector *) DatumGetPointer(
 									((GISTENTRY *) PG_GETARG_POINTER(0))->key
 	);
 
@@ -325,7 +364,7 @@ gtsvector_consistent(PG_FUNCTION_ARGS)
 }
 
 static int4
-unionkey(BITVECP sbase, GISTTYPE * add)
+unionkey(BITVECP sbase, SignTSVector *add)
 {
 	int4		i;
 
@@ -336,9 +375,8 @@ unionkey(BITVECP sbase, GISTTYPE * add)
 		if (ISALLTRUE(add))
 			return 1;
 
-		LOOPBYTE(
-				 sbase[i] |= sadd[i];
-		);
+		LOOPBYTE
+			sbase[i] |= sadd[i];
 	}
 	else
 	{
@@ -360,7 +398,7 @@ gtsvector_union(PG_FUNCTION_ARGS)
 	int4		i,
 				len;
 	int4		flag = 0;
-	GISTTYPE   *result;
+	SignTSVector *result;
 
 	MemSet((void *) base, 0, sizeof(BITVEC));
 	for (i = 0; i < entryvec->n; i++)
@@ -374,12 +412,12 @@ gtsvector_union(PG_FUNCTION_ARGS)
 
 	flag |= SIGNKEY;
 	len = CALCGTSIZE(flag, 0);
-	result = (GISTTYPE *) palloc(len);
+	result = (SignTSVector *) palloc(len);
+	*size = len;
 	SET_VARSIZE(result, len);
 	result->flag = flag;
 	if (!ISALLTRUE(result))
 		memcpy((void *) GETSIGN(result), (void *) base, sizeof(BITVEC));
-	*size = len;
 
 	PG_RETURN_POINTER(result);
 }
@@ -387,8 +425,8 @@ gtsvector_union(PG_FUNCTION_ARGS)
 Datum
 gtsvector_same(PG_FUNCTION_ARGS)
 {
-	GISTTYPE   *a = (GISTTYPE *) PG_GETARG_POINTER(0);
-	GISTTYPE   *b = (GISTTYPE *) PG_GETARG_POINTER(1);
+	SignTSVector *a = (SignTSVector *) PG_GETARG_POINTER(0);
+	SignTSVector *b = (SignTSVector *) PG_GETARG_POINTER(1);
 	bool	   *result = (bool *) PG_GETARG_POINTER(2);
 
 	if (ISSIGNKEY(a))
@@ -406,13 +444,14 @@ gtsvector_same(PG_FUNCTION_ARGS)
 						sb = GETSIGN(b);
 
 			*result = true;
-			LOOPBYTE(
-					 if (sa[i] != sb[i])
-					 {
-				*result = false;
-				break;
+			LOOPBYTE
+			{
+				if (sa[i] != sb[i])
+				{
+					*result = false;
+					break;
+				}
 			}
-			);
 		}
 	}
 	else
@@ -447,9 +486,8 @@ sizebitvec(BITVECP sign)
 	int4		size = 0,
 				i;
 
-	LOOPBYTE(
-			 size += number_of_ones[(unsigned char) sign[i]];
-	);
+	LOOPBYTE
+		size += number_of_ones[(unsigned char) sign[i]];
 	return size;
 }
 
@@ -460,15 +498,16 @@ hemdistsign(BITVECP a, BITVECP b)
 				diff,
 				dist = 0;
 
-	LOOPBYTE(
-			 diff = (unsigned char) (a[i] ^ b[i]);
-	dist += number_of_ones[diff];
-	);
+	LOOPBYTE
+	{
+		diff = (unsigned char) (a[i] ^ b[i]);
+		dist += number_of_ones[diff];
+	}
 	return dist;
 }
 
 static int
-hemdist(GISTTYPE * a, GISTTYPE * b)
+hemdist(SignTSVector *a, SignTSVector *b)
 {
 	if (ISALLTRUE(a))
 	{
@@ -489,8 +528,8 @@ gtsvector_penalty(PG_FUNCTION_ARGS)
 	GISTENTRY  *origentry = (GISTENTRY *) PG_GETARG_POINTER(0); /* always ISSIGNKEY */
 	GISTENTRY  *newentry = (GISTENTRY *) PG_GETARG_POINTER(1);
 	float	   *penalty = (float *) PG_GETARG_POINTER(2);
-	GISTTYPE   *origval = (GISTTYPE *) DatumGetPointer(origentry->key);
-	GISTTYPE   *newval = (GISTTYPE *) DatumGetPointer(newentry->key);
+	SignTSVector *origval = (SignTSVector *) DatumGetPointer(origentry->key);
+	SignTSVector *newval = (SignTSVector *) DatumGetPointer(newentry->key);
 	BITVECP		orig = GETSIGN(origval);
 
 	*penalty = 0.0;
@@ -515,10 +554,10 @@ typedef struct
 {
 	bool		allistrue;
 	BITVEC		sign;
-}	CACHESIGN;
+} CACHESIGN;
 
 static void
-fillcache(CACHESIGN * item, GISTTYPE * key)
+fillcache(CACHESIGN *item, SignTSVector *key)
 {
 	item->allistrue = false;
 	if (ISARRKEY(key))
@@ -534,20 +573,23 @@ typedef struct
 {
 	OffsetNumber pos;
 	int4		cost;
-}	SPLITCOST;
+} SPLITCOST;
 
 static int
-comparecost(const void *a, const void *b)
+comparecost(const void *va, const void *vb)
 {
-	if (((SPLITCOST *) a)->cost == ((SPLITCOST *) b)->cost)
+	SPLITCOST  *a = (SPLITCOST *) va;
+	SPLITCOST  *b = (SPLITCOST *) vb;
+
+	if (a->cost == b->cost)
 		return 0;
 	else
-		return (((SPLITCOST *) a)->cost > ((SPLITCOST *) b)->cost) ? 1 : -1;
+		return (a->cost > b->cost) ? 1 : -1;
 }
 
 
 static int
-hemdistcache(CACHESIGN * a, CACHESIGN * b)
+hemdistcache(CACHESIGN *a, CACHESIGN *b)
 {
 	if (a->allistrue)
 	{
@@ -569,7 +611,7 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
 	GIST_SPLITVEC *v = (GIST_SPLITVEC *) PG_GETARG_POINTER(1);
 	OffsetNumber k,
 				j;
-	GISTTYPE   *datum_l,
+	SignTSVector *datum_l,
 			   *datum_r;
 	BITVECP		union_l,
 				union_r;
@@ -627,26 +669,26 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
 	/* form initial .. */
 	if (cache[seed_1].allistrue)
 	{
-		datum_l = (GISTTYPE *) palloc(CALCGTSIZE(SIGNKEY | ALLISTRUE, 0));
+		datum_l = (SignTSVector *) palloc(CALCGTSIZE(SIGNKEY | ALLISTRUE, 0));
 		SET_VARSIZE(datum_l, CALCGTSIZE(SIGNKEY | ALLISTRUE, 0));
 		datum_l->flag = SIGNKEY | ALLISTRUE;
 	}
 	else
 	{
-		datum_l = (GISTTYPE *) palloc(CALCGTSIZE(SIGNKEY, 0));
+		datum_l = (SignTSVector *) palloc(CALCGTSIZE(SIGNKEY, 0));
 		SET_VARSIZE(datum_l, CALCGTSIZE(SIGNKEY, 0));
 		datum_l->flag = SIGNKEY;
 		memcpy((void *) GETSIGN(datum_l), (void *) cache[seed_1].sign, sizeof(BITVEC));
 	}
 	if (cache[seed_2].allistrue)
 	{
-		datum_r = (GISTTYPE *) palloc(CALCGTSIZE(SIGNKEY | ALLISTRUE, 0));
+		datum_r = (SignTSVector *) palloc(CALCGTSIZE(SIGNKEY | ALLISTRUE, 0));
 		SET_VARSIZE(datum_r, CALCGTSIZE(SIGNKEY | ALLISTRUE, 0));
 		datum_r->flag = SIGNKEY | ALLISTRUE;
 	}
 	else
 	{
-		datum_r = (GISTTYPE *) palloc(CALCGTSIZE(SIGNKEY, 0));
+		datum_r = (SignTSVector *) palloc(CALCGTSIZE(SIGNKEY, 0));
 		SET_VARSIZE(datum_r, CALCGTSIZE(SIGNKEY, 0));
 		datum_r->flag = SIGNKEY;
 		memcpy((void *) GETSIGN(datum_r), (void *) cache[seed_2].sign, sizeof(BITVEC));
@@ -717,9 +759,8 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
 			else
 			{
 				ptr = cache[j].sign;
-				LOOPBYTE(
-						 union_l[i] |= ptr[i];
-				);
+				LOOPBYTE
+					union_l[i] |= ptr[i];
 			}
 			*left++ = j;
 			v->spl_nleft++;
@@ -734,9 +775,8 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
 			else
 			{
 				ptr = cache[j].sign;
-				LOOPBYTE(
-						 union_r[i] |= ptr[i];
-				);
+				LOOPBYTE
+					union_r[i] |= ptr[i];
 			}
 			*right++ = j;
 			v->spl_nright++;
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
new file mode 100644
index 000000000000..ca5caac6961f
--- /dev/null
+++ b/src/backend/utils/adt/tsquery.c
@@ -0,0 +1,979 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsquery.c
+ *	  I/O functions for tsquery
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.15.2.1 2008/04/11 22:52:17 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "libpq/pqformat.h"
+#include "miscadmin.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "utils/memutils.h"
+#include "utils/pg_crc.h"
+
+
+struct TSQueryParserStateData
+{
+	/* State for gettoken_query */
+	char	   *buffer;			/* entire string we are scanning */
+	char	   *buf;			/* current scan point */
+	int			state;
+	int			count;			/* nesting count, incremented by (,
+								 * decremented by ) */
+
+	/* polish (prefix) notation in list, filled in by push* functions */
+	List	   *polstr;
+
+	/*
+	 * Strings from operands are collected in op. curop is a pointer to the
+	 * end of used space of op.
+	 */
+	char	   *op;
+	char	   *curop;
+	int			lenop;			/* allocated size of op */
+	int			sumlen;			/* used size of op */
+
+	/* state for value's parser */
+	TSVectorParseState valstate;
+};
+
+/* parser's states */
+#define WAITOPERAND 1
+#define WAITOPERATOR	2
+#define WAITFIRSTOPERAND 3
+#define WAITSINGLEOPERAND 4
+
+/*
+ * subroutine to parse the weight part, like ':1AB' of a query.
+ */
+static char *
+get_weight(char *buf, int16 *weight)
+{
+	*weight = 0;
+
+	if (!t_iseq(buf, ':'))
+		return buf;
+
+	buf++;
+	while (*buf && pg_mblen(buf) == 1)
+	{
+		switch (*buf)
+		{
+			case 'a':
+			case 'A':
+				*weight |= 1 << 3;
+				break;
+			case 'b':
+			case 'B':
+				*weight |= 1 << 2;
+				break;
+			case 'c':
+			case 'C':
+				*weight |= 1 << 1;
+				break;
+			case 'd':
+			case 'D':
+				*weight |= 1;
+				break;
+			default:
+				return buf;
+		}
+		buf++;
+	}
+
+	return buf;
+}
+
+/*
+ * token types for parsing
+ */
+typedef enum
+{
+	PT_END = 0,
+	PT_ERR = 1,
+	PT_VAL = 2,
+	PT_OPR = 3,
+	PT_OPEN = 4,
+	PT_CLOSE = 5
+} ts_tokentype;
+
+/*
+ * get token from query string
+ *
+ * *operator is filled in with OP_* when return values is PT_OPR
+ * *strval, *lenval and *weight are filled in when return value is PT_VAL
+ */
+static ts_tokentype
+gettoken_query(TSQueryParserState state,
+			   int8 *operator,
+			   int *lenval, char **strval, int16 *weight)
+{
+	while (1)
+	{
+		switch (state->state)
+		{
+			case WAITFIRSTOPERAND:
+			case WAITOPERAND:
+				if (t_iseq(state->buf, '!'))
+				{
+					(state->buf)++;		/* can safely ++, t_iseq guarantee
+										 * that pg_mblen()==1 */
+					*operator = OP_NOT;
+					state->state = WAITOPERAND;
+					return PT_OPR;
+				}
+				else if (t_iseq(state->buf, '('))
+				{
+					state->count++;
+					(state->buf)++;
+					state->state = WAITOPERAND;
+					return PT_OPEN;
+				}
+				else if (t_iseq(state->buf, ':'))
+				{
+					ereport(ERROR,
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("syntax error in tsquery: \"%s\"",
+									state->buffer)));
+				}
+				else if (!t_isspace(state->buf))
+				{
+					/*
+					 * We rely on the tsvector parser to parse the value for
+					 * us
+					 */
+					reset_tsvector_parser(state->valstate, state->buf);
+					if (gettoken_tsvector(state->valstate, strval, lenval, NULL, NULL, &state->buf))
+					{
+						state->buf = get_weight(state->buf, weight);
+						state->state = WAITOPERATOR;
+						return PT_VAL;
+					}
+					else if (state->state == WAITFIRSTOPERAND)
+						return PT_END;
+					else
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("no operand in tsquery: \"%s\"",
+										state->buffer)));
+				}
+				break;
+			case WAITOPERATOR:
+				if (t_iseq(state->buf, '&'))
+				{
+					state->state = WAITOPERAND;
+					*operator = OP_AND;
+					(state->buf)++;
+					return PT_OPR;
+				}
+				if (t_iseq(state->buf, '|'))
+				{
+					state->state = WAITOPERAND;
+					*operator = OP_OR;
+					(state->buf)++;
+					return PT_OPR;
+				}
+				else if (t_iseq(state->buf, ')'))
+				{
+					(state->buf)++;
+					state->count--;
+					return (state->count < 0) ? PT_ERR : PT_CLOSE;
+				}
+				else if (*(state->buf) == '\0')
+					return (state->count) ? PT_ERR : PT_END;
+				else if (!t_isspace(state->buf))
+					return PT_ERR;
+				break;
+			case WAITSINGLEOPERAND:
+				if (*(state->buf) == '\0')
+					return PT_END;
+				*strval = state->buf;
+				*lenval = strlen(state->buf);
+				state->buf += strlen(state->buf);
+				state->count++;
+				return PT_VAL;
+			default:
+				return PT_ERR;
+				break;
+		}
+		state->buf += pg_mblen(state->buf);
+	}
+	return PT_END;
+}
+
+/*
+ * Push an operator to state->polstr
+ */
+void
+pushOperator(TSQueryParserState state, int8 oper)
+{
+	QueryOperator *tmp;
+
+	Assert(oper == OP_NOT || oper == OP_AND || oper == OP_OR);
+
+	tmp = (QueryOperator *) palloc0(sizeof(QueryOperator));
+	tmp->type = QI_OPR;
+	tmp->oper = oper;
+	/* left is filled in later with findoprnd */
+
+	state->polstr = lcons(tmp, state->polstr);
+}
+
+static void
+pushValue_internal(TSQueryParserState state, pg_crc32 valcrc, int distance, int lenval, int weight)
+{
+	QueryOperand *tmp;
+
+	if (distance >= MAXSTRPOS)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("value is too big in tsquery: \"%s\"",
+						state->buffer)));
+	if (lenval >= MAXSTRLEN)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("operand is too long in tsquery: \"%s\"",
+						state->buffer)));
+
+	tmp = (QueryOperand *) palloc0(sizeof(QueryOperand));
+	tmp->type = QI_VAL;
+	tmp->weight = weight;
+	tmp->valcrc = (int32) valcrc;
+	tmp->length = lenval;
+	tmp->distance = distance;
+
+	state->polstr = lcons(tmp, state->polstr);
+}
+
+/*
+ * Push an operand to state->polstr.
+ *
+ * strval must point to a string equal to state->curop. lenval is the length
+ * of the string.
+ */
+void
+pushValue(TSQueryParserState state, char *strval, int lenval, int2 weight)
+{
+	pg_crc32	valcrc;
+
+	if (lenval >= MAXSTRLEN)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("word is too long in tsquery: \"%s\"",
+						state->buffer)));
+
+	INIT_LEGACY_CRC32(valcrc);
+	COMP_LEGACY_CRC32(valcrc, strval, lenval);
+	FIN_LEGACY_CRC32(valcrc);
+	pushValue_internal(state, valcrc, state->curop - state->op, lenval, weight);
+
+	/* append the value string to state.op, enlarging buffer if needed first */
+	while (state->curop - state->op + lenval + 1 >= state->lenop)
+	{
+		int			used = state->curop - state->op;
+
+		state->lenop *= 2;
+		state->op = (char *) repalloc((void *) state->op, state->lenop);
+		state->curop = state->op + used;
+	}
+	memcpy((void *) state->curop, (void *) strval, lenval);
+	state->curop += lenval;
+	*(state->curop) = '\0';
+	state->curop++;
+	state->sumlen += lenval + 1 /* \0 */ ;
+}
+
+
+/*
+ * Push a stopword placeholder to state->polstr
+ */
+void
+pushStop(TSQueryParserState state)
+{
+	QueryOperand *tmp;
+
+	tmp = (QueryOperand *) palloc0(sizeof(QueryOperand));
+	tmp->type = QI_VALSTOP;
+
+	state->polstr = lcons(tmp, state->polstr);
+}
+
+
+#define STACKDEPTH	32
+
+/*
+ * Make polish (prefix) notation of query.
+ *
+ * See parse_tsquery for explanation of pushval.
+ */
+static void
+makepol(TSQueryParserState state,
+		PushFunction pushval,
+		Datum opaque)
+{
+	int8		operator = 0;
+	ts_tokentype type;
+	int			lenval = 0;
+	char	   *strval = NULL;
+	int8		opstack[STACKDEPTH];
+	int			lenstack = 0;
+	int16		weight = 0;
+
+	/* since this function recurses, it could be driven to stack overflow */
+	check_stack_depth();
+
+	while ((type = gettoken_query(state, &operator, &lenval, &strval, &weight)) != PT_END)
+	{
+		switch (type)
+		{
+			case PT_VAL:
+				pushval(opaque, state, strval, lenval, weight);
+				while (lenstack && (opstack[lenstack - 1] == OP_AND ||
+									opstack[lenstack - 1] == OP_NOT))
+				{
+					lenstack--;
+					pushOperator(state, opstack[lenstack]);
+				}
+				break;
+			case PT_OPR:
+				if (lenstack && operator == OP_OR)
+					pushOperator(state, OP_OR);
+				else
+				{
+					if (lenstack == STACKDEPTH) /* internal error */
+						elog(ERROR, "tsquery stack too small");
+					opstack[lenstack] = operator;
+					lenstack++;
+				}
+				break;
+			case PT_OPEN:
+				makepol(state, pushval, opaque);
+
+				while (lenstack && (opstack[lenstack - 1] == OP_AND ||
+									opstack[lenstack - 1] == OP_NOT))
+				{
+					lenstack--;
+					pushOperator(state, opstack[lenstack]);
+				}
+				break;
+			case PT_CLOSE:
+				while (lenstack)
+				{
+					lenstack--;
+					pushOperator(state, opstack[lenstack]);
+				};
+				return;
+			case PT_ERR:
+			default:
+				ereport(ERROR,
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("syntax error in tsquery: \"%s\"",
+								state->buffer)));
+		}
+	}
+	while (lenstack)
+	{
+		lenstack--;
+		pushOperator(state, opstack[lenstack]);
+	}
+}
+
+static void
+findoprnd_recurse(QueryItem *ptr, uint32 *pos, int nnodes)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (*pos >= nnodes)
+		elog(ERROR, "malformed tsquery: operand not found");
+
+	if (ptr[*pos].type == QI_VAL ||
+		ptr[*pos].type == QI_VALSTOP)	/* need to handle VALSTOP here, they
+										 * haven't been cleaned away yet. */
+	{
+		(*pos)++;
+	}
+	else
+	{
+		Assert(ptr[*pos].type == QI_OPR);
+
+		if (ptr[*pos].operator.oper == OP_NOT)
+		{
+			ptr[*pos].operator.left = 1;
+			(*pos)++;
+			findoprnd_recurse(ptr, pos, nnodes);
+		}
+		else
+		{
+			QueryOperator *curitem = &ptr[*pos].operator;
+			int			tmp = *pos;
+
+			Assert(curitem->oper == OP_AND || curitem->oper == OP_OR);
+
+			(*pos)++;
+			findoprnd_recurse(ptr, pos, nnodes);
+			curitem->left = *pos - tmp;
+			findoprnd_recurse(ptr, pos, nnodes);
+		}
+	}
+}
+
+
+/*
+ * Fills in the left-fields previously left unfilled. The input
+ * QueryItems must be in polish (prefix) notation.
+ */
+static void
+findoprnd(QueryItem *ptr, int size)
+{
+	uint32		pos;
+
+	pos = 0;
+	findoprnd_recurse(ptr, &pos, size);
+
+	if (pos != size)
+		elog(ERROR, "malformed tsquery: extra nodes");
+}
+
+
+/*
+ * Each value (operand) in the query is be passed to pushval. pushval can
+ * transform the simple value to an arbitrarily complex expression using
+ * pushValue and pushOperator. It must push a single value with pushValue,
+ * a complete expression with all operands, or a a stopword placeholder
+ * with pushStop, otherwise the prefix notation representation will be broken,
+ * having an operator with no operand.
+ *
+ * opaque is passed on to pushval as is, pushval can use it to store its
+ * private state.
+ *
+ * The returned query might contain QI_STOPVAL nodes. The caller is responsible
+ * for cleaning them up (with clean_fakeval)
+ */
+TSQuery
+parse_tsquery(char *buf,
+			  PushFunction pushval,
+			  Datum opaque,
+			  bool isplain)
+{
+	struct TSQueryParserStateData state;
+	int			i;
+	TSQuery		query;
+	int			commonlen;
+	QueryItem  *ptr;
+	ListCell   *cell;
+
+	/* init state */
+	state.buffer = buf;
+	state.buf = buf;
+	state.state = (isplain) ? WAITSINGLEOPERAND : WAITFIRSTOPERAND;
+	state.count = 0;
+	state.polstr = NIL;
+
+	/* init value parser's state */
+	state.valstate = init_tsvector_parser(state.buffer, true, true);
+
+	/* init list of operand */
+	state.sumlen = 0;
+	state.lenop = 64;
+	state.curop = state.op = (char *) palloc(state.lenop);
+	*(state.curop) = '\0';
+
+	/* parse query & make polish notation (postfix, but in reverse order) */
+	makepol(&state, pushval, opaque);
+
+	close_tsvector_parser(state.valstate);
+
+	if (list_length(state.polstr) == 0)
+	{
+		ereport(NOTICE,
+				(errmsg("text-search query doesn't contain lexemes: \"%s\"",
+						state.buffer)));
+		query = (TSQuery) palloc(HDRSIZETQ);
+		SET_VARSIZE(query, HDRSIZETQ);
+		query->size = 0;
+		return query;
+	}
+
+	/* Pack the QueryItems in the final TSQuery struct to return to caller */
+	commonlen = COMPUTESIZE(list_length(state.polstr), state.sumlen);
+	query = (TSQuery) palloc0(commonlen);
+	SET_VARSIZE(query, commonlen);
+	query->size = list_length(state.polstr);
+	ptr = GETQUERY(query);
+
+	/* Copy QueryItems to TSQuery */
+	i = 0;
+	foreach(cell, state.polstr)
+	{
+		QueryItem  *item = (QueryItem *) lfirst(cell);
+
+		switch (item->type)
+		{
+			case QI_VAL:
+				memcpy(&ptr[i], item, sizeof(QueryOperand));
+				break;
+			case QI_VALSTOP:
+				ptr[i].type = QI_VALSTOP;
+				break;
+			case QI_OPR:
+				memcpy(&ptr[i], item, sizeof(QueryOperator));
+				break;
+			default:
+				elog(ERROR, "unrecognized QueryItem type: %d", item->type);
+		}
+		i++;
+	}
+
+	/* Copy all the operand strings to TSQuery */
+	memcpy((void *) GETOPERAND(query), (void *) state.op, state.sumlen);
+	pfree(state.op);
+
+	/* Set left operand pointers for every operator. */
+	findoprnd(ptr, query->size);
+
+	return query;
+}
+
+static void
+pushval_asis(Datum opaque, TSQueryParserState state, char *strval, int lenval,
+			 int16 weight)
+{
+	pushValue(state, strval, lenval, weight);
+}
+
+/*
+ * in without morphology
+ */
+Datum
+tsqueryin(PG_FUNCTION_ARGS)
+{
+	char	   *in = PG_GETARG_CSTRING(0);
+
+	pg_verifymbstr(in, strlen(in), false);
+
+	PG_RETURN_TSQUERY(parse_tsquery(in, pushval_asis, PointerGetDatum(NULL), false));
+}
+
+/*
+ * out function
+ */
+typedef struct
+{
+	QueryItem  *curpol;
+	char	   *buf;
+	char	   *cur;
+	char	   *op;
+	int			buflen;
+} INFIX;
+
+/* Makes sure inf->buf is large enough for adding 'addsize' bytes */
+#define RESIZEBUF(inf, addsize) \
+while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \
+{ \
+	int len = (inf)->cur - (inf)->buf; \
+	(inf)->buflen *= 2; \
+	(inf)->buf = (char*) repalloc( (void*)(inf)->buf, (inf)->buflen ); \
+	(inf)->cur = (inf)->buf + len; \
+}
+
+/*
+ * recursive walk on tree and print it in
+ * infix (human-readable) view
+ */
+static void
+infix(INFIX *in, bool first)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (in->curpol->type == QI_VAL)
+	{
+		QueryOperand *curpol = &in->curpol->operand;
+		char	   *op = in->op + curpol->distance;
+		int			clen;
+
+		RESIZEBUF(in, curpol->length * (pg_database_encoding_max_length() + 1) + 2 + 5);
+		*(in->cur) = '\'';
+		in->cur++;
+		while (*op)
+		{
+			if (t_iseq(op, '\''))
+			{
+				*(in->cur) = '\'';
+				in->cur++;
+			}
+			else if (t_iseq(op, '\\'))
+			{
+				*(in->cur) = '\\';
+				in->cur++;
+			}
+			COPYCHAR(in->cur, op);
+
+			clen = pg_mblen(op);
+			op += clen;
+			in->cur += clen;
+		}
+		*(in->cur) = '\'';
+		in->cur++;
+		if (curpol->weight)
+		{
+			*(in->cur) = ':';
+			in->cur++;
+			if (curpol->weight & (1 << 3))
+			{
+				*(in->cur) = 'A';
+				in->cur++;
+			}
+			if (curpol->weight & (1 << 2))
+			{
+				*(in->cur) = 'B';
+				in->cur++;
+			}
+			if (curpol->weight & (1 << 1))
+			{
+				*(in->cur) = 'C';
+				in->cur++;
+			}
+			if (curpol->weight & 1)
+			{
+				*(in->cur) = 'D';
+				in->cur++;
+			}
+		}
+		*(in->cur) = '\0';
+		in->curpol++;
+	}
+	else if (in->curpol->operator.oper == OP_NOT)
+	{
+		bool		isopr = false;
+
+		RESIZEBUF(in, 1);
+		*(in->cur) = '!';
+		in->cur++;
+		*(in->cur) = '\0';
+		in->curpol++;
+
+		if (in->curpol->type == QI_OPR)
+		{
+			isopr = true;
+			RESIZEBUF(in, 2);
+			sprintf(in->cur, "( ");
+			in->cur = strchr(in->cur, '\0');
+		}
+
+		infix(in, isopr);
+		if (isopr)
+		{
+			RESIZEBUF(in, 2);
+			sprintf(in->cur, " )");
+			in->cur = strchr(in->cur, '\0');
+		}
+	}
+	else
+	{
+		int8		op = in->curpol->operator.oper;
+		INFIX		nrm;
+
+		in->curpol++;
+		if (op == OP_OR && !first)
+		{
+			RESIZEBUF(in, 2);
+			sprintf(in->cur, "( ");
+			in->cur = strchr(in->cur, '\0');
+		}
+
+		nrm.curpol = in->curpol;
+		nrm.op = in->op;
+		nrm.buflen = 16;
+		nrm.cur = nrm.buf = (char *) palloc(sizeof(char) * nrm.buflen);
+
+		/* get right operand */
+		infix(&nrm, false);
+
+		/* get & print left operand */
+		in->curpol = nrm.curpol;
+		infix(in, false);
+
+		/* print operator & right operand */
+		RESIZEBUF(in, 3 + (nrm.cur - nrm.buf));
+		switch (op)
+		{
+			case OP_OR:
+				sprintf(in->cur, " | %s", nrm.buf);
+				break;
+			case OP_AND:
+				sprintf(in->cur, " & %s", nrm.buf);
+				break;
+			default:
+				/* OP_NOT is handled in above if-branch */
+				elog(ERROR, "unrecognized operator type: %d", op);
+		}
+		in->cur = strchr(in->cur, '\0');
+		pfree(nrm.buf);
+
+		if (op == OP_OR && !first)
+		{
+			RESIZEBUF(in, 2);
+			sprintf(in->cur, " )");
+			in->cur = strchr(in->cur, '\0');
+		}
+	}
+}
+
+
+Datum
+tsqueryout(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY(0);
+	INFIX		nrm;
+
+	if (query->size == 0)
+	{
+		char	   *b = palloc(1);
+
+		*b = '\0';
+		PG_RETURN_POINTER(b);
+	}
+	nrm.curpol = GETQUERY(query);
+	nrm.buflen = 32;
+	nrm.cur = nrm.buf = (char *) palloc(sizeof(char) * nrm.buflen);
+	*(nrm.cur) = '\0';
+	nrm.op = GETOPERAND(query);
+	infix(&nrm, true);
+
+	PG_FREE_IF_COPY(query, 0);
+	PG_RETURN_CSTRING(nrm.buf);
+}
+
+/*
+ * Binary Input / Output functions. The binary format is as follows:
+ *
+ * uint32	 number of operators/operands in the query
+ *
+ * Followed by the operators and operands, in prefix notation. For each
+ * operand:
+ *
+ * uint8	type, QI_VAL
+ * uint8	weight
+ *			operand text in client encoding, null-terminated
+ *
+ * For each operator:
+ * uint8	type, QI_OPR
+ * uint8	operator, one of OP_AND, OP_OR, OP_NOT.
+ */
+Datum
+tsquerysend(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY(0);
+	StringInfoData buf;
+	int			i;
+	QueryItem  *item = GETQUERY(query);
+
+	pq_begintypsend(&buf);
+
+	pq_sendint(&buf, query->size, sizeof(uint32));
+	for (i = 0; i < query->size; i++)
+	{
+		pq_sendint(&buf, item->type, sizeof(item->type));
+
+		switch (item->type)
+		{
+			case QI_VAL:
+				pq_sendint(&buf, item->operand.weight, sizeof(uint8));
+				pq_sendstring(&buf, GETOPERAND(query) + item->operand.distance);
+				break;
+			case QI_OPR:
+				pq_sendint(&buf, item->operator.oper, sizeof(item->operator.oper));
+				break;
+			default:
+				elog(ERROR, "unrecognized tsquery node type: %d", item->type);
+		}
+		item++;
+	}
+
+	PG_FREE_IF_COPY(query, 0);
+
+	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
+}
+
+Datum
+tsqueryrecv(PG_FUNCTION_ARGS)
+{
+	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
+	TSQuery		query;
+	int			i,
+				len;
+	QueryItem  *item;
+	int			datalen;
+	char	   *ptr;
+	uint32		size;
+	const char **operands;
+
+	size = pq_getmsgint(buf, sizeof(uint32));
+	if (size > (MaxAllocSize / sizeof(QueryItem)))
+		elog(ERROR, "invalid size of tsquery");
+
+	/* Allocate space to temporarily hold operand strings */
+	operands = palloc(size * sizeof(char *));
+
+	/* Allocate space for all the QueryItems. */
+	len = HDRSIZETQ + sizeof(QueryItem) * size;
+	query = (TSQuery) palloc0(len);
+	query->size = size;
+	item = GETQUERY(query);
+
+	datalen = 0;
+	for (i = 0; i < size; i++)
+	{
+		item->type = (int8) pq_getmsgint(buf, sizeof(int8));
+
+		if (item->type == QI_VAL)
+		{
+			size_t		val_len;	/* length after recoding to server encoding */
+			uint8		weight;
+			const char *val;
+			pg_crc32	valcrc;
+
+			weight = (uint8) pq_getmsgint(buf, sizeof(uint8));
+			val = pq_getmsgstring(buf);
+			val_len = strlen(val);
+
+			/* Sanity checks */
+
+			if (weight > 0xF)
+				elog(ERROR, "invalid tsquery: invalid weight bitmap");
+
+			if (val_len > MAXSTRLEN)
+				elog(ERROR, "invalid tsquery: operand too long");
+
+			if (datalen > MAXSTRPOS)
+				elog(ERROR, "invalid tsquery: total operand length exceeded");
+
+			/* Looks valid. */
+
+			INIT_LEGACY_CRC32(valcrc);
+			COMP_LEGACY_CRC32(valcrc, val, val_len);
+			FIN_LEGACY_CRC32(valcrc);
+
+			item->operand.weight = weight;
+			item->operand.valcrc = (int32) valcrc;
+			item->operand.length = val_len;
+			item->operand.distance = datalen;
+
+			/*
+			 * Operand strings are copied to the final struct after this loop;
+			 * here we just collect them to an array
+			 */
+			operands[i] = val;
+
+			datalen += val_len + 1;		/* + 1 for the '\0' terminator */
+		}
+		else if (item->type == QI_OPR)
+		{
+			int8		oper;
+
+			oper = (int8) pq_getmsgint(buf, sizeof(int8));
+			if (oper != OP_NOT && oper != OP_OR && oper != OP_AND)
+				elog(ERROR, "invalid tsquery: unrecognized operator type %d",
+					 (int) oper);
+			if (i == size - 1)
+				elog(ERROR, "invalid pointer to right operand");
+
+			item->operator.oper = oper;
+		}
+		else
+			elog(ERROR, "unrecognized tsquery node type: %d", item->type);
+
+		item++;
+	}
+
+	/* Enlarge buffer to make room for the operand values. */
+	query = (TSQuery) repalloc(query, len + datalen);
+	item = GETQUERY(query);
+	ptr = GETOPERAND(query);
+
+	/*
+	 * Fill in the left-pointers. Checks that the tree is well-formed as a
+	 * side-effect.
+	 */
+	findoprnd(item, size);
+
+	/* Copy operands to output struct */
+	for (i = 0; i < size; i++)
+	{
+		if (item->type == QI_VAL)
+		{
+			memcpy(ptr, operands[i], item->operand.length + 1);
+			ptr += item->operand.length + 1;
+		}
+		item++;
+	}
+
+	pfree(operands);
+
+	Assert(ptr - GETOPERAND(query) == datalen);
+
+	SET_VARSIZE(query, len + datalen);
+
+	PG_RETURN_TSVECTOR(query);
+}
+
+/*
+ * debug function, used only for view query
+ * which will be executed in non-leaf pages in index
+ */
+Datum
+tsquerytree(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY(0);
+	INFIX		nrm;
+	text	   *res;
+	QueryItem  *q;
+	int			len;
+
+	if (query->size == 0)
+	{
+		res = (text *) palloc(VARHDRSZ);
+		SET_VARSIZE(res, VARHDRSZ);
+		PG_RETURN_POINTER(res);
+	}
+
+	q = clean_NOT(GETQUERY(query), &len);
+
+	if (!q)
+	{
+		res = (text *) palloc(1 + VARHDRSZ);
+		SET_VARSIZE(res, 1 + VARHDRSZ);
+		*((char *) VARDATA(res)) = 'T';
+	}
+	else
+	{
+		nrm.curpol = q;
+		nrm.buflen = 32;
+		nrm.cur = nrm.buf = (char *) palloc(sizeof(char) * nrm.buflen);
+		*(nrm.cur) = '\0';
+		nrm.op = GETOPERAND(query);
+		infix(&nrm, true);
+
+		res = (text *) palloc(nrm.cur - nrm.buf + VARHDRSZ);
+		SET_VARSIZE(res, nrm.cur - nrm.buf + VARHDRSZ);
+		strncpy(VARDATA(res), nrm.buf, nrm.cur - nrm.buf);
+		pfree(q);
+	}
+
+	PG_FREE_IF_COPY(query, 0);
+
+	PG_RETURN_POINTER(res);
+}
diff --git a/contrib/tsearch2/query_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
similarity index 50%
rename from contrib/tsearch2/query_cleanup.c
rename to src/backend/utils/adt/tsquery_cleanup.c
index 0d3427ff9b81..50c1b75ad51e 100644
--- a/contrib/tsearch2/query_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -1,92 +1,105 @@
-/*
- * Rewrite routines of query tree
- * Teodor Sigaev <teodor@sigaev.ru>
+/*-------------------------------------------------------------------------
+ *
+ * tsquery_cleanup.c
+ *	 Cleanup query from NOT values and/or stopword
+ *	 Utility functions to correct work.
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.10 2008/01/01 19:45:53 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include <float.h>
-
-#include "utils/builtins.h"
-
-#include "query.h"
-#include "query_cleanup.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "miscadmin.h"
 
 typedef struct NODE
 {
 	struct NODE *left;
 	struct NODE *right;
-	ITEM	   *valnode;
-}	NODE;
+	QueryItem  *valnode;
+} NODE;
 
 /*
  * make query tree from plain view of query
  */
 static NODE *
-maketree(ITEM * in)
+maketree(QueryItem *in)
 {
 	NODE	   *node = (NODE *) palloc(sizeof(NODE));
 
 	node->valnode = in;
 	node->right = node->left = NULL;
-	if (in->type == OPR)
+	if (in->type == QI_OPR)
 	{
 		node->right = maketree(in + 1);
-		if (in->val != (int4) '!')
-			node->left = maketree(in + in->left);
+		if (in->operator.oper != OP_NOT)
+			node->left = maketree(in + in->operator.left);
 	}
 	return node;
 }
 
+/*
+ * Internal state for plaintree and plainnode
+ */
 typedef struct
 {
-	ITEM	   *ptr;
-	int4		len;
-	int4		cur;
-}	PLAINTREE;
+	QueryItem  *ptr;
+	int			len;			/* allocated size of ptr */
+	int			cur;			/* number of elements in ptr */
+} PLAINTREE;
 
 static void
-plainnode(PLAINTREE * state, NODE * node)
+plainnode(PLAINTREE *state, NODE *node)
 {
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
 	if (state->cur == state->len)
 	{
 		state->len *= 2;
-		state->ptr = (ITEM *) repalloc((void *) state->ptr, state->len * sizeof(ITEM));
+		state->ptr = (QueryItem *) repalloc((void *) state->ptr, state->len * sizeof(QueryItem));
 	}
-	memcpy((void *) &(state->ptr[state->cur]), (void *) node->valnode, sizeof(ITEM));
-	if (node->valnode->type == VAL)
+	memcpy((void *) &(state->ptr[state->cur]), (void *) node->valnode, sizeof(QueryItem));
+	if (node->valnode->type == QI_VAL)
 		state->cur++;
-	else if (node->valnode->val == (int4) '!')
+	else if (node->valnode->operator.oper == OP_NOT)
 	{
-		state->ptr[state->cur].left = 1;
+		state->ptr[state->cur].operator.left = 1;
 		state->cur++;
 		plainnode(state, node->right);
 	}
 	else
 	{
-		int4		cur = state->cur;
+		int			cur = state->cur;
 
 		state->cur++;
 		plainnode(state, node->right);
-		state->ptr[cur].left = state->cur - cur;
+		state->ptr[cur].operator.left = state->cur - cur;
 		plainnode(state, node->left);
 	}
 	pfree(node);
 }
 
 /*
- * make plain view of tree from 'normal' view of tree
+ * make plain view of tree from a NODE-tree representation
  */
-static ITEM *
-plaintree(NODE * root, int4 *len)
+static QueryItem *
+plaintree(NODE *root, int *len)
 {
 	PLAINTREE	pl;
 
 	pl.cur = 0;
 	pl.len = 16;
-	if (root && (root->valnode->type == VAL || root->valnode->type == OPR))
+	if (root && (root->valnode->type == QI_VAL || root->valnode->type == QI_OPR))
 	{
-		pl.ptr = (ITEM *) palloc(pl.len * sizeof(ITEM));
+		pl.ptr = (QueryItem *) palloc(pl.len * sizeof(QueryItem));
 		plainnode(&pl, root);
 	}
 	else
@@ -96,8 +109,11 @@ plaintree(NODE * root, int4 *len)
 }
 
 static void
-freetree(NODE * node)
+freetree(NODE *node)
 {
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
 	if (!node)
 		return;
 	if (node->left)
@@ -114,19 +130,22 @@ freetree(NODE * node)
  * Operator ! always return TRUE
  */
 static NODE *
-clean_NOT_intree(NODE * node)
+clean_NOT_intree(NODE *node)
 {
-	if (node->valnode->type == VAL)
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (node->valnode->type == QI_VAL)
 		return node;
 
-	if (node->valnode->val == (int4) '!')
+	if (node->valnode->operator.oper == OP_NOT)
 	{
 		freetree(node);
 		return NULL;
 	}
 
 	/* operator & or | */
-	if (node->valnode->val == (int4) '|')
+	if (node->valnode->operator.oper == OP_OR)
 	{
 		if ((node->left = clean_NOT_intree(node->left)) == NULL ||
 			(node->right = clean_NOT_intree(node->right)) == NULL)
@@ -139,6 +158,8 @@ clean_NOT_intree(NODE * node)
 	{
 		NODE	   *res = node;
 
+		Assert(node->valnode->operator.oper == OP_AND);
+
 		node->left = clean_NOT_intree(node->left);
 		node->right = clean_NOT_intree(node->right);
 		if (node->left == NULL && node->right == NULL)
@@ -161,8 +182,8 @@ clean_NOT_intree(NODE * node)
 	return node;
 }
 
-ITEM *
-clean_NOT_v2(ITEM * ptr, int4 *len)
+QueryItem *
+clean_NOT(QueryItem *ptr, int *len)
 {
 	NODE	   *root = maketree(ptr);
 
@@ -177,32 +198,42 @@ clean_NOT_v2(ITEM * ptr, int4 *len)
 #undef V_FALSE
 #endif
 
-#define V_UNKNOWN	0
-#define V_TRUE		1
-#define V_FALSE		2
-#define V_STOP		3
+/*
+ * output values for result output parameter of clean_fakeval_intree
+ */
+#define V_UNKNOWN	0			/* the expression can't be evaluated
+								 * statically */
+#define V_TRUE		1			/* the expression is always true (not
+								 * implemented) */
+#define V_FALSE		2			/* the expression is always false (not
+								 * implemented) */
+#define V_STOP		3			/* the expression is a stop word */
 
 /*
  * Clean query tree from values which is always in
  * text (stopword)
  */
 static NODE *
-clean_fakeval_intree(NODE * node, char *result)
+clean_fakeval_intree(NODE *node, char *result)
 {
 	char		lresult = V_UNKNOWN,
 				rresult = V_UNKNOWN;
 
-	if (node->valnode->type == VAL)
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (node->valnode->type == QI_VAL)
 		return node;
-	else if (node->valnode->type == VALSTOP)
+	else if (node->valnode->type == QI_VALSTOP)
 	{
 		pfree(node);
 		*result = V_STOP;
 		return NULL;
 	}
 
+	Assert(node->valnode->type == QI_OPR);
 
-	if (node->valnode->val == (int4) '!')
+	if (node->valnode->operator.oper == OP_NOT)
 	{
 		node->right = clean_fakeval_intree(node->right, &rresult);
 		if (!node->right)
@@ -218,6 +249,7 @@ clean_fakeval_intree(NODE * node, char *result)
 
 		node->left = clean_fakeval_intree(node->left, &lresult);
 		node->right = clean_fakeval_intree(node->right, &rresult);
+
 		if (lresult == V_STOP && rresult == V_STOP)
 		{
 			freetree(node);
@@ -239,8 +271,8 @@ clean_fakeval_intree(NODE * node, char *result)
 	return node;
 }
 
-ITEM *
-clean_fakeval_v2(ITEM * ptr, int4 *len)
+QueryItem *
+clean_fakeval(QueryItem *ptr, int *len)
 {
 	NODE	   *root = maketree(ptr);
 	char		result = V_UNKNOWN;
@@ -249,7 +281,8 @@ clean_fakeval_v2(ITEM * ptr, int4 *len)
 	resroot = clean_fakeval_intree(root, &result);
 	if (result != V_UNKNOWN)
 	{
-		elog(NOTICE, "query contains only stopword(s) or doesn't contain lexeme(s), ignored");
+		ereport(NOTICE,
+				(errmsg("text-search query contains only stop words or doesn't contain lexemes, ignored")));
 		*len = 0;
 		return NULL;
 	}
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
new file mode 100644
index 000000000000..52529ff39b6d
--- /dev/null
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -0,0 +1,259 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsquery_gist.c
+ *	  GiST index support for tsquery
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.4.2.1 2008/04/20 09:29:48 teodor Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "access/skey.h"
+#include "access/gist.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+
+#define GETENTRY(vec,pos) DatumGetTSQuerySign((vec)->vector[pos].key)
+
+
+Datum
+gtsquery_compress(PG_FUNCTION_ARGS)
+{
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	GISTENTRY  *retval = entry;
+
+	if (entry->leafkey)
+	{
+		TSQuerySign sign;
+
+		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
+		sign = makeTSQuerySign(DatumGetTSQuery(entry->key));
+
+		gistentryinit(*retval, TSQuerySignGetDatum(sign),
+					  entry->rel, entry->page,
+					  entry->offset, FALSE);
+	}
+
+	PG_RETURN_POINTER(retval);
+}
+
+Datum
+gtsquery_decompress(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(PG_GETARG_DATUM(0));
+}
+
+Datum
+gtsquery_consistent(PG_FUNCTION_ARGS)
+{
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	TSQuerySign	key = DatumGetTSQuerySign(entry->key);
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
+	TSQuerySign sq = makeTSQuerySign(query);
+	bool		retval;
+
+	switch (strategy)
+	{
+		case RTContainsStrategyNumber:
+			if (GIST_LEAF(entry))
+				retval = (key & sq) == sq;
+			else
+				retval = (key & sq) != 0;
+			break;
+		case RTContainedByStrategyNumber:
+			if (GIST_LEAF(entry))
+				retval = (key & sq) == key;
+			else
+				retval = (key & sq) != 0;
+			break;
+		default:
+			retval = FALSE;
+	}
+	PG_RETURN_BOOL(retval);
+}
+
+Datum
+gtsquery_union(PG_FUNCTION_ARGS)
+{
+	GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
+	int		   *size = (int *) PG_GETARG_POINTER(1);
+	TSQuerySign sign;
+	int			i;
+
+	sign = 0;
+
+	for (i = 0; i < entryvec->n; i++)
+		sign |= GETENTRY(entryvec, i);
+
+	*size = sizeof(TSQuerySign);
+
+	PG_RETURN_TSQUERYSIGN(sign);
+}
+
+Datum
+gtsquery_same(PG_FUNCTION_ARGS)
+{
+	TSQuerySign a = PG_GETARG_TSQUERYSIGN(0);
+	TSQuerySign b = PG_GETARG_TSQUERYSIGN(1);
+	bool	   *result = (bool *) PG_GETARG_POINTER(2);
+
+	*result = (a == b) ? true : false;
+
+	PG_RETURN_POINTER(result);
+}
+
+static int
+sizebitvec(TSQuerySign sign)
+{
+	int			size = 0,
+				i;
+
+	for (i = 0; i < TSQS_SIGLEN; i++)
+		size += 0x01 & (sign >> i);
+
+	return size;
+}
+
+static int
+hemdist(TSQuerySign a, TSQuerySign b)
+{
+	TSQuerySign res = a ^ b;
+
+	return sizebitvec(res);
+}
+
+Datum
+gtsquery_penalty(PG_FUNCTION_ARGS)
+{
+	TSQuerySign origval = DatumGetTSQuerySign(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
+	TSQuerySign newval = DatumGetTSQuerySign(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
+	float	   *penalty = (float *) PG_GETARG_POINTER(2);
+
+	*penalty = hemdist(origval, newval);
+
+	PG_RETURN_POINTER(penalty);
+}
+
+
+typedef struct
+{
+	OffsetNumber pos;
+	int4		cost;
+} SPLITCOST;
+
+static int
+comparecost(const void *a, const void *b)
+{
+	if (((SPLITCOST *) a)->cost == ((SPLITCOST *) b)->cost)
+		return 0;
+	else
+		return (((SPLITCOST *) a)->cost > ((SPLITCOST *) b)->cost) ? 1 : -1;
+}
+
+#define WISH_F(a,b,c) (double)( -(double)(((a)-(b))*((a)-(b))*((a)-(b)))*(c) )
+
+Datum
+gtsquery_picksplit(PG_FUNCTION_ARGS)
+{
+	GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
+	GIST_SPLITVEC *v = (GIST_SPLITVEC *) PG_GETARG_POINTER(1);
+	OffsetNumber maxoff = entryvec->n - 2;
+	OffsetNumber k,
+				j;
+	TSQuerySign datum_l,
+				datum_r;
+	int4		size_alpha,
+				size_beta;
+	int4		size_waste,
+				waste = -1;
+	int4		nbytes;
+	OffsetNumber seed_1 = 0,
+				seed_2 = 0;
+	OffsetNumber *left,
+			   *right;
+
+	SPLITCOST  *costvector;
+
+	nbytes = (maxoff + 2) * sizeof(OffsetNumber);
+	left = v->spl_left = (OffsetNumber *) palloc(nbytes);
+	right = v->spl_right = (OffsetNumber *) palloc(nbytes);
+	v->spl_nleft = v->spl_nright = 0;
+
+	for (k = FirstOffsetNumber; k < maxoff; k = OffsetNumberNext(k))
+		for (j = OffsetNumberNext(k); j <= maxoff; j = OffsetNumberNext(j))
+		{
+			size_waste = hemdist(GETENTRY(entryvec, j), GETENTRY(entryvec, k));
+			if (size_waste > waste)
+			{
+				waste = size_waste;
+				seed_1 = k;
+				seed_2 = j;
+			}
+		}
+
+
+	if (seed_1 == 0 || seed_2 == 0)
+	{
+		seed_1 = 1;
+		seed_2 = 2;
+	}
+
+	datum_l = GETENTRY(entryvec, seed_1);
+	datum_r = GETENTRY(entryvec, seed_2);
+
+	maxoff = OffsetNumberNext(maxoff);
+	costvector = (SPLITCOST *) palloc(sizeof(SPLITCOST) * maxoff);
+	for (j = FirstOffsetNumber; j <= maxoff; j = OffsetNumberNext(j))
+	{
+		costvector[j - 1].pos = j;
+		size_alpha = hemdist(GETENTRY(entryvec, seed_1), GETENTRY(entryvec, j));
+		size_beta = hemdist(GETENTRY(entryvec, seed_2), GETENTRY(entryvec, j));
+		costvector[j - 1].cost = abs(size_alpha - size_beta);
+	}
+	qsort((void *) costvector, maxoff, sizeof(SPLITCOST), comparecost);
+
+	for (k = 0; k < maxoff; k++)
+	{
+		j = costvector[k].pos;
+		if (j == seed_1)
+		{
+			*left++ = j;
+			v->spl_nleft++;
+			continue;
+		}
+		else if (j == seed_2)
+		{
+			*right++ = j;
+			v->spl_nright++;
+			continue;
+		}
+		size_alpha = hemdist(datum_l, GETENTRY(entryvec, j));
+		size_beta = hemdist(datum_r, GETENTRY(entryvec, j));
+
+		if (size_alpha < size_beta + WISH_F(v->spl_nleft, v->spl_nright, 0.05))
+		{
+			datum_l |= GETENTRY(entryvec, j);
+			*left++ = j;
+			v->spl_nleft++;
+		}
+		else
+		{
+			datum_r |= GETENTRY(entryvec, j);
+			*right++ = j;
+			v->spl_nright++;
+		}
+	}
+
+	*right = *left = FirstOffsetNumber;
+	v->spl_ldatum = TSQuerySignGetDatum(datum_l);
+	v->spl_rdatum = TSQuerySignGetDatum(datum_r);
+
+	PG_RETURN_POINTER(v);
+}
diff --git a/src/backend/utils/adt/tsquery_op.c b/src/backend/utils/adt/tsquery_op.c
new file mode 100644
index 000000000000..f3c40de5f2ef
--- /dev/null
+++ b/src/backend/utils/adt/tsquery_op.c
@@ -0,0 +1,286 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsquery_op.c
+ *	  Various operations with tsquery
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_op.c,v 1.3.2.3 2010/08/03 00:10:58 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_utils.h"
+#include "utils/pg_crc.h"
+
+Datum
+tsquery_numnode(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY(0);
+	int			nnode = query->size;
+
+	PG_FREE_IF_COPY(query, 0);
+	PG_RETURN_INT32(nnode);
+}
+
+static QTNode *
+join_tsqueries(TSQuery a, TSQuery b, int8 operator)
+{
+	QTNode	   *res = (QTNode *) palloc0(sizeof(QTNode));
+
+	res->flags |= QTN_NEEDFREE;
+
+	res->valnode = (QueryItem *) palloc0(sizeof(QueryItem));
+	res->valnode->type = QI_OPR;
+	res->valnode->operator.oper = operator;
+
+	res->child = (QTNode **) palloc0(sizeof(QTNode *) * 2);
+	res->child[0] = QT2QTN(GETQUERY(b), GETOPERAND(b));
+	res->child[1] = QT2QTN(GETQUERY(a), GETOPERAND(a));
+	res->nchild = 2;
+
+	return res;
+}
+
+Datum
+tsquery_and(PG_FUNCTION_ARGS)
+{
+	TSQuery		a = PG_GETARG_TSQUERY_COPY(0);
+	TSQuery		b = PG_GETARG_TSQUERY_COPY(1);
+	QTNode	   *res;
+	TSQuery		query;
+
+	if (a->size == 0)
+	{
+		PG_FREE_IF_COPY(a, 1);
+		PG_RETURN_POINTER(b);
+	}
+	else if (b->size == 0)
+	{
+		PG_FREE_IF_COPY(b, 1);
+		PG_RETURN_POINTER(a);
+	}
+
+	res = join_tsqueries(a, b, OP_AND);
+
+	query = QTN2QT(res);
+
+	QTNFree(res);
+	PG_FREE_IF_COPY(a, 0);
+	PG_FREE_IF_COPY(b, 1);
+
+	PG_RETURN_TSQUERY(query);
+}
+
+Datum
+tsquery_or(PG_FUNCTION_ARGS)
+{
+	TSQuery		a = PG_GETARG_TSQUERY_COPY(0);
+	TSQuery		b = PG_GETARG_TSQUERY_COPY(1);
+	QTNode	   *res;
+	TSQuery		query;
+
+	if (a->size == 0)
+	{
+		PG_FREE_IF_COPY(a, 1);
+		PG_RETURN_POINTER(b);
+	}
+	else if (b->size == 0)
+	{
+		PG_FREE_IF_COPY(b, 1);
+		PG_RETURN_POINTER(a);
+	}
+
+	res = join_tsqueries(a, b, OP_OR);
+
+	query = QTN2QT(res);
+
+	QTNFree(res);
+	PG_FREE_IF_COPY(a, 0);
+	PG_FREE_IF_COPY(b, 1);
+
+	PG_RETURN_POINTER(query);
+}
+
+Datum
+tsquery_not(PG_FUNCTION_ARGS)
+{
+	TSQuery		a = PG_GETARG_TSQUERY_COPY(0);
+	QTNode	   *res;
+	TSQuery		query;
+
+	if (a->size == 0)
+		PG_RETURN_POINTER(a);
+
+	res = (QTNode *) palloc0(sizeof(QTNode));
+
+	res->flags |= QTN_NEEDFREE;
+
+	res->valnode = (QueryItem *) palloc0(sizeof(QueryItem));
+	res->valnode->type = QI_OPR;
+	res->valnode->operator.oper = OP_NOT;
+
+	res->child = (QTNode **) palloc0(sizeof(QTNode *));
+	res->child[0] = QT2QTN(GETQUERY(a), GETOPERAND(a));
+	res->nchild = 1;
+
+	query = QTN2QT(res);
+
+	QTNFree(res);
+	PG_FREE_IF_COPY(a, 0);
+
+	PG_RETURN_POINTER(query);
+}
+
+static int
+CompareTSQ(TSQuery a, TSQuery b)
+{
+	if (a->size != b->size)
+	{
+		return (a->size < b->size) ? -1 : 1;
+	}
+	else if (VARSIZE(a) != VARSIZE(b))
+	{
+		return (VARSIZE(a) < VARSIZE(b)) ? -1 : 1;
+	}
+	else if (a->size != 0)
+	{
+		QTNode	   *an = QT2QTN(GETQUERY(a), GETOPERAND(a));
+		QTNode	   *bn = QT2QTN(GETQUERY(b), GETOPERAND(b));
+		int			res = QTNodeCompare(an, bn);
+
+		QTNFree(an);
+		QTNFree(bn);
+
+		return res;
+	}
+
+	return 0;
+}
+
+Datum
+tsquery_cmp(PG_FUNCTION_ARGS)
+{
+	TSQuery		a = PG_GETARG_TSQUERY_COPY(0);
+	TSQuery		b = PG_GETARG_TSQUERY_COPY(1);
+	int			res = CompareTSQ(a, b);
+
+	PG_FREE_IF_COPY(a, 0);
+	PG_FREE_IF_COPY(b, 1);
+
+	PG_RETURN_INT32(res);
+}
+
+#define CMPFUNC( NAME, CONDITION )				\
+Datum											\
+NAME(PG_FUNCTION_ARGS) {						\
+	TSQuery  a = PG_GETARG_TSQUERY_COPY(0);		\
+	TSQuery  b = PG_GETARG_TSQUERY_COPY(1);		\
+	int res = CompareTSQ(a,b);					\
+												\
+	PG_FREE_IF_COPY(a,0);						\
+	PG_FREE_IF_COPY(b,1);						\
+												\
+	PG_RETURN_BOOL( CONDITION );				\
+}
+
+CMPFUNC(tsquery_lt, res < 0);
+CMPFUNC(tsquery_le, res <= 0);
+CMPFUNC(tsquery_eq, res == 0);
+CMPFUNC(tsquery_ge, res >= 0);
+CMPFUNC(tsquery_gt, res > 0);
+CMPFUNC(tsquery_ne, res != 0);
+
+TSQuerySign
+makeTSQuerySign(TSQuery a)
+{
+	int			i;
+	QueryItem  *ptr = GETQUERY(a);
+	TSQuerySign sign = 0;
+
+	for (i = 0; i < a->size; i++)
+	{
+		if (ptr->type == QI_VAL)
+			sign |= ((TSQuerySign) 1) << (ptr->operand.valcrc % TSQS_SIGLEN);
+		ptr++;
+	}
+
+	return sign;
+}
+
+Datum
+tsq_mcontains(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY(0);
+	TSQuery		ex = PG_GETARG_TSQUERY(1);
+	TSQuerySign sq,
+				se;
+	int			i,
+				j;
+	QueryItem  *iq,
+			   *ie;
+
+	if (query->size < ex->size)
+	{
+		PG_FREE_IF_COPY(query, 0);
+		PG_FREE_IF_COPY(ex, 1);
+
+		PG_RETURN_BOOL(false);
+	}
+
+	sq = makeTSQuerySign(query);
+	se = makeTSQuerySign(ex);
+
+	if ((sq & se) != se)
+	{
+		PG_FREE_IF_COPY(query, 0);
+		PG_FREE_IF_COPY(ex, 1);
+
+		PG_RETURN_BOOL(false);
+	}
+
+	ie = GETQUERY(ex);
+
+	for (i = 0; i < ex->size; i++)
+	{
+		iq = GETQUERY(query);
+		if (ie[i].type != QI_VAL)
+			continue;
+		for (j = 0; j < query->size; j++)
+			if (iq[j].type == QI_VAL && ie[i].operand.valcrc == iq[j].operand.valcrc)
+			{
+				j = query->size + 1;
+				break;
+			}
+		if (j == query->size)
+		{
+			PG_FREE_IF_COPY(query, 0);
+			PG_FREE_IF_COPY(ex, 1);
+
+			PG_RETURN_BOOL(false);
+		}
+	}
+
+	PG_FREE_IF_COPY(query, 0);
+	PG_FREE_IF_COPY(ex, 1);
+
+	PG_RETURN_BOOL(true);
+}
+
+Datum
+tsq_mcontained(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(
+					DirectFunctionCall2(
+										tsq_mcontains,
+										PG_GETARG_DATUM(1),
+										PG_GETARG_DATUM(0)
+										)
+		);
+}
diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c
new file mode 100644
index 000000000000..729c878ecbdb
--- /dev/null
+++ b/src/backend/utils/adt/tsquery_rewrite.c
@@ -0,0 +1,432 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsquery_rewrite.c
+ *	  Utilities for reconstructing tsquery
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.11.2.1 2009/07/28 09:32:45 teodor Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "executor/spi.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "miscadmin.h"
+
+
+static int
+addone(int *counters, int last, int total)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	counters[last]++;
+	if (counters[last] >= total)
+	{
+		if (last == 0)
+			return 0;
+		if (addone(counters, last - 1, total - 1) == 0)
+			return 0;
+		counters[last] = counters[last - 1] + 1;
+	}
+	return 1;
+}
+
+/*
+ * If node is equal to ex, replace it with subs. Replacement is actually done
+ * by returning either node or a copy of subs.
+ */
+static QTNode *
+findeq(QTNode *node, QTNode *ex, QTNode *subs, bool *isfind)
+{
+
+	if ((node->sign & ex->sign) != ex->sign ||
+		node->valnode->type != ex->valnode->type)
+		return node;
+
+	if (node->flags & QTN_NOCHANGE)
+		return node;
+
+	if (node->valnode->type == QI_OPR)
+	{
+		if (node->valnode->operator.oper != ex->valnode->operator.oper)
+			return node;
+
+		if (node->nchild == ex->nchild)
+		{
+			if (QTNEq(node, ex))
+			{
+				QTNFree(node);
+				if (subs)
+				{
+					node = QTNCopy(subs);
+					node->flags |= QTN_NOCHANGE;
+				}
+				else
+					node = NULL;
+				*isfind = true;
+			}
+		}
+		else if (node->nchild > ex->nchild)
+		{
+			/*
+			 * AND and NOT are commutative, so we check if a subset of the
+			 * children match. For example, if tnode is A | B | C, and ex is B
+			 * | C, we have a match after we convert tnode to A | (B | C).
+			 */
+			int		   *counters = (int *) palloc(sizeof(int) * node->nchild);
+			int			i;
+			QTNode	   *tnode = (QTNode *) palloc(sizeof(QTNode));
+
+			memset(tnode, 0, sizeof(QTNode));
+			tnode->child = (QTNode **) palloc(sizeof(QTNode *) * ex->nchild);
+			tnode->nchild = ex->nchild;
+			tnode->valnode = (QueryItem *) palloc(sizeof(QueryItem));
+			*(tnode->valnode) = *(ex->valnode);
+
+			for (i = 0; i < ex->nchild; i++)
+				counters[i] = i;
+
+			do
+			{
+				tnode->sign = 0;
+				for (i = 0; i < ex->nchild; i++)
+				{
+					tnode->child[i] = node->child[counters[i]];
+					tnode->sign |= tnode->child[i]->sign;
+				}
+
+				if (QTNEq(tnode, ex))
+				{
+					int			j = 0;
+
+					pfree(tnode->valnode);
+					pfree(tnode->child);
+					pfree(tnode);
+					if (subs)
+					{
+						tnode = QTNCopy(subs);
+						tnode->flags = QTN_NOCHANGE | QTN_NEEDFREE;
+					}
+					else
+						tnode = NULL;
+
+					node->child[counters[0]] = tnode;
+
+					for (i = 1; i < ex->nchild; i++)
+						node->child[counters[i]] = NULL;
+					for (i = 0; i < node->nchild; i++)
+					{
+						if (node->child[i])
+						{
+							node->child[j] = node->child[i];
+							j++;
+						}
+					}
+
+					node->nchild = j;
+
+					*isfind = true;
+
+					break;
+				}
+			} while (addone(counters, ex->nchild - 1, node->nchild));
+			if (tnode && (tnode->flags & QTN_NOCHANGE) == 0)
+			{
+				pfree(tnode->valnode);
+				pfree(tnode->child);
+				pfree(tnode);
+			}
+			else
+				QTNSort(node);
+			pfree(counters);
+		}
+	}
+	else
+	{
+		Assert(node->valnode->type == QI_VAL);
+
+		if (node->valnode->operand.valcrc != ex->valnode->operand.valcrc)
+			return node;
+		else if (QTNEq(node, ex))
+		{
+			QTNFree(node);
+			if (subs)
+			{
+				node = QTNCopy(subs);
+				node->flags |= QTN_NOCHANGE;
+			}
+			else
+			{
+				node = NULL;
+			}
+			*isfind = true;
+		}
+	}
+
+	return node;
+}
+
+static QTNode *
+dofindsubquery(QTNode *root, QTNode *ex, QTNode *subs, bool *isfind)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	root = findeq(root, ex, subs, isfind);
+
+	if (root && (root->flags & QTN_NOCHANGE) == 0 && root->valnode->type == QI_OPR)
+	{
+		int			i;
+
+		for (i = 0; i < root->nchild; i++)
+			root->child[i] = dofindsubquery(root->child[i], ex, subs, isfind);
+	}
+
+	return root;
+}
+
+static QTNode *
+dropvoidsubtree(QTNode *root)
+{
+
+	if (!root)
+		return NULL;
+
+	if (root->valnode->type == QI_OPR)
+	{
+		int			i,
+					j = 0;
+
+		for (i = 0; i < root->nchild; i++)
+		{
+			if (root->child[i])
+			{
+				root->child[j] = root->child[i];
+				j++;
+			}
+		}
+
+		root->nchild = j;
+
+		if (root->nchild == 0)
+		{
+			QTNFree(root);
+			root = NULL;
+		}
+		else if (root->nchild == 1 && root->valnode->operator.oper != OP_NOT)
+		{
+			QTNode	   *nroot = root->child[0];
+
+			pfree(root);
+			root = nroot;
+		}
+	}
+
+	return root;
+}
+
+QTNode *
+findsubquery(QTNode *root, QTNode *ex, QTNode *subs, bool *isfind)
+{
+	bool		DidFind = false;
+
+	root = dofindsubquery(root, ex, subs, &DidFind);
+
+	if (!subs && DidFind)
+		root = dropvoidsubtree(root);
+
+	if (isfind)
+		*isfind = DidFind;
+
+	return root;
+}
+
+Datum
+tsquery_rewrite_query(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY_COPY(0);
+	text	   *in = PG_GETARG_TEXT_P(1);
+	TSQuery		rewrited = query;
+	MemoryContext outercontext = CurrentMemoryContext;
+	MemoryContext oldcontext;
+	QTNode	   *tree;
+	char	   *buf;
+	SPIPlanPtr	plan;
+	Portal		portal;
+	bool		isnull;
+	int			i;
+
+	if (query->size == 0)
+	{
+		PG_FREE_IF_COPY(in, 1);
+		PG_RETURN_POINTER(rewrited);
+	}
+
+	tree = QT2QTN(GETQUERY(query), GETOPERAND(query));
+	QTNTernary(tree);
+	QTNSort(tree);
+
+	buf = TextPGetCString(in);
+
+	SPI_connect();
+
+	if ((plan = SPI_prepare(buf, 0, NULL)) == NULL)
+		elog(ERROR, "SPI_prepare(\"%s\") failed", buf);
+
+	if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL)
+		elog(ERROR, "SPI_cursor_open(\"%s\") failed", buf);
+
+	SPI_cursor_fetch(portal, true, 100);
+
+	if (SPI_tuptable == NULL ||
+		SPI_tuptable->tupdesc->natts != 2 ||
+		SPI_gettypeid(SPI_tuptable->tupdesc, 1) != TSQUERYOID ||
+		SPI_gettypeid(SPI_tuptable->tupdesc, 2) != TSQUERYOID)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("ts_rewrite query must return two tsquery columns")));
+
+	while (SPI_processed > 0 && tree)
+	{
+		for (i = 0; i < SPI_processed && tree; i++)
+		{
+			Datum		qdata = SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 1, &isnull);
+			Datum		sdata;
+
+			if (isnull)
+				continue;
+
+			sdata = SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 2, &isnull);
+
+			if (!isnull)
+			{
+				TSQuery		qtex = DatumGetTSQuery(qdata);
+				TSQuery		qtsubs = DatumGetTSQuery(sdata);
+				QTNode	   *qex,
+						   *qsubs = NULL;
+
+				if (qtex->size == 0)
+				{
+					if (qtex != (TSQuery) DatumGetPointer(qdata))
+						pfree(qtex);
+					if (qtsubs != (TSQuery) DatumGetPointer(sdata))
+						pfree(qtsubs);
+					continue;
+				}
+
+				qex = QT2QTN(GETQUERY(qtex), GETOPERAND(qtex));
+
+				QTNTernary(qex);
+				QTNSort(qex);
+
+				if (qtsubs->size)
+					qsubs = QT2QTN(GETQUERY(qtsubs), GETOPERAND(qtsubs));
+
+				oldcontext = MemoryContextSwitchTo(outercontext);
+				tree = findsubquery(tree, qex, qsubs, NULL);
+				MemoryContextSwitchTo(oldcontext);
+
+				QTNFree(qex);
+				if (qtex != (TSQuery) DatumGetPointer(qdata))
+					pfree(qtex);
+				QTNFree(qsubs);
+				if (qtsubs != (TSQuery) DatumGetPointer(sdata))
+					pfree(qtsubs);
+
+				if (tree)
+				{
+					/* ready the tree for another pass */
+					QTNClearFlags(tree, QTN_NOCHANGE);
+					QTNSort(tree);
+				}
+			}
+		}
+
+		SPI_freetuptable(SPI_tuptable);
+		SPI_cursor_fetch(portal, true, 100);
+	}
+
+	SPI_freetuptable(SPI_tuptable);
+	SPI_cursor_close(portal);
+	SPI_freeplan(plan);
+	SPI_finish();
+
+	if (tree)
+	{
+		QTNBinary(tree);
+		rewrited = QTN2QT(tree);
+		QTNFree(tree);
+		PG_FREE_IF_COPY(query, 0);
+	}
+	else
+	{
+		SET_VARSIZE(rewrited, HDRSIZETQ);
+		rewrited->size = 0;
+	}
+
+	pfree(buf);
+	PG_FREE_IF_COPY(in, 1);
+	PG_RETURN_POINTER(rewrited);
+}
+
+Datum
+tsquery_rewrite(PG_FUNCTION_ARGS)
+{
+	TSQuery		query = PG_GETARG_TSQUERY_COPY(0);
+	TSQuery		ex = PG_GETARG_TSQUERY(1);
+	TSQuery		subst = PG_GETARG_TSQUERY(2);
+	TSQuery		rewrited = query;
+	QTNode	   *tree,
+			   *qex,
+			   *subs = NULL;
+
+	if (query->size == 0 || ex->size == 0)
+	{
+		PG_FREE_IF_COPY(ex, 1);
+		PG_FREE_IF_COPY(subst, 2);
+		PG_RETURN_POINTER(rewrited);
+	}
+
+	tree = QT2QTN(GETQUERY(query), GETOPERAND(query));
+	QTNTernary(tree);
+	QTNSort(tree);
+
+	qex = QT2QTN(GETQUERY(ex), GETOPERAND(ex));
+	QTNTernary(qex);
+	QTNSort(qex);
+
+	if (subst->size)
+		subs = QT2QTN(GETQUERY(subst), GETOPERAND(subst));
+
+	tree = findsubquery(tree, qex, subs, NULL);
+
+	QTNFree(qex);
+	QTNFree(subs);
+
+	if (!tree)
+	{
+		SET_VARSIZE(rewrited, HDRSIZETQ);
+		rewrited->size = 0;
+		PG_FREE_IF_COPY(ex, 1);
+		PG_FREE_IF_COPY(subst, 2);
+		PG_RETURN_POINTER(rewrited);
+	}
+	else
+	{
+		QTNBinary(tree);
+		rewrited = QTN2QT(tree);
+		QTNFree(tree);
+	}
+
+	PG_FREE_IF_COPY(query, 0);
+	PG_FREE_IF_COPY(ex, 1);
+	PG_FREE_IF_COPY(subst, 2);
+	PG_RETURN_POINTER(rewrited);
+}
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
new file mode 100644
index 000000000000..01afc4e0bbb2
--- /dev/null
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -0,0 +1,403 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsquery_util.c
+ *	  Utilities for tsquery datatype
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.8.2.1 2010/08/03 00:10:58 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "miscadmin.h"
+
+QTNode *
+QT2QTN(QueryItem *in, char *operand)
+{
+	QTNode	   *node = (QTNode *) palloc0(sizeof(QTNode));
+
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	node->valnode = in;
+
+	if (in->type == QI_OPR)
+	{
+		node->child = (QTNode **) palloc0(sizeof(QTNode *) * 2);
+		node->child[0] = QT2QTN(in + 1, operand);
+		node->sign = node->child[0]->sign;
+		if (in->operator.oper == OP_NOT)
+			node->nchild = 1;
+		else
+		{
+			node->nchild = 2;
+			node->child[1] = QT2QTN(in + in->operator.left, operand);
+			node->sign |= node->child[1]->sign;
+		}
+	}
+	else if (operand)
+	{
+		node->word = operand + in->operand.distance;
+		node->sign = 1 << (in->operand.valcrc % 32);
+	}
+
+	return node;
+}
+
+void
+QTNFree(QTNode *in)
+{
+	if (!in)
+		return;
+
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (in->valnode->type == QI_VAL && in->word && (in->flags & QTN_WORDFREE) != 0)
+		pfree(in->word);
+
+	if (in->child)
+	{
+		if (in->valnode)
+		{
+			if (in->valnode->type == QI_OPR && in->nchild > 0)
+			{
+				int			i;
+
+				for (i = 0; i < in->nchild; i++)
+					QTNFree(in->child[i]);
+			}
+			if (in->flags & QTN_NEEDFREE)
+				pfree(in->valnode);
+		}
+		pfree(in->child);
+	}
+
+	pfree(in);
+}
+
+int
+QTNodeCompare(QTNode *an, QTNode *bn)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (an->valnode->type != bn->valnode->type)
+		return (an->valnode->type > bn->valnode->type) ? -1 : 1;
+
+	if (an->valnode->type == QI_OPR)
+	{
+		QueryOperator *ao = &an->valnode->operator;
+		QueryOperator *bo = &bn->valnode->operator;
+
+		if (ao->oper != bo->oper)
+			return (ao->oper > bo->oper) ? -1 : 1;
+
+		if (an->nchild != bn->nchild)
+			return (an->nchild > bn->nchild) ? -1 : 1;
+
+		{
+			int			i,
+						res;
+
+			for (i = 0; i < an->nchild; i++)
+				if ((res = QTNodeCompare(an->child[i], bn->child[i])) != 0)
+					return res;
+		}
+		return 0;
+	}
+	else if (an->valnode->type == QI_VAL)
+	{
+		QueryOperand *ao = &an->valnode->operand;
+		QueryOperand *bo = &bn->valnode->operand;
+
+		if (ao->valcrc != bo->valcrc)
+		{
+			return (ao->valcrc > bo->valcrc) ? -1 : 1;
+		}
+
+		if (ao->length == bo->length)
+			return strncmp(an->word, bn->word, ao->length);
+		else
+			return (ao->length > bo->length) ? -1 : 1;
+	}
+	else
+	{
+		elog(ERROR, "unrecognized QueryItem type: %d", an->valnode->type);
+		return 0;				/* keep compiler quiet */
+	}
+}
+
+static int
+cmpQTN(const void *a, const void *b)
+{
+	return QTNodeCompare(*(QTNode **) a, *(QTNode **) b);
+}
+
+void
+QTNSort(QTNode *in)
+{
+	int			i;
+
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (in->valnode->type != QI_OPR)
+		return;
+
+	for (i = 0; i < in->nchild; i++)
+		QTNSort(in->child[i]);
+	if (in->nchild > 1)
+		qsort((void *) in->child, in->nchild, sizeof(QTNode *), cmpQTN);
+}
+
+bool
+QTNEq(QTNode *a, QTNode *b)
+{
+	uint32		sign = a->sign & b->sign;
+
+	if (!(sign == a->sign && sign == b->sign))
+		return 0;
+
+	return (QTNodeCompare(a, b) == 0) ? true : false;
+}
+
+/*
+ * Remove unnecessary intermediate nodes. For example:
+ *
+ *	OR			OR
+ * a  OR	-> a b c
+ *	 b	c
+ */
+void
+QTNTernary(QTNode *in)
+{
+	int			i;
+
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (in->valnode->type != QI_OPR)
+		return;
+
+	for (i = 0; i < in->nchild; i++)
+		QTNTernary(in->child[i]);
+
+	for (i = 0; i < in->nchild; i++)
+	{
+		QTNode	   *cc = in->child[i];
+
+		if (cc->valnode->type == QI_OPR && in->valnode->operator.oper == cc->valnode->operator.oper)
+		{
+			int			oldnchild = in->nchild;
+
+			in->nchild += cc->nchild - 1;
+			in->child = (QTNode **) repalloc(in->child, in->nchild * sizeof(QTNode *));
+
+			if (i + 1 != oldnchild)
+				memmove(in->child + i + cc->nchild, in->child + i + 1,
+						(oldnchild - i - 1) * sizeof(QTNode *));
+
+			memcpy(in->child + i, cc->child, cc->nchild * sizeof(QTNode *));
+			i += cc->nchild - 1;
+
+			if (cc->flags & QTN_NEEDFREE)
+				pfree(cc->valnode);
+			pfree(cc);
+		}
+	}
+}
+
+/*
+ * Convert a tree to binary tree by inserting intermediate nodes.
+ * (Opposite of QTNTernary)
+ */
+void
+QTNBinary(QTNode *in)
+{
+	int			i;
+
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (in->valnode->type != QI_OPR)
+		return;
+
+	for (i = 0; i < in->nchild; i++)
+		QTNBinary(in->child[i]);
+
+	if (in->nchild <= 2)
+		return;
+
+	while (in->nchild > 2)
+	{
+		QTNode	   *nn = (QTNode *) palloc0(sizeof(QTNode));
+
+		nn->valnode = (QueryItem *) palloc0(sizeof(QueryItem));
+		nn->child = (QTNode **) palloc0(sizeof(QTNode *) * 2);
+
+		nn->nchild = 2;
+		nn->flags = QTN_NEEDFREE;
+
+		nn->child[0] = in->child[0];
+		nn->child[1] = in->child[1];
+		nn->sign = nn->child[0]->sign | nn->child[1]->sign;
+
+		nn->valnode->type = in->valnode->type;
+		nn->valnode->operator.oper = in->valnode->operator.oper;
+
+		in->child[0] = nn;
+		in->child[1] = in->child[in->nchild - 1];
+		in->nchild--;
+	}
+}
+
+/*
+ * Count the total length of operand string in tree, including '\0'-
+ * terminators.
+ */
+static void
+cntsize(QTNode *in, int *sumlen, int *nnode)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	*nnode += 1;
+	if (in->valnode->type == QI_OPR)
+	{
+		int			i;
+
+		for (i = 0; i < in->nchild; i++)
+			cntsize(in->child[i], sumlen, nnode);
+	}
+	else
+	{
+		*sumlen += in->valnode->operand.length + 1;
+	}
+}
+
+typedef struct
+{
+	QueryItem  *curitem;
+	char	   *operand;
+	char	   *curoperand;
+} QTN2QTState;
+
+static void
+fillQT(QTN2QTState *state, QTNode *in)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	if (in->valnode->type == QI_VAL)
+	{
+		memcpy(state->curitem, in->valnode, sizeof(QueryOperand));
+
+		memcpy(state->curoperand, in->word, in->valnode->operand.length);
+		state->curitem->operand.distance = state->curoperand - state->operand;
+		state->curoperand[in->valnode->operand.length] = '\0';
+		state->curoperand += in->valnode->operand.length + 1;
+		state->curitem++;
+	}
+	else
+	{
+		QueryItem  *curitem = state->curitem;
+
+		Assert(in->valnode->type == QI_OPR);
+
+		memcpy(state->curitem, in->valnode, sizeof(QueryOperator));
+
+		Assert(in->nchild <= 2);
+		state->curitem++;
+
+		fillQT(state, in->child[0]);
+
+		if (in->nchild == 2)
+		{
+			curitem->operator.left = state->curitem - curitem;
+			fillQT(state, in->child[1]);
+		}
+	}
+}
+
+TSQuery
+QTN2QT(QTNode *in)
+{
+	TSQuery		out;
+	int			len;
+	int			sumlen = 0,
+				nnode = 0;
+	QTN2QTState state;
+
+	cntsize(in, &sumlen, &nnode);
+	len = COMPUTESIZE(nnode, sumlen);
+
+	out = (TSQuery) palloc0(len);
+	SET_VARSIZE(out, len);
+	out->size = nnode;
+
+	state.curitem = GETQUERY(out);
+	state.operand = state.curoperand = GETOPERAND(out);
+
+	fillQT(&state, in);
+	return out;
+}
+
+QTNode *
+QTNCopy(QTNode *in)
+{
+	QTNode	   *out;
+
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	out = (QTNode *) palloc(sizeof(QTNode));
+
+	*out = *in;
+	out->valnode = (QueryItem *) palloc(sizeof(QueryItem));
+	*(out->valnode) = *(in->valnode);
+	out->flags |= QTN_NEEDFREE;
+
+	if (in->valnode->type == QI_VAL)
+	{
+		out->word = palloc(in->valnode->operand.length + 1);
+		memcpy(out->word, in->word, in->valnode->operand.length);
+		out->word[in->valnode->operand.length] = '\0';
+		out->flags |= QTN_WORDFREE;
+	}
+	else
+	{
+		int			i;
+
+		out->child = (QTNode **) palloc(sizeof(QTNode *) * in->nchild);
+
+		for (i = 0; i < in->nchild; i++)
+			out->child[i] = QTNCopy(in->child[i]);
+	}
+
+	return out;
+}
+
+void
+QTNClearFlags(QTNode *in, uint32 flags)
+{
+	/* since this function recurses, it could be driven to stack overflow. */
+	check_stack_depth();
+
+	in->flags &= ~flags;
+
+	if (in->valnode->type != QI_VAL)
+	{
+		int			i;
+
+		for (i = 0; i < in->nchild; i++)
+			QTNClearFlags(in->child[i], flags);
+	}
+}
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
new file mode 100644
index 000000000000..065c94d20977
--- /dev/null
+++ b/src/backend/utils/adt/tsrank.c
@@ -0,0 +1,856 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsrank.c
+ *		rank tsvector by tsquery
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsrank.c,v 1.12 2008/01/01 19:45:53 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <math.h>
+
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "utils/array.h"
+#include "miscadmin.h"
+
+
+static float weights[] = {0.1f, 0.2f, 0.4f, 1.0f};
+
+#define wpos(wep)	( w[ WEP_GETWEIGHT(wep) ] )
+
+#define RANK_NO_NORM			0x00
+#define RANK_NORM_LOGLENGTH		0x01
+#define RANK_NORM_LENGTH		0x02
+#define RANK_NORM_EXTDIST		0x04
+#define RANK_NORM_UNIQ			0x08
+#define RANK_NORM_LOGUNIQ		0x10
+#define RANK_NORM_RDIVRPLUS1	0x20
+#define DEF_NORM_METHOD			RANK_NO_NORM
+
+static float calc_rank_or(float *w, TSVector t, TSQuery q);
+static float calc_rank_and(float *w, TSVector t, TSQuery q);
+
+/*
+ * Returns a weight of a word collocation
+ */
+static float4
+word_distance(int4 w)
+{
+	if (w > 100)
+		return 1e-30f;
+
+	return 1.0 / (1.005 + 0.05 * exp(((float4) w) / 1.5 - 2));
+}
+
+static int
+cnt_length(TSVector t)
+{
+	WordEntry  *ptr = ARRPTR(t),
+			   *end = (WordEntry *) STRPTR(t);
+	int			len = 0;
+
+	while (ptr < end)
+	{
+		int			clen = POSDATALEN(t, ptr);
+
+		if (clen == 0)
+			len += 1;
+		else
+			len += clen;
+
+		ptr++;
+	}
+
+	return len;
+}
+
+static int
+WordECompareQueryItem(char *eval, char *qval, WordEntry *ptr, QueryOperand *item)
+{
+	if (ptr->len == item->length)
+		return strncmp(
+					   eval + ptr->pos,
+					   qval + item->distance,
+					   item->length);
+
+	return (ptr->len > item->length) ? 1 : -1;
+}
+
+/*
+ * Returns a pointer to a WordEntry corresponding 'item' from tsvector 't'. 'q'
+ * is the TSQuery containing 'item'. Returns NULL if not found.
+ */
+static WordEntry *
+find_wordentry(TSVector t, TSQuery q, QueryOperand *item)
+{
+	WordEntry  *StopLow = ARRPTR(t);
+	WordEntry  *StopHigh = (WordEntry *) STRPTR(t);
+	WordEntry  *StopMiddle;
+	int			difference;
+
+	/* Loop invariant: StopLow <= item < StopHigh */
+
+	while (StopLow < StopHigh)
+	{
+		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
+		difference = WordECompareQueryItem(STRPTR(t), GETOPERAND(q), StopMiddle, item);
+		if (difference == 0)
+			return StopMiddle;
+		else if (difference < 0)
+			StopLow = StopMiddle + 1;
+		else
+			StopHigh = StopMiddle;
+	}
+
+	return NULL;
+}
+
+
+/*
+ * sort QueryOperands by (length, word)
+ */
+static int
+compareQueryOperand(const void *a, const void *b, void *arg)
+{
+	char	   *operand = (char *) arg;
+	QueryOperand *qa = (*(QueryOperand **) a);
+	QueryOperand *qb = (*(QueryOperand **) b);
+
+	if (qa->length == qb->length)
+		return strncmp(operand + qa->distance,
+					   operand + qb->distance,
+					   qb->length);
+
+	return (qa->length > qb->length) ? 1 : -1;
+}
+
+/*
+ * Returns a sorted, de-duplicated array of QueryOperands in a query.
+ * The returned QueryOperands are pointers to the original QueryOperands
+ * in the query.
+ *
+ * Length of the returned array is stored in *size
+ */
+static QueryOperand **
+SortAndUniqItems(TSQuery q, int *size)
+{
+	char	   *operand = GETOPERAND(q);
+	QueryItem  *item = GETQUERY(q);
+	QueryOperand **res,
+			  **ptr,
+			  **prevptr;
+
+	ptr = res = (QueryOperand **) palloc(sizeof(QueryOperand *) * *size);
+
+	/* Collect all operands from the tree to res */
+	while ((*size)--)
+	{
+		if (item->type == QI_VAL)
+		{
+			*ptr = (QueryOperand *) item;
+			ptr++;
+		}
+		item++;
+	}
+
+	*size = ptr - res;
+	if (*size < 2)
+		return res;
+
+	qsort_arg(res, *size, sizeof(QueryOperand **), compareQueryOperand, (void *) operand);
+
+	ptr = res + 1;
+	prevptr = res;
+
+	/* remove duplicates */
+	while (ptr - res < *size)
+	{
+		if (compareQueryOperand((void *) ptr, (void *) prevptr, (void *) operand) != 0)
+		{
+			prevptr++;
+			*prevptr = *ptr;
+		}
+		ptr++;
+	}
+
+	*size = prevptr + 1 - res;
+	return res;
+}
+
+/* A dummy WordEntryPos array to use when haspos is false */
+static WordEntryPosVector POSNULL = {
+	1,							/* Number of elements that follow */
+	{0}
+};
+
+static float
+calc_rank_and(float *w, TSVector t, TSQuery q)
+{
+	WordEntryPosVector **pos;
+	int			i,
+				k,
+				l,
+				p;
+	WordEntry  *entry;
+	WordEntryPos *post,
+			   *ct;
+	int4		dimt,
+				lenct,
+				dist;
+	float		res = -1.0;
+	QueryOperand **item;
+	int			size = q->size;
+
+	item = SortAndUniqItems(q, &size);
+	if (size < 2)
+	{
+		pfree(item);
+		return calc_rank_or(w, t, q);
+	}
+	pos = (WordEntryPosVector **) palloc0(sizeof(WordEntryPosVector *) * q->size);
+	WEP_SETPOS(POSNULL.pos[0], MAXENTRYPOS - 1);
+
+	for (i = 0; i < size; i++)
+	{
+		entry = find_wordentry(t, q, item[i]);
+		if (!entry)
+			continue;
+
+		if (entry->haspos)
+			pos[i] = _POSVECPTR(t, entry);
+		else
+			pos[i] = &POSNULL;
+
+
+		dimt = pos[i]->npos;
+		post = pos[i]->pos;
+		for (k = 0; k < i; k++)
+		{
+			if (!pos[k])
+				continue;
+			lenct = pos[k]->npos;
+			ct = pos[k]->pos;
+			for (l = 0; l < dimt; l++)
+			{
+				for (p = 0; p < lenct; p++)
+				{
+					dist = Abs((int) WEP_GETPOS(post[l]) - (int) WEP_GETPOS(ct[p]));
+					if (dist || (dist == 0 && (pos[i] == &POSNULL || pos[k] == &POSNULL)))
+					{
+						float		curw;
+
+						if (!dist)
+							dist = MAXENTRYPOS;
+						curw = sqrt(wpos(post[l]) * wpos(ct[p]) * word_distance(dist));
+						res = (res < 0) ? curw : 1.0 - (1.0 - res) * (1.0 - curw);
+					}
+				}
+			}
+		}
+	}
+	pfree(pos);
+	pfree(item);
+	return res;
+}
+
+static float
+calc_rank_or(float *w, TSVector t, TSQuery q)
+{
+	WordEntry  *entry;
+	WordEntryPos *post;
+	int4		dimt,
+				j,
+				i;
+	float		res = 0.0;
+	QueryOperand **item;
+	int			size = q->size;
+
+	item = SortAndUniqItems(q, &size);
+
+	for (i = 0; i < size; i++)
+	{
+		float		resj,
+					wjm;
+		int4		jm;
+
+		entry = find_wordentry(t, q, item[i]);
+		if (!entry)
+			continue;
+
+		if (entry->haspos)
+		{
+			dimt = POSDATALEN(t, entry);
+			post = POSDATAPTR(t, entry);
+		}
+		else
+		{
+			dimt = POSNULL.npos;
+			post = POSNULL.pos;
+		}
+
+		resj = 0.0;
+		wjm = -1.0;
+		jm = 0;
+		for (j = 0; j < dimt; j++)
+		{
+			resj = resj + wpos(post[j]) / ((j + 1) * (j + 1));
+			if (wpos(post[j]) > wjm)
+			{
+				wjm = wpos(post[j]);
+				jm = j;
+			}
+		}
+/*
+		limit (sum(i/i^2),i->inf) = pi^2/6
+		resj = sum(wi/i^2),i=1,noccurence,
+		wi - should be sorted desc,
+		don't sort for now, just choose maximum weight. This should be corrected
+		Oleg Bartunov
+*/
+		res = res + (wjm + resj - wjm / ((jm + 1) * (jm + 1))) / 1.64493406685;
+	}
+	if (size > 0)
+		res = res / size;
+	pfree(item);
+	return res;
+}
+
+static float
+calc_rank(float *w, TSVector t, TSQuery q, int4 method)
+{
+	QueryItem  *item = GETQUERY(q);
+	float		res = 0.0;
+	int			len;
+
+	if (!t->size || !q->size)
+		return 0.0;
+
+	/* XXX: What about NOT? */
+	res = (item->type == QI_OPR && item->operator.oper == OP_AND) ?
+		calc_rank_and(w, t, q) : calc_rank_or(w, t, q);
+
+	if (res < 0)
+		res = 1e-20f;
+
+	if ((method & RANK_NORM_LOGLENGTH) && t->size > 0)
+		res /= log((double) (cnt_length(t) + 1)) / log(2.0);
+
+	if (method & RANK_NORM_LENGTH)
+	{
+		len = cnt_length(t);
+		if (len > 0)
+			res /= (float) len;
+	}
+
+	/* RANK_NORM_EXTDIST not applicable */
+
+	if ((method & RANK_NORM_UNIQ) && t->size > 0)
+		res /= (float) (t->size);
+
+	if ((method & RANK_NORM_LOGUNIQ) && t->size > 0)
+		res /= log((double) (t->size + 1)) / log(2.0);
+
+	if (method & RANK_NORM_RDIVRPLUS1)
+		res /= (res + 1);
+
+	return res;
+}
+
+static float *
+getWeights(ArrayType *win)
+{
+	static float ws[lengthof(weights)];
+	int			i;
+	float4	   *arrdata;
+
+	if (win == 0)
+		return weights;
+
+	if (ARR_NDIM(win) != 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+				 errmsg("array of weight must be one-dimensional")));
+
+	if (ArrayGetNItems(ARR_NDIM(win), ARR_DIMS(win)) < lengthof(weights))
+		ereport(ERROR,
+				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
+				 errmsg("array of weight is too short")));
+
+	if (ARR_HASNULL(win))
+		ereport(ERROR,
+				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+				 errmsg("array of weight must not contain nulls")));
+
+	arrdata = (float4 *) ARR_DATA_PTR(win);
+	for (i = 0; i < lengthof(weights); i++)
+	{
+		ws[i] = (arrdata[i] >= 0) ? arrdata[i] : weights[i];
+		if (ws[i] > 1.0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("weight out of range")));
+	}
+
+	return ws;
+}
+
+Datum
+ts_rank_wttf(PG_FUNCTION_ARGS)
+{
+	ArrayType  *win = (ArrayType *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	TSVector	txt = PG_GETARG_TSVECTOR(1);
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+	int			method = PG_GETARG_INT32(3);
+	float		res;
+
+	res = calc_rank(getWeights(win), txt, query, method);
+
+	PG_FREE_IF_COPY(win, 0);
+	PG_FREE_IF_COPY(txt, 1);
+	PG_FREE_IF_COPY(query, 2);
+	PG_RETURN_FLOAT4(res);
+}
+
+Datum
+ts_rank_wtt(PG_FUNCTION_ARGS)
+{
+	ArrayType  *win = (ArrayType *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	TSVector	txt = PG_GETARG_TSVECTOR(1);
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+	float		res;
+
+	res = calc_rank(getWeights(win), txt, query, DEF_NORM_METHOD);
+
+	PG_FREE_IF_COPY(win, 0);
+	PG_FREE_IF_COPY(txt, 1);
+	PG_FREE_IF_COPY(query, 2);
+	PG_RETURN_FLOAT4(res);
+}
+
+Datum
+ts_rank_ttf(PG_FUNCTION_ARGS)
+{
+	TSVector	txt = PG_GETARG_TSVECTOR(0);
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	int			method = PG_GETARG_INT32(2);
+	float		res;
+
+	res = calc_rank(getWeights(NULL), txt, query, method);
+
+	PG_FREE_IF_COPY(txt, 0);
+	PG_FREE_IF_COPY(query, 1);
+	PG_RETURN_FLOAT4(res);
+}
+
+Datum
+ts_rank_tt(PG_FUNCTION_ARGS)
+{
+	TSVector	txt = PG_GETARG_TSVECTOR(0);
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	float		res;
+
+	res = calc_rank(getWeights(NULL), txt, query, DEF_NORM_METHOD);
+
+	PG_FREE_IF_COPY(txt, 0);
+	PG_FREE_IF_COPY(query, 1);
+	PG_RETURN_FLOAT4(res);
+}
+
+typedef struct
+{
+	QueryItem **item;
+	int16		nitem;
+	uint8		wclass;
+	int32		pos;
+} DocRepresentation;
+
+static int
+compareDocR(const void *va, const void *vb)
+{
+	DocRepresentation *a = (DocRepresentation *) va;
+	DocRepresentation *b = (DocRepresentation *) vb;
+
+	if (a->pos == b->pos)
+		return 0;
+	return (a->pos > b->pos) ? 1 : -1;
+}
+
+typedef struct
+{
+	TSQuery		query;
+	bool	   *operandexist;
+} QueryRepresentation;
+
+#define QR_GET_OPERAND_EXISTS(q, v)		( (q)->operandexist[ ((QueryItem*)(v)) - GETQUERY((q)->query) ] )
+#define QR_SET_OPERAND_EXISTS(q, v)  QR_GET_OPERAND_EXISTS(q,v) = true
+
+static bool
+checkcondition_QueryOperand(void *checkval, QueryOperand *val)
+{
+	QueryRepresentation *qr = (QueryRepresentation *) checkval;
+
+	return QR_GET_OPERAND_EXISTS(qr, val);
+}
+
+typedef struct
+{
+	int			pos;
+	int			p;
+	int			q;
+	DocRepresentation *begin;
+	DocRepresentation *end;
+} Extention;
+
+
+static bool
+Cover(DocRepresentation *doc, int len, QueryRepresentation *qr, Extention *ext)
+{
+	DocRepresentation *ptr;
+	int			lastpos = ext->pos;
+	int			i;
+	bool		found = false;
+
+	/*
+	 * since this function recurses, it could be driven to stack overflow.
+	 * (though any decent compiler will optimize away the tail-recursion.
+	 */
+	check_stack_depth();
+
+	memset(qr->operandexist, 0, sizeof(bool) * qr->query->size);
+
+	ext->p = 0x7fffffff;
+	ext->q = 0;
+	ptr = doc + ext->pos;
+
+	/* find upper bound of cover from current position, move up */
+	while (ptr - doc < len)
+	{
+		for (i = 0; i < ptr->nitem; i++)
+		{
+			if (ptr->item[i]->type == QI_VAL)
+				QR_SET_OPERAND_EXISTS(qr, ptr->item[i]);
+		}
+		if (TS_execute(GETQUERY(qr->query), (void *) qr, false, checkcondition_QueryOperand))
+		{
+			if (ptr->pos > ext->q)
+			{
+				ext->q = ptr->pos;
+				ext->end = ptr;
+				lastpos = ptr - doc;
+				found = true;
+			}
+			break;
+		}
+		ptr++;
+	}
+
+	if (!found)
+		return false;
+
+	memset(qr->operandexist, 0, sizeof(bool) * qr->query->size);
+
+	ptr = doc + lastpos;
+
+	/* find lower bound of cover from found upper bound, move down */
+	while (ptr >= doc + ext->pos)
+	{
+		for (i = 0; i < ptr->nitem; i++)
+			if (ptr->item[i]->type == QI_VAL)
+				QR_SET_OPERAND_EXISTS(qr, ptr->item[i]);
+		if (TS_execute(GETQUERY(qr->query), (void *) qr, true, checkcondition_QueryOperand))
+		{
+			if (ptr->pos < ext->p)
+			{
+				ext->begin = ptr;
+				ext->p = ptr->pos;
+			}
+			break;
+		}
+		ptr--;
+	}
+
+	if (ext->p <= ext->q)
+	{
+		/*
+		 * set position for next try to next lexeme after begining of founded
+		 * cover
+		 */
+		ext->pos = (ptr - doc) + 1;
+		return true;
+	}
+
+	ext->pos++;
+	return Cover(doc, len, qr, ext);
+}
+
+static DocRepresentation *
+get_docrep(TSVector txt, QueryRepresentation *qr, int *doclen)
+{
+	QueryItem  *item = GETQUERY(qr->query);
+	WordEntry  *entry;
+	WordEntryPos *post;
+	int4		dimt,
+				j,
+				i;
+	int			len = qr->query->size * 4,
+				cur = 0;
+	DocRepresentation *doc;
+	char	   *operand;
+
+	doc = (DocRepresentation *) palloc(sizeof(DocRepresentation) * len);
+	operand = GETOPERAND(qr->query);
+
+	for (i = 0; i < qr->query->size; i++)
+	{
+		QueryOperand *curoperand;
+
+		if (item[i].type != QI_VAL)
+			continue;
+
+		curoperand = &item[i].operand;
+
+		if (QR_GET_OPERAND_EXISTS(qr, &item[i]))
+			continue;
+
+		entry = find_wordentry(txt, qr->query, curoperand);
+		if (!entry)
+			continue;
+
+		if (entry->haspos)
+		{
+			dimt = POSDATALEN(txt, entry);
+			post = POSDATAPTR(txt, entry);
+		}
+		else
+		{
+			dimt = POSNULL.npos;
+			post = POSNULL.pos;
+		}
+
+		while (cur + dimt >= len)
+		{
+			len *= 2;
+			doc = (DocRepresentation *) repalloc(doc, sizeof(DocRepresentation) * len);
+		}
+
+		for (j = 0; j < dimt; j++)
+		{
+			if (j == 0)
+			{
+				int			k;
+
+				doc[cur].nitem = 0;
+				doc[cur].item = (QueryItem **) palloc(sizeof(QueryItem *) * qr->query->size);
+
+				for (k = 0; k < qr->query->size; k++)
+				{
+					QueryOperand *kptr = &item[k].operand;
+					QueryOperand *iptr = &item[i].operand;
+
+					if (k == i ||
+						(item[k].type == QI_VAL &&
+						 compareQueryOperand(&kptr, &iptr, operand) == 0))
+					{
+						/*
+						 * if k == i, we've already checked above that it's
+						 * type == Q_VAL
+						 */
+						doc[cur].item[doc[cur].nitem] = item + k;
+						doc[cur].nitem++;
+						QR_SET_OPERAND_EXISTS(qr, item + k);
+					}
+				}
+			}
+			else
+			{
+				doc[cur].nitem = doc[cur - 1].nitem;
+				doc[cur].item = doc[cur - 1].item;
+			}
+			doc[cur].pos = WEP_GETPOS(post[j]);
+			doc[cur].wclass = WEP_GETWEIGHT(post[j]);
+			cur++;
+		}
+	}
+
+	*doclen = cur;
+
+	if (cur > 0)
+	{
+		qsort((void *) doc, cur, sizeof(DocRepresentation), compareDocR);
+		return doc;
+	}
+
+	pfree(doc);
+	return NULL;
+}
+
+static float4
+calc_rank_cd(float4 *arrdata, TSVector txt, TSQuery query, int method)
+{
+	DocRepresentation *doc;
+	int			len,
+				i,
+				doclen = 0;
+	Extention	ext;
+	double		Wdoc = 0.0;
+	double		invws[lengthof(weights)];
+	double		SumDist = 0.0,
+				PrevExtPos = 0.0,
+				CurExtPos = 0.0;
+	int			NExtent = 0;
+	QueryRepresentation qr;
+
+
+	for (i = 0; i < lengthof(weights); i++)
+	{
+		invws[i] = ((double) ((arrdata[i] >= 0) ? arrdata[i] : weights[i]));
+		if (invws[i] > 1.0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("weight out of range")));
+		invws[i] = 1.0 / invws[i];
+	}
+
+	qr.query = query;
+	qr.operandexist = (bool *) palloc0(sizeof(bool) * query->size);
+
+	doc = get_docrep(txt, &qr, &doclen);
+	if (!doc)
+	{
+		pfree(qr.operandexist);
+		return 0.0;
+	}
+
+	MemSet(&ext, 0, sizeof(Extention));
+	while (Cover(doc, doclen, &qr, &ext))
+	{
+		double		Cpos = 0.0;
+		double		InvSum = 0.0;
+		int			nNoise;
+		DocRepresentation *ptr = ext.begin;
+
+		while (ptr <= ext.end)
+		{
+			InvSum += invws[ptr->wclass];
+			ptr++;
+		}
+
+		Cpos = ((double) (ext.end - ext.begin + 1)) / InvSum;
+
+		/*
+		 * if doc are big enough then ext.q may be equal to ext.p due to limit
+		 * of posional information. In this case we approximate number of
+		 * noise word as half cover's length
+		 */
+		nNoise = (ext.q - ext.p) - (ext.end - ext.begin);
+		if (nNoise < 0)
+			nNoise = (ext.end - ext.begin) / 2;
+		Wdoc += Cpos / ((double) (1 + nNoise));
+
+		CurExtPos = ((double) (ext.q + ext.p)) / 2.0;
+		if (NExtent > 0 && CurExtPos > PrevExtPos		/* prevent devision by
+														 * zero in a case of
+				multiple lexize */ )
+			SumDist += 1.0 / (CurExtPos - PrevExtPos);
+
+		PrevExtPos = CurExtPos;
+		NExtent++;
+	}
+
+	if ((method & RANK_NORM_LOGLENGTH) && txt->size > 0)
+		Wdoc /= log((double) (cnt_length(txt) + 1));
+
+	if (method & RANK_NORM_LENGTH)
+	{
+		len = cnt_length(txt);
+		if (len > 0)
+			Wdoc /= (double) len;
+	}
+
+	if ((method & RANK_NORM_EXTDIST) && NExtent > 0 && SumDist > 0)
+		Wdoc /= ((double) NExtent) / SumDist;
+
+	if ((method & RANK_NORM_UNIQ) && txt->size > 0)
+		Wdoc /= (double) (txt->size);
+
+	if ((method & RANK_NORM_LOGUNIQ) && txt->size > 0)
+		Wdoc /= log((double) (txt->size + 1)) / log(2.0);
+
+	if (method & RANK_NORM_RDIVRPLUS1)
+		Wdoc /= (Wdoc + 1);
+
+	pfree(doc);
+
+	pfree(qr.operandexist);
+
+	return (float4) Wdoc;
+}
+
+Datum
+ts_rankcd_wttf(PG_FUNCTION_ARGS)
+{
+	ArrayType  *win = (ArrayType *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	TSVector	txt = PG_GETARG_TSVECTOR(1);
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+	int			method = PG_GETARG_INT32(3);
+	float		res;
+
+	res = calc_rank_cd(getWeights(win), txt, query, method);
+
+	PG_FREE_IF_COPY(win, 0);
+	PG_FREE_IF_COPY(txt, 1);
+	PG_FREE_IF_COPY(query, 2);
+	PG_RETURN_FLOAT4(res);
+}
+
+Datum
+ts_rankcd_wtt(PG_FUNCTION_ARGS)
+{
+	ArrayType  *win = (ArrayType *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	TSVector	txt = PG_GETARG_TSVECTOR(1);
+	TSQuery		query = PG_GETARG_TSQUERY(2);
+	float		res;
+
+	res = calc_rank_cd(getWeights(win), txt, query, DEF_NORM_METHOD);
+
+	PG_FREE_IF_COPY(win, 0);
+	PG_FREE_IF_COPY(txt, 1);
+	PG_FREE_IF_COPY(query, 2);
+	PG_RETURN_FLOAT4(res);
+}
+
+Datum
+ts_rankcd_ttf(PG_FUNCTION_ARGS)
+{
+	TSVector	txt = PG_GETARG_TSVECTOR(0);
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	int			method = PG_GETARG_INT32(2);
+	float		res;
+
+	res = calc_rank_cd(getWeights(NULL), txt, query, method);
+
+	PG_FREE_IF_COPY(txt, 0);
+	PG_FREE_IF_COPY(query, 1);
+	PG_RETURN_FLOAT4(res);
+}
+
+Datum
+ts_rankcd_tt(PG_FUNCTION_ARGS)
+{
+	TSVector	txt = PG_GETARG_TSVECTOR(0);
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	float		res;
+
+	res = calc_rank_cd(getWeights(NULL), txt, query, DEF_NORM_METHOD);
+
+	PG_FREE_IF_COPY(txt, 0);
+	PG_FREE_IF_COPY(query, 1);
+	PG_RETURN_FLOAT4(res);
+}
diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c
new file mode 100644
index 000000000000..486bb6b47b1f
--- /dev/null
+++ b/src/backend/utils/adt/tsvector.c
@@ -0,0 +1,550 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsvector.c
+ *	  I/O functions for tsvector
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.11 2008/01/01 19:45:53 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "libpq/pqformat.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_utils.h"
+#include "utils/memutils.h"
+
+typedef struct
+{
+	WordEntry	entry;			/* must be first! */
+	WordEntryPos *pos;
+	int			poslen;			/* number of elements in pos */
+} WordEntryIN;
+
+
+/* Compare two WordEntryPos values for qsort */
+static int
+comparePos(const void *a, const void *b)
+{
+	int			apos = WEP_GETPOS(*(const WordEntryPos *) a);
+	int			bpos = WEP_GETPOS(*(const WordEntryPos *) b);
+
+	if (apos == bpos)
+		return 0;
+	return (apos > bpos) ? 1 : -1;
+}
+
+/*
+ * Removes duplicate pos entries. If there's two entries with same pos
+ * but different weight, the higher weight is retained.
+ *
+ * Returns new length.
+ */
+static int
+uniquePos(WordEntryPos *a, int l)
+{
+	WordEntryPos *ptr,
+			   *res;
+
+	if (l <= 1)
+		return l;
+
+	qsort((void *) a, l, sizeof(WordEntryPos), comparePos);
+
+	res = a;
+	ptr = a + 1;
+	while (ptr - a < l)
+	{
+		if (WEP_GETPOS(*ptr) != WEP_GETPOS(*res))
+		{
+			res++;
+			*res = *ptr;
+			if (res - a >= MAXNUMPOS - 1 ||
+				WEP_GETPOS(*res) == MAXENTRYPOS - 1)
+				break;
+		}
+		else if (WEP_GETWEIGHT(*ptr) > WEP_GETWEIGHT(*res))
+			WEP_SETWEIGHT(*res, WEP_GETWEIGHT(*ptr));
+		ptr++;
+	}
+
+	return res + 1 - a;
+}
+
+/* Compare two WordEntryIN values for qsort */
+static int
+compareentry(const void *va, const void *vb, void *arg)
+{
+	const WordEntryIN *a = (const WordEntryIN *) va;
+	const WordEntryIN *b = (const WordEntryIN *) vb;
+	char	   *BufferStr = (char *) arg;
+
+	if (a->entry.len == b->entry.len)
+	{
+		return strncmp(&BufferStr[a->entry.pos],
+					   &BufferStr[b->entry.pos],
+					   a->entry.len);
+	}
+
+	return (a->entry.len > b->entry.len) ? 1 : -1;
+}
+
+/*
+ * Sort an array of WordEntryIN, remove duplicates.
+ * *outbuflen receives the amount of space needed for strings and positions.
+ */
+static int
+uniqueentry(WordEntryIN *a, int l, char *buf, int *outbuflen)
+{
+	int			buflen;
+	WordEntryIN *ptr,
+			   *res;
+
+	Assert(l >= 1);
+
+	if (l > 1)
+		qsort_arg((void *) a, l, sizeof(WordEntryIN), compareentry,
+				  (void *) buf);
+
+	buflen = 0;
+	res = a;
+	ptr = a + 1;
+	while (ptr - a < l)
+	{
+		if (!(ptr->entry.len == res->entry.len &&
+			  strncmp(&buf[ptr->entry.pos], &buf[res->entry.pos],
+					  res->entry.len) == 0))
+		{
+			/* done accumulating data into *res, count space needed */
+			buflen += res->entry.len;
+			if (res->entry.haspos)
+			{
+				res->poslen = uniquePos(res->pos, res->poslen);
+				buflen = SHORTALIGN(buflen);
+				buflen += res->poslen * sizeof(WordEntryPos) + sizeof(uint16);
+			}
+			res++;
+			memcpy(res, ptr, sizeof(WordEntryIN));
+		}
+		else if (ptr->entry.haspos)
+		{
+			if (res->entry.haspos)
+			{
+				/* append ptr's positions to res's positions */
+				int			newlen = ptr->poslen + res->poslen;
+
+				res->pos = (WordEntryPos *)
+					repalloc(res->pos, newlen * sizeof(WordEntryPos));
+				memcpy(&res->pos[res->poslen], ptr->pos,
+					   ptr->poslen * sizeof(WordEntryPos));
+				res->poslen = newlen;
+				pfree(ptr->pos);
+			}
+			else
+			{
+				/* just give ptr's positions to pos */
+				res->entry.haspos = 1;
+				res->pos = ptr->pos;
+				res->poslen = ptr->poslen;
+			}
+		}
+		ptr++;
+	}
+
+	/* count space needed for last item */
+	buflen += res->entry.len;
+	if (res->entry.haspos)
+	{
+		res->poslen = uniquePos(res->pos, res->poslen);
+		buflen = SHORTALIGN(buflen);
+		buflen += res->poslen * sizeof(WordEntryPos) + sizeof(uint16);
+	}
+
+	*outbuflen = buflen;
+	return res + 1 - a;
+}
+
+static int
+WordEntryCMP(WordEntry *a, WordEntry *b, char *buf)
+{
+	return compareentry(a, b, buf);
+}
+
+
+Datum
+tsvectorin(PG_FUNCTION_ARGS)
+{
+	char	   *buf = PG_GETARG_CSTRING(0);
+	TSVectorParseState state;
+	WordEntryIN *arr;
+	int			totallen;
+	int			arrlen;			/* allocated size of arr */
+	WordEntry  *inarr;
+	int			len = 0;
+	TSVector	in;
+	int			i;
+	char	   *token;
+	int			toklen;
+	WordEntryPos *pos;
+	int			poslen;
+	char	   *strbuf;
+	int			stroff;
+
+	/*
+	 * Tokens are appended to tmpbuf, cur is a pointer to the end of used
+	 * space in tmpbuf.
+	 */
+	char	   *tmpbuf;
+	char	   *cur;
+	int			buflen = 256;	/* allocated size of tmpbuf */
+
+	pg_verifymbstr(buf, strlen(buf), false);
+
+	state = init_tsvector_parser(buf, false, false);
+
+	arrlen = 64;
+	arr = (WordEntryIN *) palloc(sizeof(WordEntryIN) * arrlen);
+	cur = tmpbuf = (char *) palloc(buflen);
+
+	while (gettoken_tsvector(state, &token, &toklen, &pos, &poslen, NULL))
+	{
+		if (toklen >= MAXSTRLEN)
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("word is too long (%ld bytes, max %ld bytes)",
+							(long) toklen,
+							(long) (MAXSTRLEN - 1))));
+
+		if (cur - tmpbuf > MAXSTRPOS)
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("string is too long for tsvector")));
+
+		/*
+		 * Enlarge buffers if needed
+		 */
+		if (len >= arrlen)
+		{
+			arrlen *= 2;
+			arr = (WordEntryIN *)
+				repalloc((void *) arr, sizeof(WordEntryIN) * arrlen);
+		}
+		while ((cur - tmpbuf) + toklen >= buflen)
+		{
+			int			dist = cur - tmpbuf;
+
+			buflen *= 2;
+			tmpbuf = (char *) repalloc((void *) tmpbuf, buflen);
+			cur = tmpbuf + dist;
+		}
+		arr[len].entry.len = toklen;
+		arr[len].entry.pos = cur - tmpbuf;
+		memcpy((void *) cur, (void *) token, toklen);
+		cur += toklen;
+
+		if (poslen != 0)
+		{
+			arr[len].entry.haspos = 1;
+			arr[len].pos = pos;
+			arr[len].poslen = poslen;
+		}
+		else
+		{
+			arr[len].entry.haspos = 0;
+			arr[len].pos = NULL;
+			arr[len].poslen = 0;
+		}
+		len++;
+	}
+
+	close_tsvector_parser(state);
+
+	if (len > 0)
+		len = uniqueentry(arr, len, tmpbuf, &buflen);
+	else
+		buflen = 0;
+
+	if (buflen > MAXSTRPOS)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("string is too long for tsvector")));
+
+	totallen = CALCDATASIZE(len, buflen);
+	in = (TSVector) palloc0(totallen);
+	SET_VARSIZE(in, totallen);
+	in->size = len;
+	inarr = ARRPTR(in);
+	strbuf = STRPTR(in);
+	stroff = 0;
+	for (i = 0; i < len; i++)
+	{
+		memcpy(strbuf + stroff, &tmpbuf[arr[i].entry.pos], arr[i].entry.len);
+		arr[i].entry.pos = stroff;
+		stroff += arr[i].entry.len;
+		if (arr[i].entry.haspos)
+		{
+			if (arr[i].poslen > 0xFFFF)
+				elog(ERROR, "positions array too long");
+
+			/* Copy number of positions */
+			stroff = SHORTALIGN(stroff);
+			*(uint16 *) (strbuf + stroff) = (uint16) arr[i].poslen;
+			stroff += sizeof(uint16);
+
+			/* Copy positions */
+			memcpy(strbuf + stroff, arr[i].pos, arr[i].poslen * sizeof(WordEntryPos));
+			stroff += arr[i].poslen * sizeof(WordEntryPos);
+
+			pfree(arr[i].pos);
+		}
+		inarr[i] = arr[i].entry;
+	}
+
+	Assert((strbuf + stroff - (char *) in) == totallen);
+
+	PG_RETURN_TSVECTOR(in);
+}
+
+Datum
+tsvectorout(PG_FUNCTION_ARGS)
+{
+	TSVector	out = PG_GETARG_TSVECTOR(0);
+	char	   *outbuf;
+	int4		i,
+				lenbuf = 0,
+				pp;
+	WordEntry  *ptr = ARRPTR(out);
+	char	   *curbegin,
+			   *curin,
+			   *curout;
+
+	lenbuf = out->size * 2 /* '' */ + out->size - 1 /* space */ + 2 /* \0 */ ;
+	for (i = 0; i < out->size; i++)
+	{
+		lenbuf += ptr[i].len * 2 * pg_database_encoding_max_length() /* for escape */ ;
+		if (ptr[i].haspos)
+			lenbuf += 1 /* : */ + 7 /* int2 + , + weight */ * POSDATALEN(out, &(ptr[i]));
+	}
+
+	curout = outbuf = (char *) palloc(lenbuf);
+	for (i = 0; i < out->size; i++)
+	{
+		curbegin = curin = STRPTR(out) + ptr->pos;
+		if (i != 0)
+			*curout++ = ' ';
+		*curout++ = '\'';
+		while (curin - curbegin < ptr->len)
+		{
+			int			len = pg_mblen(curin);
+
+			if (t_iseq(curin, '\''))
+				*curout++ = '\'';
+			else if (t_iseq(curin, '\\'))
+				*curout++ = '\\';
+
+			while (len--)
+				*curout++ = *curin++;
+		}
+
+		*curout++ = '\'';
+		if ((pp = POSDATALEN(out, ptr)) != 0)
+		{
+			WordEntryPos *wptr;
+
+			*curout++ = ':';
+			wptr = POSDATAPTR(out, ptr);
+			while (pp)
+			{
+				curout += sprintf(curout, "%d", WEP_GETPOS(*wptr));
+				switch (WEP_GETWEIGHT(*wptr))
+				{
+					case 3:
+						*curout++ = 'A';
+						break;
+					case 2:
+						*curout++ = 'B';
+						break;
+					case 1:
+						*curout++ = 'C';
+						break;
+					case 0:
+					default:
+						break;
+				}
+
+				if (pp > 1)
+					*curout++ = ',';
+				pp--;
+				wptr++;
+			}
+		}
+		ptr++;
+	}
+
+	*curout = '\0';
+	PG_FREE_IF_COPY(out, 0);
+	PG_RETURN_CSTRING(outbuf);
+}
+
+/*
+ * Binary Input / Output functions. The binary format is as follows:
+ *
+ * uint32	number of lexemes
+ *
+ * for each lexeme:
+ *		lexeme text in client encoding, null-terminated
+ *		uint16	number of positions
+ *		for each position:
+ *			uint16 WordEntryPos
+ */
+
+Datum
+tsvectorsend(PG_FUNCTION_ARGS)
+{
+	TSVector	vec = PG_GETARG_TSVECTOR(0);
+	StringInfoData buf;
+	int			i,
+				j;
+	WordEntry  *weptr = ARRPTR(vec);
+
+	pq_begintypsend(&buf);
+
+	pq_sendint(&buf, vec->size, sizeof(int32));
+	for (i = 0; i < vec->size; i++)
+	{
+		uint16		npos;
+
+		/*
+		 * the strings in the TSVector array are not null-terminated, so we
+		 * have to send the null-terminator separately
+		 */
+		pq_sendtext(&buf, STRPTR(vec) + weptr->pos, weptr->len);
+		pq_sendbyte(&buf, '\0');
+
+		npos = POSDATALEN(vec, weptr);
+		pq_sendint(&buf, npos, sizeof(uint16));
+
+		if (npos > 0)
+		{
+			WordEntryPos *wepptr = POSDATAPTR(vec, weptr);
+
+			for (j = 0; j < npos; j++)
+				pq_sendint(&buf, wepptr[j], sizeof(WordEntryPos));
+		}
+		weptr++;
+	}
+
+	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
+}
+
+Datum
+tsvectorrecv(PG_FUNCTION_ARGS)
+{
+	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
+	TSVector	vec;
+	int			i;
+	int32		nentries;
+	int			datalen;		/* number of bytes used in the variable size
+								 * area after fixed size TSVector header and
+								 * WordEntries */
+	Size		hdrlen;
+	Size		len;			/* allocated size of vec */
+
+	nentries = pq_getmsgint(buf, sizeof(int32));
+	if (nentries < 0 || nentries > (MaxAllocSize / sizeof(WordEntry)))
+		elog(ERROR, "invalid size of tsvector");
+
+	hdrlen = DATAHDRSIZE + sizeof(WordEntry) * nentries;
+
+	len = hdrlen * 2;			/* times two to make room for lexemes */
+	vec = (TSVector) palloc0(len);
+	vec->size = nentries;
+
+	datalen = 0;
+	for (i = 0; i < nentries; i++)
+	{
+		const char *lexeme;
+		uint16		npos;
+		size_t		lex_len;
+
+		lexeme = pq_getmsgstring(buf);
+		npos = (uint16) pq_getmsgint(buf, sizeof(uint16));
+
+		/* sanity checks */
+
+		lex_len = strlen(lexeme);
+		if (lex_len < 0 || lex_len > MAXSTRLEN)
+			elog(ERROR, "invalid tsvector: lexeme too long");
+
+		if (datalen > MAXSTRPOS)
+			elog(ERROR, "invalid tsvector: maximum total lexeme length exceeded");
+
+		if (npos > MAXNUMPOS)
+			elog(ERROR, "unexpected number of tsvector positions");
+
+		/*
+		 * Looks valid. Fill the WordEntry struct, and copy lexeme.
+		 *
+		 * But make sure the buffer is large enough first.
+		 */
+		while (hdrlen + SHORTALIGN(datalen + lex_len) +
+			   (npos + 1) * sizeof(WordEntryPos) >= len)
+		{
+			len *= 2;
+			vec = (TSVector) repalloc(vec, len);
+		}
+
+		vec->entries[i].haspos = (npos > 0) ? 1 : 0;
+		vec->entries[i].len = lex_len;
+		vec->entries[i].pos = datalen;
+
+		memcpy(STRPTR(vec) + datalen, lexeme, lex_len);
+
+		datalen += lex_len;
+
+		if (i > 0 && WordEntryCMP(&vec->entries[i],
+								  &vec->entries[i - 1],
+								  STRPTR(vec)) <= 0)
+			elog(ERROR, "lexemes are misordered");
+
+		/* Receive positions */
+		if (npos > 0)
+		{
+			uint16		j;
+			WordEntryPos *wepptr;
+
+			/*
+			 * Pad to 2-byte alignment if necessary. Though we used palloc0
+			 * for the initial allocation, subsequent repalloc'd memory areas
+			 * are not initialized to zero.
+			 */
+			if (datalen != SHORTALIGN(datalen))
+			{
+				*(STRPTR(vec) + datalen) = '\0';
+				datalen = SHORTALIGN(datalen);
+			}
+
+			memcpy(STRPTR(vec) + datalen, &npos, sizeof(uint16));
+
+			wepptr = POSDATAPTR(vec, &vec->entries[i]);
+			for (j = 0; j < npos; j++)
+			{
+				wepptr[j] = (WordEntryPos) pq_getmsgint(buf, sizeof(WordEntryPos));
+				if (j > 0 && WEP_GETPOS(wepptr[j]) <= WEP_GETPOS(wepptr[j - 1]))
+					elog(ERROR, "position information is misordered");
+			}
+
+			datalen += (npos + 1) * sizeof(WordEntry);
+		}
+	}
+
+	SET_VARSIZE(vec, hdrlen + datalen);
+
+	PG_RETURN_TSVECTOR(vec);
+}
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
new file mode 100644
index 000000000000..09ed8480123e
--- /dev/null
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -0,0 +1,1462 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsvector_op.c
+ *	  operations over tsvector
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.12.2.1 2008/04/08 18:20:34 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "catalog/namespace.h"
+#include "commands/trigger.h"
+#include "executor/spi.h"
+#include "funcapi.h"
+#include "mb/pg_wchar.h"
+#include "miscadmin.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_utils.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+
+
+typedef struct
+{
+	WordEntry  *arrb;
+	WordEntry  *arre;
+	char	   *values;
+	char	   *operand;
+} CHKVAL;
+
+typedef struct
+{
+	uint32		cur;
+	TSVector	stat;
+} StatStorage;
+
+typedef struct
+{
+	uint32		len;
+	uint32		pos;
+	uint32		ndoc;
+	uint32		nentry;
+} StatEntry;
+
+typedef struct
+{
+	int32		vl_len_;		/* varlena header (do not touch directly!) */
+	int4		size;
+	int4		weight;
+	char		data[1];
+} tsstat;
+
+#define STATHDRSIZE (sizeof(int4) * 4)
+#define CALCSTATSIZE(x, lenstr) ( (x) * sizeof(StatEntry) + STATHDRSIZE + (lenstr) )
+#define STATPTR(x)	( (StatEntry*) ( (char*)(x) + STATHDRSIZE ) )
+#define STATSTRPTR(x)	( (char*)(x) + STATHDRSIZE + ( sizeof(StatEntry) * ((TSVector)(x))->size ) )
+#define STATSTRSIZE(x)	( VARSIZE((TSVector)(x)) - STATHDRSIZE - ( sizeof(StatEntry) * ((TSVector)(x))->size ) )
+
+
+static Datum tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column);
+
+
+/*
+ * Check if datatype is the specified type or equivalent to it.
+ *
+ * Note: we could just do getBaseType() unconditionally, but since that's
+ * a relatively expensive catalog lookup that most users won't need, we
+ * try the straight comparison first.
+ */
+static bool
+is_expected_type(Oid typid, Oid expected_type)
+{
+	if (typid == expected_type)
+		return true;
+	typid = getBaseType(typid);
+	if (typid == expected_type)
+		return true;
+	return false;
+}
+
+/* Check if datatype is TEXT or binary-equivalent to it */
+static bool
+is_text_type(Oid typid)
+{
+	/* varchar(n) and char(n) are binary-compatible with text */
+	if (typid == TEXTOID || typid == VARCHAROID || typid == BPCHAROID)
+		return true;
+	/* Allow domains over these types, too */
+	typid = getBaseType(typid);
+	if (typid == TEXTOID || typid == VARCHAROID || typid == BPCHAROID)
+		return true;
+	return false;
+}
+
+
+/*
+ * Order: haspos, len, word, for all positions (pos, weight)
+ */
+static int
+silly_cmp_tsvector(const TSVector a, const TSVector b)
+{
+	if (VARSIZE(a) < VARSIZE(b))
+		return -1;
+	else if (VARSIZE(a) > VARSIZE(b))
+		return 1;
+	else if (a->size < b->size)
+		return -1;
+	else if (a->size > b->size)
+		return 1;
+	else
+	{
+		WordEntry  *aptr = ARRPTR(a);
+		WordEntry  *bptr = ARRPTR(b);
+		int			i = 0;
+		int			res;
+
+
+		for (i = 0; i < a->size; i++)
+		{
+			if (aptr->haspos != bptr->haspos)
+			{
+				return (aptr->haspos > bptr->haspos) ? -1 : 1;
+			}
+			else if (aptr->len != bptr->len)
+			{
+				return (aptr->len > bptr->len) ? -1 : 1;
+			}
+			else if ((res = strncmp(STRPTR(a) + aptr->pos, STRPTR(b) + bptr->pos, bptr->len)) != 0)
+			{
+				return res;
+			}
+			else if (aptr->haspos)
+			{
+				WordEntryPos *ap = POSDATAPTR(a, aptr);
+				WordEntryPos *bp = POSDATAPTR(b, bptr);
+				int			j;
+
+				if (POSDATALEN(a, aptr) != POSDATALEN(b, bptr))
+					return (POSDATALEN(a, aptr) > POSDATALEN(b, bptr)) ? -1 : 1;
+
+				for (j = 0; j < POSDATALEN(a, aptr); j++)
+				{
+					if (WEP_GETPOS(*ap) != WEP_GETPOS(*bp))
+					{
+						return (WEP_GETPOS(*ap) > WEP_GETPOS(*bp)) ? -1 : 1;
+					}
+					else if (WEP_GETWEIGHT(*ap) != WEP_GETWEIGHT(*bp))
+					{
+						return (WEP_GETWEIGHT(*ap) > WEP_GETWEIGHT(*bp)) ? -1 : 1;
+					}
+					ap++, bp++;
+				}
+			}
+
+			aptr++;
+			bptr++;
+		}
+	}
+
+	return 0;
+}
+
+#define TSVECTORCMPFUNC( type, action, ret )			\
+Datum													\
+tsvector_##type(PG_FUNCTION_ARGS)						\
+{														\
+	TSVector	a = PG_GETARG_TSVECTOR(0);				\
+	TSVector	b = PG_GETARG_TSVECTOR(1);				\
+	int			res = silly_cmp_tsvector(a, b);			\
+	PG_FREE_IF_COPY(a,0);								\
+	PG_FREE_IF_COPY(b,1);								\
+	PG_RETURN_##ret( res action 0 );					\
+}
+
+TSVECTORCMPFUNC(lt, <, BOOL);
+TSVECTORCMPFUNC(le, <=, BOOL);
+TSVECTORCMPFUNC(eq, ==, BOOL);
+TSVECTORCMPFUNC(ge, >=, BOOL);
+TSVECTORCMPFUNC(gt, >, BOOL);
+TSVECTORCMPFUNC(ne, !=, BOOL);
+TSVECTORCMPFUNC(cmp, +, INT32);
+
+Datum
+tsvector_strip(PG_FUNCTION_ARGS)
+{
+	TSVector	in = PG_GETARG_TSVECTOR(0);
+	TSVector	out;
+	int			i,
+				len = 0;
+	WordEntry  *arrin = ARRPTR(in),
+			   *arrout;
+	char	   *cur;
+
+	for (i = 0; i < in->size; i++)
+		len += arrin[i].len;
+
+	len = CALCDATASIZE(in->size, len);
+	out = (TSVector) palloc0(len);
+	SET_VARSIZE(out, len);
+	out->size = in->size;
+	arrout = ARRPTR(out);
+	cur = STRPTR(out);
+	for (i = 0; i < in->size; i++)
+	{
+		memcpy(cur, STRPTR(in) + arrin[i].pos, arrin[i].len);
+		arrout[i].haspos = 0;
+		arrout[i].len = arrin[i].len;
+		arrout[i].pos = cur - STRPTR(out);
+		cur += arrout[i].len;
+	}
+
+	PG_FREE_IF_COPY(in, 0);
+	PG_RETURN_POINTER(out);
+}
+
+Datum
+tsvector_length(PG_FUNCTION_ARGS)
+{
+	TSVector	in = PG_GETARG_TSVECTOR(0);
+	int4		ret = in->size;
+
+	PG_FREE_IF_COPY(in, 0);
+	PG_RETURN_INT32(ret);
+}
+
+Datum
+tsvector_setweight(PG_FUNCTION_ARGS)
+{
+	TSVector	in = PG_GETARG_TSVECTOR(0);
+	char		cw = PG_GETARG_CHAR(1);
+	TSVector	out;
+	int			i,
+				j;
+	WordEntry  *entry;
+	WordEntryPos *p;
+	int			w = 0;
+
+	switch (cw)
+	{
+		case 'A':
+		case 'a':
+			w = 3;
+			break;
+		case 'B':
+		case 'b':
+			w = 2;
+			break;
+		case 'C':
+		case 'c':
+			w = 1;
+			break;
+		case 'D':
+		case 'd':
+			w = 0;
+			break;
+		default:
+			/* internal error */
+			elog(ERROR, "unrecognized weight: %d", cw);
+	}
+
+	out = (TSVector) palloc(VARSIZE(in));
+	memcpy(out, in, VARSIZE(in));
+	entry = ARRPTR(out);
+	i = out->size;
+	while (i--)
+	{
+		if ((j = POSDATALEN(out, entry)) != 0)
+		{
+			p = POSDATAPTR(out, entry);
+			while (j--)
+			{
+				WEP_SETWEIGHT(*p, w);
+				p++;
+			}
+		}
+		entry++;
+	}
+
+	PG_FREE_IF_COPY(in, 0);
+	PG_RETURN_POINTER(out);
+}
+
+static int
+compareEntry(char *ptra, WordEntry *a, char *ptrb, WordEntry *b)
+{
+	if (a->len == b->len)
+	{
+		return strncmp(
+					   ptra + a->pos,
+					   ptrb + b->pos,
+					   a->len);
+	}
+	return (a->len > b->len) ? 1 : -1;
+}
+
+/*
+ * Add positions from src to dest after offsetting them by maxpos.
+ * Return the number added (might be less than expected due to overflow)
+ */
+static int4
+add_pos(TSVector src, WordEntry *srcptr,
+		TSVector dest, WordEntry *destptr,
+		int4 maxpos)
+{
+	uint16	   *clen = &_POSVECPTR(dest, destptr)->npos;
+	int			i;
+	uint16		slen = POSDATALEN(src, srcptr),
+				startlen;
+	WordEntryPos *spos = POSDATAPTR(src, srcptr),
+			   *dpos = POSDATAPTR(dest, destptr);
+
+	if (!destptr->haspos)
+		*clen = 0;
+
+	startlen = *clen;
+	for (i = 0;
+		 i < slen && *clen < MAXNUMPOS &&
+		 (*clen == 0 || WEP_GETPOS(dpos[*clen - 1]) != MAXENTRYPOS - 1);
+		 i++)
+	{
+		WEP_SETWEIGHT(dpos[*clen], WEP_GETWEIGHT(spos[i]));
+		WEP_SETPOS(dpos[*clen], LIMITPOS(WEP_GETPOS(spos[i]) + maxpos));
+		(*clen)++;
+	}
+
+	if (*clen != startlen)
+		destptr->haspos = 1;
+	return *clen - startlen;
+}
+
+
+Datum
+tsvector_concat(PG_FUNCTION_ARGS)
+{
+	TSVector	in1 = PG_GETARG_TSVECTOR(0);
+	TSVector	in2 = PG_GETARG_TSVECTOR(1);
+	TSVector	out;
+	WordEntry  *ptr;
+	WordEntry  *ptr1,
+			   *ptr2;
+	WordEntryPos *p;
+	int			maxpos = 0,
+				i,
+				j,
+				i1,
+				i2,
+				dataoff,
+				output_bytes,
+				output_size;
+	char	   *data,
+			   *data1,
+			   *data2;
+
+	/* Get max position in in1; we'll need this to offset in2's positions */
+	ptr = ARRPTR(in1);
+	i = in1->size;
+	while (i--)
+	{
+		if ((j = POSDATALEN(in1, ptr)) != 0)
+		{
+			p = POSDATAPTR(in1, ptr);
+			while (j--)
+			{
+				if (WEP_GETPOS(*p) > maxpos)
+					maxpos = WEP_GETPOS(*p);
+				p++;
+			}
+		}
+		ptr++;
+	}
+
+	ptr1 = ARRPTR(in1);
+	ptr2 = ARRPTR(in2);
+	data1 = STRPTR(in1);
+	data2 = STRPTR(in2);
+	i1 = in1->size;
+	i2 = in2->size;
+
+	/*
+	 * Conservative estimate of space needed.  We might need all the data
+	 * in both inputs, and conceivably add a pad byte before position data
+	 * for each item where there was none before.
+	 */
+	output_bytes = VARSIZE(in1) + VARSIZE(in2) + i1 + i2;
+
+	out = (TSVector) palloc0(output_bytes);
+	SET_VARSIZE(out, output_bytes);
+
+	/*
+	 * We must make out->size valid so that STRPTR(out) is sensible.  We'll
+	 * collapse out any unused space at the end.
+	 */
+	out->size = in1->size + in2->size;
+
+	ptr = ARRPTR(out);
+	data = STRPTR(out);
+	dataoff = 0;
+	while (i1 && i2)
+	{
+		int			cmp = compareEntry(data1, ptr1, data2, ptr2);
+
+		if (cmp < 0)
+		{						/* in1 first */
+			ptr->haspos = ptr1->haspos;
+			ptr->len = ptr1->len;
+			memcpy(data + dataoff, data1 + ptr1->pos, ptr1->len);
+			ptr->pos = dataoff;
+			dataoff += ptr1->len;
+			if (ptr->haspos)
+			{
+				dataoff = SHORTALIGN(dataoff);
+				memcpy(data + dataoff, _POSVECPTR(in1, ptr1), POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16));
+				dataoff += POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16);
+			}
+
+			ptr++;
+			ptr1++;
+			i1--;
+		}
+		else if (cmp > 0)
+		{						/* in2 first */
+			ptr->haspos = ptr2->haspos;
+			ptr->len = ptr2->len;
+			memcpy(data + dataoff, data2 + ptr2->pos, ptr2->len);
+			ptr->pos = dataoff;
+			dataoff += ptr2->len;
+			if (ptr->haspos)
+			{
+				int			addlen = add_pos(in2, ptr2, out, ptr, maxpos);
+
+				if (addlen == 0)
+					ptr->haspos = 0;
+				else
+				{
+					dataoff = SHORTALIGN(dataoff);
+					dataoff += addlen * sizeof(WordEntryPos) + sizeof(uint16);
+				}
+			}
+
+			ptr++;
+			ptr2++;
+			i2--;
+		}
+		else
+		{
+			ptr->haspos = ptr1->haspos | ptr2->haspos;
+			ptr->len = ptr1->len;
+			memcpy(data + dataoff, data1 + ptr1->pos, ptr1->len);
+			ptr->pos = dataoff;
+			dataoff += ptr1->len;
+			if (ptr->haspos)
+			{
+				if (ptr1->haspos)
+				{
+					dataoff = SHORTALIGN(dataoff);
+					memcpy(data + dataoff, _POSVECPTR(in1, ptr1), POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16));
+					dataoff += POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16);
+					if (ptr2->haspos)
+						dataoff += add_pos(in2, ptr2, out, ptr, maxpos) * sizeof(WordEntryPos);
+				}
+				else	/* must have ptr2->haspos */
+				{
+					int			addlen = add_pos(in2, ptr2, out, ptr, maxpos);
+
+					if (addlen == 0)
+						ptr->haspos = 0;
+					else
+					{
+						dataoff = SHORTALIGN(dataoff);
+						dataoff += addlen * sizeof(WordEntryPos) + sizeof(uint16);
+					}
+				}
+			}
+
+			ptr++;
+			ptr1++;
+			ptr2++;
+			i1--;
+			i2--;
+		}
+	}
+
+	while (i1)
+	{
+		ptr->haspos = ptr1->haspos;
+		ptr->len = ptr1->len;
+		memcpy(data + dataoff, data1 + ptr1->pos, ptr1->len);
+		ptr->pos = dataoff;
+		dataoff += ptr1->len;
+		if (ptr->haspos)
+		{
+			dataoff = SHORTALIGN(dataoff);
+			memcpy(data + dataoff, _POSVECPTR(in1, ptr1), POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16));
+			dataoff += POSDATALEN(in1, ptr1) * sizeof(WordEntryPos) + sizeof(uint16);
+		}
+
+		ptr++;
+		ptr1++;
+		i1--;
+	}
+
+	while (i2)
+	{
+		ptr->haspos = ptr2->haspos;
+		ptr->len = ptr2->len;
+		memcpy(data + dataoff, data2 + ptr2->pos, ptr2->len);
+		ptr->pos = dataoff;
+		dataoff += ptr2->len;
+		if (ptr->haspos)
+		{
+			int			addlen = add_pos(in2, ptr2, out, ptr, maxpos);
+
+			if (addlen == 0)
+				ptr->haspos = 0;
+			else
+			{
+				dataoff = SHORTALIGN(dataoff);
+				dataoff += addlen * sizeof(WordEntryPos) + sizeof(uint16);
+			}
+		}
+
+		ptr++;
+		ptr2++;
+		i2--;
+	}
+
+	/*
+	 * Instead of checking each offset individually, we check for overflow of
+	 * pos fields once at the end.
+	 */
+	if (dataoff > MAXSTRPOS)
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("string is too long for tsvector")));
+
+	/*
+	 * Adjust sizes (asserting that we didn't overrun the original estimates)
+	 * and collapse out any unused array entries.
+	 */
+	output_size = ptr - ARRPTR(out);
+	Assert(output_size <= out->size);
+	out->size = output_size;
+	if (data != STRPTR(out))
+		memmove(STRPTR(out), data, dataoff);
+	output_bytes = CALCDATASIZE(out->size, dataoff);
+	Assert(output_bytes <= VARSIZE(out));
+	SET_VARSIZE(out, output_bytes);
+
+	PG_FREE_IF_COPY(in1, 0);
+	PG_FREE_IF_COPY(in2, 1);
+	PG_RETURN_POINTER(out);
+}
+
+/*
+ * compare 2 string values
+ */
+static int4
+ValCompare(CHKVAL *chkval, WordEntry *ptr, QueryOperand *item)
+{
+	if (ptr->len == item->length)
+		return strncmp(
+					   &(chkval->values[ptr->pos]),
+					   &(chkval->operand[item->distance]),
+					   item->length);
+
+	return (ptr->len > item->length) ? 1 : -1;
+}
+
+/*
+ * check weight info
+ */
+static bool
+checkclass_str(CHKVAL *chkval, WordEntry *val, QueryOperand *item)
+{
+	WordEntryPosVector *posvec;
+	WordEntryPos *ptr;
+	uint16		len;
+
+	posvec = (WordEntryPosVector *)
+		(chkval->values + SHORTALIGN(val->pos + val->len));
+
+	len = posvec->npos;
+	ptr = posvec->pos;
+
+	while (len--)
+	{
+		if (item->weight & (1 << WEP_GETWEIGHT(*ptr)))
+			return true;
+		ptr++;
+	}
+	return false;
+}
+
+/*
+ * is there value 'val' in array or not ?
+ */
+static bool
+checkcondition_str(void *checkval, QueryOperand *val)
+{
+	CHKVAL	   *chkval = (CHKVAL *) checkval;
+	WordEntry  *StopLow = chkval->arrb;
+	WordEntry  *StopHigh = chkval->arre;
+	WordEntry  *StopMiddle;
+	int			difference;
+
+	/* Loop invariant: StopLow <= val < StopHigh */
+
+	while (StopLow < StopHigh)
+	{
+		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
+		difference = ValCompare(chkval, StopMiddle, val);
+		if (difference == 0)
+			return (val->weight && StopMiddle->haspos) ?
+				checkclass_str(chkval, StopMiddle, val) : true;
+		else if (difference < 0)
+			StopLow = StopMiddle + 1;
+		else
+			StopHigh = StopMiddle;
+	}
+
+	return (false);
+}
+
+/*
+ * check for boolean condition.
+ *
+ * if calcnot is false, NOT expressions are always evaluated to be true. This is used in ranking.
+ * checkval can be used to pass information to the callback. TS_execute doesn't
+ * do anything with it.
+ * chkcond is a callback function used to evaluate each VAL node in the query.
+ *
+ */
+bool
+TS_execute(QueryItem *curitem, void *checkval, bool calcnot,
+		   bool (*chkcond) (void *checkval, QueryOperand *val))
+{
+	/* since this function recurses, it could be driven to stack overflow */
+	check_stack_depth();
+
+	if (curitem->type == QI_VAL)
+		return chkcond(checkval, (QueryOperand *) curitem);
+
+	switch (curitem->operator.oper)
+	{
+		case OP_NOT:
+			if (calcnot)
+				return !TS_execute(curitem + 1, checkval, calcnot, chkcond);
+			else
+				return true;
+		case OP_AND:
+			if (TS_execute(curitem + curitem->operator.left, checkval, calcnot, chkcond))
+				return TS_execute(curitem + 1, checkval, calcnot, chkcond);
+			else
+				return false;
+
+		case OP_OR:
+			if (TS_execute(curitem + curitem->operator.left, checkval, calcnot, chkcond))
+				return true;
+			else
+				return TS_execute(curitem + 1, checkval, calcnot, chkcond);
+
+		default:
+			elog(ERROR, "unrecognized operator: %d", curitem->operator.oper);
+	}
+
+	/* not reachable, but keep compiler quiet */
+	return false;
+}
+
+/*
+ * boolean operations
+ */
+Datum
+ts_match_qv(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall2(ts_match_vq,
+										PG_GETARG_DATUM(1),
+										PG_GETARG_DATUM(0)));
+}
+
+Datum
+ts_match_vq(PG_FUNCTION_ARGS)
+{
+	TSVector	val = PG_GETARG_TSVECTOR(0);
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	CHKVAL		chkval;
+	bool		result;
+
+	if (!val->size || !query->size)
+	{
+		PG_FREE_IF_COPY(val, 0);
+		PG_FREE_IF_COPY(query, 1);
+		PG_RETURN_BOOL(false);
+	}
+
+	chkval.arrb = ARRPTR(val);
+	chkval.arre = chkval.arrb + val->size;
+	chkval.values = STRPTR(val);
+	chkval.operand = GETOPERAND(query);
+	result = TS_execute(
+						GETQUERY(query),
+						&chkval,
+						true,
+						checkcondition_str
+		);
+
+	PG_FREE_IF_COPY(val, 0);
+	PG_FREE_IF_COPY(query, 1);
+	PG_RETURN_BOOL(result);
+}
+
+Datum
+ts_match_tt(PG_FUNCTION_ARGS)
+{
+	TSVector	vector;
+	TSQuery		query;
+	bool		res;
+
+	vector = DatumGetTSVector(DirectFunctionCall1(to_tsvector,
+												  PG_GETARG_DATUM(0)));
+	query = DatumGetTSQuery(DirectFunctionCall1(plainto_tsquery,
+												PG_GETARG_DATUM(1)));
+
+	res = DatumGetBool(DirectFunctionCall2(ts_match_vq,
+										   TSVectorGetDatum(vector),
+										   TSQueryGetDatum(query)));
+
+	pfree(vector);
+	pfree(query);
+
+	PG_RETURN_BOOL(res);
+}
+
+Datum
+ts_match_tq(PG_FUNCTION_ARGS)
+{
+	TSVector	vector;
+	TSQuery		query = PG_GETARG_TSQUERY(1);
+	bool		res;
+
+	vector = DatumGetTSVector(DirectFunctionCall1(to_tsvector,
+												  PG_GETARG_DATUM(0)));
+
+	res = DatumGetBool(DirectFunctionCall2(ts_match_vq,
+										   TSVectorGetDatum(vector),
+										   TSQueryGetDatum(query)));
+
+	pfree(vector);
+	PG_FREE_IF_COPY(query, 1);
+
+	PG_RETURN_BOOL(res);
+}
+
+/*
+ * ts_stat statistic function support
+ */
+
+
+/*
+ * Returns the number of positions in value 'wptr' within tsvector 'txt',
+ * that have a weight equal to one of the weights in 'weight' bitmask.
+ */
+static int
+check_weight(TSVector txt, WordEntry *wptr, int8 weight)
+{
+	int			len = POSDATALEN(txt, wptr);
+	int			num = 0;
+	WordEntryPos *ptr = POSDATAPTR(txt, wptr);
+
+	while (len--)
+	{
+		if (weight & (1 << WEP_GETWEIGHT(*ptr)))
+			num++;
+		ptr++;
+	}
+	return num;
+}
+
+static WordEntry **
+SEI_realloc(WordEntry **in, uint32 *len)
+{
+	if (*len == 0 || in == NULL)
+	{
+		*len = 8;
+		in = palloc(sizeof(WordEntry *) * (*len));
+	}
+	else
+	{
+		*len *= 2;
+		in = repalloc(in, sizeof(WordEntry *) * (*len));
+	}
+	return in;
+}
+
+static int
+compareStatWord(StatEntry *a, WordEntry *b, tsstat *stat, TSVector txt)
+{
+	if (a->len == b->len)
+		return strncmp(
+					   STATSTRPTR(stat) + a->pos,
+					   STRPTR(txt) + b->pos,
+					   a->len
+			);
+	return (a->len > b->len) ? 1 : -1;
+}
+
+static tsstat *
+formstat(tsstat *stat, TSVector txt, WordEntry **entry, uint32 len)
+{
+	tsstat	   *newstat;
+	uint32		totallen,
+				nentry;
+	uint32		slen = 0;
+	WordEntry **ptr = entry;
+	char	   *curptr;
+	StatEntry  *sptr,
+			   *nptr;
+
+	while (ptr - entry < len)
+	{
+		slen += (*ptr)->len;
+		ptr++;
+	}
+
+	nentry = stat->size + len;
+	slen += STATSTRSIZE(stat);
+	totallen = CALCSTATSIZE(nentry, slen);
+	newstat = palloc(totallen);
+	SET_VARSIZE(newstat, totallen);
+	newstat->weight = stat->weight;
+	newstat->size = nentry;
+
+	memcpy(STATSTRPTR(newstat), STATSTRPTR(stat), STATSTRSIZE(stat));
+	curptr = STATSTRPTR(newstat) + STATSTRSIZE(stat);
+
+	ptr = entry;
+	sptr = STATPTR(stat);
+	nptr = STATPTR(newstat);
+
+	if (len == 1)
+	{
+		StatEntry  *StopLow = STATPTR(stat);
+		StatEntry  *StopHigh = (StatEntry *) STATSTRPTR(stat);
+
+		while (StopLow < StopHigh)
+		{
+			sptr = StopLow + (StopHigh - StopLow) / 2;
+			if (compareStatWord(sptr, *ptr, stat, txt) < 0)
+				StopLow = sptr + 1;
+			else
+				StopHigh = sptr;
+		}
+		nptr = STATPTR(newstat) + (StopLow - STATPTR(stat));
+		memcpy(STATPTR(newstat), STATPTR(stat), sizeof(StatEntry) * (StopLow - STATPTR(stat)));
+		if ((*ptr)->haspos)
+			nptr->nentry = (stat->weight) ? check_weight(txt, *ptr, stat->weight) : POSDATALEN(txt, *ptr);
+		else
+			nptr->nentry = 1;
+		nptr->ndoc = 1;
+		nptr->len = (*ptr)->len;
+		memcpy(curptr, STRPTR(txt) + (*ptr)->pos, nptr->len);
+		nptr->pos = curptr - STATSTRPTR(newstat);
+		memcpy(nptr + 1, StopLow, sizeof(StatEntry) * (((StatEntry *) STATSTRPTR(stat)) - StopLow));
+	}
+	else
+	{
+		while (sptr - STATPTR(stat) < stat->size && ptr - entry < len)
+		{
+			if (compareStatWord(sptr, *ptr, stat, txt) < 0)
+			{
+				memcpy(nptr, sptr, sizeof(StatEntry));
+				sptr++;
+			}
+			else
+			{
+				if ((*ptr)->haspos)
+					nptr->nentry = (stat->weight) ? check_weight(txt, *ptr, stat->weight) : POSDATALEN(txt, *ptr);
+				else
+					nptr->nentry = 1;
+				nptr->ndoc = 1;
+				nptr->len = (*ptr)->len;
+				memcpy(curptr, STRPTR(txt) + (*ptr)->pos, nptr->len);
+				nptr->pos = curptr - STATSTRPTR(newstat);
+				curptr += nptr->len;
+				ptr++;
+			}
+			nptr++;
+		}
+
+		memcpy(nptr, sptr, sizeof(StatEntry) * (stat->size - (sptr - STATPTR(stat))));
+
+		while (ptr - entry < len)
+		{
+			if ((*ptr)->haspos)
+				nptr->nentry = (stat->weight) ? check_weight(txt, *ptr, stat->weight) : POSDATALEN(txt, *ptr);
+			else
+				nptr->nentry = 1;
+			nptr->ndoc = 1;
+			nptr->len = (*ptr)->len;
+			memcpy(curptr, STRPTR(txt) + (*ptr)->pos, nptr->len);
+			nptr->pos = curptr - STATSTRPTR(newstat);
+			curptr += nptr->len;
+			ptr++;
+			nptr++;
+		}
+	}
+
+	return newstat;
+}
+
+/*
+ * This is written like a custom aggregate function, because the
+ * original plan was to do just that. Unfortunately, an aggregate function
+ * can't return a set, so that plan was abandoned. If that limitation is
+ * lifted in the future, ts_stat could be a real aggregate function so that
+ * you could use it like this:
+ *
+ *	 SELECT ts_stat(vector_column) FROM vector_table;
+ *
+ *	where vector_column is a tsvector-type column in vector_table.
+ */
+
+static tsstat *
+ts_accum(tsstat *stat, Datum data)
+{
+	tsstat	   *newstat;
+	TSVector	txt = DatumGetTSVector(data);
+	WordEntry **newentry = NULL;
+	uint32		len = 0,
+				cur = 0;
+	StatEntry  *sptr;
+	WordEntry  *wptr;
+	int			n = 0;
+
+	if (stat == NULL)
+	{							/* Init in first */
+		stat = palloc(STATHDRSIZE);
+		SET_VARSIZE(stat, STATHDRSIZE);
+		stat->size = 0;
+		stat->weight = 0;
+	}
+
+	/* simple check of correctness */
+	if (txt == NULL || txt->size == 0)
+	{
+		if (txt != (TSVector) DatumGetPointer(data))
+			pfree(txt);
+		return stat;
+	}
+
+	sptr = STATPTR(stat);
+	wptr = ARRPTR(txt);
+
+	if (stat->size < 100 * txt->size)
+	{							/* merge */
+		while (sptr - STATPTR(stat) < stat->size && wptr - ARRPTR(txt) < txt->size)
+		{
+			int			cmp = compareStatWord(sptr, wptr, stat, txt);
+
+			if (cmp < 0)
+				sptr++;
+			else if (cmp == 0)
+			{
+				if (stat->weight == 0)
+				{
+					sptr->ndoc++;
+					sptr->nentry += (wptr->haspos) ? POSDATALEN(txt, wptr) : 1;
+				}
+				else if (wptr->haspos && (n = check_weight(txt, wptr, stat->weight)) != 0)
+				{
+					sptr->ndoc++;
+					sptr->nentry += n;
+				}
+				sptr++;
+				wptr++;
+			}
+			else
+			{
+				if (stat->weight == 0 || check_weight(txt, wptr, stat->weight) != 0)
+				{
+					if (cur == len)
+						newentry = SEI_realloc(newentry, &len);
+					newentry[cur] = wptr;
+					cur++;
+				}
+				wptr++;
+			}
+		}
+
+		while (wptr - ARRPTR(txt) < txt->size)
+		{
+			if (stat->weight == 0 || check_weight(txt, wptr, stat->weight) != 0)
+			{
+				if (cur == len)
+					newentry = SEI_realloc(newentry, &len);
+				newentry[cur] = wptr;
+				cur++;
+			}
+			wptr++;
+		}
+	}
+	else
+	{							/* search */
+		while (wptr - ARRPTR(txt) < txt->size)
+		{
+			StatEntry  *StopLow = STATPTR(stat);
+			StatEntry  *StopHigh = (StatEntry *) STATSTRPTR(stat);
+			int			cmp;
+
+			while (StopLow < StopHigh)
+			{
+				sptr = StopLow + (StopHigh - StopLow) / 2;
+				cmp = compareStatWord(sptr, wptr, stat, txt);
+				if (cmp == 0)
+				{
+					if (stat->weight == 0)
+					{
+						sptr->ndoc++;
+						sptr->nentry += (wptr->haspos) ? POSDATALEN(txt, wptr) : 1;
+					}
+					else if (wptr->haspos && (n = check_weight(txt, wptr, stat->weight)) != 0)
+					{
+						sptr->ndoc++;
+						sptr->nentry += n;
+					}
+					break;
+				}
+				else if (cmp < 0)
+					StopLow = sptr + 1;
+				else
+					StopHigh = sptr;
+			}
+
+			if (StopLow >= StopHigh)
+			{					/* not found */
+				if (stat->weight == 0 || check_weight(txt, wptr, stat->weight) != 0)
+				{
+					if (cur == len)
+						newentry = SEI_realloc(newentry, &len);
+					newentry[cur] = wptr;
+					cur++;
+				}
+			}
+			wptr++;
+		}
+	}
+
+
+	if (cur == 0)
+	{							/* no new words */
+		if (txt != (TSVector) DatumGetPointer(data))
+			pfree(txt);
+		return stat;
+	}
+
+	newstat = formstat(stat, txt, newentry, cur);
+	pfree(newentry);
+
+	if (txt != (TSVector) DatumGetPointer(data))
+		pfree(txt);
+	return newstat;
+}
+
+static void
+ts_setup_firstcall(FunctionCallInfo fcinfo, FuncCallContext *funcctx,
+				   tsstat *stat)
+{
+	TupleDesc	tupdesc;
+	MemoryContext oldcontext;
+	StatStorage *st;
+
+	oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+	st = palloc(sizeof(StatStorage));
+	st->cur = 0;
+	st->stat = palloc(VARSIZE(stat));
+	memcpy(st->stat, stat, VARSIZE(stat));
+	funcctx->user_fctx = (void *) st;
+
+	tupdesc = CreateTemplateTupleDesc(3, false);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "word",
+					   TEXTOID, -1, 0);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "ndoc",
+					   INT4OID, -1, 0);
+	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "nentry",
+					   INT4OID, -1, 0);
+	funcctx->tuple_desc = BlessTupleDesc(tupdesc);
+	funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
+
+	MemoryContextSwitchTo(oldcontext);
+}
+
+
+static Datum
+ts_process_call(FuncCallContext *funcctx)
+{
+	StatStorage *st;
+
+	st = (StatStorage *) funcctx->user_fctx;
+
+	if (st->cur < st->stat->size)
+	{
+		Datum		result;
+		char	   *values[3];
+		char		ndoc[16];
+		char		nentry[16];
+		StatEntry  *entry = STATPTR(st->stat) + st->cur;
+		HeapTuple	tuple;
+
+		values[0] = palloc(entry->len + 1);
+		memcpy(values[0], STATSTRPTR(st->stat) + entry->pos, entry->len);
+		(values[0])[entry->len] = '\0';
+		sprintf(ndoc, "%d", entry->ndoc);
+		values[1] = ndoc;
+		sprintf(nentry, "%d", entry->nentry);
+		values[2] = nentry;
+
+		tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
+		result = HeapTupleGetDatum(tuple);
+
+		pfree(values[0]);
+		st->cur++;
+		return result;
+	}
+	else
+	{
+		pfree(st->stat);
+		pfree(st);
+	}
+
+	return (Datum) 0;
+}
+
+static tsstat *
+ts_stat_sql(text *txt, text *ws)
+{
+	char	   *query = TextPGetCString(txt);
+	int			i;
+	tsstat	   *newstat,
+			   *stat;
+	bool		isnull;
+	Portal		portal;
+	SPIPlanPtr	plan;
+
+	if ((plan = SPI_prepare(query, 0, NULL)) == NULL)
+		/* internal error */
+		elog(ERROR, "SPI_prepare(\"%s\") failed", query);
+
+	if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL)
+		/* internal error */
+		elog(ERROR, "SPI_cursor_open(\"%s\") failed", query);
+
+	SPI_cursor_fetch(portal, true, 100);
+
+	if (SPI_tuptable == NULL ||
+		SPI_tuptable->tupdesc->natts != 1 ||
+		!is_expected_type(SPI_gettypeid(SPI_tuptable->tupdesc, 1),
+						  TSVECTOROID))
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("ts_stat query must return one tsvector column")));
+
+	stat = palloc(STATHDRSIZE);
+	SET_VARSIZE(stat, STATHDRSIZE);
+	stat->size = 0;
+	stat->weight = 0;
+
+	if (ws)
+	{
+		char	   *buf;
+
+		buf = VARDATA(ws);
+		while (buf - VARDATA(ws) < VARSIZE(ws) - VARHDRSZ)
+		{
+			if (pg_mblen(buf) == 1)
+			{
+				switch (*buf)
+				{
+					case 'A':
+					case 'a':
+						stat->weight |= 1 << 3;
+						break;
+					case 'B':
+					case 'b':
+						stat->weight |= 1 << 2;
+						break;
+					case 'C':
+					case 'c':
+						stat->weight |= 1 << 1;
+						break;
+					case 'D':
+					case 'd':
+						stat->weight |= 1;
+						break;
+					default:
+						stat->weight |= 0;
+				}
+			}
+			buf += pg_mblen(buf);
+		}
+	}
+
+	while (SPI_processed > 0)
+	{
+		for (i = 0; i < SPI_processed; i++)
+		{
+			Datum		data = SPI_getbinval(SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 1, &isnull);
+
+			if (!isnull)
+			{
+				newstat = ts_accum(stat, data);
+				if (stat != newstat && stat)
+					pfree(stat);
+				stat = newstat;
+			}
+		}
+
+		SPI_freetuptable(SPI_tuptable);
+		SPI_cursor_fetch(portal, true, 100);
+	}
+
+	SPI_freetuptable(SPI_tuptable);
+	SPI_cursor_close(portal);
+	SPI_freeplan(plan);
+	pfree(query);
+
+	return stat;
+}
+
+Datum
+ts_stat1(PG_FUNCTION_ARGS)
+{
+	FuncCallContext *funcctx;
+	Datum		result;
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		tsstat	   *stat;
+		text	   *txt = PG_GETARG_TEXT_P(0);
+
+		funcctx = SRF_FIRSTCALL_INIT();
+		SPI_connect();
+		stat = ts_stat_sql(txt, NULL);
+		PG_FREE_IF_COPY(txt, 0);
+		ts_setup_firstcall(fcinfo, funcctx, stat);
+		SPI_finish();
+	}
+
+	funcctx = SRF_PERCALL_SETUP();
+	if ((result = ts_process_call(funcctx)) != (Datum) 0)
+		SRF_RETURN_NEXT(funcctx, result);
+	SRF_RETURN_DONE(funcctx);
+}
+
+Datum
+ts_stat2(PG_FUNCTION_ARGS)
+{
+	FuncCallContext *funcctx;
+	Datum		result;
+
+	if (SRF_IS_FIRSTCALL())
+	{
+		tsstat	   *stat;
+		text	   *txt = PG_GETARG_TEXT_P(0);
+		text	   *ws = PG_GETARG_TEXT_P(1);
+
+		funcctx = SRF_FIRSTCALL_INIT();
+		SPI_connect();
+		stat = ts_stat_sql(txt, ws);
+		PG_FREE_IF_COPY(txt, 0);
+		PG_FREE_IF_COPY(ws, 1);
+		ts_setup_firstcall(fcinfo, funcctx, stat);
+		SPI_finish();
+	}
+
+	funcctx = SRF_PERCALL_SETUP();
+	if ((result = ts_process_call(funcctx)) != (Datum) 0)
+		SRF_RETURN_NEXT(funcctx, result);
+	SRF_RETURN_DONE(funcctx);
+}
+
+
+/*
+ * Triggers for automatic update of a tsvector column from text column(s)
+ *
+ * Trigger arguments are either
+ *		name of tsvector col, name of tsconfig to use, name(s) of text col(s)
+ *		name of tsvector col, name of regconfig col, name(s) of text col(s)
+ * ie, tsconfig can either be specified by name, or indirectly as the
+ * contents of a regconfig field in the row.  If the name is used, it must
+ * be explicitly schema-qualified.
+ */
+Datum
+tsvector_update_trigger_byid(PG_FUNCTION_ARGS)
+{
+	return tsvector_update_trigger(fcinfo, false);
+}
+
+Datum
+tsvector_update_trigger_bycolumn(PG_FUNCTION_ARGS)
+{
+	return tsvector_update_trigger(fcinfo, true);
+}
+
+static Datum
+tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
+{
+	TriggerData *trigdata;
+	Trigger    *trigger;
+	Relation	rel;
+	HeapTuple	rettuple = NULL;
+	int			tsvector_attr_num,
+				i;
+	ParsedText	prs;
+	Datum		datum;
+	bool		isnull;
+	text	   *txt;
+	Oid			cfgId;
+
+	/* Check call context */
+	if (!CALLED_AS_TRIGGER(fcinfo))		/* internal error */
+		elog(ERROR, "tsvector_update_trigger: not fired by trigger manager");
+
+	trigdata = (TriggerData *) fcinfo->context;
+	if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
+		elog(ERROR, "tsvector_update_trigger: can't process STATEMENT events");
+	if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
+		elog(ERROR, "tsvector_update_trigger: must be fired BEFORE event");
+
+	if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
+		rettuple = trigdata->tg_trigtuple;
+	else if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
+		rettuple = trigdata->tg_newtuple;
+	else
+		elog(ERROR, "tsvector_update_trigger: must be fired for INSERT or UPDATE");
+
+	trigger = trigdata->tg_trigger;
+	rel = trigdata->tg_relation;
+
+	if (trigger->tgnargs < 3)
+		elog(ERROR, "tsvector_update_trigger: arguments must be tsvector_field, ts_config, text_field1, ...)");
+
+	/* Find the target tsvector column */
+	tsvector_attr_num = SPI_fnumber(rel->rd_att, trigger->tgargs[0]);
+	if (tsvector_attr_num == SPI_ERROR_NOATTRIBUTE)
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_COLUMN),
+				 errmsg("tsvector column \"%s\" does not exist",
+						trigger->tgargs[0])));
+	if (!is_expected_type(SPI_gettypeid(rel->rd_att, tsvector_attr_num),
+						  TSVECTOROID))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("column \"%s\" is not of tsvector type",
+						trigger->tgargs[0])));
+
+	/* Find the configuration to use */
+	if (config_column)
+	{
+		int			config_attr_num;
+
+		config_attr_num = SPI_fnumber(rel->rd_att, trigger->tgargs[1]);
+		if (config_attr_num == SPI_ERROR_NOATTRIBUTE)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("configuration column \"%s\" does not exist",
+							trigger->tgargs[1])));
+		if (!is_expected_type(SPI_gettypeid(rel->rd_att, config_attr_num),
+							  REGCONFIGOID))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("column \"%s\" is not of regconfig type",
+							trigger->tgargs[1])));
+
+		datum = SPI_getbinval(rettuple, rel->rd_att, config_attr_num, &isnull);
+		if (isnull)
+			ereport(ERROR,
+					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+					 errmsg("configuration column \"%s\" must not be null",
+							trigger->tgargs[1])));
+		cfgId = DatumGetObjectId(datum);
+	}
+	else
+	{
+		List	   *names;
+
+		names = stringToQualifiedNameList(trigger->tgargs[1]);
+		/* require a schema so that results are not search path dependent */
+		if (list_length(names) < 2)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("text search configuration name \"%s\" must be schema-qualified",
+							trigger->tgargs[1])));
+		cfgId = TSConfigGetCfgid(names, false);
+	}
+
+	/* initialize parse state */
+	prs.lenwords = 32;
+	prs.curwords = 0;
+	prs.pos = 0;
+	prs.words = (ParsedWord *) palloc(sizeof(ParsedWord) * prs.lenwords);
+
+	/* find all words in indexable column(s) */
+	for (i = 2; i < trigger->tgnargs; i++)
+	{
+		int			numattr;
+
+		numattr = SPI_fnumber(rel->rd_att, trigger->tgargs[i]);
+		if (numattr == SPI_ERROR_NOATTRIBUTE)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("column \"%s\" does not exist",
+							trigger->tgargs[i])));
+		if (!is_text_type(SPI_gettypeid(rel->rd_att, numattr)))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("column \"%s\" is not of character type",
+							trigger->tgargs[i])));
+
+		datum = SPI_getbinval(rettuple, rel->rd_att, numattr, &isnull);
+		if (isnull)
+			continue;
+
+		txt = DatumGetTextP(datum);
+
+		parsetext(cfgId, &prs, VARDATA(txt), VARSIZE(txt) - VARHDRSZ);
+
+		if (txt != (text *) DatumGetPointer(datum))
+			pfree(txt);
+	}
+
+	/* make tsvector value */
+	if (prs.curwords)
+	{
+		datum = PointerGetDatum(make_tsvector(&prs));
+		rettuple = SPI_modifytuple(rel, rettuple, 1, &tsvector_attr_num,
+								   &datum, NULL);
+		pfree(DatumGetPointer(datum));
+	}
+	else
+	{
+		TSVector	out = palloc(CALCDATASIZE(0, 0));
+
+		SET_VARSIZE(out, CALCDATASIZE(0, 0));
+		out->size = 0;
+		datum = PointerGetDatum(out);
+		rettuple = SPI_modifytuple(rel, rettuple, 1, &tsvector_attr_num,
+								   &datum, NULL);
+		pfree(prs.words);
+	}
+
+	if (rettuple == NULL)		/* internal error */
+		elog(ERROR, "tsvector_update_trigger: %d returned by SPI_modifytuple",
+			 SPI_result);
+
+	return PointerGetDatum(rettuple);
+}
diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c
new file mode 100644
index 000000000000..70d422067924
--- /dev/null
+++ b/src/backend/utils/adt/tsvector_parser.c
@@ -0,0 +1,370 @@
+/*-------------------------------------------------------------------------
+ *
+ * tsvector_parser.c
+ *	  Parser for tsvector
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_parser.c,v 1.6 2008/01/01 19:45:53 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "libpq/pqformat.h"
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_locale.h"
+#include "tsearch/ts_utils.h"
+#include "utils/memutils.h"
+
+
+/*
+ * Private state of tsvector parser.  Note that tsquery also uses this code to
+ * parse its input, hence the boolean flags.  The two flags are both true or
+ * both false in current usage, but we keep them separate for clarity.
+ * is_tsquery affects *only* the content of error messages.
+ */
+struct TSVectorParseStateData
+{
+	char	   *prsbuf;			/* next input character */
+	char	   *bufstart;		/* whole string (used only for errors) */
+	char	   *word;			/* buffer to hold the current word */
+	int			len;			/* size in bytes allocated for 'word' */
+	int			eml;			/* max bytes per character */
+	bool		oprisdelim;		/* treat ! | * ( ) as delimiters? */
+	bool		is_tsquery;		/* say "tsquery" not "tsvector" in errors? */
+};
+
+
+/*
+ * Initializes parser for the input string. If oprisdelim is set, the
+ * following characters are treated as delimiters in addition to whitespace:
+ * ! | & ( )
+ */
+TSVectorParseState
+init_tsvector_parser(char *input, bool oprisdelim, bool is_tsquery)
+{
+	TSVectorParseState state;
+
+	state = (TSVectorParseState) palloc(sizeof(struct TSVectorParseStateData));
+	state->prsbuf = input;
+	state->bufstart = input;
+	state->len = 32;
+	state->word = (char *) palloc(state->len);
+	state->eml = pg_database_encoding_max_length();
+	state->oprisdelim = oprisdelim;
+	state->is_tsquery = is_tsquery;
+
+	return state;
+}
+
+/*
+ * Reinitializes parser to parse 'input', instead of previous input.
+ */
+void
+reset_tsvector_parser(TSVectorParseState state, char *input)
+{
+	state->prsbuf = input;
+}
+
+/*
+ * Shuts down a tsvector parser.
+ */
+void
+close_tsvector_parser(TSVectorParseState state)
+{
+	pfree(state->word);
+	pfree(state);
+}
+
+/* increase the size of 'word' if needed to hold one more character */
+#define RESIZEPRSBUF \
+do { \
+	int clen = curpos - state->word; \
+	if ( clen + state->eml >= state->len ) \
+	{ \
+		state->len *= 2; \
+		state->word = (char *) repalloc(state->word, state->len); \
+		curpos = state->word + clen; \
+	} \
+} while (0)
+
+#define ISOPERATOR(x)	( pg_mblen(x)==1 && ( *(x)=='!' || *(x)=='&' || *(x)=='|' || *(x)=='(' || *(x)==')' ) )
+
+/* Fills gettoken_tsvector's output parameters, and returns true */
+#define RETURN_TOKEN \
+do { \
+	if (pos_ptr != NULL) \
+	{ \
+		*pos_ptr = pos; \
+		*poslen = npos; \
+	} \
+	else if (pos != NULL) \
+		pfree(pos); \
+	\
+	if (strval != NULL) \
+		*strval = state->word; \
+	if (lenval != NULL) \
+		*lenval = curpos - state->word; \
+	if (endptr != NULL) \
+		*endptr = state->prsbuf; \
+	return true; \
+} while(0)
+
+
+/* State codes used in gettoken_tsvector */
+#define WAITWORD		1
+#define WAITENDWORD		2
+#define WAITNEXTCHAR	3
+#define WAITENDCMPLX	4
+#define WAITPOSINFO		5
+#define INPOSINFO		6
+#define WAITPOSDELIM	7
+#define WAITCHARCMPLX	8
+
+#define PRSSYNTAXERROR prssyntaxerror(state)
+
+static void
+prssyntaxerror(TSVectorParseState state)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_SYNTAX_ERROR),
+			 state->is_tsquery ?
+			 errmsg("syntax error in tsquery: \"%s\"", state->bufstart) :
+			 errmsg("syntax error in tsvector: \"%s\"", state->bufstart)));
+}
+
+
+/*
+ * Get next token from string being parsed. Returns true if successful,
+ * false if end of input string is reached.  On success, these output
+ * parameters are filled in:
+ *
+ * *strval		pointer to token
+ * *lenval		length of *strval
+ * *pos_ptr		pointer to a palloc'd array of positions and weights
+ *				associated with the token. If the caller is not interested
+ *				in the information, NULL can be supplied. Otherwise
+ *				the caller is responsible for pfreeing the array.
+ * *poslen		number of elements in *pos_ptr
+ * *endptr		scan resumption point
+ *
+ * Pass NULL for unwanted output parameters.
+ */
+bool
+gettoken_tsvector(TSVectorParseState state,
+				  char **strval, int *lenval,
+				  WordEntryPos **pos_ptr, int *poslen,
+				  char **endptr)
+{
+	int			oldstate = 0;
+	char	   *curpos = state->word;
+	int			statecode = WAITWORD;
+
+	/*
+	 * pos is for collecting the comma delimited list of positions followed by
+	 * the actual token.
+	 */
+	WordEntryPos *pos = NULL;
+	int			npos = 0;		/* elements of pos used */
+	int			posalen = 0;	/* allocated size of pos */
+
+	while (1)
+	{
+		if (statecode == WAITWORD)
+		{
+			if (*(state->prsbuf) == '\0')
+				return false;
+			else if (t_iseq(state->prsbuf, '\''))
+				statecode = WAITENDCMPLX;
+			else if (t_iseq(state->prsbuf, '\\'))
+			{
+				statecode = WAITNEXTCHAR;
+				oldstate = WAITENDWORD;
+			}
+			else if (state->oprisdelim && ISOPERATOR(state->prsbuf))
+				PRSSYNTAXERROR;
+			else if (!t_isspace(state->prsbuf))
+			{
+				COPYCHAR(curpos, state->prsbuf);
+				curpos += pg_mblen(state->prsbuf);
+				statecode = WAITENDWORD;
+			}
+		}
+		else if (statecode == WAITNEXTCHAR)
+		{
+			if (*(state->prsbuf) == '\0')
+				ereport(ERROR,
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("there is no escaped character: \"%s\"",
+								state->bufstart)));
+			else
+			{
+				RESIZEPRSBUF;
+				COPYCHAR(curpos, state->prsbuf);
+				curpos += pg_mblen(state->prsbuf);
+				Assert(oldstate != 0);
+				statecode = oldstate;
+			}
+		}
+		else if (statecode == WAITENDWORD)
+		{
+			if (t_iseq(state->prsbuf, '\\'))
+			{
+				statecode = WAITNEXTCHAR;
+				oldstate = WAITENDWORD;
+			}
+			else if (t_isspace(state->prsbuf) || *(state->prsbuf) == '\0' ||
+					 (state->oprisdelim && ISOPERATOR(state->prsbuf)))
+			{
+				RESIZEPRSBUF;
+				if (curpos == state->word)
+					PRSSYNTAXERROR;
+				*(curpos) = '\0';
+				RETURN_TOKEN;
+			}
+			else if (t_iseq(state->prsbuf, ':'))
+			{
+				if (curpos == state->word)
+					PRSSYNTAXERROR;
+				*(curpos) = '\0';
+				if (state->oprisdelim)
+					RETURN_TOKEN;
+				else
+					statecode = INPOSINFO;
+			}
+			else
+			{
+				RESIZEPRSBUF;
+				COPYCHAR(curpos, state->prsbuf);
+				curpos += pg_mblen(state->prsbuf);
+			}
+		}
+		else if (statecode == WAITENDCMPLX)
+		{
+			if (t_iseq(state->prsbuf, '\''))
+			{
+				statecode = WAITCHARCMPLX;
+			}
+			else if (t_iseq(state->prsbuf, '\\'))
+			{
+				statecode = WAITNEXTCHAR;
+				oldstate = WAITENDCMPLX;
+			}
+			else if (*(state->prsbuf) == '\0')
+				PRSSYNTAXERROR;
+			else
+			{
+				RESIZEPRSBUF;
+				COPYCHAR(curpos, state->prsbuf);
+				curpos += pg_mblen(state->prsbuf);
+			}
+		}
+		else if (statecode == WAITCHARCMPLX)
+		{
+			if (t_iseq(state->prsbuf, '\''))
+			{
+				RESIZEPRSBUF;
+				COPYCHAR(curpos, state->prsbuf);
+				curpos += pg_mblen(state->prsbuf);
+				statecode = WAITENDCMPLX;
+			}
+			else
+			{
+				RESIZEPRSBUF;
+				*(curpos) = '\0';
+				if (curpos == state->word)
+					PRSSYNTAXERROR;
+				if (state->oprisdelim)
+				{
+					/* state->prsbuf+=pg_mblen(state->prsbuf); */
+					RETURN_TOKEN;
+				}
+				else
+					statecode = WAITPOSINFO;
+				continue;		/* recheck current character */
+			}
+		}
+		else if (statecode == WAITPOSINFO)
+		{
+			if (t_iseq(state->prsbuf, ':'))
+				statecode = INPOSINFO;
+			else
+				RETURN_TOKEN;
+		}
+		else if (statecode == INPOSINFO)
+		{
+			if (t_isdigit(state->prsbuf))
+			{
+				if (posalen == 0)
+				{
+					posalen = 4;
+					pos = (WordEntryPos *) palloc(sizeof(WordEntryPos) * posalen);
+					npos = 0;
+				}
+				else if (npos + 1 >= posalen)
+				{
+					posalen *= 2;
+					pos = (WordEntryPos *) repalloc(pos, sizeof(WordEntryPos) * posalen);
+				}
+				npos++;
+				WEP_SETPOS(pos[npos - 1], LIMITPOS(atoi(state->prsbuf)));
+				/* we cannot get here in tsquery, so no need for 2 errmsgs */
+				if (WEP_GETPOS(pos[npos - 1]) == 0)
+					ereport(ERROR,
+							(errcode(ERRCODE_SYNTAX_ERROR),
+							 errmsg("wrong position info in tsvector: \"%s\"",
+									state->bufstart)));
+				WEP_SETWEIGHT(pos[npos - 1], 0);
+				statecode = WAITPOSDELIM;
+			}
+			else
+				PRSSYNTAXERROR;
+		}
+		else if (statecode == WAITPOSDELIM)
+		{
+			if (t_iseq(state->prsbuf, ','))
+				statecode = INPOSINFO;
+			else if (t_iseq(state->prsbuf, 'a') || t_iseq(state->prsbuf, 'A') || t_iseq(state->prsbuf, '*'))
+			{
+				if (WEP_GETWEIGHT(pos[npos - 1]))
+					PRSSYNTAXERROR;
+				WEP_SETWEIGHT(pos[npos - 1], 3);
+			}
+			else if (t_iseq(state->prsbuf, 'b') || t_iseq(state->prsbuf, 'B'))
+			{
+				if (WEP_GETWEIGHT(pos[npos - 1]))
+					PRSSYNTAXERROR;
+				WEP_SETWEIGHT(pos[npos - 1], 2);
+			}
+			else if (t_iseq(state->prsbuf, 'c') || t_iseq(state->prsbuf, 'C'))
+			{
+				if (WEP_GETWEIGHT(pos[npos - 1]))
+					PRSSYNTAXERROR;
+				WEP_SETWEIGHT(pos[npos - 1], 1);
+			}
+			else if (t_iseq(state->prsbuf, 'd') || t_iseq(state->prsbuf, 'D'))
+			{
+				if (WEP_GETWEIGHT(pos[npos - 1]))
+					PRSSYNTAXERROR;
+				WEP_SETWEIGHT(pos[npos - 1], 0);
+			}
+			else if (t_isspace(state->prsbuf) ||
+					 *(state->prsbuf) == '\0')
+				RETURN_TOKEN;
+			else if (!t_isdigit(state->prsbuf))
+				PRSSYNTAXERROR;
+		}
+		else	/* internal error */
+			elog(ERROR, "unrecognized state in gettoken_tsvector: %d",
+				 statecode);
+
+		/* get next char */
+		state->prsbuf += pg_mblen(state->prsbuf);
+	}
+
+	return false;
+}
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
new file mode 100644
index 000000000000..be79d186a1e1
--- /dev/null
+++ b/src/backend/utils/adt/txid.c
@@ -0,0 +1,591 @@
+/*-------------------------------------------------------------------------
+ * txid.c
+ *
+ *	Export internal transaction IDs to user level.
+ *
+ * Note that only top-level transaction IDs are ever converted to TXID.
+ * This is important because TXIDs frequently persist beyond the global
+ * xmin horizon, or may even be shipped to other machines, so we cannot
+ * rely on being able to correlate subtransaction IDs with their parents
+ * via functions such as SubTransGetTopmostTransaction().
+ *
+ *
+ *	Copyright (c) 2003-2008, PostgreSQL Global Development Group
+ *	Author: Jan Wieck, Afilias USA INC.
+ *	64-bit txids: Marko Kreen, Skype Technologies
+ *
+ *	$PostgreSQL: pgsql/src/backend/utils/adt/txid.c,v 1.4 2008/01/01 19:45:53 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "access/transam.h"
+#include "access/xact.h"
+#include "funcapi.h"
+#include "libpq/pqformat.h"
+#include "utils/builtins.h"
+
+
+#ifndef INT64_IS_BUSTED
+/* txid will be signed int8 in database, so must limit to 63 bits */
+#define MAX_TXID   UINT64CONST(0x7FFFFFFFFFFFFFFF)
+#else
+/* we only really have 32 bits to work with :-( */
+#define MAX_TXID   UINT64CONST(0x7FFFFFFF)
+#endif
+
+/* Use unsigned variant internally */
+typedef uint64 txid;
+
+/* sprintf format code for uint64 */
+#define TXID_FMT UINT64_FORMAT
+
+/*
+ * If defined, use bsearch() function for searching for txids in snapshots
+ * that have more than the specified number of values.
+ */
+#define USE_BSEARCH_IF_NXIP_GREATER 30
+
+
+/*
+ * Snapshot containing 8byte txids.
+ */
+typedef struct
+{
+	/*
+	 * 4-byte length hdr, should not be touched directly.
+	 *
+	 * Explicit embedding is ok as we want always correct alignment anyway.
+	 */
+	int32		__varsz;
+
+	uint32		nxip;			/* number of txids in xip array */
+	txid		xmin;
+	txid		xmax;
+	txid		xip[1];			/* in-progress txids, xmin <= xip[i] < xmax */
+} TxidSnapshot;
+
+#define TXID_SNAPSHOT_SIZE(nxip) \
+	(offsetof(TxidSnapshot, xip) + sizeof(txid) * (nxip))
+
+/*
+ * Epoch values from xact.c
+ */
+typedef struct
+{
+	TransactionId last_xid;
+	uint32		epoch;
+} TxidEpoch;
+
+
+/*
+ * Fetch epoch data from xact.c.
+ */
+static void
+load_xid_epoch(TxidEpoch *state)
+{
+	GetNextXidAndEpoch(&state->last_xid, &state->epoch);
+}
+
+/*
+ * do a TransactionId -> txid conversion for an XID near the given epoch
+ */
+static txid
+convert_xid(TransactionId xid, const TxidEpoch *state)
+{
+#ifndef INT64_IS_BUSTED
+	uint64		epoch;
+
+	/* return special xid's as-is */
+	if (!TransactionIdIsNormal(xid))
+		return (txid) xid;
+
+	/* xid can be on either side when near wrap-around */
+	epoch = (uint64) state->epoch;
+	if (xid > state->last_xid &&
+		TransactionIdPrecedes(xid, state->last_xid))
+		epoch--;
+	else if (xid < state->last_xid &&
+			 TransactionIdFollows(xid, state->last_xid))
+		epoch++;
+
+	return (epoch << 32) | xid;
+#else							/* INT64_IS_BUSTED */
+	/* we can't do anything with the epoch, so ignore it */
+	return (txid) xid & MAX_TXID;
+#endif   /* INT64_IS_BUSTED */
+}
+
+/*
+ * txid comparator for qsort/bsearch
+ */
+static int
+cmp_txid(const void *aa, const void *bb)
+{
+	txid		a = *(const txid *) aa;
+	txid		b = *(const txid *) bb;
+
+	if (a < b)
+		return -1;
+	if (a > b)
+		return 1;
+	return 0;
+}
+
+/*
+ * sort a snapshot's txids, so we can use bsearch() later.
+ *
+ * For consistency of on-disk representation, we always sort even if bsearch
+ * will not be used.
+ */
+static void
+sort_snapshot(TxidSnapshot *snap)
+{
+	if (snap->nxip > 1)
+		qsort(snap->xip, snap->nxip, sizeof(txid), cmp_txid);
+}
+
+/*
+ * check txid visibility.
+ */
+static bool
+is_visible_txid(txid value, const TxidSnapshot *snap)
+{
+	if (value < snap->xmin)
+		return true;
+	else if (value >= snap->xmax)
+		return false;
+#ifdef USE_BSEARCH_IF_NXIP_GREATER
+	else if (snap->nxip > USE_BSEARCH_IF_NXIP_GREATER)
+	{
+		void	   *res;
+
+		res = bsearch(&value, snap->xip, snap->nxip, sizeof(txid), cmp_txid);
+		/* if found, transaction is still in progress */
+		return (res) ? false : true;
+	}
+#endif
+	else
+	{
+		uint32		i;
+
+		for (i = 0; i < snap->nxip; i++)
+		{
+			if (value == snap->xip[i])
+				return false;
+		}
+		return true;
+	}
+}
+
+/*
+ * helper functions to use StringInfo for TxidSnapshot creation.
+ */
+
+static StringInfo
+buf_init(txid xmin, txid xmax)
+{
+	TxidSnapshot snap;
+	StringInfo	buf;
+
+	snap.xmin = xmin;
+	snap.xmax = xmax;
+	snap.nxip = 0;
+
+	buf = makeStringInfo();
+	appendBinaryStringInfo(buf, (char *) &snap, TXID_SNAPSHOT_SIZE(0));
+	return buf;
+}
+
+static void
+buf_add_txid(StringInfo buf, txid xid)
+{
+	TxidSnapshot *snap = (TxidSnapshot *) buf->data;
+
+	/* do this before possible realloc */
+	snap->nxip++;
+
+	appendBinaryStringInfo(buf, (char *) &xid, sizeof(xid));
+}
+
+static TxidSnapshot *
+buf_finalize(StringInfo buf)
+{
+	TxidSnapshot *snap = (TxidSnapshot *) buf->data;
+
+	SET_VARSIZE(snap, buf->len);
+
+	/* buf is not needed anymore */
+	buf->data = NULL;
+	pfree(buf);
+
+	return snap;
+}
+
+/*
+ * simple number parser.
+ *
+ * We return 0 on error, which is invalid value for txid.
+ */
+static txid
+str2txid(const char *s, const char **endp)
+{
+	txid		val = 0;
+	txid		cutoff = MAX_TXID / 10;
+	txid		cutlim = MAX_TXID % 10;
+
+	for (; *s; s++)
+	{
+		unsigned	d;
+
+		if (*s < '0' || *s > '9')
+			break;
+		d = *s - '0';
+
+		/*
+		 * check for overflow
+		 */
+		if (val > cutoff || (val == cutoff && d > cutlim))
+		{
+			val = 0;
+			break;
+		}
+
+		val = val * 10 + d;
+	}
+	if (endp)
+		*endp = s;
+	return val;
+}
+
+/*
+ * parse snapshot from cstring
+ */
+static TxidSnapshot *
+parse_snapshot(const char *str)
+{
+	txid		xmin;
+	txid		xmax;
+	txid		last_val = 0,
+				val;
+	const char *str_start = str;
+	const char *endp;
+	StringInfo	buf;
+
+	xmin = str2txid(str, &endp);
+	if (*endp != ':')
+		goto bad_format;
+	str = endp + 1;
+
+	xmax = str2txid(str, &endp);
+	if (*endp != ':')
+		goto bad_format;
+	str = endp + 1;
+
+	/* it should look sane */
+	if (xmin == 0 || xmax == 0 || xmin > xmax)
+		goto bad_format;
+
+	/* allocate buffer */
+	buf = buf_init(xmin, xmax);
+
+	/* loop over values */
+	while (*str != '\0')
+	{
+		/* read next value */
+		val = str2txid(str, &endp);
+		str = endp;
+
+		/* require the input to be in order */
+		if (val < xmin || val >= xmax || val <= last_val)
+			goto bad_format;
+
+		buf_add_txid(buf, val);
+		last_val = val;
+
+		if (*str == ',')
+			str++;
+		else if (*str != '\0')
+			goto bad_format;
+	}
+
+	return buf_finalize(buf);
+
+bad_format:
+	elog(ERROR, "invalid input for txid_snapshot: \"%s\"", str_start);
+	return NULL;
+}
+
+/*
+ * Public functions.
+ *
+ * txid_current() and txid_current_snapshot() are the only ones that
+ * communicate with core xid machinery.  All the others work on data
+ * returned by them.
+ */
+
+/*
+ * txid_current() returns int8
+ *
+ *		Return the current toplevel transaction ID as TXID
+ */
+Datum
+txid_current(PG_FUNCTION_ARGS)
+{
+	txid		val;
+	TxidEpoch	state;
+
+	load_xid_epoch(&state);
+
+	val = convert_xid(GetTopTransactionId(), &state);
+
+	PG_RETURN_INT64(val);
+}
+
+/*
+ * txid_current_snapshot() returns txid_snapshot
+ *
+ *		Return current snapshot in TXID format
+ *
+ * Note that only top-transaction XIDs are included in the snapshot.
+ */
+Datum
+txid_current_snapshot(PG_FUNCTION_ARGS)
+{
+	TxidSnapshot *snap;
+	uint32		nxip,
+				i,
+				size;
+	TxidEpoch	state;
+	Snapshot	cur;
+
+	cur = ActiveSnapshot;
+	if (cur == NULL)
+		elog(ERROR, "txid_current_snapshot: ActiveSnapshot == NULL");
+
+	load_xid_epoch(&state);
+
+	/* allocate */
+	nxip = cur->xcnt;
+	size = TXID_SNAPSHOT_SIZE(nxip);
+	snap = palloc(size);
+	SET_VARSIZE(snap, size);
+
+	/* fill */
+	snap->xmin = convert_xid(cur->xmin, &state);
+	snap->xmax = convert_xid(cur->xmax, &state);
+	snap->nxip = nxip;
+	for (i = 0; i < nxip; i++)
+		snap->xip[i] = convert_xid(cur->xip[i], &state);
+
+	/* we want them guaranteed to be in ascending order */
+	sort_snapshot(snap);
+
+	PG_RETURN_POINTER(snap);
+}
+
+/*
+ * txid_snapshot_in(cstring) returns txid_snapshot
+ *
+ *		input function for type txid_snapshot
+ */
+Datum
+txid_snapshot_in(PG_FUNCTION_ARGS)
+{
+	char	   *str = PG_GETARG_CSTRING(0);
+	TxidSnapshot *snap;
+
+	snap = parse_snapshot(str);
+
+	PG_RETURN_POINTER(snap);
+}
+
+/*
+ * txid_snapshot_out(txid_snapshot) returns cstring
+ *
+ *		output function for type txid_snapshot
+ */
+Datum
+txid_snapshot_out(PG_FUNCTION_ARGS)
+{
+	TxidSnapshot *snap = (TxidSnapshot *) PG_GETARG_VARLENA_P(0);
+	StringInfoData str;
+	uint32		i;
+
+	initStringInfo(&str);
+
+	appendStringInfo(&str, TXID_FMT ":", snap->xmin);
+	appendStringInfo(&str, TXID_FMT ":", snap->xmax);
+
+	for (i = 0; i < snap->nxip; i++)
+	{
+		if (i > 0)
+			appendStringInfoChar(&str, ',');
+		appendStringInfo(&str, TXID_FMT, snap->xip[i]);
+	}
+
+	PG_RETURN_CSTRING(str.data);
+}
+
+/*
+ * txid_snapshot_recv(internal) returns txid_snapshot
+ *
+ *		binary input function for type txid_snapshot
+ *
+ *		format: int4 nxip, int8 xmin, int8 xmax, int8 xip
+ */
+Datum
+txid_snapshot_recv(PG_FUNCTION_ARGS)
+{
+	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
+	TxidSnapshot *snap;
+	txid		last = 0;
+	int			nxip;
+	int			i;
+	int			avail;
+	int			expect;
+	txid		xmin,
+				xmax;
+
+	/*
+	 * load nxip and check for nonsense.
+	 *
+	 * (nxip > avail) check is against int overflows in 'expect'.
+	 */
+	nxip = pq_getmsgint(buf, 4);
+	avail = buf->len - buf->cursor;
+	expect = 8 + 8 + nxip * 8;
+	if (nxip < 0 || nxip > avail || expect > avail)
+		goto bad_format;
+
+	xmin = pq_getmsgint64(buf);
+	xmax = pq_getmsgint64(buf);
+	if (xmin == 0 || xmax == 0 || xmin > xmax || xmax > MAX_TXID)
+		goto bad_format;
+
+	snap = palloc(TXID_SNAPSHOT_SIZE(nxip));
+	snap->xmin = xmin;
+	snap->xmax = xmax;
+	snap->nxip = nxip;
+	SET_VARSIZE(snap, TXID_SNAPSHOT_SIZE(nxip));
+
+	for (i = 0; i < nxip; i++)
+	{
+		txid		cur = pq_getmsgint64(buf);
+
+		if (cur <= last || cur < xmin || cur >= xmax)
+			goto bad_format;
+		snap->xip[i] = cur;
+		last = cur;
+	}
+	PG_RETURN_POINTER(snap);
+
+bad_format:
+	elog(ERROR, "invalid snapshot data");
+	return (Datum) NULL;
+}
+
+/*
+ * txid_snapshot_send(txid_snapshot) returns bytea
+ *
+ *		binary output function for type txid_snapshot
+ *
+ *		format: int4 nxip, int8 xmin, int8 xmax, int8 xip
+ */
+Datum
+txid_snapshot_send(PG_FUNCTION_ARGS)
+{
+	TxidSnapshot *snap = (TxidSnapshot *) PG_GETARG_VARLENA_P(0);
+	StringInfoData buf;
+	uint32		i;
+
+	pq_begintypsend(&buf);
+	pq_sendint(&buf, snap->nxip, 4);
+	pq_sendint64(&buf, snap->xmin);
+	pq_sendint64(&buf, snap->xmax);
+	for (i = 0; i < snap->nxip; i++)
+		pq_sendint64(&buf, snap->xip[i]);
+	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
+}
+
+/*
+ * txid_visible_in_snapshot(int8, txid_snapshot) returns bool
+ *
+ *		is txid visible in snapshot ?
+ */
+Datum
+txid_visible_in_snapshot(PG_FUNCTION_ARGS)
+{
+	txid		value = PG_GETARG_INT64(0);
+	TxidSnapshot *snap = (TxidSnapshot *) PG_GETARG_VARLENA_P(1);
+
+	PG_RETURN_BOOL(is_visible_txid(value, snap));
+}
+
+/*
+ * txid_snapshot_xmin(txid_snapshot) returns int8
+ *
+ *		return snapshot's xmin
+ */
+Datum
+txid_snapshot_xmin(PG_FUNCTION_ARGS)
+{
+	TxidSnapshot *snap = (TxidSnapshot *) PG_GETARG_VARLENA_P(0);
+
+	PG_RETURN_INT64(snap->xmin);
+}
+
+/*
+ * txid_snapshot_xmax(txid_snapshot) returns int8
+ *
+ *		return snapshot's xmax
+ */
+Datum
+txid_snapshot_xmax(PG_FUNCTION_ARGS)
+{
+	TxidSnapshot *snap = (TxidSnapshot *) PG_GETARG_VARLENA_P(0);
+
+	PG_RETURN_INT64(snap->xmax);
+}
+
+/*
+ * txid_snapshot_xip(txid_snapshot) returns setof int8
+ *
+ *		return in-progress TXIDs in snapshot.
+ */
+Datum
+txid_snapshot_xip(PG_FUNCTION_ARGS)
+{
+	FuncCallContext *fctx;
+	TxidSnapshot *snap;
+	txid		value;
+
+	/* on first call initialize snap_state and get copy of snapshot */
+	if (SRF_IS_FIRSTCALL())
+	{
+		TxidSnapshot *arg = (TxidSnapshot *) PG_GETARG_VARLENA_P(0);
+
+		fctx = SRF_FIRSTCALL_INIT();
+
+		/* make a copy of user snapshot */
+		snap = MemoryContextAlloc(fctx->multi_call_memory_ctx, VARSIZE(arg));
+		memcpy(snap, arg, VARSIZE(arg));
+
+		fctx->user_fctx = snap;
+	}
+
+	/* return values one-by-one */
+	fctx = SRF_PERCALL_SETUP();
+	snap = fctx->user_fctx;
+	if (fctx->call_cntr < snap->nxip)
+	{
+		value = snap->xip[fctx->call_cntr];
+		SRF_RETURN_NEXT(fctx, Int64GetDatum(value));
+	}
+	else
+	{
+		SRF_RETURN_DONE(fctx);
+	}
+}
diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c
index d01fef4b574e..216546e52066 100644
--- a/src/backend/utils/adt/uuid.c
+++ b/src/backend/utils/adt/uuid.c
@@ -3,10 +3,10 @@
  * uuid.c
  *	  Functions for the built-in type "uuid".
  *
- * Copyright (c) 2007, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/uuid.c,v 1.3 2007/01/31 19:33:54 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/uuid.c,v 1.7 2008/01/01 20:31:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,17 +24,17 @@
 /* pg_uuid_t is declared to be struct pg_uuid_t in uuid.h */
 struct pg_uuid_t
 {
-    unsigned char  data[UUID_LEN];
+	unsigned char data[UUID_LEN];
 };
 
 static void string_to_uuid(const char *source, pg_uuid_t *uuid);
-static int uuid_internal_cmp(const pg_uuid_t *arg1, const pg_uuid_t *arg2);
+static int	uuid_internal_cmp(const pg_uuid_t *arg1, const pg_uuid_t *arg2);
 
 Datum
 uuid_in(PG_FUNCTION_ARGS)
 {
-	char 		*uuid_str = PG_GETARG_CSTRING(0);
-	pg_uuid_t 	*uuid;
+	char	   *uuid_str = PG_GETARG_CSTRING(0);
+	pg_uuid_t  *uuid;
 
 	uuid = (pg_uuid_t *) palloc(sizeof(*uuid));
 	string_to_uuid(uuid_str, uuid);
@@ -44,22 +44,21 @@ uuid_in(PG_FUNCTION_ARGS)
 Datum
 uuid_out(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 			*uuid = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *uuid = PG_GETARG_UUID_P(0);
 	static const char hex_chars[] = "0123456789abcdef";
-	StringInfoData 		 buf;
-	int 				 i;
+	StringInfoData buf;
+	int			i;
 
 	initStringInfo(&buf);
 	for (i = 0; i < UUID_LEN; i++)
 	{
-		int hi;
-		int lo;
+		int			hi;
+		int			lo;
 
 		/*
 		 * We print uuid values as a string of 8, 4, 4, 4, and then 12
-		 * hexadecimal characters, with each group is separated by a
-		 * hyphen ("-"). Therefore, add the hyphens at the appropriate
-		 * places here.
+		 * hexadecimal characters, with each group is separated by a hyphen
+		 * ("-"). Therefore, add the hyphens at the appropriate places here.
 		 */
 		if (i == 4 || i == 6 || i == 8 || i == 10)
 			appendStringInfoChar(&buf, '-');
@@ -83,9 +82,9 @@ uuid_out(PG_FUNCTION_ARGS)
 static void
 string_to_uuid(const char *source, pg_uuid_t *uuid)
 {
-	char 		hex_buf[32];	/* not NUL terminated */
-	int 		i;
-	int 		src_len;
+	char		hex_buf[32];	/* not NUL terminated */
+	int			i;
+	int			src_len;
 
 	src_len = strlen(source);
 	if (src_len != 32 && src_len != 36 && src_len != 38)
@@ -102,7 +101,7 @@ string_to_uuid(const char *source, pg_uuid_t *uuid)
 			if (str[0] != '{' || str[37] != '}')
 				goto syntax_error;
 
-			str++;	/* skip the first character */
+			str++;				/* skip the first character */
 		}
 
 		if (str[8] != '-' || str[13] != '-' ||
@@ -118,7 +117,7 @@ string_to_uuid(const char *source, pg_uuid_t *uuid)
 
 	for (i = 0; i < UUID_LEN; i++)
 	{
-		char str_buf[3];
+		char		str_buf[3];
 
 		memcpy(str_buf, &hex_buf[i * 2], 2);
 		if (!isxdigit((unsigned char) str_buf[0]) ||
@@ -132,17 +131,17 @@ string_to_uuid(const char *source, pg_uuid_t *uuid)
 	return;
 
 syntax_error:
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for uuid: \"%s\"",
-						source)));
+	ereport(ERROR,
+			(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+			 errmsg("invalid input syntax for uuid: \"%s\"",
+					source)));
 }
 
 Datum
 uuid_recv(PG_FUNCTION_ARGS)
 {
-	StringInfo 	 buffer = (StringInfo) PG_GETARG_POINTER(0);
-	pg_uuid_t 	*uuid;
+	StringInfo	buffer = (StringInfo) PG_GETARG_POINTER(0);
+	pg_uuid_t  *uuid;
 
 	uuid = (pg_uuid_t *) palloc(UUID_LEN);
 	memcpy(uuid->data, pq_getmsgbytes(buffer, UUID_LEN), UUID_LEN);
@@ -152,8 +151,8 @@ uuid_recv(PG_FUNCTION_ARGS)
 Datum
 uuid_send(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 				*uuid = PG_GETARG_UUID_P(0);
-	StringInfoData 		 buffer;
+	pg_uuid_t  *uuid = PG_GETARG_UUID_P(0);
+	StringInfoData buffer;
 
 	pq_begintypsend(&buffer);
 	pq_sendbytes(&buffer, (char *) uuid->data, UUID_LEN);
@@ -170,8 +169,8 @@ uuid_internal_cmp(const pg_uuid_t *arg1, const pg_uuid_t *arg2)
 Datum
 uuid_lt(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 	*arg1 = PG_GETARG_UUID_P(0);
-	pg_uuid_t 	*arg2 = PG_GETARG_UUID_P(1);
+	pg_uuid_t  *arg1 = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *arg2 = PG_GETARG_UUID_P(1);
 
 	PG_RETURN_BOOL(uuid_internal_cmp(arg1, arg2) < 0);
 }
@@ -179,8 +178,8 @@ uuid_lt(PG_FUNCTION_ARGS)
 Datum
 uuid_le(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 	*arg1 = PG_GETARG_UUID_P(0);
-	pg_uuid_t 	*arg2 = PG_GETARG_UUID_P(1);
+	pg_uuid_t  *arg1 = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *arg2 = PG_GETARG_UUID_P(1);
 
 	PG_RETURN_BOOL(uuid_internal_cmp(arg1, arg2) <= 0);
 }
@@ -188,8 +187,8 @@ uuid_le(PG_FUNCTION_ARGS)
 Datum
 uuid_eq(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 	*arg1 = PG_GETARG_UUID_P(0);
-	pg_uuid_t 	*arg2 = PG_GETARG_UUID_P(1);
+	pg_uuid_t  *arg1 = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *arg2 = PG_GETARG_UUID_P(1);
 
 	PG_RETURN_BOOL(uuid_internal_cmp(arg1, arg2) == 0);
 }
@@ -197,8 +196,8 @@ uuid_eq(PG_FUNCTION_ARGS)
 Datum
 uuid_ge(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 	*arg1 = PG_GETARG_UUID_P(0);
-	pg_uuid_t 	*arg2 = PG_GETARG_UUID_P(1);
+	pg_uuid_t  *arg1 = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *arg2 = PG_GETARG_UUID_P(1);
 
 	PG_RETURN_BOOL(uuid_internal_cmp(arg1, arg2) >= 0);
 }
@@ -206,8 +205,8 @@ uuid_ge(PG_FUNCTION_ARGS)
 Datum
 uuid_gt(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 	*arg1 = PG_GETARG_UUID_P(0);
-	pg_uuid_t 	*arg2 = PG_GETARG_UUID_P(1);
+	pg_uuid_t  *arg1 = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *arg2 = PG_GETARG_UUID_P(1);
 
 	PG_RETURN_BOOL(uuid_internal_cmp(arg1, arg2) > 0);
 }
@@ -215,8 +214,8 @@ uuid_gt(PG_FUNCTION_ARGS)
 Datum
 uuid_ne(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 	*arg1 = PG_GETARG_UUID_P(0);
-	pg_uuid_t 	*arg2 = PG_GETARG_UUID_P(1);
+	pg_uuid_t  *arg1 = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *arg2 = PG_GETARG_UUID_P(1);
 
 	PG_RETURN_BOOL(uuid_internal_cmp(arg1, arg2) != 0);
 }
@@ -225,8 +224,8 @@ uuid_ne(PG_FUNCTION_ARGS)
 Datum
 uuid_cmp(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t 	*arg1 = PG_GETARG_UUID_P(0);
-	pg_uuid_t 	*arg2 = PG_GETARG_UUID_P(1);
+	pg_uuid_t  *arg1 = PG_GETARG_UUID_P(0);
+	pg_uuid_t  *arg2 = PG_GETARG_UUID_P(1);
 
 	PG_RETURN_INT32(uuid_internal_cmp(arg1, arg2));
 }
@@ -235,35 +234,7 @@ uuid_cmp(PG_FUNCTION_ARGS)
 Datum
 uuid_hash(PG_FUNCTION_ARGS)
 {
-	pg_uuid_t	*key = PG_GETARG_UUID_P(0);
-	return hash_any(key->data, UUID_LEN);
-}
-
-/* cast text to uuid */
-Datum
-text_uuid(PG_FUNCTION_ARGS)
-{
-	text 		*input = PG_GETARG_TEXT_P(0);
-	int		 	 length;
-	char		*str;
-	Datum	 	 result;
-
-	length = VARSIZE(input) - VARHDRSZ;
-	str = palloc(length + 1);
-	memcpy(str, VARDATA(input), length);
-	*(str + length) = '\0';
-
-	result = DirectFunctionCall1(uuid_in, CStringGetDatum(str));
-	pfree(str);
-	PG_RETURN_DATUM(result);
-}
+	pg_uuid_t  *key = PG_GETARG_UUID_P(0);
 
-/* cast uuid to text */
-Datum
-uuid_text(PG_FUNCTION_ARGS)
-{
-	pg_uuid_t 	*uuid 	  = PG_GETARG_UUID_P(0);
-	Datum 		 uuid_str = DirectFunctionCall1(uuid_out, UUIDPGetDatum(uuid));
-
-	PG_RETURN_DATUM(DirectFunctionCall1(textin, uuid_str));
+	return hash_any(key->data, UUID_LEN);
 }
diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c
index afda1ebde66d..212c854c58f2 100644
--- a/src/backend/utils/adt/varbit.c
+++ b/src/backend/utils/adt/varbit.c
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.52 2007/01/05 22:19:42 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.57.2.2 2010/01/07 19:53:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,9 +28,9 @@
 static int32
 anybit_typmodin(ArrayType *ta, const char *typename)
 {
-	int32    typmod;
-	int32	*tl;
-	int		n;
+	int32		typmod;
+	int32	   *tl;
+	int			n;
 
 	tl = ArrayGetIntegerTypmods(ta, &n);
 
@@ -63,7 +63,7 @@ anybit_typmodin(ArrayType *ta, const char *typename)
 static char *
 anybit_typmodout(int32 typmod)
 {
-	char    *res = (char *) palloc(64);
+	char	   *res = (char *) palloc(64);
 
 	if (typmod >= 0)
 		snprintf(res, 64, "(%d)", typmod);
@@ -390,7 +390,7 @@ bit(PG_FUNCTION_ARGS)
 Datum
 bittypmodin(PG_FUNCTION_ARGS)
 {
-	ArrayType    *ta = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *ta = PG_GETARG_ARRAYTYPE_P(0);
 
 	PG_RETURN_INT32(anybit_typmodin(ta, "bit"));
 }
@@ -398,7 +398,7 @@ bittypmodin(PG_FUNCTION_ARGS)
 Datum
 bittypmodout(PG_FUNCTION_ARGS)
 {
-	int32 typmod = PG_GETARG_INT32(0);
+	int32		typmod = PG_GETARG_INT32(0);
 
 	PG_RETURN_CSTRING(anybit_typmodout(typmod));
 }
@@ -703,7 +703,7 @@ varbit(PG_FUNCTION_ARGS)
 Datum
 varbittypmodin(PG_FUNCTION_ARGS)
 {
-	ArrayType    *ta = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *ta = PG_GETARG_ARRAYTYPE_P(0);
 
 	PG_RETURN_INT32(anybit_typmodin(ta, "varbit"));
 }
@@ -711,7 +711,7 @@ varbittypmodin(PG_FUNCTION_ARGS)
 Datum
 varbittypmodout(PG_FUNCTION_ARGS)
 {
-	int32 typmod = PG_GETARG_INT32(0);
+	int32		typmod = PG_GETARG_INT32(0);
 
 	PG_RETURN_CSTRING(anybit_typmodout(typmod));
 }
@@ -973,13 +973,23 @@ bitsubstr(PG_FUNCTION_ARGS)
 			   *ps;
 
 	bitlen = VARBITLEN(arg);
-	/* If we do not have an upper bound, set bitlen */
-	if (l == -1)
-		l = bitlen;
-	e = s + l;
 	s1 = Max(s, 1);
-	e1 = Min(e, bitlen + 1);
-	if (s1 > bitlen || e1 < 1)
+	/* If we do not have an upper bound, use end of string */
+	if (l < 0)
+	{
+		e1 = bitlen + 1;
+	}
+	else
+	{
+		e = s + l;
+		/* guard against overflow, even though we don't allow L<0 here */
+		if (e < s)
+			ereport(ERROR,
+					(errcode(ERRCODE_SUBSTRING_ERROR),
+					 errmsg("negative substring length not allowed")));
+		e1 = Min(e, bitlen + 1);
+	}
+	if (s1 > bitlen || e1 <= s1)
 	{
 		/* Need to return a zero-length bitstring */
 		len = VARBITTOTALLEN(0);
@@ -1374,7 +1384,12 @@ bitfromint4(PG_FUNCTION_ARGS)
 	/* store first fractional byte */
 	if (destbitsleft > srcbitsleft)
 	{
-		*r++ = (bits8) ((a >> (srcbitsleft - 8)) & BITMASK);
+		int		val = (int) (a >> (destbitsleft - 8));
+
+		/* Force sign-fill in case the compiler implements >> as zero-fill */
+		if (a < 0)
+			val |= (-1) << (srcbitsleft + 8 - destbitsleft);
+		*r++ = (bits8) (val & BITMASK);
 		destbitsleft -= 8;
 	}
 	/* Now srcbitsleft and destbitsleft are the same, need not track both */
@@ -1453,7 +1468,12 @@ bitfromint8(PG_FUNCTION_ARGS)
 	/* store first fractional byte */
 	if (destbitsleft > srcbitsleft)
 	{
-		*r++ = (bits8) ((a >> (srcbitsleft - 8)) & BITMASK);
+		int		val = (int) (a >> (destbitsleft - 8));
+
+		/* Force sign-fill in case the compiler implements >> as zero-fill */
+		if (a < 0)
+			val |= (-1) << (srcbitsleft + 8 - destbitsleft);
+		*r++ = (bits8) (val & BITMASK);
 		destbitsleft -= 8;
 	}
 	/* Now srcbitsleft and destbitsleft are the same, need not track both */
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index aa4e3cdd297e..826bb565fc4b 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.121 2007/01/05 22:19:42 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.126 2008/01/01 19:45:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -210,21 +210,9 @@ bpcharin(PG_FUNCTION_ARGS)
 Datum
 bpcharout(PG_FUNCTION_ARGS)
 {
-	Datum d = PG_GETARG_DATUM(0);
-	char *s; void *tofree; int len; 
-	char *result;
+	Datum		txt = PG_GETARG_DATUM(0);
 
-	varattrib_untoast_ptr_len(d, &s, &len, &tofree); 
-
-	/* copy and add null term */
-	result = (char *) palloc(len + 1);
-	memcpy(result, s, len);
-	result[len] = '\0';
-
-	if(tofree)
-		pfree(tofree);
-
-	PG_RETURN_CSTRING(result);
+	PG_RETURN_CSTRING(TextDatumGetCString(txt));
 }
 
 /*
@@ -275,12 +263,11 @@ bpcharsend(PG_FUNCTION_ARGS)
 Datum
 bpchar(PG_FUNCTION_ARGS)
 {
-	Datum 		d = PG_GETARG_DATUM(0);
+	BpChar	   *source = PG_GETARG_BPCHAR_PP(0);
 	int32		maxlen = PG_GETARG_INT32(1);
 	bool		isExplicit = PG_GETARG_BOOL(2);
-	char *p; void *tofree; int plen; 
-	int len;
 	BpChar	   *result;
+	int32		len;
 	char	   *r;
 	char	   *s;
 	int			i;
@@ -289,70 +276,64 @@ bpchar(PG_FUNCTION_ARGS)
 
 	/* No work if typmod is invalid */
 	if (maxlen < (int32) VARHDRSZ)
-		return d;
+		PG_RETURN_BPCHAR_P(source);
+
+	maxlen -= VARHDRSZ;
 
-	varattrib_untoast_ptr_len(d, &p, &plen, &tofree);
+	len = VARSIZE_ANY_EXHDR(source);
+	s = VARDATA_ANY(source);
 
-	charlen = pg_mbstrlen_with_len(p, plen) + VARHDRSZ;
+	charlen = pg_mbstrlen_with_len(s, len);
 
 	/* No work if supplied data matches typmod already */
 	if (charlen == maxlen)
-	{
-		if(tofree)
-			pfree(tofree);
-		return d;
-	}
-
-	len = plen + VARHDRSZ;
+		PG_RETURN_BPCHAR_P(source);
 
 	if (charlen > maxlen)
 	{
 		/* Verify that extra characters are spaces, and clip them off */
 		size_t		maxmblen;
 
-		maxmblen = pg_mbcharcliplen(p, plen, maxlen - VARHDRSZ) + VARHDRSZ;
+		maxmblen = pg_mbcharcliplen(s, len, maxlen);
 
 		if (!isExplicit)
 		{
-			for (i = maxmblen - VARHDRSZ; i < plen; i++)
-				if (*(p + i) != ' ')
+			for (i = maxmblen; i < len; i++)
+				if (s[i] != ' ')
 					ereport(ERROR,
 							(errcode(ERRCODE_STRING_DATA_RIGHT_TRUNCATION),
 							 errmsg("value too long for type character(%d)",
-									maxlen - VARHDRSZ)));
+									maxlen)));
 		}
 
 		len = maxmblen;
 
 		/*
-		 * XXX: at this point, maxlen is the necessary byte length+VARHDRSZ,
-		 * not the number of CHARACTERS!
+		 * At this point, maxlen is the necessary byte length, not the number
+		 * of CHARACTERS!
 		 */
 		maxlen = len;
 	}
 	else
 	{
 		/*
-		 * XXX: at this point, maxlen is the necessary byte length+VARHDRSZ,
-		 * not the number of CHARACTERS!
+		 * At this point, maxlen is the necessary byte length, not the number
+		 * of CHARACTERS!
 		 */
 		maxlen = len + (maxlen - charlen);
 	}
 
-	s = p;
+	Assert(maxlen >= len);
 
-	result = palloc(maxlen);
-	SET_VARSIZE(result, maxlen);
+	result = palloc(maxlen + VARHDRSZ);
+	SET_VARSIZE(result, maxlen + VARHDRSZ);
 	r = VARDATA(result);
 
-	memcpy(r, s, len - VARHDRSZ);
+	memcpy(r, s, len);
 
 	/* blank pad the string if necessary */
 	if (maxlen > len)
-		memset(r + len - VARHDRSZ, ' ', maxlen - len);
-
-	if(tofree)
-		pfree(tofree);
+		memset(r + len, ' ', maxlen - len);
 
 	PG_RETURN_BPCHAR_P(result);
 }
@@ -382,36 +363,29 @@ char_bpchar(PG_FUNCTION_ARGS)
 Datum
 bpchar_name(PG_FUNCTION_ARGS)
 {
+	BpChar	   *s = PG_GETARG_BPCHAR_PP(0);
+	char	   *s_data;
 	Name		result;
-	Datum d = PG_GETARG_DATUM(0);
-	char *s; void *tofree; int len;
+	int			len;
 
-	varattrib_untoast_ptr_len(d, &s, &len, &tofree);
+	len = VARSIZE_ANY_EXHDR(s);
+	s_data = VARDATA_ANY(s);
 
-	/* Truncate to max length for a Name */
+	/* Truncate oversize input */
 	if (len >= NAMEDATALEN)
-		len = NAMEDATALEN - 1;
+		len = pg_mbcliplen(s_data, len, NAMEDATALEN - 1);
 
 	/* Remove trailing blanks */
 	while (len > 0)
 	{
-		if (*(s + len - 1) != ' ')
+		if (s_data[len - 1] != ' ')
 			break;
 		len--;
 	}
 
-	result = (NameData *) palloc(NAMEDATALEN);
-	memcpy(NameStr(*result), s, len);
-
-	/* Now null pad to full length... */
-	while (len < NAMEDATALEN)
-	{
-		*(NameStr(*result) + len) = '\0';
-		len++;
-	}
-
-	if(tofree)
-		pfree(tofree);
+	/* We use palloc0 here to ensure result is zero-padded */
+	result = (Name) palloc0(NAMEDATALEN);
+	memcpy(NameStr(*result), s_data, len);
 
 	PG_RETURN_NAME(result);
 }
@@ -530,22 +504,9 @@ varcharin(PG_FUNCTION_ARGS)
 Datum
 varcharout(PG_FUNCTION_ARGS)
 {
-	char	   *result;
-
-	Datum d = PG_GETARG_DATUM(0);
-	char *s; void *tofree; int len;
+	Datum		txt = PG_GETARG_DATUM(0);
 
-	varattrib_untoast_ptr_len(d, &s, &len, &tofree); 
-
-	/* copy and add null term */
-	result = palloc(len + 1);
-	memcpy(result, s, len);
-	result[len] = '\0';
-
-	if(tofree)
-		pfree(tofree);
-
-	PG_RETURN_CSTRING(result);
+	PG_RETURN_CSTRING(TextDatumGetCString(txt));
 }
 
 /*
@@ -596,44 +557,40 @@ varcharsend(PG_FUNCTION_ARGS)
 Datum
 varchar(PG_FUNCTION_ARGS)
 {
-	Datum 		d = PG_GETARG_DATUM(0);
-	int32		maxlen = PG_GETARG_INT32(1);
+	VarChar    *source = PG_GETARG_VARCHAR_PP(0);
+	int32		typmod = PG_GETARG_INT32(1);
 	bool		isExplicit = PG_GETARG_BOOL(2);
-	VarChar    *result;
+	int32		len,
+				maxlen;
 	size_t		maxmblen;
 	int			i;
+	char	   *s_data;
 
-	char *p; void *tofree; int len;
-
-	varattrib_untoast_ptr_len(d, &p, &len, &tofree);
+	len = VARSIZE_ANY_EXHDR(source);
+	s_data = VARDATA_ANY(source);
+	maxlen = typmod - VARHDRSZ;
 
 	/* No work if typmod is invalid or supplied data fits it already */
-	if (maxlen < (int32) VARHDRSZ || (len + VARHDRSZ) <= maxlen)
-		return d;
+	if (maxlen < 0 || len <= maxlen)
+		PG_RETURN_VARCHAR_P(source);
 
 	/* only reach here if string is too long... */
+
 	/* truncate multibyte string preserving multibyte boundary */
-	maxmblen = pg_mbcharcliplen(p, len, maxlen - VARHDRSZ);
+	maxmblen = pg_mbcharcliplen(s_data, len, maxlen);
 
 	if (!isExplicit)
 	{
 		for (i = maxmblen; i < len; i++)
-			if (*(p + i) != ' ')
+			if (s_data[i] != ' ')
 				ereport(ERROR,
 						(errcode(ERRCODE_STRING_DATA_RIGHT_TRUNCATION),
 					  errmsg("value too long for type character varying(%d)",
-							 maxlen - VARHDRSZ)));
+							 maxlen)));
 	}
 
-	len = maxmblen + VARHDRSZ;
-	result = palloc(len);
-	SET_VARSIZE(result, len);
-	memcpy(VARDATA(result), p, maxmblen); 
-
-	if(tofree)
-		pfree(tofree);
-
-	PG_RETURN_VARCHAR_P(result);
+	PG_RETURN_VARCHAR_P((VarChar *) cstring_to_text_with_len(s_data,
+															 maxmblen));
 }
 
 Datum
@@ -659,13 +616,16 @@ varchartypmodout(PG_FUNCTION_ARGS)
 
 /* "True" length (not counting trailing blanks) of a BpChar */
 static inline int
-bcTruelen(char *p, int len)
+bcTruelen(BpChar *arg)
 {
+	char	   *s = VARDATA_ANY(arg);
 	int			i;
+	int			len;
 
+	len = VARSIZE_ANY_EXHDR(arg);
 	for (i = len - 1; i >= 0; i--)
 	{
-		if (p[i] != ' ')
+		if (s[i] != ' ')
 			break;
 	}
 	return i + 1;
@@ -674,20 +634,15 @@ bcTruelen(char *p, int len)
 Datum
 bpcharlen(PG_FUNCTION_ARGS)
 {
-	Datum d = PG_GETARG_DATUM(0);
-	char* p; void *tofree; int len;
-
-	varattrib_untoast_ptr_len(d, &p, &len, &tofree);
+	BpChar	   *arg = PG_GETARG_BPCHAR_PP(0);
+	int			len;
 
 	/* get number of bytes, ignoring trailing spaces */
-	len = bcTruelen(p, len);
+	len = bcTruelen(arg);
 
 	/* in multibyte encoding, convert to number of characters */
 	if (pg_database_encoding_max_length() != 1)
-		len = pg_mbstrlen_with_len(p, len);
-
-	if(tofree)
-		pfree(tofree);
+		len = pg_mbstrlen_with_len(VARDATA_ANY(arg), len);
 
 	PG_RETURN_INT32(len);
 }
@@ -695,15 +650,10 @@ bpcharlen(PG_FUNCTION_ARGS)
 Datum
 bpcharoctetlen(PG_FUNCTION_ARGS)
 {
-	Datum d = PG_GETARG_DATUM(0);
-	char* p; void *tofree; int len;
+	Datum		arg = PG_GETARG_DATUM(0);
 
-	varattrib_untoast_ptr_len(d, &p, &len, &tofree);
-
-	if(tofree)
-		pfree(tofree);
-
-	PG_RETURN_INT32(len);
+	/* We need not detoast the input at all */
+	PG_RETURN_INT32(toast_raw_datum_size(arg) - VARHDRSZ);
 }
 
 
@@ -714,143 +664,192 @@ bpcharoctetlen(PG_FUNCTION_ARGS)
  * be careful to free working copies of toasted datums.  Most places don't
  * need to be so careful.
  *****************************************************************************/
-static inline bool bpeq(Datum d0, Datum d1)
+Datum
+bpchareq(PG_FUNCTION_ARGS)
 {
-	char* p0; void *tofree0; int len0;
-	char* p1; void *tofree1; int len1;
-
-	bool result;
-
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	bool		result;
 
-	len0 = bcTruelen(p0, len0);
-	len1 = bcTruelen(p1, len1);
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
 
 	/*
 	 * Since we only care about equality or not-equality, we can avoid all the
 	 * expense of strcoll() here, and just do bitwise comparison.
 	 */
-	if (len0 != len1)
+	if (len1 != len2)
 		result = false;
 	else
-		result = (memcmp(p0, p1, len0) == 0); 
+		result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) == 0);
 
-	if(tofree0)
-		pfree(tofree0);
-	if(tofree1)
-		pfree(tofree1);
-
-	return result;
-}
-
-
-Datum
-bpchareq(PG_FUNCTION_ARGS)
-{
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	PG_RETURN_BOOL(bpeq(d0, d1)); 
+	PG_RETURN_BOOL(result);
 }
 
 Datum
 bpcharne(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
-
-	PG_RETURN_BOOL((!bpeq(d0, d1))); 
-}
-
-static inline int
-bpcmp(Datum d0, Datum d1)
-{
-	char *p0; void *tofree0; int len0;
-	char *p1; void *tofree1; int len1;
-	int result;
-
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	bool		result;
 
-	len0 = bcTruelen(p0, len0);
-	len1 = bcTruelen(p1, len1);
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
 
-	result = varstr_cmp(p0, len0, p1, len1);
+	/*
+	 * Since we only care about equality or not-equality, we can avoid all the
+	 * expense of strcoll() here, and just do bitwise comparison.
+	 */
+	if (len1 != len2)
+		result = true;
+	else
+		result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) != 0);
 
-	if(tofree0)
-		pfree(tofree0);
-	if(tofree1)
-		pfree(tofree1);
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	return result;
+	PG_RETURN_BOOL(result);
 }
 
 Datum
 bpcharlt(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
+
+	cmp = varstr_cmp(VARDATA_ANY(arg1), len1, VARDATA_ANY(arg2), len2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	PG_RETURN_BOOL(bpcmp(d0, d1) < 0);
+	PG_RETURN_BOOL(cmp < 0);
 }
 
 Datum
 bpcharle(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
+
+	cmp = varstr_cmp(VARDATA_ANY(arg1), len1, VARDATA_ANY(arg2), len2);
 
-	PG_RETURN_BOOL(bpcmp(d0, d1) <= 0);
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(cmp <= 0);
 }
 
 Datum
 bpchargt(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
 
-	PG_RETURN_BOOL(bpcmp(d0, d1) > 0);
+	cmp = varstr_cmp(VARDATA_ANY(arg1), len1, VARDATA_ANY(arg2), len2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(cmp > 0);
 }
 
 Datum
 bpcharge(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
 
-	PG_RETURN_BOOL(bpcmp(d0, d1) >= 0);
+	cmp = varstr_cmp(VARDATA_ANY(arg1), len1, VARDATA_ANY(arg2), len2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(cmp >= 0);
 }
 
 Datum
 bpcharcmp(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
 
-	PG_RETURN_INT32(bpcmp(d0, d1));
+	cmp = varstr_cmp(VARDATA_ANY(arg1), len1, VARDATA_ANY(arg2), len2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_INT32(cmp);
 }
 
 Datum
 bpchar_larger(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
 
-	int cmp = bpcmp(d0, d1);
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
 
-	return cmp >= 0 ? d0 : d1;
+	cmp = varstr_cmp(VARDATA_ANY(arg1), len1, VARDATA_ANY(arg2), len2);
+
+	PG_RETURN_BPCHAR_P((cmp >= 0) ? arg1 : arg2);
 }
 
 Datum
 bpchar_smaller(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	BpChar	   *arg1 = PG_GETARG_BPCHAR_PP(0);
+	BpChar	   *arg2 = PG_GETARG_BPCHAR_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = bcTruelen(arg1);
+	len2 = bcTruelen(arg2);
 
-	int cmp = bpcmp(d0, d1);
+	cmp = varstr_cmp(VARDATA_ANY(arg1), len1, VARDATA_ANY(arg2), len2);
 
-	return cmp <= 0 ? d0 : d1;
+	PG_RETURN_BPCHAR_P((cmp <= 0) ? arg1 : arg2);
 }
 
 
@@ -865,18 +864,18 @@ bpchar_smaller(PG_FUNCTION_ARGS)
 Datum
 hashbpchar(PG_FUNCTION_ARGS)
 {
-	Datum d = PG_GETARG_DATUM(0);
-	char* p; void *tofree; int len;
-	Datum result;
-
-	varattrib_untoast_ptr_len(d, &p, &len, &tofree);
+	BpChar	   *key = PG_GETARG_BPCHAR_PP(0);
+	char	   *keydata;
+	int			keylen;
+	Datum		result;
 
-	len = bcTruelen(p, len);
+	keydata = VARDATA_ANY(key);
+	keylen = bcTruelen(key);
 
-	result = hash_any((unsigned char *) p, len); 
+	result = hash_any((unsigned char *) keydata, keylen);
 
-	if(tofree)
-		pfree(tofree);
+	/* Avoid leaking memory for toasted inputs */
+	PG_FREE_IF_COPY(key, 0);
 
 	return result;
 }
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index a6d386ab19ce..b5d5afeaaba8 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.154 2007/01/05 22:19:42 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.162.2.1 2008/03/13 18:32:02 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -277,7 +277,7 @@ byteain(PG_FUNCTION_ARGS)
 Datum
 byteaout(PG_FUNCTION_ARGS)
 {
-	bytea	   *vlena = PG_GETARG_BYTEA_P(0);
+	bytea	   *vlena = PG_GETARG_BYTEA_PP(0);
 	char	   *result;
 	char	   *vp;
 	char	   *rp;
@@ -379,19 +379,15 @@ textin(PG_FUNCTION_ARGS)
 Datum
 textout(PG_FUNCTION_ARGS)
 {
-	char *result;
-
-	Datum d = PG_GETARG_DATUM(0);
-	char *p; void *tofree; int len;
-	varattrib_untoast_ptr_len(d, &p, &len, &tofree);
+	text	   *t = PG_GETARG_TEXT_PP(0);
+	int			len;
+	char	   *result;
 
+	len = VARSIZE_ANY_EXHDR(t);
 	result = (char *) palloc(len + 1);
-	memcpy(result, p, len);
+	memcpy(result, VARDATA_ANY(t), len);
 	result[len] = '\0';
 
-	if(tofree != NULL)
-		pfree(tofree);
-
 	PG_RETURN_CSTRING(result);
 }
 
@@ -504,15 +500,10 @@ text_length(Datum str)
 		PG_RETURN_INT32(toast_raw_datum_size(str) - VARHDRSZ);
 	else
 	{
-		int32 ret;
-		char *p; void *tofree; int len;
-		varattrib_untoast_ptr_len(str, &p, &len, &tofree);
-
-		ret = pg_mbstrlen_with_len(p, len); 
-		if(tofree)
-			pfree(tofree);
+		text	   *t = DatumGetTextPP(str);
 
-		PG_RETURN_INT32(ret);
+		PG_RETURN_INT32(pg_mbstrlen_with_len(VARDATA_ANY(t),
+											 VARSIZE_ANY_EXHDR(t)));
 	}
 }
 
@@ -544,27 +535,36 @@ textoctetlen(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32(toast_raw_datum_size(str) - VARHDRSZ);
 }
 
-/* 
- * Generaic concatenation of two varlena.  The varlena may comes in differnt
- * flavors, but they are really the same.  Duplicate the body of the function makes
- * no sense.
+/*
+ * textcat -
+ *	  takes two text* and returns a text* that is the concatenation of
+ *	  the two.
+ *
+ * Rewritten by Sapa, sapa@hq.icb.chel.su. 8-Jul-96.
+ * Updated by Thomas, Thomas.Lockhart@jpl.nasa.gov 1997-07-10.
+ * Allocate space for output in all cases.
+ * XXX - thomas 1997-07-10
  */
-static inline Datum generic_varlena_cat(PG_FUNCTION_ARGS)
+Datum
+textcat(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-
-	Datum d1 = PG_GETARG_DATUM(1);
-	char *p1; void *tofree1; int len1;
+	text	   *t1 = PG_GETARG_TEXT_PP(0);
+	text	   *t2 = PG_GETARG_TEXT_PP(1);
+	int			len1,
+				len2,
+				len;
+	text	   *result;
+	char	   *ptr;
 
-	int len; 
-	text *result;
-	char *ptr;
+	len1 = VARSIZE_ANY_EXHDR(t1);
+	if (len1 < 0)
+		len1 = 0;
 
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
+	len2 = VARSIZE_ANY_EXHDR(t2);
+	if (len2 < 0)
+		len2 = 0;
 
-	len = len0 + len1 + VARHDRSZ;
+	len = len1 + len2 + VARHDRSZ;
 	result = (text *) palloc(len);
 
 	/* Set size of result string... */
@@ -572,31 +572,14 @@ static inline Datum generic_varlena_cat(PG_FUNCTION_ARGS)
 
 	/* Fill data field of result string... */
 	ptr = VARDATA(result);
-
-	if (len0 > 0)
-		memcpy(ptr, p0, len0); 
 	if (len1 > 0)
-		memcpy(ptr + len0, p1, len1); 
+		memcpy(ptr, VARDATA_ANY(t1), len1);
+	if (len2 > 0)
+		memcpy(ptr + len1, VARDATA_ANY(t2), len2);
 
 	PG_RETURN_TEXT_P(result);
 }
 
-/*
- * textcat -
- *	  takes two text* and returns a text* that is the concatenation of
- *	  the two.
- *
- * Rewritten by Sapa, sapa@hq.icb.chel.su. 8-Jul-96.
- * Updated by Thomas, Thomas.Lockhart@jpl.nasa.gov 1997-07-10.
- * Allocate space for output in all cases.
- * XXX - thomas 1997-07-10
- */
-Datum
-textcat(PG_FUNCTION_ARGS)
-{
-	return generic_varlena_cat(fcinfo);
-}
-
 /*
  * charlen_to_bytelen()
  *	Compute the number of bytes occupied by n characters starting at *p
@@ -861,8 +844,7 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
 		 * If we're working with an untoasted source, no need to do an extra
 		 * copying step.
 		 */
-		if (VARATT_IS_COMPRESSED(DatumGetPointer(str)) ||
-			VARATT_IS_EXTERNAL(DatumGetPointer(str)))
+		if (VARATT_IS_COMPRESSED(str) || VARATT_IS_EXTERNAL(str))
 			slice = DatumGetTextPSlice(str, slice_start, slice_size);
 		else
 			slice = (text *) DatumGetPointer(str);
@@ -943,11 +925,9 @@ Datum
 textpos(PG_FUNCTION_ARGS)
 {
 	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-
 	Datum d1 = PG_GETARG_DATUM(1);
+	char *p0; void *tofree0; int len0;
 	char *p1; void *tofree1; int len1;
-	
 	int32 pos;
 
 	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
@@ -1020,8 +1000,8 @@ text_position_setup_ptr_len(char* p1, int len1, char* p2, int len2, TextPosition
 	{
 		/* simple case - single byte encoding */
 		state->use_wchar = false;
-		state->str1 = p1; 
-		state->str2 = p2; 
+		state->str1 = p1;
+		state->str2 = p2;
 		state->len1 = len1;
 		state->len2 = len2;
 	}
@@ -1262,54 +1242,25 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
 	return result;
 }
 
-static inline int
-text_cmp_datum(Datum d0, Datum d1)
+/* text_cmp()
+ * Internal comparison function for text strings.
+ * Returns -1, 0 or 1
+ */
+static int
+text_cmp(text *arg1, text *arg2)
 {
-	char *p0; void *tofree0; int len0;
-	char *p1; void *tofree1; int len1;
-	int result;
+	char	   *a1p,
+			   *a2p;
+	int			len1,
+				len2;
 
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
+	a1p = VARDATA_ANY(arg1);
+	a2p = VARDATA_ANY(arg2);
 
-	result = varstr_cmp(p0, len0, p1, len1);
-
-	if(tofree0)
-		pfree(tofree0);
-	if(tofree1)
-		pfree(tofree1);
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
 
-	return result;
-}
-
-static inline Datum generic_varlena_eq(PG_FUNCTION_ARGS)
-{
-	bool		result;
-
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-
-	Datum d1 = PG_GETARG_DATUM(1);
-	char *p1; void *tofree1; int len1;
-
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
-
-	/*
-	 * Since we only care about equality or not-equality, we can avoid all the
-	 * expense of strcoll() here, and just do bitwise comparison.
-	 */
-	if(len0 != len1)
-		result = false;
-	else
-		result = (memcmp(p0, p1, len1) == 0);
-
-	if(tofree0)
-		pfree(tofree0);
-	if(tofree1)
-		pfree(tofree1);
-	
-	PG_RETURN_BOOL(result);
+	return varstr_cmp(a1p, len1, a2p, len2);
 }
 
 /*
@@ -1323,63 +1274,121 @@ static inline Datum generic_varlena_eq(PG_FUNCTION_ARGS)
 Datum
 texteq(PG_FUNCTION_ARGS)
 {
-	return generic_varlena_eq(fcinfo);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	/*
+	 * Since we only care about equality or not-equality, we can avoid all the
+	 * expense of strcoll() here, and just do bitwise comparison.
+	 */
+	if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2))
+		result = false;
+	else
+		result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2),
+						  VARSIZE_ANY_EXHDR(arg1)) == 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(result);
 }
 
 Datum
 textne(PG_FUNCTION_ARGS)
 {
-	Datum d = generic_varlena_eq(fcinfo);
-	return (d==0 ? 1 : 0);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	/*
+	 * Since we only care about equality or not-equality, we can avoid all the
+	 * expense of strcoll() here, and just do bitwise comparison.
+	 */
+	if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2))
+		result = true;
+	else
+		result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2),
+						  VARSIZE_ANY_EXHDR(arg1)) != 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(result);
 }
 
 Datum
 text_lt(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = (text_cmp(arg1, arg2) < 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	bool result = (text_cmp_datum(d0, d1) < 0); 
 	PG_RETURN_BOOL(result);
 }
 
 Datum
 text_le(PG_FUNCTION_ARGS)
 {	
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = (text_cmp(arg1, arg2) <= 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	bool result = (text_cmp_datum(d0, d1) <= 0); 
 	PG_RETURN_BOOL(result);
 }
 
 Datum
 text_gt(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = (text_cmp(arg1, arg2) > 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	bool result = (text_cmp_datum(d0, d1) > 0); 
 	PG_RETURN_BOOL(result);
 }
 
 Datum
 text_ge(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = (text_cmp(arg1, arg2) >= 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	bool result = (text_cmp_datum(d0, d1) >= 0); 
 	PG_RETURN_BOOL(result);
 }
 
 Datum
 bttextcmp(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int32		result;
+
+	result = text_cmp(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
 
-	int result = text_cmp_datum(d0, d1);
 	PG_RETURN_INT32(result);
 }
 
@@ -1387,21 +1396,25 @@ bttextcmp(PG_FUNCTION_ARGS)
 Datum
 text_larger(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	text	   *result;
 
-	int cmp = text_cmp_datum(d0, d1);
-	return (cmp > 0 ? d0 : d1);
+	result = ((text_cmp(arg1, arg2) > 0) ? arg1 : arg2);
+
+	PG_RETURN_TEXT_P(result);
 }
 
 Datum
 text_smaller(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	text	   *result;
 
-	int cmp = text_cmp_datum(d0, d1);
-	return (cmp < 0 ? d0 : d1);
+	result = ((text_cmp(arg1, arg2) < 0) ? arg1 : arg2);
+
+	PG_RETURN_TEXT_P(result);
 }
 
 
@@ -1410,32 +1423,19 @@ text_smaller(PG_FUNCTION_ARGS)
  * of text data types, to allow building indexes suitable for LIKE
  * clauses.
  */
-static inline int generic_varlena_cmp(PG_FUNCTION_ARGS)
-{
-	Datum d0 = PG_GETARG_DATUM(0);
-	Datum d1 = PG_GETARG_DATUM(1);
 
+static int
+internal_text_pattern_compare(text *arg1, text *arg2)
+{
 	int			result;
 
-	char *p0; void *tofree0; int len0;
-	char *p1; void *tofree1; int len1;
-
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
-
-	result = memcmp(p0, p1, Min(len0, len1));
-
-	if(tofree0)
-		pfree(tofree0);
-	if(tofree1)
-		pfree(tofree1);
-
-	if(result != 0)
+	result = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2),
+					Min(VARSIZE_ANY_EXHDR(arg1), VARSIZE_ANY_EXHDR(arg2)));
+	if (result != 0)
 		return result;
-
-	if (len0 < len1)
+	else if (VARSIZE_ANY_EXHDR(arg1) < VARSIZE_ANY_EXHDR(arg2))
 		return -1;
-	else if (len0 > len1)
+	else if (VARSIZE_ANY_EXHDR(arg1) > VARSIZE_ANY_EXHDR(arg2))
 		return 1;
 	else
 		return 0;
@@ -1444,7 +1444,15 @@ static inline int generic_varlena_cmp(PG_FUNCTION_ARGS)
 Datum
 text_pattern_lt(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo); 
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int			result;
+
+	result = internal_text_pattern_compare(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
 	PG_RETURN_BOOL(result < 0);
 }
 
@@ -1452,16 +1460,50 @@ text_pattern_lt(PG_FUNCTION_ARGS)
 Datum
 text_pattern_le(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo); 
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int			result;
+
+	result = internal_text_pattern_compare(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
 	PG_RETURN_BOOL(result <= 0);
 }
 
 
+Datum
+text_pattern_eq(PG_FUNCTION_ARGS)
+{
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int			result;
+
+	if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2))
+		result = 1;
+	else
+		result = internal_text_pattern_compare(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(result == 0);
+}
+
 
 Datum
 text_pattern_ge(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo); 
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int			result;
+
+	result = internal_text_pattern_compare(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
 	PG_RETURN_BOOL(result >= 0);
 }
 
@@ -1469,19 +1511,54 @@ text_pattern_ge(PG_FUNCTION_ARGS)
 Datum
 text_pattern_gt(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo); 
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int			result;
+
+	result = internal_text_pattern_compare(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
 	PG_RETURN_BOOL(result > 0);
 }
 
 
+Datum
+text_pattern_ne(PG_FUNCTION_ARGS)
+{
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int			result;
+
+	if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2))
+		result = 1;
+	else
+		result = internal_text_pattern_compare(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(result != 0);
+}
+
 
 Datum
 bttext_pattern_cmp(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo); 
-	PG_RETURN_INT32(result); 
+	text	   *arg1 = PG_GETARG_TEXT_PP(0);
+	text	   *arg2 = PG_GETARG_TEXT_PP(1);
+	int			result;
+
+	result = internal_text_pattern_compare(arg1, arg2);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_INT32(result);
 }
 
+
 /*-------------------------------------------------------------
  * byteaoctetlen
  *
@@ -1507,7 +1584,36 @@ byteaoctetlen(PG_FUNCTION_ARGS)
 Datum
 byteacat(PG_FUNCTION_ARGS)
 {
-	return generic_varlena_cat(fcinfo);
+	bytea	   *t1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *t2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2,
+				len;
+	bytea	   *result;
+	char	   *ptr;
+
+	len1 = VARSIZE_ANY_EXHDR(t1);
+	if (len1 < 0)
+		len1 = 0;
+
+	len2 = VARSIZE_ANY_EXHDR(t2);
+	if (len2 < 0)
+		len2 = 0;
+
+	len = len1 + len2 + VARHDRSZ;
+	result = (bytea *) palloc(len);
+
+	/* Set size of result string... */
+	SET_VARSIZE(result, len);
+
+	/* Fill data field of result string... */
+	ptr = VARDATA(result);
+	if (len1 > 0)
+		memcpy(ptr, VARDATA_ANY(t1), len1);
+	if (len2 > 0)
+		memcpy(ptr + len1, VARDATA_ANY(t2), len2);
+
+	PG_RETURN_BYTEA_P(result);
 }
 
 #define PG_STR_GET_BYTEA(str_) \
@@ -1598,39 +1704,37 @@ bytea_substr_no_len(PG_FUNCTION_ARGS)
 Datum
 byteapos(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-
-	Datum d1 = PG_GETARG_DATUM(1);
-	char *p1; void *tofree1; int len1;
-
+	bytea	   *t1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *t2 = PG_GETARG_BYTEA_PP(1);
 	int			pos;
-	int			px, p;
+	int			px,
+				p;
+	int			len1,
+				len2;
+	char	   *p1,
+			   *p2;
 
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
-	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
+	len1 = VARSIZE_ANY_EXHDR(t1);
+	len2 = VARSIZE_ANY_EXHDR(t2);
 
-	/* empty pattern */
-	if(len1 == 0)
-		PG_RETURN_INT32(1);
+	if (len2 <= 0)
+		PG_RETURN_INT32(1);		/* result for empty pattern */
+
+	p1 = VARDATA_ANY(t1);
+	p2 = VARDATA_ANY(t2);
 
 	pos = 0;
-	px = (len0 - len1);
+	px = (len1 - len2);
 	for (p = 0; p <= px; p++)
 	{
-		if ((*p1 == *p0) && (memcmp(p0, p1, len1) == 0))
+		if ((*p2 == *p1) && (memcmp(p1, p2, len2) == 0))
 		{
 			pos = p + 1;
 			break;
 		};
-		p0++;
+		p1++;
 	};
 
-	if(tofree0)
-		pfree(tofree0);
-	if(tofree1)
-		pfree(tofree1);
-
 	PG_RETURN_INT32(pos);
 }
 
@@ -1644,26 +1748,22 @@ byteapos(PG_FUNCTION_ARGS)
 Datum
 byteaGetByte(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-
+	bytea	   *v = PG_GETARG_BYTEA_PP(0);
 	int32		n = PG_GETARG_INT32(1);
-	int32 result;
+	int			len;
+	int			byte;
 
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
+	len = VARSIZE_ANY_EXHDR(v);
 
-	if (n < 0 || n >= len0)
+	if (n < 0 || n >= len)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("index %d out of valid range, 0..%d",
-						n, len0 - 1)));
+						n, len - 1)));
 
-	result = (unsigned char) p0[n];
+	byte = ((unsigned char *) VARDATA_ANY(v))[n];
 
-	if(tofree0)
-		pfree(tofree0);
-
-	PG_RETURN_INT32(result);
+	PG_RETURN_INT32(byte);
 }
 
 /*-------------------------------------------------------------
@@ -1677,31 +1777,27 @@ byteaGetByte(PG_FUNCTION_ARGS)
 Datum
 byteaGetBit(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
-
+	bytea	   *v = PG_GETARG_BYTEA_PP(0);
 	int32		n = PG_GETARG_INT32(1);
+	int			byteNo,
+				bitNo;
+	int			len;
+	int			byte;
 
-	int			byteNo, bitNo;
-	int			result;
-
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
+	len = VARSIZE_ANY_EXHDR(v);
 
-	if (n < 0 || n >= len0 * 8)
+	if (n < 0 || n >= len * 8)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("index %d out of valid range, 0..%d",
-						n, len0 * 8 - 1)));
+						n, len * 8 - 1)));
 
 	byteNo = n / 8;
 	bitNo = n % 8;
 
-	result = (unsigned char) p0[byteNo]; 
-
-	if(tofree0)
-		pfree(tofree0);
+	byte = ((unsigned char *) VARDATA_ANY(v))[byteNo];
 
-	if (result & (1 << bitNo))
+	if (byte & (1 << bitNo))
 		PG_RETURN_INT32(1);
 	else
 		PG_RETURN_INT32(0);
@@ -1814,28 +1910,19 @@ byteaSetBit(PG_FUNCTION_ARGS)
 Datum
 text_name(PG_FUNCTION_ARGS)
 {
-	Datum d0 = PG_GETARG_DATUM(0);
-	char *p0; void *tofree0; int len0;
+	text	   *s = PG_GETARG_TEXT_PP(0);
 	Name		result;
+	int			len;
 
-	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
+	len = VARSIZE_ANY_EXHDR(s);
 
 	/* Truncate oversize input */
-	if (len0 >= NAMEDATALEN)
-		len0 = NAMEDATALEN - 1;
-
-	result = (Name) palloc(NAMEDATALEN);
-	memcpy(NameStr(*result), p0, len0); 
+	if (len >= NAMEDATALEN)
+		len = pg_mbcliplen(VARDATA_ANY(s), len, NAMEDATALEN - 1);
 
-	/* now null pad to full length... */
-	while (len0 < NAMEDATALEN)
-	{
-		*(NameStr(*result) + len0) = '\0';
-		len0++;
-	}
-
-	if(tofree0)
-		pfree(tofree0);
+	/* We use palloc0 here to ensure result is zero-padded */
+	result = (Name) palloc0(NAMEDATALEN);
+	memcpy(NameStr(*result), VARDATA_ANY(s), len);
 
 	PG_RETURN_NAME(result);
 }
@@ -1847,8 +1934,16 @@ Datum
 name_text(PG_FUNCTION_ARGS)
 {
 	Name		s = PG_GETARG_NAME(0);
+	text	   *result;
+	int			len;
+
+	len = strlen(NameStr(*s));
 
-	PG_RETURN_TEXT_P(cstring_to_text(NameStr(*s)));
+	result = palloc(VARHDRSZ + len);
+	SET_VARSIZE(result, VARHDRSZ + len);
+	memcpy(VARDATA(result), NameStr(*s), len);
+
+	PG_RETURN_TEXT_P(result);
 }
 
 
@@ -2031,49 +2126,151 @@ SplitIdentifierString(char *rawstring, char separator,
 Datum
 byteaeq(PG_FUNCTION_ARGS)
 {
-	return generic_varlena_eq(fcinfo);
+	bytea	   *arg1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *arg2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2;
+	bool		result;
+
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
+
+	/* fast path for different-length inputs */
+	if (len1 != len2)
+		result = false;
+	else
+		result = (memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) == 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(result);
 }
 
 Datum
 byteane(PG_FUNCTION_ARGS)
 {
-	Datum d = generic_varlena_eq(fcinfo);
-	return (d==0 ? 1 : 0);
+	bytea	   *arg1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *arg2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2;
+	bool		result;
+
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
+
+	/* fast path for different-length inputs */
+	if (len1 != len2)
+		result = true;
+	else
+		result = (memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) != 0);
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL(result);
 }
 
 Datum
 bytealt(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo);
-	PG_RETURN_BOOL(result < 0); 
+	bytea	   *arg1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *arg2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
+
+	cmp = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2));
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL((cmp < 0) || ((cmp == 0) && (len1 < len2)));
 }
 
 Datum
 byteale(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo);
-	PG_RETURN_BOOL(result <= 0); 
+	bytea	   *arg1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *arg2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
+
+	cmp = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2));
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL((cmp < 0) || ((cmp == 0) && (len1 <= len2)));
 }
 
 Datum
 byteagt(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo);
-	PG_RETURN_BOOL(result > 0); 
+	bytea	   *arg1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *arg2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
+
+	cmp = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2));
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL((cmp > 0) || ((cmp == 0) && (len1 > len2)));
 }
 
 Datum
 byteage(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo);
-	PG_RETURN_BOOL(result >= 0); 
+	bytea	   *arg1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *arg2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
+
+	cmp = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2));
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_BOOL((cmp > 0) || ((cmp == 0) && (len1 >= len2)));
 }
 
 Datum
 byteacmp(PG_FUNCTION_ARGS)
 {
-	int result = generic_varlena_cmp(fcinfo);
-	PG_RETURN_INT32(result); 
+	bytea	   *arg1 = PG_GETARG_BYTEA_PP(0);
+	bytea	   *arg2 = PG_GETARG_BYTEA_PP(1);
+	int			len1,
+				len2;
+	int			cmp;
+
+	len1 = VARSIZE_ANY_EXHDR(arg1);
+	len2 = VARSIZE_ANY_EXHDR(arg2);
+
+	cmp = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2));
+	if ((cmp == 0) && (len1 != len2))
+		cmp = (len1 < len2) ? -1 : 1;
+
+	PG_FREE_IF_COPY(arg1, 0);
+	PG_FREE_IF_COPY(arg2, 1);
+
+	PG_RETURN_INT32(cmp);
 }
 
 /*
@@ -2108,7 +2305,8 @@ replace_text(PG_FUNCTION_ARGS)
 	Datum d2 = PG_GETARG_DATUM(2);
 	char *p2; void *tofree2; int len2;
 
-	int from_sub_text_len; 
+	int			src_text_len;
+	int			from_sub_text_len;
 
 	TextPositionState state = 
 		{
@@ -2126,7 +2324,7 @@ replace_text(PG_FUNCTION_ARGS)
 	int			chunk_len;
 	char	   *start_ptr;
 	StringInfoData str;
-
+ 
 	varattrib_untoast_ptr_len(d0, &p0, &len0, &tofree0);
 	varattrib_untoast_ptr_len(d1, &p1, &len1, &tofree1);
 	varattrib_untoast_ptr_len(d2, &p2, &len2, &tofree2);
@@ -2149,6 +2347,20 @@ replace_text(PG_FUNCTION_ARGS)
 
 	text_position_setup_ptr_len(p0, len0, p1, len1, &state); 
 
+	/*
+	 * Note: we check the converted string length, not the original, because
+	 * they could be different if the input contained invalid encoding.
+	 */
+	src_text_len = state.len1;
+	from_sub_text_len = state.len2;
+
+	/* Return unmodified source string if empty source or pattern */
+	if (src_text_len < 1 || from_sub_text_len < 1)
+	{
+		text_position_cleanup(&state);
+		PG_RETURN_DATUM(d0);
+	}
+
 	start_posn = 1;
 	curr_posn = text_position_next(1, &state);
 
@@ -2173,6 +2385,8 @@ replace_text(PG_FUNCTION_ARGS)
 
 	do
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		/* copy the data skipped over by last text_position_next() */
 		chunk_len = charlen_to_bytelen(start_ptr, curr_posn - start_posn);
 		appendBinaryStringInfo(&str, start_ptr, chunk_len);
@@ -2213,8 +2427,8 @@ replace_text(PG_FUNCTION_ARGS)
 static bool
 check_replace_text_has_escape_char(const text *replace_text)
 {
-	const char *p = VARDATA_ANY((void *) replace_text);
-	const char *p_end = p + VARSIZE_ANY((void *) replace_text);
+	const char *p = VARDATA_ANY(replace_text);
+	const char *p_end = p + VARSIZE_ANY_EXHDR(replace_text);
 
 	if (pg_database_encoding_max_length() == 1)
 	{
@@ -2417,6 +2631,7 @@ replace_text_regexp(text *src_text, void *regexp,
 			chunk_len = charlen_to_bytelen(start_ptr,
 										   pmatch[0].rm_so - data_pos);
 			appendBinaryStringInfo(&buf, start_ptr, chunk_len);
+
 			/*
 			 * Advance start_ptr over that text, to avoid multiple rescans of
 			 * it if the replace_text contains multiple back-references.
@@ -2655,6 +2870,8 @@ static char* text_to_array_impl(char *string, int stringByteLen, char *delimiter
 
 	for (fldnum = 1;; fldnum++) /* field number is 1 based */
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		end_posn = text_position_next(start_posn, &state);
 
 		if (end_posn == 0 && !endOfString)
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 8d1b6c1aaf23..46dc6657e95a 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -1646,7 +1646,7 @@ map_xml_name_to_sql_identifier(char *name)
 char *
 map_sql_value_to_xml_value(Datum value, Oid type, bool xml_escape_strings)
 {
-	if (is_array_type(type))
+	if (type_is_array(type))
 	{
 		ArrayType  *array;
 		Oid			elmtype;
diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile
index 684c4787318d..6d3d595757d9 100644
--- a/src/backend/utils/cache/Makefile
+++ b/src/backend/utils/cache/Makefile
@@ -12,7 +12,9 @@ subdir = src/backend/utils/cache
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = catcache.o inval.o relcache.o syscache.o lsyscache.o typcache.o \
-	syncrefhashtable.o sharedcache.o sharedcache_gclock.o
+OBJS = catcache.o inval.o plancache.o relcache.o \
+	syscache.o lsyscache.o typcache.o ts_cache.o
+
+OBJS +=	syncrefhashtable.o sharedcache.o sharedcache_gclock.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 918c33e78832..9d7c33ebba3a 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.136 2007/01/05 22:19:42 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.140.2.1 2008/03/05 17:01:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,7 @@
 #include "access/heapam.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
+#include "access/tuptoaster.h"
 #include "access/valid.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
@@ -26,6 +27,7 @@
 #ifdef CATCACHE_STATS
 #include "storage/ipc.h"		/* for on_proc_exit */
 #endif
+#include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
@@ -145,6 +147,8 @@ GetCCHashEqFuncs(Oid keytype, PGFunction *hashfunc, RegProcedure *eqfunc)
 		case REGOPERATOROID:
 		case REGCLASSOID:
 		case REGTYPEOID:
+		case REGCONFIGOID:
+		case REGDICTIONARYOID:
 			*hashfunc = hashoid;
 
 			*eqfunc = F_OIDEQ;
@@ -172,6 +176,7 @@ static uint32
 CatalogCacheComputeHashValue(CatCache *cache, int nkeys, ScanKey cur_skey)
 {
 	uint32		hashValue = 0;
+	uint32		oneHash;
 
 	CACHE4_elog(DEBUG2, "CatalogCacheComputeHashValue %s %d %p",
 				cache->cc_relname,
@@ -181,24 +186,31 @@ CatalogCacheComputeHashValue(CatCache *cache, int nkeys, ScanKey cur_skey)
 	switch (nkeys)
 	{
 		case 4:
-			hashValue ^=
+			oneHash =
 				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[3],
-											  cur_skey[3].sk_argument)) << 9;
+												   cur_skey[3].sk_argument));
+			hashValue ^= oneHash << 24;
+			hashValue ^= oneHash >> 8;
 			/* FALLTHROUGH */
 		case 3:
-			hashValue ^=
+			oneHash =
 				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[2],
-											  cur_skey[2].sk_argument)) << 6;
+												   cur_skey[2].sk_argument));
+			hashValue ^= oneHash << 16;
+			hashValue ^= oneHash >> 16;
 			/* FALLTHROUGH */
 		case 2:
-			hashValue ^=
+			oneHash =
 				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[1],
-											  cur_skey[1].sk_argument)) << 3;
+												   cur_skey[1].sk_argument));
+			hashValue ^= oneHash << 8;
+			hashValue ^= oneHash >> 24;
 			/* FALLTHROUGH */
 		case 1:
-			hashValue ^=
+			oneHash =
 				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[0],
 												   cur_skey[0].sk_argument));
+			hashValue ^= oneHash;
 			break;
 		default:
 			elog(FATAL, "wrong number of hash keys: %d", nkeys);
@@ -929,8 +941,16 @@ InitCatCachePhase2(CatCache *cache, bool touch_index)
 	{
 		Relation	idesc;
 
+		/*
+		 * We must lock the underlying catalog before opening the index to
+		 * avoid deadlock, since index_open could possibly result in reading
+		 * this same catalog, and if anyone else is exclusive-locking this
+		 * catalog and index they'll be doing it in that order.
+		 */
+		LockRelationOid(cache->cc_reloid, AccessShareLock);
 		idesc = index_open(cache->cc_indexoid, AccessShareLock);
 		index_close(idesc, AccessShareLock);
+		UnlockRelationOid(cache->cc_reloid, AccessShareLock);
 	}
 }
 
@@ -1615,16 +1635,32 @@ CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp,
 						uint32 hashValue, Index hashIndex, bool negative)
 {
 	CatCTup    *ct;
+	HeapTuple	dtp;
 	MemoryContext oldcxt;
 
+	/*
+	 * If there are any out-of-line toasted fields in the tuple, expand them
+	 * in-line.  This saves cycles during later use of the catcache entry,
+	 * and also protects us against the possibility of the toast tuples being
+	 * freed before we attempt to fetch them, in case of something using a
+	 * slightly stale catcache entry.
+	 */
+	if (HeapTupleHasExternal(ntp))
+		dtp = toast_flatten_tuple(ntp, cache->cc_tupdesc);
+	else
+		dtp = ntp;
+
 	/*
 	 * Allocate CatCTup header in cache memory, and copy the tuple there too.
 	 */
 	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
 	ct = (CatCTup *) palloc(sizeof(CatCTup));
-	heap_copytuple_with_tuple(ntp, &ct->tuple);
+	heap_copytuple_with_tuple(dtp, &ct->tuple);
 	MemoryContextSwitchTo(oldcxt);
 
+	if (dtp != ntp)
+		heap_freetuple(dtp);
+
 	/*
 	 * Finish initializing the CatCTup header, and add it to the cache's
 	 * linked list and counts.
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index d2cbbe386010..540ade2af3a5 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -80,7 +80,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.79 2007/01/05 22:19:43 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.83.2.1 2008/03/13 18:00:39 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -161,17 +161,29 @@ static TransInvalidationInfo *transInvalInfo = NULL;
  * Dynamically-registered callback functions.  Current implementation
  * assumes there won't be very many of these at once; could improve if needed.
  */
+/*
+ * MAX_SYSCACHE_CALLBACKS has been bumped up in GPDB, because ORCA registers
+ * a lot of callbacks.
+ */
+#define MAX_SYSCACHE_CALLBACKS 40
+#define MAX_RELCACHE_CALLBACKS 5
+
+static struct SYSCACHECALLBACK
+{
+	int16		id;				/* cache number */
+	SyscacheCallbackFunction function;
+	Datum		arg;
+}	syscache_callback_list[MAX_SYSCACHE_CALLBACKS];
 
-#define MAX_CACHE_CALLBACKS 20
+static int	syscache_callback_count = 0;
 
-static struct CACHECALLBACK
+static struct RELCACHECALLBACK
 {
-	int16		id;				/* cache number or message type id */
-	CacheCallbackFunction function;
+	RelcacheCallbackFunction function;
 	Datum		arg;
-}	cache_callback_list[MAX_CACHE_CALLBACKS];
+}	relcache_callback_list[MAX_RELCACHE_CALLBACKS];
 
-static int	cache_callback_count = 0;
+static int	relcache_callback_count = 0;
 
 /* info values for 2PC callback */
 #define TWOPHASE_INFO_MSG			0	/* SharedInvalidationMessage */
@@ -439,7 +451,7 @@ RegisterRelcacheInvalidation(Oid dbId, Oid relId)
 	 * hack to ensure that the next CommandCounterIncrement() will think
 	 * that we need to do CommandEndInvalidationMessages().
 	 */
-	(void) GetCurrentCommandId(/*true*/);
+	(void) GetCurrentCommandId(true);
 
 	/*
 	 * If the relation being invalidated is one of those cached in the
@@ -463,7 +475,7 @@ RegisterSmgrInvalidation(RelFileNode rnode)
 	/*
 	 * As above, just in case there is not an associated catalog change.
 	 */
-	(void) GetCurrentCommandId(/*true*/);
+	(void) GetCurrentCommandId(true);
 }
 
 #ifdef USE_ASSERT_CHECKING
@@ -518,12 +530,13 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
 									 msg->cc.hashValue,
 									 &msg->cc.tuplePtr);
 
-			for (i = 0; i < cache_callback_count; i++)
+			for (i = 0; i < syscache_callback_count; i++)
 			{
-				struct CACHECALLBACK *ccitem = cache_callback_list + i;
+				struct SYSCACHECALLBACK *ccitem = syscache_callback_list + i;
 
 				if (ccitem->id == msg->cc.id)
-					(*ccitem->function) (ccitem->arg, InvalidOid);
+					(*ccitem->function) (ccitem->arg,
+										 msg->cc.id, &msg->cc.tuplePtr);
 			}
 		}
 	}
@@ -533,12 +546,11 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
 		{
 			RelationCacheInvalidateEntry(msg->rc.relId);
 
-			for (i = 0; i < cache_callback_count; i++)
+			for (i = 0; i < relcache_callback_count; i++)
 			{
-				struct CACHECALLBACK *ccitem = cache_callback_list + i;
+				struct RELCACHECALLBACK *ccitem = relcache_callback_list + i;
 
-				if (ccitem->id == SHAREDINVALRELCACHE_ID)
-					(*ccitem->function) (ccitem->arg, msg->rc.relId);
+				(*ccitem->function) (ccitem->arg, msg->rc.relId);
 			}
 		}
 	}
@@ -578,9 +590,16 @@ InvalidateSystemCaches(void)
 	ResetCatalogCaches();
 	RelationCacheInvalidate();	/* gets smgr cache too */
 
-	for (i = 0; i < cache_callback_count; i++)
+	for (i = 0; i < syscache_callback_count; i++)
+	{
+		struct SYSCACHECALLBACK *ccitem = syscache_callback_list + i;
+
+		(*ccitem->function) (ccitem->arg, ccitem->id, NULL);
+	}
+
+	for (i = 0; i < relcache_callback_count; i++)
 	{
-		struct CACHECALLBACK *ccitem = cache_callback_list + i;
+		struct RELCACHECALLBACK *ccitem = relcache_callback_list + i;
 
 		(*ccitem->function) (ccitem->arg, InvalidOid);
 	}
@@ -671,7 +690,7 @@ PrepareForTupleInvalidation(Relation relation, HeapTuple tuple)
 		 * KLUGE ALERT: we always send the relcache event with MyDatabaseId,
 		 * even if the rel in question is shared (which we can't easily tell).
 		 * This essentially means that only backends in this same database
-		 * will react to the relcache flush request. This is in fact
+		 * will react to the relcache flush request.  This is in fact
 		 * appropriate, since only those backends could see our pg_attribute
 		 * change anyway.  It looks a bit ugly though.	(In practice, shared
 		 * relations can't have schema changes after bootstrap, so we should
@@ -896,10 +915,10 @@ inval_twophase_postcommit(TransactionId xid, uint16 info,
 			SendSharedInvalidMessages(msg, 1);
 			break;
 		case TWOPHASE_INFO_FILE_BEFORE:
-			RelationCacheInitFileInvalidate(true);
+			RelationCacheInitFilePreInvalidate();
 			break;
 		case TWOPHASE_INFO_FILE_AFTER:
-			RelationCacheInitFileInvalidate(false);
+			RelationCacheInitFilePostInvalidate();
 			break;
 		default:
 			Assert(false);
@@ -946,7 +965,7 @@ AtEOXact_Inval(bool isCommit)
 		 * unless we committed.
 		 */
 		if (transInvalInfo->RelcacheInitFileInval)
-			RelationCacheInitFileInvalidate(true);
+			RelationCacheInitFilePreInvalidate();
 
 		AppendInvalidationMessages(&transInvalInfo->PriorCmdInvalidMsgs,
 								   &transInvalInfo->CurrentCmdInvalidMsgs);
@@ -955,7 +974,7 @@ AtEOXact_Inval(bool isCommit)
 										SendSharedInvalidMessages);
 
 		if (transInvalInfo->RelcacheInitFileInval)
-			RelationCacheInitFileInvalidate(false);
+			RelationCacheInitFilePostInvalidate();
 	}
 	else if (transInvalInfo != NULL)
 	{
@@ -1065,6 +1084,114 @@ CommandEndInvalidationMessages(void)
 							   &transInvalInfo->CurrentCmdInvalidMsgs);
 }
 
+
+/*
+ * BeginNonTransactionalInvalidation
+ *		Prepare for invalidation messages for nontransactional updates.
+ *
+ * A nontransactional invalidation is one that must be sent whether or not
+ * the current transaction eventually commits.  We arrange for all invals
+ * queued between this call and EndNonTransactionalInvalidation() to be sent
+ * immediately when the latter is called.
+ *
+ * Currently, this is only used by heap_page_prune(), and only when it is
+ * invoked during VACUUM FULL's first pass over a table.  We expect therefore
+ * that we are not inside a subtransaction and there are no already-pending
+ * invalidations.  This could be relaxed by setting up a new nesting level of
+ * invalidation data, but for now there's no need.  Note that heap_page_prune
+ * knows that this function does not change any state, and therefore there's
+ * no need to worry about cleaning up if there's an elog(ERROR) before
+ * reaching EndNonTransactionalInvalidation (the invals will just be thrown
+ * away if that happens).
+ *
+ * GPDB: In GPDB, however, the way we use transactions during VACUUM FULL is
+ * different from PostgreSQL, and can already be pending invalidations in
+ * the queue. So we do what the above suggested, and create a new nesting level.
+ */
+void
+BeginNonTransactionalInvalidation(void)
+{
+	TransInvalidationInfo *myInfo;
+
+	/* Must be at top of stack */
+	Assert(transInvalInfo != NULL && transInvalInfo->parent == NULL);
+
+	/* GPDB: create a new nesting level, as in AtSubStart_Inval() */
+	myInfo = (TransInvalidationInfo *)
+		MemoryContextAllocZero(TopTransactionContext,
+							   sizeof(TransInvalidationInfo));
+	myInfo->parent = transInvalInfo;
+	myInfo->my_level = GetCurrentTransactionNestLevel();
+	transInvalInfo = myInfo;
+}
+
+/*
+ * EndNonTransactionalInvalidation
+ *		Process queued-up invalidation messages for nontransactional updates.
+ *
+ * We expect to find messages in CurrentCmdInvalidMsgs only (else there
+ * was a CommandCounterIncrement within the "nontransactional" update).
+ * We must process them locally and send them out to the shared invalidation
+ * message queue.
+ *
+ * We must also reset the lists to empty and explicitly free memory (we can't
+ * rely on end-of-transaction cleanup for that).
+ */
+void
+EndNonTransactionalInvalidation(void)
+{
+	InvalidationChunk *chunk;
+	InvalidationChunk *next;
+
+	/* Must be at one nesting level below top of stack */
+	Assert(transInvalInfo != NULL);
+	Assert(transInvalInfo->parent != NULL);
+	Assert(transInvalInfo->parent->parent == NULL);
+
+	/* Must not have any prior-command messages */
+	Assert(transInvalInfo->PriorCmdInvalidMsgs.cclist == NULL);
+	Assert(transInvalInfo->PriorCmdInvalidMsgs.rclist == NULL);
+
+	/*
+	 * At present, this function is only used for CTID-changing updates;
+	 * since the relcache init file doesn't store any tuple CTIDs, we
+	 * don't have to invalidate it.  That might not be true forever
+	 * though, in which case we'd need code similar to AtEOXact_Inval.
+	 */
+
+	/* Send out the invals */
+	ProcessInvalidationMessages(&transInvalInfo->CurrentCmdInvalidMsgs,
+								LocalExecuteInvalidationMessage);
+	ProcessInvalidationMessageMulti(&transInvalInfo->CurrentCmdInvalidMsgs,
+									SendSharedInvalidMessages);
+
+	/* Clean up and release memory */
+	for (chunk = transInvalInfo->CurrentCmdInvalidMsgs.cclist;
+		 chunk != NULL;
+		 chunk = next)
+	{
+		next = chunk->next;
+		pfree(chunk);
+	}
+	for (chunk = transInvalInfo->CurrentCmdInvalidMsgs.rclist;
+		 chunk != NULL;
+		 chunk = next)
+	{
+		next = chunk->next;
+		pfree(chunk);
+	}
+
+	/* Pop the transaction state stack */
+	{
+		TransInvalidationInfo *myInfo = transInvalInfo;
+
+		transInvalInfo = myInfo->parent;
+
+		pfree(myInfo);
+	}
+}
+
+
 /*
  * CacheInvalidateHeapTuple
  *		Register the given tuple for invalidation at end of command
@@ -1156,26 +1283,25 @@ CacheInvalidateRelcacheByRelid(Oid relid)
 /*
  * CacheRegisterSyscacheCallback
  *		Register the specified function to be called for all future
- *		invalidation events in the specified cache.
+ *		invalidation events in the specified cache.  The cache ID and the
+ *		TID of the tuple being invalidated will be passed to the function.
  *
- * NOTE: currently, the OID argument to the callback routine is not
- * provided for syscache callbacks; the routine doesn't really get any
- * useful info as to exactly what changed.	It should treat every call
- * as a "cache flush" request.
+ * NOTE: NULL will be passed for the TID if a cache reset request is received.
+ * In this case the called routines should flush all cached state.
  */
 void
 CacheRegisterSyscacheCallback(int cacheid,
-							  CacheCallbackFunction func,
+							  SyscacheCallbackFunction func,
 							  Datum arg)
 {
-	if (cache_callback_count >= MAX_CACHE_CALLBACKS)
-		elog(FATAL, "out of cache_callback_list slots");
+	if (syscache_callback_count >= MAX_SYSCACHE_CALLBACKS)
+		elog(FATAL, "out of syscache_callback_list slots");
 
-	cache_callback_list[cache_callback_count].id = cacheid;
-	cache_callback_list[cache_callback_count].function = func;
-	cache_callback_list[cache_callback_count].arg = arg;
+	syscache_callback_list[syscache_callback_count].id = cacheid;
+	syscache_callback_list[syscache_callback_count].function = func;
+	syscache_callback_list[syscache_callback_count].arg = arg;
 
-	++cache_callback_count;
+	++syscache_callback_count;
 }
 
 /*
@@ -1188,15 +1314,14 @@ CacheRegisterSyscacheCallback(int cacheid,
  * In this case the called routines should flush all cached state.
  */
 void
-CacheRegisterRelcacheCallback(CacheCallbackFunction func,
+CacheRegisterRelcacheCallback(RelcacheCallbackFunction func,
 							  Datum arg)
 {
-	if (cache_callback_count >= MAX_CACHE_CALLBACKS)
-		elog(FATAL, "out of cache_callback_list slots");
+	if (relcache_callback_count >= MAX_RELCACHE_CALLBACKS)
+		elog(FATAL, "out of relcache_callback_list slots");
 
-	cache_callback_list[cache_callback_count].id = SHAREDINVALRELCACHE_ID;
-	cache_callback_list[cache_callback_count].function = func;
-	cache_callback_list[cache_callback_count].arg = arg;
+	relcache_callback_list[relcache_callback_count].function = func;
+	relcache_callback_list[relcache_callback_count].arg = arg;
 
-	++cache_callback_count;
+	++relcache_callback_count;
 }
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index e4e9dfce8e53..e1be5b433360 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.148 2007/02/14 01:58:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.155.2.1 2010/07/09 22:58:01 tgl Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -170,13 +170,13 @@ get_opfamily_member(Oid opfamily, Oid lefttype, Oid righttype,
  * (This indicates that the operator is not a valid ordering operator.)
  *
  * Note: the operator could be registered in multiple families, for example
- * if someone were to build a "reverse sort" opfamily.  This would result in
+ * if someone were to build a "reverse sort" opfamily.	This would result in
  * uncertainty as to whether "ORDER BY USING op" would default to NULLS FIRST
  * or NULLS LAST, as well as inefficient planning due to failure to match up
  * pathkeys that should be the same.  So we want a determinate result here.
  * Because of the way the syscache search works, we'll use the interpretation
  * associated with the opfamily with smallest OID, which is probably
- * determinate enough.  Since there is no longer any particularly good reason
+ * determinate enough.	Since there is no longer any particularly good reason
  * to build reverse-sort opfamilies, it doesn't seem worth expending any
  * additional effort on ensuring consistency.
  */
@@ -259,7 +259,7 @@ get_compare_function_for_ordering_op(Oid opno, Oid *cmpfunc, bool *reverse)
 									 opcintype,
 									 opcintype,
 									 BTORDER_PROC);
-		if (!OidIsValid(*cmpfunc))				/* should not happen */
+		if (!OidIsValid(*cmpfunc))		/* should not happen */
 			elog(ERROR, "missing support function %d(%u,%u) in opfamily %u",
 				 BTORDER_PROC, opcintype, opcintype, opfamily);
 		*reverse = (strategy == BTGreaterStrategyNumber);
@@ -343,7 +343,7 @@ get_ordering_op_for_equality_op(Oid opno, bool use_lhs_type)
 		if (aform->amopstrategy == BTEqualStrategyNumber)
 		{
 			/* Found a suitable opfamily, get matching ordering operator */
-			Oid		typid;
+			Oid			typid;
 
 			typid = use_lhs_type ? aform->amoplefttype : aform->amoprighttype;
 			result = get_opfamily_member(aform->amopfamily,
@@ -371,7 +371,7 @@ get_ordering_op_for_equality_op(Oid opno, bool use_lhs_type)
  *
  * The planner currently uses simple equal() tests to compare the lists
  * returned by this function, which makes the list order relevant, though
- * strictly speaking it should not be.  Because of the way syscache list
+ * strictly speaking it should not be.	Because of the way syscache list
  * searches are handled, in normal operation the result will be sorted by OID
  * so everything works fine.  If running with system index usage disabled,
  * the result ordering is unspecified and hence the planner might fail to
@@ -466,6 +466,7 @@ get_compatible_hash_operators(Oid opno,
 				result = true;
 				break;
 			}
+
 			/*
 			 * Get the matching single-type operator(s).  Failure probably
 			 * shouldn't happen --- it implies a bogus opfamily --- but
@@ -1678,6 +1679,35 @@ bool agg_has_prelim_or_invprelim_func(Oid aggid)
 	return has_prelimfunc || has_invprelimfunc;
 }
 
+/*
+ * get_rel_tablespace
+ *
+ *		Returns the pg_tablespace OID associated with a given relation.
+ *
+ * Note: InvalidOid might mean either that we couldn't find the relation,
+ * or that it is in the database's default tablespace.
+ */
+Oid
+get_rel_tablespace(Oid relid)
+{
+	HeapTuple	tp;
+
+	tp = SearchSysCache(RELOID,
+						ObjectIdGetDatum(relid),
+						0, 0, 0);
+	if (HeapTupleIsValid(tp))
+	{
+		Form_pg_class reltup = (Form_pg_class) GETSTRUCT(tp);
+		Oid			result;
+
+		result = reltup->reltablespace;
+		ReleaseSysCache(tp);
+		return result;
+	}
+	else
+		return InvalidOid;
+}
+
 
 /*
  * get_func_nargs
@@ -2257,35 +2287,6 @@ get_rel_relstorage(Oid relid)
 	return result;
 }
 
-/*
- * get_rel_tablespace
- *
- *		Returns the pg_tablespace OID associated with a given relation.
- *
- * Note: InvalidOid might mean either that we couldn't find the relation,
- * or that it is in the database's default tablespace.
- */
-Oid
-get_rel_tablespace(Oid relid)
-{
-	Oid			result = InvalidOid;
-	int			fetchCount;
-
-	result = caql_getoid_plus(
-			NULL,
-			&fetchCount,
-			NULL,
-			cql("SELECT reltablespace FROM pg_class "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(relid)));
-
-	if (!fetchCount)
-		return InvalidOid;
-
-	return result;
-}
-
-
 /*				---------- TYPE CACHE ----------						 */
 
 /*
@@ -2685,7 +2686,8 @@ get_typdefault(Oid typid)
 			datum = OidInputFunctionCall(type->typinput, strDefaultVal,
 										 getTypeIOParam(typeTuple), -1);
 			/* Build a Const node containing the value */
-			expr = (Node *) makeConst(typid, -1,
+			expr = (Node *) makeConst(typid,
+									  -1,
 									  type->typlen,
 									  datum,
 									  false,
@@ -2736,23 +2738,17 @@ getBaseTypeAndTypmod(Oid typid, int32 *typmod)
 	{
 		HeapTuple	tup;
 		Form_pg_type typTup;
-		cqContext  *pcqCtx;
-		
-		pcqCtx = caql_beginscan(
-				NULL,
-				cql("SELECT * FROM pg_type "
-					" WHERE oid = :1 ",
-					ObjectIdGetDatum(typid)));
-
-		tup = caql_getnext(pcqCtx);
 
+		tup = SearchSysCache(TYPEOID,
+							 ObjectIdGetDatum(typid),
+							 0, 0, 0);
 		if (!HeapTupleIsValid(tup))
 			elog(ERROR, "cache lookup failed for type %u", typid);
 		typTup = (Form_pg_type) GETSTRUCT(tup);
 		if (typTup->typtype != TYPTYPE_DOMAIN)
 		{
 			/* Not a domain, so done */
-			caql_endscan(pcqCtx);
+			ReleaseSysCache(tup);
 			break;
 		}
 
@@ -2760,7 +2756,7 @@ getBaseTypeAndTypmod(Oid typid, int32 *typmod)
 		typid = typTup->typbasetype;
 		*typmod = typTup->typtypmod;
 
-		caql_endscan(pcqCtx);
+		ReleaseSysCache(tup);
 	}
 
 	return typid;
@@ -2863,6 +2859,16 @@ type_is_rowtype(Oid typid)
 	return (typid == RECORDOID || get_typtype(typid) == TYPTYPE_COMPOSITE);
 }
 
+/*
+ * type_is_enum
+ *	  Returns true if the given type is an enum type.
+ */
+bool
+type_is_enum(Oid typid)
+{
+	return (get_typtype(typid) == TYPTYPE_ENUM);
+}
+
 /*
  * get_typ_typrelid
  *
@@ -2872,21 +2878,22 @@ type_is_rowtype(Oid typid)
 Oid
 get_typ_typrelid(Oid typid)
 {
-	Oid			result = InvalidOid;
-	int			fetchCount;
+	HeapTuple	tp;
 
-	result = caql_getoid_plus(
-			NULL,
-			&fetchCount,
-			NULL,
-			cql("SELECT typrelid FROM pg_type "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(typid)));
+	tp = SearchSysCache(TYPEOID,
+						ObjectIdGetDatum(typid),
+						0, 0, 0);
+	if (HeapTupleIsValid(tp))
+	{
+		Form_pg_type typtup = (Form_pg_type) GETSTRUCT(tp);
+		Oid			result;
 
-	if (!fetchCount)
+		result = typtup->typrelid;
+		ReleaseSysCache(tp);
+		return result;
+	}
+	else
 		return InvalidOid;
-
-	return result;
 }
 
 /*
@@ -2929,29 +2936,21 @@ get_element_type(Oid typid)
  *
  *		Given the type OID, get the corresponding "true" array type.
  *		Returns InvalidOid if no array type can be found.
- *
  */
 Oid
 get_array_type(Oid typid)
 {
 	HeapTuple	tp;
 	Oid			result = InvalidOid;
-	cqContext  *pcqCtx;
-
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_type "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(typid)));
-
-	tp = caql_getnext(pcqCtx);
 
+	tp = SearchSysCache(TYPEOID,
+						ObjectIdGetDatum(typid),
+						0, 0, 0);
 	if (HeapTupleIsValid(tp))
 	{
 		result = ((Form_pg_type) GETSTRUCT(tp))->typarray;
+		ReleaseSysCache(tp);
 	}
-
-	caql_endscan(pcqCtx);
 	return result;
 }
 
@@ -3322,6 +3321,10 @@ get_attdistinct(Oid relid, AttrNumber attnum)
  * If the attribute type is pass-by-reference, the values referenced by
  * the values array are themselves palloc'd.  The palloc'd stuff can be
  * freed by calling free_attstatsslot.
+ *
+ * Note: at present, atttype/atttypmod aren't actually used here at all.
+ * But the caller must have the correct (or at least binary-compatible)
+ * type ID to pass to free_attstatsslot later.
  */
 extern bool get_attstatsslot_desc(TupleDesc tupdesc, HeapTuple statstuple,
 				 Oid atttype, int32 atttypmod,
@@ -3380,6 +3383,7 @@ get_attstatsslot_desc(TupleDesc tupdesc, HeapTuple statstuple,
 	Datum		val;
 	bool		isnull;
 	ArrayType  *statarray;
+	Oid			arrayelemtype;
 	int			narrayelem;
 	HeapTuple	typeTuple;
 	Form_pg_type typeForm;
@@ -3413,24 +3417,24 @@ get_attstatsslot_desc(TupleDesc tupdesc, HeapTuple statstuple,
 		 */
 		if (ARR_NDIM(statarray) > 0)
 		{
-			cqContext  *typcqCtx;
-
-			/* Need to get info about the array element type */
-			typcqCtx = caql_beginscan(
-					NULL,
-					cql("SELECT * FROM pg_type "
-						" WHERE oid = :1 ",
-						ObjectIdGetDatum(atttype)));
-
-			typeTuple = caql_getnext(typcqCtx);
-
+			/*
+			 * Need to get info about the array element type.  We look at the
+			 * actual element type embedded in the array, which might be only
+			 * binary-compatible with the passed-in atttype.  The info we
+			 * extract here should be the same either way, but deconstruct_array
+			 * is picky about having an exact type OID match.
+			 */
+			arrayelemtype = ARR_ELEMTYPE(statarray);
+			typeTuple = SearchSysCache(TYPEOID,
+									   ObjectIdGetDatum(arrayelemtype),
+									   0, 0, 0);
 			if (!HeapTupleIsValid(typeTuple))
-				elog(ERROR, "cache lookup failed for type %u", atttype);
+				elog(ERROR, "cache lookup failed for type %u", arrayelemtype);
 			typeForm = (Form_pg_type) GETSTRUCT(typeTuple);
 
 			/* Deconstruct array into Datum elements; NULLs not expected */
 			deconstruct_array(statarray,
-					atttype,
+					arrayelemtype,
 					typeForm->typlen,
 					typeForm->typbyval,
 					typeForm->typalign,
@@ -3451,7 +3455,7 @@ get_attstatsslot_desc(TupleDesc tupdesc, HeapTuple statstuple,
 				}
 			}
 
-			caql_endscan(typcqCtx);
+			ReleaseSysCache(typeTuple);
 		}
 		/*
 		 * Free statarray if it's a detoasted copy.
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
new file mode 100644
index 000000000000..2a63a28cd2a0
--- /dev/null
+++ b/src/backend/utils/cache/plancache.c
@@ -0,0 +1,1137 @@
+/*-------------------------------------------------------------------------
+ *
+ * plancache.c
+ *	  Plan cache management.
+ *
+ * We can store a cached plan in either fully-planned format, or just
+ * parsed-and-rewritten if the caller wishes to postpone planning until
+ * actual parameter values are available.  CachedPlanSource has the same
+ * contents either way, but CachedPlan contains a list of PlannedStmts
+ * and bare utility statements in the first case, or a list of Query nodes
+ * in the second case.
+ *
+ * The plan cache manager itself is principally responsible for tracking
+ * whether cached plans should be invalidated because of schema changes in
+ * the objects they depend on.  When (and if) the next demand for a cached
+ * plan occurs, the query will be replanned.  Note that this could result
+ * in an error, for example if a column referenced by the query is no
+ * longer present.	The creator of a cached plan can specify whether it
+ * is allowable for the query to change output tupdesc on replan (this
+ * could happen with "SELECT *" for example) --- if so, it's up to the
+ * caller to notice changes and cope with them.
+ *
+ * Currently, we track exactly the dependencies of plans on relations and
+ * user-defined functions.  On relcache invalidation events or pg_proc
+ * syscache invalidation events, we invalidate just those plans that depend
+ * on the particular object being modified.  (Note: this scheme assumes
+ * that any table modification that requires replanning will generate a
+ * relcache inval event.)  We also watch for inval events on certain other
+ * system catalogs, such as pg_namespace; but for them, our response is
+ * just to invalidate all plans.  We expect updates on those catalogs to
+ * be infrequent enough that more-detailed tracking is not worth the effort.
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/plancache.c,v 1.15.2.4 2010/08/13 16:27:35 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "utils/plancache.h"
+#include "access/transam.h"
+#include "catalog/namespace.h"
+#include "executor/executor.h"
+#include "executor/spi.h"
+#include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
+#include "optimizer/planmain.h"
+#include "storage/lmgr.h"
+#include "tcop/pquery.h"
+#include "tcop/tcopprot.h"
+#include "tcop/utility.h"
+#include "utils/inval.h"
+#include "utils/memutils.h"
+#include "utils/resowner.h"
+#include "utils/syscache.h"
+
+
+static List *cached_plans_list = NIL;
+
+static void StoreCachedPlan(CachedPlanSource *plansource, List *stmt_list,
+				MemoryContext plan_context);
+static void AcquireExecutorLocks(List *stmt_list, bool acquire);
+static void AcquirePlannerLocks(List *stmt_list, bool acquire);
+static void ScanQueryForLocks(Query *parsetree, bool acquire);
+static bool ScanQueryWalker(Node *node, bool *acquire);
+static bool rowmark_member(List *rowMarks, int rt_index);
+static bool plan_list_is_transient(List *stmt_list);
+static void PlanCacheRelCallback(Datum arg, Oid relid);
+static void PlanCacheFuncCallback(Datum arg, int cacheid, ItemPointer tuplePtr);
+static void PlanCacheSysCallback(Datum arg, int cacheid, ItemPointer tuplePtr);
+
+
+/*
+ * InitPlanCache: initialize module during InitPostgres.
+ *
+ * All we need to do is hook into inval.c's callback lists.
+ */
+void
+InitPlanCache(void)
+{
+	CacheRegisterRelcacheCallback(PlanCacheRelCallback, (Datum) 0);
+	CacheRegisterSyscacheCallback(PROCOID, PlanCacheFuncCallback, (Datum) 0);
+	CacheRegisterSyscacheCallback(NAMESPACEOID, PlanCacheSysCallback, (Datum) 0);
+	CacheRegisterSyscacheCallback(OPEROID, PlanCacheSysCallback, (Datum) 0);
+	CacheRegisterSyscacheCallback(AMOPOPID, PlanCacheSysCallback, (Datum) 0);
+}
+
+/*
+ * CreateCachedPlan: initially create a plan cache entry.
+ *
+ * The caller must already have successfully parsed/planned the query;
+ * about all that we do here is copy it into permanent storage.
+ *
+ * raw_parse_tree: output of raw_parser()
+ * query_string: original query text (can be NULL if not available, but
+ *		that is discouraged because it degrades error message quality)
+ * commandTag: compile-time-constant tag for query, or NULL if empty query
+ * param_types: array of parameter type OIDs, or NULL if none
+ * num_params: number of parameters
+ * cursor_options: options bitmask that was/will be passed to planner
+ * stmt_list: list of PlannedStmts/utility stmts, or list of Query trees
+ * fully_planned: are we caching planner or rewriter output?
+ * fixed_result: TRUE to disallow changes in result tupdesc
+ */
+CachedPlanSource *
+CreateCachedPlan(Node *raw_parse_tree,
+				 const char *query_string,
+				 const char *commandTag,
+				 Oid *param_types,
+				 int num_params,
+				 int cursor_options,
+				 List *stmt_list,
+				 bool fully_planned,
+				 bool fixed_result)
+{
+	CachedPlanSource *plansource;
+	OverrideSearchPath *search_path;
+	MemoryContext source_context;
+	MemoryContext oldcxt;
+
+	/*
+	 * Make a dedicated memory context for the CachedPlanSource and its
+	 * subsidiary data.  We expect it can be pretty small.
+	 */
+	source_context = AllocSetContextCreate(CacheMemoryContext,
+										   "CachedPlanSource",
+										   ALLOCSET_SMALL_MINSIZE,
+										   ALLOCSET_SMALL_INITSIZE,
+										   ALLOCSET_SMALL_MAXSIZE);
+
+	/*
+	 * Fetch current search_path into new context, but do any recalculation
+	 * work required in caller's context.
+	 */
+	search_path = GetOverrideSearchPath(source_context);
+
+	/*
+	 * Create and fill the CachedPlanSource struct within the new context.
+	 */
+	oldcxt = MemoryContextSwitchTo(source_context);
+	plansource = (CachedPlanSource *) palloc(sizeof(CachedPlanSource));
+	plansource->raw_parse_tree = copyObject(raw_parse_tree);
+	plansource->query_string = query_string ? pstrdup(query_string) : NULL;
+	plansource->commandTag = commandTag;		/* no copying needed */
+	if (num_params > 0)
+	{
+		plansource->param_types = (Oid *) palloc(num_params * sizeof(Oid));
+		memcpy(plansource->param_types, param_types, num_params * sizeof(Oid));
+	}
+	else
+		plansource->param_types = NULL;
+	plansource->num_params = num_params;
+	plansource->cursor_options = cursor_options;
+	plansource->fully_planned = fully_planned;
+	plansource->fixed_result = fixed_result;
+	plansource->search_path = search_path;
+	plansource->generation = 0; /* StoreCachedPlan will increment */
+	plansource->resultDesc = PlanCacheComputeResultDesc(stmt_list);
+	plansource->plan = NULL;
+	plansource->context = source_context;
+	plansource->orig_plan = NULL;
+
+	/*
+	 * Copy the current output plans into the plancache entry.
+	 */
+	StoreCachedPlan(plansource, stmt_list, NULL);
+
+	/*
+	 * Now we can add the entry to the list of cached plans.  The List nodes
+	 * live in CacheMemoryContext.
+	 */
+	MemoryContextSwitchTo(CacheMemoryContext);
+
+	cached_plans_list = lappend(cached_plans_list, plansource);
+
+	MemoryContextSwitchTo(oldcxt);
+
+	return plansource;
+}
+
+/*
+ * FastCreateCachedPlan: create a plan cache entry with minimal data copying.
+ *
+ * For plans that aren't expected to live very long, the copying overhead of
+ * CreateCachedPlan is annoying.  We provide this variant entry point in which
+ * the caller has already placed all the data in a suitable memory context.
+ * The source data and completed plan are in the same context, since this
+ * avoids extra copy steps during plan construction.  If the query ever does
+ * need replanning, we'll generate a separate new CachedPlan at that time, but
+ * the CachedPlanSource and the initial CachedPlan share the caller-provided
+ * context and go away together when neither is needed any longer.	(Because
+ * the parser and planner generate extra cruft in addition to their real
+ * output, this approach means that the context probably contains a bunch of
+ * useless junk as well as the useful trees.  Hence, this method is a
+ * space-for-time tradeoff, which is worth making for plans expected to be
+ * short-lived.)
+ *
+ * raw_parse_tree, query_string, param_types, and stmt_list must reside in the
+ * given context, which must have adequate lifespan (recommendation: make it a
+ * child of CacheMemoryContext).  Otherwise the API is the same as
+ * CreateCachedPlan.
+ */
+CachedPlanSource *
+FastCreateCachedPlan(Node *raw_parse_tree,
+					 char *query_string,
+					 const char *commandTag,
+					 Oid *param_types,
+					 int num_params,
+					 int cursor_options,
+					 List *stmt_list,
+					 bool fully_planned,
+					 bool fixed_result,
+					 MemoryContext context)
+{
+	CachedPlanSource *plansource;
+	OverrideSearchPath *search_path;
+	MemoryContext oldcxt;
+
+	/*
+	 * Fetch current search_path into given context, but do any recalculation
+	 * work required in caller's context.
+	 */
+	search_path = GetOverrideSearchPath(context);
+
+	/*
+	 * Create and fill the CachedPlanSource struct within the given context.
+	 */
+	oldcxt = MemoryContextSwitchTo(context);
+	plansource = (CachedPlanSource *) palloc(sizeof(CachedPlanSource));
+	plansource->raw_parse_tree = raw_parse_tree;
+	plansource->query_string = query_string;
+	plansource->commandTag = commandTag;		/* no copying needed */
+	plansource->param_types = param_types;
+	plansource->num_params = num_params;
+	plansource->cursor_options = cursor_options;
+	plansource->fully_planned = fully_planned;
+	plansource->fixed_result = fixed_result;
+	plansource->search_path = search_path;
+	plansource->generation = 0; /* StoreCachedPlan will increment */
+	plansource->resultDesc = PlanCacheComputeResultDesc(stmt_list);
+	plansource->plan = NULL;
+	plansource->context = context;
+	plansource->orig_plan = NULL;
+
+	/*
+	 * Store the current output plans into the plancache entry.
+	 */
+	StoreCachedPlan(plansource, stmt_list, context);
+
+	/*
+	 * Since the context is owned by the CachedPlan, advance its refcount.
+	 */
+	plansource->orig_plan = plansource->plan;
+	plansource->orig_plan->refcount++;
+
+	/*
+	 * Now we can add the entry to the list of cached plans.  The List nodes
+	 * live in CacheMemoryContext.
+	 */
+	MemoryContextSwitchTo(CacheMemoryContext);
+
+	cached_plans_list = lappend(cached_plans_list, plansource);
+
+	MemoryContextSwitchTo(oldcxt);
+
+	return plansource;
+}
+
+/*
+ * StoreCachedPlan: store a built or rebuilt plan into a plancache entry.
+ *
+ * Common subroutine for CreateCachedPlan and RevalidateCachedPlan.
+ */
+static void
+StoreCachedPlan(CachedPlanSource *plansource,
+				List *stmt_list,
+				MemoryContext plan_context)
+{
+	CachedPlan *plan;
+	MemoryContext oldcxt;
+
+	if (plan_context == NULL)
+	{
+		/*
+		 * Make a dedicated memory context for the CachedPlan and its
+		 * subsidiary data.  It's probably not going to be large, but just in
+		 * case, use the default maxsize parameter.
+		 */
+		plan_context = AllocSetContextCreate(CacheMemoryContext,
+											 "CachedPlan",
+											 ALLOCSET_SMALL_MINSIZE,
+											 ALLOCSET_SMALL_INITSIZE,
+											 ALLOCSET_DEFAULT_MAXSIZE);
+
+		/*
+		 * Copy supplied data into the new context.
+		 */
+		oldcxt = MemoryContextSwitchTo(plan_context);
+
+		stmt_list = (List *) copyObject(stmt_list);
+	}
+	else
+	{
+		/* Assume subsidiary data is in the given context */
+		oldcxt = MemoryContextSwitchTo(plan_context);
+	}
+
+	/*
+	 * Create and fill the CachedPlan struct within the new context.
+	 */
+	plan = (CachedPlan *) palloc(sizeof(CachedPlan));
+	plan->stmt_list = stmt_list;
+	plan->fully_planned = plansource->fully_planned;
+	plan->dead = false;
+	if (plansource->fully_planned && plan_list_is_transient(stmt_list))
+	{
+		Assert(TransactionIdIsNormal(TransactionXmin));
+		plan->saved_xmin = TransactionXmin;
+	}
+	else
+		plan->saved_xmin = InvalidTransactionId;
+	plan->refcount = 1;			/* for the parent's link */
+	plan->generation = ++(plansource->generation);
+	plan->context = plan_context;
+	if (plansource->fully_planned)
+	{
+		/* Planner already extracted dependencies, we don't have to */
+		plan->relationOids = plan->invalItems = NIL;
+	}
+	else
+	{
+		/* Use the planner machinery to extract dependencies */
+		extract_query_dependencies(stmt_list,
+								   &plan->relationOids,
+								   &plan->invalItems);
+	}
+
+	Assert(plansource->plan == NULL);
+	plansource->plan = plan;
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * DropCachedPlan: destroy a cached plan.
+ *
+ * Actually this only destroys the CachedPlanSource: the referenced CachedPlan
+ * is released, but not destroyed until its refcount goes to zero.	That
+ * handles the situation where DropCachedPlan is called while the plan is
+ * still in use.
+ */
+void
+DropCachedPlan(CachedPlanSource *plansource)
+{
+	/* Validity check that we were given a CachedPlanSource */
+	Assert(list_member_ptr(cached_plans_list, plansource));
+
+	/* Remove it from the list */
+	cached_plans_list = list_delete_ptr(cached_plans_list, plansource);
+
+	/* Decrement child CachePlan's refcount and drop if no longer needed */
+	if (plansource->plan)
+		ReleaseCachedPlan(plansource->plan, false);
+
+	/*
+	 * If CachedPlanSource has independent storage, just drop it.  Otherwise
+	 * decrement the refcount on the CachePlan that owns the storage.
+	 */
+	if (plansource->orig_plan == NULL)
+	{
+		/* Remove the CachedPlanSource and all subsidiary data */
+		MemoryContextDelete(plansource->context);
+	}
+	else
+	{
+		Assert(plansource->context == plansource->orig_plan->context);
+		ReleaseCachedPlan(plansource->orig_plan, false);
+	}
+}
+
+/*
+ * RevalidateCachedPlan: prepare for re-use of a previously cached plan.
+ *
+ * What we do here is re-acquire locks and rebuild the plan if necessary.
+ * On return, the plan is valid and we have sufficient locks to begin
+ * execution (or planning, if not fully_planned).
+ *
+ * On return, the refcount of the plan has been incremented; a later
+ * ReleaseCachedPlan() call is expected.  The refcount has been reported
+ * to the CurrentResourceOwner if useResOwner is true.
+ *
+ * Note: if any replanning activity is required, the caller's memory context
+ * is used for that work.
+ *
+ * In GPDB, this function has two extra parameters: boundParams and intoClause.
+ * If boundParams is set, the parameter values are used to generate the plan.
+ * That makes the plan specific to the given values, and cannot be reused when
+ * the query is executed with different params (RevalidateCachedPlanWithParams
+ * will mark the plan so that it will be automatically re-planned on next
+ * call). If 'intoClause' is given, the plan is to be used as part of a
+ * CREATE TABLE AS statement. That affects the distribution of the output rows:
+ * we cannot reuse a generic plan that fetches all the output rows into master.
+ * They should be distributed to the correct segments according to the
+ * distribution policy of the target table, instead. A non-NULL intoClause
+ * therefore also forces the plan to be re-planned on next call.
+ */
+CachedPlan *
+RevalidateCachedPlanWithParams(CachedPlanSource *plansource, bool useResOwner,
+							   ParamListInfo boundParams, IntoClause *intoClause)
+{
+	CachedPlan *plan;
+
+	/* Validity check that we were given a CachedPlanSource */
+	Assert(list_member_ptr(cached_plans_list, plansource));
+
+	/*
+	 * If the plan currently appears valid, acquire locks on the referenced
+	 * objects; then check again.  We need to do it this way to cover the race
+	 * condition that an invalidation message arrives before we get the lock.
+	 */
+	plan = plansource->plan;
+
+	/*
+	 * If we are to use the parameter values in the plan, or this is a
+	 * CREATE TABLE AS EXECUTE, we cannot re-use a generic plan.
+	 */
+	if (plan && (boundParams || intoClause))
+		plan->dead = true;
+
+	if (plan && !plan->dead)
+	{
+		/*
+		 * Plan must have positive refcount because it is referenced by
+		 * plansource; so no need to fear it disappears under us here.
+		 */
+		Assert(plan->refcount > 0);
+
+		if (plan->fully_planned)
+			AcquireExecutorLocks(plan->stmt_list, true);
+		else
+			AcquirePlannerLocks(plan->stmt_list, true);
+
+		/*
+		 * If plan was transient, check to see if TransactionXmin has
+		 * advanced, and if so invalidate it.
+		 */
+		if (!plan->dead &&
+			TransactionIdIsValid(plan->saved_xmin) &&
+			!TransactionIdEquals(plan->saved_xmin, TransactionXmin))
+			plan->dead = true;
+
+		/*
+		 * By now, if any invalidation has happened, the inval callback
+		 * functions will have marked the plan dead.
+		 */
+		if (plan->dead)
+		{
+			/* Ooops, the race case happened.  Release useless locks. */
+			if (plan->fully_planned)
+				AcquireExecutorLocks(plan->stmt_list, false);
+			else
+				AcquirePlannerLocks(plan->stmt_list, false);
+		}
+	}
+
+	/*
+	 * If plan has been invalidated, unlink it from the parent and release it.
+	 */
+	if (plan && plan->dead)
+	{
+		plansource->plan = NULL;
+		ReleaseCachedPlan(plan, false);
+		plan = NULL;
+	}
+
+	/*
+	 * Build a new plan if needed.
+	 */
+	if (!plan)
+	{
+		Snapshot	saveActiveSnapshot = ActiveSnapshot;
+		List	   *slist;
+
+		/*
+		 * Restore the search_path that was in use when the plan was made.
+		 * See comments for PushOverrideSearchPath about limitations of this.
+		 *
+		 * (XXX is there anything else we really need to restore?)
+		 */
+		PushOverrideSearchPath(plansource->search_path);
+
+		/*
+		 * If a snapshot is already set (the normal case), we can just use
+		 * that for parsing/planning.  But if it isn't, install one.  We must
+		 * arrange to restore ActiveSnapshot afterward, to ensure that
+		 * RevalidateCachedPlan has no caller-visible effects on the
+		 * snapshot.  Having to replan is an unusual case, and it seems a
+		 * really bad idea for RevalidateCachedPlan to affect the snapshot
+		 * only in unusual cases.  (Besides, the snap might have been created
+		 * in a short-lived context.)
+		 */
+		PG_TRY();
+		{
+			Snapshot	mySnapshot = NULL;
+			TupleDesc	resultDesc;
+			Node	   *raw_parse_tree;
+
+			if (ActiveSnapshot == NULL)
+			{
+				mySnapshot = CopySnapshot(GetTransactionSnapshot());
+				ActiveSnapshot = mySnapshot;
+			}
+
+			/*
+			 * If this is a CREATE TABLE AS, pass information about the
+			 * target table's distribution key to the planner.
+			 */
+			if (intoClause)
+			{
+				SelectStmt *select;
+
+				if (!IsA(plansource->raw_parse_tree, SelectStmt))
+					ereport(ERROR,
+							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+							 errmsg("prepared statement is not a SELECT")));
+
+				select = (SelectStmt *) copyObject(plansource->raw_parse_tree);
+
+				select->intoClause = copyObject(intoClause);
+
+				raw_parse_tree = (Node *) select;
+			}
+			else
+				raw_parse_tree = copyObject(plansource->raw_parse_tree);
+
+			/*
+			 * Run parse analysis and rule rewriting.  The parser tends to
+			 * scribble on its input, so we must copy the raw parse tree to
+			 * prevent corruption of the cache.  Note that we do not use
+			 * parse_analyze_varparams(), assuming that the caller never wants
+			 * the parameter types to change from the original values.
+			 */
+			slist = pg_analyze_and_rewrite(raw_parse_tree,
+										   plansource->query_string,
+										   plansource->param_types,
+										   plansource->num_params);
+
+			if (plansource->fully_planned)
+			{
+				/*
+				 * Generate plans for queries.
+				 *
+				 * The planner may try to call SPI-using functions, which
+				 * causes a problem if we're already inside one.  Rather than
+				 * expect all SPI-using code to do SPI_push whenever a replan
+				 * could happen, it seems best to take care of the case here.
+				 */
+				bool	pushed;
+
+				pushed = SPI_push_conditional();
+
+				slist = pg_plan_queries(slist, plansource->cursor_options,
+										boundParams, false);
+
+				SPI_pop_conditional(pushed);
+			}
+
+			/*
+			 * Check or update the result tupdesc.	XXX should we use a weaker
+			 * condition than equalTupleDescs() here?
+			 */
+			resultDesc = PlanCacheComputeResultDesc(slist);
+			if (resultDesc == NULL && plansource->resultDesc == NULL)
+			{
+				/* OK, doesn't return tuples */
+			}
+			else if (intoClause)
+			{
+				/* OK */
+			}
+			else if (resultDesc == NULL || plansource->resultDesc == NULL ||
+					 !equalTupleDescs(resultDesc, plansource->resultDesc, true))
+			{
+				MemoryContext oldcxt;
+
+				/* can we give a better error message? */
+				if (plansource->fixed_result)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("cached plan must not change result type")));
+				oldcxt = MemoryContextSwitchTo(plansource->context);
+				if (resultDesc)
+					resultDesc = CreateTupleDescCopy(resultDesc);
+				if (plansource->resultDesc)
+					FreeTupleDesc(plansource->resultDesc);
+				plansource->resultDesc = resultDesc;
+				MemoryContextSwitchTo(oldcxt);
+			}
+
+			/* Done with snapshot */
+			if (mySnapshot)
+				FreeSnapshot(mySnapshot);
+		}
+		PG_CATCH();
+		{
+			/* Restore global vars and propagate error */
+			ActiveSnapshot = saveActiveSnapshot;
+			PG_RE_THROW();
+		}
+		PG_END_TRY();
+
+		ActiveSnapshot = saveActiveSnapshot;
+
+		/* Now we can restore current search path */
+		PopOverrideSearchPath();
+
+		/*
+		 * Store the plans into the plancache entry, advancing the generation
+		 * count.
+		 */
+		StoreCachedPlan(plansource, slist, NULL);
+
+		plan = plansource->plan;
+
+		/*
+		 * If we used the parameter values to create the plan, or this is a
+		 * CREATE TABLE AS, we cannot re-use this plan on subsequent calls.
+		 */
+		if (boundParams || intoClause)
+			plan->saved_xmin = BootstrapTransactionId;
+	}
+
+	/*
+	 * Last step: flag the plan as in use by caller.
+	 */
+	if (useResOwner)
+		ResourceOwnerEnlargePlanCacheRefs(CurrentResourceOwner);
+	plan->refcount++;
+	if (useResOwner)
+		ResourceOwnerRememberPlanCacheRef(CurrentResourceOwner, plan);
+
+	return plan;
+}
+
+/*
+ * Compatibility version of RevalidateCachedPlanWithParams, for the simple
+ * case of no params and no CREATE TABLE AS.
+ */
+CachedPlan *
+RevalidateCachedPlan(CachedPlanSource *plansource, bool useResOwner)
+{
+	return RevalidateCachedPlanWithParams(plansource, useResOwner, NULL, NULL);
+}
+
+/*
+ * ReleaseCachedPlan: release active use of a cached plan.
+ *
+ * This decrements the reference count, and frees the plan if the count
+ * has thereby gone to zero.  If useResOwner is true, it is assumed that
+ * the reference count is managed by the CurrentResourceOwner.
+ *
+ * Note: useResOwner = false is used for releasing references that are in
+ * persistent data structures, such as the parent CachedPlanSource or a
+ * Portal.	Transient references should be protected by a resource owner.
+ */
+void
+ReleaseCachedPlan(CachedPlan *plan, bool useResOwner)
+{
+	if (useResOwner)
+		ResourceOwnerForgetPlanCacheRef(CurrentResourceOwner, plan);
+	Assert(plan->refcount > 0);
+	plan->refcount--;
+	if (plan->refcount == 0)
+		MemoryContextDelete(plan->context);
+}
+
+/*
+ * CachedPlanIsValid: test whether the plan within a CachedPlanSource is
+ * currently valid (that is, not marked as being in need of revalidation).
+ *
+ * This result is only trustworthy (ie, free from race conditions) if
+ * the caller has acquired locks on all the relations used in the plan.
+ */
+bool
+CachedPlanIsValid(CachedPlanSource *plansource)
+{
+	CachedPlan *plan;
+
+	/* Validity check that we were given a CachedPlanSource */
+	Assert(list_member_ptr(cached_plans_list, plansource));
+
+	plan = plansource->plan;
+	if (plan && !plan->dead)
+	{
+		/*
+		 * Plan must have positive refcount because it is referenced by
+		 * plansource; so no need to fear it disappears under us here.
+		 */
+		Assert(plan->refcount > 0);
+
+		/*
+		 * Although we don't want to acquire locks here, it still seems
+		 * useful to check for expiration of a transient plan.
+		 */
+		if (TransactionIdIsValid(plan->saved_xmin) &&
+			!TransactionIdEquals(plan->saved_xmin, TransactionXmin))
+			plan->dead = true;
+		else
+			return true;
+	}
+
+	return false;
+}
+
+/*
+ * AcquireExecutorLocks: acquire locks needed for execution of a fully-planned
+ * cached plan; or release them if acquire is false.
+ */
+static void
+AcquireExecutorLocks(List *stmt_list, bool acquire)
+{
+	ListCell   *lc1;
+
+	foreach(lc1, stmt_list)
+	{
+		PlannedStmt *plannedstmt = (PlannedStmt *) lfirst(lc1);
+		int			rt_index;
+		ListCell   *lc2;
+
+		Assert(!IsA(plannedstmt, Query));
+		if (!IsA(plannedstmt, PlannedStmt))
+			continue;			/* Ignore utility statements */
+
+		rt_index = 0;
+		foreach(lc2, plannedstmt->rtable)
+		{
+			RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc2);
+			LOCKMODE	lockmode;
+
+			rt_index++;
+
+			if (rte->rtekind != RTE_RELATION)
+				continue;
+
+			/*
+			 * Acquire the appropriate type of lock on each relation OID. Note
+			 * that we don't actually try to open the rel, and hence will not
+			 * fail if it's been dropped entirely --- we'll just transiently
+			 * acquire a non-conflicting lock.
+			 */
+			if (list_member_int(plannedstmt->resultRelations, rt_index))
+				lockmode = RowExclusiveLock;
+			else if (rowmark_member(plannedstmt->rowMarks, rt_index))
+				lockmode = RowShareLock;
+			else
+				lockmode = AccessShareLock;
+
+			if (acquire)
+				LockRelationOid(rte->relid, lockmode);
+			else
+				UnlockRelationOid(rte->relid, lockmode);
+		}
+	}
+}
+
+/*
+ * AcquirePlannerLocks: acquire locks needed for planning and execution of a
+ * not-fully-planned cached plan; or release them if acquire is false.
+ *
+ * Note that we don't actually try to open the relations, and hence will not
+ * fail if one has been dropped entirely --- we'll just transiently acquire
+ * a non-conflicting lock.
+ */
+static void
+AcquirePlannerLocks(List *stmt_list, bool acquire)
+{
+	ListCell   *lc;
+
+	foreach(lc, stmt_list)
+	{
+		Query	   *query = (Query *) lfirst(lc);
+
+		Assert(IsA(query, Query));
+		ScanQueryForLocks(query, acquire);
+	}
+}
+
+/*
+ * ScanQueryForLocks: recursively scan one Query for AcquirePlannerLocks.
+ */
+static void
+ScanQueryForLocks(Query *parsetree, bool acquire)
+{
+	ListCell   *lc;
+	int			rt_index;
+
+	/*
+	 * First, process RTEs of the current query level.
+	 */
+	rt_index = 0;
+	foreach(lc, parsetree->rtable)
+	{
+		RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+		LOCKMODE	lockmode;
+
+		rt_index++;
+		switch (rte->rtekind)
+		{
+			case RTE_RELATION:
+				/* Acquire or release the appropriate type of lock */
+				if (rt_index == parsetree->resultRelation)
+					lockmode = RowExclusiveLock;
+				else if (rowmark_member(parsetree->rowMarks, rt_index))
+					lockmode = RowShareLock;
+				else
+					lockmode = AccessShareLock;
+				if (acquire)
+					LockRelationOid(rte->relid, lockmode);
+				else
+					UnlockRelationOid(rte->relid, lockmode);
+				break;
+
+			case RTE_SUBQUERY:
+				/* Recurse into subquery-in-FROM */
+				ScanQueryForLocks(rte->subquery, acquire);
+				break;
+
+			default:
+				/* ignore other types of RTEs */
+				break;
+		}
+	}
+
+	/*
+	 * Recurse into sublink subqueries, too.  But we already did the ones in
+	 * the rtable.
+	 */
+	if (parsetree->hasSubLinks)
+	{
+		query_tree_walker(parsetree, ScanQueryWalker,
+						  (void *) &acquire,
+						  QTW_IGNORE_RT_SUBQUERIES);
+	}
+}
+
+/*
+ * Walker to find sublink subqueries for ScanQueryForLocks
+ */
+static bool
+ScanQueryWalker(Node *node, bool *acquire)
+{
+	if (node == NULL)
+		return false;
+	if (IsA(node, SubLink))
+	{
+		SubLink    *sub = (SubLink *) node;
+
+		/* Do what we came for */
+		ScanQueryForLocks((Query *) sub->subselect, *acquire);
+		/* Fall through to process lefthand args of SubLink */
+	}
+
+	/*
+	 * Do NOT recurse into Query nodes, because ScanQueryForLocks already
+	 * processed subselects of subselects for us.
+	 */
+	return expression_tree_walker(node, ScanQueryWalker,
+								  (void *) acquire);
+}
+
+/*
+ * rowmark_member: check whether an RT index appears in a RowMarkClause list.
+ */
+static bool
+rowmark_member(List *rowMarks, int rt_index)
+{
+	ListCell   *l;
+
+	foreach(l, rowMarks)
+	{
+		RowMarkClause *rc = (RowMarkClause *) lfirst(l);
+
+		if (rc->rti == rt_index)
+			return true;
+	}
+	return false;
+}
+
+/*
+ * plan_list_is_transient: check if any of the plans in the list are transient.
+ */
+static bool
+plan_list_is_transient(List *stmt_list)
+{
+	ListCell   *lc;
+
+	foreach(lc, stmt_list)
+	{
+		PlannedStmt *plannedstmt = (PlannedStmt *) lfirst(lc);
+
+		if (!IsA(plannedstmt, PlannedStmt))
+			continue;			/* Ignore utility statements */
+
+		if (plannedstmt->transientPlan)
+			return true;
+	}
+
+	return false;
+}
+
+/*
+ * PlanCacheComputeResultDesc: given a list of either fully-planned statements
+ * or Queries, determine the result tupledesc it will produce.	Returns NULL
+ * if the execution will not return tuples.
+ *
+ * Note: the result is created or copied into current memory context.
+ */
+TupleDesc
+PlanCacheComputeResultDesc(List *stmt_list)
+{
+	Node	   *node;
+	Query	   *query;
+	PlannedStmt *pstmt;
+
+	switch (ChoosePortalStrategy(stmt_list))
+	{
+		case PORTAL_ONE_SELECT:
+			node = (Node *) linitial(stmt_list);
+			if (IsA(node, Query))
+			{
+				query = (Query *) node;
+				return ExecCleanTypeFromTL(query->targetList, false);
+			}
+			if (IsA(node, PlannedStmt))
+			{
+				pstmt = (PlannedStmt *) node;
+				return ExecCleanTypeFromTL(pstmt->planTree->targetlist, false);
+			}
+			/* other cases shouldn't happen, but return NULL */
+			break;
+
+		case PORTAL_ONE_RETURNING:
+			node = PortalListGetPrimaryStmt(stmt_list);
+			if (IsA(node, Query))
+			{
+				query = (Query *) node;
+				Assert(query->returningList);
+				return ExecCleanTypeFromTL(query->returningList, false);
+			}
+			if (IsA(node, PlannedStmt))
+			{
+				pstmt = (PlannedStmt *) node;
+				Assert(pstmt->returningLists);
+				return ExecCleanTypeFromTL((List *) linitial(pstmt->returningLists), false);
+			}
+			/* other cases shouldn't happen, but return NULL */
+			break;
+
+		case PORTAL_UTIL_SELECT:
+			node = (Node *) linitial(stmt_list);
+			if (IsA(node, Query))
+			{
+				query = (Query *) node;
+				Assert(query->utilityStmt);
+				return UtilityTupleDescriptor(query->utilityStmt);
+			}
+			/* else it's a bare utility statement */
+			return UtilityTupleDescriptor(node);
+
+		case PORTAL_MULTI_QUERY:
+			/* will not return tuples */
+			break;
+	}
+	return NULL;
+}
+
+/*
+ * PlanCacheRelCallback
+ *		Relcache inval callback function
+ *
+ * Invalidate all plans mentioning the given rel, or all plans mentioning
+ * any rel at all if relid == InvalidOid.
+ */
+static void
+PlanCacheRelCallback(Datum arg, Oid relid)
+{
+	ListCell   *lc1;
+
+	foreach(lc1, cached_plans_list)
+	{
+		CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc1);
+		CachedPlan *plan = plansource->plan;
+
+		/* No work if it's already invalidated */
+		if (!plan || plan->dead)
+			continue;
+		if (plan->fully_planned)
+		{
+			/* Have to check the per-PlannedStmt relid lists */
+			ListCell   *lc2;
+
+			foreach(lc2, plan->stmt_list)
+			{
+				PlannedStmt *plannedstmt = (PlannedStmt *) lfirst(lc2);
+
+				Assert(!IsA(plannedstmt, Query));
+				if (!IsA(plannedstmt, PlannedStmt))
+					continue;	/* Ignore utility statements */
+				if ((relid == InvalidOid) ? plannedstmt->relationOids != NIL :
+					list_member_oid(plannedstmt->relationOids, relid))
+				{
+					/* Invalidate the plan! */
+					plan->dead = true;
+					break;		/* out of stmt_list scan */
+				}
+			}
+		}
+		else
+		{
+			/* Otherwise check the single list we built ourselves */
+			if ((relid == InvalidOid) ? plan->relationOids != NIL :
+				list_member_oid(plan->relationOids, relid))
+				plan->dead = true;
+		}
+	}
+}
+
+/*
+ * PlanCacheFuncCallback
+ *		Syscache inval callback function for PROCOID cache
+ *
+ * Invalidate all plans mentioning the given catalog entry, or all plans
+ * mentioning any member of this cache if tuplePtr == NULL.
+ *
+ * Note that the coding would support use for multiple caches, but right
+ * now only user-defined functions are tracked this way.
+ */
+static void
+PlanCacheFuncCallback(Datum arg, int cacheid, ItemPointer tuplePtr)
+{
+	ListCell   *lc1;
+
+	foreach(lc1, cached_plans_list)
+	{
+		CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc1);
+		CachedPlan *plan = plansource->plan;
+
+		/* No work if it's already invalidated */
+		if (!plan || plan->dead)
+			continue;
+		if (plan->fully_planned)
+		{
+			/* Have to check the per-PlannedStmt inval-item lists */
+			ListCell   *lc2;
+
+			foreach(lc2, plan->stmt_list)
+			{
+				PlannedStmt *plannedstmt = (PlannedStmt *) lfirst(lc2);
+				ListCell   *lc3;
+
+				Assert(!IsA(plannedstmt, Query));
+				if (!IsA(plannedstmt, PlannedStmt))
+					continue;	/* Ignore utility statements */
+				foreach(lc3, plannedstmt->invalItems)
+				{
+					PlanInvalItem *item = (PlanInvalItem *) lfirst(lc3);
+
+					if (item->cacheId != cacheid)
+						continue;
+					if (tuplePtr == NULL ||
+						ItemPointerEquals(tuplePtr, &item->tupleId))
+					{
+						/* Invalidate the plan! */
+						plan->dead = true;
+						break;		/* out of invalItems scan */
+					}
+				}
+				if (plan->dead)
+					break;		/* out of stmt_list scan */
+			}
+		}
+		else
+		{
+			/* Otherwise check the single list we built ourselves */
+			ListCell   *lc2;
+
+			foreach(lc2, plan->invalItems)
+			{
+				PlanInvalItem *item = (PlanInvalItem *) lfirst(lc2);
+
+				if (item->cacheId != cacheid)
+					continue;
+				if (tuplePtr == NULL ||
+					ItemPointerEquals(tuplePtr, &item->tupleId))
+				{
+					/* Invalidate the plan! */
+					plan->dead = true;
+					break;
+				}
+			}
+		}
+	}
+}
+
+/*
+ * PlanCacheSysCallback
+ *		Syscache inval callback function for other caches
+ *
+ * Just invalidate everything...
+ */
+static void
+PlanCacheSysCallback(Datum arg, int cacheid, ItemPointer tuplePtr)
+{
+	ResetPlanCache();
+}
+
+/*
+ * ResetPlanCache: drop all cached plans.
+ */
+void
+ResetPlanCache(void)
+{
+	ListCell   *lc;
+
+	foreach(lc, cached_plans_list)
+	{
+		CachedPlanSource *plansource = (CachedPlanSource *) lfirst(lc);
+		CachedPlan *plan = plansource->plan;
+
+		if (plan)
+			plan->dead = true;
+	}
+}
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 083d2f75805d..8dc175ba779c 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.259 2007/03/29 00:15:38 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.266.2.10 2010/09/02 03:17:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,6 +38,7 @@
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/catquery.h"
+#include "catalog/index.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_amop.h"
@@ -60,6 +61,7 @@
 #include "optimizer/clauses.h"
 #include "optimizer/planmain.h"
 #include "optimizer/prep.h"
+#include "optimizer/var.h"
 #include "rewrite/rewriteDefine.h"
 #include "storage/fd.h"
 #include "storage/smgr.h"
@@ -71,7 +73,6 @@
 #include "utils/relationnode.h"
 #include "utils/resowner.h"
 #include "utils/syscache.h"
-#include "utils/typcache.h"
 
 #include "catalog/gp_policy.h"         /* GpPolicy */
 #include "cdb/cdbtm.h"
@@ -157,8 +158,7 @@ do { \
 	RelIdCacheEnt *idhentry; bool found; \
 	idhentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
 										   (void *) &(RELATION->rd_id), \
-										   HASH_ENTER, \
-										   &found); \
+										   HASH_ENTER, &found); \
 	/* used to give notice if found -- now just keep quiet */ \
 	idhentry->reldesc = RELATION; \
 } while(0)
@@ -167,7 +167,8 @@ do { \
 do { \
 	RelIdCacheEnt *hentry; \
 	hentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
-										 (void *) &(ID), HASH_FIND,NULL); \
+										 (void *) &(ID), \
+										 HASH_FIND, NULL); \
 	if (hentry) \
 		RELATION = hentry->reldesc; \
 	else \
@@ -211,7 +212,7 @@ static HTAB *OpClassCache = NULL;
 static void RelationDestroyRelation(Relation relation);
 static void RelationClearRelation(Relation relation, bool rebuild);
 
-static void RelationReloadClassinfo(Relation relation);
+static void RelationReloadIndexInfo(Relation relation);
 static void RelationFlushRelation(Relation relation);
 static bool load_relcache_init_file(bool shared);
 static void write_relcache_init_file(bool shared);
@@ -1114,6 +1115,7 @@ RelationBuildRuleLock(Relation relation)
 
 		rule->event = rewrite_form->ev_type - '0';
 		rule->attrno = rewrite_form->ev_attr;
+		rule->enabled = rewrite_form->ev_enabled;
 		rule->isInstead = rewrite_form->is_instead;
 
 		/*
@@ -1219,6 +1221,8 @@ equalRuleLocks(RuleLock *rlock1, RuleLock *rlock2)
 				return false;
 			if (rule1->attrno != rule2->attrno)
 				return false;
+			if (rule1->enabled != rule2->enabled)
+				return false;
 			if (rule1->isInstead != rule2->isInstead)
 				return false;
 			if (!equal(rule1->qual, rule2->qual))
@@ -1232,6 +1236,7 @@ equalRuleLocks(RuleLock *rlock1, RuleLock *rlock2)
 	return true;
 }
 
+
 /*
  *		RelationBuildDesc
  *
@@ -1291,7 +1296,7 @@ RelationBuildDesc(Oid targetRelId, bool insertIt)
 	relation->rd_isnailed = false;
 	relation->rd_createSubid = InvalidSubTransactionId;
 	relation->rd_newRelfilenodeSubid = InvalidSubTransactionId;
-	relation->rd_istemp = isTempNamespace(relation->rd_rel->relnamespace);
+	relation->rd_istemp = isTempOrToastNamespace(relation->rd_rel->relnamespace);
 	relation->rd_issyscat = (strncmp(relation->rd_rel->relname.data, "pg_", 3) == 0);
 
     /*
@@ -1404,7 +1409,7 @@ RelationInitIndexAccessInfo(Relation relation)
 	Datum		indoptionDatum;
 	bool		isnull;
 	oidvector  *indclass;
-	int2vector  *indoption;
+	int2vector *indoption;
 	MemoryContext indexcxt;
 	MemoryContext oldcontext;
 	int			natts;
@@ -1502,8 +1507,8 @@ RelationInitIndexAccessInfo(Relation relation)
 
 	/*
 	 * indclass cannot be referenced directly through the C struct, because it
-	 * comes after the variable-width indkey field.  Must extract the
-	 * datum the hard way...
+	 * comes after the variable-width indkey field.  Must extract the datum
+	 * the hard way...
 	 */
 	indclassDatum = fastgetattr(relation->rd_indextuple,
 								Anum_pg_index_indclass,
@@ -1513,9 +1518,9 @@ RelationInitIndexAccessInfo(Relation relation)
 	indclass = (oidvector *) DatumGetPointer(indclassDatum);
 
 	/*
-	 * Fill the operator and support procedure OID arrays, as well as the
-	 * info about opfamilies and opclass input types.  (aminfo and
-	 * supportinfo are left as zeroes, and are filled on-the-fly when used)
+	 * Fill the operator and support procedure OID arrays, as well as the info
+	 * about opfamilies and opclass input types.  (aminfo and supportinfo are
+	 * left as zeroes, and are filled on-the-fly when used)
 	 */
 	IndexSupportInitialize(indclass,
 						   relation->rd_operator, relation->rd_support,
@@ -1608,7 +1613,7 @@ IndexSupportInitialize(oidvector *indclass,
  * Note there is no provision for flushing the cache.  This is OK at the
  * moment because there is no way to ALTER any interesting properties of an
  * existing opclass --- all you can do is drop it, which will result in
- * a useless but harmless dead entry in the cache.	To support altering
+ * a useless but harmless dead entry in the cache.  To support altering
  * opclass membership (not the same as opfamily membership!), we'd need to
  * be able to flush this cache as well as the contents of relcache entries
  * for indexes.
@@ -1646,34 +1651,50 @@ LookupOpclassInfo(Oid operatorClassOid,
 											   (void *) &operatorClassOid,
 											   HASH_ENTER, &found);
 
-	if (found && opcentry->valid)
+	if (!found)
+	{
+		/* Need to allocate memory for new entry */
+		opcentry->valid = false;	/* until known OK */
+		opcentry->numStrats = numStrats;
+		opcentry->numSupport = numSupport;
+
+		if (numStrats > 0)
+			opcentry->operatorOids = (Oid *)
+				MemoryContextAllocZero(CacheMemoryContext,
+									   numStrats * sizeof(Oid));
+		else
+			opcentry->operatorOids = NULL;
+
+		if (numSupport > 0)
+			opcentry->supportProcs = (RegProcedure *)
+				MemoryContextAllocZero(CacheMemoryContext,
+									   numSupport * sizeof(RegProcedure));
+		else
+			opcentry->supportProcs = NULL;
+	}
+	else
 	{
-		/* Already made an entry for it */
 		Assert(numStrats == opcentry->numStrats);
 		Assert(numSupport == opcentry->numSupport);
-		return opcentry;
 	}
 
-	/* Need to fill in new entry */
-	opcentry->valid = false;	/* until known OK */
-	opcentry->numStrats = numStrats;
-	opcentry->numSupport = numSupport;
-
-	if (numStrats > 0)
-		opcentry->operatorOids = (Oid *)
-			MemoryContextAllocZero(CacheMemoryContext,
-								   numStrats * sizeof(Oid));
-	else
-		opcentry->operatorOids = NULL;
+	/*
+	 * When testing for cache-flush hazards, we intentionally disable the
+	 * operator class cache and force reloading of the info on each call.
+	 * This is helpful because we want to test the case where a cache flush
+	 * occurs while we are loading the info, and it's very hard to provoke
+	 * that if this happens only once per opclass per backend.
+	 */
+#if defined(CLOBBER_CACHE_ALWAYS)
+	opcentry->valid = false;
+#endif
 
-	if (numSupport > 0)
-		opcentry->supportProcs = (RegProcedure *)
-			MemoryContextAllocZero(CacheMemoryContext,
-								   numSupport * sizeof(RegProcedure));
-	else
-		opcentry->supportProcs = NULL;
+	if (opcentry->valid)
+		return opcentry;
 
 	/*
+	 * Need to fill in new entry.
+	 *
 	 * To avoid infinite recursion during startup, force heap scans if we're
 	 * looking up info for the opclasses used by the indexes we would like to
 	 * reference here.
@@ -1852,10 +1873,10 @@ formrdesc(const char *relationName, Oid relationReltype,
 	 * initialize relation tuple form
 	 *
 	 * The data we insert here is pretty incomplete/bogus, but it'll serve to
-	 * get us launched.  RelationCacheInitializePhase3() will read the real
-	 * data from pg_class and replace what we've done here.  Note in
-	 * particular that relowner is left as zero; this cues
-	 * RelationCacheInitializePhase3 that the real data isn't there yet.
+	 * get us launched.  RelationCacheInitializePhase2() will read the real
+	 * data from pg_class and replace what we've done here.  Note in particular
+	 * that relowner is left as zero; this cues RelationCacheInitializePhase2
+	 * that the real data isn't there yet.
 	 */
 	relation->rd_rel = (Form_pg_class) palloc0(CLASS_TUPLE_SIZE);
 
@@ -2006,11 +2027,10 @@ RelationIdGetRelation(Oid relationId)
 			 * a headache for indexes that reload itself depends on.
 			 */
 			if (rd->rd_rel->relkind == RELKIND_INDEX)
-				RelationReloadClassinfo(rd);
+				RelationReloadIndexInfo(rd);
 			else
 				RelationClearRelation(rd, true);
-		 }
-
+		}
 		return rd;
 	}
 
@@ -2095,17 +2115,17 @@ RelationClose(Relation relation)
 }
 
 /*
- * RelationReloadClassinfo - reload the pg_class row (only)
+ * RelationReloadIndexInfo - reload minimal information for an open index
  *
- *	This function is used only for indexes.  We currently allow only the
- *	pg_class row of an existing index to change (to support changes of
- *	owner, tablespace, or relfilenode), not its pg_index row or other
- *	subsidiary index schema information.  Therefore it's sufficient to do
- *	this when we get an SI invalidation.  Furthermore, there are cases
- *	where it's necessary not to throw away the index information, especially
- *	for "nailed" indexes which we are unable to rebuild on-the-fly.
+ *	This function is used only for indexes.  A relcache inval on an index
+ *	can mean that its pg_class or pg_index row changed.  There are only
+ *	very limited changes that are allowed to an existing index's schema,
+ *	so we can update the relcache entry without a complete rebuild; which
+ *	is fortunate because we can't rebuild an index entry that is "nailed"
+ *	and/or in active use.  We support full replacement of the pg_class row,
+ *	as well as updates of a few simple fields of the pg_index row.
  *
- *	We can't necessarily reread the pg_class row right away; we might be
+ *	We can't necessarily reread the catalog rows right away; we might be
  *	in a failed transaction when we receive the SI notification.  If so,
  *	RelationClearRelation just marks the entry as invalid by setting
  *	rd_isvalid to false.  This routine is called to fix the entry when it
@@ -2114,9 +2134,15 @@ RelationClose(Relation relation)
  *	We assume that at the time we are called, we have at least AccessShareLock
  *	on the target index.  (Note: in the calls from RelationClearRelation,
  *	this is legitimate because we know the rel has positive refcount.)
+ *
+ *	If the target index is an index on pg_class or pg_index, we'd better have
+ *	previously gotten at least AccessShareLock on its underlying catalog,
+ *	else we are at risk of deadlock against someone trying to exclusive-lock
+ *	the heap and index in that order.  This is ensured in current usage by
+ *	only applying this to indexes being opened or having positive refcount.
  */
 static void
-RelationReloadClassinfo(Relation relation)
+RelationReloadIndexInfo(Relation relation)
 {
 	bool		indexOK;
 	HeapTuple	pg_class_tuple;
@@ -2134,6 +2160,7 @@ RelationReloadClassinfo(Relation relation)
 	if (relation->rd_amcache)
 		pfree(relation->rd_amcache);
 	relation->rd_amcache = NULL;
+
 	/*
 	 * If it's a shared index, we might be called before backend startup has
 	 * finished selecting a database, in which case we have no way to read
@@ -2172,6 +2199,46 @@ RelationReloadClassinfo(Relation relation)
 	/* Forget gp_relation_node information -- it may have changed. */
 	MemSet(&relation->rd_segfile0_relationnodeinfo, 0, sizeof(RelationNodeInfo));
 
+	/*
+	 * For a non-system index, there are fields of the pg_index row that are
+	 * allowed to change, so re-read that row and update the relcache entry.
+	 * Most of the info derived from pg_index (such as support function lookup
+	 * info) cannot change, and indeed the whole point of this routine is to
+	 * update the relcache entry without clobbering that data; so wholesale
+	 * replacement is not appropriate.
+	 */
+	if (!IsSystemRelation(relation))
+	{
+		HeapTuple	tuple;
+		Form_pg_index index;
+
+		tuple = SearchSysCache(INDEXRELID,
+							   ObjectIdGetDatum(RelationGetRelid(relation)),
+							   0, 0, 0);
+		if (!HeapTupleIsValid(tuple))
+			elog(ERROR, "cache lookup failed for index %u",
+				 RelationGetRelid(relation));
+		index = (Form_pg_index) GETSTRUCT(tuple);
+
+		/*
+		 * Basically, let's just copy all the bool fields.  There are one or
+		 * two of these that can't actually change in the current code, but
+		 * it's not worth it to track exactly which ones they are.  None of
+		 * the array fields are allowed to change, though.
+		 */
+		relation->rd_index->indisunique = index->indisunique;
+		relation->rd_index->indisprimary = index->indisprimary;
+		relation->rd_index->indisclustered = index->indisclustered;
+		relation->rd_index->indisvalid = index->indisvalid;
+		relation->rd_index->indcheckxmin = index->indcheckxmin;
+		relation->rd_index->indisready = index->indisready;
+
+		/* Copy xmin too, as that is needed to make sense of indcheckxmin */
+		HeapTupleHeaderSetXmin(relation->rd_indextuple->t_data,
+							   HeapTupleHeaderGetXmin(tuple->t_data));
+
+		ReleaseSysCache(tuple);
+	}
 
 	/* Okay, now it's valid again */
 	relation->rd_isvalid = true;
@@ -2206,6 +2273,7 @@ RelationDestroyRelation(Relation relation)
 	if (--relation->rd_att->tdrefcount == 0)
 		FreeTupleDesc(relation->rd_att);
 	list_free(relation->rd_indexlist);
+	bms_free(relation->rd_indexattr);
 	FreeTriggerDesc(relation->trigdesc);
 	if (relation->rd_options)
 		pfree(relation->rd_options);
@@ -2228,17 +2296,30 @@ RelationDestroyRelation(Relation relation)
  *
  *	 Physically blow away a relation cache entry, or reset it and rebuild
  *	 it from scratch (that is, from catalog entries).  The latter path is
- *	 usually used when we are notified of a change to an open relation
- *	 (one with refcount > 0).  However, this routine just does whichever
- *	 it's told to do; callers must determine which they want.
+ *	 used when we are notified of a change to an open relation (one with
+ *	 refcount > 0).
  *
- *	 NB: when rebuilding, we'd better hold some lock on the relation.
- *	 In current usages this is presumed true because it has refcnt > 0.
+ *	 NB: when rebuilding, we'd better hold some lock on the relation,
+ *	 else the catalog data we need to read could be changing under us.
+ *	 Also, a rel to be rebuilt had better have refcnt > 0.  This is because
+ *	 an sinval reset could happen while we're accessing the catalogs, and
+ *	 the rel would get blown away underneath us by RelationCacheInvalidate
+ *	 if it has zero refcnt.
+ *
+ *	 The "rebuild" parameter is redundant in current usage because it has
+ *	 to match the relation's refcnt status, but we keep it as a crosscheck
+ *	 that we're doing what the caller expects.
  */
 static void
 RelationClearRelation(Relation relation, bool rebuild)
 {
-	Oid			old_reltype = relation->rd_rel->reltype;
+	/*
+	 * As per notes above, a rel to be rebuilt MUST have refcnt > 0; while
+	 * of course it would be a bad idea to blow away one with nonzero refcnt.
+	 */
+	Assert(rebuild ?
+		   !RelationHasReferenceCountZero(relation) :
+		   RelationHasReferenceCountZero(relation));
 
 	/*
 	 * Make sure smgr and lower levels close the relation's files, if they
@@ -2269,7 +2350,7 @@ RelationClearRelation(Relation relation, bool rebuild)
 		{
 			relation->rd_isvalid = false;		/* needs to be revalidated */
 			if (relation->rd_refcnt > 1)
-				RelationReloadClassinfo(relation);
+				RelationReloadIndexInfo(relation);
 		}
 		return;
 	}
@@ -2279,14 +2360,14 @@ RelationClearRelation(Relation relation, bool rebuild)
 	 * have valid index support information.  This avoids problems with active
 	 * use of the index support information.  As with nailed indexes, we
 	 * re-read the pg_class row to handle possible physical relocation of the
-	 * index.
+	 * index, and we check for pg_index updates too.
 	 */
 	if (relation->rd_rel->relkind == RELKIND_INDEX &&
 		relation->rd_refcnt > 0 &&
 		relation->rd_indexcxt != NULL)
 	{
 		relation->rd_isvalid = false;	/* needs to be revalidated */
-		RelationReloadClassinfo(relation);
+		RelationReloadIndexInfo(relation);
 		return;
 	}
 
@@ -2301,9 +2382,6 @@ RelationClearRelation(Relation relation, bool rebuild)
 	 */
 	if (!rebuild)
 	{
-		/* Flush any rowtype cache entry */
-		flush_rowtype_cache(old_reltype);
-
 		/* Remove it from the hash table */
 		RelationCacheDelete(relation);
 
@@ -2351,7 +2429,6 @@ RelationClearRelation(Relation relation, bool rebuild)
 		if (newrel == NULL)
  		{
  			/* Should only get here if relation was deleted */
- 			flush_rowtype_cache(old_reltype);
 			RelationCacheDelete(relation);
 			RelationDestroyRelation(relation);
  			elog(ERROR, "relation %u deleted while still in use", save_relid);
@@ -2359,8 +2436,6 @@ RelationClearRelation(Relation relation, bool rebuild)
  
 		keep_tupdesc = equalTupleDescs(relation->rd_att, newrel->rd_att, true);
 		keep_rules = equalRuleLocks(relation->rd_rules, newrel->rd_rules);
-		if (!keep_tupdesc)
- 			flush_rowtype_cache(old_reltype);
 
 		/*
 		 * Perform swapping of the relcache entry contents.  Within this
@@ -2386,7 +2461,7 @@ RelationClearRelation(Relation relation, bool rebuild)
 			memcpy(&tmpstruct, newrel, sizeof(RelationData));
 			memcpy(newrel, relation, sizeof(RelationData));
 			memcpy(relation, &tmpstruct, sizeof(RelationData));
- 		}
+		}
 
 		/* rd_smgr must not be swapped, due to back-links from smgr level */
 		SWAPFIELD(SMgrRelation, rd_smgr);
@@ -2396,6 +2471,7 @@ RelationClearRelation(Relation relation, bool rebuild)
 		Assert(newrel->rd_isnailed == relation->rd_isnailed);
 		/* creation sub-XIDs must be preserved */
 		SWAPFIELD(SubTransactionId, rd_createSubid);
+		SWAPFIELD(SubTransactionId, rd_newRelfilenodeSubid);
 		/* un-swap rd_rel pointers, swap contents instead */
 		SWAPFIELD(Form_pg_class, rd_rel);
 		/* ... but actually, we don't have to update newrel->rd_rel */
@@ -2429,8 +2505,6 @@ RelationClearRelation(Relation relation, bool rebuild)
 static void
 RelationFlushRelation(Relation relation)
 {
-	bool		rebuild;
-
 	if (relation->rd_createSubid != InvalidSubTransactionId ||
 		relation->rd_newRelfilenodeSubid != InvalidSubTransactionId)
 	{
@@ -2438,18 +2512,24 @@ RelationFlushRelation(Relation relation)
 		 * New relcache entries are always rebuilt, not flushed; else we'd
 		 * forget the "new" status of the relation, which is a useful
 		 * optimization to have.  Ditto for the new-relfilenode status.
+		 *
+		 * The rel could have zero refcnt here, so temporarily increment
+		 * the refcnt to ensure it's safe to rebuild it.  We can assume that
+		 * the current transaction has some lock on the rel already.
 		 */
-		rebuild = true;
+		RelationIncrementReferenceCount(relation);
+		RelationClearRelation(relation, true);
+		RelationDecrementReferenceCount(relation);
 	}
 	else
 	{
 		/*
 		 * Pre-existing rels can be dropped from the relcache if not open.
 		 */
-		rebuild = !RelationHasReferenceCountZero(relation);
-	}
+		bool	rebuild = !RelationHasReferenceCountZero(relation);
 
-	RelationClearRelation(relation, rebuild);
+		RelationClearRelation(relation, rebuild);
+	}
 }
 
 /*
@@ -2517,10 +2597,6 @@ RelationCacheInvalidateEntry(Oid relationId)
  *	 Likewise, we need not discard new-relfilenode-in-transaction hints,
  *	 since any invalidation of those would be a local event.
  *
- *	 We don't do anything special for newRelfilenode-in-transaction relations, 
- *	 though since we have a lock on the relation nobody else should be 
- *	 generating cache invalidation messages for it anyhow.
- *
  *	 We do this in two phases: the first pass deletes deletable items, and
  *	 the second one rebuilds the rebuildable items.  This is essential for
  *	 safety, because hash_seq_search only copes with concurrent deletion of
@@ -2649,8 +2725,9 @@ AtEOXact_RelationCache(bool isCommit)
 	 * MPP-3333: READERS need to *always* scan, otherwise they will not be able
 	 * to maintain a coherent view of the storage layer.
 	 */
-	if (!need_eoxact_work &&
-		DistributedTransactionContext != DTX_CONTEXT_QE_READER
+	if (!need_eoxact_work
+		/* GPDB_83_MERGE_FIXME: disabled this special case, see FIXME comment below */
+		//&& DistributedTransactionContext != DTX_CONTEXT_QE_READER
 #ifdef USE_ASSERT_CHECKING
 		&& !assert_enabled
 #endif
@@ -2690,7 +2767,7 @@ AtEOXact_RelationCache(bool isCommit)
 		if (DistributedTransactionContext == DTX_CONTEXT_QE_ENTRY_DB_SINGLETON ||
 			DistributedTransactionContext == DTX_CONTEXT_QE_READER)
 		{
-			RelationClearRelation(relation, false);
+			RelationClearRelation(relation, relation->rd_isnailed ? true : false);
 			continue;
 		}
 
@@ -2787,28 +2864,43 @@ AtEOSubXact_RelationCache(bool isCommit, SubTransactionId mySubid,
 		{
 			if (isCommit)
 				relation->rd_createSubid = parentSubid;
-			else
+			else if (RelationHasReferenceCountZero(relation))
 			{
-				Assert(RelationHasReferenceCountZero(relation));
 				/*
 				 * In abort, delete the error log file before forgetting
 				 * this relation.
 				 */
 				ErrorLogDelete(MyDatabaseId, RelationGetRelid(relation));
+
 				RelationClearRelation(relation, false);
 				continue;
 			}
+			else
+			{
+				/*
+				 * Hmm, somewhere there's a (leaked?) reference to the
+				 * relation.  We daren't remove the entry for fear of
+				 * dereferencing a dangling pointer later.  Bleat, and mark it
+				 * as not belonging to the current transaction.  Hopefully
+				 * it'll get cleaned up eventually.  This must be just a
+				 * WARNING to avoid error-during-error-recovery loops.
+				 */
+				relation->rd_createSubid = InvalidSubTransactionId;
+				elog(WARNING, "cannot remove relcache entry for \"%s\" because it has nonzero refcount",
+					 RelationGetRelationName(relation));
+			}
 		}
 
 		/*
-		 * Likewise, update or drop any new-relfilenode-in-subtransaction hint.
+		 * Likewise, update or drop any new-relfilenode-in-subtransaction
+		 * hint.
 		 */
 		if (relation->rd_newRelfilenodeSubid == mySubid)
 		{
 			if (isCommit)
 				relation->rd_newRelfilenodeSubid = parentSubid;
 			else
-			 relation->rd_newRelfilenodeSubid = InvalidSubTransactionId;
+				relation->rd_newRelfilenodeSubid = InvalidSubTransactionId;
 		}
 
 		/*
@@ -2828,7 +2920,7 @@ AtEOSubXact_RelationCache(bool isCommit, SubTransactionId mySubid,
  * RelationCacheMarkNewRelfilenode
  *
  *	Mark the rel as having been given a new relfilenode in the current
- *	(sub) transaction.  This is a hint that can be used to optimize
+ *	(sub) transaction.	This is a hint that can be used to optimize
  *	later operations on the rel in the same transaction.
  */
 void
@@ -2927,7 +3019,7 @@ RelationBuildLocalRelation(const char *relname,
 	need_eoxact_work = true;
 
 	/* is it a temporary relation? */
-	rel->rd_istemp = isTempNamespace(relnamespace);
+	rel->rd_istemp = isTempOrToastNamespace(relnamespace);
 
 	/* is it a system catalog? */
 	rel->rd_issyscat = (strncmp(relname, "pg_", 3) == 0);
@@ -3264,8 +3356,8 @@ RelationCacheInitializePhase3(void)
 	 * relcache entries have rules or triggers, load that info the hard way
 	 * since it isn't recorded in the cache file.
 	 *
-	 * Whenever we access the catalogs to read data, there is a possibility of
-	 * a shared-inval cache flush causing relcache entries to be removed.
+	 * Whenever we access the catalogs to read data, there is a possibility
+	 * of a shared-inval cache flush causing relcache entries to be removed.
 	 * Since hash_seq_search only guarantees to still work after the *current*
 	 * entry is removed, it's unsafe to continue the hashtable scan afterward.
 	 * We handle this by restarting the scan from scratch after each access.
@@ -3313,9 +3405,9 @@ RelationCacheInitializePhase3(void)
 
 			/*
 			 * Check the values in rd_att were set up correctly.  (We cannot
-			 * just copy them over now: formrdesc must have set up the rd_att
-			 * data correctly to start with, because it may already have been
-			 * copied into one or more catcache entries.)
+			 * just copy them over now: formrdesc must have set up the
+			 * rd_att data correctly to start with, because it may already
+			 * have been copied into one or more catcache entries.)
 			 */
 			Assert(relation->rd_att->tdtypeid == relp->reltype);
 			Assert(relation->rd_att->tdtypmod == -1);
@@ -3709,7 +3801,8 @@ RelationGetIndexList(Relation relation)
 		result = insert_ordered_oid(result, index->indexrelid);
 
 		/* Check to see if it is a unique, non-partial btree index on OID */
-		if (index->indnatts == 1 &&
+		if (IndexIsValid(index) &&
+			index->indnatts == 1 &&
 			index->indisunique &&
 			index->indkey.values[0] == ObjectIdAttributeNumber &&
 			index->indclass.values[0] == OID_BTREE_OPS_OID &&
@@ -3775,6 +3868,13 @@ insert_ordered_oid(List *list, Oid datum)
  * messages.  In practice it is only used on pg_class (see REINDEX).
  *
  * It is up to the caller to make sure the given list is correctly ordered.
+ *
+ * We deliberately do not change rd_indexattr here: even when operating
+ * with a temporary partial index list, HOT-update decisions must be made
+ * correctly with respect to the full index set.  It is up to the caller
+ * to ensure that a correct rd_indexattr set has been cached before first
+ * calling RelationSetIndexList; else a subsequent inquiry might cause a
+ * wrong rd_indexattr set to get computed and cached.
  */
 void
 RelationSetIndexList(Relation relation, List *indexIds, Oid oidIndex)
@@ -3882,7 +3982,7 @@ RelationGetIndexExpressions(Relation relation)
 	fix_opfuncids((Node *) result);
 
 	/* Now save a copy of the completed tree in the relcache entry. */
-	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+	oldcxt = MemoryContextSwitchTo(relation->rd_indexcxt);
 	relation->rd_indexprs = (List *) copyObject(result);
 	MemoryContextSwitchTo(oldcxt);
 
@@ -3957,13 +4057,107 @@ RelationGetIndexPredicate(Relation relation)
 	fix_opfuncids((Node *) result);
 
 	/* Now save a copy of the completed tree in the relcache entry. */
-	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+	oldcxt = MemoryContextSwitchTo(relation->rd_indexcxt);
 	relation->rd_indpred = (List *) copyObject(result);
 	MemoryContextSwitchTo(oldcxt);
 
 	return result;
 }
 
+/*
+ * RelationGetIndexAttrBitmap -- get a bitmap of index attribute numbers
+ *
+ * The result has a bit set for each attribute used anywhere in the index
+ * definitions of all the indexes on this relation.  (This includes not only
+ * simple index keys, but attributes used in expressions and partial-index
+ * predicates.)
+ *
+ * Attribute numbers are offset by FirstLowInvalidHeapAttributeNumber so that
+ * we can include system attributes (e.g., OID) in the bitmap representation.
+ *
+ * Caller had better hold at least RowExclusiveLock on the target relation
+ * to ensure that it has a stable set of indexes.  This also makes it safe
+ * (deadlock-free) for us to take locks on the relation's indexes.
+ *
+ * The returned result is palloc'd in the caller's memory context and should
+ * be bms_free'd when not needed anymore.
+ */
+Bitmapset *
+RelationGetIndexAttrBitmap(Relation relation)
+{
+	Bitmapset  *indexattrs;
+	List	   *indexoidlist;
+	ListCell   *l;
+	MemoryContext oldcxt;
+
+	/* Quick exit if we already computed the result. */
+	if (relation->rd_indexattr != NULL)
+		return bms_copy(relation->rd_indexattr);
+
+	/* Fast path if definitely no indexes */
+	if (!RelationGetForm(relation)->relhasindex)
+		return NULL;
+
+	/*
+	 * Get cached list of index OIDs
+	 */
+	indexoidlist = RelationGetIndexList(relation);
+
+	/* Fall out if no indexes (but relhasindex was set) */
+	if (indexoidlist == NIL)
+		return NULL;
+
+	/*
+	 * For each index, add referenced attributes to indexattrs.
+	 *
+	 * Note: we consider all indexes returned by RelationGetIndexList, even if
+	 * they are not indisready or indisvalid.  This is important because an
+	 * index for which CREATE INDEX CONCURRENTLY has just started must be
+	 * included in HOT-safety decisions (see README.HOT).
+	 */
+	indexattrs = NULL;
+	foreach(l, indexoidlist)
+	{
+		Oid			indexOid = lfirst_oid(l);
+		Relation	indexDesc;
+		IndexInfo  *indexInfo;
+		int			i;
+
+		indexDesc = index_open(indexOid, AccessShareLock);
+
+		/* Extract index key information from the index's pg_index row */
+		indexInfo = BuildIndexInfo(indexDesc);
+
+		/* Collect simple attribute references */
+		for (i = 0; i < indexInfo->ii_NumIndexAttrs; i++)
+		{
+			int			attrnum = indexInfo->ii_KeyAttrNumbers[i];
+
+			if (attrnum != 0)
+				indexattrs = bms_add_member(indexattrs,
+							   attrnum - FirstLowInvalidHeapAttributeNumber);
+		}
+
+		/* Collect all attributes used in expressions, too */
+		pull_varattnos((Node *) indexInfo->ii_Expressions, &indexattrs);
+
+		/* Collect all attributes in the index predicate, too */
+		pull_varattnos((Node *) indexInfo->ii_Predicate, &indexattrs);
+
+		index_close(indexDesc, AccessShareLock);
+	}
+
+	list_free(indexoidlist);
+
+	/* Now save a copy of the bitmap in the relcache entry. */
+	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+	relation->rd_indexattr = bms_copy(indexattrs);
+	MemoryContextSwitchTo(oldcxt);
+
+	/* We return our original working copy for caller to play with */
+	return indexattrs;
+}
+
 
 /*
  *	load_relcache_init_file, write_relcache_init_file
@@ -4293,6 +4487,7 @@ load_relcache_init_file(bool shared)
 			rel->rd_refcnt = 0;
 		rel->rd_indexvalid = 0;
 		rel->rd_indexlist = NIL;
+		rel->rd_indexattr = NULL;
 		rel->rd_oidindex = InvalidOid;
 		rel->rd_createSubid = InvalidSubTransactionId;
 		rel->rd_newRelfilenodeSubid = InvalidSubTransactionId;
@@ -4519,8 +4714,8 @@ write_relcache_init_file(bool shared)
 	 * updated by SI message processing, but we can't be sure whether what we
 	 * wrote out was up-to-date.)
 	 *
-	 * This mustn't run concurrently with RelationCacheInitFileInvalidate, so
-	 * grab a serialization lock for the duration.
+	 * This mustn't run concurrently with the code that unlinks an init file
+	 * and sends SI messages, so grab a serialization lock for the duration.
 	 */
 	LWLockAcquire(RelCacheInitLock, LW_EXCLUSIVE);
 
@@ -4584,19 +4779,22 @@ RelationIdIsInInitFile(Oid relationId)
  * changed one or more of the relation cache entries that are kept in the
  * local init file.
  *
- * We actually need to remove the init file twice: once just before sending
- * the SI messages that include relcache inval for such relations, and once
- * just after sending them.  The unlink before ensures that a backend that's
- * currently starting cannot read the now-obsolete init file and then miss
- * the SI messages that will force it to update its relcache entries.  (This
- * works because the backend startup sequence gets into the PGPROC array before
- * trying to load the init file.)  The unlink after is to synchronize with a
- * backend that may currently be trying to write an init file based on data
- * that we've just rendered invalid.  Such a backend will see the SI messages,
- * but we can't leave the init file sitting around to fool later backends.
+ * To be safe against concurrent inspection or rewriting of the init file,
+ * we must take RelCacheInitLock, then remove the old init file, then send
+ * the SI messages that include relcache inval for such relations, and then
+ * release RelCacheInitLock.  This serializes the whole affair against
+ * write_relcache_init_file, so that we can be sure that any other process
+ * that's concurrently trying to create a new init file won't move an
+ * already-stale version into place after we unlink.  Also, because we unlink
+ * before sending the SI messages, a backend that's currently starting cannot
+ * read the now-obsolete init file and then miss the SI messages that will
+ * force it to update its relcache entries.  (This works because the backend
+ * startup sequence gets into the sinval array before trying to load the init
+ * file.)
  *
- * Ignore any failure to unlink the file, since it might not be there if
- * no backend has been started since the last removal.
+ * We take the lock and do the unlink in RelationCacheInitFilePreInvalidate,
+ * then release the lock in RelationCacheInitFilePostInvalidate.  Caller must
+ * send any pending SI messages between those calls.
  *
  * Notice this deals only with the local init file, not the shared init file.
  * The reason is that there can never be a "significant" change to the
@@ -4606,34 +4804,37 @@ RelationIdIsInInitFile(Oid relationId)
  * be invalid enough to make it necessary to remove it.
  */
 void
-RelationCacheInitFileInvalidate(bool beforeSend)
+RelationCacheInitFilePreInvalidate(void)
 {
 	char		initfilename[MAXPGPATH];
 
 	snprintf(initfilename, sizeof(initfilename), "%s/%s",
 			 DatabasePath, RELCACHE_INIT_FILENAME);
 
-	if (beforeSend)
-	{
-		/* no interlock needed here */
-		unlink(initfilename);
-	}
-	else
+	LWLockAcquire(RelCacheInitLock, LW_EXCLUSIVE);
+
+	if (unlink(initfilename) < 0)
 	{
 		/*
-		 * We need to interlock this against write_relcache_init_file, to
-		 * guard against possibility that someone renames a new-but-
-		 * already-obsolete init file into place just after we unlink. With
-		 * the interlock, it's certain that write_relcache_init_file will
-		 * notice our SI inval message before renaming into place, or else
-		 * that we will execute second and successfully unlink the file.
+		 * The file might not be there if no backend has been started since
+		 * the last removal.  But complain about failures other than ENOENT.
+		 * Fortunately, it's not too late to abort the transaction if we
+		 * can't get rid of the would-be-obsolete init file.
 		 */
-		LWLockAcquire(RelCacheInitLock, LW_EXCLUSIVE);
-		unlink(initfilename);
-		LWLockRelease(RelCacheInitLock);
+		if (errno != ENOENT)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not remove cache file \"%s\": %m",
+							initfilename)));
 	}
 }
 
+void
+RelationCacheInitFilePostInvalidate(void)
+{
+	LWLockRelease(RelCacheInitLock);
+}
+
 /*
  * Remove the init files during postmaster startup.
  *
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 3baef88d390a..895dc0e9233b 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.111 2007/02/14 01:58:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.114 2008/01/01 19:45:53 momjian Exp $
  *
  * NOTES
  *	  These routines allow the parser/planner/executor to perform
@@ -35,6 +35,7 @@
 #include "catalog/pg_constraint.h"
 #include "catalog/pg_conversion.h"
 #include "catalog/pg_database.h"
+#include "catalog/pg_enum.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
@@ -45,6 +46,11 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_rewrite.h"
 #include "catalog/pg_statistic.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_config_map.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_window.h"
 #include "catalog/pg_tidycat.h"
@@ -322,6 +328,28 @@ static const struct cachedesc cacheinfo[] = {
 		},
 		4
 	},
+	{EnumRelationId,			/* ENUMOID */
+		EnumOidIndexId,
+		1,
+		{
+			ObjectIdAttributeNumber,
+			0,
+			0,
+			0
+		},
+		256
+	},
+	{EnumRelationId,			/* ENUMTYPOIDNAME */
+		EnumTypIdLabelIndexId,
+		2,
+		{
+			Anum_pg_enum_enumtypid,
+			Anum_pg_enum_enumlabel,
+			0,
+			0
+		},
+		256
+	},
 	{IndexRelationId,					/* INDEXRELID */
 		IndexRelidIndexId,
 		1,
@@ -509,6 +537,105 @@ static const struct cachedesc cacheinfo[] = {
 		},
 		1024
 	},
+	{TSConfigMapRelationId,		/* TSCONFIGMAP */
+		TSConfigMapIndexId,
+		3,
+		{
+			Anum_pg_ts_config_map_mapcfg,
+			Anum_pg_ts_config_map_maptokentype,
+			Anum_pg_ts_config_map_mapseqno,
+			0
+		},
+		4
+	},
+	{TSConfigRelationId,		/* TSCONFIGNAMENSP */
+		TSConfigNameNspIndexId,
+		2,
+		{
+			Anum_pg_ts_config_cfgname,
+			Anum_pg_ts_config_cfgnamespace,
+			0,
+			0
+		},
+		16
+	},
+	{TSConfigRelationId,		/* TSCONFIGOID */
+		TSConfigOidIndexId,
+		1,
+		{
+			ObjectIdAttributeNumber,
+			0,
+			0,
+			0
+		},
+		16
+	},
+	{TSDictionaryRelationId,	/* TSDICTNAMENSP */
+		TSDictionaryNameNspIndexId,
+		2,
+		{
+			Anum_pg_ts_dict_dictname,
+			Anum_pg_ts_dict_dictnamespace,
+			0,
+			0
+		},
+		16
+	},
+	{TSDictionaryRelationId,	/* TSDICTOID */
+		TSDictionaryOidIndexId,
+		1,
+		{
+			ObjectIdAttributeNumber,
+			0,
+			0,
+			0
+		},
+		16
+	},
+	{TSParserRelationId,		/* TSPARSERNAMENSP */
+		TSParserNameNspIndexId,
+		2,
+		{
+			Anum_pg_ts_parser_prsname,
+			Anum_pg_ts_parser_prsnamespace,
+			0,
+			0
+		},
+		4
+	},
+	{TSParserRelationId,		/* TSPARSEROID */
+		TSParserOidIndexId,
+		1,
+		{
+			ObjectIdAttributeNumber,
+			0,
+			0,
+			0
+		},
+		4
+	},
+	{TSTemplateRelationId,		/* TSTEMPLATENAMENSP */
+		TSTemplateNameNspIndexId,
+		2,
+		{
+			Anum_pg_ts_template_tmplname,
+			Anum_pg_ts_template_tmplnamespace,
+			0,
+			0
+		},
+		16
+	},
+	{TSTemplateRelationId,		/* TSTEMPLATEOID */
+		TSTemplateOidIndexId,
+		1,
+		{
+			ObjectIdAttributeNumber,
+			0,
+			0,
+			0
+		},
+		16
+	},
 	{TypeRelationId,					/* TYPENAMENSP */
 		TypeNameNspIndexId,
 		2,
diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
new file mode 100644
index 000000000000..918d2266e831
--- /dev/null
+++ b/src/backend/utils/cache/ts_cache.c
@@ -0,0 +1,661 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_cache.c
+ *	  Tsearch related object caches.
+ *
+ * Tsearch performance is very sensitive to performance of parsers,
+ * dictionaries and mapping, so lookups should be cached as much
+ * as possible.
+ *
+ * Once a backend has created a cache entry for a particular TS object OID,
+ * the cache entry will exist for the life of the backend; hence it is
+ * safe to hold onto a pointer to the cache entry while doing things that
+ * might result in recognizing a cache invalidation.  Beware however that
+ * subsidiary information might be deleted and reallocated somewhere else
+ * if a cache inval and reval happens!	This does not look like it will be
+ * a big problem as long as parser and dictionary methods do not attempt
+ * any database access.
+ *
+ *
+ * Copyright (c) 2006-2008, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/ts_cache.c,v 1.5 2008/01/01 19:45:53 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/xact.h"
+#include "catalog/indexing.h"
+#include "catalog/namespace.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_config_map.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
+#include "catalog/pg_type.h"
+#include "commands/defrem.h"
+#include "miscadmin.h"
+#include "tsearch/ts_cache.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
+#include "utils/catcache.h"
+#include "utils/fmgroids.h"
+#include "utils/inval.h"
+#include "utils/lsyscache.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
+
+
+/*
+ * MAXTOKENTYPE/MAXDICTSPERTT are arbitrary limits on the workspace size
+ * used in lookup_ts_config_cache().  We could avoid hardwiring a limit
+ * by making the workspace dynamically enlargeable, but it seems unlikely
+ * to be worth the trouble.
+ */
+#define MAXTOKENTYPE	256
+#define MAXDICTSPERTT	100
+
+
+static HTAB *TSParserCacheHash = NULL;
+static TSParserCacheEntry *lastUsedParser = NULL;
+
+static HTAB *TSDictionaryCacheHash = NULL;
+static TSDictionaryCacheEntry *lastUsedDictionary = NULL;
+
+static HTAB *TSConfigCacheHash = NULL;
+static TSConfigCacheEntry *lastUsedConfig = NULL;
+
+/*
+ * GUC default_text_search_config, and a cache of the current config's OID
+ */
+char	   *TSCurrentConfig = NULL;
+
+static Oid	TSCurrentConfigCache = InvalidOid;
+
+
+/*
+ * We use this syscache callback to detect when a visible change to a TS
+ * catalog entry has been made, by either our own backend or another one.
+ *
+ * In principle we could just flush the specific cache entry that changed,
+ * but given that TS configuration changes are probably infrequent, it
+ * doesn't seem worth the trouble to determine that; we just flush all the
+ * entries of the related hash table.
+ *
+ * We can use the same function for all TS caches by passing the hash
+ * table address as the "arg".
+ */
+static void
+InvalidateTSCacheCallBack(Datum arg, int cacheid, ItemPointer tuplePtr)
+{
+	HTAB	   *hash = (HTAB *) DatumGetPointer(arg);
+	HASH_SEQ_STATUS status;
+	TSAnyCacheEntry *entry;
+
+	hash_seq_init(&status, hash);
+	while ((entry = (TSAnyCacheEntry *) hash_seq_search(&status)) != NULL)
+		entry->isvalid = false;
+
+	/* Also invalidate the current-config cache if it's pg_ts_config */
+	if (hash == TSConfigCacheHash)
+		TSCurrentConfigCache = InvalidOid;
+}
+
+/*
+ * Fetch parser cache entry
+ */
+TSParserCacheEntry *
+lookup_ts_parser_cache(Oid prsId)
+{
+	TSParserCacheEntry *entry;
+
+	if (TSParserCacheHash == NULL)
+	{
+		/* First time through: initialize the hash table */
+		HASHCTL		ctl;
+
+		if (!CacheMemoryContext)
+			CreateCacheMemoryContext();
+
+		MemSet(&ctl, 0, sizeof(ctl));
+		ctl.keysize = sizeof(Oid);
+		ctl.entrysize = sizeof(TSParserCacheEntry);
+		ctl.hash = oid_hash;
+		TSParserCacheHash = hash_create("Tsearch parser cache", 4,
+										&ctl, HASH_ELEM | HASH_FUNCTION);
+		/* Flush cache on pg_ts_parser changes */
+		CacheRegisterSyscacheCallback(TSPARSEROID, InvalidateTSCacheCallBack,
+									  PointerGetDatum(TSParserCacheHash));
+	}
+
+	/* Check single-entry cache */
+	if (lastUsedParser && lastUsedParser->prsId == prsId &&
+		lastUsedParser->isvalid)
+		return lastUsedParser;
+
+	/* Try to look up an existing entry */
+	entry = (TSParserCacheEntry *) hash_search(TSParserCacheHash,
+											   (void *) &prsId,
+											   HASH_FIND, NULL);
+	if (entry == NULL || !entry->isvalid)
+	{
+		/*
+		 * If we didn't find one, we want to make one. But first look up the
+		 * object to be sure the OID is real.
+		 */
+		HeapTuple	tp;
+		Form_pg_ts_parser prs;
+
+		tp = SearchSysCache(TSPARSEROID,
+							ObjectIdGetDatum(prsId),
+							0, 0, 0);
+		if (!HeapTupleIsValid(tp))
+			elog(ERROR, "cache lookup failed for text search parser %u",
+				 prsId);
+		prs = (Form_pg_ts_parser) GETSTRUCT(tp);
+
+		/*
+		 * Sanity checks
+		 */
+		if (!OidIsValid(prs->prsstart))
+			elog(ERROR, "text search parser %u has no prsstart method", prsId);
+		if (!OidIsValid(prs->prstoken))
+			elog(ERROR, "text search parser %u has no prstoken method", prsId);
+		if (!OidIsValid(prs->prsend))
+			elog(ERROR, "text search parser %u has no prsend method", prsId);
+
+		if (entry == NULL)
+		{
+			bool		found;
+
+			/* Now make the cache entry */
+			entry = (TSParserCacheEntry *)
+				hash_search(TSParserCacheHash,
+							(void *) &prsId,
+							HASH_ENTER, &found);
+			Assert(!found);		/* it wasn't there a moment ago */
+		}
+
+		MemSet(entry, 0, sizeof(TSParserCacheEntry));
+		entry->prsId = prsId;
+		entry->startOid = prs->prsstart;
+		entry->tokenOid = prs->prstoken;
+		entry->endOid = prs->prsend;
+		entry->headlineOid = prs->prsheadline;
+		entry->lextypeOid = prs->prslextype;
+
+		ReleaseSysCache(tp);
+
+		fmgr_info_cxt(entry->startOid, &entry->prsstart, CacheMemoryContext);
+		fmgr_info_cxt(entry->tokenOid, &entry->prstoken, CacheMemoryContext);
+		fmgr_info_cxt(entry->endOid, &entry->prsend, CacheMemoryContext);
+		if (OidIsValid(entry->headlineOid))
+			fmgr_info_cxt(entry->headlineOid, &entry->prsheadline,
+						  CacheMemoryContext);
+
+		entry->isvalid = true;
+	}
+
+	lastUsedParser = entry;
+
+	return entry;
+}
+
+/*
+ * Fetch dictionary cache entry
+ */
+TSDictionaryCacheEntry *
+lookup_ts_dictionary_cache(Oid dictId)
+{
+	TSDictionaryCacheEntry *entry;
+
+	if (TSDictionaryCacheHash == NULL)
+	{
+		/* First time through: initialize the hash table */
+		HASHCTL		ctl;
+
+		if (!CacheMemoryContext)
+			CreateCacheMemoryContext();
+
+		MemSet(&ctl, 0, sizeof(ctl));
+		ctl.keysize = sizeof(Oid);
+		ctl.entrysize = sizeof(TSDictionaryCacheEntry);
+		ctl.hash = oid_hash;
+		TSDictionaryCacheHash = hash_create("Tsearch dictionary cache", 8,
+											&ctl, HASH_ELEM | HASH_FUNCTION);
+		/* Flush cache on pg_ts_dict and pg_ts_template changes */
+		CacheRegisterSyscacheCallback(TSDICTOID, InvalidateTSCacheCallBack,
+									  PointerGetDatum(TSDictionaryCacheHash));
+		CacheRegisterSyscacheCallback(TSTEMPLATEOID, InvalidateTSCacheCallBack,
+									  PointerGetDatum(TSDictionaryCacheHash));
+	}
+
+	/* Check single-entry cache */
+	if (lastUsedDictionary && lastUsedDictionary->dictId == dictId &&
+		lastUsedDictionary->isvalid)
+		return lastUsedDictionary;
+
+	/* Try to look up an existing entry */
+	entry = (TSDictionaryCacheEntry *) hash_search(TSDictionaryCacheHash,
+												   (void *) &dictId,
+												   HASH_FIND, NULL);
+	if (entry == NULL || !entry->isvalid)
+	{
+		/*
+		 * If we didn't find one, we want to make one. But first look up the
+		 * object to be sure the OID is real.
+		 */
+		HeapTuple	tpdict,
+					tptmpl;
+		Form_pg_ts_dict dict;
+		Form_pg_ts_template template;
+		MemoryContext saveCtx;
+
+		tpdict = SearchSysCache(TSDICTOID,
+								ObjectIdGetDatum(dictId),
+								0, 0, 0);
+		if (!HeapTupleIsValid(tpdict))
+			elog(ERROR, "cache lookup failed for text search dictionary %u",
+				 dictId);
+		dict = (Form_pg_ts_dict) GETSTRUCT(tpdict);
+
+		/*
+		 * Sanity checks
+		 */
+		if (!OidIsValid(dict->dicttemplate))
+			elog(ERROR, "text search dictionary %u has no template", dictId);
+
+		/*
+		 * Retrieve dictionary's template
+		 */
+		tptmpl = SearchSysCache(TSTEMPLATEOID,
+								ObjectIdGetDatum(dict->dicttemplate),
+								0, 0, 0);
+		if (!HeapTupleIsValid(tptmpl))
+			elog(ERROR, "cache lookup failed for text search template %u",
+				 dict->dicttemplate);
+		template = (Form_pg_ts_template) GETSTRUCT(tptmpl);
+
+		/*
+		 * Sanity checks
+		 */
+		if (!OidIsValid(template->tmpllexize))
+			elog(ERROR, "text search template %u has no lexize method",
+				 template->tmpllexize);
+
+		if (entry == NULL)
+		{
+			bool		found;
+
+			/* Now make the cache entry */
+			entry = (TSDictionaryCacheEntry *)
+				hash_search(TSDictionaryCacheHash,
+							(void *) &dictId,
+							HASH_ENTER, &found);
+			Assert(!found);		/* it wasn't there a moment ago */
+
+			/* Create private memory context the first time through */
+			saveCtx = AllocSetContextCreate(CacheMemoryContext,
+											NameStr(dict->dictname),
+											ALLOCSET_SMALL_MINSIZE,
+											ALLOCSET_SMALL_INITSIZE,
+											ALLOCSET_SMALL_MAXSIZE);
+		}
+		else
+		{
+			/* Clear the existing entry's private context */
+			saveCtx = entry->dictCtx;
+			MemoryContextResetAndDeleteChildren(saveCtx);
+		}
+
+		MemSet(entry, 0, sizeof(TSDictionaryCacheEntry));
+		entry->dictId = dictId;
+		entry->dictCtx = saveCtx;
+
+		entry->lexizeOid = template->tmpllexize;
+
+		if (OidIsValid(template->tmplinit))
+		{
+			List	   *dictoptions;
+			Datum		opt;
+			bool		isnull;
+			MemoryContext oldcontext;
+
+			/*
+			 * Init method runs in dictionary's private memory context, and we
+			 * make sure the options are stored there too
+			 */
+			oldcontext = MemoryContextSwitchTo(entry->dictCtx);
+
+			opt = SysCacheGetAttr(TSDICTOID, tpdict,
+								  Anum_pg_ts_dict_dictinitoption,
+								  &isnull);
+			if (isnull)
+				dictoptions = NIL;
+			else
+				dictoptions = deserialize_deflist(opt);
+
+			entry->dictData =
+				DatumGetPointer(OidFunctionCall1(template->tmplinit,
+											  PointerGetDatum(dictoptions)));
+
+			MemoryContextSwitchTo(oldcontext);
+		}
+
+		ReleaseSysCache(tptmpl);
+		ReleaseSysCache(tpdict);
+
+		fmgr_info_cxt(entry->lexizeOid, &entry->lexize, entry->dictCtx);
+
+		entry->isvalid = true;
+	}
+
+	lastUsedDictionary = entry;
+
+	return entry;
+}
+
+/*
+ * Initialize config cache and prepare callbacks.  This is split out of
+ * lookup_ts_config_cache because we need to activate the callback before
+ * caching TSCurrentConfigCache, too.
+ */
+static void
+init_ts_config_cache(void)
+{
+	HASHCTL		ctl;
+
+	if (!CacheMemoryContext)
+		CreateCacheMemoryContext();
+
+	MemSet(&ctl, 0, sizeof(ctl));
+	ctl.keysize = sizeof(Oid);
+	ctl.entrysize = sizeof(TSConfigCacheEntry);
+	ctl.hash = oid_hash;
+	TSConfigCacheHash = hash_create("Tsearch configuration cache", 16,
+									&ctl, HASH_ELEM | HASH_FUNCTION);
+	/* Flush cache on pg_ts_config and pg_ts_config_map changes */
+	CacheRegisterSyscacheCallback(TSCONFIGOID, InvalidateTSCacheCallBack,
+								  PointerGetDatum(TSConfigCacheHash));
+	CacheRegisterSyscacheCallback(TSCONFIGMAP, InvalidateTSCacheCallBack,
+								  PointerGetDatum(TSConfigCacheHash));
+}
+
+/*
+ * Fetch configuration cache entry
+ */
+TSConfigCacheEntry *
+lookup_ts_config_cache(Oid cfgId)
+{
+	TSConfigCacheEntry *entry;
+
+	if (TSConfigCacheHash == NULL)
+	{
+		/* First time through: initialize the hash table */
+		init_ts_config_cache();
+	}
+
+	/* Check single-entry cache */
+	if (lastUsedConfig && lastUsedConfig->cfgId == cfgId &&
+		lastUsedConfig->isvalid)
+		return lastUsedConfig;
+
+	/* Try to look up an existing entry */
+	entry = (TSConfigCacheEntry *) hash_search(TSConfigCacheHash,
+											   (void *) &cfgId,
+											   HASH_FIND, NULL);
+	if (entry == NULL || !entry->isvalid)
+	{
+		/*
+		 * If we didn't find one, we want to make one. But first look up the
+		 * object to be sure the OID is real.
+		 */
+		HeapTuple	tp;
+		Form_pg_ts_config cfg;
+		Relation	maprel;
+		Relation	mapidx;
+		ScanKeyData mapskey;
+		IndexScanDesc mapscan;
+		HeapTuple	maptup;
+		ListDictionary maplists[MAXTOKENTYPE + 1];
+		Oid			mapdicts[MAXDICTSPERTT];
+		int			maxtokentype;
+		int			ndicts;
+		int			i;
+
+		tp = SearchSysCache(TSCONFIGOID,
+							ObjectIdGetDatum(cfgId),
+							0, 0, 0);
+		if (!HeapTupleIsValid(tp))
+			elog(ERROR, "cache lookup failed for text search configuration %u",
+				 cfgId);
+		cfg = (Form_pg_ts_config) GETSTRUCT(tp);
+
+		/*
+		 * Sanity checks
+		 */
+		if (!OidIsValid(cfg->cfgparser))
+			elog(ERROR, "text search configuration %u has no parser", cfgId);
+
+		if (entry == NULL)
+		{
+			bool		found;
+
+			/* Now make the cache entry */
+			entry = (TSConfigCacheEntry *)
+				hash_search(TSConfigCacheHash,
+							(void *) &cfgId,
+							HASH_ENTER, &found);
+			Assert(!found);		/* it wasn't there a moment ago */
+		}
+		else
+		{
+			/* Cleanup old contents */
+			if (entry->map)
+			{
+				for (i = 0; i < entry->lenmap; i++)
+					if (entry->map[i].dictIds)
+						pfree(entry->map[i].dictIds);
+				pfree(entry->map);
+			}
+		}
+
+		MemSet(entry, 0, sizeof(TSConfigCacheEntry));
+		entry->cfgId = cfgId;
+		entry->prsId = cfg->cfgparser;
+
+		ReleaseSysCache(tp);
+
+		/*
+		 * Scan pg_ts_config_map to gather dictionary list for each token type
+		 *
+		 * Because the index is on (mapcfg, maptokentype, mapseqno), we will
+		 * see the entries in maptokentype order, and in mapseqno order for
+		 * each token type, even though we didn't explicitly ask for that.
+		 */
+		MemSet(maplists, 0, sizeof(maplists));
+		maxtokentype = 0;
+		ndicts = 0;
+
+		ScanKeyInit(&mapskey,
+					Anum_pg_ts_config_map_mapcfg,
+					BTEqualStrategyNumber, F_OIDEQ,
+					ObjectIdGetDatum(cfgId));
+
+		maprel = heap_open(TSConfigMapRelationId, AccessShareLock);
+		mapidx = index_open(TSConfigMapIndexId, AccessShareLock);
+		mapscan = index_beginscan(maprel, mapidx, SnapshotNow, 1, &mapskey);
+
+		while ((maptup = index_getnext(mapscan, ForwardScanDirection)) != NULL)
+		{
+			Form_pg_ts_config_map cfgmap = (Form_pg_ts_config_map) GETSTRUCT(maptup);
+			int			toktype = cfgmap->maptokentype;
+
+			if (toktype <= 0 || toktype > MAXTOKENTYPE)
+				elog(ERROR, "maptokentype value %d is out of range", toktype);
+			if (toktype < maxtokentype)
+				elog(ERROR, "maptokentype entries are out of order");
+			if (toktype > maxtokentype)
+			{
+				/* starting a new token type, but first save the prior data */
+				if (ndicts > 0)
+				{
+					maplists[maxtokentype].len = ndicts;
+					maplists[maxtokentype].dictIds = (Oid *)
+						MemoryContextAlloc(CacheMemoryContext,
+										   sizeof(Oid) * ndicts);
+					memcpy(maplists[maxtokentype].dictIds, mapdicts,
+						   sizeof(Oid) * ndicts);
+				}
+				maxtokentype = toktype;
+				mapdicts[0] = cfgmap->mapdict;
+				ndicts = 1;
+			}
+			else
+			{
+				/* continuing data for current token type */
+				if (ndicts >= MAXDICTSPERTT)
+					elog(ERROR, "too many pg_ts_config_map entries for one token type");
+				mapdicts[ndicts++] = cfgmap->mapdict;
+			}
+		}
+
+		index_endscan(mapscan);
+		index_close(mapidx, AccessShareLock);
+		heap_close(maprel, AccessShareLock);
+
+		if (ndicts > 0)
+		{
+			/* save the last token type's dictionaries */
+			maplists[maxtokentype].len = ndicts;
+			maplists[maxtokentype].dictIds = (Oid *)
+				MemoryContextAlloc(CacheMemoryContext,
+								   sizeof(Oid) * ndicts);
+			memcpy(maplists[maxtokentype].dictIds, mapdicts,
+				   sizeof(Oid) * ndicts);
+			/* and save the overall map */
+			entry->lenmap = maxtokentype + 1;
+			entry->map = (ListDictionary *)
+				MemoryContextAlloc(CacheMemoryContext,
+								   sizeof(ListDictionary) * entry->lenmap);
+			memcpy(entry->map, maplists,
+				   sizeof(ListDictionary) * entry->lenmap);
+		}
+
+		entry->isvalid = true;
+	}
+
+	lastUsedConfig = entry;
+
+	return entry;
+}
+
+
+/*---------------------------------------------------
+ * GUC variable "default_text_search_config"
+ *---------------------------------------------------
+ */
+
+Oid
+getTSCurrentConfig(bool emitError)
+{
+	/* if we have a cached value, return it */
+	if (OidIsValid(TSCurrentConfigCache))
+		return TSCurrentConfigCache;
+
+	/* fail if GUC hasn't been set up yet */
+	if (TSCurrentConfig == NULL || *TSCurrentConfig == '\0')
+	{
+		if (emitError)
+			elog(ERROR, "text search configuration isn't set");
+		else
+			return InvalidOid;
+	}
+
+	if (TSConfigCacheHash == NULL)
+	{
+		/* First time through: initialize the tsconfig inval callback */
+		init_ts_config_cache();
+	}
+
+	/* Look up the config */
+	TSCurrentConfigCache =
+		TSConfigGetCfgid(stringToQualifiedNameList(TSCurrentConfig),
+						 !emitError);
+
+	return TSCurrentConfigCache;
+}
+
+const char *
+assignTSCurrentConfig(const char *newval, bool doit, GucSource source)
+{
+	/*
+	 * If we aren't inside a transaction, we cannot do database access so
+	 * cannot verify the config name.  Must accept it on faith.
+	 */
+	if (IsTransactionState())
+	{
+		Oid			cfgId;
+		HeapTuple	tuple;
+		Form_pg_ts_config cfg;
+		char	   *buf;
+
+		cfgId = TSConfigGetCfgid(stringToQualifiedNameList(newval), true);
+
+		/*
+		 * When source == PGC_S_TEST, we are checking the argument of an
+		 * ALTER DATABASE SET or ALTER USER SET command.  It could be that
+		 * the intended use of the setting is for some other database, so
+		 * we should not error out if the text search configuration is not
+		 * present in the current database.  We issue a NOTICE instead.
+		 */
+		if (!OidIsValid(cfgId))
+		{
+			if (source == PGC_S_TEST && !doit)
+			{
+				ereport(NOTICE,
+						(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("text search configuration \"%s\" does not exist",
+								newval)));
+				return newval;
+			}
+			else
+				return NULL;
+		}
+
+		/*
+		 * Modify the actually stored value to be fully qualified, to ensure
+		 * later changes of search_path don't affect it.
+		 */
+		tuple = SearchSysCache(TSCONFIGOID,
+							   ObjectIdGetDatum(cfgId),
+							   0, 0, 0);
+		if (!HeapTupleIsValid(tuple))
+			elog(ERROR, "cache lookup failed for text search configuration %u",
+				 cfgId);
+		cfg = (Form_pg_ts_config) GETSTRUCT(tuple);
+
+		buf = quote_qualified_identifier(get_namespace_name(cfg->cfgnamespace),
+										 NameStr(cfg->cfgname));
+
+		ReleaseSysCache(tuple);
+
+		/* GUC wants it malloc'd not palloc'd */
+		newval = strdup(buf);
+		pfree(buf);
+
+		if (doit && newval)
+			TSCurrentConfigCache = cfgId;
+	}
+	else
+	{
+		if (doit)
+			TSCurrentConfigCache = InvalidOid;
+	}
+
+	return newval;
+}
diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c
index c504f632598b..24c41f996121 100644
--- a/src/backend/utils/cache/typcache.c
+++ b/src/backend/utils/cache/typcache.c
@@ -4,14 +4,14 @@
  *	  POSTGRES type cache code
  *
  * The type cache exists to speed lookup of certain information about data
- * types that is not directly available from a type's pg_type row.  In
- * particular, we use a type's default btree opclass, or the default hash
+ * types that is not directly available from a type's pg_type row.  For
+ * example, we use a type's default btree opclass, or the default hash
  * opclass if no btree opclass exists, to determine which operators should
  * be used for grouping and sorting the type (GROUP BY, ORDER BY ASC/DESC).
  *
  * Several seemingly-odd choices have been made to support use of the type
  * cache by the generic array comparison routines array_eq() and array_cmp().
- * Because these routines are used as index support operations, they cannot
+ * Because those routines are used as index support operations, they cannot
  * leak memory.  To allow them to execute efficiently, all information that
  * either of them would like to re-use across calls is made available in the
  * type cache.
@@ -36,7 +36,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.24 2007/01/05 22:19:43 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.27.2.1 2010/09/02 03:17:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,6 +49,7 @@
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "utils/builtins.h"
+#include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
@@ -87,6 +88,9 @@ static TupleDesc *RecordCacheArray = NULL;
 static int32 RecordCacheArrayLen = 0;	/* allocated length of array */
 static int32 NextRecordTypmod = 0;		/* number of entries used */
 
+static void TypeCacheRelCallback(Datum arg, Oid relid);
+
+
 /*
  * lookup_type_cache
  *
@@ -118,6 +122,9 @@ lookup_type_cache(Oid type_id, int flags)
 		ctl.hash = oid_hash;
 		TypeCacheHash = hash_create("Type information cache", 64,
 									&ctl, HASH_ELEM | HASH_FUNCTION);
+
+		/* Also set up a callback for relcache SI invalidations */
+		CacheRegisterRelcacheCallback(TypeCacheRelCallback, (Datum) 0);
 	}
 
 	/* Try to look up an existing entry */
@@ -176,7 +183,7 @@ lookup_type_cache(Oid type_id, int flags)
 				  TYPECACHE_BTREE_OPFAMILY)) &&
 		typentry->btree_opf == InvalidOid)
 	{
-		Oid		opclass;
+		Oid			opclass;
 
 		opclass = GetDefaultOpClass(type_id, BTREE_AM_OID);
 		if (OidIsValid(opclass))
@@ -282,7 +289,7 @@ lookup_type_cache(Oid type_id, int flags)
 	 */
 	if ((flags & TYPECACHE_TUPDESC) &&
 		typentry->tupDesc == NULL &&
-		typentry->typtype == 'c')
+		typentry->typtype == TYPTYPE_COMPOSITE)
 	{
 		Relation	rel;
 
@@ -517,38 +524,53 @@ assign_record_type_typmod(TupleDesc tupDesc)
 }
 
 /*
- * flush_rowtype_cache
+ * TypeCacheRelCallback
+ *		Relcache inval callback function
  *
- * If a typcache entry exists for a rowtype, delete the entry's cached
- * tuple descriptor link.  This is called from relcache.c when a cached
- * relation tupdesc is about to be dropped.
+ * Delete the cached tuple descriptor (if any) for the given rel's composite
+ * type, or for all composite types if relid == InvalidOid.
+ *
+ * This is called when a relcache invalidation event occurs for the given
+ * relid.  We must scan the whole typcache hash since we don't know the
+ * type OID corresponding to the relid.  We could do a direct search if this
+ * were a syscache-flush callback on pg_type, but then we would need all
+ * ALTER-TABLE-like commands that could modify a rowtype to issue syscache
+ * invals against the rel's pg_type OID.  The extra SI signaling could very
+ * well cost more than we'd save, since in most usages there are not very
+ * many entries in a backend's typcache.  The risk of bugs-of-omission seems
+ * high, too.
+ *
+ * Another possibility, with only localized impact, is to maintain a second
+ * hashtable that indexes composite-type typcache entries by their typrelid.
+ * But it's still not clear it's worth the trouble.
  */
-void
-flush_rowtype_cache(Oid type_id)
+static void
+TypeCacheRelCallback(Datum arg, Oid relid)
 {
+	HASH_SEQ_STATUS status;
 	TypeCacheEntry *typentry;
 
-	if (TypeCacheHash == NULL)
-		return;					/* no table, so certainly no entry */
-
-	typentry = (TypeCacheEntry *) hash_search(TypeCacheHash,
-											  (void *) &type_id,
-											  HASH_FIND, NULL);
-	if (typentry == NULL)
-		return;					/* no matching entry */
-	if (typentry->tupDesc == NULL)
-		return;					/* tupdesc hasn't been requested */
-
-	/*
-	 * Release our refcount and free the tupdesc if none remain. (Can't use
-	 * DecrTupleDescRefCount because this reference is not logged in current
-	 * resource owner.)
-	 */
-	Assert(typentry->tupDesc->tdrefcount > 0);
-	if (--typentry->tupDesc->tdrefcount == 0)
-		FreeTupleDesc(typentry->tupDesc);
+	/* TypeCacheHash must exist, else this callback wouldn't be registered */
+	hash_seq_init(&status, TypeCacheHash);
+	while ((typentry = (TypeCacheEntry *) hash_seq_search(&status)) != NULL)
+	{
+		if (typentry->tupDesc == NULL)
+			continue;	/* not composite, or tupdesc hasn't been requested */
 
-	typentry->tupDesc = NULL;
+		/* Delete if match, or if we're zapping all composite types */
+		if (relid == typentry->typrelid || relid == InvalidOid)
+		{
+			/*
+			 * Release our refcount, and free the tupdesc if none remain.
+			 * (Can't use DecrTupleDescRefCount because this reference is not
+			 * logged in current resource owner.)
+			 */
+			Assert(typentry->tupDesc->tdrefcount > 0);
+			if (--typentry->tupDesc->tdrefcount == 0)
+				FreeTupleDesc(typentry->tupDesc);
+			typentry->tupDesc = NULL;
+		}
+	}
 }
 
 
diff --git a/src/backend/utils/datumstream/datumstream.c b/src/backend/utils/datumstream/datumstream.c
index 37ef4d4ea93b..344297923ff5 100644
--- a/src/backend/utils/datumstream/datumstream.c
+++ b/src/backend/utils/datumstream/datumstream.c
@@ -1051,7 +1051,7 @@ datumstreamwrite_lob(DatumStreamWrite * acc, Datum d)
 	/*
 	 * If the datum is toasted	/ compressed -- an error.
 	 */
-	if (VARATT_IS_EXTENDED_D(d))
+	if (VARATT_IS_EXTENDED(DatumGetPointer(d)))
 	{
 		elog(ERROR, "Expected large object / variable length objects (varlena) to be de-toasted and/or de-compressed at this point");
 	}
@@ -1059,7 +1059,7 @@ datumstreamwrite_lob(DatumStreamWrite * acc, Datum d)
 	/*
 	 * De-Toast Datum
 	 */
-	if (VARATT_IS_EXTERNAL_D(d))
+	if (VARATT_IS_EXTERNAL(DatumGetPointer(d)))
 	{
 		d = PointerGetDatum(heap_tuple_fetch_attr(DatumGetPointer(d)));
 	}
diff --git a/src/backend/utils/datumstream/datumstreamblock.c b/src/backend/utils/datumstream/datumstreamblock.c
index db0928a63031..fe782d4c77cc 100755
--- a/src/backend/utils/datumstream/datumstreamblock.c
+++ b/src/backend/utils/datumstream/datumstreamblock.c
@@ -1633,17 +1633,17 @@ DatumStreamBlockWrite_PutOrig(
 			p = DatumGetPointer(d);
 			wsz = sz;
 		}
-		else if (VARATT_IS_SHORT_D(d))
+		else if (VARATT_IS_SHORT(DatumGetPointer(d)))
 		{
 			sz = VARSIZE_SHORT(DatumGetPointer(d));
 			p = DatumGetPointer(d);
 			wsz = sz;
 		}
-		else if (value_type_could_short(d, dsw->typeInfo->typid))
+		else if (value_type_could_short(DatumGetPointer(d), dsw->typeInfo->typid))
 		{
-			sz = VARSIZE_D(d) - VARHDRSZ + VARHDRSZ_SHORT;
+			sz = VARATT_CONVERTED_SHORT_SIZE(DatumGetPointer(d));
 			c1 = VARSIZE_TO_SHORT_D(d);
-			p = VARDATA_D(d);
+			p = VARDATA(DatumGetPointer(d));
 			wsz = sz - 1;
 		}
 		else
@@ -3247,17 +3247,17 @@ DatumStreamBlockWrite_PutDense(
 			p = DatumGetPointer(d);
 			wsz = sz;
 		}
-		else if (VARATT_IS_SHORT_D(d))
+		else if (VARATT_IS_SHORT(DatumGetPointer(d)))
 		{
 			sz = VARSIZE_SHORT(DatumGetPointer(d));
 			p = DatumGetPointer(d);
 			wsz = sz;
 		}
-		else if (value_type_could_short(d, dsw->typeInfo->typid))
+		else if (value_type_could_short(DatumGetPointer(d), dsw->typeInfo->typid))
 		{
-			sz = VARSIZE_D(d) - VARHDRSZ + VARHDRSZ_SHORT;
+			sz = VARATT_CONVERTED_SHORT_SIZE(DatumGetPointer(d));
 			c1 = VARSIZE_TO_SHORT_D(d);
-			p = VARDATA_D(d);
+			p = VARDATA(DatumGetPointer(d));
 			wsz = sz - 1;
 		}
 		else
@@ -4502,7 +4502,7 @@ DatumStreamBlock_IntegrityCheckVarlena(
 			 * we will not go here if item begins with SHORT header.
 			 */
 
-			afterPadding = (uint8 *) att_align(p, typeInfo->align);
+			afterPadding = (uint8 *) att_align_nominal(p, typeInfo->align);
 			saveBeginOffset = currentOffset;
 			while (p < afterPadding)
 			{
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index d0a3abd5bc52..540505978c9e 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/error/assert.c,v 1.33 2007/01/05 22:19:43 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/error/assert.c,v 1.35 2008/01/01 19:45:53 momjian Exp $
  *
  * NOTE
  *	  This should eventually work with elog()
@@ -56,6 +56,15 @@ ExceptionalCondition(const char *conditionName,
 		fflush(stderr);
 	}
 
+#ifdef SLEEP_ON_ASSERT
+
+	/*
+	 * It would be nice to use pg_usleep() here, but only does 2000 sec or 33
+	 * minutes, which seems too short.
+	 */
+	sleep(1000000);
+#endif
+
 	abort();
 	return 0;
 }
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 09e0af1dd471..6b3fb2183d2d 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -43,7 +43,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.182 2007/02/11 11:59:26 mha Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.201.2.5 2010/05/08 16:40:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -108,6 +108,9 @@ static const char *err_gettext(const char *str)
    the supplied arguments. */
 __attribute__((format_arg(1)));
 
+#undef _
+#define _(x) err_gettext(x)
+
 /* Global variables */
 ErrorContextCallback *error_context_stack = NULL;
 
@@ -182,7 +185,7 @@ static int	recursion_depth = 0;	/* to detect actual recursion */
 
 #define FORMATTED_TS_LEN 128
 static char formatted_start_time[FORMATTED_TS_LEN];
-//static char formatted_log_time[FORMATTED_TS_LEN];
+static char formatted_log_time[FORMATTED_TS_LEN];
 
 /* Macro for checking errordata_stack_depth is reasonable */
 #define CHECK_STACK_DEPTH() \
@@ -203,9 +206,9 @@ static const char *useful_strerror(int errnum);
 static const char *error_severity(int elevel);
 static void append_with_tabs(StringInfo buf, const char *str);
 static bool is_log_level_output(int elevel, int log_min_level);
-static void write_pipe_chunks(char *data, int len);
+static void write_pipe_chunks(char *data, int len, int dest);
+static void write_csvlog(ErrorData *edata);
 static void elog_debug_linger(ErrorData *edata);
-static void setup_formatted_start_time(void);
 
 
 /* verify string is correctly encoded, and escape it if invalid  */
@@ -437,9 +440,9 @@ errstart(int elevel, const char *filename, int lineno,
 
 		/*
 		 * Infinite error recursion might be due to something broken
-		 * in a context traceback routine.  Abandon them too.  We also
-		 * abandon attempting to print the error statement (which, if long,
-		 * could itself be the source of the recursive failure).
+		 * in a context traceback routine.	Abandon them too.  We also abandon
+		 * attempting to print the error statement (which, if long, could
+		 * itself be the source of the recursive failure).
 		 */
 		if (in_error_recursion_trouble())
 		{
@@ -477,6 +480,15 @@ errstart(int elevel, const char *filename, int lineno,
 	edata->elevel = elevel;
 	edata->output_to_server = output_to_server;
 	edata->output_to_client = output_to_client;
+	if (filename)
+	{
+		const char *slash;
+
+		/* keep only base name, useful especially for vpath builds */
+		slash = strrchr(filename, '/');
+		if (slash)
+			filename = slash + 1;
+	}
 	edata->filename = filename;
 	edata->lineno = lineno;
 	edata->funcname = funcname;
@@ -1437,6 +1449,15 @@ elog_start(const char *filename, int lineno, const char *funcname)
 	}
 
 	edata = &errordata[errordata_stack_depth];
+	if (filename)
+	{
+		const char *slash;
+
+		/* keep only base name, useful especially for vpath builds */
+		slash = strrchr(filename, '/');
+		if (slash)
+			filename = slash + 1;
+	}
 	edata->filename = filename;
 	edata->lineno = lineno;
 	edata->funcname = funcname;
@@ -1644,7 +1665,9 @@ ReThrowError(ErrorData *edata)
 		/*
 		 * Wups, stack not big enough.	We treat this as a PANIC condition
 		 * because it suggests an infinite loop of errors during error
-		 * recovery.
+		 * recovery.  Note that the message is intentionally not localized,
+		 * else failure to convert it to client encoding could cause further
+		 * recursion.
 		 */
 		errordata_stack_depth = -1;		/* make room on stack */
 		ereport(PANIC, (errmsg_internal("ERRORDATA_STACK_SIZE exceeded")));
@@ -1736,7 +1759,6 @@ pg_re_throw(void)
 }
 
 
-
 /*
  * CDB: elog_demote
  *
@@ -2131,28 +2153,6 @@ write_eventlog(int level, const char *line)
 }
 #endif   /* WIN32 */
 
-/*
- * setup formatted_start_time
- */
-static void
-setup_formatted_start_time(void)
-{
-	pg_time_t	stamp_time = (pg_time_t) MyStartTime;
-	pg_tz	   *tz;
-
-	/*
-	 * Normally we print log timestamps in log_timezone, but during startup we
-	 * could get here before that's set. If so, fall back to gmt_timezone
-	 * (which guc.c ensures is set up before Log_line_prefix can become
-	 * nonempty).
-	 */
-	tz = log_timezone ? log_timezone : gmt_timezone;
-
-	pg_strftime(formatted_start_time, FORMATTED_TS_LEN,
-				"%Y-%m-%d %H:%M:%S %Z",
-				pg_localtime(&stamp_time, tz));
-}
-
 
 /*
  * CDB: Tidy up the error message
@@ -2311,7 +2311,8 @@ log_line_prefix(StringInfo buf)
 	/*
 	 * This is one of the few places where we'd rather not inherit a static
 	 * variable's value from the postmaster.  But since we will, reset it when
-	 * MyProcPid changes.
+	 * MyProcPid changes. MyStartTime also changes when MyProcPid does, so
+	 * reset the formatted start timestamp too.
 	 */
 	if (log_my_pid != MyProcPid)
 	{
@@ -2390,58 +2391,62 @@ log_line_prefix(StringInfo buf)
 					 * log messages to have the same time format. See MPP-2591.
 					 *
 					 */
-					pg_time_t		stamp_time;
-					char		strfbuf[128],
-								msbuf[8];
 					struct timeval tv;
+					pg_time_t	stamp_time;
+					pg_tz	   *tz;
+					char		msbuf[8];
 
 					gettimeofday(&tv, NULL);
-					stamp_time = (pg_time_t)tv.tv_sec;
+					stamp_time = (pg_time_t) tv.tv_sec;
+					/* GP: Save the time of the last log line. */
+					LastLogTimeVal = tv;
 
 					/*
-					 * GP: Save the time of the last log line.
+					 * Normally we print log timestamps in log_timezone, but
+					 * during startup we could get here before that's set. If
+					 * so, fall back to gmt_timezone (which guc.c ensures is
+					 * set up before Log_line_prefix can become nonempty).
 					 */
-					LastLogTimeVal = tv;
+					tz = log_timezone ? log_timezone : gmt_timezone;
 
-					pg_strftime(strfbuf, sizeof(strfbuf),
+					pg_strftime(formatted_log_time, FORMATTED_TS_LEN,
 					/* leave room for microseconds... */
-					/* Win32 timezone names are too long so don't print them */
-#ifndef WIN32
 								"%Y-%m-%d %H:%M:%S        %Z",
-#else
-								"%Y-%m-%d %H:%M:%S        ",
-#endif
 							 pg_localtime(&stamp_time, log_timezone ? log_timezone : gmt_timezone));
 
-					/* 'paste' milliseconds into place... */
+					/* 'paste' microseconds into place... */
 					sprintf(msbuf, ".%06d", (int) (tv.tv_usec));
-					strncpy(strfbuf + 19, msbuf, 7);
+					strncpy(formatted_log_time + 19, msbuf, 4);
 
-					appendStringInfoString(buf, strfbuf);
+					appendStringInfoString(buf, formatted_log_time);
 				}
 				break;
 			case 't':
 				{
-					pg_time_t		stamp_time = (pg_time_t)time(NULL);
+					pg_time_t	stamp_time = (pg_time_t) time(NULL);
 					pg_tz	   *tz;
 					char		strfbuf[128];
 
 					tz = log_timezone ? log_timezone : gmt_timezone;
 
 					pg_strftime(strfbuf, sizeof(strfbuf),
-					/* Win32 timezone names are too long so don't print them */
-#ifndef WIN32
-							 "%Y-%m-%d %H:%M:%S %Z",
-#else
-							 "%Y-%m-%d %H:%M:%S",
-#endif
+								"%Y-%m-%d %H:%M:%S %Z",
 								pg_localtime(&stamp_time, tz));
 					appendStringInfoString(buf, strfbuf);
 				}
 				break;
 			case 's':
 				if (formatted_start_time[0] == '\0')
-					setup_formatted_start_time();
+				{
+					pg_time_t	stamp_time = (pg_time_t) MyStartTime;
+					pg_tz	   *tz;
+
+					tz = log_timezone ? log_timezone : gmt_timezone;
+
+					pg_strftime(formatted_start_time, FORMATTED_TS_LEN,
+								"%Y-%m-%d %H:%M:%S %Z",
+								pg_localtime(&stamp_time, tz));
+				}
 				appendStringInfoString(buf, formatted_start_time);
 				break;
 			case 'i':
@@ -2451,7 +2456,7 @@ log_line_prefix(StringInfo buf)
 					int		displen;
 
 					psdisp = get_ps_display(&displen);
-					appendStringInfo(buf, "%.*s", displen, psdisp);
+					appendBinaryStringInfo(buf, psdisp, displen);
 				}
 				break;
 			case 'r':
@@ -2474,14 +2479,14 @@ log_line_prefix(StringInfo buf)
 				if (MyProcPort == NULL)
 					i = format_len;
 				break;
+			case 'v':
+				/* keep VXID format in sync with lockfuncs.c */
+				if (MyProc != NULL)
+					appendStringInfo(buf, "%d/%u",
+									 MyProc->backendId, MyProc->lxid);
+				break;
 			case 'x':
-				if (MyProcPort)
-				{
-					if (IsTransactionState())
-						appendStringInfo(buf, "%u", GetTopTransactionId());
-					else
-						appendStringInfo(buf, "%u", InvalidTransactionId);
-				}
+				appendStringInfo(buf, "%u", GetTopTransactionIdIfAny());
 				break;
 
 			/* MPP SPECIFIC OPTIONS. */
@@ -2587,6 +2592,247 @@ log_line_prefix(StringInfo buf)
 	}
 }
 
+/*
+ * append a CSV'd version of a string to a StringInfo
+ * We use the PostgreSQL defaults for CSV, i.e. quote = escape = '"'
+ * If it's NULL, append nothing.
+ */
+static inline void
+appendCSVLiteral(StringInfo buf, const char *data)
+{
+	const char *p = data;
+	char		c;
+
+	/* avoid confusing an empty string with NULL */
+	if (p == NULL)
+		return;
+
+	appendStringInfoCharMacro(buf, '"');
+	while ((c = *p++) != '\0')
+	{
+		if (c == '"')
+			appendStringInfoCharMacro(buf, '"');
+		appendStringInfoCharMacro(buf, c);
+	}
+	appendStringInfoCharMacro(buf, '"');
+}
+
+/*
+ * Constructs the error message, depending on the Errordata it gets, in a CSV
+ * format which is described in doc/src/sgml/config.sgml.
+ */
+static void
+write_csvlog(ErrorData *edata)
+{
+	StringInfoData buf;
+	bool	print_stmt = false;
+
+	/* static counter for line numbers */
+	static long log_line_number = 0;
+
+	/* has counter been reset in current process? */
+	static int	log_my_pid = 0;
+
+	/*
+	 * This is one of the few places where we'd rather not inherit a static
+	 * variable's value from the postmaster.  But since we will, reset it when
+	 * MyProcPid changes.
+	 */
+	if (log_my_pid != MyProcPid)
+	{
+		log_line_number = 0;
+		log_my_pid = MyProcPid;
+		formatted_start_time[0] = '\0';
+	}
+	log_line_number++;
+
+	initStringInfo(&buf);
+
+	/*
+	 * timestamp with milliseconds
+	 *
+	 * Check if the timestamp is already calculated for the syslog message,
+	 * and use it if so.  Otherwise, get the current timestamp.  This is done
+	 * to put same timestamp in both syslog and csvlog messages.
+	 */
+	if (formatted_log_time[0] == '\0')
+	{
+		struct timeval tv;
+		pg_time_t	stamp_time;
+		pg_tz	   *tz;
+		char		msbuf[8];
+
+		gettimeofday(&tv, NULL);
+		stamp_time = (pg_time_t) tv.tv_sec;
+
+		/*
+		 * Normally we print log timestamps in log_timezone, but during
+		 * startup we could get here before that's set. If so, fall back to
+		 * gmt_timezone (which guc.c ensures is set up before Log_line_prefix
+		 * can become nonempty).
+		 */
+		tz = log_timezone ? log_timezone : gmt_timezone;
+
+		pg_strftime(formatted_log_time, FORMATTED_TS_LEN,
+		/* leave room for milliseconds... */
+					"%Y-%m-%d %H:%M:%S     %Z",
+					pg_localtime(&stamp_time, tz));
+
+		/* 'paste' milliseconds into place... */
+		sprintf(msbuf, ".%03d", (int) (tv.tv_usec / 1000));
+		strncpy(formatted_log_time + 19, msbuf, 4);
+	}
+	appendStringInfoString(&buf, formatted_log_time);
+	appendStringInfoChar(&buf, ',');
+
+	/* username */
+	if (MyProcPort)
+		appendCSVLiteral(&buf, MyProcPort->user_name);
+	appendStringInfoChar(&buf, ',');
+
+	/* database name */
+	if (MyProcPort)
+		appendCSVLiteral(&buf, MyProcPort->database_name);
+	appendStringInfoChar(&buf, ',');
+
+	/* Process id  */
+	if (MyProcPid != 0)
+		appendStringInfo(&buf, "%d", MyProcPid);
+	appendStringInfoChar(&buf, ',');
+
+	/* Remote host and port */
+	if (MyProcPort && MyProcPort->remote_host)
+	{
+		appendStringInfoChar(&buf, '"');
+		appendStringInfo(&buf, "%s", MyProcPort->remote_host);
+		if (MyProcPort->remote_port && MyProcPort->remote_port[0] != '\0')
+			appendStringInfo(&buf, ":%s", MyProcPort->remote_port);
+		appendStringInfoChar(&buf, '"');
+	}
+	appendStringInfoChar(&buf, ',');
+
+	/* session id */
+	appendStringInfo(&buf, "%lx.%x", (long) MyStartTime, MyProcPid);
+	appendStringInfoChar(&buf, ',');
+
+	/* Line number */
+	appendStringInfo(&buf, "%ld", log_line_number);
+	appendStringInfoChar(&buf, ',');
+
+	/* PS display */
+	if (MyProcPort)
+	{
+		StringInfoData msgbuf;
+		const char *psdisp;
+		int			displen;
+
+		initStringInfo(&msgbuf);
+
+		psdisp = get_ps_display(&displen);
+		appendBinaryStringInfo(&msgbuf, psdisp, displen);
+		appendCSVLiteral(&buf, msgbuf.data);
+	
+		pfree(msgbuf.data);
+	}
+	appendStringInfoChar(&buf, ',');
+
+	/* session start timestamp */
+	if (formatted_start_time[0] == '\0')
+	{
+		pg_time_t	stamp_time = (pg_time_t) MyStartTime;
+		pg_tz	   *tz = log_timezone ? log_timezone : gmt_timezone;
+
+		pg_strftime(formatted_start_time, FORMATTED_TS_LEN,
+					"%Y-%m-%d %H:%M:%S %Z",
+					pg_localtime(&stamp_time, tz));
+	}
+	appendStringInfoString(&buf, formatted_start_time);
+	appendStringInfoChar(&buf, ',');
+
+	/* Virtual transaction id */
+	/* keep VXID format in sync with lockfuncs.c */
+	if (MyProc != NULL && MyProc->backendId != InvalidBackendId)
+		appendStringInfo(&buf, "%d/%u", MyProc->backendId, MyProc->lxid);
+	appendStringInfoChar(&buf, ',');
+
+	/* Transaction id */
+	appendStringInfo(&buf, "%u", GetTopTransactionIdIfAny());
+	appendStringInfoChar(&buf, ',');
+
+	/* Error severity */
+	appendStringInfo(&buf, "%s", error_severity(edata->elevel));
+	appendStringInfoChar(&buf, ',');
+
+	/* SQL state code */
+	appendStringInfo(&buf, "%s", unpack_sql_state(edata->sqlerrcode));
+	appendStringInfoChar(&buf, ',');
+
+	/* errmessage */
+	appendCSVLiteral(&buf, edata->message);
+	appendStringInfoCharMacro(&buf, ',');
+
+	/* errdetail */
+	appendCSVLiteral(&buf, edata->detail);
+	appendStringInfoCharMacro(&buf, ',');
+
+	/* errhint */
+	appendCSVLiteral(&buf, edata->hint);
+	appendStringInfoCharMacro(&buf, ',');
+
+	/* internal query */
+	appendCSVLiteral(&buf, edata->internalquery);
+	appendStringInfoCharMacro(&buf, ',');
+
+	/* if printed internal query, print internal pos too */
+	if (edata->internalpos > 0 && edata->internalquery != NULL)
+		appendStringInfo(&buf, "%d", edata->internalpos);
+	appendStringInfoCharMacro(&buf, ',');
+
+	/* errcontext */
+	appendCSVLiteral(&buf, edata->context);
+	appendStringInfoCharMacro(&buf, ',');
+
+	/* user query --- only reported if not disabled by the caller */
+	if (is_log_level_output(edata->elevel, log_min_error_statement) &&
+		debug_query_string != NULL &&
+		!edata->hide_stmt)
+		print_stmt = true;
+	if (print_stmt)
+		appendCSVLiteral(&buf, debug_query_string);
+	appendStringInfoCharMacro(&buf, ',');
+	if (print_stmt && edata->cursorpos > 0)
+		appendStringInfo(&buf, "%d", edata->cursorpos);
+	appendStringInfoCharMacro(&buf, ',');
+
+	/* file error location */
+	if (Log_error_verbosity >= PGERROR_VERBOSE)
+	{
+		StringInfoData	msgbuf;
+
+		initStringInfo(&msgbuf);
+
+		if (edata->funcname && edata->filename)
+			appendStringInfo(&msgbuf, "%s, %s:%d",
+							 edata->funcname, edata->filename,
+							 edata->lineno);
+		else if (edata->filename)
+			appendStringInfo(&msgbuf, "%s:%d",
+							 edata->filename, edata->lineno);
+		appendCSVLiteral(&buf, msgbuf.data);
+		pfree(msgbuf.data);
+	}
+
+	appendStringInfoChar(&buf, '\n');
+
+	/* If in the syslogger process, try to write messages direct to file */
+	if (am_syslogger)
+		write_syslogger_file(buf.data, buf.len, LOG_DESTINATION_CSVLOG);
+	else
+		write_pipe_chunks(buf.data, buf.len, LOG_DESTINATION_CSVLOG);
+
+	pfree(buf.data);
+}
+
 /*
  * Unpack MAKE_SQLSTATE code. Note that this returns a pointer to a
  * static buffer.
@@ -2946,7 +3192,7 @@ append_stacktrace(PipeProtoChunk *buffer, StringInfo append, void *const *stacka
 			else
 			{
 				if (amsyslogger)
-					write_syslogger_file_binary(symbol, symbol_len);
+					write_syslogger_file_binary(symbol, symbol_len, LOG_DESTINATION_STDERR);
 				else
 					write(fileno(stderr), symbol, symbol_len);
 			}
@@ -2965,9 +3211,9 @@ write_syslogger_file_string(const char *str, bool amsyslogger, bool append_comma
 	{
 		if (amsyslogger)
 		{
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 			syslogger_write_str(str, strlen(str), true, true);
-			write_syslogger_file_binary("\"", 1);
+			write_syslogger_file_binary("\"", 1, LOG_DESTINATION_STDERR);
 		}
 		else
 		{
@@ -2980,7 +3226,7 @@ write_syslogger_file_string(const char *str, bool amsyslogger, bool append_comma
 	if (append_comma)
 	{
 		if (amsyslogger)
-			write_syslogger_file_binary(",", 1);
+			write_syslogger_file_binary(",", 1, LOG_DESTINATION_STDERR);
 		else
 			write(fileno(stderr), ",", 1);
 	}
@@ -3028,10 +3274,7 @@ write_syslogger_in_csv(ErrorData *edata, bool amsyslogger)
 							   amsyslogger, true);
 
 	/* transaction id */
-	if (MyProcPort != NULL && IsTransactionState())
-		syslogger_write_int32(false, "", GetTopTransactionId(), amsyslogger, true);
-	else
-		syslogger_write_int32(false, "", InvalidTransactionId, amsyslogger, true);
+	syslogger_write_int32(false, "", GetTopTransactionIdIfAny(), amsyslogger, true);
 
 	/* GPDB specific options */
 	syslogger_write_int32(true, "con", gp_session_id, amsyslogger, true);
@@ -3108,7 +3351,7 @@ write_syslogger_in_csv(ErrorData *edata, bool amsyslogger)
 
 	/* EOL */
 	if (amsyslogger)
-		write_syslogger_file_binary(LOG_EOL, strlen(LOG_EOL));
+		write_syslogger_file_binary(LOG_EOL, strlen(LOG_EOL), LOG_DESTINATION_STDERR);
 	else
 		write(fileno(stderr), LOG_EOL, strlen(LOG_EOL));
 }
@@ -3179,9 +3422,7 @@ write_message_to_server_log(int elevel,
 	fix_fields.error_cursor_pos = cursorpos;
 	fix_fields.internal_query_pos = internalpos;
 	fix_fields.error_fileline = lineno;
-	fix_fields.top_trans_id = InvalidTransactionId;
-	if (MyProcPort != NULL && IsTransactionState())
-		fix_fields.top_trans_id = GetTopTransactionId();
+	fix_fields.top_trans_id = GetTopTransactionIdIfAny();
 
 	GetAllTransactionXids(&(fix_fields.dist_trans_id),
 						  &(fix_fields.local_trans_id),
@@ -3285,7 +3526,7 @@ send_message_to_server_log(ErrorData *edata)
 
 	if (Log_destination & LOG_DESTINATION_STDERR)
 	{
-		if (Redirect_stderr && gp_log_format == 1)
+		if (Logging_collector && gp_log_format == 1)
 		{
 			if (redirection_done)
 			{
@@ -3323,6 +3564,9 @@ send_message_to_server_log(ErrorData *edata)
 
 	/* Format message prefix. */
 	initStringInfo(&buf);
+
+	formatted_log_time[0] = '\0';
+
 	log_line_prefix(&buf);
 	nc = buf.len;
 	appendStringInfo(&buf, "%s:  ", error_severity(edata->elevel));
@@ -3514,6 +3758,13 @@ send_message_to_server_log(ErrorData *edata)
 	/* Write to stderr, if enabled */
 	if ((Log_destination & LOG_DESTINATION_STDERR) || whereToSendOutput == DestDebug)
 	{
+		/*
+		 * Use the chunking protocol if we know the syslogger should be
+		 * catching stderr output, and we are not ourselves the syslogger.
+		 * Otherwise, just do a vanilla write to stderr.
+		 */
+		if (redirection_done && !am_syslogger)
+			write_pipe_chunks(buf.data, buf.len, LOG_DESTINATION_STDERR);
 #ifdef WIN32
 
 		/*
@@ -3523,33 +3774,62 @@ send_message_to_server_log(ErrorData *edata)
 		 * If stderr redirection is active, it was OK to write to stderr above
 		 * because that's really a pipe to the syslogger process.
 		 */
-		if (pgwin32_is_service() && (!redirection_done || am_syslogger) )
+		else if (pgwin32_is_service() && (!redirection_done || am_syslogger) )
 			write_eventlog(edata->elevel, buf.data);
-		else
 #endif
 			/* only use the chunking protocol if we know the syslogger should
 			 * be catching stderr output, and we are not ourselves the
 			 * syslogger. Otherwise, go directly to stderr.
 			 */
 			if (redirection_done && !am_syslogger)
-				write_pipe_chunks(buf.data, buf.len);
+				write_pipe_chunks(buf.data, buf.len, LOG_DESTINATION_STDERR);
 			else
 				write(fileno(stderr), buf.data, buf.len);
 	}
 
 	/* If in the syslogger process, try to write messages direct to file */
 	if (am_syslogger)
-		write_syslogger_file_binary(buf.data, buf.len);
+		write_syslogger_file_binary(buf.data, buf.len, LOG_DESTINATION_STDERR);
 
 	pfree(prefix.data);
-	pfree(buf.data);
+
+	/* Write to CSV log if enabled */
+	if (Log_destination & LOG_DESTINATION_CSVLOG)
+	{
+		if (redirection_done || am_syslogger)
+		{
+			/*
+			 * send CSV data if it's safe to do so (syslogger doesn't need the
+			 * pipe). First get back the space in the message buffer.
+			 */
+			pfree(buf.data);
+			write_csvlog(edata);
+		}
+		else
+		{
+			const char *msg = _("Not safe to send CSV data\n");
+
+			write(fileno(stderr), msg, strlen(msg));
+			if (!(Log_destination & LOG_DESTINATION_STDERR) &&
+				whereToSendOutput != DestDebug)
+			{
+				/* write message to stderr unless we just sent it above */
+				write(fileno(stderr), buf.data, buf.len);
+			}
+			pfree(buf.data);
+		}
+	}
+	else
+	{
+		pfree(buf.data);
+	}
 }
 
 /*
  * Send data to the syslogger using the chunked protocol
  */
 static void
-write_pipe_chunks(char *data, int len)
+write_pipe_chunks(char *data, int len, int dest)
 {
 	PipeProtoChunk p;
 
@@ -3562,7 +3842,7 @@ write_pipe_chunks(char *data, int len)
 	p.hdr.thid = mythread();
 	p.hdr.main_thid = mainthread();
 	p.hdr.chunk_no = 0;
-	p.hdr.log_format = 't';
+	p.hdr.log_format = (dest == LOG_DESTINATION_CSVLOG ? 'c' : 't');
 	p.hdr.is_segv_msg = 'f';
 	p.hdr.next = -1;
 
@@ -3860,9 +4140,9 @@ useful_strerror(int errnum)
 	if (str == NULL || *str == '\0')
 	{
 		snprintf(errorstr_buf, sizeof(errorstr_buf),
-				 /*------
-				   translator: This string will be truncated at 47
-				   characters expanded. */
+		/*------
+		  translator: This string will be truncated at 47
+		  characters expanded. */
 				 _("operating system error %d"), errnum);
 		str = errorstr_buf;
 	}
@@ -3961,7 +4241,7 @@ write_stderr(const char *fmt,...)
 
 	va_start(ap, fmt);
 
-	if (Redirect_stderr && gp_log_format == 1)
+	if (Logging_collector && gp_log_format == 1)
 	{
 		char		errbuf[2048];		/* Arbitrary size? */
 
@@ -4023,7 +4303,7 @@ write_stderr(const char *fmt,...)
 
 		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
 
-		write_eventlog(EVENTLOG_ERROR_TYPE, errbuf);
+		write_eventlog(ERROR, errbuf);
 	}
 	else
 	{
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index d272dd45e1df..1230da125cbf 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.104 2007/02/09 03:35:34 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.113.2.2 2009/12/09 21:58:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,7 @@
 #include "postgres.h"
 
 #include "catalog/catquery.h"
+#include "access/heapam.h"
 #include "access/tuptoaster.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_proc.h"
@@ -226,7 +227,14 @@ fmgr_info_cxt_security(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt,
 	finfo->fn_strict = procedureStruct->proisstrict;
 	finfo->fn_retset = procedureStruct->proretset;
 
-	if (procedureStruct->prosecdef && !ignore_security)
+	/*
+	 * If it has prosecdef set, or non-null proconfig, use
+	 * fmgr_security_definer call handler --- unless we are being called again
+	 * by fmgr_security_definer or fmgr_info_other_lang.
+	 */
+	if (!ignore_security &&
+		(procedureStruct->prosecdef ||
+		 !heap_attisnull(procedureTuple, Anum_pg_proc_proconfig)))
 	{
 		finfo->fn_addr = fmgr_security_definer;
 		finfo->fn_stats = TRACK_FUNC_ALL;		/* ie, never track */
@@ -390,27 +398,23 @@ fmgr_info_other_lang(Oid functionId, FmgrInfo *finfo, HeapTuple procedureTuple)
 {
 	Form_pg_proc procedureStruct = (Form_pg_proc) GETSTRUCT(procedureTuple);
 	Oid			language = procedureStruct->prolang;
+	HeapTuple	languageTuple;
+	Form_pg_language languageStruct;
 	FmgrInfo	plfinfo;
-	Oid			lanplcallfoid;
-	int			fetchCount;
-
-	lanplcallfoid = caql_getoid_plus(
-			NULL,
-			&fetchCount,
-			NULL,
-			cql("SELECT lanplcallfoid FROM pg_language "
-				" WHERE oid = :1 ",
-				ObjectIdGetDatum(language)));
 
-	if (!fetchCount)
+	languageTuple = SearchSysCache(LANGOID,
+								   ObjectIdGetDatum(language),
+								   0, 0, 0);
+	if (!HeapTupleIsValid(languageTuple))
 		elog(ERROR, "cache lookup failed for language %u", language);
+	languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
 
 	/*
 	 * Look up the language's call handler function, ignoring any attributes
 	 * that would normally cause insertion of fmgr_security_definer.  We
 	 * need to get back a bare pointer to the actual C-language function.
 	 */
-	fmgr_info_cxt_security(lanplcallfoid, &plfinfo,
+	fmgr_info_cxt_security(languageStruct->lanplcallfoid, &plfinfo,
 						   CurrentMemoryContext, true);
 	finfo->fn_addr = plfinfo.fn_addr;
 
@@ -422,6 +426,7 @@ fmgr_info_other_lang(Oid functionId, FmgrInfo *finfo, HeapTuple procedureTuple)
 	if (plfinfo.fn_extra != NULL)
 		elog(ERROR, "language %u has old-style handler", language);
 
+	ReleaseSysCache(languageTuple);
 }
 
 /*
@@ -877,39 +882,46 @@ fmgr_oldstyle(PG_FUNCTION_ARGS)
 
 
 /*
- * Support for security definer functions
+ * Support for security-definer and proconfig-using functions.	We support
+ * both of these features using the same call handler, because they are
+ * often used together and it would be inefficient (as well as notationally
+ * messy) to have two levels of call handler involved.
  */
-
 struct fmgr_security_definer_cache
 {
-	FmgrInfo	flinfo;
-	Oid			userid;
+	FmgrInfo	flinfo;			/* lookup info for target function */
+	Oid			userid;			/* userid to set, or InvalidOid */
+	ArrayType  *proconfig;		/* GUC values to set, or NULL */
 };
 
 /*
- * Function handler for security definer functions.  We extract the
- * OID of the actual function and do a fmgr lookup again.  Then we
- * look up the owner of the function and cache both the fmgr info and
- * the owner ID.  During the call we temporarily replace the flinfo
- * with the cached/looked-up one, while keeping the outer fcinfo
- * (which contains all the actual arguments, etc.)
- * intact. 	This is not re-entrant, but then the fcinfo itself can't be used
+ * Function handler for security-definer/proconfig functions.  We extract the
+ * OID of the actual function and do a fmgr lookup again.  Then we fetch the
+ * pg_proc row and copy the owner ID and proconfig fields.	(All this info
+ * is cached for the duration of the current query.)  To execute a call,
+ * we temporarily replace the flinfo with the cached/looked-up one, while
+ * keeping the outer fcinfo (which contains all the actual arguments, etc.)
+ * intact.	This is not re-entrant, but then the fcinfo itself can't be used
  * re-entrantly anyway.
  */
 static Datum
 fmgr_security_definer(PG_FUNCTION_ARGS)
 {
 	Datum		result;
-	FmgrInfo   *save_flinfo;
 	struct fmgr_security_definer_cache *volatile fcache;
+	FmgrInfo   *save_flinfo;
 	Oid			save_userid;
 	int			save_sec_context;
+	volatile int save_nestlevel;
 	PgStat_FunctionCallUsage fcusage;
 
 	if (!fcinfo->flinfo->fn_extra)
 	{
-		Oid			proowner;
-		int			fetchCount;
+		HeapTuple	tuple;
+		Form_pg_proc procedureStruct;
+		Datum		datum;
+		bool		isnull;
+		MemoryContext oldcxt;
 
 		fcache = MemoryContextAllocZero(fcinfo->flinfo->fn_mcxt,
 										sizeof(*fcache));
@@ -918,31 +930,54 @@ fmgr_security_definer(PG_FUNCTION_ARGS)
 							   fcinfo->flinfo->fn_mcxt, true);
 		fcache->flinfo.fn_expr = fcinfo->flinfo->fn_expr;
 
-		proowner = caql_getoid_plus(
-				NULL,
-				&fetchCount,
-				NULL,
-				cql("SELECT proowner FROM pg_proc "
-					" WHERE oid = :1 ",
-					ObjectIdGetDatum(fcinfo->flinfo->fn_oid)));
-
-		if (!fetchCount)
+		tuple = SearchSysCache1(PROCOID,
+								ObjectIdGetDatum(fcinfo->flinfo->fn_oid));
+		if (!HeapTupleIsValid(tuple))
 			elog(ERROR, "cache lookup failed for function %u",
 				 fcinfo->flinfo->fn_oid);
-		fcache->userid = proowner;
+		procedureStruct = (Form_pg_proc) GETSTRUCT(tuple);
+
+		if (procedureStruct->prosecdef)
+			fcache->userid = procedureStruct->proowner;
+
+		datum = SysCacheGetAttr(PROCOID, tuple, Anum_pg_proc_proconfig,
+								&isnull);
+		if (!isnull)
+		{
+			oldcxt = MemoryContextSwitchTo(fcinfo->flinfo->fn_mcxt);
+			fcache->proconfig = DatumGetArrayTypePCopy(datum);
+			MemoryContextSwitchTo(oldcxt);
+		}
+
+		ReleaseSysCache(tuple);
 
 		fcinfo->flinfo->fn_extra = fcache;
 	}
 	else
 		fcache = fcinfo->flinfo->fn_extra;
 
+	/* GetUserIdAndSecContext is cheap enough that no harm in a wasted call */
 	GetUserIdAndSecContext(&save_userid, &save_sec_context);
-	SetUserIdAndSecContext(fcache->userid,
-						   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
+	if (fcache->proconfig)		/* Need a new GUC nesting level */
+		save_nestlevel = NewGUCNestLevel();
+	else
+		save_nestlevel = 0;		/* keep compiler quiet */
+
+	if (OidIsValid(fcache->userid))
+		SetUserIdAndSecContext(fcache->userid,
+							   save_sec_context | SECURITY_LOCAL_USERID_CHANGE);
+
+	if (fcache->proconfig)
+	{
+		ProcessGUCArray(fcache->proconfig,
+						(superuser() ? PGC_SUSET : PGC_USERSET),
+						PGC_S_SESSION,
+						GUC_ACTION_SAVE);
+	}
 
 	/*
 	 * We don't need to restore GUC or userid settings on error, because the
-	 * ensuing xact or subxact abort will do that.	The PG_TRY block is only
+	 * ensuing xact or subxact abort will do that.  The PG_TRY block is only
 	 * needed to clean up the flinfo link.
 	 */
 	save_flinfo = fcinfo->flinfo;
@@ -974,7 +1009,10 @@ fmgr_security_definer(PG_FUNCTION_ARGS)
 
 	fcinfo->flinfo = save_flinfo;
 
-	SetUserIdAndSecContext(save_userid, save_sec_context);
+	if (fcache->proconfig)
+		AtEOXact_GUC(true, save_nestlevel);
+	if (OidIsValid(fcache->userid))
+		SetUserIdAndSecContext(save_userid, save_sec_context);
 
 	return result;
 }
@@ -1843,7 +1881,7 @@ OidFunctionCall9(Oid functionId, Datum arg1, Datum arg2,
  *
  * One important difference from the bare function call is that we will
  * push any active SPI context, allowing SPI-using I/O functions to be
- * called from other SPI functions without extra notation.	This is a hack,
+ * called from other SPI functions without extra notation.  This is a hack,
  * but the alternative of expecting all SPI functions to do SPI_push/SPI_pop
  * around I/O calls seems worse.
  */
@@ -2171,6 +2209,9 @@ get_call_expr_argtype(Node *expr, int argnum)
 	else if (IsA(expr, ArrayCoerceExpr) &&
 			argnum == 0)
 		argtype = get_element_type(argtype);
+	else if (IsA(expr, ArrayCoerceExpr) &&
+			 argnum == 0)
+		argtype = get_element_type(argtype);
 
 	return argtype;
 }
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index e8de33fd51b4..79208f6beb3f 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.33 2007/02/01 19:10:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.37.2.2 2008/11/30 18:49:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,8 +66,8 @@ init_MultiFuncCall(PG_FUNCTION_ARGS)
 		/*
 		 * First call
 		 */
-		ReturnSetInfo *rsi = (ReturnSetInfo *) fcinfo->resultinfo;
-		MemoryContext multi_call_ctx;
+		ReturnSetInfo  *rsi = (ReturnSetInfo *) fcinfo->resultinfo;
+		MemoryContext	multi_call_ctx;
 
 		/*
 		 * Create a suitably long-lived context to hold cross-call data
@@ -184,7 +184,6 @@ shutdown_MultiFuncCall(Datum arg)
 	 * Delete context that holds all multi-call data, including the
 	 * FuncCallContext itself
 	 */
-	MemoryContextSwitchTo(flinfo->fn_mcxt);
 	MemoryContextDelete(funcctx->multi_call_memory_ctx);
 }
 
@@ -459,6 +458,8 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 	int			nargs = declared_args->dim1;
 	bool		have_anyelement_result = false;
 	bool		have_anyarray_result = false;
+	bool		have_anynonarray = false;
+	bool		have_anyenum = false;
 	Oid			anyelement_type = InvalidOid;
 	Oid			anyarray_type = InvalidOid;
 	int			i;
@@ -474,6 +475,14 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 			case ANYARRAYOID:
 				have_anyarray_result = true;
 				break;
+			case ANYNONARRAYOID:
+				have_anyelement_result = true;
+				have_anynonarray = true;
+				break;
+			case ANYENUMOID:
+				have_anyelement_result = true;
+				have_anyenum = true;
+				break;
 			default:
 				break;
 		}
@@ -493,6 +502,8 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 		switch (declared_args->values[i])
 		{
 			case ANYELEMENTOID:
+			case ANYNONARRAYOID:
+			case ANYENUMOID:
 				if (!OidIsValid(anyelement_type))
 					anyelement_type = get_call_expr_argtype(call_expr, i);
 				break;
@@ -519,12 +530,22 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 											 anyelement_type,
 											 ANYELEMENTOID);
 
+	/* Enforce ANYNONARRAY if needed */
+	if (have_anynonarray && type_is_array(anyelement_type))
+		return false;
+
+	/* Enforce ANYENUM if needed */
+	if (have_anyenum && !type_is_enum(anyelement_type))
+		return false;
+
 	/* And finally replace the tuple column types as needed */
 	for (i = 0; i < natts; i++)
 	{
 		switch (tupdesc->attrs[i]->atttypid)
 		{
 			case ANYELEMENTOID:
+			case ANYNONARRAYOID:
+			case ANYENUMOID:
 				TupleDescInitEntry(tupdesc, i + 1,
 								   NameStr(tupdesc->attrs[i]->attname),
 								   anyelement_type,
@@ -575,6 +596,8 @@ resolve_polymorphic_argtypes(int numargs, Oid *argtypes, char *argmodes,
 		switch (argtypes[i])
 		{
 			case ANYELEMENTOID:
+			case ANYNONARRAYOID:
+			case ANYENUMOID:
 				if (argmode == PROARGMODE_OUT || argmode == PROARGMODE_TABLE)
 					have_anyelement_result = true;
 				else
@@ -629,12 +652,16 @@ resolve_polymorphic_argtypes(int numargs, Oid *argtypes, char *argmodes,
 											 anyelement_type,
 											 ANYELEMENTOID);
 
+	/* XXX do we need to enforce ANYNONARRAY or ANYENUM here?  I think not */
+
 	/* And finally replace the output column types as needed */
 	for (i = 0; i < numargs; i++)
 	{
 		switch (argtypes[i])
 		{
 			case ANYELEMENTOID:
+			case ANYNONARRAYOID:
+			case ANYENUMOID:
 				argtypes[i] = anyelement_type;
 				break;
 			case ANYARRAYOID:
@@ -661,12 +688,13 @@ get_type_func_class(Oid typid)
 {
 	switch (get_typtype(typid))
 	{
-		case 'c':
+		case TYPTYPE_COMPOSITE:
 			return TYPEFUNC_COMPOSITE;
-		case 'b':
-		case 'd':
+		case TYPTYPE_BASE:
+		case TYPTYPE_DOMAIN:
+		case TYPTYPE_ENUM:
 			return TYPEFUNC_SCALAR;
-		case 'p':
+		case TYPTYPE_PSEUDO:
 			if (typid == RECORDOID)
 				return TYPEFUNC_RECORD;
 
@@ -906,7 +934,7 @@ get_func_result_name(Oid functionId)
  * Given a pg_proc row for a function, return a tuple descriptor for the
  * result rowtype, or NULL if the function does not have OUT parameters.
  *
- * Note that this does not handle resolution of ANYELEMENT/ANYARRAY types;
+ * Note that this does not handle resolution of polymorphic types;
  * that is deliberate.
  */
 TupleDesc
@@ -1093,7 +1121,7 @@ RelationNameGetTupleDesc(const char *relname)
 	List	   *relname_list;
 
 	/* Open relation and copy the tuple description */
-	relname_list = stringToQualifiedNameList(relname, "RelationNameGetTupleDesc");
+	relname_list = stringToQualifiedNameList(relname);
 	relvar = makeRangeVarFromNameList(relname_list);
 	rel = relation_openrv(relvar, AccessShareLock);
 	tupdesc = CreateTupleDescCopy(RelationGetDescr(rel));
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 9d0fc0daabd8..c2f98953584e 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -68,6 +68,8 @@
 
 #include "postgres.h"
 
+#include <limits.h>
+
 #include "access/xact.h"
 #include "storage/shmem.h"
 #include "storage/spin.h"
@@ -204,6 +206,8 @@ static void hdefault(HTAB *hashp);
 static int	choose_nelem_alloc(Size entrysize);
 static bool init_htab(HTAB *hashp, long nelem);
 static void hash_corrupted(HTAB *hashp);
+static long next_pow2_long(long num);
+static int	next_pow2_int(long num);
 static void register_seq_scan(HTAB *hashp);
 static void deregister_seq_scan(HTAB *hashp);
 static bool has_seq_scans(HTAB *hashp);
@@ -378,8 +382,13 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
 	{
 		/* Doesn't make sense to partition a local hash table */
 		Assert(flags & HASH_SHARED_MEM);
-		/* # of partitions had better be a power of 2 */
-		Assert(info->num_partitions == (1L << my_log2(info->num_partitions)));
+
+		/*
+		 * The number of partitions had better be a power of 2. Also, it must
+		 * be less than INT_MAX (see init_htab()), so call the int version of
+		 * next_pow2.
+		 */
+		Assert(info->num_partitions == next_pow2_int(info->num_partitions));
 
 		hctl->num_partitions = info->num_partitions;
 	}
@@ -520,7 +529,6 @@ init_htab(HTAB *hashp, long nelem)
 {
 	HASHHDR    *hctl = hashp->hctl;
 	HASHSEGMENT *segp;
-	long		lnbuckets;
 	int			nbuckets;
 	int			nsegs;
 
@@ -535,9 +543,7 @@ init_htab(HTAB *hashp, long nelem)
 	 * number of buckets.  Allocate space for the next greater power of two
 	 * number of buckets
 	 */
-	lnbuckets = (nelem - 1) / hctl->ffactor + 1;
-
-	nbuckets = 1 << my_log2(lnbuckets);
+	nbuckets = next_pow2_int((nelem - 1) / hctl->ffactor + 1);
 
 	/*
 	 * In a partitioned table, nbuckets must be at least equal to
@@ -555,7 +561,7 @@ init_htab(HTAB *hashp, long nelem)
 	 * Figure number of directory segments needed, round up to a power of 2
 	 */
 	nsegs = (nbuckets - 1) / hctl->ssize + 1;
-	nsegs = 1 << my_log2(nsegs);
+	nsegs = next_pow2_int(nsegs);
 
 	/*
 	 * Make sure directory is big enough. If pre-allocated directory is too
@@ -625,9 +631,9 @@ hash_estimate_size(long num_entries, Size entrysize)
 				elementAllocCnt;
 
 	/* estimate number of buckets wanted */
-	nBuckets = 1L << my_log2((num_entries - 1) / DEF_FFACTOR + 1);
+	nBuckets = next_pow2_long((num_entries - 1) / DEF_FFACTOR + 1);
 	/* # of segments needed for nBuckets */
-	nSegments = 1L << my_log2((nBuckets - 1) / DEF_SEGSIZE + 1);
+	nSegments = next_pow2_long((nBuckets - 1) / DEF_SEGSIZE + 1);
 	/* directory entries */
 	nDirEntries = DEF_DIRSIZE;
 	while (nDirEntries < nSegments)
@@ -668,9 +674,9 @@ hash_select_dirsize(long num_entries)
 				nDirEntries;
 
 	/* estimate number of buckets wanted */
-	nBuckets = 1L << my_log2((num_entries - 1) / DEF_FFACTOR + 1);
+	nBuckets = next_pow2_long((num_entries - 1) / DEF_FFACTOR + 1);
 	/* # of segments needed for nBuckets */
-	nSegments = 1L << my_log2((nBuckets - 1) / DEF_SEGSIZE + 1);
+	nSegments = next_pow2_long((nBuckets - 1) / DEF_SEGSIZE + 1);
 	/* directory entries */
 	nDirEntries = DEF_DIRSIZE;
 	while (nDirEntries < nSegments)
@@ -823,10 +829,10 @@ hash_search_with_hash_value(HTAB *hashp,
 #endif
 
 	/*
-	 * If inserting, check if it's time to split the bucket.
+	 * If inserting, check if it is time to split a bucket.
 	 *
 	 * NOTE: failure to expand table is not a fatal error, it just means we
-	 * have to run at higher fill factor than we wanted. However, if we're
+	 * have to run at higher fill factor than we wanted.  However, if we're
 	 * using the palloc allocator then it will throw error anyway on
 	 * out-of-memory, so we must do this before modifying the table.
 	 */
@@ -844,7 +850,7 @@ hash_search_with_hash_value(HTAB *hashp,
 		if (!IS_PARTITIONED(hctl) && !hashp->frozen &&
 			hctl->nentries / (long) (hctl->max_bucket + 1) >= hctl->ffactor &&
 			!has_seq_scans(hashp))
-			(void)expand_table(hashp);
+			(void) expand_table(hashp);
 	}
 
 	/*
@@ -966,11 +972,12 @@ hash_search_with_hash_value(HTAB *hashp,
 			hashp->keycopy(ELEMENTKEY(currBucket), keyPtr, keysize);
 
 			/*
-			 * Caller is expected to fill the data field on return. DO NOT
+			 * Caller is expected to fill the data field on return.  DO NOT
 			 * insert any code that could possibly throw error here, as doing
 			 * so would leave the table entry incomplete and hence corrupt the
 			 * caller's data structure.
 			 */
+
 			return (void *) ELEMENTKEY(currBucket);
 	}
 
@@ -1407,16 +1414,37 @@ my_log2(long num)
 	int			i;
 	long		limit;
 
+	/* guard against too-large input, which would put us into infinite loop */
+	if (num > LONG_MAX / 2)
+		num = LONG_MAX / 2;
+
 	for (i = 0, limit = 1; limit < num; i++, limit <<= 1)
 		;
 	return i;
 }
 
+/* calculate first power of 2 >= num, bounded to what will fit in a long */
+static long
+next_pow2_long(long num)
+{
+	/* my_log2's internal range check is sufficient */
+	return 1L << my_log2(num);
+}
+
+/* calculate first power of 2 >= num, bounded to what will fit in an int */
+static int
+next_pow2_int(long num)
+{
+	if (num > INT_MAX / 2)
+		num = INT_MAX / 2;
+	return 1 << my_log2(num);
+}
+
 
 /************************* SEQ SCAN TRACKING ************************/
 
 /*
- * We track active hash_seq_search scans here.  The need for this mechanism
+ * We track active hash_seq_search scans here.	The need for this mechanism
  * comes from the fact that a scan will get confused if a bucket split occurs
  * while it's in progress: it might visit entries twice, or even miss some
  * entirely (if it's partway through the same bucket that splits).  Hence
@@ -1436,7 +1464,7 @@ my_log2(long num)
  *
  * This arrangement is reasonably robust if a transient hashtable is deleted
  * without notifying us.  The absolute worst case is we might inhibit splits
- * in another table created later at exactly the same address.  We will give
+ * in another table created later at exactly the same address.	We will give
  * a warning at transaction end for reference leaks, so any bugs leading to
  * lack of notification should be easy to catch.
  */
@@ -1464,7 +1492,7 @@ register_seq_scan(HTAB *hashp)
 static void
 deregister_seq_scan(HTAB *hashp)
 {
-	int		i;
+	int			i;
 
 	/* Search backward since it's most likely at the stack top */
 	for (i = num_seq_scans - 1; i >= 0; i--)
@@ -1485,7 +1513,7 @@ deregister_seq_scan(HTAB *hashp)
 static bool
 has_seq_scans(HTAB *hashp)
 {
-	int		i;
+	int			i;
 
 	for (i = 0; i < num_seq_scans; i++)
 	{
@@ -1510,7 +1538,7 @@ AtEOXact_HashTables(bool isCommit)
 	 */
 	if (isCommit)
 	{
-		int		i;
+		int			i;
 
 		for (i = 0; i < num_seq_scans; i++)
 		{
@@ -1525,7 +1553,7 @@ AtEOXact_HashTables(bool isCommit)
 void
 AtEOSubXact_HashTables(bool isCommit, int nestDepth)
 {
-	int		i;
+	int			i;
 
 	/*
 	 * Search backward to make cleanup easy.  Note we must check all entries,
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index 11403c87d83b..c0aa8a5d1ee5 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -9,7 +9,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/hash/hashfn.c,v 1.30 2007/01/05 22:19:43 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/hash/hashfn.c,v 1.32 2008/01/01 19:45:53 momjian Exp $
+ *
+ * NOTES
+ *	  It is expected that every bit of a hash function's 32-bit result is
+ *	  as random as every other; failure to ensure this is likely to lead
+ *	  to poor performance of hash tables.  In most cases a hash
+ *	  function should use hash_any() or its variant hash_uint32().
  *
  * NOTES
  *	  It is expected that every bit of a hash function's 32-bit result is
@@ -64,8 +70,7 @@ uint32
 oid_hash(const void *key, Size keysize)
 {
 	Assert(keysize == sizeof(Oid));
-	/* We don't actually bother to do anything to the OID value ... */
-	return (uint32) *((const Oid *) key);
+	return DatumGetUInt32(hash_uint32((uint32) *((const Oid *) key)));
 }
 
 /*
diff --git a/src/backend/utils/init/flatfiles.c b/src/backend/utils/init/flatfiles.c
index fab9846d1287..581197e7c933 100644
--- a/src/backend/utils/init/flatfiles.c
+++ b/src/backend/utils/init/flatfiles.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.24 2007/01/05 22:19:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.30 2008/01/01 19:45:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -202,7 +202,7 @@ name_okay(const char *str)
  * so we can set or update the XID wrap limit.
  *
  * Also, if "startup" is true, we tell relcache.c to clear out the relcache
- * init file in each database.  That's a bit nonmodular, but scanning
+ * init file in each database.	That's a bit nonmodular, but scanning
  * pg_database twice during system startup seems too high a price for keeping
  * things better separated.
  */
@@ -245,8 +245,8 @@ write_database_file(Relation drel, bool startup)
 		datfrozenxid = dbform->datfrozenxid;
 
 		/*
-		 * Identify the oldest datfrozenxid.  This must match
-		 * the logic in vac_truncate_clog() in vacuum.c.
+		 * Identify the oldest datfrozenxid.  This must match the logic in
+		 * vac_truncate_clog() in vacuum.c.
 		 *
 		 * MPP-20053: Skip databases that cannot be connected to in computing
 		 * the oldest database.
@@ -320,7 +320,6 @@ write_database_file(Relation drel, bool startup)
  *
  * The format for the flat auth file is
  *		"rolename" "password" "validuntil" "memberof" "memberof" ...
- * Only roles that are marked rolcanlogin are entered into the auth file.
  * Each role's line lists all the roles (groups) of which it is directly
  * or indirectly a member, except for itself.
  *
@@ -334,7 +333,6 @@ write_database_file(Relation drel, bool startup)
 typedef struct
 {
 	Oid			roleid;
-	bool		rolcanlogin;
 	bool		rolsuper;
 	char	   *rolname;
 	char	   *rolpassword;
@@ -406,8 +404,7 @@ load_auth_entries(Relation rel_authid, auth_entry **auth_info_out, int *total_ro
 	auth_entry *auth_info;
 
 	/*
-	 * Read pg_authid and fill temporary data structures.  Note we must read
-	 * all roles, even those without rolcanlogin.
+	 * Read pg_authid and fill temporary data structures.
 	 */
 	totalblocks = RelationGetNumberOfBlocks(rel_authid);
 	totalblocks = totalblocks ? totalblocks : 1;
@@ -433,7 +430,6 @@ load_auth_entries(Relation rel_authid, auth_entry **auth_info_out, int *total_ro
 
 		auth_info[curr_role].roleid = HeapTupleGetOid(tuple);
 		auth_info[curr_role].rolsuper = aform->rolsuper;
-		auth_info[curr_role].rolcanlogin = aform->rolcanlogin;
 		auth_info[curr_role].rolname = pstrdup(NameStr(aform->rolname));
 		auth_info[curr_role].member_of = NIL;
 
@@ -441,7 +437,10 @@ load_auth_entries(Relation rel_authid, auth_entry **auth_info_out, int *total_ro
 		 * We can't use heap_getattr() here because during startup we will not
 		 * have any tupdesc for pg_authid.  Fortunately it's not too hard to
 		 * work around this.  rolpassword is the first possibly-null field so
-		 * we can compute its offset directly.
+		 * we can compute its offset directly.	Note that this only works
+		 * reliably because the preceding field (rolconnlimit) is int4, and
+		 * therefore rolpassword is always 4-byte-aligned, and will be at the
+		 * same offset no matter whether it uses 1-byte or 4-byte header.
 		 */
 		tp = (char *) tup + tup->t_hoff;
 		off = offsetof(FormData_pg_authid, rolpassword);
@@ -460,6 +459,10 @@ load_auth_entries(Relation rel_authid, auth_entry **auth_info_out, int *total_ro
 			/*
 			 * The password probably shouldn't ever be out-of-line toasted; if
 			 * it is, ignore it, since we can't handle that in startup mode.
+			 *
+			 * It is entirely likely that it's 1-byte format not 4-byte, and
+			 * theoretically possible that it's compressed inline, but textout
+			 * should be able to handle those cases even in startup mode.
 			 */
 			if (VARATT_IS_EXTERNAL(DatumGetPointer(datum)))
 				auth_info[curr_role].rolpassword = pstrdup("");
@@ -467,7 +470,7 @@ load_auth_entries(Relation rel_authid, auth_entry **auth_info_out, int *total_ro
 				auth_info[curr_role].rolpassword = DatumGetCString(DirectFunctionCall1(textout, datum));
 
 			/* assume passwd has attlen -1 */
-			off = att_addlength(off, -1, PointerGetDatum(tp + off));
+			off = att_addlength_pointer(off, -1, tp + off);
 		}
 
 		if (HeapTupleHasNulls(tuple) &&
@@ -482,7 +485,7 @@ load_auth_entries(Relation rel_authid, auth_entry **auth_info_out, int *total_ro
 			 * rolvaliduntil is timestamptz, which we assume is double
 			 * alignment and pass-by-value.
 			 */
-			off = att_align(off, 'd');
+			off = att_align_nominal(off, 'd');
 			datum = fetch_att(tp + off, true, sizeof(TimestampTz));
 			auth_info[curr_role].rolvaliduntil = DatumGetCString(DirectFunctionCall1(timestamptz_out, datum));
 		}
@@ -585,10 +588,6 @@ write_auth_file(Relation rel_authid, Relation rel_authmem)
 			List	   *roles_names_list = NIL;
 			ListCell   *mem;
 
-			/* We can skip this for non-login roles */
-			if (!auth_info[curr_role].rolcanlogin)
-				continue;
-
 			/*
 			 * This search algorithm is the same as in is_member_of_role; we
 			 * are just working with a different input data structure.
@@ -677,26 +676,21 @@ write_auth_file(Relation rel_authid, Relation rel_authmem)
 	for (curr_role = 0; curr_role < total_roles; curr_role++)
 	{
 		auth_entry *arole = &auth_info[curr_role];
+		ListCell   *mem;
 
-		if (arole->rolcanlogin)
-		{
-			ListCell   *mem;
+		sputs_quote(&buffer, arole->rolname);
+		appendStringInfoChar(&buffer, ' ');
+		sputs_quote(&buffer, arole->rolpassword);
+		appendStringInfoChar(&buffer, ' ');
+		sputs_quote(&buffer, arole->rolvaliduntil);
 
-			sputs_quote(&buffer, arole->rolname);
-			appendStringInfoChar(&buffer, ' ');
-			sputs_quote(&buffer, arole->rolpassword);
+		foreach(mem, arole->member_of)
+		{
 			appendStringInfoChar(&buffer, ' ');
-			sputs_quote(&buffer, arole->rolvaliduntil);
-
-			foreach(mem, arole->member_of)
-			{
-				appendStringInfoChar(&buffer, ' ');
-				sputs_quote(&buffer, (char *) lfirst(mem));
-			}
-
-			appendStringInfoChar(&buffer, '\n');
-
+			sputs_quote(&buffer, (char *) lfirst(mem));
 		}
+
+		appendStringInfoChar(&buffer, '\n');
 	}
 
 	MirroredFlatFile_Append(&mirroredOpen, buffer.data, buffer.len,
@@ -1113,6 +1107,14 @@ AtEOXact_UpdateFlatFiles(bool isCommit)
 	 * Signal the postmaster to reload its caches.
 	 */
 	SendPostmasterSignal(PMSIGNAL_PASSWORD_CHANGE);
+
+	/*
+	 * Force synchronous commit, to minimize the window between changing the
+	 * flat files on-disk and marking the transaction committed.  It's not
+	 * great that there is any window at all, but definitely we don't want to
+	 * make it larger than necessary.
+	 */
+	ForceSyncCommit();
 }
 
 
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 63a4560b701d..3919eda087a8 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.101 2007/04/16 18:29:54 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.104 2008/01/01 19:45:53 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -116,7 +116,7 @@ int			max_statement_mem = 2048000;
 int			gp_vmem_limit_per_query = 0;
 int			maintenance_work_mem = 65536;
 
-/* 
+/*
  * Primary determinants of sizes of shared-memory structures.  MaxBackends is
  * MaxConnections + autovacuum_max_workers (it is computed by the GUC assign
  * hook):
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 17283c0ad4f0..4e887737e793 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.162 2007/02/15 23:23:23 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.166.2.2 2010/08/16 17:33:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -406,7 +406,7 @@ GetAuthenticatedUserId(void)
  * ever throw any kind of error.  This is because they are used by
  * StartTransaction and AbortTransaction to save/restore the settings,
  * and during the first transaction within a backend, the value to be saved
- * and perhaps restored is indeed invalid.	We have to be able to get
+ * and perhaps restored is indeed invalid.  We have to be able to get
  * through AbortTransaction without asserting in case InitPostgres fails.
  */
 void
@@ -482,7 +482,7 @@ InitializeSessionUserId(const char *rolename)
 	HeapTuple	roleTup;
 	Form_pg_authid rform;
 	Oid			roleid;
-	cqContext  *pcqCtx;
+
 	/*
 	 * Don't do scans if we're bootstrapping, none of the system catalogs
 	 * exist yet, and they should be owned by postgres anyway.
@@ -492,14 +492,9 @@ InitializeSessionUserId(const char *rolename)
 	/* call only once */
 	AssertState(!OidIsValid(AuthenticatedUserId));
 
-	pcqCtx = caql_beginscan(
-			NULL,
-			cql("SELECT * FROM pg_authid "
-				" WHERE rolname = :1 ",
-				CStringGetDatum((char *) rolename)));
-
-	roleTup = caql_getnext(pcqCtx);
-
+	roleTup = SearchSysCache(AUTHNAME,
+							 PointerGetDatum(rolename),
+							 0, 0, 0);
 	if (!HeapTupleIsValid(roleTup))
 		ereport(FATAL,
 				(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
@@ -576,7 +571,7 @@ InitializeSessionUserId(const char *rolename)
 					AuthenticatedUserIsSuperuser ? "on" : "off",
 					PGC_INTERNAL, PGC_S_OVERRIDE);
 
-	caql_endscan(pcqCtx);
+	ReleaseSysCache(roleTup);
 }
 
 
@@ -959,6 +954,9 @@ CreateLockFile(const char *filename, bool amPostmaster,
 		 * admin) but has left orphan backends behind.	Check for this by
 		 * looking to see if there is an associated shmem segment that is
 		 * still in use.
+		 *
+		 * Note: because postmaster.pid is written in two steps, we might not
+		 * find the shmem ID values in it; we can't treat that as an error.
 		 */
 		if (isDDLock)
 		{
@@ -1023,7 +1021,18 @@ CreateLockFile(const char *filename, bool amPostmaster,
 				(errcode_for_file_access(),
 				 errmsg("could not write lock file \"%s\": %m", filename)));
 	}
-	if (close(fd))
+	if (pg_fsync(fd) != 0)
+	{
+		int			save_errno = errno;
+
+		close(fd);
+		unlink(filename);
+		errno = save_errno;
+		ereport(FATAL,
+				(errcode_for_file_access(),
+				 errmsg("could not write lock file \"%s\": %m", filename)));
+	}
+	if (close(fd) != 0)
 	{
 		int			save_errno = errno;
 
@@ -1190,7 +1199,14 @@ RecordSharedMemoryInLockFile(unsigned long id1, unsigned long id2)
 		close(fd);
 		return;
 	}
-	if (close(fd))
+	if (pg_fsync(fd) != 0)
+	{
+		ereport(LOG,
+				(errcode_for_file_access(),
+				 errmsg("could not write to file \"%s\": %m",
+						DIRECTORY_LOCK_FILE)));
+	}
+	if (close(fd) != 0)
 	{
 		ereport(LOG,
 				(errcode_for_file_access(),
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 9c25185a7501..495608089587 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.174 2007/02/15 23:23:23 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.180.2.1 2008/09/11 14:01:35 alvherre Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -50,6 +50,7 @@
 #include "utils/flatfiles.h"
 #include "utils/fmgroids.h"
 #include "utils/guc.h"
+#include "utils/plancache.h"
 #include "utils/portal.h"
 #include "utils/ps_status.h"
 #include "utils/relcache.h"
@@ -314,7 +315,12 @@ ProcessRoleGUC(void)
 	{
 		ArrayType  *a = DatumGetArrayTypeP(datum);
 
-		ProcessGUCArray(a, PGC_S_USER);
+		/*
+		 * We process all the options at SUSET level.  We assume that the
+		 * right to insert an option into pg_authid was checked when it was
+		 * inserted.
+		 */
+		ProcessGUCArray(a, PGC_SUSET, PGC_S_USER, GUC_ACTION_SET);
 	}
 
 	caql_endscan(pcqCtx);
@@ -429,7 +435,12 @@ CheckMyDatabase(const char *name, bool am_superuser)
 		{
 			ArrayType  *a = DatumGetArrayTypeP(datum);
 
-			ProcessGUCArray(a, PGC_S_DATABASE);
+			/*
+			 * We process all the options at SUSET level.  We assume that the
+			 * right to insert an option into pg_database was checked when it
+			 * was inserted.
+			 */
+			ProcessGUCArray(a, PGC_SUSET, PGC_S_DATABASE, GUC_ACTION_SET);
 		}
 	}
 
@@ -633,6 +644,7 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
 	 */
 	RelationCacheInitialize();
 	InitCatalogCache();
+	InitPlanCache();
 
 	/* Initialize portal manager */
 	EnablePortalManager();
diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
index ab149f7e3941..60a5726a4991 100644
--- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
@@ -278,8 +278,8 @@ win866_to_win1251(PG_FUNCTION_ARGS)
 	/*
 	 * Note: There are a few characters like the "Numero" sign that exist in
 	 * all the other cyrillic encodings (win1251, ISO_8859-5 and cp866), but
-	 * not in KOI8R. As we use MULE_INTERNAL/KOI8R as an intermediary, we will
-	 * fail to convert those characters.
+	 * not in KOI8R. As we use MULE_INTERNAL/KOI8R as an intermediary, we
+	 * will fail to convert those characters.
 	 */
 	buf = palloc(len * ENCODING_GROWTH_RATE + 1);
 	win8662mic(src, buf, len);
diff --git a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c b/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c
index e65d755368fc..e43d5618f69a 100644
--- a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c
+++ b/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c
@@ -218,8 +218,7 @@ get_ten(int b, int *ku)
 static void
 shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len)
 {
-	int			c1,
-				c2;
+	int			c1;
 	int			ku,
 				ten,
 				kubun;
@@ -229,7 +228,6 @@ shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len
 	while (len > 0)
 	{
 		c1 = *sjis;
-		c2 = sjis[1];
 
 		if (!IS_HIGHBIT_SET(c1))
 		{
@@ -245,7 +243,7 @@ shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len
 
 		l = pg_encoding_verifymb(PG_SHIFT_JIS_2004, (const char *) sjis, len);
 
-		if (l < 0)
+		if (l < 0 || l > len)
 			report_invalid_encoding(PG_SHIFT_JIS_2004,
 									(const char *) sjis, len);
 
@@ -257,6 +255,8 @@ shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len
 		}
 		else if (l == 2)
 		{
+			int			c2 = sjis[1];
+
 			plane = 1;
 			ku = 1;
 			ten = 1;
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 9281571e9549..f7997d094d96 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
  *
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.61 2006/12/24 00:57:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.69.2.1 2008/05/27 12:24:46 mha Exp $
  */
 #include "postgres.h"
 
@@ -837,6 +837,28 @@ pg_encoding_mb2wchar_with_len(int encoding,
 	return (*pg_wchar_table[encoding].mb2wchar_with_len) ((const unsigned char *) from, to, len);
 }
 
+/* convert a wchar string to a multibyte */
+int
+pg_wchar2mb(const pg_wchar *from, char *to)
+{
+	return (*pg_wchar_table[DatabaseEncoding->encoding].wchar2mb_with_len) (from, (unsigned char *)to, pg_wchar_strlen(from));
+}
+
+/* convert a wchar string to a multibyte with a limited length */
+int
+pg_wchar2mb_with_len(const pg_wchar *from, char *to, int len)
+{
+	return (*pg_wchar_table[DatabaseEncoding->encoding].wchar2mb_with_len) (from, (unsigned char *)to, len);
+}
+
+/* same, with any encoding */
+int
+pg_encoding_wchar2mb_with_len(int encoding,
+							  const pg_wchar *from, char *to, int len)
+{
+	return (*pg_wchar_table[encoding].wchar2mb_with_len) (from, (unsigned char *)to, len);
+}
+
 /* returns the byte length of a multibyte word */
 int
 pg_mblen(const char *mbstr)
@@ -1024,6 +1046,25 @@ SetDatabaseEncoding(int encoding)
 
 	DatabaseEncoding = &pg_enc2name_tbl[encoding];
 	Assert(DatabaseEncoding->encoding == encoding);
+
+	/*
+	 * On Windows, we allow UTF-8 database encoding to be used with any
+	 * locale setting, because UTF-8 requires special handling anyway.
+	 * But this means that gettext() might be misled about what output
+	 * encoding it should use, so we have to tell it explicitly.
+	 *
+	 * In future we might want to call bind_textdomain_codeset
+	 * unconditionally, but that requires knowing how to spell the codeset
+	 * name properly for all encodings on all platforms, which might be
+	 * problematic.
+	 *
+	 * This is presently unnecessary, but harmless, on non-Windows platforms.
+	 */
+#ifdef ENABLE_NLS
+	if (encoding == PG_UTF8)
+		if (bind_textdomain_codeset("postgres", "UTF-8") == NULL)
+			elog(LOG, "bind_textdomain_codeset failed");
+#endif
 }
 
 /*
diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c
index 81e93d9b141b..c617c8fce5f5 100644
--- a/src/backend/utils/mb/wchar.c
+++ b/src/backend/utils/mb/wchar.c
@@ -99,8 +99,7 @@ pg_euc2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 			*to |= *from++;
 			len -= 2;
 		}
-		else
-			/* must be ASCII */
+		else							/* must be ASCII */
 		{
 			*to = *from++;
 			len--;
@@ -339,6 +338,55 @@ pg_euctw_dsplen(const unsigned char *s)
 	return len;
 }
 
+/*
+ * Convert pg_wchar to EUC_* encoding.
+ * caller must allocate enough space for "to", including a trailing zero!
+ * len: length of from.
+ * "from" not necessarily null terminated.
+ */
+static int
+pg_wchar2euc_with_len(const pg_wchar *from, unsigned char *to, int len)
+{
+	int			cnt = 0;
+
+	while (len > 0 && *from)
+	{
+		unsigned char c;
+
+		if ((c = (*from >> 24)))
+		{
+			*to++ = c;
+			*to++ = (*from >> 16) & 0xff;
+			*to++ = (*from >> 8) & 0xff;
+			*to++ = *from & 0xff;
+			cnt += 4;
+		}
+		else if ((c = (*from >> 16)))
+		{
+			*to++ = c;
+			*to++ = (*from >> 8) & 0xff;
+			*to++ = *from & 0xff;
+			cnt += 3;
+		}
+		else if ((c = (*from >> 8)))
+		{
+			*to++ = c;
+			*to++ = *from & 0xff;
+			cnt += 2;
+		}
+		else
+		{
+			*to++ = *from;
+			cnt++;
+		}
+		from++;
+		len--;
+	}
+	*to = 0;
+	return cnt;
+}
+
+
 /*
  * JOHAB
  */
@@ -453,6 +501,31 @@ unicode_to_utf8(pg_wchar c, unsigned char *utf8string)
 	return utf8string;
 }
 
+/*
+ * Trivial conversion from pg_wchar to UTF-8.
+ * caller should allocate enough space for "to"
+ * len: length of from.
+ * "from" not necessarily null terminated.
+ */
+static int
+pg_wchar2utf_with_len(const pg_wchar *from, unsigned char *to, int len)
+{
+	int			cnt = 0;
+
+	while (len > 0 && *from)
+	{
+		int char_len;
+
+		unicode_to_utf8(*from, to);
+		char_len = pg_utf_mblen(to);
+		cnt += char_len;
+		to += char_len;
+		from++;
+		len--;
+	}
+	*to = 0;
+	return cnt;
+}
 
 /*
  * Return the byte length of a UTF8 character pointed to by s
@@ -717,6 +790,77 @@ pg_mule2wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 	return cnt;
 }
 
+/*
+ * convert pg_wchar to mule internal code
+ * caller should allocate enough space for "to"
+ * len: length of from.
+ * "from" not necessarily null terminated.
+ */
+static int
+pg_wchar2mule_with_len(const pg_wchar *from, unsigned char *to, int len)
+{
+	int			cnt = 0;
+
+	while (len > 0 && *from)
+	{
+		unsigned char lb;
+
+		lb = (*from >> 16) & 0xff;
+		if (IS_LC1(lb))
+		{
+			*to++ = lb;
+			*to++ = *from & 0xff;
+			cnt += 2;
+		}
+		else if (IS_LC2(lb))
+		{
+			*to++ = lb;
+			*to++ = (*from >> 8) & 0xff;
+			*to++ = *from & 0xff;
+			cnt += 3;
+		}
+		else if (IS_LCPRV1_A_RANGE(lb))
+		{
+			*to++ = LCPRV1_A;
+			*to++ = lb;
+			*to++ = *from & 0xff;
+			cnt += 3;
+		}
+		else if (IS_LCPRV1_B_RANGE(lb))
+		{
+			*to++ = LCPRV1_B;
+			*to++ = lb;
+			*to++ = *from & 0xff;
+			cnt += 3;
+		}
+		else if (IS_LCPRV2_A_RANGE(lb))
+		{
+			*to++ = LCPRV2_A;
+			*to++ = lb;
+			*to++ = (*from >> 8) & 0xff;
+			*to++ = *from & 0xff;
+			cnt += 4;
+		}
+		else if (IS_LCPRV2_B_RANGE(lb))
+		{
+			*to++ = LCPRV2_B;
+			*to++ = lb;
+			*to++ = (*from >> 8) & 0xff;
+			*to++ = *from & 0xff;
+			cnt += 4;
+		}
+		else
+		{
+			*to++ = *from & 0xff;
+			cnt += 1;
+		}
+		from++;
+		len--;
+	}
+	*to = 0;
+	return cnt;
+}
+
 int
 pg_mule_mblen(const unsigned char *s)
 {
@@ -772,6 +916,28 @@ pg_latin12wchar_with_len(const unsigned char *from, pg_wchar *to, int len)
 	return cnt;
 }
 
+/*
+ * Trivial conversion from pg_wchar to single byte encoding. Just ignores
+ * high bits.
+ * caller should allocate enough space for "to"
+ * len: length of from.
+ * "from" not necessarily null terminated.
+ */
+static int
+pg_wchar2single_with_len(const pg_wchar *from, unsigned char *to, int len)
+{
+	int			cnt = 0;
+
+	while (len > 0 && *from)
+	{
+		*to++ = *from++;
+		len--;
+		cnt++;
+	}
+	*to = 0;
+	return cnt;
+}
+
 static int
 pg_latin1_mblen(const unsigned char *s)
 {
@@ -1339,48 +1505,48 @@ pg_utf8_islegal(const unsigned char *source, int length)
  *-------------------------------------------------------------------
  */
 pg_wchar_tbl pg_wchar_table[] = {
-	{pg_ascii2wchar_with_len, pg_ascii_mblen, pg_ascii_dsplen, pg_ascii_verifier, 1},	/* PG_SQL_ASCII */
-	{pg_eucjp2wchar_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifier, 3},	/* PG_EUC_JP */
-	{pg_euccn2wchar_with_len, pg_euccn_mblen, pg_euccn_dsplen, pg_euccn_verifier, 2},	/* PG_EUC_CN */
-	{pg_euckr2wchar_with_len, pg_euckr_mblen, pg_euckr_dsplen, pg_euckr_verifier, 3},	/* PG_EUC_KR */
-	{pg_euctw2wchar_with_len, pg_euctw_mblen, pg_euctw_dsplen, pg_euctw_verifier, 4},	/* PG_EUC_TW */
-	{pg_eucjp2wchar_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifier, 3},	/* PG_EUC_JIS_2004 */
-	{pg_utf2wchar_with_len, pg_utf_mblen, pg_utf_dsplen, pg_utf8_verifier, 4},	/* PG_UTF8 */
-	{pg_mule2wchar_with_len, pg_mule_mblen, pg_mule_dsplen, pg_mule_verifier, 4},		/* PG_MULE_INTERNAL */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN1 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN2 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN3 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN4 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN5 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN6 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN7 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN8 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN9 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN10 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1256 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1258 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN866 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN874 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_KOI8R */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1251 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1252 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-5 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-6 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-7 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-8 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1250 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1253 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1254 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1255 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1257 */
-	{pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_KOI8U */
-	{0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifier, 2},	/* PG_SJIS */
-	{0, pg_big5_mblen, pg_big5_dsplen, pg_big5_verifier, 2},	/* PG_BIG5 */
-	{0, pg_gbk_mblen, pg_gbk_dsplen, pg_gbk_verifier, 2},		/* PG_GBK */
-	{0, pg_uhc_mblen, pg_uhc_dsplen, pg_uhc_verifier, 2},		/* PG_UHC */
-	{0, pg_gb18030_mblen, pg_gb18030_dsplen, pg_gb18030_verifier, 4},	/* PG_GB18030 */
-	{0, pg_johab_mblen, pg_johab_dsplen, pg_johab_verifier, 3}, /* PG_JOHAB */
-	{0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifier, 2}		/* PG_SHIFT_JIS_2004 */
+	{pg_ascii2wchar_with_len, pg_wchar2single_with_len, pg_ascii_mblen, pg_ascii_dsplen, pg_ascii_verifier, 1},	/* PG_SQL_ASCII */
+	{pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifier, 3},	/* PG_EUC_JP */
+	{pg_euccn2wchar_with_len, pg_wchar2euc_with_len, pg_euccn_mblen, pg_euccn_dsplen, pg_euccn_verifier, 2},	/* PG_EUC_CN */
+	{pg_euckr2wchar_with_len, pg_wchar2euc_with_len, pg_euckr_mblen, pg_euckr_dsplen, pg_euckr_verifier, 3},	/* PG_EUC_KR */
+	{pg_euctw2wchar_with_len, pg_wchar2euc_with_len, pg_euctw_mblen, pg_euctw_dsplen, pg_euctw_verifier, 4},	/* PG_EUC_TW */
+	{pg_eucjp2wchar_with_len, pg_wchar2euc_with_len, pg_eucjp_mblen, pg_eucjp_dsplen, pg_eucjp_verifier, 3},	/* PG_EUC_JIS_2004 */
+	{pg_utf2wchar_with_len, pg_wchar2utf_with_len, pg_utf_mblen, pg_utf_dsplen, pg_utf8_verifier, 4},	/* PG_UTF8 */
+	{pg_mule2wchar_with_len, pg_wchar2mule_with_len, pg_mule_mblen, pg_mule_dsplen, pg_mule_verifier, 4},		/* PG_MULE_INTERNAL */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN1 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN2 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN3 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN4 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN5 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN6 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN7 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN8 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN9 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_LATIN10 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1256 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1258 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN866 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN874 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_KOI8R */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1251 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1252 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-5 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-6 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-7 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* ISO-8859-8 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1250 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1253 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1254 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1255 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_WIN1257 */
+	{pg_latin12wchar_with_len, pg_wchar2single_with_len, pg_latin1_mblen, pg_latin1_dsplen, pg_latin1_verifier, 1},		/* PG_KOI8U */
+	{0, 0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifier, 2},	/* PG_SJIS */
+	{0, 0, pg_big5_mblen, pg_big5_dsplen, pg_big5_verifier, 2},	/* PG_BIG5 */
+	{0, 0, pg_gbk_mblen, pg_gbk_dsplen, pg_gbk_verifier, 2},		/* PG_GBK */
+	{0, 0, pg_uhc_mblen, pg_uhc_dsplen, pg_uhc_verifier, 2},		/* PG_UHC */
+	{0, 0, pg_gb18030_mblen, pg_gb18030_dsplen, pg_gb18030_verifier, 4},	/* PG_GB18030 */
+	{0, 0, pg_johab_mblen, pg_johab_dsplen, pg_johab_verifier, 3}, /* PG_JOHAB */
+	{0, 0, pg_sjis_mblen, pg_sjis_dsplen, pg_sjis_verifier, 2}		/* PG_SHIFT_JIS_2004 */
 };
 
 /* returns the byte length of a word for mule internal code */
@@ -1638,10 +1804,10 @@ report_untranslatable_char(int src_encoding, int dest_encoding,
 
 	ereport(ERROR,
 			(errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),
-	  errmsg("character 0x%s of encoding \"%s\" has no equivalent in \"%s\"",
-			 buf,
-			 pg_enc2name_tbl[src_encoding].name,
-			 pg_enc2name_tbl[dest_encoding].name)));
+			 errmsg("character 0x%s of encoding \"%s\" has no equivalent in \"%s\"",
+					buf,
+					pg_enc2name_tbl[src_encoding].name,
+					pg_enc2name_tbl[dest_encoding].name)));
 }
 
 #endif
diff --git a/src/backend/utils/misc/faultinjector.c b/src/backend/utils/misc/faultinjector.c
index 9813d73ccb9b..62081fc9031c 100644
--- a/src/backend/utils/misc/faultinjector.c
+++ b/src/backend/utils/misc/faultinjector.c
@@ -24,8 +24,8 @@
 #include "cdb/cdbfilerep.h"
 #include "cdb/cdbfilerepservice.h"
 #include "cdb/cdbresynchronizechangetracking.h"
-#include "postmaster/bgwriter.h"
 #include "cdb/cdbutil.h"
+#include "postmaster/bgwriter.h"
 #include "postmaster/fts.h"
 #include "storage/spin.h"
 #include "storage/shmem.h"
@@ -822,7 +822,7 @@ FaultInjector_InjectFaultIfSet(
 				FaultInjector_UpdateHashEntry(entryLocal);
 			}
 
-			RequestCheckpoint(true, false);
+			RequestCheckpoint(CHECKPOINT_WAIT | CHECKPOINT_IMMEDIATE);
 			ereport(PANIC,
 					(errmsg("fault triggered, fault name:'%s' fault type:'%s' ",
 							FaultInjectorIdentifierEnumToString[entryLocal->faultInjectorIdentifier],
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 9e1ac348bd82..956d582070a0 100755
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.47 2007/02/10 14:58:55 petere Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.53 2008/01/01 19:45:54 momjian Exp $
  */
 
 %{
@@ -135,6 +135,10 @@ ProcessConfigFile(GucContext context)
 {
 	int			elevel;
 	struct name_value_pair *item, *head, *tail;
+	char	   *cvc = NULL;
+	struct config_string *cvc_struct;
+	const char *envvar;
+	int			i;
 
 	Assert(context == PGC_POSTMASTER || context == PGC_SIGHUP);
 
@@ -149,6 +153,7 @@ ProcessConfigFile(GucContext context)
 	else
 		elevel = ERROR;
 
+	/* Parse the file into a list of option names and values */
 	head = tail = NULL;
 
 	if (!ParseConfigFile(ConfigFileName, NULL,
@@ -156,17 +161,177 @@ ProcessConfigFile(GucContext context)
 						 &head, &tail))
 		goto cleanup_list;
 
-	/* try to apply options brute-force; depending on the context bad ones will be
-	 * logged accordingly;
+	/*
+	 * We need the proposed new value of custom_variable_classes to check
+	 * custom variables with.  ParseConfigFile ensured that if it's in
+	 * the file, it's first in the list.  But first check to see if we
+	 * have an active value from the command line, which should override
+	 * the file in any case.  (Since there's no relevant env var, the
+	 * only possible nondefault sources are the file and ARGV.)
+	 */
+	cvc_struct = (struct config_string *)
+		find_option("custom_variable_classes", false, elevel);
+	if (cvc_struct && cvc_struct->gen.reset_source > PGC_S_FILE)
+	{
+		cvc = guc_strdup(elevel, cvc_struct->reset_val);
+		if (cvc == NULL)
+			goto cleanup_list;
+	}
+	else if (head != NULL &&
+			 guc_name_compare(head->name, "custom_variable_classes") == 0)
+	{
+		/*
+		 * Need to canonicalize the value via the assign hook.  Casting away
+		 * const is a bit ugly, but we know the result is malloc'd.
+		 */
+		cvc = (char *) assign_custom_variable_classes(head->value,
+													  false, PGC_S_FILE);
+		if (cvc == NULL)
+		{
+			ereport(elevel,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("invalid value for parameter \"%s\": \"%s\"",
+							head->name, head->value)));
+			goto cleanup_list;
+		}
+	}
+
+	/*
+	 * Mark all extant GUC variables as not present in the config file.
+	 * We need this so that we can tell below which ones have been removed
+	 * from the file since we last processed it.
+	 */
+	for (i = 0; i < num_guc_variables; i++)
+	{
+		struct config_generic *gconf = guc_variables[i];
+
+		gconf->status &= ~GUC_IS_IN_FILE;
+	}
+
+	/*
+	 * Check if all options are valid.  As a side-effect, the GUC_IS_IN_FILE
+	 * flag is set on each GUC variable mentioned in the list.
+	 */
+	for (item = head; item; item = item->next)
+	{
+		char *sep = strchr(item->name, GUC_QUALIFIER_SEPARATOR);
+
+		if (sep)
+		{
+			/*
+			 * We have to consider three cases for custom variables:
+			 *
+			 * 1. The class name is not valid according to the (new) setting
+			 * of custom_variable_classes.  If so, reject.  We don't care
+			 * which side is at fault.
+			 */
+			if (!is_custom_class(item->name, sep - item->name, cvc))
+			{
+				ereport(elevel,
+						(errcode(ERRCODE_UNDEFINED_OBJECT),
+						 errmsg("unrecognized configuration parameter \"%s\"",
+								item->name)));
+				goto cleanup_list;
+			}
+			/*
+			 * 2. There is no GUC entry.  If we called set_config_option then
+			 * it would make a placeholder, which we don't want to do yet,
+			 * since we could still fail further down the list.  Do nothing
+			 * (assuming that making the placeholder will succeed later).
+			 */
+			if (find_option(item->name, false, elevel) == NULL)
+				continue;
+			/*
+			 * 3. There is already a GUC entry (either real or placeholder) for
+			 * the variable.  In this case we should let set_config_option
+			 * check it, since the assignment could well fail if it's a real
+			 * entry.
+			 */
+		}
+
+		if (!set_config_option(item->name, item->value, context,
+							   PGC_S_FILE, GUC_ACTION_SET, false))
+			goto cleanup_list;
+	}
+
+	/*
+	 * Check for variables having been removed from the config file, and
+	 * revert their reset values (and perhaps also effective values) to the
+	 * boot-time defaults.  If such a variable can't be changed after startup,
+	 * just throw a warning and continue.  (This is analogous to the fact that
+	 * set_config_option only throws a warning for a new but different value.
+	 * If we wanted to make it a hard error, we'd need an extra pass over the
+	 * list so that we could throw the error before starting to apply
+	 * changes.)
+	 */
+	for (i = 0; i < num_guc_variables; i++)
+	{
+		struct config_generic *gconf = guc_variables[i];
+		GucStack   *stack;
+
+		if (gconf->reset_source != PGC_S_FILE ||
+			(gconf->status & GUC_IS_IN_FILE))
+			continue;
+		if (gconf->context < PGC_SIGHUP)
+		{
+			ereport(elevel,
+					(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
+					 errmsg("parameter \"%s\" cannot be changed after server start; configuration file change ignored",
+							gconf->name)));
+			continue;
+		}
+
+		/*
+		 * Reset any "file" sources to "default", else set_config_option
+		 * will not override those settings.
+		 */
+		if (gconf->reset_source == PGC_S_FILE)
+			gconf->reset_source = PGC_S_DEFAULT;
+		if (gconf->source == PGC_S_FILE)
+			gconf->source = PGC_S_DEFAULT;
+		for (stack = gconf->stack; stack; stack = stack->prev)
+		{
+			if (stack->source == PGC_S_FILE)
+				stack->source = PGC_S_DEFAULT;
+		}
+
+		/* Now we can re-apply the wired-in default */
+		set_config_option(gconf->name, NULL, context, PGC_S_DEFAULT,
+						  GUC_ACTION_SET, true);
+	}
+
+	/*
+	 * Restore any variables determined by environment variables.  This
+	 * is a no-op except in the case where one of these had been in the
+	 * config file and is now removed.  PGC_S_ENV_VAR will override the
+	 * wired-in default we just applied, but cannot override any other source.
+	 *
+	 * Keep this list in sync with InitializeGUCOptions()!
+	 * PGPORT can be ignored, because it cannot be changed without restart.
+	 * We assume rlimit hasn't changed, either.
 	 */
+	envvar = getenv("PGDATESTYLE");
+	if (envvar != NULL)
+		set_config_option("datestyle", envvar, PGC_POSTMASTER,
+						  PGC_S_ENV_VAR, GUC_ACTION_SET, true);
+
+	envvar = getenv("PGCLIENTENCODING");
+	if (envvar != NULL)
+		set_config_option("client_encoding", envvar, PGC_POSTMASTER,
+						  PGC_S_ENV_VAR, GUC_ACTION_SET, true);
+
+
+	/* If we got here all the options checked out okay, so apply them. */
 	for (item = head; item; item = item->next)
 	{
 		set_config_option(item->name, item->value, context,
-						  PGC_S_FILE, false, true);
+						  PGC_S_FILE, GUC_ACTION_SET, true);
 	}
 
  cleanup_list:
 	free_name_value_list(head);
+	if (cvc)
+		free(cvc);
 }
 
 
@@ -264,6 +429,7 @@ ParseConfigFile(const char *config_file, const char *calling_file,
 	while ((token = yylex()))
 	{
 		char	   *opt_name, *opt_value;
+		struct name_value_pair *item;
 
 		if (token == GUC_EOL)	/* empty or comment line */
 			continue;
@@ -296,7 +462,7 @@ ParseConfigFile(const char *config_file, const char *calling_file,
 			goto parse_error;
 
 		/* OK, process the option name and value */
-		if (pg_strcasecmp(opt_name, "include") == 0)
+		if (guc_name_compare(opt_name, "include") == 0)
 		{
 			/*
 			 * An include directive isn't a variable and should be processed
@@ -319,23 +485,39 @@ ParseConfigFile(const char *config_file, const char *calling_file,
 			pfree(opt_name);
 			pfree(opt_value);
 		}
-		else if (pg_strcasecmp(opt_name, "custom_variable_classes") == 0)
+		else if (guc_name_compare(opt_name, "custom_variable_classes") == 0)
 		{
 			/*
 			 * This variable must be processed first as it controls
-			 * the validity of other variables; so apply immediately.
-			 * This may fail; plow through, all failures get logged properly.
+			 * the validity of other variables; so it goes at the head
+			 * of the result list.  If we already found a value for it,
+			 * replace with this one.
 			 */
-			set_config_option(opt_name, opt_value, context,
-								   PGC_S_FILE, false, true);
-			pfree(opt_name);
-			pfree(opt_value);
+			item = *head_p;
+			if (item != NULL &&
+				guc_name_compare(item->name, "custom_variable_classes") == 0)
+			{
+				/* replace existing head item */
+				pfree(item->name);
+				pfree(item->value);
+				item->name = opt_name;
+				item->value = opt_value;
+			}
+			else
+			{
+				/* prepend to list */
+				item = palloc(sizeof *item);
+				item->name = opt_name;
+				item->value = opt_value;
+				item->next = *head_p;
+				*head_p = item;
+				if (*tail_p == NULL)
+					*tail_p = item;
+			}
 		}
 		else
 		{
-			/* append to list */
-			struct name_value_pair *item;
-
+			/* ordinary variable, append to list */
 			item = palloc(sizeof *item);
 			item->name = opt_name;
 			item->value = opt_value;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index d98d10fc6d7d..2886771f0ad1 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -26,15 +26,16 @@
 #include <syslog.h>
 #endif
 
-
 #include "access/gin.h"
 #include "access/transam.h"
 #include "access/twophase.h"
 #include "access/xact.h"
 #include "catalog/namespace.h"
 #include "commands/async.h"
+#include "commands/prepare.h"
 #include "commands/vacuum.h"
 #include "commands/variable.h"
+#include "commands/trigger.h"
 #include "funcapi.h"
 #include "libpq/auth.h"
 #include "libpq/pqformat.h"
@@ -54,13 +55,17 @@
 #include "postmaster/syslogger.h"
 #include "replication/walsender.h"
 #include "replication/walreceiver.h"
+#include "postmaster/walwriter.h"
 #include "storage/fd.h"
 #include "storage/freespace.h"
 #include "tcop/tcopprot.h"
+#include "tsearch/ts_cache.h"
 #include "utils/builtins.h"
 #include "utils/guc_tables.h"
 #include "utils/memutils.h"
 #include "utils/pg_locale.h"
+#include "utils/plancache.h"
+#include "utils/portal.h"
 #include "utils/ps_status.h"
 #include "utils/tzparser.h"
 #include "utils/xml.h"
@@ -106,11 +111,20 @@ extern bool Log_disconnections;
 extern int	CommitDelay;
 extern int	CommitSiblings;
 extern char *default_tablespace;
+extern char *temp_tablespaces;
+extern bool synchronize_seqscans;
 extern bool fullPageWrites;
+extern int	ssl_renegotiation_limit;
 
 #ifdef USE_SSL
 extern char *SSLCipherSuites;
 #endif
+#ifdef TRACE_SYNCSCAN
+extern bool trace_syncscan;
+#endif
+#ifdef DEBUG_BOUNDED_SORT
+extern bool optimize_bounded_sort;
+#endif
 
 #ifdef USE_SSL
 extern char *SSLCipherSuites;
@@ -131,6 +145,8 @@ static const char *assign_syslog_ident(const char *ident,
 
 static const char *assign_defaultxactisolevel(const char *newval, bool doit,
 						   GucSource source);
+static const char *assign_session_replication_role(const char *newval, bool doit,
+								GucSource source);
 static const char *assign_log_min_messages(const char *newval, bool doit,
 						GucSource source);
 static const char *assign_client_min_messages(const char *newval,
@@ -157,7 +173,7 @@ static const char *assign_backslash_quote(const char *newval, bool doit, GucSour
 static const char *assign_timezone_abbreviations(const char *newval, bool doit, GucSource source);
 static const char *assign_xmlbinary(const char *newval, bool doit, GucSource source);
 static const char *assign_xmloption(const char *newval, bool doit, GucSource source);
-
+static const char *show_archive_command(void);
 static bool assign_tcp_keepalives_idle(int newval, bool doit, GucSource source);
 static bool assign_tcp_keepalives_interval(int newval, bool doit, GucSource source);
 static bool assign_tcp_keepalives_count(int newval, bool doit, GucSource source);
@@ -170,14 +186,11 @@ static bool assign_autovacuum_max_workers(int newval, bool doit, GucSource sourc
 static bool assign_maxconnections(int newval, bool doit, GucSource source);
 
 static const char *assign_application_name(const char *newval, bool doit, GucSource source);
-static bool assign_autovacuum_warning(bool newval, bool doit, GucSource source);
 
 static int	defunct_int = 0;
 static bool	defunct_bool = false;
 static double defunct_double = 0;
 
-static bool dummy_autovac = false;
-
 /*
  * GUC option variables that are exported from this module
  */
@@ -251,6 +264,7 @@ static char *client_encoding_string;
 static char *IntervalStyle_string;
 static char *datestyle_string;
 static char *default_iso_level_string;
+static char *session_replication_role_string;
 static char *locale_ctype;
 static char *regex_flavor_string;
 static char *server_encoding_string;
@@ -459,11 +473,9 @@ const char *const config_type_names[] =
  * 5. Add it to src/backend/utils/misc/postgresql.conf.sample, if
  *	  appropriate.
  *
- * 6. Add it to src/bin/psql/tab-complete.c, if it's a USERSET option.
- *
- * 7. Don't forget to document the option.
+ * 6. Don't forget to document the option (at least in config.sgml).
  *
- * 8. If it's a new GUC_LIST option you must edit pg_dumpall.c to ensure
+ * 7. If it's a new GUC_LIST option you must edit pg_dumpall.c to ensure
  *	  it is not single quoted at dump time.
  */
 
@@ -594,6 +606,14 @@ static struct config_bool ConfigureNamesBool[] =
 		&enableFsync,
 		true, NULL, NULL
 	},
+	{
+		{"synchronous_commit", PGC_USERSET, WAL_SETTINGS,
+			gettext_noop("Sets immediate fsync at commit."),
+			NULL
+		},
+		&XactSyncCommit,
+		true, NULL, NULL
+	},
 	{
 		{"zero_damaged_pages", PGC_SUSET, DEVELOPER_OPTIONS,
 			gettext_noop("Continues processing past damaged page headers."),
@@ -630,6 +650,14 @@ static struct config_bool ConfigureNamesBool[] =
 		&SilentMode,
 		false, NULL, NULL
 	},
+	{
+		{"log_checkpoints", PGC_SIGHUP, LOGGING_WHAT,
+			gettext_noop("Logs each checkpoint."),
+			NULL
+		},
+		&log_checkpoints,
+		false, NULL, NULL
+	},
 	{
 		{"log_connections", PGC_BACKEND, LOGGING_WHAT,
 			gettext_noop("Logs each successful connection."),
@@ -765,6 +793,7 @@ static struct config_bool ConfigureNamesBool[] =
 		&Explain_pretty_print,
 		true, NULL, NULL
 	},
+
 	{
 		{"track_activities", PGC_SUSET, STATS_COLLECTOR,
 			gettext_noop("Collects information about executing commands."),
@@ -781,7 +810,7 @@ static struct config_bool ConfigureNamesBool[] =
 			NULL
 		},
 		&pgstat_track_counts,
-		false, NULL, NULL
+		true, NULL, NULL
 	},
 
 	{
@@ -794,7 +823,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"update_process_title", PGC_SUSET, CLIENT_CONN_OTHER,
+		{"update_process_title", PGC_SUSET, STATS_COLLECTOR,
 			gettext_noop("Updates the process title to show the active SQL command."),
 			gettext_noop("Enables updating of the process title every time a new SQL command is received by the server.")
 		},
@@ -808,8 +837,22 @@ static struct config_bool ConfigureNamesBool[] =
 			NULL,
 			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
-		&dummy_autovac,
-		false, assign_autovacuum_warning, NULL
+		&autovacuum_start_daemon,
+		/*
+		 * GPDB: The default for autovacuum is intentionally 'off', even though it's 'on'
+		 * in PostgreSQL. We may want to revisit this later, but people had bad experience
+		 * with autovacuum on GPDB 4.3 versions. Mainly, it's problematic in a cluster when
+		 * autovacuum kicks in in a single segment: the performance of the cluster is often
+		 * only as good as the slowest segment, so autovacuum running on one segment slows
+		 * down the whole system. Also, auto-analyze is problematic, because we actually
+		 * need to collect statistics across all segments in the master, rather than collect
+		 * per-segment statistics at different times in different segments.
+		 *
+		 * So, disabled by default for now. You can still turn it on manually if you know what
+		 * you're doing (e.g. it might be ok to let autovacuum handle small fact tables and
+		 * catalog tables, and schedule manual vacuums for all the big tables).
+		 */
+		false, NULL, NULL
 	},
 
 	{
@@ -861,6 +904,15 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 #endif
 
+	{
+		{"log_lock_waits", PGC_SUSET, LOGGING_WHAT,
+			gettext_noop("Logs long lock waits."),
+			NULL
+		},
+		&log_lock_waits,
+		false, NULL, NULL
+	},
+
 	{
 		{"log_hostname", PGC_SIGHUP, LOGGING_WHAT,
 			gettext_noop("Logs the host name in the connection logs."),
@@ -974,12 +1026,11 @@ static struct config_bool ConfigureNamesBool[] =
 		false, NULL, NULL
 	},
 	{
-		{"redirect_stderr", PGC_POSTMASTER, DEFUNCT_OPTIONS,
-			gettext_noop("Defunct: start a subprocess to capture stderr output into log files."),
-		 	NULL,
-		 	GUC_NO_SHOW_ALL
+		{"logging_collector", PGC_POSTMASTER, DEFUNCT_OPTIONS,
+			gettext_noop("Defunct: Start a subprocess to capture stderr output and/or csvlogs into log files."),
+			NULL
 		},
-		&Redirect_stderr,
+		&Logging_collector,
 		true, NULL, NULL
 	},
 	{
@@ -1001,6 +1052,33 @@ static struct config_bool ConfigureNamesBool[] =
 		false, NULL, NULL
 	},
 
+#ifdef TRACE_SYNCSCAN
+	/* this is undocumented because not exposed in a standard build */
+	{
+		{"trace_syncscan", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Generate debugging output for synchronized scanning."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&trace_syncscan,
+		false, NULL, NULL
+	},
+#endif
+
+#ifdef DEBUG_BOUNDED_SORT
+	/* this is undocumented because not exposed in a standard build */
+	{
+		{
+			"optimize_bounded_sort", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable bounded sorting using heap sort."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimize_bounded_sort,
+		true, NULL, NULL
+	},
+#endif
+
 #ifdef WAL_DEBUG
 	{
 		{"wal_debug", PGC_SUSET, DEVELOPER_OPTIONS,
@@ -1029,7 +1107,7 @@ static struct config_bool ConfigureNamesBool[] =
 
 	{
 		{"krb_caseins_users", PGC_POSTMASTER, CONN_AUTH_SECURITY,
-			gettext_noop("Sets whether Kerberos user names should be treated as case-insensitive."),
+			gettext_noop("Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."),
 			NULL
 		},
 		&pg_krb_caseins_users,
@@ -1055,6 +1133,24 @@ static struct config_bool ConfigureNamesBool[] =
 		true, NULL, NULL
 	},
 
+	{
+		{"synchronize_seqscans", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
+			gettext_noop("Enable synchronized sequential scans."),
+			NULL
+		},
+		&synchronize_seqscans,
+		true, NULL, NULL
+	},
+
+	{
+		{"archive_mode", PGC_POSTMASTER, WAL_SETTINGS,
+			gettext_noop("Allows archiving of WAL files using archive_command."),
+			NULL
+		},
+		&XLogArchiveMode,
+		false, NULL, NULL
+	},
+
 	{
 		{"ignore_system_indexes", PGC_BACKEND, DEVELOPER_OPTIONS,
 			gettext_noop("Disables reading from system indexes."),
@@ -1083,7 +1179,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_UNIT_S | GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
 		&XLogArchiveTimeout,
-		0, 0, INT_MAX, NULL, NULL
+		0, 0, INT_MAX / 2, NULL, NULL
 	},
 	{
 		{"post_auth_delay", PGC_BACKEND, DEVELOPER_OPTIONS,
@@ -1092,7 +1188,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL | GUC_UNIT_S
 		},
 		&PostAuthDelay,
-		0, 0, INT_MAX, NULL, NULL
+		0, 0, INT_MAX / 1000000, NULL, NULL
 	},
 	{
 		{"default_statistics_target", PGC_USERSET, STATS_ANALYZE,
@@ -1170,7 +1266,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_UNIT_MS
 		},
 		&DeadlockTimeout,
-		1000, 0, INT_MAX, NULL, NULL
+		1000, 1, INT_MAX / 1000, NULL, NULL
 	},
 
 	/*
@@ -1182,8 +1278,8 @@ static struct config_int ConfigureNamesInt[] =
 	 *
 	 * MaxBackends is limited to INT_MAX/4 because some places compute
 	 * 4*MaxBackends without any overflow check.  This check is made on
-	 * assign_maxconnections, since MaxBackends is computed as MaxConnections +
-	 * autovacuum_max_workers.
+	 * assign_maxconnections, since MaxBackends is computed as MaxConnections
+	 * + autovacuum_max_workers.
 	 *
 	 * Likewise we have to limit NBuffers to INT_MAX/2.
 	 */
@@ -1332,7 +1428,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_UNIT_MS | GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
 		&autovacuum_vac_cost_delay,
-		-1, -1, 1000, NULL, NULL
+		20, -1, 1000, NULL, NULL
 	},
 
 	{
@@ -1496,7 +1592,17 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"commit_delay", PGC_USERSET, WAL_CHECKPOINTS,
+		{"wal_writer_delay", PGC_SIGHUP, WAL_SETTINGS,
+			gettext_noop("WAL writer sleep time between WAL flushes."),
+			NULL,
+			GUC_UNIT_MS
+		},
+		&WalWriterDelay,
+		200, 1, 10000, NULL, NULL
+	},
+
+	{
+		{"commit_delay", PGC_USERSET, WAL_SETTINGS,
 			gettext_noop("Sets the delay in microseconds between transaction commit and "
 						 "flushing WAL to disk."),
 			NULL,
@@ -1507,7 +1613,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"commit_siblings", PGC_USERSET, WAL_CHECKPOINTS,
+		{"commit_siblings", PGC_USERSET, WAL_SETTINGS,
 			gettext_noop("Sets the minimum concurrent open transactions before performing "
 						 "commit_delay."),
 			NULL,
@@ -1530,15 +1636,26 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"log_min_duration_statement", PGC_SUSET, LOGGING_WHEN,
-			gettext_noop("Sets the minimum execution time above which statements will "
-						 "be logged."),
-			gettext_noop("Zero prints all queries. The default is -1 (turning this feature off)."),
+			gettext_noop("Sets the minimum execution time above which "
+						 "statements will be logged."),
+			gettext_noop("Zero prints all queries. -1 turns this feature off."),
 			GUC_UNIT_MS | GUC_GPDB_ADDOPT
 		},
 		&log_min_duration_statement,
 		-1, -1, INT_MAX / 1000, NULL, NULL
 	},
 
+	{
+		{"log_autovacuum_min_duration", PGC_SIGHUP, LOGGING_WHAT,
+			gettext_noop("Sets the minimum execution time above which "
+						 "autovacuum actions will be logged."),
+			gettext_noop("Zero prints all actions. -1 turns autovacuum logging off."),
+			GUC_UNIT_MS
+		},
+		&Log_autovacuum_min_duration,
+		-1, -1, INT_MAX / 1000, NULL, NULL
+	},
+
 	{
 		{"bgwriter_delay", PGC_SIGHUP, RESOURCES,
 			gettext_noop("Background writer sleep time between rounds."),
@@ -1556,17 +1673,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
 		&bgwriter_lru_maxpages,
-		5, 0, 1000, NULL, NULL
-	},
-
-	{
-		{"bgwriter_all_maxpages", PGC_SIGHUP, RESOURCES,
-			gettext_noop("Background writer maximum number of all pages to flush per round."),
-			NULL,
-			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
-		},
-		&bgwriter_all_maxpages,
-		5, 0, 1000, NULL, NULL
+		100, 0, 1000, NULL, NULL
 	},
 
 	{
@@ -1645,7 +1752,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_UNIT_S | GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
 		&autovacuum_naptime,
-		60, 1, INT_MAX, NULL, NULL
+		60, 1, INT_MAX / 1000, NULL, NULL
 	},
 	{
 		{"autovacuum_vacuum_threshold", PGC_SIGHUP, DEFUNCT_OPTIONS,
@@ -1654,7 +1761,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
 		&autovacuum_vac_thresh,
-		500, 0, INT_MAX, NULL, NULL
+		50, 0, INT_MAX, NULL, NULL
 	},
 	{
 		{"autovacuum_analyze_threshold", PGC_SIGHUP, DEFUNCT_OPTIONS,
@@ -1663,7 +1770,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
 		&autovacuum_anl_thresh,
-		250, 0, INT_MAX, NULL, NULL
+		50, 0, INT_MAX, NULL, NULL
 	},
 	{
 		/* see varsup.c for why this is PGC_POSTMASTER not PGC_SIGHUP */
@@ -1675,6 +1782,15 @@ static struct config_int ConfigureNamesInt[] =
 		&autovacuum_freeze_max_age,
 		200000000, 1000, 2000000000, NULL, NULL
 	},
+	{
+		/* see max_connections */
+		{"autovacuum_max_workers", PGC_POSTMASTER, AUTOVACUUM,
+			gettext_noop("Sets the maximum number of simultaneously running autovacuum worker processes."),
+			NULL
+		},
+		&autovacuum_max_workers,
+		3, 1, INT_MAX / 4, assign_autovacuum_max_workers, NULL
+	},
 
 	{
 		{"tcp_keepalives_idle", PGC_USERSET, CLIENT_CONN_OTHER,
@@ -1696,6 +1812,16 @@ static struct config_int ConfigureNamesInt[] =
 		0, 0, INT_MAX, assign_tcp_keepalives_interval, show_tcp_keepalives_interval
 	},
 
+	{
+		{"ssl_renegotiation_limit", PGC_USERSET, CONN_AUTH_SECURITY,
+			gettext_noop("Set the amount of traffic to send and receive before renegotiating the encryption keys."),
+			NULL,
+			GUC_UNIT_KB,
+		},
+		&ssl_renegotiation_limit,
+		512 * 1024, 0, MAX_KILOBYTES, NULL, NULL
+	},
+
 	{
 		{"tcp_keepalives_count", PGC_USERSET, CLIENT_CONN_OTHER,
 			gettext_noop("Maximum number of TCP keepalive retransmits."),
@@ -1740,7 +1866,7 @@ static struct config_int ConfigureNamesInt[] =
 		&server_version_num,
 		PG_VERSION_NUM, PG_VERSION_NUM, PG_VERSION_NUM, NULL, NULL
 	},
-				
+
 	{
 		{"log_temp_files", PGC_USERSET, LOGGING_WHAT,
 			gettext_noop("Log the use of temporary files larger than this number of kilobytes."),
@@ -1858,23 +1984,13 @@ static struct config_real ConfigureNamesReal[] =
 		1.0, 0.0, 100.0, NULL, NULL
 	},
 	{
-		{"bgwriter_lru_percent", PGC_SIGHUP, RESOURCES,
-			gettext_noop("Background writer percentage of LRU buffers to flush per round."),
-			NULL,
-			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
-		},
-		&bgwriter_lru_percent,
-		1.0, 0.0, 100.0, NULL, NULL
-	},
-
-	{
-		{"bgwriter_all_percent", PGC_SIGHUP, RESOURCES,
-			gettext_noop("Background writer percentage of all buffers to flush per round."),
+		{"bgwriter_lru_multiplier", PGC_SIGHUP, RESOURCES,
+			gettext_noop("Background writer multiplier on average buffers to scan per round."),
 			NULL,
 			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
-		&bgwriter_all_percent,
-		0.333, 0.0, 100.0, NULL, NULL
+		&bgwriter_lru_multiplier,
+		2.0, 0.0, 10.0, NULL, NULL
 	},
 
 	{
@@ -1906,6 +2022,15 @@ static struct config_real ConfigureNamesReal[] =
 		0.1, 0.0, 100.0, NULL, NULL
 	},
 
+	{
+		{"checkpoint_completion_target", PGC_SIGHUP, WAL_CHECKPOINTS,
+			gettext_noop("Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."),
+			NULL
+		},
+		&CheckPointCompletionTarget,
+		0.5, 0.0, 1.0, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, 0.0, 0.0, 0.0, NULL, NULL
@@ -1932,7 +2057,7 @@ static struct config_string ConfigureNamesString[] =
 			GUC_NOT_IN_SAMPLE | GUC_NO_SHOW_ALL
 		},
 		&XLogArchiveCommand,
-		"", NULL, NULL
+		"", NULL, show_archive_command
 	},
 
 	{
@@ -2058,6 +2183,22 @@ static struct config_string ConfigureNamesString[] =
 		"", assign_default_tablespace, NULL
 	},
 
+/*
+ * GPDB_83_MERGE_FIXME: what to do with temp tablespaces in GPDB? we
+ * had something similar with filespaces, I think. See also comments in
+ * OpenTemporaryFile()
+ */
+#if 0
+	{
+		{"temp_tablespaces", PGC_USERSET, CLIENT_CONN_STATEMENT,
+			gettext_noop("Sets the tablespace(s) to use for temporary tables and sort files."),
+			NULL,
+			GUC_LIST_INPUT | GUC_LIST_QUOTE
+		},
+		&temp_tablespaces,
+		"", assign_temp_tablespaces, NULL
+	},
+#endif
 	{
 		{"default_transaction_isolation", PGC_USERSET, CLIENT_CONN_STATEMENT,
 			gettext_noop("Sets the transaction isolation level of each new transaction."),
@@ -2068,6 +2209,16 @@ static struct config_string ConfigureNamesString[] =
 		"read committed", assign_defaultxactisolevel, NULL
 	},
 
+	{
+		{"session_replication_role", PGC_SUSET, CLIENT_CONN_STATEMENT,
+			gettext_noop("Sets the session's behavior for triggers and rewrite rules."),
+			gettext_noop("Each session can be either"
+						 " \"origin\", \"replica\", or \"local\".")
+		},
+		&session_replication_role_string,
+		"origin", assign_session_replication_role, NULL
+	},
+
 	{
 		{"dynamic_library_path", PGC_SUSET, CLIENT_CONN_OTHER,
 			gettext_noop("Sets the path for dynamically loadable modules."),
@@ -2082,7 +2233,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"krb_server_keyfile", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"krb_server_keyfile", PGC_POSTMASTER, CONN_AUTH_SECURITY,
 			gettext_noop("Sets the location of the Kerberos server key file."),
 			NULL,
 			GUC_SUPERUSER_ONLY
@@ -2255,8 +2406,9 @@ static struct config_string ConfigureNamesString[] =
 	{
 		{"log_destination", PGC_SIGHUP, DEFUNCT_OPTIONS,
 			gettext_noop("Defunct: Sets the destination for server log output."),
-			gettext_noop("Valid values are combinations of \"stderr\", \"syslog\", "
-						 "and \"eventlog\", depending on the platform."),
+			gettext_noop("Valid values are combinations of \"stderr\", "
+						 "\"syslog\", \"csvlog\", and \"eventlog\", "
+						 "depending on the platform."),
 			GUC_LIST_INPUT | GUC_NO_SHOW_ALL
 		},
 		&log_destination_string,
@@ -2452,6 +2604,15 @@ static struct config_string ConfigureNamesString[] =
 		"pg_stat_tmp", assign_pgstat_temp_directory, NULL
 	},
 
+	{
+		{"default_text_search_config", PGC_USERSET, CLIENT_CONN_LOCALE,
+			gettext_noop("Sets default text search configuration."),
+			NULL
+		},
+		&TSCurrentConfig,
+		"pg_catalog.simple", assignTSCurrentConfig, NULL
+	},
+
 #ifdef USE_SSL
 	{
 		{"ssl_ciphers", PGC_POSTMASTER, CONN_AUTH_SECURITY,
@@ -2521,8 +2682,6 @@ static int	size_guc_variables;
 
 static bool guc_dirty;			/* TRUE if need to do commit/abort work */
 
-static bool guc_cannotprepare;                        /* TRUE if this transaction cannot be prepared for 2PC */
-
 static bool reporting_enabled;	/* TRUE to enable GUC_REPORT */
 
 static int	GUCNestLevel = 0;	/* 1 when in main transaction */
@@ -2530,7 +2689,7 @@ static int	GUCNestLevel = 0;	/* 1 when in main transaction */
 
 static int	guc_var_compare(const void *a, const void *b);
 static int	guc_name_compare(const char *namea, const char *nameb);
-static void push_old_value(struct config_generic * gconf);
+static void push_old_value(struct config_generic * gconf, GucAction action);
 static void ReportGUCOption(struct config_generic * record);
 static void ShowGUCConfigOption(const char *name, DestReceiver *dest);
 static void ShowAllGUCConfig(DestReceiver *dest);
@@ -2599,12 +2758,12 @@ set_string_field(struct config_string * conf, char **field, char *newval)
 	if (oldval == NULL ||
 		oldval == *(conf->variable) ||
 		oldval == conf->reset_val ||
-		oldval == conf->tentative_val)
+		oldval == conf->boot_val)
 		return;
 	for (stack = conf->gen.stack; stack; stack = stack->prev)
 	{
-		if (oldval == stack->tentative_val.stringval ||
-			oldval == stack->value.stringval)
+		if (oldval == stack->prior.stringval ||
+			oldval == stack->masked.stringval)
 			return;
 	}
 
@@ -2622,18 +2781,71 @@ string_field_used(struct config_string * conf, char *strval)
 
 	if (strval == *(conf->variable) ||
 		strval == conf->reset_val ||
-		strval == conf->tentative_val)
+		strval == conf->boot_val)
 		return true;
 	for (stack = conf->gen.stack; stack; stack = stack->prev)
 	{
-		if (strval == stack->tentative_val.stringval ||
-			strval == stack->value.stringval)
+		if (strval == stack->prior.stringval ||
+			strval == stack->masked.stringval)
 			return true;
 	}
 	return false;
 }
 
+/*
+ * Support for copying a variable's active value into a stack entry
+ */
+static void
+set_stack_value(struct config_generic * gconf, union config_var_value * val)
+{
+	switch (gconf->vartype)
+	{
+		case PGC_BOOL:
+			val->boolval =
+				*((struct config_bool *) gconf)->variable;
+			break;
+		case PGC_INT:
+			val->intval =
+				*((struct config_int *) gconf)->variable;
+			break;
+		case PGC_REAL:
+			val->realval =
+				*((struct config_real *) gconf)->variable;
+			break;
+		case PGC_STRING:
+			/* we assume stringval is NULL if not valid */
+			set_string_field((struct config_string *) gconf,
+							 &(val->stringval),
+							 *((struct config_string *) gconf)->variable);
+			break;
+	}
+}
+
+/*
+ * Support for discarding a no-longer-needed value in a stack entry
+ */
+static void
+discard_stack_value(struct config_generic * gconf, union config_var_value * val)
+{
+	switch (gconf->vartype)
+	{
+		case PGC_BOOL:
+		case PGC_INT:
+		case PGC_REAL:
+			/* no need to do anything */
+			break;
+		case PGC_STRING:
+			set_string_field((struct config_string *) gconf,
+							 &(val->stringval),
+							 NULL);
+			break;
+	}
+}
+
 
+/*
+ * Fetch the sorted array pointer (exported for help_config.c's use ONLY)
+ */
 struct config_generic **
 get_guc_variables(void)
 {
@@ -2875,40 +3087,6 @@ build_guc_variables(void)
 		  sizeof(struct config_generic *), guc_var_compare);
 }
 
-static bool
-is_custom_class(const char *name, int dotPos)
-{
-	/*
-	 * assign_custom_variable_classes() has made sure no empty identifiers or
-	 * whitespace exists in the variable
-	 */
-	bool		result = false;
-	const char *ccs = GetConfigOption("custom_variable_classes");
-
-	if (ccs != NULL)
-	{
-		const char *start = ccs;
-
-		for (;; ++ccs)
-		{
-			int			c = *ccs;
-
-			if (c == 0 || c == ',')
-			{
-				if (dotPos == ccs - start && strncmp(start, name, dotPos) == 0)
-				{
-					result = true;
-					break;
-				}
-				if (c == 0)
-					break;
-				start = ccs + 1;
-			}
-		}
-	}
-	return result;
-}
-
 /*
  * Add a new GUC variable to the list of known variables. The
  * list is expanded if needed.
@@ -2952,7 +3130,7 @@ add_guc_variable(struct config_generic * var, int elevel)
  * Create and add a placeholder variable. It's presumed to belong
  * to a valid custom variable class at this point.
  */
-static struct config_string *
+static struct config_generic *
 add_placeholder_variable(const char *name, int elevel)
 {
 	size_t		sz = sizeof(struct config_string) + sizeof(char *);
@@ -2962,9 +3140,8 @@ add_placeholder_variable(const char *name, int elevel)
 	var = (struct config_string *) guc_malloc(elevel, sz);
 	if (var == NULL)
 		return NULL;
-
-	gen = &var->gen;
 	memset(var, 0, sz);
+	gen = &var->gen;
 
 	gen->name = guc_strdup(elevel, name);
 	if (gen->name == NULL)
@@ -2981,7 +3158,8 @@ add_placeholder_variable(const char *name, int elevel)
 
 	/*
 	 * The char* is allocated at the end of the struct since we have no
-	 * 'static' place to point to.
+	 * 'static' place to point to.	Note that the current value, as well as
+	 * the boot and reset values, start out NULL.
 	 */
 	var->variable = (char **) (var + 1);
 
@@ -2992,17 +3170,53 @@ add_placeholder_variable(const char *name, int elevel)
 		return NULL;
 	}
 
-	return var;
+	return gen;
+}
+
+/*
+ * Detect whether the portion of "name" before dotPos matches any custom
+ * variable class name listed in custom_var_classes.  The latter must be
+ * formatted the way that assign_custom_variable_classes does it, ie,
+ * no whitespace.  NULL is valid for custom_var_classes.
+ */
+static bool
+is_custom_class(const char *name, int dotPos, const char *custom_var_classes)
+{
+	bool		result = false;
+	const char *ccs = custom_var_classes;
+
+	if (ccs != NULL)
+	{
+		const char *start = ccs;
+
+		for (;; ++ccs)
+		{
+			char		c = *ccs;
+
+			if (c == '\0' || c == ',')
+			{
+				if (dotPos == ccs - start && strncmp(start, name, dotPos) == 0)
+				{
+					result = true;
+					break;
+				}
+				if (c == '\0')
+					break;
+				start = ccs + 1;
+			}
+		}
+	}
+	return result;
 }
 
 /*
- * Look up option NAME. If it exists, return a pointer to its record,
- * else return NULL.
+ * Look up option NAME.  If it exists, return a pointer to its record,
+ * else return NULL.  If create_placeholders is TRUE, we'll create a
+ * placeholder record for a valid-looking custom variable name.
  */
 static struct config_generic *
-find_option(const char *name, int elevel)
+find_option(const char *name, bool create_placeholders, int elevel)
 {
-	const char *dot;
 	const char **key = &name;
 	struct config_generic **res;
 	int			i;
@@ -3029,17 +3243,21 @@ find_option(const char *name, int elevel)
 	for (i = 0; map_old_guc_names[i] != NULL; i += 2)
 	{
 		if (guc_name_compare(name, map_old_guc_names[i]) == 0)
-			return find_option(map_old_guc_names[i + 1], elevel);
+			return find_option(map_old_guc_names[i + 1], false, elevel);
 	}
 
-	/*
-	 * Check if the name is qualified, and if so, check if the qualifier maps
-	 * to a custom variable class.
-	 */
-	dot = strchr(name, GUC_QUALIFIER_SEPARATOR);
-	if (dot != NULL && is_custom_class(name, dot - name))
-		/* Add a placeholder variable for this name */
-		return (struct config_generic *) add_placeholder_variable(name, elevel);
+	if (create_placeholders)
+	{
+		/*
+		 * Check if the name is qualified, and if so, check if the qualifier
+		 * matches any custom variable class.  If so, add a placeholder.
+		 */
+		const char *dot = strchr(name, GUC_QUALIFIER_SEPARATOR);
+
+		if (dot != NULL &&
+			is_custom_class(name, dot - name, custom_variable_classes))
+			return add_placeholder_variable(name, elevel);
+	}
 
 	/* Unknown name */
 	return NULL;
@@ -3107,6 +3325,12 @@ InitializeGUCOptions(void)
 	 */
 	pg_timezone_pre_initialize();
 
+	/*
+	 * Before log_line_prefix could possibly receive a nonempty setting, make
+	 * sure that timezone processing is minimally alive (see elog.c).
+	 */
+	pg_timezone_pre_initialize();
+
 	/*
 	 * Build sorted array of all GUC variables.
 	 */
@@ -3122,7 +3346,6 @@ InitializeGUCOptions(void)
 
 		gconf->status = 0;
 		gconf->reset_source = PGC_S_DEFAULT;
-		gconf->tentative_source = PGC_S_DEFAULT;
 		gconf->source = PGC_S_DEFAULT;
 		gconf->stack = NULL;
 
@@ -3133,39 +3356,39 @@ InitializeGUCOptions(void)
 					struct config_bool *conf = (struct config_bool *) gconf;
 
 					if (conf->assign_hook)
-						if (!(*conf->assign_hook) (conf->reset_val, true,
+						if (!(*conf->assign_hook) (conf->boot_val, true,
 												   PGC_S_DEFAULT))
 							elog(FATAL, "failed to initialize %s to %d",
-								 conf->gen.name, (int) conf->reset_val);
-					*conf->variable = conf->reset_val;
+								 conf->gen.name, (int) conf->boot_val);
+					*conf->variable = conf->reset_val = conf->boot_val;
 					break;
 				}
 			case PGC_INT:
 				{
 					struct config_int *conf = (struct config_int *) gconf;
 
-					Assert(conf->reset_val >= conf->min);
-					Assert(conf->reset_val <= conf->max);
+					Assert(conf->boot_val >= conf->min);
+					Assert(conf->boot_val <= conf->max);
 					if (conf->assign_hook)
-						if (!(*conf->assign_hook) (conf->reset_val, true,
+						if (!(*conf->assign_hook) (conf->boot_val, true,
 												   PGC_S_DEFAULT))
 							elog(FATAL, "failed to initialize %s to %d",
-								 conf->gen.name, conf->reset_val);
-					*conf->variable = conf->reset_val;
+								 conf->gen.name, conf->boot_val);
+					*conf->variable = conf->reset_val = conf->boot_val;
 					break;
 				}
 			case PGC_REAL:
 				{
 					struct config_real *conf = (struct config_real *) gconf;
 
-					Assert(conf->reset_val >= conf->min);
-					Assert(conf->reset_val <= conf->max);
+					Assert(conf->boot_val >= conf->min);
+					Assert(conf->boot_val <= conf->max);
 					if (conf->assign_hook)
-						if (!(*conf->assign_hook) (conf->reset_val, true,
+						if (!(*conf->assign_hook) (conf->boot_val, true,
 												   PGC_S_DEFAULT))
 							elog(FATAL, "failed to initialize %s to %g",
-								 conf->gen.name, conf->reset_val);
-					*conf->variable = conf->reset_val;
+								 conf->gen.name, conf->boot_val);
+					*conf->variable = conf->reset_val = conf->boot_val;
 					break;
 				}
 			case PGC_STRING:
@@ -3175,11 +3398,10 @@ InitializeGUCOptions(void)
 
 					*conf->variable = NULL;
 					conf->reset_val = NULL;
-					conf->tentative_val = NULL;
 
 					if (conf->boot_val == NULL)
 					{
-						/* Cannot set value yet */
+						/* leave the value NULL, do not call assign hook */
 						break;
 					}
 
@@ -3215,7 +3437,6 @@ InitializeGUCOptions(void)
 	}
 
 	guc_dirty = false;
-	guc_cannotprepare = false;
 
 	reporting_enabled = false;
 
@@ -3230,7 +3451,8 @@ InitializeGUCOptions(void)
 
 	/*
 	 * For historical reasons, some GUC parameters can receive defaults from
-	 * environment variables.  Process those settings.
+	 * environment variables.  Process those settings.	NB: if you add or
+	 * remove anything here, see also ProcessConfigFile().
 	 */
 
 	env = getenv("PGPORT");
@@ -3253,11 +3475,11 @@ InitializeGUCOptions(void)
 	stack_rlimit = get_stack_depth_rlimit();
 	if (stack_rlimit > 0)
 	{
-		int		new_limit = (stack_rlimit - STACK_DEPTH_SLOP) / 1024L;
+		int			new_limit = (stack_rlimit - STACK_DEPTH_SLOP) / 1024L;
 
 		if (new_limit > 100)
 		{
-			char	limbuf[16];
+			char		limbuf[16];
 
 			new_limit = Min(new_limit, 2048);
 			sprintf(limbuf, "%d", new_limit);
@@ -3441,7 +3663,7 @@ ResetAllOptions(void)
 			continue;
 
 		/* Save old value to support transaction abort */
-		push_old_value(gconf);
+		push_old_value(gconf, GUC_ACTION_SET);
 
 		switch (gconf->vartype)
 		{
@@ -3452,14 +3674,10 @@ ResetAllOptions(void)
 					if (conf->assign_hook)
 						if (!(*conf->assign_hook) (conf->reset_val, true,
 												   PGC_S_SESSION))
-							elog(ERROR, "failed to reset %s", conf->gen.name);
+							elog(ERROR, "failed to reset %s to %d",
+								 conf->gen.name, (int) conf->reset_val);
 					*conf->variable = conf->reset_val;
-					conf->tentative_val = conf->reset_val;
 					conf->gen.source = conf->gen.reset_source;
-					conf->gen.tentative_source = conf->gen.reset_source;
-					conf->gen.status |= GUC_HAVE_TENTATIVE;
-					guc_dirty = true;
-					guc_cannotprepare = true;
 					break;
 				}
 			case PGC_INT:
@@ -3469,14 +3687,10 @@ ResetAllOptions(void)
 					if (conf->assign_hook)
 						if (!(*conf->assign_hook) (conf->reset_val, true,
 												   PGC_S_SESSION))
-							elog(ERROR, "failed to reset %s", conf->gen.name);
+							elog(ERROR, "failed to reset %s to %d",
+								 conf->gen.name, conf->reset_val);
 					*conf->variable = conf->reset_val;
-					conf->tentative_val = conf->reset_val;
 					conf->gen.source = conf->gen.reset_source;
-					conf->gen.tentative_source = conf->gen.reset_source;
-					conf->gen.status |= GUC_HAVE_TENTATIVE;
-					guc_dirty = true;
-					guc_cannotprepare = true;
 					break;
 				}
 			case PGC_REAL:
@@ -3486,14 +3700,10 @@ ResetAllOptions(void)
 					if (conf->assign_hook)
 						if (!(*conf->assign_hook) (conf->reset_val, true,
 												   PGC_S_SESSION))
-							elog(ERROR, "failed to reset %s", conf->gen.name);
+							elog(ERROR, "failed to reset %s to %g",
+								 conf->gen.name, conf->reset_val);
 					*conf->variable = conf->reset_val;
-					conf->tentative_val = conf->reset_val;
 					conf->gen.source = conf->gen.reset_source;
-					conf->gen.tentative_source = conf->gen.reset_source;
-					conf->gen.status |= GUC_HAVE_TENTATIVE;
-					guc_dirty = true;
-					guc_cannotprepare = true;
 					break;
 				}
 			case PGC_STRING:
@@ -3501,23 +3711,18 @@ ResetAllOptions(void)
 					struct config_string *conf = (struct config_string *) gconf;
 					char	   *str;
 
-					if (conf->reset_val == NULL)
-					{
-						/* Nothing to reset to, as yet; so do nothing */
-						break;
-					}
-
 					/* We need not strdup here */
 					str = conf->reset_val;
 
-					if (conf->assign_hook)
+					if (conf->assign_hook && str)
 					{
 						const char *newstr;
 
 						newstr = (*conf->assign_hook) (str, true,
 													   PGC_S_SESSION);
 						if (newstr == NULL)
-							elog(ERROR, "failed to reset %s", conf->gen.name);
+							elog(ERROR, "failed to reset %s to \"%s\"",
+								 conf->gen.name, str);
 						else if (newstr != str)
 						{
 							/*
@@ -3528,12 +3733,7 @@ ResetAllOptions(void)
 					}
 
 					set_string_field(conf, conf->variable, str);
-					set_string_field(conf, &conf->tentative_val, str);
 					conf->gen.source = conf->gen.reset_source;
-					conf->gen.tentative_source = conf->gen.reset_source;
-					conf->gen.status |= GUC_HAVE_TENTATIVE;
-					guc_dirty = true;
-					guc_cannotprepare = true;
 					break;
 				}
 		}
@@ -3546,84 +3746,84 @@ ResetAllOptions(void)
 
 /*
  * push_old_value
- *		Push previous state during first assignment to a GUC variable
- *		within a particular transaction.
- *
- * We have to be willing to "back-fill" the state stack if the first
- * assignment occurs within a subtransaction nested several levels deep.
- * This ensures that if an intermediate transaction aborts, it will have
- * the proper value available to restore the setting to.
+ *		Push previous state during transactional assignment to a GUC variable.
  */
 static void
-push_old_value(struct config_generic * gconf)
+push_old_value(struct config_generic * gconf, GucAction action)
 {
 	GucStack   *stack;
 
-	/* If we're not inside a transaction, do nothing */
+	/* If we're not inside a nest level, do nothing */
 	if (GUCNestLevel == 0)
 		return;
 
-	for (;;)
+	/* Do we already have a stack entry of the current nest level? */
+	stack = gconf->stack;
+	if (stack && stack->nest_level >= GUCNestLevel)
 	{
-		/* Done if we already pushed it at this nesting depth */
-		if (gconf->stack && gconf->stack->nest_level >= GUCNestLevel)
-			return;
-
-		/*
-		 * We keep all the stack entries in TopTransactionContext so as to
-		 * avoid allocation problems when a subtransaction back-fills stack
-		 * entries for upper transaction levels.
-		 */
-		stack = (GucStack *) MemoryContextAlloc(TopTransactionContext,
-												sizeof(GucStack));
-
-		stack->prev = gconf->stack;
-		stack->nest_level = stack->prev ? stack->prev->nest_level + 1 : 1;
-		stack->status = gconf->status;
-		stack->tentative_source = gconf->tentative_source;
-		stack->source = gconf->source;
-
-		switch (gconf->vartype)
+		/* Yes, so adjust its state if necessary */
+		Assert(stack->nest_level == GUCNestLevel);
+		switch (action)
 		{
-			case PGC_BOOL:
-				stack->tentative_val.boolval =
-					((struct config_bool *) gconf)->tentative_val;
-				stack->value.boolval =
-					*((struct config_bool *) gconf)->variable;
-				break;
-
-			case PGC_INT:
-				stack->tentative_val.intval =
-					((struct config_int *) gconf)->tentative_val;
-				stack->value.intval =
-					*((struct config_int *) gconf)->variable;
+			case GUC_ACTION_SET:
+				/* SET overrides any prior action at same nest level */
+				if (stack->state == GUC_SET_LOCAL)
+				{
+					/* must discard old masked value */
+					discard_stack_value(gconf, &stack->masked);
+				}
+				stack->state = GUC_SET;
 				break;
-
-			case PGC_REAL:
-				stack->tentative_val.realval =
-					((struct config_real *) gconf)->tentative_val;
-				stack->value.realval =
-					*((struct config_real *) gconf)->variable;
+			case GUC_ACTION_LOCAL:
+				if (stack->state == GUC_SET)
+				{
+					/* SET followed by SET LOCAL, remember SET's value */
+					set_stack_value(gconf, &stack->masked);
+					stack->state = GUC_SET_LOCAL;
+				}
+				/* in all other cases, no change to stack entry */
 				break;
-
-			case PGC_STRING:
-				stack->tentative_val.stringval =
-					((struct config_string *) gconf)->tentative_val;
-				stack->value.stringval =
-					*((struct config_string *) gconf)->variable;
+			case GUC_ACTION_SAVE:
+				/* Could only have a prior SAVE of same variable */
+				Assert(stack->state == GUC_SAVE);
 				break;
 		}
+		Assert(guc_dirty);		/* must be set already */
+		return;
+	}
 
-		gconf->stack = stack;
-
-		/* Set state to indicate nothing happened yet within this level */
-		gconf->status = GUC_HAVE_STACK;
+	/*
+	 * Push a new stack entry
+	 *
+	 * We keep all the stack entries in TopTransactionContext for simplicity.
+	 */
+	stack = (GucStack *) MemoryContextAllocZero(TopTransactionContext,
+												sizeof(GucStack));
 
-		/* Ensure we remember to pop at end of xact */
-		guc_dirty = true;
+	stack->prev = gconf->stack;
+	stack->nest_level = GUCNestLevel;
+	switch (action)
+	{
+		case GUC_ACTION_SET:
+			stack->state = GUC_SET;
+			break;
+		case GUC_ACTION_LOCAL:
+			stack->state = GUC_LOCAL;
+			break;
+		case GUC_ACTION_SAVE:
+			stack->state = GUC_SAVE;
+			break;
 	}
+	stack->source = gconf->source;
+	set_stack_value(gconf, &stack->prior);
+
+	gconf->stack = stack;
+
+	/* Ensure we remember to pop at end of xact */
+	guc_dirty = true;
 }
 
+
 /*
  * Do GUC processing at main transaction start.
  */
@@ -3631,9 +3831,9 @@ void
 AtStart_GUC(void)
 {
 	/*
-	 * The nest level should be 0 between transactions; if it isn't,
-	 * somebody didn't call AtEOXact_GUC, or called it with the wrong
-	 * nestLevel.  We throw a warning but make no other effort to clean up.
+	 * The nest level should be 0 between transactions; if it isn't, somebody
+	 * didn't call AtEOXact_GUC, or called it with the wrong nestLevel.  We
+	 * throw a warning but make no other effort to clean up.
 	 */
 	if (GUCNestLevel != 0)
 		elog(WARNING, "GUC nest level = %d at transaction start",
@@ -3643,7 +3843,7 @@ AtStart_GUC(void)
 
 /*
  * Enter a new nesting level for GUC values.  This is called at subtransaction
- * start and when entering a function that has proconfig settings.  NOTE that
+ * start and when entering a function that has proconfig settings.	NOTE that
  * we must not risk error here, else subtransaction start will be unhappy.
  */
 int
@@ -3662,6 +3862,7 @@ NewGUCNestLevel(void)
 void
 AtEOXact_GUC(bool isCommit, int nestLevel)
 {
+	bool		still_dirty;
 	int			i;
 
 	/*
@@ -3680,244 +3881,237 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 		return;
 	}
 
+	still_dirty = false;
 	for (i = 0; i < num_guc_variables; i++)
 	{
 		struct config_generic *gconf = guc_variables[i];
-		int			my_status = gconf->status;
-		GucStack   *stack = gconf->stack;
-		bool		useTentative;
-		bool		changed;
+		GucStack   *stack;
 
 		/*
-		 * Skip if nothing's happened to this var in this transaction
+		 * Process and pop each stack entry within the nest level.	To
+		 * simplify fmgr_security_definer(), we allow failure exit from a
+		 * function-with-SET-options to be recovered at the surrounding
+		 * transaction or subtransaction abort; so there could be more than
+		 * one stack entry to pop.
 		 */
-		if (my_status == 0)
+		while ((stack = gconf->stack) != NULL &&
+			   stack->nest_level >= nestLevel)
 		{
-			Assert(stack == NULL);
-			continue;
-		}
-		/* Assert that we stacked old value before changing it */
-		Assert(stack != NULL && (my_status & GUC_HAVE_STACK));
-		/* However, the last change may have been at an outer xact level */
-		if (stack->nest_level < nestLevel)
-			continue;
-		Assert(stack->nest_level == nestLevel);
+			GucStack   *prev = stack->prev;
+			bool		restorePrior = false;
+			bool		restoreMasked = false;
+			bool		changed;
 
-		/*
-		 * We will pop the stack entry.  Start by restoring outer xact status
-		 * (since we may want to modify it below).	Be careful to use
-		 * my_status to reference the inner xact status below this point...
-		 */
-		gconf->status = stack->status;
-
-		/*
-		 * We have two cases:
-		 *
-		 * If commit and HAVE_TENTATIVE, set actual value to tentative (this
-		 * is to override a SET LOCAL if one occurred later than SET). We keep
-		 * the tentative value and propagate HAVE_TENTATIVE to the parent
-		 * status, allowing the SET's effect to percolate up. (But if we're
-		 * exiting the outermost transaction, we'll drop the HAVE_TENTATIVE
-		 * bit below.)
-		 *
-		 * Otherwise, we have a transaction that aborted or executed only SET
-		 * LOCAL (or no SET at all).  In either case it should have no further
-		 * effect, so restore both tentative and actual values from the stack
-		 * entry.
-		 */
-
-		useTentative = isCommit && (my_status & GUC_HAVE_TENTATIVE) != 0;
-		changed = false;
-
-		switch (gconf->vartype)
-		{
-			case PGC_BOOL:
+			/*
+			 * In this next bit, if we don't set either restorePrior or
+			 * restoreMasked, we must "discard" any unwanted fields of the
+			 * stack entries to avoid leaking memory.  If we do set one of
+			 * those flags, unused fields will be cleaned up after restoring.
+			 */
+			if (!isCommit)		/* if abort, always restore prior value */
+				restorePrior = true;
+			else if (stack->state == GUC_SAVE)
+				restorePrior = true;
+			else if (stack->nest_level == 1)
+			{
+				/* transaction commit */
+				if (stack->state == GUC_SET_LOCAL)
+					restoreMasked = true;
+				else if (stack->state == GUC_SET)
 				{
-					struct config_bool *conf = (struct config_bool *) gconf;
-					bool		newval;
-					GucSource	newsource;
-
-					if (useTentative)
-					{
-						newval = conf->tentative_val;
-						newsource = conf->gen.tentative_source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-					}
-					else
-					{
-						newval = stack->value.boolval;
-						newsource = stack->source;
-						conf->tentative_val = stack->tentative_val.boolval;
-						conf->gen.tentative_source = stack->tentative_source;
-					}
-
-					if (*conf->variable != newval)
-					{
-						if (conf->assign_hook)
-							if (!(*conf->assign_hook) (newval,
-													   true, PGC_S_OVERRIDE))
-								elog(LOG, "failed to commit %s",
-									 conf->gen.name);
-						*conf->variable = newval;
-						changed = true;
-					}
-					conf->gen.source = newsource;
-					break;
+					/* we keep the current active value */
+					discard_stack_value(gconf, &stack->prior);
 				}
-			case PGC_INT:
+				else	/* must be GUC_LOCAL */
+					restorePrior = true;
+			}
+			else if (prev == NULL ||
+					 prev->nest_level < stack->nest_level - 1)
+			{
+				/* decrement entry's level and do not pop it */
+				stack->nest_level--;
+				continue;
+			}
+			else
+			{
+				/*
+				 * We have to merge this stack entry into prev. See README for
+				 * discussion of this bit.
+				 */
+				switch (stack->state)
 				{
-					struct config_int *conf = (struct config_int *) gconf;
-					int			newval;
-					GucSource	newsource;
+					case GUC_SAVE:
+						Assert(false);	/* can't get here */
+
+					case GUC_SET:
+						/* next level always becomes SET */
+						discard_stack_value(gconf, &stack->prior);
+						if (prev->state == GUC_SET_LOCAL)
+							discard_stack_value(gconf, &prev->masked);
+						prev->state = GUC_SET;
+						break;
 
-					if (useTentative)
-					{
-						newval = conf->tentative_val;
-						newsource = conf->gen.tentative_source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-					}
-					else
-					{
-						newval = stack->value.intval;
-						newsource = stack->source;
-						conf->tentative_val = stack->tentative_val.intval;
-						conf->gen.tentative_source = stack->tentative_source;
-					}
+					case GUC_LOCAL:
+						if (prev->state == GUC_SET)
+						{
+							/* LOCAL migrates down */
+							prev->masked = stack->prior;
+							prev->state = GUC_SET_LOCAL;
+						}
+						else
+						{
+							/* else just forget this stack level */
+							discard_stack_value(gconf, &stack->prior);
+						}
+						break;
 
-					if (*conf->variable != newval)
-					{
-						if (conf->assign_hook)
-							if (!(*conf->assign_hook) (newval,
-													   true, PGC_S_OVERRIDE))
-								elog(LOG, "failed to commit %s",
-									 conf->gen.name);
-						*conf->variable = newval;
-						changed = true;
-					}
-					conf->gen.source = newsource;
-					break;
+					case GUC_SET_LOCAL:
+						/* prior state at this level no longer wanted */
+						discard_stack_value(gconf, &stack->prior);
+						/* copy down the masked state */
+						if (prev->state == GUC_SET_LOCAL)
+							discard_stack_value(gconf, &prev->masked);
+						prev->masked = stack->masked;
+						prev->state = GUC_SET_LOCAL;
+						break;
 				}
-			case PGC_REAL:
-				{
-					struct config_real *conf = (struct config_real *) gconf;
-					double		newval;
-					GucSource	newsource;
+			}
 
-					if (useTentative)
-					{
-						newval = conf->tentative_val;
-						newsource = conf->gen.tentative_source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-					}
-					else
-					{
-						newval = stack->value.realval;
-						newsource = stack->source;
-						conf->tentative_val = stack->tentative_val.realval;
-						conf->gen.tentative_source = stack->tentative_source;
-					}
+			changed = false;
 
-					if (*conf->variable != newval)
-					{
-						if (conf->assign_hook)
-							if (!(*conf->assign_hook) (newval,
-													   true, PGC_S_OVERRIDE))
-								elog(LOG, "failed to commit %s",
-									 conf->gen.name);
-						*conf->variable = newval;
-						changed = true;
-					}
-					conf->gen.source = newsource;
-					break;
+			if (restorePrior || restoreMasked)
+			{
+				/* Perform appropriate restoration of the stacked value */
+				union config_var_value newvalue;
+				GucSource	newsource;
+
+				if (restoreMasked)
+				{
+					newvalue = stack->masked;
+					newsource = PGC_S_SESSION;
 				}
-			case PGC_STRING:
+				else
 				{
-					struct config_string *conf = (struct config_string *) gconf;
-					char	   *newval;
-					GucSource	newsource;
+					newvalue = stack->prior;
+					newsource = stack->source;
+				}
 
-					if (useTentative)
-					{
-						newval = conf->tentative_val;
-						newsource = conf->gen.tentative_source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-					}
-					else
-					{
-						newval = stack->value.stringval;
-						newsource = stack->source;
-						set_string_field(conf, &conf->tentative_val,
-										 stack->tentative_val.stringval);
-						conf->gen.tentative_source = stack->tentative_source;
-					}
+				switch (gconf->vartype)
+				{
+					case PGC_BOOL:
+						{
+							struct config_bool *conf = (struct config_bool *) gconf;
+							bool		newval = newvalue.boolval;
 
-					if (*conf->variable != newval)
-					{
-						if (conf->assign_hook)
+							if (*conf->variable != newval)
+							{
+								if (conf->assign_hook)
+									if (!(*conf->assign_hook) (newval,
+													   true, PGC_S_OVERRIDE))
+										elog(LOG, "failed to commit %s as %d",
+											 conf->gen.name, (int) newval);
+								*conf->variable = newval;
+								changed = true;
+							}
+							break;
+						}
+					case PGC_INT:
 						{
-							const char *newstr;
-
-							newstr = (*conf->assign_hook) (newval, true,
-														   PGC_S_OVERRIDE);
-							if (newstr == NULL)
-								elog(LOG, "failed to commit %s",
-									 conf->gen.name);
-							else if (newstr != newval)
+							struct config_int *conf = (struct config_int *) gconf;
+							int			newval = newvalue.intval;
+
+							if (*conf->variable != newval)
 							{
-								/*
-								 * If newval should now be freed, it'll be
-								 * taken care of below.
-								 *
-								 * See notes in set_config_option about
-								 * casting
-								 */
-								newval = (char *) newstr;
+								if (conf->assign_hook)
+									if (!(*conf->assign_hook) (newval,
+													   true, PGC_S_OVERRIDE))
+										elog(LOG, "failed to commit %s as %d",
+											 conf->gen.name, newval);
+								*conf->variable = newval;
+								changed = true;
 							}
+							break;
 						}
+					case PGC_REAL:
+						{
+							struct config_real *conf = (struct config_real *) gconf;
+							double		newval = newvalue.realval;
 
-						set_string_field(conf, conf->variable, newval);
-						changed = true;
-					}
-					conf->gen.source = newsource;
-					/* Release stacked values if not used anymore */
-					set_string_field(conf, &stack->value.stringval,
-									 NULL);
-					set_string_field(conf, &stack->tentative_val.stringval,
-									 NULL);
-					/* Don't store tentative value separately after commit */
-					if (nestLevel == 1)
-						set_string_field(conf, &conf->tentative_val, NULL);
-					break;
+							if (*conf->variable != newval)
+							{
+								if (conf->assign_hook)
+									if (!(*conf->assign_hook) (newval,
+													   true, PGC_S_OVERRIDE))
+										elog(LOG, "failed to commit %s as %g",
+											 conf->gen.name, newval);
+								*conf->variable = newval;
+								changed = true;
+							}
+							break;
+						}
+					case PGC_STRING:
+						{
+							struct config_string *conf = (struct config_string *) gconf;
+							char	   *newval = newvalue.stringval;
+
+							if (*conf->variable != newval)
+							{
+								if (conf->assign_hook && newval)
+								{
+									const char *newstr;
+
+									newstr = (*conf->assign_hook) (newval, true,
+															 PGC_S_OVERRIDE);
+									if (newstr == NULL)
+										elog(LOG, "failed to commit %s as \"%s\"",
+											 conf->gen.name, newval);
+									else if (newstr != newval)
+									{
+										/*
+										 * If newval should now be freed,
+										 * it'll be taken care of below.
+										 *
+										 * See notes in set_config_option
+										 * about casting
+										 */
+										newval = (char *) newstr;
+									}
+								}
+
+								set_string_field(conf, conf->variable, newval);
+								changed = true;
+							}
+
+							/*
+							 * Release stacked values if not used anymore. We
+							 * could use discard_stack_value() here, but since
+							 * we have type-specific code anyway, might as
+							 * well inline it.
+							 */
+							set_string_field(conf, &stack->prior.stringval, NULL);
+							set_string_field(conf, &stack->masked.stringval, NULL);
+							break;
+						}
 				}
-		}
 
-		/* Finish popping the state stack */
-		gconf->stack = stack->prev;
-		pfree(stack);
+				gconf->source = newsource;
+			}
+
+			/* Finish popping the state stack */
+			gconf->stack = prev;
+			pfree(stack);
 
-		/*
-		 * If we're now out of all xact levels, forget TENTATIVE status bit;
-		 * there's nothing tentative about the value anymore.
-		 */
-		if (nestLevel == 1)
-		{
-			Assert(gconf->stack == NULL);
-			gconf->status = 0;
-		}
+			/* Report new value if we changed it */
+			if (changed && (gconf->flags & GUC_REPORT))
+				ReportGUCOption(gconf);
+		}						/* end of stack-popping loop */
 
-		/* Report new value if we changed it */
-		if (changed && (gconf->flags & GUC_REPORT))
-			ReportGUCOption(gconf);
+		if (stack != NULL)
+			still_dirty = true;
 	}
 
-	/*
-	 * If we're now out of all xact levels, we can clear guc_dirty. (Note: we
-	 * cannot reset guc_dirty when exiting a subtransaction, because we know
-	 * that all outer transaction levels will have stacked values to deal
-	 * with.)
-	 */
-	if (nestLevel == 1)
-		guc_dirty = false;
+	/* If there are no remaining stack entries, we can reset guc_dirty */
+	guc_dirty = still_dirty;
 
 	/* Update nesting level */
 	GUCNestLevel = nestLevel - 1;
@@ -4195,59 +4389,25 @@ parse_int(const char *value, int *result, int flags, const char **hintmsg)
  * result is not NULL, return the semantic value there.
  */
 static bool
-parse_real(const char *value, double *result, int flags)
+parse_real(const char *value, double *result)
 {
 	double		val;
 	char	   *endptr;
 
+	if (result)
+		*result = 0;			/* suppress compiler warning */
+
 	errno = 0;
 	val = strtod(value, &endptr);
+	if (endptr == value || errno == ERANGE)
+		return false;
 
-	if ((flags & GUC_UNIT_MEMORY) && endptr != value)
-	{
-		bool		used = false;
-
-		while (*endptr == ' ')
-			endptr++;
-
-		if (strcmp(endptr, "kB") == 0)
-		{
-			used = true;
-			endptr += 2;
-		}
-		else if (strcmp(endptr, "MB") == 0)
-		{
-			val *= KB_PER_MB;
-			used = true;
-			endptr += 2;
-		}
-		else if (strcmp(endptr, "GB") == 0)
-		{
-			val *= KB_PER_GB;
-			used = true;
-			endptr += 2;
-		}
-
-		if (used)
-		{
-			switch (flags & GUC_UNIT_MEMORY)
-			{
-				case GUC_UNIT_BLOCKS:
-					val /= (BLCKSZ / 1024);
-					break;
-				case GUC_UNIT_XBLOCKS:
-					val /= (XLOG_BLCKSZ / 1024);
-					break;
-			}
-		}
-	}
-
-    if (endptr == value || *endptr != '\0' || errno == ERANGE)
-	{
-		if (result)
-			*result = 0;		/* suppress compiler warning */
+	/* allow whitespace after number */
+	while (isspace((unsigned char) *endptr))
+		endptr++;
+	if (*endptr != '\0')
 		return false;
-	}
+
 	if (result)
 		*result = val;
 	return true;
@@ -4312,7 +4472,7 @@ call_string_assign_hook(GucStringAssignHook assign_hook,
 bool
 set_config_option(const char *name, const char *value,
 				  GucContext context, GucSource source,
-				  bool isLocal, bool changeVal)
+				  GucAction action, bool changeVal)
 {
 	struct config_generic *record;
 	int			elevel;
@@ -4331,7 +4491,7 @@ set_config_option(const char *name, const char *value,
 	else
 		elevel = ERROR;
 
-	record = find_option(name, elevel);
+	record = find_option(name, true, elevel);
 	if (record == NULL)
 	{
 		ereport(elevel,
@@ -4353,6 +4513,15 @@ set_config_option(const char *name, const char *value,
 	      return true;
         }  /* end if (record->flags & GUC_DISALLOW_USER_SET) */
 
+	/*
+	 * If source is postgresql.conf, mark the found record with
+	 * GUC_IS_IN_FILE. This is for the convenience of ProcessConfigFile.  Note
+	 * that we do it even if changeVal is false, since ProcessConfigFile wants
+	 * the marking to occur during its testing pass.
+	 */
+	if (source == PGC_S_FILE)
+		record->status |= GUC_IS_IN_FILE;
+
 	/*
 	 * Check if the option can be set at this time. See guc.h for the precise
 	 * rules. Note that we don't want to throw errors if we're in the SIGHUP
@@ -4384,9 +4553,8 @@ set_config_option(const char *name, const char *value,
 				if (changeVal && !is_newvalue_equal(record, value))
 					ereport(elevel,
 							(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
-					   errmsg("attempted change of parameter \"%s\" ignored",
-							  name),
-							 errdetail("This parameter cannot be changed after server start.")));
+							 errmsg("parameter \"%s\" cannot be changed after server start; configuration file change ignored",
+									name)));
 				return true;
 			}
 			if (context != PGC_POSTMASTER)
@@ -4516,6 +4684,48 @@ set_config_option(const char *name, const char *value,
 		}
 	}
 
+	/*
+	 * Disallow changing GUC_NOT_WHILE_SEC_REST values if we are inside a
+	 * security restriction context.  We can reject this regardless of
+	 * the GUC context or source, mainly because sources that it might be
+	 * reasonable to override for won't be seen while inside a function.
+	 *
+	 * Note: variables marked GUC_NOT_WHILE_SEC_REST should usually be marked
+	 * GUC_NO_RESET_ALL as well, because ResetAllOptions() doesn't check this.
+	 * An exception might be made if the reset value is assumed to be "safe".
+	 *
+	 * Note: this flag is currently used for "session_authorization" and
+	 * "role".  We need to prohibit changing these inside a local userid
+	 * context because when we exit it, GUC won't be notified, leaving things
+	 * out of sync.  (This could be fixed by forcing a new GUC nesting level,
+	 * but that would change behavior in possibly-undesirable ways.)  Also,
+	 * we prohibit changing these in a security-restricted operation because
+	 * otherwise RESET could be used to regain the session user's privileges.
+	 */
+	if (record->flags & GUC_NOT_WHILE_SEC_REST)
+	{
+		if (InLocalUserIdChange())
+		{
+			/*
+			 * Phrasing of this error message is historical, but it's the
+			 * most common case.
+			 */
+			ereport(elevel,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("cannot set parameter \"%s\" within security-definer function",
+							name)));
+			return false;
+		}
+		if (InSecurityRestrictedOperation())
+		{
+			ereport(elevel,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("cannot set parameter \"%s\" within security-restricted operation",
+							name)));
+			return false;
+		}
+	}
+
 	/*
 	 * Should we set reset/stacked values?	(If so, the behavior is not
 	 * transactional.)	This is done either when we get a default value from
@@ -4523,7 +4733,7 @@ set_config_option(const char *name, const char *value,
 	 * value to its default.
 	 */
 	makeDefault = changeVal && (source <= PGC_S_OVERRIDE) &&
-	    (value != NULL);
+		((value != NULL) || source == PGC_S_DEFAULT);
 
 	/*
 	 * Ignore attempted set if overridden by previously processed setting.
@@ -4564,6 +4774,8 @@ set_config_option(const char *name, const char *value,
 						return false;
 					}
 				}
+				else if (source == PGC_S_DEFAULT)
+					newval = conf->boot_val;
 				else
 				{
 					newval = conf->reset_val;
@@ -4572,7 +4784,7 @@ set_config_option(const char *name, const char *value,
 
 				/* Save old value to support transaction abort */
 				if (changeVal && !makeDefault)
-					push_old_value(&conf->gen);
+					push_old_value(&conf->gen, action);
 
 				if (conf->assign_hook)
 					if (!(*conf->assign_hook) (newval, changeVal, source))
@@ -4584,43 +4796,28 @@ set_config_option(const char *name, const char *value,
 						return false;
 					}
 
-				if (changeVal || makeDefault)
+				if (changeVal)
+				{
+					*conf->variable = newval;
+					conf->gen.source = source;
+				}
+				if (makeDefault)
 				{
-					if (changeVal)
+					GucStack   *stack;
+
+					if (conf->gen.reset_source <= source)
 					{
-						*conf->variable = newval;
-						conf->gen.source = source;
+						conf->reset_val = newval;
+						conf->gen.reset_source = source;
 					}
-					if (makeDefault)
+					for (stack = conf->gen.stack; stack; stack = stack->prev)
 					{
-						GucStack   *stack;
-
-						if (conf->gen.reset_source <= source)
+						if (stack->source <= source)
 						{
-							conf->reset_val = newval;
-							conf->gen.reset_source = source;
-						}
-						for (stack = conf->gen.stack; stack; stack = stack->prev)
-						{
-							if (stack->source <= source)
-							{
-								stack->value.boolval = newval;
-								stack->source = source;
-							}
+							stack->prior.boolval = newval;
+							stack->source = source;
 						}
 					}
-					else if (isLocal)
-					{
-						conf->gen.status |= GUC_HAVE_LOCAL;
-						guc_dirty = true;
-					}
-					else
-					{
-						conf->tentative_val = newval;
-						conf->gen.tentative_source = source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-						guc_dirty = true;
-					}
 				}
 				break;
 			}
@@ -4638,9 +4835,9 @@ set_config_option(const char *name, const char *value,
 					{
 						ereport(elevel,
 								(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 		 errmsg("invalid value for parameter \"%s\": \"%s\"",
-										name, value),
-						 		 hintmsg ? errhint("%s", hintmsg) : 0));
+						 errmsg("invalid value for parameter \"%s\": \"%s\"",
+								name, value),
+								 hintmsg ? errhint("%s", hintmsg) : 0));
 						return false;
 					}
 					if (newval < conf->min || newval > conf->max)
@@ -4680,6 +4877,8 @@ set_config_option(const char *name, const char *value,
 						return false;
 					}
 				}
+				else if (source == PGC_S_DEFAULT)
+					newval = conf->boot_val;
 				else
 				{
 					newval = conf->reset_val;
@@ -4688,7 +4887,7 @@ set_config_option(const char *name, const char *value,
 
 				/* Save old value to support transaction abort */
 				if (changeVal && !makeDefault)
-					push_old_value(&conf->gen);
+					push_old_value(&conf->gen, action);
 
 				if (conf->assign_hook)
 					if (!(*conf->assign_hook) (newval, changeVal, source))
@@ -4700,43 +4899,28 @@ set_config_option(const char *name, const char *value,
 						return false;
 					}
 
-				if (changeVal || makeDefault)
+				if (changeVal)
+				{
+					*conf->variable = newval;
+					conf->gen.source = source;
+				}
+				if (makeDefault)
 				{
-					if (changeVal)
+					GucStack   *stack;
+
+					if (conf->gen.reset_source <= source)
 					{
-						*conf->variable = newval;
-						conf->gen.source = source;
+						conf->reset_val = newval;
+						conf->gen.reset_source = source;
 					}
-					if (makeDefault)
+					for (stack = conf->gen.stack; stack; stack = stack->prev)
 					{
-						GucStack   *stack;
-
-						if (conf->gen.reset_source <= source)
-						{
-							conf->reset_val = newval;
-							conf->gen.reset_source = source;
-						}
-						for (stack = conf->gen.stack; stack; stack = stack->prev)
+						if (stack->source <= source)
 						{
-							if (stack->source <= source)
-							{
-								stack->value.intval = newval;
-								stack->source = source;
-							}
+							stack->prior.intval = newval;
+							stack->source = source;
 						}
 					}
-					else if (isLocal)
-					{
-						conf->gen.status |= GUC_HAVE_LOCAL;
-						guc_dirty = true;
-					}
-					else
-					{
-						conf->tentative_val = newval;
-						conf->gen.tentative_source = source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-						guc_dirty = true;
-					}
 				}
 				break;
 			}
@@ -4748,7 +4932,7 @@ set_config_option(const char *name, const char *value,
 
 				if (value)
 				{
-					if (!parse_real(value, &newval, conf->gen.flags))
+					if (!parse_real(value, &newval))
 					{
 						ereport(elevel,
 								(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -4765,6 +4949,8 @@ set_config_option(const char *name, const char *value,
 						return false;
 					}
 				}
+				else if (source == PGC_S_DEFAULT)
+					newval = conf->boot_val;
 				else
 				{
 					newval = conf->reset_val;
@@ -4773,7 +4959,7 @@ set_config_option(const char *name, const char *value,
 
 				/* Save old value to support transaction abort */
 				if (changeVal && !makeDefault)
-					push_old_value(&conf->gen);
+					push_old_value(&conf->gen, action);
 
 				if (conf->assign_hook)
 					if (!(*conf->assign_hook) (newval, changeVal, source))
@@ -4785,43 +4971,28 @@ set_config_option(const char *name, const char *value,
 						return false;
 					}
 
-				if (changeVal || makeDefault)
+				if (changeVal)
+				{
+					*conf->variable = newval;
+					conf->gen.source = source;
+				}
+				if (makeDefault)
 				{
-					if (changeVal)
+					GucStack   *stack;
+
+					if (conf->gen.reset_source <= source)
 					{
-						*conf->variable = newval;
-						conf->gen.source = source;
+						conf->reset_val = newval;
+						conf->gen.reset_source = source;
 					}
-					if (makeDefault)
+					for (stack = conf->gen.stack; stack; stack = stack->prev)
 					{
-						GucStack   *stack;
-
-						if (conf->gen.reset_source <= source)
+						if (stack->source <= source)
 						{
-							conf->reset_val = newval;
-							conf->gen.reset_source = source;
-						}
-						for (stack = conf->gen.stack; stack; stack = stack->prev)
-						{
-							if (stack->source <= source)
-							{
-								stack->value.realval = newval;
-								stack->source = source;
-							}
+							stack->prior.realval = newval;
+							stack->source = source;
 						}
 					}
-					else if (isLocal)
-					{
-						conf->gen.status |= GUC_HAVE_LOCAL;
-						guc_dirty = true;
-					}
-					else
-					{
-						conf->tentative_val = newval;
-						conf->gen.tentative_source = source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-						guc_dirty = true;
-					}
 				}
 				break;
 			}
@@ -4844,28 +5015,40 @@ set_config_option(const char *name, const char *value,
 					if (conf->gen.flags & GUC_IS_NAME)
 						truncate_identifier(newval, strlen(newval), true);
 				}
-				else if (conf->reset_val)
+				else if (source == PGC_S_DEFAULT)
+				{
+					if (conf->boot_val == NULL)
+						newval = NULL;
+					else
+					{
+						newval = guc_strdup(elevel, conf->boot_val);
+						if (newval == NULL)
+							return false;
+					}
+				}
+				else
 				{
 					/*
 					 * We could possibly avoid strdup here, but easier to make
-					 * this case work the same as the normal assignment case.
+					 * this case work the same as the normal assignment case;
+					 * note the possible free of newval below.
 					 */
-					newval = guc_strdup(elevel, conf->reset_val);
-					if (newval == NULL)
-						return false;
+					if (conf->reset_val == NULL)
+						newval = NULL;
+					else
+					{
+						newval = guc_strdup(elevel, conf->reset_val);
+						if (newval == NULL)
+							return false;
+					}
 					source = conf->gen.reset_source;
 				}
-				else
-				{
-					/* Nothing to reset to, as yet; so do nothing */
-					break;
-				}
 
 				/* Save old value to support transaction abort */
 				if (changeVal && !makeDefault)
-					push_old_value(&conf->gen);
+					push_old_value(&conf->gen, action);
 
-				if (conf->assign_hook)
+				if (conf->assign_hook && newval)
 				{
 					const char *hookresult;
 
@@ -4902,49 +5085,32 @@ set_config_option(const char *name, const char *value,
 					}
 				}
 
-				if (changeVal || makeDefault)
+				if (changeVal)
 				{
-					if (changeVal)
+					set_string_field(conf, conf->variable, newval);
+					conf->gen.source = source;
+				}
+				if (makeDefault)
+				{
+					GucStack   *stack;
+
+					if (conf->gen.reset_source <= source)
 					{
-						set_string_field(conf, conf->variable, newval);
-						conf->gen.source = source;
+						set_string_field(conf, &conf->reset_val, newval);
+						conf->gen.reset_source = source;
 					}
-					if (makeDefault)
+					for (stack = conf->gen.stack; stack; stack = stack->prev)
 					{
-						GucStack   *stack;
-
-						if (conf->gen.reset_source <= source)
+						if (stack->source <= source)
 						{
-							set_string_field(conf, &conf->reset_val, newval);
-							conf->gen.reset_source = source;
+							set_string_field(conf, &stack->prior.stringval,
+											 newval);
+							stack->source = source;
 						}
-						for (stack = conf->gen.stack; stack; stack = stack->prev)
-						{
-							if (stack->source <= source)
-							{
-								set_string_field(conf, &stack->value.stringval,
-												 newval);
-								stack->source = source;
-							}
-						}
-						/* Perhaps we didn't install newval anywhere */
-						if (!string_field_used(conf, newval))
-							free(newval);
-					}
-					else if (isLocal)
-					{
-						conf->gen.status |= GUC_HAVE_LOCAL;
-						guc_dirty = true;
-					}
-					else
-					{
-						set_string_field(conf, &conf->tentative_val, newval);
-						conf->gen.tentative_source = source;
-						conf->gen.status |= GUC_HAVE_TENTATIVE;
-						guc_dirty = true;
 					}
 				}
-				else
+				/* Perhaps we didn't install newval anywhere */
+				if (newval && !string_field_used(conf, newval))
 					free(newval);
 				break;
 			}
@@ -4966,7 +5132,8 @@ void
 SetConfigOption(const char *name, const char *value,
 				GucContext context, GucSource source)
 {
-	(void) set_config_option(name, value, context, source, false, true);
+	(void) set_config_option(name, value, context, source,
+							 GUC_ACTION_SET, true);
 }
 
 
@@ -4984,7 +5151,7 @@ GetConfigOption(const char *name)
 	struct config_generic *record;
 	static char buffer[256];
 
-	record = find_option(name, ERROR);
+	record = find_option(name, false, ERROR);
 	if (record == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -5017,6 +5184,10 @@ GetConfigOption(const char *name)
 
 /*
  * Get the RESET value associated with the given option.
+ *
+ * Note: this is not re-entrant, due to use of static result buffer;
+ * not to mention that a string variable could have its reset_val changed.
+ * Beware of assuming the result value is good for very long.
  */
 const char *
 GetConfigOptionResetString(const char *name)
@@ -5024,7 +5195,7 @@ GetConfigOptionResetString(const char *name)
 	struct config_generic *record;
 	static char buffer[256];
 
-	record = find_option(name, ERROR);
+	record = find_option(name, false, ERROR);
 	if (record == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -5064,7 +5235,7 @@ IsSuperuserConfigOption(const char *name)
 {
 	struct config_generic *record;
 
-	record = find_option(name, ERROR);
+	record = find_option(name, false, ERROR);
 	/* On an unrecognized name, don't error, just return false. */
 	if (record == NULL)
 		return false;
@@ -5072,6 +5243,51 @@ IsSuperuserConfigOption(const char *name)
 }
 
 
+/*
+ * GUC_complaint_elevel
+ *		Get the ereport error level to use in an assign_hook's error report.
+ *
+ * This should be used by assign hooks that want to emit a custom error
+ * report (in addition to the generic "invalid value for option FOO" that
+ * guc.c will provide).  Note that the result might be ERROR or a lower
+ * level, so the caller must be prepared for control to return from ereport,
+ * or not.  If control does return, return false/NULL from the hook function.
+ *
+ * At some point it'd be nice to replace this with a mechanism that allows
+ * the custom message to become the DETAIL line of guc.c's generic message.
+ */
+int
+GUC_complaint_elevel(GucSource source)
+{
+	int			elevel;
+
+	if (source == PGC_S_FILE)
+	{
+		/*
+		 * To avoid cluttering the log, only the postmaster bleats loudly
+		 * about problems with the config file.
+		 */
+		elevel = IsUnderPostmaster ? DEBUG3 : LOG;
+	}
+	else if (source == PGC_S_OVERRIDE)
+	{
+		/*
+		 * If we're a postmaster child, this is probably "undo" during
+		 * transaction abort, so we don't want to clutter the log.  There's
+		 * a small chance of a real problem with an OVERRIDE setting,
+		 * though, so suppressing the message entirely wouldn't be desirable.
+		 */
+		elevel = IsUnderPostmaster ? DEBUG5 : LOG;
+	}
+	else if (source < PGC_S_INTERACTIVE)
+		elevel = LOG;
+	else
+		elevel = ERROR;
+
+	return elevel;
+}
+
+
 /*
  * flatten_set_variable_args
  *		Given a parsenode List as emitted by the grammar for SET,
@@ -5080,10 +5296,10 @@ IsSuperuserConfigOption(const char *name)
  * We need to be told the name of the variable the args are for, because
  * the flattening rules vary (ugh).
  *
- * The result is NULL if input is NIL (ie, SET ... TO DEFAULT), otherwise
+ * The result is NULL if args is NIL (ie, SET ... TO DEFAULT), otherwise
  * a palloc'd string.
  */
-char *
+static char *
 flatten_set_variable_args(const char *name, List *args)
 {
 	struct config_generic *record;
@@ -5091,15 +5307,12 @@ flatten_set_variable_args(const char *name, List *args)
 	StringInfoData buf;
 	ListCell   *l;
 
-	/*
-	 * Fast path if just DEFAULT.  We do not check the variable name in this
-	 * case --- necessary for RESET ALL to work correctly.
-	 */
+	/* Fast path if just DEFAULT */
 	if (args == NIL)
 		return NULL;
 
 	/* Else get flags for the variable */
-	record = find_option(name, ERROR);
+	record = find_option(name, true, ERROR);
 	if (record == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -5145,11 +5358,13 @@ flatten_set_variable_args(const char *name, List *args)
 					 * to interval and back to normalize the value and account
 					 * for any typmod.
 					 */
+					Oid			typoid;
 					int32		typmod;
 					Datum		interval;
 					char	   *intervalout;
 
-					typmod = typenameTypeMod(NULL, arg->typname, INTERVALOID);
+					typoid = typenameTypeId(NULL, arg->typname, &typmod);
+					Assert(typoid == INTERVALOID);
 
 					interval =
 						DirectFunctionCall3(interval_in,
@@ -5189,7 +5404,121 @@ flatten_set_variable_args(const char *name, List *args)
  * SET command
  */
 void
-SetPGVariable(const char *name, List *args, bool is_local, bool gp_dispatch)
+ExecSetVariableStmt(VariableSetStmt *stmt)
+{
+	GucAction	action = stmt->is_local ? GUC_ACTION_LOCAL : GUC_ACTION_SET;
+
+	switch (stmt->kind)
+	{
+		case VAR_SET_VALUE:
+		case VAR_SET_CURRENT:
+			set_config_option(stmt->name,
+							  ExtractSetVariableArgs(stmt),
+							  (superuser() ? PGC_SUSET : PGC_USERSET),
+							  PGC_S_SESSION,
+							  action,
+							  true);
+			break;
+		case VAR_SET_MULTI:
+
+			/*
+			 * Special case for special SQL syntax that effectively sets more
+			 * than one variable per statement.
+			 */
+			if (strcmp(stmt->name, "TRANSACTION") == 0)
+			{
+				ListCell   *head;
+
+				foreach(head, stmt->args)
+				{
+					DefElem    *item = (DefElem *) lfirst(head);
+
+					if (strcmp(item->defname, "transaction_isolation") == 0)
+						SetPGVariable("transaction_isolation",
+									  list_make1(item->arg), stmt->is_local);
+					else if (strcmp(item->defname, "transaction_read_only") == 0)
+						SetPGVariable("transaction_read_only",
+									  list_make1(item->arg), stmt->is_local);
+					else
+						elog(ERROR, "unexpected SET TRANSACTION element: %s",
+							 item->defname);
+				}
+			}
+			else if (strcmp(stmt->name, "SESSION CHARACTERISTICS") == 0)
+			{
+				ListCell   *head;
+
+				foreach(head, stmt->args)
+				{
+					DefElem    *item = (DefElem *) lfirst(head);
+
+					if (strcmp(item->defname, "transaction_isolation") == 0)
+						SetPGVariable("default_transaction_isolation",
+									  list_make1(item->arg), stmt->is_local);
+					else if (strcmp(item->defname, "transaction_read_only") == 0)
+						SetPGVariable("default_transaction_read_only",
+									  list_make1(item->arg), stmt->is_local);
+					else
+						elog(ERROR, "unexpected SET SESSION element: %s",
+							 item->defname);
+				}
+			}
+			else
+				elog(ERROR, "unexpected SET MULTI element: %s",
+					 stmt->name);
+			break;
+		case VAR_SET_DEFAULT:
+		case VAR_RESET:
+			set_config_option(stmt->name,
+							  NULL,
+							  (superuser() ? PGC_SUSET : PGC_USERSET),
+							  PGC_S_SESSION,
+							  action,
+							  true);
+			break;
+		case VAR_RESET_ALL:
+			ResetAllOptions();
+			break;
+	}
+}
+
+/*
+ * Get the value to assign for a VariableSetStmt, or NULL if it's RESET.
+ * The result is palloc'd.
+ *
+ * This is exported for use by actions such as ALTER ROLE SET.
+ */
+char *
+ExtractSetVariableArgs(VariableSetStmt *stmt)
+{
+	switch (stmt->kind)
+	{
+		case VAR_SET_VALUE:
+			return flatten_set_variable_args(stmt->name, stmt->args);
+		case VAR_SET_CURRENT:
+			return GetConfigOptionByName(stmt->name, NULL);
+		default:
+			return NULL;
+	}
+}
+
+
+
+/*
+ * SetPGVariable - SET command exported as an easily-C-callable function.
+ *
+ * This provides access to SET TO value, as well as SET TO DEFAULT (expressed
+ * by passing args == NIL), but not SET FROM CURRENT functionality.
+ */
+void
+SetPGVariable(const char *name, List *args, bool is_local)
+{
+	SetPGVariableOptDispatch(name, args, is_local, true);
+}
+
+/* GPDB: Like SetPGVariable, but with extra 'gp_dispatch' parameter.  */
+void
+SetPGVariableOptDispatch(const char *name, List *args, bool is_local, bool gp_dispatch)
 {
 	char	   *argstring = flatten_set_variable_args(name, args);
 
@@ -5198,7 +5527,7 @@ SetPGVariable(const char *name, List *args, bool is_local, bool gp_dispatch)
 					  argstring,
 					  (superuser() ? PGC_SUSET : PGC_USERSET),
 					  PGC_S_SESSION,
-					  is_local,
+					  is_local ? GUC_ACTION_LOCAL : GUC_ACTION_SET,
 					  true);
 
 	if (Gp_role == GP_ROLE_DISPATCH && !IsBootstrapProcessingMode() &&
@@ -5312,7 +5641,7 @@ set_config_by_name(PG_FUNCTION_ARGS)
 					  value,
 					  (superuser() ? PGC_SUSET : PGC_USERSET),
 					  PGC_S_SESSION,
-					  is_local,
+					  is_local ? GUC_ACTION_LOCAL : GUC_ACTION_SET,
 					  true);
 
     if (Gp_role == GP_ROLE_DISPATCH && !IsBootstrapProcessingMode() &&
@@ -5339,6 +5668,38 @@ set_config_by_name(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(result_text);
 }
 
+
+/*
+ * Common code for DefineCustomXXXVariable subroutines: allocate the
+ * new variable's config struct and fill in generic fields.
+ */
+static struct config_generic *
+init_custom_variable(const char *name,
+					 const char *short_desc,
+					 const char *long_desc,
+					 GucContext context,
+					 enum config_type type,
+					 size_t sz)
+{
+	struct config_generic *gen;
+
+	gen = (struct config_generic *) guc_malloc(ERROR, sz);
+	memset(gen, 0, sz);
+
+	gen->name = guc_strdup(ERROR, name);
+	gen->context = context;
+	gen->group = CUSTOM_OPTIONS;
+	gen->short_desc = short_desc;
+	gen->long_desc = long_desc;
+	gen->vartype = type;
+
+	return gen;
+}
+
+/*
+ * Common code for DefineCustomXXXVariable subroutines: insert the new
+ * variable into the GUC variable array, replacing any placeholder.
+ */
 static void
 define_custom_variable(struct config_generic * variable)
 {
@@ -5346,15 +5707,16 @@ define_custom_variable(struct config_generic * variable)
 	const char **nameAddr = &name;
 	const char *value;
 	struct config_string *pHolder;
-	struct config_generic **res = (struct config_generic **) bsearch(
-														  (void *) &nameAddr,
-													  (void *) guc_variables,
-														   num_guc_variables,
-											 sizeof(struct config_generic *),
-															guc_var_compare);
+	struct config_generic **res;
 
+	res = (struct config_generic **) bsearch((void *) &nameAddr,
+											 (void *) guc_variables,
+											 num_guc_variables,
+											 sizeof(struct config_generic *),
+											 guc_var_compare);
 	if (res == NULL)
 	{
+		/* No placeholder to replace, so just add it */
 		add_guc_variable(variable, ERROR);
 		return;
 	}
@@ -5368,13 +5730,14 @@ define_custom_variable(struct config_generic * variable)
 				 errmsg("attempt to redefine parameter \"%s\"", name)));
 
 	Assert((*res)->vartype == PGC_STRING);
-	pHolder = (struct config_string *) * res;
+	pHolder = (struct config_string *) (*res);
 
-	/* We have the same name, no sorting is necessary */
+	/*
+	 * Replace the placeholder. We aren't changing the name, so no re-sorting
+	 * is necessary
+	 */
 	*res = variable;
 
-	value = *pHolder->variable;
-
 	/*
 	 * Assign the string value stored in the placeholder to the real variable.
 	 *
@@ -5382,9 +5745,12 @@ define_custom_variable(struct config_generic * variable)
 	 * assignment, since we don't want it to roll back if the current xact
 	 * fails later.
 	 */
-	set_config_option(name, value,
-					  pHolder->gen.context, pHolder->gen.source,
-					  false, true);
+	value = *pHolder->variable;
+
+	if (value)
+		set_config_option(name, value,
+						  pHolder->gen.context, pHolder->gen.source,
+						  GUC_ACTION_SET, true);
 
 	/*
 	 * Free up as much as we conveniently can of the placeholder structure
@@ -5392,27 +5758,10 @@ define_custom_variable(struct config_generic * variable)
 	 */
 	set_string_field(pHolder, pHolder->variable, NULL);
 	set_string_field(pHolder, &pHolder->reset_val, NULL);
-	set_string_field(pHolder, &pHolder->tentative_val, NULL);
 
 	free(pHolder);
 }
 
-static void
-init_custom_variable(struct config_generic * gen,
-					 const char *name,
-					 const char *short_desc,
-					 const char *long_desc,
-					 GucContext context,
-					 enum config_type type)
-{
-	gen->name = guc_strdup(ERROR, name);
-	gen->context = context;
-	gen->group = CUSTOM_OPTIONS;
-	gen->short_desc = short_desc;
-	gen->long_desc = long_desc;
-	gen->vartype = type;
-}
-
 void
 DefineCustomBoolVariable(const char *name,
 						 const char *short_desc,
@@ -5422,13 +5771,13 @@ DefineCustomBoolVariable(const char *name,
 						 GucBoolAssignHook assign_hook,
 						 GucShowHook show_hook)
 {
-	size_t		sz = sizeof(struct config_bool);
-	struct config_bool *var = (struct config_bool *) guc_malloc(ERROR, sz);
-
-	memset(var, 0, sz);
-	init_custom_variable(&var->gen, name, short_desc, long_desc, context, PGC_BOOL);
+	struct config_bool *var;
 
+	var = (struct config_bool *)
+		init_custom_variable(name, short_desc, long_desc, context,
+							 PGC_BOOL, sizeof(struct config_bool));
 	var->variable = valueAddr;
+	var->boot_val = *valueAddr;
 	var->reset_val = *valueAddr;
 	var->assign_hook = assign_hook;
 	var->show_hook = show_hook;
@@ -5446,13 +5795,13 @@ DefineCustomIntVariable(const char *name,
 						GucIntAssignHook assign_hook,
 						GucShowHook show_hook)
 {
-	size_t		sz = sizeof(struct config_int);
-	struct config_int *var = (struct config_int *) guc_malloc(ERROR, sz);
-
-	memset(var, 0, sz);
-	init_custom_variable(&var->gen, name, short_desc, long_desc, context, PGC_INT);
+	struct config_int *var;
 
+	var = (struct config_int *)
+		init_custom_variable(name, short_desc, long_desc, context,
+							 PGC_INT, sizeof(struct config_int));
 	var->variable = valueAddr;
+	var->boot_val = *valueAddr;
 	var->reset_val = *valueAddr;
 	var->min = minValue;
 	var->max = maxValue;
@@ -5472,13 +5821,13 @@ DefineCustomRealVariable(const char *name,
 						 GucRealAssignHook assign_hook,
 						 GucShowHook show_hook)
 {
-	size_t		sz = sizeof(struct config_real);
-	struct config_real *var = (struct config_real *) guc_malloc(ERROR, sz);
-
-	memset(var, 0, sz);
-	init_custom_variable(&var->gen, name, short_desc, long_desc, context, PGC_REAL);
+	struct config_real *var;
 
+	var = (struct config_real *)
+		init_custom_variable(name, short_desc, long_desc, context,
+							 PGC_REAL, sizeof(struct config_real));
 	var->variable = valueAddr;
+	var->boot_val = *valueAddr;
 	var->reset_val = *valueAddr;
 	var->min = minValue;
 	var->max = maxValue;
@@ -5496,14 +5845,16 @@ DefineCustomStringVariable(const char *name,
 						   GucStringAssignHook assign_hook,
 						   GucShowHook show_hook)
 {
-	size_t		sz = sizeof(struct config_string);
-	struct config_string *var = (struct config_string *) guc_malloc(ERROR, sz);
-
-	memset(var, 0, sz);
-	init_custom_variable(&var->gen, name, short_desc, long_desc, context, PGC_STRING);
+	struct config_string *var;
 
+	var = (struct config_string *)
+		init_custom_variable(name, short_desc, long_desc, context,
+							 PGC_STRING, sizeof(struct config_string));
 	var->variable = valueAddr;
-	var->reset_val = *valueAddr;
+	var->boot_val = *valueAddr;
+	/* we could probably do without strdup, but keep it like normal case */
+	if (var->boot_val)
+		var->reset_val = guc_strdup(ERROR, var->boot_val);
 	var->assign_hook = assign_hook;
 	var->show_hook = show_hook;
 	define_custom_variable(&var->gen);
@@ -5540,7 +5891,7 @@ EmitWarningsOnPlaceholders(const char *className)
 void
 GetPGVariable(const char *name, DestReceiver *dest)
 {
-	if (pg_strcasecmp(name, "all") == 0)
+	if (guc_name_compare(name, "all") == 0)
 		ShowAllGUCConfig(dest);
 	else
 		ShowGUCConfigOption(name, dest);
@@ -5551,7 +5902,7 @@ GetPGVariableResultDesc(const char *name)
 {
 	TupleDesc	tupdesc;
 
-	if (pg_strcasecmp(name, "all") == 0)
+	if (guc_name_compare(name, "all") == 0)
 	{
 		/* need a tuple descriptor representing three TEXT columns */
 		tupdesc = CreateTemplateTupleDesc(3, false);
@@ -5578,23 +5929,6 @@ GetPGVariableResultDesc(const char *name)
 	return tupdesc;
 }
 
-/*
- * RESET command
- */
-void
-ResetPGVariable(const char *name)
-{
-	if (pg_strcasecmp(name, "all") == 0)
-		ResetAllOptions();
-	else
-		set_config_option(name,
-						  NULL,
-						  (superuser() ? PGC_SUSET : PGC_USERSET),
-						  PGC_S_SESSION,
-						  false,
-						  true);
-}
-
 
 /*
  * SHOW command
@@ -5682,7 +6016,7 @@ GetConfigOptionByName(const char *name, const char **varname)
 {
 	struct config_generic *record;
 
-	record = find_option(name, ERROR);
+	record = find_option(name, false, ERROR);
 	if (record == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -6186,9 +6520,19 @@ _ShowOption(struct config_generic * record, bool use_units)
 }
 
 
+/*
+ * Attempt (badly) to detect if a proposed new GUC setting is the same
+ * as the current value.
+ *
+ * XXX this does not really work because it doesn't account for the
+ * effects of canonicalization of string values by assign_hooks.
+ */
 static bool
 is_newvalue_equal(struct config_generic * record, const char *newvalue)
 {
+	/* newvalue == NULL isn't supported */
+	Assert(newvalue != NULL);
+
 	switch (record->vartype)
 	{
 		case PGC_BOOL:
@@ -6196,8 +6540,8 @@ is_newvalue_equal(struct config_generic * record, const char *newvalue)
 				struct config_bool *conf = (struct config_bool *) record;
 				bool		newval;
 
-				return parse_bool(newvalue, &newval) &&
-					*conf->variable == newval;
+				return parse_bool(newvalue, &newval)
+					&& *conf->variable == newval;
 			}
 		case PGC_INT:
 			{
@@ -6212,14 +6556,15 @@ is_newvalue_equal(struct config_generic * record, const char *newvalue)
 				struct config_real *conf = (struct config_real *) record;
 				double		newval;
 
-				return parse_real(newvalue, &newval, record->flags)
+				return parse_real(newvalue, &newval)
 					&& *conf->variable == newval;
 			}
 		case PGC_STRING:
 			{
 				struct config_string *conf = (struct config_string *) record;
 
-				return strcmp(*conf->variable, newvalue) == 0;
+				return *conf->variable != NULL &&
+					strcmp(*conf->variable, newvalue) == 0;
 			}
 	}
 
@@ -6399,7 +6744,7 @@ read_nondefault_variables(void)
 		if ((varname = read_string_with_null(fp)) == NULL)
 			break;
 
-		if ((record = find_option(varname, FATAL)) == NULL)
+		if ((record = find_option(varname, true, FATAL)) == NULL)
 			elog(FATAL, "failed to locate variable %s in exec config params file", varname);
 		if ((varvalue = read_string_with_null(fp)) == NULL)
 			elog(FATAL, "invalid format of exec config params file");
@@ -6407,7 +6752,7 @@ read_nondefault_variables(void)
 			elog(FATAL, "invalid format of exec config params file");
 
 		(void) set_config_option(varname, varvalue, record->context,
-								 varsource, false, true);
+								 varsource, GUC_ACTION_SET, true);
 		free(varname);
 		free(varvalue);
 	}
@@ -6456,11 +6801,14 @@ ParseLongOption(const char *string, char **name, char **value)
 }
 
 /*
- * Handle options fetched from pg_database.datconfig or pg_authid.rolconfig.
+ * Handle options fetched from pg_database.datconfig, pg_authid.rolconfig,
+ * pg_proc.proconfig, etc.	Caller must specify proper context/source/action.
+ *
  * The array parameter must be an array of TEXT (it must not be NULL).
  */
 void
-ProcessGUCArray(ArrayType *array, GucSource source)
+ProcessGUCArray(ArrayType *array,
+				GucContext context, GucSource source, GucAction action)
 {
 	int			i;
 
@@ -6468,7 +6816,6 @@ ProcessGUCArray(ArrayType *array, GucSource source)
 	Assert(ARR_ELEMTYPE(array) == TEXTOID);
 	Assert(ARR_NDIM(array) == 1);
 	Assert(ARR_LBOUND(array)[0] == 1);
-	Assert(source == PGC_S_DATABASE || source == PGC_S_USER);
 
 	for (i = 1; i <= ARR_DIMS(array)[0]; i++)
 	{
@@ -6495,17 +6842,13 @@ ProcessGUCArray(ArrayType *array, GucSource source)
 		{
 			ereport(WARNING,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-			  errmsg("could not parse setting for parameter \"%s\"", name)));
+					 errmsg("could not parse setting for parameter \"%s\"",
+							name)));
 			free(name);
 			continue;
 		}
 
-		/*
-		 * We process all these options at SUSET level.  We assume that the
-		 * right to insert an option into pg_database or pg_authid was checked
-		 * when it was inserted.
-		 */
-		SetConfigOption(name, value, PGC_SUSET, source);
+		(void) set_config_option(name, value, context, source, action, true);
 
 		free(name);
 		if (value)
@@ -6533,7 +6876,7 @@ GUCArrayAdd(ArrayType *array, const char *name, const char *value)
 	/* test if the option is valid */
 	set_config_option(name, value,
 					  superuser() ? PGC_SUSET : PGC_USERSET,
-					  PGC_S_TEST, false, false);
+					  PGC_S_TEST, GUC_ACTION_SET, false);
 
 	/* convert name to canonical spelling, so we can use plain strcmp */
 	(void) GetConfigOptionByName(name, &varname);
@@ -6611,7 +6954,7 @@ GUCArrayDelete(ArrayType *array, const char *name)
 	/* test if the option is valid */
 	set_config_option(name, NULL,
 					  superuser() ? PGC_SUSET : PGC_USERSET,
-					  PGC_S_TEST, false, false);
+					  PGC_S_TEST, GUC_ACTION_SET, false);
 
 	/* convert name to canonical spelling, so we can use plain strcmp */
 	(void) GetConfigOptionByName(name, &varname);
@@ -6645,6 +6988,7 @@ GUCArrayDelete(ArrayType *array, const char *name)
 			&& val[strlen(name)] == '=')
 			continue;
 
+
 		/* else add it to the output array */
 		if (newarray)
 		{
@@ -6712,7 +7056,7 @@ GUCArrayReset(ArrayType *array)
 		eqsgn = strchr(val, '=');
 		*eqsgn = '\0';
 
-		gconf = find_option(val, WARNING);
+		gconf = find_option(val, false, WARNING);
 		if (!gconf)
 			continue;
 
@@ -6746,36 +7090,8 @@ GUCArrayReset(ArrayType *array)
 	return newarray;
 }
 
-static bool
-assign_maxconnections(int newval, bool doit, GucSource source)
-{
-	if (doit)
-	{
-		if (newval + autovacuum_max_workers > INT_MAX / 4)
-			return false;
-
-		MaxBackends = newval + autovacuum_max_workers;
-	}
-
-	return true;
-}
-
-static bool
-assign_autovacuum_max_workers(int newval, bool doit, GucSource source)
-{
-	if (doit)
-	{
-		if (newval + MaxConnections > INT_MAX / 4)
-			return false;
-
-		MaxBackends = newval + MaxConnections;
-	}
-
-	return true;
-}
-
 /*
- * assign_hook subroutines
+ * assign_hook and show_hook subroutines
  */
 
 static const char *
@@ -6795,9 +7111,8 @@ assign_log_destination(const char *value, bool doit, GucSource source)
 		/* syntax error in list */
 		pfree(rawstring);
 		list_free(elemlist);
-		if (source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 			errmsg("invalid list syntax for parameter \"log_destination\"")));
 		return NULL;
 	}
@@ -6808,6 +7123,8 @@ assign_log_destination(const char *value, bool doit, GucSource source)
 
 		if (pg_strcasecmp(tok, "stderr") == 0)
 			newlogdest |= LOG_DESTINATION_STDERR;
+		else if (pg_strcasecmp(tok, "csvlog") == 0)
+			newlogdest |= LOG_DESTINATION_CSVLOG;
 #ifdef HAVE_SYSLOG
 		else if (pg_strcasecmp(tok, "syslog") == 0)
 			newlogdest |= LOG_DESTINATION_SYSLOG;
@@ -6818,9 +7135,8 @@ assign_log_destination(const char *value, bool doit, GucSource source)
 #endif
 		else
 		{
-			if (source >= PGC_S_INTERACTIVE)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+			ereport(GUC_complaint_elevel(source),
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				  errmsg("unrecognized \"log_destination\" key word: \"%s\"",
 						 tok)));
 			pfree(rawstring);
@@ -6914,8 +7230,34 @@ assign_defaultxactisolevel(const char *newval, bool doit, GucSource source)
 }
 
 static const char *
-assign_log_min_messages(const char *newval,
-						bool doit, GucSource source)
+assign_session_replication_role(const char *newval, bool doit, GucSource source)
+{
+	int			newrole;
+
+	if (pg_strcasecmp(newval, "origin") == 0)
+		newrole = SESSION_REPLICATION_ROLE_ORIGIN;
+	else if (pg_strcasecmp(newval, "replica") == 0)
+		newrole = SESSION_REPLICATION_ROLE_REPLICA;
+	else if (pg_strcasecmp(newval, "local") == 0)
+		newrole = SESSION_REPLICATION_ROLE_LOCAL;
+	else
+		return NULL;
+
+	/*
+	 * Must flush the plan cache when changing replication role; but don't
+	 * flush unnecessarily.
+	 */
+	if (doit && SessionReplicationRole != newrole)
+	{
+		ResetPlanCache();
+		SessionReplicationRole = newrole;
+	}
+
+	return newval;
+}
+
+static const char *
+assign_log_min_messages(const char *newval, bool doit, GucSource source)
 {
 	return (assign_msglvl(&log_min_messages, newval, doit, source));
 }
@@ -7123,10 +7465,9 @@ assign_phony_autocommit(bool newval, bool doit, GucSource source)
 {
 	if (!newval)
 	{
-		if (doit && source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("SET AUTOCOMMIT TO OFF is no longer supported")));
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("SET AUTOCOMMIT TO OFF is no longer supported")));
 		return false;
 	}
 	return true;
@@ -7142,11 +7483,11 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source)
 	bool		hasSpaceAfterToken = false;
 	const char *cp = newval;
 	int			symLen = 0;
-	int			c;
+	char		c;
 	StringInfoData buf;
 
 	initStringInfo(&buf);
-	while ((c = *cp++) != 0)
+	while ((c = *cp++) != '\0')
 	{
 		if (isspace((unsigned char) c))
 		{
@@ -7157,12 +7498,12 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source)
 
 		if (c == ',')
 		{
-			hasSpaceAfterToken = false;
-			if (symLen > 0)
+			if (symLen > 0)		/* terminate identifier */
 			{
-				symLen = 0;
 				appendStringInfoChar(&buf, ',');
+				symLen = 0;
 			}
+			hasSpaceAfterToken = false;
 			continue;
 		}
 
@@ -7172,24 +7513,19 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source)
 			 * Syntax error due to token following space after token or non
 			 * alpha numeric character
 			 */
-			ereport(LOG,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("invalid syntax for \"custom_variable_classes\": \"%s\"", newval)));
 			pfree(buf.data);
 			return NULL;
 		}
+		appendStringInfoChar(&buf, c);
 		symLen++;
-		appendStringInfoChar(&buf, (char) c);
 	}
 
 	/* Remove stray ',' at end */
 	if (symLen == 0 && buf.len > 0)
 		buf.data[--buf.len] = '\0';
 
-	if (buf.len == 0)
-		newval = NULL;
-	else if (doit)
-		newval = strdup(buf.data);
+	/* GUC wants the result malloc'd */
+	newval = guc_strdup(LOG, buf.data);
 
 	pfree(buf.data);
 	return newval;
@@ -7200,30 +7536,27 @@ assign_debug_assertions(bool newval, bool doit, GucSource source)
 {
 #ifndef USE_ASSERT_CHECKING
 	if (newval)
-		ereport(ERROR,
+	{
+		ereport(GUC_complaint_elevel(source),
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 			   errmsg("assertion checking is not supported by this build")));
+		return false;
+	}
 #endif
 	return true;
 }
 
-static bool
-assign_autovacuum_warning(bool newval, bool doit, GucSource source)
-{
-	if (newval)
-		elog(WARNING, "Autovacuum is not supported in GPDB.");
-
-	return true;
-}
-
 static bool
 assign_ssl(bool newval, bool doit, GucSource source)
 {
 #ifndef USE_SSL
 	if (newval)
-		ereport(ERROR,
+	{
+		ereport(GUC_complaint_elevel(source),
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("SSL is not supported by this build")));
+		return false;
+	}
 #endif
 	return true;
 }
@@ -7233,12 +7566,11 @@ assign_stage_log_stats(bool newval, bool doit, GucSource source)
 {
 	if (newval && log_statement_stats)
 	{
-		if (source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("cannot enable parameter when \"log_statement_stats\" is true")));
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot enable parameter when \"log_statement_stats\" is true")));
 		/* source == PGC_S_OVERRIDE means do it anyway, eg at xact abort */
-		else if (source != PGC_S_OVERRIDE)
+		if (source != PGC_S_OVERRIDE)
 			return false;
 	}
 	return true;
@@ -7250,15 +7582,14 @@ assign_log_stats(bool newval, bool doit, GucSource source)
 	if (newval &&
 		(log_parser_stats || log_planner_stats || log_executor_stats || log_dispatch_stats))
 	{
-		if (source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("cannot enable \"log_statement_stats\" when "
-							"\"log_parser_stats\", \"log_planner_stats\", "
-							"\"log_dispatch_stats\", "
-							"or \"log_executor_stats\" is true")));
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot enable \"log_statement_stats\" when "
+						"\"log_parser_stats\", \"log_planner_stats\", "
+						"\"log_dispatch_stats\", "
+						"or \"log_executor_stats\" is true")));
 		/* source == PGC_S_OVERRIDE means do it anyway, eg at xact abort */
-		else if (source != PGC_S_OVERRIDE)
+		if (source != PGC_S_OVERRIDE)
 			return false;
 	}
 	return true;
@@ -7270,12 +7601,11 @@ assign_transaction_read_only(bool newval, bool doit, GucSource source)
 	/* Can't go to r/w mode inside a r/o transaction */
 	if (newval == false && XactReadOnly && IsSubTransaction())
 	{
-		if (source >= PGC_S_INTERACTIVE)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("cannot set transaction read-write mode inside a read-only transaction")));
+		ereport(GUC_complaint_elevel(source),
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot set transaction read-write mode inside a read-only transaction")));
 		/* source == PGC_S_OVERRIDE means do it anyway, eg at xact abort */
-		else if (source != PGC_S_OVERRIDE)
+		if (source != PGC_S_OVERRIDE)
 			return false;
 	}
 	return true;
@@ -7414,6 +7744,15 @@ assign_xmloption(const char *newval, bool doit, GucSource source)
 	return newval;
 }
 
+static const char *
+show_archive_command(void)
+{
+	if (XLogArchiveMode)
+		return XLogArchiveCommand;
+	else
+		return "(disabled)";
+}
+
 static bool
 assign_tcp_keepalives_idle(int newval, bool doit, GucSource source)
 {
@@ -7580,4 +7919,28 @@ show_allow_system_table_mods(void)
 		return "NONE";
 }
 
+static bool
+assign_maxconnections(int newval, bool doit, GucSource source)
+{
+	if (newval + autovacuum_max_workers > INT_MAX / 4)
+		return false;
+
+	if (doit)
+		MaxBackends = newval + autovacuum_max_workers;
+
+	return true;
+}
+
+static bool
+assign_autovacuum_max_workers(int newval, bool doit, GucSource source)
+{
+	if (newval + MaxConnections > INT_MAX / 4)
+		return false;
+
+	if (doit)
+		MaxBackends = newval + MaxConnections;
+
+	return true;
+}
+
 #include "guc-file.c"
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index f956c6cee18f..955683b19c18 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -581,9 +581,6 @@ bool		codegen;
 /* Security */
 bool		gp_reject_internal_tcp_conn = true;
 
-/* plpgsql plancache GUC */
-bool		gp_plpgsql_clear_cache_always = false;
-
 /*
  * Default storage options GUC.  Value is comma-separated name=value
  * pairs.  E.g. "appendonly=true,orientation=column"
@@ -3350,16 +3347,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true, NULL, NULL
 	},
 
-	{
-		{"gp_plpgsql_clear_cache_always", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Controls caching of plpgsql plans in session"),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE | GUC_GPDB_ADDOPT
-		},
-		&gp_plpgsql_clear_cache_always,
-		false, NULL, NULL
-	},
-
 	{
 		{"fts_diskio_check", PGC_USERSET, DEVELOPER_OPTIONS,
 			gettext_noop("Controls if FTS should perform disk IO checks on primary segments as part of probe"),
diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c
index f33cb185e451..a6732c7c1ea1 100644
--- a/src/backend/utils/misc/help_config.c
+++ b/src/backend/utils/misc/help_config.c
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.18 2007/01/05 22:19:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.19.2.1 2008/02/23 19:23:37 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 198eab57c10f..f331b003eca6 100755
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -20,12 +20,6 @@
 # parameters, which are marked below, require a server shutdown and restart to
 # take effect.
 #
-# This file is read on server startup and when the server receives a
-# SIGHUP.  If you edit the file on a running system, you have to SIGHUP the
-# server for the changes to take effect, or use "pg_ctl reload". Some
-# settings, which are marked below, require a server shutdown and restart
-# to take effect.
-#
 # Any parameter can also be given as a command-line option to the server, e.g.,
 # "postgres -c log_connections=on".  Some parameters can be changed at run time
 # with the "SET" SQL command.
@@ -34,12 +28,12 @@
 # Time units:    ms = milliseconds s = seconds min = minutes h = hours d = days
 
 
-#---------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # FILE LOCATIONS
-#---------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 
-# The default values of these variables are driven from the -D command line
-# switch or PGDATA environment variable, represented here as ConfigDir.
+# The default values of these variables are driven from the -D command-line
+# option or PGDATA environment variable, represented here as ConfigDir.
 
 #data_directory = 'ConfigDir'		# use data in another directory
 					# (change requires restart)
@@ -59,7 +53,7 @@
 
 # - Connection Settings -
 
-#listen_addresses = '*'		# what IP address(es) to listen on;
+#listen_addresses = '*'			# what IP address(es) to listen on;
 					# comma-separated list of addresses;
 					# defaults to '*', '*' = all
 					# (change requires restart)
@@ -74,10 +68,10 @@
 # WARNING: YOU MUST SHUT DOWN YOUR GREENPLUM SYSTEM BEFORE CHANGING 
 # THE PORT NUMBER IN THIS FILE.
 
-#max_connections = 200
-# note: increasing max_connections costs ~400 bytes of shared memory per
-# connection slot, plus lock space (see max_locks_per_transaction).  You
-# might also need to raise shared_buffers to support more connections.
+#max_connections = 200			# (change requires restart)
+# Note:  Increasing max_connections costs ~400 bytes of shared memory per 
+# connection slot, plus lock space (see max_locks_per_transaction).  You might
+# also need to raise shared_buffers to support more connections.
 #superuser_reserved_connections = 3	# (change requires restart)
 #unix_socket_directory = ''		# (change requires restart)
 #unix_socket_group = ''			# (change requires restart)
@@ -92,13 +86,14 @@
 #ssl = off				# (change requires restart)
 #ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
 					# (change requires restart)
+#ssl_renegotiation_limit = 512MB	# amount of data between renegotiations
 #password_encryption = on
 #db_user_namespace = off
 
 # Kerberos and GSSAPI
-#krb_server_keyfile = ''
-#krb_srvname = 'postgres'		# (Kerberos only)
-#krb_caseins_users = off
+#krb_server_keyfile = ''		# (change requires restart)
+#krb_srvname = 'postgres'		# (change requires restart, Kerberos only)
+#krb_caseins_users = off		# (change requires restart)
 
 # - TCP Keepalives -
 # see "man 7 tcp" for details
@@ -122,7 +117,7 @@
 #temp_buffers = 8MB			# min 800kB
 max_prepared_transactions = 250		# can be 0 or more
 					# (change requires restart)
-# Note: increasing max_prepared_transactions costs ~600 bytes of shared memory
+# Note:  Increasing max_prepared_transactions costs ~600 bytes of shared memory
 # per transaction slot, plus lock space (see max_locks_per_transaction).
 #work_mem = 32MB			# min 64kB
 #maintenance_work_mem = 64MB		# min 1MB
@@ -197,7 +192,7 @@ max_prepared_transactions = 250		# can be 0 or more
 
 #from_collapse_limit = 8
 #join_collapse_limit = 8		# 1 disables collapsing of explicit
-					# JOINs
+					# JOIN clauses
 #gp_segments_for_planner = 0     # if 0, actual number of segments is used
 
 #gp_enable_direct_dispatch = on
@@ -223,10 +218,10 @@ optimizer_analyze_root_partition = on # stats collection on root partitions
 					# off, meaning append to existing files
 					# in all cases.
 #log_rotation_age = 1d			# Automatic rotation of logfiles will
-					# happen after that time.  0 disables.
+					# happen after that time.  0 to disable.
 #log_rotation_size = 10MB		# Automatic rotation of logfiles will 
 					# happen after that much log output.
-					# 0 disables.
+					# 0 to disable.
 
 # - When to Log -
 
@@ -273,9 +268,7 @@ optimizer_analyze_root_partition = on # stats collection on root partitions
 
 #log_min_duration_statement = -1	# -1 is disabled, 0 logs all statements
 					# and their durations, > 0 logs only
-					# statements running at least this number
-					# of milliseconds
-
+					# statements running at least this time.
 
 # - What to Log -
 
@@ -285,6 +278,7 @@ optimizer_analyze_root_partition = on # stats collection on root partitions
 #debug_print_slice_table = off
 #debug_print_plan = off
 #debug_pretty_print = off
+#log_checkpoints = off
 #log_connections = off
 #log_disconnections = off
 #log_duration = off
@@ -403,6 +397,32 @@ gp_autostats_mode=on_no_stats		# none, on_no_stats, on_change. see documentation
 gp_autostats_on_change_threshold=2147483647 # [0..INT_MAX]. see documentation for semantics.
 log_autostats=off	# print additional autostats information
 
+#------------------------------------------------------------------------------
+# AUTOVACUUM PARAMETERS
+#------------------------------------------------------------------------------
+
+#autovacuum = on			# Enable autovacuum subprocess?  'on' 
+					# requires track_counts to also be on.
+#log_autovacuum_min_duration = -1	# -1 disables, 0 logs all actions and
+					# their durations, > 0 logs only
+					# actions running at least that time.
+#autovacuum_max_workers = 3		# max number of autovacuum subprocesses
+#autovacuum_naptime = 1min		# time between autovacuum runs
+#autovacuum_vacuum_threshold = 50	# min number of row updates before
+					# vacuum
+#autovacuum_analyze_threshold = 50	# min number of row updates before 
+					# analyze
+#autovacuum_vacuum_scale_factor = 0.2	# fraction of table size before vacuum
+#autovacuum_analyze_scale_factor = 0.1	# fraction of table size before analyze
+#autovacuum_freeze_max_age = 200000000	# maximum XID age before forced vacuum
+					# (change requires restart)
+#autovacuum_vacuum_cost_delay = 20	# default vacuum cost delay for
+					# autovacuum, -1 means use
+					# vacuum_cost_delay
+#autovacuum_vacuum_cost_limit = -1	# default vacuum cost limit for
+					# autovacuum, -1 means use
+					# vacuum_cost_limit
+
 #------------------------------------------------------------------------------
 # CLIENT CONNECTION DEFAULTS
 #------------------------------------------------------------------------------
@@ -414,18 +434,18 @@ log_autostats=off	# print additional autostats information
 #check_function_bodies = on
 #default_transaction_isolation = 'read committed'
 #default_transaction_read_only = off
-#statement_timeout = 0			# in milliseconds, 0 is disabled
+#session_replication_role = 'origin'
+#statement_timeout = 0			# 0 is disabled
 #idle_session_gang_timeout = 18s 	# in milliseconds, 0 is disabled
 #vacuum_freeze_min_age = 100000000
 
 # - Locale and Formatting -
 
 #datestyle = 'iso, mdy'
-#intervalstyle = 'postgres'
 #timezone = unknown			# actually, defaults to TZ environment
 					# setting
 #timezone_abbreviations = 'Default'     # Select the set of available time zone
-					# abbreviations. Currently, there are
+					# abbreviations.  Currently, there are
 					#   Default
 					#   Australia
 					#   India
@@ -442,6 +462,9 @@ log_autostats=off	# print additional autostats information
 #lc_numeric = 'C'			# locale for number formatting
 #lc_time = 'C'				# locale for time formatting
 
+# default configuration for text search
+#default_text_search_config = 'pg_catalog.simple'
+
 # - Other Defaults -
 
 #dynamic_library_path = '$libdir'
@@ -496,7 +519,7 @@ max_appendonly_tables = 10000 # Maximum number of append only tables that can
 #escape_string_warning = on
 #regex_flavor = advanced		# advanced, extended, or basic
 #standard_conforming_strings = on
-
+#synchronize_seqscans = on
 
 # - Other Platforms and Clients -
 
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 2353d84eaebc..cd77621ae0bf 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -5,7 +5,7 @@
  * to contain some useful information. Mechanism differs wildly across
  * platforms.
  *
- * $PostgreSQL: pgsql/src/backend/utils/misc/ps_status.c,v 1.35 2007/02/16 21:34:04 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/ps_status.c,v 1.38.2.1 2010/05/27 19:19:50 tgl Exp $
  *
  * Portions Copyright (c) 2005-2009, Greenplum inc
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
@@ -54,7 +54,7 @@ bool		update_process_title = true;
  *	   (some other BSD systems)
  * PS_USE_CLOBBER_ARGV
  *	   write over the argv and environment area
- *	   (most SysV-like systems)
+ *	   (Linux and most SysV-like systems)
  * PS_USE_WIN32
  *	   push the string out as the name of a Windows event
  * PS_USE_NONE
@@ -86,7 +86,7 @@ bool		update_process_title = true;
 #endif
 
 #ifndef PS_USE_CLOBBER_ARGV
-/* all but one options need a buffer to write their ps line in */
+/* all but one option need a buffer to write their ps line in */
 #define PS_BUFFER_SIZE 256
 static char ps_buffer[PS_BUFFER_SIZE];
 static const size_t ps_buffer_size = PS_BUFFER_SIZE;
@@ -96,6 +96,8 @@ static size_t ps_buffer_size;	/* space determined at run time */
 static size_t last_status_len;  /* use to minimize length of clobber */
 #endif   /* PS_USE_CLOBBER_ARGV */
 
+static size_t ps_buffer_cur_len;		/* nominal strlen(ps_buffer) */
+
 static size_t ps_buffer_fixed_size;		/* size of the constant prefix */
 #if (defined(sun) && !defined(BSD))
 static size_t ps_argument_size; /* size for the first argument */
@@ -262,9 +264,10 @@ init_ps_display(const char *username, const char *dbname,
     if (!IsUnderPostmaster)
         return;
 
-    /* no ps display if you didn't call save_ps_display_args() */
-    if (!save_argv)
-        return;
+	/* no ps display if you didn't call save_ps_display_args() */
+	if (!save_argv)
+		return;
+
 #ifdef PS_USE_CLOBBER_ARGV
     /* If ps_buffer is a pointer, it might still be null */
     if (!ps_buffer)
@@ -344,8 +347,10 @@ init_ps_display(const char *username, const char *dbname,
 	ps_buffer[ps_buffer_fixed_size + ps_host_info_size] = PS_PADDING;
 #endif
 
-    ps_buffer_fixed_size += ps_host_info_size;
+	ps_buffer_cur_len = ps_buffer_fixed_size = strlen(ps_buffer);
 	real_act_prefix_size = ps_buffer_fixed_size;
+
+	set_ps_display(initial_str, true);
 #endif   /* not PS_USE_NONE */
 }
 
@@ -358,13 +363,14 @@ init_ps_display(const char *username, const char *dbname,
 void
 set_ps_display(const char *activity, bool force)
 {
+#ifndef PS_USE_NONE
+	/* update_process_title=off disables updates, unless force = true */
     char   *cp = ps_buffer + ps_buffer_fixed_size;
     char   *ep = ps_buffer + ps_buffer_size;
 
     if (!force && !update_process_title)
         return;
 
-#ifndef PS_USE_NONE
     /* no ps display for stand-alone backend */
     if (!IsUnderPostmaster)
         return;
@@ -413,6 +419,7 @@ set_ps_display(const char *activity, bool force)
 	 * effectively becomes ps_buffer_size.
 	 */
 	real_act_prefix_size = Min(cp, ep) - ps_buffer;
+	ps_buffer_cur_len = real_act_prefix_size;
 
 	/* Append caller's activity string. */
 	if (ep - cp > 0)
@@ -427,9 +434,9 @@ set_ps_display(const char *activity, bool force)
     {
         union pstun pst;
 
-        pst.pst_command = ps_buffer;
-        pstat(PSTAT_SETCMD, pst, strlen(ps_buffer), 0, 0);
-    }
+		pst.pst_command = ps_buffer;
+		pstat(PSTAT_SETCMD, pst, ps_buffer_cur_len, 0, 0);
+	}
 #endif   /* PS_USE_PSTAT */
 
 #ifdef PS_USE_PS_STRINGS
@@ -438,37 +445,11 @@ set_ps_display(const char *activity, bool force)
 #endif   /* PS_USE_PS_STRINGS */
 
 #ifdef PS_USE_CLOBBER_ARGV
-    {
-        int         buflen;
-#if (defined(sun) && !defined(BSD))
-		int         request_buflen = 2 * ps_argument_size + 1;
-#endif
-
-        /* pad unused memory */
-        buflen = strlen(ps_buffer);
-
-#if (defined(sun) && !defined(BSD))
-		/*
-		 * In Solaris, to properly show the ps status display, it requires the length of
-		 * the status at least twice of the original arguments. We pad the '.'s
-		 * if buflen is not big enough. Note that using spaces to pad does not work, 
-		 * and I don't know why.
-		 */
-		if (buflen < request_buflen)
-		{
-			int pad_len = request_buflen - buflen;
-			if (ps_buffer_size < request_buflen)
-				pad_len = ps_buffer_size - buflen;
-			MemSet(ps_buffer + buflen, '.', pad_len);
-			buflen += pad_len;
-		}
-#endif
-
-		/* clobber remainder of old status string */
-		if (last_status_len > buflen)
-			MemSet(ps_buffer + buflen, PS_PADDING, last_status_len - buflen);
-		last_status_len = buflen;
-    }
+	/* pad unused memory; need only clobber remainder of old status string */
+	if (last_status_len > ps_buffer_cur_len)
+		MemSet(ps_buffer + ps_buffer_cur_len, PS_PADDING,
+			   last_status_len - ps_buffer_cur_len);
+	last_status_len = ps_buffer_cur_len;
 #endif   /* PS_USE_CLOBBER_ARGV */
 
 #ifdef PS_USE_WIN32
@@ -501,25 +482,15 @@ static inline const char *
 get_ps_display_from_position(size_t pos, int *displen)
 {
 #ifdef PS_USE_CLOBBER_ARGV
-	size_t		offset;
-
 	/* If ps_buffer is a pointer, it might still be null */
 	if (!ps_buffer)
 	{
 		*displen = 0;
 		return "";
 	}
-
-	/* Remove any trailing spaces to offset the effect of PS_PADDING */
-	offset = ps_buffer_size;
-	while (offset > pos && ps_buffer[offset-1] == PS_PADDING)
-		offset--;
-
-	*displen = offset - pos;
-#else
-	*displen = strlen(ps_buffer + pos);
 #endif
-	Assert(*displen >= 0);
+
+	*displen = (int) (ps_buffer_cur_len - ps_buffer_fixed_size);
 
 	return ps_buffer + pos;
 }
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 12e469a67c1c..43950e9e0c44 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/superuser.c,v 1.36 2007/01/05 22:19:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/superuser.c,v 1.38 2008/09/09 18:58:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,7 +38,7 @@ static Oid	last_roleid = InvalidOid;	/* InvalidOid == cache not valid */
 static bool last_roleid_is_super = false;
 static bool roleid_callback_registered = false;
 
-static void RoleidCallback(Datum arg, Oid relid);
+static void RoleidCallback(Datum arg, int cacheid, ItemPointer tuplePtr);
 
 
 /*
@@ -114,7 +114,7 @@ superuser_arg(Oid roleid)
  *		Syscache inval callback function
  */
 static void
-RoleidCallback(Datum arg, Oid relid)
+RoleidCallback(Datum arg, int cacheid, ItemPointer tuplePtr)
 {
 	/* Invalidate our local cache in case role's superuserness changed */
 	last_roleid = InvalidOid;
diff --git a/src/backend/utils/misc/test/guc_test.c b/src/backend/utils/misc/test/guc_test.c
index cac3f4d20ca5..2133c11be48e 100644
--- a/src/backend/utils/misc/test/guc_test.c
+++ b/src/backend/utils/misc/test/guc_test.c
@@ -243,16 +243,16 @@ test__find_option(void **state)
 	build_guc_variables();
 
 	struct config_generic *config;
-	config = find_option("unknown_name", LOG);
+	config = find_option("unknown_name", false, LOG);
 	assert_null(config);
 
-	config = find_option("password_encryption", LOG);
+	config = find_option("password_encryption", false, LOG);
 	assert_not_null(config);
-	config = find_option("gp_resqueue_priority_cpucores_per_segment", LOG);
+	config = find_option("gp_resqueue_priority_cpucores_per_segment", false, LOG);
 	assert_not_null(config);
 
 	/* supported obsolete guc name */
-	config = find_option("work_mem", LOG);
+	config = find_option("work_mem", false, LOG);
 	assert_not_null(config);
 }
 
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 4b8c263c2b36..b5a26a811036 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/aset.c,v 1.71 2007/01/05 22:19:47 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/aset.c,v 1.76 2008/01/01 19:45:55 momjian Exp $
  *
  * NOTE:
  *	This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -818,13 +818,13 @@ AllocSetContextCreate(MemoryContext parent,
 #endif
 
 	/*
-	 * Compute the allocation chunk size limit for this context.  It can't
-	 * be more than ALLOC_CHUNK_LIMIT because of the fixed number of
-	 * freelists.  If maxBlockSize is small then requests exceeding the
-	 * maxBlockSize should be treated as large chunks, too.  We have to
-	 * have allocChunkLimit a power of two, because the requested and
-	 * actually-allocated sizes of any chunk must be on the same side of
-	 * the limit, else we get confused about whether the chunk is "big".
+	 * Compute the allocation chunk size limit for this context.  It can't be
+	 * more than ALLOC_CHUNK_LIMIT because of the fixed number of freelists.
+	 * If maxBlockSize is small then requests exceeding the maxBlockSize
+	 * should be treated as large chunks, too.	We have to have
+	 * allocChunkLimit a power of two, because the requested and
+	 * actually-allocated sizes of any chunk must be on the same side of the
+	 * limit, else we get confused about whether the chunk is "big".
 	 */
 	context->allocChunkLimit = ALLOC_CHUNK_LIMIT;
 	while (context->allocChunkLimit >
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 2f79b182d143..c331bc6415e9 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.59 2007/01/05 22:19:47 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.63 2008/01/01 19:45:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,8 +74,7 @@ MemoryContext TopTransactionContext = NULL;
 MemoryContext CurTransactionContext = NULL;
 MemoryContext MemoryAccountMemoryContext = NULL;
 
-/* These two are transient links to contexts owned by other objects: */
-MemoryContext QueryContext = NULL;
+/* This is a transient link to the active portal's memory context: */
 MemoryContext PortalContext = NULL;
 
 
@@ -805,7 +804,6 @@ MemoryContextStats(MemoryContext context)
     		currentAvailable, allAllocated, allFreed, maxHeld);
 }
 
-
 /*
  * MemoryContextCheck
  *		Check all chunks in the named context.
@@ -1324,8 +1322,8 @@ pnstrdup(const char *in, Size len)
 /*
  *	Memory support routines for libpgport on Win32
  *
- *	Win32 can't load a library that DLLIMPORTs a variable
- *	if the link object files also DLLIMPORT the same variable.
+ *	Win32 can't load a library that PGDLLIMPORTs a variable
+ *	if the link object files also PGDLLIMPORT the same variable.
  *	For this reason, libpgport can't reference CurrentMemoryContext
  *	in the palloc macro calls.
  *
@@ -1346,7 +1344,7 @@ pgport_pstrdup(const char *str)
 }
 
 
-/* Doesn't reference a DLLIMPORT variable, but here for completeness. */
+/* Doesn't reference a PGDLLIMPORT variable, but here for completeness. */
 void
 pgport_pfree(void *pointer)
 {
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 535e35bbda53..efdefbfc7ef0 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.97.2.1 2007/04/26 23:24:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.106.2.5 2010/07/13 09:02:46 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include "access/xact.h"
 #include "catalog/pg_type.h"
 #include "commands/portalcmds.h"
-#include "funcapi.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
@@ -148,15 +147,15 @@ GetPortalByName(const char *name)
  *		Get the "primary" stmt within a portal, ie, the one marked canSetTag.
  *
  * Returns NULL if no such stmt.  If multiple PlannedStmt structs within the
- * portal are marked canSetTag, returns the first one.	Neither of these
+ * portal are marked canSetTag, returns the first one.  Neither of these
  * cases should occur in present usages of this function.
  *
- * Copes if given a list of Querys --- can't happen in a portal, but may
- * occur elsewhere, e.g., PreparedStatement handling or, eventually,
- * plan caching.
+ * Copes if given a list of Querys --- can't happen in a portal, but this
+ * code also supports plancache.c, which needs both cases.
  *
- * For use with a portal, use PortalGetPrimaryStmt rather than calling this 
- * directly.
+ * Note: the reason this is just handed a List is so that plancache.c
+ * can share the code.  For use with a portal, use PortalGetPrimaryStmt
+ * rather than calling this directly.
  */
 Node *
 PortalListGetPrimaryStmt(List *stmts)
@@ -169,7 +168,7 @@ PortalListGetPrimaryStmt(List *stmts)
 
 		if (IsA(stmt, PlannedStmt))
 		{
-			if (((PlannedStmt *)stmt)->canSetTag)
+			if (((PlannedStmt *) stmt)->canSetTag)
 				return stmt;
 		}
 		else if (IsA(stmt, Query))
@@ -289,17 +288,29 @@ CreateNewPortal(void)
  * PortalDefineQuery
  *		A simple subroutine to establish a portal's query.
  *
- * Notes: Caller MUST supply a sourceText string; it is no longer okay
- * to pass NULL.  (If you really don't have source text, pass a constant 
- * string, e.g., "(query not available)".) 
+ * Notes: as of PG 8.4 (this part backported to GPDB already), caller MUST supply a sourceText string; it is not
+ * allowed anymore to pass NULL.  (If you really don't have source text,
+ * you can pass a constant string, perhaps "(query not available)".)
  *
  * commandTag shall be NULL if and only if the original query string
- * (before rewriting) was an empty string.	Also, commandTag must be a
- * pointer to a constant string, since it is not copied.  
+ * (before rewriting) was an empty string.  Also, the passed commandTag must
+ * be a pointer to a constant string, since it is not copied.
  *
- * The caller is responsible for ensuring that the passed prepStmtName
- * (if not NULL) and sourceText have adequate lifetime. Also, queryContext 
- * must accurately  describe the location of the stmt list contents.
+ * If cplan is provided, then it is a cached plan containing the stmts,
+ * and the caller must have done RevalidateCachedPlan(), causing a refcount
+ * increment.  The refcount will be released when the portal is destroyed.
+ *
+ * If cplan is NULL, then it is the caller's responsibility to ensure that
+ * the passed plan trees have adequate lifetime.  Typically this is done by
+ * copying them into the portal's heap context.
+ *
+ * The caller is also responsible for ensuring that the passed prepStmtName
+ * and sourceText (if not NULL) have adequate lifetime.
+ *
+ * NB: this function mustn't do much beyond storing the passed values; in
+ * particular don't do anything that risks elog(ERROR).  If that were to
+ * happen here before storing the cplan reference, we'd leak the plancache
+ * refcount that the caller is trying to hand off to us.
  */
 void
 PortalDefineQuery(Portal portal,
@@ -308,20 +319,42 @@ PortalDefineQuery(Portal portal,
 				  NodeTag	  sourceTag,
 				  const char *commandTag,
 				  List *stmts,
-				  MemoryContext queryContext)
+				  CachedPlan *cplan)
 {
 	AssertArg(PortalIsValid(portal));
-	AssertState(portal->queryContext == NULL);	/* else defined already */
+	AssertState(portal->status == PORTAL_NEW);
 
 	AssertArg(sourceText != NULL);
-	AssertArg(commandTag != NULL || stmts == NIL);
+	Assert(commandTag != NULL || stmts == NIL);
 
 	portal->prepStmtName = prepStmtName;
 	portal->sourceText = sourceText;
 	portal->sourceTag = sourceTag;
 	portal->commandTag = commandTag;
 	portal->stmts = stmts;
-	portal->queryContext = queryContext;
+	portal->cplan = cplan;
+	portal->status = PORTAL_DEFINED;
+}
+
+/*
+ * PortalReleaseCachedPlan
+ *		Release a portal's reference to its cached plan, if any.
+ */
+static void
+PortalReleaseCachedPlan(Portal portal)
+{
+	if (portal->cplan)
+	{
+		ReleaseCachedPlan(portal->cplan, false);
+		portal->cplan = NULL;
+
+		/*
+		 * We must also clear portal->stmts which is now a dangling
+		 * reference to the cached plan's plan list.  This protects any
+		 * code that might try to examine the Portal later.
+		 */
+		portal->stmts = NIL;
+	}
 }
 
 /*
@@ -356,6 +389,31 @@ PortalCreateHoldStore(Portal portal)
 	MemoryContextSwitchTo(oldcxt);
 }
 
+/*
+ * PinPortal
+ *		Protect a portal from dropping.
+ *
+ * A pinned portal is still unpinned and dropped at transaction or
+ * subtransaction abort.
+ */
+void
+PinPortal(Portal portal)
+{
+	if (portal->portalPinned)
+		elog(ERROR, "portal already pinned");
+
+	portal->portalPinned = true;
+}
+
+void
+UnpinPortal(Portal portal)
+{
+	if (!portal->portalPinned)
+		elog(ERROR, "portal not pinned");
+
+	portal->portalPinned = false;
+}
+
 /*
  * PortalDrop
  *		Destroy the portal.
@@ -365,9 +423,16 @@ PortalDrop(Portal portal, bool isTopCommit)
 {
 	AssertArg(PortalIsValid(portal));
 
-	/* Not sure if this case can validly happen or not... */
-	if (portal->status == PORTAL_ACTIVE)
-		elog(ERROR, "cannot drop active or queued portal");
+	/*
+	 * Don't allow dropping a pinned portal, it's still needed by whoever
+	 * pinned it. Not sure if the PORTAL_ACTIVE case can validly happen or
+	 * not...
+	 */
+	if (portal->portalPinned ||
+		portal->status == PORTAL_ACTIVE)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_STATE),
+				 errmsg("cannot drop active portal \"%s\"", portal->name)));
 
 	TeardownSequenceServer();
 
@@ -385,6 +450,9 @@ PortalDrop(Portal portal, bool isTopCommit)
 	if (portal->cleanup)
 		(*portal->cleanup) (portal);
 
+	/* drop cached plan reference, if any */
+	PortalReleaseCachedPlan(portal);
+
 	/*
 	 * Release any resources still attached to the portal.	There are several
 	 * cases being covered here:
@@ -453,24 +521,25 @@ PortalDrop(Portal portal, bool isTopCommit)
 }
 
 /*
- * DropDependentPortals
- *		Drop any portals using the specified context as queryContext.
+ * Delete all declared cursors.
  *
- * This is normally used to make sure we can safely drop a prepared statement.
+ * Used by commands: CLOSE ALL, DISCARD ALL
  */
 void
-DropDependentPortals(MemoryContext queryContext)
+PortalHashTableDeleteAll(void)
 {
 	HASH_SEQ_STATUS status;
 	PortalHashEnt *hentry;
 
-	hash_seq_init(&status, PortalHashTable);
+	if (PortalHashTable == NULL)
+		return;
 
-	while ((hentry = (PortalHashEnt *) hash_seq_search(&status)) != NULL)
+	hash_seq_init(&status, PortalHashTable);
+	while ((hentry = hash_seq_search(&status)) != NULL)
 	{
 		Portal		portal = hentry->portal;
 
-		if (portal->queryContext == queryContext)
+		if (portal->status != PORTAL_ACTIVE)
 			PortalDrop(portal, false);
 	}
 }
@@ -514,6 +583,9 @@ CommitHoldablePortals(void)
 			PortalCreateHoldStore(portal);
 			PersistHoldablePortal(portal);
 
+			/* drop cached plan reference, if any */
+			PortalReleaseCachedPlan(portal);
+
 			/*
 			 * Any resources belonging to the portal will be released in the
 			 * upcoming transaction-wide cleanup; the portal will no longer
@@ -607,6 +679,13 @@ AtCommit_Portals(void)
 			continue;
 		}
 
+		/*
+		 * There should be no pinned portals anymore. Complain if someone
+		 * leaked one.
+		 */
+		if (portal->portalPinned)
+			elog(ERROR, "cannot commit while a portal is pinned");
+
 		/*
 		 * Do nothing to cursors held over from a previous transaction
 		 * (including holdable ones just frozen by CommitHoldablePortals).
@@ -661,6 +740,9 @@ AtAbort_Portals(void)
 			portal->cleanup = NULL;
 		}
 
+		/* drop cached plan reference, if any */
+		PortalReleaseCachedPlan(portal);
+
 		/*
 		 * Any resources belonging to the portal will be released in the
 		 * upcoming transaction-wide cleanup; they will be gone before we run
@@ -702,7 +784,15 @@ AtCleanup_Portals(void)
 			continue;
 		}
 
-		/* Else zap it. */
+		/*
+		 * If a portal is still pinned, forcibly unpin it. PortalDrop will
+		 * not let us drop the portal otherwise. Whoever pinned the portal
+		 * was interrupted by the abort too and won't try to use it anymore.
+		 */
+		if (portal->portalPinned)
+			portal->portalPinned = false;
+
+		/* Zap it. */
 		PortalDrop(portal, false);
 	}
 }
@@ -800,6 +890,9 @@ AtSubAbort_Portals(SubTransactionId mySubid,
 				portal->cleanup = NULL;
 			}
 
+			/* drop cached plan reference, if any */
+			PortalReleaseCachedPlan(portal);
+
 			/*
 			 * Any resources belonging to the portal will be released in the
 			 * upcoming transaction-wide cleanup; they will be gone before we
@@ -839,6 +932,14 @@ AtSubCleanup_Portals(SubTransactionId mySubid)
 		if (portal->createSubid != mySubid)
 			continue;
 
+		/*
+		 * If a portal is still pinned, forcibly unpin it. PortalDrop will not
+		 * let us drop the portal otherwise. Whoever pinned the portal was
+		 * interrupted by the abort too and won't try to use it anymore.
+		 */
+		if (portal->portalPinned)
+			portal->portalPinned = false;
+
 		/* Zap it. */
 		PortalDrop(portal, false);
 	}
@@ -949,8 +1050,8 @@ pg_cursor(PG_FUNCTION_ARGS)
 	oldcontext = MemoryContextSwitchTo(per_query_ctx);
 
 	/*
-	 * build tupdesc for result tuples. This must match the definition of
-	 * the pg_cursors view in system_views.sql
+	 * build tupdesc for result tuples. This must match the definition of the
+	 * pg_cursors view in system_views.sql
 	 */
 	tupdesc = CreateTemplateTupleDesc(6, false);
 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "name",
@@ -972,6 +1073,9 @@ pg_cursor(PG_FUNCTION_ARGS)
 	 */
 	tupstore = tuplestore_begin_heap(true, false, work_mem);
 
+	/* generate junk in short-term context */
+	MemoryContextSwitchTo(oldcontext);
+
 	hash_seq_init(&hash_seq, PortalHashTable);
 	while ((hentry = hash_seq_search(&hash_seq)) != NULL)
 	{
@@ -984,10 +1088,7 @@ pg_cursor(PG_FUNCTION_ARGS)
 		if (!portal->visible)
 			continue;
 
-		/* generate junk in short-term context */
-		MemoryContextSwitchTo(oldcontext);
-
-		MemSet(nulls, 0, sizeof(nulls));
+		MemSet(nulls, false, sizeof(nulls));
 
 		values[0] = DirectFunctionCall1(textin, CStringGetDatum((char *) portal->name));
 		if (!portal->sourceText)
@@ -1002,16 +1103,12 @@ pg_cursor(PG_FUNCTION_ARGS)
 
 		tuple = heap_form_tuple(tupdesc, values, nulls);
 
-		/* switch to appropriate context while storing the tuple */
-		MemoryContextSwitchTo(per_query_ctx);
 		tuplestore_puttuple(tupstore, tuple);
 	}
 
 	/* clean up and return the tuplestore */
 	tuplestore_donestoring(tupstore);
 
-	MemoryContextSwitchTo(oldcontext);
-
 	rsinfo->returnMode = SFRM_Materialize;
 	rsinfo->setResult = tupstore;
 	rsinfo->setDesc = tupdesc;
diff --git a/src/backend/utils/probes.d b/src/backend/utils/probes.d
index 7cf10d1d8cfe..aaab801e2948 100755
--- a/src/backend/utils/probes.d
+++ b/src/backend/utils/probes.d
@@ -1,9 +1,9 @@
 /* ----------
  *	DTrace probes for PostgreSQL backend
  *
- *	Copyright (c) 2006, PostgreSQL Global Development Group
+ *	Copyright (c) 2006-2008, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.1 2006/07/24 16:32:45 petere Exp $
+ *	$PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.2 2008/01/02 02:42:06 momjian Exp $
  * ----------
  */
 
diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c
index 6cef7f00c785..8868bb0d9838 100644
--- a/src/backend/utils/resowner/resowner.c
+++ b/src/backend/utils/resowner/resowner.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.23 2007/01/05 22:19:47 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.27.2.1 2009/12/03 11:03:44 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,10 +59,20 @@ typedef struct ResourceOwnerData
 	Relation   *relrefs;		/* dynamically allocated array */
 	int			maxrelrefs;		/* currently allocated array size */
 
+	/* We have built-in support for remembering plancache references */
+	int			nplanrefs;		/* number of owned plancache pins */
+	CachedPlan **planrefs;		/* dynamically allocated array */
+	int			maxplanrefs;	/* currently allocated array size */
+
 	/* We have built-in support for remembering tupdesc references */
 	int			ntupdescs;		/* number of owned tupdesc references */
 	TupleDesc  *tupdescs;		/* dynamically allocated array */
 	int			maxtupdescs;	/* currently allocated array size */
+
+	/* We have built-in support for remembering open temporary files */
+	int			nfiles;			/* number of owned temporary files */
+	File	   *files;			/* dynamically allocated array */
+	int			maxfiles;		/* currently allocated array size */
 } ResourceOwnerData;
 
 
@@ -93,7 +103,9 @@ static void ResourceOwnerReleaseInternal(ResourceOwner owner,
 							 bool isCommit,
 							 bool isTopLevel);
 static void PrintRelCacheLeakWarning(Relation rel);
+static void PrintPlanCacheLeakWarning(CachedPlan *plan);
 static void PrintTupleDescLeakWarning(TupleDesc tupdesc);
+static void PrintFileLeakWarning(File file);
 
 
 /*****************************************************************************
@@ -299,6 +311,13 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
                                              owner->name);
 			ReleaseCatCacheList(owner->catlistrefs[owner->ncatlistrefs - 1]);
 		}
+		/* Ditto for plancache references */
+		while (owner->nplanrefs > 0)
+		{
+			if (isCommit)
+				PrintPlanCacheLeakWarning(owner->planrefs[owner->nplanrefs - 1]);
+			ReleaseCachedPlan(owner->planrefs[owner->nplanrefs - 1], true);
+		}
 		/* Ditto for tupdesc references */
 		while (owner->ntupdescs > 0)
 		{
@@ -307,6 +326,14 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
 			DecrTupleDescRefCount(owner->tupdescs[owner->ntupdescs - 1]);
 		}
 
+		/* Ditto for temporary files */
+		while (owner->nfiles > 0)
+		{
+			if (isCommit)
+				PrintFileLeakWarning(owner->files[owner->nfiles - 1]);
+			FileClose(owner->files[owner->nfiles - 1]);
+		}
+
 		/* Clean up index scans too */
 		ReleaseResources_hash();
 	}
@@ -335,7 +362,9 @@ ResourceOwnerDelete(ResourceOwner owner)
 	Assert(owner->ncatrefs == 0);
 	Assert(owner->ncatlistrefs == 0);
 	Assert(owner->nrelrefs == 0);
+	Assert(owner->nplanrefs == 0);
 	Assert(owner->ntupdescs == 0);
+	Assert(owner->nfiles == 0);
 
 	/*
 	 * Delete children.  The recursive call will delink the child from me, so
@@ -360,8 +389,12 @@ ResourceOwnerDelete(ResourceOwner owner)
 		pfree(owner->catlistrefs);
 	if (owner->relrefs)
 		pfree(owner->relrefs);
+	if (owner->planrefs)
+		pfree(owner->planrefs);
 	if (owner->tupdescs)
 		pfree(owner->tupdescs);
+	if (owner->files)
+		pfree(owner->files);
 
 	pfree(owner);
 }
@@ -777,6 +810,86 @@ PrintRelCacheLeakWarning(Relation rel)
 		 RelationGetRelationName(rel));
 }
 
+/*
+ * Make sure there is room for at least one more entry in a ResourceOwner's
+ * plancache reference array.
+ *
+ * This is separate from actually inserting an entry because if we run out
+ * of memory, it's critical to do so *before* acquiring the resource.
+ */
+void
+ResourceOwnerEnlargePlanCacheRefs(ResourceOwner owner)
+{
+	int			newmax;
+
+	if (owner->nplanrefs < owner->maxplanrefs)
+		return;					/* nothing to do */
+
+	if (owner->planrefs == NULL)
+	{
+		newmax = 16;
+		owner->planrefs = (CachedPlan **)
+			MemoryContextAlloc(TopMemoryContext, newmax * sizeof(CachedPlan *));
+		owner->maxplanrefs = newmax;
+	}
+	else
+	{
+		newmax = owner->maxplanrefs * 2;
+		owner->planrefs = (CachedPlan **)
+			repalloc(owner->planrefs, newmax * sizeof(CachedPlan *));
+		owner->maxplanrefs = newmax;
+	}
+}
+
+/*
+ * Remember that a plancache reference is owned by a ResourceOwner
+ *
+ * Caller must have previously done ResourceOwnerEnlargePlanCacheRefs()
+ */
+void
+ResourceOwnerRememberPlanCacheRef(ResourceOwner owner, CachedPlan *plan)
+{
+	Assert(owner->nplanrefs < owner->maxplanrefs);
+	owner->planrefs[owner->nplanrefs] = plan;
+	owner->nplanrefs++;
+}
+
+/*
+ * Forget that a plancache reference is owned by a ResourceOwner
+ */
+void
+ResourceOwnerForgetPlanCacheRef(ResourceOwner owner, CachedPlan *plan)
+{
+	CachedPlan **planrefs = owner->planrefs;
+	int			np1 = owner->nplanrefs - 1;
+	int			i;
+
+	for (i = np1; i >= 0; i--)
+	{
+		if (planrefs[i] == plan)
+		{
+			while (i < np1)
+			{
+				planrefs[i] = planrefs[i + 1];
+				i++;
+			}
+			owner->nplanrefs = np1;
+			return;
+		}
+	}
+	elog(ERROR, "plancache reference %p is not owned by resource owner %s",
+		 plan, owner->name);
+}
+
+/*
+ * Debugging subroutine
+ */
+static void
+PrintPlanCacheLeakWarning(CachedPlan *plan)
+{
+	elog(WARNING, "plancache reference leak: plan %p not closed", plan);
+}
+
 /*
  * Make sure there is room for at least one more entry in a ResourceOwner's
  * tupdesc reference array.
@@ -858,3 +971,87 @@ PrintTupleDescLeakWarning(TupleDesc tupdesc)
 		 "TupleDesc reference leak: TupleDesc %p (%u,%d) still referenced",
 		 tupdesc, tupdesc->tdtypeid, tupdesc->tdtypmod);
 }
+
+
+/*
+ * Make sure there is room for at least one more entry in a ResourceOwner's
+ * files reference array.
+ *
+ * This is separate from actually inserting an entry because if we run out
+ * of memory, it's critical to do so *before* acquiring the resource.
+ */
+void
+ResourceOwnerEnlargeFiles(ResourceOwner owner)
+{
+	int			newmax;
+
+	if (owner->nfiles < owner->maxfiles)
+		return;					/* nothing to do */
+
+	if (owner->files == NULL)
+	{
+		newmax = 16;
+		owner->files = (File *)
+			MemoryContextAlloc(TopMemoryContext, newmax * sizeof(File));
+		owner->maxfiles = newmax;
+	}
+	else
+	{
+		newmax = owner->maxfiles * 2;
+		owner->files = (File *)
+			repalloc(owner->files, newmax * sizeof(File));
+		owner->maxfiles = newmax;
+	}
+}
+
+/*
+ * Remember that a temporary file is owned by a ResourceOwner
+ *
+ * Caller must have previously done ResourceOwnerEnlargeFiles()
+ */
+void
+ResourceOwnerRememberFile(ResourceOwner owner, File file)
+{
+	Assert(owner->nfiles < owner->maxfiles);
+	owner->files[owner->nfiles] = file;
+	owner->nfiles++;
+}
+
+/*
+ * Forget that a temporary file is owned by a ResourceOwner
+ */
+void
+ResourceOwnerForgetFile(ResourceOwner owner, File file)
+{
+	File	   *files = owner->files;
+	int			ns1 = owner->nfiles - 1;
+	int			i;
+
+	for (i = ns1; i >= 0; i--)
+	{
+		if (files[i] == file)
+		{
+			while (i < ns1)
+			{
+				files[i] = files[i + 1];
+				i++;
+			}
+			owner->nfiles = ns1;
+			return;
+		}
+	}
+	elog(ERROR, "temporery file %d is not owned by resource owner %s",
+		 file, owner->name);
+}
+
+
+/*
+ * Debugging subroutine
+ */
+static void
+PrintFileLeakWarning(File file)
+{
+	elog(WARNING,
+		 "temporary file leak: File %d still referenced",
+		 file);
+}
diff --git a/src/backend/utils/resscheduler/memquota.c b/src/backend/utils/resscheduler/memquota.c
index 24c62db57c12..7b0fa602672b 100644
--- a/src/backend/utils/resscheduler/memquota.c
+++ b/src/backend/utils/resscheduler/memquota.c
@@ -971,7 +971,11 @@ PolicyEagerFreeAssignWalker(Node *node, PolicyEagerFreeContext *context)
 			 */
 			uint64 memKB = ComputeAvgMemKBForMemIntenseOp(context->groupNode);
 
-			Assert(planNode->operatorMemKB == 0);
+			/* GPDB_83_MERGE_FIXME: disabled this assertion. Installcheck-good tripped it.
+			 * I'm not sure why, but nothing too bad happens if we set the memory twice, so
+			 * let's investigate later..
+			 */
+			//Assert(planNode->operatorMemKB == 0);
 
 			planNode->operatorMemKB = memKB;
 
diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c
index 1971220a0794..cd18a6d086df 100644
--- a/src/backend/utils/sort/logtape.c
+++ b/src/backend/utils/sort/logtape.c
@@ -31,6 +31,53 @@
  * the illusion of N independent tape devices to tuplesort.c.  Note that
  * logtape.c itself depends on buffile.c to provide a "logical file" of
  * larger size than the underlying OS may support.
+ *
+ * For simplicity, we allocate and release space in the underlying file
+ * in BLCKSZ-size blocks.  Space allocation boils down to keeping track
+ * of which blocks in the underlying file belong to which logical tape,
+ * plus any blocks that are free (recycled and not yet reused).
+ * The blocks in each logical tape are remembered using a method borrowed
+ * from the Unix HFS filesystem: we store data block numbers in an
+ * "indirect block".  If an indirect block fills up, we write it out to
+ * the underlying file and remember its location in a second-level indirect
+ * block.  In the same way second-level blocks are remembered in third-
+ * level blocks, and so on if necessary (of course we're talking huge
+ * amounts of data here).  The topmost indirect block of a given logical
+ * tape is never actually written out to the physical file, but all lower-
+ * level indirect blocks will be.
+ *
+ * The initial write pass is guaranteed to fill the underlying file
+ * perfectly sequentially, no matter how data is divided into logical tapes.
+ * Once we begin merge passes, the access pattern becomes considerably
+ * less predictable --- but the seeking involved should be comparable to
+ * what would happen if we kept each logical tape in a separate file,
+ * so there's no serious performance penalty paid to obtain the space
+ * savings of recycling.  We try to localize the write accesses by always
+ * writing to the lowest-numbered free block when we have a choice; it's
+ * not clear this helps much, but it can't hurt.  (XXX perhaps a LIFO
+ * policy for free blocks would be better?)
+ *
+ * To support the above policy of writing to the lowest free block,
+ * ltsGetFreeBlock sorts the list of free block numbers into decreasing
+ * order each time it is asked for a block and the list isn't currently
+ * sorted.	This is an efficient way to handle it because we expect cycles
+ * of releasing many blocks followed by re-using many blocks, due to
+ * tuplesort.c's "preread" behavior.
+ *
+ * Since all the bookkeeping and buffer memory is allocated with palloc(),
+ * and the underlying file(s) are made with OpenTemporaryFile, all resources
+ * for a logical tape set are certain to be cleaned up even if processing
+ * is aborted by ereport(ERROR).  To avoid confusion, the caller should take
+ * care that all calls for a single LogicalTapeSet are made in the same
+ * palloc context.
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/backend/utils/sort/logtape.c,v 1.26 2008/01/01 19:45:55 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index e75378d6bbad..57b349ccb56d 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -88,7 +88,7 @@
  *
  *
  * Portions Copyright (c) 2007-2008, Greenplum inc
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -104,6 +104,7 @@
 #include "catalog/catquery.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_operator.h"
+#include "commands/tablespace.h"
 #include "executor/execWorkfile.h"
 #include "executor/instrument.h"        /* Instrumentation */
 #include "executor/nodeSort.h"  		/* Gpmon */ 
@@ -119,9 +120,16 @@
 
 #include "cdb/cdbvars.h"
 
+
 #include "utils/dynahash.h" /* my_log2 */
 
-/* GUC variable */
+/* GUC variables */
+#ifdef TRACE_SORT
+bool		trace_sort = false;
+#endif
+#ifdef DEBUG_BOUNDED_SORT
+bool		optimize_bounded_sort = true;
+#endif
 
 /*
  * The objects we actually sort are SortTuple structs.	These contain
@@ -164,6 +172,7 @@ typedef struct
 typedef enum
 {
 	TSS_INITIAL,				/* Loading tuples; still within memory limit */
+	TSS_BOUNDED,				/* Loading tuples into bounded-size heap */
 	TSS_BUILDRUNS,				/* Loading tuples; writing to tape */
 	TSS_SORTEDINMEM,			/* Sort completed entirely in memory */
 	TSS_SORTEDONTAPE,			/* Sort completed, final run is on tape */
@@ -217,6 +226,10 @@ struct Tuplesortstate
 	TupSortStatus status;		/* enumerated value as shown above */
 	int			nKeys;			/* number of columns in sort key */
 	bool		randomAccess;	/* did caller request random access? */
+	bool		bounded;		/* did caller specify a maximum number of
+								 * tuples to return? */
+	bool		boundUsed;		/* true if we made use of a bounded heap */
+	int			bound;			/* if bounded, the maximum number of tuples */
 	long		availMem;		/* remaining memory available, in bytes */
 	long        availMemMin;    /* CDB: availMem low water mark (bytes) */
 	long        availMemMin01;  /* MPP-1559: initial low water mark */
@@ -265,6 +278,13 @@ struct Tuplesortstate
 	void		(*readtup) (Tuplesortstate *state, TuplesortPos *pos, SortTuple *stup,
 			LogicalTape *lt, uint32 len);
 
+	/*
+	 * Function to reverse the sort direction from its current state. (We
+	 * could dispense with this if we wanted to enforce that all variants
+	 * represent the sort key information alike.)
+	 */
+	void		(*reversedirection) (Tuplesortstate *state);
+
 	/*
 	 * This array holds the tuples now in sort memory.	If we are in state
 	 * INITIAL, the tuples are in no particular order; if we are in state
@@ -403,6 +423,7 @@ static bool is_sortstate_rwfile(Tuplesortstate *state)
 #define COPYTUP(state,stup,tup) ((*(state)->copytup) (state, stup, tup))
 #define WRITETUP(state,tape,stup)	((*(state)->writetup) (state, tape, stup))
 #define READTUP(state,pos,stup,tape,len) ((*(state)->readtup) (state, pos, stup, tape, len))
+#define REVERSEDIRECTION(state) ((*(state)->reversedirection) (state))
 #define LACKMEM(state)		((state)->availMem < 0)
 
 static inline void USEMEM(Tuplesortstate *state, int amt)
@@ -475,6 +496,8 @@ static void mergeprereadone(Tuplesortstate *state, int srcTape);
 static void dumptuples(Tuplesortstate *state, bool alltuples);
 static void tuplesort_sorted_insert(Tuplesortstate *state, SortTuple *tuple,
 					  int tupleindex, bool checkIndex);
+static void make_bounded_heap(Tuplesortstate *state);
+static void sort_bounded_heap(Tuplesortstate *state);
 static void tuplesort_heap_insert(Tuplesortstate *state, SortTuple *tuple,
 					  int tupleindex, bool checkIndex);
 static void tuplesort_heap_siftup(Tuplesortstate *state, bool checkIndex);
@@ -486,18 +509,22 @@ static void copytup_heap(Tuplesortstate *state, SortTuple *stup, void *tup);
 static void writetup_heap(Tuplesortstate *state, LogicalTape *lt, SortTuple *stup);
 static void readtup_heap(Tuplesortstate *state, TuplesortPos *pos, SortTuple *stup,
 			 LogicalTape *lt, unsigned int len);
+static void reversedirection_heap(Tuplesortstate *state);
 static int comparetup_index(const SortTuple *a, const SortTuple *b,
 				 Tuplesortstate *state);
 static void copytup_index(Tuplesortstate *state, SortTuple *stup, void *tup);
 static void writetup_index(Tuplesortstate *state, LogicalTape *lt, SortTuple *stup);
 static void readtup_index(Tuplesortstate *state, TuplesortPos *pos, SortTuple *stup,
 			  LogicalTape *lt, unsigned int len);
+static void reversedirection_index(Tuplesortstate *state);
 static int comparetup_datum(const SortTuple *a, const SortTuple *b,
 				 Tuplesortstate *state);
 static void copytup_datum(Tuplesortstate *state, SortTuple *stup, void *tup);
 static void writetup_datum(Tuplesortstate *state, LogicalTape *lt, SortTuple *stup);
 static void readtup_datum(Tuplesortstate *state, TuplesortPos *pos, SortTuple *stup,
 			  LogicalTape *lt, unsigned int len);
+static void reversedirection_datum(Tuplesortstate *state);
+static void free_sort_tuple(Tuplesortstate *state, SortTuple *stup);
 
 
 /*
@@ -552,6 +579,8 @@ tuplesort_begin_common(int workMem, bool randomAccess, bool allocmemtuple)
 
 	state->status = TSS_INITIAL;
 	state->randomAccess = randomAccess;
+	state->bounded = false;
+	state->boundUsed = false;
 	state->allowedMem = workMem * 1024L;
 	state->availMemMin = state->availMem = state->allowedMem;
 	state->availMemMin01 = state->availMemMin;
@@ -674,6 +703,7 @@ tuplesort_begin_heap(TupleDesc tupDesc,
 	state->copytup = copytup_heap;
 	state->writetup = writetup_heap;
 	state->readtup = readtup_heap;
+	state->reversedirection = reversedirection_heap;
 
 	state->tupDesc = tupDesc;	/* assume we need not copy tupDesc */
 	state->mt_bind = create_memtuple_binding(tupDesc);
@@ -682,8 +712,8 @@ tuplesort_begin_heap(TupleDesc tupDesc,
 
 	for (i = 0; i < nkeys; i++)
 	{
-		Oid		sortFunction;
-		bool	reverse;
+		Oid			sortFunction;
+		bool		reverse;
 
 		AssertArg(attNums[i] != 0);
 		AssertArg(sortOperators[i] != 0);
@@ -819,6 +849,7 @@ tuplesort_begin_index(Relation indexRel,
 	state->copytup = copytup_index;
 	state->writetup = writetup_index;
 	state->readtup = readtup_index;
+	state->reversedirection = reversedirection_index;
 
 	state->indexRel = indexRel;
 	/* see comments below about btree dependence of this code... */
@@ -855,6 +886,7 @@ tuplesort_begin_datum(Oid datumType,
 	state->copytup = copytup_datum;
 	state->writetup = writetup_datum;
 	state->readtup = readtup_datum;
+	state->reversedirection = reversedirection_datum;
 
 	state->datumType = datumType;
 
@@ -880,6 +912,40 @@ tuplesort_begin_datum(Oid datumType,
 	return state;
 }
 
+/*
+ * tuplesort_set_bound
+ *
+ *	Advise tuplesort that at most the first N result tuples are required.
+ *
+ * Must be called before inserting any tuples.	(Actually, we could allow it
+ * as long as the sort hasn't spilled to disk, but there seems no need for
+ * delayed calls at the moment.)
+ *
+ * This is a hint only. The tuplesort may still return more tuples than
+ * requested.
+ */
+void
+tuplesort_set_bound(Tuplesortstate *state, int64 bound)
+{
+	/* Assert we're called before loading any tuples */
+	Assert(state->status == TSS_INITIAL);
+	Assert(state->memtupcount == 0);
+	Assert(!state->bounded);
+
+#ifdef DEBUG_BOUNDED_SORT
+	/* Honor GUC setting that disables the feature (for easy testing) */
+	if (!optimize_bounded_sort)
+		return;
+#endif
+
+	/* We want to be able to compute bound * 2, so limit the setting */
+	if (bound > (int64) (INT_MAX / 2))
+		return;
+
+	state->bounded = true;
+	state->bound = (int) bound;
+}
+
 /*
  * tuplesort_end
  *
@@ -1179,6 +1245,32 @@ puttuple_common(Tuplesortstate *state, SortTuple *tuple)
                 }
 			}
 
+			/*
+			 * Check if it's time to switch over to a bounded heapsort. We do
+			 * so if the input tuple count exceeds twice the desired tuple
+			 * count (this is a heuristic for where heapsort becomes cheaper
+			 * than a quicksort), or if we've just filled workMem and have
+			 * enough tuples to meet the bound.
+			 *
+			 * Note that once we enter TSS_BOUNDED state we will always try to
+			 * complete the sort that way.	In the worst case, if later input
+			 * tuples are larger than earlier ones, this might cause us to
+			 * exceed workMem significantly.
+			 */
+			if (state->bounded &&
+				(state->memtupcount > state->bound * 2 ||
+				 (state->memtupcount > state->bound && LACKMEM(state))))
+			{
+#ifdef TRACE_SORT
+				if (trace_sort)
+					elog(LOG, "switching to bounded heapsort at %ld tuples: %s",
+						 state->memtupcount,
+						 pg_rusage_show(&state->ru_start));
+#endif
+				make_bounded_heap(state);
+				return;
+			}
+
 			/*
 			 * Done if we still fit in available memory and have array slots.
 			 */
@@ -1197,6 +1289,31 @@ puttuple_common(Tuplesortstate *state, SortTuple *tuple)
 			 */
 			dumptuples(state, false);
 			break;
+
+		case TSS_BOUNDED:
+
+			/*
+			 * We don't want to grow the array here, so check whether the new
+			 * tuple can be discarded before putting it in.  This should be a
+			 * good speed optimization, too, since when there are many more
+			 * input tuples than the bound, most input tuples can be discarded
+			 * with just this one comparison.  Note that because we currently
+			 * have the sort direction reversed, we must check for <= not >=.
+			 */
+			if (COMPARETUP(state, tuple, &state->memtuples[0]) <= 0)
+			{
+				/* new tuple <= top of the heap, so we can discard it */
+				free_sort_tuple(state, tuple);
+			}
+			else
+			{
+				/* discard top of heap, sift up, insert new tuple */
+				free_sort_tuple(state, &state->memtuples[0]);
+				tuplesort_heap_siftup(state, false);
+				tuplesort_heap_insert(state, tuple, 0, false);
+			}
+			break;
+
 		case TSS_BUILDRUNS:
 
 			/*
@@ -1223,6 +1340,7 @@ puttuple_common(Tuplesortstate *state, SortTuple *tuple)
 			 */
 			dumptuples(state, false);
 			break;
+
 		default:
 			elog(ERROR, "invalid tuplesort state");
 			break;
@@ -1243,6 +1361,22 @@ tuplesort_performsort(Tuplesortstate *state)
 
 	switch (state->status)
 	{
+		case TSS_BOUNDED:
+
+			/*
+			 * We were able to accumulate all the tuples required for output
+			 * in memory, using a heap to eliminate excess tuples.	Now we
+			 * have to transform the heap to a properly-sorted array.
+			 */
+			sort_bounded_heap(state);
+			state->pos.current = 0;
+			state->pos.eof_reached = false;
+			state->pos.markpos.tapepos.blkNum = 0L; 
+			state->pos.markpos.tapepos.offset = 0;
+			state->pos.markpos_eof = false;
+			state->status = TSS_SORTEDINMEM;
+			break;
+
 		case TSS_INITIAL:
 			if(!is_sortstate_rwfile(state))
 			{
@@ -1269,6 +1403,7 @@ tuplesort_performsort(Tuplesortstate *state)
 				inittapes(state, state->pfile_rwfile_prefix);
 				/* fall through */
 			}
+
 		case TSS_BUILDRUNS:
 
 			/*
@@ -1302,6 +1437,7 @@ tuplesort_performsort(Tuplesortstate *state)
 			state->pos.markpos.tapepos.offset = 0;
 			state->pos.markpos_eof = false;
 			break;
+
 		default:
 			elog(ERROR, "invalid tuplesort state");
 			break;
@@ -1359,6 +1495,15 @@ tuplesort_gettuple_common_pos(Tuplesortstate *state, TuplesortPos *pos,
 					return true;
 				}
 				pos->eof_reached = true;
+
+				/*
+				 * Complain if caller tries to retrieve more tuples than
+				 * originally asked for in a bounded sort.	This is because
+				 * returning EOF here might be the wrong thing.
+				 */
+				if (state->bounded && state->pos.current >= state->bound)
+					elog(ERROR, "retrieved too many tuples in a bounded sort");
+
 				return false;
 			}
 			else
@@ -1667,6 +1812,12 @@ inittapes(Tuplesortstate *state, const char* rwfile_prefix)
 	if (tapeSpace + GetMemoryChunkSpace(state->memtuples) < state->allowedMem)
 		USEMEM(state, tapeSpace);
 
+	/*
+	 * Make sure that the temp file(s) underlying the tape set are created in
+	 * suitable temp tablespaces.
+	 */
+	PrepareTempTablespaces();
+
 	/*
 	 * Create the tape set and allocate the per-tape data arrays.
 	 */
@@ -2407,6 +2558,64 @@ tuplesort_restorepos(Tuplesortstate *state)
 	tuplesort_restorepos_pos(state, &state->pos);
 }
 
+/*
+ * tuplesort_explain - produce a line of information for EXPLAIN ANALYZE
+ *
+ * This can be called after tuplesort_performsort() finishes to obtain
+ * printable summary information about how the sort was performed.
+ *
+ * The result is a palloc'd string.
+ */
+char *
+tuplesort_explain(Tuplesortstate *state)
+{
+	char	   *result = (char *) palloc(100);
+	long		spaceUsed;
+
+	/*
+	 * Note: it might seem we should print both memory and disk usage for a
+	 * disk-based sort.  However, the current code doesn't track memory space
+	 * accurately once we have begun to return tuples to the caller (since we
+	 * don't account for pfree's the caller is expected to do), so we cannot
+	 * rely on availMem in a disk sort.  This does not seem worth the overhead
+	 * to fix.	Is it worth creating an API for the memory context code to
+	 * tell us how much is actually used in sortcontext?
+	 */
+	if (state->tapeset)
+		spaceUsed = LogicalTapeSetBlocks(state->tapeset) * (BLCKSZ / 1024);
+	else
+		spaceUsed = (state->allowedMem - state->availMem + 1023) / 1024;
+
+	switch (state->status)
+	{
+		case TSS_SORTEDINMEM:
+			if (state->boundUsed)
+				snprintf(result, 100,
+						 "Sort Method:  top-N heapsort  Memory: %ldkB",
+						 spaceUsed);
+			else
+				snprintf(result, 100,
+						 "Sort Method:  quicksort  Memory: %ldkB",
+						 spaceUsed);
+			break;
+		case TSS_SORTEDONTAPE:
+			snprintf(result, 100,
+					 "Sort Method:  external sort  Disk: %ldkB",
+					 spaceUsed);
+			break;
+		case TSS_FINALMERGE:
+			snprintf(result, 100,
+					 "Sort Method:  external merge  Disk: %ldkB",
+					 spaceUsed);
+			break;
+		default:
+			snprintf(result, 100, "sort still in progress");
+			break;
+	}
+
+	return result;
+}
+
 
 /*
  * Heap manipulation routines, per Knuth's Algorithm 5.2.3H.
@@ -2420,6 +2629,99 @@ tuplesort_restorepos(Tuplesortstate *state)
 	 ((tup1)->tupindex) - ((tup2)->tupindex) : \
 	 COMPARETUP(state, tup1, tup2))
 
+/*
+ * Convert the existing unordered array of SortTuples to a bounded heap,
+ * discarding all but the smallest "state->bound" tuples.
+ *
+ * When working with a bounded heap, we want to keep the largest entry
+ * at the root (array entry zero), instead of the smallest as in the normal
+ * sort case.  This allows us to discard the largest entry cheaply.
+ * Therefore, we temporarily reverse the sort direction.
+ *
+ * We assume that all entries in a bounded heap will always have tupindex
+ * zero; it therefore doesn't matter that HEAPCOMPARE() doesn't reverse
+ * the direction of comparison for tupindexes.
+ */
+static void
+make_bounded_heap(Tuplesortstate *state)
+{
+	int			tupcount = state->memtupcount;
+	int			i;
+
+	Assert(state->status == TSS_INITIAL);
+	Assert(state->bounded);
+	Assert(tupcount >= state->bound);
+
+	/* Reverse sort direction so largest entry will be at root */
+	REVERSEDIRECTION(state);
+
+	state->memtupcount = 0;		/* make the heap empty */
+	for (i = 0; i < tupcount; i++)
+	{
+		if (state->memtupcount >= state->bound &&
+		  COMPARETUP(state, &state->memtuples[i], &state->memtuples[0]) <= 0)
+		{
+			/* New tuple would just get thrown out, so skip it */
+			free_sort_tuple(state, &state->memtuples[i]);
+		}
+		else
+		{
+			/* Insert next tuple into heap */
+			/* Must copy source tuple to avoid possible overwrite */
+			SortTuple	stup = state->memtuples[i];
+
+			tuplesort_heap_insert(state, &stup, 0, false);
+
+			/* If heap too full, discard largest entry */
+			if (state->memtupcount > state->bound)
+			{
+				free_sort_tuple(state, &state->memtuples[0]);
+				tuplesort_heap_siftup(state, false);
+			}
+		}
+	}
+
+	Assert(state->memtupcount == state->bound);
+	state->status = TSS_BOUNDED;
+}
+
+/*
+ * Convert the bounded heap to a properly-sorted array
+ */
+static void
+sort_bounded_heap(Tuplesortstate *state)
+{
+	int			tupcount = state->memtupcount;
+
+	Assert(state->status == TSS_BOUNDED);
+	Assert(state->bounded);
+	Assert(tupcount == state->bound);
+
+	/*
+	 * We can unheapify in place because each sift-up will remove the largest
+	 * entry, which we can promptly store in the newly freed slot at the end.
+	 * Once we're down to a single-entry heap, we're done.
+	 */
+	while (state->memtupcount > 1)
+	{
+		SortTuple	stup = state->memtuples[0];
+
+		/* this sifts-up the next-largest entry and decreases memtupcount */
+		tuplesort_heap_siftup(state, false);
+		state->memtuples[state->memtupcount] = stup;
+	}
+	state->memtupcount = tupcount;
+
+	/*
+	 * Reverse sort direction back to the original state.  This is not
+	 * actually necessary but seems like a good idea for tidiness.
+	 */
+	REVERSEDIRECTION(state);
+
+	state->status = TSS_SORTEDINMEM;
+	state->boundUsed = true;
+}
+
 /*
  * Insert a new tuple into an empty or existing heap, maintaining the
  * heap invariant.	Caller is responsible for ensuring there's room.
@@ -2724,7 +3026,7 @@ markrunend(Tuplesortstate *state, int tapenum)
 
 
 /*
- * Set up for an external caller of ApplySortFunction.  This function
+ * Set up for an external caller of ApplySortFunction.	This function
  * basically just exists to localize knowledge of the encoding of sk_flags
  * used in this module.
  */
@@ -2734,7 +3036,7 @@ SelectSortFunction(Oid sortOperator,
 				   Oid *sortFunction,
 				   int *sortFlags)
 {
-	bool	reverse;
+	bool		reverse;
 
 	if (!get_compare_function_for_ordering_op(sortOperator,
 											  sortFunction, &reverse))
@@ -2955,6 +3257,19 @@ readtup_heap(Tuplesortstate *state, TuplesortPos *pos, SortTuple *stup, LogicalT
 		stup->datum1 = memtuple_getattr(stup->tuple, state->mt_bind, state->scanKeys[0].sk_attno, &stup->isnull1);
 }
 
+static void
+reversedirection_heap(Tuplesortstate *state)
+{
+	ScanKey		scanKey = state->scanKeys;
+	int			nkey;
+
+	for (nkey = 0; nkey < state->nKeys; nkey++, scanKey++)
+	{
+		scanKey->sk_flags ^= (SK_BT_DESC | SK_BT_NULLS_FIRST);
+	}
+}
+
+
 /*
  * Routines specialized for IndexTuple case
  *
@@ -3146,6 +3461,18 @@ readtup_index(Tuplesortstate *state, TuplesortPos *pos, SortTuple *stup,
 								 &stup->isnull1);
 }
 
+static void
+reversedirection_index(Tuplesortstate *state)
+{
+	ScanKey		scanKey = state->indexScanKey;
+	int			nkey;
+
+	for (nkey = 0; nkey < state->nKeys; nkey++, scanKey++)
+	{
+		scanKey->sk_flags ^= (SK_BT_DESC | SK_BT_NULLS_FIRST);
+	}
+}
+
 
 /*
  * Routines specialized for DatumTuple case
@@ -3271,3 +3598,19 @@ void tuplesort_checksend_gpmonpkt(gpmon_packet_t *pkt, int *tick)
 		*tick = gpmon_tick;
 	}
 }
+
+static void
+reversedirection_datum(Tuplesortstate *state)
+{
+	state->sortFnFlags ^= (SK_BT_DESC | SK_BT_NULLS_FIRST);
+}
+
+/*
+ * Convenience routine to free a tuple previously loaded into sort memory
+ */
+static void
+free_sort_tuple(Tuplesortstate *state, SortTuple *stup)
+{
+	FREEMEM(state, GetMemoryChunkSpace(stup->tuple));
+	pfree(stup->tuple);
+}
diff --git a/src/backend/utils/sort/tuplesort_mk.c b/src/backend/utils/sort/tuplesort_mk.c
index 3db59c5440df..d2ce601e0304 100644
--- a/src/backend/utils/sort/tuplesort_mk.c
+++ b/src/backend/utils/sort/tuplesort_mk.c
@@ -1,3 +1,7 @@
+/*
+ * GPDB_83MERGE_FIXME: PostgreSQL 8.3 added "bounded" sort support to
+ * tuplesort.c. It has not been ported to tuplesort_mk.c yet
+ */
 /*-------------------------------------------------------------------------
  *
  * tuplesort.c
@@ -907,6 +911,7 @@ tuplesort_begin_index_mk(Relation indexRel,
             tupdesc, 0, 0);
    
     state->mkctxt.enforceUnique = enforceUnique;
+	state->mkctxt.indexname = RelationGetRelationName(indexRel);
     state->mkctxt.indexRel = indexRel;
     MemoryContextSwitchTo(oldcontext);
 
@@ -958,6 +963,35 @@ tuplesort_begin_datum_mk(ScanState * ss,
     return state;
 }
 
+/*
+ * tuplesort_set_bound
+ *
+ *	Advise tuplesort that at most the first N result tuples are required.
+ *
+ * Must be called before inserting any tuples.	(Actually, we could allow it
+ * as long as the sort hasn't spilled to disk, but there seems no need for
+ * delayed calls at the moment.)
+ *
+ * This is a hint only. The tuplesort may still return more tuples than
+ * requested.
+ */
+void
+tuplesort_set_bound_mk(Tuplesortstate_mk *state, int64 bound)
+{
+	/*
+	 * GPDB_83_MERGE_FIXME: bounded sort not implemented for tuplesort_mk.
+	 * The top-N feature was added to tuplesort.c in PostgreSQL 8.3, but it
+	 * hasn't been ported over to tuplesort_mk.c yet. Or perhaps we should just
+	 * pick the valuable parts of tuplesort_mk.c into tuplesort.c, and get
+	 * rid of the separate tuplesort_mk.c?
+	 *
+	 * Until we do something about this, everything's still going to work,
+	 * but the top-N optimization won't apply when tuplesort_mk is used.
+	 * Note that the planner doesn't know about that, so cost estimates
+	 * involving sorting with tuplesort_mk and LIMIT might be way off.
+	 */
+}
+
 /*
  * tuplesort_end
  *
@@ -2547,6 +2581,60 @@ tuplesort_restorepos_mk(Tuplesortstate_mk *state)
     tuplesort_restorepos_pos_mk(state, &state->pos);
 }
 
+
+/*
+ * tuplesort_explain - produce a line of information for EXPLAIN ANALYZE
+ *
+ * This can be called after tuplesort_performsort() finishes to obtain
+ * printable summary information about how the sort was performed.
+ *
+ * The result is a palloc'd string.
+ */
+char *
+tuplesort_explain_mk(Tuplesortstate_mk *state)
+{
+	char	   *result = (char *) palloc(100);
+	long		spaceUsed;
+
+	/*
+	 * Note: it might seem we should print both memory and disk usage for a
+	 * disk-based sort.  However, the current code doesn't track memory space
+	 * accurately once we have begun to return tuples to the caller (since we
+	 * don't account for pfree's the caller is expected to do), so we cannot
+	 * rely on availMem in a disk sort.  This does not seem worth the overhead
+	 * to fix.	Is it worth creating an API for the memory context code to
+	 * tell us how much is actually used in sortcontext?
+	 */
+	if (state->tapeset)
+		spaceUsed = LogicalTapeSetBlocks(state->tapeset);
+	else
+		spaceUsed = (MemoryContextGetCurrentSpace(state->sortcontext) + 1024) / 1024;
+
+	switch (state->status)
+	{
+		case TSS_SORTEDINMEM:
+			snprintf(result, 100,
+					 "Sort Method:  quicksort  Memory: %ldkB",
+					 spaceUsed);
+			break;
+		case TSS_SORTEDONTAPE:
+			snprintf(result, 100,
+					 "Sort Method:  external sort  Disk: %ldkB",
+					 spaceUsed);
+			break;
+		case TSS_FINALMERGE:
+			snprintf(result, 100,
+					 "Sort Method:  external merge  Disk: %ldkB",
+					 spaceUsed);
+			break;
+		default:
+			snprintf(result, 100, "sort still in progress");
+			break;
+	}
+
+	return result;
+}
+
 /*
  * Tape interface routines
  */
diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index 19295057f1cc..6b28eb7bd115 100644
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -20,10 +20,12 @@
  * maxKBytes, we dump all the tuples into a temp file and then read from that
  * when needed.
  *
- * When the caller requests random access to the data, we write the temp file
+ * When the caller requests backward-scan capability, we write the temp file
  * in a format that allows either forward or backward scan.  Otherwise, only
- * forward scan is allowed.  But rewind and markpos/restorepos are allowed
- * in any case.
+ * forward scan is allowed.  Rewind and markpos/restorepos are normally allowed
+ * but can be turned off via tuplestore_set_eflags; turning off both backward
+ * scan and rewind enables truncation of the tuplestore at the mark point
+ * (if any) for minimal memory usage.
  *
  * Because we allow reading before writing is complete, there are two
  * interesting positions in the temp file: the current read position and
@@ -37,7 +39,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/sort/tuplestore.c,v 1.29.2.1 2007/08/02 17:48:54 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/sort/tuplestore.c,v 1.36.2.1 2009/12/29 17:41:18 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,9 +47,12 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
+#include "commands/tablespace.h"
 #include "executor/instrument.h"        /* struct Instrumentation */
+#include "executor/executor.h"
 #include "storage/buffile.h"
 #include "utils/memutils.h"
+#include "utils/resowner.h"
 #include "utils/tuplestore.h"
 
 #include "utils/debugbreak.h"
@@ -101,10 +106,12 @@ typedef enum
 struct Tuplestorestate
 {
 	TupStoreStatus status;		/* enumerated value as shown above */
-	bool		randomAccess;	/* did caller request random access? */
+	int			eflags;			/* capability flags */
 	bool		interXact;		/* keep open through transactions? */
 	long		availMem;		/* remaining memory available, in bytes */
 	BufFile    *myfile;			/* underlying file, or NULL if none */
+	MemoryContext context;		/* memory context for holding tuples */
+	ResourceOwner resowner;		/* resowner for holding temp files */
 
 	/*
 	 * These function pointers decouple the routines that must know what kind
@@ -242,12 +249,14 @@ FREEMEM(Tuplestorestate *state, int amt)
  *--------------------
  */
 
-static Tuplestorestate *tuplestore_begin_common(bool randomAccess,
+
+static Tuplestorestate *tuplestore_begin_common(int eflags,
 						bool interXact,
 						int maxKBytes);
 
 static void tuplestore_puttuple_common(Tuplestorestate *state, TuplestorePos *pos, void *tuple);
 static void dumptuples(Tuplestorestate *state, TuplestorePos *pos);
+static void tuplestore_trim(Tuplestorestate *state, int ntuples);
 static uint32 getlen(Tuplestorestate *state, TuplestorePos *pos, bool eofOK);
 static void *copytup_heap(Tuplestorestate *state, TuplestorePos *pos, void *tup);
 static void writetup_heap(Tuplestorestate *state, TuplestorePos *pos, void *tup);
@@ -277,19 +286,21 @@ tuplestore_begin_pos(Tuplestorestate* state, TuplestorePos **pos)
  * Initialize for a tuple store operation.
  */
 static Tuplestorestate *
-tuplestore_begin_common(bool randomAccess, bool interXact, int maxKBytes) 
+tuplestore_begin_common(int eflags, bool interXact, int maxKBytes)
 {
 	Tuplestorestate *state;
 
 	state = (Tuplestorestate *) palloc0(sizeof(Tuplestorestate));
 
 	state->status = TSS_INMEM;
-	state->randomAccess = randomAccess;
+	state->eflags = eflags;
 	state->interXact = interXact;
 	state->availMem = maxKBytes * 1024L;
     state->availMemMin = state->availMem;
     state->allowedMem = state->availMem;
 	state->myfile = NULL;
+	state->context = CurrentMemoryContext;
+	state->resowner = CurrentResourceOwner;
 
 	state->memtupcount = 0;
 	state->memtupsize = 1024;	/* initial guess */
@@ -317,9 +328,9 @@ tuplestore_begin_common(bool randomAccess, bool interXact, int maxKBytes)
  *
  * interXact: if true, the files used for on-disk storage persist beyond the
  * end of the current transaction.	NOTE: It's the caller's responsibility to
- * create such a tuplestore in a memory context that will also survive
- * transaction boundaries, and to ensure the tuplestore is closed when it's
- * no longer wanted.
+ * create such a tuplestore in a memory context and resource owner that will
+ * also survive transaction boundaries, and to ensure the tuplestore is closed
+ * when it's no longer wanted.
  *
  * maxKBytes: how much data to store in memory (any data beyond this
  * amount is paged to disk).  When in doubt, use work_mem.
@@ -328,8 +339,17 @@ Tuplestorestate *
 tuplestore_begin_heap(bool randomAccess, bool interXact, int maxKBytes)
 {
 	Tuplestorestate *state;
+	int			eflags;
+
+	/*
+	 * This interpretation of the meaning of randomAccess is compatible with
+	 * the pre-8.3 behavior of tuplestores.
+	 */
+	eflags = randomAccess ?
+		(EXEC_FLAG_BACKWARD | EXEC_FLAG_REWIND | EXEC_FLAG_MARK) :
+		(EXEC_FLAG_REWIND | EXEC_FLAG_MARK);
 
-	state = tuplestore_begin_common(randomAccess, interXact, maxKBytes);
+	state = tuplestore_begin_common(eflags, interXact, maxKBytes);
 
 	state->copytup = copytup_heap;
 	state->writetup = writetup_heap;
@@ -354,6 +374,29 @@ tuplestore_set_instrument(Tuplestorestate          *state,
     state->instrument = instrument;
 }                               /* tuplestore_set_instrument */
 
+/*
+ * tuplestore_set_eflags
+ *
+ * Set capability flags at a finer grain than is allowed by
+ * tuplestore_begin_xxx.  This must be called before inserting any data
+ * into the tuplestore.
+ *
+ * eflags is a bitmask following the meanings used for executor node
+ * startup flags (see executor.h).	tuplestore pays attention to these bits:
+ *		EXEC_FLAG_REWIND		need rewind to start
+ *		EXEC_FLAG_BACKWARD		need backward fetch
+ *		EXEC_FLAG_MARK			need mark/restore
+ * If tuplestore_set_eflags is not called, REWIND and MARK are allowed,
+ * and BACKWARD is set per "randomAccess" in the tuplestore_begin_xxx call.
+ */
+void
+tuplestore_set_eflags(Tuplestorestate *state, int eflags)
+{
+	Assert(state->status == TSS_INMEM);
+	Assert(state->memtupcount == 0);
+
+	state->eflags = eflags;
+}
 
 /*
  * tuplestore_end
@@ -434,6 +477,7 @@ tuplestore_puttupleslot_pos(Tuplestorestate *state, TuplestorePos *pos,
 						TupleTableSlot *slot)
 {
 	MemTuple tuple;
+	MemoryContext oldcxt = MemoryContextSwitchTo(state->context);
 
 	/*
 	 * Form a MinimalTuple in working memory
@@ -442,6 +486,8 @@ tuplestore_puttupleslot_pos(Tuplestorestate *state, TuplestorePos *pos,
 	USEMEM(state, GetMemoryChunkSpace(tuple));
 
 	tuplestore_puttuple_common(state, pos, (void *) tuple);
+
+	MemoryContextSwitchTo(oldcxt);
 }
 void
 tuplestore_puttupleslot(Tuplestorestate *state, TupleTableSlot *slot)
@@ -458,12 +504,16 @@ tuplestore_puttupleslot(Tuplestorestate *state, TupleTableSlot *slot)
 void
 tuplestore_puttuple_pos(Tuplestorestate *state, TuplestorePos *pos, HeapTuple tuple)
 {
+	MemoryContext oldcxt = MemoryContextSwitchTo(state->context);
+
 	/*
 	 * Copy the tuple.	(Must do this even in WRITEFILE case.)
 	 */
 	tuple = COPYTUP(state, pos, tuple);
 
 	tuplestore_puttuple_common(state, pos, (void *) tuple);
+
+	MemoryContextSwitchTo(oldcxt);
 }
 void tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple)
 {
@@ -473,6 +523,8 @@ void tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple)
 static void
 tuplestore_puttuple_common(Tuplestorestate *state, TuplestorePos *pos, void *tuple)
 {
+	ResourceOwner oldowner;
+
 	switch (state->status)
 	{
 		case TSS_INMEM:
@@ -515,13 +567,23 @@ tuplestore_puttuple_common(Tuplestorestate *state, TuplestorePos *pos, void *tup
 				return;
 
 			/*
-			 * Nope; time to switch to tape-based operation.
+			 * Nope; time to switch to tape-based operation.  Make sure that
+			 * the temp file(s) are created in suitable temp tablespaces.
 			 */
+			PrepareTempTablespaces();
+
+			/* associate the file with the store's resource owner */
+			oldowner = CurrentResourceOwner;
+			CurrentResourceOwner = state->resowner;
+
 			{
 				char tmpprefix[50];
 				snprintf(tmpprefix, 50, "slice%d_tuplestore", currentSliceId);
 				state->myfile = BufFileCreateTemp(tmpprefix, state->interXact);
 			}
+
+			CurrentResourceOwner = oldowner;
+
 			state->status = TSS_WRITEFILE;
 			dumptuples(state, pos);
 			break;
@@ -553,6 +615,9 @@ tuplestore_puttuple_common(Tuplestorestate *state, TuplestorePos *pos, void *tup
  * Fetch the next tuple in either forward or back direction.
  * Returns NULL if no more tuples.	If should_free is set, the
  * caller must pfree the returned tuple when done with it.
+ *
+ * Backward scan is only allowed if randomAccess was set true or
+ * EXEC_FLAG_BACKWARD was specified to tuplestore_set_eflags().
  */
 static void *
 tuplestore_gettuple(Tuplestorestate *state, TuplestorePos *pos, bool forward,
@@ -561,7 +626,7 @@ tuplestore_gettuple(Tuplestorestate *state, TuplestorePos *pos, bool forward,
 	uint32 tuplen;
 	void	   *tup;
 
-	Assert(forward || state->randomAccess);
+	Assert(forward || (state->eflags & EXEC_FLAG_BACKWARD));
 
 	switch (state->status)
 	{
@@ -809,6 +874,8 @@ void tuplestore_flush(Tuplestorestate *state)
 void
 tuplestore_rescan_pos(Tuplestorestate *state, TuplestorePos *pos)
 {
+	Assert(state->eflags & EXEC_FLAG_REWIND);
+
 	switch (state->status)
 	{
 		case TSS_INMEM:
@@ -841,10 +908,27 @@ tuplestore_rescan(Tuplestorestate *state)
 void
 tuplestore_markpos_pos(Tuplestorestate *state, TuplestorePos *pos)
 {
+	Assert(state->eflags & EXEC_FLAG_MARK);
+
 	switch (state->status)
 	{
 		case TSS_INMEM:
 			pos->markpos_current = pos->current;
+
+			/*
+			 * We can truncate the tuplestore if neither backward scan nor
+			 * rewind capability are required by the caller.  There will never
+			 * be a need to back up past the mark point.
+			 *
+			 * Note: you might think we could remove all the tuples before
+			 * "current", since that one is the next to be returned.  However,
+			 * since tuplestore_gettuple returns a direct pointer to our
+			 * internal copy of the tuple, it's likely that the caller has
+			 * still got the tuple just before "current" referenced in a slot.
+			 * Don't free it yet.
+			 */
+			if (!(state->eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_REWIND)))
+				tuplestore_trim(state, 1);
 			break;
 		case TSS_WRITEFILE:
 			if (pos->eof_reached)
@@ -880,6 +964,8 @@ tuplestore_markpos(Tuplestorestate *state)
 void
 tuplestore_restorepos_pos(Tuplestorestate *state, TuplestorePos *pos)
 {
+	Assert(state->eflags & EXEC_FLAG_MARK);
+
 	switch (state->status)
 	{
 		case TSS_INMEM:
@@ -909,6 +995,56 @@ tuplestore_restorepos(Tuplestorestate *state)
 	tuplestore_restorepos_pos(state, &state->pos);
 }
 
+/*
+ * tuplestore_trim	- remove all but ntuples tuples before current
+ */
+static void
+tuplestore_trim(Tuplestorestate *state, int ntuples)
+{
+	int			nremove;
+	int			i;
+
+	/*
+	 * We don't bother trimming temp files since it usually would mean more
+	 * work than just letting them sit in kernel buffers until they age out.
+	 */
+	if (state->status != TSS_INMEM)
+		return;
+
+	nremove = state->current - ntuples;
+	if (nremove <= 0)
+		return;					/* nothing to do */
+	Assert(nremove <= state->memtupcount);
+
+	/* Release no-longer-needed tuples */
+	for (i = 0; i < nremove; i++)
+	{
+		FREEMEM(state, GetMemoryChunkSpace(state->memtuples[i]));
+		pfree(state->memtuples[i]);
+	}
+
+	/*
+	 * Slide the array down and readjust pointers.	This may look pretty
+	 * stupid, but we expect that there will usually not be very many
+	 * tuple-pointers to move, so this isn't that expensive; and it keeps a
+	 * lot of other logic simple.
+	 *
+	 * In fact, in the current usage for merge joins, it's demonstrable that
+	 * there will always be exactly one non-removed tuple; so optimize that
+	 * case.
+	 */
+	if (nremove + 1 == state->memtupcount)
+		state->memtuples[0] = state->memtuples[nremove];
+	else
+		memmove(state->memtuples, state->memtuples + nremove,
+				(state->memtupcount - nremove) * sizeof(void *));
+
+	state->memtupcount -= nremove;
+	state->current -= nremove;
+	state->markpos_current -= nremove;
+}
+
+
 /*
  * Tape interface routines
  */
@@ -963,7 +1099,7 @@ writetup_heap(Tuplestorestate *state, TuplestorePos *pos, void *tup)
 
 	if (BufFileWrite(state->myfile, (void *) tup, tuplen) != (size_t) tuplen)
 		elog(ERROR, "write failed");
-	if (state->randomAccess)	/* need trailing length word? */
+	if (state->eflags & EXEC_FLAG_BACKWARD)		/* need trailing length word? */
 		if (BufFileWrite(state->myfile, (void *) &tuplen,
 						 sizeof(tuplen)) != sizeof(tuplen))
 			elog(ERROR, "write failed");
@@ -1021,11 +1157,13 @@ readtup_heap(Tuplestorestate *state, TuplestorePos *pos, uint32 len)
 		htup->t_data = (HeapTupleHeader ) ((char *) tup + HEAPTUPLESIZE);
 	}
 
-	if (state->randomAccess)	/* need trailing length word? */
+	if (state->eflags & EXEC_FLAG_BACKWARD)		/* need trailing length word? */
+	{
 		if (BufFileRead(state->myfile, (void *) &tuplen,
 						sizeof(tuplen)) != sizeof(tuplen))
 		{
 			insist_log(false, "unexpected end of data");
 		}
+	}
 	return (void *) tup;
 }
diff --git a/src/backend/utils/stat/bayes.c b/src/backend/utils/stat/bayes.c
index 899d8871ee2a..732e4e403762 100644
--- a/src/backend/utils/stat/bayes.c
+++ b/src/backend/utils/stat/bayes.c
@@ -347,11 +347,15 @@ nb_classify_final(PG_FUNCTION_ARGS)
 	 * beginning and walk adding the length of the current element until
 	 * you get to the index you are interested in.
 	 */
+	/*
+	 * GPDB_83_MERGE_FIXME: is it guaranteed that there are no short varlenas
+	 * in the array?
+	 */
 	class_data = (char*) ARR_DATA_PTR(state.classes);
 	for (i = 0; i < maxi; i++)
 	{
 		class_data += VARSIZE(class_data);
-		class_data = (char*) att_align(class_data, 'i');
+		class_data = (char*) att_align_nominal(class_data, 'i');
 	}
 	PG_RETURN_TEXT_P(class_data);
 }
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index aeda231a3be4..b9e1f38212e2 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -15,7 +15,7 @@
  * this module.
  *
  * To allow reusing existing combo cids, we also keep a hash table that
- * maps cmin,cmax pairs to combo cids.  This keeps the data structure size
+ * maps cmin,cmax pairs to combo cids.	This keeps the data structure size
  * reasonable in most cases, since the number of unique pairs used by any
  * one transaction is likely to be small.
  *
diff --git a/src/backend/utils/time/sharedsnapshot.c b/src/backend/utils/time/sharedsnapshot.c
index 6a220c46ff79..5a41e0fc9d3a 100644
--- a/src/backend/utils/time/sharedsnapshot.c
+++ b/src/backend/utils/time/sharedsnapshot.c
@@ -28,8 +28,9 @@
 #include "utils/memutils.h"
 #include "utils/sharedsnapshot.h"
 
-/* MPP Addition. Distributed Snapshot that gets sent in from the QD to processes
- * running in EXECUTE mode.
+/*
+ * Distributed Snapshot that gets sent in from the QD to processes running
+ * in EXECUTE mode.
  */
 DtxContext DistributedTransactionContext = DTX_CONTEXT_LOCAL_ONLY;
 
@@ -62,6 +63,16 @@ static Size slotSize = 0;
 static Size slotCount = 0;
 static Size xipEntryCount = 0;
 
+
+/*
+ * File references to shared snapshot files open in this transaction.
+ */
+static List *shared_snapshot_files = NIL;
+
+/* prototypes for internal functions */
+static SharedSnapshotSlot *SharedSnapshotAdd(int4 slotId);
+static SharedSnapshotSlot *SharedSnapshotLookup(int4 slotId);
+
 /*
  * Report shared-memory space needed by CreateSharedSnapshot.
  */
@@ -151,6 +162,8 @@ CreateSharedSnapshotArray(void)
 			xip_base += xipEntryCount;
 		}
 	}
+
+	shared_snapshot_files = NIL;
 }
 
 /*
@@ -500,6 +513,8 @@ dumpSharedLocalSnapshot_forCursor(void)
 	TransactionId *xids = NULL;
 	int64 sub_size;
 	int64 size_read;
+	ResourceOwner oldowner;
+	MemoryContext oldcontext;
 
 	Assert(Gp_role == GP_ROLE_DISPATCH || (Gp_role == GP_ROLE_EXECUTE && Gp_is_writer));
 	Assert(SharedLocalSnapshotSlot != NULL);
@@ -507,8 +522,25 @@ dumpSharedLocalSnapshot_forCursor(void)
 	src = (SharedSnapshotSlot *)SharedLocalSnapshotSlot;
 	fname = sharedLocalSnapshot_filename(src->QDxid, src->QDcid, src->segmateSync);
 
-	/* Create our dump-file, this will either return a valid file, or throw an error */
+	/*
+	 * Create our dump-file. Hold the reference to it in
+	 * the transaction's resource owner, so that it lives as long
+	 * as the cursor we're declaring.
+	 */
+	oldowner = CurrentResourceOwner;
+	CurrentResourceOwner = TopTransactionResourceOwner;
+	oldcontext = MemoryContextSwitchTo(TopTransactionContext);
 	f = BufFileCreateTemp_ReaderWriter(fname, true, false);
+
+	/*
+	 * Remember our file, so that we can close it at end of transaction.
+	 * The resource owner mechanism would do it for us as a backstop, but it
+	 * produces warnings at commit if some files haven't been closed.
+	 */
+	shared_snapshot_files = lappend(shared_snapshot_files, f);
+	MemoryContextSwitchTo(oldcontext);
+	CurrentResourceOwner = oldowner;
+
 	/* we have our file. */
 
 #define FileWriteOK(file, ptr, size) (BufFileWrite(file, ptr, size) == size)
@@ -803,6 +835,25 @@ readSharedLocalSnapshot_forCursor(Snapshot snapshot)
 	return;
 }
 
+/*
+ * Free any shared snapshot files.
+ */
+void
+AtEOXact_SharedSnapshot(void)
+{
+	ListCell *lc;
+	List *oldlist;
+
+	oldlist = shared_snapshot_files;
+	shared_snapshot_files = NIL;
+
+	foreach(lc, oldlist)
+	{
+		BufFileClose((BufFile * ) lfirst(lc));
+	}
+	list_free(oldlist);
+}
+
 /*
  * LogDistributedSnapshotInfo
  *   Log the distributed snapshot info in a given snapshot.
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index 066a975b9163..6b9e835fe901 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -50,7 +50,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.101 2007/01/05 22:19:47 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.109.2.1 2008/09/11 14:01:35 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,16 +78,20 @@
 
 #include "access/distributedlog.h"
 
+/* Static variables representing various special snapshot semantics */
+SnapshotData SnapshotNowData = {HeapTupleSatisfiesNow};
+SnapshotData SnapshotSelfData = {HeapTupleSatisfiesSelf};
+SnapshotData SnapshotAnyData = {HeapTupleSatisfiesAny};
+SnapshotData SnapshotToastData = {HeapTupleSatisfiesToast};
+
 /*
  * These SnapshotData structs are static to simplify memory allocation
  * (see the hack in GetSnapshotData to avoid repeated malloc/free).
  */
-static SnapshotData SnapshotDirtyData;
-static SnapshotData SerializableSnapshotData;
-static SnapshotData LatestSnapshotData;
+static SnapshotData SerializableSnapshotData = {HeapTupleSatisfiesMVCC};
+static SnapshotData LatestSnapshotData = {HeapTupleSatisfiesMVCC};
 
 /* Externally visible pointers to valid snapshots: */
-Snapshot	SnapshotDirty = &SnapshotDirtyData;
 Snapshot	SerializableSnapshot = NULL;
 Snapshot	LatestSnapshot = NULL;
 
@@ -98,26 +102,34 @@ Snapshot	LatestSnapshot = NULL;
  */
 Snapshot	ActiveSnapshot = NULL;
 
-/* These are updated by GetSnapshotData: */
-TransactionId TransactionXmin = InvalidTransactionId;
-TransactionId RecentXmin = InvalidTransactionId;
+/*
+ * These are updated by GetSnapshotData.  We initialize them this way
+ * for the convenience of TransactionIdIsInProgress: even in bootstrap
+ * mode, we don't want it to say that BootstrapTransactionId is in progress.
+ *
+ * RecentGlobalXmin is initialized to InvalidTransactionId, to ensure that no
+ * one tries to use a stale value.  Readers should ensure that it has been set
+ * to something else before using it.
+ */
+TransactionId TransactionXmin = FirstNormalTransactionId;
+TransactionId RecentXmin = FirstNormalTransactionId;
 TransactionId RecentGlobalXmin = InvalidTransactionId;
 
+
 /* local functions */
-static bool XidInSnapshot(TransactionId xid, Snapshot snapshot, bool isXmax,
+static bool XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot, bool isXmax,
 			  bool distributedSnapshotIgnore, bool *setDistributedSnapshotIgnore);
-static bool XidInSnapshot_Local(TransactionId xid, Snapshot snapshot, bool isXmax);
-
+static bool XidInMVCCSnapshot_Local(TransactionId xid, Snapshot snapshot, bool isXmax);
 
 /*
  * Set the buffer dirty after setting t_infomask
  */
 static inline void
-markDirty(Buffer buffer, bool disabled, Relation relation, HeapTupleHeader tuple, bool isXmin)
+markDirty(Buffer buffer, Relation relation, HeapTupleHeader tuple, bool isXmin)
 {
 	TransactionId xid;
 
-	if (!disabled)
+	if (!gp_disable_tuple_hints)
 	{
 		SetBufferCommitInfoNeedsSave(buffer);
 		return;
@@ -136,7 +148,6 @@ markDirty(Buffer buffer, bool disabled, Relation relation, HeapTupleHeader tuple
 	if (relation->rd_issyscat)
 	{
 		/* Assume we want to always mark the buffer dirty */
-
 		SetBufferCommitInfoNeedsSave(buffer);
 		return;
 	}
@@ -166,7 +177,80 @@ markDirty(Buffer buffer, bool disabled, Relation relation, HeapTupleHeader tuple
 }
 
 /*
- * HeapTupleSatisfiesItself
+ * SetHintBits()
+ *
+ * Set commit/abort hint bits on a tuple, if appropriate at this time.
+ *
+ * It is only safe to set a transaction-committed hint bit if we know the
+ * transaction's commit record has been flushed to disk.  We cannot change
+ * the LSN of the page here because we may hold only a share lock on the
+ * buffer, so we can't use the LSN to interlock this; we have to just refrain
+ * from setting the hint bit until some future re-examination of the tuple.
+ *
+ * We can always set hint bits when marking a transaction aborted.	(Some
+ * code in heapam.c relies on that!)
+ *
+ * Also, if we are cleaning up HEAP_MOVED_IN or HEAP_MOVED_OFF entries, then
+ * we can always set the hint bits, since VACUUM FULL always uses synchronous
+ * commits and doesn't move tuples that weren't previously hinted.	(This is
+ * not known by this subroutine, but is applied by its callers.)
+ *
+ * Normal commits may be asynchronous, so for those we need to get the LSN
+ * of the transaction and then check whether this is flushed.
+ *
+ * The caller should pass xid as the XID of the transaction to check, or
+ * InvalidTransactionId if no check is needed.
+ */
+static inline void
+SetHintBits(HeapTupleHeader tuple, Buffer buffer, Relation rel,
+			uint16 infomask, TransactionId xid)
+{
+	bool		isXmin;
+
+	if (TransactionIdIsValid(xid))
+	{
+		/* NB: xid must be known committed here! */
+		XLogRecPtr	commitLSN = TransactionIdGetCommitLSN(xid);
+
+		if (XLogNeedsFlush(commitLSN))
+			return;				/* not flushed yet, so don't set hint */
+	}
+
+	tuple->t_infomask |= infomask;
+
+	switch(infomask)
+	{
+		case HEAP_XMIN_INVALID:
+		case HEAP_XMIN_COMMITTED:
+			isXmin = true;
+			break;
+		case HEAP_XMAX_INVALID:
+		case HEAP_XMAX_COMMITTED:
+			isXmin = false;
+			break;
+		default:
+			elog(ERROR, "unexpected infomask while setting hint bits: %d", infomask);
+			isXmin = false; /* keep compiler quiet */
+	}
+
+	markDirty(buffer, rel, tuple, isXmin);
+}
+
+/*
+ * HeapTupleSetHintBits --- exported version of SetHintBits()
+ *
+ * This must be separate because of C99's brain-dead notions about how to
+ * implement inline functions.
+ */
+void
+HeapTupleSetHintBits(HeapTupleHeader tuple, Buffer buffer, Relation rel,
+					 uint16 infomask, TransactionId xid)
+{
+	SetHintBits(tuple, buffer, rel, infomask, xid);
+}
+
+/*
+ * HeapTupleSatisfiesSelf
  *		True iff heap tuple is valid "for itself".
  *
  *	Here, we consider the effects of:
@@ -190,10 +274,8 @@ markDirty(Buffer buffer, bool disabled, Relation relation, HeapTupleHeader tuple
  *			 Xmax is not committed)))			that has not been committed
  */
 bool
-HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer)
+HeapTupleSatisfiesSelf(Relation relation, HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
 {
-	const bool disableTupleHints = gp_disable_tuple_hints;
-
 	if (!(tuple->t_infomask & HEAP_XMIN_COMMITTED))
 	{
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
@@ -209,12 +291,12 @@ HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer
 			{
 				if (TransactionIdDidCommit(xvac))
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+							InvalidTransactionId);
 			}
 		}
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
@@ -226,14 +308,12 @@ HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer
 				if (TransactionIdIsInProgress(xvac))
 					return false;
 				if (TransactionIdDidCommit(xvac))
-				{
-					tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-				}
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+								InvalidTransactionId);
 				else
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
 			}
@@ -248,30 +328,26 @@ HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer
 
 			Assert(!(tuple->t_infomask & HEAP_XMAX_IS_MULTI));
 
-			/* deleting subtransaction aborted? */
-			if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
+			if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
 			{
-				tuple->t_infomask |= HEAP_XMAX_INVALID;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+				/* deleting subtransaction must have aborted */
+				SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+							InvalidTransactionId);
 				return true;
 			}
 
-			Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
-
 			return false;
 		}
 		else if (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
 			return false;
 		else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
-		{
-			tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-			markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-		}
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+						HeapTupleHeaderGetXmin(tuple));
 		else
 		{
 			/* it must have aborted or crashed */
-			tuple->t_infomask |= HEAP_XMIN_INVALID;
-			markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+						InvalidTransactionId);
 			return false;
 		}
 	}
@@ -308,8 +384,8 @@ HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return true;
 	}
 
@@ -317,13 +393,13 @@ HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer
 
 	if (tuple->t_infomask & HEAP_IS_LOCKED)
 	{
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return true;
 	}
 
-	tuple->t_infomask |= HEAP_XMAX_COMMITTED;
-	markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+	SetHintBits(tuple, buffer, relation, HEAP_XMAX_COMMITTED,
+				HeapTupleHeaderGetXmax(tuple));
 	return false;
 }
 
@@ -369,10 +445,8 @@ HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer
  *		that do catalog accesses.  this is unfortunate, but not critical.
  */
 bool
-HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
+HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
 {
-	const bool disableTupleHints = gp_disable_tuple_hints;
-
 	if (!(tuple->t_infomask & HEAP_XMIN_COMMITTED))
 	{
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
@@ -388,13 +462,12 @@ HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 			{
 				if (TransactionIdDidCommit(xvac))
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+							InvalidTransactionId);
 			}
 		}
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
@@ -406,22 +479,19 @@ HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 				if (TransactionIdIsInProgress(xvac))
 					return false;
 				if (TransactionIdDidCommit(xvac))
-				{
-					tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-				}
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+								InvalidTransactionId);
 				else
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
 			}
 		}
 		else if (TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmin(tuple)))
 		{
-			if (HeapTupleHeaderGetCmin(tuple) >= GetCurrentCommandId())
+			if (HeapTupleHeaderGetCmin(tuple) >= GetCurrentCommandId(false))
 				return false;	/* inserted after scan started */
 
 			if (tuple->t_infomask & HEAP_XMAX_INVALID)	/* xid invalid */
@@ -432,44 +502,30 @@ HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 
 			Assert(!(tuple->t_infomask & HEAP_XMAX_IS_MULTI));
 
-			/* deleting subtransaction aborted? */
-			if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
+			if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
 			{
-				tuple->t_infomask |= HEAP_XMAX_INVALID;
-
-				/* If ComboCID format cid, roll it back to normal Cmin */
-				if (tuple->t_infomask & HEAP_COMBOCID)
-					HeapTupleHeaderSetCmin(tuple, HeapTupleHeaderGetCmin(tuple));
-
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
-
+				/* deleting subtransaction must have aborted */
+				SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+							InvalidTransactionId);
 				return true;
 			}
 
-			Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
-
-			if (HeapTupleHeaderGetCmax(tuple) >= GetCurrentCommandId())
+			if (HeapTupleHeaderGetCmax(tuple) >= GetCurrentCommandId(false))
 				return true;	/* deleted after scan started */
 			else
 				return false;	/* deleted before scan started */
 		}
+		else if (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
+			return false;
+		else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+						HeapTupleHeaderGetXmin(tuple));
 		else
 		{
-			if (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
-				return false;
-			else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
-			{
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-			}
-			else
-			{
-				/* it must have aborted or crashed */
-				tuple->t_infomask |= HEAP_XMIN_INVALID;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-
-				return false;
-			}
+			/* it must have aborted or crashed */
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+						InvalidTransactionId);
+			return false;
 		}
 	}
 
@@ -496,10 +552,10 @@ HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 	{
 		if (tuple->t_infomask & HEAP_IS_LOCKED)
 			return true;
-		if (HeapTupleHeaderGetCmax(tuple) >= GetCurrentCommandId())
-			return true;	/* deleted after scan started */
+		if (HeapTupleHeaderGetCmax(tuple) >= GetCurrentCommandId(false))
+			return true;		/* deleted after scan started */
 		else
-			return false;	/* deleted before scan started */
+			return false;		/* deleted before scan started */
 	}
 
 	if (TransactionIdIsInProgress(HeapTupleHeaderGetXmax(tuple)))
@@ -508,9 +564,8 @@ HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
-
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return true;
 	}
 
@@ -518,17 +573,26 @@ HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 
 	if (tuple->t_infomask & HEAP_IS_LOCKED)
 	{
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return true;
 	}
 
-	tuple->t_infomask |= HEAP_XMAX_COMMITTED;
-	markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
-
+	SetHintBits(tuple, buffer, relation, HEAP_XMAX_COMMITTED,
+				HeapTupleHeaderGetXmax(tuple));
 	return false;
 }
 
+/*
+ * HeapTupleSatisfiesAny
+ *		Dummy "satisfies" routine: any tuple satisfies SnapshotAny.
+ */
+bool
+HeapTupleSatisfiesAny(Relation relation, HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
+{
+	return true;
+}
+
 /*
  * HeapTupleSatisfiesToast
  *		True iff heap tuple is valid as a TOAST row.
@@ -544,10 +608,9 @@ HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer)
  * table.
  */
 bool
-HeapTupleSatisfiesToast(Relation relation, HeapTupleHeader tuple, Buffer buffer)
+HeapTupleSatisfiesToast(Relation relation, HeapTupleHeader tuple, Snapshot snapshot,
+						Buffer buffer)
 {
-	const bool disableTupleHints = gp_disable_tuple_hints;
-
 	if (!(tuple->t_infomask & HEAP_XMIN_COMMITTED))
 	{
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
@@ -563,12 +626,12 @@ HeapTupleSatisfiesToast(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 			{
 				if (TransactionIdDidCommit(xvac))
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+							InvalidTransactionId);
 			}
 		}
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
@@ -580,14 +643,12 @@ HeapTupleSatisfiesToast(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 				if (TransactionIdIsInProgress(xvac))
 					return false;
 				if (TransactionIdDidCommit(xvac))
-				{
-					tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-				}
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+								InvalidTransactionId);
 				else
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
 			}
@@ -629,8 +690,6 @@ HTSU_Result
 HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId curcid,
 						 Buffer buffer)
 {
-	const bool disableTupleHints = gp_disable_tuple_hints;
-
 	if (!(tuple->t_infomask & HEAP_XMIN_COMMITTED))
 	{
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
@@ -646,12 +705,12 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
 			{
 				if (TransactionIdDidCommit(xvac))
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return HeapTupleInvisible;
 				}
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+							InvalidTransactionId);
 			}
 		}
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
@@ -663,14 +722,12 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
 				if (TransactionIdIsInProgress(xvac))
 					return HeapTupleInvisible;
 				if (TransactionIdDidCommit(xvac))
-				{
-					tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-				}
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+								InvalidTransactionId);
 				else
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return HeapTupleInvisible;
 				}
 			}
@@ -688,23 +745,14 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
 
 			Assert(!(tuple->t_infomask & HEAP_XMAX_IS_MULTI));
 
-			/* deleting subtransaction aborted? */
-			if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
+			if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
 			{
-				tuple->t_infomask |= HEAP_XMAX_INVALID;
-
-				/* If ComboCID format cid, roll it back to normal Cmin */
-				if (tuple->t_infomask & HEAP_COMBOCID)
-				{
-					HeapTupleHeaderSetCmin(tuple, HeapTupleHeaderGetCmin(tuple));
-				}
-
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+				/* deleting subtransaction must have aborted */
+				SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+							InvalidTransactionId);
 				return HeapTupleMayBeUpdated;
 			}
 
-			Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
-
 			if (HeapTupleHeaderGetCmax(tuple) >= curcid)
 				return HeapTupleSelfUpdated;	/* updated after scan started */
 			else
@@ -713,15 +761,13 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
 		else if (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
 			return HeapTupleInvisible;
 		else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
-		{
-			tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-			markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-		}
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+						HeapTupleHeaderGetXmin(tuple));
 		else
 		{
 			/* it must have aborted or crashed */
-			tuple->t_infomask |= HEAP_XMIN_INVALID;
-			markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+						InvalidTransactionId);
 			return HeapTupleInvisible;
 		}
 	}
@@ -745,8 +791,8 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
 
 		if (MultiXactIdIsRunning(HeapTupleHeaderGetXmax(tuple)))
 			return HeapTupleBeingUpdated;
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return HeapTupleMayBeUpdated;
 	}
 
@@ -766,8 +812,8 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return HeapTupleMayBeUpdated;
 	}
 
@@ -775,13 +821,13 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
 
 	if (tuple->t_infomask & HEAP_IS_LOCKED)
 	{
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return HeapTupleMayBeUpdated;
 	}
 
-	tuple->t_infomask |= HEAP_XMAX_COMMITTED;
-	markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+	SetHintBits(tuple, buffer, relation, HEAP_XMAX_COMMITTED,
+				HeapTupleHeaderGetXmax(tuple));
 	return HeapTupleUpdated;	/* updated by other */
 }
 
@@ -794,22 +840,22 @@ HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple, CommandId cur
  *		previous commands of this transaction
  *		changes made by the current command
  *
- * This is essentially like HeapTupleSatisfiesItself as far as effects of
+ * This is essentially like HeapTupleSatisfiesSelf as far as effects of
  * the current transaction and committed/aborted xacts are concerned.
  * However, we also include the effects of other xacts still in progress.
  *
- * Returns extra information in the global variable SnapshotDirty, namely
- * xids of concurrent xacts that affected the tuple.  SnapshotDirty->xmin
- * is set to InvalidTransactionId if xmin is either committed good or
- * committed dead; or to xmin if that transaction is still in progress.
- * Similarly for SnapshotDirty->xmax.
+ * A special hack is that the passed-in snapshot struct is used as an
+ * output argument to return the xids of concurrent xacts that affected the
+ * tuple.  snapshot->xmin is set to the tuple's xmin if that is another
+ * transaction that's still in progress; or to InvalidTransactionId if the
+ * tuple's xmin is committed good, committed dead, or my own xact.  Similarly
+ * for snapshot->xmax and the tuple's xmax.
  */
 bool
-HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer)
+HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Snapshot snapshot,
+						Buffer buffer)
 {
-	const bool disableTupleHints = gp_disable_tuple_hints;
-
-	SnapshotDirty->xmin = SnapshotDirty->xmax = InvalidTransactionId;
+	snapshot->xmin = snapshot->xmax = InvalidTransactionId;
 
 	if (!(tuple->t_infomask & HEAP_XMIN_COMMITTED))
 	{
@@ -826,12 +872,12 @@ HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 			{
 				if (TransactionIdDidCommit(xvac))
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+							InvalidTransactionId);
 			}
 		}
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
@@ -843,14 +889,12 @@ HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 				if (TransactionIdIsInProgress(xvac))
 					return false;
 				if (TransactionIdDidCommit(xvac))
-				{
-					tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-				}
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+								InvalidTransactionId);
 				else
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
 			}
@@ -865,34 +909,30 @@ HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 
 			Assert(!(tuple->t_infomask & HEAP_XMAX_IS_MULTI));
 
-			/* deleting subtransaction aborted? */
-			if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
+			if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
 			{
-				tuple->t_infomask |= HEAP_XMAX_INVALID;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+				/* deleting subtransaction must have aborted */
+				SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+							InvalidTransactionId);
 				return true;
 			}
 
-			Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
-
 			return false;
 		}
 		else if (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
 		{
-			SnapshotDirty->xmin = HeapTupleHeaderGetXmin(tuple);
+			snapshot->xmin = HeapTupleHeaderGetXmin(tuple);
 			/* XXX shouldn't we fall through to look at xmax? */
 			return true;		/* in insertion by other */
 		}
 		else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
-		{
-			tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-			markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-		}
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+						HeapTupleHeaderGetXmin(tuple));
 		else
 		{
 			/* it must have aborted or crashed */
-			tuple->t_infomask |= HEAP_XMIN_INVALID;
-			markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+						InvalidTransactionId);
 			return false;
 		}
 	}
@@ -925,15 +965,15 @@ HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 
 	if (TransactionIdIsInProgress(HeapTupleHeaderGetXmax(tuple)))
 	{
-		SnapshotDirty->xmax = HeapTupleHeaderGetXmax(tuple);
+		snapshot->xmax = HeapTupleHeaderGetXmax(tuple);
 		return true;
 	}
 
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return true;
 	}
 
@@ -941,19 +981,19 @@ HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer)
 
 	if (tuple->t_infomask & HEAP_IS_LOCKED)
 	{
-		tuple->t_infomask |= HEAP_XMAX_INVALID;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+					InvalidTransactionId);
 		return true;
 	}
 
-	tuple->t_infomask |= HEAP_XMAX_COMMITTED;
-	markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+	SetHintBits(tuple, buffer, relation, HEAP_XMAX_COMMITTED,
+				HeapTupleHeaderGetXmax(tuple));
 	return false;				/* updated by other */
 }
 
 /*
- * HeapTupleSatisfiesSnapshot
- *		True iff heap tuple is valid for the given snapshot.
+ * HeapTupleSatisfiesMVCC
+ *		True iff heap tuple is valid for the given MVCC snapshot.
  *
  *	Here, we consider the effects of:
  *		all transactions committed as of the time of the given snapshot
@@ -973,10 +1013,9 @@ HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer)
  * can't see it.)
  */
 bool
-HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot snapshot,
-						   Buffer buffer)
+HeapTupleSatisfiesMVCC(Relation relation, HeapTupleHeader tuple, Snapshot snapshot,
+					   Buffer buffer)
 {
-	const bool disableTupleHints = gp_disable_tuple_hints;
 	bool inSnapshot = false;
 	bool setDistributedSnapshotIgnore = false;
 
@@ -995,13 +1034,12 @@ HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot sn
 			{
 				if (TransactionIdDidCommit(xvac))
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+							InvalidTransactionId);
 			}
 		}
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
@@ -1013,15 +1051,12 @@ HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot sn
 				if (TransactionIdIsInProgress(xvac))
 					return false;
 				if (TransactionIdDidCommit(xvac))
-				{
-					tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-				}
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+								InvalidTransactionId);
 				else
 				{
-					tuple->t_infomask |= HEAP_XMIN_INVALID;
-					markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-
+					SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+								InvalidTransactionId);
 					return false;
 				}
 			}
@@ -1039,20 +1074,11 @@ HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot sn
 
 			Assert(!(tuple->t_infomask & HEAP_XMAX_IS_MULTI));
 
-			/* deleting subtransaction aborted? */
-			/* FIXME -- is this correct w.r.t. the cmax of the tuple? */
-			if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
+			if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
 			{
-				tuple->t_infomask |= HEAP_XMAX_INVALID;
-
-				/* If ComboCID format cid, roll it back to normal Cmin */
-				if (tuple->t_infomask & HEAP_COMBOCID)
-				{
-					HeapTupleHeaderSetCmin(tuple, HeapTupleHeaderGetCmin(tuple));
-				}
-
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
-
+				/* deleting subtransaction must have aborted */
+				SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+							InvalidTransactionId);
 				return true;
 			}
 
@@ -1066,23 +1092,17 @@ HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot sn
 			else
 				return false;	/* deleted before scan started */
 		}
+		else if (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
+			return false;
+		else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+						HeapTupleHeaderGetXmin(tuple));
 		else
 		{
-			if (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
-				return false;
-			else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
-			{
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-			}
-			else
-			{
-				/* it must have aborted or crashed */
-				tuple->t_infomask |= HEAP_XMIN_INVALID;
-				markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
-
-				return false;
-			}
+			/* it must have aborted or crashed */
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+						InvalidTransactionId);
+			return false;
 		}
 	}
 
@@ -1090,16 +1110,15 @@ HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot sn
 	 * By here, the inserting transaction has committed - have to check
 	 * when...
 	 */
-	inSnapshot = XidInSnapshot(
-		HeapTupleHeaderGetXmin(tuple),
-		snapshot,
-		/* isXmax */ false,
-		((tuple->t_infomask2 & HEAP_XMIN_DISTRIBUTED_SNAPSHOT_IGNORE) != 0),
-		&setDistributedSnapshotIgnore);
+	inSnapshot =
+		XidInMVCCSnapshot(HeapTupleHeaderGetXmin(tuple), snapshot,
+						  /* isXmax */ false,
+						  ((tuple->t_infomask2 & HEAP_XMIN_DISTRIBUTED_SNAPSHOT_IGNORE) != 0),
+						  &setDistributedSnapshotIgnore);
 	if (setDistributedSnapshotIgnore)
 	{
 		tuple->t_infomask2 |= HEAP_XMIN_DISTRIBUTED_SNAPSHOT_IGNORE;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ true);
+		markDirty(buffer, relation, tuple, /* isXmin */ true);
 	}
 
 	if (inSnapshot)
@@ -1134,30 +1153,28 @@ HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot sn
 		if (!TransactionIdDidCommit(HeapTupleHeaderGetXmax(tuple)))
 		{
 			/* it must have aborted or crashed */
-			tuple->t_infomask |= HEAP_XMAX_INVALID;
-			markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
-
+			SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+						InvalidTransactionId);
 			return true;
 		}
 
 		/* xmax transaction committed */
-		tuple->t_infomask |= HEAP_XMAX_COMMITTED;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		SetHintBits(tuple, buffer, relation, HEAP_XMAX_COMMITTED,
+					HeapTupleHeaderGetXmax(tuple));
 	}
 
 	/*
 	 * OK, the deleting transaction committed too ... but when?
 	 */
-	inSnapshot = XidInSnapshot(
-		HeapTupleHeaderGetXmax(tuple),
-		snapshot,
-		/* isXmax */ true,
-		((tuple->t_infomask2 & HEAP_XMAX_DISTRIBUTED_SNAPSHOT_IGNORE) != 0),
-		&setDistributedSnapshotIgnore);
+	inSnapshot =
+			XidInMVCCSnapshot(HeapTupleHeaderGetXmax(tuple), snapshot,
+							  /* isXmax */ true,
+							  ((tuple->t_infomask2 & HEAP_XMAX_DISTRIBUTED_SNAPSHOT_IGNORE) != 0),
+							  &setDistributedSnapshotIgnore);
 	if (setDistributedSnapshotIgnore)
 	{
 		tuple->t_infomask2 |= HEAP_XMAX_DISTRIBUTED_SNAPSHOT_IGNORE;
-		markDirty(buffer, disableTupleHints, relation, tuple, /* isXmin */ false);
+		markDirty(buffer, relation, tuple, /* isXmin */ false);
 	}
 
 	if (inSnapshot)
@@ -1179,7 +1196,7 @@ HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple, Snapshot sn
  * even if we see that the deleting transaction has committed.
  */
 HTSV_Result
-HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
+HeapTupleSatisfiesVacuum(Relation relation, HeapTupleHeader tuple, TransactionId OldestXmin,
 						 Buffer buffer)
 {
 	/*
@@ -1202,12 +1219,12 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 				return HEAPTUPLE_DELETE_IN_PROGRESS;
 			if (TransactionIdDidCommit(xvac))
 			{
-				tuple->t_infomask |= HEAP_XMIN_INVALID;
-				SetBufferCommitInfoNeedsSave(buffer);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+							InvalidTransactionId);
 				return HEAPTUPLE_DEAD;
 			}
-			tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-			SetBufferCommitInfoNeedsSave(buffer);
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+						InvalidTransactionId);
 		}
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
@@ -1218,14 +1235,12 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 			if (TransactionIdIsInProgress(xvac))
 				return HEAPTUPLE_INSERT_IN_PROGRESS;
 			if (TransactionIdDidCommit(xvac))
-			{
-				tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-				SetBufferCommitInfoNeedsSave(buffer);
-			}
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+							InvalidTransactionId);
 			else
 			{
-				tuple->t_infomask |= HEAP_XMIN_INVALID;
-				SetBufferCommitInfoNeedsSave(buffer);
+				SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+							InvalidTransactionId);
 				return HEAPTUPLE_DEAD;
 			}
 		}
@@ -1239,21 +1254,23 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 			return HEAPTUPLE_DELETE_IN_PROGRESS;
 		}
 		else if (TransactionIdDidCommit(HeapTupleHeaderGetXmin(tuple)))
-		{
-			tuple->t_infomask |= HEAP_XMIN_COMMITTED;
-			SetBufferCommitInfoNeedsSave(buffer);
-		}
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_COMMITTED,
+						HeapTupleHeaderGetXmin(tuple));
 		else
 		{
 			/*
 			 * Not in Progress, Not Committed, so either Aborted or crashed
 			 */
-			tuple->t_infomask |= HEAP_XMIN_INVALID;
-			SetBufferCommitInfoNeedsSave(buffer);
+			SetHintBits(tuple, buffer, relation, HEAP_XMIN_INVALID,
+						InvalidTransactionId);
 			return HEAPTUPLE_DEAD;
 		}
-		/* Should only get here if we set XMIN_COMMITTED */
-		Assert(tuple->t_infomask & HEAP_XMIN_COMMITTED);
+
+		/*
+		 * At this point the xmin is known committed, but we might not have
+		 * been able to set the hint bit yet; so we can no longer Assert that
+		 * it's set.
+		 */
 	}
 
 	/*
@@ -1268,8 +1285,8 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 		/*
 		 * "Deleting" xact really only locked it, so the tuple is live in any
 		 * case.  However, we should make sure that either XMAX_COMMITTED or
-		 * XMAX_INVALID gets set once the xact is gone, to reduce the costs
-		 * of examining the tuple for future xacts.  Also, marking dead
+		 * XMAX_INVALID gets set once the xact is gone, to reduce the costs of
+		 * examining the tuple for future xacts.  Also, marking dead
 		 * MultiXacts as invalid here provides defense against MultiXactId
 		 * wraparound (see also comments in heap_freeze_tuple()).
 		 */
@@ -1291,8 +1308,8 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 			 * We know that xmax did lock the tuple, but it did not and will
 			 * never actually update it.
 			 */
-			tuple->t_infomask |= HEAP_XMAX_INVALID;
-			SetBufferCommitInfoNeedsSave(buffer);
+			SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+						InvalidTransactionId);
 		}
 		return HEAPTUPLE_LIVE;
 	}
@@ -1309,45 +1326,31 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 		if (TransactionIdIsInProgress(HeapTupleHeaderGetXmax(tuple)))
 			return HEAPTUPLE_DELETE_IN_PROGRESS;
 		else if (TransactionIdDidCommit(HeapTupleHeaderGetXmax(tuple)))
-		{
-			tuple->t_infomask |= HEAP_XMAX_COMMITTED;
-			SetBufferCommitInfoNeedsSave(buffer);
-		}
+			SetHintBits(tuple, buffer, relation, HEAP_XMAX_COMMITTED,
+						HeapTupleHeaderGetXmax(tuple));
 		else
 		{
 			/*
 			 * Not in Progress, Not Committed, so either Aborted or crashed
 			 */
-			tuple->t_infomask |= HEAP_XMAX_INVALID;
-			SetBufferCommitInfoNeedsSave(buffer);
+			SetHintBits(tuple, buffer, relation, HEAP_XMAX_INVALID,
+						InvalidTransactionId);
 			return HEAPTUPLE_LIVE;
 		}
-		/* Should only get here if we set XMAX_COMMITTED */
-		Assert(tuple->t_infomask & HEAP_XMAX_COMMITTED);
-	}
-
-	/*
-	 * Deleter committed, but check special cases.
-	 */
 
-	if (TransactionIdEquals(HeapTupleHeaderGetXmin(tuple),
-							HeapTupleHeaderGetXmax(tuple)))
-	{
 		/*
-		 * Inserter also deleted it, so it was never visible to anyone else.
-		 * However, we can only remove it early if it's not an updated tuple;
-		 * else its parent tuple is linking to it via t_ctid, and this tuple
-		 * mustn't go away before the parent does.
+		 * At this point the xmax is known committed, but we might not have
+		 * been able to set the hint bit yet; so we can no longer Assert that
+		 * it's set.
 		 */
-		if (!(tuple->t_infomask & HEAP_UPDATED))
-			return HEAPTUPLE_DEAD;
 	}
 
+	/*
+	 * Deleter committed, but perhaps it was recent enough that some open
+	 * transactions could still see the tuple.
+	 */
 	if (!TransactionIdPrecedes(HeapTupleHeaderGetXmax(tuple), OldestXmin))
-	{
-		/* deleting xact is too recent, tuple could still be visible */
 		return HEAPTUPLE_RECENTLY_DEAD;
-	}
 
 	/* Otherwise, it's dead and removable */
 	return HEAPTUPLE_DEAD;
@@ -1420,8 +1423,6 @@ GetLatestSnapshot(void)
  *		Copy the given snapshot.
  *
  * The copy is palloc'd in the current memory context.
- *
- * Note that this will not work on "special" snapshots.
  */
 Snapshot
 CopySnapshot(Snapshot snapshot)
@@ -1496,7 +1497,7 @@ CopySnapshot(Snapshot snapshot)
  * This is currently identical to pfree, but is provided for cleanliness.
  *
  * Do *not* apply this to the results of GetTransactionSnapshot or
- * GetLatestSnapshot.
+ * GetLatestSnapshot, since those are just static structs.
  */
 void
 FreeSnapshot(Snapshot snapshot)
@@ -1525,14 +1526,13 @@ FreeXactSnapshot(void)
 }
 
 /*
- * XidInSnapshot
+ * XidInMVCCSnapshot
  *		Is the given XID still-in-progress according to the distributed
  *      and local snapshots?
  */
 static bool
-XidInSnapshot(
-	TransactionId xid, Snapshot snapshot, bool isXmax,
-    bool distributedSnapshotIgnore, bool *setDistributedSnapshotIgnore)
+XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot, bool isXmax,
+				  bool distributedSnapshotIgnore, bool *setDistributedSnapshotIgnore)
 {
 	Assert (setDistributedSnapshotIgnore != NULL);
 	*setDistributedSnapshotIgnore = false;
@@ -1581,11 +1581,11 @@ XidInSnapshot(
 		}
 	}
 
-	return XidInSnapshot_Local(xid, snapshot, isXmax);
+	return XidInMVCCSnapshot_Local(xid, snapshot, isXmax);
 }
 
 /*
- * XidInSnapshot_Local
+ * XidInMVCCSnapshot_Local
  *		Is the given XID still-in-progress according to the local snapshot?
  *
  * Note: GetSnapshotData never stores either top xid or subxids of our own
@@ -1594,7 +1594,7 @@ XidInSnapshot(
  * apply this for known-committed XIDs.
  */
 static bool
-XidInSnapshot_Local(TransactionId xid, Snapshot snapshot, bool isXmax)
+XidInMVCCSnapshot_Local(TransactionId xid, Snapshot snapshot, bool isXmax)
 {
 	uint32		i;
 
@@ -1689,8 +1689,9 @@ static char *TupleVisibilityStatus_Name(TupleVisibilityStatus status)
 static TupleTransactionStatus GetTupleVisibilityCLogStatus(TransactionId xid)
 {
 	XidStatus xidStatus;
+	XLogRecPtr lsn;
 
-	xidStatus = TransactionIdGetStatus(xid);
+	xidStatus = TransactionIdGetStatus(xid, &lsn);
 	switch (xidStatus)
 	{
 	case TRANSACTION_STATUS_IN_PROGRESS:	return TupleTransactionStatus_CLogInProgress;
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index d9a86bbfd33e..e58d84d5dd7d 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.133 2007/02/16 02:10:07 alvherre Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.152.2.6 2009/11/14 15:39:41 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,9 +54,6 @@
 #include <unistd.h>
 #include <locale.h>
 #include <signal.h>
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
 #include <time.h>
 
 #include "libpq/pqsignal.h"
@@ -95,6 +92,7 @@ static char *lc_monetary = "";
 static char *lc_numeric = "";
 static char *lc_time = "";
 static char *lc_messages = "";
+static const char *default_text_search_config = "";
 static char *username = "";
 static bool pwprompt = false;
 static char *pwfilename = NULL;
@@ -127,6 +125,7 @@ static char *hba_file;
 static char *ident_file;
 static char *conf_file;
 static char *conversion_file;
+static char *dictionary_file;
 static char *info_schema_file;
 static char *cdb_init_d_dir;
 static char *features_file;
@@ -190,7 +189,7 @@ static void exit_nicely(void);
 static char *get_id(void);
 static char *get_encoding_id(char *encoding_name);
 static char *get_short_version(void);
-static int  check_data_dir(char *dir);
+static int	check_data_dir(char *dir);
 static bool mkdatadir(const char *subdir);
 static void set_input(char **dest, char *filename);
 static void check_input(char *path);
@@ -205,6 +204,7 @@ static void setup_depend(void);
 static void setup_sysviews(void);
 static void setup_description(void);
 static void setup_conversion(void);
+static void setup_dictionary(void);
 static void setup_privileges(void);
 static void set_info_version(void);
 static void setup_schema(void);
@@ -217,7 +217,6 @@ static void check_ok(void);
 static char *escape_quotes(const char *src);
 static int	locale_date_order(const char *locale);
 static bool chklocale(const char *locale);
-static bool chklocaleencoding(const char *locale, int user_enc);
 static void setlocales(void);
 static void usage(const char *progname);
 
@@ -519,6 +518,7 @@ readfile(char *path)
 	int			maxlength = 0,
 				linelen = 0;
 	int			nlines = 0;
+	int			n;
 	char	  **result;
 	char	   *buffer;
 	int			c;
@@ -559,16 +559,13 @@ readfile(char *path)
 	/* now reprocess the file and store the lines */
 
 	rewind(infile);
-	nlines = 0;
-	while (fgets(buffer, maxlength + 1, infile) != NULL)
-	{
-		result[nlines] = xstrdup(buffer);
-		nlines++;
-	}
+	n = 0;
+	while (fgets(buffer, maxlength + 1, infile) != NULL && n < nlines)
+		result[n++] = xstrdup(buffer);
 
 	fclose(infile);
 	free(buffer);
-	result[nlines] = NULL;
+	result[n] = NULL;
 
 	return result;
 }
@@ -769,7 +766,7 @@ exit_nicely(void)
 		else if (found_existing_xlogdir)
 		{
 			fprintf(stderr,
-					_("%s: removing contents of transaction log directory \"%s\"\n"),
+			_("%s: removing contents of transaction log directory \"%s\"\n"),
 					progname, xlog_dir);
 			if (!rmtree(xlog_dir, false))
 				fprintf(stderr, _("%s: failed to remove contents of transaction log directory\n"),
@@ -786,7 +783,7 @@ exit_nicely(void)
 
 		if (made_new_xlogdir || found_existing_xlogdir)
 			fprintf(stderr,
-			  _("%s: transaction log directory \"%s\" not removed at user's request\n"),
+					_("%s: transaction log directory \"%s\" not removed at user's request\n"),
 					progname, xlog_dir);
 	}
 
@@ -865,8 +862,7 @@ get_encoding_id(char *encoding_name)
 
 	if (encoding_name && *encoding_name)
 	{
-		if ((enc = pg_char_to_encoding(encoding_name)) >= 0 &&
-			pg_valid_server_encoding(encoding_name) >= 0)
+		if ((enc = pg_valid_server_encoding(encoding_name)) >= 0)
 			return encodingid_to_string(enc);
 	}
 	fprintf(stderr, _("%s: \"%s\" is not a valid server encoding name\n"),
@@ -874,163 +870,90 @@ get_encoding_id(char *encoding_name)
 	exit(1);
 }
 
-#if defined(HAVE_LANGINFO_H) && defined(CODESET)
 /*
- * Checks whether the encoding selected for PostgreSQL and the
- * encoding used by the system locale match.
+ * Support for determining the best default text search configuration.
+ * We key this off the first part of LC_CTYPE (ie, the language name).
  */
-
-struct encoding_match
+struct tsearch_config_match
 {
-	enum pg_enc pg_enc_code;
-	char	   *system_enc_name;
-};
-
-struct encoding_match encoding_match_list[] = {
-	{PG_EUC_JP, "EUC-JP"},
-	{PG_EUC_JP, "eucJP"},
-	{PG_EUC_JP, "IBM-eucJP"},
-	{PG_EUC_JP, "sdeckanji"},
-
-	{PG_EUC_CN, "EUC-CN"},
-	{PG_EUC_CN, "eucCN"},
-	{PG_EUC_CN, "IBM-eucCN"},
-	{PG_EUC_CN, "GB2312"},
-	{PG_EUC_CN, "dechanzi"},
-
-	{PG_EUC_KR, "EUC-KR"},
-	{PG_EUC_KR, "eucKR"},
-	{PG_EUC_KR, "IBM-eucKR"},
-	{PG_EUC_KR, "deckorean"},
-	{PG_EUC_KR, "5601"},
-
-	{PG_EUC_TW, "EUC-TW"},
-	{PG_EUC_TW, "eucTW"},
-	{PG_EUC_TW, "IBM-eucTW"},
-	{PG_EUC_TW, "cns11643"},
-
-#ifdef NOT_VERIFIED
-	{PG_JOHAB, "???"},
-#endif
-
-	{PG_UTF8, "UTF-8"},
-	{PG_UTF8, "utf8"},
-
-	{PG_LATIN1, "ISO-8859-1"},
-	{PG_LATIN1, "ISO8859-1"},
-	{PG_LATIN1, "iso88591"},
-
-	{PG_LATIN2, "ISO-8859-2"},
-	{PG_LATIN2, "ISO8859-2"},
-	{PG_LATIN2, "iso88592"},
-
-	{PG_LATIN3, "ISO-8859-3"},
-	{PG_LATIN3, "ISO8859-3"},
-	{PG_LATIN3, "iso88593"},
-
-	{PG_LATIN4, "ISO-8859-4"},
-	{PG_LATIN4, "ISO8859-4"},
-	{PG_LATIN4, "iso88594"},
-
-	{PG_LATIN5, "ISO-8859-9"},
-	{PG_LATIN5, "ISO8859-9"},
-	{PG_LATIN5, "iso88599"},
-
-	{PG_LATIN6, "ISO-8859-10"},
-	{PG_LATIN6, "ISO8859-10"},
-	{PG_LATIN6, "iso885910"},
-
-	{PG_LATIN7, "ISO-8859-13"},
-	{PG_LATIN7, "ISO8859-13"},
-	{PG_LATIN7, "iso885913"},
-
-	{PG_LATIN8, "ISO-8859-14"},
-	{PG_LATIN8, "ISO8859-14"},
-	{PG_LATIN8, "iso885914"},
-
-	{PG_LATIN9, "ISO-8859-15"},
-	{PG_LATIN9, "ISO8859-15"},
-	{PG_LATIN9, "iso885915"},
-
-	{PG_LATIN10, "ISO-8859-16"},
-	{PG_LATIN10, "ISO8859-16"},
-	{PG_LATIN10, "iso885916"},
-
-	{PG_WIN1252, "CP1252"},
-	{PG_WIN1253, "CP1253"},
-	{PG_WIN1254, "CP1254"},
-	{PG_WIN1255, "CP1255"},
-	{PG_WIN1256, "CP1256"},
-	{PG_WIN1257, "CP1257"},
-	{PG_WIN1258, "CP1258"},
-#ifdef NOT_VERIFIED
-	{PG_WIN874, "???"},
-#endif
-	{PG_KOI8R, "KOI8-R"},
-	{PG_WIN1251, "CP1251"},
-	{PG_WIN866, "CP866"},
-
-	{PG_ISO_8859_5, "ISO-8859-5"},
-	{PG_ISO_8859_5, "ISO8859-5"},
-	{PG_ISO_8859_5, "iso88595"},
-
-	{PG_ISO_8859_6, "ISO-8859-6"},
-	{PG_ISO_8859_6, "ISO8859-6"},
-	{PG_ISO_8859_6, "iso88596"},
-
-	{PG_ISO_8859_7, "ISO-8859-7"},
-	{PG_ISO_8859_7, "ISO8859-7"},
-	{PG_ISO_8859_7, "iso88597"},
-
-	{PG_ISO_8859_8, "ISO-8859-8"},
-	{PG_ISO_8859_8, "ISO8859-8"},
-	{PG_ISO_8859_8, "iso88598"},
-
-	{PG_SQL_ASCII, NULL}		/* end marker */
+	const char *tsconfname;
+	const char *langname;
 };
 
-static char *
-get_encoding_from_locale(const char *ctype)
+static const struct tsearch_config_match tsearch_config_languages[] =
 {
-	char	   *save;
-	char	   *sys;
-
-	save = setlocale(LC_CTYPE, NULL);
-	if (!save)
-		return NULL;
-	save = xstrdup(save);
-
-	setlocale(LC_CTYPE, ctype);
-	sys = nl_langinfo(CODESET);
-	sys = xstrdup(sys);
-
-	setlocale(LC_CTYPE, save);
-	free(save);
-
-	return sys;
-}
+	{"danish", "da"},
+	{"danish", "Danish"},
+	{"dutch", "nl"},
+	{"dutch", "Dutch"},
+	{"english", "C"},
+	{"english", "POSIX"},
+	{"english", "en"},
+	{"english", "English"},
+	{"finnish", "fi"},
+	{"finnish", "Finnish"},
+	{"french", "fr"},
+	{"french", "French"},
+	{"german", "de"},
+	{"german", "German"},
+	{"hungarian", "hu"},
+	{"hungarian", "Hungarian"},
+	{"italian", "it"},
+	{"italian", "Italian"},
+	{"norwegian", "no"},
+	{"norwegian", "Norwegian"},
+	{"portuguese", "pt"},
+	{"portuguese", "Portuguese"},
+	{"romanian", "ro"},
+	{"russian", "ru"},
+	{"russian", "Russian"},
+	{"spanish", "es"},
+	{"spanish", "Spanish"},
+	{"swedish", "sv"},
+	{"swedish", "Swedish"},
+	{"turkish", "tr"},
+	{"turkish", "Turkish"},
+	{NULL, NULL}				/* end marker */
+};
 
-static int
-find_matching_encoding(const char *ctype)
+/*
+ * Look for a text search configuration matching lc_ctype, and return its
+ * name; return NULL if no match.
+ */
+static const char *
+find_matching_ts_config(const char *lc_type)
 {
-	char	   *sys;
 	int			i;
+	char	   *langname,
+			   *ptr;
 
-	sys = get_encoding_from_locale(ctype);
+	/*
+	 * Convert lc_ctype to a language name by stripping everything after an
+	 * underscore.	Just for paranoia, we also stop at '.' or '@'.
+	 */
+	if (lc_type == NULL)
+		langname = xstrdup("");
+	else
+	{
+		ptr = langname = xstrdup(lc_type);
+		while (*ptr && *ptr != '_' && *ptr != '.' && *ptr != '@')
+			ptr++;
+		*ptr = '\0';
+	}
 
-	for (i = 0; encoding_match_list[i].system_enc_name; i++)
+	for (i = 0; tsearch_config_languages[i].tsconfname; i++)
 	{
-		if (pg_strcasecmp(sys, encoding_match_list[i].system_enc_name) == 0)
+		if (pg_strcasecmp(tsearch_config_languages[i].langname, langname) == 0)
 		{
-			free(sys);
-			return encoding_match_list[i].pg_enc_code;
+			free(langname);
+			return tsearch_config_languages[i].tsconfname;
 		}
 	}
 
-	free(sys);
-	return -1;
+	free(langname);
+	return NULL;
 }
-#endif   /* HAVE_LANGINFO_H && CODESET */
+
 
 
 
@@ -1170,26 +1093,31 @@ check_input(char *path)
 	if (stat(path, &statbuf) != 0)
 	{
 		if (errno == ENOENT)
+		{
+			fprintf(stderr,
+					_("%s: file \"%s\" does not exist\n"), progname, path);
 			fprintf(stderr,
-					_("%s: file \"%s\" does not exist\n"
-					  "This means you have a corrupted installation or identified\n"
-					  "the wrong directory with the invocation option -L.\n"),
-					progname, path);
+					_("This might mean you have a corrupted installation or identified\n"
+					  "the wrong directory with the invocation option -L.\n"));
+		}
 		else
+		{
 			fprintf(stderr,
-					_("%s: could not access file \"%s\": %s\n"
-					  "This might mean you have a corrupted installation or identified\n"
-					  "the wrong directory with the invocation option -L.\n"),
-					progname, path, strerror(errno));
+					_("%s: could not access file \"%s\": %s\n"), progname, path,
+					  strerror(errno));
+			fprintf(stderr,
+					_("This might mean you have a corrupted installation or identified\n"
+					  "the wrong directory with the invocation option -L.\n"));
+		}
 		exit(1);
 	}
 	if (!S_ISREG(statbuf.st_mode))
 	{
 		fprintf(stderr,
-				_("%s: file \"%s\" is not a regular file\n"
-			   "This means you have a corrupted installation or identified\n"
-				  "the wrong directory with the invocation option -L.\n"),
-				progname, path);
+				_("%s: file \"%s\" is not a regular file\n"), progname, path);
+		fprintf(stderr,
+				_("This might mean you have a corrupted installation or identified\n"
+				  "the wrong directory with the invocation option -L.\n"));
 		exit(1);
 	}
 }
@@ -1384,10 +1312,10 @@ test_config_settings(void)
     if (n_fsm_pages <= 0)
         n_fsm_pages = FSM_FOR_BUFS(n_buffers);
 
-	if ((n_buffers * (BLCKSZ/1024)) % 1024 == 0)
-		printf("%dMB/%d\n", (n_buffers * (BLCKSZ/1024)) / 1024, n_fsm_pages);
+	if ((n_buffers * (BLCKSZ / 1024)) % 1024 == 0)
+		printf("%dMB/%d\n", (n_buffers * (BLCKSZ / 1024)) / 1024, n_fsm_pages);
 	else
-		printf("%dkB/%d\n", n_buffers * (BLCKSZ/1024), n_fsm_pages);
+		printf("%dkB/%d\n", n_buffers * (BLCKSZ / 1024), n_fsm_pages);
 }
 
 /*
@@ -1409,12 +1337,12 @@ setup_config(void)
 
     conflines = add_assignment(conflines, "max_connections", "%d", n_connections);
 
-	if ((n_buffers * (BLCKSZ/1024)) % 1024 == 0)
+	if ((n_buffers * (BLCKSZ / 1024)) % 1024 == 0)
         conflines = add_assignment(conflines, "shared_buffers", "%dMB",
-                                   (n_buffers * (BLCKSZ/1024)) / 1024);
+                                   (n_buffers * (BLCKSZ / 1024)) / 1024);
 	else
         conflines = add_assignment(conflines, "shared_buffers", "%dkB",
-                                   n_buffers * (BLCKSZ/1024));
+                                   n_buffers * (BLCKSZ / 1024));
 
 	conflines = add_assignment(conflines, "max_fsm_pages", "%d", n_fsm_pages);
 
@@ -1451,6 +1379,13 @@ setup_config(void)
 			break;
 	}
 
+	snprintf(repltok, sizeof(repltok),
+			 "default_text_search_config = 'pg_catalog.%s'",
+			 escape_quotes(default_text_search_config));
+	conflines = replace_token(conflines,
+						 "#default_text_search_config = 'pg_catalog.simple'",
+							  repltok);
+
 	snprintf(path, sizeof(path), "%s/postgresql.conf", pg_data);
 
 	writefile(path, conflines);
@@ -1791,8 +1726,8 @@ setup_depend(void)
 		 * dependencies seems hard.
 		 *
 		 * Note that we deliberately do not pin the system views, which
-		 * haven't been created yet.  Also, no conversions, databases,
-		 * or tablespaces are pinned.
+		 * haven't been created yet.  Also, no conversions, databases, or
+		 * tablespaces are pinned.
 		 *
 		 * First delete any already-made entries; PINs override all else, and
 		 * must be the only entries for their objects.
@@ -1838,6 +1773,14 @@ setup_depend(void)
 		" FROM pg_namespace "
 		"    WHERE nspname ~ '^(pg_|gp_)';\n",
 
+		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
+		" FROM pg_ts_parser;\n",
+		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
+		" FROM pg_ts_dict;\n",
+		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
+		" FROM pg_ts_template;\n",
+		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
+		" FROM pg_ts_config;\n",
 		"INSERT INTO pg_shdepend SELECT 0, 0, 0, tableoid, oid, 'p' "
 		" FROM pg_authid;\n",
 		NULL
@@ -1984,6 +1927,43 @@ setup_conversion(void)
 	check_ok();
 }
 
+/*
+ * load extra dictionaries (Snowball stemmers)
+ */
+static void
+setup_dictionary(void)
+{
+	PG_CMD_DECL;
+	char	  **line;
+	char	  **conv_lines;
+
+	fputs(_("creating dictionaries ... "), stdout);
+	fflush(stdout);
+
+	/*
+	 * We use -j here to avoid backslashing stuff
+	 */
+	snprintf(cmd, sizeof(cmd),
+			 "\"%s\" %s -j template1 >%s",
+			 backend_exec, backend_options,
+			 DEVNULL);
+
+	PG_CMD_OPEN;
+
+	conv_lines = readfile(dictionary_file);
+	for (line = conv_lines; *line != NULL; line++)
+	{
+		PG_CMD_PUTS(*line);
+		free(*line);
+	}
+
+	free(conv_lines);
+
+	PG_CMD_CLOSE;
+
+	check_ok();
+}
+
 /*
  * Set up privileges
  *
@@ -2476,6 +2456,13 @@ escape_quotes(const char *src)
 	return result;
 }
 
+/* Hack to suppress a warning about %x from some versions of gcc */
+static inline size_t
+my_strftime(char *s, size_t max, const char *fmt, const struct tm * tm)
+{
+	return strftime(s, max, fmt, tm);
+}
+
 /*
  * Determine likely date order from locale
  */
@@ -2505,7 +2492,7 @@ locale_date_order(const char *locale)
 	testtime.tm_mon = 10;		/* November, should come out as "11" */
 	testtime.tm_year = 133;		/* 2033 */
 
-	res = strftime(buf, sizeof(buf), "%x", &testtime);
+	res = my_strftime(buf, sizeof(buf), "%x", &testtime);
 
 	setlocale(LC_TIME, save);
 	free(save);
@@ -2615,38 +2602,6 @@ setlocales(void)
 
 }
 
-/*
- * check if the chosen encoding matches the encoding required by the locale
- * this should match the backend check_locale_encoding() function
- *
- */
-bool chklocaleencoding(const char *locale, int user_enc)
-{
-	int			locale_enc;
-
-	locale_enc = pg_get_encoding_from_locale(locale);
-
-	/* We allow selection of SQL_ASCII */
-	if (!(locale_enc == user_enc ||
-		  locale_enc == PG_SQL_ASCII ||
-		  user_enc == PG_SQL_ASCII
-#ifdef WIN32
-
-	/*
-	 * On win32, if the encoding chosen is UTF8, all locales are OK (assuming
-	 * the actual locale name passed the checks above). This is because UTF8
-	 * is a pseudo-codepage, that we convert to UTF16 before doing any
-	 * operations on, and UTF16 supports all locales.
-	 */
-		  || user_enc == PG_UTF8
-#endif
-		  ))
-	{
-		return false;
-	}
-	return true;
-}
-
 /*
  * Try to parse value as an integer.  The accepted formats are the
  * usual decimal, octal, or hexadecimal formats.
@@ -2796,6 +2751,10 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
 		return 0;
 	}
 
+#ifndef __CYGWIN__
+    AddUserToTokenDacl(restrictedToken);
+#endif
+
 	if (!CreateProcessAsUser(restrictedToken,
 						NULL,
 						cmd,
@@ -2813,10 +2772,6 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo)
 		return 0;
 	}
 
-#ifndef __CYGWIN__
-	AddUserToDacl(processInfo->hProcess);
-#endif
-
 	return ResumeThread(processInfo->hThread);
 }
 #endif
@@ -2841,6 +2796,8 @@ usage(const char *progname)
 			 "                            environment)\n"));
 	printf(_("  --is_filerep_mirrored=yes|no whether or not this db directory will be mirrored by file replication\n"));
 	printf(_("  --no-locale               equivalent to --locale=C\n"));
+	printf(_("  -T, --text-search-config=CFG\n"
+		 "                            default text search configuration\n"));
 	printf(_("  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"));
 	printf(_("  -A, --auth=METHOD         default authentication method for local connections\n"));
 	printf(_("  -U, --username=NAME       database superuser name\n"));
@@ -2883,6 +2840,7 @@ main(int argc, char *argv[])
 		{"lc-time", required_argument, NULL, 6},
 		{"lc-messages", required_argument, NULL, 7},
 		{"no-locale", no_argument, NULL, 8},
+		{"text-search-config", required_argument, NULL, 'T'},
 		{"auth", required_argument, NULL, 'A'},
 		{"pwprompt", no_argument, NULL, 'W'},
 		{"pwfile", required_argument, NULL, 9},
@@ -2912,8 +2870,6 @@ main(int argc, char *argv[])
 	char		bin_dir[MAXPGPATH];
 	char	   *pg_data_native;
 
-	int			user_enc;
-
 #ifdef WIN32
 	char	   *restrict_env;
 #endif
@@ -2963,7 +2919,7 @@ main(int argc, char *argv[])
 
 	/* process command-line options */
 
-	while ((c = getopt_long(argc, argv, "dD:E:L:mnU:WA:sX:", long_options, &option_index)) != -1)
+	while ((c = getopt_long(argc, argv, "dD:E:L:mnU:WA:sT:X:", long_options, &option_index)) != -1)
 	{
         const char *optname;
         char        shortopt[2];
@@ -3045,6 +3001,9 @@ main(int argc, char *argv[])
 			case 's':
 				show_setting = true;
 				break;
+			case 'T':
+				default_text_search_config = xstrdup(optarg);
+				break;
 			case 'X':
 				xlog_dir = xstrdup(optarg);
 				break;
@@ -3092,7 +3051,7 @@ main(int argc, char *argv[])
 	if (optind < argc)
 	{
 		fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
-				progname, argv[optind + 1]);
+				progname, argv[optind]);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
 		exit(1);
@@ -3272,10 +3231,6 @@ main(int argc, char *argv[])
 	if (strlen(username) == 0)
 		username = effective_user;
 
-
-	if (strlen(encoding))
-		encodingid = get_encoding_id(encoding);
-
 	set_input(&bki_file, "postgres.bki");
 	set_input(&desc_file, "postgres.description");
 	set_input(&shdesc_file, "postgres.shdescription");
@@ -3283,6 +3238,7 @@ main(int argc, char *argv[])
 	set_input(&ident_file, "pg_ident.conf.sample");
 	set_input(&conf_file, "postgresql.conf.sample");
 	set_input(&conversion_file, "conversion_create.sql");
+	set_input(&dictionary_file, "snowball_create.sql");
 	set_input(&info_schema_file, "information_schema.sql");
 	set_input(&features_file, "sql_features.txt");
 	set_input(&system_views_file, "system_views.sql");
@@ -3316,6 +3272,7 @@ main(int argc, char *argv[])
 	check_input(ident_file);
 	check_input(conf_file);
 	check_input(conversion_file);
+	check_input(dictionary_file);
 	check_input(info_schema_file);
 	check_input(features_file);
 	check_input(system_views_file);
@@ -3350,54 +3307,111 @@ main(int argc, char *argv[])
 			   lc_time);
 	}
 
-#if defined(HAVE_LANGINFO_H) && defined(CODESET)
-	if (pg_strcasecmp(lc_ctype, "C") != 0 && pg_strcasecmp(lc_ctype, "POSIX") != 0)
+	if (strlen(encoding) == 0)
 	{
-		if (strlen(encoding) == 0)
-		{
-			int			tmp;
+		int			ctype_enc;
 
-			tmp = find_matching_encoding(lc_ctype);
-			if (tmp == -1)
-			{
-				fprintf(stderr, _("%s: could not find suitable encoding for locale \"%s\"\n"), progname, lc_ctype);
-				fprintf(stderr, _("Rerun %s with the -E option.\n"), progname);
-				fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
-				exit(1);
-			}
-			else
-			{
-				encodingid = encodingid_to_string(tmp);
-				printf(_("The default database encoding has accordingly been set to %s.\n"),
-					   pg_encoding_to_char(tmp));
-			}
+		ctype_enc = pg_get_encoding_from_locale(lc_ctype);
+
+		if (ctype_enc == PG_SQL_ASCII &&
+			!(pg_strcasecmp(lc_ctype, "C") == 0 ||
+			  pg_strcasecmp(lc_ctype, "POSIX") == 0))
+		{
+			/* Hmm, couldn't recognize the locale's codeset */
+			fprintf(stderr, _("%s: could not find suitable encoding for locale %s\n"),
+					progname, lc_ctype);
+			fprintf(stderr, _("Rerun %s with the -E option.\n"), progname);
+			fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+					progname);
+			exit(1);
+		}
+		else if (!pg_valid_server_encoding_id(ctype_enc))
+		{
+			/* We recognized it, but it's not a legal server encoding */
+			fprintf(stderr,
+					_("%s: locale %s requires unsupported encoding %s\n"),
+					progname, lc_ctype, pg_encoding_to_char(ctype_enc));
+			fprintf(stderr,
+				  _("Encoding %s is not allowed as a server-side encoding.\n"
+					"Rerun %s with a different locale selection.\n"),
+					pg_encoding_to_char(ctype_enc), progname);
+			exit(1);
 		}
 		else
 		{
-			user_enc = atoi(encodingid);
-			if (!chklocaleencoding(lc_ctype, user_enc))
-			{
-				fprintf(stderr, _("Encoding mismatch.\n"
-										"The encoding you selected (%s) and the encoding that the\n"
-										"selected locale uses (%s) do not match.  This would lead to\n"
-										"misbehavior in various character string processing functions.\n"),
-								pg_encoding_to_char(user_enc),
-								lc_ctype);
-				exit(1);
-			}
-			if(!chklocaleencoding(lc_collate, user_enc))
-			{
-				fprintf(stderr, _("Encoding mismatch.\n"
-										"The encoding you selected (%s) and the encoding that the\n"
-										"selected locale uses (%s) do not match.  This would lead to\n"
-										"misbehavior in various character string processing functions.\n"),
-								pg_encoding_to_char(user_enc),
-								lc_collate);
-				exit(1);
-			}
+			encodingid = encodingid_to_string(ctype_enc);
+			printf(_("The default database encoding has accordingly been set to %s.\n"),
+				   pg_encoding_to_char(ctype_enc));
+		}
+	}
+	else
+	{
+		int			user_enc;
+		int			ctype_enc;
+
+		encodingid = get_encoding_id(encoding);
+		user_enc = atoi(encodingid);
+
+		ctype_enc = pg_get_encoding_from_locale(lc_ctype);
+
+		/* We allow selection of SQL_ASCII --- see notes in createdb() */
+		if (!(ctype_enc == user_enc ||
+			  ctype_enc == PG_SQL_ASCII ||
+			  user_enc == PG_SQL_ASCII
+#ifdef WIN32
+
+		/*
+		 * On win32, if the encoding chosen is UTF8, all locales are OK
+		 * (assuming the actual locale name passed the checks above). This is
+		 * because UTF8 is a pseudo-codepage, that we convert to UTF16 before
+		 * doing any operations on, and UTF16 supports all locales.
+		 */
+			  || user_enc == PG_UTF8
+#endif
+			  ))
+		{
+			fprintf(stderr, _("%s: encoding mismatch\n"), progname);
+			fprintf(stderr,
+			   _("The encoding you selected (%s) and the encoding that the\n"
+			  "selected locale uses (%s) do not match.  This would lead to\n"
+			"misbehavior in various character string processing functions.\n"
+			   "Rerun %s and either do not specify an encoding explicitly,\n"
+				 "or choose a matching combination.\n"),
+					pg_encoding_to_char(user_enc),
+					pg_encoding_to_char(ctype_enc),
+					progname);
+			exit(1);
 		}
 	}
-#endif   /* HAVE_LANGINFO_H && CODESET */
+
+	if (strlen(default_text_search_config) == 0)
+	{
+		default_text_search_config = find_matching_ts_config(lc_ctype);
+		if (default_text_search_config == NULL)
+		{
+			printf(_("%s: could not find suitable text search configuration for locale %s\n"),
+				   progname, lc_ctype);
+			default_text_search_config = "simple";
+		}
+	}
+	else
+	{
+		const char *checkmatch = find_matching_ts_config(lc_ctype);
+
+		if (checkmatch == NULL)
+		{
+			printf(_("%s: warning: suitable text search configuration for locale %s is unknown\n"),
+				   progname, lc_ctype);
+		}
+		else if (strcmp(checkmatch, default_text_search_config) != 0)
+		{
+			printf(_("%s: warning: specified text search configuration \"%s\" might not match locale %s\n"),
+				   progname, default_text_search_config, lc_ctype);
+		}
+	}
+
+	printf(_("The default text search configuration will be set to \"%s\".\n"),
+		   default_text_search_config);
 
 	printf("\n");
 
@@ -3482,10 +3496,15 @@ main(int argc, char *argv[])
 	/* Create transaction log symlink, if required */
 	if (strcmp(xlog_dir, "") != 0)
 	{
-		char	*linkloc;
+		char	   *linkloc;
 
-		linkloc = (char *) malloc(strlen(pg_data) + 8 + 2);
-		sprintf(linkloc, "%s/pg_xlog", pg_data);
+		/* clean up xlog directory name, check it's absolute */
+		canonicalize_path(xlog_dir);
+		if (!is_absolute_path(xlog_dir))
+		{
+			fprintf(stderr, _("%s: transaction log directory location must be an absolute path\n"), progname);
+			exit_nicely();
+		}
 
 		/* check if the specified xlog directory is empty */
 		switch (check_data_dir(xlog_dir))
@@ -3503,9 +3522,7 @@ main(int argc, char *argv[])
 					exit_nicely();
 				}
 				else
-				{
 					check_ok();
-				}
 
 				made_new_xlogdir = true;
 				break;
@@ -3552,7 +3569,7 @@ main(int argc, char *argv[])
 		if (symlink(xlog_dir, linkloc) != 0)
 		{
 			fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s\n"),
-						progname, linkloc, strerror(errno));
+					progname, linkloc, strerror(errno));
 			exit_nicely();
 		}
 #else
@@ -3616,6 +3633,8 @@ main(int argc, char *argv[])
 
 		setup_conversion();
 
+		setup_dictionary();
+
 		setup_privileges();
 
 		setup_schema();
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index d125a125a0ca..018838a978c4 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
 # $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.21.2.1 2009/09/03 21:01:00 petere Exp $
 CATALOG_NAME	:= initdb
-AVAIL_LANGUAGES	:= cs de es fr it ja pt_BR ru sv ta tr
+AVAIL_LANGUAGES	:= cs de es fr it ko pl pt_BR ro ru sk sl sv ta tr zh_CN zh_TW
 GETTEXT_FILES	:= initdb.c ../../port/dirmod.c ../../port/exec.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/ipcclean/Makefile b/src/bin/ipcclean/Makefile
index d24ef10c2bc7..5856b9c17ce5 100644
--- a/src/bin/ipcclean/Makefile
+++ b/src/bin/ipcclean/Makefile
@@ -2,10 +2,10 @@
 #
 # Makefile for src/bin/ipcclean
 #
-# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/ipcclean/Makefile,v 1.21 2007/01/05 22:19:47 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/ipcclean/Makefile,v 1.22 2008/01/01 19:45:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index 482e4209b6e4..4c89a74b4922 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -28,7 +28,6 @@ STD_CFLAGS := $(filter-out -I%,$(CFLAGS))
 STD_LDFLAGS := $(filter-out -L%,$(LDFLAGS))
 STD_LIBS := $(filter-out -L%,$(LIBS))
 
-override CPPFLAGS += -DFRONTEND
 override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
 override CPPFLAGS += -DVAL_CC="\"$(CC)\""
 override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
index c8f017c284fd..1f98736d797b 100644
--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -1,5 +1,5 @@
 # $PostgreSQL: pgsql/src/bin/pg_config/nls.mk,v 1.19.2.1 2009/09/03 21:01:00 petere Exp $
 CATALOG_NAME	:= pg_config
-AVAIL_LANGUAGES	:= de es fr it ja ko nb pt_BR ro ru sv ta tr
+AVAIL_LANGUAGES	:= cs de es fr it ko nb pl pt_BR ro ru sl sv ta tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_config.c ../../port/exec.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_config/win32.mak b/src/bin/pg_config/win32.mak
deleted file mode 100644
index a0fccf321fff..000000000000
--- a/src/bin/pg_config/win32.mak
+++ /dev/null
@@ -1,119 +0,0 @@
-# Makefile for Microsoft Visual C++ 5.0 (or compat)
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-
-!IFDEF DEBUG
-OPT=/Od /Zi /MDd
-LOPT=/DEBUG
-DEBUGDEF=/D _DEBUG
-OUTDIR=.\Debug
-INTDIR=.\Debug
-!ELSE
-OPT=/O2 /MD
-LOPT=
-DEBUGDEF=/D NDEBUG
-OUTDIR=.\Release
-INTDIR=.\Release
-!ENDIF
-
-ALL : "..\..\port\pg_config_paths.h" "$(OUTDIR)\pg_config.exe"
-
-CLEAN :
-	-@erase "$(INTDIR)\pg_config.obj"
-	-@erase "$(INTDIR)\pgstrcasecmp.obj"
-	-@erase "$(OUTDIR)\path.obj"
-	-@erase "$(OUTDIR)\strlcpy.obj"
-	-@erase "$(INTDIR)\exec.obj"
-	-@erase "$(INTDIR)\snprintf.obj"
-	-@erase "$(OUTDIR)\pg_config.exe"
-	-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
-
-"..\..\port\pg_config_paths.h": win32.mak
-	echo #define PGBINDIR "" >$@
-	echo #define PGSHAREDIR "" >>$@
-	echo #define SYSCONFDIR "" >>$@
-	echo #define INCLUDEDIR "" >>$@
-	echo #define PKGINCLUDEDIR "" >>$@
-	echo #define INCLUDEDIRSERVER "" >>$@
-	echo #define LIBDIR "" >>$@
-	echo #define PKGLIBDIR "" >>$@
-	echo #define LOCALEDIR "" >>$@
-	echo #define DOCDIR "" >>$@
-	echo #define MANDIR "" >>$@
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
- "_MBCS" /Fp"$(INTDIR)\pg_config.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
- /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
- /I ..\..\include\port\win32_msvc /D "FRONTEND" \
- /D "_CRT_SECURE_NO_DEPRECATE"
-
-CPP_OBJS=$(INTDIR)/
-CPP_SBRS=.
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\pg_config.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_config.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\pg_config.obj" \
-	"$(INTDIR)\pgstrcasecmp.obj" \
-	"$(OUTDIR)\path.obj" \
-	"$(OUTDIR)\strlcpy.obj" \
-	"$(INTDIR)\exec.obj" \
-	"$(INTDIR)\snprintf.obj" \
-!IFDEF DEBUG
-	"..\..\interfaces\libpq\Debug\libpqddll.lib"
-!ELSE
-	"..\..\interfaces\libpq\Release\libpqdll.lib"
-!ENDIF
-
-"$(OUTDIR)\pg_config.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-"$(OUTDIR)\path.obj" : "$(OUTDIR)" ..\..\port\path.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\path.c
-<<
-
-"$(OUTDIR)\strlcpy.obj" : "$(OUTDIR)" ..\..\port\strlcpy.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\strlcpy.c
-<<
-
-"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
-<<
-
-"$(INTDIR)\exec.obj" : ..\..\port\exec.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\exec.c
-<<
-
-"$(INTDIR)\snprintf.obj" : ..\..\port\snprintf.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\snprintf.c
-<<
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
diff --git a/src/bin/pg_controldata/.gitignore b/src/bin/pg_controldata/.gitignore
index eab0c28a8bb3..32ea40181f5b 100644
--- a/src/bin/pg_controldata/.gitignore
+++ b/src/bin/pg_controldata/.gitignore
@@ -1 +1,3 @@
+/pg_crc.c
+
 /pg_controldata
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index d67fdbb13828..16bee75f54f6 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -18,8 +18,6 @@ LIBS := $(filter-out -lresolv -lbz2, $(LIBS))
 # This program isn't interactive, so doesn't need these
 LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses -lcurl -lssl -lcrypto -lz, $(LIBS))
 
-override CPPFLAGS += -DFRONTEND
-
 OBJS= pg_controldata.o $(WIN32RES)
 
 all: submake-libpgport pg_controldata
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index 85e4a505cc7a..5d479180ccc0 100644
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -1,5 +1,5 @@
 # $PostgreSQL: pgsql/src/bin/pg_controldata/nls.mk,v 1.19.2.1 2009/09/03 21:01:04 petere Exp $
 CATALOG_NAME	:= pg_controldata
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR sv ta tr
+AVAIL_LANGUAGES	:= cs de es fa fr hu it ko nb pl pt_BR ro ru sk sl sv ta tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_controldata.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index ba66f9cb6ce9..119c83cf35ca 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -6,7 +6,7 @@
  * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
  * licence: BSD
  *
- * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.32 2006/12/08 19:50:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.36.2.1 2008/09/24 08:59:46 mha Exp $
  */
 #include "postgres_fe.h"
 
@@ -182,9 +182,6 @@ main(int argc, char *argv[])
 	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
 		   ControlFile.checkPointCopy.redo.xlogid,
 		   ControlFile.checkPointCopy.redo.xrecoff);
-	printf(_("Latest checkpoint's UNDO location:    %X/%X\n"),
-		   ControlFile.checkPointCopy.undo.xlogid,
-		   ControlFile.checkPointCopy.undo.xrecoff);
 	printf(_("Latest checkpoint's TimeLineID:       %u\n"),
 		   ControlFile.checkPointCopy.ThisTimeLineID);
 	printf(_("Latest checkpoint's NextXID:          %u/%u\n"),
@@ -221,6 +218,8 @@ main(int argc, char *argv[])
 		   ControlFile.nameDataLen);
 	printf(_("Maximum columns in an index:          %u\n"),
 		   ControlFile.indexMaxKeys);
+	printf(_("Maximum size of a TOAST chunk:        %u\n"),
+		   ControlFile.toast_max_chunk_size);
 	printf(_("Date/time type storage:               %s\n"),
 		   (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
 	printf(_("Maximum length of locale name:        %u\n"),
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index ee9b1e11d64b..42ff5f8a8c7b 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -24,7 +24,7 @@ LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses -lcurl -lssl
 
 
 
-override CPPFLAGS := -DFRONTEND -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS=	pg_ctl.o $(WIN32RES)
 
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 26fb0e5c7125..72278518659f 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,5 +1,5 @@
 # $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.18.2.1 2009/09/03 21:01:07 petere Exp $
 CATALOG_NAME	:= pg_ctl
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR ru sv ta tr
+AVAIL_LANGUAGES	:= cs de es fr it ko pt_BR ro ru sk sl sv ta tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_ctl.c ../../port/exec.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 0955e4faa210..38e7d757517e 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.6 2009/01/28 11:19:40 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.92.2.8 2009/11/14 15:39:41 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,7 @@
 #include "postgres_fe.h"
 #include "libpq-fe.h"
 
+#include <fcntl.h>
 #include <locale.h>
 #include <signal.h>
 #include <sys/types.h>
@@ -167,6 +168,9 @@ write_eventlog(int level, const char *line)
 {
 	static HANDLE evtHandle = INVALID_HANDLE_VALUE;
 
+	if (silent_mode && level == EVENTLOG_INFORMATION_TYPE)
+		return;
+
 	if (evtHandle == INVALID_HANDLE_VALUE)
 	{
 		evtHandle = RegisterEventSource(NULL, "PostgreSQL");
@@ -306,50 +310,84 @@ get_pgpid(void)
 static char **
 readfile(const char *path)
 {
-	FILE	   *infile;
-	int			maxlength = 0,
-				linelen = 0;
-	int			nlines = 0;
+	int			fd;
+	int			nlines;
 	char	  **result;
 	char	   *buffer;
-	int			c;
+	char	   *linebegin;
+	int			i;
+	int			n;
+	int			len;
+	struct stat	statbuf;
 
-	if ((infile = fopen(path, "r")) == NULL)
+	/*
+	 * Slurp the file into memory.
+	 *
+	 * The file can change concurrently, so we read the whole file into memory
+	 * with a single read() call. That's not guaranteed to get an atomic
+	 * snapshot, but in practice, for a small file, it's close enough for the
+	 * current use.
+	 */
+	fd = open(path, O_RDONLY | PG_BINARY, 0);
+	if (fd < 0)
 		return NULL;
+	if (fstat(fd, &statbuf) < 0)
+	{
+		close(fd);
+		return NULL;
+	}
+	if (statbuf.st_size == 0)
+	{
+		/* empty file */
+		close(fd);
+		result = (char **) pg_malloc(sizeof(char *));
+		*result = NULL;
+		return result;
+	}
+	buffer = pg_malloc(statbuf.st_size + 1);
 
-	/* pass over the file twice - the first time to size the result */
+	len = read(fd, buffer, statbuf.st_size + 1);
+	close(fd);
+	if (len != statbuf.st_size)
+	{
+		/* oops, the file size changed between fstat and read */
+		free(buffer);
+		return NULL;
+	}
 
-	while ((c = fgetc(infile)) != EOF)
+	/*
+	 * Count newlines. We expect there to be a newline after each full line,
+	 * including one at the end of file. If there isn't a newline at the end,
+	 * any characters after the last newline will be ignored.
+	 */
+	nlines = 0;
+	for (i = 0; i < len; i++)
 	{
-		linelen++;
-		if (c == '\n')
-		{
+		if (buffer[i] == '\n')
 			nlines++;
-			if (linelen > maxlength)
-				maxlength = linelen;
-			linelen = 0;
-		}
 	}
 
-	/* handle last line without a terminating newline (yuck) */
-	if (linelen)
-		nlines++;
-	if (linelen > maxlength)
-		maxlength = linelen;
-
-	/* set up the result and the line buffer */
+	/* set up the result buffer */
 	result = (char **) pg_malloc((nlines + 1) * sizeof(char *));
-	buffer = (char *) pg_malloc(maxlength + 1);
 
-	/* now reprocess the file and store the lines */
-	rewind(infile);
-	nlines = 0;
-	while (fgets(buffer, maxlength + 1, infile) != NULL)
-		result[nlines++] = xstrdup(buffer);
+	/* now split the buffer into lines */
+	linebegin = buffer;
+	n = 0;
+	for (i = 0; i < len; i++)
+	{
+		if (buffer[i] == '\n')
+		{
+			int		slen = &buffer[i] - linebegin + 1;
+			char   *linebuf = pg_malloc(slen + 1);
+			memcpy(linebuf, linebegin, slen);
+			linebuf[slen] = '\0';
+			result[n++] = linebuf;
+			linebegin = &buffer[i + 1];
+		}
+	}
+	result[n] = NULL;
 
-	fclose(infile);
 	free(buffer);
-	result[nlines] = NULL;
 
 	return result;
 }
@@ -676,7 +714,7 @@ read_post_opts(void)
 					post_opts = arg1 + 1; /* point past whitespace */
 				}
 				else
-                    post_opts = "";
+					post_opts = "";
 				if (postgres_path == NULL)
 					postgres_path = optline;
 			}
@@ -1335,7 +1373,7 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR * argv)
 
 	memset(&pi, 0, sizeof(pi));
 
-        read_post_opts();
+	read_post_opts();
 
 	/* Register the control request handler */
 	if ((hStatus = RegisterServiceCtrlHandler(register_servicename, pgwin32_ServiceHandler)) == (SERVICE_STATUS_HANDLE) 0)
@@ -1360,8 +1398,8 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR * argv)
 		write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Waiting for server startup...\n"));
 		if (test_postmaster_connection(true) != PQPING_OK)
 		{
-                	write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Timed out waiting for server startup\n"));
- 			pgwin32_SetServiceStatus(SERVICE_STOPPED);
+			write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Timed out waiting for server startup\n"));
+			pgwin32_SetServiceStatus(SERVICE_STOPPED);
 			return;
 		}
 		write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Server started and accepting connections\n"));
@@ -1371,7 +1409,7 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR * argv)
 	 * Save the checkpoint value as it might have been incremented in
 	 * test_postmaster_connection
 	 */
-        check_point_start = status.dwCheckPoint;
+	check_point_start = status.dwCheckPoint;
 
 	pgwin32_SetServiceStatus(SERVICE_RUNNING);
 
@@ -1529,6 +1567,10 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION * processInfo, bool as_se
 		return 0;
 	}
 
+#ifndef __CYGWIN__
+    AddUserToTokenDacl(restrictedToken);
+#endif
+
 	r = CreateProcessAsUser(restrictedToken, NULL, cmd, NULL, NULL, TRUE, CREATE_SUSPENDED, NULL, NULL, &si, processInfo);
 
 	Kernel32Handle = LoadLibrary("KERNEL32.DLL");
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index beb17247fda9..6fa00832c6a7 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.63 2007/01/05 22:19:48 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.65 2008/01/01 19:45:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,6 @@ subdir = src/bin/pg_dump
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-ifneq ($(PORTNAME), win32)
-override CFLAGS += $(PTHREAD_CFLAGS) -pthread -Wno-error
-endif
-
 # The frontend doesn't need everything that's in LIBS, some are backend only
 LIBS := $(filter-out -lresolv, $(LIBS))
 # This program isn't interactive, so doesn't need these
@@ -25,7 +21,7 @@ LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses -lcurl -lssl
 
 
 # the use of tempnam in pg_backup_tar.c causes a warning when using newer versions of GCC
-override CPPFLAGS := -Wno-deprecated-declarations -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -Wno-deprecated-declarations -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS=	pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
 	pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
diff --git a/src/bin/pg_dump/cdb/cdb_backup_archiver.c b/src/bin/pg_dump/cdb/cdb_backup_archiver.c
index 3ad186c704a7..67bf8601f1d7 100644
--- a/src/bin/pg_dump/cdb/cdb_backup_archiver.c
+++ b/src/bin/pg_dump/cdb/cdb_backup_archiver.c
@@ -415,12 +415,12 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 						if (te->copyStmt && strlen(te->copyStmt) > 0)
 						{
 							ahprintf(AH, "%s", te->copyStmt);
-							AH->writingCopyData = true;
+							AH->outputKind = OUTPUT_COPYDATA;
 						}
 
 						(*AH->PrintTocDataPtr) (AH, te, ropt);
 
-						AH->writingCopyData = false;
+						AH->outputKind = OUTPUT_OTHERDATA;
 
 						_enableTriggersIfNecessary(AH, te, ropt);
 					}
@@ -1770,8 +1770,7 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
 	AH->mode = mode;
 	AH->compression = compression;
 
-	AH->pgCopyBuf = createPQExpBuffer();
-	AH->sqlBuf = createPQExpBuffer();
+	memset(&(AH->sqlparse), 0, sizeof(AH->sqlparse));
 
 	/* Open stdout with no compression for AH output handle */
 	AH->gzOut = 0;
diff --git a/src/bin/pg_dump/cdb/cdb_dump_agent.c b/src/bin/pg_dump/cdb/cdb_dump_agent.c
index 7599bbd61018..dfab49df882f 100644
--- a/src/bin/pg_dump/cdb/cdb_dump_agent.c
+++ b/src/bin/pg_dump/cdb/cdb_dump_agent.c
@@ -220,6 +220,10 @@ static void dumpSequence(Archive *fout, TableInfo *tbinfo);
 static void dumpIndex(Archive *fout, IndxInfo *indxinfo);
 static void dumpConstraint(Archive *fout, ConstraintInfo *coninfo);
 static void dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo);
+static void dumpTSParser(Archive *fout, TSParserInfo *prsinfo);
+static void dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo);
+static void dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo);
+static void dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo);
 
 static void dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
 		const char *type, const char *name,
@@ -242,6 +246,7 @@ static char *format_table_function_columns(FuncInfo *finfo, int nallargs,
 							  char **argnames);
 static const char *convertRegProcReference(const char *proc);
 static const char *convertOperatorReference(const char *opr);
+static const char *convertTSFunction(Oid funcOid);
 static char *getFormattedTypeName(Oid oid, OidOptions opts);
 static bool hasBlobs(Archive *AH);
 static int	dumpBlobs(Archive *AH, void *arg __attribute__((unused)));
@@ -1215,6 +1220,12 @@ dumpMain(bool oids, const char *dumpencoding, int outputBlobs, int plainText, Re
 
 	g_gp_supportsAttributeEncoding = testAttributeEncodingSupport();
 
+	/* Let cdb_dump_include functions know whether to include full text */
+	g_gp_supportsFullText = g_fout->remoteVersion >= 80300;
+
+	/* Let cdb_dump_include functions know whether to handle lanowner col */
+	g_gp_supportsLanOwner = g_fout->remoteVersion >= 80300;
+
 	/*
 	 * Process the schema and table include/exclude lists and develop a list
 	 * of table oids to be included in the dump.
@@ -2611,8 +2622,20 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj)
 			if (!postDataSchemaOnly)
 			dumpTableData(fout, (TableDataInfo *) dobj);
 			break;
-		case DO_TABLE_TYPE:
-			/* table rowtypes are never dumped separately */
+		case DO_DUMMY_TYPE:
+			/* table rowtypes and array types are never dumped separately */
+			break;
+		case DO_TSPARSER:
+			dumpTSParser(fout, (TSParserInfo *) dobj);
+			break;
+		case DO_TSDICT:
+			dumpTSDictionary(fout, (TSDictInfo *) dobj);
+			break;
+		case DO_TSTEMPLATE:
+			dumpTSTemplate(fout, (TSTemplateInfo *) dobj);
+			break;
+		case DO_TSCONFIG:
+			dumpTSConfig(fout, (TSConfigInfo *) dobj);
 			break;
 		case DO_BLOBS:
 			if (!postDataSchemaOnly)
@@ -4448,6 +4471,42 @@ convertOperatorReference(const char *opr)
 	return oname;
 }
 
+/*
+ * Convert a function OID obtained from pg_ts_parser or pg_ts_template
+ *
+ * It is sufficient to use REGPROC rather than REGPROCEDURE, since the
+ * argument lists of these functions are predetermined.  Note that the
+ * caller should ensure we are in the proper schema, because the results
+ * are search path dependent!
+ */
+static const char *
+convertTSFunction(Oid funcOid)
+{
+	char	   *result;
+	char		query[128];
+	PGresult   *res;
+	int			ntups;
+
+	snprintf(query, sizeof(query),
+			 "SELECT '%u'::pg_catalog.regproc", funcOid);
+	res = PQexec(g_conn, query);
+	check_sql_result(res, g_conn, query, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	if (ntups != 1)
+	{
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+				  ntups, query);
+		exit_nicely();
+	}
+
+	result = strdup(PQgetvalue(res, 0, 0));
+
+	PQclear(res);
+
+	return result;
+}
+
 /*
  * dumpOpclass
  *	  write out a single operator class definition
@@ -5466,6 +5525,348 @@ dumpExtProtocol(Archive *fout, ExtProtInfo *ptcinfo)
 			free (protoFuncs[i].name);
 }
 
+/*
+ * dumpTSParser
+ *	  write out a single text search parser
+ */
+static void
+dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+
+	/* Skip if not to be dumped */
+	if (!prsinfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(prsinfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH PARSER %s (\n",
+					  fmtId(prsinfo->dobj.name));
+
+	appendPQExpBuffer(q, "    START = %s,\n",
+					  convertTSFunction(prsinfo->prsstart));
+	appendPQExpBuffer(q, "    GETTOKEN = %s,\n",
+					  convertTSFunction(prsinfo->prstoken));
+	appendPQExpBuffer(q, "    END = %s,\n",
+					  convertTSFunction(prsinfo->prsend));
+	if (prsinfo->prsheadline != InvalidOid)
+		appendPQExpBuffer(q, "    HEADLINE = %s,\n",
+						  convertTSFunction(prsinfo->prsheadline));
+	appendPQExpBuffer(q, "    LEXTYPES = %s );\n",
+					  convertTSFunction(prsinfo->prslextype));
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH PARSER %s",
+					  fmtId(prsinfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(prsinfo->dobj.name));
+
+	ArchiveEntry(fout, prsinfo->dobj.catId, prsinfo->dobj.dumpId,
+				 prsinfo->dobj.name,
+				 prsinfo->dobj.namespace->dobj.name,
+				 NULL,
+				 "",
+				 false, "TEXT SEARCH PARSER", q->data, delq->data, NULL,
+				 prsinfo->dobj.dependencies, prsinfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Parser Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH PARSER %s",
+					  fmtId(prsinfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, "",
+				prsinfo->dobj.catId, 0, prsinfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+}
+
+/*
+ * dumpTSDictionary
+ *	  write out a single text search dictionary
+ */
+static void
+dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+	PQExpBuffer query;
+	PGresult   *res;
+	int			ntups;
+	char	   *nspname;
+	char	   *tmplname;
+
+	/* Skip if not to be dumped */
+	if (!dictinfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+	query = createPQExpBuffer();
+
+	/* Fetch name and namespace of the dictionary's template */
+	selectSourceSchema("pg_catalog");
+	appendPQExpBuffer(query, "SELECT nspname, tmplname "
+					  "FROM pg_ts_template p, pg_namespace n "
+					  "WHERE p.oid = '%u' AND n.oid = tmplnamespace",
+					  dictinfo->dicttemplate);
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+	ntups = PQntuples(res);
+	if (ntups != 1)
+	{
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+				  ntups, query->data);
+		exit_nicely();
+	}
+	nspname = PQgetvalue(res, 0, 0);
+	tmplname = PQgetvalue(res, 0, 1);
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(dictinfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH DICTIONARY %s (\n",
+					  fmtId(dictinfo->dobj.name));
+
+	appendPQExpBuffer(q, "    TEMPLATE = ");
+	if (strcmp(nspname, dictinfo->dobj.namespace->dobj.name) != 0)
+		appendPQExpBuffer(q, "%s.", fmtId(nspname));
+	appendPQExpBuffer(q, "%s", fmtId(tmplname));
+
+	PQclear(res);
+
+	/* the dictinitoption can be dumped straight into the command */
+	if (dictinfo->dictinitoption)
+		appendPQExpBuffer(q, ",\n    %s", dictinfo->dictinitoption);
+
+	appendPQExpBuffer(q, " );\n");
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH DICTIONARY %s",
+					  fmtId(dictinfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(dictinfo->dobj.name));
+
+	ArchiveEntry(fout, dictinfo->dobj.catId, dictinfo->dobj.dumpId,
+				 dictinfo->dobj.name,
+				 dictinfo->dobj.namespace->dobj.name,
+				 NULL,
+				 dictinfo->rolname,
+				 false, "TEXT SEARCH DICTIONARY", q->data, delq->data, NULL,
+				 dictinfo->dobj.dependencies, dictinfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Dictionary Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH DICTIONARY %s",
+					  fmtId(dictinfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, dictinfo->rolname,
+				dictinfo->dobj.catId, 0, dictinfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+	destroyPQExpBuffer(query);
+}
+
+/*
+ * dumpTSTemplate
+ *	  write out a single text search template
+ */
+static void
+dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+
+	/* Skip if not to be dumped */
+	if (!tmplinfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(tmplinfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH TEMPLATE %s (\n",
+					  fmtId(tmplinfo->dobj.name));
+
+	if (tmplinfo->tmplinit != InvalidOid)
+		appendPQExpBuffer(q, "    INIT = %s,\n",
+						  convertTSFunction(tmplinfo->tmplinit));
+	appendPQExpBuffer(q, "    LEXIZE = %s );\n",
+					  convertTSFunction(tmplinfo->tmpllexize));
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH TEMPLATE %s",
+					  fmtId(tmplinfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(tmplinfo->dobj.name));
+
+	ArchiveEntry(fout, tmplinfo->dobj.catId, tmplinfo->dobj.dumpId,
+				 tmplinfo->dobj.name,
+				 tmplinfo->dobj.namespace->dobj.name,
+				 NULL,
+				 "",
+				 false, "TEXT SEARCH TEMPLATE", q->data, delq->data, NULL,
+				 tmplinfo->dobj.dependencies, tmplinfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Template Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH TEMPLATE %s",
+					  fmtId(tmplinfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, "",
+				tmplinfo->dobj.catId, 0, tmplinfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+}
+
+/*
+ * dumpTSConfig
+ *	  write out a single text search configuration
+ */
+static void
+dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+	PQExpBuffer query;
+	PGresult   *res;
+	char	   *nspname;
+	char	   *prsname;
+	int			ntups,
+				i;
+	int			i_tokenname;
+	int			i_dictname;
+
+	/* Skip if not to be dumped */
+	if (!cfginfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+	query = createPQExpBuffer();
+
+	/* Fetch name and namespace of the config's parser */
+	selectSourceSchema("pg_catalog");
+	appendPQExpBuffer(query, "SELECT nspname, prsname "
+					  "FROM pg_ts_parser p, pg_namespace n "
+					  "WHERE p.oid = '%u' AND n.oid = prsnamespace",
+					  cfginfo->cfgparser);
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+	ntups = PQntuples(res);
+	if (ntups != 1)
+	{
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+				  ntups, query->data);
+		exit_nicely();
+	}
+	nspname = PQgetvalue(res, 0, 0);
+	prsname = PQgetvalue(res, 0, 1);
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(cfginfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH CONFIGURATION %s (\n",
+					  fmtId(cfginfo->dobj.name));
+
+	appendPQExpBuffer(q, "    PARSER = ");
+	if (strcmp(nspname, cfginfo->dobj.namespace->dobj.name) != 0)
+		appendPQExpBuffer(q, "%s.", fmtId(nspname));
+	appendPQExpBuffer(q, "%s );\n", fmtId(prsname));
+
+	PQclear(res);
+
+	resetPQExpBuffer(query);
+	appendPQExpBuffer(query,
+					  "SELECT \n"
+					  "  ( SELECT alias FROM pg_catalog.ts_token_type('%u'::pg_catalog.oid) AS t \n"
+					  "    WHERE t.tokid = m.maptokentype ) AS tokenname, \n"
+					  "  m.mapdict::pg_catalog.regdictionary AS dictname \n"
+					  "FROM pg_catalog.pg_ts_config_map AS m \n"
+					  "WHERE m.mapcfg = '%u' \n"
+					  "ORDER BY m.mapcfg, m.maptokentype, m.mapseqno",
+					  cfginfo->cfgparser, cfginfo->dobj.catId.oid);
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+	ntups = PQntuples(res);
+
+	i_tokenname = PQfnumber(res, "tokenname");
+	i_dictname = PQfnumber(res, "dictname");
+
+	for (i = 0; i < ntups; i++)
+	{
+		char	   *tokenname = PQgetvalue(res, i, i_tokenname);
+		char	   *dictname = PQgetvalue(res, i, i_dictname);
+
+		if (i == 0 ||
+			strcmp(tokenname, PQgetvalue(res, i - 1, i_tokenname)) != 0)
+		{
+			/* starting a new token type, so start a new command */
+			if (i > 0)
+				appendPQExpBuffer(q, ";\n");
+			appendPQExpBuffer(q, "\nALTER TEXT SEARCH CONFIGURATION %s\n",
+							  fmtId(cfginfo->dobj.name));
+			/* tokenname needs quoting, dictname does NOT */
+			appendPQExpBuffer(q, "    ADD MAPPING FOR %s WITH %s",
+							  fmtId(tokenname), dictname);
+		}
+		else
+			appendPQExpBuffer(q, ", %s", dictname);
+	}
+
+	if (ntups > 0)
+		appendPQExpBuffer(q, ";\n");
+
+	PQclear(res);
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH CONFIGURATION %s",
+					  fmtId(cfginfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(cfginfo->dobj.name));
+
+	ArchiveEntry(fout, cfginfo->dobj.catId, cfginfo->dobj.dumpId,
+				 cfginfo->dobj.name,
+				 cfginfo->dobj.namespace->dobj.name,
+				 NULL,
+				 cfginfo->rolname,
+			   false, "TEXT SEARCH CONFIGURATION", q->data, delq->data, NULL,
+				 cfginfo->dobj.dependencies, cfginfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Configuration Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH CONFIGURATION %s",
+					  fmtId(cfginfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, cfginfo->rolname,
+				cfginfo->dobj.catId, 0, cfginfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+	destroyPQExpBuffer(query);
+}
 /*----------
  * Write out grant/revoke information
  *
@@ -5658,7 +6059,7 @@ dumpExternal(TableInfo *tbinfo, PQExpBuffer query, PQExpBuffer q, PQExpBuffer de
 		for (j = 0; j < tbinfo->numatts; j++)
 		{
 			/* Is this one of the table's own attrs, and not dropped ? */
-			if (!tbinfo->inhAttrs[j] && !tbinfo->attisdropped[j])
+			if (tbinfo->attislocal[j] && !tbinfo->attisdropped[j])
 			{
 				/* Format properly if not first attr */
 				if (actual_atts > 0)
@@ -5962,7 +6363,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		for (j = 0; j < tbinfo->numatts; j++)
 		{
 			/* Is this one of the table's own attrs, and not dropped ? */
-			if (!tbinfo->inhAttrs[j] && !tbinfo->attisdropped[j])
+			if (tbinfo->attislocal[j] && !tbinfo->attisdropped[j])
 			{
 				/* Format properly if not first attr */
 				if (actual_atts > 0)
@@ -6013,7 +6414,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		for (j = 0; j < tbinfo->numatts; j++)
 		{
 			/* Is this one of the table's own attrs, and not dropped ? */
-			if (!tbinfo->inhAttrs[j] && !tbinfo->attisdropped[j])
+			if (tbinfo->attislocal[j] && !tbinfo->attisdropped[j])
 			{
 				/* Format properly if not first attr */
 				if (actual_atts > 0)
@@ -6033,7 +6434,6 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 				 * and not to be printed separately.
 				 */
 				if (tbinfo->attrdefs[j] != NULL &&
-					!tbinfo->inhAttrDef[j] &&
 					!tbinfo->attrdefs[j]->separate)
 					appendPQExpBuffer(q, " DEFAULT %s",
 									  tbinfo->attrdefs[j]->adef_expr);
@@ -6387,10 +6787,6 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
 	if (!tbinfo->dobj.dump || !adinfo->separate || dataOnly)
 		return;
 
-	/* Don't print inherited defaults, either */
-	if (tbinfo->inhAttrDef[adnum - 1])
-		return;
-
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
 
diff --git a/src/bin/pg_dump/cdb/cdb_dump_include.c b/src/bin/pg_dump/cdb/cdb_dump_include.c
index 7b030052a45a..0ef8314c5cca 100644
--- a/src/bin/pg_dump/cdb/cdb_dump_include.c
+++ b/src/bin/pg_dump/cdb/cdb_dump_include.c
@@ -66,8 +66,18 @@ bool		g_gp_supportsOpfamilies = true;
 /*
  * Indicates whether or not the GPDB cluster supports column attributes.
  */
-bool g_gp_supportsAttributeEncoding = false;
+bool		g_gp_supportsAttributeEncoding = false;
 
+/*
+ * Indicates whether or not the GPDB cluster supports full text search
+ */
+bool		g_gp_supportsFullText = false;
+
+/*
+ * Indicates whether or not the GPDB cluster supports languages owned by
+ * other than OID 10.
+ */
+bool		g_gp_supportsLanOwner = false;
 
 /*
  * When true, indicates that only the MPP schema is being dumped.
@@ -911,16 +921,6 @@ getTypes(int *numTypes)
 		tinfo[i].typtype = *PQgetvalue(res, i, i_typtype);
 		tinfo[i].shellType = NULL;
 
-		/*
-		 * If it's a table's rowtype, use special type code to facilitate
-		 * sorting into the desired order.	(We don't want to consider it an
-		 * ordinary type because that would bring the table up into the
-		 * datatype part of the dump order.)
-		 */
-		if (OidIsValid(tinfo[i].typrelid) &&
-			tinfo[i].typrelkind != RELKIND_COMPOSITE_TYPE)
-			tinfo[i].dobj.objType = DO_TABLE_TYPE;
-
 		/*
 		 * check for user-defined array types, omit system generated ones
 		 */
@@ -2442,13 +2442,28 @@ getProcLangs(int *numProcLangs)
 	/* Make sure we are in proper schema */
 	selectSourceSchema("pg_catalog");
 
-	/* Languages are owned by the bootstrap superuser, OID 10 */
-	appendPQExpBuffer(query, "SELECT tableoid, oid, *, "
-					  "(%s '10') as lanowner "
-					  "FROM pg_language "
-					  "WHERE lanispl "
-					  "ORDER BY oid",
-					  username_subquery);
+	if (g_gp_supportsLanOwner)
+	{
+		/* pg_language has a lanowner column */
+		appendPQExpBuffer(query, "SELECT tableoid, oid, "
+						  "lanname, lanpltrusted, lanplcallfoid, "
+						  "lanvalidator,  lanacl, "
+						  "(%s lanowner) as lanowner "
+						  "FROM pg_language "
+						  "WHERE lanispl "
+						  "ORDER BY oid",
+						  username_subquery);
+	}
+	else
+	{
+		/* Languages are owned by the bootstrap superuser, OID 10 */
+		appendPQExpBuffer(query, "SELECT tableoid, oid, *, "
+						  "(%s '10') as lanowner "
+						  "FROM pg_language "
+						  "WHERE lanispl "
+						  "ORDER BY oid",
+						  username_subquery);
+	}
 
 	res = PQexec(g_conn, query->data);
 	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
@@ -2748,8 +2763,6 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 		tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
-		tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool));
-		tbinfo->inhAttrDef = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->inhNotNull = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attencoding = (char **)malloc(ntups * sizeof(char *));
 		hasdefaults = false;
@@ -2774,9 +2787,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 			tbinfo->attrdefs[j] = NULL; /* fix below */
 			if (PQgetvalue(res, j, i_atthasdef)[0] == 't')
 				hasdefaults = true;
+
 			/* these flags will be set in flagInhAttrs() */
-			tbinfo->inhAttrs[j] = false;
-			tbinfo->inhAttrDef[j] = false;
 			tbinfo->inhNotNull[j] = false;
 
 			/* column storage attributes */
@@ -2949,6 +2961,343 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 	destroyPQExpBuffer(q);
 }
 
+/*
+ * Test whether a column should be printed as part of table's CREATE TABLE.
+ * Column number is zero-based.
+ *
+ * Normally this is always true, but it's false for dropped columns, as well
+ * as those that were inherited without any local definition.  (If we print
+ * such a column it will mistakenly get pg_attribute.attislocal set to true.)
+ *
+ * This function exists because there are scattered nonobvious places that
+ * must be kept in sync with this decision.
+ */
+bool
+shouldPrintColumn(TableInfo *tbinfo, int colno)
+{
+	return (tbinfo->attislocal[colno] && !tbinfo->attisdropped[colno]);
+}
+
+/*
+ * getTSParsers:
+ *	  read all text search parsers in the system catalogs and return them
+ *	  in the TSParserInfo* structure
+ *
+ *	numTSParsers is set to the number of parsers read in
+ */
+TSParserInfo *
+getTSParsers(int *numTSParsers)
+{
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSParserInfo *prsinfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_prsname;
+	int			i_prsnamespace;
+	int			i_prsstart;
+	int			i_prstoken;
+	int			i_prsend;
+	int			i_prsheadline;
+	int			i_prslextype;
+
+	/* Before 8.3, there is no built-in text search support */
+	if (!g_gp_supportsFullText)
+	{
+		*numTSParsers = 0;
+		return NULL;
+	}
+
+	/*
+	 * find all text search objects, including builtin ones; we filter out
+	 * system-defined objects at dump-out time.
+	 */
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
+
+	appendPQExpBuffer(query, "SELECT tableoid, oid, prsname, prsnamespace, "
+					  "prsstart::oid, prstoken::oid, "
+					  "prsend::oid, prsheadline::oid, prslextype::oid "
+					  "FROM pg_ts_parser");
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSParsers = ntups;
+
+	prsinfo = (TSParserInfo *) malloc(ntups * sizeof(TSParserInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_prsname = PQfnumber(res, "prsname");
+	i_prsnamespace = PQfnumber(res, "prsnamespace");
+	i_prsstart = PQfnumber(res, "prsstart");
+	i_prstoken = PQfnumber(res, "prstoken");
+	i_prsend = PQfnumber(res, "prsend");
+	i_prsheadline = PQfnumber(res, "prsheadline");
+	i_prslextype = PQfnumber(res, "prslextype");
+
+	for (i = 0; i < ntups; i++)
+	{
+		prsinfo[i].dobj.objType = DO_TSPARSER;
+		prsinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		prsinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&prsinfo[i].dobj);
+		prsinfo[i].dobj.name = strdup(PQgetvalue(res, i, i_prsname));
+		prsinfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_prsnamespace)),
+												  prsinfo[i].dobj.catId.oid);
+		prsinfo[i].prsstart = atooid(PQgetvalue(res, i, i_prsstart));
+		prsinfo[i].prstoken = atooid(PQgetvalue(res, i, i_prstoken));
+		prsinfo[i].prsend = atooid(PQgetvalue(res, i, i_prsend));
+		prsinfo[i].prsheadline = atooid(PQgetvalue(res, i, i_prsheadline));
+		prsinfo[i].prslextype = atooid(PQgetvalue(res, i, i_prslextype));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(prsinfo[i].dobj));
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return prsinfo;
+}
+
+/*
+ * getTSDictionaries:
+ *	  read all text search dictionaries in the system catalogs and return them
+ *	  in the TSDictInfo* structure
+ *
+ *	numTSDicts is set to the number of dictionaries read in
+ */
+TSDictInfo *
+getTSDictionaries(int *numTSDicts)
+{
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSDictInfo *dictinfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_dictname;
+	int			i_dictnamespace;
+	int			i_rolname;
+	int			i_dicttemplate;
+	int			i_dictinitoption;
+
+	/* Before 8.3, there is no built-in text search support */
+	if (!g_gp_supportsFullText)
+	{
+		*numTSDicts = 0;
+		return NULL;
+	}
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
+
+	appendPQExpBuffer(query, "SELECT tableoid, oid, dictname, "
+					  "dictnamespace, (%s dictowner) as rolname, "
+					  "dicttemplate, dictinitoption "
+					  "FROM pg_ts_dict",
+					  username_subquery);
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSDicts = ntups;
+
+	dictinfo = (TSDictInfo *) malloc(ntups * sizeof(TSDictInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_dictname = PQfnumber(res, "dictname");
+	i_dictnamespace = PQfnumber(res, "dictnamespace");
+	i_rolname = PQfnumber(res, "rolname");
+	i_dictinitoption = PQfnumber(res, "dictinitoption");
+	i_dicttemplate = PQfnumber(res, "dicttemplate");
+
+	for (i = 0; i < ntups; i++)
+	{
+		dictinfo[i].dobj.objType = DO_TSDICT;
+		dictinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		dictinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&dictinfo[i].dobj);
+		dictinfo[i].dobj.name = strdup(PQgetvalue(res, i, i_dictname));
+		dictinfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_dictnamespace)),
+												 dictinfo[i].dobj.catId.oid);
+		dictinfo[i].rolname = strdup(PQgetvalue(res, i, i_rolname));
+		dictinfo[i].dicttemplate = atooid(PQgetvalue(res, i, i_dicttemplate));
+		if (PQgetisnull(res, i, i_dictinitoption))
+			dictinfo[i].dictinitoption = NULL;
+		else
+			dictinfo[i].dictinitoption = strdup(PQgetvalue(res, i, i_dictinitoption));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(dictinfo[i].dobj));
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return dictinfo;
+}
+
+/*
+ * getTSTemplates:
+ *	  read all text search templates in the system catalogs and return them
+ *	  in the TSTemplateInfo* structure
+ *
+ *	numTSTemplates is set to the number of templates read in
+ */
+TSTemplateInfo *
+getTSTemplates(int *numTSTemplates)
+{
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSTemplateInfo *tmplinfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_tmplname;
+	int			i_tmplnamespace;
+	int			i_tmplinit;
+	int			i_tmpllexize;
+
+	/* Before 8.3, there is no built-in text search support */
+	if (!g_gp_supportsFullText)
+	{
+		*numTSTemplates = 0;
+		return NULL;
+	}
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
+
+	appendPQExpBuffer(query, "SELECT tableoid, oid, tmplname, "
+					  "tmplnamespace, tmplinit::oid, tmpllexize::oid "
+					  "FROM pg_ts_template");
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSTemplates = ntups;
+
+	tmplinfo = (TSTemplateInfo *) malloc(ntups * sizeof(TSTemplateInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_tmplname = PQfnumber(res, "tmplname");
+	i_tmplnamespace = PQfnumber(res, "tmplnamespace");
+	i_tmplinit = PQfnumber(res, "tmplinit");
+	i_tmpllexize = PQfnumber(res, "tmpllexize");
+
+	for (i = 0; i < ntups; i++)
+	{
+		tmplinfo[i].dobj.objType = DO_TSTEMPLATE;
+		tmplinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		tmplinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&tmplinfo[i].dobj);
+		tmplinfo[i].dobj.name = strdup(PQgetvalue(res, i, i_tmplname));
+		tmplinfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_tmplnamespace)),
+												 tmplinfo[i].dobj.catId.oid);
+		tmplinfo[i].tmplinit = atooid(PQgetvalue(res, i, i_tmplinit));
+		tmplinfo[i].tmpllexize = atooid(PQgetvalue(res, i, i_tmpllexize));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(tmplinfo[i].dobj));
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return tmplinfo;
+}
+
+/*
+ * getTSConfigurations:
+ *	  read all text search configurations in the system catalogs and return
+ *	  them in the TSConfigInfo* structure
+ *
+ *	numTSConfigs is set to the number of configurations read in
+ */
+TSConfigInfo *
+getTSConfigurations(int *numTSConfigs)
+{
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSConfigInfo *cfginfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_cfgname;
+	int			i_cfgnamespace;
+	int			i_rolname;
+	int			i_cfgparser;
+
+	/* Before 8.3, there is no built-in text search support */
+	if (!g_gp_supportsFullText)
+	{
+		*numTSConfigs = 0;
+		return NULL;
+	}
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
+
+	appendPQExpBuffer(query, "SELECT tableoid, oid, cfgname, "
+					  "cfgnamespace, (%s cfgowner) as rolname, cfgparser "
+					  "FROM pg_ts_config",
+					  username_subquery);
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSConfigs = ntups;
+
+	cfginfo = (TSConfigInfo *) malloc(ntups * sizeof(TSConfigInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_cfgname = PQfnumber(res, "cfgname");
+	i_cfgnamespace = PQfnumber(res, "cfgnamespace");
+	i_rolname = PQfnumber(res, "rolname");
+	i_cfgparser = PQfnumber(res, "cfgparser");
+
+	for (i = 0; i < ntups; i++)
+	{
+		cfginfo[i].dobj.objType = DO_TSCONFIG;
+		cfginfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		cfginfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&cfginfo[i].dobj);
+		cfginfo[i].dobj.name = strdup(PQgetvalue(res, i, i_cfgname));
+		cfginfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_cfgnamespace)),
+												  cfginfo[i].dobj.catId.oid);
+		cfginfo[i].rolname = strdup(PQgetvalue(res, i, i_rolname));
+		cfginfo[i].cfgparser = atooid(PQgetvalue(res, i, i_cfgparser));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(cfginfo[i].dobj));
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return cfginfo;
+}
+
 bool
 testExtProtocolSupport(void)
 {
diff --git a/src/bin/pg_dump/cdb/cdb_dump_include.h b/src/bin/pg_dump/cdb/cdb_dump_include.h
index be81002728a0..6ba4a034ebd3 100644
--- a/src/bin/pg_dump/cdb/cdb_dump_include.h
+++ b/src/bin/pg_dump/cdb/cdb_dump_include.h
@@ -64,6 +64,16 @@ extern bool g_gp_supportsOpfamilies;
  */
 extern bool g_gp_supportsAttributeEncoding;
 
+/*
+ * Indicates whether or not the GPDB cluster supports full text search
+ */
+extern bool g_gp_supportsFullText;
+
+/*
+ * Indicates whether or not the GPDB cluster supports languages owned by
+ * other than OID 10.
+ */
+extern bool g_gp_supportsLanOwner;
 
 /*
  * Indicates whether or not the GPDB cluster supports SQL/MED.
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 8b8c44f85093..5ff8fe152fa8 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.96 2007/01/23 17:54:50 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.102 2008/01/01 19:45:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,18 +42,29 @@ static int	numCatalogIds = 0;
 
 /*
  * These variables are static to avoid the notational cruft of having to pass
- * them into findTableByOid() and friends.
+ * them into findTableByOid() and friends.	For each of these arrays, we
+ * build a sorted-by-OID index array immediately after it's built, and then
+ * we use binary search in findTableByOid() and friends.  (qsort'ing the base
+ * arrays themselves would be simpler, but it doesn't work because pg_dump.c
+ * may have already established pointers between items.)
  */
 static TableInfo *tblinfo;
 static TypeInfo *typinfo;
 static TypeStorageOptions *typestorageoptions;
 static FuncInfo *funinfo;
 static OprInfo *oprinfo;
+static NamespaceInfo *nspinfo;
 static int	numTables;
 static int	numTypes;
 static int  numTypeStorageOptions;
 static int	numFuncs;
 static int	numOperators;
+static int	numNamespaces;
+static DumpableObject **tblinfoindex;
+static DumpableObject **typinfoindex;
+static DumpableObject **funinfoindex;
+static DumpableObject **oprinfoindex;
+static DumpableObject **nspinfoindex;
 
 bool is_gpdump = false; /* determines whether to print extra logging messages in getSchemaData */
 
@@ -61,6 +72,8 @@ static void flagInhTables(TableInfo *tbinfo, int numTables,
 			  InhInfo *inhinfo, int numInherits);
 static void flagInhAttrs(TableInfo *tbinfo, int numTables,
 			 InhInfo *inhinfo, int numInherits);
+static DumpableObject **buildIndexArray(void *objArray, int numObjs,
+				Size objSize);
 static int	DOCatalogIdCompare(const void *p1, const void *p2);
 static void findParentsByOid(TableInfo *self,
 				 InhInfo *inhinfo, int numInherits);
@@ -76,7 +89,6 @@ void		reset(void);
 TableInfo *
 getSchemaData(int *numTablesPtr, int g_role)
 {
-	NamespaceInfo *nsinfo;
 	AggInfo    *agginfo;
 	InhInfo    *inhinfo;
 	RuleInfo   *ruleinfo;
@@ -86,7 +98,10 @@ getSchemaData(int *numTablesPtr, int g_role)
 	OpfamilyInfo *opfinfo;
 	ConvInfo   *convinfo;
 	ExtProtInfo *ptcinfo;
-	int			numNamespaces;
+	TSParserInfo *prsinfo;
+	TSTemplateInfo *tmplinfo;
+	TSDictInfo *dictinfo;
+	TSConfigInfo *cfginfo;
 	int			numAggregates;
 	int			numInherits;
 	int			numRules;
@@ -96,102 +111,138 @@ getSchemaData(int *numTablesPtr, int g_role)
 	int			numOpfamilies;
 	int			numConversions;
 	int			numExtProtocols;
+	int			numTSParsers;
+	int			numTSTemplates;
+	int			numTSDicts;
+	int			numTSConfigs;
 	const char *LOGGER_INFO = "INFO";
 
-	//write_msg(NULL, "reading schemas\n");
-	if(is_gpdump || g_verbose)
+	if (is_gpdump || g_verbose)
 		status_log_msg(LOGGER_INFO, progname, "reading schemas\n");
-	nsinfo = getNamespaces(&numNamespaces);
+	nspinfo = getNamespaces(&numNamespaces);
+	nspinfoindex = buildIndexArray(nspinfo, numNamespaces, sizeof(NamespaceInfo));
 
-	if(g_role == 1) // ROLE_MASTER
+	/*
+	 * getTables should be done as soon as possible, so as to minimize the
+	 * window between starting our transaction and acquiring per-table locks.
+	 * However, we have to do getNamespaces first because the tables get
+	 * linked to their containing namespaces during getTables.
+	 */
+	if (g_verbose)
+		write_msg(NULL, "reading user-defined tables\n");
+	tblinfo = getTables(&numTables);
+	tblinfoindex = buildIndexArray(tblinfo, numTables, sizeof(TableInfo));
+
+	/*
+	 * ROLE_MASTER
+	 */
+	if (g_role == 1)
 	{
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading user-defined functions\n");
 		funinfo = getFuncs(&numFuncs);
+		funinfoindex = buildIndexArray(funinfo, numFuncs, sizeof(FuncInfo));
 
 		/* this must be after getFuncs */
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading user-defined types\n");
 		typinfo = getTypes(&numTypes);
+		typinfoindex = buildIndexArray(typinfo, numTypes, sizeof(TypeInfo));
 
 		/* this must be after getFuncs */
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading type storage options\n");
 		typestorageoptions = getTypeStorageOptions(&numTypeStorageOptions);
 
 		/* this must be after getFuncs, too */
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading procedural languages\n");
 		proclanginfo = getProcLangs(&numProcLangs);
 
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading user-defined aggregate functions\n");
 		agginfo = getAggregates(&numAggregates);
 
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading user-defined operators\n");
 		oprinfo = getOperators(&numOperators);
+		oprinfoindex = buildIndexArray(oprinfo, numOperators, sizeof(OprInfo));
 
 		if (testExtProtocolSupport())
 		{
-			if(is_gpdump || g_verbose)
+			if (is_gpdump || g_verbose)
 				status_log_msg(LOGGER_INFO, progname, "reading user-defined external protocols\n");
 			ptcinfo = getExtProtocols(&numExtProtocols);
 		}
 
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading user-defined operator classes\n");
 		opcinfo = getOpclasses(&numOpclasses);
 
+		if (is_gpdump || g_verbose)
+			write_msg(NULL, "reading user-defined text search parsers\n");
+		prsinfo = getTSParsers(&numTSParsers);
+
+		if (is_gpdump || g_verbose)
+			write_msg(NULL, "reading user-defined text search templates\n");
+		tmplinfo = getTSTemplates(&numTSTemplates);
+
+		if (is_gpdump || g_verbose)
+			write_msg(NULL, "reading user-defined text search dictionaries\n");
+		dictinfo = getTSDictionaries(&numTSDicts);
+
+		if (is_gpdump || g_verbose)
+			write_msg(NULL, "reading user-defined text search configurations\n");
+		cfginfo = getTSConfigurations(&numTSConfigs);
+
 		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading user-defined operator families\n");
 		opfinfo = getOpfamilies(&numOpfamilies);
 
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading user-defined conversions\n");
 		convinfo = getConversions(&numConversions);
 	}
 
-	if(is_gpdump || g_verbose)
-		status_log_msg(LOGGER_INFO, progname, "reading user-defined tables\n");
-	tblinfo = getTables(&numTables);
-
-	if(is_gpdump || g_verbose)
+	if (is_gpdump || g_verbose)
 		status_log_msg(LOGGER_INFO, progname, "reading table inheritance information\n");
 	inhinfo = getInherits(&numInherits);
 
-	if(is_gpdump || g_verbose)
+	if (is_gpdump || g_verbose)
 		status_log_msg(LOGGER_INFO, progname, "reading rewrite rules\n");
 	ruleinfo = getRules(&numRules);
 
-	if(is_gpdump || g_verbose)
+	if (is_gpdump || g_verbose)
 		status_log_msg(LOGGER_INFO, progname, "reading type casts\n");
 	castinfo = getCasts(&numCasts);
 
 	/* Link tables to parents, mark parents of target tables interesting */
-	if(is_gpdump || g_verbose)
+	if (is_gpdump || g_verbose)
 		status_log_msg(LOGGER_INFO, progname, "finding inheritance relationships\n");
 	flagInhTables(tblinfo, numTables, inhinfo, numInherits);
 
-	if(is_gpdump || g_verbose)
+	if (is_gpdump || g_verbose)
 		status_log_msg(LOGGER_INFO, progname, "reading column info for interesting tables\n");
 	getTableAttrs(tblinfo, numTables);
 
-	if(is_gpdump || g_verbose)
+	if (is_gpdump || g_verbose)
 		status_log_msg(LOGGER_INFO, progname, "flagging inherited columns in subtables\n");
 	flagInhAttrs(tblinfo, numTables, inhinfo, numInherits);
 
-	if(g_role == 1) // ROLE_MASTER
+	/*
+	 * ROLE_MASTER
+	 */
+	if (g_role == 1)
 	{
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading indexes\n");
 		getIndexes(tblinfo, numTables);
 
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading constraints\n");
 		getConstraints(tblinfo, numTables);
 
-		if(is_gpdump || g_verbose)
+		if (is_gpdump || g_verbose)
 			status_log_msg(LOGGER_INFO, progname, "reading triggers\n");
 		getTriggers(tblinfo, numTables);
 	}
@@ -245,7 +296,13 @@ flagInhTables(TableInfo *tblinfo, int numTables,
 
 /* flagInhAttrs -
  *	 for each dumpable table in tblinfo, flag its inherited attributes
- * so when we dump the table out, we don't dump out the inherited attributes
+ *
+ * What we need to do here is detect child columns that inherit NOT NULL
+ * bits from their parents (so that we needn't specify that again for the
+ * child) and child columns that have DEFAULT NULL when their parents had
+ * some non-null default.  In the latter case, we make up a dummy AttrDefInfo
+ * object so that we'll correctly emit the necessary DEFAULT NULL clause;
+ * otherwise the backend will apply an inherited default to the column.
  *
  * modifies tblinfo
  */
@@ -262,7 +319,6 @@ flagInhAttrs(TableInfo *tblinfo, int numTables,
 		TableInfo  *tbinfo = &(tblinfo[i]);
 		int			numParents;
 		TableInfo **parents;
-		TableInfo  *parent;
 
 		/* Sequences, views and external tables never have parents */
 		if (tbinfo->relkind == RELKIND_SEQUENCE ||
@@ -281,132 +337,70 @@ flagInhAttrs(TableInfo *tblinfo, int numTables,
 		if (numParents == 0)
 			continue;			/* nothing to see here, move along */
 
-		/*----------------------------------------------------------------
-		 * For each attr, check the parent info: if no parent has an attr
-		 * with the same name, then it's not inherited. If there *is* an
-		 * attr with the same name, then only dump it if:
-		 *
-		 * - it is NOT NULL and zero parents are NOT NULL
-		 *	 OR
-		 * - it has a default value AND the default value does not match
-		 *	 all parent default values, or no parents specify a default.
-		 *
-		 * See discussion on -hackers around 2-Apr-2001.
-		 *----------------------------------------------------------------
-		 */
+		/* For each column, search for matching column names in parent(s) */
 		for (j = 0; j < tbinfo->numatts; j++)
 		{
-			bool		foundAttr;		/* Attr was found in a parent */
 			bool		foundNotNull;	/* Attr was NOT NULL in a parent */
-			bool		defaultsMatch;	/* All non-empty defaults match */
-			bool		defaultsFound;	/* Found a default in a parent */
-			AttrDefInfo *attrDef;
+			bool		foundDefault;	/* Found a default in a parent */
 
-			foundAttr = false;
-			foundNotNull = false;
-			defaultsMatch = true;
-			defaultsFound = false;
-
-			attrDef = tbinfo->attrdefs[j];
+			/* no point in examining dropped columns */
+			if (tbinfo->attisdropped[j])
+				continue;
 
+			foundNotNull = false;
+			foundDefault = false;
 			for (k = 0; k < numParents; k++)
 			{
+				TableInfo  *parent = parents[k];
 				int			inhAttrInd;
 
-				parent = parents[k];
 				inhAttrInd = strInArray(tbinfo->attnames[j],
 										parent->attnames,
 										parent->numatts);
-
-				if (inhAttrInd != -1)
+				if (inhAttrInd >= 0)
 				{
-					AttrDefInfo *inhDef = parent->attrdefs[inhAttrInd];
-
-					foundAttr = true;
 					foundNotNull |= parent->notnull[inhAttrInd];
-					if (inhDef != NULL)
-					{
-						defaultsFound = true;
-
-						/*
-						 * If any parent has a default and the child doesn't,
-						 * we have to emit an explicit DEFAULT NULL clause for
-						 * the child, else the parent's default will win.
-						 */
-						if (attrDef == NULL)
-						{
-							attrDef = (AttrDefInfo *) malloc(sizeof(AttrDefInfo));
-							attrDef->dobj.objType = DO_ATTRDEF;
-							attrDef->dobj.catId.tableoid = 0;
-							attrDef->dobj.catId.oid = 0;
-							AssignDumpId(&attrDef->dobj);
-							attrDef->adtable = tbinfo;
-							attrDef->adnum = j + 1;
-							attrDef->adef_expr = strdup("NULL");
-
-							attrDef->dobj.name = strdup(tbinfo->dobj.name);
-							attrDef->dobj.namespace = tbinfo->dobj.namespace;
-
-							attrDef->dobj.dump = tbinfo->dobj.dump;
-
-							attrDef->separate = false;
-							addObjectDependency(&tbinfo->dobj,
-												attrDef->dobj.dumpId);
-
-							tbinfo->attrdefs[j] = attrDef;
-						}
-						if (strcmp(attrDef->adef_expr, inhDef->adef_expr) != 0)
-						{
-							defaultsMatch = false;
-
-							/*
-							 * Whenever there is a non-matching parent
-							 * default, add a dependency to force the parent
-							 * default to be dumped first, in case the
-							 * defaults end up being dumped as separate
-							 * commands.  Otherwise the parent default will
-							 * override the child's when it is applied.
-							 */
-							addObjectDependency(&attrDef->dobj,
-												inhDef->dobj.dumpId);
-						}
-					}
+					foundDefault |= (parent->attrdefs[inhAttrInd] != NULL);
 				}
 			}
 
-			/*
-			 * Based on the scan of the parents, decide if we can rely on the
-			 * inherited attr
-			 */
-			if (foundAttr)		/* Attr was inherited */
+			/* Remember if we found inherited NOT NULL */
+			tbinfo->inhNotNull[j] = foundNotNull;
+
+			/* Manufacture a DEFAULT NULL clause if necessary */
+			if (foundDefault && tbinfo->attrdefs[j] == NULL)
 			{
-				/* Set inherited flag by default */
-				tbinfo->inhAttrs[j] = true;
-				tbinfo->inhAttrDef[j] = true;
-				tbinfo->inhNotNull[j] = true;
-
-				/*
-				 * Clear it if attr had a default, but parents did not, or
-				 * mismatch
-				 */
-				if ((attrDef != NULL) && (!defaultsFound || !defaultsMatch))
+				AttrDefInfo *attrDef;
+
+				attrDef = (AttrDefInfo *) malloc(sizeof(AttrDefInfo));
+				attrDef->dobj.objType = DO_ATTRDEF;
+				attrDef->dobj.catId.tableoid = 0;
+				attrDef->dobj.catId.oid = 0;
+				AssignDumpId(&attrDef->dobj);
+				attrDef->dobj.name = strdup(tbinfo->dobj.name);
+				attrDef->dobj.namespace = tbinfo->dobj.namespace;
+				attrDef->dobj.dump = tbinfo->dobj.dump;
+
+				attrDef->adtable = tbinfo;
+				attrDef->adnum = j + 1;
+				attrDef->adef_expr = strdup("NULL");
+
+				/* Will column be dumped explicitly? */
+				if (shouldPrintColumn(tbinfo, j))
 				{
-					tbinfo->inhAttrs[j] = false;
-					tbinfo->inhAttrDef[j] = false;
+					attrDef->separate = false;
+					/* No dependency needed: NULL cannot have dependencies */
 				}
-
-				/*
-				 * Clear it if NOT NULL and none of the parents were NOT NULL
-				 */
-				if (tbinfo->notnull[j] && !foundNotNull)
+				else
 				{
-					tbinfo->inhAttrs[j] = false;
-					tbinfo->inhNotNull[j] = false;
+					/* column will be suppressed, print default separately */
+					attrDef->separate = true;
+					/* ensure it comes out after the table */
+					addObjectDependency(&attrDef->dobj,
+										tbinfo->dobj.dumpId);
 				}
 
-				/* Clear it if attr has local definition */
-				if (tbinfo->attislocal[j])
-					tbinfo->inhAttrs[j] = false;
+				tbinfo->attrdefs[j] = attrDef;
 			}
 		}
 
@@ -429,9 +423,9 @@ flagInhAttrs(TableInfo *tblinfo, int numTables,
 
 			for (k = 0; k < numParents; k++)
 			{
+				TableInfo  *parent = parents[k];
 				int			l;
 
-				parent = parents[k];
 				for (l = 0; l < parent->ncheck; l++)
 				{
 					ConstraintInfo *pconstr = &(parent->checkexprs[l]);
@@ -650,6 +644,70 @@ findObjectByCatalogId(CatalogId catalogId)
 	return NULL;
 }
 
+/*
+ * Find a DumpableObject by OID, in a pre-sorted array of one type of object
+ *
+ * Returns NULL for unknown OID
+ */
+static DumpableObject *
+findObjectByOid(Oid oid, DumpableObject **indexArray, int numObjs)
+{
+	DumpableObject **low;
+	DumpableObject **high;
+
+	/*
+	 * This is the same as findObjectByCatalogId except we assume we need not
+	 * look at table OID because the objects are all the same type.
+	 *
+	 * We could use bsearch() here, but the notational cruft of calling
+	 * bsearch is nearly as bad as doing it ourselves; and the generalized
+	 * bsearch function is noticeably slower as well.
+	 */
+	if (numObjs <= 0)
+		return NULL;
+	low = indexArray;
+	high = indexArray + (numObjs - 1);
+	while (low <= high)
+	{
+		DumpableObject **middle;
+		int			difference;
+
+		middle = low + (high - low) / 2;
+		difference = oidcmp((*middle)->catId.oid, oid);
+		if (difference == 0)
+			return *middle;
+		else if (difference < 0)
+			low = middle + 1;
+		else
+			high = middle - 1;
+	}
+	return NULL;
+}
+
+/*
+ * Build an index array of DumpableObject pointers, sorted by OID
+ */
+static DumpableObject **
+buildIndexArray(void *objArray, int numObjs, Size objSize)
+{
+	DumpableObject **ptrs;
+	int			i;
+
+	ptrs = (DumpableObject **) malloc(numObjs * sizeof(DumpableObject *));
+	for (i = 0; i < numObjs; i++)
+		ptrs[i] = (DumpableObject *) ((char *) objArray + i * objSize);
+
+	/* We can use DOCatalogIdCompare to sort since its first key is OID */
+	if (numObjs > 1)
+		qsort((void *) ptrs, numObjs, sizeof(DumpableObject *),
+			  DOCatalogIdCompare);
+
+	return ptrs;
+}
+
+/*
+ * qsort comparator for pointers to DumpableObjects
+ */
 static int
 DOCatalogIdCompare(const void *p1, const void *p2)
 {
@@ -740,80 +798,55 @@ removeObjectDependency(DumpableObject *dobj, DumpId refId)
  * findTableByOid
  *	  finds the entry (in tblinfo) of the table with the given oid
  *	  returns NULL if not found
- *
- * NOTE:  should hash this, but just do linear search for now
  */
 TableInfo *
 findTableByOid(Oid oid)
 {
-	int			i;
-
-	for (i = 0; i < numTables; i++)
-	{
-		if (tblinfo[i].dobj.catId.oid == oid)
-			return &tblinfo[i];
-	}
-	return NULL;
+	return (TableInfo *) findObjectByOid(oid, tblinfoindex, numTables);
 }
 
 /*
  * findTypeByOid
  *	  finds the entry (in typinfo) of the type with the given oid
  *	  returns NULL if not found
- *
- * NOTE:  should hash this, but just do linear search for now
  */
 TypeInfo *
 findTypeByOid(Oid oid)
 {
-	int			i;
-
-	for (i = 0; i < numTypes; i++)
-	{
-		if (typinfo[i].dobj.catId.oid == oid)
-			return &typinfo[i];
-	}
-	return NULL;
+	return (TypeInfo *) findObjectByOid(oid, typinfoindex, numTypes);
 }
 
 /*
  * findFuncByOid
  *	  finds the entry (in funinfo) of the function with the given oid
  *	  returns NULL if not found
- *
- * NOTE:  should hash this, but just do linear search for now
  */
 FuncInfo *
 findFuncByOid(Oid oid)
 {
-	int			i;
-
-	for (i = 0; i < numFuncs; i++)
-	{
-		if (funinfo[i].dobj.catId.oid == oid)
-			return &funinfo[i];
-	}
-	return NULL;
+	return (FuncInfo *) findObjectByOid(oid, funinfoindex, numFuncs);
 }
 
 /*
  * findOprByOid
  *	  finds the entry (in oprinfo) of the operator with the given oid
  *	  returns NULL if not found
- *
- * NOTE:  should hash this, but just do linear search for now
  */
 OprInfo *
 findOprByOid(Oid oid)
 {
-	int			i;
+	return (OprInfo *) findObjectByOid(oid, oprinfoindex, numOperators);
+}
 
-	for (i = 0; i < numOperators; i++)
-	{
-		if (oprinfo[i].dobj.catId.oid == oid)
-			return &oprinfo[i];
-	}
-	return NULL;
+/*
+ * findNamespaceByOid
+ *	  finds the entry (in nspinfo) of the namespace with the given oid
+ *	  returns NULL if not found
+ */
+NamespaceInfo *
+findNamespaceByOid(Oid oid)
+{
+	return (NamespaceInfo *) findObjectByOid(oid, nspinfoindex, numNamespaces);
 }
 
 
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
index 3681d73c7c41..1dd352d3f8ba 100644
--- a/src/bin/pg_dump/dumputils.c
+++ b/src/bin/pg_dump/dumputils.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.35 2007/01/05 22:19:48 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.40 2008/01/01 19:45:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -291,6 +291,84 @@ appendStringLiteralDQ(PQExpBuffer buf, const char *str, const char *dqprefix)
 }
 
 
+/*
+ * Convert a bytea value (presented as raw bytes) to an SQL string literal
+ * and append it to the given buffer.  We assume the specified
+ * standard_conforming_strings setting.
+ *
+ * This is needed in situations where we do not have a PGconn available.
+ * Where we do, PQescapeByteaConn is a better choice.
+ */
+void
+appendByteaLiteral(PQExpBuffer buf, const unsigned char *str, size_t length,
+				   bool std_strings)
+{
+	const unsigned char *vp;
+	unsigned char *rp;
+	size_t		i;
+	size_t		len;
+	size_t		bslash_len = (std_strings ? 1 : 2);
+
+	len = 2;					/* for the quote marks */
+	vp = str;
+	for (i = length; i > 0; i--, vp++)
+	{
+		if (*vp < 0x20 || *vp > 0x7e)
+			len += bslash_len + 3;
+		else if (*vp == '\'')
+			len += 2;
+		else if (*vp == '\\')
+			len += bslash_len + bslash_len;
+		else
+			len++;
+	}
+
+	if (!enlargePQExpBuffer(buf, len))
+		return;
+
+	rp = (unsigned char *) (buf->data + buf->len);
+	*rp++ = '\'';
+
+	vp = str;
+	for (i = length; i > 0; i--, vp++)
+	{
+		if (*vp < 0x20 || *vp > 0x7e)
+		{
+			int			val = *vp;
+
+			if (!std_strings)
+				*rp++ = '\\';
+			*rp++ = '\\';
+			*rp++ = (val >> 6) + '0';
+			*rp++ = ((val >> 3) & 07) + '0';
+			*rp++ = (val & 07) + '0';
+		}
+		else if (*vp == '\'')
+		{
+			*rp++ = '\'';
+			*rp++ = '\'';
+		}
+		else if (*vp == '\\')
+		{
+			if (!std_strings)
+			{
+				*rp++ = '\\';
+				*rp++ = '\\';
+			}
+			*rp++ = '\\';
+			*rp++ = '\\';
+		}
+		else
+			*rp++ = *vp;
+	}
+
+	*rp++ = '\'';
+	*rp = '\0';
+
+	buf->len = ((char *) rp) - buf->data;
+}
+
+
 /*
  * Convert backend's version string into a number.
  */
@@ -472,8 +550,8 @@ buildACLCommands(const char *name, const char *type,
 	 * We still need some hacking though to cover the case where new default
 	 * public privileges are added in new versions: the REVOKE ALL will revoke
 	 * them, leading to behavior different from what the old version had,
-	 * which is generally not what's wanted.  So add back default privs if
-	 * the source database is too old to have had that particular priv.
+	 * which is generally not what's wanted.  So add back default privs if the
+	 * source database is too old to have had that particular priv.
 	 */
 	if (remoteVersion < 80200 && strcmp(type, "DATABASE") == 0)
 	{
diff --git a/src/bin/pg_dump/dumputils.h b/src/bin/pg_dump/dumputils.h
index 74070432a35e..36a941e797c3 100644
--- a/src/bin/pg_dump/dumputils.h
+++ b/src/bin/pg_dump/dumputils.h
@@ -6,9 +6,10 @@
  *
  *
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.h,v 1.20 2007/01/05 22:19:48 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.h,v 1.21 2008/01/01 19:45:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,6 +28,9 @@ extern void appendStringLiteralConn(PQExpBuffer buf, const char *str,
 						PGconn *conn);
 extern void appendStringLiteralDQ(PQExpBuffer buf, const char *str,
 					  const char *dqprefix);
+extern void appendByteaLiteral(PQExpBuffer buf,
+							   const unsigned char *str, size_t length,
+							   bool std_strings);
 extern int	parse_version(const char *versionString);
 extern bool parsePGArray(const char *atext, char ***itemarray, int *nitems);
 extern bool buildACLCommands(const char *name, const char *type,
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index adb9cbea10d2..acec12e8557e 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.142 2007/02/19 15:05:06 mha Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.152.2.1 2009/01/13 11:45:03 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,6 +65,7 @@ static TocEntry *getTocEntryByDumpId(ArchiveHandle *AH, DumpId id);
 static void _moveAfter(ArchiveHandle *AH __attribute__((unused)), TocEntry *pos, TocEntry *te);
 static int	_discoverArchiveFormat(ArchiveHandle *AH);
 
+static int	RestoringToDB(ArchiveHandle *AH);
 static void dump_lo_buf(ArchiveHandle *AH);
 static void _write_msg(const char *modulename, const char *fmt, va_list ap);
 static void _die_horribly(ArchiveHandle *AH, const char *modulename, const char *fmt, va_list ap);
@@ -153,6 +154,12 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 	 */
 	if (ropt->createDB && ropt->dropSchema)
 		die_horribly(AH, modulename, "-C and -c are incompatible options\n");
+	/*
+	 * -1 is not compatible with -C, because we can't create a database
+	 *  inside a transaction block.
+	 */
+	if (ropt->createDB && ropt->single_txn)
+		die_horribly(AH, modulename, "-C and -1 are incompatible options\n");
 
 	/*
 	 * -C is not compatible with -1, because we can't create a database inside
@@ -284,7 +291,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 		 */
 		if (AH->currSchema)
 			free(AH->currSchema);
-		AH->currSchema = NULL;
+		AH->currSchema = strdup("");
 	}
 
 	/*
@@ -397,24 +404,25 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 							  te->tag);
 
 						/*
-						 * If we have a copy statement, use it. As of V1.3,
-						 * these are separate to allow easy import from
-						 * withing a database connection. Pre 1.3 archives can
-						 * not use DB connections and are sent to output only.
-						 *
-						 * For V1.3+, the table data MUST have a copy
-						 * statement so that we can go into appropriate mode
-						 * with libpq.
+						 * If we have a copy statement, use it.
 						 */
 						if (te->copyStmt && strlen(te->copyStmt) > 0)
 						{
 							ahprintf(AH, "%s", te->copyStmt);
-							AH->writingCopyData = true;
+							AH->outputKind = OUTPUT_COPYDATA;
 						}
+						else
+							AH->outputKind = OUTPUT_OTHERDATA;
 
 						(*AH->PrintTocDataPtr) (AH, te, ropt);
 
-						AH->writingCopyData = false;
+						/*
+						 * Terminate COPY if needed.
+						 */
+						if (AH->outputKind == OUTPUT_COPYDATA &&
+							RestoringToDB(AH))
+							EndDBCopyMode(AH, te);
+						AH->outputKind = OUTPUT_SQLCMDS;
 
 						_enableTriggersIfNecessary(AH, te, ropt);
 					}
@@ -777,7 +785,7 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid)
 	/* Initialize the LO Buffer */
 	AH->lo_buf_used = 0;
 
-	ahlog(AH, 2, "restoring large object with OID %u\n", oid);
+	ahlog(AH, 1, "restoring large object with OID %u\n", oid);
 
 	if (AH->connection)
 	{
@@ -829,11 +837,8 @@ SortTocFromFile(Archive *AHX, RestoreOptions *ropt)
 {
 	ArchiveHandle *AH = (ArchiveHandle *) AHX;
 	FILE	   *fh;
-	char		buf[1024];
-	char	   *cmnt;
-	char	   *endptr;
-	DumpId		id;
-	TocEntry   *te;
+	char		buf[100];
+	bool		incomplete_line;
 	TocEntry   *tePrev;
 
 	/* Allocate space for the 'wanted' array, and init it */
@@ -846,11 +851,33 @@ SortTocFromFile(Archive *AHX, RestoreOptions *ropt)
 	/* Setup the file */
 	fh = fopen(ropt->tocFile, PG_BINARY_R);
 	if (!fh)
-		die_horribly(AH, modulename, "could not open TOC file: %s\n",
-					 strerror(errno));
+		die_horribly(AH, modulename, "could not open TOC file \"%s\": %s\n",
+					 ropt->tocFile, strerror(errno));
 
+	incomplete_line = false;
 	while (fgets(buf, sizeof(buf), fh) != NULL)
 	{
+		bool		prev_incomplete_line = incomplete_line;
+		int			buflen;
+		char	   *cmnt;
+		char	   *endptr;
+		DumpId		id;
+		TocEntry   *te;
+
+		/*
+		 * Some lines in the file might be longer than sizeof(buf).  This is
+		 * no problem, since we only care about the leading numeric ID which
+		 * can be at most a few characters; but we have to skip continuation
+		 * bufferloads when processing a long line.
+		 */
+		buflen = strlen(buf);
+		if (buflen > 0 && buf[buflen - 1] == '\n')
+			incomplete_line = false;
+		else
+			incomplete_line = true;
+		if (prev_incomplete_line)
+			continue;
+
 		/* Truncate line at comment, if any */
 		cmnt = strchr(buf, ';');
 		if (cmnt != NULL)
@@ -1010,7 +1037,14 @@ SetOutput(ArchiveHandle *AH, char *filename, int compression)
 	}
 
 	if (!AH->OF)
-		die_horribly(AH, modulename, "could not open output file: %s\n", strerror(errno));
+	{
+		if (filename)
+			die_horribly(AH, modulename, "could not open output file \"%s\": %s\n",
+						 filename, strerror(errno));
+		else
+			die_horribly(AH, modulename, "could not open output file: %s\n",
+						 strerror(errno));
+	}
 
 	return sav;
 }
@@ -1043,17 +1077,13 @@ ahprintf(ArchiveHandle *AH, const char *fmt,...)
 {
 	char	   *p = NULL;
 	va_list		ap;
-	int			bSize = strlen(fmt) + 256;		/* Should be enough */
+	int			bSize = strlen(fmt) + 256;		/* Usually enough */
 	int			cnt = -1;
 
 	/*
 	 * This is paranoid: deal with the possibility that vsnprintf is willing
-	 * to ignore trailing null
-	 */
-
-	/*
-	 * or returns > 0 even if string does not fit. It may be the case that it
-	 * returns cnt = bufsize
+	 * to ignore trailing null or returns > 0 even if string does not fit.
+	 * It may be the case that it returns cnt = bufsize.
 	 */
 	while (cnt < 0 || cnt >= (bSize - 1))
 	{
@@ -1114,27 +1144,26 @@ dump_lo_buf(ArchiveHandle *AH)
 	}
 	else
 	{
-		unsigned char *str;
-		size_t		len;
+		PQExpBuffer buf = createPQExpBuffer();
 
-		str = PQescapeBytea((const unsigned char *) AH->lo_buf,
-							AH->lo_buf_used, &len);
-		if (!str)
-			die_horribly(AH, modulename, "out of memory\n");
+		appendByteaLiteralAHX(buf,
+							  (const unsigned char *) AH->lo_buf,
+							  AH->lo_buf_used,
+							  AH);
 
 		/* Hack: turn off writingBlob so ahwrite doesn't recurse to here */
 		AH->writingBlob = 0;
-		ahprintf(AH, "SELECT lowrite(0, '%s');\n", str);
+		ahprintf(AH, "SELECT pg_catalog.lowrite(0, %s);\n", buf->data);
 		AH->writingBlob = 1;
 
-		free(str);
+		destroyPQExpBuffer(buf);
 	}
 	AH->lo_buf_used = 0;
 }
 
 
 /*
- *	Write buffer to the output file (usually stdout). This is user for
+ *	Write buffer to the output file (usually stdout). This is used for
  *	outputting 'restore' scripts etc. It is even possible for an archive
  *	format to create a custom output routine to 'fake' a restore if it
  *	wants to generate a script (see TAR output).
@@ -1186,7 +1215,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
 		 * connected then send it to the DB.
 		 */
 		if (RestoringToDB(AH))
-			return ExecuteSqlCommandBuf(AH, (void *) ptr, size * nmemb);		/* Always 1, currently */
+			return ExecuteSqlCommandBuf(AH, (const char *) ptr, size * nmemb);
 		else
 		{
 			res = fwrite((void *) ptr, size, nmemb, AH->OF);
@@ -1384,7 +1413,7 @@ WriteOffset(ArchiveHandle *AH, pgoff_t o, int wasSet)
 }
 
 int
-ReadOffset(ArchiveHandle *AH, pgoff_t *o)
+ReadOffset(ArchiveHandle *AH, pgoff_t * o)
 {
 	int			i;
 	int			off;
@@ -1569,12 +1598,17 @@ _discoverArchiveFormat(ArchiveHandle *AH)
 	{
 		wantClose = 1;
 		fh = fopen(AH->fSpec, PG_BINARY_R);
+		if (!fh)
+			die_horribly(AH, modulename, "could not open input file \"%s\": %s\n",
+						 AH->fSpec, strerror(errno));
 	}
 	else
+	{
 		fh = stdin;
-
-	if (!fh)
-		die_horribly(AH, modulename, "could not open input file: %s\n", strerror(errno));
+		if (!fh)
+			die_horribly(AH, modulename, "could not open input file: %s\n",
+						 strerror(errno));
+	}
 
 	cnt = fread(sig, 1, 5, fh);
 
@@ -1732,8 +1766,7 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
 	AH->mode = mode;
 	AH->compression = compression;
 
-	AH->pgCopyBuf = createPQExpBuffer();
-	AH->sqlBuf = createPQExpBuffer();
+	memset(&(AH->sqlparse), 0, sizeof(AH->sqlparse));
 
 	/* Open stdout with no compression for AH output handle */
 	AH->gzOut = 0;
@@ -2479,7 +2512,9 @@ _getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
 		strcmp(type, "TABLE") == 0 ||
 		strcmp(type, "EXTERNAL TABLE") == 0 ||
 		strcmp(type, "FOREIGN TABLE") == 0 ||
-		strcmp(type, "TYPE") == 0)
+		strcmp(type, "TYPE") == 0 ||
+		strcmp(type, "TEXT SEARCH DICTIONARY") == 0 ||
+		strcmp(type, "TEXT SEARCH CONFIGURATION") == 0)
 	{
 		appendPQExpBuffer(buf, "%s ", type);
 		if (te->namespace && te->namespace[0])	/* is null pre-7.3 */
@@ -2502,10 +2537,11 @@ _getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
 
 	/* objects named by just a name */
 	if (strcmp(type, "DATABASE") == 0 ||
-		strcmp(type, "SCHEMA") == 0 ||
 		strcmp(type, "FOREIGN DATA WRAPPER") == 0 ||
 		strcmp(type, "SERVER") == 0 ||
-		strcmp(type, "USER MAPPING") == 0)
+		strcmp(type, "USER MAPPING") == 0 ||
+		strcmp(type, "PROCEDURAL LANGUAGE") == 0 ||
+		strcmp(type, "SCHEMA") == 0)
 	{
 		appendPQExpBuffer(buf, "%s %s", type, fmtId(te->tag));
 		return;
@@ -2562,11 +2598,17 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 	/*
 	 * Avoid dumping the public schema, as it will already be created ...
 	 * unless we are using --clean mode, in which case it's been deleted and
-	 * we'd better recreate it.
+	 * we'd better recreate it.  Likewise for its comment, if any.
 	 */
-	if (!ropt->dropSchema &&
-		strcmp(te->desc, "SCHEMA") == 0 && strcmp(te->tag, "public") == 0)
-		return;
+	if (!ropt->dropSchema)
+	{
+		if (strcmp(te->desc, "SCHEMA") == 0 &&
+			strcmp(te->tag, "public") == 0)
+			return;
+		if (strcmp(te->desc, "COMMENT") == 0 &&
+			strcmp(te->tag, "SCHEMA public") == 0)
+			return;
+	}
 
 #if 0
 	/*
@@ -2722,6 +2764,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 			strcmp(te->desc, "OPERATOR") == 0 ||
 			strcmp(te->desc, "OPERATOR CLASS") == 0 ||
 			strcmp(te->desc, "OPERATOR FAMILY") == 0 ||
+			strcmp(te->desc, "PROCEDURAL LANGUAGE") == 0 ||
 			strcmp(te->desc, "SCHEMA") == 0 ||
 			strcmp(te->desc, "TABLE") == 0 ||
 			strcmp(te->desc, "EXTERNAL TABLE") == 0 ||
@@ -2731,7 +2774,9 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 			strcmp(te->desc, "SEQUENCE") == 0 ||
 			strcmp(te->desc, "FOREIGN DATA WRAPPER") == 0 ||
 			strcmp(te->desc, "SERVER") == 0 ||
-			strcmp(te->desc, "PROTOCOL") == 0)
+			strcmp(te->desc, "PROTOCOL") == 0 ||
+			strcmp(te->desc, "TEXT SEARCH DICTIONARY") == 0 ||
+			strcmp(te->desc, "TEXT SEARCH CONFIGURATION") == 0)
 		{
 			PQExpBuffer temp = createPQExpBuffer();
 
@@ -2747,7 +2792,6 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 				 strcmp(te->desc, "DEFAULT") == 0 ||
 				 strcmp(te->desc, "FK CONSTRAINT") == 0 ||
 				 strcmp(te->desc, "INDEX") == 0 ||
-				 strcmp(te->desc, "PROCEDURAL LANGUAGE") == 0 ||
 				 strcmp(te->desc, "RULE") == 0 ||
 				 strcmp(te->desc, "TRIGGER") == 0 ||
 				 strcmp(te->desc, "USER MAPPING") == 0)
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index 1535c4cb8400..d27e35ad05ca 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -17,7 +17,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.75 2007/02/19 15:05:06 mha Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.76 2007/11/07 12:24:24 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -136,23 +136,15 @@ typedef struct _outputContext
 typedef enum
 {
 	SQL_SCAN = 0,				/* normal */
-	SQL_IN_SQL_COMMENT,			/* -- comment */
-	SQL_IN_EXT_COMMENT,			/* slash-star comment */
 	SQL_IN_SINGLE_QUOTE,		/* '...' literal */
-	SQL_IN_E_QUOTE,				/* E'...' literal */
-	SQL_IN_DOUBLE_QUOTE,		/* "..." identifier */
-	SQL_IN_DOLLAR_TAG,			/* possible dollar-quote starting tag */
-	SQL_IN_DOLLAR_QUOTE			/* body of dollar quote */
+	SQL_IN_DOUBLE_QUOTE			/* "..." identifier */
 } sqlparseState;
 
 typedef struct
 {
 	sqlparseState state;		/* see above */
-	char		lastChar;		/* preceding char, or '\0' initially */
 	bool		backSlash;		/* next char is backslash quoted? */
-	int			braceDepth;		/* parenthesis nesting depth */
-	PQExpBuffer tagBuf;			/* dollar quote tag (NULL if not created) */
-	int			minTagEndPos;	/* first possible end position of $-quote */
+	PQExpBuffer curCmd;			/* incomplete line (NULL if not created) */
 } sqlparseInfo;
 
 typedef enum
@@ -163,6 +155,13 @@ typedef enum
 	STAGE_FINALIZING
 } ArchiverStage;
 
+typedef enum
+{
+	OUTPUT_SQLCMDS = 0,			/* emitting general SQL commands */
+	OUTPUT_COPYDATA,			/* writing COPY data */
+	OUTPUT_OTHERDATA			/* writing data as INSERT commands */
+} ArchiverOutput;
+
 typedef enum
 {
 	REQ_SCHEMA = 1,
@@ -190,8 +189,7 @@ typedef struct _archiveHandle
 								 * Added V1.7 */
 	ArchiveFormat format;		/* Archive format */
 
-	sqlparseInfo sqlparse;
-	PQExpBuffer sqlBuf;
+	sqlparseInfo sqlparse;		/* state for parsing INSERT data */
 
 	time_t		createDate;		/* Date archive created */
 
@@ -230,7 +228,7 @@ typedef struct _archiveHandle
 	StartBlobPtr StartBlobPtr;
 	EndBlobPtr EndBlobPtr;
 
-	CustomOutPtr CustomOutPtr;	/* Alternate script output routine */
+	CustomOutPtr CustomOutPtr;	/* Alternative script output routine */
 
 	/* Stuff for direct DB connection */
 	char	   *archdbname;		/* DB name *read* from archive */
@@ -239,10 +237,8 @@ typedef struct _archiveHandle
 	PGconn	   *connection;
 	int			connectToDB;	/* Flag to indicate if direct DB connection is
 								 * required */
-	bool		writingCopyData;	/* True when we are sending COPY data */
+	ArchiverOutput outputKind;	/* Flag for what we're currently writing */
 	bool		pgCopyIn;		/* Currently in libpq 'COPY IN' mode. */
-	PQExpBuffer pgCopyBuf;		/* Left-over data from incomplete lines in
-								 * COPY IN */
 
 	int			loFd;			/* BLOB fd */
 	int			writingBlob;	/* Flag */
@@ -332,6 +328,9 @@ extern bool checkSeek(FILE *fp);
 #define appendStringLiteralAHX(buf,str,AH) \
 	appendStringLiteral(buf, str, (AH)->public.encoding, (AH)->public.std_strings)
 
+#define appendByteaLiteralAHX(buf,str,len,AH) \
+	appendByteaLiteral(buf, str, len, (AH)->public.std_strings)
+
 /*
  * Mandatory routines for each supported format
  */
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index dcbe74bae4d8..e1b5b3c94f9d 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -19,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.37 2007/02/19 15:05:06 mha Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.40 2007/10/28 21:55:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index 89c1e9e1bd2f..d35997e2838a 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	Implements the basic DB functions used by the archiver.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.75 2006/10/04 00:30:05 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.77.2.1 2008/08/16 02:25:11 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,24 +14,19 @@
 #include "dumputils.h"
 
 #include <unistd.h>
-
 #include <ctype.h>
-
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
 
 
+#define DB_MAX_ERR_STMT 128
+
 static const char *modulename = gettext_noop("archiver (db)");
 
 static void _check_database_version(ArchiveHandle *AH);
 static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
 static void notice_processor(void *arg __attribute__((unused)), const char *message);
-static char *_sendSQLLine(ArchiveHandle *AH, char *qry, char *eos);
-static char *_sendCopyLine(ArchiveHandle *AH, char *qry, char *eos);
-
-static bool _isIdentChar(unsigned char c);
-static bool _isDQChar(unsigned char c, bool atStart);
 
 #define DB_MAX_ERR_STMT 128
 
@@ -330,8 +325,10 @@ notice_processor(void *arg __attribute__((unused)), const char *message)
 }
 
 
-/* Public interface */
-/* Convenience function to send a query. Monitors result to handle COPY statements */
+/*
+ * Convenience function to send a query.
+ * Monitors result to detect COPY statements
+ */
 static void
 ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc)
 {
@@ -348,6 +345,7 @@ ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc)
 	{
 		case PGRES_COMMAND_OK:
 		case PGRES_TUPLES_OK:
+		case PGRES_EMPTY_QUERY:
 			/* A-OK */
 			break;
 		case PGRES_COPY_IN:
@@ -372,220 +370,68 @@ ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc)
 	PQclear(res);
 }
 
+
 /*
- * Used by ExecuteSqlCommandBuf to send one buffered line when running a COPY command.
+ * Process non-COPY table data (that is, INSERT commands).
+ *
+ * The commands have been run together as one long string for compressibility,
+ * and we are receiving them in bufferloads with arbitrary boundaries, so we
+ * have to locate command boundaries and save partial commands across calls.
+ * All state must be kept in AH->sqlparse, not in local variables of this
+ * routine.  We assume that AH->sqlparse was filled with zeroes when created.
+ *
+ * We have to lex the data to the extent of identifying literals and quoted
+ * identifiers, so that we can recognize statement-terminating semicolons.
+ * We assume that INSERT data will not contain SQL comments, E'' literals,
+ * or dollar-quoted strings, so this is much simpler than a full SQL lexer.
  */
-static char *
-_sendCopyLine(ArchiveHandle *AH, char *qry, char *eos)
+static void
+ExecuteInsertCommands(ArchiveHandle *AH, const char *buf, size_t bufLen)
 {
-	size_t		loc;			/* Location of next newline */
-	int			pos = 0;		/* Current position */
-	int			sPos = 0;		/* Last pos of a slash char */
-	int			isEnd = 0;
-
-	/* loop to find unquoted newline ending the line of COPY data */
-	for (;;)
-	{
-		loc = strcspn(&qry[pos], "\n") + pos;
-
-		/* If no match, then wait */
-		if (loc >= (eos - qry)) /* None found */
-		{
-			appendBinaryPQExpBuffer(AH->pgCopyBuf, qry, (eos - qry));
-			return eos;
-		}
-
-		/*
-		 * fprintf(stderr, "Found cr at %d, prev char was %c, next was %c\n",
-		 * loc, qry[loc-1], qry[loc+1]);
-		 */
-
-		/* Count the number of preceding slashes */
-		sPos = loc;
-		while (sPos > 0 && qry[sPos - 1] == '\\')
-			sPos--;
-
-		sPos = loc - sPos;
-
-		/*
-		 * If an odd number of preceding slashes, then \n was escaped so set
-		 * the next search pos, and loop (if any left).
-		 */
-		if ((sPos & 1) == 1)
-		{
-			/* fprintf(stderr, "cr was escaped\n"); */
-			pos = loc + 1;
-			if (pos >= (eos - qry))
-			{
-				appendBinaryPQExpBuffer(AH->pgCopyBuf, qry, (eos - qry));
-				return eos;
-			}
-		}
-		else
-			break;
-	}
+	const char *qry = buf;
+	const char *eos = buf + bufLen;
 
-	/* We found an unquoted newline */
-	qry[loc] = '\0';
-	appendPQExpBuffer(AH->pgCopyBuf, "%s\n", qry);
-	isEnd = (strcmp(AH->pgCopyBuf->data, "\\.\n") == 0);
+	/* initialize command buffer if first time through */
+	if (AH->sqlparse.curCmd == NULL)
+		AH->sqlparse.curCmd = createPQExpBuffer();
 
-	/*
-	 * Note that we drop the data on the floor if libpq has failed to enter
-	 * COPY mode; this allows us to behave reasonably when trying to continue
-	 * after an error in a COPY command.
-	 */
-	if (AH->pgCopyIn &&
-		PQputCopyData(AH->connection, AH->pgCopyBuf->data,
-					  AH->pgCopyBuf->len) <= 0)
-		die_horribly(AH, modulename, "error returned by PQputCopyData: %s",
-					 PQerrorMessage(AH->connection));
-
-	resetPQExpBuffer(AH->pgCopyBuf);
-
-	if (isEnd && AH->pgCopyIn)
+	for (; qry < eos; qry++)
 	{
-		PGresult   *res;
-
-		if (PQputCopyEnd(AH->connection, NULL) <= 0)
-			die_horribly(AH, modulename, "error returned by PQputCopyEnd: %s",
-						 PQerrorMessage(AH->connection));
-
-		/* Check command status and return to normal libpq state */
-		res = PQgetResult(AH->connection);
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-			warn_or_die_horribly(AH, modulename, "COPY failed: %s",
-								 PQerrorMessage(AH->connection));
-		PQclear(res);
+		char	ch = *qry;
 
-		AH->pgCopyIn = false;
-	}
-
-	return qry + loc + 1;
-}
+		/* For neatness, we skip any newlines between commands */
+		if (!(ch == '\n' && AH->sqlparse.curCmd->len == 0))
+			appendPQExpBufferChar(AH->sqlparse.curCmd, ch);
 
-/*
- * Used by ExecuteSqlCommandBuf to send one buffered line of SQL
- * (not data for the copy command).
- */
-static char *
-_sendSQLLine(ArchiveHandle *AH, char *qry, char *eos)
-{
-	/*
-	 * The following is a mini state machine to assess the end of an SQL
-	 * statement. It really only needs to parse good SQL, or at least that's
-	 * the theory... End-of-statement is assumed to be an unquoted,
-	 * un-commented semi-colon that's not within any parentheses.
-	 *
-	 * Note: the input can be split into bufferloads at arbitrary boundaries.
-	 * Therefore all state must be kept in AH->sqlparse, not in local
-	 * variables of this routine.  We assume that AH->sqlparse was filled with
-	 * zeroes when created.
-	 */
-	for (; qry < eos; qry++)
-	{
 		switch (AH->sqlparse.state)
 		{
 			case SQL_SCAN:		/* Default state == 0, set in _allocAH */
-				if (*qry == ';' && AH->sqlparse.braceDepth == 0)
+				if (ch == ';')
 				{
 					/*
 					 * We've found the end of a statement. Send it and reset
 					 * the buffer.
 					 */
-					appendPQExpBufferChar(AH->sqlBuf, ';');		/* inessential */
-					ExecuteSqlCommand(AH, AH->sqlBuf->data,
+					ExecuteSqlCommand(AH, AH->sqlparse.curCmd->data,
 									  "could not execute query");
-					resetPQExpBuffer(AH->sqlBuf);
-					AH->sqlparse.lastChar = '\0';
-
-					/*
-					 * Remove any following newlines - so that embedded COPY
-					 * commands don't get a starting newline.
-					 */
-					qry++;
-					while (qry < eos && *qry == '\n')
-						qry++;
-
-					/* We've finished one line, so exit */
-					return qry;
+					resetPQExpBuffer(AH->sqlparse.curCmd);
 				}
-				else if (*qry == '\'')
+				else if (ch == '\'')
 				{
-					if (AH->sqlparse.lastChar == 'E')
-						AH->sqlparse.state = SQL_IN_E_QUOTE;
-					else
-						AH->sqlparse.state = SQL_IN_SINGLE_QUOTE;
+					AH->sqlparse.state = SQL_IN_SINGLE_QUOTE;
 					AH->sqlparse.backSlash = false;
 				}
-				else if (*qry == '"')
+				else if (ch == '"')
 				{
 					AH->sqlparse.state = SQL_IN_DOUBLE_QUOTE;
 				}
-
-				/*
-				 * Look for dollar-quotes. We make the assumption that
-				 * $-quotes will not have an ident character just before them
-				 * in pg_dump output.  XXX is this good enough?
-				 */
-				else if (*qry == '$' && !_isIdentChar(AH->sqlparse.lastChar))
-				{
-					AH->sqlparse.state = SQL_IN_DOLLAR_TAG;
-					/* initialize separate buffer with possible tag */
-					if (AH->sqlparse.tagBuf == NULL)
-						AH->sqlparse.tagBuf = createPQExpBuffer();
-					else
-						resetPQExpBuffer(AH->sqlparse.tagBuf);
-					appendPQExpBufferChar(AH->sqlparse.tagBuf, *qry);
-				}
-				else if (*qry == '-' && AH->sqlparse.lastChar == '-')
-					AH->sqlparse.state = SQL_IN_SQL_COMMENT;
-				else if (*qry == '*' && AH->sqlparse.lastChar == '/')
-					AH->sqlparse.state = SQL_IN_EXT_COMMENT;
-				else if (*qry == '(')
-					AH->sqlparse.braceDepth++;
-				else if (*qry == ')')
-					AH->sqlparse.braceDepth--;
-				break;
-
-			case SQL_IN_SQL_COMMENT:
-				if (*qry == '\n')
-					AH->sqlparse.state = SQL_SCAN;
-				break;
-
-			case SQL_IN_EXT_COMMENT:
-
-				/*
-				 * This isn't fully correct, because we don't account for
-				 * nested slash-stars, but pg_dump never emits such.
-				 */
-				if (AH->sqlparse.lastChar == '*' && *qry == '/')
-					AH->sqlparse.state = SQL_SCAN;
 				break;
 
 			case SQL_IN_SINGLE_QUOTE:
 				/* We needn't handle '' specially */
-				if (*qry == '\'' && !AH->sqlparse.backSlash)
-					AH->sqlparse.state = SQL_SCAN;
-				else if (*qry == '\\')
-					AH->sqlparse.backSlash = !AH->sqlparse.backSlash;
-				else
-					AH->sqlparse.backSlash = false;
-				break;
-
-			case SQL_IN_E_QUOTE:
-
-				/*
-				 * Eventually we will need to handle '' specially, because
-				 * after E'...''... we should still be in E_QUOTE state.
-				 *
-				 * XXX problem: how do we tell whether the dump was made by a
-				 * version that thinks backslashes aren't special in non-E
-				 * literals??
-				 */
-				if (*qry == '\'' && !AH->sqlparse.backSlash)
+				if (ch == '\'' && !AH->sqlparse.backSlash)
 					AH->sqlparse.state = SQL_SCAN;
-				else if (*qry == '\\')
+				else if (ch == '\\' && !AH->public.std_strings)
 					AH->sqlparse.backSlash = !AH->sqlparse.backSlash;
 				else
 					AH->sqlparse.backSlash = false;
@@ -593,103 +439,93 @@ _sendSQLLine(ArchiveHandle *AH, char *qry, char *eos)
 
 			case SQL_IN_DOUBLE_QUOTE:
 				/* We needn't handle "" specially */
-				if (*qry == '"')
-					AH->sqlparse.state = SQL_SCAN;
-				break;
-
-			case SQL_IN_DOLLAR_TAG:
-				if (*qry == '$')
-				{
-					/* Do not add the closing $ to tagBuf */
-					AH->sqlparse.state = SQL_IN_DOLLAR_QUOTE;
-					AH->sqlparse.minTagEndPos = AH->sqlBuf->len + AH->sqlparse.tagBuf->len + 1;
-				}
-				else if (_isDQChar(*qry, (AH->sqlparse.tagBuf->len == 1)))
-				{
-					/* Valid, so add to tag */
-					appendPQExpBufferChar(AH->sqlparse.tagBuf, *qry);
-				}
-				else
-				{
-					/*
-					 * Ooops, we're not really in a dollar-tag.  Valid tag
-					 * chars do not include the various chars we look for in
-					 * this state machine, so it's safe to just jump from this
-					 * state back to SCAN.	We have to back up the qry pointer
-					 * so that the current character gets rescanned in SCAN
-					 * state; and then "continue" so that the bottom-of-loop
-					 * actions aren't done yet.
-					 */
-					AH->sqlparse.state = SQL_SCAN;
-					qry--;
-					continue;
-				}
-				break;
-
-			case SQL_IN_DOLLAR_QUOTE:
-
-				/*
-				 * If we are at a $, see whether what precedes it matches
-				 * tagBuf.	(Remember that the trailing $ of the tag was not
-				 * added to tagBuf.)  However, don't compare until we have
-				 * enough data to be a possible match --- this is needed to
-				 * avoid false match on '$a$a$...'
-				 */
-				if (*qry == '$' &&
-					AH->sqlBuf->len >= AH->sqlparse.minTagEndPos &&
-					strcmp(AH->sqlparse.tagBuf->data,
-						   AH->sqlBuf->data + AH->sqlBuf->len - AH->sqlparse.tagBuf->len) == 0)
+				if (ch == '"')
 					AH->sqlparse.state = SQL_SCAN;
 				break;
 		}
-
-		appendPQExpBufferChar(AH->sqlBuf, *qry);
-		AH->sqlparse.lastChar = *qry;
 	}
-
-	/*
-	 * If we get here, we've processed entire bufferload with no complete SQL
-	 * stmt
-	 */
-	return eos;
 }
 
 
-/* Convenience function to send one or more queries. Monitors result to handle COPY statements */
+/*
+ * Implement ahwrite() for direct-to-DB restore
+ */
 int
-ExecuteSqlCommandBuf(ArchiveHandle *AH, void *qryv, size_t bufLen)
+ExecuteSqlCommandBuf(ArchiveHandle *AH, const char *buf, size_t bufLen)
 {
-	char	   *qry = (char *) qryv;
-	char	   *eos = qry + bufLen;
-
-	/*
-	 * fprintf(stderr, "\n\n*****\n Buffer:\n\n%s\n*******************\n\n",
-	 * qry);
-	 */
-
-	/* Could switch between command and COPY IN mode at each line */
-	while (qry < eos)
+	if (AH->outputKind == OUTPUT_COPYDATA)
+	{
+		/*
+		 * COPY data.
+		 *
+		 * We drop the data on the floor if libpq has failed to enter COPY
+		 * mode; this allows us to behave reasonably when trying to continue
+		 * after an error in a COPY command.
+		 */
+		if (AH->pgCopyIn &&
+			PQputCopyData(AH->connection, buf, bufLen) <= 0)
+			die_horribly(AH, modulename, "error returned by PQputCopyData: %s",
+						 PQerrorMessage(AH->connection));
+	}
+	else if (AH->outputKind == OUTPUT_OTHERDATA)
+	{
+		/*
+		 * Table data expressed as INSERT commands.
+		 */
+		ExecuteInsertCommands(AH, buf, bufLen);
+	}
+	else
 	{
 		/*
-		 * If libpq is in CopyIn mode *or* if the archive structure shows we
-		 * are sending COPY data, treat the data as COPY data.	The pgCopyIn
-		 * check is only needed for backwards compatibility with ancient
-		 * archive files that might just issue a COPY command without marking
-		 * it properly.  Note that in an archive entry that has a copyStmt,
-		 * all data up to the end of the entry will go to _sendCopyLine, and
-		 * therefore will be dropped if libpq has failed to enter COPY mode.
-		 * Also, if a "\." data terminator is found, anything remaining in the
-		 * archive entry will be dropped.
+		 * General SQL commands; we assume that commands will not be split
+		 * across calls.
+		 *
+		 * In most cases the data passed to us will be a null-terminated
+		 * string, but if it's not, we have to add a trailing null.
 		 */
-		if (AH->pgCopyIn || AH->writingCopyData)
-			qry = _sendCopyLine(AH, qry, eos);
+		if (buf[bufLen] == '\0')
+			ExecuteSqlCommand(AH, buf, "could not execute query");
 		else
-			qry = _sendSQLLine(AH, qry, eos);
+		{
+			char   *str = (char *) malloc(bufLen + 1);
+
+			if (!str)
+				die_horribly(AH, modulename, "out of memory\n");
+			memcpy(str, buf, bufLen);
+			str[bufLen] = '\0';
+			ExecuteSqlCommand(AH, str, "could not execute query");
+			free(str);
+		}
 	}
 
 	return 1;
 }
 
+/*
+ * Terminate a COPY operation during direct-to-DB restore
+ */
+void
+EndDBCopyMode(ArchiveHandle *AH, TocEntry *te)
+{
+	if (AH->pgCopyIn)
+	{
+		PGresult   *res;
+
+		if (PQputCopyEnd(AH->connection, NULL) <= 0)
+			die_horribly(AH, modulename, "error returned by PQputCopyEnd: %s",
+						 PQerrorMessage(AH->connection));
+
+		/* Check command status and return to normal libpq state */
+		res = PQgetResult(AH->connection);
+		if (PQresultStatus(res) != PGRES_COMMAND_OK)
+			warn_or_die_horribly(AH, modulename, "COPY failed for table \"%s\": %s",
+								 te->tag, PQerrorMessage(AH->connection));
+		PQclear(res);
+
+		AH->pgCopyIn = false;
+	}
+}
+
 void
 StartTransaction(ArchiveHandle *AH)
 {
@@ -701,32 +537,3 @@ CommitTransaction(ArchiveHandle *AH)
 {
 	ExecuteSqlCommand(AH, "COMMIT", "could not commit database transaction");
 }
-
-static bool
-_isIdentChar(unsigned char c)
-{
-	if ((c >= 'a' && c <= 'z')
-		|| (c >= 'A' && c <= 'Z')
-		|| (c >= '0' && c <= '9')
-		|| (c == '_')
-		|| (c == '$')
-		|| (c >= (unsigned char) '\200')		/* no need to check <= \377 */
-		)
-		return true;
-	else
-		return false;
-}
-
-static bool
-_isDQChar(unsigned char c, bool atStart)
-{
-	if ((c >= 'a' && c <= 'z')
-		|| (c >= 'A' && c <= 'Z')
-		|| (c == '_')
-		|| (!atStart && c >= '0' && c <= '9')
-		|| (c >= (unsigned char) '\200')		/* no need to check <= \377 */
-		)
-		return true;
-	else
-		return false;
-}
diff --git a/src/bin/pg_dump/pg_backup_db.h b/src/bin/pg_dump/pg_backup_db.h
index 8d09eebe89d4..3d8522f0a4a8 100644
--- a/src/bin/pg_dump/pg_backup_db.h
+++ b/src/bin/pg_dump/pg_backup_db.h
@@ -10,7 +10,9 @@
 
 #include "pg_backup_archiver.h"
 
-extern int	ExecuteSqlCommandBuf(ArchiveHandle *AH, void *qry, size_t bufLen);
+extern int	ExecuteSqlCommandBuf(ArchiveHandle *AH, const char *buf, size_t bufLen);
+
+extern void EndDBCopyMode(ArchiveHandle *AH, struct _tocEntry * te);
 
 extern void StartTransaction(ArchiveHandle *AH);
 extern void CommitTransaction(ArchiveHandle *AH);
diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c
index 604027a0b95a..2a957eecd47d 100644
--- a/src/bin/pg_dump/pg_backup_files.c
+++ b/src/bin/pg_dump/pg_backup_files.c
@@ -20,7 +20,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.31 2007/02/19 15:05:06 mha Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.34 2007/10/28 21:55:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -121,12 +121,17 @@ InitArchiveFmt_Files(ArchiveHandle *AH)
 		if (AH->fSpec && strcmp(AH->fSpec, "") != 0)
 		{
 			AH->FH = fopen(AH->fSpec, PG_BINARY_W);
+			if (AH->FH == NULL)
+				die_horribly(NULL, modulename, "could not open output file \"%s\": %s\n",
+							 AH->fSpec, strerror(errno));
 		}
 		else
+		{
 			AH->FH = stdout;
-
-		if (AH->FH == NULL)
-			die_horribly(NULL, modulename, "could not open output file: %s\n", strerror(errno));
+			if (AH->FH == NULL)
+				die_horribly(NULL, modulename, "could not open output file: %s\n",
+							 strerror(errno));
+		}
 
 		ctx->hasSeek = checkSeek(AH->FH);
 
@@ -139,12 +144,19 @@ InitArchiveFmt_Files(ArchiveHandle *AH)
 	{							/* Read Mode */
 
 		if (AH->fSpec && strcmp(AH->fSpec, "") != 0)
+		{
 			AH->FH = fopen(AH->fSpec, PG_BINARY_R);
+			if (AH->FH == NULL)
+				die_horribly(NULL, modulename, "could not open input file \"%s\": %s\n",
+							 AH->fSpec, strerror(errno));
+		}
 		else
+		{
 			AH->FH = stdin;
-
-		if (AH->FH == NULL)
-			die_horribly(NULL, modulename, "could not open input file: %s\n", strerror(errno));
+			if (AH->FH == NULL)
+				die_horribly(NULL, modulename, "could not open input file: %s\n",
+							 strerror(errno));
+		}
 
 		ctx->hasSeek = checkSeek(AH->FH);
 
@@ -242,7 +254,8 @@ _StartData(ArchiveHandle *AH, TocEntry *te)
 #endif
 
 	if (tctx->FH == NULL)
-		die_horribly(AH, modulename, "could not open output file: %s\n", strerror(errno));
+		die_horribly(AH, modulename, "could not open output file \"%s\": %s\n",
+					 tctx->filename, strerror(errno));
 }
 
 static size_t
@@ -286,8 +299,9 @@ _PrintFileData(ArchiveHandle *AH, char *filename, RestoreOptions *ropt)
 	FILE *FH = fopen(filename, PG_BINARY_R);
 #endif
 
-	if (FH == NULL)
-		die_horribly(AH, modulename, "could not open input file: %s\n", strerror(errno));
+	if (AH->FH == NULL)
+		die_horribly(AH, modulename, "could not open input file \"%s\": %s\n",
+					 filename, strerror(errno));
 
 	while ((cnt = GZREAD(buf, 1, 4095, FH)) > 0)
 	{
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index 9f01343394bc..33f85f75d313 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -99,16 +99,16 @@ _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen)
 {
 	if (dLen > 0)
 	{
-		unsigned char *str;
-		size_t		len;
+		PQExpBuffer buf = createPQExpBuffer();
 
-		str = PQescapeBytea((const unsigned char *) data, dLen, &len);
-		if (!str)
-			die_horribly(AH, NULL, "out of memory\n");
+		appendByteaLiteralAHX(buf,
+							  (const unsigned char *) data,
+							  dLen,
+							  AH);
 
-		ahprintf(AH, "SELECT pg_catalog.lowrite(0, '%s');\n", str);
+		ahprintf(AH, "SELECT pg_catalog.lowrite(0, %s);\n", buf->data);
 
-		free(str);
+		destroyPQExpBuffer(buf);
 	}
 	return dLen;
 }
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index bb1b9d4248ba..bcee25b9d1de 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.57 2007/02/19 15:05:06 mha Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.62 2007/11/15 21:14:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -176,13 +176,21 @@ InitArchiveFmt_Tar(ArchiveHandle *AH)
 	if (AH->mode == archModeWrite)
 	{
 		if (AH->fSpec && strcmp(AH->fSpec, "") != 0)
+		{
 			ctx->tarFH = fopen(AH->fSpec, PG_BINARY_W);
+			if (ctx->tarFH == NULL)
+				die_horribly(NULL, modulename,
+						   "could not open TOC file \"%s\" for output: %s\n",
+							 AH->fSpec, strerror(errno));
+		}
 		else
+		{
 			ctx->tarFH = stdout;
-
-		if (ctx->tarFH == NULL)
-			die_horribly(NULL, modulename,
-				"could not open TOC file for output: %s\n", strerror(errno));
+			if (ctx->tarFH == NULL)
+				die_horribly(NULL, modulename,
+							 "could not open TOC file for output: %s\n",
+							 strerror(errno));
+		}
 
 		ctx->tarFHpos = 0;
 
@@ -212,14 +220,20 @@ InitArchiveFmt_Tar(ArchiveHandle *AH)
 	}
 	else
 	{							/* Read Mode */
-
 		if (AH->fSpec && strcmp(AH->fSpec, "") != 0)
+		{
 			ctx->tarFH = fopen(AH->fSpec, PG_BINARY_R);
+			if (ctx->tarFH == NULL)
+				die_horribly(NULL, modulename, "could not open TOC file \"%s\" for input: %s\n",
+							 AH->fSpec, strerror(errno));
+		}
 		else
+		{
 			ctx->tarFH = stdin;
-
-		if (ctx->tarFH == NULL)
-			die_horribly(NULL, modulename, "could not open TOC file for input: %s\n", strerror(errno));
+			if (ctx->tarFH == NULL)
+				die_horribly(NULL, modulename, "could not open TOC file for input: %s\n",
+							 strerror(errno));
+		}
 
 		/*
 		 * Make unbuffered since we will dup() it, and the buffers screw each
@@ -728,56 +742,46 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt)
 {
 	lclContext *ctx = (lclContext *) AH->formatData;
 	lclTocEntry *tctx = (lclTocEntry *) te->formatData;
-	char	   *tmpCopy;
-	size_t		i,
-				pos1,
-				pos2;
+	int			pos1;
 
 	if (!tctx->filename)
 		return;
 
+	/*
+	 * If we're writing the special restore.sql script, emit a suitable
+	 * command to include each table's data from the corresponding file.
+	 *
+	 * In the COPY case this is a bit klugy because the regular COPY command
+	 * was already printed before we get control.
+	 */
 	if (ctx->isSpecialScript)
 	{
-		if (!te->copyStmt)
-			return;
-
-		/* Abort the default COPY */
-		ahprintf(AH, "\\.\n");
-
-		/* Get a copy of the COPY statement and clean it up */
-		tmpCopy = strdup(te->copyStmt);
-		for (i = 0; i < strlen(tmpCopy); i++)
-			tmpCopy[i] = pg_tolower((unsigned char) tmpCopy[i]);
-
-		/*
-		 * This is very nasty; we don't know if the archive used WITH OIDS, so
-		 * we search the string for it in a paranoid sort of way.
-		 */
-		if (strncmp(tmpCopy, "copy ", 5) != 0)
-			die_horribly(AH, modulename,
-						 "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n", tmpCopy);
-
-		pos1 = 5;
-		for (pos1 = 5; pos1 < strlen(tmpCopy); pos1++)
-			if (tmpCopy[pos1] != ' ')
-				break;
-
-		if (tmpCopy[pos1] == '"')
-			pos1 += 2;
-
-		pos1 += strlen(te->tag);
-
-		for (pos2 = pos1; pos2 < strlen(tmpCopy); pos2++)
-			if (strncmp(&tmpCopy[pos2], "from stdin", 10) == 0)
-				break;
+		if (te->copyStmt)
+		{
+			/* Abort the COPY FROM stdin */
+			ahprintf(AH, "\\.\n");
 
-		if (pos2 >= strlen(tmpCopy))
-			die_horribly(AH, modulename,
-						 "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" starting at position %lu\n",
-						 tmpCopy, (unsigned long) pos1);
+			/*
+			 * The COPY statement should look like "COPY ... FROM stdin;\n",
+			 * see dumpTableData().
+			 */
+			pos1 = (int) strlen(te->copyStmt) - 13;
+			if (pos1 < 6 || strncmp(te->copyStmt, "COPY ", 5) != 0 ||
+				strcmp(te->copyStmt + pos1, " FROM stdin;\n") != 0)
+				die_horribly(AH, modulename,
+							 "unexpected COPY statement syntax: \"%s\"\n",
+							 te->copyStmt);
 
-		ahwrite(tmpCopy, 1, pos2, AH);	/* 'copy "table" [with oids]' */
-		ahprintf(AH, " from '$$PATH$$/%s' %s", tctx->filename, &tmpCopy[pos2 + 10]);
+			/* Emit all but the FROM part ... */
+			ahwrite(te->copyStmt, 1, pos1, AH);
+			/* ... and insert modified FROM */
+			ahprintf(AH, " FROM '$$PATH$$/%s';\n\n", tctx->filename);
+		}
+		else
+		{
+			/* --inserts mode, no worries, just include the data file */
+			ahprintf(AH, "\\i $$PATH$$/%s\n\n", tctx->filename);
+		}
 
 		return;
 	}
@@ -810,7 +814,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt)
 			oid = atooid(&th->targetFile[5]);
 			if (oid != 0)
 			{
-				ahlog(AH, 1, "restoring large object OID %u\n", oid);
+				ahlog(AH, 1, "restoring large object with OID %u\n", oid);
 
 				StartRestoreBlob(AH, oid);
 
@@ -923,18 +927,14 @@ _CloseArchive(ArchiveHandle *AH)
 		 * if the files have been extracted.
 		 */
 		th = tarOpen(AH, "restore.sql", 'w');
-		tarPrintf(AH, th, "create temporary table pgdump_restore_path(p text);\n");
+
 		tarPrintf(AH, th, "--\n"
 				  "-- NOTE:\n"
 				  "--\n"
 				  "-- File paths need to be edited. Search for $$PATH$$ and\n"
 				  "-- replace it with the path to the directory containing\n"
 				  "-- the extracted data files.\n"
-				  "--\n"
-				  "-- Edit the following to match the path where the\n"
-				  "-- tar archive has been extracted.\n"
 				  "--\n");
-		tarPrintf(AH, th, "insert into pgdump_restore_path values('/tmp');\n\n");
 
 		AH->CustomOutPtr = _scriptOut;
 
@@ -956,8 +956,12 @@ _CloseArchive(ArchiveHandle *AH)
 
 		tarClose(AH, th);
 
-		/* Add a block of NULLs since it's de-rigeur. */
-		for (i = 0; i < 512; i++)
+		ctx->isSpecialScript = 0;
+
+		/*
+		 * EOF marker for tar files is two blocks of NULLs.
+		 */
+		for (i = 0; i < 512 * 2; i++)
 		{
 			if (fputc(0, ctx->tarFH) == EOF)
 				die_horribly(AH, modulename,
@@ -1108,11 +1112,16 @@ _tarChecksum(char *header)
 	int			i,
 				sum;
 
-	sum = 0;
+	/*
+	 * Per POSIX, the checksum is the simple sum of all bytes in the header,
+	 * treating the bytes as unsigned, and treating the checksum field (at
+	 * offset 148) as though it contained 8 spaces.
+	 */
+	sum = 8 * ' ';				/* presumed value for checksum field */
 	for (i = 0; i < 512; i++)
 		if (i < 148 || i >= 156)
 			sum += 0xFF & header[i];
-	return sum + 256;			/* Assume 8 blanks in checksum field */
+	return sum;
 }
 
 bool
@@ -1126,11 +1135,15 @@ isValidTarHeader(char *header)
 	if (sum != chk)
 		return false;
 
-	/* POSIX format */
-	if (strncmp(&header[257], "ustar00", 7) == 0)
+	/* POSIX tar format */
+	if (memcmp(&header[257], "ustar\0", 6) == 0 &&
+		memcmp(&header[263], "00", 2) == 0)
+		return true;
+	/* GNU tar format */
+	if (memcmp(&header[257], "ustar  \0", 8) == 0)
 		return true;
-	/* older format */
-	if (strncmp(&header[257], "ustar  ", 7) == 0)
+	/* not-quite-POSIX format written by pre-9.3 pg_dump */
+	if (memcmp(&header[257], "ustar00\0", 8) == 0)
 		return true;
 
 	return false;
@@ -1157,8 +1170,8 @@ _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th)
 	fseeko(tmp, 0, SEEK_SET);
 
 	/*
-	 * Some compilers with throw a warning knowing this test can never be true
-	 * because pgoff_t can't exceed the compared maximum.
+	 * Some compilers will throw a warning knowing this test can never be true
+	 * because pgoff_t can't exceed the compared maximum on their platform.
 	 */
 	if (th->fileLen > MAX_TAR_MEMBER_FILELEN)
 		die_horribly(AH, modulename, "archive member too large for tar format\n");
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 0520fcf754e8..d603ce6983bf 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -26,7 +26,7 @@
  *	http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.460 2007/02/14 01:58:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.482.2.2 2009/04/01 18:54:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -140,10 +140,6 @@ char		g_comment_end[10];
 
 static const CatalogId nilCatalogId = {0, 0};
 
-/* these are to avoid passing around info for findNamespace() */
-static NamespaceInfo *g_namespaces;
-static int	g_numNamespaces;
-
 const char *EXT_PARTITION_NAME_POSTFIX = "_external_partition__";
 /* flag to turn on/off dollar quoting */
 static int	disable_dollar_quoting = 0;
@@ -176,6 +172,7 @@ static void dumpNamespace(Archive *fout, NamespaceInfo *nspinfo);
 static void dumpType(Archive *fout, TypeInfo *tinfo);
 static void dumpBaseType(Archive *fout, TypeInfo *tinfo);
 static void dumpTypeStorageOptions(Archive *fout, TypeStorageOptions *tstorageoptions);
+static void dumpEnumType(Archive *fout, TypeInfo *tinfo);
 static void dumpDomain(Archive *fout, TypeInfo *tinfo);
 static void dumpCompositeType(Archive *fout, TypeInfo *tinfo);
 static void dumpShellType(Archive *fout, ShellTypeInfo *stinfo);
@@ -199,6 +196,10 @@ static void dumpSequence(Archive *fout, TableInfo *tbinfo);
 static void dumpIndex(Archive *fout, IndxInfo *indxinfo);
 static void dumpConstraint(Archive *fout, ConstraintInfo *coninfo);
 static void dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo);
+static void dumpTSParser(Archive *fout, TSParserInfo *prsinfo);
+static void dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo);
+static void dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo);
+static void dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo);
 
 static void dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
 		const char *type, const char *name,
@@ -222,6 +223,7 @@ static char *format_table_function_columns(FuncInfo *finfo, int nallargs,
 							  char **argnames);
 static const char *convertRegProcReference(const char *proc);
 static const char *convertOperatorReference(const char *opr);
+static const char *convertTSFunction(Oid funcOid);
 static void selectSourceSchema(const char *schemaName);
 static bool testGPbackend(void);
 static bool testPartitioningSupport(void);
@@ -671,56 +673,51 @@ main(int argc, char **argv)
 
 	if (dataOnly && schemaOnly)
 	{
-		write_msg(NULL, "options \"schema only\" (-s) and \"data only\" (-a) cannot be used together\n");
+		write_msg(NULL, "options -s/--schema-only and -a/--data-only cannot be used together\n");
 		exit(1);
 	}
 
 	if (dataOnly && outputClean)
 	{
-		write_msg(NULL, "options \"clean\" (-c) and \"data only\" (-a) cannot be used together\n");
+		write_msg(NULL, "options -c/--clean and -a/--data-only cannot be used together\n");
 		exit(1);
 	}
 
 	if (dump_inserts && oids)
 	{
-		write_msg(NULL, "options --inserts/--column-inserts (-d, -D) and OID (-o) options cannot be used together\n");
+		write_msg(NULL, "options --inserts/--column-inserts (-d, -D) and OID (-o, --oids) options cannot be used together\n");
 		write_msg(NULL, "(The INSERT command cannot set OIDs.)\n");
 		exit(1);
 	}
 
 	/* open the output file */
-	switch (format[0])
+	if (pg_strcasecmp(format, "a") == 0 || pg_strcasecmp(format, "append") == 0)
 	{
-		case 'a':
-		case 'A':
-			plainText = 1;
-			g_fout = CreateArchive(filename, archNull, 0, archModeAppend);
-			break;
-
-		case 'c':
-		case 'C':
-			g_fout = CreateArchive(filename, archCustom, compressLevel, archModeWrite);
-			break;
-
-		case 'f':
-		case 'F':
-			g_fout = CreateArchive(filename, archFiles, compressLevel, archModeWrite);
-			break;
-
-		case 'p':
-		case 'P':
-			plainText = 1;
-			g_fout = CreateArchive(filename, archNull, 0, archModeWrite);
-			break;
-
-		case 't':
-		case 'T':
-			g_fout = CreateArchive(filename, archTar, compressLevel, archModeWrite);
-			break;
-
-		default:
-			write_msg(NULL, "invalid output format \"%s\" specified\n", format);
-			exit(1);
+		/* This is used by pg_dumpall, and is not documented */
+		plainText = 1;
+		g_fout = CreateArchive(filename, archNull, 0, archModeAppend);
+	}
+	else if (pg_strcasecmp(format, "c") == 0 || pg_strcasecmp(format, "custom") == 0)
+		g_fout = CreateArchive(filename, archCustom, compressLevel, archModeWrite);
+	else if (pg_strcasecmp(format, "f") == 0 || pg_strcasecmp(format, "file") == 0)
+	{
+		/*
+		 * Dump files into the current directory; for demonstration only, not
+		 * documented.
+		 */
+		g_fout = CreateArchive(filename, archFiles, compressLevel, archModeWrite);
+	}
+	else if (pg_strcasecmp(format, "p") == 0 || pg_strcasecmp(format, "plain") == 0)
+	{
+		plainText = 1;
+		g_fout = CreateArchive(filename, archNull, 0, archModeWrite);
+	}
+	else if (pg_strcasecmp(format, "t") == 0 || pg_strcasecmp(format, "tar") == 0)
+		g_fout = CreateArchive(filename, archTar, compressLevel, archModeWrite);
+	else
+	{
+		write_msg(NULL, "invalid output format \"%s\" specified\n", format);
+		exit(1);
 	}
 
 	if (g_fout == NULL)
@@ -795,6 +792,18 @@ main(int argc, char **argv)
 			break;
 	}
 
+	/*
+	 * If supported, set extra_float_digits so that we can dump float data
+	 * exactly (given correctly implemented float I/O code, anyway)
+	 */
+	do_sql_command(g_conn, "SET extra_float_digits TO 2");
+
+	/*
+	 * If synchronized scanning is supported, disable it, to prevent
+	 * unpredictable changes in row ordering across a dump and reload.
+	 */
+	do_sql_command(g_conn, "SET synchronize_seqscans TO off");
+
 	/*
 	 * Start serializable transaction to dump consistent data.
 	 */
@@ -805,12 +814,6 @@ main(int argc, char **argv)
 	/* Select the appropriate subquery to convert user IDs to names */
 	username_subquery = "SELECT rolname FROM pg_catalog.pg_roles WHERE oid =";
 
-	/*
-	 * If supported, set extra_float_digits so that we can dump float data
-	 * exactly (given correctly implemented float I/O code, anyway)
-	 */
-	do_sql_command(g_conn, "SET extra_float_digits TO 2");
-
 	/*
 	 * Remember whether or not this GP database supports partitioning.
 	 */
@@ -1218,18 +1221,47 @@ selectDumpableTable(TableInfo *tbinfo)
 /*
  * selectDumpableType: policy-setting subroutine
  *		Mark a type as to be dumped or not
+ *
+ * If it's a table's rowtype or an autogenerated array type, we also apply a
+ * special type code to facilitate sorting into the desired order.  (We don't
+ * want to consider those to be ordinary types because that would bring tables
+ * up into the datatype part of the dump order.)  We still set the object's
+ * dump flag; that's not going to cause the dummy type to be dumped, but we
+ * need it so that casts involving such types will be dumped correctly -- see
+ * dumpCast.  This means the flag should be set the same as for the underlying
+ * object (the table or base type).
  */
 static void
 selectDumpableType(TypeInfo *tinfo)
 {
-	/* Dump only types in dumpable namespaces */
-	if (!tinfo->dobj.namespace->dobj.dump)
-		tinfo->dobj.dump = false;
-
 	/* skip complex types, except for standalone composite types */
-	/* (note: this test should now be unnecessary) */
-	else if (OidIsValid(tinfo->typrelid) &&
-			 tinfo->typrelkind != RELKIND_COMPOSITE_TYPE)
+	if (OidIsValid(tinfo->typrelid) &&
+		tinfo->typrelkind != RELKIND_COMPOSITE_TYPE)
+	{
+		TableInfo  *tytable = findTableByOid(tinfo->typrelid);
+
+		tinfo->dobj.objType = DO_DUMMY_TYPE;
+		if (tytable != NULL)
+			tinfo->dobj.dump = tytable->dobj.dump;
+		else
+			tinfo->dobj.dump = false;
+		return;
+	}
+
+	/* skip auto-generated array types */
+	if (tinfo->isArray)
+	{
+		tinfo->dobj.objType = DO_DUMMY_TYPE;
+		/*
+		 * Fall through to set the dump flag; we assume that the subsequent
+		 * rules will do the same thing as they would for the array's base
+		 * type.  (We cannot reliably look up the base type here, since
+		 * getTypes may not have processed it yet.)
+		 */
+	}
+
+	/* dump only types in dumpable namespaces */
+	if (!tinfo->dobj.namespace->dobj.dump)
 		tinfo->dobj.dump = false;
 
 	/* skip undefined placeholder types */
@@ -1355,7 +1387,7 @@ dumpTableData_copy(Archive *fout, void *dcontext)
 			PQfreemem(copybuf);
 		}
 
-		/*
+		/* ----------
 		 * THROTTLE:
 		 *
 		 * There was considerable discussion in late July, 2000 regarding
@@ -1368,9 +1400,14 @@ dumpTableData_copy(Archive *fout, void *dcontext)
 		 * implementation was suggested. The latter failed because the loop
 		 * was too tight. Finally, the following was implemented:
 		 *
-		 * If throttle is non-zero, then See how long since the last sleep.
-		 * Work out how long to sleep (based on ratio). If sleep is more than
-		 * 100ms, then sleep reset timer EndIf EndIf
+		 * If throttle is non-zero, then
+		 *		See how long since the last sleep.
+		 *		Work out how long to sleep (based on ratio).
+		 *		If sleep is more than 100ms, then
+		 *			sleep
+		 *			reset timer
+		 *		EndIf
+		 * EndIf
 		 *
 		 * where the throttle value was the number of ms to sleep per ms of
 		 * work. The calculation was done in each loop.
@@ -1393,6 +1430,7 @@ dumpTableData_copy(Archive *fout, void *dcontext)
 		 *
 		 * This will return after the interval specified in the structure tvi.
 		 * Finally, call gettimeofday again to save the 'last sleep time'.
+		 * ----------
 		 */
 	}
 	archprintf(fout, "\\.\n\n\n");
@@ -1415,6 +1453,14 @@ dumpTableData_copy(Archive *fout, void *dcontext)
 	return 1;
 }
 
+/*
+ * Dump table data using INSERT commands.
+ *
+ * Caution: when we restore from an archive file direct to database, the
+ * INSERT commands emitted by this function have to be parsed by
+ * pg_backup_db.c's ExecuteInsertCommands(), which will not handle comments,
+ * E'' strings, or dollar-quoted strings.  So don't emit anything like that.
+ */
 static int
 dumpTableData_insert(Archive *fout, void *dcontext)
 {
@@ -1762,6 +1808,7 @@ dumpDatabase(Archive *AH)
 	if (comment && strlen(comment))
 	{
 		resetPQExpBuffer(dbQry);
+		/* Generates warning when loaded into a differently-named database.*/
 		appendPQExpBuffer(dbQry, "COMMENT ON DATABASE %s IS ", fmtId(datname));
 		appendStringLiteralAH(dbQry, comment, AH);
 		appendPQExpBuffer(dbQry, ";\n");
@@ -1962,7 +2009,11 @@ dumpBlobComments(Archive *AH, void *arg __attribute__((unused)))
 	selectSourceSchema("pg_catalog");
 
 	/* Cursor to get all BLOB comments */
-	blobQry = "DECLARE blobcmt CURSOR FOR SELECT loid, obj_description(loid, 'pg_largeobject') FROM (SELECT DISTINCT loid FROM pg_largeobject) ss";
+	blobQry = "DECLARE blobcmt CURSOR FOR SELECT loid, "
+			  "obj_description(loid, 'pg_largeobject') "
+			  "FROM (SELECT DISTINCT loid FROM "
+			  "pg_description d JOIN pg_largeobject l ON (objoid = loid) "
+			  "WHERE classoid = 'pg_largeobject'::regclass) ss";
 
 	res = PQexec(g_conn, blobQry);
 	check_sql_result(res, g_conn, blobQry, PGRES_COMMAND_OK);
@@ -2078,8 +2129,7 @@ getNamespaces(int *numNamespaces)
 	PQclear(res);
 	destroyPQExpBuffer(query);
 
-	g_namespaces = nsinfo;
-	g_numNamespaces = *numNamespaces = ntups;
+	*numNamespaces = ntups;
 
 	return nsinfo;
 }
@@ -2090,24 +2140,23 @@ getNamespaces(int *numNamespaces)
  *		getNamespaces
  *
  * NB: for pre-7.3 source database, we use object OID to guess whether it's
- * a system object or not.	In 7.3 and later there is no guessing.
+ * a system object or not.	In 7.3 and later there is no guessing, and we
+ * don't use objoid at all.
  */
 static NamespaceInfo *
 findNamespace(Oid nsoid, Oid objoid)
 {
-	int			i;
+	NamespaceInfo *nsinfo;
 
-	for (i = 0; i < g_numNamespaces; i++)
-	{
-		NamespaceInfo *nsinfo = &g_namespaces[i];
+	nsinfo = findNamespaceByOid(nsoid);
 
-		if (nsoid == nsinfo->dobj.catId.oid)
-			return nsinfo;
+	if (nsinfo == NULL)
+	{
+		write_msg(NULL, "schema with OID %u does not exist\n", nsoid);
+		exit_nicely();
 	}
-	write_msg(NULL, "schema with OID %u does not exist\n", nsoid);
-	exit_nicely();
 
-	return NULL;				/* keep compiler quiet */
+	return nsinfo;
 }
 
 /*
@@ -2155,7 +2204,7 @@ getTypes(int *numTypes)
 	 * auto-generated array type by checking the element type's typarray.
 	 * (Before that the test is capable of generating false positives.) We
 	 * still check for name beginning with '_', though, so as to avoid the
-	 * cost of the subselect probe for all standard types.  This would have to
+	 * cost of the subselect probe for all standard types.	This would have to
 	 * be revisited if the backend ever allows renaming of array types.
 	 */
 
@@ -2212,16 +2261,6 @@ getTypes(int *numTypes)
 		tinfo[i].typtype = *PQgetvalue(res, i, i_typtype);
 		tinfo[i].shellType = NULL;
 
-		/*
-		 * If it's a table's rowtype, use special type code to facilitate
-		 * sorting into the desired order.	(We don't want to consider it an
-		 * ordinary type because that would bring the table up into the
-		 * datatype part of the dump order.)
-		 */
-		if (OidIsValid(tinfo[i].typrelid) &&
-			tinfo[i].typrelkind != RELKIND_COMPOSITE_TYPE)
-			tinfo[i].dobj.objType = DO_TABLE_TYPE;
-
 		if (strcmp(PQgetvalue(res, i, i_typisdefined), "t") == 0)
 			tinfo[i].isDefined = true;
 		else
@@ -2240,7 +2279,7 @@ getTypes(int *numTypes)
 		 */
 		tinfo[i].nDomChecks = 0;
 		tinfo[i].domChecks = NULL;
-		if (tinfo[i].dobj.dump && tinfo[i].typtype == 'd')
+		if (tinfo[i].dobj.dump && tinfo[i].typtype == TYPTYPE_DOMAIN)
 			getDomainConstraints(&(tinfo[i]));
 
 		/*
@@ -2252,7 +2291,7 @@ getTypes(int *numTypes)
 		 * should copy the base type's catId, but then it might capture the
 		 * pg_depend entries for the type, which we don't want.
 		 */
-		if (tinfo[i].dobj.dump && tinfo[i].typtype == 'b')
+		if (tinfo[i].dobj.dump && tinfo[i].typtype == TYPTYPE_BASE)
 		{
 			stinfo = (ShellTypeInfo *) malloc(sizeof(ShellTypeInfo));
 			stinfo->dobj.objType = DO_SHELL_TYPE;
@@ -3205,40 +3244,45 @@ getTables(int *numTables)
 
 	PQclear(res);
 
+	destroyPQExpBuffer(query);
+	destroyPQExpBuffer(delqry);
+	destroyPQExpBuffer(lockquery);
+
+	return tblinfo;
+}
+
+/*
+ * getOwnedSeqs
+ *	  identify owned sequences and mark them as dumpable if owning table is
+ *
+ * We used to do this in getTables(), but it's better to do it after the
+ * index used by findTableByOid() has been set up.
+ */
+void
+getOwnedSeqs(TableInfo tblinfo[], int numTables)
+{
+	int			i;
+
 	/*
 	 * Force sequences that are "owned" by table columns to be dumped whenever
 	 * their owning table is being dumped.
 	 */
-	for (i = 0; i < ntups; i++)
+	for (i = 0; i < numTables; i++)
 	{
 		TableInfo  *seqinfo = &tblinfo[i];
-		int			j;
+		TableInfo  *owning_tab;
 
 		if (!OidIsValid(seqinfo->owning_tab))
 			continue;			/* not an owned sequence */
 		if (seqinfo->dobj.dump)
 			continue;			/* no need to search */
-
-		/* can't use findTableByOid yet, unfortunately */
-		for (j = 0; j < ntups; j++)
+		owning_tab = findTableByOid(seqinfo->owning_tab);
+		if (owning_tab && owning_tab->dobj.dump)
 		{
-			if (tblinfo[j].dobj.catId.oid == seqinfo->owning_tab)
-			{
-				if (tblinfo[j].dobj.dump)
-				{
-					seqinfo->interesting = true;
-					seqinfo->dobj.dump = true;
-				}
-				break;
-			}
+			seqinfo->interesting = true;
+			seqinfo->dobj.dump = true;
 		}
 	}
-
-	destroyPQExpBuffer(query);
-	destroyPQExpBuffer(delqry);
-	destroyPQExpBuffer(lockquery);
-
-	return tblinfo;
 }
 
 /*
@@ -3651,15 +3695,29 @@ getRules(int *numRules)
 	int			i_ruletable;
 	int			i_ev_type;
 	int			i_is_instead;
+	int			i_ev_enabled;
 
 	/* Make sure we are in proper schema */
 	selectSourceSchema("pg_catalog");
 
-	appendPQExpBuffer(query, "SELECT "
-					  "tableoid, oid, rulename, "
-					  "ev_class as ruletable, ev_type, is_instead "
-					  "FROM pg_rewrite "
-					  "ORDER BY oid");
+	if (g_fout->remoteVersion >= 80300)
+	{
+		appendPQExpBuffer(query, "SELECT "
+						  "tableoid, oid, rulename, "
+						  "ev_class as ruletable, ev_type, is_instead, "
+						  "ev_enabled "
+						  "FROM pg_rewrite "
+						  "ORDER BY oid");
+	}
+	else
+	{
+		appendPQExpBuffer(query, "SELECT "
+						  "tableoid, oid, rulename, "
+						  "ev_class as ruletable, ev_type, is_instead, "
+						  "'O'::char as ev_enabled "
+						  "FROM pg_rewrite "
+						  "ORDER BY oid");
+	}
 
 	res = PQexec(g_conn, query->data);
 	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
@@ -3676,6 +3734,7 @@ getRules(int *numRules)
 	i_ruletable = PQfnumber(res, "ruletable");
 	i_ev_type = PQfnumber(res, "ev_type");
 	i_is_instead = PQfnumber(res, "is_instead");
+	i_ev_enabled = PQfnumber(res, "ev_enabled");
 
 	for (i = 0; i < ntups; i++)
 	{
@@ -3699,6 +3758,7 @@ getRules(int *numRules)
 		ruleinfo[i].dobj.dump = ruleinfo[i].ruletable->dobj.dump;
 		ruleinfo[i].ev_type = *(PQgetvalue(res, i, i_ev_type));
 		ruleinfo[i].is_instead = *(PQgetvalue(res, i, i_is_instead)) == 't';
+		ruleinfo[i].ev_enabled = *(PQgetvalue(res, i, i_ev_enabled));
 		if (ruleinfo[i].ruletable)
 		{
 			/*
@@ -3869,7 +3929,7 @@ getTriggers(TableInfo tblinfo[], int numTables)
 			tginfo[j].tgnargs = atoi(PQgetvalue(res, j, i_tgnargs));
 			tginfo[j].tgargs = strdup(PQgetvalue(res, j, i_tgargs));
 			tginfo[j].tgisconstraint = *(PQgetvalue(res, j, i_tgisconstraint)) == 't';
-			tginfo[j].tgenabled = *(PQgetvalue(res, j, i_tgenabled)) == 't';
+			tginfo[j].tgenabled = *(PQgetvalue(res, j, i_tgenabled));
 			tginfo[j].tgdeferrable = *(PQgetvalue(res, j, i_tgdeferrable)) == 't';
 			tginfo[j].tginitdeferred = *(PQgetvalue(res, j, i_tginitdeferred)) == 't';
 
@@ -3935,13 +3995,28 @@ getProcLangs(int *numProcLangs)
 	/* Make sure we are in proper schema */
 	selectSourceSchema("pg_catalog");
 
-	/* Languages are owned by the bootstrap superuser, OID 10 */
-	appendPQExpBuffer(query, "SELECT tableoid, oid, *, "
-					  "(%s '10') as lanowner "
-					  "FROM pg_language "
-					  "WHERE lanispl "
-					  "ORDER BY oid",
-					  username_subquery);
+	if (g_fout->remoteVersion >= 80300)
+	{
+		/* pg_language has a lanowner column */
+		appendPQExpBuffer(query, "SELECT tableoid, oid, "
+						  "lanname, lanpltrusted, lanplcallfoid, "
+						  "lanvalidator,  lanacl, "
+						  "(%s lanowner) as lanowner "
+						  "FROM pg_language "
+						  "WHERE lanispl "
+						  "ORDER BY oid",
+						  username_subquery);
+	}
+	else
+	{
+		/* Languages are owned by the bootstrap superuser, OID 10 */
+		appendPQExpBuffer(query, "SELECT tableoid, oid, *, "
+						  "(%s '10') as lanowner "
+						  "FROM pg_language "
+						  "WHERE lanispl "
+						  "ORDER BY oid",
+						  username_subquery);
+	}
 
 	res = PQexec(g_conn, query->data);
 	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
@@ -4214,11 +4289,9 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 		tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
-		tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
-		tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool));
-		tbinfo->inhAttrDef = (bool *) malloc(ntups * sizeof(bool));
 		tbinfo->inhNotNull = (bool *) malloc(ntups * sizeof(bool));
-		tbinfo->attencoding = (char **)malloc(ntups * sizeof(char *));
+		tbinfo->attencoding = (char **) malloc(ntups * sizeof(char *));
+		tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
 		hasdefaults = false;
 
 		for (j = 0; j < ntups; j++)
@@ -4243,8 +4316,6 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 				hasdefaults = true;
 
 			/* these flags will be set in flagInhAttrs() */
-			tbinfo->inhAttrs[j] = false;
-			tbinfo->inhAttrDef[j] = false;
 			tbinfo->inhNotNull[j] = false;
 
 			/* column storage attributes */
@@ -4286,12 +4357,28 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 			{
 				int			adnum;
 
+				adnum = atoi(PQgetvalue(res, j, 2));
+
+				if (adnum <= 0 || adnum > ntups)
+				{
+					write_msg(NULL, "invalid adnum value %d for table \"%s\"\n",
+							  adnum, tbinfo->dobj.name);
+					exit_nicely();
+				}
+
+				/*
+				 * dropped columns shouldn't have defaults, but just in case,
+				 * ignore 'em
+				 */
+				if (tbinfo->attisdropped[adnum - 1])
+					continue;
+
 				attrdefs[j].dobj.objType = DO_ATTRDEF;
 				attrdefs[j].dobj.catId.tableoid = atooid(PQgetvalue(res, j, 0));
 				attrdefs[j].dobj.catId.oid = atooid(PQgetvalue(res, j, 1));
 				AssignDumpId(&attrdefs[j].dobj);
 				attrdefs[j].adtable = tbinfo;
-				attrdefs[j].adnum = adnum = atoi(PQgetvalue(res, j, 2));
+				attrdefs[j].adnum = adnum;
 				attrdefs[j].adef_expr = strdup(PQgetvalue(res, j, 3));
 
 				attrdefs[j].dobj.name = strdup(tbinfo->dobj.name);
@@ -4302,9 +4389,8 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 				/*
 				 * Defaults on a VIEW must always be dumped as separate ALTER
 				 * TABLE commands.	Defaults on regular tables are dumped as
-				 * part of the CREATE TABLE if possible.  To check if it's
-				 * safe, we mark the default as needing to appear before the
-				 * CREATE.
+				 * part of the CREATE TABLE if possible, which it won't be
+				 * if the column is not going to be emitted explicitly.
 				 */
 				if (tbinfo->relkind == RELKIND_VIEW)
 				{
@@ -4313,19 +4399,27 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 					addObjectDependency(&attrdefs[j].dobj,
 										tbinfo->dobj.dumpId);
 				}
+				else if (!shouldPrintColumn(tbinfo, adnum - 1))
+				{
+					/* column will be suppressed, print default separately */
+					attrdefs[j].separate = true;
+					/* needed in case pre-7.3 DB: */
+					addObjectDependency(&attrdefs[j].dobj,
+										tbinfo->dobj.dumpId);
+				}
 				else
 				{
 					attrdefs[j].separate = false;
+					/*
+					 * Mark the default as needing to appear before the table,
+					 * so that any dependencies it has must be emitted before
+					 * the CREATE TABLE.  If this is not possible, we'll
+					 * change to "separate" mode while sorting dependencies.
+					 */
 					addObjectDependency(&tbinfo->dobj,
 										attrdefs[j].dobj.dumpId);
 				}
 
-				if (adnum <= 0 || adnum > ntups)
-				{
-					write_msg(NULL, "invalid adnum value %d for table \"%s\"\n",
-							  adnum, tbinfo->dobj.name);
-					exit_nicely();
-				}
 				tbinfo->attrdefs[adnum - 1] = &attrdefs[j];
 			}
 			PQclear(res);
@@ -4409,95 +4503,434 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 }
 
 /*
- * dumpComment --
+ * Test whether a column should be printed as part of table's CREATE TABLE.
+ * Column number is zero-based.
  *
- * This routine is used to dump any comments associated with the
- * object handed to this routine. The routine takes a constant character
- * string for the target part of the comment-creation command, plus
- * the namespace and owner of the object (for labeling the ArchiveEntry),
- * plus catalog ID and subid which are the lookup key for pg_description,
- * plus the dump ID for the object (for setting a dependency).
- * If a matching pg_description entry is found, it is dumped.
+ * Normally this is always true, but it's false for dropped columns, as well
+ * as those that were inherited without any local definition.  (If we print
+ * such a column it will mistakenly get pg_attribute.attislocal set to true.)
  *
- * Note: although this routine takes a dumpId for dependency purposes,
- * that purpose is just to mark the dependency in the emitted dump file
- * for possible future use by pg_restore.  We do NOT use it for determining
- * ordering of the comment in the dump file, because this routine is called
- * after dependency sorting occurs.  This routine should be called just after
- * calling ArchiveEntry() for the specified object.
+ * This function exists because there are scattered nonobvious places that
+ * must be kept in sync with this decision.
  */
-static void
-dumpComment(Archive *fout, const char *target,
-			const char *namespace, const char *owner,
-			CatalogId catalogId, int subid, DumpId dumpId)
+bool
+shouldPrintColumn(TableInfo *tbinfo, int colno)
 {
-	CommentItem *comments;
-	int			ncomments;
-
-	/* Comments are SCHEMA not data */
-	if (dataOnly)
-		return;
+	return (tbinfo->attislocal[colno] && !tbinfo->attisdropped[colno]);
+}
 
-	/* Search for comments associated with catalogId, using table */
-	ncomments = findComments(fout, catalogId.tableoid, catalogId.oid,
-							 &comments);
 
-	/* Is there one matching the subid? */
-	while (ncomments > 0)
+/*
+ * getTSParsers:
+ *	  read all text search parsers in the system catalogs and return them
+ *	  in the TSParserInfo* structure
+ *
+ *	numTSParsers is set to the number of parsers read in
+ */
+TSParserInfo *
+getTSParsers(int *numTSParsers)
+{
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSParserInfo *prsinfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_prsname;
+	int			i_prsnamespace;
+	int			i_prsstart;
+	int			i_prstoken;
+	int			i_prsend;
+	int			i_prsheadline;
+	int			i_prslextype;
+
+	/* Before 8.3, there is no built-in text search support */
+	if (g_fout->remoteVersion < 80300)
 	{
-		if (comments->objsubid == subid)
-			break;
-		comments++;
-		ncomments--;
+		*numTSParsers = 0;
+		return NULL;
 	}
 
-	/* If a comment exists, build COMMENT ON statement */
-	if (ncomments > 0)
-	{
-		PQExpBuffer query = createPQExpBuffer();
+	/*
+	 * find all text search objects, including builtin ones; we filter out
+	 * system-defined objects at dump-out time.
+	 */
 
-		appendPQExpBuffer(query, "COMMENT ON %s IS ", target);
-		appendStringLiteralAH(query, comments->descr, fout);
-		appendPQExpBuffer(query, ";\n");
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
 
-		ArchiveEntry(fout, nilCatalogId, createDumpId(),
-					 target, namespace, NULL, owner, false,
-					 "COMMENT", query->data, "", NULL,
-					 &(dumpId), 1,
-					 NULL, NULL);
+	appendPQExpBuffer(query, "SELECT tableoid, oid, prsname, prsnamespace, "
+					  "prsstart::oid, prstoken::oid, "
+					  "prsend::oid, prsheadline::oid, prslextype::oid "
+					  "FROM pg_ts_parser");
 
-		destroyPQExpBuffer(query);
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSParsers = ntups;
+
+	prsinfo = (TSParserInfo *) malloc(ntups * sizeof(TSParserInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_prsname = PQfnumber(res, "prsname");
+	i_prsnamespace = PQfnumber(res, "prsnamespace");
+	i_prsstart = PQfnumber(res, "prsstart");
+	i_prstoken = PQfnumber(res, "prstoken");
+	i_prsend = PQfnumber(res, "prsend");
+	i_prsheadline = PQfnumber(res, "prsheadline");
+	i_prslextype = PQfnumber(res, "prslextype");
+
+	for (i = 0; i < ntups; i++)
+	{
+		prsinfo[i].dobj.objType = DO_TSPARSER;
+		prsinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		prsinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&prsinfo[i].dobj);
+		prsinfo[i].dobj.name = strdup(PQgetvalue(res, i, i_prsname));
+		prsinfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_prsnamespace)),
+												  prsinfo[i].dobj.catId.oid);
+		prsinfo[i].prsstart = atooid(PQgetvalue(res, i, i_prsstart));
+		prsinfo[i].prstoken = atooid(PQgetvalue(res, i, i_prstoken));
+		prsinfo[i].prsend = atooid(PQgetvalue(res, i, i_prsend));
+		prsinfo[i].prsheadline = atooid(PQgetvalue(res, i, i_prsheadline));
+		prsinfo[i].prslextype = atooid(PQgetvalue(res, i, i_prslextype));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(prsinfo[i].dobj));
 	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return prsinfo;
 }
 
 /*
- * dumpTableComment --
+ * getTSDictionaries:
+ *	  read all text search dictionaries in the system catalogs and return them
+ *	  in the TSDictInfo* structure
  *
- * As above, but dump comments for both the specified table (or view)
- * and its columns.
+ *	numTSDicts is set to the number of dictionaries read in
  */
-static void
-dumpTableComment(Archive *fout, TableInfo *tbinfo,
-				 const char *reltypename)
+TSDictInfo *
+getTSDictionaries(int *numTSDicts)
 {
-	CommentItem *comments;
-	int			ncomments;
-	PQExpBuffer query;
-	PQExpBuffer target;
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSDictInfo *dictinfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_dictname;
+	int			i_dictnamespace;
+	int			i_rolname;
+	int			i_dicttemplate;
+	int			i_dictinitoption;
 
-	/* Comments are SCHEMA not data */
-	if (dataOnly)
-		return;
+	/* Before 8.3, there is no built-in text search support */
+	if (g_fout->remoteVersion < 80300)
+	{
+		*numTSDicts = 0;
+		return NULL;
+	}
 
-	/* Search for comments associated with relation, using table */
-	ncomments = findComments(fout,
-							 tbinfo->dobj.catId.tableoid,
-							 tbinfo->dobj.catId.oid,
-							 &comments);
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
 
-	/* If comments exist, build COMMENT ON statements */
-	if (ncomments <= 0)
-		return;
+	appendPQExpBuffer(query, "SELECT tableoid, oid, dictname, "
+					  "dictnamespace, (%s dictowner) as rolname, "
+					  "dicttemplate, dictinitoption "
+					  "FROM pg_ts_dict",
+					  username_subquery);
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSDicts = ntups;
+
+	dictinfo = (TSDictInfo *) malloc(ntups * sizeof(TSDictInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_dictname = PQfnumber(res, "dictname");
+	i_dictnamespace = PQfnumber(res, "dictnamespace");
+	i_rolname = PQfnumber(res, "rolname");
+	i_dictinitoption = PQfnumber(res, "dictinitoption");
+	i_dicttemplate = PQfnumber(res, "dicttemplate");
+
+	for (i = 0; i < ntups; i++)
+	{
+		dictinfo[i].dobj.objType = DO_TSDICT;
+		dictinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		dictinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&dictinfo[i].dobj);
+		dictinfo[i].dobj.name = strdup(PQgetvalue(res, i, i_dictname));
+		dictinfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_dictnamespace)),
+												 dictinfo[i].dobj.catId.oid);
+		dictinfo[i].rolname = strdup(PQgetvalue(res, i, i_rolname));
+		dictinfo[i].dicttemplate = atooid(PQgetvalue(res, i, i_dicttemplate));
+		if (PQgetisnull(res, i, i_dictinitoption))
+			dictinfo[i].dictinitoption = NULL;
+		else
+			dictinfo[i].dictinitoption = strdup(PQgetvalue(res, i, i_dictinitoption));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(dictinfo[i].dobj));
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return dictinfo;
+}
+
+/*
+ * getTSTemplates:
+ *	  read all text search templates in the system catalogs and return them
+ *	  in the TSTemplateInfo* structure
+ *
+ *	numTSTemplates is set to the number of templates read in
+ */
+TSTemplateInfo *
+getTSTemplates(int *numTSTemplates)
+{
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSTemplateInfo *tmplinfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_tmplname;
+	int			i_tmplnamespace;
+	int			i_tmplinit;
+	int			i_tmpllexize;
+
+	/* Before 8.3, there is no built-in text search support */
+	if (g_fout->remoteVersion < 80300)
+	{
+		*numTSTemplates = 0;
+		return NULL;
+	}
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
+
+	appendPQExpBuffer(query, "SELECT tableoid, oid, tmplname, "
+					  "tmplnamespace, tmplinit::oid, tmpllexize::oid "
+					  "FROM pg_ts_template");
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSTemplates = ntups;
+
+	tmplinfo = (TSTemplateInfo *) malloc(ntups * sizeof(TSTemplateInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_tmplname = PQfnumber(res, "tmplname");
+	i_tmplnamespace = PQfnumber(res, "tmplnamespace");
+	i_tmplinit = PQfnumber(res, "tmplinit");
+	i_tmpllexize = PQfnumber(res, "tmpllexize");
+
+	for (i = 0; i < ntups; i++)
+	{
+		tmplinfo[i].dobj.objType = DO_TSTEMPLATE;
+		tmplinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		tmplinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&tmplinfo[i].dobj);
+		tmplinfo[i].dobj.name = strdup(PQgetvalue(res, i, i_tmplname));
+		tmplinfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_tmplnamespace)),
+												 tmplinfo[i].dobj.catId.oid);
+		tmplinfo[i].tmplinit = atooid(PQgetvalue(res, i, i_tmplinit));
+		tmplinfo[i].tmpllexize = atooid(PQgetvalue(res, i, i_tmpllexize));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(tmplinfo[i].dobj));
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return tmplinfo;
+}
+
+/*
+ * getTSConfigurations:
+ *	  read all text search configurations in the system catalogs and return
+ *	  them in the TSConfigInfo* structure
+ *
+ *	numTSConfigs is set to the number of configurations read in
+ */
+TSConfigInfo *
+getTSConfigurations(int *numTSConfigs)
+{
+	PGresult   *res;
+	int			ntups;
+	int			i;
+	PQExpBuffer query = createPQExpBuffer();
+	TSConfigInfo *cfginfo;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_cfgname;
+	int			i_cfgnamespace;
+	int			i_rolname;
+	int			i_cfgparser;
+
+	/* Before 8.3, there is no built-in text search support */
+	if (g_fout->remoteVersion < 80300)
+	{
+		*numTSConfigs = 0;
+		return NULL;
+	}
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema("pg_catalog");
+
+	appendPQExpBuffer(query, "SELECT tableoid, oid, cfgname, "
+					  "cfgnamespace, (%s cfgowner) as rolname, cfgparser "
+					  "FROM pg_ts_config",
+					  username_subquery);
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	*numTSConfigs = ntups;
+
+	cfginfo = (TSConfigInfo *) malloc(ntups * sizeof(TSConfigInfo));
+
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_cfgname = PQfnumber(res, "cfgname");
+	i_cfgnamespace = PQfnumber(res, "cfgnamespace");
+	i_rolname = PQfnumber(res, "rolname");
+	i_cfgparser = PQfnumber(res, "cfgparser");
+
+	for (i = 0; i < ntups; i++)
+	{
+		cfginfo[i].dobj.objType = DO_TSCONFIG;
+		cfginfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		cfginfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&cfginfo[i].dobj);
+		cfginfo[i].dobj.name = strdup(PQgetvalue(res, i, i_cfgname));
+		cfginfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_cfgnamespace)),
+												  cfginfo[i].dobj.catId.oid);
+		cfginfo[i].rolname = strdup(PQgetvalue(res, i, i_rolname));
+		cfginfo[i].cfgparser = atooid(PQgetvalue(res, i, i_cfgparser));
+
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(cfginfo[i].dobj));
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+
+	return cfginfo;
+}
+
+
+/*
+ * dumpComment --
+ *
+ * This routine is used to dump any comments associated with the
+ * object handed to this routine. The routine takes a constant character
+ * string for the target part of the comment-creation command, plus
+ * the namespace and owner of the object (for labeling the ArchiveEntry),
+ * plus catalog ID and subid which are the lookup key for pg_description,
+ * plus the dump ID for the object (for setting a dependency).
+ * If a matching pg_description entry is found, it is dumped.
+ *
+ * Note: although this routine takes a dumpId for dependency purposes,
+ * that purpose is just to mark the dependency in the emitted dump file
+ * for possible future use by pg_restore.  We do NOT use it for determining
+ * ordering of the comment in the dump file, because this routine is called
+ * after dependency sorting occurs.  This routine should be called just after
+ * calling ArchiveEntry() for the specified object.
+ */
+static void
+dumpComment(Archive *fout, const char *target,
+			const char *namespace, const char *owner,
+			CatalogId catalogId, int subid, DumpId dumpId)
+{
+	CommentItem *comments;
+	int			ncomments;
+
+	/* Comments are SCHEMA not data */
+	if (dataOnly)
+		return;
+
+	/* Search for comments associated with catalogId, using table */
+	ncomments = findComments(fout, catalogId.tableoid, catalogId.oid,
+							 &comments);
+
+	/* Is there one matching the subid? */
+	while (ncomments > 0)
+	{
+		if (comments->objsubid == subid)
+			break;
+		comments++;
+		ncomments--;
+	}
+
+	/* If a comment exists, build COMMENT ON statement */
+	if (ncomments > 0)
+	{
+		PQExpBuffer query = createPQExpBuffer();
+
+		appendPQExpBuffer(query, "COMMENT ON %s IS ", target);
+		appendStringLiteralAH(query, comments->descr, fout);
+		appendPQExpBuffer(query, ";\n");
+
+		ArchiveEntry(fout, nilCatalogId, createDumpId(),
+					 target, namespace, NULL, owner, false,
+					 "COMMENT", query->data, "", NULL,
+					 &(dumpId), 1,
+					 NULL, NULL);
+
+		destroyPQExpBuffer(query);
+	}
+}
+
+/*
+ * dumpTableComment --
+ *
+ * As above, but dump comments for both the specified table (or view)
+ * and its columns.
+ */
+static void
+dumpTableComment(Archive *fout, TableInfo *tbinfo,
+				 const char *reltypename)
+{
+	CommentItem *comments;
+	int			ncomments;
+	PQExpBuffer query;
+	PQExpBuffer target;
+
+	/* Comments are SCHEMA not data */
+	if (dataOnly)
+		return;
+
+	/* Search for comments associated with relation, using table */
+	ncomments = findComments(fout,
+							 tbinfo->dobj.catId.tableoid,
+							 tbinfo->dobj.catId.oid,
+							 &comments);
+
+	/* If comments exist, build COMMENT ON statements */
+	if (ncomments <= 0)
+		return;
 
 	query = createPQExpBuffer();
 	target = createPQExpBuffer();
@@ -4796,8 +5229,20 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj)
 			if (!postDataSchemaOnly)
 			dumpTableData(fout, (TableDataInfo *) dobj);
 			break;
-		case DO_TABLE_TYPE:
-			/* table rowtypes are never dumped separately */
+		case DO_DUMMY_TYPE:
+			/* table rowtypes and array types are never dumped separately */
+			break;
+		case DO_TSPARSER:
+			dumpTSParser(fout, (TSParserInfo *) dobj);
+			break;
+		case DO_TSDICT:
+			dumpTSDictionary(fout, (TSDictInfo *) dobj);
+			break;
+		case DO_TSTEMPLATE:
+			dumpTSTemplate(fout, (TSTemplateInfo *) dobj);
+			break;
+		case DO_TSCONFIG:
+			dumpTSConfig(fout, (TSConfigInfo *) dobj);
 			break;
 		case DO_BLOBS:
 			if (!postDataSchemaOnly)
@@ -4883,12 +5328,92 @@ dumpType(Archive *fout, TypeInfo *tinfo)
 		return;
 
 	/* Dump out in proper style */
-	if (tinfo->typtype == 'b')
+	if (tinfo->typtype == TYPTYPE_BASE)
 		dumpBaseType(fout, tinfo);
-	else if (tinfo->typtype == 'd')
+	else if (tinfo->typtype == TYPTYPE_DOMAIN)
 		dumpDomain(fout, tinfo);
-	else if (tinfo->typtype == 'c')
+	else if (tinfo->typtype == TYPTYPE_COMPOSITE)
 		dumpCompositeType(fout, tinfo);
+	else if (tinfo->typtype == TYPTYPE_ENUM)
+		dumpEnumType(fout, tinfo);
+}
+
+/*
+ * dumpEnumType
+ *	  writes out to fout the queries to recreate a user-defined enum type
+ */
+static void
+dumpEnumType(Archive *fout, TypeInfo *tinfo)
+{
+	PQExpBuffer q = createPQExpBuffer();
+	PQExpBuffer delq = createPQExpBuffer();
+	PQExpBuffer query = createPQExpBuffer();
+	PGresult   *res;
+	int			num,
+				i;
+	char	   *label;
+
+	/* Set proper schema search path so regproc references list correctly */
+	selectSourceSchema(tinfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(query, "SELECT enumlabel FROM pg_catalog.pg_enum "
+					  "WHERE enumtypid = '%u'"
+					  "ORDER BY oid",
+					  tinfo->dobj.catId.oid);
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+
+	num = PQntuples(res);
+	/* should be at least 1 value */
+	if (num == 0)
+	{
+		write_msg(NULL, "no label definitions found for enum ID %u\n", tinfo->dobj.catId.oid);
+		exit_nicely();
+	}
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog.
+	 * CASCADE shouldn't be required here as for normal types since the I/O
+	 * functions are generic and do not get dropped.
+	 */
+	appendPQExpBuffer(delq, "DROP TYPE %s.",
+					  fmtId(tinfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, "%s;\n",
+					  fmtId(tinfo->dobj.name));
+	appendPQExpBuffer(q, "CREATE TYPE %s AS ENUM (\n",
+					  fmtId(tinfo->dobj.name));
+	for (i = 0; i < num; i++)
+	{
+		label = PQgetvalue(res, i, 0);
+		if (i > 0)
+			appendPQExpBuffer(q, ",\n");
+		appendPQExpBuffer(q, "    ");
+		appendStringLiteralAH(q, label, fout);
+	}
+	appendPQExpBuffer(q, "\n);\n");
+
+	ArchiveEntry(fout, tinfo->dobj.catId, tinfo->dobj.dumpId,
+				 tinfo->dobj.name,
+				 tinfo->dobj.namespace->dobj.name,
+				 NULL,
+				 tinfo->rolname, false,
+				 "TYPE", q->data, delq->data, NULL,
+				 tinfo->dobj.dependencies, tinfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Type Comments */
+	resetPQExpBuffer(q);
+
+	appendPQExpBuffer(q, "TYPE %s", fmtId(tinfo->dobj.name));
+	dumpComment(fout, q->data,
+				tinfo->dobj.namespace->dobj.name, tinfo->rolname,
+				tinfo->dobj.catId, 0, tinfo->dobj.dumpId);
+
+	PQclear(res);
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+	destroyPQExpBuffer(query);
 }
 
 /*
@@ -5072,7 +5597,7 @@ dumpBaseType(Archive *fout, TypeInfo *tinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -5299,7 +5824,7 @@ dumpDomain(Archive *fout, TypeInfo *tinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -5417,7 +5942,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tinfo)
 	ntups = PQntuples(res);
 	if (ntups < 1)
 	{
-		write_msg(NULL, "query yielded no rows: %s\n", query->data);
+		write_msg(NULL, "query returned no rows: %s\n", query->data);
 		exit_nicely();
 	}
 
@@ -6049,6 +6574,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	char	   *provolatile;
 	char	   *proisstrict;
 	char	   *prosecdef;
+	char	   *proconfig;
 	char	   *procost;
 	char	   *prorows;
 	char	   *lanname;
@@ -6060,6 +6586,9 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	char	  **argnames = NULL;
 	bool		isGE43 = isGPDB4300OrLater();
 	bool		isGE50 = isGPDB5000OrLater();
+	char	  **configitems = NULL;
+	int			nconfigitems = 0;
+	int			i;
 
 	/* Skip if not to be dumped */
 	if (!finfo->dobj.dump || dataOnly)
@@ -6087,99 +6616,26 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 						  "pg_catalog.pg_get_function_identity_arguments(oid) as funciargs, "
 						  "pg_catalog.pg_get_function_result(oid) as funcresult, "
 						  "provolatile, proisstrict, prosecdef, "
-						  "procost, prorows, prodataaccess, "
+						  "proconfig, procost, prorows, prodataaccess, "
 						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
 						  "FROM pg_catalog.pg_proc "
 						  "WHERE oid = '%u'::pg_catalog.oid",
 						  finfo->dobj.catId.oid);
 
 	}
-	else if (g_fout->remoteVersion >= 80300)
-	{
-		appendPQExpBuffer(query,
-						  "SELECT proretset, prosrc, probin, "
-						  "proallargtypes, proargmodes, proargnames, "
-						  "provolatile, proisstrict, prosecdef,"
-						  "procost, prorows, %s"
-						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
-						  "FROM pg_catalog.pg_proc "
-						  "WHERE oid = '%u'::pg_catalog.oid",
-						  (isGE43 ? "prodataaccess, " : ""),
-						  finfo->dobj.catId.oid);
-	}
-	else if (g_fout->remoteVersion >= 80100)
+	else
 	{
 		appendPQExpBuffer(query,
 						  "SELECT proretset, prosrc, probin, "
 						  "proallargtypes, proargmodes, proargnames, "
 						  "provolatile, proisstrict, prosecdef, "
-						  "0 as procost, 0 as prorows, %s"
+						  "null as proconfig, 0 as procost, 0 as prorows, %s"
 						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
 						  "FROM pg_catalog.pg_proc "
 						  "WHERE oid = '%u'::pg_catalog.oid",
 						  (isGE43 ? "prodataaccess, " : ""),
 						  finfo->dobj.catId.oid);
 	}
-	else if (g_fout->remoteVersion >= 80000)
-	{
-		appendPQExpBuffer(query,
-						  "SELECT proretset, prosrc, probin, "
-						  "null as proallargtypes, "
-						  "null as proargmodes, "
-						  "proargnames, "
-						  "provolatile, proisstrict, prosecdef, "
-						  "0 as procost, 0 as prorows, "
-						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
-						  "FROM pg_catalog.pg_proc "
-						  "WHERE oid = '%u'::pg_catalog.oid",
-						  finfo->dobj.catId.oid);
-	}
-	else if (g_fout->remoteVersion >= 70300)
-	{
-		appendPQExpBuffer(query,
-						  "SELECT proretset, prosrc, probin, "
-						  "null as proallargtypes, "
-						  "null as proargmodes, "
-						  "null as proargnames, "
-						  "provolatile, proisstrict, prosecdef, "
-						  "0 as procost, 0 as prorows, "
-						  "(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
-						  "FROM pg_catalog.pg_proc "
-						  "WHERE oid = '%u'::pg_catalog.oid",
-						  finfo->dobj.catId.oid);
-	}
-	else if (g_fout->remoteVersion >= 70100)
-	{
-		appendPQExpBuffer(query,
-						  "SELECT proretset, prosrc, probin, "
-						  "null as proallargtypes, "
-						  "null as proargmodes, "
-						  "null as proargnames, "
-			 "case when proiscachable then 'i' else 'v' end as provolatile, "
-						  "proisstrict, "
-						  "'f'::boolean as prosecdef, "
-						  "0 as procost, 0 as prorows, "
-		  "(SELECT lanname FROM pg_language WHERE oid = prolang) as lanname "
-						  "FROM pg_proc "
-						  "WHERE oid = '%u'::oid",
-						  finfo->dobj.catId.oid);
-	}
-	else
-	{
-		appendPQExpBuffer(query,
-						  "SELECT proretset, prosrc, probin, "
-						  "null as proallargtypes, "
-						  "null as proargmodes, "
-						  "null as proargnames, "
-			 "case when proiscachable then 'i' else 'v' end as provolatile, "
-						  "'f'::boolean as proisstrict, "
-						  "'f'::boolean as prosecdef, "
-						  "0 as procost, 0 as prorows, "
-		  "(SELECT lanname FROM pg_language WHERE oid = prolang) as lanname "
-						  "FROM pg_proc "
-						  "WHERE oid = '%u'::oid",
-						  finfo->dobj.catId.oid);
-	}
 
 	res = PQexec(g_conn, query->data);
 	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
@@ -6188,7 +6644,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -6213,6 +6669,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	provolatile = PQgetvalue(res, 0, PQfnumber(res, "provolatile"));
 	proisstrict = PQgetvalue(res, 0, PQfnumber(res, "proisstrict"));
 	prosecdef = PQgetvalue(res, 0, PQfnumber(res, "prosecdef"));
+	proconfig = PQgetvalue(res, 0, PQfnumber(res, "proconfig"));
 	procost = PQgetvalue(res, 0, PQfnumber(res, "procost"));
 	prorows = PQgetvalue(res, 0, PQfnumber(res, "prorows"));
 	lanname = PQgetvalue(res, 0, PQfnumber(res, "lanname"));
@@ -6317,6 +6774,19 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	}
 	funcsig_tag = format_function_signature(finfo, false);
 
+	if (proconfig && *proconfig)
+	{
+		if (!parsePGArray(proconfig, &configitems, &nconfigitems))
+		{
+			write_msg(NULL, "WARNING: could not parse proconfig array\n");
+			if (configitems)
+				free(configitems);
+			configitems = NULL;
+			nconfigitems = 0;
+		}
+	}
+
+
 	/*
 	 * DROP must be fully qualified in case same name appears in pg_catalog
 	 */
@@ -6374,7 +6844,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 
 	/*
 	 * COST and ROWS are emitted only if present and not default, so as not to
-	 * break backwards-compatibility of the dump without need.  Keep this code
+	 * break backwards-compatibility of the dump without need.	Keep this code
 	 * in sync with the defaults in functioncmds.c.
 	 */
 	if (strcmp(procost, "0") != 0)
@@ -6407,6 +6877,31 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 
 	appendPQExpBuffer(q, ";\n");
 
+	for (i = 0; i < nconfigitems; i++)
+	{
+		/* we feel free to scribble on configitems[] here */
+		char	   *configitem = configitems[i];
+		char	   *pos;
+
+		pos = strchr(configitem, '=');
+		if (pos == NULL)
+			continue;
+		*pos++ = '\0';
+		appendPQExpBuffer(q, "\n    SET %s TO ", fmtId(configitem));
+
+		/*
+		 * Some GUC variable names are 'LIST' type and hence must not be
+		 * quoted.
+		 */
+		if (pg_strcasecmp(configitem, "DateStyle") == 0
+			|| pg_strcasecmp(configitem, "search_path") == 0)
+			appendPQExpBuffer(q, "%s", pos);
+		else
+			appendStringLiteralAH(q, pos, fout);
+	}
+
+	appendPQExpBuffer(q, ";\n");
+
 	ArchiveEntry(fout, finfo->dobj.catId, finfo->dobj.dumpId,
 				 funcsig_tag,
 				 finfo->dobj.namespace->dobj.name,
@@ -6442,6 +6937,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 		free(argmodes);
 	if (argnames)
 		free(argnames);
+	if (configitems)
+		free(configitems);
 }
 
 
@@ -6694,7 +7191,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -6893,6 +7390,43 @@ convertOperatorReference(const char *opr)
 	return oname;
 }
 
+/*
+ * Convert a function OID obtained from pg_ts_parser or pg_ts_template
+ *
+ * It is sufficient to use REGPROC rather than REGPROCEDURE, since the
+ * argument lists of these functions are predetermined.  Note that the
+ * caller should ensure we are in the proper schema, because the results
+ * are search path dependent!
+ */
+static const char *
+convertTSFunction(Oid funcOid)
+{
+	char	   *result;
+	char		query[128];
+	PGresult   *res;
+	int			ntups;
+
+	snprintf(query, sizeof(query),
+			 "SELECT '%u'::pg_catalog.regproc", funcOid);
+	res = PQexec(g_conn, query);
+	check_sql_result(res, g_conn, query, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+	if (ntups != 1)
+	{
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+				  ntups, query);
+		exit_nicely();
+	}
+
+	result = strdup(PQgetvalue(res, 0, 0));
+
+	PQclear(res);
+
+	return result;
+}
+
+
 /*
  * dumpOpclass
  *	  write out a single operator class definition
@@ -6951,8 +7485,8 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 						  "nspname AS opcfamilynsp, "
 						  "(SELECT amname FROM pg_catalog.pg_am WHERE oid = opcmethod) AS amname "
 						  "FROM pg_catalog.pg_opclass c "
-						  "LEFT JOIN pg_catalog.pg_opfamily f ON f.oid = opcfamily "
-						  "LEFT JOIN pg_catalog.pg_namespace n ON n.oid = opfnamespace "
+				   "LEFT JOIN pg_catalog.pg_opfamily f ON f.oid = opcfamily "
+			   "LEFT JOIN pg_catalog.pg_namespace n ON n.oid = opfnamespace "
 						  "WHERE c.oid = '%u'::pg_catalog.oid",
 						  opcinfo->dobj.catId.oid);
 	}
@@ -6963,7 +7497,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 						  "opcdefault, "
 						  "NULL AS opcfamily, "
 						  "NULL AS opcfamilynsp, "
-						  "(SELECT amname FROM pg_catalog.pg_am WHERE oid = opcamid) AS amname "
+		"(SELECT amname FROM pg_catalog.pg_am WHERE oid = opcamid) AS amname "
 						  "FROM pg_catalog.pg_opclass "
 						  "WHERE oid = '%u'::pg_catalog.oid",
 						  opcinfo->dobj.catId.oid);
@@ -6976,7 +7510,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -7044,15 +7578,15 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	if (g_fout->remoteVersion >= 80300)
 	{
 		/*
-		 * Print only those opfamily members that are tied to the opclass
-		 * by pg_depend entries.
+		 * Print only those opfamily members that are tied to the opclass by
+		 * pg_depend entries.
 		 */
 		appendPQExpBuffer(query, "SELECT amopstrategy, amopreqcheck, "
 						  "amopopr::pg_catalog.regoperator "
 						  "FROM pg_catalog.pg_amop ao, pg_catalog.pg_depend "
-						  "WHERE refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass "
+		   "WHERE refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass "
 						  "AND refobjid = '%u'::pg_catalog.oid "
-						  "AND classid = 'pg_catalog.pg_amop'::pg_catalog.regclass "
+				   "AND classid = 'pg_catalog.pg_amop'::pg_catalog.regclass "
 						  "AND objid = ao.oid "
 						  "ORDER BY amopstrategy",
 						  opcinfo->dobj.catId.oid);
@@ -7103,15 +7637,15 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	if (g_fout->remoteVersion >= 80300)
 	{
 		/*
-		 * Print only those opfamily members that are tied to the opclass
-		 * by pg_depend entries.
+		 * Print only those opfamily members that are tied to the opclass by
+		 * pg_depend entries.
 		 */
 		appendPQExpBuffer(query, "SELECT amprocnum, "
 						  "amproc::pg_catalog.regprocedure "
-						  "FROM pg_catalog.pg_amproc ap, pg_catalog.pg_depend "
-						  "WHERE refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass "
+						"FROM pg_catalog.pg_amproc ap, pg_catalog.pg_depend "
+		   "WHERE refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass "
 						  "AND refobjid = '%u'::pg_catalog.oid "
-						  "AND classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass "
+				 "AND classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass "
 						  "AND objid = ap.oid "
 						  "ORDER BY amprocnum",
 						  opcinfo->dobj.catId.oid);
@@ -7219,8 +7753,8 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	 * or functions, or (2) it contains an opclass with a different name or
 	 * owner.  Otherwise it's sufficient to let it be created during creation
 	 * of the contained opclass, and not dumping it improves portability of
-	 * the dump.  Since we have to fetch the loose operators/funcs anyway,
-	 * do that first.
+	 * the dump.  Since we have to fetch the loose operators/funcs anyway, do
+	 * that first.
 	 */
 
 	query = createPQExpBuffer();
@@ -7231,15 +7765,15 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	selectSourceSchema(opfinfo->dobj.namespace->dobj.name);
 
 	/*
-	 * Fetch only those opfamily members that are tied directly to the opfamily
-	 * by pg_depend entries.
+	 * Fetch only those opfamily members that are tied directly to the
+	 * opfamily by pg_depend entries.
 	 */
 	appendPQExpBuffer(query, "SELECT amopstrategy, amopreqcheck, "
 					  "amopopr::pg_catalog.regoperator "
 					  "FROM pg_catalog.pg_amop ao, pg_catalog.pg_depend "
-					  "WHERE refclassid = 'pg_catalog.pg_opfamily'::pg_catalog.regclass "
+		  "WHERE refclassid = 'pg_catalog.pg_opfamily'::pg_catalog.regclass "
 					  "AND refobjid = '%u'::pg_catalog.oid "
-					  "AND classid = 'pg_catalog.pg_amop'::pg_catalog.regclass "
+				   "AND classid = 'pg_catalog.pg_amop'::pg_catalog.regclass "
 					  "AND objid = ao.oid "
 					  "ORDER BY amopstrategy",
 					  opfinfo->dobj.catId.oid);
@@ -7254,9 +7788,9 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 					  "amproclefttype::pg_catalog.regtype, "
 					  "amprocrighttype::pg_catalog.regtype "
 					  "FROM pg_catalog.pg_amproc ap, pg_catalog.pg_depend "
-					  "WHERE refclassid = 'pg_catalog.pg_opfamily'::pg_catalog.regclass "
+		  "WHERE refclassid = 'pg_catalog.pg_opfamily'::pg_catalog.regclass "
 					  "AND refobjid = '%u'::pg_catalog.oid "
-					  "AND classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass "
+				 "AND classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass "
 					  "AND objid = ap.oid "
 					  "ORDER BY amprocnum",
 					  opfinfo->dobj.catId.oid);
@@ -7272,9 +7806,9 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 		appendPQExpBuffer(query, "SELECT 1 "
 						  "FROM pg_catalog.pg_opclass c, pg_catalog.pg_opfamily f, pg_catalog.pg_depend "
 						  "WHERE f.oid = '%u'::pg_catalog.oid "
-						  "AND refclassid = 'pg_catalog.pg_opfamily'::pg_catalog.regclass "
+			"AND refclassid = 'pg_catalog.pg_opfamily'::pg_catalog.regclass "
 						  "AND refobjid = f.oid "
-						  "AND classid = 'pg_catalog.pg_opclass'::pg_catalog.regclass "
+				"AND classid = 'pg_catalog.pg_opclass'::pg_catalog.regclass "
 						  "AND objid = c.oid "
 						  "AND (opcname != opfname OR opcnamespace != opfnamespace OR opcowner != opfowner) "
 						  "LIMIT 1",
@@ -7302,7 +7836,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	resetPQExpBuffer(query);
 
 	appendPQExpBuffer(query, "SELECT "
-					  "(SELECT amname FROM pg_catalog.pg_am WHERE oid = opfmethod) AS amname "
+	 "(SELECT amname FROM pg_catalog.pg_am WHERE oid = opfmethod) AS amname "
 					  "FROM pg_catalog.pg_opfamily "
 					  "WHERE oid = '%u'::pg_catalog.oid",
 					  opfinfo->dobj.catId.oid);
@@ -7314,7 +7848,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -7487,7 +8021,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -7649,7 +8183,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "Got %d rows instead of one from: %s",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
@@ -7941,6 +8475,350 @@ dumpExtProtocol(Archive *fout, ExtProtInfo *ptcinfo)
 			free (protoFuncs[i].name);
 }
 
+/*
+ * dumpTSParser
+ *	  write out a single text search parser
+ */
+static void
+dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+
+	/* Skip if not to be dumped */
+	if (!prsinfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(prsinfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH PARSER %s (\n",
+					  fmtId(prsinfo->dobj.name));
+
+	appendPQExpBuffer(q, "    START = %s,\n",
+					  convertTSFunction(prsinfo->prsstart));
+	appendPQExpBuffer(q, "    GETTOKEN = %s,\n",
+					  convertTSFunction(prsinfo->prstoken));
+	appendPQExpBuffer(q, "    END = %s,\n",
+					  convertTSFunction(prsinfo->prsend));
+	if (prsinfo->prsheadline != InvalidOid)
+		appendPQExpBuffer(q, "    HEADLINE = %s,\n",
+						  convertTSFunction(prsinfo->prsheadline));
+	appendPQExpBuffer(q, "    LEXTYPES = %s );\n",
+					  convertTSFunction(prsinfo->prslextype));
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH PARSER %s",
+					  fmtId(prsinfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(prsinfo->dobj.name));
+
+	ArchiveEntry(fout, prsinfo->dobj.catId, prsinfo->dobj.dumpId,
+				 prsinfo->dobj.name,
+				 prsinfo->dobj.namespace->dobj.name,
+				 NULL,
+				 "",
+				 false, "TEXT SEARCH PARSER", q->data, delq->data, NULL,
+				 prsinfo->dobj.dependencies, prsinfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Parser Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH PARSER %s",
+					  fmtId(prsinfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, "",
+				prsinfo->dobj.catId, 0, prsinfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+}
+
+/*
+ * dumpTSDictionary
+ *	  write out a single text search dictionary
+ */
+static void
+dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+	PQExpBuffer query;
+	PGresult   *res;
+	int			ntups;
+	char	   *nspname;
+	char	   *tmplname;
+
+	/* Skip if not to be dumped */
+	if (!dictinfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+	query = createPQExpBuffer();
+
+	/* Fetch name and namespace of the dictionary's template */
+	selectSourceSchema("pg_catalog");
+	appendPQExpBuffer(query, "SELECT nspname, tmplname "
+					  "FROM pg_ts_template p, pg_namespace n "
+					  "WHERE p.oid = '%u' AND n.oid = tmplnamespace",
+					  dictinfo->dicttemplate);
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+	ntups = PQntuples(res);
+	if (ntups != 1)
+	{
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+				  ntups, query->data);
+		exit_nicely();
+	}
+	nspname = PQgetvalue(res, 0, 0);
+	tmplname = PQgetvalue(res, 0, 1);
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(dictinfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH DICTIONARY %s (\n",
+					  fmtId(dictinfo->dobj.name));
+
+	appendPQExpBuffer(q, "    TEMPLATE = ");
+	if (strcmp(nspname, dictinfo->dobj.namespace->dobj.name) != 0)
+		appendPQExpBuffer(q, "%s.", fmtId(nspname));
+	appendPQExpBuffer(q, "%s", fmtId(tmplname));
+
+	PQclear(res);
+
+	/* the dictinitoption can be dumped straight into the command */
+	if (dictinfo->dictinitoption)
+		appendPQExpBuffer(q, ",\n    %s", dictinfo->dictinitoption);
+
+	appendPQExpBuffer(q, " );\n");
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH DICTIONARY %s",
+					  fmtId(dictinfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(dictinfo->dobj.name));
+
+	ArchiveEntry(fout, dictinfo->dobj.catId, dictinfo->dobj.dumpId,
+				 dictinfo->dobj.name,
+				 dictinfo->dobj.namespace->dobj.name,
+				 NULL,
+				 dictinfo->rolname,
+				 false, "TEXT SEARCH DICTIONARY", q->data, delq->data, NULL,
+				 dictinfo->dobj.dependencies, dictinfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Dictionary Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH DICTIONARY %s",
+					  fmtId(dictinfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, dictinfo->rolname,
+				dictinfo->dobj.catId, 0, dictinfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+	destroyPQExpBuffer(query);
+}
+
+/*
+ * dumpTSTemplate
+ *	  write out a single text search template
+ */
+static void
+dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+
+	/* Skip if not to be dumped */
+	if (!tmplinfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(tmplinfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH TEMPLATE %s (\n",
+					  fmtId(tmplinfo->dobj.name));
+
+	if (tmplinfo->tmplinit != InvalidOid)
+		appendPQExpBuffer(q, "    INIT = %s,\n",
+						  convertTSFunction(tmplinfo->tmplinit));
+	appendPQExpBuffer(q, "    LEXIZE = %s );\n",
+					  convertTSFunction(tmplinfo->tmpllexize));
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH TEMPLATE %s",
+					  fmtId(tmplinfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(tmplinfo->dobj.name));
+
+	ArchiveEntry(fout, tmplinfo->dobj.catId, tmplinfo->dobj.dumpId,
+				 tmplinfo->dobj.name,
+				 tmplinfo->dobj.namespace->dobj.name,
+				 NULL,
+				 "",
+				 false, "TEXT SEARCH TEMPLATE", q->data, delq->data, NULL,
+				 tmplinfo->dobj.dependencies, tmplinfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Template Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH TEMPLATE %s",
+					  fmtId(tmplinfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, "",
+				tmplinfo->dobj.catId, 0, tmplinfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+}
+
+/*
+ * dumpTSConfig
+ *	  write out a single text search configuration
+ */
+static void
+dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
+{
+	PQExpBuffer q;
+	PQExpBuffer delq;
+	PQExpBuffer query;
+	PGresult   *res;
+	char	   *nspname;
+	char	   *prsname;
+	int			ntups,
+				i;
+	int			i_tokenname;
+	int			i_dictname;
+
+	/* Skip if not to be dumped */
+	if (!cfginfo->dobj.dump || dataOnly)
+		return;
+
+	q = createPQExpBuffer();
+	delq = createPQExpBuffer();
+	query = createPQExpBuffer();
+
+	/* Fetch name and namespace of the config's parser */
+	selectSourceSchema("pg_catalog");
+	appendPQExpBuffer(query, "SELECT nspname, prsname "
+					  "FROM pg_ts_parser p, pg_namespace n "
+					  "WHERE p.oid = '%u' AND n.oid = prsnamespace",
+					  cfginfo->cfgparser);
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+	ntups = PQntuples(res);
+	if (ntups != 1)
+	{
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
+				  ntups, query->data);
+		exit_nicely();
+	}
+	nspname = PQgetvalue(res, 0, 0);
+	prsname = PQgetvalue(res, 0, 1);
+
+	/* Make sure we are in proper schema */
+	selectSourceSchema(cfginfo->dobj.namespace->dobj.name);
+
+	appendPQExpBuffer(q, "CREATE TEXT SEARCH CONFIGURATION %s (\n",
+					  fmtId(cfginfo->dobj.name));
+
+	appendPQExpBuffer(q, "    PARSER = ");
+	if (strcmp(nspname, cfginfo->dobj.namespace->dobj.name) != 0)
+		appendPQExpBuffer(q, "%s.", fmtId(nspname));
+	appendPQExpBuffer(q, "%s );\n", fmtId(prsname));
+
+	PQclear(res);
+
+	resetPQExpBuffer(query);
+	appendPQExpBuffer(query,
+					  "SELECT \n"
+					  "  ( SELECT alias FROM pg_catalog.ts_token_type('%u'::pg_catalog.oid) AS t \n"
+					  "    WHERE t.tokid = m.maptokentype ) AS tokenname, \n"
+					  "  m.mapdict::pg_catalog.regdictionary AS dictname \n"
+					  "FROM pg_catalog.pg_ts_config_map AS m \n"
+					  "WHERE m.mapcfg = '%u' \n"
+					  "ORDER BY m.mapcfg, m.maptokentype, m.mapseqno",
+					  cfginfo->cfgparser, cfginfo->dobj.catId.oid);
+
+	res = PQexec(g_conn, query->data);
+	check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+	ntups = PQntuples(res);
+
+	i_tokenname = PQfnumber(res, "tokenname");
+	i_dictname = PQfnumber(res, "dictname");
+
+	for (i = 0; i < ntups; i++)
+	{
+		char	   *tokenname = PQgetvalue(res, i, i_tokenname);
+		char	   *dictname = PQgetvalue(res, i, i_dictname);
+
+		if (i == 0 ||
+			strcmp(tokenname, PQgetvalue(res, i - 1, i_tokenname)) != 0)
+		{
+			/* starting a new token type, so start a new command */
+			if (i > 0)
+				appendPQExpBuffer(q, ";\n");
+			appendPQExpBuffer(q, "\nALTER TEXT SEARCH CONFIGURATION %s\n",
+							  fmtId(cfginfo->dobj.name));
+			/* tokenname needs quoting, dictname does NOT */
+			appendPQExpBuffer(q, "    ADD MAPPING FOR %s WITH %s",
+							  fmtId(tokenname), dictname);
+		}
+		else
+			appendPQExpBuffer(q, ", %s", dictname);
+	}
+
+	if (ntups > 0)
+		appendPQExpBuffer(q, ";\n");
+
+	PQclear(res);
+
+	/*
+	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 */
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH CONFIGURATION %s",
+					  fmtId(cfginfo->dobj.namespace->dobj.name));
+	appendPQExpBuffer(delq, ".%s;\n",
+					  fmtId(cfginfo->dobj.name));
+
+	ArchiveEntry(fout, cfginfo->dobj.catId, cfginfo->dobj.dumpId,
+				 cfginfo->dobj.name,
+				 cfginfo->dobj.namespace->dobj.name,
+				 NULL,
+				 cfginfo->rolname,
+			   false, "TEXT SEARCH CONFIGURATION", q->data, delq->data, NULL,
+				 cfginfo->dobj.dependencies, cfginfo->dobj.nDeps,
+				 NULL, NULL);
+
+	/* Dump Configuration Comments */
+	resetPQExpBuffer(q);
+	appendPQExpBuffer(q, "TEXT SEARCH CONFIGURATION %s",
+					  fmtId(cfginfo->dobj.name));
+	dumpComment(fout, q->data,
+				NULL, cfginfo->rolname,
+				cfginfo->dobj.catId, 0, cfginfo->dobj.dumpId);
+
+	destroyPQExpBuffer(q);
+	destroyPQExpBuffer(delq);
+	destroyPQExpBuffer(query);
+}
+
+
 /*----------
  * Write out grant/revoke information
  *
@@ -8133,7 +9011,7 @@ dumpExternal(TableInfo *tbinfo, PQExpBuffer query, PQExpBuffer q, PQExpBuffer de
 		for (j = 0; j < tbinfo->numatts; j++)
 		{
 			/* Is this one of the table's own attrs, and not dropped ? */
-			if (!tbinfo->inhAttrs[j] && !tbinfo->attisdropped[j])
+			if (tbinfo->attislocal[j] && !tbinfo->attisdropped[j])
 			{
 				/* Format properly if not first attr */
 				if (actual_atts > 0)
@@ -8391,8 +9269,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		actual_atts = 0;
 		for (j = 0; j < tbinfo->numatts; j++)
 		{
-			/* Is this one of the table's own attrs, and not dropped ? */
-			if (!tbinfo->inhAttrs[j] && !tbinfo->attisdropped[j])
+			/* Dump if it's locally defined in this table, and not dropped */
+			if (shouldPrintColumn(tbinfo, j))
 			{
 				/* Format properly if not first attr */
 				if (actual_atts > 0)
@@ -8408,11 +9286,9 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 								  tbinfo->atttypnames[j]);
 
 				/*
-				 * Default value --- suppress if inherited
-				 * and not to be printed separately.
+				 * Default value --- suppress if to be printed separately.
 				 */
 				if (tbinfo->attrdefs[j] != NULL &&
-					!tbinfo->inhAttrDef[j] &&
 					!tbinfo->attrdefs[j]->separate)
 					appendPQExpBuffer(q, " DEFAULT %s",
 									  tbinfo->attrdefs[j]->adef_expr);
@@ -8616,16 +9492,36 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 			PQclear(res);
 		}
 
-		/* Loop dumping statistics and storage statements */
+		/*
+		 * Dump additional per-column properties that we can't handle in the
+		 * main CREATE TABLE command.
+		 */
 		for (j = 0; j < tbinfo->numatts; j++)
 		{
+			/* None of this applies to dropped columns */
+			if (tbinfo->attisdropped[j])
+				continue;
+
+			/*
+			 * If we didn't dump the column definition explicitly above, and
+			 * it is NOT NULL and did not inherit that property from a parent,
+			 * we have to mark it separately.
+			 */
+			if (!shouldPrintColumn(tbinfo, j) &&
+				tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
+			{
+				appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
+								  fmtId(tbinfo->dobj.name));
+				appendPQExpBuffer(q, "ALTER COLUMN %s SET NOT NULL;\n",
+								  fmtId(tbinfo->attnames[j]));
+			}
+
 			/*
 			 * Dump per-column statistics information. We only issue an ALTER
 			 * TABLE statement if the attstattarget entry for this column is
 			 * non-negative (i.e. it's not the default value)
 			 */
-			if (tbinfo->attstattarget[j] >= 0 &&
-				!tbinfo->attisdropped[j])
+			if (tbinfo->attstattarget[j] >= 0)
 			{
 				appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
 								  fmtId(tbinfo->dobj.name));
@@ -8642,7 +9538,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 			 * its storage type changed independently from the parent
 			 * specification.
 			 */
-			if (!tbinfo->attisdropped[j] && tbinfo->attstorage[j] != tbinfo->typstorage[j])
+			if (tbinfo->attstorage[j] != tbinfo->typstorage[j])
 			{
 				switch (tbinfo->attstorage[j])
 				{
@@ -8735,18 +9631,18 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
 	PQExpBuffer q;
 	PQExpBuffer delq;
 
-	/* Only print it if "separate" mode is selected */
-	if (!tbinfo->dobj.dump || !adinfo->separate || dataOnly)
+	/* Skip if table definition not to be dumped */
+	if (!tbinfo->dobj.dump || dataOnly)
 		return;
 
-	/* Don't print inherited defaults, either */
-	if (tbinfo->inhAttrDef[adnum - 1])
+	/* Skip if not "separate"; it was dumped in the table's definition */
+	if (!adinfo->separate)
 		return;
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
 
-	appendPQExpBuffer(q, "ALTER TABLE %s ",
+	appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
 					  fmtId(tbinfo->dobj.name));
 	appendPQExpBuffer(q, "ALTER COLUMN %s SET DEFAULT %s;\n",
 					  fmtId(tbinfo->attnames[adnum - 1]),
@@ -9442,11 +10338,27 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 	}
 	appendPQExpBuffer(query, ");\n");
 
-	if (!tginfo->tgenabled)
+	if (tginfo->tgenabled != 't' && tginfo->tgenabled != 'O')
 	{
 		appendPQExpBuffer(query, "\nALTER TABLE %s ",
 						  fmtId(tbinfo->dobj.name));
-		appendPQExpBuffer(query, "DISABLE TRIGGER %s;\n",
+		switch (tginfo->tgenabled)
+		{
+			case 'D':
+			case 'f':
+				appendPQExpBuffer(query, "DISABLE");
+				break;
+			case 'A':
+				appendPQExpBuffer(query, "ENABLE ALWAYS");
+				break;
+			case 'R':
+				appendPQExpBuffer(query, "ENABLE REPLICA");
+				break;
+			default:
+				appendPQExpBuffer(query, "ENABLE");
+				break;
+		}
+		appendPQExpBuffer(query, " TRIGGER %s;\n",
 						  fmtId(tginfo->dobj.name));
 	}
 
@@ -9515,13 +10427,40 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 
 	if (PQntuples(res) != 1)
 	{
-		write_msg(NULL, "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned",
+		write_msg(NULL, "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n",
 				  rinfo->dobj.name, tbinfo->dobj.name);
 		exit_nicely();
 	}
 
 	printfPQExpBuffer(cmd, "%s\n", PQgetvalue(res, 0, 0));
 
+	/*
+	 * Add the command to alter the rules replication firing semantics if it
+	 * differs from the default.
+	 */
+	if (rinfo->ev_enabled != 'O')
+	{
+		appendPQExpBuffer(cmd, "ALTER TABLE %s.",
+						  fmtId(tbinfo->dobj.namespace->dobj.name));
+		appendPQExpBuffer(cmd, "%s ",
+						  fmtId(tbinfo->dobj.name));
+		switch (rinfo->ev_enabled)
+		{
+			case 'A':
+				appendPQExpBuffer(cmd, "ENABLE ALWAYS RULE %s;\n",
+								  fmtId(rinfo->dobj.name));
+				break;
+			case 'R':
+				appendPQExpBuffer(cmd, "ENABLE REPLICA RULE %s;\n",
+								  fmtId(rinfo->dobj.name));
+				break;
+			case 'D':
+				appendPQExpBuffer(cmd, "DISABLE RULE %s;\n",
+								  fmtId(rinfo->dobj.name));
+				break;
+		}
+	}
+
 	/*
 	 * DROP must be fully qualified in case same name appears in pg_catalog
 	 */
@@ -10005,7 +10944,7 @@ getFormattedTypeName(Oid oid, OidOptions opts)
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		write_msg(NULL, "query yielded %d rows instead of one: %s\n",
+		write_msg(NULL, "query returned %d rows instead of one: %s\n",
 				  ntups, query->data);
 		exit_nicely();
 	}
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index a898459ff2f1..6c6671ffc52a 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.h,v 1.133 2007/02/19 15:05:06 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.h,v 1.139.2.1 2009/01/18 20:44:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -128,7 +128,11 @@ typedef enum
 	DO_PROCLANG,
 	DO_CAST,
 	DO_TABLE_DATA,
-	DO_TABLE_TYPE,
+	DO_DUMMY_TYPE,
+	DO_TSPARSER,
+	DO_TSDICT,
+	DO_TSTEMPLATE,
+	DO_TSCONFIG,
 	DO_BLOBS,
 	DO_BLOB_COMMENTS,
 	DO_EXTPROTOCOL,
@@ -293,18 +297,10 @@ typedef struct _tableInfo
 	char	   *typstorage;		/* type storage scheme */
 	bool	   *attisdropped;	/* true if attr is dropped; don't dump it */
 	bool	   *attislocal;		/* true if attr has local definition */
-
-	/*
-	 * Note: we need to store per-attribute notnull, default, and constraint
-	 * stuff for all interesting tables so that we can tell which constraints
-	 * were inherited.
-	 */
-	bool	   *notnull;		/* Not null constraints on attributes */
-	struct _attrDefInfo **attrdefs;		/* DEFAULT expressions */
-	bool	   *inhAttrs;		/* true if each attribute is inherited */
-	bool	   *inhAttrDef;		/* true if attr's default is inherited */
+	bool	   *notnull;		/* NOT NULL constraints on attributes */
 	bool	   *inhNotNull;		/* true if NOT NULL is inherited */
-	char    **attencoding;  /* the attribute encoding values */
+	char	  **attencoding;	/* the attribute encoding values */
+	struct _attrDefInfo **attrdefs;		/* DEFAULT expressions */
 	struct _constraintInfo *checkexprs; /* CHECK constraints */
 
 	/*
@@ -317,7 +313,7 @@ typedef struct _tableInfo
 
 typedef struct _attrDefInfo
 {
-	DumpableObject dobj;
+	DumpableObject dobj;		/* note: dobj.name is name of table */
 	TableInfo  *adtable;		/* link to table of attribute */
 	int			adnum;
 	char	   *adef_expr;		/* decompiled DEFAULT expression */
@@ -351,6 +347,7 @@ typedef struct _ruleInfo
 	TableInfo  *ruletable;		/* link to table the rule is for */
 	char		ev_type;
 	bool		is_instead;
+	char		ev_enabled;
 	bool		separate;		/* TRUE if must dump as separate item */
 	/* separate is always true for non-ON SELECT rules */
 } RuleInfo;
@@ -367,7 +364,7 @@ typedef struct _triggerInfo
 	char	   *tgconstrname;
 	Oid			tgconstrrelid;
 	char	   *tgconstrrelname;
-	bool		tgenabled;
+	char		tgenabled;
 	bool		tgdeferrable;
 	bool		tginitdeferred;
 } TriggerInfo;
@@ -416,6 +413,37 @@ typedef struct _inhInfo
 	Oid			inhparent;		/* OID of its parent */
 } InhInfo;
 
+typedef struct _prsInfo
+{
+	DumpableObject dobj;
+	Oid			prsstart;
+	Oid			prstoken;
+	Oid			prsend;
+	Oid			prsheadline;
+	Oid			prslextype;
+} TSParserInfo;
+
+typedef struct _dictInfo
+{
+	DumpableObject dobj;
+	char	   *rolname;
+	Oid			dicttemplate;
+	char	   *dictinitoption;
+} TSDictInfo;
+
+typedef struct _tmplInfo
+{
+	DumpableObject dobj;
+	Oid			tmplinit;
+	Oid			tmpllexize;
+} TSTemplateInfo;
+
+typedef struct _cfgInfo
+{
+	DumpableObject dobj;
+	char	   *rolname;
+	Oid			cfgparser;
+} TSConfigInfo;
 
 /* global decls */
 extern bool force_quotes;		/* double-quotes for identifiers flag */
@@ -457,6 +485,7 @@ extern TableInfo *findTableByOid(Oid oid);
 extern TypeInfo *findTypeByOid(Oid oid);
 extern FuncInfo *findFuncByOid(Oid oid);
 extern OprInfo *findOprByOid(Oid oid);
+extern NamespaceInfo *findNamespaceByOid(Oid oid);
 
 extern void simple_oid_list_append(SimpleOidList *list, Oid val);
 extern void simple_string_list_append(SimpleStringList *list, const char *val);
@@ -493,6 +522,7 @@ extern OpclassInfo *getOpclasses(int *numOpclasses);
 extern OpfamilyInfo *getOpfamilies(int *numOpfamilies);
 extern ConvInfo *getConversions(int *numConversions);
 extern TableInfo *getTables(int *numTables);
+extern void getOwnedSeqs(TableInfo tblinfo[], int numTables);
 extern InhInfo *getInherits(int *numInherits);
 extern void getIndexes(TableInfo tblinfo[], int numTables);
 extern void getConstraints(TableInfo tblinfo[], int numTables);
@@ -501,6 +531,11 @@ extern void getTriggers(TableInfo tblinfo[], int numTables);
 extern ProcLangInfo *getProcLangs(int *numProcLangs);
 extern CastInfo *getCasts(int *numCasts);
 extern void getTableAttrs(TableInfo *tbinfo, int numTables);
+extern bool shouldPrintColumn(TableInfo *tbinfo, int colno);
+extern TSParserInfo *getTSParsers(int *numTSParsers);
+extern TSDictInfo *getTSDictionaries(int *numTSDicts);
+extern TSTemplateInfo *getTSTemplates(int *numTSTemplates);
+extern TSConfigInfo *getTSConfigurations(int *numTSConfigs);
 
 extern bool	testExtProtocolSupport(void);
 
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index bde6703e298a..22d2b8f56e0e 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump_sort.c,v 1.17 2007/01/23 17:54:50 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump_sort.c,v 1.20.2.1 2009/01/18 20:44:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,9 @@ static const char *modulename = gettext_noop("sorter");
  * Sort priority for object types when dumping a pre-7.3 database.
  * Objects are sorted by priority levels, and within an equal priority level
  * by OID.	(This is a relatively crude hack to provide semi-reasonable
- * behavior for old databases without full dependency info.)
+ * behavior for old databases without full dependency info.)  Note: text
+ * search objects can't really happen here, so the rather bogus priorities
+ * for them don't matter.
  */
 static const int oldObjectTypePriority[] =
 {
@@ -45,7 +47,11 @@ static const int oldObjectTypePriority[] =
 	2,							/* DO_PROCLANG */
 	2,							/* DO_CAST */
 	9,							/* DO_TABLE_DATA */
-	7,							/* DO_TABLE_TYPE */
+	7,							/* DO_DUMMY_TYPE */
+	3,							/* DO_TSPARSER */
+	4,							/* DO_TSDICT */
+	3,							/* DO_TSTEMPLATE */
+	5,							/* DO_TSCONFIG */
 	10,							/* DO_BLOBS */
 	11,							/* DO_BLOB_COMMENTS */
 	3,							/* DO_EXTPROTOCOL */
@@ -66,21 +72,25 @@ static const int newObjectTypePriority[] =
 	7,							/* DO_OPCLASS */
 	7,							/* DO_OPFAMILY */
 	9,							/* DO_CONVERSION */
-	10,							/* DO_TABLE */
-	12,							/* DO_ATTRDEF */
-	17,							/* DO_INDEX */
-	18,							/* DO_RULE */
-	19,							/* DO_TRIGGER */
-	16,							/* DO_CONSTRAINT */
-	20,							/* DO_FK_CONSTRAINT */
+	14,							/* DO_TABLE */
+	16,							/* DO_ATTRDEF */
+	21,							/* DO_INDEX */
+	22,							/* DO_RULE */
+	23,							/* DO_TRIGGER */
+	20,							/* DO_CONSTRAINT */
+	24,							/* DO_FK_CONSTRAINT */
 	2,							/* DO_PROCLANG */
 	8,							/* DO_CAST */
-	13,							/* DO_TABLE_DATA */
-	11,							/* DO_TABLE_TYPE */
-	14,							/* DO_BLOBS */
-	15,							/* DO_BLOB_COMMENTS */
 	8,							/* DO_EXTPROTOCOL */
-	15,							/* DO_TYPE_STORAGE_OPTIONS */
+	17,							/* DO_TABLE_DATA */
+	15,							/* DO_DUMMY_TYPE */
+	10,							/* DO_TSPARSER */
+	12,							/* DO_TSDICT */
+	11,							/* DO_TSTEMPLATE */
+	13,							/* DO_TSCONFIG */
+	18,							/* DO_BLOBS */
+	19,							/* DO_BLOB_COMMENTS */
+	19							/* DO_TYPE_STORAGE_OPTIONS */
 };
 
 
@@ -93,11 +103,11 @@ static bool TopoSort(DumpableObject **objs,
 static void addHeapElement(int val, int *heap, int heapLength);
 static int	removeHeapElement(int *heap, int heapLength);
 static void findDependencyLoops(DumpableObject **objs, int nObjs, int totObjs);
-static bool findLoop(DumpableObject *obj,
+static int	findLoop(DumpableObject *obj,
 		 DumpId startPoint,
+		 bool *processed,
 		 DumpableObject **workspace,
-		 int depth,
-		 int *newDepth);
+		 int depth);
 static void repairDependencyLoop(DumpableObject **loop,
 					 int nLoop);
 static void describeDumpableObject(DumpableObject *obj,
@@ -467,58 +477,52 @@ static void
 findDependencyLoops(DumpableObject **objs, int nObjs, int totObjs)
 {
 	/*
-	 * We use a workspace array, the initial part of which stores objects
-	 * already processed, and the rest of which is used as temporary space to
-	 * try to build a loop in.	This is convenient because we do not care
-	 * about loops involving already-processed objects (see notes above); we
-	 * can easily reject such loops in findLoop() because of this
-	 * representation.	After we identify and process a loop, we can add it to
-	 * the initial part of the workspace just by moving the boundary pointer.
-	 *
-	 * When we determine that an object is not part of any interesting loop,
-	 * we also add it to the initial part of the workspace.  This is not
-	 * necessary for correctness, but saves later invocations of findLoop()
-	 * from uselessly chasing references to such an object.
-	 *
-	 * We make the workspace large enough to hold all objects in the original
-	 * universe.  This is probably overkill, but it's provably enough space...
+	 * We use two data structures here.  One is a bool array processed[],
+	 * which is indexed by dump ID and marks the objects already processed
+	 * during this invocation of findDependencyLoops().  The other is a
+	 * workspace[] array of DumpableObject pointers, in which we try to build
+	 * lists of objects constituting loops.  We make workspace[] large enough
+	 * to hold all the objects, which is huge overkill in most cases but could
+	 * theoretically be necessary if there is a single dependency chain
+	 * linking all the objects.
 	 */
+	bool	   *processed;
 	DumpableObject **workspace;
-	int			initiallen;
 	bool		fixedloop;
 	int			i;
 
+	processed = (bool *) calloc(getMaxDumpId() + 1, sizeof(bool));
 	workspace = (DumpableObject **) malloc(totObjs * sizeof(DumpableObject *));
-	if (workspace == NULL)
+	if (processed == NULL || workspace == NULL)
 		exit_horribly(NULL, modulename, "out of memory\n");
-	initiallen = 0;
 	fixedloop = false;
 
 	for (i = 0; i < nObjs; i++)
 	{
 		DumpableObject *obj = objs[i];
-		int			newlen;
+		int			looplen;
+		int			j;
 
-		workspace[initiallen] = NULL;	/* see test below */
+		looplen = findLoop(obj, obj->dumpId, processed, workspace, 0);
 
-		if (findLoop(obj, obj->dumpId, workspace, initiallen, &newlen))
+		if (looplen > 0)
 		{
-			/* Found a loop of length newlen - initiallen */
-			repairDependencyLoop(&workspace[initiallen], newlen - initiallen);
-			/* Add loop members to workspace */
-			initiallen = newlen;
+			/* Found a loop, repair it */
+			repairDependencyLoop(workspace, looplen);
 			fixedloop = true;
+			/* Mark loop members as processed */
+			for (j = 0; j < looplen; j++)
+				processed[workspace[j]->dumpId] = true;
 		}
 		else
 		{
 			/*
-			 * Didn't find a loop, but add this object to workspace anyway,
-			 * unless it's already present.  We piggyback on the test that
-			 * findLoop() already did: it won't have tentatively added obj to
-			 * workspace if it's already present.
+			 * There's no loop starting at this object, but mark it processed
+			 * anyway.  This is not necessary for correctness, but saves later
+			 * invocations of findLoop() from uselessly chasing references to
+			 * such an object.
 			 */
-			if (workspace[initiallen] == obj)
-				initiallen++;
+			processed[obj->dumpId] = true;
 		}
 	}
 
@@ -527,45 +531,51 @@ findDependencyLoops(DumpableObject **objs, int nObjs, int totObjs)
 		exit_horribly(NULL, modulename, "could not identify dependency loop\n");
 
 	free(workspace);
+	free(processed);
 }
 
 /*
  * Recursively search for a circular dependency loop that doesn't include
- * any existing workspace members.
+ * any already-processed objects.
  *
  *	obj: object we are examining now
  *	startPoint: dumpId of starting object for the hoped-for circular loop
- *	workspace[]: work array for previously processed and current objects
+ *	processed[]: flag array marking already-processed objects
+ *	workspace[]: work array in which we are building list of loop members
  *	depth: number of valid entries in workspace[] at call
- *	newDepth: if successful, set to new number of workspace[] entries
  *
- * On success, *newDepth is set and workspace[] entries depth..*newDepth-1
- * are filled with pointers to the members of the loop.
+ * On success, the length of the loop is returned, and workspace[] is filled
+ * with pointers to the members of the loop.  On failure, we return 0.
  *
  * Note: it is possible that the given starting object is a member of more
  * than one cycle; if so, we will find an arbitrary one of the cycles.
  */
-static bool
+static int
 findLoop(DumpableObject *obj,
 		 DumpId startPoint,
+		 bool *processed,
 		 DumpableObject **workspace,
-		 int depth,
-		 int *newDepth)
+		 int depth)
 {
 	int			i;
 
 	/*
-	 * Reject if obj is already present in workspace.  This test serves three
-	 * purposes: it prevents us from finding loops that overlap
-	 * previously-processed loops, it prevents us from going into infinite
-	 * recursion if we are given a startPoint object that links to a cycle
-	 * it's not a member of, and it guarantees that we can't overflow the
-	 * allocated size of workspace[].
+	 * Reject if obj is already processed.  This test prevents us from finding
+	 * loops that overlap previously-processed loops.
+	 */
+	if (processed[obj->dumpId])
+		return 0;
+
+	/*
+	 * Reject if obj is already present in workspace.  This test prevents us
+	 * from going into infinite recursion if we are given a startPoint object
+	 * that links to a cycle it's not a member of, and it guarantees that we
+	 * can't overflow the allocated size of workspace[].
 	 */
 	for (i = 0; i < depth; i++)
 	{
 		if (workspace[i] == obj)
-			return false;
+			return 0;
 	}
 
 	/*
@@ -579,10 +589,7 @@ findLoop(DumpableObject *obj,
 	for (i = 0; i < obj->nDeps; i++)
 	{
 		if (obj->dependencies[i] == startPoint)
-		{
-			*newDepth = depth;
-			return true;
-		}
+			return depth;
 	}
 
 	/*
@@ -591,18 +598,20 @@ findLoop(DumpableObject *obj,
 	for (i = 0; i < obj->nDeps; i++)
 	{
 		DumpableObject *nextobj = findObjectByDumpId(obj->dependencies[i]);
+		int			newDepth;
 
 		if (!nextobj)
 			continue;			/* ignore dependencies on undumped objects */
-		if (findLoop(nextobj,
-					 startPoint,
-					 workspace,
-					 depth,
-					 newDepth))
-			return true;
+		newDepth = findLoop(nextobj,
+							startPoint,
+							processed,
+							workspace,
+							depth);
+		if (newDepth > 0)
+			return newDepth;
 	}
 
-	return false;
+	return 0;
 }
 
 /*
@@ -1075,9 +1084,29 @@ describeDumpableObject(DumpableObject *obj, char *buf, int bufsize)
 					 "TABLE DATA %s  (ID %d OID %u)",
 					 obj->name, obj->dumpId, obj->catId.oid);
 			return;
-		case DO_TABLE_TYPE:
+		case DO_DUMMY_TYPE:
+			snprintf(buf, bufsize,
+					 "DUMMY TYPE %s  (ID %d OID %u)",
+					 obj->name, obj->dumpId, obj->catId.oid);
+			return;
+		case DO_TSPARSER:
+			snprintf(buf, bufsize,
+					 "TEXT SEARCH PARSER %s  (ID %d OID %u)",
+					 obj->name, obj->dumpId, obj->catId.oid);
+			return;
+		case DO_TSDICT:
+			snprintf(buf, bufsize,
+					 "TEXT SEARCH DICTIONARY %s  (ID %d OID %u)",
+					 obj->name, obj->dumpId, obj->catId.oid);
+			return;
+		case DO_TSTEMPLATE:
+			snprintf(buf, bufsize,
+					 "TEXT SEARCH TEMPLATE %s  (ID %d OID %u)",
+					 obj->name, obj->dumpId, obj->catId.oid);
+			return;
+		case DO_TSCONFIG:
 			snprintf(buf, bufsize,
-					 "TABLE TYPE %s  (ID %d OID %u)",
+					 "TEXT SEARCH CONFIGURATION %s  (ID %d OID %u)",
 					 obj->name, obj->dumpId, obj->catId.oid);
 			return;
 		case DO_BLOBS:
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index c830c116043a..ec4e5ab80ec9 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.90 2007/02/10 14:58:55 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.100 2008/01/01 19:45:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,8 +74,8 @@ static int	disable_triggers = 0;
 static int	use_setsessauth = 0;
 static int	server_version;
 
-static FILE	*OPF;
-static char	*filename = NULL;
+static FILE *OPF;
+static char *filename = NULL;
 
 int
 main(int argc, char *argv[])
@@ -84,7 +84,6 @@ main(int argc, char *argv[])
 	char	   *pgport = NULL;
 	char	   *pguser = NULL;
 	char	   *pgdb = NULL;
-
 	enum trivalue prompt_password = TRI_DEFAULT;
 	bool		data_only = false;
 	bool		globals_only = false;
@@ -95,7 +94,7 @@ main(int argc, char *argv[])
 	bool		no_gp_syntax = false;
 	PGconn	   *conn;
 	int			encoding;
-	const char	*std_strings;
+	const char *std_strings;
 	int			c,
 				ret;
 
@@ -380,7 +379,7 @@ main(int argc, char *argv[])
 	/* Make sure the user hasn't specified a mix of globals-only options */
 	if (globals_only && roles_only)
 	{
-		fprintf(stderr, _("%s: --globals-only and --roles-only cannot be used together\n"),
+		fprintf(stderr, _("%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"),
 				progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
@@ -389,7 +388,7 @@ main(int argc, char *argv[])
 
 	if (globals_only && tablespaces_only)
 	{
-		fprintf(stderr, _("%s: --globals-only and --tablespaces-only cannot be used together\n"),
+		fprintf(stderr, _("%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"),
 				progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
@@ -398,7 +397,7 @@ main(int argc, char *argv[])
 
 	if (roles_only && tablespaces_only)
 	{
-		fprintf(stderr, _("%s: --roles-only and --tablespaces-only cannot be used together\n"),
+		fprintf(stderr, _("%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"),
 				progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
@@ -484,7 +483,7 @@ main(int argc, char *argv[])
 	{
 		/* Replicate encoding and std_strings in output */
 		fprintf(OPF, "SET client_encoding = '%s';\n",
-			   pg_encoding_to_char(encoding));
+				pg_encoding_to_char(encoding));
 		fprintf(OPF, "SET standard_conforming_strings = %s;\n", std_strings);
 		if (strcmp(std_strings, "off") == 0)
 			fprintf(OPF, "SET escape_string_warning = 'off';\n");
@@ -1555,27 +1554,29 @@ runPgDump(const char *dbname)
 	 * Strangely enough, this is the only place we pass a database name on the
 	 * command line, except "postgres" which doesn't need quoting.
 	 *
-	 * If we have a filename, use the undocumented plain-append pg_dump format.
+	 * If we have a filename, use the undocumented plain-append pg_dump
+	 * format.
 	 */
 	if (filename)
 	{
 #ifndef WIN32
-	appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa '", SYSTEMQUOTE, pg_dump_bin,
+		appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa '", SYSTEMQUOTE, pg_dump_bin,
 #else
-	appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa \"", SYSTEMQUOTE, pg_dump_bin,
+		appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa \"", SYSTEMQUOTE, pg_dump_bin,
 #endif
-					  pgdumpopts->data);
+						  pgdumpopts->data);
 	}
 	else
 	{
 #ifndef WIN32
-	appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp '", SYSTEMQUOTE, pg_dump_bin,
+		appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp '", SYSTEMQUOTE, pg_dump_bin,
 #else
-	appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp \"", SYSTEMQUOTE, pg_dump_bin,
+		appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp \"", SYSTEMQUOTE, pg_dump_bin,
 #endif
-					  pgdumpopts->data);
+						  pgdumpopts->data);
 	}
 
+
 	/* Shell quoting is not quite like SQL quoting, so can't use fmtId */
 	for (p = dbname; *p; p++)
 	{
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index fcb735a26ef3..e3deef14a110 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.84 2006/10/14 23:07:22 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.85 2007/12/11 19:01:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_dump/win32.mak b/src/bin/pg_dump/win32.mak
deleted file mode 100644
index 1dba0f657e88..000000000000
--- a/src/bin/pg_dump/win32.mak
+++ /dev/null
@@ -1,206 +0,0 @@
-# Makefile for Microsoft Visual C++ 5.0 (or compat)
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-PERL=perl.exe
-FLEX=flex.exe
-BISON=bison.exe
-MV=move
-
-!IFDEF DEBUG
-OPT=/Od /Zi /MDd
-LOPT=/DEBUG
-DEBUGDEF=/D _DEBUG
-OUTDIR=.\Debug
-INTDIR=.\Debug
-!ELSE
-OPT=/O2 /MD
-LOPT=
-DEBUGDEF=/D NDEBUG
-OUTDIR=.\Release
-INTDIR=.\Release
-!ENDIF
-
-REFDOCDIR= ../../../doc/src/sgml/ref
-
-CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
- "_MBCS" /Fp"$(INTDIR)\pg_dump.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
- /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
- /I ..\..\include\port\win32_msvc /I ..\..\backend \
- /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE"
-
-CPP_OBJS=$(INTDIR)/
-CPP_SBRS=.
-
-ALL : ..\..\backend\parser\gram.h "..\..\port\pg_config_paths.h" \
- "$(OUTDIR)\pg_dump.exe" "$(OUTDIR)\pg_dumpall.exe" "$(OUTDIR)\pg_restore.exe"
-
-CLEAN :
-	-@erase "$(INTDIR)\pg_backup_archiver.obj"
-	-@erase "$(INTDIR)\pg_backup_db.obj"
-	-@erase "$(INTDIR)\pg_backup_custom.obj"
-	-@erase "$(INTDIR)\pg_backup_files.obj"
-	-@erase "$(INTDIR)\pg_backup_null.obj"
-	-@erase "$(INTDIR)\pg_backup_tar.obj"
-	-@erase "$(INTDIR)\dumputils.obj"
-	-@erase "$(INTDIR)\common.obj" 
-	-@erase "$(INTDIR)\pg_dump_sort.obj" 
-	-@erase "$(INTDIR)\keywords.obj" 
-	-@erase "$(INTDIR)\exec.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\getopt_long.obj"
-	-@erase "$(INTDIR)\path.obj"
-	-@erase "$(INTDIR)\strlcpy.obj"
-	-@erase "$(INTDIR)\pgstrcasecmp.obj"
-	-@erase "$(INTDIR)\sprompt.obj"
-	-@erase "$(INTDIR)\snprintf.obj"
-	-@erase "$(INTDIR)\qsort.obj"
-#	-@erase "$(INTDIR)\pg_dump.pch"
-	-@erase "$(OUTDIR)\pg_dump.obj"
-	-@erase "$(OUTDIR)\pg_dump.exe"
-	-@erase "$(INTDIR)\pg_dumpall.obj"
-	-@erase "$(OUTDIR)\pg_dumpall.exe"
-	-@erase "$(INTDIR)\pg_restore.obj"
-	-@erase "$(OUTDIR)\pg_restore.exe"
-#	-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
-#	-@erase "$(INTDIR)\..\..\backend\parser\gram.h" 
-#	-@erase "$(INTDIR)\..\..\backend\parser\gram.c"
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no
-LINK32_FLAGS_DMP= \
- /pdb:"$(OUTDIR)\pg_dump.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_dump.exe"
-LINK32_FLAGS_ALL= \
- /pdb:"$(OUTDIR)\pg_dumpall.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_dumpall.exe"
-LINK32_FLAGS_RES= \
- /pdb:"$(OUTDIR)\pg_restore.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\pg_restore.exe"
-
-LINK32_OBJS= \
-	"$(INTDIR)\pg_backup_archiver.obj" \
-	"$(INTDIR)\pg_backup_db.obj" \
-	"$(INTDIR)\pg_backup_custom.obj" \
-	"$(INTDIR)\pg_backup_files.obj" \
-	"$(INTDIR)\pg_backup_null.obj" \
-	"$(INTDIR)\pg_backup_tar.obj" \
-	"$(INTDIR)\dumputils.obj" \
-	"$(INTDIR)\keywords.obj" \
-	"$(INTDIR)\exec.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\getopt_long.obj" \
-	"$(INTDIR)\path.obj" \
-	"$(INTDIR)\strlcpy.obj" \
-	"$(INTDIR)\pgstrcasecmp.obj" \
-	"$(INTDIR)\sprompt.obj" \
-	"$(INTDIR)\snprintf.obj" \
-	"$(INTDIR)\qsort.obj"
-
-LINK32_OBJS_DMP= \
-	"$(INTDIR)\common.obj" \
-	"$(INTDIR)\pg_dump_sort.obj" \
-	"$(INTDIR)\pg_dump.obj"
-LINK32_OBJS_RES= "$(INTDIR)\pg_restore.obj"
-LINK32_OBJS_ALL= "$(INTDIR)\pg_dumpall.obj"
-
-!IFDEF DEBUG
-LINK32_OBJS	= $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib"
-!ELSE
-LINK32_OBJS	= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
-!ENDIF
-
-"..\..\port\pg_config_paths.h": 
-	echo #define PGBINDIR "" >$@
-	echo #define PGSHAREDIR "" >>$@
-	echo #define SYSCONFDIR "" >>$@
-	echo #define INCLUDEDIR "" >>$@
-	echo #define PKGINCLUDEDIR "" >>$@
-	echo #define INCLUDEDIRSERVER "" >>$@
-	echo #define LIBDIR "" >>$@
-	echo #define PKGLIBDIR "" >>$@
-	echo #define LOCALEDIR "" >>$@
-	echo #define DOCDIR "" >>$@
-	echo #define MANDIR "" >>$@
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(OUTDIR)\pg_dump.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_DMP)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_FLAGS_DMP) $(LINK32_OBJS) $(LINK32_OBJS_DMP)
-<<
-
-"$(OUTDIR)\pg_dumpall.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_ALL)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_FLAGS_ALL) $(LINK32_OBJS) $(LINK32_OBJS_ALL)
-<<
-
-"$(OUTDIR)\pg_restore.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32_OBJS_RES)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_FLAGS_RES) $(LINK32_OBJS) $(LINK32_OBJS_RES)
-<<
-
-"$(INTDIR)\keywords.obj" : ..\..\backend\parser\keywords.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\backend\parser\keywords.c
-<<
-
-"$(INTDIR)\exec.obj" : ..\..\port\exec.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\exec.c
-<<
-
-"$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\getopt.c
-<<
-
-"$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\getopt_long.c
-<<
-
-"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\path.c
-<<
-
-"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\strlcpy.c
-<<
-
-"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
-<<
-
-"$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\sprompt.c
-<<
-
-"$(INTDIR)\snprintf.obj" : "$(INTDIR)" ..\..\port\snprintf.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\snprintf.c
-<<
-
-"$(INTDIR)\qsort.obj" : "$(INTDIR)" ..\..\port\qsort.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\qsort.c
-<<
-
-..\..\backend\parser\gram.h : ..\..\backend\parser\gram.y
-	$(BISON)  -d  ..\..\backend\parser\gram.y
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
diff --git a/src/bin/pg_resetxlog/.gitignore b/src/bin/pg_resetxlog/.gitignore
index 6b84208ee0c2..584590951fc6 100644
--- a/src/bin/pg_resetxlog/.gitignore
+++ b/src/bin/pg_resetxlog/.gitignore
@@ -1 +1,3 @@
+/pg_crc.c
+
 /pg_resetxlog
diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile
index 0e427bca12ae..0abbd5a20e17 100644
--- a/src/bin/pg_resetxlog/Makefile
+++ b/src/bin/pg_resetxlog/Makefile
@@ -18,9 +18,6 @@ LIBS := $(filter-out -lresolv -lbz2, $(LIBS))
 # This program isn't interactive, so doesn't need these
 LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses -lcurl -lssl -lcrypto -lz, $(LIBS))
 
-
-override CPPFLAGS += -DFRONTEND
-
 OBJS= pg_resetxlog.o $(WIN32RES)
 
 all: submake-libpgport pg_resetxlog
diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index 1e62a48e1836..806332af4660 100644
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
@@ -1,5 +1,5 @@
 # $PostgreSQL: pgsql/src/bin/pg_resetxlog/nls.mk,v 1.20.2.1 2009/09/03 21:01:10 petere Exp $
 CATALOG_NAME	:= pg_resetxlog
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR ro ru sv ta tr
+AVAIL_LANGUAGES	:= cs de es fr hu it ko nb pt_BR ro ru sk sl sv ta tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_resetxlog.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index 9a20556d07e7..cb5cc679b501 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.57 2007/02/10 14:58:55 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.63.2.2 2009/05/03 23:13:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,6 +75,7 @@ static void PrintControlValues(bool guessed);
 static void RewriteControlFile(void);
 static void FindEndOfXLOG(void);
 static void KillExistingXLOG(void);
+static void KillExistingArchiveStatus(void);
 static void WriteEmptyXLOG(void);
 static void usage(void);
 
@@ -101,7 +102,6 @@ main(int argc, char *argv[])
 	char	   *endptr3;
 	char	   *DataDir;
 	int			fd;
-	char		path[MAXPGPATH];
 
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_resetxlog"));
 
@@ -281,13 +281,12 @@ main(int argc, char *argv[])
 	 * Check for a postmaster lock file --- if there is one, refuse to
 	 * proceed, on grounds we might be interfering with a live installation.
 	 */
-	snprintf(path, MAXPGPATH, "%s/postmaster.pid", DataDir);
-
-	if ((fd = open(path, O_RDONLY, 0)) < 0)
+	if ((fd = open("postmaster.pid", O_RDONLY, 0)) < 0)
 	{
 		if (errno != ENOENT)
 		{
-			fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"), progname, path, strerror(errno));
+			fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
+					progname, "postmaster.pid", strerror(errno));
 			exit(1);
 		}
 	}
@@ -295,7 +294,7 @@ main(int argc, char *argv[])
 	{
 		fprintf(stderr, _("%s: lock file \"%s\" exists\n"
 						  "Is a server running?  If not, delete the lock file and try again.\n"),
-				progname, path);
+				progname, "postmaster.pid");
 		exit(1);
 	}
 
@@ -362,7 +361,7 @@ main(int argc, char *argv[])
 	if (ControlFile.state != DB_SHUTDOWNED && !force)
 	{
 		printf(_("The database server was not shut down cleanly.\n"
-				 "Resetting the transaction log might cause data to be lost.\n"
+			   "Resetting the transaction log might cause data to be lost.\n"
 				 "If you want to proceed anyway, use -f to force reset.\n"));
 		exit(1);
 	}
@@ -372,6 +371,7 @@ main(int argc, char *argv[])
 	 */
 	RewriteControlFile();
 	KillExistingXLOG();
+	KillExistingArchiveStatus();
 	WriteEmptyXLOG();
 
 	printf(_("Transaction log reset\n"));
@@ -483,7 +483,6 @@ GuessControlValues(void)
 
 	ControlFile.checkPointCopy.redo.xlogid = 0;
 	ControlFile.checkPointCopy.redo.xrecoff = SizeOfXLogLongPHD;
-	ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
 	ControlFile.checkPointCopy.ThisTimeLineID = 1;
 	ControlFile.checkPointCopy.nextXidEpoch = 0;
 	ControlFile.checkPointCopy.nextXid = (TransactionId) 514;	/* XXX */
@@ -504,6 +503,7 @@ GuessControlValues(void)
 	ControlFile.xlog_seg_size = XLOG_SEG_SIZE;
 	ControlFile.nameDataLen = NAMEDATALEN;
 	ControlFile.indexMaxKeys = INDEX_MAX_KEYS;
+	ControlFile.toast_max_chunk_size = TOAST_MAX_CHUNK_SIZE;
 #ifdef HAVE_INT64_TIMESTAMP
 	ControlFile.enableIntTimes = TRUE;
 #else
@@ -556,9 +556,9 @@ PrintControlValues(bool guessed)
 	snprintf(sysident_str, sizeof(sysident_str), UINT64_FORMAT,
 			 ControlFile.system_identifier);
 
-	printf(_("First log file ID for new XLOG:       %u\n"),
+	printf(_("First log file ID after reset:        %u\n"),
 		   newXlogId);
-	printf(_("First log file segment for new XLOG:  %u\n"),
+	printf(_("First log file segment after reset:   %u\n"),
 		   newXlogSeg);
 	printf(_("pg_control version number:            %u\n"),
 		   ControlFile.pg_control_version);
@@ -592,6 +592,8 @@ PrintControlValues(bool guessed)
 		   ControlFile.nameDataLen);
 	printf(_("Maximum columns in an index:          %u\n"),
 		   ControlFile.indexMaxKeys);
+	printf(_("Maximum size of a TOAST chunk:        %u\n"),
+		   ControlFile.toast_max_chunk_size);
 	printf(_("Date/time type storage:               %s\n"),
 		   (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers")));
 	printf(_("Maximum length of locale name:        %u\n"),
@@ -619,7 +621,7 @@ RewriteControlFile(void)
 	ControlFile.checkPointCopy.redo.xlogid = newXlogId;
 	ControlFile.checkPointCopy.redo.xrecoff =
 		newXlogSeg * XLogSegSize + SizeOfXLogLongPHD;
-	ControlFile.checkPointCopy.time = (pg_time_t) time(NULL);
+	ControlFile.checkPointCopy.time = time(NULL);
 
 	ControlFile.state = DB_SHUTDOWNED;
 	ControlFile.time = (pg_time_t) time(NULL);
@@ -706,17 +708,17 @@ FindEndOfXLOG(void)
 	struct dirent *xlde;
 
 	/*
-	 * Initialize the max() computation using the last checkpoint address
-	 * from old pg_control.  Note that for the moment we are working with
-	 * segment numbering according to the old xlog seg size.
+	 * Initialize the max() computation using the last checkpoint address from
+	 * old pg_control.	Note that for the moment we are working with segment
+	 * numbering according to the old xlog seg size.
 	 */
 	newXlogId = ControlFile.checkPointCopy.redo.xlogid;
 	newXlogSeg = ControlFile.checkPointCopy.redo.xrecoff / ControlFile.xlog_seg_size;
 
 	/*
-	 * Scan the pg_xlog directory to find existing WAL segment files.
-	 * We assume any present have been used; in most scenarios this should
-	 * be conservative, because of xlog.c's attempts to pre-create files.
+	 * Scan the pg_xlog directory to find existing WAL segment files. We
+	 * assume any present have been used; in most scenarios this should be
+	 * conservative, because of xlog.c's attempts to pre-create files.
 	 */
 	xldir = opendir(XLOGDIR);
 	if (xldir == NULL)
@@ -732,11 +734,12 @@ FindEndOfXLOG(void)
 		if (strlen(xlde->d_name) == 24 &&
 			strspn(xlde->d_name, "0123456789ABCDEF") == 24)
 		{
-			unsigned int	tli,
-							log,
-							seg;
+			unsigned int tli,
+						log,
+						seg;
 
 			sscanf(xlde->d_name, "%08X%08X%08X", &tli, &log, &seg);
+
 			/*
 			 * Note: we take the max of all files found, regardless of their
 			 * timelines.  Another possibility would be to ignore files of
@@ -771,8 +774,8 @@ FindEndOfXLOG(void)
 	closedir(xldir);
 
 	/*
-	 * Finally, convert to new xlog seg size, and advance by one to ensure
-	 * we are in virgin territory.
+	 * Finally, convert to new xlog seg size, and advance by one to ensure we
+	 * are in virgin territory.
 	 */
 	newXlogSeg *= ControlFile.xlog_seg_size;
 	newXlogSeg = (newXlogSeg + XLogSegSize - 1) / XLogSegSize;
@@ -836,6 +839,63 @@ KillExistingXLOG(void)
 }
 
 
+/*
+ * Remove existing archive status files
+ */
+static void
+KillExistingArchiveStatus(void)
+{
+	DIR		   *xldir;
+	struct dirent *xlde;
+	char		path[MAXPGPATH];
+
+#define ARCHSTATDIR	XLOGDIR "/archive_status"
+
+	xldir = opendir(ARCHSTATDIR);
+	if (xldir == NULL)
+	{
+		fprintf(stderr, _("%s: could not open directory \"%s\": %s\n"),
+				progname, ARCHSTATDIR, strerror(errno));
+		exit(1);
+	}
+
+	errno = 0;
+	while ((xlde = readdir(xldir)) != NULL)
+	{
+		if (strspn(xlde->d_name, "0123456789ABCDEF") == 24 &&
+			(strcmp(xlde->d_name + 24, ".ready") == 0 ||
+			 strcmp(xlde->d_name + 24, ".done")  == 0))
+		{
+			snprintf(path, MAXPGPATH, "%s/%s", ARCHSTATDIR, xlde->d_name);
+			if (unlink(path) < 0)
+			{
+				fprintf(stderr, _("%s: could not delete file \"%s\": %s\n"),
+						progname, path, strerror(errno));
+				exit(1);
+			}
+		}
+		errno = 0;
+	}
+#ifdef WIN32
+
+	/*
+	 * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
+	 * released version
+	 */
+	if (GetLastError() == ERROR_NO_MORE_FILES)
+		errno = 0;
+#endif
+
+	if (errno)
+	{
+		fprintf(stderr, _("%s: could not read from directory \"%s\": %s\n"),
+				progname, ARCHSTATDIR, strerror(errno));
+		exit(1);
+	}
+	closedir(xldir);
+}
+
+
 /*
  * Write an empty XLOG file, containing only the checkpoint record
  * already set up in ControlFile.
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index f195cf514cf1..83efe5303749 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -38,7 +38,7 @@ OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
 	tab-complete.o mbprint.o dumputils.o keywords.o kwlookup.o \
 	sql_help.o \
 	$(WIN32RES)
-	
+
 FLEXFLAGS = -Cfe
 
 # The frontend doesn't need everything that's in LIBS, some are backend only
diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak
deleted file mode 100644
index 9115a136b61a..000000000000
--- a/src/bin/psql/bcc32.mak
+++ /dev/null
@@ -1,243 +0,0 @@
-# Makefile for Borland C++ 5.5
-
-# Borland C++ base install directory goes here
-# BCB=c:\Borland\Bcc55
-
-!IF "$(BCB)" == ""
-!MESSAGE You must edit bcc32.mak and define BCB at the top
-!ERROR missing BCB
-!ENDIF
-
-!IF "$(__NMAKE__)" == ""
-!MESSAGE You must use the -N compatibility flag, e.g. make -N -f bcc32.make
-!ERROR missing -N
-!ENDIF
-
-!MESSAGE Building PSQL.EXE ...
-!MESSAGE
-!IF "$(CFG)" == ""
-CFG=Release
-!MESSAGE No configuration specified. Defaulting to Release with STATIC libraries.
-!MESSAGE To use dynamic link libraries add -DDLL_LIBS to make command line.
-!MESSAGE
-!ELSE
-!MESSAGE Configuration "$(CFG)"
-!MESSAGE
-!ENDIF
-
-!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running MAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Release" (Win32 Release EXE)
-!MESSAGE "Debug" (Win32 Debug EXE)
-!MESSAGE
-!ERROR An invalid configuration was specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=bcc32.exe
-PERL=perl.exe
-FLEX=flex.exe
-
-!IF "$(CFG)" == "Debug"
-DEBUG=1
-OUTDIR=.\Debug
-INTDIR=.\Debug
-!else
-OUTDIR=.\Release
-INTDIR=.\Release
-!endif
-REFDOCDIR=../../../doc/src/sgml/ref
-
-CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32;..\..\include\port\win32_msvc;..\pg_dump;..\..\backend \
-           -c -D$(USERDEFINES) -DFRONTEND -n"$(INTDIR)" -tWM -tWC -q -5 -a8 -pc -X -w-use \
-	   -w-par -w-pia -w-csu -w-aus -w-ccc
-
-!IFDEF DEBUG
-CPP_PROJ  	= $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
-LIBPG_DIR 	= Debug
-!ELSE
-CPP_PROJ	= $(CPP_PROJ) -O -Oi -OS -DNDEBUG
-LIBPG_DIR 	= Release
-!ENDIF
-
-!IFDEF DLL_LIBS
-CPP_PROJ	= $(CPP_PROJ) -D_RTLDLL
-LIBRARIES	= cw32mti.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpqdll.lib
-!ELSE
-CPP_PROJ	= $(CPP_PROJ) -DBCC32_STATIC
-LIBRARIES	= cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib
-!ENDIF
-
-.path.obj = $(INTDIR)
-
-USERDEFINES = WIN32;_CONSOLE;_MBCS
-
-ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
-
-CLEAN :
-	-@erase "$(INTDIR)\command.obj"
-	-@erase "$(INTDIR)\common.obj"
-	-@erase "$(INTDIR)\copy.obj"
-	-@erase "$(INTDIR)\describe.obj"
-	-@erase "$(INTDIR)\help.obj"
-	-@erase "$(INTDIR)\input.obj"
-	-@erase "$(INTDIR)\large_obj.obj"
-	-@erase "$(INTDIR)\mainloop.obj"
-	-@erase "$(INTDIR)\mbprint.obj"
-	-@erase "$(INTDIR)\print.obj"
-	-@erase "$(INTDIR)\prompt.obj"
-	-@erase "$(INTDIR)\psqlscan.obj"
-	-@erase "$(INTDIR)\startup.obj"
-	-@erase "$(INTDIR)\stringutils.obj"
-	-@erase "$(INTDIR)\tab-complete.obj"
-	-@erase "$(INTDIR)\variables.obj"
-	-@erase "$(INTDIR)\exec.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\getopt_long.obj"
-	-@erase "$(INTDIR)\snprintf.obj"
-	-@erase "$(INTDIR)\path.obj"
-	-@erase "$(INTDIR)\strlcpy.obj"
-	-@erase "$(INTDIR)\pgstrcasecmp.obj"
-	-@erase "$(INTDIR)\sprompt.obj"
-	-@erase "$(INTDIR)\dumputils.obj"
-	-@erase "$(INTDIR)\keywords.obj"
-	-@erase "$(INTDIR)\psql.ilc"
-	-@erase "$(INTDIR)\psql.ild"
-	-@erase "$(INTDIR)\psql.tds"
-	-@erase "$(INTDIR)\psql.ils"
-	-@erase "$(INTDIR)\psql.ilf"
-	-@erase "$(OUTDIR)\psql.exe"
-	-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
-
-LINK32=ilink32.exe
-LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v
-LINK32_OBJS= \
-	"$(INTDIR)\command.obj" \
-	"$(INTDIR)\common.obj" \
-	"$(INTDIR)\copy.obj" \
-	"$(INTDIR)\describe.obj" \
-	"$(INTDIR)\help.obj" \
-	"$(INTDIR)\input.obj" \
-	"$(INTDIR)\large_obj.obj" \
-	"$(INTDIR)\mainloop.obj" \
-	"$(INTDIR)\mbprint.obj" \
-	"$(INTDIR)\print.obj" \
-	"$(INTDIR)\prompt.obj" \
-	"$(INTDIR)\psqlscan.obj" \
-	"$(INTDIR)\startup.obj" \
-	"$(INTDIR)\stringutils.obj" \
-	"$(INTDIR)\tab-complete.obj" \
-	"$(INTDIR)\variables.obj" \
-	"$(INTDIR)\exec.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\getopt_long.obj" \
-	"$(INTDIR)\snprintf.obj" \
-	"$(INTDIR)\path.obj" \
-	"$(INTDIR)\strlcpy.obj" \
-	"$(INTDIR)\pgstrcasecmp.obj" \
-	"$(INTDIR)\sprompt.obj" \
-	"$(INTDIR)\dumputils.obj" \
-	"$(INTDIR)\keywords.obj" 
-
-!IFDEF DEBUG
-LINK32_OBJS	= $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\blibpqddll.lib"
-!ELSE
-LINK32_OBJS	= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\blibpqdll.lib"
-!ENDIF
-
-# Have to use \# so # isn't treated as a comment, but MSVC doesn't like this
-"..\..\port\pg_config_paths.h": bcc32.mak
-	echo \#define PGBINDIR "" >$@
-	echo \#define PGSHAREDIR "" >>$@
-	echo \#define SYSCONFDIR "" >>$@
-	echo \#define INCLUDEDIR "" >>$@
-	echo \#define PKGINCLUDEDIR "" >>$@
-	echo \#define INCLUDEDIRSERVER "" >>$@
-	echo \#define LIBDIR "" >>$@
-	echo \#define PKGLIBDIR "" >>$@
-	echo \#define LOCALEDIR "" >>$@
-	echo \#define DOCDIR "" >>$@
-	echo \#define MANDIR "" >>$@
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS)
-	$(LINK32) @&&!
-	$(LINK32_FLAGS) +
-	c0x32.obj $(LINK32_OBJS), +
-	$@,, +
-	import32.lib $(LIBRARIES),,
-!
-
-"$(INTDIR)\exec.obj" : ..\..\port\exec.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\exec.c
-<<
-
-"$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\getopt.c
-<<
-
-"$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\getopt_long.c
-<<
-
-"$(INTDIR)\snprintf.obj" : "$(INTDIR)" ..\..\port\snprintf.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\snprintf.c
-<<
-
-"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\path.c
-<<
-
-"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\strlcpy.c
-<<
-
-"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
-<<
-
-"$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\sprompt.c
-<<
-
-"$(INTDIR)\dumputils.obj" : "$(INTDIR)" ..\pg_dump\dumputils.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\pg_dump\dumputils.c
-<<
-
-"$(INTDIR)\keywords.obj" : "$(INTDIR)" ..\..\backend\parser\keywords.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\backend\parser\keywords.c
-<<
-
-"sql_help.h": create_help.pl 
-       $(PERL) create_help.pl $(REFDOCDIR) $@
-
-psqlscan.c : psqlscan.l
-	$(FLEX) -Cfe -opsqlscan.c psqlscan.l
-
-.c.obj:
-	$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
-
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index b8e805044166..dbc410bcbd87 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -943,6 +943,17 @@ exec_command(const char *cmd,
 		char	   *fname = psql_scan_slash_option(scan_state,
 												   OT_NORMAL, NULL, true);
 
+#if defined(WIN32) && !defined(__CYGWIN__)
+
+		/*
+		 * XXX This does not work for all terminal environments or for output
+		 * containing non-ASCII characters; see comments in simple_prompt().
+		 */
+#define DEVTTY	"con"
+#else
+#define DEVTTY	"/dev/tty"
+#endif
+
 		expand_tilde(&fname);
 		/* This scrolls off the screen when using /dev/tty */
 		success = saveHistory(fname ? fname : DEVTTY, -1, false, false);
@@ -1604,7 +1615,7 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf, bool *edited)
 		ret = GetTempPath(MAXPGPATH, tmpdir);
 		if (ret == 0 || ret > MAXPGPATH)
 		{
-			psql_error("cannot locate temporary directory: %s",
+			psql_error("cannot locate temporary directory: %s\n",
 					   !ret ? strerror(errno) : "");
 			return false;
 		}
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 7c232f8d2560..018ec10a14dd 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -87,7 +87,7 @@ pg_calloc(size_t nmemb, size_t size)
 	tmp = calloc(nmemb, size);
 	if (!tmp)
 	{
-		psql_error("out of memory");
+		psql_error("out of memory\n");
 		exit(EXIT_FAILURE);
 	}
 	return tmp;
@@ -936,7 +936,7 @@ SendQuery(const char *query)
 	PQclear(results);
 
 	/* Possible microtiming output */
-	if (OK && pset.timing)
+	if (OK && pset.timing && !pset.quiet)
 		printf(_("Time: %.3f ms\n"), elapsed_msec);
 
 	/* check for events that may occur during query execution */
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index a5f092f3219f..89ae92e4d9e5 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2010, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.h,v 1.54 2007/01/05 22:19:49 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.h,v 1.56 2008/01/01 19:45:55 momjian Exp $
  */
 #ifndef COMMON_H
 #define COMMON_H
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index a1c115786213..5daf43ae3ac4 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -591,7 +591,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
 				}
 			}
 
-			pset.lineno++;
+			if (copystream == pset.cur_cmd_source)
+				pset.lineno++;
 		}
 	}
 
diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h
index d2181ff54096..5fad51f4b6b4 100644
--- a/src/bin/psql/describe.h
+++ b/src/bin/psql/describe.h
@@ -54,6 +54,18 @@ extern bool listTSDictionaries(const char *pattern, bool verbose);
 /* \dFt */
 extern bool listTSTemplates(const char *pattern, bool verbose);
 
+/* \dF */
+extern bool listTSConfigs(const char *pattern, bool verbose);
+
+/* \dFp */
+extern bool listTSParsers(const char *pattern, bool verbose);
+
+/* \dFd */
+extern bool listTSDictionaries(const char *pattern, bool verbose);
+
+/* \dFt */
+extern bool listTSTemplates(const char *pattern, bool verbose);
+
 /* \l */
 extern bool listAllDbs(bool verbose);
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 8cf7bf938c37..4fc24e64c086 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -171,6 +171,11 @@ void
 slashUsage(unsigned short int pager)
 {
 	FILE	   *output;
+	char	   *currdb;
+
+	currdb = PQdb(pset.db);
+	if (currdb == NULL)
+		currdb = "";
 
 	output = PageOutput(90, pager);
 
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index c95ee22d8872..700b09eee28a 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -95,10 +95,10 @@ void
 pg_append_history(const char *s, PQExpBuffer history_buf)
 {
 #ifdef USE_READLINE
-	if (useHistory && s && s[0])
+	if (useHistory && s)
 	{
 		appendPQExpBufferStr(history_buf, s);
-		if (s[strlen(s) - 1] != '\n')
+		if (!s[0] || s[strlen(s) - 1] != '\n')
 			appendPQExpBufferChar(history_buf, '\n');
 	}
 #endif
diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c
index 73277894c312..0b515da137dc 100644
--- a/src/bin/psql/mbprint.c
+++ b/src/bin/psql/mbprint.c
@@ -3,7 +3,11 @@
  *
  * Copyright (c) 2000-2010, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.25 2007/01/05 22:19:49 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.29.2.2 2010/08/16 00:06:37 tgl Exp $
+ *
+ * XXX this file does not really belong in psql/.  Perhaps move to libpq?
+ * It also seems that the mbvalidate function is redundant with existing
+ * functionality.
  */
 
 #include "postgres_fe.h"
@@ -245,7 +249,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding,
 				linewidth += 4;
 				format_size += 4;
 			}
-			else				/* Output it as-is */
+			else	/* Output it as-is */
 			{
 				linewidth += w;
 				format_size += 1;
@@ -256,7 +260,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding,
 			linewidth += 6;		/* \u0000 */
 			format_size += 6;
 		}
-		else					/* All other chars */
+		else	/* All other chars */
 		{
 			linewidth += w;
 			format_size += chlen;
@@ -333,7 +337,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
 				linewidth += 4;
 				ptr += 4;
 			}
-			else				/* Output it as-is */
+			else	/* Output it as-is */
 			{
 				linewidth += w;
 				*ptr++ = *pwcs;
@@ -355,7 +359,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
 			ptr += 6;
 			linewidth += 6;
 		}
-		else					/* All other chars */
+		else	/* All other chars */
 		{
 			int			i;
 
diff --git a/src/bin/psql/mbprint.h b/src/bin/psql/mbprint.h
index 4e9d933c945e..99fdbec3d82e 100644
--- a/src/bin/psql/mbprint.h
+++ b/src/bin/psql/mbprint.h
@@ -13,6 +13,6 @@ extern unsigned char *mbvalidate(unsigned char *pwcs, int encoding);
 extern int	pg_wcswidth(const unsigned char *pwcs, size_t len, int encoding);
 extern void pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count);
 extern void pg_wcssize(unsigned char *pwcs, size_t len, int encoding,
-		   int *width, int *height, int *format_size);
+					   int *width, int *height, int *format_size);
 
 #endif   /* MBPRINT_H */
diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index 59aff9c9a7a2..7af00d558d8e 100755
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -1800,7 +1800,7 @@ prepare_buffer(const char *txt, int len, char **txtcopy)
 			/* first byte should always be okay... */
 			newtxt[i] = txt[i];
 			i++;
-			while (--thislen > 0)
+			while (--thislen > 0 && i < len)
 				newtxt[i++] = (char) 0xFF;
 		}
 	}
diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
deleted file mode 100644
index f0fe208fe5d3..000000000000
--- a/src/bin/psql/win32.mak
+++ /dev/null
@@ -1,192 +0,0 @@
-# Makefile for Microsoft Visual C++ 5.0 (or compat)
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-PERL=perl.exe
-FLEX=flex.exe
-
-!IFDEF DEBUG
-OPT=/Od /Zi /MDd
-LOPT=/DEBUG
-DEBUGDEF=/D _DEBUG
-OUTDIR=.\Debug
-INTDIR=.\Debug
-!ELSE
-OPT=/O2 /MD
-LOPT=
-DEBUGDEF=/D NDEBUG
-OUTDIR=.\Release
-INTDIR=.\Release
-!ENDIF
-
-REFDOCDIR= ../../../doc/src/sgml/ref
-
-CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
- "_MBCS" /Fp"$(INTDIR)\psql.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
- /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
- /I ..\..\include\port\win32_msvc /I ..\pg_dump /I ..\..\backend \
- /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE"
-
-CPP_OBJS=$(INTDIR)/
-CPP_SBRS=.
-
-ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
-
-CLEAN :
-	-@erase "$(INTDIR)\command.obj"
-	-@erase "$(INTDIR)\common.obj"
-	-@erase "$(INTDIR)\copy.obj"
-	-@erase "$(INTDIR)\describe.obj"
-	-@erase "$(INTDIR)\help.obj"
-	-@erase "$(INTDIR)\input.obj"
-	-@erase "$(INTDIR)\large_obj.obj"
-	-@erase "$(INTDIR)\mainloop.obj"
-	-@erase "$(INTDIR)\mbprint.obj"
-	-@erase "$(INTDIR)\print.obj"
-	-@erase "$(INTDIR)\prompt.obj"
-	-@erase "$(INTDIR)\psqlscan.obj"
-	-@erase "$(INTDIR)\startup.obj"
-	-@erase "$(INTDIR)\stringutils.obj"
-	-@erase "$(INTDIR)\tab-complete.obj"
-	-@erase "$(INTDIR)\variables.obj"
-	-@erase "$(INTDIR)\exec.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\getopt_long.obj"
-	-@erase "$(INTDIR)\snprintf.obj"
-	-@erase "$(INTDIR)\path.obj"
-	-@erase "$(INTDIR)\strlcpy.obj"
-	-@erase "$(INTDIR)\pgstrcasecmp.obj"
-	-@erase "$(INTDIR)\sprompt.obj"
-	-@erase "$(INTDIR)\dumputils.obj"
-	-@erase "$(INTDIR)\keywords.obj"
-	-@erase "$(INTDIR)\*psql.pch"
-	-@erase "$(OUTDIR)\psql.exe"
-	-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shfolder.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\psql.pdb" /machine:I386 $(LOPT) /out:"$(OUTDIR)\psql.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\command.obj" \
-	"$(INTDIR)\common.obj" \
-	"$(INTDIR)\copy.obj" \
-	"$(INTDIR)\describe.obj" \
-	"$(INTDIR)\help.obj" \
-	"$(INTDIR)\input.obj" \
-	"$(INTDIR)\large_obj.obj" \
-	"$(INTDIR)\mainloop.obj" \
-	"$(INTDIR)\mbprint.obj" \
-	"$(INTDIR)\print.obj" \
-	"$(INTDIR)\prompt.obj" \
-	"$(INTDIR)\psqlscan.obj" \
-	"$(INTDIR)\startup.obj" \
-	"$(INTDIR)\stringutils.obj" \
-	"$(INTDIR)\tab-complete.obj" \
-	"$(INTDIR)\variables.obj" \
-	"$(INTDIR)\exec.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\getopt_long.obj" \
-	"$(INTDIR)\snprintf.obj" \
-	"$(INTDIR)\path.obj" \
-	"$(INTDIR)\strlcpy.obj" \
-	"$(INTDIR)\pgstrcasecmp.obj" \
-	"$(INTDIR)\sprompt.obj" \
-	"$(INTDIR)\dumputils.obj" \
-	"$(INTDIR)\keywords.obj" 
-
-!IFDEF DEBUG
-LINK32_OBJS	= $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib"
-!ELSE
-LINK32_OBJS	= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
-!ENDIF
-
-"..\..\port\pg_config_paths.h": win32.mak
-	echo #define PGBINDIR "" >$@
-	echo #define PGSHAREDIR "" >>$@
-	echo #define SYSCONFDIR "" >>$@
-	echo #define INCLUDEDIR "" >>$@
-	echo #define PKGINCLUDEDIR "" >>$@
-	echo #define INCLUDEDIRSERVER "" >>$@
-	echo #define LIBDIR "" >>$@
-	echo #define PKGLIBDIR "" >>$@
-	echo #define LOCALEDIR "" >>$@
-	echo #define DOCDIR "" >>$@
-	echo #define MANDIR "" >>$@
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-"$(INTDIR)\exec.obj" : ..\..\port\exec.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\exec.c
-<<
-
-"$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\getopt.c
-<<
-
-"$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\getopt_long.c
-<<
-
-"$(INTDIR)\snprintf.obj" : "$(INTDIR)" ..\..\port\snprintf.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\snprintf.c
-<<
-
-"$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\path.c
-<<
-
-"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\strlcpy.c
-<<
-
-"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
-<<
-
-"$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\sprompt.c
-<<
-
-"$(INTDIR)\dumputils.obj" : "$(INTDIR)" ..\pg_dump\dumputils.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\pg_dump\dumputils.c
-<<
-
-"$(INTDIR)\keywords.obj" : "$(INTDIR)" ..\..\backend\parser\keywords.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\backend\parser\keywords.c
-<<
-
-"sql_help.h" : create_help.pl
-        $(PERL) create_help.pl $(REFDOCDIR) $@
-	
-psqlscan.c : psqlscan.l
-	$(FLEX) -Cfe -opsqlscan.c psqlscan.l
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index b654dcf64012..d54096a2d990 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/scripts
 #
-# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.42 2009/03/07 02:09:22 alvherre Exp $
@@ -26,7 +26,7 @@ LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses -lcurl -lssl
 
 PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb reindexdb
 
-override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
 
 # I don't think we really need libpgport for any of the scripts, but
 # if we don't have it, we'd need to filter out -lpgport, otherwise we get a link error on solaris and win32
diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index eae0e7fe2349..5ead03f65813 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -1,6 +1,6 @@
 # $PostgreSQL: pgsql/src/bin/scripts/nls.mk,v 1.23.2.1 2009/09/03 21:01:11 petere Exp $
 CATALOG_NAME    := pgscripts
-AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ro sv ta tr
+AVAIL_LANGUAGES := cs de es fr it ko pt_BR ro ru sk sl sv ta tr zh_CN zh_TW
 GETTEXT_FILES   := createdb.c createlang.c createuser.c \
                    dropdb.c droplang.c dropuser.c \
                    clusterdb.c vacuumdb.c reindexdb.c \
diff --git a/src/include/Makefile b/src/include/Makefile
index 33c38023cb37..5f273174d628 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -4,7 +4,7 @@
 #
 # 'make install' installs whole contents of src/include.
 #
-# $PostgreSQL: pgsql/src/include/Makefile,v 1.21 2005/12/09 21:19:35 petere Exp $
+# $PostgreSQL: pgsql/src/include/Makefile,v 1.23.2.1 2009/07/20 20:38:58 alvherre Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,8 +18,9 @@ all: pg_config.h pg_config_os.h check_oids
 
 # Subdirectories containing headers for server-side dev
 SUBDIRS = access bootstrap catalog codegen commands executor gpmon lib libpq mb \
-	nodes optimizer parser postmaster regex replication rewrite storage \
-	tcop utils port port/atomics port/win32 port/win32_msvc port/win32_msvc/sys \
+	nodes optimizer parser postmaster regex replication rewrite storage tcop \
+	snowball snowball/libstemmer tsearch tsearch/dicts utils \
+	port port/atomics port/win32 port/win32_msvc port/win32_msvc/sys \
 	port/win32/arpa port/win32/netinet port/win32/sys \
 	portability
 
@@ -53,6 +54,12 @@ install: all installdirs
 	$(INSTALL_DATA) $(srcdir)/cdb/cdbpathlocus.h   $(DESTDIR)$(includedir_internal_cdb)
 	$(INSTALL_DATA) $(srcdir)/cdb/cdbdef.h   $(DESTDIR)$(includedir_internal_cdb)
 	$(INSTALL_DATA) $(srcdir)/cdb/cdbdistributedsnapshot.h   $(DESTDIR)$(includedir_internal_cdb)
+ifeq ($(vpath_build),yes)
+	for file in dynloader.h parser/parse.h; do \
+	  cp $$file '$(DESTDIR)$(includedir_server)'/$$file || exit; \
+	  chmod $(INSTALL_DATA_MODE) '$(DESTDIR)$(includedir_server)'/$$file || exit; \
+	done
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq' \
diff --git a/src/include/access/clog.h b/src/include/access/clog.h
index aaf996842916..8a8a033e182c 100644
--- a/src/include/access/clog.h
+++ b/src/include/access/clog.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/clog.h,v 1.19 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/clog.h,v 1.21 2008/01/01 19:45:56 momjian Exp $
  */
 #ifndef CLOG_H
 #define CLOG_H
@@ -32,9 +32,8 @@ typedef int XidStatus;
 #define NUM_CLOG_BUFFERS	8
 
 
-extern void TransactionIdSetStatus(TransactionId xid, XidStatus status);
-
-extern XidStatus TransactionIdGetStatus(TransactionId xid);
+extern void TransactionIdSetStatus(TransactionId xid, XidStatus status, XLogRecPtr lsn);
+extern XidStatus TransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn);
 extern XidStatus InRecoveryTransactionIdGetStatus(TransactionId xid, bool *valid);
 
 extern char *XidStatus_Name(XidStatus status);
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index e2e48d7d1dfa..c5f216aa96ed 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -4,7 +4,7 @@
  *	  POSTGRES generalized index access method definitions.
  *
  *
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.81 2009/08/01 20:59:17 tgl Exp $
@@ -41,6 +41,7 @@ typedef struct IndexVacuumInfo
 	bool		vacuum_full;	/* VACUUM FULL (we have exclusive lock) */
 	int			message_level;	/* ereport level for progress messages */
 	double		num_heap_tuples;	/* tuples remaining in heap */
+	BufferAccessStrategy strategy;		/* access strategy for reads */
 	List        *extra_oids;    /* For bitmap indexes: store three relfilenode oids
 								 * for reindexing a bitmap index.
 								 */
diff --git a/src/include/access/gin.h b/src/include/access/gin.h
index 1fc3e5c4c749..9f090bb7d4dd 100644
--- a/src/include/access/gin.h
+++ b/src/include/access/gin.h
@@ -2,8 +2,9 @@
  * gin.h
  *	  header file for postgres inverted index access method implementation.
  *
- *	Copyright (c) 2006, PostgreSQL Global Development Group
- *	$PostgreSQL: pgsql/src/include/access/gin.h,v 1.10 2007/01/31 15:09:45 teodor Exp $
+ *	Copyright (c) 2006-2008, PostgreSQL Global Development Group
+ *
+ *	$PostgreSQL: pgsql/src/include/access/gin.h,v 1.16.2.3 2009/06/05 18:50:52 tgl Exp $
  *--------------------------------------------------------------------------
  */
 
@@ -31,41 +32,35 @@
 #define GIN_CONSISTENT_PROC			   4
 #define GINNProcs					   4
 
-typedef XLogRecPtr GinNSN;
+/*
+ * Max depth allowed in search tree during bulk inserts.  This is to keep from
+ * degenerating to O(N^2) behavior when the tree is unbalanced due to sorted
+ * or nearly-sorted input.  (Perhaps it would be better to use a balanced-tree
+ * algorithm, but in common cases that would only add useless overhead.)
+ */
+#define GIN_MAX_TREE_DEPTH 100
 
 /*
  * Page opaque data in a inverted index page.
+ *
+ * Note: GIN does not include a page ID word as do the other index types.
+ * This is OK because the opaque data is only 8 bytes and so can be reliably
+ * distinguished by size.  Revisit this if the size ever increases.
  */
 typedef struct GinPageOpaqueData
 {
-	uint16		flags;
+	BlockNumber rightlink;		/* next page if any */
 	OffsetNumber maxoff;		/* number entries on GIN_DATA page: number of
 								 * heap ItemPointer on GIN_DATA|GIN_LEAF page
 								 * and number of records on GIN_DATA &
 								 * ~GIN_LEAF page */
-	BlockNumber rightlink;
+	uint16		flags;			/* see bit definitions below */
 } GinPageOpaqueData;
 
 typedef GinPageOpaqueData *GinPageOpaque;
 
 #define GIN_ROOT_BLKNO	(0)
 
-typedef struct
-{
-	BlockIdData child_blkno;	/* use it instead of BlockNumber to save space
-								 * on page */
-	ItemPointerData key;
-} PostingItem;
-
-#define PostingItemGetBlockNumber(pointer) \
-	BlockIdGetBlockNumber(&(pointer)->child_blkno)
-
-#define PostingItemSetBlockNumber(pointer, blockNumber) \
-	BlockIdSet(&((pointer)->child_blkno), (blockNumber))
-
-/*
- * Page opaque data in a inverted index page.
- */
 #define GIN_DATA		  (1 << 0)
 #define GIN_LEAF		  (1 << 1)
 #define GIN_DELETED		  (1 << 2)
@@ -98,8 +93,21 @@ typedef struct
 #define GinItemPointerGetOffsetNumber(pointer) \
 	((pointer)->ip_posid)
 
+typedef struct
+{
+	BlockIdData child_blkno;	/* use it instead of BlockNumber to save space
+								 * on page */
+	ItemPointerData key;
+} PostingItem;
+
+#define PostingItemGetBlockNumber(pointer) \
+	BlockIdGetBlockNumber(&(pointer)->child_blkno)
+
+#define PostingItemSetBlockNumber(pointer, blockNumber) \
+	BlockIdSet(&((pointer)->child_blkno), (blockNumber))
+
 /*
- * Support work on IndexTuuple on leaf pages
+ * Support work on IndexTuple on leaf pages
  */
 #define GinGetNPosting(itup)	GinItemPointerGetOffsetNumber(&(itup)->t_tid)
 #define GinSetNPosting(itup,n)	ItemPointerSetOffsetNumber(&(itup)->t_tid,(n))
@@ -233,7 +241,7 @@ extern void GinInitBuffer(Buffer b, uint32 f);
 extern void GinInitPage(Page page, uint32 f, Size pageSize);
 extern int	compareEntries(GinState *ginstate, Datum a, Datum b);
 extern Datum *extractEntriesS(GinState *ginstate, Datum value,
-							  int32 *nentries, bool *needUnique);
+				int32 *nentries, bool *needUnique);
 extern Datum *extractEntriesSU(GinState *ginstate, Datum value, int32 *nentries);
 extern Page GinPageGetCopyPage(Page page);
 
@@ -314,12 +322,9 @@ extern IndexTuple ginPageGetLinkItup(Buffer buf);
 
 /* gindatapage.c */
 extern int	compareItemPointers(ItemPointer a, ItemPointer b);
-extern void
-MergeItemPointers(
-				  ItemPointerData *dst,
+extern void MergeItemPointers(ItemPointerData *dst,
 				  ItemPointerData *a, uint32 na,
-				  ItemPointerData *b, uint32 nb
-);
+				  ItemPointerData *b, uint32 nb);
 
 extern void GinDataPageAddItem(Page page, void *data, OffsetNumber offset);
 extern void PageDeletePostingItem(Page page, OffsetNumber offset);
@@ -401,8 +406,8 @@ typedef struct GinScanOpaqueData
 
 	GinScanKey	keys;
 	uint32		nkeys;
-	bool		isVoidRes; /* true if ginstate.extractQueryFn 
-							  guarantees that nothing will be found */
+	bool		isVoidRes;		/* true if ginstate.extractQueryFn guarantees
+								 * that nothing will be found */
 
 	GinScanKey	markPos;
 } GinScanOpaqueData;
@@ -420,9 +425,9 @@ extern void newScanKey(IndexScanDesc scan);
 extern PGDLLIMPORT int GinFuzzySearchLimit;
 
 #define ItemPointerSetMax(p)	ItemPointerSet( (p), (BlockNumber)0xffffffff, (OffsetNumber)0xffff )
-#define ItemPointerIsMax(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0xffffffff && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff )
+#define ItemPointerIsMax(p) ( GinItemPointerGetBlockNumber(p) == (BlockNumber)0xffffffff && GinItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff )
 #define ItemPointerSetMin(p)	ItemPointerSet( (p), (BlockNumber)0, (OffsetNumber)0)
-#define ItemPointerIsMin(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0 && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0 )
+#define ItemPointerIsMin(p) ( GinItemPointerGetBlockNumber(p) == (BlockNumber)0 && GinItemPointerGetOffsetNumber(p) == (OffsetNumber)0 )
 
 extern Datum gingetmulti(PG_FUNCTION_ARGS);
 extern Datum gingettuple(PG_FUNCTION_ARGS);
@@ -433,6 +438,7 @@ extern Datum ginvacuumcleanup(PG_FUNCTION_ARGS);
 
 /* ginarrayproc.c */
 extern Datum ginarrayextract(PG_FUNCTION_ARGS);
+extern Datum ginqueryarrayextract(PG_FUNCTION_ARGS);
 extern Datum ginarrayconsistent(PG_FUNCTION_ARGS);
 
 /* ginbulk.c */
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 43b624feb1ed..1e4d49dd6af0 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/gist.h,v 1.57 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/gist.h,v 1.59 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,25 +56,30 @@
 /*
  * Page opaque data in a GiST index page.
  */
-#define F_LEAF			(1 << 0)
-#define F_DELETED		(1 << 1)
+#define F_LEAF				(1 << 0)
+#define F_DELETED			(1 << 1)
 #define F_TUPLES_DELETED	(1 << 2)
 
 typedef XLogRecPtr GistNSN;
 
 typedef struct GISTPageOpaqueData
 {
-	uint32		flags;			/* 29 bits are unused for now */
-	BlockNumber rightlink;
-
-	/*
-	 * the only meaning - change this value if page split.
-	 */
-	GistNSN		nsn;
+	GistNSN		nsn;			/* this value must change on page split */
+	BlockNumber rightlink;		/* next page if any */
+	uint16		flags;			/* see bit definitions above */
+	uint16		gist_page_id;	/* for identification of GiST indexes */
 } GISTPageOpaqueData;
 
 typedef GISTPageOpaqueData *GISTPageOpaque;
 
+/*
+ * The page ID is for the convenience of pg_filedump and similar utilities,
+ * which otherwise would have a hard time telling pages of different index
+ * types apart.  It should be the last 2 bytes on the page.  This is more or
+ * less "free" due to alignment considerations.
+ */
+#define GIST_PAGE_ID		0xFF81
+
 /*
  * This is the Split Vector to be returned by the PickSplit method.
  * PickSplit should check spl_(r|l)datum_exists. If it is 'true',
diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index 3ebdbc26411c..26e2c2e52c91 100644
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.26 2007/01/20 18:43:35 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.28.2.3 2008/10/22 12:54:25 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,8 +62,8 @@ typedef struct GISTSTATE
 
 typedef struct MatchedItemPtr 
 {
-        ItemPointerData         heapPtr;
-        OffsetNumber            pageOffset; /* offset in index page */
+	ItemPointerData		heapPtr;
+	OffsetNumber		pageOffset; /* offset in index page */
 } MatchedItemPtr;
 
 /*
@@ -75,6 +75,7 @@ typedef struct GISTScanOpaqueData
 	GISTSearchStack *stack;
 	GISTSearchStack *markstk;
 	uint16		flags;
+	bool        qual_ok;        /* false if qual can never be satisfied */
 	GISTSTATE  *giststate;
 	MemoryContext tempCxt;
 	Buffer		curbuf;
@@ -82,18 +83,17 @@ typedef struct GISTScanOpaqueData
 	Buffer		markbuf;
 	ItemPointerData markpos;
 
-	MatchedItemPtr 	pageData[BLCKSZ/sizeof(IndexTupleData)];
-	OffsetNumber    nPageData;
-	OffsetNumber    curPageData;
-	MatchedItemPtr 	markPageData[BLCKSZ/sizeof(IndexTupleData)];
-	OffsetNumber    markNPageData;
-	OffsetNumber    markCurPageData;
+	MatchedItemPtr	pageData[BLCKSZ/sizeof(IndexTupleData)];
+	OffsetNumber	nPageData;
+	OffsetNumber	curPageData;
+	MatchedItemPtr	markPageData[BLCKSZ/sizeof(IndexTupleData)];
+	OffsetNumber	markNPageData;
+	OffsetNumber	markCurPageData;
 } GISTScanOpaqueData;
 
 typedef GISTScanOpaqueData *GISTScanOpaque;
 
 /* XLog stuff */
-extern const XLogRecPtr XLogRecPtrForTemp;
 
 #define XLOG_GIST_PAGE_UPDATE		0x00
 #define XLOG_GIST_NEW_ROOT			0x20
@@ -358,6 +358,8 @@ extern void gistMakeUnionKey(GISTSTATE *giststate, int attno,
 				 GISTENTRY *entry2, bool isnull2,
 				 Datum *dst, bool *dstisnull);
 
+extern XLogRecPtr GetXLogRecPtrForTemp(void);
+
 /* gistvacuum.c */
 extern Datum gistbulkdelete(PG_FUNCTION_ARGS);
 extern Datum gistvacuumcleanup(PG_FUNCTION_ARGS);
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index 4b30c5dd7714..2f5fa04aadcf 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/gistscan.h,v 1.31 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/gistscan.h,v 1.32 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 239f89b80f00..90d4deacf656 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/hash.h,v 1.76 2007/01/30 01:33:36 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/hash.h,v 1.84 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -56,20 +56,18 @@ typedef struct HashPageOpaqueData
 	BlockNumber hasho_nextblkno;	/* next ovfl blkno */
 	Bucket		hasho_bucket;	/* bucket number this pg belongs to */
 	uint16		hasho_flag;		/* page type code, see above */
-	uint16		hasho_filler;	/* available for future use */
-
-	/*
-	 * We presently set hasho_filler to HASHO_FILL (0x1234); this is for the
-	 * convenience of pg_filedump, which otherwise would have a hard time
-	 * telling HashPageOpaqueData from BTPageOpaqueData.  If we ever need that
-	 * space for some other purpose, pg_filedump will have to find another
-	 * way.
-	 */
+	uint16		hasho_page_id;	/* for identification of hash indexes */
 } HashPageOpaqueData;
 
 typedef HashPageOpaqueData *HashPageOpaque;
 
-#define HASHO_FILL		0x1234
+/*
+ * The page ID is for the convenience of pg_filedump and similar utilities,
+ * which otherwise would have a hard time telling pages of different index
+ * types apart.  It should be the last 2 bytes on the page.  This is more or
+ * less "free" due to alignment considerations.
+ */
+#define HASHO_PAGE_ID		0xFF80
 
 /*
  *	HashScanOpaqueData is private state for a hash index scan.
@@ -258,6 +256,7 @@ extern Datum hashint2(PG_FUNCTION_ARGS);
 extern Datum hashint4(PG_FUNCTION_ARGS);
 extern Datum hashint8(PG_FUNCTION_ARGS);
 extern Datum hashoid(PG_FUNCTION_ARGS);
+extern Datum hashenum(PG_FUNCTION_ARGS);
 extern Datum hashfloat4(PG_FUNCTION_ARGS);
 extern Datum hashfloat8(PG_FUNCTION_ARGS);
 extern Datum hashoidvector(PG_FUNCTION_ARGS);
@@ -275,18 +274,25 @@ extern void _hash_doinsert(Relation rel, IndexTuple itup);
 
 /* hashovfl.c */
 extern Buffer _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf);
-extern BlockNumber _hash_freeovflpage(Relation rel, Buffer ovflbuf);
+extern BlockNumber _hash_freeovflpage(Relation rel, Buffer ovflbuf,
+				   BufferAccessStrategy bstrategy);
 extern void _hash_initbitmap(Relation rel, HashMetaPage metap,
 				 BlockNumber blkno);
 extern void _hash_squeezebucket(Relation rel,
-					Bucket bucket, BlockNumber bucket_blkno);
+					Bucket bucket, BlockNumber bucket_blkno,
+					BufferAccessStrategy bstrategy);
 
 /* hashpage.c */
 extern void _hash_getlock(Relation rel, BlockNumber whichlock, int access);
 extern bool _hash_try_getlock(Relation rel, BlockNumber whichlock, int access);
 extern void _hash_droplock(Relation rel, BlockNumber whichlock, int access);
-extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access);
-extern Buffer _hash_getnewbuf(Relation rel, BlockNumber blkno, int access);
+extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno,
+			 int access, int flags);
+extern Buffer _hash_getinitbuf(Relation rel, BlockNumber blkno);
+extern Buffer _hash_getnewbuf(Relation rel, BlockNumber blkno);
+extern Buffer _hash_getbuf_with_strategy(Relation rel, BlockNumber blkno,
+						   int access, int flags,
+						   BufferAccessStrategy bstrategy);
 extern void _hash_relbuf(Relation rel, Buffer buf);
 extern void _hash_dropbuf(Relation rel, Buffer buf);
 extern void _hash_wrtbuf(Relation rel, Buffer buf);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 5944cf0852a0..93254d082d2f 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.121 2007/03/29 00:15:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.130.2.1 2008/03/08 21:58:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -124,28 +124,47 @@ heap_getattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull)
 extern void RelationFetchGpRelationNodeForXLog_Index(Relation relation);
 
 /*
- * Fetch the persistent TID and serial number for a relation from the gp_relation_node
- * if needed to put in the XLOG record header.
+ * Check if we have the persistent TID and serial number for a relation.
  */
-inline static void RelationFetchGpRelationNodeForXLog(
-	Relation		relation)
+static inline bool
+RelationNeedToFetchGpRelationNodeForXLog(Relation relation)
 {
 	if (!InRecovery && !relation->rd_segfile0_relationnodeinfo.isPresent &&
 		!GpPersistent_SkipXLogInfo(relation->rd_id))
 	{
-	
+		return true;
+	}
+	else
+		return false;
+}
+
+/*
+ * Fetch the persistent TID and serial number for a relation from the gp_relation_node
+ * if needed to put in the XLOG record header.
+ */
+static inline void
+RelationFetchGpRelationNodeForXLog(Relation relation)
+{
+	if (RelationNeedToFetchGpRelationNodeForXLog(relation))
+	{
 		if (relation->rd_rel->relkind == RELKIND_INDEX )
 		{
 			// UNDONE: Temporarily.
 			RelationFetchGpRelationNodeForXLog_Index(relation);
 			return;
-				 
 		}
 		RelationFetchSegFile0GpRelationNode(relation);
 	}
 }
 
 
+typedef enum
+{
+	LockTupleShared,
+	LockTupleExclusive
+} LockTupleMode;
+
+
 /* ----------------
  *		function prototypes for heap access method
  *
@@ -154,13 +173,6 @@ inline static void RelationFetchGpRelationNodeForXLog(
  * ----------------
  */
 
-/* heapam.c */
-
-typedef enum
-{
-	LockTupleShared,
-	LockTupleExclusive
-} LockTupleMode;
 
 typedef enum
 {
@@ -190,6 +202,7 @@ inline static void xl_heapnode_set(
 	heapnode->persistentSerialNum = rel->rd_segfile0_relationnodeinfo.persistentSerialNum;
 }
 
+/* in heap/heapam.c */
 extern Relation relation_open(Oid relationId, LOCKMODE lockmode);
 extern Relation try_relation_open(Oid relationId, LOCKMODE lockmode, 
 								  bool noWait);
@@ -219,6 +232,11 @@ extern Relation CdbOpenRelationRv(const RangeVar *relation, LOCKMODE reqmode,
 
 extern HeapScanDesc heap_beginscan(Relation relation, Snapshot snapshot,
 			   int nkeys, ScanKey key);
+extern HeapScanDesc heap_beginscan_strat(Relation relation, Snapshot snapshot,
+					 int nkeys, ScanKey key,
+					 bool allow_strat, bool allow_sync);
+extern HeapScanDesc heap_beginscan_bm(Relation relation, Snapshot snapshot,
+				  int nkeys, ScanKey key);
 extern void heap_rescan(HeapScanDesc scan, ScanKey key);
 extern void heap_endscan(HeapScanDesc scan);
 extern HeapTuple heap_getnext(HeapScanDesc scan, ScanDirection direction);
@@ -231,7 +249,11 @@ extern bool heap_fetch(Relation relation, Snapshot snapshot,
 		   Relation stats_relation);
 extern bool heap_release_fetch(Relation relation, Snapshot snapshot,
 				   HeapTuple tuple, Buffer *userbuf, bool keep_buf,
-		   		   Relation stats_relation);
+				   Relation stats_relation);
+extern bool heap_hot_search_buffer(Relation rel, ItemPointer tid, Buffer buffer,
+					   Snapshot snapshot, bool *all_dead);
+extern bool heap_hot_search(ItemPointer tid, Relation relation,
+				Snapshot snapshot, bool *all_dead);
 
 extern void heap_get_latest_tid(Relation relation, Snapshot snapshot,
 					ItemPointer tid);
@@ -254,7 +276,7 @@ extern void heap_inplace_update(Relation relation, HeapTuple tuple);
 extern void frozen_heap_inplace_update(Relation relation, HeapTuple tuple);
 extern void frozen_heap_inplace_delete(Relation relation, HeapTuple tuple);
 extern bool heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
-							  Buffer buf);
+				  Buffer buf);
 
 extern Oid	simple_heap_insert(Relation relation, HeapTuple tup);
 extern Oid frozen_heap_insert(Relation relation, HeapTuple tup);
@@ -267,6 +289,8 @@ extern void heap_markpos(HeapScanDesc scan);
 extern void heap_markposx(HeapScanDesc scan, HeapTuple tuple);
 extern void heap_restrpos(HeapScanDesc scan);
 
+extern void heap_sync(Relation relation);
+
 extern void heap_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *rptr);
 extern void heap_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
 extern bool heap_getrelfilenode(
@@ -282,17 +306,22 @@ extern XLogRecPtr log_heap_move(Relation reln, Buffer oldbuf,
 			  ItemPointerData from,
 			  Buffer newbuf, HeapTuple newtup);
 extern XLogRecPtr log_heap_clean(Relation reln, Buffer buffer,
-			   OffsetNumber *unused, int uncnt);
+			   OffsetNumber *redirected, int nredirected,
+			   OffsetNumber *nowdead, int ndead,
+			   OffsetNumber *nowunused, int nunused,
+			   bool redirect_move);
 extern XLogRecPtr log_heap_freeze(Relation reln, Buffer buffer,
-								  TransactionId cutoff_xid,
-								  OffsetNumber *offsets, int offcnt);
+				TransactionId cutoff_xid,
+				OffsetNumber *offsets, int offcnt);
+extern XLogRecPtr log_newpage(RelFileNode *rnode, BlockNumber blk, Page page);
 
 /* in common/heaptuple.c */
 extern Size heap_compute_data_size(TupleDesc tupleDesc,
 					   Datum *values, bool *isnull);
 extern Size heap_fill_tuple(TupleDesc tupleDesc,
 				Datum *values, bool *isnull,
-				char *data, uint16 *infomask, bits8 *bit);
+				char *data, Size data_size,
+				uint16 *infomask, bits8 *bit);
 extern bool heap_attisnull(HeapTuple tup, int attnum);
 extern bool heap_attisnull_normalattr(HeapTuple tup, int attnum);
 
@@ -327,9 +356,32 @@ extern void heap_deform_tuple(HeapTuple tuple, TupleDesc tupleDesc,
 extern void heap_deformtuple(HeapTuple tuple, TupleDesc tupleDesc,
 				 Datum *values, char *nulls) __attribute__ ((deprecated));
 extern void heap_freetuple(HeapTuple htup);
+extern MinimalTuple heap_form_minimal_tuple(TupleDesc tupleDescriptor,
+						Datum *values, bool *isnull);
+extern void heap_free_minimal_tuple(MinimalTuple mtup);
+extern MinimalTuple heap_copy_minimal_tuple(MinimalTuple mtup);
+extern HeapTuple heap_tuple_from_minimal_tuple(MinimalTuple mtup);
+extern MinimalTuple minimal_tuple_from_heap_tuple(HeapTuple htup);
 extern HeapTuple heap_addheader(int natts, bool withoid,
 			   Size structlen, void *structure);
 
-extern void heap_sync(Relation relation);
+/* in heap/pruneheap.c */
+extern void heap_page_prune_opt(Relation relation, Buffer buffer,
+					TransactionId OldestXmin);
+extern int heap_page_prune(Relation relation, Buffer buffer,
+				TransactionId OldestXmin,
+				bool redirect_move, bool report_stats);
+extern void heap_page_prune_execute(Relation reln, Buffer buffer,
+						OffsetNumber *redirected, int nredirected,
+						OffsetNumber *nowdead, int ndead,
+						OffsetNumber *nowunused, int nunused,
+						bool redirect_move);
+extern void heap_get_root_tuples(Page page, OffsetNumber *root_offsets);
+
+/* in heap/syncscan.c */
+extern void ss_report_location(Relation rel, BlockNumber location);
+extern BlockNumber ss_get_location(Relation rel, BlockNumber relnblocks);
+extern void SyncScanShmemInit(void);
+extern Size SyncScanShmemSize(void);
 
 #endif   /* HEAPAM_H */
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index 3b9928f892fc..63d1f8e4a861 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.34 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.35 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 2ef910ab20de..0e083158ed66 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.91 2007/02/09 03:35:34 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.98 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -165,9 +165,8 @@ typedef HeapTupleHeaderData *HeapTupleHeader;
 #define HEAP_HASNULL			0x0001	/* has null attribute(s) */
 #define HEAP_HASVARWIDTH		0x0002	/* has variable-width attribute(s) */
 #define HEAP_HASEXTERNAL		0x0004	/* has external stored attribute(s) */
-#define HEAP_HASCOMPRESSED		0x0008	/* has compressed stored attribute(s) */
-#define HEAP_HASEXTENDED		0x000C	/* the two above combined */
-#define HEAP_HASOID				0x0010	/* has an object-id field */
+#define HEAP_HASOID				0x0008	/* has an object-id field */
+/* bit 0x0010 is available */
 #define HEAP_COMBOCID			0x0020	/* t_cid is a combo cid */
 #define HEAP_XMAX_EXCL_LOCK		0x0040	/* xmax is exclusive locker */
 #define HEAP_XMAX_SHARED_LOCK	0x0080	/* xmax is shared locker */
@@ -190,8 +189,7 @@ typedef HeapTupleHeaderData *HeapTupleHeader;
 /*
  * information stored in t_infomask2:
  */
-#define HEAP_NATTS_MASK			0x7FF	/* 11 bits for number of attributes */
-
+#define HEAP_NATTS_MASK			0x07FF	/* 11 bits for number of attributes */
 #define HEAP_XMIN_DISTRIBUTED_SNAPSHOT_IGNORE		0x0800	
 										/* t_xmin is either an old committed 
 										 * distributed transaction or local.
@@ -200,7 +198,10 @@ typedef HeapTupleHeaderData *HeapTupleHeader;
 										 */
 #define HEAP_XMAX_DISTRIBUTED_SNAPSHOT_IGNORE		0x1000
 										/* t_xmax same as above. */
-/* bits 0xE000 are currently unused */
+#define HEAP_HOT_UPDATED		0x4000	/* tuple was HOT-updated */
+#define HEAP_ONLY_TUPLE			0x8000	/* this is heap-only tuple */
+
+#define HEAP2_XACT_MASK			0xC000	/* visibility-related bits */
 
 /*
  * HeapTupleHeader accessor macros
@@ -216,7 +217,7 @@ typedef HeapTupleHeaderData *HeapTupleHeader;
 
 #define HeapTupleHeaderSetXmin(tup, xid) \
 ( \
-	TransactionIdStore((xid), &(tup)->t_choice.t_heap.t_xmin) \
+	(tup)->t_choice.t_heap.t_xmin = (xid) \
 )
 
 #define HeapTupleHeaderGetXmax(tup) \
@@ -226,7 +227,7 @@ typedef HeapTupleHeaderData *HeapTupleHeader;
 
 #define HeapTupleHeaderSetXmax(tup, xid) \
 ( \
-	TransactionIdStore((xid), &(tup)->t_choice.t_heap.t_xmax) \
+	(tup)->t_choice.t_heap.t_xmax = (xid) \
 )
 
 /*
@@ -270,7 +271,7 @@ do { \
 #define HeapTupleHeaderSetXvac(tup, xid) \
 do { \
 	Assert((tup)->t_infomask & HEAP_MOVED); \
-	TransactionIdStore((xid), &(tup)->t_choice.t_heap.t_field3.t_xvac); \
+	(tup)->t_choice.t_heap.t_field3.t_xvac = (xid); \
 } while (0)
 
 #define HeapTupleHeaderGetDatumLength(tup) \
@@ -313,6 +314,43 @@ do { \
 	*((Oid *) ((char *)(tup) + (tup)->t_hoff - sizeof(Oid))) = (oid); \
 } while (0)
 
+/*
+ * Note that we stop considering a tuple HOT-updated as soon as it is known
+ * aborted or the would-be updating transaction is known aborted.  For best
+ * efficiency, check tuple visibility before using this macro, so that the
+ * INVALID bits will be as up to date as possible.
+ */
+#define HeapTupleHeaderIsHotUpdated(tup) \
+( \
+	((tup)->t_infomask2 & HEAP_HOT_UPDATED) != 0 && \
+	((tup)->t_infomask & (HEAP_XMIN_INVALID | HEAP_XMAX_INVALID)) == 0 \
+)
+
+#define HeapTupleHeaderSetHotUpdated(tup) \
+( \
+	(tup)->t_infomask2 |= HEAP_HOT_UPDATED \
+)
+
+#define HeapTupleHeaderClearHotUpdated(tup) \
+( \
+	(tup)->t_infomask2 &= ~HEAP_HOT_UPDATED \
+)
+
+#define HeapTupleHeaderIsHeapOnly(tup) \
+( \
+  (tup)->t_infomask2 & HEAP_ONLY_TUPLE \
+)
+
+#define HeapTupleHeaderSetHeapOnly(tup) \
+( \
+  (tup)->t_infomask2 |= HEAP_ONLY_TUPLE \
+)
+
+#define HeapTupleHeaderClearHeapOnly(tup) \
+( \
+  (tup)->t_infomask2 &= ~HEAP_ONLY_TUPLE \
+)
+
 #define HeapTupleHeaderGetNatts(tup) \
 	((tup)->t_infomask2 & HEAP_NATTS_MASK)
 
@@ -321,6 +359,7 @@ do { \
 	(tup)->t_infomask2 = ((tup)->t_infomask2 & ~HEAP_NATTS_MASK) | (natts) \
 )
 
+
 /*
  * BITMAPLEN(NATTS) -
  *		Computes size of null bitmap given number of data columns.
@@ -345,6 +384,11 @@ do { \
  * fit on one heap page.  (Note that indexes could have more, because they
  * use a smaller tuple header.)  We arrive at the divisor because each tuple
  * must be maxaligned, and it must have an associated item pointer.
+ *
+ * Note: with HOT, there could theoretically be more line pointers (not actual
+ * tuples) than this on a heap page.  However we constrain the number of line
+ * pointers to this anyway, to avoid excessive line-pointer bloat and not
+ * require increases in the size of work arrays.
  */
 #define MaxHeapTuplesPerPage	\
 	((int) ((BLCKSZ - offsetof(PageHeaderData, pd_linp)) / \
@@ -359,6 +403,61 @@ do { \
  */
 #define MaxAttrSize		(10 * 1024 * 1024)
 
+/*
+ * MinimalTuple is an alternative representation that is used for transient
+ * tuples inside the executor, in places where transaction status information
+ * is not required, the tuple rowtype is known, and shaving off a few bytes
+ * is worthwhile because we need to store many tuples.	The representation
+ * is chosen so that tuple access routines can work with either full or
+ * minimal tuples via a HeapTupleData pointer structure.  The access routines
+ * see no difference, except that they must not access the transaction status
+ * or t_ctid fields because those aren't there.
+ *
+ * For the most part, MinimalTuples should be accessed via TupleTableSlot
+ * routines.  These routines will prevent access to the "system columns"
+ * and thereby prevent accidental use of the nonexistent fields.
+ *
+ * MinimalTupleData contains a length word, some padding, and fields matching
+ * HeapTupleHeaderData beginning with t_infomask2. The padding is chosen so
+ * that offsetof(t_infomask2) is the same modulo MAXIMUM_ALIGNOF in both
+ * structs.   This makes data alignment rules equivalent in both cases.
+ *
+ * When a minimal tuple is accessed via a HeapTupleData pointer, t_data is
+ * set to point MINIMAL_TUPLE_OFFSET bytes before the actual start of the
+ * minimal tuple --- that is, where a full tuple matching the minimal tuple's
+ * data would start.  This trick is what makes the structs seem equivalent.
+ *
+ * Note that t_hoff is computed the same as in a full tuple, hence it includes
+ * the MINIMAL_TUPLE_OFFSET distance.  t_len does not include that, however.
+ */
+#define MINIMAL_TUPLE_OFFSET \
+	((offsetof(HeapTupleHeaderData, t_infomask2) - sizeof(uint32)) / MAXIMUM_ALIGNOF * MAXIMUM_ALIGNOF)
+#define MINIMAL_TUPLE_PADDING \
+	((offsetof(HeapTupleHeaderData, t_infomask2) - sizeof(uint32)) % MAXIMUM_ALIGNOF)
+
+typedef struct MinimalTupleData
+{
+	uint32		t_len;			/* actual length of minimal tuple */
+
+	char		mt_padding[MINIMAL_TUPLE_PADDING];
+
+	/* Fields below here must match HeapTupleHeaderData! */
+
+	uint16		t_infomask2;	/* number of attributes + various flags */
+
+	uint16		t_infomask;		/* various flag bits, see below */
+
+	uint8		t_hoff;			/* sizeof header incl. bitmap, padding */
+
+	/* ^ - 23 bytes - ^ */
+
+	bits8		t_bits[1];		/* bitmap of NULLs -- VARIABLE LENGTH */
+
+	/* MORE DATA FOLLOWS AT END OF STRUCT */
+} MinimalTupleData;
+
+typedef MinimalTupleData *MinimalTuple;
+
 
 /*
  * HeapTupleData is an in-memory data structure that points to a tuple.
@@ -447,11 +546,23 @@ static inline uint32 heaptuple_get_size(HeapTuple htup)
 #define HeapTupleHasExternal(tuple) \
 		(((tuple)->t_data->t_infomask & HEAP_HASEXTERNAL) != 0)
 
-#define HeapTupleHasCompressed(tuple) \
-		(((tuple)->t_data->t_infomask & HEAP_HASCOMPRESSED) != 0)
+#define HeapTupleIsHotUpdated(tuple) \
+		HeapTupleHeaderIsHotUpdated((tuple)->t_data)
+
+#define HeapTupleSetHotUpdated(tuple) \
+		HeapTupleHeaderSetHotUpdated((tuple)->t_data)
 
-#define HeapTupleHasExtended(tuple) \
-		(((tuple)->t_data->t_infomask & HEAP_HASEXTENDED) != 0)
+#define HeapTupleClearHotUpdated(tuple) \
+		HeapTupleHeaderClearHotUpdated((tuple)->t_data)
+
+#define HeapTupleIsHeapOnly(tuple) \
+		HeapTupleHeaderIsHeapOnly((tuple)->t_data)
+
+#define HeapTupleSetHeapOnly(tuple) \
+		HeapTupleHeaderSetHeapOnly((tuple)->t_data)
+
+#define HeapTupleClearHeapOnly(tuple) \
+		HeapTupleHeaderClearHeapOnly((tuple)->t_data)
 
 #define HeapTupleGetOid(tuple) \
 		HeapTupleHeaderGetOid((tuple)->t_data)
@@ -466,27 +577,30 @@ static inline uint32 heaptuple_get_size(HeapTuple htup)
  * XLOG allows to store some information in high 4 bits of log
  * record xl_info field.  We use 3 for opcode and one for init bit.
  */
-#define XLOG_HEAP_INSERT	0x00
-#define XLOG_HEAP_DELETE	0x10
-#define XLOG_HEAP_UPDATE	0x20
-#define XLOG_HEAP_MOVE		0x30
-#define XLOG_HEAP_CLEAN		0x40
-#define XLOG_HEAP_NEWPAGE	0x50
-#define XLOG_HEAP_LOCK		0x60
-#define XLOG_HEAP_INPLACE	0x70
-#define XLOG_HEAP_OPMASK	0x70
+#define XLOG_HEAP_INSERT		0x00
+#define XLOG_HEAP_DELETE		0x10
+#define XLOG_HEAP_UPDATE		0x20
+#define XLOG_HEAP_MOVE			0x30
+#define XLOG_HEAP_HOT_UPDATE	0x40
+#define XLOG_HEAP_NEWPAGE		0x50
+#define XLOG_HEAP_LOCK			0x60
+#define XLOG_HEAP_INPLACE		0x70
+
+#define XLOG_HEAP_OPMASK		0x70
 /*
  * When we insert 1st item on new page in INSERT/UPDATE
  * we can (and we do) restore entire page in redo
  */
-#define XLOG_HEAP_INIT_PAGE 0x80
+#define XLOG_HEAP_INIT_PAGE		0x80
 /*
- * We ran out of opcodes, so heapam.c now has a second RmgrId.  These opcodes
+ * We ran out of opcodes, so heapam.c now has a second RmgrId.	These opcodes
  * are associated with RM_HEAP2_ID, but are not logically different from
  * the ones above associated with RM_HEAP_ID.  We apply XLOG_HEAP_OPMASK,
  * although currently XLOG_HEAP_INIT_PAGE is not used for any of these.
  */
-#define XLOG_HEAP2_FREEZE	0x00
+#define XLOG_HEAP2_FREEZE		0x00
+#define XLOG_HEAP2_CLEAN		0x10
+#define XLOG_HEAP2_CLEAN_MOVE	0x20
 
 /*
  * All what we need to find changed tuple
@@ -547,7 +661,7 @@ typedef struct xl_heap_insert
 
 #define SizeOfHeapInsert	(offsetof(xl_heap_insert, target) + SizeOfHeapTid)
 
-/* This is what we need to know about update|move */
+/* This is what we need to know about update|move|hot_update */
 typedef struct xl_heap_update
 {
 	xl_heaptid	target;			/* deleted tuple id */
@@ -558,15 +672,34 @@ typedef struct xl_heap_update
 
 #define SizeOfHeapUpdate	(offsetof(xl_heap_update, newtid) + SizeOfIptrData)
 
-/* This is what we need to know about vacuum page cleanup */
+/*
+ * This is what we need to know about vacuum page cleanup/redirect
+ *
+ * The array of OffsetNumbers following the fixed part of the record contains:
+ *	* for each redirected item: the item offset, then the offset redirected to
+ *	* for each now-dead item: the item offset
+ *	* for each now-unused item: the item offset
+ * The total number of OffsetNumbers is therefore 2*nredirected+ndead+nunused.
+ * Note that nunused is not explicitly stored, but may be found by reference
+ * to the total record length.
+ *
+ * If the opcode is CLEAN_MOVE instead of CLEAN, then each redirection pair
+ * should be interpreted as physically moving the "to" item pointer to the
+ * "from" slot, rather than placing a redirection item in the "from" slot.
+ * The moved pointers should be replaced by LP_UNUSED items (there will not
+ * be explicit entries in the "now-unused" list for this).	Also, the
+ * HEAP_ONLY bit in the moved tuples must be turned off.
+ */
 typedef struct xl_heap_clean
 {
 	xl_heapnode heapnode;
 	BlockNumber block;
-	/* UNUSED OFFSET NUMBERS FOLLOW AT THE END */
+	uint16		nredirected;
+	uint16		ndead;
+	/* OFFSET NUMBERS FOLLOW */
 } xl_heap_clean;
 
-#define SizeOfHeapClean (offsetof(xl_heap_clean, block) + sizeof(BlockNumber))
+#define SizeOfHeapClean (offsetof(xl_heap_clean, ndead) + sizeof(uint16))
 
 /* This is for replacing a page's contents in toto */
 /* NB: this is used for indexes as well as heaps */
@@ -614,7 +747,7 @@ typedef struct xl_heap_freeze
 extern CommandId HeapTupleHeaderGetCmin(HeapTupleHeader tup);
 extern CommandId HeapTupleHeaderGetCmax(HeapTupleHeader tup);
 extern void HeapTupleHeaderAdjustCmax(HeapTupleHeader tup,
-									  CommandId *cmax,
-									  bool *iscombo);
+						  CommandId *cmax,
+						  bool *iscombo);
 
 #endif   /* HTUP_H */
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 5d4052f7dc2f..e0172ce32277 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -4,7 +4,7 @@
  *	  POSTGRES index tuple definitions.
  *
  *
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * $PostgreSQL: pgsql/src/include/access/itup.h,v 1.52 2009/08/01 19:59:41 tgl Exp $
diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h
index f7d48801e1fa..1c45a706fb1e 100644
--- a/src/include/access/multixact.h
+++ b/src/include/access/multixact.h
@@ -52,6 +52,8 @@ extern void MultiXactIdSetOldestMember(void);
 extern int	GetMultiXactIdMembers(MultiXactId multi, TransactionId **xids);
 
 extern void AtEOXact_MultiXact(void);
+extern void AtPrepare_MultiXact(void);
+extern void PostPrepare_MultiXact(TransactionId xid);
 
 extern Size MultiXactShmemSize(void);
 extern void MultiXactShmemInit(void);
@@ -67,7 +69,14 @@ extern void MultiXactSetNextMXact(MultiXactId nextMulti,
 extern void MultiXactAdvanceNextMXact(MultiXactId minMulti,
 						  MultiXactOffset minMultiOffset);
 
-extern void multixact_redo(XLogRecPtr beginLoc __attribute__((unused)) , XLogRecPtr lsn __attribute__((unused)), XLogRecord *record);
+extern void multixact_redo(XLogRecPtr beginLoc __attribute__((unused)),
+						   XLogRecPtr lsn __attribute__((unused)), XLogRecord *record);
 extern void multixact_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
+extern void multixact_twophase_recover(TransactionId xid, uint16 info,
+						   void *recdata, uint32 len);
+extern void multixact_twophase_postcommit(TransactionId xid, uint16 info,
+							  void *recdata, uint32 len);
+extern void multixact_twophase_postabort(TransactionId xid, uint16 info,
+							 void *recdata, uint32 len);
 
 #endif   /* MULTIXACT_H */
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 4fad6f18493e..ecd159c73cfc 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.115 2007/11/16 19:53:50 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.116.2.1 2008/04/16 23:59:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,8 +40,8 @@ typedef uint16 BTCycleId;
  *	stored into both halves of the split page.	(If VACUUM is not running,
  *	both pages receive zero cycleids.)	This allows VACUUM to detect whether
  *	a page was split since it started, with a small probability of false match
- *	if the page was last split some exact multiple of 65536 VACUUMs ago.
- *	Also, during a split, the BTP_SPLIT_END flag is cleared in the left
+ *	if the page was last split some exact multiple of MAX_BT_CYCLE_ID VACUUMs
+ *	ago.  Also, during a split, the BTP_SPLIT_END flag is cleared in the left
  *	(original) page, and set in the right page, but only if the next page
  *	to its right has a different cycleid.
  *
@@ -73,6 +73,15 @@ typedef BTPageOpaqueData *BTPageOpaque;
 #define BTP_SPLIT_END	(1 << 5)	/* rightmost page of split group */
 #define BTP_HAS_GARBAGE (1 << 6)	/* page has LP_DELETEd tuples */
 
+/*
+ * The max allowed value of a cycle ID is a bit less than 64K.	This is
+ * for convenience of pg_filedump and similar utilities: we want to use
+ * the last 2 bytes of special space as an index type indicator, and
+ * restricting cycle ID lets btree use that space for vacuum cycle IDs
+ * while still allowing index type to be identified.
+ */
+#define MAX_BT_CYCLE_ID		0xFF7F
+
 
 /*
  * The Meta page is always the first page in the btree index.
@@ -296,7 +305,7 @@ typedef struct xl_btree_insert
  * Note: the four XLOG_BTREE_SPLIT xl_info codes all use this data record.
  * The _L and _R variants indicate whether the inserted tuple went into the
  * left or right split page (and thus, whether newitemoff and the new item
- * are stored or not).  The _ROOT variants indicate that we are splitting
+ * are stored or not).	The _ROOT variants indicate that we are splitting
  * the root page, and thus that a newroot record rather than an insert or
  * split record should follow.	Note that a split record never carries a
  * metapage update --- we'll do that in the parent-level update.
@@ -314,11 +323,11 @@ typedef struct xl_btree_split
 	int64		persistentSerialNum;
 
 	/*
-	 * If level > 0, BlockIdData downlink follows.  (We use BlockIdData
-	 * rather than BlockNumber for alignment reasons: SizeOfBtreeSplit
-	 * is only 16-bit aligned.)
+	 * If level > 0, BlockIdData downlink follows.	(We use BlockIdData rather
+	 * than BlockNumber for alignment reasons: SizeOfBtreeSplit is only 16-bit
+	 * aligned.)
 	 *
-	 * If level > 0, an IndexTuple representing the HIKEY of the left page
+	 * If level > 0, an IndexTuple representing the HIKEY of the left page 
 	 * follows.  We don't need this on leaf pages, because it's the same
 	 * as the leftmost key in the new right page.  Also, it's suppressed if
 	 * XLogInsert chooses to store the left page's whole page image.
@@ -391,7 +400,7 @@ typedef struct xl_btree_newroot
  *	The strategy numbers are chosen so that we can commute them by
  *	subtraction, thus:
  */
-#define BTCommuteStrategyNumber(strat)  (BTMaxStrategyNumber + 1 - (strat))
+#define BTCommuteStrategyNumber(strat)	(BTMaxStrategyNumber + 1 - (strat))
 
 /*
  *	When a new operator class is declared, we require that the user
@@ -520,7 +529,7 @@ typedef BTScanOpaqueData *BTScanOpaque;
 
 /*
  * We use some private sk_flags bits in preprocessed scan keys.  We're allowed
- * to use bits 16-31 (see skey.h).  The uppermost bits are copied from the
+ * to use bits 16-31 (see skey.h).	The uppermost bits are copied from the
  * index's indoption[] array entry for the index attribute.
  */
 #define SK_BT_REQFWD	0x00010000		/* required to continue forward scan */
@@ -558,9 +567,6 @@ extern void _bt_insert_parent(Relation rel, Buffer buf, Buffer rbuf,
  * prototypes for functions in nbtpage.c
  */
 extern void _bt_initmetapage(Page page, BlockNumber rootbknum, uint32 level);
-extern void _bt_lognewpage(Relation index,
-						   Page newPage,
-						   BlockNumber blockNo);
 extern Buffer _bt_getroot(Relation rel, int access);
 extern Buffer _bt_gettrueroot(Relation rel);
 extern void _bt_checkpage(Relation rel, Buffer buf);
@@ -572,8 +578,8 @@ extern void _bt_pageinit(Page page, Size size);
 extern bool _bt_page_recyclable(Page page);
 extern void _bt_delitems(Relation rel, Buffer buf,
 			 OffsetNumber *itemnos, int nitems, bool inVacuum);
-extern int	_bt_pagedel(Relation rel, Buffer buf,
-						BTStack stack, bool vacuum_full);
+extern int _bt_pagedel(Relation rel, Buffer buf,
+			BTStack stack, bool vacuum_full);
 
 /*
  * prototypes for functions in nbtsearch.c
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index c412accd090e..4f2fcbf41d32 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/printtup.h,v 1.35 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/printtup.h,v 1.36 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h
index 3f7473fcd579..91ac89ba9642 100644
--- a/src/include/access/reloptions.h
+++ b/src/include/access/reloptions.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.3 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.5 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 251a849d0135..73f5459e1f14 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.52 2007/01/20 18:43:35 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.60 2008/01/14 01:39:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,8 +29,16 @@ typedef struct HeapScanDescData
 	Snapshot	rs_snapshot;	/* snapshot to see */
 	int			rs_nkeys;		/* number of scan keys */
 	ScanKey		rs_key;			/* array of scan key descriptors */
-	BlockNumber rs_nblocks;		/* number of blocks to scan */
+	bool		rs_bitmapscan;	/* true if this is really a bitmap scan */
 	bool		rs_pageatatime; /* verify visibility page-at-a-time? */
+	bool		rs_allow_strat; /* allow or disallow use of access strategy */
+	bool		rs_allow_sync;	/* allow or disallow use of syncscan */
+
+	/* state set up at initscan time */
+	BlockNumber rs_nblocks;		/* number of blocks to scan */
+	BlockNumber rs_startblock;	/* block # to start at */
+	BufferAccessStrategy rs_strategy;	/* access strategy for reads */
+	bool		rs_syncscan;	/* report location to syncscan logic? */
 
 	/* scan current state */
 	bool		rs_inited;		/* false = scan not init'd yet */
@@ -84,6 +92,9 @@ typedef struct IndexScanDescData
 	HeapTupleData xs_ctup;		/* current heap tuple, if any */
 	Buffer		xs_cbuf;		/* current heap buffer in scan, if any */
 	/* NB: if xs_cbuf is not InvalidBuffer, we hold a pin on that buffer */
+	TransactionId xs_prev_xmax; /* previous HOT chain member's XMAX, if any */
+	OffsetNumber xs_next_hot;	/* next member of HOT chain, if any */
+	bool		xs_hot_dead;	/* T if all members of HOT chain are dead */
 } IndexScanDescData;
 
 typedef IndexScanDescData *IndexScanDesc;
diff --git a/src/include/access/rewriteheap.h b/src/include/access/rewriteheap.h
new file mode 100644
index 000000000000..77441bfbb715
--- /dev/null
+++ b/src/include/access/rewriteheap.h
@@ -0,0 +1,30 @@
+/*-------------------------------------------------------------------------
+ *
+ * rewriteheap.h
+ *	  Declarations for heap rewrite support functions
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994-5, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/access/rewriteheap.h,v 1.4 2008/01/01 19:45:56 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef REWRITE_HEAP_H
+#define REWRITE_HEAP_H
+
+#include "access/htup.h"
+#include "utils/rel.h"
+
+/* struct definition is private to rewriteheap.c */
+typedef struct RewriteStateData *RewriteState;
+
+extern RewriteState begin_heap_rewrite(Relation NewHeap,
+				   TransactionId OldestXmin, TransactionId FreezeXid,
+				   bool use_wal);
+extern void end_heap_rewrite(RewriteState state);
+extern void rewrite_heap_tuple(RewriteState state, HeapTuple oldTuple,
+				   HeapTuple newTuple);
+extern void rewrite_heap_dead_tuple(RewriteState state, HeapTuple oldTuple);
+
+#endif   /* REWRITE_HEAP_H */
diff --git a/src/include/access/slru.h b/src/include/access/slru.h
index eecf97275a5c..faab736c9443 100644
--- a/src/include/access/slru.h
+++ b/src/include/access/slru.h
@@ -6,13 +6,14 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/slru.h,v 1.20 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/slru.h,v 1.23 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SLRU_H
 #define SLRU_H
 
+#include "access/xlogdefs.h"
 #include "storage/lwlock.h"
 
 #define CLOG_DIR				"pg_clog"
@@ -57,6 +58,17 @@ typedef struct SlruSharedData
 	int		   *page_lru_count;
 	LWLockId   *buffer_locks;
 
+	/*
+	 * Optional array of WAL flush LSNs associated with entries in the SLRU
+	 * pages.  If not zero/NULL, we must flush WAL before writing pages (true
+	 * for pg_clog, false for multixact and pg_subtrans).  group_lsn[] has
+	 * lsn_groups_per_page entries per buffer slot, each containing the
+	 * highest LSN known for a contiguous group of SLRU entries on that slot's
+	 * page.
+	 */
+	XLogRecPtr *group_lsn;
+	int			lsn_groups_per_page;
+
 	/*----------
 	 * We mark a page "most recently used" by setting
 	 *		page_lru_count[slotno] = ++cur_lru_count;
@@ -87,8 +99,8 @@ typedef struct SlruCtlData
 	SlruShared	shared;
 
 	/*
-	 * This flag tells whether to fsync writes (true for pg_clog, false for
-	 * pg_subtrans).
+	 * This flag tells whether to fsync writes (true for pg_clog and multixact
+	 * stuff, false for pg_subtrans).
 	 */
 	bool		do_fsync;
 
@@ -112,11 +124,12 @@ typedef SlruCtlData *SlruCtl;
 typedef struct SlruFlushData *SlruFlush;
 
 
-extern Size SimpleLruShmemSize(int nslots);
-extern void SimpleLruInit(SlruCtl ctl, const char *name, int nslots,
+extern Size SimpleLruShmemSize(int nslots, int nlsns);
+extern void SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
 			  LWLockId ctllock, const char *subdir);
 extern int	SimpleLruZeroPage(SlruCtl ctl, int pageno);
-extern int	SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid);
+extern int SimpleLruReadPage(SlruCtl ctl, int pageno, bool write_ok,
+				  TransactionId xid);
 extern int SimpleLruReadPage_ReadOnly(SlruCtl ctl, int pageno,
 				      TransactionId xid, bool *valid);
 extern void SimpleLruWritePage(SlruCtl ctl, int slotno, SlruFlush fdata);
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index eafe76b14f13..d4966388bd4c 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/transam.h,v 1.60 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/transam.h,v 1.64 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #define TRANSAM_H
 
 #include "catalog/pg_magic_oid.h"
+#include "access/xlogdefs.h"
+
 
 /* ----------------
  *		Special transaction ID values
@@ -42,6 +44,7 @@
 #define TransactionIdEquals(id1, id2)	((id1) == (id2))
 #define TransactionIdStore(xid, dest)	(*(dest) = (xid))
 #define StoreInvalidTransactionId(dest) (*(dest) = InvalidTransactionId)
+
 /* advance a transaction ID variable, handling wraparound correctly */
 #define TransactionIdAdvance(dest)	\
 	do { \
@@ -50,9 +53,17 @@
 			(dest) = FirstNormalTransactionId; \
 	} while(0)
 
+/* back up a transaction ID variable, handling wraparound correctly */
+#define TransactionIdRetreat(dest)	\
+	do { \
+		(dest)--; \
+	} while ((dest) < FirstNormalTransactionId)
+
 /*
- * VariableCache is placed in shmem and used by
- * backends to get next available OID & XID.
+ * VariableCache is a data structure in shared memory that is used to track
+ * OID and XID assignment state.  For largely historical reasons, there is
+ * just one struct with different fields that are protected by different
+ * LWLocks.
  *
  * Note: xidWrapLimit and limit_datname are not "active" values, but are
  * used just to generate useful messages when xidWarnLimit or xidStopLimit
@@ -60,8 +71,15 @@
  */
 typedef struct VariableCacheData
 {
+	/*
+	 * These fields are protected by OidGenLock.
+	 */
 	Oid			nextOid;		/* next OID to assign */
 	uint32		oidCount;		/* OIDs available before must do XLOG work */
+
+	/*
+	 * These fields are protected by XidGenLock.
+	 */
 	TransactionId nextXid;		/* next XID to assign */
 
 	TransactionId oldestXid;	/* cluster-wide minimum datfrozenxid */
@@ -70,6 +88,12 @@ typedef struct VariableCacheData
 	TransactionId xidStopLimit; /* refuse to advance nextXid beyond here */
 	TransactionId xidWrapLimit; /* where the world ends */
 	NameData	limit_datname;	/* database that needs vacuumed first */
+
+	/*
+	 * These fields are protected by ProcArrayLock.
+	 */
+	TransactionId latestCompletedXid;	/* newest XID that has committed or
+										 * aborted */
 } VariableCacheData;
 
 typedef VariableCacheData *VariableCache;
@@ -93,14 +117,19 @@ extern int xid_warn_limit;
 extern bool TransactionIdDidCommit(TransactionId transactionId);
 extern bool TransactionIdDidAbort(TransactionId transactionId);
 extern void TransactionIdCommit(TransactionId transactionId);
+extern void TransactionIdAsyncCommit(TransactionId transactionId, XLogRecPtr lsn);
 extern void TransactionIdAbort(TransactionId transactionId);
 extern void TransactionIdSubCommit(TransactionId transactionId);
 extern void TransactionIdCommitTree(int nxids, TransactionId *xids);
+extern void TransactionIdAsyncCommitTree(int nxids, TransactionId *xids, XLogRecPtr lsn);
 extern void TransactionIdAbortTree(int nxids, TransactionId *xids);
 extern bool TransactionIdPrecedes(TransactionId id1, TransactionId id2);
 extern bool TransactionIdPrecedesOrEquals(TransactionId id1, TransactionId id2);
 extern bool TransactionIdFollows(TransactionId id1, TransactionId id2);
 extern bool TransactionIdFollowsOrEquals(TransactionId id1, TransactionId id2);
+extern TransactionId TransactionIdLatest(TransactionId mainxid,
+					int nxids, const TransactionId *xids);
+extern XLogRecPtr TransactionIdGetCommitLSN(TransactionId xid);
 
 /* in transam/varsup.c */
 extern TransactionId GetNewTransactionId(bool isSubXact, bool setProcXid);
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index da55780b7512..3c14746e2e25 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/tupdesc.h,v 1.52 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/tupdesc.h,v 1.53 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 8c75bbb7719a..c3a75d770ed5 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/tupmacs.h,v 1.31 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/tupmacs.h,v 1.35 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -67,22 +67,6 @@
 	PointerGetDatum((char *) (T)) \
 )
 
-/*
- * att_align aligns the given offset as needed for a datum of alignment
- * requirement attalign.  The cases are tested in what is hopefully something
- * like their frequency of occurrence.
- */
-#define att_align(cur_offset, attalign) \
-( \
-	((attalign) == 'i') ? INTALIGN(cur_offset) : \
-	 (((attalign) == 'c') ? ((intptr_t)(cur_offset)) : \
-	  (((attalign) == 'd') ? DOUBLEALIGN(cur_offset) : \
-		( \
-			AssertMacro((attalign) == 's'), \
-			SHORTALIGN(cur_offset) \
-		))) \
-)
-
 /*
  * att_align_datum aligns the given offset as needed for a datum of alignment
  * requirement attalign and typlen attlen.	attdatum is the Datum variable
@@ -93,7 +77,7 @@
  */
 #define att_align_datum(cur_offset, attalign, attlen, attdatum) \
 ( \
-	((attlen) == -1 && VARATT_IS_SHORT(DatumGetPointer(attdatum))) ? (intptr_t) (cur_offset) : \
+	((attlen) == -1 && VARATT_IS_SHORT(DatumGetPointer(attdatum))) ? (long) (cur_offset) : \
 	att_align_nominal(cur_offset, attalign) \
 )
 
@@ -113,11 +97,10 @@
  */
 #define att_align_pointer(cur_offset, attalign, attlen, attptr) \
 ( \
-	((attlen) == -1 && VARATT_NOT_PAD_BYTE(attptr)) ? (intptr_t) (cur_offset) : \
+	((attlen) == -1 && VARATT_NOT_PAD_BYTE(attptr)) ? (long) (cur_offset) : \
 	att_align_nominal(cur_offset, attalign) \
 )
 
-
 /*
  * att_align_nominal aligns the given offset as needed for a datum of alignment
  * requirement attalign, ignoring any consideration of packed varlena datums.
@@ -136,7 +119,7 @@
 #define att_align_nominal(cur_offset, attalign) \
 ( \
 	((attalign) == 'i') ? INTALIGN(cur_offset) : \
-	 (((attalign) == 'c') ? (intptr_t) (cur_offset) : \
+	 (((attalign) == 'c') ? ((intptr_t)(cur_offset)) : \
 	  (((attalign) == 'd') ? DOUBLEALIGN(cur_offset) : \
 	   ( \
 			AssertMacro((attalign) == 's'), \
@@ -178,23 +161,6 @@
 	)) \
 )
 
-#define att_addlength(cur_offset, attlen, attval) \
-( \
-	((attlen) > 0) ? \
-	( \
-		(cur_offset) + (attlen) \
-	) \
-	: (((attlen) == -1) ? \
-	( \
-		(cur_offset) + VARSIZE_ANY(DatumGetPointer(attval)) \
-	) \
-	: \
-	( \
-		AssertMacro((attlen) == -2), \
-		(cur_offset) + (strlen(DatumGetCString(attval)) + 1) \
-	)) \
-)
-
 /*
  * store_att_byval is a partial inverse of fetch_att: store a given Datum
  * value into a tuple data area at the specified address.  However, it only
@@ -228,7 +194,7 @@
 /* Proper align with zero padding */
 static inline char * att_align_zero(char *data, char alignchar)
 {
-    size_t  misalignment = (size_t)att_align(1, alignchar) - 1;
+    size_t  misalignment = (size_t)att_align_nominal(1, alignchar) - 1;
 
     while ((size_t)data & misalignment)
 		*(data++) = 0;
@@ -236,19 +202,18 @@ static inline char * att_align_zero(char *data, char alignchar)
 	return data;
 }
 
-#ifndef VARATT_COULD_SHORT
-#define VARATT_COULD_SHORT(PTR) (VARATT_IS_4B_U(PTR) && (VARSIZE(PTR)-VARHDRSZ+VARHDRSZ_SHORT <= VARATT_SHORT_MAX))
-#define VARATT_COULD_SHORT_D(D) VARATT_COULD_SHORT(DatumGetPointer(D))
-#endif
-
-/* Determin if a datum of type oid can be stored in short varlena format */
-static inline bool value_type_could_short(Datum d, Oid typid)
+/*
+ * Determine if a datum of type oid can be stored in short varlena format.
+ * The caller must've checked that it's a pass-by-reference type.
+ */
+static inline bool
+value_type_could_short(Pointer ptr, Oid typid)
 {
-        return	!VARATT_IS_EXTERNAL_D(d) &&
-                (VARATT_IS_SHORT_D(d) || 
-                 (VARATT_COULD_SHORT_D(d) &&
-                  typid != INT2VECTOROID &&
-                  typid != OIDVECTOROID &&
-                  typid < FirstNormalObjectId));
+	return !VARATT_IS_EXTERNAL(ptr) &&
+		(VARATT_IS_SHORT(ptr) ||
+		 (VARATT_CAN_MAKE_SHORT(ptr) &&
+		  typid != INT2VECTOROID &&
+		  typid != OIDVECTOROID &&
+		  typid < FirstNormalObjectId));
 }
 #endif
diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h
index a0b2396833b1..9b735fd8f30e 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.33 2007/03/29 00:15:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.38 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 #include "access/htup.h"
 #include "access/memtup.h"
 #include "storage/bufpage.h"
-#include "utils/relcache.h"
 
 #ifndef VARSIZE_TO_SHORT
 #define VARSIZE_TO_SHORT(PTR)   ((char)(VARSIZE(PTR)-VARHDRSZ+VARHDRSZ_SHORT) | 0x80)
@@ -36,19 +35,27 @@
  * TOAST_TUPLE_TARGET bytes.  Both numbers include all tuple header overhead
  * and between-fields alignment padding, but we do *not* consider any
  * end-of-tuple alignment padding; hence the values can be compared directly
- * to a tuple's t_len field.  We choose TOAST_TUPLE_THRESHOLD with the
- * knowledge that toast-table tuples will be exactly that size, and we'd
- * like to fit four of them per page with minimal space wastage.
+ * to a tuple's t_len field.
  *
- * The numbers need not be the same, though they currently are.
+ * The numbers need not be the same, though they currently are.  It doesn't
+ * make sense for TARGET to exceed THRESHOLD, but it could be useful to make
+ * it be smaller.
  *
- * Note: sizeof(PageHeaderData) includes the first ItemId, but we have
- * to allow for 3 more, if we want to fit 4 tuples on a page.
+ * Currently we choose both values to match the largest tuple size for which
+ * TOAST_TUPLES_PER_PAGE tuples can fit on a disk page.
+ *
+ * XXX while these can be modified without initdb, some thought needs to be
+ * given to needs_toast_table() in toasting.c before unleashing random
+ * changes.  Also see LOBLKSIZE in large_object.h, which can *not* be
+ * changed without initdb.
  */
+#define TOAST_TUPLES_PER_PAGE	4
+
+/* Note: sizeof(PageHeaderData) includes the first ItemId on the page */
 #define TOAST_TUPLE_THRESHOLD	\
 	MAXALIGN_DOWN((BLCKSZ - \
-				   MAXALIGN(sizeof(PageHeaderData) + 3 * sizeof(ItemIdData))) \
-				  / 4)
+				   MAXALIGN(sizeof(PageHeaderData) + (TOAST_TUPLES_PER_PAGE-1) * sizeof(ItemIdData))) \
+				  / TOAST_TUPLES_PER_PAGE)
 
 #define TOAST_TUPLE_TARGET		TOAST_TUPLE_THRESHOLD
 
@@ -63,20 +70,26 @@
  * When we store an oversize datum externally, we divide it into chunks
  * containing at most TOAST_MAX_CHUNK_SIZE data bytes.	This number *must*
  * be small enough that the completed toast-table tuple (including the
- * ID and sequence fields and all overhead) is no more than MaxHeapTupleSize
- * bytes.  It *should* be small enough to make toast-table tuples no more
- * than TOAST_TUPLE_THRESHOLD bytes, else heapam.c will uselessly invoke
- * the toaster on toast-table tuples.  The current coding ensures that the
- * maximum tuple length is exactly TOAST_TUPLE_THRESHOLD bytes.
+ * ID and sequence fields and all overhead) will fit on a page.
+ * The coding here sets the size on the theory that we want to fit
+ * EXTERN_TUPLES_PER_PAGE tuples of maximum size onto a page.
  *
- * NB: you cannot change this value without forcing initdb, at least not
- * if your DB contains any multi-chunk toasted values.
+ * NB: Changing TOAST_MAX_CHUNK_SIZE requires an initdb.
  */
-#define TOAST_MAX_CHUNK_SIZE	(TOAST_TUPLE_THRESHOLD -			\
-				MAXALIGN(offsetof(HeapTupleHeaderData, t_bits)) -	\
-				sizeof(Oid) -										\
-				sizeof(int32) -										\
-				VARHDRSZ)
+#define EXTERN_TUPLES_PER_PAGE	4		/* tweak only this */
+
+/* Note: sizeof(PageHeaderData) includes the first ItemId on the page */
+#define EXTERN_TUPLE_MAX_SIZE	\
+	MAXALIGN_DOWN((BLCKSZ - \
+				   MAXALIGN(sizeof(PageHeaderData) + (EXTERN_TUPLES_PER_PAGE-1) * sizeof(ItemIdData))) \
+				  / EXTERN_TUPLES_PER_PAGE)
+
+#define TOAST_MAX_CHUNK_SIZE	\
+	(EXTERN_TUPLE_MAX_SIZE -							\
+	 MAXALIGN(offsetof(HeapTupleHeaderData, t_bits)) -	\
+	 sizeof(Oid) -										\
+	 sizeof(int32) -									\
+	 VARHDRSZ)
 
 
 /* ----------
@@ -150,6 +163,15 @@ extern struct varlena *heap_tuple_untoast_attr_slice(struct varlena *attr,
 							  int32 sliceoffset,
 							  int32 slicelength);
 
+/* ----------
+ * toast_flatten_tuple -
+ *
+ *	"Flatten" a tuple to contain no out-of-line toasted fields.
+ *	(This does not eliminate compressed or short-header datums.)
+ * ----------
+ */
+extern HeapTuple toast_flatten_tuple(HeapTuple tup, TupleDesc tupleDesc);
+
 /* ----------
  * toast_flatten_tuple_attribute -
  *
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
index 964faabf3612..bdd8ddc2a7e5 100644
--- a/src/include/access/twophase.h
+++ b/src/include/access/twophase.h
@@ -16,6 +16,7 @@
 
 #include "access/xlogdefs.h"
 #include "access/xlogmm.h"
+#include "storage/backendid.h"
 #include "storage/proc.h"
 #include "utils/timestamp.h"
 
@@ -67,6 +68,7 @@ extern void AtAbort_Twophase(void);
 extern void PostPrepare_Twophase(void);
 
 extern PGPROC *TwoPhaseGetDummyProc(TransactionId xid);
+extern BackendId TwoPhaseGetDummyBackendId(TransactionId xid);
 
 extern GlobalTransaction MarkAsPreparing(TransactionId xid, 
 				LocalDistribXactRef *distribToLocalXactRef,
diff --git a/src/include/access/twophase_rmgr.h b/src/include/access/twophase_rmgr.h
index dc018005ae7c..88f54aff7faa 100644
--- a/src/include/access/twophase_rmgr.h
+++ b/src/include/access/twophase_rmgr.h
@@ -27,7 +27,8 @@ typedef uint8 TwoPhaseRmgrId;
 #define TWOPHASE_RM_FLATFILES_ID	3
 #define TWOPHASE_RM_NOTIFY_ID		4
 #define TWOPHASE_RM_PGSTAT_ID		5
-#define TWOPHASE_RM_MAX_ID			TWOPHASE_RM_PGSTAT_ID
+#define TWOPHASE_RM_MULTIXACT_ID	6
+#define TWOPHASE_RM_MAX_ID			TWOPHASE_RM_MULTIXACT_ID
 
 extern const TwoPhaseCallback twophase_recover_callbacks[];
 extern const TwoPhaseCallback twophase_postcommit_callbacks[];
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 09c30d5a6e33..98a8432a9684 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xact.h,v 1.84 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/xact.h,v 1.93.2.1 2008/03/04 19:54:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,6 +43,12 @@ extern int	XactIsoLevel;
 extern bool DefaultXactReadOnly;
 extern bool XactReadOnly;
 
+/* Asynchronous commits */
+extern bool XactSyncCommit;
+
+/* Kluge for 2PC support */
+extern bool MyXactAccessedTempRel;
+
 /*
  *	start- and end-of-transaction callbacks for dynamically loaded modules
  */
@@ -85,6 +91,7 @@ typedef void (*SubXactCallback) (SubXactEvent event, SubTransactionId mySubid,
 
 typedef struct xl_xact_commit
 {
+	TimestampTz xact_time;		/* time of commit */
 	time_t		xtime;
 
 	int16		persistentCommitObjectCount;	
@@ -102,6 +109,7 @@ typedef struct xl_xact_commit
 
 typedef struct xl_xact_abort
 {
+	TimestampTz xact_time;		/* time of abort */
 	time_t		xtime;
 
 	int16		persistentAbortObjectCount;	
@@ -194,10 +202,11 @@ extern void GetAllTransactionXids(
 	TransactionId				*localXid,
 	TransactionId				*subXid);
 extern TransactionId GetTopTransactionId(void);
+extern TransactionId GetTopTransactionIdIfAny(void);
 extern TransactionId GetCurrentTransactionId(void);
 extern TransactionId GetCurrentTransactionIdIfAny(void);
 extern SubTransactionId GetCurrentSubTransactionId(void);
-extern CommandId GetCurrentCommandId(void);
+extern CommandId GetCurrentCommandId(bool used);
 extern TimestampTz GetCurrentTransactionStartTimestamp(void);
 extern TimestampTz GetCurrentStatementStartTimestamp(void);
 extern TimestampTz GetCurrentTransactionStopTimestamp(void);
@@ -206,6 +215,7 @@ extern void SetCurrentStatementStartTimestampToMaster(TimestampTz masterTime);
 extern int	GetCurrentTransactionNestLevel(void);
 extern bool TransactionIdIsCurrentTransactionId(TransactionId xid);
 extern void CommandCounterIncrement(void);
+extern void ForceSyncCommit(void);
 extern void StartTransactionCommand(void);
 extern void CommitTransactionCommand(void);
 extern void AbortCurrentTransaction(void);
@@ -224,15 +234,14 @@ extern void TransactionInformationQEWriter(DistributedTransactionId *QEDistribut
 extern bool IsSubTransaction(void);
 extern bool IsTransactionBlock(void);
 extern bool IsTransactionOrTransactionBlock(void);
-extern bool IsTransactionDirty(void);
 extern void ExecutorMarkTransactionUsesSequences(void);
 extern void ExecutorMarkTransactionDoesWrites(void);
 extern bool ExecutorSaysTransactionDoesWrites(void);
 extern char TransactionBlockStatusCode(void);
 extern void AbortOutOfAnyTransaction(void);
-extern void PreventTransactionChain(void *stmtNode, const char *stmtType);
-extern void RequireTransactionChain(void *stmtNode, const char *stmtType);
-extern bool IsInTransactionChain(void *stmtNode);
+extern void PreventTransactionChain(bool isTopLevel, const char *stmtType);
+extern void RequireTransactionChain(bool isTopLevel, const char *stmtType);
+extern bool IsInTransactionChain(bool isTopLevel);
 extern void RegisterXactCallback(XactCallback callback, void *arg);
 extern void UnregisterXactCallback(XactCallback callback, void *arg);
 extern void RegisterXactCallbackOnce(XactCallback callback, void *arg);
@@ -240,7 +249,7 @@ extern void UnregisterXactCallbackOnce(XactCallback callback, void *arg);
 extern void RegisterSubXactCallback(SubXactCallback callback, void *arg);
 extern void UnregisterSubXactCallback(SubXactCallback callback, void *arg);
 
-extern void RecordTransactionCommit(void);
+extern TransactionId RecordTransactionCommit(void);
 extern void RecordDistributedForgetCommitted(struct TMGXACT_LOG *gxact_log);
 extern bool RecordCrashTransactionAbortRecord(
 	TransactionId				xid,
@@ -270,6 +279,4 @@ void ShowSubtransactionsForSharedSnapshot(void);
 void GetSubXidsInXidBuffer(void);
 void UpdateSubtransactionsInSharedSnapshot(DistributedTransactionId dxid);
 
-extern void ClearTransactionFromPgProc_UnderLock(void);
-
 #endif   /* XACT_H */
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 1532de3a7a4a..ef11116c16be 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.77 2007/05/20 21:08:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.87 2008/01/01 19:45:56 momjian Exp $
  */
 #ifndef XLOG_H
 #define XLOG_H
@@ -20,6 +20,7 @@
 #include "utils/pg_crc.h"
 #include "utils/relcache.h"
 #include "utils/segadmin.h"
+#include "utils/timestamp.h"
 #include "cdb/cdbpublic.h"
 
 /*
@@ -107,12 +108,6 @@ typedef struct XLogRecord
  */
 #define XLR_BKP_REMOVABLE		0x01
 
-/*
- * Sometimes we log records which are out of transaction control.
- * Rmgr may "or" XLOG_NO_TRAN into info passed to XLogInsert to indicate this.
- */
-#define XLOG_NO_TRAN			XLR_INFO_MASK
-
 /* Sync methods */
 #define SYNC_METHOD_FSYNC		0
 #define SYNC_METHOD_FDATASYNC	1
@@ -161,23 +156,22 @@ typedef struct XLogRecData
 
 extern TimeLineID ThisTimeLineID;		/* current TLI */
 extern bool InRecovery;
-
-extern XLogRecPtr MyLastRecPtr;
-extern bool MyXactMadeXLogEntry;
-extern bool MyXactMadeTempRelUpdate;
-extern XLogRecPtr ProcLastRecEnd;
+extern XLogRecPtr XactLastRecEnd;
 
 /* these variables are GUC parameters related to XLOG */
 extern int	CheckPointSegments;
 extern int	XLOGbuffers;
+extern bool XLogArchiveMode;
 extern char *XLogArchiveCommand;
 extern int	XLogArchiveTimeout;
 extern char *XLOG_sync_method;
 extern const char XLOG_sync_method_default[];
 extern bool gp_keep_all_xlog;
 extern int keep_wal_segments;
+extern bool log_checkpoints;
 
-#define XLogArchivingActive()	(XLogArchiveCommand[0] != '\0')
+#define XLogArchivingActive()	(XLogArchiveMode)
+#define XLogArchiveCommandSet() (XLogArchiveCommand[0] != '\0')
 
 /* 
  * Whether we need to always generate transaction log (XLOG), or if we can
@@ -200,6 +194,41 @@ extern bool am_startup;
 extern bool XLOG_DEBUG;
 #endif
 
+/*
+ * OR-able request flag bits for checkpoints.  The "cause" bits are used only
+ * for logging purposes.  Note: the flags must be defined so that it's
+ * sensible to OR together request flags arising from different requestors.
+ */
+
+/* These directly affect the behavior of CreateCheckPoint and subsidiaries */
+#define CHECKPOINT_IS_SHUTDOWN	0x0001	/* Checkpoint is for shutdown */
+#define CHECKPOINT_IMMEDIATE	0x0002	/* Do it without delays */
+#define CHECKPOINT_FORCE		0x0004	/* Force even if no activity */
+/* These are important to RequestCheckpoint */
+#define CHECKPOINT_WAIT			0x0008	/* Wait for completion */
+/* These indicate the cause of a checkpoint request */
+#define CHECKPOINT_CAUSE_XLOG	0x0010	/* XLOG consumption */
+#define CHECKPOINT_CAUSE_TIME	0x0020	/* Elapsed time */
+
+/* Checkpoint statistics */
+typedef struct CheckpointStatsData
+{
+	TimestampTz ckpt_start_t;	/* start of checkpoint */
+	TimestampTz ckpt_write_t;	/* start of flushing buffers */
+	TimestampTz ckpt_sync_t;	/* start of fsyncs */
+	TimestampTz ckpt_sync_end_t;	/* end of fsyncs */
+	TimestampTz ckpt_end_t;		/* end of checkpoint */
+
+	int			ckpt_bufs_written;		/* # of buffers written */
+
+	int			ckpt_segs_added;	/* # of new xlog segments created */
+	int			ckpt_segs_removed;		/* # of xlog segments deleted */
+	int			ckpt_segs_recycled;		/* # of xlog segments recycled */
+} CheckpointStatsData;
+
+extern CheckpointStatsData CheckpointStats;
+
+
 extern XLogRecPtr XLogInsert(RmgrId rmid, uint8 info, XLogRecData *rdata);
 extern XLogRecPtr XLogInsert_OverrideXid(RmgrId rmid, uint8 info, XLogRecData *rdata, TransactionId overrideXid);
 extern XLogRecPtr XLogLastInsertBeginLoc(void);
@@ -217,6 +246,11 @@ extern void xlog_redo(XLogRecPtr beginLoc __attribute__((unused)), XLogRecPtr ls
 extern void xlog_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
 
 extern void issue_xlog_fsync(int fd, uint32 log, uint32 seg);
+extern void XLogBackgroundFlush(void);
+extern void XLogAsyncCommitFlush(void);
+extern bool XLogNeedsFlush(XLogRecPtr RecPtr);
+
+extern void XLogSetAsyncCommitLSN(XLogRecPtr record);
 
 extern bool RecoveryInProgress(void);
 extern XLogRecPtr GetInsertRecPtr(void);
@@ -237,9 +271,10 @@ extern void StartupXLOG_Pass3(void);
 extern void StartupXLOG_Pass4(void);
 extern void ShutdownXLOG(int code, Datum arg);
 extern void InitXLOGAccess(void);
-extern void CreateCheckPoint(bool shutdown, bool force);
+extern void CreateCheckPoint(int flags);
 extern void XLogPutNextOid(Oid nextOid);
 extern XLogRecPtr GetRedoRecPtr(void);
+extern XLogRecPtr GetInsertRecPtr(void);
 extern void GetNextXidAndEpoch(TransactionId *xid, uint32 *epoch);
 
 extern void XLogGetRecoveryStart(char *callerStr, char *reasonStr, XLogRecPtr *redoCheckPointLoc, CheckPoint *redoCheckPoint);
diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h
index 4d30e616a76e..7914c77111d6 100644
--- a/src/include/access/xlog_internal.h
+++ b/src/include/access/xlog_internal.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xlog_internal.h,v 1.21 2007/05/20 21:08:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/xlog_internal.h,v 1.22 2008/01/01 19:45:56 momjian Exp $
  */
 #ifndef XLOG_INTERNAL_H
 #define XLOG_INTERNAL_H
diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h
index b58e56aaf73b..0c46e79d8f46 100644
--- a/src/include/access/xlogdefs.h
+++ b/src/include/access/xlogdefs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xlogdefs.h,v 1.17 2007/02/14 05:00:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/xlogdefs.h,v 1.19 2008/01/01 19:45:56 momjian Exp $
  */
 #ifndef XLOG_DEFS_H
 #define XLOG_DEFS_H
@@ -126,7 +126,11 @@ typedef uint32 TimeLineID;
 #endif
 #endif
 
-#if defined(OPEN_DATASYNC_FLAG)
+#if defined(PLATFORM_DEFAULT_SYNC_METHOD)
+#define DEFAULT_SYNC_METHOD_STR	PLATFORM_DEFAULT_SYNC_METHOD_STR
+#define DEFAULT_SYNC_METHOD		PLATFORM_DEFAULT_SYNC_METHOD
+#define DEFAULT_SYNC_FLAGBIT	PLATFORM_DEFAULT_SYNC_FLAGBIT
+#elif defined(OPEN_DATASYNC_FLAG)
 #define DEFAULT_SYNC_METHOD_STR "open_datasync"
 #define DEFAULT_SYNC_METHOD		SYNC_METHOD_OPEN
 #define DEFAULT_SYNC_FLAGBIT	OPEN_DATASYNC_FLAG
@@ -134,10 +138,6 @@ typedef uint32 TimeLineID;
 #define DEFAULT_SYNC_METHOD_STR "fdatasync"
 #define DEFAULT_SYNC_METHOD		SYNC_METHOD_FDATASYNC
 #define DEFAULT_SYNC_FLAGBIT	0
-#elif defined(HAVE_FSYNC_WRITETHROUGH_ONLY)
-#define DEFAULT_SYNC_METHOD_STR "fsync_writethrough"
-#define DEFAULT_SYNC_METHOD		SYNC_METHOD_FSYNC_WRITETHROUGH
-#define DEFAULT_SYNC_FLAGBIT	0
 #else
 #define DEFAULT_SYNC_METHOD_STR "fsync"
 #define DEFAULT_SYNC_METHOD		SYNC_METHOD_FSYNC
diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h
index 4e8530f871a0..32e200c2b374 100644
--- a/src/include/access/xlogutils.h
+++ b/src/include/access/xlogutils.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/xlogutils.h,v 1.22 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/xlogutils.h,v 1.23 2008/01/01 19:45:56 momjian Exp $
  */
 #ifndef XLOG_UTILS_H
 #define XLOG_UTILS_H
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index b49cde3fb2d5..f8f33b0883f7 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -64,4 +64,5 @@ extern int	boot_yyparse(void);
 
 extern int	boot_yylex(void);
 extern void boot_yyerror(const char *str);
+
 #endif   /* BOOTSTRAP_H */
diff --git a/src/include/catalog/.gitignore b/src/include/catalog/.gitignore
index fe55b366a6a6..b945b2f8af01 100644
--- a/src/include/catalog/.gitignore
+++ b/src/include/catalog/.gitignore
@@ -1 +1,2 @@
 gp_version.h
+/schemapg.h
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index d0984fe08603..e8d8333c1d4f 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catalog.h,v 1.37 2007/01/05 22:19:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catalog.h,v 1.38 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/catalog/catullus.pl b/src/include/catalog/catullus.pl
index 485407879581..3b9e28ec2a78 100755
--- a/src/include/catalog/catullus.pl
+++ b/src/include/catalog/catullus.pl
@@ -862,6 +862,7 @@ sub printfndef
 		 ($tup->{prosrc} ? $tup->{prosrc} : "_null_" )) . " " .
 		($tup->{probin} ? $tup->{probin} : "_null_") . " " .
 		($tup->{proacl} ? $tup->{proacl} : "_null_") . " " . 
+		($tup->{proconfig} ? $tup->{proconfig} : "_null_") . " " . 
 		$tup->{prodataaccess} . " " .
 		"));\n";
 	$bigstr .= "DESCR(" . $fndef->{with}->{description} . ");\n"
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 7756e940f58f..3c93593501df 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.387 2007/02/20 10:00:25 petere Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.441 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,6 +56,6 @@
  */
 
 /*							3yyymmddN */
-#define CATALOG_VERSION_NO	301604129
+#define CATALOG_VERSION_NO	301605129
 
 #endif
diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h
index a31f39d635e9..2ad5e64aab06 100644
--- a/src/include/catalog/dependency.h
+++ b/src/include/catalog/dependency.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/dependency.h,v 1.29 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/dependency.h,v 1.33 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -137,6 +137,10 @@ typedef enum ObjectClass
 	OCLASS_REWRITE,				/* pg_rewrite */
 	OCLASS_TRIGGER,				/* pg_trigger */
 	OCLASS_SCHEMA,				/* pg_namespace */
+	OCLASS_TSPARSER,			/* pg_ts_parser */
+	OCLASS_TSDICT,				/* pg_ts_dict */
+	OCLASS_TSTEMPLATE,			/* pg_ts_template */
+	OCLASS_TSCONFIG,			/* pg_ts_config */
 	OCLASS_ROLE,				/* pg_authid */
 	OCLASS_DATABASE,			/* pg_database */
 	OCLASS_TBLSPACE,			/* pg_tablespace */
@@ -179,6 +183,10 @@ extern void add_exact_object_address(const ObjectAddress *object,
 extern bool object_address_present(const ObjectAddress *object,
 					   const ObjectAddresses *addrs);
 
+extern void record_object_address_dependencies(const ObjectAddress *depender,
+								   ObjectAddresses *referenced,
+								   DependencyType behavior);
+
 extern void free_object_addresses(ObjectAddresses *addrs);
 
 /* in pg_depend.c */
diff --git a/src/include/catalog/gp_persistent.h b/src/include/catalog/gp_persistent.h
index 5f66db593f32..3851478fd9c1 100755
--- a/src/include/catalog/gp_persistent.h
+++ b/src/include/catalog/gp_persistent.h
@@ -263,7 +263,7 @@ typedef FormData_gp_relation_node *Form_gp_relation_node;
  * gp_relation_node_index Index values for FormData_pg_index.
  */
 #define Index_gp_relation_node_index \
-   GpRelationNodeOidIndexId, GpRelationNodeRelationId, Natts_gp_relation_node_index, true, false, false, true, {Init_int2vector}, {Init_oidvector}, {Init_oidvector}, {Init_text}, {Init_text}
+	GpRelationNodeOidIndexId, GpRelationNodeRelationId, Natts_gp_relation_node_index, true, false, false, true, false, true, {Init_int2vector}, {Init_oidvector}, {Init_oidvector}, {Init_text}, {Init_text}
 
 #define IndKey_gp_relation_node_index \
     1, 2
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index 6fb5b365be0b..d97b9004ddc3 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.86 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.87 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -126,7 +126,8 @@ extern Form_pg_attribute SystemAttributeByName(const char *attname,
 
 extern void CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind);
 
-extern void CheckAttributeType(const char *attname, Oid atttypid);
+extern void CheckAttributeType(const char *attname, Oid atttypid,
+							   List *containing_rowtypes);
 extern void SetRelationNumChecks(Relation rel, int numchecks);
 
 /* MPP-6929: metadata tracking */
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 57f196044bb4..aa7f6b94733a 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/index.h,v 1.73 2007/01/09 02:14:15 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/index.h,v 1.75.2.1 2008/11/13 17:42:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,13 @@ typedef void (*IndexBuildCallback) (Relation index,
 									bool tupleIsAlive,
 									void *state);
 
+/* Action code for index_set_state_flags */
+typedef enum
+{
+	INDEX_CREATE_SET_READY,
+	INDEX_CREATE_SET_VALID
+} IndexStateFlagsAction;
+
 
 extern Oid index_create(Oid heapRelationId,
 			 const char *indexRelationName,
@@ -58,22 +65,27 @@ extern void FormIndexDatum(IndexInfo *indexInfo,
 			   Datum *values,
 			   bool *isnull);
 
-extern Oid setNewRelfilenode(Relation relation);
-extern Oid setNewRelfilenodeToOid(Relation relation, Oid newrelfilenode);
+extern Oid setNewRelfilenode(Relation relation, TransactionId freezeXid);
+extern Oid setNewRelfilenodeToOid(Relation relation, TransactionId freezeXid,
+					   Oid newrelfilenode);
 
 extern void index_build(Relation heapRelation,
 			Relation indexRelation,
 			IndexInfo *indexInfo,
-			bool isprimary);
+			bool isprimary,
+			bool isreindex);
 
-extern double IndexBuildScan(Relation heapRelation,
-				   Relation indexRelation,
-				   IndexInfo *indexInfo,
-				   IndexBuildCallback callback,
-				   void *callback_state);
+extern double IndexBuildScan(Relation parentRelation,
+					Relation indexRelation,
+					IndexInfo *indexInfo,
+					bool allow_sync,
+					IndexBuildCallback callback,
+					void *callback_state);
 
 extern void validate_index(Oid heapId, Oid indexId, Snapshot snapshot);
 
+extern void index_set_state_flags(Oid indexId, IndexStateFlagsAction action);
+
 extern Oid reindex_index(Oid indexId, Oid newrelfilenode, List **extra_oids);
 extern bool reindex_relation(Oid relid, bool toast_too, bool aoseg_too, 
 							 bool aoblkdir_too, bool aovisimap_too,
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index f8ca38d47d0f..0672fc995a0e 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -5,11 +5,11 @@
  *	  on system catalogs
  *
  *
- * Copyright (c) 2007-2010, Greenplum inc
+ * Portions Copyright (c) 2007-2010, Greenplum inc
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/indexing.h,v 1.98 2007/02/14 01:58:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/indexing.h,v 1.102 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 #define INDEXING_H
 
 #include "access/htup.h"
-#include "utils/rel.h"
+#include "utils/relcache.h"
 
 /*
  * The state object used by CatalogOpenIndexes and friends is actually the
@@ -68,7 +68,7 @@ DECLARE_UNIQUE_INDEX(pg_amop_fam_strat_index, 2653, on pg_amop using btree(amopf
 DECLARE_UNIQUE_INDEX(pg_amop_opr_fam_index, 2654, on pg_amop using btree(amopopr oid_ops, amopfamily oid_ops));
 #define AccessMethodOperatorIndexId  2654
 DECLARE_UNIQUE_INDEX(pg_amop_oid_index, 2756, on pg_amop using btree(oid oid_ops));
-#define AccessMethodOperatorOidIndexId  2756
+#define AccessMethodOperatorOidIndexId	2756
 
 DECLARE_UNIQUE_INDEX(pg_amproc_fam_proc_index, 2655, on pg_amproc using btree(amprocfamily oid_ops, amproclefttype oid_ops, amprocrighttype oid_ops, amprocnum int2_ops));
 #define AccessMethodProcedureIndexId  2655
@@ -139,6 +139,11 @@ DECLARE_UNIQUE_INDEX(pg_description_o_c_o_index, 2675, on pg_description using b
 DECLARE_UNIQUE_INDEX(pg_shdescription_o_c_index, 2397, on pg_shdescription using btree(objoid oid_ops, classoid oid_ops));
 #define SharedDescriptionObjIndexId 2397
 
+DECLARE_UNIQUE_INDEX(pg_enum_oid_index, 3502, on pg_enum using btree(oid oid_ops));
+#define EnumOidIndexId	3502
+DECLARE_UNIQUE_INDEX(pg_enum_typid_label_index, 3503, on pg_enum using btree(enumtypid oid_ops, enumlabel name_ops));
+#define EnumTypIdLabelIndexId 3503
+
 /* This following index is not used for a cache and is not unique */
 DECLARE_INDEX(pg_index_indrelid_index, 2678, on pg_index using btree(indrelid oid_ops));
 #define IndexIndrelidIndexId  2678
@@ -161,7 +166,7 @@ DECLARE_UNIQUE_INDEX(pg_operator_oprname_l_r_n_index, 2689, on pg_operator using
 DECLARE_UNIQUE_INDEX(pg_opfamily_am_name_nsp_index, 2754, on pg_opfamily using btree(opfmethod oid_ops, opfname name_ops, opfnamespace oid_ops));
 #define OpfamilyAmNameNspIndexId  2754
 DECLARE_UNIQUE_INDEX(pg_opfamily_oid_index, 2755, on pg_opfamily using btree(oid oid_ops));
-#define OpfamilyOidIndexId  2755
+#define OpfamilyOidIndexId	2755
 
 DECLARE_UNIQUE_INDEX(pg_pltemplate_name_index, 1137, on pg_pltemplate using btree(tmplname name_ops));
 #define PLTemplateNameIndexId  1137
@@ -188,8 +193,8 @@ DECLARE_UNIQUE_INDEX(pg_statistic_relid_att_index, 2696, on pg_statistic using b
 
 DECLARE_UNIQUE_INDEX(pg_filespace_oid_index, 2858, on pg_filespace using btree(oid oid_ops));
 #define FilespaceOidIndexId  2858
-DECLARE_UNIQUE_INDEX(pg_filespace_fsname_index, 2859, on pg_filespace using btree(fsname name_ops));
-#define FilespaceNameIndexId  2859
+DECLARE_UNIQUE_INDEX(pg_filespace_fsname_index, 6998, on pg_filespace using btree(fsname name_ops));
+#define FilespaceNameIndexId  6998
 
 DECLARE_UNIQUE_INDEX(pg_tablespace_oid_index, 2697, on pg_tablespace using btree(oid oid_ops));
 #define TablespaceOidIndexId  2697
@@ -204,6 +209,29 @@ DECLARE_UNIQUE_INDEX(pg_trigger_tgrelid_tgname_index, 2701, on pg_trigger using
 DECLARE_UNIQUE_INDEX(pg_trigger_oid_index, 2702, on pg_trigger using btree(oid oid_ops));
 #define TriggerOidIndexId  2702
 
+DECLARE_UNIQUE_INDEX(pg_ts_config_cfgname_index, 3608, on pg_ts_config using btree(cfgname name_ops, cfgnamespace oid_ops));
+#define TSConfigNameNspIndexId	3608
+DECLARE_UNIQUE_INDEX(pg_ts_config_oid_index, 3712, on pg_ts_config using btree(oid oid_ops));
+#define TSConfigOidIndexId	3712
+
+DECLARE_UNIQUE_INDEX(pg_ts_config_map_index, 3609, on pg_ts_config_map using btree(mapcfg oid_ops, maptokentype int4_ops, mapseqno int4_ops));
+#define TSConfigMapIndexId	3609
+
+DECLARE_UNIQUE_INDEX(pg_ts_dict_dictname_index, 3604, on pg_ts_dict using btree(dictname name_ops, dictnamespace oid_ops));
+#define TSDictionaryNameNspIndexId	3604
+DECLARE_UNIQUE_INDEX(pg_ts_dict_oid_index, 3605, on pg_ts_dict using btree(oid oid_ops));
+#define TSDictionaryOidIndexId	3605
+
+DECLARE_UNIQUE_INDEX(pg_ts_parser_prsname_index, 3606, on pg_ts_parser using btree(prsname name_ops, prsnamespace oid_ops));
+#define TSParserNameNspIndexId	3606
+DECLARE_UNIQUE_INDEX(pg_ts_parser_oid_index, 3607, on pg_ts_parser using btree(oid oid_ops));
+#define TSParserOidIndexId	3607
+
+DECLARE_UNIQUE_INDEX(pg_ts_template_tmplname_index, 3766, on pg_ts_template using btree(tmplname name_ops, tmplnamespace oid_ops));
+#define TSTemplateNameNspIndexId	3766
+DECLARE_UNIQUE_INDEX(pg_ts_template_oid_index, 3767, on pg_ts_template using btree(oid oid_ops));
+#define TSTemplateOidIndexId	3767
+
 DECLARE_UNIQUE_INDEX(pg_type_oid_index, 2703, on pg_type using btree(oid oid_ops));
 #define TypeOidIndexId	2703
 DECLARE_UNIQUE_INDEX(pg_type_typname_nsp_index, 2704, on pg_type using btree(typname name_ops, typnamespace oid_ops));
diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h
index c65bbfb355cd..3dbde758c4cb 100644
--- a/src/include/catalog/namespace.h
+++ b/src/include/catalog/namespace.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.44 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.53 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,16 @@ typedef struct _FuncCandidateList
 	Oid			args[1];		/* arg types --- VARIABLE LENGTH ARRAY */
 }	*FuncCandidateList;	/* VARIABLE LENGTH STRUCT */
 
+/*
+ *	Structure for xxxOverrideSearchPath functions
+ */
+typedef struct OverrideSearchPath
+{
+	List	   *schemas;		/* OIDs of explicitly named schemas */
+	bool		addCatalog;		/* implicitly prepend pg_catalog? */
+	bool		addTemp;		/* implicitly prepend temp schema? */
+} OverrideSearchPath;
+
 typedef void (*RangeVarGetRelidCallback) (const RangeVar *relation, Oid relId,
 										   Oid oldRelId, void *callback_arg);
 
@@ -65,16 +75,28 @@ extern bool OpfamilyIsVisible(Oid opfid);
 extern Oid	ConversionGetConid(const char *conname);
 extern bool ConversionIsVisible(Oid conid);
 
+extern Oid	TSParserGetPrsid(List *names, bool failOK);
+extern bool TSParserIsVisible(Oid prsId);
+
+extern Oid	TSDictionaryGetDictid(List *names, bool failOK);
+extern bool TSDictionaryIsVisible(Oid dictId);
+
+extern Oid	TSTemplateGetTmplid(List *names, bool failOK);
+extern bool TSTemplateIsVisible(Oid tmplId);
+
+extern Oid	TSConfigGetCfgid(List *names, bool failOK);
+extern bool TSConfigIsVisible(Oid cfgid);
+
 extern void DeconstructQualifiedName(List *names,
 						 char **nspname_p,
 						 char **objname_p);
 extern Oid	LookupExplicitNamespace(const char *nspname);
 
 extern void DropTempTableNamespaceForResetSession(Oid namespaceOid);
-extern void SetTempNamespace(Oid namespaceOid);
+extern void SetTempNamespace(Oid namespaceOid, Oid toastNamespaceOid);
 extern Oid  ResetTempNamespace(void);
 extern bool TempNamespaceOidIsValid(void);  /* GPDB only:  used by cdbgang.c */
-extern void InitTempTableNamespaceWithOids(Oid tempSchema);
+extern void InitTempTableNamespaceWithOids(Oid tempSchema, Oid tempToastSchema);
 
 extern Oid	LookupCreationNamespace(const char *nspname);
 extern Oid	QualifiedNameGetCreationNamespace(List *names, char **objname_p);
@@ -83,11 +105,16 @@ extern char *NameListToString(List *names);
 extern char *NameListToQuotedString(List *names);
 
 extern bool isTempNamespace(Oid namespaceId);
+extern bool isTempToastNamespace(Oid namespaceId);
+extern bool isTempOrToastNamespace(Oid namespaceId);
 extern bool isAnyTempNamespace(Oid namespaceId);
 extern bool isOtherTempNamespace(Oid namespaceId);
+extern Oid	GetTempToastNamespace(void);
+extern void ResetTempTableNamespace(void);
 
-extern void PushSpecialNamespace(Oid namespaceId);
-extern void PopSpecialNamespace(Oid namespaceId);
+extern OverrideSearchPath *GetOverrideSearchPath(MemoryContext context);
+extern void PushOverrideSearchPath(OverrideSearchPath *newpath);
+extern void PopOverrideSearchPath(void);
 
 extern Oid	FindConversionByName(List *conname);
 extern Oid	FindDefaultConversionProc(int4 for_encoding, int4 to_encoding);
@@ -102,5 +129,6 @@ extern void AtEOSubXact_Namespace(bool isCommit, SubTransactionId mySubid,
 extern char *namespace_search_path;
 
 extern List *fetch_search_path(bool includeImplicit);
+extern int	fetch_search_path_array(Oid *sarray, int sarray_len);
 
 #endif   /* NAMESPACE_H */
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 58e682ffb2dc..8f84e19c18e6 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.61 2007/02/17 00:55:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.65 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -97,16 +97,16 @@
 
 CATALOG(pg_aggregate,2600) BKI_WITHOUT_OIDS
 {
-	regproc	aggfnoid;		
-	regproc	aggtransfn;		
-	regproc	agginvtransfn;	/* MPP windowing */
-	regproc	aggprelimfn;	/* MPP 2-phase agg */
-	regproc	agginvprelimfn;	/* MPP windowing */
-	regproc	aggfinalfn;		
-	Oid		aggsortop;		
-	Oid		aggtranstype;	
-	text	agginitval;		/* VARIABLE LENGTH FIELD */
-	bool	aggordered;		/* MPP ordered aggregates */
+	regproc		aggfnoid;
+	regproc		aggtransfn;
+	regproc		agginvtransfn;	/* MPP windowing */
+	regproc		aggprelimfn;	/* MPP 2-phase agg */
+	regproc		agginvprelimfn;	/* MPP windowing */
+	regproc		aggfinalfn;
+	Oid			aggsortop;
+	Oid			aggtranstype;
+	text		agginitval;		/* VARIABLE LENGTH FIELD */
+	bool		aggordered;		/* MPP ordered aggregates */
 } FormData_pg_aggregate;
 
 
@@ -187,6 +187,7 @@ DATA(insert ( 2130	numeric_larger	- numeric_larger	- -				1756	1700	_null_  f));
 DATA(insert ( 2050	array_larger	- array_larger		- -				1073	2277	_null_  f));
 DATA(insert ( 2244	bpchar_larger	- bpchar_larger		- -				1060	1042	_null_  f));
 DATA(insert ( 2797	tidlarger		- tidlarger			- -				2800	27		_null_  f));
+DATA(insert ( 3526	enum_larger		- enum_larger		- -				3519	3500	_null_  f));
 DATA(insert ( 3332	gpxlogloclarger	- gpxlogloclarger	- -				3328	3310	_null_  f));
 
 /* min */
@@ -209,6 +210,7 @@ DATA(insert ( 2146	numeric_smaller - numeric_smaller	- -				1754	1700	_null_  f)
 DATA(insert ( 2051	array_smaller	- array_smaller		- -				1072	2277	_null_  f));
 DATA(insert ( 2245	bpchar_smaller	- bpchar_smaller	- -				1058	1042	_null_  f));
 DATA(insert ( 2798	tidsmaller		- tidsmaller		- -				2799	27		_null_  f));
+DATA(insert ( 3527	enum_smaller	- enum_smaller		- -				3518	3500	_null_  f));
 DATA(insert ( 3333	gpxloglocsmaller - gpxloglocsmaller		- -			3327	3310	_null_  f));
 
 /* count */
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index b80e4c2b2fb1..0394a0d57bf8 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_am.h,v 1.50 2007/01/20 23:13:01 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_am.h,v 1.53 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
@@ -37,6 +37,7 @@
    amcanmulticol    boolean, 
    amoptionalkey    boolean, 
    amindexnulls     boolean, 
+   amsearchnulls    boolean, 
    amstorage        boolean, 
    amclusterable    boolean, 
    amcanshrink      boolean, 
@@ -88,9 +89,9 @@ CATALOG(pg_am,2601)
 {
 	NameData	amname;			/* access method name */
 	int2		amstrategies;	/* total number of strategies (operators) by
-								 * which we can traverse/search this AM.
-								 * Zero if AM does not have a fixed set of
-								 * strategy assignments. */
+								 * which we can traverse/search this AM. Zero
+								 * if AM does not have a fixed set of strategy
+								 * assignments. */
 	int2		amsupport;		/* total number of support functions that this
 								 * AM uses */
 	bool		amcanorder;		/* does AM support ordered scan results? */
@@ -98,6 +99,7 @@ CATALOG(pg_am,2601)
 	bool		amcanmulticol;	/* does AM support multi-column indexes? */
 	bool		amoptionalkey;	/* can query omit key for the first column? */
 	bool		amindexnulls;	/* does AM support NULL index entries? */
+	bool		amsearchnulls;	/* can AM search for NULL index entries? */
 	bool		amstorage;		/* can storage type differ from column type? */
 	bool		amclusterable;	/* does AM support cluster command? */
 	bool		amcanshrink;	/* does AM do anything other than REINDEX in
@@ -137,41 +139,42 @@ typedef FormData_pg_am *Form_pg_am;
 #define Anum_pg_am_amcanmulticol		6
 #define Anum_pg_am_amoptionalkey		7
 #define Anum_pg_am_amindexnulls			8
-#define Anum_pg_am_amstorage			9
-#define Anum_pg_am_amclusterable		10
-#define Anum_pg_am_amcanshrink			11
-#define Anum_pg_am_aminsert				12
-#define Anum_pg_am_ambeginscan			13
-#define Anum_pg_am_amgettuple			14
-#define Anum_pg_am_amgetmulti			15
-#define Anum_pg_am_amrescan				16
-#define Anum_pg_am_amendscan			17
-#define Anum_pg_am_ammarkpos			18
-#define Anum_pg_am_amrestrpos			19
-#define Anum_pg_am_ambuild				20
-#define Anum_pg_am_ambulkdelete			21
-#define Anum_pg_am_amvacuumcleanup		22
-#define Anum_pg_am_amcostestimate		23
-#define Anum_pg_am_amoptions			24
+#define Anum_pg_am_amsearchnulls		9
+#define Anum_pg_am_amstorage			10
+#define Anum_pg_am_amclusterable		11
+#define Anum_pg_am_amcanshrink			12
+#define Anum_pg_am_aminsert				13
+#define Anum_pg_am_ambeginscan			14
+#define Anum_pg_am_amgettuple			15
+#define Anum_pg_am_amgetmulti			16
+#define Anum_pg_am_amrescan				17
+#define Anum_pg_am_amendscan			18
+#define Anum_pg_am_ammarkpos			19
+#define Anum_pg_am_amrestrpos			20
+#define Anum_pg_am_ambuild				21
+#define Anum_pg_am_ambulkdelete			22
+#define Anum_pg_am_amvacuumcleanup		23
+#define Anum_pg_am_amcostestimate		24
+#define Anum_pg_am_amoptions			25
 
 /* ----------------
  *		initial contents of pg_am
  * ----------------
  */
 
-DATA(insert OID = 403 (  btree	5 1 t t t t t f t t btinsert btbeginscan btgettuple btgetmulti btrescan btendscan btmarkpos btrestrpos btbuild btbulkdelete btvacuumcleanup btcostestimate btoptions ));
+DATA(insert OID = 403 (  btree	5 1 t t t t t t f t t btinsert btbeginscan btgettuple btgetmulti btrescan btendscan btmarkpos btrestrpos btbuild btbulkdelete btvacuumcleanup btcostestimate btoptions ));
 DESCR("b-tree index access method");
 #define BTREE_AM_OID 403
-DATA(insert OID = 405 (  hash	1 1 f f f f f f f t hashinsert hashbeginscan hashgettuple hashgetmulti hashrescan hashendscan hashmarkpos hashrestrpos hashbuild hashbulkdelete hashvacuumcleanup hashcostestimate hashoptions ));
+DATA(insert OID = 405 (  hash	1 1 f f f f f f f f t hashinsert hashbeginscan hashgettuple hashgetmulti hashrescan hashendscan hashmarkpos hashrestrpos hashbuild hashbulkdelete hashvacuumcleanup hashcostestimate hashoptions ));
 DESCR("hash index access method");
 #define HASH_AM_OID 405
-DATA(insert OID = 783 (  gist	0 7 f f t t t t t t gistinsert gistbeginscan gistgettuple gistgetmulti gistrescan gistendscan gistmarkpos gistrestrpos gistbuild gistbulkdelete gistvacuumcleanup gistcostestimate gistoptions ));
+DATA(insert OID = 783 (  gist	0 7 f f t t t t t t t gistinsert gistbeginscan gistgettuple gistgetmulti gistrescan gistendscan gistmarkpos gistrestrpos gistbuild gistbulkdelete gistvacuumcleanup gistcostestimate gistoptions ));
 DESCR("GiST index access method");
 #define GIST_AM_OID 783
-DATA(insert OID = 2742 (  gin	0 4 f f f f f t f t gininsert ginbeginscan gingettuple gingetmulti ginrescan ginendscan ginmarkpos ginrestrpos ginbuild ginbulkdelete ginvacuumcleanup gincostestimate ginoptions ));
+DATA(insert OID = 2742 (  gin	0 4 f f f f f f t f t gininsert ginbeginscan gingettuple gingetmulti ginrescan ginendscan ginmarkpos ginrestrpos ginbuild ginbulkdelete ginvacuumcleanup gincostestimate ginoptions ));
 DESCR("GIN index access method");
 #define GIN_AM_OID 2742
-DATA(insert OID = 3013 (  bitmap	5 1 f f t t t f f f bminsert bmbeginscan bmgettuple bmgetmulti bmrescan bmendscan bmmarkpos bmrestrpos bmbuild bmbulkdelete bmvacuumcleanup bmcostestimate bmoptions ));
+DATA(insert OID = 3013 (  bitmap	5 1 f f t t t f f f f bminsert bmbeginscan bmgettuple bmgetmulti bmrescan bmendscan bmmarkpos bmrestrpos bmbuild bmbulkdelete bmvacuumcleanup bmcostestimate bmoptions ));
 DESCR("bitmap index access method");
 #define BITMAP_AM_OID 3013
 
@@ -179,7 +182,7 @@ DESCR("bitmap index access method");
  * Am_btree AM values for FormData_pg_am.
  */
 #define Am_btree \
-	{"btree"}, 5, 1, true, true, true, true, true, false, true, true, BTINSERT_OID, BTBEGINSCAN_OID, BTGETTUPLE_OID, BTGETMULTI_OID, BTRESCAN_OID, BTENDSCAN_OID, BTMARKPOS_OID, BTRESTRPOS_OID, BTBUILD_OID, BTBULKDELETE_OID, BTVACUUMCLEANUP_OID, BTCOSTESTIMATE_OID, BTOPTIONS_OID
+	{"btree"}, 5, 1, true, true, true, true, true, true, false, true, true, BTINSERT_OID, BTBEGINSCAN_OID, BTGETTUPLE_OID, BTGETMULTI_OID, BTRESCAN_OID, BTENDSCAN_OID, BTMARKPOS_OID, BTRESTRPOS_OID, BTBUILD_OID, BTBULKDELETE_OID, BTVACUUMCLEANUP_OID, BTCOSTESTIMATE_OID, BTOPTIONS_OID
 
 
 #endif   /* PG_AM_H */
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index 7df10bbf121b..4ff8d0c4b108 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_amop.h,v 1.79 2007/02/06 02:59:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_amop.h,v 1.84 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	 the genbki.sh script reads this file and generates .bki
@@ -187,7 +187,7 @@ DATA(insert (	1989   26 26 5 f  610	403 ));
 
 DATA(insert (	2789   27 27 1 f 2799	403 ));
 DATA(insert (	2789   27 27 2 f 2801	403 ));
-DATA(insert (	2789   27 27 3 f 387 	403 ));
+DATA(insert (	2789   27 27 3 f 387	403 ));
 DATA(insert (	2789   27 27 4 f 2802	403 ));
 DATA(insert (	2789   27 27 5 f 2800	403 ));
 
@@ -206,29 +206,29 @@ DATA(insert (	1991   30 30 5 f  646	403 ));
  */
 
 /* default operators float4 */
-DATA(insert (	1970   700 700 1 f  622 403 ));
-DATA(insert (	1970   700 700 2 f  624 403 ));
-DATA(insert (	1970   700 700 3 f  620 403 ));
-DATA(insert (	1970   700 700 4 f  625 403 ));
-DATA(insert (	1970   700 700 5 f  623 403 ));
+DATA(insert (	1970   700 700 1 f	622 403 ));
+DATA(insert (	1970   700 700 2 f	624 403 ));
+DATA(insert (	1970   700 700 3 f	620 403 ));
+DATA(insert (	1970   700 700 4 f	625 403 ));
+DATA(insert (	1970   700 700 5 f	623 403 ));
 /* crosstype operators float48 */
-DATA(insert (	1970   700 701 1 f  1122 403 ));
-DATA(insert (	1970   700 701 2 f  1124 403 ));
-DATA(insert (	1970   700 701 3 f  1120 403 ));
-DATA(insert (	1970   700 701 4 f  1125 403 ));
-DATA(insert (	1970   700 701 5 f  1123 403 ));
+DATA(insert (	1970   700 701 1 f	1122 403 ));
+DATA(insert (	1970   700 701 2 f	1124 403 ));
+DATA(insert (	1970   700 701 3 f	1120 403 ));
+DATA(insert (	1970   700 701 4 f	1125 403 ));
+DATA(insert (	1970   700 701 5 f	1123 403 ));
 /* default operators float8 */
-DATA(insert (	1970   701 701 1 f  672 403 ));
-DATA(insert (	1970   701 701 2 f  673 403 ));
-DATA(insert (	1970   701 701 3 f  670 403 ));
-DATA(insert (	1970   701 701 4 f  675 403 ));
-DATA(insert (	1970   701 701 5 f  674 403 ));
+DATA(insert (	1970   701 701 1 f	672 403 ));
+DATA(insert (	1970   701 701 2 f	673 403 ));
+DATA(insert (	1970   701 701 3 f	670 403 ));
+DATA(insert (	1970   701 701 4 f	675 403 ));
+DATA(insert (	1970   701 701 5 f	674 403 ));
 /* crosstype operators float84 */
-DATA(insert (	1970   701 700 1 f  1132 403 ));
-DATA(insert (	1970   701 700 2 f  1134 403 ));
-DATA(insert (	1970   701 700 3 f  1130 403 ));
-DATA(insert (	1970   701 700 4 f  1135 403 ));
-DATA(insert (	1970   701 700 5 f  1133 403 ));
+DATA(insert (	1970   701 700 1 f	1132 403 ));
+DATA(insert (	1970   701 700 2 f	1134 403 ));
+DATA(insert (	1970   701 700 3 f	1130 403 ));
+DATA(insert (	1970   701 700 4 f	1135 403 ));
+DATA(insert (	1970   701 700 5 f	1133 403 ));
 
 /*
  *	btree char_ops
@@ -236,7 +236,7 @@ DATA(insert (	1970   701 700 5 f  1133 403 ));
 
 DATA(insert (	429   18 18 1 f  631	403 ));
 DATA(insert (	429   18 18 2 f  632	403 ));
-DATA(insert (	429   18 18 3 f	92	403 ));
+DATA(insert (	429   18 18 3 f 92	403 ));
 DATA(insert (	429   18 18 4 f  634	403 ));
 DATA(insert (	429   18 18 5 f  633	403 ));
 
@@ -383,21 +383,21 @@ DATA(insert (	1982   1186 1186 5 f 1334	403 ));
  *	btree macaddr
  */
 
-DATA(insert (	1984   829 829 1 f 1222	403 ));
-DATA(insert (	1984   829 829 2 f 1223	403 ));
-DATA(insert (	1984   829 829 3 f 1220	403 ));
-DATA(insert (	1984   829 829 4 f 1225	403 ));
-DATA(insert (	1984   829 829 5 f 1224	403 ));
+DATA(insert (	1984   829 829 1 f 1222 403 ));
+DATA(insert (	1984   829 829 2 f 1223 403 ));
+DATA(insert (	1984   829 829 3 f 1220 403 ));
+DATA(insert (	1984   829 829 4 f 1225 403 ));
+DATA(insert (	1984   829 829 5 f 1224 403 ));
 
 /*
  *	btree network
  */
 
-DATA(insert (	1974   869 869 1 f 1203	403 ));
-DATA(insert (	1974   869 869 2 f 1204	403 ));
-DATA(insert (	1974   869 869 3 f 1201	403 ));
-DATA(insert (	1974   869 869 4 f 1206	403 ));
-DATA(insert (	1974   869 869 5 f 1205	403 ));
+DATA(insert (	1974   869 869 1 f 1203 403 ));
+DATA(insert (	1974   869 869 2 f 1204 403 ));
+DATA(insert (	1974   869 869 3 f 1201 403 ));
+DATA(insert (	1974   869 869 4 f 1206 403 ));
+DATA(insert (	1974   869 869 5 f 1205 403 ));
 
 /*
  *	btree numeric
@@ -420,11 +420,11 @@ DATA(insert (	3221   195 195 5 f 3482	403 ));
  *	btree bool
  */
 
-DATA(insert (	424   16 16 1 f	58	403 ));
+DATA(insert (	424   16 16 1 f 58	403 ));
 DATA(insert (	424   16 16 2 f 1694	403 ));
-DATA(insert (	424   16 16 3 f	91	403 ));
+DATA(insert (	424   16 16 3 f 91	403 ));
 DATA(insert (	424   16 16 4 f 1695	403 ));
-DATA(insert (	424   16 16 5 f	59	403 ));
+DATA(insert (	424   16 16 5 f 59	403 ));
 
 /*
  *	btree bit
@@ -480,31 +480,31 @@ DATA(insert (	2098   19 19 5 f 2336	403 ));
  *	btree money_ops
  */
 
-DATA(insert (	2099   790 790 1 f  902	403 ));
-DATA(insert (	2099   790 790 2 f  904	403 ));
-DATA(insert (	2099   790 790 3 f  900	403 ));
-DATA(insert (	2099   790 790 4 f  905	403 ));
-DATA(insert (	2099   790 790 5 f  903	403 ));
+DATA(insert (	2099   790 790 1 f	902 403 ));
+DATA(insert (	2099   790 790 2 f	904 403 ));
+DATA(insert (	2099   790 790 3 f	900 403 ));
+DATA(insert (	2099   790 790 4 f	905 403 ));
+DATA(insert (	2099   790 790 5 f	903 403 ));
 
 /*
  *	btree reltime_ops
  */
 
-DATA(insert (	2233   703 703 1 f  568	403 ));
-DATA(insert (	2233   703 703 2 f  570	403 ));
-DATA(insert (	2233   703 703 3 f  566	403 ));
-DATA(insert (	2233   703 703 4 f  571	403 ));
-DATA(insert (	2233   703 703 5 f  569	403 ));
+DATA(insert (	2233   703 703 1 f	568 403 ));
+DATA(insert (	2233   703 703 2 f	570 403 ));
+DATA(insert (	2233   703 703 3 f	566 403 ));
+DATA(insert (	2233   703 703 4 f	571 403 ));
+DATA(insert (	2233   703 703 5 f	569 403 ));
 
 /*
  *	btree tinterval_ops
  */
 
-DATA(insert (	2234   704 704 1 f  813	403 ));
-DATA(insert (	2234   704 704 2 f  815	403 ));
-DATA(insert (	2234   704 704 3 f  811	403 ));
-DATA(insert (	2234   704 704 4 f  816	403 ));
-DATA(insert (	2234   704 704 5 f  814	403 ));
+DATA(insert (	2234   704 704 1 f	813 403 ));
+DATA(insert (	2234   704 704 2 f	815 403 ));
+DATA(insert (	2234   704 704 3 f	811 403 ));
+DATA(insert (	2234   704 704 4 f	816 403 ));
+DATA(insert (	2234   704 704 5 f	814 403 ));
 
 /*
  *	btree array_ops
@@ -516,11 +516,11 @@ DATA(insert (	397   2277 2277 3 f 1070	403 ));
 DATA(insert (	397   2277 2277 4 f 1075	403 ));
 DATA(insert (	397   2277 2277 5 f 1073	403 ));
 
-/* 
- * btree uuid_ops 
+/*
+ * btree uuid_ops
  */
- 
-DATA(insert (	2968  2950 2950 1 f	2974	403 ));
+
+DATA(insert (	2968  2950 2950 1 f 2974	403 ));
 DATA(insert (	2968  2950 2950 2 f 2976	403 ));
 DATA(insert (	2968  2950 2950 3 f 2972	403 ));
 DATA(insert (	2968  2950 2950 4 f 2977	403 ));
@@ -533,30 +533,30 @@ DATA(insert (	2968  2950 2950 5 f 2975	403 ));
 /* bpchar_ops */
 DATA(insert (	427   1042 1042 1 f 1054	405 ));
 /* char_ops */
-DATA(insert (	431   18 18 1 f	92	405 ));
+DATA(insert (	431   18 18 1 f 92	405 ));
 /* date_ops */
 DATA(insert (	435   1082 1082 1 f 1093	405 ));
 /* float_ops */
-DATA(insert (	1971   700 700 1 f  620	405 ));
-DATA(insert (	1971   701 701 1 f  670	405 ));
-DATA(insert (	1971   700 701 1 f 1120	405 ));
-DATA(insert (	1971   701 700 1 f 1130	405 ));
+DATA(insert (	1971   700 700 1 f	620 405 ));
+DATA(insert (	1971   701 701 1 f	670 405 ));
+DATA(insert (	1971   700 701 1 f 1120 405 ));
+DATA(insert (	1971   701 700 1 f 1130 405 ));
 /* network_ops */
-DATA(insert (	1975   869 869 1 f 1201	405 ));
+DATA(insert (	1975   869 869 1 f 1201 405 ));
 /* integer_ops */
 DATA(insert (	1977   21 21 1 f	94	405 ));
 DATA(insert (	1977   23 23 1 f	96	405 ));
-DATA(insert (	1977   20 20 1 f	410	405 ));
-DATA(insert (	1977   21 23 1 f	532	405 ));
-DATA(insert (	1977   21 20 1 f   1862	405 ));
-DATA(insert (	1977   23 21 1 f	533	405 ));
+DATA(insert (	1977   20 20 1 f	410 405 ));
+DATA(insert (	1977   21 23 1 f	532 405 ));
+DATA(insert (	1977   21 20 1 f   1862 405 ));
+DATA(insert (	1977   23 21 1 f	533 405 ));
 DATA(insert (	1977   23 20 1 f	15	405 ));
-DATA(insert (	1977   20 21 1 f   1868	405 ));
-DATA(insert (	1977   20 23 1 f	416	405 ));
+DATA(insert (	1977   20 21 1 f   1868 405 ));
+DATA(insert (	1977   20 23 1 f	416 405 ));
 /* interval_ops */
 DATA(insert (	1983   1186 1186 1 f 1330	405 ));
 /* macaddr_ops */
-DATA(insert (	1985   829 829 1 f 1220	405 ));
+DATA(insert (	1985   829 829 1 f 1220 405 ));
 /* name_ops */
 DATA(insert (	1987   19 19 1 f	93	405 ));
 /* oid_ops */
@@ -584,9 +584,9 @@ DATA(insert (	2225   28 28 1 f  352	405 ));
 /* cid_ops */
 DATA(insert (	2226   29 29 1 f  385	405 ));
 /* abstime_ops */
-DATA(insert (	2227   702 702 1 f  560	405 ));
+DATA(insert (	2227   702 702 1 f	560 405 ));
 /* reltime_ops */
-DATA(insert (	2228   703 703 1 f  566	405 ));
+DATA(insert (	2228   703 703 1 f	566 405 ));
 /* text_pattern_ops */
 DATA(insert (	2229   25 25 1 f 2316	405 ));
 /* bpchar_pattern_ops */
@@ -595,77 +595,126 @@ DATA(insert (	2231   1042 1042 1 f 7076	405 ));
 DATA(insert (	2232   19 19 1 f 2334	405 ));
 /* aclitem_ops */
 DATA(insert (	2235   1033 1033 1 f  974	405 ));
+/* uuid_ops */
+DATA(insert (	2969   2950 2950 1 f 2972 405 ));
 /* numeric_ops */
 DATA(insert (	1998   1700 1700 1 f 1752 405 ));
-/* uuid_ops */ 
-DATA(insert (	2969   2950 2950 1 f 2972 405 ));
 
 
 /*
  *	gist box_ops
  */
 
-DATA(insert (	2593   603 603 1  f	493	783 ));
-DATA(insert (	2593   603 603 2  f	494	783 ));
-DATA(insert (	2593   603 603 3  f	500	783 ));
-DATA(insert (	2593   603 603 4  f	495	783 ));
-DATA(insert (	2593   603 603 5  f	496	783 ));
-DATA(insert (	2593   603 603 6  f	499	783 ));
-DATA(insert (	2593   603 603 7  f	498	783 ));
-DATA(insert (	2593   603 603 8  f	497	783 ));
-DATA(insert (	2593   603 603 9  f	2571	783 ));
-DATA(insert (	2593   603 603 10 f	2570	783 ));
-DATA(insert (	2593   603 603 11 f	2573	783 ));
-DATA(insert (	2593   603 603 12 f	2572	783 ));
-DATA(insert (	2593   603 603 13 f	2863	783 ));
-DATA(insert (	2593   603 603 14 f	2862	783 ));
+DATA(insert (	2593   603 603 1  f 493 783 ));
+DATA(insert (	2593   603 603 2  f 494 783 ));
+DATA(insert (	2593   603 603 3  f 500 783 ));
+DATA(insert (	2593   603 603 4  f 495 783 ));
+DATA(insert (	2593   603 603 5  f 496 783 ));
+DATA(insert (	2593   603 603 6  f 499 783 ));
+DATA(insert (	2593   603 603 7  f 498 783 ));
+DATA(insert (	2593   603 603 8  f 497 783 ));
+DATA(insert (	2593   603 603 9  f 2571	783 ));
+DATA(insert (	2593   603 603 10 f 2570	783 ));
+DATA(insert (	2593   603 603 11 f 2573	783 ));
+DATA(insert (	2593   603 603 12 f 2572	783 ));
+DATA(insert (	2593   603 603 13 f 2863	783 ));
+DATA(insert (	2593   603 603 14 f 2862	783 ));
 
 /*
  *	gist poly_ops (supports polygons)
  */
 
-DATA(insert (	2594   604 604 1  t	485	783 ));
-DATA(insert (	2594   604 604 2  t	486	783 ));
-DATA(insert (	2594   604 604 3  t	492	783 ));
-DATA(insert (	2594   604 604 4  t	487	783 ));
-DATA(insert (	2594   604 604 5  t	488	783 ));
-DATA(insert (	2594   604 604 6  t	491	783 ));
-DATA(insert (	2594   604 604 7  t	490	783 ));
-DATA(insert (	2594   604 604 8  t	489	783 ));
-DATA(insert (	2594   604 604 9  t	2575	783 ));
-DATA(insert (	2594   604 604 10 t	2574	783 ));
-DATA(insert (	2594   604 604 11 t	2577	783 ));
-DATA(insert (	2594   604 604 12 t	2576	783 ));
-DATA(insert (	2594   604 604 13 t	2861	783 ));
-DATA(insert (	2594   604 604 14 t	2860	783 ));
+DATA(insert (	2594   604 604 1  t 485 783 ));
+DATA(insert (	2594   604 604 2  t 486 783 ));
+DATA(insert (	2594   604 604 3  t 492 783 ));
+DATA(insert (	2594   604 604 4  t 487 783 ));
+DATA(insert (	2594   604 604 5  t 488 783 ));
+DATA(insert (	2594   604 604 6  t 491 783 ));
+DATA(insert (	2594   604 604 7  t 490 783 ));
+DATA(insert (	2594   604 604 8  t 489 783 ));
+DATA(insert (	2594   604 604 9  t 2575	783 ));
+DATA(insert (	2594   604 604 10 t 2574	783 ));
+DATA(insert (	2594   604 604 11 t 2577	783 ));
+DATA(insert (	2594   604 604 12 t 2576	783 ));
+DATA(insert (	2594   604 604 13 t 2861	783 ));
+DATA(insert (	2594   604 604 14 t 2860	783 ));
 
 /*
  *	gist circle_ops
  */
 
-DATA(insert (	2595   718 718 1  t	1506	783 ));
-DATA(insert (	2595   718 718 2  t	1507	783 ));
-DATA(insert (	2595   718 718 3  t	1513	783 ));
-DATA(insert (	2595   718 718 4  t	1508	783 ));
-DATA(insert (	2595   718 718 5  t	1509	783 ));
-DATA(insert (	2595   718 718 6  t	1512	783 ));
-DATA(insert (	2595   718 718 7  t	1511	783 ));
-DATA(insert (	2595   718 718 8  t	1510	783 ));
-DATA(insert (	2595   718 718 9  t	2589	783 ));
-DATA(insert (	2595   718 718 10 t	1515	783 ));
-DATA(insert (	2595   718 718 11 t	1514	783 ));
-DATA(insert (	2595   718 718 12 t	2590	783 ));
-DATA(insert (	2595   718 718 13 t	2865	783 ));
-DATA(insert (	2595   718 718 14 t	2864	783 ));
+DATA(insert (	2595   718 718 1  t 1506	783 ));
+DATA(insert (	2595   718 718 2  t 1507	783 ));
+DATA(insert (	2595   718 718 3  t 1513	783 ));
+DATA(insert (	2595   718 718 4  t 1508	783 ));
+DATA(insert (	2595   718 718 5  t 1509	783 ));
+DATA(insert (	2595   718 718 6  t 1512	783 ));
+DATA(insert (	2595   718 718 7  t 1511	783 ));
+DATA(insert (	2595   718 718 8  t 1510	783 ));
+DATA(insert (	2595   718 718 9  t 2589	783 ));
+DATA(insert (	2595   718 718 10 t 1515	783 ));
+DATA(insert (	2595   718 718 11 t 1514	783 ));
+DATA(insert (	2595   718 718 12 t 2590	783 ));
+DATA(insert (	2595   718 718 13 t 2865	783 ));
+DATA(insert (	2595   718 718 14 t 2864	783 ));
 
 /*
  * gin array_ops (these anyarray operators are used with all the opclasses
  * of the family)
  */
-DATA(insert (	2745   2277 2277 1  f	2750	2742 ));
-DATA(insert (	2745   2277 2277 2  f	2751	2742 ));
-DATA(insert (	2745   2277 2277 3  t	2752	2742 ));
-DATA(insert (	2745   2277 2277 4  t	1070	2742 ));
+DATA(insert (	2745   2277 2277 1	f	2750	2742 ));
+DATA(insert (	2745   2277 2277 2	f	2751	2742 ));
+DATA(insert (	2745   2277 2277 3	t	2752	2742 ));
+DATA(insert (	2745   2277 2277 4	t	1070	2742 ));
+
+/*
+ * btree enum_ops
+ */
+DATA(insert (	3522   3500 3500 1	f	3518	403 ));
+DATA(insert (	3522   3500 3500 2	f	3520	403 ));
+DATA(insert (	3522   3500 3500 3	f	3516	403 ));
+DATA(insert (	3522   3500 3500 4	f	3521	403 ));
+DATA(insert (	3522   3500 3500 5	f	3519	403 ));
+
+/*
+ * hash enum_ops
+ */
+DATA(insert (	3523   3500 3500 1	f	3516	405 ));
+
+/*
+ * btree tsvector_ops
+ */
+DATA(insert (	3626   3614 3614 1 f   3627 403 ));
+DATA(insert (	3626   3614 3614 2 f   3628 403 ));
+DATA(insert (	3626   3614 3614 3 f   3629 403 ));
+DATA(insert (	3626   3614 3614 4 f   3631 403 ));
+DATA(insert (	3626   3614 3614 5 f   3632 403 ));
+
+/*
+ * GiST tsvector_ops
+ */
+DATA(insert (	3655   3614 3615 1	t  3636 783 ));
+
+/*
+ * GIN tsvector_ops
+ */
+DATA(insert (	3659   3614 3615 1	f  3636 2742 ));
+DATA(insert (	3659   3614 3615 2	t  3660 2742 ));
+
+/*
+ * btree tsquery_ops
+ */
+DATA(insert (	3683   3615 3615 1 f   3674 403 ));
+DATA(insert (	3683   3615 3615 2 f   3675 403 ));
+DATA(insert (	3683   3615 3615 3 f   3676 403 ));
+DATA(insert (	3683   3615 3615 4 f   3678 403 ));
+DATA(insert (	3683   3615 3615 5 f   3679 403 ));
+
+/*
+ * GiST tsquery_ops
+ */
+DATA(insert (	3702   3615 3615 7	t  3693 783 ));
+DATA(insert (	3702   3615 3615 8	t  3694 783 ));
 
 /*
  * the operators for the on-disk bitmap index.
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index 8c95c8faddb3..efca390ca4c3 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -22,7 +22,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_amproc.h,v 1.63 2007/01/28 16:16:52 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_amproc.h,v 1.70 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -66,11 +66,11 @@
 
 CATALOG(pg_amproc,2603)
 {
-	Oid			amprocfamily;		/* the index opfamily this entry is for */
-	Oid			amproclefttype;		/* procedure's left input data type */
+	Oid			amprocfamily;	/* the index opfamily this entry is for */
+	Oid			amproclefttype; /* procedure's left input data type */
 	Oid			amprocrighttype;	/* procedure's right input data type */
-	int2		amprocnum;			/* support procedure index */
-	regproc		amproc;				/* OID of the proc */
+	int2		amprocnum;		/* support procedure index */
+	regproc		amproc;			/* OID of the proc */
 } FormData_pg_amproc;
 
 /* ----------------
@@ -146,6 +146,7 @@ DATA(insert (	2234   704 704 1  381 ));
 DATA(insert (	2789   27 27 1 2794 ));
 DATA(insert (	7080   3310 3310 1 7081 ));
 DATA(insert (	2968   2950 2950 1 2960 ));
+DATA(insert (	3522   3500 3500 1 3514 ));
 DATA(insert (	3221   195 195 1 3057 ));
 
 
@@ -165,11 +166,11 @@ DATA(insert (	1987   19 19 1 455 ));
 DATA(insert (	1990   26 26 1 453 ));
 DATA(insert (	1992   30 30 1 457 ));
 DATA(insert (	1995   25 25 1 400 ));
-DATA(insert (	1997   1083 1083 1 452 ));
+DATA(insert (	1997   1083 1083 1 1688 ));
 DATA(insert (	1998   1700 1700 1 432 ));
-DATA(insert (	1999   1184 1184 1 452 ));
+DATA(insert (	1999   1184 1184 1 2039 ));
 DATA(insert (	2001   1266 1266 1 1696 ));
-DATA(insert (	2040   1114 1114 1 452 ));
+DATA(insert (	2040   1114 1114 1 2039 ));
 DATA(insert (	2222   16 16 1 454 ));
 DATA(insert (	2223   17 17 1 456 ));
 DATA(insert (	2224   22 22 1 398 ));
@@ -182,6 +183,7 @@ DATA(insert (	2231   1042 1042 1 456 ));
 DATA(insert (	2232   19 19 1 455 ));
 DATA(insert (	2235   1033 1033 1 329 ));
 DATA(insert (	2969   2950 2950 1 2963 ));
+DATA(insert (	3523   3500 3500 1 3515 ));
 
 
 /* gist */
@@ -206,120 +208,149 @@ DATA(insert (	2595   718 718 4 2580 ));
 DATA(insert (	2595   718 718 5 2581 ));
 DATA(insert (	2595   718 718 6 2582 ));
 DATA(insert (	2595   718 718 7 2584 ));
+DATA(insert (	3655   3614 3614 1 3654 ));
+DATA(insert (	3655   3614 3614 2 3651 ));
+DATA(insert (	3655   3614 3614 3 3648 ));
+DATA(insert (	3655   3614 3614 4 3649 ));
+DATA(insert (	3655   3614 3614 5 3653 ));
+DATA(insert (	3655   3614 3614 6 3650 ));
+DATA(insert (	3655   3614 3614 7 3652 ));
+DATA(insert (	3702   3615 3615 1 3701 ));
+DATA(insert (	3702   3615 3615 2 3698 ));
+DATA(insert (	3702   3615 3615 3 3695 ));
+DATA(insert (	3702   3615 3615 4 3696 ));
+DATA(insert (	3702   3615 3615 5 3700 ));
+DATA(insert (	3702   3615 3615 6 3697 ));
+DATA(insert (	3702   3615 3615 7 3699 ));
+
 
 /* gin */
-DATA(insert (	2745   1007 1007 1  351 ));
+DATA(insert (	2745   1007 1007 1	351 ));
 DATA(insert (	2745   1007 1007 2 2743 ));
-DATA(insert (	2745   1007 1007 3 2743 ));
+DATA(insert (	2745   1007 1007 3 2774 ));
 DATA(insert (	2745   1007 1007 4 2744 ));
-DATA(insert (	2745   1009 1009 1  360 ));
+DATA(insert (	2745   1009 1009 1	360 ));
 DATA(insert (	2745   1009 1009 2 2743 ));
-DATA(insert (	2745   1009 1009 3 2743 ));
+DATA(insert (	2745   1009 1009 3 2774 ));
 DATA(insert (	2745   1009 1009 4 2744 ));
+DATA(insert (	2745   1015 1015 1	360 ));
+DATA(insert (	2745   1015 1015 2 2743 ));
+DATA(insert (	2745   1015 1015 3 2774 ));
+DATA(insert (	2745   1015 1015 4 2744 ));
 DATA(insert (	2745   1023 1023 1 357 ));
 DATA(insert (	2745   1023 1023 2 2743 ));
-DATA(insert (	2745   1023 1023 3 2743 ));
+DATA(insert (	2745   1023 1023 3 2774 ));
 DATA(insert (	2745   1023 1023 4 2744 ));
 DATA(insert (	2745   1561 1561 1 1596 ));
 DATA(insert (	2745   1561 1561 2 2743 ));
-DATA(insert (	2745   1561 1561 3 2743 ));
+DATA(insert (	2745   1561 1561 3 2774 ));
 DATA(insert (	2745   1561 1561 4 2744 ));
 DATA(insert (	2745   1000 1000 1 1693 ));
 DATA(insert (	2745   1000 1000 2 2743 ));
-DATA(insert (	2745   1000 1000 3 2743 ));
+DATA(insert (	2745   1000 1000 3 2774 ));
 DATA(insert (	2745   1000 1000 4 2744 ));
 DATA(insert (	2745   1014 1014 1 1078 ));
 DATA(insert (	2745   1014 1014 2 2743 ));
-DATA(insert (	2745   1014 1014 3 2743 ));
+DATA(insert (	2745   1014 1014 3 2774 ));
 DATA(insert (	2745   1014 1014 4 2744 ));
 DATA(insert (	2745   1001 1001 1 1954 ));
 DATA(insert (	2745   1001 1001 2 2743 ));
-DATA(insert (	2745   1001 1001 3 2743 ));
+DATA(insert (	2745   1001 1001 3 2774 ));
 DATA(insert (	2745   1001 1001 4 2744 ));
 DATA(insert (	2745   1002 1002 1 358 ));
 DATA(insert (	2745   1002 1002 2 2743 ));
-DATA(insert (	2745   1002 1002 3 2743 ));
+DATA(insert (	2745   1002 1002 3 2774 ));
 DATA(insert (	2745   1002 1002 4 2744 ));
 DATA(insert (	2745   1182 1182 1 1092 ));
 DATA(insert (	2745   1182 1182 2 2743 ));
-DATA(insert (	2745   1182 1182 3 2743 ));
+DATA(insert (	2745   1182 1182 3 2774 ));
 DATA(insert (	2745   1182 1182 4 2744 ));
 DATA(insert (	2745   1021 1021 1 354 ));
 DATA(insert (	2745   1021 1021 2 2743 ));
-DATA(insert (	2745   1021 1021 3 2743 ));
+DATA(insert (	2745   1021 1021 3 2774 ));
 DATA(insert (	2745   1021 1021 4 2744 ));
 DATA(insert (	2745   1022 1022 1 355 ));
 DATA(insert (	2745   1022 1022 2 2743 ));
-DATA(insert (	2745   1022 1022 3 2743 ));
+DATA(insert (	2745   1022 1022 3 2774 ));
 DATA(insert (	2745   1022 1022 4 2744 ));
 DATA(insert (	2745   1041 1041 1 926 ));
 DATA(insert (	2745   1041 1041 2 2743 ));
-DATA(insert (	2745   1041 1041 3 2743 ));
+DATA(insert (	2745   1041 1041 3 2774 ));
 DATA(insert (	2745   1041 1041 4 2744 ));
+DATA(insert (	2745   651 651 1 926 ));
+DATA(insert (	2745   651 651 2 2743 ));
+DATA(insert (	2745   651 651 3 2774 ));
+DATA(insert (	2745   651 651 4 2744 ));
 DATA(insert (	2745   1005 1005 1 350 ));
 DATA(insert (	2745   1005 1005 2 2743 ));
-DATA(insert (	2745   1005 1005 3 2743 ));
+DATA(insert (	2745   1005 1005 3 2774 ));
 DATA(insert (	2745   1005 1005 4 2744 ));
 DATA(insert (	2745   1016 1016 1 842 ));
 DATA(insert (	2745   1016 1016 2 2743 ));
-DATA(insert (	2745   1016 1016 3 2743 ));
+DATA(insert (	2745   1016 1016 3 2774 ));
 DATA(insert (	2745   1016 1016 4 2744 ));
 DATA(insert (	2745   1187 1187 1 1315 ));
 DATA(insert (	2745   1187 1187 2 2743 ));
-DATA(insert (	2745   1187 1187 3 2743 ));
+DATA(insert (	2745   1187 1187 3 2774 ));
 DATA(insert (	2745   1187 1187 4 2744 ));
 DATA(insert (	2745   1040 1040 1 836 ));
 DATA(insert (	2745   1040 1040 2 2743 ));
-DATA(insert (	2745   1040 1040 3 2743 ));
+DATA(insert (	2745   1040 1040 3 2774 ));
 DATA(insert (	2745   1040 1040 4 2744 ));
 DATA(insert (	2745   1003 1003 1 359 ));
 DATA(insert (	2745   1003 1003 2 2743 ));
-DATA(insert (	2745   1003 1003 3 2743 ));
+DATA(insert (	2745   1003 1003 3 2774 ));
 DATA(insert (	2745   1003 1003 4 2744 ));
 DATA(insert (	2745   1231 1231 1 1769 ));
 DATA(insert (	2745   1231 1231 2 2743 ));
-DATA(insert (	2745   1231 1231 3 2743 ));
+DATA(insert (	2745   1231 1231 3 2774 ));
 DATA(insert (	2745   1231 1231 4 2744 ));
 DATA(insert (	2745   1028 1028 1 356 ));
 DATA(insert (	2745   1028 1028 2 2743 ));
-DATA(insert (	2745   1028 1028 3 2743 ));
+DATA(insert (	2745   1028 1028 3 2774 ));
 DATA(insert (	2745   1028 1028 4 2744 ));
 DATA(insert (	2745   1013 1013 1 404 ));
 DATA(insert (	2745   1013 1013 2 2743 ));
-DATA(insert (	2745   1013 1013 3 2743 ));
+DATA(insert (	2745   1013 1013 3 2774 ));
 DATA(insert (	2745   1013 1013 4 2744 ));
 DATA(insert (	2745   1183 1183 1 1107 ));
 DATA(insert (	2745   1183 1183 2 2743 ));
-DATA(insert (	2745   1183 1183 3 2743 ));
+DATA(insert (	2745   1183 1183 3 2774 ));
 DATA(insert (	2745   1183 1183 4 2744 ));
 DATA(insert (	2745   1185 1185 1 1314 ));
 DATA(insert (	2745   1185 1185 2 2743 ));
-DATA(insert (	2745   1185 1185 3 2743 ));
+DATA(insert (	2745   1185 1185 3 2774 ));
 DATA(insert (	2745   1185 1185 4 2744 ));
 DATA(insert (	2745   1270 1270 1 1358 ));
 DATA(insert (	2745   1270 1270 2 2743 ));
-DATA(insert (	2745   1270 1270 3 2743 ));
+DATA(insert (	2745   1270 1270 3 2774 ));
 DATA(insert (	2745   1270 1270 4 2744 ));
 DATA(insert (	2745   1563 1563 1 1672 ));
 DATA(insert (	2745   1563 1563 2 2743 ));
-DATA(insert (	2745   1563 1563 3 2743 ));
+DATA(insert (	2745   1563 1563 3 2774 ));
 DATA(insert (	2745   1563 1563 4 2744 ));
 DATA(insert (	2745   1115 1115 1 2045 ));
 DATA(insert (	2745   1115 1115 2 2743 ));
-DATA(insert (	2745   1115 1115 3 2743 ));
+DATA(insert (	2745   1115 1115 3 2774 ));
 DATA(insert (	2745   1115 1115 4 2744 ));
 DATA(insert (	2745   791 791 1 377 ));
 DATA(insert (	2745   791 791 2 2743 ));
-DATA(insert (	2745   791 791 3 2743 ));
+DATA(insert (	2745   791 791 3 2774 ));
 DATA(insert (	2745   791 791 4 2744 ));
 DATA(insert (	2745   1024 1024 1 380 ));
 DATA(insert (	2745   1024 1024 2 2743 ));
-DATA(insert (	2745   1024 1024 3 2743 ));
+DATA(insert (	2745   1024 1024 3 2774 ));
 DATA(insert (	2745   1024 1024 4 2744 ));
 DATA(insert (	2745   1025 1025 1 381 ));
 DATA(insert (	2745   1025 1025 2 2743 ));
-DATA(insert (	2745   1025 1025 3 2743 ));
+DATA(insert (	2745   1025 1025 3 2774 ));
 DATA(insert (	2745   1025 1025 4 2744 ));
+DATA(insert (	3659   3614 3614 1 360 ));
+DATA(insert (	3659   3614 3614 2 3656 ));
+DATA(insert (	3659   3614 3614 3 3657 ));
+DATA(insert (	3659   3614 3614 4 3658 ));
+DATA(insert (	3626   3614 3614 1 3622 ));
+DATA(insert (	3683   3615 3615 1 3668 ));
 
 /*
  * the operator routines for the on-disk bitmap index.
diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index afc0706a4c35..c44699a79750 100644
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_attrdef.h,v 1.21 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_attrdef.h,v 1.22 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index c61a6e51d598..7f7501e0dc11 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_attribute.h,v 1.130 2007/01/22 01:35:21 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_attribute.h,v 1.134 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -354,8 +354,9 @@ DATA(insert ( 1247 gp_segment_id	23 0  4  -8 0 -1 -1 t p i t f f t 0));
 { 1255, {"proargdefaults"},		25, -1, -1, 21, 0, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
 { 1255, {"prosrc"},				25, -1, -1, 22, 0, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
 { 1255, {"probin"},				17, -1, -1, 23, 0, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
-{ 1255, {"proacl"},			  1034, -1, -1, 24, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
-{ 1255, {"prodataaccess"},		18, -1, 1, 25, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }
+{ 1255, {"proconfig"},		  1009, -1, -1, 24, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
+{ 1255, {"proacl"},			  1034, -1, -1, 25, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
+{ 1255, {"prodataaccess"},		18, -1, 1, 26, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }
 
 DATA(insert ( 1255 proname			19 -1 NAMEDATALEN	1 0 -1 -1 f p i t f f t 0));
 DATA(insert ( 1255 pronamespace		26 -1 4   2 0 -1 -1 t p i t f f t 0));
@@ -380,8 +381,9 @@ DATA(insert ( 1255 proargnames	  1009 -1 -1 20 1 -1 -1 f x i f f f t 0));
 DATA(insert ( 1255 proargdefaults	25 -1 -1 21 0 -1 -1 f x i f f f t 0));
 DATA(insert ( 1255 prosrc			25 -1 -1 22 0 -1 -1 f x i f f f t 0));
 DATA(insert ( 1255 probin			17 -1 -1 23 0 -1 -1 f x i f f f t 0));
-DATA(insert ( 1255 proacl		  1034 -1 -1 24 1 -1 -1 f x i f f f t 0));
-DATA(insert ( 1255 prodataaccess	18 -1 1  25 0 -1 -1 t p c t f f t 0));
+DATA(insert ( 1255 proconfig	  1009 -1 -1 24 1 -1 -1 f x i f f f t 0));
+DATA(insert ( 1255 proacl		  1034 -1 -1 25 1 -1 -1 f x i f f f t 0));
+DATA(insert ( 1255 prodataaccess	18 -1 1  26 0 -1 -1 t p c t f f t 0));
 DATA(insert ( 1255 ctid				27 0  6  -1 0 -1 -1 f p s t f f t 0));
 DATA(insert ( 1255 oid				26 0  4  -2 0 -1 -1 t p i t f f t 0));
 DATA(insert ( 1255 xmin				28 0  4  -3 0 -1 -1 t p i t f f t 0));
@@ -531,11 +533,13 @@ DATA(insert ( 1259 gp_segment_id   23 0  4  -8 0 -1 -1 t p i t f f t 0));
 { 0, {"indisprimary"},		16, -1, 1, 5, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \
 { 0, {"indisclustered"},	16, -1, 1, 6, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \
 { 0, {"indisvalid"},		16, -1, 1, 7, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \
-{ 0, {"indkey"},			22, -1, -1, 8, 1, -1, -1, false, 'p', 'i', true, false, false, true, 0 }, \
-{ 0, {"indclass"},			30, -1, -1, 9, 1, -1, -1, false, 'p', 'i', true, false, false, true, 0 }, \
-{ 0, {"indoption"},			22, -1, -1, 10, 1, -1, -1, false, 'p', 'i', true, false, false, true, 0 }, \
-{ 0, {"indexprs"},			25, -1, -1, 11, 0, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
-{ 0, {"indpred"},			25, -1, -1, 12, 0, -1, -1, false, 'x', 'i', false, false, false, true, 0 }
+{ 0, {"indcheckxmin"},		16, -1, 1, 8, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \
+{ 0, {"indisready"},		16, -1, 1, 9, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \
+{ 0, {"indkey"},			22, -1, -1, 10, 1, -1, -1, false, 'p', 'i', true, false, false, true, 0 }, \
+{ 0, {"indclass"},			30, -1, -1, 11, 1, -1, -1, false, 'p', 'i', true, false, false, true, 0 }, \
+{ 0, {"indoption"},			22, -1, -1, 12, 1, -1, -1, false, 'p', 'i', true, false, false, true, 0 }, \
+{ 0, {"indexprs"},			25, -1, -1, 13, 0, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \
+{ 0, {"indpred"},			25, -1, -1, 14, 0, -1, -1, false, 'x', 'i', false, false, false, true, 0 }
 
 
 /* -----------------------------------------------
diff --git a/src/include/catalog/pg_auth_members.h b/src/include/catalog/pg_auth_members.h
index 9a95ecfc0d2a..9f8b31aeca36 100644
--- a/src/include/catalog/pg_auth_members.h
+++ b/src/include/catalog/pg_auth_members.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_auth_members.h,v 1.3 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_auth_members.h,v 1.4 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_authid.h b/src/include/catalog/pg_authid.h
index ef05337d875f..79f0b64d2a28 100644
--- a/src/include/catalog/pg_authid.h
+++ b/src/include/catalog/pg_authid.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_authid.h,v 1.6 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_authid.h,v 1.7 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_autovacuum.h b/src/include/catalog/pg_autovacuum.h
index f04f34702ee6..7cf8a754ffa7 100644
--- a/src/include/catalog/pg_autovacuum.h
+++ b/src/include/catalog/pg_autovacuum.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_autovacuum.h,v 1.6 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_autovacuum.h,v 1.8 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,16 +46,16 @@
 #define AutovacuumRelationId	1248
 CATALOG(pg_autovacuum,1248) BKI_WITHOUT_OIDS
 {
-	Oid			vacrelid;			/* OID of table */
-	bool		enabled;			/* enabled for this table? */
+	Oid			vacrelid;		/* OID of table */
+	bool		enabled;		/* enabled for this table? */
 	int4		vac_base_thresh;	/* base threshold value */
-	float4		vac_scale_factor;	/* reltuples scaling factor */
+	float4		vac_scale_factor;		/* reltuples scaling factor */
 	int4		anl_base_thresh;	/* base threshold value */
-	float4		anl_scale_factor;	/* reltuples scaling factor */
-	int4		vac_cost_delay;		/* vacuum cost-based delay */
-	int4		vac_cost_limit;		/* vacuum cost limit */
-	int4		freeze_min_age;		/* vacuum min freeze age */
-	int4		freeze_max_age;		/* max age before forcing vacuum */
+	float4		anl_scale_factor;		/* reltuples scaling factor */
+	int4		vac_cost_delay; /* vacuum cost-based delay */
+	int4		vac_cost_limit; /* vacuum cost limit */
+	int4		freeze_min_age; /* vacuum min freeze age */
+	int4		freeze_max_age; /* max age before forcing vacuum */
 } FormData_pg_autovacuum;
 
 /* ----------------
diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h
index 7723e98dfd5c..02d948b5f4c1 100644
--- a/src/include/catalog/pg_cast.h
+++ b/src/include/catalog/pg_cast.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 2006-2010, Greenplum inc
  * Copyright (c) 2002-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_cast.h,v 1.31 2007/02/03 14:06:55 petere Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_cast.h,v 1.38 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -198,11 +198,25 @@ DATA(insert (	21 2206  313 i ));
 DATA(insert (	23 2206    0 i ));
 DATA(insert ( 2206	 20 1288 a ));
 DATA(insert ( 2206	 23    0 a ));
+DATA(insert (	26 3734    0 i ));
+DATA(insert ( 3734	 26    0 i ));
+DATA(insert (	20 3734 1287 i ));
+DATA(insert (	21 3734  313 i ));
+DATA(insert (	23 3734    0 i ));
+DATA(insert ( 3734	 20 1288 a ));
+DATA(insert ( 3734	 23    0 a ));
+DATA(insert (	26 3769    0 i ));
+DATA(insert ( 3769	 26    0 i ));
+DATA(insert (	20 3769 1287 i ));
+DATA(insert (	21 3769  313 i ));
+DATA(insert (	23 3769    0 i ));
+DATA(insert ( 3769	 20 1288 a ));
+DATA(insert ( 3769	 23    0 a ));
 DATA(insert (	25 2205 1079 i ));
 DATA(insert ( 1043 2205 1079 i ));
 
 /*
- * String category: this needs to be tightened up
+ * String category
  */
 DATA(insert (	25 1042    0 i ));
 DATA(insert (	25 1043    0 i ));
@@ -222,7 +236,8 @@ DATA(insert ( 1043	 18  944 a ));
 DATA(insert (	25	 19  407 i ));
 DATA(insert ( 1042	 19  409 i ));
 DATA(insert ( 1043	 19 1400 i ));
-/* Cross-category casts between int4 and "char" */
+
+/* Allow explicit coercions between int4 and "char" */
 DATA(insert (	18	 23   77 e ));
 DATA(insert (	23	 18   78 e ));
 
@@ -294,123 +309,42 @@ DATA(insert ( 1560	 23 1684 e ));
 /*
  * Cross-category casts to and from TEXT
  *
- * For historical reasons, most casts to TEXT are implicit.  This is BAD
- * and should be reined in.
+ * We need entries here only for a few specialized cases where the behavior
+ * of the cast function differs from the datatype's I/O functions.  Otherwise,
+ * parse_coerce.c will generate CoerceViaIO operations without any prompting.
+ *
+ * Note that the castcontext values specified here should be no stronger than
+ * parse_coerce.c's automatic casts ('a' to text, 'e' from text) else odd
+ * behavior will ensue when the automatic cast is applied instead of the
+ * pg_cast entry!
  */
-DATA(insert (	20	 25 1289 i ));
-DATA(insert (	25	 20 1290 e ));
-DATA(insert (	21	 25  113 i ));
-DATA(insert (	25	 21  818 e ));
-DATA(insert (	23	 25  112 i ));
-DATA(insert (	25	 23  819 e ));
-DATA(insert (	26	 25  114 i ));
-DATA(insert (	25	 26  817 e ));
-DATA(insert (	25	650 1714 e ));
-DATA(insert (  700	 25  841 i ));
-DATA(insert (	25	700  839 e ));
-DATA(insert (  701	 25  840 i ));
-DATA(insert (	25	701  838 e ));
-DATA(insert (  829	 25  752 e ));
-DATA(insert (	25	829  767 e ));
-DATA(insert (  650	 25  730 e ));
-DATA(insert (  869	 25  730 e ));
-DATA(insert (	25	869 1713 e ));
-DATA(insert ( 1082	 25  749 i ));
-DATA(insert (	25 1082  748 e ));
-DATA(insert ( 1083	 25  948 i ));
-DATA(insert (	25 1083  837 e ));
-DATA(insert ( 1114	 25 2034 i ));
-DATA(insert (	25 1114 2022 e ));
-DATA(insert ( 1184	 25 1192 i ));
-DATA(insert (	25 1184 1191 e ));
-DATA(insert ( 1186	 25 1193 i ));
-DATA(insert (	25 1186 6117 e ));
-DATA(insert ( 1266	 25  939 i ));
-DATA(insert (	25 1266  938 e ));
-DATA(insert ( 1700	 25 1688 i ));
-DATA(insert (	25 1700 1686 e ));
-DATA(insert (  142   25 2922 e ));
-DATA(insert (   25  142	2896 e ));
+DATA(insert (  650	 25  730 a ));
+DATA(insert (  869	 25  730 a ));
+DATA(insert (	16	 25 2971 a ));
+DATA(insert (  142	 25    0 a ));
+DATA(insert (	25	142 2896 e ));
 
 /*
  * Cross-category casts to and from VARCHAR
  *
- * We support all the same casts as for TEXT, but none are implicit.
+ * We support all the same casts as for TEXT.
  */
-DATA(insert (	20 1043 1289 a ));
-DATA(insert ( 1043	 20 1290 e ));
-DATA(insert (	21 1043  113 a ));
-DATA(insert ( 1043	 21  818 e ));
-DATA(insert (	23 1043  112 a ));
-DATA(insert ( 1043	 23  819 e ));
-DATA(insert (	26 1043  114 a ));
-DATA(insert ( 1043	 26  817 e ));
-DATA(insert ( 1043	650 1714 e ));
-DATA(insert (  700 1043  841 a ));
-DATA(insert ( 1043	700  839 e ));
-DATA(insert (  701 1043  840 a ));
-DATA(insert ( 1043	701  838 e ));
-DATA(insert (  829 1043  752 e ));
-DATA(insert ( 1043	829  767 e ));
-DATA(insert (  650 1043  730 e ));
-DATA(insert (  869 1043  730 e ));
-DATA(insert ( 1043	869 1713 e ));
-DATA(insert ( 1082 1043  749 a ));
-DATA(insert ( 1043 1082  748 e ));
-DATA(insert ( 1083 1043  948 a ));
-DATA(insert ( 1043 1083  837 e ));
-DATA(insert ( 1114 1043 2034 a ));
-DATA(insert ( 1043 1114 2022 e ));
-DATA(insert ( 1184 1043 1192 a ));
-DATA(insert ( 1043 1184 1191 e ));
-DATA(insert ( 1186 1043 1193 a ));
-DATA(insert ( 1043 1186 6117 e ));
-DATA(insert ( 1266 1043  939 a ));
-DATA(insert ( 1043 1266  938 e ));
-DATA(insert ( 1700 1043 1688 a ));
-DATA(insert ( 1043 1700 1686 e ));
-DATA(insert (  142 1043 2922 e ));
-DATA(insert ( 1043  142 2896 e ));
+DATA(insert (  650 1043  730 a ));
+DATA(insert (  869 1043  730 a ));
+DATA(insert (	16 1043 2971 a ));
+DATA(insert (  142 1043    0 a ));
+DATA(insert ( 1043	142 2896 e ));
 
 /*
  * Cross-category casts to and from BPCHAR
  *
- * A function supporting cast to TEXT/VARCHAR can be used for cast to BPCHAR,
- * but the other direction is okay only if the function treats trailing
- * blanks as insignificant.  So this is a subset of the VARCHAR list.
- * (Arguably the holdouts should be fixed, but I'm not doing that now...)
+ * We support all the same casts as for TEXT.
  */
-DATA(insert (	20 1042 1289 a ));
-DATA(insert ( 1042	 20 1290 e ));
-DATA(insert (	21 1042  113 a ));
-DATA(insert ( 1042	 21  818 e ));
-DATA(insert (	23 1042  112 a ));
-DATA(insert ( 1042	 23  819 e ));
-DATA(insert (	26 1042  114 a ));
-DATA(insert ( 1042	 26  817 e ));
-DATA(insert (  700 1042  841 a ));
-DATA(insert ( 1042	700  839 e ));
-DATA(insert (  701 1042  840 a ));
-DATA(insert ( 1042	701  838 e ));
-DATA(insert (  829 1042  752 e ));
-DATA(insert ( 1042	829  767 e ));
-DATA(insert (  650 1042  730 e ));
-DATA(insert (  869 1042  730 e ));
-DATA(insert ( 1082 1042  749 a ));
-DATA(insert ( 1042 1082  748 e ));
-DATA(insert ( 1083 1042  948 a ));
-DATA(insert ( 1042 1083  837 e ));
-DATA(insert ( 1114 1042 2034 a ));
-DATA(insert ( 1042 1114 2022 e ));
-DATA(insert ( 1184 1042 1192 a ));
-DATA(insert ( 1042 1184 1191 e ));
-DATA(insert ( 1186 1042 1193 a ));
-DATA(insert ( 1042 1186 6117 e ));
-DATA(insert ( 1266 1042  939 a ));
-DATA(insert ( 1042 1266  938 e ));
-DATA(insert ( 1700 1042 1688 a ));
-DATA(insert ( 1042 1700 1686 e ));
-DATA(insert (  142 1042 2922 e ));
+DATA(insert (  650 1042  730 a ));
+DATA(insert (  869 1042  730 a ));
+DATA(insert (	16 1042 2971 a ));
+DATA(insert (  142 1042    0 a ));
+DATA(insert ( 1042	142 2896 e ));
 
 /*
  * Length-coercion functions
@@ -426,12 +360,6 @@ DATA(insert ( 1560 1560 1685 i ));
 DATA(insert ( 1562 1562 1687 i ));
 DATA(insert ( 1700 1700 1703 i ));
 
-/* casts to and from uuid */ 
-DATA(insert (   25 2950 2964 a ));
-DATA(insert ( 2950   25 2965 a ));
-DATA(insert ( 1043 2950 2964 a ));
-DATA(insert ( 2950 1043 2965 a ));
-
 /* complex type */
 DATA(insert OID=9069 (701  195 3584 i));
 DATA(insert OID=9070 (700  195 3585 i));
@@ -441,19 +369,14 @@ DATA(insert OID=9090 (21   195 3588 i));
 DATA(insert OID=9091 (600  195 0 e));
 DATA(insert OID=9092 (195  600 0 e));
 DATA(insert OID=9093 (1700 195 3592 i));
+
 /*
  * CDB: Allow explicit cast from tid to int8
  */
 DATA(insert (   27   20 6021 e ));
 
-/* 
- * CASTS created after 3.x must have fixed oids otherwise upgrade will not work
- * correctly. 
- */
-
 /* GP: Allow explicit cast between tid and aotid. */
-DATA(insert OID = 9901 (	27 3300    0 e ));
-DATA(insert OID = 9902 ( 3300	 27    0 e ));
-
+DATA(insert (	27 3300    0 e ));
+DATA(insert ( 3300	 27    0 e ));
 
 #endif   /* PG_CAST_H */
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 9210fa520c2c..1cc51526c2dc 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_class.h,v 1.100 2007/01/22 01:35:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_class.h,v 1.104 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -123,7 +123,7 @@ CATALOG(pg_class,1259) BKI_BOOTSTRAP
 	bool		relhaspkey;		/* has PRIMARY KEY index */
 	bool		relhasrules;	/* has associated rules */
 	bool		relhassubclass; /* has derived classes */
-	TransactionId relfrozenxid;	/* all Xids < this are frozen in this rel */
+	TransactionId relfrozenxid; /* all Xids < this are frozen in this rel */
 
 	/*
 	 * VARIABLE LENGTH FIELDS start here.  These fields may be NULL, too.
@@ -199,7 +199,7 @@ DATA(insert OID = 1247 (  pg_type		PGNSP 71 PGUID 0 1247 0 0 0 0 0 0 0 f f r h 2
 DESCR("");
 DATA(insert OID = 1249 (  pg_attribute	PGNSP 75 PGUID 0 1249 0 0 0 0 0 0 0 f f r h 17 0 0 0 0 0 f f f f 3 _null_ _null_ ));
 DESCR("");
-DATA(insert OID = 1255 (  pg_proc		PGNSP 81 PGUID 0 1255 0 0 0 0 0 0 0 f f r h 25 0 0 0 0 0 t f f f 3 _null_ _null_ ));
+DATA(insert OID = 1255 (  pg_proc		PGNSP 81 PGUID 0 1255 0 0 0 0 0 0 0 f f r h 26 0 0 0 0 0 t f f f 3 _null_ _null_ ));
 DESCR("");
 DATA(insert OID = 1259 (  pg_class		PGNSP 83 PGUID 0 1259 0 0 0 0 0 0 0 f f r h 30 0 0 0 0 0 t f f f 3 _null_ _null_ ));
 DESCR("");
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index e8c1dc03e3c5..5f63ce8c02ce 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_constraint.h,v 1.25 2007/02/14 01:58:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_constraint.h,v 1.27 2008/01/17 18:56:54 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -235,6 +235,7 @@ extern Oid CreateConstraintEntry(const char *constraintName,
 								 const char *conSrc);
 
 extern void RemoveConstraintById(Oid conId);
+extern void RenameConstraintById(Oid conId, const char *newname);
 
 extern bool ConstraintNameIsUsed(ConstraintCategory conCat, Oid objId,
 					 Oid objNamespace, const char *conname);
diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h
index 2f530af687b1..58b4a0c205dc 100644
--- a/src/include/catalog/pg_control.h
+++ b/src/include/catalog/pg_control.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.38 2007/05/20 21:08:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.39 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
  * The first three digits is the PostgreSQL version number. The last
  * four digits indicates the GPDB version.
  */
-#define PG_CONTROL_VERSION	8310500
+#define PG_CONTROL_VERSION	8330500
 
 /*
  * Body of CheckPoint XLOG records.  This is declared here because we keep
@@ -37,9 +37,6 @@ typedef struct CheckPoint
 {
 	XLogRecPtr	redo;			/* next RecPtr available when we began to
 								 * create CheckPoint (i.e. REDO start point) */
-	XLogRecPtr	undo;			/* first record of oldest in-progress
-								 * transaction when we started (i.e. UNDO end
-								 * point) */
 	TimeLineID	ThisTimeLineID; /* current TLI */
 	uint32		nextXidEpoch;	/* higher-order bits of nextXid */
 	TransactionId nextXid;		/* next free XID */
@@ -176,6 +173,8 @@ typedef struct ControlFileData
 	uint32		nameDataLen;	/* catalog name field width */
 	uint32		indexMaxKeys;	/* max number of columns in an index */
 
+	uint32		toast_max_chunk_size;	/* chunk size in TOAST tables */
+
 	/* flag indicating internal format of timestamp, interval, time */
 	uint32		enableIntTimes; /* int64 storage enabled? */
 
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 9b053c629a92..edcb8d8af697 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_conversion.h,v 1.19 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_conversion.h,v 1.20 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index beb5e10491d6..83a43f6c668e 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_database.h,v 1.43 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_database.h,v 1.46 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -64,7 +64,7 @@ CATALOG(pg_database,1262) BKI_SHARED_RELATION
 	bool		datallowconn;	/* new connections allowed? */
 	int4		datconnlimit;	/* max connections allowed (-1=no limit) */
 	Oid			datlastsysoid;	/* highest OID to consider a system OID */
-	TransactionId datfrozenxid;	/* all Xids < this are frozen in this DB */
+	TransactionId datfrozenxid; /* all Xids < this are frozen in this DB */
 	Oid			dattablespace;	/* default table space for this DB */
 	text		datconfig[1];	/* database-specific GUC (VAR LENGTH) */
 	aclitem		datacl[1];		/* access permissions (VAR LENGTH) */
@@ -95,7 +95,7 @@ typedef FormData_pg_database *Form_pg_database;
 #define Anum_pg_database_datacl			11
 
 DATA(insert OID = 1 (  template1 PGUID ENCODING t t -1 0 0 1663 _null_ _null_ ));
-SHDESCR("Default template database");
+SHDESCR("default template database");
 #define TemplateDbOid			1
 
 #define Schema_pg_database \
diff --git a/src/include/catalog/pg_depend.h b/src/include/catalog/pg_depend.h
index 838a8490f64c..e53dae1b5b1c 100644
--- a/src/include/catalog/pg_depend.h
+++ b/src/include/catalog/pg_depend.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_depend.h,v 1.8 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_depend.h,v 1.9 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h
index 97b61e955fbb..afa6597a0bc1 100644
--- a/src/include/catalog/pg_description.h
+++ b/src/include/catalog/pg_description.h
@@ -22,7 +22,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_description.h,v 1.25 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_description.h,v 1.26 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_enum.h b/src/include/catalog/pg_enum.h
new file mode 100644
index 000000000000..96945eece70a
--- /dev/null
+++ b/src/include/catalog/pg_enum.h
@@ -0,0 +1,91 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_enum.h
+ *	  definition of the system "enum" relation (pg_enum)
+ *	  along with the relation's initial contents.
+ *
+ *
+ * Copyright (c) 2006-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/catalog/pg_enum.h,v 1.3 2008/01/01 19:45:56 momjian Exp $
+ *
+ * NOTES
+ *	  the genbki.sh script reads this file and generates .bki
+ *	  information from the DATA() statements.
+ *
+ *	  XXX do NOT break up DATA() statements into multiple lines!
+ *		  the scripts are not as smart as you might think...
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_ENUM_H
+#define PG_ENUM_H
+
+#include "catalog/genbki.h"
+#include "nodes/pg_list.h"
+
+/* ----------------
+ *		postgres.h contains the system type definitions and the
+ *		CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file
+ *		can be read by both genbki.sh and the C compiler.
+ * ----------------
+ */
+
+/* TIDYCAT_BEGINFAKEDEF
+
+   CREATE TABLE pg_enum
+   with (relid=3501)
+   (
+   enumtypid       oid,
+   enumlabel       name
+   );
+
+   create index on pg_enum(oid) with (indexid=3502, CamelCase=EnumOidIndexId);
+   create unique index on pg_enum(enumtypid, enumlabel) with (indexid=3503, CamelCase=EnumTypIdLabel);
+
+   alter table pg_enum add fk enumtypid on pg_type(oid);
+
+   TIDYCAT_ENDFAKEDEF
+*/
+
+
+/* ----------------
+ *		pg_enum definition.  cpp turns this into
+ *		typedef struct FormData_pg_enum
+ * ----------------
+ */
+#define EnumRelationId	3501
+
+CATALOG(pg_enum,3501)
+{
+	Oid			enumtypid;		/* OID of owning enum type */
+	NameData	enumlabel;		/* text representation of enum value */
+} FormData_pg_enum;
+
+/* ----------------
+ *		Form_pg_enum corresponds to a pointer to a tuple with
+ *		the format of pg_enum relation.
+ * ----------------
+ */
+typedef FormData_pg_enum *Form_pg_enum;
+
+/* ----------------
+ *		compiler constants for pg_enum
+ * ----------------
+ */
+#define Natts_pg_enum					2
+#define Anum_pg_enum_enumtypid			1
+#define Anum_pg_enum_enumlabel			2
+
+/* ----------------
+ *		pg_enum has no initial contents
+ * ----------------
+ */
+
+/*
+ * prototypes for functions in pg_enum.c
+ */
+extern void EnumValuesCreate(Oid enumTypeOid, List *vals, List **valOids);
+extern void EnumValuesDelete(Oid enumTypeOid);
+
+#endif   /* PG_ENUM_H */
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 2bc30d0ab9e5..f535c452d407 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_index.h,v 1.43 2007/01/09 02:14:15 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_index.h,v 1.45 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -33,6 +33,8 @@
    indisprimary    boolean    ,
    indisclustered  boolean    ,
    indisvalid      boolean    ,
+   indcheckxmin    boolean    ,
+   indisready      boolean    ,
    indkey          int2vector ,
    indclass        oidvector  ,
    indoption       int2vector ,
@@ -66,6 +68,8 @@ CATALOG(pg_index,2610) BKI_WITHOUT_OIDS
 	bool		indisprimary;	/* is this index for primary key? */
 	bool		indisclustered; /* is this the index last clustered by? */
 	bool		indisvalid;		/* is this index valid for use by queries? */
+	bool		indcheckxmin;	/* must we wait for xmin to be old? */
+	bool		indisready;		/* is this index ready for inserts? */
 
 	/* VARIABLE LENGTH FIELDS: */
 	int2vector	indkey;			/* column numbers of indexed cols, or 0 */
@@ -89,7 +93,7 @@ typedef FormData_pg_index *Form_pg_index;
  *		compiler constants for pg_index
  * ----------------
  */
-#define Natts_pg_index					12
+#define Natts_pg_index					14
 #define Anum_pg_index_indexrelid		1
 #define Anum_pg_index_indrelid			2
 #define Anum_pg_index_indnatts			3
@@ -97,11 +101,13 @@ typedef FormData_pg_index *Form_pg_index;
 #define Anum_pg_index_indisprimary		5
 #define Anum_pg_index_indisclustered	6
 #define Anum_pg_index_indisvalid		7
-#define Anum_pg_index_indkey			8
-#define Anum_pg_index_indclass			9
-#define Anum_pg_index_indoption			10
-#define Anum_pg_index_indexprs			11
-#define Anum_pg_index_indpred			12
+#define Anum_pg_index_indcheckxmin		8
+#define Anum_pg_index_indisready		9
+#define Anum_pg_index_indkey			10
+#define Anum_pg_index_indclass			11
+#define Anum_pg_index_indoption			12
+#define Anum_pg_index_indexprs			13
+#define Anum_pg_index_indpred			14
 
 /*
  * Index AMs that support ordered scans must support these two indoption
@@ -111,4 +117,12 @@ typedef FormData_pg_index *Form_pg_index;
 #define INDOPTION_DESC			0x0001	/* values are in reverse order */
 #define INDOPTION_NULLS_FIRST	0x0002	/* NULLs are first instead of last */
 
+/*
+ * Use of these macros is recommended over direct examination of the state
+ * flag columns where possible; this allows source code compatibility with
+ * 9.2 and up.
+ */
+#define IndexIsValid(indexForm) ((indexForm)->indisvalid)
+#define IndexIsReady(indexForm) ((indexForm)->indisready)
+
 #endif   /* PG_INDEX_H */
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index a1f0f0181a86..ad9a8c2cd721 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_inherits.h,v 1.23 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_inherits.h,v 1.24 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index 37f26ae00738..e21b487b0fc0 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_language.h,v 1.29 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_language.h,v 1.32 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -27,6 +27,7 @@
    with (relid=2612)
    ( 
    lanname        name, 
+   lanowner       oid, 
    lanispl        boolean, -- Is a procedural language
    lanpltrusted   boolean, -- PL is trusted
    lanplcallfoid  oid,     -- Call handler for PL
@@ -40,6 +41,7 @@
 
    alter table pg_language add fk lanplcallfoid on pg_proc(oid);
    alter table pg_language add fk lanvalidator on pg_proc(oid);
+   alter table pg_language add fk lanowner on pg_authid(oid);
 
    TIDYCAT_ENDDEF
 */
@@ -67,7 +69,8 @@
 
 CATALOG(pg_language,2612)
 {
- 	NameData	lanname;		
+	NameData	lanname;		/* Language name */
+	Oid			lanowner;		/* Language's owner */
 	bool		lanispl;		/* Is a procedural language */
 	bool		lanpltrusted;	/* PL is trusted */
 	Oid			lanplcallfoid;	/* Call handler for PL */
@@ -89,14 +92,15 @@ typedef FormData_pg_language *Form_pg_language;
  *		compiler constants for pg_language
  * ----------------
  */
-#define Natts_pg_language				7
+#define Natts_pg_language				8
 #define Anum_pg_language_lanname		1
-#define Anum_pg_language_lanispl		2
-#define Anum_pg_language_lanpltrusted	3
-#define Anum_pg_language_lanplcallfoid	4
-#define Anum_pg_language_laninline		5
-#define Anum_pg_language_lanvalidator	6
-#define Anum_pg_language_lanacl			7
+#define Anum_pg_language_lanowner		2
+#define Anum_pg_language_lanispl		3
+#define Anum_pg_language_lanpltrusted	4
+#define Anum_pg_language_lanplcallfoid	5
+#define Anum_pg_language_laninline		6
+#define Anum_pg_language_lanvalidator	7
+#define Anum_pg_language_lanacl			8
 
 
 /* TIDYCAT_END_CODEGEN */
@@ -107,13 +111,13 @@ typedef FormData_pg_language *Form_pg_language;
  * ----------------
  */
 
-DATA(insert OID = 12 ( "internal" f f 0 0 2246 _null_ ));
-DESCR("Built-in functions");
+DATA(insert OID = 12 ( "internal" PGUID f f 0 0 2246 _null_ ));
+DESCR("built-in functions");
 #define INTERNALlanguageId 12
-DATA(insert OID = 13 ( "c" f f 0 0 2247 _null_ ));
-DESCR("Dynamically-loaded C functions");
+DATA(insert OID = 13 ( "c" PGUID f f 0 0 2247 _null_ ));
+DESCR("dynamically-loaded C functions");
 #define ClanguageId 13
-DATA(insert OID = 14 ( "sql" f t 0 0 2248 _null_ ));
+DATA(insert OID = 14 ( "sql" PGUID f t 0 0 2248 _null_ ));
 DESCR("SQL-language functions");
 #define SQLlanguageId 14
 
diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h
index 9786faa3b864..db3e33727c66 100644
--- a/src/include/catalog/pg_largeobject.h
+++ b/src/include/catalog/pg_largeobject.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_largeobject.h,v 1.21 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_largeobject.h,v 1.22 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h
index b59a316253b6..190b647e2e32 100644
--- a/src/include/catalog/pg_listener.h
+++ b/src/include/catalog/pg_listener.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_listener.h,v 1.22 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_listener.h,v 1.23 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_namespace.h b/src/include/catalog/pg_namespace.h
index 71db5ce1952c..b1308641c4d8 100644
--- a/src/include/catalog/pg_namespace.h
+++ b/src/include/catalog/pg_namespace.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_namespace.h,v 1.21 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_namespace.h,v 1.23 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -105,16 +105,16 @@ typedef FormData_pg_namespace *Form_pg_namespace;
  */
 
 DATA(insert OID = 11 ( "pg_catalog" PGUID _null_ ));
-DESCR("System catalog schema");
+DESCR("system catalog schema");
 #define PG_CATALOG_NAMESPACE 11
 DATA(insert OID = 99 ( "pg_toast" PGUID _null_ ));
-DESCR("Reserved schema for TOAST tables");
+DESCR("reserved schema for TOAST tables");
 #define PG_TOAST_NAMESPACE 99
 DATA(insert OID = 3012  ( "pg_bitmapindex" PGUID _null_ ));
 DESCR("Reserved schema for internal relations of bitmap indexes");
 #define PG_BITMAPINDEX_NAMESPACE 3012
 DATA(insert OID = 2200 ( "public" PGUID _null_ ));
-DESCR("Standard public schema");
+DESCR("standard public schema");
 #define PG_PUBLIC_NAMESPACE 2200
 DATA(insert OID = 6104 ( "pg_aoseg" PGUID _null_ ));
 DESCR("Reserved schema for Append Only segment list and eof tables");
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index e2d03759fe5a..c5ed888bceba 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -28,7 +28,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_opclass.h,v 1.74 2007/01/28 16:16:52 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_opclass.h,v 1.79 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -160,8 +160,8 @@ DATA(insert (	403		text_ops			PGNSP PGUID 1994   25 t 0 ));
 DATA(insert (	405		text_ops			PGNSP PGUID 1995   25 t 0 ));
 DATA(insert (	403		time_ops			PGNSP PGUID 1996 1083 t 0 ));
 DATA(insert (	405		time_ops			PGNSP PGUID 1997 1083 t 0 ));
-DATA(insert (	403		timestamptz_ops 	PGNSP PGUID  434 1184 t 0 ));
-DATA(insert (	405		timestamptz_ops 	PGNSP PGUID 1999 1184 t 0 ));
+DATA(insert (	403		timestamptz_ops		PGNSP PGUID  434 1184 t 0 ));
+DATA(insert (	405		timestamptz_ops		PGNSP PGUID 1999 1184 t 0 ));
 DATA(insert (	403		timetz_ops			PGNSP PGUID 2000 1266 t 0 ));
 DATA(insert (	405		timetz_ops			PGNSP PGUID 2001 1266 t 0 ));
 DATA(insert (	403		varbit_ops			PGNSP PGUID 2002 1562 t 0 ));
@@ -223,8 +223,15 @@ DATA(insert (	2742	_timestamp_ops		PGNSP PGUID 2745  1115 t 1114 ));
 DATA(insert (	2742	_money_ops			PGNSP PGUID 2745  791 t 790 ));
 DATA(insert (	2742	_reltime_ops		PGNSP PGUID 2745  1024 t 703 ));
 DATA(insert (	2742	_tinterval_ops		PGNSP PGUID 2745  1025 t 704 ));
-DATA(insert (   403     uuid_ops			PGNSP PGUID 2968  2950 t 0 ));
-DATA(insert (   405     uuid_ops			PGNSP PGUID 2969  2950 t 0 ));
+DATA(insert (	403		uuid_ops			PGNSP PGUID 2968  2950 t 0 ));
+DATA(insert (	405		uuid_ops			PGNSP PGUID 2969  2950 t 0 ));
+DATA(insert (	403		enum_ops			PGNSP PGUID 3522  3500 t 0 ));
+DATA(insert (	405		enum_ops			PGNSP PGUID 3523  3500 t 0 ));
+DATA(insert (	403		tsvector_ops		PGNSP PGUID 3626  3614 t 0 ));
+DATA(insert (	783		tsvector_ops		PGNSP PGUID 3655  3614 t 3642 ));
+DATA(insert (	2742	tsvector_ops		PGNSP PGUID 3659  3614 t 25 ));
+DATA(insert (	403		tsquery_ops			PGNSP PGUID 3683  3615 t 0 ));
+DATA(insert (	783		tsquery_ops			PGNSP PGUID 3702  3615 t 20 ));
 
 DATA(insert (	403		xlogloc_ops			PGNSP PGUID 7080  3310 t 0 ));
 
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 270909e6ccac..edf238c6d46c 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_operator.h,v 1.150 2007/02/06 02:59:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_operator.h,v 1.157 2008/01/01 19:45:56 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -152,9 +152,9 @@ DATA(insert OID =  97 ( "<"		   PGNSP PGUID b f f	23	23	16 521 525 int4lt scalar
 DATA(insert OID =  98 ( "="		   PGNSP PGUID b t t	25	25	16	98 531 texteq eqsel eqjoinsel ));
 #define TextEqualOperator 98
 
-DATA(insert OID = 349 (  "||"	   PGNSP PGUID b f f 2277 2283 2277	0 0 array_append   -	   -	 ));
-DATA(insert OID = 374 (  "||"	   PGNSP PGUID b f f 2283 2277 2277	0 0 array_prepend  -	   -	 ));
-DATA(insert OID = 375 (  "||"	   PGNSP PGUID b f f 2277 2277 2277	0 0 array_cat	   -	   -	 ));
+DATA(insert OID = 349 (  "||"	   PGNSP PGUID b f f 2277 2283 2277 0 0 array_append   -	   -	 ));
+DATA(insert OID = 374 (  "||"	   PGNSP PGUID b f f 2283 2277 2277 0 0 array_prepend  -	   -	 ));
+DATA(insert OID = 375 (  "||"	   PGNSP PGUID b f f 2277 2277 2277 0 0 array_cat	   -	   -	 ));
 
 DATA(insert OID = 352 (  "="	   PGNSP PGUID b f t	28	28	16 352	 0 xideq eqsel eqjoinsel ));
 #define XidEqualOperator 352
@@ -308,8 +308,8 @@ DATA(insert OID = 594 (  "*"	   PGNSP PGUID b f f 701 701 701 594	 0 float8mul -
 DATA(insert OID = 595 (  "@"	   PGNSP PGUID l f f	 0 701 701	 0	 0 float8abs - - ));
 DATA(insert OID = 596 (  "|/"	   PGNSP PGUID l f f	 0 701 701	 0	 0 dsqrt - - ));
 DATA(insert OID = 597 (  "||/"	   PGNSP PGUID l f f	 0 701 701	 0	 0 dcbrt - - ));
-DATA(insert OID = 1284 (  "|"	   PGNSP PGUID l f f	 0 704 702	 0   0 tintervalstart - - ));
-DATA(insert OID = 606 (  "<#>"	   PGNSP PGUID b f f 702 702 704	 0   0 mktinterval - - ));
+DATA(insert OID = 1284 (  "|"	   PGNSP PGUID l f f	 0 704 702	 0	 0 tintervalstart - - ));
+DATA(insert OID = 606 (  "<#>"	   PGNSP PGUID b f f 702 702 704	 0	 0 mktinterval - - ));
 
 DATA(insert OID = 607 (  "="	   PGNSP PGUID b t t	26	26	16 607 608 oideq eqsel eqjoinsel ));
 #define OidEqualOperator 607
@@ -340,8 +340,6 @@ DATA(insert OID = 622 (  "<"	   PGNSP PGUID b f f	700  700	16 623 625 float4lt s
 DATA(insert OID = 623 (  ">"	   PGNSP PGUID b f f	700  700	16 622 624 float4gt scalargtsel scalargtjoinsel ));
 DATA(insert OID = 624 (  "<="	   PGNSP PGUID b f f	700  700	16 625 623 float4le scalarltsel scalarltjoinsel ));
 DATA(insert OID = 625 (  ">="	   PGNSP PGUID b f f	700  700	16 624 622 float4ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 626 (  "!!="	   PGNSP PGUID b f f	23	 25		16 0   0	int4notin - - ));
-DATA(insert OID = 627 (  "!!="	   PGNSP PGUID b f f	26	 25		16 0   0	oidnotin - - ));
 DATA(insert OID = 630 (  "<>"	   PGNSP PGUID b f f	18	18		16 630	92	charne neqsel neqjoinsel ));
 
 DATA(insert OID = 631 (  "<"	   PGNSP PGUID b f f	18	18	16 633 634 charlt scalarltsel scalarltjoinsel ));
@@ -421,9 +419,9 @@ DATA(insert OID =  793 (  "<"	   PGNSP PGUID b f f	602  602	 16  794  0 path_n_l
 DATA(insert OID =  794 (  ">"	   PGNSP PGUID b f f	602  602	 16  793  0 path_n_gt - - ));
 DATA(insert OID =  795 (  "<="	   PGNSP PGUID b f f	602  602	 16  796  0 path_n_le - - ));
 DATA(insert OID =  796 (  ">="	   PGNSP PGUID b f f	602  602	 16  795  0 path_n_ge - - ));
-DATA(insert OID =  797 (  "#"	   PGNSP PGUID l f f	0  602	 23    0  0 path_npoints - - ));
+DATA(insert OID =  797 (  "#"	   PGNSP PGUID l f f	0	 602	 23    0  0 path_npoints - - ));
 DATA(insert OID =  798 (  "?#"	   PGNSP PGUID b f f	602  602	 16    0  0 path_inter - - ));
-DATA(insert OID =  799 (  "@-@"    PGNSP PGUID l f f	0  602	701    0  0 path_length - - ));
+DATA(insert OID =  799 (  "@-@"    PGNSP PGUID l f f	0	 602	701    0  0 path_length - - ));
 DATA(insert OID =  800 (  ">^"	   PGNSP PGUID b f f	603  603	 16    0  0 box_above_eq positionsel positionjoinsel ));
 DATA(insert OID =  801 (  "<^"	   PGNSP PGUID b f f	603  603	 16    0  0 box_below_eq positionsel positionjoinsel ));
 DATA(insert OID =  802 (  "?#"	   PGNSP PGUID b f f	603  603	 16    0  0 box_overlap areasel areajoinsel ));
@@ -557,12 +555,12 @@ DATA(insert OID = 1135 (  ">="		PGNSP PGUID b f f  701	700  16 1124 1132 float84
 
 
 /* LIKE hacks by Keith Parks. */
-DATA(insert OID = 1207 (  "~~"	  PGNSP PGUID b f f  19	25	16 0 1208 namelike likesel likejoinsel ));
+DATA(insert OID = 1207 (  "~~"	  PGNSP PGUID b f f  19 25	16 0 1208 namelike likesel likejoinsel ));
 #define OID_NAME_LIKE_OP		1207
-DATA(insert OID = 1208 (  "!~~"   PGNSP PGUID b f f  19	25	16 0 1207 namenlike nlikesel nlikejoinsel ));
-DATA(insert OID = 1209 (  "~~"	  PGNSP PGUID b f f  25	25	16 0 1210 textlike likesel likejoinsel ));
+DATA(insert OID = 1208 (  "!~~"   PGNSP PGUID b f f  19 25	16 0 1207 namenlike nlikesel nlikejoinsel ));
+DATA(insert OID = 1209 (  "~~"	  PGNSP PGUID b f f  25 25	16 0 1210 textlike likesel likejoinsel ));
 #define OID_TEXT_LIKE_OP		1209
-DATA(insert OID = 1210 (  "!~~"   PGNSP PGUID b f f  25	25	16 0 1209 textnlike nlikesel nlikejoinsel ));
+DATA(insert OID = 1210 (  "!~~"   PGNSP PGUID b f f  25 25	16 0 1209 textnlike nlikesel nlikejoinsel ));
 DATA(insert OID = 1211 (  "~~"	  PGNSP PGUID b f f  1042 25	16 0 1212 bpcharlike likesel likejoinsel ));
 #define OID_BPCHAR_LIKE_OP		1211
 DATA(insert OID = 1212 (  "!~~"   PGNSP PGUID b f f  1042 25	16 0 1211 bpcharnlike nlikesel nlikejoinsel ));
@@ -586,9 +584,9 @@ DATA(insert OID = 1322 (  "<"	   PGNSP PGUID b f f 1184 1184	 16 1324 1325 times
 DATA(insert OID = 1323 (  "<="	   PGNSP PGUID b f f 1184 1184	 16 1325 1324 timestamptz_le scalarltsel scalarltjoinsel ));
 DATA(insert OID = 1324 (  ">"	   PGNSP PGUID b f f 1184 1184	 16 1322 1323 timestamptz_gt scalargtsel scalargtjoinsel ));
 DATA(insert OID = 1325 (  ">="	   PGNSP PGUID b f f 1184 1184	 16 1323 1322 timestamptz_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1327 (  "+"	   PGNSP PGUID b f f 1184 1186 1184	 2554 0 timestamptz_pl_interval - - ));
-DATA(insert OID = 1328 (  "-"	   PGNSP PGUID b f f 1184 1184 1186	 0	0 timestamptz_mi - - ));
-DATA(insert OID = 1329 (  "-"	   PGNSP PGUID b f f 1184 1186 1184	 0	0 timestamptz_mi_interval - - ));
+DATA(insert OID = 1327 (  "+"	   PGNSP PGUID b f f 1184 1186 1184  2554 0 timestamptz_pl_interval - - ));
+DATA(insert OID = 1328 (  "-"	   PGNSP PGUID b f f 1184 1184 1186  0	0 timestamptz_mi - - ));
+DATA(insert OID = 1329 (  "-"	   PGNSP PGUID b f f 1184 1186 1184  0	0 timestamptz_mi_interval - - ));
 
 /* interval operators */
 DATA(insert OID = 1330 (  "="	   PGNSP PGUID b t t 1186 1186	 16 1330 1331 interval_eq eqsel eqjoinsel ));
@@ -603,15 +601,15 @@ DATA(insert OID = 1336 (  "-"	   PGNSP PGUID l f f	0 1186 1186    0	0 interval_u
 DATA(insert OID = 1337 (  "+"	   PGNSP PGUID b f f 1186 1186 1186 1337	0 interval_pl - - ));
 DATA(insert OID = 1338 (  "-"	   PGNSP PGUID b f f 1186 1186 1186    0	0 interval_mi - - ));
 
-DATA(insert OID = 1360 (  "+"	   PGNSP PGUID b f f 1082 1083 1114	1363 0 datetime_pl - - ));
-DATA(insert OID = 1361 (  "+"	   PGNSP PGUID b f f 1082 1266 1184	1366 0 datetimetz_pl - - ));
-DATA(insert OID = 1363 (  "+"	   PGNSP PGUID b f f 1083 1082 1114	1360 0 timedate_pl - - ));
-DATA(insert OID = 1366 (  "+"	   PGNSP PGUID b f f 1266 1082 1184	1361 0 timetzdate_pl - - ));
+DATA(insert OID = 1360 (  "+"	   PGNSP PGUID b f f 1082 1083 1114 1363 0 datetime_pl - - ));
+DATA(insert OID = 1361 (  "+"	   PGNSP PGUID b f f 1082 1266 1184 1366 0 datetimetz_pl - - ));
+DATA(insert OID = 1363 (  "+"	   PGNSP PGUID b f f 1083 1082 1114 1360 0 timedate_pl - - ));
+DATA(insert OID = 1366 (  "+"	   PGNSP PGUID b f f 1266 1082 1184 1361 0 timetzdate_pl - - ));
 
-DATA(insert OID = 1399 (  "-"	   PGNSP PGUID b f f 1083 1083 1186	 0	0 time_mi_time - - ));
+DATA(insert OID = 1399 (  "-"	   PGNSP PGUID b f f 1083 1083 1186  0	0 time_mi_time - - ));
 
 /* additional geometric operators - thomas 97/04/18 */
-DATA(insert OID = 1420 (  "@@"	  PGNSP PGUID l f f	 0	718 600   0    0 circle_center - - ));
+DATA(insert OID = 1420 (  "@@"	  PGNSP PGUID l f f  0	718 600   0    0 circle_center - - ));
 DATA(insert OID = 1500 (  "="	  PGNSP PGUID b f f  718	718 16 1500 1501 circle_eq eqsel eqjoinsel ));
 DATA(insert OID = 1501 (  "<>"	  PGNSP PGUID b f f  718	718 16 1501 1500 circle_ne neqsel neqjoinsel ));
 DATA(insert OID = 1502 (  "<"	  PGNSP PGUID b f f  718	718 16 1503 1505 circle_lt areasel areajoinsel ));
@@ -636,7 +634,7 @@ DATA(insert OID = 1518 (  "*"	  PGNSP PGUID b f f  718	600  718	  0    0 circle_
 DATA(insert OID = 1519 (  "/"	  PGNSP PGUID b f f  718	600  718	  0    0 circle_div_pt - - ));
 
 DATA(insert OID = 1520 (  "<->"   PGNSP PGUID b f f  718	718  701   1520    0 circle_distance - - ));
-DATA(insert OID = 1521 (  "#"	  PGNSP PGUID l f f	 0		604   23	  0    0 poly_npoints - - ));
+DATA(insert OID = 1521 (  "#"	  PGNSP PGUID l f f  0		604   23	  0    0 poly_npoints - - ));
 DATA(insert OID = 1522 (  "<->"   PGNSP PGUID b f f  600	718  701	  0    0 dist_pc - - ));
 DATA(insert OID = 1523 (  "<->"   PGNSP PGUID b f f  718	604  701	  0    0 dist_cpoly - - ));
 
@@ -646,8 +644,8 @@ DATA(insert OID = 1524 (  "<->"   PGNSP PGUID b f f  628	603  701	  0  0 dist_lb
 DATA(insert OID = 1525 (  "?#"	  PGNSP PGUID b f f  601	601 16 1525  0 lseg_intersect - - ));
 DATA(insert OID = 1526 (  "?||"   PGNSP PGUID b f f  601	601 16 1526  0 lseg_parallel - - ));
 DATA(insert OID = 1527 (  "?-|"   PGNSP PGUID b f f  601	601 16 1527  0 lseg_perp - - ));
-DATA(insert OID = 1528 (  "?-"	  PGNSP PGUID l f f	 0	601 16	  0  0 lseg_horizontal - - ));
-DATA(insert OID = 1529 (  "?|"	  PGNSP PGUID l f f	 0	601 16	  0  0 lseg_vertical - - ));
+DATA(insert OID = 1528 (  "?-"	  PGNSP PGUID l f f  0	601 16	  0  0 lseg_horizontal - - ));
+DATA(insert OID = 1529 (  "?|"	  PGNSP PGUID l f f  0	601 16	  0  0 lseg_vertical - - ));
 DATA(insert OID = 1535 (  "="	  PGNSP PGUID b f f  601	601 16 1535 1586 lseg_eq eqsel eqjoinsel ));
 DATA(insert OID = 1536 (  "#"	  PGNSP PGUID b f f  601	601  600 1536  0 lseg_interpt - - ));
 DATA(insert OID = 1537 (  "?#"	  PGNSP PGUID b f f  601	628 16	  0  0 inter_sl - - ));
@@ -683,8 +681,8 @@ DATA(insert OID = 1591 (  "@-@"   PGNSP PGUID l f f 0  601	701    0  0 lseg_leng
 DATA(insert OID = 1611 (  "?#"	  PGNSP PGUID b f f  628	628 16 1611  0 line_intersect - - ));
 DATA(insert OID = 1612 (  "?||"   PGNSP PGUID b f f  628	628 16 1612  0 line_parallel - - ));
 DATA(insert OID = 1613 (  "?-|"   PGNSP PGUID b f f  628	628 16 1613  0 line_perp - - ));
-DATA(insert OID = 1614 (  "?-"	  PGNSP PGUID l f f	 0	628 16	  0  0 line_horizontal - - ));
-DATA(insert OID = 1615 (  "?|"	  PGNSP PGUID l f f	 0	628 16	  0  0 line_vertical - - ));
+DATA(insert OID = 1614 (  "?-"	  PGNSP PGUID l f f  0	628 16	  0  0 line_horizontal - - ));
+DATA(insert OID = 1615 (  "?|"	  PGNSP PGUID l f f  0	628 16	  0  0 line_vertical - - ));
 DATA(insert OID = 1616 (  "="	  PGNSP PGUID b f f  628	628 16 1616  0 line_eq eqsel eqjoinsel ));
 DATA(insert OID = 1617 (  "#"	  PGNSP PGUID b f f  628	628  600 1617  0 line_interpt - - ));
 
@@ -724,12 +722,12 @@ DATA(insert OID = 2640 (  "-"	   PGNSP PGUID b f f	869 869  20 0 0 inetmi - - ))
 
 
 /* case-insensitive LIKE hacks */
-DATA(insert OID = 1625 (  "~~*"   PGNSP PGUID b f f  19	25	16 0 1626 nameiclike iclikesel iclikejoinsel ));
+DATA(insert OID = 1625 (  "~~*"   PGNSP PGUID b f f  19 25	16 0 1626 nameiclike iclikesel iclikejoinsel ));
 #define OID_NAME_ICLIKE_OP		1625
-DATA(insert OID = 1626 (  "!~~*"  PGNSP PGUID b f f  19	25	16 0 1625 nameicnlike icnlikesel icnlikejoinsel ));
-DATA(insert OID = 1627 (  "~~*"   PGNSP PGUID b f f  25	25	16 0 1628 texticlike iclikesel iclikejoinsel ));
+DATA(insert OID = 1626 (  "!~~*"  PGNSP PGUID b f f  19 25	16 0 1625 nameicnlike icnlikesel icnlikejoinsel ));
+DATA(insert OID = 1627 (  "~~*"   PGNSP PGUID b f f  25 25	16 0 1628 texticlike iclikesel iclikejoinsel ));
 #define OID_TEXT_ICLIKE_OP		1627
-DATA(insert OID = 1628 (  "!~~*"  PGNSP PGUID b f f  25	25	16 0 1627 texticnlike icnlikesel icnlikejoinsel ));
+DATA(insert OID = 1628 (  "!~~*"  PGNSP PGUID b f f  25 25	16 0 1627 texticnlike icnlikesel icnlikejoinsel ));
 DATA(insert OID = 1629 (  "~~*"   PGNSP PGUID b f f  1042 25	16 0 1630 bpchariclike iclikesel iclikejoinsel ));
 #define OID_BPCHAR_ICLIKE_OP	1629
 DATA(insert OID = 1630 (  "!~~*"  PGNSP PGUID b f f  1042 25	16 0 1629 bpcharicnlike icnlikesel icnlikejoinsel ));
@@ -758,18 +756,18 @@ DATA(insert OID = 1786 (  "<"	  PGNSP PGUID b f f 1560 1560 16 1787 1789 bitlt s
 DATA(insert OID = 1787 (  ">"	  PGNSP PGUID b f f 1560 1560 16 1786 1788 bitgt scalargtsel scalargtjoinsel ));
 DATA(insert OID = 1788 (  "<="	  PGNSP PGUID b f f 1560 1560 16 1789 1787 bitle scalarltsel scalarltjoinsel ));
 DATA(insert OID = 1789 (  ">="	  PGNSP PGUID b f f 1560 1560 16 1788 1786 bitge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 1791 (  "&"	  PGNSP PGUID b f f 1560 1560 1560 1791	 0 bitand - - ));
-DATA(insert OID = 1792 (  "|"	  PGNSP PGUID b f f 1560 1560 1560 1792	 0 bitor - - ));
-DATA(insert OID = 1793 (  "#"	  PGNSP PGUID b f f 1560 1560 1560 1793	 0 bitxor - - ));
+DATA(insert OID = 1791 (  "&"	  PGNSP PGUID b f f 1560 1560 1560 1791  0 bitand - - ));
+DATA(insert OID = 1792 (  "|"	  PGNSP PGUID b f f 1560 1560 1560 1792  0 bitor - - ));
+DATA(insert OID = 1793 (  "#"	  PGNSP PGUID b f f 1560 1560 1560 1793  0 bitxor - - ));
 DATA(insert OID = 1794 (  "~"	  PGNSP PGUID l f f    0 1560 1560	  0  0 bitnot - - ));
 DATA(insert OID = 1795 (  "<<"	  PGNSP PGUID b f f 1560   23 1560	  0  0 bitshiftleft - - ));
 DATA(insert OID = 1796 (  ">>"	  PGNSP PGUID b f f 1560   23 1560	  0  0 bitshiftright - - ));
-DATA(insert OID = 1797 (  "||"	  PGNSP PGUID b f f 1560 1560 1560	  0  0 bitcat - - ));
+DATA(insert OID = 1797 (  "||"	  PGNSP PGUID b f f 1562 1562 1562	  0  0 bitcat - - ));
 
-DATA(insert OID = 1800 (  "+"	   PGNSP PGUID b f f 1083 1186 1083	 1849 0 time_pl_interval - - ));
-DATA(insert OID = 1801 (  "-"	   PGNSP PGUID b f f 1083 1186 1083	 0	0 time_mi_interval - - ));
-DATA(insert OID = 1802 (  "+"	   PGNSP PGUID b f f 1266 1186 1266	 2552 0 timetz_pl_interval - - ));
-DATA(insert OID = 1803 (  "-"	   PGNSP PGUID b f f 1266 1186 1266	 0	0 timetz_mi_interval - - ));
+DATA(insert OID = 1800 (  "+"	   PGNSP PGUID b f f 1083 1186 1083  1849 0 time_pl_interval - - ));
+DATA(insert OID = 1801 (  "-"	   PGNSP PGUID b f f 1083 1186 1083  0	0 time_mi_interval - - ));
+DATA(insert OID = 1802 (  "+"	   PGNSP PGUID b f f 1266 1186 1266  2552 0 timetz_pl_interval - - ));
+DATA(insert OID = 1803 (  "-"	   PGNSP PGUID b f f 1266 1186 1266  0	0 timetz_mi_interval - - ));
 
 DATA(insert OID = 1804 (  "="	  PGNSP PGUID b t f 1562 1562 16 1804 1805 varbiteq eqsel eqjoinsel ));
 #define VarbitEqualOperator 1804
@@ -779,7 +777,7 @@ DATA(insert OID = 1807 (  ">"	  PGNSP PGUID b f f 1562 1562 16 1806 1808 varbitg
 DATA(insert OID = 1808 (  "<="	  PGNSP PGUID b f f 1562 1562 16 1809 1807 varbitle scalarltsel scalarltjoinsel ));
 DATA(insert OID = 1809 (  ">="	  PGNSP PGUID b f f 1562 1562 16 1808 1806 varbitge scalargtsel scalargtjoinsel ));
 
-DATA(insert OID = 1849 (  "+"	   PGNSP PGUID b f f 1186 1083 1083	 1800 0 interval_pl_time - - ));
+DATA(insert OID = 1849 (  "+"	   PGNSP PGUID b f f 1186 1083 1083  1800 0 interval_pl_time - - ));
 
 DATA(insert OID = 1862 ( "="	   PGNSP PGUID b t t	21	20	16 1868  1863 int28eq eqsel eqjoinsel ));
 #define Int28EqualOperator 1862
@@ -836,7 +834,7 @@ DATA(insert OID = 1960 ( ">="	   PGNSP PGUID b f f 17 17	16 1958 1957 byteage sc
 DATA(insert OID = 2016 (  "~~"	   PGNSP PGUID b f f 17 17	16 0	2017 bytealike likesel likejoinsel ));
 #define OID_BYTEA_LIKE_OP		2016
 DATA(insert OID = 2017 (  "!~~"    PGNSP PGUID b f f 17 17	16 0	2016 byteanlike nlikesel nlikejoinsel ));
-DATA(insert OID = 2018 (  "||"	   PGNSP PGUID b f f 17 17	17 0	0    byteacat - - ));
+DATA(insert OID = 2018 (  "||"	   PGNSP PGUID b f f 17 17	17 0	0	 byteacat - - ));
 
 /* timestamp operators */
 DATA(insert OID = 2060 (  "="	   PGNSP PGUID b t t 1114 1114	 16 2060 2061 timestamp_eq eqsel eqjoinsel ));
@@ -846,9 +844,9 @@ DATA(insert OID = 2062 (  "<"	   PGNSP PGUID b f f 1114 1114	 16 2064 2065 times
 DATA(insert OID = 2063 (  "<="	   PGNSP PGUID b f f 1114 1114	 16 2065 2064 timestamp_le scalarltsel scalarltjoinsel ));
 DATA(insert OID = 2064 (  ">"	   PGNSP PGUID b f f 1114 1114	 16 2062 2063 timestamp_gt scalargtsel scalargtjoinsel ));
 DATA(insert OID = 2065 (  ">="	   PGNSP PGUID b f f 1114 1114	 16 2063 2062 timestamp_ge scalargtsel scalargtjoinsel ));
-DATA(insert OID = 2066 (  "+"	   PGNSP PGUID b f f 1114 1186 1114	 2553 0 timestamp_pl_interval - - ));
-DATA(insert OID = 2067 (  "-"	   PGNSP PGUID b f f 1114 1114 1186	 0	0 timestamp_mi - - ));
-DATA(insert OID = 2068 (  "-"	   PGNSP PGUID b f f 1114 1186 1114	 0	0 timestamp_mi_interval - - ));
+DATA(insert OID = 2066 (  "+"	   PGNSP PGUID b f f 1114 1186 1114  2553 0 timestamp_pl_interval - - ));
+DATA(insert OID = 2067 (  "-"	   PGNSP PGUID b f f 1114 1114 1186  0	0 timestamp_mi - - ));
+DATA(insert OID = 2068 (  "-"	   PGNSP PGUID b f f 1114 1186 1114  0	0 timestamp_mi_interval - - ));
 
 /* character-by-character (not collation order) comparison operators for character types */
 
@@ -924,7 +922,7 @@ DATA(insert OID = 2551 (  "+"	   PGNSP PGUID b f f	1186 1082 1114 1076 0 interva
 DATA(insert OID = 2552 (  "+"	   PGNSP PGUID b f f	1186 1266 1266 1802 0 interval_pl_timetz - - ));
 DATA(insert OID = 2553 (  "+"	   PGNSP PGUID b f f	1186 1114 1114 2066 0 interval_pl_timestamp - - ));
 DATA(insert OID = 2554 (  "+"	   PGNSP PGUID b f f	1186 1184 1184 1327 0 interval_pl_timestamptz - - ));
-DATA(insert OID = 2555 (  "+"	   PGNSP PGUID b f f	23   1082 1082 1100 0 integer_pl_date - - ));
+DATA(insert OID = 2555 (  "+"	   PGNSP PGUID b f f	23	 1082 1082 1100 0 integer_pl_date - - ));
 
 /* new operators for Y-direction rtree opfamilies */
 DATA(insert OID = 2570 (  "<<|"    PGNSP PGUID b f f 603 603	16	 0	 0 box_below positionsel positionjoinsel ));
@@ -943,6 +941,10 @@ DATA(insert OID = 2750 (  "&&"	   PGNSP PGUID b f f 2277 2277	16 2750  0 arrayov
 DATA(insert OID = 2751 (  "@>"	   PGNSP PGUID b f f 2277 2277	16 2752  0 arraycontains contsel contjoinsel ));
 DATA(insert OID = 2752 (  "<@"	   PGNSP PGUID b f f 2277 2277	16 2751  0 arraycontained contsel contjoinsel ));
 
+/* capturing operators to preserve pre-8.3 behavior of text concatenation */
+DATA(insert OID = 2779 (  "||"	   PGNSP PGUID b f f 25 2776	25	 0 0 textanycat - - ));
+DATA(insert OID = 2780 (  "||"	   PGNSP PGUID b f f 2776 25	25	 0 0 anytextcat - - ));
+
 /* obsolete names for contains/contained-by operators; remove these someday */
 DATA(insert OID = 2860 (  "@"	   PGNSP PGUID b f f 604 604	16 2861  0 poly_contained contsel contjoinsel ));
 DATA(insert OID = 2861 (  "~"	   PGNSP PGUID b f f 604 604	16 2860  0 poly_contain contsel contjoinsel ));
@@ -957,20 +959,56 @@ DATA(insert OID = 2869 (  "@"	   PGNSP PGUID b f f 600 604	 16  2870  0 pt_conta
 DATA(insert OID = 2870 (  "~"	   PGNSP PGUID b f f 604 600	 16  2869  0 poly_contain_pt - - ));
 DATA(insert OID = 2871 (  "@"	   PGNSP PGUID b f f 600 718	 16  2872  0 pt_contained_circle - - ));
 DATA(insert OID = 2872 (  "~"	   PGNSP PGUID b f f 718 600	 16  2871  0 circle_contain_pt - - ));
-DATA(insert OID = 2873 (  "@"	   PGNSP PGUID b f f 600 628 16	  0  0 on_pl - - ));
-DATA(insert OID = 2874 (  "@"	   PGNSP PGUID b f f 600 601 16	  0  0 on_ps - - ));
-DATA(insert OID = 2875 (  "@"	   PGNSP PGUID b f f 601 628 16	  0  0 on_sl - - ));
-DATA(insert OID = 2876 (  "@"	   PGNSP PGUID b f f 601 603 16	  0  0 on_sb - - ));
+DATA(insert OID = 2873 (  "@"	   PGNSP PGUID b f f 600 628 16   0  0 on_pl - - ));
+DATA(insert OID = 2874 (  "@"	   PGNSP PGUID b f f 600 601 16   0  0 on_ps - - ));
+DATA(insert OID = 2875 (  "@"	   PGNSP PGUID b f f 601 628 16   0  0 on_sl - - ));
+DATA(insert OID = 2876 (  "@"	   PGNSP PGUID b f f 601 603 16   0  0 on_sb - - ));
 DATA(insert OID = 2877 (  "~"	   PGNSP PGUID b f f 1034 1033	 16 0 0 aclcontains - - ));
 
-/* uuid operators */ 
-DATA(insert OID = 2972 (  "="      PGNSP PGUID b t t 2950 2950 16 2972 2973 uuid_eq eqsel eqjoinsel ));
+/* uuid operators */
+DATA(insert OID = 2972 (  "="	   PGNSP PGUID b t t 2950 2950 16 2972 2973 uuid_eq eqsel eqjoinsel ));
 DATA(insert OID = 2973 (  "<>"	   PGNSP PGUID b f f 2950 2950 16 2973 2972 uuid_ne neqsel neqjoinsel ));
 DATA(insert OID = 2974 (  "<"	   PGNSP PGUID b f f 2950 2950 16 2975 2977 uuid_lt scalarltsel scalarltjoinsel ));
 DATA(insert OID = 2975 (  ">"	   PGNSP PGUID b f f 2950 2950 16 2974 2976 uuid_gt scalargtsel scalargtjoinsel ));
 DATA(insert OID = 2976 (  "<="	   PGNSP PGUID b f f 2950 2950 16 2977 2975 uuid_le scalarltsel scalarltjoinsel ));
 DATA(insert OID = 2977 (  ">="	   PGNSP PGUID b f f 2950 2950 16 2976 2974 uuid_ge scalargtsel scalargtjoinsel ));
 
+/* enum operators */
+DATA(insert OID = 3516 (  "="	   PGNSP PGUID b t t 3500 3500 16 3516 3517 enum_eq eqsel eqjoinsel ));
+DATA(insert OID = 3517 (  "<>"	   PGNSP PGUID b f f 3500 3500 16 3517 3516 enum_ne neqsel neqjoinsel ));
+DATA(insert OID = 3518 (  "<"	   PGNSP PGUID b f f 3500 3500 16 3519 3521 enum_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3519 (  ">"	   PGNSP PGUID b f f 3500 3500 16 3518 3520 enum_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3520 (  "<="	   PGNSP PGUID b f f 3500 3500 16 3521 3519 enum_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3521 (  ">="	   PGNSP PGUID b f f 3500 3500 16 3520 3518 enum_ge scalargtsel scalargtjoinsel ));
+
+/*
+ * tsearch operations
+ */
+DATA(insert OID = 3627 (  "<"	   PGNSP PGUID b f f 3614	 3614	 16 3632 3631	 tsvector_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3628 (  "<="	   PGNSP PGUID b f f 3614	 3614	 16 3631 3632	 tsvector_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3629 (  "="	   PGNSP PGUID b t f 3614	 3614	 16 3629 3630	 tsvector_eq eqsel eqjoinsel ));
+DATA(insert OID = 3630 (  "<>"	   PGNSP PGUID b f f 3614	 3614	 16 3630 3629	 tsvector_ne neqsel neqjoinsel ));
+DATA(insert OID = 3631 (  ">="	   PGNSP PGUID b f f 3614	 3614	 16 3628 3627	 tsvector_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3632 (  ">"	   PGNSP PGUID b f f 3614	 3614	 16 3627 3628	 tsvector_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3633 (  "||"	   PGNSP PGUID b f f 3614	 3614	 3614  0	0	 tsvector_concat   -	-	  ));
+DATA(insert OID = 3636 (  "@@"	   PGNSP PGUID b f f 3614	 3615	 16 3637	0	 ts_match_vq   contsel	   contjoinsel	 ));
+DATA(insert OID = 3637 (  "@@"	   PGNSP PGUID b f f 3615	 3614	 16 3636	0	 ts_match_qv   contsel	   contjoinsel	 ));
+DATA(insert OID = 3660 (  "@@@"    PGNSP PGUID b f f 3614	 3615	 16 3661	0	 ts_match_vq   contsel	   contjoinsel	 ));
+DATA(insert OID = 3661 (  "@@@"    PGNSP PGUID b f f 3615	 3614	 16 3660	0	 ts_match_qv   contsel	   contjoinsel	 ));
+DATA(insert OID = 3674 (  "<"	   PGNSP PGUID b f f 3615	 3615	 16 3679 3678	 tsquery_lt scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3675 (  "<="	   PGNSP PGUID b f f 3615	 3615	 16 3678 3679	 tsquery_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3676 (  "="	   PGNSP PGUID b t f 3615	 3615	 16 3676 3677	 tsquery_eq eqsel eqjoinsel ));
+DATA(insert OID = 3677 (  "<>"	   PGNSP PGUID b f f 3615	 3615	 16 3677 3676	 tsquery_ne neqsel neqjoinsel ));
+DATA(insert OID = 3678 (  ">="	   PGNSP PGUID b f f 3615	 3615	 16 3675 3674	 tsquery_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3679 (  ">"	   PGNSP PGUID b f f 3615	 3615	 16 3674 3675	 tsquery_gt scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3680 (  "&&"	   PGNSP PGUID b f f 3615	 3615	 3615  0	0	 tsquery_and   -	-	  ));
+DATA(insert OID = 3681 (  "||"	   PGNSP PGUID b f f 3615	 3615	 3615  0	0	 tsquery_or   -		-	  ));
+DATA(insert OID = 3682 (  "!!"	   PGNSP PGUID l f f 0		 3615	 3615  0	0	 tsquery_not   -	-	  ));
+DATA(insert OID = 3693 (  "@>"	   PGNSP PGUID b f f 3615	 3615	 16 3694	0	 tsq_mcontains	contsel    contjoinsel	 ));
+DATA(insert OID = 3694 (  "<@"	   PGNSP PGUID b f f 3615	 3615	 16 3693	0	 tsq_mcontained contsel    contjoinsel	 ));
+DATA(insert OID = 3762 (  "@@"	   PGNSP PGUID b f f 25		 25		 16    0	0	 ts_match_tt	contsel    contjoinsel	 ));
+DATA(insert OID = 3763 (  "@@"	   PGNSP PGUID b f f 25		 3615	 16    0	0	 ts_match_tq	contsel    contjoinsel	 ));
+
 
 
 /* gpxlogloc operators */
diff --git a/src/include/catalog/pg_opfamily.h b/src/include/catalog/pg_opfamily.h
index 621c744c62fb..efdd910b7c59 100644
--- a/src/include/catalog/pg_opfamily.h
+++ b/src/include/catalog/pg_opfamily.h
@@ -5,10 +5,10 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_opfamily.h,v 1.3 2007/01/28 16:16:52 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_opfamily.h,v 1.7 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -48,7 +48,7 @@
 */
 
 /* ----------------
- *		pg_opfamily definition.	cpp turns this into
+ *		pg_opfamily definition. cpp turns this into
  *		typedef struct FormData_pg_opfamily
  * ----------------
  */
@@ -158,6 +158,13 @@ DATA(insert OID = 2595 (	783		circle_ops		PGNSP PGUID ));
 DATA(insert OID = 2745 (	2742	array_ops		PGNSP PGUID ));
 DATA(insert OID = 2968 (	403		uuid_ops		PGNSP PGUID ));
 DATA(insert OID = 2969 (	405		uuid_ops		PGNSP PGUID ));
+DATA(insert OID = 3522 (	403		enum_ops		PGNSP PGUID ));
+DATA(insert OID = 3523 (	405		enum_ops		PGNSP PGUID ));
+DATA(insert OID = 3626 (	403		tsvector_ops	PGNSP PGUID ));
+DATA(insert OID = 3655 (	783		tsvector_ops	PGNSP PGUID ));
+DATA(insert OID = 3659 (	2742	tsvector_ops	PGNSP PGUID ));
+DATA(insert OID = 3683 (	403		tsquery_ops		PGNSP PGUID ));
+DATA(insert OID = 3702 (	783		tsquery_ops		PGNSP PGUID ));
 
 /* Complex Number type */
 DATA(insert OID = 3221 (	403		complex_ops		PGNSP PGUID ));
diff --git a/src/include/catalog/pg_pltemplate.h b/src/include/catalog/pg_pltemplate.h
index efddd0b0a5b9..f0709e2e18ce 100644
--- a/src/include/catalog/pg_pltemplate.h
+++ b/src/include/catalog/pg_pltemplate.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_pltemplate.h,v 1.3 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_pltemplate.h,v 1.5 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -33,6 +33,7 @@
    (
    tmplname       name, 
    tmpltrusted    boolean, 
+   tmpldbacreate  boolean, 
    tmplhandler    text, 
    tmplinline     text,
    tmplvalidator  text, 
@@ -56,6 +57,7 @@ CATALOG(pg_pltemplate,1136) BKI_SHARED_RELATION BKI_WITHOUT_OIDS
 {
 	NameData	tmplname;		/* name of PL */
 	bool		tmpltrusted;	/* PL is trusted? */
+	bool		tmpldbacreate;	/* PL is installable by db owner? */
 	text		tmplhandler;	/* name of call handler function */
 	text		tmplinline;		/* name of anonymous-block handler, or NULL */
 	text		tmplvalidator;	/* name of validator function, or NULL */
@@ -74,27 +76,30 @@ typedef FormData_pg_pltemplate *Form_pg_pltemplate;
  *		compiler constants for pg_pltemplate
  * ----------------
  */
-#define Natts_pg_pltemplate					7
+#define Natts_pg_pltemplate					8
 #define Anum_pg_pltemplate_tmplname			1
 #define Anum_pg_pltemplate_tmpltrusted		2
-#define Anum_pg_pltemplate_tmplhandler		3
-#define Anum_pg_pltemplate_tmplinline		4
-#define Anum_pg_pltemplate_tmplvalidator	5
-#define Anum_pg_pltemplate_tmpllibrary		6
-#define Anum_pg_pltemplate_tmplacl			7
+#define Anum_pg_pltemplate_tmpldbacreate	3
+#define Anum_pg_pltemplate_tmplhandler		4
+#define Anum_pg_pltemplate_tmplinline		5
+#define Anum_pg_pltemplate_tmplvalidator	6
+#define Anum_pg_pltemplate_tmpllibrary		7
+#define Anum_pg_pltemplate_tmplacl			8
 
 
 /* ----------------
  *		initial contents of pg_pltemplate
  * ----------------
  */
-DATA(insert ( "plpgsql"		t "plpgsql_call_handler" "plpgsql_inline_handler" "plpgsql_validator" "$libdir/plpgsql" _null_ ));
-DATA(insert ( "pltcl"		t "pltcl_call_handler" _null_ _null_ "$libdir/pltcl" _null_ ));
-DATA(insert ( "pltclu"		f "pltclu_call_handler" _null_ _null_ "$libdir/pltcl" _null_ ));
-DATA(insert ( "plperl"		t "plperl_call_handler" "plperl_inline_handler" "plperl_validator" "$libdir/plperl" _null_ ));
-DATA(insert ( "plperlu"		f "plperlu_call_handler" "plperlu_inline_handler" "plperlu_validator" "$libdir/plperl" _null_ ));
-DATA(insert ( "plpythonu"	f "plpython_call_handler" "plpython_inline_handler" _null_ "$libdir/plpython" _null_ ));
-DATA(insert ( "plr"         f "plr_call_handler" _null_ _null_ "$libdir/plr" _null_ ));
-DATA(insert ( "pljava"      t "pljava_call_handler" _null_ _null_ "$libdir/pljava" _null_ ));
-DATA(insert ( "pljavau"     f "pljavau_call_handler" _null_ _null_ "$libdir/pljava" _null_ ));
+DATA(insert ( "plpgsql"		t t "plpgsql_call_handler" "plpgsql_inline_handler" "plpgsql_validator" "$libdir/plpgsql" _null_ ));
+DATA(insert ( "pltcl"		t t "pltcl_call_handler" _null_ _null_ "$libdir/pltcl" _null_ ));
+DATA(insert ( "pltclu"		f f "pltclu_call_handler" _null_ _null_ "$libdir/pltcl" _null_ ));
+DATA(insert ( "plperl"		t t "plperl_call_handler" "plperl_inline_handler" "plperl_validator" "$libdir/plperl" _null_ ));
+DATA(insert ( "plperlu"		f f "plperlu_call_handler" "plperlu_inline_handler" "plperlu_validator" "$libdir/plperl" _null_ ));
+DATA(insert ( "plpythonu"	f f "plpython_call_handler" "plpython_inline_handler" _null_ "$libdir/plpython" _null_ ));
+
+/* Additional languages installed in GPDB */
+DATA(insert ( "plr"         f f "plr_call_handler" _null_ _null_ "$libdir/plr" _null_ ));
+DATA(insert ( "pljava"      t t "pljava_call_handler" _null_ _null_ "$libdir/pljava" _null_ ));
+DATA(insert ( "pljavau"     f f "pljavau_call_handler" _null_ _null_ "$libdir/pljava" _null_ ));
 #endif   /* PG_PLTEMPLATE_H */
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index d088eb915c81..6d112af72726 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.446 2007/02/20 10:00:25 petere Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.482 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -55,6 +55,7 @@
    proargdefaults  text,
    prosrc          text, 
    probin          bytea, 
+   proconfig       text[], 
    proacl          aclitem[],
    prodataaccess   "char"
    );
@@ -109,6 +110,7 @@ CATALOG(pg_proc,1255) BKI_BOOTSTRAP
 								 * defaults (NULL if none) */
 	text		prosrc;			/* procedure source text */
 	bytea		probin;			/* secondary procedure definition field */
+	text		proconfig[1];	/* procedure-local GUC settings */
 	aclitem		proacl[1];		/* access permissions */
 	char		prodataaccess;	/* data access indicator */
 } FormData_pg_proc;
@@ -124,7 +126,7 @@ typedef FormData_pg_proc *Form_pg_proc;
  *		compiler constants for pg_proc
  * ----------------
  */
-#define Natts_pg_proc					25
+#define Natts_pg_proc					26
 #define Anum_pg_proc_proname			1
 #define Anum_pg_proc_pronamespace		2
 #define Anum_pg_proc_proowner			3
@@ -152,8 +154,9 @@ GPDB_COLUMN_DEFAULT(pg_proc_proiswin, f);
 GPDB_COLUMN_DEFAULT(pg_proc_proargdefaults, _null_);
 #define Anum_pg_proc_prosrc				22
 #define Anum_pg_proc_probin				23
-#define Anum_pg_proc_proacl				24
-#define Anum_pg_proc_prodataaccess		25
+#define Anum_pg_proc_proconfig			24
+#define Anum_pg_proc_proacl				25
+#define Anum_pg_proc_prodataaccess		26
 GPDB_COLUMN_DEFAULT(pg_proc_prodataaccess, n);
 /*
  * TODO: It would be nice if we could default prodataaccess to 'c' for all
@@ -170,4067 +173,4384 @@ GPDB_COLUMN_DEFAULT(pg_proc_prodataaccess, n);
 
 /* OIDS 1 - 99 */
 
-DATA(insert OID = 1242 (  boolin		   PGNSP PGUID 12 1 0 f f t f i 1 16 "2275" _null_ _null_ _null_ boolin - _null_ ));
+DATA(insert OID = 1242 (  boolin		   PGNSP PGUID 12 1 0 f f t f i 1 16 "2275" _null_ _null_ _null_ boolin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1243 (  boolout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "16" _null_ _null_ _null_ boolout - _null_ ));
+DATA(insert OID = 1243 (  boolout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "16" _null_ _null_ _null_ boolout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1244 (  byteain		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2275" _null_ _null_ _null_ byteain - _null_ ));
+DATA(insert OID = 1244 (  byteain		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2275" _null_ _null_ _null_ byteain - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  31 (  byteaout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "17" _null_ _null_ _null_ byteaout - _null_ ));
+DATA(insert OID =  31 (  byteaout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "17" _null_ _null_ _null_ byteaout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1245 (  charin		   PGNSP PGUID 12 1 0 f f t f i 1 18 "2275" _null_ _null_ _null_ charin - _null_ ));
+DATA(insert OID = 1245 (  charin		   PGNSP PGUID 12 1 0 f f t f i 1 18 "2275" _null_ _null_ _null_ charin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  33 (  charout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "18" _null_ _null_ _null_ charout - _null_ ));
+DATA(insert OID =  33 (  charout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "18" _null_ _null_ _null_ charout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  34 (  namein			   PGNSP PGUID 12 1 0 f f t f i 1 19 "2275" _null_ _null_ _null_ namein - _null_ ));
+DATA(insert OID =  34 (  namein			   PGNSP PGUID 12 1 0 f f t f i 1 19 "2275" _null_ _null_ _null_ namein - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  35 (  nameout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "19" _null_ _null_ _null_ nameout - _null_ ));
+DATA(insert OID =  35 (  nameout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "19" _null_ _null_ _null_ nameout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  38 (  int2in			   PGNSP PGUID 12 1 0 f f t f i 1 21 "2275" _null_ _null_ _null_ int2in - _null_ ));
+DATA(insert OID =  38 (  int2in			   PGNSP PGUID 12 1 0 f f t f i 1 21 "2275" _null_ _null_ _null_ int2in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  39 (  int2out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "21" _null_ _null_ _null_ int2out - _null_ ));
+DATA(insert OID =  39 (  int2out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "21" _null_ _null_ _null_ int2out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  40 (  int2vectorin	   PGNSP PGUID 12 1 0 f f t f i 1 22 "2275" _null_ _null_ _null_ int2vectorin - _null_ ));
+DATA(insert OID =  40 (  int2vectorin	   PGNSP PGUID 12 1 0 f f t f i 1 22 "2275" _null_ _null_ _null_ int2vectorin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  41 (  int2vectorout	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "22" _null_ _null_ _null_ int2vectorout - _null_ ));
+DATA(insert OID =  41 (  int2vectorout	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "22" _null_ _null_ _null_ int2vectorout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  42 (  int4in			   PGNSP PGUID 12 1 0 f f t f i 1 23 "2275" _null_ _null_ _null_ int4in - _null_ ));
+DATA(insert OID =  42 (  int4in			   PGNSP PGUID 12 1 0 f f t f i 1 23 "2275" _null_ _null_ _null_ int4in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  43 (  int4out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_ int4out - _null_ ));
+DATA(insert OID =  43 (  int4out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_ int4out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  44 (  regprocin		   PGNSP PGUID 12 1 0 f f t f s 1 24 "2275" _null_ _null_ _null_ regprocin - _null_ ));
+DATA(insert OID =  44 (  regprocin		   PGNSP PGUID 12 1 0 f f t f s 1 24 "2275" _null_ _null_ _null_ regprocin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  45 (  regprocout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "24" _null_ _null_ _null_ regprocout - _null_ ));
+DATA(insert OID =  45 (  regprocout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "24" _null_ _null_ _null_ regprocout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  46 (  textin			   PGNSP PGUID 12 1 0 f f t f i 1 25 "2275" _null_ _null_ _null_ textin - _null_ ));
+DATA(insert OID =  46 (  textin			   PGNSP PGUID 12 1 0 f f t f i 1 25 "2275" _null_ _null_ _null_ textin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  47 (  textout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "25" _null_ _null_ _null_ textout - _null_ ));
+DATA(insert OID =  47 (  textout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "25" _null_ _null_ _null_ textout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  48 (  tidin			   PGNSP PGUID 12 1 0 f f t f i 1 27 "2275" _null_ _null_ _null_ tidin - _null_ ));
+DATA(insert OID =  48 (  tidin			   PGNSP PGUID 12 1 0 f f t f i 1 27 "2275" _null_ _null_ _null_ tidin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  49 (  tidout			   PGNSP PGUID 12 1 0 f f t f i 1 2275 "27" _null_ _null_ _null_ tidout - _null_ ));
+DATA(insert OID =  49 (  tidout			   PGNSP PGUID 12 1 0 f f t f i 1 2275 "27" _null_ _null_ _null_ tidout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  50 (  xidin			   PGNSP PGUID 12 1 0 f f t f i 1 28 "2275" _null_ _null_ _null_ xidin - _null_ ));
+DATA(insert OID =  50 (  xidin			   PGNSP PGUID 12 1 0 f f t f i 1 28 "2275" _null_ _null_ _null_ xidin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  51 (  xidout			   PGNSP PGUID 12 1 0 f f t f i 1 2275 "28" _null_ _null_ _null_ xidout - _null_ ));
+DATA(insert OID =  51 (  xidout			   PGNSP PGUID 12 1 0 f f t f i 1 2275 "28" _null_ _null_ _null_ xidout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  52 (  cidin			   PGNSP PGUID 12 1 0 f f t f i 1 29 "2275" _null_ _null_ _null_ cidin - _null_ ));
+DATA(insert OID =  52 (  cidin			   PGNSP PGUID 12 1 0 f f t f i 1 29 "2275" _null_ _null_ _null_ cidin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  53 (  cidout			   PGNSP PGUID 12 1 0 f f t f i 1 2275 "29" _null_ _null_ _null_ cidout - _null_ ));
+DATA(insert OID =  53 (  cidout			   PGNSP PGUID 12 1 0 f f t f i 1 2275 "29" _null_ _null_ _null_ cidout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  54 (  oidvectorin	   PGNSP PGUID 12 1 0 f f t f i 1 30 "2275" _null_ _null_ _null_ oidvectorin - _null_ ));
+DATA(insert OID =  54 (  oidvectorin	   PGNSP PGUID 12 1 0 f f t f i 1 30 "2275" _null_ _null_ _null_ oidvectorin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  55 (  oidvectorout	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "30" _null_ _null_ _null_ oidvectorout - _null_ ));
+DATA(insert OID =  55 (  oidvectorout	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "30" _null_ _null_ _null_ oidvectorout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  56 (  boollt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boollt - _null_ ));
+DATA(insert OID =  56 (  boollt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boollt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID =  57 (  boolgt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boolgt - _null_ ));
+DATA(insert OID =  57 (  boolgt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boolgt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  60 (  booleq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ booleq - _null_ ));
+DATA(insert OID =  60 (  booleq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ booleq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  61 (  chareq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ chareq - _null_ ));
+DATA(insert OID =  61 (  chareq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ chareq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  62 (  nameeq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ nameeq - _null_ ));
+DATA(insert OID =  62 (  nameeq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ nameeq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  63 (  int2eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2eq - _null_ ));
+DATA(insert OID =  63 (  int2eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  64 (  int2lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2lt - _null_ ));
+DATA(insert OID =  64 (  int2lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID =  65 (  int4eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4eq - _null_ ));
+DATA(insert OID =  65 (  int4eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  66 (  int4lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4lt - _null_ ));
+DATA(insert OID =  66 (  int4lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID =  67 (  texteq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texteq - _null_ ));
+DATA(insert OID =  67 (  texteq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texteq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  68 (  xideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "28 28" _null_ _null_ _null_ xideq - _null_ ));
+DATA(insert OID =  68 (  xideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "28 28" _null_ _null_ _null_ xideq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  69 (  cideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "29 29" _null_ _null_ _null_ cideq - _null_ ));
+DATA(insert OID =  69 (  cideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "29 29" _null_ _null_ _null_ cideq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  70 (  charne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charne - _null_ ));
+DATA(insert OID =  70 (  charne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1246 (  charlt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charlt - _null_ ));
+DATA(insert OID = 1246 (  charlt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charlt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID =  72 (  charle			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charle - _null_ ));
+DATA(insert OID =  72 (  charle			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charle - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  73 (  chargt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ chargt - _null_ ));
+DATA(insert OID =  73 (  chargt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ chargt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  74 (  charge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charge - _null_ ));
+DATA(insert OID =  74 (  charge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "18 18" _null_ _null_ _null_ charge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID =  77 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23  "18" _null_ _null_ _null_	chartoi4 - _null_ ));
+DATA(insert OID =  77 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23  "18" _null_ _null_ _null_	chartoi4 - _null_ _null_ ));
 DESCR("convert char to int4");
-DATA(insert OID =  78 (  char			   PGNSP PGUID 12 1 0 f f t f i 1  18  "23" _null_ _null_ _null_	i4tochar - _null_ ));
+DATA(insert OID =  78 (  char			   PGNSP PGUID 12 1 0 f f t f i 1  18  "23" _null_ _null_ _null_	i4tochar - _null_ _null_ ));
 DESCR("convert int4 to char");
 
-DATA(insert OID =  79 (  nameregexeq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameregexeq - _null_ ));
+DATA(insert OID =  79 (  nameregexeq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameregexeq - _null_ _null_ ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1252 (  nameregexne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameregexne - _null_ ));
+DATA(insert OID = 1252 (  nameregexne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameregexne - _null_ _null_ ));
 DESCR("does not match regex., case-sensitive");
-DATA(insert OID = 1254 (  textregexeq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textregexeq - _null_ ));
+DATA(insert OID = 1254 (  textregexeq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textregexeq - _null_ _null_ ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1256 (  textregexne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textregexne - _null_ ));
+DATA(insert OID = 1256 (  textregexne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textregexne - _null_ _null_ ));
 DESCR("does not match regex., case-sensitive");
-DATA(insert OID = 1257 (  textlen		   PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_	textlen - _null_ ));
+DATA(insert OID = 1257 (  textlen		   PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_	textlen - _null_ _null_ ));
 DESCR("length");
-DATA(insert OID = 1258 (  textcat		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ textcat - _null_ ));
+DATA(insert OID = 1258 (  textcat		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ textcat - _null_ _null_ ));
 DESCR("concatenate");
 
-DATA(insert OID =  84 (  boolne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boolne - _null_ ));
+DATA(insert OID =  84 (  boolne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boolne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID =  89 (  version		   PGNSP PGUID 12 1 0 f f t f s 0 25 "" _null_ _null_ _null_ pgsql_version - _null_ ));
+DATA(insert OID =  89 (  version		   PGNSP PGUID 12 1 0 f f t f s 0 25 "" _null_ _null_ _null_ pgsql_version - _null_ _null_ ));
 DESCR("PostgreSQL version string");
 
 /* OIDS 100 - 199 */
 
-DATA(insert OID = 101 (  eqsel			   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	eqsel - _null_ ));
+DATA(insert OID = 101 (  eqsel			   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	eqsel - _null_ _null_ ));
 DESCR("restriction selectivity of = and related operators");
-DATA(insert OID = 102 (  neqsel			   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	neqsel - _null_ ));
+DATA(insert OID = 102 (  neqsel			   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	neqsel - _null_ _null_ ));
 DESCR("restriction selectivity of <> and related operators");
-DATA(insert OID = 103 (  scalarltsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	scalarltsel - _null_ ));
+DATA(insert OID = 103 (  scalarltsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	scalarltsel - _null_ _null_ ));
 DESCR("restriction selectivity of < and related operators on scalar datatypes");
-DATA(insert OID = 104 (  scalargtsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	scalargtsel - _null_ ));
+DATA(insert OID = 104 (  scalargtsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	scalargtsel - _null_ _null_ ));
 DESCR("restriction selectivity of > and related operators on scalar datatypes");
-DATA(insert OID = 105 (  eqjoinsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	eqjoinsel - _null_ ));
+DATA(insert OID = 105 (  eqjoinsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	eqjoinsel - _null_ _null_ ));
 DESCR("join selectivity of = and related operators");
-DATA(insert OID = 106 (  neqjoinsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	neqjoinsel - _null_ ));
+DATA(insert OID = 106 (  neqjoinsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	neqjoinsel - _null_ _null_ ));
 DESCR("join selectivity of <> and related operators");
-DATA(insert OID = 107 (  scalarltjoinsel   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	scalarltjoinsel - _null_ ));
+DATA(insert OID = 107 (  scalarltjoinsel   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	scalarltjoinsel - _null_ _null_ ));
 DESCR("join selectivity of < and related operators on scalar datatypes");
-DATA(insert OID = 108 (  scalargtjoinsel   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	scalargtjoinsel - _null_ ));
+DATA(insert OID = 108 (  scalargtjoinsel   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	scalargtjoinsel - _null_ _null_ ));
 DESCR("join selectivity of > and related operators on scalar datatypes");
 
-DATA(insert OID =  109 (  unknownin		   PGNSP PGUID 12 1 0 f f t f i 1 705 "2275" _null_ _null_ _null_ unknownin - _null_ ));
+DATA(insert OID =  109 (  unknownin		   PGNSP PGUID 12 1 0 f f t f i 1 705 "2275" _null_ _null_ _null_ unknownin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  110 (  unknownout	   PGNSP PGUID 12 1 0 f f t f i 1 2275	"705" _null_ _null_ _null_	unknownout - _null_ ));
+DATA(insert OID =  110 (  unknownout	   PGNSP PGUID 12 1 0 f f t f i 1 2275	"705" _null_ _null_ _null_	unknownout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 111 (  numeric_fac	   PGNSP PGUID 12 1 0 f f t f i 1 1700 "20" _null_ _null_ _null_	numeric_fac - _null_ ));
-DATA(insert OID = 112 (  text			   PGNSP PGUID 12 1 0 f f t f i 1  25 "23" _null_ _null_ _null_ int4_text - _null_ ));
-DESCR("convert int4 to text");
-DATA(insert OID = 113 (  text			   PGNSP PGUID 12 1 0 f f t f i 1  25 "21" _null_ _null_ _null_ int2_text - _null_ ));
-DESCR("convert int2 to text");
-DATA(insert OID = 114 (  text			   PGNSP PGUID 12 1 0 f f t f i 1  25 "26" _null_ _null_ _null_ oid_text - _null_ ));
-DESCR("convert oid to text");
+DATA(insert OID = 111 (  numeric_fac	   PGNSP PGUID 12 1 0 f f t f i 1 1700 "20" _null_ _null_ _null_	numeric_fac - _null_ _null_ ));
 
-DATA(insert OID = 115 (  box_above_eq	   PGNSP PGUID 12 1 0 f f t f i 2  16 "603 603" _null_ _null_ _null_	box_above_eq - _null_ ));
+DATA(insert OID = 115 (  box_above_eq	   PGNSP PGUID 12 1 0 f f t f i 2  16 "603 603" _null_ _null_ _null_	box_above_eq - _null_ _null_ ));
 DESCR("is above (allows touching)");
-DATA(insert OID = 116 (  box_below_eq	   PGNSP PGUID 12 1 0 f f t f i 2  16 "603 603" _null_ _null_ _null_	box_below_eq - _null_ ));
+DATA(insert OID = 116 (  box_below_eq	   PGNSP PGUID 12 1 0 f f t f i 2  16 "603 603" _null_ _null_ _null_	box_below_eq - _null_ _null_ ));
 DESCR("is below (allows touching)");
 
-DATA(insert OID = 117 (  point_in		   PGNSP PGUID 12 1 0 f f t f i 1 600 "2275" _null_ _null_ _null_  point_in - _null_ ));
+DATA(insert OID = 117 (  point_in		   PGNSP PGUID 12 1 0 f f t f i 1 600 "2275" _null_ _null_ _null_  point_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 118 (  point_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "600" _null_ _null_ _null_  point_out - _null_ ));
+DATA(insert OID = 118 (  point_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "600" _null_ _null_ _null_  point_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 119 (  lseg_in		   PGNSP PGUID 12 1 0 f f t f i 1 601 "2275" _null_ _null_ _null_  lseg_in - _null_ ));
+DATA(insert OID = 119 (  lseg_in		   PGNSP PGUID 12 1 0 f f t f i 1 601 "2275" _null_ _null_ _null_  lseg_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 120 (  lseg_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "601" _null_ _null_ _null_  lseg_out - _null_ ));
+DATA(insert OID = 120 (  lseg_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "601" _null_ _null_ _null_  lseg_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 121 (  path_in		   PGNSP PGUID 12 1 0 f f t f i 1 602 "2275" _null_ _null_ _null_  path_in - _null_ ));
+DATA(insert OID = 121 (  path_in		   PGNSP PGUID 12 1 0 f f t f i 1 602 "2275" _null_ _null_ _null_  path_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 122 (  path_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "602" _null_ _null_ _null_  path_out - _null_ ));
+DATA(insert OID = 122 (  path_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "602" _null_ _null_ _null_  path_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 123 (  box_in			   PGNSP PGUID 12 1 0 f f t f i 1 603 "2275" _null_ _null_ _null_  box_in - _null_ ));
+DATA(insert OID = 123 (  box_in			   PGNSP PGUID 12 1 0 f f t f i 1 603 "2275" _null_ _null_ _null_  box_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 124 (  box_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "603" _null_ _null_ _null_  box_out - _null_ ));
+DATA(insert OID = 124 (  box_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "603" _null_ _null_ _null_  box_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 125 (  box_overlap	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overlap - _null_ ));
+DATA(insert OID = 125 (  box_overlap	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overlap - _null_ _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 126 (  box_ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_ge - _null_ ));
+DATA(insert OID = 126 (  box_ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal by area");
-DATA(insert OID = 127 (  box_gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_gt - _null_ ));
+DATA(insert OID = 127 (  box_gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_gt - _null_ _null_ ));
 DESCR("greater-than by area");
-DATA(insert OID = 128 (  box_eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_eq - _null_ ));
+DATA(insert OID = 128 (  box_eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_eq - _null_ _null_ ));
 DESCR("equal by area");
-DATA(insert OID = 129 (  box_lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_lt - _null_ ));
+DATA(insert OID = 129 (  box_lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_lt - _null_ _null_ ));
 DESCR("less-than by area");
-DATA(insert OID = 130 (  box_le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_le - _null_ ));
+DATA(insert OID = 130 (  box_le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_le - _null_ _null_ ));
 DESCR("less-than-or-equal by area");
-DATA(insert OID = 131 (  point_above	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_above - _null_ ));
+DATA(insert OID = 131 (  point_above	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_above - _null_ _null_ ));
 DESCR("is above");
-DATA(insert OID = 132 (  point_left		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_left - _null_ ));
+DATA(insert OID = 132 (  point_left		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_left - _null_ _null_ ));
 DESCR("is left of");
-DATA(insert OID = 133 (  point_right	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_right - _null_ ));
+DATA(insert OID = 133 (  point_right	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_right - _null_ _null_ ));
 DESCR("is right of");
-DATA(insert OID = 134 (  point_below	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_below - _null_ ));
+DATA(insert OID = 134 (  point_below	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_below - _null_ _null_ ));
 DESCR("is below");
-DATA(insert OID = 135 (  point_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_eq - _null_ ));
+DATA(insert OID = 135 (  point_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_eq - _null_ _null_ ));
 DESCR("same as?");
-DATA(insert OID = 136 (  on_pb			   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 603" _null_ _null_ _null_ on_pb - _null_ ));
+DATA(insert OID = 136 (  on_pb			   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 603" _null_ _null_ _null_ on_pb - _null_ _null_ ));
 DESCR("point inside box?");
-DATA(insert OID = 137 (  on_ppath		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 602" _null_ _null_ _null_ on_ppath - _null_ ));
+DATA(insert OID = 137 (  on_ppath		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 602" _null_ _null_ _null_ on_ppath - _null_ _null_ ));
 DESCR("point within closed path, or point on open path");
-DATA(insert OID = 138 (  box_center		   PGNSP PGUID 12 1 0 f f t f i 1 600 "603" _null_ _null_ _null_	box_center - _null_ ));
+DATA(insert OID = 138 (  box_center		   PGNSP PGUID 12 1 0 f f t f i 1 600 "603" _null_ _null_ _null_	box_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 139 (  areasel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	areasel - _null_ ));
+DATA(insert OID = 139 (  areasel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	areasel - _null_ _null_ ));
 DESCR("restriction selectivity for area-comparison operators");
-DATA(insert OID = 140 (  areajoinsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	areajoinsel - _null_ ));
+DATA(insert OID = 140 (  areajoinsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	areajoinsel - _null_ _null_ ));
 DESCR("join selectivity for area-comparison operators");
-DATA(insert OID = 141 (  int4mul		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mul - _null_ ));
+DATA(insert OID = 141 (  int4mul		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 144 (  int4ne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4ne - _null_ ));
+DATA(insert OID = 144 (  int4ne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 145 (  int2ne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2ne - _null_ ));
+DATA(insert OID = 145 (  int2ne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 146 (  int2gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2gt - _null_ ));
+DATA(insert OID = 146 (  int2gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 147 (  int4gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4gt - _null_ ));
+DATA(insert OID = 147 (  int4gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 148 (  int2le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2le - _null_ ));
+DATA(insert OID = 148 (  int2le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 149 (  int4le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4le - _null_ ));
+DATA(insert OID = 149 (  int4le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 150 (  int4ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4ge - _null_ ));
+DATA(insert OID = 150 (  int4ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 23" _null_ _null_ _null_ int4ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 151 (  int2ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2ge - _null_ ));
+DATA(insert OID = 151 (  int2ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 21" _null_ _null_ _null_ int2ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 152 (  int2mul		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mul - _null_ ));
+DATA(insert OID = 152 (  int2mul		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 153 (  int2div		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2div - _null_ ));
+DATA(insert OID = 153 (  int2div		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 154 (  int4div		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4div - _null_ ));
+DATA(insert OID = 154 (  int4div		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 155 (  int2mod		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mod - _null_ ));
+DATA(insert OID = 155 (  int2mod		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 156 (  int4mod		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mod - _null_ ));
+DATA(insert OID = 156 (  int4mod		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 157 (  textne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textne - _null_ ));
+DATA(insert OID = 157 (  textne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 158 (  int24eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24eq - _null_ ));
+DATA(insert OID = 158 (  int24eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 159 (  int42eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42eq - _null_ ));
+DATA(insert OID = 159 (  int42eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 160 (  int24lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24lt - _null_ ));
+DATA(insert OID = 160 (  int24lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 161 (  int42lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42lt - _null_ ));
+DATA(insert OID = 161 (  int42lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 162 (  int24gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24gt - _null_ ));
+DATA(insert OID = 162 (  int24gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 163 (  int42gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42gt - _null_ ));
+DATA(insert OID = 163 (  int42gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 164 (  int24ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24ne - _null_ ));
+DATA(insert OID = 164 (  int24ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 165 (  int42ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42ne - _null_ ));
+DATA(insert OID = 165 (  int42ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 166 (  int24le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24le - _null_ ));
+DATA(insert OID = 166 (  int24le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 167 (  int42le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42le - _null_ ));
+DATA(insert OID = 167 (  int42le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 168 (  int24ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24ge - _null_ ));
+DATA(insert OID = 168 (  int24ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 23" _null_ _null_ _null_ int24ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 169 (  int42ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42ge - _null_ ));
+DATA(insert OID = 169 (  int42ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 21" _null_ _null_ _null_ int42ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 170 (  int24mul		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mul - _null_ ));
+DATA(insert OID = 170 (  int24mul		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 171 (  int42mul		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mul - _null_ ));
+DATA(insert OID = 171 (  int42mul		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 172 (  int24div		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24div - _null_ ));
+DATA(insert OID = 172 (  int24div		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 173 (  int42div		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42div - _null_ ));
+DATA(insert OID = 173 (  int42div		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 174 (  int24mod		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mod - _null_ ));
+DATA(insert OID = 174 (  int24mod		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 175 (  int42mod		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mod - _null_ ));
+DATA(insert OID = 175 (  int42mod		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 176 (  int2pl			   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2pl - _null_ ));
+DATA(insert OID = 176 (  int2pl			   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 177 (  int4pl			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4pl - _null_ ));
+DATA(insert OID = 177 (  int4pl			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 178 (  int24pl		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24pl - _null_ ));
+DATA(insert OID = 178 (  int24pl		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 179 (  int42pl		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42pl - _null_ ));
+DATA(insert OID = 179 (  int42pl		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 180 (  int2mi			   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mi - _null_ ));
+DATA(insert OID = 180 (  int2mi			   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 181 (  int4mi			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mi - _null_ ));
+DATA(insert OID = 181 (  int4mi			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 182 (  int24mi		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mi - _null_ ));
+DATA(insert OID = 182 (  int24mi		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 183 (  int42mi		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mi - _null_ ));
+DATA(insert OID = 183 (  int42mi		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 184 (  oideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oideq - _null_ ));
+DATA(insert OID = 184 (  oideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oideq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 185 (  oidne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidne - _null_ ));
+DATA(insert OID = 185 (  oidne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 186 (  box_same		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_same - _null_ ));
+DATA(insert OID = 186 (  box_same		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_same - _null_ _null_ ));
 DESCR("same as?");
-DATA(insert OID = 187 (  box_contain	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_contain - _null_ ));
+DATA(insert OID = 187 (  box_contain	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_contain - _null_ _null_ ));
 DESCR("contains?");
-DATA(insert OID = 188 (  box_left		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_left - _null_ ));
+DATA(insert OID = 188 (  box_left		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_left - _null_ _null_ ));
 DESCR("is left of");
-DATA(insert OID = 189 (  box_overleft	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overleft - _null_ ));
+DATA(insert OID = 189 (  box_overleft	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overleft - _null_ _null_ ));
 DESCR("overlaps or is left of");
-DATA(insert OID = 190 (  box_overright	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overright - _null_ ));
+DATA(insert OID = 190 (  box_overright	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overright - _null_ _null_ ));
 DESCR("overlaps or is right of");
-DATA(insert OID = 191 (  box_right		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_right - _null_ ));
+DATA(insert OID = 191 (  box_right		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_right - _null_ _null_ ));
 DESCR("is right of");
-DATA(insert OID = 192 (  box_contained	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_contained - _null_ ));
+DATA(insert OID = 192 (  box_contained	   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_contained - _null_ _null_ ));
 DESCR("is contained by?");
 
 /* OIDS 200 - 299 */
 
-DATA(insert OID = 200 (  float4in		   PGNSP PGUID 12 1 0 f f t f i 1 700 "2275" _null_ _null_ _null_  float4in - _null_ ));
+DATA(insert OID = 200 (  float4in		   PGNSP PGUID 12 1 0 f f t f i 1 700 "2275" _null_ _null_ _null_  float4in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 201 (  float4out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "700" _null_ _null_ _null_  float4out - _null_ ));
+DATA(insert OID = 201 (  float4out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "700" _null_ _null_ _null_  float4out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 202 (  float4mul		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4mul - _null_ ));
+DATA(insert OID = 202 (  float4mul		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 203 (  float4div		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4div - _null_ ));
+DATA(insert OID = 203 (  float4div		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 204 (  float4pl		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4pl - _null_ ));
+DATA(insert OID = 204 (  float4pl		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 205 (  float4mi		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4mi - _null_ ));
+DATA(insert OID = 205 (  float4mi		   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 206 (  float4um		   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_	float4um - _null_ ));
+DATA(insert OID = 206 (  float4um		   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_	float4um - _null_ _null_ ));
 DESCR("negate");
-DATA(insert OID = 207 (  float4abs		   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_	float4abs - _null_ ));
+DATA(insert OID = 207 (  float4abs		   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_	float4abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 208 (  float4_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1022 "1022 700" _null_ _null_ _null_	float4_accum - _null_ ));
+DATA(insert OID = 208 (  float4_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1022 "1022 700" _null_ _null_ _null_	float4_accum - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 209 (  float4larger	   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4larger - _null_ ));
+DATA(insert OID = 209 (  float4larger	   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 211 (  float4smaller	   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4smaller - _null_ ));
+DATA(insert OID = 211 (  float4smaller	   PGNSP PGUID 12 1 0 f f t f i 2 700 "700 700" _null_ _null_ _null_	float4smaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 212 (  int4um			   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4um - _null_ ));
+DATA(insert OID = 212 (  int4um			   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4um - _null_ _null_ ));
 DESCR("negate");
-DATA(insert OID = 213 (  int2um			   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2um - _null_ ));
+DATA(insert OID = 213 (  int2um			   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2um - _null_ _null_ ));
 DESCR("negate");
 
-DATA(insert OID = 214 (  float8in		   PGNSP PGUID 12 1 0 f f t f i 1 701 "2275" _null_ _null_ _null_  float8in - _null_ ));
+DATA(insert OID = 214 (  float8in		   PGNSP PGUID 12 1 0 f f t f i 1 701 "2275" _null_ _null_ _null_  float8in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 215 (  float8out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "701" _null_ _null_ _null_  float8out - _null_ ));
+DATA(insert OID = 215 (  float8out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "701" _null_ _null_ _null_  float8out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 216 (  float8mul		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8mul - _null_ ));
+DATA(insert OID = 216 (  float8mul		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 217 (  float8div		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8div - _null_ ));
+DATA(insert OID = 217 (  float8div		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 218 (  float8pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8pl - _null_ ));
+DATA(insert OID = 218 (  float8pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 219 (  float8mi		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8mi - _null_ ));
+DATA(insert OID = 219 (  float8mi		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 220 (  float8um		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	float8um - _null_ ));
+DATA(insert OID = 220 (  float8um		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	float8um - _null_ _null_ ));
 DESCR("negate");
-DATA(insert OID = 221 (  float8abs		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	float8abs - _null_ ));
+DATA(insert OID = 221 (  float8abs		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	float8abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 222 (  float8_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1022 "1022 701" _null_ _null_ _null_	float8_accum - _null_ ));
+DATA(insert OID = 222 (  float8_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1022 "1022 701" _null_ _null_ _null_	float8_accum - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 223 (  float8larger	   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8larger - _null_ ));
+DATA(insert OID = 223 (  float8larger	   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 224 (  float8smaller	   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8smaller - _null_ ));
+DATA(insert OID = 224 (  float8smaller	   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	float8smaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 225 (  lseg_center	   PGNSP PGUID 12 1 0 f f t f i 1 600 "601" _null_ _null_ _null_	lseg_center - _null_ ));
+DATA(insert OID = 225 (  lseg_center	   PGNSP PGUID 12 1 0 f f t f i 1 600 "601" _null_ _null_ _null_	lseg_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 226 (  path_center	   PGNSP PGUID 12 1 0 f f t f i 1 600 "602" _null_ _null_ _null_	path_center - _null_ ));
+DATA(insert OID = 226 (  path_center	   PGNSP PGUID 12 1 0 f f t f i 1 600 "602" _null_ _null_ _null_	path_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 227 (  poly_center	   PGNSP PGUID 12 1 0 f f t f i 1 600 "604" _null_ _null_ _null_	poly_center - _null_ ));
+DATA(insert OID = 227 (  poly_center	   PGNSP PGUID 12 1 0 f f t f i 1 600 "604" _null_ _null_ _null_	poly_center - _null_ _null_ ));
 DESCR("center of");
 
-DATA(insert OID = 228 (  dround			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dround - _null_ ));
+DATA(insert OID = 228 (  dround			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dround - _null_ _null_ ));
 DESCR("round to nearest integer");
-DATA(insert OID = 229 (  dtrunc			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dtrunc - _null_ ));
+DATA(insert OID = 229 (  dtrunc			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dtrunc - _null_ _null_ ));
 DESCR("truncate to integer");
-DATA(insert OID = 2308 ( ceil			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dceil - _null_ ));
+DATA(insert OID = 2308 ( ceil			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dceil - _null_ _null_ ));
 DESCR("smallest integer >= value");
-DATA(insert OID = 2320 ( ceiling		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dceil - _null_ ));
+DATA(insert OID = 2320 ( ceiling		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dceil - _null_ _null_ ));
 DESCR("smallest integer >= value");
-DATA(insert OID = 2309 ( floor			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dfloor - _null_ ));
+DATA(insert OID = 2309 ( floor			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dfloor - _null_ _null_ ));
 DESCR("largest integer <= value");
-DATA(insert OID = 2310 ( sign			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dsign - _null_ ));
+DATA(insert OID = 2310 ( sign			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dsign - _null_ _null_ ));
 DESCR("sign of value");
-DATA(insert OID = 230 (  dsqrt			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dsqrt - _null_ ));
+DATA(insert OID = 230 (  dsqrt			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dsqrt - _null_ _null_ ));
 DESCR("square root");
-DATA(insert OID = 231 (  dcbrt			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dcbrt - _null_ ));
+DATA(insert OID = 231 (  dcbrt			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dcbrt - _null_ _null_ ));
 DESCR("cube root");
-DATA(insert OID = 232 (  dpow			   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	dpow - _null_ ));
+DATA(insert OID = 232 (  dpow			   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	dpow - _null_ _null_ ));
 DESCR("exponentiation (x^y)");
-DATA(insert OID = 233 (  dexp			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dexp - _null_ ));
+DATA(insert OID = 233 (  dexp			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dexp - _null_ _null_ ));
 DESCR("natural exponential (e^x)");
-DATA(insert OID = 234 (  dlog1			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog1 - _null_ ));
+DATA(insert OID = 234 (  dlog1			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog1 - _null_ _null_ ));
 DESCR("natural logarithm");
-DATA(insert OID = 235 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701  "21" _null_ _null_ _null_	i2tod - _null_ ));
+DATA(insert OID = 235 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701  "21" _null_ _null_ _null_	i2tod - _null_ _null_ ));
 DESCR("convert int2 to float8");
-DATA(insert OID = 236 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700  "21" _null_ _null_ _null_	i2tof - _null_ ));
+DATA(insert OID = 236 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700  "21" _null_ _null_ _null_	i2tof - _null_ _null_ ));
 DESCR("convert int2 to float4");
-DATA(insert OID = 237 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21 "701" _null_ _null_ _null_	dtoi2 - _null_ ));
+DATA(insert OID = 237 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21 "701" _null_ _null_ _null_	dtoi2 - _null_ _null_ ));
 DESCR("convert float8 to int2");
-DATA(insert OID = 238 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21 "700" _null_ _null_ _null_	ftoi2 - _null_ ));
+DATA(insert OID = 238 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21 "700" _null_ _null_ _null_	ftoi2 - _null_ _null_ ));
 DESCR("convert float4 to int2");
-DATA(insert OID = 239 (  line_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "628 628" _null_ _null_ _null_	line_distance - _null_ ));
+DATA(insert OID = 239 (  line_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "628 628" _null_ _null_ _null_	line_distance - _null_ _null_ ));
 DESCR("distance between");
 
-DATA(insert OID = 240 (  abstimein		   PGNSP PGUID 12 1 0 f f t f s 1 702 "2275" _null_ _null_ _null_  abstimein - _null_ ));
+DATA(insert OID = 240 (  abstimein		   PGNSP PGUID 12 1 0 f f t f s 1 702 "2275" _null_ _null_ _null_  abstimein - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 241 (  abstimeout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "702" _null_ _null_ _null_  abstimeout - _null_ ));
+DATA(insert OID = 241 (  abstimeout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "702" _null_ _null_ _null_  abstimeout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 242 (  reltimein		   PGNSP PGUID 12 1 0 f f t f s 1 703 "2275" _null_ _null_ _null_  reltimein - _null_ ));
+DATA(insert OID = 242 (  reltimein		   PGNSP PGUID 12 1 0 f f t f s 1 703 "2275" _null_ _null_ _null_  reltimein - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 243 (  reltimeout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "703" _null_ _null_ _null_  reltimeout - _null_ ));
+DATA(insert OID = 243 (  reltimeout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "703" _null_ _null_ _null_  reltimeout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 244 (  timepl			   PGNSP PGUID 12 1 0 f f t f i 2 702 "702 703" _null_ _null_ _null_	timepl - _null_ ));
+DATA(insert OID = 244 (  timepl			   PGNSP PGUID 12 1 0 f f t f i 2 702 "702 703" _null_ _null_ _null_	timepl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 245 (  timemi			   PGNSP PGUID 12 1 0 f f t f i 2 702 "702 703" _null_ _null_ _null_	timemi - _null_ ));
+DATA(insert OID = 245 (  timemi			   PGNSP PGUID 12 1 0 f f t f i 2 702 "702 703" _null_ _null_ _null_	timemi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 246 (  tintervalin	   PGNSP PGUID 12 1 0 f f t f s 1 704 "2275" _null_ _null_ _null_  tintervalin - _null_ ));
+DATA(insert OID = 246 (  tintervalin	   PGNSP PGUID 12 1 0 f f t f s 1 704 "2275" _null_ _null_ _null_  tintervalin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 247 (  tintervalout	   PGNSP PGUID 12 1 0 f f t f s 1 2275 "704" _null_ _null_ _null_  tintervalout - _null_ ));
+DATA(insert OID = 247 (  tintervalout	   PGNSP PGUID 12 1 0 f f t f s 1 2275 "704" _null_ _null_ _null_  tintervalout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 248 (  intinterval	   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 704" _null_ _null_ _null_ intinterval - _null_ ));
+DATA(insert OID = 248 (  intinterval	   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 704" _null_ _null_ _null_ intinterval - _null_ _null_ ));
 DESCR("abstime in tinterval");
-DATA(insert OID = 249 (  tintervalrel	   PGNSP PGUID 12 1 0 f f t f i 1 703 "704" _null_ _null_ _null_	tintervalrel - _null_ ));
+DATA(insert OID = 249 (  tintervalrel	   PGNSP PGUID 12 1 0 f f t f i 1 703 "704" _null_ _null_ _null_	tintervalrel - _null_ _null_ ));
 DESCR("tinterval to reltime");
-DATA(insert OID = 250 (  timenow		   PGNSP PGUID 12 1 0 f f t f s 0 702 "" _null_ _null_ _null_  timenow - _null_ ));
-DESCR("Current date and time (abstime)");
-DATA(insert OID = 251 (  abstimeeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimeeq - _null_ ));
+DATA(insert OID = 250 (  timenow		   PGNSP PGUID 12 1 0 f f t f s 0 702 "" _null_ _null_ _null_  timenow - _null_ _null_ ));
+DESCR("current date and time (abstime)");
+DATA(insert OID = 251 (  abstimeeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimeeq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 252 (  abstimene		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimene - _null_ ));
+DATA(insert OID = 252 (  abstimene		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimene - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 253 (  abstimelt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimelt - _null_ ));
+DATA(insert OID = 253 (  abstimelt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimelt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 254 (  abstimegt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimegt - _null_ ));
+DATA(insert OID = 254 (  abstimegt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimegt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 255 (  abstimele		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimele - _null_ ));
+DATA(insert OID = 255 (  abstimele		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimele - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 256 (  abstimege		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimege - _null_ ));
+DATA(insert OID = 256 (  abstimege		   PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimege - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 257 (  reltimeeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimeeq - _null_ ));
+DATA(insert OID = 257 (  reltimeeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimeeq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 258 (  reltimene		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimene - _null_ ));
+DATA(insert OID = 258 (  reltimene		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimene - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 259 (  reltimelt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimelt - _null_ ));
+DATA(insert OID = 259 (  reltimelt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimelt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 260 (  reltimegt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimegt - _null_ ));
+DATA(insert OID = 260 (  reltimegt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimegt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 261 (  reltimele		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimele - _null_ ));
+DATA(insert OID = 261 (  reltimele		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimele - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 262 (  reltimege		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimege - _null_ ));
+DATA(insert OID = 262 (  reltimege		   PGNSP PGUID 12 1 0 f f t f i 2 16 "703 703" _null_ _null_ _null_ reltimege - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 263 (  tintervalsame	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalsame - _null_ ));
+DATA(insert OID = 263 (  tintervalsame	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalsame - _null_ _null_ ));
 DESCR("same as?");
-DATA(insert OID = 264 (  tintervalct	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalct - _null_ ));
+DATA(insert OID = 264 (  tintervalct	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalct - _null_ _null_ ));
 DESCR("contains?");
-DATA(insert OID = 265 (  tintervalov	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalov - _null_ ));
+DATA(insert OID = 265 (  tintervalov	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalov - _null_ _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 266 (  tintervalleneq    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervalleneq - _null_ ));
+DATA(insert OID = 266 (  tintervalleneq    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervalleneq - _null_ _null_ ));
 DESCR("length equal");
-DATA(insert OID = 267 (  tintervallenne    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenne - _null_ ));
+DATA(insert OID = 267 (  tintervallenne    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenne - _null_ _null_ ));
 DESCR("length not equal to");
-DATA(insert OID = 268 (  tintervallenlt    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenlt - _null_ ));
+DATA(insert OID = 268 (  tintervallenlt    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenlt - _null_ _null_ ));
 DESCR("length less-than");
-DATA(insert OID = 269 (  tintervallengt    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallengt - _null_ ));
+DATA(insert OID = 269 (  tintervallengt    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallengt - _null_ _null_ ));
 DESCR("length greater-than");
-DATA(insert OID = 270 (  tintervallenle    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenle - _null_ ));
+DATA(insert OID = 270 (  tintervallenle    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenle - _null_ _null_ ));
 DESCR("length less-than-or-equal");
-DATA(insert OID = 271 (  tintervallenge    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenge - _null_ ));
+DATA(insert OID = 271 (  tintervallenge    PGNSP PGUID 12 1 0 f f t f i 2 16 "704 703" _null_ _null_ _null_ tintervallenge - _null_ _null_ ));
 DESCR("length greater-than-or-equal");
-DATA(insert OID = 272 (  tintervalstart    PGNSP PGUID 12 1 0 f f t f i 1 702 "704" _null_ _null_ _null_	tintervalstart - _null_ ));
+DATA(insert OID = 272 (  tintervalstart    PGNSP PGUID 12 1 0 f f t f i 1 702 "704" _null_ _null_ _null_	tintervalstart - _null_ _null_ ));
 DESCR("start of interval");
-DATA(insert OID = 273 (  tintervalend	   PGNSP PGUID 12 1 0 f f t f i 1 702 "704" _null_ _null_ _null_	tintervalend - _null_ ));
+DATA(insert OID = 273 (  tintervalend	   PGNSP PGUID 12 1 0 f f t f i 1 702 "704" _null_ _null_ _null_	tintervalend - _null_ _null_ ));
 DESCR("end of interval");
-DATA(insert OID = 274 (  timeofday		   PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ timeofday - _null_ ));
-DESCR("Current date and time - increments during transactions");
-DATA(insert OID = 275 (  isfinite		   PGNSP PGUID 12 1 0 f f t f i 1 16 "702" _null_ _null_ _null_ abstime_finite - _null_ ));
+DATA(insert OID = 274 (  timeofday		   PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ timeofday - _null_ _null_ ));
+DESCR("current date and time - increments during transactions");
+DATA(insert OID = 275 (  isfinite		   PGNSP PGUID 12 1 0 f f t f i 1 16 "702" _null_ _null_ _null_ abstime_finite - _null_ _null_ ));
 DESCR("finite abstime?");
 
-DATA(insert OID = 277 (  inter_sl		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 628" _null_ _null_ _null_ inter_sl - _null_ ));
+DATA(insert OID = 277 (  inter_sl		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 628" _null_ _null_ _null_ inter_sl - _null_ _null_ ));
 DESCR("intersect?");
-DATA(insert OID = 278 (  inter_lb		   PGNSP PGUID 12 1 0 f f t f i 2 16 "628 603" _null_ _null_ _null_ inter_lb - _null_ ));
+DATA(insert OID = 278 (  inter_lb		   PGNSP PGUID 12 1 0 f f t f i 2 16 "628 603" _null_ _null_ _null_ inter_lb - _null_ _null_ ));
 DESCR("intersect?");
 
-DATA(insert OID = 279 (  float48mul		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48mul - _null_ ));
+DATA(insert OID = 279 (  float48mul		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 280 (  float48div		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48div - _null_ ));
+DATA(insert OID = 280 (  float48div		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 281 (  float48pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48pl - _null_ ));
+DATA(insert OID = 281 (  float48pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 282 (  float48mi		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48mi - _null_ ));
+DATA(insert OID = 282 (  float48mi		   PGNSP PGUID 12 1 0 f f t f i 2 701 "700 701" _null_ _null_ _null_	float48mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 283 (  float84mul		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84mul - _null_ ));
+DATA(insert OID = 283 (  float84mul		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 284 (  float84div		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84div - _null_ ));
+DATA(insert OID = 284 (  float84div		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 285 (  float84pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84pl - _null_ ));
+DATA(insert OID = 285 (  float84pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 286 (  float84mi		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84mi - _null_ ));
+DATA(insert OID = 286 (  float84mi		   PGNSP PGUID 12 1 0 f f t f i 2 701 "701 700" _null_ _null_ _null_	float84mi - _null_ _null_ ));
 DESCR("subtract");
 
-DATA(insert OID = 287 (  float4eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4eq - _null_ ));
+DATA(insert OID = 287 (  float4eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 288 (  float4ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4ne - _null_ ));
+DATA(insert OID = 288 (  float4ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 289 (  float4lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4lt - _null_ ));
+DATA(insert OID = 289 (  float4lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 290 (  float4le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4le - _null_ ));
+DATA(insert OID = 290 (  float4le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 291 (  float4gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4gt - _null_ ));
+DATA(insert OID = 291 (  float4gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 292 (  float4ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4ge - _null_ ));
+DATA(insert OID = 292 (  float4ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 700" _null_ _null_ _null_ float4ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 293 (  float8eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8eq - _null_ ));
+DATA(insert OID = 293 (  float8eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 294 (  float8ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8ne - _null_ ));
+DATA(insert OID = 294 (  float8ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 295 (  float8lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8lt - _null_ ));
+DATA(insert OID = 295 (  float8lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 296 (  float8le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8le - _null_ ));
+DATA(insert OID = 296 (  float8le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 297 (  float8gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8gt - _null_ ));
+DATA(insert OID = 297 (  float8gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 298 (  float8ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8ge - _null_ ));
+DATA(insert OID = 298 (  float8ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 701" _null_ _null_ _null_ float8ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 299 (  float48eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48eq - _null_ ));
+DATA(insert OID = 299 (  float48eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48eq - _null_ _null_ ));
 DESCR("equal");
 
 /* OIDS 300 - 399 */
 
-DATA(insert OID = 300 (  float48ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48ne - _null_ ));
+DATA(insert OID = 300 (  float48ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 301 (  float48lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48lt - _null_ ));
+DATA(insert OID = 301 (  float48lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 302 (  float48le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48le - _null_ ));
+DATA(insert OID = 302 (  float48le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 303 (  float48gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48gt - _null_ ));
+DATA(insert OID = 303 (  float48gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 304 (  float48ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48ge - _null_ ));
+DATA(insert OID = 304 (  float48ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "700 701" _null_ _null_ _null_ float48ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 305 (  float84eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84eq - _null_ ));
+DATA(insert OID = 305 (  float84eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 306 (  float84ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84ne - _null_ ));
+DATA(insert OID = 306 (  float84ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 307 (  float84lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84lt - _null_ ));
+DATA(insert OID = 307 (  float84lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 308 (  float84le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84le - _null_ ));
+DATA(insert OID = 308 (  float84le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 309 (  float84gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84gt - _null_ ));
+DATA(insert OID = 309 (  float84gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 310 (  float84ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84ge - _null_ ));
+DATA(insert OID = 310 (  float84ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "701 700" _null_ _null_ _null_ float84ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 320 ( width_bucket	   PGNSP PGUID 12 1 0 f f t f i 4 23 "701 701 701 23" _null_ _null_ _null_	width_bucket_float8 - _null_ ));
+DATA(insert OID = 320 ( width_bucket	   PGNSP PGUID 12 1 0 f f t f i 4 23 "701 701 701 23" _null_ _null_ _null_	width_bucket_float8 - _null_ _null_ ));
 DESCR("bucket number of operand in equidepth histogram");
 
-DATA(insert OID = 311 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701 "700" _null_ _null_ _null_	ftod - _null_ ));
+DATA(insert OID = 311 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701 "700" _null_ _null_ _null_	ftod - _null_ _null_ ));
 DESCR("convert float4 to float8");
-DATA(insert OID = 312 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700 "701" _null_ _null_ _null_	dtof - _null_ ));
+DATA(insert OID = 312 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700 "701" _null_ _null_ _null_	dtof - _null_ _null_ ));
 DESCR("convert float8 to float4");
-DATA(insert OID = 313 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23  "21" _null_ _null_ _null_	i2toi4 - _null_ ));
+DATA(insert OID = 313 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23  "21" _null_ _null_ _null_	i2toi4 - _null_ _null_ ));
 DESCR("convert int2 to int4");
-DATA(insert OID = 314 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21  "23" _null_ _null_ _null_	i4toi2 - _null_ ));
+DATA(insert OID = 314 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21  "23" _null_ _null_ _null_	i4toi2 - _null_ _null_ ));
 DESCR("convert int4 to int2");
-DATA(insert OID = 315 (  int2vectoreq	   PGNSP PGUID 12 1 0 f f t f i 2  16  "22 22" _null_ _null_ _null_ int2vectoreq - _null_ ));
+DATA(insert OID = 315 (  int2vectoreq	   PGNSP PGUID 12 1 0 f f t f i 2  16  "22 22" _null_ _null_ _null_ int2vectoreq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 316 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701  "23" _null_ _null_ _null_	i4tod - _null_ ));
+DATA(insert OID = 316 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701  "23" _null_ _null_ _null_	i4tod - _null_ _null_ ));
 DESCR("convert int4 to float8");
-DATA(insert OID = 317 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23 "701" _null_ _null_ _null_	dtoi4 - _null_ ));
+DATA(insert OID = 317 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23 "701" _null_ _null_ _null_	dtoi4 - _null_ _null_ ));
 DESCR("convert float8 to int4");
-DATA(insert OID = 318 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700  "23" _null_ _null_ _null_	i4tof - _null_ ));
+DATA(insert OID = 318 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700  "23" _null_ _null_ _null_	i4tof - _null_ _null_ ));
 DESCR("convert int4 to float4");
-DATA(insert OID = 319 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23 "700" _null_ _null_ _null_	ftoi4 - _null_ ));
+DATA(insert OID = 319 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23 "700" _null_ _null_ _null_	ftoi4 - _null_ _null_ ));
 DESCR("convert float4 to int4");
 
-DATA(insert OID = 330 (  btgettuple		   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  btgettuple - _null_ ));
+DATA(insert OID = 330 (  btgettuple		   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  btgettuple - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTGETTUPLE_OID 330
 
-DATA(insert OID = 636 (  btgetmulti		   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ btgetmulti - _null_ ));
+DATA(insert OID = 636 (  btgetmulti		   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ btgetmulti - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTGETMULTI_OID 636
 
-DATA(insert OID = 331 (  btinsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	btinsert - _null_ ));
+DATA(insert OID = 331 (  btinsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	btinsert - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTINSERT_OID 331
 
-DATA(insert OID = 333 (  btbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	btbeginscan - _null_ ));
+DATA(insert OID = 333 (  btbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	btbeginscan - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTBEGINSCAN_OID 333
 
-DATA(insert OID = 334 (  btrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ btrescan - _null_ ));
+DATA(insert OID = 334 (  btrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ btrescan - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTRESCAN_OID 334
 
-DATA(insert OID = 335 (  btendscan		   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	btendscan - _null_ ));
+DATA(insert OID = 335 (  btendscan		   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	btendscan - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTENDSCAN_OID 335
 
-DATA(insert OID = 336 (  btmarkpos		   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	btmarkpos - _null_ ));
+DATA(insert OID = 336 (  btmarkpos		   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	btmarkpos - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTMARKPOS_OID 336
 
-DATA(insert OID = 337 (  btrestrpos		   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	btrestrpos - _null_ ));
+DATA(insert OID = 337 (  btrestrpos		   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	btrestrpos - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTRESTRPOS_OID 337
 
-DATA(insert OID = 338 (  btbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ btbuild - _null_ ));
+DATA(insert OID = 338 (  btbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ btbuild - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTBUILD_OID 338
 
-DATA(insert OID = 332 (  btbulkdelete	   PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ btbulkdelete - _null_ ));
+DATA(insert OID = 332 (  btbulkdelete	   PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ btbulkdelete - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTBULKDELETE_OID 332
 
-DATA(insert OID = 972 (  btvacuumcleanup   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ btvacuumcleanup - _null_ ));
+DATA(insert OID = 972 (  btvacuumcleanup   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ btvacuumcleanup - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTVACUUMCLEANUP_OID 972
 
-DATA(insert OID = 1268 (  btcostestimate   PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  btcostestimate - _null_ ));
+DATA(insert OID = 1268 (  btcostestimate   PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  btcostestimate - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTCOSTESTIMATE_OID 1268
 
-DATA(insert OID = 2785 (  btoptions		   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  btoptions - _null_ ));
+DATA(insert OID = 2785 (  btoptions		   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  btoptions - _null_ _null_ ));
 DESCR("btree(internal)");
 #define BTOPTIONS_OID 2785
 
-DATA(insert OID = 339 (  poly_same		   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_same - _null_ ));
+DATA(insert OID = 339 (  poly_same		   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_same - _null_ _null_ ));
 DESCR("same as?");
-DATA(insert OID = 340 (  poly_contain	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_contain - _null_ ));
+DATA(insert OID = 340 (  poly_contain	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_contain - _null_ _null_ ));
 DESCR("contains?");
-DATA(insert OID = 341 (  poly_left		   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_left - _null_ ));
+DATA(insert OID = 341 (  poly_left		   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_left - _null_ _null_ ));
 DESCR("is left of");
-DATA(insert OID = 342 (  poly_overleft	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overleft - _null_ ));
+DATA(insert OID = 342 (  poly_overleft	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overleft - _null_ _null_ ));
 DESCR("overlaps or is left of");
-DATA(insert OID = 343 (  poly_overright    PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overright - _null_ ));
+DATA(insert OID = 343 (  poly_overright    PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overright - _null_ _null_ ));
 DESCR("overlaps or is right of");
-DATA(insert OID = 344 (  poly_right		   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_right - _null_ ));
+DATA(insert OID = 344 (  poly_right		   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_right - _null_ _null_ ));
 DESCR("is right of");
-DATA(insert OID = 345 (  poly_contained    PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_contained - _null_ ));
+DATA(insert OID = 345 (  poly_contained    PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_contained - _null_ _null_ ));
 DESCR("is contained by?");
-DATA(insert OID = 346 (  poly_overlap	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overlap - _null_ ));
+DATA(insert OID = 346 (  poly_overlap	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overlap - _null_ _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 347 (  poly_in		   PGNSP PGUID 12 1 0 f f t f i 1 604 "2275" _null_ _null_ _null_  poly_in - _null_ ));
+DATA(insert OID = 347 (  poly_in		   PGNSP PGUID 12 1 0 f f t f i 1 604 "2275" _null_ _null_ _null_  poly_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 348 (  poly_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "604" _null_ _null_ _null_  poly_out - _null_ ));
+DATA(insert OID = 348 (  poly_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "604" _null_ _null_ _null_  poly_out - _null_ _null_ ));
 DESCR("I/O");
 
-DATA(insert OID = 350 (  btint2cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 21" _null_ _null_ _null_ btint2cmp - _null_ ));
+DATA(insert OID = 350 (  btint2cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 21" _null_ _null_ _null_ btint2cmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 351 (  btint4cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ btint4cmp - _null_ ));
+DATA(insert OID = 351 (  btint4cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ btint4cmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 842 (  btint8cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "20 20" _null_ _null_ _null_ btint8cmp - _null_ ));
+DATA(insert OID = 842 (  btint8cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "20 20" _null_ _null_ _null_ btint8cmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 354 (  btfloat4cmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "700 700" _null_ _null_ _null_ btfloat4cmp - _null_ ));
+DATA(insert OID = 354 (  btfloat4cmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "700 700" _null_ _null_ _null_ btfloat4cmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 355 (  btfloat8cmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "701 701" _null_ _null_ _null_ btfloat8cmp - _null_ ));
+DATA(insert OID = 355 (  btfloat8cmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "701 701" _null_ _null_ _null_ btfloat8cmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 356 (  btoidcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "26 26" _null_ _null_ _null_ btoidcmp - _null_ ));
+DATA(insert OID = 356 (  btoidcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "26 26" _null_ _null_ _null_ btoidcmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 404 (  btoidvectorcmp    PGNSP PGUID 12 1 0 f f t f i 2 23 "30 30" _null_ _null_ _null_ btoidvectorcmp - _null_ ));
+DATA(insert OID = 404 (  btoidvectorcmp    PGNSP PGUID 12 1 0 f f t f i 2 23 "30 30" _null_ _null_ _null_ btoidvectorcmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 357 (  btabstimecmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "702 702" _null_ _null_ _null_ btabstimecmp - _null_ ));
+DATA(insert OID = 357 (  btabstimecmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "702 702" _null_ _null_ _null_ btabstimecmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 358 (  btcharcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "18 18" _null_ _null_ _null_ btcharcmp - _null_ ));
+DATA(insert OID = 358 (  btcharcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "18 18" _null_ _null_ _null_ btcharcmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 359 (  btnamecmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "19 19" _null_ _null_ _null_ btnamecmp - _null_ ));
+DATA(insert OID = 359 (  btnamecmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "19 19" _null_ _null_ _null_ btnamecmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 360 (  bttextcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ bttextcmp - _null_ ));
+DATA(insert OID = 360 (  bttextcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ bttextcmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 377 (  cash_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "790 790" _null_ _null_ _null_ cash_cmp - _null_ ));
+DATA(insert OID = 377 (  cash_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "790 790" _null_ _null_ _null_ cash_cmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 380 (  btreltimecmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "703 703" _null_ _null_ _null_ btreltimecmp - _null_ ));
+DATA(insert OID = 380 (  btreltimecmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "703 703" _null_ _null_ _null_ btreltimecmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 381 (  bttintervalcmp    PGNSP PGUID 12 1 0 f f t f i 2 23 "704 704" _null_ _null_ _null_ bttintervalcmp - _null_ ));
+DATA(insert OID = 381 (  bttintervalcmp    PGNSP PGUID 12 1 0 f f t f i 2 23 "704 704" _null_ _null_ _null_ bttintervalcmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 382 (  btarraycmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 2277" _null_ _null_ _null_ btarraycmp - _null_ ));
+DATA(insert OID = 382 (  btarraycmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 2277" _null_ _null_ _null_ btarraycmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
 
-DATA(insert OID = 361 (  lseg_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "601 601" _null_ _null_ _null_	lseg_distance - _null_ ));
+DATA(insert OID = 361 (  lseg_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "601 601" _null_ _null_ _null_	lseg_distance - _null_ _null_ ));
 DESCR("distance between");
-DATA(insert OID = 362 (  lseg_interpt	   PGNSP PGUID 12 1 0 f f t f i 2 600 "601 601" _null_ _null_ _null_	lseg_interpt - _null_ ));
+DATA(insert OID = 362 (  lseg_interpt	   PGNSP PGUID 12 1 0 f f t f i 2 600 "601 601" _null_ _null_ _null_	lseg_interpt - _null_ _null_ ));
 DESCR("intersection point");
-DATA(insert OID = 363 (  dist_ps		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 601" _null_ _null_ _null_	dist_ps - _null_ ));
+DATA(insert OID = 363 (  dist_ps		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 601" _null_ _null_ _null_	dist_ps - _null_ _null_ ));
 DESCR("distance between");
-DATA(insert OID = 364 (  dist_pb		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 603" _null_ _null_ _null_	dist_pb - _null_ ));
+DATA(insert OID = 364 (  dist_pb		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 603" _null_ _null_ _null_	dist_pb - _null_ _null_ ));
 DESCR("distance between point and box");
-DATA(insert OID = 365 (  dist_sb		   PGNSP PGUID 12 1 0 f f t f i 2 701 "601 603" _null_ _null_ _null_	dist_sb - _null_ ));
+DATA(insert OID = 365 (  dist_sb		   PGNSP PGUID 12 1 0 f f t f i 2 701 "601 603" _null_ _null_ _null_	dist_sb - _null_ _null_ ));
 DESCR("distance between segment and box");
-DATA(insert OID = 366 (  close_ps		   PGNSP PGUID 12 1 0 f f t f i 2 600 "600 601" _null_ _null_ _null_	close_ps - _null_ ));
+DATA(insert OID = 366 (  close_ps		   PGNSP PGUID 12 1 0 f f t f i 2 600 "600 601" _null_ _null_ _null_	close_ps - _null_ _null_ ));
 DESCR("closest point on line segment");
-DATA(insert OID = 367 (  close_pb		   PGNSP PGUID 12 1 0 f f t f i 2 600 "600 603" _null_ _null_ _null_	close_pb - _null_ ));
+DATA(insert OID = 367 (  close_pb		   PGNSP PGUID 12 1 0 f f t f i 2 600 "600 603" _null_ _null_ _null_	close_pb - _null_ _null_ ));
 DESCR("closest point on box");
-DATA(insert OID = 368 (  close_sb		   PGNSP PGUID 12 1 0 f f t f i 2 600 "601 603" _null_ _null_ _null_	close_sb - _null_ ));
+DATA(insert OID = 368 (  close_sb		   PGNSP PGUID 12 1 0 f f t f i 2 600 "601 603" _null_ _null_ _null_	close_sb - _null_ _null_ ));
 DESCR("closest point to line segment on box");
-DATA(insert OID = 369 (  on_ps			   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 601" _null_ _null_ _null_ on_ps - _null_ ));
+DATA(insert OID = 369 (  on_ps			   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 601" _null_ _null_ _null_ on_ps - _null_ _null_ ));
 DESCR("point contained in segment?");
-DATA(insert OID = 370 (  path_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "602 602" _null_ _null_ _null_	path_distance - _null_ ));
+DATA(insert OID = 370 (  path_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "602 602" _null_ _null_ _null_	path_distance - _null_ _null_ ));
 DESCR("distance between paths");
-DATA(insert OID = 371 (  dist_ppath		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 602" _null_ _null_ _null_	dist_ppath - _null_ ));
+DATA(insert OID = 371 (  dist_ppath		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 602" _null_ _null_ _null_	dist_ppath - _null_ _null_ ));
 DESCR("distance between point and path");
-DATA(insert OID = 372 (  on_sb			   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 603" _null_ _null_ _null_ on_sb - _null_ ));
+DATA(insert OID = 372 (  on_sb			   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 603" _null_ _null_ _null_ on_sb - _null_ _null_ ));
 DESCR("lseg contained in box?");
-DATA(insert OID = 373 (  inter_sb		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 603" _null_ _null_ _null_ inter_sb - _null_ ));
+DATA(insert OID = 373 (  inter_sb		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 603" _null_ _null_ _null_ inter_sb - _null_ _null_ ));
 DESCR("intersect?");
 
 /* OIDS 400 - 499 */
 
-DATA(insert OID =  401 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "1042" _null_ _null_ _null_	rtrim1 - _null_ ));
+DATA(insert OID =  401 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "1042" _null_ _null_ _null_	rtrim1 - _null_ _null_ ));
 DESCR("convert char(n) to text");
-DATA(insert OID =  406 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "19" _null_ _null_ _null_ name_text - _null_ ));
+DATA(insert OID =  406 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "19" _null_ _null_ _null_ name_text - _null_ _null_ ));
 DESCR("convert name to text");
-DATA(insert OID =  407 (  name			   PGNSP PGUID 12 1 0 f f t f i 1 19 "25" _null_ _null_ _null_ text_name - _null_ ));
+DATA(insert OID =  407 (  name			   PGNSP PGUID 12 1 0 f f t f i 1 19 "25" _null_ _null_ _null_ text_name - _null_ _null_ ));
 DESCR("convert text to name");
-DATA(insert OID =  408 (  bpchar		   PGNSP PGUID 12 1 0 f f t f i 1 1042 "19" _null_ _null_ _null_ name_bpchar - _null_ ));
+DATA(insert OID =  408 (  bpchar		   PGNSP PGUID 12 1 0 f f t f i 1 1042 "19" _null_ _null_ _null_ name_bpchar - _null_ _null_ ));
 DESCR("convert name to char(n)");
-DATA(insert OID =  409 (  name			   PGNSP PGUID 12 1 0 f f t f i 1 19 "1042" _null_ _null_ _null_	bpchar_name - _null_ ));
+DATA(insert OID =  409 (  name			   PGNSP PGUID 12 1 0 f f t f i 1 19 "1042" _null_ _null_ _null_	bpchar_name - _null_ _null_ ));
 DESCR("convert char(n) to name");
 
-DATA(insert OID = 440 (  hashgettuple	   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  hashgettuple - _null_ ));
+DATA(insert OID = 440 (  hashgettuple	   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  hashgettuple - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 637 (  hashgetmulti	   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ hashgetmulti - _null_ ));
+DATA(insert OID = 637 (  hashgetmulti	   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ hashgetmulti - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 441 (  hashinsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	hashinsert - _null_ ));
+DATA(insert OID = 441 (  hashinsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	hashinsert - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 443 (  hashbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	hashbeginscan - _null_ ));
+DATA(insert OID = 443 (  hashbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	hashbeginscan - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 444 (  hashrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ hashrescan - _null_ ));
+DATA(insert OID = 444 (  hashrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ hashrescan - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 445 (  hashendscan	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	hashendscan - _null_ ));
+DATA(insert OID = 445 (  hashendscan	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	hashendscan - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 446 (  hashmarkpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	hashmarkpos - _null_ ));
+DATA(insert OID = 446 (  hashmarkpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	hashmarkpos - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 447 (  hashrestrpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	hashrestrpos - _null_ ));
+DATA(insert OID = 447 (  hashrestrpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	hashrestrpos - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 448 (  hashbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ hashbuild - _null_ ));
+DATA(insert OID = 448 (  hashbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ hashbuild - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 442 (  hashbulkdelete    PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ hashbulkdelete - _null_ ));
+DATA(insert OID = 442 (  hashbulkdelete    PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ hashbulkdelete - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 425 (  hashvacuumcleanup PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ hashvacuumcleanup - _null_ ));
+DATA(insert OID = 425 (  hashvacuumcleanup PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ hashvacuumcleanup - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 438 (  hashcostestimate  PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  hashcostestimate - _null_ ));
+DATA(insert OID = 438 (  hashcostestimate  PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  hashcostestimate - _null_ _null_ ));
 DESCR("hash(internal)");
-DATA(insert OID = 2786 (  hashoptions	   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  hashoptions - _null_ ));
+DATA(insert OID = 2786 (  hashoptions	   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  hashoptions - _null_ _null_ ));
 DESCR("hash(internal)");
 
-DATA(insert OID = 449 (  hashint2		   PGNSP PGUID 12 1 0 f f t f i 1 23 "21" _null_ _null_ _null_	hashint2 - _null_ ));
+DATA(insert OID = 449 (  hashint2		   PGNSP PGUID 12 1 0 f f t f i 1 23 "21" _null_ _null_ _null_	hashint2 - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 450 (  hashint4		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	hashint4 - _null_ ));
+DATA(insert OID = 450 (  hashint4		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	hashint4 - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 949 (  hashint8		   PGNSP PGUID 12 1 0 f f t f i 1 23 "20" _null_ _null_ _null_	hashint8 - _null_ ));
+DATA(insert OID = 949 (  hashint8		   PGNSP PGUID 12 1 0 f f t f i 1 23 "20" _null_ _null_ _null_	hashint8 - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 451 (  hashfloat4		   PGNSP PGUID 12 1 0 f f t f i 1 23 "700" _null_ _null_ _null_ hashfloat4 - _null_ ));
+DATA(insert OID = 451 (  hashfloat4		   PGNSP PGUID 12 1 0 f f t f i 1 23 "700" _null_ _null_ _null_ hashfloat4 - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 452 (  hashfloat8		   PGNSP PGUID 12 1 0 f f t f i 1 23 "701" _null_ _null_ _null_ hashfloat8 - _null_ ));
+DATA(insert OID = 452 (  hashfloat8		   PGNSP PGUID 12 1 0 f f t f i 1 23 "701" _null_ _null_ _null_ hashfloat8 - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 453 (  hashoid		   PGNSP PGUID 12 1 0 f f t f i 1 23 "26" _null_ _null_ _null_	hashoid - _null_ ));
+DATA(insert OID = 453 (  hashoid		   PGNSP PGUID 12 1 0 f f t f i 1 23 "26" _null_ _null_ _null_	hashoid - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 454 (  hashchar		   PGNSP PGUID 12 1 0 f f t f i 1 23 "18" _null_ _null_ _null_	hashchar - _null_ ));
+DATA(insert OID = 454 (  hashchar		   PGNSP PGUID 12 1 0 f f t f i 1 23 "18" _null_ _null_ _null_	hashchar - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 455 (  hashname		   PGNSP PGUID 12 1 0 f f t f i 1 23 "19" _null_ _null_ _null_	hashname - _null_ ));
+DATA(insert OID = 455 (  hashname		   PGNSP PGUID 12 1 0 f f t f i 1 23 "19" _null_ _null_ _null_	hashname - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 400 (  hashtext		   PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_ hashtext - _null_ ));
+DATA(insert OID = 400 (  hashtext		   PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_ hashtext - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 456 (  hashvarlena	   PGNSP PGUID 12 1 0 f f t f i 1 23 "2281" _null_ _null_ _null_ hashvarlena - _null_ ));
+DATA(insert OID = 456 (  hashvarlena	   PGNSP PGUID 12 1 0 f f t f i 1 23 "2281" _null_ _null_ _null_ hashvarlena - _null_ _null_ ));
 DESCR("hash any varlena type");
-DATA(insert OID = 457 (  hashoidvector	   PGNSP PGUID 12 1 0 f f t f i 1 23 "30" _null_ _null_ _null_	hashoidvector - _null_ ));
+DATA(insert OID = 457 (  hashoidvector	   PGNSP PGUID 12 1 0 f f t f i 1 23 "30" _null_ _null_ _null_	hashoidvector - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 329 (  hash_aclitem	   PGNSP PGUID 12 1 0 f f t f i 1 23 "1033" _null_ _null_ _null_	hash_aclitem - _null_ ));
+DATA(insert OID = 329 (  hash_aclitem	   PGNSP PGUID 12 1 0 f f t f i 1 23 "1033" _null_ _null_ _null_	hash_aclitem - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 398 (  hashint2vector    PGNSP PGUID 12 1 0 f f t f i 1 23 "22" _null_ _null_ _null_	hashint2vector - _null_ ));
+DATA(insert OID = 398 (  hashint2vector    PGNSP PGUID 12 1 0 f f t f i 1 23 "22" _null_ _null_ _null_	hashint2vector - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 399 (  hashmacaddr	   PGNSP PGUID 12 1 0 f f t f i 1 23 "829" _null_ _null_ _null_ hashmacaddr - _null_ ));
+DATA(insert OID = 399 (  hashmacaddr	   PGNSP PGUID 12 1 0 f f t f i 1 23 "829" _null_ _null_ _null_ hashmacaddr - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 422 (  hashinet		   PGNSP PGUID 12 1 0 f f t f i 1 23 "869" _null_ _null_ _null_ hashinet - _null_ ));
+DATA(insert OID = 422 (  hashinet		   PGNSP PGUID 12 1 0 f f t f i 1 23 "869" _null_ _null_ _null_ hashinet - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 458 (  text_larger	   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ text_larger - _null_ ));
+DATA(insert OID = 432 (  hash_numeric	   PGNSP PGUID 12 1 0 f f t f i 1 23 "1700" _null_ _null_ _null_ hash_numeric - _null_ _null_ ));
+DESCR("hash");
+DATA(insert OID = 458 (  text_larger	   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ text_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 459 (  text_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ text_smaller - _null_ ));
+DATA(insert OID = 459 (  text_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ text_smaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 460 (  int8in			   PGNSP PGUID 12 1 0 f f t f i 1 20 "2275" _null_ _null_ _null_ int8in - _null_ ));
+DATA(insert OID = 460 (  int8in			   PGNSP PGUID 12 1 0 f f t f i 1 20 "2275" _null_ _null_ _null_ int8in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 461 (  int8out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "20" _null_ _null_ _null_ int8out - _null_ ));
+DATA(insert OID = 461 (  int8out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "20" _null_ _null_ _null_ int8out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 462 (  int8um			   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8um - _null_ ));
+DATA(insert OID = 462 (  int8um			   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8um - _null_ _null_ ));
 DESCR("negate");
-DATA(insert OID = 463 (  int8pl			   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8pl - _null_ ));
+DATA(insert OID = 463 (  int8pl			   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 464 (  int8mi			   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mi - _null_ ));
+DATA(insert OID = 464 (  int8mi			   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 465 (  int8mul		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mul - _null_ ));
+DATA(insert OID = 465 (  int8mul		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 466 (  int8div		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8div - _null_ ));
+DATA(insert OID = 466 (  int8div		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 467 (  int8eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8eq - _null_ ));
+DATA(insert OID = 467 (  int8eq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 468 (  int8ne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8ne - _null_ ));
+DATA(insert OID = 468 (  int8ne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 469 (  int8lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8lt - _null_ ));
+DATA(insert OID = 469 (  int8lt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 470 (  int8gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8gt - _null_ ));
+DATA(insert OID = 470 (  int8gt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 471 (  int8le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8le - _null_ ));
+DATA(insert OID = 471 (  int8le			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 472 (  int8ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8ge - _null_ ));
+DATA(insert OID = 472 (  int8ge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 20" _null_ _null_ _null_ int8ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 474 (  int84eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84eq - _null_ ));
+DATA(insert OID = 474 (  int84eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 475 (  int84ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84ne - _null_ ));
+DATA(insert OID = 475 (  int84ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 476 (  int84lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84lt - _null_ ));
+DATA(insert OID = 476 (  int84lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 477 (  int84gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84gt - _null_ ));
+DATA(insert OID = 477 (  int84gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 478 (  int84le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84le - _null_ ));
+DATA(insert OID = 478 (  int84le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 479 (  int84ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84ge - _null_ ));
+DATA(insert OID = 479 (  int84ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 23" _null_ _null_ _null_ int84ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 480 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23 "20" _null_ _null_ _null_ int84 - _null_ ));
+DATA(insert OID = 480 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1  23 "20" _null_ _null_ _null_ int84 - _null_ _null_ ));
 DESCR("convert int8 to int4");
-DATA(insert OID = 481 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "23" _null_ _null_ _null_ int48 - _null_ ));
+DATA(insert OID = 481 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "23" _null_ _null_ _null_ int48 - _null_ _null_ ));
 DESCR("convert int4 to int8");
-DATA(insert OID = 482 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701 "20" _null_ _null_ _null_ i8tod - _null_ ));
+DATA(insert OID = 482 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701 "20" _null_ _null_ _null_ i8tod - _null_ _null_ ));
 DESCR("convert int8 to float8");
-DATA(insert OID = 483 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "701" _null_ _null_ _null_	dtoi8 - _null_ ));
+DATA(insert OID = 483 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "701" _null_ _null_ _null_	dtoi8 - _null_ _null_ ));
 DESCR("convert float8 to int8");
 
 /* OIDS 500 - 599 */
 
 /* OIDS 600 - 699 */
 
-DATA(insert OID = 652 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700 "20" _null_ _null_ _null_ i8tof - _null_ ));
+DATA(insert OID = 652 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700 "20" _null_ _null_ _null_ i8tof - _null_ _null_ ));
 DESCR("convert int8 to float4");
-DATA(insert OID = 653 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "700" _null_ _null_ _null_	ftoi8 - _null_ ));
+DATA(insert OID = 653 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "700" _null_ _null_ _null_	ftoi8 - _null_ _null_ ));
 DESCR("convert float4 to int8");
 
-DATA(insert OID = 714 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21 "20" _null_ _null_ _null_ int82 - _null_ ));
+DATA(insert OID = 714 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1  21 "20" _null_ _null_ _null_ int82 - _null_ _null_ ));
 DESCR("convert int8 to int2");
-DATA(insert OID = 754 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "21" _null_ _null_ _null_ int28 - _null_ ));
+DATA(insert OID = 754 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1  20 "21" _null_ _null_ _null_ int28 - _null_ _null_ ));
 DESCR("convert int2 to int8");
 
-DATA(insert OID = 1285 (  int4notin		   PGNSP PGUID 12 1 0 f f t f s 2 16 "23 25" _null_ _null_ _null_ int4notin - _null_ ));
-DESCR("not in");
-DATA(insert OID = 1286 (  oidnotin		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ oidnotin - _null_ ));
-DESCR("not in");
-DATA(insert OID = 655 (  namelt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namelt - _null_ ));
+DATA(insert OID = 655 (  namelt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namelt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 656 (  namele			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namele - _null_ ));
+DATA(insert OID = 656 (  namele			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namele - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 657 (  namegt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namegt - _null_ ));
+DATA(insert OID = 657 (  namegt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namegt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 658 (  namege			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namege - _null_ ));
+DATA(insert OID = 658 (  namege			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namege - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 659 (  namene			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namene - _null_ ));
+DATA(insert OID = 659 (  namene			   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ namene - _null_ _null_ ));
 DESCR("not equal");
 
-DATA(insert OID = 668 (  bpchar			   PGNSP PGUID 12 1 0 f f t f i 3 1042 "1042 23 16" _null_ _null_ _null_ bpchar - _null_ ));
+DATA(insert OID = 668 (  bpchar			   PGNSP PGUID 12 1 0 f f t f i 3 1042 "1042 23 16" _null_ _null_ _null_ bpchar - _null_ _null_ ));
 DESCR("adjust char() to typmod length");
-DATA(insert OID = 669 (  varchar		   PGNSP PGUID 12 1 0 f f t f i 3 1043 "1043 23 16" _null_ _null_ _null_ varchar - _null_ ));
+DATA(insert OID = 669 (  varchar		   PGNSP PGUID 12 1 0 f f t f i 3 1043 "1043 23 16" _null_ _null_ _null_ varchar - _null_ _null_ ));
 DESCR("adjust varchar() to typmod length");
 
-DATA(insert OID = 676 (  mktinterval	   PGNSP PGUID 12 1 0 f f t f i 2 704 "702 702" _null_ _null_ _null_ mktinterval - _null_ ));
+DATA(insert OID = 676 (  mktinterval	   PGNSP PGUID 12 1 0 f f t f i 2 704 "702 702" _null_ _null_ _null_ mktinterval - _null_ _null_ ));
 DESCR("convert to tinterval");
-DATA(insert OID = 619 (  oidvectorne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorne - _null_ ));
+DATA(insert OID = 619 (  oidvectorne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 677 (  oidvectorlt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorlt - _null_ ));
+DATA(insert OID = 677 (  oidvectorlt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorlt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 678 (  oidvectorle	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorle - _null_ ));
+DATA(insert OID = 678 (  oidvectorle	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorle - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 679 (  oidvectoreq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectoreq - _null_ ));
+DATA(insert OID = 679 (  oidvectoreq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectoreq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 680 (  oidvectorge	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorge - _null_ ));
+DATA(insert OID = 680 (  oidvectorge	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 681 (  oidvectorgt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorgt - _null_ ));
+DATA(insert OID = 681 (  oidvectorgt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "30 30" _null_ _null_ _null_ oidvectorgt - _null_ _null_ ));
 DESCR("greater-than");
 
 /* OIDS 700 - 799 */
-DATA(insert OID = 710 (  getpgusername	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ current_user - _null_ ));
+DATA(insert OID = 710 (  getpgusername	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ current_user - _null_ _null_ ));
 DESCR("deprecated -- use current_user");
-DATA(insert OID = 716 (  oidlt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidlt - _null_ ));
+DATA(insert OID = 716 (  oidlt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidlt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 717 (  oidle			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidle - _null_ ));
+DATA(insert OID = 717 (  oidle			   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidle - _null_ _null_ ));
 DESCR("less-than-or-equal");
 
-DATA(insert OID = 720 (  octet_length	   PGNSP PGUID 12 1 0 f f t f i 1 23 "17" _null_ _null_ _null_	byteaoctetlen - _null_ ));
+DATA(insert OID = 720 (  octet_length	   PGNSP PGUID 12 1 0 f f t f i 1 23 "17" _null_ _null_ _null_	byteaoctetlen - _null_ _null_ ));
 DESCR("octet length");
-DATA(insert OID = 721 (  get_byte		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 23" _null_ _null_ _null_ byteaGetByte - _null_ ));
+DATA(insert OID = 721 (  get_byte		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 23" _null_ _null_ _null_ byteaGetByte - _null_ _null_ ));
 DESCR("get byte");
-DATA(insert OID = 722 (  set_byte		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	byteaSetByte - _null_ ));
+DATA(insert OID = 722 (  set_byte		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	byteaSetByte - _null_ _null_ ));
 DESCR("set byte");
-DATA(insert OID = 723 (  get_bit		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 23" _null_ _null_ _null_ byteaGetBit - _null_ ));
+DATA(insert OID = 723 (  get_bit		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 23" _null_ _null_ _null_ byteaGetBit - _null_ _null_ ));
 DESCR("get bit");
-DATA(insert OID = 724 (  set_bit		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	byteaSetBit - _null_ ));
+DATA(insert OID = 724 (  set_bit		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	byteaSetBit - _null_ _null_ ));
 DESCR("set bit");
 
-DATA(insert OID = 725 (  dist_pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 628" _null_ _null_ _null_	dist_pl - _null_ ));
+DATA(insert OID = 725 (  dist_pl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 628" _null_ _null_ _null_	dist_pl - _null_ _null_ ));
 DESCR("distance between point and line");
-DATA(insert OID = 726 (  dist_lb		   PGNSP PGUID 12 1 0 f f t f i 2 701 "628 603" _null_ _null_ _null_	dist_lb - _null_ ));
+DATA(insert OID = 726 (  dist_lb		   PGNSP PGUID 12 1 0 f f t f i 2 701 "628 603" _null_ _null_ _null_	dist_lb - _null_ _null_ ));
 DESCR("distance between line and box");
-DATA(insert OID = 727 (  dist_sl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "601 628" _null_ _null_ _null_	dist_sl - _null_ ));
+DATA(insert OID = 727 (  dist_sl		   PGNSP PGUID 12 1 0 f f t f i 2 701 "601 628" _null_ _null_ _null_	dist_sl - _null_ _null_ ));
 DESCR("distance between lseg and line");
-DATA(insert OID = 728 (  dist_cpoly		   PGNSP PGUID 12 1 0 f f t f i 2 701 "718 604" _null_ _null_ _null_	dist_cpoly - _null_ ));
+DATA(insert OID = 728 (  dist_cpoly		   PGNSP PGUID 12 1 0 f f t f i 2 701 "718 604" _null_ _null_ _null_	dist_cpoly - _null_ _null_ ));
 DESCR("distance between");
-DATA(insert OID = 729 (  poly_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "604 604" _null_ _null_ _null_	poly_distance - _null_ ));
+DATA(insert OID = 729 (  poly_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "604 604" _null_ _null_ _null_	poly_distance - _null_ _null_ ));
 DESCR("distance between");
 
-DATA(insert OID = 740 (  text_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_lt - _null_ ));
+DATA(insert OID = 740 (  text_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 741 (  text_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_le - _null_ ));
+DATA(insert OID = 741 (  text_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 742 (  text_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_gt - _null_ ));
+DATA(insert OID = 742 (  text_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 743 (  text_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_ge - _null_ ));
+DATA(insert OID = 743 (  text_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 745 (  current_user	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ current_user - _null_ ));
+DATA(insert OID = 745 (  current_user	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ current_user - _null_ _null_ ));
 DESCR("current user name");
-DATA(insert OID = 746 (  session_user	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ session_user - _null_ ));
+DATA(insert OID = 746 (  session_user	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ session_user - _null_ _null_ ));
 DESCR("session user name");
 
-DATA(insert OID = 744 (  array_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_eq - _null_ ));
+DATA(insert OID = 744 (  array_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_eq - _null_ _null_ ));
 DESCR("array equal");
-DATA(insert OID = 390 (  array_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_ne - _null_ ));
+DATA(insert OID = 390 (  array_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_ne - _null_ _null_ ));
 DESCR("array not equal");
-DATA(insert OID = 391 (  array_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_lt - _null_ ));
+DATA(insert OID = 391 (  array_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_lt - _null_ _null_ ));
 DESCR("array less than");
-DATA(insert OID = 392 (  array_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_gt - _null_ ));
+DATA(insert OID = 392 (  array_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_gt - _null_ _null_ ));
 DESCR("array greater than");
-DATA(insert OID = 393 (  array_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_le - _null_ ));
+DATA(insert OID = 393 (  array_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_le - _null_ _null_ ));
 DESCR("array less than or equal");
-DATA(insert OID = 396 (  array_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_ge - _null_ ));
+DATA(insert OID = 396 (  array_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ array_ge - _null_ _null_ ));
 DESCR("array greater than or equal");
 /* TODO: array_ndims OID is 748 */
-DATA(insert OID = 3400 (  array_ndims		   PGNSP PGUID 12 1 0 f f t f i 1 23 "2277" _null_ _null_ _null_ array_ndims - _null_ ));
+DATA(insert OID = 3400 (  array_ndims		   PGNSP PGUID 12 1 0 f f t f i 1 23 "2277" _null_ _null_ _null_ array_ndims - _null_  _null_ ));
 DESCR("array dimensions");
-DATA(insert OID = 747 (  array_dims		   PGNSP PGUID 12 1 0 f f t f i 1 25 "2277" _null_ _null_ _null_ array_dims - _null_ ));
+DATA(insert OID = 747 (  array_dims		   PGNSP PGUID 12 1 0 f f t f i 1 25 "2277" _null_ _null_ _null_ array_dims - _null_ _null_ ));
 DESCR("array dimensions");
-DATA(insert OID = 750 (  array_in		   PGNSP PGUID 12 1 0 f f t f s 3 2277 "2275 26 23" _null_ _null_ _null_	array_in - _null_ ));
+DATA(insert OID = 750 (  array_in		   PGNSP PGUID 12 1 0 f f t f s 3 2277 "2275 26 23" _null_ _null_ _null_	array_in - _null_ _null_ ));
 DESCR("I/O");
 #define ARRAY_OUT_OID 751
-DATA(insert OID = 751 (  array_out		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "2277" _null_ _null_ _null_	array_out - _null_ ));
+DATA(insert OID = 751 (  array_out		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "2277" _null_ _null_ _null_	array_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2091 (  array_lower	   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 23" _null_ _null_ _null_ array_lower - _null_ ));
+DATA(insert OID = 2091 (  array_lower	   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 23" _null_ _null_ _null_ array_lower - _null_ _null_ ));
 DESCR("array lower dimension");
-DATA(insert OID = 2092 (  array_upper	   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 23" _null_ _null_ _null_ array_upper - _null_ ));
+DATA(insert OID = 2092 (  array_upper	   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 23" _null_ _null_ _null_ array_upper - _null_ _null_ ));
 DESCR("array upper dimension");
 /* TODO: array_length OID is 2176 */
-DATA(insert OID = 3401 (  array_length	   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 23" _null_ _null_ _null_ array_length - _null_ ));
+DATA(insert OID = 3401 (  array_length	   PGNSP PGUID 12 1 0 f f t f i 2 23 "2277 23" _null_ _null_ _null_ array_length - _null_ _null_ ));
 DESCR("array length");
-DATA(insert OID = 378 (  array_append	   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2277 2283" _null_ _null_ _null_ array_push - _null_ ));
+DATA(insert OID = 378 (  array_append	   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2277 2283" _null_ _null_ _null_ array_push - _null_ _null_ ));
 DESCR("append element onto end of array");
-DATA(insert OID = 379 (  array_prepend	   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2283 2277" _null_ _null_ _null_ array_push - _null_ ));
+DATA(insert OID = 379 (  array_prepend	   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2283 2277" _null_ _null_ _null_ array_push - _null_ _null_ ));
 DESCR("prepend element onto front of array");
-DATA(insert OID = 383 (  array_cat		   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2277 2277" _null_ _null_ _null_ array_cat - _null_ ));
+DATA(insert OID = 383 (  array_cat		   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2277 2277" _null_ _null_ _null_ array_cat - _null_ _null_ ));
 DESCR("concatenate two arrays");
-DATA(insert OID = 384  (  array_coerce	   PGNSP PGUID 12 1 0 f f t f s 1 2277 "2277" _null_ _null_ _null_ array_type_coerce - _null_ ));
-DESCR("coerce array to another array type");
-DATA(insert OID = 394 (  string_to_array   PGNSP PGUID 12 1 0 f f t f i 2 1009 "25 25" _null_ _null_ _null_ text_to_array - _null_ ));
+DATA(insert OID = 394 (  string_to_array   PGNSP PGUID 12 1 0 f f t f i 2 1009 "25 25" _null_ _null_ _null_ text_to_array - _null_ _null_ ));
 DESCR("split delimited text into text[]");
-DATA(insert OID = 395 (  array_to_string   PGNSP PGUID 12 1 0 f f t f i 2 25 "2277 25" _null_ _null_ _null_ array_to_text - _null_ ));
+DATA(insert OID = 395 (  array_to_string   PGNSP PGUID 12 1 0 f f t f i 2 25 "2277 25" _null_ _null_ _null_ array_to_text - _null_ _null_ ));
 DESCR("concatenate array elements, using delimiter, into text");
-DATA(insert OID = 515 (  array_larger	   PGNSP PGUID 12 1 0 f f t f i 2 2277 "2277 2277" _null_ _null_ _null_ array_larger - _null_ ));
+DATA(insert OID = 515 (  array_larger	   PGNSP PGUID 12 1 0 f f t f i 2 2277 "2277 2277" _null_ _null_ _null_ array_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 516 (  array_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 2277 "2277 2277" _null_ _null_ _null_ array_smaller - _null_ ));
+DATA(insert OID = 516 (  array_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 2277 "2277 2277" _null_ _null_ _null_ array_smaller - _null_ _null_ ));
 DESCR("smaller of two");
 /* TODO: generate_subscripts OID is 1191 */
-DATA(insert OID = 3402 (  generate_subscripts PGNSP PGUID 12 1 1000 f f t t i 3 23 "2277 23 16" _null_ _null_ _null_ generate_subscripts - _null_ ));
+DATA(insert OID = 3402 (  generate_subscripts PGNSP PGUID 12 1 1000 f f t t i 3 23 "2277 23 16" _null_ _null_ _null_ generate_subscripts - _null_ _null_ ));
 DESCR("array subscripts generator");
 /* TODO: generate_subscripts OID is 1192 */
-DATA(insert OID = 3403 (  generate_subscripts PGNSP PGUID 12 1 1000 f f t t i 2 23 "2277 23" _null_ _null_ _null_ generate_subscripts_nodir - _null_ ));
+DATA(insert OID = 3403 (  generate_subscripts PGNSP PGUID 12 1 1000 f f t t i 2 23 "2277 23" _null_ _null_ _null_ generate_subscripts_nodir - _null_ _null_ ));
 DESCR("array subscripts generator");
 /* TODO: array_fill OID is 1193 */
-DATA(insert OID = 3404 (  array_fill 	   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2283 1007" _null_ _null_ _null_ array_fill - _null_ ));
+DATA(insert OID = 3404 (  array_fill 	   PGNSP PGUID 12 1 0 f f f f i 2 2277 "2283 1007" _null_ _null_ _null_ array_fill - _null_ _null_ ));
 DESCR("array constructor with value");
 /* TODO: array_fill OID is 1286 */
-DATA(insert OID = 3405 (  array_fill 	   PGNSP PGUID 12 1 0 f f f f i 3 2277 "2283 1007 1007" _null_ _null_ _null_ array_fill_with_lower_bounds - _null_ ));
+DATA(insert OID = 3405 (  array_fill 	   PGNSP PGUID 12 1 0 f f f f i 3 2277 "2283 1007 1007" _null_ _null_ _null_ array_fill_with_lower_bounds - _null_ _null_ ));
 DESCR("array constructor with value");
 
-DATA(insert OID = 760 (  smgrin			   PGNSP PGUID 12 1 0 f f t f s 1 210 "2275" _null_ _null_ _null_  smgrin - _null_ ));
+DATA(insert OID = 760 (  smgrin			   PGNSP PGUID 12 1 0 f f t f s 1 210 "2275" _null_ _null_ _null_  smgrin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 761 (  smgrout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "210" _null_ _null_ _null_  smgrout - _null_ ));
+DATA(insert OID = 761 (  smgrout		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "210" _null_ _null_ _null_  smgrout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 762 (  smgreq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "210 210" _null_ _null_ _null_ smgreq - _null_ ));
+DATA(insert OID = 762 (  smgreq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "210 210" _null_ _null_ _null_ smgreq - _null_ _null_ ));
 DESCR("storage manager");
-DATA(insert OID = 763 (  smgrne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "210 210" _null_ _null_ _null_ smgrne - _null_ ));
+DATA(insert OID = 763 (  smgrne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "210 210" _null_ _null_ _null_ smgrne - _null_ _null_ ));
 DESCR("storage manager");
 
-DATA(insert OID = 764 (  lo_import		   PGNSP PGUID 12 1 0 f f t f v 1 26 "25" _null_ _null_ _null_	lo_import - _null_ ));
+DATA(insert OID = 764 (  lo_import		   PGNSP PGUID 12 1 0 f f t f v 1 26 "25" _null_ _null_ _null_	lo_import - _null_ _null_ ));
 DESCR("large object import");
-DATA(insert OID = 765 (  lo_export		   PGNSP PGUID 12 1 0 f f t f v 2 23 "26 25" _null_ _null_ _null_ lo_export - _null_ ));
+DATA(insert OID = 765 (  lo_export		   PGNSP PGUID 12 1 0 f f t f v 2 23 "26 25" _null_ _null_ _null_ lo_export - _null_ _null_ ));
 DESCR("large object export");
 
-DATA(insert OID = 766 (  int4inc		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4inc - _null_ ));
+DATA(insert OID = 766 (  int4inc		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4inc - _null_ _null_ ));
 DESCR("increment");
-DATA(insert OID = 768 (  int4larger		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4larger - _null_ ));
+DATA(insert OID = 768 (  int4larger		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 769 (  int4smaller	   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4smaller - _null_ ));
+DATA(insert OID = 769 (  int4smaller	   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4smaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 770 (  int2larger		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2larger - _null_ ));
+DATA(insert OID = 770 (  int2larger		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 771 (  int2smaller	   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2smaller - _null_ ));
+DATA(insert OID = 771 (  int2smaller	   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2smaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 774 (  gistgettuple	   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  gistgettuple - _null_ ));
+DATA(insert OID = 774 (  gistgettuple	   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  gistgettuple - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 638 (  gistgetmulti	   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ gistgetmulti - _null_ ));
+DATA(insert OID = 638 (  gistgetmulti	   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ gistgetmulti - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 775 (  gistinsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	gistinsert - _null_ ));
+DATA(insert OID = 775 (  gistinsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	gistinsert - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 777 (  gistbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	gistbeginscan - _null_ ));
+DATA(insert OID = 777 (  gistbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	gistbeginscan - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 778 (  gistrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ gistrescan - _null_ ));
+DATA(insert OID = 778 (  gistrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ gistrescan - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 779 (  gistendscan	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	gistendscan - _null_ ));
+DATA(insert OID = 779 (  gistendscan	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	gistendscan - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 780 (  gistmarkpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	gistmarkpos - _null_ ));
+DATA(insert OID = 780 (  gistmarkpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	gistmarkpos - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 781 (  gistrestrpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	gistrestrpos - _null_ ));
+DATA(insert OID = 781 (  gistrestrpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	gistrestrpos - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 782 (  gistbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ gistbuild - _null_ ));
+DATA(insert OID = 782 (  gistbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ gistbuild - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 776 (  gistbulkdelete    PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ gistbulkdelete - _null_ ));
+DATA(insert OID = 776 (  gistbulkdelete    PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ gistbulkdelete - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 2561 (  gistvacuumcleanup   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ gistvacuumcleanup - _null_ ));
+DATA(insert OID = 2561 (  gistvacuumcleanup   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ gistvacuumcleanup - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 772 (  gistcostestimate  PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  gistcostestimate - _null_ ));
+DATA(insert OID = 772 (  gistcostestimate  PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  gistcostestimate - _null_ _null_ ));
 DESCR("gist(internal)");
-DATA(insert OID = 2787 (  gistoptions	   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  gistoptions - _null_ ));
+DATA(insert OID = 2787 (  gistoptions	   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  gistoptions - _null_ _null_ ));
 DESCR("gist(internal)");
 
-DATA(insert OID = 784 (  tintervaleq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervaleq - _null_ ));
+DATA(insert OID = 784 (  tintervaleq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervaleq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 785 (  tintervalne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalne - _null_ ));
+DATA(insert OID = 785 (  tintervalne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 786 (  tintervallt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervallt - _null_ ));
+DATA(insert OID = 786 (  tintervallt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervallt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 787 (  tintervalgt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalgt - _null_ ));
+DATA(insert OID = 787 (  tintervalgt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalgt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 788 (  tintervalle	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalle - _null_ ));
+DATA(insert OID = 788 (  tintervalle	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalle - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 789 (  tintervalge	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalge - _null_ ));
+DATA(insert OID = 789 (  tintervalge	   PGNSP PGUID 12 1 0 f f t f i 2 16 "704 704" _null_ _null_ _null_ tintervalge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
 /* OIDS 800 - 899 */
 
-DATA(insert OID = 817 (  oid			   PGNSP PGUID 12 1 0 f f t f i 1 26 "25" _null_ _null_ _null_	text_oid - _null_ ));
-DESCR("convert text to oid");
-DATA(insert OID = 818 (  int2			   PGNSP PGUID 12 1 0 f f t f i 1 21 "25" _null_ _null_ _null_	text_int2 - _null_ ));
-DESCR("convert text to int2");
-DATA(insert OID = 819 (  int4			   PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_	text_int4 - _null_ ));
-DESCR("convert text to int4");
-
-DATA(insert OID = 838 (  float8			   PGNSP PGUID 12 1 0 f f t f i 1 701 "25" _null_ _null_ _null_ text_float8 - _null_ ));
-DESCR("convert text to float8");
-DATA(insert OID = 839 (  float4			   PGNSP PGUID 12 1 0 f f t f i 1 700 "25" _null_ _null_ _null_ text_float4 - _null_ ));
-DESCR("convert text to float4");
-DATA(insert OID = 840 (  text			   PGNSP PGUID 12 1 0 f f t f i 1  25 "701" _null_ _null_ _null_	float8_text - _null_ ));
-DESCR("convert float8 to text");
-DATA(insert OID = 841 (  text			   PGNSP PGUID 12 1 0 f f t f i 1  25 "700" _null_ _null_ _null_	float4_text - _null_ ));
-DESCR("convert float4 to text");
-
-DATA(insert OID =  846 (  cash_mul_flt4    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 700" _null_ _null_ _null_	cash_mul_flt4 - _null_ ));
+DATA(insert OID =  846 (  cash_mul_flt4    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 700" _null_ _null_ _null_	cash_mul_flt4 - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID =  847 (  cash_div_flt4    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 700" _null_ _null_ _null_	cash_div_flt4 - _null_ ));
+DATA(insert OID =  847 (  cash_div_flt4    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 700" _null_ _null_ _null_	cash_div_flt4 - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID =  848 (  flt4_mul_cash    PGNSP PGUID 12 1 0 f f t f i 2 790 "700 790" _null_ _null_ _null_	flt4_mul_cash - _null_ ));
+DATA(insert OID =  848 (  flt4_mul_cash    PGNSP PGUID 12 1 0 f f t f i 2 790 "700 790" _null_ _null_ _null_	flt4_mul_cash - _null_ _null_ ));
 DESCR("multiply");
 
-DATA(insert OID =  849 (  position		   PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ textpos - _null_ ));
+DATA(insert OID =  849 (  position		   PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ textpos - _null_ _null_ ));
 DESCR("return position of substring");
-DATA(insert OID =  850 (  textlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textlike - _null_ ));
+DATA(insert OID =  850 (  textlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textlike - _null_ _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID =  851 (  textnlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textnlike - _null_ ));
+DATA(insert OID =  851 (  textnlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textnlike - _null_ _null_ ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID =  852 (  int48eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48eq - _null_ ));
+DATA(insert OID =  852 (  int48eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  853 (  int48ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48ne - _null_ ));
+DATA(insert OID =  853 (  int48ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID =  854 (  int48lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48lt - _null_ ));
+DATA(insert OID =  854 (  int48lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID =  855 (  int48gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48gt - _null_ ));
+DATA(insert OID =  855 (  int48gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  856 (  int48le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48le - _null_ ));
+DATA(insert OID =  856 (  int48le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  857 (  int48ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48ge - _null_ ));
+DATA(insert OID =  857 (  int48ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "23 20" _null_ _null_ _null_ int48ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID =  858 (  namelike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ namelike - _null_ ));
+DATA(insert OID =  858 (  namelike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ namelike - _null_ _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID =  859 (  namenlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ namenlike - _null_ ));
+DATA(insert OID =  859 (  namenlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ namenlike - _null_ _null_ ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID =  860 (  bpchar		   PGNSP PGUID 12 1 0 f f t f i 1 1042 "18" _null_ _null_ _null_	char_bpchar - _null_ ));
+DATA(insert OID =  860 (  bpchar		   PGNSP PGUID 12 1 0 f f t f i 1 1042 "18" _null_ _null_ _null_	char_bpchar - _null_ _null_ ));
 DESCR("convert char to char()");
 
-DATA(insert OID = 861 ( current_database	   PGNSP PGUID 12 1 0 f f t f i 0 19 "" _null_ _null_ _null_ current_database - _null_ ));
+DATA(insert OID = 861 ( current_database	   PGNSP PGUID 12 1 0 f f t f i 0 19 "" _null_ _null_ _null_ current_database - _null_ _null_ ));
 DESCR("returns the current database");
 
-DATA(insert OID =  862 (  int4_mul_cash		   PGNSP PGUID 12 1 0 f f t f i 2 790 "23 790" _null_ _null_ _null_ int4_mul_cash - _null_ ));
+DATA(insert OID =  862 (  int4_mul_cash		   PGNSP PGUID 12 1 0 f f t f i 2 790 "23 790" _null_ _null_ _null_ int4_mul_cash - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID =  863 (  int2_mul_cash		   PGNSP PGUID 12 1 0 f f t f i 2 790 "21 790" _null_ _null_ _null_ int2_mul_cash - _null_ ));
+DATA(insert OID =  863 (  int2_mul_cash		   PGNSP PGUID 12 1 0 f f t f i 2 790 "21 790" _null_ _null_ _null_ int2_mul_cash - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID =  864 (  cash_mul_int4		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 23" _null_ _null_ _null_ cash_mul_int4 - _null_ ));
+DATA(insert OID =  864 (  cash_mul_int4		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 23" _null_ _null_ _null_ cash_mul_int4 - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID =  865 (  cash_div_int4		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 23" _null_ _null_ _null_ cash_div_int4 - _null_ ));
+DATA(insert OID =  865 (  cash_div_int4		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 23" _null_ _null_ _null_ cash_div_int4 - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID =  866 (  cash_mul_int2		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 21" _null_ _null_ _null_ cash_mul_int2 - _null_ ));
+DATA(insert OID =  866 (  cash_mul_int2		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 21" _null_ _null_ _null_ cash_mul_int2 - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID =  867 (  cash_div_int2		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 21" _null_ _null_ _null_ cash_div_int2 - _null_ ));
+DATA(insert OID =  867 (  cash_div_int2		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 21" _null_ _null_ _null_ cash_div_int2 - _null_ _null_ ));
 DESCR("divide");
 
-DATA(insert OID =  886 (  cash_in		   PGNSP PGUID 12 1 0 f f t f i 1 790 "2275" _null_ _null_ _null_  cash_in - _null_ ));
+DATA(insert OID =  886 (  cash_in		   PGNSP PGUID 12 1 0 f f t f i 1 790 "2275" _null_ _null_ _null_  cash_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  887 (  cash_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "790" _null_ _null_ _null_  cash_out - _null_ ));
+DATA(insert OID =  887 (  cash_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "790" _null_ _null_ _null_  cash_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID =  888 (  cash_eq		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_eq - _null_ ));
+DATA(insert OID =  888 (  cash_eq		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID =  889 (  cash_ne		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_ne - _null_ ));
+DATA(insert OID =  889 (  cash_ne		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID =  890 (  cash_lt		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_lt - _null_ ));
+DATA(insert OID =  890 (  cash_lt		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID =  891 (  cash_le		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_le - _null_ ));
+DATA(insert OID =  891 (  cash_le		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  892 (  cash_gt		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_gt - _null_ ));
+DATA(insert OID =  892 (  cash_gt		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID =  893 (  cash_ge		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_ge - _null_ ));
+DATA(insert OID =  893 (  cash_ge		   PGNSP PGUID 12 1 0 f f t f i 2  16 "790 790" _null_ _null_ _null_	cash_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID =  894 (  cash_pl		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cash_pl - _null_ ));
+DATA(insert OID =  894 (  cash_pl		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cash_pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID =  895 (  cash_mi		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cash_mi - _null_ ));
+DATA(insert OID =  895 (  cash_mi		   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cash_mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID =  896 (  cash_mul_flt8    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 701" _null_ _null_ _null_	cash_mul_flt8 - _null_ ));
+DATA(insert OID =  896 (  cash_mul_flt8    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 701" _null_ _null_ _null_	cash_mul_flt8 - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID =  897 (  cash_div_flt8    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 701" _null_ _null_ _null_	cash_div_flt8 - _null_ ));
+DATA(insert OID =  897 (  cash_div_flt8    PGNSP PGUID 12 1 0 f f t f i 2 790 "790 701" _null_ _null_ _null_	cash_div_flt8 - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID =  898 (  cashlarger	   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cashlarger - _null_ ));
+DATA(insert OID =  898 (  cashlarger	   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cashlarger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID =  899 (  cashsmaller	   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cashsmaller - _null_ ));
+DATA(insert OID =  899 (  cashsmaller	   PGNSP PGUID 12 1 0 f f t f i 2 790 "790 790" _null_ _null_ _null_	cashsmaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID =  919 (  flt8_mul_cash    PGNSP PGUID 12 1 0 f f t f i 2 790 "701 790" _null_ _null_ _null_	flt8_mul_cash - _null_ ));
+DATA(insert OID =  919 (  flt8_mul_cash    PGNSP PGUID 12 1 0 f f t f i 2 790 "701 790" _null_ _null_ _null_	flt8_mul_cash - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID =  935 (  cash_words	   PGNSP PGUID 12 1 0 f f t f i 1  25 "790" _null_ _null_ _null_	cash_words - _null_ ));
+DATA(insert OID =  935 (  cash_words	   PGNSP PGUID 12 1 0 f f t f i 1  25 "790" _null_ _null_ _null_	cash_words - _null_ _null_ ));
 DESCR("output amount as words");
 
 /* OIDS 900 - 999 */
 
-DATA(insert OID = 940 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mod - _null_ ));
+DATA(insert OID = 940 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 941 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mod - _null_ ));
+DATA(insert OID = 941 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 942 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mod - _null_ ));
+DATA(insert OID = 942 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ int24mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 943 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mod - _null_ ));
+DATA(insert OID = 943 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ int42mod - _null_ _null_ ));
 DESCR("modulus");
 
-DATA(insert OID = 945 (  int8mod		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mod - _null_ ));
+DATA(insert OID = 945 (  int8mod		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 947 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mod - _null_ ));
+DATA(insert OID = 947 (  mod			   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8mod - _null_ _null_ ));
 DESCR("modulus");
 
-DATA(insert OID = 944 (  char			   PGNSP PGUID 12 1 0 f f t f i 1 18 "25" _null_ _null_ _null_	text_char - _null_ ));
+DATA(insert OID = 944 (  char			   PGNSP PGUID 12 1 0 f f t f i 1 18 "25" _null_ _null_ _null_	text_char - _null_ _null_ ));
 DESCR("convert text to char");
-DATA(insert OID = 946 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "18" _null_ _null_ _null_	char_text - _null_ ));
+DATA(insert OID = 946 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "18" _null_ _null_ _null_	char_text - _null_ _null_ ));
 DESCR("convert char to text");
 
-DATA(insert OID = 950 (  istrue			   PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_	istrue - _null_ ));
+DATA(insert OID = 950 (  istrue			   PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_	istrue - _null_ _null_ ));
 DESCR("bool is true (not false or unknown)");
-DATA(insert OID = 951 (  isfalse		   PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_	isfalse - _null_ ));
+DATA(insert OID = 951 (  isfalse		   PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_	isfalse - _null_ _null_ ));
 DESCR("bool is false (not true or unknown)");
 
-DATA(insert OID = 952 (  lo_open		   PGNSP PGUID 12 1 0 f f t f v 2 23 "26 23" _null_ _null_ _null_ lo_open - _null_ ));
+DATA(insert OID = 952 (  lo_open		   PGNSP PGUID 12 1 0 f f t f v 2 23 "26 23" _null_ _null_ _null_ lo_open - _null_ _null_ ));
 DESCR("large object open");
-DATA(insert OID = 953 (  lo_close		   PGNSP PGUID 12 1 0 f f t f v 1 23 "23" _null_ _null_ _null_	lo_close - _null_ ));
+DATA(insert OID = 953 (  lo_close		   PGNSP PGUID 12 1 0 f f t f v 1 23 "23" _null_ _null_ _null_	lo_close - _null_ _null_ ));
 DESCR("large object close");
-DATA(insert OID = 954 (  loread			   PGNSP PGUID 12 1 0 f f t f v 2 17 "23 23" _null_ _null_ _null_ loread - _null_ ));
+DATA(insert OID = 954 (  loread			   PGNSP PGUID 12 1 0 f f t f v 2 17 "23 23" _null_ _null_ _null_ loread - _null_ _null_ ));
 DESCR("large object read");
-DATA(insert OID = 955 (  lowrite		   PGNSP PGUID 12 1 0 f f t f v 2 23 "23 17" _null_ _null_ _null_ lowrite - _null_ ));
+DATA(insert OID = 955 (  lowrite		   PGNSP PGUID 12 1 0 f f t f v 2 23 "23 17" _null_ _null_ _null_ lowrite - _null_ _null_ ));
 DESCR("large object write");
-DATA(insert OID = 956 (  lo_lseek		   PGNSP PGUID 12 1 0 f f t f v 3 23 "23 23 23" _null_ _null_ _null_	lo_lseek - _null_ ));
+DATA(insert OID = 956 (  lo_lseek		   PGNSP PGUID 12 1 0 f f t f v 3 23 "23 23 23" _null_ _null_ _null_	lo_lseek - _null_ _null_ ));
 DESCR("large object seek");
-DATA(insert OID = 957 (  lo_creat		   PGNSP PGUID 12 1 0 f f t f v 1 26 "23" _null_ _null_ _null_	lo_creat - _null_ ));
+DATA(insert OID = 957 (  lo_creat		   PGNSP PGUID 12 1 0 f f t f v 1 26 "23" _null_ _null_ _null_	lo_creat - _null_ _null_ ));
 DESCR("large object create");
-DATA(insert OID = 715 (  lo_create		   PGNSP PGUID 12 1 0 f f t f v 1 26 "26" _null_ _null_ _null_	lo_create - _null_ ));
+DATA(insert OID = 715 (  lo_create		   PGNSP PGUID 12 1 0 f f t f v 1 26 "26" _null_ _null_ _null_	lo_create - _null_ _null_ ));
 DESCR("large object create");
-DATA(insert OID = 958 (  lo_tell		   PGNSP PGUID 12 1 0 f f t f v 1 23 "23" _null_ _null_ _null_	lo_tell - _null_ ));
+DATA(insert OID = 958 (  lo_tell		   PGNSP PGUID 12 1 0 f f t f v 1 23 "23" _null_ _null_ _null_	lo_tell - _null_ _null_ ));
 DESCR("large object position");
+DATA(insert OID = 1004 (  lo_truncate	   PGNSP PGUID 12 1 0 f f t f v 2 23 "23 23" _null_ _null_ _null_ lo_truncate - _null_ _null_ ));
+DESCR("truncate large object");
 
-DATA(insert OID = 959 (  on_pl			   PGNSP PGUID 12 1 0 f f t f i 2  16 "600 628" _null_ _null_ _null_	on_pl - _null_ ));
+DATA(insert OID = 959 (  on_pl			   PGNSP PGUID 12 1 0 f f t f i 2  16 "600 628" _null_ _null_ _null_	on_pl - _null_ _null_ ));
 DESCR("point on line?");
-DATA(insert OID = 960 (  on_sl			   PGNSP PGUID 12 1 0 f f t f i 2  16 "601 628" _null_ _null_ _null_	on_sl - _null_ ));
+DATA(insert OID = 960 (  on_sl			   PGNSP PGUID 12 1 0 f f t f i 2  16 "601 628" _null_ _null_ _null_	on_sl - _null_ _null_ ));
 DESCR("lseg on line?");
-DATA(insert OID = 961 (  close_pl		   PGNSP PGUID 12 1 0 f f t f i 2 600 "600 628" _null_ _null_ _null_	close_pl - _null_ ));
+DATA(insert OID = 961 (  close_pl		   PGNSP PGUID 12 1 0 f f t f i 2 600 "600 628" _null_ _null_ _null_	close_pl - _null_ _null_ ));
 DESCR("closest point on line");
-DATA(insert OID = 962 (  close_sl		   PGNSP PGUID 12 1 0 f f t f i 2 600 "601 628" _null_ _null_ _null_	close_sl - _null_ ));
+DATA(insert OID = 962 (  close_sl		   PGNSP PGUID 12 1 0 f f t f i 2 600 "601 628" _null_ _null_ _null_	close_sl - _null_ _null_ ));
 DESCR("closest point to line segment on line");
-DATA(insert OID = 963 (  close_lb		   PGNSP PGUID 12 1 0 f f t f i 2 600 "628 603" _null_ _null_ _null_	close_lb - _null_ ));
+DATA(insert OID = 963 (  close_lb		   PGNSP PGUID 12 1 0 f f t f i 2 600 "628 603" _null_ _null_ _null_	close_lb - _null_ _null_ ));
 DESCR("closest point to line on box");
 
-DATA(insert OID = 964 (  lo_unlink		   PGNSP PGUID 12 1 0 f f t f v 1  23 "26" _null_ _null_ _null_ lo_unlink - _null_ ));
+DATA(insert OID = 964 (  lo_unlink		   PGNSP PGUID 12 1 0 f f t f v 1  23 "26" _null_ _null_ _null_ lo_unlink - _null_ _null_ ));
 DESCR("large object unlink(delete)");
 
-DATA(insert OID = 973 (  path_inter		   PGNSP PGUID 12 1 0 f f t f i 2  16 "602 602" _null_ _null_ _null_	path_inter - _null_ ));
+DATA(insert OID = 973 (  path_inter		   PGNSP PGUID 12 1 0 f f t f i 2  16 "602 602" _null_ _null_ _null_	path_inter - _null_ _null_ ));
 DESCR("intersect?");
-DATA(insert OID = 975 (  area			   PGNSP PGUID 12 1 0 f f t f i 1 701 "603" _null_ _null_ _null_	box_area - _null_ ));
+DATA(insert OID = 975 (  area			   PGNSP PGUID 12 1 0 f f t f i 1 701 "603" _null_ _null_ _null_	box_area - _null_ _null_ ));
 DESCR("box area");
-DATA(insert OID = 976 (  width			   PGNSP PGUID 12 1 0 f f t f i 1 701 "603" _null_ _null_ _null_	box_width - _null_ ));
+DATA(insert OID = 976 (  width			   PGNSP PGUID 12 1 0 f f t f i 1 701 "603" _null_ _null_ _null_	box_width - _null_ _null_ ));
 DESCR("box width");
-DATA(insert OID = 977 (  height			   PGNSP PGUID 12 1 0 f f t f i 1 701 "603" _null_ _null_ _null_	box_height - _null_ ));
+DATA(insert OID = 977 (  height			   PGNSP PGUID 12 1 0 f f t f i 1 701 "603" _null_ _null_ _null_	box_height - _null_ _null_ ));
 DESCR("box height");
-DATA(insert OID = 978 (  box_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "603 603" _null_ _null_ _null_	box_distance - _null_ ));
+DATA(insert OID = 978 (  box_distance	   PGNSP PGUID 12 1 0 f f t f i 2 701 "603 603" _null_ _null_ _null_	box_distance - _null_ _null_ ));
 DESCR("distance between boxes");
-DATA(insert OID = 979 (  area			   PGNSP PGUID 12 1 0 f f t f i 1 701 "602" _null_ _null_ _null_	path_area - _null_ ));
+DATA(insert OID = 979 (  area			   PGNSP PGUID 12 1 0 f f t f i 1 701 "602" _null_ _null_ _null_	path_area - _null_ _null_ ));
 DESCR("area of a closed path");
-DATA(insert OID = 980 (  box_intersect	   PGNSP PGUID 12 1 0 f f t f i 2 603 "603 603" _null_ _null_ _null_	box_intersect - _null_ ));
+DATA(insert OID = 980 (  box_intersect	   PGNSP PGUID 12 1 0 f f t f i 2 603 "603 603" _null_ _null_ _null_	box_intersect - _null_ _null_ ));
 DESCR("box intersection (another box)");
-DATA(insert OID = 981 (  diagonal		   PGNSP PGUID 12 1 0 f f t f i 1 601 "603" _null_ _null_ _null_	box_diagonal - _null_ ));
+DATA(insert OID = 981 (  diagonal		   PGNSP PGUID 12 1 0 f f t f i 1 601 "603" _null_ _null_ _null_	box_diagonal - _null_ _null_ ));
 DESCR("box diagonal");
-DATA(insert OID = 982 (  path_n_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_lt - _null_ ));
+DATA(insert OID = 982 (  path_n_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 983 (  path_n_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_gt - _null_ ));
+DATA(insert OID = 983 (  path_n_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 984 (  path_n_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_eq - _null_ ));
+DATA(insert OID = 984 (  path_n_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 985 (  path_n_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_le - _null_ ));
+DATA(insert OID = 985 (  path_n_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 986 (  path_n_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_ge - _null_ ));
+DATA(insert OID = 986 (  path_n_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "602 602" _null_ _null_ _null_ path_n_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 987 (  path_length	   PGNSP PGUID 12 1 0 f f t f i 1 701 "602" _null_ _null_ _null_	path_length - _null_ ));
+DATA(insert OID = 987 (  path_length	   PGNSP PGUID 12 1 0 f f t f i 1 701 "602" _null_ _null_ _null_	path_length - _null_ _null_ ));
 DESCR("sum of path segment lengths");
-DATA(insert OID = 988 (  point_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_ne - _null_ ));
+DATA(insert OID = 988 (  point_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 989 (  point_vert		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_vert - _null_ ));
+DATA(insert OID = 989 (  point_vert		   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_vert - _null_ _null_ ));
 DESCR("vertically aligned?");
-DATA(insert OID = 990 (  point_horiz	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_horiz - _null_ ));
+DATA(insert OID = 990 (  point_horiz	   PGNSP PGUID 12 1 0 f f t f i 2 16 "600 600" _null_ _null_ _null_ point_horiz - _null_ _null_ ));
 DESCR("horizontally aligned?");
-DATA(insert OID = 991 (  point_distance    PGNSP PGUID 12 1 0 f f t f i 2 701 "600 600" _null_ _null_ _null_	point_distance - _null_ ));
+DATA(insert OID = 991 (  point_distance    PGNSP PGUID 12 1 0 f f t f i 2 701 "600 600" _null_ _null_ _null_	point_distance - _null_ _null_ ));
 DESCR("distance between");
-DATA(insert OID = 992 (  slope			   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 600" _null_ _null_ _null_	point_slope - _null_ ));
+DATA(insert OID = 992 (  slope			   PGNSP PGUID 12 1 0 f f t f i 2 701 "600 600" _null_ _null_ _null_	point_slope - _null_ _null_ ));
 DESCR("slope between points");
-DATA(insert OID = 993 (  lseg			   PGNSP PGUID 12 1 0 f f t f i 2 601 "600 600" _null_ _null_ _null_	lseg_construct - _null_ ));
+DATA(insert OID = 993 (  lseg			   PGNSP PGUID 12 1 0 f f t f i 2 601 "600 600" _null_ _null_ _null_	lseg_construct - _null_ _null_ ));
 DESCR("convert points to line segment");
-DATA(insert OID = 994 (  lseg_intersect    PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_intersect - _null_ ));
+DATA(insert OID = 994 (  lseg_intersect    PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_intersect - _null_ _null_ ));
 DESCR("intersect?");
-DATA(insert OID = 995 (  lseg_parallel	   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_parallel - _null_ ));
+DATA(insert OID = 995 (  lseg_parallel	   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_parallel - _null_ _null_ ));
 DESCR("parallel?");
-DATA(insert OID = 996 (  lseg_perp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_perp - _null_ ));
+DATA(insert OID = 996 (  lseg_perp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_perp - _null_ _null_ ));
 DESCR("perpendicular?");
-DATA(insert OID = 997 (  lseg_vertical	   PGNSP PGUID 12 1 0 f f t f i 1 16 "601" _null_ _null_ _null_ lseg_vertical - _null_ ));
+DATA(insert OID = 997 (  lseg_vertical	   PGNSP PGUID 12 1 0 f f t f i 1 16 "601" _null_ _null_ _null_ lseg_vertical - _null_ _null_ ));
 DESCR("vertical?");
-DATA(insert OID = 998 (  lseg_horizontal   PGNSP PGUID 12 1 0 f f t f i 1 16 "601" _null_ _null_ _null_ lseg_horizontal - _null_ ));
+DATA(insert OID = 998 (  lseg_horizontal   PGNSP PGUID 12 1 0 f f t f i 1 16 "601" _null_ _null_ _null_ lseg_horizontal - _null_ _null_ ));
 DESCR("horizontal?");
-DATA(insert OID = 999 (  lseg_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_eq - _null_ ));
+DATA(insert OID = 999 (  lseg_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_eq - _null_ _null_ ));
 DESCR("equal");
 
-DATA(insert OID =  748 (  date			   PGNSP PGUID 12 1 0 f f t f s 1 1082 "25" _null_ _null_ _null_ text_date - _null_ ));
-DESCR("convert text to date");
-DATA(insert OID =  749 (  text			   PGNSP PGUID 12 1 0 f f t f s 1 25 "1082" _null_ _null_ _null_ date_text - _null_ ));
-DESCR("convert date to text");
-DATA(insert OID =  837 (  time			   PGNSP PGUID 12 1 0 f f t f s 1 1083 "25" _null_ _null_ _null_ text_time - _null_ ));
-DESCR("convert text to time");
-DATA(insert OID =  948 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "1083" _null_ _null_ _null_ time_text - _null_ ));
-DESCR("convert time to text");
-DATA(insert OID =  938 (  timetz		   PGNSP PGUID 12 1 0 f f t f s 1 1266 "25" _null_ _null_ _null_ text_timetz - _null_ ));
-DESCR("convert text to timetz");
-DATA(insert OID =  939 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "1266" _null_ _null_ _null_ timetz_text - _null_ ));
-DESCR("convert timetz to text");
-
 /* OIDS 1000 - 1999 */
 
-DATA(insert OID = 1026 (  timezone		   PGNSP PGUID 12 1 0 f f t f i 2 1114 "1186 1184" _null_ _null_ _null_ timestamptz_izone - _null_ ));
+DATA(insert OID = 1026 (  timezone		   PGNSP PGUID 12 1 0 f f t f i 2 1114 "1186 1184" _null_ _null_ _null_ timestamptz_izone - _null_ _null_ ));
 DESCR("adjust timestamp to new time zone");
 
-DATA(insert OID = 1029 (  nullvalue		   PGNSP PGUID 12 1 0 f f f f i 1 16 "2276" _null_ _null_ _null_ nullvalue - _null_ ));
+DATA(insert OID = 1029 (  nullvalue		   PGNSP PGUID 12 1 0 f f f f i 1 16 "2276" _null_ _null_ _null_ nullvalue - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1030 (  nonnullvalue	   PGNSP PGUID 12 1 0 f f f f i 1 16 "2276" _null_ _null_ _null_ nonnullvalue - _null_ ));
+DATA(insert OID = 1030 (  nonnullvalue	   PGNSP PGUID 12 1 0 f f f f i 1 16 "2276" _null_ _null_ _null_ nonnullvalue - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1031 (  aclitemin		   PGNSP PGUID 12 1 0 f f t f s 1 1033 "2275" _null_ _null_ _null_	aclitemin - _null_ ));
+DATA(insert OID = 1031 (  aclitemin		   PGNSP PGUID 12 1 0 f f t f s 1 1033 "2275" _null_ _null_ _null_	aclitemin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1032 (  aclitemout	   PGNSP PGUID 12 1 0 f f t f s 1 2275 "1033" _null_ _null_ _null_	aclitemout - _null_ ));
+DATA(insert OID = 1032 (  aclitemout	   PGNSP PGUID 12 1 0 f f t f s 1 2275 "1033" _null_ _null_ _null_	aclitemout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1035 (  aclinsert		   PGNSP PGUID 12 1 0 f f t f i 2 1034 "1034 1033" _null_ _null_ _null_ aclinsert - _null_ ));
+DATA(insert OID = 1035 (  aclinsert		   PGNSP PGUID 12 1 0 f f t f i 2 1034 "1034 1033" _null_ _null_ _null_ aclinsert - _null_ _null_ ));
 DESCR("add/update ACL item");
-DATA(insert OID = 1036 (  aclremove		   PGNSP PGUID 12 1 0 f f t f i 2 1034 "1034 1033" _null_ _null_ _null_ aclremove - _null_ ));
+DATA(insert OID = 1036 (  aclremove		   PGNSP PGUID 12 1 0 f f t f i 2 1034 "1034 1033" _null_ _null_ _null_ aclremove - _null_ _null_ ));
 DESCR("remove ACL item");
-DATA(insert OID = 1037 (  aclcontains	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1034 1033" _null_ _null_ _null_ aclcontains - _null_ ));
+DATA(insert OID = 1037 (  aclcontains	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1034 1033" _null_ _null_ _null_ aclcontains - _null_ _null_ ));
 DESCR("ACL contains item?");
-DATA(insert OID = 1062 (  aclitemeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1033 1033" _null_ _null_ _null_ aclitem_eq - _null_ ));
+DATA(insert OID = 1062 (  aclitemeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1033 1033" _null_ _null_ _null_ aclitem_eq - _null_ _null_ ));
 DESCR("equality operator for ACL items");
-DATA(insert OID = 1365 (  makeaclitem	   PGNSP PGUID 12 1 0 f f t f i 4 1033 "26 26 25 16" _null_ _null_ _null_ makeaclitem - _null_ ));
+DATA(insert OID = 1365 (  makeaclitem	   PGNSP PGUID 12 1 0 f f t f i 4 1033 "26 26 25 16" _null_ _null_ _null_ makeaclitem - _null_ _null_ ));
 DESCR("make ACL item");
-DATA(insert OID = 1044 (  bpcharin		   PGNSP PGUID 12 1 0 f f t f i 3 1042 "2275 26 23" _null_ _null_ _null_ bpcharin - _null_ ));
+DATA(insert OID = 1044 (  bpcharin		   PGNSP PGUID 12 1 0 f f t f i 3 1042 "2275 26 23" _null_ _null_ _null_ bpcharin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1045 (  bpcharout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1042" _null_ _null_ _null_	bpcharout - _null_ ));
+DATA(insert OID = 1045 (  bpcharout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1042" _null_ _null_ _null_	bpcharout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2913 (  bpchartypmodin   PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	bpchartypmodin - _null_ ));
+DATA(insert OID = 2913 (  bpchartypmodin   PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	bpchartypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2914 (  bpchartypmodout  PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	bpchartypmodout - _null_ ));
+DATA(insert OID = 2914 (  bpchartypmodout  PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	bpchartypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1046 (  varcharin		   PGNSP PGUID 12 1 0 f f t f i 3 1043 "2275 26 23" _null_ _null_ _null_ varcharin - _null_ ));
+DATA(insert OID = 1046 (  varcharin		   PGNSP PGUID 12 1 0 f f t f i 3 1043 "2275 26 23" _null_ _null_ _null_ varcharin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1047 (  varcharout	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1043" _null_ _null_ _null_	varcharout - _null_ ));
+DATA(insert OID = 1047 (  varcharout	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1043" _null_ _null_ _null_	varcharout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2915 (  varchartypmodin  PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	varchartypmodin - _null_ ));
+DATA(insert OID = 2915 (  varchartypmodin  PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	varchartypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2916 (  varchartypmodout PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	varchartypmodout - _null_ ));
+DATA(insert OID = 2916 (  varchartypmodout PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	varchartypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1048 (  bpchareq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpchareq - _null_ ));
+DATA(insert OID = 1048 (  bpchareq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpchareq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1049 (  bpcharlt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharlt - _null_ ));
+DATA(insert OID = 1049 (  bpcharlt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharlt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1050 (  bpcharle		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharle - _null_ ));
+DATA(insert OID = 1050 (  bpcharle		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharle - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1051 (  bpchargt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpchargt - _null_ ));
+DATA(insert OID = 1051 (  bpchargt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpchargt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1052 (  bpcharge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharge - _null_ ));
+DATA(insert OID = 1052 (  bpcharge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1053 (  bpcharne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharne - _null_ ));
+DATA(insert OID = 1053 (  bpcharne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ bpcharne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1063 (  bpchar_larger    PGNSP PGUID 12 1 0 f f t f i 2 1042 "1042 1042" _null_ _null_ _null_ bpchar_larger - _null_ ));
+DATA(insert OID = 1063 (  bpchar_larger    PGNSP PGUID 12 1 0 f f t f i 2 1042 "1042 1042" _null_ _null_ _null_ bpchar_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1064 (  bpchar_smaller   PGNSP PGUID 12 1 0 f f t f i 2 1042 "1042 1042" _null_ _null_ _null_ bpchar_smaller - _null_ ));
+DATA(insert OID = 1064 (  bpchar_smaller   PGNSP PGUID 12 1 0 f f t f i 2 1042 "1042 1042" _null_ _null_ _null_ bpchar_smaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1078 (  bpcharcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1042 1042" _null_ _null_ _null_ bpcharcmp - _null_ ));
+DATA(insert OID = 1078 (  bpcharcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1042 1042" _null_ _null_ _null_ bpcharcmp - _null_ _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1080 (  hashbpchar	   PGNSP PGUID 12 1 0 f f t f i 1 23 "1042" _null_ _null_ _null_	hashbpchar - _null_ ));
+DATA(insert OID = 1080 (  hashbpchar	   PGNSP PGUID 12 1 0 f f t f i 1 23 "1042" _null_ _null_ _null_	hashbpchar - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 1081 (  format_type	   PGNSP PGUID 12 1 0 f f f f s 2 25 "26 23" _null_ _null_ _null_ format_type - _null_ ));
+DATA(insert OID = 1081 (  format_type	   PGNSP PGUID 12 1 0 f f f f s 2 25 "26 23" _null_ _null_ _null_ format_type - _null_ _null_ ));
 DESCR("format a type oid and atttypmod to canonical SQL");
-DATA(insert OID = 1084 (  date_in		   PGNSP PGUID 12 1 0 f f t f s 1 1082 "2275" _null_ _null_ _null_	date_in - _null_ ));
+DATA(insert OID = 1084 (  date_in		   PGNSP PGUID 12 1 0 f f t f s 1 1082 "2275" _null_ _null_ _null_	date_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1085 (  date_out		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "1082" _null_ _null_ _null_	date_out - _null_ ));
+DATA(insert OID = 1085 (  date_out		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "1082" _null_ _null_ _null_	date_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1086 (  date_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_eq - _null_ ));
+DATA(insert OID = 1086 (  date_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1087 (  date_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_lt - _null_ ));
+DATA(insert OID = 1087 (  date_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1088 (  date_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_le - _null_ ));
+DATA(insert OID = 1088 (  date_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1089 (  date_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_gt - _null_ ));
+DATA(insert OID = 1089 (  date_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1090 (  date_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_ge - _null_ ));
+DATA(insert OID = 1090 (  date_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1091 (  date_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_ne - _null_ ));
+DATA(insert OID = 1091 (  date_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1082" _null_ _null_ _null_ date_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1092 (  date_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1082 1082" _null_ _null_ _null_ date_cmp - _null_ ));
+DATA(insert OID = 1092 (  date_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1082 1082" _null_ _null_ _null_ date_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
 
 /* OIDS 1100 - 1199 */
 
-DATA(insert OID = 1102 (  time_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_lt - _null_ ));
+DATA(insert OID = 1102 (  time_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1103 (  time_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_le - _null_ ));
+DATA(insert OID = 1103 (  time_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1104 (  time_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_gt - _null_ ));
+DATA(insert OID = 1104 (  time_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1105 (  time_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_ge - _null_ ));
+DATA(insert OID = 1105 (  time_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1106 (  time_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_ne - _null_ ));
+DATA(insert OID = 1106 (  time_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1107 (  time_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1083 1083" _null_ _null_ _null_ time_cmp - _null_ ));
+DATA(insert OID = 1107 (  time_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1083 1083" _null_ _null_ _null_ time_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1138 (  date_larger	   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 1082" _null_ _null_ _null_ date_larger - _null_ ));
+DATA(insert OID = 1138 (  date_larger	   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 1082" _null_ _null_ _null_ date_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1139 (  date_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 1082" _null_ _null_ _null_ date_smaller - _null_ ));
+DATA(insert OID = 1139 (  date_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 1082" _null_ _null_ _null_ date_smaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1140 (  date_mi		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1082 1082" _null_ _null_ _null_ date_mi - _null_ ));
+DATA(insert OID = 1140 (  date_mi		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1082 1082" _null_ _null_ _null_ date_mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1141 (  date_pli		   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 23" _null_ _null_ _null_ date_pli - _null_ ));
+DATA(insert OID = 1141 (  date_pli		   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 23" _null_ _null_ _null_ date_pli - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 1142 (  date_mii		   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 23" _null_ _null_ _null_ date_mii - _null_ ));
+DATA(insert OID = 1142 (  date_mii		   PGNSP PGUID 12 1 0 f f t f i 2 1082 "1082 23" _null_ _null_ _null_ date_mii - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1143 (  time_in		   PGNSP PGUID 12 1 0 f f t f s 3 1083 "2275 26 23" _null_ _null_ _null_ time_in - _null_ ));
+DATA(insert OID = 1143 (  time_in		   PGNSP PGUID 12 1 0 f f t f s 3 1083 "2275 26 23" _null_ _null_ _null_ time_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1144 (  time_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1083" _null_ _null_ _null_	time_out - _null_ ));
+DATA(insert OID = 1144 (  time_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1083" _null_ _null_ _null_	time_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2909 (  timetypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timetypmodin - _null_ ));
+DATA(insert OID = 2909 (  timetypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timetypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2910 (  timetypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timetypmodout - _null_ ));
+DATA(insert OID = 2910 (  timetypmodout		PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timetypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1145 (  time_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_eq - _null_ ));
+DATA(insert OID = 1145 (  time_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1083 1083" _null_ _null_ _null_ time_eq - _null_ _null_ ));
 DESCR("equal");
 
-DATA(insert OID = 1146 (  circle_add_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_add_pt - _null_ ));
+DATA(insert OID = 1146 (  circle_add_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_add_pt - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 1147 (  circle_sub_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_sub_pt - _null_ ));
+DATA(insert OID = 1147 (  circle_sub_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_sub_pt - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1148 (  circle_mul_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_mul_pt - _null_ ));
+DATA(insert OID = 1148 (  circle_mul_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_mul_pt - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1149 (  circle_div_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_div_pt - _null_ ));
+DATA(insert OID = 1149 (  circle_div_pt    PGNSP PGUID 12 1 0 f f t f i 2 718 "718 600" _null_ _null_ _null_	circle_div_pt - _null_ _null_ ));
 DESCR("divide");
 
-DATA(insert OID = 1150 (  timestamptz_in   PGNSP PGUID 12 1 0 f f t f s 3 1184 "2275 26 23" _null_ _null_ _null_ timestamptz_in - _null_ ));
+DATA(insert OID = 1150 (  timestamptz_in   PGNSP PGUID 12 1 0 f f t f s 3 1184 "2275 26 23" _null_ _null_ _null_ timestamptz_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1151 (  timestamptz_out  PGNSP PGUID 12 1 0 f f t f s 1 2275 "1184" _null_ _null_ _null_	timestamptz_out - _null_ ));
+DATA(insert OID = 1151 (  timestamptz_out  PGNSP PGUID 12 1 0 f f t f s 1 2275 "1184" _null_ _null_ _null_	timestamptz_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2907 (  timestamptztypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timestamptztypmodin - _null_ ));
+DATA(insert OID = 2907 (  timestamptztypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timestamptztypmodin - _null_ _null_));
 DESCR("I/O typmod");
-DATA(insert OID = 2908 (  timestamptztypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timestamptztypmodout - _null_ ));
+DATA(insert OID = 2908 (  timestamptztypmodout		PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timestamptztypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1152 (  timestamptz_eq   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_eq - _null_ ));
+DATA(insert OID = 1152 (  timestamptz_eq   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1153 (  timestamptz_ne   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_ne - _null_ ));
+DATA(insert OID = 1153 (  timestamptz_ne   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1154 (  timestamptz_lt   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_lt - _null_ ));
+DATA(insert OID = 1154 (  timestamptz_lt   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1155 (  timestamptz_le   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_le - _null_ ));
+DATA(insert OID = 1155 (  timestamptz_le   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1156 (  timestamptz_ge   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_ge - _null_ ));
+DATA(insert OID = 1156 (  timestamptz_ge   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1157 (  timestamptz_gt   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_gt - _null_ ));
+DATA(insert OID = 1157 (  timestamptz_gt   PGNSP PGUID 12 1 0 f f t f i 2 16 "1184 1184" _null_ _null_ _null_ timestamp_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1158 (  to_timestamp	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 1184 f "701" _null_ _null_ _null_ _null_ "select (''epoch''::timestamptz + $1 * ''1 second''::interval)" - _null_ c ));
+DATA(insert OID = 1158 (  to_timestamp	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 1184 f "701" _null_ _null_ _null_ _null_ "select (''epoch''::pg_catalog.timestamptz + $1 * ''1 second''::pg_catalog.interval)" - _null_ _null_ c ));
 DESCR("convert UNIX epoch to timestamptz");
-DATA(insert OID = 1159 (  timezone		   PGNSP PGUID 12 1 0 f f t f i 2 1114 "25 1184" _null_ _null_ _null_  timestamptz_zone - _null_ ));
+DATA(insert OID = 1159 (  timezone		   PGNSP PGUID 12 1 0 f f t f i 2 1114 "25 1184" _null_ _null_ _null_  timestamptz_zone - _null_ _null_ ));
 DESCR("adjust timestamp to new time zone");
 
-DATA(insert OID = 1160 (  interval_in	   PGNSP PGUID 12 1 0 f f t f s 3 1186 "2275 26 23" _null_ _null_ _null_ interval_in - _null_ ));
+DATA(insert OID = 1160 (  interval_in	   PGNSP PGUID 12 1 0 f f t f s 3 1186 "2275 26 23" _null_ _null_ _null_ interval_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1161 (  interval_out	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1186" _null_ _null_ _null_	interval_out - _null_ ));
+DATA(insert OID = 1161 (  interval_out	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1186" _null_ _null_ _null_	interval_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2903 (  intervaltypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	intervaltypmodin - _null_ ));
+DATA(insert OID = 2903 (  intervaltypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	intervaltypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2904 (  intervaltypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	intervaltypmodout - _null_ ));
+DATA(insert OID = 2904 (  intervaltypmodout		PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	intervaltypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1162 (  interval_eq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_eq - _null_ ));
+DATA(insert OID = 1162 (  interval_eq	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1163 (  interval_ne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_ne - _null_ ));
+DATA(insert OID = 1163 (  interval_ne	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1164 (  interval_lt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_lt - _null_ ));
+DATA(insert OID = 1164 (  interval_lt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1165 (  interval_le	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_le - _null_ ));
+DATA(insert OID = 1165 (  interval_le	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1166 (  interval_ge	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_ge - _null_ ));
+DATA(insert OID = 1166 (  interval_ge	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1167 (  interval_gt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_gt - _null_ ));
+DATA(insert OID = 1167 (  interval_gt	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1186 1186" _null_ _null_ _null_ interval_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1168 (  interval_um	   PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_um - _null_ ));
+DATA(insert OID = 1168 (  interval_um	   PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_um - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1169 (  interval_pl	   PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_ interval_pl - _null_ ));
+DATA(insert OID = 1169 (  interval_pl	   PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_ interval_pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 1170 (  interval_mi	   PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_ interval_mi - _null_ ));
+DATA(insert OID = 1170 (  interval_mi	   PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_ interval_mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1171 (  date_part		   PGNSP PGUID 12 1 0 f f t f s 2  701 "25 1184" _null_ _null_ _null_ timestamptz_part - _null_ ));
+DATA(insert OID = 1171 (  date_part		   PGNSP PGUID 12 1 0 f f t f s 2  701 "25 1184" _null_ _null_ _null_ timestamptz_part - _null_ _null_ ));
 DESCR("extract field from timestamp with time zone");
-DATA(insert OID = 1172 (  date_part		   PGNSP PGUID 12 1 0 f f t f i 2  701 "25 1186" _null_ _null_ _null_ interval_part - _null_ ));
+DATA(insert OID = 1172 (  date_part		   PGNSP PGUID 12 1 0 f f t f i 2  701 "25 1186" _null_ _null_ _null_ interval_part - _null_ _null_ ));
 DESCR("extract field from interval");
-DATA(insert OID = 1173 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f i 1 1184 "702" _null_ _null_ _null_ abstime_timestamptz - _null_ ));
+DATA(insert OID = 1173 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f i 1 1184 "702" _null_ _null_ _null_ abstime_timestamptz - _null_ _null_ ));
 DESCR("convert abstime to timestamp with time zone");
-DATA(insert OID = 1174 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f s 1 1184 "1082" _null_ _null_ _null_	date_timestamptz - _null_ ));
+DATA(insert OID = 1174 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f s 1 1184 "1082" _null_ _null_ _null_	date_timestamptz - _null_ _null_ ));
 DESCR("convert date to timestamp with time zone");
-DATA(insert OID = 2711 (  justify_interval PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_justify_interval - _null_ ));
+DATA(insert OID = 2711 (  justify_interval PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_justify_interval - _null_ _null_ ));
 DESCR("promote groups of 24 hours to numbers of days and promote groups of 30 days to numbers of months");
-DATA(insert OID = 1175 (  justify_hours    PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_justify_hours - _null_ ));
+DATA(insert OID = 1175 (  justify_hours    PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_justify_hours - _null_ _null_ ));
 DESCR("promote groups of 24 hours to numbers of days");
-DATA(insert OID = 1295 (  justify_days	   PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_justify_days - _null_ ));
+DATA(insert OID = 1295 (  justify_days	   PGNSP PGUID 12 1 0 f f t f i 1 1186 "1186" _null_ _null_ _null_	interval_justify_days - _null_ _null_ ));
 DESCR("promote groups of 30 days to numbers of months");
-DATA(insert OID = 1176 (  timestamptz	   PGNSP PGUID 14 1 0 0 f f t f s 2 0 1184 f "1082 1083" _null_ _null_ _null_ _null_ "select cast(($1 + $2) as timestamp with time zone)" - _null_ c ));
+DATA(insert OID = 1176 (  timestamptz	   PGNSP PGUID 14 1 0 0 f f t f s 2 0 1184 f "1082 1083" _null_ _null_ _null_ _null_ "select cast(($1 + $2) as timestamp with time zone)" - _null_ _null_ c ));
 DESCR("convert date and time to timestamp with time zone");
-DATA(insert OID = 1177 (  interval		   PGNSP PGUID 12 1 0 f f t f i 1 1186 "703" _null_ _null_ _null_ reltime_interval - _null_ ));
+DATA(insert OID = 1177 (  interval		   PGNSP PGUID 12 1 0 f f t f i 1 1186 "703" _null_ _null_ _null_ reltime_interval - _null_ _null_ ));
 DESCR("convert reltime to interval");
-DATA(insert OID = 1178 (  date			   PGNSP PGUID 12 1 0 f f t f s 1 1082 "1184" _null_ _null_ _null_	timestamptz_date - _null_ ));
+DATA(insert OID = 1178 (  date			   PGNSP PGUID 12 1 0 f f t f s 1 1082 "1184" _null_ _null_ _null_	timestamptz_date - _null_ _null_ ));
 DESCR("convert timestamp with time zone to date");
-DATA(insert OID = 1179 (  date			   PGNSP PGUID 12 1 0 f f t f s 1 1082 "702" _null_ _null_ _null_ abstime_date - _null_ ));
+DATA(insert OID = 1179 (  date			   PGNSP PGUID 12 1 0 f f t f s 1 1082 "702" _null_ _null_ _null_ abstime_date - _null_ _null_ ));
 DESCR("convert abstime to date");
-DATA(insert OID = 1180 (  abstime		   PGNSP PGUID 12 1 0 f f t f i 1  702 "1184" _null_ _null_ _null_	timestamptz_abstime - _null_ ));
+DATA(insert OID = 1180 (  abstime		   PGNSP PGUID 12 1 0 f f t f i 1  702 "1184" _null_ _null_ _null_	timestamptz_abstime - _null_ _null_ ));
 DESCR("convert timestamp with time zone to abstime");
-DATA(insert OID = 1181 (  age			   PGNSP PGUID 12 1 0 f f t f s 1 23 "28" _null_ _null_ _null_	xid_age - _null_ ));
+DATA(insert OID = 1181 (  age			   PGNSP PGUID 12 1 0 f f t f s 1 23 "28" _null_ _null_ _null_	xid_age - _null_ _null_ ));
 DESCR("age of a transaction ID, in transactions before current transaction");
 
-DATA(insert OID = 1188 (  timestamptz_mi   PGNSP PGUID 12 1 0 f f t f i 2 1186 "1184 1184" _null_ _null_ _null_ timestamp_mi - _null_ ));
+DATA(insert OID = 1188 (  timestamptz_mi   PGNSP PGUID 12 1 0 f f t f i 2 1186 "1184 1184" _null_ _null_ _null_ timestamp_mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1189 (  timestamptz_pl_interval PGNSP PGUID 12 1 0 f f t f s 2 1184 "1184 1186" _null_ _null_ _null_	timestamptz_pl_interval - _null_ ));
+DATA(insert OID = 1189 (  timestamptz_pl_interval PGNSP PGUID 12 1 0 f f t f s 2 1184 "1184 1186" _null_ _null_ _null_	timestamptz_pl_interval - _null_ _null_ ));
 DESCR("plus");
-DATA(insert OID = 1190 (  timestamptz_mi_interval PGNSP PGUID 12 1 0 f f t f s 2 1184 "1184 1186" _null_ _null_ _null_	timestamptz_mi_interval - _null_ ));
+DATA(insert OID = 1190 (  timestamptz_mi_interval PGNSP PGUID 12 1 0 f f t f s 2 1184 "1184 1186" _null_ _null_ _null_	timestamptz_mi_interval - _null_ _null_ ));
 DESCR("minus");
-DATA(insert OID = 1191 (  timestamptz		PGNSP PGUID 12 1 0 f f t f s 1 1184 "25" _null_ _null_ _null_ text_timestamptz - _null_ ));
-DESCR("convert text to timestamp with time zone");
-DATA(insert OID = 1192 (  text				PGNSP PGUID 12 1 0 f f t f s 1	 25 "1184" _null_ _null_ _null_ timestamptz_text - _null_ ));
-DESCR("convert timestamp with time zone to text");
-DATA(insert OID = 1193 (  text				PGNSP PGUID 12 1 0 f f t f i 1	 25 "1186" _null_ _null_ _null_ interval_text - _null_ ));
-DESCR("convert interval to text");
-DATA(insert OID = 1194 (  reltime			PGNSP PGUID 12 1 0 f f t f i 1	703 "1186" _null_ _null_ _null_ interval_reltime - _null_ ));
+DATA(insert OID = 1194 (  reltime			PGNSP PGUID 12 1 0 f f t f i 1	703 "1186" _null_ _null_ _null_ interval_reltime - _null_ _null_ ));
 DESCR("convert interval to reltime");
-DATA(insert OID = 1195 (  timestamptz_smaller PGNSP PGUID 12 1 0 f f t f i 2 1184 "1184 1184" _null_ _null_ _null_	timestamp_smaller - _null_ ));
+DATA(insert OID = 1195 (  timestamptz_smaller PGNSP PGUID 12 1 0 f f t f i 2 1184 "1184 1184" _null_ _null_ _null_	timestamp_smaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1196 (  timestamptz_larger  PGNSP PGUID 12 1 0 f f t f i 2 1184 "1184 1184" _null_ _null_ _null_	timestamp_larger - _null_ ));
+DATA(insert OID = 1196 (  timestamptz_larger  PGNSP PGUID 12 1 0 f f t f i 2 1184 "1184 1184" _null_ _null_ _null_	timestamp_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1197 (  interval_smaller	PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_	interval_smaller - _null_ ));
+DATA(insert OID = 1197 (  interval_smaller	PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_	interval_smaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1198 (  interval_larger	PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_	interval_larger - _null_ ));
+DATA(insert OID = 1198 (  interval_larger	PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 1186" _null_ _null_ _null_	interval_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1199 (  age				PGNSP PGUID 12 1 0 f f t f i 2 1186 "1184 1184" _null_ _null_ _null_	timestamptz_age - _null_ ));
+DATA(insert OID = 1199 (  age				PGNSP PGUID 12 1 0 f f t f i 2 1186 "1184 1184" _null_ _null_ _null_	timestamptz_age - _null_ _null_ ));
 DESCR("date difference preserving months and years");
 
 /* OIDS 1200 - 1299 */
 
-DATA(insert OID = 1200 (  interval			PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 23" _null_ _null_ _null_	interval_scale - _null_ ));
+DATA(insert OID = 1200 (  interval			PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 23" _null_ _null_ _null_	interval_scale - _null_ _null_ ));
 DESCR("adjust interval precision");
 
-DATA(insert OID = 1215 (  obj_description		   PGNSP PGUID 14 100 0 0 f f t f s 2 0 25 f "26 19" _null_ _null_ _null_ _null_ "select description from pg_catalog.pg_description where objoid = $1 and classoid = (select oid from pg_catalog.pg_class where relname = $2 and relnamespace = PGNSP) and objsubid = 0" - _null_ c ));
+DATA(insert OID = 1215 (  obj_description		   PGNSP PGUID 14 100 0 0 f f t f s 2 0 25 f "26 19" _null_ _null_ _null_ _null_ "select description from pg_catalog.pg_description where objoid = $1 and classoid = (select oid from pg_catalog.pg_class where relname = $2 and relnamespace = PGNSP) and objsubid = 0" - _null_ _null_ c ));
 DESCR("get description for object id and catalog name");
-DATA(insert OID = 1216 (  col_description		   PGNSP PGUID 14 100 0 0 f f t f s 2 0 25 f "26 23" _null_ _null_ _null_ _null_ "select description from pg_catalog.pg_description where objoid = $1 and classoid = ''pg_catalog.pg_class''::regclass and objsubid = $2" - _null_ c ));
+DATA(insert OID = 1216 (  col_description		   PGNSP PGUID 14 100 0 0 f f t f s 2 0 25 f "26 23" _null_ _null_ _null_ _null_ "select description from pg_catalog.pg_description where objoid = $1 and classoid = ''pg_catalog.pg_class''::pg_catalog.regclass and objsubid = $2" - _null_ _null_ c ));
 DESCR("get description for table column");
-DATA(insert OID = 1993 (  shobj_description		   PGNSP PGUID 14 100 0 0 f f t f s 2 0 25 f "26 19" _null_ _null_ _null_ _null_ "select description from pg_catalog.pg_shdescription where objoid = $1 and classoid = (select oid from pg_catalog.pg_class where relname = $2 and relnamespace = PGNSP)" - _null_ c ));
+DATA(insert OID = 1993 (  shobj_description		   PGNSP PGUID 14 100 0 0 f f t f s 2 0 25 f "26 19" _null_ _null_ _null_ _null_ "select description from pg_catalog.pg_shdescription where objoid = $1 and classoid = (select oid from pg_catalog.pg_class where relname = $2 and relnamespace = PGNSP)" - _null_ _null_ c ));
 DESCR("get description for object id and shared catalog name");
 
-DATA(insert OID = 1217 (  date_trunc	   PGNSP PGUID 12 1 0 f f t f s 2 1184 "25 1184" _null_ _null_ _null_ timestamptz_trunc - _null_ ));
+DATA(insert OID = 1217 (  date_trunc	   PGNSP PGUID 12 1 0 f f t f s 2 1184 "25 1184" _null_ _null_ _null_ timestamptz_trunc - _null_ _null_ ));
 DESCR("truncate timestamp with time zone to specified units");
-DATA(insert OID = 1218 (  date_trunc	   PGNSP PGUID 12 1 0 f f t f i 2 1186 "25 1186" _null_ _null_ _null_ interval_trunc - _null_ ));
+DATA(insert OID = 1218 (  date_trunc	   PGNSP PGUID 12 1 0 f f t f i 2 1186 "25 1186" _null_ _null_ _null_ interval_trunc - _null_ _null_ ));
 DESCR("truncate interval to specified units");
 
-DATA(insert OID = 1219 (  int8inc		   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8inc - _null_ ));
+DATA(insert OID = 1219 (  int8inc		   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8inc - _null_ _null_ ));
 DESCR("increment");
-DATA(insert OID = 2804 (  int8inc_any	   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 2276" _null_ _null_ _null_ int8inc_any - _null_ ));
+DATA(insert OID = 2804 (  int8inc_any	   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 2276" _null_ _null_ _null_ int8inc_any - _null_ _null_ ));
 DESCR("increment, ignores second argument");
-DATA(insert OID = 1230 (  int8abs		   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8abs - _null_ ));
+DATA(insert OID = 1230 (  int8abs		   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8abs - _null_ _null_ ));
 DESCR("absolute value");
 
-DATA(insert OID = 1236 (  int8larger	   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8larger - _null_ ));
+DATA(insert OID = 1236 (  int8larger	   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1237 (  int8smaller	   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8smaller - _null_ ));
+DATA(insert OID = 1237 (  int8smaller	   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8smaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1238 (  texticregexeq    PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticregexeq - _null_ ));
+DATA(insert OID = 1238 (  texticregexeq    PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticregexeq - _null_ _null_ ));
 DESCR("matches regex., case-insensitive");
-DATA(insert OID = 1239 (  texticregexne    PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticregexne - _null_ ));
+DATA(insert OID = 1239 (  texticregexne    PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticregexne - _null_ _null_ ));
 DESCR("does not match regex., case-insensitive");
-DATA(insert OID = 1240 (  nameicregexeq    PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameicregexeq - _null_ ));
+DATA(insert OID = 1240 (  nameicregexeq    PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameicregexeq - _null_ _null_ ));
 DESCR("matches regex., case-insensitive");
-DATA(insert OID = 1241 (  nameicregexne    PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameicregexne - _null_ ));
+DATA(insert OID = 1241 (  nameicregexne    PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_ nameicregexne - _null_ _null_ ));
 DESCR("does not match regex., case-insensitive");
 
-DATA(insert OID = 1251 (  int4abs		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4abs - _null_ ));
+DATA(insert OID = 1251 (  int4abs		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1253 (  int2abs		   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2abs - _null_ ));
+DATA(insert OID = 1253 (  int2abs		   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2abs - _null_ _null_ ));
 DESCR("absolute value");
 
-DATA(insert OID = 6117 (  interval		   PGNSP PGUID 12 1 0 f f t f s 1 1186 "25" _null_ _null_ _null_	text_interval - _null_ ));
-DESCR("convert text to interval");
-
-DATA(insert OID = 1271 (  overlaps		   PGNSP PGUID 12 1 0 f f f f i 4 16 "1266 1266 1266 1266" _null_ _null_ _null_ overlaps_timetz - _null_ ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 1272 (  datetime_pl	   PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1083" _null_ _null_ _null_ datetime_timestamp - _null_ ));
+DATA(insert OID = 1271 (  overlaps		   PGNSP PGUID 12 1 0 f f f f i 4 16 "1266 1266 1266 1266" _null_ _null_ _null_ overlaps_timetz - _null_ _null_ ));
+DESCR("intervals overlap?");
+DATA(insert OID = 1272 (  datetime_pl	   PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1083" _null_ _null_ _null_ datetime_timestamp - _null_ _null_ ));
 DESCR("convert date and time to timestamp");
-DATA(insert OID = 1273 (  date_part		   PGNSP PGUID 12 1 0 f f t f i 2  701 "25 1266" _null_ _null_ _null_ timetz_part - _null_ ));
+DATA(insert OID = 1273 (  date_part		   PGNSP PGUID 12 1 0 f f t f i 2  701 "25 1266" _null_ _null_ _null_ timetz_part - _null_ _null_ ));
 DESCR("extract field from time with time zone");
-DATA(insert OID = 1274 (  int84pl		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84pl - _null_ ));
+DATA(insert OID = 1274 (  int84pl		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 1275 (  int84mi		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84mi - _null_ ));
+DATA(insert OID = 1275 (  int84mi		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1276 (  int84mul		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84mul - _null_ ));
+DATA(insert OID = 1276 (  int84mul		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1277 (  int84div		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84div - _null_ ));
+DATA(insert OID = 1277 (  int84div		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int84div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 1278 (  int48pl		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48pl - _null_ ));
+DATA(insert OID = 1278 (  int48pl		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48pl - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 1279 (  int48mi		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48mi - _null_ ));
+DATA(insert OID = 1279 (  int48mi		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1280 (  int48mul		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48mul - _null_ ));
+DATA(insert OID = 1280 (  int48mul		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1281 (  int48div		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48div - _null_ ));
+DATA(insert OID = 1281 (  int48div		   PGNSP PGUID 12 1 0 f f t f i 2 20 "23 20" _null_ _null_ _null_ int48div - _null_ _null_ ));
 DESCR("divide");
 
-DATA(insert OID = 1287 (  oid			   PGNSP PGUID 12 1 0 f f t f i 1 26 "20" _null_ _null_ _null_	i8tooid - _null_ ));
+DATA(insert OID = 1287 (  oid			   PGNSP PGUID 12 1 0 f f t f i 1 26 "20" _null_ _null_ _null_	i8tooid - _null_ _null_ ));
 DESCR("convert int8 to oid");
-DATA(insert OID = 1288 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1 20 "26" _null_ _null_ _null_	oidtoi8 - _null_ ));
+DATA(insert OID = 1288 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1 20 "26" _null_ _null_ _null_	oidtoi8 - _null_ _null_ ));
 DESCR("convert oid to int8");
 
-DATA(insert OID = 1289 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "20" _null_ _null_ _null_	int8_text - _null_ ));
-DESCR("convert int8 to text");
-DATA(insert OID = 1290 (  int8			   PGNSP PGUID 12 1 0 f f t f i 1 20 "25" _null_ _null_ _null_	text_int8 - _null_ ));
-DESCR("convert text to int8");
-
-DATA(insert OID = 1291 (  array_length_coerce	PGNSP PGUID 12 1 0 f f t f s 3 2277 "2277 23 16" _null_ _null_ _null_ array_length_coerce - _null_ ));
-DESCR("adjust any array to new element typmod");
-
-DATA(insert OID = 1292 ( tideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tideq - _null_ ));
+DATA(insert OID = 1292 ( tideq			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tideq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1293 ( currtid		   PGNSP PGUID 12 1 0 f f t f v 2 27 "26 27" _null_ _null_ _null_ currtid_byreloid - _null_ ));
+DATA(insert OID = 1293 ( currtid		   PGNSP PGUID 12 1 0 f f t f v 2 27 "26 27" _null_ _null_ _null_ currtid_byreloid - _null_ _null_ ));
 DESCR("latest tid of a tuple");
-DATA(insert OID = 1294 ( currtid2		   PGNSP PGUID 12 1 0 f f t f v 2 27 "25 27" _null_ _null_ _null_ currtid_byrelname - _null_ ));
+DATA(insert OID = 1294 ( currtid2		   PGNSP PGUID 12 1 0 f f t f v 2 27 "25 27" _null_ _null_ _null_ currtid_byrelname - _null_ _null_ ));
 DESCR("latest tid of a tuple");
-DATA(insert OID = 1265 ( tidne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidne - _null_ ));
+DATA(insert OID = 1265 ( tidne			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2790 ( tidgt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidgt - _null_));
+DATA(insert OID = 2790 ( tidgt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidgt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2791 ( tidlt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidlt - _null_));
+DATA(insert OID = 2791 ( tidlt			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidlt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2792 ( tidge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidge - _null_));
+DATA(insert OID = 2792 ( tidge			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2793 ( tidle			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidle - _null_));
+DATA(insert OID = 2793 ( tidle			   PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidle - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2794 ( bttidcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "27 27" _null_ _null_ _null_ bttidcmp - _null_));
+DATA(insert OID = 2794 ( bttidcmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "27 27" _null_ _null_ _null_ bttidcmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 2795 ( tidlarger		   PGNSP PGUID 12 1 0 f f t f i 2 27 "27 27" _null_ _null_ _null_ tidlarger - _null_ ));
+DATA(insert OID = 2795 ( tidlarger		   PGNSP PGUID 12 1 0 f f t f i 2 27 "27 27" _null_ _null_ _null_ tidlarger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 2796 ( tidsmaller		   PGNSP PGUID 12 1 0 f f t f i 2 27 "27 27" _null_ _null_ _null_ tidsmaller - _null_ ));
+DATA(insert OID = 2796 ( tidsmaller		   PGNSP PGUID 12 1 0 f f t f i 2 27 "27 27" _null_ _null_ _null_ tidsmaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1296 (  timedate_pl	   PGNSP PGUID 14 1 0 0 f f t f i 2 0 1114 f "1083 1082" _null_ _null_ _null_ _null_ "select ($2 + $1)" - _null_ c ));
+DATA(insert OID = 1296 (  timedate_pl	   PGNSP PGUID 14 1 0 0 f f t f i 2 0 1114 f "1083 1082" _null_ _null_ _null_ _null_ "select ($2 + $1)" - _null_ _null_ c ));
 DESCR("convert time and date to timestamp");
-DATA(insert OID = 1297 (  datetimetz_pl    PGNSP PGUID 12 1 0 f f t f i 2 1184 "1082 1266" _null_ _null_ _null_ datetimetz_timestamptz - _null_ ));
+DATA(insert OID = 1297 (  datetimetz_pl    PGNSP PGUID 12 1 0 f f t f i 2 1184 "1082 1266" _null_ _null_ _null_ datetimetz_timestamptz - _null_ _null_ ));
 DESCR("convert date and time with time zone to timestamp with time zone");
-DATA(insert OID = 1298 (  timetzdate_pl	   PGNSP PGUID 14 1 0 0 f f t f i 2 0 1184 f "1266 1082" _null_ _null_ _null_ _null_ "select ($2 + $1)" - _null_ c ));
+DATA(insert OID = 1298 (  timetzdate_pl	   PGNSP PGUID 14 1 0 0 f f t f i 2 0 1184 f "1266 1082" _null_ _null_ _null_ _null_ "select ($2 + $1)" - _null_ _null_ c ));
 DESCR("convert time with time zone and date to timestamp with time zone");
-DATA(insert OID = 1299 (  now			   PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_	now - _null_ ));
+DATA(insert OID = 1299 (  now			   PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_	now - _null_ _null_ ));
 DESCR("current transaction time");
-DATA(insert OID = 2647 (  transaction_timestamp PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ now - _null_ ));
+DATA(insert OID = 2647 (  transaction_timestamp PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ now - _null_ _null_ ));
 DESCR("current transaction time");
-DATA(insert OID = 2648 (  statement_timestamp	PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ statement_timestamp - _null_ ));
+DATA(insert OID = 2648 (  statement_timestamp	PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ statement_timestamp - _null_ _null_ ));
 DESCR("current statement time");
-DATA(insert OID = 2649 (  clock_timestamp	PGNSP PGUID 12 1 0 f f t f v 0 1184 "" _null_ _null_ _null_ clock_timestamp - _null_ ));
+DATA(insert OID = 2649 (  clock_timestamp	PGNSP PGUID 12 1 0 f f t f v 0 1184 "" _null_ _null_ _null_ clock_timestamp - _null_ _null_ ));
 DESCR("current clock time");
 
 /* OIDS 1300 - 1399 */
 
-DATA(insert OID = 1300 (  positionsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	positionsel - _null_ ));
+DATA(insert OID = 1300 (  positionsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	positionsel - _null_ _null_ ));
 DESCR("restriction selectivity for position-comparison operators");
-DATA(insert OID = 1301 (  positionjoinsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	positionjoinsel - _null_ ));
+DATA(insert OID = 1301 (  positionjoinsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	positionjoinsel - _null_ _null_ ));
 DESCR("join selectivity for position-comparison operators");
-DATA(insert OID = 1302 (  contsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	contsel - _null_ ));
+DATA(insert OID = 1302 (  contsel		   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_	contsel - _null_ _null_ ));
 DESCR("restriction selectivity for containment comparison operators");
-DATA(insert OID = 1303 (  contjoinsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	contjoinsel - _null_ ));
+DATA(insert OID = 1303 (  contjoinsel	   PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_	contjoinsel - _null_ _null_ ));
 DESCR("join selectivity for containment comparison operators");
 
-DATA(insert OID = 1304 ( overlaps			 PGNSP PGUID 12 1 0 f f f f i 4 16 "1184 1184 1184 1184" _null_ _null_ _null_ overlaps_timestamp - _null_ ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 1305 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f s 4 0 16 f "1184 1186 1184 1186" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ c ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 1306 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f s 4 0 16 f "1184 1184 1184 1186" _null_ _null_ _null_ _null_ "select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ c ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 1307 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f s 4 0 16 f "1184 1186 1184 1184" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ c ));
-DESCR("SQL92 interval comparison");
-
-DATA(insert OID = 1308 ( overlaps			 PGNSP PGUID 12 1 0 f f f f i 4 16 "1083 1083 1083 1083" _null_ _null_ _null_ overlaps_time - _null_ ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 1309 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1083 1186 1083 1186" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ c ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 1310 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1083 1083 1083 1186" _null_ _null_ _null_ _null_ "select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ c ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 1311 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1083 1186 1083 1083" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ c ));
-DESCR("SQL92 interval comparison");
-
-DATA(insert OID = 1312 (  timestamp_in		 PGNSP PGUID 12 1 0 f f t f s 3 1114 "2275 26 23" _null_ _null_ _null_ timestamp_in - _null_ ));
-DESCR("I/O");
-DATA(insert OID = 1313 (  timestamp_out		 PGNSP PGUID 12 1 0 f f t f s 1 2275 "1114" _null_ _null_ _null_ timestamp_out - _null_ ));
-DESCR("I/O");
-DATA(insert OID = 2905 (  timestamptypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timestamptypmodin - _null_ ));
+DATA(insert OID = 1304 ( overlaps			 PGNSP PGUID 12 1 0 f f f f i 4 16 "1184 1184 1184 1184" _null_ _null_ _null_ overlaps_timestamp - _null_ _null_ ));
+DESCR("intervals overlap?");
+DATA(insert OID = 1305 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f s 4 0 16 f "1184 1186 1184 1186" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+DATA(insert OID = 1306 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f s 4 0 16 f "1184 1184 1184 1186" _null_ _null_ _null_ _null_ "select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+DATA(insert OID = 1307 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f s 4 0 16 f "1184 1186 1184 1184" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+
+DATA(insert OID = 1308 ( overlaps			 PGNSP PGUID 12 1 0 f f f f i 4 16 "1083 1083 1083 1083" _null_ _null_ _null_ overlaps_time - _null_ _null_ ));
+DESCR("intervals overlap?");
+DATA(insert OID = 1309 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1083 1186 1083 1186" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+DATA(insert OID = 1310 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1083 1083 1083 1186" _null_ _null_ _null_ _null_ "select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+DATA(insert OID = 1311 ( overlaps			 PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1083 1186 1083 1083" _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+
+DATA(insert OID = 1312 (  timestamp_in		 PGNSP PGUID 12 1 0 f f t f s 3 1114 "2275 26 23" _null_ _null_ _null_ timestamp_in - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 1313 (  timestamp_out		 PGNSP PGUID 12 1 0 f f t f s 1 2275 "1114" _null_ _null_ _null_ timestamp_out - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2905 (  timestamptypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timestamptypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2906 (  timestamptypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timestamptypmodout - _null_ ));
+DATA(insert OID = 2906 (  timestamptypmodout	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timestamptypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1314 (  timestamptz_cmp	 PGNSP PGUID 12 1 0 f f t f i 2 23 "1184 1184" _null_ _null_ _null_ timestamp_cmp - _null_ ));
+DATA(insert OID = 1314 (  timestamptz_cmp	 PGNSP PGUID 12 1 0 f f t f i 2 23 "1184 1184" _null_ _null_ _null_ timestamp_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1315 (  interval_cmp		 PGNSP PGUID 12 1 0 f f t f i 2 23 "1186 1186" _null_ _null_ _null_ interval_cmp - _null_ ));
+DATA(insert OID = 1315 (  interval_cmp		 PGNSP PGUID 12 1 0 f f t f i 2 23 "1186 1186" _null_ _null_ _null_ interval_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1316 (  time				 PGNSP PGUID 12 1 0 f f t f i 1 1083 "1114" _null_ _null_ _null_	timestamp_time - _null_ ));
+DATA(insert OID = 1316 (  time				 PGNSP PGUID 12 1 0 f f t f i 1 1083 "1114" _null_ _null_ _null_	timestamp_time - _null_ _null_ ));
 DESCR("convert timestamp to time");
 
-DATA(insert OID = 1317 (  length			 PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_	textlen - _null_ ));
+DATA(insert OID = 1317 (  length			 PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_	textlen - _null_ _null_ ));
 DESCR("length");
-DATA(insert OID = 1318 (  length			 PGNSP PGUID 12 1 0 f f t f i 1 23 "1042" _null_ _null_ _null_	bpcharlen - _null_ ));
+DATA(insert OID = 1318 (  length			 PGNSP PGUID 12 1 0 f f t f i 1 23 "1042" _null_ _null_ _null_	bpcharlen - _null_ _null_ ));
 DESCR("character length");
 
-DATA(insert OID = 1319 (  xideqint4			 PGNSP PGUID 12 1 0 f f t f i 2 16 "28 23" _null_ _null_ _null_ xideq - _null_ ));
+DATA(insert OID = 1319 (  xideqint4			 PGNSP PGUID 12 1 0 f f t f i 2 16 "28 23" _null_ _null_ _null_ xideq - _null_ _null_ ));
 DESCR("equal");
 
-DATA(insert OID = 1326 (  interval_div		 PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 701" _null_ _null_ _null_	interval_div - _null_ ));
+DATA(insert OID = 1326 (  interval_div		 PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 701" _null_ _null_ _null_	interval_div - _null_ _null_ ));
 DESCR("divide");
 
-DATA(insert OID = 1339 (  dlog10			 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog10 - _null_ ));
+DATA(insert OID = 1339 (  dlog10			 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog10 - _null_ _null_ ));
 DESCR("base 10 logarithm");
-DATA(insert OID = 1340 (  log				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog10 - _null_ ));
+DATA(insert OID = 1340 (  log				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog10 - _null_ _null_ ));
 DESCR("base 10 logarithm");
-DATA(insert OID = 1341 (  ln				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog1 - _null_ ));
+DATA(insert OID = 1341 (  ln				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dlog1 - _null_ _null_ ));
 DESCR("natural logarithm");
-DATA(insert OID = 1342 (  round				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dround - _null_ ));
+DATA(insert OID = 1342 (  round				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dround - _null_ _null_ ));
 DESCR("round to nearest integer");
-DATA(insert OID = 1343 (  trunc				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dtrunc - _null_ ));
+DATA(insert OID = 1343 (  trunc				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dtrunc - _null_ _null_ ));
 DESCR("truncate to integer");
-DATA(insert OID = 1344 (  sqrt				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dsqrt - _null_ ));
+DATA(insert OID = 1344 (  sqrt				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dsqrt - _null_ _null_ ));
 DESCR("square root");
-DATA(insert OID = 1345 (  cbrt				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dcbrt - _null_ ));
+DATA(insert OID = 1345 (  cbrt				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dcbrt - _null_ _null_ ));
 DESCR("cube root");
-DATA(insert OID = 1346 (  pow				 PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	dpow - _null_ ));
+DATA(insert OID = 1346 (  pow				 PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	dpow - _null_ _null_ ));
 DESCR("exponentiation");
-DATA(insert OID = 1368 (  power				 PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	dpow - _null_ ));
+DATA(insert OID = 1368 (  power				 PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_	dpow - _null_ _null_ ));
 DESCR("exponentiation");
-DATA(insert OID = 1347 (  exp				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dexp - _null_ ));
+DATA(insert OID = 1347 (  exp				 PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	dexp - _null_ _null_ ));
 DESCR("exponential");
 
 /*
  * This form of obj_description is now deprecated, since it will fail if
  * OIDs are not unique across system catalogs.	Use the other forms instead.
  */
-DATA(insert OID = 1348 (  obj_description	 PGNSP PGUID 14 100 0 0 f f t f s 1 0 25 f "26" _null_ _null_ _null_ _null_	"select description from pg_catalog.pg_description where objoid = $1 and objsubid = 0" - _null_ c ));
+DATA(insert OID = 1348 (  obj_description	 PGNSP PGUID 14 100 0 0 f f t f s 1 0 25 f "26" _null_ _null_ _null_ _null_	"select description from pg_catalog.pg_description where objoid = $1 and objsubid = 0" - _null_ _null_ c ));
 DESCR("get description for object id (deprecated)");
-DATA(insert OID = 1349 (  oidvectortypes	 PGNSP PGUID 12 1 0 f f t f s 1 25 "30" _null_ _null_ _null_	oidvectortypes - _null_ ));
+DATA(insert OID = 1349 (  oidvectortypes	 PGNSP PGUID 12 1 0 f f t f s 1 25 "30" _null_ _null_ _null_	oidvectortypes - _null_ _null_ ));
 DESCR("print type names of oidvector field");
 
 
-DATA(insert OID = 1350 (  timetz_in		   PGNSP PGUID 12 1 0 f f t f s 3 1266 "2275 26 23" _null_ _null_ _null_ timetz_in - _null_ ));
+DATA(insert OID = 1350 (  timetz_in		   PGNSP PGUID 12 1 0 f f t f s 3 1266 "2275 26 23" _null_ _null_ _null_ timetz_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1351 (  timetz_out	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1266" _null_ _null_ _null_	timetz_out - _null_ ));
+DATA(insert OID = 1351 (  timetz_out	   PGNSP PGUID 12 1 0 f f t f i 1 2275 "1266" _null_ _null_ _null_	timetz_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2911 (  timetztypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timetztypmodin - _null_ ));
+DATA(insert OID = 2911 (  timetztypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	timetztypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2912 (  timetztypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timetztypmodout - _null_ ));
+DATA(insert OID = 2912 (  timetztypmodout	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	timetztypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1352 (  timetz_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_eq - _null_ ));
+DATA(insert OID = 1352 (  timetz_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1353 (  timetz_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_ne - _null_ ));
+DATA(insert OID = 1353 (  timetz_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1354 (  timetz_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_lt - _null_ ));
+DATA(insert OID = 1354 (  timetz_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1355 (  timetz_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_le - _null_ ));
+DATA(insert OID = 1355 (  timetz_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1356 (  timetz_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_ge - _null_ ));
+DATA(insert OID = 1356 (  timetz_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1357 (  timetz_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_gt - _null_ ));
+DATA(insert OID = 1357 (  timetz_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1266 1266" _null_ _null_ _null_ timetz_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1358 (  timetz_cmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "1266 1266" _null_ _null_ _null_ timetz_cmp - _null_ ));
+DATA(insert OID = 1358 (  timetz_cmp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "1266 1266" _null_ _null_ _null_ timetz_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 1359 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f i 2 1184 "1082 1266" _null_ _null_ _null_ datetimetz_timestamptz - _null_ ));
+DATA(insert OID = 1359 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f i 2 1184 "1082 1266" _null_ _null_ _null_ datetimetz_timestamptz - _null_ _null_ ));
 DESCR("convert date and time with time zone to timestamp with time zone");
 
-DATA(insert OID = 1364 (  time			   PGNSP PGUID 14 1 0 0 f f t f s 1 0 1083 f "702" _null_ _null_ _null_ _null_ "select cast(cast($1 as timestamp without time zone) as time)" - _null_ c ));
+DATA(insert OID = 1364 (  time			   PGNSP PGUID 14 1 0 0 f f t f s 1 0 1083 f "702" _null_ _null_ _null_ _null_ "select cast(cast($1 as timestamp without time zone) as pg_catalog.time)" - _null_ _null_ c ));
 DESCR("convert abstime to time");
 
-DATA(insert OID = 1367 (  character_length	PGNSP PGUID 12 1 0 f f t f i 1	23 "1042" _null_ _null_ _null_	bpcharlen - _null_ ));
+DATA(insert OID = 1367 (  character_length	PGNSP PGUID 12 1 0 f f t f i 1	23 "1042" _null_ _null_ _null_	bpcharlen - _null_ _null_ ));
 DESCR("character length");
-DATA(insert OID = 1369 (  character_length	PGNSP PGUID 12 1 0 f f t f i 1	23 "25" _null_ _null_ _null_	textlen - _null_ ));
+DATA(insert OID = 1369 (  character_length	PGNSP PGUID 12 1 0 f f t f i 1	23 "25" _null_ _null_ _null_	textlen - _null_ _null_ ));
 DESCR("character length");
 
-DATA(insert OID = 1370 (  interval			 PGNSP PGUID 12 1 0 f f t f i 1 1186 "1083" _null_ _null_ _null_	time_interval - _null_ ));
+DATA(insert OID = 1370 (  interval			 PGNSP PGUID 12 1 0 f f t f i 1 1186 "1083" _null_ _null_ _null_	time_interval - _null_ _null_ ));
 DESCR("convert time to interval");
-DATA(insert OID = 1372 (  char_length		 PGNSP PGUID 12 1 0 f f t f i 1 23	 "1042" _null_ _null_ _null_	bpcharlen - _null_ ));
+DATA(insert OID = 1372 (  char_length		 PGNSP PGUID 12 1 0 f f t f i 1 23	 "1042" _null_ _null_ _null_	bpcharlen - _null_ _null_ ));
 DESCR("character length");
-
-DATA(insert OID = 1373 (  array_type_length_coerce	PGNSP PGUID 12 1 0 f f t f s 3 2277 "2277 23 16" _null_ _null_ _null_ array_type_length_coerce - _null_ ));
-DESCR("coerce array to another type and adjust element typmod");
-
-DATA(insert OID = 1374 (  octet_length			 PGNSP PGUID 12 1 0 f f t f i 1 23	 "25" _null_ _null_ _null_	textoctetlen - _null_ ));
+DATA(insert OID = 1374 (  octet_length			 PGNSP PGUID 12 1 0 f f t f i 1 23	 "25" _null_ _null_ _null_	textoctetlen - _null_ _null_ ));
 DESCR("octet length");
-DATA(insert OID = 1375 (  octet_length			 PGNSP PGUID 12 1 0 f f t f i 1 23	 "1042" _null_ _null_ _null_	bpcharoctetlen - _null_ ));
+DATA(insert OID = 1375 (  octet_length			 PGNSP PGUID 12 1 0 f f t f i 1 23	 "1042" _null_ _null_ _null_	bpcharoctetlen - _null_ _null_ ));
 DESCR("octet length");
 
-DATA(insert OID = 1377 (  time_larger	   PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1083" _null_ _null_ _null_ time_larger - _null_ ));
+DATA(insert OID = 1377 (  time_larger	   PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1083" _null_ _null_ _null_ time_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1378 (  time_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1083" _null_ _null_ _null_ time_smaller - _null_ ));
+DATA(insert OID = 1378 (  time_smaller	   PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1083" _null_ _null_ _null_ time_smaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 1379 (  timetz_larger    PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1266" _null_ _null_ _null_ timetz_larger - _null_ ));
+DATA(insert OID = 1379 (  timetz_larger    PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1266" _null_ _null_ _null_ timetz_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1380 (  timetz_smaller   PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1266" _null_ _null_ _null_ timetz_smaller - _null_ ));
+DATA(insert OID = 1380 (  timetz_smaller   PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1266" _null_ _null_ _null_ timetz_smaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1381 (  char_length	   PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_	textlen - _null_ ));
+DATA(insert OID = 1381 (  char_length	   PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_	textlen - _null_ _null_ ));
 DESCR("character length");
 
-DATA(insert OID = 1382 (  date_part 	PGNSP PGUID 14 1 0 0 f f t f s 2 0 701 f "25 702" _null_ _null_ _null_ _null_ "select pg_catalog.date_part($1, cast($2 as timestamp with time zone))" - _null_ c ));
+DATA(insert OID = 1382 (  date_part 	PGNSP PGUID 14 1 0 0 f f t f s 2 0 701 f "25 702" _null_ _null_ _null_ _null_ "select pg_catalog.date_part($1, cast($2 as timestamp with time zone))" - _null_ _null_ c ));
 DESCR("extract field from abstime");
-DATA(insert OID = 1383 (  date_part 	PGNSP PGUID 14 1 0 0 f f t f s 2 0 701 f "25 703" _null_ _null_ _null_ _null_ "select pg_catalog.date_part($1, cast($2 as pg_catalog.interval))" - _null_ c ));
+DATA(insert OID = 1383 (  date_part 	PGNSP PGUID 14 1 0 0 f f t f s 2 0 701 f "25 703" _null_ _null_ _null_ _null_ "select pg_catalog.date_part($1, cast($2 as pg_catalog.interval))" - _null_ _null_ c ));
 DESCR("extract field from reltime");
-DATA(insert OID = 1384 (  date_part 	PGNSP PGUID 14 1 0 0 f f t f i 2 0 701 f "25 1082" _null_ _null_ _null_ _null_ "select pg_catalog.date_part($1, cast($2 as timestamp without time zone))" - _null_ c ));
+DATA(insert OID = 1384 (  date_part 	PGNSP PGUID 14 1 0 0 f f t f i 2 0 701 f "25 1082" _null_ _null_ _null_ _null_ "select pg_catalog.date_part($1, cast($2 as timestamp without time zone))" - _null_ _null_ c ));
 DESCR("extract field from date");
-DATA(insert OID = 1385 (  date_part    PGNSP PGUID 12 1 0 f f t f i 2  701 "25 1083" _null_ _null_ _null_  time_part - _null_ ));
+DATA(insert OID = 1385 (  date_part    PGNSP PGUID 12 1 0 f f t f i 2  701 "25 1083" _null_ _null_ _null_  time_part - _null_ _null_ ));
 DESCR("extract field from time");
-DATA(insert OID = 1386 (  age		   PGNSP PGUID 14 1 0 0 f f t f s 1 0 1186 f "1184" _null_ _null_ _null_ _null_ "select pg_catalog.age(cast(current_date as timestamp with time zone), $1)" - _null_ c ));
+DATA(insert OID = 1386 (  age		   PGNSP PGUID 14 1 0 0 f f t f s 1 0 1186 f "1184" _null_ _null_ _null_ _null_ "select pg_catalog.age(cast(current_date as timestamp with time zone), $1)" - _null_ _null_ c ));
 DESCR("date difference from today preserving months and years");
 
-DATA(insert OID = 1388 (  timetz	   PGNSP PGUID 12 1 0 f f t f s 1 1266 "1184" _null_ _null_ _null_	timestamptz_timetz - _null_ ));
+DATA(insert OID = 1388 (  timetz	   PGNSP PGUID 12 1 0 f f t f s 1 1266 "1184" _null_ _null_ _null_	timestamptz_timetz - _null_ _null_ ));
 DESCR("convert timestamptz to timetz");
 
-DATA(insert OID = 1389 (  isfinite	   PGNSP PGUID 12 1 0 f f t f i 1 16 "1184" _null_ _null_ _null_	timestamp_finite - _null_ ));
+DATA(insert OID = 1389 (  isfinite	   PGNSP PGUID 12 1 0 f f t f i 1 16 "1184" _null_ _null_ _null_	timestamp_finite - _null_ _null_ ));
 DESCR("finite timestamp?");
-DATA(insert OID = 1390 (  isfinite	   PGNSP PGUID 12 1 0 f f t f i 1 16 "1186" _null_ _null_ _null_	interval_finite - _null_ ));
+DATA(insert OID = 1390 (  isfinite	   PGNSP PGUID 12 1 0 f f t f i 1 16 "1186" _null_ _null_ _null_	interval_finite - _null_ _null_ ));
 DESCR("finite interval?");
 
 
-DATA(insert OID = 1376 (  factorial		   PGNSP PGUID 12 1 0 f f t f i 1 1700 "20" _null_ _null_ _null_	numeric_fac - _null_ ));
+DATA(insert OID = 1376 (  factorial		   PGNSP PGUID 12 1 0 f f t f i 1 1700 "20" _null_ _null_ _null_	numeric_fac - _null_ _null_ ));
 DESCR("factorial");
-DATA(insert OID = 1394 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_	float4abs - _null_ ));
+DATA(insert OID = 1394 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_	float4abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1395 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	float8abs - _null_ ));
+DATA(insert OID = 1395 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_	float8abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1396 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8abs - _null_ ));
+DATA(insert OID = 1396 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1397 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4abs - _null_ ));
+DATA(insert OID = 1397 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1398 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2abs - _null_ ));
+DATA(insert OID = 1398 (  abs			   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2abs - _null_ _null_ ));
 DESCR("absolute value");
 
 /* OIDS 1400 - 1499 */
 
-DATA(insert OID = 1400 (  name		   PGNSP PGUID 12 1 0 f f t f i 1 19 "1043" _null_ _null_ _null_	text_name - _null_ ));
+DATA(insert OID = 1400 (  name		   PGNSP PGUID 12 1 0 f f t f i 1 19 "1043" _null_ _null_ _null_	text_name - _null_ _null_ ));
 DESCR("convert varchar to name");
-DATA(insert OID = 1401 (  varchar	   PGNSP PGUID 12 1 0 f f t f i 1 1043 "19" _null_ _null_ _null_	name_text - _null_ ));
+DATA(insert OID = 1401 (  varchar	   PGNSP PGUID 12 1 0 f f t f i 1 1043 "19" _null_ _null_ _null_	name_text - _null_ _null_ ));
 DESCR("convert name to varchar");
 
-DATA(insert OID = 1402 (  current_schema	PGNSP PGUID 12 1 0 f f t f s 0	  19 "" _null_ _null_ _null_ current_schema - _null_ ));
+DATA(insert OID = 1402 (  current_schema	PGNSP PGUID 12 1 0 f f t f s 0	  19 "" _null_ _null_ _null_ current_schema - _null_ _null_ ));
 DESCR("current schema name");
-DATA(insert OID = 1403 (  current_schemas	PGNSP PGUID 12 1 0 f f t f s 1	1003 "16" _null_ _null_ _null_	current_schemas - _null_ ));
+DATA(insert OID = 1403 (  current_schemas	PGNSP PGUID 12 1 0 f f t f s 1	1003 "16" _null_ _null_ _null_	current_schemas - _null_ _null_ ));
 DESCR("current schema search list");
 
-DATA(insert OID = 1404 (  overlay			PGNSP PGUID 14 1 0 0 f f t f i 4 0 25 f "25 25 23 23" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, 1, ($3 - 1)) || $2 || pg_catalog.substring($1, ($3 + $4))" - _null_ c ));
+DATA(insert OID = 1404 (  overlay			PGNSP PGUID 14 1 0 0 f f t f i 4 0 25 f "25 25 23 23" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, 1, ($3 - 1)) || $2 || pg_catalog.substring($1, ($3 + $4))" - _null_ _null_ c ));
 DESCR("substitute portion of string");
-DATA(insert OID = 1405 (  overlay			PGNSP PGUID 14 1 0 0 f f t f i 3 0 25 f "25 25 23" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, 1, ($3 - 1)) || $2 || pg_catalog.substring($1, ($3 + pg_catalog.char_length($2)))" - _null_ c ));
+DATA(insert OID = 1405 (  overlay			PGNSP PGUID 14 1 0 0 f f t f i 3 0 25 f "25 25 23" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, 1, ($3 - 1)) || $2 || pg_catalog.substring($1, ($3 + pg_catalog.char_length($2)))" - _null_ _null_ c ));
 DESCR("substitute portion of string");
 
-DATA(insert OID = 1406 (  isvertical		PGNSP PGUID 12 1 0 f f t f i 2	16 "600 600" _null_ _null_ _null_  point_vert - _null_ ));
+DATA(insert OID = 1406 (  isvertical		PGNSP PGUID 12 1 0 f f t f i 2	16 "600 600" _null_ _null_ _null_  point_vert - _null_ _null_ ));
 DESCR("vertically aligned?");
-DATA(insert OID = 1407 (  ishorizontal		PGNSP PGUID 12 1 0 f f t f i 2	16 "600 600" _null_ _null_ _null_  point_horiz - _null_ ));
+DATA(insert OID = 1407 (  ishorizontal		PGNSP PGUID 12 1 0 f f t f i 2	16 "600 600" _null_ _null_ _null_  point_horiz - _null_ _null_ ));
 DESCR("horizontally aligned?");
-DATA(insert OID = 1408 (  isparallel		PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_parallel - _null_ ));
+DATA(insert OID = 1408 (  isparallel		PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_parallel - _null_ _null_ ));
 DESCR("parallel?");
-DATA(insert OID = 1409 (  isperp			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_perp - _null_ ));
+DATA(insert OID = 1409 (  isperp			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_perp - _null_ _null_ ));
 DESCR("perpendicular?");
-DATA(insert OID = 1410 (  isvertical		PGNSP PGUID 12 1 0 f f t f i 1	16 "601" _null_ _null_ _null_  lseg_vertical - _null_ ));
+DATA(insert OID = 1410 (  isvertical		PGNSP PGUID 12 1 0 f f t f i 1	16 "601" _null_ _null_ _null_  lseg_vertical - _null_ _null_ ));
 DESCR("vertical?");
-DATA(insert OID = 1411 (  ishorizontal		PGNSP PGUID 12 1 0 f f t f i 1	16 "601" _null_ _null_ _null_  lseg_horizontal - _null_ ));
+DATA(insert OID = 1411 (  ishorizontal		PGNSP PGUID 12 1 0 f f t f i 1	16 "601" _null_ _null_ _null_  lseg_horizontal - _null_ _null_ ));
 DESCR("horizontal?");
-DATA(insert OID = 1412 (  isparallel		PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_parallel - _null_ ));
+DATA(insert OID = 1412 (  isparallel		PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_parallel - _null_ _null_ ));
 DESCR("parallel?");
-DATA(insert OID = 1413 (  isperp			PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_perp - _null_ ));
+DATA(insert OID = 1413 (  isperp			PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_perp - _null_ _null_ ));
 DESCR("perpendicular?");
-DATA(insert OID = 1414 (  isvertical		PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_vertical - _null_ ));
+DATA(insert OID = 1414 (  isvertical		PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_vertical - _null_ _null_ ));
 DESCR("vertical?");
-DATA(insert OID = 1415 (  ishorizontal		PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_horizontal - _null_ ));
+DATA(insert OID = 1415 (  ishorizontal		PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_horizontal - _null_ _null_ ));
 DESCR("horizontal?");
-DATA(insert OID = 1416 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "718" _null_ _null_ _null_ circle_center - _null_ ));
+DATA(insert OID = 1416 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "718" _null_ _null_ _null_ circle_center - _null_ _null_ ));
 DESCR("center of");
 
-DATA(insert OID = 1417 (  isnottrue			PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_ isnottrue - _null_ ));
+DATA(insert OID = 1417 (  isnottrue			PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_ isnottrue - _null_ _null_ ));
 DESCR("bool is not true (ie, false or unknown)");
-DATA(insert OID = 1418 (  isnotfalse		PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_ isnotfalse - _null_ ));
+DATA(insert OID = 1418 (  isnotfalse		PGNSP PGUID 12 1 0 f f f f i 1 16 "16" _null_ _null_ _null_ isnotfalse - _null_ _null_ ));
 DESCR("bool is not false (ie, true or unknown)");
 
-DATA(insert OID = 1419 (  time				PGNSP PGUID 12 1 0 f f t f i 1 1083 "1186" _null_ _null_ _null_ interval_time - _null_ ));
+DATA(insert OID = 1419 (  time				PGNSP PGUID 12 1 0 f f t f i 1 1083 "1186" _null_ _null_ _null_ interval_time - _null_ _null_ ));
 DESCR("convert interval to time");
 
-DATA(insert OID = 1421 (  box				PGNSP PGUID 12 1 0 f f t f i 2 603 "600 600" _null_ _null_ _null_ points_box - _null_ ));
+DATA(insert OID = 1421 (  box				PGNSP PGUID 12 1 0 f f t f i 2 603 "600 600" _null_ _null_ _null_ points_box - _null_ _null_ ));
 DESCR("convert points to box");
-DATA(insert OID = 1422 (  box_add			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_add - _null_ ));
+DATA(insert OID = 1422 (  box_add			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_add - _null_ _null_ ));
 DESCR("add point to box (translate)");
-DATA(insert OID = 1423 (  box_sub			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_sub - _null_ ));
+DATA(insert OID = 1423 (  box_sub			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_sub - _null_ _null_ ));
 DESCR("subtract point from box (translate)");
-DATA(insert OID = 1424 (  box_mul			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_mul - _null_ ));
+DATA(insert OID = 1424 (  box_mul			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_mul - _null_ _null_ ));
 DESCR("multiply box by point (scale)");
-DATA(insert OID = 1425 (  box_div			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_div - _null_ ));
+DATA(insert OID = 1425 (  box_div			PGNSP PGUID 12 1 0 f f t f i 2 603 "603 600" _null_ _null_ _null_ box_div - _null_ _null_ ));
 DESCR("divide box by point (scale)");
-DATA(insert OID = 1426 (  path_contain_pt	PGNSP PGUID 14 1 0 0 f f t f i 2 0 16 f "602 600" _null_ _null_ _null_ _null_ "select pg_catalog.on_ppath($2, $1)" - _null_ c ));
+DATA(insert OID = 1426 (  path_contain_pt	PGNSP PGUID 14 1 0 0 f f t f i 2 0 16 f "602 600" _null_ _null_ _null_ _null_ "select pg_catalog.on_ppath($2, $1)" - _null_ _null_ c ));
 DESCR("path contains point?");
-DATA(insert OID = 1428 (  poly_contain_pt	PGNSP PGUID 12 1 0 f f t f i 2	16 "604 600" _null_ _null_ _null_  poly_contain_pt - _null_ ));
+DATA(insert OID = 1428 (  poly_contain_pt	PGNSP PGUID 12 1 0 f f t f i 2	16 "604 600" _null_ _null_ _null_  poly_contain_pt - _null_ _null_ ));
 DESCR("polygon contains point?");
-DATA(insert OID = 1429 (  pt_contained_poly PGNSP PGUID 12 1 0 f f t f i 2	16 "600 604" _null_ _null_ _null_  pt_contained_poly - _null_ ));
+DATA(insert OID = 1429 (  pt_contained_poly PGNSP PGUID 12 1 0 f f t f i 2	16 "600 604" _null_ _null_ _null_  pt_contained_poly - _null_ _null_ ));
 DESCR("point contained in polygon?");
 
-DATA(insert OID = 1430 (  isclosed			PGNSP PGUID 12 1 0 f f t f i 1	16 "602" _null_ _null_ _null_  path_isclosed - _null_ ));
+DATA(insert OID = 1430 (  isclosed			PGNSP PGUID 12 1 0 f f t f i 1	16 "602" _null_ _null_ _null_  path_isclosed - _null_ _null_ ));
 DESCR("path closed?");
-DATA(insert OID = 1431 (  isopen			PGNSP PGUID 12 1 0 f f t f i 1	16 "602" _null_ _null_ _null_  path_isopen - _null_ ));
+DATA(insert OID = 1431 (  isopen			PGNSP PGUID 12 1 0 f f t f i 1	16 "602" _null_ _null_ _null_  path_isopen - _null_ _null_ ));
 DESCR("path open?");
-DATA(insert OID = 1432 (  path_npoints		PGNSP PGUID 12 1 0 f f t f i 1	23 "602" _null_ _null_ _null_  path_npoints - _null_ ));
+DATA(insert OID = 1432 (  path_npoints		PGNSP PGUID 12 1 0 f f t f i 1	23 "602" _null_ _null_ _null_  path_npoints - _null_ _null_ ));
 DESCR("number of points in path");
 
 /* pclose and popen might better be named close and open, but that crashes initdb.
  * - thomas 97/04/20
  */
 
-DATA(insert OID = 1433 (  pclose			PGNSP PGUID 12 1 0 f f t f i 1 602 "602" _null_ _null_ _null_ path_close - _null_ ));
+DATA(insert OID = 1433 (  pclose			PGNSP PGUID 12 1 0 f f t f i 1 602 "602" _null_ _null_ _null_ path_close - _null_ _null_ ));
 DESCR("close path");
-DATA(insert OID = 1434 (  popen				PGNSP PGUID 12 1 0 f f t f i 1 602 "602" _null_ _null_ _null_ path_open - _null_ ));
+DATA(insert OID = 1434 (  popen				PGNSP PGUID 12 1 0 f f t f i 1 602 "602" _null_ _null_ _null_ path_open - _null_ _null_ ));
 DESCR("open path");
-DATA(insert OID = 1435 (  path_add			PGNSP PGUID 12 1 0 f f t f i 2 602 "602 602" _null_ _null_ _null_ path_add - _null_ ));
+DATA(insert OID = 1435 (  path_add			PGNSP PGUID 12 1 0 f f t f i 2 602 "602 602" _null_ _null_ _null_ path_add - _null_ _null_ ));
 DESCR("concatenate open paths");
-DATA(insert OID = 1436 (  path_add_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_add_pt - _null_ ));
+DATA(insert OID = 1436 (  path_add_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_add_pt - _null_ _null_ ));
 DESCR("add (translate path)");
-DATA(insert OID = 1437 (  path_sub_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_sub_pt - _null_ ));
+DATA(insert OID = 1437 (  path_sub_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_sub_pt - _null_ _null_ ));
 DESCR("subtract (translate path)");
-DATA(insert OID = 1438 (  path_mul_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_mul_pt - _null_ ));
+DATA(insert OID = 1438 (  path_mul_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_mul_pt - _null_ _null_ ));
 DESCR("multiply (rotate/scale path)");
-DATA(insert OID = 1439 (  path_div_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_div_pt - _null_ ));
+DATA(insert OID = 1439 (  path_div_pt		PGNSP PGUID 12 1 0 f f t f i 2 602 "602 600" _null_ _null_ _null_ path_div_pt - _null_ _null_ ));
 DESCR("divide (rotate/scale path)");
 
-DATA(insert OID = 1440 (  point				PGNSP PGUID 12 1 0 f f t f i 2 600 "701 701" _null_ _null_ _null_ construct_point - _null_ ));
+DATA(insert OID = 1440 (  point				PGNSP PGUID 12 1 0 f f t f i 2 600 "701 701" _null_ _null_ _null_ construct_point - _null_ _null_ ));
 DESCR("convert x, y to point");
-DATA(insert OID = 1441 (  point_add			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_add - _null_ ));
+DATA(insert OID = 1441 (  point_add			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_add - _null_ _null_ ));
 DESCR("add points (translate)");
-DATA(insert OID = 1442 (  point_sub			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_sub - _null_ ));
+DATA(insert OID = 1442 (  point_sub			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_sub - _null_ _null_ ));
 DESCR("subtract points (translate)");
-DATA(insert OID = 1443 (  point_mul			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_mul - _null_ ));
+DATA(insert OID = 1443 (  point_mul			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_mul - _null_ _null_ ));
 DESCR("multiply points (scale/rotate)");
-DATA(insert OID = 1444 (  point_div			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_div - _null_ ));
+DATA(insert OID = 1444 (  point_div			PGNSP PGUID 12 1 0 f f t f i 2 600 "600 600" _null_ _null_ _null_ point_div - _null_ _null_ ));
 DESCR("divide points (scale/rotate)");
 
-DATA(insert OID = 1445 (  poly_npoints		PGNSP PGUID 12 1 0 f f t f i 1	23 "604" _null_ _null_ _null_  poly_npoints - _null_ ));
+DATA(insert OID = 1445 (  poly_npoints		PGNSP PGUID 12 1 0 f f t f i 1	23 "604" _null_ _null_ _null_  poly_npoints - _null_ _null_ ));
 DESCR("number of points in polygon");
-DATA(insert OID = 1446 (  box				PGNSP PGUID 12 1 0 f f t f i 1 603 "604" _null_ _null_ _null_ poly_box - _null_ ));
+DATA(insert OID = 1446 (  box				PGNSP PGUID 12 1 0 f f t f i 1 603 "604" _null_ _null_ _null_ poly_box - _null_ _null_ ));
 DESCR("convert polygon to bounding box");
-DATA(insert OID = 1447 (  path				PGNSP PGUID 12 1 0 f f t f i 1 602 "604" _null_ _null_ _null_ poly_path - _null_ ));
+DATA(insert OID = 1447 (  path				PGNSP PGUID 12 1 0 f f t f i 1 602 "604" _null_ _null_ _null_ poly_path - _null_ _null_ ));
 DESCR("convert polygon to path");
-DATA(insert OID = 1448 (  polygon			PGNSP PGUID 12 1 0 f f t f i 1 604 "603" _null_ _null_ _null_ box_poly - _null_ ));
+DATA(insert OID = 1448 (  polygon			PGNSP PGUID 12 1 0 f f t f i 1 604 "603" _null_ _null_ _null_ box_poly - _null_ _null_ ));
 DESCR("convert box to polygon");
-DATA(insert OID = 1449 (  polygon			PGNSP PGUID 12 1 0 f f t f i 1 604 "602" _null_ _null_ _null_ path_poly - _null_ ));
+DATA(insert OID = 1449 (  polygon			PGNSP PGUID 12 1 0 f f t f i 1 604 "602" _null_ _null_ _null_ path_poly - _null_ _null_ ));
 DESCR("convert path to polygon");
 
-DATA(insert OID = 1450 (  circle_in			PGNSP PGUID 12 1 0 f f t f i 1 718 "2275" _null_ _null_ _null_	circle_in - _null_ ));
+DATA(insert OID = 1450 (  circle_in			PGNSP PGUID 12 1 0 f f t f i 1 718 "2275" _null_ _null_ _null_	circle_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1451 (  circle_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "718" _null_ _null_ _null_	circle_out - _null_ ));
+DATA(insert OID = 1451 (  circle_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "718" _null_ _null_ _null_	circle_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1452 (  circle_same		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_same - _null_ ));
+DATA(insert OID = 1452 (  circle_same		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_same - _null_ _null_ ));
 DESCR("same as?");
-DATA(insert OID = 1453 (  circle_contain	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_contain - _null_ ));
+DATA(insert OID = 1453 (  circle_contain	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_contain - _null_ _null_ ));
 DESCR("contains?");
-DATA(insert OID = 1454 (  circle_left		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_left - _null_ ));
+DATA(insert OID = 1454 (  circle_left		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_left - _null_ _null_ ));
 DESCR("is left of");
-DATA(insert OID = 1455 (  circle_overleft	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overleft - _null_ ));
+DATA(insert OID = 1455 (  circle_overleft	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overleft - _null_ _null_ ));
 DESCR("overlaps or is left of");
-DATA(insert OID = 1456 (  circle_overright	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overright - _null_ ));
+DATA(insert OID = 1456 (  circle_overright	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overright - _null_ _null_ ));
 DESCR("overlaps or is right of");
-DATA(insert OID = 1457 (  circle_right		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_right - _null_ ));
+DATA(insert OID = 1457 (  circle_right		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_right - _null_ _null_ ));
 DESCR("is right of");
-DATA(insert OID = 1458 (  circle_contained	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_contained - _null_ ));
+DATA(insert OID = 1458 (  circle_contained	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_contained - _null_ _null_ ));
 DESCR("is contained by?");
-DATA(insert OID = 1459 (  circle_overlap	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overlap - _null_ ));
+DATA(insert OID = 1459 (  circle_overlap	PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overlap - _null_ _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 1460 (  circle_below		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_below - _null_ ));
+DATA(insert OID = 1460 (  circle_below		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_below - _null_ _null_ ));
 DESCR("is below");
-DATA(insert OID = 1461 (  circle_above		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_above - _null_ ));
+DATA(insert OID = 1461 (  circle_above		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_above - _null_ _null_ ));
 DESCR("is above");
-DATA(insert OID = 1462 (  circle_eq			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_eq - _null_ ));
+DATA(insert OID = 1462 (  circle_eq			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_eq - _null_ _null_ ));
 DESCR("equal by area");
-DATA(insert OID = 1463 (  circle_ne			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_ne - _null_ ));
+DATA(insert OID = 1463 (  circle_ne			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_ne - _null_ _null_ ));
 DESCR("not equal by area");
-DATA(insert OID = 1464 (  circle_lt			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_lt - _null_ ));
+DATA(insert OID = 1464 (  circle_lt			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_lt - _null_ _null_ ));
 DESCR("less-than by area");
-DATA(insert OID = 1465 (  circle_gt			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_gt - _null_ ));
+DATA(insert OID = 1465 (  circle_gt			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_gt - _null_ _null_ ));
 DESCR("greater-than by area");
-DATA(insert OID = 1466 (  circle_le			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_le - _null_ ));
+DATA(insert OID = 1466 (  circle_le			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_le - _null_ _null_ ));
 DESCR("less-than-or-equal by area");
-DATA(insert OID = 1467 (  circle_ge			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_ge - _null_ ));
+DATA(insert OID = 1467 (  circle_ge			PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal by area");
-DATA(insert OID = 1468 (  area				PGNSP PGUID 12 1 0 f f t f i 1 701 "718" _null_ _null_ _null_ circle_area - _null_ ));
+DATA(insert OID = 1468 (  area				PGNSP PGUID 12 1 0 f f t f i 1 701 "718" _null_ _null_ _null_ circle_area - _null_ _null_ ));
 DESCR("area of circle");
-DATA(insert OID = 1469 (  diameter			PGNSP PGUID 12 1 0 f f t f i 1 701 "718" _null_ _null_ _null_ circle_diameter - _null_ ));
+DATA(insert OID = 1469 (  diameter			PGNSP PGUID 12 1 0 f f t f i 1 701 "718" _null_ _null_ _null_ circle_diameter - _null_ _null_ ));
 DESCR("diameter of circle");
-DATA(insert OID = 1470 (  radius			PGNSP PGUID 12 1 0 f f t f i 1 701 "718" _null_ _null_ _null_ circle_radius - _null_ ));
+DATA(insert OID = 1470 (  radius			PGNSP PGUID 12 1 0 f f t f i 1 701 "718" _null_ _null_ _null_ circle_radius - _null_ _null_ ));
 DESCR("radius of circle");
-DATA(insert OID = 1471 (  circle_distance	PGNSP PGUID 12 1 0 f f t f i 2 701 "718 718" _null_ _null_ _null_ circle_distance - _null_ ));
+DATA(insert OID = 1471 (  circle_distance	PGNSP PGUID 12 1 0 f f t f i 2 701 "718 718" _null_ _null_ _null_ circle_distance - _null_ _null_ ));
 DESCR("distance between");
-DATA(insert OID = 1472 (  circle_center		PGNSP PGUID 12 1 0 f f t f i 1 600 "718" _null_ _null_ _null_ circle_center - _null_ ));
+DATA(insert OID = 1472 (  circle_center		PGNSP PGUID 12 1 0 f f t f i 1 600 "718" _null_ _null_ _null_ circle_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 1473 (  circle			PGNSP PGUID 12 1 0 f f t f i 2 718 "600 701" _null_ _null_ _null_ cr_circle - _null_ ));
+DATA(insert OID = 1473 (  circle			PGNSP PGUID 12 1 0 f f t f i 2 718 "600 701" _null_ _null_ _null_ cr_circle - _null_ _null_ ));
 DESCR("convert point and radius to circle");
-DATA(insert OID = 1474 (  circle			PGNSP PGUID 12 1 0 f f t f i 1 718 "604" _null_ _null_ _null_ poly_circle - _null_ ));
+DATA(insert OID = 1474 (  circle			PGNSP PGUID 12 1 0 f f t f i 1 718 "604" _null_ _null_ _null_ poly_circle - _null_ _null_ ));
 DESCR("convert polygon to circle");
-DATA(insert OID = 1475 (  polygon			PGNSP PGUID 12 1 0 f f t f i 2 604 "23 718" _null_ _null_ _null_	circle_poly - _null_ ));
+DATA(insert OID = 1475 (  polygon			PGNSP PGUID 12 1 0 f f t f i 2 604 "23 718" _null_ _null_ _null_	circle_poly - _null_ _null_ ));
 DESCR("convert vertex count and circle to polygon");
-DATA(insert OID = 1476 (  dist_pc			PGNSP PGUID 12 1 0 f f t f i 2 701 "600 718" _null_ _null_ _null_ dist_pc - _null_ ));
+DATA(insert OID = 1476 (  dist_pc			PGNSP PGUID 12 1 0 f f t f i 2 701 "600 718" _null_ _null_ _null_ dist_pc - _null_ _null_ ));
 DESCR("distance between point and circle");
-DATA(insert OID = 1477 (  circle_contain_pt PGNSP PGUID 12 1 0 f f t f i 2	16 "718 600" _null_ _null_ _null_  circle_contain_pt - _null_ ));
+DATA(insert OID = 1477 (  circle_contain_pt PGNSP PGUID 12 1 0 f f t f i 2	16 "718 600" _null_ _null_ _null_  circle_contain_pt - _null_ _null_ ));
 DESCR("circle contains point?");
-DATA(insert OID = 1478 (  pt_contained_circle	PGNSP PGUID 12 1 0 f f t f i 2	16 "600 718" _null_ _null_ _null_  pt_contained_circle - _null_ ));
+DATA(insert OID = 1478 (  pt_contained_circle	PGNSP PGUID 12 1 0 f f t f i 2	16 "600 718" _null_ _null_ _null_  pt_contained_circle - _null_ _null_ ));
 DESCR("point contained in circle?");
-DATA(insert OID = 1479 (  circle			PGNSP PGUID 12 1 0 f f t f i 1 718 "603" _null_ _null_ _null_ box_circle - _null_ ));
+DATA(insert OID = 1479 (  circle			PGNSP PGUID 12 1 0 f f t f i 1 718 "603" _null_ _null_ _null_ box_circle - _null_ _null_ ));
 DESCR("convert box to circle");
-DATA(insert OID = 1480 (  box				PGNSP PGUID 12 1 0 f f t f i 1 603 "718" _null_ _null_ _null_ circle_box - _null_ ));
+DATA(insert OID = 1480 (  box				PGNSP PGUID 12 1 0 f f t f i 1 603 "718" _null_ _null_ _null_ circle_box - _null_ _null_ ));
 DESCR("convert circle to box");
-DATA(insert OID = 1481 (  tinterval			 PGNSP PGUID 12 1 0 f f t f i 2 704 "702 702" _null_ _null_ _null_ mktinterval - _null_ ));
+DATA(insert OID = 1481 (  tinterval			 PGNSP PGUID 12 1 0 f f t f i 2 704 "702 702" _null_ _null_ _null_ mktinterval - _null_ _null_ ));
 DESCR("convert to tinterval");
 
-DATA(insert OID = 1482 (  lseg_ne			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_ne - _null_ ));
+DATA(insert OID = 1482 (  lseg_ne			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1483 (  lseg_lt			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_lt - _null_ ));
+DATA(insert OID = 1483 (  lseg_lt			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_lt - _null_ _null_ ));
 DESCR("less-than by length");
-DATA(insert OID = 1484 (  lseg_le			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_le - _null_ ));
+DATA(insert OID = 1484 (  lseg_le			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_le - _null_ _null_ ));
 DESCR("less-than-or-equal by length");
-DATA(insert OID = 1485 (  lseg_gt			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_gt - _null_ ));
+DATA(insert OID = 1485 (  lseg_gt			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_gt - _null_ _null_ ));
 DESCR("greater-than by length");
-DATA(insert OID = 1486 (  lseg_ge			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_ge - _null_ ));
+DATA(insert OID = 1486 (  lseg_ge			PGNSP PGUID 12 1 0 f f t f i 2	16 "601 601" _null_ _null_ _null_  lseg_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal by length");
-DATA(insert OID = 1487 (  lseg_length		PGNSP PGUID 12 1 0 f f t f i 1 701 "601" _null_ _null_ _null_ lseg_length - _null_ ));
+DATA(insert OID = 1487 (  lseg_length		PGNSP PGUID 12 1 0 f f t f i 1 701 "601" _null_ _null_ _null_ lseg_length - _null_ _null_ ));
 DESCR("distance between endpoints");
-DATA(insert OID = 1488 (  close_ls			PGNSP PGUID 12 1 0 f f t f i 2 600 "628 601" _null_ _null_ _null_ close_ls - _null_ ));
+DATA(insert OID = 1488 (  close_ls			PGNSP PGUID 12 1 0 f f t f i 2 600 "628 601" _null_ _null_ _null_ close_ls - _null_ _null_ ));
 DESCR("closest point to line on line segment");
-DATA(insert OID = 1489 (  close_lseg		PGNSP PGUID 12 1 0 f f t f i 2 600 "601 601" _null_ _null_ _null_ close_lseg - _null_ ));
+DATA(insert OID = 1489 (  close_lseg		PGNSP PGUID 12 1 0 f f t f i 2 600 "601 601" _null_ _null_ _null_ close_lseg - _null_ _null_ ));
 DESCR("closest point to line segment on line segment");
 
-DATA(insert OID = 1490 (  line_in			PGNSP PGUID 12 1 0 f f t f i 1 628 "2275" _null_ _null_ _null_	line_in - _null_ ));
+DATA(insert OID = 1490 (  line_in			PGNSP PGUID 12 1 0 f f t f i 1 628 "2275" _null_ _null_ _null_	line_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1491 (  line_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "628" _null_ _null_ _null_	line_out - _null_ ));
+DATA(insert OID = 1491 (  line_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "628" _null_ _null_ _null_	line_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1492 (  line_eq			PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_ line_eq - _null_ ));
+DATA(insert OID = 1492 (  line_eq			PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_ line_eq - _null_ _null_ ));
 DESCR("lines equal?");
-DATA(insert OID = 1493 (  line				PGNSP PGUID 12 1 0 f f t f i 2 628 "600 600" _null_ _null_ _null_ line_construct_pp - _null_ ));
+DATA(insert OID = 1493 (  line				PGNSP PGUID 12 1 0 f f t f i 2 628 "600 600" _null_ _null_ _null_ line_construct_pp - _null_ _null_ ));
 DESCR("line from points");
-DATA(insert OID = 1494 (  line_interpt		PGNSP PGUID 12 1 0 f f t f i 2 600 "628 628" _null_ _null_ _null_ line_interpt - _null_ ));
+DATA(insert OID = 1494 (  line_interpt		PGNSP PGUID 12 1 0 f f t f i 2 600 "628 628" _null_ _null_ _null_ line_interpt - _null_ _null_ ));
 DESCR("intersection point");
-DATA(insert OID = 1495 (  line_intersect	PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_intersect - _null_ ));
+DATA(insert OID = 1495 (  line_intersect	PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_intersect - _null_ _null_ ));
 DESCR("intersect?");
-DATA(insert OID = 1496 (  line_parallel		PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_parallel - _null_ ));
+DATA(insert OID = 1496 (  line_parallel		PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_parallel - _null_ _null_ ));
 DESCR("parallel?");
-DATA(insert OID = 1497 (  line_perp			PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_perp - _null_ ));
+DATA(insert OID = 1497 (  line_perp			PGNSP PGUID 12 1 0 f f t f i 2	16 "628 628" _null_ _null_ _null_  line_perp - _null_ _null_ ));
 DESCR("perpendicular?");
-DATA(insert OID = 1498 (  line_vertical		PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_vertical - _null_ ));
+DATA(insert OID = 1498 (  line_vertical		PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_vertical - _null_ _null_ ));
 DESCR("vertical?");
-DATA(insert OID = 1499 (  line_horizontal	PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_horizontal - _null_ ));
+DATA(insert OID = 1499 (  line_horizontal	PGNSP PGUID 12 1 0 f f t f i 1	16 "628" _null_ _null_ _null_  line_horizontal - _null_ _null_ ));
 DESCR("horizontal?");
 
 /* OIDS 1500 - 1599 */
 
-DATA(insert OID = 1530 (  length			PGNSP PGUID 12 1 0 f f t f i 1 701 "601" _null_ _null_ _null_ lseg_length - _null_ ));
+DATA(insert OID = 1530 (  length			PGNSP PGUID 12 1 0 f f t f i 1 701 "601" _null_ _null_ _null_ lseg_length - _null_ _null_ ));
 DESCR("distance between endpoints");
-DATA(insert OID = 1531 (  length			PGNSP PGUID 12 1 0 f f t f i 1 701 "602" _null_ _null_ _null_ path_length - _null_ ));
+DATA(insert OID = 1531 (  length			PGNSP PGUID 12 1 0 f f t f i 1 701 "602" _null_ _null_ _null_ path_length - _null_ _null_ ));
 DESCR("sum of path segments");
 
 
-DATA(insert OID = 1532 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "601" _null_ _null_ _null_ lseg_center - _null_ ));
+DATA(insert OID = 1532 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "601" _null_ _null_ _null_ lseg_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 1533 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "602" _null_ _null_ _null_ path_center - _null_ ));
+DATA(insert OID = 1533 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "602" _null_ _null_ _null_ path_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 1534 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "603" _null_ _null_ _null_ box_center - _null_ ));
+DATA(insert OID = 1534 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "603" _null_ _null_ _null_ box_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 1540 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "604" _null_ _null_ _null_ poly_center - _null_ ));
+DATA(insert OID = 1540 (  point				PGNSP PGUID 12 1 0 f f t f i 1 600 "604" _null_ _null_ _null_ poly_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 1541 (  lseg				PGNSP PGUID 12 1 0 f f t f i 1 601 "603" _null_ _null_ _null_ box_diagonal - _null_ ));
+DATA(insert OID = 1541 (  lseg				PGNSP PGUID 12 1 0 f f t f i 1 601 "603" _null_ _null_ _null_ box_diagonal - _null_ _null_ ));
 DESCR("diagonal of");
-DATA(insert OID = 1542 (  center			PGNSP PGUID 12 1 0 f f t f i 1 600 "603" _null_ _null_ _null_ box_center - _null_ ));
+DATA(insert OID = 1542 (  center			PGNSP PGUID 12 1 0 f f t f i 1 600 "603" _null_ _null_ _null_ box_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 1543 (  center			PGNSP PGUID 12 1 0 f f t f i 1 600 "718" _null_ _null_ _null_ circle_center - _null_ ));
+DATA(insert OID = 1543 (  center			PGNSP PGUID 12 1 0 f f t f i 1 600 "718" _null_ _null_ _null_ circle_center - _null_ _null_ ));
 DESCR("center of");
-DATA(insert OID = 1544 (  polygon			PGNSP PGUID 14 1 0 0 f f t f i 1 0 604 f "718" _null_ _null_ _null_ _null_ "select pg_catalog.polygon(12, $1)" - _null_ c ));
+DATA(insert OID = 1544 (  polygon			PGNSP PGUID 14 1 0 0 f f t f i 1 0 604 f "718" _null_ _null_ _null_ _null_ "select pg_catalog.polygon(12, $1)" - _null_ _null_ c ));
 DESCR("convert circle to 12-vertex polygon");
-DATA(insert OID = 1545 (  npoints			PGNSP PGUID 12 1 0 f f t f i 1	23 "602" _null_ _null_ _null_  path_npoints - _null_ ));
+DATA(insert OID = 1545 (  npoints			PGNSP PGUID 12 1 0 f f t f i 1	23 "602" _null_ _null_ _null_  path_npoints - _null_ _null_ ));
 DESCR("number of points in path");
-DATA(insert OID = 1556 (  npoints			PGNSP PGUID 12 1 0 f f t f i 1	23 "604" _null_ _null_ _null_  poly_npoints - _null_ ));
+DATA(insert OID = 1556 (  npoints			PGNSP PGUID 12 1 0 f f t f i 1	23 "604" _null_ _null_ _null_  poly_npoints - _null_ _null_ ));
 DESCR("number of points in polygon");
 
-DATA(insert OID = 1564 (  bit_in			PGNSP PGUID 12 1 0 f f t f i 3 1560 "2275 26 23" _null_ _null_ _null_ bit_in - _null_ ));
+DATA(insert OID = 1564 (  bit_in			PGNSP PGUID 12 1 0 f f t f i 3 1560 "2275 26 23" _null_ _null_ _null_ bit_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1565 (  bit_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "1560" _null_ _null_ _null_ bit_out - _null_ ));
+DATA(insert OID = 1565 (  bit_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "1560" _null_ _null_ _null_ bit_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2919 (  bittypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	bittypmodin - _null_ ));
+DATA(insert OID = 2919 (  bittypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	bittypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2920 (  bittypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	bittypmodout - _null_ ));
+DATA(insert OID = 2920 (  bittypmodout		PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	bittypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
 
-DATA(insert OID = 1569 (  like				PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_	textlike - _null_ ));
+DATA(insert OID = 1569 (  like				PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_	textlike - _null_ _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 1570 (  notlike			PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_	textnlike - _null_ ));
+DATA(insert OID = 1570 (  notlike			PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_	textnlike - _null_ _null_ ));
 DESCR("does not match LIKE expression");
-DATA(insert OID = 1571 (  like				PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	namelike - _null_ ));
+DATA(insert OID = 1571 (  like				PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	namelike - _null_ _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 1572 (  notlike			PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	namenlike - _null_ ));
+DATA(insert OID = 1572 (  notlike			PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	namenlike - _null_ _null_ ));
 DESCR("does not match LIKE expression");
 
 
 /* SEQUENCE functions */
-DATA(insert OID = 1574 (  nextval			PGNSP PGUID 12 1 0 f f t f v 1 20 "2205" _null_ _null_ _null_	nextval_oid - _null_ ));
+DATA(insert OID = 1574 (  nextval			PGNSP PGUID 12 1 0 f f t f v 1 20 "2205" _null_ _null_ _null_	nextval_oid - _null_ _null_ ));
 DESCR("sequence next value");
 #define NEXTVAL_FUNC_OID 1574
-DATA(insert OID = 1575 (  currval			PGNSP PGUID 12 1 0 f f t f v 1 20 "2205" _null_ _null_ _null_	currval_oid - _null_ ));
+DATA(insert OID = 1575 (  currval			PGNSP PGUID 12 1 0 f f t f v 1 20 "2205" _null_ _null_ _null_	currval_oid - _null_ _null_ ));
 DESCR("sequence current value");
 #define CURRVAL_FUNC_OID 1575
-DATA(insert OID = 1576 (  setval			PGNSP PGUID 12 1 0 f f t f v 2 20 "2205 20" _null_ _null_ _null_  setval_oid - _null_ ));
+DATA(insert OID = 1576 (  setval			PGNSP PGUID 12 1 0 f f t f v 2 20 "2205 20" _null_ _null_ _null_  setval_oid - _null_ _null_ ));
 DESCR("set sequence value");
 #define SETVAL_FUNC_OID 1576
-DATA(insert OID = 1765 (  setval			PGNSP PGUID 12 1 0 f f t f v 3 20 "2205 20 16" _null_ _null_ _null_ setval3_oid - _null_ ));
+DATA(insert OID = 1765 (  setval			PGNSP PGUID 12 1 0 f f t f v 3 20 "2205 20 16" _null_ _null_ _null_ setval3_oid - _null_ _null_ ));
 DESCR("set sequence value and iscalled status");
 
-DATA(insert OID = 1579 (  varbit_in			PGNSP PGUID 12 1 0 f f t f i 3 1562 "2275 26 23" _null_ _null_ _null_ varbit_in - _null_ ));
+DATA(insert OID = 1579 (  varbit_in			PGNSP PGUID 12 1 0 f f t f i 3 1562 "2275 26 23" _null_ _null_ _null_ varbit_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1580 (  varbit_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "1562" _null_ _null_ _null_ varbit_out - _null_ ));
+DATA(insert OID = 1580 (  varbit_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "1562" _null_ _null_ _null_ varbit_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2902 (  varbittypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	varbittypmodin - _null_ ));
+DATA(insert OID = 2902 (  varbittypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	varbittypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2921 (  varbittypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	varbittypmodout - _null_ ));
+DATA(insert OID = 2921 (  varbittypmodout	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	varbittypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
 
-DATA(insert OID = 1581 (  biteq				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	biteq - _null_ ));
+DATA(insert OID = 1581 (  biteq				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	biteq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1582 (  bitne				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitne - _null_ ));
+DATA(insert OID = 1582 (  bitne				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1592 (  bitge				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitge - _null_ ));
+DATA(insert OID = 1592 (  bitge				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitge - _null_ _null_ ));
 DESCR("greater than or equal");
-DATA(insert OID = 1593 (  bitgt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitgt - _null_ ));
+DATA(insert OID = 1593 (  bitgt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitgt - _null_ _null_ ));
 DESCR("greater than");
-DATA(insert OID = 1594 (  bitle				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitle - _null_ ));
+DATA(insert OID = 1594 (  bitle				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitle - _null_ _null_ ));
 DESCR("less than or equal");
-DATA(insert OID = 1595 (  bitlt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitlt - _null_ ));
+DATA(insert OID = 1595 (  bitlt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1560 1560" _null_ _null_ _null_	bitlt - _null_ _null_ ));
 DESCR("less than");
-DATA(insert OID = 1596 (  bitcmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "1560 1560" _null_ _null_ _null_	bitcmp - _null_ ));
+DATA(insert OID = 1596 (  bitcmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "1560 1560" _null_ _null_ _null_	bitcmp - _null_ _null_ ));
 DESCR("compare");
 
-DATA(insert OID = 1598 (  random			PGNSP PGUID 12 1 0 f f t f v 0 701 "" _null_ _null_ _null_	drandom - _null_ ));
+DATA(insert OID = 1598 (  random			PGNSP PGUID 12 1 0 f f t f v 0 701 "" _null_ _null_ _null_	drandom - _null_ _null_ ));
 DESCR("random value");
-DATA(insert OID = 1599 (  setseed			PGNSP PGUID 12 1 0 f f t f v 1 2278 "701" _null_ _null_ _null_ setseed - _null_ ));
+DATA(insert OID = 1599 (  setseed			PGNSP PGUID 12 1 0 f f t f v 1 2278 "701" _null_ _null_ _null_ setseed - _null_ _null_ ));
 DESCR("set random seed");
 
 /* OIDS 1600 - 1699 */
 
-DATA(insert OID = 1600 (  asin				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dasin - _null_ ));
+DATA(insert OID = 1600 (  asin				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dasin - _null_ _null_ ));
 DESCR("arcsine");
-DATA(insert OID = 1601 (  acos				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dacos - _null_ ));
+DATA(insert OID = 1601 (  acos				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dacos - _null_ _null_ ));
 DESCR("arccosine");
-DATA(insert OID = 1602 (  atan				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ datan - _null_ ));
+DATA(insert OID = 1602 (  atan				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ datan - _null_ _null_ ));
 DESCR("arctangent");
-DATA(insert OID = 1603 (  atan2				PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_ datan2 - _null_ ));
+DATA(insert OID = 1603 (  atan2				PGNSP PGUID 12 1 0 f f t f i 2 701 "701 701" _null_ _null_ _null_ datan2 - _null_ _null_ ));
 DESCR("arctangent, two arguments");
-DATA(insert OID = 1604 (  sin				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dsin - _null_ ));
+DATA(insert OID = 1604 (  sin				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dsin - _null_ _null_ ));
 DESCR("sine");
-DATA(insert OID = 1605 (  cos				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dcos - _null_ ));
+DATA(insert OID = 1605 (  cos				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dcos - _null_ _null_ ));
 DESCR("cosine");
-DATA(insert OID = 1606 (  tan				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dtan - _null_ ));
+DATA(insert OID = 1606 (  tan				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dtan - _null_ _null_ ));
 DESCR("tangent");
-DATA(insert OID = 1607 (  cot				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dcot - _null_ ));
+DATA(insert OID = 1607 (  cot				PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ dcot - _null_ _null_ ));
 DESCR("cotangent");
-DATA(insert OID = 1608 (  degrees			PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ degrees - _null_ ));
+DATA(insert OID = 1608 (  degrees			PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ degrees - _null_ _null_ ));
 DESCR("radians to degrees");
-DATA(insert OID = 1609 (  radians			PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ radians - _null_ ));
+DATA(insert OID = 1609 (  radians			PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_ radians - _null_ _null_ ));
 DESCR("degrees to radians");
-DATA(insert OID = 1610 (  pi				PGNSP PGUID 12 1 0 f f t f i 0 701 "" _null_ _null_ _null_	dpi - _null_ ));
+DATA(insert OID = 1610 (  pi				PGNSP PGUID 12 1 0 f f t f i 0 701 "" _null_ _null_ _null_	dpi - _null_ _null_ ));
 DESCR("PI");
 
-DATA(insert OID = 1618 (  interval_mul		PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 701" _null_ _null_ _null_ interval_mul - _null_ ));
+DATA(insert OID = 1618 (  interval_mul		PGNSP PGUID 12 1 0 f f t f i 2 1186 "1186 701" _null_ _null_ _null_ interval_mul - _null_ _null_ ));
 DESCR("multiply interval");
 
-DATA(insert OID = 1620 (  ascii				PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_ ascii - _null_ ));
+DATA(insert OID = 1620 (  ascii				PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_ ascii - _null_ _null_ ));
 DESCR("convert first char to int4");
-DATA(insert OID = 1621 (  chr				PGNSP PGUID 12 1 0 f f t f i 1 25 "23" _null_ _null_ _null_ chr - _null_ ));
+DATA(insert OID = 1621 (  chr				PGNSP PGUID 12 1 0 f f t f i 1 25 "23" _null_ _null_ _null_ chr - _null_ _null_ ));
 DESCR("convert int4 to char");
-DATA(insert OID = 1622 (  repeat			PGNSP PGUID 12 1 0 f f t f i 2 25 "25 23" _null_ _null_ _null_	repeat - _null_ ));
+DATA(insert OID = 1622 (  repeat			PGNSP PGUID 12 1 0 f f t f i 2 25 "25 23" _null_ _null_ _null_	repeat - _null_ _null_ ));
 DESCR("replicate string int4 times");
 
-DATA(insert OID = 1623 (  similar_escape	PGNSP PGUID 12 1 0 f f f f i 2 25 "25 25" _null_ _null_ _null_ similar_escape - _null_ ));
+DATA(insert OID = 1623 (  similar_escape	PGNSP PGUID 12 1 0 f f f f i 2 25 "25 25" _null_ _null_ _null_ similar_escape - _null_ _null_ ));
 DESCR("convert SQL99 regexp pattern to POSIX style");
 
-DATA(insert OID = 1624 (  mul_d_interval	PGNSP PGUID 12 1 0 f f t f i 2 1186 "701 1186" _null_ _null_ _null_ mul_d_interval - _null_ ));
+DATA(insert OID = 1624 (  mul_d_interval	PGNSP PGUID 12 1 0 f f t f i 2 1186 "701 1186" _null_ _null_ _null_ mul_d_interval - _null_ _null_ ));
 
-DATA(insert OID = 1631 (  bpcharlike	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textlike - _null_ ));
+DATA(insert OID = 1631 (  bpcharlike	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textlike - _null_ _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 1632 (  bpcharnlike	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textnlike - _null_ ));
+DATA(insert OID = 1632 (  bpcharnlike	   PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textnlike - _null_ _null_ ));
 DESCR("does not match LIKE expression");
 
-DATA(insert OID = 1633 (  texticlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticlike - _null_ ));
+DATA(insert OID = 1633 (  texticlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticlike - _null_ _null_ ));
 DESCR("matches LIKE expression, case-insensitive");
-DATA(insert OID = 1634 (  texticnlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticnlike - _null_ ));
+DATA(insert OID = 1634 (  texticnlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texticnlike - _null_ _null_ ));
 DESCR("does not match LIKE expression, case-insensitive");
-DATA(insert OID = 1635 (  nameiclike		PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	nameiclike - _null_ ));
+DATA(insert OID = 1635 (  nameiclike		PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	nameiclike - _null_ _null_ ));
 DESCR("matches LIKE expression, case-insensitive");
-DATA(insert OID = 1636 (  nameicnlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	nameicnlike - _null_ ));
+DATA(insert OID = 1636 (  nameicnlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "19 25" _null_ _null_ _null_	nameicnlike - _null_ _null_ ));
 DESCR("does not match LIKE expression, case-insensitive");
-DATA(insert OID = 1637 (  like_escape		PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ like_escape - _null_ ));
+DATA(insert OID = 1637 (  like_escape		PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ like_escape - _null_ _null_ ));
 DESCR("convert LIKE pattern to use backslash escapes");
 
-DATA(insert OID = 1656 (  bpcharicregexeq	 PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticregexeq - _null_ ));
+DATA(insert OID = 1656 (  bpcharicregexeq	 PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticregexeq - _null_ _null_ ));
 DESCR("matches regex., case-insensitive");
-DATA(insert OID = 1657 (  bpcharicregexne	 PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticregexne - _null_ ));
+DATA(insert OID = 1657 (  bpcharicregexne	 PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticregexne - _null_ _null_ ));
 DESCR("does not match regex., case-insensitive");
-DATA(insert OID = 1658 (  bpcharregexeq    PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textregexeq - _null_ ));
+DATA(insert OID = 1658 (  bpcharregexeq    PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textregexeq - _null_ _null_ ));
 DESCR("matches regex., case-sensitive");
-DATA(insert OID = 1659 (  bpcharregexne    PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textregexne - _null_ ));
+DATA(insert OID = 1659 (  bpcharregexne    PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ textregexne - _null_ _null_ ));
 DESCR("does not match regex., case-sensitive");
-DATA(insert OID = 1660 (  bpchariclike		PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticlike - _null_ ));
+DATA(insert OID = 1660 (  bpchariclike		PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticlike - _null_ _null_ ));
 DESCR("matches LIKE expression, case-insensitive");
-DATA(insert OID = 1661 (  bpcharicnlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticnlike - _null_ ));
+DATA(insert OID = 1661 (  bpcharicnlike		PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 25" _null_ _null_ _null_ texticnlike - _null_ _null_ ));
 DESCR("does not match LIKE expression, case-insensitive");
 
-DATA(insert OID = 1689 (  flatfile_update_trigger  PGNSP PGUID 12 1 0 f f t f v 0 2279	"" _null_ _null_ _null_ flatfile_update_trigger - _null_ ));
+DATA(insert OID = 1689 (  flatfile_update_trigger  PGNSP PGUID 12 1 0 f f t f v 0 2279	"" _null_ _null_ _null_ flatfile_update_trigger - _null_ _null_ ));
 DESCR("update flat-file copy of a shared catalog");
 
 /* Oracle Compatibility Related Functions - By Edmund Mergl <E.Mergl@bawue.de> */
-DATA(insert OID =  868 (  strpos	   PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ textpos - _null_ ));
+DATA(insert OID =  868 (  strpos	   PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ textpos - _null_ _null_ ));
 DESCR("find position of substring");
-DATA(insert OID =  870 (  lower		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	lower - _null_ ));
+DATA(insert OID =  870 (  lower		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	lower - _null_ _null_ ));
 DESCR("lowercase");
-DATA(insert OID =  871 (  upper		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	upper - _null_ ));
+DATA(insert OID =  871 (  upper		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	upper - _null_ _null_ ));
 DESCR("uppercase");
-DATA(insert OID =  872 (  initcap	   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	initcap - _null_ ));
+DATA(insert OID =  872 (  initcap	   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	initcap - _null_ _null_ ));
 DESCR("capitalize each word");
-DATA(insert OID =  873 (  lpad		   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 25" _null_ _null_ _null_	lpad - _null_ ));
+DATA(insert OID =  873 (  lpad		   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 25" _null_ _null_ _null_	lpad - _null_ _null_ ));
 DESCR("left-pad string to length");
-DATA(insert OID =  874 (  rpad		   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 25" _null_ _null_ _null_	rpad - _null_ ));
+DATA(insert OID =  874 (  rpad		   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 25" _null_ _null_ _null_	rpad - _null_ _null_ ));
 DESCR("right-pad string to length");
-DATA(insert OID =  875 (  ltrim		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ ltrim - _null_ ));
+DATA(insert OID =  875 (  ltrim		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ ltrim - _null_ _null_ ));
 DESCR("trim selected characters from left end of string");
-DATA(insert OID =  876 (  rtrim		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ rtrim - _null_ ));
+DATA(insert OID =  876 (  rtrim		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ rtrim - _null_ _null_ ));
 DESCR("trim selected characters from right end of string");
-DATA(insert OID =  877 (  substr	   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 23" _null_ _null_ _null_	text_substr - _null_ ));
+DATA(insert OID =  877 (  substr	   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 23" _null_ _null_ _null_	text_substr - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID =  878 (  translate    PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 25" _null_ _null_ _null_	translate - _null_ ));
+DATA(insert OID =  878 (  translate    PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 25" _null_ _null_ _null_	translate - _null_ _null_ ));
 DESCR("map a set of character appearing in string");
-DATA(insert OID =  879 (  lpad		   PGNSP PGUID 14 1 0 0 f f t f i 2 0 25 f "25 23" _null_ _null_ _null_ _null_ "select pg_catalog.lpad($1, $2, '' '')" - _null_ c ));
+DATA(insert OID =  879 (  lpad		   PGNSP PGUID 14 1 0 0 f f t f i 2 0 25 f "25 23" _null_ _null_ _null_ _null_ "select pg_catalog.lpad($1, $2, '' '')" - _null_ _null_ c ));
 DESCR("left-pad string to length");
-DATA(insert OID =  880 (  rpad		   PGNSP PGUID 14 1 0 0 f f t f i 2 0 25 f "25 23" _null_ _null_ _null_ _null_ "select pg_catalog.rpad($1, $2, '' '')" - _null_ c ));
+DATA(insert OID =  880 (  rpad		   PGNSP PGUID 14 1 0 0 f f t f i 2 0 25 f "25 23" _null_ _null_ _null_ _null_ "select pg_catalog.rpad($1, $2, '' '')" - _null_  _null_ c ));
 DESCR("right-pad string to length");
-DATA(insert OID =  881 (  ltrim		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	ltrim1 - _null_ ));
+DATA(insert OID =  881 (  ltrim		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	ltrim1 - _null_ _null_ ));
 DESCR("trim spaces from left end of string");
-DATA(insert OID =  882 (  rtrim		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	rtrim1 - _null_ ));
+DATA(insert OID =  882 (  rtrim		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	rtrim1 - _null_ _null_ ));
 DESCR("trim spaces from right end of string");
-DATA(insert OID =  883 (  substr	   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 23" _null_ _null_ _null_ text_substr_no_len - _null_ ));
+DATA(insert OID =  883 (  substr	   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 23" _null_ _null_ _null_ text_substr_no_len - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID =  884 (  btrim		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ btrim - _null_ ));
+DATA(insert OID =  884 (  btrim		   PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_ btrim - _null_ _null_ ));
 DESCR("trim selected characters from both ends of string");
-DATA(insert OID =  885 (  btrim		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	btrim1 - _null_ ));
+DATA(insert OID =  885 (  btrim		   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	btrim1 - _null_ _null_ ));
 DESCR("trim spaces from both ends of string");
 
-DATA(insert OID =  936 (  substring    PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 23" _null_ _null_ _null_	text_substr - _null_ ));
+DATA(insert OID =  936 (  substring    PGNSP PGUID 12 1 0 f f t f i 3 25 "25 23 23" _null_ _null_ _null_	text_substr - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID =  937 (  substring    PGNSP PGUID 12 1 0 f f t f i 2 25 "25 23" _null_ _null_ _null_ text_substr_no_len - _null_ ));
+DATA(insert OID =  937 (  substring    PGNSP PGUID 12 1 0 f f t f i 2 25 "25 23" _null_ _null_ _null_ text_substr_no_len - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID =  2087 ( replace	   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 25" _null_ _null_ _null_	replace_text - _null_ ));
+DATA(insert OID =  2087 ( replace	   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 25" _null_ _null_ _null_	replace_text - _null_ _null_ ));
 DESCR("replace all occurrences of old_substr with new_substr in string");
-DATA(insert OID =  2284 ( regexp_replace	   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 25" _null_ _null_ _null_	textregexreplace_noopt - _null_ ));
+DATA(insert OID =  2284 ( regexp_replace	   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 25" _null_ _null_ _null_	textregexreplace_noopt - _null_ _null_ ));
 DESCR("replace text using regexp");
-DATA(insert OID =  2285 ( regexp_replace	   PGNSP PGUID 12 1 0 f f t f i 4 25 "25 25 25 25" _null_ _null_ _null_ textregexreplace - _null_ ));
+DATA(insert OID =  2285 ( regexp_replace	   PGNSP PGUID 12 1 0 f f t f i 4 25 "25 25 25 25" _null_ _null_ _null_ textregexreplace - _null_ _null_ ));
 DESCR("replace text using regexp");
-DATA(insert OID =  2088 ( split_part   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 23" _null_ _null_ _null_	split_text - _null_ ));
+DATA(insert OID =  2763 ( regexp_matches   PGNSP PGUID 12 1 1 f f t t i 2 1009 "25 25" _null_ _null_ _null_ regexp_matches_no_flags - _null_ _null_ ));
+DESCR("return all match groups for regexp");
+DATA(insert OID =  2764 ( regexp_matches   PGNSP PGUID 12 1 10 f f t t i 3 1009 "25 25 25" _null_ _null_ _null_ regexp_matches - _null_ _null_ ));
+DESCR("return all match groups for regexp");
+DATA(insert OID =  2088 ( split_part   PGNSP PGUID 12 1 0 f f t f i 3 25 "25 25 23" _null_ _null_ _null_	split_text - _null_ _null_ ));
 DESCR("split string by field_sep and return field_num");
-DATA(insert OID =  2089 ( to_hex	   PGNSP PGUID 12 1 0 f f t f i 1 25 "23" _null_ _null_ _null_	to_hex32 - _null_ ));
+DATA(insert OID =  2765 ( regexp_split_to_table PGNSP PGUID 12 1 1000 f f t t i 2 25 "25 25" _null_ _null_ _null_	regexp_split_to_table_no_flags - _null_ _null_ ));
+DESCR("split string by pattern");
+DATA(insert OID =  2766 ( regexp_split_to_table PGNSP PGUID 12 1 1000 f f t t i 3 25 "25 25 25" _null_ _null_ _null_	regexp_split_to_table - _null_ _null_ ));
+DESCR("split string by pattern");
+DATA(insert OID =  2767 ( regexp_split_to_array PGNSP PGUID 12 1 0 f f t f i 2 1009 "25 25" _null_ _null_ _null_	regexp_split_to_array_no_flags - _null_ _null_ ));
+DESCR("split string by pattern");
+DATA(insert OID =  2768 ( regexp_split_to_array PGNSP PGUID 12 1 0 f f t f i 3 1009 "25 25 25" _null_ _null_ _null_ regexp_split_to_array - _null_ _null_ ));
+DESCR("split string by pattern");
+DATA(insert OID =  2089 ( to_hex	   PGNSP PGUID 12 1 0 f f t f i 1 25 "23" _null_ _null_ _null_	to_hex32 - _null_ _null_ ));
 DESCR("convert int4 number to hex");
-DATA(insert OID =  2090 ( to_hex	   PGNSP PGUID 12 1 0 f f t f i 1 25 "20" _null_ _null_ _null_	to_hex64 - _null_ ));
+DATA(insert OID =  2090 ( to_hex	   PGNSP PGUID 12 1 0 f f t f i 1 25 "20" _null_ _null_ _null_	to_hex64 - _null_ _null_ ));
 DESCR("convert int8 number to hex");
 
 /* for character set encoding support */
 
 /* return database encoding name */
-DATA(insert OID = 1039 (  getdatabaseencoding	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ getdatabaseencoding - _null_ ));
+DATA(insert OID = 1039 (  getdatabaseencoding	   PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ getdatabaseencoding - _null_ _null_ ));
 DESCR("encoding name of current database");
 
 /* return client encoding name i.e. session encoding */
-DATA(insert OID = 810 (  pg_client_encoding    PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ pg_client_encoding - _null_ ));
+DATA(insert OID = 810 (  pg_client_encoding    PGNSP PGUID 12 1 0 f f t f s 0 19 "" _null_ _null_ _null_ pg_client_encoding - _null_ _null_ ));
 DESCR("encoding name of current database");
 
-DATA(insert OID = 3335 (  length		   PGNSP PGUID 12 1 0 f f t f s 2 23 "17 19" _null_ _null_ _null_ length_in_encoding - _null_ ));
+DATA(insert OID = 1713 (  length		   PGNSP PGUID 12 1 0 f f t f s 2 23 "17 19" _null_ _null_ _null_ length_in_encoding - _null_ _null_ ));
 DESCR("length of string in specified encoding");
 
-DATA(insert OID = 3336 (  convert_from		   PGNSP PGUID 12 1 0 f f t f s 2 25 "17 19" _null_ _null_ _null_ pg_convert_from - _null_ ));
+DATA(insert OID = 1714 (  convert_from		   PGNSP PGUID 12 1 0 f f t f s 2 25 "17 19" _null_ _null_ _null_ pg_convert_from - _null_ _null_ ));
 DESCR("convert string with specified source encoding name");
 
-DATA(insert OID = 1717 (  convert_to		   PGNSP PGUID 12 1 0 f f t f s 2 17 "25 19" _null_ _null_ _null_ pg_convert_to - _null_ ));
+DATA(insert OID = 1717 (  convert_to		   PGNSP PGUID 12 1 0 f f t f s 2 17 "25 19" _null_ _null_ _null_ pg_convert_to - _null_ _null_ ));
 DESCR("convert string with specified destination encoding name");
 
-DATA(insert OID = 1813 (  convert		   PGNSP PGUID 12 1 0 f f t f s 3 17 "17 19 19" _null_ _null_ _null_	pg_convert - _null_ ));
+DATA(insert OID = 1813 (  convert		   PGNSP PGUID 12 1 0 f f t f s 3 17 "17 19 19" _null_ _null_ _null_ pg_convert - _null_ _null_ ));
 DESCR("convert string with specified encoding names");
 
-DATA(insert OID = 1264 (  pg_char_to_encoding	   PGNSP PGUID 12 1 0 f f t f s 1 23 "19" _null_ _null_ _null_	PG_char_to_encoding - _null_ ));
+DATA(insert OID = 1264 (  pg_char_to_encoding	   PGNSP PGUID 12 1 0 f f t f s 1 23 "19" _null_ _null_ _null_	PG_char_to_encoding - _null_ _null_ ));
 DESCR("convert encoding name to encoding id");
 
-DATA(insert OID = 1597 (  pg_encoding_to_char	   PGNSP PGUID 12 1 0 f f t f s 1 19 "23" _null_ _null_ _null_	PG_encoding_to_char - _null_ ));
+DATA(insert OID = 1597 (  pg_encoding_to_char	   PGNSP PGUID 12 1 0 f f t f s 1 19 "23" _null_ _null_ _null_	PG_encoding_to_char - _null_ _null_ ));
 DESCR("convert encoding id to encoding name");
 
-DATA(insert OID = 1638 (  oidgt				   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidgt - _null_ ));
+DATA(insert OID = 1638 (  oidgt				   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidgt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1639 (  oidge				   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidge - _null_ ));
+DATA(insert OID = 1639 (  oidge				   PGNSP PGUID 12 1 0 f f t f i 2 16 "26 26" _null_ _null_ _null_ oidge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
 /* System-view support functions */
-DATA(insert OID = 1573 (  pg_get_ruledef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_ruledef - _null_ ));
+DATA(insert OID = 1573 (  pg_get_ruledef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_ruledef - _null_ _null_ ));
 DESCR("source text of a rule");
-DATA(insert OID = 1640 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "25" _null_ _null_ _null_	pg_get_viewdef_name - _null_ ));
+DATA(insert OID = 1640 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "25" _null_ _null_ _null_	pg_get_viewdef_name - _null_ _null_ ));
 DESCR("select statement of a view");
-DATA(insert OID = 1641 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_viewdef - _null_ ));
+DATA(insert OID = 1641 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_viewdef - _null_ _null_ ));
 DESCR("select statement of a view");
-DATA(insert OID = 1642 (  pg_get_userbyid	   PGNSP PGUID 12 1 0 f f t f s 1 19 "26" _null_ _null_ _null_	pg_get_userbyid - _null_ ));
+DATA(insert OID = 1642 (  pg_get_userbyid	   PGNSP PGUID 12 1 0 f f t f s 1 19 "26" _null_ _null_ _null_	pg_get_userbyid - _null_ _null_ ));
 DESCR("role name by OID (with fallback)");
-DATA(insert OID = 1643 (  pg_get_indexdef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_indexdef - _null_ ));
+DATA(insert OID = 1643 (  pg_get_indexdef	   PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_indexdef - _null_ _null_ ));
 DESCR("index description");
-DATA(insert OID = 1662 (  pg_get_triggerdef    PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_triggerdef - _null_ ));
+DATA(insert OID = 1662 (  pg_get_triggerdef    PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_triggerdef - _null_ _null_ ));
 DESCR("trigger description");
-DATA(insert OID = 1387 (  pg_get_constraintdef PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_constraintdef - _null_ ));
+DATA(insert OID = 1387 (  pg_get_constraintdef PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_	pg_get_constraintdef - _null_ _null_ ));
 DESCR("constraint description");
-DATA(insert OID = 1716 (  pg_get_expr		   PGNSP PGUID 12 1 0 f f t f s 2 25 "25 26" _null_ _null_ _null_ pg_get_expr - _null_ ));
+DATA(insert OID = 1716 (  pg_get_expr		   PGNSP PGUID 12 1 0 f f t f s 2 25 "25 26" _null_ _null_ _null_ pg_get_expr - _null_ _null_ ));
 DESCR("deparse an encoded expression");
-DATA(insert OID = 1665 (  pg_get_serial_sequence	PGNSP PGUID 12 1 0 f f t f s 2 25 "25 25" _null_ _null_ _null_	pg_get_serial_sequence - _null_ ));
+DATA(insert OID = 1665 (  pg_get_serial_sequence	PGNSP PGUID 12 1 0 f f t f s 2 25 "25 25" _null_ _null_ _null_	pg_get_serial_sequence - _null_ _null_ ));
 DESCR("name of sequence for a serial column");
 /* pg_get_function_arguments(oid) => text */
-DATA(insert OID = 2096 ( pg_get_function_arguments  PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_ pg_get_function_arguments - _null_ ));
+DATA(insert OID = 2096 ( pg_get_function_arguments  PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_ pg_get_function_arguments - _null_ _null_ ));
 DESCR("argument list of a function");
 
 /* pg_get_function_result(oid) => text */
-DATA(insert OID = 3238 ( pg_get_function_result  PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_ pg_get_function_result - _null_ ));
+DATA(insert OID = 3238 ( pg_get_function_result  PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_ pg_get_function_result - _null_ _null_ ));
 DESCR("result type of a function");
 
 /* pg_get_function_identity_arguments(oid) => text */
-DATA(insert OID = 3239 ( pg_get_function_identity_arguments  PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_ pg_get_function_identity_arguments - _null_ ));
+DATA(insert OID = 3239 ( pg_get_function_identity_arguments  PGNSP PGUID 12 1 0 f f t f s 1 25 "26" _null_ _null_ _null_ pg_get_function_identity_arguments - _null_ _null_ ));
 DESCR("identity argument list of a function");
 
 
 /* Generic referential integrity constraint triggers */
-DATA(insert OID = 1644 (  RI_FKey_check_ins		PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_check_ins - _null_ m ));
+DATA(insert OID = 1644 (  RI_FKey_check_ins		PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_check_ins - _null_ _null_ m ));
 DESCR("referential integrity FOREIGN KEY ... REFERENCES");
-DATA(insert OID = 1645 (  RI_FKey_check_upd		PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_check_upd - _null_ m ));
+DATA(insert OID = 1645 (  RI_FKey_check_upd		PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_check_upd - _null_ _null_ m ));
 DESCR("referential integrity FOREIGN KEY ... REFERENCES");
-DATA(insert OID = 1646 (  RI_FKey_cascade_del	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_cascade_del - _null_ m ));
+DATA(insert OID = 1646 (  RI_FKey_cascade_del	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_cascade_del - _null_ _null_ m ));
 DESCR("referential integrity ON DELETE CASCADE");
-DATA(insert OID = 1647 (  RI_FKey_cascade_upd	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_cascade_upd - _null_ m ));
+DATA(insert OID = 1647 (  RI_FKey_cascade_upd	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_cascade_upd - _null_ _null_ m ));
 DESCR("referential integrity ON UPDATE CASCADE");
-DATA(insert OID = 1648 (  RI_FKey_restrict_del	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_restrict_del - _null_ m ));
+DATA(insert OID = 1648 (  RI_FKey_restrict_del	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_restrict_del - _null_ _null_ m ));
 DESCR("referential integrity ON DELETE RESTRICT");
-DATA(insert OID = 1649 (  RI_FKey_restrict_upd	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_restrict_upd - _null_ m ));
+DATA(insert OID = 1649 (  RI_FKey_restrict_upd	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_restrict_upd - _null_ _null_ m ));
 DESCR("referential integrity ON UPDATE RESTRICT");
-DATA(insert OID = 1650 (  RI_FKey_setnull_del	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setnull_del - _null_ m ));
+DATA(insert OID = 1650 (  RI_FKey_setnull_del	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setnull_del - _null_ _null_ m ));
 DESCR("referential integrity ON DELETE SET NULL");
-DATA(insert OID = 1651 (  RI_FKey_setnull_upd	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setnull_upd - _null_ m ));
+DATA(insert OID = 1651 (  RI_FKey_setnull_upd	PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setnull_upd - _null_ _null_ m ));
 DESCR("referential integrity ON UPDATE SET NULL");
-DATA(insert OID = 1652 (  RI_FKey_setdefault_del PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setdefault_del - _null_ m ));
+DATA(insert OID = 1652 (  RI_FKey_setdefault_del PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setdefault_del - _null_ _null_ m ));
 DESCR("referential integrity ON DELETE SET DEFAULT");
-DATA(insert OID = 1653 (  RI_FKey_setdefault_upd PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setdefault_upd - _null_ m ));
+DATA(insert OID = 1653 (  RI_FKey_setdefault_upd PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_setdefault_upd - _null_ _null_ m ));
 DESCR("referential integrity ON UPDATE SET DEFAULT");
-DATA(insert OID = 1654 (  RI_FKey_noaction_del PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_noaction_del - _null_ m ));
+DATA(insert OID = 1654 (  RI_FKey_noaction_del PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_noaction_del - _null_ _null_ m ));
 DESCR("referential integrity ON DELETE NO ACTION");
-DATA(insert OID = 1655 (  RI_FKey_noaction_upd PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_noaction_upd - _null_ m ));
+DATA(insert OID = 1655 (  RI_FKey_noaction_upd PGNSP PGUID 12 1 0 0 f f t f v 0 0 2279 f "" _null_ _null_ _null_ _null_ RI_FKey_noaction_upd - _null_ _null_ m ));
 DESCR("referential integrity ON UPDATE NO ACTION");
 
-DATA(insert OID = 1666 (  varbiteq			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	biteq - _null_ ));
+DATA(insert OID = 1666 (  varbiteq			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	biteq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1667 (  varbitne			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitne - _null_ ));
+DATA(insert OID = 1667 (  varbitne			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1668 (  varbitge			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitge - _null_ ));
+DATA(insert OID = 1668 (  varbitge			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitge - _null_ _null_ ));
 DESCR("greater than or equal");
-DATA(insert OID = 1669 (  varbitgt			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitgt - _null_ ));
+DATA(insert OID = 1669 (  varbitgt			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitgt - _null_ _null_ ));
 DESCR("greater than");
-DATA(insert OID = 1670 (  varbitle			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitle - _null_ ));
+DATA(insert OID = 1670 (  varbitle			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitle - _null_ _null_ ));
 DESCR("less than or equal");
-DATA(insert OID = 1671 (  varbitlt			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitlt - _null_ ));
+DATA(insert OID = 1671 (  varbitlt			PGNSP PGUID 12 1 0 f f t f i 2 16 "1562 1562" _null_ _null_ _null_	bitlt - _null_ _null_ ));
 DESCR("less than");
-DATA(insert OID = 1672 (  varbitcmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "1562 1562" _null_ _null_ _null_	bitcmp - _null_ ));
+DATA(insert OID = 1672 (  varbitcmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "1562 1562" _null_ _null_ _null_	bitcmp - _null_ _null_ ));
 DESCR("compare");
 
-DATA(insert OID = 1673 (  bitand			PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 1560" _null_ _null_ _null_	bitand - _null_ ));
+DATA(insert OID = 1673 (  bitand			PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 1560" _null_ _null_ _null_	bitand - _null_ _null_ ));
 DESCR("bitwise and");
-DATA(insert OID = 1674 (  bitor				PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 1560" _null_ _null_ _null_	bitor - _null_ ));
+DATA(insert OID = 1674 (  bitor				PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 1560" _null_ _null_ _null_	bitor - _null_ _null_ ));
 DESCR("bitwise or");
-DATA(insert OID = 1675 (  bitxor			PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 1560" _null_ _null_ _null_	bitxor - _null_ ));
+DATA(insert OID = 1675 (  bitxor			PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 1560" _null_ _null_ _null_	bitxor - _null_ _null_ ));
 DESCR("bitwise exclusive or");
-DATA(insert OID = 1676 (  bitnot			PGNSP PGUID 12 1 0 f f t f i 1 1560 "1560" _null_ _null_ _null_ bitnot - _null_ ));
+DATA(insert OID = 1676 (  bitnot			PGNSP PGUID 12 1 0 f f t f i 1 1560 "1560" _null_ _null_ _null_ bitnot - _null_ _null_ ));
 DESCR("bitwise not");
-DATA(insert OID = 1677 (  bitshiftleft		PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 23" _null_ _null_ _null_	bitshiftleft - _null_ ));
+DATA(insert OID = 1677 (  bitshiftleft		PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 23" _null_ _null_ _null_	bitshiftleft - _null_ _null_ ));
 DESCR("bitwise left shift");
-DATA(insert OID = 1678 (  bitshiftright		PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 23" _null_ _null_ _null_	bitshiftright - _null_ ));
+DATA(insert OID = 1678 (  bitshiftright		PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 23" _null_ _null_ _null_	bitshiftright - _null_ _null_ ));
 DESCR("bitwise right shift");
-DATA(insert OID = 1679 (  bitcat			PGNSP PGUID 12 1 0 f f t f i 2 1560 "1560 1560" _null_ _null_ _null_	bitcat - _null_ ));
+DATA(insert OID = 1679 (  bitcat			PGNSP PGUID 12 1 0 f f t f i 2 1562 "1562 1562" _null_ _null_ _null_	bitcat - _null_ _null_ ));
 DESCR("bitwise concatenation");
-DATA(insert OID = 1680 (  substring			PGNSP PGUID 12 1 0 f f t f i 3 1560 "1560 23 23" _null_ _null_ _null_ bitsubstr - _null_ ));
+DATA(insert OID = 1680 (  substring			PGNSP PGUID 12 1 0 f f t f i 3 1560 "1560 23 23" _null_ _null_ _null_ bitsubstr - _null_ _null_ ));
 DESCR("return portion of bitstring");
-DATA(insert OID = 1681 (  length			PGNSP PGUID 12 1 0 f f t f i 1 23 "1560" _null_ _null_ _null_ bitlength - _null_ ));
+DATA(insert OID = 1681 (  length			PGNSP PGUID 12 1 0 f f t f i 1 23 "1560" _null_ _null_ _null_ bitlength - _null_ _null_ ));
 DESCR("bitstring length");
-DATA(insert OID = 1682 (  octet_length		PGNSP PGUID 12 1 0 f f t f i 1 23 "1560" _null_ _null_ _null_ bitoctetlength - _null_ ));
+DATA(insert OID = 1682 (  octet_length		PGNSP PGUID 12 1 0 f f t f i 1 23 "1560" _null_ _null_ _null_ bitoctetlength - _null_ _null_ ));
 DESCR("octet length");
-DATA(insert OID = 1683 (  bit				PGNSP PGUID 12 1 0 f f t f i 2 1560 "23 23" _null_ _null_ _null_	bitfromint4 - _null_ ));
+DATA(insert OID = 1683 (  bit				PGNSP PGUID 12 1 0 f f t f i 2 1560 "23 23" _null_ _null_ _null_	bitfromint4 - _null_ _null_ ));
 DESCR("int4 to bitstring");
-DATA(insert OID = 1684 (  int4				PGNSP PGUID 12 1 0 f f t f i 1 23 "1560" _null_ _null_ _null_ bittoint4 - _null_ ));
+DATA(insert OID = 1684 (  int4				PGNSP PGUID 12 1 0 f f t f i 1 23 "1560" _null_ _null_ _null_ bittoint4 - _null_ _null_ ));
 DESCR("bitstring to int4");
 
-DATA(insert OID = 1685 (  bit			   PGNSP PGUID 12 1 0 f f t f i 3 1560 "1560 23 16" _null_ _null_ _null_ bit - _null_ ));
+DATA(insert OID = 1685 (  bit			   PGNSP PGUID 12 1 0 f f t f i 3 1560 "1560 23 16" _null_ _null_ _null_ bit - _null_ _null_ ));
 DESCR("adjust bit() to typmod length");
-DATA(insert OID = 1687 (  varbit		   PGNSP PGUID 12 1 0 f f t f i 3 1562 "1562 23 16" _null_ _null_ _null_ varbit - _null_ ));
+DATA(insert OID = 1687 (  varbit		   PGNSP PGUID 12 1 0 f f t f i 3 1562 "1562 23 16" _null_ _null_ _null_ varbit - _null_ _null_ ));
 DESCR("adjust varbit() to typmod length");
 
-DATA(insert OID = 1698 (  position		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1560 1560" _null_ _null_ _null_ bitposition - _null_ ));
+DATA(insert OID = 1698 (  position		   PGNSP PGUID 12 1 0 f f t f i 2 23 "1560 1560" _null_ _null_ _null_ bitposition - _null_ _null_ ));
 DESCR("return position of sub-bitstring");
-DATA(insert OID = 1699 (  substring			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1560 f "1560 23" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, $2, -1)" - _null_ c ));
+DATA(insert OID = 1699 (  substring			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1560 f "1560 23" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, $2, -1)" - _null_ _null_ c ));
 DESCR("return portion of bitstring");
 
 
 /* for mac type support */
-DATA(insert OID = 436 (  macaddr_in			PGNSP PGUID 12 1 0 f f t f i 1 829 "2275" _null_ _null_ _null_	macaddr_in - _null_ ));
+DATA(insert OID = 436 (  macaddr_in			PGNSP PGUID 12 1 0 f f t f i 1 829 "2275" _null_ _null_ _null_	macaddr_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 437 (  macaddr_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "829" _null_ _null_ _null_	macaddr_out - _null_ ));
+DATA(insert OID = 437 (  macaddr_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "829" _null_ _null_ _null_	macaddr_out - _null_ _null_ ));
 DESCR("I/O");
 
-DATA(insert OID = 752 (  text				PGNSP PGUID 12 1 0 f f t f i 1 25 "829" _null_ _null_ _null_	macaddr_text - _null_ ));
-DESCR("MAC address to text");
-DATA(insert OID = 753 (  trunc				PGNSP PGUID 12 1 0 f f t f i 1 829 "829" _null_ _null_ _null_ macaddr_trunc - _null_ ));
+DATA(insert OID = 753 (  trunc				PGNSP PGUID 12 1 0 f f t f i 1 829 "829" _null_ _null_ _null_ macaddr_trunc - _null_ _null_ ));
 DESCR("MAC manufacturer fields");
-DATA(insert OID = 767 (  macaddr			PGNSP PGUID 12 1 0 f f t f i 1 829 "25" _null_ _null_ _null_	text_macaddr - _null_ ));
-DESCR("text to MAC address");
 
-DATA(insert OID = 830 (  macaddr_eq			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_eq - _null_ ));
+DATA(insert OID = 830 (  macaddr_eq			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 831 (  macaddr_lt			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_lt - _null_ ));
+DATA(insert OID = 831 (  macaddr_lt			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 832 (  macaddr_le			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_le - _null_ ));
+DATA(insert OID = 832 (  macaddr_le			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 833 (  macaddr_gt			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_gt - _null_ ));
+DATA(insert OID = 833 (  macaddr_gt			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 834 (  macaddr_ge			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_ge - _null_ ));
+DATA(insert OID = 834 (  macaddr_ge			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 835 (  macaddr_ne			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_ne - _null_ ));
+DATA(insert OID = 835 (  macaddr_ne			PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_	macaddr_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 836 (  macaddr_cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "829 829" _null_ _null_ _null_	macaddr_cmp - _null_ ));
+DATA(insert OID = 836 (  macaddr_cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "829 829" _null_ _null_ _null_	macaddr_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
 
 /* for inet type support */
-DATA(insert OID = 910 (  inet_in			PGNSP PGUID 12 1 0 f f t f i 1 869 "2275" _null_ _null_ _null_	inet_in - _null_ ));
+DATA(insert OID = 910 (  inet_in			PGNSP PGUID 12 1 0 f f t f i 1 869 "2275" _null_ _null_ _null_	inet_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 911 (  inet_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "869" _null_ _null_ _null_	inet_out - _null_ ));
+DATA(insert OID = 911 (  inet_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "869" _null_ _null_ _null_	inet_out - _null_ _null_ ));
 DESCR("I/O");
 
 /* for cidr type support */
-DATA(insert OID = 1267 (  cidr_in			PGNSP PGUID 12 1 0 f f t f i 1 650 "2275" _null_ _null_ _null_	cidr_in - _null_ ));
+DATA(insert OID = 1267 (  cidr_in			PGNSP PGUID 12 1 0 f f t f i 1 650 "2275" _null_ _null_ _null_	cidr_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1427 (  cidr_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "650" _null_ _null_ _null_	cidr_out - _null_ ));
+DATA(insert OID = 1427 (  cidr_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "650" _null_ _null_ _null_	cidr_out - _null_ _null_ ));
 DESCR("I/O");
 
 /* these are used for both inet and cidr */
-DATA(insert OID = 920 (  network_eq			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_eq - _null_ ));
+DATA(insert OID = 920 (  network_eq			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 921 (  network_lt			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_lt - _null_ ));
+DATA(insert OID = 921 (  network_lt			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 922 (  network_le			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_le - _null_ ));
+DATA(insert OID = 922 (  network_le			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 923 (  network_gt			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_gt - _null_ ));
+DATA(insert OID = 923 (  network_gt			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 924 (  network_ge			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_ge - _null_ ));
+DATA(insert OID = 924 (  network_ge			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 925 (  network_ne			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_ne - _null_ ));
+DATA(insert OID = 925 (  network_ne			PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 926 (  network_cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "869 869" _null_ _null_ _null_	network_cmp - _null_ ));
+DATA(insert OID = 926 (  network_cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "869 869" _null_ _null_ _null_	network_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 927 (  network_sub		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_sub - _null_ ));
+DATA(insert OID = 927 (  network_sub		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_sub - _null_ _null_ ));
 DESCR("is-subnet");
-DATA(insert OID = 928 (  network_subeq		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_subeq - _null_ ));
+DATA(insert OID = 928 (  network_subeq		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_subeq - _null_ _null_ ));
 DESCR("is-subnet-or-equal");
-DATA(insert OID = 929 (  network_sup		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_sup - _null_ ));
+DATA(insert OID = 929 (  network_sup		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_sup - _null_ _null_ ));
 DESCR("is-supernet");
-DATA(insert OID = 930 (  network_supeq		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_supeq - _null_ ));
+DATA(insert OID = 930 (  network_supeq		PGNSP PGUID 12 1 0 f f t f i 2 16 "869 869" _null_ _null_ _null_	network_supeq - _null_ _null_ ));
 DESCR("is-supernet-or-equal");
 
 /* inet/cidr functions */
-DATA(insert OID = 598 (  abbrev				PGNSP PGUID 12 1 0 f f t f i 1 25 "869" _null_ _null_ _null_	inet_abbrev - _null_ ));
+DATA(insert OID = 598 (  abbrev				PGNSP PGUID 12 1 0 f f t f i 1 25 "869" _null_ _null_ _null_	inet_abbrev - _null_ _null_ ));
 DESCR("abbreviated display of inet value");
-DATA(insert OID = 599 (  abbrev				PGNSP PGUID 12 1 0 f f t f i 1 25 "650" _null_ _null_ _null_	cidr_abbrev - _null_ ));
+DATA(insert OID = 599 (  abbrev				PGNSP PGUID 12 1 0 f f t f i 1 25 "650" _null_ _null_ _null_	cidr_abbrev - _null_ _null_ ));
 DESCR("abbreviated display of cidr value");
-DATA(insert OID = 605 (  set_masklen		PGNSP PGUID 12 1 0 f f t f i 2 869 "869 23" _null_ _null_ _null_	inet_set_masklen - _null_ ));
+DATA(insert OID = 605 (  set_masklen		PGNSP PGUID 12 1 0 f f t f i 2 869 "869 23" _null_ _null_ _null_	inet_set_masklen - _null_ _null_ ));
 DESCR("change netmask of inet");
-DATA(insert OID = 635 (  set_masklen		PGNSP PGUID 12 1 0 f f t f i 2 650 "650 23" _null_ _null_ _null_	cidr_set_masklen - _null_ ));
+DATA(insert OID = 635 (  set_masklen		PGNSP PGUID 12 1 0 f f t f i 2 650 "650 23" _null_ _null_ _null_	cidr_set_masklen - _null_ _null_ ));
 DESCR("change netmask of cidr");
-DATA(insert OID = 711 (  family				PGNSP PGUID 12 1 0 f f t f i 1 23 "869" _null_ _null_ _null_	network_family - _null_ ));
+DATA(insert OID = 711 (  family				PGNSP PGUID 12 1 0 f f t f i 1 23 "869" _null_ _null_ _null_	network_family - _null_ _null_ ));
 DESCR("address family (4 for IPv4, 6 for IPv6)");
-DATA(insert OID = 683 (  network			PGNSP PGUID 12 1 0 f f t f i 1 650 "869" _null_ _null_ _null_ network_network - _null_ ));
+DATA(insert OID = 683 (  network			PGNSP PGUID 12 1 0 f f t f i 1 650 "869" _null_ _null_ _null_ network_network - _null_ _null_ ));
 DESCR("network part of address");
-DATA(insert OID = 696 (  netmask			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_ network_netmask - _null_ ));
+DATA(insert OID = 696 (  netmask			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_ network_netmask - _null_ _null_ ));
 DESCR("netmask of address");
-DATA(insert OID = 697 (  masklen			PGNSP PGUID 12 1 0 f f t f i 1 23 "869" _null_ _null_ _null_	network_masklen - _null_ ));
+DATA(insert OID = 697 (  masklen			PGNSP PGUID 12 1 0 f f t f i 1 23 "869" _null_ _null_ _null_	network_masklen - _null_ _null_ ));
 DESCR("netmask length");
-DATA(insert OID = 698 (  broadcast			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_ network_broadcast - _null_ ));
+DATA(insert OID = 698 (  broadcast			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_ network_broadcast - _null_ _null_ ));
 DESCR("broadcast address of network");
-DATA(insert OID = 699 (  host				PGNSP PGUID 12 1 0 f f t f i 1 25 "869" _null_ _null_ _null_	network_host - _null_ ));
+DATA(insert OID = 699 (  host				PGNSP PGUID 12 1 0 f f t f i 1 25 "869" _null_ _null_ _null_	network_host - _null_ _null_ ));
 DESCR("show address octets only");
-DATA(insert OID = 730 (  text				PGNSP PGUID 12 1 0 f f t f i 1 25 "869" _null_ _null_ _null_	network_show - _null_ ));
+DATA(insert OID = 730 (  text				PGNSP PGUID 12 1 0 f f t f i 1 25 "869" _null_ _null_ _null_	network_show - _null_ _null_ ));
 DESCR("show all parts of inet/cidr value");
-DATA(insert OID = 1362 (  hostmask			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_ network_hostmask - _null_ ));
+DATA(insert OID = 1362 (  hostmask			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_ network_hostmask - _null_ _null_ ));
 DESCR("hostmask of address");
-DATA(insert OID = 1713 (  inet				PGNSP PGUID 12 1 0 f f t f i 1 869 "25" _null_ _null_ _null_	text_inet - _null_ ));
-DESCR("text to inet");
-DATA(insert OID = 1714 (  cidr				PGNSP PGUID 12 1 0 f f t f i 1 650 "25" _null_ _null_ _null_	text_cidr - _null_ ));
-DESCR("text to cidr");
-DATA(insert OID = 1715 (  cidr				PGNSP PGUID 12 1 0 f f t f i 1 650 "869" _null_ _null_ _null_	inet_to_cidr - _null_ ));
+DATA(insert OID = 1715 (  cidr				PGNSP PGUID 12 1 0 f f t f i 1 650 "869" _null_ _null_ _null_	inet_to_cidr - _null_ _null_ ));
 DESCR("coerce inet to cidr");
 
-DATA(insert OID = 2196 (  inet_client_addr		PGNSP PGUID 12 1 0 f f f f s 0 869 "" _null_ _null_ _null_	inet_client_addr - _null_ ));
+DATA(insert OID = 2196 (  inet_client_addr		PGNSP PGUID 12 1 0 f f f f s 0 869 "" _null_ _null_ _null_	inet_client_addr - _null_ _null_ ));
 DESCR("inet address of the client");
-DATA(insert OID = 2197 (  inet_client_port		PGNSP PGUID 12 1 0 f f f f s 0 23 "" _null_ _null_ _null_  inet_client_port - _null_ ));
+DATA(insert OID = 2197 (  inet_client_port		PGNSP PGUID 12 1 0 f f f f s 0 23 "" _null_ _null_ _null_  inet_client_port - _null_ _null_ ));
 DESCR("client's port number for this connection");
-DATA(insert OID = 2198 (  inet_server_addr		PGNSP PGUID 12 1 0 f f f f s 0 869 "" _null_ _null_ _null_	inet_server_addr - _null_ ));
+DATA(insert OID = 2198 (  inet_server_addr		PGNSP PGUID 12 1 0 f f f f s 0 869 "" _null_ _null_ _null_	inet_server_addr - _null_ _null_ ));
 DESCR("inet address of the server");
-DATA(insert OID = 2199 (  inet_server_port		PGNSP PGUID 12 1 0 f f f f s 0 23 "" _null_ _null_ _null_  inet_server_port - _null_ ));
+DATA(insert OID = 2199 (  inet_server_port		PGNSP PGUID 12 1 0 f f f f s 0 23 "" _null_ _null_ _null_  inet_server_port - _null_ _null_ ));
 DESCR("server's port number for this connection");
 
-DATA(insert OID = 2627 (  inetnot			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_	inetnot - _null_ ));
+DATA(insert OID = 2627 (  inetnot			PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_	inetnot - _null_ _null_ ));
 DESCR("bitwise not");
-DATA(insert OID = 2628 (  inetand			PGNSP PGUID 12 1 0 f f t f i 2 869 "869 869" _null_ _null_ _null_	inetand - _null_ ));
+DATA(insert OID = 2628 (  inetand			PGNSP PGUID 12 1 0 f f t f i 2 869 "869 869" _null_ _null_ _null_	inetand - _null_ _null_ ));
 DESCR("bitwise and");
-DATA(insert OID = 2629 (  inetor			PGNSP PGUID 12 1 0 f f t f i 2 869 "869 869" _null_ _null_ _null_	inetor - _null_ ));
+DATA(insert OID = 2629 (  inetor			PGNSP PGUID 12 1 0 f f t f i 2 869 "869 869" _null_ _null_ _null_	inetor - _null_ _null_ ));
 DESCR("bitwise or");
-DATA(insert OID = 2630 (  inetpl			PGNSP PGUID 12 1 0 f f t f i 2 869 "869 20" _null_ _null_ _null_	inetpl - _null_ ));
+DATA(insert OID = 2630 (  inetpl			PGNSP PGUID 12 1 0 f f t f i 2 869 "869 20" _null_ _null_ _null_	inetpl - _null_ _null_ ));
 DESCR("add integer to inet value");
-DATA(insert OID = 2631 (  int8pl_inet		PGNSP PGUID 14 1 0 0 f f t f i 2 0 869 f "20 869" _null_ _null_ _null_ _null_	"select $2 + $1" - _null_ c ));
+DATA(insert OID = 2631 (  int8pl_inet		PGNSP PGUID 14 1 0 0 f f t f i 2 0 869 f "20 869" _null_ _null_ _null_ _null_	"select $2 + $1" - _null_ _null_ c ));
 DESCR("add integer to inet value");
-DATA(insert OID = 2632 (  inetmi_int8		PGNSP PGUID 12 1 0 f f t f i 2 869 "869 20" _null_ _null_ _null_	inetmi_int8 - _null_ ));
+DATA(insert OID = 2632 (  inetmi_int8		PGNSP PGUID 12 1 0 f f t f i 2 869 "869 20" _null_ _null_ _null_	inetmi_int8 - _null_ _null_ ));
 DESCR("subtract integer from inet value");
-DATA(insert OID = 2633 (  inetmi			PGNSP PGUID 12 1 0 f f t f i 2 20 "869 869" _null_ _null_ _null_	inetmi - _null_ ));
+DATA(insert OID = 2633 (  inetmi			PGNSP PGUID 12 1 0 f f t f i 2 20 "869 869" _null_ _null_ _null_	inetmi - _null_ _null_ ));
 DESCR("subtract inet values");
 
-DATA(insert OID = 1686 ( numeric			PGNSP PGUID 12 1 0 f f t f i 1 1700 "25" _null_ _null_ _null_ text_numeric - _null_ ));
-DESCR("(internal)");
-DATA(insert OID = 1688 ( text				PGNSP PGUID 12 1 0 f f t f i 1 25 "1700" _null_ _null_ _null_ numeric_text - _null_ ));
-DESCR("(internal)");
-
-DATA(insert OID = 1690 ( time_mi_time		PGNSP PGUID 12 1 0 f f t f i 2 1186 "1083 1083" _null_ _null_ _null_	time_mi_time - _null_ ));
+DATA(insert OID = 1690 ( time_mi_time		PGNSP PGUID 12 1 0 f f t f i 2 1186 "1083 1083" _null_ _null_ _null_	time_mi_time - _null_ _null_ ));
 DESCR("minus");
 
-DATA(insert OID =  1691 (  boolle			PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_	boolle - _null_ ));
+DATA(insert OID =  1691 (  boolle			PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_	boolle - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID =  1692 (  boolge			PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_	boolge - _null_ ));
+DATA(insert OID =  1692 (  boolge			PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_	boolge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1693 (  btboolcmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "16 16" _null_ _null_ _null_	btboolcmp - _null_ ));
+DATA(insert OID = 1693 (  btboolcmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "16 16" _null_ _null_ _null_	btboolcmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
 
-DATA(insert OID = 1696 (  timetz_hash		PGNSP PGUID 12 1 0 f f t f i 1 23 "1266" _null_ _null_ _null_ timetz_hash - _null_ ));
+DATA(insert OID = 1688 (  time_hash			PGNSP PGUID 12 1 0 f f t f i 1 23 "1083" _null_ _null_ _null_ time_hash - _null_ _null_ ));
+DESCR("hash");
+DATA(insert OID = 1696 (  timetz_hash		PGNSP PGUID 12 1 0 f f t f i 1 23 "1266" _null_ _null_ _null_ timetz_hash - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 1697 (  interval_hash		PGNSP PGUID 12 1 0 f f t f i 1 23 "1186" _null_ _null_ _null_ interval_hash - _null_ ));
+DATA(insert OID = 1697 (  interval_hash		PGNSP PGUID 12 1 0 f f t f i 1 23 "1186" _null_ _null_ _null_ interval_hash - _null_ _null_ ));
 DESCR("hash");
 
 
 /* OID's 1700 - 1799 NUMERIC data type */
-DATA(insert OID = 1701 ( numeric_in				PGNSP PGUID 12 1 0 f f t f i 3 1700 "2275 26 23" _null_ _null_ _null_  numeric_in - _null_ ));
+DATA(insert OID = 1701 ( numeric_in				PGNSP PGUID 12 1 0 f f t f i 3 1700 "2275 26 23" _null_ _null_ _null_  numeric_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1702 ( numeric_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "1700" _null_ _null_ _null_ numeric_out - _null_ ));
+DATA(insert OID = 1702 ( numeric_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "1700" _null_ _null_ _null_ numeric_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2917 (  numerictypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	numerictypmodin - _null_ ));
+DATA(insert OID = 2917 (  numerictypmodin   	PGNSP PGUID 12 1 0 f f t f i 1 23 "1263" _null_ _null_ _null_	numerictypmodin - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 2918 (  numerictypmodout  	PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	numerictypmodout - _null_ ));
+DATA(insert OID = 2918 (  numerictypmodout		PGNSP PGUID 12 1 0 f f t f i 1 2275 "23" _null_ _null_ _null_	numerictypmodout - _null_ _null_ ));
 DESCR("I/O typmod");
-DATA(insert OID = 1703 ( numeric				PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 23" _null_ _null_ _null_	numeric - _null_ ));
+DATA(insert OID = 1703 ( numeric				PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 23" _null_ _null_ _null_	numeric - _null_ _null_ ));
 DESCR("adjust numeric to typmod precision/scale");
-DATA(insert OID = 1704 ( numeric_abs			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_abs - _null_ ));
+DATA(insert OID = 1704 ( numeric_abs			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1705 ( abs					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_abs - _null_ ));
+DATA(insert OID = 1705 ( abs					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_abs - _null_ _null_ ));
 DESCR("absolute value");
-DATA(insert OID = 1706 ( sign					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_sign - _null_ ));
+DATA(insert OID = 1706 ( sign					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_sign - _null_ _null_ ));
 DESCR("sign of value");
-DATA(insert OID = 1707 ( round					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 23" _null_ _null_ _null_	numeric_round - _null_ ));
+DATA(insert OID = 1707 ( round					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 23" _null_ _null_ _null_	numeric_round - _null_ _null_ ));
 DESCR("value rounded to 'scale'");
-DATA(insert OID = 1708 ( round					PGNSP PGUID 14 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ "select pg_catalog.round($1,0)" - _null_ c ));
+DATA(insert OID = 1708 ( round					PGNSP PGUID 14 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ "select pg_catalog.round($1,0)" - _null_ _null_ c ));
 DESCR("value rounded to 'scale' of zero");
-DATA(insert OID = 1709 ( trunc					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 23" _null_ _null_ _null_	numeric_trunc - _null_ ));
+DATA(insert OID = 1709 ( trunc					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 23" _null_ _null_ _null_	numeric_trunc - _null_ _null_ ));
 DESCR("value truncated to 'scale'");
-DATA(insert OID = 1710 ( trunc					PGNSP PGUID 14 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ "select pg_catalog.trunc($1,0)" - _null_ c ));
+DATA(insert OID = 1710 ( trunc					PGNSP PGUID 14 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ "select pg_catalog.trunc($1,0)" - _null_ _null_ c ));
 DESCR("value truncated to 'scale' of zero");
-DATA(insert OID = 1711 ( ceil					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ceil - _null_ ));
+DATA(insert OID = 1711 ( ceil					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ceil - _null_ _null_ ));
 DESCR("smallest integer >= value");
-DATA(insert OID = 2167 ( ceiling				PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ceil - _null_ ));
+DATA(insert OID = 2167 ( ceiling				PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ceil - _null_ _null_ ));
 DESCR("smallest integer >= value");
-DATA(insert OID = 1712 ( floor					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_floor - _null_ ));
+DATA(insert OID = 1712 ( floor					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_floor - _null_ _null_ ));
 DESCR("largest integer <= value");
-DATA(insert OID = 1718 ( numeric_eq				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_eq - _null_ ));
+DATA(insert OID = 1718 ( numeric_eq				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1719 ( numeric_ne				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_ne - _null_ ));
+DATA(insert OID = 1719 ( numeric_ne				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1720 ( numeric_gt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_gt - _null_ ));
+DATA(insert OID = 1720 ( numeric_gt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1721 ( numeric_ge				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_ge - _null_ ));
+DATA(insert OID = 1721 ( numeric_ge				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1722 ( numeric_lt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_lt - _null_ ));
+DATA(insert OID = 1722 ( numeric_lt				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1723 ( numeric_le				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_le - _null_ ));
+DATA(insert OID = 1723 ( numeric_le				PGNSP PGUID 12 1 0 f f t f i 2 16 "1700 1700" _null_ _null_ _null_	numeric_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1724 ( numeric_add			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_add - _null_ ));
+DATA(insert OID = 1724 ( numeric_add			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_add - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 1725 ( numeric_sub			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_sub - _null_ ));
+DATA(insert OID = 1725 ( numeric_sub			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_sub - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 1726 ( numeric_mul			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_mul - _null_ ));
+DATA(insert OID = 1726 ( numeric_mul			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_mul - _null_ _null_ ));
 DESCR("multiply");
-DATA(insert OID = 1727 ( numeric_div			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_div - _null_ ));
+DATA(insert OID = 1727 ( numeric_div			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_div - _null_ _null_ ));
 DESCR("divide");
-DATA(insert OID = 1728 ( mod					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_mod - _null_ ));
+DATA(insert OID = 1728 ( mod					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 1729 ( numeric_mod			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_mod - _null_ ));
+DATA(insert OID = 1729 ( numeric_mod			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_mod - _null_ _null_ ));
 DESCR("modulus");
-DATA(insert OID = 1730 ( sqrt					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_sqrt - _null_ ));
+DATA(insert OID = 1730 ( sqrt					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_sqrt - _null_ _null_ ));
 DESCR("square root");
-DATA(insert OID = 1731 ( numeric_sqrt			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_sqrt - _null_ ));
+DATA(insert OID = 1731 ( numeric_sqrt			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_sqrt - _null_ _null_ ));
 DESCR("square root");
-DATA(insert OID = 1732 ( exp					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_exp - _null_ ));
+DATA(insert OID = 1732 ( exp					PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_exp - _null_ _null_ ));
 DESCR("e raised to the power of n");
-DATA(insert OID = 1733 ( numeric_exp			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_exp - _null_ ));
+DATA(insert OID = 1733 ( numeric_exp			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_exp - _null_ _null_ ));
 DESCR("e raised to the power of n");
-DATA(insert OID = 1734 ( ln						PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ln - _null_ ));
+DATA(insert OID = 1734 ( ln						PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ln - _null_ _null_ ));
 DESCR("natural logarithm of n");
-DATA(insert OID = 1735 ( numeric_ln				PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ln - _null_ ));
+DATA(insert OID = 1735 ( numeric_ln				PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_ln - _null_ _null_ ));
 DESCR("natural logarithm of n");
-DATA(insert OID = 1736 ( log					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_log - _null_ ));
+DATA(insert OID = 1736 ( log					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_log - _null_ _null_ ));
 DESCR("logarithm base m of n");
-DATA(insert OID = 1737 ( numeric_log			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_log - _null_ ));
+DATA(insert OID = 1737 ( numeric_log			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_log - _null_ _null_ ));
 DESCR("logarithm base m of n");
-DATA(insert OID = 1738 ( pow					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_power - _null_ ));
+DATA(insert OID = 1738 ( pow					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_power - _null_ _null_ ));
 DESCR("m raised to the power of n");
-DATA(insert OID = 2169 ( power					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_power - _null_ ));
+DATA(insert OID = 2169 ( power					PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_power - _null_ _null_ ));
 DESCR("m raised to the power of n");
-DATA(insert OID = 1739 ( numeric_power			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_power - _null_ ));
+DATA(insert OID = 1739 ( numeric_power			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_power - _null_ _null_ ));
 DESCR("m raised to the power of n");
-DATA(insert OID = 1740 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "23" _null_ _null_ _null_ int4_numeric - _null_ ));
+DATA(insert OID = 1740 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "23" _null_ _null_ _null_ int4_numeric - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1741 ( log					PGNSP PGUID 14 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ "select pg_catalog.log(10, $1)" - _null_ c ));
+DATA(insert OID = 1741 ( log					PGNSP PGUID 14 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ "select pg_catalog.log(10, $1)" - _null_ _null_ c ));
 DESCR("logarithm base 10 of n");
-DATA(insert OID = 1742 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "700" _null_ _null_ _null_	float4_numeric - _null_ ));
+DATA(insert OID = 1742 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "700" _null_ _null_ _null_	float4_numeric - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1743 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "701" _null_ _null_ _null_	float8_numeric - _null_ ));
+DATA(insert OID = 1743 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "701" _null_ _null_ _null_	float8_numeric - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1744 ( int4					PGNSP PGUID 12 1 0 f f t f i 1 23 "1700" _null_ _null_ _null_ numeric_int4 - _null_ ));
+DATA(insert OID = 1744 ( int4					PGNSP PGUID 12 1 0 f f t f i 1 23 "1700" _null_ _null_ _null_ numeric_int4 - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1745 ( float4					PGNSP PGUID 12 1 0 f f t f i 1 700 "1700" _null_ _null_ _null_	numeric_float4 - _null_ ));
+DATA(insert OID = 1745 ( float4					PGNSP PGUID 12 1 0 f f t f i 1 700 "1700" _null_ _null_ _null_	numeric_float4 - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1746 ( float8					PGNSP PGUID 12 1 0 f f t f i 1 701 "1700" _null_ _null_ _null_	numeric_float8 - _null_ ));
+DATA(insert OID = 1746 ( float8					PGNSP PGUID 12 1 0 f f t f i 1 701 "1700" _null_ _null_ _null_	numeric_float8 - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 2170 ( width_bucket			PGNSP PGUID 12 1 0 f f t f i 4 23 "1700 1700 1700 23" _null_ _null_ _null_	width_bucket_numeric - _null_ ));
+DATA(insert OID = 2170 ( width_bucket			PGNSP PGUID 12 1 0 f f t f i 4 23 "1700 1700 1700 23" _null_ _null_ _null_	width_bucket_numeric - _null_ _null_ ));
 DESCR("bucket number of operand in equidepth histogram");
 
-DATA(insert OID = 1747 ( time_pl_interval		PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1186" _null_ _null_ _null_	time_pl_interval - _null_ ));
+DATA(insert OID = 1747 ( time_pl_interval		PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1186" _null_ _null_ _null_	time_pl_interval - _null_ _null_ ));
 DESCR("plus");
-DATA(insert OID = 1748 ( time_mi_interval		PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1186" _null_ _null_ _null_	time_mi_interval - _null_ ));
+DATA(insert OID = 1748 ( time_mi_interval		PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 1186" _null_ _null_ _null_	time_mi_interval - _null_ _null_ ));
 DESCR("minus");
-DATA(insert OID = 1749 ( timetz_pl_interval		PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1186" _null_ _null_ _null_	timetz_pl_interval - _null_ ));
+DATA(insert OID = 1749 ( timetz_pl_interval		PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1186" _null_ _null_ _null_	timetz_pl_interval - _null_ _null_ ));
 DESCR("plus");
-DATA(insert OID = 1750 ( timetz_mi_interval		PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1186" _null_ _null_ _null_	timetz_mi_interval - _null_ ));
+DATA(insert OID = 1750 ( timetz_mi_interval		PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 1186" _null_ _null_ _null_	timetz_mi_interval - _null_ _null_ ));
 DESCR("minus");
 
-DATA(insert OID = 1764 ( numeric_inc			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_inc - _null_ ));
+DATA(insert OID = 1764 ( numeric_inc			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_inc - _null_ _null_ ));
 DESCR("increment by one");
-DATA(insert OID = 1766 ( numeric_smaller		PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_smaller - _null_ ));
+DATA(insert OID = 1766 ( numeric_smaller		PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_smaller - _null_ _null_ ));
 DESCR("smaller of two numbers");
-DATA(insert OID = 1767 ( numeric_larger			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_larger - _null_ ));
+DATA(insert OID = 1767 ( numeric_larger			PGNSP PGUID 12 1 0 f f t f i 2 1700 "1700 1700" _null_ _null_ _null_	numeric_larger - _null_ _null_ ));
 DESCR("larger of two numbers");
-DATA(insert OID = 1769 ( numeric_cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "1700 1700" _null_ _null_ _null_	numeric_cmp - _null_ ));
+DATA(insert OID = 1769 ( numeric_cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "1700 1700" _null_ _null_ _null_	numeric_cmp - _null_ _null_ ));
 DESCR("compare two numbers");
-DATA(insert OID = 1771 ( numeric_uminus			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_uminus - _null_ ));
+DATA(insert OID = 1771 ( numeric_uminus			PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_ numeric_uminus - _null_ _null_ ));
 DESCR("negate");
-DATA(insert OID = 1779 ( int8					PGNSP PGUID 12 1 0 f f t f i 1 20 "1700" _null_ _null_ _null_ numeric_int8 - _null_ ));
+DATA(insert OID = 1779 ( int8					PGNSP PGUID 12 1 0 f f t f i 1 20 "1700" _null_ _null_ _null_ numeric_int8 - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1781 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "20" _null_ _null_ _null_ int8_numeric - _null_ ));
+DATA(insert OID = 1781 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "20" _null_ _null_ _null_ int8_numeric - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1782 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "21" _null_ _null_ _null_ int2_numeric - _null_ ));
+DATA(insert OID = 1782 ( numeric				PGNSP PGUID 12 1 0 f f t f i 1 1700 "21" _null_ _null_ _null_ int2_numeric - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 1783 ( int2					PGNSP PGUID 12 1 0 f f t f i 1 21 "1700" _null_ _null_ _null_ numeric_int2 - _null_ ));
+DATA(insert OID = 1783 ( int2					PGNSP PGUID 12 1 0 f f t f i 1 21 "1700" _null_ _null_ _null_ numeric_int2 - _null_ _null_ ));
 DESCR("(internal)");
 
 /* Complex Number type */
-DATA(insert OID = 3057 ( complex_cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "195 195" _null_ _null_ _null_	complex_cmp - _null_ ));
+DATA(insert OID = 3057 ( complex_cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "195 195" _null_ _null_ _null_	complex_cmp - _null_ _null_ ));
 DESCR("compare two complex numbers");
 
 /* formatting */
-DATA(insert OID = 1770 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1184 25" _null_ _null_ _null_  timestamptz_to_char - _null_ ));
+DATA(insert OID = 1770 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1184 25" _null_ _null_ _null_  timestamptz_to_char - _null_ _null_ ));
 DESCR("format timestamp with time zone to text");
-DATA(insert OID = 1772 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1700 25" _null_ _null_ _null_  numeric_to_char - _null_ ));
+DATA(insert OID = 1772 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1700 25" _null_ _null_ _null_  numeric_to_char - _null_ _null_ ));
 DESCR("format numeric to text");
-DATA(insert OID = 1773 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "23 25" _null_ _null_ _null_ int4_to_char - _null_ ));
+DATA(insert OID = 1773 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "23 25" _null_ _null_ _null_ int4_to_char - _null_ _null_ ));
 DESCR("format int4 to text");
-DATA(insert OID = 1774 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "20 25" _null_ _null_ _null_ int8_to_char - _null_ ));
+DATA(insert OID = 1774 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "20 25" _null_ _null_ _null_ int8_to_char - _null_ _null_ ));
 DESCR("format int8 to text");
-DATA(insert OID = 1775 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "700 25" _null_ _null_ _null_	float4_to_char - _null_ ));
+DATA(insert OID = 1775 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "700 25" _null_ _null_ _null_	float4_to_char - _null_ _null_ ));
 DESCR("format float4 to text");
-DATA(insert OID = 1776 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "701 25" _null_ _null_ _null_	float8_to_char - _null_ ));
+DATA(insert OID = 1776 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "701 25" _null_ _null_ _null_	float8_to_char - _null_ _null_ ));
 DESCR("format float8 to text");
-DATA(insert OID = 1777 ( to_number			PGNSP PGUID 12 1 0 f f t f s 2	1700 "25 25" _null_ _null_ _null_  numeric_to_number - _null_ ));
+DATA(insert OID = 1777 ( to_number			PGNSP PGUID 12 1 0 f f t f s 2	1700 "25 25" _null_ _null_ _null_  numeric_to_number - _null_ _null_ ));
 DESCR("convert text to numeric");
-DATA(insert OID = 1778 ( to_timestamp		PGNSP PGUID 12 1 0 f f t f s 2	1184 "25 25" _null_ _null_ _null_  to_timestamp - _null_ ));
+DATA(insert OID = 1778 ( to_timestamp		PGNSP PGUID 12 1 0 f f t f s 2	1184 "25 25" _null_ _null_ _null_  to_timestamp - _null_ _null_ ));
 DESCR("convert text to timestamp with time zone");
-DATA(insert OID = 1780 ( to_date			PGNSP PGUID 12 1 0 f f t f s 2	1082 "25 25" _null_ _null_ _null_  to_date - _null_ ));
+DATA(insert OID = 1780 ( to_date			PGNSP PGUID 12 1 0 f f t f s 2	1082 "25 25" _null_ _null_ _null_  to_date - _null_ _null_ ));
 DESCR("convert text to date");
-DATA(insert OID = 1768 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1186 25" _null_ _null_ _null_  interval_to_char - _null_ ));
+DATA(insert OID = 1768 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1186 25" _null_ _null_ _null_  interval_to_char - _null_ _null_ ));
 DESCR("format interval to text");
 
-DATA(insert OID =  1282 ( quote_ident	   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_ quote_ident - _null_ ));
+DATA(insert OID =  1282 ( quote_ident	   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_ quote_ident - _null_ _null_ ));
 DESCR("quote an identifier for usage in a querystring");
-DATA(insert OID =  1283 ( quote_literal    PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_ quote_literal - _null_ ));
+DATA(insert OID =  1283 ( quote_literal    PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_ quote_literal - _null_ _null_ ));
 DESCR("quote a literal for usage in a querystring");
+DATA(insert OID =  1285 ( quote_literal    PGNSP PGUID 14 1 0 f f t f v 1 25 "2283" _null_ _null_ _null_ "select pg_catalog.quote_literal($1::pg_catalog.text)" - _null_ _null_ ));
+DESCR("quote a data value for usage in a querystring");
 
-DATA(insert OID = 1798 (  oidin			   PGNSP PGUID 12 1 0 f f t f i 1 26 "2275" _null_ _null_ _null_ oidin - _null_ ));
+DATA(insert OID = 1798 (  oidin			   PGNSP PGUID 12 1 0 f f t f i 1 26 "2275" _null_ _null_ _null_ oidin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1799 (  oidout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "26" _null_ _null_ _null_ oidout - _null_ ));
+DATA(insert OID = 1799 (  oidout		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "26" _null_ _null_ _null_ oidout - _null_ _null_ ));
 DESCR("I/O");
 
 
-DATA(insert OID = 1810 (  bit_length	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 23 f "17" _null_ _null_ _null_ _null_ "select pg_catalog.octet_length($1) * 8" - _null_ c ));
+DATA(insert OID = 1810 (  bit_length	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 23 f "17" _null_ _null_ _null_ _null_ "select pg_catalog.octet_length($1) * 8" - _null_ _null_ c ));
 DESCR("length in bits");
-DATA(insert OID = 1811 (  bit_length	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 23 f "25" _null_ _null_ _null_ _null_ "select pg_catalog.octet_length($1) * 8" - _null_ c ));
+DATA(insert OID = 1811 (  bit_length	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 23 f "25" _null_ _null_ _null_ _null_ "select pg_catalog.octet_length($1) * 8" - _null_ _null_ c ));
 DESCR("length in bits");
-DATA(insert OID = 1812 (  bit_length	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 23 f "1560" _null_ _null_ _null_ _null_ "select pg_catalog.length($1)" - _null_ c ));
+DATA(insert OID = 1812 (  bit_length	   PGNSP PGUID 14 1 0 0 f f t f i 1 0 23 f "1560" _null_ _null_ _null_ _null_ "select pg_catalog.length($1)" - _null_ _null_ c ));
 DESCR("length in bits");
 
 /* Selectivity estimators for LIKE and related operators */
-DATA(insert OID = 1814 ( iclikesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  iclikesel - _null_ ));
+DATA(insert OID = 1814 ( iclikesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  iclikesel - _null_ _null_ ));
 DESCR("restriction selectivity of ILIKE");
-DATA(insert OID = 1815 ( icnlikesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  icnlikesel - _null_ ));
+DATA(insert OID = 1815 ( icnlikesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  icnlikesel - _null_ _null_ ));
 DESCR("restriction selectivity of NOT ILIKE");
-DATA(insert OID = 1816 ( iclikejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  iclikejoinsel - _null_ ));
+DATA(insert OID = 1816 ( iclikejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  iclikejoinsel - _null_ _null_ ));
 DESCR("join selectivity of ILIKE");
-DATA(insert OID = 1817 ( icnlikejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  icnlikejoinsel - _null_ ));
+DATA(insert OID = 1817 ( icnlikejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  icnlikejoinsel - _null_ _null_ ));
 DESCR("join selectivity of NOT ILIKE");
-DATA(insert OID = 1818 ( regexeqsel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  regexeqsel - _null_ ));
+DATA(insert OID = 1818 ( regexeqsel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  regexeqsel - _null_ _null_ ));
 DESCR("restriction selectivity of regex match");
-DATA(insert OID = 1819 ( likesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  likesel - _null_ ));
+DATA(insert OID = 1819 ( likesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  likesel - _null_ _null_ ));
 DESCR("restriction selectivity of LIKE");
-DATA(insert OID = 1820 ( icregexeqsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  icregexeqsel - _null_ ));
+DATA(insert OID = 1820 ( icregexeqsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  icregexeqsel - _null_ _null_ ));
 DESCR("restriction selectivity of case-insensitive regex match");
-DATA(insert OID = 1821 ( regexnesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  regexnesel - _null_ ));
+DATA(insert OID = 1821 ( regexnesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  regexnesel - _null_ _null_ ));
 DESCR("restriction selectivity of regex non-match");
-DATA(insert OID = 1822 ( nlikesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  nlikesel - _null_ ));
+DATA(insert OID = 1822 ( nlikesel			PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  nlikesel - _null_ _null_ ));
 DESCR("restriction selectivity of NOT LIKE");
-DATA(insert OID = 1823 ( icregexnesel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  icregexnesel - _null_ ));
+DATA(insert OID = 1823 ( icregexnesel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 23" _null_ _null_ _null_  icregexnesel - _null_ _null_ ));
 DESCR("restriction selectivity of case-insensitive regex non-match");
-DATA(insert OID = 1824 ( regexeqjoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  regexeqjoinsel - _null_ ));
+DATA(insert OID = 1824 ( regexeqjoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  regexeqjoinsel - _null_ _null_ ));
 DESCR("join selectivity of regex match");
-DATA(insert OID = 1825 ( likejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  likejoinsel - _null_ ));
+DATA(insert OID = 1825 ( likejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  likejoinsel - _null_ _null_ ));
 DESCR("join selectivity of LIKE");
-DATA(insert OID = 1826 ( icregexeqjoinsel	PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  icregexeqjoinsel - _null_ ));
+DATA(insert OID = 1826 ( icregexeqjoinsel	PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  icregexeqjoinsel - _null_ _null_ ));
 DESCR("join selectivity of case-insensitive regex match");
-DATA(insert OID = 1827 ( regexnejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  regexnejoinsel - _null_ ));
+DATA(insert OID = 1827 ( regexnejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  regexnejoinsel - _null_ _null_ ));
 DESCR("join selectivity of regex non-match");
-DATA(insert OID = 1828 ( nlikejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  nlikejoinsel - _null_ ));
+DATA(insert OID = 1828 ( nlikejoinsel		PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  nlikejoinsel - _null_ _null_ ));
 DESCR("join selectivity of NOT LIKE");
-DATA(insert OID = 1829 ( icregexnejoinsel	PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  icregexnejoinsel - _null_ ));
+DATA(insert OID = 1829 ( icregexnejoinsel	PGNSP PGUID 12 1 0 f f t f s 4 701 "2281 26 2281 21" _null_ _null_ _null_  icregexnejoinsel - _null_ _null_ ));
 DESCR("join selectivity of case-insensitive regex non-match");
 
 /* Aggregate-related functions */
-DATA(insert OID = 1830 (  float8_avg	   PGNSP PGUID 12 1 0 f f t f i 1 701 "17" _null_ _null_ _null_ float8_avg - _null_ ));
+DATA(insert OID = 1830 (  float8_avg	   PGNSP PGUID 12 1 0 f f t f i 1 701 "17" _null_ _null_ _null_ float8_avg - _null_ _null_ ));
 DESCR("AVG aggregate final function");
-DATA(insert OID = 2512 (  float8_var_pop   PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_var_pop - _null_ ));
+DATA(insert OID = 2512 (  float8_var_pop   PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_var_pop - _null_ _null_ ));
 DESCR("VAR_POP aggregate final function");
-DATA(insert OID = 1831 (  float8_var_samp  PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_var_samp - _null_ ));
+DATA(insert OID = 1831 (  float8_var_samp  PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_var_samp - _null_ _null_ ));
 DESCR("VAR_SAMP aggregate final function");
-DATA(insert OID = 2513 (  float8_stddev_pop PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_stddev_pop - _null_ ));
+DATA(insert OID = 2513 (  float8_stddev_pop PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_stddev_pop - _null_ _null_ ));
 DESCR("STDDEV_POP aggregate final function");
-DATA(insert OID = 1832 (  float8_stddev_samp	PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_stddev_samp - _null_ ));
+DATA(insert OID = 1832 (  float8_stddev_samp	PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_stddev_samp - _null_ _null_ ));
 DESCR("STDDEV_SAMP aggregate final function");
-DATA(insert OID = 1833 (  numeric_accum    PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 1700" _null_ _null_ _null_ numeric_accum - _null_ ));
+DATA(insert OID = 1833 (  numeric_accum    PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 1700" _null_ _null_ _null_ numeric_accum - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1834 (  int2_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 21" _null_ _null_ _null_ int2_accum - _null_ ));
+DATA(insert OID = 1834 (  int2_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 21" _null_ _null_ _null_ int2_accum - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1835 (  int4_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 23" _null_ _null_ _null_ int4_accum - _null_ ));
+DATA(insert OID = 1835 (  int4_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 23" _null_ _null_ _null_ int4_accum - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1836 (  int8_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 20" _null_ _null_ _null_ int8_accum - _null_ ));
+DATA(insert OID = 1836 (  int8_accum	   PGNSP PGUID 12 1 0 f f t f i 2 1231 "1231 20" _null_ _null_ _null_ int8_accum - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1837 (  numeric_avg	   PGNSP PGUID 12 1 0 f f t f i 1 1700 "17" _null_ _null_ _null_  numeric_avg - _null_ ));
+DATA(insert OID = 1837 (  numeric_avg	   PGNSP PGUID 12 1 0 f f t f i 1 1700 "17" _null_ _null_ _null_  numeric_avg - _null_ _null_ ));
 DESCR("AVG aggregate final function");
-DATA(insert OID = 2514 (  numeric_var_pop  PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_	numeric_var_pop - _null_ ));
+DATA(insert OID = 2514 (  numeric_var_pop  PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_	numeric_var_pop - _null_ _null_ ));
 DESCR("VAR_POP aggregate final function");
-DATA(insert OID = 1838 (  numeric_var_samp PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_	numeric_var_samp - _null_ ));
+DATA(insert OID = 1838 (  numeric_var_samp PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_	numeric_var_samp - _null_ _null_ ));
 DESCR("VAR_SAMP aggregate final function");
-DATA(insert OID = 2596 (  numeric_stddev_pop PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_	numeric_stddev_pop - _null_ ));
+DATA(insert OID = 2596 (  numeric_stddev_pop PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_	numeric_stddev_pop - _null_ _null_ ));
 DESCR("STDDEV_POP aggregate final function");
-DATA(insert OID = 1839 (  numeric_stddev_samp	PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_ numeric_stddev_samp - _null_ ));
+DATA(insert OID = 1839 (  numeric_stddev_samp	PGNSP PGUID 12 1 0 f f t f i 1 1700 "1231" _null_ _null_ _null_ numeric_stddev_samp - _null_ _null_ ));
 DESCR("STDDEV_SAMP aggregate final function");
-DATA(insert OID = 1840 (  int2_sum		   PGNSP PGUID 12 1 0 f f f f i 2 20 "20 21" _null_ _null_ _null_ int2_sum - _null_ ));
+DATA(insert OID = 1840 (  int2_sum		   PGNSP PGUID 12 1 0 f f f f i 2 20 "20 21" _null_ _null_ _null_ int2_sum - _null_ _null_ ));
 DESCR("SUM(int2) transition function");
-DATA(insert OID = 1841 (  int4_sum		   PGNSP PGUID 12 1 0 f f f f i 2 20 "20 23" _null_ _null_ _null_ int4_sum - _null_ ));
+DATA(insert OID = 1841 (  int4_sum		   PGNSP PGUID 12 1 0 f f f f i 2 20 "20 23" _null_ _null_ _null_ int4_sum - _null_ _null_ ));
 DESCR("SUM(int4) transition function");
-DATA(insert OID = 1842 (  int8_sum		   PGNSP PGUID 12 1 0 f f f f i 2 1700 "1700 20" _null_ _null_ _null_ int8_sum - _null_ ));
+DATA(insert OID = 1842 (  int8_sum		   PGNSP PGUID 12 1 0 f f f f i 2 1700 "1700 20" _null_ _null_ _null_ int8_sum - _null_ _null_ ));
 DESCR("SUM(int8) transition function");
-DATA(insert OID = 1843 (  interval_accum   PGNSP PGUID 12 1 0 f f t f i 2 1187 "1187 1186" _null_ _null_ _null_ interval_accum - _null_ ));
+DATA(insert OID = 1843 (  interval_accum   PGNSP PGUID 12 1 0 f f t f i 2 1187 "1187 1186" _null_ _null_ _null_ interval_accum - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 1844 (  interval_avg	   PGNSP PGUID 12 1 0 f f t f i 1 1186 "1187" _null_ _null_ _null_	interval_avg - _null_ ));
+DATA(insert OID = 1844 (  interval_avg	   PGNSP PGUID 12 1 0 f f t f i 1 1186 "1187" _null_ _null_ _null_	interval_avg - _null_ _null_ ));
 DESCR("AVG aggregate final function");
-DATA(insert OID = 1962 (  int2_avg_accum   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 21" _null_ _null_ _null_ int2_avg_accum - _null_ ));
+DATA(insert OID = 1962 (  int2_avg_accum   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 21" _null_ _null_ _null_ int2_avg_accum - _null_ _null_ ));
 DESCR("AVG(int2) transition function");
-DATA(insert OID = 1963 (  int4_avg_accum   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 23" _null_ _null_ _null_ int4_avg_accum - _null_ ));
+DATA(insert OID = 1963 (  int4_avg_accum   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 23" _null_ _null_ _null_ int4_avg_accum - _null_ _null_ ));
 DESCR("AVG(int4) transition function");
-DATA(insert OID = 1964 (  int8_avg		   PGNSP PGUID 12 1 0 f f t f i 1 1700 "17" _null_ _null_ _null_ int8_avg - _null_ ));
+DATA(insert OID = 1964 (  int8_avg		   PGNSP PGUID 12 1 0 f f t f i 1 1700 "17" _null_ _null_ _null_ int8_avg - _null_ _null_ ));
 DESCR("AVG(int) aggregate final function");
-DATA(insert OID = 2805 (  int8inc_float8_float8		PGNSP PGUID 12 1 0 f f t f i 3 20 "20 701 701" _null_ _null_ _null_ int8inc_float8_float8 - _null_ ));
+DATA(insert OID = 2805 (  int8inc_float8_float8		PGNSP PGUID 12 1 0 f f t f i 3 20 "20 701 701" _null_ _null_ _null_ int8inc_float8_float8 - _null_ _null_ ));
 DESCR("REGR_COUNT(double, double) transition function");
-DATA(insert OID = 2806 (  float8_regr_accum			PGNSP PGUID 12 1 0 f f t f i 3 1022 "1022 701 701" _null_ _null_ _null_ float8_regr_accum - _null_ ));
+DATA(insert OID = 2806 (  float8_regr_accum			PGNSP PGUID 12 1 0 f f t f i 3 1022 "1022 701 701" _null_ _null_ _null_ float8_regr_accum - _null_ _null_ ));
 DESCR("REGR_...(double, double) transition function");
-DATA(insert OID = 2807 (  float8_regr_sxx			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_sxx - _null_ ));
+DATA(insert OID = 2807 (  float8_regr_sxx			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_sxx - _null_ _null_ ));
 DESCR("REGR_SXX(double, double) aggregate final function");
-DATA(insert OID = 2808 (  float8_regr_syy			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_syy - _null_ ));
+DATA(insert OID = 2808 (  float8_regr_syy			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_syy - _null_ _null_ ));
 DESCR("REGR_SYY(double, double) aggregate final function");
-DATA(insert OID = 2809 (  float8_regr_sxy			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_sxy - _null_ ));
+DATA(insert OID = 2809 (  float8_regr_sxy			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_sxy - _null_ _null_ ));
 DESCR("REGR_SXY(double, double) aggregate final function");
-DATA(insert OID = 2810 (  float8_regr_avgx			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_avgx - _null_ ));
+DATA(insert OID = 2810 (  float8_regr_avgx			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_avgx - _null_ _null_ ));
 DESCR("REGR_AVGX(double, double) aggregate final function");
-DATA(insert OID = 2811 (  float8_regr_avgy			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_avgy - _null_ ));
+DATA(insert OID = 2811 (  float8_regr_avgy			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_avgy - _null_ _null_ ));
 DESCR("REGR_AVGY(double, double) aggregate final function");
-DATA(insert OID = 2812 (  float8_regr_r2			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_r2 - _null_ ));
+DATA(insert OID = 2812 (  float8_regr_r2			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_r2 - _null_ _null_ ));
 DESCR("REGR_R2(double, double) aggregate final function");
-DATA(insert OID = 2813 (  float8_regr_slope			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_slope - _null_ ));
+DATA(insert OID = 2813 (  float8_regr_slope			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_slope - _null_ _null_ ));
 DESCR("REGR_SLOPE(double, double) aggregate final function");
-DATA(insert OID = 2814 (  float8_regr_intercept		PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_intercept - _null_ ));
+DATA(insert OID = 2814 (  float8_regr_intercept		PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_regr_intercept - _null_ _null_ ));
 DESCR("REGR_INTERCEPT(double, double) aggregate final function");
-DATA(insert OID = 2815 (  float8_covar_pop			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_covar_pop - _null_ ));
+DATA(insert OID = 2815 (  float8_covar_pop			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_covar_pop - _null_ _null_ ));
 DESCR("COVAR_POP(double, double) aggregate final function");
-DATA(insert OID = 2816 (  float8_covar_samp			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_covar_samp - _null_ ));
+DATA(insert OID = 2816 (  float8_covar_samp			PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_covar_samp - _null_ _null_ ));
 DESCR("COVAR_SAMP(double, double) aggregate final function");
-DATA(insert OID = 2817 (  float8_corr				PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_corr - _null_ ));
+DATA(insert OID = 2817 (  float8_corr				PGNSP PGUID 12 1 0 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_corr - _null_ _null_ ));
 DESCR("CORR(double, double) aggregate final function");
 
 /* To ASCII conversion */
-DATA(insert OID = 1845 ( to_ascii	PGNSP PGUID 12 1 0 f f t f i 1	25 "25" _null_ _null_ _null_	to_ascii_default - _null_ ));
+DATA(insert OID = 1845 ( to_ascii	PGNSP PGUID 12 1 0 f f t f i 1	25 "25" _null_ _null_ _null_	to_ascii_default - _null_ _null_ ));
 DESCR("encode text from DB encoding to ASCII text");
-DATA(insert OID = 1846 ( to_ascii	PGNSP PGUID 12 1 0 f f t f i 2	25 "25 23" _null_ _null_ _null_ to_ascii_enc - _null_ ));
+DATA(insert OID = 1846 ( to_ascii	PGNSP PGUID 12 1 0 f f t f i 2	25 "25 23" _null_ _null_ _null_ to_ascii_enc - _null_ _null_ ));
 DESCR("encode text from encoding to ASCII text");
-DATA(insert OID = 1847 ( to_ascii	PGNSP PGUID 12 1 0 f f t f i 2	25 "25 19" _null_ _null_ _null_ to_ascii_encname - _null_ ));
+DATA(insert OID = 1847 ( to_ascii	PGNSP PGUID 12 1 0 f f t f i 2	25 "25 19" _null_ _null_ _null_ to_ascii_encname - _null_ _null_ ));
 DESCR("encode text from encoding to ASCII text");
 
-DATA(insert OID = 1848 ( interval_pl_time	PGNSP PGUID 14 1 0 0 f f t f i 2 0 1083 f "1186 1083" _null_ _null_ _null_ _null_	"select $2 + $1" - _null_ c ));
+DATA(insert OID = 1848 ( interval_pl_time	PGNSP PGUID 14 1 0 0 f f t f i 2 0 1083 f "1186 1083" _null_ _null_ _null_ _null_	"select $2 + $1" - _null_ _null_ c ));
 DESCR("plus");
 
-DATA(insert OID = 1850 (  int28eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28eq - _null_ ));
+DATA(insert OID = 1850 (  int28eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1851 (  int28ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28ne - _null_ ));
+DATA(insert OID = 1851 (  int28ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1852 (  int28lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28lt - _null_ ));
+DATA(insert OID = 1852 (  int28lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1853 (  int28gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28gt - _null_ ));
+DATA(insert OID = 1853 (  int28gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1854 (  int28le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28le - _null_ ));
+DATA(insert OID = 1854 (  int28le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1855 (  int28ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28ge - _null_ ));
+DATA(insert OID = 1855 (  int28ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "21 20" _null_ _null_ _null_ int28ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 1856 (  int82eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82eq - _null_ ));
+DATA(insert OID = 1856 (  int82eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1857 (  int82ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82ne - _null_ ));
+DATA(insert OID = 1857 (  int82ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1858 (  int82lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82lt - _null_ ));
+DATA(insert OID = 1858 (  int82lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1859 (  int82gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82gt - _null_ ));
+DATA(insert OID = 1859 (  int82gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1860 (  int82le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82le - _null_ ));
+DATA(insert OID = 1860 (  int82le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1861 (  int82ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82ge - _null_ ));
+DATA(insert OID = 1861 (  int82ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "20 21" _null_ _null_ _null_ int82ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
 
-DATA(insert OID = 1892 (  int2and		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2and - _null_ ));
+DATA(insert OID = 1892 (  int2and		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2and - _null_ _null_ ));
 DESCR("bitwise and");
-DATA(insert OID = 1893 (  int2or		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2or - _null_ ));
+DATA(insert OID = 1893 (  int2or		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2or - _null_ _null_ ));
 DESCR("bitwise or");
-DATA(insert OID = 1894 (  int2xor		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2xor - _null_ ));
+DATA(insert OID = 1894 (  int2xor		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 21" _null_ _null_ _null_ int2xor - _null_ _null_ ));
 DESCR("bitwise xor");
-DATA(insert OID = 1895 (  int2not		   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2not - _null_ ));
+DATA(insert OID = 1895 (  int2not		   PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_	int2not - _null_ _null_ ));
 DESCR("bitwise not");
-DATA(insert OID = 1896 (  int2shl		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 23" _null_ _null_ _null_ int2shl - _null_ ));
+DATA(insert OID = 1896 (  int2shl		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 23" _null_ _null_ _null_ int2shl - _null_ _null_ ));
 DESCR("bitwise shift left");
-DATA(insert OID = 1897 (  int2shr		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 23" _null_ _null_ _null_ int2shr - _null_ ));
+DATA(insert OID = 1897 (  int2shr		   PGNSP PGUID 12 1 0 f f t f i 2 21 "21 23" _null_ _null_ _null_ int2shr - _null_ _null_ ));
 DESCR("bitwise shift right");
 
-DATA(insert OID = 1898 (  int4and		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4and - _null_ ));
+DATA(insert OID = 1898 (  int4and		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4and - _null_ _null_ ));
 DESCR("bitwise and");
-DATA(insert OID = 1899 (  int4or		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4or - _null_ ));
+DATA(insert OID = 1899 (  int4or		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4or - _null_ _null_ ));
 DESCR("bitwise or");
-DATA(insert OID = 1900 (  int4xor		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4xor - _null_ ));
+DATA(insert OID = 1900 (  int4xor		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4xor - _null_ _null_ ));
 DESCR("bitwise xor");
-DATA(insert OID = 1901 (  int4not		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4not - _null_ ));
+DATA(insert OID = 1901 (  int4not		   PGNSP PGUID 12 1 0 f f t f i 1 23 "23" _null_ _null_ _null_	int4not - _null_ _null_ ));
 DESCR("bitwise not");
-DATA(insert OID = 1902 (  int4shl		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4shl - _null_ ));
+DATA(insert OID = 1902 (  int4shl		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4shl - _null_ _null_ ));
 DESCR("bitwise shift left");
-DATA(insert OID = 1903 (  int4shr		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4shr - _null_ ));
+DATA(insert OID = 1903 (  int4shr		   PGNSP PGUID 12 1 0 f f t f i 2 23 "23 23" _null_ _null_ _null_ int4shr - _null_ _null_ ));
 DESCR("bitwise shift right");
 
-DATA(insert OID = 1904 (  int8and		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8and - _null_ ));
+DATA(insert OID = 1904 (  int8and		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8and - _null_ _null_ ));
 DESCR("bitwise and");
-DATA(insert OID = 1905 (  int8or		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8or - _null_ ));
+DATA(insert OID = 1905 (  int8or		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8or - _null_ _null_ ));
 DESCR("bitwise or");
-DATA(insert OID = 1906 (  int8xor		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8xor - _null_ ));
+DATA(insert OID = 1906 (  int8xor		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 20" _null_ _null_ _null_ int8xor - _null_ _null_ ));
 DESCR("bitwise xor");
-DATA(insert OID = 1907 (  int8not		   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8not - _null_ ));
+DATA(insert OID = 1907 (  int8not		   PGNSP PGUID 12 1 0 f f t f i 1 20 "20" _null_ _null_ _null_	int8not - _null_ _null_ ));
 DESCR("bitwise not");
-DATA(insert OID = 1908 (  int8shl		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int8shl - _null_ ));
+DATA(insert OID = 1908 (  int8shl		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int8shl - _null_ _null_ ));
 DESCR("bitwise shift left");
-DATA(insert OID = 1909 (  int8shr		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int8shr - _null_ ));
+DATA(insert OID = 1909 (  int8shr		   PGNSP PGUID 12 1 0 f f t f i 2 20 "20 23" _null_ _null_ _null_ int8shr - _null_ _null_ ));
 DESCR("bitwise shift right");
 
-DATA(insert OID = 1910 (  int8up		   PGNSP PGUID 12 1 0 f f t f i 1 20	"20" _null_ _null_ _null_ int8up - _null_ ));
+DATA(insert OID = 1910 (  int8up		   PGNSP PGUID 12 1 0 f f t f i 1 20	"20" _null_ _null_ _null_ int8up - _null_ _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1911 (  int2up		   PGNSP PGUID 12 1 0 f f t f i 1 21	"21" _null_ _null_ _null_ int2up - _null_ ));
+DATA(insert OID = 1911 (  int2up		   PGNSP PGUID 12 1 0 f f t f i 1 21	"21" _null_ _null_ _null_ int2up - _null_ _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1912 (  int4up		   PGNSP PGUID 12 1 0 f f t f i 1 23	"23" _null_ _null_ _null_ int4up - _null_ ));
+DATA(insert OID = 1912 (  int4up		   PGNSP PGUID 12 1 0 f f t f i 1 23	"23" _null_ _null_ _null_ int4up - _null_ _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1913 (  float4up		   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_		float4up - _null_ ));
+DATA(insert OID = 1913 (  float4up		   PGNSP PGUID 12 1 0 f f t f i 1 700 "700" _null_ _null_ _null_		float4up - _null_ _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1914 (  float8up		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_		float8up - _null_ ));
+DATA(insert OID = 1914 (  float8up		   PGNSP PGUID 12 1 0 f f t f i 1 701 "701" _null_ _null_ _null_		float8up - _null_ _null_ ));
 DESCR("unary plus");
-DATA(insert OID = 1915 (  numeric_uplus    PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_	numeric_uplus - _null_ ));
+DATA(insert OID = 1915 (  numeric_uplus    PGNSP PGUID 12 1 0 f f t f i 1 1700 "1700" _null_ _null_ _null_	numeric_uplus - _null_ _null_ ));
 DESCR("unary plus");
 
-DATA(insert OID = 1922 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_table_privilege_name_name - _null_ ));
+DATA(insert OID = 1922 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_table_privilege_name_name - _null_ _null_ ));
 DESCR("user privilege on relation by username, rel name");
-DATA(insert OID = 1923 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_table_privilege_name_id - _null_ ));
+DATA(insert OID = 1923 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_table_privilege_name_id - _null_ _null_ ));
 DESCR("user privilege on relation by username, rel oid");
-DATA(insert OID = 1924 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_table_privilege_id_name - _null_ ));
+DATA(insert OID = 1924 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_table_privilege_id_name - _null_ _null_ ));
 DESCR("user privilege on relation by user oid, rel name");
-DATA(insert OID = 1925 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_table_privilege_id_id - _null_ ));
+DATA(insert OID = 1925 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_table_privilege_id_id - _null_ _null_ ));
 DESCR("user privilege on relation by user oid, rel oid");
-DATA(insert OID = 1926 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_table_privilege_name - _null_ ));
+DATA(insert OID = 1926 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_table_privilege_name - _null_ _null_ ));
 DESCR("current user privilege on relation by rel name");
-DATA(insert OID = 1927 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_table_privilege_id - _null_ ));
+DATA(insert OID = 1927 (  has_table_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_table_privilege_id - _null_ _null_ ));
 DESCR("current user privilege on relation by rel oid");
 
 
-DATA(insert OID = 1928 (  pg_stat_get_numscans			PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_numscans - _null_ ));
-DESCR("Statistics: Number of scans done for table/index");
-DATA(insert OID = 1929 (  pg_stat_get_tuples_returned	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_returned - _null_ ));
-DESCR("Statistics: Number of tuples read by seqscan");
-DATA(insert OID = 1930 (  pg_stat_get_tuples_fetched	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_fetched - _null_ ));
-DESCR("Statistics: Number of tuples fetched by idxscan");
-DATA(insert OID = 1931 (  pg_stat_get_tuples_inserted	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_inserted - _null_ ));
-DESCR("Statistics: Number of tuples inserted");
-DATA(insert OID = 1932 (  pg_stat_get_tuples_updated	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_updated - _null_ ));
-DESCR("Statistics: Number of tuples updated");
-DATA(insert OID = 1933 (  pg_stat_get_tuples_deleted	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_deleted - _null_ ));
-DESCR("Statistics: Number of tuples deleted");
-DATA(insert OID = 2878 (  pg_stat_get_live_tuples	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_live_tuples - _null_ ));
-DESCR("Statistics: Number of live tuples");
-DATA(insert OID = 2879 (  pg_stat_get_dead_tuples	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_dead_tuples - _null_ ));
-DESCR("Statistics: Number of dead tuples");
-DATA(insert OID = 1934 (  pg_stat_get_blocks_fetched	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_blocks_fetched - _null_ ));
-DESCR("Statistics: Number of blocks fetched");
-DATA(insert OID = 1935 (  pg_stat_get_blocks_hit		PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_blocks_hit - _null_ ));
-DESCR("Statistics: Number of blocks found in cache");
-DATA(insert OID = 2781 (  pg_stat_get_last_vacuum_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_vacuum_time - _null_));
-DESCR("Statistics: Last manual vacuum time for a table");
-DATA(insert OID = 2782 (  pg_stat_get_last_autovacuum_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_autovacuum_time - _null_));
-DESCR("Statistics: Last auto vacuum time for a table");
-DATA(insert OID = 2783 (  pg_stat_get_last_analyze_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_analyze_time - _null_));
-DESCR("Statistics: Last manual analyze time for a table");
-DATA(insert OID = 2784 (  pg_stat_get_last_autoanalyze_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_autoanalyze_time - _null_));
-DESCR("Statistics: Last auto analyze time for a table");
-DATA(insert OID = 1936 (  pg_stat_get_backend_idset		PGNSP PGUID 12 1 100 f f t t s 0 23 "" _null_ _null_ _null_ pg_stat_get_backend_idset - _null_ ));
-DESCR("Statistics: Currently active backend IDs");
-DATA(insert OID = 2026 (  pg_backend_pid				PGNSP PGUID 12 1 0 f f t f s 0 23 "" _null_ _null_ _null_ pg_backend_pid - _null_ ));
-DESCR("Statistics: Current backend PID");
-DATA(insert OID = 1937 (  pg_stat_get_backend_pid		PGNSP PGUID 12 1 0 f f t f s 1 23 "23" _null_ _null_ _null_ pg_stat_get_backend_pid - _null_ ));
-DESCR("Statistics: PID of backend");
-DATA(insert OID = 1938 (  pg_stat_get_backend_dbid		PGNSP PGUID 12 1 0 f f t f s 1 26 "23" _null_ _null_ _null_ pg_stat_get_backend_dbid - _null_ ));
-DESCR("Statistics: Database ID of backend");
-DATA(insert OID = 1939 (  pg_stat_get_backend_userid	PGNSP PGUID 12 1 0 f f t f s 1 26 "23" _null_ _null_ _null_ pg_stat_get_backend_userid - _null_ ));
-DESCR("Statistics: User ID of backend");
-DATA(insert OID = 1940 (  pg_stat_get_backend_activity	PGNSP PGUID 12 1 0 f f t f s 1 25 "23" _null_ _null_ _null_ pg_stat_get_backend_activity - _null_ ));
-DESCR("Statistics: Current query of backend");
-DATA(insert OID = 2853 (  pg_stat_get_backend_waiting	PGNSP PGUID 12 1 0 f f t f s 1 16 "23" _null_ _null_ _null_ pg_stat_get_backend_waiting - _null_ ));
-DESCR("Statistics: Is backend currently waiting for a lock");
-DATA(insert OID = 2094 (  pg_stat_get_backend_activity_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_	pg_stat_get_backend_activity_start - _null_));
-DESCR("Statistics: Start time for current query of backend");
-DATA(insert OID = 2857 (  pg_stat_get_backend_txn_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_	pg_stat_get_backend_xact_start - _null_));
-DESCR("Statistics: Start time for backend's current transaction");
-DATA(insert OID = 1391 ( pg_stat_get_backend_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_ pg_stat_get_backend_start - _null_));
-DESCR("Statistics: Start time for current backend session");
-DATA(insert OID = 1392 ( pg_stat_get_backend_client_addr PGNSP PGUID 12 1 0 f f t f s 1 869 "23" _null_ _null_ _null_ pg_stat_get_backend_client_addr - _null_));
-DESCR("Statistics: Address of client connected to backend");
-DATA(insert OID = 1393 ( pg_stat_get_backend_client_port PGNSP PGUID 12 1 0 f f t f s 1 23 "23" _null_ _null_ _null_ pg_stat_get_backend_client_port - _null_));
-DESCR("Statistics: Port number of client connected to backend");
-DATA(insert OID = 1941 (  pg_stat_get_db_numbackends	PGNSP PGUID 12 1 0 f f t f s 1 23 "26" _null_ _null_ _null_ pg_stat_get_db_numbackends - _null_ ));
-DESCR("Statistics: Number of backends in database");
-DATA(insert OID = 1942 (  pg_stat_get_db_xact_commit	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_xact_commit - _null_ ));
-DESCR("Statistics: Transactions committed");
-DATA(insert OID = 1943 (  pg_stat_get_db_xact_rollback	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_xact_rollback - _null_ ));
-DESCR("Statistics: Transactions rolled back");
-DATA(insert OID = 1944 (  pg_stat_get_db_blocks_fetched PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_blocks_fetched - _null_ ));
-DESCR("Statistics: Blocks fetched for database");
-DATA(insert OID = 1945 (  pg_stat_get_db_blocks_hit		PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_blocks_hit - _null_ ));
-DESCR("Statistics: Blocks found in cache for database");
-DATA(insert OID = 2230 (  pg_stat_clear_snapshot		PGNSP PGUID 12 1 0 f f f f v 0 2278  "" _null_ _null_ _null_	pg_stat_clear_snapshot - _null_ ));
-DESCR("Statistics: Discard current transaction's statistics snapshot");
-DATA(insert OID = 2274 (  pg_stat_reset					PGNSP PGUID 12 1 0 f f f f v 0 2278  "" _null_ _null_ _null_	pg_stat_reset - _null_ ));
-DESCR("Statistics: Reset collected statistics for current database");
-
-DATA(insert OID = 1946 (  encode						PGNSP PGUID 12 1 0 f f t f i 2 25 "17 25" _null_ _null_ _null_	binary_encode - _null_ ));
-DESCR("Convert bytea value into some ascii-only text string");
-DATA(insert OID = 1947 (  decode						PGNSP PGUID 12 1 0 f f t f i 2 17 "25 25" _null_ _null_ _null_	binary_decode - _null_ ));
-DESCR("Convert ascii-encoded text string into bytea value");
-
-DATA(insert OID = 1948 (  byteaeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteaeq - _null_ ));
+DATA(insert OID = 1928 (  pg_stat_get_numscans			PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_numscans - _null_ _null_ ));
+DESCR("statistics: number of scans done for table/index");
+DATA(insert OID = 1929 (  pg_stat_get_tuples_returned	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_returned - _null_ _null_ ));
+DESCR("statistics: number of tuples read by seqscan");
+DATA(insert OID = 1930 (  pg_stat_get_tuples_fetched	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_fetched - _null_ _null_ ));
+DESCR("statistics: number of tuples fetched by idxscan");
+DATA(insert OID = 1931 (  pg_stat_get_tuples_inserted	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_inserted - _null_ _null_ ));
+DESCR("statistics: number of tuples inserted");
+DATA(insert OID = 1932 (  pg_stat_get_tuples_updated	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_updated - _null_ _null_ ));
+DESCR("statistics: number of tuples updated");
+DATA(insert OID = 1933 (  pg_stat_get_tuples_deleted	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_deleted - _null_ _null_ ));
+DESCR("statistics: number of tuples deleted");
+DATA(insert OID = 1972 (  pg_stat_get_tuples_hot_updated PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_tuples_hot_updated - _null_ _null_ ));
+DESCR("statistics: number of tuples hot updated");
+DATA(insert OID = 2878 (  pg_stat_get_live_tuples	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_live_tuples - _null_ _null_ ));
+DESCR("statistics: number of live tuples");
+DATA(insert OID = 2879 (  pg_stat_get_dead_tuples	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_dead_tuples - _null_ _null_ ));
+DESCR("statistics: number of dead tuples");
+DATA(insert OID = 1934 (  pg_stat_get_blocks_fetched	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_blocks_fetched - _null_ _null_ ));
+DESCR("statistics: number of blocks fetched");
+DATA(insert OID = 1935 (  pg_stat_get_blocks_hit		PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_blocks_hit - _null_ _null_ ));
+DESCR("statistics: number of blocks found in cache");
+DATA(insert OID = 2781 (  pg_stat_get_last_vacuum_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_vacuum_time - _null_ _null_ ));
+DESCR("statistics: last manual vacuum time for a table");
+DATA(insert OID = 2782 (  pg_stat_get_last_autovacuum_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_autovacuum_time - _null_ _null_ ));
+DESCR("statistics: last auto vacuum time for a table");
+DATA(insert OID = 2783 (  pg_stat_get_last_analyze_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_analyze_time - _null_ _null_ ));
+DESCR("statistics: last manual analyze time for a table");
+DATA(insert OID = 2784 (  pg_stat_get_last_autoanalyze_time PGNSP PGUID 12 1 0 f f t f s 1 1184 "26" _null_ _null_ _null_	pg_stat_get_last_autoanalyze_time - _null_ _null_ ));
+DESCR("statistics: last auto analyze time for a table");
+DATA(insert OID = 1936 (  pg_stat_get_backend_idset		PGNSP PGUID 12 1 100 f f t t s 0 23 "" _null_ _null_ _null_ pg_stat_get_backend_idset - _null_ _null_ ));
+DESCR("statistics: currently active backend IDs");
+DATA(insert OID = 2026 (  pg_backend_pid				PGNSP PGUID 12 1 0 f f t f s 0 23 "" _null_ _null_ _null_ pg_backend_pid - _null_ _null_ ));
+DESCR("statistics: current backend PID");
+DATA(insert OID = 1937 (  pg_stat_get_backend_pid		PGNSP PGUID 12 1 0 f f t f s 1 23 "23" _null_ _null_ _null_ pg_stat_get_backend_pid - _null_ _null_ ));
+DESCR("statistics: PID of backend");
+DATA(insert OID = 1938 (  pg_stat_get_backend_dbid		PGNSP PGUID 12 1 0 f f t f s 1 26 "23" _null_ _null_ _null_ pg_stat_get_backend_dbid - _null_ _null_ ));
+DESCR("statistics: database ID of backend");
+DATA(insert OID = 1939 (  pg_stat_get_backend_userid	PGNSP PGUID 12 1 0 f f t f s 1 26 "23" _null_ _null_ _null_ pg_stat_get_backend_userid - _null_ _null_ ));
+DESCR("statistics: user ID of backend");
+DATA(insert OID = 1940 (  pg_stat_get_backend_activity	PGNSP PGUID 12 1 0 f f t f s 1 25 "23" _null_ _null_ _null_ pg_stat_get_backend_activity - _null_ _null_ ));
+DESCR("statistics: current query of backend");
+DATA(insert OID = 2853 (  pg_stat_get_backend_waiting	PGNSP PGUID 12 1 0 f f t f s 1 16 "23" _null_ _null_ _null_ pg_stat_get_backend_waiting - _null_ _null_ ));
+DESCR("statistics: is backend currently waiting for a lock");
+DATA(insert OID = 2094 (  pg_stat_get_backend_activity_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_	pg_stat_get_backend_activity_start - _null_ _null_ ));
+DESCR("statistics: start time for current query of backend");
+DATA(insert OID = 2857 (  pg_stat_get_backend_txn_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_	pg_stat_get_backend_xact_start - _null_ _null_ ));
+DESCR("statistics: start time for backend's current transaction");
+DATA(insert OID = 1391 ( pg_stat_get_backend_start PGNSP PGUID 12 1 0 f f t f s 1 1184 "23" _null_ _null_ _null_ pg_stat_get_backend_start - _null_ _null_ ));
+DESCR("statistics: start time for current backend session");
+DATA(insert OID = 1392 ( pg_stat_get_backend_client_addr PGNSP PGUID 12 1 0 f f t f s 1 869 "23" _null_ _null_ _null_ pg_stat_get_backend_client_addr - _null_ _null_ ));
+DESCR("statistics: address of client connected to backend");
+DATA(insert OID = 1393 ( pg_stat_get_backend_client_port PGNSP PGUID 12 1 0 f f t f s 1 23 "23" _null_ _null_ _null_ pg_stat_get_backend_client_port - _null_ _null_ ));
+DESCR("statistics: port number of client connected to backend");
+DATA(insert OID = 1941 (  pg_stat_get_db_numbackends	PGNSP PGUID 12 1 0 f f t f s 1 23 "26" _null_ _null_ _null_ pg_stat_get_db_numbackends - _null_ _null_ ));
+DESCR("statistics: number of backends in database");
+DATA(insert OID = 1942 (  pg_stat_get_db_xact_commit	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_xact_commit - _null_ _null_ ));
+DESCR("statistics: transactions committed");
+DATA(insert OID = 1943 (  pg_stat_get_db_xact_rollback	PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_xact_rollback - _null_ _null_ ));
+DESCR("statistics: transactions rolled back");
+DATA(insert OID = 1944 (  pg_stat_get_db_blocks_fetched PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_blocks_fetched - _null_ _null_ ));
+DESCR("statistics: blocks fetched for database");
+DATA(insert OID = 1945 (  pg_stat_get_db_blocks_hit		PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_blocks_hit - _null_ _null_ ));
+DESCR("statistics: blocks found in cache for database");
+DATA(insert OID = 2758 (  pg_stat_get_db_tuples_returned PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_tuples_returned - _null_ _null_ ));
+DESCR("statistics: tuples returned for database");
+DATA(insert OID = 2759 (  pg_stat_get_db_tuples_fetched PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_tuples_fetched - _null_ _null_ ));
+DESCR("statistics: tuples fetched for database");
+DATA(insert OID = 2760 (  pg_stat_get_db_tuples_inserted PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_tuples_inserted - _null_ _null_ ));
+DESCR("statistics: tuples inserted in database");
+DATA(insert OID = 2761 (  pg_stat_get_db_tuples_updated PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_tuples_updated - _null_ _null_ ));
+DESCR("statistics: tuples updated in database");
+DATA(insert OID = 2762 (  pg_stat_get_db_tuples_deleted PGNSP PGUID 12 1 0 f f t f s 1 20 "26" _null_ _null_ _null_ pg_stat_get_db_tuples_deleted - _null_ _null_ ));
+DESCR("statistics: tuples deleted in database");
+DATA(insert OID = 2769 ( pg_stat_get_bgwriter_timed_checkpoints PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_bgwriter_timed_checkpoints - _null_ _null_ ));
+DESCR("statistics: number of timed checkpoints started by the bgwriter");
+DATA(insert OID = 2770 ( pg_stat_get_bgwriter_requested_checkpoints PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_bgwriter_requested_checkpoints - _null_ _null_ ));
+DESCR("statistics: number of backend requested checkpoints started by the bgwriter");
+DATA(insert OID = 2771 ( pg_stat_get_bgwriter_buf_written_checkpoints PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_bgwriter_buf_written_checkpoints - _null_ _null_ ));
+DESCR("statistics: number of buffers written by the bgwriter during checkpoints");
+DATA(insert OID = 2772 ( pg_stat_get_bgwriter_buf_written_clean PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_bgwriter_buf_written_clean - _null_ _null_ ));
+DESCR("statistics: number of buffers written by the bgwriter for cleaning dirty buffers");
+DATA(insert OID = 2773 ( pg_stat_get_bgwriter_maxwritten_clean PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_bgwriter_maxwritten_clean - _null_ _null_ ));
+DESCR("statistics: number of times the bgwriter stopped processing when it had written too many buffers while cleaning");
+DATA(insert OID = 2775 ( pg_stat_get_buf_written_backend PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_buf_written_backend - _null_ _null_ ));
+DESCR("statistics: number of buffers written by backends");
+DATA(insert OID = 2859 ( pg_stat_get_buf_alloc			PGNSP PGUID 12 1 0 f f t f s 0 20 "" _null_ _null_ _null_ pg_stat_get_buf_alloc - _null_ _null_ ));
+DESCR("statistics: number of buffer allocations");
+
+DATA(insert OID = 2230 (  pg_stat_clear_snapshot		PGNSP PGUID 12 1 0 f f f f v 0 2278  "" _null_ _null_ _null_	pg_stat_clear_snapshot - _null_ _null_ ));
+DESCR("statistics: discard current transaction's statistics snapshot");
+DATA(insert OID = 2274 (  pg_stat_reset					PGNSP PGUID 12 1 0 f f f f v 0 2278  "" _null_ _null_ _null_	pg_stat_reset - _null_ _null_ ));
+DESCR("statistics: reset collected statistics for current database");
+
+DATA(insert OID = 1946 (  encode						PGNSP PGUID 12 1 0 f f t f i 2 25 "17 25" _null_ _null_ _null_	binary_encode - _null_ _null_ ));
+DESCR("convert bytea value into some ascii-only text string");
+DATA(insert OID = 1947 (  decode						PGNSP PGUID 12 1 0 f f t f i 2 17 "25 25" _null_ _null_ _null_	binary_decode - _null_ _null_ ));
+DESCR("convert ascii-encoded text string into bytea value");
+
+DATA(insert OID = 1948 (  byteaeq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteaeq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 1949 (  bytealt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ bytealt - _null_ ));
+DATA(insert OID = 1949 (  bytealt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ bytealt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 1950 (  byteale		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteale - _null_ ));
+DATA(insert OID = 1950 (  byteale		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteale - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 1951 (  byteagt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteagt - _null_ ));
+DATA(insert OID = 1951 (  byteagt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteagt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 1952 (  byteage		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteage - _null_ ));
+DATA(insert OID = 1952 (  byteage		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteage - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 1953 (  byteane		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteane - _null_ ));
+DATA(insert OID = 1953 (  byteane		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteane - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 1954 (  byteacmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 17" _null_ _null_ _null_ byteacmp - _null_ ));
+DATA(insert OID = 1954 (  byteacmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 17" _null_ _null_ _null_ byteacmp - _null_ _null_ ));
 DESCR("less-equal-greater");
 
-DATA(insert OID = 1961 (  timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 23" _null_ _null_ _null_ timestamp_scale - _null_ ));
+DATA(insert OID = 1961 (  timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 23" _null_ _null_ _null_ timestamp_scale - _null_ _null_ ));
 DESCR("adjust timestamp precision");
 
-DATA(insert OID = 1965 (  oidlarger		   PGNSP PGUID 12 1 0 f f t f i 2 26 "26 26" _null_ _null_ _null_ oidlarger - _null_ ));
+DATA(insert OID = 1965 (  oidlarger		   PGNSP PGUID 12 1 0 f f t f i 2 26 "26 26" _null_ _null_ _null_ oidlarger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 1966 (  oidsmaller	   PGNSP PGUID 12 1 0 f f t f i 2 26 "26 26" _null_ _null_ _null_ oidsmaller - _null_ ));
+DATA(insert OID = 1966 (  oidsmaller	   PGNSP PGUID 12 1 0 f f t f i 2 26 "26 26" _null_ _null_ _null_ oidsmaller - _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1967 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f i 2 1184 "1184 23" _null_ _null_ _null_ timestamptz_scale - _null_ ));
+DATA(insert OID = 1967 (  timestamptz	   PGNSP PGUID 12 1 0 f f t f i 2 1184 "1184 23" _null_ _null_ _null_ timestamptz_scale - _null_ _null_ ));
 DESCR("adjust timestamptz precision");
-DATA(insert OID = 1968 (  time			   PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 23" _null_ _null_ _null_ time_scale - _null_ ));
+DATA(insert OID = 1968 (  time			   PGNSP PGUID 12 1 0 f f t f i 2 1083 "1083 23" _null_ _null_ _null_ time_scale - _null_ _null_ ));
 DESCR("adjust time precision");
-DATA(insert OID = 1969 (  timetz		   PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 23" _null_ _null_ _null_ timetz_scale - _null_ ));
+DATA(insert OID = 1969 (  timetz		   PGNSP PGUID 12 1 0 f f t f i 2 1266 "1266 23" _null_ _null_ _null_ timetz_scale - _null_ _null_ ));
 DESCR("adjust time with time zone precision");
 
-DATA(insert OID = 2005 (  bytealike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ bytealike - _null_ ));
+DATA(insert OID = 2003 (  textanycat	   PGNSP PGUID 14 1 0 f f t f i 2 25 "25 2776" _null_ _null_ _null_ "select $1 || $2::pg_catalog.text" - _null_ _null_ ));
+DESCR("concatenate");
+DATA(insert OID = 2004 (  anytextcat	   PGNSP PGUID 14 1 0 f f t f i 2 25 "2776 25" _null_ _null_ _null_ "select $1::pg_catalog.text || $2" - _null_ _null_ ));
+DESCR("concatenate");
+
+DATA(insert OID = 2005 (  bytealike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ bytealike - _null_ _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 2006 (  byteanlike	   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteanlike - _null_ ));
+DATA(insert OID = 2006 (  byteanlike	   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteanlike - _null_ _null_ ));
 DESCR("does not match LIKE expression");
-DATA(insert OID = 2007 (  like			   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ bytealike - _null_ ));
+DATA(insert OID = 2007 (  like			   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ bytealike - _null_ _null_ ));
 DESCR("matches LIKE expression");
-DATA(insert OID = 2008 (  notlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteanlike - _null_ ));
+DATA(insert OID = 2008 (  notlike		   PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteanlike - _null_ _null_ ));
 DESCR("does not match LIKE expression");
-DATA(insert OID = 2009 (  like_escape	   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 17" _null_ _null_ _null_ like_escape_bytea - _null_ ));
+DATA(insert OID = 2009 (  like_escape	   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 17" _null_ _null_ _null_ like_escape_bytea - _null_ _null_ ));
 DESCR("convert LIKE pattern to use backslash escapes");
-DATA(insert OID = 2010 (  length		   PGNSP PGUID 12 1 0 f f t f i 1 23 "17" _null_ _null_ _null_	byteaoctetlen - _null_ ));
+DATA(insert OID = 2010 (  length		   PGNSP PGUID 12 1 0 f f t f i 1 23 "17" _null_ _null_ _null_	byteaoctetlen - _null_ _null_ ));
 DESCR("octet length");
-DATA(insert OID = 2011 (  byteacat		   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 17" _null_ _null_ _null_ byteacat - _null_ ));
+DATA(insert OID = 2011 (  byteacat		   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 17" _null_ _null_ _null_ byteacat - _null_ _null_ ));
 DESCR("concatenate");
-DATA(insert OID = 2012 (  substring		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	bytea_substr - _null_ ));
+DATA(insert OID = 2012 (  substring		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	bytea_substr - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID = 2013 (  substring		   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 23" _null_ _null_ _null_ bytea_substr_no_len - _null_ ));
+DATA(insert OID = 2013 (  substring		   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 23" _null_ _null_ _null_ bytea_substr_no_len - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID = 2085 (  substr		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	bytea_substr - _null_ ));
+DATA(insert OID = 2085 (  substr		   PGNSP PGUID 12 1 0 f f t f i 3 17 "17 23 23" _null_ _null_ _null_	bytea_substr - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID = 2086 (  substr		   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 23" _null_ _null_ _null_ bytea_substr_no_len - _null_ ));
+DATA(insert OID = 2086 (  substr		   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 23" _null_ _null_ _null_ bytea_substr_no_len - _null_ _null_ ));
 DESCR("return portion of string");
-DATA(insert OID = 2014 (  position		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 17" _null_ _null_ _null_ byteapos - _null_ ));
+DATA(insert OID = 2014 (  position		   PGNSP PGUID 12 1 0 f f t f i 2 23 "17 17" _null_ _null_ _null_ byteapos - _null_ _null_ ));
 DESCR("return position of substring");
-DATA(insert OID = 2015 (  btrim			   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 17" _null_ _null_ _null_ byteatrim - _null_ ));
+DATA(insert OID = 2015 (  btrim			   PGNSP PGUID 12 1 0 f f t f i 2 17 "17 17" _null_ _null_ _null_ byteatrim - _null_ _null_ ));
 DESCR("trim both ends of string");
 
-DATA(insert OID = 2019 (  time				PGNSP PGUID 12 1 0 f f t f s 1 1083 "1184" _null_ _null_ _null_ timestamptz_time - _null_ ));
+DATA(insert OID = 2019 (  time				PGNSP PGUID 12 1 0 f f t f s 1 1083 "1184" _null_ _null_ _null_ timestamptz_time - _null_ _null_ ));
 DESCR("convert timestamptz to time");
-DATA(insert OID = 2020 (  date_trunc		PGNSP PGUID 12 1 0 f f t f i 2 1114 "25 1114" _null_ _null_ _null_	timestamp_trunc - _null_ ));
+DATA(insert OID = 2020 (  date_trunc		PGNSP PGUID 12 1 0 f f t f i 2 1114 "25 1114" _null_ _null_ _null_	timestamp_trunc - _null_ _null_ ));
 DESCR("truncate timestamp to specified units");
-DATA(insert OID = 2021 (  date_part			PGNSP PGUID 12 1 0 f f t f i 2	701 "25 1114" _null_ _null_ _null_	timestamp_part - _null_ ));
+DATA(insert OID = 2021 (  date_part			PGNSP PGUID 12 1 0 f f t f i 2	701 "25 1114" _null_ _null_ _null_	timestamp_part - _null_ _null_ ));
 DESCR("extract field from timestamp");
-DATA(insert OID = 2022 (  timestamp			PGNSP PGUID 12 1 0 f f t f s 1 1114 "25" _null_ _null_ _null_ text_timestamp - _null_ ));
-DESCR("convert text to timestamp");
-DATA(insert OID = 2023 (  timestamp			PGNSP PGUID 12 1 0 f f t f s 1 1114 "702" _null_ _null_ _null_	abstime_timestamp - _null_ ));
+DATA(insert OID = 2023 (  timestamp			PGNSP PGUID 12 1 0 f f t f s 1 1114 "702" _null_ _null_ _null_	abstime_timestamp - _null_ _null_ ));
 DESCR("convert abstime to timestamp");
-DATA(insert OID = 2024 (  timestamp			PGNSP PGUID 12 1 0 f f t f i 1 1114 "1082" _null_ _null_ _null_ date_timestamp - _null_ ));
+DATA(insert OID = 2024 (  timestamp			PGNSP PGUID 12 1 0 f f t f i 1 1114 "1082" _null_ _null_ _null_ date_timestamp - _null_ _null_ ));
 DESCR("convert date to timestamp");
-DATA(insert OID = 2025 (  timestamp			PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1083" _null_ _null_ _null_	datetime_timestamp - _null_ ));
+DATA(insert OID = 2025 (  timestamp			PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1083" _null_ _null_ _null_	datetime_timestamp - _null_ _null_ ));
 DESCR("convert date and time to timestamp");
-DATA(insert OID = 2027 (  timestamp			PGNSP PGUID 12 1 0 f f t f s 1 1114 "1184" _null_ _null_ _null_ timestamptz_timestamp - _null_ ));
+DATA(insert OID = 2027 (  timestamp			PGNSP PGUID 12 1 0 f f t f s 1 1114 "1184" _null_ _null_ _null_ timestamptz_timestamp - _null_ _null_ ));
 DESCR("convert timestamp with time zone to timestamp");
-DATA(insert OID = 2028 (  timestamptz		PGNSP PGUID 12 1 0 f f t f s 1 1184 "1114" _null_ _null_ _null_ timestamp_timestamptz - _null_ ));
+DATA(insert OID = 2028 (  timestamptz		PGNSP PGUID 12 1 0 f f t f s 1 1184 "1114" _null_ _null_ _null_ timestamp_timestamptz - _null_ _null_ ));
 DESCR("convert timestamp to timestamp with time zone");
-DATA(insert OID = 2029 (  date				PGNSP PGUID 12 1 0 f f t f i 1 1082 "1114" _null_ _null_ _null_ timestamp_date - _null_ ));
+DATA(insert OID = 2029 (  date				PGNSP PGUID 12 1 0 f f t f i 1 1082 "1114" _null_ _null_ _null_ timestamp_date - _null_ _null_ ));
 DESCR("convert timestamp to date");
-DATA(insert OID = 2030 (  abstime			PGNSP PGUID 12 1 0 f f t f s 1	702 "1114" _null_ _null_ _null_ timestamp_abstime - _null_ ));
+DATA(insert OID = 2030 (  abstime			PGNSP PGUID 12 1 0 f f t f s 1	702 "1114" _null_ _null_ _null_ timestamp_abstime - _null_ _null_ ));
 DESCR("convert timestamp to abstime");
-DATA(insert OID = 2031 (  timestamp_mi		PGNSP PGUID 12 1 0 f f t f i 2 1186 "1114 1114" _null_ _null_ _null_	timestamp_mi - _null_ ));
+DATA(insert OID = 2031 (  timestamp_mi		PGNSP PGUID 12 1 0 f f t f i 2 1186 "1114 1114" _null_ _null_ _null_	timestamp_mi - _null_ _null_ ));
 DESCR("subtract");
-DATA(insert OID = 2032 (  timestamp_pl_interval PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1186" _null_ _null_ _null_	timestamp_pl_interval - _null_ ));
+DATA(insert OID = 2032 (  timestamp_pl_interval PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1186" _null_ _null_ _null_	timestamp_pl_interval - _null_ _null_ ));
 DESCR("plus");
-DATA(insert OID = 2033 (  timestamp_mi_interval PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1186" _null_ _null_ _null_	timestamp_mi_interval - _null_ ));
+DATA(insert OID = 2033 (  timestamp_mi_interval PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1186" _null_ _null_ _null_	timestamp_mi_interval - _null_ _null_ ));
 DESCR("minus");
-DATA(insert OID = 2034 (  text				PGNSP PGUID 12 1 0 f f t f s 1	 25 "1114" _null_ _null_ _null_ timestamp_text - _null_ ));
-DESCR("convert timestamp to text");
-DATA(insert OID = 2035 (  timestamp_smaller PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1114" _null_ _null_ _null_	timestamp_smaller - _null_ ));
+DATA(insert OID = 2035 (  timestamp_smaller PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1114" _null_ _null_ _null_	timestamp_smaller - _null_ _null_ ));
 DESCR("smaller of two");
-DATA(insert OID = 2036 (  timestamp_larger	PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1114" _null_ _null_ _null_	timestamp_larger - _null_ ));
+DATA(insert OID = 2036 (  timestamp_larger	PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1114" _null_ _null_ _null_	timestamp_larger - _null_ _null_ ));
 DESCR("larger of two");
-DATA(insert OID = 2037 (  timezone			PGNSP PGUID 12 1 0 f f t f v 2 1266 "25 1266" _null_ _null_ _null_	timetz_zone - _null_ ));
+DATA(insert OID = 2037 (  timezone			PGNSP PGUID 12 1 0 f f t f v 2 1266 "25 1266" _null_ _null_ _null_	timetz_zone - _null_ _null_ ));
 DESCR("adjust time with time zone to new zone");
-DATA(insert OID = 2038 (  timezone			PGNSP PGUID 12 1 0 f f t f i 2 1266 "1186 1266" _null_ _null_ _null_	timetz_izone - _null_ ));
+DATA(insert OID = 2038 (  timezone			PGNSP PGUID 12 1 0 f f t f i 2 1266 "1186 1266" _null_ _null_ _null_	timetz_izone - _null_ _null_ ));
 DESCR("adjust time with time zone to new zone");
-DATA(insert OID = 2041 ( overlaps			PGNSP PGUID 12 1 0 f f f f i 4 16 "1114 1114 1114 1114" _null_ _null_ _null_	overlaps_timestamp - _null_ ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 2042 ( overlaps			PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1114 1186 1114 1186" _null_ _null_ _null_ _null_	"select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ c ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 2043 ( overlaps			PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1114 1114 1114 1186" _null_ _null_ _null_ _null_	"select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ c ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 2044 ( overlaps			PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1114 1186 1114 1114" _null_ _null_ _null_ _null_	"select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ c ));
-DESCR("SQL92 interval comparison");
-DATA(insert OID = 2045 (  timestamp_cmp		PGNSP PGUID 12 1 0 f f t f i 2	23 "1114 1114" _null_ _null_ _null_ timestamp_cmp - _null_ ));
+DATA(insert OID = 2039 (  timestamp_hash	PGNSP PGUID 12 1 0 f f t f i 1	23 "1114" _null_ _null_ _null_ timestamp_hash - _null_ _null_ ));
+DESCR("hash");
+DATA(insert OID = 2041 ( overlaps			PGNSP PGUID 12 1 0 f f f f i 4 16 "1114 1114 1114 1114" _null_ _null_ _null_	overlaps_timestamp - _null_ _null_ ));
+DESCR("intervals overlap?");
+DATA(insert OID = 2042 ( overlaps			PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1114 1186 1114 1186" _null_ _null_ _null_ _null_	"select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+DATA(insert OID = 2043 ( overlaps			PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1114 1114 1114 1186" _null_ _null_ _null_ _null_	"select ($1, $2) overlaps ($3, ($3 + $4))" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+DATA(insert OID = 2044 ( overlaps			PGNSP PGUID 14 1 0 0 f f f f i 4 0 16 f "1114 1186 1114 1114" _null_ _null_ _null_ _null_	"select ($1, ($1 + $2)) overlaps ($3, $4)" - _null_ _null_ c ));
+DESCR("intervals overlap?");
+DATA(insert OID = 2045 (  timestamp_cmp		PGNSP PGUID 12 1 0 f f t f i 2	23 "1114 1114" _null_ _null_ _null_ timestamp_cmp - _null_ _null_ ));
 DESCR("less-equal-greater");
-DATA(insert OID = 2046 (  time				PGNSP PGUID 12 1 0 f f t f i 1 1083 "1266" _null_ _null_ _null_ timetz_time - _null_ ));
+DATA(insert OID = 2046 (  time				PGNSP PGUID 12 1 0 f f t f i 1 1083 "1266" _null_ _null_ _null_ timetz_time - _null_ _null_ ));
 DESCR("convert time with time zone to time");
-DATA(insert OID = 2047 (  timetz			PGNSP PGUID 12 1 0 f f t f s 1 1266 "1083" _null_ _null_ _null_ time_timetz - _null_ ));
+DATA(insert OID = 2047 (  timetz			PGNSP PGUID 12 1 0 f f t f s 1 1266 "1083" _null_ _null_ _null_ time_timetz - _null_ _null_ ));
 DESCR("convert time to timetz");
-DATA(insert OID = 2048 (  isfinite			PGNSP PGUID 12 1 0 f f t f i 1	 16 "1114" _null_ _null_ _null_ timestamp_finite - _null_ ));
+DATA(insert OID = 2048 (  isfinite			PGNSP PGUID 12 1 0 f f t f i 1	 16 "1114" _null_ _null_ _null_ timestamp_finite - _null_ _null_ ));
 DESCR("finite timestamp?");
-DATA(insert OID = 2049 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1114 25" _null_ _null_ _null_  timestamp_to_char - _null_ ));
+DATA(insert OID = 2049 ( to_char			PGNSP PGUID 12 1 0 f f t f s 2	25 "1114 25" _null_ _null_ _null_  timestamp_to_char - _null_ _null_ ));
 DESCR("format timestamp to text");
-DATA(insert OID = 2052 (  timestamp_eq		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_eq - _null_ ));
+DATA(insert OID = 2052 (  timestamp_eq		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2053 (  timestamp_ne		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_ne - _null_ ));
+DATA(insert OID = 2053 (  timestamp_ne		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_ne - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2054 (  timestamp_lt		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_lt - _null_ ));
+DATA(insert OID = 2054 (  timestamp_lt		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2055 (  timestamp_le		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_le - _null_ ));
+DATA(insert OID = 2055 (  timestamp_le		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2056 (  timestamp_ge		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_ge - _null_ ));
+DATA(insert OID = 2056 (  timestamp_ge		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2057 (  timestamp_gt		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_gt - _null_ ));
+DATA(insert OID = 2057 (  timestamp_gt		PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1114" _null_ _null_ _null_	timestamp_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2058 (  age				PGNSP PGUID 12 1 0 f f t f i 2 1186 "1114 1114" _null_ _null_ _null_	timestamp_age - _null_ ));
+DATA(insert OID = 2058 (  age				PGNSP PGUID 12 1 0 f f t f i 2 1186 "1114 1114" _null_ _null_ _null_	timestamp_age - _null_ _null_ ));
 DESCR("date difference preserving months and years");
-DATA(insert OID = 2059 (  age				PGNSP PGUID 14 1 0 0 f f t f s 1 0 1186 f "1114" _null_ _null_ _null_ _null_ "select pg_catalog.age(cast(current_date as timestamp without time zone), $1)" - _null_ c ));
+DATA(insert OID = 2059 (  age				PGNSP PGUID 14 1 0 0 f f t f s 1 0 1186 f "1114" _null_ _null_ _null_ _null_ "select pg_catalog.age(cast(current_date as timestamp without time zone), $1)" - _null_ _null_ c ));
 DESCR("date difference from today preserving months and years");
 
-DATA(insert OID = 2069 (  timezone			PGNSP PGUID 12 1 0 f f t f i 2 1184 "25 1114" _null_ _null_ _null_	timestamp_zone - _null_ ));
+DATA(insert OID = 2069 (  timezone			PGNSP PGUID 12 1 0 f f t f i 2 1184 "25 1114" _null_ _null_ _null_	timestamp_zone - _null_ _null_ ));
 DESCR("adjust timestamp to new time zone");
-DATA(insert OID = 2070 (  timezone			PGNSP PGUID 12 1 0 f f t f i 2 1184 "1186 1114" _null_ _null_ _null_	timestamp_izone - _null_ ));
+DATA(insert OID = 2070 (  timezone			PGNSP PGUID 12 1 0 f f t f i 2 1184 "1186 1114" _null_ _null_ _null_	timestamp_izone - _null_ _null_ ));
 DESCR("adjust timestamp to new time zone");
-DATA(insert OID = 2071 (  date_pl_interval	PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1186" _null_ _null_ _null_	date_pl_interval - _null_ ));
+DATA(insert OID = 2071 (  date_pl_interval	PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1186" _null_ _null_ _null_	date_pl_interval - _null_ _null_ ));
 DESCR("add");
-DATA(insert OID = 2072 (  date_mi_interval	PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1186" _null_ _null_ _null_	date_mi_interval - _null_ ));
+DATA(insert OID = 2072 (  date_mi_interval	PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1186" _null_ _null_ _null_	date_mi_interval - _null_ _null_ ));
 DESCR("subtract");
 
-DATA(insert OID = 2073 (  substring			PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_	textregexsubstr - _null_ ));
+DATA(insert OID = 2073 (  substring			PGNSP PGUID 12 1 0 f f t f i 2 25 "25 25" _null_ _null_ _null_	textregexsubstr - _null_ _null_ ));
 DESCR("extracts text matching regular expression");
-DATA(insert OID = 2074 (  substring			PGNSP PGUID 14 1 0 0 f f t f i 3 0 25 f "25 25 25" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, pg_catalog.similar_escape($2, $3))" - _null_ c ));
+DATA(insert OID = 2074 (  substring			PGNSP PGUID 14 1 0 0 f f t f i 3 0 25 f "25 25 25" _null_ _null_ _null_ _null_ "select pg_catalog.substring($1, pg_catalog.similar_escape($2, $3))" - _null_ _null_ c ));
 DESCR("extracts text matching SQL99 regular expression");
 
-DATA(insert OID = 2075 (  bit				PGNSP PGUID 12 1 0 f f t f i 2 1560 "20 23" _null_ _null_ _null_	bitfromint8 - _null_ ));
+DATA(insert OID = 2075 (  bit				PGNSP PGUID 12 1 0 f f t f i 2 1560 "20 23" _null_ _null_ _null_	bitfromint8 - _null_ _null_ ));
 DESCR("int8 to bitstring");
-DATA(insert OID = 2076 (  int8				PGNSP PGUID 12 1 0 f f t f i 1 20 "1560" _null_ _null_ _null_ bittoint8 - _null_ ));
+DATA(insert OID = 2076 (  int8				PGNSP PGUID 12 1 0 f f t f i 1 20 "1560" _null_ _null_ _null_ bittoint8 - _null_ _null_ ));
 DESCR("bitstring to int8");
 
-DATA(insert OID = 2077 (  current_setting	PGNSP PGUID 12 1 0 f f t f s 1 25 "25" _null_ _null_ _null_ show_config_by_name - _null_ ));
+DATA(insert OID = 2077 (  current_setting	PGNSP PGUID 12 1 0 f f t f s 1 25 "25" _null_ _null_ _null_ show_config_by_name - _null_ _null_ ));
 DESCR("SHOW X as a function");
-DATA(insert OID = 2078 (  set_config		PGNSP PGUID 12 1 0 f f f f v 3 25 "25 25 16" _null_ _null_ _null_ set_config_by_name - _null_ ));
+DATA(insert OID = 2078 (  set_config		PGNSP PGUID 12 1 0 f f f f v 3 25 "25 25 16" _null_ _null_ _null_ set_config_by_name - _null_ _null_ ));
 DESCR("SET X as a function");
-DATA(insert OID = 2084 (  pg_show_all_settings	PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" _null_ _null_ _null_ show_all_settings - _null_ ));
+DATA(insert OID = 2084 (  pg_show_all_settings	PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" _null_ _null_ _null_ show_all_settings - _null_ _null_ ));
 DESCR("SHOW ALL as a function");
-DATA(insert OID = 1371 (  pg_lock_status   PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_lock_status - _null_ r ));
+DATA(insert OID = 1371 (  pg_lock_status   PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_lock_status - _null_ _null_ r ));
 DESCR("view system lock information");
-DATA(insert OID = 1065 (  pg_prepared_xact PGNSP PGUID 12 1 1000 f f t t v 0 2249 "" _null_ _null_ _null_ pg_prepared_xact - _null_ ));
+DATA(insert OID = 1065 (  pg_prepared_xact PGNSP PGUID 12 1 1000 f f t t v 0 2249 "" _null_ _null_ _null_ pg_prepared_xact - _null_ _null_ ));
 DESCR("view two-phase transactions");
 
-DATA(insert OID = 2079 (  pg_table_is_visible		PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_table_is_visible - _null_ ));
+DATA(insert OID = 2079 (  pg_table_is_visible		PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_table_is_visible - _null_ _null_ ));
 DESCR("is table visible in search path?");
-DATA(insert OID = 2080 (  pg_type_is_visible		PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_type_is_visible - _null_ ));
+DATA(insert OID = 2080 (  pg_type_is_visible		PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_type_is_visible - _null_ _null_ ));
 DESCR("is type visible in search path?");
-DATA(insert OID = 2081 (  pg_function_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_function_is_visible - _null_ ));
+DATA(insert OID = 2081 (  pg_function_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_function_is_visible - _null_ _null_ ));
 DESCR("is function visible in search path?");
-DATA(insert OID = 2082 (  pg_operator_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_operator_is_visible - _null_ ));
+DATA(insert OID = 2082 (  pg_operator_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_operator_is_visible - _null_ _null_ ));
 DESCR("is operator visible in search path?");
-DATA(insert OID = 2083 (  pg_opclass_is_visible		PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_opclass_is_visible - _null_ ));
+DATA(insert OID = 2083 (  pg_opclass_is_visible		PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_opclass_is_visible - _null_ _null_ ));
 DESCR("is opclass visible in search path?");
-DATA(insert OID = 2093 (  pg_conversion_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_conversion_is_visible - _null_ ));
+DATA(insert OID = 2093 (  pg_conversion_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_conversion_is_visible - _null_ _null_ ));
 DESCR("is conversion visible in search path?");
-DATA(insert OID = 2854 (  pg_my_temp_schema			PGNSP PGUID 12 1 0 f f t f s 0 26 "" _null_ _null_ _null_ pg_my_temp_schema - _null_ ));
+DATA(insert OID = 3756 (  pg_ts_parser_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_ts_parser_is_visible - _null_ _null_ ));
+DESCR("is text search parser visible in search path?");
+DATA(insert OID = 3757 (  pg_ts_dict_is_visible		PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_ts_dict_is_visible - _null_ _null_ ));
+DESCR("is text search dictionary visible in search path?");
+DATA(insert OID = 3768 (  pg_ts_template_is_visible PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_ts_template_is_visible - _null_ _null_ ));
+DESCR("is text search template visible in search path?");
+DATA(insert OID = 3758 (  pg_ts_config_is_visible	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_ts_config_is_visible - _null_ _null_ ));
+DESCR("is text search configuration visible in search path?");
+
+DATA(insert OID = 2854 (  pg_my_temp_schema			PGNSP PGUID 12 1 0 f f t f s 0 26 "" _null_ _null_ _null_ pg_my_temp_schema - _null_ _null_ ));
 DESCR("get OID of current session's temp schema, if any");
-DATA(insert OID = 2855 (  pg_is_other_temp_schema	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_is_other_temp_schema - _null_ ));
+DATA(insert OID = 2855 (  pg_is_other_temp_schema	PGNSP PGUID 12 1 0 f f t f s 1 16 "26" _null_ _null_ _null_ pg_is_other_temp_schema - _null_ _null_ ));
 DESCR("is schema another session's temp schema?");
 
-DATA(insert OID = 2171 ( pg_cancel_backend		PGNSP PGUID 12 1 0 f f t f v 1 16 "23" _null_ _null_ _null_ pg_cancel_backend - _null_ ));
-DESCR("Cancel a server process' current query");
-DATA(insert OID = 2172 ( pg_start_backup		PGNSP PGUID 12 1 0 f f t f v 1 25 "25" _null_ _null_ _null_ pg_start_backup - _null_ ));
-DESCR("Prepare for taking an online backup");
-DATA(insert OID = 2173 ( pg_stop_backup			PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_stop_backup - _null_ ));
-DESCR("Finish taking an online backup");
-DATA(insert OID = 2848 ( pg_switch_xlog			PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_switch_xlog - _null_ ));
-DESCR("Switch to new xlog file");
-DATA(insert OID = 2849 ( pg_current_xlog_location	PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_current_xlog_location - _null_ ));
+DATA(insert OID = 2171 ( pg_cancel_backend		PGNSP PGUID 12 1 0 f f t f v 1 16 "23" _null_ _null_ _null_ pg_cancel_backend - _null_ _null_ ));
+DESCR("cancel a server process' current query");
+DATA(insert OID = 2172 ( pg_start_backup		PGNSP PGUID 12 1 0 f f t f v 1 25 "25" _null_ _null_ _null_ pg_start_backup - _null_ _null_ ));
+DESCR("prepare for taking an online backup");
+DATA(insert OID = 2173 ( pg_stop_backup			PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_stop_backup - _null_ _null_ ));
+DESCR("finish taking an online backup");
+DATA(insert OID = 2848 ( pg_switch_xlog			PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_switch_xlog - _null_ _null_ ));
+DESCR("switch to new xlog file");
+DATA(insert OID = 2849 ( pg_current_xlog_location	PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_current_xlog_location - _null_ _null_ ));
 DESCR("current xlog write location");
-DATA(insert OID = 2852 ( pg_current_xlog_insert_location	PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_current_xlog_insert_location - _null_ ));
+DATA(insert OID = 2852 ( pg_current_xlog_insert_location	PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_current_xlog_insert_location - _null_ _null_ ));
 DESCR("current xlog insert location");
-DATA(insert OID = 2850 ( pg_xlogfile_name_offset	PGNSP PGUID 12 1 0 f f t f i 1 2249 "25" "{25,25,23}" "{i,o,o}" "{wal_location,file_name,file_offset}" pg_xlogfile_name_offset - _null_ ));
+DATA(insert OID = 2850 ( pg_xlogfile_name_offset	PGNSP PGUID 12 1 0 f f t f i 1 2249 "25" "{25,25,23}" "{i,o,o}" "{wal_location,file_name,file_offset}" pg_xlogfile_name_offset - _null_ _null_ ));
 DESCR("xlog filename and byte offset, given an xlog location");
-DATA(insert OID = 2851 ( pg_xlogfile_name			PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_ pg_xlogfile_name - _null_ ));
+DATA(insert OID = 2851 ( pg_xlogfile_name			PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_ pg_xlogfile_name - _null_ _null_ ));
 DESCR("xlog filename, given an xlog location");
 
-DATA(insert OID = 2621 ( pg_reload_conf			PGNSP PGUID 12 1 0 f f t f v 0 16 "" _null_ _null_ _null_ pg_reload_conf - _null_ ));
-DESCR("Reload configuration files");
-DATA(insert OID = 2622 ( pg_rotate_logfile		PGNSP PGUID 12 1 0 f f t f v 0 16 "" _null_ _null_ _null_ pg_rotate_logfile - _null_ ));
-DESCR("Rotate log file");
+DATA(insert OID = 2621 ( pg_reload_conf			PGNSP PGUID 12 1 0 f f t f v 0 16 "" _null_ _null_ _null_ pg_reload_conf - _null_ _null_ ));
+DESCR("reload configuration files");
+DATA(insert OID = 2622 ( pg_rotate_logfile		PGNSP PGUID 12 1 0 f f t f v 0 16 "" _null_ _null_ _null_ pg_rotate_logfile - _null_ _null_ ));
+DESCR("rotate log file");
 
-DATA(insert OID = 2623 ( pg_stat_file		PGNSP PGUID 12 1 0 f f t f v 1 2249 "25" "{25,20,1184,1184,1184,1184,16}" "{i,o,o,o,o,o,o}" "{filename,size,access,modification,change,creation,isdir}" pg_stat_file - _null_ ));
-DESCR("Return file information");
-DATA(insert OID = 2624 ( pg_read_file		PGNSP PGUID 12 1 0 f f t f v 3 25 "25 20 20" _null_ _null_ _null_ pg_read_file - _null_ ));
-DESCR("Read text from a file");
-DATA(insert OID = 2625 ( pg_ls_dir			PGNSP PGUID 12 1 1000 f f t t v 1 25 "25" _null_ _null_ _null_ pg_ls_dir - _null_ ));
-DESCR("List all files in a directory");
-DATA(insert OID = 2626 ( pg_sleep			PGNSP PGUID 12 1 0 f f t f v 1 2278 "701" _null_ _null_ _null_ pg_sleep - _null_ ));
-DESCR("Sleep for the specified time in seconds");
+DATA(insert OID = 2623 ( pg_stat_file		PGNSP PGUID 12 1 0 f f t f v 1 2249 "25" "{25,20,1184,1184,1184,1184,16}" "{i,o,o,o,o,o,o}" "{filename,size,access,modification,change,creation,isdir}" pg_stat_file - _null_ _null_ ));
+DESCR("return file information");
+DATA(insert OID = 2624 ( pg_read_file		PGNSP PGUID 12 1 0 f f t f v 3 25 "25 20 20" _null_ _null_ _null_ pg_read_file - _null_ _null_ ));
+DESCR("read text from a file");
+DATA(insert OID = 2625 ( pg_ls_dir			PGNSP PGUID 12 1 1000 f f t t v 1 25 "25" _null_ _null_ _null_ pg_ls_dir - _null_ _null_ ));
+DESCR("list all files in a directory");
+DATA(insert OID = 2626 ( pg_sleep			PGNSP PGUID 12 1 0 f f t f v 1 2278 "701" _null_ _null_ _null_ pg_sleep - _null_ _null_ ));
+DESCR("sleep for the specified time in seconds");
 
+DATA(insert OID = 2971 (  text				PGNSP PGUID 12 1 0 f f t f i 1 25 "16" _null_ _null_ _null_ booltext - _null_ _null_ ));
+DESCR("convert boolean to text");
 
 /* Aggregates (moved here from pg_aggregate for 7.3) */
 
-DATA(insert OID = 2100 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2101 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2102 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2103 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2104 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2105 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2106 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DATA(insert OID = 2100 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2101 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2102 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2103 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2104 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2105 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2106 (  avg				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 
 #define SUM_OID_MIN 2107
-DATA(insert OID = 2107 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2108 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 20 "23" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2109 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 20 "21" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2110 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 700 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2111 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2112 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 790 "790" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2113 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2114 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DATA(insert OID = 2107 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2108 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 20 "23" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2109 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 20 "21" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2110 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 700 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2111 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2112 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 790 "790" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2113 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2114 (  sum				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 #define SUM_OID_MAX 2114
 
-DATA(insert OID = 2115 (  max				PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2116 (  max				PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2117 (  max				PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2118 (  max				PGNSP PGUID 12 1 0 t f f f i 1 26 "26" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2119 (  max				PGNSP PGUID 12 1 0 t f f f i 1 700 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2120 (  max				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2121 (  max				PGNSP PGUID 12 1 0 t f f f i 1 702 "702" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2122 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1082 "1082" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2123 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1083 "1083" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2124 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1266 "1266" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2125 (  max				PGNSP PGUID 12 1 0 t f f f i 1 790 "790" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2126 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1114 "1114" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2127 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1184 "1184" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2128 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2129 (  max				PGNSP PGUID 12 1 0 t f f f i 1 25 "25" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2130 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2050 (  max				PGNSP PGUID 12 1 0 t f f f i 1 2277 "2277" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2244 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1042 "1042" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2797 (  max				PGNSP PGUID 12 1 0 t f f f i 1 27 "27" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2131 (  min				PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2132 (  min				PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2133 (  min				PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2134 (  min				PGNSP PGUID 12 1 0 t f f f i 1 26 "26" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2135 (  min				PGNSP PGUID 12 1 0 t f f f i 1 700 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2136 (  min				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2137 (  min				PGNSP PGUID 12 1 0 t f f f i 1 702 "702" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2138 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1082 "1082" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2139 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1083 "1083" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2140 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1266 "1266" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2141 (  min				PGNSP PGUID 12 1 0 t f f f i 1 790 "790" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2142 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1114 "1114" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2143 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1184 "1184" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2144 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2145 (  min				PGNSP PGUID 12 1 0 t f f f i 1 25 "25" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2146 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2051 (  min				PGNSP PGUID 12 1 0 t f f f i 1 2277 "2277" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2245 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1042 "1042" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-DATA(insert OID = 2798 (  min				PGNSP PGUID 12 1 0 t f f f i 1 27 "27" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DATA(insert OID = 2115 (  max				PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2116 (  max				PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2117 (  max				PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2118 (  max				PGNSP PGUID 12 1 0 t f f f i 1 26 "26" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2119 (  max				PGNSP PGUID 12 1 0 t f f f i 1 700 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2120 (  max				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2121 (  max				PGNSP PGUID 12 1 0 t f f f i 1 702 "702" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2122 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1082 "1082" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2123 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1083 "1083" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2124 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1266 "1266" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2125 (  max				PGNSP PGUID 12 1 0 t f f f i 1 790 "790" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2126 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1114 "1114" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2127 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1184 "1184" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2128 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2129 (  max				PGNSP PGUID 12 1 0 t f f f i 1 25 "25" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2130 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2050 (  max				PGNSP PGUID 12 1 0 t f f f i 1 2277 "2277" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2244 (  max				PGNSP PGUID 12 1 0 t f f f i 1 1042 "1042" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2797 (  max				PGNSP PGUID 12 1 0 t f f f i 1 27 "27" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2131 (  min				PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2132 (  min				PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2133 (  min				PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2134 (  min				PGNSP PGUID 12 1 0 t f f f i 1 26 "26" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2135 (  min				PGNSP PGUID 12 1 0 t f f f i 1 700 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2136 (  min				PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2137 (  min				PGNSP PGUID 12 1 0 t f f f i 1 702 "702" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2138 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1082 "1082" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2139 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1083 "1083" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2140 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1266 "1266" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2141 (  min				PGNSP PGUID 12 1 0 t f f f i 1 790 "790" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2142 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1114 "1114" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2143 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1184 "1184" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2144 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1186 "1186" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2145 (  min				PGNSP PGUID 12 1 0 t f f f i 1 25 "25" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2146 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2051 (  min				PGNSP PGUID 12 1 0 t f f f i 1 2277 "2277" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2245 (  min				PGNSP PGUID 12 1 0 t f f f i 1 1042 "1042" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2798 (  min				PGNSP PGUID 12 1 0 t f f f i 1 27 "27" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 
 /* count has two forms: count(any) and count(*) */
-DATA(insert OID = 2147 (  count				PGNSP PGUID 12 1 0 t f f f i 1 20 "2276" _null_ _null_ _null_  aggregate_dummy - _null_ ));
+DATA(insert OID = 2147 (  count				PGNSP PGUID 12 1 0 t f f f i 1 20 "2276" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
 #define COUNT_ANY_OID 2147
-DATA(insert OID = 2803 (  count				PGNSP PGUID 12 1 0 t f f f i 0 20 "" _null_ _null_ _null_  aggregate_dummy - _null_ ));
+DATA(insert OID = 2803 (  count				PGNSP PGUID 12 1 0 t f f f i 0 20 "" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
 #define COUNT_STAR_OID  2803
 
-DATA(insert OID = 2718 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2719 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2720 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2721 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2722 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2723 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2641 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2642 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2643 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2644 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2645 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2646 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2148 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2149 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2150 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2151 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2152 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2153 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2724 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2725 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2726 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2727 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2728 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2729 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2712 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2713 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2714 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2715 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2716 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2717 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2154 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2155 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2156 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2157 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2158 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2159 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2818 (  regr_count		PGNSP PGUID 12 1 0 t f f f i 2 20 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2819 (  regr_sxx			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2820 (  regr_syy			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2821 (  regr_sxy			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2822 (  regr_avgx			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2823 (  regr_avgy			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2824 (  regr_r2			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2825 (  regr_slope		PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2826 (  regr_intercept	PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2827 (  covar_pop			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2828 (  covar_samp		PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-DATA(insert OID = 2829 (  corr				PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ ));
-
-DATA(insert OID = 2160 ( text_pattern_lt	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_lt - _null_ ));
-DATA(insert OID = 2161 ( text_pattern_le	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_le - _null_ ));
-DATA(insert OID = 2162 ( text_pattern_eq	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ texteq - _null_ ));
-DATA(insert OID = 2163 ( text_pattern_ge	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_ge - _null_ ));
-DATA(insert OID = 2164 ( text_pattern_gt	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_gt - _null_ ));
-DATA(insert OID = 2165 ( text_pattern_ne	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ textne - _null_ ));
-DATA(insert OID = 2166 ( bttext_pattern_cmp  PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ bttext_pattern_cmp - _null_ ));
+DATA(insert OID = 2718 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2719 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2720 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2721 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2722 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2723 (  var_pop			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2641 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2642 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2643 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2644 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2645 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2646 (  var_samp			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2148 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2149 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2150 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2151 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2152 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2153 (  variance			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2724 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2725 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2726 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2727 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2728 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2729 (  stddev_pop		PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2712 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2713 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2714 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2715 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2716 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2717 (  stddev_samp		PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2154 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "20" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2155 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "23" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2156 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "21" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2157 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 701 "700" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2158 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 701 "701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2159 (  stddev			PGNSP PGUID 12 1 0 t f f f i 1 1700 "1700" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2818 (  regr_count		PGNSP PGUID 12 1 0 t f f f i 2 20 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2819 (  regr_sxx			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2820 (  regr_syy			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2821 (  regr_sxy			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2822 (  regr_avgx			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2823 (  regr_avgy			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2824 (  regr_r2			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2825 (  regr_slope		PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2826 (  regr_intercept	PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2827 (  covar_pop			PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2828 (  covar_samp		PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+DATA(insert OID = 2829 (  corr				PGNSP PGUID 12 1 0 t f f f i 2 701 "701 701" _null_ _null_ _null_  aggregate_dummy - _null_ _null_ ));
+
+DATA(insert OID = 2160 ( text_pattern_lt	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_lt - _null_ _null_ ));
+DATA(insert OID = 2161 ( text_pattern_le	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_le - _null_ _null_ ));
+DATA(insert OID = 2162 ( text_pattern_eq	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_eq - _null_ _null_ ));
+DATA(insert OID = 2163 ( text_pattern_ge	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_ge - _null_ _null_ ));
+DATA(insert OID = 2164 ( text_pattern_gt	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_gt - _null_ _null_ ));
+DATA(insert OID = 2165 ( text_pattern_ne	 PGNSP PGUID 12 1 0 f f t f i 2 16 "25 25" _null_ _null_ _null_ text_pattern_ne - _null_ _null_ ));
+DATA(insert OID = 2166 ( bttext_pattern_cmp  PGNSP PGUID 12 1 0 f f t f i 2 23 "25 25" _null_ _null_ _null_ bttext_pattern_cmp - _null_ _null_ ));
 
 /* We use the same procedures here as above since the types are binary compatible. */
-DATA(insert OID = 2174 ( bpchar_pattern_lt	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_lt - _null_ ));
-DATA(insert OID = 2175 ( bpchar_pattern_le	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_le - _null_ ));
-DATA(insert OID = 2176 ( bpchar_pattern_eq	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ texteq - _null_ ));
-DATA(insert OID = 2177 ( bpchar_pattern_ge	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_ge - _null_ ));
-DATA(insert OID = 2178 ( bpchar_pattern_gt	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_gt - _null_ ));
-DATA(insert OID = 2179 ( bpchar_pattern_ne	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ textne - _null_ ));
-DATA(insert OID = 2180 ( btbpchar_pattern_cmp PGNSP PGUID 12 1 0 f f t f i 2 23 "1042 1042" _null_ _null_ _null_ bttext_pattern_cmp - _null_ ));
+DATA(insert OID = 2174 ( bpchar_pattern_lt	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_lt - _null_ _null_ ));
+DATA(insert OID = 2175 ( bpchar_pattern_le	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_le - _null_ _null_ ));
+DATA(insert OID = 2176 ( bpchar_pattern_eq	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_eq - _null_ _null_ ));
+DATA(insert OID = 2177 ( bpchar_pattern_ge	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_ge - _null_ _null_ ));
+DATA(insert OID = 2178 ( bpchar_pattern_gt	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_gt - _null_ _null_ ));
+DATA(insert OID = 2179 ( bpchar_pattern_ne	  PGNSP PGUID 12 1 0 f f t f i 2 16 "1042 1042" _null_ _null_ _null_ text_pattern_ne - _null_ _null_ ));
+DATA(insert OID = 2180 ( btbpchar_pattern_cmp PGNSP PGUID 12 1 0 f f t f i 2 23 "1042 1042" _null_ _null_ _null_ bttext_pattern_cmp - _null_ _null_ ));
 
-DATA(insert OID = 2181 ( name_pattern_lt	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_lt - _null_ ));
-DATA(insert OID = 2182 ( name_pattern_le	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_le - _null_ ));
-DATA(insert OID = 2183 ( name_pattern_eq	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_eq - _null_ ));
-DATA(insert OID = 2184 ( name_pattern_ge	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_ge - _null_ ));
-DATA(insert OID = 2185 ( name_pattern_gt	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_gt - _null_ ));
-DATA(insert OID = 2186 ( name_pattern_ne	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_ne - _null_ ));
-DATA(insert OID = 2187 ( btname_pattern_cmp PGNSP PGUID 12 1 0 f f t f i 2 23 "19 19" _null_ _null_ _null_ btname_pattern_cmp - _null_ ));
+DATA(insert OID = 2181 ( name_pattern_lt	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_lt - _null_ _null_ ));
+DATA(insert OID = 2182 ( name_pattern_le	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_le - _null_ _null_ ));
+DATA(insert OID = 2183 ( name_pattern_eq	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_eq - _null_ _null_ ));
+DATA(insert OID = 2184 ( name_pattern_ge	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_ge - _null_ _null_ ));
+DATA(insert OID = 2185 ( name_pattern_gt	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_gt - _null_ _null_ ));
+DATA(insert OID = 2186 ( name_pattern_ne	PGNSP PGUID 12 1 0 f f t f i 2 16 "19 19" _null_ _null_ _null_ name_pattern_ne - _null_ _null_ ));
+DATA(insert OID = 2187 ( btname_pattern_cmp PGNSP PGUID 12 1 0 f f t f i 2 23 "19 19" _null_ _null_ _null_ btname_pattern_cmp - _null_ _null_ ));
 
-DATA(insert OID = 2188 ( btint48cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "23 20" _null_ _null_ _null_ btint48cmp - _null_ ));
-DATA(insert OID = 2189 ( btint84cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "20 23" _null_ _null_ _null_ btint84cmp - _null_ ));
-DATA(insert OID = 2190 ( btint24cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ btint24cmp - _null_ ));
-DATA(insert OID = 2191 ( btint42cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ btint42cmp - _null_ ));
-DATA(insert OID = 2192 ( btint28cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "21 20" _null_ _null_ _null_ btint28cmp - _null_ ));
-DATA(insert OID = 2193 ( btint82cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "20 21" _null_ _null_ _null_ btint82cmp - _null_ ));
-DATA(insert OID = 2194 ( btfloat48cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "700 701" _null_ _null_ _null_ btfloat48cmp - _null_ ));
-DATA(insert OID = 2195 ( btfloat84cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "701 700" _null_ _null_ _null_ btfloat84cmp - _null_ ));
+DATA(insert OID = 2188 ( btint48cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "23 20" _null_ _null_ _null_ btint48cmp - _null_ _null_ ));
+DATA(insert OID = 2189 ( btint84cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "20 23" _null_ _null_ _null_ btint84cmp - _null_ _null_ ));
+DATA(insert OID = 2190 ( btint24cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "21 23" _null_ _null_ _null_ btint24cmp - _null_ _null_ ));
+DATA(insert OID = 2191 ( btint42cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "23 21" _null_ _null_ _null_ btint42cmp - _null_ _null_ ));
+DATA(insert OID = 2192 ( btint28cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "21 20" _null_ _null_ _null_ btint28cmp - _null_ _null_ ));
+DATA(insert OID = 2193 ( btint82cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "20 21" _null_ _null_ _null_ btint82cmp - _null_ _null_ ));
+DATA(insert OID = 2194 ( btfloat48cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "700 701" _null_ _null_ _null_ btfloat48cmp - _null_ _null_ ));
+DATA(insert OID = 2195 ( btfloat84cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "701 700" _null_ _null_ _null_ btfloat84cmp - _null_ _null_ ));
 
 
-DATA(insert OID = 2212 (  regprocedurein	PGNSP PGUID 12 1 0 f f t f s 1 2202 "2275" _null_ _null_ _null_ regprocedurein - _null_ ));
+DATA(insert OID = 2212 (  regprocedurein	PGNSP PGUID 12 1 0 f f t f s 1 2202 "2275" _null_ _null_ _null_ regprocedurein - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2213 (  regprocedureout	PGNSP PGUID 12 1 0 f f t f s 1 2275 "2202" _null_ _null_ _null_ regprocedureout - _null_ ));
+DATA(insert OID = 2213 (  regprocedureout	PGNSP PGUID 12 1 0 f f t f s 1 2275 "2202" _null_ _null_ _null_ regprocedureout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2214 (  regoperin			PGNSP PGUID 12 1 0 f f t f s 1 2203 "2275" _null_ _null_ _null_ regoperin - _null_ ));
+DATA(insert OID = 2214 (  regoperin			PGNSP PGUID 12 1 0 f f t f s 1 2203 "2275" _null_ _null_ _null_ regoperin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2215 (  regoperout		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2203" _null_ _null_ _null_ regoperout - _null_ ));
+DATA(insert OID = 2215 (  regoperout		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2203" _null_ _null_ _null_ regoperout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2216 (  regoperatorin		PGNSP PGUID 12 1 0 f f t f s 1 2204 "2275" _null_ _null_ _null_ regoperatorin - _null_ ));
+DATA(insert OID = 2216 (  regoperatorin		PGNSP PGUID 12 1 0 f f t f s 1 2204 "2275" _null_ _null_ _null_ regoperatorin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2217 (  regoperatorout	PGNSP PGUID 12 1 0 f f t f s 1 2275 "2204" _null_ _null_ _null_ regoperatorout - _null_ ));
+DATA(insert OID = 2217 (  regoperatorout	PGNSP PGUID 12 1 0 f f t f s 1 2275 "2204" _null_ _null_ _null_ regoperatorout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2218 (  regclassin		PGNSP PGUID 12 1 0 f f t f s 1 2205 "2275" _null_ _null_ _null_ regclassin - _null_ ));
+DATA(insert OID = 2218 (  regclassin		PGNSP PGUID 12 1 0 f f t f s 1 2205 "2275" _null_ _null_ _null_ regclassin - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2219 (  regclassout		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2205" _null_ _null_ _null_ regclassout - _null_ ));
+DATA(insert OID = 2219 (  regclassout		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2205" _null_ _null_ _null_ regclassout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2220 (  regtypein			PGNSP PGUID 12 1 0 f f t f s 1 2206 "2275" _null_ _null_ _null_ regtypein - _null_ ));
+DATA(insert OID = 2220 (  regtypein			PGNSP PGUID 12 1 0 f f t f s 1 2206 "2275" _null_ _null_ _null_ regtypein - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2221 (  regtypeout		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2206" _null_ _null_ _null_ regtypeout - _null_ ));
+DATA(insert OID = 2221 (  regtypeout		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2206" _null_ _null_ _null_ regtypeout - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 1079 (  regclass			PGNSP PGUID 12 1 0 f f t f s 1 2205 "25" _null_ _null_ _null_	text_regclass - _null_ ));
+DATA(insert OID = 1079 (  regclass			PGNSP PGUID 12 1 0 f f t f s 1 2205 "25" _null_ _null_ _null_	text_regclass - _null_ _null_ ));
 DESCR("convert text to regclass");
 
-DATA(insert OID = 2246 ( fmgr_internal_validator PGNSP PGUID 12 1 0 f f t f s 1 2278 "26" _null_ _null_ _null_ fmgr_internal_validator - _null_ ));
+DATA(insert OID = 2246 ( fmgr_internal_validator PGNSP PGUID 12 1 0 f f t f s 1 2278 "26" _null_ _null_ _null_ fmgr_internal_validator - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 2247 ( fmgr_c_validator	PGNSP PGUID 12 1 0 f f t f s 1	 2278 "26" _null_ _null_ _null_ fmgr_c_validator - _null_ ));
+DATA(insert OID = 2247 ( fmgr_c_validator	PGNSP PGUID 12 1 0 f f t f s 1	 2278 "26" _null_ _null_ _null_ fmgr_c_validator - _null_ _null_ ));
 DESCR("(internal)");
-DATA(insert OID = 2248 ( fmgr_sql_validator PGNSP PGUID 12 1 0 f f t f s 1	 2278 "26" _null_ _null_ _null_ fmgr_sql_validator - _null_ ));
+DATA(insert OID = 2248 ( fmgr_sql_validator PGNSP PGUID 12 1 0 f f t f s 1	 2278 "26" _null_ _null_ _null_ fmgr_sql_validator - _null_ _null_ ));
 DESCR("(internal)");
 
-DATA(insert OID = 2250 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_database_privilege_name_name - _null_ ));
+DATA(insert OID = 2250 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_database_privilege_name_name - _null_ _null_ ));
 DESCR("user privilege on database by username, database name");
-DATA(insert OID = 2251 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_database_privilege_name_id - _null_ ));
+DATA(insert OID = 2251 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_database_privilege_name_id - _null_ _null_ ));
 DESCR("user privilege on database by username, database oid");
-DATA(insert OID = 2252 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_database_privilege_id_name - _null_ ));
+DATA(insert OID = 2252 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_database_privilege_id_name - _null_ _null_ ));
 DESCR("user privilege on database by user oid, database name");
-DATA(insert OID = 2253 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_database_privilege_id_id - _null_ ));
+DATA(insert OID = 2253 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_database_privilege_id_id - _null_ _null_ ));
 DESCR("user privilege on database by user oid, database oid");
-DATA(insert OID = 2254 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_database_privilege_name - _null_ ));
+DATA(insert OID = 2254 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_database_privilege_name - _null_ _null_ ));
 DESCR("current user privilege on database by database name");
-DATA(insert OID = 2255 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_database_privilege_id - _null_ ));
+DATA(insert OID = 2255 (  has_database_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_database_privilege_id - _null_ _null_ ));
 DESCR("current user privilege on database by database oid");
 
-DATA(insert OID = 2256 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_function_privilege_name_name - _null_ ));
+DATA(insert OID = 2256 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_function_privilege_name_name - _null_ _null_ ));
 DESCR("user privilege on function by username, function name");
-DATA(insert OID = 2257 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_function_privilege_name_id - _null_ ));
+DATA(insert OID = 2257 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_function_privilege_name_id - _null_ _null_ ));
 DESCR("user privilege on function by username, function oid");
-DATA(insert OID = 2258 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_function_privilege_id_name - _null_ ));
+DATA(insert OID = 2258 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_function_privilege_id_name - _null_ _null_ ));
 DESCR("user privilege on function by user oid, function name");
-DATA(insert OID = 2259 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_function_privilege_id_id - _null_ ));
+DATA(insert OID = 2259 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_function_privilege_id_id - _null_ _null_ ));
 DESCR("user privilege on function by user oid, function oid");
-DATA(insert OID = 2260 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_function_privilege_name - _null_ ));
+DATA(insert OID = 2260 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_function_privilege_name - _null_ _null_ ));
 DESCR("current user privilege on function by function name");
-DATA(insert OID = 2261 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_function_privilege_id - _null_ ));
+DATA(insert OID = 2261 (  has_function_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_function_privilege_id - _null_ _null_ ));
 DESCR("current user privilege on function by function oid");
 
-DATA(insert OID = 2262 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_language_privilege_name_name - _null_ ));
+DATA(insert OID = 2262 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_language_privilege_name_name - _null_ _null_ ));
 DESCR("user privilege on language by username, language name");
-DATA(insert OID = 2263 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_language_privilege_name_id - _null_ ));
+DATA(insert OID = 2263 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_language_privilege_name_id - _null_ _null_ ));
 DESCR("user privilege on language by username, language oid");
-DATA(insert OID = 2264 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_language_privilege_id_name - _null_ ));
+DATA(insert OID = 2264 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_language_privilege_id_name - _null_ _null_ ));
 DESCR("user privilege on language by user oid, language name");
-DATA(insert OID = 2265 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_language_privilege_id_id - _null_ ));
+DATA(insert OID = 2265 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_language_privilege_id_id - _null_ _null_ ));
 DESCR("user privilege on language by user oid, language oid");
-DATA(insert OID = 2266 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_language_privilege_name - _null_ ));
+DATA(insert OID = 2266 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_language_privilege_name - _null_ _null_ ));
 DESCR("current user privilege on language by language name");
-DATA(insert OID = 2267 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_language_privilege_id - _null_ ));
+DATA(insert OID = 2267 (  has_language_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_language_privilege_id - _null_ _null_ ));
 DESCR("current user privilege on language by language oid");
 
-DATA(insert OID = 2268 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_schema_privilege_name_name - _null_ ));
+DATA(insert OID = 2268 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_schema_privilege_name_name - _null_ _null_ ));
 DESCR("user privilege on schema by username, schema name");
-DATA(insert OID = 2269 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_schema_privilege_name_id - _null_ ));
+DATA(insert OID = 2269 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_schema_privilege_name_id - _null_ _null_ ));
 DESCR("user privilege on schema by username, schema oid");
-DATA(insert OID = 2270 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_schema_privilege_id_name - _null_ ));
+DATA(insert OID = 2270 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_schema_privilege_id_name - _null_ _null_ ));
 DESCR("user privilege on schema by user oid, schema name");
-DATA(insert OID = 2271 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_schema_privilege_id_id - _null_ ));
+DATA(insert OID = 2271 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_schema_privilege_id_id - _null_ _null_ ));
 DESCR("user privilege on schema by user oid, schema oid");
-DATA(insert OID = 2272 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_schema_privilege_name - _null_ ));
+DATA(insert OID = 2272 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_schema_privilege_name - _null_ _null_ ));
 DESCR("current user privilege on schema by schema name");
-DATA(insert OID = 2273 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_schema_privilege_id - _null_ ));
+DATA(insert OID = 2273 (  has_schema_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_schema_privilege_id - _null_ _null_ ));
 DESCR("current user privilege on schema by schema oid");
 
-DATA(insert OID = 2390 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_tablespace_privilege_name_name - _null_ ));
+DATA(insert OID = 2390 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 25 25" _null_ _null_ _null_	has_tablespace_privilege_name_name - _null_ _null_ ));
 DESCR("user privilege on tablespace by username, tablespace name");
-DATA(insert OID = 2391 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_tablespace_privilege_name_id - _null_ ));
+DATA(insert OID = 2391 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	has_tablespace_privilege_name_id - _null_ _null_ ));
 DESCR("user privilege on tablespace by username, tablespace oid");
-DATA(insert OID = 2392 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_tablespace_privilege_id_name - _null_ ));
+DATA(insert OID = 2392 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 25 25" _null_ _null_ _null_	has_tablespace_privilege_id_name - _null_ _null_ ));
 DESCR("user privilege on tablespace by user oid, tablespace name");
-DATA(insert OID = 2393 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_tablespace_privilege_id_id - _null_ ));
+DATA(insert OID = 2393 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	has_tablespace_privilege_id_id - _null_ _null_ ));
 DESCR("user privilege on tablespace by user oid, tablespace oid");
-DATA(insert OID = 2394 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_tablespace_privilege_name - _null_ ));
+DATA(insert OID = 2394 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ has_tablespace_privilege_name - _null_ _null_ ));
 DESCR("current user privilege on tablespace by tablespace name");
-DATA(insert OID = 2395 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_tablespace_privilege_id - _null_ ));
+DATA(insert OID = 2395 (  has_tablespace_privilege		   PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ has_tablespace_privilege_id - _null_ _null_ ));
 DESCR("current user privilege on tablespace by tablespace oid");
 
-DATA(insert OID = 2705 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "19 19 25" _null_ _null_ _null_	pg_has_role_name_name - _null_ ));
+DATA(insert OID = 2705 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "19 19 25" _null_ _null_ _null_	pg_has_role_name_name - _null_ _null_ ));
 DESCR("user privilege on role by username, role name");
-DATA(insert OID = 2706 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	pg_has_role_name_id - _null_ ));
+DATA(insert OID = 2706 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "19 26 25" _null_ _null_ _null_	pg_has_role_name_id - _null_ _null_ ));
 DESCR("user privilege on role by username, role oid");
-DATA(insert OID = 2707 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "26 19 25" _null_ _null_ _null_	pg_has_role_id_name - _null_ ));
+DATA(insert OID = 2707 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "26 19 25" _null_ _null_ _null_	pg_has_role_id_name - _null_ _null_ ));
 DESCR("user privilege on role by user oid, role name");
-DATA(insert OID = 2708 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	pg_has_role_id_id - _null_ ));
+DATA(insert OID = 2708 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 3 16 "26 26 25" _null_ _null_ _null_	pg_has_role_id_id - _null_ _null_ ));
 DESCR("user privilege on role by user oid, role oid");
-DATA(insert OID = 2709 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 2 16 "19 25" _null_ _null_ _null_ pg_has_role_name - _null_ ));
+DATA(insert OID = 2709 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 2 16 "19 25" _null_ _null_ _null_ pg_has_role_name - _null_ _null_ ));
 DESCR("current user privilege on role by role name");
-DATA(insert OID = 2710 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ pg_has_role_id - _null_ ));
+DATA(insert OID = 2710 (  pg_has_role		PGNSP PGUID 12 1 0 f f t f s 2 16 "26 25" _null_ _null_ _null_ pg_has_role_id - _null_ _null_ ));
 DESCR("current user privilege on role by role oid");
 
-DATA(insert OID = 1269 (  pg_column_size		PGNSP PGUID 12 1 0 f f t f s 1 23 "2276" _null_ _null_ _null_  pg_column_size - _null_ ));
+DATA(insert OID = 1269 (  pg_column_size		PGNSP PGUID 12 1 0 f f t f s 1 23 "2276" _null_ _null_ _null_  pg_column_size - _null_ _null_ ));
 DESCR("bytes required to store the value, perhaps with compression");
-DATA(insert OID = 2322 ( pg_tablespace_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_tablespace_size_oid - _null_ r ));
-DESCR("Calculate total disk space usage for the specified tablespace");
-DATA(insert OID = 2323 ( pg_tablespace_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "19" _null_ _null_ _null_ _null_ pg_tablespace_size_name - _null_ r ));
-DESCR("Calculate total disk space usage for the specified tablespace");
-DATA(insert OID = 2324 ( pg_database_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_database_size_oid - _null_ r ));
-DESCR("Calculate total disk space usage for the specified database");
-DATA(insert OID = 2168 ( pg_database_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "19" _null_ _null_ _null_ _null_ pg_database_size_name - _null_ r ));
-DESCR("Calculate total disk space usage for the specified database");
-DATA(insert OID = 2325 ( pg_relation_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_relation_size_oid - _null_ r ));
-DESCR("Calculate disk space usage for the specified table or index");
-DATA(insert OID = 2289 ( pg_relation_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "25" _null_ _null_ _null_ _null_ pg_relation_size_name - _null_ r ));
-DESCR("Calculate disk space usage for the specified table or index");
-DATA(insert OID = 2286 ( pg_total_relation_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_total_relation_size_oid - _null_ r ));
-DESCR("Calculate total disk space usage for the specified table and associated indexes and toast tables");
-DATA(insert OID = 2287 ( pg_total_relation_size			PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "25" _null_ _null_ _null_ _null_ pg_total_relation_size_name - _null_ r ));
-DESCR("Calculate total disk space usage for the specified table and associated indexes and toast tables");
-DATA(insert OID = 2288 ( pg_size_pretty			PGNSP PGUID 12 1 0 0 f f t f v 1 0 25 f "20" _null_ _null_ _null_ _null_ pg_size_pretty - _null_ r ));
-DESCR("Convert a long int to a human readable text using size units");
+DATA(insert OID = 2322 ( pg_tablespace_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_tablespace_size_oid - _null_ _null_ ));
+DESCR("total disk space usage for the specified tablespace");
+DATA(insert OID = 2323 ( pg_tablespace_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "19" _null_ _null_ _null_ pg_tablespace_size_name - _null_ _null_ ));
+DESCR("total disk space usage for the specified tablespace");
+DATA(insert OID = 2324 ( pg_database_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_database_size_oid - _null_ _null_ ));
+DESCR("total disk space usage for the specified database");
+DATA(insert OID = 2168 ( pg_database_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "19" _null_ _null_ _null_ pg_database_size_name - _null_ _null_ ));
+DESCR("total disk space usage for the specified database");
+DATA(insert OID = 2325 ( pg_relation_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_relation_size_oid - _null_ _null_ ));
+DESCR("disk space usage for the specified table or index");
+DATA(insert OID = 2289 ( pg_relation_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "25" _null_ _null_ _null_ pg_relation_size_name - _null_ _null_ ));
+DESCR("disk space usage for the specified table or index");
+DATA(insert OID = 2286 ( pg_total_relation_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_total_relation_size_oid - _null_ _null_ ));
+DESCR("total disk space usage for the specified table and associated indexes and toast tables");
+DATA(insert OID = 2287 ( pg_total_relation_size		PGNSP PGUID 12 1 0 f f t f v 1 20 "25" _null_ _null_ _null_ pg_total_relation_size_name - _null_ _null_ ));
+DESCR("total disk space usage for the specified table and associated indexes and toast tables");
+DATA(insert OID = 2288 ( pg_size_pretty			PGNSP PGUID 12 1 0 f f t f v 1 25 "20" _null_ _null_ _null_ pg_size_pretty - _null_ _null_ ));
+DESCR("convert a long int to a human readable text using size units");
 
-DATA(insert OID = 2290 (  record_in			PGNSP PGUID 12 1 0 f f t f v 3 2249 "2275 26 23" _null_ _null_ _null_	record_in - _null_ ));
+DATA(insert OID = 2290 (  record_in			PGNSP PGUID 12 1 0 f f t f v 3 2249 "2275 26 23" _null_ _null_ _null_	record_in - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2291 (  record_out		PGNSP PGUID 12 1 0 f f t f v 1 2275 "2249" _null_ _null_ _null_ record_out - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2292 (  cstring_in		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2275" _null_ _null_ _null_ cstring_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2291 (  record_out		PGNSP PGUID 12 1 0 f f t f v 1 2275 "2249" _null_ _null_ _null_ record_out - _null_ ));
+DATA(insert OID = 2293 (  cstring_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2275" _null_ _null_ _null_ cstring_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2292 (  cstring_in		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2275" _null_ _null_ _null_ cstring_in - _null_ ));
+DATA(insert OID = 2294 (  any_in			PGNSP PGUID 12 1 0 f f t f i 1 2276 "2275" _null_ _null_ _null_ any_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2293 (  cstring_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2275" _null_ _null_ _null_ cstring_out - _null_ ));
+DATA(insert OID = 2295 (  any_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "2276" _null_ _null_ _null_ any_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2294 (  any_in			PGNSP PGUID 12 1 0 f f t f i 1 2276 "2275" _null_ _null_ _null_ any_in - _null_ ));
+DATA(insert OID = 2296 (  anyarray_in		PGNSP PGUID 12 1 0 f f t f i 1 2277 "2275" _null_ _null_ _null_ anyarray_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2295 (  any_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "2276" _null_ _null_ _null_ any_out - _null_ ));
+DATA(insert OID = 2297 (  anyarray_out		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2277" _null_ _null_ _null_ anyarray_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2296 (  anyarray_in		PGNSP PGUID 12 1 0 f f t f i 1 2277 "2275" _null_ _null_ _null_ anyarray_in - _null_ ));
+DATA(insert OID = 2298 (  void_in			PGNSP PGUID 12 1 0 f f t f i 1 2278 "2275" _null_ _null_ _null_ void_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2297 (  anyarray_out		PGNSP PGUID 12 1 0 f f t f s 1 2275 "2277" _null_ _null_ _null_ anyarray_out - _null_ ));
+DATA(insert OID = 2299 (  void_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "2278" _null_ _null_ _null_ void_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2298 (  void_in			PGNSP PGUID 12 1 0 f f t f i 1 2278 "2275" _null_ _null_ _null_ void_in - _null_ ));
+DATA(insert OID = 2300 (  trigger_in		PGNSP PGUID 12 1 0 f f t f i 1 2279 "2275" _null_ _null_ _null_ trigger_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2299 (  void_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "2278" _null_ _null_ _null_ void_out - _null_ ));
+DATA(insert OID = 2301 (  trigger_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2279" _null_ _null_ _null_ trigger_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2300 (  trigger_in		PGNSP PGUID 12 1 0 f f t f i 1 2279 "2275" _null_ _null_ _null_ trigger_in - _null_ ));
+DATA(insert OID = 2302 (  language_handler_in	PGNSP PGUID 12 1 0 f f t f i 1 2280 "2275" _null_ _null_ _null_ language_handler_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2301 (  trigger_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2279" _null_ _null_ _null_ trigger_out - _null_ ));
+DATA(insert OID = 2303 (  language_handler_out	PGNSP PGUID 12 1 0 f f t f i 1 2275 "2280" _null_ _null_ _null_ language_handler_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2302 (  language_handler_in	PGNSP PGUID 12 1 0 f f t f i 1 2280 "2275" _null_ _null_ _null_ language_handler_in - _null_ ));
+DATA(insert OID = 2304 (  internal_in		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2275" _null_ _null_ _null_ internal_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2303 (  language_handler_out	PGNSP PGUID 12 1 0 f f t f i 1 2275 "2280" _null_ _null_ _null_ language_handler_out - _null_ ));
+DATA(insert OID = 2305 (  internal_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2281" _null_ _null_ _null_ internal_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2304 (  internal_in		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2275" _null_ _null_ _null_ internal_in - _null_ ));
+DATA(insert OID = 2306 (  opaque_in			PGNSP PGUID 12 1 0 f f t f i 1 2282 "2275" _null_ _null_ _null_ opaque_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2305 (  internal_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2281" _null_ _null_ _null_ internal_out - _null_ ));
+DATA(insert OID = 2307 (  opaque_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2282" _null_ _null_ _null_ opaque_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2306 (  opaque_in			PGNSP PGUID 12 1 0 f f t f i 1 2282 "2275" _null_ _null_ _null_ opaque_in - _null_ ));
+DATA(insert OID = 2312 (  anyelement_in		PGNSP PGUID 12 1 0 f f t f i 1 2283 "2275" _null_ _null_ _null_ anyelement_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2307 (  opaque_out		PGNSP PGUID 12 1 0 f f t f i 1 2275 "2282" _null_ _null_ _null_ opaque_out - _null_ ));
+DATA(insert OID = 2313 (  anyelement_out	PGNSP PGUID 12 1 0 f f t f i 1 2275 "2283" _null_ _null_ _null_ anyelement_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2312 (  anyelement_in		PGNSP PGUID 12 1 0 f f t f i 1 2283 "2275" _null_ _null_ _null_ anyelement_in - _null_ ));
+DATA(insert OID = 2398 (  shell_in			PGNSP PGUID 12 1 0 f f t f i 1 2282 "2275" _null_ _null_ _null_ shell_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2313 (  anyelement_out	PGNSP PGUID 12 1 0 f f t f i 1 2275 "2283" _null_ _null_ _null_ anyelement_out - _null_ ));
+DATA(insert OID = 2399 (  shell_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "2282" _null_ _null_ _null_ shell_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2398 (  shell_in			PGNSP PGUID 12 1 0 f f t f i 1 2282 "2275" _null_ _null_ _null_ shell_in - _null_ ));
+DATA(insert OID = 2597 (  domain_in			PGNSP PGUID 12 1 0 f f f f v 3 2276 "2275 26 23" _null_ _null_ _null_ domain_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2399 (  shell_out			PGNSP PGUID 12 1 0 f f t f i 1 2275 "2282" _null_ _null_ _null_ shell_out - _null_ ));
+DATA(insert OID = 2598 (  domain_recv		PGNSP PGUID 12 1 0 f f f f v 3 2276 "2281 26 23" _null_ _null_ _null_ domain_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2597 (  domain_in			PGNSP PGUID 12 1 0 f f f f v 3 2276 "2275 26 23" _null_ _null_ _null_ domain_in - _null_ ));
+DATA(insert OID = 2777 (  anynonarray_in	PGNSP PGUID 12 1 0 f f t f i 1 2776 "2275" _null_ _null_ _null_ anynonarray_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2598 (  domain_recv		PGNSP PGUID 12 1 0 f f f f v 3 2276 "2281 26 23" _null_ _null_ _null_ domain_recv - _null_ ));
+DATA(insert OID = 2778 (  anynonarray_out	PGNSP PGUID 12 1 0 f f t f i 1 2275 "2776" _null_ _null_ _null_ anynonarray_out - _null_ _null_ ));
 DESCR("I/O");
 
 /* cryptographic */
-DATA(insert OID =  2311 (  md5	   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	md5_text - _null_ ));
+DATA(insert OID =  2311 (  md5	   PGNSP PGUID 12 1 0 f f t f i 1 25 "25" _null_ _null_ _null_	md5_text - _null_ _null_ ));
 DESCR("calculates md5 hash");
-DATA(insert OID =  2321 (  md5	   PGNSP PGUID 12 1 0 f f t f i 1 25 "17" _null_ _null_ _null_	md5_bytea - _null_ ));
+DATA(insert OID =  2321 (  md5	   PGNSP PGUID 12 1 0 f f t f i 1 25 "17" _null_ _null_ _null_	md5_bytea - _null_ _null_ ));
 DESCR("calculates md5 hash");
 
 /* crosstype operations for date vs. timestamp and timestamptz */
-DATA(insert OID = 2338 (  date_lt_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_lt_timestamp - _null_ ));
+DATA(insert OID = 2338 (  date_lt_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_lt_timestamp - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2339 (  date_le_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_le_timestamp - _null_ ));
+DATA(insert OID = 2339 (  date_le_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_le_timestamp - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2340 (  date_eq_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_eq_timestamp - _null_ ));
+DATA(insert OID = 2340 (  date_eq_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_eq_timestamp - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2341 (  date_gt_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_gt_timestamp - _null_ ));
+DATA(insert OID = 2341 (  date_gt_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_gt_timestamp - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2342 (  date_ge_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_ge_timestamp - _null_ ));
+DATA(insert OID = 2342 (  date_ge_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_ge_timestamp - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2343 (  date_ne_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_ne_timestamp - _null_ ));
+DATA(insert OID = 2343 (  date_ne_timestamp		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1082 1114" _null_ _null_ _null_ date_ne_timestamp - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2344 (  date_cmp_timestamp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "1082 1114" _null_ _null_ _null_ date_cmp_timestamp - _null_ ));
+DATA(insert OID = 2344 (  date_cmp_timestamp	   PGNSP PGUID 12 1 0 f f t f i 2 23 "1082 1114" _null_ _null_ _null_ date_cmp_timestamp - _null_ _null_ ));
 DESCR("less-equal-greater");
 
-DATA(insert OID = 2351 (  date_lt_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_lt_timestamptz - _null_ ));
+DATA(insert OID = 2351 (  date_lt_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_lt_timestamptz - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2352 (  date_le_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_le_timestamptz - _null_ ));
+DATA(insert OID = 2352 (  date_le_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_le_timestamptz - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2353 (  date_eq_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_eq_timestamptz - _null_ ));
+DATA(insert OID = 2353 (  date_eq_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_eq_timestamptz - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2354 (  date_gt_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_gt_timestamptz - _null_ ));
+DATA(insert OID = 2354 (  date_gt_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_gt_timestamptz - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2355 (  date_ge_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_ge_timestamptz - _null_ ));
+DATA(insert OID = 2355 (  date_ge_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_ge_timestamptz - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2356 (  date_ne_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_ne_timestamptz - _null_ ));
+DATA(insert OID = 2356 (  date_ne_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1082 1184" _null_ _null_ _null_ date_ne_timestamptz - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2357 (  date_cmp_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 23 "1082 1184" _null_ _null_ _null_ date_cmp_timestamptz - _null_ ));
+DATA(insert OID = 2357 (  date_cmp_timestamptz	   PGNSP PGUID 12 1 0 f f t f s 2 23 "1082 1184" _null_ _null_ _null_ date_cmp_timestamptz - _null_ _null_ ));
 DESCR("less-equal-greater");
 
-DATA(insert OID = 2364 (  timestamp_lt_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_lt_date - _null_ ));
+DATA(insert OID = 2364 (  timestamp_lt_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_lt_date - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2365 (  timestamp_le_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_le_date - _null_ ));
+DATA(insert OID = 2365 (  timestamp_le_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_le_date - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2366 (  timestamp_eq_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_eq_date - _null_ ));
+DATA(insert OID = 2366 (  timestamp_eq_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_eq_date - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2367 (  timestamp_gt_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_gt_date - _null_ ));
+DATA(insert OID = 2367 (  timestamp_gt_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_gt_date - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2368 (  timestamp_ge_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_ge_date - _null_ ));
+DATA(insert OID = 2368 (  timestamp_ge_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_ge_date - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2369 (  timestamp_ne_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_ne_date - _null_ ));
+DATA(insert OID = 2369 (  timestamp_ne_date		   PGNSP PGUID 12 1 0 f f t f i 2 16 "1114 1082" _null_ _null_ _null_ timestamp_ne_date - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2370 (  timestamp_cmp_date	   PGNSP PGUID 12 1 0 f f t f i 2 23 "1114 1082" _null_ _null_ _null_ timestamp_cmp_date - _null_ ));
+DATA(insert OID = 2370 (  timestamp_cmp_date	   PGNSP PGUID 12 1 0 f f t f i 2 23 "1114 1082" _null_ _null_ _null_ timestamp_cmp_date - _null_ _null_ ));
 DESCR("less-equal-greater");
 
-DATA(insert OID = 2377 (  timestamptz_lt_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_lt_date - _null_ ));
+DATA(insert OID = 2377 (  timestamptz_lt_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_lt_date - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2378 (  timestamptz_le_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_le_date - _null_ ));
+DATA(insert OID = 2378 (  timestamptz_le_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_le_date - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2379 (  timestamptz_eq_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_eq_date - _null_ ));
+DATA(insert OID = 2379 (  timestamptz_eq_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_eq_date - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2380 (  timestamptz_gt_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_gt_date - _null_ ));
+DATA(insert OID = 2380 (  timestamptz_gt_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_gt_date - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2381 (  timestamptz_ge_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_ge_date - _null_ ));
+DATA(insert OID = 2381 (  timestamptz_ge_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_ge_date - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2382 (  timestamptz_ne_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_ne_date - _null_ ));
+DATA(insert OID = 2382 (  timestamptz_ne_date	   PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1082" _null_ _null_ _null_ timestamptz_ne_date - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2383 (  timestamptz_cmp_date	   PGNSP PGUID 12 1 0 f f t f s 2 23 "1184 1082" _null_ _null_ _null_ timestamptz_cmp_date - _null_ ));
+DATA(insert OID = 2383 (  timestamptz_cmp_date	   PGNSP PGUID 12 1 0 f f t f s 2 23 "1184 1082" _null_ _null_ _null_ timestamptz_cmp_date - _null_ _null_ ));
 DESCR("less-equal-greater");
 
 /* crosstype operations for timestamp vs. timestamptz */
-DATA(insert OID = 2520 (  timestamp_lt_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_lt_timestamptz - _null_ ));
+DATA(insert OID = 2520 (  timestamp_lt_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_lt_timestamptz - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2521 (  timestamp_le_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_le_timestamptz - _null_ ));
+DATA(insert OID = 2521 (  timestamp_le_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_le_timestamptz - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2522 (  timestamp_eq_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_eq_timestamptz - _null_ ));
+DATA(insert OID = 2522 (  timestamp_eq_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_eq_timestamptz - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2523 (  timestamp_gt_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_gt_timestamptz - _null_ ));
+DATA(insert OID = 2523 (  timestamp_gt_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_gt_timestamptz - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2524 (  timestamp_ge_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_ge_timestamptz - _null_ ));
+DATA(insert OID = 2524 (  timestamp_ge_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_ge_timestamptz - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2525 (  timestamp_ne_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_ne_timestamptz - _null_ ));
+DATA(insert OID = 2525 (  timestamp_ne_timestamptz	PGNSP PGUID 12 1 0 f f t f s 2 16 "1114 1184" _null_ _null_ _null_	timestamp_ne_timestamptz - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2526 (  timestamp_cmp_timestamptz PGNSP PGUID 12 1 0 f f t f s 2 23 "1114 1184" _null_ _null_ _null_	timestamp_cmp_timestamptz - _null_ ));
+DATA(insert OID = 2526 (  timestamp_cmp_timestamptz PGNSP PGUID 12 1 0 f f t f s 2 23 "1114 1184" _null_ _null_ _null_	timestamp_cmp_timestamptz - _null_ _null_ ));
 DESCR("less-equal-greater");
 
-DATA(insert OID = 2527 (  timestamptz_lt_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_lt_timestamp - _null_ ));
+DATA(insert OID = 2527 (  timestamptz_lt_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_lt_timestamp - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2528 (  timestamptz_le_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_le_timestamp - _null_ ));
+DATA(insert OID = 2528 (  timestamptz_le_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_le_timestamp - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2529 (  timestamptz_eq_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_eq_timestamp - _null_ ));
+DATA(insert OID = 2529 (  timestamptz_eq_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_eq_timestamp - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2530 (  timestamptz_gt_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_gt_timestamp - _null_ ));
+DATA(insert OID = 2530 (  timestamptz_gt_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_gt_timestamp - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2531 (  timestamptz_ge_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_ge_timestamp - _null_ ));
+DATA(insert OID = 2531 (  timestamptz_ge_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_ge_timestamp - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2532 (  timestamptz_ne_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_ne_timestamp - _null_ ));
+DATA(insert OID = 2532 (  timestamptz_ne_timestamp	PGNSP PGUID 12 1 0 f f t f s 2 16 "1184 1114" _null_ _null_ _null_	timestamptz_ne_timestamp - _null_ _null_ ));
 DESCR("not equal");
-DATA(insert OID = 2533 (  timestamptz_cmp_timestamp PGNSP PGUID 12 1 0 f f t f s 2 23 "1184 1114" _null_ _null_ _null_	timestamptz_cmp_timestamp - _null_ ));
+DATA(insert OID = 2533 (  timestamptz_cmp_timestamp PGNSP PGUID 12 1 0 f f t f s 2 23 "1184 1114" _null_ _null_ _null_	timestamptz_cmp_timestamp - _null_ _null_ ));
 DESCR("less-equal-greater");
 
 
 /* send/receive functions */
-DATA(insert OID = 2400 (  array_recv		   PGNSP PGUID 12 1 0 f f t f s 3 2277 "2281 26 23" _null_ _null_ _null_  array_recv - _null_ ));
+DATA(insert OID = 2400 (  array_recv		   PGNSP PGUID 12 1 0 f f t f s 3 2277 "2281 26 23" _null_ _null_ _null_  array_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2401 (  array_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "2277" _null_ _null_ _null_	array_send - _null_ ));
+DATA(insert OID = 2401 (  array_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "2277" _null_ _null_ _null_	array_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2402 (  record_recv		   PGNSP PGUID 12 1 0 f f t f v 3 2249 "2281 26 23" _null_ _null_ _null_  record_recv - _null_ ));
+DATA(insert OID = 2402 (  record_recv		   PGNSP PGUID 12 1 0 f f t f v 3 2249 "2281 26 23" _null_ _null_ _null_  record_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2403 (  record_send		   PGNSP PGUID 12 1 0 f f t f v 1 17 "2249" _null_ _null_ _null_  record_send - _null_ ));
+DATA(insert OID = 2403 (  record_send		   PGNSP PGUID 12 1 0 f f t f v 1 17 "2249" _null_ _null_ _null_  record_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2404 (  int2recv			   PGNSP PGUID 12 1 0 f f t f i 1 21 "2281" _null_ _null_ _null_	int2recv - _null_ ));
+DATA(insert OID = 2404 (  int2recv			   PGNSP PGUID 12 1 0 f f t f i 1 21 "2281" _null_ _null_ _null_	int2recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2405 (  int2send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "21" _null_ _null_ _null_	int2send - _null_ ));
+DATA(insert OID = 2405 (  int2send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "21" _null_ _null_ _null_	int2send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2406 (  int4recv			   PGNSP PGUID 12 1 0 f f t f i 1 23 "2281" _null_ _null_ _null_	int4recv - _null_ ));
+DATA(insert OID = 2406 (  int4recv			   PGNSP PGUID 12 1 0 f f t f i 1 23 "2281" _null_ _null_ _null_	int4recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2407 (  int4send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "23" _null_ _null_ _null_	int4send - _null_ ));
+DATA(insert OID = 2407 (  int4send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "23" _null_ _null_ _null_	int4send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2408 (  int8recv			   PGNSP PGUID 12 1 0 f f t f i 1 20 "2281" _null_ _null_ _null_	int8recv - _null_ ));
+DATA(insert OID = 2408 (  int8recv			   PGNSP PGUID 12 1 0 f f t f i 1 20 "2281" _null_ _null_ _null_	int8recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2409 (  int8send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "20" _null_ _null_ _null_	int8send - _null_ ));
+DATA(insert OID = 2409 (  int8send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "20" _null_ _null_ _null_	int8send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2410 (  int2vectorrecv	   PGNSP PGUID 12 1 0 f f t f i 1 22 "2281" _null_ _null_ _null_	int2vectorrecv - _null_ ));
+DATA(insert OID = 2410 (  int2vectorrecv	   PGNSP PGUID 12 1 0 f f t f i 1 22 "2281" _null_ _null_ _null_	int2vectorrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2411 (  int2vectorsend	   PGNSP PGUID 12 1 0 f f t f i 1 17 "22" _null_ _null_ _null_	int2vectorsend - _null_ ));
+DATA(insert OID = 2411 (  int2vectorsend	   PGNSP PGUID 12 1 0 f f t f i 1 17 "22" _null_ _null_ _null_	int2vectorsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2412 (  bytearecv			   PGNSP PGUID 12 1 0 f f t f i 1 17 "2281" _null_ _null_ _null_	bytearecv - _null_ ));
+DATA(insert OID = 2412 (  bytearecv			   PGNSP PGUID 12 1 0 f f t f i 1 17 "2281" _null_ _null_ _null_	bytearecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2413 (  byteasend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "17" _null_ _null_ _null_	byteasend - _null_ ));
+DATA(insert OID = 2413 (  byteasend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "17" _null_ _null_ _null_	byteasend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2414 (  textrecv			   PGNSP PGUID 12 1 0 f f t f s 1 25 "2281" _null_ _null_ _null_	textrecv - _null_ ));
+DATA(insert OID = 2414 (  textrecv			   PGNSP PGUID 12 1 0 f f t f s 1 25 "2281" _null_ _null_ _null_	textrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2415 (  textsend			   PGNSP PGUID 12 1 0 f f t f s 1 17 "25" _null_ _null_ _null_	textsend - _null_ ));
+DATA(insert OID = 2415 (  textsend			   PGNSP PGUID 12 1 0 f f t f s 1 17 "25" _null_ _null_ _null_	textsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2416 (  unknownrecv		   PGNSP PGUID 12 1 0 f f t f i 1 705 "2281" _null_ _null_ _null_  unknownrecv - _null_ ));
+DATA(insert OID = 2416 (  unknownrecv		   PGNSP PGUID 12 1 0 f f t f i 1 705 "2281" _null_ _null_ _null_  unknownrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2417 (  unknownsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "705" _null_ _null_ _null_ unknownsend - _null_ ));
+DATA(insert OID = 2417 (  unknownsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "705" _null_ _null_ _null_ unknownsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2418 (  oidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 26 "2281" _null_ _null_ _null_	oidrecv - _null_ ));
+DATA(insert OID = 2418 (  oidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 26 "2281" _null_ _null_ _null_	oidrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2419 (  oidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "26" _null_ _null_ _null_	oidsend - _null_ ));
+DATA(insert OID = 2419 (  oidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "26" _null_ _null_ _null_	oidsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2420 (  oidvectorrecv		   PGNSP PGUID 12 1 0 f f t f i 1 30 "2281" _null_ _null_ _null_	oidvectorrecv - _null_ ));
+DATA(insert OID = 2420 (  oidvectorrecv		   PGNSP PGUID 12 1 0 f f t f i 1 30 "2281" _null_ _null_ _null_	oidvectorrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2421 (  oidvectorsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "30" _null_ _null_ _null_	oidvectorsend - _null_ ));
+DATA(insert OID = 2421 (  oidvectorsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "30" _null_ _null_ _null_	oidvectorsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2422 (  namerecv			   PGNSP PGUID 12 1 0 f f t f s 1 19 "2281" _null_ _null_ _null_	namerecv - _null_ ));
+DATA(insert OID = 2422 (  namerecv			   PGNSP PGUID 12 1 0 f f t f s 1 19 "2281" _null_ _null_ _null_	namerecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2423 (  namesend			   PGNSP PGUID 12 1 0 f f t f s 1 17 "19" _null_ _null_ _null_	namesend - _null_ ));
+DATA(insert OID = 2423 (  namesend			   PGNSP PGUID 12 1 0 f f t f s 1 17 "19" _null_ _null_ _null_	namesend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2424 (  float4recv		   PGNSP PGUID 12 1 0 f f t f i 1 700 "2281" _null_ _null_ _null_  float4recv - _null_ ));
+DATA(insert OID = 2424 (  float4recv		   PGNSP PGUID 12 1 0 f f t f i 1 700 "2281" _null_ _null_ _null_  float4recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2425 (  float4send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "700" _null_ _null_ _null_ float4send - _null_ ));
+DATA(insert OID = 2425 (  float4send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "700" _null_ _null_ _null_ float4send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2426 (  float8recv		   PGNSP PGUID 12 1 0 f f t f i 1 701 "2281" _null_ _null_ _null_  float8recv - _null_ ));
+DATA(insert OID = 2426 (  float8recv		   PGNSP PGUID 12 1 0 f f t f i 1 701 "2281" _null_ _null_ _null_  float8recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2427 (  float8send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "701" _null_ _null_ _null_ float8send - _null_ ));
+DATA(insert OID = 2427 (  float8send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "701" _null_ _null_ _null_ float8send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2428 (  point_recv		   PGNSP PGUID 12 1 0 f f t f i 1 600 "2281" _null_ _null_ _null_  point_recv - _null_ ));
+DATA(insert OID = 2428 (  point_recv		   PGNSP PGUID 12 1 0 f f t f i 1 600 "2281" _null_ _null_ _null_  point_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2429 (  point_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "600" _null_ _null_ _null_ point_send - _null_ ));
+DATA(insert OID = 2429 (  point_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "600" _null_ _null_ _null_ point_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2430 (  bpcharrecv		   PGNSP PGUID 12 1 0 f f t f s 3 1042 "2281 26 23" _null_ _null_ _null_  bpcharrecv - _null_ ));
+DATA(insert OID = 2430 (  bpcharrecv		   PGNSP PGUID 12 1 0 f f t f s 3 1042 "2281 26 23" _null_ _null_ _null_  bpcharrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2431 (  bpcharsend		   PGNSP PGUID 12 1 0 f f t f s 1 17 "1042" _null_ _null_ _null_	bpcharsend - _null_ ));
+DATA(insert OID = 2431 (  bpcharsend		   PGNSP PGUID 12 1 0 f f t f s 1 17 "1042" _null_ _null_ _null_	bpcharsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2432 (  varcharrecv		   PGNSP PGUID 12 1 0 f f t f s 3 1043 "2281 26 23" _null_ _null_ _null_  varcharrecv - _null_ ));
+DATA(insert OID = 2432 (  varcharrecv		   PGNSP PGUID 12 1 0 f f t f s 3 1043 "2281 26 23" _null_ _null_ _null_  varcharrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2433 (  varcharsend		   PGNSP PGUID 12 1 0 f f t f s 1 17 "1043" _null_ _null_ _null_	varcharsend - _null_ ));
+DATA(insert OID = 2433 (  varcharsend		   PGNSP PGUID 12 1 0 f f t f s 1 17 "1043" _null_ _null_ _null_	varcharsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2434 (  charrecv			   PGNSP PGUID 12 1 0 f f t f i 1 18 "2281" _null_ _null_ _null_	charrecv - _null_ ));
+DATA(insert OID = 2434 (  charrecv			   PGNSP PGUID 12 1 0 f f t f i 1 18 "2281" _null_ _null_ _null_	charrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2435 (  charsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "18" _null_ _null_ _null_	charsend - _null_ ));
+DATA(insert OID = 2435 (  charsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "18" _null_ _null_ _null_	charsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2436 (  boolrecv			   PGNSP PGUID 12 1 0 f f t f i 1 16 "2281" _null_ _null_ _null_	boolrecv - _null_ ));
+DATA(insert OID = 2436 (  boolrecv			   PGNSP PGUID 12 1 0 f f t f i 1 16 "2281" _null_ _null_ _null_	boolrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2437 (  boolsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "16" _null_ _null_ _null_	boolsend - _null_ ));
+DATA(insert OID = 2437 (  boolsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "16" _null_ _null_ _null_	boolsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2438 (  tidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 27 "2281" _null_ _null_ _null_	tidrecv - _null_ ));
+DATA(insert OID = 2438 (  tidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 27 "2281" _null_ _null_ _null_	tidrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2439 (  tidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "27" _null_ _null_ _null_	tidsend - _null_ ));
+DATA(insert OID = 2439 (  tidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "27" _null_ _null_ _null_	tidsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2440 (  xidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 28 "2281" _null_ _null_ _null_	xidrecv - _null_ ));
+DATA(insert OID = 2440 (  xidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 28 "2281" _null_ _null_ _null_	xidrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2441 (  xidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "28" _null_ _null_ _null_	xidsend - _null_ ));
+DATA(insert OID = 2441 (  xidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "28" _null_ _null_ _null_	xidsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2442 (  cidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 29 "2281" _null_ _null_ _null_	cidrecv - _null_ ));
+DATA(insert OID = 2442 (  cidrecv			   PGNSP PGUID 12 1 0 f f t f i 1 29 "2281" _null_ _null_ _null_	cidrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2443 (  cidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "29" _null_ _null_ _null_	cidsend - _null_ ));
+DATA(insert OID = 2443 (  cidsend			   PGNSP PGUID 12 1 0 f f t f i 1 17 "29" _null_ _null_ _null_	cidsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2444 (  regprocrecv		   PGNSP PGUID 12 1 0 f f t f i 1 24 "2281" _null_ _null_ _null_	regprocrecv - _null_ ));
+DATA(insert OID = 2444 (  regprocrecv		   PGNSP PGUID 12 1 0 f f t f i 1 24 "2281" _null_ _null_ _null_	regprocrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2445 (  regprocsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "24" _null_ _null_ _null_	regprocsend - _null_ ));
+DATA(insert OID = 2445 (  regprocsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "24" _null_ _null_ _null_	regprocsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2446 (  regprocedurerecv	   PGNSP PGUID 12 1 0 f f t f i 1 2202 "2281" _null_ _null_ _null_	regprocedurerecv - _null_ ));
+DATA(insert OID = 2446 (  regprocedurerecv	   PGNSP PGUID 12 1 0 f f t f i 1 2202 "2281" _null_ _null_ _null_	regprocedurerecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2447 (  regproceduresend	   PGNSP PGUID 12 1 0 f f t f i 1 17 "2202" _null_ _null_ _null_	regproceduresend - _null_ ));
+DATA(insert OID = 2447 (  regproceduresend	   PGNSP PGUID 12 1 0 f f t f i 1 17 "2202" _null_ _null_ _null_	regproceduresend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2448 (  regoperrecv		   PGNSP PGUID 12 1 0 f f t f i 1 2203 "2281" _null_ _null_ _null_	regoperrecv - _null_ ));
+DATA(insert OID = 2448 (  regoperrecv		   PGNSP PGUID 12 1 0 f f t f i 1 2203 "2281" _null_ _null_ _null_	regoperrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2449 (  regopersend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2203" _null_ _null_ _null_	regopersend - _null_ ));
+DATA(insert OID = 2449 (  regopersend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2203" _null_ _null_ _null_	regopersend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2450 (  regoperatorrecv	   PGNSP PGUID 12 1 0 f f t f i 1 2204 "2281" _null_ _null_ _null_	regoperatorrecv - _null_ ));
+DATA(insert OID = 2450 (  regoperatorrecv	   PGNSP PGUID 12 1 0 f f t f i 1 2204 "2281" _null_ _null_ _null_	regoperatorrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2451 (  regoperatorsend	   PGNSP PGUID 12 1 0 f f t f i 1 17 "2204" _null_ _null_ _null_	regoperatorsend - _null_ ));
+DATA(insert OID = 2451 (  regoperatorsend	   PGNSP PGUID 12 1 0 f f t f i 1 17 "2204" _null_ _null_ _null_	regoperatorsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2452 (  regclassrecv		   PGNSP PGUID 12 1 0 f f t f i 1 2205 "2281" _null_ _null_ _null_	regclassrecv - _null_ ));
+DATA(insert OID = 2452 (  regclassrecv		   PGNSP PGUID 12 1 0 f f t f i 1 2205 "2281" _null_ _null_ _null_	regclassrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2453 (  regclasssend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2205" _null_ _null_ _null_	regclasssend - _null_ ));
+DATA(insert OID = 2453 (  regclasssend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2205" _null_ _null_ _null_	regclasssend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2454 (  regtyperecv		   PGNSP PGUID 12 1 0 f f t f i 1 2206 "2281" _null_ _null_ _null_	regtyperecv - _null_ ));
+DATA(insert OID = 2454 (  regtyperecv		   PGNSP PGUID 12 1 0 f f t f i 1 2206 "2281" _null_ _null_ _null_	regtyperecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2455 (  regtypesend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2206" _null_ _null_ _null_	regtypesend - _null_ ));
+DATA(insert OID = 2455 (  regtypesend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2206" _null_ _null_ _null_	regtypesend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2456 (  bit_recv			   PGNSP PGUID 12 1 0 f f t f i 3 1560 "2281 26 23" _null_ _null_ _null_  bit_recv - _null_ ));
+DATA(insert OID = 2456 (  bit_recv			   PGNSP PGUID 12 1 0 f f t f i 3 1560 "2281 26 23" _null_ _null_ _null_  bit_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2457 (  bit_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "1560" _null_ _null_ _null_	bit_send - _null_ ));
+DATA(insert OID = 2457 (  bit_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "1560" _null_ _null_ _null_	bit_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2458 (  varbit_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1562 "2281 26 23" _null_ _null_ _null_  varbit_recv - _null_ ));
+DATA(insert OID = 2458 (  varbit_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1562 "2281 26 23" _null_ _null_ _null_  varbit_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2459 (  varbit_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1562" _null_ _null_ _null_	varbit_send - _null_ ));
+DATA(insert OID = 2459 (  varbit_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1562" _null_ _null_ _null_	varbit_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2460 (  numeric_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1700 "2281 26 23" _null_ _null_ _null_  numeric_recv - _null_ ));
+DATA(insert OID = 2460 (  numeric_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1700 "2281 26 23" _null_ _null_ _null_  numeric_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2461 (  numeric_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1700" _null_ _null_ _null_	numeric_send - _null_ ));
+DATA(insert OID = 2461 (  numeric_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1700" _null_ _null_ _null_	numeric_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2462 (  abstimerecv		   PGNSP PGUID 12 1 0 f f t f i 1 702 "2281" _null_ _null_ _null_  abstimerecv - _null_ ));
+DATA(insert OID = 2462 (  abstimerecv		   PGNSP PGUID 12 1 0 f f t f i 1 702 "2281" _null_ _null_ _null_  abstimerecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2463 (  abstimesend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "702" _null_ _null_ _null_ abstimesend - _null_ ));
+DATA(insert OID = 2463 (  abstimesend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "702" _null_ _null_ _null_ abstimesend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2464 (  reltimerecv		   PGNSP PGUID 12 1 0 f f t f i 1 703 "2281" _null_ _null_ _null_  reltimerecv - _null_ ));
+DATA(insert OID = 2464 (  reltimerecv		   PGNSP PGUID 12 1 0 f f t f i 1 703 "2281" _null_ _null_ _null_  reltimerecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2465 (  reltimesend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "703" _null_ _null_ _null_ reltimesend - _null_ ));
+DATA(insert OID = 2465 (  reltimesend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "703" _null_ _null_ _null_ reltimesend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2466 (  tintervalrecv		   PGNSP PGUID 12 1 0 f f t f i 1 704 "2281" _null_ _null_ _null_  tintervalrecv - _null_ ));
+DATA(insert OID = 2466 (  tintervalrecv		   PGNSP PGUID 12 1 0 f f t f i 1 704 "2281" _null_ _null_ _null_  tintervalrecv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2467 (  tintervalsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "704" _null_ _null_ _null_ tintervalsend - _null_ ));
+DATA(insert OID = 2467 (  tintervalsend		   PGNSP PGUID 12 1 0 f f t f i 1 17 "704" _null_ _null_ _null_ tintervalsend - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2468 (  date_recv			   PGNSP PGUID 12 1 0 f f t f i 1 1082 "2281" _null_ _null_ _null_	date_recv - _null_ ));
+DATA(insert OID = 2468 (  date_recv			   PGNSP PGUID 12 1 0 f f t f i 1 1082 "2281" _null_ _null_ _null_	date_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2469 (  date_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "1082" _null_ _null_ _null_	date_send - _null_ ));
+DATA(insert OID = 2469 (  date_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "1082" _null_ _null_ _null_	date_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2470 (  time_recv			   PGNSP PGUID 12 1 0 f f t f i 3 1083 "2281 26 23" _null_ _null_ _null_  time_recv - _null_ ));
+DATA(insert OID = 2470 (  time_recv			   PGNSP PGUID 12 1 0 f f t f i 3 1083 "2281 26 23" _null_ _null_ _null_  time_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2471 (  time_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "1083" _null_ _null_ _null_	time_send - _null_ ));
+DATA(insert OID = 2471 (  time_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "1083" _null_ _null_ _null_	time_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2472 (  timetz_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1266 "2281 26 23" _null_ _null_ _null_  timetz_recv - _null_ ));
+DATA(insert OID = 2472 (  timetz_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1266 "2281 26 23" _null_ _null_ _null_  timetz_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2473 (  timetz_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1266" _null_ _null_ _null_	timetz_send - _null_ ));
+DATA(insert OID = 2473 (  timetz_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1266" _null_ _null_ _null_	timetz_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2474 (  timestamp_recv	   PGNSP PGUID 12 1 0 f f t f i 3 1114 "2281 26 23" _null_ _null_ _null_  timestamp_recv - _null_ ));
+DATA(insert OID = 2474 (  timestamp_recv	   PGNSP PGUID 12 1 0 f f t f i 3 1114 "2281 26 23" _null_ _null_ _null_  timestamp_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2475 (  timestamp_send	   PGNSP PGUID 12 1 0 f f t f i 1 17 "1114" _null_ _null_ _null_	timestamp_send - _null_ ));
+DATA(insert OID = 2475 (  timestamp_send	   PGNSP PGUID 12 1 0 f f t f i 1 17 "1114" _null_ _null_ _null_	timestamp_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2476 (  timestamptz_recv	   PGNSP PGUID 12 1 0 f f t f i 3 1184 "2281 26 23" _null_ _null_ _null_  timestamptz_recv - _null_ ));
+DATA(insert OID = 2476 (  timestamptz_recv	   PGNSP PGUID 12 1 0 f f t f i 3 1184 "2281 26 23" _null_ _null_ _null_  timestamptz_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2477 (  timestamptz_send	   PGNSP PGUID 12 1 0 f f t f i 1 17 "1184" _null_ _null_ _null_	timestamptz_send - _null_ ));
+DATA(insert OID = 2477 (  timestamptz_send	   PGNSP PGUID 12 1 0 f f t f i 1 17 "1184" _null_ _null_ _null_	timestamptz_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2478 (  interval_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1186 "2281 26 23" _null_ _null_ _null_  interval_recv - _null_ ));
+DATA(insert OID = 2478 (  interval_recv		   PGNSP PGUID 12 1 0 f f t f i 3 1186 "2281 26 23" _null_ _null_ _null_  interval_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2479 (  interval_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1186" _null_ _null_ _null_	interval_send - _null_ ));
+DATA(insert OID = 2479 (  interval_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "1186" _null_ _null_ _null_	interval_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2480 (  lseg_recv			   PGNSP PGUID 12 1 0 f f t f i 1 601 "2281" _null_ _null_ _null_  lseg_recv - _null_ ));
+DATA(insert OID = 2480 (  lseg_recv			   PGNSP PGUID 12 1 0 f f t f i 1 601 "2281" _null_ _null_ _null_  lseg_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2481 (  lseg_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "601" _null_ _null_ _null_ lseg_send - _null_ ));
+DATA(insert OID = 2481 (  lseg_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "601" _null_ _null_ _null_ lseg_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2482 (  path_recv			   PGNSP PGUID 12 1 0 f f t f i 1 602 "2281" _null_ _null_ _null_  path_recv - _null_ ));
+DATA(insert OID = 2482 (  path_recv			   PGNSP PGUID 12 1 0 f f t f i 1 602 "2281" _null_ _null_ _null_  path_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2483 (  path_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "602" _null_ _null_ _null_ path_send - _null_ ));
+DATA(insert OID = 2483 (  path_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "602" _null_ _null_ _null_ path_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2484 (  box_recv			   PGNSP PGUID 12 1 0 f f t f i 1 603 "2281" _null_ _null_ _null_  box_recv - _null_ ));
+DATA(insert OID = 2484 (  box_recv			   PGNSP PGUID 12 1 0 f f t f i 1 603 "2281" _null_ _null_ _null_  box_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2485 (  box_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "603" _null_ _null_ _null_ box_send - _null_ ));
+DATA(insert OID = 2485 (  box_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "603" _null_ _null_ _null_ box_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2486 (  poly_recv			   PGNSP PGUID 12 1 0 f f t f i 1 604 "2281" _null_ _null_ _null_  poly_recv - _null_ ));
+DATA(insert OID = 2486 (  poly_recv			   PGNSP PGUID 12 1 0 f f t f i 1 604 "2281" _null_ _null_ _null_  poly_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2487 (  poly_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "604" _null_ _null_ _null_ poly_send - _null_ ));
+DATA(insert OID = 2487 (  poly_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "604" _null_ _null_ _null_ poly_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2488 (  line_recv			   PGNSP PGUID 12 1 0 f f t f i 1 628 "2281" _null_ _null_ _null_  line_recv - _null_ ));
+DATA(insert OID = 2488 (  line_recv			   PGNSP PGUID 12 1 0 f f t f i 1 628 "2281" _null_ _null_ _null_  line_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2489 (  line_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "628" _null_ _null_ _null_ line_send - _null_ ));
+DATA(insert OID = 2489 (  line_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "628" _null_ _null_ _null_ line_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2490 (  circle_recv		   PGNSP PGUID 12 1 0 f f t f i 1 718 "2281" _null_ _null_ _null_  circle_recv - _null_ ));
+DATA(insert OID = 2490 (  circle_recv		   PGNSP PGUID 12 1 0 f f t f i 1 718 "2281" _null_ _null_ _null_  circle_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2491 (  circle_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "718" _null_ _null_ _null_ circle_send - _null_ ));
+DATA(insert OID = 2491 (  circle_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "718" _null_ _null_ _null_ circle_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2492 (  cash_recv			   PGNSP PGUID 12 1 0 f f t f i 1 790 "2281" _null_ _null_ _null_  cash_recv - _null_ ));
+DATA(insert OID = 2492 (  cash_recv			   PGNSP PGUID 12 1 0 f f t f i 1 790 "2281" _null_ _null_ _null_  cash_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2493 (  cash_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "790" _null_ _null_ _null_ cash_send - _null_ ));
+DATA(insert OID = 2493 (  cash_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "790" _null_ _null_ _null_ cash_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2494 (  macaddr_recv		   PGNSP PGUID 12 1 0 f f t f i 1 829 "2281" _null_ _null_ _null_  macaddr_recv - _null_ ));
+DATA(insert OID = 2494 (  macaddr_recv		   PGNSP PGUID 12 1 0 f f t f i 1 829 "2281" _null_ _null_ _null_  macaddr_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2495 (  macaddr_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "829" _null_ _null_ _null_ macaddr_send - _null_ ));
+DATA(insert OID = 2495 (  macaddr_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "829" _null_ _null_ _null_ macaddr_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2496 (  inet_recv			   PGNSP PGUID 12 1 0 f f t f i 1 869 "2281" _null_ _null_ _null_  inet_recv - _null_ ));
+DATA(insert OID = 2496 (  inet_recv			   PGNSP PGUID 12 1 0 f f t f i 1 869 "2281" _null_ _null_ _null_  inet_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2497 (  inet_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "869" _null_ _null_ _null_ inet_send - _null_ ));
+DATA(insert OID = 2497 (  inet_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "869" _null_ _null_ _null_ inet_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2498 (  cidr_recv			   PGNSP PGUID 12 1 0 f f t f i 1 650 "2281" _null_ _null_ _null_  cidr_recv - _null_ ));
+DATA(insert OID = 2498 (  cidr_recv			   PGNSP PGUID 12 1 0 f f t f i 1 650 "2281" _null_ _null_ _null_  cidr_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2499 (  cidr_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "650" _null_ _null_ _null_ cidr_send - _null_ ));
+DATA(insert OID = 2499 (  cidr_send			   PGNSP PGUID 12 1 0 f f t f i 1 17 "650" _null_ _null_ _null_ cidr_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2500 (  cstring_recv		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "2281" _null_ _null_ _null_	cstring_recv - _null_ ));
+DATA(insert OID = 2500 (  cstring_recv		   PGNSP PGUID 12 1 0 f f t f s 1 2275 "2281" _null_ _null_ _null_	cstring_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2501 (  cstring_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "2275" _null_ _null_ _null_	cstring_send - _null_ ));
+DATA(insert OID = 2501 (  cstring_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "2275" _null_ _null_ _null_	cstring_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2502 (  anyarray_recv		   PGNSP PGUID 12 1 0 f f t f s 1 2277 "2281" _null_ _null_ _null_	anyarray_recv - _null_ ));
+DATA(insert OID = 2502 (  anyarray_recv		   PGNSP PGUID 12 1 0 f f t f s 1 2277 "2281" _null_ _null_ _null_	anyarray_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2503 (  anyarray_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "2277" _null_ _null_ _null_	anyarray_send - _null_ ));
+DATA(insert OID = 2503 (  anyarray_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "2277" _null_ _null_ _null_	anyarray_send - _null_ _null_ ));
 DESCR("I/O");
 
 /* System-view support functions with pretty-print option */
-DATA(insert OID = 2504 (  pg_get_ruledef	   PGNSP PGUID 12 1 0 f f t f s 2 25 "26 16" _null_ _null_ _null_  pg_get_ruledef_ext - _null_ ));
+DATA(insert OID = 2504 (  pg_get_ruledef	   PGNSP PGUID 12 1 0 f f t f s 2 25 "26 16" _null_ _null_ _null_  pg_get_ruledef_ext - _null_ _null_ ));
 DESCR("source text of a rule with pretty-print option");
-DATA(insert OID = 2505 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 2 25 "25 16" _null_ _null_ _null_  pg_get_viewdef_name_ext - _null_ ));
+DATA(insert OID = 2505 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 2 25 "25 16" _null_ _null_ _null_  pg_get_viewdef_name_ext - _null_ _null_ ));
 DESCR("select statement of a view with pretty-print option");
-DATA(insert OID = 2506 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 2 25 "26 16" _null_ _null_ _null_  pg_get_viewdef_ext - _null_ ));
+DATA(insert OID = 2506 (  pg_get_viewdef	   PGNSP PGUID 12 1 0 f f t f s 2 25 "26 16" _null_ _null_ _null_  pg_get_viewdef_ext - _null_ _null_ ));
 DESCR("select statement of a view with pretty-print option");
-DATA(insert OID = 2507 (  pg_get_indexdef	   PGNSP PGUID 12 1 0 f f t f s 3 25 "26 23 16" _null_ _null_ _null_	pg_get_indexdef_ext - _null_ ));
+DATA(insert OID = 2507 (  pg_get_indexdef	   PGNSP PGUID 12 1 0 f f t f s 3 25 "26 23 16" _null_ _null_ _null_	pg_get_indexdef_ext - _null_ _null_ ));
 DESCR("index description (full create statement or single expression) with pretty-print option");
-DATA(insert OID = 2508 (  pg_get_constraintdef PGNSP PGUID 12 1 0 f f t f s 2 25 "26 16" _null_ _null_ _null_  pg_get_constraintdef_ext - _null_ ));
+DATA(insert OID = 2508 (  pg_get_constraintdef PGNSP PGUID 12 1 0 f f t f s 2 25 "26 16" _null_ _null_ _null_  pg_get_constraintdef_ext - _null_ _null_ ));
 DESCR("constraint description with pretty-print option");
-DATA(insert OID = 2509 (  pg_get_expr		   PGNSP PGUID 12 1 0 f f t f s 3 25 "25 26 16" _null_ _null_ _null_ pg_get_expr_ext - _null_ ));
+DATA(insert OID = 2509 (  pg_get_expr		   PGNSP PGUID 12 1 0 f f t f s 3 25 "25 26 16" _null_ _null_ _null_ pg_get_expr_ext - _null_ _null_ ));
 DESCR("deparse an encoded expression with pretty-print option");
-DATA(insert OID = 2510 (  pg_prepared_statement PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" _null_ _null_ _null_ pg_prepared_statement - _null_ ));
+DATA(insert OID = 2510 (  pg_prepared_statement PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" _null_ _null_ _null_ pg_prepared_statement - _null_ _null_ ));
 DESCR("get the prepared statements for this session");
-DATA(insert OID = 2511 (  pg_cursor PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" _null_ _null_ _null_ pg_cursor - _null_ ));
+DATA(insert OID = 2511 (  pg_cursor PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" _null_ _null_ _null_ pg_cursor - _null_ _null_ ));
 DESCR("get the open cursors for this session");
-DATA(insert OID = 2599 (  pg_timezone_abbrevs	PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" "{25,1186,16}" "{o,o,o}" "{abbrev,utc_offset,is_dst}" pg_timezone_abbrevs - _null_ ));
+DATA(insert OID = 2599 (  pg_timezone_abbrevs	PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" "{25,1186,16}" "{o,o,o}" "{abbrev,utc_offset,is_dst}" pg_timezone_abbrevs - _null_ _null_ ));
 DESCR("get the available time zone abbreviations");
-DATA(insert OID = 2856 (  pg_timezone_names		PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" "{25,25,1186,16}" "{o,o,o,o}" "{name,abbrev,utc_offset,is_dst}" pg_timezone_names - _null_ ));
+DATA(insert OID = 2856 (  pg_timezone_names		PGNSP PGUID 12 1 1000 f f t t s 0 2249 "" "{25,25,1186,16}" "{o,o,o,o}" "{name,abbrev,utc_offset,is_dst}" pg_timezone_names - _null_ _null_ ));
 DESCR("get the available time zone names");
 
 /* non-persistent series generator */
-DATA(insert OID = 1066 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 3 23 "23 23 23" _null_ _null_ _null_ generate_series_step_int4 - _null_ ));
+DATA(insert OID = 1066 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 3 23 "23 23 23" _null_ _null_ _null_ generate_series_step_int4 - _null_ _null_ ));
 DESCR("non-persistent series generator");
-DATA(insert OID = 1067 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 2 23 "23 23" _null_ _null_ _null_ generate_series_int4 - _null_ ));
+DATA(insert OID = 1067 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 2 23 "23 23" _null_ _null_ _null_ generate_series_int4 - _null_ _null_ ));
 DESCR("non-persistent series generator");
-DATA(insert OID = 1068 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 3 20 "20 20 20" _null_ _null_ _null_ generate_series_step_int8 - _null_ ));
+DATA(insert OID = 1068 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 3 20 "20 20 20" _null_ _null_ _null_ generate_series_step_int8 - _null_ _null_ ));
 DESCR("non-persistent series generator");
-DATA(insert OID = 1069 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 2 20 "20 20" _null_ _null_ _null_ generate_series_int8 - _null_ ));
+DATA(insert OID = 1069 (  generate_series PGNSP PGUID 12 1 1000 f f t t v 2 20 "20 20" _null_ _null_ _null_ generate_series_int8 - _null_ _null_ ));
 DESCR("non-persistent series generator");
 
 /* boolean aggregates */
-DATA(insert OID = 2515 ( booland_statefunc			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ booland_statefunc - _null_ ));
+DATA(insert OID = 2515 ( booland_statefunc			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ booland_statefunc - _null_ _null_ ));
 DESCR("boolean-and aggregate transition function");
-DATA(insert OID = 2516 ( boolor_statefunc			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boolor_statefunc - _null_ ));
+DATA(insert OID = 2516 ( boolor_statefunc			   PGNSP PGUID 12 1 0 f f t f i 2 16 "16 16" _null_ _null_ _null_ boolor_statefunc - _null_ _null_ ));
 DESCR("boolean-or aggregate transition function");
-DATA(insert OID = 2517 ( bool_and					   PGNSP PGUID 12 1 0 t f f f i 1 16 "16" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DATA(insert OID = 2517 ( bool_and					   PGNSP PGUID 12 1 0 t f f f i 1 16 "16" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("boolean-and aggregate");
 /* ANY, SOME? These names conflict with subquery operators. See doc. */
-DATA(insert OID = 2518 ( bool_or					   PGNSP PGUID 12 1 0 t f f f i 1 16 "16" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DATA(insert OID = 2518 ( bool_or					   PGNSP PGUID 12 1 0 t f f f i 1 16 "16" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("boolean-or aggregate");
-DATA(insert OID = 2519 ( every						   PGNSP PGUID 12 1 0 t f f f i 1 16 "16" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DATA(insert OID = 2519 ( every						   PGNSP PGUID 12 1 0 t f f f i 1 16 "16" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("boolean-and aggregate");
 
 /* bitwise integer aggregates */
-DATA(insert OID = 2236 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2236 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-and smallint aggregate");
-DATA(insert OID = 2237 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2237 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 21 "21" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-or smallint aggregate");
-DATA(insert OID = 2238 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2238 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-and integer aggregate");
-DATA(insert OID = 2239 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2239 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 23 "23" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-or integer aggregate");
-DATA(insert OID = 2240 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2240 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-and bigint aggregate");
-DATA(insert OID = 2241 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2241 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 20 "20" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-or bigint aggregate");
-DATA(insert OID = 2242 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 1560 "1560" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2242 ( bit_and					   PGNSP PGUID 12 1 0 t f f f i 1 1560 "1560" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-and bit aggregate");
-DATA(insert OID = 2243 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 1560 "1560" _null_ _null_ _null_ aggregate_dummy - _null_));
+DATA(insert OID = 2243 ( bit_or						   PGNSP PGUID 12 1 0 t f f f i 1 1560 "1560" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("bitwise-or bit aggregate");
 
 /* formerly-missing interval + datetime operators */
-DATA(insert OID = 2546 ( interval_pl_date			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1114 f "1186 1082" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ c ));
-DATA(insert OID = 2547 ( interval_pl_timetz			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1266 f "1186 1266" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ c ));
-DATA(insert OID = 2548 ( interval_pl_timestamp			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1114 f "1186 1114" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ c ));
-DATA(insert OID = 2549 ( interval_pl_timestamptz			PGNSP PGUID 14 1 0 0 f f t f s 2 0 1184 f "1186 1184" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ c ));
-DATA(insert OID = 2550 ( integer_pl_date			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1082 f "23 1082" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ c ));
+DATA(insert OID = 2546 ( interval_pl_date			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1114 f "1186 1082" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ _null_ c ));
+DATA(insert OID = 2547 ( interval_pl_timetz			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1266 f "1186 1266" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ _null_ c ));
+DATA(insert OID = 2548 ( interval_pl_timestamp			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1114 f "1186 1114" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ _null_ c ));
+DATA(insert OID = 2549 ( interval_pl_timestamptz			PGNSP PGUID 14 1 0 0 f f t f s 2 0 1184 f "1186 1184" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ _null_ c ));
+DATA(insert OID = 2550 ( integer_pl_date			PGNSP PGUID 14 1 0 0 f f t f i 2 0 1082 f "23 1082" _null_ _null_ _null_ _null_ "select $2 + $1" - _null_ _null_ c ));
 
-DATA(insert OID = 2556 ( pg_tablespace_databases	PGNSP PGUID 12 1 1000 f f t t s 1 26 "26" _null_ _null_ _null_ pg_tablespace_databases - _null_));
+DATA(insert OID = 2556 ( pg_tablespace_databases	PGNSP PGUID 12 1 1000 f f t t s 1 26 "26" _null_ _null_ _null_ pg_tablespace_databases - _null_ _null_ ));
 DESCR("returns database oids in a tablespace");
 
-DATA(insert OID = 2557 ( bool				   PGNSP PGUID 12 1 0 f f t f i 1  16 "23" _null_ _null_ _null_ int4_bool - _null_ ));
+DATA(insert OID = 2557 ( bool				   PGNSP PGUID 12 1 0 f f t f i 1  16 "23" _null_ _null_ _null_ int4_bool - _null_ _null_ ));
 DESCR("convert int4 to boolean");
-DATA(insert OID = 2558 ( int4				   PGNSP PGUID 12 1 0 f f t f i 1  23 "16" _null_ _null_ _null_ bool_int4 - _null_ ));
+DATA(insert OID = 2558 ( int4				   PGNSP PGUID 12 1 0 f f t f i 1  23 "16" _null_ _null_ _null_ bool_int4 - _null_ _null_ ));
 DESCR("convert boolean to int4");
-DATA(insert OID = 2559 ( lastval			   PGNSP PGUID 12 1 0 f f t f v 0 20 "" _null_ _null_ _null_	lastval - _null_ ));
+DATA(insert OID = 2559 ( lastval			   PGNSP PGUID 12 1 0 f f t f v 0 20 "" _null_ _null_ _null_	lastval - _null_ _null_ ));
 DESCR("current value from last used sequence");
 
 /* start time function */
-DATA(insert OID = 2560 (  pg_postmaster_start_time PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ pgsql_postmaster_start_time - _null_ ));
+DATA(insert OID = 2560 (  pg_postmaster_start_time PGNSP PGUID 12 1 0 f f t f s 0 1184 "" _null_ _null_ _null_ pgsql_postmaster_start_time - _null_ _null_ ));
 DESCR("postmaster start time");
 
 /* new functions for Y-direction rtree opclasses */
-DATA(insert OID = 2562 (  box_below		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_below - _null_ ));
+DATA(insert OID = 2562 (  box_below		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_below - _null_ _null_ ));
 DESCR("is below");
-DATA(insert OID = 2563 (  box_overbelow    PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overbelow - _null_ ));
+DATA(insert OID = 2563 (  box_overbelow    PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overbelow - _null_ _null_ ));
 DESCR("overlaps or is below");
-DATA(insert OID = 2564 (  box_overabove    PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overabove - _null_ ));
+DATA(insert OID = 2564 (  box_overabove    PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_overabove - _null_ _null_ ));
 DESCR("overlaps or is above");
-DATA(insert OID = 2565 (  box_above		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_above - _null_ ));
+DATA(insert OID = 2565 (  box_above		   PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_above - _null_ _null_ ));
 DESCR("is above");
-DATA(insert OID = 2566 (  poly_below	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_below - _null_ ));
+DATA(insert OID = 2566 (  poly_below	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_below - _null_ _null_ ));
 DESCR("is below");
-DATA(insert OID = 2567 (  poly_overbelow   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overbelow - _null_ ));
+DATA(insert OID = 2567 (  poly_overbelow   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overbelow - _null_ _null_ ));
 DESCR("overlaps or is below");
-DATA(insert OID = 2568 (  poly_overabove   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overabove - _null_ ));
+DATA(insert OID = 2568 (  poly_overabove   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_overabove - _null_ _null_ ));
 DESCR("overlaps or is above");
-DATA(insert OID = 2569 (  poly_above	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_above - _null_ ));
+DATA(insert OID = 2569 (  poly_above	   PGNSP PGUID 12 1 0 f f t f i 2 16 "604 604" _null_ _null_ _null_ poly_above - _null_ _null_ ));
 DESCR("is above");
-DATA(insert OID = 2587 (  circle_overbelow		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overbelow - _null_ ));
+DATA(insert OID = 2587 (  circle_overbelow		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overbelow - _null_ _null_ ));
 DESCR("overlaps or is below");
-DATA(insert OID = 2588 (  circle_overabove		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overabove - _null_ ));
+DATA(insert OID = 2588 (  circle_overabove		PGNSP PGUID 12 1 0 f f t f i 2	16 "718 718" _null_ _null_ _null_  circle_overabove - _null_ _null_ ));
 DESCR("overlaps or is above");
 
 /* support functions for GiST r-tree emulation */
-DATA(insert OID = 2578 (  gist_box_consistent	PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 603 23" _null_ _null_ _null_	gist_box_consistent - _null_ ));
+DATA(insert OID = 2578 (  gist_box_consistent	PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 603 23" _null_ _null_ _null_	gist_box_consistent - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2579 (  gist_box_compress		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_box_compress - _null_ ));
+DATA(insert OID = 2579 (  gist_box_compress		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_box_compress - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2580 (  gist_box_decompress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_box_decompress - _null_ ));
+DATA(insert OID = 2580 (  gist_box_decompress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_box_decompress - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2581 (  gist_box_penalty		PGNSP PGUID 12 1 0 f f t f i 3 2281 "2281 2281 2281" _null_ _null_ _null_	gist_box_penalty - _null_ ));
+DATA(insert OID = 2581 (  gist_box_penalty		PGNSP PGUID 12 1 0 f f t f i 3 2281 "2281 2281 2281" _null_ _null_ _null_	gist_box_penalty - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2582 (  gist_box_picksplit	PGNSP PGUID 12 1 0 f f t f i 2 2281 "2281 2281" _null_ _null_ _null_	gist_box_picksplit - _null_ ));
+DATA(insert OID = 2582 (  gist_box_picksplit	PGNSP PGUID 12 1 0 f f t f i 2 2281 "2281 2281" _null_ _null_ _null_	gist_box_picksplit - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2583 (  gist_box_union		PGNSP PGUID 12 1 0 f f t f i 2 603 "2281 2281" _null_ _null_ _null_ gist_box_union - _null_ ));
+DATA(insert OID = 2583 (  gist_box_union		PGNSP PGUID 12 1 0 f f t f i 2 603 "2281 2281" _null_ _null_ _null_ gist_box_union - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2584 (  gist_box_same			PGNSP PGUID 12 1 0 f f t f i 3 2281 "603 603 2281" _null_ _null_ _null_ gist_box_same - _null_ ));
+DATA(insert OID = 2584 (  gist_box_same			PGNSP PGUID 12 1 0 f f t f i 3 2281 "603 603 2281" _null_ _null_ _null_ gist_box_same - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2585 (  gist_poly_consistent	PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 604 23" _null_ _null_ _null_	gist_poly_consistent - _null_ ));
+DATA(insert OID = 2585 (  gist_poly_consistent	PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 604 23" _null_ _null_ _null_	gist_poly_consistent - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2586 (  gist_poly_compress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_poly_compress - _null_ ));
+DATA(insert OID = 2586 (  gist_poly_compress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_poly_compress - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2591 (  gist_circle_consistent PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 718 23" _null_ _null_ _null_	gist_circle_consistent - _null_ ));
+DATA(insert OID = 2591 (  gist_circle_consistent PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 718 23" _null_ _null_ _null_	gist_circle_consistent - _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2592 (  gist_circle_compress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_circle_compress - _null_ ));
+DATA(insert OID = 2592 (  gist_circle_compress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gist_circle_compress - _null_ _null_ ));
 DESCR("GiST support");
 
 /* GIN */
-DATA(insert OID = 2730 (  gingettuple	   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  gingettuple - _null_ ));
+DATA(insert OID = 2730 (  gingettuple	   PGNSP PGUID 12 1 0 f f t f v 2 16 "2281 2281" _null_ _null_ _null_  gingettuple - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2731 (  gingetmulti	   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_	gingetmulti - _null_ ));
+DATA(insert OID = 2731 (  gingetmulti	   PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_	gingetmulti - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2732 (  gininsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	gininsert - _null_ ));
+DATA(insert OID = 2732 (  gininsert		   PGNSP PGUID 12 1 0 f f t f v 6 16 "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_	gininsert - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2733 (  ginbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	ginbeginscan - _null_ ));
+DATA(insert OID = 2733 (  ginbeginscan	   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_	ginbeginscan - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2734 (  ginrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ ginrescan - _null_ ));
+DATA(insert OID = 2734 (  ginrescan		   PGNSP PGUID 12 1 0 f f t f v 2 2278 "2281 2281" _null_ _null_ _null_ ginrescan - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2735 (  ginendscan	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	ginendscan - _null_ ));
+DATA(insert OID = 2735 (  ginendscan	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	ginendscan - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2736 (  ginmarkpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	ginmarkpos - _null_ ));
+DATA(insert OID = 2736 (  ginmarkpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	ginmarkpos - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2737 (  ginrestrpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	ginrestrpos - _null_ ));
+DATA(insert OID = 2737 (  ginrestrpos	   PGNSP PGUID 12 1 0 f f t f v 1 2278 "2281" _null_ _null_ _null_	ginrestrpos - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2738 (  ginbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ ginbuild - _null_ ));
+DATA(insert OID = 2738 (  ginbuild		   PGNSP PGUID 12 1 0 f f t f v 3 2281 "2281 2281 2281" _null_ _null_ _null_ ginbuild - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2739 (  ginbulkdelete    PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ ginbulkdelete - _null_ ));
+DATA(insert OID = 2739 (  ginbulkdelete    PGNSP PGUID 12 1 0 f f t f v 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ ginbulkdelete - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2740 (  ginvacuumcleanup PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ ginvacuumcleanup - _null_ ));
+DATA(insert OID = 2740 (  ginvacuumcleanup PGNSP PGUID 12 1 0 f f t f v 2 2281 "2281 2281" _null_ _null_ _null_ ginvacuumcleanup - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2741 (  gincostestimate  PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  gincostestimate - _null_ ));
+DATA(insert OID = 2741 (  gincostestimate  PGNSP PGUID 12 1 0 f f t f v 8 2278 "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_  gincostestimate - _null_ _null_ ));
 DESCR("gin(internal)");
-DATA(insert OID = 2788 (  ginoptions	   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  ginoptions - _null_ ));
+DATA(insert OID = 2788 (  ginoptions	   PGNSP PGUID 12 1 0 f f t f s 2 17 "1009 16" _null_ _null_ _null_  ginoptions - _null_ _null_ ));
 DESCR("gin(internal)");
 
 /* GIN array support */
-DATA(insert OID = 2743 (  ginarrayextract	 PGNSP PGUID 12 1 0 f f t f i 2 2281 "2277 2281" _null_ _null_ _null_	ginarrayextract - _null_ ));
+DATA(insert OID = 2743 (  ginarrayextract	 PGNSP PGUID 12 1 0 f f t f i 2 2281 "2277 2281" _null_ _null_ _null_	ginarrayextract - _null_ _null_ ));
 DESCR("GIN array support");
-DATA(insert OID = 2744 (  ginarrayconsistent PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 21 2281" _null_ _null_ _null_	ginarrayconsistent - _null_ ));
+DATA(insert OID = 2774 (  ginqueryarrayextract	PGNSP PGUID 12 1 0 f f t f i 3 2281 "2277 2281 21" _null_ _null_ _null_ ginqueryarrayextract - _null_ _null_ ));
+DESCR("GIN array support");
+DATA(insert OID = 2744 (  ginarrayconsistent PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 21 2281" _null_ _null_ _null_	ginarrayconsistent - _null_ _null_ ));
 DESCR("GIN array support");
 
 /* overlap/contains/contained */
-DATA(insert OID = 2747 (  arrayoverlap		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ arrayoverlap - _null_ ));
+DATA(insert OID = 2747 (  arrayoverlap		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ arrayoverlap - _null_ _null_ ));
 DESCR("overlaps");
-DATA(insert OID = 2748 (  arraycontains		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ arraycontains - _null_ ));
+DATA(insert OID = 2748 (  arraycontains		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ arraycontains - _null_ _null_ ));
 DESCR("contains");
-DATA(insert OID = 2749 (  arraycontained	   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ arraycontained - _null_ ));
+DATA(insert OID = 2749 (  arraycontained	   PGNSP PGUID 12 1 0 f f t f i 2 16 "2277 2277" _null_ _null_ _null_ arraycontained - _null_ _null_ ));
 DESCR("is contained by");
 
 /* userlock replacements */
-DATA(insert OID = 2880 (  pg_advisory_lock				PGNSP PGUID 12 1 0 f f t f v 1 2278 "20" _null_ _null_ _null_ pg_advisory_lock_int8 - _null_ ));
+DATA(insert OID = 2880 (  pg_advisory_lock				PGNSP PGUID 12 1 0 f f t f v 1 2278 "20" _null_ _null_ _null_ pg_advisory_lock_int8 - _null_ _null_ ));
 DESCR("obtain exclusive advisory lock");
-DATA(insert OID = 2881 (  pg_advisory_lock_shared		PGNSP PGUID 12 1 0 f f t f v 1 2278 "20" _null_ _null_ _null_ pg_advisory_lock_shared_int8 - _null_ ));
+DATA(insert OID = 2881 (  pg_advisory_lock_shared		PGNSP PGUID 12 1 0 f f t f v 1 2278 "20" _null_ _null_ _null_ pg_advisory_lock_shared_int8 - _null_ _null_ ));
 DESCR("obtain shared advisory lock");
-DATA(insert OID = 2882 (  pg_try_advisory_lock			PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_try_advisory_lock_int8 - _null_ ));
+DATA(insert OID = 2882 (  pg_try_advisory_lock			PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_try_advisory_lock_int8 - _null_ _null_ ));
 DESCR("obtain exclusive advisory lock if available");
-DATA(insert OID = 2883 (  pg_try_advisory_lock_shared	PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_try_advisory_lock_shared_int8 - _null_ ));
+DATA(insert OID = 2883 (  pg_try_advisory_lock_shared	PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_try_advisory_lock_shared_int8 - _null_ _null_ ));
 DESCR("obtain shared advisory lock if available");
-DATA(insert OID = 2884 (  pg_advisory_unlock			PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_advisory_unlock_int8 - _null_ ));
+DATA(insert OID = 2884 (  pg_advisory_unlock			PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_advisory_unlock_int8 - _null_ _null_ ));
 DESCR("release exclusive advisory lock");
-DATA(insert OID = 2885 (  pg_advisory_unlock_shared		PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_advisory_unlock_shared_int8 - _null_ ));
+DATA(insert OID = 2885 (  pg_advisory_unlock_shared		PGNSP PGUID 12 1 0 f f t f v 1 16 "20" _null_ _null_ _null_ pg_advisory_unlock_shared_int8 - _null_ _null_ ));
 DESCR("release shared advisory lock");
-DATA(insert OID = 2886 (  pg_advisory_lock				PGNSP PGUID 12 1 0 f f t f v 2 2278 "23 23" _null_ _null_ _null_ pg_advisory_lock_int4 - _null_ ));
+DATA(insert OID = 2886 (  pg_advisory_lock				PGNSP PGUID 12 1 0 f f t f v 2 2278 "23 23" _null_ _null_ _null_ pg_advisory_lock_int4 - _null_ _null_ ));
 DESCR("obtain exclusive advisory lock");
-DATA(insert OID = 2887 (  pg_advisory_lock_shared		PGNSP PGUID 12 1 0 f f t f v 2 2278 "23 23" _null_ _null_ _null_ pg_advisory_lock_shared_int4 - _null_ ));
+DATA(insert OID = 2887 (  pg_advisory_lock_shared		PGNSP PGUID 12 1 0 f f t f v 2 2278 "23 23" _null_ _null_ _null_ pg_advisory_lock_shared_int4 - _null_ _null_ ));
 DESCR("obtain shared advisory lock");
-DATA(insert OID = 2888 (  pg_try_advisory_lock			PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_try_advisory_lock_int4 - _null_ ));
+DATA(insert OID = 2888 (  pg_try_advisory_lock			PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_try_advisory_lock_int4 - _null_ _null_ ));
 DESCR("obtain exclusive advisory lock if available");
-DATA(insert OID = 2889 (  pg_try_advisory_lock_shared	PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_try_advisory_lock_shared_int4 - _null_ ));
+DATA(insert OID = 2889 (  pg_try_advisory_lock_shared	PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_try_advisory_lock_shared_int4 - _null_ _null_ ));
 DESCR("obtain shared advisory lock if available");
-DATA(insert OID = 2890 (  pg_advisory_unlock			PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_advisory_unlock_int4 - _null_ ));
+DATA(insert OID = 2890 (  pg_advisory_unlock			PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_advisory_unlock_int4 - _null_ _null_ ));
 DESCR("release exclusive advisory lock");
-DATA(insert OID = 2891 (  pg_advisory_unlock_shared		PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_advisory_unlock_shared_int4 - _null_ ));
+DATA(insert OID = 2891 (  pg_advisory_unlock_shared		PGNSP PGUID 12 1 0 f f t f v 2 16 "23 23" _null_ _null_ _null_ pg_advisory_unlock_shared_int4 - _null_ _null_ ));
 DESCR("release shared advisory lock");
-DATA(insert OID = 2892 (  pg_advisory_unlock_all		PGNSP PGUID 12 1 0 f f t f v 0 2278 "" _null_ _null_ _null_ pg_advisory_unlock_all - _null_ ));
+DATA(insert OID = 2892 (  pg_advisory_unlock_all		PGNSP PGUID 12 1 0 f f t f v 0 2278 "" _null_ _null_ _null_ pg_advisory_unlock_all - _null_ _null_ ));
 DESCR("release all advisory locks");
 
 /* XML support */
-DATA(insert OID = 2893 (  xml_in		   PGNSP PGUID 12 1 0 f f t f i 1 142 "2275" _null_ _null_ _null_ xml_in - _null_ ));
+DATA(insert OID = 2893 (  xml_in		   PGNSP PGUID 12 1 0 f f t f s 1 142 "2275" _null_ _null_ _null_ xml_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2894 (  xml_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "142" _null_ _null_ _null_ xml_out - _null_ ));
+DATA(insert OID = 2894 (  xml_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "142" _null_ _null_ _null_ xml_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2896 (  xml			   PGNSP PGUID 12 1 0 f f t f i 1 142 "25" _null_ _null_ _null_ texttoxml - _null_ ));
-DESCR("perform a non-validating parse of a character string to produce an XML value");
-DATA(insert OID = 2895 (  xmlcomment	   PGNSP PGUID 12 1 0 f f t f i 1 142 "25" _null_ _null_ _null_ xmlcomment - _null_ ));
+DATA(insert OID = 2895 (  xmlcomment	   PGNSP PGUID 12 1 0 f f t f i 1 142 "25" _null_ _null_ _null_ xmlcomment - _null_ _null_ ));
 DESCR("generate an XML comment");
-DATA(insert OID = 2987 (  xmlvalidate 	   PGNSP PGUID 12 1 0 f f t f i 2 16 "142 25" _null_ _null_ _null_ xmlvalidate - _null_ ));
+DATA(insert OID = 2896 (  xml			   PGNSP PGUID 12 1 0 f f t f i 1 142 "25" _null_ _null_ _null_ texttoxml - _null_ _null_ ));
+DESCR("perform a non-validating parse of a character string to produce an XML value");
+DATA(insert OID = 2987 (  xmlvalidate 	   PGNSP PGUID 12 1 0 f f t f i 2 16 "142 25" _null_ _null_ _null_ xmlvalidate - _null_ _null_ ));
 DESCR("validate an XML value");
-DATA(insert OID = 2898 (  xml_recv		   PGNSP PGUID 12 1 0 f f t f s 1 142 "2281" _null_ _null_ _null_	xml_recv - _null_ ));
+DATA(insert OID = 2898 (  xml_recv		   PGNSP PGUID 12 1 0 f f t f s 1 142 "2281" _null_ _null_ _null_	xml_recv - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2899 (  xml_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "142" _null_ _null_ _null_	xml_send - _null_ ));
+DATA(insert OID = 2899 (  xml_send		   PGNSP PGUID 12 1 0 f f t f s 1 17 "142" _null_ _null_ _null_ xml_send - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2900 (  xmlconcat2       PGNSP PGUID 12 1 0 f f f f i 2 142 "142 142" _null_ _null_ _null_ xmlconcat2 - _null_ ));
+DATA(insert OID = 2900 (  xmlconcat2	   PGNSP PGUID 12 1 0 f f f f i 2 142 "142 142" _null_ _null_ _null_ xmlconcat2 - _null_ _null_ ));
 DESCR("aggregate transition function");
-DATA(insert OID = 2901 (  xmlagg           PGNSP PGUID 12 1 0 t f f f i 1 142 "142" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DATA(insert OID = 2901 (  xmlagg		   PGNSP PGUID 12 1 0 t f f f i 1 142 "142" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
 DESCR("concatenate XML values");
-DATA(insert OID = 2922 (  text             PGNSP PGUID 12 1 0 f f t f s 1 25 "142" _null_ _null_ _null_ xmltotext - _null_ ));
+DATA(insert OID = 2922 (  text			   PGNSP PGUID 12 1 0 f f t f i 1 25 "142" _null_ _null_ _null_ xmltotext - _null_ _null_ ));
 DESCR("serialize an XML value to a character string");
 
-DATA(insert OID = 2923 (  table_to_xml                PGNSP PGUID 12 100 0 f f t f s 4 142 "2205 16 16 25" _null_ _null_ "{tbl,nulls,tableforest,targetns}" table_to_xml - _null_ ));
+DATA(insert OID = 2923 (  table_to_xml				  PGNSP PGUID 12 100 0 f f t f s 4 142 "2205 16 16 25" _null_ _null_ "{tbl,nulls,tableforest,targetns}" table_to_xml - _null_ _null_ ));
 DESCR("map table contents to XML");
-DATA(insert OID = 2924 (  query_to_xml                PGNSP PGUID 12 100 0 f f t f s 4 142 "25 16 16 25" _null_ _null_ "{query,nulls,tableforest,targetns}" query_to_xml - _null_ ));
+DATA(insert OID = 2924 (  query_to_xml				  PGNSP PGUID 12 100 0 f f t f s 4 142 "25 16 16 25" _null_ _null_ "{query,nulls,tableforest,targetns}" query_to_xml - _null_ _null_ ));
 DESCR("map query result to XML");
-DATA(insert OID = 2925 (  cursor_to_xml               PGNSP PGUID 12 100 0 f f t f s 5 142 "1790 23 16 16 25" _null_ _null_ "{cursor,count,nulls,tableforest,targetns}" cursor_to_xml - _null_ ));
+DATA(insert OID = 2925 (  cursor_to_xml				  PGNSP PGUID 12 100 0 f f t f s 5 142 "1790 23 16 16 25" _null_ _null_ "{cursor,count,nulls,tableforest,targetns}" cursor_to_xml - _null_ _null_ ));
 DESCR("map rows from cursor to XML");
-DATA(insert OID = 2926 (  table_to_xmlschema          PGNSP PGUID 12 100 0 f f t f s 4 142 "2205 16 16 25" _null_ _null_ "{tbl,nulls,tableforest,targetns}" table_to_xmlschema - _null_ ));
+DATA(insert OID = 2926 (  table_to_xmlschema		  PGNSP PGUID 12 100 0 f f t f s 4 142 "2205 16 16 25" _null_ _null_ "{tbl,nulls,tableforest,targetns}" table_to_xmlschema - _null_ _null_ ));
 DESCR("map table structure to XML Schema");
-DATA(insert OID = 2927 (  query_to_xmlschema          PGNSP PGUID 12 100 0 f f t f s 4 142 "25 16 16 25" _null_ _null_ "{query,nulls,tableforest,targetns}" query_to_xmlschema - _null_ ));
+DATA(insert OID = 2927 (  query_to_xmlschema		  PGNSP PGUID 12 100 0 f f t f s 4 142 "25 16 16 25" _null_ _null_ "{query,nulls,tableforest,targetns}" query_to_xmlschema - _null_ _null_ ));
 DESCR("map query result structure to XML Schema");
-DATA(insert OID = 2928 (  cursor_to_xmlschema         PGNSP PGUID 12 100 0 f f t f s 4 142 "1790 16 16 25" _null_ _null_ "{cursor,nulls,tableforest,targetns}" cursor_to_xmlschema - _null_ ));
+DATA(insert OID = 2928 (  cursor_to_xmlschema		  PGNSP PGUID 12 100 0 f f t f s 4 142 "1790 16 16 25" _null_ _null_ "{cursor,nulls,tableforest,targetns}" cursor_to_xmlschema - _null_ _null_ ));
 DESCR("map cursor structure to XML Schema");
-DATA(insert OID = 2929 (  table_to_xml_and_xmlschema  PGNSP PGUID 12 100 0 f f t f s 4 142 "2205 16 16 25" _null_ _null_ "{tbl,nulls,tableforest,targetns}" table_to_xml_and_xmlschema - _null_ ));
+DATA(insert OID = 2929 (  table_to_xml_and_xmlschema  PGNSP PGUID 12 100 0 f f t f s 4 142 "2205 16 16 25" _null_ _null_ "{tbl,nulls,tableforest,targetns}" table_to_xml_and_xmlschema - _null_ _null_ ));
 DESCR("map table contents and structure to XML and XML Schema");
-DATA(insert OID = 2930 (  query_to_xml_and_xmlschema  PGNSP PGUID 12 100 0 f f t f s 4 142 "25 16 16 25" _null_ _null_ "{query,nulls,tableforest,targetns}" query_to_xml_and_xmlschema - _null_ ));
+DATA(insert OID = 2930 (  query_to_xml_and_xmlschema  PGNSP PGUID 12 100 0 f f t f s 4 142 "25 16 16 25" _null_ _null_ "{query,nulls,tableforest,targetns}" query_to_xml_and_xmlschema - _null_ _null_ ));
 DESCR("map query result and structure to XML and XML Schema");
 
+DATA(insert OID = 2933 (  schema_to_xml				  PGNSP PGUID 12 100 0 f f t f s 4 142 "19 16 16 25" _null_ _null_ "{schema,nulls,tableforest,targetns}" schema_to_xml - _null_ _null_ ));
+DESCR("map schema contents to XML");
+DATA(insert OID = 2934 (  schema_to_xmlschema		  PGNSP PGUID 12 100 0 f f t f s 4 142 "19 16 16 25" _null_ _null_ "{schema,nulls,tableforest,targetns}" schema_to_xmlschema - _null_ _null_ ));
+DESCR("map schema structure to XML Schema");
+DATA(insert OID = 2935 (  schema_to_xml_and_xmlschema PGNSP PGUID 12 100 0 f f t f s 4 142 "19 16 16 25" _null_ _null_ "{schema,nulls,tableforest,targetns}" schema_to_xml_and_xmlschema - _null_ _null_ ));
+DESCR("map schema contents and structure to XML and XML Schema");
+
+DATA(insert OID = 2936 (  database_to_xml			  PGNSP PGUID 12 100 0 f f t f s 3 142 "16 16 25" _null_ _null_ "{nulls,tableforest,targetns}" database_to_xml - _null_ _null_ ));
+DESCR("map database contents to XML");
+DATA(insert OID = 2937 (  database_to_xmlschema		  PGNSP PGUID 12 100 0 f f t f s 3 142 "16 16 25" _null_ _null_ "{nulls,tableforest,targetns}" database_to_xmlschema - _null_ _null_ ));
+DESCR("map database structure to XML Schema");
+DATA(insert OID = 2938 (  database_to_xml_and_xmlschema PGNSP PGUID 12 100 0 f f t f s 3 142 "16 16 25" _null_ _null_ "{nulls,tableforest,targetns}" database_to_xml_and_xmlschema - _null_ _null_ ));
+DESCR("map database contents and structure to XML and XML Schema");
+
+DATA(insert OID = 2931 (  xpath		 PGNSP PGUID 12 1 0 f f t f i 3 143 "25 142 1009" _null_ _null_ _null_ xpath - _null_ _null_ ));
+DESCR("evaluate XPath expression, with namespaces support");
+DATA(insert OID = 2932 (  xpath		 PGNSP PGUID 14 1 0 f f t f i 2 143 "25 142" _null_ _null_ _null_ "select pg_catalog.xpath($1, $2, ''{}''::pg_catalog.text[])" - _null_ _null_ ));
+DESCR("evaluate XPath expression");
 
-/* uuid */ 
-DATA(insert OID = 2952 (  uuid_in		   PGNSP PGUID 12 1 0 f f t f i 1 2950 "2275" _null_ _null_ _null_ uuid_in - _null_ ));
+/* uuid */
+DATA(insert OID = 2952 (  uuid_in		   PGNSP PGUID 12 1 0 f f t f i 1 2950 "2275" _null_ _null_ _null_ uuid_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2953 (  uuid_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "2950" _null_ _null_ _null_ uuid_out - _null_ ));
+DATA(insert OID = 2953 (  uuid_out		   PGNSP PGUID 12 1 0 f f t f i 1 2275 "2950" _null_ _null_ _null_ uuid_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2954 (  uuid_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_lt - _null_ ));
+DATA(insert OID = 2954 (  uuid_lt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_lt - _null_ _null_ ));
 DESCR("less-than");
-DATA(insert OID = 2955 (  uuid_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_le - _null_ ));
+DATA(insert OID = 2955 (  uuid_le		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_le - _null_ _null_ ));
 DESCR("less-than-or-equal");
-DATA(insert OID = 2956 (  uuid_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_eq - _null_ ));
+DATA(insert OID = 2956 (  uuid_eq		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_eq - _null_ _null_ ));
 DESCR("equal");
-DATA(insert OID = 2957 (  uuid_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_ge - _null_ ));
+DATA(insert OID = 2957 (  uuid_ge		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_ge - _null_ _null_ ));
 DESCR("greater-than-or-equal");
-DATA(insert OID = 2958 (  uuid_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_gt - _null_ ));
+DATA(insert OID = 2958 (  uuid_gt		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_gt - _null_ _null_ ));
 DESCR("greater-than");
-DATA(insert OID = 2959 (  uuid_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_ne - _null_ ));
+DATA(insert OID = 2959 (  uuid_ne		   PGNSP PGUID 12 1 0 f f t f i 2 16 "2950 2950" _null_ _null_ _null_ uuid_ne - _null_ _null_ ));
 DESCR("not-equal");
-DATA(insert OID = 2960 (  uuid_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "2950 2950" _null_ _null_ _null_ uuid_cmp - _null_ ));
+DATA(insert OID = 2960 (  uuid_cmp		   PGNSP PGUID 12 1 0 f f t f i 2 23 "2950 2950" _null_ _null_ _null_ uuid_cmp - _null_ _null_ ));
 DESCR("btree less-equal-greater");
-DATA(insert OID = 2961 (  uuid_recv		   PGNSP PGUID 12 1 0 f f t f i 1 2950 "2281" _null_ _null_ _null_ uuid_recv - _null_ ));
+DATA(insert OID = 2961 (  uuid_recv		   PGNSP PGUID 12 1 0 f f t f i 1 2950 "2281" _null_ _null_ _null_ uuid_recv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2962 (  uuid_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2950" _null_ _null_ _null_ uuid_send - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2963 (  uuid_hash		   PGNSP PGUID 12 1 0 f f t f i 1 23 "2950" _null_ _null_ _null_ uuid_hash - _null_ _null_ ));
+DESCR("hash");
+
+/* enum related procs */
+DATA(insert OID = 3504 (  anyenum_in	PGNSP PGUID 12 1 0 f f t f i 1 3500 "2275" _null_ _null_ _null_ anyenum_in - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2962 (  uuid_send		   PGNSP PGUID 12 1 0 f f t f i 1 17 "2950" _null_ _null_ _null_ uuid_send - _null_ ));
+DATA(insert OID = 3505 (  anyenum_out	PGNSP PGUID 12 1 0 f f t f s 1 2275 "3500" _null_ _null_ _null_ anyenum_out - _null_ _null_ ));
 DESCR("I/O");
-DATA(insert OID = 2963 (  uuid_hash		   PGNSP PGUID 12 1 0 f f t f i 1 23 "2950" _null_ _null_ _null_ uuid_hash - _null_ ));
+DATA(insert OID = 3506 (  enum_in		PGNSP PGUID 12 1 0 f f t f s 2 3500 "2275 26" _null_ _null_ _null_ enum_in - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3507 (  enum_out		PGNSP PGUID 12 1 0 f f t f s 1 2275 "3500" _null_ _null_ _null_ enum_out - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3508 (  enum_eq		PGNSP PGUID 12 1 0 f f t f i 2 16 "3500 3500" _null_ _null_ _null_ enum_eq - _null_ _null_ ));
+DESCR("equal");
+DATA(insert OID = 3509 (  enum_ne		PGNSP PGUID 12 1 0 f f t f i 2 16 "3500 3500" _null_ _null_ _null_ enum_ne - _null_ _null_ ));
+DESCR("not equal");
+DATA(insert OID = 3510 (  enum_lt		PGNSP PGUID 12 1 0 f f t f i 2 16 "3500 3500" _null_ _null_ _null_ enum_lt - _null_ _null_ ));
+DESCR("less-than");
+DATA(insert OID = 3511 (  enum_gt		PGNSP PGUID 12 1 0 f f t f i 2 16 "3500 3500" _null_ _null_ _null_ enum_gt - _null_ _null_ ));
+DESCR("greater-than");
+DATA(insert OID = 3512 (  enum_le		PGNSP PGUID 12 1 0 f f t f i 2 16 "3500 3500" _null_ _null_ _null_ enum_le - _null_ _null_ ));
+DESCR("less-than-or-equal");
+DATA(insert OID = 3513 (  enum_ge		PGNSP PGUID 12 1 0 f f t f i 2 16 "3500 3500" _null_ _null_ _null_ enum_ge - _null_ _null_ ));
+DESCR("greater-than-or-equal");
+DATA(insert OID = 3514 (  enum_cmp		PGNSP PGUID 12 1 0 f f t f i 2 23 "3500 3500" _null_ _null_ _null_ enum_cmp - _null_ _null_ ));
+DESCR("btree-less-equal-greater");
+DATA(insert OID = 3515 (  hashenum		PGNSP PGUID 12 1 0 f f t f i 1 23 "3500" _null_ _null_ _null_ hashenum - _null_ _null_ ));
 DESCR("hash");
-DATA(insert OID = 2964 (  uuid PGNSP	   PGUID 12 1 0 f f t f i 1 2950 "25" _null_ _null_ _null_ text_uuid - _null_ ));
-DESCR("convert text to uuid");
-DATA(insert OID = 2965 (  text PGNSP	   PGUID 12 1 0 f f t f i 1 25 "2950" _null_ _null_ _null_ uuid_text - _null_ ));
-DESCR("convert uuid to text");
+DATA(insert OID = 3524 (  enum_smaller	PGNSP PGUID 12 1 0 f f t f i 2 3500 "3500 3500" _null_ _null_ _null_ enum_smaller - _null_ _null_ ));
+DESCR("smaller of two");
+DATA(insert OID = 3525 (  enum_larger	PGNSP PGUID 12 1 0 f f t f i 2 3500 "3500 3500" _null_ _null_ _null_ enum_larger - _null_ _null_ ));
+DESCR("larger of two");
+DATA(insert OID = 3526 (  max			PGNSP PGUID 12 1 0 t f f f i 1 3500 "3500" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DESCR("maximum value of all enum input values");
+DATA(insert OID = 3527 (  min			PGNSP PGUID 12 1 0 t f f f i 1 3500 "3500" _null_ _null_ _null_ aggregate_dummy - _null_ _null_ ));
+DESCR("minimum value of all enum input values");
+DATA(insert OID = 3528 (  enum_first	PGNSP PGUID 12 1 0 f f f f s 1 3500 "3500" _null_ _null_ _null_ enum_first - _null_ _null_ ));
+DESCR("first value of the input enum type");
+DATA(insert OID = 3529 (  enum_last		PGNSP PGUID 12 1 0 f f f f s 1 3500 "3500" _null_ _null_ _null_ enum_last - _null_ _null_ ));
+DESCR("last value of the input enum type");
+DATA(insert OID = 3530 (  enum_range	PGNSP PGUID 12 1 0 f f f f s 2 2277 "3500 3500" _null_ _null_ _null_ enum_range_bounds - _null_ _null_ ));
+DESCR("range between the two given enum values, as an ordered array");
+DATA(insert OID = 3531 (  enum_range	PGNSP PGUID 12 1 0 f f f f s 1 2277 "3500" _null_ _null_ _null_ enum_range_all - _null_ _null_ ));
+DESCR("range of the given enum type, as an ordered array");
+DATA(insert OID = 3532 (  enum_recv		PGNSP PGUID 12 1 0 f f t f s 2 3500 "2275 26" _null_ _null_ _null_ enum_recv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3533 (  enum_send		PGNSP PGUID 12 1 0 f f t f s 1 17	"3500" _null_ _null_ _null_ enum_send - _null_ _null_ ));
+DESCR("I/O");
+
+/* text search stuff */
+DATA(insert OID =  3610 (  tsvectorin			PGNSP PGUID 12 1 0 f f t f i 1 3614 "2275" _null_ _null_ _null_ tsvectorin - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3639 (  tsvectorrecv			PGNSP PGUID 12 1 0 f f t f i 1 3614 "2281" _null_ _null_ _null_ tsvectorrecv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3611 (  tsvectorout			PGNSP PGUID 12 1 0 f f t f i 1 2275 "3614" _null_ _null_ _null_ tsvectorout - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3638 (  tsvectorsend			PGNSP PGUID 12 1 0 f f t f i 1 17 "3614" _null_ _null_ _null_	tsvectorsend - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3612 (  tsqueryin			PGNSP PGUID 12 1 0 f f t f i 1 3615 "2275" _null_ _null_ _null_ tsqueryin - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3641 (  tsqueryrecv			PGNSP PGUID 12 1 0 f f t f i 1 3615 "2281" _null_ _null_ _null_ tsqueryrecv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3613 (  tsqueryout			PGNSP PGUID 12 1 0 f f t f i 1 2275 "3615" _null_ _null_ _null_ tsqueryout - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3640 (  tsquerysend			PGNSP PGUID 12 1 0 f f t f i 1 17 "3615" _null_ _null_ _null_	tsquerysend - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3646 (  gtsvectorin			PGNSP PGUID 12 1 0 f f t f i 1 3642 "2275" _null_ _null_ _null_ gtsvectorin - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID =  3647 (  gtsvectorout			PGNSP PGUID 12 1 0 f f t f i 1 2275 "3642" _null_ _null_ _null_ gtsvectorout - _null_ _null_ ));
+DESCR("I/O");
+
+DATA(insert OID = 3616 (  tsvector_lt			PGNSP PGUID 12 1 0 f f t f i 2 16 "3614 3614" _null_ _null_ _null_ tsvector_lt - _null_ _null_ ));
+DESCR("less-than");
+DATA(insert OID = 3617 (  tsvector_le			PGNSP PGUID 12 1 0 f f t f i 2 16 "3614 3614" _null_ _null_ _null_ tsvector_le - _null_ _null_ ));
+DESCR("less-than-or-equal");
+DATA(insert OID = 3618 (  tsvector_eq			PGNSP PGUID 12 1 0 f f t f i 2 16 "3614 3614" _null_ _null_ _null_ tsvector_eq - _null_ _null_ ));
+DESCR("equal");
+DATA(insert OID = 3619 (  tsvector_ne			PGNSP PGUID 12 1 0 f f t f i 2 16 "3614 3614" _null_ _null_ _null_ tsvector_ne - _null_ _null_ ));
+DESCR("not equal");
+DATA(insert OID = 3620 (  tsvector_ge			PGNSP PGUID 12 1 0 f f t f i 2 16 "3614 3614" _null_ _null_ _null_ tsvector_ge - _null_ _null_ ));
+DESCR("greater-than-or-equal");
+DATA(insert OID = 3621 (  tsvector_gt			PGNSP PGUID 12 1 0 f f t f i 2 16 "3614 3614" _null_ _null_ _null_ tsvector_gt - _null_ _null_ ));
+DESCR("greater-than");
+DATA(insert OID = 3622 (  tsvector_cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "3614 3614" _null_ _null_ _null_ tsvector_cmp - _null_ _null_ ));
+DESCR("btree less-equal-greater");
+
+DATA(insert OID = 3711 (  length				PGNSP PGUID 12 1 0 f f t f i 1 23 "3614" _null_ _null_ _null_ tsvector_length - _null_ _null_ ));
+DESCR("number of lexemes");
+DATA(insert OID = 3623 (  strip					PGNSP PGUID 12 1 0 f f t f i 1 3614 "3614" _null_ _null_ _null_ tsvector_strip - _null_ _null_ ));
+DESCR("strip position information");
+DATA(insert OID = 3624 (  setweight				PGNSP PGUID 12 1 0 f f t f i 2 3614 "3614 18" _null_ _null_ _null_ tsvector_setweight - _null_ _null_ ));
+DESCR("set weight of lexeme's entries");
+DATA(insert OID = 3625 (  tsvector_concat		PGNSP PGUID 12 1 0 f f t f i 2 3614 "3614 3614" _null_ _null_ _null_ tsvector_concat - _null_ _null_ ));
+DESCR("concatenate");
+
+DATA(insert OID = 3634 (  ts_match_vq			PGNSP PGUID 12 1 0 f f t f i 2 16 "3614 3615" _null_ _null_ _null_ ts_match_vq - _null_ _null_ ));
+DESCR("match tsvector to tsquery");
+DATA(insert OID = 3635 (  ts_match_qv			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3614" _null_ _null_ _null_ ts_match_qv - _null_ _null_ ));
+DESCR("match tsquery to tsvector");
+DATA(insert OID = 3760 (  ts_match_tt			PGNSP PGUID 12 3 0 f f t f s 2 16 "25 25" _null_ _null_ _null_ ts_match_tt - _null_ _null_ ));
+DESCR("text search match");
+DATA(insert OID = 3761 (  ts_match_tq			PGNSP PGUID 12 2 0 f f t f s 2 16 "25 3615" _null_ _null_ _null_ ts_match_tq - _null_ _null_ ));
+DESCR("match text to tsquery");
+
+DATA(insert OID = 3648 (  gtsvector_compress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gtsvector_compress - _null_ _null_ ));
+DESCR("GiST tsvector support");
+DATA(insert OID = 3649 (  gtsvector_decompress	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gtsvector_decompress - _null_ _null_ ));
+DESCR("GiST tsvector support");
+DATA(insert OID = 3650 (  gtsvector_picksplit	PGNSP PGUID 12 1 0 f f t f i 2 2281 "2281 2281" _null_ _null_ _null_ gtsvector_picksplit - _null_ _null_ ));
+DESCR("GiST tsvector support");
+DATA(insert OID = 3651 (  gtsvector_union		PGNSP PGUID 12 1 0 f f t f i 2 2281 "2281 2281" _null_ _null_ _null_ gtsvector_union - _null_ _null_ ));
+DESCR("GiST tsvector support");
+DATA(insert OID = 3652 (  gtsvector_same		PGNSP PGUID 12 1 0 f f t f i 3 2281 "3642 3642 2281" _null_ _null_ _null_ gtsvector_same - _null_ _null_ ));
+DESCR("GiST tsvector support");
+DATA(insert OID = 3653 (  gtsvector_penalty		PGNSP PGUID 12 1 0 f f t f i 3 2281 "2281 2281 2281" _null_ _null_ _null_ gtsvector_penalty - _null_ _null_ ));
+DESCR("GiST tsvector support");
+DATA(insert OID = 3654 (  gtsvector_consistent	PGNSP PGUID 12 1 0 f f t f i 3 16 "3642 2281 23" _null_ _null_ _null_ gtsvector_consistent - _null_ _null_ ));
+DESCR("GiST tsvector support");
+
+DATA(insert OID = 3656 (  gin_extract_tsvector	PGNSP PGUID 12 1 0 f f t f i 2 2281 "3614 2281" _null_ _null_ _null_	gin_extract_tsvector - _null_ _null_ ));
+DESCR("GIN tsvector support");
+DATA(insert OID = 3657 (  gin_extract_tsquery	PGNSP PGUID 12 1 0 f f t f i 3 2281 "3615 2281 21" _null_ _null_ _null_ gin_extract_tsquery - _null_ _null_ ));
+DESCR("GIN tsvector support");
+DATA(insert OID = 3658 (  gin_tsquery_consistent PGNSP PGUID 12 1 0 f f t f i 3 16 "2281 21 3615" _null_ _null_ _null_	gin_tsquery_consistent - _null_ _null_ ));
+DESCR("GIN tsvector support");
+
+DATA(insert OID = 3662 (  tsquery_lt			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsquery_lt - _null_ _null_ ));
+DESCR("less-than");
+DATA(insert OID = 3663 (  tsquery_le			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsquery_le - _null_ _null_ ));
+DESCR("less-than-or-equal");
+DATA(insert OID = 3664 (  tsquery_eq			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsquery_eq - _null_ _null_ ));
+DESCR("equal");
+DATA(insert OID = 3665 (  tsquery_ne			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsquery_ne - _null_ _null_ ));
+DESCR("not equal");
+DATA(insert OID = 3666 (  tsquery_ge			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsquery_ge - _null_ _null_ ));
+DESCR("greater-than-or-equal");
+DATA(insert OID = 3667 (  tsquery_gt			PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsquery_gt - _null_ _null_ ));
+DESCR("greater-than");
+DATA(insert OID = 3668 (  tsquery_cmp			PGNSP PGUID 12 1 0 f f t f i 2 23 "3615 3615" _null_ _null_ _null_ tsquery_cmp - _null_ _null_ ));
+DESCR("btree less-equal-greater");
+
+DATA(insert OID = 3669 (  tsquery_and		PGNSP PGUID 12 1 0 f f t f i 2 3615 "3615 3615" _null_ _null_ _null_ tsquery_and - _null_ _null_ ));
+DESCR("AND-concatenate");
+DATA(insert OID = 3670 (  tsquery_or		PGNSP PGUID 12 1 0 f f t f i 2 3615 "3615 3615" _null_ _null_ _null_ tsquery_or - _null_ _null_ ));
+DESCR("OR-concatenate");
+DATA(insert OID = 3671 (  tsquery_not		PGNSP PGUID 12 1 0 f f t f i 1 3615 "3615" _null_ _null_ _null_ tsquery_not - _null_ _null_ ));
+DESCR("NOT-tsquery");
+
+DATA(insert OID = 3691 (  tsq_mcontains		PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsq_mcontains - _null_ _null_ ));
+DESCR("contains");
+DATA(insert OID = 3692 (  tsq_mcontained	PGNSP PGUID 12 1 0 f f t f i 2 16 "3615 3615" _null_ _null_ _null_ tsq_mcontained - _null_ _null_ ));
+DESCR("contained");
+
+DATA(insert OID = 3672 (  numnode			PGNSP PGUID 12 1 0 f f t f i 1 23 "3615" _null_ _null_ _null_ tsquery_numnode - _null_ _null_ ));
+DESCR("number of nodes");
+DATA(insert OID = 3673 (  querytree			PGNSP PGUID 12 1 0 f f t f i 1 25 "3615" _null_ _null_ _null_ tsquerytree - _null_ _null_ ));
+DESCR("show real useful query for GiST index");
+
+DATA(insert OID = 3684 (  ts_rewrite		PGNSP PGUID 12 1 0 f f t f i 3 3615 "3615 3615 3615" _null_ _null_ _null_ tsquery_rewrite - _null_ _null_ ));
+DESCR("rewrite tsquery");
+DATA(insert OID = 3685 (  ts_rewrite		PGNSP PGUID 12 1 0 f f t f v 2 3615 "3615 25" _null_ _null_ _null_ tsquery_rewrite_query - _null_ _null_ ));
+DESCR("rewrite tsquery");
+
+DATA(insert OID = 3695 (  gtsquery_compress				PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gtsquery_compress - _null_ _null_ ));
+DESCR("GiST tsquery support");
+DATA(insert OID = 3696 (  gtsquery_decompress			PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ gtsquery_decompress - _null_ _null_ ));
+DESCR("GiST tsquery support");
+DATA(insert OID = 3697 (  gtsquery_picksplit			PGNSP PGUID 12 1 0 f f t f i 2 2281 "2281 2281" _null_ _null_ _null_ gtsquery_picksplit - _null_ _null_ ));
+DESCR("GiST tsquery support");
+DATA(insert OID = 3698 (  gtsquery_union				PGNSP PGUID 12 1 0 f f t f i 2 2281 "2281 2281" _null_ _null_ _null_ gtsquery_union - _null_ _null_ ));
+DESCR("GiST tsquery support");
+DATA(insert OID = 3699 (  gtsquery_same					PGNSP PGUID 12 1 0 f f t f i 3 2281 "20 20 2281" _null_ _null_ _null_ gtsquery_same - _null_ _null_ ));
+DESCR("GiST tsquery support");
+DATA(insert OID = 3700 (  gtsquery_penalty				PGNSP PGUID 12 1 0 f f t f i 3 2281 "2281 2281 2281" _null_ _null_ _null_ gtsquery_penalty - _null_ _null_ ));
+DESCR("GiST tsquery support");
+DATA(insert OID = 3701 (  gtsquery_consistent			PGNSP PGUID 12 1 0 f f t f i 3 16 "20 2281 23" _null_ _null_ _null_ gtsquery_consistent - _null_ _null_ ));
+DESCR("GiST tsquery support");
+
+DATA(insert OID = 3689 (  ts_stat		PGNSP PGUID 12 10 10000 f f t t v 1 2249 "25" "{25,25,23,23}" "{i,o,o,o}" "{query,word,ndoc,nentry}" ts_stat1 - _null_ _null_ ));
+DESCR("statistics of tsvector column");
+DATA(insert OID = 3690 (  ts_stat		PGNSP PGUID 12 10 10000 f f t t v 2 2249 "25 25" "{25,25,25,23,23}" "{i,i,o,o,o}" "{query,weights,word,ndoc,nentry}" ts_stat2 - _null_ _null_ ));
+DESCR("statistics of tsvector column");
+
+DATA(insert OID = 3703 (  ts_rank		PGNSP PGUID 12 1 0 f f t f i 4 700 "1021 3614 3615 23" _null_ _null_ _null_ ts_rank_wttf - _null_ _null_ ));
+DESCR("relevance");
+DATA(insert OID = 3704 (  ts_rank		PGNSP PGUID 12 1 0 f f t f i 3 700 "1021 3614 3615" _null_ _null_ _null_ ts_rank_wtt - _null_ _null_ ));
+DESCR("relevance");
+DATA(insert OID = 3705 (  ts_rank		PGNSP PGUID 12 1 0 f f t f i 3 700 "3614 3615 23" _null_ _null_ _null_ ts_rank_ttf - _null_ _null_ ));
+DESCR("relevance");
+DATA(insert OID = 3706 (  ts_rank		PGNSP PGUID 12 1 0 f f t f i 2 700 "3614 3615" _null_ _null_ _null_ ts_rank_tt - _null_ _null_ ));
+DESCR("relevance");
+DATA(insert OID = 3707 (  ts_rank_cd	PGNSP PGUID 12 1 0 f f t f i 4 700 "1021 3614 3615 23" _null_ _null_ _null_ ts_rankcd_wttf - _null_ _null_ ));
+DESCR("relevance");
+DATA(insert OID = 3708 (  ts_rank_cd	PGNSP PGUID 12 1 0 f f t f i 3 700 "1021 3614 3615" _null_ _null_ _null_ ts_rankcd_wtt - _null_ _null_ ));
+DESCR("relevance");
+DATA(insert OID = 3709 (  ts_rank_cd	PGNSP PGUID 12 1 0 f f t f i 3 700 "3614 3615 23" _null_ _null_ _null_ ts_rankcd_ttf - _null_ _null_ ));
+DESCR("relevance");
+DATA(insert OID = 3710 (  ts_rank_cd	PGNSP PGUID 12 1 0 f f t f i 2 700 "3614 3615" _null_ _null_ _null_ ts_rankcd_tt - _null_ _null_ ));
+DESCR("relevance");
+
+DATA(insert OID = 3713 (  ts_token_type PGNSP PGUID 12 1 16 f f t t i 1 2249 "26" "{26,23,25,25}" "{i,o,o,o}" "{parser_oid,tokid,alias,description}" ts_token_type_byid - _null_ _null_ ));
+DESCR("get parser's token types");
+DATA(insert OID = 3714 (  ts_token_type PGNSP PGUID 12 1 16 f f t t s 1 2249 "25" "{25,23,25,25}" "{i,o,o,o}" "{parser_name,tokid,alias,description}" ts_token_type_byname - _null_ _null_ ));
+DESCR("get parser's token types");
+DATA(insert OID = 3715 (  ts_parse		PGNSP PGUID 12 1 1000 f f t t i 2 2249 "26 25" "{26,25,23,25}" "{i,i,o,o}" "{parser_oid,txt,tokid,token}" ts_parse_byid - _null_ _null_ ));
+DESCR("parse text to tokens");
+DATA(insert OID = 3716 (  ts_parse		PGNSP PGUID 12 1 1000 f f t t s 2 2249 "25 25" "{25,25,23,25}" "{i,i,o,o}" "{parser_name,txt,tokid,token}" ts_parse_byname - _null_ _null_ ));
+DESCR("parse text to tokens");
+
+DATA(insert OID = 3717 (  prsd_start		PGNSP PGUID 12 1 0 f f t f i 2 2281 "2281 23" _null_ _null_ _null_ prsd_start - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3718 (  prsd_nexttoken	PGNSP PGUID 12 1 0 f f t f i 3 2281 "2281 2281 2281" _null_ _null_ _null_ prsd_nexttoken - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3719 (  prsd_end			PGNSP PGUID 12 1 0 f f t f i 1 2278 "2281" _null_ _null_ _null_ prsd_end - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3720 (  prsd_headline		PGNSP PGUID 12 1 0 f f t f i 3 2281 "2281 2281 3615" _null_ _null_ _null_ prsd_headline - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3721 (  prsd_lextype		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ prsd_lextype - _null_ _null_ ));
+DESCR("");
+
+DATA(insert OID = 3723 (  ts_lexize			PGNSP PGUID 12 1 0 f f t f i 2 1009 "3769 25" _null_ _null_ _null_ ts_lexize - _null_ _null_ ));
+DESCR("normalize one word by dictionary");
+
+DATA(insert OID = 3725 (  dsimple_init		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ dsimple_init - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3726 (  dsimple_lexize	PGNSP PGUID 12 1 0 f f t f i 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ dsimple_lexize - _null_ _null_ ));
+DESCR("");
+
+DATA(insert OID = 3728 (  dsynonym_init		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ dsynonym_init - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3729 (  dsynonym_lexize	PGNSP PGUID 12 1 0 f f t f i 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ dsynonym_lexize - _null_ _null_ ));
+DESCR("");
+
+DATA(insert OID = 3731 (  dispell_init		PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ dispell_init - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3732 (  dispell_lexize	PGNSP PGUID 12 1 0 f f t f i 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ dispell_lexize - _null_ _null_ ));
+DESCR("");
+
+DATA(insert OID = 3740 (  thesaurus_init	PGNSP PGUID 12 1 0 f f t f i 1 2281 "2281" _null_ _null_ _null_ thesaurus_init - _null_ _null_ ));
+DESCR("");
+DATA(insert OID = 3741 (  thesaurus_lexize	PGNSP PGUID 12 1 0 f f t f i 4 2281 "2281 2281 2281 2281" _null_ _null_ _null_ thesaurus_lexize - _null_ _null_ ));
+DESCR("");
+
+DATA(insert OID = 3743 (  ts_headline	PGNSP PGUID 12 1 0 f f t f i 4 25 "3734 25 3615 25" _null_ _null_ _null_ ts_headline_byid_opt - _null_ _null_ ));
+DESCR("generate headline");
+DATA(insert OID = 3744 (  ts_headline	PGNSP PGUID 12 1 0 f f t f i 3 25 "3734 25 3615" _null_ _null_ _null_ ts_headline_byid - _null_ _null_ ));
+DESCR("generate headline");
+DATA(insert OID = 3754 (  ts_headline	PGNSP PGUID 12 1 0 f f t f s 3 25 "25 3615 25" _null_ _null_ _null_ ts_headline_opt - _null_ _null_ ));
+DESCR("generate headline");
+DATA(insert OID = 3755 (  ts_headline	PGNSP PGUID 12 1 0 f f t f s 2 25 "25 3615" _null_ _null_ _null_ ts_headline - _null_ _null_ ));
+DESCR("generate headline");
+
+DATA(insert OID = 3745 (  to_tsvector		PGNSP PGUID 12 1 0 f f t f i 2 3614 "3734 25" _null_ _null_ _null_ to_tsvector_byid - _null_ _null_ ));
+DESCR("transform to tsvector");
+DATA(insert OID = 3746 (  to_tsquery		PGNSP PGUID 12 1 0 f f t f i 2 3615 "3734 25" _null_ _null_ _null_ to_tsquery_byid - _null_ _null_ ));
+DESCR("make tsquery");
+DATA(insert OID = 3747 (  plainto_tsquery	PGNSP PGUID 12 1 0 f f t f i 2 3615 "3734 25" _null_ _null_ _null_ plainto_tsquery_byid - _null_ _null_ ));
+DESCR("transform to tsquery");
+DATA(insert OID = 3749 (  to_tsvector		PGNSP PGUID 12 1 0 f f t f s 1 3614 "25" _null_ _null_ _null_ to_tsvector - _null_ _null_ ));
+DESCR("transform to tsvector");
+DATA(insert OID = 3750 (  to_tsquery		PGNSP PGUID 12 1 0 f f t f s 1 3615 "25" _null_ _null_ _null_ to_tsquery - _null_ _null_ ));
+DESCR("make tsquery");
+DATA(insert OID = 3751 (  plainto_tsquery	PGNSP PGUID 12 1 0 f f t f s 1 3615 "25" _null_ _null_ _null_ plainto_tsquery - _null_ _null_ ));
+DESCR("transform to tsquery");
+
+DATA(insert OID = 3752 (  tsvector_update_trigger			PGNSP PGUID 12 1 0 f f f f v 0 2279 "" _null_ _null_ _null_ tsvector_update_trigger_byid - _null_ _null_ ));
+DESCR("trigger for automatic update of tsvector column");
+DATA(insert OID = 3753 (  tsvector_update_trigger_column	PGNSP PGUID 12 1 0 f f f f v 0 2279 "" _null_ _null_ _null_ tsvector_update_trigger_bycolumn - _null_ _null_ ));
+DESCR("trigger for automatic update of tsvector column");
+
+DATA(insert OID = 3759 (  get_current_ts_config PGNSP PGUID 12 1 0 f f t f s 0 3734 "" _null_ _null_ _null_ get_current_ts_config - _null_ _null_ ));
+DESCR("get current tsearch configuration");
+
+DATA(insert OID = 3736 (  regconfigin		PGNSP PGUID 12 1 0 f f t f s 1 3734 "2275" _null_ _null_ _null_ regconfigin - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3737 (  regconfigout		PGNSP PGUID 12 1 0 f f t f s 1 2275 "3734" _null_ _null_ _null_ regconfigout - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3738 (  regconfigrecv		PGNSP PGUID 12 1 0 f f t f i 1 3734 "2281" _null_ _null_ _null_ regconfigrecv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3739 (  regconfigsend		PGNSP PGUID 12 1 0 f f t f i 1 17 "3734" _null_ _null_ _null_ regconfigsend - _null_ _null_ ));
+DESCR("I/O");
+
+DATA(insert OID = 3771 (  regdictionaryin	PGNSP PGUID 12 1 0 f f t f s 1 3769 "2275" _null_ _null_ _null_ regdictionaryin - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3772 (  regdictionaryout	PGNSP PGUID 12 1 0 f f t f s 1 2275 "3769" _null_ _null_ _null_ regdictionaryout - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3773 (  regdictionaryrecv PGNSP PGUID 12 1 0 f f t f i 1 3769 "2281" _null_ _null_ _null_ regdictionaryrecv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 3774 (  regdictionarysend PGNSP PGUID 12 1 0 f f t f i 1 17 "3769" _null_ _null_ _null_ regdictionarysend - _null_ _null_ ));
+DESCR("I/O");
+
+/* txid */
+DATA(insert OID = 2939 (  txid_snapshot_in			PGNSP PGUID 12 1  0 f f t f i 1 2970 "2275" _null_ _null_ _null_ txid_snapshot_in - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2940 (  txid_snapshot_out			PGNSP PGUID 12 1  0 f f t f i 1 2275 "2970" _null_ _null_ _null_ txid_snapshot_out - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2941 (  txid_snapshot_recv		PGNSP PGUID 12 1  0 f f t f i 1 2970 "2281" _null_ _null_ _null_ txid_snapshot_recv - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2942 (  txid_snapshot_send		PGNSP PGUID 12 1  0 f f t f i 1 17 "2970"	_null_ _null_ _null_ txid_snapshot_send - _null_ _null_ ));
+DESCR("I/O");
+DATA(insert OID = 2943 (  txid_current				PGNSP PGUID 12 1  0 f f t f s 0 20 ""		_null_ _null_ _null_ txid_current - _null_ _null_ ));
+DESCR("get current transaction ID");
+DATA(insert OID = 2944 (  txid_current_snapshot		PGNSP PGUID 12 1  0 f f t f s 0 2970 ""		_null_ _null_ _null_ txid_current_snapshot - _null_ _null_ ));
+DESCR("get current snapshot");
+DATA(insert OID = 2945 (  txid_snapshot_xmin		PGNSP PGUID 12 1  0 f f t f i 1 20 "2970"	_null_ _null_ _null_ txid_snapshot_xmin - _null_ _null_ ));
+DESCR("get xmin of snapshot");
+DATA(insert OID = 2946 (  txid_snapshot_xmax		PGNSP PGUID 12 1  0 f f t f i 1 20 "2970"	_null_ _null_ _null_ txid_snapshot_xmax - _null_ _null_ ));
+DESCR("get xmax of snapshot");
+DATA(insert OID = 2947 (  txid_snapshot_xip			PGNSP PGUID 12 1 50 f f t t i 1 20 "2970"	_null_ _null_ _null_ txid_snapshot_xip - _null_ _null_ ));
+DESCR("get set of in-progress txids in snapshot");
+DATA(insert OID = 2948 (  txid_visible_in_snapshot	PGNSP PGUID 12 1  0 f f t f i 2 16 "20 2970" _null_ _null_ _null_ txid_visible_in_snapshot - _null_ _null_ ));
+DESCR("is txid visible in snapshot?");
+
 
 /*
  * Include more definitions from pg_proc_gp.h, for GPDB-added functions. They
@@ -4246,11 +4566,11 @@ DESCR("convert uuid to text");
  * syntax, we need to create the DATA statement manually and place it here.
  */
 /* gp_read_error_log(IN exttable text, OUT cmdtime timestamptz, OUT relname text, OUT filename text, OUT linenum int4, OUT bytenum int4, OUT errmsg text, OUT rawdata text, OUT rawbytes bytea) => SETOF record */ 
-DATA(insert OID = 3000 ( gp_read_error_log  PGNSP PGUID 12 1 1000 0 f f t t v 1 0 2249 f "25" "{25,1184,25,25,23,23,25,25,17}" "{i,o,o,o,o,o,o,o,o}" "{exttable,cmdtime,relname,filename,linenum,bytenum,errmsg,rawdata,rawbytes}" _null_ gp_read_error_log _null_ _null_ s ));
+DATA(insert OID = 3000 ( gp_read_error_log  PGNSP PGUID 12 1 1000 0 f f t t v 1 0 2249 f "25" "{25,1184,25,25,23,23,25,25,17}" "{i,o,o,o,o,o,o,o,o}" "{exttable,cmdtime,relname,filename,linenum,bytenum,errmsg,rawdata,rawbytes}" _null_ gp_read_error_log _null_ _null_ _null_ s ));
 DESCR("read the error log for the specified external table");
 
 /* gp_truncate_error_log(text) => bool */ 
-DATA(insert OID = 3069 ( gp_truncate_error_log  PGNSP PGUID 12 1 0 0 f f t f v 1 0 16 f "25" _null_ _null_ _null_ _null_ gp_truncate_error_log _null_ _null_ m ));
+DATA(insert OID = 3069 ( gp_truncate_error_log  PGNSP PGUID 12 1 0 0 f f t f v 1 0 16 f "25" _null_ _null_ _null_ _null_ gp_truncate_error_log _null_ _null_ _null_ m ));
 DESCR("truncate the error log for the specified external table");
 
 /*
@@ -4310,6 +4630,7 @@ extern Oid ProcedureCreate(const char *procedureName,
 				Datum parameterModes,
 				Datum parameterNames,
 				List *parameterDefaults,
+				Datum proconfig,
 				float4 procost,
 				float4 prorows,
 				char prodataaccess,
diff --git a/src/include/catalog/pg_proc.sql b/src/include/catalog/pg_proc.sql
index c3c581e01c44..abc6544b540b 100644
--- a/src/include/catalog/pg_proc.sql
+++ b/src/include/catalog/pg_proc.sql
@@ -12,8 +12,6 @@
  CREATE FUNCTION float8_avg_decum(bytea, float8) RETURNS bytea LANGUAGE internal IMMUTABLE STRICT AS 'float8_avg_decum' WITH (OID=3109, DESCRIPTION="aggregate inverse transition function");
  CREATE FUNCTION btgpxlogloccmp(gpxlogloc, gpxlogloc) RETURNS int4 LANGUAGE internal IMMUTABLE STRICT AS 'btgpxlogloccmp' WITH (OID=7081, DESCRIPTION="btree less-equal-greater");
 
- CREATE FUNCTION hash_numeric("numeric") RETURNS int4 LANGUAGE internal IMMUTABLE STRICT AS 'hash_numeric' WITH (OID=432, DESCRIPTION="hash");
-
 -- MPP -- array_add -- special for prospective customer 
  CREATE FUNCTION array_add(_int4, _int4) RETURNS _int4 LANGUAGE internal IMMUTABLE STRICT AS 'array_int4_add' WITH (OID=6012, DESCRIPTION="itemwise add two integer arrays");
 
@@ -35,8 +33,6 @@
 
  CREATE FUNCTION current_query() RETURNS text LANGUAGE internal VOLATILE AS 'current_query' WITH (OID=820, DESCRIPTION="returns the currently executing query");
 
- CREATE FUNCTION lo_truncate(int4, int4) RETURNS int4 LANGUAGE internal VOLATILE STRICT AS 'lo_truncate' WITH (OID=828, DESCRIPTION="truncate large object");
-
  CREATE FUNCTION int8dec(int8) RETURNS int8 LANGUAGE internal IMMUTABLE STRICT AS 'int8dec' WITH (OID=3546);
 
 
@@ -44,18 +40,6 @@
 
  CREATE FUNCTION interval_interval_mod("interval", "interval") RETURNS "interval" LANGUAGE internal IMMUTABLE STRICT AS 'interval_interval_mod' WITH (OID=6116, DESCRIPTION="modulus");
 
- CREATE FUNCTION regexp_matches(text, text) RETURNS SETOF _text LANGUAGE internal IMMUTABLE STRICT AS 'regexp_matches_no_flags' WITH (OID=5018, DESCRIPTION="return all match groups for regexp");
-
- CREATE FUNCTION regexp_matches(text, text, text) RETURNS SETOF _text LANGUAGE internal IMMUTABLE STRICT AS 'regexp_matches' WITH (OID=5019, DESCRIPTION="return all match groups for regexp");
-
- CREATE FUNCTION regexp_split_to_table(text, text) RETURNS SETOF text LANGUAGE internal IMMUTABLE STRICT AS 'regexp_split_to_table_no_flags' WITH (OID=5020, DESCRIPTION="split string by pattern");
-
- CREATE FUNCTION regexp_split_to_table(text, text, text) RETURNS SETOF text LANGUAGE internal IMMUTABLE STRICT AS 'regexp_split_to_table' WITH (OID=5021, DESCRIPTION="split string by pattern");
-
- CREATE FUNCTION regexp_split_to_array(text, text) RETURNS _text LANGUAGE internal IMMUTABLE STRICT AS 'regexp_split_to_array_no_flags' WITH (OID=5022, DESCRIPTION="split string by pattern");
-
- CREATE FUNCTION regexp_split_to_array(text, text, text) RETURNS _text LANGUAGE internal IMMUTABLE STRICT AS 'regexp_split_to_array' WITH (OID=5023, DESCRIPTION="split string by pattern");
-
 -- System-view support functions 
  CREATE FUNCTION pg_get_partition_def(oid) RETURNS text LANGUAGE internal STABLE STRICT AS 'pg_get_partition_def' WITH (OID=5024);
 
@@ -73,7 +57,7 @@
 
  CREATE FUNCTION pg_typeof("any") RETURNS regtype LANGUAGE internal STABLE AS 'pg_typeof' WITH (OID=822, DESCRIPTION="returns the type of the argument");
 
- CREATE FUNCTION numeric_dec("numeric") RETURNS "numeric" LANGUAGE internal IMMUTABLE STRICT AS 'numeric_dec' WITH (OID=1004, DESCRIPTION="increment by one");
+ CREATE FUNCTION numeric_dec("numeric") RETURNS "numeric" LANGUAGE internal IMMUTABLE STRICT AS 'numeric_dec' WITH (OID=6997, DESCRIPTION="increment by one");
 
 
 -- Sequences and time series
@@ -171,8 +155,6 @@
 
  CREATE FUNCTION pg_file_length(text) RETURNS int8 LANGUAGE internal VOLATILE STRICT AS 'pg_file_length' WITH (OID=6051, DESCRIPTION="Get the length of a file (via stat)");
 
- CREATE FUNCTION text(bool) RETURNS text LANGUAGE internal IMMUTABLE STRICT AS 'booltext' WITH (OID=2971, DESCRIPTION="convert boolean to text");
-
 -- Aggregates (moved here from pg_aggregate for 7.3) 
 
  CREATE FUNCTION max(gpxlogloc) RETURNS gpxlogloc LANGUAGE internal IMMUTABLE AS 'aggregate_dummy' WITH (OID=3332, proisagg="t");
@@ -1558,11 +1540,6 @@
 
  CREATE FUNCTION gp_persistent_repair_delete(int4, tid) RETURNS int4 LANGUAGE internal VOLATILE AS 'gp_persistent_repair_delete' WITH (OID=7181, DESCRIPTION="Remove an entry specified by TID from a persistent table for the current database instance");
 
-
- CREATE FUNCTION xpath(text, xml, _text) RETURNS _xml LANGUAGE internal IMMUTABLE STRICT AS 'xpath' WITH (OID=2983, DESCRIPTION="evaluate XPath expression, with namespaces support");
-
- CREATE FUNCTION xpath(text, xml) RETURNS _xml LANGUAGE sql IMMUTABLE STRICT AS $$select pg_catalog.xpath($1, $2, '{}'::pg_catalog.text[])$$ WITH (OID=2984, DESCRIPTION="evaluate XPath expression");
-
  CREATE FUNCTION xmlexists(text, xml) RETURNS bool LANGUAGE internal IMMUTABLE STRICT AS 'xmlexists' WITH (OID=2985, DESCRIPTION="test XML value against XPath expression");
 
  CREATE FUNCTION xpath_exists(text, xml, _text) RETURNS bool LANGUAGE internal IMMUTABLE STRICT AS 'xpath_exists' WITH (OID=2986, DESCRIPTION="test XML value against XPath expression, with namespace support");
diff --git a/src/include/catalog/pg_proc_gp.h b/src/include/catalog/pg_proc_gp.h
index 29c635890bfd..a4a6098cc7ff 100644
--- a/src/include/catalog/pg_proc_gp.h
+++ b/src/include/catalog/pg_proc_gp.h
@@ -33,1335 +33,1299 @@
 /* This file is translated into DATA rows by catullus.pl. See */
 /* README.add_catalog_function for instructions on how to run it. */
 /* float4_decum(_float8, float4) => _float8 */ 
-DATA(insert OID = 6024 ( float4_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 700" _null_ _null_ _null_ _null_ float4_decum _null_ _null_ n ));
+DATA(insert OID = 6024 ( float4_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 700" _null_ _null_ _null_ _null_ float4_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* float4_avg_accum(bytea, float4) => bytea */ 
-DATA(insert OID = 3106 ( float4_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 700" _null_ _null_ _null_ _null_ float4_avg_accum _null_ _null_ n ));
+DATA(insert OID = 3106 ( float4_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 700" _null_ _null_ _null_ _null_ float4_avg_accum _null_ _null_ _null_ n ));
 DESCR("aggregate transition function");
 
 /* float4_avg_decum(bytea, float4) => bytea */ 
-DATA(insert OID = 3107 ( float4_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 700" _null_ _null_ _null_ _null_ float4_avg_decum _null_ _null_ n ));
+DATA(insert OID = 3107 ( float4_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 700" _null_ _null_ _null_ _null_ float4_avg_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* float8_decum(_float8, float8) => _float8 */ 
-DATA(insert OID = 6025 ( float8_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 701" _null_ _null_ _null_ _null_ float8_decum _null_ _null_ n ));
+DATA(insert OID = 6025 ( float8_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 701" _null_ _null_ _null_ _null_ float8_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* float8_avg_accum(bytea, float8) => bytea */ 
-DATA(insert OID = 3108 ( float8_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 701" _null_ _null_ _null_ _null_ float8_avg_accum _null_ _null_ n ));
+DATA(insert OID = 3108 ( float8_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 701" _null_ _null_ _null_ _null_ float8_avg_accum _null_ _null_ _null_ n ));
 DESCR("aggregate transition function");
 
 /* float8_avg_decum(bytea, float8) => bytea */ 
-DATA(insert OID = 3109 ( float8_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 701" _null_ _null_ _null_ _null_ float8_avg_decum _null_ _null_ n ));
+DATA(insert OID = 3109 ( float8_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 701" _null_ _null_ _null_ _null_ float8_avg_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* btgpxlogloccmp(gpxlogloc, gpxlogloc) => int4 */ 
-DATA(insert OID = 7081 ( btgpxlogloccmp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 f "3310 3310" _null_ _null_ _null_ _null_ btgpxlogloccmp _null_ _null_ n ));
+DATA(insert OID = 7081 ( btgpxlogloccmp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 f "3310 3310" _null_ _null_ _null_ _null_ btgpxlogloccmp _null_ _null_ _null_ n ));
 DESCR("btree less-equal-greater");
 
-/* hash_numeric("numeric") => int4 */ 
-DATA(insert OID = 432 ( hash_numeric  PGNSP PGUID 12 1 0 0 f f t f i 1 0 23 f "1700" _null_ _null_ _null_ _null_ hash_numeric _null_ _null_ n ));
-DESCR("hash");
-
 
 /* MPP -- array_add -- special for prospective customer  */
 /* array_add(_int4, _int4) => _int4 */ 
-DATA(insert OID = 6012 ( array_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1007 f "1007 1007" _null_ _null_ _null_ _null_ array_int4_add _null_ _null_ n ));
+DATA(insert OID = 6012 ( array_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1007 f "1007 1007" _null_ _null_ _null_ _null_ array_int4_add _null_ _null_ _null_ n ));
 DESCR("itemwise add two integer arrays");
 
 /* array_agg_transfn(internal, anyelement) => internal */ 
-DATA(insert OID = 6096 ( array_agg_transfn  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2281 f "2281 2283" _null_ _null_ _null_ _null_ array_agg_transfn _null_ _null_ n ));
+DATA(insert OID = 6096 ( array_agg_transfn  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2281 f "2281 2283" _null_ _null_ _null_ _null_ array_agg_transfn _null_ _null_ _null_ n ));
 DESCR("array_agg transition function");
 
 /* array_agg_finalfn(internal) => anyarray */ 
-DATA(insert OID = 6097 ( array_agg_finalfn  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 f "2281" _null_ _null_ _null_ _null_ array_agg_finalfn _null_ _null_ n ));
+DATA(insert OID = 6097 ( array_agg_finalfn  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 f "2281" _null_ _null_ _null_ _null_ array_agg_finalfn _null_ _null_ _null_ n ));
 DESCR("array_agg final function");
 
 /* array_agg(anyelement) => anyarray */ 
-DATA(insert OID = 6098 ( array_agg  PGNSP PGUID 12 1 0 0 t f f f i 1 0 2277 f "2283" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 6098 ( array_agg  PGNSP PGUID 12 1 0 0 t f f f i 1 0 2277 f "2283" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 DESCR("concatenate aggregate input into an array");
 
 /* string_agg_transfn(internal, text) => internal */ 
-DATA(insert OID = 3534 ( string_agg_transfn  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2281 f "2281 25" _null_ _null_ _null_ _null_ string_agg_transfn _null_ _null_ n ));
+DATA(insert OID = 3534 ( string_agg_transfn  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2281 f "2281 25" _null_ _null_ _null_ _null_ string_agg_transfn _null_ _null_ _null_ n ));
 DESCR("string_agg(text) transition function");
 
 /* string_agg_delim_transfn(internal, text, text) => internal */ 
-DATA(insert OID = 3535 ( string_agg_delim_transfn  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2281 f "2281 25 25" _null_ _null_ _null_ _null_ string_agg_delim_transfn _null_ _null_ n ));
+DATA(insert OID = 3535 ( string_agg_delim_transfn  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2281 f "2281 25 25" _null_ _null_ _null_ _null_ string_agg_delim_transfn _null_ _null_ _null_ n ));
 DESCR("string_agg(text, text) transition function");
 
 /* string_agg_finalfn(internal) => text */ 
-DATA(insert OID = 3536 ( string_agg_finalfn  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 f "2281" _null_ _null_ _null_ _null_ string_agg_finalfn _null_ _null_ n ));
+DATA(insert OID = 3536 ( string_agg_finalfn  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 f "2281" _null_ _null_ _null_ _null_ string_agg_finalfn _null_ _null_ _null_ n ));
 DESCR("string_agg final function");
 
 /* string_agg(text) => text */ 
-DATA(insert OID = 3537 ( string_agg  PGNSP PGUID 12 1 0 0 t f f f i 1 0 25 f "25" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3537 ( string_agg  PGNSP PGUID 12 1 0 0 t f f f i 1 0 25 f "25" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 DESCR("concatenate aggregate input into an string");
 
 /* string_agg(text, text) => text */ 
-DATA(insert OID = 3538 ( string_agg  PGNSP PGUID 12 1 0 0 t f f f i 2 0 25 f "25 25" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3538 ( string_agg  PGNSP PGUID 12 1 0 0 t f f f i 2 0 25 f "25 25" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 DESCR("concatenate aggregate input into an string with delimiter");
 
 /* current_query() => text */ 
-DATA(insert OID = 820 ( current_query  PGNSP PGUID 12 1 0 0 f f f f v 0 0 25 f "" _null_ _null_ _null_ _null_ current_query _null_ _null_ n ));
+DATA(insert OID = 820 ( current_query  PGNSP PGUID 12 1 0 0 f f f f v 0 0 25 f "" _null_ _null_ _null_ _null_ current_query _null_ _null_ _null_ n ));
 DESCR("returns the currently executing query");
 
-/* lo_truncate(int4, int4) => int4 */ 
-DATA(insert OID = 828 ( lo_truncate  PGNSP PGUID 12 1 0 0 f f t f v 2 0 23 f "23 23" _null_ _null_ _null_ _null_ lo_truncate _null_ _null_ n ));
-DESCR("truncate large object");
-
 /* int8dec(int8) => int8 */ 
-DATA(insert OID = 3546 ( int8dec  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "20" _null_ _null_ _null_ _null_ int8dec _null_ _null_ n ));
+DATA(insert OID = 3546 ( int8dec  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "20" _null_ _null_ _null_ _null_ int8dec _null_ _null_ _null_ n ));
 
 /* interval_interval_div("interval", "interval") => float8 */ 
-DATA(insert OID = 6115 ( interval_interval_div  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 f "1186 1186" _null_ _null_ _null_ _null_ interval_interval_div _null_ _null_ n ));
+DATA(insert OID = 6115 ( interval_interval_div  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 f "1186 1186" _null_ _null_ _null_ _null_ interval_interval_div _null_ _null_ _null_ n ));
 DESCR("divide");
 
 /* interval_interval_mod("interval", "interval") => "interval" */ 
-DATA(insert OID = 6116 ( interval_interval_mod  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 f "1186 1186" _null_ _null_ _null_ _null_ interval_interval_mod _null_ _null_ n ));
+DATA(insert OID = 6116 ( interval_interval_mod  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 f "1186 1186" _null_ _null_ _null_ _null_ interval_interval_mod _null_ _null_ _null_ n ));
 DESCR("modulus");
 
-/* regexp_matches(text, text) => SETOF _text */ 
-DATA(insert OID = 5018 ( regexp_matches  PGNSP PGUID 12 1 1000 0 f f t t i 2 0 1009 f "25 25" _null_ _null_ _null_ _null_ regexp_matches_no_flags _null_ _null_ n ));
-DESCR("return all match groups for regexp");
-
-/* regexp_matches(text, text, text) => SETOF _text */ 
-DATA(insert OID = 5019 ( regexp_matches  PGNSP PGUID 12 1 1000 0 f f t t i 3 0 1009 f "25 25 25" _null_ _null_ _null_ _null_ regexp_matches _null_ _null_ n ));
-DESCR("return all match groups for regexp");
-
-/* regexp_split_to_table(text, text) => SETOF text */ 
-DATA(insert OID = 5020 ( regexp_split_to_table  PGNSP PGUID 12 1 1000 0 f f t t i 2 0 25 f "25 25" _null_ _null_ _null_ _null_ regexp_split_to_table_no_flags _null_ _null_ n ));
-DESCR("split string by pattern");
-
-/* regexp_split_to_table(text, text, text) => SETOF text */ 
-DATA(insert OID = 5021 ( regexp_split_to_table  PGNSP PGUID 12 1 1000 0 f f t t i 3 0 25 f "25 25 25" _null_ _null_ _null_ _null_ regexp_split_to_table _null_ _null_ n ));
-DESCR("split string by pattern");
-
-/* regexp_split_to_array(text, text) => _text */ 
-DATA(insert OID = 5022 ( regexp_split_to_array  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1009 f "25 25" _null_ _null_ _null_ _null_ regexp_split_to_array_no_flags _null_ _null_ n ));
-DESCR("split string by pattern");
-
-/* regexp_split_to_array(text, text, text) => _text */ 
-DATA(insert OID = 5023 ( regexp_split_to_array  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1009 f "25 25 25" _null_ _null_ _null_ _null_ regexp_split_to_array _null_ _null_ n ));
-DESCR("split string by pattern");
-
 
 /* System-view support functions  */
 /* pg_get_partition_def(oid) => text */ 
-DATA(insert OID = 5024 ( pg_get_partition_def  PGNSP PGUID 12 1 0 0 f f t f s 1 0 25 f "26" _null_ _null_ _null_ _null_ pg_get_partition_def _null_ _null_ n ));
+DATA(insert OID = 5024 ( pg_get_partition_def  PGNSP PGUID 12 1 0 0 f f t f s 1 0 25 f "26" _null_ _null_ _null_ _null_ pg_get_partition_def _null_ _null_ _null_ n ));
 
 /* pg_get_partition_def(oid, bool) => text */ 
-DATA(insert OID = 5025 ( pg_get_partition_def  PGNSP PGUID 12 1 0 0 f f t f s 2 0 25 f "26 16" _null_ _null_ _null_ _null_ pg_get_partition_def_ext _null_ _null_ n ));
+DATA(insert OID = 5025 ( pg_get_partition_def  PGNSP PGUID 12 1 0 0 f f t f s 2 0 25 f "26 16" _null_ _null_ _null_ _null_ pg_get_partition_def_ext _null_ _null_ _null_ n ));
 DESCR("partition configuration for a given relation");
 
 /* pg_get_partition_def(oid, bool, bool) => text */ 
-DATA(insert OID = 5034 ( pg_get_partition_def  PGNSP PGUID 12 1 0 0 f f t f s 3 0 25 f "26 16 16" _null_ _null_ _null_ _null_ pg_get_partition_def_ext2 _null_ _null_ n ));
+DATA(insert OID = 5034 ( pg_get_partition_def  PGNSP PGUID 12 1 0 0 f f t f s 3 0 25 f "26 16 16" _null_ _null_ _null_ _null_ pg_get_partition_def_ext2 _null_ _null_ _null_ n ));
 DESCR("partition configuration for a given relation");
 
 /* pg_get_partition_rule_def(oid) => text */ 
-DATA(insert OID = 5027 ( pg_get_partition_rule_def  PGNSP PGUID 12 1 0 0 f f t f s 1 0 25 f "26" _null_ _null_ _null_ _null_ pg_get_partition_rule_def _null_ _null_ n ));
+DATA(insert OID = 5027 ( pg_get_partition_rule_def  PGNSP PGUID 12 1 0 0 f f t f s 1 0 25 f "26" _null_ _null_ _null_ _null_ pg_get_partition_rule_def _null_ _null_ _null_ n ));
 
 /* pg_get_partition_rule_def(oid, bool) => text */ 
-DATA(insert OID = 5028 ( pg_get_partition_rule_def  PGNSP PGUID 12 1 0 0 f f t f s 2 0 25 f "26 16" _null_ _null_ _null_ _null_ pg_get_partition_rule_def_ext _null_ _null_ n ));
+DATA(insert OID = 5028 ( pg_get_partition_rule_def  PGNSP PGUID 12 1 0 0 f f t f s 2 0 25 f "26 16" _null_ _null_ _null_ _null_ pg_get_partition_rule_def_ext _null_ _null_ _null_ n ));
 DESCR("partition configuration for a given rule");
 
 /* pg_get_partition_template_def(oid, bool, bool) => text */ 
-DATA(insert OID = 5037 ( pg_get_partition_template_def  PGNSP PGUID 12 1 0 0 f f t f s 3 0 25 f "26 16 16" _null_ _null_ _null_ _null_ pg_get_partition_template_def _null_ _null_ n ));
+DATA(insert OID = 5037 ( pg_get_partition_template_def  PGNSP PGUID 12 1 0 0 f f t f s 3 0 25 f "26 16 16" _null_ _null_ _null_ _null_ pg_get_partition_template_def _null_ _null_ _null_ n ));
 DESCR("ALTER statement to recreate subpartition templates for a give relation");
 
 /* pg_get_keywords(OUT word text, OUT catcode "char", OUT catdesc text) => SETOF pg_catalog.record */ 
-DATA(insert OID = 821 ( pg_get_keywords  PGNSP PGUID 12 1 1000 0 f f t t s 0 0 2249 f "" "{25,18,25}" "{o,o,o}" "{word,catcode,catdesc}" _null_ pg_get_keywords _null_ _null_ n ));
+DATA(insert OID = 821 ( pg_get_keywords  PGNSP PGUID 12 1 1000 0 f f t t s 0 0 2249 f "" "{25,18,25}" "{o,o,o}" "{word,catcode,catdesc}" _null_ pg_get_keywords _null_ _null_ _null_ n ));
 DESCR("list of SQL keywords");
 
 /* pg_typeof("any") => regtype */ 
-DATA(insert OID = 822 ( pg_typeof  PGNSP PGUID 12 1 0 0 f f f f s 1 0 2206 f "2276" _null_ _null_ _null_ _null_ pg_typeof _null_ _null_ n ));
+DATA(insert OID = 822 ( pg_typeof  PGNSP PGUID 12 1 0 0 f f f f s 1 0 2206 f "2276" _null_ _null_ _null_ _null_ pg_typeof _null_ _null_ _null_ n ));
 DESCR("returns the type of the argument");
 
 /* numeric_dec("numeric") => "numeric" */ 
-DATA(insert OID = 1004 ( numeric_dec  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ numeric_dec _null_ _null_ n ));
+DATA(insert OID = 6997 ( numeric_dec  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1700 f "1700" _null_ _null_ _null_ _null_ numeric_dec _null_ _null_ _null_ n ));
 DESCR("increment by one");
 
 
 /* Sequences and time series */
 /* interval_bound(numeric, numeric) => numeric */ 
-DATA(insert OID = 2991 ( interval_bound  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 f "1700 1700" _null_ _null_ _null_ _null_ numeric_interval_bound _null_ _null_ n ));
+DATA(insert OID = 2991 ( interval_bound  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 f "1700 1700" _null_ _null_ _null_ _null_ numeric_interval_bound _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(numeric, numeric, int4) => numeric */ 
-DATA(insert OID = 2992 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1700 f "1700 1700 23" _null_ _null_ _null_ _null_ numeric_interval_bound_shift _null_ _null_ n ));
+DATA(insert OID = 2992 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1700 f "1700 1700 23" _null_ _null_ _null_ _null_ numeric_interval_bound_shift _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(numeric, numeric, int4, numeric) => numeric */ 
-DATA(insert OID = 2993 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1700 f "1700 1700 23 1700" _null_ _null_ _null_ _null_ numeric_interval_bound_shift_rbound _null_ _null_ n ));
+DATA(insert OID = 2993 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1700 f "1700 1700 23 1700" _null_ _null_ _null_ _null_ numeric_interval_bound_shift_rbound _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(timestamp, "interval") => timestamp */ 
-DATA(insert OID = 2994 ( interval_bound  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 f "1114 1186" _null_ _null_ _null_ _null_ timestamp_interval_bound _null_ _null_ n ));
+DATA(insert OID = 2994 ( interval_bound  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 f "1114 1186" _null_ _null_ _null_ _null_ timestamp_interval_bound _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(timestamp, "interval", int4) => timestamp */ 
-DATA(insert OID = 2995 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1114 f "1114 1186 23" _null_ _null_ _null_ _null_ timestamp_interval_bound_shift _null_ _null_ n ));
+DATA(insert OID = 2995 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1114 f "1114 1186 23" _null_ _null_ _null_ _null_ timestamp_interval_bound_shift _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(timestamp, "interval", int4, timestamp) => timestamp */ 
-DATA(insert OID = 2996 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1114 f "1114 1186 23 1114" _null_ _null_ _null_ _null_ timestamp_interval_bound_shift_reg _null_ _null_ n ));
+DATA(insert OID = 2996 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1114 f "1114 1186 23 1114" _null_ _null_ _null_ _null_ timestamp_interval_bound_shift_reg _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(timestamptz, "interval") => timestamptz */ 
-DATA(insert OID = 2997 ( interval_bound  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 f "1184 1186" _null_ _null_ _null_ _null_ timestamptz_interval_bound _null_ _null_ n ));
+DATA(insert OID = 2997 ( interval_bound  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 f "1184 1186" _null_ _null_ _null_ _null_ timestamptz_interval_bound _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(timestamptz, "interval", int4) => timestamptz */ 
-DATA(insert OID = 2998 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1184 f "1184 1186 23" _null_ _null_ _null_ _null_ timestamptz_interval_bound_shift _null_ _null_ n ));
+DATA(insert OID = 2998 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1184 f "1184 1186 23" _null_ _null_ _null_ _null_ timestamptz_interval_bound_shift _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 /* interval_bound(timestamptz, "interval", int4, timestamptz) => timestamptz */ 
-DATA(insert OID = 2999 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1184 f "1184 1186 23 1184" _null_ _null_ _null_ _null_ timestamptz_interval_bound_shift_reg _null_ _null_ n ));
+DATA(insert OID = 2999 ( interval_bound  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1184 f "1184 1186 23 1184" _null_ _null_ _null_ _null_ timestamptz_interval_bound_shift_reg _null_ _null_ _null_ n ));
 DESCR("boundary of the interval containing the given value");
 
 
 /* Aggregate-related functions  */
 /* numeric_avg_accum(bytea, "numeric") => bytea */ 
-DATA(insert OID = 3102 ( numeric_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 1700" _null_ _null_ _null_ _null_ numeric_avg_accum _null_ _null_ n ));
+DATA(insert OID = 3102 ( numeric_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 1700" _null_ _null_ _null_ _null_ numeric_avg_accum _null_ _null_ _null_ n ));
 DESCR("aggregate transition function");
 
 /* numeric_decum(_numeric, "numeric") => _numeric */ 
-DATA(insert OID = 7309 ( numeric_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 1700" _null_ _null_ _null_ _null_ numeric_decum _null_ _null_ n ));
+DATA(insert OID = 7309 ( numeric_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 1700" _null_ _null_ _null_ _null_ numeric_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* numeric_avg_decum(bytea, "numeric") => bytea */ 
-DATA(insert OID = 3103 ( numeric_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 1700" _null_ _null_ _null_ _null_ numeric_avg_decum _null_ _null_ n ));
+DATA(insert OID = 3103 ( numeric_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 1700" _null_ _null_ _null_ _null_ numeric_avg_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* int2_decum(_numeric, int2) => _numeric */ 
-DATA(insert OID = 7306 ( int2_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 21" _null_ _null_ _null_ _null_ int2_decum _null_ _null_ n ));
+DATA(insert OID = 7306 ( int2_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 21" _null_ _null_ _null_ _null_ int2_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* int4_decum(_numeric, int4) => _numeric */ 
-DATA(insert OID = 7307 ( int4_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 23" _null_ _null_ _null_ _null_ int4_decum _null_ _null_ n ));
+DATA(insert OID = 7307 ( int4_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 23" _null_ _null_ _null_ _null_ int4_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* int8_decum(_numeric, int8) => _numeric */ 
-DATA(insert OID = 7308 ( int8_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 20" _null_ _null_ _null_ _null_ int8_decum _null_ _null_ n ));
+DATA(insert OID = 7308 ( int8_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 20" _null_ _null_ _null_ _null_ int8_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* int2_invsum(int8, int2) => int8 */ 
-DATA(insert OID = 7008 ( int2_invsum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 f "20 21" _null_ _null_ _null_ _null_ int2_invsum _null_ _null_ n ));
+DATA(insert OID = 7008 ( int2_invsum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 f "20 21" _null_ _null_ _null_ _null_ int2_invsum _null_ _null_ _null_ n ));
 DESCR("SUM(int2) inverse transition function");
 
 /* int4_invsum(int8, int4) => int8 */ 
-DATA(insert OID = 7009 ( int4_invsum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 f "20 23" _null_ _null_ _null_ _null_ int4_invsum _null_ _null_ n ));
+DATA(insert OID = 7009 ( int4_invsum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 f "20 23" _null_ _null_ _null_ _null_ int4_invsum _null_ _null_ _null_ n ));
 DESCR("SUM(int4) inverse transition function");
 
 /* int8_invsum("numeric", int8) => "numeric" */ 
-DATA(insert OID = 7010 ( int8_invsum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1700 f "1700 20" _null_ _null_ _null_ _null_ int8_invsum _null_ _null_ n ));
+DATA(insert OID = 7010 ( int8_invsum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1700 f "1700 20" _null_ _null_ _null_ _null_ int8_invsum _null_ _null_ _null_ n ));
 DESCR("SUM(int8) inverse transition function");
 
 /* interval_decum(_interval, "interval") => _interval */ 
-DATA(insert OID = 6038 ( interval_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1187 f "1187 1186" _null_ _null_ _null_ _null_ interval_decum _null_ _null_ n ));
+DATA(insert OID = 6038 ( interval_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1187 f "1187 1186" _null_ _null_ _null_ _null_ interval_decum _null_ _null_ _null_ n ));
 DESCR("aggregate inverse transition function");
 
 /* int8_avg_accum(bytea, int8) => bytea */ 
-DATA(insert OID = 3100 ( int8_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 20" _null_ _null_ _null_ _null_ int8_avg_accum _null_ _null_ n ));
+DATA(insert OID = 3100 ( int8_avg_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 20" _null_ _null_ _null_ _null_ int8_avg_accum _null_ _null_ _null_ n ));
 DESCR("AVG(int8) transition function");
 
 /* int2_avg_decum(bytea, int2) => bytea */ 
-DATA(insert OID = 6019 ( int2_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 21" _null_ _null_ _null_ _null_ int2_avg_decum _null_ _null_ n ));
+DATA(insert OID = 6019 ( int2_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 21" _null_ _null_ _null_ _null_ int2_avg_decum _null_ _null_ _null_ n ));
 DESCR("AVG(int2) transition function");
 
 /* int4_avg_decum(bytea, int4) => bytea */ 
-DATA(insert OID = 6020 ( int4_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 23" _null_ _null_ _null_ _null_ int4_avg_decum _null_ _null_ n ));
+DATA(insert OID = 6020 ( int4_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 23" _null_ _null_ _null_ _null_ int4_avg_decum _null_ _null_ _null_ n ));
 DESCR("AVG(int4) transition function");
 
 /* int8_avg_decum(bytea, int8) => bytea */ 
-DATA(insert OID = 3101 ( int8_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 20" _null_ _null_ _null_ _null_ int8_avg_decum _null_ _null_ n ));
+DATA(insert OID = 3101 ( int8_avg_decum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 20" _null_ _null_ _null_ _null_ int8_avg_decum _null_ _null_ _null_ n ));
 DESCR("AVG(int8) transition function");
 
 /* pg_partition_oid_transfn(internal, oid, record) => internal */ 
-DATA(insert OID = 6099 ( pg_partition_oid_transfn  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2281 f "2281 26 2249" _null_ _null_ _null_ _null_ pg_partition_oid_transfn _null_ _null_ n ));
+DATA(insert OID = 6099 ( pg_partition_oid_transfn  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2281 f "2281 26 2249" _null_ _null_ _null_ _null_ pg_partition_oid_transfn _null_ _null_ _null_ n ));
 DESCR("pg_partition_oid transition function");
 
 /* pg_partition_oid_finalfn(internal) => _oid */ 
-DATA(insert OID = 6100 ( pg_partition_oid_finalfn  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1028 f "2281" _null_ _null_ _null_ _null_ pg_partition_oid_finalfn _null_ _null_ n ));
+DATA(insert OID = 6100 ( pg_partition_oid_finalfn  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1028 f "2281" _null_ _null_ _null_ _null_ pg_partition_oid_finalfn _null_ _null_ _null_ n ));
 DESCR("pg_partition_oid final function");
 
 /* pg_partition_oid(oid, record) => _oid */ 
-DATA(insert OID = 6112 ( pg_partition_oid  PGNSP PGUID 12 1 0 0 t f f f i 2 0 1028 f "26 2249" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 6112 ( pg_partition_oid  PGNSP PGUID 12 1 0 0 t f f f i 2 0 1028 f "26 2249" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 
 #define PG_PARTITION_OID_OID 6112
 /* pg_stat_get_backend_waiting_reason(int4) => text */ 
-DATA(insert OID = 2897 ( pg_stat_get_backend_waiting_reason  PGNSP PGUID 12 1 0 0 f f t f s 1 0 25 f "23" _null_ _null_ _null_ _null_ pg_stat_get_backend_waiting_reason _null_ _null_ n ));
+DATA(insert OID = 2897 ( pg_stat_get_backend_waiting_reason  PGNSP PGUID 12 1 0 0 f f t f s 1 0 25 f "23" _null_ _null_ _null_ _null_ pg_stat_get_backend_waiting_reason _null_ _null_ _null_ n ));
 DESCR("Statistics: Reason backend is waiting for");
 
 /* pg_stat_get_queue_num_exec(oid) => int8 */ 
-DATA(insert OID = 6031 ( pg_stat_get_queue_num_exec  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_num_exec _null_ _null_ n ));
+DATA(insert OID = 6031 ( pg_stat_get_queue_num_exec  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_num_exec _null_ _null_ _null_ n ));
 DESCR("Statistics: Number of queries that executed in queue");
 
 /* pg_stat_get_queue_num_wait(oid) => int8 */ 
-DATA(insert OID = 6032 ( pg_stat_get_queue_num_wait  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_num_wait _null_ _null_ n ));
+DATA(insert OID = 6032 ( pg_stat_get_queue_num_wait  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_num_wait _null_ _null_ _null_ n ));
 DESCR("Statistics: Number of queries that waited in queue");
 
 /* pg_stat_get_queue_elapsed_exec(oid) => int8 */ 
-DATA(insert OID = 6033 ( pg_stat_get_queue_elapsed_exec  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_elapsed_exec _null_ _null_ n ));
+DATA(insert OID = 6033 ( pg_stat_get_queue_elapsed_exec  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_elapsed_exec _null_ _null_ _null_ n ));
 DESCR("Statistics:  Elapsed seconds for queries that executed in queue");
 
 /* pg_stat_get_queue_elapsed_wait(oid) => int8 */ 
-DATA(insert OID = 6034 ( pg_stat_get_queue_elapsed_wait  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_elapsed_wait _null_ _null_ n ));
+DATA(insert OID = 6034 ( pg_stat_get_queue_elapsed_wait  PGNSP PGUID 12 1 0 0 f f t f s 1 0 20 f "26" _null_ _null_ _null_ _null_ pg_stat_get_queue_elapsed_wait _null_ _null_ _null_ n ));
 DESCR("Statistics:  Elapsed seconds for queries that waited in queue");
 
 /* pg_stat_get_backend_session_id(int4) => int4 */ 
-DATA(insert OID = 6039 ( pg_stat_get_backend_session_id  PGNSP PGUID 12 1 0 0 f f t f s 1 0 23 f "23" _null_ _null_ _null_ _null_ pg_stat_get_backend_session_id _null_ _null_ n ));
+DATA(insert OID = 6039 ( pg_stat_get_backend_session_id  PGNSP PGUID 12 1 0 0 f f t f s 1 0 23 f "23" _null_ _null_ _null_ _null_ pg_stat_get_backend_session_id _null_ _null_ _null_ n ));
 DESCR("Statistics: Greenplum session id of backend");
 
 /* pg_renice_session(int4, int4) => int4 */ 
-DATA(insert OID = 6042 ( pg_renice_session  PGNSP PGUID 12 1 0 0 f f t f v 2 0 23 f "23 23" _null_ _null_ _null_ _null_ pg_renice_session _null_ _null_ n ));
+DATA(insert OID = 6042 ( pg_renice_session  PGNSP PGUID 12 1 0 0 f f t f v 2 0 23 f "23 23" _null_ _null_ _null_ _null_ pg_renice_session _null_ _null_ _null_ n ));
 DESCR("change priority of all the backends for a given session id");
 
 /* pg_stat_get_activity(IN pid int4, OUT datid oid, OUT procpid int4, OUT usesysid oid, OUT application_name text, OUT current_query text, OUT waiting bool, OUT xact_start timestamptz, OUT query_start timestamptz, OUT backend_start timestamptz, OUT client_addr inet, OUT client_port int4, OUT sess_id int4, OUT waiting_reason text) => SETOF pg_catalog.record */ 
-DATA(insert OID = 6071 ( pg_stat_get_activity  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "23" "{23,26,23,26,25,25,16,1184,1184,1184,869,23,23,25}" "{i,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{pid,datid,procpid,usesysid,application_name,current_query,waiting,xact_start,query_start,backend_start,client_addr,client_port,sess_id,waiting_reason}" _null_ pg_stat_get_activity _null_ _null_ n ));
+DATA(insert OID = 6071 ( pg_stat_get_activity  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "23" "{23,26,23,26,25,25,16,1184,1184,1184,869,23,23,25}" "{i,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{pid,datid,procpid,usesysid,application_name,current_query,waiting,xact_start,query_start,backend_start,client_addr,client_port,sess_id,waiting_reason}" _null_ pg_stat_get_activity _null_ _null_ _null_ n ));
 DESCR("statistics: information about currently active backends");
 
 /* pg_stat_get_wal_senders(OUT pid int4, OUT state text, OUT sent_location text, OUT write_location text, OUT flush_location text, OUT replay_location text, OUT sync_priority int4, OUT sync_state text) => SETOF pg_catalog.record */ 
-DATA(insert OID = 3099 ( pg_stat_get_wal_senders  PGNSP PGUID 12 1 1000 0 f f f t s 0 0 2249 f "" "{23,25,25,25,25,25,23,25}" "{o,o,o,o,o,o,o,o}" "{pid,state,sent_location,write_location,flush_location,replay_location,sync_priority,sync_state}" _null_ pg_stat_get_wal_senders _null_ _null_ n ));
+DATA(insert OID = 3099 ( pg_stat_get_wal_senders  PGNSP PGUID 12 1 1000 0 f f f t s 0 0 2249 f "" "{23,25,25,25,25,25,23,25}" "{o,o,o,o,o,o,o,o}" "{pid,state,sent_location,write_location,flush_location,replay_location,sync_priority,sync_state}" _null_ pg_stat_get_wal_senders _null_ _null_ _null_ n ));
 DESCR("statistics: information about currently active replication");
 
 /* pg_terminate_backend(int4) => bool */ 
-DATA(insert OID = 6118 ( pg_terminate_backend  PGNSP PGUID 12 1 0 0 f f t f v 1 0 16 f "23" _null_ _null_ _null_ _null_ pg_terminate_backend _null_ _null_ n ));
+DATA(insert OID = 6118 ( pg_terminate_backend  PGNSP PGUID 12 1 0 0 f f t f v 1 0 16 f "23" _null_ _null_ _null_ _null_ pg_terminate_backend _null_ _null_ _null_ n ));
 DESCR("terminate a server process");
 
 /* pg_resqueue_status() => SETOF record */ 
-DATA(insert OID = 6030 ( pg_resqueue_status  PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_resqueue_status _null_ _null_ n ));
+DATA(insert OID = 6030 ( pg_resqueue_status  PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_resqueue_status _null_ _null_ _null_ n ));
 DESCR("Return resource queue information");
 
 /* pg_resqueue_status_kv() => SETOF record */ 
-DATA(insert OID = 6069 ( pg_resqueue_status_kv  PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_resqueue_status_kv _null_ _null_ n ));
+DATA(insert OID = 6069 ( pg_resqueue_status_kv  PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_resqueue_status_kv _null_ _null_ _null_ n ));
 DESCR("Return resource queue information");
 
 /* pg_file_read(text, int8, int8) => text */ 
-DATA(insert OID = 6045 ( pg_file_read  PGNSP PGUID 12 1 0 0 f f t f v 3 0 25 f "25 20 20" _null_ _null_ _null_ _null_ pg_read_file _null_ _null_ n ));
+DATA(insert OID = 6045 ( pg_file_read  PGNSP PGUID 12 1 0 0 f f t f v 3 0 25 f "25 20 20" _null_ _null_ _null_ _null_ pg_read_file _null_ _null_ _null_ n ));
 DESCR("Read text from a file");
 
 /* pg_logfile_rotate() => bool */ 
-DATA(insert OID = 6046 ( pg_logfile_rotate  PGNSP PGUID 12 1 0 0 f f t f v 0 0 16 f "" _null_ _null_ _null_ _null_ pg_rotate_logfile _null_ _null_ n ));
+DATA(insert OID = 6046 ( pg_logfile_rotate  PGNSP PGUID 12 1 0 0 f f t f v 0 0 16 f "" _null_ _null_ _null_ _null_ pg_rotate_logfile _null_ _null_ _null_ n ));
 DESCR("Rotate log file");
 
 /* pg_file_write(text, text, bool) => int8 */ 
-DATA(insert OID = 6047 ( pg_file_write  PGNSP PGUID 12 1 0 0 f f t f v 3 0 20 f "25 25 16" _null_ _null_ _null_ _null_ pg_file_write _null_ _null_ n ));
+DATA(insert OID = 6047 ( pg_file_write  PGNSP PGUID 12 1 0 0 f f t f v 3 0 20 f "25 25 16" _null_ _null_ _null_ _null_ pg_file_write _null_ _null_ _null_ n ));
 DESCR("Write text to a file");
 
 /* pg_file_rename(text, text, text) => bool */ 
-DATA(insert OID = 6048 ( pg_file_rename  PGNSP PGUID 12 1 0 0 f f f f v 3 0 16 f "25 25 25" _null_ _null_ _null_ _null_ pg_file_rename _null_ _null_ n ));
+DATA(insert OID = 6048 ( pg_file_rename  PGNSP PGUID 12 1 0 0 f f f f v 3 0 16 f "25 25 25" _null_ _null_ _null_ _null_ pg_file_rename _null_ _null_ _null_ n ));
 DESCR("Rename a file");
 
 /* pg_file_unlink(text) => bool */ 
-DATA(insert OID = 6049 ( pg_file_unlink  PGNSP PGUID 12 1 0 0 f f t f v 1 0 16 f "25" _null_ _null_ _null_ _null_ pg_file_unlink _null_ _null_ n ));
+DATA(insert OID = 6049 ( pg_file_unlink  PGNSP PGUID 12 1 0 0 f f t f v 1 0 16 f "25" _null_ _null_ _null_ _null_ pg_file_unlink _null_ _null_ _null_ n ));
 DESCR("Delete (unlink) a file");
 
 /* pg_logdir_ls() => SETOF record */ 
-DATA(insert OID = 6050 ( pg_logdir_ls  PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_logdir_ls _null_ _null_ n ));
+DATA(insert OID = 6050 ( pg_logdir_ls  PGNSP PGUID 12 1 1000 0 f f t t v 0 0 2249 f "" _null_ _null_ _null_ _null_ pg_logdir_ls _null_ _null_ _null_ n ));
 DESCR("ls the log dir");
 
 /* pg_file_length(text) => int8 */ 
-DATA(insert OID = 6051 ( pg_file_length  PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "25" _null_ _null_ _null_ _null_ pg_file_length _null_ _null_ n ));
+DATA(insert OID = 6051 ( pg_file_length  PGNSP PGUID 12 1 0 0 f f t f v 1 0 20 f "25" _null_ _null_ _null_ _null_ pg_file_length _null_ _null_ _null_ n ));
 DESCR("Get the length of a file (via stat)");
 
-/* text(bool) => text */ 
-DATA(insert OID = 2971 ( text  PGNSP PGUID 12 1 0 0 f f t f i 1 0 25 f "16" _null_ _null_ _null_ _null_ booltext _null_ _null_ n ));
-DESCR("convert boolean to text");
-
 
 /* Aggregates (moved here from pg_aggregate for 7.3)  */
 /* max(gpxlogloc) => gpxlogloc */ 
-DATA(insert OID = 3332 ( max  PGNSP PGUID 12 1 0 0 t f f f i 1 0 3310 f "3310" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3332 ( max  PGNSP PGUID 12 1 0 0 t f f f i 1 0 3310 f "3310" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* min(gpxlogloc) => gpxlogloc */ 
-DATA(insert OID = 3333 ( min  PGNSP PGUID 12 1 0 0 t f f f i 1 0 3310 f "3310" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3333 ( min  PGNSP PGUID 12 1 0 0 t f f f i 1 0 3310 f "3310" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 
 /* MPP Aggregate -- array_sum -- special for prospective customer.  */
 /* array_sum(_int4) => _int4 */ 
-DATA(insert OID = 6013 ( array_sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1007 f "1007" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 6013 ( array_sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1007 f "1007" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 
 /* Window functions (similar to aggregates)  */
 /* row_number() => int8 */ 
-DATA(insert OID = 7000 ( row_number  PGNSP PGUID 12 1 0 0 f f f f i 0 0 20 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7000 ( row_number  PGNSP PGUID 12 1 0 0 f f f f i 0 0 20 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 
 #define ROW_NUMBER_OID 7000
 #define ROW_NUMBER_TYPE 20
 /* rank() => int8 */ 
-DATA(insert OID = 7001 ( rank  PGNSP PGUID 12 1 0 0 f f f f i 0 0 20 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7001 ( rank  PGNSP PGUID 12 1 0 0 f f f f i 0 0 20 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* dense_rank() => int8 */ 
-DATA(insert OID = 7002 ( dense_rank  PGNSP PGUID 12 1 0 0 f f f f i 0 0 20 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7002 ( dense_rank  PGNSP PGUID 12 1 0 0 f f f f i 0 0 20 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* percent_rank() => float8 */ 
-DATA(insert OID = 7003 ( percent_rank  PGNSP PGUID 12 1 0 0 f f f f i 0 0 701 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7003 ( percent_rank  PGNSP PGUID 12 1 0 0 f f f f i 0 0 701 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* cume_dist() => float8 */ 
-DATA(insert OID = 7004 ( cume_dist  PGNSP PGUID 12 1 0 0 f f f f i 0 0 701 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7004 ( cume_dist  PGNSP PGUID 12 1 0 0 f f f f i 0 0 701 t "" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 
 #define CUME_DIST_OID 7004
 /* ntile(int4) => int8 */ 
-DATA(insert OID = 7005 ( ntile  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7005 ( ntile  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* ntile(int8) => int8 */ 
-DATA(insert OID = 7006 ( ntile  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7006 ( ntile  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* ntile("numeric") => int8 */ 
-DATA(insert OID = 7007 ( ntile  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7007 ( ntile  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 
 /*  XXX for now, window functions with arguments, just cite numeric = 1700, need to overload.  */
 /* first_value(bool) => bool */ 
-DATA(insert OID = 7017 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7017 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value("char") => "char" */ 
-DATA(insert OID = 7018 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7018 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(cidr) => cidr */ 
-DATA(insert OID = 7019 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7019 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(circle) => circle */ 
-DATA(insert OID = 7020 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7020 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(float4) => float4 */ 
-DATA(insert OID = 7021 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7021 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(float8) => float8 */ 
-DATA(insert OID = 7022 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7022 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(inet) => inet */ 
-DATA(insert OID = 7023 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7023 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value("interval") => "interval" */ 
-DATA(insert OID = 7024 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7024 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(line) => line */ 
-DATA(insert OID = 7025 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7025 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(lseg) => lseg */ 
-DATA(insert OID = 7026 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7026 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(macaddr) => macaddr */ 
-DATA(insert OID = 7027 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7027 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(int2) => int2 */ 
-DATA(insert OID = 7028 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7028 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(int4) => int4 */ 
-DATA(insert OID = 7029 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7029 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(int8) => int8 */ 
-DATA(insert OID = 7030 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7030 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(money) => money */ 
-DATA(insert OID = 7031 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7031 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(name) => name */ 
-DATA(insert OID = 7032 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7032 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value("numeric") => "numeric" */ 
-DATA(insert OID = 7033 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7033 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(oid) => oid */ 
-DATA(insert OID = 7034 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7034 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(path) => path */ 
-DATA(insert OID = 7035 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7035 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(point) => point */ 
-DATA(insert OID = 7036 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7036 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(polygon) => polygon */ 
-DATA(insert OID = 7037 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7037 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(reltime) => reltime */ 
-DATA(insert OID = 7038 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7038 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(text) => text */ 
-DATA(insert OID = 7039 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7039 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(tid) => tid */ 
-DATA(insert OID = 7040 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7040 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value("time") => "time" */ 
-DATA(insert OID = 7041 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7041 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value("timestamp") => "timestamp" */ 
-DATA(insert OID = 7042 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7042 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(timestamptz) => timestamptz */ 
-DATA(insert OID = 7043 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7043 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(timetz) => timetz */ 
-DATA(insert OID = 7044 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7044 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(varbit) => varbit */ 
-DATA(insert OID = 7045 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7045 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value("varchar") => "varchar" */ 
-DATA(insert OID = 7046 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7046 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(xid) => xid */ 
-DATA(insert OID = 7047 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7047 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(bytea) => bytea */ 
-DATA(insert OID = 7232 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7232 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value("bit") => "bit" */ 
-DATA(insert OID = 7256 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7256 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(box) => box */ 
-DATA(insert OID = 7272 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7272 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* first_value(anyarray) => anyarray */ 
-DATA(insert OID = 7288 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7288 ( first_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(int4) => int4 */ 
-DATA(insert OID = 7012 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7012 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(int2) => int2 */ 
-DATA(insert OID = 7013 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7013 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(int8) => int8 */ 
-DATA(insert OID = 7014 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7014 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value("numeric") => "numeric" */ 
-DATA(insert OID = 7015 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7015 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(text) => text */ 
-DATA(insert OID = 7016 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7016 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(bool) => bool */ 
-DATA(insert OID = 7063 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7063 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value("char") => "char" */ 
-DATA(insert OID = 7072 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7072 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(cidr) => cidr */ 
-DATA(insert OID = 7073 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7073 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(circle) => circle */ 
-DATA(insert OID = 7048 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7048 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(float4) => float4 */ 
-DATA(insert OID = 7049 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7049 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(float8) => float8 */ 
-DATA(insert OID = 7050 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7050 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(inet) => inet */ 
-DATA(insert OID = 7051 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7051 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value("interval") => "interval" */ 
-DATA(insert OID = 7052 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7052 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(line) => line */ 
-DATA(insert OID = 7053 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7053 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(lseg) => lseg */ 
-DATA(insert OID = 7054 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7054 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(macaddr) => macaddr */ 
-DATA(insert OID = 7055 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7055 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(money) => money */ 
-DATA(insert OID = 7056 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7056 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(name) => name */ 
-DATA(insert OID = 7057 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7057 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(oid) => oid */ 
-DATA(insert OID = 7058 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7058 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(path) => path */ 
-DATA(insert OID = 7059 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7059 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(point) => point */ 
-DATA(insert OID = 7060 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7060 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(polygon) => polygon */ 
-DATA(insert OID = 7061 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7061 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(reltime) => reltime */ 
-DATA(insert OID = 7062 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7062 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(tid) => tid */ 
-DATA(insert OID = 7064 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7064 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value("time") => "time" */ 
-DATA(insert OID = 7065 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7065 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value("timestamp") => "timestamp" */ 
-DATA(insert OID = 7066 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7066 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(timestamptz) => timestamptz */ 
-DATA(insert OID = 7067 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7067 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(timetz) => timetz */ 
-DATA(insert OID = 7068 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7068 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(varbit) => varbit */ 
-DATA(insert OID = 7069 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7069 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value("varchar") => "varchar" */ 
-DATA(insert OID = 7070 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7070 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(xid) => xid */ 
-DATA(insert OID = 7071 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7071 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(bytea) => bytea */ 
-DATA(insert OID = 7238 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7238 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value("bit") => "bit" */ 
-DATA(insert OID = 7258 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7258 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(box) => box */ 
-DATA(insert OID = 7274 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7274 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* last_value(anyarray) => anyarray */ 
-DATA(insert OID = 7290 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7290 ( last_value  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(bool, int8, bool) => bool */ 
-DATA(insert OID = 7675 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 16 t "16 20 16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7675 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 16 t "16 20 16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(bool, int8) => bool */ 
-DATA(insert OID = 7491 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 16 t "16 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7491 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 16 t "16 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(bool) => bool */ 
-DATA(insert OID = 7493 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7493 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("char", int8, "char") => "char" */ 
-DATA(insert OID = 7495 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 18 t "18 20 18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7495 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 18 t "18 20 18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("char", int8) => "char" */ 
-DATA(insert OID = 7497 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 18 t "18 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7497 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 18 t "18 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("char") => "char" */ 
-DATA(insert OID = 7499 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7499 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(cidr, int8, cidr) => cidr */ 
-DATA(insert OID = 7501 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 650 t "650 20 650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7501 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 650 t "650 20 650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(cidr, int8) => cidr */ 
-DATA(insert OID = 7503 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 650 t "650 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7503 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 650 t "650 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(cidr) => cidr */ 
-DATA(insert OID = 7505 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7505 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(circle, int8, circle) => circle */ 
-DATA(insert OID = 7507 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 718 t "718 20 718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7507 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 718 t "718 20 718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(circle, int8) => circle */ 
-DATA(insert OID = 7509 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 718 t "718 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7509 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 718 t "718 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(circle) => circle */ 
-DATA(insert OID = 7511 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7511 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(float4, int8, float4) => float4 */ 
-DATA(insert OID = 7513 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 700 t "700 20 700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7513 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 700 t "700 20 700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(float4, int8) => float4 */ 
-DATA(insert OID = 7515 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 700 t "700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7515 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 700 t "700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(float4) => float4 */ 
-DATA(insert OID = 7517 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7517 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(float8, int8, float8) => float8 */ 
-DATA(insert OID = 7519 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 701 t "701 20 701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7519 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 701 t "701 20 701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(float8, int8) => float8 */ 
-DATA(insert OID = 7521 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 701 t "701 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7521 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 701 t "701 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(float8) => float8 */ 
-DATA(insert OID = 7523 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7523 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(inet, int8, inet) => inet */ 
-DATA(insert OID = 7525 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 869 t "869 20 869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7525 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 869 t "869 20 869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(inet, int8) => inet */ 
-DATA(insert OID = 7527 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 869 t "869 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7527 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 869 t "869 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(inet) => inet */ 
-DATA(insert OID = 7529 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7529 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("interval", int8, "interval") => "interval" */ 
-DATA(insert OID = 7531 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1186 t "1186 20 1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7531 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1186 t "1186 20 1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("interval", int8) => "interval" */ 
-DATA(insert OID = 7533 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1186 t "1186 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7533 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1186 t "1186 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("interval") => "interval" */ 
-DATA(insert OID = 7535 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7535 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(line, int8, line) => line */ 
-DATA(insert OID = 7537 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 628 t "628 20 628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7537 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 628 t "628 20 628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(line, int8) => line */ 
-DATA(insert OID = 7539 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 628 t "628 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7539 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 628 t "628 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(line) => line */ 
-DATA(insert OID = 7541 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7541 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(lseg, int8, lseg) => lseg */ 
-DATA(insert OID = 7543 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 601 t "601 20 601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7543 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 601 t "601 20 601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(lseg, int8) => lseg */ 
-DATA(insert OID = 7545 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 601 t "601 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7545 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 601 t "601 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(lseg) => lseg */ 
-DATA(insert OID = 7547 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7547 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(macaddr, int8, macaddr) => macaddr */ 
-DATA(insert OID = 7549 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 829 t "829 20 829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7549 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 829 t "829 20 829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(macaddr, int8) => macaddr */ 
-DATA(insert OID = 7551 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 829 t "829 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7551 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 829 t "829 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(macaddr) => macaddr */ 
-DATA(insert OID = 7553 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7553 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int2, int8, int2) => int2 */ 
-DATA(insert OID = 7555 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 21 t "21 20 21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7555 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 21 t "21 20 21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int2, int8) => int2 */ 
-DATA(insert OID = 7557 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 21 t "21 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7557 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 21 t "21 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int2) => int2 */ 
-DATA(insert OID = 7559 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7559 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int4, int8, int4) => int4 */ 
-DATA(insert OID = 7561 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 23 t "23 20 23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7561 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 23 t "23 20 23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int4, int8) => int4 */ 
-DATA(insert OID = 7563 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 23 t "23 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7563 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 23 t "23 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int4) => int4 */ 
-DATA(insert OID = 7565 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7565 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int8, int8, int8) => int8 */ 
-DATA(insert OID = 7567 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 20 t "20 20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7567 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 20 t "20 20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int8, int8) => int8 */ 
-DATA(insert OID = 7569 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 t "20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7569 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 t "20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(int8) => int8 */ 
-DATA(insert OID = 7571 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7571 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(money, int8, money) => money */ 
-DATA(insert OID = 7573 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 790 t "790 20 790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7573 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 790 t "790 20 790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(money, int8) => money */ 
-DATA(insert OID = 7575 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 790 t "790 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7575 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 790 t "790 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(money) => money */ 
-DATA(insert OID = 7577 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7577 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(name, int8, name) => name */ 
-DATA(insert OID = 7579 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 19 t "19 20 19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7579 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 19 t "19 20 19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(name, int8) => name */ 
-DATA(insert OID = 7581 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 19 t "19 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7581 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 19 t "19 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(name) => name */ 
-DATA(insert OID = 7583 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7583 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("numeric", int8, "numeric") => "numeric" */ 
-DATA(insert OID = 7585 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1700 t "1700 20 1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7585 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1700 t "1700 20 1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("numeric", int8) => "numeric" */ 
-DATA(insert OID = 7587 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1700 t "1700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7587 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1700 t "1700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("numeric") => "numeric" */ 
-DATA(insert OID = 7589 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7589 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(oid, int8, oid) => oid */ 
-DATA(insert OID = 7591 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 26 t "26 20 26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7591 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 26 t "26 20 26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(oid, int8) => oid */ 
-DATA(insert OID = 7593 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 26 t "26 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7593 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 26 t "26 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(oid) => oid */ 
-DATA(insert OID = 7595 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7595 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(path, int8, path) => path */ 
-DATA(insert OID = 7597 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 602 t "602 20 602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7597 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 602 t "602 20 602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(path, int8) => path */ 
-DATA(insert OID = 7599 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 602 t "602 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7599 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 602 t "602 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(path) => path */ 
-DATA(insert OID = 7601 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7601 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(point, int8, point) => point */ 
-DATA(insert OID = 7603 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 600 t "600 20 600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7603 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 600 t "600 20 600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(point, int8) => point */ 
-DATA(insert OID = 7605 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 600 t "600 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7605 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 600 t "600 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(point) => point */ 
-DATA(insert OID = 7607 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7607 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(polygon, int8, polygon) => polygon */ 
-DATA(insert OID = 7609 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 604 t "604 20 604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7609 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 604 t "604 20 604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(polygon, int8) => polygon */ 
-DATA(insert OID = 7611 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 604 t "604 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7611 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 604 t "604 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(polygon) => polygon */ 
-DATA(insert OID = 7613 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7613 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(reltime, int8, reltime) => reltime */ 
-DATA(insert OID = 7615 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 703 t "703 20 703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7615 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 703 t "703 20 703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(reltime, int8) => reltime */ 
-DATA(insert OID = 7617 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 703 t "703 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7617 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 703 t "703 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(reltime) => reltime */ 
-DATA(insert OID = 7619 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7619 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(text, int8, text) => text */ 
-DATA(insert OID = 7621 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 25 t "25 20 25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7621 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 25 t "25 20 25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(text, int8) => text */ 
-DATA(insert OID = 7623 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 25 t "25 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7623 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 25 t "25 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(text) => text */ 
-DATA(insert OID = 7625 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7625 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(tid, int8, tid) => tid */ 
-DATA(insert OID = 7627 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 27 t "27 20 27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7627 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 27 t "27 20 27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(tid, int8) => tid */ 
-DATA(insert OID = 7629 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 27 t "27 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7629 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 27 t "27 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(tid) => tid */ 
-DATA(insert OID = 7631 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7631 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("time", int8, "time") => "time" */ 
-DATA(insert OID = 7633 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1083 t "1083 20 1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7633 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1083 t "1083 20 1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("time", int8) => "time" */ 
-DATA(insert OID = 7635 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1083 t "1083 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7635 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1083 t "1083 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("time") => "time" */ 
-DATA(insert OID = 7637 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7637 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("timestamp", int8, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7639 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1114 t "1114 20 1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7639 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1114 t "1114 20 1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("timestamp", int8) => "timestamp" */ 
-DATA(insert OID = 7641 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1114 t "1114 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7641 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1114 t "1114 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("timestamp") => "timestamp" */ 
-DATA(insert OID = 7643 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7643 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(timestamptz, int8, timestamptz) => timestamptz */ 
-DATA(insert OID = 7645 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1184 t "1184 20 1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7645 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1184 t "1184 20 1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(timestamptz, int8) => timestamptz */ 
-DATA(insert OID = 7647 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1184 t "1184 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7647 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1184 t "1184 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(timestamptz) => timestamptz */ 
-DATA(insert OID = 7649 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7649 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(timetz, int8, timetz) => timetz */ 
-DATA(insert OID = 7651 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1266 t "1266 20 1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7651 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1266 t "1266 20 1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(timetz, int8) => timetz */ 
-DATA(insert OID = 7653 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1266 t "1266 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7653 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1266 t "1266 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(timetz) => timetz */ 
-DATA(insert OID = 7655 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7655 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(varbit, int8, varbit) => varbit */ 
-DATA(insert OID = 7657 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1562 t "1562 20 1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7657 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1562 t "1562 20 1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(varbit, int8) => varbit */ 
-DATA(insert OID = 7659 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1562 t "1562 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7659 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1562 t "1562 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(varbit) => varbit */ 
-DATA(insert OID = 7661 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7661 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("varchar", int8, "varchar") => "varchar" */ 
-DATA(insert OID = 7663 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1043 t "1043 20 1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7663 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1043 t "1043 20 1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("varchar", int8) => "varchar" */ 
-DATA(insert OID = 7665 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1043 t "1043 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7665 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1043 t "1043 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("varchar") => "varchar" */ 
-DATA(insert OID = 7667 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7667 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(xid, int8, xid) => xid */ 
-DATA(insert OID = 7669 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 28 t "28 20 28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7669 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 28 t "28 20 28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(xid, int8) => xid */ 
-DATA(insert OID = 7671 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 28 t "28 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7671 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 28 t "28 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(xid) => xid */ 
-DATA(insert OID = 7673 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7673 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(anyarray, int8, anyarray) => anyarray */ 
-DATA(insert OID = 7211 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2277 t "2277 20 2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7211 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2277 t "2277 20 2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(anyarray, int8) => anyarray */ 
-DATA(insert OID = 7212 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2277 t "2277 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7212 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2277 t "2277 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(anyarray) => anyarray */ 
-DATA(insert OID = 7213 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7213 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(bytea) => bytea */ 
-DATA(insert OID = 7226 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7226 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(bytea, int8) => bytea */ 
-DATA(insert OID = 7228 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 17 t "17 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7228 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 17 t "17 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(bytea, int8, bytea) => bytea */ 
-DATA(insert OID = 7230 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 17 t "17 20 17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7230 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 17 t "17 20 17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("bit") => "bit" */ 
-DATA(insert OID = 7250 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7250 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("bit", int8) => "bit" */ 
-DATA(insert OID = 7252 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1560 t "1560 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7252 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1560 t "1560 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag("bit", int8, "bit") => "bit" */ 
-DATA(insert OID = 7254 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1560 t "1560 20 1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7254 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1560 t "1560 20 1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(box) => box */ 
-DATA(insert OID = 7266 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7266 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(box, int8) => box */ 
-DATA(insert OID = 7268 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 603 t "603 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7268 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 2 0 603 t "603 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lag(box, int8, box) => box */ 
-DATA(insert OID = 7270 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 603 t "603 20 603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7270 ( lag  PGNSP PGUID 12 1 0 0 f f f f i 3 0 603 t "603 20 603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int4, int8, int4) => int4 */ 
-DATA(insert OID = 7011 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 23 t "23 20 23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7011 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 23 t "23 20 23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int4, int8) => int4 */ 
-DATA(insert OID = 7074 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 23 t "23 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7074 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 23 t "23 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int4) => int4 */ 
-DATA(insert OID = 7075 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7075 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 23 t "23" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(bool, int8, bool) => bool */ 
-DATA(insert OID = 7310 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 16 t "16 20 16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7310 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 16 t "16 20 16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(bool, int8) => bool */ 
-DATA(insert OID = 7312 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 16 t "16 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7312 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 16 t "16 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(bool) => bool */ 
-DATA(insert OID = 7314 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7314 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 16 t "16" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("char", int8, "char") => "char" */ 
-DATA(insert OID = 7316 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 18 t "18 20 18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7316 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 18 t "18 20 18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("char", int8) => "char" */ 
-DATA(insert OID = 7318 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 18 t "18 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7318 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 18 t "18 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("char") => "char" */ 
-DATA(insert OID = 7320 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7320 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 18 t "18" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(cidr, int8, cidr) => cidr */ 
-DATA(insert OID = 7322 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 650 t "650 20 650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7322 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 650 t "650 20 650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(cidr, int8) => cidr */ 
-DATA(insert OID = 7324 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 650 t "650 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7324 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 650 t "650 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(cidr) => cidr */ 
-DATA(insert OID = 7326 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7326 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 650 t "650" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(circle, int8, circle) => circle */ 
-DATA(insert OID = 7328 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 718 t "718 20 718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7328 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 718 t "718 20 718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(circle, int8) => circle */ 
-DATA(insert OID = 7330 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 718 t "718 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7330 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 718 t "718 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(circle) => circle */ 
-DATA(insert OID = 7332 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7332 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 718 t "718" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(float4, int8, float4) => float4 */ 
-DATA(insert OID = 7334 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 700 t "700 20 700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7334 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 700 t "700 20 700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(float4, int8) => float4 */ 
-DATA(insert OID = 7336 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 700 t "700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7336 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 700 t "700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(float4) => float4 */ 
-DATA(insert OID = 7338 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7338 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 700 t "700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(float8, int8, float8) => float8 */ 
-DATA(insert OID = 7340 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 701 t "701 20 701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7340 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 701 t "701 20 701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(float8, int8) => float8 */ 
-DATA(insert OID = 7342 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 701 t "701 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7342 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 701 t "701 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(float8) => float8 */ 
-DATA(insert OID = 7344 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7344 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 t "701" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(inet, int8, inet) => inet */ 
-DATA(insert OID = 7346 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 869 t "869 20 869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7346 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 869 t "869 20 869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(inet, int8) => inet */ 
-DATA(insert OID = 7348 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 869 t "869 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7348 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 869 t "869 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(inet) => inet */ 
-DATA(insert OID = 7350 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7350 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 869 t "869" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("interval", int8, "interval") => "interval" */ 
-DATA(insert OID = 7352 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1186 t "1186 20 1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7352 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1186 t "1186 20 1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("interval", int8) => "interval" */ 
-DATA(insert OID = 7354 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1186 t "1186 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7354 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1186 t "1186 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("interval") => "interval" */ 
-DATA(insert OID = 7356 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7356 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1186 t "1186" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(line, int8, line) => line */ 
-DATA(insert OID = 7358 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 628 t "628 20 628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7358 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 628 t "628 20 628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(line, int8) => line */ 
-DATA(insert OID = 7360 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 628 t "628 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7360 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 628 t "628 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(line) => line */ 
-DATA(insert OID = 7362 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7362 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 628 t "628" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(lseg, int8, lseg) => lseg */ 
-DATA(insert OID = 7364 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 601 t "601 20 601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7364 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 601 t "601 20 601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(lseg, int8) => lseg */ 
-DATA(insert OID = 7366 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 601 t "601 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7366 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 601 t "601 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(lseg) => lseg */ 
-DATA(insert OID = 7368 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7368 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 601 t "601" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(macaddr, int8, macaddr) => macaddr */ 
-DATA(insert OID = 7370 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 829 t "829 20 829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7370 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 829 t "829 20 829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(macaddr, int8) => macaddr */ 
-DATA(insert OID = 7372 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 829 t "829 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7372 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 829 t "829 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(macaddr) => macaddr */ 
-DATA(insert OID = 7374 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7374 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 829 t "829" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int2, int8, int2) => int2 */ 
-DATA(insert OID = 7376 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 21 t "21 20 21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7376 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 21 t "21 20 21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int2, int8) => int2 */ 
-DATA(insert OID = 7378 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 21 t "21 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7378 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 21 t "21 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int2) => int2 */ 
-DATA(insert OID = 7380 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7380 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 21 t "21" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int8, int8, int8) => int8 */ 
-DATA(insert OID = 7382 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 20 t "20 20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7382 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 20 t "20 20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int8, int8) => int8 */ 
-DATA(insert OID = 7384 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 t "20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7384 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 20 t "20 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(int8) => int8 */ 
-DATA(insert OID = 7386 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7386 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 20 t "20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(money, int8, money) => money */ 
-DATA(insert OID = 7388 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 790 t "790 20 790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7388 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 790 t "790 20 790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(money, int8) => money */ 
-DATA(insert OID = 7390 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 790 t "790 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7390 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 790 t "790 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(money) => money */ 
-DATA(insert OID = 7392 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7392 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 790 t "790" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(name, int8, name) => name */ 
-DATA(insert OID = 7394 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 19 t "19 20 19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7394 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 19 t "19 20 19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(name, int8) => name */ 
-DATA(insert OID = 7396 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 19 t "19 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7396 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 19 t "19 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(name) => name */ 
-DATA(insert OID = 7398 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7398 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 19 t "19" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("numeric", int8, "numeric") => "numeric" */ 
-DATA(insert OID = 7400 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1700 t "1700 20 1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7400 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1700 t "1700 20 1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("numeric", int8) => "numeric" */ 
-DATA(insert OID = 7402 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1700 t "1700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7402 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1700 t "1700 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("numeric") => "numeric" */ 
-DATA(insert OID = 7404 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7404 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1700 t "1700" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(oid, int8, oid) => oid */ 
-DATA(insert OID = 7406 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 26 t "26 20 26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7406 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 26 t "26 20 26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(oid, int8) => oid */ 
-DATA(insert OID = 7408 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 26 t "26 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7408 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 26 t "26 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(oid) => oid */ 
-DATA(insert OID = 7410 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7410 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 26 t "26" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(path, int8, path) => path */ 
-DATA(insert OID = 7412 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 602 t "602 20 602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7412 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 602 t "602 20 602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(path, int8) => path */ 
-DATA(insert OID = 7414 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 602 t "602 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7414 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 602 t "602 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(path) => path */ 
-DATA(insert OID = 7416 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7416 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 602 t "602" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(point, int8, point) => point */ 
-DATA(insert OID = 7418 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 600 t "600 20 600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7418 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 600 t "600 20 600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(point, int8) => point */ 
-DATA(insert OID = 7420 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 600 t "600 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7420 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 600 t "600 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(point) => point */ 
-DATA(insert OID = 7422 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7422 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 600 t "600" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(polygon, int8, polygon) => polygon */ 
-DATA(insert OID = 7424 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 604 t "604 20 604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7424 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 604 t "604 20 604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(polygon, int8) => polygon */ 
-DATA(insert OID = 7426 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 604 t "604 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7426 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 604 t "604 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(polygon) => polygon */ 
-DATA(insert OID = 7428 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7428 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 604 t "604" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(reltime, int8, reltime) => reltime */ 
-DATA(insert OID = 7430 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 703 t "703 20 703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7430 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 703 t "703 20 703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(reltime, int8) => reltime */ 
-DATA(insert OID = 7432 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 703 t "703 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7432 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 703 t "703 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(reltime) => reltime */ 
-DATA(insert OID = 7434 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7434 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 703 t "703" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(text, int8, text) => text */ 
-DATA(insert OID = 7436 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 25 t "25 20 25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7436 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 25 t "25 20 25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(text, int8) => text */ 
-DATA(insert OID = 7438 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 25 t "25 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7438 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 25 t "25 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(text) => text */ 
-DATA(insert OID = 7440 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7440 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 25 t "25" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(tid, int8, tid) => tid */ 
-DATA(insert OID = 7442 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 27 t "27 20 27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7442 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 27 t "27 20 27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(tid, int8) => tid */ 
-DATA(insert OID = 7444 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 27 t "27 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7444 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 27 t "27 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(tid) => tid */ 
-DATA(insert OID = 7446 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7446 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 27 t "27" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("time", int8, "time") => "time" */ 
-DATA(insert OID = 7448 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1083 t "1083 20 1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7448 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1083 t "1083 20 1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("time", int8) => "time" */ 
-DATA(insert OID = 7450 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1083 t "1083 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7450 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1083 t "1083 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("time") => "time" */ 
-DATA(insert OID = 7452 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7452 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1083 t "1083" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("timestamp", int8, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7454 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1114 t "1114 20 1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7454 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1114 t "1114 20 1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("timestamp", int8) => "timestamp" */ 
-DATA(insert OID = 7456 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1114 t "1114 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7456 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1114 t "1114 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("timestamp") => "timestamp" */ 
-DATA(insert OID = 7458 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7458 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1114 t "1114" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(timestamptz, int8, timestamptz) => timestamptz */ 
-DATA(insert OID = 7460 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1184 t "1184 20 1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7460 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1184 t "1184 20 1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(timestamptz, int8) => timestamptz */ 
-DATA(insert OID = 7462 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1184 t "1184 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7462 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1184 t "1184 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(timestamptz) => timestamptz */ 
-DATA(insert OID = 7464 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7464 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1184 t "1184" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(timetz, int8, timetz) => timetz */ 
-DATA(insert OID = 7466 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1266 t "1266 20 1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7466 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1266 t "1266 20 1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(timetz, int8) => timetz */ 
-DATA(insert OID = 7468 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1266 t "1266 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7468 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1266 t "1266 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(timetz) => timetz */ 
-DATA(insert OID = 7470 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7470 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1266 t "1266" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(varbit, int8, varbit) => varbit */ 
-DATA(insert OID = 7472 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1562 t "1562 20 1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7472 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1562 t "1562 20 1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(varbit, int8) => varbit */ 
-DATA(insert OID = 7474 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1562 t "1562 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7474 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1562 t "1562 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(varbit) => varbit */ 
-DATA(insert OID = 7476 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7476 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1562 t "1562" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("varchar", int8, "varchar") => "varchar" */ 
-DATA(insert OID = 7478 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1043 t "1043 20 1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7478 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1043 t "1043 20 1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("varchar", int8) => "varchar" */ 
-DATA(insert OID = 7480 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1043 t "1043 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7480 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1043 t "1043 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("varchar") => "varchar" */ 
-DATA(insert OID = 7482 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7482 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1043 t "1043" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(xid, int8, xid) => xid */ 
-DATA(insert OID = 7484 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 28 t "28 20 28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7484 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 28 t "28 20 28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(xid, int8) => xid */ 
-DATA(insert OID = 7486 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 28 t "28 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7486 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 28 t "28 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(xid) => xid */ 
-DATA(insert OID = 7488 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7488 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 28 t "28" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(anyarray, int8, anyarray) => anyarray */ 
-DATA(insert OID = 7214 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2277 t "2277 20 2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7214 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 2277 t "2277 20 2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(anyarray, int8) => anyarray */ 
-DATA(insert OID = 7215 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2277 t "2277 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7215 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 2277 t "2277 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(anyarray) => anyarray */ 
-DATA(insert OID = 7216 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7216 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2277 t "2277" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(bytea) => bytea */ 
-DATA(insert OID = 7220 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7220 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 17 t "17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(bytea, int8) => bytea */ 
-DATA(insert OID = 7222 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 17 t "17 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7222 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 17 t "17 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(bytea, int8, bytea) => bytea */ 
-DATA(insert OID = 7224 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 17 t "17 20 17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7224 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 17 t "17 20 17" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("bit") => "bit" */ 
-DATA(insert OID = 7244 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7244 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 1560 t "1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("bit", int8) => "bit" */ 
-DATA(insert OID = 7246 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1560 t "1560 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7246 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1560 t "1560 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead("bit", int8, "bit") => "bit" */ 
-DATA(insert OID = 7248 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1560 t "1560 20 1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7248 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 1560 t "1560 20 1560" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(box) => box */ 
-DATA(insert OID = 7260 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7260 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 1 0 603 t "603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(box, int8) => box */ 
-DATA(insert OID = 7262 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 603 t "603 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7262 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 2 0 603 t "603 20" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 /* lead(box, int8, box) => box */ 
-DATA(insert OID = 7264 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 603 t "603 20 603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ n ));
+DATA(insert OID = 7264 ( lead  PGNSP PGUID 12 1 0 0 f f f f i 3 0 603 t "603 20 603" _null_ _null_ _null_ _null_ window_dummy _null_ _null_ _null_ n ));
 
 
 /*- */
 /* generate_series("timestamp", "timestamp", "interval") => SETOF "timestamp" */ 
-DATA(insert OID = 6113 ( generate_series  PGNSP PGUID 12 1 1000 0 f f t t v 3 0 1114 f "1114 1114 1186" _null_ _null_ _null_ _null_ generate_series_timestamp _null_ _null_ n ));
+DATA(insert OID = 6113 ( generate_series  PGNSP PGUID 12 1 1000 0 f f t t v 3 0 1114 f "1114 1114 1186" _null_ _null_ _null_ _null_ generate_series_timestamp _null_ _null_ _null_ n ));
 DESCR("non-persistent series generator");
 
 /* generate_series("timestamptz", "timestamptz", "interval") => SETOF "timestamptz" */ 
-DATA(insert OID = 6114 ( generate_series  PGNSP PGUID 12 1 1000 0 f f t t v 3 0 1184 f "1184 1184 1186" _null_ _null_ _null_ _null_ generate_series_timestamptz _null_ _null_ n ));
+DATA(insert OID = 6114 ( generate_series  PGNSP PGUID 12 1 1000 0 f f t t v 3 0 1184 f "1184 1184 1186" _null_ _null_ _null_ _null_ generate_series_timestamptz _null_ _null_ _null_ n ));
 DESCR("non-persistent series generator");
 
 
 /* Greenplum Analytic functions */
 /* matrix_transpose(anyarray) => anyarray */ 
-DATA(insert OID = 3200 ( matrix_transpose  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2277 f "2277" _null_ _null_ _null_ _null_ matrix_transpose _null_ _null_ n ));
+DATA(insert OID = 3200 ( matrix_transpose  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2277 f "2277" _null_ _null_ _null_ _null_ matrix_transpose _null_ _null_ _null_ n ));
 DESCR("transpose a two dimensional matrix");
 
 /* matrix_multiply(_int2, _int2) => _int8 */ 
-DATA(insert OID = 3201 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1005 1005" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ n ));
+DATA(insert OID = 3201 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1005 1005" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ _null_ n ));
 DESCR("perform matrix multiplication on two matrices");
 
 /* matrix_multiply(_int4, _int4) => _int8 */ 
-DATA(insert OID = 3202 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1007 1007" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ n ));
+DATA(insert OID = 3202 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1007 1007" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ _null_ n ));
 DESCR("perform matrix multiplication on two matrices");
 
 /* matrix_multiply(_int8, _int8) => _int8 */ 
-DATA(insert OID = 3203 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 1016" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ n ));
+DATA(insert OID = 3203 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 1016" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ _null_ n ));
 DESCR("perform matrix multiplication on two matrices");
 
 /* matrix_multiply(_float8, _float8) => _float8 */ 
-DATA(insert OID = 3204 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ n ));
+DATA(insert OID = 3204 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ matrix_multiply _null_ _null_ _null_ n ));
 DESCR("perform matrix multiplication on two matrices");
 
 /* matrix_multiply(_int8, int8) => _int8 */ 
-DATA(insert OID = 3205 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 20" _null_ _null_ _null_ _null_ int8_matrix_smultiply _null_ _null_ n ));
+DATA(insert OID = 3205 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 20" _null_ _null_ _null_ _null_ int8_matrix_smultiply _null_ _null_ _null_ n ));
 DESCR("multiply a matrix by a scalar value");
 
 /* matrix_multiply(_float8, float8) => _float8 */ 
-DATA(insert OID = 3206 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 701" _null_ _null_ _null_ _null_ float8_matrix_smultiply _null_ _null_ n ));
+DATA(insert OID = 3206 ( matrix_multiply  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 701" _null_ _null_ _null_ _null_ float8_matrix_smultiply _null_ _null_ _null_ n ));
 DESCR("multiply a matrix by a scalar value");
 
 /* matrix_add(_int2, _int2) => _int2 */ 
-DATA(insert OID = 3208 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1005 f "1005 1005" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3208 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1005 f "1005 1005" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* matrix_add(_int4, _int4) => _int4 */ 
-DATA(insert OID = 3209 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1007 f "1007 1007" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3209 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1007 f "1007 1007" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* matrix_add(_int8, _int8) => _int8 */ 
-DATA(insert OID = 3210 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 1016" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3210 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 1016" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* matrix_add(_float8, _float8) => _float8 */ 
-DATA(insert OID = 3211 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3211 ( matrix_add  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* int2_matrix_accum(_int8, _int2) => _int8 */ 
-DATA(insert OID = 3212 ( int2_matrix_accum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1016 f "1016 1005" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3212 ( int2_matrix_accum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1016 f "1016 1005" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* int4_matrix_accum(_int8, _int4) => _int8 */ 
-DATA(insert OID = 3213 ( int4_matrix_accum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1016 f "1016 1007" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3213 ( int4_matrix_accum  PGNSP PGUID 12 1 0 0 f f f f i 2 0 1016 f "1016 1007" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* int8_matrix_accum(_int8, _int8) => _int8 */ 
-DATA(insert OID = 3214 ( int8_matrix_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 1016" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3214 ( int8_matrix_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "1016 1016" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* float8_matrix_accum(_float8, _float8) => _float8 */ 
-DATA(insert OID = 3215 ( float8_matrix_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ n ));
+DATA(insert OID = 3215 ( float8_matrix_accum  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ matrix_add _null_ _null_ _null_ n ));
 DESCR("perform matrix addition on two conformable matrices");
 
 /* sum(_int2) => _int8 */ 
-DATA(insert OID = 3216 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1016 f "1005" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3216 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1016 f "1005" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* sum(_int4) => _int8 */ 
-DATA(insert OID = 3217 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1016 f "1007" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3217 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1016 f "1007" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* sum(_int8) => _int8 */ 
-DATA(insert OID = 3218 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1016 f "1016" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3218 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1016 f "1016" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* sum(_float8) => _float8 */ 
-DATA(insert OID = 3219 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3219 ( sum  PGNSP PGUID 12 1 0 0 t f f f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 
 /* 3220 - reserved for sum(numeric[])  */
 /* int4_pivot_accum(_int4, _text, text, int4) => _int4 */ 
-DATA(insert OID = 3225 ( int4_pivot_accum  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1007 f "1007 1009 25 23" _null_ _null_ _null_ _null_ int4_pivot_accum _null_ _null_ n ));
+DATA(insert OID = 3225 ( int4_pivot_accum  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1007 f "1007 1009 25 23" _null_ _null_ _null_ _null_ int4_pivot_accum _null_ _null_ _null_ n ));
 
 /* pivot_sum(_text, text, int4) => _int4 */ 
-DATA(insert OID = 3226 ( pivot_sum  PGNSP PGUID 12 1 0 0 t f f f i 3 0 1007 f "1009 25 23" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3226 ( pivot_sum  PGNSP PGUID 12 1 0 0 t f f f i 3 0 1007 f "1009 25 23" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* int8_pivot_accum(_int8, _text, text, int8) => _int8 */ 
-DATA(insert OID = 3227 ( int8_pivot_accum  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1016 f "1016 1009 25 20" _null_ _null_ _null_ _null_ int8_pivot_accum _null_ _null_ n ));
+DATA(insert OID = 3227 ( int8_pivot_accum  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1016 f "1016 1009 25 20" _null_ _null_ _null_ _null_ int8_pivot_accum _null_ _null_ _null_ n ));
 
 /* pivot_sum(_text, text, int8) => _int8 */ 
-DATA(insert OID = 3228 ( pivot_sum  PGNSP PGUID 12 1 0 0 t f f f i 3 0 1016 f "1009 25 20" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3228 ( pivot_sum  PGNSP PGUID 12 1 0 0 t f f f i 3 0 1016 f "1009 25 20" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* float8_pivot_accum(_float8, _text, text, float8) => _float8 */ 
-DATA(insert OID = 3229 ( float8_pivot_accum  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1022 f "1022 1009 25 701" _null_ _null_ _null_ _null_ float8_pivot_accum _null_ _null_ n ));
+DATA(insert OID = 3229 ( float8_pivot_accum  PGNSP PGUID 12 1 0 0 f f f f i 4 0 1022 f "1022 1009 25 701" _null_ _null_ _null_ _null_ float8_pivot_accum _null_ _null_ _null_ n ));
 
 /* pivot_sum(_text, text, float8) => _float8 */ 
-DATA(insert OID = 3230 ( pivot_sum  PGNSP PGUID 12 1 0 0 t f f f i 3 0 1022 f "1009 25 701" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3230 ( pivot_sum  PGNSP PGUID 12 1 0 0 t f f f i 3 0 1022 f "1009 25 701" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* unnest(anyarray) => SETOF anyelement */ 
-DATA(insert OID = 3240 ( unnest  PGNSP PGUID 12 1 1000 0 f f t t i 1 0 2283 f "2277" _null_ _null_ _null_ _null_ unnest _null_ _null_ n ));
+DATA(insert OID = 3240 ( unnest  PGNSP PGUID 12 1 1000 0 f f t t i 1 0 2283 f "2277" _null_ _null_ _null_ _null_ unnest _null_ _null_ _null_ n ));
 
 
 /* 3241-324? reserved for unpivot, see pivot.c  */
@@ -1369,1810 +1333,1802 @@ DATA(insert OID = 3240 ( unnest  PGNSP PGUID 12 1 1000 0 f f t t i 1 0 2283 f "2
 /* 3250 = nb_classification class  */
 /* 3251 = nb_classification type  */
 /* nb_classify_accum(nb_classification, _text, int8, _int8, _int8) => nb_classification */ 
-DATA(insert OID = 3252 ( nb_classify_accum  PGNSP PGUID 12 1 0 0 f f f f i 5 0 3251 f "3251 1009 20 1016 1016" _null_ _null_ _null_ _null_ nb_classify_accum _null_ _null_ n ));
+DATA(insert OID = 3252 ( nb_classify_accum  PGNSP PGUID 12 1 0 0 f f f f i 5 0 3251 f "3251 1009 20 1016 1016" _null_ _null_ _null_ _null_ nb_classify_accum _null_ _null_ _null_ n ));
 
 /* nb_classify_combine(nb_classification, nb_classification) => nb_classification */ 
-DATA(insert OID = 3253 ( nb_classify_combine  PGNSP PGUID 12 1 0 0 f f f f i 2 0 3251 f "3251 3251" _null_ _null_ _null_ _null_ nb_classify_combine _null_ _null_ n ));
+DATA(insert OID = 3253 ( nb_classify_combine  PGNSP PGUID 12 1 0 0 f f f f i 2 0 3251 f "3251 3251" _null_ _null_ _null_ _null_ nb_classify_combine _null_ _null_ _null_ n ));
 
 /* nb_classify_final(nb_classification) => text */ 
-DATA(insert OID = 3254 ( nb_classify_final  PGNSP PGUID 12 1 0 0 f f t f i 1 0 25 f "3251" _null_ _null_ _null_ _null_ nb_classify_final _null_ _null_ n ));
+DATA(insert OID = 3254 ( nb_classify_final  PGNSP PGUID 12 1 0 0 f f t f i 1 0 25 f "3251" _null_ _null_ _null_ _null_ nb_classify_final _null_ _null_ _null_ n ));
 
 /* nb_classify(_text, int8, _int8, _int8) => text */ 
-DATA(insert OID = 3255 ( nb_classify  PGNSP PGUID 12 1 0 0 t f f f i 4 0 25 f "1009 20 1016 1016" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3255 ( nb_classify  PGNSP PGUID 12 1 0 0 t f f f i 4 0 25 f "1009 20 1016 1016" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* nb_classify_probabilities(nb_classification) => _float8 */ 
-DATA(insert OID = 3267 ( nb_classify_probabilities  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "3251" _null_ _null_ _null_ _null_ nb_classify_probabilities _null_ _null_ n ));
+DATA(insert OID = 3267 ( nb_classify_probabilities  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "3251" _null_ _null_ _null_ _null_ nb_classify_probabilities _null_ _null_ _null_ n ));
 
 /* nb_probabilities(_text, int8, _int8, _int8) => _float8 */ 
-DATA(insert OID = 3268 ( nb_probabilities  PGNSP PGUID 12 1 0 0 t f f f i 4 0 1022 f "1009 20 1016 1016" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3268 ( nb_probabilities  PGNSP PGUID 12 1 0 0 t f f f i 4 0 1022 f "1009 20 1016 1016" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* pinv(_float8) => _float8 */ 
-DATA(insert OID = 3256 ( pinv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ pseudoinverse _null_ _null_ n ));
+DATA(insert OID = 3256 ( pinv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ pseudoinverse _null_ _null_ _null_ n ));
 
 /* float8_mregr_accum(_float8, float8, _float8) => _float8 */ 
-DATA(insert OID = 3257 ( float8_mregr_accum  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1022 f "1022 701 1022" _null_ _null_ _null_ _null_ float8_mregr_accum _null_ _null_ n ));
+DATA(insert OID = 3257 ( float8_mregr_accum  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1022 f "1022 701 1022" _null_ _null_ _null_ _null_ float8_mregr_accum _null_ _null_ _null_ n ));
 
 /* float8_mregr_combine(_float8, _float8) => _float8 */ 
-DATA(insert OID = 3258 ( float8_mregr_combine  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_mregr_combine _null_ _null_ n ));
+DATA(insert OID = 3258 ( float8_mregr_combine  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_mregr_combine _null_ _null_ _null_ n ));
 
 /* float8_mregr_coef(_float8) => _float8 */ 
-DATA(insert OID = 3259 ( float8_mregr_coef  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ float8_mregr_coef _null_ _null_ n ));
+DATA(insert OID = 3259 ( float8_mregr_coef  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ float8_mregr_coef _null_ _null_ _null_ n ));
 
 /* float8_mregr_r2(_float8) => float8 */ 
-DATA(insert OID = 3260 ( float8_mregr_r2  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "1022" _null_ _null_ _null_ _null_ float8_mregr_r2 _null_ _null_ n ));
+DATA(insert OID = 3260 ( float8_mregr_r2  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "1022" _null_ _null_ _null_ _null_ float8_mregr_r2 _null_ _null_ _null_ n ));
 
 /* mregr_coef(float8, _float8) => _float8 */ 
-DATA(insert OID = 3261 ( mregr_coef  PGNSP PGUID 12 1 0 0 t f t f i 2 0 1022 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3261 ( mregr_coef  PGNSP PGUID 12 1 0 0 t f t f i 2 0 1022 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* mregr_r2(float8, _float8) => float8 */ 
-DATA(insert OID = 3262 ( mregr_r2  PGNSP PGUID 12 1 0 0 t f t f i 2 0 701 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3262 ( mregr_r2  PGNSP PGUID 12 1 0 0 t f t f i 2 0 701 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* float8_mregr_tstats(_float8) => _float8 */ 
-DATA(insert OID = 3263 ( float8_mregr_tstats  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ float8_mregr_tstats _null_ _null_ n ));
+DATA(insert OID = 3263 ( float8_mregr_tstats  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ float8_mregr_tstats _null_ _null_ _null_ n ));
 
 /* mregr_tstats(float8, _float8) => _float8 */ 
-DATA(insert OID = 3264 ( mregr_tstats  PGNSP PGUID 12 1 0 0 t f f f i 2 0 1022 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3264 ( mregr_tstats  PGNSP PGUID 12 1 0 0 t f f f i 2 0 1022 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* float8_mregr_pvalues(_float8) => _float8 */ 
-DATA(insert OID = 3265 ( float8_mregr_pvalues  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ float8_mregr_pvalues _null_ _null_ n ));
+DATA(insert OID = 3265 ( float8_mregr_pvalues  PGNSP PGUID 12 1 0 0 f f t f i 1 0 1022 f "1022" _null_ _null_ _null_ _null_ float8_mregr_pvalues _null_ _null_ _null_ n ));
 
 /* mregr_pvalues(float8, _float8) => _float8 */ 
-DATA(insert OID = 3266 ( mregr_pvalues  PGNSP PGUID 12 1 0 0 t f f f i 2 0 1022 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ n ));
+DATA(insert OID = 3266 ( mregr_pvalues  PGNSP PGUID 12 1 0 0 t f f f i 2 0 1022 f "701 1022" _null_ _null_ _null_ _null_ aggregate_dummy _null_ _null_ _null_ n ));
 
 /* gpaotidin(cstring) => gpaotid */ 
-DATA(insert OID = 3302 ( gpaotidin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3300 f "2275" _null_ _null_ _null_ _null_ gpaotidin _null_ _null_ n ));
+DATA(insert OID = 3302 ( gpaotidin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3300 f "2275" _null_ _null_ _null_ _null_ gpaotidin _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpaotidout(gpaotid) => cstring */ 
-DATA(insert OID = 3303 ( gpaotidout  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "3300" _null_ _null_ _null_ _null_ gpaotidout _null_ _null_ n ));
+DATA(insert OID = 3303 ( gpaotidout  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "3300" _null_ _null_ _null_ _null_ gpaotidout _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpaotidrecv(internal) => gpaotid */ 
-DATA(insert OID = 3304 ( gpaotidrecv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3300 f "2281" _null_ _null_ _null_ _null_ gpaotidrecv _null_ _null_ n ));
+DATA(insert OID = 3304 ( gpaotidrecv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3300 f "2281" _null_ _null_ _null_ _null_ gpaotidrecv _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpaotidsend(gpaotid) => bytea */ 
-DATA(insert OID = 3305 ( gpaotidsend  PGNSP PGUID 12 1 0 0 f f t f i 1 0 17 f "3300" _null_ _null_ _null_ _null_ gpaotidsend _null_ _null_ n ));
+DATA(insert OID = 3305 ( gpaotidsend  PGNSP PGUID 12 1 0 0 f f t f i 1 0 17 f "3300" _null_ _null_ _null_ _null_ gpaotidsend _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocin(cstring) => gpxlogloc */ 
-DATA(insert OID = 3312 ( gpxloglocin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3310 f "2275" _null_ _null_ _null_ _null_ gpxloglocin _null_ _null_ n ));
+DATA(insert OID = 3312 ( gpxloglocin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3310 f "2275" _null_ _null_ _null_ _null_ gpxloglocin _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocout(gpxlogloc) => cstring */ 
-DATA(insert OID = 3313 ( gpxloglocout  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "3310" _null_ _null_ _null_ _null_ gpxloglocout _null_ _null_ n ));
+DATA(insert OID = 3313 ( gpxloglocout  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "3310" _null_ _null_ _null_ _null_ gpxloglocout _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocrecv(internal) => gpxlogloc */ 
-DATA(insert OID = 3314 ( gpxloglocrecv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3310 f "2281" _null_ _null_ _null_ _null_ gpxloglocrecv _null_ _null_ n ));
+DATA(insert OID = 3314 ( gpxloglocrecv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3310 f "2281" _null_ _null_ _null_ _null_ gpxloglocrecv _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocsend(gpxlogloc) => bytea */ 
-DATA(insert OID = 3315 ( gpxloglocsend  PGNSP PGUID 12 1 0 0 f f t f i 1 0 17 f "3310" _null_ _null_ _null_ _null_ gpxloglocsend _null_ _null_ n ));
+DATA(insert OID = 3315 ( gpxloglocsend  PGNSP PGUID 12 1 0 0 f f t f i 1 0 17 f "3310" _null_ _null_ _null_ _null_ gpxloglocsend _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxlogloclarger(gpxlogloc, gpxlogloc) => gpxlogloc */ 
-DATA(insert OID = 3318 ( gpxlogloclarger  PGNSP PGUID 12 1 0 0 f f t f i 2 0 3310 f "3310 3310" _null_ _null_ _null_ _null_ gpxlogloclarger _null_ _null_ n ));
+DATA(insert OID = 3318 ( gpxlogloclarger  PGNSP PGUID 12 1 0 0 f f t f i 2 0 3310 f "3310 3310" _null_ _null_ _null_ _null_ gpxlogloclarger _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocsmaller(gpxlogloc, gpxlogloc) => gpxlogloc */ 
-DATA(insert OID = 3319 ( gpxloglocsmaller  PGNSP PGUID 12 1 0 0 f f t f i 2 0 3310 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocsmaller _null_ _null_ n ));
+DATA(insert OID = 3319 ( gpxloglocsmaller  PGNSP PGUID 12 1 0 0 f f t f i 2 0 3310 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocsmaller _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxlogloceq(gpxlogloc, gpxlogloc) => bool */ 
-DATA(insert OID = 3331 ( gpxlogloceq  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxlogloceq _null_ _null_ n ));
+DATA(insert OID = 3331 ( gpxlogloceq  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxlogloceq _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocne(gpxlogloc, gpxlogloc) => bool */ 
-DATA(insert OID = 3320 ( gpxloglocne  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocne _null_ _null_ n ));
+DATA(insert OID = 3320 ( gpxloglocne  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocne _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxlogloclt(gpxlogloc, gpxlogloc) => bool */ 
-DATA(insert OID = 3321 ( gpxlogloclt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxlogloclt _null_ _null_ n ));
+DATA(insert OID = 3321 ( gpxlogloclt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxlogloclt _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocle(gpxlogloc, gpxlogloc) => bool */ 
-DATA(insert OID = 3322 ( gpxloglocle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocle _null_ _null_ n ));
+DATA(insert OID = 3322 ( gpxloglocle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocle _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocgt(gpxlogloc, gpxlogloc) => bool */ 
-DATA(insert OID = 3323 ( gpxloglocgt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocgt _null_ _null_ n ));
+DATA(insert OID = 3323 ( gpxloglocgt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocgt _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* gpxloglocge(gpxlogloc, gpxlogloc) => bool */ 
-DATA(insert OID = 3324 ( gpxloglocge  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocge _null_ _null_ n ));
+DATA(insert OID = 3324 ( gpxloglocge  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "3310 3310" _null_ _null_ _null_ _null_ gpxloglocge _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 
 /* Greenplum MPP exposed internally-defined functions.  */
 /* gp_backup_launch(text, text, text, text, text) => text */ 
-DATA(insert OID = 6003 ( gp_backup_launch  PGNSP PGUID 12 1 0 0 f f f f v 5 0 25 f "25 25 25 25 25" _null_ _null_ _null_ _null_ gp_backup_launch__ _null_ _null_ n ));
+DATA(insert OID = 6003 ( gp_backup_launch  PGNSP PGUID 12 1 0 0 f f f f v 5 0 25 f "25 25 25 25 25" _null_ _null_ _null_ _null_ gp_backup_launch__ _null_ _null_ _null_ n ));
 DESCR("launch mpp backup on outboard Postgres instances");
 
 /* gp_restore_launch(text, text, text, text, text, text, int4, bool) => text */ 
-DATA(insert OID = 6004 ( gp_restore_launch  PGNSP PGUID 12 1 0 0 f f f f v 8 0 25 f "25 25 25 25 25 25 23 16" _null_ _null_ _null_ _null_ gp_restore_launch__ _null_ _null_ n ));
+DATA(insert OID = 6004 ( gp_restore_launch  PGNSP PGUID 12 1 0 0 f f f f v 8 0 25 f "25 25 25 25 25 25 23 16" _null_ _null_ _null_ _null_ gp_restore_launch__ _null_ _null_ _null_ n ));
 DESCR("launch mpp restore on outboard Postgres instances");
 
 /* gp_read_backup_file(text, text, regproc) => text */ 
-DATA(insert OID = 6005 ( gp_read_backup_file  PGNSP PGUID 12 1 0 0 f f f f v 3 0 25 f "25 25 24" _null_ _null_ _null_ _null_ gp_read_backup_file__ _null_ _null_ n ));
+DATA(insert OID = 6005 ( gp_read_backup_file  PGNSP PGUID 12 1 0 0 f f f f v 3 0 25 f "25 25 24" _null_ _null_ _null_ _null_ gp_read_backup_file__ _null_ _null_ _null_ n ));
 DESCR("read mpp backup file on outboard Postgres instances");
 
 /* gp_write_backup_file(text, text, text) => text */ 
-DATA(insert OID = 6006 ( gp_write_backup_file  PGNSP PGUID 12 1 0 0 f f f f v 3 0 25 f "25 25 25" _null_ _null_ _null_ _null_ gp_write_backup_file__ _null_ _null_ n ));
+DATA(insert OID = 6006 ( gp_write_backup_file  PGNSP PGUID 12 1 0 0 f f f f v 3 0 25 f "25 25 25" _null_ _null_ _null_ _null_ gp_write_backup_file__ _null_ _null_ _null_ n ));
 DESCR("write mpp backup file on outboard Postgres instances");
 
 /* gp_pgdatabase() => SETOF record */ 
-DATA(insert OID = 6007 ( gp_pgdatabase  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_pgdatabase__ _null_ _null_ n ));
+DATA(insert OID = 6007 ( gp_pgdatabase  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_pgdatabase__ _null_ _null_ _null_ n ));
 DESCR("view mpp pgdatabase state");
 
 /* numeric_amalg(_numeric, _numeric) => _numeric */ 
-DATA(insert OID = 6008 ( numeric_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 1231" _null_ _null_ _null_ _null_ numeric_amalg _null_ _null_ n ));
+DATA(insert OID = 6008 ( numeric_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 1231" _null_ _null_ _null_ _null_ numeric_amalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* numeric_avg_amalg(bytea, bytea) => bytea */ 
-DATA(insert OID = 3104 ( numeric_avg_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ numeric_avg_amalg _null_ _null_ n ));
+DATA(insert OID = 3104 ( numeric_avg_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ numeric_avg_amalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* int8_avg_amalg(bytea, bytea) => bytea */ 
-DATA(insert OID = 6009 ( int8_avg_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ int8_avg_amalg _null_ _null_ n ));
+DATA(insert OID = 6009 ( int8_avg_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ int8_avg_amalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* float8_amalg(_float8, _float8) => _float8 */ 
-DATA(insert OID = 6010 ( float8_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_amalg _null_ _null_ n ));
+DATA(insert OID = 6010 ( float8_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_amalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* float8_avg_amalg(bytea, bytea) => bytea */ 
-DATA(insert OID = 3111 ( float8_avg_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ float8_avg_amalg _null_ _null_ n ));
+DATA(insert OID = 3111 ( float8_avg_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ float8_avg_amalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* interval_amalg(_interval, _interval) => _interval */ 
-DATA(insert OID = 6011 ( interval_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1187 f "1187 1187" _null_ _null_ _null_ _null_ interval_amalg _null_ _null_ n ));
+DATA(insert OID = 6011 ( interval_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1187 f "1187 1187" _null_ _null_ _null_ _null_ interval_amalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* numeric_demalg(_numeric, _numeric) => _numeric */ 
-DATA(insert OID = 6015 ( numeric_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 1231" _null_ _null_ _null_ _null_ numeric_demalg _null_ _null_ n ));
+DATA(insert OID = 6015 ( numeric_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1231 f "1231 1231" _null_ _null_ _null_ _null_ numeric_demalg _null_ _null_ _null_ n ));
 DESCR("aggregate inverse preliminary function");
 
 /* numeric_avg_demalg(bytea, bytea) => bytea */ 
-DATA(insert OID = 3105 ( numeric_avg_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ numeric_avg_demalg _null_ _null_ n ));
+DATA(insert OID = 3105 ( numeric_avg_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ numeric_avg_demalg _null_ _null_ _null_ n ));
 DESCR("aggregate inverse preliminary function");
 
 /* int8_avg_demalg(bytea, bytea) => bytea */ 
-DATA(insert OID = 6016 ( int8_avg_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ int8_avg_demalg _null_ _null_ n ));
+DATA(insert OID = 6016 ( int8_avg_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ int8_avg_demalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* float8_demalg(_float8, _float8) => _float8 */ 
-DATA(insert OID = 6017 ( float8_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_demalg _null_ _null_ n ));
+DATA(insert OID = 6017 ( float8_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_demalg _null_ _null_ _null_ n ));
 
 /* float8_avg_demalg(bytea, bytea) => bytea */ 
-DATA(insert OID = 3110 ( float8_avg_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ float8_avg_demalg _null_ _null_ n ));
+DATA(insert OID = 3110 ( float8_avg_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 f "17 17" _null_ _null_ _null_ _null_ float8_avg_demalg _null_ _null_ _null_ n ));
 DESCR("aggregate inverse preliminary function");
 
 /* interval_demalg(_interval, _interval) => _interval */ 
-DATA(insert OID = 6018 ( interval_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1187 f "1187 1187" _null_ _null_ _null_ _null_ interval_demalg _null_ _null_ n ));
+DATA(insert OID = 6018 ( interval_demalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1187 f "1187 1187" _null_ _null_ _null_ _null_ interval_demalg _null_ _null_ _null_ n ));
 DESCR("aggregate preliminary function");
 
 /* float8_regr_amalg(_float8, _float8) => _float8 */ 
-DATA(insert OID = 6014 ( float8_regr_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_regr_amalg _null_ _null_ n ));
+DATA(insert OID = 6014 ( float8_regr_amalg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1022 f "1022 1022" _null_ _null_ _null_ _null_ float8_regr_amalg _null_ _null_ _null_ n ));
 
 /* int8(tid) => int8 */ 
-DATA(insert OID = 6021 ( int8  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "27" _null_ _null_ _null_ _null_ tidtoi8 _null_ _null_ n ));
+DATA(insert OID = 6021 ( int8  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "27" _null_ _null_ _null_ _null_ tidtoi8 _null_ _null_ _null_ n ));
 DESCR("convert tid to int8");
 
 
 #define CDB_PROC_TIDTOI8    6021
 /* gp_execution_segment() => SETOF int4 */ 
-DATA(insert OID = 6022 ( gp_execution_segment  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 23 f "" _null_ _null_ _null_ _null_ mpp_execution_segment _null_ _null_ n ));
+DATA(insert OID = 6022 ( gp_execution_segment  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 23 f "" _null_ _null_ _null_ _null_ mpp_execution_segment _null_ _null_ _null_ n ));
 DESCR("segment executing function");
 
 
 #define MPP_EXECUTION_SEGMENT_OID 6022
 #define MPP_EXECUTION_SEGMENT_TYPE 23
 /* pg_highest_oid() => oid */ 
-DATA(insert OID = 6023 ( pg_highest_oid  PGNSP PGUID 12 1 0 0 f f t f v 0 0 26 f "" _null_ _null_ _null_ _null_ pg_highest_oid _null_ _null_ r ));
+DATA(insert OID = 6023 ( pg_highest_oid  PGNSP PGUID 12 1 0 0 f f t f v 0 0 26 f "" _null_ _null_ _null_ _null_ pg_highest_oid _null_ _null_ _null_ r ));
 DESCR("Highest oid used so far");
 
 /* gp_distributed_xacts() => SETOF record */ 
-DATA(insert OID = 6035 ( gp_distributed_xacts  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_distributed_xacts__ _null_ _null_ n ));
+DATA(insert OID = 6035 ( gp_distributed_xacts  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_distributed_xacts__ _null_ _null_ _null_ n ));
 DESCR("view mpp distributed transaction state");
 
 /* gp_max_distributed_xid() => xid */ 
-DATA(insert OID = 6036 ( gp_max_distributed_xid  PGNSP PGUID 12 1 0 0 f f t f v 0 0 28 f "" _null_ _null_ _null_ _null_ gp_max_distributed_xid _null_ _null_ n ));
+DATA(insert OID = 6036 ( gp_max_distributed_xid  PGNSP PGUID 12 1 0 0 f f t f v 0 0 28 f "" _null_ _null_ _null_ _null_ gp_max_distributed_xid _null_ _null_ _null_ n ));
 DESCR("Highest distributed transaction id used so far");
 
 /* gp_distributed_xid() => xid */ 
-DATA(insert OID = 6037 ( gp_distributed_xid  PGNSP PGUID 12 1 0 0 f f t f v 0 0 28 f "" _null_ _null_ _null_ _null_ gp_distributed_xid _null_ _null_ n ));
+DATA(insert OID = 6037 ( gp_distributed_xid  PGNSP PGUID 12 1 0 0 f f t f v 0 0 28 f "" _null_ _null_ _null_ _null_ gp_distributed_xid _null_ _null_ _null_ n ));
 DESCR("Current distributed transaction id");
 
 /* gp_transaction_log() => SETOF record */ 
-DATA(insert OID = 6043 ( gp_transaction_log  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_transaction_log _null_ _null_ n ));
+DATA(insert OID = 6043 ( gp_transaction_log  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_transaction_log _null_ _null_ _null_ n ));
 DESCR("view logged local transaction status");
 
 /* gp_distributed_log() => SETOF record */ 
-DATA(insert OID = 6044 ( gp_distributed_log  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_distributed_log _null_ _null_ n ));
+DATA(insert OID = 6044 ( gp_distributed_log  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_distributed_log _null_ _null_ _null_ n ));
 DESCR("view logged distributed transaction status");
 
 /* gp_changetracking_log(IN filetype int4, OUT segment_id int2, OUT dbid int2, OUT space oid, OUT db oid, OUT rel oid, OUT xlogloc gpxlogloc, OUT blocknum int4, OUT persistent_tid tid, OUT persistent_sn int8) => SETOF pg_catalog.record */ 
-DATA(insert OID = 6435 ( gp_changetracking_log  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "23" "{23,21,21,26,26,26,3310,23,27,20}" "{i,o,o,o,o,o,o,o,o,o}" "{filetype,segment_id,dbid,space,db,rel,xlogloc,blocknum,persistent_tid,persistent_sn}" _null_ gp_changetracking_log _null_ _null_ n ));
+DATA(insert OID = 6435 ( gp_changetracking_log  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "23" "{23,21,21,26,26,26,3310,23,27,20}" "{i,o,o,o,o,o,o,o,o,o}" "{filetype,segment_id,dbid,space,db,rel,xlogloc,blocknum,persistent_tid,persistent_sn}" _null_ gp_changetracking_log _null_ _null_ _null_ n ));
 DESCR("view logged change tracking records");
 
 /* gp_execution_dbid() => int4 */ 
-DATA(insert OID = 6068 ( gp_execution_dbid  PGNSP PGUID 12 1 0 0 f f f f v 0 0 23 f "" _null_ _null_ _null_ _null_ gp_execution_dbid _null_ _null_ n ));
+DATA(insert OID = 6068 ( gp_execution_dbid  PGNSP PGUID 12 1 0 0 f f f f v 0 0 23 f "" _null_ _null_ _null_ _null_ gp_execution_dbid _null_ _null_ _null_ n ));
 DESCR("dbid executing function");
 
 
 /* Greenplum MPP window function implementation */
 /* row_number_immed(internal) => int8 */ 
-DATA(insert OID = 7100 ( row_number_immed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ row_number_immed _null_ _null_ n ));
+DATA(insert OID = 7100 ( row_number_immed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ row_number_immed _null_ _null_ _null_ n ));
 DESCR("window immediate function");
 
 /* rank_immed(internal) => int8 */ 
-DATA(insert OID = 7101 ( rank_immed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ rank_immed _null_ _null_ n ));
+DATA(insert OID = 7101 ( rank_immed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ rank_immed _null_ _null_ _null_ n ));
 DESCR("window immediate function");
 
 /* dense_rank_immed(internal) => int8 */ 
-DATA(insert OID = 7102 ( dense_rank_immed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ dense_rank_immed _null_ _null_ n ));
+DATA(insert OID = 7102 ( dense_rank_immed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ dense_rank_immed _null_ _null_ _null_ n ));
 DESCR("window immediate function");
 
 /* lag_bool(internal, bool, int8, bool) => bool */ 
-DATA(insert OID = 7490 ( lag_bool  PGNSP PGUID 12 1 0 0 f f t f i 4 0 16 t "2281 16 20 16" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7490 ( lag_bool  PGNSP PGUID 12 1 0 0 f f t f i 4 0 16 t "2281 16 20 16" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bool(internal, bool, int8) => bool */ 
-DATA(insert OID = 7492 ( lag_bool  PGNSP PGUID 12 1 0 0 f f t f i 3 0 16 t "2281 16 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7492 ( lag_bool  PGNSP PGUID 12 1 0 0 f f t f i 3 0 16 t "2281 16 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bool(internal, bool) => bool */ 
-DATA(insert OID = 7494 ( lag_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7494 ( lag_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_char(internal, "char", int8, "char") => "char" */ 
-DATA(insert OID = 7496 ( lag_char  PGNSP PGUID 12 1 0 0 f f t f i 4 0 18 t "2281 18 20 18" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7496 ( lag_char  PGNSP PGUID 12 1 0 0 f f t f i 4 0 18 t "2281 18 20 18" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_char(internal, "char", int8) => "char" */ 
-DATA(insert OID = 7498 ( lag_char  PGNSP PGUID 12 1 0 0 f f t f i 3 0 18 t "2281 18 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7498 ( lag_char  PGNSP PGUID 12 1 0 0 f f t f i 3 0 18 t "2281 18 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_char(internal, "char") => "char" */ 
-DATA(insert OID = 7500 ( lag_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7500 ( lag_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_cidr(internal, cidr, int8, cidr) => cidr */ 
-DATA(insert OID = 7502 ( lag_cidr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 650 t "2281 650 20 650" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7502 ( lag_cidr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 650 t "2281 650 20 650" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_cidr(internal, cidr, int8) => cidr */ 
-DATA(insert OID = 7504 ( lag_cidr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 650 t "2281 650 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7504 ( lag_cidr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 650 t "2281 650 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_cidr(internal, cidr) => cidr */ 
-DATA(insert OID = 7506 ( lag_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7506 ( lag_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_circle(internal, circle, int8, circle) => circle */ 
-DATA(insert OID = 7508 ( lag_circle  PGNSP PGUID 12 1 0 0 f f t f i 4 0 718 t "2281 718 20 718" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7508 ( lag_circle  PGNSP PGUID 12 1 0 0 f f t f i 4 0 718 t "2281 718 20 718" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_circle(internal, circle, int8) => circle */ 
-DATA(insert OID = 7510 ( lag_circle  PGNSP PGUID 12 1 0 0 f f t f i 3 0 718 t "2281 718 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7510 ( lag_circle  PGNSP PGUID 12 1 0 0 f f t f i 3 0 718 t "2281 718 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_circle(internal, circle) => circle */ 
-DATA(insert OID = 7512 ( lag_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7512 ( lag_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_float4(internal, float4, int8, float4) => float4 */ 
-DATA(insert OID = 7514 ( lag_float4  PGNSP PGUID 12 1 0 0 f f t f i 4 0 700 t "2281 700 20 700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7514 ( lag_float4  PGNSP PGUID 12 1 0 0 f f t f i 4 0 700 t "2281 700 20 700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_float4(internal, float4, int8) => float4 */ 
-DATA(insert OID = 7516 ( lag_float4  PGNSP PGUID 12 1 0 0 f f t f i 3 0 700 t "2281 700 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7516 ( lag_float4  PGNSP PGUID 12 1 0 0 f f t f i 3 0 700 t "2281 700 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_float4(internal, float4) => float4 */ 
-DATA(insert OID = 7518 ( lag_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7518 ( lag_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_float8(internal, float8, int8, float8) => float8 */ 
-DATA(insert OID = 7520 ( lag_float8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 701 t "2281 701 20 701" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7520 ( lag_float8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 701 t "2281 701 20 701" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_float8(internal, float8, int8) => float8 */ 
-DATA(insert OID = 7522 ( lag_float8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 701 t "2281 701 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7522 ( lag_float8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 701 t "2281 701 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_float8(internal, float8) => float8 */ 
-DATA(insert OID = 7524 ( lag_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7524 ( lag_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_inet(internal, inet, int8, inet) => inet */ 
-DATA(insert OID = 7526 ( lag_inet  PGNSP PGUID 12 1 0 0 f f t f i 4 0 869 t "2281 869 20 869" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7526 ( lag_inet  PGNSP PGUID 12 1 0 0 f f t f i 4 0 869 t "2281 869 20 869" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_inet(internal, inet, int8) => inet */ 
-DATA(insert OID = 7528 ( lag_inet  PGNSP PGUID 12 1 0 0 f f t f i 3 0 869 t "2281 869 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7528 ( lag_inet  PGNSP PGUID 12 1 0 0 f f t f i 3 0 869 t "2281 869 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_inet(internal, inet) => inet */ 
-DATA(insert OID = 7530 ( lag_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7530 ( lag_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_interval(internal, "interval", int8, "interval") => "interval" */ 
-DATA(insert OID = 7532 ( lag_interval  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1186 t "2281 1186 20 1186" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7532 ( lag_interval  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1186 t "2281 1186 20 1186" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_interval(internal, "interval", int8) => "interval" */ 
-DATA(insert OID = 7534 ( lag_interval  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1186 t "2281 1186 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7534 ( lag_interval  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1186 t "2281 1186 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_interval(internal, "interval") => "interval" */ 
-DATA(insert OID = 7536 ( lag_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7536 ( lag_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_line(internal, line, int8, line) => line */ 
-DATA(insert OID = 7538 ( lag_line  PGNSP PGUID 12 1 0 0 f f t f i 4 0 628 t "2281 628 20 628" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7538 ( lag_line  PGNSP PGUID 12 1 0 0 f f t f i 4 0 628 t "2281 628 20 628" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_line(internal, line, int8) => line */ 
-DATA(insert OID = 7540 ( lag_line  PGNSP PGUID 12 1 0 0 f f t f i 3 0 628 t "2281 628 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7540 ( lag_line  PGNSP PGUID 12 1 0 0 f f t f i 3 0 628 t "2281 628 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_line(internal, line) => line */ 
-DATA(insert OID = 7542 ( lag_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7542 ( lag_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_lseg(internal, lseg, int8, lseg) => lseg */ 
-DATA(insert OID = 7544 ( lag_lseg  PGNSP PGUID 12 1 0 0 f f t f i 4 0 601 t "2281 601 20 601" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7544 ( lag_lseg  PGNSP PGUID 12 1 0 0 f f t f i 4 0 601 t "2281 601 20 601" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_lseg(internal, lseg, int8) => lseg */ 
-DATA(insert OID = 7546 ( lag_lseg  PGNSP PGUID 12 1 0 0 f f t f i 3 0 601 t "2281 601 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7546 ( lag_lseg  PGNSP PGUID 12 1 0 0 f f t f i 3 0 601 t "2281 601 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_lseg(internal, lseg) => lseg */ 
-DATA(insert OID = 7548 ( lag_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7548 ( lag_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_macaddr(internal, macaddr, int8, macaddr) => macaddr */ 
-DATA(insert OID = 7550 ( lag_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 829 t "2281 829 20 829" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7550 ( lag_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 829 t "2281 829 20 829" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_macaddr(internal, macaddr, int8) => macaddr */ 
-DATA(insert OID = 7552 ( lag_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 829 t "2281 829 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7552 ( lag_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 829 t "2281 829 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_macaddr(internal, macaddr) => macaddr */ 
-DATA(insert OID = 7554 ( lag_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7554 ( lag_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_smallint(internal, int2, int8, int2) => int2 */ 
-DATA(insert OID = 7556 ( lag_smallint  PGNSP PGUID 12 1 0 0 f f t f i 4 0 21 t "2281 21 20 21" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7556 ( lag_smallint  PGNSP PGUID 12 1 0 0 f f t f i 4 0 21 t "2281 21 20 21" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_smallint(internal, int2, int8) => int2 */ 
-DATA(insert OID = 7558 ( lag_smallint  PGNSP PGUID 12 1 0 0 f f t f i 3 0 21 t "2281 21 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7558 ( lag_smallint  PGNSP PGUID 12 1 0 0 f f t f i 3 0 21 t "2281 21 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_smallint(internal, int2) => int2 */ 
-DATA(insert OID = 7560 ( lag_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7560 ( lag_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_int4(internal, int4, int8, int4) => int4 */ 
-DATA(insert OID = 7562 ( lag_int4  PGNSP PGUID 12 1 0 0 f f t f i 4 0 23 t "2281 23 20 23" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7562 ( lag_int4  PGNSP PGUID 12 1 0 0 f f t f i 4 0 23 t "2281 23 20 23" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_int4(internal, int4, int8) => int4 */ 
-DATA(insert OID = 7564 ( lag_int4  PGNSP PGUID 12 1 0 0 f f t f i 3 0 23 t "2281 23 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7564 ( lag_int4  PGNSP PGUID 12 1 0 0 f f t f i 3 0 23 t "2281 23 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_int4(internal, int4) => int4 */ 
-DATA(insert OID = 7566 ( lag_int4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7566 ( lag_int4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_int8(internal, int8, int8, int8) => int8 */ 
-DATA(insert OID = 7568 ( lag_int8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 20 t "2281 20 20 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7568 ( lag_int8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 20 t "2281 20 20 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_int8(internal, int8, int8) => int8 */ 
-DATA(insert OID = 7570 ( lag_int8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 20 t "2281 20 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7570 ( lag_int8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 20 t "2281 20 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_int8(internal, int8) => int8 */ 
-DATA(insert OID = 7572 ( lag_int8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7572 ( lag_int8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_money(internal, money, int8, money) => money */ 
-DATA(insert OID = 7574 ( lag_money  PGNSP PGUID 12 1 0 0 f f t f i 4 0 790 t "2281 790 20 790" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7574 ( lag_money  PGNSP PGUID 12 1 0 0 f f t f i 4 0 790 t "2281 790 20 790" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_money(internal, money, int8) => money */ 
-DATA(insert OID = 7576 ( lag_money  PGNSP PGUID 12 1 0 0 f f t f i 3 0 790 t "2281 790 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7576 ( lag_money  PGNSP PGUID 12 1 0 0 f f t f i 3 0 790 t "2281 790 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_money(internal, money) => money */ 
-DATA(insert OID = 7578 ( lag_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7578 ( lag_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_name(internal, name, int8, name) => name */ 
-DATA(insert OID = 7580 ( lag_name  PGNSP PGUID 12 1 0 0 f f t f i 4 0 19 t "2281 19 20 19" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7580 ( lag_name  PGNSP PGUID 12 1 0 0 f f t f i 4 0 19 t "2281 19 20 19" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_name(internal, name, int8) => name */ 
-DATA(insert OID = 7582 ( lag_name  PGNSP PGUID 12 1 0 0 f f t f i 3 0 19 t "2281 19 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7582 ( lag_name  PGNSP PGUID 12 1 0 0 f f t f i 3 0 19 t "2281 19 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_name(internal, name) => name */ 
-DATA(insert OID = 7584 ( lag_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7584 ( lag_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_numeric(internal, "numeric", int8, "numeric") => "numeric" */ 
-DATA(insert OID = 7586 ( lag_numeric  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1700 t "2281 1700 20 1700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7586 ( lag_numeric  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1700 t "2281 1700 20 1700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_numeric(internal, "numeric", int8) => "numeric" */ 
-DATA(insert OID = 7588 ( lag_numeric  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1700 t "2281 1700 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7588 ( lag_numeric  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1700 t "2281 1700 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_numeric(internal, "numeric") => "numeric" */ 
-DATA(insert OID = 7590 ( lag_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7590 ( lag_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_oid(internal, oid, int8, oid) => oid */ 
-DATA(insert OID = 7592 ( lag_oid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 26 t "2281 26 20 26" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7592 ( lag_oid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 26 t "2281 26 20 26" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_oid(internal, oid, int8) => oid */ 
-DATA(insert OID = 7594 ( lag_oid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 26 t "2281 26 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7594 ( lag_oid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 26 t "2281 26 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_oid(internal, oid) => oid */ 
-DATA(insert OID = 7596 ( lag_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7596 ( lag_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_path(internal, path, int8, path) => path */ 
-DATA(insert OID = 7598 ( lag_path  PGNSP PGUID 12 1 0 0 f f t f i 4 0 602 t "2281 602 20 602" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7598 ( lag_path  PGNSP PGUID 12 1 0 0 f f t f i 4 0 602 t "2281 602 20 602" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_path(internal, path, int8) => path */ 
-DATA(insert OID = 7600 ( lag_path  PGNSP PGUID 12 1 0 0 f f t f i 3 0 602 t "2281 602 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7600 ( lag_path  PGNSP PGUID 12 1 0 0 f f t f i 3 0 602 t "2281 602 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_path(internal, path) => path */ 
-DATA(insert OID = 7602 ( lag_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7602 ( lag_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_point(internal, point, int8, point) => point */ 
-DATA(insert OID = 7604 ( lag_point  PGNSP PGUID 12 1 0 0 f f t f i 4 0 600 t "2281 600 20 600" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7604 ( lag_point  PGNSP PGUID 12 1 0 0 f f t f i 4 0 600 t "2281 600 20 600" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_point(internal, point, int8) => point */ 
-DATA(insert OID = 7606 ( lag_point  PGNSP PGUID 12 1 0 0 f f t f i 3 0 600 t "2281 600 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7606 ( lag_point  PGNSP PGUID 12 1 0 0 f f t f i 3 0 600 t "2281 600 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_point(internal, point) => point */ 
-DATA(insert OID = 7608 ( lag_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7608 ( lag_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_polygon(internal, polygon, int8, polygon) => polygon */ 
-DATA(insert OID = 7610 ( lag_polygon  PGNSP PGUID 12 1 0 0 f f t f i 4 0 604 t "2281 604 20 604" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7610 ( lag_polygon  PGNSP PGUID 12 1 0 0 f f t f i 4 0 604 t "2281 604 20 604" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_polygon(internal, polygon, int8) => polygon */ 
-DATA(insert OID = 7612 ( lag_polygon  PGNSP PGUID 12 1 0 0 f f t f i 3 0 604 t "2281 604 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7612 ( lag_polygon  PGNSP PGUID 12 1 0 0 f f t f i 3 0 604 t "2281 604 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_polygon(internal, polygon) => polygon */ 
-DATA(insert OID = 7614 ( lag_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7614 ( lag_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_reltime(internal, reltime, int8, reltime) => reltime */ 
-DATA(insert OID = 7616 ( lag_reltime  PGNSP PGUID 12 1 0 0 f f t f i 4 0 703 t "2281 703 20 703" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7616 ( lag_reltime  PGNSP PGUID 12 1 0 0 f f t f i 4 0 703 t "2281 703 20 703" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_reltime(internal, reltime, int8) => reltime */ 
-DATA(insert OID = 7618 ( lag_reltime  PGNSP PGUID 12 1 0 0 f f t f i 3 0 703 t "2281 703 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7618 ( lag_reltime  PGNSP PGUID 12 1 0 0 f f t f i 3 0 703 t "2281 703 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_reltime(internal, reltime) => reltime */ 
-DATA(insert OID = 7620 ( lag_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7620 ( lag_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_text(internal, text, int8, text) => text */ 
-DATA(insert OID = 7622 ( lag_text  PGNSP PGUID 12 1 0 0 f f t f i 4 0 25 t "2281 25 20 25" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7622 ( lag_text  PGNSP PGUID 12 1 0 0 f f t f i 4 0 25 t "2281 25 20 25" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_text(internal, text, int8) => text */ 
-DATA(insert OID = 7624 ( lag_text  PGNSP PGUID 12 1 0 0 f f t f i 3 0 25 t "2281 25 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7624 ( lag_text  PGNSP PGUID 12 1 0 0 f f t f i 3 0 25 t "2281 25 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_text(internal, text) => text */ 
-DATA(insert OID = 7626 ( lag_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7626 ( lag_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_tid(internal, tid, int8, tid) => tid */ 
-DATA(insert OID = 7628 ( lag_tid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 27 t "2281 27 20 27" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7628 ( lag_tid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 27 t "2281 27 20 27" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_tid(internal, tid, int8) => tid */ 
-DATA(insert OID = 7630 ( lag_tid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 27 t "2281 27 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7630 ( lag_tid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 27 t "2281 27 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_tid(internal, tid) => tid */ 
-DATA(insert OID = 7632 ( lag_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7632 ( lag_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_time(internal, "time", int8, "time") => "time" */ 
-DATA(insert OID = 7634 ( lag_time  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1083 t "2281 1083 20 1083" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7634 ( lag_time  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1083 t "2281 1083 20 1083" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_time(internal, "time", int8) => "time" */ 
-DATA(insert OID = 7636 ( lag_time  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1083 t "2281 1083 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7636 ( lag_time  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1083 t "2281 1083 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_time(internal, "time") => "time" */ 
-DATA(insert OID = 7638 ( lag_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7638 ( lag_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timestamp(internal, "timestamp", int8, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7640 ( lag_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1114 t "2281 1114 20 1114" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7640 ( lag_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1114 t "2281 1114 20 1114" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timestamp(internal, "timestamp", int8) => "timestamp" */ 
-DATA(insert OID = 7642 ( lag_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1114 t "2281 1114 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7642 ( lag_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1114 t "2281 1114 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timestamp(internal, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7644 ( lag_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7644 ( lag_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timestamptz(internal, timestamptz, int8, timestamptz) => timestamptz */ 
-DATA(insert OID = 7646 ( lag_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1184 t "2281 1184 20 1184" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7646 ( lag_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1184 t "2281 1184 20 1184" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timestamptz(internal, timestamptz, int8) => timestamptz */ 
-DATA(insert OID = 7648 ( lag_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1184 t "2281 1184 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7648 ( lag_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1184 t "2281 1184 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timestamptz(internal, timestamptz) => timestamptz */ 
-DATA(insert OID = 7650 ( lag_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7650 ( lag_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timetz(internal, timetz, int8, timetz) => timetz */ 
-DATA(insert OID = 7652 ( lag_timetz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1266 t "2281 1266 20 1266" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7652 ( lag_timetz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1266 t "2281 1266 20 1266" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timetz(internal, timetz, int8) => timetz */ 
-DATA(insert OID = 7654 ( lag_timetz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1266 t "2281 1266 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7654 ( lag_timetz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1266 t "2281 1266 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_timetz(internal, timetz) => timetz */ 
-DATA(insert OID = 7656 ( lag_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7656 ( lag_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_varbit(internal, varbit, int8, varbit) => varbit */ 
-DATA(insert OID = 7658 ( lag_varbit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1562 t "2281 1562 20 1562" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7658 ( lag_varbit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1562 t "2281 1562 20 1562" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_varbit(internal, varbit, int8) => varbit */ 
-DATA(insert OID = 7660 ( lag_varbit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1562 t "2281 1562 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7660 ( lag_varbit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1562 t "2281 1562 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_varbit(internal, varbit) => varbit */ 
-DATA(insert OID = 7662 ( lag_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7662 ( lag_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_varchar(internal, "varchar", int8, "varchar") => "varchar" */ 
-DATA(insert OID = 7664 ( lag_varchar  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1043 t "2281 1043 20 1043" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7664 ( lag_varchar  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1043 t "2281 1043 20 1043" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_varchar(internal, "varchar", int8) => "varchar" */ 
-DATA(insert OID = 7666 ( lag_varchar  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1043 t "2281 1043 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7666 ( lag_varchar  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1043 t "2281 1043 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_varchar(internal, "varchar") => "varchar" */ 
-DATA(insert OID = 7668 ( lag_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7668 ( lag_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_xid(internal, xid, int8, xid) => xid */ 
-DATA(insert OID = 7670 ( lag_xid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 28 t "2281 28 20 28" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7670 ( lag_xid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 28 t "2281 28 20 28" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_xid(internal, xid, int8) => xid */ 
-DATA(insert OID = 7672 ( lag_xid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 28 t "2281 28 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7672 ( lag_xid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 28 t "2281 28 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_xid(internal, xid) => xid */ 
-DATA(insert OID = 7674 ( lag_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7674 ( lag_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_any(internal, anyarray, int8, anyarray) => anyarray */ 
-DATA(insert OID = 7208 ( lag_any  PGNSP PGUID 12 1 0 0 f f t f i 4 0 2277 t "2281 2277 20 2277" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7208 ( lag_any  PGNSP PGUID 12 1 0 0 f f t f i 4 0 2277 t "2281 2277 20 2277" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_any(internal, anyarray, int8) => anyarray */ 
-DATA(insert OID = 7209 ( lag_any  PGNSP PGUID 12 1 0 0 f f t f i 3 0 2277 t "2281 2277 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7209 ( lag_any  PGNSP PGUID 12 1 0 0 f f t f i 3 0 2277 t "2281 2277 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_any(internal, anyarray) => anyarray */ 
-DATA(insert OID = 7210 ( lag_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7210 ( lag_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bytea(internal, bytea) => bytea */ 
-DATA(insert OID = 7227 ( lag_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7227 ( lag_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bytea(internal, bytea, int8) => bytea */ 
-DATA(insert OID = 7229 ( lag_bytea  PGNSP PGUID 12 1 0 0 f f t f i 3 0 17 t "2281 17 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7229 ( lag_bytea  PGNSP PGUID 12 1 0 0 f f t f i 3 0 17 t "2281 17 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bytea(internal, bytea, int8, bytea) => bytea */ 
-DATA(insert OID = 7231 ( lag_bytea  PGNSP PGUID 12 1 0 0 f f t f i 4 0 17 t "2281 17 20 17" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7231 ( lag_bytea  PGNSP PGUID 12 1 0 0 f f t f i 4 0 17 t "2281 17 20 17" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bit(internal, "bit") => "bit" */ 
-DATA(insert OID = 7251 ( lag_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7251 ( lag_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bit(internal, "bit", int8) => "bit" */ 
-DATA(insert OID = 7253 ( lag_bit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1560 t "2281 1560 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7253 ( lag_bit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1560 t "2281 1560 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_bit(internal, "bit", int8, "bit") => "bit" */ 
-DATA(insert OID = 7255 ( lag_bit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1560 t "2281 1560 20 1560" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7255 ( lag_bit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1560 t "2281 1560 20 1560" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_box(internal, box) => box */ 
-DATA(insert OID = 7267 ( lag_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7267 ( lag_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_box(internal, box, int8) => box */ 
-DATA(insert OID = 7269 ( lag_box  PGNSP PGUID 12 1 0 0 f f t f i 3 0 603 t "2281 603 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7269 ( lag_box  PGNSP PGUID 12 1 0 0 f f t f i 3 0 603 t "2281 603 20" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lag_box(internal, box, int8, box) => box */ 
-DATA(insert OID = 7271 ( lag_box  PGNSP PGUID 12 1 0 0 f f t f i 4 0 603 t "2281 603 20 603" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ n ));
+DATA(insert OID = 7271 ( lag_box  PGNSP PGUID 12 1 0 0 f f t f i 4 0 603 t "2281 603 20 603" _null_ _null_ _null_ _null_ lag_generic _null_ _null_ _null_ n ));
 
 /* lead_int(internal, int4, int8, int4) => int4 */ 
-DATA(insert OID = 7106 ( lead_int  PGNSP PGUID 12 1 0 0 f f t f i 4 0 23 t "2281 23 20 23" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7106 ( lead_int  PGNSP PGUID 12 1 0 0 f f t f i 4 0 23 t "2281 23 20 23" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_int(internal, int4, int8) => int4 */ 
-DATA(insert OID = 7104 ( lead_int  PGNSP PGUID 12 1 0 0 f f t f i 3 0 23 t "2281 23 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7104 ( lead_int  PGNSP PGUID 12 1 0 0 f f t f i 3 0 23 t "2281 23 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_int(internal, int4) => int4 */ 
-DATA(insert OID = 7105 ( lead_int  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7105 ( lead_int  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bool(internal, bool, int8, bool) => bool */ 
-DATA(insert OID = 7311 ( lead_bool  PGNSP PGUID 12 1 0 0 f f t f i 4 0 16 t "2281 16 20 16" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7311 ( lead_bool  PGNSP PGUID 12 1 0 0 f f t f i 4 0 16 t "2281 16 20 16" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bool(internal, bool, int8) => bool */ 
-DATA(insert OID = 7313 ( lead_bool  PGNSP PGUID 12 1 0 0 f f t f i 3 0 16 t "2281 16 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7313 ( lead_bool  PGNSP PGUID 12 1 0 0 f f t f i 3 0 16 t "2281 16 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bool(internal, bool) => bool */ 
-DATA(insert OID = 7315 ( lead_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7315 ( lead_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_char(internal, "char", int8, "char") => "char" */ 
-DATA(insert OID = 7317 ( lead_char  PGNSP PGUID 12 1 0 0 f f t f i 4 0 18 t "2281 18 20 18" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7317 ( lead_char  PGNSP PGUID 12 1 0 0 f f t f i 4 0 18 t "2281 18 20 18" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_char(internal, "char", int8) => "char" */ 
-DATA(insert OID = 7319 ( lead_char  PGNSP PGUID 12 1 0 0 f f t f i 3 0 18 t "2281 18 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7319 ( lead_char  PGNSP PGUID 12 1 0 0 f f t f i 3 0 18 t "2281 18 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_char(internal, "char") => "char" */ 
-DATA(insert OID = 7321 ( lead_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7321 ( lead_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_cidr(internal, cidr, int8, cidr) => cidr */ 
-DATA(insert OID = 7323 ( lead_cidr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 650 t "2281 650 20 650" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7323 ( lead_cidr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 650 t "2281 650 20 650" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_cidr(internal, cidr, int8) => cidr */ 
-DATA(insert OID = 7325 ( lead_cidr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 650 t "2281 650 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7325 ( lead_cidr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 650 t "2281 650 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_cidr(internal, cidr) => cidr */ 
-DATA(insert OID = 7327 ( lead_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7327 ( lead_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_circle(internal, circle, int8, circle) => circle */ 
-DATA(insert OID = 7329 ( lead_circle  PGNSP PGUID 12 1 0 0 f f t f i 4 0 718 t "2281 718 20 718" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7329 ( lead_circle  PGNSP PGUID 12 1 0 0 f f t f i 4 0 718 t "2281 718 20 718" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_circle(internal, circle, int8) => circle */ 
-DATA(insert OID = 7331 ( lead_circle  PGNSP PGUID 12 1 0 0 f f t f i 3 0 718 t "2281 718 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7331 ( lead_circle  PGNSP PGUID 12 1 0 0 f f t f i 3 0 718 t "2281 718 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_circle(internal, circle) => circle */ 
-DATA(insert OID = 7333 ( lead_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7333 ( lead_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_float4(internal, float4, int8, float4) => float4 */ 
-DATA(insert OID = 7335 ( lead_float4  PGNSP PGUID 12 1 0 0 f f t f i 4 0 700 t "2281 700 20 700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7335 ( lead_float4  PGNSP PGUID 12 1 0 0 f f t f i 4 0 700 t "2281 700 20 700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_float4(internal, float4, int8) => float4 */ 
-DATA(insert OID = 7337 ( lead_float4  PGNSP PGUID 12 1 0 0 f f t f i 3 0 700 t "2281 700 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7337 ( lead_float4  PGNSP PGUID 12 1 0 0 f f t f i 3 0 700 t "2281 700 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_float4(internal, float4) => float4 */ 
-DATA(insert OID = 7339 ( lead_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7339 ( lead_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_float8(internal, float8, int8, float8) => float8 */ 
-DATA(insert OID = 7341 ( lead_float8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 701 t "2281 701 20 701" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7341 ( lead_float8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 701 t "2281 701 20 701" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_float8(internal, float8, int8) => float8 */ 
-DATA(insert OID = 7343 ( lead_float8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 701 t "2281 701 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7343 ( lead_float8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 701 t "2281 701 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_float8(internal, float8) => float8 */ 
-DATA(insert OID = 7345 ( lead_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7345 ( lead_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_inet(internal, inet, int8, inet) => inet */ 
-DATA(insert OID = 7347 ( lead_inet  PGNSP PGUID 12 1 0 0 f f t f i 4 0 869 t "2281 869 20 869" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7347 ( lead_inet  PGNSP PGUID 12 1 0 0 f f t f i 4 0 869 t "2281 869 20 869" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_inet(internal, inet, int8) => inet */ 
-DATA(insert OID = 7349 ( lead_inet  PGNSP PGUID 12 1 0 0 f f t f i 3 0 869 t "2281 869 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7349 ( lead_inet  PGNSP PGUID 12 1 0 0 f f t f i 3 0 869 t "2281 869 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_inet(internal, inet) => inet */ 
-DATA(insert OID = 7351 ( lead_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7351 ( lead_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_interval(internal, "interval", int8, "interval") => "interval" */ 
-DATA(insert OID = 7353 ( lead_interval  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1186 t "2281 1186 20 1186" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7353 ( lead_interval  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1186 t "2281 1186 20 1186" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_interval(internal, "interval", int8) => "interval" */ 
-DATA(insert OID = 7355 ( lead_interval  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1186 t "2281 1186 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7355 ( lead_interval  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1186 t "2281 1186 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_interval(internal, "interval") => "interval" */ 
-DATA(insert OID = 7357 ( lead_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7357 ( lead_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_line(internal, line, int8, line) => line */ 
-DATA(insert OID = 7359 ( lead_line  PGNSP PGUID 12 1 0 0 f f t f i 4 0 628 t "2281 628 20 628" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7359 ( lead_line  PGNSP PGUID 12 1 0 0 f f t f i 4 0 628 t "2281 628 20 628" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_line(internal, line, int8) => line */ 
-DATA(insert OID = 7361 ( lead_line  PGNSP PGUID 12 1 0 0 f f t f i 3 0 628 t "2281 628 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7361 ( lead_line  PGNSP PGUID 12 1 0 0 f f t f i 3 0 628 t "2281 628 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_line(internal, line) => line */ 
-DATA(insert OID = 7363 ( lead_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7363 ( lead_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_lseg(internal, lseg, int8, lseg) => lseg */ 
-DATA(insert OID = 7365 ( lead_lseg  PGNSP PGUID 12 1 0 0 f f t f i 4 0 601 t "2281 601 20 601" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7365 ( lead_lseg  PGNSP PGUID 12 1 0 0 f f t f i 4 0 601 t "2281 601 20 601" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_lseg(internal, lseg, int8) => lseg */ 
-DATA(insert OID = 7367 ( lead_lseg  PGNSP PGUID 12 1 0 0 f f t f i 3 0 601 t "2281 601 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7367 ( lead_lseg  PGNSP PGUID 12 1 0 0 f f t f i 3 0 601 t "2281 601 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_lseg(internal, lseg) => lseg */ 
-DATA(insert OID = 7369 ( lead_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7369 ( lead_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_macaddr(internal, macaddr, int8, macaddr) => macaddr */ 
-DATA(insert OID = 7371 ( lead_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 829 t "2281 829 20 829" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7371 ( lead_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 4 0 829 t "2281 829 20 829" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_macaddr(internal, macaddr, int8) => macaddr */ 
-DATA(insert OID = 7373 ( lead_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 829 t "2281 829 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7373 ( lead_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 3 0 829 t "2281 829 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_macaddr(internal, macaddr) => macaddr */ 
-DATA(insert OID = 7375 ( lead_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7375 ( lead_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_smallint(internal, int2, int8, int2) => int2 */ 
-DATA(insert OID = 7377 ( lead_smallint  PGNSP PGUID 12 1 0 0 f f t f i 4 0 21 t "2281 21 20 21" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7377 ( lead_smallint  PGNSP PGUID 12 1 0 0 f f t f i 4 0 21 t "2281 21 20 21" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_smallint(internal, int2, int8) => int2 */ 
-DATA(insert OID = 7379 ( lead_smallint  PGNSP PGUID 12 1 0 0 f f t f i 3 0 21 t "2281 21 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7379 ( lead_smallint  PGNSP PGUID 12 1 0 0 f f t f i 3 0 21 t "2281 21 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_smallint(internal, int2) => int2 */ 
-DATA(insert OID = 7381 ( lead_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7381 ( lead_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_int8(internal, int8, int8, int8) => int8 */ 
-DATA(insert OID = 7383 ( lead_int8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 20 t "2281 20 20 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7383 ( lead_int8  PGNSP PGUID 12 1 0 0 f f t f i 4 0 20 t "2281 20 20 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_int8(internal, int8, int8) => int8 */ 
-DATA(insert OID = 7385 ( lead_int8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 20 t "2281 20 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7385 ( lead_int8  PGNSP PGUID 12 1 0 0 f f t f i 3 0 20 t "2281 20 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_int8(internal, int8) => int8 */ 
-DATA(insert OID = 7387 ( lead_int8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7387 ( lead_int8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_money(internal, money, int8, money) => money */ 
-DATA(insert OID = 7389 ( lead_money  PGNSP PGUID 12 1 0 0 f f t f i 4 0 790 t "2281 790 20 790" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7389 ( lead_money  PGNSP PGUID 12 1 0 0 f f t f i 4 0 790 t "2281 790 20 790" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_money(internal, money, int8) => money */ 
-DATA(insert OID = 7391 ( lead_money  PGNSP PGUID 12 1 0 0 f f t f i 3 0 790 t "2281 790 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7391 ( lead_money  PGNSP PGUID 12 1 0 0 f f t f i 3 0 790 t "2281 790 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_money(internal, money) => money */ 
-DATA(insert OID = 7393 ( lead_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7393 ( lead_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_name(internal, name, int8, name) => name */ 
-DATA(insert OID = 7395 ( lead_name  PGNSP PGUID 12 1 0 0 f f t f i 4 0 19 t "2281 19 20 19" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7395 ( lead_name  PGNSP PGUID 12 1 0 0 f f t f i 4 0 19 t "2281 19 20 19" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_name(internal, name, int8) => name */ 
-DATA(insert OID = 7397 ( lead_name  PGNSP PGUID 12 1 0 0 f f t f i 3 0 19 t "2281 19 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7397 ( lead_name  PGNSP PGUID 12 1 0 0 f f t f i 3 0 19 t "2281 19 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_name(internal, name) => name */ 
-DATA(insert OID = 7399 ( lead_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7399 ( lead_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_numeric(internal, "numeric", int8, "numeric") => "numeric" */ 
-DATA(insert OID = 7401 ( lead_numeric  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1700 t "2281 1700 20 1700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7401 ( lead_numeric  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1700 t "2281 1700 20 1700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_numeric(internal, "numeric", int8) => "numeric" */ 
-DATA(insert OID = 7403 ( lead_numeric  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1700 t "2281 1700 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7403 ( lead_numeric  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1700 t "2281 1700 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_numeric(internal, "numeric") => "numeric" */ 
-DATA(insert OID = 7405 ( lead_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7405 ( lead_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_oid(internal, oid, int8, oid) => oid */ 
-DATA(insert OID = 7407 ( lead_oid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 26 t "2281 26 20 26" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7407 ( lead_oid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 26 t "2281 26 20 26" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_oid(internal, oid, int8) => oid */ 
-DATA(insert OID = 7409 ( lead_oid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 26 t "2281 26 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7409 ( lead_oid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 26 t "2281 26 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_oid(internal, oid) => oid */ 
-DATA(insert OID = 7411 ( lead_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7411 ( lead_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_path(internal, path, int8, path) => path */ 
-DATA(insert OID = 7413 ( lead_path  PGNSP PGUID 12 1 0 0 f f t f i 4 0 602 t "2281 602 20 602" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7413 ( lead_path  PGNSP PGUID 12 1 0 0 f f t f i 4 0 602 t "2281 602 20 602" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_path(internal, path, int8) => path */ 
-DATA(insert OID = 7415 ( lead_path  PGNSP PGUID 12 1 0 0 f f t f i 3 0 602 t "2281 602 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7415 ( lead_path  PGNSP PGUID 12 1 0 0 f f t f i 3 0 602 t "2281 602 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_path(internal, path) => path */ 
-DATA(insert OID = 7417 ( lead_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7417 ( lead_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_point(internal, point, int8, point) => point */ 
-DATA(insert OID = 7419 ( lead_point  PGNSP PGUID 12 1 0 0 f f t f i 4 0 600 t "2281 600 20 600" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7419 ( lead_point  PGNSP PGUID 12 1 0 0 f f t f i 4 0 600 t "2281 600 20 600" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_point(internal, point, int8) => point */ 
-DATA(insert OID = 7421 ( lead_point  PGNSP PGUID 12 1 0 0 f f t f i 3 0 600 t "2281 600 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7421 ( lead_point  PGNSP PGUID 12 1 0 0 f f t f i 3 0 600 t "2281 600 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_point(internal, point) => point */ 
-DATA(insert OID = 7423 ( lead_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7423 ( lead_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_polygon(internal, polygon, int8, polygon) => polygon */ 
-DATA(insert OID = 7425 ( lead_polygon  PGNSP PGUID 12 1 0 0 f f t f i 4 0 604 t "2281 604 20 604" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7425 ( lead_polygon  PGNSP PGUID 12 1 0 0 f f t f i 4 0 604 t "2281 604 20 604" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_polygon(internal, polygon, int8) => polygon */ 
-DATA(insert OID = 7427 ( lead_polygon  PGNSP PGUID 12 1 0 0 f f t f i 3 0 604 t "2281 604 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7427 ( lead_polygon  PGNSP PGUID 12 1 0 0 f f t f i 3 0 604 t "2281 604 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_polygon(internal, polygon) => polygon */ 
-DATA(insert OID = 7429 ( lead_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7429 ( lead_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_reltime(internal, reltime, int8, reltime) => reltime */ 
-DATA(insert OID = 7431 ( lead_reltime  PGNSP PGUID 12 1 0 0 f f t f i 4 0 703 t "2281 703 20 703" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7431 ( lead_reltime  PGNSP PGUID 12 1 0 0 f f t f i 4 0 703 t "2281 703 20 703" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_reltime(internal, reltime, int8) => reltime */ 
-DATA(insert OID = 7433 ( lead_reltime  PGNSP PGUID 12 1 0 0 f f t f i 3 0 703 t "2281 703 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7433 ( lead_reltime  PGNSP PGUID 12 1 0 0 f f t f i 3 0 703 t "2281 703 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_reltime(internal, reltime) => reltime */ 
-DATA(insert OID = 7435 ( lead_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7435 ( lead_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_text(internal, text, int8, text) => text */ 
-DATA(insert OID = 7437 ( lead_text  PGNSP PGUID 12 1 0 0 f f t f i 4 0 25 t "2281 25 20 25" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7437 ( lead_text  PGNSP PGUID 12 1 0 0 f f t f i 4 0 25 t "2281 25 20 25" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_text(internal, text, int8) => text */ 
-DATA(insert OID = 7439 ( lead_text  PGNSP PGUID 12 1 0 0 f f t f i 3 0 25 t "2281 25 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7439 ( lead_text  PGNSP PGUID 12 1 0 0 f f t f i 3 0 25 t "2281 25 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_text(internal, text) => text */ 
-DATA(insert OID = 7441 ( lead_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7441 ( lead_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_tid(internal, tid, int8, tid) => tid */ 
-DATA(insert OID = 7443 ( lead_tid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 27 t "2281 27 20 27" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7443 ( lead_tid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 27 t "2281 27 20 27" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_tid(internal, tid, int8) => tid */ 
-DATA(insert OID = 7445 ( lead_tid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 27 t "2281 27 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7445 ( lead_tid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 27 t "2281 27 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_tid(internal, tid) => tid */ 
-DATA(insert OID = 7447 ( lead_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7447 ( lead_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_time(internal, "time", int8, "time") => "time" */ 
-DATA(insert OID = 7449 ( lead_time  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1083 t "2281 1083 20 1083" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7449 ( lead_time  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1083 t "2281 1083 20 1083" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_time(internal, "time", int8) => "time" */ 
-DATA(insert OID = 7451 ( lead_time  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1083 t "2281 1083 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7451 ( lead_time  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1083 t "2281 1083 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_time(internal, "time") => "time" */ 
-DATA(insert OID = 7453 ( lead_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7453 ( lead_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timestamp(internal, "timestamp", int8, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7455 ( lead_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1114 t "2281 1114 20 1114" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7455 ( lead_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1114 t "2281 1114 20 1114" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timestamp(internal, "timestamp", int8) => "timestamp" */ 
-DATA(insert OID = 7457 ( lead_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1114 t "2281 1114 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7457 ( lead_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1114 t "2281 1114 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timestamp(internal, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7459 ( lead_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7459 ( lead_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timestamptz(internal, timestamptz, int8, timestamptz) => timestamptz */ 
-DATA(insert OID = 7461 ( lead_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1184 t "2281 1184 20 1184" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7461 ( lead_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1184 t "2281 1184 20 1184" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timestamptz(internal, timestamptz, int8) => timestamptz */ 
-DATA(insert OID = 7463 ( lead_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1184 t "2281 1184 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7463 ( lead_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1184 t "2281 1184 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timestamptz(internal, timestamptz) => timestamptz */ 
-DATA(insert OID = 7465 ( lead_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7465 ( lead_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timetz(internal, timetz, int8, timetz) => timetz */ 
-DATA(insert OID = 7467 ( lead_timetz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1266 t "2281 1266 20 1266" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7467 ( lead_timetz  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1266 t "2281 1266 20 1266" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timetz(internal, timetz, int8) => timetz */ 
-DATA(insert OID = 7469 ( lead_timetz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1266 t "2281 1266 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7469 ( lead_timetz  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1266 t "2281 1266 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_timetz(internal, timetz) => timetz */ 
-DATA(insert OID = 7471 ( lead_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7471 ( lead_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_varbit(internal, varbit, int8, varbit) => varbit */ 
-DATA(insert OID = 7473 ( lead_varbit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1562 t "2281 1562 20 1562" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7473 ( lead_varbit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1562 t "2281 1562 20 1562" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_varbit(internal, varbit, int8) => varbit */ 
-DATA(insert OID = 7475 ( lead_varbit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1562 t "2281 1562 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7475 ( lead_varbit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1562 t "2281 1562 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_varbit(internal, varbit) => varbit */ 
-DATA(insert OID = 7477 ( lead_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7477 ( lead_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_varchar(internal, "varchar", int8, "varchar") => "varchar" */ 
-DATA(insert OID = 7479 ( lead_varchar  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1043 t "2281 1043 20 1043" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7479 ( lead_varchar  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1043 t "2281 1043 20 1043" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_varchar(internal, "varchar", int8) => "varchar" */ 
-DATA(insert OID = 7481 ( lead_varchar  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1043 t "2281 1043 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7481 ( lead_varchar  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1043 t "2281 1043 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_varchar(internal, "varchar") => "varchar" */ 
-DATA(insert OID = 7483 ( lead_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7483 ( lead_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_xid(internal, xid, int8, xid) => xid */ 
-DATA(insert OID = 7485 ( lead_xid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 28 t "2281 28 20 28" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7485 ( lead_xid  PGNSP PGUID 12 1 0 0 f f t f i 4 0 28 t "2281 28 20 28" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_xid(internal, xid, int8) => xid */ 
-DATA(insert OID = 7487 ( lead_xid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 28 t "2281 28 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7487 ( lead_xid  PGNSP PGUID 12 1 0 0 f f t f i 3 0 28 t "2281 28 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_xid(internal, xid) => xid */ 
-DATA(insert OID = 7489 ( lead_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7489 ( lead_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_any(internal, anyarray, int8, anyarray) => anyarray */ 
-DATA(insert OID = 7217 ( lead_any  PGNSP PGUID 12 1 0 0 f f t f i 4 0 2277 t "2281 2277 20 2277" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7217 ( lead_any  PGNSP PGUID 12 1 0 0 f f t f i 4 0 2277 t "2281 2277 20 2277" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_any(internal, anyarray, int8) => anyarray */ 
-DATA(insert OID = 7218 ( lead_any  PGNSP PGUID 12 1 0 0 f f t f i 3 0 2277 t "2281 2277 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7218 ( lead_any  PGNSP PGUID 12 1 0 0 f f t f i 3 0 2277 t "2281 2277 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_any(internal, anyarray) => anyarray */ 
-DATA(insert OID = 7219 ( lead_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7219 ( lead_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bytea(internal, bytea) => bytea */ 
-DATA(insert OID = 7221 ( lead_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7221 ( lead_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bytea(internal, bytea, int8) => bytea */ 
-DATA(insert OID = 7223 ( lead_bytea  PGNSP PGUID 12 1 0 0 f f t f i 3 0 17 t "2281 17 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7223 ( lead_bytea  PGNSP PGUID 12 1 0 0 f f t f i 3 0 17 t "2281 17 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bytea(internal, bytea, int8, bytea) => bytea */ 
-DATA(insert OID = 7225 ( lead_bytea  PGNSP PGUID 12 1 0 0 f f t f i 4 0 17 t "2281 17 20 17" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7225 ( lead_bytea  PGNSP PGUID 12 1 0 0 f f t f i 4 0 17 t "2281 17 20 17" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bit(internal, "bit") => "bit" */ 
-DATA(insert OID = 7245 ( lead_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7245 ( lead_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bit(internal, "bit", int8) => "bit" */ 
-DATA(insert OID = 7247 ( lead_bit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1560 t "2281 1560 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7247 ( lead_bit  PGNSP PGUID 12 1 0 0 f f t f i 3 0 1560 t "2281 1560 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_bit(internal, "bit", int8, "bit") => "bit" */ 
-DATA(insert OID = 7249 ( lead_bit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1560 t "2281 1560 20 1560" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7249 ( lead_bit  PGNSP PGUID 12 1 0 0 f f t f i 4 0 1560 t "2281 1560 20 1560" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_box(internal, box) => box */ 
-DATA(insert OID = 7261 ( lead_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7261 ( lead_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_box(internal, box, int8) => box */ 
-DATA(insert OID = 7263 ( lead_box  PGNSP PGUID 12 1 0 0 f f t f i 3 0 603 t "2281 603 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7263 ( lead_box  PGNSP PGUID 12 1 0 0 f f t f i 3 0 603 t "2281 603 20" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* lead_box(internal, box, int8, box) => box */ 
-DATA(insert OID = 7265 ( lead_box  PGNSP PGUID 12 1 0 0 f f t f i 4 0 603 t "2281 603 20 603" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ n ));
+DATA(insert OID = 7265 ( lead_box  PGNSP PGUID 12 1 0 0 f f t f i 4 0 603 t "2281 603 20 603" _null_ _null_ _null_ _null_ lead_generic _null_ _null_ _null_ n ));
 
 /* first_value_bool(internal, bool) => bool */ 
-DATA(insert OID = 7111 ( first_value_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7111 ( first_value_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_char(internal, "char") => "char" */ 
-DATA(insert OID = 7112 ( first_value_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7112 ( first_value_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_cidr(internal, cidr) => cidr */ 
-DATA(insert OID = 7113 ( first_value_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7113 ( first_value_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_circle(internal, circle) => circle */ 
-DATA(insert OID = 7114 ( first_value_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7114 ( first_value_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_float4(internal, float4) => float4 */ 
-DATA(insert OID = 7115 ( first_value_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7115 ( first_value_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_float8(internal, float8) => float8 */ 
-DATA(insert OID = 7116 ( first_value_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7116 ( first_value_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_inet(internal, inet) => inet */ 
-DATA(insert OID = 7117 ( first_value_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7117 ( first_value_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_interval(internal, "interval") => "interval" */ 
-DATA(insert OID = 7118 ( first_value_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7118 ( first_value_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_line(internal, line) => line */ 
-DATA(insert OID = 7119 ( first_value_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7119 ( first_value_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_lseg(internal, lseg) => lseg */ 
-DATA(insert OID = 7120 ( first_value_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7120 ( first_value_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_macaddr(internal, macaddr) => macaddr */ 
-DATA(insert OID = 7121 ( first_value_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7121 ( first_value_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_smallint(internal, int2) => int2 */ 
-DATA(insert OID = 7122 ( first_value_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7122 ( first_value_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_int4(internal, int4) => int4 */ 
-DATA(insert OID = 7123 ( first_value_int4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7123 ( first_value_int4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_int8(internal, int8) => int8 */ 
-DATA(insert OID = 7124 ( first_value_int8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7124 ( first_value_int8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_money(internal, money) => money */ 
-DATA(insert OID = 7125 ( first_value_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7125 ( first_value_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_name(internal, name) => name */ 
-DATA(insert OID = 7126 ( first_value_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7126 ( first_value_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_numeric(internal, "numeric") => "numeric" */ 
-DATA(insert OID = 7127 ( first_value_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7127 ( first_value_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_oid(internal, oid) => oid */ 
-DATA(insert OID = 7128 ( first_value_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7128 ( first_value_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_path(internal, path) => path */ 
-DATA(insert OID = 7129 ( first_value_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7129 ( first_value_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_point(internal, point) => point */ 
-DATA(insert OID = 7130 ( first_value_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7130 ( first_value_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_polygon(internal, polygon) => polygon */ 
-DATA(insert OID = 7131 ( first_value_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7131 ( first_value_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_reltime(internal, reltime) => reltime */ 
-DATA(insert OID = 7132 ( first_value_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7132 ( first_value_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_text(internal, text) => text */ 
-DATA(insert OID = 7133 ( first_value_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7133 ( first_value_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_tid(internal, tid) => tid */ 
-DATA(insert OID = 7134 ( first_value_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7134 ( first_value_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_time(internal, "time") => "time" */ 
-DATA(insert OID = 7135 ( first_value_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7135 ( first_value_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_timestamp(internal, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7136 ( first_value_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7136 ( first_value_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_timestamptz(internal, timestamptz) => timestamptz */ 
-DATA(insert OID = 7137 ( first_value_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7137 ( first_value_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_timetz(internal, timetz) => timetz */ 
-DATA(insert OID = 7138 ( first_value_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7138 ( first_value_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_varbit(internal, varbit) => varbit */ 
-DATA(insert OID = 7139 ( first_value_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7139 ( first_value_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_varchar(internal, "varchar") => "varchar" */ 
-DATA(insert OID = 7140 ( first_value_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7140 ( first_value_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_xid(internal, xid) => xid */ 
-DATA(insert OID = 7141 ( first_value_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7141 ( first_value_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_bytea(internal, bytea) => bytea */ 
-DATA(insert OID = 7233 ( first_value_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7233 ( first_value_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_bit(internal, "bit") => "bit" */ 
-DATA(insert OID = 7257 ( first_value_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7257 ( first_value_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_box(internal, box) => box */ 
-DATA(insert OID = 7273 ( first_value_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7273 ( first_value_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* first_value_any(internal, anyarray) => anyarray */ 
-DATA(insert OID = 7289 ( first_value_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ n ));
+DATA(insert OID = 7289 ( first_value_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ first_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_int(internal, int4) => int4 */ 
-DATA(insert OID = 7103 ( last_value_int  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7103 ( last_value_int  PGNSP PGUID 12 1 0 0 f f t f i 2 0 23 t "2281 23" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_smallint(internal, int2) => int2 */ 
-DATA(insert OID = 7107 ( last_value_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7107 ( last_value_smallint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 21 t "2281 21" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_bigint(internal, int8) => int8 */ 
-DATA(insert OID = 7108 ( last_value_bigint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7108 ( last_value_bigint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 t "2281 20" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_numeric(internal, "numeric") => "numeric" */ 
-DATA(insert OID = 7109 ( last_value_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7109 ( last_value_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1700 t "2281 1700" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_text(internal, text) => text */ 
-DATA(insert OID = 7110 ( last_value_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7110 ( last_value_text  PGNSP PGUID 12 1 0 0 f f t f i 2 0 25 t "2281 25" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_bool(internal, bool) => bool */ 
-DATA(insert OID = 7165 ( last_value_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7165 ( last_value_bool  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 t "2281 16" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_char(internal, "char") => "char" */ 
-DATA(insert OID = 7166 ( last_value_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7166 ( last_value_char  PGNSP PGUID 12 1 0 0 f f t f i 2 0 18 t "2281 18" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_cidr(internal, cidr) => cidr */ 
-DATA(insert OID = 7167 ( last_value_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7167 ( last_value_cidr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 650 t "2281 650" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_circle(internal, circle) => circle */ 
-DATA(insert OID = 7168 ( last_value_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7168 ( last_value_circle  PGNSP PGUID 12 1 0 0 f f t f i 2 0 718 t "2281 718" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_float4(internal, float4) => float4 */ 
-DATA(insert OID = 7142 ( last_value_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7142 ( last_value_float4  PGNSP PGUID 12 1 0 0 f f t f i 2 0 700 t "2281 700" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_float8(internal, float8) => float8 */ 
-DATA(insert OID = 7143 ( last_value_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7143 ( last_value_float8  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 t "2281 701" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_inet(internal, inet) => inet */ 
-DATA(insert OID = 7144 ( last_value_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7144 ( last_value_inet  PGNSP PGUID 12 1 0 0 f f t f i 2 0 869 t "2281 869" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_interval(internal, "interval") => "interval" */ 
-DATA(insert OID = 7145 ( last_value_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7145 ( last_value_interval  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1186 t "2281 1186" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_line(internal, line) => line */ 
-DATA(insert OID = 7146 ( last_value_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7146 ( last_value_line  PGNSP PGUID 12 1 0 0 f f t f i 2 0 628 t "2281 628" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_lseg(internal, lseg) => lseg */ 
-DATA(insert OID = 7147 ( last_value_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7147 ( last_value_lseg  PGNSP PGUID 12 1 0 0 f f t f i 2 0 601 t "2281 601" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_macaddr(internal, macaddr) => macaddr */ 
-DATA(insert OID = 7148 ( last_value_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7148 ( last_value_macaddr  PGNSP PGUID 12 1 0 0 f f t f i 2 0 829 t "2281 829" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_money(internal, money) => money */ 
-DATA(insert OID = 7149 ( last_value_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7149 ( last_value_money  PGNSP PGUID 12 1 0 0 f f t f i 2 0 790 t "2281 790" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_name(internal, name) => name */ 
-DATA(insert OID = 7150 ( last_value_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7150 ( last_value_name  PGNSP PGUID 12 1 0 0 f f t f i 2 0 19 t "2281 19" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_oid(internal, oid) => oid */ 
-DATA(insert OID = 7151 ( last_value_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7151 ( last_value_oid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 26 t "2281 26" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_path(internal, path) => path */ 
-DATA(insert OID = 7152 ( last_value_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7152 ( last_value_path  PGNSP PGUID 12 1 0 0 f f t f i 2 0 602 t "2281 602" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_point(internal, point) => point */ 
-DATA(insert OID = 7153 ( last_value_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7153 ( last_value_point  PGNSP PGUID 12 1 0 0 f f t f i 2 0 600 t "2281 600" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_polygon(internal, polygon) => polygon */ 
-DATA(insert OID = 7154 ( last_value_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7154 ( last_value_polygon  PGNSP PGUID 12 1 0 0 f f t f i 2 0 604 t "2281 604" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_reltime(internal, reltime) => reltime */ 
-DATA(insert OID = 7155 ( last_value_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7155 ( last_value_reltime  PGNSP PGUID 12 1 0 0 f f t f i 2 0 703 t "2281 703" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_tid(internal, tid) => tid */ 
-DATA(insert OID = 7157 ( last_value_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7157 ( last_value_tid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 27 t "2281 27" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_time(internal, "time") => "time" */ 
-DATA(insert OID = 7158 ( last_value_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7158 ( last_value_time  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1083 t "2281 1083" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_timestamp(internal, "timestamp") => "timestamp" */ 
-DATA(insert OID = 7159 ( last_value_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7159 ( last_value_timestamp  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1114 t "2281 1114" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_timestamptz(internal, timestamptz) => timestamptz */ 
-DATA(insert OID = 7160 ( last_value_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7160 ( last_value_timestamptz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1184 t "2281 1184" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_timetz(internal, timetz) => timetz */ 
-DATA(insert OID = 7161 ( last_value_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7161 ( last_value_timetz  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1266 t "2281 1266" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_varbit(internal, varbit) => varbit */ 
-DATA(insert OID = 7162 ( last_value_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7162 ( last_value_varbit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1562 t "2281 1562" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_varchar(internal, "varchar") => "varchar" */ 
-DATA(insert OID = 7163 ( last_value_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7163 ( last_value_varchar  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1043 t "2281 1043" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_xid(internal, xid) => xid */ 
-DATA(insert OID = 7164 ( last_value_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7164 ( last_value_xid  PGNSP PGUID 12 1 0 0 f f t f i 2 0 28 t "2281 28" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_bytea(internal, bytea) => bytea */ 
-DATA(insert OID = 7239 ( last_value_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7239 ( last_value_bytea  PGNSP PGUID 12 1 0 0 f f t f i 2 0 17 t "2281 17" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_bit(internal, "bit") => "bit" */ 
-DATA(insert OID = 7259 ( last_value_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7259 ( last_value_bit  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1560 t "2281 1560" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_box(internal, box) => box */ 
-DATA(insert OID = 7275 ( last_value_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7275 ( last_value_box  PGNSP PGUID 12 1 0 0 f f t f i 2 0 603 t "2281 603" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* last_value_any(internal, anyarray) => anyarray */ 
-DATA(insert OID = 7291 ( last_value_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ n ));
+DATA(insert OID = 7291 ( last_value_any  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2277 t "2281 2277" _null_ _null_ _null_ _null_ last_value_generic _null_ _null_ _null_ n ));
 
 /* cume_dist_prelim(internal) => int8 */ 
-DATA(insert OID = 7204 ( cume_dist_prelim  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ cume_dist_prelim _null_ _null_ n ));
+DATA(insert OID = 7204 ( cume_dist_prelim  PGNSP PGUID 12 1 0 0 f f t f i 1 0 20 f "2281" _null_ _null_ _null_ _null_ cume_dist_prelim _null_ _null_ _null_ n ));
 DESCR("window preliminary function");
 
 
 #define CUME_DIST_PRELIM_OID 7204
 #define CUME_DIST_PRELIM_TYPE 20
 /* ntile_prelim_int(internal, int4) => _int8 */ 
-DATA(insert OID = 7205 ( ntile_prelim_int  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "2281 23" _null_ _null_ _null_ _null_ ntile_prelim_int _null_ _null_ n ));
+DATA(insert OID = 7205 ( ntile_prelim_int  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "2281 23" _null_ _null_ _null_ _null_ ntile_prelim_int _null_ _null_ _null_ n ));
 DESCR("window preliminary function");
 
 /* ntile_prelim_bigint(internal, int8) => _int8 */ 
-DATA(insert OID = 7206 ( ntile_prelim_bigint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "2281 20" _null_ _null_ _null_ _null_ ntile_prelim_bigint _null_ _null_ n ));
+DATA(insert OID = 7206 ( ntile_prelim_bigint  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "2281 20" _null_ _null_ _null_ _null_ ntile_prelim_bigint _null_ _null_ _null_ n ));
 DESCR("window preliminary function");
 
 /* ntile_prelim_numeric(internal, "numeric") => _int8 */ 
-DATA(insert OID = 7207 ( ntile_prelim_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "2281 1700" _null_ _null_ _null_ _null_ ntile_prelim_numeric _null_ _null_ n ));
+DATA(insert OID = 7207 ( ntile_prelim_numeric  PGNSP PGUID 12 1 0 0 f f t f i 2 0 1016 f "2281 1700" _null_ _null_ _null_ _null_ ntile_prelim_numeric _null_ _null_ _null_ n ));
 DESCR("window preliminary function");
 
 /* percent_rank_final(int8, int8) => float8 */ 
-DATA(insert OID = 7303 ( percent_rank_final  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 f "20 20" _null_ _null_ _null_ _null_ percent_rank_final _null_ _null_ n ));
+DATA(insert OID = 7303 ( percent_rank_final  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 f "20 20" _null_ _null_ _null_ _null_ percent_rank_final _null_ _null_ _null_ n ));
 DESCR("window final function");
 
 /* cume_dist_final(int8, int8) => float8 */ 
-DATA(insert OID = 7304 ( cume_dist_final  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 f "20 20" _null_ _null_ _null_ _null_ cume_dist_final _null_ _null_ n ));
+DATA(insert OID = 7304 ( cume_dist_final  PGNSP PGUID 12 1 0 0 f f t f i 2 0 701 f "20 20" _null_ _null_ _null_ _null_ cume_dist_final _null_ _null_ _null_ n ));
 DESCR("window final function");
 
 /* ntile_final(_int8, int8) => int8 */ 
-DATA(insert OID = 7305 ( ntile_final  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 f "1016 20" _null_ _null_ _null_ _null_ ntile_final _null_ _null_ n ));
+DATA(insert OID = 7305 ( ntile_final  PGNSP PGUID 12 1 0 0 f f t f i 2 0 20 f "1016 20" _null_ _null_ _null_ _null_ ntile_final _null_ _null_ _null_ n ));
 DESCR("window final function");
 
 /* get_ao_distribution(IN reloid oid, OUT segmentid int4, OUT tupcount float8) => SETOF pg_catalog.record */ 
-DATA(insert OID = 7169 ( get_ao_distribution  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "26" "{26,23,701}" "{i,o,o}" "{reloid,segmentid,tupcount}" _null_ get_ao_distribution_oid _null_ _null_ r ));
+DATA(insert OID = 7169 ( get_ao_distribution  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "26" "{26,23,701}" "{i,o,o}" "{reloid,segmentid,tupcount}" _null_ get_ao_distribution_oid _null_ _null_ _null_ r ));
 DESCR("show append only table tuple distribution across segment databases");
 
 /* get_ao_distribution(IN relname text, OUT segmentid int4, OUT tupcount float8) => SETOF pg_catalog.record */ 
-DATA(insert OID = 7170 ( get_ao_distribution  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "25" "{25,23,701}" "{i,o,o}" "{relname,segmentid,tupcount}" _null_ get_ao_distribution_name _null_ _null_ r ));
+DATA(insert OID = 7170 ( get_ao_distribution  PGNSP PGUID 12 1 1000 0 f f f t v 1 0 2249 f "25" "{25,23,701}" "{i,o,o}" "{relname,segmentid,tupcount}" _null_ get_ao_distribution_name _null_ _null_ _null_ r ));
 DESCR("show append only table tuple distribution across segment databases");
 
 /* get_ao_compression_ratio(oid) => float8 */ 
-DATA(insert OID = 7171 ( get_ao_compression_ratio  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "26" _null_ _null_ _null_ _null_ get_ao_compression_ratio_oid _null_ _null_ r ));
+DATA(insert OID = 7171 ( get_ao_compression_ratio  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "26" _null_ _null_ _null_ _null_ get_ao_compression_ratio_oid _null_ _null_ _null_ r ));
 DESCR("show append only table compression ratio");
 
 /* get_ao_compression_ratio(text) => float8 */ 
-DATA(insert OID = 7172 ( get_ao_compression_ratio  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "25" _null_ _null_ _null_ _null_ get_ao_compression_ratio_name _null_ _null_ r ));
+DATA(insert OID = 7172 ( get_ao_compression_ratio  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "25" _null_ _null_ _null_ _null_ get_ao_compression_ratio_name _null_ _null_ _null_ r ));
 DESCR("show append only table compression ratio");
 
 /* gp_update_ao_master_stats(oid) => float8 */ 
-DATA(insert OID = 7173 ( gp_update_ao_master_stats  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "26" _null_ _null_ _null_ _null_ gp_update_ao_master_stats_oid _null_ _null_ m ));
+DATA(insert OID = 7173 ( gp_update_ao_master_stats  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "26" _null_ _null_ _null_ _null_ gp_update_ao_master_stats_oid _null_ _null_ _null_ m ));
 DESCR("append only tables utility function");
 
 /* gp_update_ao_master_stats(text) => float8 */ 
-DATA(insert OID = 7174 ( gp_update_ao_master_stats  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "25" _null_ _null_ _null_ _null_ gp_update_ao_master_stats_name _null_ _null_ m ));
+DATA(insert OID = 7174 ( gp_update_ao_master_stats  PGNSP PGUID 12 1 0 0 f f f f v 1 0 701 f "25" _null_ _null_ _null_ _null_ gp_update_ao_master_stats_name _null_ _null_ _null_ m ));
 DESCR("append only tables utility function");
 
 /* gp_persistent_build_db(bool) => int4 */ 
-DATA(insert OID = 7178 ( gp_persistent_build_db  PGNSP PGUID 12 1 0 0 f f f f v 1 0 23 f "16" _null_ _null_ _null_ _null_ gp_persistent_build_db _null_ _null_ n ));
+DATA(insert OID = 7178 ( gp_persistent_build_db  PGNSP PGUID 12 1 0 0 f f f f v 1 0 23 f "16" _null_ _null_ _null_ _null_ gp_persistent_build_db _null_ _null_ _null_ n ));
 DESCR("populate the persistent tables and gp_relation_node for the current database");
 
 /* gp_persistent_build_all(bool) => int4 */ 
-DATA(insert OID = 7179 ( gp_persistent_build_all  PGNSP PGUID 12 1 0 0 f f f f v 1 0 23 f "16" _null_ _null_ _null_ _null_ gp_persistent_build_all _null_ _null_ n ));
+DATA(insert OID = 7179 ( gp_persistent_build_all  PGNSP PGUID 12 1 0 0 f f f f v 1 0 23 f "16" _null_ _null_ _null_ _null_ gp_persistent_build_all _null_ _null_ _null_ n ));
 DESCR("populate the persistent tables and gp_relation_node for the whole database instance");
 
 /* gp_persistent_reset_all() => int4 */ 
-DATA(insert OID = 7180 ( gp_persistent_reset_all  PGNSP PGUID 12 1 0 0 f f f f v 0 0 23 f "" _null_ _null_ _null_ _null_ gp_persistent_reset_all _null_ _null_ n ));
+DATA(insert OID = 7180 ( gp_persistent_reset_all  PGNSP PGUID 12 1 0 0 f f f f v 0 0 23 f "" _null_ _null_ _null_ _null_ gp_persistent_reset_all _null_ _null_ _null_ n ));
 DESCR("Remove the persistent tables and gp_relation_node for the whole database instance");
 
 /* gp_persistent_repair_delete(int4, tid) => int4 */ 
-DATA(insert OID = 7181 ( gp_persistent_repair_delete  PGNSP PGUID 12 1 0 0 f f f f v 2 0 23 f "23 27" _null_ _null_ _null_ _null_ gp_persistent_repair_delete _null_ _null_ n ));
+DATA(insert OID = 7181 ( gp_persistent_repair_delete  PGNSP PGUID 12 1 0 0 f f f f v 2 0 23 f "23 27" _null_ _null_ _null_ _null_ gp_persistent_repair_delete _null_ _null_ _null_ n ));
 DESCR("Remove an entry specified by TID from a persistent table for the current database instance");
 
-/* xpath(text, xml, _text) => _xml */ 
-DATA(insert OID = 2983 ( xpath  PGNSP PGUID 12 1 0 0 f f t f i 3 0 143 f "25 142 1009" _null_ _null_ _null_ _null_ xpath _null_ _null_ n ));
-DESCR("evaluate XPath expression, with namespaces support");
-
-/* xpath(text, xml) => _xml */ 
-DATA(insert OID = 2984 ( xpath  PGNSP PGUID 14 1 0 0 f f t f i 2 0 143 f "25 142" _null_ _null_ _null_ _null_ "select pg_catalog.xpath($1, $2, ''{}''::pg_catalog.text[])" _null_ _null_ c ));
-DESCR("evaluate XPath expression");
-
 /* xmlexists(text, xml) => bool */ 
-DATA(insert OID = 2985 ( xmlexists  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "25 142" _null_ _null_ _null_ _null_ xmlexists _null_ _null_ n ));
+DATA(insert OID = 2985 ( xmlexists  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "25 142" _null_ _null_ _null_ _null_ xmlexists _null_ _null_ _null_ n ));
 DESCR("test XML value against XPath expression");
 
 /* xpath_exists(text, xml, _text) => bool */ 
-DATA(insert OID = 2986 ( xpath_exists  PGNSP PGUID 12 1 0 0 f f t f i 3 0 16 f "25 142 1009" _null_ _null_ _null_ _null_ xpath_exists _null_ _null_ n ));
+DATA(insert OID = 2986 ( xpath_exists  PGNSP PGUID 12 1 0 0 f f t f i 3 0 16 f "25 142 1009" _null_ _null_ _null_ _null_ xpath_exists _null_ _null_ _null_ n ));
 DESCR("test XML value against XPath expression, with namespace support");
 
 /* xpath_exists(text, xml) => bool */ 
-DATA(insert OID = 3049 ( xpath_exists  PGNSP PGUID 14 1 0 0 f f t f i 2 0 16 f "25 142" _null_ _null_ _null_ _null_ "select pg_catalog.xpath_exists($1, $2, ''{}''::pg_catalog.text[])" _null_ _null_ c ));
+DATA(insert OID = 3049 ( xpath_exists  PGNSP PGUID 14 1 0 0 f f t f i 2 0 16 f "25 142" _null_ _null_ _null_ _null_ "select pg_catalog.xpath_exists($1, $2, ''{}''::pg_catalog.text[])" _null_ _null_ _null_ c ));
 DESCR("test XML value against XPath expression");
 
 /* xml_is_well_formed(text) => bool */ 
-DATA(insert OID = 2988 ( xml_is_well_formed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 16 f "25" _null_ _null_ _null_ _null_ xml_is_well_formed _null_ _null_ n ));
+DATA(insert OID = 2988 ( xml_is_well_formed  PGNSP PGUID 12 1 0 0 f f t f i 1 0 16 f "25" _null_ _null_ _null_ _null_ xml_is_well_formed _null_ _null_ _null_ n ));
 DESCR("determine if a string is well formed XML");
 
 /* xml_is_well_formed_document(text) => bool */ 
-DATA(insert OID = 2989 ( xml_is_well_formed_document  PGNSP PGUID 12 1 0 0 f f t f i 1 0 16 f "25" _null_ _null_ _null_ _null_ xml_is_well_formed_document _null_ _null_ n ));
+DATA(insert OID = 2989 ( xml_is_well_formed_document  PGNSP PGUID 12 1 0 0 f f t f i 1 0 16 f "25" _null_ _null_ _null_ _null_ xml_is_well_formed_document _null_ _null_ _null_ n ));
 DESCR("determine if a string is well formed XML document");
 
 /* xml_is_well_formed_content(text) => bool */ 
-DATA(insert OID = 2990 ( xml_is_well_formed_content  PGNSP PGUID 12 1 0 0 f f t f i 1 0 16 f "25" _null_ _null_ _null_ _null_ xml_is_well_formed_content _null_ _null_ n ));
+DATA(insert OID = 2990 ( xml_is_well_formed_content  PGNSP PGUID 12 1 0 0 f f t f i 1 0 16 f "25" _null_ _null_ _null_ _null_ xml_is_well_formed_content _null_ _null_ _null_ n ));
 DESCR("determine if a string is well formed XML content");
 
 
 /* the bitmap index access method routines */
 /* bmgettuple(internal, internal) => bool */ 
-DATA(insert OID = 3050 ( bmgettuple  PGNSP PGUID 12 1 0 0 f f t f v 2 0 16 f "2281 2281" _null_ _null_ _null_ _null_ bmgettuple _null_ _null_ n ));
+DATA(insert OID = 3050 ( bmgettuple  PGNSP PGUID 12 1 0 0 f f t f v 2 0 16 f "2281 2281" _null_ _null_ _null_ _null_ bmgettuple _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmgetmulti(internal, internal) => internal */ 
-DATA(insert OID = 3051 ( bmgetmulti  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2281 f "2281 2281" _null_ _null_ _null_ _null_ bmgetmulti _null_ _null_ n ));
+DATA(insert OID = 3051 ( bmgetmulti  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2281 f "2281 2281" _null_ _null_ _null_ _null_ bmgetmulti _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bminsert(internal, internal, internal, internal, internal, internal) => bool */ 
-DATA(insert OID = 3001 ( bminsert  PGNSP PGUID 12 1 0 0 f f t f v 6 0 16 f "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_ _null_ bminsert _null_ _null_ n ));
+DATA(insert OID = 3001 ( bminsert  PGNSP PGUID 12 1 0 0 f f t f v 6 0 16 f "2281 2281 2281 2281 2281 2281" _null_ _null_ _null_ _null_ bminsert _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmbeginscan(internal, internal, internal) => internal */ 
-DATA(insert OID = 3002 ( bmbeginscan  PGNSP PGUID 12 1 0 0 f f t f v 3 0 2281 f "2281 2281 2281" _null_ _null_ _null_ _null_ bmbeginscan _null_ _null_ n ));
+DATA(insert OID = 3002 ( bmbeginscan  PGNSP PGUID 12 1 0 0 f f t f v 3 0 2281 f "2281 2281 2281" _null_ _null_ _null_ _null_ bmbeginscan _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmrescan(internal, internal) => void */ 
-DATA(insert OID = 3003 ( bmrescan  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2278 f "2281 2281" _null_ _null_ _null_ _null_ bmrescan _null_ _null_ n ));
+DATA(insert OID = 3003 ( bmrescan  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2278 f "2281 2281" _null_ _null_ _null_ _null_ bmrescan _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmendscan(internal) => void */ 
-DATA(insert OID = 3004 ( bmendscan  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ bmendscan _null_ _null_ n ));
+DATA(insert OID = 3004 ( bmendscan  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ bmendscan _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmmarkpos(internal) => void */ 
-DATA(insert OID = 3005 ( bmmarkpos  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ bmmarkpos _null_ _null_ n ));
+DATA(insert OID = 3005 ( bmmarkpos  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ bmmarkpos _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmrestrpos(internal) => void */ 
-DATA(insert OID = 3006 ( bmrestrpos  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ bmrestrpos _null_ _null_ n ));
+DATA(insert OID = 3006 ( bmrestrpos  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ bmrestrpos _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmbuild(internal, internal, internal) => internal */ 
-DATA(insert OID = 3007 ( bmbuild  PGNSP PGUID 12 1 0 0 f f t f v 3 0 2281 f "2281 2281 2281" _null_ _null_ _null_ _null_ bmbuild _null_ _null_ n ));
+DATA(insert OID = 3007 ( bmbuild  PGNSP PGUID 12 1 0 0 f f t f v 3 0 2281 f "2281 2281 2281" _null_ _null_ _null_ _null_ bmbuild _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmbulkdelete(internal, internal, internal, internal) => internal */ 
-DATA(insert OID = 3008 ( bmbulkdelete  PGNSP PGUID 12 1 0 0 f f t f v 4 0 2281 f "2281 2281 2281 2281" _null_ _null_ _null_ _null_ bmbulkdelete _null_ _null_ n ));
+DATA(insert OID = 3008 ( bmbulkdelete  PGNSP PGUID 12 1 0 0 f f t f v 4 0 2281 f "2281 2281 2281 2281" _null_ _null_ _null_ _null_ bmbulkdelete _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmvacuumcleanup(internal, internal) => internal */ 
-DATA(insert OID = 3009 ( bmvacuumcleanup  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2281 f "2281 2281" _null_ _null_ _null_ _null_ bmvacuumcleanup _null_ _null_ n ));
+DATA(insert OID = 3009 ( bmvacuumcleanup  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2281 f "2281 2281" _null_ _null_ _null_ _null_ bmvacuumcleanup _null_ _null_ _null_ n ));
 
 /* bmcostestimate(internal, internal, internal, internal, internal, internal, internal, internal) => void */ 
-DATA(insert OID = 3010 ( bmcostestimate  PGNSP PGUID 12 1 0 0 f f t f v 8 0 2278 f "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_ _null_ bmcostestimate _null_ _null_ n ));
+DATA(insert OID = 3010 ( bmcostestimate  PGNSP PGUID 12 1 0 0 f f t f v 8 0 2278 f "2281 2281 2281 2281 2281 2281 2281 2281" _null_ _null_ _null_ _null_ bmcostestimate _null_ _null_ _null_ n ));
 DESCR("bitmap(internal)");
 
 /* bmoptions(_text, bool) => bytea */ 
-DATA(insert OID = 3011 ( bmoptions  PGNSP PGUID 12 1 0 0 f f t f s 2 0 17 f "1009 16" _null_ _null_ _null_ _null_ bmoptions _null_ _null_ n ));
+DATA(insert OID = 3011 ( bmoptions  PGNSP PGUID 12 1 0 0 f f t f s 2 0 17 f "1009 16" _null_ _null_ _null_ _null_ bmoptions _null_ _null_ _null_ n ));
 DESCR("btree(internal)");
 
 
 /* AOCS functions. */
 /* aocsvpinfo_decode(varbit, int4, int4) => int8 */ 
-DATA(insert OID = 9900 ( aocsvpinfo_decode  PGNSP PGUID 12 1 0 0 f f t f i 3 0 20 f "1562 23 23" _null_ _null_ _null_ _null_ aocsvpinfo_decode _null_ _null_ n ));
+DATA(insert OID = 9900 ( aocsvpinfo_decode  PGNSP PGUID 12 1 0 0 f f t f i 3 0 20 f "1562 23 23" _null_ _null_ _null_ _null_ aocsvpinfo_decode _null_ _null_ _null_ n ));
 
 
 /* raises deprecation error */
 /* gp_deprecated() => void */ 
-DATA(insert OID = 9997 ( gp_deprecated  PGNSP PGUID 12 1 0 0 f f f f i 0 0 2278 f "" _null_ _null_ _null_ _null_ gp_deprecated _null_ _null_ n ));
+DATA(insert OID = 9997 ( gp_deprecated  PGNSP PGUID 12 1 0 0 f f f f i 0 0 2278 f "" _null_ _null_ _null_ _null_ gp_deprecated _null_ _null_ _null_ n ));
 DESCR("raises function deprecation error");
 
 
 /* A convenient utility */
 /* pg_objname_to_oid(text) => oid */ 
-DATA(insert OID = 9998 ( pg_objname_to_oid  PGNSP PGUID 12 1 0 0 f f t f i 1 0 26 f "25" _null_ _null_ _null_ _null_ pg_objname_to_oid _null_ _null_ n ));
+DATA(insert OID = 9998 ( pg_objname_to_oid  PGNSP PGUID 12 1 0 0 f f t f i 1 0 26 f "25" _null_ _null_ _null_ _null_ pg_objname_to_oid _null_ _null_ _null_ n ));
 DESCR("convert an object name to oid");
 
 
 /* Fault injection */
 /* gp_fault_inject(int4, int8) => int8 */ 
-DATA(insert OID = 9999 ( gp_fault_inject  PGNSP PGUID 12 1 0 0 f f t f v 2 0 20 f "23 20" _null_ _null_ _null_ _null_ gp_fault_inject _null_ _null_ n ));
+DATA(insert OID = 9999 ( gp_fault_inject  PGNSP PGUID 12 1 0 0 f f t f v 2 0 20 f "23 20" _null_ _null_ _null_ _null_ gp_fault_inject _null_ _null_ _null_ n ));
 DESCR("Greenplum fault testing only");
 
 
 /* Analyze related */
 /* gp_statistics_estimate_reltuples_relpages_oid(oid) => _float4 */ 
-DATA(insert OID = 5032 ( gp_statistics_estimate_reltuples_relpages_oid  PGNSP PGUID 12 1 0 0 f f t f v 1 0 1021 f "26" _null_ _null_ _null_ _null_ gp_statistics_estimate_reltuples_relpages_oid _null_ _null_ n ));
+DATA(insert OID = 5032 ( gp_statistics_estimate_reltuples_relpages_oid  PGNSP PGUID 12 1 0 0 f f t f v 1 0 1021 f "26" _null_ _null_ _null_ _null_ gp_statistics_estimate_reltuples_relpages_oid _null_ _null_ _null_ n ));
 DESCR("Return reltuples/relpages information for relation.");
 
 
 /* Backoff related */
 /* gp_adjust_priority(int4, int4, int4) => int4 */ 
-DATA(insert OID = 5040 ( gp_adjust_priority  PGNSP PGUID 12 1 0 0 f f t f v 3 0 23 f "23 23 23" _null_ _null_ _null_ _null_ gp_adjust_priority_int _null_ _null_ n ));
+DATA(insert OID = 5040 ( gp_adjust_priority  PGNSP PGUID 12 1 0 0 f f t f v 3 0 23 f "23 23 23" _null_ _null_ _null_ _null_ gp_adjust_priority_int _null_ _null_ _null_ n ));
 DESCR("change weight of all the backends for a given session id");
 
 /* gp_adjust_priority(int4, int4, text) => int4 */ 
-DATA(insert OID = 5041 ( gp_adjust_priority  PGNSP PGUID 12 1 0 0 f f t f v 3 0 23 f "23 23 25" _null_ _null_ _null_ _null_ gp_adjust_priority_value _null_ _null_ n ));
+DATA(insert OID = 5041 ( gp_adjust_priority  PGNSP PGUID 12 1 0 0 f f t f v 3 0 23 f "23 23 25" _null_ _null_ _null_ _null_ gp_adjust_priority_value _null_ _null_ _null_ n ));
 DESCR("change weight of all the backends for a given session id");
 
 /* gp_list_backend_priorities() => SETOF record */ 
-DATA(insert OID = 5042 ( gp_list_backend_priorities  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_list_backend_priorities _null_ _null_ n ));
+DATA(insert OID = 5042 ( gp_list_backend_priorities  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 2249 f "" _null_ _null_ _null_ _null_ gp_list_backend_priorities _null_ _null_ _null_ n ));
 DESCR("list priorities of backends");
 
 
 /* elog related */
 /* gp_elog(text) => void */ 
-DATA(insert OID = 5044 ( gp_elog  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2278 f "25" _null_ _null_ _null_ _null_ gp_elog _null_ _null_ n ));
+DATA(insert OID = 5044 ( gp_elog  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2278 f "25" _null_ _null_ _null_ _null_ gp_elog _null_ _null_ _null_ n ));
 DESCR("Insert text into the error log");
 
 /* gp_elog(text, bool) => void */ 
-DATA(insert OID = 5045 ( gp_elog  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2278 f "25 16" _null_ _null_ _null_ _null_ gp_elog _null_ _null_ n ));
+DATA(insert OID = 5045 ( gp_elog  PGNSP PGUID 12 1 0 0 f f t f i 2 0 2278 f "25 16" _null_ _null_ _null_ _null_ gp_elog _null_ _null_ _null_ n ));
 DESCR("Insert text into the error log");
 
 
 /* Segment and master administration functions, see utils/gp/segadmin.c */
 /* gp_add_master_standby(text, text, _text) => int2 */ 
-DATA(insert OID = 5046 ( gp_add_master_standby  PGNSP PGUID 12 1 0 0 f f f f v 3 0 21 f "25 25 1009" _null_ _null_ _null_ _null_ gp_add_master_standby _null_ _null_ n ));
+DATA(insert OID = 5046 ( gp_add_master_standby  PGNSP PGUID 12 1 0 0 f f f f v 3 0 21 f "25 25 1009" _null_ _null_ _null_ _null_ gp_add_master_standby _null_ _null_ _null_ n ));
 DESCR("Perform the catalog operations necessary for adding a new standby");
 
 /* gp_add_master_standby(text, text, _text, int4) => int2 */ 
-DATA(insert OID = 5038 ( gp_add_master_standby  PGNSP PGUID 12 1 0 0 f f f f v 4 0 21 f "25 25 1009 23" _null_ _null_ _null_ _null_ gp_add_master_standby_port _null_ _null_ n ));
+DATA(insert OID = 5038 ( gp_add_master_standby  PGNSP PGUID 12 1 0 0 f f f f v 4 0 21 f "25 25 1009 23" _null_ _null_ _null_ _null_ gp_add_master_standby_port _null_ _null_ _null_ n ));
 DESCR("Perform the catalog operations necessary for adding a new standby");
 
 /* gp_remove_master_standby() => bool */ 
-DATA(insert OID = 5047 ( gp_remove_master_standby  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_remove_master_standby _null_ _null_ n ));
+DATA(insert OID = 5047 ( gp_remove_master_standby  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_remove_master_standby _null_ _null_ _null_ n ));
 DESCR("Remove a master standby from the system catalog");
 
 /* gp_add_segment_mirror(int2, text, text, int4, int4, _text) => int2 */ 
-DATA(insert OID = 5048 ( gp_add_segment_mirror  PGNSP PGUID 12 1 0 0 f f f f v 6 0 21 f "21 25 25 23 23 1009" _null_ _null_ _null_ _null_ gp_add_segment_mirror _null_ _null_ n ));
+DATA(insert OID = 5048 ( gp_add_segment_mirror  PGNSP PGUID 12 1 0 0 f f f f v 6 0 21 f "21 25 25 23 23 1009" _null_ _null_ _null_ _null_ gp_add_segment_mirror _null_ _null_ _null_ n ));
 DESCR("Perform the catalog operations necessary for adding a new segment mirror");
 
 /* gp_remove_segment_mirror(int2) => bool */ 
-DATA(insert OID = 5049 ( gp_remove_segment_mirror  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "21" _null_ _null_ _null_ _null_ gp_remove_segment_mirror _null_ _null_ n ));
+DATA(insert OID = 5049 ( gp_remove_segment_mirror  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "21" _null_ _null_ _null_ _null_ gp_remove_segment_mirror _null_ _null_ _null_ n ));
 DESCR("Remove a segment mirror from the system catalog");
 
 /* gp_add_segment(text, text, int4, _text) => int2 */ 
-DATA(insert OID = 5050 ( gp_add_segment  PGNSP PGUID 12 1 0 0 f f f f v 4 0 21 f "25 25 23 1009" _null_ _null_ _null_ _null_ gp_add_segment _null_ _null_ n ));
+DATA(insert OID = 5050 ( gp_add_segment  PGNSP PGUID 12 1 0 0 f f f f v 4 0 21 f "25 25 23 1009" _null_ _null_ _null_ _null_ gp_add_segment _null_ _null_ _null_ n ));
 DESCR("Perform the catalog operations necessary for adding a new primary segment");
 
 /* gp_remove_segment(int2) => bool */ 
-DATA(insert OID = 5051 ( gp_remove_segment  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "21" _null_ _null_ _null_ _null_ gp_remove_segment _null_ _null_ n ));
+DATA(insert OID = 5051 ( gp_remove_segment  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "21" _null_ _null_ _null_ _null_ gp_remove_segment _null_ _null_ _null_ n ));
 DESCR("Remove a primary segment from the system catalog");
 
 /* gp_prep_new_segment(_text) => bool */ 
-DATA(insert OID = 5052 ( gp_prep_new_segment  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "1009" _null_ _null_ _null_ _null_ gp_prep_new_segment _null_ _null_ n ));
+DATA(insert OID = 5052 ( gp_prep_new_segment  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "1009" _null_ _null_ _null_ _null_ gp_prep_new_segment _null_ _null_ _null_ n ));
 DESCR("Convert a cloned master catalog for use as a segment");
 
 /* gp_activate_standby() => bool */ 
-DATA(insert OID = 5053 ( gp_activate_standby  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_activate_standby _null_ _null_ n ));
+DATA(insert OID = 5053 ( gp_activate_standby  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_activate_standby _null_ _null_ _null_ n ));
 DESCR("Activate a standby");
 
 
 /* We cheat in the following two functions: they are technically volatile but */
 /* we can only dispatch them if they're immutable :(. */
 /* gp_add_segment_persistent_entries(int2, int2, _text) => bool */ 
-DATA(insert OID = 5054 ( gp_add_segment_persistent_entries  PGNSP PGUID 12 1 0 0 f f f f i 3 0 16 f "21 21 1009" _null_ _null_ _null_ _null_ gp_add_segment_persistent_entries _null_ _null_ n ));
+DATA(insert OID = 5054 ( gp_add_segment_persistent_entries  PGNSP PGUID 12 1 0 0 f f f f i 3 0 16 f "21 21 1009" _null_ _null_ _null_ _null_ gp_add_segment_persistent_entries _null_ _null_ _null_ n ));
 DESCR("Persist object nodes on a segment");
 
 /* gp_remove_segment_persistent_entries(int2, int2) => bool */ 
-DATA(insert OID = 5055 ( gp_remove_segment_persistent_entries  PGNSP PGUID 12 1 0 0 f f f f i 2 0 16 f "21 21" _null_ _null_ _null_ _null_ gp_remove_segment_persistent_entries _null_ _null_ n ));
+DATA(insert OID = 5055 ( gp_remove_segment_persistent_entries  PGNSP PGUID 12 1 0 0 f f f f i 2 0 16 f "21 21" _null_ _null_ _null_ _null_ gp_remove_segment_persistent_entries _null_ _null_ _null_ n ));
 DESCR("Remove persistent object node references at a segment");
 
 
 /* persistent table repair functions */
 /* gp_add_persistent_filespace_node_entry(tid, oid, int2, text, int2, text, int2, int8, int2, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5056 ( gp_add_persistent_filespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 13 0 16 f "27 26 21 25 21 25 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_filespace_node_entry _null_ _null_ n ));
+DATA(insert OID = 5056 ( gp_add_persistent_filespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 13 0 16 f "27 26 21 25 21 25 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_filespace_node_entry _null_ _null_ _null_ n ));
 DESCR("Add a new entry to gp_persistent_filespace_node");
 
 /* gp_add_persistent_tablespace_node_entry(tid, oid, oid, int2, int8, int2, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5057 ( gp_add_persistent_tablespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_tablespace_node_entry _null_ _null_ n ));
+DATA(insert OID = 5057 ( gp_add_persistent_tablespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_tablespace_node_entry _null_ _null_ _null_ n ));
 DESCR("Add a new entry to gp_persistent_tablespace_node");
 
 /* gp_add_persistent_database_node_entry(tid, oid, oid, int2, int8, int2, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5058 ( gp_add_persistent_database_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_database_node_entry _null_ _null_ n ));
+DATA(insert OID = 5058 ( gp_add_persistent_database_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_database_node_entry _null_ _null_ _null_ n ));
 DESCR("Add a new entry to gp_persistent_database_node");
 
 /* gp_add_persistent_relation_node_entry(tid, oid, oid, oid, int4, int2, int2, int8, int2, int2, bool, int8, gpxlogloc, int4, int8, int8, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5059 ( gp_add_persistent_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 20 0 16 f "27 26 26 26 23 21 21 20 21 21 16 20 3310 23 20 20 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_relation_node_entry _null_ _null_ n ));
+DATA(insert OID = 5059 ( gp_add_persistent_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 20 0 16 f "27 26 26 26 23 21 21 20 21 21 16 20 3310 23 20 20 23 23 20 27" _null_ _null_ _null_ _null_ gp_add_persistent_relation_node_entry _null_ _null_ _null_ n ));
 DESCR("Add a new entry to gp_persistent_relation_node");
 
 /* gp_add_global_sequence_entry(tid, int8) => bool */ 
-DATA(insert OID = 5060 ( gp_add_global_sequence_entry  PGNSP PGUID 12 1 0 0 f f f f v 2 0 16 f "27 20" _null_ _null_ _null_ _null_ gp_add_global_sequence_entry _null_ _null_ n ));
+DATA(insert OID = 5060 ( gp_add_global_sequence_entry  PGNSP PGUID 12 1 0 0 f f f f v 2 0 16 f "27 20" _null_ _null_ _null_ _null_ gp_add_global_sequence_entry _null_ _null_ _null_ n ));
 DESCR("Add a new entry to gp_global_sequence");
 
 /* gp_add_relation_node_entry(tid, oid, int4, int8, tid, int8) => bool */ 
-DATA(insert OID = 5061 ( gp_add_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 6 0 16 f "27 26 23 20 27 20" _null_ _null_ _null_ _null_ gp_add_relation_node_entry _null_ _null_ n ));
+DATA(insert OID = 5061 ( gp_add_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 6 0 16 f "27 26 23 20 27 20" _null_ _null_ _null_ _null_ gp_add_relation_node_entry _null_ _null_ _null_ n ));
 DESCR("Add a new entry to gp_relation_node");
 
 /* gp_update_persistent_filespace_node_entry(tid, oid, int2, text, int2, text, int2, int8, int2, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5062 ( gp_update_persistent_filespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 13 0 16 f "27 26 21 25 21 25 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_filespace_node_entry _null_ _null_ n ));
+DATA(insert OID = 5062 ( gp_update_persistent_filespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 13 0 16 f "27 26 21 25 21 25 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_filespace_node_entry _null_ _null_ _null_ n ));
 DESCR("Update an entry in gp_persistent_filespace_node");
 
 /* gp_update_persistent_tablespace_node_entry(tid, oid, oid, int2, int8, int2, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5063 ( gp_update_persistent_tablespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_tablespace_node_entry _null_ _null_ n ));
+DATA(insert OID = 5063 ( gp_update_persistent_tablespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_tablespace_node_entry _null_ _null_ _null_ n ));
 DESCR("Update an entry in gp_persistent_tablespace_node");
 
 /* gp_update_persistent_database_node_entry(tid, oid, oid, int2, int8, int2, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5064 ( gp_update_persistent_database_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_database_node_entry _null_ _null_ n ));
+DATA(insert OID = 5064 ( gp_update_persistent_database_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 10 0 16 f "27 26 26 21 20 21 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_database_node_entry _null_ _null_ _null_ n ));
 DESCR("Update an entry in gp_persistent_database_node");
 
 /* gp_update_persistent_relation_node_entry(tid, oid, oid, oid, int4, int2, int2, int8, int2, int2, bool, int8, gpxlogloc, int4, int8, int8, int4, int4, int8, tid) => bool */ 
-DATA(insert OID = 5065 ( gp_update_persistent_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 20 0 16 f "27 26 26 26 23 21 21 20 21 21 16 20 3310 23 20 20 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_relation_node_entry _null_ _null_ n ));
+DATA(insert OID = 5065 ( gp_update_persistent_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 20 0 16 f "27 26 26 26 23 21 21 20 21 21 16 20 3310 23 20 20 23 23 20 27" _null_ _null_ _null_ _null_ gp_update_persistent_relation_node_entry _null_ _null_ _null_ n ));
 DESCR("Update an entry in gp_persistent_relation_node");
 
 /* gp_update_global_sequence_entry(tid, int8) => bool */ 
-DATA(insert OID = 5066 ( gp_update_global_sequence_entry  PGNSP PGUID 12 1 0 0 f f f f v 2 0 16 f "27 20" _null_ _null_ _null_ _null_ gp_update_global_sequence_entry _null_ _null_ n ));
+DATA(insert OID = 5066 ( gp_update_global_sequence_entry  PGNSP PGUID 12 1 0 0 f f f f v 2 0 16 f "27 20" _null_ _null_ _null_ _null_ gp_update_global_sequence_entry _null_ _null_ _null_ n ));
 DESCR("Update an entry in gp_global_sequence");
 
 /* gp_update_relation_node_entry(tid, oid, int4, int8, tid, int8) => bool */ 
-DATA(insert OID = 5067 ( gp_update_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 6 0 16 f "27 26 23 20 27 20" _null_ _null_ _null_ _null_ gp_update_relation_node_entry _null_ _null_ n ));
+DATA(insert OID = 5067 ( gp_update_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 6 0 16 f "27 26 23 20 27 20" _null_ _null_ _null_ _null_ gp_update_relation_node_entry _null_ _null_ _null_ n ));
 DESCR("Update an entry in gp_relation_node");
 
 /* gp_delete_persistent_filespace_node_entry(tid) => bool */ 
-DATA(insert OID = 5068 ( gp_delete_persistent_filespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_filespace_node_entry _null_ _null_ n ));
+DATA(insert OID = 5068 ( gp_delete_persistent_filespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_filespace_node_entry _null_ _null_ _null_ n ));
 DESCR("Remove an entry from gp_persistent_filespace_node");
 
 /* gp_delete_persistent_tablespace_node_entry(tid) => bool */ 
-DATA(insert OID = 5069 ( gp_delete_persistent_tablespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_tablespace_node_entry _null_ _null_ n ));
+DATA(insert OID = 5069 ( gp_delete_persistent_tablespace_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_tablespace_node_entry _null_ _null_ _null_ n ));
 DESCR("Remove an entry from gp_persistent_tablespace_node");
 
 /* gp_delete_persistent_database_node_entry(tid) => bool */ 
-DATA(insert OID = 5070 ( gp_delete_persistent_database_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_database_node_entry _null_ _null_ n ));
+DATA(insert OID = 5070 ( gp_delete_persistent_database_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_database_node_entry _null_ _null_ _null_ n ));
 DESCR("Remove an entry from gp_persistent_database_node");
 
 /* gp_delete_persistent_relation_node_entry(tid) => bool */ 
-DATA(insert OID = 5071 ( gp_delete_persistent_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_relation_node_entry _null_ _null_ n ));
+DATA(insert OID = 5071 ( gp_delete_persistent_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_persistent_relation_node_entry _null_ _null_ _null_ n ));
 DESCR("Remove an entry from gp_persistent_relation_node");
 
 /* gp_delete_global_sequence_entry(tid) => bool */ 
-DATA(insert OID = 5072 ( gp_delete_global_sequence_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_global_sequence_entry _null_ _null_ n ));
+DATA(insert OID = 5072 ( gp_delete_global_sequence_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_global_sequence_entry _null_ _null_ _null_ n ));
 DESCR("Remove an entry from gp_global_sequence");
 
 /* gp_delete_relation_node_entry(tid) => bool */ 
-DATA(insert OID = 5073 ( gp_delete_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_relation_node_entry _null_ _null_ n ));
+DATA(insert OID = 5073 ( gp_delete_relation_node_entry  PGNSP PGUID 12 1 0 0 f f f f v 1 0 16 f "27" _null_ _null_ _null_ _null_ gp_delete_relation_node_entry _null_ _null_ _null_ n ));
 DESCR("Remove an entry from gp_relation_node");
 
 /* gp_persistent_relation_node_check() => SETOF gp_persistent_relation_node */ 
-DATA(insert OID = 5074 ( gp_persistent_relation_node_check  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 6990 f "" _null_ _null_ _null_ _null_ gp_persistent_relation_node_check _null_ _null_ n ));
+DATA(insert OID = 5074 ( gp_persistent_relation_node_check  PGNSP PGUID 12 1 1000 0 f f f t v 0 0 6990 f "" _null_ _null_ _null_ _null_ gp_persistent_relation_node_check _null_ _null_ _null_ n ));
 DESCR("physical filesystem information");
 
 /* gp_dbspecific_ptcat_verification() => bool */ 
-DATA(insert OID = 5075 ( gp_dbspecific_ptcat_verification  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_dbspecific_ptcat_verification _null_ _null_ n ));
+DATA(insert OID = 5075 ( gp_dbspecific_ptcat_verification  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_dbspecific_ptcat_verification _null_ _null_ _null_ n ));
 DESCR("perform database specific PersistentTables-Catalog verification");
 
 /* gp_nondbspecific_ptcat_verification() => bool */ 
-DATA(insert OID = 5080 ( gp_nondbspecific_ptcat_verification  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_nondbspecific_ptcat_verification _null_ _null_ n ));
+DATA(insert OID = 5080 ( gp_nondbspecific_ptcat_verification  PGNSP PGUID 12 1 0 0 f f f f v 0 0 16 f "" _null_ _null_ _null_ _null_ gp_nondbspecific_ptcat_verification _null_ _null_ _null_ n ));
 DESCR("perform non-database specific PersistentTables-Catalog verification");
 
 /* cosh(float8) => float8 */ 
-DATA(insert OID = 3539 ( cosh  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 f "701" _null_ _null_ _null_ _null_ dcosh _null_ _null_ n ));
+DATA(insert OID = 3539 ( cosh  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 f "701" _null_ _null_ _null_ _null_ dcosh _null_ _null_ _null_ n ));
 DESCR("Hyperbolic cosine function");
 
 /* sinh(float8) => float8 */ 
-DATA(insert OID = 3540 ( sinh  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 f "701" _null_ _null_ _null_ _null_ dsinh _null_ _null_ n ));
+DATA(insert OID = 3540 ( sinh  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 f "701" _null_ _null_ _null_ _null_ dsinh _null_ _null_ _null_ n ));
 DESCR("Hyperbolic sine function");
 
 /* tanh(float8) => float8 */ 
-DATA(insert OID = 3541 ( tanh  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 f "701" _null_ _null_ _null_ _null_ dtanh _null_ _null_ n ));
+DATA(insert OID = 3541 ( tanh  PGNSP PGUID 12 1 0 0 f f f f i 1 0 701 f "701" _null_ _null_ _null_ _null_ dtanh _null_ _null_ _null_ n ));
 DESCR("Hyperbolic tangent function");
 
 /* anytable_in(cstring) => anytable */ 
-DATA(insert OID = 3054 ( anytable_in  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3053 f "2275" _null_ _null_ _null_ _null_ anytable_in _null_ _null_ n ));
+DATA(insert OID = 3054 ( anytable_in  PGNSP PGUID 12 1 0 0 f f t f i 1 0 3053 f "2275" _null_ _null_ _null_ _null_ anytable_in _null_ _null_ _null_ n ));
 DESCR("anytable type serialization input function");
 
 /* anytable_out(anytable) => cstring */ 
-DATA(insert OID = 3055 ( anytable_out  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "3053" _null_ _null_ _null_ _null_ anytable_out _null_ _null_ n ));
+DATA(insert OID = 3055 ( anytable_out  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "3053" _null_ _null_ _null_ _null_ anytable_out _null_ _null_ _null_ n ));
 DESCR("anytable type serialization output function");
 
 /* gp_quicklz_constructor(internal, internal, bool) => internal */ 
-DATA(insert OID = 5076 ( gp_quicklz_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ quicklz_constructor _null_ _null_ n ));
+DATA(insert OID = 5076 ( gp_quicklz_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ quicklz_constructor _null_ _null_ _null_ n ));
 DESCR("quicklz constructor");
 
 /* gp_quicklz_destructor(internal) => void */ 
-DATA(insert OID = 5077 ( gp_quicklz_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ quicklz_destructor _null_ _null_ n ));
+DATA(insert OID = 5077 ( gp_quicklz_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ quicklz_destructor _null_ _null_ _null_ n ));
 DESCR("quicklz destructor");
 
 /* gp_quicklz_compress(internal, int4, internal, int4, internal, internal) => void */ 
-DATA(insert OID = 5078 ( gp_quicklz_compress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ quicklz_compress _null_ _null_ n ));
+DATA(insert OID = 5078 ( gp_quicklz_compress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ quicklz_compress _null_ _null_ _null_ n ));
 DESCR("quicklz compressor");
 
 /* gp_quicklz_decompress(internal, int4, internal, int4, internal, internal) => void */ 
-DATA(insert OID = 5079 ( gp_quicklz_decompress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ quicklz_decompress _null_ _null_ n ));
+DATA(insert OID = 5079 ( gp_quicklz_decompress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ quicklz_decompress _null_ _null_ _null_ n ));
 DESCR("quicklz decompressor");
 
 /* gp_quicklz_validator(internal) => void */ 
-DATA(insert OID = 9925 ( gp_quicklz_validator  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2278 f "2281" _null_ _null_ _null_ _null_ quicklz_validator _null_ _null_ n ));
+DATA(insert OID = 9925 ( gp_quicklz_validator  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2278 f "2281" _null_ _null_ _null_ _null_ quicklz_validator _null_ _null_ _null_ n ));
 DESCR("quicklz compression validator");
 
 /* gp_zlib_constructor(internal, internal, bool) => internal */ 
-DATA(insert OID = 9910 ( gp_zlib_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ zlib_constructor _null_ _null_ n ));
+DATA(insert OID = 9910 ( gp_zlib_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ zlib_constructor _null_ _null_ _null_ n ));
 DESCR("zlib constructor");
 
 /* gp_zlib_destructor(internal) => void */ 
-DATA(insert OID = 9911 ( gp_zlib_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ zlib_destructor _null_ _null_ n ));
+DATA(insert OID = 9911 ( gp_zlib_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ zlib_destructor _null_ _null_ _null_ n ));
 DESCR("zlib destructor");
 
 /* gp_zlib_compress(internal, int4, internal, int4, internal, internal) => void */ 
-DATA(insert OID = 9912 ( gp_zlib_compress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ zlib_compress _null_ _null_ n ));
+DATA(insert OID = 9912 ( gp_zlib_compress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ zlib_compress _null_ _null_ _null_ n ));
 DESCR("zlib compressor");
 
 /* gp_zlib_decompress(internal, int4, internal, int4, internal, internal) => void */ 
-DATA(insert OID = 9913 ( gp_zlib_decompress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ zlib_decompress _null_ _null_ n ));
+DATA(insert OID = 9913 ( gp_zlib_decompress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ zlib_decompress _null_ _null_ _null_ n ));
 DESCR("zlib decompressor");
 
 /* gp_zlib_validator(internal) => void */ 
-DATA(insert OID = 9924 ( gp_zlib_validator  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2278 f "2281" _null_ _null_ _null_ _null_ zlib_validator _null_ _null_ n ));
+DATA(insert OID = 9924 ( gp_zlib_validator  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2278 f "2281" _null_ _null_ _null_ _null_ zlib_validator _null_ _null_ _null_ n ));
 DESCR("zlib compression validator");
 
 /* gp_rle_type_constructor(internal, internal, bool) => internal */ 
-DATA(insert OID = 9914 ( gp_rle_type_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ rle_type_constructor _null_ _null_ n ));
+DATA(insert OID = 9914 ( gp_rle_type_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ rle_type_constructor _null_ _null_ _null_ n ));
 DESCR("Type specific RLE constructor");
 
 /* gp_rle_type_destructor(internal) => void */ 
-DATA(insert OID = 9915 ( gp_rle_type_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ rle_type_destructor _null_ _null_ n ));
+DATA(insert OID = 9915 ( gp_rle_type_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2278 f "2281" _null_ _null_ _null_ _null_ rle_type_destructor _null_ _null_ _null_ n ));
 DESCR("Type specific RLE destructor");
 
 /* gp_rle_type_compress(internal, int4, internal, int4, internal, internal) => void */ 
-DATA(insert OID = 9916 ( gp_rle_type_compress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ rle_type_compress _null_ _null_ n ));
+DATA(insert OID = 9916 ( gp_rle_type_compress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ rle_type_compress _null_ _null_ _null_ n ));
 DESCR("Type specific RLE compressor");
 
 /* gp_rle_type_decompress(internal, int4, internal, int4, internal, internal) => void */ 
-DATA(insert OID = 9917 ( gp_rle_type_decompress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ rle_type_decompress _null_ _null_ n ));
+DATA(insert OID = 9917 ( gp_rle_type_decompress  PGNSP PGUID 12 1 0 0 f f f f i 6 0 2278 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ rle_type_decompress _null_ _null_ _null_ n ));
 DESCR("Type specific RLE decompressor");
 
 /* gp_rle_type_validator(internal) => void */ 
-DATA(insert OID = 9923 ( gp_rle_type_validator  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2278 f "2281" _null_ _null_ _null_ _null_ rle_type_validator _null_ _null_ n ));
+DATA(insert OID = 9923 ( gp_rle_type_validator  PGNSP PGUID 12 1 0 0 f f f f i 1 0 2278 f "2281" _null_ _null_ _null_ _null_ rle_type_validator _null_ _null_ _null_ n ));
 DESCR("Type speific RLE compression validator");
 
 /* gp_dummy_compression_constructor(internal, internal, bool) => internal */ 
-DATA(insert OID = 3064 ( gp_dummy_compression_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ dummy_compression_constructor _null_ _null_ n ));
+DATA(insert OID = 3064 ( gp_dummy_compression_constructor  PGNSP PGUID 12 1 0 0 f f f f v 3 0 2281 f "2281 2281 16" _null_ _null_ _null_ _null_ dummy_compression_constructor _null_ _null_ _null_ n ));
 DESCR("Dummy compression destructor");
 
 /* gp_dummy_compression_destructor(internal) => internal */ 
-DATA(insert OID = 3065 ( gp_dummy_compression_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2281 f "2281" _null_ _null_ _null_ _null_ dummy_compression_destructor _null_ _null_ n ));
+DATA(insert OID = 3065 ( gp_dummy_compression_destructor  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2281 f "2281" _null_ _null_ _null_ _null_ dummy_compression_destructor _null_ _null_ _null_ n ));
 DESCR("Dummy compression destructor");
 
 /* gp_dummy_compression_compress(internal, int4, internal, int4, internal, internal) => internal */ 
-DATA(insert OID = 3066 ( gp_dummy_compression_compress  PGNSP PGUID 12 1 0 0 f f f f v 6 0 2281 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ dummy_compression_compress _null_ _null_ n ));
+DATA(insert OID = 3066 ( gp_dummy_compression_compress  PGNSP PGUID 12 1 0 0 f f f f v 6 0 2281 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ dummy_compression_compress _null_ _null_ _null_ n ));
 DESCR("Dummy compression compressor");
 
 /* gp_dummy_compression_decompress(internal, int4, internal, int4, internal, internal) => internal */ 
-DATA(insert OID = 3067 ( gp_dummy_compression_decompress  PGNSP PGUID 12 1 0 0 f f f f v 6 0 2281 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ dummy_compression_decompress _null_ _null_ n ));
+DATA(insert OID = 3067 ( gp_dummy_compression_decompress  PGNSP PGUID 12 1 0 0 f f f f v 6 0 2281 f "2281 23 2281 23 2281 2281" _null_ _null_ _null_ _null_ dummy_compression_decompress _null_ _null_ _null_ n ));
 DESCR("Dummy compression decompressor");
 
 /* gp_dummy_compression_validator(internal) => internal */ 
-DATA(insert OID = 3068 ( gp_dummy_compression_validator  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2281 f "2281" _null_ _null_ _null_ _null_ dummy_compression_validator _null_ _null_ n ));
+DATA(insert OID = 3068 ( gp_dummy_compression_validator  PGNSP PGUID 12 1 0 0 f f f f v 1 0 2281 f "2281" _null_ _null_ _null_ _null_ dummy_compression_validator _null_ _null_ _null_ n ));
 DESCR("Dummy compression validator");
 
 /* linear_interpolate( anyelement, anyelement, int8, anyelement, int8) => int8 */ 
-DATA(insert OID = 6072 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 20 f "2283 2283 20 2283 20" _null_ _null_ _null_ _null_ linterp_int64 _null_ _null_ n ));
+DATA(insert OID = 6072 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 20 f "2283 2283 20 2283 20" _null_ _null_ _null_ _null_ linterp_int64 _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, int4, anyelement, int4) => int4 */ 
-DATA(insert OID = 6073 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 23 f "2283 2283 23 2283 23" _null_ _null_ _null_ _null_ linterp_int32 _null_ _null_ n ));
+DATA(insert OID = 6073 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 23 f "2283 2283 23 2283 23" _null_ _null_ _null_ _null_ linterp_int32 _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, int2, anyelement, int2) => int2 */ 
-DATA(insert OID = 6074 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 21 f "2283 2283 21 2283 21" _null_ _null_ _null_ _null_ linterp_int16 _null_ _null_ n ));
+DATA(insert OID = 6074 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 21 f "2283 2283 21 2283 21" _null_ _null_ _null_ _null_ linterp_int16 _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, float8, anyelement, float8) => float8 */ 
-DATA(insert OID = 6075 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 701 f "2283 2283 701 2283 701" _null_ _null_ _null_ _null_ linterp_float8 _null_ _null_ n ));
+DATA(insert OID = 6075 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 701 f "2283 2283 701 2283 701" _null_ _null_ _null_ _null_ linterp_float8 _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, float4, anyelement, float4) => float4 */ 
-DATA(insert OID = 6076 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 700 f "2283 2283 700 2283 700" _null_ _null_ _null_ _null_ linterp_float4 _null_ _null_ n ));
+DATA(insert OID = 6076 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 700 f "2283 2283 700 2283 700" _null_ _null_ _null_ _null_ linterp_float4 _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, date, anyelement, date) => date */ 
-DATA(insert OID = 6077 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1082 f "2283 2283 1082 2283 1082" _null_ _null_ _null_ _null_ linterp_DateADT _null_ _null_ n ));
+DATA(insert OID = 6077 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1082 f "2283 2283 1082 2283 1082" _null_ _null_ _null_ _null_ linterp_DateADT _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, time, anyelement, time) => time */ 
-DATA(insert OID = 6078 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1083 f "2283 2283 1083 2283 1083" _null_ _null_ _null_ _null_ linterp_TimeADT _null_ _null_ n ));
+DATA(insert OID = 6078 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1083 f "2283 2283 1083 2283 1083" _null_ _null_ _null_ _null_ linterp_TimeADT _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, timestamp, anyelement, timestamp) => timestamp */ 
-DATA(insert OID = 6079 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1114 f "2283 2283 1114 2283 1114" _null_ _null_ _null_ _null_ linterp_Timestamp _null_ _null_ n ));
+DATA(insert OID = 6079 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1114 f "2283 2283 1114 2283 1114" _null_ _null_ _null_ _null_ linterp_Timestamp _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, timestamptz, anyelement, timestamptz) => timestamptz */ 
-DATA(insert OID = 6080 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1184 f "2283 2283 1184 2283 1184" _null_ _null_ _null_ _null_ linterp_TimestampTz _null_ _null_ n ));
+DATA(insert OID = 6080 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1184 f "2283 2283 1184 2283 1184" _null_ _null_ _null_ _null_ linterp_TimestampTz _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, "interval", anyelement, "interval") => "interval" */ 
-DATA(insert OID = 6081 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1186 f "2283 2283 1186 2283 1186" _null_ _null_ _null_ _null_ linterp_Interval _null_ _null_ n ));
+DATA(insert OID = 6081 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1186 f "2283 2283 1186 2283 1186" _null_ _null_ _null_ _null_ linterp_Interval _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* linear_interpolate( anyelement, anyelement, "numeric", anyelement, "numeric") => "numeric" */ 
-DATA(insert OID = 6082 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1700 f "2283 2283 1700 2283 1700" _null_ _null_ _null_ _null_ linterp_Numeric _null_ _null_ n ));
+DATA(insert OID = 6082 ( linear_interpolate  PGNSP PGUID 12 1 0 0 f f t f i 5 0 1700 f "2283 2283 1700 2283 1700" _null_ _null_ _null_ _null_ linterp_Numeric _null_ _null_ _null_ n ));
 DESCR("linear interpolation: x, x0,y0, x1,y1");
 
 /* lead_lag_frame_maker(internal) => internal */ 
-DATA(insert OID = 5081 ( lead_lag_frame_maker  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2281 f "2281" _null_ _null_ _null_ _null_ lead_lag_frame_maker _null_ _null_ n ));
+DATA(insert OID = 5081 ( lead_lag_frame_maker  PGNSP PGUID 12 1 0 0 f f t f v 1 0 2281 f "2281" _null_ _null_ _null_ _null_ lead_lag_frame_maker _null_ _null_ _null_ n ));
 
 /* gp_partition_propagation(int4, oid) => void */ 
-DATA(insert OID = 6083 ( gp_partition_propagation  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2278 f "23 26" _null_ _null_ _null_ _null_ gp_partition_propagation _null_ _null_ n ));
+DATA(insert OID = 6083 ( gp_partition_propagation  PGNSP PGUID 12 1 0 0 f f t f v 2 0 2278 f "23 26" _null_ _null_ _null_ _null_ gp_partition_propagation _null_ _null_ _null_ n ));
 DESCR("inserts a partition oid into specified pid-index");
 
 /* gp_partition_selection(oid, anyelement) => oid */ 
-DATA(insert OID = 6084 ( gp_partition_selection  PGNSP PGUID 12 1 0 0 f f t f s 2 0 26 f "26 2283" _null_ _null_ _null_ _null_ gp_partition_selection _null_ _null_ n ));
+DATA(insert OID = 6084 ( gp_partition_selection  PGNSP PGUID 12 1 0 0 f f t f s 2 0 26 f "26 2283" _null_ _null_ _null_ _null_ gp_partition_selection _null_ _null_ _null_ n ));
 DESCR("selects the child partition oid which satisfies a given partition key value");
 
 /* gp_partition_expansion(oid) => setof oid */ 
-DATA(insert OID = 6085 ( gp_partition_expansion  PGNSP PGUID 12 1 1000 0 f f t t s 1 0 26 f "26" _null_ _null_ _null_ _null_ gp_partition_expansion _null_ _null_ n ));
+DATA(insert OID = 6085 ( gp_partition_expansion  PGNSP PGUID 12 1 1000 0 f f t t s 1 0 26 f "26" _null_ _null_ _null_ _null_ gp_partition_expansion _null_ _null_ _null_ n ));
 DESCR("finds all child partition oids for the given parent oid");
 
 /* gp_partition_inverse(oid) => setof record */ 
-DATA(insert OID = 6086 ( gp_partition_inverse  PGNSP PGUID 12 1 1000 0 f f t t s 1 0 2249 f "26" _null_ _null_ _null_ _null_ gp_partition_inverse _null_ _null_ n ));
+DATA(insert OID = 6086 ( gp_partition_inverse  PGNSP PGUID 12 1 1000 0 f f t t s 1 0 2249 f "26" _null_ _null_ _null_ _null_ gp_partition_inverse _null_ _null_ _null_ n ));
 DESCR("returns all child partitition oids with their constraints for a given parent oid");
 
 /* disable_xform(text) => text */ 
-DATA(insert OID = 6087 ( disable_xform  PGNSP PGUID 12 1 0 0 f f t f i 1 0 25 f "25" _null_ _null_ _null_ _null_ disable_xform _null_ _null_ n ));
+DATA(insert OID = 6087 ( disable_xform  PGNSP PGUID 12 1 0 0 f f t f i 1 0 25 f "25" _null_ _null_ _null_ _null_ disable_xform _null_ _null_ _null_ n ));
 DESCR("disables transformations in the optimizer");
 
 /* enable_xform(text) => text */ 
-DATA(insert OID = 6088 ( enable_xform  PGNSP PGUID 12 1 0 0 f f t f i 1 0 25 f "25" _null_ _null_ _null_ _null_ enable_xform _null_ _null_ n ));
+DATA(insert OID = 6088 ( enable_xform  PGNSP PGUID 12 1 0 0 f f t f i 1 0 25 f "25" _null_ _null_ _null_ _null_ enable_xform _null_ _null_ _null_ n ));
 DESCR("enables transformations in the optimizer");
 
 /* gp_opt_version() => text */ 
-DATA(insert OID = 6089 ( gp_opt_version  PGNSP PGUID 12 1 0 0 f f t f i 0 0 25 f "" _null_ _null_ _null_ _null_ gp_opt_version _null_ _null_ n ));
+DATA(insert OID = 6089 ( gp_opt_version  PGNSP PGUID 12 1 0 0 f f t f i 0 0 25 f "" _null_ _null_ _null_ _null_ gp_opt_version _null_ _null_ _null_ n ));
 DESCR("Returns the optimizer and gpos library versions");
 
 
   /* functions for the complex data type */
 /* complex_in(cstring) => complex */ 
-DATA(insert OID = 3991 ( complex_in  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "2275" _null_ _null_ _null_ _null_ complex_in _null_ _null_ n ));
+DATA(insert OID = 3991 ( complex_in  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "2275" _null_ _null_ _null_ _null_ complex_in _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* complex_out(complex) => cstring */ 
-DATA(insert OID = 3548 ( complex_out  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "195" _null_ _null_ _null_ _null_ complex_out _null_ _null_ n ));
+DATA(insert OID = 3548 ( complex_out  PGNSP PGUID 12 1 0 0 f f t f i 1 0 2275 f "195" _null_ _null_ _null_ _null_ complex_out _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* complex_recv(internal) => complex */ 
-DATA(insert OID = 3549 ( complex_recv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "2281" _null_ _null_ _null_ _null_ complex_recv _null_ _null_ n ));
+DATA(insert OID = 3549 ( complex_recv  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "2281" _null_ _null_ _null_ _null_ complex_recv _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* complex_send(complex) => bytea */ 
-DATA(insert OID = 3550 ( complex_send  PGNSP PGUID 12 1 0 0 f f t f i 1 0 17 f "195" _null_ _null_ _null_ _null_ complex_send _null_ _null_ n ));
+DATA(insert OID = 3550 ( complex_send  PGNSP PGUID 12 1 0 0 f f t f i 1 0 17 f "195" _null_ _null_ _null_ _null_ complex_send _null_ _null_ _null_ n ));
 DESCR("I/O");
 
 /* complex(float8, float8) => complex */ 
-DATA(insert OID = 3551 ( complex  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "701 701" _null_ _null_ _null_ _null_ construct_complex _null_ _null_ n ));
+DATA(insert OID = 3551 ( complex  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "701 701" _null_ _null_ _null_ _null_ construct_complex _null_ _null_ _null_ n ));
 DESCR("constructs a complex number with given real part and imaginary part");
 
 /* complex_trig(float8, float8) => complex */ 
-DATA(insert OID = 3552 ( complex_trig  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "701 701" _null_ _null_ _null_ _null_ construct_complex_trig _null_ _null_ n ));
+DATA(insert OID = 3552 ( complex_trig  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "701 701" _null_ _null_ _null_ _null_ construct_complex_trig _null_ _null_ _null_ n ));
 DESCR("constructs a complex number with given magnitude and phase");
 
 /* re(complex) => float8 */ 
-DATA(insert OID = 3553 ( re  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_re _null_ _null_ n ));
+DATA(insert OID = 3553 ( re  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_re _null_ _null_ _null_ n ));
 DESCR("returns the real part of the argument");
 
 /* im(complex) => float8 */ 
-DATA(insert OID = 3554 ( im  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_im _null_ _null_ n ));
+DATA(insert OID = 3554 ( im  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_im _null_ _null_ _null_ n ));
 DESCR("returns the imaginary part of the argument");
 
 /* radians(complex) => float8 */ 
-DATA(insert OID = 3555 ( radians  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_arg _null_ _null_ n ));
+DATA(insert OID = 3555 ( radians  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_arg _null_ _null_ _null_ n ));
 DESCR("returns the phase of the argument");
 
 /* complexabs(complex) => float8 */ 
-DATA(insert OID = 3556 ( complexabs  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_mag _null_ _null_ n ));
+DATA(insert OID = 3556 ( complexabs  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_mag _null_ _null_ _null_ n ));
 DESCR("returns the magnitude of the argument");
 
 /* abs(complex) => float8 */ 
-DATA(insert OID = 3557 ( abs  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_mag _null_ _null_ n ));
+DATA(insert OID = 3557 ( abs  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_mag _null_ _null_ _null_ n ));
 DESCR("returns the magnitude of the argument");
 
 /* conj(complex) => complex */ 
-DATA(insert OID = 3558 ( conj  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_conj _null_ _null_ n ));
+DATA(insert OID = 3558 ( conj  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_conj _null_ _null_ _null_ n ));
 DESCR("returns the conjunction of the argument");
 
 /* hashcomplex(complex) => int4 */ 
-DATA(insert OID = 3559 ( hashcomplex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 23 f "195" _null_ _null_ _null_ _null_ complex_hash _null_ _null_ n ));
+DATA(insert OID = 3559 ( hashcomplex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 23 f "195" _null_ _null_ _null_ _null_ complex_hash _null_ _null_ _null_ n ));
 DESCR("hash");
 
 /* complex_eq(complex, complex) => bool */ 
-DATA(insert OID = 3560 ( complex_eq  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_eq _null_ _null_ n ));
+DATA(insert OID = 3560 ( complex_eq  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_eq _null_ _null_ _null_ n ));
 DESCR("equal");
 
 /* complex_ne(complex, complex) => bool */ 
-DATA(insert OID = 3561 ( complex_ne  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_ne _null_ _null_ n ));
+DATA(insert OID = 3561 ( complex_ne  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_ne _null_ _null_ _null_ n ));
 DESCR("not equal");
 
 /* complex_pl(complex, complex) => complex */ 
-DATA(insert OID = 3562 ( complex_pl  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_pl _null_ _null_ n ));
+DATA(insert OID = 3562 ( complex_pl  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_pl _null_ _null_ _null_ n ));
 DESCR("plus");
 
 /* complex_up(complex) => complex */ 
-DATA(insert OID = 3563 ( complex_up  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_up _null_ _null_ n ));
+DATA(insert OID = 3563 ( complex_up  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_up _null_ _null_ _null_ n ));
 DESCR("unary plus");
 
 /* complex_mi(complex, complex) => complex */ 
-DATA(insert OID = 3564 ( complex_mi  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_mi _null_ _null_ n ));
+DATA(insert OID = 3564 ( complex_mi  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_mi _null_ _null_ _null_ n ));
 DESCR("minus");
 
 /* complex_um(complex) => complex */ 
-DATA(insert OID = 3565 ( complex_um  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_um _null_ _null_ n ));
+DATA(insert OID = 3565 ( complex_um  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_um _null_ _null_ _null_ n ));
 DESCR("unary minus");
 
 /* complex_mul(complex, complex) => complex */ 
-DATA(insert OID = 3566 ( complex_mul  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_mul _null_ _null_ n ));
+DATA(insert OID = 3566 ( complex_mul  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_mul _null_ _null_ _null_ n ));
 DESCR("multiply");
 
 /* complex_div(complex, complex) => complex */ 
-DATA(insert OID = 3567 ( complex_div  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_div _null_ _null_ n ));
+DATA(insert OID = 3567 ( complex_div  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_div _null_ _null_ _null_ n ));
 DESCR("divide");
 
 /* complex_power(complex, complex) => complex */ 
-DATA(insert OID = 3568 ( complex_power  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_pow _null_ _null_ n ));
+DATA(insert OID = 3568 ( complex_power  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_pow _null_ _null_ _null_ n ));
 DESCR("exponentiation (x^y)");
 
 /* complex_sqrt(complex) => complex */ 
-DATA(insert OID = 3569 ( complex_sqrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_sqrt _null_ _null_ n ));
+DATA(insert OID = 3569 ( complex_sqrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_sqrt _null_ _null_ _null_ n ));
 DESCR("squre root");
 
 /* complex_cbrt(complex) => complex */ 
-DATA(insert OID = 3570 ( complex_cbrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cbrt _null_ _null_ n ));
+DATA(insert OID = 3570 ( complex_cbrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cbrt _null_ _null_ _null_ n ));
 DESCR("cube root");
 
 /* degrees(complex) => float8 */ 
-DATA(insert OID = 3571 ( degrees  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_degrees _null_ _null_ n ));
+DATA(insert OID = 3571 ( degrees  PGNSP PGUID 12 1 0 0 f f t f i 1 0 701 f "195" _null_ _null_ _null_ _null_ complex_degrees _null_ _null_ _null_ n ));
 DESCR("phase to degrees");
 
 /* exp(complex) => complex */ 
-DATA(insert OID = 3572 ( exp  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_exp _null_ _null_ n ));
+DATA(insert OID = 3572 ( exp  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_exp _null_ _null_ _null_ n ));
 DESCR("natural exponential (e^x)");
 
 /* ln(complex) => complex */ 
-DATA(insert OID = 3573 ( ln  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_ln _null_ _null_ n ));
+DATA(insert OID = 3573 ( ln  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_ln _null_ _null_ _null_ n ));
 DESCR("natural logarithm");
 
 /* log(complex) => complex */ 
-DATA(insert OID = 3574 ( log  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_log10 _null_ _null_ n ));
+DATA(insert OID = 3574 ( log  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_log10 _null_ _null_ _null_ n ));
 DESCR("base 10 logarithm");
 
 /* log(complex, complex) => complex */ 
-DATA(insert OID = 3575 ( log  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_log _null_ _null_ n ));
+DATA(insert OID = 3575 ( log  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_log _null_ _null_ _null_ n ));
 DESCR("logarithm base arg1 of arg2");
 
 /* acos(complex) => complex */ 
-DATA(insert OID = 3576 ( acos  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_acos _null_ _null_ n ));
+DATA(insert OID = 3576 ( acos  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_acos _null_ _null_ _null_ n ));
 DESCR("acos");
 
 /* asin(complex) => complex */ 
-DATA(insert OID = 3577 ( asin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_asin _null_ _null_ n ));
+DATA(insert OID = 3577 ( asin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_asin _null_ _null_ _null_ n ));
 DESCR("asin");
 
 /* atan(complex) => complex */ 
-DATA(insert OID = 3578 ( atan  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_atan _null_ _null_ n ));
+DATA(insert OID = 3578 ( atan  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_atan _null_ _null_ _null_ n ));
 DESCR("atan");
 
 /* cos(complex) => complex */ 
-DATA(insert OID = 3579 ( cos  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cos _null_ _null_ n ));
+DATA(insert OID = 3579 ( cos  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cos _null_ _null_ _null_ n ));
 DESCR("cos");
 
 /* cot(complex) => complex */ 
-DATA(insert OID = 3580 ( cot  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cot _null_ _null_ n ));
+DATA(insert OID = 3580 ( cot  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cot _null_ _null_ _null_ n ));
 DESCR("cot");
 
 /* sin(complex) => complex */ 
-DATA(insert OID = 3581 ( sin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_sin _null_ _null_ n ));
+DATA(insert OID = 3581 ( sin  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_sin _null_ _null_ _null_ n ));
 DESCR("sin");
 
 /* tan(complex) => complex */ 
-DATA(insert OID = 3582 ( tan  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_tan _null_ _null_ n ));
+DATA(insert OID = 3582 ( tan  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_tan _null_ _null_ _null_ n ));
 DESCR("tan");
 
 /* dotproduct(_complex, _complex) => complex */ 
-DATA(insert OID = 3583 ( dotproduct  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "196 196" _null_ _null_ _null_ _null_ complex_dot_product _null_ _null_ n ));
+DATA(insert OID = 3583 ( dotproduct  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "196 196" _null_ _null_ _null_ _null_ complex_dot_product _null_ _null_ _null_ n ));
 DESCR("dot product");
 
 /* float82complex(float8) => complex */ 
-DATA(insert OID = 3584 ( float82complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "701" _null_ _null_ _null_ _null_ float82complex _null_ _null_ n ));
+DATA(insert OID = 3584 ( float82complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "701" _null_ _null_ _null_ _null_ float82complex _null_ _null_ _null_ n ));
 DESCR("(internal) type cast from float8 to complex");
 
 /* float42complex(float4) => complex */ 
-DATA(insert OID = 3585 ( float42complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "700" _null_ _null_ _null_ _null_ float42complex _null_ _null_ n ));
+DATA(insert OID = 3585 ( float42complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "700" _null_ _null_ _null_ _null_ float42complex _null_ _null_ _null_ n ));
 DESCR("(internal) type cast from float4 to complex");
 
 /* int82complex(int8) => complex */ 
-DATA(insert OID = 3586 ( int82complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "20" _null_ _null_ _null_ _null_ int82complex _null_ _null_ n ));
+DATA(insert OID = 3586 ( int82complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "20" _null_ _null_ _null_ _null_ int82complex _null_ _null_ _null_ n ));
 DESCR("(internal) type cast from int8 to complex");
 
 /* int42complex(int4) => complex */ 
-DATA(insert OID = 3587 ( int42complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "23" _null_ _null_ _null_ _null_ int42complex _null_ _null_ n ));
+DATA(insert OID = 3587 ( int42complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "23" _null_ _null_ _null_ _null_ int42complex _null_ _null_ _null_ n ));
 DESCR("(internal) type cast from int4 to complex");
 
 /* int22complex(int2) => complex */ 
-DATA(insert OID = 3588 ( int22complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "21" _null_ _null_ _null_ _null_ int22complex _null_ _null_ n ));
+DATA(insert OID = 3588 ( int22complex  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "21" _null_ _null_ _null_ _null_ int22complex _null_ _null_ _null_ n ));
 DESCR("(internal) type cast from int2 to complex");
 
 /* power(complex, complex) => complex */ 
-DATA(insert OID = 3589 ( power  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_pow _null_ _null_ n ));
+DATA(insert OID = 3589 ( power  PGNSP PGUID 12 1 0 0 f f t f i 2 0 195 f "195 195" _null_ _null_ _null_ _null_ complex_pow _null_ _null_ _null_ n ));
 DESCR("exponentiation (x^y)");
 
 /* sqrt(complex) => complex */ 
-DATA(insert OID = 3590 ( sqrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_sqrt _null_ _null_ n ));
+DATA(insert OID = 3590 ( sqrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_sqrt _null_ _null_ _null_ n ));
 DESCR("squre root");
 
 /* cbrt(complex) => complex */ 
-DATA(insert OID = 3591 ( cbrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cbrt _null_ _null_ n ));
+DATA(insert OID = 3591 ( cbrt  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "195" _null_ _null_ _null_ _null_ complex_cbrt _null_ _null_ _null_ n ));
 DESCR("cube root");
 
 /* numeric2point("numeric") => complex */ 
-DATA(insert OID = 3592 ( numeric2point  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "1700" _null_ _null_ _null_ _null_ numeric2complex _null_ _null_ n ));
+DATA(insert OID = 3592 ( numeric2point  PGNSP PGUID 12 1 0 0 f f t f i 1 0 195 f "1700" _null_ _null_ _null_ _null_ numeric2complex _null_ _null_ _null_ n ));
 DESCR("(internal) type cast from numeric to complex");
 
 /* complex_lt(complex, complex) => bool */ 
-DATA(insert OID = 3593 ( complex_lt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_lt _null_ _null_ n ));
+DATA(insert OID = 3593 ( complex_lt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_lt _null_ _null_ _null_ n ));
 DESCR("less than");
 
 /* complex_gt(complex, complex) => bool */ 
-DATA(insert OID = 3594 ( complex_gt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_gt _null_ _null_ n ));
+DATA(insert OID = 3594 ( complex_gt  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_gt _null_ _null_ _null_ n ));
 DESCR("greater than");
 
 /* complex_lte(complex, complex) => bool */ 
-DATA(insert OID = 3595 ( complex_lte  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_lte _null_ _null_ n ));
+DATA(insert OID = 3595 ( complex_lte  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_lte _null_ _null_ _null_ n ));
 DESCR("less than or equal");
 
 /* complex_gte(complex, complex) => bool */ 
-DATA(insert OID = 3596 ( complex_gte  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_gte _null_ _null_ n ));
+DATA(insert OID = 3596 ( complex_gte  PGNSP PGUID 12 1 0 0 f f t f i 2 0 16 f "195 195" _null_ _null_ _null_ _null_ complex_gte _null_ _null_ _null_ n ));
 DESCR("greater than or equal");
 
 
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 84ca660d69be..dbe37b2d7ad3 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_rewrite.h,v 1.27 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_rewrite.h,v 1.29 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -33,6 +33,7 @@
    ev_class    oid, 
    ev_attr     smallint, 
    ev_type     "char", 
+   ev_enabled  "char", 
    is_instead  boolean, 
    ev_qual     text, 
    ev_action   text
@@ -59,6 +60,7 @@ CATALOG(pg_rewrite,2618)
 	Oid			ev_class;
 	int2		ev_attr;
 	char		ev_type;
+	char		ev_enabled;
 	bool		is_instead;
 
 	/* NB: remaining fields must be accessed via heap_getattr */
@@ -77,13 +79,14 @@ typedef FormData_pg_rewrite *Form_pg_rewrite;
  *		compiler constants for pg_rewrite
  * ----------------
  */
-#define Natts_pg_rewrite				7
+#define Natts_pg_rewrite				8
 #define Anum_pg_rewrite_rulename		1
 #define Anum_pg_rewrite_ev_class		2
 #define Anum_pg_rewrite_ev_attr			3
 #define Anum_pg_rewrite_ev_type			4
-#define Anum_pg_rewrite_is_instead		5
-#define Anum_pg_rewrite_ev_qual			6
-#define Anum_pg_rewrite_ev_action		7
+#define Anum_pg_rewrite_ev_enabled		5
+#define Anum_pg_rewrite_is_instead		6
+#define Anum_pg_rewrite_ev_qual			7
+#define Anum_pg_rewrite_ev_action		8
 
 #endif   /* PG_REWRITE_H */
diff --git a/src/include/catalog/pg_shdepend.h b/src/include/catalog/pg_shdepend.h
index bb59488e25d9..cfbe928eb724 100644
--- a/src/include/catalog/pg_shdepend.h
+++ b/src/include/catalog/pg_shdepend.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_shdepend.h,v 1.5 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_shdepend.h,v 1.6 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_shdescription.h b/src/include/catalog/pg_shdescription.h
index 96702212c1cc..a34cf6036cd5 100644
--- a/src/include/catalog/pg_shdescription.h
+++ b/src/include/catalog/pg_shdescription.h
@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_shdescription.h,v 1.4 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_shdescription.h,v 1.5 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index fcda412a9474..ad4745cc7f87 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_statistic.h,v 1.32 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_statistic.h,v 1.34 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -219,7 +219,9 @@ typedef FormData_pg_statistic *Form_pg_statistic;
  *				(values in this range will be documented in this file)
  *	100-199:	reserved for assignment by the PostGIS project
  *				(values to be documented in PostGIS documentation)
- *	200-9999:	reserved for future public assignments
+ *	200-299:	reserved for assignment by the ESRI ST_Geometry project
+ *				(values to be documented in ESRI ST_Geometry documentation)
+ *	300-9999:	reserved for future public assignments
  *
  * For private use you may choose a "kind" code at random in the range
  * 10000-30000.  However, for code that is to be widely disseminated it is
diff --git a/src/include/catalog/pg_tablespace.h b/src/include/catalog/pg_tablespace.h
index 2f348af9afeb..6f3f01c09fbe 100644
--- a/src/include/catalog/pg_tablespace.h
+++ b/src/include/catalog/pg_tablespace.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_tablespace.h,v 1.9 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_tablespace.h,v 1.10 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index 6d7c173b2189..c73744ed0352 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_trigger.h,v 1.27 2007/02/14 01:58:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_trigger.h,v 1.30 2008/01/01 19:45:57 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -30,7 +30,7 @@
    tgname          name, 
    tgfoid          oid, 
    tgtype          smallint, 
-   tgenabled       boolean, 
+   tgenabled       "char", 
    tgisconstraint  boolean, 
    tgconstrname    name, 
    tgconstrrelid   oid, 
@@ -74,7 +74,8 @@ CATALOG(pg_trigger,2620)
 	Oid			tgfoid;			/* OID of function to be called */
 	int2		tgtype;			/* BEFORE/AFTER UPDATE/DELETE/INSERT
 								 * ROW/STATEMENT; see below */
-	bool		tgenabled;		/* trigger is enabled/disabled */
+	char		tgenabled;		/* trigger's firing configuration WRT
+								 * session_replication_role */
 	bool		tgisconstraint; /* trigger is a constraint trigger */
 	NameData	tgconstrname;	/* constraint name */
 	Oid			tgconstrrelid;	/* constraint's FROM table, if any */
diff --git a/src/include/catalog/pg_ts_config.h b/src/include/catalog/pg_ts_config.h
new file mode 100644
index 000000000000..cf4049797fc3
--- /dev/null
+++ b/src/include/catalog/pg_ts_config.h
@@ -0,0 +1,86 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_ts_config.h
+ *	definition of configuration of tsearch
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/catalog/pg_ts_config.h,v 1.3 2008/01/01 19:45:57 momjian Exp $
+ *
+ * NOTES
+ *		the genbki.sh script reads this file and generates .bki
+ *		information from the DATA() statements.
+ *
+ *		XXX do NOT break up DATA() statements into multiple lines!
+ *			the scripts are not as smart as you might think...
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_TS_CONFIG_H
+#define PG_TS_CONFIG_H
+
+/* ----------------
+ *		postgres.h contains the system type definitions and the
+ *		CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file
+ *		can be read by both genbki.sh and the C compiler.
+ * ----------------
+ */
+
+/* TIDYCAT_BEGINFAKEDEF
+
+   CREATE TABLE pg_ts_config
+   with (relid=3602)
+   (
+   cfgname         name,
+   cfgnamespace    oid,
+   cfgowner        oid,
+   cfgparser       oid
+   );
+
+   create unique index on pg_ts_config(cfgname, cfgnamespace) with (indexid=3608, CamelCase=TSConfigNameNsp);
+   create unique index on pg_ts_config(oid) with (indexid=3712, CamelCase=TSConfigOid);
+
+   alter table pg_ts_config add fk cfgnamespace on pg_namespace(oid);
+   alter table pg_ts_config add fk cfgowner on pg_authid(oid);
+   alter table pg_ts_config add fk cfgparser on pg_ts_parser(oid);
+
+   TIDYCAT_ENDFAKEDEF
+*/
+
+/* ----------------
+ *		pg_ts_config definition.  cpp turns this into
+ *		typedef struct FormData_pg_ts_config
+ * ----------------
+ */
+#define TSConfigRelationId	3602
+
+CATALOG(pg_ts_config,3602)
+{
+	NameData	cfgname;		/* name of configuration */
+	Oid			cfgnamespace;	/* name space */
+	Oid			cfgowner;		/* owner */
+	Oid			cfgparser;		/* OID of parser (in pg_ts_parser) */
+} FormData_pg_ts_config;
+
+typedef FormData_pg_ts_config *Form_pg_ts_config;
+
+/* ----------------
+ *		compiler constants for pg_ts_config
+ * ----------------
+ */
+#define Natts_pg_ts_config				4
+#define Anum_pg_ts_config_cfgname		1
+#define Anum_pg_ts_config_cfgnamespace	2
+#define Anum_pg_ts_config_cfgowner		3
+#define Anum_pg_ts_config_cfgparser		4
+
+/* ----------------
+ *		initial contents of pg_ts_config
+ * ----------------
+ */
+DATA(insert OID = 3748 ( "simple" PGNSP PGUID 3722 ));
+DESCR("simple configuration");
+
+#endif   /* PG_TS_CONFIG_H */
diff --git a/src/include/catalog/pg_ts_config_map.h b/src/include/catalog/pg_ts_config_map.h
new file mode 100644
index 000000000000..f3b7f6d0b50c
--- /dev/null
+++ b/src/include/catalog/pg_ts_config_map.h
@@ -0,0 +1,102 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_ts_config_map.h
+ *	definition of token mappings for configurations of tsearch
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/catalog/pg_ts_config_map.h,v 1.3 2008/01/01 19:45:57 momjian Exp $
+ *
+ * NOTES
+ *		the genbki.sh script reads this file and generates .bki
+ *		information from the DATA() statements.
+ *
+ *		XXX do NOT break up DATA() statements into multiple lines!
+ *			the scripts are not as smart as you might think...
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_TS_CONFIG_MAP_H
+#define PG_TS_CONFIG_MAP_H
+
+/* ----------------
+ *		postgres.h contains the system type definitions and the
+ *		CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file
+ *		can be read by both genbki.sh and the C compiler.
+ * ----------------
+ */
+
+/* TIDYCAT_BEGINFAKEDEF
+
+   CREATE TABLE pg_ts_config_map
+   with (relid=3603)
+   (
+   mapcfg          oid,
+   maptokentype    integer,
+   mapseqno        integer,
+   mapdict         oid
+   );
+
+   create unique index on pg_ts_config_map(mapcfg, maptokentype, mapseqno) with (indexid=3608, CamelCase=TSConfigMap);
+
+   alter table pg_ts_config_map add fk mapcfg on pg_ts_config(oid);
+   alter table pg_ts_config_map add fk mapdict on pg_ts_dict(oid);
+
+   TIDYCAT_ENDFAKEDEF
+*/
+
+/* ----------------
+ *		pg_ts_config_map definition.  cpp turns this into
+ *		typedef struct FormData_pg_ts_config_map
+ * ----------------
+ */
+#define TSConfigMapRelationId	3603
+
+CATALOG(pg_ts_config_map,3603) BKI_WITHOUT_OIDS
+{
+	Oid			mapcfg;			/* OID of configuration owning this entry */
+	int4		maptokentype;	/* token type from parser */
+	int4		mapseqno;		/* order in which to consult dictionaries */
+	Oid			mapdict;		/* dictionary to consult */
+} FormData_pg_ts_config_map;
+
+typedef FormData_pg_ts_config_map *Form_pg_ts_config_map;
+
+/* ----------------
+ *		compiler constants for pg_ts_config_map
+ * ----------------
+ */
+#define Natts_pg_ts_config_map				4
+#define Anum_pg_ts_config_map_mapcfg		1
+#define Anum_pg_ts_config_map_maptokentype	2
+#define Anum_pg_ts_config_map_mapseqno		3
+#define Anum_pg_ts_config_map_mapdict		4
+
+/* ----------------
+ *		initial contents of pg_ts_config_map
+ * ----------------
+ */
+
+DATA(insert ( 3748	1	1	3765 ));
+DATA(insert ( 3748	2	1	3765 ));
+DATA(insert ( 3748	3	1	3765 ));
+DATA(insert ( 3748	4	1	3765 ));
+DATA(insert ( 3748	5	1	3765 ));
+DATA(insert ( 3748	6	1	3765 ));
+DATA(insert ( 3748	7	1	3765 ));
+DATA(insert ( 3748	8	1	3765 ));
+DATA(insert ( 3748	9	1	3765 ));
+DATA(insert ( 3748	10	1	3765 ));
+DATA(insert ( 3748	11	1	3765 ));
+DATA(insert ( 3748	15	1	3765 ));
+DATA(insert ( 3748	16	1	3765 ));
+DATA(insert ( 3748	17	1	3765 ));
+DATA(insert ( 3748	18	1	3765 ));
+DATA(insert ( 3748	19	1	3765 ));
+DATA(insert ( 3748	20	1	3765 ));
+DATA(insert ( 3748	21	1	3765 ));
+DATA(insert ( 3748	22	1	3765 ));
+
+#endif   /* PG_TS_CONFIG_MAP_H */
diff --git a/src/include/catalog/pg_ts_dict.h b/src/include/catalog/pg_ts_dict.h
new file mode 100644
index 000000000000..6a88dbd64e68
--- /dev/null
+++ b/src/include/catalog/pg_ts_dict.h
@@ -0,0 +1,90 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_ts_dict.h
+ *	definition of dictionaries for tsearch
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/catalog/pg_ts_dict.h,v 1.3 2008/01/01 19:45:57 momjian Exp $
+ *
+ * NOTES
+ *		the genbki.sh script reads this file and generates .bki
+ *		information from the DATA() statements.
+ *
+ *		XXX do NOT break up DATA() statements into multiple lines!
+ *			the scripts are not as smart as you might think...
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_TS_DICT_H
+#define PG_TS_DICT_H
+
+/* ----------------
+ *		postgres.h contains the system type definitions and the
+ *		CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file
+ *		can be read by both genbki.sh and the C compiler.
+ * ----------------
+ */
+
+/* TIDYCAT_BEGINFAKEDEF
+
+   CREATE TABLE pg_ts_dict
+   with (relid=3600, toast=true)
+   (
+   dictname        name,
+   dictnamespace   oid,
+   dictowner       oid,
+   dicttemplate    oid,
+   dictinitoption  text
+   );
+
+   create unique index on pg_ts_dict(dictname, dictnamespace) with (indexid=3604, CamelCase=TSDictionaryNameNsp);
+   create unique index on pg_ts_dict(oid) with (indexid=3605, CamelCase=TSDictionaryOid);
+
+   alter table pg_ts_dict add fk dictnamespace on pg_namespace(oid);
+   alter table pg_ts_dict add fk dictowner on pg_authid(oid);
+   alter table pg_ts_dict add fk dicttemplate on pg_ts_template(oid);
+
+   TIDYCAT_ENDFAKEDEF
+*/
+
+/* ----------------
+ *		pg_ts_dict definition.	cpp turns this into
+ *		typedef struct FormData_pg_ts_dict
+ * ----------------
+ */
+#define TSDictionaryRelationId	3600
+
+CATALOG(pg_ts_dict,3600)
+{
+	NameData	dictname;		/* dictionary name */
+	Oid			dictnamespace;	/* name space */
+	Oid			dictowner;		/* owner */
+	Oid			dicttemplate;	/* dictionary's template */
+	text		dictinitoption; /* options passed to dict_init() */
+} FormData_pg_ts_dict;
+
+typedef FormData_pg_ts_dict *Form_pg_ts_dict;
+
+/* ----------------
+ *		compiler constants for pg_ts_dict
+ * ----------------
+ */
+#define Natts_pg_ts_dict				5
+#define Anum_pg_ts_dict_dictname		1
+#define Anum_pg_ts_dict_dictnamespace	2
+#define Anum_pg_ts_dict_dictowner		3
+#define Anum_pg_ts_dict_dicttemplate	4
+#define Anum_pg_ts_dict_dictinitoption	5
+
+/* ----------------
+ *		initial contents of pg_ts_dict
+ * ----------------
+ */
+
+DATA(insert OID = 3765 ( "simple" PGNSP PGUID 3727 _null_));
+DESCR("simple dictionary: just lower case and check for stopword");
+
+#endif   /* PG_TS_DICT_H */
diff --git a/src/include/catalog/pg_ts_parser.h b/src/include/catalog/pg_ts_parser.h
new file mode 100644
index 000000000000..470a60289bcd
--- /dev/null
+++ b/src/include/catalog/pg_ts_parser.h
@@ -0,0 +1,98 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_ts_parser.h
+ *	definition of parsers for tsearch
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/catalog/pg_ts_parser.h,v 1.3 2008/01/01 19:45:57 momjian Exp $
+ *
+ * NOTES
+ *		the genbki.sh script reads this file and generates .bki
+ *		information from the DATA() statements.
+ *
+ *		XXX do NOT break up DATA() statements into multiple lines!
+ *			the scripts are not as smart as you might think...
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_TS_PARSER_H
+#define PG_TS_PARSER_H
+
+/* ----------------
+ *		postgres.h contains the system type definitions and the
+ *		CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file
+ *		can be read by both genbki.sh and the C compiler.
+ * ----------------
+ */
+
+/* TIDYCAT_BEGINFAKEDEF
+
+   CREATE TABLE pg_ts_parser
+   with (relid=3601)
+   (
+   prsname         name,
+   prsnamespace    oid,
+   prsstart        regproc,
+   prstoken        regproc,
+   prsend          regproc,
+   prsheadline     regproc,
+   prslextype      regproc
+  );
+
+   create unique index on pg_ts_parser(prsname, prsnamespace) with (indexid=3606, CamelCase=TSParserNameNsp);
+   create unique index on pg_ts_parser(oid) with (indexid=3607, CamelCase=TSParserOid);
+
+   alter table pg_ts_parser add fk prsnamespace on pg_namespace(oid);
+   alter table pg_ts_parser add fk prsstart on pg_proc(oid);
+   alter table pg_ts_parser add fk prsend on pg_proc(oid);
+   alter table pg_ts_parser add fk prsheadline on pg_proc(oid);
+   alter table pg_ts_parser add fk prslextype on pg_proc(oid);
+
+   TIDYCAT_ENDFAKEDEF
+*/
+
+/* ----------------
+ *		pg_ts_parser definition.  cpp turns this into
+ *		typedef struct FormData_pg_ts_parser
+ * ----------------
+ */
+#define TSParserRelationId	3601
+
+CATALOG(pg_ts_parser,3601)
+{
+	NameData	prsname;		/* parser's name */
+	Oid			prsnamespace;	/* name space */
+	regproc		prsstart;		/* init parsing session */
+	regproc		prstoken;		/* return next token */
+	regproc		prsend;			/* finalize parsing session */
+	regproc		prsheadline;	/* return data for headline creation */
+	regproc		prslextype;		/* return descriptions of lexeme's types */
+} FormData_pg_ts_parser;
+
+typedef FormData_pg_ts_parser *Form_pg_ts_parser;
+
+/* ----------------
+ *		compiler constants for pg_ts_parser
+ * ----------------
+ */
+#define Natts_pg_ts_parser					7
+#define Anum_pg_ts_parser_prsname			1
+#define Anum_pg_ts_parser_prsnamespace		2
+#define Anum_pg_ts_parser_prsstart			3
+#define Anum_pg_ts_parser_prstoken			4
+#define Anum_pg_ts_parser_prsend			5
+#define Anum_pg_ts_parser_prsheadline		6
+#define Anum_pg_ts_parser_prslextype		7
+
+/* ----------------
+ *		initial contents of pg_ts_parser
+ * ----------------
+ */
+
+DATA(insert OID = 3722 ( "default" PGNSP prsd_start prsd_nexttoken prsd_end prsd_headline prsd_lextype ));
+DESCR("default word parser");
+
+#endif   /* PG_TS_PARSER_H */
diff --git a/src/include/catalog/pg_ts_template.h b/src/include/catalog/pg_ts_template.h
new file mode 100644
index 000000000000..cc78e122d40f
--- /dev/null
+++ b/src/include/catalog/pg_ts_template.h
@@ -0,0 +1,93 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_ts_template.h
+ *	definition of dictionary templates for tsearch
+ *
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/catalog/pg_ts_template.h,v 1.4 2008/01/01 19:45:57 momjian Exp $
+ *
+ * NOTES
+ *		the genbki.sh script reads this file and generates .bki
+ *		information from the DATA() statements.
+ *
+ *		XXX do NOT break up DATA() statements into multiple lines!
+ *			the scripts are not as smart as you might think...
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_TS_TEMPLATE_H
+#define PG_TS_TEMPLATE_H
+
+/* ----------------
+ *		postgres.h contains the system type definitions and the
+ *		CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file
+ *		can be read by both genbki.sh and the C compiler.
+ * ----------------
+ */
+
+/* TIDYCAT_BEGINFAKEDEF
+
+   CREATE TABLE pg_ts_template
+   with (relid=3600)
+   (
+   tmplname        name,
+   tmplnamespace   oid,
+   tmplinit        regproc,
+   tmpllexize      regproc
+   );
+
+   create unique index on pg_ts_template(tmplname, tmplnamespace) with (indexid=3766, CamelCase=TSTemplateNameNsp);
+   create unique index on pg_ts_template(oid) with (indexid=3767, CamelCase=TSTemplateOid);
+
+   alter table pg_ts_template add fk tmplnamespace on pg_namespace(oid);
+   alter table pg_ts_template add fk tmplinit on pg_proc(oid);
+   alter table pg_ts_template add fk tmpllexize on pg_proc(oid);
+
+   TIDYCAT_ENDFAKEDEF
+*/
+
+/* ----------------
+ *		pg_ts_template definition.	cpp turns this into
+ *		typedef struct FormData_pg_ts_template
+ * ----------------
+ */
+#define TSTemplateRelationId	3764
+
+CATALOG(pg_ts_template,3764)
+{
+	NameData	tmplname;		/* template name */
+	Oid			tmplnamespace;	/* name space */
+	regproc		tmplinit;		/* initialization method of dict (may be 0) */
+	regproc		tmpllexize;		/* base method of dictionary */
+} FormData_pg_ts_template;
+
+typedef FormData_pg_ts_template *Form_pg_ts_template;
+
+/* ----------------
+ *		compiler constants for pg_ts_template
+ * ----------------
+ */
+#define Natts_pg_ts_template				4
+#define Anum_pg_ts_template_tmplname		1
+#define Anum_pg_ts_template_tmplnamespace	2
+#define Anum_pg_ts_template_tmplinit		3
+#define Anum_pg_ts_template_tmpllexize		4
+
+/* ----------------
+ *		initial contents of pg_ts_template
+ * ----------------
+ */
+
+DATA(insert OID = 3727 ( "simple" PGNSP dsimple_init dsimple_lexize ));
+DESCR("simple dictionary: just lower case and check for stopword");
+DATA(insert OID = 3730 ( "synonym" PGNSP dsynonym_init dsynonym_lexize ));
+DESCR("synonym dictionary: replace word by its synonym");
+DATA(insert OID = 3733 ( "ispell" PGNSP dispell_init dispell_lexize ));
+DESCR("ispell dictionary");
+DATA(insert OID = 3742 ( "thesaurus" PGNSP thesaurus_init thesaurus_lexize ));
+DESCR("thesaurus dictionary: phrase by phrase substitution");
+
+#endif   /* PG_TS_TEMPLATE_H */
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 8cf4ea20b110..6080cb675454 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.180 2007/01/28 16:16:54 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.191.2.1 2009/02/24 01:38:49 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -123,7 +123,7 @@ CATALOG(pg_type,1247) BKI_BOOTSTRAP
 
 	/*
 	 * typtype is 'b' for a base type, 'c' for a composite type (e.g., a
-	 * table's rowtype), 'd' for a domain type, or 'p'
+	 * table's rowtype), 'd' for a domain type, 'e' for an enum type, or 'p'
 	 * for a pseudo-type.  (Use the TYPTYPE macros below.)
 	 *
 	 * If typtype is 'c', typrelid is the OID of the class' entry in pg_class.
@@ -155,7 +155,7 @@ CATALOG(pg_type,1247) BKI_BOOTSTRAP
 
 	/*
 	 * If there is a "true" array type having this type as element type,
-	 *  typarray links to it.  Zero if no associated "true" array type.
+	 * typarray links to it.  Zero if no associated "true" array type.
 	 */
 	Oid			typarray;
 
@@ -170,8 +170,8 @@ CATALOG(pg_type,1247) BKI_BOOTSTRAP
 	/*
 	 * I/O functions for optional type modifiers.
 	 */
-	 regproc	typmodin;
-	 regproc	typmodout;
+	regproc		typmodin;
+	regproc		typmodout;
 
 	/*
 	 * Custom ANALYZE procedure for the datatype (0 selects the default).
@@ -320,7 +320,7 @@ typedef FormData_pg_type *Form_pg_type;
  * TypInfo[] in bootstrap.c.
  */
 
-/* OIDS 1 - 99  */
+/* OIDS 1 - 99 */
 DATA(insert OID = 16 (	bool	   PGNSP PGUID	1 t b t \054 0	 0 1000 boolin boolout boolrecv boolsend - - - c p f 0 -1 0 _null_ _null_ ));
 DESCR("boolean, 'true'/'false'");
 #define BOOLOID			16
@@ -329,19 +329,19 @@ DATA(insert OID = 17 (	bytea	   PGNSP PGUID -1 f b t \054 0	0 1001 byteain bytea
 DESCR("variable-length string, binary values escaped");
 #define BYTEAOID		17
 
-DATA(insert OID = 18 (	char	   PGNSP PGUID	1 t b t \054 0	0 1002 charin charout charrecv charsend - - - c p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 18 (	char	   PGNSP PGUID	1 t b t \054 0	 0 1002 charin charout charrecv charsend - - - c p f 0 -1 0 _null_ _null_ ));
 DESCR("single character");
 #define CHAROID			18
 
-DATA(insert OID = 19 (	name	   PGNSP PGUID NAMEDATALEN f b t \054 0	18 1003 namein nameout namerecv namesend - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 19 (	name	   PGNSP PGUID NAMEDATALEN f b t \054 0 18 1003 namein nameout namerecv namesend - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("63-character type for storing system identifiers");
 #define NAMEOID			19
 
-DATA(insert OID = 20 (	int8	   PGNSP PGUID	8 t b t \054 0	0 1016 int8in int8out int8recv int8send - - - d p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 20 (	int8	   PGNSP PGUID	8 t b t \054 0	 0 1016 int8in int8out int8recv int8send - - - d p f 0 -1 0 _null_ _null_ ));
 DESCR("~18 digit integer, 8-byte storage");
 #define INT8OID			20
 
-DATA(insert OID = 21 (	int2	   PGNSP PGUID	2 t b t \054 0	0 1005 int2in int2out int2recv int2send - - - s p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 21 (	int2	   PGNSP PGUID	2 t b t \054 0	 0 1005 int2in int2out int2recv int2send - - - s p f 0 -1 0 _null_ _null_ ));
 DESCR("-32 thousand to 32 thousand, 2-byte storage");
 #define INT2OID			21
 
@@ -349,11 +349,11 @@ DATA(insert OID = 22 (	int2vector PGNSP PGUID -1 f b t \054 0	21 1006 int2vector
 DESCR("array of int2, used in system tables");
 #define INT2VECTOROID	22
 
-DATA(insert OID = 23 (	int4	   PGNSP PGUID	4 t b t \054 0	0 1007 int4in int4out int4recv int4send - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 23 (	int4	   PGNSP PGUID	4 t b t \054 0	 0 1007 int4in int4out int4recv int4send - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("-2 billion to 2 billion integer, 4-byte storage");
 #define INT4OID			23
 
-DATA(insert OID = 24 (	regproc    PGNSP PGUID	4 t b t \054 0	0 1008 regprocin regprocout regprocrecv regprocsend - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 24 (	regproc    PGNSP PGUID	4 t b t \054 0	 0 1008 regprocin regprocout regprocrecv regprocsend - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("registered procedure");
 #define REGPROCOID		24
 
@@ -361,19 +361,19 @@ DATA(insert OID = 25 (	text	   PGNSP PGUID -1 f b t \054 0	0 1009 textin textout
 DESCR("variable-length string, no limit specified");
 #define TEXTOID			25
 
-DATA(insert OID = 26 (	oid		   PGNSP PGUID	4 t b t \054 0	0 1028 oidin oidout oidrecv oidsend - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 26 (	oid		   PGNSP PGUID	4 t b t \054 0	 0 1028 oidin oidout oidrecv oidsend - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("object identifier(oid), maximum 4 billion");
 #define OIDOID			26
 
-DATA(insert OID = 27 (	tid		   PGNSP PGUID	6 f b t \054 0	0 1010 tidin tidout tidrecv tidsend - - - s p f 0 -1 0 _null_ _null_ ));
-DESCR("(Block, offset), physical location of tuple");
+DATA(insert OID = 27 (	tid		   PGNSP PGUID	6 f b t \054 0	 0 1010 tidin tidout tidrecv tidsend - - - s p f 0 -1 0 _null_ _null_ ));
+DESCR("(block, offset), physical location of tuple");
 #define TIDOID		27
 
-DATA(insert OID = 28 (	xid		   PGNSP PGUID	4 t b t \054 0	0 1011 xidin xidout xidrecv xidsend - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 28 (	xid		   PGNSP PGUID	4 t b t \054 0	 0 1011 xidin xidout xidrecv xidsend - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("transaction id");
 #define XIDOID 28
 
-DATA(insert OID = 29 (	cid		   PGNSP PGUID	4 t b t \054 0	0 1012 cidin cidout cidrecv cidsend - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 29 (	cid		   PGNSP PGUID	4 t b t \054 0	 0 1012 cidin cidout cidrecv cidsend - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("command identifier type, sequence in transaction id");
 #define CIDOID 29
 
@@ -392,19 +392,19 @@ DATA(insert OID = 81 (	pg_proc			PGNSP PGUID -1 f c t \054 1255 0 0 record_in re
 DATA(insert OID = 83 (	pg_class		PGNSP PGUID -1 f c t \054 1259 0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
 #define PG_CLASS_RELTYPE_OID 83
 
-DATA(insert OID = 2967 (	pg_authid	   PGNSP PGUID -1 f c t \054 1260	0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2967 (	pg_authid	   PGNSP PGUID -1 f c t \054 1260 0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
 #define PG_AUTHID_RELTYPE_OID 2967
 
-DATA(insert OID = 2966 (	pg_auth_members	   PGNSP PGUID -1 f c t \054 1261	0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2966 (	pg_auth_members	   PGNSP PGUID -1 f c t \054 1261 0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
 #define PG_AUTH_MEMBERS_RELTYPE_OID 2966
 
-DATA(insert OID = 2970 (	pg_database	   PGNSP PGUID -1 f c t \054 1262	0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
-#define PG_DATABASE_RELTYPE_OID 2970
+DATA(insert OID = 6996 (	pg_database	   PGNSP PGUID -1 f c t \054 1262 0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
+#define PG_DATABASE_RELTYPE_OID 6996
 
-DATA(insert OID = 6995 (	gp_global_sequence	   PGNSP PGUID -1 f c t \054 5096	0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 6995 (	gp_global_sequence	   PGNSP PGUID -1 f c t \054 5096 0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
 #define GP_GLOBAL_SEQUENCE_RELTYPE_OID 6995
 
-/*  OIDS 100 - 199 */
+/* OIDS 100 - 199 */
 DATA(insert OID = 142 ( xml		   PGNSP PGUID -1 f b t \054 0 0 143 xml_in xml_out xml_recv xml_send - - - i x f 0 -1 0 _null_ _null_ ));
 DESCR("XML content");
 #define XMLOID 142
@@ -465,7 +465,7 @@ DESCR("relative, limited-range time interval (Unix delta time)");
 DATA(insert OID = 704 (  tinterval PGNSP PGUID 12 f b t \054 0	 0 1025 tintervalin tintervalout tintervalrecv tintervalsend - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("(abstime,abstime), time interval");
 #define TINTERVALOID	704
-DATA(insert OID = 705 (  unknown   PGNSP PGUID -2 f b t \054 0	0 0 unknownin unknownout unknownrecv unknownsend - - - c p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 705 (  unknown   PGNSP PGUID -2 f b t \054 0	 0 0 unknownin unknownout unknownrecv unknownsend - - - c p f 0 -1 0 _null_ _null_ ));
 DESCR("");
 #define UNKNOWNOID		705
 
@@ -482,10 +482,10 @@ DATA(insert OID = 791 (  _money    PGNSP PGUID	-1 f b t \054 0  790 0 array_in a
 DATA(insert OID = 829 ( macaddr    PGNSP PGUID	6 f b t \054 0 0 1040 macaddr_in macaddr_out macaddr_recv macaddr_send - - - i p f 0 -1 0 _null_ _null_ ));
 DESCR("XX:XX:XX:XX:XX:XX, MAC address");
 #define MACADDROID 829
-DATA(insert OID = 869 ( inet	   PGNSP PGUID	-1 f b t \054 0 0 1041 inet_in inet_out inet_recv inet_send - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 869 ( inet	   PGNSP PGUID	-1 f b t \054 0 0 1041 inet_in inet_out inet_recv inet_send - - - i m f 0 -1 0 _null_ _null_ ));
 DESCR("IP address/netmask, host address, netmask optional");
 #define INETOID 869
-DATA(insert OID = 650 ( cidr	   PGNSP PGUID	-1 f b t \054 0 0 651 cidr_in cidr_out cidr_recv cidr_send - - - i p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 650 ( cidr	   PGNSP PGUID	-1 f b t \054 0 0 651 cidr_in cidr_out cidr_recv cidr_send - - - i m f 0 -1 0 _null_ _null_ ));
 DESCR("network IP address/netmask, network address");
 #define CIDROID 650
 
@@ -509,7 +509,6 @@ DATA(insert OID = 1028 (  _oid		 PGNSP PGUID -1 f b t \054 0	26 0 array_in array
 DATA(insert OID = 1010 (  _tid		 PGNSP PGUID -1 f b t \054 0	27 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1011 (  _xid		 PGNSP PGUID -1 f b t \054 0	28 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1012 (  _cid		 PGNSP PGUID -1 f b t \054 0	29 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1263 (	_cstring	   PGNSP PGUID -1 f b t \054 0	2275 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1013 (  _oidvector PGNSP PGUID -1 f b t \054 0	30 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1014 (  _bpchar	 PGNSP PGUID -1 f b t \054 0 1042 0 array_in array_out array_recv array_send bpchartypmodin bpchartypmodout - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1015 (  _varchar	 PGNSP PGUID -1 f b t \054 0 1043 0 array_in array_out array_recv array_send varchartypmodin varchartypmodout - i x f 0 -1 0 _null_ _null_ ));
@@ -532,8 +531,10 @@ DESCR("access control list");
 #define ACLITEMOID		1033
 DATA(insert OID = 1034 (  _aclitem	 PGNSP PGUID -1 f b t \054 0 1033 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1040 (  _macaddr	 PGNSP PGUID -1 f b t \054 0  829 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 1041 (  _inet    PGNSP PGUID -1 f b t \054 0	869 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
-DATA(insert OID = 651  (  _cidr    PGNSP PGUID -1 f b t \054 0	650 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1041 (  _inet		 PGNSP PGUID -1 f b t \054 0  869 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 651  (  _cidr		 PGNSP PGUID -1 f b t \054 0  650 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 1263 (  _cstring	 PGNSP PGUID -1 f b t \054 0 2275 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+#define CSTRINGARRAYOID		1263
 DATA(insert OID = 1042 ( bpchar		 PGNSP PGUID -1 f b t \054 0	0 1014 bpcharin bpcharout bpcharrecv bpcharsend bpchartypmodin bpchartypmodout - i x f 0 -1 0 _null_ _null_ ));
 DESCR("char(length), blank-padded string, fixed storage length");
 #define BPCHAROID		1042
@@ -623,10 +624,37 @@ DATA(insert OID = 2211 ( _regtype	   PGNSP PGUID -1 f b t \054 0 2206 0 array_in
 #define REGTYPEARRAYOID 2211
 
 /* uuid */
-DATA(insert OID = 2950 (	uuid	   PGNSP PGUID 16 f b t \054 0	0 2951 uuid_in uuid_out uuid_recv uuid_send - - - c p f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2950 ( uuid			PGNSP PGUID 16 f b t \054 0 0 2951 uuid_in uuid_out uuid_recv uuid_send - - - c p f 0 -1 0 _null_ _null_ ));
 DESCR("UUID datatype");
 #define UUIDOID		2950
-DATA(insert OID = 2951 (	_uuid	   PGNSP PGUID -1 f b t \054 0	2950 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 2951 ( _uuid			PGNSP PGUID -1 f b t \054 0 2950 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+
+/* text search */
+DATA(insert OID = 3614 ( tsvector		PGNSP PGUID -1 f b t \054 0 0 3643 tsvectorin tsvectorout tsvectorrecv tsvectorsend - - - i x f 0 -1 0 _null_ _null_ ));
+DESCR("text representation for text search");
+#define TSVECTOROID		3614
+DATA(insert OID = 3642 ( gtsvector		PGNSP PGUID -1 f b t \054 0 0 3644 gtsvectorin gtsvectorout - - - - - i p f 0 -1 0 _null_ _null_ ));
+DESCR("GiST index internal text representation for text search");
+#define GTSVECTOROID	3642
+DATA(insert OID = 3615 ( tsquery		PGNSP PGUID -1 f b t \054 0 0 3645 tsqueryin tsqueryout tsqueryrecv tsquerysend - - - i p f 0 -1 0 _null_ _null_ ));
+DESCR("query representation for text search");
+#define TSQUERYOID		3615
+DATA(insert OID = 3734 ( regconfig		PGNSP PGUID 4 t b t \054 0 0 3735 regconfigin regconfigout regconfigrecv regconfigsend - - - i p f 0 -1 0 _null_ _null_ ));
+DESCR("registered text search configuration");
+#define REGCONFIGOID	3734
+DATA(insert OID = 3769 ( regdictionary	PGNSP PGUID 4 t b t \054 0 0 3770 regdictionaryin regdictionaryout regdictionaryrecv regdictionarysend - - - i p f 0 -1 0 _null_ _null_ ));
+DESCR("registered text search dictionary");
+#define REGDICTIONARYOID	3769
+
+DATA(insert OID = 3643 ( _tsvector		PGNSP PGUID -1 f b t \054 0 3614 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 3644 ( _gtsvector		PGNSP PGUID -1 f b t \054 0 3642 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 3645 ( _tsquery		PGNSP PGUID -1 f b t \054 0 3615 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 3735 ( _regconfig		PGNSP PGUID -1 f b t \054 0 3734 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+DATA(insert OID = 3770 ( _regdictionary PGNSP PGUID -1 f b t \054 0 3769 0 array_in array_out array_recv array_send - - - i x f 0 -1 0 _null_ _null_ ));
+
+DATA(insert OID = 2970 ( txid_snapshot	PGNSP PGUID -1 f b t \054 0 0 2949 txid_snapshot_in txid_snapshot_out txid_snapshot_recv txid_snapshot_send - - - d x f 0 -1 0 _null_ _null_ ));
+DESCR("txid snapshot");
+DATA(insert OID = 2949 ( _txid_snapshot PGNSP PGUID -1 f b t \054 0 2970 0 array_in array_out array_recv array_send - - - d x f 0 -1 0 _null_ _null_ ));
 
 DATA(insert OID = 3251 (	nb_classification	   PGNSP PGUID -1 f c t \054 3250	0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
 
@@ -657,7 +685,6 @@ DATA(insert OID = 2249 ( record			PGNSP PGUID -1 f p t \054 0 0 0 record_in reco
 #define RECORDOID		2249
 DATA(insert OID = 2275 ( cstring		PGNSP PGUID -2 f p t \054 0 0 1263 cstring_in cstring_out cstring_recv cstring_send - - - c p f 0 -1 0 _null_ _null_ ));
 #define CSTRINGOID		2275
-#define CSTRINGARRAYOID	1263
 DATA(insert OID = 2276 ( any			PGNSP PGUID  4 t p t \054 0 0 0 any_in any_out - - - - - i p f 0 -1 0 _null_ _null_ ));
 #define ANYOID			2276
 DATA(insert OID = 2277 ( anyarray		PGNSP PGUID -1 f p t \054 0 0 0 anyarray_in anyarray_out anyarray_recv anyarray_send - - - d x f 0 -1 0 _null_ _null_ ));
@@ -674,6 +701,11 @@ DATA(insert OID = 2282 ( opaque			PGNSP PGUID  4 t p t \054 0 0 0 opaque_in opaq
 #define OPAQUEOID		2282
 DATA(insert OID = 2283 ( anyelement		PGNSP PGUID  4 t p t \054 0 0 0 anyelement_in anyelement_out - - - - - i p f 0 -1 0 _null_ _null_ ));
 #define ANYELEMENTOID	2283
+DATA(insert OID = 2776 ( anynonarray	PGNSP PGUID  4 t p t \054 0 0 0 anynonarray_in anynonarray_out - - - - - i p f 0 -1 0 _null_ _null_ ));
+#define ANYNONARRAYOID	2776
+DATA(insert OID = 3500 ( anyenum		PGNSP PGUID  4 t p t \054 0 0 0 anyenum_in anyenum_out - - - - - i p f 0 -1 0 _null_ _null_ ));
+#define ANYENUMOID		3500
+
 DATA(insert OID = 3053 (	anytable	   PGNSP PGUID -1 f p t \054 0	0 0 anytable_in anytable_out - - - - - d x f 0 -1 0 _null_ _null_ ));
 DESCR("Represents a generic TABLE value expression");
 #define ANYTABLEOID     3053
@@ -731,9 +763,9 @@ DATA(insert OID = 6994 (gp_relation_node PGNSP PGUID -1 f c t \054 5094 0 0 reco
 /* Is a type OID a polymorphic pseudotype?	(Beware of multiple evaluation) */
 #define IsPolymorphicType(typid)  \
 	((typid) == ANYELEMENTOID || \
-	 (typid) == ANYARRAYOID)
-	 //(typid) == ANYNONARRAYOID || \   /// added in pg 8.4
-	// (typid) == ANYENUMOID)
+	 (typid) == ANYARRAYOID || \
+	 (typid) == ANYNONARRAYOID || \
+	 (typid) == ANYENUMOID)
 
 /* Is a type OID suitable for describe callback functions? */
 #define TypeSupportsDescribe(typid)  \
@@ -746,10 +778,9 @@ DATA(insert OID = 6994 (gp_relation_node PGNSP PGUID -1 f c t \054 5094 0 0 reco
  */
 extern Oid TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId,
 						 Oid shelloid);
-extern Oid TypeShellMakeWithOid(const char *typeName, Oid typeNamespace,
-								Oid ownerId, Oid shelltypeOid);
 
-extern Oid TypeCreate(const char *typeName,
+extern Oid TypeCreate(Oid newTypeOid,
+		   const char *typeName,
 		   Oid typeNamespace,
 		   Oid relationOid,
 		   char relationKind,
@@ -776,8 +807,9 @@ extern Oid TypeCreate(const char *typeName,
 		   int32 typeMod,
 		   int32 typNDims,
 		   bool typeNotNull);
-		   
-extern Oid TypeCreateWithOid(const char *typeName,
+
+extern Oid TypeCreateWithOptions(Oid newtypeOid,
+		   const char *typeName,
 		   Oid typeNamespace,
 		   Oid relationOid,
 		   char relationKind,
@@ -804,7 +836,6 @@ extern Oid TypeCreateWithOid(const char *typeName,
 		   int32 typeMod,
 		   int32 typNDims,
 		   bool typeNotNull,
-		   Oid newtypeOid,
 		   Datum typoptions);
 
 extern void GenerateTypeDependencies(Oid typeNamespace,
@@ -825,7 +856,11 @@ extern void GenerateTypeDependencies(Oid typeNamespace,
 						 Node *defaultExpr,
 						 bool rebuild);
 
-extern void TypeRename(Oid typeOid, const char *newTypeName);
+extern void TypeRename(Oid typeOid, const char *newTypeName,
+		   Oid typeNamespace);
+
+extern bool moveArrayTypeName(Oid typeOid, const char *typeName,
+				  Oid typeNamespace);
 
 extern char *makeArrayTypeName(const char *typeName, Oid typeNamespace);
 extern void add_type_encoding(Oid typid, Datum typoptions);
diff --git a/src/include/catalog/tidycat.pl b/src/include/catalog/tidycat.pl
index edf201a83129..8f0e6952bbfa 100755
--- a/src/include/catalog/tidycat.pl
+++ b/src/include/catalog/tidycat.pl
@@ -1120,6 +1120,8 @@ sub parsetab
 			{
 				last # table has a toast table - ok!
 					if (exists($alltabs->{$tname}->{with}->{toast_oid}));
+				last # table has a toast table - ok!
+					if (exists($alltabs->{$tname}->{with}->{toast}));
 
 				$badmsg .= "table $tname needs toast table (toast_oid) for column $cname of type $ctype\n";
 			}
diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h
index 1aec08ac05f0..ebc82a3783d0 100644
--- a/src/include/catalog/toasting.h
+++ b/src/include/catalog/toasting.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/toasting.h,v 1.3 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/toasting.h,v 1.4 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/cdb/cdbdatabaseinfo.h b/src/include/cdb/cdbdatabaseinfo.h
index 57a332aa50a9..a2fc7cc141fb 100755
--- a/src/include/cdb/cdbdatabaseinfo.h
+++ b/src/include/cdb/cdbdatabaseinfo.h
@@ -212,6 +212,7 @@ typedef struct DatabaseInfo
 extern DatabaseInfo *DatabaseInfo_Collect(
 	Oid 		database,
 	Oid 		defaultTablespace,
+	Snapshot	snapshot,
 	bool        collectGpRelationNodeInfo,
 	bool		collectAppendOnlyCatalogSegmentInfo,
 	bool		scanFileSystem);
diff --git a/src/include/cdb/cdbhash.h b/src/include/cdb/cdbhash.h
index 8f4c2706f222..da2a9a443619 100644
--- a/src/include/cdb/cdbhash.h
+++ b/src/include/cdb/cdbhash.h
@@ -96,4 +96,6 @@ extern bool isGreenplumDbHashable(Oid typid);
  */
 extern bool typeIsArrayType(Oid typeoid);
 
+extern bool typeIsEnumType(Oid typeoid);
+
 #endif   /* CDBHASH_H */
diff --git a/src/include/cdb/cdbmutate.h b/src/include/cdb/cdbmutate.h
index c799f6548e53..20a61bc598ce 100644
--- a/src/include/cdb/cdbmutate.h
+++ b/src/include/cdb/cdbmutate.h
@@ -38,7 +38,8 @@ extern void add_slice_to_motion(Motion *m,
 		);
 
 extern Plan *zap_trivial_result(PlannerInfo *root, Plan *plan); 
-extern Plan *apply_shareinput_dag_to_tree(Plan *plan, ApplyShareInputContext *ctxt); 
+extern Plan *apply_shareinput_dag_to_tree(PlannerGlobal *glob, Plan *plan, List *rtable);
+extern Plan *replace_shareinput_targetlists(PlannerGlobal *glob, Plan *plan);
 extern Plan *apply_shareinput_xslice(Plan *plan, PlannerGlobal *glob);
 extern void assign_plannode_id(PlannedStmt *stmt);
 
@@ -49,7 +50,7 @@ extern void remove_unused_initplans(Plan *plan, PlannerInfo *root);
 extern int32 cdbhash_const(Const *pconst, int iSegments);
 extern int32 cdbhash_const_list(List *plConsts, int iSegments);
 
-extern Node *exec_make_plan_constant(struct PlannedStmt *stmt, bool is_SRI);
+extern Node *exec_make_plan_constant(struct PlannedStmt *stmt, bool is_SRI, List **cursorPositions);
 extern Node *planner_make_plan_constant(struct PlannerInfo *root, Node *n, bool is_SRI);
 extern void remove_subquery_in_RTEs(Node *node);
 #endif   /* CDBMUTATE_H */
diff --git a/src/include/cdb/cdbpersistentstore.h b/src/include/cdb/cdbpersistentstore.h
index cbaea22759c3..bc5210f2a127 100755
--- a/src/include/cdb/cdbpersistentstore.h
+++ b/src/include/cdb/cdbpersistentstore.h
@@ -13,6 +13,7 @@
 #include "access/persistentfilesysobjname.h"
 #include "catalog/gp_global_sequence.h"
 #include "storage/itemptr.h"
+#include "storage/proc.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "utils/relcache.h"
@@ -303,89 +304,6 @@ typedef struct MirroredLockLocalVars
 	}
 #endif
 
-#ifdef USE_ASSERT_CHECKING
-
-typedef struct CheckpointStartLockLocalVars
-{
-	bool checkpointStartLockIsHeldByMe;
-	bool checkpointStartVariablesSet;
-} CheckpointStartLockLocalVars;
-
-#define CHECKPOINT_START_LOCK_DECLARE \
-	CheckpointStartLockLocalVars checkpointStartLockLocalVars = {false, false};
-#else
-
-typedef struct CheckpointStartLockLocalVars
-{
-	bool checkpointStartLockIsHeldByMe;
-} CheckpointStartLockLocalVars;
-
-#define CHECKPOINT_START_LOCK_DECLARE \
-	CheckpointStartLockLocalVars checkpointStartLockLocalVars = {false};
-#endif
-
-#ifdef USE_ASSERT_CHECKING
-#define CHECKPOINT_START_LOCK \
-	{ \
-		checkpointStartLockLocalVars.checkpointStartLockIsHeldByMe = LWLockHeldByMe(CheckpointStartLock); \
-		checkpointStartLockLocalVars.checkpointStartVariablesSet = true; \
-		\
-		if (!checkpointStartLockLocalVars.checkpointStartLockIsHeldByMe) \
-		{ \
-			LWLockAcquire(CheckpointStartLock , LW_SHARED); \
-		} \
-		else \
-		{ \
-			HOLD_INTERRUPTS(); \
-		} \
-		\
-		Assert(InterruptHoldoffCount > 0); \
-	}
-#else
-#define CHECKPOINT_START_LOCK \
-	{ \
-		checkpointStartLockLocalVars.checkpointStartLockIsHeldByMe = LWLockHeldByMe(CheckpointStartLock); \
-		\
-		if (!checkpointStartLockLocalVars.checkpointStartLockIsHeldByMe) \
-		{ \
-			LWLockAcquire(CheckpointStartLock , LW_SHARED); \
-		} \
-		else \
-		{ \
-			HOLD_INTERRUPTS(); \
-		} \
-	}
-#endif
-
-#ifdef USE_ASSERT_CHECKING
-#define CHECKPOINT_START_UNLOCK \
-	{ \
-		Assert(checkpointStartLockLocalVars.checkpointStartVariablesSet); \
-		Assert(InterruptHoldoffCount > 0); \
-		\
-		if (!checkpointStartLockLocalVars.checkpointStartLockIsHeldByMe) \
-		{ \
-			LWLockRelease(CheckpointStartLock); \
-		} \
-		else \
-		{ \
-			RESUME_INTERRUPTS(); \
-		} \
-	}
-#else
-#define CHECKPOINT_START_UNLOCK \
-	{ \
-		if (!checkpointStartLockLocalVars.checkpointStartLockIsHeldByMe) \
-		{ \
-			LWLockRelease(CheckpointStartLock); \
-		} \
-		else \
-		{ \
-			RESUME_INTERRUPTS(); \
-		} \
-	}
-#endif
-
 /*
  * Helper DEFINEs for the Persistent state-change modules to READ or WRITE.
  * We must maintain proper lock acquisition and ordering to prevent any
@@ -393,7 +311,6 @@ typedef struct CheckpointStartLockLocalVars
  *
  * The WRITE_PERSISTENT_STATE_ORDERED_LOCK gets these locks:
  *    MirroredLock        SHARED
- *    CheckpointStartLock SHARED
  *    PersistentObjLock   EXCLUSIVE
  *
  * The READ_PERSISTENT_STATE_ORDERED_LOCK gets this lock:
@@ -404,14 +321,13 @@ typedef struct CheckpointStartLockLocalVars
  * persistent table I/O at the same time. The filerep logic will always wait for an
  * EXCLUSIVE lock.
  *
- * By taking a SHARED CheckpointStartLock, the process is blocking a checkpoint from
- * occurring while performing persistent table I/O. The checkpoint logic will always
- * wait for an EXCLUSIVE lock.
- *
  * By taking an exclusive PersistentObjLock, the process is preventing simultaneous
  * I/O on the persistent tables. Only one process can obtain an EXCLUSIVE
  * PersistentObjLock.
  *
+ * WRITE_PERSISTENT_STATE_ORDERED_LOCK also sets MyProc->inCommit, to block a checkpoint
+ * from starting while performing persistent table I/O.
+ *
  * NOTE: Below these locks are the Buffer Pool content locks.
  */
 
@@ -423,17 +339,18 @@ typedef struct CheckpointStartLockLocalVars
 typedef struct WritePersistentStateLockLocalVars
 {
 	bool persistentObjLockIsHeldByMe;
+	bool save_inCommit;
 } WritePersistentStateLockLocalVars;
 
 #define WRITE_PERSISTENT_STATE_ORDERED_LOCK_DECLARE \
 	MIRRORED_LOCK_DECLARE; \
-	CHECKPOINT_START_LOCK_DECLARE;
 	WritePersistentStateLockLocalVars writePersistentStateLockLocalVars;
 
 #define WRITE_PERSISTENT_STATE_ORDERED_LOCK \
 	{ \
 		MIRRORED_LOCK; \
-		CHECKPOINT_START_LOCK; \
+		writePersistentStateLockLocalVars.save_inCommit = MyProc->inCommit; \
+		MyProc->inCommit = true;				\
 		writePersistentStateLockLocalVars.persistentObjLockIsHeldByMe = LWLockHeldByMe(PersistentObjLock); \
 		if (!writePersistentStateLockLocalVars.persistentObjLockIsHeldByMe) \
 		{ \
@@ -445,7 +362,7 @@ typedef struct WritePersistentStateLockLocalVars
 #define WRITE_PERSISTENT_STATE_ORDERED_UNLOCK \
 	{ \
 		MIRRORED_UNLOCK; \
-		CHECKPOINT_START_UNLOCK; \
+		MyProc->inCommit = writePersistentStateLockLocalVars.save_inCommit; \
 		if (!writePersistentStateLockLocalVars.persistentObjLockIsHeldByMe) \
 		{ \
 			LWLockRelease(PersistentObjLock); \
diff --git a/src/include/cdb/partitionselection.h b/src/include/cdb/partitionselection.h
index 3dd69f080eba..1a64e0418c94 100644
--- a/src/include/cdb/partitionselection.h
+++ b/src/include/cdb/partitionselection.h
@@ -50,4 +50,8 @@ extern void getPartitionNodeAndAccessMethod(Oid rootOid, List *partsMetadata, Me
 extern SelectedParts *processLevel(PartitionSelectorState *node, int level, TupleTableSlot *inputTuple);
 extern SelectedParts *static_part_selection(PartitionSelector *ps);
 
+extern AttrNumber *varattnos_map(TupleDesc oldtd, TupleDesc newtd);
+extern void change_varattnos_of_a_node(Node *node, const AttrNumber *newattno);
+extern void change_varattnos_of_a_varno(Node *node, const AttrNumber *newattno, Index varno);
+
 #endif   /* PARTITIONSELECTION_H */
diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h
index 95a4d26e0cc4..0042c3702ef6 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/cluster.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/cluster.h,v 1.31 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/cluster.h,v 1.34 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 #include "utils/rel.h"
 
 
-extern void cluster(ClusterStmt *stmt);
+extern void cluster(ClusterStmt *stmt, bool isTopLevel);
 
 extern void check_index_is_clusterable(Relation OldHeap, Oid indexOid,
 						   bool recheck);
@@ -25,7 +25,7 @@ extern void mark_index_clustered(Relation rel, Oid indexOid);
 extern Oid make_new_heap(Oid OIDOldHeap, const char *NewName, Oid NewTableSpace, 
 		TableOidInfo * oidInfo,
         bool createAoBlockDirectory);
-extern void swap_relation_files(Oid r1, Oid r2, bool swap_stats);
+extern void swap_relation_files(Oid r1, Oid r2, TransactionId frozenXid, bool swap_stats);
 
 extern void populate_oidInfo(TableOidInfo *oidInfo, Oid TableSpace, 
 							 bool relisshared, bool withTypes);
diff --git a/src/include/commands/conversioncmds.h b/src/include/commands/conversioncmds.h
index e8a8add18567..5af997876ace 100644
--- a/src/include/commands/conversioncmds.h
+++ b/src/include/commands/conversioncmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/conversioncmds.h,v 1.15 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/conversioncmds.h,v 1.16 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index 8d77735e2dac..ef51808e7d6d 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/copy.h,v 1.29 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/copy.h,v 1.31 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index ec3bdd659cf7..8f8ab16dbf42 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/dbcommands.h,v 1.46 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/dbcommands.h,v 1.47 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,7 @@
 
 /* XLOG stuff */
 #define XLOG_DBASE_CREATE		0x00
+#define XLOG_DBASE_DROP			0x10
 
 typedef struct xl_dbase_create_rec_old
 {
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 68441594c913..baa4f6b8aed2 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.80 2007/01/23 05:07:18 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.88.2.1 2010/07/03 13:53:38 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@ extern void DefineIndex(RangeVar *heapRelation,
 			char *tableSpaceName,
 			List *attributeList,
 			Expr *predicate,
-			List *rangetable,
 			List *options,
 			bool unique,
 			bool primary,
@@ -96,7 +95,41 @@ extern void RemoveAmProcEntryById(Oid entryOid);
 extern void RenameOpClass(List *name, const char *access_method, const char *newname);
 extern void RenameOpFamily(List *name, const char *access_method, const char *newname);
 extern void AlterOpClassOwner(List *name, const char *access_method, Oid newOwnerId);
+extern void AlterOpClassOwner_oid(Oid opclassOid, Oid newOwnerId);
 extern void AlterOpFamilyOwner(List *name, const char *access_method, Oid newOwnerId);
+extern void AlterOpFamilyOwner_oid(Oid opfamilyOid, Oid newOwnerId);
+
+/* commands/tsearchcmds.c */
+extern void DefineTSParser(List *names, List *parameters);
+extern void RenameTSParser(List *oldname, const char *newname);
+extern void RemoveTSParser(List *names, DropBehavior behavior,
+			   bool missing_ok);
+extern void RemoveTSParserById(Oid prsId);
+
+extern void DefineTSDictionary(List *names, List *parameters);
+extern void RenameTSDictionary(List *oldname, const char *newname);
+extern void RemoveTSDictionary(List *names, DropBehavior behavior,
+				   bool missing_ok);
+extern void RemoveTSDictionaryById(Oid dictId);
+extern void AlterTSDictionary(AlterTSDictionaryStmt *stmt);
+extern void AlterTSDictionaryOwner(List *name, Oid newOwnerId);
+
+extern void DefineTSTemplate(List *names, List *parameters);
+extern void RenameTSTemplate(List *oldname, const char *newname);
+extern void RemoveTSTemplate(List *names, DropBehavior behavior,
+				 bool missing_ok);
+extern void RemoveTSTemplateById(Oid tmplId);
+
+extern void DefineTSConfiguration(List *names, List *parameters);
+extern void RenameTSConfiguration(List *oldname, const char *newname);
+extern void RemoveTSConfiguration(List *names, DropBehavior behavior,
+					  bool missing_ok);
+extern void RemoveTSConfigurationById(Oid cfgId);
+extern void AlterTSConfiguration(AlterTSConfigurationStmt *stmt);
+extern void AlterTSConfigurationOwner(List *name, Oid newOwnerId);
+
+extern text *serialize_deflist(List *deflist);
+extern List *deserialize_deflist(Datum txt);
 
 /* support routines in commands/define.c */
 
diff --git a/src/include/commands/discard.h b/src/include/commands/discard.h
new file mode 100644
index 000000000000..7c7f07d48670
--- /dev/null
+++ b/src/include/commands/discard.h
@@ -0,0 +1,20 @@
+/*-------------------------------------------------------------------------
+ *
+ * discard.h
+ *	  prototypes for discard.c.
+ *
+ *
+ * Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/commands/discard.h,v 1.4 2008/01/01 19:45:57 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef DISCARD_H
+#define DISCARD_H
+
+#include "nodes/parsenodes.h"
+
+extern void DiscardCommand(DiscardStmt *stmt, bool isTopLevel);
+
+#endif   /* DISCARD_H */
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index b4e18fa93260..6dd38588c974 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.29 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.35 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,21 @@
 
 #include "executor/executor.h"
 
+/* Hook for plugins to get control in ExplainOneQuery() */
+typedef void (*ExplainOneQuery_hook_type) (Query *query,
+													   ExplainStmt *stmt,
+													 const char *queryString,
+													   ParamListInfo params,
+													 TupOutputState *tstate);
+extern PGDLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook;
+
+/* Hook for plugins to get control in explain_get_index_name() */
+typedef const char *(*explain_get_index_name_hook_type) (Oid indexId);
+extern PGDLLIMPORT explain_get_index_name_hook_type explain_get_index_name_hook;
+
 
 extern void ExplainQuery(ExplainStmt *stmt, const char *queryString,
-						 ParamListInfo params, DestReceiver *dest);
+			 ParamListInfo params, DestReceiver *dest);
 
 extern TupleDesc ExplainResultDesc(ExplainStmt *stmt);
 
@@ -26,8 +38,7 @@ extern void ExplainOneUtility(Node *utilityStmt, ExplainStmt *stmt,
 				  ParamListInfo params,
 				  TupOutputState *tstate);
 
-extern void ExplainOnePlan(PlannedStmt *plannedstmt, ExplainStmt *stmt,
-		   const char *queryString, ParamListInfo params,
-		   TupOutputState *tstate);
+extern void ExplainOnePlan(PlannedStmt *plannedstmt, ParamListInfo params,
+			   ExplainStmt *stmt, const char *queryString, TupOutputState *tstate);
 
 #endif   /* EXPLAIN_H */
diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h
index 801bb9b66c22..b42c8dd607fb 100644
--- a/src/include/commands/portalcmds.h
+++ b/src/include/commands/portalcmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/portalcmds.h,v 1.20 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/portalcmds.h,v 1.26 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #define PORTALCMDS_H
 
 #include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
 #include "utils/portal.h"
 
 
diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h
index d6966e27fbac..f3ea02575d5b 100644
--- a/src/include/commands/prepare.h
+++ b/src/include/commands/prepare.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 2002-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.23 2007/01/05 22:19:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.29 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,63 +14,56 @@
 #define PREPARE_H
 
 #include "executor/execdesc.h"
+#include "executor/executor.h"
+#include "utils/plancache.h"
 #include "utils/timestamp.h"
 
 struct TupOutputState;                  /* #include "executor/executor.h" */
 
 /*
- * The data structure representing a prepared statement
+ * The data structure representing a prepared statement.  This is now just
+ * a thin veneer over a plancache entry --- the main addition is that of
+ * a name.
  *
- * A prepared statement might be fully planned, or only parsed-and-rewritten.
- * If fully planned, stmt_list contains PlannedStmts and/or utility statements;
- * if not, it contains Query nodes.
- *
- * Note: all subsidiary storage lives in the context denoted by the context
- * field.  However, the string referenced by commandTag is not subsidiary
- * storage; it is assumed to be a compile-time-constant string.  As with
- * portals, commandTag shall be NULL if and only if the original query string
- * (before rewriting) was an empty string.
+ * Note: all subsidiary storage lives in the referenced plancache entry.
  */
 typedef struct
 {
 	/* dynahash.c requires key to be first field */
 	char		stmt_name[NAMEDATALEN];
-	char	   *query_string;	/* text of query, or NULL */
-	NodeTag		sourceTag;		/* GPDB: Original statement NodeTag */
-	const char *commandTag;		/* command tag (a constant!), or NULL */
-	List	   *query_list;		/* list of queries, rewritten, in case of replan */
-	List	   *argtype_list;	/* list of parameter type OIDs */
+	CachedPlanSource *plansource;		/* the actual cached plan */
+	bool		from_sql;		/* prepared via SQL, not FE/BE protocol? */
 	TimestampTz prepare_time;	/* the time when the stmt was prepared */
-	bool		from_sql;		/* stmt prepared via SQL, not FE/BE protocol? */
-	MemoryContext context;		/* context containing this query */
 } PreparedStatement;
 
 
 /* Utility statements PREPARE, EXECUTE, DEALLOCATE, EXPLAIN EXECUTE */
 extern void PrepareQuery(PrepareStmt *stmt, const char *queryString);
-extern void ExecuteQuery(ExecuteStmt *stmt, const char *queryString, 
-             ParamListInfo params,
+extern void ExecuteQuery(ExecuteStmt *stmt, const char *queryString,
+			 ParamListInfo params,
 			 DestReceiver *dest, char *completionTag);
 extern void DeallocateQuery(DeallocateStmt *stmt);
 extern void ExplainExecuteQuery(ExecuteStmt *execstmt, ExplainStmt *stmt,
-					const char * queryString,
-					ParamListInfo params,
-					struct TupOutputState *tstate);
+					const char *queryString,
+					ParamListInfo params, TupOutputState *tstate);
 
 /* Low-level access to stored prepared statements */
 extern void StorePreparedStatement(const char *stmt_name,
+					   Node *raw_parse_tree,
 					   const char *query_string,
 					   NodeTag	   sourceTag, /* GPDB */
 					   const char *commandTag,
-					   List *query_list,
-					   List *argtype_list,
+					   Oid *param_types,
+					   int num_params,
+					   int cursor_options,
+					   List *stmt_list,
 					   bool from_sql);
 extern PreparedStatement *FetchPreparedStatement(const char *stmt_name,
 					   bool throwError);
 extern void DropPreparedStatement(const char *stmt_name, bool showError);
-extern List *FetchPreparedStatementParams(const char *stmt_name);
 extern TupleDesc FetchPreparedStatementResultDesc(PreparedStatement *stmt);
-extern bool PreparedStatementReturnsTuples(PreparedStatement *stmt);
 extern List *FetchPreparedStatementTargetList(PreparedStatement *stmt);
 
+void		DropAllPreparedStatements(void);
+
 #endif   /* PREPARE_H */
diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h
index 7f38a8542ac2..07551dd8d56c 100644
--- a/src/include/commands/proclang.h
+++ b/src/include/commands/proclang.h
@@ -15,6 +15,8 @@ extern void CreateProceduralLanguage(CreatePLangStmt *stmt);
 extern void DropProceduralLanguage(DropPLangStmt *stmt);
 extern void DropProceduralLanguageById(Oid langOid);
 extern void RenameLanguage(const char *oldname, const char *newname);
+extern void AlterLanguageOwner(const char *name, Oid newOwnerId);
+extern void AlterLanguageOwner_oid(Oid oid, Oid newOwnerId);
 extern bool PLTemplateExists(const char *languageName);
 
 #endif   /* PROCLANG_H */
diff --git a/src/include/commands/schemacmds.h b/src/include/commands/schemacmds.h
index 452a8b0d9b44..2417e7aceffd 100644
--- a/src/include/commands/schemacmds.h
+++ b/src/include/commands/schemacmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/schemacmds.h,v 1.15 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/schemacmds.h,v 1.18 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index b8bbaefeaff2..e6b35cb84e64 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/sequence.h,v 1.38 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/sequence.h,v 1.39 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h
index a77949bd2bfd..a0d3340d9ef5 100644
--- a/src/include/commands/tablecmds.h
+++ b/src/include/commands/tablecmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.31.2.1 2007/05/11 20:18:17 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.37 2008/01/30 19:46:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,17 +40,6 @@ typedef struct NewConstraint
 	List	   *qualstate;		/* Execution state for CHECK */
 } NewConstraint;
 
-/*
- * During attribute re-mapping for heterogeneous partitions, we use
- * this struct to identify which varno's attributes will be re-mapped.
- * Using this struct as a *context* during expression tree walking, we
- * can skip varattnos that do not belong to a given varno.
- */
-typedef struct AttrMapContext{
-	const AttrNumber *newattno; /* The mapping table to remap the varattno */
-	Index varno; /* Which rte's varattno to re-map */
-} AttrMapContext;
-
 extern const char *synthetic_sql;
 
 extern Oid	DefineRelation(CreateStmt *stmt, char relkind, char relstorage);
@@ -80,8 +69,6 @@ extern void AlterRelationNamespaceInternal(Relation classRel, Oid relOid,
 							   Oid oldNspOid, Oid newNspOid,
 							   bool hasDependEntry);
 
-extern void ATAddColumn(Relation rel, ColumnDef *colDef);
-
 extern void CheckTableNotInUse(Relation rel, const char *stmt);
 
 extern void ExecuteTruncate(TruncateStmt *stmt);
@@ -94,15 +81,16 @@ extern void renameatt(Oid myrelid,
 
 extern void renamerel(Oid myrelid,
 		  const char *newrelname,
+		  ObjectType reltype,
 		  RenameStmt *stmt /* MPP */);
 
 extern void find_composite_type_dependencies(Oid typeOid,
 											 const char *origTblName,
 											 const char *origTypeName);
 
-extern AttrNumber *varattnos_map(TupleDesc old, TupleDesc new);
-extern AttrNumber *varattnos_map_schema(TupleDesc old, List *schema);
-extern void change_varattnos_of_a_node(Node *node, const AttrNumber *newattno);
+extern void find_composite_type_dependencies(Oid typeOid,
+								 const char *origTblName,
+								 const char *origTypeName);
 
 extern void change_varattnos_of_a_varno(Node *node, const AttrNumber *newattno, Index varno);
 
diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h
index cf4ee3d6bed2..baedbb8dffa8 100644
--- a/src/include/commands/tablespace.h
+++ b/src/include/commands/tablespace.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/tablespace.h,v 1.14 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/tablespace.h,v 1.19 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,9 @@ extern void AlterTableSpaceOwner(const char *name, Oid newOwnerId);
 
 extern void TablespaceCreateDbspace(Oid spcNode, Oid dbNode, bool isRedo);
 
-extern Oid	GetDefaultTablespace(void);
+extern Oid	GetDefaultTablespace(bool forTemp);
+
+extern void PrepareTempTablespaces(void);
 
 extern Oid	get_tablespace_oid(const char *tablespacename);
 extern char *get_tablespace_name(Oid spc_oid);
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index ccb49733cbc1..36a666740672 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/trigger.h,v 1.61 2007/02/14 01:58:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/commands/trigger.h,v 1.66.2.1 2008/09/19 14:43:47 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,6 +81,18 @@ typedef struct TriggerData
 #define TRIGGER_FIRED_AFTER(event)				\
 		(!TRIGGER_FIRED_BEFORE (event))
 
+/*
+ * Definitions for the replication role based firing.
+ */
+#define SESSION_REPLICATION_ROLE_ORIGIN		0
+#define SESSION_REPLICATION_ROLE_REPLICA	1
+#define SESSION_REPLICATION_ROLE_LOCAL		2
+extern PGDLLIMPORT int	SessionReplicationRole;
+
+#define TRIGGER_FIRES_ON_ORIGIN				'O'
+#define TRIGGER_FIRES_ALWAYS				'A'
+#define TRIGGER_FIRES_ON_REPLICA			'R'
+#define TRIGGER_DISABLED					'D'
 
 extern Oid	CreateTrigger(CreateTrigStmt *stmt, Oid constraintOid);
 
@@ -91,7 +103,7 @@ extern void RemoveTriggerById(Oid trigOid);
 extern void renametrig(Oid relid, const char *oldname, const char *newname);
 
 extern void EnableDisableTrigger(Relation rel, const char *tgname,
-					 bool enable, bool skip_system);
+					 char fires_when, bool skip_system);
 
 extern void RelationBuildTriggers(Relation relation);
 
@@ -115,8 +127,7 @@ extern void ExecASDeleteTriggers(EState *estate,
 					 ResultRelInfo *relinfo);
 extern bool ExecBRDeleteTriggers(EState *estate,
 					 ResultRelInfo *relinfo,
-					 ItemPointer tupleid,
-					 CommandId cid);
+					 ItemPointer tupleid);
 extern void ExecARDeleteTriggers(EState *estate,
 					 ResultRelInfo *relinfo,
 					 ItemPointer tupleid);
@@ -124,11 +135,10 @@ extern void ExecBSUpdateTriggers(EState *estate,
 					 ResultRelInfo *relinfo);
 extern void ExecASUpdateTriggers(EState *estate,
 					 ResultRelInfo *relinfo);
-extern HeapTuple ExecBRUpdateTriggers(EState *estate,
+extern TupleTableSlot *ExecBRUpdateTriggers(EState *estate,
 					 ResultRelInfo *relinfo,
 					 ItemPointer tupleid,
-					 HeapTuple newtuple,
-					 CommandId cid);
+					 TupleTableSlot *slot);
 extern void ExecARUpdateTriggers(EState *estate,
 					 ResultRelInfo *relinfo,
 					 ItemPointer tupleid,
@@ -153,7 +163,7 @@ extern bool RI_FKey_keyequal_upd_pk(Trigger *trigger, Relation pk_rel,
 extern bool RI_FKey_keyequal_upd_fk(Trigger *trigger, Relation fk_rel,
 						HeapTuple old_row, HeapTuple new_row);
 extern bool RI_Initial_Check(Trigger *trigger,
-							 Relation fk_rel, Relation pk_rel);
+				 Relation fk_rel, Relation pk_rel);
 
 /* result values for RI_FKey_trigger_type: */
 #define RI_TRIGGER_PK	1		/* is a trigger on the PK relation */
diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h
index 0d860d7f6e97..45d578c5e710 100644
--- a/src/include/commands/typecmds.h
+++ b/src/include/commands/typecmds.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/typecmds.h,v 1.17 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/typecmds.h,v 1.22 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@ extern void RemoveType(List *names, DropBehavior behavior, bool missing_ok);
 extern void RemoveTypeById(Oid typeOid);
 extern void DefineDomain(CreateDomainStmt *stmt);
 extern void RemoveDomain(List *names, DropBehavior behavior, bool missing_ok);
+extern void DefineEnum(CreateEnumStmt *stmt);
 extern Oid	DefineCompositeType(const RangeVar *typevar, List *coldeflist, Oid relOid, Oid comptypeOid);
 
 extern void AlterDomainDefault(List *names, Node *defaultRaw);
@@ -36,7 +37,7 @@ extern List *GetDomainConstraints(Oid typeOid);
 
 extern void AlterTypeOwner(List *names, Oid newOwnerId);
 extern void AlterTypeOwnerInternal(Oid typeOid, Oid newOwnerId,
-								   bool hasDependEntry);
+					   bool hasDependEntry);
 extern void AlterTypeNamespace(List *names, const char *newschema);
 extern void AlterTypeNamespaceInternal(Oid typeOid, Oid nspOid,
 									   bool isImplicitArray,
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index a4ba218fb0e7..0d425f35707e 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.69 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.75.2.2 2009/11/10 18:00:44 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,10 +18,12 @@
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
 #include "nodes/parsenodes.h"
+#include "storage/buf.h"
 #include "storage/lock.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
 
+
 /*----------
  * ANALYZE builds one of these structs for each attribute (column) that is
  * to be analyzed.	The struct and subsidiary data are in anl_context,
@@ -127,13 +129,15 @@ typedef struct VPgClassStats
 } VPgClassStats;
 
 /* GUC parameters */
-extern PGDLLIMPORT int default_statistics_target; /* PGDLLIMPORT for PostGIS */
+extern PGDLLIMPORT int default_statistics_target;		/* PGDLLIMPORT for
+														 * PostGIS */
 extern PGDLLIMPORT double analyze_relative_error;
 extern int	vacuum_freeze_min_age;
 
 
 /* in commands/vacuum.c */
-extern void vacuum(VacuumStmt *vacstmt, List *relids);
+extern void vacuum(VacuumStmt *vacstmt, List *relids,
+	   BufferAccessStrategy bstrategy, bool for_wraparound, bool isTopLevel);
 extern void vac_open_indexes(Relation relation, LOCKMODE lockmode,
 				 int *nindexes, Relation **Irel);
 extern void vac_close_indexes(int nindexes, Relation *Irel, LOCKMODE lockmode);
@@ -146,7 +150,7 @@ extern void vac_update_relstats_from_list(Relation rel,
 							  BlockNumber num_pages, double num_tuples,
 							  bool hasindex, TransactionId frozenxid,
 										  List *updated_stats);
-extern void vacuum_set_xid_limits(VacuumStmt *vacstmt, bool sharedRel,
+extern void vacuum_set_xid_limits(int freeze_min_age, bool sharedRel,
 					  TransactionId *oldestXmin,
 					  TransactionId *freezeLimit);
 extern void vac_update_datfrozenxid(void);
@@ -162,7 +166,8 @@ extern bool vacuumStatement_IsInAppendOnlyCompactionPhase(VacuumStmt* vacstmt);
 extern bool vacuumStatement_IsInAppendOnlyPseudoCompactionPhase(VacuumStmt* vacstmt);
 
 /* in commands/vacuumlazy.c */
-extern void lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, List *updated_stats);
+extern bool lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
+				BufferAccessStrategy bstrategy, List *updated_stats);
 extern void vacuum_appendonly_rel(Relation aorel, VacuumStmt *vacstmt);
 extern void vacuum_appendonly_fill_stats(Relation aorel, Snapshot snapshot,
 										 BlockNumber *rel_pages, double *rel_tuples,
@@ -173,7 +178,9 @@ extern void gen_oids_for_bitmaps(VacuumStmt *vacstmt, Relation onerel);
 extern List *get_oids_for_bitmap(List *all_extra_oids, Relation Irel, Relation onerel, int occurrence);
 
 /* in commands/analyze.c */
-extern void analyze_rel(Oid relid, VacuumStmt *vacstmt);
-extern void analyzeStatement(VacuumStmt *vacstmt, List *relids);
+extern void analyze_rel(Oid relid, VacuumStmt *vacstmt,
+			BufferAccessStrategy bstrategy);
+extern void analyzeStatement(VacuumStmt *vacstmt, List *relids, BufferAccessStrategy start, bool isTopLevel);
 //extern void analyzeStmt(VacuumStmt *vacstmt, List *relids);
+
 #endif   /* VACUUM_H */
diff --git a/src/include/commands/view.h b/src/include/commands/view.h
index 2245d0c4e797..daefb644d143 100644
--- a/src/include/commands/view.h
+++ b/src/include/commands/view.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/view.h,v 1.24 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/view.h,v 1.26 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 
 #include "nodes/parsenodes.h"
 
-extern void DefineView(ViewStmt *stmt);
+extern void DefineView(ViewStmt *stmt, const char *queryString);
 extern void RemoveView(const RangeVar *view, DropBehavior behavior);
 
 #endif   /* VIEW_H */
diff --git a/src/include/executor/execDynamicScan.h b/src/include/executor/execDynamicScan.h
index 20ad7f2a284b..3cb7a35ce4d5 100644
--- a/src/include/executor/execDynamicScan.h
+++ b/src/include/executor/execDynamicScan.h
@@ -17,8 +17,6 @@
 #include "executor/tuptable.h"
 #include "commands/tablecmds.h"
 
-#define DYNAMIC_SCAN_NSLOTS 2
-
 typedef void (PartitionInitMethod)(ScanState *scanState, AttrNumber *attMap);
 typedef void (PartitionEndMethod)(ScanState *scanState);
 typedef void (PartitionReScanMethod)(ScanState *scanState);
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index a1ed50e364c4..1eb1293c2b01 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -9,14 +9,14 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/execdesc.h,v 1.33 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/execdesc.h,v 1.37 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDESC_H
 #define EXECDESC_H
 
-#include "nodes/parsenodes.h"
+#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 #include "tcop/dest.h"
 #include "gpmon/gpmon.h"
@@ -137,6 +137,19 @@ typedef struct SliceTable
 	uint32		ic_instance_id;
 } SliceTable;
 
+/*
+ * Holds information about a cursor's current position.
+ */
+typedef struct CursorPosInfo
+{
+	NodeTag type;
+
+	char	   *cursor_name;
+	int		 	gp_segment_id;
+	ItemPointerData	ctid;
+	Oid			table_oid;
+} CursorPosInfo;
+
 /* ----------------
  *		query dispatch information:
  *
@@ -173,7 +186,9 @@ typedef struct QueryDispatchDesc
 	 * The implementation of MPPEXEC, which runs on the QEs, installs
 	 * the slice table in the plan as required there.
 	 */
-	SliceTable  *sliceTable;
+	SliceTable *sliceTable;
+
+	List	   *cursorPositions;
 } QueryDispatchDesc;
 
 /* ----------------
@@ -238,9 +253,9 @@ extern QueryDesc *CreateQueryDesc(PlannedStmt *plannedstmt,
 
 extern QueryDesc *CreateUtilityQueryDesc(Node *utilitystmt,
 										 const char *sourceText,
-										 Snapshot snapshot,
-										 DestReceiver *dest,
-										 ParamListInfo params);
+					   Snapshot snapshot,
+					   DestReceiver *dest,
+					   ParamListInfo params);
 
 extern void FreeQueryDesc(QueryDesc *qdesc);
 
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 194992c38b36..73dcb3528e2f 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.136 2007/02/06 02:59:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.146 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -86,6 +86,20 @@ extern bool ExecMayReturnRawTuples(PlanState *node);
 extern void ExecEagerFree(PlanState *node);
 extern void ExecEagerFreeChildNodes(PlanState *node, bool subplanDone);
 
+/*
+ * prototypes from functions in execCurrent.c
+ */
+extern void getCurrentOf(CurrentOfExpr *cexpr,
+			  ExprContext *econtext,
+			  Oid table_oid,
+			  ItemPointer current_tid,
+			  int *current_gp_segment_id,
+			  Oid *current_table_oid);
+extern bool execCurrentOf(CurrentOfExpr *cexpr,
+			  ExprContext *econtext,
+			  Oid table_oid,
+			  ItemPointer current_tid);
+
 /*
  * prototypes from functions in execGrouping.c
  */
@@ -117,9 +131,9 @@ extern TupleHashEntry LookupTupleHashEntry(TupleHashTable hashtable,
 					 TupleTableSlot *slot,
 					 bool *isnew);
 extern TupleHashEntry FindTupleHashEntry(TupleHashTable hashtable,
-										 TupleTableSlot *slot,
-										 FmgrInfo *eqfunctions,
-										 FmgrInfo *hashfunctions);
+				   TupleTableSlot *slot,
+				   FmgrInfo *eqfunctions,
+				   FmgrInfo *hashfunctions);
 
 /*
  * prototypes from functions in execJunk.c
@@ -130,9 +144,9 @@ extern JunkFilter *ExecInitJunkFilterConversion(List *targetList,
 							 TupleDesc cleanTupType,
 							 TupleTableSlot *slot);
 extern AttrNumber ExecFindJunkAttribute(JunkFilter *junkfilter,
-										const char *attrName);
+					  const char *attrName);
 extern Datum ExecGetJunkAttribute(TupleTableSlot *slot, AttrNumber attno,
-								  bool *isNull);
+					 bool *isNull);
 extern TupleTableSlot *ExecFilterJunk(JunkFilter *junkfilter,
 			   TupleTableSlot *slot);
 extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot);
@@ -211,14 +225,14 @@ extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc,
 			ScanDirection direction, long count);
 extern void ExecutorEnd(QueryDesc *queryDesc);
 extern void ExecutorRewind(QueryDesc *queryDesc);
-extern void ExecCheckRTPerms(List *rangeTable);
-extern void ExecCheckRTEPerms(RangeTblEntry *rte);
 extern void ExecEndPlan(PlanState *planstate, EState *estate);
+extern ResultRelInfo *ExecGetTriggerResultRel(EState *estate, Oid relid);
 extern bool ExecContextForcesOids(PlanState *planstate, bool *hasoids);
 extern void ExecConstraints(ResultRelInfo *resultRelInfo,
 				TupleTableSlot *slot, EState *estate);
 extern TupleTableSlot *EvalPlanQual(EState *estate, Index rti,
-			 ItemPointer tid, TransactionId priorXmax, CommandId curCid);
+			 ItemPointer tid, TransactionId priorXmax);
+extern PlanState *ExecGetActivePlanTree(QueryDesc *queryDesc);
 extern HeapTuple GetUpdatedTuple_Int(Relation relation,
 									 ItemPointer tid, 
 									 TransactionId priorXmax, 
@@ -283,7 +297,6 @@ extern Tuplestorestate *ExecMakeTableFunctionResult(ExprState *funcexpr,
 extern Datum ExecEvalExprSwitchContext(ExprState *expression, ExprContext *econtext,
 						  bool *isNull, ExprDoneCond *isDone);
 extern ExprState *ExecInitExpr(Expr *node, PlanState *parent);
-extern SubPlanState *ExecInitExprInitPlan(SubPlan *node, PlanState *parent);
 extern ExprState *ExecPrepareExpr(Expr *node, EState *estate);
 extern bool ExecQual(List *qual, ExprContext *econtext, bool resultForNull);
 extern int	ExecTargetListLength(List *targetlist);
@@ -412,7 +425,6 @@ extern void end_tup_output(TupOutputState *tstate);
  * prototypes from functions in execUtils.c
  */
 extern EState *CreateExecutorState(void);
-extern EState *CreateSubExecutorState(EState *parent_estate);
 extern void FreeExecutorState(EState *estate);
 extern void ClearPartitionState(EState *estate);
 extern ExprContext *CreateExprContext(EState *estate);
@@ -450,7 +462,7 @@ extern ProjectionInfo *ExecBuildProjectionInfo(List *targetList,
 						TupleTableSlot *slot,
 						TupleDesc inputDesc);
 extern void ExecAssignProjectionInfo(PlanState *planstate,
-									 TupleDesc inputDesc);
+						 TupleDesc inputDesc);
 extern void ExecFreeExprContext(PlanState *planstate);
 extern TupleDesc ExecGetScanType(ScanState *scanstate);
 extern void ExecAssignScanType(ScanState *scanstate, TupleDesc tupDesc);
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 208b699b16ec..8a0ff4f265e7 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.29 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.30 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index fc5ab056c8bc..888a2241756a 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.44 2007/01/30 01:33:36 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.48 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -147,6 +147,8 @@ typedef struct HashJoinBatchData
 typedef struct HashJoinTableData
 {
 	int			nbuckets;		/* # buckets in the in-memory hash table */
+	int			log2_nbuckets;	/* its log2 (nbuckets must be a power of 2) */
+
 	/* buckets[i] is head of list of tuples in i'th in-memory bucket */
 	struct HashJoinTupleData **buckets;
 	uint64     				  *bloom; /* bloom[i] is bloomfilter for buckets[i] */
diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h
index 7fb2acada08e..86afe25369b9 100644
--- a/src/include/executor/instrument.h
+++ b/src/include/executor/instrument.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 2006-2009, Greenplum inc
  * Copyright (c) 2001-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/executor/instrument.h,v 1.17 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/instrument.h,v 1.18 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index cb6d92912efe..ed0324b10213 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeAgg.h,v 1.28 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeAgg.h,v 1.29 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -177,8 +177,7 @@ extern void
 advance_aggregates(AggState *aggstate, AggStatePerGroup pergroup,
 				   MemoryManagerContainer *mem_manager);
 
-extern List *
-get_agg_hash_collist(AggState *aggstate);
+extern List *find_hash_columns(AggState *aggstate);
 
 extern Oid resolve_polymorphic_transtype(Oid aggtranstype, Oid aggfnoid,
 										 Oid *inputTypes);
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 0b99c4d16fc1..f3ba186f8607 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeAppend.h,v 1.26 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeAppend.h,v 1.27 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeBitmapAnd.h b/src/include/executor/nodeBitmapAnd.h
index 273dc0b53acb..67c0d866a5f7 100644
--- a/src/include/executor/nodeBitmapAnd.h
+++ b/src/include/executor/nodeBitmapAnd.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeBitmapAnd.h,v 1.4 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeBitmapAnd.h,v 1.5 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h
index 11485846b5d7..646ea6fd7184 100644
--- a/src/include/executor/nodeBitmapHeapscan.h
+++ b/src/include/executor/nodeBitmapHeapscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeBitmapHeapscan.h,v 1.4 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeBitmapHeapscan.h,v 1.5 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeBitmapIndexscan.h b/src/include/executor/nodeBitmapIndexscan.h
index 3d0874cefffa..6c6ba487a156 100644
--- a/src/include/executor/nodeBitmapIndexscan.h
+++ b/src/include/executor/nodeBitmapIndexscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeBitmapIndexscan.h,v 1.4 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeBitmapIndexscan.h,v 1.5 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeBitmapOr.h b/src/include/executor/nodeBitmapOr.h
index 6ffdd9d424b0..fc036f9797db 100644
--- a/src/include/executor/nodeBitmapOr.h
+++ b/src/include/executor/nodeBitmapOr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeBitmapOr.h,v 1.4 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeBitmapOr.h,v 1.5 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeFunctionscan.h b/src/include/executor/nodeFunctionscan.h
index 4e0154b46301..dd0c1bbe2328 100644
--- a/src/include/executor/nodeFunctionscan.h
+++ b/src/include/executor/nodeFunctionscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeFunctionscan.h,v 1.10 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeFunctionscan.h,v 1.11 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 84f1d4dcf940..9c1d04181bf7 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeHash.h,v 1.44 2007/01/30 01:33:36 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeHash.h,v 1.45 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index b2372cacdb49..2a895216eb2f 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeHashjoin.h,v 1.34 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeHashjoin.h,v 1.37 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index f715100aa1b8..2102f5af6359 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeIndexscan.h,v 1.30 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeIndexscan.h,v 1.31 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index ff276c9e5bf2..1617103a64da 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeMaterial.h,v 1.26 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeMaterial.h,v 1.27 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index a1fdbedd803b..cba34c37564e 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeMergejoin.h,v 1.25 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeMergejoin.h,v 1.26 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 6c34af28c393..0d9ac5fc6021 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeNestloop.h,v 1.26 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeNestloop.h,v 1.27 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index da3f548f14b9..c3a3e92e971d 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeResult.h,v 1.24 2007/02/15 03:07:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeResult.h,v 1.25 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 24d54dae1250..bef296aeb563 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeSeqscan.h,v 1.25 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeSeqscan.h,v 1.26 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h
index b96e07cef490..107323a9b3dc 100644
--- a/src/include/executor/nodeSetOp.h
+++ b/src/include/executor/nodeSetOp.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeSetOp.h,v 1.14 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeSetOp.h,v 1.15 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index ddc85fca86b8..54acb856a182 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeSort.h,v 1.23 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeSort.h,v 1.24 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h
index b4c90e98b95c..ae9835755984 100644
--- a/src/include/executor/nodeSubplan.h
+++ b/src/include/executor/nodeSubplan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeSubplan.h,v 1.25 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeSubplan.h,v 1.27 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,12 +17,12 @@
 #include "nodes/execnodes.h"
 #include "executor/execdesc.h"
 
-extern void ExecInitSubPlan(SubPlanState *node, EState *estate, int eflags);
+extern SubPlanState *ExecInitSubPlan(SubPlan *subplan, PlanState *parent);
 extern Datum ExecSubPlan(SubPlanState *node,
 			ExprContext *econtext,
 			bool *isNull,
 			ExprDoneCond *isDone);
-extern void ExecEndSubPlan(SubPlanState *node);
+
 extern void ExecReScanSetParamPlan(SubPlanState *node, PlanState *parent);
 extern void ExecEagerFreeSubPlan(SubPlanState *node);
 
diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h
index 2cb8e19c0892..0d3a41f44f5e 100644
--- a/src/include/executor/nodeSubqueryscan.h
+++ b/src/include/executor/nodeSubqueryscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeSubqueryscan.h,v 1.14 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeSubqueryscan.h,v 1.15 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h
index 822df9fd9b3f..66ec1769ad3b 100644
--- a/src/include/executor/nodeTidscan.h
+++ b/src/include/executor/nodeTidscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeTidscan.h,v 1.18 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeTidscan.h,v 1.19 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index 19e9d54a05e9..dec19cdeac57 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeUnique.h,v 1.23 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeUnique.h,v 1.24 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/nodeValuesscan.h b/src/include/executor/nodeValuesscan.h
index ee77de9307f9..04f39943cd30 100644
--- a/src/include/executor/nodeValuesscan.h
+++ b/src/include/executor/nodeValuesscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/nodeValuesscan.h,v 1.3 2007/01/05 22:19:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/nodeValuesscan.h,v 1.4 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index f5bc2c917cc7..22e91f6dd15d 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -20,17 +20,19 @@
 #include "postgres.h"
 
 /*
- *	These are not needed by this file, but used by other programs
- *	using SPI
+ *	Most of these are not needed by this file, but may be used by
+ *	user-written code that uses SPI
  */
 #include "access/heapam.h"
 #include "access/xact.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "executor/execdefs.h"
 #include "executor/executor.h"
 #include "nodes/execnodes.h"
 #include "nodes/params.h"
+#include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
@@ -43,7 +45,6 @@
 #include "utils/portal.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
-#include "executor/execdefs.h"
 
 
 typedef struct SPITupleTable
@@ -114,12 +115,15 @@ extern int SPI_execute_with_args(const char *src,
 					  Datum *Values, const char *Nulls,
 					  bool read_only, long tcount);
 extern SPIPlanPtr SPI_prepare(const char *src, int nargs, Oid *argtypes);
+extern SPIPlanPtr SPI_prepare_cursor(const char *src, int nargs, Oid *argtypes,
+				   int cursorOptions);
 extern SPIPlanPtr SPI_saveplan(SPIPlanPtr plan);
 extern int	SPI_freeplan(SPIPlanPtr plan);
 
 extern Oid	SPI_getargtypeid(SPIPlanPtr plan, int argIndex);
 extern int	SPI_getargcount(SPIPlanPtr plan);
 extern bool SPI_is_cursor_plan(SPIPlanPtr plan);
+extern bool SPI_plan_is_valid(SPIPlanPtr plan);
 extern const char *SPI_result_code_string(int code);
 
 extern HeapTuple SPI_copytuple(HeapTuple tuple);
@@ -150,6 +154,8 @@ extern Portal SPI_cursor_open_with_args(const char *name,
 extern Portal SPI_cursor_find(const char *name);
 extern void SPI_cursor_fetch(Portal portal, bool forward, long count);
 extern void SPI_cursor_move(Portal portal, bool forward, long count);
+extern void SPI_scroll_cursor_fetch(Portal, FetchDirection direction, long count);
+extern void SPI_scroll_cursor_move(Portal, FetchDirection direction, long count);
 extern void SPI_cursor_close(Portal portal);
 
 extern void AtEOXact_SPI(bool isCommit);
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index 59576deee4b7..90a036577972 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/spi_priv.h,v 1.26 2007/01/05 22:19:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/spi_priv.h,v 1.31 2008/01/01 19:45:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,29 +31,43 @@ typedef struct
 	SubTransactionId connectSubid;		/* ID of connecting subtransaction */
 } _SPI_connection;
 
+/*
+ * SPI plans have two states: saved or unsaved.
+ *
+ * For an unsaved plan, the _SPI_plan struct and all its subsidiary data are in
+ * a dedicated memory context identified by plancxt.  An unsaved plan is good
+ * at most for the current transaction, since the locks that protect it from
+ * schema changes will be lost at end of transaction.  Hence the plancxt is
+ * always a transient one.
+ *
+ * For a saved plan, the _SPI_plan struct and the argument type array are in
+ * the plancxt (which can be really small).  All the other subsidiary state
+ * is in plancache entries identified by plancache_list (note: the list cells
+ * themselves are in plancxt).	We rely on plancache.c to keep the cache
+ * entries up-to-date as needed.  The plancxt is a child of CacheMemoryContext
+ * since it should persist until explicitly destroyed.
+ *
+ * To avoid redundant coding, the representation of unsaved plans matches
+ * that of saved plans, ie, plancache_list is a list of CachedPlanSource
+ * structs which in turn point to CachedPlan structs.  However, in an unsaved
+ * plan all these structs are just created by spi.c and are not known to
+ * plancache.c.  We don't try very hard to make all their fields valid,
+ * only the ones spi.c actually uses.
+ *
+ * Note: if the original query string contained only whitespace and comments,
+ * the plancache_list will be NIL and so there is no place to store the
+ * query string.  We don't care about that, but we do care about the
+ * argument type array, which is why it's seemingly-redundantly stored.
+ */
 typedef struct _SPI_plan
 {
 	int			magic;			/* should equal _SPI_PLAN_MAGIC */
 	bool		saved;			/* saved or unsaved plan? */
-	/* Context containing _SPI_plan itself as well as subsidiary data */
-	MemoryContext plancxt;
+	List	   *plancache_list; /* one CachedPlanSource per parsetree */
+	MemoryContext plancxt;		/* Context containing _SPI_plan and data */
 	int			cursor_options; /* Cursor options used for planning */
-	/* Original query string (used for error reporting) */
-	const char *query;
-	/* List of List of querytrees; one sublist per original parsetree */
-	List	   *qtlist;
-	/* List of PlannedStmt* --- length == # of querytrees, but flat list */
-	List	   *ptlist;
-	/* Argument types, if a prepared plan */
 	int			nargs;			/* number of plan arguments */
 	Oid		   *argtypes;		/* Argument types (NULL if nargs is 0) */
-
-	unsigned long	use_count;
 } _SPI_plan;
 
-
-#define _SPI_CPLAN_CURCXT	0
-#define _SPI_CPLAN_PROCXT	1
-#define _SPI_CPLAN_TOPCXT	2
-
 #endif   /* SPI_PRIV_H */
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index 80fe044514c5..4ea0d3116aa2 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.37 2007/01/05 22:19:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.38.2.1 2009/03/30 04:09:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,6 +52,14 @@
  * else need to be "materialized" into physical tuples.  Note also that a
  * virtual tuple does not have any "system columns".
  *
+ * It is also possible for a TupleTableSlot to hold both physical and minimal
+ * copies of a tuple.  This is done when the slot is requested to provide
+ * the format other than the one it currently holds.  (Originally we attempted
+ * to handle such requests by replacing one format with the other, but that
+ * had the fatal defect of invalidating any pass-by-reference Datums pointing
+ * into the existing slot contents.)  Both copies must contain identical data
+ * payloads when this is the case.
+ *
  * The Datum/isnull arrays of a TupleTableSlot serve double duty.  When the
  * slot contains a virtual tuple, they are the authoritative data.	When the
  * slot contains a physical tuple, the arrays contain data extracted from
@@ -94,12 +102,12 @@
  *
  * tts_mintuple must always be NULL if the slot does not hold a "minimal"
  * tuple.  When it does, tts_mintuple points to the actual MinimalTupleData
- * object (the thing to be pfree'd if tts_shouldFree is true).  In this case
- * tts_tuple points at tts_minhdr and the fields of that are set correctly
+ * object (the thing to be pfree'd if tts_shouldFreeMin is true).  If the slot
+ * has only a minimal and not also a regular physical tuple, then tts_tuple
+ * points at tts_minhdr and the fields of that struct are set correctly
  * for access to the minimal tuple; in particular, tts_minhdr.t_data points
- * MINIMAL_TUPLE_OFFSET bytes before tts_mintuple.	(tts_mintuple is therefore
- * redundant, but for code simplicity we store it explicitly anyway.)  This
- * case otherwise behaves identically to the regular-physical-tuple case.
+ * MINIMAL_TUPLE_OFFSET bytes before tts_mintuple.  This allows column
+ * extraction to treat the case identically to regular physical tuples.
  *
  * tts_slow/tts_off are saved state for slot_deform_tuple, and should not
  * be touched by any other code.
@@ -109,7 +117,8 @@
 /* tts_flags */
 #define         TTS_ISEMPTY     1
 #define         TTS_SHOULDFREE 	2
-#define         TTS_VIRTUAL     4
+#define         TTS_SHOULDFREE_MEM 	4	/* should pfree tts_memtuple? */
+#define         TTS_VIRTUAL     8
 
 typedef struct TupleTableSlot
 {
@@ -256,8 +265,8 @@ static inline void slot_getsomeattrs(TupleTableSlot *slot, int attnum)
 	TupSetVirtualTuple(slot);
 }
 
-
-static inline void slot_getallattrs(TupleTableSlot *slot)
+static inline void
+slot_getallattrs(TupleTableSlot *slot)
 {
 	slot_getsomeattrs(slot, slot->tts_tupleDescriptor->natts);
 }
@@ -357,6 +366,11 @@ static inline bool slot_attisnull(TupleTableSlot *slot, int attnum)
 	return memtuple_attisnull(slot->PRIVATE_tts_memtuple, slot->tts_mt_bind, attnum);
 }
 
+#ifdef GPDB_83MERGE_FIXME
+#define TTS_HAS_PHYSICAL_TUPLE(slot)  \
+	((slot)->tts_tuple != NULL && (slot)->tts_tuple != &((slot)->tts_minhdr))
+#endif
+
 /* in executor/execTuples.c */
 extern void init_slot(TupleTableSlot *slot, TupleDesc tupdesc);
 
@@ -416,4 +430,5 @@ static inline HeapTuple ExecCopyGenericTuple(TupleTableSlot *slot)
 extern TupleTableSlot *ExecCopySlot(TupleTableSlot *dstslot, TupleTableSlot *srcslot);
 
 extern void ExecModifyMemTuple(TupleTableSlot *slot, Datum *values, bool *isnull, bool *doRepl);
+
 #endif   /* TUPTABLE_H */
diff --git a/src/include/gpopt/gpdbwrappers.h b/src/include/gpopt/gpdbwrappers.h
index ee64f5ad5376..c0763d885d02 100644
--- a/src/include/gpopt/gpdbwrappers.h
+++ b/src/include/gpopt/gpdbwrappers.h
@@ -590,7 +590,7 @@ namespace gpdb {
 
 	// returns the result of evaluating 'pexpr' as an Expr. Caller keeps ownership of 'pexpr'
 	// and takes ownership of the result 
-	Expr *PexprEvaluate(Expr *pexpr, Oid oidResultType);
+	Expr *PexprEvaluate(Expr *pexpr, Oid oidResultType, int32 iTypeMod);
 	
 	// interpret the value of "With oids" option from a list of defelems
 	bool FInterpretOidsOption(List *plOptions);
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index a1903294d8f7..ef5ced5aa128 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -87,6 +87,13 @@ extern void initStringInfoOfSize(StringInfo str, int bufsize);
  */
 extern void resetStringInfo(StringInfo str);
 
+/*------------------------
+ * resetStringInfo
+ * Clears the current content of the StringInfo, if any. The
+ * StringInfo remains valid.
+ */
+extern void resetStringInfo(StringInfo str);
+
 /*------------------------
  * appendStringInfo
  * Format text data under the control of fmt (an sprintf-style format string)
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index d9e622827142..f130576b75f5 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -92,7 +92,7 @@ typedef struct
 	gss_ctx_id_t ctx;			/* GSSAPI connection context */
 	gss_name_t	name;			/* GSSAPI client name */
 #endif
-} pg_gssinfo;
+}	pg_gssinfo;
 #endif
 
 /*
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 9ee1121ad568..0f862ee5b00e 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -75,7 +75,7 @@ typedef struct
 
 /*
  * The maximum workable length of a socket path is what will fit into
- * struct sockaddr_un.	This is usually only 100 or so bytes :-(.
+ * struct sockaddr_un.  This is usually only 100 or so bytes :-(.
  *
  * For consistency, always pass a MAXPGPATH-sized buffer to UNIXSOCK_PATH(),
  * then complain if the resulting string is >= UNIXSOCK_PATH_BUFLEN bytes.
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index 59652cc498a5..a7ec931146ad 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -51,7 +51,13 @@ typedef unsigned int pg_wchar;
 /*
  * Is a prefix byte for "private" single byte encodings?
  */
-#define IS_LCPRV1(c)	((unsigned char)(c) == 0x9a || (unsigned char)(c) == 0x9b)
+#define LCPRV1_A		0x9a
+#define LCPRV1_B		0x9b
+#define IS_LCPRV1(c)	((unsigned char)(c) == LCPRV1_A || (unsigned char)(c) == LCPRV1_B)
+#define IS_LCPRV1_A_RANGE(c)	\
+	((unsigned char)(c) >= 0xa0 && (unsigned char)(c) <= 0xdf)
+#define IS_LCPRV1_B_RANGE(c)	\
+	((unsigned char)(c) >= 0xe0 && (unsigned char)(c) <= 0xef)
 /*
  * Is a leading byte for "official" multibyte encodings?
  */
@@ -59,7 +65,13 @@ typedef unsigned int pg_wchar;
 /*
  * Is a prefix byte for "private" multibyte encodings?
  */
-#define IS_LCPRV2(c)	((unsigned char)(c) == 0x9c || (unsigned char)(c) == 0x9d)
+#define LCPRV2_A		0x9c
+#define LCPRV2_B		0x9d
+#define IS_LCPRV2(c)	((unsigned char)(c) == LCPRV2_A || (unsigned char)(c) == LCPRV2_B)
+#define IS_LCPRV2_A_RANGE(c)	\
+	((unsigned char)(c) >= 0xf0 && (unsigned char)(c) <= 0xf4)
+#define IS_LCPRV2_B_RANGE(c)	\
+	((unsigned char)(c) >= 0xf5 && (unsigned char)(c) <= 0xfe)
 
 /*----------------------------------------------------
  * leading characters
@@ -276,7 +288,11 @@ extern pg_enc2gettext pg_enc2gettext_tbl[];
  * pg_wchar stuff
  */
 typedef int (*mb2wchar_with_len_converter) (const unsigned char *from,
-														pg_wchar *to,
+													pg_wchar *to,
+													int len);
+
+typedef int (*wchar2mb_with_len_converter) (const pg_wchar *from,
+														unsigned char *to,
 														int len);
 
 typedef int (*mblen_converter) (const unsigned char *mbstr);
@@ -287,8 +303,10 @@ typedef int (*mbverifier) (const unsigned char *mbstr, int len);
 
 typedef struct
 {
-	mb2wchar_with_len_converter mb2wchar_with_len;		/* convert a multibyte
-														 * string to a wchar */
+	mb2wchar_with_len_converter mb2wchar_with_len;	/* convert a multibyte
+													 * string to a wchar */
+	wchar2mb_with_len_converter wchar2mb_with_len;	/* convert a wchar
+													 * string to a multibyte */
 	mblen_converter mblen;		/* get byte length of a char */
 	mbdisplaylen_converter dsplen;		/* get display width of a char */
 	mbverifier	mbverify;		/* verify multibyte sequence */
@@ -367,8 +385,12 @@ extern pg_encname *pg_char_to_encname_struct(const char *name);
 
 extern int	pg_mb2wchar(const char *from, pg_wchar *to);
 extern int	pg_mb2wchar_with_len(const char *from, pg_wchar *to, int len);
-extern int	pg_encoding_mb2wchar_with_len(int encoding,
-									const char *from, pg_wchar *to, int len);
+extern int pg_encoding_mb2wchar_with_len(int encoding,
+							  const char *from, pg_wchar *to, int len);
+extern int	pg_wchar2mb(const pg_wchar *from, char *to);
+extern int	pg_wchar2mb_with_len(const pg_wchar *from, char *to, int len);
+extern int pg_encoding_wchar2mb_with_len(int encoding,
+							  const pg_wchar *from, char *to, int len);
 extern int	pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2);
 extern int	pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n);
 extern int	pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n);
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index ced8792e33be..30249adf1021 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.194 2007/04/16 18:29:56 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.199.2.1 2009/12/09 21:58:17 tgl Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to other files.
@@ -25,6 +25,7 @@
 
 #include "pgtime.h"				/* for pg_time_t */
 
+
 #define PG_VERSIONSTR "postgres (Greenplum Database) " PG_VERSION "\n"
 #define PG_BACKEND_VERSIONSTR "postgres (Greenplum Database) " PG_VERSION "\n"
 
@@ -238,7 +239,6 @@ extern PGDLLIMPORT Oid MyDatabaseId;
 
 extern PGDLLIMPORT Oid MyDatabaseTableSpace;
 
-
 /*
  * Date/Time Configuration
  *
@@ -325,6 +325,19 @@ extern int gp_vmem_protect_limit;
 extern int gp_vmem_protect_gang_cache_limit;
 
 /* in tcop/postgres.c */
+
+#if defined(__ia64__) || defined(__ia64)
+typedef struct
+{
+	char	   *stack_base_ptr;
+	char	   *register_stack_base_ptr;
+} pg_stack_base_t;
+#else
+typedef char *pg_stack_base_t;
+#endif
+
+extern pg_stack_base_t set_stack_base(void);
+extern void restore_stack_base(pg_stack_base_t base);
 extern void check_stack_depth(void);
 
 
diff --git a/src/include/nodes/bitmapset.h b/src/include/nodes/bitmapset.h
index a4f7566bee99..b426de83d058 100644
--- a/src/include/nodes/bitmapset.h
+++ b/src/include/nodes/bitmapset.h
@@ -13,7 +13,7 @@
  *
  * Copyright (c) 2003-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/nodes/bitmapset.h,v 1.9 2007/01/05 22:19:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/bitmapset.h,v 1.10 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index afb846f0fa2f..45e70f4f8a57 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.167 2007/02/06 02:59:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.183.2.1 2010/07/28 04:51:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,7 +59,12 @@ typedef struct PartitionSelectorState PartitionSelectorState;
  *		Predicate			partial-index predicate, or NIL if none
  *		PredicateState		exec state for predicate, or NIL if none
  *		Unique				is it a unique index?
+ *		ReadyForInserts		is it valid for inserts?
  *		Concurrent			are we doing a concurrent index build?
+ *		BrokenHotChain		did we detect any broken HOT chains?
+ *
+ * ii_Concurrent and ii_BrokenHotChain are used only during index build;
+ * they're conventionally set to false otherwise.
  * ----------------
  */
 typedef struct IndexInfo
@@ -72,7 +77,9 @@ typedef struct IndexInfo
 	List	   *ii_Predicate;	/* list of Expr */
 	List	   *ii_PredicateState;		/* list of ExprState */
 	bool		ii_Unique;
+	bool		ii_ReadyForInserts;
 	bool		ii_Concurrent;
+	bool		ii_BrokenHotChain;
 
 	/* Additional info needed by index creation.
 	 * Used for
@@ -546,7 +553,10 @@ typedef struct EState
 	ScanDirection es_direction; /* current scan direction */
 	Snapshot	es_snapshot;	/* time qual to use */
 	Snapshot	es_crosscheck_snapshot; /* crosscheck time qual for RI */
-	List	   *es_range_table; /* List of RangeTableEntrys */
+	List	   *es_range_table; /* List of RangeTblEntry */
+
+	/* If query can insert/delete tuples, the command ID to mark them with */
+	CommandId	es_output_cid;
 
 	/* Info about target table for insert/update/delete queries: */
 	ResultRelInfo *es_result_relations; /* array of ResultRelInfos */
@@ -554,6 +564,9 @@ typedef struct EState
 	ResultRelInfo *es_result_relation_info;		/* currently active array elt */
 	JunkFilter *es_junkFilter;	/* currently active junk filter */
 
+	/* Stuff used for firing triggers: */
+	List	   *es_trig_target_relations;		/* trigger-only ResultRelInfos */
+
 	/* partitioning info for target relation */
 	PartitionNode *es_result_partitions;
 
@@ -564,6 +577,7 @@ typedef struct EState
 
 	/* Stuff used for SELECT INTO: */
 	Relation	es_into_relation_descriptor;
+	bool		es_into_relation_use_wal;
 	bool		es_into_relation_is_bulkload;
 
 	ItemPointerData es_into_relation_last_heap_tid;
@@ -583,14 +597,14 @@ typedef struct EState
 	Oid			es_lastoid;		/* last oid processed (by INSERT) */
 	List	   *es_rowMarks;	/* not good place, but there is no other */
 
-	bool		es_is_subquery;	/* true if subquery (es_query_cxt not mine) */
-
 	bool		es_instrument;	/* true requests runtime instrumentation */
 	bool		es_select_into; /* true if doing SELECT INTO */
 	bool		es_into_oids;	/* true to generate OIDs in SELECT INTO */
 
 	List	   *es_exprcontexts;	/* List of ExprContexts within EState */
 
+	List	   *es_subplanstates;		/* List of PlanState for SubPlans */
+
 	/*
 	 * this ExprContext is for per-output-tuple operations, such as constraint
 	 * checks and index-value computations.  It will be reset for each output
@@ -608,6 +622,9 @@ typedef struct EState
 	/* Additions for MPP plan slicing. */
 	struct SliceTable *es_sliceTable;
 
+	/* Current positions of cursors used in CURRENT OF expressions */
+	List	   *es_cursorPositions;
+
 	/* Data structure for node sharing */
 	List	  **es_sharenode;
 
@@ -646,16 +663,13 @@ typedef struct EState
 	int			currentExecutingSliceId;
 
 	/*
-	 * Each subplan has its own EState. This value indicates
-	 * the level of the corresponding subplan for this EState
-	 * with respect to the main plan tree.
-	 *
+	 * This is >0, if we're processing a subplan.
 	 * This is used to determine whether we could eager free
 	 * the Material node on top of Broadcast inside a subplan
 	 * (for supporting correlated subqueries). The Material
 	 * node can be eager-free'ed only when this value is 0.
 	 */
-	int			subplanLevel;
+	int			currentSubplanLevel;
 
 	/*
 	 * The root slice id for this EState.
@@ -721,7 +735,7 @@ typedef struct TupleHashTableData
 	HTAB	   *hashtab;		/* underlying dynahash table */
 	int			numCols;		/* number of columns in lookup key */
 	AttrNumber *keyColIdx;		/* attr numbers of key columns */
-	FmgrInfo   *tab_hash_funcs;	/* hash functions for table datatype(s) */
+	FmgrInfo   *tab_hash_funcs; /* hash functions for table datatype(s) */
 	FmgrInfo   *tab_eq_funcs;	/* equality functions for table datatype(s) */
 	MemoryContext tablecxt;		/* memory context containing table */
 	MemoryContext tempcxt;		/* context for function evaluations */
@@ -829,6 +843,17 @@ typedef struct GenericExprState
 	ExprState  *arg;			/* state of my child node */
 } GenericExprState;
 
+/* ----------------
+ *		WholeRowVarExprState node
+ * ----------------
+ */
+typedef struct WholeRowVarExprState
+{
+	ExprState	xprstate;
+	struct PlanState *parent;	/* parent PlanState, or NULL if none */
+	JunkFilter *wrv_junkFilter; /* JunkFilter to remove resjunk cols */
+} WholeRowVarExprState;
+
 /* ----------------
  *		AggrefExprState node
  * ----------------
@@ -1063,13 +1088,11 @@ typedef struct PartBoundOpenExprState
 typedef struct SubPlanState
 {
 	ExprState	xprstate;
-	EState	   *sub_estate;		/* subselect plan has its own EState */
 	struct PlanState *planstate;	/* subselect plan's state tree */
 	ExprState  *testexpr;		/* state of combining expression */
 	List	   *args;			/* states of argument expression(s) */
-	bool		needShutdown;	/* TRUE = need to shutdown subplan */
-
 	struct MemTupleData *curTuple;                /* copy of most recent tuple from subplan */
+	Datum		curArray;		/* most recent array from ARRAY() subplan */
 	/* these are used when hashing the subselect's output: */
 	ProjectionInfo *projLeft;	/* for projecting lefthand exprs */
 	ProjectionInfo *projRight;	/* for projecting subselect output */
@@ -1077,14 +1100,13 @@ typedef struct SubPlanState
 	TupleHashTable hashnulls;	/* hash table for rows with null(s) */
 	bool		havehashrows;	/* TRUE if hashtable is not empty */
 	bool		havenullrows;	/* TRUE if hashnulls is not empty */
-
 	MemoryContext hashtablecxt;	/* memory context containing hash tables */
 	MemoryContext hashtempcxt;	/* temp memory context for hash tables */
-	ExprContext *innerecontext;	/* working context for comparisons */
+	ExprContext *innerecontext; /* econtext for computing inner tuples */
 	AttrNumber *keyColIdx;		/* control data for hash tables */
-	FmgrInfo   *tab_hash_funcs;	/* hash functions for table datatype(s) */
+	FmgrInfo   *tab_hash_funcs; /* hash functions for table datatype(s) */
 	FmgrInfo   *tab_eq_funcs;	/* equality functions for table datatype(s) */
-	FmgrInfo   *lhs_hash_funcs;	/* hash functions for lefthand datatype(s) */
+	FmgrInfo   *lhs_hash_funcs; /* hash functions for lefthand datatype(s) */
 	FmgrInfo   *cur_eq_funcs;	/* equality functions for LHS vs. table */
 } SubPlanState;
 
@@ -1112,7 +1134,7 @@ typedef struct FieldStoreState
 } FieldStoreState;
 
 /* ----------------
- *      CoerceViaIOState node
+ *		CoerceViaIOState node
  * ----------------
  */
 typedef struct CoerceViaIOState
@@ -1122,11 +1144,11 @@ typedef struct CoerceViaIOState
 	FmgrInfo	outfunc;		/* lookup info for source output function */
 	FmgrInfo	infunc;			/* lookup info for result input function */
 	Oid			intypioparam;	/* argument needed for input function */
-}CoerceViaIOState;
+} CoerceViaIOState;
 
-/* ---------------------
- *	ArrayCoerceExprState node
- *  ---------------------
+/* ----------------
+ *		ArrayCoerceExprState node
+ * ----------------
  */
 typedef struct ArrayCoerceExprState
 {
@@ -1246,7 +1268,7 @@ typedef struct XmlExprState
 {
 	ExprState	xprstate;
 	List	   *named_args;		/* ExprStates for named arguments */
-	FmgrInfo   *named_outfuncs;	/* array of output fns for named arguments */
+	FmgrInfo   *named_outfuncs; /* array of output fns for named arguments */
 	List	   *args;			/* ExprStates for other arguments */
 } XmlExprState;
 
@@ -1834,6 +1856,7 @@ typedef struct BitmapTableScanState
 /* ----------------
  *	 TidScanState information
  *
+ *		isCurrentOf    scan has a CurrentOfExpr qual
  *		NumTids		   number of tids in this scan
  *		TidPtr		   index of currently fetched tid
  *		TidList		   evaluated item pointers (array of size NumTids)
@@ -1843,6 +1866,7 @@ typedef struct TidScanState
 {
 	ScanState	ss;				/* its first field is NodeTag */
 	List	   *tss_tidquals;	/* list of ExprState nodes */
+	bool		tss_isCurrentOf;
 	int			tss_NumTids;
 	int			tss_TidPtr;
 	int			tss_MarkTidPtr;
@@ -1854,17 +1878,13 @@ typedef struct TidScanState
  *	 SubqueryScanState information
  *
  *		SubqueryScanState is used for scanning a sub-query in the range table.
- *		The sub-query will have its own EState, which we save here.
  *		ScanTupleSlot references the current output tuple of the sub-query.
- *
- *		SubEState		   exec state for sub-query
  * ----------------
  */
 typedef struct SubqueryScanState
 {
 	ScanState	ss;				/* its first field is NodeTag */
 	PlanState  *subplan;
-	EState	   *sss_SubEState;
 	bool		cdb_want_ctid;	/* true => ctid is referenced in targetlist */
 	ItemPointerData cdb_fake_ctid;
 } SubqueryScanState;
@@ -2127,6 +2147,7 @@ typedef struct NestLoopState
  *		NumClauses		   number of mergejoinable join clauses
  *		Clauses			   info for each mergejoinable clause
  *		JoinState		   current "state" of join.  see execdefs.h
+ *		ExtraMarks		   true to issue extra Mark operations on inner scan
  *		FillOuter		   true if should emit unjoined outer tuples anyway
  *		FillInner		   true if should emit unjoined inner tuples anyway
  *		MatchedOuter	   true if found a join match for current outer tuple
@@ -2149,6 +2170,7 @@ typedef struct MergeJoinState
 	int			mj_NumClauses;
 	MergeJoinClause mj_Clauses; /* array of length mj_NumClauses */
 	int			mj_JoinState;
+	bool		mj_ExtraMarks;
 	bool		mj_FillOuter;
 	bool		mj_FillInner;
 	bool		mj_MatchedOuter;
@@ -2252,7 +2274,7 @@ typedef union GenericTupStore
 typedef struct MaterialState
 {
 	ScanState	ss;				/* its first field is NodeTag */
-	bool		randomAccess;	/* need random access to subplan output? */
+	int			eflags;			/* capability flags to pass to tuplestore */
 	bool		eof_underlying; /* reached end of underlying plan? */
 	bool		ts_destroyed;	/* called destroy tuple store? */
 
@@ -2300,9 +2322,15 @@ typedef struct SortState
 {
 	ScanState	ss;				/* its first field is NodeTag */
 	bool		randomAccess;	/* need random access to sort output? */
+	bool		bounded;		/* is the result set bounded? */
+	int64		bound;			/* if bounded, how many tuples are needed */
 	bool		sort_Done;		/* sort completed yet? */
+	bool		bounded_Done;	/* value of bounded we did the sort with */
+	int64		bound_Done;		/* value of bound we did the sort with */
 	GenericTupStore *tuplesortstate; /* private state of tuplesort.c */
 	/* CDB */ /* limit state */
+
+	/* GPDB_83MERGE_FIXME: Are these redundant with the "bound" fields? */
 	ExprState  *limitOffset;	/* OFFSET parameter, or NULL if none */
 	ExprState  *limitCount;		/* COUNT parameter, or NULL if none */
 	bool		noduplicates;	/* true if discard duplicate rows */
@@ -2499,6 +2527,7 @@ typedef struct SetOpState
 typedef enum
 {
 	LIMIT_INITIAL,				/* initial state for LIMIT node */
+	LIMIT_RESCAN,				/* rescan after recomputing parameters */
 	LIMIT_EMPTY,				/* there are no returnable rows */
 	LIMIT_INWINDOW,				/* have returned a row in the window */
 	LIMIT_SUBPLANEOF,			/* at EOF of subplan (within window) */
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 1d76668388d1..f6f8c475db60 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/makefuncs.h,v 1.57 2007/01/05 22:19:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/makefuncs.h,v 1.61 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,7 @@ extern TargetEntry *makeTargetEntry(Expr *expr,
 
 extern TargetEntry *flatCopyTargetEntry(TargetEntry *src_tle);
 
-/* extern FromExpr *makeFromExpr(List *fromlist, Node *quals); * moved to analyze.c */
+extern FromExpr *makeFromExpr(List *fromlist, Node *quals);
 
 extern Const *makeConst(Oid consttype,
 		  int32 consttypmod,
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index ce32cede087d..73420b021d06 100644
--- a/src/include/nodes/memnodes.h
+++ b/src/include/nodes/memnodes.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/memnodes.h,v 1.32 2007/01/05 22:19:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/memnodes.h,v 1.34 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index a63d8bbc6a93..4340d8d18e8d 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/nodeFuncs.h,v 1.25 2007/01/05 22:19:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/nodeFuncs.h,v 1.26 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 48f29e690a88..fc1a11782324 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.195 2007/02/19 07:03:31 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.205 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,6 +41,7 @@ typedef enum NodeTag
 	T_CdbProcess,
 	T_Slice,
 	T_SliceTable,
+	T_CursorPosInfo,
 	T_ShareNodeEntry,
 	T_PartitionState,
 	T_QueryDispatchDesc,
@@ -205,13 +206,13 @@ typedef enum NodeTag
 	T_RangeTblRef,
 	T_JoinExpr,
 	T_FromExpr,
+	T_IntoClause,
 	T_Flow,
 	T_WindowFrame,
 	T_WindowFrameEdge,
 	T_WindowKey,
 	T_Grouping,
 	T_GroupId,
-	T_IntoClause,
     T_AggOrder,
 	T_PercentileExpr,
 	T_DMLActionExpr,
@@ -252,6 +253,7 @@ typedef enum NodeTag
 	T_NullTestState,
 	T_CoerceToDomainState,
 	T_DomainConstraintState,
+	T_WholeRowVarExprState,		/* will be in a more natural position in 9.3 */
 	T_WindowRefExprState,
 	T_GroupingFuncExprState,
 	T_PercentileExprState,
@@ -336,7 +338,7 @@ typedef enum NodeTag
 	T_OidList,
 
 	/*
-	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
+	 * TAGS FOR STATEMENT NODES (mostly in parsenodes.h)
 	 */
 	T_Query = 700,
 	T_PlannedStmt,
@@ -384,7 +386,7 @@ typedef enum NodeTag
 	T_AlterSeqStmt,
 	T_VariableSetStmt,
 	T_VariableShowStmt,
-	T_VariableResetStmt,
+	T_DiscardStmt,
 	T_CreateTrigStmt,
 	T_DropPropertyStmt,
 	T_CreatePLangStmt,
@@ -421,6 +423,10 @@ typedef enum NodeTag
 	T_AlterOwnerStmt,
 	T_DropOwnedStmt,
 	T_ReassignOwnedStmt,
+	T_CompositeTypeStmt,
+	T_CreateEnumStmt,
+	T_AlterTSDictionaryStmt,
+	T_AlterTSConfigurationStmt,
 	T_WindowSpec,
 	T_WindowSpecParse,
 	T_PartitionBy,
@@ -440,9 +446,10 @@ typedef enum NodeTag
 	T_AlterTypeStmt,
 	T_SetDistributionCmd,
 
-	/**/
-	
-	T_A_Expr = 850,
+	/*
+	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
+	 */
+	T_A_Expr = 900,
 	T_ColumnRef,
 	T_ParamRef,
 	T_A_Const,
@@ -470,7 +477,6 @@ typedef enum NodeTag
 	T_FuncWithArgs,
 	T_PrivTarget,
 	T_CreateOpClassItem,
-	T_CompositeTypeStmt,
 	T_InhRelation,
 	T_FunctionParameter,
 	T_LockingClause,
@@ -495,7 +501,7 @@ typedef enum NodeTag
 	 * purposes (usually because they are involved in APIs where we want to
 	 * pass multiple object types through the same pointer).
 	 */
-	T_TriggerData = 900,		/* in commands/trigger.h */
+	T_TriggerData = 950,		/* in commands/trigger.h */
 	T_ReturnSetInfo,			/* in nodes/execnodes.h */
 	T_InlineCodeBlock,			/* in nodes/parsenodes.h */
     T_HashBitmap,               /* in nodes/tidbitmap.h */
@@ -624,10 +630,9 @@ typedef double Cost;			/* execution cost (in page-access units) */
 
 /*
  * CmdType -
- *	  enums for type of operation represented by a Query
+ *	  enums for type of operation represented by a Query or PlannedStmt
  *
- * ??? could have put this in parsenodes.h but many files not in the
- *	  optimizer also need this...
+ * This is needed in both parsenodes.h and plannodes.h, so put it here...
  */
 typedef enum CmdType
 {
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 3fe73e505d22..40fcb647d81a 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -9,12 +9,11 @@
  * the node.  Access to the original source text is needed to make use of
  * the location.
  *
- *
  * Portions Copyright (c) 2006-2009, Greenplum inc
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.340 2007/02/03 14:06:55 petere Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.359 2008/02/07 17:09:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +30,7 @@ typedef struct PartitionNode PartitionNode; /* see relation.h */
 typedef enum QuerySource
 {
 	QSRC_ORIGINAL,				/* original parsetree (explicit query) */
-	QSRC_PARSER,				/* added by parse analysis */
+	QSRC_PARSER,				/* added by parse analysis (now unused) */
 	QSRC_INSTEAD_RULE,			/* added by unconditional INSTEAD rule */
 	QSRC_QUAL_INSTEAD_RULE,		/* added by conditional INSTEAD rule */
 	QSRC_NON_INSTEAD_RULE,		/* added by non-INSTEAD rule */
@@ -98,10 +97,7 @@ typedef uint32 AclMode;			/* a bitmask of privilege bits */
  *	  but the original DeclareCursorStmt is stored in utilityStmt.
  *
  *	  Planning converts a Query tree into a Plan tree headed by a PlannedStmt
- *	  node.  Eventually, the Query tree will not used by the executor.
- *    Currently, however, the Query structure is carried by the PlannedStmt.
- *
- *    TODO Update the preceding comment, when PlannedStmt support is complete.
+ *	  node --- the Query structure is not used by the executor.
  */
 typedef struct Query
 {
@@ -124,6 +120,7 @@ typedef struct Query
 	bool		hasAggs;		/* has aggregates in tlist or havingQual */
 	bool		hasWindFuncs;	/* has window function(s) in target list */
 	bool		hasSubLinks;	/* has subquery SubLink */
+	bool        hasDynamicFunctions; /* has functions with unstable return types */
 
 	List	   *rtable;			/* list of range table entries */
 	FromExpr   *jointree;		/* table join tree (FROM and WHERE clauses) */
@@ -171,17 +168,6 @@ typedef struct Query
 	Node	   *setOperations;	/* set-operation tree if this is top level of
 								 * a UNION/INTERSECT/EXCEPT query */
 
-	/*
-	 * TODO Eventually we should remove these 4 members because they're not
-	 * used here. Instead they're in PlannedStmt.  However, we need to read
-	 * old formats, e.g. for catalog upgrade. So for now, it's easier to leave
-	 * them here.
-	 */
-	List	   *resultRelations;	/* Unused. Now in PlannedStmt. */
-	PartitionNode *result_partitions;	/* Unused. Now in PlannedStmt. */
-	List	   *result_aosegnos;	/* Unused. Now in PlannedStmt. */
-	List	   *returningLists; /* Unused. Now in PlannedStmt. */
-
 	/*
 	 * MPP: Used only on QD. Don't serialize. Holds the result distribution
 	 * policy for SELECT ... INTO and set operations.
@@ -413,7 +399,7 @@ typedef struct SortBy
 {
 	NodeTag		type;
 	SortByDir	sortby_dir;		/* ASC/DESC/USING */
-	SortByNulls	sortby_nulls;	/* NULLS FIRST/LAST */
+	SortByNulls sortby_nulls;	/* NULLS FIRST/LAST */
 	List	   *useOp;			/* name of op to use, if SORTBY_USING */
 	Node	   *node;			/* expression to sort on */
 	int			location;		/* operator location, or -1 if none/unknown */
@@ -506,7 +492,7 @@ typedef struct IndexElem
 	Node	   *expr;			/* expression to index, or NULL */
 	List	   *opclass;		/* name of desired opclass; NIL = default */
 	SortByDir	ordering;		/* ASC/DESC/default */
-	SortByNulls	nulls_ordering;	/* FIRST/LAST/default */
+	SortByNulls nulls_ordering; /* FIRST/LAST/default */
 } IndexElem;
 
 /*
@@ -764,8 +750,8 @@ typedef struct SortClause
 {
 	NodeTag		type;
 	Index		tleSortGroupRef;	/* reference into targetlist */
-	Oid			sortop;				/* the ordering operator ('<' op) */
-	bool		nulls_first;		/* do NULLs come before normal values? */
+	Oid			sortop;			/* the ordering operator ('<' op) */
+	bool		nulls_first;	/* do NULLs come before normal values? */
 } SortClause;
 
 /*
@@ -1056,10 +1042,12 @@ typedef struct SetOperationStmt
 /*****************************************************************************
  *		Other Statements (no optimizations required)
  *
- *		Some of them require a little bit of transformation (which is also
- *		done by transformStmt). The whole structure is then passed on to
- *		ProcessUtility (by-passing the optimization step) as the utilityStmt
- *		field in Query.
+ *		These are not touched by parser/analyze.c except to put them into
+ *		the utilityStmt field of a Query.  This is eventually passed to
+ *		ProcessUtility (by-passing rewriting and planning).  Some of the
+ *		statements do need attention from parse analysis, and this is
+ *		done by routines in parser/parse_utilcmd.c after ProcessUtility
+ *		receives the command for execution.
  *****************************************************************************/
 
 /*
@@ -1094,6 +1082,10 @@ typedef enum ObjectType
 	OBJECT_FILESPACE,
 	OBJECT_TABLESPACE,
 	OBJECT_TRIGGER,
+	OBJECT_TSCONFIGURATION,
+	OBJECT_TSDICTIONARY,
+	OBJECT_TSPARSER,
+	OBJECT_TSTEMPLATE,
 	OBJECT_TYPE,
 	OBJECT_VIEW,
 	OBJECT_RESQUEUE
@@ -1172,7 +1164,7 @@ typedef enum AlterTableType
 	AT_AddConstraint,			/* add constraint */
 	AT_AddConstraintRecurse,	/* internal to commands/tablecmds.c */
 	AT_ProcessedConstraint,		/* pre-processed add constraint (local in
-								 * parser/analyze.c) */
+								 * parser/parse_utilcmd.c) */
 	AT_DropConstraint,			/* drop constraint */
 	AT_DropConstraintQuietly,	/* drop constraint, no error/warning (local in
 								 * commands/tablecmds.c) */
@@ -1185,11 +1177,17 @@ typedef enum AlterTableType
 	AT_SetRelOptions,			/* SET (...) -- AM specific parameters */
 	AT_ResetRelOptions,			/* RESET (...) -- AM specific parameters */
 	AT_EnableTrig,				/* ENABLE TRIGGER name */
+	AT_EnableAlwaysTrig,		/* ENABLE ALWAYS TRIGGER name */
+	AT_EnableReplicaTrig,		/* ENABLE REPLICA TRIGGER name */
 	AT_DisableTrig,				/* DISABLE TRIGGER name */
 	AT_EnableTrigAll,			/* ENABLE TRIGGER ALL */
 	AT_DisableTrigAll,			/* DISABLE TRIGGER ALL */
 	AT_EnableTrigUser,			/* ENABLE TRIGGER USER */
 	AT_DisableTrigUser,			/* DISABLE TRIGGER USER */
+	AT_EnableRule,				/* ENABLE RULE name */
+	AT_EnableAlwaysRule,		/* ENABLE ALWAYS RULE name */
+	AT_EnableReplicaRule,		/* ENABLE REPLICA RULE name */
+	AT_DisableRule,				/* DISABLE RULE name */
 	AT_AddInherit,				/* INHERIT parent */
 	AT_DropInherit,				/* NO INHERIT parent */
 	AT_SetDistributedBy,		/* SET DISTRIBUTED BY */
@@ -1389,15 +1387,14 @@ typedef struct SingleRowErrorDesc
  *
  * We support "COPY relation FROM file", "COPY relation TO file", and
  * "COPY (query) TO file".	In any given CopyStmt, exactly one of "relation"
- * and "query" must be non-NULL.  Note: "query" is a SelectStmt before
- * parse analysis, and a Query afterwards.
+ * and "query" must be non-NULL.
  * ----------------------
  */
 typedef struct CopyStmt
 {
 	NodeTag		type;
 	RangeVar   *relation;		/* the relation to copy */
-	Query	   *query;			/* the query to copy */
+	Node	   *query;			/* the SELECT query to copy */
 	List	   *attlist;		/* List of column names (as Strings), or NIL
 								 * for all columns */
 	bool		is_from;		/* TO or FROM */
@@ -1410,6 +1407,42 @@ typedef struct CopyStmt
 	List		*ao_segnos;		/* AO segno map */
 } CopyStmt;
 
+/* ----------------------
+ * SET Statement (includes RESET)
+ *
+ * "SET var TO DEFAULT" and "RESET var" are semantically equivalent, but we
+ * preserve the distinction in VariableSetKind for CreateCommandTag().
+ * ----------------------
+ */
+typedef enum
+{
+	VAR_SET_VALUE,				/* SET var = value */
+	VAR_SET_DEFAULT,			/* SET var TO DEFAULT */
+	VAR_SET_CURRENT,			/* SET var FROM CURRENT */
+	VAR_SET_MULTI,				/* special case for SET TRANSACTION ... */
+	VAR_RESET,					/* RESET var */
+	VAR_RESET_ALL				/* RESET ALL */
+} VariableSetKind;
+
+typedef struct VariableSetStmt
+{
+	NodeTag		type;
+	VariableSetKind kind;
+	char	   *name;			/* variable to be set */
+	List	   *args;			/* List of A_Const nodes */
+	bool		is_local;		/* SET LOCAL? */
+} VariableSetStmt;
+
+/* ----------------------
+ * Show Statement
+ * ----------------------
+ */
+typedef struct VariableShowStmt
+{
+	NodeTag		type;
+	char	   *name;
+} VariableShowStmt;
+
 /* ----------------------
  *		Create Table Statement
  *
@@ -1521,7 +1554,7 @@ typedef struct CreateForeignStmt
  * relation).  We should never have both in the same node!
  *
  * Constraint attributes (DEFERRABLE etc) are initially represented as
- * separate Constraint nodes for simplicity of parsing.  analyze.c makes
+ * separate Constraint nodes for simplicity of parsing.  parse_utilcmd.c makes
  * a pass through the constraints list to attach the info to the appropriate
  * FkConstraint node (and, perhaps, someday to other kinds of constraints).
  * ----------
@@ -1860,8 +1893,7 @@ typedef struct AlterRoleSetStmt
 {
 	NodeTag		type;
 	char	   *role;			/* role name */
-	char	   *variable;		/* GUC variable name */
-	List	   *value;			/* value for variable, or NIL for Reset */
+	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
 } AlterRoleSetStmt;
 
 typedef struct DropRoleStmt
@@ -2151,12 +2183,10 @@ typedef struct IndexStmt
 	char	   *idxname;		/* name of new index, or NULL for default */
 	RangeVar   *relation;		/* relation to build index on */
 	char	   *accessMethod;	/* name of access method (eg. btree) */
-	char	   *tableSpace;		/* tablespace, or NULL to use parent's */
+	char	   *tableSpace;		/* tablespace, or NULL for default */
 	List	   *indexParams;	/* a list of IndexElem */
 	List	   *options;		/* options from WITH clause */
 	Node	   *whereClause;	/* qualification (partial-index predicate) */
-	List	   *rangetable;		/* range table for qual and/or expressions,
-								 * filled in by transformStmt() */
 	bool		is_part_child;	/* in service of a part of a partition? */
 	bool		unique;			/* is index unique? */
 	bool		primary;		/* is index on primary key? */
@@ -2167,7 +2197,7 @@ typedef struct IndexStmt
 	bool		concurrent;		/* should this be a concurrent index build? */
 	List		*idxOids;		/* For MPP. We use List here because the
 								 * bitmap index needs 3 additional oids. */
-	bool		do_part;		/* build indexes for child partitions */
+	bool		is_split_part;	/* Is this for SPLIT PARTITION command? */
 } IndexStmt;
 
 /* ----------------------
@@ -2346,7 +2376,6 @@ typedef struct RuleStmt
 	bool		instead;		/* is a 'do instead'? */
 	List	   *actions;		/* the action statements */
 	bool		replace;		/* OR REPLACE */
-	Oid			ruleOid;		/* rule Oid */
 } RuleStmt;
 
 /* ----------------------
@@ -2418,6 +2447,21 @@ typedef struct CompositeTypeStmt
 	Oid			comptypeOid;
 } CompositeTypeStmt;
 
+/* ----------------------
+ *		Create Type Statement, enum types
+ * ----------------------
+ */
+typedef struct CreateEnumStmt
+{
+	NodeTag		type;
+	List	   *typeName;		/* qualified name (list of Value strings) */
+	List	   *vals;			/* enum values (list of Value strings) */
+
+	Oid			enumTypeOid;	/* Oid to assign, when dispatching from QD to QEs */
+	Oid			enumArrayOid;	/* Oid to assign to array type, when dispatching from QD to QEs */
+	List	   *valOids;		/* Oids to assign to the values */
+} CreateEnumStmt;
+
 
 /* ----------------------
  *		Create View Statement
@@ -2428,10 +2472,11 @@ typedef struct ViewStmt
 	NodeTag		type;
 	RangeVar   *view;			/* the view to be created */
 	List	   *aliases;		/* target column names */
-	Query	   *query;			/* the SQL statement */
+	Node	   *query;			/* the SELECT query */
 	bool		replace;		/* replace an existing view? */
 	Oid         relOid;			/* create view with this relOid */
 	Oid			comptypeOid;
+	Oid			comptypeArrayOid;
 	Oid			rewriteOid;		/* Oid for rewrite rule */
 } ViewStmt;
 
@@ -2471,9 +2516,8 @@ typedef struct AlterDatabaseStmt
 typedef struct AlterDatabaseSetStmt
 {
 	NodeTag		type;
-	char	   *dbname;
-	char	   *variable;
-	List	   *value;
+	char	   *dbname;			/* database name */
+	VariableSetStmt *setstmt;	/* SET or RESET subcommand */
 } AlterDatabaseSetStmt;
 
 /* ----------------------
@@ -2515,7 +2559,7 @@ typedef struct VacuumStmt
 	bool		analyze;		/* do ANALYZE step */
 	bool		verbose;		/* print progress info */
 	bool		rootonly;		/* only ANALYZE root partition tables */
-	int			freeze_min_age;	/* min freeze age, or -1 to use default */
+	int			freeze_min_age; /* min freeze age, or -1 to use default */
 	RangeVar   *relation;		/* single table to process, or NULL */
 	List	   *va_cols;		/* list of column names, or NIL for all */
 
@@ -2576,7 +2620,7 @@ typedef struct VacuumStmt
 typedef struct ExplainStmt
 {
 	NodeTag		type;
-	Query	   *query;			/* the query */
+	Node	   *query;			/* the query (as a raw parse tree) */
 	bool		verbose;		/* print plan info */
 	bool		analyze;		/* get statistics by executing plan */
 	bool		dxl;			/* display plan in dxl format */
@@ -2592,39 +2636,22 @@ typedef struct CheckPointStmt
 } CheckPointStmt;
 
 /* ----------------------
- * Set Statement
+ * Discard Statement
  * ----------------------
  */
 
-typedef struct VariableSetStmt
+typedef enum DiscardMode
 {
-	NodeTag		type;
-	char	   *name;
-	List	   *args;
-	bool		is_local;		/* SET LOCAL */
-} VariableSetStmt;
+	DISCARD_ALL,
+	DISCARD_PLANS,
+	DISCARD_TEMP
+} DiscardMode;
 
-/* ----------------------
- * Show Statement
- * ----------------------
- */
-
-typedef struct VariableShowStmt
+typedef struct DiscardStmt
 {
 	NodeTag		type;
-	char	   *name;
-} VariableShowStmt;
-
-/* ----------------------
- * Reset Statement
- * ----------------------
- */
-
-typedef struct VariableResetStmt
-{
-	NodeTag		type;
-	char	   *name;
-} VariableResetStmt;
+	DiscardMode target;
+} DiscardStmt;
 
 /* ----------------------
  *		LOCK Statement
@@ -2717,8 +2744,7 @@ typedef struct PrepareStmt
 	NodeTag		type;
 	char	   *name;			/* Name of plan, arbitrary */
 	List	   *argtypes;		/* Types of parameters (List of TypeName) */
-	List	   *argtype_oids;	/* Types of parameters (OIDs) */
-	Query	   *query;			/* The query itself */
+	Node	   *query;			/* The query itself (as a raw parsetree) */
 } PrepareStmt;
 
 
@@ -2731,11 +2757,7 @@ typedef struct ExecuteStmt
 {
 	NodeTag		type;
 	char	   *name;			/* The name of the plan to execute */
-	IntoClause *into;			/* CTAS target or NULL */
-//	RangeVar   *into;			/* Optional table to store results in */
-//	List	   *intoOptions;	/* Options from WITH clause */
-//	OnCommitAction into_on_commit;		/* What do we do at COMMIT? */
-//	char	   *into_tbl_space; /* Tablespace to use, or NULL */
+	IntoClause *into;			/* Optional table to store results in */
 	List	   *params;			/* Values to assign to parameters */
 } ExecuteStmt;
 
@@ -2771,4 +2793,33 @@ typedef struct ReassignOwnedStmt
 	char	   *newrole;
 } ReassignOwnedStmt;
 
+/*
+ * TS Dictionary stmts: DefineStmt, RenameStmt and DropStmt are default
+ */
+typedef struct AlterTSDictionaryStmt
+{
+	NodeTag		type;
+	List	   *dictname;		/* qualified name (list of Value strings) */
+	List	   *options;		/* List of DefElem nodes */
+} AlterTSDictionaryStmt;
+
+/*
+ * TS Configuration stmts: DefineStmt, RenameStmt and DropStmt are default
+ */
+typedef struct AlterTSConfigurationStmt
+{
+	NodeTag		type;
+	List	   *cfgname;		/* qualified name (list of Value strings) */
+
+	/*
+	 * dicts will be non-NIL if ADD/ALTER MAPPING was specified. If dicts is
+	 * NIL, but tokentype isn't, DROP MAPPING was specified.
+	 */
+	List	   *tokentype;		/* list of Value strings */
+	List	   *dicts;			/* list of list of Value strings */
+	bool		override;		/* if true - remove old variant */
+	bool		replace;		/* if true - replace dictionary by another */
+	bool		missing_ok;		/* for DROP - skip error if missing? */
+} AlterTSConfigurationStmt;
+
 #endif   /* PARSENODES_H */
diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h
index 82b221e0d7ca..a228e40e1212 100644
--- a/src/include/nodes/pg_list.h
+++ b/src/include/nodes/pg_list.h
@@ -35,7 +35,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/pg_list.h,v 1.56 2007/01/05 22:19:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/pg_list.h,v 1.57 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 808cdcbe97a5..0f3111dfee28 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.90 2007/02/19 02:23:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.99 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -96,6 +96,8 @@ typedef struct PlannedStmt
 
 	List	   *subplans;		/* Plan trees for SubPlan expressions */
 
+	Bitmapset  *rewindPlanIDs;	/* indices of subplans that require REWIND */
+
 	/*
 	 * If the query has a returningList then the planner will store a list of
 	 * processed targetlists (one per result relation) here.  We must have a
@@ -137,7 +139,7 @@ typedef struct PlannedStmt
 
 	List	   *invalItems;		/* other dependencies, as PlanInvalItems */
 
-	int			nCrossLevelParams;		/* number of PARAM_EXEC Params used */
+	int			nParamExec;		/* number of PARAM_EXEC Params used */
 
 	int			nMotionNodes;	/* number of Motion nodes in plan */
 
@@ -153,7 +155,6 @@ typedef struct PlannedStmt
 	uint64		query_mem;
 } PlannedStmt;
 
-
 /*
  * Fetch the Plan associated with a SubPlan node in a completed PlannedStmt.
  */
@@ -229,8 +230,6 @@ typedef struct Plan
 	Bitmapset  *extParam;
 	Bitmapset  *allParam;
 
-	int			nParamExec;		/* Also in PlannedStmt */
-
 	/*
 	 * MPP needs to keep track of the characteristics of flow of output
 	 * tuple of Plan nodes.
@@ -747,7 +746,7 @@ typedef struct NestLoop
  *
  * The expected ordering of each mergeable column is described by a btree
  * opfamily OID, a direction (BTLessStrategyNumber or BTGreaterStrategyNumber)
- * and a nulls-first flag.  Note that the two sides of each mergeclause may
+ * and a nulls-first flag.	Note that the two sides of each mergeclause may
  * be of different datatypes, but they are ordered the same way according to
  * the common opfamily.  The operator in each mergeclause must be an equality
  * operator of the indicated opfamily.
@@ -756,9 +755,9 @@ typedef struct NestLoop
 typedef struct MergeJoin
 {
 	Join		join;
-	List	   *mergeclauses;		/* mergeclauses as expression trees */
+	List	   *mergeclauses;	/* mergeclauses as expression trees */
 	/* these are arrays, but have the same length as the mergeclauses list: */
-	Oid		   *mergeFamilies;		/* per-clause OIDs of btree opfamilies */
+	Oid		   *mergeFamilies;	/* per-clause OIDs of btree opfamilies */
 	int		   *mergeStrategies;	/* per-clause ordering (ASC or DESC) */
 	bool	   *mergeNullsFirst;	/* per-clause nulls ordering */
 	bool		unique_outer; /*CDB-OLAP true => outer is unique in merge key */
@@ -813,11 +812,14 @@ extern bool isDynamicScan(const Scan *scan);
  */
 typedef struct ShareInputScan
 {
-	Plan 		plan; /* The ShareInput */
+	Scan 		scan; /* The ShareInput */
 
 	ShareType 	share_type;
 	int 		share_id;
 	int 		driver_slice;   	/* slice id that will execute the underlying material/sort */
+	List	   *colnames;	/* output column names (string Value nodes) */
+	List	   *coltypes;	/* OID list of column type OIDs */
+	List	   *coltypmods; /* integer list of column typmods */
 } ShareInputScan;
 
 /* ----------------
@@ -1161,8 +1163,9 @@ typedef struct RowTrigger
  *
  * We track the objects on which a PlannedStmt depends in two ways:
  * relations are recorded as a simple list of OIDs, and everything else
- * is represented as a list of PlanInvalItems.  A PlanInvalItem identifies
- * a system catalog entry by cache ID and tuple TID.
+ * is represented as a list of PlanInvalItems.  A PlanInvalItem is designed
+ * to be used with the syscache invalidation mechanism, so it identifies a
+ * system catalog entry by cache ID and tuple TID.
  */
 typedef struct PlanInvalItem
 {
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 7d59fe38d774..5fddbfa3b540 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.125 2007/02/19 07:03:31 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.137 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,7 +82,6 @@ typedef struct RangeVar
 	int			location;		/* token location, or -1 if unknown */
 } RangeVar;
 
-
 typedef struct TableOidInfo
 {
 	NodeTag		type;
@@ -395,8 +394,6 @@ typedef struct WindowRef
 typedef struct ArrayRef
 {
 	Expr		xpr;
-	Oid			refrestype;		/* type of the result of the ArrayRef
-								 * operation */
 	Oid			refarraytype;	/* type of the array proper */
 	Oid			refelemtype;	/* type of the array elements */
 	int32		reftypmod;		/* typmod of the array (and elements too) */
@@ -643,19 +640,19 @@ typedef struct SubPlan
 	/* The combining operators, transformed to an executable expression: */
 	Node	   *testexpr;		/* OpExpr or RowCompareExpr expression tree */
 	List	   *paramIds;		/* IDs of Params embedded in the above */
- 	
+
     int         qDispSliceId;   /* CDB: slice# of initplan's root slice, or 0 */
- 	
-	/* The subselect, transformed to a Plan: */
 
 	/* Identification of the Plan tree to use: */
 	int			plan_id;		/* Index (from 1) in PlannedStmt.subplans */
+
 	/* Identification of the SubPlan for EXPLAIN and debugging purposes: */
 	char	   *plan_name;		/* A name assigned during planning */
 
 	/* Extra data useful for determining subplan's output type: */
 	Oid			firstColType;	/* Type of first column of subplan result */
 	int32		firstColTypmod;	/* Typmod of first column of subplan result */
+
 	/* Information about execution strategy: */
 	bool		useHashTable;	/* TRUE to store subselect output in a hash
 								 * table (implies we are doing "IN") */
@@ -1150,17 +1147,14 @@ typedef struct SetToDefault
  */
 typedef struct CurrentOfExpr
 {
-	Expr    		xpr;
-	char     		*cursor_name;  	/* name of referenced cursor */
+	Expr		xpr;
+	char	   *cursor_name;	/* name of referenced cursor, or NULL */
+	int			cursor_param;	/* refcursor parameter number, or 0 */
 	/* for planning */
-	Index    		cvarno;      	/* RT index of target relation */
+	Index		cvarno;			/* RT index of target relation */
 	/* for validation */
-	Oid				target_relid;	/* OID of original target relation, 
-									 * before any inheritance expansion */
-	/* for constant folding */
-	int		 		gp_segment_id;
-	ItemPointerData	ctid;
-	Oid				tableoid;
+	Oid			target_relid;	/* OID of original target relation, 
+								 * before any inheritance expansion */
 } CurrentOfExpr;
 
 /*--------------------
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index f439bafc9e06..62a496773059 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/print.h,v 1.26 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/print.h,v 1.28 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,8 +32,6 @@ extern void print_expr(Node *expr, List *rtable);
 extern void print_pathkeys(List *pathkeys, List *rtable);
 extern void print_tl(List *tlist, List *rtable);
 extern void print_slot(TupleTableSlot *slot);
-extern void print_plan_recursive(Plan *p, Query *parsetree,
-					 int indentLevel, char *label);
 extern void print_plan(Plan *p, Query *parsetree);
 
 #endif   /* PRINT_H */
diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h
index c878c6acc635..ac5115a18d04 100644
--- a/src/include/nodes/readfuncs.h
+++ b/src/include/nodes/readfuncs.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/readfuncs.h,v 1.23 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/readfuncs.h,v 1.24 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 9f18ce3a08dc..0208fe8675f1 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.136 2007/02/19 07:03:33 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.154.2.4 2009/04/16 20:42:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,11 +64,13 @@ typedef struct QualCost
 typedef struct ApplyShareInputContext
 {
 	List *sharedNodes;
+	List	   *curr_rtable;
+	int		   *share_refcounts;
+	int			share_refcounts_sz;		/* allocated sized of 'share_refcounts' */
 	List *sliceMarks;
 	List *motStack;
 	List *qdShares;
 	List *qdSlices;
-	List *planNodes;
 	int nextPlanId;
 } ApplyShareInputContext;
 
@@ -94,6 +96,8 @@ typedef struct PlannerGlobal
 
 	List	   *subrtables;		/* Rangetables for SubPlan nodes */
 
+	Bitmapset  *rewindPlanIDs;	/* indices of subplans that require REWIND */
+
 	List	   *finalrtable;	/* "flat" rangetable for executor */
 
 	List	   *relationOids;	/* OIDs of relations the plan depends on */
@@ -183,29 +187,30 @@ typedef struct PlannerInfo
 	List	   *join_rel_list;	/* list of join-relation RelOptInfos */
 	struct HTAB *join_rel_hash; /* optional hashtable for join relations */
 
-	/* Note:  Prior to 3.4, these fields were in the Query node.  Now they
-	 *        are managed here for later installation in PlannedStmt.
-	 */
 	List	   *resultRelations;	/* integer list of RT indexes, or NIL */
-	PartitionNode *result_partitions;
+
 	List	   *returningLists; /* list of lists of TargetEntry, or NIL */
-	List	   *result_aosegnos;
 
-	List	   *init_plans;				/* init subplans for query */
+	List	   *init_plans;		/* init subplans for query */
+
+	List	   *eq_classes;		/* list of active EquivalenceClasses */
+
+	List	   *non_eq_clauses;
+
+	List	   *canon_pathkeys; /* list of "canonical" PathKeys */
+
+	PartitionNode *result_partitions;
+	List	   *result_aosegnos;
 
 	List       *list_cteplaninfo; /* list of CtePlannerInfo, one for each CTE */
 
     /* Jointree result is a subset of the cross product of these relids... */
-    Relids      currlevel_relids;   /* CDB: all relids of current query level,
-                                     * omitting any pulled-up subquery relids */
+	Relids		currlevel_relids;	/* CDB: all relids of current query level,
+									 * omitting any pulled-up subquery relids */
 
 	/*
 	 * Outer join info
 	 */
-	List	   *eq_classes;				/* list of active EquivalenceClasses */
-
-	List	   *canon_pathkeys;			/* list of "canonical" PathKeys */
-
 	List	   *left_join_clauses;		/* list of RestrictInfos for
 										 * mergejoinable outer join clauses
 										 * w/nonnullable var on left */
@@ -229,6 +234,8 @@ typedef struct PlannerInfo
 	List	   *group_pathkeys; /* groupClause pathkeys, if any */
 	List	   *sort_pathkeys;	/* sortClause pathkeys, if any */
 
+	List	   *initial_rels;	/* RelOptInfos we are now trying to join */
+
 	MemoryContext planner_cxt;	/* context holding PlannerInfo */
 
 	double		total_table_pages;		/* # of pages in all tables of query */
@@ -241,9 +248,6 @@ typedef struct PlannerInfo
 	bool		hasPseudoConstantQuals; /* true if any RestrictInfo has
 										 * pseudoconstant = true */
 
-	/* At the end to avoid breaking existing 8.2 add-ons */
-	List	   *initial_rels;	/* RelOptInfos we are now trying to join */
-
 	PlannerConfig *config;		/* Planner configuration */
 
 } PlannerInfo;
@@ -284,7 +288,6 @@ static inline void planner_subplan_put_plan(struct PlannerInfo *root, SubPlan *s
 	cell->data.ptr_value = plan;
 }
 
-
 /*----------
  * RelOptInfo
  *		Per-relation information for planning/optimization
@@ -485,15 +488,16 @@ typedef struct RelOptInfo
  *		and indexes, but that created confusion without actually doing anything
  *		useful.  So now we have a separate IndexOptInfo struct for indexes.
  *
- *		opfamily[], indexkeys[], fwdsortop[], revsortop[], and nulls_first[]
- *		each have ncolumns entries.  Note: for historical reasons, the
- *		opfamily array has an extra entry that is always zero.  Some code
- *		scans until it sees a zero entry, rather than looking at ncolumns.
+ *		opfamily[], indexkeys[], opcintype[], fwdsortop[], revsortop[],
+ *		and nulls_first[] each have ncolumns entries.
+ *		Note: for historical reasons, the opfamily array has an extra entry
+ *		that is always zero.  Some code scans until it sees a zero entry,
+ *		rather than looking at ncolumns.
  *
  *		Zeroes in the indexkeys[] array indicate index columns that are
  *		expressions; there is one element in indexprs for each such column.
  *
- *		For an unordered index, the sortop arrays contains zeroes.  Note that
+ *		For an unordered index, the sortop arrays contains zeroes.	Note that
  *		fwdsortop[] and nulls_first[] describe the sort ordering of a forward
  *		indexscan; we can also consider a backward indexscan, which will
  *		generate sort order described by revsortop/!nulls_first.
@@ -517,6 +521,7 @@ typedef struct IndexOptInfo
 	int			ncolumns;		/* number of columns in index */
 	Oid		   *opfamily;		/* OIDs of operator families for columns */
 	int		   *indexkeys;		/* column numbers of index's keys, or 0 */
+	Oid		   *opcintype;		/* OIDs of opclass declared input data types */
 	Oid		   *fwdsortop;		/* OIDs of sort operators for each column */
 	Oid		   *revsortop;		/* OIDs of sort operators for backward scan */
 	bool	   *nulls_first;	/* do NULLs come first in the sort order? */
@@ -530,6 +535,7 @@ typedef struct IndexOptInfo
 	bool		predOK;			/* true if predicate matches query */
 	bool		unique;			/* true if a unique index */
 	bool		amoptionalkey;	/* can query omit key for the first column? */
+	bool		amsearchnulls;	/* can AM search for NULL index entries? */
     bool        cdb_default_stats_used; /* true if ANALYZE needed */
     int         num_leading_eq; /* CDB: always 0, except amcostestimate proc may
                                  * set it briefly; it is transferred forthwith
@@ -629,17 +635,20 @@ typedef struct CdbRelDedupInfo
  * us represent knowledge about different sort orderings being equivalent.
  * Since every PathKey must reference an EquivalenceClass, we will end up
  * with single-member EquivalenceClasses whenever a sort key expression has
- * not been equivalenced to anything else.  It is also possible that such an
+ * not been equivalenced to anything else.	It is also possible that such an
  * EquivalenceClass will contain a volatile expression ("ORDER BY random()"),
  * which is a case that can't arise otherwise since clauses containing
  * volatile functions are never considered mergejoinable.  We mark such
  * EquivalenceClasses specially to prevent them from being merged with
- * ordinary EquivalenceClasses.
+ * ordinary EquivalenceClasses.  Also, for volatile expressions we have
+ * to be careful to match the EquivalenceClass to the correct targetlist
+ * entry: consider SELECT random() AS a, random() AS b ... ORDER BY b,a.
+ * So we record the SortGroupRef of the originating sort clause.
  *
  * We allow equality clauses appearing below the nullable side of an outer join
  * to form EquivalenceClasses, but these have a slightly different meaning:
  * the included values might be all NULL rather than all the same non-null
- * values.  See src/backend/optimizer/README for more on that point.
+ * values.	See src/backend/optimizer/README for more on that point.
  *
  * NB: if ec_merged isn't NULL, this class has been merged into another, and
  * should be ignored in favor of using the pointed-to class.
@@ -648,18 +657,26 @@ typedef struct EquivalenceClass
 {
 	NodeTag		type;
 
-	List	   *ec_opfamilies;		/* btree operator family OIDs */
-	List	   *ec_members;			/* list of EquivalenceMembers */
-	List	   *ec_sources;			/* list of generating RestrictInfos */
-	List	   *ec_derives;			/* list of derived RestrictInfos */
-	Relids		ec_relids;			/* all relids appearing in ec_members */
-	bool		ec_has_const;		/* any pseudoconstants in ec_members? */
+	List	   *ec_opfamilies;	/* btree operator family OIDs */
+	List	   *ec_members;		/* list of EquivalenceMembers */
+	List	   *ec_sources;		/* list of generating RestrictInfos */
+	List	   *ec_derives;		/* list of derived RestrictInfos */
+	Relids		ec_relids;		/* all relids appearing in ec_members */
+	bool		ec_has_const;	/* any pseudoconstants in ec_members? */
 	bool		ec_has_volatile;	/* the (sole) member is a volatile expr */
 	bool		ec_below_outer_join;	/* equivalence applies below an OJ */
-	bool		ec_broken;			/* failed to generate needed clauses? */
-	struct EquivalenceClass *ec_merged;		/* set if merged into another EC */
+	bool		ec_broken;		/* failed to generate needed clauses? */
+	Index		ec_sortref;		/* originating sortclause label, or 0 */
+	struct EquivalenceClass *ec_merged; /* set if merged into another EC */
 } EquivalenceClass;
 
+/*
+ * If an EC contains a const and isn't below-outer-join, any PathKey depending
+ * on it must be redundant, since there's only one possible value of the key.
+ */
+#define EC_MUST_BE_REDUNDANT(eclass)  \
+	((eclass)->ec_has_const && !(eclass)->ec_below_outer_join)
+
 /*
  * EquivalenceMember - one member expression of an EquivalenceClass
  *
@@ -672,7 +689,7 @@ typedef struct EquivalenceClass
  *
  * em_datatype is usually the same as exprType(em_expr), but can be
  * different when dealing with a binary-compatible opfamily; in particular
- * anyarray_ops would never work without this.  Use em_datatype when
+ * anyarray_ops would never work without this.	Use em_datatype when
  * looking up a specific btree operator to work with this expression.
  */
 typedef struct EquivalenceMember
@@ -681,6 +698,7 @@ typedef struct EquivalenceMember
 
 	Expr	   *em_expr;		/* the expression represented */
 	Relids		em_relids;		/* all relids appearing in em_expr */
+	Relids		em_nullable_relids;		/* nullable by lower outer joins */
 	bool		em_is_const;	/* expression is pseudoconstant? */
 	bool		em_is_child;	/* derived version for a child relation? */
 	Oid			em_datatype;	/* the "nominal type" used by the opfamily */
@@ -695,11 +713,11 @@ typedef struct EquivalenceMember
  * etc.  The value being sorted is represented by linking to an
  * EquivalenceClass containing that value and including pk_opfamily among its
  * ec_opfamilies.  This is a convenient method because it makes it trivial
- * to detect equivalent and closely-related orderings.  (See optimizer/README
+ * to detect equivalent and closely-related orderings.	(See optimizer/README
  * for more information.)
  *
  * Note: pk_strategy is either BTLessStrategyNumber (for ASC) or
- * BTGreaterStrategyNumber (for DESC).  We assume that all ordering-capable
+ * BTGreaterStrategyNumber (for DESC).	We assume that all ordering-capable
  * index types will use btree-compatible strategy numbers.
  */
 
@@ -708,9 +726,9 @@ typedef struct PathKey
 	NodeTag		type;
 
 	EquivalenceClass *pk_eclass;	/* the value that is ordered */
-	Oid			pk_opfamily;		/* btree opfamily defining the ordering */
-	int			pk_strategy;		/* sort direction (ASC or DESC) */
-	bool		pk_nulls_first;		/* do NULLs come before normal values? */
+	Oid			pk_opfamily;	/* btree opfamily defining the ordering */
+	int			pk_strategy;	/* sort direction (ASC or DESC) */
+	bool		pk_nulls_first; /* do NULLs come before normal values? */
 } PathKey;
 
 /*
@@ -967,6 +985,8 @@ typedef struct CdbMotionPath
  *
  * Note: it is possible for "subpaths" to contain only one, or even no,
  * elements.  These cases are optimized during create_append_plan.
+ * In particular, an AppendPath with no subpaths is a "dummy" path that
+ * is created to represent the case that a relation is provably empty.
  */
 typedef struct AppendPath
 {
@@ -974,6 +994,9 @@ typedef struct AppendPath
 	List	   *subpaths;		/* list of component Paths */
 } AppendPath;
 
+#define IS_DUMMY_PATH(p) \
+	(IsA((p), AppendPath) && ((AppendPath *) (p))->subpaths == NIL)
+
 /*
  * ResultPath represents use of a Result plan node to compute a variable-free
  * targetlist with no underlying tables (a "SELECT expressions" query).
@@ -1163,33 +1186,51 @@ typedef struct HashPath
  *
  * When dealing with outer joins we have to be very careful about pushing qual
  * clauses up and down the tree.  An outer join's own JOIN/ON conditions must
- * be evaluated exactly at that join node, and any quals appearing in WHERE or
- * in a JOIN above the outer join cannot be pushed down below the outer join.
- * Otherwise the outer join will produce wrong results because it will see the
- * wrong sets of input rows.  All quals are stored as RestrictInfo nodes
- * during planning, but there's a flag to indicate whether a qual has been
+ * be evaluated exactly at that join node, unless they are "degenerate"
+ * conditions that reference only Vars from the nullable side of the join.
+ * Quals appearing in WHERE or in a JOIN above the outer join cannot be pushed
+ * down below the outer join, if they reference any nullable Vars.
+ * RestrictInfo nodes contain a flag to indicate whether a qual has been
  * pushed down to a lower level than its original syntactic placement in the
  * join tree would suggest.  If an outer join prevents us from pushing a qual
  * down to its "natural" semantic level (the level associated with just the
  * base rels used in the qual) then we mark the qual with a "required_relids"
  * value including more than just the base rels it actually uses.  By
- * pretending that the qual references all the rels appearing in the outer
+ * pretending that the qual references all the rels required to form the outer
  * join, we prevent it from being evaluated below the outer join's joinrel.
  * When we do form the outer join's joinrel, we still need to distinguish
  * those quals that are actually in that join's JOIN/ON condition from those
  * that appeared elsewhere in the tree and were pushed down to the join rel
  * because they used no other rels.  That's what the is_pushed_down flag is
  * for; it tells us that a qual is not an OUTER JOIN qual for the set of base
- * rels listed in required_relids.  A clause that originally came from WHERE
+ * rels listed in required_relids.	A clause that originally came from WHERE
  * or an INNER JOIN condition will *always* have its is_pushed_down flag set.
  * It's possible for an OUTER JOIN clause to be marked is_pushed_down too,
  * if we decide that it can be pushed down into the nullable side of the join.
  * In that case it acts as a plain filter qual for wherever it gets evaluated.
- *
- * When application of a qual must be delayed by outer join, we also mark it
- * with outerjoin_delayed = true.  This isn't redundant with required_relids
- * because that might equal clause_relids whether or not it's an outer-join
- * clause.
+ * (In short, is_pushed_down is only false for non-degenerate outer join
+ * conditions.  Possibly we should rename it to reflect that meaning?)
+ *
+ * In GPDB, is an there is an additional field, "ojscope_relids". If
+ * this clause is an outer join's JOIN/ON condition, "ojscope_relids" indicates
+ * the extra relations that need to be in scope, independent of what appears
+ * in the clause itself. In PostgreSQL, those are included in "required_relids",
+ * but to do "predicate propagation" in GPDB, we need to preserve the original
+ * ojscope relations. We might derive more RestrictInfos from this RestrictInfo,
+ * with a modified clause, and must be careful to not push/pull the derived
+ * RestrictInfos to places where the original RestrictInfo could not be legally
+ * placed.
+ *
+ * RestrictInfo nodes also contain an outerjoin_delayed flag, which is true
+ * if the clause's applicability must be delayed due to any outer joins
+ * appearing below it (ie, it has to be postponed to some join level higher
+ * than the set of relations it actually references).  There is also a
+ * nullable_relids field, which is the set of rels it references that can be
+ * forced null by some outer join below the clause.  outerjoin_delayed = true
+ * is subtly different from nullable_relids != NULL: a clause might reference
+ * some nullable rels and yet not be outerjoin_delayed because it also
+ * references all the other rels of the outer join(s).  A clause that is not
+ * outerjoin_delayed can be enforced anywhere it is computable.
  *
  * In general, the referenced clause might be arbitrarily complex.	The
  * kinds of clauses we can handle as indexscan quals, mergejoin clauses,
@@ -1226,7 +1267,7 @@ typedef struct HashPath
  *
  * When join clauses are generated from EquivalenceClasses, there may be
  * several equally valid ways to enforce join equivalence, of which we need
- * apply only one.  We mark clauses of this kind by setting parent_ec to
+ * apply only one.	We mark clauses of this kind by setting parent_ec to
  * point to the generating EquivalenceClass.  Multiple clauses with the same
  * parent_ec in the same join are redundant.
  */
@@ -1239,7 +1280,7 @@ typedef struct RestrictInfo
 
 	bool		is_pushed_down; /* TRUE if clause was pushed down in level */
 
-	bool		outerjoin_delayed;	/* TRUE if delayed by outer join */
+	bool		outerjoin_delayed;	/* TRUE if delayed by lower outer join */
 
 	bool		can_join;		/* see comment above */
 
@@ -1251,6 +1292,15 @@ typedef struct RestrictInfo
 	/* The set of relids required to evaluate the clause: */
 	Relids		required_relids;
 
+	/*
+	 * The set of relids required to evaluate the clause because this is an outer
+	 * join clause. required_relids is a union of this and clause_relids.
+	 */
+	Relids		ojscope_relids;
+
+	/* The relids used in the clause that are nullable by lower outer joins: */
+	Relids		nullable_relids;
+
 	/* These fields are set for any binary opclause: */
 	Relids		left_relids;	/* relids in left side of clause */
 	Relids		right_relids;	/* relids in right side of clause */
@@ -1263,15 +1313,16 @@ typedef struct RestrictInfo
 
 	/* cache space for cost and selectivity */
 	QualCost	eval_cost;		/* eval cost of clause; -1 if not yet set */
-	Selectivity this_selec;		/* selectivity; -1 if not yet set */
+	Selectivity this_selec;		/* selectivity; -1 if not yet set; >1 means
+								 * a redundant clause */
 
 	/* valid if clause is mergejoinable, else NIL */
 	List	   *mergeopfamilies;	/* opfamilies containing clause operator */
 
 	/* cache space for mergeclause processing; NULL if not yet set */
 	EquivalenceClass *left_ec;	/* EquivalenceClass containing lefthand */
-	EquivalenceClass *right_ec;	/* EquivalenceClass containing righthand */
-	EquivalenceMember *left_em;		/* EquivalenceMember for lefthand */
+	EquivalenceClass *right_ec; /* EquivalenceClass containing righthand */
+	EquivalenceMember *left_em; /* EquivalenceMember for lefthand */
 	EquivalenceMember *right_em;	/* EquivalenceMember for righthand */
 	List	   *scansel_cache;	/* list of MergeScanSelCache structs */
 
@@ -1300,8 +1351,10 @@ typedef struct MergeScanSelCache
 	int			strategy;		/* sort direction (ASC or DESC) */
 	bool		nulls_first;	/* do NULLs come before normal values? */
 	/* Results */
-	Selectivity	leftscansel;	/* scan fraction for clause left side */
-	Selectivity	rightscansel;	/* scan fraction for clause right side */
+	Selectivity leftstartsel;	/* first-join fraction for clause left side */
+	Selectivity leftendsel;		/* last-join fraction for clause left side */
+	Selectivity rightstartsel;	/* first-join fraction for clause right side */
+	Selectivity rightendsel;	/* last-join fraction for clause right side */
 } MergeScanSelCache;
 
 /*
@@ -1336,8 +1389,8 @@ typedef struct InnerIndexscanInfo
 	Relids		other_relids;	/* a set of relevant other relids */
 	bool		isouterjoin;	/* true if join is outer */
 	/* Best paths for this lookup key (NULL if no available indexscans): */
-	Path	   *cheapest_startup_innerpath;	/* cheapest startup cost */
-	Path	   *cheapest_total_innerpath;	/* cheapest total cost */
+	Path	   *cheapest_startup_innerpath;		/* cheapest startup cost */
+	Path	   *cheapest_total_innerpath;		/* cheapest total cost */
 } InnerIndexscanInfo;
 
 /*
@@ -1368,7 +1421,7 @@ typedef struct InnerIndexscanInfo
  * to be evaluated after this join is formed (because it references the RHS).
  * Any outer joins that have such a clause and this join in their RHS cannot
  * commute with this join, because that would leave noplace to check the
- * pushed-down clause.  (We don't track this for FULL JOINs, either.)
+ * pushed-down clause.	(We don't track this for FULL JOINs, either.)
  *
  * Note: OuterJoinInfo directly represents only LEFT JOIN and FULL JOIN;
  * RIGHT JOIN is handled by switching the inputs to make it a LEFT JOIN.
@@ -1385,7 +1438,7 @@ typedef struct OuterJoinInfo
 	Relids		syn_righthand;	/* base relids syntactically within RHS */
 	JoinType	join_type;		/* LEFT, FULL, or ANTI */
 	bool		lhs_strict;		/* joinclause is strict for some LHS rel */
-	bool		delay_upper_joins;	/* can't commute with upper RHS */
+	bool		delay_upper_joins;		/* can't commute with upper RHS */
 } OuterJoinInfo;
 
 /*
@@ -1396,8 +1449,10 @@ typedef struct OuterJoinInfo
  * We record information about each such IN clause in an InClauseInfo struct.
  * These structs are kept in the PlannerInfo node's in_info_list.
  *
- * Note: sub_targetlist is just a list of Vars or expressions; it does not
- * contain TargetEntry nodes.
+ * Note: sub_targetlist is a bit misnamed; it is a list of the expressions
+ * on the RHS of the IN's join clauses.  (This normally starts out as a list
+ * of Vars referencing the subquery outputs, but can get mutated if the
+ * subquery is flattened into the main query.)
  */
 
 typedef struct InClauseInfo
@@ -1405,15 +1460,14 @@ typedef struct InClauseInfo
 	NodeTag		type;
 	Relids		lefthand;		/* base relids in lefthand expressions */
 	Relids		righthand;		/* base relids coming from the subselect */
-	List	   *sub_targetlist; /* targetlist of original RHS subquery */
-	List	   *in_operators;	/* OIDs of the IN's equality operator(s) */
+	List	   *sub_targetlist; /* RHS expressions of the IN's comparisons */
+	List	   *in_operators;	/* OIDs of the IN's equality operators */
 
     bool        try_join_unique;
                                 /* CDB: true => comparison is equality op and
                                  *  subquery is not correlated.  Ok to consider
                                  *  JOIN_UNIQUE method of duplicate suppression.
                                  */
-
 } InClauseInfo;
 
 /*
diff --git a/src/include/nodes/tidbitmap.h b/src/include/nodes/tidbitmap.h
index 5ae38fa62788..587a2cb7627f 100644
--- a/src/include/nodes/tidbitmap.h
+++ b/src/include/nodes/tidbitmap.h
@@ -16,7 +16,7 @@
  * Portions Copyright (c) 2007-2008, Greenplum inc
  * Copyright (c) 2003-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/nodes/tidbitmap.h,v 1.3 2005/10/15 02:49:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/tidbitmap.h,v 1.6 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/nodes/value.h b/src/include/nodes/value.h
index cb3b691151d8..8bb16232ac8f 100644
--- a/src/include/nodes/value.h
+++ b/src/include/nodes/value.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 2003-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/nodes/value.h,v 1.6 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/value.h,v 1.7 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 34d665bff208..4bc789bdfa80 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/clauses.h,v 1.87 2007/02/19 07:03:34 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/clauses.h,v 1.88.2.1 2008/04/01 00:48:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -99,13 +99,13 @@ extern void set_coercionform_dontcare(Node *node);
 
 extern Node *eval_const_expressions(PlannerInfo *root, Node *node);
 
-extern Query *fold_constants(Query *q, ParamListInfo boundParams, Size max_size);
+extern Query *fold_constants(PlannerGlobal *glob, Query *q, ParamListInfo boundParams, Size max_size);
 
 extern Node *fold_arrayexpr_constants(ArrayExpr *arrayexpr);
 
 extern Node *estimate_expression_value(PlannerInfo *root, Node *node);
 
-extern Expr *evaluate_expr(Expr *expr, Oid result_type);
+extern Expr *evaluate_expr(Expr *expr, Oid result_type, int32 result_typmod);
 
 extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (),
 												 void *context);
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index c16f92f75fc6..3de420fa7cf4 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.84 2007/01/22 01:35:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.90 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,11 +59,25 @@ extern PGDLLIMPORT double cpu_tuple_cost;
 extern PGDLLIMPORT double cpu_index_tuple_cost;
 extern PGDLLIMPORT double cpu_operator_cost;
 extern PGDLLIMPORT int effective_cache_size;
+extern Cost disable_cost;
+extern bool enable_seqscan;
+extern bool enable_indexscan;
+extern bool enable_bitmapscan;
+extern bool enable_tidscan;
+extern bool enable_sort;
+extern bool enable_hashagg;
+extern bool enable_groupagg;
+extern bool enable_nestloop;
+extern bool enable_mergejoin;
+extern bool enable_hashjoin;
 extern bool constraint_exclusion;
-/* CDB: The enable_xxx globals have been moved to paths.h */
 
 extern Cost disable_cost;
 
+extern bool gp_enable_hashjoin_size_heuristic;          /*CDB*/
+extern bool gp_enable_fallback_plan;
+extern bool gp_enable_predicate_propagation;
+
 extern double index_pages_fetched(double tuples_fetched, BlockNumber pages,
 					double index_pages, PlannerInfo *root);
 extern void cost_seqscan(Path *path, PlannerInfo *root, RelOptInfo *baserel);
@@ -94,7 +108,9 @@ extern void cost_valuesscan(Path *path, PlannerInfo *root,
 				RelOptInfo *baserel);
 extern void cost_ctescan(Path *path, PlannerInfo *root, RelOptInfo *baserel);
 extern void cost_sort(Path *path, PlannerInfo *root,
-		  List *pathkeys, Cost input_cost, double tuples, int width);
+		  List *pathkeys, Cost input_cost, double tuples, int width,
+		  double limit_tuples);
+extern bool sort_exceeds_work_mem(Sort *sort);
 extern void cost_material(Path *path, PlannerInfo *root,
 			  Cost input_cost, double tuples, int width);
 extern void cost_agg(Path *path, PlannerInfo *root,
@@ -117,6 +133,7 @@ extern void cost_mergejoin(MergePath *path, PlannerInfo *root);
 extern void cost_hashjoin(HashPath *path, PlannerInfo *root);
 extern void cost_qual_eval(QualCost *cost, List *quals, PlannerInfo *root);
 extern void cost_qual_eval_node(QualCost *cost, Node *qual, PlannerInfo *root);
+extern Cost get_initplan_cost(PlannerInfo *root, SubPlan *subplan);
 extern void set_baserel_size_estimates(PlannerInfo *root, RelOptInfo *rel);
 extern void set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 						   RelOptInfo *outer_rel,
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 25a7100aef1e..75d813060728 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/joininfo.h,v 1.34 2007/01/20 20:45:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/joininfo.h,v 1.36 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@
 
 
 extern bool have_relevant_joinclause(PlannerInfo *root,
-									 RelOptInfo *rel1, RelOptInfo *rel2);
+						 RelOptInfo *rel1, RelOptInfo *rel2);
 
 extern void add_join_clause_to_rels(PlannerInfo *root,
 						RestrictInfo *restrictinfo,
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index 9805a06d6609..c143de9bb50e 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/pathnode.h,v 1.76 2007/01/20 20:45:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/pathnode.h,v 1.77 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 15cd6237bbce..0cdb3bae71c6 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/paths.h,v 1.96 2007/02/16 00:14:01 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/paths.h,v 1.103.2.1 2008/03/31 16:59:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,21 +21,17 @@
 /*
  * allpaths.c
  */
-extern bool enable_seqscan;
-extern bool enable_indexscan;
-extern bool enable_bitmapscan;
-extern bool enable_tidscan;
-extern bool enable_sort;
-extern bool enable_hashagg;
-extern bool enable_groupagg;
-extern bool enable_nestloop;
-extern bool enable_mergejoin;
-extern bool enable_hashjoin;
-extern bool gp_enable_hashjoin_size_heuristic;          /*CDB*/
-extern bool gp_enable_fallback_plan;
-extern bool gp_enable_predicate_propagation;
+
+/* Hook for plugins to replace standard_join_search() */
+typedef RelOptInfo *(*join_search_hook_type) (PlannerInfo *root,
+														  int levels_needed,
+														  List *initial_rels);
+extern PGDLLIMPORT join_search_hook_type join_search_hook;
+
 
 extern RelOptInfo *make_one_rel(PlannerInfo *root, List *joinlist);
+extern RelOptInfo *standard_join_search(PlannerInfo *root, int levels_needed,
+					 List *initial_rels, bool fallback);
 
 #ifdef OPTIMIZER_DEBUG
 extern void debug_print_rel(PlannerInfo *root, RelOptInfo *rel);
@@ -68,8 +64,8 @@ extern List *group_clauses_by_indexkey(IndexOptInfo *index,
 						  SaOpControl saop_control,
 						  bool *found_clause);
 extern bool eclass_matches_any_index(EquivalenceClass *ec,
-									 EquivalenceMember *em,
-									 RelOptInfo *rel);
+						 EquivalenceMember *em,
+						 RelOptInfo *rel);
 extern bool match_index_to_operand(Node *operand, int indexcol,
 					   IndexOptInfo *index);
 extern List *expand_indexqual_conditions(IndexOptInfo *index,
@@ -103,7 +99,8 @@ extern void add_paths_to_joinrel(PlannerInfo *root, RelOptInfo *joinrel,
  * joinrels.c
  *	  routines to determine which relations to join
  */
-extern List *make_rels_by_joins(PlannerInfo *root, int level, List **joinrels);
+extern List *join_search_one_level(PlannerInfo *root, int level,
+					  List **joinrels);
 extern RelOptInfo *make_join_rel(PlannerInfo *root,
 			  RelOptInfo *rel1, RelOptInfo *rel2);
 extern bool have_join_order_restriction(PlannerInfo *root,
@@ -114,31 +111,35 @@ extern bool have_join_order_restriction(PlannerInfo *root,
  *	  routines for managing EquivalenceClasses
  */
 extern bool process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
-								bool below_outer_join);
+					bool below_outer_join);
 extern void reconsider_outer_join_clauses(PlannerInfo *root);
 extern EquivalenceClass *get_eclass_for_sort_expr(PlannerInfo *root,
 						 Expr *expr,
 						 Oid expr_datatype,
-						 List *opfamilies);
+						 List *opfamilies,
+						 Index sortref);
 extern void generate_base_implied_equalities(PlannerInfo *root);
 extern List *generate_join_implied_equalities(PlannerInfo *root,
-											  RelOptInfo *joinrel,
-											  RelOptInfo *outer_rel,
-											  RelOptInfo *inner_rel);
+								 RelOptInfo *joinrel,
+								 RelOptInfo *outer_rel,
+								 RelOptInfo *inner_rel);
 extern bool exprs_known_equal(PlannerInfo *root, Node *item1, Node *item2);
 extern void add_child_rel_equivalences(PlannerInfo *root,
-									   AppendRelInfo *appinfo,
-									   RelOptInfo *parent_rel,
-									   RelOptInfo *child_rel);
+						   AppendRelInfo *appinfo,
+						   RelOptInfo *parent_rel,
+						   RelOptInfo *child_rel);
+extern void mutate_eclass_expressions(PlannerInfo *root,
+									  Node *(*mutator) (),
+									  void *context);
 extern List *find_eclass_clauses_for_index_join(PlannerInfo *root,
-												RelOptInfo *rel,
-												Relids outer_relids);
+								   RelOptInfo *rel,
+								   Relids outer_relids);
 extern bool have_relevant_eclass_joinclause(PlannerInfo *root,
 								RelOptInfo *rel1, RelOptInfo *rel2);
 extern bool has_relevant_eclass_joinclause(PlannerInfo *root,
-										   RelOptInfo *rel1);
+							   RelOptInfo *rel1);
 extern bool eclass_useful_for_merging(EquivalenceClass *eclass,
-									  RelOptInfo *rel);
+						  RelOptInfo *rel);
 
 /*
  * pathkeys.c
@@ -218,11 +219,11 @@ extern List *find_mergeclauses_for_pathkeys(PlannerInfo *root,
 							   bool outer_keys,
 							   List *restrictinfos);
 extern List *select_outer_pathkeys_for_merge(PlannerInfo *root,
-											 List *mergeclauses,
-											 RelOptInfo *joinrel);
+								List *mergeclauses,
+								RelOptInfo *joinrel);
 extern List *make_inner_pathkeys_for_merge(PlannerInfo *root,
-										   List *mergeclauses,
-										   List *outer_pathkeys);
+							  List *mergeclauses,
+							  List *outer_pathkeys);
 extern int pathkeys_useful_for_merging(PlannerInfo *root,
 							RelOptInfo *rel,
 							List *pathkeys);
@@ -230,5 +231,6 @@ extern int	pathkeys_useful_for_ordering(PlannerInfo *root, List *pathkeys);
 extern List *truncate_useless_pathkeys(PlannerInfo *root,
 						  RelOptInfo *rel,
 						  List *pathkeys);
+extern bool has_useful_pathkeys(PlannerInfo *root, RelOptInfo *rel);
 
 #endif   /* PATHS_H */
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 3dc4def073a1..cce6a2a3c2ca 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.43 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.47.2.1 2008/04/01 00:48:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,13 @@
 #include "nodes/relation.h"
 #include "utils/relcache.h"
 
+/* Hook for plugins to get control in get_relation_info() */
+typedef void (*get_relation_info_hook_type) (PlannerInfo *root,
+														 Oid relationObjectId,
+														 bool inhparent,
+														 RelOptInfo *rel);
+extern PGDLLIMPORT get_relation_info_hook_type get_relation_info_hook;
+
 
 extern void get_relation_info(PlannerInfo *root, Oid relationObjectId,
 				  bool inhparent, RelOptInfo *rel);
@@ -26,8 +33,8 @@ extern void get_external_relation_info(Oid relationObjectId, RelOptInfo *rel);
 
 extern void estimate_rel_size(Relation rel, int32 *attr_widths, BlockNumber *pages, double *tuples);
 
-extern bool relation_excluded_by_constraints(PlannerInfo *root, RelOptInfo *rel,
-								 RangeTblEntry *rte);
+extern bool relation_excluded_by_constraints(PlannerInfo *root,
+								 RelOptInfo *rel, RangeTblEntry *rte);
 
 extern List *build_physical_tlist(PlannerInfo *root, RelOptInfo *rel);
 
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 548db6bd097a..f2eec11f1dbb 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.99 2007/01/22 01:35:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.106.2.1 2008/04/17 21:22:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,7 +70,7 @@ typedef struct GroupContext
  * prototypes for plan/planmain.c
  */
 extern void query_planner(PlannerInfo *root, List *tlist,
-			  double tuple_fraction,
+			  double tuple_fraction, double limit_tuples,
 			  Path **cheapest_path, Path **sorted_path,
 			  double *num_groups);
 
@@ -186,7 +186,8 @@ extern Limit *make_limit(Plan *lefttree, Node *limitOffset, Node *limitCount,
 		   int64 offset_est, int64 count_est);
 extern SetOp *make_setop(SetOpCmd cmd, Plan *lefttree,
 		   List *distinctList, AttrNumber flagColIdx);
-extern Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
+extern Result *make_result(PlannerInfo *root, List *tlist,
+			Node *resconstantqual, Plan *subplan);
 extern Repeat *make_repeat(List *tlist,
 						   List *qual,
 						   Expr *repeatCountExpr,
@@ -195,7 +196,8 @@ extern Repeat *make_repeat(List *tlist,
 extern bool is_projection_capable_plan(Plan *plan);
 extern Plan *add_sort_cost(PlannerInfo *root, Plan *input, 
 						   int numCols, 
-						   AttrNumber *sortColIdx, Oid *sortOperators);
+						   AttrNumber *sortColIdx, Oid *sortOperators,
+						   double limit_tuples);
 extern Plan *add_agg_cost(PlannerInfo *root, Plan *plan, 
 		 List *tlist, List *qual,
 		 AggStrategy aggstrategy, 
@@ -203,7 +205,7 @@ extern Plan *add_agg_cost(PlannerInfo *root, Plan *plan,
 		 int numGroupCols, AttrNumber *grpColIdx,
 		 long numGroups, int num_nullcols,
 		 int numAggs, int transSpace);
-extern Plan *plan_pushdown_tlist(Plan *plan, List *tlist);      /*CDB*/
+extern Plan *plan_pushdown_tlist(PlannerInfo *root, Plan *plan, List *tlist);      /*CDB*/
 
 /*
  * prototypes for plan/initsplan.c
@@ -215,36 +217,38 @@ extern void add_base_rels_to_query(PlannerInfo *root, Node *jtnode);
 extern void build_base_rel_tlists(PlannerInfo *root, List *final_tlist);
 extern void add_IN_vars_to_tlists(PlannerInfo *root);
 extern void add_vars_to_targetlist(PlannerInfo *root, List *vars,
-								   Relids where_needed);
+					   Relids where_needed);
 extern List *deconstruct_jointree(PlannerInfo *root);
 extern void distribute_restrictinfo_to_rels(PlannerInfo *root,
-											RestrictInfo *restrictinfo);
+								RestrictInfo *restrictinfo);
 extern void process_implied_equality(PlannerInfo *root,
-									 Oid opno,
-									 Expr *item1,
-									 Expr *item2,
-									 Relids qualscope,
-									 bool below_outer_join,
-									 bool both_const);
+						 Oid opno,
+						 Expr *item1,
+						 Expr *item2,
+						 Relids qualscope,
+						 Relids nullable_relids,
+						 bool below_outer_join,
+						 bool both_const);
 extern void distribute_qual_to_rels(PlannerInfo *root, Node *clause,
-						bool is_deduced, bool is_deduced_but_not_equijoin,
+						bool is_deduced,
 						bool below_outer_join,
 						Relids qualscope,
 						Relids ojscope,
 						Relids outerjoin_nonnullable,
+						Relids deduced_nullable_relids,
 						List **postponed_qual_list);
 extern RestrictInfo *build_implied_join_equality(Oid opno,
 							Expr *item1,
 							Expr *item2,
-							Relids qualscope);
+							Relids qualscope,
+							Relids nullable_relids);
 
 /*
  * prototypes for plan/setrefs.c
  */
 extern Plan *set_plan_references(PlannerGlobal *glob,
-								 Plan *plan,
-								 List *rtable);
-
+					Plan *plan,
+					List *rtable);
 extern List *set_returning_clause_references(PlannerGlobal *glob,
 								List *rlist,
 								Plan *topplan,
@@ -256,6 +260,11 @@ extern void extract_query_dependencies(List *queries,
 extern void fix_opfuncids(Node *node);
 extern void set_opfuncid(OpExpr *opexpr);
 extern void set_sa_opfuncid(ScalarArrayOpExpr *opexpr);
+extern void record_plan_function_dependency(PlannerGlobal *glob, Oid funcid);
+extern void extract_query_dependencies(List *queries,
+									   List **relationOids,
+									   List **invalItems);
+extern void cdb_extract_plan_dependencies(PlannerGlobal *glob, Plan *plan);
 
 extern int num_distcols_in_grouplist(List *gc);
 
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 04c67e61a5ec..0b2b9d73f7df 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.37 2007/02/19 07:03:34 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.44 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,13 +27,10 @@ extern PGDLLIMPORT planner_hook_type planner_hook;
 
 extern ParamListInfo PlannerBoundParamList;	 /* current boundParams */
 
-extern PlannedStmt *planner(Query *parse,
-							int cursorOptions,
-							ParamListInfo boundParams);
-
-extern PlannedStmt *standard_planner(Query *parse,
-									 int cursorOptions,
-									 ParamListInfo boundParams);
+extern PlannedStmt *planner(Query *parse, int cursorOptions,
+		ParamListInfo boundParams);
+extern PlannedStmt *standard_planner(Query *parse, int cursorOptions,
+				 ParamListInfo boundParams);
 
 extern Plan *subquery_planner(PlannerGlobal *glob,
 							  Query *parse,
@@ -42,12 +39,12 @@ extern Plan *subquery_planner(PlannerGlobal *glob,
 							  PlannerInfo **subroot,
 							  PlannerConfig *config);
 
-extern bool choose_hashed_grouping(PlannerInfo *root, 
-								   double tuple_fraction,
-								   Path *cheapest_path, 
+extern bool choose_hashed_grouping(PlannerInfo *root,
+								   double tuple_fraction, double limit_tuples,
+								   Path *cheapest_path,
 								   Path *sorted_path,
 								   Oid *groupOperators, int numGroupOps,
-								   double dNumGroups, 
+								   double dNumGroups,
 								   AggClauseCounts *agg_counts);
 
 #endif   /* PLANNER_H */
diff --git a/src/include/optimizer/predtest.h b/src/include/optimizer/predtest.h
index 4f6bb7ddd2f0..d6495fc6d2da 100644
--- a/src/include/optimizer/predtest.h
+++ b/src/include/optimizer/predtest.h
@@ -3,11 +3,12 @@
  * predtest.h
  *	  prototypes for predtest.c
  *
+ *
  * Portions Copyright (c) 2005-2009, Greenplum inc
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/predtest.h,v 1.5 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/predtest.h,v 1.6 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index b53a8b3b8aea..f67c3587f651 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.57.2.1 2008/11/11 18:13:54 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.59.2.1 2008/11/11 18:13:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,9 +53,4 @@ extern void expand_inherited_tables(PlannerInfo *root);
 
 extern Node *adjust_appendrel_attrs(PlannerInfo *root, Node *node, AppendRelInfo *appinfo);
 
-extern Relids *adjust_appendrel_attr_needed(PlannerInfo *root, RelOptInfo *oldrel,
-							 AppendRelInfo *appinfo,
-							 AttrNumber new_min_attr,
-							 AttrNumber new_max_attr);
-
 #endif   /* PREP_H */
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index e6d9e10105aa..d9cacf4164c5 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/restrictinfo.h,v 1.40 2007/01/20 20:45:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/restrictinfo.h,v 1.41.2.1 2009/04/16 20:42:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,13 +19,15 @@
 
 /* Convenience macro for the common case of a valid-everywhere qual */
 #define make_simple_restrictinfo(clause)  \
-	make_restrictinfo(clause, true, false, false, NULL)
+	make_restrictinfo(clause, true, false, false, NULL, NULL, NULL)
 
 extern RestrictInfo *make_restrictinfo(Expr *clause,
 				  bool is_pushed_down,
 				  bool outerjoin_delayed,
 				  bool pseudoconstant,
-				  Relids required_relids);
+				  Relids required_relids,
+				  Relids nullable_relids,
+				  Relids ojscope_relids);
 extern List *make_restrictinfo_from_bitmapqual(Path *bitmapqual,
 								  bool is_pushed_down,
 								  bool include_predicates);
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index 60dc4b0f65ec..019a78e91d54 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/subselect.h,v 1.29 2007/02/19 07:03:34 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/subselect.h,v 1.30 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,14 +17,20 @@
 #include "nodes/relation.h"
 
 extern Node *convert_IN_to_join(PlannerInfo *root, List **rtrlist_inout, SubLink *sublink);
-extern Node *convert_testexpr(PlannerInfo *root, Node *testexpr, int rtindex, List **righthandIds);
+extern Node *convert_testexpr(PlannerInfo *root,
+				 Node *testexpr,
+				 List *subst_nodes);
 extern Node *SS_replace_correlation_vars(PlannerInfo *root, Node *expr);
 extern Node *SS_process_sublinks(PlannerInfo *root, Node *expr, bool isQual);
-extern void SS_finalize_plan(PlannerInfo *root, List *rtable, Plan *plan,
+extern void SS_finalize_plan(PlannerInfo *root, Plan *plan,
 							 bool attach_initplans);
 extern Param *SS_make_initplan_from_plan(PlannerInfo *root, Plan *plan,
 						   Oid resulttype, int32 resulttypmod);
 
 extern bool IsSubqueryCorrelated(Query *sq);
 extern bool IsSubqueryMultiLevelCorrelated(Query *sq);
+
+extern List *generate_subquery_vars(PlannerInfo *root, List *tlist,
+					   Index varno);
+
 #endif   /* SUBSELECT_H */
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 847109656178..6b44d8e489ba 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/tlist.h,v 1.45 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/tlist.h,v 1.49 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,7 @@
 
 // return the first target entries that match the node expression
 extern TargetEntry *tlist_member(Node *node, List *targetlist);
+extern TargetEntry *tlist_member_ignore_relabel(Node *node, List *targetlist);
 
 // return a list a target entries that match the node expression
 extern List *tlist_members(Node *node, List *targetlist);
@@ -29,6 +30,8 @@ extern TargetEntry *tlist_member_ignoring_RelabelType(Expr *expr, List *targetli
 extern List *flatten_tlist(List *tlist);
 extern List *add_to_flat_tlist(List *tlist, List *vars, bool resjunk);
 
+extern TargetEntry *get_sortgroupref_tle(Index sortref,
+					 List *targetList);
 extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause,
 						List *targetList);
 extern Node *get_sortgroupclause_expr(SortClause *sortClause,
diff --git a/src/include/optimizer/transform.h b/src/include/optimizer/transform.h
index 8cc6a2bbc4ab..5b587258f7a5 100644
--- a/src/include/optimizer/transform.h
+++ b/src/include/optimizer/transform.h
@@ -17,5 +17,5 @@
 extern Query *normalize_query(Query *query);
 
 /* preprocess the query for the optimizer */
-extern Query *preprocess_query_optimizer(Query *query, ParamListInfo boundParams);
+extern Query *preprocess_query_optimizer(PlannerGlobal *glob, Query *query, ParamListInfo boundParams);
 #endif /* TRANSFORM_H */
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index 6ff9a1978663..ff7e7f1ea0d3 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/var.h,v 1.35 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/var.h,v 1.37 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,7 @@ bool        cdb_walk_vars(Node                         *node,
 
 extern Relids pull_varnos(Node *node);
 
+extern void pull_varattnos(Node *node, Bitmapset **varattnos);
 extern bool contain_ctid_var_reference(Scan *scan);
 extern bool contain_var_clause(Node *node);
 extern bool contain_vars_of_level(Node *node, int levelsup);
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h
index 9229256c1753..a46d5134ed6c 100644
--- a/src/include/parser/analyze.h
+++ b/src/include/parser/analyze.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/analyze.h,v 1.34.2.1 2008/12/13 02:00:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/parser/analyze.h,v 1.38.2.1 2008/12/13 02:00:30 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,16 +17,18 @@
 #include "parser/parse_node.h"
 
 
-/* fwd declarations */
-struct GpPolicy;
-
-extern List *parse_analyze(Node *parseTree, const char *sourceText,
+extern Query *parse_analyze(Node *parseTree, const char *sourceText,
 			  Oid *paramTypes, int numParams);
-extern List *parse_analyze_varparams(Node *parseTree, const char *sourceText,
+extern Query *parse_analyze_varparams(Node *parseTree, const char *sourceText,
 						Oid **paramTypes, int *numParams);
-extern List *parse_sub_analyze(Node *parseTree, ParseState *parentParseState);
-extern bool analyze_requires_snapshot(Node *parseTree);
+extern Query *parse_sub_analyze(Node *parseTree, ParseState *parentParseState);
+
 extern List *analyzeCreateSchemaStmt(CreateSchemaStmt *stmt);
+
+extern Query *transformStmt(ParseState *pstate, Node *parseTree);
+
+extern bool analyze_requires_snapshot(Node *parseTree);
+
 extern void CheckSelectLocking(Query *qry);
 extern void applyLockingClause(Query *qry, Index rtindex,
 				   bool forUpdate, bool noWait);
@@ -36,10 +38,12 @@ typedef struct
 {
 	const char *stmtType;		/* "CREATE TABLE" or "ALTER TABLE" */
 	RangeVar   *relation;		/* relation to create */
+	Relation	rel;			/* opened/locked rel, if ALTER */
 	List	   *inhRelations;	/* relations to inherit from */
 	bool		hasoids;		/* does relation have an OID column? */
 	bool		isalter;		/* true if altering existing table */
-	bool		isaddpart;		/* true if create in service of adding a part */
+	bool		iscreatepart;	/* true if create in service of creating a part */
+	bool		issplitpart;
 	List	   *columns;		/* ColumnDef items */
 	List	   *ckconstraints;	/* CHECK constraints */
 	List	   *fkconstraints;	/* FOREIGN KEY constraints */
@@ -57,8 +61,7 @@ typedef struct
 	MemoryContext tempCtx;
 } CreateStmtContext;
 
-Query *transformCreateStmt(ParseState *pstate, CreateStmt *stmt,
-						   List **extras_before, List **extras_after);
+#define MaxPolicyAttributeNumber MaxHeapAttributeNumber
 
 int validate_partition_spec(ParseState 			*pstate,
 							CreateStmtContext 	*cxt, 
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 15371af56405..86719855be88 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -55,6 +55,5 @@ extern void parser_init(void);
 extern int	base_yyparse(void);
 extern List *SystemFuncName(char *name);
 extern TypeName *SystemTypeName(char *name);
-extern bool exprIsNullConstant(Node *arg);
 
 #endif   /* GRAMPARSE_H */
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index 5538e61f22c2..c3dd6d8e01c6 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -38,7 +38,7 @@ PG_KEYWORD("aggregate", AGGREGATE, UNRESERVED_KEYWORD)
 PG_KEYWORD("all", ALL, RESERVED_KEYWORD)
 PG_KEYWORD("also", ALSO, UNRESERVED_KEYWORD)
 PG_KEYWORD("alter", ALTER, UNRESERVED_KEYWORD)
-//PG_KEYWORD("always", ALWAYS, UNRESERVED_KEYWORD)
+PG_KEYWORD("always", ALWAYS, UNRESERVED_KEYWORD)
 PG_KEYWORD("analyse", ANALYSE, RESERVED_KEYWORD)		/* British spelling */
 PG_KEYWORD("analyze", ANALYZE, RESERVED_KEYWORD)
 PG_KEYWORD("and", AND, RESERVED_KEYWORD)
@@ -84,7 +84,7 @@ PG_KEYWORD("comment", COMMENT, UNRESERVED_KEYWORD)
 PG_KEYWORD("commit", COMMIT, UNRESERVED_KEYWORD)
 PG_KEYWORD("committed", COMMITTED, UNRESERVED_KEYWORD)
 PG_KEYWORD("concurrently", CONCURRENTLY, UNRESERVED_KEYWORD)
-//PG_KEYWORD("configuration", CONFIGURATION, UNRESERVED_KEYWORD)
+PG_KEYWORD("configuration", CONFIGURATION, UNRESERVED_KEYWORD)
 PG_KEYWORD("connection", CONNECTION, UNRESERVED_KEYWORD)
 PG_KEYWORD("constraint", CONSTRAINT, RESERVED_KEYWORD)
 PG_KEYWORD("constraints", CONSTRAINTS, UNRESERVED_KEYWORD)
@@ -92,7 +92,6 @@ PG_KEYWORD("contains", CONTAINS, UNRESERVED_KEYWORD)
 PG_KEYWORD("content", CONTENT_P, UNRESERVED_KEYWORD)        /* GPDB */
 PG_KEYWORD("continue", CONTINUE_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("conversion", CONVERSION_P, UNRESERVED_KEYWORD)
-//PG_KEYWORD("convert", CONVERT, COL_NAME_KEYWORD)
 PG_KEYWORD("copy", COPY, UNRESERVED_KEYWORD)
 PG_KEYWORD("cost", COST, UNRESERVED_KEYWORD)
 PG_KEYWORD("create", CREATE, RESERVED_KEYWORD)
@@ -103,7 +102,7 @@ PG_KEYWORD("createuser", CREATEUSER, UNRESERVED_KEYWORD)
 PG_KEYWORD("cross", CROSS, TYPE_FUNC_NAME_KEYWORD)
 PG_KEYWORD("csv", CSV, UNRESERVED_KEYWORD)
 PG_KEYWORD("cube", CUBE, COL_NAME_KEYWORD)
-PG_KEYWORD("current", CURRENT, UNRESERVED_KEYWORD)
+PG_KEYWORD("current", CURRENT_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("current_catalog", CURRENT_CATALOG, RESERVED_KEYWORD)
 PG_KEYWORD("current_date", CURRENT_DATE, RESERVED_KEYWORD)
 PG_KEYWORD("current_role", CURRENT_ROLE, RESERVED_KEYWORD)
@@ -131,9 +130,9 @@ PG_KEYWORD("delimiter", DELIMITER, UNRESERVED_KEYWORD)
 PG_KEYWORD("delimiters", DELIMITERS, UNRESERVED_KEYWORD)
 PG_KEYWORD("deny", DENY, UNRESERVED_KEYWORD)
 PG_KEYWORD("desc", DESC, RESERVED_KEYWORD)
-//PG_KEYWORD("dictionary", DICTIONARY, UNRESERVED_KEYWORD)
+PG_KEYWORD("dictionary", DICTIONARY, UNRESERVED_KEYWORD)
 PG_KEYWORD("disable", DISABLE_P, UNRESERVED_KEYWORD)
-//PG_KEYWORD("discard", DISCARD, UNRESERVED_KEYWORD)
+PG_KEYWORD("discard", DISCARD, UNRESERVED_KEYWORD)
 PG_KEYWORD("distinct", DISTINCT, RESERVED_KEYWORD)
 PG_KEYWORD("distributed", DISTRIBUTED, RESERVED_KEYWORD)
 PG_KEYWORD("do", DO, RESERVED_KEYWORD)
@@ -251,6 +250,7 @@ PG_KEYWORD("location", LOCATION, UNRESERVED_KEYWORD)
 PG_KEYWORD("lock", LOCK_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("log", LOG_P, TYPE_FUNC_NAME_KEYWORD)
 PG_KEYWORD("login", LOGIN_P, UNRESERVED_KEYWORD)
+PG_KEYWORD("mapping", MAPPING, UNRESERVED_KEYWORD)
 PG_KEYWORD("master", MASTER, UNRESERVED_KEYWORD)      /* GPDB */
 PG_KEYWORD("match", MATCH, UNRESERVED_KEYWORD)
 PG_KEYWORD("maxvalue", MAXVALUE, UNRESERVED_KEYWORD)
@@ -315,7 +315,7 @@ PG_KEYWORD("overlaps", OVERLAPS, TYPE_FUNC_NAME_KEYWORD)
 PG_KEYWORD("overlay", OVERLAY, COL_NAME_KEYWORD)
 PG_KEYWORD("owned", OWNED, UNRESERVED_KEYWORD)
 PG_KEYWORD("owner", OWNER, UNRESERVED_KEYWORD)
-//PG_KEYWORD("parser", PARSER, UNRESERVED_KEYWORD)
+PG_KEYWORD("parser", PARSER, UNRESERVED_KEYWORD)
 PG_KEYWORD("partial", PARTIAL, UNRESERVED_KEYWORD)
 PG_KEYWORD("partition", PARTITION, RESERVED_KEYWORD)         /* GPDB */
 PG_KEYWORD("partitions", PARTITIONS, UNRESERVED_KEYWORD)     /* GPDB */
@@ -325,7 +325,7 @@ PG_KEYWORD("percent", PERCENT, UNRESERVED_KEYWORD)
 PG_KEYWORD("percentile_cont", PERCENTILE_CONT, COL_NAME_KEYWORD)
 PG_KEYWORD("percentile_disc", PERCENTILE_DISC, COL_NAME_KEYWORD)
 PG_KEYWORD("placing", PLACING, RESERVED_KEYWORD)
-//PG_KEYWORD("plans", PLANS, UNRESERVED_KEYWORD)
+PG_KEYWORD("plans", PLANS, UNRESERVED_KEYWORD)
 PG_KEYWORD("position", POSITION, COL_NAME_KEYWORD)
 PG_KEYWORD("preceding", PRECEDING, RESERVED_KEYWORD)         /* unreserved in standard */
 PG_KEYWORD("precision", PRECISION, COL_NAME_KEYWORD)
@@ -358,7 +358,7 @@ PG_KEYWORD("release", RELEASE, UNRESERVED_KEYWORD)
 PG_KEYWORD("rename", RENAME, UNRESERVED_KEYWORD)
 PG_KEYWORD("repeatable", REPEATABLE, UNRESERVED_KEYWORD)
 PG_KEYWORD("replace", REPLACE, UNRESERVED_KEYWORD)
-//PG_KEYWORD("replica", REPLICA, UNRESERVED_KEYWORD)
+PG_KEYWORD("replica", REPLICA, UNRESERVED_KEYWORD)
 PG_KEYWORD("reset", RESET, UNRESERVED_KEYWORD)
 PG_KEYWORD("resource", RESOURCE, UNRESERVED_KEYWORD)
 PG_KEYWORD("restart", RESTART, UNRESERVED_KEYWORD)
@@ -378,7 +378,7 @@ PG_KEYWORD("savepoint", SAVEPOINT, UNRESERVED_KEYWORD)
 PG_KEYWORD("scatter", SCATTER, RESERVED_KEYWORD)           /* GPDB */
 PG_KEYWORD("schema", SCHEMA, UNRESERVED_KEYWORD)
 PG_KEYWORD("scroll", SCROLL, UNRESERVED_KEYWORD)
-PG_KEYWORD("search", SEARCH, UNRESERVED_KEYWORD)           /* Reserved in standard */
+PG_KEYWORD("search", SEARCH, UNRESERVED_KEYWORD)
 PG_KEYWORD("second", SECOND_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("security", SECURITY, UNRESERVED_KEYWORD)
 PG_KEYWORD("segment", SEGMENT, UNRESERVED_KEYWORD)
@@ -421,7 +421,7 @@ PG_KEYWORD("tablespace", TABLESPACE, UNRESERVED_KEYWORD)
 PG_KEYWORD("temp", TEMP, UNRESERVED_KEYWORD)
 PG_KEYWORD("template", TEMPLATE, UNRESERVED_KEYWORD)
 PG_KEYWORD("temporary", TEMPORARY, UNRESERVED_KEYWORD)
-//PG_KEYWORD("text", TEXT_P, UNRESERVED_KEYWORD)
+PG_KEYWORD("text", TEXT_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("then", THEN, RESERVED_KEYWORD)
 PG_KEYWORD("threshold", THRESHOLD, UNRESERVED_KEYWORD)          /* GPDB */
 PG_KEYWORD("ties", TIES, UNRESERVED_KEYWORD)
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index bd602e28d8a8..d71d4584121f 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_agg.h,v 1.35 2007/01/05 22:19:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_agg.h,v 1.36 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index a9d6fb753d6a..5469e6f2f219 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_clause.h,v 1.48 2007/01/09 02:14:15 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_clause.h,v 1.49 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 140d2c1a2ae8..ff7230f2d49b 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.69 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.75 2008/01/11 18:39:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #include "parser/parse_node.h"
 
 
+/* Type categories (kluge ... ought to be extensible) */
 typedef enum CATEGORY
 {
 	INVALID_TYPE,
@@ -43,6 +44,7 @@ typedef enum CoercionPathType
 	COERCION_PATH_COERCEVIAIO	/* need a CoerceViaIO node */
 } CoercionPathType;
 
+
 extern bool IsBinaryCoercible(Oid srctype, Oid targettype);
 extern bool IsPreferredType(CATEGORY category, Oid type);
 extern CATEGORY TypeCategory(Oid type);
@@ -71,8 +73,8 @@ extern Node *coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod,
 extern Node *coerce_to_boolean(ParseState *pstate, Node *node,
 				  const char *constructName);
 extern Node *coerce_to_specific_type(ParseState *pstate, Node *node,
-									 Oid targetTypeId,
-									 const char *constructName);
+						Oid targetTypeId,
+						const char *constructName);
 
 extern Oid	select_common_type(List *typeids, const char *context);
 extern Node *coerce_to_common_type(ParseState *pstate, Node *node,
@@ -90,7 +92,8 @@ extern bool check_generic_type_consistency(Oid *actual_arg_types,
 extern Oid enforce_generic_type_consistency(Oid *actual_arg_types,
 								 Oid *declared_arg_types,
 								 int nargs,
-								 Oid rettype);
+								 Oid rettype,
+								 bool allow_poly);
 extern Oid resolve_generic_type(Oid declared_type,
 					 Oid context_actual_type,
 					 Oid context_declared_type);
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 205fec4836fc..af225f1a4fab 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_expr.h,v 1.37 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_expr.h,v 1.38 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index 04ba93c70ada..7b6096a3d571 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_func.h,v 1.58 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_func.h,v 1.59.2.1 2010/07/30 17:57:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,6 +84,8 @@ extern Oid LookupFuncNameTypeNames(List *funcname, List *argtypes,
 extern Oid LookupAggNameTypeNames(List *aggname, List *argtypes,
 					   bool noError);
 
+extern void check_pg_get_expr_args(ParseState *pstate, Oid fnoid, List *args);
+
 extern void parseCheckTableFunctions(ParseState *pstate, Query *qry);
 
 #endif   /* PARSE_FUNC_H */
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 988c9e2d4ca1..9bc8e3bd90e1 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.51 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.53 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index e6cc382a6faa..f645836ea84e 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_oper.h,v 1.41 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_oper.h,v 1.42 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/parser/parse_partition.h b/src/include/parser/parse_partition.h
index 396e62791d1e..d16722118775 100644
--- a/src/include/parser/parse_partition.h
+++ b/src/include/parser/parse_partition.h
@@ -13,6 +13,7 @@
 #ifndef PARSE_PARTITION_H
 #define PARSE_PARTITION_H
 
+#include "parser/analyze.h"
 #include "parser/parse_node.h"
 
 extern void transformPartitionBy(ParseState *pstate, CreateStmtContext *cxt,
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 4da0605c2bb6..dd32a498bce6 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.56 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.57 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -82,7 +82,7 @@ extern RangeTblEntry *addRangeTableEntryForCTE(ParseState *pstate,
 											   Index levelsup,
 											   RangeVar *rangeVar,
 											   bool inFromCl);
-extern bool isSimplyUpdatableRelation(Oid relid);
+extern bool isSimplyUpdatableRelation(Oid relid, bool noerror);
 extern Index extractSimplyUpdatableRTEIndex(List *rtable);
 extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte,
 			  bool addToJoinList,
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index 49de74b0bc95..e5ac4201389c 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_type.h,v 1.35 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_type.h,v 1.39 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,27 +21,28 @@ typedef HeapTuple Type;
 
 #define ReleaseType(fmw) ReleaseSysCache((fmw))
 
-extern Oid	LookupTypeName(ParseState *pstate, const TypeName *typname);
-extern char *TypeNameToString(const TypeName *typname);
+extern Type LookupTypeName(ParseState *pstate, const TypeName *typename,
+			   int32 *typmod_p);
+extern Type typenameType(ParseState *pstate, const TypeName *typename,
+			 int32 *typmod_p);
+extern Oid typenameTypeId(ParseState *pstate, const TypeName *typename,
+			   int32 *typmod_p);
+
+extern char *TypeNameToString(const TypeName *typename);
 extern char *TypeNameListToString(List *typenames);
-extern Oid	typenameTypeId(ParseState *pstate, const TypeName *typname);
-extern Type typenameType(ParseState *pstate, const TypeName *typname);
-extern int32 typenameTypeMod(ParseState *pstate, const TypeName *typname,
-							 Oid typeId);
 
 extern Type typeidType(Oid id);
 
 extern Oid	typeTypeId(Type tp);
 extern int16 typeLen(Type t);
 extern bool typeByVal(Type t);
-extern char typeTypType(Type t);
 extern char *typeTypeName(Type t);
 extern Oid	typeTypeRelid(Type typ);
 extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod);
 
 extern Oid	typeidTypeRelid(Oid type_id);
 
-extern void parseTypeString(const char *str, Oid *type_id, int32 *typmod);
+extern void parseTypeString(const char *str, Oid *type_id, int32 *typmod_p);
 
 #define ISCOMPLEX(typid) (typeidTypeRelid(typid) != InvalidOid)
 
diff --git a/src/include/parser/parse_utilcmd.h b/src/include/parser/parse_utilcmd.h
index f6f0413c4015..f4de10251cd8 100644
--- a/src/include/parser/parse_utilcmd.h
+++ b/src/include/parser/parse_utilcmd.h
@@ -18,6 +18,15 @@
 #include "parser/analyze.h"
 #include "parser/parse_node.h"
 
+extern List *transformCreateStmt(CreateStmt *stmt, const char *queryString, bool createPartition);
+extern CreateExternalStmt *transformCreateExternalStmt(CreateExternalStmt *stmt, const char *queryString);
+extern List *transformAlterTableStmt(AlterTableStmt *stmt,
+						const char *queryString);
+extern List *transformIndexStmt(IndexStmt *stmt, const char *queryString);
+extern void transformRuleStmt(RuleStmt *stmt, const char *queryString,
+				  List **actions, Node **whereClause);
+extern List *transformCreateSchemaStmt(CreateSchemaStmt *stmt);
+
 extern void transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt, bool mayDefer);
 extern void transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
 								 InhRelation *inhRelation, bool forceBareCol);
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 29872f9e79c4..ba2011f39dba 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -170,6 +170,9 @@
 /* Define to 1 if your compiler understands __FUNCTION__. */
 #undef HAVE_FUNCNAME__FUNCTION
 
+/* Define to 1 if you have __sync_lock_test_and_set(int *) and friends. */
+#undef HAVE_GCC_INT_ATOMICS
+
 /* Define to 1 if you have __atomic_compare_exchange_n(int *, int *, int). */
 #undef HAVE_GCC__ATOMIC_INT32_CAS
 
@@ -282,19 +285,19 @@
 /* Define to 1 if you have the <kernel/OS.h> header file. */
 #undef HAVE_KERNEL_OS_H
 
-/* Define to 1 if `e_data' is a member of `krb5_error'. */
+/* Define to 1 if `e_data' is member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_E_DATA
 
-/* Define to 1 if `text.data' is a member of `krb5_error'. */
+/* Define to 1 if `text.data' is member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_TEXT_DATA
 
 /* Define to 1 if you have krb5_free_unparsed_name */
 #undef HAVE_KRB5_FREE_UNPARSED_NAME
 
-/* Define to 1 if `client' is a member of `krb5_ticket'. */
+/* Define to 1 if `client' is member of `krb5_ticket'. */
 #undef HAVE_KRB5_TICKET_CLIENT
 
-/* Define to 1 if `enc_part2' is a member of `krb5_ticket'. */
+/* Define to 1 if `enc_part2' is member of `krb5_ticket'. */
 #undef HAVE_KRB5_TICKET_ENC_PART2
 
 /* Define to 1 if you have the <langinfo.h> header file. */
@@ -351,6 +354,9 @@
 /* Define to 1 if you have the `xml2' library (-lxml2). */
 #undef HAVE_LIBXML2
 
+/* Define to 1 if you have the `xslt' library (-lxslt). */
+#undef HAVE_LIBXSLT
+
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
@@ -539,22 +545,22 @@
 /* Define to 1 if the system has the type `struct option'. */
 #undef HAVE_STRUCT_OPTION
 
-/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
+/* Define to 1 if `sa_len' is member of `struct sockaddr'. */
 #undef HAVE_STRUCT_SOCKADDR_SA_LEN
 
 /* Define to 1 if the system has the type `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE
 
-/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
+/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
 
-/* Define to 1 if `ss_len' is a member of `struct sockaddr_storage'. */
+/* Define to 1 if `ss_len' is member of `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
 
-/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
+/* Define to 1 if `__ss_family' is member of `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
 
-/* Define to 1 if `__ss_len' is a member of `struct sockaddr_storage'. */
+/* Define to 1 if `__ss_len' is member of `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN
 
 /* Define to 1 if the system has the type `struct sockaddr_un'. */
@@ -563,7 +569,7 @@
 /* Define to 1 if the system has the type `struct sockcred'. */
 #undef HAVE_STRUCT_SOCKCRED
 
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
+/* Define to 1 if `tm_zone' is member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if you have the <SupportDefs.h> header file. */
@@ -663,9 +669,6 @@
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define to 1 if the system has the type `unsigned long long int'. */
-#undef HAVE_UNSIGNED_LONG_LONG_INT
-
 /* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
@@ -693,6 +696,9 @@
 /* Define to 1 if you have the <winldap.h> header file. */
 #undef HAVE_WINLDAP_H
 
+/* Define to 1 if you have the <winsock2.h> header file. */
+#undef HAVE_WINSOCK2_H
+
 /* Define to 1 if you have __cpuid. */
 #undef HAVE__CPUID
 
@@ -723,9 +729,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -818,6 +821,10 @@
 /* Define to 1 to build with XML support. (--with-libxml) */
 #undef USE_LIBXML
 
+/* Define to 1 to use XSLT support when building contrib/xml2.
+   (--with-libxslt) */
+#undef USE_LIBXSLT
+
 /* Define to select named POSIX semaphores. */
 #undef USE_NAMED_POSIX_SEMAPHORES
 
@@ -881,11 +888,6 @@
 # endif
 #endif
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 23b7c0698703..c322d1939378 100755
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -45,7 +45,6 @@
  * HAVE_STRTOLL, HAVE_STRTOULL, HAVE_STRUCT_OPTION, ENABLE_THREAD_SAFETY,
  * USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
  *
- * For now, also HAVE_IPV6
  */
 
 /* Define to the type of arg 1 of 'accept' */
@@ -144,9 +143,6 @@
 /* Define to 1 if you have the <editline/readline.h> header file. */
 /* #undef HAVE_EDITLINE_READLINE_H */
 
-/* Define to 1 if you have the <endian.h> header file. */
-/* #undef HAVE_ENDIAN_H */
-
 /* Define to 1 if you have the `fcvt' function. */
 #define HAVE_FCVT 1
 
@@ -619,13 +615,13 @@
 #define PACKAGE_STRING "Greenplum Database 8.3devel"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.3"
+#define PACKAGE_VERSION "8.3.23"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "8.3"
+#define PG_VERSION "8.3.23"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 80300
+#define PG_VERSION_NUM 80323
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "greenplum"
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 2a4026ca2fb0..3d903dc593c4 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -5,7 +5,7 @@
  *
  *	Copyright (c) 2001-2009, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.54 2007/02/09 16:12:19 tgl Exp $
+ *	$PostgreSQL: pgsql/src/include/pgstat.h,v 1.71.2.1 2008/04/03 16:27:32 tgl Exp $
  * ----------
  */
 #ifndef PGSTAT_H
@@ -310,7 +310,6 @@ typedef struct PgStat_MsgAnalyze
 
 
 /* ----------
- 
  * PgStat_MsgQueuestat			Sent by the backend to report resource queue
  *								activity statistics.
  * ----------  GPDB 
@@ -661,11 +660,8 @@ typedef struct PgStat_FunctionCallUsage
  * GUC parameters
  * ----------
  */
-extern bool pgstat_collect_startcollector;  // NOT USED
-
+extern bool pgstat_track_activities;
 extern bool pgstat_track_counts;
-extern bool pgstat_track_counts;	// NOT USED
-extern bool pgstat_track_activities;  // NOT USED
 
 extern bool pgstat_collect_queuelevel;
 
@@ -719,6 +715,7 @@ extern void pgstat_report_analyze(Relation rel,
 
 extern void pgstat_initialize(void);
 extern void pgstat_bestart(void);
+
 extern void pgstat_report_activity(const char *what);
 extern void pgstat_report_txn_timestamp(TimestampTz tstamp);
 extern void pgstat_report_waiting(char reason);
@@ -740,16 +737,10 @@ extern PgStat_StatPortalEntry *pgstat_getportalentry(uint32 portalid,
 		if (pgstat_track_counts && (rel)->pgstat_info != NULL)		\
 			(rel)->pgstat_info->t_counts.t_numscans++;				\
 	} while (0)
-/* kluge for bitmap scans: */
-#define pgstat_discount_heap_scan(rel)									\
-	do {																\
-		if (pgstat_track_counts && (rel)->pgstat_info != NULL)			\
-			(rel)->pgstat_info->t_counts.t_numscans--;		\
-	} while (0)
-#define pgstat_count_heap_getnext(rel)									\
-	do {																\
-		if (pgstat_track_counts && (rel)->pgstat_info != NULL)			\
-			(rel)->pgstat_info->t_counts.t_tuples_returned++; \
+#define pgstat_count_heap_getnext(rel)								\
+	do {															\
+		if (pgstat_track_counts && (rel)->pgstat_info != NULL)		\
+			(rel)->pgstat_info->t_counts.t_tuples_returned++;		\
 	} while (0)
 #define pgstat_count_heap_fetch(rel)								\
 	do {															\
@@ -795,7 +786,6 @@ extern PgStat_StatPortalEntry *pgstat_getportalentry(uint32 portalid,
 		if (pgstat_track_counts && (rel)->pgstat_info != NULL)		\
 			(rel)->pgstat_info->t_counts.t_blocks_hit++;			\
 	} while (0)
-
 /* Resource queue statistics: */
 #define pgstat_count_queue_exec(p, q) 									\
 	do {																\
@@ -883,12 +873,23 @@ extern void pgstat_twophase_postcommit(TransactionId xid, uint16 info,
 extern void pgstat_twophase_postabort(TransactionId xid, uint16 info,
 						  void *recdata, uint32 len);
 
-extern void pgstat_send_bgwriter(void);
+extern void pgstat_count_heap_insert(Relation rel);
+extern void pgstat_count_heap_update(Relation rel, bool hot);
+extern void pgstat_count_heap_delete(Relation rel);
+extern void pgstat_update_heap_dead_tuples(Relation rel, int delta);
 
-/* OLD?
-extern void pgstat_count_xact_commit(void);
-extern void pgstat_count_xact_rollback(void);
-*/
+extern void AtEOXact_PgStat(bool isCommit);
+extern void AtEOSubXact_PgStat(bool isCommit, int nestDepth);
+
+extern void AtPrepare_PgStat(void);
+extern void PostPrepare_PgStat(void);
+
+extern void pgstat_twophase_postcommit(TransactionId xid, uint16 info,
+						   void *recdata, uint32 len);
+extern void pgstat_twophase_postabort(TransactionId xid, uint16 info,
+						  void *recdata, uint32 len);
+
+extern void pgstat_send_bgwriter(void);
 
 /* ----------
  * Support functions for the SQL-callable functions to
diff --git a/src/include/port.h b/src/include/port.h
index 1018d1d9cc19..4a126d70921c 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -105,11 +105,8 @@ extern BOOL AddUserToTokenDacl(HANDLE hToken);
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #define DEVNULL "nul"
-/* "con" does not work from the Msys 1.0.10 console (part of MinGW). */
-#define DEVTTY	"con"
 #else
 #define DEVNULL "/dev/null"
-#define DEVTTY "/dev/tty"
 #endif
 
 /*
@@ -219,6 +216,16 @@ __attribute__((format(printf, 1, 2)));
 #endif
 #endif   /* USE_REPL_SNPRINTF */
 
+/*
+ * Versions of libintl >= 0.18? try to replace setlocale() with a macro
+ * to their own versions.  Remove the macro, if it exists, because it
+ * ends up calling the wrong version when the backend and libintl use
+ * different versions of msvcrt.
+ */
+#if defined(setlocale) && defined(WIN32)
+#undef setlocale
+#endif
+
 /* Portable prompt handling */
 extern char *simple_prompt(const char *prompt, int maxlen, bool echo);
 
diff --git a/src/include/port/aix.h b/src/include/port/aix.h
index 14f276a9462c..67f300a72d0a 100644
--- a/src/include/port/aix.h
+++ b/src/include/port/aix.h
@@ -3,6 +3,3 @@
  */
 #define CLASS_CONFLICT
 #define DISABLE_XOPEN_NLS
-
-#include <sys/machine.h>		/* ENDIAN definitions for network
-								 * communication */
diff --git a/src/include/port/cygwin.h b/src/include/port/cygwin.h
index 1a1be83b8f4c..6d46f0c774f0 100644
--- a/src/include/port/cygwin.h
+++ b/src/include/port/cygwin.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.6 2003/12/23 03:31:30 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.7 2007/07/25 12:22:53 mha Exp $ */
 
 #include <cygwin/version.h>
 
@@ -14,8 +14,8 @@
 #endif
 
 #ifdef BUILDING_DLL
-#define DLLIMPORT __declspec (dllexport)
+#define PGDLLIMPORT __declspec (dllexport)
 #else
-#define DLLIMPORT __declspec (dllimport)
+#define PGDLLIMPORT __declspec (dllimport)
 
 #endif
diff --git a/src/include/port/dgux.h b/src/include/port/dgux.h
index 73096530f280..43ccbbbe5313 100644
--- a/src/include/port/dgux.h
+++ b/src/include/port/dgux.h
@@ -1,15 +1,3 @@
-/* $PostgreSQL: pgsql/src/include/port/dgux.h,v 1.10 2006/03/11 04:38:38 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/dgux.h,v 1.11 2007/04/06 05:36:51 tgl Exp $ */
 
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		BIG_ENDIAN
-
-#endif
+/* nothing needed */
diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h
index 6c8cdeb2fb7c..dc48e6dc1438 100644
--- a/src/include/port/hpux.h
+++ b/src/include/port/hpux.h
@@ -1,27 +1,3 @@
-/* $PostgreSQL: pgsql/src/include/port/hpux.h,v 1.23 2006/03/11 04:38:38 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/hpux.h,v 1.24 2007/04/06 05:36:51 tgl Exp $ */
 
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-
-#if defined(__hppa)
-
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		BIG_ENDIAN
-#endif
-#elif defined(__ia64)
-
-/* HPUX runs IA64 in big-endian mode */
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		BIG_ENDIAN
-#endif
-#else
-#error unrecognized CPU type for HP-UX
-
-#endif
+/* nothing needed */
diff --git a/src/include/port/linux.h b/src/include/port/linux.h
index 191338c99fda..fe6c9192f260 100644
--- a/src/include/port/linux.h
+++ b/src/include/port/linux.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/linux.h,v 1.42.2.1 2007/07/02 20:12:00 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/linux.h,v 1.44 2007/11/15 21:14:44 momjian Exp $ */
 
 /*
  * As of July 2007, all known versions of the Linux kernel will sometimes
@@ -12,3 +12,13 @@
  * to have a kernel version test here.
  */
 #define HAVE_LINUX_EIDRM_BUG
+
+/*
+ * Set the default wal_sync_method to fdatasync.  With recent Linux versions,
+ * xlogdefs.h's normal rules will prefer open_datasync, which (a) doesn't
+ * perform better and (b) causes outright failures on ext4 data=journal
+ * filesystems, because those don't support O_DIRECT.
+ */
+#define PLATFORM_DEFAULT_SYNC_METHOD_STR "fdatasync"
+#define PLATFORM_DEFAULT_SYNC_METHOD	SYNC_METHOD_FDATASYNC
+#define PLATFORM_DEFAULT_SYNC_FLAGBIT	0
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index b4e975c89d06..2f05116d3e12 100644
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -2,17 +2,3 @@
 #define SCO_ACCEPT_BUG
 
 #define USE_UNIVEL_CC
-
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		LITTLE_ENDIAN
-
-#endif
diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h
index b63d53160aaf..374f6c71c065 100644
--- a/src/include/port/solaris.h
+++ b/src/include/port/solaris.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/solaris.h,v 1.15 2007/01/10 18:22:50 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/solaris.h,v 1.17 2007/11/15 21:14:44 momjian Exp $ */
 
 /*
  * Sort this out for all operating systems some time.  The __xxx
@@ -25,36 +25,13 @@
 #include <sys/isa_defs.h>
 #endif
 
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-
-#ifndef			BYTE_ORDER
-
-#ifdef __sparc__
-#define		  BYTE_ORDER	  BIG_ENDIAN
-#endif
-#if defined(__i386__) || defined(__x86_64__) 
-#define		 BYTE_ORDER		 LITTLE_ENDIAN
-#endif
-#if defined(__amd64___) || defined(__x86_64__)
-#define		 BYTE_ORDER		 LITTLE_ENDIAN
-#endif
-#endif
-
 /*
  * Many versions of Solaris have broken strtod() --- see bug #4751182.
  * This has been fixed in current versions of Solaris:
  *
  * http://sunsolve.sun.com/search/document.do?assetkey=1-21-108993-62-1&searchclause=108993-62
  * http://sunsolve.sun.com/search/document.do?assetkey=1-21-112874-34-1&searchclause=112874-34
- * 
+ *
  * However, many people might not have patched versions, so
  * still use our own fix for the buggy version.
  */
diff --git a/src/include/port/sunos4.h b/src/include/port/sunos4.h
index f7545fc6fae8..48fdbffb91cc 100644
--- a/src/include/port/sunos4.h
+++ b/src/include/port/sunos4.h
@@ -1,16 +1,2 @@
 /* sprintf() returns char *, not int, on SunOS 4.1.x */
 #define SPRINTF_CHAR
-
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		BIG_ENDIAN
-
-#endif
diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h
index 2c38612c4d86..7366299b8a2a 100644
--- a/src/include/port/svr4.h
+++ b/src/include/port/svr4.h
@@ -1,6 +1,3 @@
-#ifndef			BYTE_ORDER
-#ifdef			MIPSEB
-#define			BYTE_ORDER		BIG_ENDIAN
-#endif
+/* $PostgreSQL */
 
-#endif
+/* nothing needed */
diff --git a/src/include/port/ultrix4.h b/src/include/port/ultrix4.h
index c199afcbea5a..7df0abc34dca 100644
--- a/src/include/port/ultrix4.h
+++ b/src/include/port/ultrix4.h
@@ -1,19 +1,6 @@
 #define NOFIXADE
 #define NEED_STRDUP
 
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		LITTLE_ENDIAN
-#endif
-
 /*
  * Except for those system calls and library functions that are either
  * - covered by the C standard library and Posix.1
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index d94e7f263b61..ca054166d191 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -3,17 +3,3 @@
  * the native UNIXWARE C compiler.
  ***************************************/
 #define USE_UNIVEL_CC
-
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		LITTLE_ENDIAN
-
-#endif
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index aef47166981f..6cddddac2e03 100644
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -6,17 +6,3 @@
  * the native UNIXWARE C compiler.
  ***************************************/
 #define USE_UNIVEL_CC
-
-#ifndef			BIG_ENDIAN
-#define			BIG_ENDIAN		4321
-#endif
-#ifndef			LITTLE_ENDIAN
-#define			LITTLE_ENDIAN	1234
-#endif
-#ifndef			PDP_ENDIAN
-#define			PDP_ENDIAN		3412
-#endif
-#ifndef			BYTE_ORDER
-#define			BYTE_ORDER		LITTLE_ENDIAN
-
-#endif
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 01a518cb70f9..514578e31e73 100644
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -13,7 +13,7 @@
  * we want a switch to disable it sometime in the future.
  */
 #ifndef __BORLANDC__
-#undef ENABLE_SSPI
+#define ENABLE_SSPI 1
 #endif
 
 /* undefine and redefine after #include */
@@ -37,17 +37,32 @@
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
 
-#define HAVE_FSYNC_WRITETHROUGH
-#define HAVE_FSYNC_WRITETHROUGH_ONLY
 #define ftruncate(a,b)	chsize(a,b)
+
+/* Windows doesn't have fsync() as such, use _commit() */
+#define fsync(fd) _commit(fd)
+
 /*
- *	Even though we don't support 'fsync' as a wal_sync_method,
- *	we do fsync() a few other places where _commit() is just fine.
+ * For historical reasons, we allow setting wal_sync_method to
+ * fsync_writethrough on Windows, even though it's really identical to fsync
+ * (both code paths wind up at _commit()).
  */
-#define fsync(fd) _commit(fd)
+#define HAVE_FSYNC_WRITETHROUGH
+#define FSYNC_WRITETHROUGH_IS_FSYNC
 
 #define USES_WINSOCK
 
+/*
+ * Ensure that anyone building an extension is using a 32 bit time_t.
+ * On Mingw/Msys, that should always be the case, but MSVC++ defaults
+ * to 64 bits. We set that for our own build in the project files
+ */
+#if defined(WIN32_ONLY_COMPILER) && !defined(FRONTEND)
+#ifndef _USE_32BIT_TIME_T
+#error "Postgres uses 32 bit time_t - add #define _USE_32BIT_TIME_T on Windows"
+#endif
+#endif
+
 /* defines for dynamic linking on Win32 platform */
 #if defined(WIN32) || defined(__CYGWIN__)
 
@@ -305,6 +320,9 @@ extern int	pgwin32_is_admin(void);
 extern int	pgwin32_is_service(void);
 #endif
 
+/* in backend/port/win32_shmem.c */
+extern int	pgwin32_ReserveSharedMemoryRegion(HANDLE);
+
 /* in port/win32error.c */
 extern void _dosmaperr(unsigned long);
 
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 1a2769db207f..4f83f0c657f7 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1995, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/postgres.h,v 1.76 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/postgres.h,v 1.88 2008/01/01 19:45:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -110,7 +110,6 @@ typedef struct
 	char		va_data[1];		/* Data begins here */
 } varattrib_1b;
 
-
 /* NOT Like Postgres! ...In GPDB, We waste a few bytes of padding, and don't always set the va_len_1be to anything */
 typedef struct
 {
@@ -136,6 +135,8 @@ typedef struct
  * look big-endian in the tuple.   This is a bit ugly, but changing it would require
  * all our customers to initdb.
  *
+ * The "xxx" bits are the length field (which includes itself in all cases).
+ * In the big-endian case we mask to extract the length.
  * Note that in both cases the flag bits are in the physically
  * first byte.	Also, it is not possible for a 1-byte length word to be zero;
  * this lets us disambiguate alignment padding bytes from the start of an
@@ -169,18 +170,23 @@ typedef struct
 	(ntohl(((varattrib_4b *) (PTR))->va_4byte.va_header) & 0x3FFFFFFF)
 #define VARSIZE_1B(PTR) \
 	(((varattrib_1b *) (PTR))->va_header & 0x7F)
-
-
 /* In GPDB, VARSIZE_1B_E() is always the size of a toast pointer plus the 4 byte header */
 #define VARSIZE_1B_E(PTR) (VARHDRSZ_EXTERNAL + sizeof(struct varatt_external))
 
-
 #define SET_VARSIZE_4B(PTR,len) \
 	(((varattrib_4b *) (PTR))->va_4byte.va_header = htonl( (len) & 0x3FFFFFFF ))
 #define SET_VARSIZE_4B_C(PTR,len) \
 	(((varattrib_4b *) (PTR))->va_4byte.va_header = htonl( ((len) & 0x3FFFFFFF) | 0x40000000 ))
 #define SET_VARSIZE_1B(PTR,len) \
 	(((varattrib_1b *) (PTR))->va_header = (len) | 0x80)
+/*
+ * Although this macro sets var_len_1be, data stored in GPDB might
+ * not have anything set in this byte, so you can't count on it's value
+ * Not really a problem, since it is always based on TOAST_POINTER_LEN
+ */
+#define SET_VARSIZE_1B_E(PTR,len) \
+	(((varattrib_1b_e *) (PTR))->va_header = 0x80, \
+	 ((varattrib_1b_e *) (PTR))->va_len_1be = (len))
 
 #define VARHDRSZ_SHORT			1
 #define VARATT_SHORT_MAX		0x7F
@@ -198,6 +204,8 @@ typedef struct
 #define VARDATA_1B(PTR)		(((varattrib_1b *) (PTR))->va_data)
 #define VARDATA_1B_E(PTR)	(((varattrib_1b_e *) (PTR))->va_data)
 
+#define VARRAWSIZE_4B_C(PTR) \
+	(((varattrib_4b *) (PTR))->va_compressed.va_rawsize)
 
 /* Externally visible macros */
 
@@ -218,57 +226,23 @@ typedef struct
  * and just use things like memcpy on it anyways.
  */
 #define VARDATA(PTR)						VARDATA_4B(PTR)
-#define VARDATA_D(D)						VARDATA(DatumGetPointer(D))
 #define VARSIZE(PTR)						VARSIZE_4B(PTR)
-#define VARSIZE_D(D) 						VARSIZE(DatumGetPointer(D))
 
-/* these are used by tuptoaster.c */
-#define VARHDRSZ_SHORT 						1
 #define VARSIZE_SHORT(PTR)					VARSIZE_1B(PTR)
-#define VARSIZE_SHORT_D(D)					VARSIZE_SHORT(DatumGetPointer(D))
 #define VARDATA_SHORT(PTR)					VARDATA_1B(PTR)
-#define VARDATA_SHORT_D(D) 					VARDATA_SHORT(DatumGetPointer(D))
-#define SET_VARSIZE(PTR, len)				SET_VARSIZE_4B  ((varattrib_4b*)(PTR), (len))
-#define SET_VARSIZE_SHORT(PTR, len) 		SET_VARSIZE_1B  ((PTR), (len))
-#define SET_VARSIZE_COMPRESSED(PTR, len) 	SET_VARSIZE_4B_C((PTR), (len))
-
-
-/* Do we want to rename these? */
-#define VARATT_IS_COMPRESSED(PTR) 			VARATT_IS_4B_C(PTR)
-#define VARATT_IS_COMPRESSED_D(D) 			VARATT_IS_COMPRESSED(DatumGetPointer(D))
-#define VARATT_IS_EXTERNAL(PTR) 			VARATT_IS_1B_E(PTR)
-#define VARATT_IS_EXTERNAL_D(D) 			VARATT_IS_1B_E(DatumGetPointer(D))
-#define VARATT_IS_SHORT(PTR) 				VARATT_IS_1B(PTR)
-#define VARATT_IS_SHORT_D(D) 				VARATT_IS_1B(DatumGetPointer(D))
-#define VARATT_SET_COMPRESSED(PTR)			SET_VARSIZE_C(PTR)
-/* XXX */
-#define VARATT_IS_EXTENDED(PTR)				(!VARATT_IS_4B_U(PTR))
-#define VARATT_IS_EXTENDED_D(D)				VARATT_IS_EXTENDED(DatumGetPointer(D))
 
 #define VARSIZE_EXTERNAL(PTR)				VARSIZE_1B_E(PTR)
+#define VARDATA_EXTERNAL(PTR)				VARDATA_1B_E(PTR)
 
+#define VARATT_IS_COMPRESSED(PTR)			VARATT_IS_4B_C(PTR)
+#define VARATT_IS_EXTERNAL(PTR)				VARATT_IS_1B_E(PTR)
+#define VARATT_IS_SHORT(PTR)				VARATT_IS_1B(PTR)
+#define VARATT_IS_EXTENDED(PTR)				(!VARATT_IS_4B_U(PTR))
 
-/*
- * Bit patterns used to indicate sort varlena headers:
- *
- * 00xxxxxx	4-byte length word, aligned, uncompressed data (up to 1G)
- * 01xxxxxx	4-byte length word, aligned, *compressed* data (up to 1G)
- * 10000000	1-byte length word, unaligned, TOAST pointer
- * 1xxxxxxx 1-byte length word, unaligned, uncompressed data (up to 126b)
- *
- * Note: IS_1B is true for external toast records but VARSIZE_1B will return 0
- * for such records. As a consequence you must always check for for IS_EXTERNAL
- * before checking for IS_1B.
- */
-
-
-#define VARATT_COULD_SHORT(PTR)	(VARATT_IS_4B_U(PTR) && (VARSIZE(PTR)-VARHDRSZ+VARHDRSZ_SHORT <= VARATT_SHORT_MAX))
-#define VARATT_COULD_SHORT_D(D)	VARATT_COULD_SHORT(DatumGetPointer(D))
-#define VARSIZE_TO_SHORT(PTR)	((char)(VARSIZE(PTR)-VARHDRSZ+VARHDRSZ_SHORT) | 0x80)
-#define VARSIZE_TO_SHORT_D(D)	VARSIZE_TO_SHORT(DatumGetPointer(D))
-
-
-
+#define SET_VARSIZE(PTR, len)				SET_VARSIZE_4B(PTR, len)
+#define SET_VARSIZE_SHORT(PTR, len)			SET_VARSIZE_1B(PTR, len)
+#define SET_VARSIZE_COMPRESSED(PTR, len)	SET_VARSIZE_4B_C(PTR, len)
+#define SET_VARSIZE_EXTERNAL(PTR, len)		SET_VARSIZE_1B_E(PTR, len)
 
 #define VARSIZE_ANY(PTR) \
 	(VARATT_IS_1B_E(PTR) ? VARSIZE_1B_E(PTR) : \
@@ -285,12 +259,6 @@ typedef struct
 #define VARDATA_ANY(PTR) \
 	 (VARATT_IS_1B(PTR) ? VARDATA_1B(PTR) : VARDATA_4B(PTR))
 
-#define VARSIZE_ANY_D(D)					VARSIZE_ANY(DatumGetPointer(D))
-#define VARDATA_ANY_D(D)					VARDATA_ANY(DatumGetPointer(D))
-#define VARSIZE_ANY_EXHDR_D(D)			    VARSIZE_ANY_EXHDR(DatumGetPointer(D))
-
-
-#define VARDATA_COMPRESSED(PTR)	((PTR)->va_compressed.va_data)
 
 /* ----------------------------------------------------------------
  *				Section 2:	datum type + support macros
@@ -299,15 +267,11 @@ typedef struct
 
 /*
  * Port Notes:
- *	Postgres makes the following assumption about machines:
- *
- *	sizeof(Datum) == sizeof(long) >= sizeof(void *) >= 4
+ *     Postgres makes the following assumption about machines:
  *
- *  Greenplum CDB:
- * 	Datum is alway 8 bytes, regardless if it is 32bit or 64bit machine.
- *  so may be > sizeof(long).
+ *     sizeof(Datum) == sizeof(long) >= sizeof(void *) >= 4
  *
- *	Postgres also assumes that
+ *     Postgres also assumes that
  *
  *	sizeof(char) == 1
  *
@@ -315,6 +279,10 @@ typedef struct
  *
  *	sizeof(short) == 2
  *
+ *  Greenplum CDB:
+ *     Datum is alway 8 bytes, regardless if it is 32bit or 64bit machine.
+ *  so may be > sizeof(long).
+ *
  * When a type narrower than Datum is stored in a Datum, we place it in the
  * low-order bits and are careful that the DatumGetXXX macro for it discards
  * the unused high-order bits (as opposed to, say, assuming they are zero).
@@ -338,15 +306,6 @@ typedef union Datum_U
 
 typedef Datum *DatumPtr;
 
-#define GET_1_BYTE(datum)	(((Datum) (datum)) & 0x000000ff)
-#define GET_2_BYTES(datum)	(((Datum) (datum)) & 0x0000ffff)
-#define GET_4_BYTES(datum)	(((Datum) (datum)) & 0xffffffff)
-#define GET_8_BYTES(datum)	((Datum) (datum))
-#define SET_1_BYTE(value)	(((Datum) (value)) & 0x000000ff)
-#define SET_2_BYTES(value)	(((Datum) (value)) & 0x0000ffff)
-#define SET_4_BYTES(value)	(((Datum) (value)) & 0xffffffff)
-#define SET_8_BYTES(value)	((Datum) (value))
-
 /* 
  * Conversion between Datum and type X.  Changed from Macro to static inline
  * functions to get proper type checking.
@@ -496,6 +455,10 @@ extern PGDLLIMPORT bool assert_enabled;
 #define AssertImply(cond1, cond2) \
 		Trap(!(!(cond1) || (cond2)), "AssertImply failed")
 
+extern int ExceptionalCondition(const char *conditionName,
+					 const char *errorType,
+					 const char *fileName, int lineNumber);
+
 #define AssertEquivalent(cond1, cond2) \
 		Trap(!((bool)(cond1) == (bool)(cond2)), "AssertEquivalent failed")
 
diff --git a/src/include/postmaster/autovacuum.h b/src/include/postmaster/autovacuum.h
index 0dd5842ae0f2..a1a55d6fdfe4 100644
--- a/src/include/postmaster/autovacuum.h
+++ b/src/include/postmaster/autovacuum.h
@@ -34,9 +34,6 @@ extern int	AutovacuumLauncherPid;
 
 extern int	Log_autovacuum_min_duration;
 
-/* autovacuum launcher PID, only valid when worker is shutting down */
-extern int	AutovacuumLauncherPid;
-
 /* Status inquiry functions */
 extern bool AutoVacuumingActive(void);
 extern bool IsAutoVacuumLauncherProcess(void);
@@ -55,9 +52,6 @@ extern void AutoVacWorkerFailed(void);
 /* autovacuum cost-delay balancer */
 extern void AutoVacuumUpdateDelay(void);
 
-/* autovacuum cost-delay balancer */
-extern void AutoVacuumUpdateDelay(void);
-
 #ifdef EXEC_BACKEND
 extern void AutoVacMain(int argc, char *argv[]); // OLD interface
 extern void AutovacuumIAm(void);
diff --git a/src/include/postmaster/bgwriter.h b/src/include/postmaster/bgwriter.h
index c65904783c32..3dd911795384 100644
--- a/src/include/postmaster/bgwriter.h
+++ b/src/include/postmaster/bgwriter.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/postmaster/bgwriter.h,v 1.9 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/postmaster/bgwriter.h,v 1.11 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,11 +20,13 @@
 extern int	BgWriterDelay;
 extern int	CheckPointTimeout;
 extern int	CheckPointWarning;
+extern double CheckPointCompletionTarget;
 
 extern void BackgroundWriterMain(void);
 extern void CheckpointMain(void);
 
-extern void RequestCheckpoint(bool waitforit, bool warnontime);
+extern void RequestCheckpoint(int flags);
+extern void CheckpointWriteDelay(int flags, double progress);
 
 extern void RequestCheckpointSmgrCloseAll(void);
 
diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h
index 22205ddd0a56..63357e5037f9 100644
--- a/src/include/postmaster/syslogger.h
+++ b/src/include/postmaster/syslogger.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2004-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.7.2.1 2007/06/14 01:49:39 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.14 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
 #define LOG_EOL         "\n"
 #endif
 
-/* 
+/*
  * Primitive protocol structure for writing to syslogger pipe(s).  The idea
  * here is to divide long messages into chunks that are not more than
  * PIPE_BUF bytes long, which according to POSIX spec must be written into
@@ -36,9 +36,9 @@
  * also cope with non-protocol data coming down the pipe, though we cannot
  * guarantee long strings won't get split apart.
  *
- * We use 't' or 'f' instead of a bool for is_last to make the protocol a tiny
- * bit more robust against finding a false double nul byte prologue.  But we
- * still might find it in the len and/or pid bytes unless we're careful.
+ * We use non-nul bytes in is_last to make the protocol a tiny bit
+ * more robust against finding a false double nul byte prologue. But
+ * we still might find it in the len and/or pid bytes unless we're careful.
  */
 
 #ifdef PIPE_BUF
@@ -48,7 +48,7 @@
 #else
 #define PIPE_CHUNK_SIZE  ((int) PIPE_BUF)
 #endif
-#else  /* not defined */
+#else							/* not defined */
 /* POSIX says the value of PIPE_BUF must be at least 512, so use that */
 #define PIPE_CHUNK_SIZE  512
 #endif
@@ -93,7 +93,7 @@ typedef struct CSVChunkStr
     const char *p;
 } CSVChunkStr;
 
-extern void write_syslogger_file_binary(const char *buffer, int count);
+extern void write_syslogger_file_binary(const char *buffer, int count, int dest);
 extern void syslogger_log_chunk_list(PipeProtoChunk *chunk);
 
 typedef struct
@@ -165,7 +165,7 @@ typedef struct
 } GpSegvErrorData;
 
 /* GUC options */
-extern bool Redirect_stderr;
+extern bool Logging_collector;
 extern int	Log_RotationAge;
 extern int	Log_RotationSize;
 extern PGDLLIMPORT char *Log_directory;
@@ -184,7 +184,7 @@ extern HANDLE syslogPipe[2];
 
 extern int	SysLogger_Start(void);
 
-extern void write_syslogger_file(const char *buffer, int count);
+extern void write_syslogger_file(const char *buffer, int count, int dest);
 
 extern void syslogger_append_timestamp(pg_time_t stamp_time, bool amsyslogger, bool append_comma);
 extern void syslogger_append_current_timestamp(bool amsyslogger);
diff --git a/src/include/postmaster/walwriter.h b/src/include/postmaster/walwriter.h
new file mode 100644
index 000000000000..03a7d9379361
--- /dev/null
+++ b/src/include/postmaster/walwriter.h
@@ -0,0 +1,20 @@
+/*-------------------------------------------------------------------------
+ *
+ * walwriter.h
+ *	  Exports from postmaster/walwriter.c.
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/postmaster/walwriter.h,v 1.2 2008/01/01 19:45:58 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef _WALWRITER_H
+#define _WALWRITER_H
+
+/* GUC options */
+extern int	WalWriterDelay;
+
+extern void WalWriterMain(void);
+
+#endif   /* _WALWRITER_H */
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index abd90bc07c08..58e7d045c7e5 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -151,10 +151,13 @@ typedef struct
 #define REG_INVARG	16			/* invalid argument to regex function */
 #define REG_MIXED	17			/* character widths of regex and string differ */
 #define REG_BADOPT	18			/* invalid embedded option */
-#define REG_ETOOBIG 19			/* nfa has too many states */
+#define REG_ETOOBIG	19			/* nfa has too many states */
 /* two specials for debugging and testing */
 #define REG_ATOI	101			/* convert error-code name to number */
 #define REG_ITOA	102			/* convert error-code number to name */
+/* non-error result codes for pg_regprefix */
+#define REG_PREFIX	(-1)		/* identified a common prefix */
+#define REG_EXACT	(-2)		/* identified an exact match */
 
 
 
@@ -163,12 +166,8 @@ typedef struct
  */
 extern int	pg_regcomp(regex_t *, const pg_wchar *, size_t, int);
 extern int	pg_regexec(regex_t *, const pg_wchar *, size_t, size_t, rm_detail_t *, size_t, regmatch_t[], int);
+extern int	pg_regprefix(regex_t *, pg_wchar **, size_t *);
 extern void pg_regfree(regex_t *);
 extern size_t pg_regerror(int, const regex_t *, char *, size_t);
 
-/*
- * guc configuration variables
- */
-extern int	regex_flavor;
-
 #endif   /* _REGEX_H_ */
diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h
index 52f2157535a1..973e99a0823b 100644
--- a/src/include/regex/regguts.h
+++ b/src/include/regex/regguts.h
@@ -188,6 +188,7 @@ struct colordesc
 	color		sub;			/* open subcolor (if any); free chain ptr */
 #define  NOSUB	 COLORLESS
 	struct arc *arcs;			/* color chain */
+	chr			firstchr;		/* char first assigned to this color */
 	int			flags;
 #define  FREECOL 01				/* currently free */
 #define  PSEUDO  02				/* pseudocolor, no real chars */
@@ -255,15 +256,14 @@ struct state;
 
 struct arc
 {
-	int			type;
-#define  ARCFREE '\0'
+	int			type;			/* 0 if free, else an NFA arc type code */
 	color		co;
 	struct state *from;			/* where it's from (and contained within) */
 	struct state *to;			/* where it's to */
-	struct arc *outchain;		/* *from's outs chain or free chain */
+	struct arc *outchain;		/* link in *from's outs chain or free chain */
 #define  freechain	 outchain
-	struct arc *inchain;		/* *to's ins chain */
-	struct arc *colorchain;		/* color's arc chain */
+	struct arc *inchain;		/* link in *to's ins chain */
+	struct arc *colorchain;		/* link in color's arc chain */
 	struct arc *colorchainRev;	/* back-link in color's arc chain */
 };
 
@@ -315,24 +315,38 @@ struct nfa
 
 /*
  * definitions for compacted NFA
+ *
+ * The main space savings in a compacted NFA is from making the arcs as small
+ * as possible.  We store only the transition color and next-state number for
+ * each arc.  The list of out arcs for each state is an array beginning at
+ * cnfa.states[statenumber], and terminated by a dummy carc struct with
+ * co == COLORLESS.
+ *
+ * The non-dummy carc structs are of two types: plain arcs and LACON arcs.
+ * Plain arcs just store the transition color number as "co".  LACON arcs
+ * store the lookahead constraint number plus cnfa.ncolors as "co".  LACON
+ * arcs can be distinguished from plain by testing for co >= cnfa.ncolors.
  */
 struct carc
 {
 	color		co;				/* COLORLESS is list terminator */
-	int			to;				/* state number */
+	int			to;				/* next-state number */
 };
 
 struct cnfa
 {
 	int			nstates;		/* number of states */
-	int			ncolors;		/* number of colors */
+	int			ncolors;		/* number of colors (max color in use + 1) */
 	int			flags;
-#define  HASLACONS	 01			/* uses lookahead constraints */
+#define  HASLACONS	01			/* uses lookahead constraints */
 	int			pre;			/* setup state number */
 	int			post;			/* teardown state number */
 	color		bos[2];			/* colors, if any, assigned to BOS and BOL */
 	color		eos[2];			/* colors, if any, assigned to EOS and EOL */
+	char	   *stflags;		/* vector of per-state flags bytes */
+#define  CNFA_NOPROGRESS	01	/* flag bit for a no-progress state */
 	struct carc **states;		/* vector of pointers to outarc lists */
+	/* states[n] are pointers into a single malloc'd array of arcs */
 	struct carc *arcs;			/* the area for the lists */
 };
 
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index 47e0a7ea5c2a..95bd2dbe7c02 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/rewrite/prs2lock.h,v 1.22 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/rewrite/prs2lock.h,v 1.24 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,6 +28,7 @@ typedef struct RewriteRule
 	AttrNumber	attrno;
 	Node	   *qual;
 	List	   *actions;
+	char		enabled;
 	bool		isInstead;
 } RewriteRule;
 
diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h
index a7e03184f21e..b3448c44dca4 100644
--- a/src/include/rewrite/rewriteDefine.h
+++ b/src/include/rewrite/rewriteDefine.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/rewrite/rewriteDefine.h,v 1.23 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/rewrite/rewriteDefine.h,v 1.28 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,11 +16,27 @@
 
 #include "nodes/parsenodes.h"
 
-extern void DefineQueryRewrite(RuleStmt *args);
+#define RULE_FIRES_ON_ORIGIN	'O'
+#define RULE_FIRES_ALWAYS		'A'
+#define RULE_FIRES_ON_REPLICA	'R'
+#define RULE_DISABLED			'D'
+
+extern void DefineRule(RuleStmt *stmt, const char *queryString);
+
+extern void DefineQueryRewrite(char *rulename,
+				   Oid event_relid,
+				   Node *event_qual,
+				   CmdType event_type,
+				   bool is_instead,
+				   bool replace,
+				   List *action);
 
 extern void RenameRewriteRule(Oid owningRel, const char *oldName,
 				  const char *newName);
 
 extern void setRuleCheckAsUser(Node *node, Oid userid);
 
+extern void EnableDisableRule(Relation rel, const char *rulename,
+				  char fires_when);
+
 #endif   /* REWRITEDEFINE_H */
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index c21366b2ae6d..297cb0411f28 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/rewrite/rewriteHandler.h,v 1.28 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/rewrite/rewriteHandler.h,v 1.29 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index 4f8e35b122a3..514c3eddf2b2 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/rewrite/rewriteManip.h,v 1.43 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/rewrite/rewriteManip.h,v 1.44.2.1 2008/08/14 20:31:59 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,8 @@ extern void ChangeVarNodes(Node *node, int old_varno, int new_varno,
 			   int sublevels_up);
 extern void IncrementVarSublevelsUp(Node *node, int delta_sublevels_up,
 						int min_sublevels_up);
+extern void IncrementVarSublevelsUp_rtable(List *rtable,
+							   int delta_sublevels_up,	int min_sublevels_up);
 extern void IncrementVarSublevelsUpInTransformGroupedWindows(Node *node,
 		int delta_sublevels_up, int min_sublevels_up);
 
@@ -39,6 +41,11 @@ extern int	locate_agg_of_level(Node *node, int levelsup);
 extern bool checkExprHasAggs(Node *node);
 extern bool checkExprHasSubLink(Node *node);
 
+extern Node *map_variable_attnos(Node *node,
+					int target_varno, int sublevels_up,
+					const AttrNumber *attno_map, int map_length,
+					bool *found_whole_row);
+
 extern Node *ResolveNew(Node *node, int target_varno, int sublevels_up,
 		   RangeTblEntry *target_rte,
 		   List *targetlist, int event, int update_varno);
diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h
index bd6c30da39e5..0f3a435045c1 100644
--- a/src/include/rewrite/rewriteRemove.h
+++ b/src/include/rewrite/rewriteRemove.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/rewrite/rewriteRemove.h,v 1.23 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/rewrite/rewriteRemove.h,v 1.24 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h
index c92dd8a2709d..cbfa563da79b 100644
--- a/src/include/rewrite/rewriteSupport.h
+++ b/src/include/rewrite/rewriteSupport.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/rewrite/rewriteSupport.h,v 1.29 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/rewrite/rewriteSupport.h,v 1.30 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/snowball/header.h b/src/include/snowball/header.h
new file mode 100644
index 000000000000..aa79857b1e31
--- /dev/null
+++ b/src/include/snowball/header.h
@@ -0,0 +1,62 @@
+/*-------------------------------------------------------------------------
+ *
+ * header.h
+ *		Replacement header file for Snowball stemmer modules
+ *
+ * The Snowball stemmer modules do #include "header.h", and think they
+ * are including snowball/libstemmer/header.h.	We adjust the CPPFLAGS
+ * so that this file is found instead, and thereby we can modify the
+ * headers they see.  The main point here is to ensure that pg_config.h
+ * is included before any system headers such as <stdio.h>; without that,
+ * we have portability issues on some platforms due to variation in
+ * largefile options across different modules in the backend.
+ *
+ * NOTE: this file should not be included into any non-snowball sources!
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/snowball/header.h,v 1.3 2008/01/01 19:45:58 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef SNOWBALL_HEADR_H
+#define SNOWBALL_HEADR_H
+
+#include "postgres.h"
+
+/* Some platforms define MAXINT and/or MININT, causing conflicts */
+#ifdef MAXINT
+#undef MAXINT
+#endif
+#ifdef MININT
+#undef MININT
+#endif
+
+/* Now we can include the original Snowball header.h */
+#include "snowball/libstemmer/header.h"
+
+/*
+ * Redefine standard memory allocation interface to pgsql's one.
+ * This allows us to control where the Snowball code allocates stuff.
+ */
+#ifdef malloc
+#undef malloc
+#endif
+#define malloc(a)		palloc(a)
+
+#ifdef calloc
+#undef calloc
+#endif
+#define calloc(a,b)		palloc0((a) * (b))
+
+#ifdef realloc
+#undef realloc
+#endif
+#define realloc(a,b)	repalloc(a,b)
+
+#ifdef free
+#undef free
+#endif
+#define free(a)			pfree(a)
+
+#endif   /* SNOWBALL_HEADR_H */
diff --git a/contrib/tsearch2/snowball/api.h b/src/include/snowball/libstemmer/api.h
similarity index 54%
rename from contrib/tsearch2/snowball/api.h
rename to src/include/snowball/libstemmer/api.h
index a66935efcc9e..8b997f0c2986 100644
--- a/contrib/tsearch2/snowball/api.h
+++ b/src/include/snowball/libstemmer/api.h
@@ -11,24 +11,16 @@ typedef unsigned char symbol;
 
 */
 
-struct SN_env
-{
-	symbol	   *p;
-	int			c;
-	int			a;
-	int			l;
-	int			lb;
-	int			bra;
-	int			ket;
-	int			S_size;
-	int			I_size;
-	int			B_size;
-	symbol	  **S;
-	int		   *I;
-	symbol	   *B;
+struct SN_env {
+    symbol * p;
+    int c; int l; int lb; int bra; int ket;
+    symbol * * S;
+    int * I;
+    unsigned char * B;
 };
 
-extern struct SN_env *SN_create_env(int S_size, int I_size, int B_size);
-extern void SN_close_env(struct SN_env * z);
+extern struct SN_env * SN_create_env(int S_size, int I_size, int B_size);
+extern void SN_close_env(struct SN_env * z, int S_size);
+
+extern int SN_set_current(struct SN_env * z, int size, const symbol * s);
 
-extern int	SN_set_current(struct SN_env * z, int size, const symbol * s);
diff --git a/src/include/snowball/libstemmer/header.h b/src/include/snowball/libstemmer/header.h
new file mode 100644
index 000000000000..4d3078f50f46
--- /dev/null
+++ b/src/include/snowball/libstemmer/header.h
@@ -0,0 +1,58 @@
+
+#include <limits.h>
+
+#include "api.h"
+
+#define MAXINT INT_MAX
+#define MININT INT_MIN
+
+#define HEAD 2*sizeof(int)
+
+#define SIZE(p)        ((int *)(p))[-1]
+#define SET_SIZE(p, n) ((int *)(p))[-1] = n
+#define CAPACITY(p)    ((int *)(p))[-2]
+
+struct among
+{   int s_size;     /* number of chars in string */
+    const symbol * s;       /* search string */
+    int substring_i;/* index to longest matching substring */
+    int result;     /* result of the lookup */
+    int (* function)(struct SN_env *);
+};
+
+extern symbol * create_s(void);
+extern void lose_s(symbol * p);
+
+extern int skip_utf8(const symbol * p, int c, int lb, int l, int n);
+
+extern int in_grouping_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+extern int in_grouping_b_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+extern int out_grouping_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+extern int out_grouping_b_U(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+
+extern int in_grouping(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+extern int in_grouping_b(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+extern int out_grouping(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+extern int out_grouping_b(struct SN_env * z, const unsigned char * s, int min, int max, int repeat);
+
+extern int eq_s(struct SN_env * z, int s_size, const symbol * s);
+extern int eq_s_b(struct SN_env * z, int s_size, const symbol * s);
+extern int eq_v(struct SN_env * z, const symbol * p);
+extern int eq_v_b(struct SN_env * z, const symbol * p);
+
+extern int find_among(struct SN_env * z, const struct among * v, int v_size);
+extern int find_among_b(struct SN_env * z, const struct among * v, int v_size);
+
+extern int replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int * adjustment);
+extern int slice_from_s(struct SN_env * z, int s_size, const symbol * s);
+extern int slice_from_v(struct SN_env * z, const symbol * p);
+extern int slice_del(struct SN_env * z);
+
+extern int insert_s(struct SN_env * z, int bra, int ket, int s_size, const symbol * s);
+extern int insert_v(struct SN_env * z, int bra, int ket, const symbol * p);
+
+extern symbol * slice_to(struct SN_env * z, symbol * p);
+extern symbol * assign_to(struct SN_env * z, symbol * p);
+
+extern void debug(struct SN_env * z, int number, int line_count);
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_danish.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_danish.h
new file mode 100644
index 000000000000..49c5559cdfc8
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_danish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * danish_ISO_8859_1_create_env(void);
+extern void danish_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int danish_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_dutch.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_dutch.h
new file mode 100644
index 000000000000..e67d11152cd9
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_dutch.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * dutch_ISO_8859_1_create_env(void);
+extern void dutch_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int dutch_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_english.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_english.h
new file mode 100644
index 000000000000..e685dcf7ef09
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_english.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * english_ISO_8859_1_create_env(void);
+extern void english_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int english_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_finnish.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_finnish.h
new file mode 100644
index 000000000000..c67b67b944f9
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_finnish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * finnish_ISO_8859_1_create_env(void);
+extern void finnish_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int finnish_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_french.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_french.h
new file mode 100644
index 000000000000..21244d616219
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_french.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * french_ISO_8859_1_create_env(void);
+extern void french_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int french_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_german.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_german.h
new file mode 100644
index 000000000000..852538922784
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_german.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * german_ISO_8859_1_create_env(void);
+extern void german_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int german_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_hungarian.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_hungarian.h
new file mode 100644
index 000000000000..c3177e5019c6
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_hungarian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * hungarian_ISO_8859_1_create_env(void);
+extern void hungarian_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int hungarian_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_italian.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_italian.h
new file mode 100644
index 000000000000..dccbfd5e9712
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_italian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * italian_ISO_8859_1_create_env(void);
+extern void italian_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int italian_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_norwegian.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
new file mode 100644
index 000000000000..e09e34e52f39
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * norwegian_ISO_8859_1_create_env(void);
+extern void norwegian_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int norwegian_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_porter.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_porter.h
new file mode 100644
index 000000000000..5c8fd01db17f
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_porter.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * porter_ISO_8859_1_create_env(void);
+extern void porter_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int porter_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_portuguese.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_portuguese.h
new file mode 100644
index 000000000000..0279bc94da69
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_portuguese.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * portuguese_ISO_8859_1_create_env(void);
+extern void portuguese_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int portuguese_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_spanish.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_spanish.h
new file mode 100644
index 000000000000..83f1498403f5
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_spanish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * spanish_ISO_8859_1_create_env(void);
+extern void spanish_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int spanish_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_1_swedish.h b/src/include/snowball/libstemmer/stem_ISO_8859_1_swedish.h
new file mode 100644
index 000000000000..4184e5ca39e8
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_1_swedish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * swedish_ISO_8859_1_create_env(void);
+extern void swedish_ISO_8859_1_close_env(struct SN_env * z);
+
+extern int swedish_ISO_8859_1_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_ISO_8859_2_romanian.h b/src/include/snowball/libstemmer/stem_ISO_8859_2_romanian.h
new file mode 100644
index 000000000000..931f269ceb29
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_ISO_8859_2_romanian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * romanian_ISO_8859_2_create_env(void);
+extern void romanian_ISO_8859_2_close_env(struct SN_env * z);
+
+extern int romanian_ISO_8859_2_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/contrib/tsearch2/snowball/russian_stem.h b/src/include/snowball/libstemmer/stem_KOI8_R_russian.h
similarity index 62%
rename from contrib/tsearch2/snowball/russian_stem.h
rename to src/include/snowball/libstemmer/stem_KOI8_R_russian.h
index 217c20abdd9e..de2179d29f0c 100644
--- a/contrib/tsearch2/snowball/russian_stem.h
+++ b/src/include/snowball/libstemmer/stem_KOI8_R_russian.h
@@ -2,16 +2,15 @@
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
 #ifdef __cplusplus
-extern		"C"
-{
+extern "C" {
 #endif
 
-extern struct SN_env *russian_KOI8_R_create_env(void);
+extern struct SN_env * russian_KOI8_R_create_env(void);
 extern void russian_KOI8_R_close_env(struct SN_env * z);
 
-extern int	russian_KOI8_R_stem(struct SN_env * z);
+extern int russian_KOI8_R_stem(struct SN_env * z);
 
 #ifdef __cplusplus
 }
-
 #endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_danish.h b/src/include/snowball/libstemmer/stem_UTF_8_danish.h
new file mode 100644
index 000000000000..ed744d454f08
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_danish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * danish_UTF_8_create_env(void);
+extern void danish_UTF_8_close_env(struct SN_env * z);
+
+extern int danish_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_dutch.h b/src/include/snowball/libstemmer/stem_UTF_8_dutch.h
new file mode 100644
index 000000000000..a99646452b05
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_dutch.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * dutch_UTF_8_create_env(void);
+extern void dutch_UTF_8_close_env(struct SN_env * z);
+
+extern int dutch_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_english.h b/src/include/snowball/libstemmer/stem_UTF_8_english.h
new file mode 100644
index 000000000000..619a8bc72ae5
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_english.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * english_UTF_8_create_env(void);
+extern void english_UTF_8_close_env(struct SN_env * z);
+
+extern int english_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_finnish.h b/src/include/snowball/libstemmer/stem_UTF_8_finnish.h
new file mode 100644
index 000000000000..d2f2fd963832
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_finnish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * finnish_UTF_8_create_env(void);
+extern void finnish_UTF_8_close_env(struct SN_env * z);
+
+extern int finnish_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_french.h b/src/include/snowball/libstemmer/stem_UTF_8_french.h
new file mode 100644
index 000000000000..08e341846df4
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_french.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * french_UTF_8_create_env(void);
+extern void french_UTF_8_close_env(struct SN_env * z);
+
+extern int french_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_german.h b/src/include/snowball/libstemmer/stem_UTF_8_german.h
new file mode 100644
index 000000000000..5bd84d431f0a
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_german.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * german_UTF_8_create_env(void);
+extern void german_UTF_8_close_env(struct SN_env * z);
+
+extern int german_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_hungarian.h b/src/include/snowball/libstemmer/stem_UTF_8_hungarian.h
new file mode 100644
index 000000000000..d81bd23469a0
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_hungarian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * hungarian_UTF_8_create_env(void);
+extern void hungarian_UTF_8_close_env(struct SN_env * z);
+
+extern int hungarian_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_italian.h b/src/include/snowball/libstemmer/stem_UTF_8_italian.h
new file mode 100644
index 000000000000..3bee080d52c1
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_italian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * italian_UTF_8_create_env(void);
+extern void italian_UTF_8_close_env(struct SN_env * z);
+
+extern int italian_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_norwegian.h b/src/include/snowball/libstemmer/stem_UTF_8_norwegian.h
new file mode 100644
index 000000000000..c75444bcd95f
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_norwegian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * norwegian_UTF_8_create_env(void);
+extern void norwegian_UTF_8_close_env(struct SN_env * z);
+
+extern int norwegian_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_porter.h b/src/include/snowball/libstemmer/stem_UTF_8_porter.h
new file mode 100644
index 000000000000..82d469ac4598
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_porter.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * porter_UTF_8_create_env(void);
+extern void porter_UTF_8_close_env(struct SN_env * z);
+
+extern int porter_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_portuguese.h b/src/include/snowball/libstemmer/stem_UTF_8_portuguese.h
new file mode 100644
index 000000000000..9fe7f9aa811c
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_portuguese.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * portuguese_UTF_8_create_env(void);
+extern void portuguese_UTF_8_close_env(struct SN_env * z);
+
+extern int portuguese_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_romanian.h b/src/include/snowball/libstemmer/stem_UTF_8_romanian.h
new file mode 100644
index 000000000000..d01e8132e208
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_romanian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * romanian_UTF_8_create_env(void);
+extern void romanian_UTF_8_close_env(struct SN_env * z);
+
+extern int romanian_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_russian.h b/src/include/snowball/libstemmer/stem_UTF_8_russian.h
new file mode 100644
index 000000000000..4ef774ddccbb
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_russian.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * russian_UTF_8_create_env(void);
+extern void russian_UTF_8_close_env(struct SN_env * z);
+
+extern int russian_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_spanish.h b/src/include/snowball/libstemmer/stem_UTF_8_spanish.h
new file mode 100644
index 000000000000..10572ecc3708
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_spanish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * spanish_UTF_8_create_env(void);
+extern void spanish_UTF_8_close_env(struct SN_env * z);
+
+extern int spanish_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_swedish.h b/src/include/snowball/libstemmer/stem_UTF_8_swedish.h
new file mode 100644
index 000000000000..1444ebb49a63
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_swedish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * swedish_UTF_8_create_env(void);
+extern void swedish_UTF_8_close_env(struct SN_env * z);
+
+extern int swedish_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/snowball/libstemmer/stem_UTF_8_turkish.h b/src/include/snowball/libstemmer/stem_UTF_8_turkish.h
new file mode 100644
index 000000000000..8173a174867d
--- /dev/null
+++ b/src/include/snowball/libstemmer/stem_UTF_8_turkish.h
@@ -0,0 +1,16 @@
+
+/* This file was generated automatically by the Snowball to ANSI C compiler */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern struct SN_env * turkish_UTF_8_create_env(void);
+extern void turkish_UTF_8_close_env(struct SN_env * z);
+
+extern int turkish_UTF_8_stem(struct SN_env * z);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 3da6641c872c..eb43bac891dd 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.89 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.95 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@
 #define BM_IO_ERROR				(1 << 4)		/* previous I/O failed */
 #define BM_JUST_DIRTIED			(1 << 5)		/* dirtied since write started */
 #define BM_PIN_COUNT_WAITER		(1 << 6)		/* have waiter for sole pin */
-// unused #define BM_CHECKPOINT_NEEDED	(1 << 7)		/* must write for checkpoint */
+#define BM_CHECKPOINT_NEEDED	(1 << 7)		/* must write for checkpoint */
 
 typedef bits16 BufFlags;
 
@@ -165,14 +165,11 @@ typedef struct sbufdesc
 
 
 /* in buf_init.c */
-extern PGDLLIMPORT volatile BufferDesc *BufferDescriptors;
+extern PGDLLIMPORT BufferDesc *BufferDescriptors;
 
 /* in localbuf.c */
 extern BufferDesc *LocalBufferDescriptors;
 
-/* in freelist.c */
-extern bool strategy_hint_vacuum;
-
 /* event counters in buf_init.c */
 extern long int ReadBufferCount;
 extern long int ReadLocalBufferCount;
@@ -187,9 +184,13 @@ extern long int LocalBufferFlushCount;
  */
 
 /* freelist.c */
-extern volatile BufferDesc *StrategyGetBuffer(void);
-extern void StrategyFreeBuffer(volatile BufferDesc *buf, bool at_head);
-extern int	StrategySyncStart(void);
+extern volatile BufferDesc *StrategyGetBuffer(BufferAccessStrategy strategy,
+				  bool *lock_held);
+extern void StrategyFreeBuffer(volatile BufferDesc *buf);
+extern bool StrategyRejectBuffer(BufferAccessStrategy strategy,
+					 volatile BufferDesc *buf);
+
+extern int	StrategySyncStart(uint32 *complete_passes, uint32 *num_buf_alloc);
 extern Size StrategyShmemSize(void);
 extern void StrategyInitialize(bool init);
 
diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h
index 6b3eb39f085c..4cd97d9ae141 100644
--- a/src/include/storage/buffile.h
+++ b/src/include/storage/buffile.h
@@ -19,7 +19,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/buffile.h,v 1.20 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/buffile.h,v 1.23 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index f3c698da16bc..d0a00f02727f 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.102 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.111 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,15 @@
 
 typedef void *Block;
 
+/* Possible arguments for GetAccessStrategy() */
+typedef enum BufferAccessStrategyType
+{
+	BAS_NORMAL,					/* Normal random access */
+	BAS_BULKREAD,				/* Large read-only scan (hint bit updates are
+								 * ok) */
+	BAS_VACUUM					/* VACUUM */
+} BufferAccessStrategyType;
+
 /* in globals.c ... this duplicates miscadmin.h */
 extern PGDLLIMPORT int NBuffers;
 
@@ -33,10 +42,8 @@ extern PGDLLIMPORT int NBuffers;
 extern bool memory_protect_buffer_pool;
 extern bool flush_buffer_pages_when_evicted;
 extern bool zero_damaged_pages;
-extern double bgwriter_lru_percent;
-extern double bgwriter_all_percent;
 extern int	bgwriter_lru_maxpages;
-extern int	bgwriter_all_maxpages;
+extern double bgwriter_lru_multiplier;
 
 extern PGDLLIMPORT bool IsUnderPostmaster; /* from utils/init/globals.c */
 #define ShouldMemoryProtectBufferPool() (memory_protect_buffer_pool && IsUnderPostmaster)
@@ -284,6 +291,9 @@ typedef struct MirroredLockBufMgrLocalVars
  * prototypes for functions in bufmgr.c
  */
 extern Buffer ReadBuffer(Relation reln, BlockNumber blockNum);
+extern Buffer ReadBufferWithStrategy(Relation reln, BlockNumber blockNum,
+					   BufferAccessStrategy strategy);
+extern Buffer ReadOrZeroBuffer(Relation reln, BlockNumber blockNum);
 extern Buffer ReadBuffer_Resync(SMgrRelation reln, BlockNumber blockNum,
 				  const char *relidstr);
 
@@ -302,11 +312,12 @@ extern char *ShowBufferUsage(void);
 extern void ResetBufferUsage(void);
 extern void AtEOXact_Buffers(bool isCommit);
 extern void PrintBufferLeakWarning(Buffer buffer);
-extern void FlushBufferPool(void);
+extern void CheckPointBuffers(int flags);
 extern BlockNumber BufferGetBlockNumber(Buffer buffer);
 extern BlockNumber RelationGetNumberOfBlocks(Relation relation);
 extern void RelationTruncate(Relation rel, BlockNumber nblocks, bool markPersistentAsPhysicallyTruncated);
 extern void FlushRelationBuffers(Relation rel);
+extern void FlushDatabaseBuffers(Oid dbid);
 extern void DropRelFileNodeBuffers(RelFileNode rnode, bool istemp,
 					   BlockNumber firstDelBlock);
 extern void DropDatabaseBuffers(Oid tbpoid, Oid dbid);
@@ -323,16 +334,17 @@ extern void UnlockBuffers(void);
 extern void LockBuffer(Buffer buffer, int mode);
 extern bool ConditionalLockBuffer(Buffer buffer);
 extern void LockBufferForCleanup(Buffer buffer);
+extern bool ConditionalLockBufferForCleanup(Buffer buffer);
 
 extern void AbortBufferIO(void);
 
 extern void BufmgrCommit(void);
-extern void BufferSync(void);
 extern void BgBufferSync(void);
 
 extern void AtProcExit_LocalBuffers(void);
 
 /* in freelist.c */
-extern void StrategyHintVacuum(bool vacuum_active);
+extern BufferAccessStrategy GetAccessStrategy(BufferAccessStrategyType btype);
+extern void FreeAccessStrategy(BufferAccessStrategy strategy);
 
 #endif
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 1d2f02993cb4..e61c9daef95e 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/bufpage.h,v 1.71 2007/02/21 20:02:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/bufpage.h,v 1.77 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -95,16 +95,18 @@ typedef uint16 LocationIndex;
  *		pd_upper	- offset to end of free space.
  *		pd_special	- offset to start of special space.
  *		pd_pagesize_version - size in bytes and page layout version number.
+ *		pd_prune_xid - oldest XID among potentially prunable tuples on page.
  *
  * The LSN is used by the buffer manager to enforce the basic rule of WAL:
  * "thou shalt write xlog before data".  A dirty buffer cannot be dumped
  * to disk until xlog has been flushed at least as far as the page's LSN.
- * We also store the TLI for identification purposes (it is not clear that
- * this is actually necessary, but it seems like a good idea).
  * We also store the 16 least significant bits of the TLI for identification
  * purposes (it is not clear that this is actually necessary, but it seems
  * like a good idea).
  *
+ * pd_prune_xid is a hint field that helps determine whether pruning will be
+ * useful.	It is currently unused in index pages.
+ *
  * The page version number and page size are packed together into a single
  * uint16 field.  This is for historical reasons: before PostgreSQL 7.3,
  * there was no concept of a page version number, and doing it this way
@@ -130,6 +132,7 @@ typedef struct PageHeaderData
 	LocationIndex pd_upper;		/* offset to end of free space */
 	LocationIndex pd_special;	/* offset to start of special space */
 	uint16		pd_pagesize_version;
+	TransactionId pd_prune_xid; /* oldest prunable XID, or zero if none */
 	ItemIdData	pd_linp[1];		/* beginning of line pointer array */
 } PageHeaderData;
 
@@ -139,13 +142,19 @@ typedef PageHeaderData *PageHeader;
  * pd_flags contains the following flag bits.  Undefined bits are initialized
  * to zero and may be used in the future.
  *
- * PD_HAS_FREE_LINES is set if there are any not-LP_USED line pointers before
+ * PD_HAS_FREE_LINES is set if there are any LP_UNUSED line pointers before
  * pd_lower.  This should be considered a hint rather than the truth, since
  * changes to it are not WAL-logged.
+ *
+ * PD_PAGE_FULL is set if an UPDATE doesn't find enough free space in the
+ * page for its new tuple version; this suggests that a prune is needed.
+ * Again, this is just a hint.
  */
-#define PD_HAS_FREE_LINES	0x0001	/* are there any unused line pointers? */
+#define PD_HAS_FREE_LINES	0x0001		/* are there any unused line pointers? */
+#define PD_PAGE_FULL		0x0002		/* not enough free space for new
+										 * tuple? */
 
-#define PD_VALID_FLAG_BITS	0x0001	/* OR of all valid pd_flags bits */
+#define PD_VALID_FLAG_BITS	0x0003		/* OR of all valid pd_flags bits */
 
 /*
  * Page layout version number 0 is for pre-7.3 Postgres releases.
@@ -153,7 +162,8 @@ typedef PageHeaderData *PageHeader;
  * Release 8.0 uses 2; it changed the HeapTupleHeader layout again.
  * Release 8.1 uses 3; it redefined HeapTupleHeader infomask bits.
  * Release 8.3 uses 4; it changed the HeapTupleHeader layout again, and
- * added the pd_flags field (by stealing some bits from pd_tli).
+ *		added the pd_flags field (by stealing some bits from pd_tli),
+ *		as well as adding the pd_prune_xid field (which enlarges the header).
  */
 #define PG_PAGE_LAYOUT_VERSION		4
 
@@ -283,7 +293,7 @@ typedef PageHeaderData *PageHeader;
 #define PageGetItem(page, itemId) \
 ( \
 	AssertMacro(PageIsValid(page)), \
-	AssertMacro(ItemIdIsUsed(itemId)), \
+	AssertMacro(ItemIdHasStorage(itemId)), \
 	(Item)(((char *)(page)) + ItemIdGetOffset(itemId)) \
 )
 
@@ -340,7 +350,38 @@ typedef PageHeaderData *PageHeader;
 #define PageGetTLI(page) \
 	(((PageHeader) (page))->pd_tli)
 #define PageSetTLI(page, tli) \
-	(((PageHeader) (page))->pd_tli = (tli))
+	(((PageHeader) (page))->pd_tli = (uint16) (tli))
+
+#define PageHasFreeLinePointers(page) \
+	(((PageHeader) (page))->pd_flags & PD_HAS_FREE_LINES)
+#define PageSetHasFreeLinePointers(page) \
+	(((PageHeader) (page))->pd_flags |= PD_HAS_FREE_LINES)
+#define PageClearHasFreeLinePointers(page) \
+	(((PageHeader) (page))->pd_flags &= ~PD_HAS_FREE_LINES)
+
+#define PageIsFull(page) \
+	(((PageHeader) (page))->pd_flags & PD_PAGE_FULL)
+#define PageSetFull(page) \
+	(((PageHeader) (page))->pd_flags |= PD_PAGE_FULL)
+#define PageClearFull(page) \
+	(((PageHeader) (page))->pd_flags &= ~PD_PAGE_FULL)
+
+#define PageIsPrunable(page, oldestxmin) \
+( \
+	AssertMacro(TransactionIdIsNormal(oldestxmin)), \
+	TransactionIdIsValid(((PageHeader) (page))->pd_prune_xid) && \
+	TransactionIdPrecedes(((PageHeader) (page))->pd_prune_xid, oldestxmin) \
+)
+#define PageSetPrunable(page, xid) \
+do { \
+	Assert(TransactionIdIsNormal(xid)); \
+	if (!TransactionIdIsValid(((PageHeader) (page))->pd_prune_xid) || \
+		TransactionIdPrecedes(xid, ((PageHeader) (page))->pd_prune_xid)) \
+		((PageHeader) (page))->pd_prune_xid = (xid); \
+} while (0)
+#define PageClearPrunable(page) \
+	(((PageHeader) (page))->pd_prune_xid = InvalidTransactionId)
+
 
 #define PageHasFreeLinePointers(page) \
 	(((PageHeader) (page))->pd_flags & PD_HAS_FREE_LINES)
@@ -357,12 +398,13 @@ typedef PageHeaderData *PageHeader;
 extern void PageInit(Page page, Size pageSize, Size specialSize);
 extern bool PageHeaderIsValid(PageHeader page);
 extern OffsetNumber PageAddItem(Page page, Item item, Size size,
-			OffsetNumber offsetNumber, ItemIdFlags flags);
+			OffsetNumber offsetNumber, bool overwrite, bool is_heap);
 extern Page PageGetTempPage(Page page, Size specialSize);
 extern void PageRestoreTempPage(Page tempPage, Page oldPage);
-extern int	PageRepairFragmentation(Page page, OffsetNumber *unused);
+extern void PageRepairFragmentation(Page page);
 extern Size PageGetFreeSpace(Page page);
 extern Size PageGetExactFreeSpace(Page page);
+extern Size PageGetHeapFreeSpace(Page page);
 extern void PageIndexTupleDelete(Page page, OffsetNumber offset);
 extern void PageIndexMultiDelete(Page page, OffsetNumber *itemnos, int nitems);
 
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 541cdafecf17..a879dd2d2dd8 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/fd.h,v 1.57 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/fd.h,v 1.61 2008/01/01 19:45:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -60,7 +60,6 @@ extern int	max_files_per_process;
  */
 
 /* Operations on virtual Files --- equivalent to Unix kernel file ops */
-extern File FileNameOpenFile(FileName fileName, int fileFlags, int fileMode);
 extern File PathNameOpenFile(FileName fileName, int fileFlags, int fileMode);
 
 File
@@ -77,7 +76,6 @@ OpenNamedFile(const char   *fileName,
                   bool          closeAtEOXact);
 
 extern void FileClose(File file);
-extern void FileUnlink(File file);
 extern int	FileRead(File file, char *buffer, int amount);
 extern int	FileWrite(File file, char *buffer, int amount);
 extern int	FileSync(File file);
@@ -102,10 +100,15 @@ extern int	BasicOpenFile(FileName fileName, int fileFlags, int fileMode);
 extern void InitFileAccess(void);
 extern void set_max_safe_fds(void);
 extern void closeAllVfds(void);
+extern void SetTempTablespaces(Oid *tableSpaces, int numSpaces);
+extern bool TempTablespacesAreSet(void);
+extern Oid	GetNextTempTableSpace(void);
 extern void AtEOXact_Files(void);
 extern void AtEOSubXact_Files(bool isCommit, SubTransactionId mySubid,
 				  SubTransactionId parentSubid);
 extern void RemovePgTempFiles(void);
+extern void SetDeleteOnExit(File file);
+
 extern int	pg_fsync(int fd);
 extern int	pg_fsync_no_writethrough(int fd);
 extern int	pg_fsync_writethrough(int fd);
diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h
index c7d7d27ab47b..087ac6a619eb 100644
--- a/src/include/storage/freespace.h
+++ b/src/include/storage/freespace.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.25 2007/01/05 22:19:57 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.27 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index ebdd95254000..bf717187aa11 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/ipc.h,v 1.73 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/ipc.h,v 1.74.2.1 2008/04/16 23:59:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h
index f1de73f7dab5..338eeef210a2 100644
--- a/src/include/storage/itemid.h
+++ b/src/include/storage/itemid.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/itemid.h,v 1.27 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/itemid.h,v 1.30 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,10 +22,10 @@
  * that does not have storage, independently of its lp_flags state.
  */
 typedef struct ItemIdData
-{								/* line pointers */
-	unsigned	lp_off:15,		/* offset to start of tuple */
-				lp_flags:2,		/* flags for tuple */
-				lp_len:15;		/* length of tuple */
+{
+	unsigned	lp_off:15,		/* offset to tuple (from start of page) */
+				lp_flags:2,		/* state of item pointer, see below */
+				lp_len:15;		/* byte length of tuple */
 } ItemIdData;
 
 typedef ItemIdData *ItemId;
@@ -35,33 +35,17 @@ typedef ItemIdData *ItemId;
  * for immediate re-use, the other states are not.
  */
 #define LP_UNUSED		0		/* unused (should always have lp_len=0) */
-#define LP_USED			0x01	/* this line pointer is being used */
-#define LP_DELETE		0x02	/* item is to be deleted */
+#define LP_NORMAL		1		/* used (should always have lp_len>0) */
+#define LP_REDIRECT		2		/* HOT redirect (should have lp_len=0) */
 #define LP_DEAD			3		/* dead, may or may not have storage */
 
-#define ItemIdDeleted(itemId) \
-	(((itemId)->lp_flags & LP_DELETE) != 0)
-
-#define ItemIdIsNormal(itemid) \
-	(((itemid)->lp_flags == LP_USED))
-
-#define ItemIdIsDead(itemid) \
-	(((itemid)->lp_flags == LP_DEAD))
-/*
- * This bit may be passed to PageAddItem together with
- * LP_USED & LP_DELETE bits to specify overwrite mode
- */
-#define OverwritePageMode	0x10
-
 /*
- * Item offsets, lengths, and flags are represented by these types when
+ * Item offsets and lengths are represented by these types when
  * they're not actually stored in an ItemIdData.
  */
 typedef uint16 ItemOffset;
 typedef uint16 ItemLength;
 
-typedef bits16 ItemIdFlags;
-
 
 /* ----------------
  *		support macros
@@ -86,6 +70,13 @@ typedef bits16 ItemIdFlags;
 #define ItemIdGetFlags(itemId) \
    ((itemId)->lp_flags)
 
+/*
+ *		ItemIdGetRedirect
+ * In a REDIRECT pointer, lp_off holds the link to the next item pointer
+ */
+#define ItemIdGetRedirect(itemId) \
+   ((itemId)->lp_off)
+
 /*
  * ItemIdIsValid
  *		True iff item identifier is valid.
@@ -95,15 +86,98 @@ typedef bits16 ItemIdFlags;
 
 /*
  * ItemIdIsUsed
- *		True iff disk item identifier is in use.
- *
- * Note:
- *		Assumes disk item identifier is valid.
+ *		True iff item identifier is in use.
  */
 #define ItemIdIsUsed(itemId) \
+	((itemId)->lp_flags != LP_UNUSED)
+
+/*
+ * ItemIdIsNormal
+ *		True iff item identifier is in state NORMAL.
+ */
+#define ItemIdIsNormal(itemId) \
+	((itemId)->lp_flags == LP_NORMAL)
+
+/*
+ * ItemIdIsRedirected
+ *		True iff item identifier is in state REDIRECT.
+ */
+#define ItemIdIsRedirected(itemId) \
+	((itemId)->lp_flags == LP_REDIRECT)
+
+/*
+ * ItemIdIsDead
+ *		True iff item identifier is in state DEAD.
+ */
+#define ItemIdIsDead(itemId) \
+	((itemId)->lp_flags == LP_DEAD)
+
+/*
+ * ItemIdHasStorage
+ *		True iff item identifier has associated storage.
+ */
+#define ItemIdHasStorage(itemId) \
+	((itemId)->lp_len != 0)
+
+/*
+ * ItemIdSetUnused
+ *		Set the item identifier to be UNUSED, with no storage.
+ *		Beware of multiple evaluations of itemId!
+ */
+#define ItemIdSetUnused(itemId) \
+( \
+	(itemId)->lp_flags = LP_UNUSED, \
+	(itemId)->lp_off = 0, \
+	(itemId)->lp_len = 0 \
+)
+
+/*
+ * ItemIdSetNormal
+ *		Set the item identifier to be NORMAL, with the specified storage.
+ *		Beware of multiple evaluations of itemId!
+ */
+#define ItemIdSetNormal(itemId, off, len) \
+( \
+	(itemId)->lp_flags = LP_NORMAL, \
+	(itemId)->lp_off = (off), \
+	(itemId)->lp_len = (len) \
+)
+
+/*
+ * ItemIdSetRedirect
+ *		Set the item identifier to be REDIRECT, with the specified link.
+ *		Beware of multiple evaluations of itemId!
+ */
+#define ItemIdSetRedirect(itemId, link) \
+( \
+	(itemId)->lp_flags = LP_REDIRECT, \
+	(itemId)->lp_off = (link), \
+	(itemId)->lp_len = 0 \
+)
+
+/*
+ * ItemIdSetDead
+ *		Set the item identifier to be DEAD, with no storage.
+ *		Beware of multiple evaluations of itemId!
+ */
+#define ItemIdSetDead(itemId) \
+( \
+	(itemId)->lp_flags = LP_DEAD, \
+	(itemId)->lp_off = 0, \
+	(itemId)->lp_len = 0 \
+)
+
+/*
+ * ItemIdMarkDead
+ *		Set the item identifier to be DEAD, keeping its existing storage.
+ *
+ * Note: in indexes, this is used as if it were a hint-bit mechanism;
+ * we trust that multiple processors can do this in parallel and get
+ * the same result.
+ */
+#define ItemIdMarkDead(itemId) \
 ( \
-	AssertMacro(ItemIdIsValid(itemId)), \
-	(bool) (((itemId)->lp_flags & LP_USED) != 0) \
+	(itemId)->lp_flags = LP_DEAD \
 )
 
 #endif   /* ITEMID_H */
diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h
index e05178926e5a..08d7a96bb1a2 100644
--- a/src/include/storage/itempos.h
+++ b/src/include/storage/itempos.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/itempos.h,v 1.24 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/itempos.h,v 1.25 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index e7afd8ee0294..3fe17637b7b5 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/lmgr.h,v 1.57 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/lmgr.h,v 1.60.2.1 2008/03/04 19:54:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,6 +69,11 @@ extern void XactLockTableDelete(TransactionId xid);
 extern void XactLockTableWait(TransactionId xid);
 extern bool ConditionalXactLockTableWait(TransactionId xid);
 
+/* Lock a VXID (used to wait for a transaction to finish) */
+extern void VirtualXactLockTableInsert(VirtualTransactionId vxid);
+extern void VirtualXactLockTableWait(VirtualTransactionId vxid);
+extern bool ConditionalVirtualXactLockTableWait(VirtualTransactionId vxid);
+
 /* Lock a general object (other than a relation) of the current database */
 extern void LockDatabaseObject(Oid classid, Oid objid, uint16 objsubid,
 				   LOCKMODE lockmode);
@@ -80,7 +85,8 @@ extern void LockSharedObject(Oid classid, Oid objid, uint16 objsubid,
 				 LOCKMODE lockmode);
 extern void UnlockSharedObject(Oid classid, Oid objid, uint16 objsubid,
 				   LOCKMODE lockmode);
-/* Knowledge about which locktags describe temp objects */
-extern bool LockTagIsTemp(const LOCKTAG *tag);
+
+/* Describe a locktag for error messages */
+extern void DescribeLockTag(StringInfo buf, const LOCKTAG *tag);
 
 #endif   /* LMGR_H */
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 8e8790752b36..f46ada59b3b2 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.103 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.112.2.1 2008/09/16 01:56:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #define LOCK_H_
 
 #include "nodes/pg_list.h"
+#include "storage/backendid.h"
 #include "storage/itemptr.h"
 #include "storage/lwlock.h"
 #include "storage/shmem.h"
@@ -42,6 +43,38 @@ extern bool Debug_deadlocks;
 #endif   /* LOCK_DEBUG */
 
 
+/*
+ * Top-level transactions are identified by VirtualTransactionIDs comprising
+ * the BackendId of the backend running the xact, plus a locally-assigned
+ * LocalTransactionId.	These are guaranteed unique over the short term,
+ * but will be reused after a database restart; hence they should never
+ * be stored on disk.
+ *
+ * Note that struct VirtualTransactionId can not be assumed to be atomically
+ * assignable as a whole.  However, type LocalTransactionId is assumed to
+ * be atomically assignable, and the backend ID doesn't change often enough
+ * to be a problem, so we can fetch or assign the two fields separately.
+ * We deliberately refrain from using the struct within PGPROC, to prevent
+ * coding errors from trying to use struct assignment with it; instead use
+ * GET_VXID_FROM_PGPROC().
+ */
+typedef struct
+{
+	BackendId	backendId;		/* determined at backend startup */
+	LocalTransactionId localTransactionId;		/* backend-local transaction
+												 * id */
+} VirtualTransactionId;
+
+#define InvalidLocalTransactionId		0
+#define LocalTransactionIdIsValid(lxid) ((lxid) != InvalidLocalTransactionId)
+#define VirtualTransactionIdIsValid(vxid) \
+	(((vxid).backendId != InvalidBackendId) && \
+	 LocalTransactionIdIsValid((vxid).localTransactionId))
+#define GET_VXID_FROM_PGPROC(vxid, proc) \
+	((vxid).backendId = (proc).backendId, \
+	 (vxid).localTransactionId = (proc).lxid)
+
+
 /*
  * LOCKMODE is an integer (1..N) indicating a lock type.  LOCKMASK is a bit
  * mask indicating a set of held or requested lock types (the bit 1<<mode
@@ -155,6 +188,8 @@ typedef enum LockTagType
 	/* ID info for a tuple is PAGE info + OffsetNumber */
 	LOCKTAG_TRANSACTION,		/* transaction (for waiting for xact done) */
 	/* ID info for a transaction is its TransactionId */
+	LOCKTAG_VIRTUALTRANSACTION, /* virtual transaction (ditto) */
+	/* ID info for a virtual transaction is its VirtualTransactionId */
 	LOCKTAG_RELATION_RESYNCHRONIZE,			/* whole relation for resynchronize */
 	/* ID info for a relation is DB OID + REL OID; DB OID = 0 if shared */
 	LOCKTAG_RELATION_APPENDONLY_SEGMENT_FILE,	/* Segment file within an Append-Only relation */
@@ -172,6 +207,8 @@ typedef enum LockTagType
 	LOCKTAG_ADVISORY			/* advisory user locks */
 } LockTagType;
 
+#define LOCKTAG_LAST_TYPE	LOCKTAG_ADVISORY
+
 /*
  * The LOCKTAG struct is defined with malice aforethought to fit into 16
  * bytes with no padding.  Note that this would need adjustment if we were
@@ -235,6 +272,14 @@ typedef struct LOCKTAG
 	 (locktag).locktag_type = LOCKTAG_TRANSACTION, \
 	 (locktag).locktag_lockmethodid = DEFAULT_LOCKMETHOD)
 
+#define SET_LOCKTAG_VIRTUALTRANSACTION(locktag,vxid) \
+	((locktag).locktag_field1 = (vxid).backendId, \
+	 (locktag).locktag_field2 = (vxid).localTransactionId, \
+	 (locktag).locktag_field3 = 0, \
+	 (locktag).locktag_field4 = 0, \
+	 (locktag).locktag_type = LOCKTAG_VIRTUALTRANSACTION, \
+	 (locktag).locktag_lockmethodid = DEFAULT_LOCKMETHOD)
+
 #define SET_LOCKTAG_RELATION_RESYNCHRONIZE(locktag,dboid,reloid) \
 	((locktag).locktag_field1 = (dboid), \
 	 (locktag).locktag_field2 = (reloid), \
@@ -437,6 +482,17 @@ typedef enum
 	LOCKACQUIRE_ALREADY_HELD	/* incremented count for lock already held */
 } LockAcquireResult;
 
+/* Deadlock states identified by DeadLockCheck() */
+typedef enum
+{
+	DS_NOT_YET_CHECKED,			/* no deadlock check has run yet */
+	DS_NO_DEADLOCK,				/* no deadlock detected */
+	DS_SOFT_DEADLOCK,			/* deadlock avoided by queue rearrangement */
+	DS_HARD_DEADLOCK,			/* deadlock, no way out but ERROR */
+	DS_BLOCKED_BY_AUTOVACUUM	/* no deadlock; queue blocked by autovacuum
+								 * worker */
+} DeadLockState;
+
 
 /*
  * The lockmgr's shared hash tables are partitioned to reduce contention.
@@ -485,7 +541,8 @@ extern bool LockRelease(const LOCKTAG *locktag,
 extern void LockReleaseAll(LOCKMETHODID lockmethodid, bool allLocks);
 extern void LockReleaseCurrentOwner(void);
 extern void LockReassignCurrentOwner(void);
-extern List *GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode);
+extern VirtualTransactionId *GetLockConflicts(const LOCKTAG *locktag,
+				 LOCKMODE lockmode);
 extern void AtPrepare_Locks(void);
 extern void PostPrepare_Locks(TransactionId xid);
 extern int LockCheckConflicts(LockMethod lockMethodTable,
@@ -506,7 +563,8 @@ extern void lock_twophase_postcommit(TransactionId xid, uint16 info,
 extern void lock_twophase_postabort(TransactionId xid, uint16 info,
 						void *recdata, uint32 len);
 
-extern bool DeadLockCheck(PGPROC *proc);
+extern DeadLockState DeadLockCheck(PGPROC *proc);
+extern PGPROC *GetBlockingAutoVacuumPgproc(void);
 extern void DeadLockReport(void);
 extern void RememberSimpleDeadLock(PGPROC *proc1,
 					   LOCKMODE lockmode,
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index f6e5b94fcfe4..8a79e6eda614 100644
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/lwlock.h,v 1.36 2007/04/16 18:30:04 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/storage/lwlock.h,v 1.38 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,7 +62,6 @@ typedef enum LWLockId
 	WALWriteLock,
 	ControlFileLock,
 	CheckpointLock,
-	CheckpointStartLock,
 	CLogControlLock,
 	SubtransControlLock,
 	MultiXactGenLock,
@@ -76,6 +75,7 @@ typedef enum LWLockId
 	AddinShmemInitLock,
 	AutovacuumLock,
 	AutovacuumScheduleLock,
+	SyncScanLock,
 	SharedSnapshotLock,
 	DistributedLogControlLock,
 	SeqServerControlLock,
diff --git a/src/include/storage/pg_sema.h b/src/include/storage/pg_sema.h
index cce441ba9cd8..5d5fbe2a97c3 100644
--- a/src/include/storage/pg_sema.h
+++ b/src/include/storage/pg_sema.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/pg_sema.h,v 1.11 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/pg_sema.h,v 1.12 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h
index 81a99a2348d3..984a3bea9b83 100644
--- a/src/include/storage/pg_shmem.h
+++ b/src/include/storage/pg_shmem.h
@@ -17,7 +17,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/pg_shmem.h,v 1.22 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/pg_shmem.h,v 1.23 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/storage/pmsignal.h b/src/include/storage/pmsignal.h
index 5b4df3b5de3a..90978c8c2067 100644
--- a/src/include/storage/pmsignal.h
+++ b/src/include/storage/pmsignal.h
@@ -31,7 +31,6 @@ typedef enum
 	PMSIGNAL_START_AUTOVAC_LAUNCHER,	/* start an autovacuum launcher */
 	PMSIGNAL_START_AUTOVAC_WORKER,		/* start an autovacuum worker */
 
-	PMSIGNAL_START_AUTOVAC,
 	PMSIGNAL_START_WALRECEIVER, /* start a walreceiver */
 
 	PMSIGNAL_FILEREP_STATE_CHANGE,	      /* filerep is reporting state change */ 
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 9adad412f2e0..806b1d5f84d4 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.98 2007/04/16 18:30:04 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.104 2008/01/26 19:55:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,8 +79,13 @@ struct PGPROC
 
 	Latch		procLatch;		/* generic latch for process */
 
-	TransactionId xid;			/* transaction currently being executed by
-								 * this proc */
+	LocalTransactionId lxid;	/* local id of top-level transaction currently
+								 * being executed by this proc, if running;
+								 * else InvalidLocalTransactionId */
+
+	TransactionId xid;			/* id of top-level transaction currently being
+								 * executed by this proc, if running and XID
+								 * is assigned; else InvalidTransactionId */
 
 	LocalDistribXactRef	localDistribXactRef;
 								/* Reference to the LocalDistribXact 
@@ -91,14 +96,16 @@ struct PGPROC
 								 * xid >= xmin ! */
 
 	int			pid;			/* This backend's process id, or 0 */
+	BackendId	backendId;		/* This backend's backend ID (if assigned) */
 	Oid			databaseId;		/* OID of database this backend is using */
 	Oid			roleId;			/* OID of role using this backend */
     int         mppSessionId;   /* serial num of the qDisp process */
     int         mppLocalProcessSerial;  /* this backend's PGPROC serial num */
     bool		mppIsWriter;	/* The writer gang member, holder of locks */
 
-	bool		inVacuum;		/* true if current xact is a LAZY VACUUM */
-	bool		isAutovacuum;	/* true if it's autovacuum */
+	bool		inCommit;		/* true if within commit critical section */
+
+	uint8		vacuumFlags;	/* vacuum-related flags, see above */
 
 	/* Info about LWLock the process is currently waiting for, if any. */
 	bool		lwWaiting;		/* true if waiting for an LW lock */
@@ -157,6 +164,7 @@ extern PGDLLIMPORT PGPROC *MyProc;
 /* Special for MPP reader gangs */
 extern PGDLLIMPORT PGPROC *lockHolderProcPtr;
 
+
 /*
  * There is one ProcGlobal struct for the whole database cluster.
  */
@@ -211,9 +219,11 @@ typedef struct PROC_HDR
  */
 #define NUM_AUXILIARY_PROCS	 14
 
+
 /* configurable options */
 extern int	DeadlockTimeout;
 extern int	StatementTimeout;
+extern bool log_lock_waits;
 extern int IdleSessionGangTimeout;
 
 extern volatile bool cancel_from_timeout;
@@ -235,7 +245,7 @@ extern void ProcQueueInit(PROC_QUEUE *queue);
 extern int	ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable);
 extern PGPROC *ProcWakeup(PGPROC *proc, int waitStatus);
 extern void ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock);
-extern bool LockWaitCancel(void);
+extern void LockWaitCancel(void);
 
 extern void ProcWaitForSignal(void);
 extern void ProcSendSignal(int pid);
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
index e8b0c350fd94..2e66281ede1c 100644
--- a/src/include/storage/procarray.h
+++ b/src/include/storage/procarray.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/procarray.h,v 1.12 2007/01/16 13:28:57 alvherre Exp $
+ * $PostgreSQL: pgsql/src/include/storage/procarray.h,v 1.20 2008/01/09 21:52:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,22 +16,36 @@
 
 #include "storage/lock.h"
 
+#include "cdb/cdbpublic.h"
+
 struct DtxContextInfo;         /* cdb/cdbdtxcontextinfo.h */
 struct SnapshotData;           /* utils/tqual.h */
 
 extern Size ProcArrayShmemSize(void);
 extern void CreateSharedProcArray(void);
 extern void ProcArrayAdd(PGPROC *proc);
-extern void ProcArrayRemove(PGPROC *proc, bool forPrepare, bool isCommit);
+extern void ProcArrayRemove(PGPROC *proc, TransactionId latestXid,
+							bool forPrepare, bool isCommit);
+extern void ProcArrayEndTransaction(PGPROC *proc, TransactionId latestXid, bool isCommit,
+						bool *needStateChangeFromDistributed,
+						bool *needNotifyCommittedDtxTransaction,
+						LocalDistribXactRef *localDistribXactRef);
+extern void ProcArrayClearTransaction(PGPROC *proc);
+extern void ClearTransactionFromPgProc_UnderLock(PGPROC *proc);
 
 extern bool TransactionIdIsInProgress(TransactionId xid);
 extern bool TransactionIdIsActive(TransactionId xid);
-extern TransactionId GetOldestXmin(bool allDbs);
+extern TransactionId GetOldestXmin(bool allDbs, bool ignoreVacuum);
+
+extern int	GetTransactionsInCommit(TransactionId **xids_p);
+extern bool HaveTransactionsInCommit(TransactionId *xids, int nxids);
 
 extern PGPROC *BackendPidGetProc(int pid);
 extern int	BackendXidGetPid(TransactionId xid);
 extern bool IsBackendPid(int pid);
 
+extern VirtualTransactionId *GetCurrentVirtualXIDs(TransactionId limitXmin,
+					  bool allDbs, int excludeVacuum);
 extern int	CountActiveBackends(void);
 extern int	CountDBBackends(Oid databaseid);
 extern int	CountUserBackends(Oid roleid);
@@ -40,7 +54,8 @@ extern bool HasSerializableBackends(bool allDbs);
 extern bool HasDropTransaction(bool allDbs);
 
 extern void XidCacheRemoveRunningXids(TransactionId xid,
-						  int nxids, TransactionId *xids);
+						  int nxids, const TransactionId *xids,
+						  TransactionId latestXid);
 						  
 extern PGPROC *FindProcByGpSessionId(long gp_session_id);
 extern void UpdateSerializableCommandId(void);
diff --git a/src/include/storage/relfilenode.h b/src/include/storage/relfilenode.h
index fa5d4a7ee5a3..dcf42c668faf 100644
--- a/src/include/storage/relfilenode.h
+++ b/src/include/storage/relfilenode.h
@@ -64,6 +64,10 @@ typedef enum ForkNumber
  * identified by pg_database.dattablespace).  However this shorthand
  * is NOT allowed in RelFileNode structs --- the real tablespace ID
  * must be supplied when setting spcNode.
+ *
+ * Note: various places use RelFileNode in hashtable keys.  Therefore,
+ * there *must not* be any unused padding bytes in this struct.  That
+ * should be safe as long as all the fields are of type Oid.
  */
 typedef struct RelFileNode
 {
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 4332ab344d56..9f3d89e766e3 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -252,13 +252,33 @@ tas(volatile slock_t *lock)
 #endif	 /* __ia64__ || __ia64 */
 
 
+/*
+ * On ARM, we use __sync_lock_test_and_set(int *, int) if available, and if
+ * not fall back on the SWPB instruction.  SWPB does not work on ARMv6 or
+ * later, so the compiler builtin is preferred if available.  Note also that
+ * the int-width variant of the builtin works on more chips than other widths.
+ */
 #if defined(__arm__) || defined(__arm)
 #define HAS_TEST_AND_SET
 
-typedef unsigned char slock_t;
-
 #define TAS(lock) tas(lock)
 
+#ifdef HAVE_GCC_INT_ATOMICS
+
+typedef int slock_t;
+
+static __inline__ int
+tas(volatile slock_t *lock)
+{
+	return __sync_lock_test_and_set(lock, 1);
+}
+
+#define S_UNLOCK(lock) __sync_lock_release(lock)
+
+#else /* !HAVE_GCC_INT_ATOMICS */
+
+typedef unsigned char slock_t;
+
 static __inline__ int
 tas(volatile slock_t *lock)
 {
@@ -272,6 +292,7 @@ tas(volatile slock_t *lock)
 	return (int) _res;
 }
 
+#endif	 /* HAVE_GCC_INT_ATOMICS */
 #endif	 /* __arm__ */
 
 
@@ -568,36 +589,6 @@ typedef int slock_t;
 #endif /* __m32r__ */
 
 
-#if defined(__sh__)				/* Renesas' SuperH */
-#define HAS_TEST_AND_SET
-
-typedef unsigned char slock_t;
-
-#define TAS(lock) tas(lock)
-
-static __inline__ int
-tas(volatile slock_t *lock)
-{
-	register int _res;
-
-	/*
-	 * This asm is coded as if %0 could be any register, but actually SuperH
-	 * restricts the target of xor-immediate to be R0.  That's handled by
-	 * the "z" constraint on _res.
-	 */
-	__asm__ __volatile__(
-		"	tas.b @%2    \n"
-		"	movt  %0     \n"
-		"	xor   #1,%0  \n"
-:		"=z"(_res), "+m"(*lock)
-:		"r"(lock)
-:		"memory", "t");
-	return _res;
-}
-
-#endif	 /* __sh__ */
-
-
 /* These live in s_lock.c, but only for gcc */
 
 
@@ -608,7 +599,7 @@ typedef unsigned char slock_t;
 #endif
 
 
-#endif	/* defined(__GNUC__) || defined(__INTEL_COMPILER) */
+#endif	/* __GNUC__ */
 
 
 
@@ -812,7 +803,7 @@ typedef unsigned char slock_t;
 #endif
 
 
-#if defined(__SUNPRO_C) && (defined(__i386) || defined(__x86_64__) || defined(__sparc__) || defined(__sparc))
+#if defined(__sun) && (defined(__i386) || defined(__x86_64__) || defined(__sparc__) || defined(__sparc))
 #define HAS_TEST_AND_SET
 
 #if defined(__i386) || defined(__x86_64__) || defined(__sparcv9) || defined(__sparcv8plus)
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 03a94745e4b3..c9ee1a1f4670 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -14,7 +14,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/shmem.h,v 1.50 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/shmem.h,v 1.53 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,6 @@
 typedef unsigned long SHMEM_OFFSET;
 
 #define INVALID_OFFSET	(-1)
-#define BAD_LOCATION	(-1)
 
 /*
  * Start of the primary shared memory region, in this process' address space.
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 9b6b86f7b873..62ba38aefc62 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/sinval.h,v 1.45 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/sinval.h,v 1.46 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 9a716e45e6a9..c41fca67d229 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -35,4 +35,6 @@ extern void SIInsertDataEntries(const SharedInvalidationMessage *data, int n);
 extern int	SIGetDataEntries(SharedInvalidationMessage *data, int datasize);
 extern void SICleanupQueue(bool callerHasWriteLock, int minFree);
 
+extern LocalTransactionId GetNextLocalTransactionId(void);
+
 #endif   /* SINVALADT_H */
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index 060a81f37a5c..40e8c9417d6a 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/smgr.h,v 1.58 2007/01/17 16:25:01 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/storage/smgr.h,v 1.62 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -371,10 +371,9 @@ extern bool smgrgetappendonlyinfo(
 	MirrorDataLossTrackingState 	*mirrorDataLossTrackingState,
 
 	int64							*mirrorDataLossTrackingSessionNum);
-extern int	smgrGetPendingFileSysWork(
-	EndXactRecKind						endXactRecKind,
-
-	PersistentEndXactFileSysActionInfo	**ptr);
+extern int smgrGetPendingFileSysWork(EndXactRecKind endXactRecKind,
+						  PersistentEndXactFileSysActionInfo **ptr,
+						  bool *haveNonTemp);
 extern int	smgrGetAppendOnlyMirrorResyncEofs(
 	EndXactRecKind									endXactRecKind,
 
@@ -389,7 +388,9 @@ extern void AtEOXact_smgr(bool forCommit);
 extern void PostPrepare_smgr(void);
 extern void smgrcommit(void);
 extern void smgrabort(void);
+extern void smgrpreckpt(void);
 extern void smgrsync(void);
+extern void smgrpostckpt(void);
 
 extern void smgr_redo(XLogRecPtr beginLoc, XLogRecPtr lsn, XLogRecord *record);
 extern void smgr_desc(StringInfo buf, XLogRecPtr beginLoc, XLogRecord *record);
@@ -513,7 +514,9 @@ extern BlockNumber mdnblocks(SMgrRelation reln);
 extern void mdtruncate(SMgrRelation reln, BlockNumber nblocks,
 		   bool isTemp, bool allowedNotFound);
 extern void mdimmedsync(SMgrRelation reln);
+extern void mdpreckpt(void);
 extern void mdsync(void);
+extern void mdpostckpt(void);
 
 /*
  * MPP-18228 - to make addition to pending delete list atomic with adding
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index fe8c288ea819..3829c824ec28 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -54,7 +54,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tcop/dest.h,v 1.53 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/dest.h,v 1.54 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 1f45e64aad26..f186b1c4c5f0 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -7,13 +7,14 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tcop/pquery.h,v 1.40 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/pquery.h,v 1.44 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PQUERY_H
 #define PQUERY_H
 
+#include "nodes/parsenodes.h"
 #include "utils/portal.h"
 
 
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index c538713d1306..acc335a60459 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.86 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.92 2008/01/01 19:45:59 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -42,21 +42,19 @@ typedef enum
 	LOGSTMT_ALL					/* log all statements */
 } LogStmtLevel;
 
-extern int log_statement;
-
-#ifndef BOOTSTRAP_INCLUDE
+extern LogStmtLevel log_statement;
 
 extern List *pg_parse_and_rewrite(const char *query_string,
 					 Oid *paramTypes, int numParams);
 extern List *pg_parse_query(const char *query_string);
 extern List *pg_analyze_and_rewrite(Node *parsetree, const char *query_string,
 					   Oid *paramTypes, int numParams);
-extern PlannedStmt *pg_plan_query(Query *querytree, ParamListInfo boundParams);
-extern List *pg_plan_queries(List *querytrees, ParamListInfo boundParams,
-				bool needSnapshot);
+extern PlannedStmt *pg_plan_query(Query *querytree, int cursorOptions,
+			  ParamListInfo boundParams);
+extern List *pg_plan_queries(List *querytrees, int cursorOptions,
+				ParamListInfo boundParams, bool needSnapshot);
 
 extern bool assign_max_stack_depth(int newval, bool doit, GucSource source);
-#endif   /* BOOTSTRAP_INCLUDE */
 
 extern void die(SIGNAL_ARGS);
 extern void quickdie(SIGNAL_ARGS);
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index 386588abbdaa..9c666b21fa80 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tcop/utility.h,v 1.30 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/utility.h,v 1.34 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,14 +29,9 @@ extern const char *CreateCommandTag(Node *parsetree);
 
 extern LogStmtLevel GetCommandLogLevel(Node *parsetree);
 
-extern LogStmtLevel GetQueryLogLevel(Query *parsetree);
-
+/* GPDB_83MERGE_FIXME Function is deprecated upstream but used in MPP code, replace */
 extern LogStmtLevel GetPlannedStmtLogLevel(PlannedStmt * stmt);
 
-extern bool QueryReturnsTuples(Query *parsetree); /* Obsolete? */
-
-extern bool QueryIsReadOnly(Query *parsetree);  /* Obsolete */
-
 extern bool CommandIsReadOnly(Node *parsetree);
 
 extern void CheckRelationOwnership(RangeVar *rel, bool noCatalogs);
diff --git a/src/include/tsearch/dicts/regis.h b/src/include/tsearch/dicts/regis.h
new file mode 100644
index 000000000000..5c3c1794b846
--- /dev/null
+++ b/src/include/tsearch/dicts/regis.h
@@ -0,0 +1,49 @@
+/*-------------------------------------------------------------------------
+ *
+ * regis.h
+ *
+ * Declarations for for fast regex subset, used by ISpell
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/tsearch/dicts/regis.h,v 1.5 2008/01/21 02:46:11 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef __REGIS_H__
+#define __REGIS_H__
+
+typedef struct RegisNode
+{
+	uint32
+				type:2,
+				len:16,
+				unused:14;
+	struct RegisNode *next;
+	unsigned char data[1];
+} RegisNode;
+
+#define  RNHDRSZ	(offsetof(RegisNode,data))
+
+#define RSF_ONEOF	1
+#define RSF_NONEOF	2
+
+typedef struct Regis
+{
+	RegisNode  *node;
+	uint32
+				issuffix:1,
+				nchar:16,
+				unused:15;
+} Regis;
+
+bool		RS_isRegis(const char *str);
+
+void		RS_compile(Regis *r, bool issuffix, const char *str);
+void		RS_free(Regis *r);
+
+/*returns true if matches */
+bool		RS_execute(Regis *r, char *str);
+
+#endif
diff --git a/src/include/tsearch/dicts/spell.h b/src/include/tsearch/dicts/spell.h
new file mode 100644
index 000000000000..7215c9666f8b
--- /dev/null
+++ b/src/include/tsearch/dicts/spell.h
@@ -0,0 +1,169 @@
+/*-------------------------------------------------------------------------
+ *
+ * spell.h
+ *
+ * Declarations for ISpell dictionary
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/tsearch/dicts/spell.h,v 1.6 2008/01/01 19:45:59 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef __SPELL_H__
+#define __SPELL_H__
+
+#include "regex/regex.h"
+#include "tsearch/dicts/regis.h"
+#include "tsearch/ts_public.h"
+
+/*
+ * Max length of a flag name. Names longer than this will be truncated
+ * to the maximum.
+ */
+#define MAXFLAGLEN 16
+
+struct SPNode;
+
+typedef struct
+{
+	uint32		val:8,
+				isword:1,
+				compoundflag:4,
+				affix:19;
+	struct SPNode *node;
+} SPNodeData;
+
+/*
+ * Names of FF_ are correlated with Hunspell options in affix file
+ * http://sourceforge.net/docman/display_doc.php?docid=29374&group_id=143754
+ */
+#define FF_COMPOUNDONLY		0x01
+#define FF_COMPOUNDBEGIN	0x02
+#define FF_COMPOUNDMIDDLE	0x04
+#define FF_COMPOUNDLAST		0x08
+#define FF_COMPOUNDFLAG		( FF_COMPOUNDBEGIN | FF_COMPOUNDMIDDLE | FF_COMPOUNDLAST )
+#define FF_DICTFLAGMASK		0x0f
+
+typedef struct SPNode
+{
+	uint32		length;
+	SPNodeData	data[1];
+} SPNode;
+
+#define SPNHDRSZ	(offsetof(SPNode,data))
+
+
+typedef struct spell_struct
+{
+	union
+	{
+		/*
+		 * flag is filled in by NIImportDictionary. After NISortDictionary, d
+		 * is valid and flag is invalid.
+		 */
+		char		flag[MAXFLAGLEN];
+		struct
+		{
+			int			affix;
+			int			len;
+		}			d;
+	}			p;
+	char		word[1];		/* variable length, null-terminated */
+} SPELL;
+
+#define SPELLHDRSZ	(offsetof(SPELL, word))
+
+typedef struct aff_struct
+{
+	uint32		flag:8,
+				type:1,
+				flagflags:7,
+				issimple:1,
+				isregis:1,
+				replen:14;
+	char	   *find;
+	char	   *repl;
+	union
+	{
+		regex_t		regex;
+		Regis		regis;
+	}			reg;
+} AFFIX;
+
+/*
+ * affixes use dictionary flags too
+ */
+#define FF_COMPOUNDPERMITFLAG	0x10
+#define FF_COMPOUNDFORBIDFLAG	0x20
+#define FF_CROSSPRODUCT			0x40
+
+/*
+ * Don't change the order of these. Initialization sorts by these,
+ * and expects prefixes to come first after sorting.
+ */
+#define FF_SUFFIX				1
+#define FF_PREFIX				0
+
+struct AffixNode;
+
+typedef struct
+{
+	uint32		val:8,
+				naff:24;
+	AFFIX	  **aff;
+	struct AffixNode *node;
+} AffixNodeData;
+
+typedef struct AffixNode
+{
+	uint32		isvoid:1,
+				length:31;
+	AffixNodeData data[1];
+} AffixNode;
+
+#define ANHRDSZ		   (offsetof(AffixNode, data))
+
+typedef struct
+{
+	char	   *affix;
+	int			len;
+	bool		issuffix;
+} CMPDAffix;
+
+typedef struct
+{
+	int			maffixes;
+	int			naffixes;
+	AFFIX	   *Affix;
+
+	/*
+	 * Temporary array of all words in the dict file. Only used during
+	 * initialization
+	 */
+	SPELL	  **Spell;
+	int			nspell;			/* number of valid entries in Spell array */
+	int			mspell;			/* allocated length of Spell array */
+
+	AffixNode  *Suffix;
+	AffixNode  *Prefix;
+
+	SPNode	   *Dictionary;
+	char	  **AffixData;
+	int			lenAffixData;
+	int			nAffixData;
+
+	CMPDAffix  *CompoundAffix;
+
+	unsigned char flagval[256];
+	bool		usecompound;
+} IspellDict;
+
+extern TSLexeme *NINormalizeWord(IspellDict *Conf, char *word);
+extern void NIImportAffixes(IspellDict *Conf, const char *filename);
+extern void NIImportDictionary(IspellDict *Conf, const char *filename);
+extern void NISortDictionary(IspellDict *Conf);
+extern void NISortAffixes(IspellDict *Conf);
+
+#endif
diff --git a/src/include/tsearch/ts_cache.h b/src/include/tsearch/ts_cache.h
new file mode 100644
index 000000000000..9d9c15bf9cb2
--- /dev/null
+++ b/src/include/tsearch/ts_cache.h
@@ -0,0 +1,98 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_cache.h
+ *	  Tsearch related object caches.
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_cache.h,v 1.4 2008/01/01 19:45:59 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef TS_CACHE_H
+#define TS_CACHE_H
+
+#include "fmgr.h"
+#include "utils/guc.h"
+
+
+/*
+ * All TS*CacheEntry structs must share this common header
+ * (see InvalidateTSCacheCallBack)
+ */
+typedef struct TSAnyCacheEntry
+{
+	Oid			objId;
+	bool		isvalid;
+} TSAnyCacheEntry;
+
+
+typedef struct TSParserCacheEntry
+{
+	/* prsId is the hash lookup key and MUST BE FIRST */
+	Oid			prsId;			/* OID of the parser */
+	bool		isvalid;
+
+	Oid			startOid;
+	Oid			tokenOid;
+	Oid			endOid;
+	Oid			headlineOid;
+	Oid			lextypeOid;
+
+	/*
+	 * Pre-set-up fmgr call of most needed parser's methods
+	 */
+	FmgrInfo	prsstart;
+	FmgrInfo	prstoken;
+	FmgrInfo	prsend;
+	FmgrInfo	prsheadline;
+} TSParserCacheEntry;
+
+typedef struct TSDictionaryCacheEntry
+{
+	/* dictId is the hash lookup key and MUST BE FIRST */
+	Oid			dictId;
+	bool		isvalid;
+
+	/* most frequent fmgr call */
+	Oid			lexizeOid;
+	FmgrInfo	lexize;
+
+	MemoryContext dictCtx;		/* memory context to store private data */
+	void	   *dictData;
+} TSDictionaryCacheEntry;
+
+typedef struct
+{
+	int			len;
+	Oid		   *dictIds;
+} ListDictionary;
+
+typedef struct
+{
+	/* cfgId is the hash lookup key and MUST BE FIRST */
+	Oid			cfgId;
+	bool		isvalid;
+
+	Oid			prsId;
+
+	int			lenmap;
+	ListDictionary *map;
+} TSConfigCacheEntry;
+
+
+/*
+ * GUC variable for current configuration
+ */
+extern char *TSCurrentConfig;
+
+
+extern TSParserCacheEntry *lookup_ts_parser_cache(Oid prsId);
+extern TSDictionaryCacheEntry *lookup_ts_dictionary_cache(Oid dictId);
+extern TSConfigCacheEntry *lookup_ts_config_cache(Oid cfgId);
+
+extern Oid	getTSCurrentConfig(bool emitError);
+extern const char *assignTSCurrentConfig(const char *newval, bool doit, GucSource source);
+
+#endif   /* TS_CACHE_H */
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
new file mode 100644
index 000000000000..f0e4bd468a4f
--- /dev/null
+++ b/src/include/tsearch/ts_locale.h
@@ -0,0 +1,83 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_locale.h
+ *		locale compatibility layer for tsearch
+ *
+ * Copyright (c) 1998-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_locale.h,v 1.5.2.1 2008/06/18 20:55:49 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef __TSLOCALE_H__
+#define __TSLOCALE_H__
+
+#include <ctype.h>
+#include <limits.h>
+
+#include "utils/pg_locale.h"
+#include "mb/pg_wchar.h"
+
+/*
+ * towlower() and friends should be in <wctype.h>, but some pre-C99 systems
+ * declare them in <wchar.h>.
+ */
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+#ifdef HAVE_WCTYPE_H
+#include <wctype.h>
+#endif
+
+#if defined(HAVE_WCSTOMBS) && defined(HAVE_TOWLOWER)
+#define TS_USE_WIDE
+#endif
+
+/* working state for tsearch_readline (should be a local var in caller) */
+typedef struct
+{
+	FILE	   *fp;
+	const char *filename;
+	int			lineno;
+	char	   *curline;
+	ErrorContextCallback cb;
+} tsearch_readline_state;
+
+#define TOUCHAR(x)	(*((const unsigned char *) (x)))
+
+#ifdef TS_USE_WIDE
+
+extern size_t wchar2char(char *to, const wchar_t *from, size_t tolen);
+extern size_t char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen);
+
+extern int	t_isdigit(const char *ptr);
+extern int	t_isspace(const char *ptr);
+extern int	t_isalpha(const char *ptr);
+extern int	t_isprint(const char *ptr);
+
+/* The second argument of t_iseq() must be a plain ASCII character */
+#define t_iseq(x,c)		(TOUCHAR(x) == (unsigned char) (c))
+
+#define COPYCHAR(d,s)	memcpy(d, s, pg_mblen(s))
+#else							/* not TS_USE_WIDE */
+
+#define t_isdigit(x)	isdigit(TOUCHAR(x))
+#define t_isspace(x)	isspace(TOUCHAR(x))
+#define t_isalpha(x)	isalpha(TOUCHAR(x))
+#define t_isprint(x)	isprint(TOUCHAR(x))
+#define t_iseq(x,c)		(TOUCHAR(x) == (unsigned char) (c))
+
+#define COPYCHAR(d,s)	(*((unsigned char *) (d)) = TOUCHAR(s))
+#endif   /* TS_USE_WIDE */
+
+extern char *lowerstr(const char *str);
+extern char *lowerstr_with_len(const char *str, int len);
+
+extern bool tsearch_readline_begin(tsearch_readline_state *stp,
+								   const char *filename);
+extern char *tsearch_readline(tsearch_readline_state *stp);
+extern void tsearch_readline_end(tsearch_readline_state *stp);
+
+extern char *t_readline(FILE *fp);
+
+#endif   /* __TSLOCALE_H__ */
diff --git a/src/include/tsearch/ts_public.h b/src/include/tsearch/ts_public.h
new file mode 100644
index 000000000000..590d3055a7a9
--- /dev/null
+++ b/src/include/tsearch/ts_public.h
@@ -0,0 +1,115 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_public.h
+ *	  Public interface to various tsearch modules, such as
+ *	  parsers and dictionaries.
+ *
+ * Copyright (c) 1998-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_public.h,v 1.8.2.1 2009/01/15 17:06:03 teodor Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef _PG_TS_PUBLIC_H_
+#define _PG_TS_PUBLIC_H_
+
+#include "tsearch/ts_type.h"
+
+/*
+ * Parser's framework
+ */
+
+/*
+ * returning type for prslextype method of parser
+ */
+typedef struct
+{
+	int			lexid;
+	char	   *alias;
+	char	   *descr;
+} LexDescr;
+
+/*
+ * Interface to headline generator
+ */
+typedef struct
+{
+	uint32		selected:1,
+				in:1,
+				replace:1,
+				repeated:1,
+				skip:1,
+				unused:3,
+				type:8,
+				len:16;
+	char	   *word;
+	QueryOperand *item;
+} HeadlineWordEntry;
+
+typedef struct
+{
+	HeadlineWordEntry *words;
+	int4		lenwords;
+	int4		curwords;
+	char	   *startsel;
+	char	   *stopsel;
+	int2		startsellen;
+	int2		stopsellen;
+} HeadlineParsedText;
+
+/*
+ * Common useful things for tsearch subsystem
+ */
+extern char *get_tsearch_config_filename(const char *basename,
+							const char *extension);
+
+/*
+ * Often useful stopword list management
+ */
+typedef struct
+{
+	int			len;
+	char	  **stop;
+} StopList;
+
+extern void readstoplist(const char *fname, StopList *s,
+			 char *(*wordop) (const char *));
+extern bool searchstoplist(StopList *s, char *key);
+
+/*
+ * Interface with dictionaries
+ */
+
+/* return struct for any lexize function */
+typedef struct
+{
+	/*
+	 * number of variant of split word , for example Word 'fotballklubber'
+	 * (norwegian) has two varian to split: ( fotball, klubb ) and ( fot,
+	 * ball, klubb ). So, dictionary should return: nvariant lexeme 1 fotball
+	 * 1	  klubb 2	   fot 2	  ball 2	  klubb
+	 */
+	uint16		nvariant;
+
+	uint16		flags;
+
+	/* C-string */
+	char	   *lexeme;
+} TSLexeme;
+
+#define TSL_ADDPOS		0x01
+
+/*
+ * Struct for supporting complex dictionaries like thesaurus.
+ * 4th argument for dictlexize method is a pointer to this
+ */
+typedef struct
+{
+	bool		isend;			/* in: marks for lexize_info about text end is
+								 * reached */
+	bool		getnext;		/* out: dict wants next lexeme */
+	void	   *private;		/* internal dict state between calls with
+								 * getnext == true */
+} DictSubState;
+
+#endif   /* _PG_TS_PUBLIC_H_ */
diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
new file mode 100644
index 000000000000..9f5e63e2273e
--- /dev/null
+++ b/src/include/tsearch/ts_type.h
@@ -0,0 +1,291 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_type.h
+ *	  Definitions for the tsvector and tsquery types
+ *
+ * Copyright (c) 1998-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_type.h,v 1.10 2008/01/01 19:45:59 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef _PG_TSTYPE_H_
+#define _PG_TSTYPE_H_
+
+#include "fmgr.h"
+#include "utils/pg_crc.h"
+
+
+/*
+ * TSVector type.
+ * Note, tsvectorsend/recv believe that sizeof(WordEntry) == 4
+ */
+
+typedef struct
+{
+	uint32
+				haspos:1,
+				len:11,			/* MAX 2Kb */
+				pos:20;			/* MAX 1Mb */
+} WordEntry;
+
+#define MAXSTRLEN ( (1<<11) - 1)
+#define MAXSTRPOS ( (1<<20) - 1)
+
+/*
+ * Equivalent to
+ * typedef struct {
+ *		uint16
+ *			weight:2,
+ *			pos:14;
+ * }
+ */
+
+typedef uint16 WordEntryPos;
+
+typedef struct
+{
+	uint16		npos;
+	WordEntryPos pos[1];		/* var length */
+} WordEntryPosVector;
+
+
+#define WEP_GETWEIGHT(x)	( (x) >> 14 )
+#define WEP_GETPOS(x)		( (x) & 0x3fff )
+
+#define WEP_SETWEIGHT(x,v)	( (x) = ( (v) << 14 ) | ( (x) & 0x3fff ) )
+#define WEP_SETPOS(x,v)		( (x) = ( (x) & 0xc000 ) | ( (v) & 0x3fff ) )
+
+#define MAXENTRYPOS (1<<14)
+#define MAXNUMPOS	(256)
+#define LIMITPOS(x) ( ( (x) >= MAXENTRYPOS ) ? (MAXENTRYPOS-1) : (x) )
+
+/*
+ * Structure of tsvector datatype:
+ * 1) standard varlena header
+ * 2) int4		size - number of lexemes or WordEntry array, which is the same
+ * 3) Array of WordEntry - sorted array, comparison based on word's length
+ *							and strncmp(). WordEntry->pos points number of
+ *							bytes from end of WordEntry array to start of
+ *							corresponding lexeme.
+ * 4) Lexeme's storage:
+ *	  lexeme (without null-terminator)
+ *	  if haspos is true:
+ *		padding byte if necessary to make the number of positions 2-byte aligned
+ *		uint16		number of positions that follow.
+ *		uint16[]	positions
+ *
+ * The positions must be sorted.
+ */
+
+typedef struct
+{
+	int32		vl_len_;		/* varlena header (do not touch directly!) */
+	int32		size;
+	WordEntry	entries[1];		/* var size */
+	/* lexemes follow */
+} TSVectorData;
+
+typedef TSVectorData *TSVector;
+
+#define DATAHDRSIZE (offsetof(TSVectorData, entries))
+#define CALCDATASIZE(x, lenstr) (DATAHDRSIZE + (x) * sizeof(WordEntry) + (lenstr) )
+#define ARRPTR(x)	( (x)->entries )
+
+/* returns a pointer to the beginning of lexemes */
+#define STRPTR(x)	( (char *) &(x)->entries[x->size] )
+
+#define _POSVECPTR(x, e)	((WordEntryPosVector *)(STRPTR(x) + SHORTALIGN((e)->pos + (e)->len)))
+#define POSDATALEN(x,e) ( ( (e)->haspos ) ? (_POSVECPTR(x,e)->npos) : 0 )
+#define POSDATAPTR(x,e) (_POSVECPTR(x,e)->pos)
+
+/*
+ * fmgr interface macros
+ */
+
+#define DatumGetTSVector(X)			((TSVector) PG_DETOAST_DATUM(X))
+#define DatumGetTSVectorCopy(X)		((TSVector) PG_DETOAST_DATUM_COPY(X))
+#define TSVectorGetDatum(X)			PointerGetDatum(X)
+#define PG_GETARG_TSVECTOR(n)		DatumGetTSVector(PG_GETARG_DATUM(n))
+#define PG_GETARG_TSVECTOR_COPY(n)	DatumGetTSVectorCopy(PG_GETARG_DATUM(n))
+#define PG_RETURN_TSVECTOR(x)		return TSVectorGetDatum(x)
+
+/*
+ * I/O
+ */
+extern Datum tsvectorin(PG_FUNCTION_ARGS);
+extern Datum tsvectorout(PG_FUNCTION_ARGS);
+extern Datum tsvectorsend(PG_FUNCTION_ARGS);
+extern Datum tsvectorrecv(PG_FUNCTION_ARGS);
+
+/*
+ * operations with tsvector
+ */
+extern Datum tsvector_lt(PG_FUNCTION_ARGS);
+extern Datum tsvector_le(PG_FUNCTION_ARGS);
+extern Datum tsvector_eq(PG_FUNCTION_ARGS);
+extern Datum tsvector_ne(PG_FUNCTION_ARGS);
+extern Datum tsvector_ge(PG_FUNCTION_ARGS);
+extern Datum tsvector_gt(PG_FUNCTION_ARGS);
+extern Datum tsvector_cmp(PG_FUNCTION_ARGS);
+
+extern Datum tsvector_length(PG_FUNCTION_ARGS);
+extern Datum tsvector_strip(PG_FUNCTION_ARGS);
+extern Datum tsvector_setweight(PG_FUNCTION_ARGS);
+extern Datum tsvector_concat(PG_FUNCTION_ARGS);
+extern Datum tsvector_update_trigger_byid(PG_FUNCTION_ARGS);
+extern Datum tsvector_update_trigger_bycolumn(PG_FUNCTION_ARGS);
+
+extern Datum ts_match_vq(PG_FUNCTION_ARGS);
+extern Datum ts_match_qv(PG_FUNCTION_ARGS);
+extern Datum ts_match_tt(PG_FUNCTION_ARGS);
+extern Datum ts_match_tq(PG_FUNCTION_ARGS);
+
+extern Datum ts_stat1(PG_FUNCTION_ARGS);
+extern Datum ts_stat2(PG_FUNCTION_ARGS);
+
+extern Datum ts_rank_tt(PG_FUNCTION_ARGS);
+extern Datum ts_rank_wtt(PG_FUNCTION_ARGS);
+extern Datum ts_rank_ttf(PG_FUNCTION_ARGS);
+extern Datum ts_rank_wttf(PG_FUNCTION_ARGS);
+extern Datum ts_rankcd_tt(PG_FUNCTION_ARGS);
+extern Datum ts_rankcd_wtt(PG_FUNCTION_ARGS);
+extern Datum ts_rankcd_ttf(PG_FUNCTION_ARGS);
+extern Datum ts_rankcd_wttf(PG_FUNCTION_ARGS);
+
+
+/*
+ * TSQuery
+ *
+ *
+ */
+
+typedef int8 QueryItemType;
+
+/* Valid values for QueryItemType: */
+#define QI_VAL 1
+#define QI_OPR 2
+#define QI_VALSTOP 3			/* This is only used in an intermediate stack
+								 * representation in parse_tsquery. It's not a
+								 * legal type elsewhere. */
+
+/*
+ * QueryItem is one node in tsquery - operator or operand.
+ */
+typedef struct
+{
+	QueryItemType type;			/* operand or kind of operator (ts_tokentype) */
+	uint8		weight;			/* weights of operand to search. It's a
+								 * bitmask of allowed weights. if it =0 then
+								 * any weight are allowed. Weights and bit
+								 * map: A: 1<<3 B: 1<<2 C: 1<<1 D: 1<<0 */
+	int32		valcrc;			/* XXX: pg_crc32 would be a more appropriate
+								 * data type, but we use comparisons to signed
+								 * integers in the code. They would need to be
+								 * changed as well. */
+
+	/* pointer to text value of operand, must correlate with WordEntry */
+	uint32
+				length:12,
+				distance:20;
+} QueryOperand;
+
+
+/* Legal values for QueryOperator.operator */
+#define OP_NOT	1
+#define OP_AND	2
+#define OP_OR	3
+
+typedef struct
+{
+	QueryItemType type;
+	int8		oper;			/* see above */
+	uint32		left;			/* pointer to left operand. Right operand is
+								 * item + 1, left operand is placed
+								 * item+item->left */
+} QueryOperator;
+
+/*
+ * Note: TSQuery is 4-bytes aligned, so make sure there's no fields
+ * inside QueryItem requiring 8-byte alignment, like int64.
+ */
+typedef union
+{
+	QueryItemType type;
+	QueryOperator operator;
+	QueryOperand operand;
+} QueryItem;
+
+/*
+ * Storage:
+ *	(len)(size)(array of QueryItem)(operands as '\0'-terminated c-strings)
+ */
+
+typedef struct
+{
+	int32		vl_len_;		/* varlena header (do not touch directly!) */
+	int4		size;			/* number of QueryItems */
+	char		data[1];
+} TSQueryData;
+
+typedef TSQueryData *TSQuery;
+
+#define HDRSIZETQ	( VARHDRSZ + sizeof(int4) )
+
+/* Computes the size of header and all QueryItems. size is the number of
+ * QueryItems, and lenofoperand is the total length of all operands
+ */
+#define COMPUTESIZE(size, lenofoperand) ( HDRSIZETQ + (size) * sizeof(QueryItem) + (lenofoperand) )
+
+/* Returns a pointer to the first QueryItem in a TSVector */
+#define GETQUERY(x)  ((QueryItem*)( (char*)(x)+HDRSIZETQ ))
+
+/* Returns a pointer to the beginning of operands in a TSVector */
+#define GETOPERAND(x)	( (char*)GETQUERY(x) + ((TSQuery)(x))->size * sizeof(QueryItem) )
+
+/*
+ * fmgr interface macros
+ * Note, TSQuery type marked as plain storage, so it can't be toasted
+ * but PG_DETOAST_DATUM_COPY is used for simplicity
+ */
+
+#define DatumGetTSQuery(X)			((TSQuery) DatumGetPointer(X))
+#define DatumGetTSQueryCopy(X)		((TSQuery) PG_DETOAST_DATUM_COPY(X))
+#define TSQueryGetDatum(X)			PointerGetDatum(X)
+#define PG_GETARG_TSQUERY(n)		DatumGetTSQuery(PG_GETARG_DATUM(n))
+#define PG_GETARG_TSQUERY_COPY(n)	DatumGetTSQueryCopy(PG_GETARG_DATUM(n))
+#define PG_RETURN_TSQUERY(x)		return TSQueryGetDatum(x)
+
+/*
+ * I/O
+ */
+extern Datum tsqueryin(PG_FUNCTION_ARGS);
+extern Datum tsqueryout(PG_FUNCTION_ARGS);
+extern Datum tsquerysend(PG_FUNCTION_ARGS);
+extern Datum tsqueryrecv(PG_FUNCTION_ARGS);
+
+/*
+ * operations with tsquery
+ */
+extern Datum tsquery_lt(PG_FUNCTION_ARGS);
+extern Datum tsquery_le(PG_FUNCTION_ARGS);
+extern Datum tsquery_eq(PG_FUNCTION_ARGS);
+extern Datum tsquery_ne(PG_FUNCTION_ARGS);
+extern Datum tsquery_ge(PG_FUNCTION_ARGS);
+extern Datum tsquery_gt(PG_FUNCTION_ARGS);
+extern Datum tsquery_cmp(PG_FUNCTION_ARGS);
+
+extern Datum tsquerytree(PG_FUNCTION_ARGS);
+extern Datum tsquery_numnode(PG_FUNCTION_ARGS);
+
+extern Datum tsquery_and(PG_FUNCTION_ARGS);
+extern Datum tsquery_or(PG_FUNCTION_ARGS);
+extern Datum tsquery_not(PG_FUNCTION_ARGS);
+
+extern Datum tsquery_rewrite(PG_FUNCTION_ARGS);
+extern Datum tsquery_rewrite_query(PG_FUNCTION_ARGS);
+
+extern Datum tsq_mcontains(PG_FUNCTION_ARGS);
+extern Datum tsq_mcontained(PG_FUNCTION_ARGS);
+
+#endif   /* _PG_TSTYPE_H_ */
diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h
new file mode 100644
index 000000000000..b94e40f64467
--- /dev/null
+++ b/src/include/tsearch/ts_utils.h
@@ -0,0 +1,278 @@
+/*-------------------------------------------------------------------------
+ *
+ * ts_utils.h
+ *	  helper utilities for tsearch
+ *
+ * Copyright (c) 1998-2008, PostgreSQL Global Development Group
+ *
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.12 2008/01/01 19:45:59 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef _PG_TS_UTILS_H_
+#define _PG_TS_UTILS_H_
+
+#include "tsearch/ts_type.h"
+#include "tsearch/ts_public.h"
+#include "nodes/pg_list.h"
+
+/*
+ * Common parse definitions for tsvector and tsquery
+ */
+
+/* tsvector parser support. */
+
+struct TSVectorParseStateData;	/* opaque struct in tsvector_parser.c */
+typedef struct TSVectorParseStateData *TSVectorParseState;
+
+extern TSVectorParseState init_tsvector_parser(char *input,
+					 bool oprisdelim,
+					 bool is_tsquery);
+extern void reset_tsvector_parser(TSVectorParseState state, char *input);
+extern bool gettoken_tsvector(TSVectorParseState state,
+				  char **token, int *len,
+				  WordEntryPos **pos, int *poslen,
+				  char **endptr);
+extern void close_tsvector_parser(TSVectorParseState state);
+
+/* parse_tsquery */
+
+struct TSQueryParserStateData;	/* private in backend/utils/adt/tsquery.c */
+typedef struct TSQueryParserStateData *TSQueryParserState;
+
+typedef void (*PushFunction) (Datum opaque, TSQueryParserState state,
+										  char *token, int tokenlen,
+										  int2 tokenweights		/* bitmap as described
+																 * in QueryOperand
+								  struct */ );
+
+extern TSQuery parse_tsquery(char *buf,
+			  PushFunction pushval,
+			  Datum opaque, bool isplain);
+
+/* Functions for use by PushFunction implementations */
+extern void pushValue(TSQueryParserState state,
+		  char *strval, int lenval, int2 weight);
+extern void pushStop(TSQueryParserState state);
+extern void pushOperator(TSQueryParserState state, int8 operator);
+
+/*
+ * parse plain text and lexize words
+ */
+typedef struct
+{
+	uint16		len;
+	uint16		nvariant;
+	union
+	{
+		uint16		pos;
+
+		/*
+		 * When apos array is used, apos[0] is the number of elements in the
+		 * array (excluding apos[0]), and alen is the allocated size of the
+		 * array.
+		 */
+		uint16	   *apos;
+	}			pos;
+	char	   *word;
+	uint32		alen;
+} ParsedWord;
+
+typedef struct
+{
+	ParsedWord *words;
+	int4		lenwords;
+	int4		curwords;
+	int4		pos;
+} ParsedText;
+
+extern void parsetext(Oid cfgId, ParsedText *prs, char *buf, int4 buflen);
+
+/*
+ * headline framework, flow in common to generate:
+ *	1 parse text with hlparsetext
+ *	2 parser-specific function to find part
+ *	3 generateHeadline to generate result text
+ */
+
+extern void hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query,
+			char *buf, int4 buflen);
+extern text *generateHeadline(HeadlineParsedText *prs);
+
+/*
+ * Common check function for tsvector @@ tsquery
+ */
+
+extern bool TS_execute(QueryItem *curitem, void *checkval, bool calcnot,
+		   bool (*chkcond) (void *checkval, QueryOperand *val));
+
+/*
+ * Useful conversion macros
+ */
+#define TextPGetCString(t) DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(t)))
+#define CStringGetTextP(c) DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(c)))
+
+/*
+ * to_ts* - text transformation to tsvector, tsquery
+ */
+extern TSVector make_tsvector(ParsedText *prs);
+
+extern Datum to_tsvector_byid(PG_FUNCTION_ARGS);
+extern Datum to_tsvector(PG_FUNCTION_ARGS);
+extern Datum to_tsquery_byid(PG_FUNCTION_ARGS);
+extern Datum to_tsquery(PG_FUNCTION_ARGS);
+extern Datum plainto_tsquery_byid(PG_FUNCTION_ARGS);
+extern Datum plainto_tsquery(PG_FUNCTION_ARGS);
+
+/*
+ * GiST support function
+ */
+
+extern Datum gtsvector_compress(PG_FUNCTION_ARGS);
+extern Datum gtsvector_decompress(PG_FUNCTION_ARGS);
+extern Datum gtsvector_consistent(PG_FUNCTION_ARGS);
+extern Datum gtsvector_union(PG_FUNCTION_ARGS);
+extern Datum gtsvector_same(PG_FUNCTION_ARGS);
+extern Datum gtsvector_penalty(PG_FUNCTION_ARGS);
+extern Datum gtsvector_picksplit(PG_FUNCTION_ARGS);
+
+/*
+ * IO functions for pseudotype gtsvector
+ * used internally in tsvector GiST opclass
+ */
+extern Datum gtsvectorin(PG_FUNCTION_ARGS);
+extern Datum gtsvectorout(PG_FUNCTION_ARGS);
+
+/*
+ * GIN support function
+ */
+
+extern Datum gin_extract_tsvector(PG_FUNCTION_ARGS);
+extern Datum gin_extract_tsquery(PG_FUNCTION_ARGS);
+extern Datum gin_tsquery_consistent(PG_FUNCTION_ARGS);
+
+/*
+ * Possible strategy numbers for indexes
+ *	  TSearchStrategyNumber  - (tsvector|text) @@ tsquery
+ *	  TSearchWithClassStrategyNumber  - tsvector @@@ tsquery
+ */
+#define TSearchStrategyNumber			1
+#define TSearchWithClassStrategyNumber	2
+
+/*
+ * TSQuery Utilities
+ */
+extern QueryItem *clean_NOT(QueryItem *ptr, int4 *len);
+extern QueryItem *clean_fakeval(QueryItem *ptr, int4 *len);
+
+typedef struct QTNode
+{
+	QueryItem  *valnode;
+	uint32		flags;
+	int4		nchild;
+	char	   *word;
+	uint32		sign;
+	struct QTNode **child;
+} QTNode;
+
+/* bits in QTNode.flags */
+#define QTN_NEEDFREE	0x01
+#define QTN_NOCHANGE	0x02
+#define QTN_WORDFREE	0x04
+
+typedef uint64 TSQuerySign;
+
+#define TSQS_SIGLEN  (sizeof(TSQuerySign)*BITS_PER_BYTE)
+
+#define TSQuerySignGetDatum(X)		Int64GetDatum((int64) (X))
+#define DatumGetTSQuerySign(X)		((TSQuerySign) DatumGetInt64(X))
+#define PG_RETURN_TSQUERYSIGN(X)	return TSQuerySignGetDatum(X)
+#define PG_GETARG_TSQUERYSIGN(n)	DatumGetTSQuerySign(PG_GETARG_DATUM(n))
+
+
+extern QTNode *QT2QTN(QueryItem *in, char *operand);
+extern TSQuery QTN2QT(QTNode *in);
+extern void QTNFree(QTNode *in);
+extern void QTNSort(QTNode *in);
+extern void QTNTernary(QTNode *in);
+extern void QTNBinary(QTNode *in);
+extern int	QTNodeCompare(QTNode *an, QTNode *bn);
+extern QTNode *QTNCopy(QTNode *in);
+extern void QTNClearFlags(QTNode *in, uint32 flags);
+extern bool QTNEq(QTNode *a, QTNode *b);
+extern TSQuerySign makeTSQuerySign(TSQuery a);
+extern QTNode *findsubquery(QTNode *root, QTNode *ex, QTNode *subs,
+			 bool *isfind);
+
+/*
+ * TSQuery GiST support
+ */
+extern Datum gtsquery_compress(PG_FUNCTION_ARGS);
+extern Datum gtsquery_decompress(PG_FUNCTION_ARGS);
+extern Datum gtsquery_consistent(PG_FUNCTION_ARGS);
+extern Datum gtsquery_union(PG_FUNCTION_ARGS);
+extern Datum gtsquery_same(PG_FUNCTION_ARGS);
+extern Datum gtsquery_penalty(PG_FUNCTION_ARGS);
+extern Datum gtsquery_picksplit(PG_FUNCTION_ARGS);
+
+/*
+ * Parser interface to SQL
+ */
+extern Datum ts_token_type_byid(PG_FUNCTION_ARGS);
+extern Datum ts_token_type_byname(PG_FUNCTION_ARGS);
+extern Datum ts_parse_byid(PG_FUNCTION_ARGS);
+extern Datum ts_parse_byname(PG_FUNCTION_ARGS);
+
+/*
+ * Default word parser
+ */
+
+extern Datum prsd_start(PG_FUNCTION_ARGS);
+extern Datum prsd_nexttoken(PG_FUNCTION_ARGS);
+extern Datum prsd_end(PG_FUNCTION_ARGS);
+extern Datum prsd_headline(PG_FUNCTION_ARGS);
+extern Datum prsd_lextype(PG_FUNCTION_ARGS);
+
+/*
+ * Dictionary interface to SQL
+ */
+extern Datum ts_lexize(PG_FUNCTION_ARGS);
+
+/*
+ * Simple built-in dictionary
+ */
+extern Datum dsimple_init(PG_FUNCTION_ARGS);
+extern Datum dsimple_lexize(PG_FUNCTION_ARGS);
+
+/*
+ * Synonym built-in dictionary
+ */
+extern Datum dsynonym_init(PG_FUNCTION_ARGS);
+extern Datum dsynonym_lexize(PG_FUNCTION_ARGS);
+
+/*
+ * ISpell dictionary
+ */
+extern Datum dispell_init(PG_FUNCTION_ARGS);
+extern Datum dispell_lexize(PG_FUNCTION_ARGS);
+
+/*
+ * Thesaurus
+ */
+extern Datum thesaurus_init(PG_FUNCTION_ARGS);
+extern Datum thesaurus_lexize(PG_FUNCTION_ARGS);
+
+/*
+ * headline
+ */
+extern Datum ts_headline_byid_opt(PG_FUNCTION_ARGS);
+extern Datum ts_headline_byid(PG_FUNCTION_ARGS);
+extern Datum ts_headline(PG_FUNCTION_ARGS);
+extern Datum ts_headline_opt(PG_FUNCTION_ARGS);
+
+/*
+ * current cfg
+ */
+extern Datum get_current_ts_config(PG_FUNCTION_ARGS);
+
+#endif   /* _PG_TS_UTILS_H_ */
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 5251ad073276..2347b7730f16 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.100 2007/01/23 05:07:18 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.103 2008/01/01 19:45:59 momjian Exp $
  *
  * NOTES
  *	  An ACL array is simply an array of AclItems, representing the union
@@ -183,6 +183,8 @@ typedef enum AclObjectKind
 	ACL_KIND_OPFAMILY,			/* pg_opfamily */
 	ACL_KIND_CONVERSION,		/* pg_conversion */
 	ACL_KIND_TABLESPACE,		/* pg_tablespace */
+	ACL_KIND_TSDICTIONARY,		/* pg_ts_dict */
+	ACL_KIND_TSCONFIGURATION,	/* pg_ts_config */
 	ACL_KIND_FILESPACE,         /* pg_filespace */
 	ACL_KIND_EXTPROTOCOL,		/* pg_extprotocol */
 	MAX_ACL_KIND				/* MUST BE LAST */
@@ -282,6 +284,7 @@ extern bool pg_class_ownercheck(Oid class_oid, Oid roleid);
 extern bool pg_type_ownercheck(Oid type_oid, Oid roleid);
 extern bool pg_oper_ownercheck(Oid oper_oid, Oid roleid);
 extern bool pg_proc_ownercheck(Oid proc_oid, Oid roleid);
+extern bool pg_language_ownercheck(Oid lan_oid, Oid roleid);
 extern bool pg_namespace_ownercheck(Oid nsp_oid, Oid roleid);
 extern bool pg_tablespace_ownercheck(Oid spc_oid, Oid roleid);
 extern bool pg_filespace_ownercheck(Oid fs_oid, Oid roleid);
@@ -289,7 +292,8 @@ extern bool pg_opclass_ownercheck(Oid opc_oid, Oid roleid);
 extern bool pg_opfamily_ownercheck(Oid opf_oid, Oid roleid);
 extern bool pg_database_ownercheck(Oid db_oid, Oid roleid);
 extern bool pg_conversion_ownercheck(Oid conv_oid, Oid roleid);
-extern bool pg_foreign_server_ownercheck(Oid srv_oid, Oid roleid);
+extern bool pg_ts_dict_ownercheck(Oid dict_oid, Oid roleid);
+extern bool pg_ts_config_ownercheck(Oid cfg_oid, Oid roleid);
 extern bool pg_extprotocol_ownercheck(Oid ptc_oid, Oid roleid);
 
 #endif   /* ACL_H */
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index 7ee158fd746a..b3f3fc4acd3e 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -49,7 +49,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/array.h,v 1.62 2007/01/05 22:19:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/array.h,v 1.66 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -200,9 +200,6 @@ extern Datum array_dims(PG_FUNCTION_ARGS);
 extern Datum array_lower(PG_FUNCTION_ARGS);
 extern Datum array_upper(PG_FUNCTION_ARGS);
 extern Datum array_length(PG_FUNCTION_ARGS);
-extern Datum array_type_coerce(PG_FUNCTION_ARGS);
-extern Datum array_type_length_coerce(PG_FUNCTION_ARGS);
-extern Datum array_length_coerce(PG_FUNCTION_ARGS);
 extern Datum array_larger(PG_FUNCTION_ARGS);
 extern Datum array_smaller(PG_FUNCTION_ARGS);
 extern Datum generate_subscripts(PG_FUNCTION_ARGS);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index f481e0007a48..53f08d1c70e8 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -5,7 +5,7 @@
  *
  *
  * Portions Copyright (c) 2005-2010, Greenplum inc
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.336 2009/08/01 19:59:41 tgl Exp $
@@ -120,6 +120,25 @@ extern Datum char_text(PG_FUNCTION_ARGS);
 extern Datum domain_in(PG_FUNCTION_ARGS);
 extern Datum domain_recv(PG_FUNCTION_ARGS);
 
+/* enum.c */
+extern Datum enum_in(PG_FUNCTION_ARGS);
+extern Datum enum_out(PG_FUNCTION_ARGS);
+extern Datum enum_recv(PG_FUNCTION_ARGS);
+extern Datum enum_send(PG_FUNCTION_ARGS);
+extern Datum enum_lt(PG_FUNCTION_ARGS);
+extern Datum enum_le(PG_FUNCTION_ARGS);
+extern Datum enum_eq(PG_FUNCTION_ARGS);
+extern Datum enum_ne(PG_FUNCTION_ARGS);
+extern Datum enum_ge(PG_FUNCTION_ARGS);
+extern Datum enum_gt(PG_FUNCTION_ARGS);
+extern Datum enum_cmp(PG_FUNCTION_ARGS);
+extern Datum enum_smaller(PG_FUNCTION_ARGS);
+extern Datum enum_larger(PG_FUNCTION_ARGS);
+extern Datum enum_first(PG_FUNCTION_ARGS);
+extern Datum enum_last(PG_FUNCTION_ARGS);
+extern Datum enum_range_bounds(PG_FUNCTION_ARGS);
+extern Datum enum_range_all(PG_FUNCTION_ARGS);
+
 /* int.c */
 extern Datum int2in(PG_FUNCTION_ARGS);
 extern Datum int2out(PG_FUNCTION_ARGS);
@@ -136,12 +155,8 @@ extern Datum int4recv(PG_FUNCTION_ARGS);
 extern Datum int4send(PG_FUNCTION_ARGS);
 extern Datum i2toi4(PG_FUNCTION_ARGS);
 extern Datum i4toi2(PG_FUNCTION_ARGS);
-extern Datum int2_text(PG_FUNCTION_ARGS);
-extern Datum text_int2(PG_FUNCTION_ARGS);
 extern Datum int4_bool(PG_FUNCTION_ARGS);
 extern Datum bool_int4(PG_FUNCTION_ARGS);
-extern Datum int4_text(PG_FUNCTION_ARGS);
-extern Datum text_int4(PG_FUNCTION_ARGS);
 extern Datum int4eq(PG_FUNCTION_ARGS);
 extern Datum int4ne(PG_FUNCTION_ARGS);
 extern Datum int4lt(PG_FUNCTION_ARGS);
@@ -330,10 +345,6 @@ extern Datum i4tof(PG_FUNCTION_ARGS);
 extern Datum i2tof(PG_FUNCTION_ARGS);
 extern Datum ftoi4(PG_FUNCTION_ARGS);
 extern Datum ftoi2(PG_FUNCTION_ARGS);
-extern Datum text_float8(PG_FUNCTION_ARGS);
-extern Datum text_float4(PG_FUNCTION_ARGS);
-extern Datum float8_text(PG_FUNCTION_ARGS);
-extern Datum float4_text(PG_FUNCTION_ARGS);
 extern Datum dround(PG_FUNCTION_ARGS);
 extern Datum dceil(PG_FUNCTION_ARGS);
 extern Datum dfloor(PG_FUNCTION_ARGS);
@@ -447,10 +458,6 @@ extern Datum pg_sleep(PG_FUNCTION_ARGS);
 extern Datum pg_get_keywords(PG_FUNCTION_ARGS);
 extern Datum pg_typeof(PG_FUNCTION_ARGS);
 
-/* not_in.c */
-extern Datum int4notin(PG_FUNCTION_ARGS);
-extern Datum oidnotin(PG_FUNCTION_ARGS);
-
 /* oid.c */
 extern Datum oidin(PG_FUNCTION_ARGS);
 extern Datum oidout(PG_FUNCTION_ARGS);
@@ -464,8 +471,6 @@ extern Datum oidge(PG_FUNCTION_ARGS);
 extern Datum oidgt(PG_FUNCTION_ARGS);
 extern Datum oidlarger(PG_FUNCTION_ARGS);
 extern Datum oidsmaller(PG_FUNCTION_ARGS);
-extern Datum oid_text(PG_FUNCTION_ARGS);
-extern Datum text_oid(PG_FUNCTION_ARGS);
 extern Datum oidvectorin(PG_FUNCTION_ARGS);
 extern Datum oidvectorout(PG_FUNCTION_ARGS);
 extern Datum oidvectorrecv(PG_FUNCTION_ARGS);
@@ -489,6 +494,10 @@ extern Datum anyarray_in(PG_FUNCTION_ARGS);
 extern Datum anyarray_out(PG_FUNCTION_ARGS);
 extern Datum anyarray_recv(PG_FUNCTION_ARGS);
 extern Datum anyarray_send(PG_FUNCTION_ARGS);
+extern Datum anynonarray_in(PG_FUNCTION_ARGS);
+extern Datum anynonarray_out(PG_FUNCTION_ARGS);
+extern Datum anyenum_in(PG_FUNCTION_ARGS);
+extern Datum anyenum_out(PG_FUNCTION_ARGS);
 extern Datum void_in(PG_FUNCTION_ARGS);
 extern Datum void_out(PG_FUNCTION_ARGS);
 extern Datum trigger_in(PG_FUNCTION_ARGS);
@@ -526,6 +535,8 @@ extern Datum regexp_split_to_table_no_flags(PG_FUNCTION_ARGS);
 extern Datum regexp_split_to_array(PG_FUNCTION_ARGS);
 extern Datum regexp_split_to_array_no_flags(PG_FUNCTION_ARGS);
 extern bool regex_flavor_is_basic(void);
+extern char *regexp_fixed_prefix(text *text_re, bool case_insensitive,
+								 bool *exact);
 
 /* regproc.c */
 extern Datum regprocin(PG_FUNCTION_ARGS);
@@ -552,8 +563,16 @@ extern Datum regtypein(PG_FUNCTION_ARGS);
 extern Datum regtypeout(PG_FUNCTION_ARGS);
 extern Datum regtyperecv(PG_FUNCTION_ARGS);
 extern Datum regtypesend(PG_FUNCTION_ARGS);
+extern Datum regconfigin(PG_FUNCTION_ARGS);
+extern Datum regconfigout(PG_FUNCTION_ARGS);
+extern Datum regconfigrecv(PG_FUNCTION_ARGS);
+extern Datum regconfigsend(PG_FUNCTION_ARGS);
+extern Datum regdictionaryin(PG_FUNCTION_ARGS);
+extern Datum regdictionaryout(PG_FUNCTION_ARGS);
+extern Datum regdictionaryrecv(PG_FUNCTION_ARGS);
+extern Datum regdictionarysend(PG_FUNCTION_ARGS);
 extern Datum text_regclass(PG_FUNCTION_ARGS);
-extern List *stringToQualifiedNameList(const char *string, const char *caller);
+extern List *stringToQualifiedNameList(const char *string);
 extern char *format_procedure(Oid procedure_oid);
 extern char *format_operator(Oid operator_oid);
 
@@ -591,10 +610,8 @@ extern char *deparse_expression(Node *expr, List *dpcontext,
 extern char *deparse_expr_sweet(Node *expr, List *dpcontext,
 				   bool forceprefix, bool showimplicit);                /*CDB*/
 extern List *deparse_context_for(const char *aliasname, Oid relid);
-extern List *deparse_context_for_plan(int outer_varno, Node *outercontext,
-						 int inner_varno, Node *innercontext,
+extern List *deparse_context_for_plan(Node *outer_plan, Node *inner_plan,
 						 List *rtable);
-extern Node *deparse_context_for_subplan(const char *name, Node *subplan);
 extern const char *quote_literal_internal(const char *literal);
 extern const char *quote_identifier(const char *ident);
 extern char *quote_qualified_identifier(const char *qualifier,
@@ -704,6 +721,8 @@ extern Datum text_gt(PG_FUNCTION_ARGS);
 extern Datum text_ge(PG_FUNCTION_ARGS);
 extern Datum text_larger(PG_FUNCTION_ARGS);
 extern Datum text_smaller(PG_FUNCTION_ARGS);
+extern Datum text_pattern_eq(PG_FUNCTION_ARGS);
+extern Datum text_pattern_ne(PG_FUNCTION_ARGS);
 extern Datum text_pattern_lt(PG_FUNCTION_ARGS);
 extern Datum text_pattern_le(PG_FUNCTION_ARGS);
 extern Datum text_pattern_gt(PG_FUNCTION_ARGS);
@@ -858,8 +877,6 @@ extern Datum network_show(PG_FUNCTION_ARGS);
 extern Datum inet_abbrev(PG_FUNCTION_ARGS);
 extern Datum cidr_abbrev(PG_FUNCTION_ARGS);
 extern double convert_network_to_scalar(Datum value, Oid typid);
-extern Datum text_cidr(PG_FUNCTION_ARGS);
-extern Datum text_inet(PG_FUNCTION_ARGS);
 extern Datum inet_to_cidr(PG_FUNCTION_ARGS);
 extern Datum inet_set_masklen(PG_FUNCTION_ARGS);
 extern Datum cidr_set_masklen(PG_FUNCTION_ARGS);
@@ -890,8 +907,6 @@ extern Datum macaddr_ge(PG_FUNCTION_ARGS);
 extern Datum macaddr_gt(PG_FUNCTION_ARGS);
 extern Datum macaddr_ne(PG_FUNCTION_ARGS);
 extern Datum macaddr_trunc(PG_FUNCTION_ARGS);
-extern Datum macaddr_text(PG_FUNCTION_ARGS);
-extern Datum text_macaddr(PG_FUNCTION_ARGS);
 extern Datum hashmacaddr(PG_FUNCTION_ARGS);
 
 /* numeric.c */
@@ -901,7 +916,7 @@ extern Datum numeric_recv(PG_FUNCTION_ARGS);
 extern Datum numeric_send(PG_FUNCTION_ARGS);
 extern Datum numerictypmodin(PG_FUNCTION_ARGS);
 extern Datum numerictypmodout(PG_FUNCTION_ARGS);
-extern Datum numeric(PG_FUNCTION_ARGS);
+extern Datum numeric (PG_FUNCTION_ARGS);
 extern Datum numeric_abs(PG_FUNCTION_ARGS);
 extern Datum numeric_uminus(PG_FUNCTION_ARGS);
 extern Datum numeric_uplus(PG_FUNCTION_ARGS);
@@ -946,8 +961,6 @@ extern Datum numeric_float8(PG_FUNCTION_ARGS);
 extern Datum numeric_float8_no_overflow(PG_FUNCTION_ARGS);
 extern Datum float4_numeric(PG_FUNCTION_ARGS);
 extern Datum numeric_float4(PG_FUNCTION_ARGS);
-extern Datum text_numeric(PG_FUNCTION_ARGS);
-extern Datum numeric_text(PG_FUNCTION_ARGS);
 extern Datum numeric_accum(PG_FUNCTION_ARGS);
 extern Datum numeric_decum(PG_FUNCTION_ARGS);
 extern Datum int2_accum(PG_FUNCTION_ARGS);
@@ -983,6 +996,7 @@ extern Datum int8_avg(PG_FUNCTION_ARGS);
 extern Datum float8_avg(PG_FUNCTION_ARGS);
 extern Datum width_bucket_numeric(PG_FUNCTION_ARGS);
 extern Datum hash_numeric(PG_FUNCTION_ARGS);
+
 extern Datum numeric_amalg(PG_FUNCTION_ARGS); /* MPP */
 extern Datum int8_avg_amalg(PG_FUNCTION_ARGS); /* MPP */
 extern Datum float8_avg_amalg(PG_FUNCTION_ARGS); /* MPP */
@@ -1057,6 +1071,18 @@ extern Datum pg_advisory_unlock_int4(PG_FUNCTION_ARGS);
 extern Datum pg_advisory_unlock_shared_int4(PG_FUNCTION_ARGS);
 extern Datum pg_advisory_unlock_all(PG_FUNCTION_ARGS);
 
+/* txid.c */
+extern Datum txid_snapshot_in(PG_FUNCTION_ARGS);
+extern Datum txid_snapshot_out(PG_FUNCTION_ARGS);
+extern Datum txid_snapshot_recv(PG_FUNCTION_ARGS);
+extern Datum txid_snapshot_send(PG_FUNCTION_ARGS);
+extern Datum txid_current(PG_FUNCTION_ARGS);
+extern Datum txid_current_snapshot(PG_FUNCTION_ARGS);
+extern Datum txid_snapshot_xmin(PG_FUNCTION_ARGS);
+extern Datum txid_snapshot_xmax(PG_FUNCTION_ARGS);
+extern Datum txid_snapshot_xip(PG_FUNCTION_ARGS);
+extern Datum txid_visible_in_snapshot(PG_FUNCTION_ARGS);
+
 /* access/transam/twophase.c */
 extern Datum pg_prepared_xact(PG_FUNCTION_ARGS);
 
@@ -1079,8 +1105,15 @@ extern Datum uuid_gt(PG_FUNCTION_ARGS);
 extern Datum uuid_ne(PG_FUNCTION_ARGS);
 extern Datum uuid_cmp(PG_FUNCTION_ARGS);
 extern Datum uuid_hash(PG_FUNCTION_ARGS);
-extern Datum text_uuid(PG_FUNCTION_ARGS);
-extern Datum uuid_text(PG_FUNCTION_ARGS);
+
+/* access/transam/twophase.c */
+extern Datum pg_prepared_xact(PG_FUNCTION_ARGS);
+
+/* commands/prepare.c */
+extern Datum pg_prepared_statement(PG_FUNCTION_ARGS);
+
+/* utils/mmgr/portalmem.c */
+extern Datum pg_cursor(PG_FUNCTION_ARGS);
 
 /* tqual.c */
 extern Datum mpp_global_xid_map(PG_FUNCTION_ARGS);
diff --git a/src/include/utils/combocid.h b/src/include/utils/combocid.h
index e64ae213429b..7197b221557e 100644
--- a/src/include/utils/combocid.h
+++ b/src/include/utils/combocid.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL$
+ * $PostgreSQL: pgsql/src/include/utils/combocid.h,v 1.2 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/utils/date.h b/src/include/utils/date.h
index f28bd1e26e9c..a36fa821ffc6 100644
--- a/src/include/utils/date.h
+++ b/src/include/utils/date.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.36 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.39 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -107,6 +107,8 @@ static inline DateADT date_pl_days(DateADT date, int32 days)
 }
 
 /* date.c */
+extern double date2timestamp_no_overflow(DateADT dateVal);
+
 extern Datum date_in(PG_FUNCTION_ARGS);
 extern Datum date_out(PG_FUNCTION_ARGS);
 extern Datum date_recv(PG_FUNCTION_ARGS);
@@ -159,8 +161,6 @@ extern Datum date_timestamptz(PG_FUNCTION_ARGS);
 extern Datum timestamptz_date(PG_FUNCTION_ARGS);
 extern Datum datetime_timestamp(PG_FUNCTION_ARGS);
 extern Datum abstime_date(PG_FUNCTION_ARGS);
-extern Datum text_date(PG_FUNCTION_ARGS);
-extern Datum date_text(PG_FUNCTION_ARGS);
 
 extern Datum time_in(PG_FUNCTION_ARGS);
 extern Datum time_out(PG_FUNCTION_ARGS);
@@ -176,6 +176,7 @@ extern Datum time_le(PG_FUNCTION_ARGS);
 extern Datum time_gt(PG_FUNCTION_ARGS);
 extern Datum time_ge(PG_FUNCTION_ARGS);
 extern Datum time_cmp(PG_FUNCTION_ARGS);
+extern Datum time_hash(PG_FUNCTION_ARGS);
 extern Datum overlaps_time(PG_FUNCTION_ARGS);
 extern Datum time_larger(PG_FUNCTION_ARGS);
 extern Datum time_smaller(PG_FUNCTION_ARGS);
@@ -184,8 +185,6 @@ extern Datum timestamp_time(PG_FUNCTION_ARGS);
 extern Datum timestamptz_time(PG_FUNCTION_ARGS);
 extern Datum time_interval(PG_FUNCTION_ARGS);
 extern Datum interval_time(PG_FUNCTION_ARGS);
-extern Datum text_time(PG_FUNCTION_ARGS);
-extern Datum time_text(PG_FUNCTION_ARGS);
 extern Datum time_pl_interval(PG_FUNCTION_ARGS);
 extern Datum time_mi_interval(PG_FUNCTION_ARGS);
 extern Datum time_part(PG_FUNCTION_ARGS);
@@ -214,8 +213,6 @@ extern Datum timetz_time(PG_FUNCTION_ARGS);
 extern Datum time_timetz(PG_FUNCTION_ARGS);
 extern Datum timestamptz_timetz(PG_FUNCTION_ARGS);
 extern Datum datetimetz_timestamptz(PG_FUNCTION_ARGS);
-extern Datum text_timetz(PG_FUNCTION_ARGS);
-extern Datum timetz_text(PG_FUNCTION_ARGS);
 extern Datum timetz_part(PG_FUNCTION_ARGS);
 extern Datum timetz_zone(PG_FUNCTION_ARGS);
 extern Datum timetz_izone(PG_FUNCTION_ARGS);
diff --git a/src/include/utils/datumstreamblock.h b/src/include/utils/datumstreamblock.h
index 5964be52d607..daf84f3cd4ef 100755
--- a/src/include/utils/datumstreamblock.h
+++ b/src/include/utils/datumstreamblock.h
@@ -1198,14 +1198,14 @@ DatumStreamBlockRead_Get(DatumStreamBlockRead * dsr, Datum *datum, bool *null)
 		Assert(dsr->delta_item == false);
 
 		*datum = PointerGetDatum(dsr->datump);
-		Assert(VARATT_IS_SHORT_D(*datum) || !VARATT_IS_EXTERNAL_D(*datum));
+		Assert(VARATT_IS_SHORT(DatumGetPointer(*datum)) || !VARATT_IS_EXTERNAL(DatumGetPointer(*datum)));
 
 		/*
 		 * PERFORMANCE EXPERIMENT: Only do integrity and trace checking for
 		 * DEBUG builds...
 		 */
 #ifdef USE_ASSERT_CHECKING
-		varLen = VARSIZE_ANY_D(*datum);
+		varLen = VARSIZE_ANY(DatumGetPointer(*datum));
 
 		if (varLen < 0 || varLen > dsr->physical_data_size)
 		{
@@ -1471,7 +1471,7 @@ DatumStreamBlockRead_AdvanceOrig(DatumStreamBlockRead * dsr)
 			 */
 			if (*dsr->datump == 0)
 			{
-				dsr->datump = (uint8 *) att_align(dsr->datump, dsr->typeInfo.align);
+				dsr->datump = (uint8 *) att_align_nominal(dsr->datump, dsr->typeInfo.align);
 			}
 
 			/*
@@ -1928,7 +1928,7 @@ DatumStreamBlockRead_AdvanceDense(DatumStreamBlockRead * dsr)
 			 */
 			if (*dsr->datump == 0)
 			{
-				dsr->datump = (uint8 *) att_align(dsr->datump, dsr->typeInfo.align);
+				dsr->datump = (uint8 *) att_align_nominal(dsr->datump, dsr->typeInfo.align);
 			}
 
 			/*
diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h
index 2c9a15917523..c513142fdcf9 100644
--- a/src/include/utils/dynahash.h
+++ b/src/include/utils/dynahash.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/dynahash.h,v 1.18 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/dynahash.h,v 1.19 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index 43a47f52bb49..97abff458815 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/dynamic_loader.h,v 1.27 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/dynamic_loader.h,v 1.28 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 23d60e1f0220..5089f35e939b 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.83 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.90.2.2 2008/10/27 19:37:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -393,8 +393,8 @@ typedef struct ErrorData
 	bool		show_funcname;	/* true to force funcname inclusion */
     bool        omit_location;  /* GPDB: don't add filename:line# and stack trace */
     bool        fatal_return;   /* GPDB: true => return instead of proc_exit() */
-	bool		hide_stmt;		/* true to prevent STATEMENT: inclusion */
 	bool		send_alert;		/* GPDB: send e-mail alert and/or SNMP trap/inform */
+	bool		hide_stmt;		/* true to prevent STATEMENT: inclusion */
 	const char *filename;		/* __FILE__ of ereport() call */
 	int			lineno;			/* __LINE__ of ereport() call */
 	const char *funcname;		/* __func__ of ereport() call */
diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h
index e03c4cfe6643..ab96b5d5d39d 100644
--- a/src/include/utils/formatting.h
+++ b/src/include/utils/formatting.h
@@ -2,7 +2,7 @@
 /* -----------------------------------------------------------------------
  * formatting.h
  *
- * $PostgreSQL: pgsql/src/include/utils/formatting.h,v 1.17 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/formatting.h,v 1.18 2008/01/01 19:45:59 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index cd1a79ca12f8..feb2c5f8a315 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/geo_decls.h,v 1.52 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/geo_decls.h,v 1.54 2008/01/01 19:45:59 momjian Exp $
  *
  * NOTE
  *	  These routines do *not* use the float types from adt/.
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 2e6e0b1677a1..b0bee409f9e1 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -8,12 +8,13 @@
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
- * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.78 2007/01/09 21:31:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.90.2.1 2010/03/25 14:45:06 alvherre Exp $
  *--------------------------------------------------------------------
  */
 #ifndef GUC_H
 #define GUC_H
 
+#include "nodes/parsenodes.h"
 #include "tcop/dest.h"
 #include "utils/array.h"
 
@@ -106,6 +107,14 @@ typedef bool (*GucRealAssignHook) (double newval, bool doit, GucSource source);
 
 typedef const char *(*GucShowHook) (void);
 
+typedef enum
+{
+	/* Types of set_config_option actions */
+	GUC_ACTION_SET,				/* regular SET command */
+	GUC_ACTION_LOCAL,			/* SET LOCAL command */
+	GUC_ACTION_SAVE				/* function SET option */
+} GucAction;
+
 #define GUC_QUALIFIER_SEPARATOR '.'
 
 /* GUC lists for gp_guc_list_show().  (List of struct config_generic) */
@@ -290,7 +299,6 @@ extern int gp_max_partition_level;
 
 extern bool gp_temporary_files_filespace_repair;
 extern bool gp_perfmon_print_packet_info;
-extern bool gp_plpgsql_clear_cache_always;
 extern bool fts_diskio_check;
 
 /* Debug DTM Action */
@@ -590,23 +598,27 @@ extern void BeginReportingGUCOptions(void);
 extern void ParseLongOption(const char *string, char **name, char **value);
 extern bool set_config_option(const char *name, const char *value,
 				  GucContext context, GucSource source,
-				  bool isLocal, bool changeVal);
+				  GucAction action, bool changeVal);
 extern char *GetConfigOptionByName(const char *name, const char **varname);
 extern void GetConfigOptionByNum(int varnum, const char **values, bool *noshow);
 extern int	GetNumConfigOptions(void);
 
-extern void SetPGVariable(const char *name, List *args, bool is_local, bool gp_dispatch);
+extern void SetPGVariable(const char *name, List *args, bool is_local);
+extern void SetPGVariableOptDispatch(const char *name, List *args, bool is_local, bool gp_dispatch);
 extern void GetPGVariable(const char *name, DestReceiver *dest);
 extern TupleDesc GetPGVariableResultDesc(const char *name);
-extern void ResetPGVariable(const char *name);
 
-extern char *flatten_set_variable_args(const char *name, List *args);
+extern void ExecSetVariableStmt(VariableSetStmt *stmt);
+extern char *ExtractSetVariableArgs(VariableSetStmt *stmt);
 
-extern void ProcessGUCArray(ArrayType *array, GucSource source);
+extern void ProcessGUCArray(ArrayType *array,
+				GucContext context, GucSource source, GucAction action);
 extern ArrayType *GUCArrayAdd(ArrayType *array, const char *name, const char *value);
 extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
 extern ArrayType *GUCArrayReset(ArrayType *array);
 
+extern int	GUC_complaint_elevel(GucSource source);
+
 extern void pg_timezone_abbrev_initialize(void);
 
 extern int  gp_guc_list_show(struct StringInfoData    *buf,
@@ -631,6 +643,8 @@ extern void read_nondefault_variables(void);
 /* in commands/tablespace.c */
 extern const char *assign_default_tablespace(const char *newval,
 						  bool doit, GucSource source);
+extern const char *assign_temp_tablespaces(const char *newval,
+						bool doit, GucSource source);
 
 /* in utils/adt/regexp.c */
 extern const char *assign_regex_flavor(const char *value,
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 1ae8a66dfe80..eef511576d01 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 2006-2008, Greenplum inc
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
- *	  $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.29.2.2 2009/12/09 21:58:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.38.2.2 2009/12/09 21:58:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -120,18 +120,27 @@ enum config_group
 };
 
 /*
- * Stack entry for saving the state of a variable prior to the current
- * transaction
+ * Stack entry for saving the state a variable had prior to an uncommitted
+ * transactional change
  */
+typedef enum
+{
+	/* This is almost GucAction, but we need a fourth state for SET+LOCAL */
+	GUC_SAVE,					/* entry caused by function SET option */
+	GUC_SET,					/* entry caused by plain SET command */
+	GUC_LOCAL,					/* entry caused by SET LOCAL command */
+	GUC_SET_LOCAL				/* entry caused by SET then SET LOCAL */
+} GucStackState;
+
 typedef struct guc_stack
 {
 	struct guc_stack *prev;		/* previous stack item, if any */
-	int			nest_level;		/* nesting depth of cur transaction */
-	int			status;			/* previous status bits, see below */
-	GucSource	tentative_source;		/* source of the tentative_value */
-	GucSource	source;			/* source of the actual value */
-	union config_var_value tentative_val;		/* previous tentative val */
-	union config_var_value value;		/* previous actual value */
+	int			nest_level;		/* nesting depth at which we made entry */
+	GucStackState state;		/* see enum above */
+	GucSource	source;			/* source of the prior value */
+	union config_var_value prior;		/* previous value of variable */
+	union config_var_value masked;		/* SET value in a GUC_SET_LOCAL entry */
+	/* masked value's source must be PGC_S_SESSION, so no need to store it */
 } GucStack;
 
 /*
@@ -154,9 +163,8 @@ struct config_generic
 	enum config_type vartype;	/* type of variable (set only at startup) */
 	int			status;			/* status bits, see below */
 	GucSource	reset_source;	/* source of the reset_value */
-	GucSource	tentative_source;		/* source of the tentative_value */
 	GucSource	source;			/* source of the current actual value */
-	GucStack   *stack;			/* stacked outside-of-transaction states */
+	GucStack   *stack;			/* stacked prior values */
 };
 
 /* bit values in flags field */
@@ -171,7 +179,7 @@ struct config_generic
 #define GUC_SUPERUSER_ONLY		0x0100	/* show only to superusers */
 #define GUC_IS_NAME				0x0200	/* limit string to NAMEDATALEN-1 */
 
-#define GUC_UNIT_KB				0x0400	/* value is in 1 kB */
+#define GUC_UNIT_KB				0x0400	/* value is in kilobytes */
 #define GUC_UNIT_BLOCKS			0x0800	/* value is in blocks */
 #define GUC_UNIT_XBLOCKS		0x0C00	/* value is in xlog blocks */
 #define GUC_UNIT_MEMORY			0x0C00	/* mask for KB, BLOCKS, XBLOCKS */
@@ -188,9 +196,11 @@ struct config_generic
 #define GUC_DISALLOW_USER_SET  0x20000 /* Do not allow this GUC to be set by the user */
 
 /* bit values in status field */
-#define GUC_HAVE_TENTATIVE	0x0001		/* tentative value is defined */
-#define GUC_HAVE_LOCAL		0x0002		/* a SET LOCAL has been executed */
-#define GUC_HAVE_STACK		0x0004		/* we have stacked prior value(s) */
+#define GUC_IS_IN_FILE		0x0001		/* found it in config file */
+/*
+ * Caution: the GUC_IS_IN_FILE bit is transient state for ProcessConfigFile.
+ * Do not assume that its value represents useful information elsewhere.
+ */
 
 /* upper limit for GUC variables measured in kilobytes of memory */
 #if SIZEOF_SIZE_T > 4
@@ -204,58 +214,53 @@ struct config_generic
 struct config_bool
 {
 	struct config_generic gen;
-	/* these fields must be set correctly in initial value: */
-	/* (all but reset_val are constants) */
+	/* constant fields, must be set correctly in initial value: */
 	bool	   *variable;
-	bool		reset_val;
+	bool		boot_val;
 	GucBoolAssignHook assign_hook;
 	GucShowHook show_hook;
 	/* variable fields, initialized at runtime: */
-	bool		tentative_val;
+	bool		reset_val;
 };
 
 struct config_int
 {
 	struct config_generic gen;
-	/* these fields must be set correctly in initial value: */
-	/* (all but reset_val are constants) */
+	/* constant fields, must be set correctly in initial value: */
 	int		   *variable;
-	int			reset_val;
+	int			boot_val;
 	int			min;
 	int			max;
 	GucIntAssignHook assign_hook;
 	GucShowHook show_hook;
 	/* variable fields, initialized at runtime: */
-	int			tentative_val;
+	int			reset_val;
 };
 
 struct config_real
 {
 	struct config_generic gen;
-	/* these fields must be set correctly in initial value: */
-	/* (all but reset_val are constants) */
+	/* constant fields, must be set correctly in initial value: */
 	double	   *variable;
-	double		reset_val;
+	double		boot_val;
 	double		min;
 	double		max;
 	GucRealAssignHook assign_hook;
 	GucShowHook show_hook;
 	/* variable fields, initialized at runtime: */
-	double		tentative_val;
+	double		reset_val;
 };
 
 struct config_string
 {
 	struct config_generic gen;
-	/* these fields must be set correctly in initial value: */
-	/* (all are constants) */
+	/* constant fields, must be set correctly in initial value: */
 	char	  **variable;
 	const char *boot_val;
 	GucStringAssignHook assign_hook;
 	GucShowHook show_hook;
 	/* variable fields, initialized at runtime: */
 	char	   *reset_val;
-	char	   *tentative_val;
 };
 
 /* constant tables corresponding to enums above and in guc.h */
diff --git a/src/include/utils/help_config.h b/src/include/utils/help_config.h
index 3f7e77bf58d0..ba57755135ab 100644
--- a/src/include/utils/help_config.h
+++ b/src/include/utils/help_config.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
- *	  $PostgreSQL: pgsql/src/include/utils/help_config.h,v 1.9 2007/01/05 22:19:59 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/include/utils/help_config.h,v 1.10 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index 35c81bb56b44..0abc4677dd4c 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/hsearch.h,v 1.45.2.1 2007/04/26 23:24:57 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/hsearch.h,v 1.48 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h
index c1ead12360ef..f67932b15d2e 100644
--- a/src/include/utils/inet.h
+++ b/src/include/utils/inet.h
@@ -70,9 +70,11 @@ typedef struct macaddr
 /*
  * fmgr interface macros
  */
-#define DatumGetInetP(X)	((inet *) PG_DETOAST_DATUM_PACKED(X))
+#define DatumGetInetP(X)	((inet *) PG_DETOAST_DATUM(X))
+#define DatumGetInetPP(X)	((inet *) PG_DETOAST_DATUM_PACKED(X))
 #define InetPGetDatum(X)	PointerGetDatum(X)
 #define PG_GETARG_INET_P(n) DatumGetInetP(PG_GETARG_DATUM(n))
+#define PG_GETARG_INET_PP(n) DatumGetInetPP(PG_GETARG_DATUM(n))
 #define PG_RETURN_INET_P(x) return InetPGetDatum(x)
 /* macaddr is a fixed-length pass-by-reference datatype */
 #define DatumGetMacaddrP(X)    ((macaddr *) DatumGetPointer(X))
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index ddbb1a9012de..0f85f217399f 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/int8.h,v 1.46 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/int8.h,v 1.48 2008/01/01 19:45:59 momjian Exp $
  *
  * NOTES
  * These data types are supported on all 64-bit architectures, and may
@@ -122,9 +122,6 @@ extern Datum ftoi8(PG_FUNCTION_ARGS);
 extern Datum i8tooid(PG_FUNCTION_ARGS);
 extern Datum oidtoi8(PG_FUNCTION_ARGS);
 
-extern Datum int8_text(PG_FUNCTION_ARGS);
-extern Datum text_int8(PG_FUNCTION_ARGS);
-
 extern Datum generate_series_int8(PG_FUNCTION_ARGS);
 extern Datum generate_series_step_int8(PG_FUNCTION_ARGS);
 
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 5c123685fbca..f2f6b3e77d97 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/inval.h,v 1.40 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/inval.h,v 1.41.2.1 2008/03/13 18:00:39 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,8 @@
 #include "utils/rel.h"
 
 
-typedef void (*CacheCallbackFunction) (Datum arg, Oid relid);
+typedef void (*SyscacheCallbackFunction) (Datum arg, int cacheid, ItemPointer tuplePtr);
+typedef void (*RelcacheCallbackFunction) (Datum arg, Oid relid);
 
 
 extern void AcceptInvalidationMessages(void);
@@ -37,6 +38,10 @@ extern void PostPrepare_Inval(void);
 
 extern void CommandEndInvalidationMessages(void);
 
+extern void BeginNonTransactionalInvalidation(void);
+
+extern void EndNonTransactionalInvalidation(void);
+
 extern void CacheInvalidateHeapTuple(Relation relation, HeapTuple tuple);
 
 extern void CacheInvalidateRelcache(Relation relation);
@@ -46,10 +51,10 @@ extern void CacheInvalidateRelcacheByTuple(HeapTuple classTuple);
 extern void CacheInvalidateRelcacheByRelid(Oid relid);
 
 extern void CacheRegisterSyscacheCallback(int cacheid,
-							  CacheCallbackFunction func,
+							  SyscacheCallbackFunction func,
 							  Datum arg);
 
-extern void CacheRegisterRelcacheCallback(CacheCallbackFunction func,
+extern void CacheRegisterRelcacheCallback(RelcacheCallbackFunction func,
 							  Datum arg);
 
 extern void inval_twophase_postcommit(TransactionId xid, uint16 info,
diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h
index 0f9afe378e0b..5fcae86f177e 100644
--- a/src/include/utils/logtape.h
+++ b/src/include/utils/logtape.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/logtape.h,v 1.16 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/logtape.h,v 1.17 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index b98474fc8cd9..d8bc420edff3 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.117 2007/02/14 01:58:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.122 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,28 +43,28 @@ typedef enum CmpType
 extern bool op_in_opfamily(Oid opno, Oid opfamily);
 extern int	get_op_opfamily_strategy(Oid opno, Oid opfamily);
 extern void get_op_opfamily_properties(Oid opno, Oid opfamily,
-						  int *strategy,
-						  Oid *lefttype,
-						  Oid *righttype,
-						  bool *recheck);
-extern Oid	get_opfamily_member(Oid opfamily, Oid lefttype, Oid righttype,
-								int16 strategy);
+						   int *strategy,
+						   Oid *lefttype,
+						   Oid *righttype,
+						   bool *recheck);
+extern Oid get_opfamily_member(Oid opfamily, Oid lefttype, Oid righttype,
+					int16 strategy);
 extern bool get_ordering_op_properties(Oid opno,
 						   Oid *opfamily, Oid *opcintype, int16 *strategy);
 extern bool get_compare_function_for_ordering_op(Oid opno,
-												 Oid *cmpfunc, bool *reverse);
+									 Oid *cmpfunc, bool *reverse);
 extern Oid	get_equality_op_for_ordering_op(Oid opno);
 extern Oid	get_ordering_op_for_equality_op(Oid opno, bool use_lhs_type);
 extern List *get_mergejoin_opfamilies(Oid opno);
 extern bool get_compatible_hash_operators(Oid opno,
-										  Oid *lhs_opno, Oid *rhs_opno);
+							  Oid *lhs_opno, Oid *rhs_opno);
 extern bool get_op_hash_functions(Oid opno,
 					  RegProcedure *lhs_procno, RegProcedure *rhs_procno);
 extern void get_op_btree_interpretation(Oid opno,
 							List **opfamilies, List **opstrats);
 extern bool ops_in_same_btree_opfamily(Oid opno1, Oid opno2);
-extern Oid	get_opfamily_proc(Oid opfamily, Oid lefttype, Oid righttype,
-							  int16 procnum);
+extern Oid get_opfamily_proc(Oid opfamily, Oid lefttype, Oid righttype,
+				  int16 procnum);
 extern char *get_attname(Oid relid, AttrNumber attnum);
 extern char *get_relid_attribute_name(Oid relid, AttrNumber attnum);
 extern AttrNumber get_attnum(Oid relid, const char *attname);
@@ -138,6 +138,7 @@ extern char get_typstorage(Oid typid);
 extern Node *get_typdefault(Oid typid);
 extern char get_typtype(Oid typid);
 extern bool type_is_rowtype(Oid typid);
+extern bool type_is_enum(Oid typid);
 extern Oid	get_typ_typrelid(Oid typid);
 extern Oid	get_element_type(Oid typid);
 extern Oid	get_array_type(Oid typid);
@@ -201,7 +202,7 @@ extern List *find_all_inheritors(Oid parentrel);
 extern List *get_operator_opfamilies(Oid opno);
 extern List *get_index_opfamilies(Oid oidIndex);
 
-#define is_array_type(typid)  (get_element_type(typid) != InvalidOid)
+#define type_is_array(typid)  (get_element_type(typid) != InvalidOid)
 
 #define TypeIsToastable(typid)	(get_typstorage(typid) != 'p')
 
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index c0034044d56c..a8643d2787b5 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/memutils.h,v 1.61 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/memutils.h,v 1.64 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -191,10 +191,10 @@ extern PGDLLIMPORT MemoryContext TopTransactionContext;
 extern PGDLLIMPORT MemoryContext CurTransactionContext;
 extern PGDLLIMPORT MemoryContext MemoryAccountMemoryContext;
 
-/* These two are transient links to contexts owned by other objects: */
-extern PGDLLIMPORT MemoryContext QueryContext;
+/* This is a transient link to the active portal's memory context: */
 extern PGDLLIMPORT MemoryContext PortalContext;
 
+
 /*
  * Memory-context-type-independent functions in mcxt.c
  */
diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h
index 16df80f690be..98bebc004354 100644
--- a/src/include/utils/numeric.h
+++ b/src/include/utils/numeric.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1998-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/utils/numeric.h,v 1.23 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/numeric.h,v 1.26 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,8 +63,8 @@
 typedef struct NumericData
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int16		n_weight;		/* Weight of 1st digit	*/
 	uint16		n_sign_dscale;	/* Sign + display scale */
+	int16		n_weight;		/* Weight of 1st digit	*/
 	char		n_data[1];		/* Digits (really array of NumericDigit) */
 } NumericData;
 
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index ae1854619a05..7fed28087206 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -22,7 +22,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/palloc.h,v 1.36 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/palloc.h,v 1.38 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h
index e53b9d8541d9..bea6bb07cebe 100644
--- a/src/include/utils/pg_locale.h
+++ b/src/include/utils/pg_locale.h
@@ -41,7 +41,6 @@ extern const char *locale_time_assign(const char *value,
 				   bool doit, GucSource source);
 
 extern bool check_locale(int category, const char *locale);
-extern bool check_locale_encoding(const char *locale, int user_enc);
 extern char *pg_perm_setlocale(int category, const char *locale);
 
 extern bool lc_collate_is_c(void);
diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h
index e81ae0d5ca7f..1fb5464e46aa 100644
--- a/src/include/utils/pg_lzcompress.h
+++ b/src/include/utils/pg_lzcompress.h
@@ -60,6 +60,10 @@ typedef struct PGLZ_Header
  *		first_success_by	Abandon compression if we find no compressible
  *							data within the first this-many bytes.
  *
+ *		min_comp_rate		Minimum compression rate (0-99%) to require for
+ *							inputs smaller than force_input_size.  If not
+ *							achieved, the output will be uncompressed.
+ *
  *		match_size_good		The initial GOOD match size when starting history
  *							lookup. When looking up the history to find a
  *							match that could be expressed as a tag, the
diff --git a/src/include/utils/plancache.h b/src/include/utils/plancache.h
new file mode 100644
index 000000000000..6aadae49b670
--- /dev/null
+++ b/src/include/utils/plancache.h
@@ -0,0 +1,123 @@
+/*-------------------------------------------------------------------------
+ *
+ * plancache.h
+ *	  Plan cache definitions.
+ *
+ * See plancache.c for comments.
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.11.2.1 2008/09/15 23:37:49 tgl Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PLANCACHE_H
+#define PLANCACHE_H
+
+#include "access/tupdesc.h"
+#include "nodes/params.h"
+#include "nodes/parsenodes.h"
+
+/*
+ * CachedPlanSource represents the portion of a cached plan that persists
+ * across invalidation/replan cycles.  It stores a raw parse tree (required),
+ * the original source text (optional, but highly recommended to improve
+ * error reports), and adjunct data.
+ *
+ * Normally, both the struct itself and the subsidiary data live in the
+ * context denoted by the context field, while the linked-to CachedPlan, if
+ * any, has its own context.  Thus an invalidated CachedPlan can be dropped
+ * when no longer needed, and conversely a CachedPlanSource can be dropped
+ * without worrying whether any portals depend on particular instances of
+ * its plan.
+ *
+ * But for entries created by FastCreateCachedPlan, the CachedPlanSource
+ * and the initial version of the CachedPlan share the same memory context.
+ * In this case, we treat the memory context as belonging to the CachedPlan.
+ * The CachedPlanSource has an extra reference-counted link (orig_plan)
+ * to the CachedPlan, and the memory context goes away when the CachedPlan's
+ * reference count goes to zero.  This arrangement saves overhead for plans
+ * that aren't expected to live long enough to need replanning, while not
+ * losing any flexibility if a replan turns out to be necessary.
+ *
+ * Note: the string referenced by commandTag is not subsidiary storage;
+ * it is assumed to be a compile-time-constant string.	As with portals,
+ * commandTag shall be NULL if and only if the original query string (before
+ * rewriting) was an empty string.
+ */
+typedef struct CachedPlanSource
+{
+	Node	   *raw_parse_tree; /* output of raw_parser() */
+	char	   *query_string;	/* text of query, or NULL */
+	const char *commandTag;		/* command tag (a constant!), or NULL */
+	NodeTag		sourceTag;		/* GPDB: Original statement NodeTag */
+	Oid		   *param_types;	/* array of parameter type OIDs, or NULL */
+	int			num_params;		/* length of param_types array */
+	int			cursor_options; /* cursor options used for planning */
+	bool		fully_planned;	/* do we cache planner or rewriter output? */
+	bool		fixed_result;	/* disallow change in result tupdesc? */
+	struct OverrideSearchPath *search_path;		/* saved search_path */
+	int			generation;		/* counter, starting at 1, for replans */
+	TupleDesc	resultDesc;		/* result type; NULL = doesn't return tuples */
+	struct CachedPlan *plan;	/* link to plan, or NULL if not valid */
+	MemoryContext context;		/* context containing this CachedPlanSource */
+	struct CachedPlan *orig_plan;		/* link to plan owning my context */
+} CachedPlanSource;
+
+/*
+ * CachedPlan represents the portion of a cached plan that is discarded when
+ * invalidation occurs.  The reference count includes both the link(s) from the
+ * parent CachedPlanSource, and any active plan executions, so the plan can be
+ * discarded exactly when refcount goes to zero.  Both the struct itself and
+ * the subsidiary data live in the context denoted by the context field.
+ * This makes it easy to free a no-longer-needed cached plan.
+ */
+typedef struct CachedPlan
+{
+	List	   *stmt_list;		/* list of statement or Query nodes */
+	bool		fully_planned;	/* do we cache planner or rewriter output? */
+	bool		dead;			/* if true, do not use */
+	TransactionId saved_xmin;	/* if valid, replan when TransactionXmin
+								 * changes from this value */
+	int			refcount;		/* count of live references to this struct */
+	int			generation;		/* counter, starting at 1, for replans */
+	MemoryContext context;		/* context containing this CachedPlan */
+	/* These fields are used only in the not-fully-planned case: */
+	List	   *relationOids;	/* OIDs of relations the stmts depend on */
+	List	   *invalItems;		/* other dependencies, as PlanInvalItems */
+} CachedPlan;
+
+
+extern void InitPlanCache(void);
+extern CachedPlanSource *CreateCachedPlan(Node *raw_parse_tree,
+				 const char *query_string,
+				 const char *commandTag,
+				 Oid *param_types,
+				 int num_params,
+				 int cursor_options,
+				 List *stmt_list,
+				 bool fully_planned,
+				 bool fixed_result);
+extern CachedPlanSource *FastCreateCachedPlan(Node *raw_parse_tree,
+					 char *query_string,
+					 const char *commandTag,
+					 Oid *param_types,
+					 int num_params,
+					 int cursor_options,
+					 List *stmt_list,
+					 bool fully_planned,
+					 bool fixed_result,
+					 MemoryContext context);
+extern void DropCachedPlan(CachedPlanSource *plansource);
+extern CachedPlan *RevalidateCachedPlan(CachedPlanSource *plansource,
+					 bool useResOwner);
+extern CachedPlan *RevalidateCachedPlanWithParams(CachedPlanSource *plansource,
+							   bool useResOwner, ParamListInfo boundParams, IntoClause *intoClause);
+extern void ReleaseCachedPlan(CachedPlan *plan, bool useResOwner);
+extern bool CachedPlanIsValid(CachedPlanSource *plansource);
+extern TupleDesc PlanCacheComputeResultDesc(List *stmt_list);
+
+extern void ResetPlanCache(void);
+
+#endif   /* PLANCACHE_H */
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index b062a39f7ef5..5a944ece4f4d 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.72 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.78.2.1 2010/07/05 09:27:31 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -95,7 +95,8 @@ typedef enum PortalStrategy
  */
 typedef enum PortalStatus
 {
-	PORTAL_NEW = 0,				/* in process of creation */
+	PORTAL_NEW = 0,				/* freshly created */
+	PORTAL_DEFINED,				/* PortalDefineQuery done */
 	PORTAL_READY,				/* PortalStart complete, can run it */
 	PORTAL_QUEUE, 				/* portal is queued (cannot delete it) */
 	PORTAL_ACTIVE,				/* portal is running (can't delete it) */
@@ -135,16 +136,8 @@ typedef struct PortalData
 	/* The query or queries the portal will execute */
 	const char *sourceText;		/* text of query (as of PlannedStmt, never NULL) */
 	const char *commandTag;		/* command tag for original query */
-	List	   *stmts;			/* PlannedStmts and/or utility Querys */
-	MemoryContext queryContext; /* where the parse trees live */
-
-	/*
-	 * Note: queryContext effectively identifies which prepared statement the
-	 * portal depends on, if any.  The queryContext is *not* owned by the
-	 * portal and is not to be deleted by portal destruction.  (But for a
-	 * cursor it is the same as "heap", and that context is deleted by portal
-	 * destruction.)  The plan trees may be in either queryContext or heap.
-	 */
+	List	   *stmts;			/* PlannedStmts and/or utility statements */
+	CachedPlan *cplan;			/* CachedPlan, if stmts are from one */
 
 	ParamListInfo portalParams; /* params to pass to query */
 
@@ -158,6 +151,7 @@ typedef struct PortalData
 				 * in an extreme case when a portal receives a SIGTERM just
 				 * after being granted the resource lock, the holding ResLock
 				 * is not set but it is indeed holding the ResLock */
+	bool		portalPinned;	/* a pinned portal can't be dropped */
 
 	/* If not NULL, Executor is active; call ExecutorEnd eventually: */
 	QueryDesc  *queryDesc;		/* info needed for executor invocation */
@@ -230,8 +224,9 @@ extern void AtSubAbort_Portals(SubTransactionId mySubid,
 extern void AtSubCleanup_Portals(SubTransactionId mySubid);
 extern Portal CreatePortal(const char *name, bool allowDup, bool dupSilent);
 extern Portal CreateNewPortal(void);
+extern void PinPortal(Portal portal);
+extern void UnpinPortal(Portal portal);
 extern void PortalDrop(Portal portal, bool isTopCommit);
-extern void DropDependentPortals(MemoryContext queryContext);
 extern Portal GetPortalByName(const char *name);
 extern void PortalDefineQuery(Portal portal,
 				  const char *prepStmtName,
@@ -239,11 +234,10 @@ extern void PortalDefineQuery(Portal portal,
 				  NodeTag	  sourceTag, /* GPDB */
 				  const char *commandTag,
 				  List *stmts,
-//				  List *parseTrees,
-//				  List *planTrees,
-				  MemoryContext queryContext);
+				  CachedPlan *cplan);
 extern Node *PortalListGetPrimaryStmt(List *stmts);
 extern void PortalCreateHoldStore(Portal portal);
+extern void PortalHashTableDeleteAll(void);
 extern void AtExitCleanup_ResPortals(void);
 extern void TotalResPortalIncrements(int pid, Oid queueid,
 									 Cost *totalIncrements, int *num);
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index e6433946d121..9c1d35716de0 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.100 2007/03/29 00:15:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.104 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,7 @@ typedef struct Trigger
 	char	   *tgname;
 	Oid			tgfoid;
 	int16		tgtype;
-	bool		tgenabled;
+	char		tgenabled;
 	bool		tgisconstraint;
 	Oid			tgconstrrelid;
 	Oid			tgconstraint;
@@ -145,8 +145,8 @@ typedef struct RelationData
 	char		rd_indexvalid;	/* state of rd_indexlist: 0 = not valid, 1 =
 								 * valid, 2 = temporarily forced */
 	SubTransactionId rd_createSubid;	/* rel was created in current xact */
-	SubTransactionId rd_newRelfilenodeSubid;	/* new relfilenode assigned
-												 * in current xact */
+	SubTransactionId rd_newRelfilenodeSubid;	/* new relfilenode assigned in
+												 * current xact */
 
 	/*
 	 * Debugging information, Values from CREATE TABLE, if present.
@@ -161,14 +161,15 @@ typedef struct RelationData
 	 * survived into; or zero if the rel was not created in the current top
 	 * transaction.  This should be relied on only for optimization purposes;
 	 * it is possible for new-ness to be "forgotten" (eg, after CLUSTER).
-	 * Likewise, rd_newRelfilenodeSubid is the ID of the highest subtransaction
-	 * the relfilenode change has survived into, or zero if not changed in
-	 * the current transaction (or we have forgotten changing it).
+	 * Likewise, rd_newRelfilenodeSubid is the ID of the highest
+	 * subtransaction the relfilenode change has survived into, or zero if not
+	 * changed in the current transaction (or we have forgotten changing it).
 	 */
 	Form_pg_class rd_rel;		/* RELATION tuple */
 	TupleDesc	rd_att;			/* tuple descriptor */
 	Oid			rd_id;			/* relation's object id */
 	List	   *rd_indexlist;	/* list of OIDs of indexes on relation */
+	Bitmapset  *rd_indexattr;	/* identifies columns used in indexes */
 	Oid			rd_oidindex;	/* OID of unique index on OID, if any */
 	LockInfoData rd_lockInfo;	/* lock mgr's info for locking relation */
 	RuleLock   *rd_rules;		/* rewrite rules */
@@ -196,8 +197,8 @@ typedef struct RelationData
 	 *
 	 * Note: only default operators and support procs for each opclass are
 	 * cached, namely those with lefttype and righttype equal to the opclass's
-	 * opcintype.  The arrays are indexed by strategy or support number,
-	 * which is a sufficient identifier given that restriction.
+	 * opcintype.  The arrays are indexed by strategy or support number, which
+	 * is a sufficient identifier given that restriction.
 	 *
 	 * Note: rd_amcache is available for index AMs to cache private data about
 	 * an index.  This must be just a cache since it may get reset at any time
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 1d7b4b110465..12e0a02eaea8 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/relcache.h,v 1.59 2007/03/29 00:15:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/relcache.h,v 1.61 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,6 @@
 #include "nodes/pg_list.h"
 #include "catalog/pg_class.h"
 
-
-struct SysScanDescData; /* defined in access/genam.h */
-
 typedef struct RelationData *Relation;
 
 /* ----------------
@@ -35,6 +32,8 @@ typedef struct RelationData *Relation;
  */
 typedef Relation *RelationPtr;
 
+struct SysScanDescData; /* defined in access/genam.h */
+
 /*
  * Routines to open (lookup) and close a relcache entry
  */
@@ -49,6 +48,7 @@ extern List *RelationGetIndexList(Relation relation);
 extern Oid	RelationGetOidIndex(Relation relation);
 extern List *RelationGetIndexExpressions(Relation relation);
 extern List *RelationGetIndexPredicate(Relation relation);
+extern Bitmapset *RelationGetIndexAttrBitmap(Relation relation);
 
 extern void RelationSetIndexList(Relation relation,
 					 List *indexIds, Oid oidIndex);
@@ -92,7 +92,8 @@ extern void RelationCacheMarkNewRelfilenode(Relation rel);
  * Routines to help manage rebuilding of relcache init file
  */
 extern bool RelationIdIsInInitFile(Oid relationId);
-extern void RelationCacheInitFileInvalidate(bool beforeSend);
+extern void RelationCacheInitFilePreInvalidate(void);
+extern void RelationCacheInitFilePostInvalidate(void);
 extern void RelationCacheInitFileRemove(void);
 
 extern void IndexSupportInitialize(oidvector *indclass,
diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h
index 74bdd889cd31..f804e32d610c 100644
--- a/src/include/utils/resowner.h
+++ b/src/include/utils/resowner.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.10 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.15.2.1 2009/12/03 11:03:44 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,9 @@
 #define RESOWNER_H
 
 #include "storage/buf.h"
+#include "storage/fd.h"
 #include "utils/catcache.h"
+#include "utils/plancache.h"
 
 
 /*
@@ -106,6 +108,13 @@ extern void ResourceOwnerRememberRelationRef(ResourceOwner owner,
 extern void ResourceOwnerForgetRelationRef(ResourceOwner owner,
 							   Relation rel);
 
+/* support for plancache refcount management */
+extern void ResourceOwnerEnlargePlanCacheRefs(ResourceOwner owner);
+extern void ResourceOwnerRememberPlanCacheRef(ResourceOwner owner,
+								  CachedPlan *plan);
+extern void ResourceOwnerForgetPlanCacheRef(ResourceOwner owner,
+								CachedPlan *plan);
+
 /* support for tupledesc refcount management */
 extern void ResourceOwnerEnlargeTupleDescs(ResourceOwner owner);
 extern void ResourceOwnerRememberTupleDesc(ResourceOwner owner,
@@ -113,4 +122,11 @@ extern void ResourceOwnerRememberTupleDesc(ResourceOwner owner,
 extern void ResourceOwnerForgetTupleDesc(ResourceOwner owner,
 							 TupleDesc tupdesc);
 
+/* support for temporary file management */
+extern void ResourceOwnerEnlargeFiles(ResourceOwner owner);
+extern void ResourceOwnerRememberFile(ResourceOwner owner,
+						  File file);
+extern void ResourceOwnerForgetFile(ResourceOwner owner,
+						File file);
+
 #endif   /* RESOWNER_H */
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
index dd7eb88332bb..18c3d5a4ef2a 100644
--- a/src/include/utils/selfuncs.h
+++ b/src/include/utils/selfuncs.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/selfuncs.h,v 1.39 2007/01/22 20:00:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/selfuncs.h,v 1.43 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -119,7 +119,7 @@ extern double convert_timevalue_to_scalar(Datum value, Oid typid);
 extern Pattern_Prefix_Status pattern_fixed_prefix(Const *patt,
 					 Pattern_Type ptype,
 					 Const **prefix,
-					 Const **rest);
+					 Selectivity *rest_selec);
 extern Const *make_greater_string(const Const *str_const, FmgrInfo *ltproc);
 
 extern Datum eqsel(PG_FUNCTION_ARGS);
@@ -163,8 +163,8 @@ extern Selectivity rowcomparesel(PlannerInfo *root,
 
 extern void mergejoinscansel(PlannerInfo *root, Node *clause,
 				 Oid opfamily, int strategy, bool nulls_first,
-				 Selectivity *leftscan,
-				 Selectivity *rightscan);
+				 Selectivity *leftstart, Selectivity *leftend,
+				 Selectivity *rightstart, Selectivity *rightend);
 
 extern double estimate_num_groups(PlannerInfo *root, List *groupExprs,
 					double input_rows);
diff --git a/src/include/utils/sharedsnapshot.h b/src/include/utils/sharedsnapshot.h
index 49d26d6d5771..f6223e0cfa34 100644
--- a/src/include/utils/sharedsnapshot.h
+++ b/src/include/utils/sharedsnapshot.h
@@ -49,4 +49,6 @@ extern void lookupSharedSnapshot(char *lookerDescription, char *creatorDescripti
 extern void dumpSharedLocalSnapshot_forCursor(void);
 extern void readSharedLocalSnapshot_forCursor(Snapshot snapshot);
 
+extern void AtEOXact_SharedSnapshot(void);
+
 #endif   /* SHAREDSNAPSHOT_H */
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 7b44f953a998..00fe297f67a4 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -54,6 +54,8 @@ enum SysCacheIdentifier
 	CONSTROID,
 	CONVOID,
 	DATABASEOID,
+	ENUMOID,
+	ENUMTYPOIDNAME,
 	INDEXRELID,
 	LANGNAME,
 	LANGOID,
@@ -71,9 +73,18 @@ enum SysCacheIdentifier
 	RELOID,
 	RULERELNAME,
 	STATRELATT,
+	TSCONFIGMAP,
+	TSCONFIGNAMENSP,
+	TSCONFIGOID,
+	TSDICTNAMENSP,
+	TSDICTOID,
+	TSPARSERNAMENSP,
+	TSPARSEROID,
+	TSTEMPLATENAMENSP,
+	TSTEMPLATEOID,
 	TYPENAMENSP,
 	TYPEOID,
-	WINFNOID = 38
+	WINFNOID = 49
 };
 /* TIDYCAT_END_CODEGEN */
 
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index c4c0becaa659..161da1e456db 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.67 2007/02/16 03:39:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.74 2008/01/23 21:26:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -100,6 +100,16 @@ typedef struct
 #define USECS_PER_SEC	INT64CONST(1000000)
 #endif
 
+/*
+ * We allow numeric timezone offsets up to 15:59:59 either way from Greenwich.
+ * Currently, the record holders for wackiest offsets in actual use are zones
+ * Asia/Manila, at -15:56:00 until 1844, and America/Metlakatla, at +15:13:42
+ * until 1867.  If we were to reject such values we would fail to dump and
+ * restore old timestamptz values with these zone settings.
+ */
+#define MAX_TZDISP_HOUR		15				/* maximum allowed hour part */
+#define TZDISP_LIMIT		((MAX_TZDISP_HOUR + 1) * SECS_PER_HOUR)
+
 /*
  * Macros for fmgr-callable functions.
  *
@@ -267,6 +277,7 @@ extern Datum interval_justify_days(PG_FUNCTION_ARGS);
 extern float8 interval_li_fraction(Interval *x, Interval *x0, Interval *x1, 
 								   bool *eq_bounds, bool *eq_abscissas);
 extern Interval *interval_li_value(float8 f, Interval *y0, Interval *y1);
+
 extern Datum timestamp_trunc(PG_FUNCTION_ARGS);
 extern Datum interval_trunc(PG_FUNCTION_ARGS);
 extern Datum timestamp_part(PG_FUNCTION_ARGS);
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index a30c541fc52a..9efb707e1b13 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.65 2007/01/05 22:19:59 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.71 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,23 +30,32 @@
 #define MAX_XIDBUF_INIT_PAGES 16
 
 /*
- * "Regular" snapshots are pointers to a SnapshotData structure.
- *
- * We also have some "special" snapshot values that have fixed meanings
- * and don't need any backing SnapshotData.  These are encoded by small
- * integer values, which of course is a gross violation of ANSI C, but
- * it works fine on all known platforms.
- *
- * SnapshotDirty is an even more special case: its semantics are fixed,
- * but there is a backing SnapshotData struct for it.  That struct is
- * actually used as *output* data from tqual.c, not input into it.
- * (But hey, SnapshotDirty ought to have a dirty implementation, no? ;-))
+ * We use SnapshotData structures to represent both "regular" (MVCC)
+ * snapshots and "special" snapshots that have non-MVCC semantics.
+ * The specific semantics of a snapshot are encoded by the "satisfies"
+ * function.
  */
+typedef struct SnapshotData *Snapshot;
+
+typedef bool (*SnapshotSatisfiesFunc) (Relation relation, HeapTupleHeader tuple,
+										   Snapshot snapshot, Buffer buffer);
 
 typedef struct SnapshotData
 {
-	TransactionId xmin;			/* XID < xmin are visible to me */
-	TransactionId xmax;			/* XID >= xmax are invisible to me */
+	SnapshotSatisfiesFunc satisfies;	/* tuple test function */
+
+	/*
+	 * The remaining fields are used only for MVCC snapshots, and are normally
+	 * just zeroes in special snapshots.  (But xmin and xmax are used
+	 * specially by HeapTupleSatisfiesDirty.)
+	 *
+	 * An MVCC snapshot can never see the effects of XIDs >= xmax. It can see
+	 * the effects of all older XIDs except those listed in the snapshot. xmin
+	 * is stored as an optimization to avoid needing to search the XID arrays
+	 * for most tuples.
+	 */
+	TransactionId xmin;			/* all XID < xmin are visible to me */
+	TransactionId xmax;			/* all XID >= xmax are invisible to me */
 	uint32		xcnt;			/* # of xact ids in xip[] */
 	TransactionId *xip;			/* array of xact IDs in progress */
 	/* note: all ids in xip[] satisfy xmin <= xip[i] < xmax */
@@ -69,24 +78,30 @@ typedef struct SnapshotData
 								 */
 } SnapshotData;
 
-typedef SnapshotData *Snapshot;
+#define InvalidSnapshot		((Snapshot) NULL)
 
-/* Special snapshot values: */
-#define InvalidSnapshot				((Snapshot) 0x0)	/* same as NULL */
-#define SnapshotNow					((Snapshot) 0x1)
-#define SnapshotSelf				((Snapshot) 0x2)
-#define SnapshotAny					((Snapshot) 0x3)
-#define SnapshotToast				((Snapshot) 0x4)
+/* Static variables representing various special snapshot semantics */
+extern PGDLLIMPORT SnapshotData SnapshotNowData;
+extern PGDLLIMPORT SnapshotData SnapshotSelfData;
+extern PGDLLIMPORT SnapshotData SnapshotAnyData;
+extern PGDLLIMPORT SnapshotData SnapshotToastData;
 
-extern PGDLLIMPORT Snapshot SnapshotDirty;
+#define SnapshotNow			(&SnapshotNowData)
+#define SnapshotSelf		(&SnapshotSelfData)
+#define SnapshotAny			(&SnapshotAnyData)
+#define SnapshotToast		(&SnapshotToastData)
+
+/*
+ * We don't provide a static SnapshotDirty variable because it would be
+ * non-reentrant.  Instead, users of that snapshot type should declare a
+ * local variable of type SnapshotData, and initialize it with this macro.
+ */
+#define InitDirtySnapshot(snapshotdata)  \
+	((snapshotdata).satisfies = HeapTupleSatisfiesDirty)
 
 /* This macro encodes the knowledge of which snapshots are MVCC-safe */
 #define IsMVCCSnapshot(snapshot)  \
-	((snapshot) != SnapshotNow && \
-	 (snapshot) != SnapshotSelf && \
-	 (snapshot) != SnapshotAny && \
-	 (snapshot) != SnapshotToast && \
-	 (snapshot) != SnapshotDirty)
+	((snapshot)->satisfies == HeapTupleSatisfiesMVCC)
 
 
 extern PGDLLIMPORT Snapshot SerializableSnapshot;
@@ -104,34 +119,14 @@ extern TransactionId RecentGlobalXmin;
  * Notes:
  *	Assumes heap tuple is valid.
  *	Beware of multiple evaluations of snapshot argument.
- *	Hint bits in the HeapTuple's t_infomask may be updated as a side effect.
+ *	Hint bits in the HeapTuple's t_infomask may be updated as a side effect;
+ *	if so, the indicated buffer is marked dirty.
  *
  *   GP: The added relation parameter helps us decide if we are going to set tuple hint
  *   bits.  If it is null, we ignore the gp_disable_tuple_hints GUC.
- *
  */
-#define HeapTupleSatisfiesVisibility(relation, tuple, snapshot, buffer) \
-((snapshot) == SnapshotNow ? \
-	HeapTupleSatisfiesNow(relation, (tuple)->t_data, buffer) \
-: \
-	((snapshot) == SnapshotSelf ? \
-		HeapTupleSatisfiesItself(relation, (tuple)->t_data, buffer) \
-	: \
-		((snapshot) == SnapshotAny ? \
-			true \
-		: \
-			((snapshot) == SnapshotToast ? \
-				HeapTupleSatisfiesToast(relation, (tuple)->t_data, buffer) \
-			: \
-				((snapshot) == SnapshotDirty ? \
-					HeapTupleSatisfiesDirty(relation, (tuple)->t_data, buffer) \
-				: \
-					HeapTupleSatisfiesSnapshot(relation, (tuple)->t_data, snapshot, buffer) \
-				) \
-			) \
-		) \
-	) \
-)
+#define HeapTupleSatisfiesVisibility(rel, tuple, snapshot, buffer)	\
+	((*(snapshot)->satisfies) (rel, (tuple)->t_data, snapshot, buffer))
 
 /* Result codes for HeapTupleSatisfiesUpdate */
 typedef enum
@@ -190,17 +185,30 @@ typedef struct TupleVisibilitySummary
 	TupleVisibilityStatus		visibilityStatus;
 } TupleVisibilitySummary;
 
-extern bool HeapTupleSatisfiesItself(Relation relation, HeapTupleHeader tuple, Buffer buffer);
-extern bool HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple, Buffer buffer);
-extern bool HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple, Buffer buffer);
-extern bool HeapTupleSatisfiesToast(Relation relation, HeapTupleHeader tuple, Buffer buffer);
-extern bool HeapTupleSatisfiesSnapshot(Relation relation, HeapTupleHeader tuple,
-						   Snapshot snapshot, Buffer buffer);
+
+/* These are the "satisfies" test routines for the various snapshot types */
+extern bool HeapTupleSatisfiesMVCC(Relation relation, HeapTupleHeader tuple,
+					   Snapshot snapshot, Buffer buffer);
+extern bool HeapTupleSatisfiesNow(Relation relation, HeapTupleHeader tuple,
+					  Snapshot snapshot, Buffer buffer);
+extern bool HeapTupleSatisfiesSelf(Relation relation, HeapTupleHeader tuple,
+					   Snapshot snapshot, Buffer buffer);
+extern bool HeapTupleSatisfiesAny(Relation relation, HeapTupleHeader tuple,
+					  Snapshot snapshot, Buffer buffer);
+extern bool HeapTupleSatisfiesToast(Relation relation, HeapTupleHeader tuple,
+						Snapshot snapshot, Buffer buffer);
+extern bool HeapTupleSatisfiesDirty(Relation relation, HeapTupleHeader tuple,
+						Snapshot snapshot, Buffer buffer);
+
+/* Special "satisfies" routines with different APIs */
 extern HTSU_Result HeapTupleSatisfiesUpdate(Relation relation, HeapTupleHeader tuple,
 						 CommandId curcid, Buffer buffer);
-extern HTSV_Result HeapTupleSatisfiesVacuum(HeapTupleHeader tuple,
+extern HTSV_Result HeapTupleSatisfiesVacuum(Relation relation, HeapTupleHeader tuple,
 						 TransactionId OldestXmin, Buffer buffer);
 
+extern void HeapTupleSetHintBits(HeapTupleHeader tuple, Buffer buffer, Relation rel,
+					 uint16 infomask, TransactionId xid);
+
 extern Snapshot GetTransactionSnapshot(void);
 extern Snapshot GetLatestSnapshot(void);
 extern Snapshot CopySnapshot(Snapshot snapshot);
diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h
index bafe109989fa..fca655a61927 100644
--- a/src/include/utils/tuplesort.h
+++ b/src/include/utils/tuplesort.h
@@ -14,7 +14,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.25 2007/01/09 02:14:16 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.28 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,6 +105,9 @@ extern void cdb_tuplesort_init_mk(Tuplesortstate_mk *state,
 							   int sort_flags,
 							   int64 maxdistinct);
 
+extern void tuplesort_set_bound(Tuplesortstate *state, int64 bound);
+extern void tuplesort_set_bound_mk(Tuplesortstate_mk *state, int64 bound);
+
 extern void tuplesort_puttupleslot(Tuplesortstate *state, TupleTableSlot *slot);
 extern void tuplesort_puttupleslot_mk(Tuplesortstate_mk *state, TupleTableSlot *slot);
 
@@ -137,6 +140,9 @@ extern void tuplesort_flush_mk(Tuplesortstate_mk *state);
 extern void tuplesort_finalize_stats(Tuplesortstate *state);
 extern void tuplesort_finalize_stats_mk(Tuplesortstate_mk *state);
 
+extern char *tuplesort_explain(Tuplesortstate *state);
+extern char *tuplesort_explain_mk(Tuplesortstate_mk *state);
+
 extern int	tuplesort_merge_order(long allowedMem);
 
 /*
diff --git a/src/include/utils/tuplesort_mk.h b/src/include/utils/tuplesort_mk.h
index d283edfa00d6..bb82110326ef 100644
--- a/src/include/utils/tuplesort_mk.h
+++ b/src/include/utils/tuplesort_mk.h
@@ -285,6 +285,9 @@ typedef struct MKContext {
 
     /* enforce Unique, for index build */
     bool enforceUnique;
+
+	/* Name of the index we're building, if any. Used for error messages. */
+	char	   *indexname;
 } MKContext;
 
 /**
diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h
index 42c823f3b9db..dce19e8414a1 100644
--- a/src/include/utils/tuplestore.h
+++ b/src/include/utils/tuplestore.h
@@ -22,7 +22,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/tuplestore.h,v 1.20 2007/01/05 22:20:00 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/tuplestore.h,v 1.22 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,6 +63,8 @@ extern Tuplestorestate* tuplestore_begin_heap(bool randomAccess,
 					  bool interXact,
 					  int maxKBytes);
 
+extern void tuplestore_set_eflags(Tuplestorestate *state, int eflags);
+
 extern void tuplestore_puttupleslot_pos(Tuplestorestate *state, TuplestorePos *pos, TupleTableSlot *slot);
 extern void tuplestore_puttupleslot(Tuplestorestate *state, TupleTableSlot *slot);
 
@@ -73,7 +75,6 @@ extern void tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple);
 /* tuplestore_donestoring() used to be required, but is no longer used */
 #define tuplestore_donestoring(state)	((void) 0)
 
-/* backwards scan is only allowed if randomAccess was specified 'true' */
 extern bool tuplestore_gettupleslot_pos(Tuplestorestate *state, TuplestorePos *pos, bool forward,
 						TupleTableSlot *slot);
 extern bool tuplestore_gettupleslot(Tuplestorestate *state, bool forward, TupleTableSlot *slot);
diff --git a/src/include/utils/typcache.h b/src/include/utils/typcache.h
index 789c6e6d3468..529890ac3fab 100644
--- a/src/include/utils/typcache.h
+++ b/src/include/utils/typcache.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.14 2007/01/05 22:20:00 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.16.2.1 2010/09/02 03:17:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,7 +39,7 @@ typedef struct TypeCacheEntry
 	 * information hasn't yet been requested.
 	 */
 	Oid			btree_opf;		/* the default btree opclass' family */
-	Oid			btree_opintype;	/* the default btree opclass' opcintype */
+	Oid			btree_opintype; /* the default btree opclass' opcintype */
 	Oid			hash_opf;		/* the default hash opclass' family */
 	Oid			hash_opintype;	/* the default hash opclass' opcintype */
 	Oid			eq_opr;			/* the equality operator */
@@ -86,7 +86,6 @@ extern TupleDesc lookup_rowtype_tupdesc_copy(Oid type_id, int32 typmod);
 
 extern void assign_record_type_typmod(TupleDesc tupDesc);
 
-extern void flush_rowtype_cache(Oid type_id);
-
 extern void build_tuple_node_list(List **transientTypeList);
+
 #endif   /* TYPCACHE_H */
diff --git a/src/include/utils/uuid.h b/src/include/utils/uuid.h
index 4817939d5287..d4bc73c2cb07 100644
--- a/src/include/utils/uuid.h
+++ b/src/include/utils/uuid.h
@@ -5,12 +5,12 @@
  *	  to avoid conflicts with any uuid_t type that might be defined by
  *	  the system headers.
  *
- * Copyright (c) 2007, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/utils/uuid.h,v 1.2 2007/01/28 20:25:38 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/utils/uuid.h,v 1.4 2008/01/01 20:31:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
- */ 
+ */
 #ifndef UUID_H
 #define UUID_H
 
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h
index 601548497cc7..6443bc1d3f07 100644
--- a/src/include/utils/varbit.h
+++ b/src/include/utils/varbit.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/varbit.h,v 1.25 2007/01/05 22:20:00 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/varbit.h,v 1.27 2008/01/01 19:45:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 93505eaab187..7ec252c44568 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -402,14 +402,18 @@ PGTYPESnumeric_to_asc(numeric *num, int dscale)
 	numeric    *numcopy = PGTYPESnumeric_new();
 	char	   *s;
 
-	if (dscale < 0)
-		dscale = num->dscale;
+	if (numcopy == NULL)
+		return NULL;
 
 	if (PGTYPESnumeric_copy(num, numcopy) < 0)
 	{
 		PGTYPESnumeric_free(numcopy);
 		return NULL;
 	}
+
+	if (dscale < 0)
+		dscale = num->dscale;
+
 	/* get_str_from_var may change its argument */
 	s = get_str_from_var(numcopy, dscale);
 	PGTYPESnumeric_free(numcopy);
@@ -1493,6 +1497,9 @@ numericvar_to_double(numeric *var, double *dp)
 	char	   *endptr;
 	numeric    *varcopy = PGTYPESnumeric_new();
 
+	if (varcopy == NULL)
+		return -1;
+
 	if (PGTYPESnumeric_copy(var, varcopy) < 0)
 	{
 		PGTYPESnumeric_free(varcopy);
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
index 0f3da1663d09..d8c76ffe6367 100644
--- a/src/interfaces/ecpg/preproc/ecpg.trailer
+++ b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -917,7 +917,7 @@ ECPGDisconnect: SQL_DISCONNECT dis_name { $$ = $2; }
 		;
 
 dis_name: connection_object			{ $$ = $1; }
-		| CURRENT			{ $$ = make_str("\"CURRENT\""); }
+		| CURRENT_P			{ $$ = make_str("\"CURRENT\""); }
 		| ALL				{ $$ = make_str("\"ALL\""); }
 		| /* EMPTY */			{ $$ = make_str("\"CURRENT\""); }
 		;
diff --git a/src/interfaces/ecpg/test/compat_informix/.gitignore b/src/interfaces/ecpg/test/compat_informix/.gitignore
new file mode 100644
index 000000000000..f97706ba4bee
--- /dev/null
+++ b/src/interfaces/ecpg/test/compat_informix/.gitignore
@@ -0,0 +1,18 @@
+/charfuncs
+/charfuncs.c
+/dec_test
+/dec_test.c
+/describe
+/describe.c
+/rfmtdate
+/rfmtdate.c
+/rfmtlong
+/rfmtlong.c
+/rnull
+/rnull.c
+/sqlda
+/sqlda.c
+/test_informix
+/test_informix.c
+/test_informix2
+/test_informix2.c
diff --git a/src/interfaces/ecpg/test/connect/.gitignore b/src/interfaces/ecpg/test/connect/.gitignore
new file mode 100644
index 000000000000..1c30d6ef1253
--- /dev/null
+++ b/src/interfaces/ecpg/test/connect/.gitignore
@@ -0,0 +1,11 @@
+/test1
+/test1.c
+/test1.pgc
+/test2
+/test2.c
+/test3
+/test3.c
+/test4
+/test4.c
+/test5
+/test5.c
diff --git a/src/interfaces/ecpg/test/expected/.gitignore b/src/interfaces/ecpg/test/expected/.gitignore
new file mode 100644
index 000000000000..004ef9750ea3
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/.gitignore
@@ -0,0 +1 @@
+/connect-test1.c
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.stderr b/src/interfaces/ecpg/test/expected/thread-alloc.stderr
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.stdout b/src/interfaces/ecpg/test/expected/thread-alloc.stdout
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/interfaces/ecpg/test/expected/thread-descriptor.stderr b/src/interfaces/ecpg/test/expected/thread-descriptor.stderr
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/interfaces/ecpg/test/expected/thread-descriptor.stdout b/src/interfaces/ecpg/test/expected/thread-descriptor.stdout
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/interfaces/ecpg/test/expected/thread-prep.stderr b/src/interfaces/ecpg/test/expected/thread-prep.stderr
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/interfaces/ecpg/test/expected/thread-prep_2.stdout b/src/interfaces/ecpg/test/expected/thread-prep_2.stdout
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/interfaces/ecpg/test/pgtypeslib/.gitignore b/src/interfaces/ecpg/test/pgtypeslib/.gitignore
new file mode 100644
index 000000000000..2987fef21530
--- /dev/null
+++ b/src/interfaces/ecpg/test/pgtypeslib/.gitignore
@@ -0,0 +1,10 @@
+/dt_test
+/dt_test.c
+/dt_test2
+/dt_test2.c
+/nan_test
+/nan_test.c
+/num_test
+/num_test.c
+/num_test2
+/num_test2.c
diff --git a/src/interfaces/ecpg/test/preproc/.gitignore b/src/interfaces/ecpg/test/preproc/.gitignore
new file mode 100644
index 000000000000..f2b304b13717
--- /dev/null
+++ b/src/interfaces/ecpg/test/preproc/.gitignore
@@ -0,0 +1,22 @@
+/array_of_struct
+/array_of_struct.c
+/autoprep
+/autoprep.c
+/comment
+/comment.c
+/cursor
+/cursor.c
+/define
+/define.c
+/init
+/init.c
+/outofscope
+/outofscope.c
+/strings
+/strings.c
+/type
+/type.c
+/variable
+/variable.c
+/whenever
+/whenever.c
diff --git a/src/interfaces/ecpg/test/sql/.gitignore b/src/interfaces/ecpg/test/sql/.gitignore
new file mode 100644
index 000000000000..cd6f342bb1e0
--- /dev/null
+++ b/src/interfaces/ecpg/test/sql/.gitignore
@@ -0,0 +1,40 @@
+/array
+/array.c
+/binary
+/binary.c
+/code100
+/code100.c
+/copystdout
+/copystdout.c
+/define
+/define.c
+/desc
+/desc.c
+/describe
+/describe.c
+/dynalloc
+/dynalloc.c
+/dynalloc2
+/dynalloc2.c
+/dyntest
+/dyntest.c
+/execute
+/execute.c
+/fetch
+/fetch.c
+/func
+/func.c
+/indicators
+/indicators.c
+/insupd
+/insupd.c
+/oldexec
+/oldexec.c
+/parser
+/parser.c
+/quote
+/quote.c
+/show
+/show.c
+/sqlda
+/sqlda.c
diff --git a/src/interfaces/ecpg/test/thread/.gitignore b/src/interfaces/ecpg/test/thread/.gitignore
new file mode 100644
index 000000000000..12ff319b94e6
--- /dev/null
+++ b/src/interfaces/ecpg/test/thread/.gitignore
@@ -0,0 +1,10 @@
+/alloc
+/alloc.c
+/descriptor
+/descriptor.c
+/prep
+/prep.c
+/thread
+/thread.c
+/thread_implicit
+/thread_implicit.c
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index 94ef40d3bcb6..585e831cdb6f 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -681,7 +681,6 @@ PQprintTuples(const PGresult *res,
 	int			i,
 				j;
 	char		formatString[80];
-
 	char	   *tborder = NULL;
 
 	nFields = PQnfields(res);
@@ -700,15 +699,15 @@ PQprintTuples(const PGresult *res,
 			int			width;
 
 			width = nFields * 14;
-			tborder = malloc(width + 1);
+			tborder = (char *) malloc(width + 1);
 			if (!tborder)
 			{
 				fprintf(stderr, libpq_gettext("out of memory\n"));
 				abort();
 			}
-			for (i = 0; i <= width; i++)
+			for (i = 0; i < width; i++)
 				tborder[i] = '-';
-			tborder[i] = '\0';
+			tborder[width] = '\0';
 			fprintf(fout, "%s\n", tborder);
 		}
 
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index ee60b08f6d76..3aab219e2a6a 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -27,7 +27,7 @@ endif
 POSTGRES_IMP= postgres.imp
 
 ifdef PGXS
-BE_DLLLIBS= -Wl,-bI:$(bindir)/postgres/$(POSTGRES_IMP)
+BE_DLLLIBS= -Wl,-bI:$(pkglibdir)/$(POSTGRES_IMP)
 else
 BE_DLLLIBS= -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP)
 endif
diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin
index 4ce0f6b1ff30..d552418c18c0 100644
--- a/src/makefiles/Makefile.cygwin
+++ b/src/makefiles/Makefile.cygwin
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.9 2006/06/22 23:50:35 tgl Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.10 2007/08/22 06:34:18 tgl Exp $
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
 ifdef PGXS
@@ -22,9 +22,11 @@ CFLAGS_SL =
 
 ifneq (,$(findstring backend,$(subdir)))
 ifeq (,$(findstring conversion_procs,$(subdir)))
+ifeq (,$(findstring snowball,$(subdir)))
 override CPPFLAGS+= -DBUILDING_DLL
 endif
 endif
+endif
 
 ifneq (,$(findstring timezone,$(subdir)))
 override CPPFLAGS+= -DBUILDING_DLL
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index 1316fa1d68df..f91dfae391c2 100644
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -38,9 +38,9 @@ else
    DLSUFFIX = .sl
 endif
 ifeq ($(GCC), yes)
-   CFLAGS_SL = -fpic
+   CFLAGS_SL = -fPIC
 else
-   CFLAGS_SL = +z
+   CFLAGS_SL = +Z
 endif
 
 # Rule for building shared libs (currently used only for regression test
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index 90c5d6b2f4c4..e55f5228d3a6 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.10 2006/06/22 23:50:35 tgl Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.11 2007/08/21 13:32:33 mha Exp $
 
 # Use replacement include files for those missing on Win32
 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
@@ -22,9 +22,11 @@ CFLAGS_SL =
 
 ifneq (,$(findstring backend,$(subdir)))
 ifeq (,$(findstring conversion_procs,$(subdir)))
+ifeq (,$(findstring snowball,$(subdir)))
 override CPPFLAGS+= -DBUILDING_DLL
 endif
 endif
+endif
 
 ifneq (,$(findstring timezone,$(subdir)))
 override CPPFLAGS+= -DBUILDING_DLL
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index f7357f2d0602..57c5a1380790 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -22,6 +22,7 @@
 #   DATA -- random files to install into $PREFIX/share/contrib
 #   DATA_built -- random files to install into $PREFIX/share/contrib,
 #     which need to be built first
+#   DATA_TSEARCH -- random files to install into $PREFIX/share/tsearch_data
 #   DOCS -- random files to install under $PREFIX/doc/contrib
 #   SCRIPTS -- script files (not binaries) to install into $PREFIX/bin
 #   SCRIPTS_built -- script files (not binaries) to install into $PREFIX/bin,
@@ -90,20 +91,26 @@ install: all installdirs
 ifneq (,$(DATA)$(DATA_built))
 	@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
 	  echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'"; \
-	  $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'; \
+	  $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib' || exit; \
 	done
 endif # DATA
+ifneq (,$(DATA_TSEARCH))
+	@for file in $(addprefix $(srcdir)/, $(DATA_TSEARCH)); do \
+	  echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data'"; \
+	  $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data' || exit; \
+	done
+endif # DATA_TSEARCH
 ifdef MODULES
 	@for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \
 	  echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \
-	  $(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'; \
+	  $(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)' || exit; \
 	done
 endif # MODULES
 ifdef DOCS
 ifdef docdir
 	@for file in $(addprefix $(srcdir)/, $(DOCS)); do \
 	  echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'"; \
-	  $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'; \
+	  $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib' || exit; \
 	done
 endif # docdir
 endif # DOCS
@@ -113,13 +120,13 @@ endif # PROGRAM
 ifdef SCRIPTS
 	@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
 	  echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
-	  $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
+	  $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)' || exit; \
 	done
 endif # SCRIPTS
 ifdef SCRIPTS_built
 	@for file in $(SCRIPTS_built); do \
 	  echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
-	  $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
+	  $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)' || exit; \
 	done
 endif # SCRIPTS_built
 
@@ -134,6 +141,12 @@ endif
 ifneq (,$(MODULES))
 	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
 endif
+ifneq (,$(DATA_TSEARCH))
+	$(mkinstalldirs) '$(DESTDIR)$(datadir)/tsearch_data'
+endif
+ifneq (,$(MODULES)$(MODULE_big))
+	$(mkinstalldirs) '$(DESTDIR)$(pkglibdir)'
+endif
 ifdef DOCS
 ifdef docdir
 	$(MKDIR_P) '$(DESTDIR)$(docdir)/contrib'
@@ -152,6 +165,9 @@ uninstall:
 ifneq (,$(DATA)$(DATA_built))
 	rm -f $(addprefix '$(DESTDIR)$(datadir)'/contrib/, $(notdir $(DATA) $(DATA_built)))
 endif
+ifneq (,$(DATA_TSEARCH))
+	rm -f $(addprefix '$(DESTDIR)$(datadir)'/tsearch_data/, $(notdir $(DATA_TSEARCH)))
+endif
 ifdef MODULES
 	rm -f $(addprefix '$(DESTDIR)$(pkglibdir)'/, $(addsuffix $(DLSUFFIX), $(MODULES)))
 endif
@@ -243,7 +259,7 @@ endif
 
 # against installed postmaster
 installcheck: submake
-	$(top_builddir)/src/test/regress/pg_regress --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS)
+	$(top_builddir)/src/test/regress/pg_regress --psqldir="$(PSQLDIR)" $(REGRESS_OPTS) $(REGRESS)
 
 # in-tree test doesn't work yet (no way to install my shared library)
 #check: all submake
@@ -264,5 +280,5 @@ endif
 
 ifdef PROGRAM
 $(PROGRAM): $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(PG_LIBS) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(OBJS) $(PG_LIBS) $(LDFLAGS) $(LIBS) -o $@$(X)
 endif
diff --git a/src/pl/Makefile b/src/pl/Makefile
index 77ce242cd322..4a0f3654721a 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/pl/Makefile,v 1.25 2007/02/09 15:55:59 petere Exp $
+# $PostgreSQL: pgsql/src/pl/Makefile,v 1.26 2007/06/01 19:38:07 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 3f37cbc5f7e7..260c12869ba6 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -27,7 +27,7 @@ override CPPFLAGS += -DPLPERL_HAVE_UID_GID
 override CFLAGS += -Wno-comment
 endif
 
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE
 
 rpathdir = $(perl_archlibexp)/CORE
 
diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
index 9bb5f183cc2f..ec908816efda 100755
--- a/src/pl/plperl/expected/plperl.out
+++ b/src/pl/plperl/expected/plperl.out
@@ -598,6 +598,28 @@ SELECT * from perl_spi_prepared_row('(1, 2)');
  x | y 
 ---+---
  1 | 2
+--
+-- Test detection of unsafe operations
+CREATE OR REPLACE FUNCTION perl_unsafe1() RETURNS void AS $$
+	my $fd = fileno STDERR;
+$$ LANGUAGE plperl;
+ERROR:  creation of Perl function "perl_unsafe1" failed: 'fileno' trapped by operation mask at line 2.
+-- check safe behavior when a function body is replaced during execution
+CREATE OR REPLACE FUNCTION self_modify(INTEGER) RETURNS INTEGER AS $$
+   spi_exec_query('CREATE OR REPLACE FUNCTION self_modify(INTEGER) RETURNS INTEGER AS \'return $_[0] * 3;\' LANGUAGE plperl;');
+   spi_exec_query('select self_modify(42) AS a');
+   return $_[0] * 2;
+$$ LANGUAGE plperl;
+SELECT self_modify(42);
+ self_modify 
+-------------
+          84
+(1 row)
+
+SELECT self_modify(42);
+ self_modify 
+-------------
+         126
 (1 row)
 
 -- simple test of a DO block
diff --git a/src/pl/plperl/expected/plperl_array.out b/src/pl/plperl/expected/plperl_array.out
index 90bfa61dfa7b..f444ffac430a 100644
--- a/src/pl/plperl/expected/plperl_array.out
+++ b/src/pl/plperl/expected/plperl_array.out
@@ -61,7 +61,7 @@ select plperl_sum_array('{{{{{{{1,2},{3,4}},{{5,6},{7,8}}},{{{9,10},{11,12}},
 {{{{{1,2},{3,4}},{{5,6},{7,8}}},{{{9,10},{11,12}},{{13,14},{15,16}}}},
 {{{{17,18},{19,20}},{{21,22},{23,24}}},{{{25,26},{27,28}},{{29,30},{31,32}}}}}}}'
 );
-ERROR:  number of array dimensions (6) exceeds the maximum allowed (6)
+ERROR:  number of array dimensions (7) exceeds the maximum allowed (6)
 LINE 1: select plperl_sum_array('{{{{{{{1,2},{3,4}},{{5,6},{7,8}}},{...
                                 ^
 select plperl_sum_array('{{{1,2,3}, {4,5,6,7}}, {{7,8,9}, {10, 11, 12}}}');
diff --git a/src/pl/plperl/expected/plperlu_plperl.out b/src/pl/plperl/expected/plperlu_plperl.out
new file mode 100644
index 000000000000..3afc90c8f132
--- /dev/null
+++ b/src/pl/plperl/expected/plperlu_plperl.out
@@ -0,0 +1,76 @@
+--
+-- Test that recursing between plperl and plperlu doesn't allow plperl to perform unsafe ops
+--
+-- recurse between a plperl and plperlu function that are identical except that
+-- each calls the other. Each also checks if an unsafe opcode can be executed.
+CREATE OR REPLACE FUNCTION recurse_plperl(i int) RETURNS SETOF TEXT LANGUAGE plperl
+AS $$
+	my $i = shift;
+	return unless $i > 0;
+	return_next "plperl  $i entry: ".((eval "stat;1") ? "ok" : $@);
+	return_next $_
+		for map { $_->{recurse_plperlu} }
+			@{spi_exec_query("select * from recurse_plperlu($i-1)")->{rows}};
+	return;
+$$;
+CREATE OR REPLACE FUNCTION recurse_plperlu(i int) RETURNS SETOF TEXT LANGUAGE plperlu
+AS $$
+	my $i = shift;
+	return unless $i > 0;
+	return_next "plperlu $i entry: ".((eval "stat;1") ? "ok" : $@);
+	return_next $_
+		for map { $_->{recurse_plperl} }
+			@{spi_exec_query("select * from recurse_plperl($i-1)")->{rows}};
+	return;
+$$;
+SELECT * FROM recurse_plperl(5);
+                        recurse_plperl                        
+--------------------------------------------------------------
+ plperl  5 entry: 'stat' trapped by operation mask at line 1.
+ 
+ plperlu 4 entry: ok
+ plperl  3 entry: 'stat' trapped by operation mask at line 1.
+ 
+ plperlu 2 entry: ok
+ plperl  1 entry: 'stat' trapped by operation mask at line 1.
+ 
+(5 rows)
+
+SELECT * FROM recurse_plperlu(5);
+                       recurse_plperlu                        
+--------------------------------------------------------------
+ plperlu 5 entry: ok
+ plperl  4 entry: 'stat' trapped by operation mask at line 1.
+ 
+ plperlu 3 entry: ok
+ plperl  2 entry: 'stat' trapped by operation mask at line 1.
+ 
+ plperlu 1 entry: ok
+(5 rows)
+
+--
+-- Make sure we can't use/require things in plperl
+--
+CREATE OR REPLACE FUNCTION use_plperlu() RETURNS void LANGUAGE plperlu
+AS $$
+use Errno;
+$$;
+CREATE OR REPLACE FUNCTION use_plperl() RETURNS void LANGUAGE plperl
+AS $$
+use Errno;
+$$;
+ERROR:  creation of Perl function "use_plperl" failed: Unable to load Errno.pm into plperl at line 2.
+BEGIN failed--compilation aborted at line 2.
+-- make sure our overloaded require op gets restored/set correctly
+select use_plperlu();
+ use_plperlu 
+-------------
+ 
+(1 row)
+
+CREATE OR REPLACE FUNCTION use_plperl() RETURNS void LANGUAGE plperl
+AS $$
+use Errno;
+$$;
+ERROR:  creation of Perl function "use_plperl" failed: Unable to load Errno.pm into plperl at line 2.
+BEGIN failed--compilation aborted at line 2.
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index e75895effa71..810a34618cb7 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -23,6 +23,7 @@
 #include "commands/trigger.h"
 #include "executor/spi.h"
 #include "funcapi.h"
+#include "libpq/pqsignal.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
@@ -58,14 +59,15 @@ PG_MODULE_MAGIC;
 
 
 /**********************************************************************
- * Information associated with a Perl interpreter.	We have one interpreter
- * that is used for all plperlu (untrusted) functions.	For plperl (trusted)
+ * Information associated with a Perl interpreter.  We have one interpreter
+ * that is used for all plperlu (untrusted) functions.  For plperl (trusted)
  * functions, there is a separate interpreter for each effective SQL userid.
  * (This is needed to ensure that an unprivileged user can't inject Perl code
  * that'll be executed with the privileges of some other SQL user.)
  *
  * The plperl_interp_desc structs are kept in a Postgres hash table indexed
  * by userid OID, with OID 0 used for the single untrusted interpreter.
+ * Once created, an interpreter is kept for the life of the process.
  *
  * We start out by creating a "held" interpreter, which we initialize
  * only as far as we can do without deciding if it will be trusted or
@@ -91,28 +93,44 @@ typedef struct plperl_interp_desc
 
 /**********************************************************************
  * The information we cache about loaded procedures
+ *
+ * The refcount field counts the struct's reference from the hash table shown
+ * below, plus one reference for each function call level that is using the
+ * struct.  We can release the struct, and the associated Perl sub, when the
+ * refcount goes to zero.
  **********************************************************************/
 typedef struct plperl_proc_desc
 {
 	char	   *proname;		/* name of the sql function */
 	TransactionId fn_xmin;
 	ItemPointerData fn_tid;
+	int			refcount;		/* reference count of this struct */
+	SV		   *reference;		/* CODE reference for Perl sub */
 	plperl_interp_desc *interp; /* interpreter it's created in */
 	bool		fn_readonly;
 	bool		lanpltrusted;
 	bool		fn_retistuple;	/* true, if function returns tuple */
 	bool		fn_retisset;	/* true, if function returns set */
 	bool		fn_retisarray;	/* true if function returns array */
+	/* Conversion info for function's result type: */
 	Oid			result_oid;		/* Oid of result type */
 	FmgrInfo	result_in_func; /* I/O function and arg for result type */
 	Oid			result_typioparam;
+	/* Conversion info for function's argument types: */
 	int			nargs;
 	FmgrInfo	arg_out_func[FUNC_MAX_ARGS];
 	bool		arg_is_rowtype[FUNC_MAX_ARGS];
 	Oid			arg_arraytype[FUNC_MAX_ARGS];	/* InvalidOid if not an array */
-	SV		   *reference;
 } plperl_proc_desc;
 
+#define increment_prodesc_refcount(prodesc)  \
+	((prodesc)->refcount++)
+#define decrement_prodesc_refcount(prodesc)  \
+	do { \
+		if (--((prodesc)->refcount) <= 0) \
+			free_plperl_function(prodesc); \
+	} while(0)
+
 /**********************************************************************
  * For speedy lookup, we maintain a hash table mapping from
  * function OID + trigger flag + user OID to plperl_proc_desc pointers.
@@ -128,19 +146,18 @@ typedef struct plperl_proc_desc
  **********************************************************************/
 typedef struct plperl_proc_key
 {
-	Oid			proc_id;		/* Function OID */
-
+	Oid			proc_id;				/* Function OID */
 	/*
 	 * is_trigger is really a bool, but declare as Oid to ensure this struct
 	 * contains no padding
 	 */
-	Oid			is_trigger;		/* is it a trigger function? */
-	Oid			user_id;		/* User calling the function, or 0 */
+	Oid			is_trigger;				/* is it a trigger function? */
+	Oid			user_id;				/* User calling the function, or 0 */
 } plperl_proc_key;
 
 typedef struct plperl_proc_ptr
 {
-	plperl_proc_key proc_key;	/* Hash key (must be first!) */
+	plperl_proc_key proc_key;			/* Hash key (must be first!) */
 	plperl_proc_desc *proc_ptr;
 } plperl_proc_ptr;
 
@@ -239,6 +256,8 @@ static void set_interp_require(bool trusted);
 static Datum plperl_func_handler(PG_FUNCTION_ARGS);
 static Datum plperl_trigger_handler(PG_FUNCTION_ARGS);
 
+static void free_plperl_function(plperl_proc_desc *prodesc);
+
 static plperl_proc_desc *compile_plperl_function(Oid fn_oid, bool is_trigger);
 
 static SV  *plperl_hash_from_tuple(HeapTuple tuple, TupleDesc tupdesc);
@@ -1153,6 +1172,9 @@ plperl_array_to_datum(SV *src, Oid typid)
 	return makeMdArrayResult(astate, ndims, dims, lbs, CurrentMemoryContext, true);
 }
 
+/*
+ * Initialize the current Perl interpreter as a trusted interp
+ */
 static void
 _sv_to_datum_finfo(FmgrInfo *fcinfo, Oid typid, Oid *typioparam)
 {
@@ -1576,9 +1598,15 @@ plperl_call_handler(PG_FUNCTION_ARGS)
 	Datum		retval;
 	plperl_call_data *save_call_data = current_call_data;
 	plperl_interp_desc *oldinterp = plperl_active_interp;
+	plperl_call_data this_call_data;
+
+	/* Initialize current-call status record */
+	MemSet(&this_call_data, 0, sizeof(this_call_data));
+	this_call_data.fcinfo = fcinfo;
 
 	PG_TRY();
 	{
+		current_call_data = &this_call_data;
 		if (CALLED_AS_TRIGGER(fcinfo))
 			retval = plperl_trigger_handler(fcinfo);
 		else
@@ -2055,6 +2083,7 @@ plperl_func_handler(PG_FUNCTION_ARGS)
 
 	prodesc = compile_plperl_function(fcinfo->flinfo->fn_oid, false);
 	current_call_data->prodesc = prodesc;
+	increment_prodesc_refcount(prodesc);
 
 	/* Set a callback for error reporting */
 	pl_error_context.callback = plperl_exec_callback;
@@ -2227,6 +2256,7 @@ plperl_trigger_handler(PG_FUNCTION_ARGS)
 	/* Find or compile the function */
 	prodesc = compile_plperl_function(fcinfo->flinfo->fn_oid, true);
 	current_call_data->prodesc = prodesc;
+	increment_prodesc_refcount(prodesc);
 
 	/* Set a callback for error reporting */
 	pl_error_context.callback = plperl_exec_callback;
@@ -2353,6 +2383,27 @@ validate_plperl_function(plperl_proc_ptr *proc_ptr, HeapTuple procTup)
 }
 
 
+static void
+free_plperl_function(plperl_proc_desc *prodesc)
+{
+	Assert(prodesc->refcount <= 0);
+	/* Release CODE reference, if we have one, from the appropriate interp */
+	if (prodesc->reference)
+	{
+		plperl_interp_desc *oldinterp = plperl_active_interp;
+
+		activate_interpreter(prodesc->interp);
+		SvREFCNT_dec(prodesc->reference);
+		activate_interpreter(oldinterp);
+	}
+	/* Get rid of what we conveniently can of our own structs */
+	/* (FmgrInfo subsidiary info will get leaked ...) */
+	if (prodesc->proname)
+		free(prodesc->proname);
+	free(prodesc);
+}
+
+
 static plperl_proc_desc *
 compile_plperl_function(Oid fn_oid, bool is_trigger)
 {
@@ -2423,6 +2474,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 			ereport(ERROR,
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of memory")));
+		/* Initialize all fields to 0 so free_plperl_function is safe */
 		MemSet(prodesc, 0, sizeof(plperl_proc_desc));
 		prodesc->proname = strdup(NameStr(procStruct->proname));
 		if (prodesc->proname == NULL)
@@ -2443,8 +2495,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 								  ObjectIdGetDatum(procStruct->prolang));
 		if (!HeapTupleIsValid(langTup))
 		{
-			free(prodesc->proname);
-			free(prodesc);
+			free_plperl_function(prodesc);
 			elog(ERROR, "cache lookup failed for language %u",
 				 procStruct->prolang);
 		}
@@ -2463,8 +2514,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 								ObjectIdGetDatum(procStruct->prorettype));
 			if (!HeapTupleIsValid(typeTup))
 			{
-				free(prodesc->proname);
-				free(prodesc);
+				free_plperl_function(prodesc);
 				elog(ERROR, "cache lookup failed for type %u",
 					 procStruct->prorettype);
 			}
@@ -2478,8 +2528,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 					 /* okay */ ;
 				else if (procStruct->prorettype == TRIGGEROID)
 				{
-					free(prodesc->proname);
-					free(prodesc);
+					free_plperl_function(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("trigger functions can only be called "
@@ -2487,8 +2536,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 				}
 				else
 				{
-					free(prodesc->proname);
-					free(prodesc);
+					free_plperl_function(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/Perl functions cannot return type %s",
@@ -2523,8 +2571,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 						ObjectIdGetDatum(procStruct->proargtypes.values[i]));
 				if (!HeapTupleIsValid(typeTup))
 				{
-					free(prodesc->proname);
-					free(prodesc);
+					free_plperl_function(prodesc);
 					elog(ERROR, "cache lookup failed for type %u",
 						 procStruct->proargtypes.values[i]);
 				}
@@ -2534,8 +2581,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 				if (typeStruct->typtype == TYPTYPE_PSEUDO &&
 					procStruct->proargtypes.values[i] != RECORDOID)
 				{
-					free(prodesc->proname);
-					free(prodesc);
+					free_plperl_function(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/Perl functions cannot accept type %s",
diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql
index 6cdec3679fb0..ac78d5f3ba95 100644
--- a/src/pl/plperl/sql/plperl.sql
+++ b/src/pl/plperl/sql/plperl.sql
@@ -386,6 +386,22 @@ return $q->{rows}->[0]->{a};
 $$ LANGUAGE plperl;
 SELECT * from perl_spi_prepared_row('(1, 2)');
 
+--
+-- Test detection of unsafe operations
+CREATE OR REPLACE FUNCTION perl_unsafe1() RETURNS void AS $$
+	my $fd = fileno STDERR;
+$$ LANGUAGE plperl;
+
+-- check safe behavior when a function body is replaced during execution
+CREATE OR REPLACE FUNCTION self_modify(INTEGER) RETURNS INTEGER AS $$
+   spi_exec_query('CREATE OR REPLACE FUNCTION self_modify(INTEGER) RETURNS INTEGER AS \'return $_[0] * 3;\' LANGUAGE plperl;');
+   spi_exec_query('select self_modify(42) AS a');
+   return $_[0] * 2;
+$$ LANGUAGE plperl;
+
+SELECT self_modify(42);
+SELECT self_modify(42);
+
 -- simple test of a DO block
 DO $$
   $a = 'This is a test';
diff --git a/src/pl/plperl/sql/plperlu_plperl.sql b/src/pl/plperl/sql/plperlu_plperl.sql
new file mode 100644
index 000000000000..6bd1a317c856
--- /dev/null
+++ b/src/pl/plperl/sql/plperlu_plperl.sql
@@ -0,0 +1,53 @@
+--
+-- Test that recursing between plperl and plperlu doesn't allow plperl to perform unsafe ops
+--
+
+-- recurse between a plperl and plperlu function that are identical except that
+-- each calls the other. Each also checks if an unsafe opcode can be executed.
+
+CREATE OR REPLACE FUNCTION recurse_plperl(i int) RETURNS SETOF TEXT LANGUAGE plperl
+AS $$
+	my $i = shift;
+	return unless $i > 0;
+	return_next "plperl  $i entry: ".((eval "stat;1") ? "ok" : $@);
+	return_next $_
+		for map { $_->{recurse_plperlu} }
+			@{spi_exec_query("select * from recurse_plperlu($i-1)")->{rows}};
+	return;
+$$;
+
+CREATE OR REPLACE FUNCTION recurse_plperlu(i int) RETURNS SETOF TEXT LANGUAGE plperlu
+AS $$
+	my $i = shift;
+	return unless $i > 0;
+	return_next "plperlu $i entry: ".((eval "stat;1") ? "ok" : $@);
+	return_next $_
+		for map { $_->{recurse_plperl} }
+			@{spi_exec_query("select * from recurse_plperl($i-1)")->{rows}};
+	return;
+$$;
+
+SELECT * FROM recurse_plperl(5);
+SELECT * FROM recurse_plperlu(5);
+
+--
+-- Make sure we can't use/require things in plperl
+--
+
+CREATE OR REPLACE FUNCTION use_plperlu() RETURNS void LANGUAGE plperlu
+AS $$
+use Errno;
+$$;
+
+CREATE OR REPLACE FUNCTION use_plperl() RETURNS void LANGUAGE plperl
+AS $$
+use Errno;
+$$;
+
+-- make sure our overloaded require op gets restored/set correctly
+select use_plperlu();
+
+CREATE OR REPLACE FUNCTION use_plperl() RETURNS void LANGUAGE plperl
+AS $$
+use Errno;
+$$;
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index 4cc4841315bc..314f13af0af5 100755
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.99 2007/02/19 03:18:51 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.108.2.1 2009/02/02 20:25:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,7 @@ static PLpgSQL_expr		*read_sql_construct(int until,
 static	PLpgSQL_expr	*read_sql_stmt(const char *sqlstart);
 static	PLpgSQL_type	*read_datatype(int tok);
 static	PLpgSQL_stmt	*make_execsql_stmt(const char *sqlstart, int lineno);
-static	PLpgSQL_stmt	*make_fetch_stmt(int lineno, int curvar);
+static	PLpgSQL_stmt_fetch *read_fetch_direction(void);
 static	PLpgSQL_stmt	*make_return_stmt(int lineno);
 static	PLpgSQL_stmt	*make_return_next_stmt(int lineno);
 static	PLpgSQL_stmt	*make_return_query_stmt(int lineno);
@@ -56,6 +56,7 @@ static PLpgSQL_row		*make_scalar_list1(const char *initial_name,
 										   int lineno);
 static	void			 check_sql_expr(const char *stmt);
 static	void			 plpgsql_sql_error_callback(void *arg);
+static	char			*check_label(const char *yytxt);
 static	void			 check_labels(const char *start_label,
 									  const char *end_label);
 
@@ -107,6 +108,7 @@ static	void			 check_labels(const char *start_label,
 		PLpgSQL_exception_block	*exception_block;
 		PLpgSQL_nsitem			*nsitem;
 		PLpgSQL_diag_item		*diagitem;
+		PLpgSQL_stmt_fetch		*fetch;
 }
 
 %type <declhdr> decl_sect
@@ -124,8 +126,8 @@ static	void			 check_labels(const char *start_label,
 %type <expr>	expr_until_then expr_until_loop
 %type <expr>	opt_exitcond
 
-%type <ival>	assign_var cursor_variable
-%type <var>		cursor_varptr
+%type <ival>	assign_var
+%type <var>		cursor_variable
 %type <variable>	decl_cursor_arg
 %type <forvariable>	for_variable
 %type <stmt>	for_control
@@ -139,7 +141,7 @@ static	void			 check_labels(const char *start_label,
 %type <stmt>	stmt_assign stmt_if stmt_loop stmt_while stmt_exit
 %type <stmt>	stmt_return stmt_raise stmt_execsql
 %type <stmt>	stmt_dynexecute stmt_for stmt_perform stmt_getdiag
-%type <stmt>	stmt_open stmt_fetch stmt_close stmt_null
+%type <stmt>	stmt_open stmt_fetch stmt_move stmt_close stmt_null
 
 %type <list>	proc_exceptions
 %type <exception_block> exception_sect
@@ -154,6 +156,9 @@ static	void			 check_labels(const char *start_label,
 %type <diagitem> getdiag_list_item
 %type <ival>	getdiag_kind getdiag_target
 
+%type <ival>	opt_scrollable
+%type <fetch>   opt_fetch_direction
+
 %type <ival>	lno
 
 		/*
@@ -190,6 +195,8 @@ static	void			 check_labels(const char *start_label,
 %token	K_IS
 %token	K_LOG
 %token	K_LOOP
+%token	K_MOVE
+%token	K_NOSCROLL
 %token	K_NOT
 %token	K_NOTICE
 %token	K_NULL
@@ -202,6 +209,7 @@ static	void			 check_labels(const char *start_label,
 %token	K_RESULT_OID
 %token	K_RETURN
 %token	K_REVERSE
+%token	K_SCROLL
 %token	K_STRICT
 %token	K_THEN
 %token	K_TO
@@ -221,7 +229,6 @@ static	void			 check_labels(const char *start_label,
 %token	T_ROW
 %token	T_RECORD
 %token	T_DTYPE
-%token	T_LABEL
 %token	T_WORD
 %token	T_ERROR
 
@@ -372,9 +379,9 @@ decl_statement	: decl_varname decl_const decl_datatype decl_notnull decl_defval
 					{
 						plpgsql_ns_rename($2, $4);
 					}
-				| decl_varname K_CURSOR
-					{ plpgsql_ns_push(NULL); }
-				  decl_cursor_args decl_is_from decl_cursor_query
+				| decl_varname opt_scrollable K_CURSOR
+					{ plpgsql_ns_push($1.name); }
+				  decl_cursor_args decl_is_for decl_cursor_query
 					{
 						PLpgSQL_var *new;
 						PLpgSQL_expr *curname_def;
@@ -414,11 +421,26 @@ decl_statement	: decl_varname decl_const decl_datatype decl_notnull decl_defval
 						curname_def->query = pstrdup(buf);
 						new->default_val = curname_def;
 
-						new->cursor_explicit_expr = $6;
-						if ($4 == NULL)
+						new->cursor_explicit_expr = $7;
+						if ($5 == NULL)
 							new->cursor_explicit_argrow = -1;
 						else
-							new->cursor_explicit_argrow = $4->rowno;
+							new->cursor_explicit_argrow = $5->rowno;
+						new->cursor_options = CURSOR_OPT_FAST_PLAN | $2;
+					}
+				;
+
+opt_scrollable :
+					{
+						$$ = 0;
+					}
+				| K_NOSCROLL
+					{
+						$$ = CURSOR_OPT_NO_SCROLL;
+					}
+				| K_SCROLL
+					{
+						$$ = CURSOR_OPT_SCROLL;
 					}
 				;
 
@@ -484,7 +506,7 @@ decl_cursor_arg : decl_varname decl_datatype
 					}
 				;
 
-decl_is_from	:	K_IS |		/* Oracle */
+decl_is_for		:	K_IS |		/* Oracle */
 					K_FOR;		/* ANSI */
 
 decl_aliasitem	: T_WORD
@@ -497,7 +519,8 @@ decl_aliasitem	: T_WORD
 							yyerror("only positional parameters can be aliased");
 
 						plpgsql_ns_setlocal(false);
-						nsi = plpgsql_ns_lookup(name, NULL);
+
+						nsi = plpgsql_ns_lookup(name, NULL, NULL, NULL);
 						if (nsi == NULL)
 						{
 							plpgsql_error_lineno = plpgsql_scanner_lineno();
@@ -624,6 +647,8 @@ proc_stmt		: pl_block ';'
 						{ $$ = $1; }
 				| stmt_fetch
 						{ $$ = $1; }
+				| stmt_move
+						{ $$ = $1; }
 				| stmt_close
 						{ $$ = $1; }
 				| stmt_null
@@ -862,7 +887,7 @@ stmt_for		: opt_block_label K_FOR for_control loop_body
 						}
 
 						check_labels($1, $4.end_label);
-						/* close namespace started in opt_label */
+						/* close namespace started in opt_block_label */
 						plpgsql_ns_pop();
 					}
 				;
@@ -954,39 +979,25 @@ for_control		:
 								PLpgSQL_stmt_fori	*new;
 								char				*varname;
 
-								/* First expression is well-formed */
+								/* Check first expression is well-formed */
 								check_sql_expr(expr1->query);
 
-
-								expr2 = read_sql_construct(K_BY,
-														   K_LOOP,
+								/* Read and check the second one */
+								expr2 = read_sql_construct(K_LOOP,
+														   K_BY,
 														   "LOOP",
 														   "SELECT ",
 														   true,
-														   false,
+														   true,
 														   &tok);
 
-								if (tok == K_BY) 
+								/* Get the BY clause if any */
+								if (tok == K_BY)
 									expr_by = plpgsql_read_expression(K_LOOP, "LOOP");
 								else
-								{
-									/*
-									 * If there is no BY clause we will assume 1
-									 */
-									char buf[1024];
-									PLpgSQL_dstring		ds;
-
-									plpgsql_dstring_init(&ds);
-
-									expr_by = palloc0(sizeof(PLpgSQL_expr));
-									expr_by->dtype      		= PLPGSQL_DTYPE_EXPR;
-									strcpy(buf, "SELECT 1");
-									plpgsql_dstring_append(&ds, buf);
-									expr_by->query			    = pstrdup(plpgsql_dstring_get(&ds));
-									expr_by->plan				= NULL;
-								}
+									expr_by = NULL;
 
-								/* should have had a single variable name */
+								/* Should have had a single variable name */
 								plpgsql_error_lineno = $2.lineno;
 								if ($2.scalar && $2.row)
 									ereport(ERROR,
@@ -1009,7 +1020,7 @@ for_control		:
 								new->reverse  = reverse;
 								new->lower	  = expr1;
 								new->upper	  = expr2;
-								new->by		  = expr_by;
+								new->step	  = expr_by;
 
 								$$ = (PLpgSQL_stmt *) new;
 							}
@@ -1169,6 +1180,7 @@ stmt_return		: K_RETURN lno
 						tok = yylex();
 						if (tok == 0)
 							yyerror("unexpected end of function definition");
+
 						/*
 						 * To avoid making NEXT and QUERY effectively be
 						 * reserved words within plpgsql, recognize them
@@ -1320,7 +1332,7 @@ stmt_dynexecute : K_EXECUTE lno
 				;
 
 
-stmt_open		: K_OPEN lno cursor_varptr
+stmt_open		: K_OPEN lno cursor_variable
 					{
 						PLpgSQL_stmt_open *new;
 						int				  tok;
@@ -1329,10 +1341,23 @@ stmt_open		: K_OPEN lno cursor_varptr
 						new->cmd_type = PLPGSQL_STMT_OPEN;
 						new->lineno = $2;
 						new->curvar = $3->varno;
+						new->cursor_options = CURSOR_OPT_FAST_PLAN;
 
 						if ($3->cursor_explicit_expr == NULL)
 						{
+							/* be nice if we could use opt_scrollable here */
 						    tok = yylex();
+							if (tok == K_NOSCROLL)
+							{
+								new->cursor_options |= CURSOR_OPT_NO_SCROLL;
+								tok = yylex();
+							}
+							else if (tok == K_SCROLL)
+							{
+								new->cursor_options |= CURSOR_OPT_SCROLL;
+								tok = yylex();
+							}
+
 							if (tok != K_FOR)
 							{
 								plpgsql_error_lineno = $2;
@@ -1437,9 +1462,43 @@ stmt_open		: K_OPEN lno cursor_varptr
 					}
 				;
 
-stmt_fetch		: K_FETCH lno cursor_variable K_INTO
+stmt_fetch		: K_FETCH lno opt_fetch_direction cursor_variable K_INTO
 					{
-						$$ = make_fetch_stmt($2, $3);
+						PLpgSQL_stmt_fetch *fetch = $3;
+						PLpgSQL_rec	   *rec;
+						PLpgSQL_row	   *row;
+
+						/* We have already parsed everything through the INTO keyword */
+						read_into_target(&rec, &row, NULL);
+
+						if (yylex() != ';')
+							yyerror("syntax error");
+
+						fetch->lineno = $2;
+						fetch->rec		= rec;
+						fetch->row		= row;
+						fetch->curvar	= $4->varno;
+						fetch->is_move	= false;
+
+						$$ = (PLpgSQL_stmt *)fetch;
+					}
+				;
+				
+stmt_move		: K_MOVE lno opt_fetch_direction cursor_variable ';'
+					{
+						PLpgSQL_stmt_fetch *fetch = $3;
+
+						fetch->lineno = $2;
+						fetch->curvar	= $4->varno;
+						fetch->is_move	= true;
+
+						$$ = (PLpgSQL_stmt *)fetch;
+					}
+				;
+
+opt_fetch_direction	:
+					{
+						$$ = read_fetch_direction();
 					}
 				;
 
@@ -1450,7 +1509,7 @@ stmt_close		: K_CLOSE lno cursor_variable ';'
 						new = palloc(sizeof(PLpgSQL_stmt_close));
 						new->cmd_type = PLPGSQL_STMT_CLOSE;
 						new->lineno = $2;
-						new->curvar = $3;
+						new->curvar = $3->varno;
 
 						$$ = (PLpgSQL_stmt *)new;
 					}
@@ -1463,7 +1522,7 @@ stmt_null		: K_NULL ';'
 					}
 				;
 
-cursor_varptr	: T_SCALAR
+cursor_variable	: T_SCALAR
 					{
 						if (yylval.scalar->dtype != PLPGSQL_DTYPE_VAR)
 							yyerror("cursor variable must be a simple variable");
@@ -1480,23 +1539,6 @@ cursor_varptr	: T_SCALAR
 					}
 				;
 
-cursor_variable	: T_SCALAR
-					{
-						if (yylval.scalar->dtype != PLPGSQL_DTYPE_VAR)
-							yyerror("cursor variable must be a simple variable");
-
-						if (((PLpgSQL_var *) yylval.scalar)->datatype->typoid != REFCURSOROID)
-						{
-							plpgsql_error_lineno = plpgsql_scanner_lineno();
-							ereport(ERROR,
-									(errcode(ERRCODE_DATATYPE_MISMATCH),
-									 errmsg("\"%s\" must be of type refcursor",
-											((PLpgSQL_var *) yylval.scalar)->refname)));
-						}
-						$$ = yylval.scalar->dno;
-					}
-				;
-
 exception_sect	:
 					{ $$ = NULL; }
 				| K_EXCEPTION lno
@@ -1599,20 +1641,28 @@ opt_block_label	:
 					}
 				;
 
+/*
+ * need all the options because scanner will have tried to resolve as variable
+ */
 opt_label	:
 					{
 						$$ = NULL;
 					}
-				| T_LABEL
+				| T_WORD
 					{
-						char *label_name;
-						plpgsql_convert_ident(yytext, &label_name, 1);
-						$$ = label_name;
+						$$ = check_label(yytext);
 					}
-				| T_WORD
+				| T_SCALAR
 					{
-						/* just to give a better error than "syntax error" */
-						yyerror("no such label");
+						$$ = check_label(yytext);
+					}
+				| T_RECORD
+					{
+						$$ = check_label(yytext);
+					}
+				| T_ROW
+					{
+						$$ = check_label(yytext);
 					}
 				;
 
@@ -1989,28 +2039,94 @@ make_execsql_stmt(const char *sqlstart, int lineno)
 }
 
 
-static PLpgSQL_stmt *
-make_fetch_stmt(int lineno, int curvar)
+static PLpgSQL_stmt_fetch *
+read_fetch_direction(void)
 {
-	int					tok;
-	PLpgSQL_rec		   *rec;
-	PLpgSQL_row		   *row;
 	PLpgSQL_stmt_fetch *fetch;
+	int			tok;
+	bool		check_FROM = true;
 
-	/* We have already parsed everything through the INTO keyword */
-	read_into_target(&rec, &row, NULL);
+	/*
+	 * We create the PLpgSQL_stmt_fetch struct here, but only fill in
+	 * the fields arising from the optional direction clause
+	 */
+	fetch = (PLpgSQL_stmt_fetch *) palloc0(sizeof(PLpgSQL_stmt_fetch));
+	fetch->cmd_type = PLPGSQL_STMT_FETCH;
+	/* set direction defaults: */
+	fetch->direction = FETCH_FORWARD;
+	fetch->how_many  = 1;
+	fetch->expr      = NULL;
+
+	/*
+	 * Most of the direction keywords are not plpgsql keywords, so we
+	 * rely on examining yytext ...
+	 */
 	tok = yylex();
-	if (tok != ';')
-		yyerror("syntax error");
+	if (tok == 0)
+		yyerror("unexpected end of function definition");
 
-	fetch = palloc0(sizeof(PLpgSQL_stmt_fetch));
-	fetch->cmd_type = PLPGSQL_STMT_FETCH;
-	fetch->lineno	= lineno;
-	fetch->rec		= rec;
-	fetch->row		= row;
-	fetch->curvar	= curvar;
+	if (pg_strcasecmp(yytext, "next") == 0)
+	{
+		/* use defaults */
+	}
+	else if (pg_strcasecmp(yytext, "prior") == 0)
+	{
+		fetch->direction = FETCH_BACKWARD;
+	}
+	else if (pg_strcasecmp(yytext, "first") == 0)
+	{
+		fetch->direction = FETCH_ABSOLUTE;
+	}
+	else if (pg_strcasecmp(yytext, "last") == 0)
+	{
+		fetch->direction = FETCH_ABSOLUTE;
+		fetch->how_many  = -1;
+	}
+	else if (pg_strcasecmp(yytext, "absolute") == 0)
+	{
+		fetch->direction = FETCH_ABSOLUTE;
+		fetch->expr = read_sql_construct(K_FROM, K_IN, "FROM or IN",
+										 "SELECT ", true, true, NULL);
+		check_FROM = false;
+	}
+	else if (pg_strcasecmp(yytext, "relative") == 0)
+	{
+		fetch->direction = FETCH_RELATIVE;
+		fetch->expr = read_sql_construct(K_FROM, K_IN, "FROM or IN",
+										 "SELECT ", true, true, NULL);
+		check_FROM = false;
+	}
+	else if (pg_strcasecmp(yytext, "forward") == 0)
+	{
+		/* use defaults */
+	}
+	else if (pg_strcasecmp(yytext, "backward") == 0)
+	{
+		fetch->direction = FETCH_BACKWARD;
+	}
+	else if (tok != T_SCALAR)
+	{
+		plpgsql_push_back_token(tok);
+		fetch->expr = read_sql_construct(K_FROM, K_IN, "FROM or IN",
+										 "SELECT ", true, true, NULL);
+		check_FROM = false;
+	}
+	else
+	{
+		/* Assume there's no direction clause */
+		plpgsql_push_back_token(tok);
+		check_FROM = false;
+	}
 
-	return (PLpgSQL_stmt *) fetch;
+	/* check FROM or IN keyword after direction's specification */
+	if (check_FROM)
+	{
+		tok = yylex();
+		if (tok != K_FROM && tok != K_IN)
+			yyerror("expected FROM or IN");
+	}
+
+	return fetch;
 }
 
 
@@ -2134,9 +2250,9 @@ make_return_query_stmt(int lineno)
 		yyerror("cannot use RETURN QUERY in a non-SETOF function");
 
 	new = palloc0(sizeof(PLpgSQL_stmt_return_query));
-	new->cmd_type	= PLPGSQL_STMT_RETURN_QUERY;
-	new->lineno		= lineno;
-	new->query		= read_sql_construct(';', 0, ")", "", false, true, NULL);
+	new->cmd_type = PLPGSQL_STMT_RETURN_QUERY;
+	new->lineno = lineno;
+	new->query = read_sql_construct(';', 0, ")", "", false, true, NULL);
 
 	return (PLpgSQL_stmt *) new;
 }
@@ -2396,6 +2512,17 @@ plpgsql_sql_error_callback(void *arg)
 	errposition(0);
 }
 
+static char *
+check_label(const char *yytxt)
+{
+	char	   *label_name;
+
+	plpgsql_convert_ident(yytxt, &label_name, 1);
+	if (plpgsql_ns_lookup_label(label_name) == NULL)
+		yyerror("no such label");
+	return label_name;
+}
+
 static void
 check_labels(const char *start_label, const char *end_label)
 {
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index e468da4d02c2..6e6a493f52d6 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.113 2007/02/09 03:35:34 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.121.2.1 2008/10/09 16:35:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -175,6 +175,7 @@ plpgsql_compile(FunctionCallInfo fcinfo, bool forValidator)
 			 * storage (if not done already).
 			 */
 			delete_function(function);
+
 			/*
 			 * If the function isn't in active use then we can overwrite the
 			 * func struct with new data, allowing any other existing fn_extra
@@ -186,8 +187,8 @@ plpgsql_compile(FunctionCallInfo fcinfo, bool forValidator)
 			 * what a corner case this is.)
 			 *
 			 * If we found the function struct via fn_extra then it's possible
-			 * a replacement has already been made, so go back and recheck
-			 * the hashtable.
+			 * a replacement has already been made, so go back and recheck the
+			 * hashtable.
 			 */
 			if (function->use_count != 0)
 			{
@@ -307,10 +308,12 @@ do_compile(FunctionCallInfo fcinfo,
 	error_context_stack = &plerrcontext;
 
 	/*
-	 * Initialize the compiler
+	 * Initialize the compiler, particularly the namespace stack.  The
+	 * outermost namespace contains function parameters and other special
+	 * variables (such as FOUND), and is named after the function itself.
 	 */
 	plpgsql_ns_init();
-	plpgsql_ns_push(NULL);
+	plpgsql_ns_push(NameStr(procStruct->proname));
 	plpgsql_DumpExecTree = false;
 
 	datums_alloc = 128;
@@ -407,7 +410,7 @@ do_compile(FunctionCallInfo fcinfo,
 				argdtype = plpgsql_build_datatype(argtypeid, -1);
 
 				/* Disallow pseudotype argument */
-				/* (note we already replaced ANYARRAY/ANYELEMENT) */
+				/* (note we already replaced polymorphic types) */
 				/* (build_variable would do this, but wrong message) */
 				if (argdtype->ttype != PLPGSQL_TTYPE_SCALAR &&
 					argdtype->ttype != PLPGSQL_TTYPE_ROW)
@@ -499,14 +502,15 @@ do_compile(FunctionCallInfo fcinfo,
 			 * the info available.
 			 */
 			rettypeid = procStruct->prorettype;
-			if (rettypeid == ANYARRAYOID || rettypeid == ANYELEMENTOID)
+			if (IsPolymorphicType(rettypeid))
 			{
 				if (forValidator)
 				{
 					if (rettypeid == ANYARRAYOID)
 						rettypeid = INT4ARRAYOID;
-					else
+					else	/* ANYELEMENT or ANYNONARRAY */
 						rettypeid = INT4OID;
+					/* XXX what could we use for ANYENUM? */
 				}
 				else
 				{
@@ -537,8 +541,8 @@ do_compile(FunctionCallInfo fcinfo,
 			typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 			/* Disallow pseudotype result, except VOID or RECORD */
-			/* (note we already replaced ANYARRAY/ANYELEMENT) */
-			if (typeStruct->typtype == 'p')
+			/* (note we already replaced polymorphic types) */
+			if (typeStruct->typtype == TYPTYPE_PSEUDO)
 			{
 				if (rettypeid == VOIDOID ||
 					rettypeid == RECORDOID)
@@ -569,8 +573,7 @@ do_compile(FunctionCallInfo fcinfo,
 				 * types, and not when the return is specified through an
 				 * output parameter.
 				 */
-				if ((procStruct->prorettype == ANYARRAYOID ||
-					 procStruct->prorettype == ANYELEMENTOID) &&
+				if (IsPolymorphicType(procStruct->prorettype) &&
 					num_out_args == 0)
 				{
 					(void) plpgsql_build_variable("$0", 0,
@@ -958,7 +961,7 @@ add_dummy_return(PLpgSQL_function *function)
  * ----------
  */
 int
-plpgsql_parse_word(char *word)
+plpgsql_parse_word(const char *word)
 {
 	PLpgSQL_nsitem *nse;
 	char	   *cp[1];
@@ -968,6 +971,7 @@ plpgsql_parse_word(char *word)
 
 	/*
 	 * Recognize tg_argv when compiling triggers
+	 * (XXX this sucks, it should be a regular variable in the namestack)
 	 */
 	if (plpgsql_curr_compile->fn_functype == T_TRIGGER)
 	{
@@ -996,15 +1000,13 @@ plpgsql_parse_word(char *word)
 	/*
 	 * Do a lookup on the compiler's namestack
 	 */
-	nse = plpgsql_ns_lookup(cp[0], NULL);
+	nse = plpgsql_ns_lookup(cp[0], NULL, NULL, NULL);
+	pfree(cp[0]);
+
 	if (nse != NULL)
 	{
-		pfree(cp[0]);
 		switch (nse->itemtype)
 		{
-			case PLPGSQL_NSTYPE_LABEL:
-				return T_LABEL;
-
 			case PLPGSQL_NSTYPE_VAR:
 				plpgsql_yylval.scalar = plpgsql_Datums[nse->itemno];
 				return T_SCALAR;
@@ -1026,7 +1028,6 @@ plpgsql_parse_word(char *word)
 	 * Nothing found - up to now it's a word without any special meaning for
 	 * us.
 	 */
-	pfree(cp[0]);
 	return T_WORD;
 }
 
@@ -1037,18 +1038,19 @@ plpgsql_parse_word(char *word)
  * ----------
  */
 int
-plpgsql_parse_dblword(char *word)
+plpgsql_parse_dblword(const char *word)
 {
 	PLpgSQL_nsitem *ns;
 	char	   *cp[2];
+	int			nnames;
 
 	/* Do case conversion and word separation */
 	plpgsql_convert_ident(word, cp, 2);
 
 	/*
-	 * Lookup the first word
+	 * Do a lookup on the compiler's namestack
 	 */
-	ns = plpgsql_ns_lookup(cp[0], NULL);
+	ns = plpgsql_ns_lookup(cp[0], cp[1], NULL, &nnames);
 	if (ns == NULL)
 	{
 		pfree(cp[0]);
@@ -1058,39 +1060,15 @@ plpgsql_parse_dblword(char *word)
 
 	switch (ns->itemtype)
 	{
-		case PLPGSQL_NSTYPE_LABEL:
-
-			/*
-			 * First word is a label, so second word could be a variable,
-			 * record or row in that bodies namestack. Anything else could
-			 * only be something in a query given to the SPI manager and
-			 * T_ERROR will get eaten up by the collector routines.
-			 */
-			ns = plpgsql_ns_lookup(cp[1], cp[0]);
+		case PLPGSQL_NSTYPE_VAR:
+			/* Block-qualified reference to scalar variable. */
+			plpgsql_yylval.scalar = plpgsql_Datums[ns->itemno];
 			pfree(cp[0]);
 			pfree(cp[1]);
-			if (ns == NULL)
-				return T_ERROR;
-			switch (ns->itemtype)
-			{
-				case PLPGSQL_NSTYPE_VAR:
-					plpgsql_yylval.scalar = plpgsql_Datums[ns->itemno];
-					return T_SCALAR;
-
-				case PLPGSQL_NSTYPE_REC:
-					plpgsql_yylval.rec = (PLpgSQL_rec *) (plpgsql_Datums[ns->itemno]);
-					return T_RECORD;
-
-				case PLPGSQL_NSTYPE_ROW:
-					plpgsql_yylval.row = (PLpgSQL_row *) (plpgsql_Datums[ns->itemno]);
-					return T_ROW;
-
-				default:
-					return T_ERROR;
-			}
-			break;
+			return T_SCALAR;
 
 		case PLPGSQL_NSTYPE_REC:
+			if (nnames == 1)
 			{
 				/*
 				 * First word is a record name, so second word must be a field
@@ -1111,8 +1089,17 @@ plpgsql_parse_dblword(char *word)
 				pfree(cp[1]);
 				return T_SCALAR;
 			}
+			else
+			{
+				/* Block-qualified reference to record variable. */
+				plpgsql_yylval.rec = (PLpgSQL_rec *) (plpgsql_Datums[ns->itemno]);
+				pfree(cp[0]);
+				pfree(cp[1]);
+				return T_RECORD;
+			}
 
 		case PLPGSQL_NSTYPE_ROW:
+			if (nnames == 1)
 			{
 				/*
 				 * First word is a row name, so second word must be a field in
@@ -1138,6 +1125,14 @@ plpgsql_parse_dblword(char *word)
 						 errmsg("row \"%s\" has no field \"%s\"",
 								cp[0], cp[1])));
 			}
+			else
+			{
+				/* Block-qualified reference to row variable. */
+				plpgsql_yylval.row = (PLpgSQL_row *) (plpgsql_Datums[ns->itemno]);
+				pfree(cp[0]);
+				pfree(cp[1]);
+				return T_ROW;
+			}
 
 		default:
 			break;
@@ -1155,38 +1150,21 @@ plpgsql_parse_dblword(char *word)
  * ----------
  */
 int
-plpgsql_parse_tripword(char *word)
+plpgsql_parse_tripword(const char *word)
 {
 	PLpgSQL_nsitem *ns;
 	char	   *cp[3];
+	int			nnames;
 
 	/* Do case conversion and word separation */
 	plpgsql_convert_ident(word, cp, 3);
 
 	/*
-	 * Lookup the first word - it must be a label
-	 */
-	ns = plpgsql_ns_lookup(cp[0], NULL);
-	if (ns == NULL)
-	{
-		pfree(cp[0]);
-		pfree(cp[1]);
-		pfree(cp[2]);
-		return T_ERROR;
-	}
-	if (ns->itemtype != PLPGSQL_NSTYPE_LABEL)
-	{
-		pfree(cp[0]);
-		pfree(cp[1]);
-		pfree(cp[2]);
-		return T_ERROR;
-	}
-
-	/*
-	 * First word is a label, so second word could be a record or row
+	 * Do a lookup on the compiler's namestack.
+	 * Must find a qualified reference.
 	 */
-	ns = plpgsql_ns_lookup(cp[1], cp[0]);
-	if (ns == NULL)
+	ns = plpgsql_ns_lookup(cp[0], cp[1], cp[2], &nnames);
+	if (ns == NULL || nnames != 2)
 	{
 		pfree(cp[0]);
 		pfree(cp[1]);
@@ -1199,7 +1177,7 @@ plpgsql_parse_tripword(char *word)
 		case PLPGSQL_NSTYPE_REC:
 			{
 				/*
-				 * This word is a record name, so third word must be a field
+				 * words 1/2 are a record name, so third word must be a field
 				 * in this record.
 				 */
 				PLpgSQL_recfield *new;
@@ -1223,7 +1201,7 @@ plpgsql_parse_tripword(char *word)
 		case PLPGSQL_NSTYPE_ROW:
 			{
 				/*
-				 * This word is a row name, so third word must be a field in
+				 * words 1/2 are a row name, so third word must be a field in
 				 * this row.
 				 */
 				PLpgSQL_row *row;
@@ -1271,7 +1249,7 @@ plpgsql_parse_wordtype(char *word)
 {
 	PLpgSQL_nsitem *nse;
 	bool		old_nsstate;
-	Oid			typeOid;
+	HeapTuple	typeTup;
 	char	   *cp[2];
 	int			i;
 
@@ -1285,11 +1263,10 @@ plpgsql_parse_wordtype(char *word)
 	pfree(cp[1]);
 
 	/*
-	 * Do a lookup on the compiler's namestack. But ensure it moves up to the
-	 * toplevel.
+	 * Do a lookup on the compiler's namestack.  Ensure we scan all levels.
 	 */
 	old_nsstate = plpgsql_ns_setlocal(false);
-	nse = plpgsql_ns_lookup(cp[0], NULL);
+	nse = plpgsql_ns_lookup(cp[0], NULL, NULL, NULL);
 	plpgsql_ns_setlocal(old_nsstate);
 
 	if (nse != NULL)
@@ -1310,34 +1287,26 @@ plpgsql_parse_wordtype(char *word)
 
 	/*
 	 * Word wasn't found on the namestack. Try to find a data type with that
-	 * name, but ignore pg_type entries that are in fact class types.
+	 * name, but ignore shell types and complex types.
 	 */
-	typeOid = LookupTypeName(NULL, makeTypeName(cp[0]));
-	if (OidIsValid(typeOid))
+	typeTup = LookupTypeName(NULL, makeTypeName(cp[0]), NULL);
+	if (typeTup)
 	{
-		HeapTuple	typeTup;
+		Form_pg_type typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
-		typeTup = SearchSysCache(TYPEOID,
-								 ObjectIdGetDatum(typeOid),
-								 0, 0, 0);
-		if (HeapTupleIsValid(typeTup))
+		if (!typeStruct->typisdefined ||
+			typeStruct->typrelid != InvalidOid)
 		{
-			Form_pg_type typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
-
-			if (!typeStruct->typisdefined ||
-				typeStruct->typrelid != InvalidOid)
-			{
-				ReleaseSysCache(typeTup);
-				pfree(cp[0]);
-				return T_ERROR;
-			}
-
-			plpgsql_yylval.dtype = build_datatype(typeTup, -1);
-
 			ReleaseSysCache(typeTup);
 			pfree(cp[0]);
-			return T_DTYPE;
+			return T_ERROR;
 		}
+
+		plpgsql_yylval.dtype = build_datatype(typeTup, -1);
+
+		ReleaseSysCache(typeTup);
+		pfree(cp[0]);
+		return T_DTYPE;
 	}
 
 	/*
@@ -1379,32 +1348,21 @@ plpgsql_parse_dblwordtype(char *word)
 	word[i] = '.';
 	plpgsql_convert_ident(word, cp, 3);
 	word[i] = '%';
+	pfree(cp[2]);
 
 	/*
-	 * Lookup the first word
+	 * Do a lookup on the compiler's namestack.  Ensure we scan all levels.
+	 * We don't need to check number of names matched, because we will only
+	 * consider scalar variables.
 	 */
-	nse = plpgsql_ns_lookup(cp[0], NULL);
+	old_nsstate = plpgsql_ns_setlocal(false);
+	nse = plpgsql_ns_lookup(cp[0], cp[1], NULL, NULL);
+	plpgsql_ns_setlocal(old_nsstate);
 
-	/*
-	 * If this is a label lookup the second word in that label's namestack
-	 * level
-	 */
-	if (nse != NULL)
+	if (nse != NULL && nse->itemtype == PLPGSQL_NSTYPE_VAR)
 	{
-		if (nse->itemtype == PLPGSQL_NSTYPE_LABEL)
-		{
-			old_nsstate = plpgsql_ns_setlocal(false);
-			nse = plpgsql_ns_lookup(cp[1], cp[0]);
-			plpgsql_ns_setlocal(old_nsstate);
-
-			if (nse != NULL && nse->itemtype == PLPGSQL_NSTYPE_VAR)
-			{
-				plpgsql_yylval.dtype = ((PLpgSQL_var *) (plpgsql_Datums[nse->itemno]))->datatype;
-				result = T_DTYPE;
-			}
-		}
-
-		/* Return T_ERROR if not found, otherwise T_DTYPE */
+		plpgsql_yylval.dtype = ((PLpgSQL_var *) (plpgsql_Datums[nse->itemno]))->datatype;
+		result = T_DTYPE;
 		goto done;
 	}
 
@@ -1470,8 +1428,6 @@ plpgsql_parse_dblwordtype(char *word)
  * plpgsql_parse_tripwordtype		Same lookup for word.word.word%TYPE
  * ----------
  */
-#define TYPE_JUNK_LEN	5
-
 int
 plpgsql_parse_tripwordtype(char *word)
 {
@@ -1481,10 +1437,7 @@ plpgsql_parse_tripwordtype(char *word)
 	HeapTuple	typetup = NULL;
 	Form_pg_class classStruct;
 	Form_pg_attribute attrStruct;
-	char	   *cp[2];
-	char	   *colname[1];
-	int			qualified_att_len;
-	int			numdots = 0;
+	char	   *cp[4];
 	int			i;
 	RangeVar   *relvar;
 	MemoryContext oldCxt;
@@ -1494,28 +1447,15 @@ plpgsql_parse_tripwordtype(char *word)
 	oldCxt = MemoryContextSwitchTo(compile_tmp_cxt);
 
 	/* Do case conversion and word separation */
-	qualified_att_len = strlen(word) - TYPE_JUNK_LEN;
-	Assert(word[qualified_att_len] == '%');
-
-	for (i = 0; i < qualified_att_len; i++)
-	{
-		if (word[i] == '.' && ++numdots == 2)
-			break;
-	}
-
-	cp[0] = (char *) palloc((i + 1) * sizeof(char));
-	memcpy(cp[0], word, i * sizeof(char));
-	cp[0][i] = '\0';
-
-	/*
-	 * qualified_att_len - one based position + 1 (null terminator)
-	 */
-	cp[1] = (char *) palloc((qualified_att_len - i) * sizeof(char));
-	memcpy(cp[1], &word[i + 1], (qualified_att_len - i - 1) * sizeof(char));
-	cp[1][qualified_att_len - i - 1] = '\0';
+	/* We convert %type to .type momentarily to keep converter happy */
+	i = strlen(word) - 5;
+	Assert(word[i] == '%');
+	word[i] = '.';
+	plpgsql_convert_ident(word, cp, 4);
+	word[i] = '%';
+	pfree(cp[3]);
 
-	relvar = makeRangeVarFromNameList(stringToQualifiedNameList(cp[0],
-											  "plpgsql_parse_tripwordtype"));
+	relvar = makeRangeVar(cp[0], cp[1], -1);
 	classOid = RangeVarGetRelid(relvar, true);
 	if (!OidIsValid(classOid))
 		goto done;
@@ -1539,8 +1479,7 @@ plpgsql_parse_tripwordtype(char *word)
 	/*
 	 * Fetch the named table field and its type
 	 */
-	plpgsql_convert_ident(cp[1], colname, 1);
-	attrtup = SearchSysCacheAttName(classOid, colname[0]);
+	attrtup = SearchSysCacheAttName(classOid, cp[2]);
 	if (!HeapTupleIsValid(attrtup))
 		goto done;
 	attrStruct = (Form_pg_attribute) GETSTRUCT(attrtup);
@@ -1616,13 +1555,11 @@ plpgsql_parse_wordrowtype(char *word)
  *			So word must be a namespace qualified table name.
  * ----------
  */
-#define ROWTYPE_JUNK_LEN	8
-
 int
 plpgsql_parse_dblwordrowtype(char *word)
 {
 	Oid			classOid;
-	char	   *cp;
+	char	   *cp[3];
 	int			i;
 	RangeVar   *relvar;
 	MemoryContext oldCxt;
@@ -1632,19 +1569,19 @@ plpgsql_parse_dblwordrowtype(char *word)
 
 	/* Do case conversion and word separation */
 	/* We convert %rowtype to .rowtype momentarily to keep converter happy */
-	i = strlen(word) - ROWTYPE_JUNK_LEN;
+	i = strlen(word) - 8;
 	Assert(word[i] == '%');
-	word[i] = '\0';
-	cp = pstrdup(word);
+	word[i] = '.';
+	plpgsql_convert_ident(word, cp, 3);
 	word[i] = '%';
 
 	/* Lookup the relation */
-	relvar = makeRangeVarFromNameList(stringToQualifiedNameList(cp, "plpgsql_parse_dblwordrowtype"));
+	relvar = makeRangeVar(cp[0], cp[1], -1);
 	classOid = RangeVarGetRelid(relvar, true);
 	if (!OidIsValid(classOid))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s\" does not exist", cp)));
+				 errmsg("relation \"%s.%s\" does not exist", cp[0], cp[1])));
 
 	/* Build and return the row type struct */
 	plpgsql_yylval.dtype = plpgsql_build_datatype(get_rel_type_id(classOid),
@@ -1959,15 +1896,16 @@ build_datatype(HeapTuple typeTup, int32 typmod)
 	typ->typoid = HeapTupleGetOid(typeTup);
 	switch (typeStruct->typtype)
 	{
-		case 'b':				/* base type */
-		case 'd':				/* domain */
+		case TYPTYPE_BASE:
+		case TYPTYPE_DOMAIN:
+		case TYPTYPE_ENUM:
 			typ->ttype = PLPGSQL_TTYPE_SCALAR;
 			break;
-		case 'c':				/* composite, ie, rowtype */
+		case TYPTYPE_COMPOSITE:
 			Assert(OidIsValid(typeStruct->typrelid));
 			typ->ttype = PLPGSQL_TTYPE_ROW;
 			break;
-		case 'p':				/* pseudo */
+		case TYPTYPE_PSEUDO:
 			if (typ->typoid == RECORDOID)
 				typ->ttype = PLPGSQL_TTYPE_REC;
 			else
@@ -2070,7 +2008,7 @@ plpgsql_adddatum(PLpgSQL_datum *new)
  * last call.
  *
  * This is used around a DECLARE section to create a list of the VARs
- * that have to be initialized at block entry.  Note that VARs can also
+ * that have to be initialized at block entry.	Note that VARs can also
  * be created elsewhere than DECLARE, eg by a FOR-loop, but it is then
  * the responsibility of special-purpose code to initialize them.
  * ----------
@@ -2203,6 +2141,8 @@ plpgsql_resolve_polymorphic_argtypes(int numargs,
 			switch (argtypes[i])
 			{
 				case ANYELEMENTOID:
+				case ANYNONARRAYOID:
+				case ANYENUMOID:		/* XXX dubious */
 					argtypes[i] = INT4OID;
 					break;
 				case ANYARRAYOID:
@@ -2219,7 +2159,7 @@ plpgsql_resolve_polymorphic_argtypes(int numargs,
  * delete_function - clean up as much as possible of a stale function cache
  *
  * We can't release the PLpgSQL_function struct itself, because of the
- * possibility that there are fn_extra pointers to it.  We can release
+ * possibility that there are fn_extra pointers to it.	We can release
  * the subsidiary storage, but only if there are no active evaluations
  * in progress.  Otherwise we'll just leak that storage.  Since the
  * case would only occur if a pg_proc update is detected during a nested
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index d62734a08469..965ee84ddac7 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.188 2007/02/08 18:37:30 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.202.2.10 2010/08/19 18:11:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,23 +44,23 @@ static const char *const raise_skip_msg = "RAISE";
  * creates its own "eval_econtext" ExprContext within this estate for
  * per-evaluation workspace.  eval_econtext is freed at normal function exit,
  * and the EState is freed at transaction end (in case of error, we assume
- * that the abort mechanisms clean it all up).  In order to be sure
+ * that the abort mechanisms clean it all up).	In order to be sure
  * ExprContext callbacks are handled properly, each subtransaction has to have
- * its own such EState; hence we need a stack.  We use a simple counter to
+ * its own such EState; hence we need a stack.	We use a simple counter to
  * distinguish different instantiations of the EState, so that we can tell
  * whether we have a current copy of a prepared expression.
  *
  * This arrangement is a bit tedious to maintain, but it's worth the trouble
  * so that we don't have to re-prepare simple expressions on each trip through
- * a function.  (We assume the case to optimize is many repetitions of a
+ * a function.	(We assume the case to optimize is many repetitions of a
  * function within a transaction.)
  */
 typedef struct SimpleEstateStackEntry
 {
-	EState *xact_eval_estate;				/* EState for current xact level */
-	long int	xact_estate_simple_id;		/* ID for xact_eval_estate */
-	SubTransactionId xact_subxid;			/* ID for current subxact */
-	struct SimpleEstateStackEntry *next;	/* next stack entry up */
+	EState	   *xact_eval_estate;		/* EState for current xact level */
+	long int	xact_estate_simple_id;	/* ID for xact_eval_estate */
+	SubTransactionId xact_subxid;		/* ID for current subxact */
+	struct SimpleEstateStackEntry *next;		/* next stack entry up */
 } SimpleEstateStackEntry;
 
 static SimpleEstateStackEntry *simple_estate_stack = NULL;
@@ -123,11 +123,12 @@ static void plpgsql_estate_setup(PLpgSQL_execstate *estate,
 static void exec_eval_cleanup(PLpgSQL_execstate *estate);
 
 static void exec_prepare_plan(PLpgSQL_execstate *estate,
-				  PLpgSQL_expr *expr);
+				  PLpgSQL_expr *expr, int cursorOptions);
 static bool exec_simple_check_node(Node *node);
 static void exec_simple_check_plan(PLpgSQL_expr *expr);
-static Datum exec_eval_simple_expr(PLpgSQL_execstate *estate,
+static bool exec_eval_simple_expr(PLpgSQL_execstate *estate,
 					  PLpgSQL_expr *expr,
+					  Datum *result,
 					  bool *isNull,
 					  Oid *rettype);
 
@@ -162,14 +163,17 @@ static void exec_move_row(PLpgSQL_execstate *estate,
 static HeapTuple make_tuple_from_row(PLpgSQL_execstate *estate,
 					PLpgSQL_row *row,
 					TupleDesc tupdesc);
-static char *convert_value_to_string(Datum value, Oid valtype);
-static Datum exec_cast_value(Datum value, Oid valtype,
+static char *convert_value_to_string(PLpgSQL_execstate *estate,
+						Datum value, Oid valtype);
+static Datum exec_cast_value(PLpgSQL_execstate *estate,
+				Datum value, Oid valtype,
 				Oid reqtype,
 				FmgrInfo *reqinput,
 				Oid reqtypioparam,
 				int32 reqtypmod,
 				bool isnull);
-static Datum exec_simple_cast_value(Datum value, Oid valtype,
+static Datum exec_simple_cast_value(PLpgSQL_execstate *estate,
+					   Datum value, Oid valtype,
 					   Oid reqtype, int32 reqtypmod,
 					   bool isnull);
 static void exec_init_tuple_store(PLpgSQL_execstate *estate);
@@ -177,8 +181,6 @@ static bool compatible_tupdesc(TupleDesc td1, TupleDesc td2);
 static void exec_set_found(PLpgSQL_execstate *estate, bool state);
 static void plpgsql_create_econtext(PLpgSQL_execstate *estate);
 static void free_var(PLpgSQL_var *var);
-static void exec_check_cache_plan(PLpgSQL_expr *expr);
-static void exec_free_plan(PLpgSQL_expr *expr);
 
 
 /* ----------
@@ -254,7 +256,6 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)
 						/* Build a temporary HeapTuple control structure */
 						tmptup.t_len = HeapTupleHeaderGetDatumLength(td);
 						ItemPointerSetInvalid(&(tmptup.t_self));
-						//tmptup.t_tableOid = InvalidOid;
 						tmptup.t_data = td;
 						exec_move_row(&estate, NULL, row, &tmptup, tupdesc);
 						ReleaseTupleDesc(tupdesc);
@@ -264,6 +265,8 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)
 						/* If arg is null, treat it as an empty row */
 						exec_move_row(&estate, NULL, row, NULL, NULL);
 					}
+					/* clean up after exec_move_row() */
+					exec_eval_cleanup(&estate);
 				}
 				break;
 
@@ -397,7 +400,9 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)
 		else
 		{
 			/* Cast value to proper type */
-			estate.retval = exec_cast_value(estate.retval, estate.rettype,
+			estate.retval = exec_cast_value(&estate,
+											estate.retval,
+											estate.rettype,
 											func->fn_rettype,
 											&(func->fn_retinput),
 											func->fn_rettypioparam,
@@ -909,7 +914,7 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 						 */
 						if (!var->datatype->typinput.fn_strict)
 						{
-							bool	valIsNull = true;
+							bool		valIsNull = true;
 
 							exec_assign_value(estate,
 											  (PLpgSQL_datum *) var,
@@ -1093,8 +1098,10 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 
 					free_var(state_var);
 					state_var->value = (Datum) 0;
+					state_var->isnull = true;
 					free_var(errm_var);
 					errm_var->value = (Datum) 0;
+					errm_var->isnull = true;
 					break;
 				}
 			}
@@ -1344,17 +1351,9 @@ exec_stmt_getdiag(PLpgSQL_execstate *estate, PLpgSQL_stmt_getdiag *stmt)
 	foreach(lc, stmt->diag_items)
 	{
 		PLpgSQL_diag_item *diag_item = (PLpgSQL_diag_item *) lfirst(lc);
-		PLpgSQL_datum *var;
+		PLpgSQL_datum *var = estate->datums[diag_item->target];
 		bool		isnull = false;
 
-		if (diag_item->target <= 0)
-			continue;
-
-		var = estate->datums[diag_item->target];
-
-		if (var == NULL)
-			continue;
-
 		switch (diag_item->kind)
 		{
 			case PLPGSQL_GETDIAG_ROW_COUNT:
@@ -1528,8 +1527,7 @@ exec_stmt_while(PLpgSQL_execstate *estate, PLpgSQL_stmt_while *stmt)
 /* ----------
  * exec_stmt_fori			Iterate an integer variable
  *					from a lower to an upper value
- *					incrementing or decrementing in BY value
- *					Loop can be left with exit.
+ *					incrementing or decrementing by the BY value
  * ----------
  */
 static int
@@ -1537,19 +1535,21 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
 {
 	PLpgSQL_var *var;
 	Datum		value;
-	Datum		by_value;
-	Oid			valtype;
 	bool		isnull;
+	Oid			valtype;
+	int32		loop_value;
+	int32		end_value;
+	int32		step_value;
 	bool		found = false;
 	int			rc = PLPGSQL_RC_OK;
 
 	var = (PLpgSQL_var *) (estate->datums[stmt->var->varno]);
 
 	/*
-	 * Get the value of the lower bound into the loop var
+	 * Get the value of the lower bound
 	 */
 	value = exec_eval_expr(estate, stmt->lower, &isnull, &valtype);
-	value = exec_cast_value(value, valtype, var->datatype->typoid,
+	value = exec_cast_value(estate, value, valtype, var->datatype->typoid,
 							&(var->datatype->typinput),
 							var->datatype->typioparam,
 							var->datatype->atttypmod, isnull);
@@ -1557,15 +1557,14 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 				 errmsg("lower bound of FOR loop cannot be NULL")));
-	var->value = value;
-	var->isnull = false;
+	loop_value = DatumGetInt32(value);
 	exec_eval_cleanup(estate);
 
 	/*
 	 * Get the value of the upper bound
 	 */
 	value = exec_eval_expr(estate, stmt->upper, &isnull, &valtype);
-	value = exec_cast_value(value, valtype, var->datatype->typoid,
+	value = exec_cast_value(estate, value, valtype, var->datatype->typoid,
 							&(var->datatype->typinput),
 							var->datatype->typioparam,
 							var->datatype->atttypmod, isnull);
@@ -1573,22 +1572,32 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 				 errmsg("upper bound of FOR loop cannot be NULL")));
+	end_value = DatumGetInt32(value);
 	exec_eval_cleanup(estate);
 
 	/*
-	 * Get the by value
+	 * Get the step value
 	 */
-	by_value = exec_eval_expr(estate, stmt->by, &isnull, &valtype);
-	by_value = exec_cast_value(by_value, valtype, var->datatype->typoid,
-							   &(var->datatype->typinput),
-							   var->datatype->typioparam,
-							   var->datatype->atttypmod, isnull);
-
-	if (isnull)
-		ereport(ERROR,
-				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-				 errmsg("by value of FOR loop cannot be NULL")));
-	exec_eval_cleanup(estate);
+	if (stmt->step)
+	{
+		value = exec_eval_expr(estate, stmt->step, &isnull, &valtype);
+		value = exec_cast_value(estate, value, valtype, var->datatype->typoid,
+								&(var->datatype->typinput),
+								var->datatype->typioparam,
+								var->datatype->atttypmod, isnull);
+		if (isnull)
+			ereport(ERROR,
+					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+					 errmsg("BY value of FOR loop cannot be NULL")));
+		step_value = DatumGetInt32(value);
+		exec_eval_cleanup(estate);
+		if (step_value <= 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				  errmsg("BY value of FOR loop must be greater than zero")));
+	}
+	else
+		step_value = 1;
 
 	/*
 	 * Now do the loop
@@ -1596,21 +1605,27 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
 	for (;;)
 	{
 		/*
-		 * Check bounds
+		 * Check against upper bound
 		 */
 		if (stmt->reverse)
 		{
-			if ((int4) (var->value) < (int4) value)
+			if (loop_value < end_value)
 				break;
 		}
 		else
 		{
-			if ((int4) (var->value) > (int4) value)
+			if (loop_value > end_value)
 				break;
 		}
 
 		found = true;			/* looped at least once */
 
+		/*
+		 * Assign current value to loop var
+		 */
+		var->value = Int32GetDatum(loop_value);
+		var->isnull = false;
+
 		/*
 		 * Execute the statements
 		 */
@@ -1666,9 +1681,17 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
 		 * case exit the loop.
 		 */
 		if (stmt->reverse)
-			var->value -= by_value;
+		{
+			if ((int32) (loop_value - step_value) > loop_value)
+				break;
+			loop_value -= step_value;
+		}
 		else
-			var->value += by_value;
+		{
+			if ((int32) (loop_value + step_value) < loop_value)
+				break;
+			loop_value += step_value;
+		}
 	}
 
 	/*
@@ -1714,9 +1737,11 @@ exec_stmt_fors(PLpgSQL_execstate *estate, PLpgSQL_stmt_fors *stmt)
 
 	/*
 	 * Open the implicit cursor for the statement and fetch the initial 10
-	 * rows.
+	 * rows. Pin the portal to make sure it doesn't get closed by the user
+	 * statements we execute.
 	 */
 	exec_run_select(estate, stmt->query, 0, &portal);
+	PinPortal(portal);
 
 	SPI_cursor_fetch(portal, true, 10);
 	tuptab = SPI_tuptable;
@@ -1727,7 +1752,10 @@ exec_stmt_fors(PLpgSQL_execstate *estate, PLpgSQL_stmt_fors *stmt)
 	 * with FOUND = false.
 	 */
 	if (n == 0)
+	{
 		exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
+		exec_eval_cleanup(estate);
+	}
 	else
 		found = true;			/* processed at least one tuple */
 
@@ -1742,6 +1770,7 @@ exec_stmt_fors(PLpgSQL_execstate *estate, PLpgSQL_stmt_fors *stmt)
 			 * Assign the tuple to the target
 			 */
 			exec_move_row(estate, rec, row, tuptab->vals[i], tuptab->tupdesc);
+			exec_eval_cleanup(estate);
 
 			/*
 			 * Execute the statements
@@ -1798,6 +1827,7 @@ exec_stmt_fors(PLpgSQL_execstate *estate, PLpgSQL_stmt_fors *stmt)
 				 * code should match the code after the loop.)
 				 */
 				SPI_freetuptable(tuptab);
+				UnpinPortal(portal);
 				SPI_cursor_close(portal);
 				exec_set_found(estate, found);
 
@@ -1823,6 +1853,7 @@ exec_stmt_fors(PLpgSQL_execstate *estate, PLpgSQL_stmt_fors *stmt)
 	/*
 	 * Close the implicit cursor
 	 */
+	UnpinPortal(portal);
 	SPI_cursor_close(portal);
 
 	/*
@@ -1999,9 +2030,7 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 				 errmsg("cannot use RETURN NEXT in a non-SETOF function")));
 
 	if (estate->tuple_store == NULL)
-	{
 		exec_init_tuple_store(estate);
-	}
 
 	/* rettupdesc will be filled by exec_init_tuple_store */
 	tupdesc = estate->rettupdesc;
@@ -2025,7 +2054,8 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 						errmsg("wrong result type supplied in RETURN NEXT")));
 
 					/* coerce type if needed */
-					retval = exec_simple_cast_value(retval,
+					retval = exec_simple_cast_value(estate,
+													retval,
 													var->datatype->typoid,
 												 tupdesc->attrs[0]->atttypid,
 												tupdesc->attrs[0]->atttypmod,
@@ -2091,7 +2121,8 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 								&rettype);
 
 		/* coerce type if needed */
-		retval = exec_simple_cast_value(retval,
+		retval = exec_simple_cast_value(estate,
+										retval,
 										rettype,
 										tupdesc->attrs[0]->atttypid,
 										tupdesc->attrs[0]->atttypmod,
@@ -2100,8 +2131,6 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 		tuple = heap_form_tuple(tupdesc, &retval, &isNull);
 
 		free_tuple = true;
-
-		exec_eval_cleanup(estate);
 	}
 	else
 	{
@@ -2113,16 +2142,14 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 
 	if (HeapTupleIsValid(tuple))
 	{
-		MemoryContext oldcxt;
-
-		oldcxt = MemoryContextSwitchTo(estate->tuple_store_cxt);
 		tuplestore_puttuple(estate->tuple_store, tuple);
-		MemoryContextSwitchTo(oldcxt);
 
 		if (free_tuple)
 			heap_freetuple(tuple);
 	}
 
+	exec_eval_cleanup(estate);
+
 	return PLPGSQL_RC_OK;
 }
 
@@ -2184,6 +2211,7 @@ exec_init_tuple_store(PLpgSQL_execstate *estate)
 {
 	ReturnSetInfo *rsi = estate->rsi;
 	MemoryContext oldcxt;
+	ResourceOwner oldowner;
 
 	/*
 	 * Check caller can handle a set result in the way we want
@@ -2195,10 +2223,20 @@ exec_init_tuple_store(PLpgSQL_execstate *estate)
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("set-valued function called in context that cannot accept a set")));
 
-	estate->tuple_store_cxt = rsi->econtext->ecxt_per_query_memory;
-
+	/*
+	 * Switch to the right memory context and resource owner for storing
+	 * the tuplestore for return set. If we're within a subtransaction opened
+	 * for an exception-block, for example, we must still create the
+	 * tuplestore in the resource owner that was active when this function was
+	 * entered, and not in the subtransaction resource owner.
+	 */
 	oldcxt = MemoryContextSwitchTo(estate->tuple_store_cxt);
-	estate->tuple_store = tuplestore_begin_heap(true, false, work_mem); 
+	oldowner = CurrentResourceOwner;
+	CurrentResourceOwner = estate->tuple_store_owner;
+
+	estate->tuple_store = tuplestore_begin_heap(true, false, work_mem);
+
+	CurrentResourceOwner = oldowner;
 	MemoryContextSwitchTo(oldcxt);
 
 	estate->rettupdesc = rsi->expectedDesc;
@@ -2251,7 +2289,9 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			if (paramisnull)
 				extval = "<NULL>";
 			else
-				extval = convert_value_to_string(paramvalue, paramtypeid);
+				extval = convert_value_to_string(estate,
+												 paramvalue,
+												 paramtypeid);
 			plpgsql_dstring_append(&ds, extval);
 			current_param = lnext(current_param);
 			exec_eval_cleanup(estate);
@@ -2310,7 +2350,16 @@ plpgsql_estate_setup(PLpgSQL_execstate *estate,
 	estate->exitlabel = NULL;
 
 	estate->tuple_store = NULL;
-	estate->tuple_store_cxt = NULL;
+	if (rsi)
+	{
+		estate->tuple_store_cxt = rsi->econtext->ecxt_per_query_memory;
+		estate->tuple_store_owner = CurrentResourceOwner;
+	}
+	else
+	{
+		estate->tuple_store_cxt = NULL;
+		estate->tuple_store_owner = NULL;
+	}
 	estate->rsi = rsi;
 
 	estate->trig_nargs = 0;
@@ -2355,6 +2404,9 @@ plpgsql_estate_setup(PLpgSQL_execstate *estate,
  *
  * NB: the result of the evaluation is no longer valid after this is done,
  * unless it is a pass-by-value datatype.
+ *
+ * NB: if you change this code, see also the hacks in exec_assign_value's
+ * PLPGSQL_DTYPE_ARRAYELEM case.
  * ----------
  */
 static void
@@ -2377,11 +2429,10 @@ exec_eval_cleanup(PLpgSQL_execstate *estate)
  */
 static void
 exec_prepare_plan(PLpgSQL_execstate *estate,
-				  PLpgSQL_expr *expr)
+				  PLpgSQL_expr *expr, int cursorOptions)
 {
 	int			i;
-	_SPI_plan  *spi_plan;
-	void	   *plan;
+	SPIPlanPtr	plan;
 	Oid		   *argtypes;
 
 	/*
@@ -2403,7 +2454,8 @@ exec_prepare_plan(PLpgSQL_execstate *estate,
 	/*
 	 * Generate and save the plan
 	 */
-	plan = SPI_prepare(expr->query, expr->nparams, argtypes);
+	plan = SPI_prepare_cursor(expr->query, expr->nparams, argtypes,
+							  cursorOptions);
 	if (plan == NULL)
 	{
 		/* Some SPI errors deserve specific error messages */
@@ -2413,36 +2465,21 @@ exec_prepare_plan(PLpgSQL_execstate *estate,
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						 errmsg("cannot COPY to/from client in PL/pgSQL")));
-			case SPI_ERROR_CURSOR:
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					errmsg("cannot manipulate cursors directly in PL/pgSQL"),
-						 errhint("Use PL/pgSQL's cursor features instead.")));
 			case SPI_ERROR_TRANSACTION:
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						 errmsg("cannot begin/end transactions in PL/pgSQL"),
 						 errhint("Use a BEGIN block with an EXCEPTION clause instead.")));
 			default:
-				elog(ERROR, "SPI_prepare failed for \"%s\": %s",
+				elog(ERROR, "SPI_prepare_cursor failed for \"%s\": %s",
 					 expr->query, SPI_result_code_string(SPI_result));
 		}
 	}
 	expr->plan = SPI_saveplan(plan);
-	spi_plan = (_SPI_plan *) expr->plan;
-	expr->plan_argtypes = spi_plan->argtypes;
-	expr->expr_simple_expr = NULL;
-	exec_simple_check_plan(expr);
-
 	SPI_freeplan(plan);
-
-	if (Gp_role != GP_ROLE_EXECUTE)
-	{
-		/* 
-		 * if we are not in EXECUTE mode, check if plan should be cached. 
-		 */
-		exec_check_cache_plan(expr);
-	}
+	plan = expr->plan;
+	expr->plan_argtypes = plan->argtypes;
+	exec_simple_check_plan(expr);
 
 	pfree(argtypes);
 }
@@ -2467,35 +2504,27 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 	 * On the first call for this statement generate the plan, and detect
 	 * whether the statement is INSERT/UPDATE/DELETE
 	 */
-
- 	/* if we find a cached plan, check if we want to use it */
-	if (expr->plan != NULL)
-	{
-		exec_free_plan(expr);
-	}
-	
 	if (expr->plan == NULL)
 	{
-		_SPI_plan  *spi_plan;
 		ListCell   *l;
 
-		exec_prepare_plan(estate, expr);
+		exec_prepare_plan(estate, expr, 0);
 		stmt->mod_stmt = false;
-		spi_plan = (_SPI_plan *) expr->plan;
-		foreach(l, spi_plan->qtlist)
+		foreach(l, expr->plan->plancache_list)
 		{
+			CachedPlanSource *plansource = (CachedPlanSource *) lfirst(l);
 			ListCell   *l2;
 
-			foreach(l2, (List *) lfirst(l))
+			foreach(l2, plansource->plan->stmt_list)
 			{
-				Query	   *q = (Query *) lfirst(l2);
+				PlannedStmt *p = (PlannedStmt *) lfirst(l2);
 
-				Assert(IsA(q, Query));
-				if (q->canSetTag)
+				if (IsA(p, PlannedStmt) &&
+					p->canSetTag)
 				{
-					if (q->commandType == CMD_INSERT ||
-						q->commandType == CMD_UPDATE ||
-						q->commandType == CMD_DELETE)
+					if (p->commandType == CMD_INSERT ||
+						p->commandType == CMD_UPDATE ||
+						p->commandType == CMD_DELETE)
 						stmt->mod_stmt = true;
 				}
 			}
@@ -2551,13 +2580,19 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 
 	/*
 	 * Check for error, and set FOUND if appropriate (for historical reasons
-	 * we set FOUND only for certain query types).	Also Assert that we
-	 * identified the statement type the same as SPI did.
+	 * we set FOUND only for certain query types).
+	 *
+	 * Note: the command type indicated by return code might not match
+	 * mod_stmt, if there is an INSTEAD OF rule rewriting an UPDATE into an
+	 * INSERT, for example. In that case, the INSERT doesn't have canSetTag
+	 * set, mod_stmt is false, and SPI_execute_plan sets SPI_processed to
+	 * zero. We'll set FOUND to false here in that case. If the statement is
+	 * rewritten into a utility statement, however, FOUND is left unchanged.
+	 * Arguably that's a bug, but changing it now could break applications.
 	 */
 	switch (rc)
 	{
 		case SPI_OK_SELECT:
-			Assert(!stmt->mod_stmt);
 			exec_set_found(estate, (SPI_processed != 0));
 			break;
 
@@ -2567,13 +2602,11 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 		case SPI_OK_INSERT_RETURNING:
 		case SPI_OK_UPDATE_RETURNING:
 		case SPI_OK_DELETE_RETURNING:
-			Assert(stmt->mod_stmt);
 			exec_set_found(estate, (SPI_processed != 0));
 			break;
 
 		case SPI_OK_SELINTO:
 		case SPI_OK_UTILITY:
-			Assert(!stmt->mod_stmt);
 			break;
 
 		case SPI_OK_REWRITTEN:
@@ -2657,6 +2690,7 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 		}
 
 		/* Clean up */
+		exec_eval_cleanup(estate);
 		SPI_freetuptable(SPI_tuptable);
 	}
 	else
@@ -2702,7 +2736,10 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 				 errmsg("cannot EXECUTE a null querystring")));
 
 	/* Get the C-String representation */
-	querystr = convert_value_to_string(query, restype);
+	querystr = convert_value_to_string(estate, query, restype);
+
+	/* copy it out of the temporary context before we clean up */
+	querystr = pstrdup(querystr);
 
 	exec_eval_cleanup(estate);
 
@@ -2760,11 +2797,6 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("cannot COPY to/from client in PL/pgSQL")));
-		case SPI_ERROR_CURSOR:
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("cannot manipulate cursors directly in PL/pgSQL"),
-					 errhint("Use PL/pgSQL's cursor features instead.")));
 		case SPI_ERROR_TRANSACTION:
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -2826,6 +2858,8 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 			/* Put the first result row into the target */
 			exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
 		}
+		/* clean up after exec_move_row() */
+		exec_eval_cleanup(estate);
 	}
 	else
 	{
@@ -2862,7 +2896,7 @@ exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt)
 	PLpgSQL_row *row = NULL;
 	SPITupleTable *tuptab;
 	int			n;
-	void	   *plan;
+	SPIPlanPtr	plan;
 	Portal		portal;
 	bool		found = false;
 
@@ -2887,7 +2921,10 @@ exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt)
 				 errmsg("cannot EXECUTE a null querystring")));
 
 	/* Get the C-String representation */
-	querystr = convert_value_to_string(query, restype);
+	querystr = convert_value_to_string(estate, query, restype);
+
+	/* copy it out of the temporary context before we clean up */
+	querystr = pstrdup(querystr);
 
 	exec_eval_cleanup(estate);
 
@@ -2906,6 +2943,12 @@ exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt)
 	pfree(querystr);
 	SPI_freeplan(plan);
 
+	/*
+	 * Make sure the portal doesn't get closed by the user statements
+	 * we execute.
+	 */
+	PinPortal(portal);
+
 	/*
 	 * Fetch the initial 10 tuples
 	 */
@@ -2918,7 +2961,10 @@ exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt)
 	 * with FOUND = false.
 	 */
 	if (n == 0)
+	{
 		exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
+		exec_eval_cleanup(estate);
+	}
 	else
 		found = true;			/* processed at least one tuple */
 
@@ -2937,6 +2983,7 @@ exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt)
 			 * Assign the tuple to the target
 			 */
 			exec_move_row(estate, rec, row, tuptab->vals[i], tuptab->tupdesc);
+			exec_eval_cleanup(estate);
 
 			/*
 			 * Execute the statements
@@ -2989,6 +3036,7 @@ exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt)
 				 * code should match the code after the loop.)
 				 */
 				SPI_freetuptable(tuptab);
+				UnpinPortal(portal);
 				SPI_cursor_close(portal);
 				exec_set_found(estate, found);
 
@@ -3014,6 +3062,7 @@ exec_stmt_dynfors(PLpgSQL_execstate *estate, PLpgSQL_stmt_dynfors *stmt)
 	/*
 	 * Close the implicit cursor
 	 */
+	UnpinPortal(portal);
 	SPI_cursor_close(portal);
 
 	/*
@@ -3075,14 +3124,8 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 		 */
 		query = stmt->query;
 
-	 	/* if we find a cached plan, check if we want to use it */
-		if (query->plan != NULL)
-		{
-			exec_free_plan(query);
-		}
-	
 		if (query->plan == NULL)
-			exec_prepare_plan(estate, query);
+			exec_prepare_plan(estate, query, stmt->cursor_options);
 	}
 	else if (stmt->dynquery != NULL)
 	{
@@ -3093,7 +3136,7 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 		Datum		queryD;
 		Oid			restype;
 		char	   *querystr;
-		void	   *curplan;
+		SPIPlanPtr	curplan;
 
 		/* ----------
 		 * We evaluate the string expression after the
@@ -3108,7 +3151,10 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 					 errmsg("cannot EXECUTE a null querystring")));
 
 		/* Get the C-String representation */
-		querystr = convert_value_to_string(queryD, restype);
+		querystr = convert_value_to_string(estate, queryD, restype);
+
+		/* copy it out of the temporary context before we clean up */
+		querystr = pstrdup(querystr);
 
 		exec_eval_cleanup(estate);
 
@@ -3116,9 +3162,9 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 		 * Now we prepare a query plan for it and open a cursor
 		 * ----------
 		 */
-		curplan = SPI_prepare(querystr, 0, NULL);
+		curplan = SPI_prepare_cursor(querystr, 0, NULL, stmt->cursor_options);
 		if (curplan == NULL)
-			elog(ERROR, "SPI_prepare failed for \"%s\": %s",
+			elog(ERROR, "SPI_prepare_cursor failed for \"%s\": %s",
 				 querystr, SPI_result_code_string(SPI_result));
 		portal = SPI_cursor_open(curname, curplan, NULL, NULL,
 								 estate->readonly_func);
@@ -3184,14 +3230,9 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 		}
 
 		query = curvar->cursor_explicit_expr;
-		/* if we find a cached plan, check if we want to use it */
-		if (query->plan != NULL)
-		{
-			exec_free_plan(query);
-		}
 
 		if (query->plan == NULL)
-			exec_prepare_plan(estate, query);
+			exec_prepare_plan(estate, query, curvar->cursor_options);
 	}
 
 	/* ----------
@@ -3246,7 +3287,8 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 
 
 /* ----------
- * exec_stmt_fetch			Fetch from a cursor into a target
+ * exec_stmt_fetch			Fetch from a cursor into a target, or just
+ *							move the current position of the cursor
  * ----------
  */
 static int
@@ -3255,6 +3297,7 @@ exec_stmt_fetch(PLpgSQL_execstate *estate, PLpgSQL_stmt_fetch *stmt)
 	PLpgSQL_var *curvar = NULL;
 	PLpgSQL_rec *rec = NULL;
 	PLpgSQL_row *row = NULL;
+	long		how_many = stmt->how_many;
 	SPITupleTable *tuptab;
 	Portal		portal;
 	char	   *curname;
@@ -3278,46 +3321,74 @@ exec_stmt_fetch(PLpgSQL_execstate *estate, PLpgSQL_stmt_fetch *stmt)
 				 errmsg("cursor \"%s\" does not exist", curname)));
 	pfree(curname);
 
-	/* ----------
-	 * Determine if we fetch into a record or a row
-	 * ----------
-	 */
-	if (stmt->rec != NULL)
-		rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->recno]);
-	else if (stmt->row != NULL)
-		row = (PLpgSQL_row *) (estate->datums[stmt->row->rowno]);
-	else
-		elog(ERROR, "unsupported target");
+	/* Calculate position for FETCH_RELATIVE or FETCH_ABSOLUTE */
+	if (stmt->expr)
+	{
+		bool		isnull;
 
-	/* ----------
-	 * Fetch 1 tuple from the cursor
-	 * ----------
-	 */
-	SPI_cursor_fetch(portal, true, 1);
-	tuptab = SPI_tuptable;
-	n = SPI_processed;
+		/* XXX should be doing this in LONG not INT width */
+		how_many = exec_eval_integer(estate, stmt->expr, &isnull);
 
-	/* ----------
-	 * Set the target and the global FOUND variable appropriately.
-	 * ----------
-	 */
-	if (n == 0)
+		if (isnull)
+			ereport(ERROR,
+					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+					 errmsg("relative or absolute cursor position is NULL")));
+
+		exec_eval_cleanup(estate);
+	}
+
+	if (!stmt->is_move)
 	{
-		exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
-		exec_set_found(estate, false);
+		/* ----------
+		 * Determine if we fetch into a record or a row
+		 * ----------
+		 */
+		if (stmt->rec != NULL)
+			rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->recno]);
+		else if (stmt->row != NULL)
+			row = (PLpgSQL_row *) (estate->datums[stmt->row->rowno]);
+		else
+			elog(ERROR, "unsupported target");
+
+		/* ----------
+		 * Fetch 1 tuple from the cursor
+		 * ----------
+		 */
+		SPI_scroll_cursor_fetch(portal, stmt->direction, how_many);
+		tuptab = SPI_tuptable;
+		n = SPI_processed;
+
+		/* ----------
+		 * Set the target and the global FOUND variable appropriately.
+		 * ----------
+		 */
+		if (n == 0)
+		{
+			exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
+			exec_set_found(estate, false);
+		}
+		else
+		{
+			exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
+			exec_set_found(estate, true);
+		}
+
+		exec_eval_cleanup(estate);
+		SPI_freetuptable(tuptab);
 	}
 	else
 	{
-		exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
-		exec_set_found(estate, true);
-	}
+		/* Move the cursor */
+		SPI_scroll_cursor_move(portal, stmt->direction, how_many);
+		n = SPI_processed;
 
-	SPI_freetuptable(tuptab);
+		/* Set the global FOUND variable appropriately. */
+		exec_set_found(estate, n != 0);
+	}
 
 	return PLPGSQL_RC_OK;
 }
 
-
 /* ----------
  * exec_stmt_close			Close a cursor
  * ----------
@@ -3378,6 +3449,10 @@ exec_assign_expr(PLpgSQL_execstate *estate, PLpgSQL_datum *target,
 
 /* ----------
  * exec_assign_value			Put a value into a target field
+ *
+ * Note: in some code paths, this will leak memory in the eval_econtext;
+ * we assume that will be cleaned up later by exec_eval_cleanup.  We cannot
+ * call exec_eval_cleanup here for fear of destroying the input Datum value.
  * ----------
  */
 static void
@@ -3395,7 +3470,10 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				PLpgSQL_var *var = (PLpgSQL_var *) target;
 				Datum		newvalue;
 
-				newvalue = exec_cast_value(value, valtype, var->datatype->typoid,
+				newvalue = exec_cast_value(estate,
+										   value,
+										   valtype,
+										   var->datatype->typoid,
 										   &(var->datatype->typinput),
 										   var->datatype->typioparam,
 										   var->datatype->atttypmod,
@@ -3408,19 +3486,14 @@ exec_assign_value(PLpgSQL_execstate *estate,
 									var->refname)));
 
 				/*
-				 * If type is by-reference, make sure we have a freshly
-				 * palloc'd copy; the originally passed value may not live as
-				 * long as the variable!  But we don't need to re-copy if
-				 * exec_cast_value performed a conversion; its output must
-				 * already be palloc'd.
+				 * If type is by-reference, copy the new value (which is
+				 * probably in the eval_econtext) into the procedure's
+				 * memory context.
 				 */
 				if (!var->datatype->typbyval && !*isNull)
-				{
-					if (newvalue == value)
-						newvalue = datumCopy(newvalue,
-											 false,
-											 var->datatype->typlen);
-				}
+					newvalue = datumCopy(newvalue,
+										 false,
+										 var->datatype->typlen);
 
 				/*
 				 * Now free the old value.	(We can't do this any earlier
@@ -3445,12 +3518,6 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				 */
 				PLpgSQL_row *row = (PLpgSQL_row *) target;
 
-				/* Source must be of RECORD or composite type */
-				if (!(valtype == RECORDOID ||
-					  get_typtype(valtype) == 'c'))
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("cannot assign non-composite value to a row variable")));
 				if (*isNull)
 				{
 					/* If source is null, just assign nulls to the row */
@@ -3464,7 +3531,12 @@ exec_assign_value(PLpgSQL_execstate *estate,
 					TupleDesc	tupdesc;
 					HeapTupleData tmptup;
 
-					/* Else source is a tuple Datum, safe to do this: */
+					/* Source must be of RECORD or composite type */
+					if (!type_is_rowtype(valtype))
+						ereport(ERROR,
+								(errcode(ERRCODE_DATATYPE_MISMATCH),
+								 errmsg("cannot assign non-composite value to a row variable")));
+					/* Source is a tuple Datum, so safe to do this: */
 					td = DatumGetHeapTupleHeader(value);
 					/* Extract rowtype info and find a tupdesc */
 					tupType = HeapTupleHeaderGetTypeId(td);
@@ -3487,12 +3559,6 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				 */
 				PLpgSQL_rec *rec = (PLpgSQL_rec *) target;
 
-				/* Source must be of RECORD or composite type */
-				if (!(valtype == RECORDOID ||
-					  get_typtype(valtype) == 'c'))
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("cannot assign non-composite value to a record variable")));
 				if (*isNull)
 				{
 					/* If source is null, just assign nulls to the record */
@@ -3506,7 +3572,13 @@ exec_assign_value(PLpgSQL_execstate *estate,
 					TupleDesc	tupdesc;
 					HeapTupleData tmptup;
 
-					/* Else source is a tuple Datum, safe to do this: */
+					/* Source must be of RECORD or composite type */
+					if (!type_is_rowtype(valtype))
+						ereport(ERROR,
+								(errcode(ERRCODE_DATATYPE_MISMATCH),
+								 errmsg("cannot assign non-composite value to a record variable")));
+
+					/* Source is a tuple Datum, so safe to do this: */
 					td = DatumGetHeapTupleHeader(value);
 					/* Extract rowtype info and find a tupdesc */
 					tupType = HeapTupleHeaderGetTypeId(td);
@@ -3591,7 +3663,8 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				atttype = SPI_gettypeid(rec->tupdesc, fno + 1);
 				atttypmod = rec->tupdesc->attrs[fno]->atttypmod;
 				attisnull = *isNull;
-				values[fno] = exec_simple_cast_value(value,
+				values[fno] = exec_simple_cast_value(estate,
+													 value,
 													 valtype,
 													 atttype,
 													 atttypmod,
@@ -3621,14 +3694,15 @@ exec_assign_value(PLpgSQL_execstate *estate,
 
 				pfree(values);
 				pfree(nulls);
-				if (mustfree)
-					pfree(mustfree);
 
 				break;
 			}
 
 		case PLPGSQL_DTYPE_ARRAYELEM:
 			{
+				/*
+				 * Target is an element of an array
+				 */
 				int			nsubscripts;
 				int			i;
 				PLpgSQL_expr *subscripts[MAXDIM];
@@ -3644,10 +3718,20 @@ exec_assign_value(PLpgSQL_execstate *estate,
 							coerced_value;
 				ArrayType  *oldarrayval;
 				ArrayType  *newarrayval;
+				SPITupleTable *save_eval_tuptable;
+				MemoryContext oldcontext;
+
+				/*
+				 * We need to do subscript evaluation, which might require
+				 * evaluating general expressions; and the caller might have
+				 * done that too in order to prepare the input Datum.  We
+				 * have to save and restore the caller's SPI_execute result,
+				 * if any.
+				 */
+				save_eval_tuptable = estate->eval_tuptable;
+				estate->eval_tuptable = NULL;
 
 				/*
-				 * Target is an element of an array
-				 *
 				 * To handle constructs like x[1][2] := something, we have to
 				 * be prepared to deal with a chain of arrayelem datums. Chase
 				 * back to find the base array datum, and save the subscript
@@ -3715,6 +3799,17 @@ exec_assign_value(PLpgSQL_execstate *estate,
 						ereport(ERROR,
 								(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 								 errmsg("array subscript in assignment must not be NULL")));
+
+					/*
+					 * Clean up in case the subscript expression wasn't simple.
+					 * We can't do exec_eval_cleanup, but we can do this much
+					 * (which is safe because the integer subscript value is
+					 * surely pass-by-value), and we must do it in case the
+					 * next subscript expression isn't simple either.
+					 */
+					if (estate->eval_tuptable != NULL)
+						SPI_freetuptable(estate->eval_tuptable);
+					estate->eval_tuptable = NULL;
 				}
 
 				/* Swap to the caller's tuple table. */
@@ -3722,7 +3817,8 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				estate->eval_tuptable = save_tuptable;
 
 				/* Coerce source value to match array element type. */
-				coerced_value = exec_simple_cast_value(value,
+				coerced_value = exec_simple_cast_value(estate,
+													   value,
 													   valtype,
 													   arrayelemtypeid,
 													   -1,
@@ -3742,6 +3838,9 @@ exec_assign_value(PLpgSQL_execstate *estate,
 					(oldarrayisnull || *isNull))
 					return;
 
+				/* oldarrayval and newarrayval should be short-lived */
+				oldcontext = MemoryContextSwitchTo(estate->eval_econtext->ecxt_per_tuple_memory);
+
 				if (oldarrayisnull)
 					oldarrayval = construct_empty_array(arrayelemtypeid);
 				else
@@ -3760,12 +3859,7 @@ exec_assign_value(PLpgSQL_execstate *estate,
 										elemtypbyval,
 										elemtypalign);
 
-				/*
-				 * Avoid leaking the result of exec_simple_cast_value, if it
-				 * performed a conversion to a pass-by-ref type.
-				 */
-				if (!*isNull && coerced_value != value && !elemtypbyval)
-					pfree(DatumGetPointer(coerced_value));
+				MemoryContextSwitchTo(oldcontext);
 
 				/*
 				 * Assign the new array to the base variable.  It's never NULL
@@ -3775,11 +3869,6 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				exec_assign_value(estate, target,
 								  PointerGetDatum(newarrayval),
 								  arraytypeid, isNull);
-
-				/*
-				 * Avoid leaking the modified array value, too.
-				 */
-				pfree(newarrayval);
 				break;
 			}
 
@@ -3969,7 +4058,7 @@ exec_eval_integer(PLpgSQL_execstate *estate,
 	Oid			exprtypeid;
 
 	exprdatum = exec_eval_expr(estate, expr, isNull, &exprtypeid);
-	exprdatum = exec_simple_cast_value(exprdatum, exprtypeid,
+	exprdatum = exec_simple_cast_value(estate, exprdatum, exprtypeid,
 									   INT4OID, -1,
 									   *isNull);
 	return DatumGetInt32(exprdatum);
@@ -3991,7 +4080,7 @@ exec_eval_boolean(PLpgSQL_execstate *estate,
 	Oid			exprtypeid;
 
 	exprdatum = exec_eval_expr(estate, expr, isNull, &exprtypeid);
-	exprdatum = exec_simple_cast_value(exprdatum, exprtypeid,
+	exprdatum = exec_simple_cast_value(estate, exprdatum, exprtypeid,
 									   BOOLOID, -1,
 									   *isNull);
 	return DatumGetBool(exprdatum);
@@ -4010,21 +4099,25 @@ exec_eval_expr(PLpgSQL_execstate *estate,
 			   bool *isNull,
 			   Oid *rettype)
 {
+	Datum		result;
 	int			rc;
 
 	/*
-	 * If not already done create a plan for this expression
+	 * If first time through, create a plan for this expression.
 	 */
 	if (expr->plan == NULL)
-		exec_prepare_plan(estate, expr);
+		exec_prepare_plan(estate, expr, 0);
 
 	/*
 	 * If this is a simple expression, bypass SPI and use the executor
 	 * directly
 	 */
-	if (expr->expr_simple_expr != NULL)
-		return exec_eval_simple_expr(estate, expr, isNull, rettype);
+	if (exec_eval_simple_expr(estate, expr, &result, isNull, rettype))
+		return result;
 
+	/*
+	 * Else do it the hard way via exec_run_select
+	 */
 	rc = exec_run_select(estate, expr, 2, NULL);
 	if (rc != SPI_OK_SELECT)
 		ereport(ERROR,
@@ -4076,17 +4169,11 @@ exec_run_select(PLpgSQL_execstate *estate,
 	char	   *nulls;
 	int			rc;
 
-	/* if we find a cached plan, check if we want to use it */
-	if (expr->plan != NULL)
-	{
-		exec_free_plan(expr);
-	}
-
 	/*
 	 * generate the plan if needed
 	 */
 	if (expr->plan == NULL)
-		exec_prepare_plan(estate, expr);
+		exec_prepare_plan(estate, expr, 0);
 
 	/*
 	 * Now build up the values and nulls arguments for SPI_execute_plan()
@@ -4150,23 +4237,81 @@ exec_run_select(PLpgSQL_execstate *estate,
  * exec_eval_simple_expr -		Evaluate a simple expression returning
  *								a Datum by directly calling ExecEvalExpr().
  *
+ * If successful, store results into *result, *isNull, *rettype and return
+ * TRUE.  If the expression cannot be handled by simple evaluation,
+ * return FALSE.
+ *
+ * Because we only store one execution tree for a simple expression, we
+ * can't handle recursion cases.  So, if we see the tree is already busy
+ * with an evaluation in the current xact, we just return FALSE and let the
+ * caller run the expression the hard way.  (Other alternatives such as
+ * creating a new tree for a recursive call either introduce memory leaks,
+ * or add enough bookkeeping to be doubtful wins anyway.)  Another case that
+ * is covered by the expr_simple_in_use test is where a previous execution
+ * of the tree was aborted by an error: the tree may contain bogus state
+ * so we dare not re-use it.
+ *
+ * It is possible though unlikely for a simple expression to become non-simple
+ * (consider for example redefining a trivial view).  We must handle that for
+ * correctness; fortunately it's normally inexpensive to do
+ * RevalidateCachedPlan on a simple expression.  We do not consider the other
+ * direction (non-simple expression becoming simple) because we'll still give
+ * correct results if that happens, and it's unlikely to be worth the cycles
+ * to check.
+ *
  * Note: if pass-by-reference, the result is in the eval_econtext's
  * temporary memory context.  It will be freed when exec_eval_cleanup
  * is done.
  * ----------
  */
-static Datum
+static bool
 exec_eval_simple_expr(PLpgSQL_execstate *estate,
 					  PLpgSQL_expr *expr,
+					  Datum *result,
 					  bool *isNull,
 					  Oid *rettype)
 {
-	Datum		retval;
 	ExprContext *econtext = estate->eval_econtext;
+	CachedPlanSource *plansource;
+	CachedPlan *cplan;
 	ParamListInfo paramLI;
 	int			i;
 	Snapshot	saveActiveSnapshot;
 
+	/*
+	 * Forget it if expression wasn't simple before.
+	 */
+	if (expr->expr_simple_expr == NULL)
+		return false;
+
+	/*
+	 * If expression is in use in current xact, don't touch it.
+	 */
+	if (expr->expr_simple_in_use &&
+		expr->expr_simple_id == estate->eval_estate_simple_id)
+		return false;
+
+	/*
+	 * Revalidate cached plan, so that we will notice if it became stale. (We
+	 * also need to hold a refcount while using the plan.)	Note that even if
+	 * replanning occurs, the length of plancache_list can't change, since it
+	 * is a property of the raw parsetree generated from the query text.
+	 */
+	Assert(list_length(expr->plan->plancache_list) == 1);
+	plansource = (CachedPlanSource *) linitial(expr->plan->plancache_list);
+	cplan = RevalidateCachedPlan(plansource, true);
+	if (cplan->generation != expr->expr_simple_generation)
+	{
+		/* It got replanned ... is it still simple? */
+		exec_simple_check_plan(expr);
+		if (expr->expr_simple_expr == NULL)
+		{
+			/* Ooops, release refcount and fail */
+			ReleaseCachedPlan(cplan, true);
+			return false;
+		}
+	}
+
 	/*
 	 * Pass back previously-determined result type.
 	 */
@@ -4174,12 +4319,14 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 
 	/*
 	 * Prepare the expression for execution, if it's not been done already in
-	 * the current eval_estate.
+	 * the current eval_estate.  (This will be forced to happen if we called
+	 * exec_simple_check_plan above.)
 	 */
 	if (expr->expr_simple_id != estate->eval_estate_simple_id)
 	{
 		expr->expr_simple_state = ExecPrepareExpr(expr->expr_simple_expr,
 												  estate->eval_estate);
+		expr->expr_simple_in_use = false;
 		expr->expr_simple_id = estate->eval_estate_simple_id;
 	}
 
@@ -4239,18 +4386,27 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 			ActiveSnapshot = CopySnapshot(GetTransactionSnapshot());
 		}
 
+		/*
+		 * Mark expression as busy for the duration of the ExecEvalExpr call.
+		 */
+		expr->expr_simple_in_use = true;
+
 		/*
 		 * Finally we can call the executor to evaluate the expression
 		 */
-		retval = ExecEvalExpr(expr->expr_simple_state,
-							  econtext,
-							  isNull,
-							  NULL);
+		*result = ExecEvalExpr(expr->expr_simple_state,
+							   econtext,
+							   isNull,
+							   NULL);
+
+		/* Assorted cleanup */
+		expr->expr_simple_in_use = false;
 		MemoryContextSwitchTo(oldcontext);
 	}
 	PG_CATCH();
 	{
 		/* Restore global vars and propagate error */
+		/* note we intentionally don't reset expr_simple_in_use here */
 		ActiveSnapshot = saveActiveSnapshot;
 		PG_RE_THROW();
 	}
@@ -4259,15 +4415,23 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 	ActiveSnapshot = saveActiveSnapshot;
 	SPI_pop();
 
+	/*
+	 * Now we can release our refcount on the cached plan.
+	 */
+	ReleaseCachedPlan(cplan, true);
+
 	/*
 	 * That's it.
 	 */
-	return retval;
+	return true;
 }
 
 
 /* ----------
  * exec_move_row			Move one tuple's values into a record or row
+ *
+ * Since this uses exec_assign_value, caller should eventually call
+ * exec_eval_cleanup to prevent long-term memory leaks.
  * ----------
  */
 static void
@@ -4339,13 +4503,13 @@ exec_move_row(PLpgSQL_execstate *estate,
 	 * Row is a bit more complicated in that we assign the individual
 	 * attributes of the tuple to the variables the row points to.
 	 *
-	 * NOTE: this code used to demand row->nfields == HeapTupleHeaderGetNatts(tup->t_data,
-	 * but that's wrong.  The tuple might have more fields than we expected if
-	 * it's from an inheritance-child table of the current table, or it might
-	 * have fewer if the table has had columns added by ALTER TABLE. Ignore
-	 * extra columns and assume NULL for missing columns, the same as
-	 * heap_getattr would do.  We also have to skip over dropped columns in
-	 * either the source or destination.
+	 * NOTE: this code used to demand row->nfields ==
+	 * HeapTupleHeaderGetNatts(tup->t_data, but that's wrong.  The tuple might
+	 * have more fields than we expected if it's from an inheritance-child
+	 * table of the current table, or it might have fewer if the table has had
+	 * columns added by ALTER TABLE. Ignore extra columns and assume NULL for
+	 * missing columns, the same as heap_getattr would do.	We also have to
+	 * skip over dropped columns in either the source or destination.
 	 *
 	 * If we have no tuple data at all, we'll assign NULL to all columns of
 	 * the row variable.
@@ -4394,6 +4558,10 @@ exec_move_row(PLpgSQL_execstate *estate,
 			{
 				value = (Datum) 0;
 				isnull = true;
+				/*
+				 * InvalidOid is OK because exec_assign_value doesn't care
+				 * about the type of a source NULL
+				 */
 				valtype = InvalidOid;
 			}
 
@@ -4459,44 +4627,44 @@ make_tuple_from_row(PLpgSQL_execstate *estate,
 /* ----------
  * convert_value_to_string			Convert a non-null Datum to C string
  *
- * Note: callers generally assume that the result is a palloc'd string and
- * should be pfree'd.  This is not all that safe an assumption ...
+ * Note: the result is in the estate's eval_econtext, and will be cleared
+ * by the next exec_eval_cleanup() call.  The invoked output function might
+ * leave additional cruft there as well, so just pfree'ing the result string
+ * would not be enough to avoid memory leaks if we did not do it like this.
+ * In most usages the Datum being passed in is also in that context (if
+ * pass-by-reference) and so an exec_eval_cleanup() call is needed anyway.
  *
  * Note: not caching the conversion function lookup is bad for performance.
  * ----------
  */
 static char *
-convert_value_to_string(Datum value, Oid valtype)
+convert_value_to_string(PLpgSQL_execstate *estate, Datum value, Oid valtype)
 {
-	char	   *str;
+	char	   *result;
+	MemoryContext oldcontext;
 	Oid			typoutput;
 	bool		typIsVarlena;
 
+	oldcontext = MemoryContextSwitchTo(estate->eval_econtext->ecxt_per_tuple_memory);
 	getTypeOutputInfo(valtype, &typoutput, &typIsVarlena);
+	result = OidOutputFunctionCall(typoutput, value);
+	MemoryContextSwitchTo(oldcontext);
 
-	/*
-	 * We do SPI_push to allow the datatype output function to use SPI.
-	 * However we do not mess around with CommandCounterIncrement or advancing
-	 * the snapshot, which means that a stable output function would not see
-	 * updates made so far by our own function.  The use-case for such
-	 * scenarios seems too narrow to justify the cycles that would be
-	 * expended.
-	 */
-	SPI_push();
-
-	str = OidOutputFunctionCall(typoutput, value);
-
-	SPI_pop();
-
-	return str;
+	return result;
 }
 
 /* ----------
  * exec_cast_value			Cast a value if required
+ *
+ * Note: the estate's eval_econtext is used for temporary storage, and may
+ * also contain the result Datum if we have to do a conversion to a pass-
+ * by-reference data type.  Be sure to do an exec_eval_cleanup() call when
+ * done with the result.
  * ----------
  */
 static Datum
-exec_cast_value(Datum value, Oid valtype,
+exec_cast_value(PLpgSQL_execstate *estate,
+				Datum value, Oid valtype,
 				Oid reqtype,
 				FmgrInfo *reqinput,
 				Oid reqtypioparam,
@@ -4504,36 +4672,27 @@ exec_cast_value(Datum value, Oid valtype,
 				bool isnull)
 {
 	/*
-	 * If the type of the queries return value isn't that of the variable,
-	 * convert it.
+	 * If the type of the given value isn't what's requested, convert it.
 	 */
 	if (valtype != reqtype || reqtypmod != -1)
 	{
+		MemoryContext oldcontext;
+
+		oldcontext = MemoryContextSwitchTo(estate->eval_econtext->ecxt_per_tuple_memory);
 		if (!isnull)
 		{
 			char	   *extval;
 
-			extval = convert_value_to_string(value, valtype);
-
-			/* Allow input function to use SPI ... see notes above */
-			SPI_push();
-
+			extval = convert_value_to_string(estate, value, valtype);
 			value = InputFunctionCall(reqinput, extval,
 									  reqtypioparam, reqtypmod);
-
-			SPI_pop();
-
-			pfree(extval);
 		}
 		else
 		{
-			SPI_push();
-
 			value = InputFunctionCall(reqinput, NULL,
 									  reqtypioparam, reqtypmod);
-
-			SPI_pop();
 		}
+		MemoryContextSwitchTo(oldcontext);
 	}
 
 	return value;
@@ -4548,30 +4707,29 @@ exec_cast_value(Datum value, Oid valtype,
  * ----------
  */
 static Datum
-exec_simple_cast_value(Datum value, Oid valtype,
+exec_simple_cast_value(PLpgSQL_execstate *estate,
+					   Datum value, Oid valtype,
 					   Oid reqtype, int32 reqtypmod,
 					   bool isnull)
 {
-	if (!isnull)
+	if (valtype != reqtype || reqtypmod != -1)
 	{
-		if (valtype != reqtype || reqtypmod != -1)
-		{
-			Oid			typinput;
-			Oid			typioparam;
-			FmgrInfo	finfo_input;
-
-			getTypeInputInfo(reqtype, &typinput, &typioparam);
-
-			fmgr_info(typinput, &finfo_input);
-
-			value = exec_cast_value(value,
-									valtype,
-									reqtype,
-									&finfo_input,
-									typioparam,
-									reqtypmod,
-									isnull);
-		}
+		Oid			typinput;
+		Oid			typioparam;
+		FmgrInfo	finfo_input;
+
+		getTypeInputInfo(reqtype, &typinput, &typioparam);
+
+		fmgr_info(typinput, &finfo_input);
+
+		value = exec_cast_value(estate,
+								value,
+								valtype,
+								reqtype,
+								&finfo_input,
+								typioparam,
+								reqtypmod,
+								isnull);
 	}
 
 	return value;
@@ -4781,7 +4939,7 @@ exec_simple_check_node(Node *node)
 
 		case T_XmlExpr:
 			{
-				XmlExpr *expr = (XmlExpr *) node;
+				XmlExpr    *expr = (XmlExpr *) node;
 
 				if (!exec_simple_check_node((Node *) expr->named_args))
 					return FALSE;
@@ -4844,41 +5002,61 @@ exec_simple_check_node(Node *node)
 static void
 exec_simple_check_plan(PLpgSQL_expr *expr)
 {
-	_SPI_plan  *spi_plan = (_SPI_plan *) expr->plan;
-	PlannedStmt *stmt;
+	SPIPlanPtr	spi_plan = expr->plan;
+	CachedPlanSource *plansource;
+	PlannedStmt *stmt = NULL;
 	Plan	   *plan;
 	TargetEntry *tle;
 
+	/*
+	 * Initialize to "not simple", and remember the plan generation number we
+	 * last checked.  (If the query produces more or less than one parsetree
+	 * we just leave expr_simple_generation set to 0.)
+	 */
 	expr->expr_simple_expr = NULL;
+	expr->expr_simple_generation = 0;
 
 	/*
 	 * 1. We can only evaluate queries that resulted in one single execution
 	 * plan
 	 */
-	if (list_length(spi_plan->ptlist) != 1)
+	if (list_length(expr->plan->plancache_list) != 1)
+		return;
+	plansource = (CachedPlanSource *) linitial(expr->plan->plancache_list);
+	expr->expr_simple_generation = plansource->generation;
+	if (list_length(plansource->plan->stmt_list) != 1)
 		return;
 
 	/*
 	 * MPP-8038: Utility statements get here too, so make sure this is
 	 * planned
 	 */
-	if (IsA(linitial(spi_plan->ptlist), PlannedStmt))
+	if (list_length(spi_plan->plancache_list) != 1)
 	{
-		stmt = (PlannedStmt *) linitial(spi_plan->ptlist);
-		plan = stmt ? stmt->planTree : NULL;
+		CachedPlanSource *cached_ps;
+		
+		cached_ps = (CachedPlanSource *) linitial(spi_plan->plancache_list);
+		if (list_length(cached_ps->plan->stmt_list) != 1)
+		{
+			if (IsA(linitial(cached_ps->plan->stmt_list), PlannedStmt))
+				stmt = (PlannedStmt *) linitial(cached_ps->plan->stmt_list);
+		}
 	}
-	else
+
+	if (!stmt)
 	{
 		/* This is a utility statement */
-		plan = NULL;
+		stmt = (PlannedStmt *) linitial(plansource->plan->stmt_list);
 	}
 
 	/*
 	 * 2. It must be a RESULT plan --> no scan's required
 	 */
-	if (plan == NULL)			/* utility statement produces this */
+	if (!IsA(stmt, PlannedStmt))
 		return;
-
+	if (stmt->commandType != CMD_SELECT || stmt->intoClause)
+		return;
+	plan = stmt->planTree;
 	if (!IsA(plan, Result))
 		return;
 
@@ -4912,6 +5090,7 @@ exec_simple_check_plan(PLpgSQL_expr *expr)
 	 */
 	expr->expr_simple_expr = tle->expr;
 	expr->expr_simple_state = NULL;
+	expr->expr_simple_in_use = false;
 	expr->expr_simple_id = -1;
 	/* Also stash away the expression result type */
 	expr->expr_simple_type = exprType((Node *) tle->expr);
@@ -5047,7 +5226,7 @@ plpgsql_subxact_cb(SubXactEvent event, SubTransactionId mySubid,
 		simple_estate_stack->xact_subxid == mySubid)
 	{
 		SimpleEstateStackEntry *next;
-		
+
 		if (event == SUBXACT_EVENT_COMMIT_SUB)
 			FreeExecutorState(simple_estate_stack->xact_eval_estate);
 		next = simple_estate_stack->next;
@@ -5071,90 +5250,3 @@ free_var(PLpgSQL_var *var)
 		var->freeval = false;
 	}
 }
-
-
-
-/* ----------
- * exec_check_cache_plan -		Check if a plan can be cached
- * 
- * This routine checks if plan can be cached to avoid stale 
- * plan issues as seen with MPP-16204.
- *
- * 	- If the input expr contains only UTILITY statements, the routine 
- *	  sets cachable to true.
- * ----------
- */
-static void
-exec_check_cache_plan(PLpgSQL_expr *expr)
-{
-	_SPI_plan	*spi_plan = (_SPI_plan *) expr->plan; 
-	PlannedStmt	*stmt = NULL; 
-	Plan		*plan = NULL; 
-	ListCell	*plan_list_item = NULL;
-
-	/* 
-	 * store the current transaction id. we will only free the plan
-	 * if the next invocation of the plan is from a different	
-	 * transaction 
-	 */
-	expr->transaction_id = GetTopTransactionId();
-
-	/* 
-	 * we can have multiple PlannedStmt. Walk all of them
-	 */
-	foreach (plan_list_item, spi_plan->ptlist)
-	{
-		if (IsA((lfirst(plan_list_item)), PlannedStmt))
-		{
-			stmt = (PlannedStmt *)lfirst(plan_list_item);
-			plan = stmt ? stmt->planTree : NULL;
-		}
-		else
-		{
-			/* UTILITY statements */
-		  	plan = NULL;
-		}
-
-		if (plan == NULL)
-		{
-			continue;	
-		}
-		else
-		{
-			expr->cachable = false;
-			return;
-		}
-	}
-
- 	expr->cachable = true;
-	return; 
-}
-
-/* 
- * exec_free_plan
- * 
- * This routine frees the plan cached by PL/pgSQL under the following 
- * conditions 
- *	- the use_count is 0 . This is to protect the plan under recursive 
- *	  invocations and
- *	- exec_check_cache_plan has indicated that it is not safe to cache the 
- * 	  plan and
- *	- we are not in EXECUTE mode
- * 	- if the plan was compiled in a different transaction (this check is 
- *	  made so we don't free the plans too aggresively.
-*/
-static void
-exec_free_plan(PLpgSQL_expr *expr)
-{
-	TransactionId txid = GetTopTransactionId();
-
-	if (((_SPI_plan *)expr->plan)->use_count == 0 
-		&& !expr->cachable 
-		&& Gp_role != GP_ROLE_EXECUTE 
-		&& (gp_plpgsql_clear_cache_always || expr->transaction_id != txid)) 
-	{
-		SPI_freeplan(expr->plan);
-		expr->plan = NULL;
-	}
-}
-
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 3dbbc56bfd79..5d7224970f09 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.57 2007/01/28 17:58:13 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.67.2.1 2010/02/17 01:48:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -154,15 +154,14 @@ plpgsql_ns_setlocal(bool flag)
  * ----------
  */
 void
-plpgsql_ns_push(char *label)
+plpgsql_ns_push(const char *label)
 {
 	PLpgSQL_ns *new;
 
 	if (label == NULL)
 		label = "";
 
-	new = palloc(sizeof(PLpgSQL_ns));
-	memset(new, 0, sizeof(PLpgSQL_ns));
+	new = palloc0(sizeof(PLpgSQL_ns));
 	new->upper = ns_current;
 	ns_current = new;
 
@@ -227,59 +226,98 @@ plpgsql_ns_additem(int itemtype, int itemno, const char *name)
 
 
 /* ----------
- * plpgsql_ns_lookup			Lookup for a word in the namestack
+ * plpgsql_ns_lookup			Lookup an identifier in the namestack
+ *
+ * Note that this only searches for variables, not labels.
+ *
+ * name1 must be non-NULL.  Pass NULL for name2 and/or name3 if parsing a name
+ * with fewer than three components.
+ *
+ * If names_used isn't NULL, *names_used receives the number of names
+ * matched: 0 if no match, 1 if name1 matched an unqualified variable name,
+ * 2 if name1 and name2 matched a block label + variable name.
+ *
+ * Note that name3 is never directly matched to anything.  However, if it
+ * isn't NULL, we will disregard qualified matches to scalar variables.
+ * Similarly, if name2 isn't NULL, we disregard unqualified matches to
+ * scalar variables.
  * ----------
  */
 PLpgSQL_nsitem *
-plpgsql_ns_lookup(char *name, char *label)
+plpgsql_ns_lookup(const char *name1, const char *name2, const char *name3,
+				  int *names_used)
 {
 	PLpgSQL_ns *ns;
 	int			i;
 
-	/*
-	 * If a label is specified, lookup only in that
-	 */
-	if (label != NULL)
+	/* Scan each level of the namestack */
+	for (ns = ns_current; ns != NULL; ns = ns->upper)
 	{
-		for (ns = ns_current; ns != NULL; ns = ns->upper)
+		/* Check for unqualified match to variable name */
+		for (i = 1; i < ns->items_used; i++)
 		{
-			if (!strcmp(ns->items[0]->name, label))
+			PLpgSQL_nsitem *nsitem = ns->items[i];
+
+			if (strcmp(nsitem->name, name1) == 0)
 			{
-				for (i = 1; i < ns->items_used; i++)
+				if (name2 == NULL ||
+					nsitem->itemtype != PLPGSQL_NSTYPE_VAR)
 				{
-					if (!strcmp(ns->items[i]->name, name))
-						return ns->items[i];
+					if (names_used)
+						*names_used = 1;
+					return nsitem;
 				}
-				return NULL;	/* name not found in specified label */
 			}
 		}
-		return NULL;			/* label not found */
-	}
 
-	/*
-	 * No label given, lookup for visible labels ignoring localmode
-	 */
-	for (ns = ns_current; ns != NULL; ns = ns->upper)
-	{
-		if (!strcmp(ns->items[0]->name, name))
-			return ns->items[0];
+		/* Check for qualified match to variable name */
+		if (name2 != NULL &&
+			strcmp(ns->items[0]->name, name1) == 0)
+		{
+			for (i = 1; i < ns->items_used; i++)
+			{
+				PLpgSQL_nsitem *nsitem = ns->items[i];
+
+				if (strcmp(nsitem->name, name2) == 0)
+				{
+					if (name3 == NULL ||
+						nsitem->itemtype != PLPGSQL_NSTYPE_VAR)
+					{
+						if (names_used)
+							*names_used = 2;
+						return nsitem;
+					}
+				}
+			}
+		}
+
+		if (ns_localmode)
+			break;				/* do not look into upper levels */
 	}
 
-	/*
-	 * Finally lookup name in the namestack
-	 */
+	/* This is just to suppress possibly-uninitialized-variable warnings */
+	if (names_used)
+		*names_used = 0;
+	return NULL;				/* No match found */
+}
+
+
+/* ----------
+ * plpgsql_ns_lookup_label		Lookup a label in the namestack
+ * ----------
+ */
+PLpgSQL_nsitem *
+plpgsql_ns_lookup_label(const char *name)
+{
+	PLpgSQL_ns *ns;
+
 	for (ns = ns_current; ns != NULL; ns = ns->upper)
 	{
-		for (i = 1; i < ns->items_used; i++)
-		{
-			if (!strcmp(ns->items[i]->name, name))
-				return ns->items[i];
-		}
-		if (ns_localmode)
-			return NULL;		/* name not found in current namespace */
+		if (strcmp(ns->items[0]->name, name) == 0)
+			return ns->items[0];
 	}
 
-	return NULL;
+	return NULL;				/* label not found */
 }
 
 
@@ -295,14 +333,13 @@ plpgsql_ns_rename(char *oldname, char *newname)
 	int			i;
 
 	/*
-	 * Lookup name in the namestack; do the lookup in the current namespace
-	 * only.
+	 * Lookup name in the namestack
 	 */
 	for (ns = ns_current; ns != NULL; ns = ns->upper)
 	{
 		for (i = 1; i < ns->items_used; i++)
 		{
-			if (!strcmp(ns->items[i]->name, oldname))
+			if (strcmp(ns->items[i]->name, oldname) == 0)
 			{
 				newitem = palloc(sizeof(PLpgSQL_nsitem) + strlen(newname));
 				newitem->itemtype = ns->items[i]->itemtype;
@@ -437,41 +474,41 @@ plpgsql_stmt_typename(PLpgSQL_stmt *stmt)
 		case PLPGSQL_STMT_ASSIGN:
 			return _("assignment");
 		case PLPGSQL_STMT_IF:
-			return _("if");
+			return "IF";
 		case PLPGSQL_STMT_LOOP:
-			return _("loop");
+			return "LOOP";
 		case PLPGSQL_STMT_WHILE:
-			return _("while");
+			return "WHILE";
 		case PLPGSQL_STMT_FORI:
-			return _("for with integer loop variable");
+			return _("FOR with integer loop variable");
 		case PLPGSQL_STMT_FORS:
-			return _("for over select rows");
+			return _("FOR over SELECT rows");
 		case PLPGSQL_STMT_EXIT:
-			return _("exit");
+			return "EXIT";
 		case PLPGSQL_STMT_RETURN:
-			return _("return");
+			return "RETURN";
 		case PLPGSQL_STMT_RETURN_NEXT:
-			return _("return next");
+			return "RETURN NEXT";
 		case PLPGSQL_STMT_RETURN_QUERY:
 			return "RETURN QUERY";
 		case PLPGSQL_STMT_RAISE:
-			return _("raise");
+			return "RAISE";
 		case PLPGSQL_STMT_EXECSQL:
 			return _("SQL statement");
 		case PLPGSQL_STMT_DYNEXECUTE:
-			return _("execute statement");
+			return _("EXECUTE statement");
 		case PLPGSQL_STMT_DYNFORS:
-			return _("for over execute statement");
+			return _("FOR over EXECUTE statement");
 		case PLPGSQL_STMT_GETDIAG:
-			return _("get diagnostics");
+			return "GET DIAGNOSTICS";
 		case PLPGSQL_STMT_OPEN:
-			return _("open");
+			return "OPEN";
 		case PLPGSQL_STMT_FETCH:
-			return _("fetch");
+			return "FETCH";
 		case PLPGSQL_STMT_CLOSE:
-			return _("close");
+			return "CLOSE";
 		case PLPGSQL_STMT_PERFORM:
-			return _("perform");
+			return "PERFORM";
 	}
 
 	return "unknown";
@@ -641,7 +678,7 @@ free_fori(PLpgSQL_stmt_fori *stmt)
 {
 	free_expr(stmt->lower);
 	free_expr(stmt->upper);
-	free_expr(stmt->by);
+	free_expr(stmt->step);
 	free_stmts(stmt->body);
 }
 
@@ -804,7 +841,7 @@ plpgsql_free_function_memory(PLpgSQL_function *func)
  **********************************************************************/
 static int	dump_indent;
 
-static void dump_ind();
+static void dump_ind(void);
 static void dump_stmt(PLpgSQL_stmt *stmt);
 static void dump_block(PLpgSQL_stmt_block *block);
 static void dump_assign(PLpgSQL_stmt_assign *stmt);
@@ -824,6 +861,7 @@ static void dump_dynfors(PLpgSQL_stmt_dynfors *stmt);
 static void dump_getdiag(PLpgSQL_stmt_getdiag *stmt);
 static void dump_open(PLpgSQL_stmt_open *stmt);
 static void dump_fetch(PLpgSQL_stmt_fetch *stmt);
+static void dump_cursor_direction(PLpgSQL_stmt_fetch *stmt);
 static void dump_close(PLpgSQL_stmt_close *stmt);
 static void dump_perform(PLpgSQL_stmt_perform *stmt);
 static void dump_expr(PLpgSQL_expr *expr);
@@ -1033,10 +1071,13 @@ dump_fori(PLpgSQL_stmt_fori *stmt)
 	printf("    upper = ");
 	dump_expr(stmt->upper);
 	printf("\n");
-	dump_ind();
-	printf("    by = ");
-	dump_expr(stmt->by);
-	printf("\n");
+	if (stmt->step)
+	{
+		dump_ind();
+		printf("    step = ");
+		dump_expr(stmt->step);
+		printf("\n");
+	}
 	dump_indent -= 2;
 
 	dump_stmts(stmt->body);
@@ -1095,21 +1136,64 @@ static void
 dump_fetch(PLpgSQL_stmt_fetch *stmt)
 {
 	dump_ind();
-	printf("FETCH curvar=%d\n", stmt->curvar);
 
+	if (!stmt->is_move)
+	{
+		printf("FETCH curvar=%d\n", stmt->curvar);
+		dump_cursor_direction(stmt);
+
+		dump_indent += 2;
+		if (stmt->rec != NULL)
+		{
+			dump_ind();
+			printf("    target = %d %s\n", stmt->rec->recno, stmt->rec->refname);
+		}
+		if (stmt->row != NULL)
+		{
+			dump_ind();
+			printf("    target = %d %s\n", stmt->row->rowno, stmt->row->refname);
+		}
+		dump_indent -= 2;
+	}
+	else
+	{
+		printf("MOVE curvar=%d\n", stmt->curvar);
+		dump_cursor_direction(stmt);
+	}
+}
+
+static void
+dump_cursor_direction(PLpgSQL_stmt_fetch *stmt)
+{
 	dump_indent += 2;
-	if (stmt->rec != NULL)
+	dump_ind();
+	switch (stmt->direction)
 	{
-		dump_ind();
-		printf("    target = %d %s\n", stmt->rec->recno, stmt->rec->refname);
+		case FETCH_FORWARD:
+			printf("    FORWARD ");
+			break;
+		case FETCH_BACKWARD:
+			printf("    BACKWARD ");
+			break;
+		case FETCH_ABSOLUTE:
+			printf("    ABSOLUTE ");
+			break;
+		case FETCH_RELATIVE:
+			printf("    RELATIVE ");
+			break;
+		default:
+			printf("??? unknown cursor direction %d", stmt->direction);
 	}
-	if (stmt->row != NULL)
+
+	if (stmt->expr)
 	{
-		dump_ind();
-		printf("    target = %d %s\n", stmt->row->rowno, stmt->row->refname);
+		dump_expr(stmt->expr);
+		printf("\n");
 	}
-	dump_indent -= 2;
+	else
+		printf("%d\n", stmt->how_many);
 
+	dump_indent -= 2;
 }
 
 static void
@@ -1132,8 +1216,9 @@ static void
 dump_exit(PLpgSQL_stmt_exit *stmt)
 {
 	dump_ind();
-	printf("%s label='%s'",
-		   stmt->is_exit ? "EXIT" : "CONTINUE", stmt->label);
+	printf("%s", stmt->is_exit ? "EXIT" : "CONTINUE");
+	if (stmt->label != NULL)
+		printf(" label='%s'", stmt->label);
 	if (stmt->cond != NULL)
 	{
 		printf(" WHEN ");
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 5257bc8a423e..9b378bb32a4b 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.36 2007/01/30 22:05:13 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.38 2008/01/01 19:46:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -220,8 +220,7 @@ plpgsql_validator(PG_FUNCTION_ARGS)
 			istrigger = true;
 		else if (proc->prorettype != RECORDOID &&
 				 proc->prorettype != VOIDOID &&
-				 proc->prorettype != ANYARRAYOID &&
-				 proc->prorettype != ANYELEMENTOID)
+				 !IsPolymorphicType(proc->prorettype))
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("PL/pgSQL functions cannot return type %s",
@@ -236,8 +235,7 @@ plpgsql_validator(PG_FUNCTION_ARGS)
 	{
 		if (get_typtype(argtypes[i]) == TYPTYPE_PSEUDO)
 		{
-			if (argtypes[i] != ANYARRAYOID &&
-				argtypes[i] != ANYELEMENTOID)
+			if (!IsPolymorphicType(argtypes[i]))
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						 errmsg("PL/pgSQL functions cannot accept type %s",
diff --git a/src/pl/plpgsql/src/plerrcodes.h b/src/pl/plpgsql/src/plerrcodes.h
index 881ae13f1837..5fbdf255d820 100644
--- a/src/pl/plpgsql/src/plerrcodes.h
+++ b/src/pl/plpgsql/src/plerrcodes.h
@@ -9,7 +9,7 @@
  *
  * Copyright (c) 2003-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/plerrcodes.h,v 1.11 2007/01/05 22:20:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/plerrcodes.h,v 1.13 2008/01/15 01:36:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -243,6 +243,10 @@
 	"untranslatable_character", ERRCODE_UNTRANSLATABLE_CHARACTER
 },
 
+{
+	"not_an_xml_document", ERRCODE_NOT_AN_XML_DOCUMENT
+},
+
 {
 	"invalid_xml_document", ERRCODE_INVALID_XML_DOCUMENT
 },
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index 148e502bc0aa..1e5b2d5fbc62 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -3,12 +3,12 @@
  * plpgsql.h		- Definitions for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.85 2007/02/09 03:35:34 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.95.2.2 2009/12/29 17:41:18 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -174,20 +174,22 @@ typedef struct PLpgSQL_expr
 	int			dtype;
 	int			exprno;
 	char	   *query;
-	void	   *plan;
-	bool			cachable;			/* true if plan can be cached */
+	SPIPlanPtr	plan;
+	bool		cachable;			/* true if plan can be cached */
 	Oid		   *plan_argtypes;
 	/* fields for "simple expression" fast-path execution: */
 	Expr	   *expr_simple_expr;		/* NULL means not a simple expr */
 	Oid			expr_simple_type;
 	TransactionId	transaction_id;	/* used for clearing cached plan */
+	int			expr_simple_generation; /* plancache generation we checked */
 
 	/*
 	 * if expr is simple AND prepared in current eval_estate,
-	 * expr_simple_state is valid.  Test validity by seeing if expr_simple_id
-	 * matches eval_estate_simple_id.
+	 * expr_simple_state and expr_simple_in_use are valid. Test validity by
+	 * seeing if expr_simple_id matches eval_estate_simple_id.
 	 */
-	ExprState  *expr_simple_state;
+	ExprState  *expr_simple_state;		/* eval tree for expr_simple_expr */
+	bool		expr_simple_in_use;		/* true if eval tree is active */
 	long int	expr_simple_id;
 
 	/* params to pass to expr */
@@ -209,6 +211,7 @@ typedef struct
 	PLpgSQL_expr *default_val;
 	PLpgSQL_expr *cursor_explicit_expr;
 	int			cursor_explicit_argrow;
+	int			cursor_options;
 
 	Datum		value;
 	bool		isnull;
@@ -403,7 +406,7 @@ typedef struct
 	PLpgSQL_var *var;
 	PLpgSQL_expr *lower;
 	PLpgSQL_expr *upper;
-	PLpgSQL_expr *by;
+	PLpgSQL_expr *step;			/* NULL means default (ie, BY 1) */
 	int			reverse;
 	List	   *body;			/* List of statements */
 } PLpgSQL_stmt_fori;
@@ -438,6 +441,7 @@ typedef struct
 	int			cmd_type;
 	int			lineno;
 	int			curvar;
+	int			cursor_options;
 	PLpgSQL_row *returntype;
 	PLpgSQL_expr *argquery;
 	PLpgSQL_expr *query;
@@ -446,12 +450,16 @@ typedef struct
 
 
 typedef struct
-{								/* FETCH curvar INTO statement		*/
+{								/* FETCH or MOVE statement */
 	int			cmd_type;
 	int			lineno;
-	PLpgSQL_rec *rec;
+	PLpgSQL_rec *rec;			/* target, as record or row */
 	PLpgSQL_row *row;
-	int			curvar;
+	int			curvar;			/* cursor variable to fetch from */
+	FetchDirection direction;	/* fetch direction */
+	int			how_many;		/* count, if constant (expr is NULL) */
+	PLpgSQL_expr *expr;			/* count, if expression */
+	bool		is_move;		/* is this a fetch or move? */
 } PLpgSQL_stmt_fetch;
 
 
@@ -468,7 +476,7 @@ typedef struct
 	int			cmd_type;
 	int			lineno;
 	bool		is_exit;		/* Is this an exit or a continue? */
-	char	   *label;
+	char	   *label;			/* NULL if it's an unlabelled EXIT/CONTINUE */
 	PLpgSQL_expr *cond;
 } PLpgSQL_stmt_exit;
 
@@ -617,6 +625,7 @@ typedef struct
 
 	Tuplestorestate *tuple_store;		/* SRFs accumulate results here */
 	MemoryContext tuple_store_cxt;
+	ResourceOwner tuple_store_owner;
 	ReturnSetInfo *rsi;
 
 	int			trig_nargs;
@@ -630,9 +639,9 @@ typedef struct
 	SPITupleTable *eval_tuptable;
 	uint64		eval_processed;
 	Oid			eval_lastoid;
-	ExprContext *eval_econtext;	/* for executing simple expressions */
+	ExprContext *eval_econtext; /* for executing simple expressions */
 	EState	   *eval_estate;	/* EState containing eval_econtext */
-	long int	eval_estate_simple_id;		/* ID for eval_estate */
+	long int	eval_estate_simple_id;	/* ID for eval_estate */
 
 	/* status information for error context reporting */
 	PLpgSQL_function *err_func; /* current func */
@@ -724,9 +733,9 @@ extern PLpgSQL_function *plpgsql_compile(FunctionCallInfo fcinfo,
 				bool forValidator);
 extern PLpgSQL_function *plpgsql_compile_inline(FunctionCallInfo fcinfo, 
 				char *proc_source);
-extern int	plpgsql_parse_word(char *word);
-extern int	plpgsql_parse_dblword(char *word);
-extern int	plpgsql_parse_tripword(char *word);
+extern int	plpgsql_parse_word(const char *word);
+extern int	plpgsql_parse_dblword(const char *word);
+extern int	plpgsql_parse_tripword(const char *word);
 extern int	plpgsql_parse_wordtype(char *word);
 extern int	plpgsql_parse_dblwordtype(char *word);
 extern int	plpgsql_parse_tripwordtype(char *word);
@@ -762,7 +771,7 @@ extern HeapTuple plpgsql_exec_trigger(PLpgSQL_function *func,
 					 TriggerData *trigdata);
 extern void plpgsql_xact_cb(XactEvent event, void *arg);
 extern void plpgsql_subxact_cb(SubXactEvent event, SubTransactionId mySubid,
-							   SubTransactionId parentSubid, void *arg);
+				   SubTransactionId parentSubid, void *arg);
 
 /* ----------
  * Functions for the dynamic string handling in pl_funcs.c
@@ -775,15 +784,17 @@ extern void plpgsql_dstring_append_char(PLpgSQL_dstring *ds, char c);
 extern char *plpgsql_dstring_get(PLpgSQL_dstring *ds);
 
 /* ----------
- * Functions for the namestack handling in pl_funcs.c
+ * Functions for namestack handling in pl_funcs.c
  * ----------
  */
 extern void plpgsql_ns_init(void);
 extern bool plpgsql_ns_setlocal(bool flag);
-extern void plpgsql_ns_push(char *label);
+extern void plpgsql_ns_push(const char *label);
 extern void plpgsql_ns_pop(void);
 extern void plpgsql_ns_additem(int itemtype, int itemno, const char *name);
-extern PLpgSQL_nsitem *plpgsql_ns_lookup(char *name, char *nsname);
+extern PLpgSQL_nsitem *plpgsql_ns_lookup(const char *name1, const char *name2,
+										 const char *name3, int *names_used);
+extern PLpgSQL_nsitem *plpgsql_ns_lookup_label(const char *name);
 extern void plpgsql_ns_rename(char *oldname, char *newname);
 
 /* ----------
diff --git a/src/pl/plpgsql/src/scan.l b/src/pl/plpgsql/src/scan.l
index 3d6e52ec0c08..338b203b5a1d 100755
--- a/src/pl/plpgsql/src/scan.l
+++ b/src/pl/plpgsql/src/scan.l
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.55 2007/01/05 22:20:02 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.60 2008/01/01 19:46:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -141,8 +141,8 @@ declare			{ return K_DECLARE;			}
 default			{ return K_DEFAULT;			}
 diagnostics		{ return K_DIAGNOSTICS;		}
 else			{ return K_ELSE;			}
-elseif          { return K_ELSIF;           }
-elsif           { return K_ELSIF;           }
+elseif			{ return K_ELSIF;			}
+elsif			{ return K_ELSIF;			}
 end				{ return K_END;				}
 exception		{ return K_EXCEPTION;		}
 execute			{ return K_EXECUTE;			}
@@ -159,6 +159,8 @@ into			{ return K_INTO;			}
 is				{ return K_IS;				}
 log				{ return K_LOG;				}
 loop			{ return K_LOOP;			}
+move			{ return K_MOVE;			}
+no{space}+scroll { return K_NOSCROLL;		}
 not				{ return K_NOT;				}
 notice			{ return K_NOTICE;			}
 null			{ return K_NULL;			}
@@ -171,6 +173,7 @@ result_oid		{ return K_RESULT_OID;		}
 return			{ return K_RETURN;			}
 reverse			{ return K_REVERSE;			}
 row_count		{ return K_ROW_COUNT;		}
+scroll			{ return K_SCROLL;			}
 strict			{ return K_STRICT;	    	}
 then			{ return K_THEN;			}
 to				{ return K_TO;				}
diff --git a/src/pl/plpython/.gitignore b/src/pl/plpython/.gitignore
index 70633a438d6d..3b6d4b4d4d42 100644
--- a/src/pl/plpython/.gitignore
+++ b/src/pl/plpython/.gitignore
@@ -1,3 +1,6 @@
+# Generated subdirectories
+/results/
+
 libplpython.so.0
 libplpython.so.0.0
 libplpython.so
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 5340cd44491f..690969b720a3 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -84,7 +84,7 @@ installdirs: installdirs-lib
 uninstall: uninstall-lib
 
 installcheck: submake
-	$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS)
+	$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir="$(PSQLDIR)" $(REGRESS_OPTS) $(REGRESS)
 
 .PHONY: submake
 submake:
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index ec2f0a5bbfd7..beb4b25ec62a 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -2166,7 +2166,6 @@ PLy_input_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)
 
 	if (arg->is_rowtype == 0)
 		elog(ERROR, "PLyTypeInfo struct is initialized for a Datum");
-
 	arg->is_rowtype = 1;
 
 	if (arg->in.r.natts != desc->natts)
diff --git a/src/pl/tcl/.gitignore b/src/pl/tcl/.gitignore
new file mode 100644
index 000000000000..19b6c5ba425c
--- /dev/null
+++ b/src/pl/tcl/.gitignore
@@ -0,0 +1,2 @@
+# Generated subdirectories
+/results/
diff --git a/src/pl/tcl/expected/pltcl_setup.out b/src/pl/tcl/expected/pltcl_setup.out
index 496cf228dc0e..e46c1c3e987e 100755
--- a/src/pl/tcl/expected/pltcl_setup.out
+++ b/src/pl/tcl/expected/pltcl_setup.out
@@ -495,3 +495,23 @@ CREATE OPERATOR CLASS tcl_int4_ops
 	OPERATOR 4  @>=,
 	OPERATOR 5  @>,
 	FUNCTION 1  tcl_int4cmp(int4,int4) ;
+--
+-- Test usage of Tcl's "clock" command.  In recent Tcl versions this
+-- command fails without working "unknown" support, so it's a good canary
+-- for initialization problems.
+--
+create function tcl_date_week(int4,int4,int4) returns text as $$
+    return [clock format [clock scan "$2/$3/$1"] -format "%U"]
+$$ language pltcl immutable;
+select tcl_date_week(2010,1,24);
+ tcl_date_week 
+---------------
+ 04
+(1 row)
+
+select tcl_date_week(2001,10,24);
+ tcl_date_week 
+---------------
+ 42
+(1 row)
+
diff --git a/src/pl/tcl/modules/.gitignore b/src/pl/tcl/modules/.gitignore
new file mode 100644
index 000000000000..89581887c48e
--- /dev/null
+++ b/src/pl/tcl/modules/.gitignore
@@ -0,0 +1,3 @@
+/pltcl_delmod
+/pltcl_listmod
+/pltcl_loadmod
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 3111c9c5a72b..437846a85584 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -2,7 +2,7 @@
  * pltcl.c		- PostgreSQL support for Tcl as
  *				  procedural language (PL)
  *
- *	  $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.110 2007/02/09 03:35:35 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.117.2.3 2010/05/13 18:29:25 tgl Exp $
  *
  **********************************************************************/
 
@@ -19,15 +19,17 @@
 #endif
 
 #include "access/heapam.h"
-#include "catalog/pg_language.h"
+#include "catalog/namespace.h"
 #include "catalog/pg_proc.h"
 #include "commands/trigger.h"
 #include "executor/spi.h"
 #include "fmgr.h"
+#include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "parser/parse_type.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
+#include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/syscache.h"
@@ -76,16 +78,37 @@ utf_e2u(unsigned char *src)
 
 PG_MODULE_MAGIC;
 
+
+/**********************************************************************
+ * Information associated with a Tcl interpreter.  We have one interpreter
+ * that is used for all pltclu (untrusted) functions.  For pltcl (trusted)
+ * functions, there is a separate interpreter for each effective SQL userid.
+ * (This is needed to ensure that an unprivileged user can't inject Tcl code
+ * that'll be executed with the privileges of some other SQL user.)
+ *
+ * The pltcl_interp_desc structs are kept in a Postgres hash table indexed
+ * by userid OID, with OID 0 used for the single untrusted interpreter.
+ **********************************************************************/
+typedef struct pltcl_interp_desc
+{
+	Oid			user_id;				/* Hash key (must be first!) */
+	Tcl_Interp *interp;					/* The interpreter */
+	Tcl_HashTable query_hash;			/* pltcl_query_desc structs */
+} pltcl_interp_desc;
+
+
 /**********************************************************************
  * The information we cache about loaded procedures
  **********************************************************************/
 typedef struct pltcl_proc_desc
 {
-	char	   *proname;
+	char	   *user_proname;
+	char	   *internal_proname;
 	TransactionId fn_xmin;
 	ItemPointerData fn_tid;
 	bool		fn_readonly;
 	bool		lanpltrusted;
+	pltcl_interp_desc *interp_desc;
 	FmgrInfo	result_in_func;
 	Oid			result_typioparam;
 	int			nargs;
@@ -108,19 +131,40 @@ typedef struct pltcl_query_desc
 } pltcl_query_desc;
 
 
+/**********************************************************************
+ * For speedy lookup, we maintain a hash table mapping from
+ * function OID + trigger OID + user OID to pltcl_proc_desc pointers.
+ * The reason the pltcl_proc_desc struct isn't directly part of the hash
+ * entry is to simplify recovery from errors during compile_pltcl_function.
+ *
+ * Note: if the same function is called by multiple userIDs within a session,
+ * there will be a separate pltcl_proc_desc entry for each userID in the case
+ * of pltcl functions, but only one entry for pltclu functions, because we
+ * set user_id = 0 for that case.
+ **********************************************************************/
+typedef struct pltcl_proc_key
+{
+	Oid			proc_id;				/* Function OID */
+	Oid			trig_id;				/* Trigger OID, or 0 if not trigger */
+	Oid			user_id;				/* User calling the function, or 0 */
+} pltcl_proc_key;
+
+typedef struct pltcl_proc_ptr
+{
+	pltcl_proc_key proc_key;			/* Hash key (must be first!) */
+	pltcl_proc_desc *proc_ptr;
+} pltcl_proc_ptr;
+
+
 /**********************************************************************
  * Global data
  **********************************************************************/
 static bool pltcl_pm_init_done = false;
-static bool pltcl_be_init_done = false;
 static Tcl_Interp *pltcl_hold_interp = NULL;
-static Tcl_Interp *pltcl_norm_interp = NULL;
-static Tcl_Interp *pltcl_safe_interp = NULL;
-static Tcl_HashTable *pltcl_proc_hash = NULL;
-static Tcl_HashTable *pltcl_norm_query_hash = NULL;
-static Tcl_HashTable *pltcl_safe_query_hash = NULL;
+static HTAB *pltcl_interp_htab = NULL;
+static HTAB *pltcl_proc_htab = NULL;
 
-/* these are saved and restored by pltcl_call_handler */
+/* these are saved and restored by pltcl_handler */
 static FunctionCallInfo pltcl_current_fcinfo = NULL;
 static pltcl_proc_desc *pltcl_current_prodesc = NULL;
 
@@ -131,17 +175,20 @@ Datum		pltcl_call_handler(PG_FUNCTION_ARGS);
 Datum		pltclu_call_handler(PG_FUNCTION_ARGS);
 void		_PG_init(void);
 
-static void pltcl_init_all(void);
-static void pltcl_init_interp(Tcl_Interp *interp);
+static void pltcl_init_interp(pltcl_interp_desc *interp_desc, bool pltrusted);
+static pltcl_interp_desc *pltcl_fetch_interp(bool pltrusted);
 static void pltcl_init_load_unknown(Tcl_Interp *interp);
 
-static Datum pltcl_func_handler(PG_FUNCTION_ARGS);
+static Datum pltcl_handler(PG_FUNCTION_ARGS, bool pltrusted);
 
-static HeapTuple pltcl_trigger_handler(PG_FUNCTION_ARGS);
+static Datum pltcl_func_handler(PG_FUNCTION_ARGS, bool pltrusted);
 
-static void throw_tcl_error(Tcl_Interp *interp);
+static HeapTuple pltcl_trigger_handler(PG_FUNCTION_ARGS, bool pltrusted);
 
-static pltcl_proc_desc *compile_pltcl_function(Oid fn_oid, Oid tgreloid);
+static void throw_tcl_error(Tcl_Interp *interp, const char *proname);
+
+static pltcl_proc_desc *compile_pltcl_function(Oid fn_oid, Oid tgreloid,
+											   bool pltrusted);
 
 static int pltcl_elog(ClientData cdata, Tcl_Interp *interp,
 		   int argc, CONST84 char *argv[]);
@@ -173,6 +220,67 @@ static void pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc,
 						   Tcl_DString *retval);
 
 
+/*
+ * Hack to override Tcl's builtin Notifier subsystem.  This prevents the
+ * backend from becoming multithreaded, which breaks all sorts of things.
+ * That happens in the default version of Tcl_InitNotifier if the TCL library
+ * has been compiled with multithreading support (i.e. when TCL_THREADS is
+ * defined under Unix, and in all cases under Windows).
+ * It's okay to disable the notifier because we never enter the Tcl event loop
+ * from Postgres, so the notifier capabilities are initialized, but never
+ * used.  Only InitNotifier and DeleteFileHandler ever seem to get called
+ * within Postgres, but we implement all the functions for completeness.
+ * We can only fix this with Tcl >= 8.4, when Tcl_SetNotifier() appeared.
+ */
+#if HAVE_TCL_VERSION(8,4)
+
+static ClientData
+pltcl_InitNotifier(void)
+{
+	static int	fakeThreadKey;	/* To give valid address for ClientData */
+
+	return (ClientData) &(fakeThreadKey);
+}
+
+static void
+pltcl_FinalizeNotifier(ClientData clientData)
+{
+}
+
+static void
+pltcl_SetTimer(Tcl_Time *timePtr)
+{
+}
+
+static void
+pltcl_AlertNotifier(ClientData clientData)
+{
+}
+
+static void
+pltcl_CreateFileHandler(int fd, int mask,
+						Tcl_FileProc *proc, ClientData clientData)
+{
+}
+
+static void
+pltcl_DeleteFileHandler(int fd)
+{
+}
+
+static void
+pltcl_ServiceModeHook(int mode)
+{
+}
+
+static int
+pltcl_WaitForEvent(Tcl_Time *timePtr)
+{
+	return 0;
+}
+#endif   /* HAVE_TCL_VERSION(8,2) */
+
+
 /*
  * This routine is a crock, and so is everyplace that calls it.  The problem
  * is that the cached form of pltcl functions/queries is allocated permanently
@@ -194,10 +302,15 @@ perm_fmgr_info(Oid functionId, FmgrInfo *finfo)
  * _PG_init()			- library load-time initialization
  *
  * DO NOT make this static nor change its name!
+ *
+ * The work done here must be safe to do in the postmaster process,
+ * in case the pltcl library is preloaded in the postmaster.
  */
 void
 _PG_init(void)
 {
+	HASHCTL		hash_ctl;
+
 	/* Be sure we do initialization only once (should be redundant now) */
 	if (pltcl_pm_init_done)
 		return;
@@ -207,70 +320,87 @@ _PG_init(void)
 	Tcl_FindExecutable("");
 #endif
 
+#if HAVE_TCL_VERSION(8,4)
+
+	/*
+	 * Override the functions in the Notifier subsystem.  See comments above.
+	 */
+	{
+		Tcl_NotifierProcs notifier;
+
+		notifier.setTimerProc = pltcl_SetTimer;
+		notifier.waitForEventProc = pltcl_WaitForEvent;
+		notifier.createFileHandlerProc = pltcl_CreateFileHandler;
+		notifier.deleteFileHandlerProc = pltcl_DeleteFileHandler;
+		notifier.initNotifierProc = pltcl_InitNotifier;
+		notifier.finalizeNotifierProc = pltcl_FinalizeNotifier;
+		notifier.alertNotifierProc = pltcl_AlertNotifier;
+		notifier.serviceModeHookProc = pltcl_ServiceModeHook;
+		Tcl_SetNotifier(&notifier);
+	}
+#endif
+
 	/************************************************************
 	 * Create the dummy hold interpreter to prevent close of
 	 * stdout and stderr on DeleteInterp
 	 ************************************************************/
 	if ((pltcl_hold_interp = Tcl_CreateInterp()) == NULL)
-		elog(ERROR, "could not create \"hold\" interpreter");
+		elog(ERROR, "could not create master Tcl interpreter");
+	if (Tcl_Init(pltcl_hold_interp) == TCL_ERROR)
+		elog(ERROR, "could not initialize master Tcl interpreter");
 
 	/************************************************************
-	 * Create the two interpreters
+	 * Create the hash table for working interpreters
 	 ************************************************************/
-	if ((pltcl_norm_interp =
-		 Tcl_CreateSlave(pltcl_hold_interp, "norm", 0)) == NULL)
-		elog(ERROR, "could not create \"normal\" interpreter");
-	pltcl_init_interp(pltcl_norm_interp);
-
-	if ((pltcl_safe_interp =
-		 Tcl_CreateSlave(pltcl_hold_interp, "safe", 1)) == NULL)
-		elog(ERROR, "could not create \"safe\" interpreter");
-	pltcl_init_interp(pltcl_safe_interp);
+	memset(&hash_ctl, 0, sizeof(hash_ctl));
+	hash_ctl.keysize = sizeof(Oid);
+	hash_ctl.entrysize = sizeof(pltcl_interp_desc);
+	hash_ctl.hash = oid_hash;
+	pltcl_interp_htab = hash_create("PL/Tcl interpreters",
+									8,
+									&hash_ctl,
+									HASH_ELEM | HASH_FUNCTION);
 
 	/************************************************************
-	 * Initialize the proc and query hash tables
+	 * Create the hash table for function lookup
 	 ************************************************************/
-	pltcl_proc_hash = (Tcl_HashTable *) malloc(sizeof(Tcl_HashTable));
-	pltcl_norm_query_hash = (Tcl_HashTable *) malloc(sizeof(Tcl_HashTable));
-	pltcl_safe_query_hash = (Tcl_HashTable *) malloc(sizeof(Tcl_HashTable));
-	Tcl_InitHashTable(pltcl_proc_hash, TCL_STRING_KEYS);
-	Tcl_InitHashTable(pltcl_norm_query_hash, TCL_STRING_KEYS);
-	Tcl_InitHashTable(pltcl_safe_query_hash, TCL_STRING_KEYS);
+	memset(&hash_ctl, 0, sizeof(hash_ctl));
+	hash_ctl.keysize = sizeof(pltcl_proc_key);
+	hash_ctl.entrysize = sizeof(pltcl_proc_ptr);
+	hash_ctl.hash = tag_hash;
+	pltcl_proc_htab = hash_create("PL/Tcl functions",
+								  100,
+								  &hash_ctl,
+								  HASH_ELEM | HASH_FUNCTION);
 
 	pltcl_pm_init_done = true;
 }
 
 /**********************************************************************
- * pltcl_init_all()		- Initialize all
- *
- * This does initialization that can't be done in the postmaster, and
- * hence is not safe to do at library load time.
+ * pltcl_init_interp() - initialize a new Tcl interpreter
  **********************************************************************/
 static void
-pltcl_init_all(void)
+pltcl_init_interp(pltcl_interp_desc *interp_desc, bool pltrusted)
 {
+	Tcl_Interp *interp;
+	char		interpname[32];
+
 	/************************************************************
-	 * Try to load the unknown procedure from pltcl_modules
+	 * Create the Tcl interpreter as a slave of pltcl_hold_interp.
+	 * Note: Tcl automatically does Tcl_Init in the untrusted case,
+	 * and it's not wanted in the trusted case.
 	 ************************************************************/
-	if (!pltcl_be_init_done)
-	{
-		if (SPI_connect() != SPI_OK_CONNECT)
-			elog(ERROR, "SPI_connect failed");
-		pltcl_init_load_unknown(pltcl_norm_interp);
-		pltcl_init_load_unknown(pltcl_safe_interp);
-		if (SPI_finish() != SPI_OK_FINISH)
-			elog(ERROR, "SPI_finish failed");
-		pltcl_be_init_done = true;
-	}
-}
+	snprintf(interpname, sizeof(interpname), "slave_%u", interp_desc->user_id);
+	if ((interp = Tcl_CreateSlave(pltcl_hold_interp, interpname,
+								  pltrusted ? 1 : 0)) == NULL)
+		elog(ERROR, "could not create slave Tcl interpreter");
+	interp_desc->interp = interp;
 
+	/************************************************************
+	 * Initialize the query hash table associated with interpreter
+	 ************************************************************/
+	Tcl_InitHashTable(&interp_desc->query_hash, TCL_STRING_KEYS);
 
-/**********************************************************************
- * pltcl_init_interp() - initialize a Tcl interpreter
- **********************************************************************/
-static void
-pltcl_init_interp(Tcl_Interp *interp)
-{
 	/************************************************************
 	 * Install the commands for SPI support in the interpreter
 	 ************************************************************/
@@ -291,8 +421,40 @@ pltcl_init_interp(Tcl_Interp *interp)
 					  pltcl_SPI_execute_plan, NULL, NULL);
 	Tcl_CreateCommand(interp, "spi_lastoid",
 					  pltcl_SPI_lastoid, NULL, NULL);
+
+	/************************************************************
+	 * Try to load the unknown procedure from pltcl_modules
+	 ************************************************************/
+	pltcl_init_load_unknown(interp);
 }
 
+/**********************************************************************
+ * pltcl_fetch_interp() - fetch the Tcl interpreter to use for a function
+ *
+ * This also takes care of any on-first-use initialization required.
+ * Note: we assume caller has already connected to SPI.
+ **********************************************************************/
+static pltcl_interp_desc *
+pltcl_fetch_interp(bool pltrusted)
+{
+	Oid			user_id;
+	pltcl_interp_desc *interp_desc;
+	bool		found;
+
+	/* Find or create the interpreter hashtable entry for this userid */
+	if (pltrusted)
+		user_id = GetUserId();
+	else
+		user_id = InvalidOid;
+
+	interp_desc = hash_search(pltcl_interp_htab, &user_id,
+							  HASH_ENTER,
+							  &found);
+	if (!found)
+		pltcl_init_interp(interp_desc, pltrusted);
+
+	return interp_desc;
+}
 
 /**********************************************************************
  * pltcl_init_load_unknown()	- Load the unknown procedure from
@@ -301,6 +463,12 @@ pltcl_init_interp(Tcl_Interp *interp)
 static void
 pltcl_init_load_unknown(Tcl_Interp *interp)
 {
+	Oid			relOid;
+	Relation	pmrel;
+	char	   *pmrelname,
+			   *nspname;
+	char	   *buf;
+	int			buflen;
 	int			spi_rc;
 	int			tcl_rc;
 	Tcl_DString unknown_src;
@@ -310,47 +478,87 @@ pltcl_init_load_unknown(Tcl_Interp *interp)
 
 	/************************************************************
 	 * Check if table pltcl_modules exists
+	 *
+	 * We allow the table to be found anywhere in the search_path.
+	 * This is for backwards compatibility.  To ensure that the table
+	 * is trustworthy, we require it to be owned by a superuser.
+	 *
+	 * this next bit of code is the same as try_relation_openrv(),
+	 * which only exists in 8.4 and up.
 	 ************************************************************/
-	spi_rc = SPI_execute("select 1 from pg_catalog.pg_class "
-						 "where relname = 'pltcl_modules'",
-						 false, 1);
-	SPI_freetuptable(SPI_tuptable);
-	if (spi_rc != SPI_OK_SELECT)
-		elog(ERROR, "select from pg_class failed");
-	if (SPI_processed == 0)
+
+	/* Check for shared-cache-inval messages */
+	AcceptInvalidationMessages();
+
+	/* Look up the appropriate relation using namespace search */
+	relOid = RangeVarGetRelid(makeRangeVar(NULL, "pltcl_modules"), true);
+
+	/* Drop out on not-found */
+	if (!OidIsValid(relOid))
 		return;
 
+	/* Let relation_open do the rest */
+	pmrel = relation_open(relOid, AccessShareLock);
+
+	if (pmrel == NULL)
+		return;
+	/* must be table or view, else ignore */
+	if (!(pmrel->rd_rel->relkind == RELKIND_RELATION ||
+		  pmrel->rd_rel->relkind == RELKIND_VIEW))
+	{
+		relation_close(pmrel, AccessShareLock);
+		return;
+	}
+	/* must be owned by superuser, else ignore */
+	if (!superuser_arg(pmrel->rd_rel->relowner))
+	{
+		relation_close(pmrel, AccessShareLock);
+		return;
+	}
+	/* get fully qualified table name for use in select command */
+	nspname = get_namespace_name(RelationGetNamespace(pmrel));
+	if (!nspname)
+		elog(ERROR, "cache lookup failed for namespace %u",
+			 RelationGetNamespace(pmrel));
+	pmrelname = quote_qualified_identifier(nspname,
+										   RelationGetRelationName(pmrel));
+
 	/************************************************************
-	 * Read all the row's from it where modname = 'unknown' in
-	 * the order of modseq
+	 * Read all the rows from it where modname = 'unknown',
+	 * in the order of modseq
 	 ************************************************************/
-	Tcl_DStringInit(&unknown_src);
+	buflen = strlen(pmrelname) + 100;
+	buf = (char *) palloc(buflen);
+	snprintf(buf, buflen,
+			 "select modsrc from %s where modname = 'unknown' order by modseq",
+			 pmrelname);
 
-	spi_rc = SPI_execute("select modseq, modsrc from pltcl_modules "
-						 "where modname = 'unknown' "
-						 "order by modseq",
-						 false, 0);
+	spi_rc = SPI_execute(buf, false, 0);
 	if (spi_rc != SPI_OK_SELECT)
 		elog(ERROR, "select from pltcl_modules failed");
 
+	pfree(buf);
+
 	/************************************************************
 	 * If there's nothing, module unknown doesn't exist
 	 ************************************************************/
 	if (SPI_processed == 0)
 	{
-		Tcl_DStringFree(&unknown_src);
 		SPI_freetuptable(SPI_tuptable);
 		elog(WARNING, "module \"unknown\" not found in pltcl_modules");
+		relation_close(pmrel, AccessShareLock);
 		return;
 	}
 
 	/************************************************************
-	 * There is a module named unknown. Resemble the
+	 * There is a module named unknown. Reassemble the
 	 * source from the modsrc attributes and evaluate
 	 * it in the Tcl interpreter
 	 ************************************************************/
 	fno = SPI_fnumber(SPI_tuptable->tupdesc, "modsrc");
 
+	Tcl_DStringInit(&unknown_src);
+
 	for (i = 0; i < SPI_processed; i++)
 	{
 		part = SPI_getvalue(SPI_tuptable->vals[i],
@@ -364,8 +572,19 @@ pltcl_init_load_unknown(Tcl_Interp *interp)
 		}
 	}
 	tcl_rc = Tcl_GlobalEval(interp, Tcl_DStringValue(&unknown_src));
+
 	Tcl_DStringFree(&unknown_src);
 	SPI_freetuptable(SPI_tuptable);
+
+	if (tcl_rc != TCL_OK)
+	{
+		UTF_BEGIN;
+		elog(ERROR, "could not load module \"unknown\": %s",
+			 UTF_U2E(Tcl_GetStringResult(interp)));
+		UTF_END;
+	}
+
+	relation_close(pmrel, AccessShareLock);
 }
 
 
@@ -381,16 +600,30 @@ PG_FUNCTION_INFO_V1(pltcl_call_handler);
 /* keep non-static */
 Datum
 pltcl_call_handler(PG_FUNCTION_ARGS)
+{
+	return pltcl_handler(fcinfo, true);
+}
+
+/*
+ * Alternative handler for unsafe functions
+ */
+PG_FUNCTION_INFO_V1(pltclu_call_handler);
+
+/* keep non-static */
+Datum
+pltclu_call_handler(PG_FUNCTION_ARGS)
+{
+	return pltcl_handler(fcinfo, false);
+}
+
+
+static Datum
+pltcl_handler(PG_FUNCTION_ARGS, bool pltrusted)
 {
 	Datum		retval;
 	FunctionCallInfo save_fcinfo;
 	pltcl_proc_desc *save_prodesc;
 
-	/*
-	 * Initialize interpreters if first time through
-	 */
-	pltcl_init_all();
-
 	/*
 	 * Ensure that static pointers are saved/restored properly
 	 */
@@ -406,12 +639,12 @@ pltcl_call_handler(PG_FUNCTION_ARGS)
 		if (CALLED_AS_TRIGGER(fcinfo))
 		{
 			pltcl_current_fcinfo = NULL;
-			retval = PointerGetDatum(pltcl_trigger_handler(fcinfo));
+			retval = PointerGetDatum(pltcl_trigger_handler(fcinfo, pltrusted));
 		}
 		else
 		{
 			pltcl_current_fcinfo = fcinfo;
-			retval = pltcl_func_handler(fcinfo);
+			retval = pltcl_func_handler(fcinfo, pltrusted);
 		}
 	}
 	PG_CATCH();
@@ -429,23 +662,11 @@ pltcl_call_handler(PG_FUNCTION_ARGS)
 }
 
 
-/*
- * Alternate handler for unsafe functions
- */
-PG_FUNCTION_INFO_V1(pltclu_call_handler);
-
-/* keep non-static */
-Datum
-pltclu_call_handler(PG_FUNCTION_ARGS)
-{
-	return pltcl_call_handler(fcinfo);
-}
-
 /**********************************************************************
  * pltcl_func_handler()		- Handler for regular function calls
  **********************************************************************/
 static Datum
-pltcl_func_handler(PG_FUNCTION_ARGS)
+pltcl_func_handler(PG_FUNCTION_ARGS, bool pltrusted)
 {
 	pltcl_proc_desc *prodesc;
 	Tcl_Interp *volatile interp;
@@ -460,14 +681,12 @@ pltcl_func_handler(PG_FUNCTION_ARGS)
 		elog(ERROR, "could not connect to SPI manager");
 
 	/* Find or compile the function */
-	prodesc = compile_pltcl_function(fcinfo->flinfo->fn_oid, InvalidOid);
+	prodesc = compile_pltcl_function(fcinfo->flinfo->fn_oid, InvalidOid,
+									 pltrusted);
 
 	pltcl_current_prodesc = prodesc;
 
-	if (prodesc->lanpltrusted)
-		interp = pltcl_safe_interp;
-	else
-		interp = pltcl_norm_interp;
+	interp = prodesc->interp_desc->interp;
 
 	/************************************************************
 	 * Create the tcl command to call the internal
@@ -475,7 +694,7 @@ pltcl_func_handler(PG_FUNCTION_ARGS)
 	 ************************************************************/
 	Tcl_DStringInit(&tcl_cmd);
 	Tcl_DStringInit(&list_tmp);
-	Tcl_DStringAppendElement(&tcl_cmd, prodesc->proname);
+	Tcl_DStringAppendElement(&tcl_cmd, prodesc->internal_proname);
 
 	/************************************************************
 	 * Add all call arguments to the command
@@ -558,7 +777,7 @@ pltcl_func_handler(PG_FUNCTION_ARGS)
 	 * Check for errors reported by Tcl.
 	 ************************************************************/
 	if (tcl_rc != TCL_OK)
-		throw_tcl_error(interp);
+		throw_tcl_error(interp, prodesc->user_proname);
 
 	/************************************************************
 	 * Disconnect from SPI manager and then create the return
@@ -595,7 +814,7 @@ pltcl_func_handler(PG_FUNCTION_ARGS)
  * pltcl_trigger_handler()	- Handler for trigger calls
  **********************************************************************/
 static HeapTuple
-pltcl_trigger_handler(PG_FUNCTION_ARGS)
+pltcl_trigger_handler(PG_FUNCTION_ARGS, bool pltrusted)
 {
 	pltcl_proc_desc *prodesc;
 	Tcl_Interp *volatile interp;
@@ -621,14 +840,12 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
 
 	/* Find or compile the function */
 	prodesc = compile_pltcl_function(fcinfo->flinfo->fn_oid,
-									 RelationGetRelid(trigdata->tg_relation));
+									 RelationGetRelid(trigdata->tg_relation),
+									 pltrusted);
 
 	pltcl_current_prodesc = prodesc;
 
-	if (prodesc->lanpltrusted)
-		interp = pltcl_safe_interp;
-	else
-		interp = pltcl_norm_interp;
+	interp = prodesc->interp_desc->interp;
 
 	tupdesc = trigdata->tg_relation->rd_att;
 
@@ -642,7 +859,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
 	PG_TRY();
 	{
 		/* The procedure name */
-		Tcl_DStringAppendElement(&tcl_cmd, prodesc->proname);
+		Tcl_DStringAppendElement(&tcl_cmd, prodesc->internal_proname);
 
 		/* The trigger name for argument TG_name */
 		Tcl_DStringAppendElement(&tcl_cmd, trigdata->tg_trigger->tgname);
@@ -780,7 +997,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
 	 * Check for errors reported by Tcl.
 	 ************************************************************/
 	if (tcl_rc != TCL_OK)
-		throw_tcl_error(interp);
+		throw_tcl_error(interp, prodesc->user_proname);
 
 	/************************************************************
 	 * The return value from the procedure might be one of
@@ -912,7 +1129,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
  * throw_tcl_error	- ereport an error returned from the Tcl interpreter
  **********************************************************************/
 static void
-throw_tcl_error(Tcl_Interp *interp)
+throw_tcl_error(Tcl_Interp *interp, const char *proname)
 {
 	/*
 	 * Caution is needed here because Tcl_GetVar could overwrite the
@@ -932,7 +1149,8 @@ throw_tcl_error(Tcl_Interp *interp)
 										   TCL_GLOBAL_ONLY));
 	ereport(ERROR,
 			(errmsg("%s", emsg),
-			 errcontext("%s", econtext)));
+			 errcontext("%s\nin PL/Tcl function \"%s\"",
+						econtext, proname)));
 	UTF_END;
 }
 
@@ -944,18 +1162,14 @@ throw_tcl_error(Tcl_Interp *interp)
  * (InvalidOid) when compiling a plain function.
  **********************************************************************/
 static pltcl_proc_desc *
-compile_pltcl_function(Oid fn_oid, Oid tgreloid)
+compile_pltcl_function(Oid fn_oid, Oid tgreloid, bool pltrusted)
 {
-	bool		is_trigger = OidIsValid(tgreloid);
 	HeapTuple	procTup;
 	Form_pg_proc procStruct;
-	char		internal_proname[128];
-	Tcl_HashEntry *hashent;
-	pltcl_proc_desc *prodesc = NULL;
-	Tcl_Interp *interp;
-	int			i;
-	int			hashnew;
-	int			tcl_rc;
+	pltcl_proc_key proc_key;
+	pltcl_proc_ptr *proc_ptr;
+	bool		found;
+	pltcl_proc_desc *prodesc;
 
 	/* We'll need the pg_proc tuple in any case... */
 	procTup = SearchSysCache(PROCOID,
@@ -965,39 +1179,35 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 		elog(ERROR, "cache lookup failed for function %u", fn_oid);
 	procStruct = (Form_pg_proc) GETSTRUCT(procTup);
 
-	/************************************************************
-	 * Build our internal proc name from the functions Oid
-	 ************************************************************/
-	if (!is_trigger)
-		snprintf(internal_proname, sizeof(internal_proname),
-				 "__PLTcl_proc_%u", fn_oid);
-	else
-		snprintf(internal_proname, sizeof(internal_proname),
-				 "__PLTcl_proc_%u_trigger_%u", fn_oid, tgreloid);
+	/* Try to find function in pltcl_proc_htab */
+	proc_key.proc_id = fn_oid;
+	proc_key.trig_id = tgreloid;
+	proc_key.user_id = pltrusted ? GetUserId() : InvalidOid;
 
-	/************************************************************
-	 * Lookup the internal proc name in the hashtable
-	 ************************************************************/
-	hashent = Tcl_FindHashEntry(pltcl_proc_hash, internal_proname);
+	proc_ptr = hash_search(pltcl_proc_htab, &proc_key,
+						   HASH_ENTER,
+						   &found);
+	if (!found)
+		proc_ptr->proc_ptr = NULL;
+
+	prodesc = proc_ptr->proc_ptr;
 
 	/************************************************************
 	 * If it's present, must check whether it's still up to date.
 	 * This is needed because CREATE OR REPLACE FUNCTION can modify the
 	 * function's pg_proc entry without changing its OID.
 	 ************************************************************/
-	if (hashent != NULL)
+	if (prodesc != NULL)
 	{
 		bool		uptodate;
 
-		prodesc = (pltcl_proc_desc *) Tcl_GetHashValue(hashent);
-
 		uptodate = (prodesc->fn_xmin == HeapTupleHeaderGetXmin(procTup->t_data) &&
-				ItemPointerEquals(&prodesc->fn_tid, &procTup->t_self));
+					ItemPointerEquals(&prodesc->fn_tid, &procTup->t_self));
 
 		if (!uptodate)
 		{
-			Tcl_DeleteHashEntry(hashent);
-			hashent = NULL;
+			proc_ptr->proc_ptr = NULL;
+			prodesc = NULL;
 		}
 	}
 
@@ -1009,11 +1219,11 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 	 *
 	 * Then we load the procedure into the Tcl interpreter.
 	 ************************************************************/
-	if (hashent == NULL)
+	if (prodesc == NULL)
 	{
-		HeapTuple	langTup;
+		bool		is_trigger = OidIsValid(tgreloid);
+		char		internal_proname[128];
 		HeapTuple	typeTup;
-		Form_pg_language langStruct;
 		Form_pg_type typeStruct;
 		Tcl_DString proc_internal_def;
 		Tcl_DString proc_internal_body;
@@ -1022,6 +1232,19 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 		bool		isnull;
 		char	   *proc_source;
 		char		buf[32];
+		Tcl_Interp *interp;
+		int			i;
+		int			tcl_rc;
+
+		/************************************************************
+		 * Build our internal proc name from the functions Oid + trigger Oid
+		 ************************************************************/
+		if (!is_trigger)
+			snprintf(internal_proname, sizeof(internal_proname),
+					 "__PLTcl_proc_%u", fn_oid);
+		else
+			snprintf(internal_proname, sizeof(internal_proname),
+					 "__PLTcl_proc_%u_trigger_%u", fn_oid, tgreloid);
 
 		/************************************************************
 		 * Allocate a new procedure description block
@@ -1032,35 +1255,26 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of memory")));
 		MemSet(prodesc, 0, sizeof(pltcl_proc_desc));
-		prodesc->proname = strdup(internal_proname);
+		prodesc->user_proname = strdup(NameStr(procStruct->proname));
+		prodesc->internal_proname = strdup(internal_proname);
+		if (prodesc->user_proname == NULL || prodesc->internal_proname == NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_OUT_OF_MEMORY),
+					 errmsg("out of memory")));
 		prodesc->fn_xmin = HeapTupleHeaderGetXmin(procTup->t_data);
 		prodesc->fn_tid = procTup->t_self;
 
 		/* Remember if function is STABLE/IMMUTABLE */
 		prodesc->fn_readonly =
 			(procStruct->provolatile != PROVOLATILE_VOLATILE);
+		/* And whether it is trusted */
+		prodesc->lanpltrusted = pltrusted;
 
 		/************************************************************
-		 * Lookup the pg_language tuple by Oid
+		 * Identify the interpreter to use for the function
 		 ************************************************************/
-		langTup = SearchSysCache(LANGOID,
-								 ObjectIdGetDatum(procStruct->prolang),
-								 0, 0, 0);
-		if (!HeapTupleIsValid(langTup))
-		{
-			free(prodesc->proname);
-			free(prodesc);
-			elog(ERROR, "cache lookup failed for language %u",
-				 procStruct->prolang);
-		}
-		langStruct = (Form_pg_language) GETSTRUCT(langTup);
-		prodesc->lanpltrusted = langStruct->lanpltrusted;
-		ReleaseSysCache(langTup);
-
-		if (prodesc->lanpltrusted)
-			interp = pltcl_safe_interp;
-		else
-			interp = pltcl_norm_interp;
+		prodesc->interp_desc = pltcl_fetch_interp(prodesc->lanpltrusted);
+		interp = prodesc->interp_desc->interp;
 
 		/************************************************************
 		 * Get the required information for input conversion of the
@@ -1073,7 +1287,8 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 									 0, 0, 0);
 			if (!HeapTupleIsValid(typeTup))
 			{
-				free(prodesc->proname);
+				free(prodesc->user_proname);
+				free(prodesc->internal_proname);
 				free(prodesc);
 				elog(ERROR, "cache lookup failed for type %u",
 					 procStruct->prorettype);
@@ -1081,13 +1296,14 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 			typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 			/* Disallow pseudotype result, except VOID */
-			if (typeStruct->typtype == 'p')
+			if (typeStruct->typtype == TYPTYPE_PSEUDO)
 			{
 				if (procStruct->prorettype == VOIDOID)
 					 /* okay */ ;
 				else if (procStruct->prorettype == TRIGGEROID)
 				{
-					free(prodesc->proname);
+					free(prodesc->user_proname);
+					free(prodesc->internal_proname);
 					free(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -1095,7 +1311,8 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 				}
 				else
 				{
-					free(prodesc->proname);
+					free(prodesc->user_proname);
+					free(prodesc->internal_proname);
 					free(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -1104,9 +1321,10 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 				}
 			}
 
-			if (typeStruct->typtype == 'c')
+			if (typeStruct->typtype == TYPTYPE_COMPOSITE)
 			{
-				free(prodesc->proname);
+				free(prodesc->user_proname);
+				free(prodesc->internal_proname);
 				free(prodesc);
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -1134,7 +1352,8 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 										 0, 0, 0);
 				if (!HeapTupleIsValid(typeTup))
 				{
-					free(prodesc->proname);
+					free(prodesc->user_proname);
+					free(prodesc->internal_proname);
 					free(prodesc);
 					elog(ERROR, "cache lookup failed for type %u",
 						 procStruct->proargtypes.values[i]);
@@ -1142,9 +1361,10 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 				typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 				/* Disallow pseudotype argument */
-				if (typeStruct->typtype == 'p')
+				if (typeStruct->typtype == TYPTYPE_PSEUDO)
 				{
-					free(prodesc->proname);
+					free(prodesc->user_proname);
+					free(prodesc->internal_proname);
 					free(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -1152,7 +1372,7 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 						format_type_be(procStruct->proargtypes.values[i]))));
 				}
 
-				if (typeStruct->typtype == 'c')
+				if (typeStruct->typtype == TYPTYPE_COMPOSITE)
 				{
 					prodesc->arg_is_rowtype[i] = true;
 					snprintf(buf, sizeof(buf), "__PLTcl_Tup_%d", i + 1);
@@ -1252,7 +1472,8 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 		Tcl_DStringFree(&proc_internal_def);
 		if (tcl_rc != TCL_OK)
 		{
-			free(prodesc->proname);
+			free(prodesc->user_proname);
+			free(prodesc->internal_proname);
 			free(prodesc);
 			UTF_BEGIN;
 			elog(ERROR, "could not create internal procedure \"%s\": %s",
@@ -1261,11 +1482,12 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 		}
 
 		/************************************************************
-		 * Add the proc description block to the hashtable
+		 * Add the proc description block to the hashtable.  Note we do not
+		 * attempt to free any previously existing prodesc block.  This is
+		 * annoying, but necessary since there could be active calls using
+		 * the old prodesc.
 		 ************************************************************/
-		hashent = Tcl_CreateHashEntry(pltcl_proc_hash,
-									  prodesc->proname, &hashnew);
-		Tcl_SetHashValue(hashent, (ClientData) prodesc);
+		proc_ptr->proc_ptr = prodesc;
 	}
 
 	ReleaseSysCache(procTup);
@@ -1859,23 +2081,24 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,
 	PG_TRY();
 	{
 		/************************************************************
-		 * Lookup the argument types by name in the system cache
-		 * and remember the required information for input conversion
+		 * Resolve argument type names and then look them up by oid
+		 * in the system cache, and remember the required information
+		 * for input conversion.
 		 ************************************************************/
 		for (i = 0; i < nargs; i++)
 		{
-			List	   *names;
-			HeapTuple	typeTup;
+			Oid			typId,
+						typInput,
+						typIOParam;
+			int32		typmod;
 
-			/* Parse possibly-qualified type name and look it up in pg_type */
-			names = stringToQualifiedNameList(args[i],
-											  "pltcl_SPI_prepare");
-			typeTup = typenameType(NULL, makeTypeNameFromNameList(names));
-			qdesc->argtypes[i] = HeapTupleGetOid(typeTup);
-			perm_fmgr_info(((Form_pg_type) GETSTRUCT(typeTup))->typinput,
-						   &(qdesc->arginfuncs[i]));
-			qdesc->argtypioparams[i] = getTypeIOParam(typeTup);
-			ReleaseSysCache(typeTup);
+			parseTypeString(args[i], &typId, &typmod);
+
+			getTypeInputInfo(typId, &typInput, &typIOParam);
+
+			qdesc->argtypes[i] = typId;
+			perm_fmgr_info(typInput, &(qdesc->arginfuncs[i]));
+			qdesc->argtypioparams[i] = typIOParam;
 		}
 
 		/************************************************************
@@ -1919,10 +2142,7 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp,
 	 * Insert a hashtable entry for the plan and return
 	 * the key to the caller
 	 ************************************************************/
-	if (interp == pltcl_norm_interp)
-		query_hash = pltcl_norm_query_hash;
-	else
-		query_hash = pltcl_safe_query_hash;
+	query_hash = &pltcl_current_prodesc->interp_desc->query_hash;
 
 	hashent = Tcl_CreateHashEntry(query_hash, qdesc->qname, &hashnew);
 	Tcl_SetHashValue(hashent, (ClientData) qdesc);
@@ -2013,10 +2233,7 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
 		return TCL_ERROR;
 	}
 
-	if (interp == pltcl_norm_interp)
-		query_hash = pltcl_norm_query_hash;
-	else
-		query_hash = pltcl_safe_query_hash;
+	query_hash = &pltcl_current_prodesc->interp_desc->query_hash;
 
 	hashent = Tcl_FindHashEntry(query_hash, argv[i]);
 	if (hashent == NULL)
diff --git a/src/pl/tcl/sql/pltcl_setup.sql b/src/pl/tcl/sql/pltcl_setup.sql
index 55ac7e20d55e..4a581ed8b123 100644
--- a/src/pl/tcl/sql/pltcl_setup.sql
+++ b/src/pl/tcl/sql/pltcl_setup.sql
@@ -542,3 +542,15 @@ CREATE OPERATOR CLASS tcl_int4_ops
 	OPERATOR 4  @>=,
 	OPERATOR 5  @>,
 	FUNCTION 1  tcl_int4cmp(int4,int4) ;
+
+--
+-- Test usage of Tcl's "clock" command.  In recent Tcl versions this
+-- command fails without working "unknown" support, so it's a good canary
+-- for initialization problems.
+--
+create function tcl_date_week(int4,int4,int4) returns text as $$
+    return [clock format [clock scan "$2/$3/$1"] -format "%U"]
+$$ language pltcl immutable;
+
+select tcl_date_week(2010,1,24);
+select tcl_date_week(2001,10,24);
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 26676b1703f4..234176191741 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -10,7 +10,7 @@
  *	Win32 (NT4 and newer).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.47 2007/01/19 16:42:24 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.51.2.5 2009/09/13 18:32:27 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -307,7 +307,7 @@ pgsymlink(const char *oldpath, const char *newpath)
  * must call pgfnames_cleanup later to free the memory allocated by this
  * function.
  */
-char	  **
+char **
 pgfnames(const char *path)
 {
 	DIR		   *dir;
@@ -428,11 +428,11 @@ rmtree(const char *path, bool rmtopdir)
 		 * delete it anyway.
 		 *
 		 * This is not an academic possibility. One scenario where this
-		 * happens is when bgwriter has a pending unlink request for a file in
-		 * a database that's being dropped. In dropdb(), we call
+		 * happens is when bgwriter has a pending unlink request for a file
+		 * in a database that's being dropped. In dropdb(), we call
 		 * ForgetDatabaseFsyncRequests() to flush out any such pending unlink
-		 * requests, but because that's asynchronous, it's not guaranteed that
-		 * the bgwriter receives the message in time.
+		 * requests, but because that's asynchronous, it's not guaranteed
+		 * that the bgwriter receives the message in time.
 		 */
 		if (lstat(pathbuf, &statbuf) != 0)
 		{
@@ -509,7 +509,7 @@ rmtree(const char *path, bool rmtopdir)
  * to update this field.
  */
 int
-pgwin32_safestat(const char *path, struct stat * buf)
+pgwin32_safestat(const char *path, struct stat *buf)
 {
 	int			r;
 	WIN32_FILE_ATTRIBUTE_DATA attr;
@@ -535,8 +535,8 @@ pgwin32_safestat(const char *path, struct stat * buf)
 	}
 
 	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
+	 * XXX no support for large files here, but we don't do that in
+	 * general on Win32 yet.
 	 */
 	buf->st_size = attr.nFileSizeLow;
 
diff --git a/src/port/exec.c b/src/port/exec.c
index f6d9b83d499c..156e4217ac5c 100644
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -399,7 +399,7 @@ find_other_exec(const char *argv0, const char *target,
 	 */
 	if (versionstr)
 	{
-		snprintf(cmd, sizeof(cmd), "\"%s\" -V 2>%s", retpath, DEVNULL);
+		snprintf(cmd, sizeof(cmd), "\"%s\" -V", retpath);
 
 		if (!pipe_read_line(cmd, line, sizeof(line)))
 			return -1;
@@ -430,12 +430,21 @@ pipe_read_line(char *cmd, char *line, int maxsize)
 	fflush(stdout);
 	fflush(stderr);
 
+	errno = 0;
 	if ((pgver = popen(cmd, "r")) == NULL)
+	{
+		perror("popen failure");
 		return NULL;
+	}
 
+	errno = 0;
 	if (fgets(line, maxsize, pgver) == NULL)
 	{
-		perror("fgets failure");
+		if (feof(pgver))
+			fprintf(stderr, "no data was returned by command \"%s\"\n", cmd);
+		else
+			perror("fgets failure");
+		pclose(pgver);			/* no error checking */
 		return NULL;
 	}
 
@@ -672,11 +681,10 @@ set_pglocale_pgservice(const char *argv0, const char *app)
 #ifdef WIN32
 
 /*
- * AddUserToDacl(HANDLE hProcess)
+ * AddUserToTokenDacl(HANDLE hToken)
  *
- * This function adds the current user account to the default DACL
- * which gets attached to the restricted token used when we create
- * a restricted process.
+ * This function adds the current user account to the restricted
+ * token used when we create a restricted process.
  *
  * This is required because of some security changes in Windows
  * that appeared in patches to XP/2K3 and in Vista/2008.
@@ -689,13 +697,13 @@ set_pglocale_pgservice(const char *argv0, const char *app)
  * and CreateProcess() calls when running as Administrator.
  *
  * This function fixes this problem by modifying the DACL of the
- * specified process and explicitly re-adding the current user account.
- * This is still secure because the Administrator account inherits it's
- * privileges from the Administrators group - it doesn't have any of
- * it's own.
+ * token the process will use, and explicitly re-adding the current
+ * user account.  This is still secure because the Administrator account
+ * inherits its privileges from the Administrators group - it doesn't
+ * have any of its own.
  */
 BOOL
-AddUserToDacl(HANDLE hProcess)
+AddUserToTokenDacl(HANDLE hToken)
 {
 	int			i;
 	ACL_SIZE_INFORMATION asi;
@@ -703,7 +711,7 @@ AddUserToDacl(HANDLE hProcess)
 	DWORD		dwNewAclSize;
 	DWORD		dwSize = 0;
 	DWORD		dwTokenInfoLength = 0;
-	HANDLE		hToken = NULL;
+	DWORD		dwResult = 0;
 	PACL		pacl = NULL;
 	PSID		psidUser = NULL;
 	TOKEN_DEFAULT_DACL tddNew;
@@ -711,13 +719,6 @@ AddUserToDacl(HANDLE hProcess)
 	TOKEN_INFORMATION_CLASS tic = TokenDefaultDacl;
 	BOOL		ret = FALSE;
 
-	/* Get the token for the process */
-	if (!OpenProcessToken(hProcess, TOKEN_QUERY | TOKEN_ADJUST_DEFAULT, &hToken))
-	{
-		log_error("could not open process token: %lu", GetLastError());
-		goto cleanup;
-	}
-
 	/* Figure out the buffer size for the DACL info */
 	if (!GetTokenInformation(hToken, tic, (LPVOID) NULL, dwTokenInfoLength, &dwSize))
 	{
@@ -744,7 +745,7 @@ AddUserToDacl(HANDLE hProcess)
 	}
 
 	/* Get the ACL info */
-	if (!GetAclInformation(ptdd->DefaultDacl, (LPVOID) &asi,
+	if (!GetAclInformation(ptdd->DefaultDacl, (LPVOID) & asi,
 						   (DWORD) sizeof(ACL_SIZE_INFORMATION),
 						   AclSizeInformation))
 	{
@@ -760,7 +761,7 @@ AddUserToDacl(HANDLE hProcess)
 	}
 
 	/* Figure out the size of the new ACL */
-	dwNewAclSize = asi.AclBytesInUse + sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(psidUser) -sizeof(DWORD);
+	dwNewAclSize = asi.AclBytesInUse + sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(psidUser) - sizeof(DWORD);
 
 	/* Allocate the ACL buffer & initialize it */
 	pacl = (PACL) LocalAlloc(LPTR, dwNewAclSize);
@@ -793,7 +794,7 @@ AddUserToDacl(HANDLE hProcess)
 	}
 
 	/* Add the new ACE for the current user */
-	if (!AddAccessAllowedAce(pacl, ACL_REVISION, GENERIC_ALL, psidUser))
+	if (!AddAccessAllowedAceEx(pacl, ACL_REVISION, OBJECT_INHERIT_ACE, GENERIC_ALL, psidUser))
 	{
 		log_error("could not add access allowed ACE: %lu", GetLastError());
 		goto cleanup;
@@ -820,9 +821,6 @@ AddUserToDacl(HANDLE hProcess)
 	if (ptdd)
 		LocalFree((HLOCAL) ptdd);
 
-	if (hToken)
-		CloseHandle(hToken);
-
 	return ret;
 }
 
diff --git a/src/port/path.c b/src/port/path.c
index 166e765d1c58..34b1eac8ca4c 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -194,6 +194,8 @@ make_native_path(char *filename)
 /*
  * join_path_components - join two path components, inserting a slash
  *
+ * We omit the slash if either given component is empty.
+ *
  * ret_path is the output area (must be of size MAXPGPATH)
  *
  * ret_path can be the same as head, but not the same as tail.
@@ -206,37 +208,22 @@ join_path_components(char *ret_path,
 		strlcpy(ret_path, head, MAXPGPATH);
 
 	/*
-	 * Remove any leading "." and ".." in the tail component, adjusting head
-	 * as needed.
+	 * Remove any leading "." in the tail component.
+	 *
+	 * Note: we used to try to remove ".." as well, but that's tricky to get
+	 * right; now we just leave it to be done by canonicalize_path() later.
 	 */
-	for (;;)
-	{
-		if (tail[0] == '.' && IS_DIR_SEP(tail[1]))
-		{
-			tail += 2;
-		}
-		else if (tail[0] == '.' && tail[1] == '\0')
-		{
-			tail += 1;
-			break;
-		}
-		else if (tail[0] == '.' && tail[1] == '.' && IS_DIR_SEP(tail[2]))
-		{
-			trim_directory(ret_path);
-			tail += 3;
-		}
-		else if (tail[0] == '.' && tail[1] == '.' && tail[2] == '\0')
-		{
-			trim_directory(ret_path);
-			tail += 2;
-			break;
-		}
-		else
-			break;
-	}
+	while (tail[0] == '.' && IS_DIR_SEP(tail[1]))
+		tail += 2;
+
 	if (*tail)
+	{
+		/* only separate with slash if head wasn't empty */
 		snprintf(ret_path + strlen(ret_path), MAXPGPATH - strlen(ret_path),
-				 "/%s", tail);
+				 "%s%s",
+				 (*(skip_drive(head)) != '\0') ? "/" : "",
+				 tail);
+	}
 }
 
 
@@ -694,6 +681,15 @@ get_home_path(char *ret_path)
  *
  * Modify the given string in-place to name the parent directory of the
  * named file.
+ *
+ * If the input is just a file name with no directory part, the result is
+ * an empty string, not ".".  This is appropriate when the next step is
+ * join_path_components(), but might need special handling otherwise.
+ *
+ * Caution: this will not produce desirable results if the string ends
+ * with "..".  For most callers this is not a problem since the string
+ * is already known to name a regular file.  If in doubt, apply
+ * canonicalize_path() first.
  */
 void
 get_parent_directory(char *path)
diff --git a/src/port/rand.c b/src/port/rand.c
index 8559ef8c175f..5982ef9cb72e 100644
--- a/src/port/rand.c
+++ b/src/port/rand.c
@@ -74,7 +74,7 @@ srand48(long seed)
 {
 	_rand48_seed[0] = RAND48_SEED_0;
 	_rand48_seed[1] = (unsigned short) seed;
-	_rand48_seed[2] = (unsigned short) (seed > 16);
+	_rand48_seed[2] = (unsigned short) (seed >> 16);
 	_rand48_mult[0] = RAND48_MULT_0;
 	_rand48_mult[1] = RAND48_MULT_1;
 	_rand48_mult[2] = RAND48_MULT_2;
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index b06daa2e9950..f0eb77f483d3 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -56,15 +56,42 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 	if (!destination)
 		return NULL;
 
+#ifdef WIN32
+
+	/*
+	 * A Windows console has an "input code page" and an "output code page";
+	 * these usually match each other, but they rarely match the "Windows ANSI
+	 * code page" defined at system boot and expected of "char *" arguments to
+	 * Windows API functions.  The Microsoft CRT write() implementation
+	 * automatically converts text between these code pages when writing to a
+	 * console.  To identify such file descriptors, it calls GetConsoleMode()
+	 * on the underlying HANDLE, which in turn requires GENERIC_READ access on
+	 * the HANDLE.  Opening termout in mode "w+" allows that detection to
+	 * succeed.  Otherwise, write() would not recognize the descriptor as a
+	 * console, and non-ASCII characters would display incorrectly.
+	 *
+	 * XXX fgets() still receives text in the console's input code page.  This
+	 * makes non-ASCII credentials unportable.
+	 */
+	termin = fopen("CONIN$", "r");
+	termout = fopen("CONOUT$", "w+");
+#else
+
 	/*
 	 * Do not try to collapse these into one "w+" mode file. Doesn't work on
 	 * some platforms (eg, HPUX 10.20).
 	 */
-	termin = fopen(DEVTTY, "r");
-	termout = fopen(DEVTTY, "w");
+	termin = fopen("/dev/tty", "r");
+	termout = fopen("/dev/tty", "w");
+#endif
 	if (!termin || !termout
 #ifdef WIN32
-	/* See DEVTTY comment for msys */
+	/*
+	 * Direct console I/O does not work from the MSYS 1.0.10 console.  Writes
+	 * reach nowhere user-visible; reads block indefinitely.  XXX This affects
+	 * most Windows terminal environments, including rxvt, mintty, Cygwin
+	 * xterm, Cygwin sshd, and PowerShell ISE.  Switch to a more-generic test.
+	 */
 		|| (getenv("OSTYPE") && strcmp(getenv("OSTYPE"), "msys") == 0)
 #endif
 		)
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 208482c726ec..4d277fff9430 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
 #include "pg_config.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    8,3,0,0
- PRODUCTVERSION 8,3,0,0
+ FILEVERSION    8,3,23,0
+ PRODUCTVERSION 8,3,23,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32
diff --git a/src/template/darwin b/src/template/darwin
old mode 100755
new mode 100644
index 6b52e0d73695..b017530a8715
--- a/src/template/darwin
+++ b/src/template/darwin
@@ -1,4 +1,8 @@
-# $PostgreSQL: pgsql/src/template/darwin,v 1.11.16.1 2010/08/02 04:51:25 tgl Exp $
+# $PostgreSQL: pgsql/src/template/darwin,v 1.11 2007/09/26 00:32:46 tgl Exp $
+
+# Apple's cpp-precomp seems a tad broken, so don't use it
+# (Note: on OS X before 10.2, you might need -traditional-cpp instead)
+CC="$CC -no-cpp-precomp"
 
 # Select appropriate semaphore support.  Darwin 6.0 (Mac OS X 10.2) and up
 # support System V semaphores; before that we have to use POSIX semaphores,
diff --git a/src/template/linux b/src/template/linux
old mode 100755
new mode 100644
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 559c39c9e1dc..cc41176f93f9 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -251,7 +251,7 @@ main(int argc, char **argv)
 
 		printf("exporting large object to file \"%s\" ...\n", out_filename);
 /*		exportFile(conn, lobjOid, out_filename); */
-		if (!lo_export(conn, lobjOid, out_filename))
+		if (lo_export(conn, lobjOid, out_filename) < 0)
 			fprintf(stderr, "%s\n", PQerrorMessage(conn));
 	}
 
diff --git a/src/test/regress/.gitignore b/src/test/regress/.gitignore
index 32d5d846b337..7a600f759b46 100644
--- a/src/test/regress/.gitignore
+++ b/src/test/regress/.gitignore
@@ -1,5 +1,3 @@
-pg_regress
-results
 yml
 current_good_schedule
 libregress.so
@@ -12,4 +10,11 @@ regression.out
 config.ini
 pgbouncer.log
 pgbouncer.pid
-tmp_check
+
+# Local binaries
+/pg_regress
+
+# Generated subdirectories
+/tmp_check/
+/results/
+/log/
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 754c3c48955a..d891be8e8bd3 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -3,10 +3,10 @@
 # GNUmakefile--
 #    Makefile for src/test/regress (the regression tests)
 #
-# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.68 2007/06/12 11:07:32 mha Exp $
+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.71 2008/01/01 19:46:00 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,10 +19,15 @@ contribdir = $(top_builddir)/contrib
 # port number for temp-installation test postmaster
 TEMP_PORT = 5$(DEF_PGPORT)
 
+# file with extra config for temp build
+TEMP_CONF =
+ifdef TEMP_CONFIG
+TEMP_CONF += --temp-config=$(TEMP_CONFIG)
+endif
+
 # Greenplum regression tests use $PGPORT
 PGPORT?=15432
 
-
 # where to find psql for testing an existing installation
 PSQLDIR = $(bindir)
 
@@ -112,7 +117,7 @@ bb_output_files := $(foreach file, $(bb_ofile_list), bugbuster/expected/$(file).
 
 
 ifneq ($(PORTNAME),win32)
-abs_srcdir := $(shell cd $(srcdir) && pwd)
+abs_srcdir := $(shell cd "$(srcdir)" && pwd)
 abs_builddir := $(shell pwd)
 else
 abs_srcdir := $(shell cd $(srcdir) && pwd -W)
@@ -158,8 +163,6 @@ includecheck:
 ## Run tests
 ##
 
-## To load a procedural language use "--load-language=..."
-
 pg_regress_call = ./pg_regress --inputdir=$(srcdir) --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE) --init-file=$(srcdir)/init_file
 pg_regress_call_bb = ./pg_regress --inputdir=$(srcdir)/bugbuster --outputdir=$(srcdir)/bugbuster --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE) --init-file=$(srcdir)/init_file
 pg_regress_call_opt = ./pg_regress --inputdir=$(srcdir)/optfunctional --outputdir=$(srcdir)/optfunctional --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE) --init-file=$(srcdir)/optfunctional/init_file
diff --git a/src/test/regress/checkinc.py b/src/test/regress/checkinc.py
index d7d0b4e1bd16..942b91ef133b 100755
--- a/src/test/regress/checkinc.py
+++ b/src/test/regress/checkinc.py
@@ -79,7 +79,10 @@
     'ws2tcpip.h':            [],
     'atomic.h':              [],
     'mbarrier.h':            [],
-    'machine/sys/inline.h':  []
+    'machine/sys/inline.h':  [],
+    # snowball/libstemmer/header.h includes "api.h", without specifying
+    # a path. Don't be alarmed by that.
+    'api.h': []
 }
 
 
diff --git a/src/test/regress/data/tsearch.data b/src/test/regress/data/tsearch.data
new file mode 100644
index 000000000000..29a26f2428cc
--- /dev/null
+++ b/src/test/regress/data/tsearch.data
@@ -0,0 +1,508 @@
+\n	
+\n	
+\n	
+\n	
+\n	
+\n	
+\n	
+\n	
+\n	i8 hy qo xa jl wr le l5 ja jx zf ro vw wd wa cc mm wh fn yd td l8 ec rv th oc ix ir sm y4 gh pr qg ue cx ww zv c9 zv tx eo f5 gd km b9 wb rm ym yl xj u7 xz uk iq tm ux di if uc hc ge
+\n	gr ty ph jh po wa iw ag wq r3 yd ow rb ip et ej yl a9 dk pu y6 su ov hf xe qe sd qr zt kp ml ea tp pg dq e3 s3 hh gn hz j7 hb qs qd v0 v4 w0 nu ee wk ez un rd sz wx e7 pn yf gh uh ki kx rb qv f1 bh sr yj ry r2
+\n	q1 q8 wp w9 vs ww rq de qt wo qp sa rv mc sn u8 yl
+\n	hv ra sa fr qs ps 4w z5 ls wt ad wy q6 zg bd vt wa e4 ft w7 ld es yg et ic pm sw ja qv ov jm ma b3 wu wi qy ug hs wh ex rt tj en ur e2 ut gv as ui dy qy du qo gv cy lx kw xm fl x2 hd ny nu hh dt wg wh rs wb wz yy yu tj ha ak rw sw io h1 ux ku v6 wc qa rv xb s8 qd f2 zo k2 ew w4 yh yu yi
+\n	rs tt gp qh wt q6 lg zh vr b8 uy uu lh px jm ww qe xu fp fd rs qu ki dr fn gq gw jv oq zt 2r lc ke wg l9 x3 x5 7g vs ar e7 u2 s8 t0 av dj kl nm u2 zp gf yw ee oc tw a1
+\n	qs uz wr gq q9 rl e0 pe dj a9 hp qw aw er kq pp uu pl zo wp fr r6 ej pv u5 hh av lw ko qc pn qj ez n8 wn eu tq
+\n	po h9 rd qs hr la u0 um me wp 0p rl mv rc ab r0 fe fj fk qn jh iy cn lb bl ln b5 ll yg yh qt qp uz od dq as gn cr qa wa cu fy zy vo xk eq vg mr ns yy t7 yi op th yo ov pv em tc hg az io s5 ct os wu lq dr mp hk si gx
+\n	hm k5 pw a5 qh nb q3 ql wr wt z7 oz wu wh kv q8 c3 mt mg hb a3 rz pz uo y1 rb av us ek dz q0 d3 qw j2 ls wy qq jf ng eo gl ed ix em he qt du hp jc f2 m9 qp hb l4 gy zf l6 qr dn cp x1 oh qk kk s3 hy wg zs ot wj sl oz ie e9 ay it u5 ai hm gh py hz qk ki h8 ja zu qb ei vc qj hg ev h6 yh u0 tb id
+\n	qg d1 bt c5 r3 iv g6 d7 rc ml gk uh yn y0 zo uh qd wh ib uo u4 om qg ql yz
+\n	hb a3 q5 pl yj lo qy ki sy fo rj kk zq dl wn 7a zi wn wm yr w3 tv r1
+\n	ft k6 iz qn qj q2 q3 bl zd av ro wo lk tg ea ew ed y1 ia yl ic g6 po aw sc zm qn gl wq qw zr jp wt j5 gs vt qt yc rr op yw tl ye hr i8 tb uu j0 xd lz vu nl qd fu wg pf wj bt ee wh t2 tp sz um oo tg ha u4 f5 sw pq pr ju qk mh ki zb vj ob cx df hj ef cj q6 u9 tv rv o4 sy ru fq ir
+\n	ps ko uk tz vv um t9 uk k2 ja o6 ob
+\n	qs nb gh ld q7 jc sp el w0 py qx i2 qe la rl qw tu ti dq ue iv oi wa qr ed t3 fg oa of rr fv qz xn wu wq te hx
+\n	yb ty pq az fi qg qn la bu ji lg wg q8 mi cv rl up lg om oq ym pv in aq gg js ha on ww qr bj vn pv he b5 mh qe cc mk qt rb eu qy rw tr qo ec op sn oh e2 ao iv e4 hy dt s6 qt p1 hb ih qs wg x1 bd l1 t1 ro r9 uv wb aw gu os t0 ah e0 s0 hj pe or qj zz ql fd ks qv bq qm bg ec ry oj u8 u0 yj ru r1 yx o7
+\n	z4 wr qz cg nq ir bb gb w7 e5 zc pj e9 px uo fp ts aq db q9 iy qe zv xu a9 l1 mb qw tc qu fi hw ur de e4 hk lj wo wf fi ep rl wh vh ek vp oi sv rh ay hj px aa er tv do ir
+\n	tr o9 gb tt pp qa qs a5 ps rf q1 kj by ub ru ox co o8 ny wp wa ws rd kk b1 zc rl rz uo ts ig fh db qm q0 bg rr fu ld lr wb en nd cw vr hy rn qr en em au p8 so oh ut hz gq wp ow be ky wj dw t1 pl er wc ot na r9 wl ou un um wx iq sc e8 sn re rr f7 hz h4 ce wz qx wx kp px tl tx ai wq hf ec 6u rz og yt ok yy yp
+\n	sa pp a7 qm qh of je qj lo ph wt h0 ji cg z8 2v xs zl mo ik hm on tu d8 av ot pn iv ez ja qn pq wy 7r mq qu p1 tu p6 ti ur pj uy ui qo i9 qa nj xm s1 ya fb 7j ro wn t6 wz yu iq yi go en pb aj f5 hf ug uh hk av pr wl wz im ja v9 u2 ks it br wv wn se ia o5 ox ei r2 ig aj sp
+\n	sa tn z8 ew uo eh g8 zt wy 27 ff uh te en pd eh hv 2e wh ty oi sw xx 2p qs mx wb q3 rl eq aa eu
+\n	d4 ef ta zq j2 em c0 vv wf kj dw uk ql y9 rn
+\n	sq nm kl w8 ur kz c1 pc y1 g4 oi jv wr zy ew by se ec yn ti gq gt rd l5 ej yp tk da qz qx ir wm on q2 to ew
+\n	rd gu z2 kj qk bl 6d wy nw xq iu 8t ri uc kq nx ql oa vi kd o6
+\n	ra gr he wy q0 ow ti ia pb ha qr lv ms qu pu qw qr ml qt ep sv i5 of fm oe nl xh x1 xz u4 ha ao fc ug pw nh n9 qv kh vx uq w1 u0 ei if
+\n	q1 d2 qz zd jd qb wj nt ah mj ea ed y1 et fj qe en b8 ty iv ht fv tn tm sg jb ky ai en us tl ud iu zj ql u1 ci ru iw tw
+\n	fr ub h9 pd ub jk vh z6 wu wh wp 5z yt w9 w0 uy om tl rc r6 ax d7 et y2 tw dz se vf ii m3 lf b4 jf vr qw qy uf es qp en tl to ye ue ph e3 uy i0 jl pz oe qo zp wp ft ka zf qd wd kr qf l9 mm wf qx ef t3 x8 ex rg ev s8 ys it da rw al hn tc f6 fv nd nc ad fj nr x0 bx yq ti rx ok tb hx o8 dp
+\n	o0 jq un xu q8 wo qq gg ta oj ec az dl bl wb
+\n	o9 ij pq gu gp nv qk gg la q4 nw bo z8 9a iw wu q8 eh wi nt jk ut ys c1 r5 up y1 yl py oy ht gd td db qn cz qw lp re c7 dh j5 ia bz dj qr qt wd wf qi rt sv ul uz tl ta yr e4 tm sg pc jv hc hv lc xg xm br vf r8 na wl ou td wc up rj s8 e8 ir ys ii qk p0 lt ho wb x8 bv lw w1 rz ew aa rv ry gx o8
+\n	tt hn gn un db fu uq qf d4 q3 pp ji lf wu bx q8 hx kb ny t5 bn hb ex yf ef yj g1 g2 to yk g3 ej sk hy dv qc gj qv sy bg wr na wy bx z0 rc rm ml ug te qp i5 ue oj s4 im oq qt gx sa gt l4 sv at v3 bq mv wd x3 80 x8 aq xk rg yp en gs us dq ak tz al tx o2 dg f9 kv or h4 jy k1 jo h8 kp lt os kh as tn eu ul tm su an tw sp
+\n	za yi pe sh pv y4 y5 hy th jg qy qt ke ti ue qk yy ie cq wl p0 lw mf er w5
+\n	k9 bt xu kc me is o5 z9 kb gv ur rc oe sk qn ve wi mm rn eu to ue uy qa xf by t1 td t7 aw up yf pr dk cg zr sc 3d at rw ec rl st zo rn do
+\n	o9 z5 wy vi ya ea ee fo gf va ov ww rr wr lb ro qq vr gj nw ru ym iv s4 hu tm wo wp zs br fs wg ej du y1 yt yu e7 eb em dd pq v7 cr um ae oz 0z kc tq rw zl rt wb y9 xv tm tq di eo te gc
+\n	tt un qs qn a7 qh je qj k0 o1 wr q6 wy ab q9 qm wr ea er eh pi hi sc hs m6 w1 bv lo zr tn yk ep op es ve xx sb ux hg sa gq qp wd n2 zh wf xf wj y3 wl e7 os u4 on ip kn ko qp s7 ly zn ba wu u4 kh f4 zo y9 q6 oh iw tq
+\n	qa a4 gu a7 cp z1 he ma q7 lu dp w7 ea rc ee d8 y4 tw ez im ae bv ii qe vb zt lc lv wm ro lk qr hp re tw yv es fp as zu oe qu qi bp wg cp p7 v4 ek rd wc ar rj tj e8 od e0 pm h2 h4 in qf wu wi 19 bj rl rc ee yj et tw ep
+\n	gv qd kj cd t3 c3 ih ws rg mc rx lh fd g8 gh cc vw b7 qe at j7 qo ws wg oy t6 t9 go eb e8 us u5 rq oe zj jy oz cj wb be ei pm og se w4 yu xw su yx if
+\n	o9 ub rd hw gs z3 ql nq ru wg jc 1t kv mr zm ah dd jk w8 ej aq ig y8 pp fj li wq jj cc qr no wy wu en bx yr qy oo es fy pd tk ix ph yr sf vx pn p2 jq fs ed oy yk os ie s9 u5 ak ud gd uf kb xc u1 xm eu xw 19 wn vh w1 to ee er aa rb rn ru an r1 ei
+\n	se kl 7h b6 xs ym tp an ta qb gn uo pt xi cl qp qy op vr ym ri ti tl i5 e1 e4 i9 ff i5 qp jx ht ql uo en pe ku h7 iw wn w4 ey ia si
+\n	ql xt wi k6 ew sf eg up eh oy sq ja g9 i3 qe cv l1 qq bv w2 la eu wg ec ef oh fs tb pc xd qs nl qu fn dy oi iu yf re fc hj hk xv zn zz w1 ew
+\n	po al hm qk jt cd ju nm li rs w9 ev ut ea 2f r4 d6 ey im pa nu wr m4 is bc xz w3 eu tb ha ft p4 ti to hr dy af i6 iz r4 jb x7 wj xg na rf gi at pn gd re wq qz ze bo wc vz sm zo my ye u7 oh dk w5 is yx tw fe dp
+\n	jl za gk cm wu vq jc zc iu mb oe fo fp ic sc 2l hy qr eb p5 pf dq pa fy lc td sz oo aw u1 rj fl tz nx aq xx oz xb 55 y0
+\n	uq wr lh jv ri i7 ss qo gy bt s3 u1 dy ox hg it
+\n	ps hr lf jx bn qq up eh ab yl pn jg ng bz gd qr yw i9 j8 zi 3v oz at hd cx oj u9 rt uz ro ov
+\n	sq ga ny se cj id rg r3 pk kv ee sh ek dk sz pp q0 mn az kp ei qi ry em ph p9 gw hc m0 cp ea mn yf t1 5y wx ol e6 ec u2 e7 uh uj uk av ql lw qx zr qv mw qg cq ww wb pw tu w2 mf ut gk af yo ie ob
+\n	hn um a6 q7 af du r4 up tp ej sk lo le m8 rp eu ei qi ky op of tp ur oj hu tb dy qu gt tf oz wc s7 e7 ua pw ax nb wx wy fj wn 18 wv es yq ok w4 uz yx yc
+\n	pa qg qh q4 fv qz kx q6 cp gb c6 pr eh id in qw we bk wn qq b6 qy qu es ic s1 og gn wp op qf ic ro os yp rj fj ag oc ay da fv wl qp f1 yx n7 ea w2 ly yj iq iw rm o5
+\n	o9 ps d3 lp wr qc md e5 rk w0 pm gx lf ku qt qp to tc pk fb tb qi lh nt yd vt ot ra tg gd zx wx vj rq cr hm ma jp vg u8 rt ei it
+\n	dx dv h9 rf qf uw a8 qh uv k3 ri is yr r3 eq uu tz yn y6 qc ps jf wq xe wx lc qr j4 ku xx nb 4z sr tr uq p6 uz of i6 s1 fs pj tc hu qu hz f1 hp lj s4 qx tg yp gs ob tz ds sw pm ug hm ip ql le vl wq tb xv eq w2 yg w4 st o6
+\n	qd q4 pa z6 qz ia 70 r3 mb iu es r5 gh t9 cj vz qw mb ko vt qr qt gh qo ty eb kq n1 xb ef rp ek gu rg s7 rj sn ai hg o1 uj pr jt fg v0 tq tx ww bj bm ct w1 zi rn ox iw ri
+\n	al rd w8 vp yd yk r0 pi po se sr qa l0 qk ir e9 hm kc rz aa w6
+\n	un pq qd a8 z2 qk z5 ws bi xy qx wg wp t4 mj gv qm rg c6 w7 w9 es y1 g2 ej yz gg qc qn wq qw m9 wx qe kr 27 fp fq m7 xp 3p qr rr tr ij il eh au s1 uc fx ut qu sj j8 j9 ya nr rz wg wh eg x8 sl t7 yu vf ay ds ap re dh qg qh qj hz qk zz qx k3 cy iq ox qv eu nx n6 6r lq n0 y0 uq tb sy iw fm an
+\n	yv dc qs gm q2 cv ok wt b2 cj wu mr zj kn e5 iu pz r8 pe fp ot tq a9 y5 sz ez cl wq qq wv a7 ln ky jd qe qr yx rm qi ea ln te y9 ev en eh iv tx e3 as tn j8 wf xh co fl nc wk xz es rx ee wh ub aq u1 ar e7 up it iu o2 wl ko jo cu pc wo al hm uq rn ul yz ro
+\n	pw na wu jd yf oe qr xr sk wa hw ql wg x6 s9 u7 am
+\n	uv tr ub k7 qg he u6 jt gs z3 by tn bi av z7 jc ck q7 2n ny cx km mk rf pj xi lh sf up yj to ia ab tq fq pm fd qc qv ps su qw fu xu cm zb bc qr qt tn ei rw gl p1 xi qo tt ed ef ri iz yw oh tc uy tv as qu l4 qr t4 wx e5 ae op oa em tz gd dq rw ug dr ux qj be ko cg nl je aj xw q1 vv ax rl w2 yt aa u0 eu ah
+\n	dc ph sq jt ql un q5 cg lk w9 ur uy pz uo sx qv qq cc ln fu ym ho su pn qa bq pd wj wj yk ou wl rk o2 pt uc km ja wm ry rm ob
+\n	gb pw qf we q3 ls q4 sy bl lg q8 t3 wl rg ed io ef if oi hp lo kw wy qw ei yz rt es p6 fp hi qo bn qw wg cy np uv yy oa uo ir of em ug x9 qh nj n8 ea u8 er w6
+\n	ij dg cd lw gk wu zl dd eb eq sg ia am in wq xt nk wr xj qq p5 pd pk as sd fn lj jw fk l9 nt wl oo fj sb u4 gs fx hg o1 dr fb hj h8 xc yq ch er e2 aa af ah ob
+\n	a2 o0 hn pd iz hw jg q1 jl qz ip le me wi bb r3 z7 g1 eh td sw g9 qq c9 vy ud qo es ec tj uw dq ur hj dy oe zp lk l5 fl wj ys t2 ej t4 ek rs sl yu oa u3 gd pm rw h1 pr h2 py wl 2p s7 wq 6r mi 10 ox o6
+\n	i3 qw ee ur cy nx r2 wj t2 ub ir aj cl qm u0 oz
+\n	qd qn un qz xy nq an kg hc c6 w8 93 eq ts g9 wy mg w3 rb 3f wf rw kt op es ef at em s6 pc wg bw x1 xl wg hl yk yo eb ud hm hl py wb u4 zp bj bm se sr sy ox am
+\n	rc ix qs ls qy at ut pk yo ys ec hs lq xv ks
+\n	yb al zf ws cn ac ih th ww vb kt b3 xo qe qi te ea p8 tn qd ci ix xk pk bg rc tl f4 wb rb ru
+\n	iy qd a5 jq jw qh sw fv oz cj hc qq ya ee yn pr av or us iv fa qb q9 bh ns d0 qe i1 b0 fh qy qu qi ry os ul hq ri ix e1 ao p0 qt sf qi uh ll ko lx nz sg jz hq sh p8 x3 wg rd sx yo yp u3 pv rq ds tc rr wx lr xb wn ep hh bk yw q6 og yr yg si tq do if
+\n	hv qa qf jg he q1 kj qz bh lr kn rj th kz ef eh av pp i1 ar gl ur lr bz xp yr ze qt tn es fl hw s5 qa ed t4 wz sx rg sv e9 fz hf al h1 av bg ym ee yg
+\n	k8 nn jy q4 wd lf xu q9 a1 4v yd mb r6 yh pb ta g6 dn d3 pl j1 jk wc cn wy 26 rr te ti fa e4 uy fb gr hb kd lc qf p5 wh au fa iv xo hf ot eg ra wv tp ec yo ah iu pw hj ac h3 py k2 u1 wb rl rz yt er w6 ru af yo ep
+\n	qd uq qh qm q3 vg qc c5 rd vp ut eq on yn ii xp up r8 d0 sz qx ue pl lx qe wr qr lm nh qt ha qo ki ri e2 tx iv ao s3 ow kp xf rh ya r2 rk cw nt by wd j8 t1 hk y1 ns t6 wc ev sq rq yf ux aw ch qs u2 zn sm rt wb bk yq dh 8w w3 rc yg o3 yi ox ov ir
+\n	u0 q7 qb ml or nu b5 1l xb tr tp in qt hz so v6 dq o2 qh wl nb rv fw
+\n	ss jr zf zh xt oy hy aw y8 js ob wq ny or vy fi en tb qi j9 gt ib ot oy rd e5 y6 tg th pt gq wz rt rl ew fm ie ri ir ro ah
+\n	o0 qj h9 wy ee g9 gk jd fg qt 3d fu ru iz tl fd tv ad hl wp oo wf nb ez sv tl f4 dr oy rp
+\n	ak il k6 qh q2 vd k3 zd bo lj k7 km 5c ut rz yd up ua is r0 qn zq wq j1 qe cv pw fu md bw yw qq ra rw qu ex ik at y0 ru ti yw fz ic ao ow gm jc i7 nf p4 fj xg kr br xk bs mb pk hl wl ta ez sv e9 us om rw ap gq wl k2 qz h8 gu kf et ru tq ag uz rp
+\n	yb az dd fu rf hw qg we u9 o3 q5 q6 ag c2 o7 wa kh w8 vo mc yg tu ua uh ta tw ih hu fj su bg ww bh kw ry ru wy ky wu wi fw 20 b9 qo ik oa ev hw s1 e1 e3 fc uu s5 tn qy hz jc do ou jq gb kf pf xl x3 yv lz iq eb e8 os sn fx dw qg ql wc ka n8 gf ly se tv yk di si o7 r2 rp
+\n	il mj vi sd ia y6 wq rm p5 ux ho nr ef ej wq iq fn
+\n	ft cs uo io er ic tw ig mm c9 xk ab ze uw i5 s1 e4 pl ui f2 lj p4 sf x4 kz ej ez eb ov of rw dy av qh f0 h5 ki qx cx eb og gk oz uc
+\n	ul io zd kn w9 y3 wt qq wp jl i9 jk ca h5 wx wb tm do
+\n	iy hv cs a2 ee yz y6 gk kq em qy uq ts w0 rq rr vt pb nc q5
+\n	qn q3 vt vu yk ej fp tw zm qq qy y9 hh wo wg rh ep x5 wk mr el l9 av hz w5
+\n	hq qz wy cx rh ur w9 e8 r4 fq im fj gj dm qn gl jn iz l1 yh mz rw e2 qo wh nt wk zw t7 e5 iq fh eb sn ud az uv fh sv dq q1 ku zs eb ue xq rn o6 do
+\n	ub lo sq wr d1 mt o7 ts t5 rd xe iu yg ot gg se pp qc js lu xt j3 j4 wt pc vz 5o yr qw zw qr eu db sy eb em fo i0 ad gw m9 ig ih lc od n4 pg rx bi ni kq wl aw e7 az jo mk bo wb ei mi ep wb eq di do
+\n	q1 ub xt db wt ws ik pl ee or to ej ic is fr jk ls c9 qq yg qt eo rw tp p8 dy pz gm hz or xs bt x8 t4 t8 s7 oj lt wv vx u7 w4 et ox yo
+\n	po o9 ih dx qa rf qf pd d2 kl ad lh kb bd qm bb b1 z8 ew d6 yg d7 ym ti eh ic iv oi y6 sz dx qn ut qm gz pj zw jj 4d bk wb lm xb ke yx oo qp yb yn en fo yw fp e4 aa fd jz qu gw qa zs nl v9 wf qt qi vg ni wx hk 9f sz tg t0 ga de re io av h2 jt x0 h4 wx wc fg rb rn nc yz iy zp ds ep zw pr xv rz yh yk zp do hc ep
+\n	hb ty z2 qz qz zh gw mg kb ve zz ti tp py el jp tg qc ar qv gx la qr cn lr nd ng ve qt 6g ml op pd uq uw eh i8 uy dt ho j8 wp wd qe xm w0 x4 qk el e9 pb sm pn tc gt ce oj jr mi ds wb ym ew u8
+\n	ij yb hn u7 cd gj co dp lp b2 r5 ed ti pn qx g0 jb jn jj we bl ri ot pi rb yc sv ty oh ph hh e4 hy sd wp ll ft l7 wh ca ys wf wb t7 sv uo sb sn ha pb sw de un qc bz wo en as tb eu af eo
+\n	d2 k0 wr q4 q5 c2 sj iv pm g8 m1 l1 5s ij aa lb xm vf ej ta ar th od sm cw gy bu qd q1 u8 ry rn
+\n	qa ux q3 mj ex yu zx rk gi rl ya is py am tw ja js db ps dn qb qn gn lc pe qq vr qr eo qi ec oa ev uz yq of in ho qo jj jk wk wd zp wf lz t8 tk ha pv fz pn ug o2 pe uk kv gq v7 oi qv wv dj tv fn fw
+\n	dx a3 k5 um uq jd og nn q5 qx cu wp rd ws d6 px ac oe rb up tp ej ek ih ff qc gj qm xk b4 dz jg sq jh eu yx eo re es ul yw tp i6 pj ho qi qf sn og xo yv pk wj wb go ar uo eb ir iy pq uh qg h6 vt wv sn n0 rx af uz hx eo
+\n	yv ub ty gn gu fu dm ca q2 d4 cn ad iw k6 bf zl zz 2o w7 uo ee yk ix g3 am fw oi jo se ha vs qn iy qq 24 bl j6 g4 cw jv 1l ei qy ke j4 qi ep of ao hh tb gm sh lh vc uf vu wd p6 xm qt kh rk l9 s4 wh mr t4 oi rf iq op ox u4 e9 fk u5 it re uk f0 kb nd qk ce jp lr cy js qd qb sb tq n7 n8 ed ue tn ox o6 id r2 it
+\n	qa pa jd qn qg jt gh q5 lg ag qv ah qn vr da rh w7 b2 rz rx d6 d7 eg eh yl a9 ek dl tw sc hp ha su gz lo qe le ns kt qy qi 1h kp mz qu es yb yn p6 eh fs ok as im dy px gq qp qs l6 iv rl zw dr 4r hi wj rp t6 go s8 e8 at e9 f3 ak dg f9 qh pt dz ww rv wb oc pv be wq cs q1 xr xx eq yr u9 sr tb yl tq if hc ig
+\n	a5 co dh bt lw ck lh w7 3e mp r3 rz yf yh uh eh td y8 fg pa ar va dm su q9 d5 qw re vh he jc 1g ib xz qq qw yg vt rn rb cb ry ym em i7 hr ff f2 qp rd lx wg lb kh va jv qi xd wh wc el un sz tf gu oz ae e9 e0 iu dr io dt fb dh jo um wx s5 oa kx ly rn oc zy f3 hb tt wb u9 oz hx if ig
+\n	ak o0 qd q7 eq g1 y2 pt dk g8 qb vs qe dh 5i pt yh qo ul tp oj sp oq di uh zg xn rx tp tf ie f6 cg rv zm xw zq 5f md sr yk ru ro
+\n	a2 tt ub rs ij ml ow pe el gd va ue zm sa pq lc yw qi qw lv ep qo uj ym tl ye hj s6 uf qp 82 fk y1 wl oi t8 fk pb tx o1 sk lm oo xv n2 ad fk n6 dp on q6 rv
+\n	qf jf kk nm oz q7 b2 xo fw kj rh ua oe yl gh vd qe gn wb pt wi z0 se gj 48 of i5 oh so hz wp ae wg nc kg xf ev pv ov au iy az f7 qb q5 eq yr tv yy ol ry o4 oc di ep
+\n	po o9 dc a5 jd z1 sq ws b7 ti r9 sl ez aw tg zm si ng qe ky b5 pp eb od jl ff oe ce qp gy yv qk r4 xf kw iw sn tx gg uh cq ql qa 2s mt eq rb dp
+\n	qs qz cd dl se q0 lv eu yi rw qo uh uj ul en tx wo qd e6 pv gg je zx kp qc q3 ye en
+\n	un qs qh se ws lf so eq yf ef y3 g4 zb hs q0 no qw j2 y0 uu fb di f1 kq oa ul t3 ot fh ak yf fv dt f8 jo sx wx at wn cs lq zc
+\n	ub qa qs ik pw uq a6 pd dm d1 qm d2 qk cv zd bi wd ne ah qb kg kh ij 1p rk w9 wt r5 d5 px uf eh yk oy pm i2 hp st qn si qm zw we ls px lr ri qr sr db hp qu xk fy os eg en uc ur i7 sa hp vn qs kw dn od rh xj w9 wk ph ap yh el oi oo e7 gp ay s0 f4 gf az jy qk ql qx 1k v9 qc jq zy n5 kg hd ww wv bj hj ur er rn ry eo o7
+\n	df a6 dn je ql no q6 ox wo zl bn rh ya mv e0 yn pr gd pi y8 i4 c7 g1 j6 wo rv eu xg eo c0 yx ea sv os wp qw wl ou un t6 u2 os of f6 dt f0 jt wc ja ae qv rm ds pq y7 qk ck aa ux
+\n	db iz jk zd wy wh c3 zk 2o rj hw vp on ed ac to g2 r0 id ta th qb dm pj m8 np oe pu bb tc gh ml rq uf tu eh ye tx gv pk jv j8 lk xs kd fi mx be wd t3 mr wk wl td eb ie tz dw rw pm re fb dj h6 ql wz wx qx qv u3 vz xe ex 2w ty ew xm oz an
+\n	ty a6 we wi ro lj bn rh r5 g4 aw jd q0 gz xy m6 wu qq et oo ex qp tr y0 fi au e3 oj gm px lg wk tu ek tg u2 ov em dg uk nd qj cy hp wq mi bj q4 ia fm r1 ei ie ux
+\n	tr qg h7 qk jl kc jr am mo w8 e8 td gl kw sd jo qr vl gs qe b9 mm fh eo uh ft ik e2 i0 uu ff qu f2 jq v2 wg kg ek aq wm yi yo s8 e8 sq ab cw wt ck pb pn xl bj yq wm ew xq su r2
+\n	qk wa q6 jj ws ut gd gf ly ec pj sa pd wl e5 wc da kx zk zz zb wv rm te
+\n	jq uz nv ql as jx z8 q7 o7 yt rl ea e0 ym y2 pr ia sz sq sr qq qr vk oe pe lr bl ll rm yx y0 eg ti e1 ue uu ui jx zd oq kd rg lv lb r1 fx ro me ts ay f6 fc io qg py qj qk qs ky qh y9 ok o4 am
+\n	qh dl jt wy a2 yk y2 i4 zq kq we bb dg m6 qq zw rt ta tc ff xs xd qf g0 1d yg du wz iy sw tc dd hj hk mh ov zi wn hk ee yj af
+\n	ra ak uw q3 cb ji wy fw gw t4 mu ts qw ww rj vo rl yd ug d9 gj i3 zw qw wy md qq bv rn qy pd tl ic p9 hr dr hh ui sf f1 i6 ws cy es ef t5 kr ek oo t7 ec e8 u4 od dq ji ch jr zm jy q1 zp yq 2e og yo tm
+\n	tr tt qa qd jf pg qh jr sw ao q3 qz za wt js bl vw q9 ws uu w0 ya pl yf rx ee tu r7 gg dv it lo ww up js qq qe lz eu qy rr yb ri ay ye ta tv im sh ss uk qd qf bw ro sl wl t5 e5 um th ha fx re ii fv je hk ot cq km h8 ks bk vl qn xe te tt rl u7 iq ry ag dp o8
+\n	sa z1 qj q2 nn wr z5 mq xu q7 gv t6 w7 r4 c1 mb sd ed ym ot ta ht ts tw gd tf g8 se ar gh fh qv qn zm hs qw qe oq wc xj vz xl wo rn i2 sr rq at yq uw s1 tx hy fm pc wo hv gy vu wd lc ul p8 wk wk el oz oa rh gp pn gf fx fc f7 rr dy x9 uk f0 py wl v7 cr ch qs wv nz lv lu 5o xe ym ly er yi ia gl ox r1 dp
+\n	uv qd hm qf gp k9 kj we lf bs ej 2i el wl t7 rj w0 rz yf ys r8 tp py tq tw dl im qc db qq sd ry c9 oe if qw aw qu uh tt p5 p7 p8 oj zi oe qu qi lk j9 sk zs ka lc wh wk zq mq vh t2 ej r9 mr ez t6 e5 op rk ga pb dq ap f9 py qk qz wc kd pv bd sm dr u7 mf o3 yk di r2
+\n	po a3 uw q5 q7 ck kb zj td zz yf jd wq xh ld qr w4 p1 ij fu tp qq sv y2 yt t6 e5 op dw iu pw jp ka qv 4u qf rm vb w6
+\n	fy a6 qg cs z3 ql dc jz wy me cj o6 ba kv wp w8 ea r5 uo fw ib ig g7 gg sy bg qr cb cq ro xl xv ex tt ru pd hg im oq gq ao rl pl aq sz t7 e6 os uf ug gg pr ql qz vt mj px wb ci qf ov be bg ww mp mi rz u7 w3 ei yc
+\n	gh cm ca rg uy pm y7 g8 lx yc qi re uh yn uq eh tz ph wo cr sv fp kh sl oi sx ov ga iu h1 je fd rv qv wi jy yy ry o4 tq si
+\n	qd iz qh q3 cg lf wy xa ez eq om ug eg yj fo fp yz qx qe wb or jg xb c9 p4 tj y0 iz tc oj tb i6 p1 ka zf qe yp wj mv ra ez rd uh pt zl lm sz wc lr bq oc zq sr af gl ei ux it
+\n	a2 qa h9 qh q3 fn kx ve wz us sj yz fd g7 vh c9 xq xj ln tz wp wf kg kk by vf j9 5y un yi e6 rh sn tx hj kn rb
+\n	un qs fi qm jk js bd o8 bx vt eq ya xp yg pz ym dj fp tp ta oy dl qc cx qq m1 rt wn d0 wm yr qw aq qt tb ha p1 uk yn ef tj gv im sd hk pz jx zi wa wf ba l0 wd mq ej wv t5 ek iq pv ov f3 em ak rq hn hh f7 uk qh ot ju ng ji h7 wz cr v9 bj bk rc er ia is iw ei id ov pu hc aj
+\n	pw gm qd jf u6 z3 jl q4 wt bi lr id wa wz w8 ya ev ew r6 yn ee io r8 ip ej td im si j2 jo d7 m4 pv iv yg qi il ti i6 ta ib ap fb hz wd vu wf wh kt kh og kk nm rp ti ek ns t7 y5 wc ae ir pv hf ub wc ho wb wn mi rn w6 yk tm te rp
+\n	o9 un h0 a6 pf iq xi tg w8 z7 r5 om oq eg or y4 sr fh zv vw zq tc ws rq db rw eo ym tl fv i9 pz jx j7 hx oi qf x2 l9 x3 qj by to el sx ys yd ao az uj hl dl tj nz wn kg kh on wv w1 w5 gl ei
+\n	gv az ql nm rc r7 yl ja zn q9 xw no iz qt pk x4 l4 tg u3 of zk wc go qb mo eq u7 tv rm ig fe
+\n	o0 ik qd um qg k9 mb bu wy bx ny ws hm ea mb iu pe eg ey sh uh g2 ic iv aq td qx ja qb ha 2j lp xr wc vl wn wi sl tx qt rq ec vw of uw sm ic qy j7 ns hb 2q kw wf vp 1f x1 5c zs y1 rg tg oz e7 fh eb ie up e0 ap ve wq zz cr wz h8 wv go ly fk az pr rz h4 ew w2 ok w5 ia si ro am
+\n	dv d2 cd qc zt 25 xp wd te es sh eo wn f4 wo tv oc
+\n	uv qd qn hr bj b1 mw lg io sh lo qq xh m6 28 rn xx p7 im qt jn jw bm qf r1 mn ny ed em ii dd wn cz ds vc wb hh q4 yw ur rt ie o6 ux r2
+\n	rs dh z1 jr cb vq r3 eq om y1 sg r9 if tw qb qn m2 vy dc b0 ik fa ib aa jz qu sg qs 1s be of w9 oz sv t9 oc pv rw dd o2 dh lq ka lu 1m qk q4 y0 ye yq w2 w6 si ob it
+\n	o9 db iz fi qn qj mw 3v wp li e3 km zz yy mo ya rz mv yg r7 yh pc or r9 pm a0 td ih db lt pg jf gl re ww qw m4 j5 xi wi yd nh yg qr rm et ey ug re rr y9 y0 sb tu od ay of iv oh i8 ok uu sf gq lg wa nn uj qs cu kd xb wg cs 3k yv hk pn ii hh cw km wz wx wc n3 jr wm qn bd zo mo jo wm q6 w3 rt an hx ah am uc dp
+\n	ps pt vq kc bs vu vo xu ee ib hv wj x3 nu ud yf qh wb lb gz
+\n	ra o9 qs ty rd ps db pu qj u6 k9 nb qk oj ql wt jx bo ri xo o0 mk rh bm mj ut mb rc yn et yl pm ih i1 g9 qm xq oq bj wt jp xu pt bc eo ep qi ky sv uk fy ri i5 im dy hk ui tm f2 uf ug qd kf nc s3 fs 12 t2 ro du wk ek yt ej t7 s7 oc ay s9 pv fl s0 gf tx fc ac py v5 qk ce qz cr jp ck hp u3 zm xr ii yv ea cf hj ye w3 tp do tw ux
+\n	o9 qa ik wt kc q8 wk sp yy w8 w0 ys ea om tu yz pn fe ae g9 ps g0 i4 qb fk qn qm ut j1 d6 4d cb vj vk xy j5 be wi ve qq gf qr j3 ug qo p4 sm s2 ut fd pl qt jz ui qy qu qa nk fj iz xh wk iv qz fb ro x6 ti sl rs hc oi wm us ai dw o1 hh ab qh qj ju ng wl zr vk tw 5a vc hk md yr u7 w2 yt tn eu ul ah
+\n	uv ra qs ty jh q4 o4 bc vr o9 rg jz mc r4 ui g1 ey g3 sj am sq fj qn it xt ln dl jh b9 g8 dv qt yz ea ue ss w9 wj kk bi ym tg t0 ob ys iu uj qk nf v6 nj ox qb wy mw 1n pq eq w1 rx rp ge
+\n	a2 pa e4 xy yd sj vs jj xj lm qy qp ri ux p8 pj tv xs wd wf oz gd sw rw uj uk qj k1 xx um eu bx my em ey
+\n	az h0 qz iq bl kb xp yf y8 qn rv hx oc re gt k2 bo qg cf rl
+\n	yv uj d2 mq hx ws w7 mv yn r8 ab an ae jn xw al up be qr zr ep re qo ec ur ap hp pn wp i9 rf wf vo qk t8 eb yd uk kv ww wx wt ox kh mi eq yj oz fn ie am rp
+\n	ik df qg jg k9 wy kc ro wi ve bb rl ew io or eh sq oi qc qe d7 m4 pu gd db oo yv yq ix eh fl pg ib hu pl cr fr xd cy ke mx yh wk ag hf hk qg sj we mz gp u4 ak ma rz rv af ox di yx ob
+\n	hn pa pw qd il qh q1 z3 wr t3 wo ws vu uu ld pe fo dj ot dx pp vl qq rr ls j4 fs dl ve c6 rq ln xk ec rt ty ik y0 tu yq fz s5 sd sh jn wa uj ws lx qr ca rz wd nu ek yy yi y6 uo os up f4 fz qk h8 qc wr at 18 ca ww rv sy ox o6
+\n	dv wu wo uo m2 we rp b6 qe ik e1 bq w8 x5 ez fh u4 iy jy wu li f5 u8 w3 yl te
+\n	sa ds qd no q5 ra jd qo ru r7 uo ar ud on ak fv dg wl qx qv ye yl ep ge
+\n	ss rf qn bu gj rj uo yz tf m1 kw zr oo y0 pf tc dy qu v6 xh t4 oo um df je qh dz v8 ho wn wo 0w dj rv o3 du ro
+\n	ij uj k7 me lg ih hv ws rj pl sd uo y1 yk d0 pt y4 g4 ou tw sq td fj ha qm qq 4a kw d7 xy m5 bx c9 yx nw tr qo uj fu en p6 s1 ht tb qo zp kq x2 wk wj wk yt wz sz ae iw ay fk ao ug pq qg k1 ql xx qc cl qk 56 bn oj yt et ut uy tw ir yc
+\n	k5 pg cp z5 wr no zd tk ej an qx gj i3 su we up 3q yq fx ib tv qp ik wj yf u1 os rk jt qo qx n9 w1 rb
+\n	k9 uv gs wr 3b mh km bm we w9 es or yk r0 g5 aq gf nq qv ll m5 yd zq qt qp sv ed p5 of eh i7 pz hl sg jn wa m0 nm kf w8 wj de e7 ar iy pn ly wn fx w3 rb ey am
+\n	o9 d2 vg gk ex rf rc hy qm j4 ga qw rm ls yl cm en tl tp fp tb i3 qy qo j9 vn zf wf qg mb kj qi jb mq wl rj s8 lw um zt wb f4 xw f9
+\n	ra go ls qx wi c6 b0 rw g1 yz fe g8 ow qq ra mz ex oa fu iz tl uc e1 p6 x1 tf rh tk fz ap hl qh k3 xb mw zm yb yw q5 aa rp
+\n	yu qx sc xe j2 oq gs i6 i9 l0
+\n	yv ss tt gu fi qj bt ql ls io nw gk hl up zv gl ni xt wy dz qe ud nw rw qu uw e4 qy px qf zw za ty ek t7 pv dg ho wn uq rx yx ep
+\n	ga 1w ld wy o7 xr pk r9 g6 hu jg lx sd no xt wr zy ku l2 nw 9r rt i5 to tp tc s6 f1 ud ko xb rj qy es t0 f4 fx ii rr hm hj fb ji oi n1 vk ci 9e mt yc 2r tv gk yp ux
+\n	hb hn k0 wy m4 w7 rc ts y6 j3 qe ve qy rt so di qo dp lk xf mq wl em f5 pr wl wn 3k ew yt w4 ri
+\n	qa ss lq wr bx t3 r5 ed eg sx dn we 7n ra qe b9 rm wd rw eo oa ri e1 e2 ut ap hu qo ws uz ai tz nl cu wq ln wn ie aj
+\n	yb rs un hm dg qm qk ao mw fn kv ur uo pj e9 sf ia tp tw a0 td sx fg su xq m1 om na vk wy xk em l1 z0 nh b0 mz qy p2 ru au iv p9 pz ug lz xn wf xg fk zu wj wd u1 e9 tl ak hf sw o1 pw dt gq v5 lm h7 nn nl wq uq zt o3 ad ry id ig
+\n	a3 pp dv qs gn u6 jy kk io dt wt ck rg ua yd ya yh ax ac y1 pe pc pv fp fw dc qv zb dn q0 ju jj m1 ui lx qe qr t9 ja he wi vw m7 l1 jn qe wa qt xg rq qy yi qu p3 yb ed en tz so s3 tb ho fm px gw zo lx wf sm mc dq wj yg l4 uv yk tp t5 wz ol fk f4 pe kc dj wz qb zm wi br zk ww ty 6i vm eb lt eq w2 ey yp yz o6 ei
+\n	fu ga io nt wp jz yf rv oe eh pt dz ih sx qx g0 qm hf xe lz gc d5 bh 2z cn d9 1r sz li bv qe 6d bb er xv yx p2 ea tj p5 ay uq dq pg oh qt s6 px sh ko qa nn oa bq cs kk hh cr wg tu y4 t6 e5 oz th sn ov u5 dw qg dh uk n1 zr qv 3d n4 yx xe wv eb h4 yo ro hx o8 rp
+\n	ra gu hm a7 jw qm qh jr gs k0 ql xt q5 dt ru wy k5 wh fw lu kb am m6 bx vy qq ev rk 2s mc yd es io pc pv g2 ek tq tw in ih ae qc d5 ui qe wt qq m8 vr nb ee hu rw rr tt ed fi em e1 e3 hh hi sh zp qo wp l4 ws qf qf pg eg to un gu u1 t9 ox e7 u4 od ds de hh py ql h7 gy js vz gf y8 uq se do ro rp
+\n	qs qg gk ta bf r3 hw r7 r9 sh ua g3 sq td g7 ha lu qw xr wy wu rz ko bb i6 uy as di qi za hv jw rf 1f 2u va ap qi rc du wk yt t7 u2 ob re ax v8 cg qb wy wn kg pn yi rn ru
+\n	gr ra jq qf go ga jh gs q3 tm q8 k7 o8 mj ym er ip ua ej hy i1 dv qb vg cv m5 wy xk g5 wi ng w3 3w ud rw ug ep hq ta fc fd aa i5 hx qp wp v7 qs l6 l9 l0 jn ty t6 ie rj tk od ys on pq tc zl nh qc xv wc cu ks ei lm vm cj yi ad r1 si sp
+\n	qa hm a3 ac q9 na rj if qw rr vw tj ib su qu wo dp j0 wf pf 2y wk ym ra wb ae ga gs f8 gq im ar pb ec f9 yu rm
+\n	t8 ej an y4 td ez ln z9 lj qy sm uw dq us cp nu tg vn
+\n	qa ds k5 hw k8 k0 ql hl 1r wi fw c6 w7 mz rj xy r4 e0 ym yh eg r0 us fs ib oi qv q0 ww lp gm ln bx nc qi l1 qe wg ea qo eb tk eg to ur jc oe dp hv wa 2q nk at rg wf wg ca xk jn pk yg er ot uv wb aq ol wx e6 ev sv uo vf eb ah ud da pe qg jr kn ju ng ae wv n3 iw ly kf cl pb wv tt vn eb vm u7 ew aa w6 rm gx r2 o8
+\n	q4 q6 vk d6 eg pc pv r0 tw i3 q0 we tw sm e4 ow sn kg up hm qx zv nz wm u9 ul ri do
+\n	po uv dc qs qd hm qg q2 jj sw kl me q8 xa wa xf z5 yd r4 rq sf px ti ia r9 yl dj dk ek qx i2 sr qv qb lb wi nf wu qe tv fh qo rr yb fy eb ri ai ok qt pc ud qi qa ws qs lc zh nc x2 cs t2 di ke wk sz oc yp s9 ys ai ln wz cg wc wv os qb f2 ec y8 dg wm rz yr ee rn sy du su eu fm ei o6 dp hc
+\n	ft qj q6 wq up ut lg er uw db ll ws of og e4 1i r0 wx fh th vf re hm zi
+\n	a3 ty pw ph cg uo r7 oi q0 lb c0 vl xx mh hu b9 qy tt sv p5 eh to hh ow tm oe si sk oi gt kq cu vi j5 wf el tf yu u3 ya uj dy qh ql ct wc el y0 o3 o6 if ge
+\n	a3 dd by wt lf 2v bl 7c bn cf yo go yf ii et ey yl aq aw g8 ho i3 qb dn qn lu vf vg 2k le ml wy t0 4h xk qw b7 bb eu xr qu tt y0 os sn tl pf og tz tx pl ss us xd cu oa qd xn ke qf vp kh ny wk r8 ej rd t7 sc e6 rh ud tx al gg re hj ux qj gw xx zv xm iy ca vb yw en oh u9 aa w5 w6 ul oc an uc
+\n	qa un dn hq hw d1 jr jy kk kl wt kz zf z7 cm q7 me xp wp mj rh ue e7 ys rz eq ew ed xp ee yj y1 to fw aq po i2 jn li on m2 na vq wu ck er yu db yi gl ty eh uw fp tx e2 fs uu sf jx oe jb qp cy bn qd wg 3z nu j9 mr t6 gp pv ha tl ai fx uf fc kx qh gw xb zt qv qb ir cq vb y9 ct ol fn ah hx sp
+\n	db wt cm ch jc wi dd ys on td po y8 q0 wq kt eu tc tv or fr s3 na e7 uf gg re f5 tt aa tb ie
+\n	a5 jw qh q1 qj oj xy my b6 es yg yl y5 zm pv qw qt qo ea ri ao in s4 gv i0 ad lh wa qf gm rk vs oy r0 ez ab lm qs qh ry ox
+\n	ga ca z6 nr wo rg bm vu uu rj e0 ui io pe eh d9 ab tw fe tf fk wy ln md rk sk qq qw hy kp dc qy y0 p5 p6 p7 ic pg e4 jb ge wp qa bn xf ks zi oy e5 um wx ie yp fv je ng oj ja v9 bp qv er an pu
+\n	a4 jw a8 o1 q3 un gh le nq q8 ig rg rl ea io er tu fp dk hy sq ae lo qq wt wy 5i xj cw dz oo qo yn ty y9 y0 sb ef tj uw ta ur i8 tb oq af hz qi wo sk zs qs vi wf kt nb y1 oy wk r0 ol ex ec tg t9 eb ap fv qk ji cr s6 et xq bf ep mi ax rt yu iq af am yc
+\n	gr uv hv tr a3 qs lo u7 jy qz kl z6 gk gz ag kn rg k0 w7 wr rl pj ii yh up ac ot d0 g6 td y6 fr se pp dc g9 cl gx qw pl m1 ii qr vz oy nf eu eo p1 os y0 ri ix au uc ai fx p9 nm jj lz pa kw ul rg gw qh 4m eo qc l5 rp oy ej un yy yu t8 sv ud fx ac dy av gq qj ve sl bu th u3 rn nz n5 zm yz bd tx el ex n9 es rt rz rx ol sy rn yo
+\n	ph cb jx wu ib vb ih ty oy tl vu
+\n	df qd k7 z2 q2 ju jz zf cm mw yr gu rx yh ym ef pc qx jd q0 ow pw wt rj xo mf xl qq qw ud tw ku ik oa od ti hk f1 xs qd wf dm s2 ph xo ou sx ae iw t9 eb u3 rk ak hf dw ax oe zl zz wm sm el cx cw lq za tu yw rx yu rn fn yi ei
+\n	a6 ql wr jx z7 wu xi ym fo if a0 dv ww lx zv dk tu sn hh ff hu zo ws rf wf aa ni kq uv t7 um go e8 ob sm tz hl uc zz ol lr kc n6 bk ry if
+\n	qs gm tn rp iu pi qe ec to l1 wh ra wl it kx fd vx q1 ri
+\n	gu pw qg we d4 ws q4 cn q5 me qv zj zl ex wr xo yg r7 eg et ey us iv po aw se cx az lb nz nc qq ew rs rq yx ep tj uq eh fz hg gv jc di wp sa nc ya cs fv qz ti wn aw e7 ox u6 pn re o2 hm fv qg hl dl v9 qv tz 6y rl ye rx ur tn eo
+\n	gr qj z6 ld tm jw hc ed y5 se ke ht tn jb 12 yt ek ao io wv ew ey fm tw ir
+\n	gv fr ak o0 gb rd dv gu qf qg qh jg ux qj ph k0 oj wa jz bi ja eg c1 fe qn b5 rs rg b1 vo z7 us d5 r5 ii tu yh y1 or ek sl pm hy dc th sy ww ze vb wt m6 iv mj qe 6f qt gk tq ru yq au ap dr hh qy sf qa ik kt wd rz ej t3 ot ej ub wx oz th s7 t0 ag ga pv em fz sw o1 ip qh nd h5 et ho cu yz tq wq wn et tn yo si ov a1
+\n	ij rs rd qd pd qg qh z4 ql ip nq q5 xu bz lh o7 my 3w xe ws 2p w9 rk es er d8 pu y6 qc gl bv qa rv qt rb os ru fn qy qu hx or wa qs at zg mx xo bg yh ec os eb hd rw dw ip vw ki ok qx cu wb sn wm yj o3 tm ei ah
+\n	tr rd pq qd um qj u7 q3 cf db k4 gl mr gw c3 bs k8 vi 4v kz cg rz et ey tp fq y5 el gd dx qx hp mn cz wq xh m4 av t0 vz m6 qw tv rq ei il sb tk eg uq tc wo qo zs rd nx 2y fo j5 l0 l1 hy vy t3 t4 yt va y5 rg e7 uo ox at ir ys hd uf fx re rr ac kc cq qk cw h6 kp xn zu bd cz ca pn pq w1 rx vc w6 yo is fw ir ov
+\n	ra ij a3 qs qn jf qm nv cs cv kz q5 um q7 q8 km ya ys rx yn d8 sh pt fe se js ue rk m7 wp et ei qy to tz s4 af 3i lc wk ej hc ex t7 oc sm s0 tl fx re fb jr jp qc kc jr cc w3 yl oc ob ep
+\n	sa yb qn k8 lf d1 c3 wp vr wl yd iu kb sz g7 mn jm lz sd m3 lv qq j1 ex qo ry ru em pk i3 hi rf fk nc wd vu yt td sc tg s9 tz tx dh x9 qh ku dz my yr w3 oj se ei gz tq hx ah fe
+\n	w9 rl rc or fq a9 pp db gj hs lc qr ec p4 ph hb x1 ez u5 qx ea 6t tn
+\n	a3 qa dd qf qn qm qj vj wi ag wo ig e3 wz r6 d7 ax pe rb ey r9 is ot tq oy if hy se qx ar qb vd qw qe np xy nd wi in gj qu y9 ev ti tb qt px ud wo ll cy wd hw kh fp wk wg wh ym vo ub rd t7 iq yo ox eb yp ys au u6 rq ii io pe qh nz vl be n8 wv hk og rc er yu u0 rn yl is do eo
+\n	dd nn oc el yu tl rc rv r7 y2 hi qc qm wu cq qw xc kp tr fu ib zi qu wp vi ci qj nu zw t1 wl fh ev os f4 f6 f7 cd zc qx zy wu bs qn u0
+\n	o9 gr fu a7 qk xu q7 wp el yu fp ou y5 pm pp qm jm st op uc fx tn hl zs kp bq p7 hi ys qj ki qc qa n6 oj ey w6 yk si
+\n	q7 xo sr he uu sd s6 gy ws iz fk sw al v6 lq fh ie oh uz pu
+\n	of ch zj rk rx rc g8 i1 jk tv ul fi e1 ic sp in jl jv j7 nm rp r8 go hf wx tb oz tw it
+\n	se kc tj rx yh eh td pa zb qv c8 j5 ri eq b9 rm ik ev ul ti p6 en ok tn wp jm ws ke br wj rp en gd rq f6 ac ab zc rz ew tb ro
+\n	qd wr d6 i3 j1 ww if qt yn fd e4 qf j5 yh t8 u1 ev qc wv pw u7 oj ok yz tw o8
+\n	un pa jd qh qm dz pi z3 ny gs k0 wt xy z6 cj k5 gl bz d1 fq ye yr rh t7 ot if g6 im pa ps fk zw lx kr lv na wu vw eo cm te qo tr ec ty sb y0 i5 to ye so tc i5 sg ct qs sc ws qr xj 2u n5 rl cw dw ys qj yn qc y1 sl t9 ox sv s8 ya s0 tl ys rw tx fx ds rr cq cd ql qa au qg vg rx yt iq tn yl uz ei si r2 ob
+\n	rs gm qk gg m3 rj eq mv yf sk gx ve eh iv i7 n3 pb uf gh uj tg ox ww bg oz su o6
+\n	ih a3 uj rd qs df h0 jd d2 kj q2 ap wr ol nw bz q7 fq ir ra w0 eq ya r6 d6 eg ej pn py pp sr qb jb wq ni xe we lm be xo w2 qo mj qr hp tr qo qp ef of yw ai e2 i8 fb tm do dp i8 l4 wd p5 sn pf gr vs rx kz vh t2 wj ot ar t9 at ir dw qj nc cw fd sx qc mz lt pv br wv dr q3 yq vn ye yw dk oh rc w3 yt se ov ge
+\n	ds h0 jw he qh jr jt ql me na ah xa tf wt pj pk om 97 rc yg ym oe yj eg dl fe sz g9 lo qq qw wx rr c8 ns vq m7 xl gs vr qw qr kq qi qo eb tk ue dw e2 i8 i9 hy hh qt f1 pc vv qs bn ij i0 uj xh wk qz ns ej un oi yi rh od ha tl re tc o1 uh ac ip qj we qh lq eb w3 w4 ia oz eu ri uz ep
+\n	fr ij dl qk z3 qz wt z9 gq mr wo zz rd dd rz ee sw pp g0 sy vg ww iu pz uo cb t9 ld qr ei yx rw es ts zi wp wd gw wj hf r4 tt x8 wl t6 hc gp eb aj ai iu o2 nh qv ey kg dp wq f5 rt cg yw sr tb gj rb fm ro ah ig
+\n	ss ux q4 ji xa mj mi ld rl pj r4 rx yg ti ix a9 ig gj j1 ww ii qe j3 mz vl qq ye m8 b8 yl qp ik ki eg uq fi ok fb oq fm sf oe hp v4 nk wg mx kt vs j8 yn wc wj ot td wn iw os u4 tl u5 rq de io x9 dl ql n2 ji wb if hx
+\n	iy jk ql q4 wt kz fb q7 vy w8 ur ax uf ym yl py ou dl pm in sq ho j1 qr ls j6 ic sl ko xq jm qe qr qt yc es ry pf he i8 s3 pj tm oe qo lk wp j9 nb yd bu rs e5 yi ar rh ga ud al hh oe wx s6 do kv be pm w5 fn ey du do pu
+\n	po rd qs il rf uq of jf nf ih w8 b0 ur pl us ed tz tu ef rb sj tf ff i1 pa dv ue fk m2 qr wt j5 c0 vw xo b7 p7 qt zi wo gt qa oo qd bt nt zq x8 ou e5 u2 fj s0 yd sw re cd qx jp wc ja ga jt bh hm eq rv hx gx
+\n	iy ij pa gy qd qg he d2 qk d4 qz q5 nw wu am qm ft w7 rq yn ef oe pv ek fq sk y4 ts am fd qx q9 jf ju wy lm zw wp er sy qu oa ta jl ss gq fe wa p2 kq ws 2w dn xz t2 ej rp rs yy e6 iq ag e0 u5 tx dd pq fv jr qj ku oj ql wz fd s5 nj qx zt 2d qb nx pm ce f9 w3 er tw rp aj it
+\n	ss qa gm dm qk c1 jd k0 t8 mk rk tk om yn tz r7 px ac av ot ts if fw ez y6 se qb ha su qn cl wx we qr zt kr mj rc qo es tj ym iz tk i6 fa i7 s3 pl jx du qu j0 ws v2 wj ys yv wd s4 wf nm dt wv ub ez ta wx e0 fz al ap qg wr ar wb fj n4 cz qg wq fc mp yq ev se eu am gx dp te
+\n	a2 hv yb nv h7 jt lw xt lu wp yr rg 2o 93 uo pr ej ez jb lz ww az oq bk b5 wi qw rq hs te ea es ed fu ti uz fd tm jc do qi j9 zs j0 wd xv iz hr wx el ns oi t8 sc t9 sb fk hg cd rb mz wn 4i ov ln yr oz tm ro o8
+\n	iy pi jt kz st tm rh ya b2 om ef eh tp el in sc qc g0 ps zq nu pq j3 oe a7 ja js ng tc qe pp eo em fc s3 hh i9 jl qy i8 lk wa ae 1p vh ox rk em hf dd jt rn tq is oc o6 so pi
+\n	qs gm qn gw qb cx w8 ur yp up uy ek ez ar sy qb hd bx rl qt yi nw tt eb fl eh pg oh ib qy qi bp jz lf eo ph wh oy y5 om az tc ab wv wb kg ww eq ok aa uy w6 ag ig pi
+\n	ra a5 db co qn d4 bu qz kx me nr q8 my lp t8 gu rk yn et y1 ej g7 yq d0 j6 b6 qq rn kw ei yc uq e2 s3 oj s6 jl kf rl ny wg mw t2 co el yy ez eb e0 al qg km k3 n2 zr tk qb n5 n7 et tm ul
+\n	po uv a2 o0 rd hq dh hw a8 d4 wi z2 vt ww kb d7 pv tq fa ta dl oi y6 im ff ae qv sy si wq pq bn b3 lm b5 wi ku qu ru ul ri tx fb ss or sk wp qd w7 kh nn es hy wh rp um sx e6 rh rk pn sq rr hm dt ip dh pt wl h8 qc vj ly bq zn gd wn q4 hj yq xb mf ok tm ge
+\n	ub pa fy qf dh qj q4 wt mw cm k5 gw kb el w7 w8 mx ya ii dj dk gd dc gh st qb iu jk qr bz vz ab b5 mf pu qe xd nq eo yb pd i6 ue dq e1 qo wo sp 1o n1 4v at qf fi of xj rj dq ew nm x5 wh na ub e5 um sb ob em pb re ip x9 h7 zv xm bw 1v mp zr w3 xm ee yg rv rt ia is ro ep
+\n	cm bp hc rx y4 sr q9 jj rt qo uk ev to ff so bg eg y4 l0 go os ay tx qh hl qc wb
+\n	z3 nn o9 xf fs gd g8 ns ec p0 tb wf uv iw jt wr dq bj u7 e2
+\n	da td ta tw tf tt ay dq sf gi ae rl e1 gk af dp
+\n	un fi dx wt m5 vo ys j3 i5 ad nr wj mn tg ox bs ia
+\n	hv yv qa qf dg qj do ek w0 is sl ez sr i2 ww we rl vr qw y9 tu p5 uc hj i6 ud ws l5 qf xh kh lg wf wj uv tf t7 e7 dt qz ka xn cx xe fn it
+\n	iy yv rs qg uw oh q3 lr vq bz ab zm wa ds b1 w9 rl rz uy wy om uo ef fo py tw fe qx i2 qc qb qn ww vg ke wr j5 j6 oy qq ng sl qw mj yh xf yk xg qu te p2 ft y9 uk ym uq so fx ff fn qy du f1 na lh wo qo ge sk v1 wg mc dq wj iv 1h pk 3s ej oy ek td ex ae yi t9 go e8 rk tz ud rq ax hz dk qz kf wm yq cy w4 h6 rt ry tn r1 gz ux pi
+\n	d2 we aa cb o3 xi tu ti gd wq pl xg wc lm de e4 sj hc ic wc ra wc go o1 dd ip wl in wx js tv rx yi yc
+\n	ty um hq co ux ql q6 wi bc kn q0 r7 yz ib pm g7 po qv re we bh 8j ru xo ra eu ud qy uh ec ty ry yn hw sm e1 pg p0 dr qy oe lc x1 kt xz pl t4 el t5 ex sn us dq rq ao f8 pr md ql v7 v0 n7 kh vn wm u7 cz et w6 gl yo ei di tw
+\n	ub jg ph q1 q2 d4 q4 qz kl ld cn ji z9 ro ek gb w7 rh pk ea ax yj pv ot yl an sl y5 po im i1 zb fj qb i4 gl xq si m1 jj lb l2 ul sn ue s1 ta hg zu lh nd j9 ci qu wd bh ef ro ra aq t7 ex t8 od en fz fc df h7 qz n1 v9 zy 4a tc bb ea yw mf ia yp eo aj rp ob
+\n	o9 qa h9 dn vo a7 qj jt ji ne kc cj zh wo q0 w7 e5 ui vi ya wy c2 r6 ui px yh y2 to pr ab dj pn a9 pm tw sq ig hi bg ni ry lv wy ic bc li qe im dv rq xy ki i5 fa fv uu af do vv za l3 bi kd nx w8 nt lh hu ra ub un ec rj ua fk ir s0 f4 uf dw jt k2 kz ml cl km wv vv es tb yj w5 rn yo af ru ah ig
+\n	vg wr zh wo on ew ef ae ha id uf eg p9 ef gi al ng 16 rz o3
+\n	qs jw qh cv z4 ok wt k8 kg km wa uu us sj oy iv tw jm c9 fo nd 20 qw w3 yi re qo yv rr op qp ue oh s3 uu px jc hx wf v2 br ep wg pz t7 t9 au re zj kn xc bo kg 1v hb wv tt u9 gj yu ry iw dp o8
+\n	qd wi ij rh ef fe jm kw xj wh uk ef ti e2 j8 ou xo ny wh rp wj ub s7 pb nb qv ev o6 o7 yx
+\n	gr dc ft qs gm qd dn k6 lo k9 nb as zg bz lw ui ee g4 dl qv q9 lu jg rx w4 yj ep oo sv uq hq yw ao fc e3 ui dy du sk gc gy qs l7 kz ed ej wl un yu wm oc gq qk qc ks tk ti eq em ly vl er ry sy yo ro eo
+\n	lq d7 i4 7w y0 qt gw ch o6 eo
+\n	fr hb dc o0 yb hn gi jh sw kj we o1 vg nm q8 bz zk bf ml ev ed r8 iv ht fg th qv vz d3 ng xj 0h 42 ew vt yg qr qt ha qu hs qp ij yn eg of tl p8 fz oh iv jl ss dy zu or sk uj co kt rp wb wx fg ev t9 rj yp u5 us ys ak rw al io kc dt jr hl ln wl wz gy wy qv qb mu hd ky ku zp ww yw rl oh ee w4 yz
+\n	fu dg qf pg jg o1 dc by q4 st t3 lj ve jr am 2i rz ea lh pl ed pz y4 g8 i2 db g0 fj q9 qn bl en hr m8 qw rn qt yi ei yk qu xi uh fy yn ix uy gn jx f2 gr fi x2 zo pl vh ek sz u1 s7 ya em u5 da re f7 hl qh ju oz ar zb ci tk ob n7 vh og w1 ok er o5 ri ro tw rp it
+\n	gv ra fr ub h0 hm pf qj kk zf zh rj eq d7 oe eh ib oi gg i4 jd ph nu gc qw rr m3 vj ry is dk qi rm qy qu ep p3 ed pd ta s3 tc fd sa im ow jc oe qi j0 gt bm vm zf nj rg w7 x2 nr wf hi rp wk co t6 t7 e6 ag eb u3 e9 f4 om o2 dk h4 gq jo cr oz ka kx rn wn do ep wb vn ef rz ew yi r2 ro so ob
+\n	ft a4 qs pq iz pd u5 cs q3 qz ra rh w7 rk mv kv ee y1 to dj sj ta pn oi tf i2 th q0 vx vf ww 2l cb wt yq ku ye gs qe w4 qy qi xi tt es qp ed ef ti i7 tc pl jz ho zo qi za fy zy rk x2 r3 ht yv ex op ae iq u2 ag pb of dd h4 lq wx cy cu zy wm ry ef dj vx st ia ey te
+\n	rs al qd uq ga qj sw we pa bi ba e4 yy mo d6 er et ti rb py ek am ib fe y7 fh jv mn qe qr oe c0 l1 qi mh 44 xe ei ev hq ix e1 pg pj ui hp pm fr qs kd nk 1v wj fa wf yt t5 vp ex wx fh pn ug fc pq io gh dg oy nf v6 bt jo qz gu me wm n7 br tx mt q1 su eu di uz am if uc aj
+\n	da a6 q1 ph uv oj ji mp t5 mi rj cf jl w0 pk ew ii rv oe r9 ic id sl se su q9 vd we j3 ac d9 yw ew w3 y0 tk ao hr in e4 hu du qu jb wp cr qs v9 p5 vi xm kf s1 ea t2 wh y1 co iq yo au iy on ds fx yf qa zv qv f1 y8 wm u8 rc o3
+\n	iu r5 el dz rt m9 hb lc x2 zp aw uz
+\n	k0 px qe qr i2 yz qo ap t1 ou n4
+\n	qg q1 wr wt wu 5x ij rg lq eg ia r9 is dl aw g9 xx w2 qt au i7 us jc f2 ge qa gt l7 lb mc x3 3p tz u6 kx f8 fb ku ag hd oj o3 fn tw
+\n	ds rs k5 go qg ga qj gs by q3 xy q6 k5 4k o8 ws td mo w8 th ys eq pk yf r5 uo rb r9 td y8 tg ho qn gz li m0 oq kw qr g1 wy iv b7 vt qr qu ti to ta ut sa i0 pl oq sd ho qa gy qq l4 ks fu wg qg kj eh ez yu tf s7 os s9 ya em pq tc fv qg ve sx af ci ah qj bj df ry rl wm zy tv ol ey ox ri ie tq ir yc
+\n	ak ra yb ds gt fy qh d3 ql jk jl ni zs q5 zf lf so wo mu yt wa w8 kl ue e7 2d mb yn tu ac pv id pm sq sw jo dv jd jg qq qw qe wr j5 wu 1h b6 vr yf cx lz rn ho gh qi es ev ty p7 fx fs s5 pl sf lh sh i8 qa xs 1o kq zg qh wk fs vo wl ez iq uo tj u3 gs ii je jr hk ql xx 1j v8 nz kf vz ww yw yt w4 rb ol o4 rn ux ig sp gc
+\n	yv fr qa rd gm ps jd a8 qh ls vg q5 lg eh z0 vt mi vy rg lp ex ew d6 yg rv oe fs sz g6 sy ha cx qq wy j6 dk hr l1 qe gl ex ln uk sv ty at ru uc ts hi hl lg jv qi vc m0 fy xg qg eo hf mu mo kz ot np oy na el yy wz fh gp up ir e9 s9 f4 gf pw uh uj jr ab qh uc wl ce qz h8 v9 wv ie 37 eu gf yv 1m ma yw wm oh dk sr oc ei o8
+\n	qn cd zf y4 oi dv xq q0 lc av cw ki xd lx qi gn bh em uf we ja ox iw qb wn my zs y9 ux
+\n	qd qf we ls lf k4 eg bc e5 rl ea r4 oq er ip g2 yl ot iv ps gx qr wy xj vz xl bx 3o qr eu qi uj p7 uc ph in pk qt i4 gq wp v6 kw kd xk zw 11 yj wj rd oz th yo eb ya tl au tx qj wl dz wz cg zv qa rb wm 7a zs vj yw ee eo
+\n	jd go qg d2 ji qn wa bf t8 ys eq ui d6 ed yn r7 is qb q9 lp lz qe c0 wu tx wa te qp 64 uq in qt qy wp j0 lz l5 og ca sz un ec rh pb pw h2 kv aw wy qf 16 rw ew tb aj
+\n	a2 gr qs fu db qn q1 uc jr qk cn q6 b2 ne lg q7 q8 wi wp b1 ec rk yj pc fo iv sk gk jb qm zw m1 wx zt xy wy em 41 ee gh xg cn yv qp sn od ao pj fs ut s5 tb ad jc j9 xa uj ws kf wg vp nv fa wk mq x6 vh wv t4 ex iq 7r y6 sv ox ev eb rj rk em aj pq gh f8 th os sb mt ak q1 xr yw ti ee tb as ox o5 yo gx uc
+\n	qj lp z0 aj wp vr wa bb xt w9 ya on ew ym ia ix pt tw dz jo ae cc qe lc qr cn b3 c0 ib ml qi uj qp pf p8 e1 s3 tn ui sg pn i8 hb ij qw pd ld fo ap ty ro 3b r0 sz ie gp rj e9 fk gd pw rr uj cf qz zr rq 4p kp pr vj w5 iq ey rn ie eo ir pi
+\n	gr rs gy pw qd ga jj z3 kj ql nn bg dm zz uy pl e0 lh ef oe am y5 fd qx hi uw i4 q9 hs jb vd cx ni qw wx zt qr d0 wi 43 w3 cc b9 qa rw oa ev ry p4 en tk ti yq pd i5 og ic ye so tc de pj ff hl oe sj qs wf v9 xn gm wg xm 1f ph dr vg wk ns t6 um oa e8 sb t0 gs sm fx o1 de h1 uk qh zj zk ng ct gp nx xe 3z wm rz yk tn ro
+\n	qa pt k7 og kl wy rp hx wp wa ui mx eb 95 ac eg dj yz aq in ih i2 q0 cz cb dg xi cq jc qe qt es ed sb en iz fp ta fc tv tn gw ka i0 lz sd il qf 1s iz qf nc xj xk ep r7 rp gu t7 wc t0 en tl iy iu pw kn km ql ct qp ch fl wm n6 rw eo qm vx ty ee ru ig
+\n	um rf qd db qf od d1 mb u0 le xu wy q6 mt bc qw cm uu us r5 uf or tq ek sx i1 it la cb ax t0 wu ab 1t qq g6 ko g7 mk qr ey ha ea qp y0 en ue tv ho i6 i8 sp xs qf v9 jl kt rk qy ot 14 na ub aq op yo en tk ob on tx f0 qk jp vi iw tj x9 zi n6 wo wb se aa ag oc gx
+\n	iy ub gy pt pd qf me xp w7 rj tk r4 rx ui ii r7 us pb pt g5 fw gf dm wi w1 eu re tq oo es pd ri tl og s2 fx ap ok i4 di lh f2 1i vm cp bh wj wx of on tx dt h2 hl qk wq qz lr tl f3 ce kp yr yg ro yx
+\n	k6 qf cp la wp gv es pl uo eg am tf y7 i3 hd jk we d7 rl b8 gg ug es rt p5 eg em tz ow 3y eo wg t1 lc wk ol tj en ak fc f6 df gt ol qc rn tz wv rx di ov
+\n	pp qd iz qm vk jg r4 pl ym y7 sc qn jf qy rq p8 yr di qu hb wd rf ks gw qg s1 x7 ec ae iw eb ai sq v8 h8 le ea vh yw yp
+\n	ik a7 cp sq q1 lq ql wa qz lr zh rp ra gb w9 ys ui ym px up r9 pr ek qv qb hs bg wt ku pu dc p1 qo ik uk y9 y0 en hr tx ts pk jl ce lj l5 p6 v4 wk nu vg oy aq aw rg os az uj kc py ql oj qc pc fj jr bf cx es vn q4 y0 og w2 ue u8 is ag ie yc
+\n	rs dd ik k5 hm dg k7 go q1 qk wt q7 wi ws t6 k0 go ii ee io ym ey sl sz sw jg si d3 qq qw nh lp cc kw xt m3 ip ln nf zm qq tc ex ry at iz p7 ux of he og dq e1 i7 pj sp s4 ok qt gt sd xf ow qr pd hd wj qh x3 yb lx wx um e6 t8 s7 uo u2 it sw pm rr qg h3 aq ze h8 ks zb kb bh ec wb vb w2 oj af
+\n	ak ds dh jg cp ws q5 nq wy su q7 kb o7 ys sf et r9 ta sq y6 dn sy cx na j6 jc qi qw qe qr rb tn 3g eo uh tr ft ri uw of i5 ue ta fs s3 uy as ss qu ns lj wp zf wg sm x1 ix mc va mi rx ej yy y4 t7 ex u1 y6 u3 up en au ds ap kv qh kn gw k1 zv eu lu kh tx qk dr dh wm ti h5 o4 w6 yk af fq so aj
+\n	uv sa hb ps q4 as wi ej qm zc yd yn fp y3 td hy ue qw qy es tu uq tx e3 jz ud sv l6 fu xh dq wk wx yi dj qz v0 qd ga mp wm yy tn fn yx
+\n	qh qz ar qq ma kq rx qa st ei
+\n	dc df il he c1 jt qn yd yn pe et pn pi d7 ke g2 j6 rl sk ng z0 m8 mh qw j1 eu qu rr es ec uk ev ul pf e4 sg jv m9 qf vd wk gu rh e9 f3 on qv vj dh aa ru ux yx o8 a1
+\n	ra qs h0 qh bf q3 dv bl mr if ws df ev b2 pl om tz ax yk ta y7 aw dn zr ax qt m5 xx wp qy qi qo at ti p7 tv i0 fm qu sh so lk qp hb p5 xk ib vd hk t2 np ek yt um u1 ir sm yf ug az qj v5 wr fg zv af qv ck ay cs ww pq wn w1 yh as yk ei
+\n	tr yb df um qf iz k7 q3 we cb cj ne zg a2 e6 ya r3 ut on rq io ow qx ja qv cx cv bh vj qr lv pc 3a rm ep uk ed ev au p8 so fx p0 ts e4 fb hj qt dy px sf f1 zo vx qa wa sa qs vm wf xg kf fz r3 bu t1 tu ez t7 va e6 fl tz uf gg io qg qj h5 zz nh qz zt et ba lu tq vz xe bb md u7 oh 5k rv rt tb yu tn ah
+\n	gr da ty qj by we ls av kc qc wi wo xr mx cm yg oe xs pr ua pt dk oy hp qm qq zw vk xi ln he rx ko dz yt qe tv eu qi yz tt y9 ev ry ym ay uq pg oj aa s4 sg hp f1 qu wp qa bn vi os iz hw kt t2 rs wl r0 ez rf pv hs om dd f8 uj dj pt dk km k1 qz qx wc n3 nl wv qn zo vx ww dr yr oj r1 tq
+\n	ra jg jr ao c1 wh rj fp gz iy lo gc dh qw qr 8p eo ev fu tl i5 uy uu ui qp mb hk yt ou aq oi e9 ip dt k2 qx vb mf id
+\n	rd h0 qn ql la vg qz lw q8 ra sp ts pr av qc vs vg ku am z0 lo ry ev eh i8 aa pl dt du i4 zs w7 wj xl yg yh ra ex u4 pn lw gu pc on n9 n0 wm em tn
+\n	gb ik rd ql xi bd yr e3 qq w7 ex rz on ui yg ax fo pv ab ta jp qw xi wi qw qe fh mz eo gk qu uj ed ev en fo ux ye fv jv ws lx kr kf n5 qj ea s4 vh ez um tj ir od ga tk f5 dh uk pr pt in v9 js sv qb zn wb vl zj wm ca mu zs ef rl yw u8 er id uz ah
+\n	iy ij ub qs lo ql jk dv h0 wy cm q7 wu eh fq w8 hm w9 mv yd rz rx rv r9 eh pr ek dk el hi qc sy i4 qq lp jj we m2 g2 fo j5 wy m6 ve tx yg w3 rv rn rq qy hs tt y9 ry ym eh to e1 ur ff hk do wa kq jw p7 yp ky r2 wx oy uv ra yt t6 yy sz t7 wc s0 of ds om kx ng ql qz vj wt wb ly wm lw dh md ew w3 tv er as yu an gz si ro do
+\n	o9 k7 q2 dt 1i wa uu t8 ut mv ef uo g3 gj hp jn nt cm rj ms wi b6 im qu eo yc ex qp eg sf do sh i8 ih qa wa wf kd yo xj ql wf ek un wx t7 s8 rj f9 qh qk k1 lq h7 in nj um bu qv ov n7 bh bn 3z w1 yt et o4 gl
+\n	a2 gt rs ty rd rf qd qn jf qh k8 q1 qj ql d4 cg wt q5 z7 lr wf wu q7 sd yg yh g1 eg to el ih sw tf fg qx dv q0 wq qq uu px vl xi js jd ze la ud qy rr ky ft i5 em p8 p9 i8 hg im as jz tn qo ul wg 8d vs ap mq x6 no t3 ub wl tf iw rh ox ua pv ir us pb tx pw dg h1 uk ux cr sz ko wx jw vl rc tv af du ei
+\n	gm we cm jx lf vq vw kb wk e3 df r3 r4 ew yf ti id fe fr su xr sl jg rq rw uq tp ss qy ws od nv wg ro t7 ar th ak da yf sw io jt cq v9 kb iy u9
+\n	qd ga q1 h8 xt um wt nq wy wp a2 rg w7 hm cf tj ut r3 ch oe r8 pa qb jb zw mm wq pl m2 wr wy mh hi ei qy nw uf yv s1 fx ut sa tb ss hl qu qi zp nf zd ar l5 5h gm vo ix xk wk wf vf el r0 sx e6 uo rj f3 em dd uh qj cf wz n9 ga tc qk mu rt ye w4 o4 ad ag
+\n	qa jr kz c3 c6 vp e0 ng wu ug ty uk tu to hr sp ud m0 ar pa qf wf kr fi ya kk wl xs ed mp x6 ub gu fh rj e9 ya om wl vj ha ex y0 id
+\n	qm q2 oh cd q7 kk ld ys yd rv yk id wt qy iz ri fi i5 ic e1 ht 5z iq ha ai sq pn al gh un kt wq mi dr ax u8 u9 gk ru ov hc ep
+\n	iy sa un h9 rf fi he uc u6 cd q6 wu zl zz rk lf yd rx d7 ef er rb d9 r9 im hu zv ps qb jf qm m8 qq ji g2 kt qq ew la xy qo es ft ik tl ye ur as tb m9 i8 qa ka qs bm zg ix ya kl t1 wj r9 oi um aw yo ie ys yf hg gq nh zc sb nw qf xm bc xr bj es rx w3 yj iq tm di gx o7 pi aj sp
+\n	il qf pd k6 h0 na is q8 4p zl jl z5 hm ec io sf dk if gd qw 1a ld lf qr yx re tq y9 pd iz yw sa wp bn jq w6 v3 x2 br ta yi ha en o1 io ip pr kp nl lt kd eu kf kn n8 zs rx ux
+\n	ih db gm jd wr zj xp vp qb c8 pc g7 uf uz p7 sh or xh xm wh mt no fh dh wv tk li qm vb ms if
+\n	he ql wi bn c1 rc ip ia av or y8 mx yr dx ex gz 1p ic wf aj kn 51 bj wn o6
+\n	hb ty dv gu ps qj ls qz ch q8 zh xp bs vt rh oe ot pb y5 y6 fr ih sc q0 re zx lm id xp yy qr ry ay p6 he dq s4 ff qt sd vx jb qo qp gb ws wd sd co fp kg s1 nm rp cu 8l y2 tf ev sn au us fz hj qg wc u4 au qh wv bn eq r1
+\n	uw vr eq rx et rb fa ek id qx ui kr wn uf p4 tl au hw tx im sf yd dz bo wb xw
+\n	uv yb ik qd gm gp k8 qk ao z6 ps mw zf jc eg a1 wa 7c zz rh yi lf pl r7 yh d8 g2 r0 tq su cz pl qe qe wr wv ku ho qt yv uj ij es ec ik yn ym uw tl sm he p8 fa ho wo gy ws zf bw nb 5q ql t1 ro rp ej xg uv el l8 rd wz rg go rh sv fh ya it pn hd ao az tc dr ac dy ot sj nd qz ok um ol sx xb wb wi n8 ji rz yr sr h6 et o3 ru rm pi
+\n	rs fi ag c3 lw ys ef sg qu qi uq eh e4 gy qt ya ro hx oa f5 1j qa cl wq rl yh pu
+\n	ub rd qd fi jl zk oq r8 y1 tp sl i2 qn sd cq 6d mj w3 p6 ta fm bo nv qi wh yj e0 ao uh kn h6 r2
+\n	pa q1 fm c4 ig ex 2a yi mx ek ez dv jf qw qe 4s xt ld dh qq mg qr yc eh s4 hj yy s9 pv rr uj or qj cd wc ly x0 wv hh ye ew yh rb yk o5 tm
+\n	pp q3 mw rd up td j2 lv af ih hb ee xh yy ua ug aa tb
+\n	sa tr ds az qd fi dn hw qg dh qh nt z3 qz ad q7 q8 tf vu ue mx vp lg tz er yj to hy fr sw th qn hf gx jj pz wt lb cm m7 wi b7 vr lo yl qi ry ef sn uq ri fx oh i3 sd i4 ho vb wa qa ik uk ar hw l8 ya cw s4 wg r7 ot wk gu u1 fh th rk en sm u5 iy iu re pr hk qg kn gq cf h8 nj ct gp wb qg hj wm cy ok er tv u0 sy fq o6 gx eo sp ob
+\n	yv ak ra co wy zj e7 ew tl fo ek ez im q0 jm bj lc tc rm ec ou bn sd os x2 lh wj ot oi y6 e6 yp ob sq p0 js qh el bg rr rc xw pu
+\n	ih um k9 q4 ls jx ej om sf uh dz oi qx cl zm qw qr zc qe i2 i6 uu qp wp ws qd sd fj mx qk yn wj ub gu ar pn rr qg ln dl al vg mf w6
+\n	tr ub ds jd gp qk jk d4 kv xo ws gi yo sj sl el tw i3 ow qe zx nx b4 qq ee eu uf uh ex p2 rr ea ry ef eb y0 en ri eh e1 oh fx fv sj jn xf qd vi l7 wg x7 r9 uv ek yt ns aw sx sc vf tk ud ds o2 pr kv ab gt v6 un qz wr wv rb os ie u4 rm zm rw n8 vc za q3 zu yy o3 yi ag pu
+\n	ij a4 uj gg jy dt 1w rj a6 r3 ii pe r0 ej ta ts ff i2 ho ov wq kw qt ot m7 qq xv ei lv kr yx yb ri fa ur de pj hi si jq wg r4 x5 hj oy 5i u3 tx tc nd v6 oz wc qv bz qb qj zl dg ed ka vh w3 yt ey w6
+\n	o9 ft az ps hq uq a8 ql we wg z8 ye wk bf rs wa c6 dd ys rl wy om pe ix y3 g4 dz gf se tg pa va jn jj al qw sf ma j5 qy wu xo dc rn se eu xb nw qu qi p4 ef ru sm eh im ad gm jv pm zd g0 wg qf ai qz ym qc t8 op iw ox ay tc av k1 ko vj qb zo wq bg q2 n0 rl yt as rn uz
+\n	o0 jq qf he qh 7k q7 kb wp z5 tl ew yg et or ez jp g9 jv gk lx vk vw qa qo ou qg kk xz rx ro wc oa us ip x0 ku hp jr o3
+\n	pp dc gi fi qf ql by we la za un qz q4 jc zh wp kg o9 qm bm wt r6 rw eg ix yl tp am a0 aw i2 fh th xq gc eq xx yr qt xt nw qu ri uq tl ue pj p0 hk vx uf jm kq ws jl 1s p6 ca he x2 wk wd r5 wg bi hk ro wj t5 sx fh sv e9 ya aj e0 pn ao ug ac kn h4 gq nj wr cu qs kf vx xw k1 og yt u0 yk di gx dp
+\n	ij tt ss dv a6 uz gp qk cv lq ql un kz gj wt 4y fq lh z0 6h w8 vp r5 ee tu sg pv y4 pu a0 tg q9 gx qq qw we la wx rr ls zy qu wi xz wi xp ew qe rn ei qo uj rt fy ik tr tk sn pf i5 tc sp s4 in gv i0 f1 si ks nl kw bq co mu eh oi ec sc wc u3 ga fk sm om kb wx bo zj hv y0 en og q6 er tv tb rb u0 w6 tm
+\n	rd ik og q3 q5 cn xp c4 ig mi e0 rc ym id tq ou po gg qb sy ob hf pk xr qr up j6 ng xx b0 qt tm eo vw ux yw pg tc e4 gy p4 xv pd wg n5 r3 wk iv rl ht oy uv ub wc ar t9 ga s0 em pw x0 pt bw wm vv vm yg fn ad af do
+\n	hb gg kl q5 t1 mi a4 b9 r4 ee up pr g8 gl q0 cc kr c9 vq yy wa qy mz ty yn yq ai og tx tn nd ws 1d ky x3 sz td gu t8 op gs tz de av sk cy zm be wv qk og uc
+\n	ph qj d2 cd q3 q4 bi wp vt oq y1 ps cw kn gz ij p4 sp e4 wa sx nj v1 w7 me s7 e9 tc k1 lw zc vj wb kb tw a1 aj
+\n	rd a5 hq qg qh q1 la cd kl mp k8 mj vy zz yu ut uo sg yz hi gk sy q0 m1 qw b5 wi dz qw rc aw eu zr uk ti em yr lk kw nz wg fx tt wg x7 rr lm ju th tt eq oc o6 yx ro o8 a1
+\n	a2 dm wy ej rh rg pe a9 oi y7 zt vk ga yf pp fh ml tj p5 sn tk im jv v6 lb pf zq ty wh t5 go sv e8 it f7 ac p9 cu bw kg qk f7 w2 ee w5 tq ep
+\n	vs rg rj 70 ys nq uf ex hh jn kg ep e0
+\n	df q3 u9 4j bn rj hw up td i1 dc hi zb wv g3 l1 rz qt qy ty tj ef eg sm tx ap in px af mx r3 r6 t2 t4 rd uo e0 iy ii hh qg zc v8 qc ch px zy zi ye og er tm if
+\n	gr pq se pp qe lq n1 cy qb wb ey
+\n	gn q1 ji sc nh pe yh qt ss rw hf kx zm o6 gx
+\n	ih hq ap bl wi wa 3y er pc eh r0 yl ta ts dl gg fg i3 hp kw lc ls rl ff wg qi uh uk yq yw ok as wp gc jm qf to yy fh e9 pn qk sz nm li q1 vb yq 2e rl tv sy di sp
+\n	o0 yb rf k6 qm fv q5 wi rp fe dd mz rz ee oe ia yz am ig hp fj su gl li we m2 ls xj md z0 uh yx eb eh ur i8 qy oe i5 jv ce jb jm lx ci kg oy hx e5 u2 tj kv qh qo af pv tz az vg yz ri ge
+\n	il z2 d2 cs ba wa 1o ys uy ed er d8 sh qx sr qb jd ov xq nu lv g1 ku pu rp qq ee et rm eu xh i5 p8 tx in i3 bn v3 ap r5 oy sl oo dr dg hj lm sk ff vu cu wb kd zi wv mu w3 yt ok rv ol ey yx ah
+\n	hv qs qf qm ph o2 zg wa a2 rl pz ow uo y2 ey ix us d0 ek fg ww j4 wv a7 wu qq bv te tr uj tp ue ts do qo cy uk j5 ra ou aq iq ev tj u5 tx gg df dg h4 qj nc wz v7 im kv jt y8 rz w2 yy ei ge
+\n	gt df jg og k0 lq kz zf iw kh gv cn ur ea eq yj ix id ez dc qc st wq c0 lm fa lj qq mj sw qe xb rq qo yn ru at e1 p9 s2 ts i8 s5 i3 sf jc xa hb qq gy wd p5 ow qf wj 1n wd qz yt ex e5 op at sm ud tz yf tc ax f7 dg qg ve sl qv tl wn 2h ky yv f8 rt o8
+\n	yv dh kj jl wr bi kc 4j nt c5 lo z3 e8 on or g3 g8 uq sr qm hd ll c0 nh ws qu ug ph tc dy oq qo nj wn t7 ox zj qj km h6 ql zz qz qc hn bk fw ob
+\n	un qs fu k7 co je gp o1 bg dt vu rj mc rz rx r6 g3 ek qc uw fj li qw lx ku z9 br b6 mz yc ty tl yw yr e4 i3 ud ce i9 rf bq xh ep wf ej rp vu wl u1 os ay of pm ap gg dt hk ab ql lq qs lt nl u3 wq n7 bm ef xm yh w6 ru fq tw
+\n	qn ql zj rg ed hs we qw re p7 p8 yr tv pc lh gx i8 wp lz cp fv lq 1b di
+\n	rs q0 is q0 yq rl qq vr qa v3 tu in h7 zy u9 o7
+\n	ak pw af z0 wa jh tf to ey r0 ta fe tf th wt m5 xu wu xo l1 b7 bv se w4 qi es dy ge vm l8 nv kh l0 j9 bi ez iw ux f0 gt zc 6w bf cx u8 w6 yo o6 fw
+\n	gb py gp pg ql um lf bx 6q ra w7 vu rj ui pj tl ii y1 r8 ac eg yl sj tp y3 py im tg zv ll ip wt av fq qw dc yu ei uf qu tw y9 em tl dq fx hk oq zu jx hb i9 bq iz mv wd qi pz lx ek aw fg ag u4 ir tk of pb az f7 qk wz le qs wy wn dd bj mp yq zb cj rc tm yo
+\n	o0 pa rd qf dn qg nm ji q6 cm wp ec uu ax r8 us aq se lt g1 bl vz jc mj 6h ul en yw e1 ye tc i0 do ge gn v2 r1 7f ed x8 rf oo t8 s9 u5 pb fc ug ab pt uc ce qz h8 u3 ga fl bc yq iq iw id o6 r2 te
+\n	da qf qn nm wr jw c2 ig rj vi ys pl ed ii ax y1 ua r9 ia ab tq an ek dl sl jo g8 qv gl hs jf d5 c7 kt ix wy wi lm qq dz ko qe ff pp qt eu wd yx ec p3 rt ty ik p6 pg i6 e3 sa fd dr gb jl as hz qo j9 j0 qs qd wf p7 br wd x5 hh t2 wl el rf tg ar rj tk em ud pn rw av iq nl qv x8 ov wq wb ec vm y0 w2 ew 5k w6 fw a1
+\n	a4 a5 z1 hr qk q3 mq zf qc wu q8 bd a3 xf es yn rc et d8 pr or yl fa se dv dn uy vz wu en mb qa tj uq i6 pl du jx f1 xs qs qd vm kd wh kh mv ed rp ra co tg oa u2 ie ha ir da pr cq uv oy qb qb eo ye rz rc ei o6 id if do yc
+\n	a3 qs w0 po gx xo nh uj e1 lz os wj uv ud tx rr gq ve ch cs xz
+\n	rs rd qs qd hw dh q1 ql dy mj zz ws vy pj ea mv yf om uf sg up ix pb ab ej tq fr tg i3 nq dn gc wx wc qr wr lv t0 cm wy wu ko qe qr ze ug oa ed ym p5 os uq i5 tp pg s1 ok tb fb vx ns p1 wa qs ka qd lx ps sf zy kj pl ro rs rd wz tf ev gp e8 u3 ir od f5 dh qj cw qk h6 ql ad qb fj tl al zs h2 rl eq rx er w5 eu yz id pu hc te
+\n	pa pw q0 j4 4f vq iv yu ry fa e4 kw xm wj t3 ff ye w1 oj rv ul ep
+\n	mw di ec wt rx ko i4 qo l3 iq iw py yl
+\n	dx uv yv qa a3 ij ps qh cg qc 2n mc ut eq rz ea kc pz sj dl in db fk su qm qe m2 we 1q ke bn xy wb yq qq vr qw xc gf tn re oo qo p8 iv e2 tc e3 e4 fv ff pl sd qy qi si pm ws aa zw bu hu fn yj pv hs gh o2 dy ln v5 qv zb tk bq 4p qj zz wv 8n h1 y9 wm yw og mf u7 tq ov sp
+\n	iy wt gx nd t5 r0 yl tg dc qc th wt ld nd zn tc ke qu qo qp tk fa hh gn qp 5d qd ar rg oz fh at ag 2a kd nx w2 w5
+\n	il wp ee ym tu ef dl el qb cl qn ob qe qr m6 mf xq i2 ud fn pc gw m9 l7 fs eh gi e7 fk ys pe ok 30 mf o8 uc
+\n	db k5 a7 je kj q3 we wt q6 ie ck kg kn gr lf pj io us id in aq jo qx su hd qm li qq jm we lc wc ld d8 lb xj em rn j4 tq oo eg fl sm he ue so hg ok dt qt px j7 qi nz l9 lj x8 wj na wk ez ex rg e7 u5 h4 kn ad cu oa qd do q4 eq w3 yy sy su r1 ri if yc uc
+\n	fr ij ft db dn gp qh ph ga gg kl ws wt ab q8 lk wp mi w9 tj pk yf ew us yz id gd y7 dc qx hp qv gl jn q0 d4 qw re qe cn cq pt wu lm dk cz yy qr rq te qi rr ea ex ye dq ok qt sg qa nk wh kt bt bd lh wf yb hu mw el rd rg sb em on qg wq oj zx wv n4 bo qf bf re wb ev yq cl yu w5 ad ag id a1 gc
+\n	qd ga dt ej kn r5 ax sg ix av am pu g5 ez fe qm nu ii zt wr vm qt jd im rb ml yx yv ru hr gv ad dw x4 ub hx wz rd ol oo rg yf f6 ii uk dl wl yw yu ie id
+\n	yv ga z3 kk pp nq le lr bp qc t1 c2 hc vt lw jl w9 ur r3 ys iu es rc ud yj r9 pb ot ta sk gj jm gx xg sf lc qr ht ve sl g7 qy nw vw fo ta tb oq fn qu hc qp op nz ow wk zo zq yg wg ke yt kr yy sb tk rk tz iu o1 rr pr qh dl dz p0 n2 ci cd vn ms aa yh ry w6 af du gc
+\n	q1 q2 mw bz k6 xf ec r4 rx yg ed d8 pv is sj qc q9 zw vf gc cv d0 xx rn ex uj ij ts ff ge i8 zg 4m x5 vh oy yy y5 wc tg at fk ob fv f9 ql bo k4 zn be ww ea ry tv w4 ru ov
+\n	tu g2 tq od pk tm fi y1 uf ku wn ew
+\n	hn rd um qg qh ph aa zn bc gv w8 rj ea es ui r7 r8 ey fw gh jf qn nu cc la 3u bx ve po et ei eo ea qp ul i7 uu fb dt pz qt m0 zf l8 kl t1 ej wj oy rf th rk gs sm em ap hg o2 ub wx ka hd br q2 hg y8 2e eq tb an oc it ep
+\n	tt um gi qh lp kl lw q4 q6 ro b1 if y6 qc th g0 q9 qm j2 we xt xi nd is ng bc ku yw sm ye dw e2 f1 lg qo wp zs gy l4 ul lv w9 br xl ql vf as yg y3 t5 wc ec iy hf ii f6 re hk qz jp oo qx xv v0 f2 vx cd vb yq ew zu yx
+\n	lo dt mt z3 rg av us pa xq wq qe qt yx y9 ev ry tk hu oe oi r1 x7 wk wz td jy ww qc 15 ba hd mo 72
+\n	rs wi vt rh we jl ur tz tw ht y8 fh i3 qb qm b3 qy ep op yn tu ay hw fd ug qp qd x7 rs yy td u1 t9 sm uh dz ql 4t rw kn wn rc eo
+\n	a4 d3 kk q5 q6 wf wg m4 2b vt w7 ur uo rw pc g2 sl if y8 fj va rr ld wn xo qw rn ml la qu ep re rr qo pd eg og e1 i8 ui qt px i4 jc gq oe jj ws ks qd ul zh sm ql tf go e8 os tk rk ay us u6 dw dh pr qh qj oy lm jo cf ff wm br k1 en og aa rb yj o4 te
+\n	gb dd rd qd a6 qj wt jx z7 xi q7 kv mv uy pk or yk ek el y5 ez aq dx qx th sy jn pe vl fp xz m8 ng jh kq qr la ei ft p9 oh hj tn ho ud xs wa jq vn il zg p7 fp ic qk wd bu e7 go hd sq ug hh ip sl ch qc px wb hs rq qh bk rl ef yw dj yt u9 st yi uz uc a1
+\n	al tt pq um uq un z6 wa vu w8 ed sj r0 tq pu dz qx js 2j na ip vz lm qq qe yj ud ei wf qi te p1 tu il tk iv dy i0 xg sf ix gp fk ai qk lm ql ch fg qv vg yw rl yy rv rm pu uc
+\n	rd ik qd jd ph gs k0 q3 qz ia q6 af q7 6w o8 tg gi sj ou aq po ja qn q0 qq gc nh xt wr fs m8 qw aq wp ho qu rm uh tr qp tj ay fi ao i8 aa i9 tv gv qu wo lj vv wa jm qa qd uk nl g0 qd dn gw ic kj nn wf wg dy ej rp y3 rs yy e6 wc oz fh eb e0 of hd yf uf ab gw qc ww yc cd ji y7 n0 wn cg u0 rn yp ie a1 dp o8
+\n	ih h9 qd xy yl ez g9 lt qm on vg rz dx qa kt p1 ex yx od uz e3 in sd oi qa cq dr me e8 ua ya dk wx bw 4p vx tn o7 pu
+\n	ij rf fu jt gs ld wu q7 wo 2u bd k8 rg ws gi oe yl if sq hi dn jn qw bb cb wt lm sq vr qe wd qi qo tk uc hp i0 pa w6 fo v4 1m x3 t7 u5 sq ai hg ap hm ju fl tz wv w4 ry tn yl fm gl ox
+\n	ql db ch wu rl ih qc 25 pb qq ty yw fp ao qy sp p1 qa rf iu rw qg uk gq km dz wv at qb jo eq ur rb ad
+\n	ra fy gm iz qk qz lf bp kc is nr ws mb es tl d6 up pe ey sj fq ek iv pn sx ly qb jd jn q0 lp m2 xl fs xx rs b8 hu rn ey qo yn vr yq ti ai e1 so ts jz du do oi sa i0 oq ow 3r 1a wg qg r4 yv ty r8 wk wl s7 u4 of e0 gd pm yf h1 qg n1 lt sv qb eu wi mt ez w2 yk su dp
+\n	rd qf dz aa bo pd pm qw rn tf ah wu
+\n	dv jd he jt ao ql zg eq pz oe dj fw sc fj nt io fi lr xu ns mx qe qt ei rq qy yw em e1 i8 sp in jv wo ci fa x6 fn ej wv oi um yi oc au yf mt te az yv yi ad yo yz
+\n	uv hv ty qd nv jh qj q1 ql we fv vj q7 gw fe wl vu w8 vp 6k yd r7 yj ia ey ot g6 dx tf im hu ae qx fh g9 lt fk hs su ov lo m1 cn t9 wi ki qq qw xx aw nw es yb vw yn ry pd ix em so ut oj du f2 lj qp jm w5 xh ny wg 13 wc qc ek el sx oo th uo yo at pv hn uh hj qj zk ql lw zx qv cc wv en yr w3 yy st uy iq ox an ah
+\n	rs pa df il iz qm k9 bu jz bi ji du lo ts yy xf cv gu mc ii rc up d8 ey pv av to yz y5 fd qx sc qv jv qr xt bk m6 ot md qq qt rq ex p2 yn sb xc fp pj qt ce wp i8 j0 wa qd gn ps qf be qt wh ky l9 za wg rp wn fh rh em vn dh vw ng wz k2 h8 f1 nz zh yz q5 zy e1 yh ad tw ep te
+\n	db wr a1 pk ew uu r7 d0 pn fe g8 la qq b0 ef os oh pk fm wa wk yi ev ua sq wu n5 tw xc er
+\n	fr yb qa hm d2 q2 o1 oj ox dm oc km kj r5 px rb et r9 y7 vs pj q0 4s lm gs qe eu ep ti tl of jq od pf nr nb ea ej yy rh u2 iu qh dk zl qv xe 2k vc vb zb xn yg gk ox tw
+\n	hb dc rd fu gu zd js wu xa c5 a5 w9 vo r5 d0 g3 oy ib i3 ha jm nu rr wy m8 b9 ws qu ru eg uz hw eh hg sp sf do jb zp dp nz wj wv fg ae ah ob hd dd gh dz qz xc s5 vi je n4 re bh ma wm as st tn yl
+\n	wi w7 om ug qa x4 yn r7 gi re n3 n7
+\n	ij pa qd qg uw qm d4 z4 q8 t3 mu yp uf ia pm ez ih qn jm nu kw qr j6 qw bb yu qs rw wf re qi ru jz tm gw lh ce xa wa xs bn nl ys t1 wk r9 gu oc u4 hd ku hp yg rv as yz ro dp
+\n	qa ss dc gu qk cs cv fv nm z7 lf z8 xs a3 rk r5 ys eg y1 po qv cl jf xq vh we wr qr b3 bv yr wf re qo sv tj ti eg dq ic fx jz du qp vb ws nl wd wj zq vg t2 zf wb tf yu ex yi yp tj en ua ud dr pe qk dl lq qz h7 ol v8 cy vi wv ck el gd q2 yw w1 ye xq w5 gk o6 ob
+\n	k5 hr jk ju k3 jq q6 zg wi id bb wa gb rf rq g1 et ot pn ht dc ww c7 we c8 cm xo mg w1 1l yx tr p2 oo lm ry ao e2 i9 e4 hi tn di lv cp ca 2u t2 no ub ex rk ys pw qg av py ql qo lb pn eo wb er tb yk ie id r2 tw o8
+\n	ra qa qd ph jh d2 dx d4 2z jl q5 ld cm wu wi 2t wa dd lg ui to id in uq ww rr g2 wu rl qe 1l qi qo ec yn ed uw p8 ut sj ig p4 zh xm p8 vs vg x7 ot cu l6 sx gu yp t0 gs az pe nf wl qz nj lr cy wr qv tj s7 u2 ly be br ym w2 af ri it ob
+\n	pp uv nb bu kz wi ah z3 c6 rg la vi oe ia ot pm dv gk 2h xq kq xg bv qr b9 j2 ec od ay p8 qi wp zd ay kg ea mq 6b qc un fh tl u5 av ub ji zx k2 wc zy 1x kc ah rw vc wv yq zv e2 rp
+\n	a2 iy sa ft pp un qn qz ol lf mg wo fr vu ya rk w0 pj pl el dz i3 jd su ob c8 pb id b9 ep yn ru tk s3 sh sj xa l3 wa nj ke kr ic xl bd ej rg yo f3 al f5 sw re uh h2 av cq bo vk kf bd mu wq wm ew ue tv ol tb o3 ul ov
+\n	iy a5 gu q2 se ls dt zf o4 dm ez jj uu ik ue w0 ya ea on ui tu rv y1 et r9 tq y5 ht dc fg i2 vs q0 av iv ku in il en ri p7 uc e2 ut sp fv qt gn f2 wo qa op v7 ws l6 wh ys zq t2 wc y3 sx yi t9 t0 ys of rq ug o2 av kn h5 ju ji ko v0 nz wn kf te dw u8 yt fn r1 ie yc it
+\n	qj lw ji eq oe g7 jf jc yr qo v7 p7 wd ma xg wz qb u7 w3
+\n	un ol eh g5 px b8 rr og gn mx yf wv sl on jo uz
+\n	qg qm q5 wy eg ri bm mz d5 rx pt ek fs pi td ez ho gh q0 ll pl kq wr d0 l1 qq ko er qt wf ei p2 ru uq ye tx s4 hc zd vn ps ix zo wk t4 y3 xh ez rf u3 up ys ou xx zv qa wb at rm eu qj wv za zs eq zy rv ry tn tq yc ob
+\n	ss qa pp rd jf a7 lp h8 um kc q7 wl rg r3 w0 wy tl a0 ih ly qm qq m1 xg qr up ja b8 yh dc lx rw ep ea ev ay ux to p7 tp tb i3 qu gq do gr za l8 rj og oy ub e5 ae tg t0 sq tx hj ad gs it vc bh yb eb w2 yg u9 w5 fn iw si di ah hc
+\n	ub o0 ik ps qd q1 ga lp cf kl m3 z7 q8 ue ee ud ix g5 ib gd aq fh th pa qc pg ue ur xw ww qr vj m5 jd ng in tx ff xc er qs eo qi p2 ky pd eg e1 yr ut ib oj tb hi hk ho gm qu qi hc ou gn wg sn wh ix wj wj wg ot ra wl un e5 rg s7 t0 oc sm tz hf fx pw x0 wz th qv 1z zt n4 qb cl wn xq xr y8 rt y9 rz tb iw vb
+\n	qn lq bu eg iw wi 2u 3q t6 k0 yd sd ed rb eh ek yz if pu y6 in fr qc qm ob il ma b4 en wu dk nh b8 qe bb mj ws qt ho yl ug qi ea tw uh p5 eg tl yr i9 pl lh ce i7 wp qa xs dn 7p kr p7 eo vs mb pk ni yh ef rp wj ej y2 iq y6 u5 em e0 ii md jy lw nj fh bq pc xm km q2 wv k1 rx u7 ut et gj tb iw gx fw yx
+\n	qa pw k6 qn qg qh as u0 dy q7 wp hv 4z 4c w0 d7 et aw wr bl mx md j6 an wi qt lc yx ec tj ri fx ht in gm ua qo qa ik ys eq n7 wh rs wz wx e7 eb ak gg ip sj py ka rl su ag
+\n	gb uz q2 qz wr q4 z7 ia ad je am my vi zc mx ym r7 yk ua pt g6 hy y7 sx ih qx pa hp jd sy gk nh no qq yg rc 3s qy ep p2 yb oa tr eb p5 en ic yr dw tc in hk qt zp i8 lz ks ci lg x3 wd xa x5 zf yt y5 op u1 oa iw fh oc rk ay pb pw uh qg zj qh h5 nf cd nv qx kp qs qb 6q cl kh xe u7 ew tv sr as rt o4 ey tn is
+\n	hv qj bo ru z9 t3 lj q9 rg vi rj sd r8 g2 sj yl aq fe po pa qv jf dm qq re we la wt wu qq vt gj ei yz rr xk uk pf so pk im zu ua sg j8 sk zd sd xz zw kl wk ol um yi rh sv u5 pb tz dl oi wz h7 s8 qf wn cx f4 mo wb ed oh ee er ry eu ei oc fw
+\n	hn a7 cv q6 cj q8 fs jv rl qq qi od dt l5 co qr zq ex u2 ah on pr wx kp wb yh gx
+\n	gv qg je zg jc q8 fr r6 yn ii g1 pe sj ta el jo sr jv ni jj zr bj ns qr qi ur hz vu wh cs ep s3 hu ez rh u2 t0 dw uj oi wx n5 18 bf wb yq oh ov
+\n	gb dc um jr mn we bl t6 vi pj c4 d7 rb ia yz tf qn dm ke xb ft au ix tv xd qq xg rx x6 vg r8 wz op h3 qj qx lr xv qc kc wp lq ea rn rm ri eo yx
+\n	ra gt qs dv ik gn co qg qm qj cb qz z6 wt ji q6 dy qc b4 ws ds vu cf on yg d8 eh py hu tg qc hp qn d3 wq c9 pv pr or qq ml eo ug tw es il os fi uw to em ic oj ho px wo qp m0 qa 1o ks 7o cp wh wk wg x5 ee yn bi ef wj ns r0 ez um u1 iw eb ir fk ov s0 fl hn h1 pr x0 ux cd wz aq jp im k4 qv bp wm n0 vm u7 w4 gj tm uz te a1
+\n	gv il ps db he nb wr ql kc zh tf mp lw ab us pn a0 tg pa th ps hf wc 1a yw l1 fs eq wp qr rw yv tr eh so i0 qf wf l7 wg na ou ah ay f4 io ip f8 cd h7 nj rn wb qb qn wp oj w3 w6 di id pu eo
+\n	hm fu pd qk bi wf q6 wu b2 q7 q8 oc lj c3 o7 6s a1 jh rg rj 2s z7 ya id ez fr gh vl cl zq hd jh xh ru c0 bz wu dl qw km kp b9 rn eu yc yc p4 ru tk ux fo ue p9 iv tv s5 do l4 cu rg w6 os fi 4b uz l7 ld l8 fx jb ee wx rp ek tg e8 uf de qh hz h4 qj gq nb wx qc sv go wm zi zo tc 3k ez ec rz ye oh ck w2 sy ia gk rm ei si dp
+\n	gi go z5 qz wj mg kl yh g5 y6 g9 xt p6 eh ap sa qu dw j8 ql yg aw t7 ir zj v5 v7 ba tw yq cz gc
+\n	ps qn z3 sw gs q4 ie gx ye wz r3 us ef d9 pb y6 tg y8 qb gc ww az c8 cb lv wy a9 qq qw l2 c8 qu uf yx qo ic de ut e4 uu tb fn oe dp wa uj bq sg mx lv v3 ya xk wd by n7 ra cp gu va yo u2 sv rk ir ya hf kc kp bo qb gp qb yc ku q3 dj o3 ey ad si o7 tw ge uc
+\n	dx yv ij pw a8 qm ph k9 dz q1 q3 cn wo wp my el bb uo on eh id yz am fe hy sw ha m8 vg wt vl wm qq w3 ls gj yx eo ef en ta e3 i3 zu hl m0 wd co zy l9 nn ea yj e5 rg gi fg gp u4 ir tl tz pm dd kc p9 zx sx qc qv kf ln on qm lw vn vm ew yg se as is di ro gc
+\n	al tt gu qf qj xo q8 c4 ws e5 ur vp ea rz g3 fw sx th db kq wt sv tb ad hv 1u gt ss xk wj qj pk rp e7 ha fk f6 dr rr hk dk nf qo lr ka ie fk cz yz q3 ym ks gl
+\n	gb q1 qk we q3 q4 t1 ox di ny wa ws gi ea rx yg r6 io ow y1 d8 ey ab g3 is ek pu ez dx qx th i3 jv fk io xh wt oe kr nd md pb vz wi ro se b9 tr yb p4 i5 p7 ux fp p8 sp in ok hj qy hz wa qq zd qd 3t wj aa dy 5u el yi uo go t0 u5 tl dq gd rw uf gg kb ux dj qj go wb zm lu tx vc es ev ry zt w2 tp w5 tn o6
+\n	ra ps hm qf qg 4q we ql q4 z6 d1 wp vt xs tg 2s e7 r3 ys oq ef c4 av dj pn aw sr th hf gx uy wr ac zv m6 wn ko c5 qt qy yl yc uh od ri uq fz dq i7 tx fc aa uu qt oe i5 ge ce wa gb vn xg wh og ya xk fs ea yf zw wh ub 8x th iw rj ah ya e9 tl yd tx yf ii fc kx hl zj or qj mh ww kf zm lb ob qn wp ww wn ym u7 rv ie pu
+\n	uj by wo ml dl qx m3 8i 2y r1 u4 hj h6 qa xv rn rm
+\n	qa gm qh ql u9 ls e3 yk fa ts wr vj ac en id ud ke ye i7 fn tn f1 ks at me l8 kl hk lx rp ek l6 ek oi e6 wc u4 2h pn 9y zq qk ec cf yq oj vz tb o4 iw ox gx te
+\n	gt ub hn qd qf hq dh q1 lp qk by ql lq we wr sy wy lh z0 ge k9 w8 th vp pz yg ti fo tp r0 g4 yz ig sx im i1 jv qn q0 wq nu 5t pw wm id qe gg qt xg wh en uc tz pj e4 tv i0 ff qt gm dp jb qp cr gr qa nk ws os wf ne wd mm wf t1 vu wz t8 e7 t0 od hs dq df av km v5 kl we fg cx al ax yq y9 rx yh ul hc
+\n	we cf q4 cj bf ws ww yd tk ef ek y8 qv fk wt ko qe ep rt ik ut op mr j0 ej t3 s8 ir pt qk km ww cg wc gi lu n6 yr rc oc
+\n	ak ft gy rd hn a6 uq q2 q4 lr ia eg d1 eb on sj dj pn pp qv i4 hs gx ww xj m8 ko im rt fi tc uy tb pl qy pc uf kf kt mv l0 qj x7 oi um tf ap uk wl ql zb vj wv tk re y7 de q4 rc ad rm ul is fq yx r2
+\n	dx gb he dl k9 z3 qk lf ad ch js o5 vq zl rj wr th r4 tu uo r8 fp ic g4 fs g6 im fr wq bg no wt dg ru ln rp wi yd qq xz ew i1 kq qt rq wg sb pj hk qu vx oi jm pa vi x5 wf ni ro ot oy di un y6 yo rh sb us tz ac f8 av ve h5 ji mj n2 ci rm yx ep rt 5f yq u9 rb hx aj
+\n	ih a3 pi mt do w7 zc nh qe wv rs xc qr ts ut pj im hp xa lv x3 ph tt sc od rr qh km oc rq xl vv jp ef st tw
+\n	ft ik a7 lp jz jx k4 hz wo bv q9 6t ur rl qx qv js dm fw wd re ea fd hu jc qu zo p3 lx pf wk vf fj 2o wx sb gs it ol yp di eo ro
+\n	tr ih yv h9 k5 qj qk nb wy gk q8 c6 mj a5 yi ur rl uy eq up yj r8 xs sh a0 ez oi y8 ly lp lx fu il ke zy cj sk xq 7u ey p2 uh yv qp rt y9 eg pf so ph tx tc uy e4 tn j0 gy ik vm ul mt nm mm x6 wj rp eh sb u4 ov of tc jt pt qj jy k1 s5 qs 7z do zi cx wq wb ma wm uw sr w5 o3 o5 su r1 yx fe
+\n	h9 gm cp z2 fb zd gk ve o7 mt bc wp bd rg w8 rk kx mv uu rb or yk eh r0 y5 ht pu tf se ar fj hp su m2 cb c9 c0 b3 ns qq qw rv gg ij y9 oa od of pg i7 hk do pm 2n sj wa vm zw vg yy om qx nj v9 f3 ee w5 w6 iw sp ep
+\n	da jq iz z1 ls z5 cg nt zk 1i gt w7 yi r3 xi yn pc fa ta ez in i2 qc uw si qw d5 kw il b4 fa ib 6c ud rq yl wg tr qp p4 ry sm ut s5 hi qi do j7 jn j0 qs iz p7 wg aq ex go ax ku nc h8 n3 v0 oc ah wm li zp rl h5 is eu o6
+\n	gr sa a4 ik dm gp q1 wy m5 fw a2 t6 rj mx e9 et ej q0 ot wu em fa mj qe yg gh j2 te tj p5 eg tk em ao i7 di lh ce m9 wa wf ys eq l1 t3 ej el tf t9 rk u4 ay rw gg dr hj ac qg zk h6 dz ok zy kc mr fz iu hk yj oz ey ag id r2 ov
+\n	ds fu ps vo qf qn pf a8 ph q4 cb le cn h0 jg gy b9 rk r3 pj yd oe ht pu ig ez hu q0 qm nu ww qw ow xh b4 is a0 qq hu bb cn xh oo qo y0 fz ue e2 yr fa pj in sa hj ui sp nj zg wj ge wk xg ra ex vs oz eb pv tl iu x0 ln cq xx iq s7 wv qs zn tl wn lr yr r2
+\n	az qf fi qn u5 we jq zh wh c4 sd is y5 po oq ki sz qe rm qy yv p4 ye tb ho 1u gq r3 pl td ov u4 hg ax zj wz wb vl vv se 5k eo
+\n	tt gi pd jk lq q6 wi gx mj ut ax av g7 qv zm lo 5y dh cw xo ve vy xg yv iv i0 qq xg jv l2 yi sc ga pv pn iu ug gy k3 cl oj tv yl di
+\n	qk se pd gt rz uu d6 io d7 tq gf em ym tu ib oe v3 si wa nm wf qf wg rk kz yd hl wx cy bp mx et
+\n	uv yb dd k9 ph q4 me o6 nr xa mu ld r5 rb g2 or fe pa fj hp db lu qn nr j2 bk kt xl rn wf qp tl uc dq i7 tx fv ar sf xm mx x1 zw yh lz mr t6 l9 s8 ah u6 x7 yw ol tq eo gc pi
+\n	ia ys jh wy sb i0 cp u3 ql kl kh
+\n	po al qg qm d2 gs q2 ap qz q4 q7 kv ah o8 rs 2o ex zx qw z5 r4 r8 y1 is ts y8 qc dm ll we wr sg lb jx wu jv qe ee qt qy es ed ym hw to tx hr s2 oh dt dy af di do qo oo qa w5 uz wh kh x1 t1 hk no r7 rp na sl ej op ev tj eb sb ya pb u5 tx ds o1 hz v6 lw jp k4 wv do wn aj bc wn yw to w4 as ey yk is ig rp o8
+\n	rs ty q1 wt wy xp e3 wa yd d7 ht ts sz fk su kw xg bw cw qw oo fu od ix sd zu jn qd ci fi xh mo cp ev th ua e0 em kc lm cu u3 n8 xr yq ti yj fm yx tw
+\n	dx z2 ga kb yo sf sk fd gf i2 vs qw vj vw qe eu mz tu sp xs qs es t0 eb ak uh hl n1 v9 wv kd o8 rp
+\n	ds qn qj qz cb kz bo wi o6 z9 fq wq ml cv cb lf eq r6 r8 ic y4 am sz sx po jp g8 ze we wu en ew qw 3q lz kw tt ty ti e1 fx ut tc uu s6 ow gm sh qp vn l4 uj op xn wh qk wz rc wh uv um ar e7 uf az uh py h5 lq vt nz lu li lm dd rl er rt yu o4 eu yz if
+\n	iz ld me z1 y2 dj ar qb b4 l1 mz ij ry to ad xs sd wf eo hj wl ex ie u5 pr zj gt oi wc kg my ex zt ks yg eu aj
+\n	gr iy ft pq um qj dz wt gj cn ru kx q8 ws ue rk eb ee fo jb jf la ji ke qq qi qw rq yb qp il eb y0 iv ff zp l3 xm fi x4 r5 xd r0 ol wc t8 ae iw ox fk of pb qj ku xc ct wc ie xn zi wm rz w2 tb u0 su pi
+\n	a3 ss je un zf vq zg wo mx d7 pm gd vn eu yk tq ik fu ai qt qf j0 to yy at ii qk wz lw n7 ly
+\n	ub dz rv qt rm wg ea pc j9 qa mr h8
+\n	a4 wp td ur px qq ki yx go wc tm an
+\n	po gn rf a5 uw qn q1 nn we is z8 wj ca t5 ij eb tz ef pr ix g3 ek ta a0 y6 sq pa wq cx kq qw we rt c0 mz pv py wi cw mj qt qu 0e oa tj ux pf to hr ao tx yr ts fd fv s5 ui qu j7 gw ug ss cy ks qf xm fk wg vp kt mv qj mn lk vh yt ol rf th os e8 tj ua rk on pq dg kv km wq kp ad bp os bw pb qh wp zs q6 u0 gj yu o5 if a1
+\n	a6 he pu vd cd q4 jz z6 qc jc bz eh wi b1 ed ym eg fo us ib td y8 gj zm pk lc qr wu mh qw sw fi ue j0 xm kz y2 ev aj df h3 qk qc tx rr rl rc ut ad so ro tw
+\n	a2 pa we kk eg q7 lh zj wp 4z gi yd yg rc io ix r9 jb xe rr iz jd ij tz p9 qi l4 pa g9 s4 vi tj pb hd f4 qh qk lq qs hn ro
+\n	gn k9 qz aw wu ki yf e2 pk v8 xk wg 5y t3 sl u4 ya gd hn ql zr oj ig
+\n	fr qn qh ph k0 q2 nq wi zz rh rx ee ef uo d7 ix el fh qv dm vg px wi m8 qq gh ud qy ec fu yw uw sa tb lg us sk wf 5h qf sh vp wk qk zw qz wg aq of ys ak al f5 re f8 pr ku qx wc u1 lr qs wb f4 cw k2 ka hk mf yr w3 ro ir
+\n	gr qh ql wh kv e4 r4 oy lu qw pb et uj tb tn xs kr dt td t8 e8 uc xn eq yi af
+\n	q5 dt ed y1 am qv ut gx m7 yt rr yq yr dy sh mt wd wm th bv ym
+\n	tr qs ca lp uv q3 wu o5 c1 rx om ee er ta ou i1 jb rt ry os ti fc ss px jn gy jz vp ea tg ay rq u6 al de qc zt wn ez rz eq aa rm ox
+\n	uv ds h9 fy rf jq he qh h8 d4 wr wf du ck wi km yp ut rv io g1 rb av y4 tw a0 hy sz qx gh ha q9 qw ze 1a bz bx bv qw po ee wa qi xk ri i6 ic he tm hl sj jb qp wp jk qr kf sm l8 be x3 qu ql t1 x6 yy fg rj ua ug qg kv k1 wl v7 xx bj ae wc n3 zy tl tz zk wq re n0 yw oh yr oz eu fm do ux uc
+\n	hb pa h0 pg q3 mw q6 mg ls lh am sc gz al j2 wt t9 lm qe j2 rm re rr ry fl yw ux i0 2e eo bt vh ra ys sm pb on tx re ff wn wv tu rt ox ul ge
+\n	al fw zb p6 hi qy ay ou rg sx ag rz uy
+\n	bx wi kv t5 3w e7 sh ht ff nu la xo qi s3 uy jb 1o vm vi l6 be x3 ny pk aw u1 rk fx km qc be rw yn ey eo ro
+\n	dn q3 jf w0 e0 lh rv zv js j2 xg ld hr qe mk s3 dr kw kc dh h2 ql cg zv n3 ym yt aa as
+\n	ft ty qh pi d3 qz ip wu wi q8 wj a1 mg mj ut wt r3 om ua y3 ou fd dc zw lp xe cn dh ng qe kp qt mz xy ef ay od tz p8 i0 hu hz qo kw jw qf kf 3y v3 qj w0 ib ew t4 fg oc e9 ua ov hs u6 f9 h6 vj qv li wq iu yv xv rc w6 rm r2
+\n	d2 d4 av jc si rs ut 5q pa mm s4 e5 tc km
+\n	qa uk uw qh vd d3 q4 xo wo c3 wl wa w7 w9 mc r4 y2 fp r0 tw fr g8 ae qn lp sd bk en vr gd hu j1 xv xg rw ep wh ed fu ul eb fl fz i7 ht jx ns v3 ll zs j0 op xf qf l6 l7 sn wk zw wg ej ti wb wz t6 oz rh rj uf je av dj h6 ql wl oi im v8 zr qv wn ku wb bj ef o4 yl r1 ei so if uc
+\n	k7 qg q5 kx oz mu wl ws rh b2 rk yh qn qe 6o 1y mj ei pf ye e1 dw hj hx do qo gc rh v2 zw x5 t1 t3 yu th e9 em au qh f0 qk km ql kp wc 5p vx bg ea ev wn wm w2 rx o3 yk ru
+\n	a2 gr qa az dd gm d1 k9 hr we bz lg mg ny wp xd mp yo pj uy xs ua pt g4 tw ez jv q9 qn wr nd md nf qq ng pi bb j2 eu yl ij ty sb os eh hw i6 hg m9 nj wa qs w5 qf nz zh hw wh be zo fs rz me yk y3 ub t7 t8 u2 u3 en ha fl yd hf qh qk wc 1x ze w1 oj ee w3 ey du uz id ah pi
+\n	o0 hn qz q5 du 2b bn a4 ex rj y1 dj yz y5 ig tf th js qv 5e gc j3 ls d8 yw bc cz tx mb wf ij ty ai as hi lh l3 qd n1 7o wf wh qh wg ot ra l6 el e5 s8 dg vm 3f 7o wn yw gj tb et
+\n	fu a5 cp ch hx hc rd eh tg g4 li sw sf il eg eb zj 2o cg ew uc
+\n	qs uc rp ml eb yd if pa c7 oq vk wu ot yq rl uz tv gb zu vm w0 sc tf ud qk wm ko yy er tw
+\n	ak tt ub pa pq il jq q1 hr k0 uv ql q3 kk zs q5 z8 is lh q8 w7 qw es ii av yz dl ht td g6 vs jm zr px bj no g2 g7 la c7 xt mz yx tt ym os to s1 ur ta s3 gv pl qy pc qi sh jv j8 gr l3 bi oa wd fy v1 s1 zp hg 5e t1 rp wj ms wl t5 el wm at fl e0 sq h3 dl qz ka ox tj qb wb wq re xr rx em ee yu ri do uc a1 rp
+\n	uv rs un qs um il ul q2 jy kl wo a1 rj tj pk ys r5 yn uo oe y4 ou y5 ar zb g0 qn gx zt lb 2v rm qy nw yz lm eg og i7 ht ss qy qi ge wf bw lv lb wh cs wk hf 7g yb zw hk ns ol rh th yo f4 rq dt uj qo fd wx nk rv ka fl mu rr q3 w2 oj ee rt w6 ru ul
+\n	qs hq qf qn d1 k0 q2 kk o5 na si bv mx e9 tz d8 tq dl ez qv jf zw ww wu xo b8 w3 i2 te p3 ry iz s1 ut as s5 hk wo wa l6 wh bq xk wj wd ra gu yi u1 t0 ak ai tc ax ip uj nf zb wv bd wo fz qm qj pe md ew rv gj ol yk tn iq yl is si ie r2
+\n	d3 ni wr ws li mj ds sh sl qx vs rp ft ik e1 sd af ho xn wg zh 6b rp eb f3 u5 uf df py k1 wz vk vx k2 dg wm er rv rb
+\n	gv iz qz wo o7 k0 oq ti r9 us ib ps g0 jm jb tq ue iv pj sa cr kh t1 ot wc at e9 ys o2 ab qj ww za rn yi
+\n	ty qn qh nt ql la q3 kl wt q5 mp mg o9 ls lh g2 id ez sw hu qb cx nu pl kw wt vz v2 1t wi mh qr eu rm qs xb ei ij uj yb sn ai iv pj oj de hy gv ka lz pa nx wg wj kj cw zp wk eq wj t5 ns rf e6 rh ev t9 eb ir e0 sm gs gd ds f5 dd de fc f8 x0 lm qz wz xc wc kx cu wv ks lv kv wn pv ei wm ju ww yv zy yt e2 rb w6 oc o6 tq ig
+\n	q2 o2 gj q6 zh mg li mo vo ch tl ax ip ho wt ln ro wo qr tr tt os fo e1 de hg gb sk w5 fp kg mm l6 yi u3 fl hs u6 fx re rr dl wb jr el rw pm rt to rx w4 gx
+\n	yv a3 qa uz k9 q2 o2 bp ny zl mj vo tk rx ui g5 pu qx nr xt ls lm rv qs yv ik fz tv wp nk gn qh qi yf ek e5 pb au tc ac kc br qz 4t qc mx ly wm kb ez w2 u8 ei o8
+\n	rf vo q1 o2 wt q5 oc 5l a2 es oe sc cx wq qw ky em tx rm p2 qo ft ed uq fs i9 ok lz v3 au xj v4 wf l3 eg ej ex wl rv qv ak mi hm cj yr w4 si
+\n	a2 tr qa fy qd qh oh kk lq dy bz oc jf wa k0 ip pm po qx wq cx we wr bj j5 yq qe gg rq rr oo ru od ix qt af or sj qo jn gr sk wd nc xo xl wk hh yf eh ek aq ex ar en tl ys rq pm ug ql qz wb wn yw og xw an if it
+\n	ak kk wu ig df w0 rb y4 fr gg i2 qb qw yf j1 ij ue s2 qt ad i5 yp ai l9 wk km ql zn yb ee rb ir te
+\n	hb q2 ld wt q7 qm km ws w7 vi iu yf rc g1 pr ot a9 pn dk ib qx hi qc jd jg hd q0 lo jj cn wb mz ec qp uj y9 tu yq au tp hg pl jx vx j7 wd 3y ca au rq kv qg dh k2 ok cf qa wv bp dw iu de k2 rt hj wm rc er o3 ey fn si if so
+\n	hq q1 qj d3 ws as ld mu rj ut d8 ey ou ib ez gf y7 qx qn vz qm vd zw ww d8 xu v1 av b6 mg gs bb g8 rm qy yv rr ry oa tb dt jb qa j0 qs l5 nz qg wj t4 td t6 eb ua s0 pn ii ac x9 qj k4 wc v9 s7 cj zy wo 10 hn yq vz u0 fm uz ux
+\n	ra pp qd d2 vg wj qn rh we ht st jm bv wu wi qy y9 de gw wa sb uz r1 qu pz ot td rg go e8 sn iy zr wc s0 ww ea pw ac w1 h4 w6 rp
+\n	fr uv pa jt qk q4 ls wu wi mt xa vu tk ed rb pe fp am sr hp qv m1 gc en yw qq qt ud ey eo p3 tj tu en ix ux ye tp ic s3 ad hz qi uf qa kr wh vd lk yn 5t u1 t0 od rr x9 f0 zj kn nk wp zs se rv ei pi
+\n	yb dc qs py qk nb jj ql q5 m3 mg zz e5 i1 zr lc zx xu vq hr xp by ei yx gl qi qp ij eg ai ph ap tn dy zp qp bp kf j5 ib vd eg el yy td yo ie ag em fc kx zx h8 wv sv q1 te wv vm yq ol if a1
+\n	ak rd rf qg lo nq xy z6 q6 mw c1 cu z8 q7 vw wp a2 zz w8 yo uu ee yn r8 av yz y6 pp uq dv i3 db jv q9 2l xg rp ib lj sq tx tc mj mk qr rw te p3 ik eg pj e3 i9 im tb tn fm na j7 lj wa ct rg v4 he x3 kl bi r7 wj y1 l6 wk el 9f t6 gu tj od e9 tz re uh o2 zk ki cf lw jp sc s6 qs qb yn yw ms md w3 rv as yi ox du yz ir yc dp hc
+\n	yv gy ik k5 db gm ux qj gc w8 ea g6 dx po jb 5t pv wi rz qp jv v1 ea en al ii dt qj py w4 if ux
+\n	iy pd yg qq p4 in qa y1 yy ta fb zk s6 lu
+\n	ql ws rv yj jk ke lm ff lb fx s4 av uv wl n1 rv dp
+\n	qh d3 rs ih rc aq we 7y ud t3 h2 zt cu oc
+\n	fr hn k6 je q3 k4 tm zh lj aj li a4 t7 w7 kx ut pl rc ih th hp wq pl ls ma oe lf wu l1 ve lp qt qy fi ti he oh hi ow tm cu p7 nr va r3 tt wk wc s8 s0 hs al o2 hk x0 qj lm v5 wl qz 7u iw os lu ah wm hk e1 o4 rm fq ro so
+\n	gr sa rd um pf ca ga ql qz wt ld z6 vw kv my xt cn wr eq tk rw fe qx qc qr qr rk qa qi ex p3 p5 dq ff pc sh cy oq v4 wg s7 yo ya od rq dt un bw zm da bg q5 ru ah
+\n	iy qd k6 dm oj qz zd vr w0 r7 d8 et y1 eg yj gz qq p3 il i8 ge wp sx s1 wj t4 lm jo qp pw xc vm sr uz ig
+\n	qf u8 iq rg rk g4 im ih oq fp a0 ib tc uj tn nc kz ll u1 un qv ck lv vv
+\n	a4 df um jg z2 lq wr tn xu id wo ez rk rz ew d5 ti ix to r0 sk fa fe fr hp jk wr v1 ms wu jm rc qt tr ex uk vr to tz ut hl sg hb qd xn rj jc 6x mo wz rp ek y4 oi oo ae sc e9 od pn hg wz js qv ln ju rx yg as rn gk o7 so it
+\n	dd qs qd py k9 lw wt db gk zf nw wh t2 nf zx w8 rj ue w0 tl ew r6 ui ef g1 or ej pn an tq ou ff qv gj jv q0 kq 2l uo oe ku wi w1 tx qe rv 1l ws eu lv p4 ru fo tz ph ib fv uu i3 qu oe pc gw wp sx zd kw w6 bo w9 cs cw my qz zf rg fh e8 ay yd fz rw fc ng qz cg wx qp oz qv ly ha cx al iu rt mp e1 ee w4 tn ul ru o6 ag aj
+\n	qa kv e5 bm yj j4 m5 rj qe ri ht oi qf qe t6 e5 aw t8 wc dw un yb
+\n	iy jg jj d4 ju ol wy bs wk wq t8 a9 y4 ta dx jp qc q9 su si ut q0 m8 qq 4a zy qq zq sw po qe qt la sn p6 ht oj hy hh qi gc bn w7 au ya kz na oa ox ov je fb or wl qx ze cg we fk tz tv cg uq w6
+\n	dx sa qa qs db go lo z3 lf ox jc wj 93 tj tk yf ii ef fo ua sk g5 fs el oi fr sx fg se q9 xq qw j3 m6 4h qq l2 eu rq qu qi hs uh p6 ix fx qa i0 wf ke bq ne wh xl ms un ex sx yi ua pb s0 rq ak ao fc pr qj cw wq vy wv u2 3h wq re yw eb gl eu
+\n	hv gv il jd go qh d3 we q4 q5 ej lk my gv a2 ds ex e7 rk yf fq pu ff qx ho js gx j1 qe kw gm ja ns wy ln d0 cz xt te xu tt sb em ix ic p0 i8 im ui di gt ws os r1 qy pz l6 e5 e6 op sb pv sn ii rr v6 ql le zy pv mt da yq ol w6 yz ag it
+\n	ds gy dg jf qg uw qj uv q5 q8 q8 q0 qm e5 rk yd tz pv if qn ju cv xy ki qw mj ls yv ru of tz so yr oq qi m9 sc kw qf zh jx wh kg l0 t1 pz un fj os ha sn f3 e0 om ab cw ct nj zy wn fl ww vn fn tn ie ov
+\n	co qh jr jj cb bi wt q6 ra qm zx ur r5 an fw tg jm re j5 vl em sl xz qe wa 45 nq ex yb ed ef ph e4 tb s6 qy lz cu gm pd gq mc ca 85 yf wf hu sb eb fk fv dt cq lq qz ww wv xr n0 eq ok er et iw r2 o7 fe it
+\n	ra dx og wd wt o9 i4 it pk qo ic dt hj jl oq sf lz wd ca hi fg f5 ap x9 gq nd iy q6 ep
+\n	o9 gb a5 z5 q6 wu w0 tl r9 dj if ts ig it zq ll qw qy ep ed ry p5 ut hh dr i0 hl qp qa zs wd ya ot xk s7 e9 om io dl ki k2 wv q1 5g er rb rm
+\n	qs w0 om ed tk ta th gf ii av og 6o ee o8
+\n	po ty rf qf he qc hz bv c5 mi rh ew tu ef sh ix r0 d0 pb tq fw ig g8 fh i2 uw hf qw qr sf cn wi fh qt hp nq yv fy tj od ux ut fb hu tn qt oi qs oa xm dm fa nm qx yy oo ec ev ox sb ya rk ys ud jy dz zv qc zb qb 17 tb lt yt u9 w4 rb st et ry yl o5 di ux
+\n	gb gt az uk gm qh d3 bt qz wd ld o3 bl cm q7 ck k7 we b2 yd ua ew tl rq yg us tq js fk jb gz jn jg qq in qr rq qy 3h c0 qp p3 yn ef sb ym jl sf sh hv qd p4 fj od ix kz ni wj wz tg t0 tj e0 sm om kx ku cw nb zc aw cy qv bq kg wq pn zz wv cd wn yr se o6 pu eo gc
+\n	gy rf qf k6 qh qj cd q3 kk cj fw b4 fr mj w7 bm wr ya z7 wt w0 r8 ip ti is pn am y5 qb hs jf qw uu wr np qt wi 1t bx qq qw aw er cv qy rw eo oa iz fp iv qi jm nk kr qf xm eo nr w0 qj bi t3 uv wk ek wn ex e5 rf rh ga it f5 pm hm f8 qj gy jp le wc qc lt s9 zu lb q1 ju w1 uw w3 oj tn tq ir r2 te
+\n	ak gn pw a5 qh k9 qk nb 2l qz wr kv mt gt w7 zx ii oe ug ix sz qx qc ar sr zb su vg qe np yg qt yj sv uk pd uq pf of eh jb sk gy ws ke kd be og kh x6 me wz e6 yo iw ah rw pm rr qg pt lm ql qz wz qs ly wb wn q3 ry rx gj ia o5 ge
+\n	gy qm d3 q3 ia c1 ta ex e5 e8 eg sy cl jf qe nj nh m9 qa w6 ek iw kv qg ab n4 w5 iq do
+\n	uv gv qa un az jd qm eg iw nr q8 zj ny c5 vu rl rx yn et ia ua is ot pt hu im gj qv vv xe xu 1g wo vt qt st qy rw qi wh ft es uk hw to p8 fn f1 hp qu sk p2 l4 zf qf g0 fi l7 be ky iv mn xp nn dt 6b ro kw uv ra tp e6 sv s8 sn tl fz iy qh hz ve v8 h8 th wc wy qb xm s9 hs wq zs yq tu en zt w4 dp yc
+\n	sa ak gi hw qm gp pp qz fm id lh 6w 9h xr w7 ui ow rb oe ia us fq g5 y5 ig oi y6 im gk ze qe gn 3o ye xz jh qe db qi p1 ep re op te y9 os pj e3 p0 zp qa ih l4 cu zg wg sn rh lf fz ic kh ni wh vh wx th ag u3 f6 uj jy k3 2a wc kv lu wo hb eq w1 rb xw yo ei o7 gx
+\n	hw wd r0 g4 sz b7 pi sn tc in qt zs rg eu
+\n	iy hv hb hq qf z3 q2 xy ia tm zf jw wq a3 rk w0 d6 eg et is id po tg gh ob jj wr np no wt ja wy xl l2 yr bt bb tc cx qr rn qt lc rw sy ex y0 ru od to tz og ye hr pj de tv e4 qt ad oo qa jq fj l7 fo wh nt pl ro wl vp yy tf va e6 fg th ar s7 os at s8 re df pe hj f0 qx qc x7 lu nc zo tx bf ww pq cg w1 rx id pu it fe
+\n	qf fi ld 4o ge da t5 zz mo zx vi ui w9 pj rl rz r4 uy r5 sf av ot fq tw sc zv g9 qv i4 ut iy m1 wy xo b0 ud cb qy rq ug wg sn fo ix uc aa i9 ss sd di sh j8 qp xa ep w0 7h wl t7 iw tj ya hs e0 fz hd u6 hh dr dh uk qj qk wx ol xb qv wb s8 15 wy zm jr nx it eo fx ww yv zy to ee yu yi iq ey iw rm uz yz ob
+\n	po ra ik qd qf je jr lp wr ji ne wu 2b nt wa e7 rx xo ia yl ta ig ff hp gk jf q9 vd si gc qe rk wu by yg rq sb os fu eh em ux ic ao pj hy im du qy cr 2e l5 qw v1 lf mv wk rx dy rp ra rg gi eb hs au ap bo oa sn zi f6 h1 zt ey yz do
+\n	lj vu y2 if qr wr ta so kg 3k ol u1 f5
+\n	yb cv mq lf zz ue ui dx qe tv qu ex tz hh tb dy ds wi rb
+\n	hb gt qa h9 rf qf qg k9 q1 lo q3 ql z8 gl zg q8 1t wo vr rg ez ws mo w9 yo r3 yd e9 ea sf a0 im tg y8 ar qb ni wr qr wv m4 ix d9 nz yq fa if yr bt qr mz qi ea rr xx at ic pk qi za hv kq w7 co xj wd x4 zs wh y3 rf ec u2 e9 ah s0 uh io un h8 iq zb bs nr be zo fz vb wm pr yw md rc ur er ia yl ox ei ux eo tw o8
+\n	qs rd rh yf px ow d8 tq ig ih cl qr yw qq in qy wc ek rh ya qg cd x9 qm lq to o3 ul a1
+\n	a2 cp as gk kc 4u zj z2 t5 zz rb eh sh sx fg fh g9 hp vd gx oq cv pe wv b8 qe cc nw tr il tl e3 qu l4 mt wk wh aq td e9 gf lm qz bu jq my wp vb dg y0 ye yq w6 r1
+\n	ij az qn ph qv bv bf mz iu is y8 ar fh q9 hd qq ji sf ld up qo p2 at sp in qi nk l5 e0 rw px 5o ew oc te
+\n	qd jr pa q5 w9 hw hu y8 dn qn zw wr ma ei xl dq i7 i9 vb sx wf wh na wl um e7 s0 h2 nh nk fj yl wn iu u7 as ad ey so uc
+\n	la up ic g5 ay ic x8 u2 ar eb wb yr aj
+\n	po da rd un qg uw lq m2 4r wg q8 z9 t3 zc d9 ae st q0 li qw wt kr qu ry en sm qf kf kh ny yt gi rh u5 em tc kv h8 qx lr jq ef
+\n	a2 dh qh q1 h8 qz z6 kx z8 bv 3q df pk tl d8 tq tf g8 zb qw 5p zm qe cv yb ec uz iv e2 gq wp uh kq ws lc wk x3 t8 rj fc io je dk lr lt wv wt bw be eo q4 ye yy rv ok yo yp ir ig
+\n	rs ij ty ps ul wr bh kb rs z4 z8 er px uo up y1 rb fo jo gg dv ph q0 jn xw ww d8 rp yd yf tx b0 op yn of jl tm px fm jc zf qd pk wh rp uv tp t9 ir yf ug qg v5 ku qz fd k4 cu mw zn iu bg lq ly rv su
+\n	ik dm cm or tw pu lp eh qd kk j0 em ng tw
+\n	ra ds qk cg q7 k6 4p t6 yu lq go yd eq r8 fw am dm xy cm v1 cz eo qi ij yn eg hq tc sj qa i0 oa l6 p6 wj vd wf mr yt ex e6 yo t9 ev s8 en rr bq kg hb lm re bj ms w1 et du
+\n	o9 gy bl wz t8 hq iu ix av y5 y8 jn j1 np xt t9 vw qq 43 xv 9w yi ft es hy op lg vs hg wd ef wx ou ox sw dr ze xr st fm ah
+\n	a3 wr fb jc c2 w8 rx fe q9 hd xq qq wi te y9 e1 qt qi qs nl ca bh u2 md tv hx
+\n	ra jh q3 aa t3 1o eq lh rv fo us pt dj pm pi qn zr bj xj cm ix a0 ra hi eu nw yc p3 ru ri ue e2 jl hi wo g9 xn qh wl wx go yp rr dj nd ch u3 fj bd jy vn w1 ia ox tm uz
+\n	ma y5 bl qi g7 ri fl ap 7a yo ko rp
+\n	um dh pg wq r5 sf ia ta an hs ne q9 wt sh rk yi ym of tb oq do hv wj ic oi sc pe sc wq wb wm tq
+\n	hq qm gg q4 xu k4 k7 uo wt kb et fo ey aw g0 xi am in qy eo qi eb ay ue og nt kl wx s9 df qg f9 v6 rv sv pc tl my bj wb eq h4 o3 ri
+\n	tt uq qh nb qz wt jx ya on om io ow ha qp e2 fd e4 hp hx p2 vm xg xn ra l8 iu yf jr qh k4 1l oa tk zp yw rz sy ul yx eo ep
+\n	ij yb qs fi ul qk by ql jl wr bi q5 bl tm q7 xp k7 vy gi tj rl rx yf ym tu er r8 pe ip ej y4 fd jn gx zt vj xt xh rj kt cm ri nh zq pp eu rw to pg e1 ue dw e2 so tb gm qi jb nk gy pa v1 xj fl kh 3k kl ed wx wc ek yy ez wc iq yo u4 it tz ak hn f8 h2 hl uv wz h8 gi nk ch zt wt bw kn yq e1 tv zp ag it
+\n	qs rf jq go qh a8 jj xt le wu qq yd d6 d0 ff qc su c7 lc wp ty y0 tu ti pf ta aa ug vb rf vi rx no un yu e5 7r up rj ag ha hs fc wz bo qv bp tv ki er
+\n	yb qa rd lo ok q6 o6 ba r6 ow or yl am aq gd dc ho cx c0 wu g4 ib c5 ep re qo ed yw iv ta hy jc pn xs oq xn bo zg ps kr iz yp wh wj xl xo zq me na ek wl wx wc rg uo ir tk aj da rw hm io uj fb jt qj dk nh zx jp qx wc zr zy zu nc xe ww wv vn h2 q6 en ew ad yl af eo if r2
+\n	yb o0 dn z1 q1 sw qk po xt wr ls z8 ox wu jd ro q8 lh mh wa rg ea c3 pz tu g2 is a9 pn tw po qc sa jj vh ax xh kt wy jv mg nh kp b9 qi od ht e4 uu ij qf sf nc wk ap wd qz rd yi s7 tk pb it f7 o2 f9 kv qh h4 ln wz gi qd zn xm sn 39 yn rz u7 yr yj is ie ag ir tw
+\n	po dx uv pq jd dm d2 hr cs gs d3 q4 wr np ab di mh vt w7 w0 on tl ia ta aq dz y7 i1 qc pg q0 wq j2 c7 la cb il wr lv na ru 4g vz nf bc sl qq qp qt ud rq wg ex uw he tz ye p9 ui ou vu at ix w0 vf bi ed yh wh ra y6 wc u1 t8 fj ov iy tz kx h1 hj jy qj h6 ng jo wz cj ie mt rq te n9 mp ma q5 8w rb o7 sp ob
+\n	po ra dg ca qj q2 is kn rd ws lq tu ym yl y5 tg pp qw we cn a7 1t jd m7 wo yr sz qa hp ei qy ec p4 hw p7 to au iv ht qt qy qo l4 lz xm wd yf wg ez s7 en f3 tx yf rr f8 cw ji qv yz ry ew w2 oj w4 w5 st rn oz ri o6 dp aj
+\n	gm jg ju q5 np lf q7 xo 1y qn k0 jo pp qx th q9 4f or ro pu bv eu nw uq ao dy jb j9 gr rd nz wj wj r9 co ta rk od dd gg hm df pr km ng oj qc sb qd wb tz cq ex wb vb ty eq tv iw
+\n	fu uq co qk jl cg ld lg wo vr gc bd rj r3 yd rz iu ew d6 io to sh y7 jp db dn qn qm si xg qr ls jo lr wy rk wn m7 qu bb es op qp ru en ta e3 in hy dy hl vc gc gt jw ke 2t wh rk lj hg oy e6 yo ev em fz rw pq re dg qk ku oi qz k4 qv li rq n8 ec 4d yb wb e1 iw id o6 ir do ux pi ep
+\n	a2 wu jd ef dc mn 5e qp pl xd ag ay
+\n	yv o9 al a5 uq qg jw pi z2 jt cd q5 3m zl ez vu rg jl rz yf ix sj fp d0 tq ff ha hs zw om ni m0 xg c8 a7 ki qw cc ei xg j3 tt tu il p6 ix tp tx ib sp hg p0 fc pj su qu jv sj lk qp ws qs gm 1x mx lv wj qu l1 dt wh wv un aq fg rg e6 uo ar ie up it sw tx f6 o2 h3 qc qa ho vj u3 kd zy n6 my ww vc lr em w2 se rt o4 yc a1 te
+\n	qs dv pa ty iz uw qh jj z3 tn jc eg e4 qq w7 ut r3 uu kb up g1 fo iv if fd gd sc qm qe xg ia wb he ky hu tv rw qu rr es p3 ue s2 as i0 dt qt hz jm j0 gy ci fi hw nv ea kk vf rx 68 ti rp wl oi vp at om io uk pt qh qj dl cf lr cx wq ku ki w2 yh af ul sp yc it
+\n	ub yb dc ty gm dm go nv we ql by la o1 ju o3 jx fm aj wa rg e4 vi a6 r4 xo tz oe ip pv dk tq a0 tf fg tg i4 pz sd ry ky mg hy g7 eu qy yi rw qp eg yw hw sm uc i7 dw fx s3 sf zo m9 xs vn rf ci nz kr qt 9y pj lk ee pz ef rk e0 fx uf az fc qg jr oy lq cg qp um ad wc zn bw n6 my xr mp tu en o3 iq ir ro
+\n	da a3 d1 jr dz ca ql nu q3 cf o6 nr mt lk yr rs lp w7 a5 pj ys ym r8 ey to fs dz im ih sw qx qv zn gl j1 xe lc zc vw 6a mh b9 qt rm re oo qp p4 tk ix p7 og tz yr sp aa hk ih lx qd mx 4n kk vf el oo td ae yo fj uf pr hl qj qk wr qc qv kf yz my wq hn zs dr ee u8 rv et ru ie ag tw
+\n	gt ph z0 zl mu ui av zm om ui vh qr he qr es fl ws w6 nc ra rk kp ol wm yu it
+\n	dd df jq jd ux ql el 3r ya uu iu ee eh g3 sj us ib pp qc jv hd bh zt uo d8 b3 xu bc rq te uh ex tt eb il qu pc ge sj qp ih xf 3r gr yh qx tu wl wn sz up ay it ab jt qz v7 wn li za 6o w3 fn yk eu ie gz ro
+\n	yv o9 qf eg eh mh jh rh r3 rv ix y3 a0 sr qc qq qr wr qe bx ki m8 mk qi lm uk eb ai ur e2 xd nc ca eo mb ed uv rs up ya of hn lw wz qz et qh wm zr rc o3 r2
+\n	ss qg qj ph qk q2 cs z4 bi qc cj q8 qn w7 rj ys ea r4 uy om rc ii fp sj ej yz el qx qv zn gk q9 hs m2 ii d7 nk c8 j4 qq dl gg pp ei qo yc od fo eh fp ta hy ok tv uu us dp qf sb zg ks sg n3 wh x2 nr cs wk kh wk wf ew 7h 7k oy t6 gi rg yp s9 ya e9 pb tc dt dh hk h2 pt qh h7 wz n1 qv kd pm cc xr kp yk tm ge
+\n	gr qa ft tt gn qs pw pu ca ph ls cg cn zf bz q7 z0 c3 qn gv w7 rg ut e8 ii er ip sg y3 oy ek ht gd qx g0 qv db su jn qq lz uu jo ru an wi kn sq nh qr qy yx eo qi xz y9 ru pd au p7 dq he ut ok fd jz ui hc j9 l3 hb xd jq gy kh wf xs sl rs aq ez y4 ts um yi e0 gh dk py v5 qk ql ko jq wc nk v0 wb qv br iu wm 6p sr gk yp pu
+\n	o0 pa pf z3 jt jy z7 cm ne w8 yz fd fg zn qq ll vg wr wb ia xx yj ty eh e1 so ts tc s4 i0 tn wo wp wa op va wk x3 vg qx rs sn au f3 tz sq hn rr o2 fv un k2 vj ey dj
+\n	iy ra ij ty a4 un rf qg dm jr kj uv we cv gk wy z8 oc wp mo jl mz ev ch rv tu ax y2 g3 oy y6 im uq qv hp qb hd iy lp nk w2 bb ho ep tr os en sm p8 p9 hy ss ui gm qi oo vn ae qd w6 ps dn wd wg ro mr yt ol oz rg s7 u5 tl yd rr ax f0 cq ku qx ze n4 wn kt ca jy bg yc zs yw rz w1 eu rm r1
+\n	hv fu ca q8 mt la r3 pl yh to sy yh tv x4 tg yp ov wn ze sp
+\n	o9 qa az gm qd pw hq pd ga qj cd q3 jk pd du c2 zk xf t8 eq om es rc ua y3 pu ig qx se qv db st qn ii lx qe wt xk nx ku br qe qr qt rm eu xf xb rn qu qi ep qo rr ex xk p5 ym fi uq to ux ix ai hj gn zi oq qf kd wf xn kr w8 rl kk mq rp rf u1 s7 oa fh e7 yp e0 pr ql sx ck ag kg kt mp eb rl em ee w6 du rm yz if ep
+\n	qs pi am 6a ut r4 ii sd ua ib y6 pa kt pb wm qq dz qt qp y0 he p8 ue tb qu or qo wh 40 8j t4 sl rf iu gh hh qc iq bf rl wm mf oh ew is dp
+\n	da ps a7 jr z4 q3 bu xt ip jx q6 np z7 bp lg bz ye wo ig bb ww rf om uu ef r8 ey pt ta pn y7 gg th dn pg qb ri qq 42 qw zw b9 b0 xb qt qy yl wh xk ft at yw i7 sp de pz fn qy si m0 ik wf sg cq ql hk er eg lc ek na wc iw ir rk ua e0 ak iu sw ap uj av ab hl uv zc qa wc jw vj qv vk ay kg xw on rw 1b wn rl eb vm eq h4 yt oz eu uz
+\n	a2 qa rd cp qh ub vg ws u0 4g bp da yo ev kz eq uu ee ef yk pr sj sk fe oi lt uy j2 gn io vk ns 27 ln wu ve yr l2 qu qi ry il ul tj eg ux i5 yr tx ph oj gq or zp wa qs gy iz v0 qt wj ic ca lh yb np ej sl td l8 yi iw s8 e8 ys yd sq al dt pt tg te yb eu tq r1 ir fe
+\n	tr h9 go qj b1 wu q7 zh el tg mb ys ed ii er r8 xs pe r0 sw db ov m7 d3 re no nu zr pq ji wr lc or qw ee yy qr rn rm re qi te ea qo yb yn y0 uz uq iz tl yr i0 fm wp qs qd he wk kl ew as hl ez oo ox ie s0 f4 dl wq wl ww lr qc qv vk mt my kn ep em yt sy am so rp sp
+\n	ak ft qg bg ji q6 bk xi tf mo ur pj yk ua qv wq gc qe ke ef eb tk uq i6 oh iv gb qs rx el yo rr pe wz wx ho xq tc mo yk du r1 tq oc hc te
+\n	ra ub qj jh jt dx ql q6 da tf r3 ew iu sg tp yl el gc 6n tt ry pd ye ff lz kt yp fl yf dl rn
+\n	o9 hb h9 qd dh qg q1 qj jy se q5 wt nr qv ge c5 el 6y uo rv ax pe et r0 fe y6 dx qx ha qq lo we zy v1 wy dl vr wa qr rm qi qp yn tz pg ph de p0 do qp wp wf bw xh ky xz wh hl to ek rd sv rj rq re h1 qg qh kl f1 zm 18 ez xe vm en 5j o3 rn fw fe it
+\n	db c2 bb o0 w8 kl kc y4 qx zm pk cw id ve mh lp rq jb fl x1 qi wd lx f3 cy bq dd ye fn ig
diff --git a/src/test/regress/expected/.gitignore b/src/test/regress/expected/.gitignore
index 78cbf8837f07..b3bcb33b48e0 100644
--- a/src/test/regress/expected/.gitignore
+++ b/src/test/regress/expected/.gitignore
@@ -1,16 +1,19 @@
+/constraints.out
+/copy.out
+/create_function_1.out
+/create_function_2.out
+/largeobject.out
+/largeobject_1.out
+/misc.out
+/tablespace.out
+
 caql.out
 constraints_optimizer.out
-copy.out
-create_function_1.out
-create_function_2.out
 aocs.out
 appendonly.out
-constraints.out
 gptokencheck.out
 mapred.out
-misc.out
 sreh.out
-tablespace.out
 upg2.out
 ereport.out
 tidycat.out
diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index d20842e4a1e0..9876e1f3618b 100755
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -295,6 +295,16 @@ having exists (select 1 from onek b
 ERROR:  aggregates not allowed in WHERE clause
 LINE 4:                where sum(distinct a.four + b.four) = b.four)...
                              ^
+-- Test handling of sublinks within outer-level aggregates.
+-- Per bug report from Daniel Grace.
+select
+  (select max((select i.unique2 from tenk1 i where i.unique1 = o.unique1)))
+from tenk1 o;
+ ?column? 
+----------
+     9999
+(1 row)
+
 --
 -- test for bitwise integer aggregates
 --
diff --git a/src/test/regress/expected/aggregates_optimizer.out b/src/test/regress/expected/aggregates_optimizer.out
index 867d0149f47e..aac5cecaff9d 100644
--- a/src/test/regress/expected/aggregates_optimizer.out
+++ b/src/test/regress/expected/aggregates_optimizer.out
@@ -295,6 +295,16 @@ having exists (select 1 from onek b
 ERROR:  aggregates not allowed in WHERE clause
 LINE 4:                where sum(distinct a.four + b.four) = b.four)...
                              ^
+-- Test handling of sublinks within outer-level aggregates.
+-- Per bug report from Daniel Grace.
+select
+  (select max((select i.unique2 from tenk1 i where i.unique1 = o.unique1)))
+from tenk1 o;
+ ?column? 
+----------
+     9999
+(1 row)
+
 --
 -- test for bitwise integer aggregates
 --
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 7677de781941..0b164e067ce5 100755
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -152,8 +152,8 @@ CREATE TABLE cor (a int, b float, c text);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 UPDATE pg_type SET typname='newcor' WHERE typrelid='cor'::regclass;
-ALTER TABLE cor RENAME TO newcor;
-ALTER TABLE newcor RENAME TO cor;
+ALTER TABLE cor RENAME TO newcor2;
+ALTER TABLE newcor2 RENAME TO cor;
 DROP TABLE cor;
 -- relname is out of sync
 CREATE TABLE cor (a int, b int);
@@ -428,7 +428,7 @@ alter table atacc3 add constraint foo check (test2>0);
 alter table atacc3 inherit atacc2;
 -- fail due to duplicates and circular inheritance
 alter table atacc3 inherit atacc2;
-ERROR:  inherited relation "atacc2" duplicated
+ERROR:  relation "atacc2" would be inherited from more than once
 alter table atacc2 inherit atacc3;
 ERROR:  circular inheritance not allowed
 DETAIL:  "atacc3" is already a child of "atacc2".
@@ -601,7 +601,7 @@ ERROR:  column "test1" named in key does not exist
 drop table atacc1;
 -- adding a new column as primary key to a non-empty table.
 -- should fail unless the column has a non-null default value.
-create table atacc1 ( test int ) distributed by (test);
+create table atacc1 ( test int );
 insert into atacc1 (test) values (0);
 -- add a primary key column without a default (fails).
 alter table atacc1 add column test2 int primary key;
@@ -1569,6 +1569,18 @@ select * from another order by 1,2;
 (3 rows)
 
 drop table another;
+-- disallow recursive containment of row types
+create temp table recur1 (f1 int);
+alter table recur1 add column f2 recur1; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
+alter table recur1 add column f2 recur1[]; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
+create temp table recur2 (f1 int, f2 recur1);
+alter table recur1 add column f2 recur2; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
+alter table recur1 add column f2 int;
+alter table recur1 alter column f2 type recur2; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
 --
 -- alter function
 --
@@ -1789,11 +1801,13 @@ select  pg_class.relname, attname, typname from pg_attribute, pg_class, pg_type
  ao1     | col3    | bpchar
 (1 row)
 
--- no explicit entry in pg_attrdef for NULL default
+-- There's an explicit entry in pg_attrdef for the NULL default (although it has
+-- the same effect as no entry).
 select relname, attname, adsrc from pg_class, pg_attribute, pg_attrdef where attrelid = pg_class.oid and adrelid = pg_class.oid and adnum = pg_attribute.attnum and pg_class.relname = 'ao1';
- relname | attname | adsrc 
----------+---------+-------
-(0 rows)
+ relname | attname |    adsrc     
+---------+---------+--------------
+ ao1     | col3    | NULL::bpchar
+(1 row)
 
 --- 
 --- check with IS NOT NULL constraint
@@ -1910,11 +1924,13 @@ select  pg_class.relname, attname, typname from pg_attribute, pg_class, pg_type
  aoco1   | col3    | bpchar
 (1 row)
 
--- no explicit entry in pg_attrdef for NULL default
+-- There's an explicit entry in pg_attrdef for the NULL default (although it has
+-- the same effect as no entry).
 select relname, attname, adsrc from pg_class, pg_attribute, pg_attrdef where attrelid = pg_class.oid and adrelid = pg_class.oid and adnum = pg_attribute.attnum and pg_class.relname = 'aoco1';
- relname | attname | adsrc 
----------+---------+-------
-(0 rows)
+ relname | attname |    adsrc     
+---------+---------+--------------
+ aoco1   | col3    | NULL::bpchar
+(1 row)
 
 --- 
 --- check with IS NOT NULL constraint
diff --git a/src/test/regress/expected/alter_table_optimizer.out b/src/test/regress/expected/alter_table_optimizer.out
index 502bfd45114a..eb10509ec20e 100644
--- a/src/test/regress/expected/alter_table_optimizer.out
+++ b/src/test/regress/expected/alter_table_optimizer.out
@@ -153,8 +153,8 @@ CREATE TABLE cor (a int, b float, c text);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 UPDATE pg_type SET typname='newcor' WHERE typrelid='cor'::regclass;
-ALTER TABLE cor RENAME TO newcor;
-ALTER TABLE newcor RENAME TO cor;
+ALTER TABLE cor RENAME TO newcor2;
+ALTER TABLE newcor2 RENAME TO cor;
 DROP TABLE cor;
 -- relname is out of sync
 CREATE TABLE cor (a int, b int);
@@ -434,7 +434,7 @@ alter table atacc3 add constraint foo check (test2>0);
 alter table atacc3 inherit atacc2;
 -- fail due to duplicates and circular inheritance
 alter table atacc3 inherit atacc2;
-ERROR:  inherited relation "atacc2" duplicated
+ERROR:  relation "atacc2" would be inherited from more than once
 alter table atacc2 inherit atacc3;
 ERROR:  circular inheritance not allowed
 DETAIL:  "atacc3" is already a child of "atacc2".
@@ -608,7 +608,7 @@ ERROR:  column "test1" named in key does not exist
 drop table atacc1;
 -- adding a new column as primary key to a non-empty table.
 -- should fail unless the column has a non-null default value.
-create table atacc1 ( test int ) distributed by (test);
+create table atacc1 ( test int );
 insert into atacc1 (test) values (0);
 -- add a primary key column without a default (fails).
 alter table atacc1 add column test2 int primary key;
@@ -1586,6 +1586,18 @@ select * from another order by 1,2;
 (3 rows)
 
 drop table another;
+-- disallow recursive containment of row types
+create temp table recur1 (f1 int);
+alter table recur1 add column f2 recur1; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
+alter table recur1 add column f2 recur1[]; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
+create temp table recur2 (f1 int, f2 recur1);
+alter table recur1 add column f2 recur2; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
+alter table recur1 add column f2 int;
+alter table recur1 alter column f2 type recur2; -- fails
+ERROR:  composite type recur1 cannot be made a member of itself
 --
 -- alter function
 --
@@ -1806,11 +1818,13 @@ select  pg_class.relname, attname, typname from pg_attribute, pg_class, pg_type
  ao1     | col3    | bpchar
 (1 row)
 
--- no explicit entry in pg_attrdef for NULL default
+-- There's an explicit entry in pg_attrdef for the NULL default (although it has
+-- the same effect as no entry).
 select relname, attname, adsrc from pg_class, pg_attribute, pg_attrdef where attrelid = pg_class.oid and adrelid = pg_class.oid and adnum = pg_attribute.attnum and pg_class.relname = 'ao1';
- relname | attname | adsrc 
----------+---------+-------
-(0 rows)
+ relname | attname |    adsrc     
+---------+---------+--------------
+ ao1     | col3    | NULL::bpchar
+(1 row)
 
 --- 
 --- check with IS NOT NULL constraint
@@ -1827,7 +1841,8 @@ create table ao1(col1 varchar(2), col2 int) WITH (APPENDONLY=TRUE) distributed r
 alter table ao1 add column col3 char(1) not null default NULL; 
 -- this should fail (same behavior as heap tables)
 insert into ao1(col1, col2) values('a', 10);
-ERROR:  null value in column "col3" violates not-null constraint
+ERROR:  One or more assertions failed  (seg0 10.64.4.151:25432 pid=28084)
+DETAIL:  Not null constraint for column col3 of table ao1 was violated
 ---
 --- alter add with no default should continue to fail
 ---
@@ -1927,11 +1942,13 @@ select  pg_class.relname, attname, typname from pg_attribute, pg_class, pg_type
  aoco1   | col3    | bpchar
 (1 row)
 
--- no explicit entry in pg_attrdef for NULL default
+-- There's an explicit entry in pg_attrdef for the NULL default (although it has
+-- the same effect as no entry).
 select relname, attname, adsrc from pg_class, pg_attribute, pg_attrdef where attrelid = pg_class.oid and adrelid = pg_class.oid and adnum = pg_attribute.attnum and pg_class.relname = 'aoco1';
- relname | attname | adsrc 
----------+---------+-------
-(0 rows)
+ relname | attname |    adsrc     
+---------+---------+--------------
+ aoco1   | col3    | NULL::bpchar
+(1 row)
 
 --- 
 --- check with IS NOT NULL constraint
@@ -1958,7 +1975,8 @@ WITH (APPENDONLY=TRUE, ORIENTATION=column) distributed randomly;
 alter table aoco1 add column col3 char(1) not null default NULL; 
 -- this should fail (same behavior as heap tables)
 insert into aoco1 (col1, col2) values('a', 10);
-ERROR:  null value in column "col3" violates not-null constraint
+ERROR:  One or more assertions failed  (seg1 10.64.4.151:25433 pid=28094)
+DETAIL:  Not null constraint for column col3 of table aoco1 was violated
 drop table if exists aoco1;
 create table aoco1(col1 varchar(2), col2 int not null)
 WITH (APPENDONLY=TRUE, ORIENTATION=column) distributed randomly;
diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out
index bd9c46368866..1a832f1e6e7b 100755
--- a/src/test/regress/expected/arrays.out
+++ b/src/test/regress/expected/arrays.out
@@ -925,6 +925,45 @@ SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
  {4,2,6,7,8,1} | {}  | {{white,yellow},{pink,orange}} | {{black,red},{green,orange}} | {2.1,3.3,1.8,1.7,1.6} | {1.6}
 (1 row)
 
+-- A few simple tests for arrays of composite types
+create type comptype as (f1 int, f2 text);
+create table comptable (c1 comptype, c2 comptype[], distkey int4) distributed by (distkey);
+-- XXX would like to not have to specify row() construct types here ...
+insert into comptable
+  values (row(1,'foo'), array[row(2,'bar')::comptype, row(3,'baz')::comptype]);
+-- check that implicitly named array type _comptype isn't a problem
+create type _comptype as enum('fooey');
+select c1, c2 from comptable;
+   c1    |          c2           
+---------+-----------------------
+ (1,foo) | {"(2,bar)","(3,baz)"}
+(1 row)
+
+select c2[2].f2 from comptable;
+ f2  
+-----
+ baz
+(1 row)
+
+drop type _comptype;
+drop table comptable;
+drop type comptype;
+-- Insert/update on a column that is array of composite
+create temp table t1 (f1 int8_tbl[], distkey int4) distributed by (distkey);
+insert into t1 (f1[5].q1) values(42);
+select f1 from t1;
+       f1        
+-----------------
+ [5:5]={"(42,)"}
+(1 row)
+
+update t1 set f1[5].q2 = 43;
+select f1 from t1;
+        f1         
+-------------------
+ [5:5]={"(42,43)"}
+(1 row)
+
 create or replace function unnest1(anyarray)
 returns setof anyelement as $$
 select $1[s] from generate_subscripts($1,1) g(s);
diff --git a/src/test/regress/expected/bitmapscan.out b/src/test/regress/expected/bitmapscan.out
index 874ef7479d1d..0907bb8eb349 100644
--- a/src/test/regress/expected/bitmapscan.out
+++ b/src/test/regress/expected/bitmapscan.out
@@ -1004,3 +1004,4 @@ SELECT COUNT(DISTINCT(highCardinalityHighDomain)) AS distinct_hchd FROM card_hea
          50004
 (1 row)
 
+drop table if exists bm_test;
diff --git a/src/test/regress/expected/boolean.out b/src/test/regress/expected/boolean.out
index 8c6b5d2546d5..40d6077c6172 100755
--- a/src/test/regress/expected/boolean.out
+++ b/src/test/regress/expected/boolean.out
@@ -18,7 +18,7 @@ SELECT bool 't' AS true;
  t
 (1 row)
 
-SELECT bool 'f' AS false;
+SELECT bool '   f           ' AS false;
  false 
 -------
  f
@@ -54,6 +54,30 @@ SELECT bool 't' <> bool 'f' AS true;
  t
 (1 row)
 
+-- explicit casts to/from text
+SELECT 'TrUe'::text::boolean AS true, 'fAlse'::text::boolean AS false;
+ true | false 
+------+-------
+ t    | f
+(1 row)
+
+SELECT '    true   '::text::boolean AS true,
+       '     FALSE'::text::boolean AS false;
+ true | false 
+------+-------
+ t    | f
+(1 row)
+
+SELECT true::boolean::text AS true, false::boolean::text AS false;
+ true | false 
+------+-------
+ true | false
+(1 row)
+
+SELECT '  tru e '::text::boolean AS invalid;    -- error
+ERROR:  invalid input syntax for type boolean: "  tru e "
+SELECT ''::text::boolean AS invalid;            -- error
+ERROR:  invalid input syntax for type boolean: ""
 CREATE TABLE BOOLTBL1 (f1 bool);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
diff --git a/src/test/regress/expected/case_gp.out b/src/test/regress/expected/case_gp.out
index 0dcaf621bfff..019fe4c3d9de 100644
--- a/src/test/regress/expected/case_gp.out
+++ b/src/test/regress/expected/case_gp.out
@@ -138,7 +138,10 @@ SELECT a,b,c,CASE c WHEN IS NOT DISTINCT FROM b THEN a
                     WHEN IS NOT DISTINCT FROM b+1 THEN a*100
                     ELSE c END 
   FROM mytable; 
-ERROR:  CASE types character varying and integer cannot be matched
+ERROR:  operator does not exist: character varying = integer
+LINE 1: SELECT a,b,c,CASE c WHEN IS NOT DISTINCT FROM b THEN a
+                                    ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 --
 -- DECODE(): Oracle compatibility
 --
@@ -148,7 +151,7 @@ SELECT decode(null,null,true,false);
  t
 (1 row)
 
-SELECT decode(NULL, 1, 100, NULL, 200, 300);
+SELECT decode(NULL::integer, 1, 100, NULL, 200, 300);
  case 
 ------
   200
@@ -544,15 +547,8 @@ select sid,
        END as case_start_dt
 from nomatch_case
 order by sid, name;
- sid  |     name      | gender |  start_dt  | case_start_dt 
-------+---------------+--------+------------+---------------
- 1000 | Jane Doe      | F      | 01-15-2011 |              
- 2000 | Ryan Goesling | M      | 02-01-2011 |              
- 3000 | Tim Tebow     | M      | 01-15-2011 |              
- 4000 | Katy Perry    | F      | 03-01-2011 |              
- 5000 | Michael Scott | F      | 02-01-2011 |              
-(5 rows)
-
+ERROR:  operator does not exist: date = integer
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 select sid,
        name,
        gender,
diff --git a/src/test/regress/expected/cluster.out b/src/test/regress/expected/cluster.out
index fa13f62b093e..8ea61f44d824 100755
--- a/src/test/regress/expected/cluster.out
+++ b/src/test/regress/expected/cluster.out
@@ -250,11 +250,12 @@ SELECT a,b,c,substring(d for 30), length(d) from clstr_tst ORDER BY 1;
 
 -- Verify that foreign key link still works
 INSERT INTO clstr_tst (b, c) VALUES (1111, 'this should fail');
-SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass;
+SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass
+ORDER BY 1;
     conname     
 ----------------
- clstr_tst_pkey
  clstr_tst_con
+ clstr_tst_pkey
 (2 rows)
 
 SELECT relname, relkind,
@@ -311,6 +312,7 @@ WHERE pg_class.oid=indexrelid
 
 -- Verify that clustering all tables does in fact cluster the right ones
 CREATE USER clstr_user;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
 CREATE TABLE clstr_1 (a INT PRIMARY KEY) DISTRIBUTED BY (a);
 NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "clstr_1_pkey" for table "clstr_1"
 CREATE TABLE clstr_2 (a INT PRIMARY KEY) DISTRIBUTED BY (a);
@@ -330,7 +332,7 @@ INSERT INTO clstr_3 VALUES (1);
 CLUSTER clstr_2;
 ERROR:  there is no previously clustered index for table "clstr_2"
 CLUSTER clstr_1_pkey ON clstr_1;
-CLUSTER clstr_2_pkey ON clstr_2;
+CLUSTER clstr_2 USING clstr_2_pkey;
 SELECT * FROM clstr_1 UNION ALL
   SELECT * FROM clstr_2 UNION ALL
   SELECT * FROM clstr_3 ORDER BY 1;
@@ -383,8 +385,60 @@ SELECT * FROM clstr_1 ORDER BY 1;
  2
 (2 rows)
 
+-- Test MVCC-safety of cluster. There isn't much we can do to verify the
+-- results with a single backend...
+CREATE TABLE clustertest (key int, distkey int) DISTRIBUTED BY (distkey);
+CREATE INDEX clustertest_pkey ON clustertest (key);
+INSERT INTO clustertest VALUES (10, 1);
+INSERT INTO clustertest VALUES (20, 2);
+INSERT INTO clustertest VALUES (30, 1);
+INSERT INTO clustertest VALUES (40, 2);
+INSERT INTO clustertest VALUES (50, 3);
+-- Use a transaction so that updates are not committed when CLUSTER sees 'em
+BEGIN;
+-- Test update where the old row version is found first in the scan
+UPDATE clustertest SET key = 100 WHERE key = 10;
+-- Test update where the new row version is found first in the scan
+UPDATE clustertest SET key = 35 WHERE key = 40;
+-- Test longer update chain 
+UPDATE clustertest SET key = 60 WHERE key = 50;
+UPDATE clustertest SET key = 70 WHERE key = 60;
+UPDATE clustertest SET key = 80 WHERE key = 70;
+SELECT key FROM clustertest;
+ key 
+-----
+  20
+  30
+ 100
+  35
+  80
+(5 rows)
+
+CLUSTER clustertest_pkey ON clustertest;
+SELECT key FROM clustertest;
+ key 
+-----
+  20
+  30
+  35
+  80
+ 100
+(5 rows)
+
+COMMIT;
+SELECT key FROM clustertest;
+ key 
+-----
+  20
+  30
+  35
+  80
+ 100
+(5 rows)
+
 -- clean up
 \c -
+DROP TABLE clustertest;
 DROP TABLE clstr_1;
 DROP TABLE clstr_2;
 DROP TABLE clstr_3;
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
index 1ccf06f376b9..2f78cbfdb198 100755
--- a/src/test/regress/expected/copy2.out
+++ b/src/test/regress/expected/copy2.out
@@ -1,4 +1,4 @@
-CREATE TABLE x (
+CREATE TEMP TABLE x (
 	a serial,
 	b int,
 	c text not null default 'stuff',
@@ -94,7 +94,7 @@ ERROR:  table "no_oids" does not have OIDs
 COPY x TO stdout;
 COPY x (c, e) TO stdout;
 COPY x (b, e) TO stdout WITH NULL 'I''m null';
-CREATE TABLE y (
+CREATE TEMP TABLE y (
 	col1 text,
 	col2 text
 );
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index ec465228fc22..07afd7e3a43b 100755
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -79,6 +79,12 @@ SELECT count(*) FROM fast_emp4000 WHERE home_base && '(1000,1000,0,0)'::box;
      2
 (1 row)
 
+SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
+ count 
+-------
+   278
+(1 row)
+
 SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
     ORDER BY (poly_center(f1))[0];
  s |         f1          
@@ -129,6 +135,12 @@ SELECT count(*) FROM fast_emp4000 WHERE home_base && '(1000,1000,0,0)'::box;
      2
 (1 row)
 
+SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
+ count 
+-------
+   278
+(1 row)
+
 SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
     ORDER BY (poly_center(f1))[0];
  s |         f1          
@@ -349,7 +361,7 @@ CREATE INDEX func_index_index on func_index_heap (textcat(f1,f2));
 INSERT INTO func_index_heap VALUES('ABC','DEF');
 INSERT INTO func_index_heap VALUES('AB','CDEFG');
 INSERT INTO func_index_heap VALUES('QWE','RTY');
--- this should fail because of unique index:
+-- this should fail because of unique index: (In GPDB, the index isn't unique, so no error)
 INSERT INTO func_index_heap VALUES('ABCD', 'EF');
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
@@ -364,7 +376,7 @@ CREATE  INDEX func_index_index on func_index_heap ((f1 || f2) text_ops);
 INSERT INTO func_index_heap VALUES('ABC','DEF');
 INSERT INTO func_index_heap VALUES('AB','CDEFG');
 INSERT INTO func_index_heap VALUES('QWE','RTY');
--- this should fail because of unique index:
+-- this should fail because of unique index: (In GPDB, the index isn't unique, so no error)
 INSERT INTO func_index_heap VALUES('ABCD', 'EF');
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
@@ -380,23 +392,27 @@ create index hash_f8_index_3 on hash_f8_heap(random) where seqno > 1000;
 --
 -- Unfortunately this only tests about half the code paths because there are
 -- no concurrent updates happening to the table at the same time.
-CREATE TABLE concur_heap (f1 text, f2 text) distributed by (f1);
+CREATE TABLE concur_heap (f1 text, f2 text, dk text) distributed by (dk);
 -- empty table
 CREATE INDEX CONCURRENTLY concur_index1 ON concur_heap(f2,f1);
 ERROR:  CREATE INDEX CONCURRENTLY is not supported
 -- MPP-9772, MPP-9773: re-enable CREATE INDEX CONCURRENTLY (off by default)
 set gp_create_index_concurrently=true;
 CREATE INDEX CONCURRENTLY concur_index1 ON concur_heap(f2,f1);
-INSERT INTO concur_heap VALUES  ('a','b');
-INSERT INTO concur_heap VALUES  ('b','b');
+INSERT INTO concur_heap VALUES  ('a','b', '1');
+INSERT INTO concur_heap VALUES  ('b','b', '1');
+INSERT INTO concur_heap VALUES  ('c','c', '2');
+INSERT INTO concur_heap VALUES  ('d','d', '3');
 -- unique index
-CREATE UNIQUE INDEX CONCURRENTLY concur_index2 ON concur_heap(f1);
+CREATE UNIQUE INDEX CONCURRENTLY concur_index2 ON concur_heap(dk, f1);
 -- check if constraint is set up properly to be enforced
-INSERT INTO concur_heap VALUES ('b','x');
+INSERT INTO concur_heap VALUES ('b','x', '1');
 ERROR:  duplicate key value violates unique constraint "concur_index2"
-DETAIL:  Key (f1)=(b) already exists.
+DETAIL:  Key (dk, f1)=(1, b) already exists.
 -- check if constraint is enforced properly at build time
---CREATE UNIQUE INDEX CONCURRENTLY concur_index3 ON concur_heap(f2);
+CREATE UNIQUE INDEX CONCURRENTLY concur_index3 ON concur_heap(dk, f2);
+ERROR:  could not create unique index "concur_index3"
+DETAIL:  Key (dk, f2)=(1, b) is duplicated.
 -- test that expression indexes and partial indexes work concurrently
 CREATE INDEX CONCURRENTLY concur_index4 on concur_heap(f2) WHERE f1='a';
 CREATE INDEX CONCURRENTLY concur_index5 on concur_heap(f2) WHERE f1='x';
@@ -417,10 +433,12 @@ COMMIT;
 Table "public.concur_heap"
  Column | Type | Modifiers 
 --------+------+-----------
+ dk     | text | 
  f1     | text | 
  f2     | text | 
 Indexes:
-    "concur_index2" UNIQUE, btree (f1)
+    "concur_index2" UNIQUE, btree (dk, f1)
+    "concur_index3" UNIQUE, btree (dk, f2) INVALID
     "concur_index1" btree (f2, f1)
     "concur_index4" btree (f2) WHERE f1 = 'a'::text
     "concur_index5" btree (f2) WHERE f1 = 'x'::text
@@ -429,3 +447,71 @@ Indexes:
 Distributed by: (f1)
 
 DROP TABLE concur_heap;
+--
+-- Tests for IS NULL with b-tree indexes
+--
+SELECT unique1, unique2 INTO onek_with_null FROM onek;
+INSERT INTO onek_with_null (unique1,unique2) VALUES (NULL, -1), (NULL, NULL);
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2,unique1);
+SET enable_seqscan = OFF;
+SET enable_indexscan = ON;
+SET enable_bitmapscan = ON;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+ count 
+-------
+     2
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+ count 
+-------
+     1
+(1 row)
+
+DROP INDEX onek_nulltest;
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2 desc,unique1);
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+ count 
+-------
+     2
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+ count 
+-------
+     1
+(1 row)
+
+DROP INDEX onek_nulltest;
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2 desc nulls last,unique1);
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+ count 
+-------
+     2
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+ count 
+-------
+     1
+(1 row)
+
+DROP INDEX onek_nulltest;
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2  nulls first,unique1);
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+ count 
+-------
+     2
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+ count 
+-------
+     1
+(1 row)
+
+RESET enable_seqscan;
+RESET enable_indexscan;
+RESET enable_bitmapscan;
+ 
+DROP TABLE onek_with_null;
diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
index 7263c7990790..c26f8810e06b 100755
--- a/src/test/regress/expected/create_table.out
+++ b/src/test/regress/expected/create_table.out
@@ -247,3 +247,7 @@ CREATE TABLE array_index_op_test (
 );
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'seqno' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE test_tsvector( 
+	t text, 
+	a tsvector 
+);
diff --git a/src/test/regress/expected/create_type.out b/src/test/regress/expected/create_type.out
index fa11d342260e..a019f337bdf8 100755
--- a/src/test/regress/expected/create_type.out
+++ b/src/test/regress/expected/create_type.out
@@ -106,6 +106,8 @@ DROP TABLE default_test;
 -- (we have borrowed numeric's typmod functions)
 CREATE TEMP TABLE mytab (foo widget(42,13,7));     -- should fail
 ERROR:  invalid NUMERIC type modifier
+LINE 1: CREATE TEMP TABLE mytab (foo widget(42,13,7));
+                                     ^
 CREATE TEMP TABLE mytab (foo widget(42,13));
 SELECT format_type(atttypid,atttypmod) FROM pg_attribute
 WHERE attrelid = 'mytab'::regclass AND attnum > 0;
diff --git a/src/test/regress/expected/decode_expr.out b/src/test/regress/expected/decode_expr.out
index 04d13346eb80..735de2a35e27 100644
--- a/src/test/regress/expected/decode_expr.out
+++ b/src/test/regress/expected/decode_expr.out
@@ -862,6 +862,11 @@ select * from vtable order by a;
 (2 rows)
 
 select decode(null, 1, 'null = 1', 'null != 1');
+ERROR:  operator does not exist: text = integer
+LINE 1: select decode(null, 1, 'null = 1', 'null != 1');
+                            ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+select decode(null::integer, 1, 'null = 1', 'null != 1');
    case    
 -----------
  null != 1
@@ -924,18 +929,10 @@ commit;
 select gender, decode(gender, 1, 'Unknown', 'M', 'Male', 'F', 'Female', 'Unknown')
 from genders
 order by gender,student_id;
- gender |  case  
---------+--------
- F      | Female
- F      | Female
- F      | Female
- F      | Female
- M      | Male
- M      | Male
- M      | Male
- M      | Male
-(8 rows)
-
+ERROR:  operator does not exist: character = integer
+LINE 1: select gender, decode(gender, 1, 'Unknown', 'M', 'Male', 'F'...
+                                      ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 select gender,decode(gender, 'N/A', 'Unknown', 'M', 'Male', 'F', 'Female')
 from genders
 order by gender,student_id;
diff --git a/src/test/regress/expected/domain.out b/src/test/regress/expected/domain.out
index ef662959abd2..b406472d6027 100755
--- a/src/test/regress/expected/domain.out
+++ b/src/test/regress/expected/domain.out
@@ -69,6 +69,25 @@ from basictest;
            |       
 (3 rows)
 
+-- check that union/case/coalesce type resolution handles domains properly
+select coalesce(4::domainint4, 7) is of (int4) as t;
+ t 
+---
+ t
+(1 row)
+
+select coalesce(4::domainint4, 7) is of (domainint4) as f;
+ f 
+---
+ f
+(1 row)
+
+select coalesce(4::domainint4, 7::domainint4) is of (domainint4) as t;
+ t 
+---
+ t
+(1 row)
+
 drop table basictest;
 drop domain domainvarchar restrict;
 drop domain domainnumeric restrict;
@@ -213,7 +232,15 @@ create table defaulttest
             , col8 ddef5
             );
 NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "defaulttest_pkey" for table "defaulttest"
-insert into defaulttest default values;
+insert into defaulttest(col4) values(0); -- fails, col5 defaults to null
+ERROR:  null value in column "col5" violates not-null constraint
+alter table defaulttest alter column col5 drop default;
+insert into defaulttest default values; -- succeeds, inserts domain default
+-- We used to treat SET DEFAULT NULL as equivalent to DROP DEFAULT; wrong
+alter table defaulttest alter column col5 set default null;
+insert into defaulttest(col4) values(0); -- fails
+ERROR:  null value in column "col5" violates not-null constraint
+alter table defaulttest alter column col5 drop default;
 insert into defaulttest default values;
 insert into defaulttest default values;
 -- Test defaults with copy
@@ -456,6 +483,11 @@ insert into ddtest2 values(row(-1));
 alter domain posint add constraint c1 check(value >= 0);
 ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
 drop table ddtest2;
+create table ddtest2(f1 ddtest1[], distkey int) distributed by (distkey);
+insert into ddtest2 values('{(-1)}');
+alter domain posint add constraint c1 check(value >= 0);
+ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
+drop table ddtest2;
 alter domain posint add constraint c1 check(value >= 0);
 create domain posint2 as posint check (value % 2 = 0);
 create table ddtest2(f1 posint2);
diff --git a/src/test/regress/expected/domain_optimizer.out b/src/test/regress/expected/domain_optimizer.out
index bc9f59026e44..b5cd643f6363 100755
--- a/src/test/regress/expected/domain_optimizer.out
+++ b/src/test/regress/expected/domain_optimizer.out
@@ -69,6 +69,25 @@ from basictest;
            |       
 (3 rows)
 
+-- check that union/case/coalesce type resolution handles domains properly
+select coalesce(4::domainint4, 7) is of (int4) as t;
+ t 
+---
+ t
+(1 row)
+
+select coalesce(4::domainint4, 7) is of (domainint4) as f;
+ f 
+---
+ f
+(1 row)
+
+select coalesce(4::domainint4, 7::domainint4) is of (domainint4) as t;
+ t 
+---
+ t
+(1 row)
+
 drop table basictest;
 drop domain domainvarchar restrict;
 drop domain domainnumeric restrict;
@@ -215,7 +234,17 @@ create table defaulttest
             , col8 ddef5
             );
 NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "defaulttest_pkey" for table "defaulttest"
-insert into defaulttest default values;
+insert into defaulttest(col4) values(0); -- fails, col5 defaults to null
+ERROR:  One or more assertions failed
+DETAIL:  Not null constraint for column col5 of table defaulttest was violated
+alter table defaulttest alter column col5 drop default;
+insert into defaulttest default values; -- succeeds, inserts domain default
+-- We used to treat SET DEFAULT NULL as equivalent to DROP DEFAULT; wrong
+alter table defaulttest alter column col5 set default null;
+insert into defaulttest(col4) values(0); -- fails
+ERROR:  One or more assertions failed
+DETAIL:  Not null constraint for column col5 of table defaulttest was violated
+alter table defaulttest alter column col5 drop default;
 insert into defaulttest default values;
 insert into defaulttest default values;
 -- Test defaults with copy
@@ -458,6 +487,11 @@ insert into ddtest2 values(row(-1));
 alter domain posint add constraint c1 check(value >= 0);
 ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
 drop table ddtest2;
+create table ddtest2(f1 ddtest1[], distkey int) distributed by (distkey);
+insert into ddtest2 values('{(-1)}');
+alter domain posint add constraint c1 check(value >= 0);
+ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
+drop table ddtest2;
 alter domain posint add constraint c1 check(value >= 0);
 create domain posint2 as posint check (value % 2 = 0);
 create table ddtest2(f1 posint2);
diff --git a/src/test/regress/expected/enum.out b/src/test/regress/expected/enum.out
new file mode 100644
index 000000000000..b07ae634b258
--- /dev/null
+++ b/src/test/regress/expected/enum.out
@@ -0,0 +1,374 @@
+--
+-- Enum tests
+--
+CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple');
+--
+-- Did it create the right number of rows?
+--
+SELECT COUNT(*) FROM pg_enum WHERE enumtypid = 'rainbow'::regtype;
+ count 
+-------
+     6
+(1 row)
+
+--
+-- I/O functions
+--
+SELECT 'red'::rainbow;
+ rainbow 
+---------
+ red
+(1 row)
+
+SELECT 'mauve'::rainbow;
+ERROR:  invalid input value for enum rainbow: "mauve"
+LINE 1: SELECT 'mauve'::rainbow;
+               ^
+--
+-- Basic table creation, row selection
+--
+CREATE TABLE enumtest (col rainbow);
+INSERT INTO enumtest values ('red'), ('orange'), ('yellow'), ('green');
+COPY enumtest FROM stdin;
+SELECT * FROM enumtest;
+  col   
+--------
+ red
+ orange
+ yellow
+ green
+ blue
+ purple
+(6 rows)
+
+--
+-- Operators, no index
+--
+SELECT * FROM enumtest WHERE col = 'orange';
+  col   
+--------
+ orange
+(1 row)
+
+SELECT * FROM enumtest WHERE col <> 'orange' ORDER BY col;
+  col   
+--------
+ red
+ yellow
+ green
+ blue
+ purple
+(5 rows)
+
+SELECT * FROM enumtest WHERE col > 'yellow' ORDER BY col;
+  col   
+--------
+ green
+ blue
+ purple
+(3 rows)
+
+SELECT * FROM enumtest WHERE col >= 'yellow' ORDER BY col;
+  col   
+--------
+ yellow
+ green
+ blue
+ purple
+(4 rows)
+
+SELECT * FROM enumtest WHERE col < 'green' ORDER BY col;
+  col   
+--------
+ red
+ orange
+ yellow
+(3 rows)
+
+SELECT * FROM enumtest WHERE col <= 'green' ORDER BY col;
+  col   
+--------
+ red
+ orange
+ yellow
+ green
+(4 rows)
+
+--
+-- Cast to/from text
+--
+SELECT 'red'::rainbow::text || 'hithere';
+  ?column?  
+------------
+ redhithere
+(1 row)
+
+SELECT 'red'::text::rainbow = 'red'::rainbow;
+ ?column? 
+----------
+ t
+(1 row)
+
+--
+-- Aggregates
+--
+SELECT min(col) FROM enumtest;
+ min 
+-----
+ red
+(1 row)
+
+SELECT max(col) FROM enumtest;
+  max   
+--------
+ purple
+(1 row)
+
+SELECT max(col) FROM enumtest WHERE col < 'green';
+  max   
+--------
+ yellow
+(1 row)
+
+--
+-- Index tests, force use of index
+--
+SET enable_seqscan = off;
+SET enable_bitmapscan = off;
+--
+-- Btree index / opclass with the various operators
+--
+CREATE INDEX enumtest_btree ON enumtest USING btree (col);
+SELECT * FROM enumtest WHERE col = 'orange';
+  col   
+--------
+ orange
+(1 row)
+
+SELECT * FROM enumtest WHERE col <> 'orange' ORDER BY col;
+  col   
+--------
+ red
+ yellow
+ green
+ blue
+ purple
+(5 rows)
+
+SELECT * FROM enumtest WHERE col > 'yellow' ORDER BY col;
+  col   
+--------
+ green
+ blue
+ purple
+(3 rows)
+
+SELECT * FROM enumtest WHERE col >= 'yellow' ORDER BY col;
+  col   
+--------
+ yellow
+ green
+ blue
+ purple
+(4 rows)
+
+SELECT * FROM enumtest WHERE col < 'green' ORDER BY col;
+  col   
+--------
+ red
+ orange
+ yellow
+(3 rows)
+
+SELECT * FROM enumtest WHERE col <= 'green' ORDER BY col;
+  col   
+--------
+ red
+ orange
+ yellow
+ green
+(4 rows)
+
+SELECT min(col) FROM enumtest;
+ min 
+-----
+ red
+(1 row)
+
+SELECT max(col) FROM enumtest;
+  max   
+--------
+ purple
+(1 row)
+
+SELECT max(col) FROM enumtest WHERE col < 'green';
+  max   
+--------
+ yellow
+(1 row)
+
+DROP INDEX enumtest_btree;
+--
+-- End index tests
+--
+RESET enable_seqscan;
+RESET enable_bitmapscan;
+--
+-- Domains over enums
+--
+CREATE DOMAIN rgb AS rainbow CHECK (VALUE IN ('red', 'green', 'blue'));
+SELECT 'red'::rgb;
+ rgb 
+-----
+ red
+(1 row)
+
+SELECT 'purple'::rgb;
+ERROR:  value for domain rgb violates check constraint "rgb_check"
+SELECT 'purple'::rainbow::rgb;
+ERROR:  value for domain rgb violates check constraint "rgb_check"
+DROP DOMAIN rgb;
+--
+-- Arrays
+--
+SELECT '{red,green,blue}'::rainbow[];
+     rainbow      
+------------------
+ {red,green,blue}
+(1 row)
+
+SELECT ('{red,green,blue}'::rainbow[])[2];
+ rainbow 
+---------
+ green
+(1 row)
+
+SELECT 'red' = ANY ('{red,green,blue}'::rainbow[]);
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT 'yellow' = ANY ('{red,green,blue}'::rainbow[]);
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT 'red' = ALL ('{red,green,blue}'::rainbow[]);
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT 'red' = ALL ('{red,red}'::rainbow[]);
+ ?column? 
+----------
+ t
+(1 row)
+
+--
+-- Support functions
+--
+SELECT enum_first(NULL::rainbow);
+ enum_first 
+------------
+ red
+(1 row)
+
+SELECT enum_last('green'::rainbow);
+ enum_last 
+-----------
+ purple
+(1 row)
+
+SELECT enum_range(NULL::rainbow);
+              enum_range               
+---------------------------------------
+ {red,orange,yellow,green,blue,purple}
+(1 row)
+
+SELECT enum_range('orange'::rainbow, 'green'::rainbow);
+      enum_range       
+-----------------------
+ {orange,yellow,green}
+(1 row)
+
+SELECT enum_range(NULL, 'green'::rainbow);
+        enum_range         
+---------------------------
+ {red,orange,yellow,green}
+(1 row)
+
+SELECT enum_range('orange'::rainbow, NULL);
+            enum_range             
+-----------------------------------
+ {orange,yellow,green,blue,purple}
+(1 row)
+
+SELECT enum_range(NULL::rainbow, NULL);
+              enum_range               
+---------------------------------------
+ {red,orange,yellow,green,blue,purple}
+(1 row)
+
+--
+-- User functions, can't test perl/python etc here since may not be compiled.
+--
+CREATE FUNCTION echo_me(anyenum) RETURNS text AS $$
+BEGIN
+RETURN $1::text || 'omg';
+END
+$$ LANGUAGE plpgsql;
+SELECT echo_me('red'::rainbow);
+ echo_me 
+---------
+ redomg
+(1 row)
+
+--
+-- Concrete function should override generic one
+--
+CREATE FUNCTION echo_me(rainbow) RETURNS text AS $$
+BEGIN
+RETURN $1::text || 'wtf';
+END
+$$ LANGUAGE plpgsql;
+SELECT echo_me('red'::rainbow);
+ echo_me 
+---------
+ redwtf
+(1 row)
+
+--
+-- If we drop the original generic one, we don't have to qualify the type
+-- anymore, since there's only one match
+--
+DROP FUNCTION echo_me(anyenum);
+SELECT echo_me('red');
+ echo_me 
+---------
+ redwtf
+(1 row)
+
+DROP FUNCTION echo_me(rainbow);
+--
+-- Cleanup
+--
+DROP TABLE enumtest;
+DROP TYPE rainbow;
+--
+-- Verify properly cleaned up
+--
+SELECT COUNT(*) FROM pg_type WHERE typname = 'rainbow';
+ count 
+-------
+     0
+(1 row)
+
+SELECT * FROM pg_enum WHERE NOT EXISTS
+  (SELECT 1 FROM pg_type WHERE pg_type.oid = enumtypid);
+ enumtypid | enumlabel 
+-----------+-----------
+(0 rows)
+
diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out
index ccfc2ea17dca..c377af196137 100755
--- a/src/test/regress/expected/errors.out
+++ b/src/test/regress/expected/errors.out
@@ -127,7 +127,7 @@ ERROR:  column "oid" of relation "stud_emp" already exists
  
 -- not in a xact 
 abort;
-WARNING:  there is no transaction in progress
+NOTICE:  there is no transaction in progress
 -- not in a xact 
 end;
 WARNING:  there is no transaction in progress
diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index 327d57c5148c..47f430ce53c8 100755
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -620,7 +620,6 @@ SELECT * from FKTABLE ORDER BY 1,2;
 UPDATE PKTABLE set ptest2=5 where ptest2=2;
 ERROR:  insert or update on table "fktable" violates foreign key constraint "constrname3"
 DETAIL:  Key (ftest1,ftest2,ftest3)=(1,-1,3) is not present in table "pktable".
-CONTEXT:  SQL statement "UPDATE ONLY "public"."fktable" SET "ftest2" = DEFAULT WHERE $1 OPERATOR(pg_catalog.=) "ftest1" AND $2 OPERATOR(pg_catalog.=) "ftest2" AND $3 OPERATOR(pg_catalog.=) "ftest3""
 -- Try to update something that will set default
 UPDATE PKTABLE set ptest1=0, ptest2=5, ptest3=10 where ptest2=2;
 UPDATE PKTABLE set ptest2=10 where ptest2=4;
@@ -1097,11 +1096,12 @@ ALTER TABLE fktable ADD CONSTRAINT fk_3_1
 FOREIGN KEY (x3) REFERENCES pktable(id1);
 ERROR:  foreign key constraint "fk_3_1" cannot be implemented
 DETAIL:  Key columns "x3" and "id1" are of incompatible types: real and integer.
--- should succeed
--- int4 promotes to text, so this is allowed (though pretty durn debatable)
+-- int4 does not promote to text
 ALTER TABLE fktable ADD CONSTRAINT fk_1_2
 FOREIGN KEY (x1) REFERENCES pktable(id2);
-ERROR:  relation "fktable" does not exist
+ERROR:  foreign key constraint "fk_1_2" cannot be implemented
+DETAIL:  Key columns "x1" and "id2" are of incompatible types: integer and character varying.
+-- should succeed
 -- int4 promotes to real
 ALTER TABLE fktable ADD CONSTRAINT fk_1_3
 FOREIGN KEY (x1) REFERENCES pktable(id3);
@@ -1127,7 +1127,7 @@ FOREIGN KEY (x2,x5,x3) REFERENCES pktable(id2,id1,id3);
 ALTER TABLE fktable ADD CONSTRAINT fk_123_231
 FOREIGN KEY (x1,x2,x3) REFERENCES pktable(id2,id3,id1);
 ERROR:  foreign key constraint "fk_123_231" cannot be implemented
-DETAIL:  Key columns "x2" and "id3" are of incompatible types: character varying and real.
+DETAIL:  Key columns "x1" and "id2" are of incompatible types: integer and character varying.
 ALTER TABLE fktable ADD CONSTRAINT fk_241_132
 FOREIGN KEY (x2,x4,x1) REFERENCES pktable(id1,id3,id2);
 ERROR:  foreign key constraint "fk_241_132" cannot be implemented
@@ -1139,7 +1139,6 @@ NOTICE:  drop cascades to constraint fk_123_123 on table fktable
 NOTICE:  drop cascades to constraint fk_5_1 on table fktable
 NOTICE:  drop cascades to constraint fktable_x1_fkey on table fktable
 NOTICE:  drop cascades to constraint fk_4_2 on table fktable
-NOTICE:  drop cascades to constraint fk_1_2 on table fktable
 NOTICE:  drop cascades to constraint fktable_x2_fkey on table fktable
 NOTICE:  drop cascades to constraint fk_1_3 on table fktable
 NOTICE:  drop cascades to constraint fktable_x3_fkey on table fktable
@@ -1274,3 +1273,35 @@ SELECT * FROM tasks;
 (3 rows)
 
 COMMIT;
+--
+-- Test self-referential FK with CASCADE (bug #6268)
+--
+create temp table selfref (
+    a int primary key,
+    b int,
+    foreign key (b) references selfref (a)
+        on update cascade on delete cascade
+);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "selfref_pkey" for table "selfref"
+insert into selfref (a, b)
+values
+    (0, 0),
+    (1, 1);
+begin;
+    update selfref set a = 123 where a = 0;
+    select a, b from selfref;
+  a  |  b  
+-----+-----
+   1 |   1
+ 123 | 123
+(2 rows)
+
+    update selfref set a = 456 where a = 123;
+    select a, b from selfref;
+  a  |  b  
+-----+-----
+   1 |   1
+ 456 | 456
+(2 rows)
+
+commit;
diff --git a/src/test/regress/expected/geometry_1.out b/src/test/regress/expected/geometry_1.out
index 164fc71017fc..0e014925257a 100755
--- a/src/test/regress/expected/geometry_1.out
+++ b/src/test/regress/expected/geometry_1.out
@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
 --
 -- Paths
 --
-SET geqo TO 'off';
 SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
  eight | npoints |           path            
 -------+---------+---------------------------
@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
        | ((34,13),(40,15))
 (8 rows)
 
-RESET geqo;
 --
 -- Polygons
 --
diff --git a/src/test/regress/expected/geometry_2.out b/src/test/regress/expected/geometry_2.out
index 2763ca1643bc..7787dab06185 100755
--- a/src/test/regress/expected/geometry_2.out
+++ b/src/test/regress/expected/geometry_2.out
@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
 --
 -- Paths
 --
-SET geqo TO 'off';
 SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
  eight | npoints |           path            
 -------+---------+---------------------------
@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
        | ((34,13),(40,15))
 (8 rows)
 
-RESET geqo;
 --
 -- Polygons
 --
diff --git a/src/test/regress/expected/gp_create_table.out b/src/test/regress/expected/gp_create_table.out
index 1601df881f5b..3442aafbac9d 100644
--- a/src/test/regress/expected/gp_create_table.out
+++ b/src/test/regress/expected/gp_create_table.out
@@ -1,9 +1,9 @@
 --MPP-22020: Dis-allow duplicate constraint names for the same table.
 create table dupconstr (
 			i int,
-			j int constraint test CHECK (j > 10),
-			CONSTRAINT test UNIQUE (i,j))
-			distributed by (i);
+						j int constraint test CHECK (j > 10),
+						CONSTRAINT test UNIQUE (i,j))
+						distributed by (i);
 NOTICE:  CREATE TABLE / UNIQUE will create implicit index "dupconstr_i_key" for table "dupconstr"
 ERROR:  constraint "test" for relation "dupconstr" already exists
 -- MPP-2764: distributed randomly is not compatible with primary key or unique
@@ -190,6 +190,6 @@ c1 int,c2 int,c3 int,c4 int,c5 int,c6 int,c7 int,c8 int,c9 int,c10 int,c11 int,c
 (
 c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,c54,c55,c56,c57,c58,c59,c60,c61,c62,c63,c64,c65,c66,c67,c68,c69,c70,c71,c72,c73,c74,c75,c76,c77,c78,c79,c80,c81,c82,c83,c84,c85,c86,c87,c88,c89,c90,c91,c92,c93,c94,c95,c96,c97,c98,c99,c100,c101,c102,c103,c104,c105,c106,c107,c108,c109,c110,c111,c112,c113,c114,c115,c116,c117,c118,c119,c120,c121,c122,c123,c124,c125,c126,c127,c128,c129,c130,c131,c132,c133,c134,c135,c136,c137,c138,c139,c140,c141,c142,c143,c144,c145,c146,c147,c148,c149,c150,c151,c152,c153,c154,c155,c156,c157,c158,c159,c160,c161,c162,c163,c164,c165,c166,c167,c168,c169,c170,c171,c172,c173,c174,c175,c176,c177,c178,c179,c180,c181,c182,c183,c184,c185,c186,c187,c188,c189,c190,c191,c192,c193,c194,c195,c196,c197,c198,c199,c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,c240,c241,c242,c243,c244,c245,c246,c247,c248,c249,c250,c251,c252,c253,c254,c255,c256,c257,c258,c259,c260,c261,c262,c263,c264,c265,c266,c267,c268,c269,c270,c271,c272,c273,c274,c275,c276,c277,c278,c279,c280,c281,c282,c283,c284,c285,c286,c287,c288,c289,c290,c291,c292,c293,c294,c295,c296,c297,c298,c299,c300,c301,c302,c303,c304,c305,c306,c307,c308,c309,c310,c311,c312,c313,c314,c315,c316,c317,c318,c319,c320,c321,c322,c323,c324,c325,c326,c327,c328,c329,c330,c331,c332,c333,c334,c335,c336,c337,c338,c339,c340,c341,c342,c343,c344,c345,c346,c347,c348,c349,c350,c351,c352,c353,c354,c355,c356,c357,c358,c359,c360,c361,c362,c363,c364,c365,c366,c367,c368,c369,c370,c371,c372,c373,c374,c375,c376,c377,c378,c379,c380,c381,c382,c383,c384,c385,c386,c387,c388,c389,c390,c391,c392,c393,c394,c395,c396,c397,c398,c399,c400,c401,c402,c403,c404,c405,c406,c407,c408,c409,c410,c411,c412,c413,c414,c415,c416,c417,c418,c419,c420,c421,c422,c423,c424,c425,c426,c427,c428,c429,c430,c431,c432,c433,c434,c435,c436,c437,c438,c439,c440,c441,c442,c443,c444,c445,c446,c447,c448,c449,c450,c451,c452,c453,c454,c455,c456,c457,c458,c459,c460,c461,c462,c463,c464,c465,c466,c467,c468,c469,c470,c471,c472,c473,c474,c475,c476,c477,c478,c479,c480,c481,c482,c483,c484,c485,c486,c487,c488,c489,c490,c491,c492,c493,c494,c495,c496,c497,c498,c499,c500,c501,c502,c503,c504,c505,c506,c507,c508,c509,c510,c511,c512,c513,c514,c515,c516,c517,c518,c519,c520,c521,c522,c523,c524,c525,c526,c527,c528,c529,c530,c531,c532,c533,c534,c535,c536,c537,c538,c539,c540,c541,c542,c543,c544,c545,c546,c547,c548,c549,c550,c551,c552,c553,c554,c555,c556,c557,c558,c559,c560,c561,c562,c563,c564,c565,c566,c567,c568,c569,c570,c571,c572,c573,c574,c575,c576,c577,c578,c579,c580,c581,c582,c583,c584,c585,c586,c587,c588,c589,c590,c591,c592,c593,c594,c595,c596,c597,c598,c599,c600,c601,c602,c603,c604,c605,c606,c607,c608,c609,c610,c611,c612,c613,c614,c615,c616,c617,c618,c619,c620,c621,c622,c623,c624,c625,c626,c627,c628,c629,c630,c631,c632,c633,c634,c635,c636,c637,c638,c639,c640,c641,c642,c643,c644,c645,c646,c647,c648,c649,c650,c651,c652,c653,c654,c655,c656,c657,c658,c659,c660,c661,c662,c663,c664,c665,c666,c667,c668,c669,c670,c671,c672,c673,c674,c675,c676,c677,c678,c679,c680,c681,c682,c683,c684,c685,c686,c687,c688,c689,c690,c691,c692,c693,c694,c695,c696,c697,c698,c699,c700,c701,c702,c703,c704,c705,c706,c707,c708,c709,c710,c711,c712,c713,c714,c715,c716,c717,c718,c719,c720,c721,c722,c723,c724,c725,c726,c727,c728,c729,c730,c731,c732,c733,c734,c735,c736,c737,c738,c739,c740,c741,c742,c743,c744,c745,c746,c747,c748,c749,c750,c751,c752,c753,c754,c755,c756,c757,c758,c759,c760,c761,c762,c763,c764,c765,c766,c767,c768,c769,c770,c771,c772,c773,c774,c775,c776,c777,c778,c779,c780,c781,c782,c783,c784,c785,c786,c787,c788,c789,c790,c791,c792,c793,c794,c795,c796,c797,c798,c799,c800,c801,c802,c803,c804,c805,c806,c807,c808,c809,c810,c811,c812,c813,c814,c815,c816,c817,c818,c819,c820,c821,c822,c823,c824,c825,c826,c827,c828,c829,c830,c831,c832,c833,c834,c835,c836,c837,c838,c839,c840,c841,c842,c843,c844,c845,c846,c847,c848,c849,c850,c851,c852,c853,c854,c855,c856,c857,c858,c859,c860,c861,c862,c863,c864,c865,c866,c867,c868,c869,c870,c871,c872,c873,c874,c875,c876,c877,c878,c879,c880,c881,c882,c883,c884,c885,c886,c887,c888,c889,c890,c891,c892,c893,c894,c895,c896,c897,c898,c899,c900,c901,c902,c903,c904,c905,c906,c907,c908,c909,c910,c911,c912,c913,c914,c915,c916,c917,c918,c919,c920,c921,c922,c923,c924,c925,c926,c927,c928,c929,c930,c931,c932,c933,c934,c935,c936,c937,c938,c939,c940,c941,c942,c943,c944,c945,c946,c947,c948,c949,c950,c951,c952,c953,c954,c955,c956,c957,c958,c959,c960,c961,c962,c963,c964,c965,c966,c967,c968,c969,c970,c971,c972,c973,c974,c975,c976,c977,c978,c979,c980,c981,c982,c983,c984,c985,c986,c987,c988,c989,c990,c991,c992,c993,c994,c995,c996,c997,c998,c999,c1000,c1001,c1002,c1003,c1004,c1005,c1006,c1007,c1008,c1009,c1010,c1011,c1012,c1013,c1014,c1015,c1016,c1017,c1018,c1019,c1020,c1021,c1022,c1023,c1024,c1025,c1026,c1027,c1028,c1029,c1030,c1031,c1032,c1033,c1034,c1035,c1036,c1037,c1038,c1039,c1040,c1041,c1042,c1043,c1044,c1045,c1046,c1047,c1048,c1049,c1050,c1051,c1052,c1053,c1054,c1055,c1056,c1057,c1058,c1059,c1060,c1061,c1062,c1063,c1064,c1065,c1066,c1067,c1068,c1069,c1070,c1071,c1072,c1073,c1074,c1075,c1076,c1077,c1078,c1079,c1080,c1081,c1082,c1083,c1084,c1085,c1086,c1087,c1088,c1089,c1090,c1091,c1092,c1093,c1094,c1095,c1096,c1097,c1098,c1099,c1100,c1101,c1102,c1103,c1104,c1105,c1106,c1107,c1108,c1109,c1110,c1111,c1112,c1113,c1114,c1115,c1116,c1117,c1118,c1119,c1120,c1121,c1122,c1123,c1124,c1125,c1126,c1127,c1128,c1129,c1130,c1131,c1132,c1133,c1134,c1135,c1136,c1137,c1138,c1139,c1140,c1141,c1142,c1143,c1144,c1145,c1146,c1147,c1148,c1149,c1150,c1151,c1152,c1153,c1154,c1155,c1156,c1157,c1158,c1159,c1160,c1161,c1162,c1163,c1164,c1165,c1166,c1167,c1168,c1169,c1170,c1171,c1172,c1173,c1174,c1175,c1176,c1177,c1178,c1179,c1180,c1181,c1182,c1183,c1184,c1185,c1186,c1187,c1188,c1189,c1190,c1191,c1192,c1193,c1194,c1195,c1196,c1197,c1198,c1199,c1200,c1201,c1202,c1203,c1204,c1205,c1206,c1207,c1208,c1209,c1210,c1211,c1212,c1213,c1214,c1215,c1216,c1217,c1218,c1219,c1220,c1221,c1222,c1223,c1224,c1225,c1226,c1227,c1228,c1229,c1230,c1231,c1232,c1233,c1234,c1235,c1236,c1237,c1238,c1239,c1240,c1241,c1242,c1243,c1244,c1245,c1246,c1247,c1248,c1249,c1250,c1251,c1252,c1253,c1254,c1255,c1256,c1257,c1258,c1259,c1260,c1261,c1262,c1263,c1264,c1265,c1266,c1267,c1268,c1269,c1270,c1271,c1272,c1273,c1274,c1275,c1276,c1277,c1278,c1279,c1280,c1281,c1282,c1283,c1284,c1285,c1286,c1287,c1288,c1289,c1290,c1291,c1292,c1293,c1294,c1295,c1296,c1297,c1298,c1299,c1300,c1301,c1302,c1303,c1304,c1305,c1306,c1307,c1308,c1309,c1310,c1311,c1312,c1313,c1314,c1315,c1316,c1317,c1318,c1319,c1320,c1321,c1322,c1323,c1324,c1325,c1326,c1327,c1328,c1329,c1330,c1331,c1332,c1333,c1334,c1335,c1336,c1337,c1338,c1339,c1340,c1341,c1342,c1343,c1344,c1345,c1346,c1347,c1348,c1349,c1350,c1351,c1352,c1353,c1354,c1355,c1356,c1357,c1358,c1359,c1360,c1361,c1362,c1363,c1364,c1365,c1366,c1367,c1368,c1369,c1370,c1371,c1372,c1373,c1374,c1375,c1376,c1377,c1378,c1379,c1380,c1381,c1382,c1383,c1384,c1385,c1386,c1387,c1388,c1389,c1390,c1391,c1392,c1393,c1394,c1395,c1396,c1397,c1398,c1399,c1400,c1401,c1402,c1403,c1404,c1405,c1406,c1407,c1408,c1409,c1410,c1411,c1412,c1413,c1414,c1415,c1416,c1417,c1418,c1419,c1420,c1421,c1422,c1423,c1424,c1425,c1426,c1427,c1428,c1429,c1430,c1431,c1432,c1433,c1434,c1435,c1436,c1437,c1438,c1439,c1440,c1441,c1442,c1443,c1444,c1445,c1446,c1447,c1448,c1449,c1450,c1451,c1452,c1453,c1454,c1455,c1456,c1457,c1458,c1459,c1460,c1461,c1462,c1463,c1464,c1465,c1466,c1467,c1468,c1469,c1470,c1471,c1472,c1473,c1474,c1475,c1476,c1477,c1478,c1479,c1480,c1481,c1482,c1483,c1484,c1485,c1486,c1487,c1488,c1489,c1490,c1491,c1492,c1493,c1494,c1495,c1496,c1497,c1498,c1499,c1500,c1501,c1502,c1503,c1504,c1505,c1506,c1507,c1508,c1509,c1510,c1511,c1512,c1513,c1514,c1515,c1516,c1517,c1518,c1519,c1520,c1521,c1522,c1523,c1524,c1525,c1526,c1527,c1528,c1529,c1530,c1531,c1532,c1533,c1534,c1535,c1536,c1537,c1538,c1539,c1540,c1541,c1542,c1543,c1544,c1545,c1546,c1547,c1548,c1549,c1550,c1551,c1552,c1553,c1554,c1555,c1556,c1557,c1558,c1559,c1560,c1561,c1562,c1563,c1564,c1565,c1566,c1567,c1568,c1569,c1570,c1571,c1572,c1573,c1574,c1575,c1576,c1577,c1578,c1579,c1580,c1581,c1582,c1583,c1584,c1585,c1586,c1587,c1588,c1589,c1590,c1591,c1592,c1593,c1594,c1595,c1596,c1597,c1598,c1599,c1600,c1601
 );
-ERROR:  number of distributed by columns exceeds limit (1600)
+ERROR:  tables can have at most 1600 columns
 drop table if exists foo;
 NOTICE:  table "foo" does not exist, skipping
diff --git a/src/test/regress/expected/gp_optimizer.out b/src/test/regress/expected/gp_optimizer.out
index 09038f5a9ee4..43afc482e639 100644
--- a/src/test/regress/expected/gp_optimizer.out
+++ b/src/test/regress/expected/gp_optimizer.out
@@ -8022,27 +8022,27 @@ partition bb start(100) end(200) every (50) );
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1" for table "multilevel_p"
-NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2" for table "multilevel_p"
-NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1" for table "multilevel_p"
-NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp1_1" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp1_2" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_1" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_2" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_3" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_4" for table "multilevel_p_1_prt_aa_1"
+NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp1_1" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp1_2" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_1" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_2" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_3" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_4" for table "multilevel_p_1_prt_aa_2"
+NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp1_1" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp1_2" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_1" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_2" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_3" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_4" for table "multilevel_p_1_prt_bb_1"
+NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2_2_prt_sp1_1" for table "multilevel_p_1_prt_bb_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2_2_prt_sp1_2" for table "multilevel_p_1_prt_bb_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2_2_prt_sp2_1" for table "multilevel_p_1_prt_bb_2"
diff --git a/src/test/regress/expected/gp_optimizer_1.out b/src/test/regress/expected/gp_optimizer_1.out
index f0542524c185..0e617553338d 100644
--- a/src/test/regress/expected/gp_optimizer_1.out
+++ b/src/test/regress/expected/gp_optimizer_1.out
@@ -8023,27 +8023,27 @@ partition bb start(100) end(200) every (50) );
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1" for table "multilevel_p"
-NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2" for table "multilevel_p"
-NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1" for table "multilevel_p"
-NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp1_1" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp1_2" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_1" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_2" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_3" for table "multilevel_p_1_prt_aa_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_1_2_prt_sp2_4" for table "multilevel_p_1_prt_aa_1"
+NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp1_1" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp1_2" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_1" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_2" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_3" for table "multilevel_p_1_prt_aa_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_aa_2_2_prt_sp2_4" for table "multilevel_p_1_prt_aa_2"
+NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp1_1" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp1_2" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_1" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_2" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_3" for table "multilevel_p_1_prt_bb_1"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_1_2_prt_sp2_4" for table "multilevel_p_1_prt_bb_1"
+NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2" for table "multilevel_p"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2_2_prt_sp1_1" for table "multilevel_p_1_prt_bb_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2_2_prt_sp1_2" for table "multilevel_p_1_prt_bb_2"
 NOTICE:  CREATE TABLE will create partition "multilevel_p_1_prt_bb_2_2_prt_sp2_1" for table "multilevel_p_1_prt_bb_2"
diff --git a/src/test/regress/expected/gpdist.out b/src/test/regress/expected/gpdist.out
index 322155fd6e64..ca51e67e4d8a 100644
--- a/src/test/regress/expected/gpdist.out
+++ b/src/test/regress/expected/gpdist.out
@@ -355,9 +355,9 @@ create table pt(i int, j int, k int, l char(2)) distributed by (i)
 partition by range(k) subpartition by list(l) subpartition template(values('A'),
 values('B')) (start(30) end(50) every(10));
 NOTICE:  CREATE TABLE will create partition "pt_1_prt_1" for table "pt"
-NOTICE:  CREATE TABLE will create partition "pt_1_prt_2" for table "pt"
 NOTICE:  CREATE TABLE will create partition "pt_1_prt_1_2_prt_1" for table "pt_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "pt_1_prt_1_2_prt_2" for table "pt_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "pt_1_prt_2" for table "pt"
 NOTICE:  CREATE TABLE will create partition "pt_1_prt_2_2_prt_1" for table "pt_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "pt_1_prt_2_2_prt_2" for table "pt_1_prt_2"
 alter table only pt set distributed randomly;
diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out
index bad2cec3faa3..74e8b3ebd37b 100755
--- a/src/test/regress/expected/guc.out
+++ b/src/test/regress/expected/guc.out
@@ -352,6 +352,85 @@ SELECT '2006-08-13 12:34:56'::timestamptz;
  2006-08-13 12:34:56-07
 (1 row)
 
+-- SET LOCAL persists through RELEASE (which was not true in 8.0-8.2)
+BEGIN;
+SHOW vacuum_cost_delay;
+ vacuum_cost_delay 
+-------------------
+ 400ms
+(1 row)
+
+SHOW datestyle;
+ DateStyle 
+-----------
+ ISO, YMD
+(1 row)
+
+SELECT '2006-08-13 12:34:56'::timestamptz;
+      timestamptz       
+------------------------
+ 2006-08-13 12:34:56-07
+(1 row)
+
+SAVEPOINT sp;
+SET LOCAL vacuum_cost_delay TO 300;
+SHOW vacuum_cost_delay;
+ vacuum_cost_delay 
+-------------------
+ 300ms
+(1 row)
+
+SET LOCAL datestyle = 'Postgres, MDY';
+SHOW datestyle;
+   DateStyle   
+---------------
+ Postgres, MDY
+(1 row)
+
+SELECT '2006-08-13 12:34:56'::timestamptz;
+         timestamptz          
+------------------------------
+ Sun Aug 13 12:34:56 2006 PDT
+(1 row)
+
+RELEASE SAVEPOINT sp;
+SHOW vacuum_cost_delay;
+ vacuum_cost_delay 
+-------------------
+ 300ms
+(1 row)
+
+SHOW datestyle;
+   DateStyle   
+---------------
+ Postgres, MDY
+(1 row)
+
+SELECT '2006-08-13 12:34:56'::timestamptz;
+         timestamptz          
+------------------------------
+ Sun Aug 13 12:34:56 2006 PDT
+(1 row)
+
+ROLLBACK;
+SHOW vacuum_cost_delay;
+ vacuum_cost_delay 
+-------------------
+ 400ms
+(1 row)
+
+SHOW datestyle;
+ DateStyle 
+-----------
+ ISO, YMD
+(1 row)
+
+SELECT '2006-08-13 12:34:56'::timestamptz;
+      timestamptz       
+------------------------
+ 2006-08-13 12:34:56-07
+(1 row)
+
 -- SET followed by SET LOCAL
 BEGIN;
 SET vacuum_cost_delay TO 400;
@@ -425,6 +504,212 @@ SELECT '2006-08-13 12:34:56'::timestamptz;
  Sun Aug 13 12:34:56 2006 PDT
 (1 row)
 
+--
+-- Test DISCARD TEMP
+--
+CREATE TEMP TABLE reset_test ( data text ) ON COMMIT DELETE ROWS;
+SELECT relname FROM pg_class WHERE relname = 'reset_test';
+  relname   
+------------
+ reset_test
+(1 row)
+
+DISCARD TEMP;
+SELECT relname FROM pg_class WHERE relname = 'reset_test';
+ relname 
+---------
+(0 rows)
+
+--
+-- Test DISCARD ALL
+--
+-- do changes
+DECLARE foo CURSOR WITH HOLD FOR SELECT 1;
+PREPARE foo AS SELECT 1;
+LISTEN foo_event;
+SET vacuum_cost_delay = 13;
+CREATE TEMP TABLE tmp_foo (data text) ON COMMIT DELETE ROWS;
+CREATE ROLE temp_reset_user;
+SET SESSION AUTHORIZATION temp_reset_user;
+-- look changes
+SELECT relname FROM pg_listener;
+  relname  
+-----------
+ foo_event
+(1 row)
+
+SELECT name FROM pg_prepared_statements;
+ name 
+------
+ foo
+(1 row)
+
+SELECT name FROM pg_cursors;
+ name 
+------
+ foo
+(1 row)
+
+SHOW vacuum_cost_delay;
+ vacuum_cost_delay 
+-------------------
+ 13ms
+(1 row)
+
+SELECT relname from pg_class where relname = 'tmp_foo';
+ relname 
+---------
+ tmp_foo
+(1 row)
+
+SELECT current_user = 'temp_reset_user';
+ ?column? 
+----------
+ t
+(1 row)
+
+-- discard everything
+DISCARD ALL;
+-- look again
+SELECT relname FROM pg_listener;
+ relname 
+---------
+(0 rows)
+
+SELECT name FROM pg_prepared_statements;
+ name 
+------
+(0 rows)
+
+SELECT name FROM pg_cursors;
+ name 
+------
+(0 rows)
+
+SHOW vacuum_cost_delay;
+ vacuum_cost_delay 
+-------------------
+ 0
+(1 row)
+
+SELECT relname from pg_class where relname = 'tmp_foo';
+ relname 
+---------
+(0 rows)
+
+SELECT current_user = 'temp_reset_user';
+ ?column? 
+----------
+ f
+(1 row)
+
+DROP ROLE temp_reset_user;
+--
+-- Tests for function-local GUC settings
+--
+set regex_flavor = advanced;
+create function report_guc(text) returns text as
+$$ select current_setting($1) $$ language sql
+set regex_flavor = basic;
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+ report_guc | current_setting 
+------------+-----------------
+ basic      | advanced
+(1 row)
+
+-- this should draw only a warning
+alter function report_guc(text) set search_path = no_such_schema;
+NOTICE:  schema "no_such_schema" does not exist
+-- with error occurring here
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+ERROR:  schema "no_such_schema" does not exist
+alter function report_guc(text) reset search_path set regex_flavor = extended;
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+ report_guc | current_setting 
+------------+-----------------
+ extended   | advanced
+(1 row)
+
+alter function report_guc(text) reset all;
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+ report_guc | current_setting 
+------------+-----------------
+ advanced   | advanced
+(1 row)
+
+-- SET LOCAL is restricted by a function SET option
+create or replace function myfunc(int) returns text as $$
+begin
+  set local regex_flavor = extended;
+  return current_setting('regex_flavor');
+end $$
+language plpgsql
+set regex_flavor = basic;
+select myfunc(0), current_setting('regex_flavor');
+  myfunc  | current_setting 
+----------+-----------------
+ extended | advanced
+(1 row)
+
+alter function myfunc(int) reset all;
+select myfunc(0), current_setting('regex_flavor');
+  myfunc  | current_setting 
+----------+-----------------
+ extended | advanced
+(1 row)
+
+set regex_flavor = advanced;
+-- but SET isn't
+create or replace function myfunc(int) returns text as $$
+begin
+  set regex_flavor = extended;
+  return current_setting('regex_flavor');
+end $$
+language plpgsql
+set regex_flavor = basic;
+select myfunc(0), current_setting('regex_flavor');
+  myfunc  | current_setting 
+----------+-----------------
+ extended | advanced
+(1 row)
+
+-- In GPDB, the plan looks somewhat different from what you get on
+-- PostgreSQL, so that the current_setting() in previous query is
+-- evaluated before myfunc(0), and therefore it shows 'advanced'.
+-- Query again to show that the myfunc(0) call actually changed
+-- the setting.
+select current_setting('regex_flavor');
+ current_setting 
+-----------------
+ extended
+(1 row)
+
+set regex_flavor = advanced;
+-- it should roll back on error, though
+create or replace function myfunc(int) returns text as $$
+begin
+  set regex_flavor = extended;
+  perform 1/$1;
+  return current_setting('regex_flavor');
+end $$
+language plpgsql
+set regex_flavor = basic;
+select myfunc(0);
+ERROR:  division by zero
+CONTEXT:  SQL statement "SELECT  1/ $1 "
+PL/pgSQL function "myfunc" line 3 at PERFORM
+select current_setting('regex_flavor');
+ current_setting 
+-----------------
+ advanced
+(1 row)
+
+select myfunc(1), current_setting('regex_flavor');
+  myfunc  | current_setting 
+----------+-----------------
+ extended | advanced
+(1 row)
+
 SELECT min_val, max_val FROM pg_settings WHERE name = 'gp_resqueue_priority_cpucores_per_segment';
  min_val | max_val 
 ---------+---------
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index 953bf292dee6..e15a3a624c9d 100755
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -1085,686 +1085,351 @@ SELECT CAST(cast(date 'today' + time with time zone '03:30'
  07:31:00
 (1 row)
 
-SELECT t.d1 + i.f1 AS "102" FROM TIMESTAMP_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
+SELECT t.d1 AS t, i.f1 AS i, t.d1 + i.f1 AS "add", t.d1 - i.f1 AS "subtract"
+  FROM TIMESTAMP_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
   WHERE t.d1 BETWEEN '1990-01-01' AND '2001-01-01'
-    AND i.f1 BETWEEN '00:00' AND '23:00' ORDER BY 1;
-            102             
-----------------------------
- Wed Feb 28 17:33:01 1996
- Wed Feb 28 22:32:01 1996
- Thu Feb 29 17:33:01 1996
- Thu Feb 29 22:32:01 1996
- Fri Mar 01 17:33:01 1996
- Fri Mar 01 22:32:01 1996
- Mon Dec 30 17:33:01 1996
- Mon Dec 30 22:32:01 1996
- Tue Dec 31 17:33:01 1996
- Tue Dec 31 22:32:01 1996
- Wed Jan 01 17:33:01 1997
- Wed Jan 01 22:32:01 1997
- Thu Jan 02 00:01:00 1997
- Thu Jan 02 03:05:05 1997
- Thu Jan 02 05:00:00 1997
- Thu Jan 02 08:04:05 1997
- Mon Feb 10 17:33:00 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01 1997
- Mon Feb 10 17:33:01.4 1997
- Mon Feb 10 17:33:01.5 1997
- Mon Feb 10 17:33:01.6 1997
- Mon Feb 10 17:33:02 1997
- Mon Feb 10 22:32:00 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01 1997
- Mon Feb 10 22:32:01.4 1997
- Mon Feb 10 22:32:01.5 1997
- Mon Feb 10 22:32:01.6 1997
- Mon Feb 10 22:32:02 1997
- Tue Feb 11 17:33:01 1997
- Tue Feb 11 22:32:01 1997
- Wed Feb 12 17:33:01 1997
- Wed Feb 12 22:32:01 1997
- Thu Feb 13 17:33:01 1997
- Thu Feb 13 22:32:01 1997
- Fri Feb 14 17:33:01 1997
- Fri Feb 14 22:32:01 1997
- Sat Feb 15 17:33:01 1997
- Sat Feb 15 22:32:01 1997
- Sun Feb 16 17:33:01 1997
- Sun Feb 16 17:33:01 1997
- Sun Feb 16 22:32:01 1997
- Sun Feb 16 22:32:01 1997
- Fri Feb 28 17:33:01 1997
- Fri Feb 28 22:32:01 1997
- Sat Mar 01 17:33:01 1997
- Sat Mar 01 22:32:01 1997
- Tue Jun 10 17:33:01 1997
- Tue Jun 10 18:33:01 1997
- Tue Jun 10 22:32:01 1997
- Tue Jun 10 23:32:01 1997
- Tue Dec 30 17:33:01 1997
- Tue Dec 30 22:32:01 1997
- Wed Dec 31 17:33:01 1997
- Wed Dec 31 22:32:01 1997
- Fri Dec 31 17:33:01 1999
- Fri Dec 31 22:32:01 1999
- Sat Jan 01 17:33:01 2000
- Sat Jan 01 22:32:01 2000
- Wed Mar 15 02:15:05 2000
- Wed Mar 15 03:15:04 2000
- Wed Mar 15 07:14:05 2000
- Wed Mar 15 08:14:04 2000
- Wed Mar 15 08:15:01 2000
- Wed Mar 15 12:15:03 2000
- Wed Mar 15 13:14:01 2000
- Wed Mar 15 13:15:02 2000
- Wed Mar 15 17:14:03 2000
- Wed Mar 15 18:14:02 2000
- Sun Dec 31 17:33:01 2000
- Sun Dec 31 22:32:01 2000
-(104 rows)
-
-SELECT t.d1 - i.f1 AS "102" FROM TIMESTAMP_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
-  WHERE t.d1 BETWEEN '1990-01-01' AND '2001-01-01'
-    AND i.f1 BETWEEN '00:00' AND '23:00' ORDER BY 1;
-            102             
-----------------------------
- Wed Feb 28 12:32:01 1996
- Wed Feb 28 17:31:01 1996
- Thu Feb 29 12:32:01 1996
- Thu Feb 29 17:31:01 1996
- Fri Mar 01 12:32:01 1996
- Fri Mar 01 17:31:01 1996
- Mon Dec 30 12:32:01 1996
- Mon Dec 30 17:31:01 1996
- Tue Dec 31 12:32:01 1996
- Tue Dec 31 17:31:01 1996
- Wed Jan 01 12:32:01 1997
- Wed Jan 01 17:31:01 1997
- Wed Jan 01 19:00:00 1997
- Wed Jan 01 22:04:05 1997
- Wed Jan 01 23:59:00 1997
- Thu Jan 02 03:03:05 1997
- Mon Feb 10 12:32:00 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01 1997
- Mon Feb 10 12:32:01.4 1997
- Mon Feb 10 12:32:01.5 1997
- Mon Feb 10 12:32:01.6 1997
- Mon Feb 10 12:32:02 1997
- Mon Feb 10 17:31:00 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01 1997
- Mon Feb 10 17:31:01.4 1997
- Mon Feb 10 17:31:01.5 1997
- Mon Feb 10 17:31:01.6 1997
- Mon Feb 10 17:31:02 1997
- Tue Feb 11 12:32:01 1997
- Tue Feb 11 17:31:01 1997
- Wed Feb 12 12:32:01 1997
- Wed Feb 12 17:31:01 1997
- Thu Feb 13 12:32:01 1997
- Thu Feb 13 17:31:01 1997
- Fri Feb 14 12:32:01 1997
- Fri Feb 14 17:31:01 1997
- Sat Feb 15 12:32:01 1997
- Sat Feb 15 17:31:01 1997
- Sun Feb 16 12:32:01 1997
- Sun Feb 16 12:32:01 1997
- Sun Feb 16 17:31:01 1997
- Sun Feb 16 17:31:01 1997
- Fri Feb 28 12:32:01 1997
- Fri Feb 28 17:31:01 1997
- Sat Mar 01 12:32:01 1997
- Sat Mar 01 17:31:01 1997
- Tue Jun 10 12:32:01 1997
- Tue Jun 10 13:32:01 1997
- Tue Jun 10 17:31:01 1997
- Tue Jun 10 18:31:01 1997
- Tue Dec 30 12:32:01 1997
- Tue Dec 30 17:31:01 1997
- Wed Dec 31 12:32:01 1997
- Wed Dec 31 17:31:01 1997
- Fri Dec 31 12:32:01 1999
- Fri Dec 31 17:31:01 1999
- Sat Jan 01 12:32:01 2000
- Sat Jan 01 17:31:01 2000
- Tue Mar 14 21:14:05 2000
- Tue Mar 14 22:14:04 2000
- Wed Mar 15 02:13:05 2000
- Wed Mar 15 03:13:04 2000
- Wed Mar 15 03:14:01 2000
- Wed Mar 15 07:14:03 2000
- Wed Mar 15 08:13:01 2000
- Wed Mar 15 08:14:02 2000
- Wed Mar 15 12:13:03 2000
- Wed Mar 15 13:13:02 2000
- Sun Dec 31 12:32:01 2000
- Sun Dec 31 17:31:01 2000
+    AND i.f1 BETWEEN '00:00' AND '23:00'
+  ORDER BY 1,2;
+              t             |     i     |             add            |          subtract           
+----------------------------+-----------+----------------------------+----------------------------
+ Wed Feb 28 17:32:01 1996   | @ 1 min   | Wed Feb 28 17:33:01 1996   | Wed Feb 28 17:31:01 1996
+ Wed Feb 28 17:32:01 1996   | @ 5 hours | Wed Feb 28 22:32:01 1996   | Wed Feb 28 12:32:01 1996
+ Thu Feb 29 17:32:01 1996   | @ 1 min   | Thu Feb 29 17:33:01 1996   | Thu Feb 29 17:31:01 1996
+ Thu Feb 29 17:32:01 1996   | @ 5 hours | Thu Feb 29 22:32:01 1996   | Thu Feb 29 12:32:01 1996
+ Fri Mar 01 17:32:01 1996   | @ 1 min   | Fri Mar 01 17:33:01 1996   | Fri Mar 01 17:31:01 1996
+ Fri Mar 01 17:32:01 1996   | @ 5 hours | Fri Mar 01 22:32:01 1996   | Fri Mar 01 12:32:01 1996
+ Mon Dec 30 17:32:01 1996   | @ 1 min   | Mon Dec 30 17:33:01 1996   | Mon Dec 30 17:31:01 1996
+ Mon Dec 30 17:32:01 1996   | @ 5 hours | Mon Dec 30 22:32:01 1996   | Mon Dec 30 12:32:01 1996
+ Tue Dec 31 17:32:01 1996   | @ 1 min   | Tue Dec 31 17:33:01 1996   | Tue Dec 31 17:31:01 1996
+ Tue Dec 31 17:32:01 1996   | @ 5 hours | Tue Dec 31 22:32:01 1996   | Tue Dec 31 12:32:01 1996
+ Wed Jan 01 17:32:01 1997   | @ 1 min   | Wed Jan 01 17:33:01 1997   | Wed Jan 01 17:31:01 1997
+ Wed Jan 01 17:32:01 1997   | @ 5 hours | Wed Jan 01 22:32:01 1997   | Wed Jan 01 12:32:01 1997
+ Thu Jan 02 00:00:00 1997   | @ 1 min   | Thu Jan 02 00:01:00 1997   | Wed Jan 01 23:59:00 1997
+ Thu Jan 02 00:00:00 1997   | @ 5 hours | Thu Jan 02 05:00:00 1997   | Wed Jan 01 19:00:00 1997
+ Thu Jan 02 03:04:05 1997   | @ 1 min   | Thu Jan 02 03:05:05 1997   | Thu Jan 02 03:03:05 1997
+ Thu Jan 02 03:04:05 1997   | @ 5 hours | Thu Jan 02 08:04:05 1997   | Wed Jan 01 22:04:05 1997
+ Mon Feb 10 17:32:00 1997   | @ 1 min   | Mon Feb 10 17:33:00 1997   | Mon Feb 10 17:31:00 1997
+ Mon Feb 10 17:32:00 1997   | @ 5 hours | Mon Feb 10 22:32:00 1997   | Mon Feb 10 12:32:00 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 1 min   | Mon Feb 10 17:33:01 1997   | Mon Feb 10 17:31:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01 1997   | @ 5 hours | Mon Feb 10 22:32:01 1997   | Mon Feb 10 12:32:01 1997
+ Mon Feb 10 17:32:01.4 1997 | @ 1 min   | Mon Feb 10 17:33:01.4 1997 | Mon Feb 10 17:31:01.4 1997
+ Mon Feb 10 17:32:01.4 1997 | @ 5 hours | Mon Feb 10 22:32:01.4 1997 | Mon Feb 10 12:32:01.4 1997
+ Mon Feb 10 17:32:01.5 1997 | @ 1 min   | Mon Feb 10 17:33:01.5 1997 | Mon Feb 10 17:31:01.5 1997
+ Mon Feb 10 17:32:01.5 1997 | @ 5 hours | Mon Feb 10 22:32:01.5 1997 | Mon Feb 10 12:32:01.5 1997
+ Mon Feb 10 17:32:01.6 1997 | @ 1 min   | Mon Feb 10 17:33:01.6 1997 | Mon Feb 10 17:31:01.6 1997
+ Mon Feb 10 17:32:01.6 1997 | @ 5 hours | Mon Feb 10 22:32:01.6 1997 | Mon Feb 10 12:32:01.6 1997
+ Mon Feb 10 17:32:02 1997   | @ 1 min   | Mon Feb 10 17:33:02 1997   | Mon Feb 10 17:31:02 1997
+ Mon Feb 10 17:32:02 1997   | @ 5 hours | Mon Feb 10 22:32:02 1997   | Mon Feb 10 12:32:02 1997
+ Tue Feb 11 17:32:01 1997   | @ 1 min   | Tue Feb 11 17:33:01 1997   | Tue Feb 11 17:31:01 1997
+ Tue Feb 11 17:32:01 1997   | @ 5 hours | Tue Feb 11 22:32:01 1997   | Tue Feb 11 12:32:01 1997
+ Wed Feb 12 17:32:01 1997   | @ 1 min   | Wed Feb 12 17:33:01 1997   | Wed Feb 12 17:31:01 1997
+ Wed Feb 12 17:32:01 1997   | @ 5 hours | Wed Feb 12 22:32:01 1997   | Wed Feb 12 12:32:01 1997
+ Thu Feb 13 17:32:01 1997   | @ 1 min   | Thu Feb 13 17:33:01 1997   | Thu Feb 13 17:31:01 1997
+ Thu Feb 13 17:32:01 1997   | @ 5 hours | Thu Feb 13 22:32:01 1997   | Thu Feb 13 12:32:01 1997
+ Fri Feb 14 17:32:01 1997   | @ 1 min   | Fri Feb 14 17:33:01 1997   | Fri Feb 14 17:31:01 1997
+ Fri Feb 14 17:32:01 1997   | @ 5 hours | Fri Feb 14 22:32:01 1997   | Fri Feb 14 12:32:01 1997
+ Sat Feb 15 17:32:01 1997   | @ 1 min   | Sat Feb 15 17:33:01 1997   | Sat Feb 15 17:31:01 1997
+ Sat Feb 15 17:32:01 1997   | @ 5 hours | Sat Feb 15 22:32:01 1997   | Sat Feb 15 12:32:01 1997
+ Sun Feb 16 17:32:01 1997   | @ 1 min   | Sun Feb 16 17:33:01 1997   | Sun Feb 16 17:31:01 1997
+ Sun Feb 16 17:32:01 1997   | @ 1 min   | Sun Feb 16 17:33:01 1997   | Sun Feb 16 17:31:01 1997
+ Sun Feb 16 17:32:01 1997   | @ 5 hours | Sun Feb 16 22:32:01 1997   | Sun Feb 16 12:32:01 1997
+ Sun Feb 16 17:32:01 1997   | @ 5 hours | Sun Feb 16 22:32:01 1997   | Sun Feb 16 12:32:01 1997
+ Fri Feb 28 17:32:01 1997   | @ 1 min   | Fri Feb 28 17:33:01 1997   | Fri Feb 28 17:31:01 1997
+ Fri Feb 28 17:32:01 1997   | @ 5 hours | Fri Feb 28 22:32:01 1997   | Fri Feb 28 12:32:01 1997
+ Sat Mar 01 17:32:01 1997   | @ 1 min   | Sat Mar 01 17:33:01 1997   | Sat Mar 01 17:31:01 1997
+ Sat Mar 01 17:32:01 1997   | @ 5 hours | Sat Mar 01 22:32:01 1997   | Sat Mar 01 12:32:01 1997
+ Tue Jun 10 17:32:01 1997   | @ 1 min   | Tue Jun 10 17:33:01 1997   | Tue Jun 10 17:31:01 1997
+ Tue Jun 10 17:32:01 1997   | @ 5 hours | Tue Jun 10 22:32:01 1997   | Tue Jun 10 12:32:01 1997
+ Tue Jun 10 18:32:01 1997   | @ 1 min   | Tue Jun 10 18:33:01 1997   | Tue Jun 10 18:31:01 1997
+ Tue Jun 10 18:32:01 1997   | @ 5 hours | Tue Jun 10 23:32:01 1997   | Tue Jun 10 13:32:01 1997
+ Tue Dec 30 17:32:01 1997   | @ 1 min   | Tue Dec 30 17:33:01 1997   | Tue Dec 30 17:31:01 1997
+ Tue Dec 30 17:32:01 1997   | @ 5 hours | Tue Dec 30 22:32:01 1997   | Tue Dec 30 12:32:01 1997
+ Wed Dec 31 17:32:01 1997   | @ 1 min   | Wed Dec 31 17:33:01 1997   | Wed Dec 31 17:31:01 1997
+ Wed Dec 31 17:32:01 1997   | @ 5 hours | Wed Dec 31 22:32:01 1997   | Wed Dec 31 12:32:01 1997
+ Fri Dec 31 17:32:01 1999   | @ 1 min   | Fri Dec 31 17:33:01 1999   | Fri Dec 31 17:31:01 1999
+ Fri Dec 31 17:32:01 1999   | @ 5 hours | Fri Dec 31 22:32:01 1999   | Fri Dec 31 12:32:01 1999
+ Sat Jan 01 17:32:01 2000   | @ 1 min   | Sat Jan 01 17:33:01 2000   | Sat Jan 01 17:31:01 2000
+ Sat Jan 01 17:32:01 2000   | @ 5 hours | Sat Jan 01 22:32:01 2000   | Sat Jan 01 12:32:01 2000
+ Wed Mar 15 02:14:05 2000   | @ 1 min   | Wed Mar 15 02:15:05 2000   | Wed Mar 15 02:13:05 2000
+ Wed Mar 15 02:14:05 2000   | @ 5 hours | Wed Mar 15 07:14:05 2000   | Tue Mar 14 21:14:05 2000
+ Wed Mar 15 03:14:04 2000   | @ 1 min   | Wed Mar 15 03:15:04 2000   | Wed Mar 15 03:13:04 2000
+ Wed Mar 15 03:14:04 2000   | @ 5 hours | Wed Mar 15 08:14:04 2000   | Tue Mar 14 22:14:04 2000
+ Wed Mar 15 08:14:01 2000   | @ 1 min   | Wed Mar 15 08:15:01 2000   | Wed Mar 15 08:13:01 2000
+ Wed Mar 15 08:14:01 2000   | @ 5 hours | Wed Mar 15 13:14:01 2000   | Wed Mar 15 03:14:01 2000
+ Wed Mar 15 12:14:03 2000   | @ 1 min   | Wed Mar 15 12:15:03 2000   | Wed Mar 15 12:13:03 2000
+ Wed Mar 15 12:14:03 2000   | @ 5 hours | Wed Mar 15 17:14:03 2000   | Wed Mar 15 07:14:03 2000
+ Wed Mar 15 13:14:02 2000   | @ 1 min   | Wed Mar 15 13:15:02 2000   | Wed Mar 15 13:13:02 2000
+ Wed Mar 15 13:14:02 2000   | @ 5 hours | Wed Mar 15 18:14:02 2000   | Wed Mar 15 08:14:02 2000
+ Sun Dec 31 17:32:01 2000   | @ 1 min   | Sun Dec 31 17:33:01 2000   | Sun Dec 31 17:31:01 2000
+ Sun Dec 31 17:32:01 2000   | @ 5 hours | Sun Dec 31 22:32:01 2000   | Sun Dec 31 12:32:01 2000
 (104 rows)
 
-SELECT t.f1 + i.f1 AS "80" FROM TIME_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
-     80      
--------------
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:59.99
- 00:01:00
- 00:01:00
- 00:59:46
- 01:00:00
- 01:00:00
- 01:00:00
- 01:00:00
- 01:00:00
- 01:01:00
- 02:02:04
- 02:02:46
- 02:03:00
- 02:03:00
- 02:03:00
- 02:03:00
- 02:03:00
- 02:03:03.99
- 02:03:04
- 02:04:00
- 03:03:04
- 03:36:39
- 03:36:39
- 04:06:04
- 04:59:00
- 04:59:59.99
- 05:00:00
- 06:00:00
- 07:03:00
- 11:58:46
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:46
- 11:59:59.99
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:46
- 12:01:00
- 12:01:00
- 12:01:00
- 12:01:00
- 12:01:00
- 12:01:00
- 12:02:00
- 13:00:00
- 14:02:04
- 14:03:00
- 14:03:04
- 14:04:04
- 15:36:25
- 15:36:25
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:37:39
- 15:37:39
- 16:59:00
- 17:00:00
- 17:01:00
- 17:39:43
- 17:39:43
- 20:36:39
- 20:36:39
- 23:58:46
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:45.99
- 23:59:46
- 23:59:59.99
- 23:59:59.99
- 23:59:59.99
- 23:59:59.99
- 23:59:59.99
+SELECT t.f1 AS t, i.f1 AS i, t.f1 + i.f1 AS "add", t.f1 - i.f1 AS "subtract"
+  FROM TIME_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
+  ORDER BY 1,2;
+      t      |               i               |     add     |  subtract   
+-------------+-------------------------------+-------------+-------------
+ 00:00:00    | @ 14 secs ago                 | 23:59:46    | 00:00:14
+ 00:00:00    | @ 1 min                       | 00:01:00    | 23:59:00
+ 00:00:00    | @ 5 hours                     | 05:00:00    | 19:00:00
+ 00:00:00    | @ 1 day 2 hours 3 mins 4 secs | 02:03:04    | 21:56:56
+ 00:00:00    | @ 10 days                     | 00:00:00    | 00:00:00
+ 00:00:00    | @ 3 mons                      | 00:00:00    | 00:00:00
+ 00:00:00    | @ 5 mons                      | 00:00:00    | 00:00:00
+ 00:00:00    | @ 5 mons 12 hours             | 12:00:00    | 12:00:00
+ 00:00:00    | @ 6 years                     | 00:00:00    | 00:00:00
+ 00:00:00    | @ 34 years                    | 00:00:00    | 00:00:00
+ 01:00:00    | @ 14 secs ago                 | 00:59:46    | 01:00:14
+ 01:00:00    | @ 1 min                       | 01:01:00    | 00:59:00
+ 01:00:00    | @ 5 hours                     | 06:00:00    | 20:00:00
+ 01:00:00    | @ 1 day 2 hours 3 mins 4 secs | 03:03:04    | 22:56:56
+ 01:00:00    | @ 10 days                     | 01:00:00    | 01:00:00
+ 01:00:00    | @ 3 mons                      | 01:00:00    | 01:00:00
+ 01:00:00    | @ 5 mons                      | 01:00:00    | 01:00:00
+ 01:00:00    | @ 5 mons 12 hours             | 13:00:00    | 13:00:00
+ 01:00:00    | @ 6 years                     | 01:00:00    | 01:00:00
+ 01:00:00    | @ 34 years                    | 01:00:00    | 01:00:00
+ 02:03:00    | @ 14 secs ago                 | 02:02:46    | 02:03:14
+ 02:03:00    | @ 1 min                       | 02:04:00    | 02:02:00
+ 02:03:00    | @ 5 hours                     | 07:03:00    | 21:03:00
+ 02:03:00    | @ 1 day 2 hours 3 mins 4 secs | 04:06:04    | 23:59:56
+ 02:03:00    | @ 10 days                     | 02:03:00    | 02:03:00
+ 02:03:00    | @ 3 mons                      | 02:03:00    | 02:03:00
+ 02:03:00    | @ 5 mons                      | 02:03:00    | 02:03:00
+ 02:03:00    | @ 5 mons 12 hours             | 14:03:00    | 14:03:00
+ 02:03:00    | @ 6 years                     | 02:03:00    | 02:03:00
+ 02:03:00    | @ 34 years                    | 02:03:00    | 02:03:00
+ 11:59:00    | @ 14 secs ago                 | 11:58:46    | 11:59:14
+ 11:59:00    | @ 1 min                       | 12:00:00    | 11:58:00
+ 11:59:00    | @ 5 hours                     | 16:59:00    | 06:59:00
+ 11:59:00    | @ 1 day 2 hours 3 mins 4 secs | 14:02:04    | 09:55:56
+ 11:59:00    | @ 10 days                     | 11:59:00    | 11:59:00
+ 11:59:00    | @ 3 mons                      | 11:59:00    | 11:59:00
+ 11:59:00    | @ 5 mons                      | 11:59:00    | 11:59:00
+ 11:59:00    | @ 5 mons 12 hours             | 23:59:00    | 23:59:00
+ 11:59:00    | @ 6 years                     | 11:59:00    | 11:59:00
+ 11:59:00    | @ 34 years                    | 11:59:00    | 11:59:00
+ 12:00:00    | @ 14 secs ago                 | 11:59:46    | 12:00:14
+ 12:00:00    | @ 1 min                       | 12:01:00    | 11:59:00
+ 12:00:00    | @ 5 hours                     | 17:00:00    | 07:00:00
+ 12:00:00    | @ 1 day 2 hours 3 mins 4 secs | 14:03:04    | 09:56:56
+ 12:00:00    | @ 10 days                     | 12:00:00    | 12:00:00
+ 12:00:00    | @ 3 mons                      | 12:00:00    | 12:00:00
+ 12:00:00    | @ 5 mons                      | 12:00:00    | 12:00:00
+ 12:00:00    | @ 5 mons 12 hours             | 00:00:00    | 00:00:00
+ 12:00:00    | @ 6 years                     | 12:00:00    | 12:00:00
+ 12:00:00    | @ 34 years                    | 12:00:00    | 12:00:00
+ 12:01:00    | @ 14 secs ago                 | 12:00:46    | 12:01:14
+ 12:01:00    | @ 1 min                       | 12:02:00    | 12:00:00
+ 12:01:00    | @ 5 hours                     | 17:01:00    | 07:01:00
+ 12:01:00    | @ 1 day 2 hours 3 mins 4 secs | 14:04:04    | 09:57:56
+ 12:01:00    | @ 10 days                     | 12:01:00    | 12:01:00
+ 12:01:00    | @ 3 mons                      | 12:01:00    | 12:01:00
+ 12:01:00    | @ 5 mons                      | 12:01:00    | 12:01:00
+ 12:01:00    | @ 5 mons 12 hours             | 00:01:00    | 00:01:00
+ 12:01:00    | @ 6 years                     | 12:01:00    | 12:01:00
+ 12:01:00    | @ 34 years                    | 12:01:00    | 12:01:00
+ 15:36:39    | @ 14 secs ago                 | 15:36:25    | 15:36:53
+ 15:36:39    | @ 14 secs ago                 | 15:36:25    | 15:36:53
+ 15:36:39    | @ 1 min                       | 15:37:39    | 15:35:39
+ 15:36:39    | @ 1 min                       | 15:37:39    | 15:35:39
+ 15:36:39    | @ 5 hours                     | 20:36:39    | 10:36:39
+ 15:36:39    | @ 5 hours                     | 20:36:39    | 10:36:39
+ 15:36:39    | @ 1 day 2 hours 3 mins 4 secs | 17:39:43    | 13:33:35
+ 15:36:39    | @ 1 day 2 hours 3 mins 4 secs | 17:39:43    | 13:33:35
+ 15:36:39    | @ 10 days                     | 15:36:39    | 15:36:39
+ 15:36:39    | @ 10 days                     | 15:36:39    | 15:36:39
+ 15:36:39    | @ 3 mons                      | 15:36:39    | 15:36:39
+ 15:36:39    | @ 3 mons                      | 15:36:39    | 15:36:39
+ 15:36:39    | @ 5 mons                      | 15:36:39    | 15:36:39
+ 15:36:39    | @ 5 mons                      | 15:36:39    | 15:36:39
+ 15:36:39    | @ 5 mons 12 hours             | 03:36:39    | 03:36:39
+ 15:36:39    | @ 5 mons 12 hours             | 03:36:39    | 03:36:39
+ 15:36:39    | @ 6 years                     | 15:36:39    | 15:36:39
+ 15:36:39    | @ 6 years                     | 15:36:39    | 15:36:39
+ 15:36:39    | @ 34 years                    | 15:36:39    | 15:36:39
+ 15:36:39    | @ 34 years                    | 15:36:39    | 15:36:39
+ 23:59:00    | @ 14 secs ago                 | 23:58:46    | 23:59:14
+ 23:59:00    | @ 1 min                       | 00:00:00    | 23:58:00
+ 23:59:00    | @ 5 hours                     | 04:59:00    | 18:59:00
+ 23:59:00    | @ 1 day 2 hours 3 mins 4 secs | 02:02:04    | 21:55:56
+ 23:59:00    | @ 10 days                     | 23:59:00    | 23:59:00
+ 23:59:00    | @ 3 mons                      | 23:59:00    | 23:59:00
+ 23:59:00    | @ 5 mons                      | 23:59:00    | 23:59:00
+ 23:59:00    | @ 5 mons 12 hours             | 11:59:00    | 11:59:00
+ 23:59:00    | @ 6 years                     | 23:59:00    | 23:59:00
+ 23:59:00    | @ 34 years                    | 23:59:00    | 23:59:00
+ 23:59:59.99 | @ 14 secs ago                 | 23:59:45.99 | 00:00:13.99
+ 23:59:59.99 | @ 1 min                       | 00:00:59.99 | 23:58:59.99
+ 23:59:59.99 | @ 5 hours                     | 04:59:59.99 | 18:59:59.99
+ 23:59:59.99 | @ 1 day 2 hours 3 mins 4 secs | 02:03:03.99 | 21:56:55.99
+ 23:59:59.99 | @ 10 days                     | 23:59:59.99 | 23:59:59.99
+ 23:59:59.99 | @ 3 mons                      | 23:59:59.99 | 23:59:59.99
+ 23:59:59.99 | @ 5 mons                      | 23:59:59.99 | 23:59:59.99
+ 23:59:59.99 | @ 5 mons 12 hours             | 11:59:59.99 | 11:59:59.99
+ 23:59:59.99 | @ 6 years                     | 23:59:59.99 | 23:59:59.99
+ 23:59:59.99 | @ 34 years                    | 23:59:59.99 | 23:59:59.99
 (100 rows)
 
-SELECT t.f1 - i.f1 AS "80" FROM TIME_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
-     80      
--------------
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:00
- 00:00:13.99
- 00:00:14
- 00:01:00
- 00:59:00
- 01:00:00
- 01:00:00
- 01:00:00
- 01:00:00
- 01:00:00
- 01:00:14
- 02:02:00
- 02:03:00
- 02:03:00
- 02:03:00
- 02:03:00
- 02:03:00
- 02:03:14
- 03:36:39
- 03:36:39
- 06:59:00
- 07:00:00
- 07:01:00
- 09:55:56
- 09:56:56
- 09:57:56
- 10:36:39
- 10:36:39
- 11:58:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:00
- 11:59:14
- 11:59:59.99
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:00
- 12:00:14
- 12:01:00
- 12:01:00
- 12:01:00
- 12:01:00
- 12:01:00
- 12:01:14
- 13:00:00
- 13:33:35
- 13:33:35
- 14:03:00
- 15:35:39
- 15:35:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:39
- 15:36:53
- 15:36:53
- 18:59:00
- 18:59:59.99
- 19:00:00
- 20:00:00
- 21:03:00
- 21:55:56
- 21:56:55.99
- 21:56:56
- 22:56:56
- 23:58:00
- 23:58:59.99
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:00
- 23:59:14
- 23:59:56
- 23:59:59.99
- 23:59:59.99
- 23:59:59.99
- 23:59:59.99
- 23:59:59.99
-(100 rows)
-
-SELECT t.f1 + i.f1 AS "100" FROM TIMETZ_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
-      100       
-----------------
- 00:00:00-07
- 00:00:00-07
- 00:00:46-07
- 00:00:59.99-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:02:00-07
- 03:36:39-04
- 00:59:46-07
- 01:00:00-07
- 01:00:00-07
- 01:00:00-07
- 01:00:00-07
- 01:00:00-07
- 01:01:00-07
- 03:36:39-05
- 02:02:04-07
- 02:02:46-07
- 02:03:00-07
- 02:03:00-07
- 02:03:00-07
- 02:03:00-07
- 02:03:00-07
- 02:03:03.99-07
- 02:04:00-07
- 02:04:04-07
- 03:03:04-07
- 04:06:04-07
- 04:59:00-07
- 04:59:59.99-07
- 05:01:00-07
- 08:07:46-04
- 08:08:00-04
- 08:08:00-04
- 08:08:00-04
- 08:08:00-04
- 08:08:00-04
- 08:09:00-04
- 06:00:00-07
- 07:03:00-07
- 10:11:04-04
- 07:06:46-08
- 07:07:00-08
- 07:07:00-08
- 07:07:00-08
- 07:07:00-08
- 07:07:00-08
- 07:08:00-08
- 13:08:00-04
- 09:10:04-08
- 11:58:46-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:46-07
- 11:59:59.99-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:46-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:02:00-07
- 15:36:25-04
- 15:36:39-04
- 15:36:39-04
- 15:36:39-04
- 15:36:39-04
- 15:36:39-04
- 15:37:39-04
- 13:00:00-07
- 12:07:00-08
- 15:36:25-05
- 15:36:39-05
- 15:36:39-05
- 15:36:39-05
- 15:36:39-05
- 15:36:39-05
- 15:37:39-05
- 14:02:04-07
- 14:03:00-07
- 14:03:04-07
- 14:04:04-07
- 17:39:43-04
- 17:39:43-05
- 16:59:00-07
- 17:00:00-07
- 17:01:00-07
- 20:08:00-04
- 20:36:39-04
- 20:36:39-05
- 19:07:00-08
- 23:58:46-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:45.99-07
- 23:59:59.99-07
- 23:59:59.99-07
- 23:59:59.99-07
- 23:59:59.99-07
- 23:59:59.99-07
-(120 rows)
-
-SELECT t.f1 - i.f1 AS "100" FROM TIMETZ_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
-      100       
-----------------
- 00:00:00-07
- 00:00:00-07
- 00:00:13.99-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:01:00-07
- 00:01:14-07
- 03:08:00-04
- 03:36:39-04
- 00:59:00-07
- 01:00:00-07
- 01:00:00-07
- 01:00:00-07
- 01:00:00-07
- 01:00:00-07
- 01:00:14-07
- 03:36:39-05
- 02:02:00-07
- 02:03:00-07
- 02:03:00-07
- 02:03:00-07
- 02:03:00-07
- 02:03:00-07
- 02:03:14-07
- 06:04:56-04
- 02:07:00-08
- 08:07:00-04
- 08:08:00-04
- 08:08:00-04
- 08:08:00-04
- 08:08:00-04
- 08:08:00-04
- 08:08:14-04
- 05:03:56-08
- 06:59:00-07
- 07:00:00-07
- 07:01:00-07
- 10:36:39-04
- 07:06:00-08
- 07:07:00-08
- 07:07:00-08
- 07:07:00-08
- 07:07:00-08
- 07:07:00-08
- 07:07:14-08
- 10:36:39-05
- 09:55:56-07
- 09:56:56-07
- 09:57:56-07
- 13:33:35-04
- 13:33:35-05
- 11:58:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:00-07
- 11:59:14-07
- 11:59:59.99-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:00-07
- 12:00:14-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:00-07
- 12:01:14-07
- 15:35:39-04
- 15:36:39-04
- 15:36:39-04
- 15:36:39-04
- 15:36:39-04
- 15:36:39-04
- 15:36:53-04
- 13:00:00-07
- 15:35:39-05
- 15:36:39-05
- 15:36:39-05
- 15:36:39-05
- 15:36:39-05
- 15:36:39-05
- 15:36:53-05
- 14:03:00-07
- 20:08:00-04
- 18:59:00-07
- 18:59:59.99-07
- 19:01:00-07
- 20:00:00-07
- 19:07:00-08
- 21:03:00-07
- 21:55:56-07
- 21:56:55.99-07
- 21:57:56-07
- 22:56:56-07
- 23:58:00-07
- 23:58:59.99-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:00-07
- 23:59:14-07
- 23:59:56-07
- 23:59:59.99-07
- 23:59:59.99-07
- 23:59:59.99-07
- 23:59:59.99-07
- 23:59:59.99-07
+SELECT t.f1 AS t, i.f1 AS i, t.f1 + i.f1 AS "add", t.f1 - i.f1 AS "subtract"
+  FROM TIMETZ_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
+  ORDER BY 1,2;
+       t        |               i               |      add       |    subtract    
+----------------+-------------------------------+----------------+----------------
+ 00:01:00-07    | @ 14 secs ago                 | 00:00:46-07    | 00:01:14-07
+ 00:01:00-07    | @ 1 min                       | 00:02:00-07    | 00:00:00-07
+ 00:01:00-07    | @ 5 hours                     | 05:01:00-07    | 19:01:00-07
+ 00:01:00-07    | @ 1 day 2 hours 3 mins 4 secs | 02:04:04-07    | 21:57:56-07
+ 00:01:00-07    | @ 10 days                     | 00:01:00-07    | 00:01:00-07
+ 00:01:00-07    | @ 3 mons                      | 00:01:00-07    | 00:01:00-07
+ 00:01:00-07    | @ 5 mons                      | 00:01:00-07    | 00:01:00-07
+ 00:01:00-07    | @ 5 mons 12 hours             | 12:01:00-07    | 12:01:00-07
+ 00:01:00-07    | @ 6 years                     | 00:01:00-07    | 00:01:00-07
+ 00:01:00-07    | @ 34 years                    | 00:01:00-07    | 00:01:00-07
+ 01:00:00-07    | @ 14 secs ago                 | 00:59:46-07    | 01:00:14-07
+ 01:00:00-07    | @ 1 min                       | 01:01:00-07    | 00:59:00-07
+ 01:00:00-07    | @ 5 hours                     | 06:00:00-07    | 20:00:00-07
+ 01:00:00-07    | @ 1 day 2 hours 3 mins 4 secs | 03:03:04-07    | 22:56:56-07
+ 01:00:00-07    | @ 10 days                     | 01:00:00-07    | 01:00:00-07
+ 01:00:00-07    | @ 3 mons                      | 01:00:00-07    | 01:00:00-07
+ 01:00:00-07    | @ 5 mons                      | 01:00:00-07    | 01:00:00-07
+ 01:00:00-07    | @ 5 mons 12 hours             | 13:00:00-07    | 13:00:00-07
+ 01:00:00-07    | @ 6 years                     | 01:00:00-07    | 01:00:00-07
+ 01:00:00-07    | @ 34 years                    | 01:00:00-07    | 01:00:00-07
+ 02:03:00-07    | @ 14 secs ago                 | 02:02:46-07    | 02:03:14-07
+ 02:03:00-07    | @ 1 min                       | 02:04:00-07    | 02:02:00-07
+ 02:03:00-07    | @ 5 hours                     | 07:03:00-07    | 21:03:00-07
+ 02:03:00-07    | @ 1 day 2 hours 3 mins 4 secs | 04:06:04-07    | 23:59:56-07
+ 02:03:00-07    | @ 10 days                     | 02:03:00-07    | 02:03:00-07
+ 02:03:00-07    | @ 3 mons                      | 02:03:00-07    | 02:03:00-07
+ 02:03:00-07    | @ 5 mons                      | 02:03:00-07    | 02:03:00-07
+ 02:03:00-07    | @ 5 mons 12 hours             | 14:03:00-07    | 14:03:00-07
+ 02:03:00-07    | @ 6 years                     | 02:03:00-07    | 02:03:00-07
+ 02:03:00-07    | @ 34 years                    | 02:03:00-07    | 02:03:00-07
+ 08:08:00-04    | @ 14 secs ago                 | 08:07:46-04    | 08:08:14-04
+ 08:08:00-04    | @ 1 min                       | 08:09:00-04    | 08:07:00-04
+ 08:08:00-04    | @ 5 hours                     | 13:08:00-04    | 03:08:00-04
+ 08:08:00-04    | @ 1 day 2 hours 3 mins 4 secs | 10:11:04-04    | 06:04:56-04
+ 08:08:00-04    | @ 10 days                     | 08:08:00-04    | 08:08:00-04
+ 08:08:00-04    | @ 3 mons                      | 08:08:00-04    | 08:08:00-04
+ 08:08:00-04    | @ 5 mons                      | 08:08:00-04    | 08:08:00-04
+ 08:08:00-04    | @ 5 mons 12 hours             | 20:08:00-04    | 20:08:00-04
+ 08:08:00-04    | @ 6 years                     | 08:08:00-04    | 08:08:00-04
+ 08:08:00-04    | @ 34 years                    | 08:08:00-04    | 08:08:00-04
+ 07:07:00-08    | @ 14 secs ago                 | 07:06:46-08    | 07:07:14-08
+ 07:07:00-08    | @ 1 min                       | 07:08:00-08    | 07:06:00-08
+ 07:07:00-08    | @ 5 hours                     | 12:07:00-08    | 02:07:00-08
+ 07:07:00-08    | @ 1 day 2 hours 3 mins 4 secs | 09:10:04-08    | 05:03:56-08
+ 07:07:00-08    | @ 10 days                     | 07:07:00-08    | 07:07:00-08
+ 07:07:00-08    | @ 3 mons                      | 07:07:00-08    | 07:07:00-08
+ 07:07:00-08    | @ 5 mons                      | 07:07:00-08    | 07:07:00-08
+ 07:07:00-08    | @ 5 mons 12 hours             | 19:07:00-08    | 19:07:00-08
+ 07:07:00-08    | @ 6 years                     | 07:07:00-08    | 07:07:00-08
+ 07:07:00-08    | @ 34 years                    | 07:07:00-08    | 07:07:00-08
+ 11:59:00-07    | @ 14 secs ago                 | 11:58:46-07    | 11:59:14-07
+ 11:59:00-07    | @ 1 min                       | 12:00:00-07    | 11:58:00-07
+ 11:59:00-07    | @ 5 hours                     | 16:59:00-07    | 06:59:00-07
+ 11:59:00-07    | @ 1 day 2 hours 3 mins 4 secs | 14:02:04-07    | 09:55:56-07
+ 11:59:00-07    | @ 10 days                     | 11:59:00-07    | 11:59:00-07
+ 11:59:00-07    | @ 3 mons                      | 11:59:00-07    | 11:59:00-07
+ 11:59:00-07    | @ 5 mons                      | 11:59:00-07    | 11:59:00-07
+ 11:59:00-07    | @ 5 mons 12 hours             | 23:59:00-07    | 23:59:00-07
+ 11:59:00-07    | @ 6 years                     | 11:59:00-07    | 11:59:00-07
+ 11:59:00-07    | @ 34 years                    | 11:59:00-07    | 11:59:00-07
+ 12:00:00-07    | @ 14 secs ago                 | 11:59:46-07    | 12:00:14-07
+ 12:00:00-07    | @ 1 min                       | 12:01:00-07    | 11:59:00-07
+ 12:00:00-07    | @ 5 hours                     | 17:00:00-07    | 07:00:00-07
+ 12:00:00-07    | @ 1 day 2 hours 3 mins 4 secs | 14:03:04-07    | 09:56:56-07
+ 12:00:00-07    | @ 10 days                     | 12:00:00-07    | 12:00:00-07
+ 12:00:00-07    | @ 3 mons                      | 12:00:00-07    | 12:00:00-07
+ 12:00:00-07    | @ 5 mons                      | 12:00:00-07    | 12:00:00-07
+ 12:00:00-07    | @ 5 mons 12 hours             | 00:00:00-07    | 00:00:00-07
+ 12:00:00-07    | @ 6 years                     | 12:00:00-07    | 12:00:00-07
+ 12:00:00-07    | @ 34 years                    | 12:00:00-07    | 12:00:00-07
+ 12:01:00-07    | @ 14 secs ago                 | 12:00:46-07    | 12:01:14-07
+ 12:01:00-07    | @ 1 min                       | 12:02:00-07    | 12:00:00-07
+ 12:01:00-07    | @ 5 hours                     | 17:01:00-07    | 07:01:00-07
+ 12:01:00-07    | @ 1 day 2 hours 3 mins 4 secs | 14:04:04-07    | 09:57:56-07
+ 12:01:00-07    | @ 10 days                     | 12:01:00-07    | 12:01:00-07
+ 12:01:00-07    | @ 3 mons                      | 12:01:00-07    | 12:01:00-07
+ 12:01:00-07    | @ 5 mons                      | 12:01:00-07    | 12:01:00-07
+ 12:01:00-07    | @ 5 mons 12 hours             | 00:01:00-07    | 00:01:00-07
+ 12:01:00-07    | @ 6 years                     | 12:01:00-07    | 12:01:00-07
+ 12:01:00-07    | @ 34 years                    | 12:01:00-07    | 12:01:00-07
+ 15:36:39-04    | @ 14 secs ago                 | 15:36:25-04    | 15:36:53-04
+ 15:36:39-04    | @ 1 min                       | 15:37:39-04    | 15:35:39-04
+ 15:36:39-04    | @ 5 hours                     | 20:36:39-04    | 10:36:39-04
+ 15:36:39-04    | @ 1 day 2 hours 3 mins 4 secs | 17:39:43-04    | 13:33:35-04
+ 15:36:39-04    | @ 10 days                     | 15:36:39-04    | 15:36:39-04
+ 15:36:39-04    | @ 3 mons                      | 15:36:39-04    | 15:36:39-04
+ 15:36:39-04    | @ 5 mons                      | 15:36:39-04    | 15:36:39-04
+ 15:36:39-04    | @ 5 mons 12 hours             | 03:36:39-04    | 03:36:39-04
+ 15:36:39-04    | @ 6 years                     | 15:36:39-04    | 15:36:39-04
+ 15:36:39-04    | @ 34 years                    | 15:36:39-04    | 15:36:39-04
+ 15:36:39-05    | @ 14 secs ago                 | 15:36:25-05    | 15:36:53-05
+ 15:36:39-05    | @ 1 min                       | 15:37:39-05    | 15:35:39-05
+ 15:36:39-05    | @ 5 hours                     | 20:36:39-05    | 10:36:39-05
+ 15:36:39-05    | @ 1 day 2 hours 3 mins 4 secs | 17:39:43-05    | 13:33:35-05
+ 15:36:39-05    | @ 10 days                     | 15:36:39-05    | 15:36:39-05
+ 15:36:39-05    | @ 3 mons                      | 15:36:39-05    | 15:36:39-05
+ 15:36:39-05    | @ 5 mons                      | 15:36:39-05    | 15:36:39-05
+ 15:36:39-05    | @ 5 mons 12 hours             | 03:36:39-05    | 03:36:39-05
+ 15:36:39-05    | @ 6 years                     | 15:36:39-05    | 15:36:39-05
+ 15:36:39-05    | @ 34 years                    | 15:36:39-05    | 15:36:39-05
+ 23:59:00-07    | @ 14 secs ago                 | 23:58:46-07    | 23:59:14-07
+ 23:59:00-07    | @ 1 min                       | 00:00:00-07    | 23:58:00-07
+ 23:59:00-07    | @ 5 hours                     | 04:59:00-07    | 18:59:00-07
+ 23:59:00-07    | @ 1 day 2 hours 3 mins 4 secs | 02:02:04-07    | 21:55:56-07
+ 23:59:00-07    | @ 10 days                     | 23:59:00-07    | 23:59:00-07
+ 23:59:00-07    | @ 3 mons                      | 23:59:00-07    | 23:59:00-07
+ 23:59:00-07    | @ 5 mons                      | 23:59:00-07    | 23:59:00-07
+ 23:59:00-07    | @ 5 mons 12 hours             | 11:59:00-07    | 11:59:00-07
+ 23:59:00-07    | @ 6 years                     | 23:59:00-07    | 23:59:00-07
+ 23:59:00-07    | @ 34 years                    | 23:59:00-07    | 23:59:00-07
+ 23:59:59.99-07 | @ 14 secs ago                 | 23:59:45.99-07 | 00:00:13.99-07
+ 23:59:59.99-07 | @ 1 min                       | 00:00:59.99-07 | 23:58:59.99-07
+ 23:59:59.99-07 | @ 5 hours                     | 04:59:59.99-07 | 18:59:59.99-07
+ 23:59:59.99-07 | @ 1 day 2 hours 3 mins 4 secs | 02:03:03.99-07 | 21:56:55.99-07
+ 23:59:59.99-07 | @ 10 days                     | 23:59:59.99-07 | 23:59:59.99-07
+ 23:59:59.99-07 | @ 3 mons                      | 23:59:59.99-07 | 23:59:59.99-07
+ 23:59:59.99-07 | @ 5 mons                      | 23:59:59.99-07 | 23:59:59.99-07
+ 23:59:59.99-07 | @ 5 mons 12 hours             | 11:59:59.99-07 | 11:59:59.99-07
+ 23:59:59.99-07 | @ 6 years                     | 23:59:59.99-07 | 23:59:59.99-07
+ 23:59:59.99-07 | @ 34 years                    | 23:59:59.99-07 | 23:59:59.99-07
 (120 rows)
 
 -- SQL9x OVERLAPS operator
diff --git a/src/test/regress/expected/information_schema.out b/src/test/regress/expected/information_schema.out
index e8b120189136..6c107f15c802 100644
--- a/src/test/regress/expected/information_schema.out
+++ b/src/test/regress/expected/information_schema.out
@@ -88,7 +88,7 @@ where ordinal_position = 20;
  pg_catalog         | pg_type              | typstorage         |               20
  pg_catalog         | pg_proc              | proargnames        |               20
  pg_catalog         | pg_class             | reltriggers        |               20
- pg_catalog         | pg_am                | ambuild            |               20
+ pg_catalog         | pg_am                | amrestrpos         |               20
  information_schema | columns              | collation_catalog  |               20
  information_schema | domains              | udt_catalog        |               20
  information_schema | parameters           | numeric_scale      |               20
diff --git a/src/test/regress/expected/information_schema_optimizer.out b/src/test/regress/expected/information_schema_optimizer.out
index d5a32ea71e27..3cdb6e1b25cb 100644
--- a/src/test/regress/expected/information_schema_optimizer.out
+++ b/src/test/regress/expected/information_schema_optimizer.out
@@ -88,7 +88,7 @@ where ordinal_position = 20;
  pg_catalog         | pg_type              | typstorage         |               20
  pg_catalog         | pg_proc              | proargnames        |               20
  pg_catalog         | pg_class             | reltriggers        |               20
- pg_catalog         | pg_am                | ambuild            |               20
+ pg_catalog         | pg_am                | amrestrpos         |               20
  information_schema | columns              | collation_catalog  |               20
  information_schema | domains              | udt_catalog        |               20
  information_schema | parameters           | numeric_scale      |               20
diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 62c81a3416af..a4e6b7fd5ee8 100755
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -608,7 +608,7 @@ SELECT * FROM a; /* Has ee entry */
 (0 rows)
 
 CREATE TABLE inhf (LIKE inhx, LIKE inhx); /* Throw error */
-ERROR:  column "xx" duplicated
+ERROR:  column "xx" specified more than once
 CREATE TABLE inhf (LIKE inhx INCLUDING DEFAULTS INCLUDING CONSTRAINTS);
 INSERT INTO inhf DEFAULT VALUES;
 SELECT * FROM inhf; /* Single entry with value 'text' */
diff --git a/src/test/regress/expected/int2.out b/src/test/regress/expected/int2.out
index dac305cf0d1c..21048bc6f8a9 100755
--- a/src/test/regress/expected/int2.out
+++ b/src/test/regress/expected/int2.out
@@ -244,3 +244,14 @@ SELECT '' AS five, i.f1, i.f1 / int4 '2' AS x FROM INT2_TBL i order by f1;
       |  32767 |  16383
 (5 rows)
 
+-- check sane handling of INT16_MIN overflow cases
+SELECT (-32768)::int2 * (-1)::int2;
+ERROR:  smallint out of range
+SELECT (-32768)::int2 / (-1)::int2;
+ERROR:  smallint out of range
+SELECT (-32768)::int2 % (-1)::int2;
+ ?column? 
+----------
+        0
+(1 row)
+
diff --git a/src/test/regress/expected/int4.out b/src/test/regress/expected/int4.out
index 1b827f5e7b47..6255e277a5f1 100755
--- a/src/test/regress/expected/int4.out
+++ b/src/test/regress/expected/int4.out
@@ -331,3 +331,24 @@ SELECT (2 + 2) / 2 AS two;
    2
 (1 row)
 
+-- check sane handling of INT_MIN overflow cases
+SELECT (-2147483648)::int4 * (-1)::int4;
+ERROR:  integer out of range
+SELECT (-2147483648)::int4 / (-1)::int4;
+ERROR:  integer out of range
+SELECT (-2147483648)::int4 % (-1)::int4;
+ ?column? 
+----------
+        0
+(1 row)
+
+SELECT (-2147483648)::int4 * (-1)::int2;
+ERROR:  integer out of range
+SELECT (-2147483648)::int4 / (-1)::int2;
+ERROR:  integer out of range
+SELECT (-2147483648)::int4 % (-1)::int2;
+ ?column? 
+----------
+        0
+(1 row)
+
diff --git a/src/test/regress/expected/int8-exp-three-digits.out b/src/test/regress/expected/int8-exp-three-digits.out
index e3697f8344f4..187bf8e43395 100755
--- a/src/test/regress/expected/int8-exp-three-digits.out
+++ b/src/test/regress/expected/int8-exp-three-digits.out
@@ -317,3 +317,24 @@ select '9223372036854775807'::int8;
 
 select '9223372036854775808'::int8;
 ERROR:  value "9223372036854775808" is out of range for type bigint
+-- check sane handling of INT64_MIN overflow cases
+SELECT (-9223372036854775808)::int8 * (-1)::int8;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 / (-1)::int8;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 % (-1)::int8;
+ ?column? 
+----------
+        0
+(1 row)
+
+SELECT (-9223372036854775808)::int8 * (-1)::int4;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 / (-1)::int4;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 % (-1)::int4;
+ ?column? 
+----------
+        0
+(1 row)
+
diff --git a/src/test/regress/expected/int8.out b/src/test/regress/expected/int8.out
index 5efc41efad53..c31ccb290934 100755
--- a/src/test/regress/expected/int8.out
+++ b/src/test/regress/expected/int8.out
@@ -337,3 +337,24 @@ select '9223372036854775808'::int8;
 ERROR:  value "9223372036854775808" is out of range for type bigint
 LINE 1: select '9223372036854775808'::int8;
                ^
+-- check sane handling of INT64_MIN overflow cases
+SELECT (-9223372036854775808)::int8 * (-1)::int8;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 / (-1)::int8;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 % (-1)::int8;
+ ?column? 
+----------
+        0
+(1 row)
+
+SELECT (-9223372036854775808)::int8 * (-1)::int4;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 / (-1)::int4;
+ERROR:  bigint out of range
+SELECT (-9223372036854775808)::int8 % (-1)::int4;
+ ?column? 
+----------
+        0
+(1 row)
+
diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out
index 9bddba2574bf..d6703895a47d 100755
--- a/src/test/regress/expected/interval.out
+++ b/src/test/regress/expected/interval.out
@@ -365,3 +365,16 @@ SELECT '1:20:05 5 microseconds'::interval;          -- error
 ERROR:  invalid input syntax for type interval: "1:20:05 5 microseconds"
 LINE 1: SELECT '1:20:05 5 microseconds'::interval;
                ^
+-- check that '30 days' equals '1 month' according to the hash function
+select '30 days'::interval = '1 month'::interval as t;
+ t 
+---
+ t
+(1 row)
+
+select interval_hash('30 days'::interval) = interval_hash('1 month'::interval) as t;
+ t 
+---
+ t
+(1 row)
+
diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index d389608eacd3..5007a41911fe 100755
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -2129,6 +2129,7 @@ on (x1 = xx1) where (xx2 is not null);
 -- regression test: check for bug with propagation of implied equality
 -- to outside an IN
 --
+analyze tenk1;		-- ensure we get consistent plans here
 select count(*) from tenk1 a where unique1 in
   (select unique1 from tenk1 b join tenk1 c using (unique1)
    where b.unique2 = 42);
@@ -2324,3 +2325,48 @@ where f2 = 53;
  53 |    |    | 
 (1 row)
 
+--
+-- regression test for improper extraction of OR indexqual conditions
+-- (as seen in early 8.3.x releases)
+--
+select a.unique2, a.ten, b.tenthous, b.unique2, b.hundred
+from tenk1 a left join tenk1 b on a.unique2 = b.tenthous
+where a.unique1 = 42 and
+      ((b.unique2 is null and a.ten = 2) or b.hundred = 3);
+ unique2 | ten | tenthous | unique2 | hundred 
+---------+-----+----------+---------+---------
+(0 rows)
+
+--
+-- test for sane behavior with noncanonical merge clauses, per bug #4926
+--
+begin;
+set enable_mergejoin = 1;
+set enable_hashjoin = 0;
+set enable_nestloop = 0;
+create temp table a (i integer);
+create temp table b (x integer, y integer);
+select * from a left join b on i = x and i = y and x = i;
+ i | x | y 
+---+---+---
+(0 rows)
+
+rollback;
+--
+-- test handling of potential equivalence clauses above outer joins
+--
+select q1, unique2, thousand, hundred
+  from int8_tbl a left join tenk1 b on q1 = unique2
+  where coalesce(thousand,123) = q1 and q1 = coalesce(hundred,123);
+ q1 | unique2 | thousand | hundred 
+----+---------+----------+---------
+(0 rows)
+
+select f1, unique2, case when unique2 is null then f1 else 0 end
+  from int4_tbl a left join tenk1 b on f1 = unique2
+  where (case when unique2 is null then f1 else 0 end) = 0;
+ f1 | unique2 | case 
+----+---------+------
+  0 |       0 |    0
+(1 row)
+
diff --git a/src/test/regress/expected/join_1.out b/src/test/regress/expected/join_1.out
index 4690b7114021..8ce77940d4fe 100755
--- a/src/test/regress/expected/join_1.out
+++ b/src/test/regress/expected/join_1.out
@@ -2129,6 +2129,7 @@ on (x1 = xx1) where (xx2 is not null);
 -- regression test: check for bug with propagation of implied equality
 -- to outside an IN
 --
+analyze tenk1;		-- ensure we get consistent plans here
 select count(*) from tenk1 a where unique1 in
   (select unique1 from tenk1 b join tenk1 c using (unique1)
    where b.unique2 = 42);
@@ -2321,3 +2322,48 @@ where f2 = 53;
  53 |    |    | 
 (1 row)
 
+--
+-- regression test for improper extraction of OR indexqual conditions
+-- (as seen in early 8.3.x releases)
+--
+select a.unique2, a.ten, b.tenthous, b.unique2, b.hundred
+from tenk1 a left join tenk1 b on a.unique2 = b.tenthous
+where a.unique1 = 42 and
+      ((b.unique2 is null and a.ten = 2) or b.hundred = 3);
+ unique2 | ten | tenthous | unique2 | hundred 
+---------+-----+----------+---------+---------
+(0 rows)
+
+--
+-- test for sane behavior with noncanonical merge clauses, per bug #4926
+--
+begin;
+set enable_mergejoin = 1;
+set enable_hashjoin = 0;
+set enable_nestloop = 0;
+create temp table a (i integer);
+create temp table b (x integer, y integer);
+select * from a left join b on i = x and i = y and x = i;
+ i | x | y 
+---+---+---
+(0 rows)
+
+rollback;
+--
+-- test handling of potential equivalence clauses above outer joins
+--
+select q1, unique2, thousand, hundred
+  from int8_tbl a left join tenk1 b on q1 = unique2
+  where coalesce(thousand,123) = q1 and q1 = coalesce(hundred,123);
+ q1 | unique2 | thousand | hundred 
+----+---------+----------+---------
+(0 rows)
+
+select f1, unique2, case when unique2 is null then f1 else 0 end
+  from int4_tbl a left join tenk1 b on f1 = unique2
+  where (case when unique2 is null then f1 else 0 end) = 0;
+ f1 | unique2 | case 
+----+---------+------
+  0 |       0 |    0
+(1 row)
+
diff --git a/src/test/regress/expected/limit.out b/src/test/regress/expected/limit.out
index f960958b2f6d..c33ebe039658 100755
--- a/src/test/regress/expected/limit.out
+++ b/src/test/regress/expected/limit.out
@@ -108,3 +108,24 @@ SELECT ''::text AS five, unique1, unique2, stringu1
       |     904 |     793 | UIAAAA
 (5 rows)
 
+-- Stress test for variable LIMIT in conjunction with bounded-heap sorting
+SELECT
+  (SELECT n
+     FROM (VALUES (1)) AS x,
+          (SELECT n FROM generate_series(1,10) AS n
+             ORDER BY n LIMIT 1 OFFSET s-1) AS y) AS z
+  FROM generate_series(1,10) AS s;
+ z  
+----
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+ 10
+(10 rows)
+
diff --git a/src/test/regress/expected/money.out b/src/test/regress/expected/money.out
new file mode 100644
index 000000000000..ec4169cbb060
--- /dev/null
+++ b/src/test/regress/expected/money.out
@@ -0,0 +1,187 @@
+--
+-- MONEY
+--
+CREATE TABLE money_data (m money);
+INSERT INTO money_data VALUES ('123');
+SELECT * FROM money_data;
+    m    
+---------
+ $123.00
+(1 row)
+
+SELECT m + '123' FROM money_data;
+ ?column? 
+----------
+  $246.00
+(1 row)
+
+SELECT m + '123.45' FROM money_data;
+ ?column? 
+----------
+  $246.45
+(1 row)
+
+SELECT m - '123.45' FROM money_data;
+ ?column? 
+----------
+   -$0.45
+(1 row)
+
+SELECT m * 2 FROM money_data;
+ ?column? 
+----------
+  $246.00
+(1 row)
+
+SELECT m / 2 FROM money_data;
+ ?column? 
+----------
+   $61.50
+(1 row)
+
+-- All true
+SELECT m = '$123.00' FROM money_data;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT m != '$124.00' FROM money_data;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT m <= '$123.00' FROM money_data;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT m >= '$123.00' FROM money_data;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT m < '$124.00' FROM money_data;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT m > '$122.00' FROM money_data;
+ ?column? 
+----------
+ t
+(1 row)
+
+-- All false
+SELECT m = '$123.01' FROM money_data;
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT m != '$123.00' FROM money_data;
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT m <= '$122.99' FROM money_data;
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT m >= '$123.01' FROM money_data;
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT m > '$124.00' FROM money_data;
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT m < '$122.00' FROM money_data;
+ ?column? 
+----------
+ f
+(1 row)
+
+SELECT cashlarger(m, '$124.00') FROM money_data;
+ cashlarger 
+------------
+    $124.00
+(1 row)
+
+SELECT cashsmaller(m, '$124.00') FROM money_data;
+ cashsmaller 
+-------------
+     $123.00
+(1 row)
+
+SELECT cash_words(m) FROM money_data;
+                   cash_words                    
+-------------------------------------------------
+ One hundred twenty three dollars and zero cents
+(1 row)
+
+SELECT cash_words(m + '1.23') FROM money_data;
+                       cash_words                       
+--------------------------------------------------------
+ One hundred twenty four dollars and twenty three cents
+(1 row)
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.45');
+SELECT * FROM money_data;
+    m    
+---------
+ $123.45
+(1 row)
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.451');
+SELECT * FROM money_data;
+    m    
+---------
+ $123.45
+(1 row)
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.454');
+SELECT * FROM money_data;
+    m    
+---------
+ $123.45
+(1 row)
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.455');
+SELECT * FROM money_data;
+    m    
+---------
+ $123.46
+(1 row)
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.456');
+SELECT * FROM money_data;
+    m    
+---------
+ $123.46
+(1 row)
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.459');
+SELECT * FROM money_data;
+    m    
+---------
+ $123.46
+(1 row)
+
diff --git a/src/test/regress/expected/oidjoins.out b/src/test/regress/expected/oidjoins.out
index f77d89e96b8c..a981b69ecb02 100755
--- a/src/test/regress/expected/oidjoins.out
+++ b/src/test/regress/expected/oidjoins.out
@@ -409,6 +409,14 @@ WHERE	indrelid != 0 AND
 ------+----------
 (0 rows)
 
+SELECT	ctid, lanowner 
+FROM	pg_catalog.pg_language fk 
+WHERE	lanowner != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.lanowner);
+ ctid | lanowner 
+------+----------
+(0 rows)
+
 SELECT	ctid, lanvalidator 
 FROM	pg_catalog.pg_language fk 
 WHERE	lanvalidator != 0 AND 
@@ -689,6 +697,142 @@ WHERE	tgfoid != 0 AND
 ------+--------
 (0 rows)
 
+SELECT	ctid, cfgnamespace 
+FROM	pg_catalog.pg_ts_config fk 
+WHERE	cfgnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.cfgnamespace);
+ ctid | cfgnamespace 
+------+--------------
+(0 rows)
+
+SELECT	ctid, cfgowner 
+FROM	pg_catalog.pg_ts_config fk 
+WHERE	cfgowner != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.cfgowner);
+ ctid | cfgowner 
+------+----------
+(0 rows)
+
+SELECT	ctid, cfgparser 
+FROM	pg_catalog.pg_ts_config fk 
+WHERE	cfgparser != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_parser pk WHERE pk.oid = fk.cfgparser);
+ ctid | cfgparser 
+------+-----------
+(0 rows)
+
+SELECT	ctid, mapcfg 
+FROM	pg_catalog.pg_ts_config_map fk 
+WHERE	mapcfg != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_config pk WHERE pk.oid = fk.mapcfg);
+ ctid | mapcfg 
+------+--------
+(0 rows)
+
+SELECT	ctid, mapdict 
+FROM	pg_catalog.pg_ts_config_map fk 
+WHERE	mapdict != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_dict pk WHERE pk.oid = fk.mapdict);
+ ctid | mapdict 
+------+---------
+(0 rows)
+
+SELECT	ctid, dictnamespace 
+FROM	pg_catalog.pg_ts_dict fk 
+WHERE	dictnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.dictnamespace);
+ ctid | dictnamespace 
+------+---------------
+(0 rows)
+
+SELECT	ctid, dictowner 
+FROM	pg_catalog.pg_ts_dict fk 
+WHERE	dictowner != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.dictowner);
+ ctid | dictowner 
+------+-----------
+(0 rows)
+
+SELECT	ctid, dicttemplate 
+FROM	pg_catalog.pg_ts_dict fk 
+WHERE	dicttemplate != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_template pk WHERE pk.oid = fk.dicttemplate);
+ ctid | dicttemplate 
+------+--------------
+(0 rows)
+
+SELECT	ctid, prsnamespace 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.prsnamespace);
+ ctid | prsnamespace 
+------+--------------
+(0 rows)
+
+SELECT	ctid, prsstart 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsstart != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsstart);
+ ctid | prsstart 
+------+----------
+(0 rows)
+
+SELECT	ctid, prstoken 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prstoken != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prstoken);
+ ctid | prstoken 
+------+----------
+(0 rows)
+
+SELECT	ctid, prsend 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsend != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsend);
+ ctid | prsend 
+------+--------
+(0 rows)
+
+SELECT	ctid, prsheadline 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsheadline != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsheadline);
+ ctid | prsheadline 
+------+-------------
+(0 rows)
+
+SELECT	ctid, prslextype 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prslextype != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prslextype);
+ ctid | prslextype 
+------+------------
+(0 rows)
+
+SELECT	ctid, tmplnamespace 
+FROM	pg_catalog.pg_ts_template fk 
+WHERE	tmplnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.tmplnamespace);
+ ctid | tmplnamespace 
+------+---------------
+(0 rows)
+
+SELECT	ctid, tmplinit 
+FROM	pg_catalog.pg_ts_template fk 
+WHERE	tmplinit != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmplinit);
+ ctid | tmplinit 
+------+----------
+(0 rows)
+
+SELECT	ctid, tmpllexize 
+FROM	pg_catalog.pg_ts_template fk 
+WHERE	tmpllexize != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmpllexize);
+ ctid | tmpllexize 
+------+------------
+(0 rows)
+
 SELECT	ctid, typnamespace 
 FROM	pg_catalog.pg_type fk 
 WHERE	typnamespace != 0 AND 
@@ -721,11 +865,11 @@ WHERE	typelem != 0 AND
 ------+---------
 (0 rows)
 
-SELECT  ctid, typarray
-FROM    pg_catalog.pg_type fk
-WHERE   typarray != 0 AND
-    NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typarray);
- ctid | typarray
+SELECT	ctid, typarray 
+FROM	pg_catalog.pg_type fk 
+WHERE	typarray != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typarray);
+ ctid | typarray 
 ------+----------
 (0 rows)
 
diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out
index 991986e99f18..fe04b9be1ea5 100755
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -380,6 +380,9 @@ WHERE c.castfunc = p.oid AND
 -- those are binary-compatible while the reverse way goes through rtrim().
 -- As of 8.2, this finds the cast from cidr to inet, because that is a
 -- trivial binary coercion while the other way goes through inet_to_cidr().
+-- As of 8.3, this finds the casts from xml to text, varchar, and bpchar,
+-- because those are binary-compatible while the reverse goes through
+-- texttoxml(), which does an XML syntax check.
 SELECT *
 FROM pg_cast c
 WHERE c.castfunc = 0 AND
@@ -392,7 +395,10 @@ WHERE c.castfunc = 0 AND
          25 |       1042 |        0 | i
        1043 |       1042 |        0 | i
         650 |        869 |        0 | i
-(3 rows)
+        142 |         25 |        0 | a
+        142 |       1043 |        0 | a
+        142 |       1042 |        0 | a
+(6 rows)
 
 -- **************** pg_operator ****************
 -- Look for illegal values in pg_operator fields.
@@ -868,6 +874,7 @@ ORDER BY 1, 2, 3;
         405 |            1 | =
         405 |            1 | ~=~
         783 |            1 | <<
+        783 |            1 | @@
         783 |            2 | &<
         783 |            3 | &&
         783 |            4 | &>
@@ -882,7 +889,9 @@ ORDER BY 1, 2, 3;
         783 |           13 | ~
         783 |           14 | @
        2742 |            1 | &&
+       2742 |            1 | @@
        2742 |            2 | @>
+       2742 |            2 | @@@
        2742 |            3 | <@
        2742 |            4 | =
        3013 |            1 | <
@@ -895,7 +904,7 @@ ORDER BY 1, 2, 3;
        3013 |            4 | ~>=~
        3013 |            5 | >
        3013 |            5 | ~>~
-(40 rows)
+(43 rows)
 
 -- Check that all operators linked to by opclass entries have selectivity
 -- estimators.  This is not absolutely required, but it seems a reasonable
@@ -1039,6 +1048,19 @@ WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND
 --------+---------+----------------+-----------------
 (0 rows)
 
+-- Also, check if there are any pg_opclass entries that don't seem to have
+-- pg_amproc support.
+SELECT amname, opcname, count(*)
+FROM pg_am am JOIN pg_opclass op ON opcmethod = am.oid
+     LEFT JOIN pg_amproc p ON amprocfamily = opcfamily AND
+         amproclefttype = amprocrighttype AND amproclefttype = opcintype
+GROUP BY amname, amsupport, opcname, amprocfamily
+HAVING count(*) != amsupport OR amprocfamily IS NULL;
+ amname |   opcname    | count 
+--------+--------------+-------
+ gin    | _complex_ops |     1
+(1 row)
+
 -- Unfortunately, we can't check the amproc link very well because the
 -- signature of the function may be different for different support routines
 -- or different base data types.
@@ -1082,10 +1104,9 @@ WHERE p3.opfmethod = (SELECT oid FROM pg_am WHERE amname = 'btree')
 -- For hash we can also do a little better: the support routines must be
 -- of the form hash(lefttype) returns int4.  There are several cases where
 -- we cheat and use a hash function that is physically compatible with the
--- datatype even though there's no cast, so for now we can't check that.
-SELECT p1.amprocfamily, p1.amprocnum,
-	p2.oid, p2.proname,
-	p3.opfname
+-- datatype even though there's no cast, so this check does find a small
+-- number of entries.
+SELECT p1.amprocfamily, p1.amprocnum, p2.proname, p3.opfname
 FROM pg_amproc AS p1, pg_proc AS p2, pg_opfamily AS p3
 WHERE p3.opfmethod = (SELECT oid FROM pg_am WHERE amname = 'hash')
     AND p1.amprocfamily = p3.oid AND p1.amproc = p2.oid AND
@@ -1093,11 +1114,20 @@ WHERE p3.opfmethod = (SELECT oid FROM pg_am WHERE amname = 'hash')
      OR proretset
      OR prorettype != 'int4'::regtype
      OR pronargs != 1
---   OR NOT physically_coercible(amproclefttype, proargtypes[0])
-     OR amproclefttype != amprocrighttype);
- amprocfamily | amprocnum | oid | proname | opfname 
---------------+-----------+-----+---------+---------
-(0 rows)
+     OR NOT physically_coercible(amproclefttype, proargtypes[0])
+     OR amproclefttype != amprocrighttype)
+ORDER BY 1;
+ amprocfamily | amprocnum |    proname     |      opfname       
+--------------+-----------+----------------+--------------------
+          435 |         1 | hashint4       | date_ops
+         1999 |         1 | timestamp_hash | timestamptz_ops
+         2222 |         1 | hashchar       | bool_ops
+         2223 |         1 | hashvarlena    | bytea_ops
+         2225 |         1 | hashint4       | xid_ops
+         2226 |         1 | hashint4       | cid_ops
+         2229 |         1 | hashvarlena    | text_pattern_ops
+         2231 |         1 | hashvarlena    | bpchar_pattern_ops
+(8 rows)
 
 -- Support routines that are primary members of opfamilies must be immutable
 -- (else it suggests that the index ordering isn't fixed).  But cross-type
diff --git a/src/test/regress/expected/partition.out b/src/test/regress/expected/partition.out
index 6c7ba969f8ea..1f627c1e7d6e 100755
--- a/src/test/regress/expected/partition.out
+++ b/src/test/regress/expected/partition.out
@@ -15,23 +15,23 @@ partition p1(subpartition sp1,subpartition sp2,subpartition sp3)
 );
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1" for table "region"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp1" for table "region_1_prt_p1"
-NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2" for table "region_1_prt_p1"
-NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3" for table "region_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp1_3_prt_1" for table "region_1_prt_p1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp1_3_prt_2" for table "region_1_prt_p1_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2" for table "region_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2_3_prt_1" for table "region_1_prt_p1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2_3_prt_2" for table "region_1_prt_p1_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3" for table "region_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3_3_prt_1" for table "region_1_prt_p1_2_prt_sp3"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3_3_prt_2" for table "region_1_prt_p1_2_prt_sp3"
 create unique index region_pkey on region(r_regionkey);
 NOTICE:  building index for child partition "region_1_prt_p1"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp1"
-NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2"
-NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp1_3_prt_1"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp1_3_prt_2"
+NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2_3_prt_1"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2_3_prt_2"
+NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3_3_prt_1"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3_3_prt_2"
 copy region from stdin with delimiter '|';
@@ -724,22 +724,22 @@ Create table sto_ao_ao
  subpartition template ( default subpartition subothers, subpartition sub1 values ('one'), subpartition sub2 values ('two'))
  (default partition others, start(date '2008-01-01') end(date '2008-04-30') every(interval '1 month'));
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others_2_prt_subothers" for table "sto_ao_ao_1_prt_others"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others_2_prt_sub1" for table "sto_ao_ao_1_prt_others"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others_2_prt_sub2" for table "sto_ao_ao_1_prt_others"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2_2_prt_subothers" for table "sto_ao_ao_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2_2_prt_sub1" for table "sto_ao_ao_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2_2_prt_sub2" for table "sto_ao_ao_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3_2_prt_subothers" for table "sto_ao_ao_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3_2_prt_sub1" for table "sto_ao_ao_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3_2_prt_sub2" for table "sto_ao_ao_1_prt_3"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4_2_prt_subothers" for table "sto_ao_ao_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4_2_prt_sub1" for table "sto_ao_ao_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4_2_prt_sub2" for table "sto_ao_ao_1_prt_4"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5_2_prt_subothers" for table "sto_ao_ao_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5_2_prt_sub1" for table "sto_ao_ao_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5_2_prt_sub2" for table "sto_ao_ao_1_prt_5"
@@ -1162,29 +1162,29 @@ partition p1 start('1') end('10001') every(5000)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 insert into partsupp values(1,2,3325,771.64,', even theodolites. regular, final
@@ -1303,29 +1303,29 @@ partition p1 start('1') end('10001') every(5000)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 select tablename, partitiontablename,
@@ -1387,10 +1387,10 @@ create table i5 (i int, g text) partition by list(g)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1" for table "i5"
-NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2" for table "i5"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1_2_prt_1" for table "i5_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1_2_prt_2" for table "i5_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1_2_prt_3" for table "i5_1_prt_p1"
+NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2" for table "i5"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2_2_prt_1" for table "i5_1_prt_p2"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2_2_prt_2" for table "i5_1_prt_p2"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2_2_prt_3" for table "i5_1_prt_p2"
@@ -1451,44 +1451,44 @@ subpartition ohio values ('OH')
   partition girls values ('F')
 );
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys" for table "rank2"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan05"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan05"
@@ -1570,44 +1570,44 @@ subpartition ohio values ('OH')
 )
 );
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys" for table "rank3"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan05"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan05"
@@ -1695,28 +1695,28 @@ add partition neuter values ('N')
             (subpartition bar values ('AZ')));
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_1"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_2"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_3"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_4"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_5"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_6"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_7"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_8"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_9"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_10"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_11"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_12"
 -- fail , no subpartition spec for rank3, works for rank2
 alter table rank2 alter partition boys
@@ -1757,26 +1757,26 @@ alter table rank2
 add default partition neuter ;
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan05"
@@ -1800,28 +1800,28 @@ add default partition neuter
             (subpartition ariz values ('AZ')));
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_1"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_2"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_3"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_4"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_5"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_6"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_7"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_8"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_9"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_10"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_11"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_12"
 -- fail
 alter table rank2
@@ -1897,10 +1897,10 @@ subpartition by list(j) subpartition template (values(1, 2, 3))
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_1" for table "granttest"
-NOTICE:  CREATE TABLE will create partition "granttest_1_prt_2" for table "granttest"
-NOTICE:  CREATE TABLE will create partition "granttest_1_prt_3" for table "granttest"
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_1_2_prt_1" for table "granttest_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "granttest_1_prt_2" for table "granttest"
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_2_2_prt_1" for table "granttest_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "granttest_1_prt_3" for table "granttest"
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_3_2_prt_1" for table "granttest_1_prt_3"
 select has_table_privilege('part_role', 'granttest'::regclass,'select');
  has_table_privilege 
@@ -2140,31 +2140,31 @@ CREATE TABLE partsupp (
                   )
           );
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_1" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_1" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_1" for table "partsupp_1_prt_p1_3"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2" for table "partsupp_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_3_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_3_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2" for table "partsupp_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_3_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_3_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_1" for table "partsupp_1_prt_p1_4"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2" for table "partsupp_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_4_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_4_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2" for table "partsupp_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_4_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_4_2_prt_2"
 drop table partsupp;
@@ -2283,56 +2283,56 @@ WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) PARTITI
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'o_orderkey' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1" for table "orders_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2" for table "orders_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_1_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2" for table "orders_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_1_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1" for table "orders_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2" for table "orders_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_2_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_2_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_2_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_2_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2" for table "orders_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_2_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_2_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_2_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_2_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1" for table "orders_1_prt_p1_3"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2" for table "orders_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_3_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_3_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_3_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_3_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2" for table "orders_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_3_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_3_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_3_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_3_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1" for table "orders_1_prt_p1_4"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2" for table "orders_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_4_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_4_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_4_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_4_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2" for table "orders_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_4_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_4_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_4_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_4_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1" for table "orders_1_prt_p1_5"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2" for table "orders_1_prt_p1_5"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_5_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_5_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_5_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_5_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2" for table "orders_1_prt_p1_5"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_5_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_5_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_5_2_prt_sp2"
@@ -3020,13 +3020,13 @@ SUBPARTITION year6 START (2006) END (2007) )
 PARTITION boys VALUES ('M')
 );
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year1" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year2" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year3" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year4" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year5" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year6" for table "rank_1_prt_girls"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_year1" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_year2" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_year3" for table "rank_1_prt_boys"
@@ -3123,30 +3123,30 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1" for table "bar_p"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_1" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_1_3_prt_1" for table "bar_p_1_prt_1_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_1_3_prt_2" for table "bar_p_1_prt_1_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2_3_prt_1" for table "bar_p_1_prt_1_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2_3_prt_2" for table "bar_p_1_prt_1_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3_3_prt_1" for table "bar_p_1_prt_1_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3_3_prt_2" for table "bar_p_1_prt_1_2_prt_3"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4_3_prt_1" for table "bar_p_1_prt_1_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4_3_prt_2" for table "bar_p_1_prt_1_2_prt_4"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5_3_prt_1" for table "bar_p_1_prt_1_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5_3_prt_2" for table "bar_p_1_prt_1_2_prt_5"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6_3_prt_1" for table "bar_p_1_prt_1_2_prt_6"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6_3_prt_2" for table "bar_p_1_prt_1_2_prt_6"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7_3_prt_1" for table "bar_p_1_prt_1_2_prt_7"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7_3_prt_2" for table "bar_p_1_prt_1_2_prt_7"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8_3_prt_1" for table "bar_p_1_prt_1_2_prt_8"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8_3_prt_2" for table "bar_p_1_prt_1_2_prt_8"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9_3_prt_1" for table "bar_p_1_prt_1_2_prt_9"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9_3_prt_2" for table "bar_p_1_prt_1_2_prt_9"
 alter table bar_p alter partition for ('5') alter partition for ('5')
@@ -3188,30 +3188,30 @@ start (1) end (10) every (1)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_1" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_1_2_prt_sp1" for table "mpp4892_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_1_2_prt_sp2" for table "mpp4892_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2_2_prt_sp1" for table "mpp4892_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2_2_prt_sp2" for table "mpp4892_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3_2_prt_sp1" for table "mpp4892_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3_2_prt_sp2" for table "mpp4892_1_prt_3"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4_2_prt_sp1" for table "mpp4892_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4_2_prt_sp2" for table "mpp4892_1_prt_4"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5_2_prt_sp1" for table "mpp4892_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5_2_prt_sp2" for table "mpp4892_1_prt_5"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6_2_prt_sp1" for table "mpp4892_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6_2_prt_sp2" for table "mpp4892_1_prt_6"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7_2_prt_sp1" for table "mpp4892_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7_2_prt_sp2" for table "mpp4892_1_prt_7"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8_2_prt_sp1" for table "mpp4892_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8_2_prt_sp2" for table "mpp4892_1_prt_8"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9_2_prt_sp1" for table "mpp4892_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9_2_prt_sp2" for table "mpp4892_1_prt_9"
 -- works
@@ -3318,12 +3318,12 @@ partition boys values ('M'),
 partition girls values ('F')
 );
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_1" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_2" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_3" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_4" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_5" for table "rank_1_prt_boys"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_1" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_2" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_3" for table "rank_1_prt_girls"
@@ -3542,10 +3542,10 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
 NOTICE:  CREATE TABLE will create partition "mpp5878_1_prt_1" for table "mpp5878"
 NOTICE:  CREATE TABLE will create partition "mpp5878_1_prt_2" for table "mpp5878"
 select partitionlistvalues from pg_partitions where tablename like 'mpp5878%';
-                partitionlistvalues                 
-----------------------------------------------------
- 'a'::bpchar, 'b'::bpchar, 'c'::bpchar, 'd'::bpchar
- 'e'::bpchar, 'f'::bpchar, 'g'::bpchar, 'h'::bpchar
+                            partitionlistvalues                             
+----------------------------------------------------------------------------
+ 'a'::character(1), 'b'::character(1), 'c'::character(1), 'd'::character(1)
+ 'e'::character(1), 'f'::character(1), 'g'::character(1), 'h'::character(1)
 (2 rows)
 
 select partitionboundary from pg_partitions where tablename like 'mpp5878%';
@@ -3579,44 +3579,44 @@ subpartition lll2 values ('F') )
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1" for table "mpp5941"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2" for table "mpp5941"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3" for table "mpp5941"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1" for table "mpp5941_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2" for table "mpp5941_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1" for table "mpp5941_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2" for table "mpp5941_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2" for table "mpp5941_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1" for table "mpp5941_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2" for table "mpp5941_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2" for table "mpp5941"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1" for table "mpp5941_1_prt_2"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2" for table "mpp5941_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1" for table "mpp5941_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2" for table "mpp5941_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2" for table "mpp5941_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1" for table "mpp5941_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2" for table "mpp5941_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3" for table "mpp5941"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1" for table "mpp5941_1_prt_3"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2" for table "mpp5941_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1" for table "mpp5941_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2" for table "mpp5941_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2" for table "mpp5941_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2_3_prt_ll1" for table "mpp5941_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2_3_prt_ll2" for table "mpp5941_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_3_2_prt_l2_3_prt_ll1"
@@ -3995,9 +3995,9 @@ subpartition by range(j) subpartition template(start(1) end(10) every(5))
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "it_1_prt_1" for table "it"
-NOTICE:  CREATE TABLE will create partition "it_1_prt_2" for table "it"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_1_2_prt_1" for table "it_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_1_2_prt_2" for table "it_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "it_1_prt_2" for table "it"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_2_2_prt_1" for table "it_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_2_2_prt_2" for table "it_1_prt_2"
 alter table it rename to newit;
@@ -4568,44 +4568,44 @@ subpartition lll2 values ('F') )
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1" for table "mpp5992"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2" for table "mpp5992"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1" for table "mpp5992_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2" for table "mpp5992_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2" for table "mpp5992_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1" for table "mpp5992_1_prt_2"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2" for table "mpp5992_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2" for table "mpp5992_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1" for table "mpp5992_1_prt_3"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2" for table "mpp5992_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2" for table "mpp5992_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_3_2_prt_l2_3_prt_ll1"
@@ -4643,15 +4643,15 @@ set subpartition template (subpartition l1 values (1,2,3),
 subpartition l2 values (4,5,6), subpartition l3 values (7,8,9,10));
 NOTICE:  replacing level 1 subpartition template specification for relation "mpp5992"
 select * from pg_partition_templates where tablename='mpp5992';
- schemaname | tablename | partitionname | partitiontype | partitionlevel | partitionrank | partitionposition |       partitionlistvalues        | partitionrangestart | partitionstartinclusive | partitionrangeend | partitionendinclusive | partitioneveryclause | partitionisdefault |           partitionboundary            
-------------+-----------+---------------+---------------+----------------+---------------+-------------------+----------------------------------+---------------------+-------------------------+-------------------+-----------------------+----------------------+--------------------+----------------------------------------
- public     | mpp5992   | lll1          | list          |              3 |               |                 1 | 'M'::bpchar                      |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll1 VALUES('M')
- public     | mpp5992   | lll2          | list          |              3 |               |                 2 | 'F'::bpchar                      |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll2 VALUES('F')
- public     | mpp5992   | ll1           | list          |              2 |               |                 1 | 'Engineering'::character varying |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll1 VALUES('Engineering')
- public     | mpp5992   | ll2           | list          |              2 |               |                 2 | 'QA'::character varying          |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll2 VALUES('QA')
- public     | mpp5992   | l1            | list          |              1 |               |                 1 | 1, 2, 3                          |                     |                         |                   |                       |                      | f                  | SUBPARTITION l1 VALUES(1, 2, 3)
- public     | mpp5992   | l2            | list          |              1 |               |                 2 | 4, 5, 6                          |                     |                         |                   |                       |                      | f                  | SUBPARTITION l2 VALUES(4, 5, 6)
- public     | mpp5992   | l3            | list          |              1 |               |                 3 | 7, 8, 9, 10                      |                     |                         |                   |                       |                      | f                  | SUBPARTITION l3 VALUES(7, 8, 9, 10)
+ schemaname | tablename | partitionname | partitiontype | partitionlevel | partitionrank | partitionposition |         partitionlistvalues          | partitionrangestart | partitionstartinclusive | partitionrangeend | partitionendinclusive | partitioneveryclause | partitionisdefault |           partitionboundary            
+------------+-----------+---------------+---------------+----------------+---------------+-------------------+--------------------------------------+---------------------+-------------------------+-------------------+-----------------------+----------------------+--------------------+----------------------------------------
+ public     | mpp5992   | lll1          | list          |              3 |               |                 1 | 'M'::character(1)                    |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll1 VALUES('M')
+ public     | mpp5992   | lll2          | list          |              3 |               |                 2 | 'F'::character(1)                    |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll2 VALUES('F')
+ public     | mpp5992   | ll1           | list          |              2 |               |                 1 | 'Engineering'::character varying(20) |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll1 VALUES('Engineering')
+ public     | mpp5992   | ll2           | list          |              2 |               |                 2 | 'QA'::character varying(20)          |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll2 VALUES('QA')
+ public     | mpp5992   | l1            | list          |              1 |               |                 1 | 1, 2, 3                              |                     |                         |                   |                       |                      | f                  | SUBPARTITION l1 VALUES(1, 2, 3)
+ public     | mpp5992   | l2            | list          |              1 |               |                 2 | 4, 5, 6                              |                     |                         |                   |                       |                      | f                  | SUBPARTITION l2 VALUES(4, 5, 6)
+ public     | mpp5992   | l3            | list          |              1 |               |                 3 | 7, 8, 9, 10                          |                     |                         |                   |                       |                      | f                  | SUBPARTITION l3 VALUES(7, 8, 9, 10)
 (7 rows)
 
 -- Now we can add a new partition
@@ -4661,20 +4661,20 @@ start (date '2011-01-01')
 end (date '2012-01-01'); -- should inherit from parent storage option
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1" for table "mpp5992_1_prt_foo1"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2" for table "mpp5992_1_prt_foo1"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3" for table "mpp5992_1_prt_foo1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_foo1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_foo1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2" for table "mpp5992_1_prt_foo1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_foo1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_foo1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3" for table "mpp5992_1_prt_foo1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1" for table "mpp5992_1_prt_foo1_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2" for table "mpp5992_1_prt_foo1_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1"
@@ -4687,20 +4687,20 @@ start (date '2012-01-01')
 end (date '2013-01-01') WITH (orientation=column,appendonly=true);
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1" for table "mpp5992_1_prt_foo2"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2" for table "mpp5992_1_prt_foo2"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3" for table "mpp5992_1_prt_foo2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_foo2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_foo2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2" for table "mpp5992_1_prt_foo2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_foo2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_foo2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3" for table "mpp5992_1_prt_foo2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1" for table "mpp5992_1_prt_foo2_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2" for table "mpp5992_1_prt_foo2_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1"
@@ -4712,20 +4712,20 @@ add partition foo3
 start (date '2013-01-01') end (date '2014-01-01') WITH (appendonly=true);
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1" for table "mpp5992_1_prt_foo3"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2" for table "mpp5992_1_prt_foo3"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3" for table "mpp5992_1_prt_foo3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_foo3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_foo3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2" for table "mpp5992_1_prt_foo3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_foo3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_foo3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3" for table "mpp5992_1_prt_foo3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1" for table "mpp5992_1_prt_foo3_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2" for table "mpp5992_1_prt_foo3_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1"
@@ -5413,10 +5413,9 @@ PARTITION BY LIST (AGG_LEVEL)
     )
 );
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_min15part" for table "mpp10223pk"
-NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart" for table "mpp10223pk"
-NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart" for table "mpp10223pk"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_min15part_2_prt_p_future" for table "mpp10223pk_1_prt_min15part"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_min15part_2_prt_p_endpart" for table "mpp10223pk_1_prt_min15part"
+NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart" for table "mpp10223pk"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p_future" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100622" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100623" for table "mpp10223pk_1_prt_hourpart"
@@ -5424,6 +5423,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100625" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100626" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p_endpart" for table "mpp10223pk_1_prt_hourpart"
+NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart" for table "mpp10223pk"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart_2_prt_p_future" for table "mpp10223pk_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart_2_prt_p20100622" for table "mpp10223pk_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart_2_prt_p20100623" for table "mpp10223pk_1_prt_daypart"
@@ -5515,10 +5515,9 @@ PARTITION BY LIST (AGG_LEVEL)
     )
 );
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_min15part" for table "mpp10223"
-NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart" for table "mpp10223"
-NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart" for table "mpp10223"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_min15part_2_prt_p_future" for table "mpp10223_1_prt_min15part"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_min15part_2_prt_p_endpart" for table "mpp10223_1_prt_min15part"
+NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart" for table "mpp10223"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p_future" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100622" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100623" for table "mpp10223_1_prt_hourpart"
@@ -5526,6 +5525,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p2010
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100625" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100626" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p_endpart" for table "mpp10223_1_prt_hourpart"
+NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart" for table "mpp10223"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart_2_prt_p_future" for table "mpp10223_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart_2_prt_p20100622" for table "mpp10223_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart_2_prt_p20100623" for table "mpp10223_1_prt_daypart"
@@ -5620,15 +5620,6 @@ subpartition template (start (1) end (10) every (1))
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_1" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_2" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_3" for table "mpp10480_1_prt_1"
@@ -5638,6 +5629,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_7" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_8" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_9" for table "mpp10480_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_1" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_2" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_3" for table "mpp10480_1_prt_2"
@@ -5647,6 +5639,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_7" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_8" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_9" for table "mpp10480_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_1" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_2" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_3" for table "mpp10480_1_prt_3"
@@ -5656,6 +5649,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_7" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_8" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_9" for table "mpp10480_1_prt_3"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_1" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_2" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_3" for table "mpp10480_1_prt_4"
@@ -5665,6 +5659,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_7" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_8" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_9" for table "mpp10480_1_prt_4"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_1" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_2" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_3" for table "mpp10480_1_prt_5"
@@ -5674,6 +5669,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_7" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_8" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_9" for table "mpp10480_1_prt_5"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_1" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_2" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_3" for table "mpp10480_1_prt_6"
@@ -5683,6 +5679,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_7" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_8" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_9" for table "mpp10480_1_prt_6"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_1" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_2" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_3" for table "mpp10480_1_prt_7"
@@ -5692,6 +5689,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_7" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_8" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_9" for table "mpp10480_1_prt_7"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_1" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_2" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_3" for table "mpp10480_1_prt_8"
@@ -5701,6 +5699,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_7" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_8" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_9" for table "mpp10480_1_prt_8"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_1" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_2" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_3" for table "mpp10480_1_prt_9"
@@ -5710,6 +5709,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_7" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_8" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_9" for table "mpp10480_1_prt_9"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10_2_prt_1" for table "mpp10480_1_prt_10"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10_2_prt_2" for table "mpp10480_1_prt_10"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10_2_prt_3" for table "mpp10480_1_prt_10"
@@ -6206,7 +6206,6 @@ insert into child_r values
 ERROR:  relation "child_r" does not exist
 LINE 1: insert into child_r values
                     ^
-    
 drop table if exists parent_s cascade; --ignore
 drop table if exists child_r cascade; --ignore
 NOTICE:  table "child_r" does not exist, skipping
@@ -6758,8 +6757,9 @@ set optimizer_nestloop_factor = 1.0;
 explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1];
                                               QUERY PLAN                                              
 ------------------------------------------------------------------------------------------------------
- Gather Motion 2:1  (slice2; segments: 2)  (cost=360.72..920.22 rows=13400 width=36)
-   ->  Nested Loop Left Join  (cost=360.72..920.22 rows=6700 width=36)
+ Gather Motion 2:1  (slice2; segments: 2)  (cost=412.08..636.60 rows=13400 width=36)
+   ->  Hash Left Join  (cost=412.08..636.60 rows=6700 width=36)
+         Hash Cond: public.foo_p.a = bar.k
          ->  Append  (cost=0.00..23.50 rows=3 width=35)
                ->  Seq Scan on foo_p_1_prt_other foo_p  (cost=0.00..1.00 rows=1 width=40)
                      Filter: t IS NOT NULL AND a = ('{1}'::integer[])[1]
@@ -6773,12 +6773,12 @@ explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.
                      Filter: t IS NOT NULL AND a = ('{1}'::integer[])[1]
                ->  Seq Scan on foo_p_1_prt_6 foo_p  (cost=0.00..4.50 rows=1 width=34)
                      Filter: t IS NOT NULL AND a = ('{1}'::integer[])[1]
-         ->  Materialize  (cost=360.72..405.38 rows=2234 width=4)
+         ->  Hash  (cost=356.25..356.25 rows=2234 width=4)
                ->  Broadcast Motion 2:2  (slice1; segments: 2)  (cost=0.00..356.25 rows=2234 width=4)
                      ->  Seq Scan on bar  (cost=0.00..289.25 rows=1117 width=4)
                            Filter: k = ('{1}'::integer[])[1]
  Settings:  optimizer_segments=3
-(20 rows)
+(21 rows)
 
 reset optimizer_segments;
 drop table if exists foo_p;
@@ -7619,60 +7619,60 @@ subpartition by range (k) subpartition template (start(1)  end(10) every(2))
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female" for table "deep_part"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male" for table "deep_part"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_1" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_2" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_3" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_4" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_5" for table "deep_part_1_prt_female_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_1" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_2" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_3" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_4" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_5" for table "deep_part_1_prt_female_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_1" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_2" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_3" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_4" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_5" for table "deep_part_1_prt_female_2_prt_3"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_1" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_2" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_3" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_4" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_5" for table "deep_part_1_prt_female_2_prt_4"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_1" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_2" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_3" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_4" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_5" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_1" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_2" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_3" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_4" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_5" for table "deep_part_1_prt_male_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_1" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_2" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_3" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_4" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_5" for table "deep_part_1_prt_male_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_1" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_2" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_3" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_4" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_5" for table "deep_part_1_prt_male_2_prt_3"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_1" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_2" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_3" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_4" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_5" for table "deep_part_1_prt_male_2_prt_4"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5_3_prt_1" for table "deep_part_1_prt_male_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5_3_prt_2" for table "deep_part_1_prt_male_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5_3_prt_3" for table "deep_part_1_prt_male_2_prt_5"
diff --git a/src/test/regress/expected/partition1.out b/src/test/regress/expected/partition1.out
index 23b26d40e6f0..dd03aa5c7b3f 100644
--- a/src/test/regress/expected/partition1.out
+++ b/src/test/regress/expected/partition1.out
@@ -21,7 +21,6 @@ partition aa ,
 partition bb 
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 ERROR:  hash partition requires PARTITIONS clause or partition specification
 LINE 4: subpartition by hash (d) 
                         ^
@@ -47,7 +46,6 @@ partition aa (subpartition cc, subpartition dd (subpartition iii)),
 partition bb (subpartition cc, subpartition dd)
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
 ERROR:  missing SUBPARTITION BY clause for subpartition specification (at depth 2)
 LINE 6: partition aa (subpartition cc, subpartition dd (subpartition...
@@ -69,8 +67,6 @@ subpartition template (
 subpartition aa values(1)
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_3" for table "ggg"
 ERROR:  column "alsodoesntexist" does not exist in relation "ggg_1_prt_1"
 LINE 5: subpartition by list(alsodoesntexist)
                         ^
@@ -84,9 +80,9 @@ partition aa (subpartition cc, subpartition dd),
 partition bb (subpartition cc, subpartition dd)
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 drop table ggg cascade;
@@ -123,17 +119,17 @@ partition aa,
 partition bb
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ee" for table "ggg_1_prt_aa_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ff" for table "ggg_1_prt_aa_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ee" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ff" for table "ggg_1_prt_aa_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc" for table "ggg_1_prt_bb"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ee" for table "ggg_1_prt_bb_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ff" for table "ggg_1_prt_bb_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ee" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ff" for table "ggg_1_prt_bb_2_prt_dd"
 drop table ggg cascade;
@@ -152,17 +148,17 @@ partition aa (subpartition cc, subpartition dd),
 partition bb (subpartition cc, subpartition dd)
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ee" for table "ggg_1_prt_aa_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ff" for table "ggg_1_prt_aa_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ee" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ff" for table "ggg_1_prt_aa_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc" for table "ggg_1_prt_bb"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ee" for table "ggg_1_prt_bb_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ff" for table "ggg_1_prt_bb_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ee" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ff" for table "ggg_1_prt_bb_2_prt_dd"
 drop table ggg cascade;
@@ -210,13 +206,13 @@ subpartition template ( subpartition ee, subpartition ff ) (
 partition aa (subpartition cc, subpartition dd), partition bb
 (subpartition cc start ('a') , subpartition dd) );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ee" for table "ggg_1_prt_aa_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ff" for table "ggg_1_prt_aa_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ee" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ff" for table "ggg_1_prt_aa_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 ERROR:  invalid use of RANGE boundary specification in partition "cc" of type HASH (at depth 2)
 LINE 6: (subpartition cc start ('a') , subpartition dd) );
                          ^
@@ -297,129 +293,129 @@ subpartition by hash(f) subpartitions 2,
 subpartition by hash(g) subpartitions 2,
 subpartition by hash(h) subpartitions 2;
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1" for table "ggg_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2" for table "ggg_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1" for table "ggg_1_prt_1_2_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2" for table "ggg_1_prt_1_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_1_4_prt_2_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2" for table "ggg_1_prt_1_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_1_3_prt_2_4_prt_2_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2" for table "ggg_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1" for table "ggg_1_prt_1_2_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2" for table "ggg_1_prt_1_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_1_4_prt_2_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2" for table "ggg_1_prt_1_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_1_2_prt_2_3_prt_2_4_prt_2_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1" for table "ggg_1_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2" for table "ggg_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1" for table "ggg_1_prt_2_2_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2" for table "ggg_1_prt_2_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_1_4_prt_2_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2" for table "ggg_1_prt_2_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_1_3_prt_2_4_prt_2_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2" for table "ggg_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1" for table "ggg_1_prt_2_2_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2" for table "ggg_1_prt_2_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_1_4_prt_2_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2" for table "ggg_1_prt_2_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_1_5_prt_2"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_1_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_1"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_1_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_1"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_2_6_prt_1" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_2"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_2_6_prt_2" for table "ggg_1_prt_2_2_prt_2_3_prt_2_4_prt_2_5_prt_2"
 drop table ggg cascade;
@@ -433,9 +429,9 @@ partition aa (subpartition cc, subpartition dd),
 partition bb (subpartition cc, subpartition dd)
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 drop table ggg cascade;
@@ -458,17 +454,17 @@ partition aa,
 partition bb
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ee" for table "ggg_1_prt_aa_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ff" for table "ggg_1_prt_aa_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ee" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ff" for table "ggg_1_prt_aa_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc" for table "ggg_1_prt_bb"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ee" for table "ggg_1_prt_bb_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ff" for table "ggg_1_prt_bb_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ee" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ff" for table "ggg_1_prt_bb_2_prt_dd"
 drop table ggg cascade;
@@ -487,17 +483,17 @@ partition aa (subpartition cc, subpartition dd),
 partition bb (subpartition cc, subpartition dd)
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ee" for table "ggg_1_prt_aa_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc_3_prt_ff" for table "ggg_1_prt_aa_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ee" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_ff" for table "ggg_1_prt_aa_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc" for table "ggg_1_prt_bb"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ee" for table "ggg_1_prt_bb_2_prt_cc"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc_3_prt_ff" for table "ggg_1_prt_bb_2_prt_cc"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ee" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_ff" for table "ggg_1_prt_bb_2_prt_dd"
 drop table ggg cascade;
@@ -587,12 +583,12 @@ start (date '2005-01-01')
   partition girls values ('F')
 );
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_1" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_2" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_3" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_4" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_5" for table "rank_1_prt_boys"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_1" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_2" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_3" for table "rank_1_prt_girls"
@@ -675,20 +671,20 @@ end (date '2009-01-01')
 	    subpartition ee values ('4', '5', '6'))
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_1" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_2" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_3" for table "ggg_1_prt_aa_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee_3_prt_1" for table "ggg_1_prt_aa_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee_3_prt_2" for table "ggg_1_prt_aa_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee_3_prt_3" for table "ggg_1_prt_aa_2_prt_ee"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_1" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_2" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_3" for table "ggg_1_prt_bb_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee_3_prt_1" for table "ggg_1_prt_bb_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee_3_prt_2" for table "ggg_1_prt_bb_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee_3_prt_3" for table "ggg_1_prt_bb_2_prt_ee"
@@ -923,12 +919,12 @@ partition boys values ('M'),
 partition girls values ('F')
 );
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_1" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_2" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_3" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_4" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_5" for table "rank_1_prt_boys"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_1" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_2" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_3" for table "rank_1_prt_girls"
@@ -1198,9 +1194,9 @@ partition aa (subpartition cc, subpartition dd),
 partition bb (subpartition cc, subpartition dd)
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_cc" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_cc" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
 drop table ggg cascade;
@@ -1236,20 +1232,20 @@ end (date '2009-01-01')
        (subpartition dd values (1,2,3), subpartition ee values (4,5,6))
 );
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa" for table "ggg"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd" for table "ggg_1_prt_aa"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_1" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_2" for table "ggg_1_prt_aa_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_dd_3_prt_3" for table "ggg_1_prt_aa_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee" for table "ggg_1_prt_aa"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee_3_prt_1" for table "ggg_1_prt_aa_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee_3_prt_2" for table "ggg_1_prt_aa_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_aa_2_prt_ee_3_prt_3" for table "ggg_1_prt_aa_2_prt_ee"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb" for table "ggg"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd" for table "ggg_1_prt_bb"
-NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_1" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_2" for table "ggg_1_prt_bb_2_prt_dd"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_dd_3_prt_3" for table "ggg_1_prt_bb_2_prt_dd"
+NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee" for table "ggg_1_prt_bb"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee_3_prt_1" for table "ggg_1_prt_bb_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee_3_prt_2" for table "ggg_1_prt_bb_2_prt_ee"
 NOTICE:  CREATE TABLE will create partition "ggg_1_prt_bb_2_prt_ee_3_prt_3" for table "ggg_1_prt_bb_2_prt_ee"
@@ -1484,12 +1480,12 @@ partition boys values ('M'),
 partition girls values ('F')
 );
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys" for table "rank2"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_1" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_2" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_3" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_4" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_5" for table "rank2_1_prt_boys"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_1" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_2" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_3" for table "rank2_1_prt_girls"
@@ -1529,7 +1525,7 @@ alter table hhh add partition cc end ('2010-01-01');
 NOTICE:  CREATE TABLE will create partition "hhh_1_prt_cc" for table "hhh"
 -- works - anonymous partition MPP-3350
 alter table hhh add partition end ('2010-02-01');
-NOTICE:  CREATE TABLE will create partition "hhh_1_prt_r1923969170" for table "hhh"
+NOTICE:  CREATE TABLE will create partition "hhh_1_prt_r1244790963" for table "hhh"
 -- MPP-3607 - ADD PARTITION with open intervals
 create table no_end1 (aa int, bb int) partition by range (bb)
 (partition foo start(3));
@@ -1762,18 +1758,18 @@ partition girls values ('F'),
 default partition neuter
 );
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_neuter" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_1" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_2" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_3" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_4" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_5" for table "rank_1_prt_boys"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_1" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_2" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_3" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_4" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_5" for table "rank_1_prt_girls"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_neuter" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_neuter_2_prt_1" for table "rank_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_neuter_2_prt_2" for table "rank_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_neuter_2_prt_3" for table "rank_1_prt_neuter"
@@ -2482,23 +2478,23 @@ subpartition by hash(b) subpartitions 2
  start(100) end(1000)
 );
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1" for table "a"
-NOTICE:  CREATE TABLE will create partition "a_1_prt_2" for table "a"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_1" for table "a_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_2" for table "a_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_3" for table "a_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_1_3_prt_1" for table "a_1_prt_1_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_1_3_prt_2" for table "a_1_prt_1_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_2" for table "a_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_2_3_prt_1" for table "a_1_prt_1_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_2_3_prt_2" for table "a_1_prt_1_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_3" for table "a_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_3_3_prt_1" for table "a_1_prt_1_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_1_2_prt_3_3_prt_2" for table "a_1_prt_1_2_prt_3"
+NOTICE:  CREATE TABLE will create partition "a_1_prt_2" for table "a"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_1" for table "a_1_prt_2"
-NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_2" for table "a_1_prt_2"
-NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_3" for table "a_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_1_3_prt_1" for table "a_1_prt_2_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_1_3_prt_2" for table "a_1_prt_2_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_2" for table "a_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_2_3_prt_1" for table "a_1_prt_2_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_2_3_prt_2" for table "a_1_prt_2_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_3" for table "a_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_3_3_prt_1" for table "a_1_prt_2_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "a_1_prt_2_2_prt_3_3_prt_2" for table "a_1_prt_2_2_prt_3"
 -- MPP-3988: allow same column in multiple partitioning keys at
diff --git a/src/test/regress/expected/partition_optimizer.out b/src/test/regress/expected/partition_optimizer.out
index 57137a69a90a..952bda93a965 100644
--- a/src/test/regress/expected/partition_optimizer.out
+++ b/src/test/regress/expected/partition_optimizer.out
@@ -15,23 +15,23 @@ partition p1(subpartition sp1,subpartition sp2,subpartition sp3)
 );
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1" for table "region"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp1" for table "region_1_prt_p1"
-NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2" for table "region_1_prt_p1"
-NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3" for table "region_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp1_3_prt_1" for table "region_1_prt_p1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp1_3_prt_2" for table "region_1_prt_p1_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2" for table "region_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2_3_prt_1" for table "region_1_prt_p1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp2_3_prt_2" for table "region_1_prt_p1_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3" for table "region_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3_3_prt_1" for table "region_1_prt_p1_2_prt_sp3"
 NOTICE:  CREATE TABLE will create partition "region_1_prt_p1_2_prt_sp3_3_prt_2" for table "region_1_prt_p1_2_prt_sp3"
 create unique index region_pkey on region(r_regionkey);
 NOTICE:  building index for child partition "region_1_prt_p1"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp1"
-NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2"
-NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp1_3_prt_1"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp1_3_prt_2"
+NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2_3_prt_2"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp2_3_prt_1"
+NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3_3_prt_1"
 NOTICE:  building index for child partition "region_1_prt_p1_2_prt_sp3_3_prt_2"
 copy region from stdin with delimiter '|';
@@ -725,22 +725,22 @@ Create table sto_ao_ao
  subpartition template ( default subpartition subothers, subpartition sub1 values ('one'), subpartition sub2 values ('two'))
  (default partition others, start(date '2008-01-01') end(date '2008-04-30') every(interval '1 month'));
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4" for table "sto_ao_ao"
-NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others_2_prt_subothers" for table "sto_ao_ao_1_prt_others"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others_2_prt_sub1" for table "sto_ao_ao_1_prt_others"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_others_2_prt_sub2" for table "sto_ao_ao_1_prt_others"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2_2_prt_subothers" for table "sto_ao_ao_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2_2_prt_sub1" for table "sto_ao_ao_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_2_2_prt_sub2" for table "sto_ao_ao_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3_2_prt_subothers" for table "sto_ao_ao_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3_2_prt_sub1" for table "sto_ao_ao_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_3_2_prt_sub2" for table "sto_ao_ao_1_prt_3"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4_2_prt_subothers" for table "sto_ao_ao_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4_2_prt_sub1" for table "sto_ao_ao_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_4_2_prt_sub2" for table "sto_ao_ao_1_prt_4"
+NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5" for table "sto_ao_ao"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5_2_prt_subothers" for table "sto_ao_ao_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5_2_prt_sub1" for table "sto_ao_ao_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "sto_ao_ao_1_prt_5_2_prt_sub2" for table "sto_ao_ao_1_prt_5"
@@ -1163,29 +1163,29 @@ partition p1 start('1') end('10001') every(5000)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 insert into partsupp values(1,2,3325,771.64,', even theodolites. regular, final
@@ -1304,29 +1304,29 @@ partition p1 start('1') end('10001') every(5000)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_sp1_4"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_3"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_sp1_4"
 select tablename, partitiontablename,
@@ -1388,10 +1388,10 @@ create table i5 (i int, g text) partition by list(g)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1" for table "i5"
-NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2" for table "i5"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1_2_prt_1" for table "i5_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1_2_prt_2" for table "i5_1_prt_p1"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p1_2_prt_3" for table "i5_1_prt_p1"
+NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2" for table "i5"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2_2_prt_1" for table "i5_1_prt_p2"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2_2_prt_2" for table "i5_1_prt_p2"
 NOTICE:  CREATE TABLE will create partition "i5_1_prt_p2_2_prt_3" for table "i5_1_prt_p2"
@@ -1452,44 +1452,44 @@ subpartition ohio values ('OH')
   partition girls values ('F')
 );
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys" for table "rank2"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04" for table "rank2_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan01_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan02_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan03_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan04_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05" for table "rank2_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05_3_prt_mass" for table "rank2_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05_3_prt_cali" for table "rank2_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_boys_2_prt_jan05_3_prt_ohio" for table "rank2_1_prt_boys_2_prt_jan05"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04" for table "rank2_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan01_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan02_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan03_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan04_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05" for table "rank2_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05_3_prt_mass" for table "rank2_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05_3_prt_cali" for table "rank2_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_girls_2_prt_jan05_3_prt_ohio" for table "rank2_1_prt_girls_2_prt_jan05"
@@ -1571,44 +1571,44 @@ subpartition ohio values ('OH')
 )
 );
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys" for table "rank3"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04" for table "rank3_1_prt_boys"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan01_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan02_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan03_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan04_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05" for table "rank3_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05_3_prt_mass" for table "rank3_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05_3_prt_cali" for table "rank3_1_prt_boys_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_boys_2_prt_jan05_3_prt_ohio" for table "rank3_1_prt_boys_2_prt_jan05"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04" for table "rank3_1_prt_girls"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan01_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan02_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan03_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan04_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05" for table "rank3_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05_3_prt_mass" for table "rank3_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05_3_prt_cali" for table "rank3_1_prt_girls_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_girls_2_prt_jan05_3_prt_ohio" for table "rank3_1_prt_girls_2_prt_jan05"
@@ -1696,28 +1696,28 @@ add partition neuter values ('N')
             (subpartition bar values ('AZ')));
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_1"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_2"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_3"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_4"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_5"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_6"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_7"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_8"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_9"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_10"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_11"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12_3_prt_bar" for table "rank3_1_prt_neuter_2_prt_foo_12"
 -- fail , no subpartition spec for rank3, works for rank2
 alter table rank2 alter partition boys
@@ -1758,26 +1758,26 @@ alter table rank2
 add default partition neuter ;
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter" for table "rank2"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04" for table "rank2_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan01"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan01_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan01"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan02"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan02_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan02"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan03"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan03_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan03"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan04"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan04_3_prt_haw" for table "rank2_1_prt_neuter_2_prt_jan04"
+NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05" for table "rank2_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05_3_prt_mass" for table "rank2_1_prt_neuter_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05_3_prt_cali" for table "rank2_1_prt_neuter_2_prt_jan05"
 NOTICE:  CREATE TABLE will create partition "rank2_1_prt_neuter_2_prt_jan05_3_prt_ohio" for table "rank2_1_prt_neuter_2_prt_jan05"
@@ -1801,28 +1801,28 @@ add default partition neuter
             (subpartition ariz values ('AZ')));
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter" for table "rank3"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
-NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_1_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_1"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_2_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_2"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_3_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_3"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_4_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_4"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_5_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_5"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_6_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_6"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_7_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_7"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_8_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_8"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_9_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_9"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_10_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_10"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_11_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_11"
+NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12" for table "rank3_1_prt_neuter"
 NOTICE:  CREATE TABLE will create partition "rank3_1_prt_neuter_2_prt_foo_12_3_prt_ariz" for table "rank3_1_prt_neuter_2_prt_foo_12"
 -- fail
 alter table rank2
@@ -1898,10 +1898,10 @@ subpartition by list(j) subpartition template (values(1, 2, 3))
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_1" for table "granttest"
-NOTICE:  CREATE TABLE will create partition "granttest_1_prt_2" for table "granttest"
-NOTICE:  CREATE TABLE will create partition "granttest_1_prt_3" for table "granttest"
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_1_2_prt_1" for table "granttest_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "granttest_1_prt_2" for table "granttest"
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_2_2_prt_1" for table "granttest_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "granttest_1_prt_3" for table "granttest"
 NOTICE:  CREATE TABLE will create partition "granttest_1_prt_3_2_prt_1" for table "granttest_1_prt_3"
 select has_table_privilege('part_role', 'granttest'::regclass,'select');
  has_table_privilege 
@@ -2141,31 +2141,31 @@ CREATE TABLE partsupp (
                   )
           );
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3" for table "partsupp"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_1" for table "partsupp_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2" for table "partsupp_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_1_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_1_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_1_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_1" for table "partsupp_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2" for table "partsupp_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_2_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_2_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_2_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_1" for table "partsupp_1_prt_p1_3"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2" for table "partsupp_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_3_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_3_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2" for table "partsupp_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_3_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_3_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_3_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4" for table "partsupp"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_1" for table "partsupp_1_prt_p1_4"
-NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2" for table "partsupp_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_1_3_prt_1" for table "partsupp_1_prt_p1_4_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_1_3_prt_2" for table "partsupp_1_prt_p1_4_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2" for table "partsupp_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2_3_prt_1" for table "partsupp_1_prt_p1_4_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "partsupp_1_prt_p1_4_2_prt_2_3_prt_2" for table "partsupp_1_prt_p1_4_2_prt_2"
 drop table partsupp;
@@ -2284,56 +2284,56 @@ WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) PARTITI
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'o_orderkey' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4" for table "orders"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1" for table "orders_1_prt_p1_1"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2" for table "orders_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_1_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_1_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2" for table "orders_1_prt_p1_1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_1_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_1_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_1_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1" for table "orders_1_prt_p1_2"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2" for table "orders_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_2_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_2_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_2_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_2_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2" for table "orders_1_prt_p1_2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_2_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_2_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_2_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_2_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_2_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1" for table "orders_1_prt_p1_3"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2" for table "orders_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_3_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_3_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_3_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_3_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2" for table "orders_1_prt_p1_3"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_3_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_3_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_3_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_3_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_3_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1" for table "orders_1_prt_p1_4"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2" for table "orders_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_4_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_4_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_4_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_4_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2" for table "orders_1_prt_p1_4"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_4_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_4_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_4_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_4_2_prt_sp2_3_prt_4" for table "orders_1_prt_p1_4_2_prt_sp2"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5" for table "orders"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1" for table "orders_1_prt_p1_5"
-NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2" for table "orders_1_prt_p1_5"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_1" for table "orders_1_prt_p1_5_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_2" for table "orders_1_prt_p1_5_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_3" for table "orders_1_prt_p1_5_2_prt_sp1"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp1_3_prt_4" for table "orders_1_prt_p1_5_2_prt_sp1"
+NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2" for table "orders_1_prt_p1_5"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2_3_prt_1" for table "orders_1_prt_p1_5_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2_3_prt_2" for table "orders_1_prt_p1_5_2_prt_sp2"
 NOTICE:  CREATE TABLE will create partition "orders_1_prt_p1_5_2_prt_sp2_3_prt_3" for table "orders_1_prt_p1_5_2_prt_sp2"
@@ -3020,13 +3020,13 @@ SUBPARTITION year6 START (2006) END (2007) )
 PARTITION boys VALUES ('M')
 );
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year1" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year2" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year3" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year4" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year5" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_year6" for table "rank_1_prt_girls"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_year1" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_year2" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_year3" for table "rank_1_prt_boys"
@@ -3123,30 +3123,30 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1" for table "bar_p"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_1" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8" for table "bar_p_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_1_3_prt_1" for table "bar_p_1_prt_1_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_1_3_prt_2" for table "bar_p_1_prt_1_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2_3_prt_1" for table "bar_p_1_prt_1_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_2_3_prt_2" for table "bar_p_1_prt_1_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3_3_prt_1" for table "bar_p_1_prt_1_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_3_3_prt_2" for table "bar_p_1_prt_1_2_prt_3"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4_3_prt_1" for table "bar_p_1_prt_1_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_4_3_prt_2" for table "bar_p_1_prt_1_2_prt_4"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5_3_prt_1" for table "bar_p_1_prt_1_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_5_3_prt_2" for table "bar_p_1_prt_1_2_prt_5"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6_3_prt_1" for table "bar_p_1_prt_1_2_prt_6"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_6_3_prt_2" for table "bar_p_1_prt_1_2_prt_6"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7_3_prt_1" for table "bar_p_1_prt_1_2_prt_7"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_7_3_prt_2" for table "bar_p_1_prt_1_2_prt_7"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8_3_prt_1" for table "bar_p_1_prt_1_2_prt_8"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_8_3_prt_2" for table "bar_p_1_prt_1_2_prt_8"
+NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9" for table "bar_p_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9_3_prt_1" for table "bar_p_1_prt_1_2_prt_9"
 NOTICE:  CREATE TABLE will create partition "bar_p_1_prt_1_2_prt_9_3_prt_2" for table "bar_p_1_prt_1_2_prt_9"
 alter table bar_p alter partition for ('5') alter partition for ('5')
@@ -3188,30 +3188,30 @@ start (1) end (10) every (1)
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_1" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8" for table "mpp4892"
-NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_1_2_prt_sp1" for table "mpp4892_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_1_2_prt_sp2" for table "mpp4892_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2_2_prt_sp1" for table "mpp4892_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_2_2_prt_sp2" for table "mpp4892_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3_2_prt_sp1" for table "mpp4892_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_3_2_prt_sp2" for table "mpp4892_1_prt_3"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4_2_prt_sp1" for table "mpp4892_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_4_2_prt_sp2" for table "mpp4892_1_prt_4"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5_2_prt_sp1" for table "mpp4892_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_5_2_prt_sp2" for table "mpp4892_1_prt_5"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6_2_prt_sp1" for table "mpp4892_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_6_2_prt_sp2" for table "mpp4892_1_prt_6"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7_2_prt_sp1" for table "mpp4892_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_7_2_prt_sp2" for table "mpp4892_1_prt_7"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8_2_prt_sp1" for table "mpp4892_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_8_2_prt_sp2" for table "mpp4892_1_prt_8"
+NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9" for table "mpp4892"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9_2_prt_sp1" for table "mpp4892_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp4892_1_prt_9_2_prt_sp2" for table "mpp4892_1_prt_9"
 -- works
@@ -3318,12 +3318,12 @@ partition boys values ('M'),
 partition girls values ('F')
 );
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys" for table "rank"
-NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_1" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_2" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_3" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_4" for table "rank_1_prt_boys"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_boys_2_prt_5" for table "rank_1_prt_boys"
+NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls" for table "rank"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_1" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_2" for table "rank_1_prt_girls"
 NOTICE:  CREATE TABLE will create partition "rank_1_prt_girls_2_prt_3" for table "rank_1_prt_girls"
@@ -3542,10 +3542,10 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
 NOTICE:  CREATE TABLE will create partition "mpp5878_1_prt_1" for table "mpp5878"
 NOTICE:  CREATE TABLE will create partition "mpp5878_1_prt_2" for table "mpp5878"
 select partitionlistvalues from pg_partitions where tablename like 'mpp5878%';
-                partitionlistvalues                 
-----------------------------------------------------
- 'a'::bpchar, 'b'::bpchar, 'c'::bpchar, 'd'::bpchar
- 'e'::bpchar, 'f'::bpchar, 'g'::bpchar, 'h'::bpchar
+                            partitionlistvalues                             
+----------------------------------------------------------------------------
+ 'a'::character(1), 'b'::character(1), 'c'::character(1), 'd'::character(1)
+ 'e'::character(1), 'f'::character(1), 'g'::character(1), 'h'::character(1)
 (2 rows)
 
 select partitionboundary from pg_partitions where tablename like 'mpp5878%';
@@ -3579,44 +3579,44 @@ subpartition lll2 values ('F') )
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1" for table "mpp5941"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2" for table "mpp5941"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3" for table "mpp5941"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1" for table "mpp5941_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2" for table "mpp5941_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1" for table "mpp5941_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2" for table "mpp5941_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2" for table "mpp5941_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1" for table "mpp5941_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2" for table "mpp5941_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_1_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2" for table "mpp5941"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1" for table "mpp5941_1_prt_2"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2" for table "mpp5941_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1" for table "mpp5941_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2" for table "mpp5941_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2" for table "mpp5941_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1" for table "mpp5941_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2" for table "mpp5941_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_2_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3" for table "mpp5941"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1" for table "mpp5941_1_prt_3"
-NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2" for table "mpp5941_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1" for table "mpp5941_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2" for table "mpp5941_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5941_1_prt_3_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2" for table "mpp5941_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2_3_prt_ll1" for table "mpp5941_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2_3_prt_ll2" for table "mpp5941_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5941_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5941_1_prt_3_2_prt_l2_3_prt_ll1"
@@ -3995,9 +3995,9 @@ subpartition by range(j) subpartition template(start(1) end(10) every(5))
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "it_1_prt_1" for table "it"
-NOTICE:  CREATE TABLE will create partition "it_1_prt_2" for table "it"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_1_2_prt_1" for table "it_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_1_2_prt_2" for table "it_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "it_1_prt_2" for table "it"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_2_2_prt_1" for table "it_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "it_1_prt_2_2_prt_2" for table "it_1_prt_2"
 alter table it rename to newit;
@@ -4568,44 +4568,44 @@ subpartition lll2 values ('F') )
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1" for table "mpp5992"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2" for table "mpp5992"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1" for table "mpp5992_1_prt_1"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2" for table "mpp5992_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2" for table "mpp5992_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_1_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1" for table "mpp5992_1_prt_2"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2" for table "mpp5992_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2" for table "mpp5992_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_2_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1" for table "mpp5992_1_prt_3"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2" for table "mpp5992_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_3_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2" for table "mpp5992_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_3_2_prt_l2_3_prt_ll1"
@@ -4643,15 +4643,15 @@ set subpartition template (subpartition l1 values (1,2,3),
 subpartition l2 values (4,5,6), subpartition l3 values (7,8,9,10));
 NOTICE:  replacing level 1 subpartition template specification for relation "mpp5992"
 select * from pg_partition_templates where tablename='mpp5992';
- schemaname | tablename | partitionname | partitiontype | partitionlevel | partitionrank | partitionposition |       partitionlistvalues        | partitionrangestart | partitionstartinclusive | partitionrangeend | partitionendinclusive | partitioneveryclause | partitionisdefault |           partitionboundary            
-------------+-----------+---------------+---------------+----------------+---------------+-------------------+----------------------------------+---------------------+-------------------------+-------------------+-----------------------+----------------------+--------------------+----------------------------------------
- public     | mpp5992   | lll1          | list          |              3 |               |                 1 | 'M'::bpchar                      |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll1 VALUES('M')
- public     | mpp5992   | lll2          | list          |              3 |               |                 2 | 'F'::bpchar                      |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll2 VALUES('F')
- public     | mpp5992   | ll1           | list          |              2 |               |                 1 | 'Engineering'::character varying |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll1 VALUES('Engineering')
- public     | mpp5992   | ll2           | list          |              2 |               |                 2 | 'QA'::character varying          |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll2 VALUES('QA')
- public     | mpp5992   | l1            | list          |              1 |               |                 1 | 1, 2, 3                          |                     |                         |                   |                       |                      | f                  | SUBPARTITION l1 VALUES(1, 2, 3)
- public     | mpp5992   | l2            | list          |              1 |               |                 2 | 4, 5, 6                          |                     |                         |                   |                       |                      | f                  | SUBPARTITION l2 VALUES(4, 5, 6)
- public     | mpp5992   | l3            | list          |              1 |               |                 3 | 7, 8, 9, 10                      |                     |                         |                   |                       |                      | f                  | SUBPARTITION l3 VALUES(7, 8, 9, 10)
+ schemaname | tablename | partitionname | partitiontype | partitionlevel | partitionrank | partitionposition |         partitionlistvalues          | partitionrangestart | partitionstartinclusive | partitionrangeend | partitionendinclusive | partitioneveryclause | partitionisdefault |           partitionboundary            
+------------+-----------+---------------+---------------+----------------+---------------+-------------------+--------------------------------------+---------------------+-------------------------+-------------------+-----------------------+----------------------+--------------------+----------------------------------------
+ public     | mpp5992   | lll1          | list          |              3 |               |                 1 | 'M'::character(1)                    |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll1 VALUES('M')
+ public     | mpp5992   | lll2          | list          |              3 |               |                 2 | 'F'::character(1)                    |                     |                         |                   |                       |                      | f                  | SUBPARTITION lll2 VALUES('F')
+ public     | mpp5992   | ll1           | list          |              2 |               |                 1 | 'Engineering'::character varying(20) |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll1 VALUES('Engineering')
+ public     | mpp5992   | ll2           | list          |              2 |               |                 2 | 'QA'::character varying(20)          |                     |                         |                   |                       |                      | f                  | SUBPARTITION ll2 VALUES('QA')
+ public     | mpp5992   | l1            | list          |              1 |               |                 1 | 1, 2, 3                              |                     |                         |                   |                       |                      | f                  | SUBPARTITION l1 VALUES(1, 2, 3)
+ public     | mpp5992   | l2            | list          |              1 |               |                 2 | 4, 5, 6                              |                     |                         |                   |                       |                      | f                  | SUBPARTITION l2 VALUES(4, 5, 6)
+ public     | mpp5992   | l3            | list          |              1 |               |                 3 | 7, 8, 9, 10                          |                     |                         |                   |                       |                      | f                  | SUBPARTITION l3 VALUES(7, 8, 9, 10)
 (7 rows)
 
 -- Now we can add a new partition
@@ -4661,20 +4661,20 @@ start (date '2011-01-01')
 end (date '2012-01-01'); -- should inherit from parent storage option
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1" for table "mpp5992_1_prt_foo1"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2" for table "mpp5992_1_prt_foo1"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3" for table "mpp5992_1_prt_foo1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_foo1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_foo1_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2" for table "mpp5992_1_prt_foo1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_foo1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_foo1_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3" for table "mpp5992_1_prt_foo1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1" for table "mpp5992_1_prt_foo1_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2" for table "mpp5992_1_prt_foo1_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1"
@@ -4687,20 +4687,20 @@ start (date '2012-01-01')
 end (date '2013-01-01') WITH (orientation=column,appendonly=true);
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1" for table "mpp5992_1_prt_foo2"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2" for table "mpp5992_1_prt_foo2"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3" for table "mpp5992_1_prt_foo2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_foo2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_foo2_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2" for table "mpp5992_1_prt_foo2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_foo2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_foo2_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3" for table "mpp5992_1_prt_foo2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1" for table "mpp5992_1_prt_foo2_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2" for table "mpp5992_1_prt_foo2_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1"
@@ -4712,20 +4712,20 @@ add partition foo3
 start (date '2013-01-01') end (date '2014-01-01') WITH (appendonly=true);
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3" for table "mpp5992"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1" for table "mpp5992_1_prt_foo3"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2" for table "mpp5992_1_prt_foo3"
-NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3" for table "mpp5992_1_prt_foo3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1" for table "mpp5992_1_prt_foo3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2" for table "mpp5992_1_prt_foo3_2_prt_l1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2" for table "mpp5992_1_prt_foo3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1" for table "mpp5992_1_prt_foo3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2" for table "mpp5992_1_prt_foo3_2_prt_l2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll2" for table "mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2"
+NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3" for table "mpp5992_1_prt_foo3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1" for table "mpp5992_1_prt_foo3_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2" for table "mpp5992_1_prt_foo3_2_prt_l3"
 NOTICE:  CREATE TABLE will create partition "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1_4_prt_lll1" for table "mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1"
@@ -5413,10 +5413,9 @@ PARTITION BY LIST (AGG_LEVEL)
     )
 );
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_min15part" for table "mpp10223pk"
-NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart" for table "mpp10223pk"
-NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart" for table "mpp10223pk"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_min15part_2_prt_p_future" for table "mpp10223pk_1_prt_min15part"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_min15part_2_prt_p_endpart" for table "mpp10223pk_1_prt_min15part"
+NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart" for table "mpp10223pk"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p_future" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100622" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100623" for table "mpp10223pk_1_prt_hourpart"
@@ -5424,6 +5423,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100625" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p20100626" for table "mpp10223pk_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_hourpart_2_prt_p_endpart" for table "mpp10223pk_1_prt_hourpart"
+NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart" for table "mpp10223pk"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart_2_prt_p_future" for table "mpp10223pk_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart_2_prt_p20100622" for table "mpp10223pk_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223pk_1_prt_daypart_2_prt_p20100623" for table "mpp10223pk_1_prt_daypart"
@@ -5515,10 +5515,9 @@ PARTITION BY LIST (AGG_LEVEL)
     )
 );
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_min15part" for table "mpp10223"
-NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart" for table "mpp10223"
-NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart" for table "mpp10223"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_min15part_2_prt_p_future" for table "mpp10223_1_prt_min15part"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_min15part_2_prt_p_endpart" for table "mpp10223_1_prt_min15part"
+NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart" for table "mpp10223"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p_future" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100622" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100623" for table "mpp10223_1_prt_hourpart"
@@ -5526,6 +5525,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p2010
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100625" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p20100626" for table "mpp10223_1_prt_hourpart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_hourpart_2_prt_p_endpart" for table "mpp10223_1_prt_hourpart"
+NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart" for table "mpp10223"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart_2_prt_p_future" for table "mpp10223_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart_2_prt_p20100622" for table "mpp10223_1_prt_daypart"
 NOTICE:  CREATE TABLE will create partition "mpp10223_1_prt_daypart_2_prt_p20100623" for table "mpp10223_1_prt_daypart"
@@ -5620,15 +5620,6 @@ subpartition template (start (1) end (10) every (1))
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9" for table "mpp10480"
-NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_1" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_2" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_3" for table "mpp10480_1_prt_1"
@@ -5638,6 +5629,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_7" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_8" for table "mpp10480_1_prt_1"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_1_2_prt_9" for table "mpp10480_1_prt_1"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_1" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_2" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_3" for table "mpp10480_1_prt_2"
@@ -5647,6 +5639,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_7" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_8" for table "mpp10480_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_2_2_prt_9" for table "mpp10480_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_1" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_2" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_3" for table "mpp10480_1_prt_3"
@@ -5656,6 +5649,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_7" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_8" for table "mpp10480_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_3_2_prt_9" for table "mpp10480_1_prt_3"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_1" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_2" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_3" for table "mpp10480_1_prt_4"
@@ -5665,6 +5659,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_7" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_8" for table "mpp10480_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_4_2_prt_9" for table "mpp10480_1_prt_4"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_1" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_2" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_3" for table "mpp10480_1_prt_5"
@@ -5674,6 +5669,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_7" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_8" for table "mpp10480_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_5_2_prt_9" for table "mpp10480_1_prt_5"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_1" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_2" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_3" for table "mpp10480_1_prt_6"
@@ -5683,6 +5679,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_7" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_8" for table "mpp10480_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_6_2_prt_9" for table "mpp10480_1_prt_6"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_1" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_2" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_3" for table "mpp10480_1_prt_7"
@@ -5692,6 +5689,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_7" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_8" for table "mpp10480_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_7_2_prt_9" for table "mpp10480_1_prt_7"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_1" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_2" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_3" for table "mpp10480_1_prt_8"
@@ -5701,6 +5699,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_7" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_8" for table "mpp10480_1_prt_8"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_8_2_prt_9" for table "mpp10480_1_prt_8"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_1" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_2" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_3" for table "mpp10480_1_prt_9"
@@ -5710,6 +5709,7 @@ NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_6" for table
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_7" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_8" for table "mpp10480_1_prt_9"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_9_2_prt_9" for table "mpp10480_1_prt_9"
+NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10" for table "mpp10480"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10_2_prt_1" for table "mpp10480_1_prt_10"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10_2_prt_2" for table "mpp10480_1_prt_10"
 NOTICE:  CREATE TABLE will create partition "mpp10480_1_prt_10_2_prt_3" for table "mpp10480_1_prt_10"
@@ -6206,7 +6206,6 @@ insert into child_r values
 ERROR:  relation "child_r" does not exist
 LINE 1: insert into child_r values
                     ^
-    
 drop table if exists parent_s cascade; --ignore
 drop table if exists child_r cascade; --ignore
 NOTICE:  table "child_r" does not exist, skipping
@@ -7593,60 +7592,60 @@ subpartition by range (k) subpartition template (start(1)  end(10) every(2))
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female" for table "deep_part"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male" for table "deep_part"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4" for table "deep_part_1_prt_female"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_1" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_2" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_3" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_4" for table "deep_part_1_prt_female_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_1_3_prt_5" for table "deep_part_1_prt_female_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_1" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_2" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_3" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_4" for table "deep_part_1_prt_female_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_2_3_prt_5" for table "deep_part_1_prt_female_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_1" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_2" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_3" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_4" for table "deep_part_1_prt_female_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_3_3_prt_5" for table "deep_part_1_prt_female_2_prt_3"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_1" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_2" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_3" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_4" for table "deep_part_1_prt_female_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_4_3_prt_5" for table "deep_part_1_prt_female_2_prt_4"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5" for table "deep_part_1_prt_female"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_1" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_2" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_3" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_4" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_female_2_prt_5_3_prt_5" for table "deep_part_1_prt_female_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4" for table "deep_part_1_prt_male"
-NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_1" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_2" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_3" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_4" for table "deep_part_1_prt_male_2_prt_1"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_1_3_prt_5" for table "deep_part_1_prt_male_2_prt_1"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_1" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_2" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_3" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_4" for table "deep_part_1_prt_male_2_prt_2"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_2_3_prt_5" for table "deep_part_1_prt_male_2_prt_2"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_1" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_2" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_3" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_4" for table "deep_part_1_prt_male_2_prt_3"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_3_3_prt_5" for table "deep_part_1_prt_male_2_prt_3"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_1" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_2" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_3" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_4" for table "deep_part_1_prt_male_2_prt_4"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_4_3_prt_5" for table "deep_part_1_prt_male_2_prt_4"
+NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5" for table "deep_part_1_prt_male"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5_3_prt_1" for table "deep_part_1_prt_male_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5_3_prt_2" for table "deep_part_1_prt_male_2_prt_5"
 NOTICE:  CREATE TABLE will create partition "deep_part_1_prt_male_2_prt_5_3_prt_3" for table "deep_part_1_prt_male_2_prt_5"
diff --git a/src/test/regress/expected/percentile.out b/src/test/regress/expected/percentile.out
index f12d1c7f51a3..1b15b9a7d53a 100644
--- a/src/test/regress/expected/percentile.out
+++ b/src/test/regress/expected/percentile.out
@@ -1038,7 +1038,7 @@ LINE 1: select count(median(a)) from perct;
 select median(count(*)) from perct;
 ERROR:  argument of percentile function must not contain aggregates
 LINE 1: select median(count(*)) from perct;
-                      ^
+               ^
 select percentile_cont(0.2) within group (order by count(*) over()) from perct;
 ERROR:  argument of percentile function must not contain window functions
 LINE 1: select percentile_cont(0.2) within group (order by count(*) ...
diff --git a/src/test/regress/expected/plancache.out b/src/test/regress/expected/plancache.out
new file mode 100644
index 000000000000..018bd7220339
--- /dev/null
+++ b/src/test/regress/expected/plancache.out
@@ -0,0 +1,267 @@
+--
+-- Tests to exercise the plan caching/invalidation mechanism
+--
+CREATE TEMP TABLE pcachetest AS SELECT * FROM int8_tbl;
+-- create and use a cached plan
+PREPARE prepstmt AS SELECT * FROM pcachetest;
+EXECUTE prepstmt;
+        q1        |        q2         
+------------------+-------------------
+              123 |               456
+              123 |  4567890123456789
+ 4567890123456789 |               123
+ 4567890123456789 |  4567890123456789
+ 4567890123456789 | -4567890123456789
+(5 rows)
+
+-- and one with parameters
+PREPARE prepstmt2(bigint) AS SELECT * FROM pcachetest WHERE q1 = $1;
+EXECUTE prepstmt2(123);
+ q1  |        q2        
+-----+------------------
+ 123 |              456
+ 123 | 4567890123456789
+(2 rows)
+
+-- invalidate the plans and see what happens
+DROP TABLE pcachetest;
+EXECUTE prepstmt;
+ERROR:  relation "pcachetest" does not exist
+EXECUTE prepstmt2(123);
+ERROR:  relation "pcachetest" does not exist
+-- recreate the temp table (this demonstrates that the raw plan is
+-- purely textual and doesn't depend on OIDs, for instance)
+CREATE TEMP TABLE pcachetest AS SELECT * FROM int8_tbl;
+EXECUTE prepstmt;
+        q1        |        q2         
+------------------+-------------------
+ 4567890123456789 | -4567890123456789
+ 4567890123456789 |               123
+              123 |               456
+              123 |  4567890123456789
+ 4567890123456789 |  4567890123456789
+(5 rows)
+
+EXECUTE prepstmt2(123);
+ q1  |        q2        
+-----+------------------
+ 123 |              456
+ 123 | 4567890123456789
+(2 rows)
+
+-- prepared statements should prevent change in output tupdesc,
+-- since clients probably aren't expecting that to change on the fly
+ALTER TABLE pcachetest ADD COLUMN q3 bigint;
+EXECUTE prepstmt;
+ERROR:  cached plan must not change result type
+EXECUTE prepstmt2(123);
+ERROR:  cached plan must not change result type
+-- but we're nice guys and will let you undo your mistake
+ALTER TABLE pcachetest DROP COLUMN q3;
+EXECUTE prepstmt;
+        q1        |        q2         
+------------------+-------------------
+ 4567890123456789 | -4567890123456789
+ 4567890123456789 |               123
+              123 |               456
+              123 |  4567890123456789
+ 4567890123456789 |  4567890123456789
+(5 rows)
+
+EXECUTE prepstmt2(123);
+ q1  |        q2        
+-----+------------------
+ 123 |              456
+ 123 | 4567890123456789
+(2 rows)
+
+-- Try it with a view, which isn't directly used in the resulting plan
+-- but should trigger invalidation anyway
+CREATE TEMP VIEW pcacheview AS
+  SELECT * FROM pcachetest;
+PREPARE vprep AS SELECT * FROM pcacheview;
+EXECUTE vprep;
+        q1        |        q2         
+------------------+-------------------
+ 4567890123456789 | -4567890123456789
+ 4567890123456789 |               123
+              123 |               456
+              123 |  4567890123456789
+ 4567890123456789 |  4567890123456789
+(5 rows)
+
+CREATE OR REPLACE TEMP VIEW pcacheview AS
+  SELECT q1, q2/2 AS q2 FROM pcachetest;
+EXECUTE vprep;
+        q1        |        q2         
+------------------+-------------------
+ 4567890123456789 | -2283945061728394
+ 4567890123456789 |                61
+              123 |               228
+              123 |  2283945061728394
+ 4567890123456789 |  2283945061728394
+(5 rows)
+
+-- Check basic SPI plan invalidation
+create function cache_test(int) returns int as $$
+declare total int;
+begin
+	create temp table t1(f1 int) distributed by (f1);
+	insert into t1 values($1);
+	insert into t1 values(11);
+	insert into t1 values(12);
+	insert into t1 values(13);
+	select sum(f1) into total from t1;
+	drop table t1;
+	return total;
+end
+$$ language plpgsql;
+select cache_test(1);
+ cache_test 
+------------
+         37
+(1 row)
+
+select cache_test(2);
+ cache_test 
+------------
+         38
+(1 row)
+
+select cache_test(3);
+ cache_test 
+------------
+         39
+(1 row)
+
+-- Check invalidation of plpgsql "simple expression"
+create temp view v1 as
+  select 2+2 as f1;
+create function cache_test_2() returns int as $$
+begin
+	return f1 from v1;
+end$$ language plpgsql;
+select cache_test_2();
+ cache_test_2 
+--------------
+            4
+(1 row)
+
+create or replace temp view v1 as
+  select 2+2+4 as f1;
+select cache_test_2();
+ cache_test_2 
+--------------
+            8
+(1 row)
+
+create or replace temp view v1 as
+  select 2+2+4+(select max(unique1) from tenk1) as f1;
+select cache_test_2();
+ cache_test_2 
+--------------
+        10007
+(1 row)
+
+--- Check that change of search_path is ignored by replans
+create schema s1
+  create table abc (f1 int);
+create schema s2
+  create table abc (f1 int);
+insert into s1.abc values(123);
+insert into s2.abc values(456);
+set search_path = s1;
+prepare p1 as select f1 from abc;
+execute p1;
+ f1  
+-----
+ 123
+(1 row)
+
+set search_path = s2;
+select f1 from abc;
+ f1  
+-----
+ 456
+(1 row)
+
+execute p1;
+ f1  
+-----
+ 123
+(1 row)
+
+alter table s1.abc add column f2 float8;   -- force replan
+execute p1;
+ f1  
+-----
+ 123
+(1 row)
+
+drop schema s1 cascade;
+NOTICE:  drop cascades to table s1.abc
+drop schema s2 cascade;
+NOTICE:  drop cascades to table abc
+reset search_path;
+-- Check that invalidation deals with regclass constants
+create temp sequence seq;
+prepare p2 as select nextval('seq');
+execute p2;
+ nextval 
+---------
+       1
+(1 row)
+
+drop sequence seq;
+create temp sequence seq;
+execute p2;
+ nextval 
+---------
+       1
+(1 row)
+
+-- Check DDL via SPI, immediately followed by SPI plan re-use
+-- (bug in original coding)
+create function cachebug() returns void as $$
+declare r int;
+begin
+  drop table if exists temptable cascade;
+  -- Ignore NOTICE about missing DISTRIBUTED BY. It was annoying here, as
+  -- usually you would only see it on the first invocation, but sometimes
+  -- you'd also get it on the second invocation, if the plan cache
+  -- got invalidated in between the invocations.
+  set client_min_messages=warning;
+  create temp table temptable as select * from generate_series(1,3) as f1;
+  reset client_min_messages;
+  create temp view vv as select * from temptable;
+  for r in select * from vv order by f1 loop
+    raise notice '%', r;
+  end loop;
+end$$ language plpgsql;
+select cachebug();
+NOTICE:  table "temptable" does not exist, skipping
+CONTEXT:  SQL statement "drop table if exists temptable cascade"
+PL/pgSQL function "cachebug" line 3 at SQL statement
+NOTICE:  1
+NOTICE:  2
+NOTICE:  3
+ cachebug 
+----------
+ 
+(1 row)
+
+select cachebug();
+NOTICE:  drop cascades to rule _RETURN on view vv
+CONTEXT:  SQL statement "drop table if exists temptable cascade"
+PL/pgSQL function "cachebug" line 3 at SQL statement
+NOTICE:  drop cascades to view vv
+CONTEXT:  SQL statement "drop table if exists temptable cascade"
+PL/pgSQL function "cachebug" line 3 at SQL statement
+NOTICE:  1
+NOTICE:  2
+NOTICE:  3
+ cachebug 
+----------
+ 
+(1 row)
+
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index bfbfb0811f96..fff6d0f21e22 100755
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -2070,13 +2070,13 @@ end$$ language plpgsql;
 select test_variable_storage();
 NOTICE:  should see this
 CONTEXT:  SQL statement "SELECT  trap_zero_divide(-100)"
-PL/pgSQL function "test_variable_storage" line 7 at perform
+PL/pgSQL function "test_variable_storage" line 7 at PERFORM
 NOTICE:  should see this only if -100 <> 0
 CONTEXT:  SQL statement "SELECT  trap_zero_divide(-100)"
-PL/pgSQL function "test_variable_storage" line 7 at perform
+PL/pgSQL function "test_variable_storage" line 7 at PERFORM
 NOTICE:  should see this only if -100 fits in smallint
 CONTEXT:  SQL statement "SELECT  trap_zero_divide(-100)"
-PL/pgSQL function "test_variable_storage" line 7 at perform
+PL/pgSQL function "test_variable_storage" line 7 at PERFORM
  test_variable_storage 
 -----------------------
  123456789012
@@ -2242,10 +2242,32 @@ begin
 end
 $$ language plpgsql;
 begin;
---select refcursor_test1('test1');
---fetch next from test1;
---select refcursor_test1('test2');
---fetch all from test2;
+select refcursor_test1('test1');
+ refcursor_test1 
+-----------------
+ test1
+(1 row)
+
+fetch next in test1;
+ a 
+---
+ 5
+(1 row)
+
+select refcursor_test1('test2');
+ refcursor_test1 
+-----------------
+ test2
+(1 row)
+
+fetch all from test2;
+  a  
+-----
+   5
+  50
+ 500
+(3 rows)
+
 commit;
 -- should fail
 fetch next from test1;
@@ -2278,7 +2300,7 @@ end;
 $$ language plpgsql;
 select raise_test1(5);
 ERROR:  too many parameters specified for RAISE
-CONTEXT:  PL/pgSQL function "raise_test1" line 2 at raise
+CONTEXT:  PL/pgSQL function "raise_test1" line 2 at RAISE
 create function raise_test2(int) returns int as $$
 begin
     raise notice 'This message has too few parameters: %, %, %', $1, $1;
@@ -2287,7 +2309,7 @@ end;
 $$ language plpgsql;
 select raise_test2(10);
 ERROR:  too few parameters specified for RAISE
-CONTEXT:  PL/pgSQL function "raise_test2" line 2 at raise
+CONTEXT:  PL/pgSQL function "raise_test2" line 2 at RAISE
 --
 -- reject function definitions that contain malformed SQL queries at
 -- compile-time, where possible
@@ -2406,7 +2428,7 @@ ERROR:  column "sqlstate" does not exist
 LINE 1: SELECT  sqlstate
                 ^
 QUERY:  SELECT  sqlstate
-CONTEXT:  PL/pgSQL function "excpt_test1" line 2 at raise
+CONTEXT:  PL/pgSQL function "excpt_test1" line 2 at RAISE
 create function excpt_test2() returns void as $$
 begin
     begin
@@ -2421,7 +2443,7 @@ ERROR:  column "sqlstate" does not exist
 LINE 1: SELECT  sqlstate
                 ^
 QUERY:  SELECT  sqlstate
-CONTEXT:  PL/pgSQL function "excpt_test2" line 4 at raise
+CONTEXT:  PL/pgSQL function "excpt_test2" line 4 at RAISE
 create function excpt_test3() returns void as $$
 begin
     begin
@@ -2898,7 +2920,7 @@ begin
 end$$ language plpgsql;
 select footest();
 ERROR:  query returned no rows
-CONTEXT:  PL/pgSQL function "footest" line 4 at execute statement
+CONTEXT:  PL/pgSQL function "footest" line 4 at EXECUTE statement
 create or replace function footest() returns void as $$
 declare x record;
 begin
@@ -2908,8 +2930,292 @@ begin
 end$$ language plpgsql;
 select footest();
 ERROR:  query returned more than one row
-CONTEXT:  PL/pgSQL function "footest" line 4 at execute statement
+CONTEXT:  PL/pgSQL function "footest" line 4 at EXECUTE statement
 drop function footest();
+-- test scrollable cursor support
+create function sc_test() returns setof integer as $$
+declare 
+  c scroll cursor for select f1 from int4_tbl;
+  x integer;
+begin
+  open c;
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch prior from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+select * from sc_test();
+   sc_test   
+-------------
+ -2147483647
+  2147483647
+     -123456
+      123456
+           0
+(5 rows)
+
+create or replace function sc_test() returns setof integer as $$
+declare 
+  c no scroll cursor for select f1 from int4_tbl;
+  x integer;
+begin
+  open c;
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch prior from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+select * from sc_test();  -- fails because of NO SCROLL specification
+ERROR:  cursor can only scan forward
+HINT:  Declare it with SCROLL option to enable backward scan.
+CONTEXT:  PL/pgSQL function "sc_test" line 6 at FETCH
+create or replace function sc_test() returns setof integer as $$
+declare 
+  c refcursor;
+  x integer;
+begin
+  open c scroll for select f1 from int4_tbl;
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch prior from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+select * from sc_test();
+   sc_test   
+-------------
+ -2147483647
+  2147483647
+     -123456
+      123456
+           0
+(5 rows)
+
+create or replace function sc_test() returns setof integer as $$
+declare 
+  c refcursor;
+  x integer;
+begin
+  open c scroll for execute 'select f1 from int4_tbl';
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch relative -2 from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+select * from sc_test();
+   sc_test   
+-------------
+ -2147483647
+     -123456
+           0
+(3 rows)
+
+create or replace function sc_test() returns setof integer as $$
+declare
+  c cursor for select * from generate_series(1, 10);
+  x integer;
+begin
+  open c;
+  loop
+      move relative 2 in c;
+      if not found then
+          exit;
+      end if;
+      fetch next from c into x;
+      if found then
+          return next x;
+      end if;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+select * from sc_test();
+ sc_test 
+---------
+       3
+       6
+       9
+(3 rows)
+
+drop function sc_test();
+-- test qualified variable names
+create function pl_qual_names (param1 int) returns void as $$
+<<outerblock>>
+declare
+  param1 int := 1;
+begin
+  <<innerblock>>
+  declare
+    param1 int := 2;
+  begin
+    raise notice 'param1 = %', param1;
+    raise notice 'pl_qual_names.param1 = %', pl_qual_names.param1;
+    raise notice 'outerblock.param1 = %', outerblock.param1;
+    raise notice 'innerblock.param1 = %', innerblock.param1;
+  end;
+end;
+$$ language plpgsql;
+select pl_qual_names(42);
+NOTICE:  param1 = 2
+NOTICE:  pl_qual_names.param1 = 42
+NOTICE:  outerblock.param1 = 1
+NOTICE:  innerblock.param1 = 2
+ pl_qual_names 
+---------------
+ 
+(1 row)
+
+drop function pl_qual_names(int);
+-- tests for RETURN QUERY
+create function ret_query1(out int, out int) returns setof record as $$
+begin
+    $1 := -1;
+    $2 := -2;
+    return next;
+    return query select x + 1, x * 10 from generate_series(0, 10) s (x);
+    return next;
+end;
+$$ language plpgsql;
+select * from ret_query1();
+ column1 | column2 
+---------+---------
+      -1 |      -2
+       1 |       0
+       2 |      10
+       3 |      20
+       4 |      30
+       5 |      40
+       6 |      50
+       7 |      60
+       8 |      70
+       9 |      80
+      10 |      90
+      11 |     100
+      -1 |      -2
+(13 rows)
+
+create type record_type as (x text, y int, z boolean);
+create or replace function ret_query2(lim int) returns setof record_type as $$
+begin
+    return query select md5(s.x::text), s.x, s.x > 0
+                 from generate_series(-8, lim) s (x) where s.x % 2 = 0;
+end;
+$$ language plpgsql;
+select * from ret_query2(8);
+                x                 | y  | z 
+----------------------------------+----+---
+ a8d2ec85eaf98407310b72eb73dda247 | -8 | f
+ 596a3d04481816330f07e4f97510c28f | -6 | f
+ 0267aaf632e87a63288a08331f22c7c3 | -4 | f
+ 5d7b9adcbe1c629ec722529dd12e5129 | -2 | f
+ cfcd208495d565ef66e7dff9f98764da |  0 | f
+ c81e728d9d4c2f636f067f89cc14862c |  2 | t
+ a87ff679a2f3e71d9181a67b7542122c |  4 | t
+ 1679091c5a880faf6fb5e6087eb1b2dc |  6 | t
+ c9f0f895fb98ab9159f51fd0297e236d |  8 | t
+(9 rows)
+
+-- Test for appropriate cleanup of non-simple expression evaluations
+-- (bug in all versions prior to August 2010)
+CREATE FUNCTION nonsimple_expr_test() RETURNS text[] AS $$
+DECLARE
+  arr text[];
+  lr text;
+  i integer;
+BEGIN
+  arr := array[array['foo','bar'], array['baz', 'quux']];
+  lr := 'fool';
+  i := 1;
+  -- use sub-SELECTs to make expressions non-simple
+  arr[(SELECT i)][(SELECT i+1)] := (SELECT lr);
+  RETURN arr;
+END;
+$$ LANGUAGE plpgsql;
+SELECT nonsimple_expr_test();
+   nonsimple_expr_test   
+-------------------------
+ {{foo,fool},{baz,quux}}
+(1 row)
+
+DROP FUNCTION nonsimple_expr_test();
+CREATE FUNCTION nonsimple_expr_test() RETURNS integer AS $$
+declare
+   i integer NOT NULL := 0;
+begin
+  begin
+    i := (SELECT NULL::integer);  -- should throw error
+  exception
+    WHEN OTHERS THEN
+      i := (SELECT 1::integer);
+  end;
+  return i;
+end;
+$$ LANGUAGE plpgsql;
+SELECT nonsimple_expr_test();
+ nonsimple_expr_test 
+---------------------
+                   1
+(1 row)
+
+DROP FUNCTION nonsimple_expr_test();
+--
+-- Test cases involving recursion and error recovery in simple expressions
+-- (bugs in all versions before October 2010).  The problems are most
+-- easily exposed by mutual recursion between plpgsql and sql functions.
+--
+create function recurse(float8) returns float8 as
+$$
+begin
+  if ($1 > 0) then
+    return sql_recurse($1 - 1);
+  else
+    return $1;
+  end if;
+end;
+$$ language plpgsql;
+-- "limit" is to prevent this from being inlined
+create function sql_recurse(float8) returns float8 as
+$$ select recurse($1) limit 1; $$ language sql;
+select recurse(5);
+ recurse 
+---------
+       0
+(1 row)
+
+create function error1(text) returns text language sql as
+$$ SELECT relname::text FROM pg_class c WHERE c.oid = $1::regclass $$;
+create function error2(p_name_table text) returns text language plpgsql as $$
+begin
+  return error1(p_name_table);
+end$$;
+BEGIN;
+create table public.stuffs (stuff text);
+SAVEPOINT a;
+select error2('nonexistent.stuffs');
+ERROR:  schema "nonexistent" does not exist
+CONTEXT:  SQL function "error1" statement 1
+PL/pgSQL function "error2" line 2 at RETURN
+ROLLBACK TO a;
+select error2('public.stuffs');
+ error2 
+--------
+ stuffs
+(1 row)
+
+rollback;
+drop function error2(p_name_table text);
+drop function error1(text);
 
 -- Test anonymous code blocks.
 DO $$
diff --git a/src/test/regress/expected/plpgsql_cache.out b/src/test/regress/expected/plpgsql_cache.out
index 77f44b060530..e4a5284aaa2e 100644
--- a/src/test/regress/expected/plpgsql_cache.out
+++ b/src/test/regress/expected/plpgsql_cache.out
@@ -3,16 +3,17 @@
 --
 -- Testing various scenarios where plans will not be cached. 
 -- MPP-16204
+set client_min_messages = 'warning';
+drop table if exists cache_tab cascade;
+drop function if exists cache_test();
+drop function if exists cache_test(int);
+reset client_min_messages;
 --
 -- ************************************************************
 -- * Repro with drop table inside a function
 -- *    - Multiple executions should not raise an error 
 -- ************************************************************
 --
-drop table if exists cache_tab cascade;
-NOTICE:  table "cache_tab" does not exist, skipping
-drop function if exists cache_test();
-NOTICE:  function cache_test() does not exist, skipping
 create function cache_test() returns void as
 $$
 begin
@@ -63,7 +64,7 @@ create function cache_test(id int) returns int as $$
 declare 
 	v_int int;
 begin 
-	select c1 from cache_tab where c2 = id INTO v_int; 
+	select c1 from cache_tab where c2 = id::text INTO v_int;
 	return v_int;
 end;
 $$ language plpgsql READS SQL DATA;
@@ -73,14 +74,13 @@ select * from cache_test(1);
            
 (1 row)
 
+-- ALTER TABLE prints a NOTICE with unpredictable temp table's name
+set client_min_messages='warning';
 alter table cache_tab split default partition 
 start (11) inclusive
 end (20) exclusive 
 into (partition part2, partition def);
-NOTICE:  exchanged partition "def" of relation "cache_tab" with relation "pg_temp_1233802"
-NOTICE:  dropped partition "def" for relation "cache_tab"
-NOTICE:  CREATE TABLE will create partition "cache_tab_1_prt_part2" for table "cache_tab"
-NOTICE:  CREATE TABLE will create partition "cache_tab_1_prt_def" for table "cache_tab"
+reset client_min_messages;
 -- following should not fail. 
 select * from cache_test(2);
  cache_test 
@@ -108,7 +108,7 @@ create function cache_test(var int) returns varchar as $$
 declare 
 	v_name varchar(20) DEFAULT 'zzzz';
 begin 
-	select name from cache_tab into v_name where id = var; 
+	select name from cache_tab into v_name where id = var;
 	return v_name;
 end;
 $$ language plpgsql READS SQL DATA;
@@ -330,14 +330,13 @@ select cache_test(100);
           0
 (1 row)
 
+-- ALTER TABLE prints a NOTICE with unpredictable temp table's name
+set client_min_messages='warning';
 alter table cache_tab split default partition 
 start (11) inclusive
 end (20) exclusive 
 into (partition part2, partition def);
-NOTICE:  exchanged partition "def" of relation "cache_tab" with relation "pg_temp_1234302"
-NOTICE:  dropped partition "def" for relation "cache_tab"
-NOTICE:  CREATE TABLE will create partition "cache_tab_1_prt_part2" for table "cache_tab"
-NOTICE:  CREATE TABLE will create partition "cache_tab_1_prt_def" for table "cache_tab"
+reset client_min_messages;
 select cache_test(100); 
  cache_test 
 ------------
@@ -511,12 +510,6 @@ drop table cache_temp;
 -- * recursive functions
 -- ************************************************************
 --
--- start_matchsubs
---
--- m|ERROR:\s+relation with OID \d+ does not exist|
--- s|ERROR:\s+relation with OID \d+ does not exist|ERROR: relation with OID DUMMY does not exist|
---
--- end_matchsubs
 create table cache_tab(c1 int, c2 int) distributed randomly; 
 drop function if exists cache_test(count int); 
 NOTICE:  function cache_test(pg_catalog.int4) does not exist, skipping
@@ -536,6 +529,17 @@ select cache_test(5);
           0
 (1 row)
 
+-- should return 5 rows
+select * from cache_tab;
+ c1 | c2 
+----+----
+  1 |  1
+  2 |  2
+  3 |  3
+  4 |  4
+  5 |  5
+(5 rows)
+
 drop table if exists cache_tab;
 create table cache_tab(c1 int, c2 int) distributed randomly; 
 select cache_test(5);
@@ -544,6 +548,17 @@ select cache_test(5);
           0
 (1 row)
 
+-- should return 5 rows
+select * from cache_tab;
+ c1 | c2 
+----+----
+  1 |  1
+  2 |  2
+  3 |  3
+  4 |  4
+  5 |  5
+(5 rows)
+
 drop function cache_test(count int); 
 --- another example with recursive functions 
 create function cache_test(count int) returns int as $$
@@ -558,132 +573,217 @@ begin
   	return cache_test($1-1);
 end; 
 $$ language plpgsql MODIFIES SQL DATA;
--- this will fail
-select cache_test(5);
-ERROR:  relation with OID 1234913 does not exist
-CONTEXT:  SQL statement "insert into cache_tab values( $1 ,  $1 )"
-PL/pgSQL function "cache_test" line 7 at SQL statement
-SQL statement "SELECT  cache_test( $1 -1)"
-PL/pgSQL function "cache_test" line 9 at return
-set gp_plpgsql_clear_cache_always = on;
--- this will pass
 select cache_test(5);
  cache_test 
 ------------
           0
 (1 row)
 
+-- should return 1 row
+select * from cache_tab;
+ c1 | c2 
+----+----
+  1 |  1
+(1 row)
+
 drop table if exists cache_tab;
 drop function cache_test(count int) cascade;
---
 -- ************************************************************
--- * testing guc
+-- * A function that queries a table that's dropped and recreated
 -- ************************************************************
 --
-drop table if exists cache_tab cascade;
-NOTICE:  table "cache_tab" does not exist, skipping
-drop function if exists cache_test();
-NOTICE:  function cache_test() does not exist, skipping
-create function cache_test() returns void as
+-- This used to fail on GPDB 4.3, but works after the PostgreSQL 8.3 merge,
+-- thanks to upstream plan cache invalidation. (The old GPDB code didn't
+-- force plans to be recomputed in the same transaction, only across
+-- transactions. There was a GUC called gp_plpgsql_clear_cache_always that
+-- you could set, and made this work, though. But that's no longer needed).
+create table cache_tab (t text);
+insert into cache_tab values ('b');
+create function cache_test(p text) returns integer as
 $$
 begin
-	drop table if exists cache_tab;
-	create table cache_tab (id int) distributed randomly;
-	insert into cache_tab values (1);
+  return (select count(*) from cache_tab where t = p);
 end;
-$$ language plpgsql MODIFIES SQL DATA;
+$$ language plpgsql;
 BEGIN;
-select cache_test();
-NOTICE:  table "cache_tab" does not exist, skipping
-CONTEXT:  SQL statement "drop table if exists cache_tab"
-PL/pgSQL function "cache_test" line 2 at SQL statement
+-- Run the function. This caches the plan for the select inside the
+-- function.
+select cache_test('b');
  cache_test 
 ------------
- 
+          1
 (1 row)
 
--- this will fail
-select cache_test();
+-- Drop and re-create the table
+drop table cache_tab;
+create table cache_tab (t text);
+insert into cache_tab values ('b');
+-- Re-run the function.
+select cache_test('b');
  cache_test 
 ------------
- 
+          1
 (1 row)
 
-COMMIT; 
-set gp_plpgsql_clear_cache_always = on;
-select cache_test();
+COMMIT;
+drop table cache_tab;
+drop function cache_test(text);
+-- ************************************************************
+-- * A function that calls another function, and the other function is
+-- * dropped and recreated.
+-- ************************************************************
+--
+-- This depends on plan cache invalidation support added in PostgreSQL 8.4.
+-- Create a function, and another function that calls the first one.
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'foo ' || t;
+end;
+$$ language plpgsql;
+create or replace function cache_test(t text) returns text as
+$$
+begin
+  return get_dummy_string(t);
+end;
+$$ language plpgsql;
+-- Run the function, to warm the plan cache with the function
+-- call to get_dummy_string().
+select cache_test('');
  cache_test 
 ------------
- 
+ foo 
+(1 row)
+
+-- Drop and re-create get_dummy_string() function.
+drop function get_dummy_string(text);
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'bar ' || t;
+end;
+$$ language plpgsql;
+-- Re-run the function
+select cache_test('');
+ cache_test 
+------------
+ bar 
+(1 row)
+
+drop function get_dummy_string(text);
+drop function cache_test(text);
+-- ************************************************************
+-- * A function that calls another function, and the other function is
+-- * dropped and recreated.
+-- ************************************************************
+-- Create a function, and another function that calls the first one.
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'foo ' || t;
+end;
+$$ language plpgsql;
+create or replace function cache_test(t text) returns text as
+$$
+begin
+  return get_dummy_string(t);
+end;
+$$ language plpgsql;
+-- Run the function, to warm the plan cache with the function
+-- call to get_dummy_string().
+select cache_test('');
+ cache_test 
+------------
+ foo 
+(1 row)
+
+-- Also run the function as part of a query so that the function
+-- is executed in segments rather than the master. (Without ORCA.
+-- With ORCA, the query is planned differently and runs on the
+-- master anyway).
+create temporary table cache_tab (t text);
+insert into cache_tab values ('b');
+select cache_test(t) from cache_tab;
+ cache_test 
+------------
+ foo b
+(1 row)
+
+-- Drop and re-create get_dummy_string() function.
+drop function get_dummy_string(text);
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'bar' || t;
+end;
+$$ language plpgsql;
+-- Re-run the function
+select cache_test('');
+ cache_test 
+------------
+ bar
 (1 row)
 
+select cache_test(t) from cache_tab;
+ cache_test 
+------------
+ barb
+(1 row)
+
+drop function get_dummy_string(text);
+drop function cache_test(text);
 drop table cache_tab;
-drop function cache_test();
---
 -- ************************************************************
--- * testing guc
+-- * A function that calls another function, and the other function
+-- * is dropped and recreated. Same as previous tests, but the
+-- * function is executed IMMUTABLE, to test that plan cache
+-- * invalidation also works when the function is inlined.
 -- ************************************************************
 --
-drop table if exists cache_tab cascade;
-NOTICE:  table "cache_tab" does not exist, skipping
-drop function if exists cache_test(); 
-NOTICE:  function cache_test() does not exist, skipping
-set gp_plpgsql_clear_cache_always = off;
-create function cache_test() returns void as
+-- To make sure that plan invalidation works also when the function
+-- is inlined.
+-- Create a function, and another function that calls the first one.
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'foo ' || t;
+end;
+$$ language plpgsql IMMUTABLE;
+create or replace function cache_test(t text) returns text as
 $$
-declare count int; 
 begin
-	count := 3;
-	while count > 0 
-	loop
-		drop table if exists cache_tab;
-		create table cache_tab (id int) distributed randomly;
-		insert into cache_tab values (1);
-		count := count - 1;
-	end loop;
+  return get_dummy_string(t);
 end;
-$$ language plpgsql MODIFIES SQL DATA;
--- this will fail
-select cache_test();
-NOTICE:  table "cache_tab" does not exist, skipping
-CONTEXT:  SQL statement "drop table if exists cache_tab"
-PL/pgSQL function "cache_test" line 6 at SQL statement
-ERROR:  relation with OID 1235145 does not exist
-CONTEXT:  SQL statement "insert into cache_tab values (1)"
-PL/pgSQL function "cache_test" line 8 at SQL statement
-set gp_plpgsql_clear_cache_always = on;
--- this will pass
-select cache_test();
-NOTICE:  table "cache_tab" does not exist, skipping
-CONTEXT:  SQL statement "drop table if exists cache_tab"
-PL/pgSQL function "cache_test" line 6 at SQL statement
+$$ language plpgsql IMMUTABLE;
+create temporary table cache_tab (t text);
+insert into cache_tab values ('b');
+-- Run the function, to warm the plan cache.
+select cache_test('');
  cache_test 
 ------------
- 
+ foo 
 (1 row)
 
-set gp_plpgsql_clear_cache_always = off;
-drop function cache_test();
-create function cache_test() returns void as
-$$
-declare count int; 
+select cache_test(t) from cache_tab;
+ cache_test 
+------------
+ foo b
+(1 row)
+
+-- Drop and re-create get_dummy_string() function.
+drop function get_dummy_string(text);
+create or replace function get_dummy_string(t text) returns text as $$
 begin
-	count := 3;
-	while count > 0 
-	loop
-		set gp_plpgsql_clear_cache_always = on;
-		drop table if exists cache_tab;
-		create table cache_tab (id int) distributed randomly;
-		insert into cache_tab values (1);
-		count := count - 1;
-	end loop;
+  return 'bar' || t;
 end;
-$$ language plpgsql MODIFIES SQL DATA;
-select cache_test();
+$$ language plpgsql;
+-- Re-run the function
+select cache_test('');
  cache_test 
 ------------
- 
+ bar
 (1 row)
 
-drop table cache_tab;
-drop function cache_test();
+select cache_test(t) from cache_tab;
+ cache_test 
+------------
+ barb
+(1 row)
+
+drop function get_dummy_string(text);
+drop function cache_test(text);
diff --git a/src/test/regress/expected/polymorphism.out b/src/test/regress/expected/polymorphism.out
index 9203122f5797..f7e2f481e7e3 100755
--- a/src/test/regress/expected/polymorphism.out
+++ b/src/test/regress/expected/polymorphism.out
@@ -91,7 +91,7 @@ CREATE AGGREGATE myaggp01a(*) (SFUNC = stfnp, STYPE = int4[],
 CREATE AGGREGATE myaggp02a(*) (SFUNC = stfnp, STYPE = anyarray,
   FINALFUNC = ffp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --     N    P
 -- should CREATE
 CREATE AGGREGATE myaggp03a(*) (SFUNC = stfp, STYPE = int4[],
@@ -103,11 +103,11 @@ CREATE AGGREGATE myaggp03b(*) (SFUNC = stfp, STYPE = int4[],
 CREATE AGGREGATE myaggp04a(*) (SFUNC = stfp, STYPE = anyarray,
   FINALFUNC = ffp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 CREATE AGGREGATE myaggp04b(*) (SFUNC = stfp, STYPE = anyarray,
   INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    Case2 (R = P) && ((B = P) || (B = N))
 --    -------------------------------------
 --    S    tf1      B    tf2
@@ -162,13 +162,13 @@ ERROR:  function tfp(integer[], anyelement) does not exist
 CREATE AGGREGATE myaggp13a(BASETYPE = int, SFUNC = tfnp, STYPE = anyarray,
   FINALFUNC = ffp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    N        N    P
 -- should ERROR: tf2p(anyarray, int) not matched by tf2p(int[],anyelement)
 CREATE AGGREGATE myaggp14a(BASETYPE = int, SFUNC = tf2p, STYPE = anyarray,
   FINALFUNC = ffp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    N        P    N
 -- should ERROR: tfnp(anyarray, anyelement) not matched by tfnp(int[],int)
 CREATE AGGREGATE myaggp15a(BASETYPE = anyelement, SFUNC = tfnp,
@@ -184,21 +184,21 @@ ERROR:  function tf2p(anyarray, anyelement) does not exist
 CREATE AGGREGATE myaggp17a(BASETYPE = int, SFUNC = tf1p, STYPE = anyarray,
   FINALFUNC = ffp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 CREATE AGGREGATE myaggp17b(BASETYPE = int, SFUNC = tf1p, STYPE = anyarray,
   INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    P        N    P
 -- should ERROR: tfp(anyarray, int) not matched by tfp(anyarray, anyelement)
 CREATE AGGREGATE myaggp18a(BASETYPE = int, SFUNC = tfp, STYPE = anyarray,
   FINALFUNC = ffp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 CREATE AGGREGATE myaggp18b(BASETYPE = int, SFUNC = tfp, STYPE = anyarray,
   INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    P        P    N
 -- should ERROR: tf1p(anyarray, anyelement) not matched by tf1p(anyarray, int)
 CREATE AGGREGATE myaggp19a(BASETYPE = anyelement, SFUNC = tf1p,
@@ -228,11 +228,11 @@ CREATE AGGREGATE myaggn01b(*) (SFUNC = stfnp, STYPE = int4[],
 CREATE AGGREGATE myaggn02a(*) (SFUNC = stfnp, STYPE = anyarray,
   FINALFUNC = ffnp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 CREATE AGGREGATE myaggn02b(*) (SFUNC = stfnp, STYPE = anyarray,
   INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --     N    P
 -- should CREATE
 CREATE AGGREGATE myaggn03a(*) (SFUNC = stfp, STYPE = int4[],
@@ -242,7 +242,7 @@ CREATE AGGREGATE myaggn03a(*) (SFUNC = stfp, STYPE = int4[],
 CREATE AGGREGATE myaggn04a(*) (SFUNC = stfp, STYPE = anyarray,
   FINALFUNC = ffnp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    Case4 (R = N) && ((B = P) || (B = N))
 --    -------------------------------------
 --    S    tf1      B    tf2
@@ -296,21 +296,21 @@ ERROR:  function tfp(integer[], anyelement) does not exist
 CREATE AGGREGATE myaggn13a(BASETYPE = int, SFUNC = tfnp, STYPE = anyarray,
   FINALFUNC = ffnp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 CREATE AGGREGATE myaggn13b(BASETYPE = int, SFUNC = tfnp, STYPE = anyarray,
   INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    N        N    P
 -- should ERROR: tf2p(anyarray, int) not matched by tf2p(int[],anyelement)
 CREATE AGGREGATE myaggn14a(BASETYPE = int, SFUNC = tf2p, STYPE = anyarray,
   FINALFUNC = ffnp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 CREATE AGGREGATE myaggn14b(BASETYPE = int, SFUNC = tf2p, STYPE = anyarray,
   INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    N        P    N
 -- should ERROR: tfnp(anyarray, anyelement) not matched by tfnp(int[],int)
 CREATE AGGREGATE myaggn15a(BASETYPE = anyelement, SFUNC = tfnp,
@@ -332,13 +332,13 @@ ERROR:  function tf2p(anyarray, anyelement) does not exist
 CREATE AGGREGATE myaggn17a(BASETYPE = int, SFUNC = tf1p, STYPE = anyarray,
   FINALFUNC = ffnp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    P        N    P
 -- should ERROR: tfp(anyarray, int) not matched by tfp(anyarray, anyelement)
 CREATE AGGREGATE myaggn18a(BASETYPE = int, SFUNC = tfp, STYPE = anyarray,
   FINALFUNC = ffnp, INITCOND = '{}');
 ERROR:  cannot determine transition data type
-DETAIL:  An aggregate using "anyarray" or "anyelement" as transition type must have at least one argument of either type.
+DETAIL:  An aggregate using a polymorphic transition type must have at least one polymorphic argument.
 --    P    P        P    N
 -- should ERROR: tf1p(anyarray, anyelement) not matched by tf1p(anyarray, int)
 CREATE AGGREGATE myaggn19a(BASETYPE = anyelement, SFUNC = tf1p,
@@ -565,17 +565,17 @@ select case when $1 then $2 else $3 end $$ language sql;
 -- by having the same value for the distributed column for multiple rows.
 -- We need this to ensure that the NOTICE raised by bleat function gets returned
 -- in the same order.
-create table int4_tbl_new(f1 int, f2 int) distributed by(f1);
-insert into int4_tbl_new values(1, 123456), (1, -2147483647), (1, 0), (1, -123456), (1, 2147483647);
+create table int4_tbl_new(f0 int, f1 int) distributed by(f0);
+insert into int4_tbl_new values(1, 0), (1, 123456), (1, -123456), (1, 2147483647), (1, -2147483647);
 -- Note this would fail with integer overflow, never mind wrong bleat() output,
 -- if the CASE expression were not successfully inlined
-select f2, sql_if(f2 > 0, bleat(f2), bleat(f2 + 1)) from int4_tbl_new;
-NOTICE:  bleat 123456
-NOTICE:  bleat -2147483646
+select f1, sql_if(f1 > 0, bleat(f1), bleat(f1 + 1)) from int4_tbl_new;
 NOTICE:  bleat 1
+NOTICE:  bleat 123456
 NOTICE:  bleat -123455
 NOTICE:  bleat 2147483647
-     f2      |   sql_if
+NOTICE:  bleat -2147483646
+     f1      |   sql_if    
 -------------+-------------
            0 |           1
       123456 |      123456
@@ -594,3 +594,39 @@ select q2, sql_if(q2 > 0, q2, q2 + 1) from int8_tbl;
  -4567890123456789 | -4567890123456788
 (5 rows)
 
+-- another kind of polymorphic aggregate
+create function add_group(grp anyarray, ad anyelement, size integer)
+  returns anyarray
+  as $$
+begin
+  if grp is null then
+    return array[ad];
+  end if;
+  if array_upper(grp, 1) < size then
+    return grp || ad;
+  end if;
+  return grp;
+end;
+$$
+  language plpgsql immutable;
+create aggregate build_group(anyelement, integer) (
+  SFUNC = add_group,
+  STYPE = anyarray
+);
+select build_group(q1,3) from (select q1 from int8_tbl order by q1) as t;
+        build_group         
+----------------------------
+ {123,123,4567890123456789}
+(1 row)
+
+-- this should fail because stype isn't compatible with arg
+create aggregate build_group(int8, integer) (
+  SFUNC = add_group,
+  STYPE = int2[]
+);
+ERROR:  function add_group(smallint[], bigint, integer) does not exist
+-- but we can make a non-poly agg from a poly sfunc if types are OK
+create aggregate build_group(int8, integer) (
+  SFUNC = add_group,
+  STYPE = int8[]
+);
diff --git a/src/test/regress/expected/portals.out b/src/test/regress/expected/portals.out
index 10c34af545f4..dc3e39142c7a 100755
--- a/src/test/regress/expected/portals.out
+++ b/src/test/regress/expected/portals.out
@@ -3,33 +3,33 @@
 --
 SET optimizer_disable_missing_stats_collection=true;
 BEGIN;
-DECLARE foo1 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo1 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo2 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo3 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo3 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo4 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo5 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo5 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo6 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo7 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo7 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo8 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo9 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo9 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo10 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo11 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo11 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo12 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo13 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo13 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo14 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo15 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo15 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo16 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo17 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo17 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo18 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo19 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo19 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo20 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo21 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo21 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 DECLARE foo22 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
-DECLARE foo23 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo23 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 FETCH 1 in foo1;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
 (1 row)
 
 FETCH 2 in foo2;
@@ -42,9 +42,9 @@ FETCH 2 in foo2;
 FETCH 3 in foo3;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
 (3 rows)
 
 FETCH 4 in foo4;
@@ -59,11 +59,11 @@ FETCH 4 in foo4;
 FETCH 5 in foo5;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
 (5 rows)
 
 FETCH 6 in foo6;
@@ -80,13 +80,13 @@ FETCH 6 in foo6;
 FETCH 7 in foo7;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
 (7 rows)
 
 FETCH 8 in foo8;
@@ -105,15 +105,15 @@ FETCH 8 in foo8;
 FETCH 9 in foo9;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
 (9 rows)
 
 FETCH 10 in foo10;
@@ -134,17 +134,17 @@ FETCH 10 in foo10;
 FETCH 11 in foo11;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
-       9 |    4463 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | RPGAAA   | VVVVxx
-      10 |    8788 |   0 |    2 |   0 |     10 |      10 |       10 |          10 |        10 |       10 |  20 |   21 | KAAAAA   | AANAAA   | AAAAxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
+    3043 |       9 |   1 |    3 |   3 |      3 |      43 |       43 |        1043 |      3043 |     3043 |  86 |   87 | BNAAAA   | JAAAAA   | HHHHxx
+    1314 |      10 |   0 |    2 |   4 |     14 |      14 |      314 |        1314 |      1314 |     1314 |  28 |   29 | OYAAAA   | KAAAAA   | OOOOxx
 (11 rows)
 
 FETCH 12 in foo12;
@@ -167,19 +167,19 @@ FETCH 12 in foo12;
 FETCH 13 in foo13;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
-       9 |    4463 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | RPGAAA   | VVVVxx
-      10 |    8788 |   0 |    2 |   0 |     10 |      10 |       10 |          10 |        10 |       10 |  20 |   21 | KAAAAA   | AANAAA   | AAAAxx
-      11 |    8396 |   1 |    3 |   1 |     11 |      11 |       11 |          11 |        11 |       11 |  22 |   23 | LAAAAA   | YKMAAA   | AAAAxx
-      12 |    6605 |   0 |    0 |   2 |     12 |      12 |       12 |          12 |        12 |       12 |  24 |   25 | MAAAAA   | BUJAAA   | HHHHxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
+    3043 |       9 |   1 |    3 |   3 |      3 |      43 |       43 |        1043 |      3043 |     3043 |  86 |   87 | BNAAAA   | JAAAAA   | HHHHxx
+    1314 |      10 |   0 |    2 |   4 |     14 |      14 |      314 |        1314 |      1314 |     1314 |  28 |   29 | OYAAAA   | KAAAAA   | OOOOxx
+    1504 |      11 |   0 |    0 |   4 |      4 |       4 |      504 |        1504 |      1504 |     1504 |   8 |    9 | WFAAAA   | LAAAAA   | VVVVxx
+    5222 |      12 |   0 |    2 |   2 |      2 |      22 |      222 |        1222 |       222 |     5222 |  44 |   45 | WSAAAA   | MAAAAA   | AAAAxx
 (13 rows)
 
 FETCH 14 in foo14;
@@ -204,21 +204,21 @@ FETCH 14 in foo14;
 FETCH 15 in foo15;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
-       9 |    4463 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | RPGAAA   | VVVVxx
-      10 |    8788 |   0 |    2 |   0 |     10 |      10 |       10 |          10 |        10 |       10 |  20 |   21 | KAAAAA   | AANAAA   | AAAAxx
-      11 |    8396 |   1 |    3 |   1 |     11 |      11 |       11 |          11 |        11 |       11 |  22 |   23 | LAAAAA   | YKMAAA   | AAAAxx
-      12 |    6605 |   0 |    0 |   2 |     12 |      12 |       12 |          12 |        12 |       12 |  24 |   25 | MAAAAA   | BUJAAA   | HHHHxx
-      13 |    5696 |   1 |    1 |   3 |     13 |      13 |       13 |          13 |        13 |       13 |  26 |   27 | NAAAAA   | CLIAAA   | AAAAxx
-      14 |    4341 |   0 |    2 |   4 |     14 |      14 |       14 |          14 |        14 |       14 |  28 |   29 | OAAAAA   | ZKGAAA   | HHHHxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
+    3043 |       9 |   1 |    3 |   3 |      3 |      43 |       43 |        1043 |      3043 |     3043 |  86 |   87 | BNAAAA   | JAAAAA   | HHHHxx
+    1314 |      10 |   0 |    2 |   4 |     14 |      14 |      314 |        1314 |      1314 |     1314 |  28 |   29 | OYAAAA   | KAAAAA   | OOOOxx
+    1504 |      11 |   0 |    0 |   4 |      4 |       4 |      504 |        1504 |      1504 |     1504 |   8 |    9 | WFAAAA   | LAAAAA   | VVVVxx
+    5222 |      12 |   0 |    2 |   2 |      2 |      22 |      222 |        1222 |       222 |     5222 |  44 |   45 | WSAAAA   | MAAAAA   | AAAAxx
+    6243 |      13 |   1 |    3 |   3 |      3 |      43 |      243 |         243 |      1243 |     6243 |  86 |   87 | DGAAAA   | NAAAAA   | HHHHxx
+    5471 |      14 |   1 |    3 |   1 |     11 |      71 |      471 |        1471 |       471 |     5471 | 142 |  143 | LCAAAA   | OAAAAA   | OOOOxx
 (15 rows)
 
 FETCH 16 in foo16;
@@ -245,23 +245,23 @@ FETCH 16 in foo16;
 FETCH 17 in foo17;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
-       9 |    4463 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | RPGAAA   | VVVVxx
-      10 |    8788 |   0 |    2 |   0 |     10 |      10 |       10 |          10 |        10 |       10 |  20 |   21 | KAAAAA   | AANAAA   | AAAAxx
-      11 |    8396 |   1 |    3 |   1 |     11 |      11 |       11 |          11 |        11 |       11 |  22 |   23 | LAAAAA   | YKMAAA   | AAAAxx
-      12 |    6605 |   0 |    0 |   2 |     12 |      12 |       12 |          12 |        12 |       12 |  24 |   25 | MAAAAA   | BUJAAA   | HHHHxx
-      13 |    5696 |   1 |    1 |   3 |     13 |      13 |       13 |          13 |        13 |       13 |  26 |   27 | NAAAAA   | CLIAAA   | AAAAxx
-      14 |    4341 |   0 |    2 |   4 |     14 |      14 |       14 |          14 |        14 |       14 |  28 |   29 | OAAAAA   | ZKGAAA   | HHHHxx
-      15 |    1358 |   1 |    3 |   5 |     15 |      15 |       15 |          15 |        15 |       15 |  30 |   31 | PAAAAA   | GACAAA   | OOOOxx
-      16 |    9675 |   0 |    0 |   6 |     16 |      16 |       16 |          16 |        16 |       16 |  32 |   33 | QAAAAA   | DIOAAA   | VVVVxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
+    3043 |       9 |   1 |    3 |   3 |      3 |      43 |       43 |        1043 |      3043 |     3043 |  86 |   87 | BNAAAA   | JAAAAA   | HHHHxx
+    1314 |      10 |   0 |    2 |   4 |     14 |      14 |      314 |        1314 |      1314 |     1314 |  28 |   29 | OYAAAA   | KAAAAA   | OOOOxx
+    1504 |      11 |   0 |    0 |   4 |      4 |       4 |      504 |        1504 |      1504 |     1504 |   8 |    9 | WFAAAA   | LAAAAA   | VVVVxx
+    5222 |      12 |   0 |    2 |   2 |      2 |      22 |      222 |        1222 |       222 |     5222 |  44 |   45 | WSAAAA   | MAAAAA   | AAAAxx
+    6243 |      13 |   1 |    3 |   3 |      3 |      43 |      243 |         243 |      1243 |     6243 |  86 |   87 | DGAAAA   | NAAAAA   | HHHHxx
+    5471 |      14 |   1 |    3 |   1 |     11 |      71 |      471 |        1471 |       471 |     5471 | 142 |  143 | LCAAAA   | OAAAAA   | OOOOxx
+    5006 |      15 |   0 |    2 |   6 |      6 |       6 |        6 |        1006 |         6 |     5006 |  12 |   13 | OKAAAA   | PAAAAA   | VVVVxx
+    5387 |      16 |   1 |    3 |   7 |      7 |      87 |      387 |        1387 |       387 |     5387 | 174 |  175 | FZAAAA   | QAAAAA   | AAAAxx
 (17 rows)
 
 FETCH 18 in foo18;
@@ -290,25 +290,25 @@ FETCH 18 in foo18;
 FETCH 19 in foo19;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
-       9 |    4463 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | RPGAAA   | VVVVxx
-      10 |    8788 |   0 |    2 |   0 |     10 |      10 |       10 |          10 |        10 |       10 |  20 |   21 | KAAAAA   | AANAAA   | AAAAxx
-      11 |    8396 |   1 |    3 |   1 |     11 |      11 |       11 |          11 |        11 |       11 |  22 |   23 | LAAAAA   | YKMAAA   | AAAAxx
-      12 |    6605 |   0 |    0 |   2 |     12 |      12 |       12 |          12 |        12 |       12 |  24 |   25 | MAAAAA   | BUJAAA   | HHHHxx
-      13 |    5696 |   1 |    1 |   3 |     13 |      13 |       13 |          13 |        13 |       13 |  26 |   27 | NAAAAA   | CLIAAA   | AAAAxx
-      14 |    4341 |   0 |    2 |   4 |     14 |      14 |       14 |          14 |        14 |       14 |  28 |   29 | OAAAAA   | ZKGAAA   | HHHHxx
-      15 |    1358 |   1 |    3 |   5 |     15 |      15 |       15 |          15 |        15 |       15 |  30 |   31 | PAAAAA   | GACAAA   | OOOOxx
-      16 |    9675 |   0 |    0 |   6 |     16 |      16 |       16 |          16 |        16 |       16 |  32 |   33 | QAAAAA   | DIOAAA   | VVVVxx
-      17 |    8274 |   1 |    1 |   7 |     17 |      17 |       17 |          17 |        17 |       17 |  34 |   35 | RAAAAA   | GGMAAA   | OOOOxx
-      18 |     376 |   0 |    2 |   8 |     18 |      18 |       18 |          18 |        18 |       18 |  36 |   37 | SAAAAA   | MOAAAA   | AAAAxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
+    3043 |       9 |   1 |    3 |   3 |      3 |      43 |       43 |        1043 |      3043 |     3043 |  86 |   87 | BNAAAA   | JAAAAA   | HHHHxx
+    1314 |      10 |   0 |    2 |   4 |     14 |      14 |      314 |        1314 |      1314 |     1314 |  28 |   29 | OYAAAA   | KAAAAA   | OOOOxx
+    1504 |      11 |   0 |    0 |   4 |      4 |       4 |      504 |        1504 |      1504 |     1504 |   8 |    9 | WFAAAA   | LAAAAA   | VVVVxx
+    5222 |      12 |   0 |    2 |   2 |      2 |      22 |      222 |        1222 |       222 |     5222 |  44 |   45 | WSAAAA   | MAAAAA   | AAAAxx
+    6243 |      13 |   1 |    3 |   3 |      3 |      43 |      243 |         243 |      1243 |     6243 |  86 |   87 | DGAAAA   | NAAAAA   | HHHHxx
+    5471 |      14 |   1 |    3 |   1 |     11 |      71 |      471 |        1471 |       471 |     5471 | 142 |  143 | LCAAAA   | OAAAAA   | OOOOxx
+    5006 |      15 |   0 |    2 |   6 |      6 |       6 |        6 |        1006 |         6 |     5006 |  12 |   13 | OKAAAA   | PAAAAA   | VVVVxx
+    5387 |      16 |   1 |    3 |   7 |      7 |      87 |      387 |        1387 |       387 |     5387 | 174 |  175 | FZAAAA   | QAAAAA   | AAAAxx
+    5785 |      17 |   1 |    1 |   5 |      5 |      85 |      785 |        1785 |       785 |     5785 | 170 |  171 | NOAAAA   | RAAAAA   | HHHHxx
+    6621 |      18 |   1 |    1 |   1 |      1 |      21 |      621 |         621 |      1621 |     6621 |  42 |   43 | RUAAAA   | SAAAAA   | OOOOxx
 (19 rows)
 
 FETCH 20 in foo20;
@@ -339,27 +339,27 @@ FETCH 20 in foo20;
 FETCH 21 in foo21;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
-       9 |    4463 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | RPGAAA   | VVVVxx
-      10 |    8788 |   0 |    2 |   0 |     10 |      10 |       10 |          10 |        10 |       10 |  20 |   21 | KAAAAA   | AANAAA   | AAAAxx
-      11 |    8396 |   1 |    3 |   1 |     11 |      11 |       11 |          11 |        11 |       11 |  22 |   23 | LAAAAA   | YKMAAA   | AAAAxx
-      12 |    6605 |   0 |    0 |   2 |     12 |      12 |       12 |          12 |        12 |       12 |  24 |   25 | MAAAAA   | BUJAAA   | HHHHxx
-      13 |    5696 |   1 |    1 |   3 |     13 |      13 |       13 |          13 |        13 |       13 |  26 |   27 | NAAAAA   | CLIAAA   | AAAAxx
-      14 |    4341 |   0 |    2 |   4 |     14 |      14 |       14 |          14 |        14 |       14 |  28 |   29 | OAAAAA   | ZKGAAA   | HHHHxx
-      15 |    1358 |   1 |    3 |   5 |     15 |      15 |       15 |          15 |        15 |       15 |  30 |   31 | PAAAAA   | GACAAA   | OOOOxx
-      16 |    9675 |   0 |    0 |   6 |     16 |      16 |       16 |          16 |        16 |       16 |  32 |   33 | QAAAAA   | DIOAAA   | VVVVxx
-      17 |    8274 |   1 |    1 |   7 |     17 |      17 |       17 |          17 |        17 |       17 |  34 |   35 | RAAAAA   | GGMAAA   | OOOOxx
-      18 |     376 |   0 |    2 |   8 |     18 |      18 |       18 |          18 |        18 |       18 |  36 |   37 | SAAAAA   | MOAAAA   | AAAAxx
-      19 |    7303 |   1 |    3 |   9 |     19 |      19 |       19 |          19 |        19 |       19 |  38 |   39 | TAAAAA   | XUKAAA   | VVVVxx
-      20 |    5574 |   0 |    0 |   0 |      0 |      20 |       20 |          20 |        20 |       20 |  40 |   41 | UAAAAA   | KGIAAA   | OOOOxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
+    3043 |       9 |   1 |    3 |   3 |      3 |      43 |       43 |        1043 |      3043 |     3043 |  86 |   87 | BNAAAA   | JAAAAA   | HHHHxx
+    1314 |      10 |   0 |    2 |   4 |     14 |      14 |      314 |        1314 |      1314 |     1314 |  28 |   29 | OYAAAA   | KAAAAA   | OOOOxx
+    1504 |      11 |   0 |    0 |   4 |      4 |       4 |      504 |        1504 |      1504 |     1504 |   8 |    9 | WFAAAA   | LAAAAA   | VVVVxx
+    5222 |      12 |   0 |    2 |   2 |      2 |      22 |      222 |        1222 |       222 |     5222 |  44 |   45 | WSAAAA   | MAAAAA   | AAAAxx
+    6243 |      13 |   1 |    3 |   3 |      3 |      43 |      243 |         243 |      1243 |     6243 |  86 |   87 | DGAAAA   | NAAAAA   | HHHHxx
+    5471 |      14 |   1 |    3 |   1 |     11 |      71 |      471 |        1471 |       471 |     5471 | 142 |  143 | LCAAAA   | OAAAAA   | OOOOxx
+    5006 |      15 |   0 |    2 |   6 |      6 |       6 |        6 |        1006 |         6 |     5006 |  12 |   13 | OKAAAA   | PAAAAA   | VVVVxx
+    5387 |      16 |   1 |    3 |   7 |      7 |      87 |      387 |        1387 |       387 |     5387 | 174 |  175 | FZAAAA   | QAAAAA   | AAAAxx
+    5785 |      17 |   1 |    1 |   5 |      5 |      85 |      785 |        1785 |       785 |     5785 | 170 |  171 | NOAAAA   | RAAAAA   | HHHHxx
+    6621 |      18 |   1 |    1 |   1 |      1 |      21 |      621 |         621 |      1621 |     6621 |  42 |   43 | RUAAAA   | SAAAAA   | OOOOxx
+    6969 |      19 |   1 |    1 |   9 |      9 |      69 |      969 |         969 |      1969 |     6969 | 138 |  139 | BIAAAA   | TAAAAA   | VVVVxx
+    9460 |      20 |   0 |    0 |   0 |      0 |      60 |      460 |        1460 |      4460 |     9460 | 120 |  121 | WZAAAA   | UAAAAA   | AAAAxx
 (21 rows)
 
 FETCH 22 in foo22;
@@ -392,29 +392,29 @@ FETCH 22 in foo22;
 FETCH 23 in foo23;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
-       1 |    2838 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | EFEAAA   | OOOOxx
-       2 |    2716 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | MAEAAA   | AAAAxx
-       3 |    5679 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | LKIAAA   | VVVVxx
-       4 |    1621 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | JKCAAA   | HHHHxx
-       5 |    5557 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | TFIAAA   | HHHHxx
-       6 |    2855 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | VFEAAA   | VVVVxx
-       7 |    8518 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | QPMAAA   | OOOOxx
-       8 |    5435 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | BBIAAA   | VVVVxx
-       9 |    4463 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | RPGAAA   | VVVVxx
-      10 |    8788 |   0 |    2 |   0 |     10 |      10 |       10 |          10 |        10 |       10 |  20 |   21 | KAAAAA   | AANAAA   | AAAAxx
-      11 |    8396 |   1 |    3 |   1 |     11 |      11 |       11 |          11 |        11 |       11 |  22 |   23 | LAAAAA   | YKMAAA   | AAAAxx
-      12 |    6605 |   0 |    0 |   2 |     12 |      12 |       12 |          12 |        12 |       12 |  24 |   25 | MAAAAA   | BUJAAA   | HHHHxx
-      13 |    5696 |   1 |    1 |   3 |     13 |      13 |       13 |          13 |        13 |       13 |  26 |   27 | NAAAAA   | CLIAAA   | AAAAxx
-      14 |    4341 |   0 |    2 |   4 |     14 |      14 |       14 |          14 |        14 |       14 |  28 |   29 | OAAAAA   | ZKGAAA   | HHHHxx
-      15 |    1358 |   1 |    3 |   5 |     15 |      15 |       15 |          15 |        15 |       15 |  30 |   31 | PAAAAA   | GACAAA   | OOOOxx
-      16 |    9675 |   0 |    0 |   6 |     16 |      16 |       16 |          16 |        16 |       16 |  32 |   33 | QAAAAA   | DIOAAA   | VVVVxx
-      17 |    8274 |   1 |    1 |   7 |     17 |      17 |       17 |          17 |        17 |       17 |  34 |   35 | RAAAAA   | GGMAAA   | OOOOxx
-      18 |     376 |   0 |    2 |   8 |     18 |      18 |       18 |          18 |        18 |       18 |  36 |   37 | SAAAAA   | MOAAAA   | AAAAxx
-      19 |    7303 |   1 |    3 |   9 |     19 |      19 |       19 |          19 |        19 |       19 |  38 |   39 | TAAAAA   | XUKAAA   | VVVVxx
-      20 |    5574 |   0 |    0 |   0 |      0 |      20 |       20 |          20 |        20 |       20 |  40 |   41 | UAAAAA   | KGIAAA   | OOOOxx
-      21 |    1628 |   1 |    1 |   1 |      1 |      21 |       21 |          21 |        21 |       21 |  42 |   43 | VAAAAA   | QKCAAA   | AAAAxx
-      22 |    7045 |   0 |    2 |   2 |      2 |      22 |       22 |          22 |        22 |       22 |  44 |   45 | WAAAAA   | ZKKAAA   | HHHHxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
+    1891 |       1 |   1 |    3 |   1 |     11 |      91 |      891 |        1891 |      1891 |     1891 | 182 |  183 | TUAAAA   | BAAAAA   | HHHHxx
+    3420 |       2 |   0 |    0 |   0 |      0 |      20 |      420 |        1420 |      3420 |     3420 |  40 |   41 | OBAAAA   | CAAAAA   | OOOOxx
+    9850 |       3 |   0 |    2 |   0 |     10 |      50 |      850 |        1850 |      4850 |     9850 | 100 |  101 | WOAAAA   | DAAAAA   | VVVVxx
+    7164 |       4 |   0 |    0 |   4 |      4 |      64 |      164 |        1164 |      2164 |     7164 | 128 |  129 | OPAAAA   | EAAAAA   | AAAAxx
+    8009 |       5 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |      3009 |     8009 |  18 |   19 | BWAAAA   | FAAAAA   | HHHHxx
+    5057 |       6 |   1 |    1 |   7 |     17 |      57 |       57 |        1057 |        57 |     5057 | 114 |  115 | NMAAAA   | GAAAAA   | OOOOxx
+    6701 |       7 |   1 |    1 |   1 |      1 |       1 |      701 |         701 |      1701 |     6701 |   2 |    3 | TXAAAA   | HAAAAA   | VVVVxx
+    4321 |       8 |   1 |    1 |   1 |      1 |      21 |      321 |         321 |      4321 |     4321 |  42 |   43 | FKAAAA   | IAAAAA   | AAAAxx
+    3043 |       9 |   1 |    3 |   3 |      3 |      43 |       43 |        1043 |      3043 |     3043 |  86 |   87 | BNAAAA   | JAAAAA   | HHHHxx
+    1314 |      10 |   0 |    2 |   4 |     14 |      14 |      314 |        1314 |      1314 |     1314 |  28 |   29 | OYAAAA   | KAAAAA   | OOOOxx
+    1504 |      11 |   0 |    0 |   4 |      4 |       4 |      504 |        1504 |      1504 |     1504 |   8 |    9 | WFAAAA   | LAAAAA   | VVVVxx
+    5222 |      12 |   0 |    2 |   2 |      2 |      22 |      222 |        1222 |       222 |     5222 |  44 |   45 | WSAAAA   | MAAAAA   | AAAAxx
+    6243 |      13 |   1 |    3 |   3 |      3 |      43 |      243 |         243 |      1243 |     6243 |  86 |   87 | DGAAAA   | NAAAAA   | HHHHxx
+    5471 |      14 |   1 |    3 |   1 |     11 |      71 |      471 |        1471 |       471 |     5471 | 142 |  143 | LCAAAA   | OAAAAA   | OOOOxx
+    5006 |      15 |   0 |    2 |   6 |      6 |       6 |        6 |        1006 |         6 |     5006 |  12 |   13 | OKAAAA   | PAAAAA   | VVVVxx
+    5387 |      16 |   1 |    3 |   7 |      7 |      87 |      387 |        1387 |       387 |     5387 | 174 |  175 | FZAAAA   | QAAAAA   | AAAAxx
+    5785 |      17 |   1 |    1 |   5 |      5 |      85 |      785 |        1785 |       785 |     5785 | 170 |  171 | NOAAAA   | RAAAAA   | HHHHxx
+    6621 |      18 |   1 |    1 |   1 |      1 |      21 |      621 |         621 |      1621 |     6621 |  42 |   43 | RUAAAA   | SAAAAA   | OOOOxx
+    6969 |      19 |   1 |    1 |   9 |      9 |      69 |      969 |         969 |      1969 |     6969 | 138 |  139 | BIAAAA   | TAAAAA   | VVVVxx
+    9460 |      20 |   0 |    0 |   0 |      0 |      60 |      460 |        1460 |      4460 |     9460 | 120 |  121 | WZAAAA   | UAAAAA   | AAAAxx
+      59 |      21 |   1 |    3 |   9 |     19 |      59 |       59 |          59 |        59 |       59 | 118 |  119 | HCAAAA   | VAAAAA   | HHHHxx
+    8020 |      22 |   0 |    0 |   0 |      0 |      20 |       20 |          20 |      3020 |     8020 |  40 |   41 | MWAAAA   | WAAAAA   | OOOOxx
 (23 rows)
 
 CLOSE foo1;
@@ -432,24 +432,24 @@ CLOSE foo12;
 -- leave some cursors open, to test that auto-close works.
 -- record this in the system view as well (don't query the time field there
 -- however)
-SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors ORDER BY name;
- name  |                           statement                            | is_holdable | is_binary | is_scrollable 
--------+----------------------------------------------------------------+-------------+-----------+---------------
- foo13 | DECLARE foo13 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4; | f           | f         | f
- foo14 | DECLARE foo14 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4; | f           | f         | f
- foo15 | DECLARE foo15 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4; | f           | f         | f
- foo16 | DECLARE foo16 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4; | f           | f         | f
- foo17 | DECLARE foo17 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4; | f           | f         | f
- foo18 | DECLARE foo18 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4; | f           | f         | f
- foo19 | DECLARE foo19 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4; | f           | f         | f
- foo20 | DECLARE foo20 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4; | f           | f         | f
- foo21 | DECLARE foo21 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4; | f           | f         | f
- foo22 | DECLARE foo22 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4; | f           | f         | f
- foo23 | DECLARE foo23 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4; | f           | f         | f
+SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors;
+ name  |                               statement                               | is_holdable | is_binary | is_scrollable 
+-------+-----------------------------------------------------------------------+-------------+-----------+---------------
+ foo13 | DECLARE foo13 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2; | f           | f         | f
+ foo15 | DECLARE foo15 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2; | f           | f         | f
+ foo19 | DECLARE foo19 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2; | f           | f         | f
+ foo17 | DECLARE foo17 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2; | f           | f         | f
+ foo14 | DECLARE foo14 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;        | f           | f         | f
+ foo21 | DECLARE foo21 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2; | f           | f         | f
+ foo23 | DECLARE foo23 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2; | f           | f         | f
+ foo18 | DECLARE foo18 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;        | f           | f         | f
+ foo20 | DECLARE foo20 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;        | f           | f         | f
+ foo22 | DECLARE foo22 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;        | f           | f         | f
+ foo16 | DECLARE foo16 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;        | f           | f         | f
 (11 rows)
 
 END;
-SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors ORDER BY name;
+SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors;
  name | statement | is_holdable | is_binary | is_scrollable 
 ------+-----------+-------------+-----------+---------------
 (0 rows)
@@ -458,11 +458,11 @@ SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors OR
 -- NO SCROLL disallows backward fetching
 --
 BEGIN;
-DECLARE foo24 NO SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo24 NO SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 FETCH 1 FROM foo24;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
-       0 |    9998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | OUOAAA   | OOOOxx
+    8800 |       0 |   0 |    0 |   0 |      0 |       0 |      800 |         800 |      3800 |     8800 |   0 |    1 | MAAAAA   | AAAAAA   | AAAAxx
 (1 row)
 
 FETCH BACKWARD 1 FROM foo24; -- should fail
@@ -510,7 +510,7 @@ CLOSE foo25;
 -- ROLLBACK should close holdable cursors
 --
 BEGIN;
-DECLARE foo26 CURSOR WITH HOLD FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo26 CURSOR WITH HOLD FOR SELECT * FROM tenk1 ORDER BY unique2;
 ROLLBACK;
 -- should fail
 FETCH FROM foo26;
@@ -616,3 +616,322 @@ EXECUTE cprep;
  c2   | declare c2 cursor with hold for select count_tt1_v(), count_tt1_s(); | t           | f         | f
 (1 row)
 
+-- test CLOSE ALL;
+SELECT name FROM pg_cursors ORDER BY 1;
+ name 
+------
+ c2
+(1 row)
+
+CLOSE ALL;
+SELECT name FROM pg_cursors ORDER BY 1;
+ name 
+------
+(0 rows)
+
+BEGIN;
+DECLARE foo1 CURSOR WITH HOLD FOR SELECT 1;
+DECLARE foo2 CURSOR WITHOUT HOLD FOR SELECT 1;
+SELECT name FROM pg_cursors ORDER BY 1;
+ name 
+------
+ foo1
+ foo2
+(2 rows)
+
+CLOSE ALL;
+SELECT name FROM pg_cursors ORDER BY 1;
+ name 
+------
+(0 rows)
+
+COMMIT;
+--
+-- Tests for updatable cursors
+--
+-- In GPDB, we use a dummy column as distribution key, so that all the
+-- rows land on the same segment. Otherwise the order the cursor returns
+-- the rows is unstable.
+CREATE TEMP TABLE uctest(f1 int, f2 text, distkey text) distributed by (distkey);
+INSERT INTO uctest VALUES (1, 'one'), (2, 'two'), (3, 'three');
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  1 | one
+  2 | two
+  3 | three
+(3 rows)
+
+-- Check DELETE WHERE CURRENT
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest;
+FETCH 2 FROM c1;
+ f1 | f2  
+----+-----
+  1 | one
+  2 | two
+(2 rows)
+
+DELETE FROM uctest WHERE CURRENT OF c1;
+-- should show deletion
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  1 | one
+  3 | three
+(2 rows)
+
+-- cursor did not move
+FETCH ALL FROM c1;
+ f1 |  f2   
+----+-------
+  3 | three
+(1 row)
+
+-- cursor is insensitive
+--MOVE BACKWARD ALL IN c1; -- backwards scans not supported in GPDB
+--FETCH ALL FROM c1;
+COMMIT;
+-- should still see deletion
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  1 | one
+  3 | three
+(2 rows)
+
+-- Check UPDATE WHERE CURRENT; this time use FOR UPDATE
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest FOR UPDATE;
+FETCH c1;
+ f1 | f2  
+----+-----
+  1 | one
+(1 row)
+
+UPDATE uctest SET f1 = 8 WHERE CURRENT OF c1;
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  3 | three
+  8 | one
+(2 rows)
+
+COMMIT;
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  3 | three
+  8 | one
+(2 rows)
+
+-- Check repeated-update and update-then-delete cases
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest;
+FETCH c1;
+ f1 |  f2   
+----+-------
+  3 | three
+(1 row)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+-- insensitive cursor should not show effects of updates or deletes
+--FETCH RELATIVE 0 FROM c1;
+DELETE FROM uctest WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+ f1 | f2  
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+DELETE FROM uctest WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+ f1 | f2  
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+ f1 | f2  
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+--FETCH RELATIVE 0 FROM c1;
+ROLLBACK;
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  3 | three
+  8 | one
+(2 rows)
+
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest FOR UPDATE;
+FETCH c1;
+ f1 |  f2   
+----+-------
+  3 | three
+(1 row)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+DELETE FROM uctest WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+ f1 | f2  
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+DELETE FROM uctest WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+ f1 | f2  
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+ f1 | f2  
+----+-------
+  8 | one
+ 13 | three
+(2 rows)
+
+--- sensitive cursors can't currently scroll back, so this is an error:
+FETCH RELATIVE 0 FROM c1;
+ERROR:  cursor can only scan forward
+HINT:  Declare it with SCROLL option to enable backward scan.
+ROLLBACK;
+SELECT f1, f2 FROM uctest;
+ f1 |  f2   
+----+-------
+  3 | three
+  8 | one
+(2 rows)
+
+-- Check inheritance cases
+CREATE TEMP TABLE ucchild () inherits (uctest);
+INSERT INTO ucchild values(100, 'hundred');
+SELECT f1, f2 FROM uctest;
+ f1  |   f2    
+-----+---------
+   3 | three
+   8 | one
+ 100 | hundred
+(3 rows)
+
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest;
+FETCH 1 FROM c1;
+ f1 |  f2   
+----+-------
+  3 | three
+(1 row)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+FETCH 1 FROM c1;
+ f1 | f2  
+----+-----
+  8 | one
+(1 row)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+FETCH 1 FROM c1;
+ f1  |   f2    
+-----+---------
+ 100 | hundred
+(1 row)
+
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+FETCH 1 FROM c1;
+ f1 | f2 
+----+----
+(0 rows)
+
+COMMIT;
+SELECT f1, f2 FROM uctest;
+ f1  |   f2    
+-----+---------
+  13 | three
+  18 | one
+ 110 | hundred
+(3 rows)
+
+-- Check various error cases
+DELETE FROM uctest WHERE CURRENT OF c1;  -- fail, no such cursor
+ERROR:  cursor "c1" does not exist
+DECLARE cx CURSOR WITH HOLD FOR SELECT * FROM uctest;
+DELETE FROM uctest WHERE CURRENT OF cx;  -- fail, can't use held cursor
+ERROR:  cursor "cx" is held from a previous transaction
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM tenk2;
+DELETE FROM uctest WHERE CURRENT OF c;  -- fail, cursor on wrong table
+ERROR:  cursor "c" is not a simply updatable scan of table "uctest"
+ROLLBACK;
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM tenk1 JOIN tenk2 USING (unique1);
+DELETE FROM tenk1 WHERE CURRENT OF c;  -- fail, cursor is on a join
+ERROR:  cursor "c" is not a simply updatable scan of table "tenk1"
+ROLLBACK;
+BEGIN;
+DECLARE c CURSOR FOR SELECT f1,count(*) FROM uctest GROUP BY f1;
+DELETE FROM uctest WHERE CURRENT OF c;  -- fail, cursor is on aggregation
+ERROR:  cursor "c" is not a simply updatable scan of table "uctest"
+ROLLBACK;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM uctest;
+DELETE FROM uctest WHERE CURRENT OF c1; -- fail, no current row
+ERROR:  cursor "c1" is not positioned on a row
+ROLLBACK;
+-- WHERE CURRENT OF may someday work with views, but today is not that day.
+-- For now, just make sure it errors out cleanly.
+CREATE TEMP VIEW ucview AS SELECT f1, f2 FROM uctest;
+CREATE RULE ucrule AS ON DELETE TO ucview DO INSTEAD
+  DELETE FROM uctest WHERE f1 = OLD.f1;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM ucview;
+FETCH FROM c1;
+ f1 |  f2   
+----+-------
+ 13 | three
+(1 row)
+
+DELETE FROM ucview WHERE CURRENT OF c1; -- fail, views not supported
+ERROR:  WHERE CURRENT OF on a view is not implemented
+ROLLBACK;
diff --git a/src/test/regress/expected/portals_updatable.out b/src/test/regress/expected/portals_updatable.out
index da5b61b71f0d..a4231acd57e1 100644
--- a/src/test/regress/expected/portals_updatable.out
+++ b/src/test/regress/expected/portals_updatable.out
@@ -516,30 +516,30 @@ CREATE TABLE bar (a int, b int, c int, d int)
         )
     ( DEFAULT PARTITION others, START(0) END(6) EVERY(1) );
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_others" for table "bar"
-NOTICE:  CREATE TABLE will create partition "bar_1_prt_2" for table "bar"
-NOTICE:  CREATE TABLE will create partition "bar_1_prt_3" for table "bar"
-NOTICE:  CREATE TABLE will create partition "bar_1_prt_4" for table "bar"
-NOTICE:  CREATE TABLE will create partition "bar_1_prt_5" for table "bar"
-NOTICE:  CREATE TABLE will create partition "bar_1_prt_6" for table "bar"
-NOTICE:  CREATE TABLE will create partition "bar_1_prt_7" for table "bar"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_others_2_prt_subothers" for table "bar_1_prt_others"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_others_2_prt_s1" for table "bar_1_prt_others"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_others_2_prt_s2" for table "bar_1_prt_others"
+NOTICE:  CREATE TABLE will create partition "bar_1_prt_2" for table "bar"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_2_2_prt_subothers" for table "bar_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_2_2_prt_s1" for table "bar_1_prt_2"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_2_2_prt_s2" for table "bar_1_prt_2"
+NOTICE:  CREATE TABLE will create partition "bar_1_prt_3" for table "bar"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_3_2_prt_subothers" for table "bar_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_3_2_prt_s1" for table "bar_1_prt_3"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_3_2_prt_s2" for table "bar_1_prt_3"
+NOTICE:  CREATE TABLE will create partition "bar_1_prt_4" for table "bar"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_4_2_prt_subothers" for table "bar_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_4_2_prt_s1" for table "bar_1_prt_4"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_4_2_prt_s2" for table "bar_1_prt_4"
+NOTICE:  CREATE TABLE will create partition "bar_1_prt_5" for table "bar"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_5_2_prt_subothers" for table "bar_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_5_2_prt_s1" for table "bar_1_prt_5"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_5_2_prt_s2" for table "bar_1_prt_5"
+NOTICE:  CREATE TABLE will create partition "bar_1_prt_6" for table "bar"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_6_2_prt_subothers" for table "bar_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_6_2_prt_s1" for table "bar_1_prt_6"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_6_2_prt_s2" for table "bar_1_prt_6"
+NOTICE:  CREATE TABLE will create partition "bar_1_prt_7" for table "bar"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_7_2_prt_subothers" for table "bar_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_7_2_prt_s1" for table "bar_1_prt_7"
 NOTICE:  CREATE TABLE will create partition "bar_1_prt_7_2_prt_s2" for table "bar_1_prt_7"
@@ -769,7 +769,7 @@ FETCH 1 FROM c1;
 (1 row)
 
 DELETE FROM ucview WHERE CURRENT OF c1;
-ERROR:  "ucview" is not simply updatable
+ERROR:  WHERE CURRENT OF on a view is not implemented
 ROLLBACK;
 -- Negative, cursor-agnostic: cannot update distribution key
 UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF a;
diff --git a/src/test/regress/expected/portals_updatable_optimizer.out b/src/test/regress/expected/portals_updatable_optimizer.out
index 85875fb86871..9659d30cdfb0 100644
--- a/src/test/regress/expected/portals_updatable_optimizer.out
+++ b/src/test/regress/expected/portals_updatable_optimizer.out
@@ -769,7 +769,7 @@ FETCH 1 FROM c1;
 (1 row)
 
 DELETE FROM ucview WHERE CURRENT OF c1;
-ERROR:  "ucview" is not simply updatable
+ERROR:  WHERE CURRENT OF on a view is not implemented
 ROLLBACK;
 -- Negative, cursor-agnostic: cannot update distribution key
 UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF a;
diff --git a/src/test/regress/expected/prepare.out b/src/test/regress/expected/prepare.out
index 1758154142f6..f209fb9e44ca 100755
--- a/src/test/regress/expected/prepare.out
+++ b/src/test/regress/expected/prepare.out
@@ -66,7 +66,8 @@ EXECUTE q2('regression');
 
 PREPARE q3(text, int, float, boolean, oid, smallint) AS
 	SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR
-	ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int) ORDER BY 1,2,3,4;
+	ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int)
+	ORDER BY unique1;
 EXECUTE q3('AAAAxx', 5::smallint, 10.5::float, false, 500::oid, 4::bigint);
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
@@ -120,7 +121,8 @@ LINE 1: PREPARE q4(nonexistenttype) AS SELECT $1;
                    ^
 -- create table as execute
 PREPARE q5(int, text) AS
-	SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2;
+	SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2
+	ORDER BY unique1;
 CREATE TEMPORARY TABLE q5_prep_results AS EXECUTE q5(200, 'DTAAAA');
 SELECT * FROM q5_prep_results ORDER BY 1,2,3,4;
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
@@ -150,19 +152,29 @@ PREPARE q7(unknown) AS
     SELECT * FROM road WHERE thepath = $1;
 SELECT name, statement, parameter_types FROM pg_prepared_statements
     ORDER BY name;
- name |                                       statement                                       |                    parameter_types                     
-------+---------------------------------------------------------------------------------------+--------------------------------------------------------
- q2   | PREPARE q2(text) AS                                                                   | {text}
-      :         SELECT datname, datistemplate, datallowconn                                     
-      :         FROM pg_database WHERE datname = $1;                                            
- q3   | PREPARE q3(text, int, float, boolean, oid, smallint) AS                               | {text,integer,"double precision",boolean,oid,smallint}
-      :         SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR                        
-      :         ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int) ORDER BY 1,2,3,4;   
- q5   | PREPARE q5(int, text) AS                                                              | {integer,text}
-      :         SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2;                        
- q6   | PREPARE q6 AS                                                                         | {integer,name}
-      :     SELECT * FROM tenk1 WHERE unique1 = $1 AND stringu1 = $2;                           
- q7   | PREPARE q7(unknown) AS                                                                | {path}
-      :     SELECT * FROM road WHERE thepath = $1;                                              
+ name |                              statement                              |                    parameter_types                     
+------+---------------------------------------------------------------------+--------------------------------------------------------
+ q2   | PREPARE q2(text) AS                                                 | {text}
+      :         SELECT datname, datistemplate, datallowconn                   
+      :         FROM pg_database WHERE datname = $1;                          
+ q3   | PREPARE q3(text, int, float, boolean, oid, smallint) AS             | {text,integer,"double precision",boolean,oid,smallint}
+      :         SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR      
+      :         ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int)   
+      :         ORDER BY unique1;                                             
+ q5   | PREPARE q5(int, text) AS                                            | {integer,text}
+      :         SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2       
+      :         ORDER BY unique1;                                             
+ q6   | PREPARE q6 AS                                                       | {integer,name}
+      :     SELECT * FROM tenk1 WHERE unique1 = $1 AND stringu1 = $2;         
+ q7   | PREPARE q7(unknown) AS                                              | {path}
+      :     SELECT * FROM road WHERE thepath = $1;                            
 (5 rows)
 
+-- test DEALLOCATE ALL;
+DEALLOCATE ALL;
+SELECT name, statement, parameter_types FROM pg_prepared_statements
+    ORDER BY name;
+ name | statement | parameter_types 
+------+-----------+-----------------
+(0 rows)
+
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 42a346a068de..e5e6b991701b 100755
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -689,8 +689,8 @@ revoke select on dep_priv_test from regressuser4 cascade;
 \dp dep_priv_test
                                                          Access privileges for database "regression"
  Schema |     Name      | Type  |                                                     Access privileges                                                      
---------+---------------+-------+----------------------------------------------------------------------------------------------------------------------------
- public | dep_priv_test | table | {regressuser1=arwdDxt/regressuser1,regressuser2=r*/regressuser1,regressuser3=r*/regressuser1,regressuser4=r*/regressuser3}
+--------+---------------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------
+ public | dep_priv_test | table | {regressuser1=arwdDxt/regressuser1,regressuser2=r*/regressuser1,regressuser3=r*/regressuser1,regressuser4=r*/regressuser3,regressuser5=r/regressuser4}
 (1 row)
 
 set session role regressuser3;
diff --git a/src/test/regress/expected/qp_functions.out b/src/test/regress/expected/qp_functions.out
index 805be8c1bdce..6ce5976e025d 100644
--- a/src/test/regress/expected/qp_functions.out
+++ b/src/test/regress/expected/qp_functions.out
@@ -578,7 +578,7 @@ select fun_array(25,50) as intarray, fun_array('abc'::text, 'bcf') AS textarray;
 (1 row)
 
 select fun_array(25,50) as intarray, fun_array('abc', 'bcf') AS textarray;
-ERROR:  could not determine anyarray/anyelement type because input has type "unknown"
+ERROR:  could not determine polymorphic type because input has type "unknown"
 -- start_ignore
 create or replace function fun_is_greater(anyelement,anyelement) returns boolean AS $$ select $1 > $2 $$ language sql;
 -- end_ignore
@@ -703,11 +703,10 @@ SELECT substr(CAST (varchar '1234' AS text), 3);
 (1 row)
 
 SELECT substr(1234, 3);
- substr 
---------
- 34
-(1 row)
-
+ERROR:  function substr(integer, integer) does not exist
+LINE 1: SELECT substr(1234, 3);
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 SELECT substr(CAST (1234 AS text), 3);
  substr 
 --------
@@ -1150,6 +1149,10 @@ PL/pgSQL function "bad_ddl" line 2 at SQL statement
 (1 row)
 
 select bad_ddl();
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CONTEXT:  SQL statement "create table junk_table(a int)"
+PL/pgSQL function "bad_ddl" line 2 at SQL statement
  bad_ddl 
 ---------
  
@@ -1169,7 +1172,7 @@ select bad_ddl();
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 CONTEXT:  SQL statement "create table junk_table(a int)"
-PL/pgSQL function "bad_ddl" line 2 at execute statement
+PL/pgSQL function "bad_ddl" line 2 at EXECUTE statement
  bad_ddl 
 ---------
  
diff --git a/src/test/regress/expected/qp_misc_jiras.out b/src/test/regress/expected/qp_misc_jiras.out
index 18367b8b0909..c3013ddcf362 100644
--- a/src/test/regress/expected/qp_misc_jiras.out
+++ b/src/test/regress/expected/qp_misc_jiras.out
@@ -33,7 +33,7 @@ ERROR:  CREATE INDEX CONCURRENTLY is not supported
 alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa);
 drop index qp_misc_jiras.tbl1318_daa;
 ERROR:  index "tbl1318_daa" does not exist
-alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa);
+alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa::text);
 drop table qp_misc_jiras.tbl1318;
 create table qp_misc_jiras.tbl1318(dummy integer, aa text not null);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'dummy' as the Greenplum Database data distribution key for this table.
@@ -1499,12 +1499,12 @@ NOTICE:  CREATE TABLE will create partition "tbl6419_test_1_prt_33" for table "t
 NOTICE:  CREATE TABLE will create partition "tbl6419_test_1_prt_34" for table "tbl6419_test"
 NOTICE:  CREATE TABLE will create partition "tbl6419_test_1_prt_35" for table "tbl6419_test"
 insert into qp_misc_jiras.tbl6419_test values( 123, '2009-06-01', 12, '2009-06-01 01:01:01', 'aaaaaa');
-select * from qp_misc_jiras.tbl6419_test where icedt = (select partitionrangestart FROM pg_partitions where tablename='test1' and schemaname='public' and partitionrank=1);
+select * from qp_misc_jiras.tbl6419_test where icedt::text = (select partitionrangestart FROM pg_partitions where tablename='test1' and schemaname='public' and partitionrank=1);
  lstg_id | icedt | icehr | cre_time | lstg_desc_txt 
 ---------+-------+-------+----------+---------------
 (0 rows)
 
-select * from qp_misc_jiras.tbl6419_test where '2009-12-12'::date = (select 'test'::text);
+select * from qp_misc_jiras.tbl6419_test where '2009-12-12'::date::text = (select 'test'::text);
  lstg_id | icedt | icehr | cre_time | lstg_desc_txt 
 ---------+-------+-------+----------+---------------
 (0 rows)
@@ -2725,10 +2725,10 @@ end;
 $$
 language plpgsql;
 select gp_segment_id, a, func2(a) from qp_misc_jiras.fim1; -- we should disallow this
-ERROR:  function cannot execute on segment because it accesses relation "qp_misc_jiras.pg_foo" (functions.c:155)  (seg2 slice1 nikos-mac:25434 pid=94008)
+ERROR:  function cannot execute on segment because it accesses relation "qp_misc_jiras.pg_foo" (functions.c:156)  (seg2 slice1 nikos-mac:25434 pid=94008)
 DETAIL:  
 SQL statement "select count(*) from qp_misc_jiras.pg_foo"
-PL/pgSQL function "func2" line 4 at execute statement
+PL/pgSQL function "func2" line 4 at EXECUTE statement
 create or replace function func3(int) returns int as $$
 declare
 	t1 int;
@@ -3416,10 +3416,6 @@ PL/pgSQL function "tbl5032_func" line 2 at SQL statement
 (1 row)
 
 SELECT qp_misc_jiras.tbl5032_func();
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'text' as the Greenplum Database data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-CONTEXT:  SQL statement "CREATE TEMP TABLE tbl5032_tt AS SELECT 'hello world!'::text"
-PL/pgSQL function "tbl5032_func" line 2 at SQL statement
  tbl5032_func 
 --------------
  
@@ -3451,10 +3447,6 @@ PL/pgSQL function "tbl5032_func" line 2 at SQL statement
 (1 row)
 
 SELECT qp_misc_jiras.tbl5032_func();
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'text' as the Greenplum Database data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-CONTEXT:  SQL statement "CREATE TEMP TABLE tbl5032_tt AS SELECT 'hello world!'::text"
-PL/pgSQL function "tbl5032_func" line 2 at SQL statement
  tbl5032_func 
 --------------
  
diff --git a/src/test/regress/expected/qp_misc_jiras_optimizer.out b/src/test/regress/expected/qp_misc_jiras_optimizer.out
index 4f0ed5017e08..64256347f002 100644
--- a/src/test/regress/expected/qp_misc_jiras_optimizer.out
+++ b/src/test/regress/expected/qp_misc_jiras_optimizer.out
@@ -33,7 +33,7 @@ ERROR:  CREATE INDEX CONCURRENTLY is not supported
 alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa);
 drop index qp_misc_jiras.tbl1318_daa;
 ERROR:  index "tbl1318_daa" does not exist
-alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa);
+alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa::text);
 drop table qp_misc_jiras.tbl1318;
 create table qp_misc_jiras.tbl1318(dummy integer, aa text not null);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'dummy' as the Greenplum Database data distribution key for this table.
@@ -1496,12 +1496,12 @@ NOTICE:  CREATE TABLE will create partition "tbl6419_test_1_prt_33" for table "t
 NOTICE:  CREATE TABLE will create partition "tbl6419_test_1_prt_34" for table "tbl6419_test"
 NOTICE:  CREATE TABLE will create partition "tbl6419_test_1_prt_35" for table "tbl6419_test"
 insert into qp_misc_jiras.tbl6419_test values( 123, '2009-06-01', 12, '2009-06-01 01:01:01', 'aaaaaa');
-select * from qp_misc_jiras.tbl6419_test where icedt = (select partitionrangestart FROM pg_partitions where tablename='test1' and schemaname='public' and partitionrank=1);
+select * from qp_misc_jiras.tbl6419_test where icedt::text = (select partitionrangestart FROM pg_partitions where tablename='test1' and schemaname='public' and partitionrank=1);
  lstg_id | icedt | icehr | cre_time | lstg_desc_txt 
 ---------+-------+-------+----------+---------------
 (0 rows)
 
-select * from qp_misc_jiras.tbl6419_test where '2009-12-12'::date = (select 'test'::text);
+select * from qp_misc_jiras.tbl6419_test where '2009-12-12'::date::text = (select 'test'::text);
  lstg_id | icedt | icehr | cre_time | lstg_desc_txt 
 ---------+-------+-------+----------+---------------
 (0 rows)
@@ -2731,7 +2731,7 @@ select gp_segment_id, a, func2(a) from qp_misc_jiras.fim1; -- we should disallow
 ERROR:  function cannot execute on segment because it accesses relation "qp_misc_jiras.pg_foo" (functions.c:155)  (seg1 slice1 nikos-mac:25433 pid=95127)
 DETAIL:  
 SQL statement "select count(*) from qp_misc_jiras.pg_foo"
-PL/pgSQL function "func2" line 4 at execute statement
+PL/pgSQL function "func2" line 4 at EXECUTE statement
 create or replace function func3(int) returns int as $$
 declare
 	t1 int;
diff --git a/src/test/regress/expected/qp_misc_rio.out b/src/test/regress/expected/qp_misc_rio.out
index 3a8d2bc941fb..dbe470d19b29 100644
--- a/src/test/regress/expected/qp_misc_rio.out
+++ b/src/test/regress/expected/qp_misc_rio.out
@@ -957,10 +957,10 @@ SELECT func_multiline3_plpythonu();
 -- Test: 29
 -- ----------------------------------------------------------------------
 SELECT * FROM pg_pltemplate WHERE tmplname LIKE '%pljava%' ORDER BY tmplname;
- tmplname | tmpltrusted |     tmplhandler      | tmplinline | tmplvalidator |  tmpllibrary   | tmplacl 
-----------+-------------+----------------------+------------+---------------+----------------+---------
- pljava   | t           | pljava_call_handler  |            |               | $libdir/pljava | 
- pljavau  | f           | pljavau_call_handler |            |               | $libdir/pljava | 
+ tmplname | tmpltrusted | tmpldbacreate |     tmplhandler      | tmplinline | tmplvalidator |  tmpllibrary   | tmplacl 
+----------+-------------+---------------+----------------------+------------+---------------+----------------+---------
+ pljava   | t           | t             | pljava_call_handler  |            |               | $libdir/pljava | 
+ pljavau  | f           | f             | pljavau_call_handler |            |               | $libdir/pljava | 
 (2 rows)
 
 -- ----------------------------------------------------------------------
diff --git a/src/test/regress/expected/qp_query_execution.out b/src/test/regress/expected/qp_query_execution.out
index d08c547f3fd1..73453bfede20 100644
--- a/src/test/regress/expected/qp_query_execution.out
+++ b/src/test/regress/expected/qp_query_execution.out
@@ -175,7 +175,7 @@ insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from gener
 insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 10000) i;
 analyze foo_p;
 analyze bar;
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6;', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -364,7 +364,7 @@ select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k  where abbp.t
  186SN SN | 186
 (10 rows)
 
-select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -465,7 +465,7 @@ select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k where abbp.t i
  36 | 36SOME NUMBER SOME NUMBER
 (10 rows)
 
-select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k where abbp.t is not null and abbp.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k where abbp.t is not null and abbp.a = 6;', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -519,7 +519,7 @@ select foo_p.k, foo_p.t from foo_p left outer join bar on foo_p.k = bar.k  where
  6.00 | 6SOME NUMBER SOME NUMBER
 (10 rows)
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6.00;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6.00;', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -580,7 +580,7 @@ select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k  where abbp.t
  186SN SN | 186
 (10 rows)
 
-select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -648,7 +648,7 @@ select foo_p.k, foo_p.t from foo_p left outer join bar_p on foo_p.k = bar_p.k  w
  6 | 6SOME NUMBER SOME NUMBER
 (10 rows)
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k  where foo_p.t is not null and foo_p.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k  where foo_p.t is not null and foo_p.a = 6;', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -745,7 +745,7 @@ select  foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k a
  6 | 6SOME NUMBER SOME NUMBER
 (1 row)
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.a  where foo_p.t is not null and foo_p.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.a  where foo_p.t is not null and foo_p.a = 6;', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -785,7 +785,7 @@ insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from gener
 insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 10000) i;
 analyze foo_p;
 analyze bar;
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1];', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1];', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
@@ -807,7 +807,7 @@ select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where
 (10 rows)
 
 create function mytest(integer) returns integer as 'select $1/100' language sql;
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = mytest(100);', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = mytest(100);', 'Hash Left Join', 'Hash Left Join');
  qx_count_operator 
 -------------------
                  1
diff --git a/src/test/regress/expected/qp_targeted_dispatch.out b/src/test/regress/expected/qp_targeted_dispatch.out
index c5e6f692f065..2048b5a052cf 100644
--- a/src/test/regress/expected/qp_targeted_dispatch.out
+++ b/src/test/regress/expected/qp_targeted_dispatch.out
@@ -273,7 +273,7 @@ INFO:  Distributed transaction command 'Distributed Abort (No Prepared)' to ALL
 savepoint s;
 ERROR:  SAVEPOINT can only be used in transaction blocks
 abort;
-WARNING:  there is no transaction in progress
+NOTICE:  there is no transaction in progress
 --start_ignore
 Drop table key_value_table cascade;
 INFO:  Distributed transaction command 'Distributed Prepare' to ALL contents
diff --git a/src/test/regress/expected/qp_targeted_dispatch_optimizer.out b/src/test/regress/expected/qp_targeted_dispatch_optimizer.out
index f68b2c6c93da..880945a0c677 100644
--- a/src/test/regress/expected/qp_targeted_dispatch_optimizer.out
+++ b/src/test/regress/expected/qp_targeted_dispatch_optimizer.out
@@ -273,7 +273,7 @@ INFO:  Distributed transaction command 'Distributed Abort (No Prepared)' to ALL
 savepoint s;
 ERROR:  SAVEPOINT can only be used in transaction blocks
 abort;
-WARNING:  there is no transaction in progress
+NOTICE:  there is no transaction in progress
 --start_ignore
 Drop table key_value_table cascade;
 INFO:  Distributed transaction command 'Distributed Prepare' to ALL contents
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index 2c928c2c2d52..51228ceea5cc 100755
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -413,7 +413,7 @@ SELECT dup(22);
 (1 row)
 
 SELECT dup('xyz');	-- fails
-ERROR:  could not determine anyarray/anyelement type because input has type "unknown"
+ERROR:  could not determine polymorphic type because input has type "unknown"
 SELECT dup('xyz'::text);
         dup        
 -------------------
@@ -440,4 +440,46 @@ DROP FUNCTION dup(anyelement);
 CREATE FUNCTION bad (f1 int, out f2 anyelement, out f3 anyarray)
 AS 'select $1, array[$1,$1]' LANGUAGE sql;
 ERROR:  cannot determine result data type
-DETAIL:  A function returning "anyarray" or "anyelement" must have at least one argument of either type.
+DETAIL:  A function returning a polymorphic type must have at least one polymorphic argument.
+-- test case for a whole-row-variable bug
+create function foo1(n integer, out a text, out b text)
+  returns setof record
+  language sql
+  as $$ select 'foo ' || i, 'bar ' || i from generate_series(1,$1) i $$;
+set work_mem='64kB';
+WARNING:  "work_mem": setting is deprecated, and may be removed in a future release.
+select t.a, t, t.a from foo1(10000) t limit 1;
+   a   |         t         |   a   
+-------+-------------------+-------
+ foo 1 | ("foo 1","bar 1") | foo 1
+(1 row)
+
+reset work_mem;
+WARNING:  "work_mem": setting is deprecated, and may be removed in a future release.
+select t.a, t, t.a from foo1(10000) t limit 1;
+   a   |         t         |   a   
+-------+-------------------+-------
+ foo 1 | ("foo 1","bar 1") | foo 1
+(1 row)
+
+drop function foo1(n integer);
+-- check handling of a SQL function with multiple OUT params (bug #5777)
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2.1) $$ language sql;
+select * from foobar();
+ column1 | column2 
+---------+---------
+       1 |     2.1
+(1 row)
+
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2) $$ language sql;
+select * from foobar();  -- fail
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned type integer at ordinal position 2, but query expects numeric.
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2.1, 3) $$ language sql;
+select * from foobar();  -- fail
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned row contains 3 attributes, but query expects 2.
+drop function foobar();
diff --git a/src/test/regress/expected/rangefuncs_cdb.out b/src/test/regress/expected/rangefuncs_cdb.out
index 88fefd01695c..d8afb64e2e94 100644
--- a/src/test/regress/expected/rangefuncs_cdb.out
+++ b/src/test/regress/expected/rangefuncs_cdb.out
@@ -795,7 +795,7 @@ SELECT dup(22);
 (1 row)
 
 SELECT dup('xyz');	-- fails
-ERROR:  could not determine anyarray/anyelement type because input has type "unknown"
+ERROR:  could not determine polymorphic type because input has type "unknown"
 SELECT dup('xyz'::text);
         dup        
 -------------------
@@ -822,5 +822,5 @@ DROP FUNCTION dup(anyelement);
 CREATE FUNCTION bad (f1 int, out f2 anyelement, out f3 anyarray)
 AS 'select $1, array[$1,$1]' LANGUAGE sql;
 ERROR:  cannot determine result data type
-DETAIL:  A function returning "anyarray" or "anyelement" must have at least one argument of either type.
+DETAIL:  A function returning a polymorphic type must have at least one polymorphic argument.
 reset optimizer_segments;
\ No newline at end of file
diff --git a/src/test/regress/expected/rangefuncs_cdb_optimizer.out b/src/test/regress/expected/rangefuncs_cdb_optimizer.out
index 6841e91ba324..d965c3d40a08 100644
--- a/src/test/regress/expected/rangefuncs_cdb_optimizer.out
+++ b/src/test/regress/expected/rangefuncs_cdb_optimizer.out
@@ -795,7 +795,7 @@ SELECT dup(22);
 (1 row)
 
 SELECT dup('xyz');	-- fails
-ERROR:  could not determine anyarray/anyelement type because input has type "unknown"
+ERROR:  could not determine polymorphic type because input has type "unknown"
 SELECT dup('xyz'::text);
         dup        
 -------------------
@@ -822,5 +822,5 @@ DROP FUNCTION dup(anyelement);
 CREATE FUNCTION bad (f1 int, out f2 anyelement, out f3 anyarray)
 AS 'select $1, array[$1,$1]' LANGUAGE sql;
 ERROR:  cannot determine result data type
-DETAIL:  A function returning "anyarray" or "anyelement" must have at least one argument of either type.
+DETAIL:  A function returning a polymorphic type must have at least one polymorphic argument.
 reset optimizer_segments;
diff --git a/src/test/regress/expected/rangefuncs_optimizer.out b/src/test/regress/expected/rangefuncs_optimizer.out
index 036ad091bb69..be0d18bbe456 100644
--- a/src/test/regress/expected/rangefuncs_optimizer.out
+++ b/src/test/regress/expected/rangefuncs_optimizer.out
@@ -411,7 +411,7 @@ SELECT dup(22);
 (1 row)
 
 SELECT dup('xyz');	-- fails
-ERROR:  could not determine anyarray/anyelement type because input has type "unknown"
+ERROR:  could not determine polymorphic type because input has type "unknown"
 SELECT dup('xyz'::text);
         dup        
 -------------------
@@ -438,4 +438,46 @@ DROP FUNCTION dup(anyelement);
 CREATE FUNCTION bad (f1 int, out f2 anyelement, out f3 anyarray)
 AS 'select $1, array[$1,$1]' LANGUAGE sql;
 ERROR:  cannot determine result data type
-DETAIL:  A function returning "anyarray" or "anyelement" must have at least one argument of either type.
+DETAIL:  A function returning a polymorphic type must have at least one polymorphic argument.
+-- test case for a whole-row-variable bug
+create function foo1(n integer, out a text, out b text)
+  returns setof record
+  language sql
+  as $$ select 'foo ' || i, 'bar ' || i from generate_series(1,$1) i $$;
+set work_mem='64kB';
+WARNING:  "work_mem": setting is deprecated, and may be removed in a future release.
+select t.a, t, t.a from foo1(10000) t limit 1;
+   a   |         t         |   a   
+-------+-------------------+-------
+ foo 1 | ("foo 1","bar 1") | foo 1
+(1 row)
+
+reset work_mem;
+WARNING:  "work_mem": setting is deprecated, and may be removed in a future release.
+select t.a, t, t.a from foo1(10000) t limit 1;
+   a   |         t         |   a   
+-------+-------------------+-------
+ foo 1 | ("foo 1","bar 1") | foo 1
+(1 row)
+
+drop function foo1(n integer);
+-- check handling of a SQL function with multiple OUT params (bug #5777)
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2.1) $$ language sql;
+select * from foobar();
+ column1 | column2 
+---------+---------
+       1 |     2.1
+(1 row)
+
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2) $$ language sql;
+select * from foobar();  -- fail
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned type integer at ordinal position 2, but query expects numeric.
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2.1, 3) $$ language sql;
+select * from foobar();  -- fail
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned row contains 3 attributes, but query expects 2.
+drop function foobar();
diff --git a/src/test/regress/expected/rowtypes.out b/src/test/regress/expected/rowtypes.out
index 59e4aa4669e8..e7e7996ad5b1 100755
--- a/src/test/regress/expected/rowtypes.out
+++ b/src/test/regress/expected/rowtypes.out
@@ -252,10 +252,20 @@ order by thousand, tenthous;
       999 |     9999
 (25 rows)
 
--- empty row constructor is valid
+-- Check some corner cases involving empty rowtypes
 select ROW();
  row 
 -----
  ()
 (1 row)
 
+select ROW() IS NULL;
+ ?column? 
+----------
+ t
+(1 row)
+
+select ROW() = ROW();
+ERROR:  cannot compare rows of zero length
+LINE 1: select ROW() = ROW();
+                     ^
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 79c69a92b8dd..c3942241fd14 100755
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -1186,6 +1186,8 @@ drop rule foorule on foo;
 create rule foorule as on insert to foo where f1 < 100
 do instead insert into foo2 values (f1);
 ERROR:  column "f1" does not exist
+LINE 2: do instead insert into foo2 values (f1);
+                                            ^
 -- this is the correct way:
 create rule foorule as on insert to foo where f1 < 100
 do instead insert into foo2 values (new.f1);
@@ -1275,33 +1277,36 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem
          viewname         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               definition                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
 --------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  iexit                    | SELECT ih.name, ih.thepath, interpt_pp(ih.thepath, r.thepath) AS exit FROM ihighway ih, ramp r WHERE (ih.thepath ## r.thepath);
- pg_cursors               | SELECT c.name, c."statement", c.is_holdable, c.is_binary, c.is_scrollable, c.creation_time FROM pg_cursor() c(name text, "statement" text, is_holdable boolean, is_binary boolean, is_scrollable boolean, creation_time timestamp with time zone);
+ pg_cursors               | SELECT c.name, c.statement, c.is_holdable, c.is_binary, c.is_scrollable, c.creation_time FROM pg_cursor() c(name text, statement text, is_holdable boolean, is_binary boolean, is_scrollable boolean, creation_time timestamp with time zone);
  pg_group                 | SELECT pg_authid.rolname AS groname, pg_authid.oid AS grosysid, ARRAY(SELECT pg_auth_members.member FROM pg_auth_members WHERE (pg_auth_members.roleid = pg_authid.oid)) AS grolist FROM pg_authid WHERE (NOT pg_authid.rolcanlogin);
- pg_indexes               | SELECT n.nspname AS schemaname, c.relname AS tablename, i.relname AS indexname, t.spcname AS "tablespace", pg_get_indexdef(i.oid) AS indexdef FROM ((((pg_index x JOIN pg_class c ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_tablespace t ON ((t.oid = i.reltablespace))) WHERE ((c.relkind = 'r'::"char") AND (i.relkind = 'i'::"char"));
- pg_prepared_statements   | SELECT p.name, p."statement", p.prepare_time, p.parameter_types, p.from_sql FROM pg_prepared_statement() p(name text, "statement" text, prepare_time timestamp with time zone, parameter_types regtype[], from_sql boolean);
- pg_prepared_xacts        | SELECT p."transaction", p.gid, p."prepared", u.rolname AS "owner", d.datname AS "database" FROM ((pg_prepared_xact() p("transaction" xid, gid text, "prepared" timestamp with time zone, ownerid oid, dbid oid) LEFT JOIN pg_authid u ON ((p.ownerid = u.oid))) LEFT JOIN pg_database d ON ((p.dbid = d.oid)));
+ pg_indexes               | SELECT n.nspname AS schemaname, c.relname AS tablename, i.relname AS indexname, t.spcname AS tablespace, pg_get_indexdef(i.oid) AS indexdef FROM ((((pg_index x JOIN pg_class c ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_tablespace t ON ((t.oid = i.reltablespace))) WHERE ((c.relkind = 'r'::"char") AND (i.relkind = 'i'::"char"));
+ pg_locks                 | SELECT l.locktype, l.database, l.relation, l.page, l.tuple, l.virtualxid, l.transactionid, l.classid, l.objid, l.objsubid, l.virtualtransaction, l.pid, l.mode, l.granted FROM pg_lock_status() l(locktype text, database oid, relation oid, page integer, tuple smallint, virtualxid text, transactionid xid, classid oid, objid oid, objsubid smallint, virtualtransaction text, pid integer, mode text, granted boolean);
+ pg_prepared_statements   | SELECT p.name, p.statement, p.prepare_time, p.parameter_types, p.from_sql FROM pg_prepared_statement() p(name text, statement text, prepare_time timestamp with time zone, parameter_types regtype[], from_sql boolean);
+ pg_prepared_xacts        | SELECT p.transaction, p.gid, p.prepared, u.rolname AS owner, d.datname AS database FROM ((pg_prepared_xact() p(transaction xid, gid text, prepared timestamp with time zone, ownerid oid, dbid oid) LEFT JOIN pg_authid u ON ((p.ownerid = u.oid))) LEFT JOIN pg_database d ON ((p.dbid = d.oid)));
+ pg_roles                 | SELECT pg_authid.rolname, pg_authid.rolsuper, pg_authid.rolinherit, pg_authid.rolcreaterole, pg_authid.rolcreatedb, pg_authid.rolcatupdate, pg_authid.rolcanlogin, pg_authid.rolconnlimit, '********'::text AS rolpassword, pg_authid.rolvaliduntil, pg_authid.rolconfig, pg_authid.oid FROM pg_authid;
  pg_rules                 | SELECT n.nspname AS schemaname, c.relname AS tablename, r.rulename, pg_get_ruledef(r.oid) AS definition FROM ((pg_rewrite r JOIN pg_class c ON ((c.oid = r.ev_class))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (r.rulename <> '_RETURN'::name);
  pg_settings              | SELECT a.name, a.setting, a.unit, a.category, a.short_desc, a.extra_desc, a.context, a.vartype, a.source, a.min_val, a.max_val FROM pg_show_all_settings() a(name text, setting text, unit text, category text, short_desc text, extra_desc text, context text, vartype text, source text, min_val text, max_val text);
  pg_shadow                | SELECT pg_authid.rolname AS usename, pg_authid.oid AS usesysid, pg_authid.rolcreatedb AS usecreatedb, pg_authid.rolsuper AS usesuper, pg_authid.rolcatupdate AS usecatupd, pg_authid.rolpassword AS passwd, (pg_authid.rolvaliduntil)::abstime AS valuntil, pg_authid.rolconfig AS useconfig FROM pg_authid WHERE pg_authid.rolcanlogin;
- pg_stat_activity         | SELECT d.oid AS datid, d.datname, pg_stat_get_backend_pid(s.backendid) AS procpid, pg_stat_get_backend_userid(s.backendid) AS usesysid, u.rolname AS usename, pg_stat_get_backend_activity(s.backendid) AS current_query, pg_stat_get_backend_waiting(s.backendid) AS waiting, pg_stat_get_backend_txn_start(s.backendid) AS txn_start, pg_stat_get_backend_activity_start(s.backendid) AS query_start, pg_stat_get_backend_start(s.backendid) AS backend_start, pg_stat_get_backend_client_addr(s.backendid) AS client_addr, pg_stat_get_backend_client_port(s.backendid) AS client_port FROM pg_database d, (SELECT pg_stat_get_backend_idset() AS backendid) s, pg_authid u WHERE ((pg_stat_get_backend_dbid(s.backendid) = d.oid) AND (pg_stat_get_backend_userid(s.backendid) = u.oid));
+ pg_stat_activity         | SELECT d.oid AS datid, d.datname, pg_stat_get_backend_pid(s.backendid) AS procpid, pg_stat_get_backend_userid(s.backendid) AS usesysid, u.rolname AS usename, pg_stat_get_backend_activity(s.backendid) AS current_query, pg_stat_get_backend_waiting(s.backendid) AS waiting, pg_stat_get_backend_xact_start(s.backendid) AS xact_start, pg_stat_get_backend_activity_start(s.backendid) AS query_start, pg_stat_get_backend_start(s.backendid) AS backend_start, pg_stat_get_backend_client_addr(s.backendid) AS client_addr, pg_stat_get_backend_client_port(s.backendid) AS client_port FROM pg_database d, (SELECT pg_stat_get_backend_idset() AS backendid) s, pg_authid u WHERE ((pg_stat_get_backend_dbid(s.backendid) = d.oid) AND (pg_stat_get_backend_userid(s.backendid) = u.oid));
  pg_stat_all_indexes      | SELECT c.oid AS relid, i.oid AS indexrelid, n.nspname AS schemaname, c.relname, i.relname AS indexrelname, pg_stat_get_numscans(i.oid) AS idx_scan, pg_stat_get_tuples_returned(i.oid) AS idx_tup_read, pg_stat_get_tuples_fetched(i.oid) AS idx_tup_fetch FROM (((pg_class c JOIN pg_index x ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char"]));
- pg_stat_all_tables       | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, pg_stat_get_numscans(c.oid) AS seq_scan, pg_stat_get_tuples_returned(c.oid) AS seq_tup_read, (sum(pg_stat_get_numscans(i.indexrelid)))::bigint AS idx_scan, ((sum(pg_stat_get_tuples_fetched(i.indexrelid)))::bigint + pg_stat_get_tuples_fetched(c.oid)) AS idx_tup_fetch, pg_stat_get_tuples_inserted(c.oid) AS n_tup_ins, pg_stat_get_tuples_updated(c.oid) AS n_tup_upd, pg_stat_get_tuples_deleted(c.oid) AS n_tup_del, pg_stat_get_live_tuples(c.oid) AS n_live_tup, pg_stat_get_dead_tuples(c.oid) AS n_dead_tup, pg_stat_get_last_vacuum_time(c.oid) AS last_vacuum, pg_stat_get_last_autovacuum_time(c.oid) AS last_autovacuum, pg_stat_get_last_analyze_time(c.oid) AS last_analyze, pg_stat_get_last_autoanalyze_time(c.oid) AS last_autoanalyze FROM ((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char"])) GROUP BY c.oid, n.nspname, c.relname;
- pg_stat_database         | SELECT d.oid AS datid, d.datname, pg_stat_get_db_numbackends(d.oid) AS numbackends, pg_stat_get_db_xact_commit(d.oid) AS xact_commit, pg_stat_get_db_xact_rollback(d.oid) AS xact_rollback, (pg_stat_get_db_blocks_fetched(d.oid) - pg_stat_get_db_blocks_hit(d.oid)) AS blks_read, pg_stat_get_db_blocks_hit(d.oid) AS blks_hit FROM pg_database d;
- pg_stat_sys_indexes      | SELECT pg_stat_all_indexes.relid, pg_stat_all_indexes.indexrelid, pg_stat_all_indexes.schemaname, pg_stat_all_indexes.relname, pg_stat_all_indexes.indexrelname, pg_stat_all_indexes.idx_scan, pg_stat_all_indexes.idx_tup_read, pg_stat_all_indexes.idx_tup_fetch FROM pg_stat_all_indexes WHERE (pg_stat_all_indexes.schemaname = ANY (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_stat_sys_tables       | SELECT pg_stat_all_tables.relid, pg_stat_all_tables.schemaname, pg_stat_all_tables.relname, pg_stat_all_tables.seq_scan, pg_stat_all_tables.seq_tup_read, pg_stat_all_tables.idx_scan, pg_stat_all_tables.idx_tup_fetch, pg_stat_all_tables.n_tup_ins, pg_stat_all_tables.n_tup_upd, pg_stat_all_tables.n_tup_del, pg_stat_all_tables.last_vacuum, pg_stat_all_tables.last_autovacuum, pg_stat_all_tables.last_analyze, pg_stat_all_tables.last_autoanalyze FROM pg_stat_all_tables WHERE (pg_stat_all_tables.schemaname = ANY (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_stat_user_indexes     | SELECT pg_stat_all_indexes.relid, pg_stat_all_indexes.indexrelid, pg_stat_all_indexes.schemaname, pg_stat_all_indexes.relname, pg_stat_all_indexes.indexrelname, pg_stat_all_indexes.idx_scan, pg_stat_all_indexes.idx_tup_read, pg_stat_all_indexes.idx_tup_fetch FROM pg_stat_all_indexes WHERE (pg_stat_all_indexes.schemaname <> ALL (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_stat_user_tables      | SELECT pg_stat_all_tables.relid, pg_stat_all_tables.schemaname, pg_stat_all_tables.relname, pg_stat_all_tables.seq_scan, pg_stat_all_tables.seq_tup_read, pg_stat_all_tables.idx_scan, pg_stat_all_tables.idx_tup_fetch, pg_stat_all_tables.n_tup_ins, pg_stat_all_tables.n_tup_upd, pg_stat_all_tables.n_tup_del, pg_stat_all_tables.last_vacuum, pg_stat_all_tables.last_autovacuum, pg_stat_all_tables.last_analyze, pg_stat_all_tables.last_autoanalyze FROM pg_stat_all_tables WHERE (pg_stat_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
+ pg_stat_all_tables       | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, pg_stat_get_numscans(c.oid) AS seq_scan, pg_stat_get_tuples_returned(c.oid) AS seq_tup_read, (sum(pg_stat_get_numscans(i.indexrelid)))::bigint AS idx_scan, ((sum(pg_stat_get_tuples_fetched(i.indexrelid)))::bigint + pg_stat_get_tuples_fetched(c.oid)) AS idx_tup_fetch, pg_stat_get_tuples_inserted(c.oid) AS n_tup_ins, pg_stat_get_tuples_updated(c.oid) AS n_tup_upd, pg_stat_get_tuples_deleted(c.oid) AS n_tup_del, pg_stat_get_tuples_hot_updated(c.oid) AS n_tup_hot_upd, pg_stat_get_live_tuples(c.oid) AS n_live_tup, pg_stat_get_dead_tuples(c.oid) AS n_dead_tup, pg_stat_get_last_vacuum_time(c.oid) AS last_vacuum, pg_stat_get_last_autovacuum_time(c.oid) AS last_autovacuum, pg_stat_get_last_analyze_time(c.oid) AS last_analyze, pg_stat_get_last_autoanalyze_time(c.oid) AS last_autoanalyze FROM ((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char"])) GROUP BY c.oid, n.nspname, c.relname;
+ pg_stat_bgwriter         | SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed, pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req, pg_stat_get_bgwriter_buf_written_checkpoints() AS buffers_checkpoint, pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean, pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean, pg_stat_get_buf_written_backend() AS buffers_backend, pg_stat_get_buf_alloc() AS buffers_alloc;
+ pg_stat_database         | SELECT d.oid AS datid, d.datname, pg_stat_get_db_numbackends(d.oid) AS numbackends, pg_stat_get_db_xact_commit(d.oid) AS xact_commit, pg_stat_get_db_xact_rollback(d.oid) AS xact_rollback, (pg_stat_get_db_blocks_fetched(d.oid) - pg_stat_get_db_blocks_hit(d.oid)) AS blks_read, pg_stat_get_db_blocks_hit(d.oid) AS blks_hit, pg_stat_get_db_tuples_returned(d.oid) AS tup_returned, pg_stat_get_db_tuples_fetched(d.oid) AS tup_fetched, pg_stat_get_db_tuples_inserted(d.oid) AS tup_inserted, pg_stat_get_db_tuples_updated(d.oid) AS tup_updated, pg_stat_get_db_tuples_deleted(d.oid) AS tup_deleted FROM pg_database d;
+ pg_stat_sys_indexes      | SELECT pg_stat_all_indexes.relid, pg_stat_all_indexes.indexrelid, pg_stat_all_indexes.schemaname, pg_stat_all_indexes.relname, pg_stat_all_indexes.indexrelname, pg_stat_all_indexes.idx_scan, pg_stat_all_indexes.idx_tup_read, pg_stat_all_indexes.idx_tup_fetch FROM pg_stat_all_indexes WHERE ((pg_stat_all_indexes.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_stat_all_indexes.schemaname ~ '^pg_toast'::text));
+ pg_stat_sys_tables       | SELECT pg_stat_all_tables.relid, pg_stat_all_tables.schemaname, pg_stat_all_tables.relname, pg_stat_all_tables.seq_scan, pg_stat_all_tables.seq_tup_read, pg_stat_all_tables.idx_scan, pg_stat_all_tables.idx_tup_fetch, pg_stat_all_tables.n_tup_ins, pg_stat_all_tables.n_tup_upd, pg_stat_all_tables.n_tup_del, pg_stat_all_tables.n_tup_hot_upd, pg_stat_all_tables.n_live_tup, pg_stat_all_tables.n_dead_tup, pg_stat_all_tables.last_vacuum, pg_stat_all_tables.last_autovacuum, pg_stat_all_tables.last_analyze, pg_stat_all_tables.last_autoanalyze FROM pg_stat_all_tables WHERE ((pg_stat_all_tables.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_stat_all_tables.schemaname ~ '^pg_toast'::text));
+ pg_stat_user_indexes     | SELECT pg_stat_all_indexes.relid, pg_stat_all_indexes.indexrelid, pg_stat_all_indexes.schemaname, pg_stat_all_indexes.relname, pg_stat_all_indexes.indexrelname, pg_stat_all_indexes.idx_scan, pg_stat_all_indexes.idx_tup_read, pg_stat_all_indexes.idx_tup_fetch FROM pg_stat_all_indexes WHERE ((pg_stat_all_indexes.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_stat_all_indexes.schemaname !~ '^pg_toast'::text));
+ pg_stat_user_tables      | SELECT pg_stat_all_tables.relid, pg_stat_all_tables.schemaname, pg_stat_all_tables.relname, pg_stat_all_tables.seq_scan, pg_stat_all_tables.seq_tup_read, pg_stat_all_tables.idx_scan, pg_stat_all_tables.idx_tup_fetch, pg_stat_all_tables.n_tup_ins, pg_stat_all_tables.n_tup_upd, pg_stat_all_tables.n_tup_del, pg_stat_all_tables.n_tup_hot_upd, pg_stat_all_tables.n_live_tup, pg_stat_all_tables.n_dead_tup, pg_stat_all_tables.last_vacuum, pg_stat_all_tables.last_autovacuum, pg_stat_all_tables.last_analyze, pg_stat_all_tables.last_autoanalyze FROM pg_stat_all_tables WHERE ((pg_stat_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_stat_all_tables.schemaname !~ '^pg_toast'::text));
  pg_statio_all_indexes    | SELECT c.oid AS relid, i.oid AS indexrelid, n.nspname AS schemaname, c.relname, i.relname AS indexrelname, (pg_stat_get_blocks_fetched(i.oid) - pg_stat_get_blocks_hit(i.oid)) AS idx_blks_read, pg_stat_get_blocks_hit(i.oid) AS idx_blks_hit FROM (((pg_class c JOIN pg_index x ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char"]));
  pg_statio_all_sequences  | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, (pg_stat_get_blocks_fetched(c.oid) - pg_stat_get_blocks_hit(c.oid)) AS blks_read, pg_stat_get_blocks_hit(c.oid) AS blks_hit FROM (pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = 'S'::"char");
  pg_statio_all_tables     | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, (pg_stat_get_blocks_fetched(c.oid) - pg_stat_get_blocks_hit(c.oid)) AS heap_blks_read, pg_stat_get_blocks_hit(c.oid) AS heap_blks_hit, (sum((pg_stat_get_blocks_fetched(i.indexrelid) - pg_stat_get_blocks_hit(i.indexrelid))))::bigint AS idx_blks_read, (sum(pg_stat_get_blocks_hit(i.indexrelid)))::bigint AS idx_blks_hit, (pg_stat_get_blocks_fetched(t.oid) - pg_stat_get_blocks_hit(t.oid)) AS toast_blks_read, pg_stat_get_blocks_hit(t.oid) AS toast_blks_hit, (pg_stat_get_blocks_fetched(x.oid) - pg_stat_get_blocks_hit(x.oid)) AS tidx_blks_read, pg_stat_get_blocks_hit(x.oid) AS tidx_blks_hit FROM ((((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_class t ON ((c.reltoastrelid = t.oid))) LEFT JOIN pg_class x ON ((t.reltoastidxid = x.oid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char"])) GROUP BY c.oid, n.nspname, c.relname, t.oid, x.oid;
- pg_statio_sys_indexes    | SELECT pg_statio_all_indexes.relid, pg_statio_all_indexes.indexrelid, pg_statio_all_indexes.schemaname, pg_statio_all_indexes.relname, pg_statio_all_indexes.indexrelname, pg_statio_all_indexes.idx_blks_read, pg_statio_all_indexes.idx_blks_hit FROM pg_statio_all_indexes WHERE (pg_statio_all_indexes.schemaname = ANY (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_statio_sys_sequences  | SELECT pg_statio_all_sequences.relid, pg_statio_all_sequences.schemaname, pg_statio_all_sequences.relname, pg_statio_all_sequences.blks_read, pg_statio_all_sequences.blks_hit FROM pg_statio_all_sequences WHERE (pg_statio_all_sequences.schemaname = ANY (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_statio_sys_tables     | SELECT pg_statio_all_tables.relid, pg_statio_all_tables.schemaname, pg_statio_all_tables.relname, pg_statio_all_tables.heap_blks_read, pg_statio_all_tables.heap_blks_hit, pg_statio_all_tables.idx_blks_read, pg_statio_all_tables.idx_blks_hit, pg_statio_all_tables.toast_blks_read, pg_statio_all_tables.toast_blks_hit, pg_statio_all_tables.tidx_blks_read, pg_statio_all_tables.tidx_blks_hit FROM pg_statio_all_tables WHERE (pg_statio_all_tables.schemaname = ANY (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_statio_user_indexes   | SELECT pg_statio_all_indexes.relid, pg_statio_all_indexes.indexrelid, pg_statio_all_indexes.schemaname, pg_statio_all_indexes.relname, pg_statio_all_indexes.indexrelname, pg_statio_all_indexes.idx_blks_read, pg_statio_all_indexes.idx_blks_hit FROM pg_statio_all_indexes WHERE (pg_statio_all_indexes.schemaname <> ALL (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_statio_user_sequences | SELECT pg_statio_all_sequences.relid, pg_statio_all_sequences.schemaname, pg_statio_all_sequences.relname, pg_statio_all_sequences.blks_read, pg_statio_all_sequences.blks_hit FROM pg_statio_all_sequences WHERE (pg_statio_all_sequences.schemaname <> ALL (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
- pg_statio_user_tables    | SELECT pg_statio_all_tables.relid, pg_statio_all_tables.schemaname, pg_statio_all_tables.relname, pg_statio_all_tables.heap_blks_read, pg_statio_all_tables.heap_blks_hit, pg_statio_all_tables.idx_blks_read, pg_statio_all_tables.idx_blks_hit, pg_statio_all_tables.toast_blks_read, pg_statio_all_tables.toast_blks_hit, pg_statio_all_tables.tidx_blks_read, pg_statio_all_tables.tidx_blks_hit FROM pg_statio_all_tables WHERE (pg_statio_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'pg_toast'::name, 'information_schema'::name]));
+ pg_statio_sys_indexes    | SELECT pg_statio_all_indexes.relid, pg_statio_all_indexes.indexrelid, pg_statio_all_indexes.schemaname, pg_statio_all_indexes.relname, pg_statio_all_indexes.indexrelname, pg_statio_all_indexes.idx_blks_read, pg_statio_all_indexes.idx_blks_hit FROM pg_statio_all_indexes WHERE ((pg_statio_all_indexes.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_statio_all_indexes.schemaname ~ '^pg_toast'::text));
+ pg_statio_sys_sequences  | SELECT pg_statio_all_sequences.relid, pg_statio_all_sequences.schemaname, pg_statio_all_sequences.relname, pg_statio_all_sequences.blks_read, pg_statio_all_sequences.blks_hit FROM pg_statio_all_sequences WHERE ((pg_statio_all_sequences.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_statio_all_sequences.schemaname ~ '^pg_toast'::text));
+ pg_statio_sys_tables     | SELECT pg_statio_all_tables.relid, pg_statio_all_tables.schemaname, pg_statio_all_tables.relname, pg_statio_all_tables.heap_blks_read, pg_statio_all_tables.heap_blks_hit, pg_statio_all_tables.idx_blks_read, pg_statio_all_tables.idx_blks_hit, pg_statio_all_tables.toast_blks_read, pg_statio_all_tables.toast_blks_hit, pg_statio_all_tables.tidx_blks_read, pg_statio_all_tables.tidx_blks_hit FROM pg_statio_all_tables WHERE ((pg_statio_all_tables.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_statio_all_tables.schemaname ~ '^pg_toast'::text));
+ pg_statio_user_indexes   | SELECT pg_statio_all_indexes.relid, pg_statio_all_indexes.indexrelid, pg_statio_all_indexes.schemaname, pg_statio_all_indexes.relname, pg_statio_all_indexes.indexrelname, pg_statio_all_indexes.idx_blks_read, pg_statio_all_indexes.idx_blks_hit FROM pg_statio_all_indexes WHERE ((pg_statio_all_indexes.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_statio_all_indexes.schemaname !~ '^pg_toast'::text));
+ pg_statio_user_sequences | SELECT pg_statio_all_sequences.relid, pg_statio_all_sequences.schemaname, pg_statio_all_sequences.relname, pg_statio_all_sequences.blks_read, pg_statio_all_sequences.blks_hit FROM pg_statio_all_sequences WHERE ((pg_statio_all_sequences.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_statio_all_sequences.schemaname !~ '^pg_toast'::text));
+ pg_statio_user_tables    | SELECT pg_statio_all_tables.relid, pg_statio_all_tables.schemaname, pg_statio_all_tables.relname, pg_statio_all_tables.heap_blks_read, pg_statio_all_tables.heap_blks_hit, pg_statio_all_tables.idx_blks_read, pg_statio_all_tables.idx_blks_hit, pg_statio_all_tables.toast_blks_read, pg_statio_all_tables.toast_blks_hit, pg_statio_all_tables.tidx_blks_read, pg_statio_all_tables.tidx_blks_hit FROM pg_statio_all_tables WHERE ((pg_statio_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_statio_all_tables.schemaname !~ '^pg_toast'::text));
  pg_stats                 | SELECT n.nspname AS schemaname, c.relname AS tablename, a.attname, s.stanullfrac AS null_frac, s.stawidth AS avg_width, s.stadistinct AS n_distinct, CASE 1 WHEN s.stakind1 THEN s.stavalues1 WHEN s.stakind2 THEN s.stavalues2 WHEN s.stakind3 THEN s.stavalues3 WHEN s.stakind4 THEN s.stavalues4 ELSE NULL::anyarray END AS most_common_vals, CASE 1 WHEN s.stakind1 THEN s.stanumbers1 WHEN s.stakind2 THEN s.stanumbers2 WHEN s.stakind3 THEN s.stanumbers3 WHEN s.stakind4 THEN s.stanumbers4 ELSE NULL::real[] END AS most_common_freqs, CASE 2 WHEN s.stakind1 THEN s.stavalues1 WHEN s.stakind2 THEN s.stavalues2 WHEN s.stakind3 THEN s.stavalues3 WHEN s.stakind4 THEN s.stavalues4 ELSE NULL::anyarray END AS histogram_bounds, CASE 3 WHEN s.stakind1 THEN s.stanumbers1[1] WHEN s.stakind2 THEN s.stanumbers2[1] WHEN s.stakind3 THEN s.stanumbers3[1] WHEN s.stakind4 THEN s.stanumbers4[1] ELSE NULL::real END AS correlation FROM (((pg_statistic s JOIN pg_class c ON ((c.oid = s.starelid))) JOIN pg_attribute a ON (((c.oid = a.attrelid) AND (a.attnum = s.staattnum)))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE has_table_privilege(c.oid, 'select'::text);
- pg_tables                | SELECT n.nspname AS schemaname, c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, t.spcname AS "tablespace", c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.reltriggers > 0) AS hastriggers FROM ((pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_tablespace t ON ((t.oid = c.reltablespace))) WHERE (c.relkind = 'r'::"char");
+ pg_tables                | SELECT n.nspname AS schemaname, c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, t.spcname AS tablespace, c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.reltriggers > 0) AS hastriggers FROM ((pg_class c LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_tablespace t ON ((t.oid = c.reltablespace))) WHERE (c.relkind = 'r'::"char");
  pg_timezone_abbrevs      | SELECT pg_timezone_abbrevs.abbrev, pg_timezone_abbrevs.utc_offset, pg_timezone_abbrevs.is_dst FROM pg_timezone_abbrevs() pg_timezone_abbrevs(abbrev, utc_offset, is_dst);
  pg_timezone_names        | SELECT pg_timezone_names.name, pg_timezone_names.abbrev, pg_timezone_names.utc_offset, pg_timezone_names.is_dst FROM pg_timezone_names() pg_timezone_names(name, abbrev, utc_offset, is_dst);
  pg_user                  | SELECT pg_shadow.usename, pg_shadow.usesysid, pg_shadow.usecreatedb, pg_shadow.usesuper, pg_shadow.usecatupd, '********'::text AS passwd, pg_shadow.valuntil, pg_shadow.useconfig FROM pg_shadow;
@@ -1320,8 +1325,8 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem
  shoelace_candelete       | SELECT shoelace_obsolete.sl_name, shoelace_obsolete.sl_avail, shoelace_obsolete.sl_color, shoelace_obsolete.sl_len, shoelace_obsolete.sl_unit, shoelace_obsolete.sl_len_cm FROM shoelace_obsolete WHERE (shoelace_obsolete.sl_avail = 0);
  shoelace_obsolete        | SELECT shoelace.sl_name, shoelace.sl_avail, shoelace.sl_color, shoelace.sl_len, shoelace.sl_unit, shoelace.sl_len_cm FROM shoelace WHERE (NOT (EXISTS (SELECT shoe.shoename FROM shoe WHERE (shoe.slcolor = shoelace.sl_color))));
  street                   | SELECT r.name, r.thepath, c.cname FROM ONLY road r, real_city c WHERE (c.outline ## r.thepath);
- toyemp                   | SELECT emp.name, emp.age, emp."location", (12 * emp.salary) AS annualsal FROM emp;
-(47 rows)
+ toyemp                   | SELECT emp.name, emp.age, emp.location, (12 * emp.salary) AS annualsal FROM emp;
+(49 rows)
 
 SELECT tablename, rulename, definition FROM pg_rules 
 	ORDER BY tablename, rulename;
@@ -1329,9 +1334,9 @@ SELECT tablename, rulename, definition FROM pg_rules
 ---------------+-----------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  pg_settings   | pg_settings_n   | CREATE RULE pg_settings_n AS ON UPDATE TO pg_settings DO INSTEAD NOTHING;
  pg_settings   | pg_settings_u   | CREATE RULE pg_settings_u AS ON UPDATE TO pg_settings WHERE (new.name = old.name) DO SELECT set_config(old.name, new.setting, false) AS set_config;
- rtest_emp     | rtest_emp_del   | CREATE RULE rtest_emp_del AS ON DELETE TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (old.ename, "current_user"(), 'fired'::bpchar, '$0.00'::money, old.salary);
- rtest_emp     | rtest_emp_ins   | CREATE RULE rtest_emp_ins AS ON INSERT TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (new.ename, "current_user"(), 'hired'::bpchar, new.salary, '$0.00'::money);
- rtest_emp     | rtest_emp_upd   | CREATE RULE rtest_emp_upd AS ON UPDATE TO rtest_emp WHERE (new.salary <> old.salary) DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (new.ename, "current_user"(), 'honored'::bpchar, new.salary, old.salary);
+ rtest_emp     | rtest_emp_del   | CREATE RULE rtest_emp_del AS ON DELETE TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal) VALUES (old.ename, "current_user"(), 'fired'::bpchar, '$0.00'::money, old.salary);
+ rtest_emp     | rtest_emp_ins   | CREATE RULE rtest_emp_ins AS ON INSERT TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal) VALUES (new.ename, "current_user"(), 'hired'::bpchar, new.salary, '$0.00'::money);
+ rtest_emp     | rtest_emp_upd   | CREATE RULE rtest_emp_upd AS ON UPDATE TO rtest_emp WHERE (new.salary <> old.salary) DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal) VALUES (new.ename, "current_user"(), 'honored'::bpchar, new.salary, old.salary);
  rtest_nothn1  | rtest_nothn_r1  | CREATE RULE rtest_nothn_r1 AS ON INSERT TO rtest_nothn1 WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD NOTHING;
  rtest_nothn1  | rtest_nothn_r2  | CREATE RULE rtest_nothn_r2 AS ON INSERT TO rtest_nothn1 WHERE ((new.a >= 30) AND (new.a < 40)) DO INSTEAD NOTHING;
  rtest_nothn2  | rtest_nothn_r3  | CREATE RULE rtest_nothn_r3 AS ON INSERT TO rtest_nothn2 WHERE (new.a >= 100) DO INSTEAD INSERT INTO rtest_nothn3 (a, b) VALUES (new.a, new.b);
@@ -1436,6 +1441,28 @@ insert into rule_and_refint_t3 values (1, 13, 11, 'row8');
 ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "rule_and_refint_t3_id3a_fkey"
 DETAIL:  Key (id3a,id3b)=(1,13) is not present in table "rule_and_refint_t1".
 --
+-- test conversion of table to view (needed to load some pg_dump files)
+--
+create table fooview (x int, y text);
+select xmin, * from fooview;
+ xmin | x | y 
+------+---+---
+(0 rows)
+
+create rule "_RETURN" as on select to fooview do instead
+  select 1 as x, 'aaa'::text as y;
+select * from fooview;
+ x |  y  
+---+-----
+ 1 | aaa
+(1 row)
+
+select xmin, * from fooview;  -- fail, views don't have such a column
+ERROR:  column "xmin" does not exist
+LINE 1: select xmin, * from fooview;
+               ^
+drop view fooview;
+--
 -- check for planner problems with complex inherited UPDATES
 --
 create table id (id serial primary key, name text);
@@ -1487,3 +1514,61 @@ select * from id_ordered ORDER BY 1;
 
 set client_min_messages to warning; -- suppress cascade notices
 drop table id cascade;
+reset client_min_messages;
+--
+-- check corner case where an entirely-dummy subplan is created by
+-- constraint exclusion
+--
+create temp table t1 (a integer primary key);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "t1_pkey" for table "t1"
+create temp table t1_1 (check (a >= 0 and a < 10)) inherits (t1);
+create temp table t1_2 (check (a >= 10 and a < 20)) inherits (t1);
+create rule t1_ins_1 as on insert to t1 
+	where new.a >= 0 and new.a < 10
+	do instead
+	insert into t1_1 values (new.a);
+create rule t1_ins_2 as on insert to t1 
+	where new.a >= 10 and new.a < 20
+	do instead
+	insert into t1_2 values (new.a);
+create rule t1_upd_1 as on update to t1
+	where old.a >= 0 and old.a < 10
+	do instead
+	update t1_1 set a = new.a where a = old.a;
+create rule t1_upd_2 as on update to t1
+	where old.a >= 10 and old.a < 20
+	do instead
+	update t1_2 set a = new.a where a = old.a;
+set constraint_exclusion = on;
+insert into t1 select * from generate_series(5,19,1) g;
+update t1 set a = 4 where a = 5;
+select * from only t1;
+ a 
+---
+(0 rows)
+
+select * from only t1_1;
+ a 
+---
+ 6
+ 7
+ 8
+ 9
+ 4
+(5 rows)
+
+select * from only t1_2;
+ a  
+----
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 18
+ 19
+(10 rows)
+
diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index b5094ddfead5..cbc1268141db 100755
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -66,6 +66,8 @@ SELECT relname, relhasindex
  interval_tbl            | f
  iportaltest             | f
  lseg_tbl                | f
+ main_table              | f
+ money_data              | f
  num_data                | f
  num_exp_add             | t
  num_exp_div             | t
@@ -100,6 +102,7 @@ SELECT relname, relhasindex
  pg_exttable             | t
  pg_foreign_data_wrapper | t
  pg_foreign_server       | t
+ pg_enum                 | t
  pg_index                | t
  pg_inherits             | t
  pg_language             | t
@@ -117,6 +120,11 @@ SELECT relname, relhasindex
  pg_statistic            | t
  pg_tablespace           | t
  pg_trigger              | t
+ pg_ts_config            | t
+ pg_ts_config_map        | t
+ pg_ts_dict              | t
+ pg_ts_parser            | t
+ pg_ts_template          | t
  pg_type                 | t
  pg_user_mapping         | t
  pg_window               | t
@@ -139,6 +147,7 @@ SELECT relname, relhasindex
  student                 | f
  tenk1                   | t
  tenk2                   | t
+ test_tsvector           | f
  text_tbl                | f
  time_tbl                | f
  timestamp_tbl           | f
@@ -146,7 +155,7 @@ SELECT relname, relhasindex
  timetz_tbl              | f
  tinterval_tbl           | f
  varchar_tbl             | f
-(133 rows)
+(139 rows)
 
 --
 -- another sanity check: every system catalog that has OIDs should have
diff --git a/src/test/regress/expected/select.out b/src/test/regress/expected/select.out
index 62606dcc3185..41356b8e73b8 100755
--- a/src/test/regress/expected/select.out
+++ b/src/test/regress/expected/select.out
@@ -209,9 +209,13 @@ SELECT onek.unique1, onek.string4 FROM onek
 -- test partial btree indexes
 --
 -- As of 7.2, planner probably won't pick an indexscan without stats,
--- so ANALYZE first.
+-- so ANALYZE first.  Also, we want to prevent it from picking a bitmapscan
+-- followed by sort, because that could hide index ordering problems.
 --
 ANALYZE onek2;
+SET enable_seqscan TO off;
+SET enable_bitmapscan TO off;
+SET enable_sort TO off;
 --
 -- awk '{if($1<10){print $0;}else{next;}}' onek.data | sort +0n -1
 --
@@ -288,6 +292,9 @@ SELECT onek2.unique1, onek2.stringu1 FROM onek2
      999 | LMAAAA
 (19 rows)
 
+RESET enable_seqscan;
+RESET enable_bitmapscan;
+RESET enable_sort;
 SELECT two, stringu1, ten, string4
    INTO TABLE tmp
    FROM onek;
@@ -763,6 +770,22 @@ select sillysrf(-1) order by 1;
 (4 rows)
 
 drop function sillysrf(int);
+-- X = X isn't a no-op, it's effectively X IS NOT NULL assuming = is strict
+-- (see bug #5084)
+select * from (values (2),(null),(1)) v(k) where k = k order by k;
+ k 
+---
+ 1
+ 2
+(2 rows)
+
+select * from (values (2),(null),(1)) v(k) where k = k;
+ k 
+---
+ 2
+ 1
+(2 rows)
+
 -- Test unsupported sorting operators
 CREATE TABLE nosort (i int);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
diff --git a/src/test/regress/expected/select_1.out b/src/test/regress/expected/select_1.out
new file mode 100644
index 000000000000..73198aa93902
--- /dev/null
+++ b/src/test/regress/expected/select_1.out
@@ -0,0 +1,770 @@
+--
+-- SELECT
+--
+-- btree index
+-- awk '{if($1<10){print;}else{next;}}' onek.data | sort +0n -1
+--
+SELECT * FROM onek
+   WHERE onek.unique1 < 10
+   ORDER BY onek.unique1;
+ unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
+---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
+       0 |     998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | KMBAAA   | OOOOxx
+       1 |     214 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | GIAAAA   | OOOOxx
+       2 |     326 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | OMAAAA   | OOOOxx
+       3 |     431 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | PQAAAA   | VVVVxx
+       4 |     833 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | BGBAAA   | HHHHxx
+       5 |     541 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | VUAAAA   | HHHHxx
+       6 |     978 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | QLBAAA   | OOOOxx
+       7 |     647 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | XYAAAA   | VVVVxx
+       8 |     653 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | DZAAAA   | HHHHxx
+       9 |      49 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | XBAAAA   | HHHHxx
+(10 rows)
+
+--
+-- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1
+--
+SELECT onek.unique1, onek.stringu1 FROM onek
+   WHERE onek.unique1 < 20 
+   ORDER BY unique1 using >;
+ unique1 | stringu1 
+---------+----------
+      19 | TAAAAA
+      18 | SAAAAA
+      17 | RAAAAA
+      16 | QAAAAA
+      15 | PAAAAA
+      14 | OAAAAA
+      13 | NAAAAA
+      12 | MAAAAA
+      11 | LAAAAA
+      10 | KAAAAA
+       9 | JAAAAA
+       8 | IAAAAA
+       7 | HAAAAA
+       6 | GAAAAA
+       5 | FAAAAA
+       4 | EAAAAA
+       3 | DAAAAA
+       2 | CAAAAA
+       1 | BAAAAA
+       0 | AAAAAA
+(20 rows)
+
+--
+-- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2
+--
+SELECT onek.unique1, onek.stringu1 FROM onek
+   WHERE onek.unique1 > 980 
+   ORDER BY stringu1 using <;
+ unique1 | stringu1 
+---------+----------
+     988 | AMAAAA
+     989 | BMAAAA
+     990 | CMAAAA
+     991 | DMAAAA
+     992 | EMAAAA
+     993 | FMAAAA
+     994 | GMAAAA
+     995 | HMAAAA
+     996 | IMAAAA
+     997 | JMAAAA
+     998 | KMAAAA
+     999 | LMAAAA
+     981 | TLAAAA
+     982 | ULAAAA
+     983 | VLAAAA
+     984 | WLAAAA
+     985 | XLAAAA
+     986 | YLAAAA
+     987 | ZLAAAA
+(19 rows)
+
+	
+--
+-- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data |
+-- sort +1d -2 +0nr -1
+--
+SELECT onek.unique1, onek.string4 FROM onek
+   WHERE onek.unique1 > 980 
+   ORDER BY string4 using <, unique1 using >;
+ unique1 | string4 
+---------+---------
+     999 | AAAAxx
+     995 | AAAAxx
+     983 | AAAAxx
+     982 | AAAAxx
+     981 | AAAAxx
+     998 | HHHHxx
+     997 | HHHHxx
+     993 | HHHHxx
+     990 | HHHHxx
+     986 | HHHHxx
+     996 | OOOOxx
+     991 | OOOOxx
+     988 | OOOOxx
+     987 | OOOOxx
+     985 | OOOOxx
+     994 | VVVVxx
+     992 | VVVVxx
+     989 | VVVVxx
+     984 | VVVVxx
+(19 rows)
+
+	
+--
+-- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data |
+-- sort +1dr -2 +0n -1
+--
+SELECT onek.unique1, onek.string4 FROM onek
+   WHERE onek.unique1 > 980
+   ORDER BY string4 using >, unique1 using <;
+ unique1 | string4 
+---------+---------
+     984 | VVVVxx
+     989 | VVVVxx
+     992 | VVVVxx
+     994 | VVVVxx
+     985 | OOOOxx
+     987 | OOOOxx
+     988 | OOOOxx
+     991 | OOOOxx
+     996 | OOOOxx
+     986 | HHHHxx
+     990 | HHHHxx
+     993 | HHHHxx
+     997 | HHHHxx
+     998 | HHHHxx
+     981 | AAAAxx
+     982 | AAAAxx
+     983 | AAAAxx
+     995 | AAAAxx
+     999 | AAAAxx
+(19 rows)
+
+	
+--
+-- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data |
+-- sort +0nr -1 +1d -2
+--
+SELECT onek.unique1, onek.string4 FROM onek
+   WHERE onek.unique1 < 20
+   ORDER BY unique1 using >, string4 using <;
+ unique1 | string4 
+---------+---------
+      19 | OOOOxx
+      18 | VVVVxx
+      17 | HHHHxx
+      16 | OOOOxx
+      15 | VVVVxx
+      14 | AAAAxx
+      13 | OOOOxx
+      12 | AAAAxx
+      11 | OOOOxx
+      10 | AAAAxx
+       9 | HHHHxx
+       8 | HHHHxx
+       7 | VVVVxx
+       6 | OOOOxx
+       5 | HHHHxx
+       4 | HHHHxx
+       3 | VVVVxx
+       2 | OOOOxx
+       1 | OOOOxx
+       0 | OOOOxx
+(20 rows)
+
+--
+-- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data |
+-- sort +0n -1 +1dr -2
+--
+SELECT onek.unique1, onek.string4 FROM onek
+   WHERE onek.unique1 < 20 
+   ORDER BY unique1 using <, string4 using >;
+ unique1 | string4 
+---------+---------
+       0 | OOOOxx
+       1 | OOOOxx
+       2 | OOOOxx
+       3 | VVVVxx
+       4 | HHHHxx
+       5 | HHHHxx
+       6 | OOOOxx
+       7 | VVVVxx
+       8 | HHHHxx
+       9 | HHHHxx
+      10 | AAAAxx
+      11 | OOOOxx
+      12 | AAAAxx
+      13 | OOOOxx
+      14 | AAAAxx
+      15 | VVVVxx
+      16 | OOOOxx
+      17 | HHHHxx
+      18 | VVVVxx
+      19 | OOOOxx
+(20 rows)
+
+--
+-- test partial btree indexes
+--
+-- As of 7.2, planner probably won't pick an indexscan without stats,
+-- so ANALYZE first.  Also, we want to prevent it from picking a bitmapscan
+-- followed by sort, because that could hide index ordering problems.
+--
+ANALYZE onek2;
+SET enable_seqscan TO off;
+SET enable_bitmapscan TO off;
+SET enable_sort TO off;
+--
+-- awk '{if($1<10){print $0;}else{next;}}' onek.data | sort +0n -1
+--
+SELECT onek2.* FROM onek2 WHERE onek2.unique1 < 10;
+ unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
+---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
+       0 |     998 |   0 |    0 |   0 |      0 |       0 |        0 |           0 |         0 |        0 |   0 |    1 | AAAAAA   | KMBAAA   | OOOOxx
+       1 |     214 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | GIAAAA   | OOOOxx
+       2 |     326 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | OMAAAA   | OOOOxx
+       3 |     431 |   1 |    3 |   3 |      3 |       3 |        3 |           3 |         3 |        3 |   6 |    7 | DAAAAA   | PQAAAA   | VVVVxx
+       4 |     833 |   0 |    0 |   4 |      4 |       4 |        4 |           4 |         4 |        4 |   8 |    9 | EAAAAA   | BGBAAA   | HHHHxx
+       5 |     541 |   1 |    1 |   5 |      5 |       5 |        5 |           5 |         5 |        5 |  10 |   11 | FAAAAA   | VUAAAA   | HHHHxx
+       6 |     978 |   0 |    2 |   6 |      6 |       6 |        6 |           6 |         6 |        6 |  12 |   13 | GAAAAA   | QLBAAA   | OOOOxx
+       7 |     647 |   1 |    3 |   7 |      7 |       7 |        7 |           7 |         7 |        7 |  14 |   15 | HAAAAA   | XYAAAA   | VVVVxx
+       8 |     653 |   0 |    0 |   8 |      8 |       8 |        8 |           8 |         8 |        8 |  16 |   17 | IAAAAA   | DZAAAA   | HHHHxx
+       9 |      49 |   1 |    1 |   9 |      9 |       9 |        9 |           9 |         9 |        9 |  18 |   19 | JAAAAA   | XBAAAA   | HHHHxx
+(10 rows)
+
+--
+-- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1
+--
+SELECT onek2.unique1, onek2.stringu1 FROM onek2
+    WHERE onek2.unique1 < 20 
+    ORDER BY unique1 using >;
+ unique1 | stringu1 
+---------+----------
+      19 | TAAAAA
+      18 | SAAAAA
+      17 | RAAAAA
+      16 | QAAAAA
+      15 | PAAAAA
+      14 | OAAAAA
+      13 | NAAAAA
+      12 | MAAAAA
+      11 | LAAAAA
+      10 | KAAAAA
+       9 | JAAAAA
+       8 | IAAAAA
+       7 | HAAAAA
+       6 | GAAAAA
+       5 | FAAAAA
+       4 | EAAAAA
+       3 | DAAAAA
+       2 | CAAAAA
+       1 | BAAAAA
+       0 | AAAAAA
+(20 rows)
+
+--
+-- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2
+--
+SELECT onek2.unique1, onek2.stringu1 FROM onek2
+   WHERE onek2.unique1 > 980;
+ unique1 | stringu1 
+---------+----------
+     981 | TLAAAA
+     982 | ULAAAA
+     983 | VLAAAA
+     984 | WLAAAA
+     985 | XLAAAA
+     986 | YLAAAA
+     987 | ZLAAAA
+     988 | AMAAAA
+     989 | BMAAAA
+     990 | CMAAAA
+     991 | DMAAAA
+     992 | EMAAAA
+     993 | FMAAAA
+     994 | GMAAAA
+     995 | HMAAAA
+     996 | IMAAAA
+     997 | JMAAAA
+     998 | KMAAAA
+     999 | LMAAAA
+(19 rows)
+
+RESET enable_seqscan;
+RESET enable_bitmapscan;
+RESET enable_sort;
+SELECT two, stringu1, ten, string4
+   INTO TABLE tmp
+   FROM onek;
+--
+-- awk '{print $1,$2;}' person.data |
+-- awk '{if(NF!=2){print $3,$2;}else{print;}}' - emp.data |
+-- awk '{if(NF!=2){print $3,$2;}else{print;}}' - student.data |
+-- awk 'BEGIN{FS="      ";}{if(NF!=2){print $4,$5;}else{print;}}' - stud_emp.data
+--
+-- SELECT name, age FROM person*; ??? check if different
+SELECT p.name, p.age FROM person* p;
+  name   | age 
+---------+-----
+ mike    |  40
+ joe     |  20
+ sally   |  34
+ sandra  |  19
+ alex    |  30
+ sue     |  50
+ denise  |  24
+ sarah   |  88
+ teresa  |  38
+ nan     |  28
+ leah    |  68
+ wendy   |  78
+ melissa |  28
+ joan    |  18
+ mary    |   8
+ jane    |  58
+ liza    |  38
+ jean    |  28
+ jenifer |  38
+ juanita |  58
+ susan   |  78
+ zena    |  98
+ martie  |  88
+ chris   |  78
+ pat     |  18
+ zola    |  58
+ louise  |  98
+ edna    |  18
+ bertha  |  88
+ sumi    |  38
+ koko    |  88
+ gina    |  18
+ rean    |  48
+ sharon  |  78
+ paula   |  68
+ julie   |  68
+ belinda |  38
+ karen   |  48
+ carina  |  58
+ diane   |  18
+ esther  |  98
+ trudy   |  88
+ fanny   |   8
+ carmen  |  78
+ lita    |  25
+ pamela  |  48
+ sandy   |  38
+ trisha  |  88
+ vera    |  78
+ velma   |  68
+ sharon  |  25
+ sam     |  30
+ bill    |  20
+ fred    |  28
+ larry   |  60
+ jeff    |  23
+ cim     |  30
+ linda   |  19
+(58 rows)
+
+--
+-- awk '{print $1,$2;}' person.data |
+-- awk '{if(NF!=2){print $3,$2;}else{print;}}' - emp.data |
+-- awk '{if(NF!=2){print $3,$2;}else{print;}}' - student.data |
+-- awk 'BEGIN{FS="      ";}{if(NF!=1){print $4,$5;}else{print;}}' - stud_emp.data |
+-- sort +1nr -2
+--
+SELECT p.name, p.age FROM person* p ORDER BY age using >, name;
+  name   | age 
+---------+-----
+ esther  |  98
+ louise  |  98
+ zena    |  98
+ bertha  |  88
+ koko    |  88
+ martie  |  88
+ sarah   |  88
+ trisha  |  88
+ trudy   |  88
+ carmen  |  78
+ chris   |  78
+ sharon  |  78
+ susan   |  78
+ wendy   |  78
+ vera    |  78
+ julie   |  68
+ leah    |  68
+ paula   |  68
+ velma   |  68
+ larry   |  60
+ carina  |  58
+ jane    |  58
+ juanita |  58
+ zola    |  58
+ sue     |  50
+ karen   |  48
+ pamela  |  48
+ rean    |  48
+ mike    |  40
+ belinda |  38
+ jenifer |  38
+ liza    |  38
+ sandy   |  38
+ sumi    |  38
+ teresa  |  38
+ sally   |  34
+ alex    |  30
+ cim     |  30
+ sam     |  30
+ fred    |  28
+ jean    |  28
+ melissa |  28
+ nan     |  28
+ lita    |  25
+ sharon  |  25
+ denise  |  24
+ jeff    |  23
+ bill    |  20
+ joe     |  20
+ linda   |  19
+ sandra  |  19
+ diane   |  18
+ edna    |  18
+ gina    |  18
+ joan    |  18
+ pat     |  18
+ fanny   |   8
+ mary    |   8
+(58 rows)
+
+--
+-- Test some cases involving whole-row Var referencing a subquery
+--
+select foo from (select 1) as foo;
+ foo 
+-----
+ (1)
+(1 row)
+
+select foo from (select null) as foo;
+ foo 
+-----
+ ()
+(1 row)
+
+select foo from (select 'xyzzy',1,null) as foo;
+    foo     
+------------
+ (xyzzy,1,)
+(1 row)
+
+--
+-- Test VALUES lists
+--
+select * from onek, (values(147, 'RFAAAA'), (931, 'VJAAAA')) as v (i, j)
+    WHERE onek.unique1 = v.i and onek.stringu1 = v.j;
+ unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 |  i  |   j    
+---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------+-----+--------
+     147 |       0 |   1 |    3 |   7 |      7 |       7 |       47 |         147 |       147 |      147 |  14 |   15 | RFAAAA   | AAAAAA   | AAAAxx  | 147 | RFAAAA
+     931 |       1 |   1 |    3 |   1 |     11 |       1 |       31 |         131 |       431 |      931 |   2 |    3 | VJAAAA   | BAAAAA   | HHHHxx  | 931 | VJAAAA
+(2 rows)
+
+-- a more complex case
+-- looks like we're coding lisp :-)
+select * from onek,
+  (values ((select i from
+    (values(10000), (2), (389), (1000), (2000), ((select 10029))) as foo(i)
+    order by i asc limit 1))) bar (i)
+  where onek.unique1 = bar.i;
+ unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 | i 
+---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------+---
+       2 |     326 |   0 |    2 |   2 |      2 |       2 |        2 |           2 |         2 |        2 |   4 |    5 | CAAAAA   | OMAAAA   | OOOOxx  | 2
+(1 row)
+
+-- try VALUES in a subquery
+select * from onek
+    where (unique1,ten) in (values (1,1), (20,0), (99,9), (17,99))
+    order by unique1;
+ unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
+---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
+       1 |     214 |   1 |    1 |   1 |      1 |       1 |        1 |           1 |         1 |        1 |   2 |    3 | BAAAAA   | GIAAAA   | OOOOxx
+      20 |     306 |   0 |    0 |   0 |      0 |       0 |       20 |          20 |        20 |       20 |   0 |    1 | UAAAAA   | ULAAAA   | OOOOxx
+      99 |     101 |   1 |    3 |   9 |     19 |       9 |       99 |          99 |        99 |       99 |  18 |   19 | VDAAAA   | XDAAAA   | HHHHxx
+(3 rows)
+
+-- VALUES is also legal as a standalone query or a set-operation member
+VALUES (1,2), (3,4+4), (7,77.7);
+ column1 | column2 
+---------+---------
+       1 |       2
+       3 |       8
+       7 |    77.7
+(3 rows)
+
+VALUES (1,2), (3,4+4), (7,77.7)
+UNION ALL
+SELECT 2+2, 57
+UNION ALL
+SELECT * FROM int8_tbl;
+     column1      |      column2      
+------------------+-------------------
+                1 |                 2
+                3 |                 8
+                7 |              77.7
+                4 |                57
+              123 |               456
+              123 |  4567890123456789
+ 4567890123456789 |               123
+ 4567890123456789 |  4567890123456789
+ 4567890123456789 | -4567890123456789
+(9 rows)
+
+--
+-- Test ORDER BY options
+--
+CREATE TEMP TABLE foo (f1 int);
+INSERT INTO foo VALUES (42),(3),(10),(7),(null),(null),(1);
+SELECT * FROM foo ORDER BY f1;
+ f1 
+----
+  1
+  3
+  7
+ 10
+ 42
+   
+   
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 ASC;	-- same thing
+ f1 
+----
+  1
+  3
+  7
+ 10
+ 42
+   
+   
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 NULLS FIRST;
+ f1 
+----
+   
+   
+  1
+  3
+  7
+ 10
+ 42
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC;
+ f1 
+----
+   
+   
+ 42
+ 10
+  7
+  3
+  1
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC NULLS LAST;
+ f1 
+----
+ 42
+ 10
+  7
+  3
+  1
+   
+   
+(7 rows)
+
+-- check if indexscans do the right things
+CREATE INDEX fooi ON foo (f1);
+SET enable_sort = false;
+SELECT * FROM foo ORDER BY f1;
+ f1 
+----
+  1
+  3
+  7
+ 10
+ 42
+   
+   
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 NULLS FIRST;
+ f1 
+----
+   
+   
+  1
+  3
+  7
+ 10
+ 42
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC;
+ f1 
+----
+   
+   
+ 42
+ 10
+  7
+  3
+  1
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC NULLS LAST;
+ f1 
+----
+ 42
+ 10
+  7
+  3
+  1
+   
+   
+(7 rows)
+
+DROP INDEX fooi;
+CREATE INDEX fooi ON foo (f1 DESC);
+SELECT * FROM foo ORDER BY f1;
+ f1 
+----
+  1
+  3
+  7
+ 10
+ 42
+   
+   
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 NULLS FIRST;
+ f1 
+----
+   
+   
+  1
+  3
+  7
+ 10
+ 42
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC;
+ f1 
+----
+   
+   
+ 42
+ 10
+  7
+  3
+  1
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC NULLS LAST;
+ f1 
+----
+ 42
+ 10
+  7
+  3
+  1
+   
+   
+(7 rows)
+
+DROP INDEX fooi;
+CREATE INDEX fooi ON foo (f1 DESC NULLS LAST);
+SELECT * FROM foo ORDER BY f1;
+ f1 
+----
+  1
+  3
+  7
+ 10
+ 42
+   
+   
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 NULLS FIRST;
+ f1 
+----
+   
+   
+  1
+  3
+  7
+ 10
+ 42
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC;
+ f1 
+----
+   
+   
+ 42
+ 10
+  7
+  3
+  1
+(7 rows)
+
+SELECT * FROM foo ORDER BY f1 DESC NULLS LAST;
+ f1 
+----
+ 42
+ 10
+  7
+  3
+  1
+   
+   
+(7 rows)
+
+--
+-- Test some corner cases that have been known to confuse the planner
+--
+-- ORDER BY on a constant doesn't really need any sorting
+SELECT 1 AS x ORDER BY x;
+ x 
+---
+ 1
+(1 row)
+
+-- But ORDER BY on a set-valued expression does
+create function sillysrf(int) returns setof int as
+  'values (1),(10),(2),($1)' language sql immutable;
+select sillysrf(42);
+ sillysrf 
+----------
+        1
+       10
+        2
+       42
+(4 rows)
+
+select sillysrf(-1) order by 1;
+ sillysrf 
+----------
+       -1
+        1
+        2
+       10
+(4 rows)
+
+drop function sillysrf(int);
diff --git a/src/test/regress/expected/sequence.out b/src/test/regress/expected/sequence.out
index 72bd1559e535..c5619682837b 100755
--- a/src/test/regress/expected/sequence.out
+++ b/src/test/regress/expected/sequence.out
@@ -91,7 +91,7 @@ ALTER TABLE foo_seq RENAME TO foo_seq_new;
 SELECT * FROM foo_seq_new;
  sequence_name | last_value | increment_by |      max_value      | min_value | cache_value | log_cnt | is_cycled | is_called 
 ---------------+------------+--------------+---------------------+-----------+-------------+---------+-----------+-----------
- foo_seq       |          1 |            1 | 9223372036854775807 |         1 |           1 |       1 | f         | f
+ foo_seq       |          1 |            1 | 9223372036854775807 |         1 |           1 |       0 | f         | f
 (1 row)
 
 DROP SEQUENCE foo_seq_new;
diff --git a/src/test/regress/expected/sequence_optimizer.out b/src/test/regress/expected/sequence_optimizer.out
index 2664415608f9..6ca46b2beadc 100644
--- a/src/test/regress/expected/sequence_optimizer.out
+++ b/src/test/regress/expected/sequence_optimizer.out
@@ -92,7 +92,7 @@ ALTER TABLE foo_seq RENAME TO foo_seq_new;
 SELECT * FROM foo_seq_new;
  sequence_name | last_value | increment_by |      max_value      | min_value | cache_value | log_cnt | is_cycled | is_called 
 ---------------+------------+--------------+---------------------+-----------+-------------+---------+-----------+-----------
- foo_seq       |          1 |            1 | 9223372036854775807 |         1 |           1 |       1 | f         | f
+ foo_seq       |          1 |            1 | 9223372036854775807 |         1 |           1 |       0 | f         | f
 (1 row)
 
 DROP SEQUENCE foo_seq_new;
diff --git a/src/test/regress/expected/sirv_functions.out b/src/test/regress/expected/sirv_functions.out
index e98e57a912ae..fe4d81ab60b9 100644
--- a/src/test/regress/expected/sirv_functions.out
+++ b/src/test/regress/expected/sirv_functions.out
@@ -198,7 +198,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -259,7 +259,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -461,7 +461,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -658,7 +658,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -882,7 +882,7 @@ BEGIN
   EXECUTE 'SELECT max(lang_count - ' || min_languages || '), max(area - ' || min_area || '), max(gnp - ' || min_gnp || ') FROM countries_results' into lang_delta,area_delta,gnp_delta;
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -925,7 +925,7 @@ create table sirv_test7_result2 as select * from sirv_test7_fun3(sirv_test7_fun2
 ERROR:  function cannot execute on segment because it issues a non-SELECT statement (functions.c:135)  (entry db pbld2:12010 pid=29278) (cdbdisp.c:1324)
 DETAIL:  
 SQL statement "CREATE  TABLE countries_results (country_code text, country_name text, lang_count int, area float, gnp float) distributed by (country_code)"
-PL/pgSQL function "sirv_test7_fun3" line 7 at execute statement
+PL/pgSQL function "sirv_test7_fun3" line 7 at EXECUTE statement
 select * from sirv_test7_result2;
 ERROR:  relation "sirv_test7_result2" does not exist
 LINE 1: select * from sirv_test7_result2;
@@ -1053,7 +1053,7 @@ BEGIN
   EXECUTE 'SELECT max(lang_count - ' || min_languages || '), max(area - ' || min_area || '), max(gnp - ' || min_gnp || ') FROM countries_results' into lang_delta,area_delta,gnp_delta;
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -1097,7 +1097,7 @@ insert into sirv_test8_result2 select * from sirv_test8_fun3(sirv_test8_fun2(2,1
 ERROR:  function cannot execute on segment because it issues a non-SELECT statement (functions.c:135)  (entry db pbld2:12010 pid=29278) (cdbdisp.c:1324)
 DETAIL:  
 SQL statement "CREATE  TABLE countries_results (country_code text, country_name text, lang_count int, area float, gnp float) distributed by (country_code)"
-PL/pgSQL function "sirv_test8_fun3" line 7 at execute statement
+PL/pgSQL function "sirv_test8_fun3" line 7 at EXECUTE statement
 select * from sirv_test8_result2 order by field2;
  field1 | field2 
 --------+--------
@@ -1308,12 +1308,12 @@ insert into sirv_test10_result2 select sirv_test10_srf2('result',2,1000,1000);
 ERROR:  function cannot execute on segment because it issues a non-SELECT statement (functions.c:135)  (seg0 slice1 pbld2:12011 pid=29759) (cdbdisp.c:1324)
 DETAIL:  
 SQL statement "CREATE  TABLE countries_results (country_code text, country_name text, lang_count int, area float, gnp float) distributed by (country_code)"
-PL/pgSQL function "sirv_test10_srf2" line 8 at execute statement
+PL/pgSQL function "sirv_test10_srf2" line 8 at EXECUTE statement
 insert into sirv_test10_result2 select * from sirv_test10_srf2('result',2,1000,1000);
 ERROR:  function cannot execute on segment because it issues a non-SELECT statement (functions.c:135)  (entry db pbld2:12010 pid=29278) (cdbdisp.c:1324)
 DETAIL:  
 SQL statement "CREATE  TABLE countries_results (country_code text, country_name text, lang_count int, area float, gnp float) distributed by (country_code)"
-PL/pgSQL function "sirv_test10_srf2" line 8 at execute statement
+PL/pgSQL function "sirv_test10_srf2" line 8 at EXECUTE statement
 --end_ignore
 select * from sirv_test10_result2; --should return 0 rows
  res 
@@ -1356,7 +1356,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -1401,7 +1401,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -1416,12 +1416,12 @@ insert into sirv_test12_result1 select sirv_test12(lang_count::int,surfacearea::
 ERROR:  function cannot execute on segment because it issues a non-SELECT statement (functions.c:135)  (seg1 slice1 pbld2:12012 pid=27128) (cdbdisp.c:1324)
 DETAIL:  
 SQL statement "CREATE  TABLE countries_results (country_code text, country_name text, lang_count int, area float, gnp float) distributed by(country_code)"
-PL/pgSQL function "sirv_test12" line 7 at execute statement
+PL/pgSQL function "sirv_test12" line 7 at EXECUTE statement
 insert into sirv_test12_result1 select * from (select sirv_test12(lang_count::int,surfacearea::float,gnp::float) from sirv_test12_input) FOO;
 ERROR:  function cannot execute on segment because it issues a non-SELECT statement (functions.c:135)  (seg1 slice1 pbld2:12012 pid=27159) (cdbdisp.c:1324)
 DETAIL:  
 SQL statement "CREATE  TABLE countries_results (country_code text, country_name text, lang_count int, area float, gnp float) distributed by(country_code)"
-PL/pgSQL function "sirv_test12" line 7 at execute statement
+PL/pgSQL function "sirv_test12" line 7 at EXECUTE statement
 --end_ignore
 select * from sirv_test12_result1;
  res 
diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index fc76d1422599..00811e2145f4 100755
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -5,9 +5,9 @@
 -- populated (by create_misc) and indexed (by create_index).
 --
 -- conditio sine qua non
-SHOW stats_start_collector;  -- must be on
- stats_start_collector 
------------------------
+SHOW track_counts;  -- must be on
+ track_counts 
+--------------
  on
 (1 row)
 
@@ -56,9 +56,6 @@ begin
     extract(epoch from clock_timestamp() - start_time);
 end
 $$ language plpgsql;
--- enable statistics
-SET stats_block_level = on;
-SET stats_row_level = on;
 -- do a seqscan
 SELECT count(*) FROM tenk2;
  count 
@@ -73,6 +70,14 @@ SELECT count(*) FROM tenk2 WHERE unique1 = 1;
      1
 (1 row)
 
+-- force the rate-limiting logic in pgstat_report_tabstat() to time out
+-- and send a message
+SELECT pg_sleep(1.0);
+ pg_sleep 
+----------
+ 
+(1 row)
+
 -- wait for stats collector to update
 SELECT wait_for_stats();
  wait_for_stats 
diff --git a/src/test/regress/expected/strings.out b/src/test/regress/expected/strings.out
index 4824dcc691b5..0e36f34ddd5a 100755
--- a/src/test/regress/expected/strings.out
+++ b/src/test/regress/expected/strings.out
@@ -286,7 +286,7 @@ SELECT regexp_matches('foobarbequebaz', $re$barbeque$re$);
 (1 row)
 
 -- give me errors
-SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque)$re$, 'zipper');
+SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque)$re$, 'gz');
 ERROR:  invalid regexp option: "z"
 SELECT regexp_matches('foobarbequebaz', $re$(barbeque$re$);
 ERROR:  invalid regular expression: parentheses () not balanced
@@ -445,10 +445,29 @@ SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', 'no
  {"the quick brown fox jumped over the lazy dog"}
 (1 row)
 
+-- some corner cases
+SELECT regexp_split_to_array('123456','1');
+ regexp_split_to_array 
+-----------------------
+ {"",23456}
+(1 row)
+
+SELECT regexp_split_to_array('123456','6');
+ regexp_split_to_array 
+-----------------------
+ {12345,""}
+(1 row)
+
+SELECT regexp_split_to_array('123456','.');
+ regexp_split_to_array  
+------------------------
+ {"","","","","","",""}
+(1 row)
+
 -- errors
 SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'zippy') AS foo;
 ERROR:  invalid regexp option: "z"
-SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'zippy');
+SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'iz');
 ERROR:  invalid regexp option: "z"
 -- global option meaningless for regexp_split
 SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'g') AS foo;
@@ -464,7 +483,7 @@ SELECT POSITION('4' IN '1234567890') = '4' AS "4";
  t
 (1 row)
 
-SELECT POSITION(5 IN '1234567890') = '5' AS "5";
+SELECT POSITION('5' IN '1234567890') = '5' AS "5";
  5 
 ---
  t
@@ -821,6 +840,39 @@ SELECT 'Hawkeye' NOT ILIKE 'h%' AS "false";
  f
 (1 row)
 
+--
+-- test %/_ combination cases, cf bugs #4821 and #5478
+--
+SELECT 'foo' LIKE '_%' as t, 'f' LIKE '_%' as t, '' LIKE '_%' as f;
+ t | t | f 
+---+---+---
+ t | t | f
+(1 row)
+
+SELECT 'foo' LIKE '%_' as t, 'f' LIKE '%_' as t, '' LIKE '%_' as f;
+ t | t | f 
+---+---+---
+ t | t | f
+(1 row)
+
+SELECT 'foo' LIKE '__%' as t, 'foo' LIKE '___%' as t, 'foo' LIKE '____%' as f;
+ t | t | f 
+---+---+---
+ t | t | f
+(1 row)
+
+SELECT 'foo' LIKE '%__' as t, 'foo' LIKE '%___' as t, 'foo' LIKE '%____' as f;
+ t | t | f 
+---+---+---
+ t | t | f
+(1 row)
+
+SELECT 'jack' LIKE '%____%' AS t;
+ t 
+---
+ t
+(1 row)
+
 --
 -- test implicit type conversion
 --
@@ -1060,11 +1112,11 @@ SELECT substr(f1, 99995, 10) from toasttest;
 
 DROP TABLE toasttest;
 -- test internally compressing datums
--- note this tests compressing a datum to a very small size which tests a
--- particular case in the packed varlena where very small compressed datums
--- must be given a 4-byte header because there are no bits to indicate
+-- this tests compressing a datum to a very small size which exercises a
+-- corner case in packed-varlena handling: even though small, the compressed
+-- datum must be given a 4-byte header because there are no bits to indicate
 -- compression in a 1-byte header
-CREATE TABLE toasttest (c char(2048));
+CREATE TABLE toasttest (c char(4096));
 INSERT INTO toasttest VALUES('x');
 SELECT length(c), c::text FROM toasttest;
  length | c 
@@ -1073,9 +1125,9 @@ SELECT length(c), c::text FROM toasttest;
 (1 row)
 
 SELECT c FROM toasttest;
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- x                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ x                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 (1 row)
 
 DROP TABLE toasttest;
diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out
index 57fb3b91234f..be55d7caa985 100755
--- a/src/test/regress/expected/subselect.out
+++ b/src/test/regress/expected/subselect.out
@@ -17,6 +17,61 @@ SELECT 1 AS zero WHERE 1 IN (SELECT 2);
 ------
 (0 rows)
 
+-- Check grammar's handling of extra parens in assorted contexts
+SELECT * FROM (SELECT 1 AS x) ss;
+ x 
+---
+ 1
+(1 row)
+
+SELECT * FROM ((SELECT 1 AS x)) ss;
+ x 
+---
+ 1
+(1 row)
+
+(SELECT 2) UNION SELECT 2;
+ ?column? 
+----------
+        2
+(1 row)
+
+((SELECT 2)) UNION SELECT 2;
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT ((SELECT 2) UNION SELECT 2);
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT (((SELECT 2)) UNION SELECT 2);
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT (SELECT ARRAY[1,2,3])[1];
+ ?column? 
+----------
+        1
+(1 row)
+
+SELECT ((SELECT ARRAY[1,2,3]))[2];
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT (((SELECT ARRAY[1,2,3])))[3];
+ ?column? 
+----------
+        3
+(1 row)
+
 -- Set up some simple test tables
 CREATE TABLE SUBSELECT_TBL (
   f1 integer,
@@ -366,8 +421,8 @@ create rule shipped_view_insert as on insert to shipped_view do instead
     insert into shipped values('wt', new.ordnum, new.partnum, new.value);
 insert into parts (partnum, cost) values (1, 1234.56);
 insert into shipped_view (ordnum, partnum, value)
-    values (0, 1, (select cost from parts where partnum = 1));
-select * from shipped_view ORDER BY 1,2;
+    values (0, 1, (select cost from parts where partnum = '1'));
+select * from shipped_view;
  ttype | ordnum | partnum |  value  
 -------+--------+---------+---------
  wt    |      0 | 1       | 1234.56
@@ -416,3 +471,117 @@ select * from (
    0
 (1 row)
 
+--
+-- Test that an IN implemented using a UniquePath does unique-ification
+-- with the right semantics, as per bug #4113.  (Unfortunately we have
+-- no simple way to ensure that this test case actually chooses that type
+-- of plan, but it does in releases 7.4-8.3.  Note that an ordering difference
+-- here might mean that some other plan type is being used, rendering the test
+-- pointless.)
+--
+create temp table numeric_table (num_col numeric);
+insert into numeric_table values (1), (1.000000000000000000001), (2), (3);
+create temp table float_table (float_col float8);
+insert into float_table values (1), (2), (3);
+select * from float_table
+  where float_col in (select num_col from numeric_table);
+ float_col 
+-----------
+         1
+         2
+         3
+(3 rows)
+
+select * from numeric_table
+  where num_col in (select float_col from float_table);
+         num_col         
+-------------------------
+                       1
+ 1.000000000000000000001
+                       2
+                       3
+(4 rows)
+
+--
+-- Test case for bug #4290: bogus calculation of subplan param sets
+--
+create temp table ta (id int primary key, val int);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "ta_pkey" for table "ta"
+insert into ta values(1,1);
+insert into ta values(2,2);
+create temp table tb (id int primary key, aval int);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "tb_pkey" for table "tb"
+insert into tb values(1,1);
+insert into tb values(2,1);
+insert into tb values(3,2);
+insert into tb values(4,2);
+create temp table tc (id int primary key, aid int);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "tc_pkey" for table "tc"
+insert into tc values(1,1);
+insert into tc values(2,2);
+select
+  ( select min(tb.id) from tb
+    where tb.aval = (select ta.val from ta where ta.id = tc.aid) ) as min_tb_id
+from tc;
+ERROR:  correlated subquery with skip-level correlations is not supported
+--
+-- Test case for 8.3 "failed to locate grouping columns" bug
+--
+create temp table t1 (f1 numeric(14,0), f2 varchar(30));
+select * from
+  (select distinct f1, f2, (select f2 from t1 x where x.f1 = up.f1) as fs
+   from t1 up) ss
+group by f1,f2,fs;
+ f1 | f2 | fs 
+----+----+----
+(0 rows)
+
+--
+-- Check that whole-row Vars reading the result of a subselect don't include
+-- any junk columns therein
+--
+-- This test works in upstream PostgreSQL but triggers a problem in GPDB; in
+-- Greenplum the typmods must be the same between all segments and the master
+-- but PostgreSQL executor defers typmod assignment to ExecEvalWholeRowVar()
+-- which is too late for Greenplum since the plan has already been dispatched.
+-- This should be fixed but requires new infrastructure.
+--
+select q from (select max(f1) from int4_tbl group by f1 order by f1) q;
+ERROR:  record type has not been registered
+--
+-- Test case for sublinks pushed down into subselects via join alias expansion
+--
+select
+  (select sq1) as qq1
+from
+  (select exists(select 1 from int4_tbl where f1 = q2) as sq1, 42 as dummy
+   from int8_tbl) sq0
+  join
+  int4_tbl i4 on dummy = i4.f1;
+ERROR:  correlated subquery with skip-level correlations is not supported
+--
+-- Test case for cross-type partial matching in hashed subplan (bug #7597)
+--
+create temp table outer_7597 (f1 int4, f2 int4);
+insert into outer_7597 values (0, 0);
+insert into outer_7597 values (1, 0);
+insert into outer_7597 values (0, null);
+insert into outer_7597 values (1, null);
+create temp table inner_7597(c1 int8, c2 int8);
+insert into inner_7597 values(0, null);
+select * from outer_7597 where (f1, f2) not in (select * from inner_7597);
+ f1 | f2 
+----+----
+  1 |  0
+  1 |   
+(2 rows)
+
+--
+-- Test case for premature memory release during hashing of subplan output
+--
+select '1'::text in (select '1'::name union all select '1'::name);
+ ?column? 
+----------
+ t
+(1 row)
+
diff --git a/src/test/regress/expected/subselect_gp_optimizer.out b/src/test/regress/expected/subselect_gp_optimizer.out
index bc1d0000ed3d..c091adba40ca 100644
--- a/src/test/regress/expected/subselect_gp_optimizer.out
+++ b/src/test/regress/expected/subselect_gp_optimizer.out
@@ -373,23 +373,23 @@ select * from csq_d1;
 -- outer plan node is master-only and CSQ has distributed relation
 --
 explain select * from csq_m1 where x not in (select x from csq_d1) or x < -100; -- gather motion
-                                                                                                  QUERY PLAN                                                                                                  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1293.00 rows=2 width=4)
-   Filter: CASE WHEN NOT csq_m1.x IS NULL THEN CASE WHEN "ColRef_0018" = "ColRef_0017" THEN NULL::boolean WHEN NOT "ColRef_0018" IS NULL THEN false ELSE true END ELSE NULL::boolean END OR csq_m1.x < (-100)
-   ->  GroupAggregate  (cost=0.00..1293.00 rows=2 width=20)
+                                                                                                                                        QUERY PLAN                                                                                                                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Result  (cost=0.00..1293.00 rows=1 width=4)
+   Filter: CASE WHEN NOT csq_m1.x IS NULL THEN CASE WHEN (sum((CASE WHEN csq_d1.x IS NULL THEN 1 ELSE 0 END))) = (count()) THEN NULL::boolean WHEN NOT (sum((CASE WHEN csq_d1.x IS NULL THEN 1 ELSE 0 END))) IS NULL THEN false ELSE true END ELSE NULL::boolean END OR csq_m1.x < (-100)
+   ->  GroupAggregate  (cost=0.00..1293.00 rows=1 width=20)
          Group By: csq_m1.x, csq_m1.ctid, csq_m1.gp_segment_id
-         ->  Nested Loop Left Join  (cost=0.00..1293.00 rows=4 width=18)
-               Join Filter: csq_m1.x = csq_d1.x OR csq_d1.x IS NULL
-               ->  Sort  (cost=0.00..431.00 rows=2 width=14)
-                     Sort Key: csq_m1.x, csq_m1.ctid, csq_m1.gp_segment_id
-                     ->  Table Scan on csq_m1  (cost=0.00..431.00 rows=2 width=14)
-               ->  Result  (cost=0.00..431.00 rows=1 width=8)
-                     ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
-                           ->  Gather Motion 2:1  (slice1; segments: 2)  (cost=0.00..431.00 rows=2 width=4)
-                                 ->  Table Scan on csq_d1  (cost=0.00..431.00 rows=1 width=4)
+         ->  Sort  (cost=0.00..1293.00 rows=1 width=18)
+               Sort Key: csq_m1.x, csq_m1.ctid, csq_m1.gp_segment_id
+               ->  Nested Loop Left Join  (cost=0.00..1293.00 rows=1 width=18)
+                     Join Filter: csq_m1.x = csq_d1.x OR csq_d1.x IS NULL
+                     ->  Table Scan on csq_m1  (cost=0.00..431.00 rows=1 width=14)
+                     ->  Result  (cost=0.00..431.00 rows=1 width=8)
+                           ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
+                                 ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
+                                       ->  Table Scan on csq_d1  (cost=0.00..431.00 rows=1 width=4)
  Settings:  optimizer=on; optimizer_segments=3
- Optimizer status: PQO version 1.621
+ Optimizer status: PQO version 1.633
 (15 rows)
 
 select * from csq_m1 where x not in (select x from csq_d1) or x < -100; -- (3)
diff --git a/src/test/regress/expected/subselect_optimizer.out b/src/test/regress/expected/subselect_optimizer.out
new file mode 100644
index 000000000000..71bbd915d157
--- /dev/null
+++ b/src/test/regress/expected/subselect_optimizer.out
@@ -0,0 +1,605 @@
+--
+-- SUBSELECT
+--
+SELECT 1 AS one WHERE 1 IN (SELECT 1);
+ one 
+-----
+   1
+(1 row)
+
+SELECT 1 AS zero WHERE 1 NOT IN (SELECT 1);
+ zero 
+------
+(0 rows)
+
+SELECT 1 AS zero WHERE 1 IN (SELECT 2);
+ zero 
+------
+(0 rows)
+
+-- Check grammar's handling of extra parens in assorted contexts
+SELECT * FROM (SELECT 1 AS x) ss;
+ x 
+---
+ 1
+(1 row)
+
+SELECT * FROM ((SELECT 1 AS x)) ss;
+ x 
+---
+ 1
+(1 row)
+
+(SELECT 2) UNION SELECT 2;
+ ?column? 
+----------
+        2
+(1 row)
+
+((SELECT 2)) UNION SELECT 2;
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT ((SELECT 2) UNION SELECT 2);
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT (((SELECT 2)) UNION SELECT 2);
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT (SELECT ARRAY[1,2,3])[1];
+ ?column? 
+----------
+        1
+(1 row)
+
+SELECT ((SELECT ARRAY[1,2,3]))[2];
+ ?column? 
+----------
+        2
+(1 row)
+
+SELECT (((SELECT ARRAY[1,2,3])))[3];
+ ?column? 
+----------
+        3
+(1 row)
+
+-- Set up some simple test tables
+CREATE TABLE SUBSELECT_TBL (
+  f1 integer,
+  f2 integer,
+  f3 float
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO SUBSELECT_TBL VALUES (1, 2, 3);
+INSERT INTO SUBSELECT_TBL VALUES (2, 3, 4);
+INSERT INTO SUBSELECT_TBL VALUES (3, 4, 5);
+INSERT INTO SUBSELECT_TBL VALUES (1, 1, 1);
+INSERT INTO SUBSELECT_TBL VALUES (2, 2, 2);
+INSERT INTO SUBSELECT_TBL VALUES (3, 3, 3);
+INSERT INTO SUBSELECT_TBL VALUES (6, 7, 8);
+INSERT INTO SUBSELECT_TBL VALUES (8, 9, NULL);
+SELECT '' AS eight, * FROM SUBSELECT_TBL ORDER BY 2,3,4;
+ eight | f1 | f2 | f3 
+-------+----+----+----
+       |  1 |  1 |  1
+       |  1 |  2 |  3
+       |  2 |  2 |  2
+       |  2 |  3 |  4
+       |  3 |  3 |  3
+       |  3 |  4 |  5
+       |  6 |  7 |  8
+       |  8 |  9 |   
+(8 rows)
+
+-- Uncorrelated subselects
+SELECT '' AS two, f1 AS "Constant Select" FROM SUBSELECT_TBL
+  WHERE f1 IN (SELECT 1) ORDER BY 2;
+ two | Constant Select 
+-----+-----------------
+     |               1
+     |               1
+(2 rows)
+
+SELECT '' AS six, f1 AS "Uncorrelated Field" FROM SUBSELECT_TBL
+  WHERE f1 IN (SELECT f2 FROM SUBSELECT_TBL) ORDER BY 2;
+ six | Uncorrelated Field 
+-----+--------------------
+     |                  1
+     |                  1
+     |                  2
+     |                  2
+     |                  3
+     |                  3
+(6 rows)
+
+SELECT '' AS six, f1 AS "Uncorrelated Field" FROM SUBSELECT_TBL
+  WHERE f1 IN (SELECT f2 FROM SUBSELECT_TBL WHERE
+    f2 IN (SELECT f1 FROM SUBSELECT_TBL)) ORDER BY 2;
+ six | Uncorrelated Field 
+-----+--------------------
+     |                  1
+     |                  1
+     |                  2
+     |                  2
+     |                  3
+     |                  3
+(6 rows)
+
+SELECT '' AS three, f1, f2
+  FROM SUBSELECT_TBL
+  WHERE (f1, f2) NOT IN (SELECT f2, CAST(f3 AS int4) FROM SUBSELECT_TBL
+                         WHERE f3 IS NOT NULL) ORDER BY 2,3;
+ three | f1 | f2 
+-------+----+----
+       |  1 |  2
+       |  6 |  7
+       |  8 |  9
+(3 rows)
+
+-- Correlated subselects
+SELECT '' AS six, f1 AS "Correlated Field", f2 AS "Second Field"
+  FROM SUBSELECT_TBL upper
+  WHERE f1 IN (SELECT f2 FROM SUBSELECT_TBL WHERE f1 = upper.f1) ORDER BY 2,3;
+ six | Correlated Field | Second Field 
+-----+------------------+--------------
+     |                1 |            1
+     |                1 |            2
+     |                2 |            2
+     |                2 |            3
+     |                3 |            3
+     |                3 |            4
+(6 rows)
+
+SELECT '' AS six, f1 AS "Correlated Field", f3 AS "Second Field"
+  FROM SUBSELECT_TBL upper
+  WHERE f1 IN
+    (SELECT f2 FROM SUBSELECT_TBL WHERE CAST(upper.f2 AS float) = f3) ORDER BY 2,3;
+ six | Correlated Field | Second Field 
+-----+------------------+--------------
+     |                1 |            1
+     |                2 |            2
+     |                2 |            4
+     |                3 |            3
+     |                3 |            5
+(5 rows)
+
+SELECT '' AS six, f1 AS "Correlated Field", f3 AS "Second Field"
+  FROM SUBSELECT_TBL upper
+  WHERE f3 IN (SELECT upper.f1 + f2 FROM SUBSELECT_TBL
+               WHERE f2 = CAST(f3 AS integer)) ORDER BY 2,3;
+ six | Correlated Field | Second Field 
+-----+------------------+--------------
+     |                1 |            3
+     |                2 |            4
+     |                3 |            5
+     |                6 |            8
+(4 rows)
+
+SELECT '' AS five, f1 AS "Correlated Field"
+  FROM SUBSELECT_TBL
+  WHERE (f1, f2) IN (SELECT f2, CAST(f3 AS int4) FROM SUBSELECT_TBL
+                     WHERE f3 IS NOT NULL) ORDER BY 2;
+ five | Correlated Field 
+------+------------------
+      |                1
+      |                2
+      |                2
+      |                3
+      |                3
+(5 rows)
+
+--
+-- Use some existing tables in the regression test
+--
+SELECT '' AS eight, ss.f1 AS "Correlated Field", ss.f3 AS "Second Field"
+  FROM SUBSELECT_TBL ss
+  WHERE f1 NOT IN (SELECT f1+1 FROM INT4_TBL
+                   WHERE f1 != ss.f1 AND f1 < 2147483647) ORDER BY 2,3;
+ eight | Correlated Field | Second Field 
+-------+------------------+--------------
+       |                2 |            2
+       |                2 |            4
+       |                3 |            3
+       |                3 |            5
+       |                6 |            8
+       |                8 |             
+(6 rows)
+
+select q1, float8(count(*)) / (select count(*) from int8_tbl)
+from int8_tbl group by q1 order by q1;
+        q1        | ?column? 
+------------------+----------
+              123 |      0.4
+ 4567890123456789 |      0.6
+(2 rows)
+
+--
+-- Test cases to catch unpleasant interactions between IN-join processing
+-- and subquery pullup.
+--
+select count(*) from
+  (select 1 from tenk1 a
+   where unique1 IN (select hundred from tenk1 b)) ss;
+ count 
+-------
+   100
+(1 row)
+
+select count(distinct ss.ten) from
+  (select ten from tenk1 a
+   where unique1 IN (select hundred from tenk1 b)) ss;
+ count 
+-------
+    10
+(1 row)
+
+select count(*) from
+  (select 1 from tenk1 a
+   where unique1 IN (select distinct hundred from tenk1 b)) ss;
+ count 
+-------
+   100
+(1 row)
+
+select count(distinct ss.ten) from
+  (select ten from tenk1 a
+   where unique1 IN (select distinct hundred from tenk1 b)) ss;
+ count 
+-------
+    10
+(1 row)
+
+--
+-- Test cases to check for overenthusiastic optimization of
+-- "IN (SELECT DISTINCT ...)" and related cases.  Per example from
+-- Luca Pireddu and Michael Fuhr.
+--
+CREATE TEMP TABLE foo (id integer);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TEMP TABLE bar (id1 integer, id2 integer);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id1' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO foo VALUES (1);
+INSERT INTO bar VALUES (1, 1);
+INSERT INTO bar VALUES (2, 2);
+INSERT INTO bar VALUES (3, 1);
+-- These cases require an extra level of distinct-ing above subquery s
+SELECT * FROM foo WHERE id IN
+    (SELECT id2 FROM (SELECT DISTINCT id1, id2 FROM bar) AS s) ORDER BY 1;
+ id 
+----
+  1
+(1 row)
+
+SELECT * FROM foo WHERE id IN
+    (SELECT id2 FROM (SELECT id1,id2 FROM bar GROUP BY id1,id2) AS s) ORDER BY 1;
+ id 
+----
+  1
+(1 row)
+
+SELECT * FROM foo WHERE id IN
+    (SELECT id2 FROM (SELECT id1, id2 FROM bar UNION
+                      SELECT id1, id2 FROM bar) AS s) ORDER BY 1;
+ id 
+----
+  1
+(1 row)
+
+-- These cases do not
+SELECT * FROM foo WHERE id IN
+    (SELECT id2 FROM (SELECT DISTINCT ON (id2) id1, id2 FROM bar) AS s) ORDER BY 1;
+ id 
+----
+  1
+(1 row)
+
+SELECT * FROM foo WHERE id IN
+    (SELECT id2 FROM (SELECT id2 FROM bar GROUP BY id2) AS s) ORDER BY 1;
+ id 
+----
+  1
+(1 row)
+
+SELECT * FROM foo WHERE id IN
+    (SELECT id2 FROM (SELECT id2 FROM bar UNION
+                      SELECT id2 FROM bar) AS s) ORDER BY 1;
+ id 
+----
+  1
+(1 row)
+
+--
+-- Test case to catch problems with multiply nested sub-SELECTs not getting
+-- recalculated properly.  Per bug report from Didier Moens.
+--
+CREATE TABLE orderstest (
+    approver_ref integer,
+    po_ref integer,
+    ordercancelled boolean
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'approver_ref' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO orderstest VALUES (1, 1, false);
+INSERT INTO orderstest VALUES (66, 5, false);
+INSERT INTO orderstest VALUES (66, 6, false);
+INSERT INTO orderstest VALUES (66, 7, false);
+INSERT INTO orderstest VALUES (66, 1, true);
+INSERT INTO orderstest VALUES (66, 8, false);
+INSERT INTO orderstest VALUES (66, 1, false);
+INSERT INTO orderstest VALUES (77, 1, false);
+INSERT INTO orderstest VALUES (1, 1, false);
+INSERT INTO orderstest VALUES (66, 1, false);
+INSERT INTO orderstest VALUES (1, 1, false);
+CREATE VIEW orders_view AS
+SELECT *,
+(SELECT CASE
+   WHEN ord.approver_ref=1 THEN '---' ELSE 'Approved'
+ END) AS "Approved",
+(SELECT CASE
+ WHEN ord.ordercancelled
+ THEN 'Cancelled'
+ ELSE
+  (SELECT CASE
+		WHEN ord.po_ref=1
+		THEN
+		 (SELECT CASE
+				WHEN ord.approver_ref=1
+				THEN '---'
+				ELSE 'Approved'
+			END)
+		ELSE 'PO'
+	END) 
+END) AS "Status",
+(CASE
+ WHEN ord.ordercancelled
+ THEN 'Cancelled'
+ ELSE
+  (CASE
+		WHEN ord.po_ref=1
+		THEN
+		 (CASE
+				WHEN ord.approver_ref=1
+				THEN '---'
+				ELSE 'Approved'
+			END)
+		ELSE 'PO'
+	END) 
+END) AS "Status_OK"
+FROM orderstest ord;
+SELECT * FROM orders_view ORDER BY 1,2,5;
+ approver_ref | po_ref | ordercancelled | Approved |  Status   | Status_OK 
+--------------+--------+----------------+----------+-----------+-----------
+            1 |      1 | f              | ---      | ---       | ---
+            1 |      1 | f              | ---      | ---       | ---
+            1 |      1 | f              | ---      | ---       | ---
+           66 |      1 | f              | Approved | Approved  | Approved
+           66 |      1 | f              | Approved | Approved  | Approved
+           66 |      1 | t              | Approved | Cancelled | Cancelled
+           66 |      5 | f              | Approved | PO        | PO
+           66 |      6 | f              | Approved | PO        | PO
+           66 |      7 | f              | Approved | PO        | PO
+           66 |      8 | f              | Approved | PO        | PO
+           77 |      1 | f              | Approved | Approved  | Approved
+(11 rows)
+
+DROP TABLE orderstest cascade;
+NOTICE:  drop cascades to rule _RETURN on view orders_view
+NOTICE:  drop cascades to view orders_view
+--
+-- Test cases to catch situations where rule rewriter fails to propagate
+-- hasSubLinks flag correctly.  Per example from Kyle Bateman.
+--
+create temp table parts (
+    partnum     text,
+    cost        float8
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'partnum' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create temp table shipped (
+    ttype       char(2),
+    ordnum      int4,
+    partnum     text,
+    value       float8
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ttype' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create temp view shipped_view as
+    select * from shipped where ttype = 'wt';
+create rule shipped_view_insert as on insert to shipped_view do instead
+    insert into shipped values('wt', new.ordnum, new.partnum, new.value);
+insert into parts (partnum, cost) values (1, 1234.56);
+insert into shipped_view (ordnum, partnum, value)
+    values (0, 1, (select cost from parts where partnum = '1'));
+select * from shipped_view;
+ ttype | ordnum | partnum |  value  
+-------+--------+---------+---------
+ wt    |      0 | 1       | 1234.56
+(1 row)
+
+create rule shipped_view_update as on update to shipped_view do instead
+    update shipped set partnum = new.partnum, value = new.value
+        where ttype = new.ttype and ordnum = new.ordnum;
+select * from shipped_view ORDER BY 1,2;
+ ttype | ordnum | partnum |  value  
+-------+--------+---------+---------
+ wt    |      0 | 1       | 1234.56
+(1 row)
+
+select f1, ss1 as relabel from
+    (select *, (select sum(f1) from int4_tbl b where f1 >= a.f1) as ss1
+     from int4_tbl a) ss;
+     f1      |  relabel   
+-------------+------------
+  2147483647 | 2147483647
+           0 | 2147607103
+      123456 | 2147607103
+     -123456 | 2147483647
+ -2147483647 |          0
+(5 rows)
+
+--
+-- Test cases involving PARAM_EXEC parameters and min/max index optimizations.
+-- Per bug report from David Sanchez i Gregori.
+--
+select * from (
+  select max(unique1) from tenk1 as a
+  where exists (select 1 from tenk1 as b where b.thousand = a.unique2)
+) ss;
+ max  
+------
+ 9997
+(1 row)
+
+select * from (
+  select min(unique1) from tenk1 as a
+  where not exists (select 1 from tenk1 as b where b.unique2 = 10000)
+) ss;
+ min 
+-----
+   0
+(1 row)
+
+--
+-- Test that an IN implemented using a UniquePath does unique-ification
+-- with the right semantics, as per bug #4113.  (Unfortunately we have
+-- no simple way to ensure that this test case actually chooses that type
+-- of plan, but it does in releases 7.4-8.3.  Note that an ordering difference
+-- here might mean that some other plan type is being used, rendering the test
+-- pointless.)
+--
+create temp table numeric_table (num_col numeric);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'num_col' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into numeric_table values (1), (1.000000000000000000001), (2), (3);
+create temp table float_table (float_col float8);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'float_col' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into float_table values (1), (2), (3);
+select * from float_table
+  where float_col in (select num_col from numeric_table);
+ float_col 
+-----------
+         1
+         2
+         3
+(3 rows)
+
+select * from numeric_table
+  where num_col in (select float_col from float_table);
+         num_col         
+-------------------------
+                       1
+                       2
+ 1.000000000000000000001
+                       3
+(4 rows)
+
+--
+-- Test case for bug #4290: bogus calculation of subplan param sets
+--
+create temp table ta (id int primary key, val int);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "ta_pkey" for table "ta"
+insert into ta values(1,1);
+insert into ta values(2,2);
+create temp table tb (id int primary key, aval int);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "tb_pkey" for table "tb"
+insert into tb values(1,1);
+insert into tb values(2,1);
+insert into tb values(3,2);
+insert into tb values(4,2);
+create temp table tc (id int primary key, aid int);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "tc_pkey" for table "tc"
+insert into tc values(1,1);
+insert into tc values(2,2);
+select
+  ( select min(tb.id) from tb
+    where tb.aval = (select ta.val from ta where ta.id = tc.aid) ) as min_tb_id
+from tc;
+ min_tb_id 
+-----------
+         1
+         3
+(2 rows)
+
+--
+-- Test case for 8.3 "failed to locate grouping columns" bug
+--
+create temp table t1 (f1 numeric(14,0), f2 varchar(30));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+select * from
+  (select distinct f1, f2, (select f2 from t1 x where x.f1 = up.f1) as fs
+   from t1 up) ss
+group by f1,f2,fs;
+ f1 | f2 | fs 
+----+----+----
+(0 rows)
+
+--
+-- Check that whole-row Vars reading the result of a subselect don't include
+-- any junk columns therein
+--
+-- This test works in upstream PostgreSQL but triggers a problem in GPDB; in
+-- Greenplum the typmods must be the same between all segments and the master
+-- but PostgreSQL executor defers typmod assignment to ExecEvalWholeRowVar()
+-- which is too late for Greenplum since the plan has already been dispatched.
+-- This should be fixed but requires new infrastructure.
+--
+select q from (select max(f1) from int4_tbl group by f1 order by f1) q;
+ERROR:  record type has not been registered
+--
+-- Test case for sublinks pushed down into subselects via join alias expansion
+--
+select
+  (select sq1) as qq1
+from
+  (select exists(select 1 from int4_tbl where f1 = q2) as sq1, 42 as dummy
+   from int8_tbl) sq0
+  join
+  int4_tbl i4 on dummy = i4.f1;
+ qq1 
+-----
+(0 rows)
+
+--
+-- Test case for cross-type partial matching in hashed subplan (bug #7597)
+--
+create temp table outer_7597 (f1 int4, f2 int4);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into outer_7597 values (0, 0);
+insert into outer_7597 values (1, 0);
+insert into outer_7597 values (0, null);
+insert into outer_7597 values (1, null);
+create temp table inner_7597(c1 int8, c2 int8);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into inner_7597 values(0, null);
+select * from outer_7597 where (f1, f2) not in (select * from inner_7597);
+ f1 | f2 
+----+----
+  1 |  0
+  1 |   
+(2 rows)
+
+--
+-- Test case for premature memory release during hashing of subplan output
+--
+select '1'::text in (select '1'::name union all select '1'::name);
+ ?column? 
+----------
+ t
+(1 row)
+
diff --git a/src/test/regress/expected/temp.out b/src/test/regress/expected/temp.out
index b1a0e9ae0fa8..1e35cb4b11ff 100755
--- a/src/test/regress/expected/temp.out
+++ b/src/test/regress/expected/temp.out
@@ -169,17 +169,13 @@ ERROR:  unsupported ON COMMIT and foreign key combination
 DETAIL:  Table "temptest4" references "temptest3", but they do not have the same ON COMMIT setting.
 -- Test manipulation of temp schema's placement in search path
 create table public.whereami (f1 text);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Greenplum Database data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into public.whereami values ('public');
 create temp table whereami (f1 text);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Greenplum Database data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into whereami values ('temp');
 create function public.whoami() returns text
-  as $$select 'public'::text$$ language sql CONTAINS SQL;
+  as $$select 'public'::text$$ language sql;
 create function pg_temp.whoami() returns text
-  as $$select 'temp'::text$$ language sql CONTAINS SQL;
+  as $$select 'temp'::text$$ language sql;
 -- default should have pg_temp implicitly first, but only for tables
 select * from whereami;
   f1  
diff --git a/src/test/regress/expected/text.out b/src/test/regress/expected/text.out
index 88723482c014..414dfc92cb5b 100755
--- a/src/test/regress/expected/text.out
+++ b/src/test/regress/expected/text.out
@@ -23,13 +23,41 @@ SELECT '' AS two, * FROM TEXT_TBL order by f1;
      | hi de ho neighbor
 (2 rows)
 
+-- As of 8.3 we have removed most implicit casts to text, so that for example
+-- this no longer works:
+select length(42);
+ERROR:  function length(integer) does not exist
+LINE 1: select length(42);
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+-- But as a special exception for usability's sake, we still allow implicit
+-- casting to text in concatenations, so long as the other input is text or
+-- an unknown literal.  So these work:
+select 'four: '::text || 2+2;
+ ?column? 
+----------
+ four: 4
+(1 row)
+
+select 'four: ' || 2+2;
+ ?column? 
+----------
+ four: 4
+(1 row)
+
+-- but not this:
+select 3 || 4.0;
+ERROR:  operator does not exist: integer || numeric
+LINE 1: select 3 || 4.0;
+                 ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 --
 -- TEXT CASTING TO/FROM ANY TYPE
 --
 SELECT '1'::bool::text;
  text
 ------
- t
+ true
 (1 row)
 
 SELECT array[1,2]::text;
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 1395e0bc8d7f..533c3a12704a 100755
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -190,7 +190,7 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 5097 BC');
 ERROR:  timestamp out of range: "Feb 16 17:32:01 5097 BC"
 LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 5097 BC...
                                             ^
--- Alternate field order that we've historically supported (sort of)
+-- Alternative field order that we've historically supported (sort of)
 -- with regular and POSIXy timezone specs
 SELECT 'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz;
          timestamptz          
diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out
index d160faf65791..770251969041 100755
--- a/src/test/regress/expected/transactions.out
+++ b/src/test/regress/expected/transactions.out
@@ -315,7 +315,7 @@ SELECT 1;			-- this should work
 
 -- check non-transactional behavior of cursors
 BEGIN;
-	DECLARE c CURSOR FOR SELECT unique2 FROM tenk1 ORDER BY 1;
+	DECLARE c CURSOR FOR SELECT unique2 FROM tenk1 ORDER BY unique2;
 	SAVEPOINT one;
 		FETCH 10 FROM c;
  unique2 
@@ -365,7 +365,7 @@ BEGIN;
 (10 rows)
 
 	CLOSE c;
-	DECLARE c CURSOR FOR SELECT unique2/0 FROM tenk1 ORDER BY 1;
+	DECLARE c CURSOR FOR SELECT unique2/0 FROM tenk1 ORDER BY unique2;
 	SAVEPOINT two;
 		FETCH 10 FROM c;
 ERROR:  division by zero
diff --git a/src/test/regress/expected/tsdicts.out b/src/test/regress/expected/tsdicts.out
new file mode 100644
index 000000000000..4b8929361a85
--- /dev/null
+++ b/src/test/regress/expected/tsdicts.out
@@ -0,0 +1,318 @@
+--Test text search dictionaries and configurations
+-- Test ISpell dictionary with ispell affix file
+CREATE TEXT SEARCH DICTIONARY ispell (
+                        Template=ispell,
+                        DictFile=ispell_sample,
+                        AffFile=ispell_sample
+);
+SELECT ts_lexize('ispell', 'skies');
+ ts_lexize 
+-----------
+ {sky}
+(1 row)
+
+SELECT ts_lexize('ispell', 'bookings');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('ispell', 'booking');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('ispell', 'foot');
+ ts_lexize 
+-----------
+ {foot}
+(1 row)
+
+SELECT ts_lexize('ispell', 'foots');
+ ts_lexize 
+-----------
+ {foot}
+(1 row)
+
+SELECT ts_lexize('ispell', 'rebookings');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('ispell', 'rebooking');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('ispell', 'rebook');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('ispell', 'unbookings');
+ ts_lexize 
+-----------
+ {book}
+(1 row)
+
+SELECT ts_lexize('ispell', 'unbooking');
+ ts_lexize 
+-----------
+ {book}
+(1 row)
+
+SELECT ts_lexize('ispell', 'unbook');
+ ts_lexize 
+-----------
+ {book}
+(1 row)
+
+SELECT ts_lexize('ispell', 'footklubber');
+   ts_lexize    
+----------------
+ {foot,klubber}
+(1 row)
+
+SELECT ts_lexize('ispell', 'footballklubber');
+                      ts_lexize                       
+------------------------------------------------------
+ {footballklubber,foot,ball,klubber,football,klubber}
+(1 row)
+
+SELECT ts_lexize('ispell', 'ballyklubber');
+   ts_lexize    
+----------------
+ {ball,klubber}
+(1 row)
+
+SELECT ts_lexize('ispell', 'footballyklubber');
+      ts_lexize      
+---------------------
+ {foot,ball,klubber}
+(1 row)
+
+-- Test ISpell dictionary with hunspell affix file
+CREATE TEXT SEARCH DICTIONARY hunspell (
+                        Template=ispell,
+                        DictFile=ispell_sample,
+                        AffFile=hunspell_sample
+);
+SELECT ts_lexize('hunspell', 'skies');
+ ts_lexize 
+-----------
+ {sky}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'bookings');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'booking');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'foot');
+ ts_lexize 
+-----------
+ {foot}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'foots');
+ ts_lexize 
+-----------
+ {foot}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'rebookings');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'rebooking');
+   ts_lexize    
+----------------
+ {booking,book}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'rebook');
+ ts_lexize 
+-----------
+ 
+(1 row)
+
+SELECT ts_lexize('hunspell', 'unbookings');
+ ts_lexize 
+-----------
+ {book}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'unbooking');
+ ts_lexize 
+-----------
+ {book}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'unbook');
+ ts_lexize 
+-----------
+ {book}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'footklubber');
+   ts_lexize    
+----------------
+ {foot,klubber}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'footballklubber');
+                      ts_lexize                       
+------------------------------------------------------
+ {footballklubber,foot,ball,klubber,football,klubber}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'ballyklubber');
+   ts_lexize    
+----------------
+ {ball,klubber}
+(1 row)
+
+SELECT ts_lexize('hunspell', 'footballyklubber');
+      ts_lexize      
+---------------------
+ {foot,ball,klubber}
+(1 row)
+
+-- Synonim dictionary
+CREATE TEXT SEARCH DICTIONARY synonym (
+						Template=synonym, 
+						Synonyms=synonym_sample
+);
+SELECT ts_lexize('synonym', 'PoStGrEs');
+ ts_lexize 
+-----------
+ {pgsql}
+(1 row)
+
+SELECT ts_lexize('synonym', 'Gogle');
+ ts_lexize 
+-----------
+ {googl}
+(1 row)
+
+-- Create and simple test thesaurus dictionary
+-- More tests in configuration checks because ts_lexize()
+-- cannot pass more than one word to thesaurus.
+CREATE TEXT SEARCH DICTIONARY thesaurus (
+                        Template=thesaurus,
+						DictFile=thesaurus_sample, 
+						Dictionary=english_stem
+);
+SELECT ts_lexize('thesaurus', 'one');
+ ts_lexize 
+-----------
+ {1}
+(1 row)
+
+-- Test ispell dictionary in configuration
+CREATE TEXT SEARCH CONFIGURATION ispell_tst (
+						COPY=english
+);
+ALTER TEXT SEARCH CONFIGURATION ispell_tst ALTER MAPPING FOR
+	word, numword, asciiword, hword, numhword, asciihword, hword_part, hword_numpart, hword_asciipart
+	WITH ispell, english_stem;
+SELECT to_tsvector('ispell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
+                                            to_tsvector                                             
+----------------------------------------------------------------------------------------------------
+ 'sky':3 'ball':7 'book':1,5 'foot':7,10 'booking':1,5 'klubber':7 'football':7 'footballklubber':7
+(1 row)
+
+SELECT to_tsquery('ispell_tst', 'footballklubber');
+                                  to_tsquery                                  
+------------------------------------------------------------------------------
+ ( 'footballklubber' | 'foot' & 'ball' & 'klubber' ) | 'football' & 'klubber'
+(1 row)
+
+SELECT to_tsquery('ispell_tst', 'footballyklubber:b & rebookings:A & sky');
+                               to_tsquery                               
+------------------------------------------------------------------------
+ 'foot':B & 'ball':B & 'klubber':B & ( 'booking':A | 'book':A ) & 'sky'
+(1 row)
+
+-- Test ispell dictionary with hunspell affix in configuration
+CREATE TEXT SEARCH CONFIGURATION hunspell_tst (
+						COPY=ispell_tst
+);
+ALTER TEXT SEARCH CONFIGURATION hunspell_tst ALTER MAPPING
+	REPLACE ispell WITH hunspell;
+SELECT to_tsvector('hunspell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
+                                            to_tsvector                                             
+----------------------------------------------------------------------------------------------------
+ 'sky':3 'ball':7 'book':1,5 'foot':7,10 'booking':1,5 'klubber':7 'football':7 'footballklubber':7
+(1 row)
+
+SELECT to_tsquery('hunspell_tst', 'footballklubber');
+                                  to_tsquery                                  
+------------------------------------------------------------------------------
+ ( 'footballklubber' | 'foot' & 'ball' & 'klubber' ) | 'football' & 'klubber'
+(1 row)
+
+SELECT to_tsquery('hunspell_tst', 'footballyklubber:b & rebookings:A & sky');
+                               to_tsquery                               
+------------------------------------------------------------------------
+ 'foot':B & 'ball':B & 'klubber':B & ( 'booking':A | 'book':A ) & 'sky'
+(1 row)
+
+-- Test synonym dictionary in configuration
+CREATE TEXT SEARCH CONFIGURATION synonym_tst (
+						COPY=english
+);
+ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR 
+	asciiword, hword_asciipart, asciihword 
+	WITH synonym, english_stem;
+SELECT to_tsvector('synonym_tst', 'Postgresql is often called as postgres or pgsql and pronounced as postgre');
+                    to_tsvector                    
+---------------------------------------------------
+ 'call':4 'often':3 'pgsql':1,6,8,12 'pronounc':10
+(1 row)
+
+SELECT to_tsvector('synonym_tst', 'Most common mistake is to write Gogle instead of Google');
+                       to_tsvector                        
+----------------------------------------------------------
+ 'googl':7,10 'write':6 'common':2 'mistak':3 'instead':8
+(1 row)
+
+-- test thesaurus in configuration
+-- see thesaurus_sample.ths to understand 'odd' resulting tsvector
+CREATE TEXT SEARCH CONFIGURATION thesaurus_tst (
+						COPY=synonym_tst
+);
+ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR 
+	asciiword, hword_asciipart, asciihword 
+	WITH synonym, thesaurus, english_stem;
+SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one');
+           to_tsvector            
+----------------------------------
+ '1':1,5 '12':3 '123':4 'pgsql':2
+(1 row)
+
+SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbrevation SN)');
+                         to_tsvector                         
+-------------------------------------------------------------
+ 'sn':1,9,11 'new':4 'call':8 'star':5 'usual':7 'abbrev':10
+(1 row)
+
+SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a tickets');
+                      to_tsvector                      
+-------------------------------------------------------
+ 'card':3,10 'like':6 'look':5 'invit':2,9 'order':1,8
+(1 row)
+
diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out
new file mode 100644
index 000000000000..4784a119fca9
--- /dev/null
+++ b/src/test/regress/expected/tsearch.out
@@ -0,0 +1,924 @@
+set optimizer_disable_missing_stats_collection = on;
+--
+-- Sanity checks for text search catalogs
+--
+-- NB: we assume the oidjoins test will have caught any dangling links,
+-- that is OID or REGPROC fields that are not zero and do not match some
+-- row in the linked-to table.  However, if we want to enforce that a link
+-- field can't be 0, we have to check it here.
+-- Find unexpected zero link entries
+SELECT oid, prsname
+FROM pg_ts_parser
+WHERE prsnamespace = 0 OR prsstart = 0 OR prstoken = 0 OR prsend = 0 OR
+      -- prsheadline is optional
+      prslextype = 0;
+ oid | prsname 
+-----+---------
+(0 rows)
+
+SELECT oid, dictname
+FROM pg_ts_dict
+WHERE dictnamespace = 0 OR dictowner = 0 OR dicttemplate = 0;
+ oid | dictname 
+-----+----------
+(0 rows)
+
+SELECT oid, tmplname
+FROM pg_ts_template
+WHERE tmplnamespace = 0 OR tmpllexize = 0;  -- tmplinit is optional
+ oid | tmplname 
+-----+----------
+(0 rows)
+
+SELECT oid, cfgname
+FROM pg_ts_config
+WHERE cfgnamespace = 0 OR cfgowner = 0 OR cfgparser = 0;
+ oid | cfgname 
+-----+---------
+(0 rows)
+
+SELECT mapcfg, maptokentype, mapseqno
+FROM pg_ts_config_map
+WHERE mapcfg = 0 OR mapdict = 0;
+ mapcfg | maptokentype | mapseqno 
+--------+--------------+----------
+(0 rows)
+
+-- Look for pg_ts_config_map entries that aren't one of parser's token types
+SELECT * FROM
+  ( SELECT oid AS cfgid, (ts_token_type(cfgparser)).tokid AS tokid
+    FROM pg_ts_config ) AS tt 
+RIGHT JOIN pg_ts_config_map AS m
+    ON (tt.cfgid=m.mapcfg AND tt.tokid=m.maptokentype)
+WHERE
+    tt.cfgid IS NULL OR tt.tokid IS NULL;
+ cfgid | tokid | mapcfg | maptokentype | mapseqno | mapdict 
+-------+-------+--------+--------------+----------+---------
+(0 rows)
+
+-- test basic text search behavior without indexes, then with
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+ count 
+-------
+   158
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+ count 
+-------
+    17
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+ count 
+-------
+     6
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+ count 
+-------
+    98
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+ count 
+-------
+    23
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+ count 
+-------
+    39
+(1 row)
+
+create index wowidx on test_tsvector using gist (a);
+SET enable_seqscan=OFF;
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+ count 
+-------
+   158
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+ count 
+-------
+    17
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+ count 
+-------
+     6
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+ count 
+-------
+    98
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+ count 
+-------
+    23
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+ count 
+-------
+    39
+(1 row)
+
+RESET enable_seqscan;
+DROP INDEX wowidx;
+--CREATE INDEX wowidx ON test_tsvector USING gin (a);
+--SET enable_seqscan=OFF;
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+ count 
+-------
+   158
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+ count 
+-------
+    17
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+ count 
+-------
+     6
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+ count 
+-------
+    98
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+ count 
+-------
+    23
+(1 row)
+
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+ count 
+-------
+    39
+(1 row)
+
+  
+RESET enable_seqscan;
+INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH');
+SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10;
+ word | ndoc | nentry 
+------+------+--------
+ qq   |  108 |    108
+ qt   |  102 |    102
+ qe   |  100 |    100
+ qh   |   98 |     98
+ qw   |   98 |     98
+ qa   |   97 |     97
+ ql   |   94 |     94
+ qs   |   94 |     94
+ qi   |   92 |     92
+ qr   |   92 |     92
+(10 rows)
+
+SELECT * FROM ts_stat('SELECT a FROM test_tsvector', 'AB') ORDER BY ndoc DESC, nentry DESC, word;
+ word | ndoc | nentry 
+------+------+--------
+ DFG  |    1 |      2
+(1 row)
+
+--dictionaries and to_tsvector
+SELECT ts_lexize('english_stem', 'skies');
+ ts_lexize 
+-----------
+ {sky}
+(1 row)
+
+SELECT ts_lexize('english_stem', 'identity');
+ ts_lexize 
+-----------
+ {ident}
+(1 row)
+
+SELECT * FROM ts_token_type('default');
+ tokid |      alias      |               description                
+-------+-----------------+------------------------------------------
+     1 | asciiword       | Word, all ASCII
+     2 | word            | Word, all letters
+     3 | numword         | Word, letters and digits
+     4 | email           | Email address
+     5 | url             | URL
+     6 | host            | Host
+     7 | sfloat          | Scientific notation
+     8 | version         | Version number
+     9 | hword_numpart   | Hyphenated word part, letters and digits
+    10 | hword_part      | Hyphenated word part, all letters
+    11 | hword_asciipart | Hyphenated word part, all ASCII
+    12 | blank           | Space symbols
+    13 | tag             | XML tag
+    14 | protocol        | Protocol head
+    15 | numhword        | Hyphenated word, letters and digits
+    16 | asciihword      | Hyphenated word, all ASCII
+    17 | hword           | Hyphenated word, all letters
+    18 | url_path        | URL path
+    19 | file            | File or path name
+    20 | float           | Decimal notation
+    21 | int             | Signed integer
+    22 | uint            | Unsigned integer
+    23 | entity          | XML entity
+(23 rows)
+
+SELECT * FROM ts_parse('default', '345 qwe@efd.r '' 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 teodor@stack.net 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');
+ tokid |                token                 
+-------+--------------------------------------
+    22 | 345
+    12 |  
+     1 | qwe
+    12 | @
+    19 | efd.r
+    12 |  ' 
+    14 | http://
+     6 | www.com
+    12 | / 
+    14 | http://
+     5 | aew.werc.ewr/?ad=qwe&dw
+     6 | aew.werc.ewr
+    18 | /?ad=qwe&dw
+    12 |  
+     5 | 1aew.werc.ewr/?ad=qwe&dw
+     6 | 1aew.werc.ewr
+    18 | /?ad=qwe&dw
+    12 |  
+     6 | 2aew.werc.ewr
+    12 |  
+    14 | http://
+     5 | 3aew.werc.ewr/?ad=qwe&dw
+     6 | 3aew.werc.ewr
+    18 | /?ad=qwe&dw
+    12 |  
+    14 | http://
+     6 | 4aew.werc.ewr
+    12 |  
+    14 | http://
+     6 | 5aew.werc.ewr:8100
+    12 | /?  
+     1 | ad
+    12 | =
+     1 | qwe
+    12 | &
+     1 | dw
+    12 |  
+     5 | 6aew.werc.ewr:8100/?ad=qwe&dw
+     6 | 6aew.werc.ewr:8100
+    18 | /?ad=qwe&dw
+    12 |  
+     5 | 7aew.werc.ewr:8100/?ad=qwe&dw=%20%32
+     6 | 7aew.werc.ewr:8100
+    18 | /?ad=qwe&dw=%20%32
+    12 |  
+     7 | +4.0e-10
+    12 |  
+     1 | qwe
+    12 |  
+     1 | qwe
+    12 |  
+     1 | qwqwe
+    12 |  
+    20 | 234.435
+    12 |  
+    22 | 455
+    12 |  
+    20 | 5.005
+    12 |  
+     4 | teodor@stack.net
+    12 |  
+    16 | qwe-wer
+    11 | qwe
+    12 | -
+    11 | wer
+    12 |  
+     1 | asdf
+    12 |  
+    13 | <fr>
+     1 | qwer
+    12 |  
+     1 | jf
+    12 |  
+     1 | sdjk
+    12 | <
+     1 | we
+    12 |  
+     1 | hjwer
+    12 |  
+    13 | <werrwe>
+    12 |  
+     3 | ewr1
+    12 | > 
+     3 | ewri2
+    12 |  
+    13 | <a href="qwe<qwe>">
+    12 | 
+       : 
+    19 | /usr/local/fff
+    12 |  
+    19 | /awdf/dwqe/4325
+    12 |  
+    19 | rewt/ewr
+    12 |  
+     1 | wefjn
+    12 |  
+    19 | /wqe-324/ewr
+    12 |  
+    19 | gist.h
+    12 |  
+    19 | gist.h.c
+    12 |  
+    19 | gist.c
+    12 | . 
+     1 | readline
+    12 |  
+    20 | 4.2
+    12 |  
+    20 | 4.2
+    12 | . 
+    20 | 4.2
+    12 | , 
+     1 | readline
+    20 | -4.2
+    12 |  
+     1 | readline
+    20 | -4.2
+    12 | . 
+    22 | 234
+    12 | 
+       : 
+    12 | <
+     1 | i
+    12 |  
+    13 | <b>
+    12 |  
+     1 | wow
+    12 |   
+    12 | < 
+     1 | jqw
+    12 |  
+    12 | <> 
+     1 | qwerty
+(131 rows)
+
+SELECT to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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                                                                                                                                                                                                                                                                                                                                                                                                                       
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ 'ad':17 'dw':19 'jf':39 '234':61 '345':1 '4.2':54,55,56 '455':31 'jqw':64 'qwe':2,18,27,28,35 'wer':36 'wow':63 '-4.2':58,60 'asdf':37 'ewr1':43 'qwer':38 'sdjk':40 '5.005':32 'efd.r':3 'ewri2':44 'hjwer':42 'qwqwe':29 'wefjn':48 'gist.c':52 'gist.h':50 'qwerti':65 '234.435':30 'qwe-wer':34 'readlin':53,57,59 'www.com':4 '+4.0e-10':26 'gist.h.c':51 'rewt/ewr':47 '/?ad=qwe&dw':7,10,14,22 '/wqe-324/ewr':49 'aew.werc.ewr':6 '1aew.werc.ewr':9 '2aew.werc.ewr':11 '3aew.werc.ewr':13 '4aew.werc.ewr':15 '/usr/local/fff':45 '/awdf/dwqe/4325':46 'teodor@stack.net':33 '/?ad=qwe&dw=%20%32':25 '5aew.werc.ewr:8100':16 '6aew.werc.ewr:8100':21 '7aew.werc.ewr:8100':24 'aew.werc.ewr/?ad=qwe&dw':5 '1aew.werc.ewr/?ad=qwe&dw':8 '3aew.werc.ewr/?ad=qwe&dw':12 '6aew.werc.ewr:8100/?ad=qwe&dw':20 '7aew.werc.ewr:8100/?ad=qwe&dw=%20%32':23
+(1 row)
+
+SELECT length(to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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'));
+ length 
+--------
+     51
+(1 row)
+
+-- ts_debug
+SELECT * from ts_debug('english', '<myns:foo-bar_baz.blurfl>abc&nm1;def&#xa9;ghi&#245;jkl</myns:foo-bar_baz.blurfl>');
+   alias   |   description   |           token            |  dictionaries  |  dictionary  | lexemes 
+-----------+-----------------+----------------------------+----------------+--------------+---------
+ tag       | XML tag         | <myns:foo-bar_baz.blurfl>  | {}             |              | 
+ asciiword | Word, all ASCII | abc                        | {english_stem} | english_stem | {abc}
+ entity    | XML entity      | &nm1;                      | {}             |              | 
+ asciiword | Word, all ASCII | def                        | {english_stem} | english_stem | {def}
+ entity    | XML entity      | &#xa9;                     | {}             |              | 
+ asciiword | Word, all ASCII | ghi                        | {english_stem} | english_stem | {ghi}
+ entity    | XML entity      | &#245;                     | {}             |              | 
+ asciiword | Word, all ASCII | jkl                        | {english_stem} | english_stem | {jkl}
+ tag       | XML tag         | </myns:foo-bar_baz.blurfl> | {}             |              | 
+(9 rows)
+
+-- to_tsquery
+SELECT to_tsquery('english', 'qwe & sKies ');
+  to_tsquery   
+---------------
+ 'qwe' & 'sky'
+(1 row)
+
+SELECT to_tsquery('simple', 'qwe & sKies ');
+   to_tsquery    
+-----------------
+ 'qwe' & 'skies'
+(1 row)
+
+SELECT to_tsquery('english', '''the wether'':dc & ''           sKies '':BC ');
+       to_tsquery       
+------------------------
+ 'wether':CD & 'sky':BC
+(1 row)
+
+SELECT to_tsquery('english', 'asd&(and|fghj)');
+   to_tsquery   
+----------------
+ 'asd' & 'fghj'
+(1 row)
+
+SELECT to_tsquery('english', '(asd&and)|fghj');
+   to_tsquery   
+----------------
+ 'asd' | 'fghj'
+(1 row)
+
+SELECT to_tsquery('english', '(asd&!and)|fghj');
+   to_tsquery   
+----------------
+ 'asd' | 'fghj'
+(1 row)
+
+SELECT to_tsquery('english', '(the|and&(i&1))&fghj');
+  to_tsquery  
+--------------
+ '1' & 'fghj'
+(1 row)
+
+SELECT plainto_tsquery('english', 'the and z 1))& fghj');
+  plainto_tsquery   
+--------------------
+ 'z' & '1' & 'fghj'
+(1 row)
+
+SELECT plainto_tsquery('english', 'foo bar') && plainto_tsquery('english', 'asd');
+       ?column?        
+-----------------------
+ 'foo' & 'bar' & 'asd'
+(1 row)
+
+SELECT plainto_tsquery('english', 'foo bar') || plainto_tsquery('english', 'asd fg');
+           ?column?           
+------------------------------
+ 'foo' & 'bar' | 'asd' & 'fg'
+(1 row)
+
+SELECT plainto_tsquery('english', 'foo bar') || !!plainto_tsquery('english', 'asd fg');
+             ?column?              
+-----------------------------------
+ 'foo' & 'bar' | !( 'asd' & 'fg' )
+(1 row)
+
+SELECT plainto_tsquery('english', 'foo bar') && 'asd | fg';
+             ?column?             
+----------------------------------
+ 'foo' & 'bar' & ( 'asd' | 'fg' )
+(1 row)
+
+SELECT ts_rank_cd(to_tsvector('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+'), to_tsquery('english', 'paint&water'));
+ ts_rank_cd 
+------------
+       0.05
+(1 row)
+
+SELECT ts_rank_cd(to_tsvector('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+'), to_tsquery('english', 'breath&motion&water'));
+ ts_rank_cd 
+------------
+ 0.00833333
+(1 row)
+
+SELECT ts_rank_cd(to_tsvector('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+'), to_tsquery('english', 'ocean'));
+ ts_rank_cd 
+------------
+        0.1
+(1 row)
+
+--headline tests
+SELECT ts_headline('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+', to_tsquery('english', 'paint&water'));
+               ts_headline               
+-----------------------------------------
+ <b>painted</b> Ocean.
+ <b>Water</b>, <b>water</b>, every where
+   And all the boards did shrink;
+ <b>Water</b>, <b>water</b>, every
+(1 row)
+
+SELECT ts_headline('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+', to_tsquery('english', 'breath&motion&water'));
+           ts_headline            
+----------------------------------
+ <b>breath</b> nor <b>motion</b>,
+ As idle as a painted Ship
+   Upon a painted Ocean.
+ <b>Water</b>, <b>water</b>
+(1 row)
+
+SELECT ts_headline('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+', to_tsquery('english', 'ocean'));
+           ts_headline            
+----------------------------------
+ <b>Ocean</b>.
+ Water, water, every where
+   And all the boards did shrink;
+ Water, water, every where
+(1 row)
+
+SELECT ts_headline('english', '
+<html>
+<!-- some comment -->
+<body>
+Sea view wow <u>foo 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>',
+to_tsquery('english', 'sea&foo'), 'HighlightAll=true');
+                                 ts_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>
+(1 row)
+
+--Rewrite sub system
+CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);
+\set ECHO none
+ALTER TABLE test_tsquery ADD COLUMN keyword tsquery;
+UPDATE test_tsquery SET keyword = to_tsquery('english', txtkeyword);
+ALTER TABLE test_tsquery ADD COLUMN sample tsquery;
+UPDATE test_tsquery SET sample = to_tsquery('english', txtsample::text);
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <  'new & york';
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <= 'new & york';
+ count 
+-------
+     2
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword = 'new & york';
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >= 'new & york';
+ count 
+-------
+     3
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >  'new & york';
+ count 
+-------
+     2
+(1 row)
+
+CREATE INDEX bt_tsq ON test_tsquery (keyword);
+SET enable_seqscan=OFF;
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <  'new & york';
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <= 'new & york';
+ count 
+-------
+     2
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword = 'new & york';
+ count 
+-------
+     1
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >= 'new & york';
+ count 
+-------
+     3
+(1 row)
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >  'new & york';
+ count 
+-------
+     2
+(1 row)
+
+RESET enable_seqscan;
+SELECT ts_rewrite('foo & bar & qq & new & york',  'new & york'::tsquery, 'big & apple | nyc | new & york & city');
+                                    ts_rewrite                                    
+----------------------------------------------------------------------------------
+ 'foo' & 'bar' & 'qq' & ( 'city' & 'new' & 'york' | ( 'nyc' | 'big' & 'apple' ) )
+(1 row)
+
+SELECT ts_rewrite('moscow', 'SELECT keyword, sample FROM test_tsquery'::text );
+     ts_rewrite      
+---------------------
+ 'moskva' | 'moscow'
+(1 row)
+
+SELECT ts_rewrite('moscow & hotel', 'SELECT keyword, sample FROM test_tsquery'::text );
+            ts_rewrite             
+-----------------------------------
+ 'hotel' & ( 'moskva' | 'moscow' )
+(1 row)
+
+SELECT ts_rewrite('bar & new & qq & foo & york', 'SELECT keyword, sample FROM test_tsquery'::text );
+                                     ts_rewrite                                      
+-------------------------------------------------------------------------------------
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
+(1 row)
+
+SELECT ts_rewrite( 'moscow', 'SELECT keyword, sample FROM test_tsquery');
+     ts_rewrite      
+---------------------
+ 'moskva' | 'moscow'
+(1 row)
+
+SELECT ts_rewrite( 'moscow & hotel', 'SELECT keyword, sample FROM test_tsquery');
+            ts_rewrite             
+-----------------------------------
+ 'hotel' & ( 'moskva' | 'moscow' )
+(1 row)
+
+SELECT ts_rewrite( 'bar & new & qq & foo & york', 'SELECT keyword, sample FROM test_tsquery');
+                                     ts_rewrite                                      
+-------------------------------------------------------------------------------------
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
+(1 row)
+
+SELECT keyword FROM test_tsquery WHERE keyword @> 'new';
+    keyword     
+----------------
+ 'new' & 'york'
+(1 row)
+
+SELECT keyword FROM test_tsquery WHERE keyword @> 'moscow';
+ keyword  
+----------
+ 'moscow'
+(1 row)
+
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'new';
+ keyword 
+---------
+(0 rows)
+
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'moscow';
+ keyword  
+----------
+ 'moscow'
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+     ts_rewrite      
+---------------------
+ 'moskva' | 'moscow'
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+            ts_rewrite             
+-----------------------------------
+ 'hotel' & ( 'moskva' | 'moscow' )
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar &  new & qq & foo & york') AS query;
+                                     ts_rewrite                                      
+-------------------------------------------------------------------------------------
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+     ts_rewrite      
+---------------------
+ 'moskva' | 'moscow'
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+            ts_rewrite             
+-----------------------------------
+ 'hotel' & ( 'moskva' | 'moscow' )
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar & new & qq & foo & york') AS query;
+                                     ts_rewrite                                      
+-------------------------------------------------------------------------------------
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
+(1 row)
+
+CREATE INDEX qq ON test_tsquery USING gist (keyword tsquery_ops);
+SET enable_seqscan=OFF;
+SELECT keyword FROM test_tsquery WHERE keyword @> 'new';
+    keyword     
+----------------
+ 'new' & 'york'
+(1 row)
+
+SELECT keyword FROM test_tsquery WHERE keyword @> 'moscow';
+ keyword  
+----------
+ 'moscow'
+(1 row)
+
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'new';
+ keyword 
+---------
+(0 rows)
+
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'moscow';
+ keyword  
+----------
+ 'moscow'
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+     ts_rewrite      
+---------------------
+ 'moskva' | 'moscow'
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+            ts_rewrite             
+-----------------------------------
+ 'hotel' & ( 'moskva' | 'moscow' )
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar & new & qq & foo & york') AS query;
+                                     ts_rewrite                                      
+-------------------------------------------------------------------------------------
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+     ts_rewrite      
+---------------------
+ 'moskva' | 'moscow'
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+            ts_rewrite             
+-----------------------------------
+ 'hotel' & ( 'moskva' | 'moscow' )
+(1 row)
+
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar &  new & qq & foo & york') AS query;
+                                     ts_rewrite                                      
+-------------------------------------------------------------------------------------
+ 'citi' & 'foo' & ( 'bar' | 'qq' ) & ( 'nyc' | ( 'big' & 'appl' | 'new' & 'york' ) )
+(1 row)
+
+RESET enable_seqscan;
+--test GUC
+SET default_text_search_config=simple;
+SELECT to_tsvector('SKIES My booKs');
+        to_tsvector         
+----------------------------
+ 'my':2 'books':3 'skies':1
+(1 row)
+
+SELECT plainto_tsquery('SKIES My booKs');
+     plainto_tsquery      
+--------------------------
+ 'skies' & 'my' & 'books'
+(1 row)
+
+SELECT to_tsquery('SKIES & My | booKs');
+        to_tsquery        
+--------------------------
+ 'skies' & 'my' | 'books'
+(1 row)
+
+SET default_text_search_config=english;
+SELECT to_tsvector('SKIES My booKs');
+   to_tsvector    
+------------------
+ 'sky':1 'book':3
+(1 row)
+
+SELECT plainto_tsquery('SKIES My booKs');
+ plainto_tsquery 
+-----------------
+ 'sky' & 'book'
+(1 row)
+
+SELECT to_tsquery('SKIES & My | booKs');
+   to_tsquery   
+----------------
+ 'sky' | 'book'
+(1 row)
+
+--trigger
+-- GPDB doesn't allow updating the distribution key, so create a synthetic
+-- distribution key column.
+alter table test_tsvector add column distkey int4;
+alter table test_tsvector set distributed by (distkey);
+CREATE TRIGGER tsvectorupdate
+BEFORE UPDATE OR INSERT ON test_tsvector
+FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger(a, 'pg_catalog.english', t);
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
+ count 
+-------
+     0
+(1 row)
+
+INSERT INTO test_tsvector (t) VALUES ('345 qwerty');
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
+ count 
+-------
+     1
+(1 row)
+
+UPDATE test_tsvector SET t = null WHERE t = '345 qwerty';
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
+ count 
+-------
+     0
+(1 row)
+
+INSERT INTO test_tsvector (t) VALUES ('345 qwerty');
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
+ count 
+-------
+     1
+(1 row)
+
diff --git a/src/test/regress/expected/tstypes.out b/src/test/regress/expected/tstypes.out
new file mode 100644
index 000000000000..4672f099e0ac
--- /dev/null
+++ b/src/test/regress/expected/tstypes.out
@@ -0,0 +1,513 @@
+--Base tsvector test
+SELECT '1'::tsvector;
+ tsvector 
+----------
+ '1'
+(1 row)
+
+SELECT '1 '::tsvector;
+ tsvector 
+----------
+ '1'
+(1 row)
+
+SELECT ' 1'::tsvector;
+ tsvector 
+----------
+ '1'
+(1 row)
+
+SELECT ' 1 '::tsvector;
+ tsvector 
+----------
+ '1'
+(1 row)
+
+SELECT '1 2'::tsvector;
+ tsvector 
+----------
+ '1' '2'
+(1 row)
+
+SELECT '''1 2'''::tsvector;
+ tsvector 
+----------
+ '1 2'
+(1 row)
+
+SELECT E'''1 \\''2'''::tsvector;
+ tsvector 
+----------
+ '1 ''2'
+(1 row)
+
+SELECT E'''1 \\''2''3'::tsvector;
+  tsvector   
+-------------
+ '3' '1 ''2'
+(1 row)
+
+SELECT E'''1 \\''2'' 3'::tsvector;
+  tsvector   
+-------------
+ '3' '1 ''2'
+(1 row)
+
+SELECT E'''1 \\''2'' '' 3'' 4 '::tsvector;
+     tsvector     
+------------------
+ '4' ' 3' '1 ''2'
+(1 row)
+
+SELECT $$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector;
+                tsvector                
+----------------------------------------
+ '\\as' 'abc' 'AB\\c' 'ab\\c' 'ab\\\\c'
+(1 row)
+
+SELECT tsvectorin(tsvectorout($$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector));
+               tsvectorin               
+----------------------------------------
+ '\\as' 'abc' 'AB\\c' 'ab\\c' 'ab\\\\c'
+(1 row)
+
+SELECT '''w'':4A,3B,2C,1D,5 a:8';
+       ?column?        
+-----------------------
+ 'w':4A,3B,2C,1D,5 a:8
+(1 row)
+
+SELECT 'a:3A b:2a'::tsvector || 'ba:1234 a:1B';
+          ?column?          
+----------------------------
+ 'a':3A,4B 'b':2A 'ba':1237
+(1 row)
+
+SELECT setweight('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd zxc:81,567,222A'::tsvector, 'c');
+                        setweight                         
+----------------------------------------------------------
+ 'a':1C,3C 'w':5C,6C,12C,13C 'asd':1C 'zxc':81C,222C,567C
+(1 row)
+
+SELECT strip('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd'::tsvector);
+     strip     
+---------------
+ 'a' 'w' 'asd'
+(1 row)
+
+--Base tsquery test
+SELECT '1'::tsquery;
+ tsquery 
+---------
+ '1'
+(1 row)
+
+SELECT '1 '::tsquery;
+ tsquery 
+---------
+ '1'
+(1 row)
+
+SELECT ' 1'::tsquery;
+ tsquery 
+---------
+ '1'
+(1 row)
+
+SELECT ' 1 '::tsquery;
+ tsquery 
+---------
+ '1'
+(1 row)
+
+SELECT '''1 2'''::tsquery;
+ tsquery 
+---------
+ '1 2'
+(1 row)
+
+SELECT E'''1 \\''2'''::tsquery;
+ tsquery 
+---------
+ '1 ''2'
+(1 row)
+
+SELECT '!1'::tsquery;
+ tsquery 
+---------
+ !'1'
+(1 row)
+
+SELECT '1|2'::tsquery;
+  tsquery  
+-----------
+ '1' | '2'
+(1 row)
+
+SELECT '1|!2'::tsquery;
+  tsquery   
+------------
+ '1' | !'2'
+(1 row)
+
+SELECT '!1|2'::tsquery;
+  tsquery   
+------------
+ !'1' | '2'
+(1 row)
+
+SELECT '!1|!2'::tsquery;
+   tsquery   
+-------------
+ !'1' | !'2'
+(1 row)
+
+SELECT '!(!1|!2)'::tsquery;
+     tsquery      
+------------------
+ !( !'1' | !'2' )
+(1 row)
+
+SELECT '!(!1|2)'::tsquery;
+     tsquery     
+-----------------
+ !( !'1' | '2' )
+(1 row)
+
+SELECT '!(1|!2)'::tsquery;
+     tsquery     
+-----------------
+ !( '1' | !'2' )
+(1 row)
+
+SELECT '!(1|2)'::tsquery;
+    tsquery     
+----------------
+ !( '1' | '2' )
+(1 row)
+
+SELECT '1&2'::tsquery;
+  tsquery  
+-----------
+ '1' & '2'
+(1 row)
+
+SELECT '!1&2'::tsquery;
+  tsquery   
+------------
+ !'1' & '2'
+(1 row)
+
+SELECT '1&!2'::tsquery;
+  tsquery   
+------------
+ '1' & !'2'
+(1 row)
+
+SELECT '!1&!2'::tsquery;
+   tsquery   
+-------------
+ !'1' & !'2'
+(1 row)
+
+SELECT '(1&2)'::tsquery;
+  tsquery  
+-----------
+ '1' & '2'
+(1 row)
+
+SELECT '1&(2)'::tsquery;
+  tsquery  
+-----------
+ '1' & '2'
+(1 row)
+
+SELECT '!(1)&2'::tsquery;
+  tsquery   
+------------
+ !'1' & '2'
+(1 row)
+
+SELECT '!(1&2)'::tsquery;
+    tsquery     
+----------------
+ !( '1' & '2' )
+(1 row)
+
+SELECT '1|2&3'::tsquery;
+     tsquery     
+-----------------
+ '1' | '2' & '3'
+(1 row)
+
+SELECT '1|(2&3)'::tsquery;
+     tsquery     
+-----------------
+ '1' | '2' & '3'
+(1 row)
+
+SELECT '(1|2)&3'::tsquery;
+       tsquery       
+---------------------
+ ( '1' | '2' ) & '3'
+(1 row)
+
+SELECT '1|2&!3'::tsquery;
+     tsquery      
+------------------
+ '1' | '2' & !'3'
+(1 row)
+
+SELECT '1|!2&3'::tsquery;
+     tsquery      
+------------------
+ '1' | !'2' & '3'
+(1 row)
+
+SELECT '!1|2&3'::tsquery;
+     tsquery      
+------------------
+ !'1' | '2' & '3'
+(1 row)
+
+SELECT '!1|(2&3)'::tsquery;
+     tsquery      
+------------------
+ !'1' | '2' & '3'
+(1 row)
+
+SELECT '!(1|2)&3'::tsquery;
+       tsquery        
+----------------------
+ !( '1' | '2' ) & '3'
+(1 row)
+
+SELECT '(!1|2)&3'::tsquery;
+       tsquery        
+----------------------
+ ( !'1' | '2' ) & '3'
+(1 row)
+
+SELECT '1|(2|(4|(5|6)))'::tsquery;
+                 tsquery                 
+-----------------------------------------
+ '1' | ( '2' | ( '4' | ( '5' | '6' ) ) )
+(1 row)
+
+SELECT '1|2|4|5|6'::tsquery;
+                 tsquery                 
+-----------------------------------------
+ ( ( ( '1' | '2' ) | '4' ) | '5' ) | '6'
+(1 row)
+
+SELECT '1&(2&(4&(5&6)))'::tsquery;
+           tsquery           
+-----------------------------
+ '1' & '2' & '4' & '5' & '6'
+(1 row)
+
+SELECT '1&2&4&5&6'::tsquery;
+           tsquery           
+-----------------------------
+ '1' & '2' & '4' & '5' & '6'
+(1 row)
+
+SELECT '1&(2&(4&(5|6)))'::tsquery;
+             tsquery             
+---------------------------------
+ '1' & '2' & '4' & ( '5' | '6' )
+(1 row)
+
+SELECT '1&(2&(4&(5|!6)))'::tsquery;
+             tsquery              
+----------------------------------
+ '1' & '2' & '4' & ( '5' | !'6' )
+(1 row)
+
+SELECT E'1&(''2''&('' 4''&(\\|5 | ''6 \\'' !|&'')))'::tsquery;
+                 tsquery                  
+------------------------------------------
+ '1' & '2' & ' 4' & ( '|5' | '6 '' !|&' )
+(1 row)
+
+SELECT $$'\\as'$$::tsquery;
+ tsquery 
+---------
+ '\\as'
+(1 row)
+
+SELECT 'a' < 'b & c'::tsquery as "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT 'a' > 'b & c'::tsquery as "false";
+ false 
+-------
+ f
+(1 row)
+
+SELECT 'a | f' < 'b & c'::tsquery as "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT 'a | ff' < 'b & c'::tsquery as "false";
+ false 
+-------
+ f
+(1 row)
+
+SELECT 'a | f | g' < 'b & c'::tsquery as "false";
+ false 
+-------
+ f
+(1 row)
+
+SELECT numnode( 'new'::tsquery );
+ numnode 
+---------
+       1
+(1 row)
+
+SELECT numnode( 'new & york'::tsquery );
+ numnode 
+---------
+       3
+(1 row)
+
+SELECT numnode( 'new & york | qwery'::tsquery );
+ numnode 
+---------
+       5
+(1 row)
+
+SELECT 'foo & bar'::tsquery && 'asd';
+       ?column?        
+-----------------------
+ 'foo' & 'bar' & 'asd'
+(1 row)
+
+SELECT 'foo & bar'::tsquery || 'asd & fg';
+           ?column?           
+------------------------------
+ 'foo' & 'bar' | 'asd' & 'fg'
+(1 row)
+
+SELECT 'foo & bar'::tsquery || !!'asd & fg'::tsquery;
+             ?column?              
+-----------------------------------
+ 'foo' & 'bar' | !( 'asd' & 'fg' )
+(1 row)
+
+SELECT 'foo & bar'::tsquery && 'asd | fg';
+             ?column?             
+----------------------------------
+ 'foo' & 'bar' & ( 'asd' | 'fg' )
+(1 row)
+
+-- tsvector-tsquery operations
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca' as "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:B' as "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:A' as "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:C' as "false";
+ false 
+-------
+ f
+(1 row)
+
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:CB' as "true";
+ true 
+------
+ t
+(1 row)
+
+SELECT ts_rank(' a:1 s:2C d g'::tsvector, 'a | s');
+  ts_rank  
+-----------
+ 0.0911891
+(1 row)
+
+SELECT ts_rank(' a:1 s:2B d g'::tsvector, 'a | s');
+ ts_rank  
+----------
+ 0.151982
+(1 row)
+
+SELECT ts_rank(' a:1 s:2 d g'::tsvector, 'a | s');
+  ts_rank  
+-----------
+ 0.0607927
+(1 row)
+
+SELECT ts_rank(' a:1 s:2C d g'::tsvector, 'a & s');
+ ts_rank  
+----------
+ 0.140153
+(1 row)
+
+SELECT ts_rank(' a:1 s:2B d g'::tsvector, 'a & s');
+ ts_rank  
+----------
+ 0.198206
+(1 row)
+
+SELECT ts_rank(' a:1 s:2 d g'::tsvector, 'a & s');
+  ts_rank  
+-----------
+ 0.0991032
+(1 row)
+
+SELECT ts_rank_cd(' a:1 s:2C d g'::tsvector, 'a | s');
+ ts_rank_cd 
+------------
+        0.3
+(1 row)
+
+SELECT ts_rank_cd(' a:1 s:2B d g'::tsvector, 'a | s');
+ ts_rank_cd 
+------------
+        0.5
+(1 row)
+
+SELECT ts_rank_cd(' a:1 s:2 d g'::tsvector, 'a | s');
+ ts_rank_cd 
+------------
+        0.2
+(1 row)
+
+SELECT ts_rank_cd(' a:1 s:2C d g'::tsvector, 'a & s');
+ ts_rank_cd 
+------------
+   0.133333
+(1 row)
+
+SELECT ts_rank_cd(' a:1 s:2B d g'::tsvector, 'a & s');
+ ts_rank_cd 
+------------
+       0.16
+(1 row)
+
+SELECT ts_rank_cd(' a:1 s:2 d g'::tsvector, 'a & s');
+ ts_rank_cd 
+------------
+        0.1
+(1 row)
+
diff --git a/src/test/regress/expected/txid.out b/src/test/regress/expected/txid.out
new file mode 100644
index 000000000000..c94502d32279
--- /dev/null
+++ b/src/test/regress/expected/txid.out
@@ -0,0 +1,238 @@
+-- txid_snapshot data type and related functions
+-- i/o
+select '12:13:'::txid_snapshot;
+ txid_snapshot 
+---------------
+ 12:13:
+(1 row)
+
+select '12:18:14,16'::txid_snapshot;
+ txid_snapshot 
+---------------
+ 12:18:14,16
+(1 row)
+
+-- errors
+select '31:12:'::txid_snapshot;
+ERROR:  invalid input for txid_snapshot: "31:12:"
+LINE 1: select '31:12:'::txid_snapshot;
+               ^
+select '0:1:'::txid_snapshot;
+ERROR:  invalid input for txid_snapshot: "0:1:"
+LINE 1: select '0:1:'::txid_snapshot;
+               ^
+select '12:13:0'::txid_snapshot;
+ERROR:  invalid input for txid_snapshot: "12:13:0"
+LINE 1: select '12:13:0'::txid_snapshot;
+               ^
+select '12:16:14,13'::txid_snapshot;
+ERROR:  invalid input for txid_snapshot: "12:16:14,13"
+LINE 1: select '12:16:14,13'::txid_snapshot;
+               ^
+select '12:16:14,14'::txid_snapshot;
+ERROR:  invalid input for txid_snapshot: "12:16:14,14"
+LINE 1: select '12:16:14,14'::txid_snapshot;
+               ^
+create temp table snapshot_test (
+	nr	integer,
+	snap	txid_snapshot
+);
+insert into snapshot_test values (1, '12:13:');
+insert into snapshot_test values (2, '12:20:13,15,18');
+insert into snapshot_test values (3, '100001:100009:100005,100007,100008');
+insert into snapshot_test values (4, '100:150:101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131');
+select snap from snapshot_test order by nr;
+                                                                snap                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------
+ 12:13:
+ 12:20:13,15,18
+ 100001:100009:100005,100007,100008
+ 100:150:101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131
+(4 rows)
+
+select  txid_snapshot_xmin(snap),
+	txid_snapshot_xmax(snap),
+	txid_snapshot_xip(snap)
+from snapshot_test order by nr, 1, 2, 3;
+ txid_snapshot_xmin | txid_snapshot_xmax | txid_snapshot_xip 
+--------------------+--------------------+-------------------
+                 12 |                 20 |                13
+                 12 |                 20 |                15
+                 12 |                 20 |                18
+             100001 |             100009 |            100005
+             100001 |             100009 |            100007
+             100001 |             100009 |            100008
+                100 |                150 |               101
+                100 |                150 |               102
+                100 |                150 |               103
+                100 |                150 |               104
+                100 |                150 |               105
+                100 |                150 |               106
+                100 |                150 |               107
+                100 |                150 |               108
+                100 |                150 |               109
+                100 |                150 |               110
+                100 |                150 |               111
+                100 |                150 |               112
+                100 |                150 |               113
+                100 |                150 |               114
+                100 |                150 |               115
+                100 |                150 |               116
+                100 |                150 |               117
+                100 |                150 |               118
+                100 |                150 |               119
+                100 |                150 |               120
+                100 |                150 |               121
+                100 |                150 |               122
+                100 |                150 |               123
+                100 |                150 |               124
+                100 |                150 |               125
+                100 |                150 |               126
+                100 |                150 |               127
+                100 |                150 |               128
+                100 |                150 |               129
+                100 |                150 |               130
+                100 |                150 |               131
+(37 rows)
+
+select id, txid_visible_in_snapshot(id, snap)
+from snapshot_test, generate_series(11, 21) id
+where nr = 2;
+ id | txid_visible_in_snapshot 
+----+--------------------------
+ 11 | t
+ 12 | t
+ 13 | f
+ 14 | t
+ 15 | f
+ 16 | t
+ 17 | t
+ 18 | f
+ 19 | t
+ 20 | f
+ 21 | f
+(11 rows)
+
+-- test bsearch
+select id, txid_visible_in_snapshot(id, snap)
+from snapshot_test, generate_series(90, 160) id
+where nr = 4;
+ id  | txid_visible_in_snapshot 
+-----+--------------------------
+  90 | t
+  91 | t
+  92 | t
+  93 | t
+  94 | t
+  95 | t
+  96 | t
+  97 | t
+  98 | t
+  99 | t
+ 100 | t
+ 101 | f
+ 102 | f
+ 103 | f
+ 104 | f
+ 105 | f
+ 106 | f
+ 107 | f
+ 108 | f
+ 109 | f
+ 110 | f
+ 111 | f
+ 112 | f
+ 113 | f
+ 114 | f
+ 115 | f
+ 116 | f
+ 117 | f
+ 118 | f
+ 119 | f
+ 120 | f
+ 121 | f
+ 122 | f
+ 123 | f
+ 124 | f
+ 125 | f
+ 126 | f
+ 127 | f
+ 128 | f
+ 129 | f
+ 130 | f
+ 131 | f
+ 132 | t
+ 133 | t
+ 134 | t
+ 135 | t
+ 136 | t
+ 137 | t
+ 138 | t
+ 139 | t
+ 140 | t
+ 141 | t
+ 142 | t
+ 143 | t
+ 144 | t
+ 145 | t
+ 146 | t
+ 147 | t
+ 148 | t
+ 149 | t
+ 150 | f
+ 151 | f
+ 152 | f
+ 153 | f
+ 154 | f
+ 155 | f
+ 156 | f
+ 157 | f
+ 158 | f
+ 159 | f
+ 160 | f
+(71 rows)
+
+-- test current values also
+select txid_current() >= txid_snapshot_xmin(txid_current_snapshot());
+ ?column? 
+----------
+ t
+(1 row)
+
+-- we can't assume current is always less than xmax, however
+select txid_visible_in_snapshot(txid_current(), txid_current_snapshot());
+ txid_visible_in_snapshot 
+--------------------------
+ f
+(1 row)
+
+-- test 64bitness
+select txid_snapshot '1000100010001000:1000100010001100:1000100010001012,1000100010001013';
+                            txid_snapshot                            
+---------------------------------------------------------------------
+ 1000100010001000:1000100010001100:1000100010001012,1000100010001013
+(1 row)
+
+select txid_visible_in_snapshot('1000100010001012', '1000100010001000:1000100010001100:1000100010001012,1000100010001013');
+ txid_visible_in_snapshot 
+--------------------------
+ f
+(1 row)
+
+select txid_visible_in_snapshot('1000100010001015', '1000100010001000:1000100010001100:1000100010001012,1000100010001013');
+ txid_visible_in_snapshot 
+--------------------------
+ t
+(1 row)
+
+-- test 64bit overflow
+SELECT txid_snapshot '1:9223372036854775807:3';
+      txid_snapshot      
+-------------------------
+ 1:9223372036854775807:3
+(1 row)
+
+SELECT txid_snapshot '1:9223372036854775808:3';
+ERROR:  invalid input for txid_snapshot: "1:9223372036854775808:3"
+LINE 1: SELECT txid_snapshot '1:9223372036854775808:3';
+               ^
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index ba6440fc5f99..df4a18234c9c 100755
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -17,7 +17,7 @@ SELECT p1.oid, p1.typname
 FROM pg_type as p1
 WHERE p1.typnamespace = 0 OR
     (p1.typlen <= 0 AND p1.typlen != -1 AND p1.typlen != -2) OR
-    (p1.typtype not in ('b', 'c', 'd', 'p')) OR
+    (p1.typtype not in ('b', 'c', 'd', 'e', 'p')) OR
     NOT p1.typisdefined OR
     (p1.typalign not in ('c', 's', 'i', 'd')) OR
     (p1.typstorage not in ('p', 'x', 'e', 'm'));
@@ -56,20 +56,30 @@ WHERE (p1.typtype = 'c' AND p1.typrelid = 0) OR
 -----+---------
 (0 rows)
 
--- Look for basic types that don't have an array type.
+-- Look for basic or enum types that don't have an array type.
 -- NOTE: as of 8.0, this check finds smgr and unknown.
 SELECT p1.oid, p1.typname
 FROM pg_type as p1
-WHERE p1.typtype in ('b') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS
+WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS
     (SELECT 1 FROM pg_type as p2
      WHERE p2.typname = ('_' || p1.typname)::name AND
-           p2.typelem = p1.oid);
+           p2.typelem = p1.oid and p1.typarray = p2.oid);
  oid | typname 
 -----+---------
  210 | smgr
  705 | unknown
 (2 rows)
 
+-- Make sure typarray points to a varlena array type of our own base
+SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, 
+       p2.typelem, p2.typlen
+FROM   pg_type p1 LEFT JOIN pg_type p2 ON (p1.typarray = p2.oid)
+WHERE  p1.typarray <> 0 AND
+       (p2.oid IS NULL OR p2.typelem <> p1.oid OR p2.typlen <> -1);
+ oid | basetype | arraytype | typelem | typlen 
+-----+----------+-----------+---------+--------
+(0 rows)
+
 -- Text conversion routines must be provided.
 SELECT p1.oid, p1.typname
 FROM pg_type as p1
diff --git a/src/test/regress/expected/union_gp.out b/src/test/regress/expected/union_gp.out
index 597cb288e0b1..6d178d0aa4bd 100644
--- a/src/test/regress/expected/union_gp.out
+++ b/src/test/regress/expected/union_gp.out
@@ -45,14 +45,13 @@ select 1 a, row_number() over (partition by 'a') union all (select 1 a , 2 b);
  1 |          2
 (2 rows)
 
--- This can preserve domain types, but we keep compatibility for now
--- See MPP-7509
+-- This should preserve domain types
 select pg_typeof(a) from (select 'a'::information_schema.sql_identifier a union all
 select 'b'::information_schema.sql_identifier)a;
-     pg_typeof     
--------------------
- character varying
- character varying
+             pg_typeof             
+-----------------------------------
+ information_schema.sql_identifier
+ information_schema.sql_identifier
 (2 rows)
 
 (select * from (
diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
index 7a4ed3f8c6b1..2d10369f5d1b 100644
--- a/src/test/regress/expected/xml.out
+++ b/src/test/regress/expected/xml.out
@@ -462,7 +462,7 @@ SELECT table_name, view_definition FROM information_schema.views
  xmlview5   | SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse";
  xmlview6   | SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";
  xmlview7   | SELECT XMLROOT('<foo/>'::xml, VERSION NO VALUE, STANDALONE YES) AS "xmlroot";
- xmlview8   | SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS bpchar))::bpchar AS "xmlserialize";
+ xmlview8   | SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS character(10)))::character(10) AS "xmlserialize";
  xmlview9   | SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text) AS "xmlserialize";
 (9 rows)
 
diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source
index e1a651dd9b2e..cbe46478ce81 100755
--- a/src/test/regress/input/copy.source
+++ b/src/test/regress/input/copy.source
@@ -39,6 +39,8 @@ COPY hash_txt_heap FROM '@abs_srcdir@/data/hash.data';
 
 COPY hash_f8_heap FROM '@abs_srcdir@/data/hash.data';
 
+COPY test_tsvector FROM '@abs_srcdir@/data/tsearch.data';
+
 -- the data in this file has a lot of duplicates in the index key
 -- fields, leading to long bucket chains and lots of table expansion.
 -- this is therefore a stress test of the bucket overflow code (unlike
diff --git a/src/test/regress/input/largeobject.source b/src/test/regress/input/largeobject.source
index 961148d6e4a6..17f86ccbc551 100644
--- a/src/test/regress/input/largeobject.source
+++ b/src/test/regress/input/largeobject.source
@@ -14,11 +14,11 @@ BEGIN;
 
 -- lo_open(lobjId oid, mode integer) returns integer
 -- The mode parameter to lo_open uses two constants:
---   INV_READ  = 0x20000 = 2 * 16^4
---   INV_WRITE = 0x40000 = 4 * 16^4
+--   INV_READ  = 0x20000
+--   INV_WRITE = 0x40000
 -- The return value is a file descriptor-like value which remains valid for the
 -- transaction.
-UPDATE lotest_stash_values SET fd = lo_open(loid, CAST((2 | 4) * 16^4 AS integer));
+UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS integer));
 
 -- loread/lowrite names are wonky, different from other functions which are lo_*
 -- lowrite(fd integer, data bytea) returns integer
@@ -55,7 +55,7 @@ END;
 
 -- Read out a portion
 BEGIN;
-UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer));
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
 
 -- lo_lseek(fd integer, offset integer, whence integer) returns integer
 -- offset is in bytes, whence is one of three values:
@@ -83,6 +83,25 @@ SELECT lo_close(fd) FROM lotest_stash_values;
 
 END;
 
+-- Test truncation.
+BEGIN;
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
+
+SELECT lo_truncate(fd, 10) FROM lotest_stash_values;
+SELECT loread(fd, 15) FROM lotest_stash_values;
+
+SELECT lo_truncate(fd, 10000) FROM lotest_stash_values;
+SELECT loread(fd, 10) FROM lotest_stash_values;
+SELECT lo_lseek(fd, 0, 2) FROM lotest_stash_values;
+SELECT lo_tell(fd) FROM lotest_stash_values;
+
+SELECT lo_truncate(fd, 5000) FROM lotest_stash_values;
+SELECT lo_lseek(fd, 0, 2) FROM lotest_stash_values;
+SELECT lo_tell(fd) FROM lotest_stash_values;
+
+SELECT lo_close(fd) FROM lotest_stash_values;
+END;
+
 -- lo_unlink(lobjId oid) returns integer
 -- return value appears to always be 1
 SELECT lo_unlink(loid) from lotest_stash_values;
@@ -92,7 +111,7 @@ TRUNCATE lotest_stash_values;
 INSERT INTO lotest_stash_values (loid) SELECT lo_import('@abs_srcdir@/data/tenk.data');
 
 BEGIN;
-UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer));
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
 
 -- with the default BLKSZ, LOBLKSZ = 2048, so this positions us for a block
 -- edge case
diff --git a/src/test/regress/input/table_functions.source b/src/test/regress/input/table_functions.source
index dc2bec9a565a..45d3d3b6f3de 100644
--- a/src/test/regress/input/table_functions.source
+++ b/src/test/regress/input/table_functions.source
@@ -991,6 +991,8 @@ DEALLOCATE p1;
 
 -- FAIL: can't pass anytable as prepare argument
 PREPARE p2 AS SELECT * FROM multiset_2( $1 ) order by a, b;
+-- This actually passes currently. You can't do anything useful with the prepared
+-- statement though, as anytable's input function just throws an error.
 PREPARE p3(anytable) AS SELECT * FROM multiset_5( $1 );
 
 -- FAIL: $1 is not a constant
@@ -1003,8 +1005,8 @@ PREPARE p5(integer) AS SELECT * FROM project( TABLE( SELECT * FROM pg_am ), $1);
 PREPARE p6 AS SELECT * FROM project( TABLE( SELECT * FROM example_r ), 2) ORDER BY 1;
 EXECUTE p6;
 
--- FAIL: MPP-16640: when underlying table has changed prepared statements 
--- will fail.  If this issue is ever fixed then this should pass as well.
+-- PASS: Check that the prepared statement is re-planned when the underlying
+-- table changes.
 ALTER TABLE example_r ALTER COLUMN a TYPE numeric;
 EXECUTE p6;
 DEALLOCATE p6;
diff --git a/src/test/regress/mapred/agebracket.source b/src/test/regress/mapred/agebracket.source
index c0d752207744..2c33dd25b15b 100644
--- a/src/test/regress/mapred/agebracket.source
+++ b/src/test/regress/mapred/agebracket.source
@@ -27,6 +27,8 @@ DEFINE:
   - TRANSITION:
       NAME:     myAdd
       LANGUAGE: perlu
+      PARAMETERS: [state integer, value integer]
+      RETURNS: value integer
       FUNCTION: |
         my ($state, $value) = @_;
         return $state + $value;
diff --git a/src/test/regress/output/aocs.source b/src/test/regress/output/aocs.source
index cf8ecfc98fd9..33fce29c3684 100644
--- a/src/test/regress/output/aocs.source
+++ b/src/test/regress/output/aocs.source
@@ -1046,4 +1046,4 @@ a.c1
   1 | 2000000
 (1 row)
 
-drop table bms_ao_bug;
\ No newline at end of file
+drop table bms_ao_bug;
diff --git a/src/test/regress/output/copy.source b/src/test/regress/output/copy.source
index 9705a4f58de8..843d157ce66a 100755
--- a/src/test/regress/output/copy.source
+++ b/src/test/regress/output/copy.source
@@ -21,6 +21,7 @@ COPY hash_i4_heap FROM '@abs_srcdir@/data/hash.data';
 COPY hash_name_heap FROM '@abs_srcdir@/data/hash.data';
 COPY hash_txt_heap FROM '@abs_srcdir@/data/hash.data';
 COPY hash_f8_heap FROM '@abs_srcdir@/data/hash.data';
+COPY test_tsvector FROM '@abs_srcdir@/data/tsearch.data';
 -- the data in this file has a lot of duplicates in the index key
 -- fields, leading to long bucket chains and lots of table expansion.
 -- this is therefore a stress test of the bucket overflow code (unlike
diff --git a/src/test/regress/output/external_table.source b/src/test/regress/output/external_table.source
index 14b630d69410..4043b4ef3b1a 100644
--- a/src/test/regress/output/external_table.source
+++ b/src/test/regress/output/external_table.source
@@ -553,15 +553,15 @@ SELECT relname, linenum, errmsg FROM gp_read_error_log('tableless_ext');
 -- Earlier these functions were hidden from the catalog and would not show up
 -- in pg_proc
 SELECT * from pg_proc where proname = 'gp_read_error_log';
-      proname      | pronamespace | proowner | prolang | procost | prorows | provariadic | proisagg | prosecdef | proisstrict | proretset | provolatile | pronargs | pronargdefaults | prorettype | proiswin | proargtypes |         proallargtypes         |     proargmodes     |                                 proargnames                                 | proargdefaults |      prosrc       | probin | proacl | prodataaccess 
--------------------+--------------+----------+---------+---------+---------+-------------+----------+-----------+-------------+-----------+-------------+----------+-----------------+------------+----------+-------------+--------------------------------+---------------------+-----------------------------------------------------------------------------+----------------+-------------------+--------+--------+---------------
- gp_read_error_log |           11 |       10 |      12 |       1 |    1000 |           0 | f        | f         | t           | t         | v           |        1 |               0 |       2249 | f        | 25          | {25,1184,25,25,23,23,25,25,17} | {i,o,o,o,o,o,o,o,o} | {exttable,cmdtime,relname,filename,linenum,bytenum,errmsg,rawdata,rawbytes} |                | gp_read_error_log |        |        | s
+      proname      | pronamespace | proowner | prolang | procost | prorows | provariadic | proisagg | prosecdef | proisstrict | proretset | provolatile | pronargs | pronargdefaults | prorettype | proiswin | proargtypes |         proallargtypes         |     proargmodes     |                                 proargnames                                 | proargdefaults |      prosrc       | probin | proconfig | proacl | prodataaccess 
+-------------------+--------------+----------+---------+---------+---------+-------------+----------+-----------+-------------+-----------+-------------+----------+-----------------+------------+----------+-------------+--------------------------------+---------------------+-----------------------------------------------------------------------------+----------------+-------------------+--------+-----------+--------+---------------
+ gp_read_error_log |           11 |       10 |      12 |       1 |    1000 |           0 | f        | f         | t           | t         | v           |        1 |               0 |       2249 | f        | 25          | {25,1184,25,25,23,23,25,25,17} | {i,o,o,o,o,o,o,o,o} | {exttable,cmdtime,relname,filename,linenum,bytenum,errmsg,rawdata,rawbytes} |                | gp_read_error_log |        |           |        | s
 (1 row)
 
 SELECT * from pg_proc where proname = 'gp_truncate_error_log';
-        proname        | pronamespace | proowner | prolang | procost | prorows | provariadic | proisagg | prosecdef | proisstrict | proretset | provolatile | pronargs | pronargdefaults | prorettype | proiswin | proargtypes | proallargtypes | proargmodes | proargnames | proargdefaults |        prosrc         | probin | proacl | prodataaccess 
------------------------+--------------+----------+---------+---------+---------+-------------+----------+-----------+-------------+-----------+-------------+----------+-----------------+------------+----------+-------------+----------------+-------------+-------------+----------------+-----------------------+--------+--------+---------------
- gp_truncate_error_log |           11 |       10 |      12 |       1 |       0 |           0 | f        | f         | t           | f         | v           |        1 |               0 |         16 | f        | 25          |                |             |             |                | gp_truncate_error_log |        |        | m
+        proname        | pronamespace | proowner | prolang | procost | prorows | provariadic | proisagg | prosecdef | proisstrict | proretset | provolatile | pronargs | pronargdefaults | prorettype | proiswin | proargtypes | proallargtypes | proargmodes | proargnames | proargdefaults |        prosrc         | probin | proconfig | proacl | prodataaccess 
+-----------------------+--------------+----------+---------+---------+---------+-------------+----------+-----------+-------------+-----------+-------------+----------+-----------------+------------+----------+-------------+----------------+-------------+-------------+----------------+-----------------------+--------+-----------+--------+---------------
+ gp_truncate_error_log |           11 |       10 |      12 |       1 |       0 |           0 | f        | f         | t           | f         | v           |        1 |               0 |         16 | f        | 25          |                |             |             |                | gp_truncate_error_log |        |           |        | m
 (1 row)
 
 -- Test for error log functionality 
@@ -1836,7 +1836,7 @@ CONTEXT:  SQL statement "SELECT sum(distinct e1.i) as sum_i, sum(distinct e2.i)
 	   (SELECT i, j FROM exttab_udfs_1 WHERE i < 5 ) e1,
 	   (SELECT i, j FROM exttab_udfs_2 WHERE i < 10) e2
 	   group by e1.j"
-PL/pgSQL function "exttab_udfs_func1" line 2 at execute statement
+PL/pgSQL function "exttab_udfs_func1" line 2 at EXECUTE statement
 -- Should be populated
 SELECT COUNT(*) > 0 FROM 
 (
@@ -1875,7 +1875,7 @@ CONTEXT:  SQL statement "SELECT sum(distinct e1.i) as sum_i, sum(distinct e2.i)
 	   (SELECT i, j FROM exttab_udfs_1 WHERE i < 5 ) e1,
 	   (SELECT i, j FROM exttab_udfs_2 WHERE i < 10) e2
 	   group by e1.j"
-PL/pgSQL function "exttab_udfs_func1" line 2 at execute statement
+PL/pgSQL function "exttab_udfs_func1" line 2 at EXECUTE statement
 SELECT * FROM exttab_udfs_insert_1;
  a 
 ---
diff --git a/src/test/regress/output/largeobject.source b/src/test/regress/output/largeobject.source
index 6d6e5cd24cf8..36b51fdccddf 100644
--- a/src/test/regress/output/largeobject.source
+++ b/src/test/regress/output/largeobject.source
@@ -11,11 +11,11 @@ INSERT INTO lotest_stash_values (loid) SELECT lo_creat(42);
 BEGIN;
 -- lo_open(lobjId oid, mode integer) returns integer
 -- The mode parameter to lo_open uses two constants:
---   INV_READ  = 0x20000 = 2 * 16^4
---   INV_WRITE = 0x40000 = 4 * 16^4
+--   INV_READ  = 0x20000
+--   INV_WRITE = 0x40000
 -- The return value is a file descriptor-like value which remains valid for the
 -- transaction.
-UPDATE lotest_stash_values SET fd = lo_open(loid, CAST((2 | 4) * 16^4 AS integer));
+UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS integer));
 -- loread/lowrite names are wonky, different from other functions which are lo_*
 -- lowrite(fd integer, data bytea) returns integer
 -- the integer is the number of bytes written
@@ -58,7 +58,7 @@ SELECT lo_close(fd) FROM lotest_stash_values;
 END;
 -- Read out a portion
 BEGIN;
-UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer));
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
 -- lo_lseek(fd integer, offset integer, whence integer) returns integer
 -- offset is in bytes, whence is one of three values:
 --  SEEK_SET (= 0) meaning relative to beginning
@@ -115,6 +115,70 @@ SELECT lo_close(fd) FROM lotest_stash_values;
         0
 (1 row)
 
+END;
+-- Test truncation.
+BEGIN;
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
+SELECT lo_truncate(fd, 10) FROM lotest_stash_values;
+ lo_truncate 
+-------------
+           0
+(1 row)
+
+SELECT loread(fd, 15) FROM lotest_stash_values;
+    loread     
+---------------
+ \012Whose woo
+(1 row)
+
+SELECT lo_truncate(fd, 10000) FROM lotest_stash_values;
+ lo_truncate 
+-------------
+           0
+(1 row)
+
+SELECT loread(fd, 10) FROM lotest_stash_values;
+                  loread                  
+------------------------------------------
+ \000\000\000\000\000\000\000\000\000\000
+(1 row)
+
+SELECT lo_lseek(fd, 0, 2) FROM lotest_stash_values;
+ lo_lseek 
+----------
+    10000
+(1 row)
+
+SELECT lo_tell(fd) FROM lotest_stash_values;
+ lo_tell 
+---------
+   10000
+(1 row)
+
+SELECT lo_truncate(fd, 5000) FROM lotest_stash_values;
+ lo_truncate 
+-------------
+           0
+(1 row)
+
+SELECT lo_lseek(fd, 0, 2) FROM lotest_stash_values;
+ lo_lseek 
+----------
+     5000
+(1 row)
+
+SELECT lo_tell(fd) FROM lotest_stash_values;
+ lo_tell 
+---------
+    5000
+(1 row)
+
+SELECT lo_close(fd) FROM lotest_stash_values;
+ lo_close 
+----------
+        0
+(1 row)
+
 END;
 -- lo_unlink(lobjId oid) returns integer
 -- return value appears to always be 1
@@ -127,7 +191,7 @@ SELECT lo_unlink(loid) from lotest_stash_values;
 TRUNCATE lotest_stash_values;
 INSERT INTO lotest_stash_values (loid) SELECT lo_import('@abs_srcdir@/data/tenk.data');
 BEGIN;
-UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer));
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
 -- with the default BLKSZ, LOBLKSZ = 2048, so this positions us for a block
 -- edge case
 SELECT lo_lseek(fd, 2030, 0) FROM lotest_stash_values;
diff --git a/src/test/regress/output/largeobject_1.source b/src/test/regress/output/largeobject_1.source
new file mode 100644
index 000000000000..f1157e457188
--- /dev/null
+++ b/src/test/regress/output/largeobject_1.source
@@ -0,0 +1,275 @@
+--
+-- Test large object support
+--
+-- Load a file
+CREATE TABLE lotest_stash_values (loid oid, fd integer);
+-- lo_creat(mode integer) returns oid
+-- The mode arg to lo_creat is unused, some vestigal holdover from ancient times
+-- returns the large object id
+INSERT INTO lotest_stash_values (loid) SELECT lo_creat(42);
+-- NOTE: large objects require transactions
+BEGIN;
+-- lo_open(lobjId oid, mode integer) returns integer
+-- The mode parameter to lo_open uses two constants:
+--   INV_READ  = 0x20000
+--   INV_WRITE = 0x40000
+-- The return value is a file descriptor-like value which remains valid for the
+-- transaction.
+UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS integer));
+-- loread/lowrite names are wonky, different from other functions which are lo_*
+-- lowrite(fd integer, data bytea) returns integer
+-- the integer is the number of bytes written
+SELECT lowrite(fd, '
+Whose woods these are I think I know,
+His house is in the village though.
+He will not see me stopping here,
+To watch his woods fill up with snow.
+
+My little horse must think it queer,
+To stop without a farmhouse near,
+Between the woods and frozen lake,
+The darkest evening of the year.
+
+He gives his harness bells a shake,
+To ask if there is some mistake.
+The only other sound''s the sweep,
+Of easy wind and downy flake.
+
+The woods are lovely, dark and deep,
+But I have promises to keep,
+And miles to go before I sleep,
+And miles to go before I sleep.
+
+         -- Robert Frost
+') FROM lotest_stash_values;
+ lowrite 
+---------
+     578
+(1 row)
+
+-- lo_close(fd integer) returns integer
+-- return value is 0 for success, or <0 for error (actually only -1, but...)
+SELECT lo_close(fd) FROM lotest_stash_values;
+ lo_close 
+----------
+        0
+(1 row)
+
+END;
+-- Read out a portion
+BEGIN;
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
+-- lo_lseek(fd integer, offset integer, whence integer) returns integer
+-- offset is in bytes, whence is one of three values:
+--  SEEK_SET (= 0) meaning relative to beginning
+--  SEEK_CUR (= 1) meaning relative to current position
+--  SEEK_END (= 2) meaning relative to end (offset better be negative)
+-- returns current position in file
+SELECT lo_lseek(fd, 422, 0) FROM lotest_stash_values;
+ lo_lseek 
+----------
+      422
+(1 row)
+
+-- loread/lowrite names are wonky, different from other functions which are lo_*
+-- loread(fd integer, len integer) returns bytea
+SELECT loread(fd, 35) FROM lotest_stash_values;
+               loread                
+-------------------------------------
+ The woods are lovely, dark and deep
+(1 row)
+
+SELECT lo_lseek(fd, -19, 1) FROM lotest_stash_values;
+ lo_lseek 
+----------
+      438
+(1 row)
+
+SELECT lowrite(fd, 'n') FROM lotest_stash_values;
+ lowrite 
+---------
+       1
+(1 row)
+
+SELECT lo_tell(fd) FROM lotest_stash_values;
+ lo_tell 
+---------
+     439
+(1 row)
+
+SELECT lo_lseek(fd, -156, 2) FROM lotest_stash_values;
+ lo_lseek 
+----------
+      422
+(1 row)
+
+SELECT loread(fd, 35) FROM lotest_stash_values;
+               loread                
+-------------------------------------
+ The woods are lonely, dark and deep
+(1 row)
+
+SELECT lo_close(fd) FROM lotest_stash_values;
+ lo_close 
+----------
+        0
+(1 row)
+
+END;
+-- Test truncation.
+BEGIN;
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
+SELECT lo_truncate(fd, 10) FROM lotest_stash_values;
+ lo_truncate 
+-------------
+           0
+(1 row)
+
+SELECT loread(fd, 15) FROM lotest_stash_values;
+    loread     
+---------------
+ \012Whose woo
+(1 row)
+
+SELECT lo_truncate(fd, 10000) FROM lotest_stash_values;
+ lo_truncate 
+-------------
+           0
+(1 row)
+
+SELECT loread(fd, 10) FROM lotest_stash_values;
+                  loread                  
+------------------------------------------
+ \000\000\000\000\000\000\000\000\000\000
+(1 row)
+
+SELECT lo_lseek(fd, 0, 2) FROM lotest_stash_values;
+ lo_lseek 
+----------
+    10000
+(1 row)
+
+SELECT lo_tell(fd) FROM lotest_stash_values;
+ lo_tell 
+---------
+   10000
+(1 row)
+
+SELECT lo_truncate(fd, 5000) FROM lotest_stash_values;
+ lo_truncate 
+-------------
+           0
+(1 row)
+
+SELECT lo_lseek(fd, 0, 2) FROM lotest_stash_values;
+ lo_lseek 
+----------
+     5000
+(1 row)
+
+SELECT lo_tell(fd) FROM lotest_stash_values;
+ lo_tell 
+---------
+    5000
+(1 row)
+
+SELECT lo_close(fd) FROM lotest_stash_values;
+ lo_close 
+----------
+        0
+(1 row)
+
+END;
+-- lo_unlink(lobjId oid) returns integer
+-- return value appears to always be 1
+SELECT lo_unlink(loid) from lotest_stash_values;
+ lo_unlink 
+-----------
+         1
+(1 row)
+
+TRUNCATE lotest_stash_values;
+INSERT INTO lotest_stash_values (loid) SELECT lo_import('@abs_srcdir@/data/tenk.data');
+BEGIN;
+UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
+-- with the default BLKSZ, LOBLKSZ = 2048, so this positions us for a block
+-- edge case
+SELECT lo_lseek(fd, 2030, 0) FROM lotest_stash_values;
+ lo_lseek 
+----------
+     2030
+(1 row)
+
+-- this should get half of the value from page 0 and half from page 1 of the
+-- large object
+SELECT loread(fd, 36) FROM lotest_stash_values;
+                             loread                              
+--------------------------------------------------------------
+ 44\011144\0111144\0114144\0119144\01188\01189\011SNAAAA\011F
+(1 row)
+
+SELECT lo_tell(fd) FROM lotest_stash_values;
+ lo_tell 
+---------
+    2066
+(1 row)
+
+SELECT lo_lseek(fd, -26, 1) FROM lotest_stash_values;
+ lo_lseek 
+----------
+     2040
+(1 row)
+
+SELECT lowrite(fd, 'abcdefghijklmnop') FROM lotest_stash_values;
+ lowrite 
+---------
+      16
+(1 row)
+
+SELECT lo_lseek(fd, 2030, 0) FROM lotest_stash_values;
+ lo_lseek 
+----------
+     2030
+(1 row)
+
+SELECT loread(fd, 36) FROM lotest_stash_values;
+                       loread                        
+--------------------------------------------------
+ 44\011144\011114abcdefghijklmnop9\011SNAAAA\011F
+(1 row)
+
+SELECT lo_close(fd) FROM lotest_stash_values;
+ lo_close 
+----------
+        0
+(1 row)
+
+END;
+SELECT lo_export(loid, '@abs_builddir@/results/lotest.txt') FROM lotest_stash_values;
+ lo_export 
+-----------
+         1
+(1 row)
+
+\lo_import 'results/lotest.txt'
+\set newloid :LASTOID
+-- just make sure \lo_export does not barf
+\lo_export :newloid 'results/lotest2.txt'
+-- This is a hack to test that export/import are reversible
+-- This uses knowledge about the inner workings of large object mechanism
+-- which should not be used outside it.  This makes it a HACK
+SELECT pageno, data FROM pg_largeobject WHERE loid = (SELECT loid from lotest_stash_values)
+EXCEPT
+SELECT pageno, data FROM pg_largeobject WHERE loid = :newloid;
+ pageno | data 
+--------+------
+(0 rows)
+
+SELECT lo_unlink(loid) FROM lotest_stash_values;
+ lo_unlink 
+-----------
+         1
+(1 row)
+
+\lo_unlink :newloid
+TRUNCATE lotest_stash_values;
diff --git a/src/test/regress/output/misc.source b/src/test/regress/output/misc.source
index 95c542ba1888..e34fc21fec50 100755
--- a/src/test/regress/output/misc.source
+++ b/src/test/regress/output/misc.source
@@ -606,6 +606,7 @@ SELECT user_relns() AS user_relns
  interval_tbl
  iportaltest
  lseg_tbl
+ money_data
  num_data
  num_exp_add
  num_exp_div
@@ -640,6 +641,7 @@ SELECT user_relns() AS user_relns
  tab2
  tenk1
  tenk2
+ test_tsvector
  text_tbl
  time_tbl
  timestamp_tbl
@@ -649,7 +651,7 @@ SELECT user_relns() AS user_relns
  toyemp
  usr_define_type
  varchar_tbl
-(145 rows)
+(147 rows)
 
 SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer')));
  name 
diff --git a/src/test/regress/output/partindex_test.source b/src/test/regress/output/partindex_test.source
index 7546b9d605ce..4ee5dbe7433a 100644
--- a/src/test/regress/output/partindex_test.source
+++ b/src/test/regress/output/partindex_test.source
@@ -53,9 +53,9 @@ NOTICE:  building index for child partition "part_table1_1_prt_part2"
 select indKey, indpred, partCons from gp_build_logical_index('part_table1'::regclass)
 as index(logicalIndexOid Oid, nColumns smallint, indKey text, indUnique bool, indPred text, indExprs text, partCons text, defaultLevels text, indType int2)
 where indpred is NOT NULL;
- indkey |                                                                                                                                                                                                                                                                                           indpred                                                                                                                                                                                                                                                                                           | partcons 
---------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------
- 1      | {BOOLEXPR :boolop and :args ({OPEXPR :opno 525 :opfuncid 150 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 1 0 0 0 0 0 0 0 ]})} {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 10 0 0 0 0 0 0 0 ]})})} | 
+ indkey |                                                                                                                                                                                                                                                                                                           indpred                                                                                                                                                                                                                                                                                                           | partcons 
+--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------
+ 1      | {BOOLEXPR :boolop and :args ({OPEXPR :opno 525 :opfuncid 150 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 1 0 0 0 0 0 0 0 ]})} {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 10 0 0 0 0 0 0 0 ]})})} | 
 (1 row)
 
 -- add a new part - index automatically created 
@@ -72,9 +72,9 @@ as index(logicalIndexOid Oid, nColumns smallint, indKey text, indUnique bool, in
 select indKey, indpred, partCons from gp_build_logical_index('part_table1'::regclass)
 as index(logicalIndexOid Oid, nColumns smallint, indKey text, indUnique bool, indPred text, indExprs text, partCons text, defaultLevels text, indType int2) 
 where indpred is NOT NULL;
- indkey |                                                                                                                                                                                                                                                                                           indpred                                                                                                                                                                                                                                                                                           | partcons 
---------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------
- 1      | {BOOLEXPR :boolop and :args ({OPEXPR :opno 525 :opfuncid 150 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 1 0 0 0 0 0 0 0 ]})} {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 10 0 0 0 0 0 0 0 ]})})} | 
+ indkey |                                                                                                                                                                                                                                                                                                           indpred                                                                                                                                                                                                                                                                                                           | partcons 
+--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------
+ 1      | {BOOLEXPR :boolop and :args ({OPEXPR :opno 525 :opfuncid 150 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 1 0 0 0 0 0 0 0 ]})} {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 10 0 0 0 0 0 0 0 ]})})} | 
 (1 row)
 
 -- create index on just 1 part
@@ -373,9 +373,9 @@ NOTICE:  building index for child partition "part_table2_1_prt_13_2_prt_other_re
 select indKey, indPred, defaultLevels, partCons from gp_build_logical_index('part_table2'::regclass)
 as index(logicalIndexOid Oid, nColumns smallint, indKey text, indUnique bool, indPred text, indExprs text, partCons text, defaultLevels text, indType int2)
 where indPred is NOT NULL;
- indkey |                                                                                                                                                                                                                                                                                            indpred                                                                                                                                                                                                                                                                                             | defaultlevels | partcons 
---------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+----------
- 1      | {BOOLEXPR :boolop and :args ({OPEXPR :opno 525 :opfuncid 150 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ -24 3 0 0 0 0 0 0 ]})} {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ -48 7 0 0 0 0 0 0 ]})})} |               | 
+ indkey |                                                                                                                                                                                                                                                                                                            indpred                                                                                                                                                                                                                                                                                                             | defaultlevels | partcons 
+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+----------
+ 1      | {BOOLEXPR :boolop and :args ({OPEXPR :opno 525 :opfuncid 150 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ -24 3 0 0 0 0 0 0 ]})} {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ -48 7 0 0 0 0 0 0 ]})})} |               | 
 (1 row)
 
 -- create index on expression on all parts
@@ -888,18 +888,18 @@ create index part_table5_i3 on part_table5_1_prt_def(abs(c1));
 select indPred, indExprs, partCons from gp_build_logical_index('part_table5'::regclass)
 as index(logicalIndexOid Oid, nColumns smallint, indKey text, indUnique bool, indPred text, indExprs text, partCons text, defaultLevels text, indType int2)
 where defaultLevels is NULL and partcons is NULL;
-                                                                                                                                    indpred                                                                                                                                     | indexprs | partcons 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------+----------
- {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 100 0 0 0 0 0 0 0 ]})} |          | 
+                                                                                                                                            indpred                                                                                                                                             | indexprs | partcons 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------+----------
+ {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 100 0 0 0 0 0 0 0 ]})} |          | 
 (1 row)
 
 -- returns 1 row with index on whole table
 select indPred from gp_build_logical_index('part_table5'::regclass)
 as index(logicalIndexOid Oid, nColumns smallint, indKey text, indUnique bool, indPred text, indExprs text, partCons text, defaultLevels text, indType int2)
 where partCons is NULL;
-                                                                                                                                    indpred                                                                                                                                     
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 100 0 0 0 0 0 0 0 ]})}
+                                                                                                                                            indpred                                                                                                                                             
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ {OPEXPR :opno 97 :opfuncid 66 :opresulttype 16 :opretset false :args ({VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varlevelsup 0 :varnoold 1 :varoattno 1} {CONST :consttype 23 :consttypmod -1 :constlen 4 :constbyval true :constisnull false :constvalue 4 [ 100 0 0 0 0 0 0 0 ]})}
 (1 row)
 
 -- returns 1 row with index on default part
diff --git a/src/test/regress/output/table_functions.source b/src/test/regress/output/table_functions.source
index 72329694786c..3c6165293964 100644
--- a/src/test/regress/output/table_functions.source
+++ b/src/test/regress/output/table_functions.source
@@ -2170,12 +2170,12 @@ View definition:
  SELECT tf.a, tf.b
    FROM multiset_2(TABLE( SELECT example.a, example.b
            FROM example
-          SCATTER BY example.a::text || example.b, 5)) tf(a, b);
+          SCATTER BY example.a || example.b, 5)) tf(a, b);
 
 SELECT pg_get_viewdef('v2'::regclass);
-                                                               pg_get_viewdef                                                                
----------------------------------------------------------------------------------------------------------------------------------------------
- SELECT tf.a, tf.b FROM multiset_2(TABLE(SELECT example.a, example.b FROM example SCATTER BY ((example.a)::text || example.b), 5)) tf(a, b);
+                                                           pg_get_viewdef                                                            
+-------------------------------------------------------------------------------------------------------------------------------------
+ SELECT tf.a, tf.b FROM multiset_2(TABLE(SELECT example.a, example.b FROM example SCATTER BY (example.a || example.b), 5)) tf(a, b);
 (1 row)
 
 CREATE VIEW v3 AS
@@ -3067,8 +3067,9 @@ ERROR:  function multiset_2(unknown) does not exist
 LINE 1: PREPARE p2 AS SELECT * FROM multiset_2( $1 ) order by a, b;
                                     ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+-- This actually passes currently. You can't do anything useful with the prepared
+-- statement though, as anytable's input function just throws an error.
 PREPARE p3(anytable) AS SELECT * FROM multiset_5( $1 );
-ERROR:  type "anytable" is not a valid parameter for PREPARE
 -- FAIL: $1 is not a constant
 PREPARE p4 AS SELECT * FROM project( TABLE( SELECT * FROM pg_am ), $1);
 ERROR:  unable to resolve function argument (execQual.c:5348)
@@ -3097,12 +3098,24 @@ EXECUTE p6;
   value4.1/1
 (10 rows)
 
--- FAIL: MPP-16640: when underlying table has changed prepared statements 
--- will fail.  If this issue is ever fixed then this should pass as well.
+-- PASS: Check that the prepared statement is re-planned when the underlying
+-- table changes.
 ALTER TABLE example_r ALTER COLUMN a TYPE numeric;
 EXECUTE p6;
-ERROR:  attribute 1 has wrong type (execQual.c:642)  (seg1 slice1 maple.local:50001 pid=64248) (cdbdisp.c:1462)
-DETAIL:  Table has type numeric, but query expects integer.
+      b      
+-------------
+  value1.1/4
+  value1.2/4
+  value1.3/4
+  value1.4/4
+  value2.1/3
+  value2.2/3
+  value2.3/3
+  value3.1/2
+  value3.2/2
+  value4.1/1
+(10 rows)
+
 DEALLOCATE p6;
 -- =======
 -- Cleanup
diff --git a/src/test/regress/output/table_functions_optimizer.source b/src/test/regress/output/table_functions_optimizer.source
index 9486396fdfa6..5797a4206696 100644
--- a/src/test/regress/output/table_functions_optimizer.source
+++ b/src/test/regress/output/table_functions_optimizer.source
@@ -2171,12 +2171,12 @@ View definition:
  SELECT tf.a, tf.b
    FROM multiset_2(TABLE( SELECT example.a, example.b
            FROM example
-          SCATTER BY example.a::text || example.b, 5)) tf(a, b);
+          SCATTER BY example.a || example.b, 5)) tf(a, b);
 
 SELECT pg_get_viewdef('v2'::regclass);
-                                                               pg_get_viewdef                                                                
----------------------------------------------------------------------------------------------------------------------------------------------
- SELECT tf.a, tf.b FROM multiset_2(TABLE(SELECT example.a, example.b FROM example SCATTER BY ((example.a)::text || example.b), 5)) tf(a, b);
+                                                           pg_get_viewdef                                                            
+-------------------------------------------------------------------------------------------------------------------------------------
+ SELECT tf.a, tf.b FROM multiset_2(TABLE(SELECT example.a, example.b FROM example SCATTER BY (example.a || example.b), 5)) tf(a, b);
 (1 row)
 
 CREATE VIEW v3 AS
@@ -3068,8 +3068,9 @@ ERROR:  function multiset_2(unknown) does not exist
 LINE 1: PREPARE p2 AS SELECT * FROM multiset_2( $1 ) order by a, b;
                                     ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+-- This actually passes currently. You can't do anything useful with the prepared
+-- statement though, as anytable's input function just throws an error.
 PREPARE p3(anytable) AS SELECT * FROM multiset_5( $1 );
-ERROR:  type "anytable" is not a valid parameter for PREPARE
 -- FAIL: $1 is not a constant
 PREPARE p4 AS SELECT * FROM project( TABLE( SELECT * FROM pg_am ), $1);
 ERROR:  unable to resolve function argument (execQual.c:5348)
@@ -3098,12 +3099,24 @@ EXECUTE p6;
   value4.1/1
 (10 rows)
 
--- FAIL: MPP-16640: when underlying table has changed prepared statements 
--- will fail.  If this issue is ever fixed then this should pass as well.
+-- PASS: Check that the prepared statement is re-planned when the underlying
+-- table changes.
 ALTER TABLE example_r ALTER COLUMN a TYPE numeric;
 EXECUTE p6;
-ERROR:  attribute 1 has wrong type (execQual.c:642)  (seg1 slice1 maple.local:50001 pid=64248) (cdbdisp.c:1462)
-DETAIL:  Table has type numeric, but query expects integer.
+      b      
+-------------
+  value1.1/4
+  value1.2/4
+  value1.3/4
+  value1.4/4
+  value2.1/3
+  value2.2/3
+  value2.3/3
+  value3.1/2
+  value3.2/2
+  value4.1/1
+(10 rows)
+
 DEALLOCATE p6;
 -- =======
 -- Cleanup
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index 74243967f82c..fe1dac504ba7 100755
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -1,8 +1,14 @@
 # ----------
-# The first group of parallel test
-# $PostgreSQL: pgsql/src/test/regress/parallel_schedule,v 1.39 2007/02/09 03:35:35 tgl Exp $
+# $PostgreSQL: pgsql/src/test/regress/parallel_schedule,v 1.46 2007/11/24 19:49:23 darcy Exp $
+#
+# By convention, we put no more than twenty tests in any one parallel group;
+# this limits the number of connections needed to run the tests.
+# ----------
+
 # ----------
-test: boolean char name varchar text int2 int4 int8 oid float4 float8 bit numeric uuid
+# The first group of parallel tests
+# ----------
+test: boolean char name varchar text int2 int4 int8 oid float4 float8 bit numeric txid uuid enum money
 
 # Depends on things setup during char, varchar and text
 test: strings
@@ -10,14 +16,16 @@ test: strings
 test: numerology
 
 # ----------
-# The second group of parallel test
+# The second group of parallel tests
 # ----------
-test: point lseg box path polygon circle date time timetz timestamp timestamptz interval abstime reltime tinterval inet comments oidjoins type_sanity opr_sanity
+test: point lseg box path polygon circle date time timetz timestamp timestamptz interval abstime reltime tinterval inet tstypes comments
 
-# Depends on point, lseg, box, path, polygon and circle
-test: geometry
-# Depends on interval, timetz, timestamp, timestamptz, reltime and abstime
-test: horology
+# ----------
+# Another group of parallel tests
+# geometry depends on point, lseg, box, path, polygon and circle
+# horology depends on interval, timetz, timestamp, timestamptz, reltime and abstime
+# ----------
+test: geometry horology oidjoins type_sanity opr_sanity
 
 # ----------
 # These four each depend on the previous one
@@ -37,7 +45,7 @@ test: create_function_2
 test: copy copyselect
 
 # ----------
-# The third group of parallel test
+# Another group of parallel tests
 # ----------
 test: constraints create_misc create_aggregate create_operator vacuum drop_if_exists
 
@@ -70,7 +78,7 @@ test: select
 ignore: random
 
 # ----------
-# The fourth group of parallel test
+# Another group of parallel tests
 # ----------
 test: select_into select_distinct select_distinct_on select_implicit select_having subselect union case join aggregates random portals arrays btree_index hash_index update delete lock
 
@@ -91,9 +99,9 @@ test: privileges
 test: misc
 
 # ----------
-# The fifth group of parallel test
+# Another group of parallel tests
 # ----------
-test: select_views portals_p2 cluster dependency guc
+test: select_views portals_p2 cluster dependency guc tsearch tsdicts
 
 # 'rules' test is disabled in GPDB. Maintaining the list of views in it is
 # too painful, and there are also errors because of cross-segment UPDATEs
@@ -109,10 +117,10 @@ test: select_views portals_p2 cluster dependency guc
 #test: foreign_key
 
 # ----------
-# The sixth group of parallel test
+# Another group of parallel tests
 # ----------
 # "plpgsql" cannot run concurrently with "rules"
-test: limit copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table sequence polymorphism rowtypes xml
+test: plancache limit copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table sequence polymorphism rowtypes xml
 
 # 83MERGE_FIXME: the largeobject test is temporarily disabled due to test errors
 # test: largeobject
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 76c6efe9554f..5ae3ba7d9da4 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.36 2007/07/18 21:19:17 alvherre Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.41.2.4 2009/11/14 15:39:41 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -86,6 +86,7 @@ static char *encoding = NULL;
 static _stringlist *schedulelist = NULL;
 static _stringlist *extra_tests = NULL;
 static char *temp_install = NULL;
+static char *temp_config = NULL;
 static char *top_builddir = NULL;
 static int	temp_port = 65432;
 static bool nolocale = false;
@@ -414,16 +415,18 @@ replace_string(char *string, char *replace, char *replacement)
  * the given suffix.
  */
 static void
-convert_sourcefiles_in(char *source, char *dest, char *suffix)
+convert_sourcefiles_in(char *source, char * dest_dir, char *dest, char *suffix)
 {
 	char		abs_srcdir[MAXPGPATH];
 	char		abs_builddir[MAXPGPATH];
 	char		testtablespace[MAXPGPATH];
 	char		indir[MAXPGPATH];
-	char		outdir[MAXPGPATH];
+	struct stat st;
+	int			ret;
 	char	  **name;
 	char	  **names;
 	int			count = 0;
+
 #ifdef WIN32
 	char	   *c;
 #endif
@@ -436,8 +439,8 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix)
 	}
 
 	/*
-	 * in a VPATH build, use the provided source directory; otherwise, use
-	 * the current directory.
+	 * in a VPATH build, use the provided source directory; otherwise, use the
+	 * current directory.
 	 */
 	if (srcdir)
 		strlcpy(abs_srcdir, srcdir, MAXPGPATH);
@@ -445,15 +448,32 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix)
 		strlcpy(abs_srcdir, abs_builddir, MAXPGPATH);
 
 	snprintf(indir, MAXPGPATH, "%s/%s", abs_srcdir, source);
+
+	/* Check that indir actually exists and is a directory */
+	ret = stat(indir, &st);
+	if (ret != 0 || !S_ISDIR(st.st_mode))
+	{
+		/*
+		 * No warning, to avoid noise in tests that do not have
+		 * these directories; for example, ecpg, contrib and src/pl.
+		 */
+		return;
+	}
+
 	names = pgfnames(indir);
 	if (!names)
 		/* Error logged in pgfnames */
 		exit_nicely(2);
 
 	/* also create the output directory if not present */
-	snprintf(outdir, sizeof(outdir), "%s/%s", abs_srcdir, dest);
-	if (!directory_exists(outdir))
-		make_directory(outdir);
+	{
+		char		outdir[MAXPGPATH];
+
+		snprintf(outdir, MAXPGPATH, "%s/%s", dest_dir, dest);
+
+		if (!directory_exists(outdir))
+			make_directory(outdir);
+	}
 
 #ifdef WIN32
 	/* in Win32, replace backslashes with forward slashes */
@@ -465,7 +485,6 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix)
 			*c = '/';
 #endif
 
-	/* try to create the test tablespace dir if it doesn't exist */
 	snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", abs_builddir);
 
 #ifdef WIN32
@@ -506,7 +525,8 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix)
 		/* build the full actual paths to open */
 		snprintf(prefix, strlen(*name) - 6, "%s", *name);
 		snprintf(srcfile, MAXPGPATH, "%s/%s", indir, *name);
-		snprintf(destfile, MAXPGPATH, "%s/%s.%s", outdir, prefix, suffix);
+		snprintf(destfile, MAXPGPATH, "%s/%s/%s.%s", dest_dir, dest, 
+				 prefix, suffix);
 
 		infile = fopen(srcfile, "r");
 		if (!infile)
@@ -573,20 +593,10 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix)
 static void
 convert_sourcefiles(void)
 {
-	struct stat	st;
-	int		ret;
-
-	ret = stat("input", &st);
-	if (ret == 0 && S_ISDIR(st.st_mode))
-		convert_sourcefiles_in("input", "sql", "sql");
-
-	ret = stat("output", &st);
-	if (ret == 0 && S_ISDIR(st.st_mode))
-		convert_sourcefiles_in("output", "expected", "out");
+	convert_sourcefiles_in("input", inputdir, "sql", "sql");
+	convert_sourcefiles_in("output", outputdir, "expected", "out");
 
-	ret = stat("mapred", &st);
-	if (ret == 0 && S_ISDIR(st.st_mode))
-		convert_sourcefiles_in("mapred", "yml", "yml");
+	convert_sourcefiles_in("mapred", inputdir, "yml", "yml");
 }
 
 /*
@@ -842,6 +852,19 @@ initialize_environment(void)
 			doputenv("PGPORT", s);
 		}
 
+		/*
+		 * GNU make stores some flags in the MAKEFLAGS environment variable to
+		 * pass arguments to its own children.	If we are invoked by make,
+		 * that causes the make invoked by us to think its part of the make
+		 * task invoking us, and so it tries to communicate with the toplevel
+		 * make.  Which fails.
+		 *
+		 * Unset the variable to protect against such problems.  We also reset
+		 * MAKELEVEL to be certain the child doesn't notice the make above us.
+		 */
+		unsetenv("MAKEFLAGS");
+		unsetenv("MAKELEVEL");
+
 		/*
 		 * Adjust path variables to point into the temp-install tree
 		 */
@@ -872,8 +895,10 @@ initialize_environment(void)
 		add_to_path("LD_LIBRARY_PATH", ':', libdir);
 		add_to_path("DYLD_LIBRARY_PATH", ':', libdir);
 		add_to_path("LIBPATH", ':', libdir);
-#if defined(WIN32) || defined(__CYGWIN__)
+#if defined(WIN32)
 		add_to_path("PATH", ';', libdir);
+#elif defined(__CYGWIN__)
+		add_to_path("PATH", ':', libdir);
 #endif
 	}
 	else
@@ -1030,57 +1055,6 @@ spawn_process(const char *cmdline)
 
 	ZeroMemory(&si, sizeof(si));
 	si.cb = sizeof(si);
-	
-	Advapi32Handle = LoadLibrary("ADVAPI32.DLL");
-	if (Advapi32Handle != NULL)
-	{
-      _CreateRestrictedToken = (__CreateRestrictedToken) GetProcAddress(Advapi32Handle, "CreateRestrictedToken");
-   }
-   
-   if (_CreateRestrictedToken == NULL)
-   {
-      if (Advapi32Handle != NULL)
-      	FreeLibrary(Advapi32Handle);
-      fprintf(stderr, "ERROR: Unable to create restricted tokens on this platform\n");
-      exit_nicely(2);
-   }
-
-   /* Open the current token to use as base for the restricted one */
-   if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &origToken))
-   {
-      fprintf(stderr, "Failed to open process token: %lu\n", GetLastError());
-      exit_nicely(2);
-   }
-
-	/* Allocate list of SIDs to remove */
-	ZeroMemory(&dropSids, sizeof(dropSids));
-	if (!AllocateAndInitializeSid(&NtAuthority, 2,
-			SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &dropSids[0].Sid) ||
-		 !AllocateAndInitializeSid(&NtAuthority, 2,
-		   SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0, 0, &dropSids[1].Sid))
-   {
-      fprintf(stderr, "Failed to allocate SIDs: %lu\n", GetLastError());
-      exit_nicely(2);
-   }
-	
-	b = _CreateRestrictedToken(origToken,
-          DISABLE_MAX_PRIVILEGE,
-          sizeof(dropSids)/sizeof(dropSids[0]),
-          dropSids,
-          0, NULL,
-          0, NULL,
-          &restrictedToken);
-
-   FreeSid(dropSids[1].Sid);
-   FreeSid(dropSids[0].Sid);
-   CloseHandle(origToken);
-   FreeLibrary(Advapi32Handle);
-   
-   if (!b)
-   {
-      fprintf(stderr, "Failed to create restricted token: %lu\n", GetLastError());
-      exit_nicely(2);
-   }
 
 	Advapi32Handle = LoadLibrary("ADVAPI32.DLL");
 	if (Advapi32Handle != NULL)
@@ -1162,7 +1136,7 @@ spawn_process(const char *cmdline)
 
 	free(cmdline2);
 
-	ResumeThread(pi.hThread);
+    ResumeThread(pi.hThread);
 	CloseHandle(pi.hThread);
 	return pi.hProcess;
 #endif
@@ -1757,7 +1731,7 @@ run_schedule(const char *schedule, test_function tfunc)
 				bool		newdiff;
 
 				if (tl)
-					tl = tl->next;		/* tl has the same length as rl and el
+					tl = tl->next;		/* tl has the same lengt has rl and el
 										 * if it exists */
 
 				newdiff = results_differ(tests[i], rl->str, el->str);
@@ -1849,7 +1823,7 @@ run_single_test(const char *test, test_function tfunc)
 		bool		newdiff;
 
 		if (tl)
-			tl = tl->next;		/* tl has the same length as rl and el if it
+			tl = tl->next;		/* tl has the same lengt has rl and el if it
 								 * exists */
 
 		newdiff = results_differ(test, rl->str, el->str);
@@ -2143,6 +2117,7 @@ help(void)
 	printf(_("  --no-locale               use C locale\n"));
 	printf(_("  --top-builddir=DIR        (relative) path to top level build directory\n"));
 	printf(_("  --temp-port=PORT          port number to start temp postmaster on\n"));
+	printf(_("  --temp-config=PATH        append contents of PATH to temporary config\n"));
 	printf(_("\n"));
 	printf(_("Options for using an existing installation:\n"));
 	printf(_("  --host=HOST               use postmaster running on HOST\n"));
@@ -2186,7 +2161,8 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 		{"psqldir", required_argument, NULL, 16},
 		{"srcdir", required_argument, NULL, 17},
 		{"create-role", required_argument, NULL, 18},
-        {"init-file", required_argument, NULL, 19},
+		{"temp-config", required_argument, NULL, 19},
+        {"init-file", required_argument, NULL, 20},
 		{NULL, 0, NULL, 0}
 	};
 
@@ -2282,10 +2258,13 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 			case 18:
 				split_to_stringlist(strdup(optarg), ", ", &extraroles);
 				break;
-            case 19:
+			case 19:
+				temp_config = strdup(optarg);
+				break;
+            case 20:
                 initfile = strdup(optarg);
                 break;
-            default:
+			default:
 				/* getopt_long already emitted a complaint */
 				fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"),
 						progname);
@@ -2374,6 +2353,32 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 			exit_nicely(2);
 		}
 
+		/* add any extra config specified to the postgresql.conf */
+		if (temp_config != NULL)
+		{
+			FILE	   *extra_conf;
+			FILE	   *pg_conf;
+			char		line_buf[1024];
+
+			snprintf(buf, sizeof(buf), "%s/data/postgresql.conf", temp_install);
+			pg_conf = fopen(buf, "a");
+			if (pg_conf == NULL)
+			{
+				fprintf(stderr, _("\n%s: could not open %s for adding extra config:\nError was %s\n"), progname, buf, strerror(errno));
+				exit_nicely(2);
+			}
+			extra_conf = fopen(temp_config, "r");
+			if (extra_conf == NULL)
+			{
+				fprintf(stderr, _("\n%s: could not open %s to read extra config:\nError was %s\n"), progname, temp_config, strerror(errno));
+				exit_nicely(2);
+			}
+			while (fgets(line_buf, sizeof(line_buf), extra_conf) != NULL)
+				fputs(line_buf, pg_conf);
+			fclose(extra_conf);
+			fclose(pg_conf);
+		}
+
 		/*
 		 * Start the temp postmaster
 		 */
diff --git a/src/test/regress/pg_regress.h b/src/test/regress/pg_regress.h
index 94db0b4d4559..40b6e7727656 100644
--- a/src/test/regress/pg_regress.h
+++ b/src/test/regress/pg_regress.h
@@ -42,6 +42,7 @@ extern bool debug;
 extern char *inputdir;
 extern char *outputdir;
 extern bool optimizer_enabled;
+
 /*
  * This should not be global but every module should be able to read command
  * line parameters.
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 69f78326b316..80c129cb47f8 100755
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/test/regress/serial_schedule,v 1.37 2007/02/09 03:35:35 tgl Exp $
+# $PostgreSQL: pgsql/src/test/regress/serial_schedule,v 1.43 2007/11/24 20:41:35 tgl Exp $
 # This should probably be in an order similar to parallel_schedule.
 test: boolean
 test: char
@@ -13,7 +13,10 @@ test: float4
 test: float8
 test: bit
 test: numeric
+test: txid
 test: uuid
+test: enum
+test: money
 test: strings
 test: numerology
 test: point
@@ -32,12 +35,13 @@ test: abstime
 test: reltime
 test: tinterval
 test: inet
+test: tstypes
 test: comments
+test: geometry
+test: horology
 test: oidjoins
 test: type_sanity
 test: opr_sanity
-test: geometry
-test: horology
 test: insert
 test: create_function_1
 test: create_type
@@ -90,6 +94,8 @@ test: cluster
 test: dependency
 test: guc
 test: combocid
+test: tsearch
+test: plancache
 test: limit
 ignore: plpgsql
 test: copy2
@@ -99,6 +105,7 @@ test: rangefuncs
 test: prepare
 test: without_oid
 test: conversion
+test: tsdicts
 test: truncate
 test: alter_table
 test: sequence
diff --git a/src/test/regress/sql/.gitignore b/src/test/regress/sql/.gitignore
index e8668668f325..480f514f95a7 100644
--- a/src/test/regress/sql/.gitignore
+++ b/src/test/regress/sql/.gitignore
@@ -1,18 +1,20 @@
+/constraints.sql
+/copy.sql
+/create_function_1.sql
+/create_function_2.sql
+/largeobject.sql
+/misc.sql
+/tablespace.sql
+
 restore_restoredb.sql
 sreh.sql
-tablespace.sql
 upg2.sql
 gptokencheck.sql
 loadcat33.sql
 loadcat34.sql
-misc.sql
 bkuprestore_advance.sql
 bkuprestore_cleanup.sql
 caql.sql
-constraints.sql
-copy.sql
-create_function_1.sql
-create_function_2.sql
 aocs.sql
 appendonly.sql
 bkup_bkupdb.sql
diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index 9aac5940ddd3..ae7fd80b215e 100644
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -80,6 +80,12 @@ group by ten
 having exists (select 1 from onek b
                where sum(distinct a.four + b.four) = b.four);
 
+-- Test handling of sublinks within outer-level aggregates.
+-- Per bug report from Daniel Grace.
+select
+  (select max((select i.unique2 from tenk1 i where i.unique1 = o.unique1)))
+from tenk1 o;
+
 --
 -- test for bitwise integer aggregates
 --
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index ba3c3d7307c3..1fc235e1ab35 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -177,8 +177,8 @@ DROP TABLE oldcor;
 -- typname is out of sync
 CREATE TABLE cor (a int, b float, c text);
 UPDATE pg_type SET typname='newcor' WHERE typrelid='cor'::regclass;
-ALTER TABLE cor RENAME TO newcor;
-ALTER TABLE newcor RENAME TO cor;
+ALTER TABLE cor RENAME TO newcor2;
+ALTER TABLE newcor2 RENAME TO cor;
 DROP TABLE cor;
 
 -- relname is out of sync
@@ -547,7 +547,7 @@ drop table atacc1;
 
 -- adding a new column as primary key to a non-empty table.
 -- should fail unless the column has a non-null default value.
-create table atacc1 ( test int ) distributed by (test);
+create table atacc1 ( test int );
 insert into atacc1 (test) values (0);
 -- add a primary key column without a default (fails).
 alter table atacc1 add column test2 int primary key;
@@ -1103,6 +1103,15 @@ select * from another order by 1,2;
 
 drop table another;
 
+-- disallow recursive containment of row types
+create temp table recur1 (f1 int);
+alter table recur1 add column f2 recur1; -- fails
+alter table recur1 add column f2 recur1[]; -- fails
+create temp table recur2 (f1 int, f2 recur1);
+alter table recur1 add column f2 recur2; -- fails
+alter table recur1 add column f2 int;
+alter table recur1 alter column f2 type recur2; -- fails
+
 --
 -- alter function
 --
@@ -1229,7 +1238,8 @@ select relname, relnatts from pg_class where relname = 'ao1';
 -- check col details in pg_attribute
 select  pg_class.relname, attname, typname from pg_attribute, pg_class, pg_type where attrelid = pg_class.oid and pg_class.relname = 'ao1' and atttypid = pg_type.oid and attname = 'col3';
 
--- no explicit entry in pg_attrdef for NULL default
+-- There's an explicit entry in pg_attrdef for the NULL default (although it has
+-- the same effect as no entry).
 select relname, attname, adsrc from pg_class, pg_attribute, pg_attrdef where attrelid = pg_class.oid and adrelid = pg_class.oid and adnum = pg_attribute.attnum and pg_class.relname = 'ao1';
 
 
@@ -1313,7 +1323,8 @@ select relname, relnatts from pg_class where relname = 'aoco1';
 -- check col details in pg_attribute
 select  pg_class.relname, attname, typname from pg_attribute, pg_class, pg_type where attrelid = pg_class.oid and pg_class.relname = 'aoco1' and atttypid = pg_type.oid and attname = 'col3';
 
--- no explicit entry in pg_attrdef for NULL default
+-- There's an explicit entry in pg_attrdef for the NULL default (although it has
+-- the same effect as no entry).
 select relname, attname, adsrc from pg_class, pg_attribute, pg_attrdef where attrelid = pg_class.oid and adrelid = pg_class.oid and adnum = pg_attribute.attnum and pg_class.relname = 'aoco1';
 
 --- 
diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql
index 893a53d4e6f8..d7b6ccbda413 100644
--- a/src/test/regress/sql/arrays.sql
+++ b/src/test/regress/sql/arrays.sql
@@ -328,6 +328,34 @@ INSERT INTO arraggtest (f1, f2, f3) VALUES
 ('{}','{{pink,white,blue,red,grey,orange}}','{2.1,1.87,1.4,2.2}');
 SELECT max(f1), min(f1), max(f2), min(f2), max(f3), min(f3) FROM arraggtest;
 
+-- A few simple tests for arrays of composite types
+
+create type comptype as (f1 int, f2 text);
+
+create table comptable (c1 comptype, c2 comptype[], distkey int4) distributed by (distkey);
+
+-- XXX would like to not have to specify row() construct types here ...
+insert into comptable
+  values (row(1,'foo'), array[row(2,'bar')::comptype, row(3,'baz')::comptype]);
+
+-- check that implicitly named array type _comptype isn't a problem
+create type _comptype as enum('fooey');
+
+select c1, c2 from comptable;
+select c2[2].f2 from comptable;
+
+drop type _comptype;
+drop table comptable;
+drop type comptype;
+
+-- Insert/update on a column that is array of composite
+
+create temp table t1 (f1 int8_tbl[], distkey int4) distributed by (distkey);
+insert into t1 (f1[5].q1) values(42);
+select f1 from t1;
+update t1 set f1[5].q2 = 43;
+select f1 from t1;
+
 create or replace function unnest1(anyarray)
 returns setof anyelement as $$
 select $1[s] from generate_subscripts($1,1) g(s);
diff --git a/src/test/regress/sql/bitmapscan.sql b/src/test/regress/sql/bitmapscan.sql
index 8799a486aab7..01dafc408d6a 100644
--- a/src/test/regress/sql/bitmapscan.sql
+++ b/src/test/regress/sql/bitmapscan.sql
@@ -279,3 +279,5 @@ INSERT INTO card_heap_table_w_bitmap (id, v, highCardinalityHighDomain)
  SELECT i, CAST(i AS VARCHAR), i % 50000 FROM generate_series(1000001, 1050000) i;
 
 SELECT COUNT(DISTINCT(highCardinalityHighDomain)) AS distinct_hchd FROM card_heap_table_w_bitmap ORDER BY distinct_hchd;
+
+drop table if exists bm_test;
diff --git a/src/test/regress/sql/boolean.sql b/src/test/regress/sql/boolean.sql
index 4282c15d5d13..f875deeddf2a 100644
--- a/src/test/regress/sql/boolean.sql
+++ b/src/test/regress/sql/boolean.sql
@@ -14,7 +14,7 @@ SELECT 1 AS one;
 
 SELECT bool 't' AS true;
 
-SELECT bool 'f' AS false;
+SELECT bool '   f           ' AS false;
 
 SELECT bool 't' or bool 'f' AS true;
 
@@ -26,6 +26,14 @@ SELECT bool 't' = bool 'f' AS false;
 
 SELECT bool 't' <> bool 'f' AS true;
 
+-- explicit casts to/from text
+SELECT 'TrUe'::text::boolean AS true, 'fAlse'::text::boolean AS false;
+SELECT '    true   '::text::boolean AS true,
+       '     FALSE'::text::boolean AS false;
+SELECT true::boolean::text AS true, false::boolean::text AS false;
+
+SELECT '  tru e '::text::boolean AS invalid;    -- error
+SELECT ''::text::boolean AS invalid;            -- error
 
 CREATE TABLE BOOLTBL1 (f1 bool);
 
diff --git a/src/test/regress/sql/case_gp.sql b/src/test/regress/sql/case_gp.sql
index 0bf996c7a750..025a8c1198a1 100644
--- a/src/test/regress/sql/case_gp.sql
+++ b/src/test/regress/sql/case_gp.sql
@@ -89,7 +89,7 @@ SELECT a,b,c,CASE c WHEN IS NOT DISTINCT FROM b THEN a
 -- DECODE(): Oracle compatibility
 --
 SELECT decode(null,null,true,false);
-SELECT decode(NULL, 1, 100, NULL, 200, 300);
+SELECT decode(NULL::integer, 1, 100, NULL, 200, 300);
 SELECT decode('1'::text, '1', 100, '2', 200);
 SELECT decode(2, 1, 'ABC', 2, 'DEF');
 SELECT decode('2009-02-05'::date, '2009-02-05', 'ok');
diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql
index 9ca31458f9ca..711bc29ba43f 100644
--- a/src/test/regress/sql/cluster.sql
+++ b/src/test/regress/sql/cluster.sql
@@ -74,7 +74,8 @@ SELECT a,b,c,substring(d for 30), length(d) from clstr_tst ORDER BY 1;
 -- Verify that foreign key link still works
 INSERT INTO clstr_tst (b, c) VALUES (1111, 'this should fail');
 
-SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass;
+SELECT conname FROM pg_constraint WHERE conrelid = 'clstr_tst'::regclass
+ORDER BY 1;
 
 
 SELECT relname, relkind,
@@ -123,7 +124,7 @@ INSERT INTO clstr_3 VALUES (1);
 CLUSTER clstr_2;
 
 CLUSTER clstr_1_pkey ON clstr_1;
-CLUSTER clstr_2_pkey ON clstr_2;
+CLUSTER clstr_2 USING clstr_2_pkey;
 SELECT * FROM clstr_1 UNION ALL
   SELECT * FROM clstr_2 UNION ALL
   SELECT * FROM clstr_3 ORDER BY 1;
@@ -154,8 +155,43 @@ INSERT INTO clstr_1 VALUES (1);
 CLUSTER clstr_1;
 SELECT * FROM clstr_1 ORDER BY 1;
 
+-- Test MVCC-safety of cluster. There isn't much we can do to verify the
+-- results with a single backend...
+
+CREATE TABLE clustertest (key int, distkey int) DISTRIBUTED BY (distkey);
+CREATE INDEX clustertest_pkey ON clustertest (key);
+
+INSERT INTO clustertest VALUES (10, 1);
+INSERT INTO clustertest VALUES (20, 2);
+INSERT INTO clustertest VALUES (30, 1);
+INSERT INTO clustertest VALUES (40, 2);
+INSERT INTO clustertest VALUES (50, 3);
+
+-- Use a transaction so that updates are not committed when CLUSTER sees 'em
+BEGIN;
+
+-- Test update where the old row version is found first in the scan
+UPDATE clustertest SET key = 100 WHERE key = 10;
+
+-- Test update where the new row version is found first in the scan
+UPDATE clustertest SET key = 35 WHERE key = 40;
+
+-- Test longer update chain 
+UPDATE clustertest SET key = 60 WHERE key = 50;
+UPDATE clustertest SET key = 70 WHERE key = 60;
+UPDATE clustertest SET key = 80 WHERE key = 70;
+
+SELECT key FROM clustertest;
+CLUSTER clustertest_pkey ON clustertest;
+SELECT key FROM clustertest;
+
+COMMIT;
+
+SELECT key FROM clustertest;
+
 -- clean up
 \c -
+DROP TABLE clustertest;
 DROP TABLE clstr_1;
 DROP TABLE clstr_2;
 DROP TABLE clstr_3;
diff --git a/src/test/regress/sql/copy2.sql b/src/test/regress/sql/copy2.sql
index b193388ab8cd..7c23ba253c4e 100644
--- a/src/test/regress/sql/copy2.sql
+++ b/src/test/regress/sql/copy2.sql
@@ -1,4 +1,4 @@
-CREATE TABLE x (
+CREATE TEMP TABLE x (
 	a serial,
 	b int,
 	c text not null default 'stuff',
@@ -116,7 +116,7 @@ COPY x TO stdout;
 COPY x (c, e) TO stdout;
 COPY x (b, e) TO stdout WITH NULL 'I''m null';
 
-CREATE TABLE y (
+CREATE TEMP TABLE y (
 	col1 text,
 	col2 text
 );
diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
index 7785b01d4019..172a36c89b09 100644
--- a/src/test/regress/sql/create_index.sql
+++ b/src/test/regress/sql/create_index.sql
@@ -96,6 +96,8 @@ SELECT * FROM fast_emp4000
 
 SELECT count(*) FROM fast_emp4000 WHERE home_base && '(1000,1000,0,0)'::box;
 
+SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
+
 SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
     ORDER BY (poly_center(f1))[0];
 
@@ -119,6 +121,8 @@ SELECT * FROM fast_emp4000
 
 SELECT count(*) FROM fast_emp4000 WHERE home_base && '(1000,1000,0,0)'::box;
 
+SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
+
 SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
     ORDER BY (poly_center(f1))[0];
 
@@ -193,7 +197,7 @@ CREATE INDEX func_index_index on func_index_heap (textcat(f1,f2));
 INSERT INTO func_index_heap VALUES('ABC','DEF');
 INSERT INTO func_index_heap VALUES('AB','CDEFG');
 INSERT INTO func_index_heap VALUES('QWE','RTY');
--- this should fail because of unique index:
+-- this should fail because of unique index: (In GPDB, the index isn't unique, so no error)
 INSERT INTO func_index_heap VALUES('ABCD', 'EF');
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
@@ -209,7 +213,7 @@ CREATE  INDEX func_index_index on func_index_heap ((f1 || f2) text_ops);
 INSERT INTO func_index_heap VALUES('ABC','DEF');
 INSERT INTO func_index_heap VALUES('AB','CDEFG');
 INSERT INTO func_index_heap VALUES('QWE','RTY');
--- this should fail because of unique index:
+-- this should fail because of unique index: (In GPDB, the index isn't unique, so no error)
 INSERT INTO func_index_heap VALUES('ABCD', 'EF');
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
@@ -228,20 +232,22 @@ create index hash_f8_index_3 on hash_f8_heap(random) where seqno > 1000;
 -- Unfortunately this only tests about half the code paths because there are
 -- no concurrent updates happening to the table at the same time.
 
-CREATE TABLE concur_heap (f1 text, f2 text) distributed by (f1);
+CREATE TABLE concur_heap (f1 text, f2 text, dk text) distributed by (dk);
 -- empty table
 CREATE INDEX CONCURRENTLY concur_index1 ON concur_heap(f2,f1);
 -- MPP-9772, MPP-9773: re-enable CREATE INDEX CONCURRENTLY (off by default)
 set gp_create_index_concurrently=true;
 CREATE INDEX CONCURRENTLY concur_index1 ON concur_heap(f2,f1);
-INSERT INTO concur_heap VALUES  ('a','b');
-INSERT INTO concur_heap VALUES  ('b','b');
+INSERT INTO concur_heap VALUES  ('a','b', '1');
+INSERT INTO concur_heap VALUES  ('b','b', '1');
+INSERT INTO concur_heap VALUES  ('c','c', '2');
+INSERT INTO concur_heap VALUES  ('d','d', '3');
 -- unique index
-CREATE UNIQUE INDEX CONCURRENTLY concur_index2 ON concur_heap(f1);
+CREATE UNIQUE INDEX CONCURRENTLY concur_index2 ON concur_heap(dk, f1);
 -- check if constraint is set up properly to be enforced
-INSERT INTO concur_heap VALUES ('b','x');
+INSERT INTO concur_heap VALUES ('b','x', '1');
 -- check if constraint is enforced properly at build time
---CREATE UNIQUE INDEX CONCURRENTLY concur_index3 ON concur_heap(f2);
+CREATE UNIQUE INDEX CONCURRENTLY concur_index3 ON concur_heap(dk, f2);
 -- test that expression indexes and partial indexes work concurrently
 CREATE INDEX CONCURRENTLY concur_index4 on concur_heap(f2) WHERE f1='a';
 CREATE INDEX CONCURRENTLY concur_index5 on concur_heap(f2) WHERE f1='x';
@@ -264,3 +270,45 @@ COMMIT;
 \d concur_heap
 
 DROP TABLE concur_heap;
+
+--
+-- Tests for IS NULL with b-tree indexes
+--
+
+SELECT unique1, unique2 INTO onek_with_null FROM onek;
+INSERT INTO onek_with_null (unique1,unique2) VALUES (NULL, -1), (NULL, NULL);
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2,unique1);
+
+SET enable_seqscan = OFF;
+SET enable_indexscan = ON;
+SET enable_bitmapscan = ON;
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+
+DROP INDEX onek_nulltest;
+
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2 desc,unique1);
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+
+DROP INDEX onek_nulltest;
+
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2 desc nulls last,unique1);
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+
+DROP INDEX onek_nulltest;
+
+CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2  nulls first,unique1);
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
+
+RESET enable_seqscan;
+RESET enable_indexscan;
+RESET enable_bitmapscan;
+ 
+DROP TABLE onek_with_null;
diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
index a777cb425e24..a8f6fddd6bbb 100644
--- a/src/test/regress/sql/create_table.sql
+++ b/src/test/regress/sql/create_table.sql
@@ -231,3 +231,8 @@ CREATE TABLE array_index_op_test (
 	i			int4[],
 	t			text[]
 );
+
+CREATE TABLE test_tsvector( 
+	t text, 
+	a tsvector 
+);
diff --git a/src/test/regress/sql/decode_expr.sql b/src/test/regress/sql/decode_expr.sql
index 96e6bf2e9861..1761000fb367 100644
--- a/src/test/regress/sql/decode_expr.sql
+++ b/src/test/regress/sql/decode_expr.sql
@@ -613,6 +613,8 @@ select * from vtable order by a;
 
 select decode(null, 1, 'null = 1', 'null != 1');
 
+select decode(null::integer, 1, 'null = 1', 'null != 1');
+
 select decode(1, null, '1 = null', '1 != null');
 
 select decode(null, null, 'null = null', 'null != null');
diff --git a/src/test/regress/sql/domain.sql b/src/test/regress/sql/domain.sql
index 353ec05bbb58..19a7bf24113e 100644
--- a/src/test/regress/sql/domain.sql
+++ b/src/test/regress/sql/domain.sql
@@ -58,6 +58,11 @@ select * from basictest;
 select testtext || testvarchar as concat, testnumeric + 42 as sum
 from basictest;
 
+-- check that union/case/coalesce type resolution handles domains properly
+select coalesce(4::domainint4, 7) is of (int4) as t;
+select coalesce(4::domainint4, 7) is of (domainint4) as f;
+select coalesce(4::domainint4, 7::domainint4) is of (domainint4) as t;
+
 drop table basictest;
 drop domain domainvarchar restrict;
 drop domain domainnumeric restrict;
@@ -176,7 +181,13 @@ create table defaulttest
             , col7 ddef4 DEFAULT 8000
             , col8 ddef5
             );
-insert into defaulttest default values;
+insert into defaulttest(col4) values(0); -- fails, col5 defaults to null
+alter table defaulttest alter column col5 drop default;
+insert into defaulttest default values; -- succeeds, inserts domain default
+-- We used to treat SET DEFAULT NULL as equivalent to DROP DEFAULT; wrong
+alter table defaulttest alter column col5 set default null;
+insert into defaulttest(col4) values(0); -- fails
+alter table defaulttest alter column col5 drop default;
 insert into defaulttest default values;
 insert into defaulttest default values;
 
@@ -372,6 +383,11 @@ insert into ddtest2 values(row(-1));
 alter domain posint add constraint c1 check(value >= 0);
 drop table ddtest2;
 
+create table ddtest2(f1 ddtest1[], distkey int) distributed by (distkey);
+insert into ddtest2 values('{(-1)}');
+alter domain posint add constraint c1 check(value >= 0);
+drop table ddtest2;
+
 alter domain posint add constraint c1 check(value >= 0);
 
 create domain posint2 as posint check (value % 2 = 0);
diff --git a/src/test/regress/sql/enum.sql b/src/test/regress/sql/enum.sql
new file mode 100644
index 000000000000..cb13113da9ce
--- /dev/null
+++ b/src/test/regress/sql/enum.sql
@@ -0,0 +1,146 @@
+--
+-- Enum tests
+--
+
+CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple');
+
+--
+-- Did it create the right number of rows?
+--
+SELECT COUNT(*) FROM pg_enum WHERE enumtypid = 'rainbow'::regtype;
+
+--
+-- I/O functions
+--
+SELECT 'red'::rainbow;
+SELECT 'mauve'::rainbow;
+
+--
+-- Basic table creation, row selection
+--
+CREATE TABLE enumtest (col rainbow);
+INSERT INTO enumtest values ('red'), ('orange'), ('yellow'), ('green');
+COPY enumtest FROM stdin;
+blue
+purple
+\.
+SELECT * FROM enumtest;
+
+--
+-- Operators, no index
+--
+SELECT * FROM enumtest WHERE col = 'orange';
+SELECT * FROM enumtest WHERE col <> 'orange' ORDER BY col;
+SELECT * FROM enumtest WHERE col > 'yellow' ORDER BY col;
+SELECT * FROM enumtest WHERE col >= 'yellow' ORDER BY col;
+SELECT * FROM enumtest WHERE col < 'green' ORDER BY col;
+SELECT * FROM enumtest WHERE col <= 'green' ORDER BY col;
+
+--
+-- Cast to/from text
+--
+SELECT 'red'::rainbow::text || 'hithere';
+SELECT 'red'::text::rainbow = 'red'::rainbow;
+
+--
+-- Aggregates
+--
+SELECT min(col) FROM enumtest;
+SELECT max(col) FROM enumtest;
+SELECT max(col) FROM enumtest WHERE col < 'green';
+
+--
+-- Index tests, force use of index
+--
+SET enable_seqscan = off;
+SET enable_bitmapscan = off;
+
+--
+-- Btree index / opclass with the various operators
+--
+CREATE INDEX enumtest_btree ON enumtest USING btree (col);
+SELECT * FROM enumtest WHERE col = 'orange';
+SELECT * FROM enumtest WHERE col <> 'orange' ORDER BY col;
+SELECT * FROM enumtest WHERE col > 'yellow' ORDER BY col;
+SELECT * FROM enumtest WHERE col >= 'yellow' ORDER BY col;
+SELECT * FROM enumtest WHERE col < 'green' ORDER BY col;
+SELECT * FROM enumtest WHERE col <= 'green' ORDER BY col;
+SELECT min(col) FROM enumtest;
+SELECT max(col) FROM enumtest;
+SELECT max(col) FROM enumtest WHERE col < 'green';
+DROP INDEX enumtest_btree;
+
+--
+-- End index tests
+--
+RESET enable_seqscan;
+RESET enable_bitmapscan;
+
+--
+-- Domains over enums
+--
+CREATE DOMAIN rgb AS rainbow CHECK (VALUE IN ('red', 'green', 'blue'));
+SELECT 'red'::rgb;
+SELECT 'purple'::rgb;
+SELECT 'purple'::rainbow::rgb;
+DROP DOMAIN rgb;
+
+--
+-- Arrays
+--
+SELECT '{red,green,blue}'::rainbow[];
+SELECT ('{red,green,blue}'::rainbow[])[2];
+SELECT 'red' = ANY ('{red,green,blue}'::rainbow[]);
+SELECT 'yellow' = ANY ('{red,green,blue}'::rainbow[]);
+SELECT 'red' = ALL ('{red,green,blue}'::rainbow[]);
+SELECT 'red' = ALL ('{red,red}'::rainbow[]);
+
+--
+-- Support functions
+--
+SELECT enum_first(NULL::rainbow);
+SELECT enum_last('green'::rainbow);
+SELECT enum_range(NULL::rainbow);
+SELECT enum_range('orange'::rainbow, 'green'::rainbow);
+SELECT enum_range(NULL, 'green'::rainbow);
+SELECT enum_range('orange'::rainbow, NULL);
+SELECT enum_range(NULL::rainbow, NULL);
+
+--
+-- User functions, can't test perl/python etc here since may not be compiled.
+--
+CREATE FUNCTION echo_me(anyenum) RETURNS text AS $$
+BEGIN
+RETURN $1::text || 'omg';
+END
+$$ LANGUAGE plpgsql;
+SELECT echo_me('red'::rainbow);
+--
+-- Concrete function should override generic one
+--
+CREATE FUNCTION echo_me(rainbow) RETURNS text AS $$
+BEGIN
+RETURN $1::text || 'wtf';
+END
+$$ LANGUAGE plpgsql;
+SELECT echo_me('red'::rainbow);
+--
+-- If we drop the original generic one, we don't have to qualify the type
+-- anymore, since there's only one match
+--
+DROP FUNCTION echo_me(anyenum);
+SELECT echo_me('red');
+DROP FUNCTION echo_me(rainbow);
+
+--
+-- Cleanup
+--
+DROP TABLE enumtest;
+DROP TYPE rainbow;
+
+--
+-- Verify properly cleaned up
+--
+SELECT COUNT(*) FROM pg_type WHERE typname = 'rainbow';
+SELECT * FROM pg_enum WHERE NOT EXISTS
+  (SELECT 1 FROM pg_type WHERE pg_type.oid = enumtypid);
diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql
index 0e5f78b6c792..bf08a3760428 100644
--- a/src/test/regress/sql/foreign_key.sql
+++ b/src/test/regress/sql/foreign_key.sql
@@ -760,12 +760,12 @@ FOREIGN KEY (x2) REFERENCES pktable(id1);
 ALTER TABLE fktable ADD CONSTRAINT fk_3_1
 FOREIGN KEY (x3) REFERENCES pktable(id1);
 
--- should succeed
-
--- int4 promotes to text, so this is allowed (though pretty durn debatable)
+-- int4 does not promote to text
 ALTER TABLE fktable ADD CONSTRAINT fk_1_2
 FOREIGN KEY (x1) REFERENCES pktable(id2);
 
+-- should succeed
+
 -- int4 promotes to real
 ALTER TABLE fktable ADD CONSTRAINT fk_1_3
 FOREIGN KEY (x1) REFERENCES pktable(id3);
@@ -921,3 +921,25 @@ SELECT * FROM tasks;
 DELETE FROM users WHERE id = 2;
 SELECT * FROM tasks;
 COMMIT;
+
+--
+-- Test self-referential FK with CASCADE (bug #6268)
+--
+create temp table selfref (
+    a int primary key,
+    b int,
+    foreign key (b) references selfref (a)
+        on update cascade on delete cascade
+);
+
+insert into selfref (a, b)
+values
+    (0, 0),
+    (1, 1);
+
+begin;
+    update selfref set a = 123 where a = 0;
+    select a, b from selfref;
+    update selfref set a = 456 where a = 123;
+    select a, b from selfref;
+commit;
diff --git a/src/test/regress/sql/gp_create_table.sql b/src/test/regress/sql/gp_create_table.sql
index 5bddc2cab788..09363ba95cff 100644
--- a/src/test/regress/sql/gp_create_table.sql
+++ b/src/test/regress/sql/gp_create_table.sql
@@ -120,7 +120,7 @@ drop table if exists foo;
 drop table if exists bar;
 
 create table foo (
-c1 int,c2 int,c3 int,c4 int,c5 int,c6 int,c7 int,c8 int,c9 int,c10 int,c11 int,c12 int,c13 int,c14 int,c15 int,c16 int,c17 int,c18 int,c19 int,c20 int,c21 int,c22 int,c23 int,c24 int,c25 int,c26 int,c27 int,c28 int,c29 int,c30 int,c31 int,c32 int,c33 int,c34 int,c35 int,c36 int,c37 int,c38 int,c39 int,c40 int,c41 int,c42 int,c43 int,c44 int,c45 int,c46 int,c47 int,c48 int,c49 int,c50 int,c51 int,c52 int,c53 int,c54 int,c55 int,c56 int,c57 int,c58 int,c59 int,c60 int,c61 int,c62 int,c63 int,c64 int,c65 int,c66 int,c67 int,c68 int,c69 int,c70 int,c71 int,c72 int,c73 int,c74 int,c75 int,c76 int,c77 int,c78 int,c79 int,c80 int,c81 int,c82 int,c83 int,c84 int,c85 int,c86 int,c87 int,c88 int,c89 int,c90 int,c91 int,c92 int,c93 int,c94 int,c95 int,c96 int,c97 int,c98 int,c99 int,c100 int,c101 int,c102 int,c103 int,c104 int,c105 int,c106 int,c107 int,c108 int,c109 int,c110 int,c111 int,c112 int,c113 int,c114 int,c115 int,c116 int,c117 int,c118 int,c119 int,c120 int,c121 int,c122 int,c123 int,c124 int,c125 int,c126 int,c127 int,c128 int,c129 int,c130 int,c131 int,c132 int,c133 int,c134 int,c135 int,c136 int,c137 int,c138 int,c139 int,c140 int,c141 int,c142 int,c143 int,c144 int,c145 int,c146 int,c147 int,c148 int,c149 int,c150 int,c151 int,c152 int,c153 int,c154 int,c155 int,c156 int,c157 int,c158 int,c159 int,c160 int,c161 int,c162 int,c163 int,c164 int,c165 int,c166 int,c167 int,c168 int,c169 int,c170 int,c171 int,c172 int,c173 int,c174 int,c175 int,c176 int,c177 int,c178 int,c179 int,c180 int,c181 int,c182 int,c183 int,c184 int,c185 int,c186 int,c187 int,c188 int,c189 int,c190 int,c191 int,c192 int,c193 int,c194 int,c195 int,c196 int,c197 int,c198 int,c199 int,c200 int,c201 int,c202 int,c203 int,c204 int,c205 int,c206 int,c207 int,c208 int,c209 int,c210 int,c211 int,c212 int,c213 int,c214 int,c215 int,c216 int,c217 int,c218 int,c219 int,c220 int,c221 int,c222 int,c223 int,c224 int,c225 int,c226 int,c227 int,c228 int,c229 int,c230 int,c231 int,c232 int,c233 int,c234 int,c235 int,c236 int,c237 int,c238 int,c239 int,c240 int,c241 int,c242 int,c243 int,c244 int,c245 int,c246 int,c247 int,c248 int,c249 int,c250 int,c251 int,c252 int,c253 int,c254 int,c255 int,c256 int,c257 int,c258 int,c259 int,c260 int,c261 int,c262 int,c263 int,c264 int,c265 int,c266 int,c267 int,c268 int,c269 int,c270 int,c271 int,c272 int,c273 int,c274 int,c275 int,c276 int,c277 int,c278 int,c279 int,c280 int,c281 int,c282 int,c283 int,c284 int,c285 int,c286 int,c287 int,c288 int,c289 int,c290 int,c291 int,c292 int,c293 int,c294 int,c295 int,c296 int,c297 int,c298 int,c299 int,c300 int,c301 int,c302 int,c303 int,c304 int,c305 int,c306 int,c307 int,c308 int,c309 int,c310 int,c311 int,c312 int,c313 int,c314 int,c315 int,c316 int,c317 int,c318 int,c319 int,c320 int,c321 int,c322 int,c323 int,c324 int,c325 int,c326 int,c327 int,c328 int,c329 int,c330 int,c331 int,c332 int,c333 int,c334 int,c335 int,c336 int,c337 int,c338 int,c339 int,c340 int,c341 int,c342 int,c343 int,c344 int,c345 int,c346 int,c347 int,c348 int,c349 int,c350 int,c351 int,c352 int,c353 int,c354 int,c355 int,c356 int,c357 int,c358 int,c359 int,c360 int,c361 int,c362 int,c363 int,c364 int,c365 int,c366 int,c367 int,c368 int,c369 int,c370 int,c371 int,c372 int,c373 int,c374 int,c375 int,c376 int,c377 int,c378 int,c379 int,c380 int,c381 int,c382 int,c383 int,c384 int,c385 int,c386 int,c387 int,c388 int,c389 int,c390 int,c391 int,c392 int,c393 int,c394 int,c395 int,c396 int,c397 int,c398 int,c399 int,c400 int,c401 int,c402 int,c403 int,c404 int,c405 int,c406 int,c407 int,c408 int,c409 int,c410 int,c411 int,c412 int,c413 int,c414 int,c415 int,c416 int,c417 int,c418 int,c419 int,c420 int,c421 int,c422 int,c423 int,c424 int,c425 int,c426 int,c427 int,c428 int,c429 int,c430 int,c431 int,c432 int,c433 int,c434 int,c435 int,c436 int,c437 int,c438 int,c439 int,c440 int,c441 int,c442 int,c443 int,c444 int,c445 int,c446 int,c447 int,c448 int,c449 int,c450 int,c451 int,c452 int,c453 int,c454 int,c455 int,c456 int,c457 int,c458 int,c459 int,c460 int,c461 int,c462 int,c463 int,c464 int,c465 int,c466 int,c467 int,c468 int,c469 int,c470 int,c471 int,c472 int,c473 int,c474 int,c475 int,c476 int,c477 int,c478 int,c479 int,c480 int,c481 int,c482 int,c483 int,c484 int,c485 int,c486 int,c487 int,c488 int,c489 int,c490 int,c491 int,c492 int,c493 int,c494 int,c495 int,c496 int,c497 int,c498 int,c499 int,c500 int,c501 int,c502 int,c503 int,c504 int,c505 int,c506 int,c507 int,c508 int,c509 int,c510 int,c511 int,c512 int,c513 int,c514 int,c515 int,c516 int,c517 int,c518 int,c519 int,c520 int,c521 int,c522 int,c523 int,c524 int,c525 int,c526 int,c527 int,c528 int,c529 int,c530 int,c531 int,c532 int,c533 int,c534 int,c535 int,c536 int,c537 int,c538 int,c539 int,c540 int,c541 int,c542 int,c543 int,c544 int,c545 int,c546 int,c547 int,c548 int,c549 int,c550 int,c551 int,c552 int,c553 int,c554 int,c555 int,c556 int,c557 int,c558 int,c559 int,c560 int,c561 int,c562 int,c563 int,c564 int,c565 int,c566 int,c567 int,c568 int,c569 int,c570 int,c571 int,c572 int,c573 int,c574 int,c575 int,c576 int,c577 int,c578 int,c579 int,c580 int,c581 int,c582 int,c583 int,c584 int,c585 int,c586 int,c587 int,c588 int,c589 int,c590 int,c591 int,c592 int,c593 int,c594 int,c595 int,c596 int,c597 int,c598 int,c599 int,c600 int,c601 int,c602 int,c603 int,c604 int,c605 int,c606 int,c607 int,c608 int,c609 int,c610 int,c611 int,c612 int,c613 int,c614 int,c615 int,c616 int,c617 int,c618 int,c619 int,c620 int,c621 int,c622 int,c623 int,c624 int,c625 int,c626 int,c627 int,c628 int,c629 int,c630 int,c631 int,c632 int,c633 int,c634 int,c635 int,c636 int,c637 int,c638 int,c639 int,c640 int,c641 int,c642 int,c643 int,c644 int,c645 int,c646 int,c647 int,c648 int,c649 int,c650 int,c651 int,c652 int,c653 int,c654 int,c655 int,c656 int,c657 int,c658 int,c659 int,c660 int,c661 int,c662 int,c663 int,c664 int,c665 int,c666 int,c667 int,c668 int,c669 int,c670 int,c671 int,c672 int,c673 int,c674 int,c675 int,c676 int,c677 int,c678 int,c679 int,c680 int,c681 int,c682 int,c683 int,c684 int,c685 int,c686 int,c687 int,c688 int,c689 int,c690 int,c691 int,c692 int,c693 int,c694 int,c695 int,c696 int,c697 int,c698 int,c699 int,c700 int,c701 int,c702 int,c703 int,c704 int,c705 int,c706 int,c707 int,c708 int,c709 int,c710 int,c711 int,c712 int,c713 int,c714 int,c715 int,c716 int,c717 int,c718 int,c719 int,c720 int,c721 int,c722 int,c723 int,c724 int,c725 int,c726 int,c727 int,c728 int,c729 int,c730 int,c731 int,c732 int,c733 int,c734 int,c735 int,c736 int,c737 int,c738 int,c739 int,c740 int,c741 int,c742 int,c743 int,c744 int,c745 int,c746 int,c747 int,c748 int,c749 int,c750 int,c751 int,c752 int,c753 int,c754 int,c755 int,c756 int,c757 int,c758 int,c759 int,c760 int,c761 int,c762 int,c763 int,c764 int,c765 int,c766 int,c767 int,c768 int,c769 int,c770 int,c771 int,c772 int,c773 int,c774 int,c775 int,c776 int,c777 int,c778 int,c779 int,c780 int,c781 int,c782 int,c783 int,c784 int,c785 int,c786 int,c787 int,c788 int,c789 int,c790 int,c791 int,c792 int,c793 int,c794 int,c795 int,c796 int,c797 int,c798 int,c799 int,c800 int,c801 int,c802 int,c803 int,c804 int,c805 int,c806 int,c807 int,c808 int,c809 int,c810 int,c811 int,c812 int,c813 int,c814 int,c815 int,c816 int,c817 int,c818 int,c819 int,c820 int,c821 int,c822 int,c823 int,c824 int,c825 int,c826 int,c827 int,c828 int,c829 int,c830 int,c831 int,c832 int,c833 int,c834 int,c835 int,c836 int,c837 int,c838 int,c839 int,c840 int,c841 int,c842 int,c843 int,c844 int,c845 int,c846 int,c847 int,c848 int,c849 int,c850 int,c851 int,c852 int,c853 int,c854 int,c855 int,c856 int,c857 int,c858 int,c859 int,c860 int,c861 int,c862 int,c863 int,c864 int,c865 int,c866 int,c867 int,c868 int,c869 int,c870 int,c871 int,c872 int,c873 int,c874 int,c875 int,c876 int,c877 int,c878 int,c879 int,c880 int,c881 int,c882 int,c883 int,c884 int,c885 int,c886 int,c887 int,c888 int,c889 int,c890 int,c891 int,c892 int,c893 int,c894 int,c895 int,c896 int,c897 int,c898 int,c899 int,c900 int,c901 int,c902 int,c903 int,c904 int,c905 int,c906 int,c907 int,c908 int,c909 int,c910 int,c911 int,c912 int,c913 int,c914 int,c915 int,c916 int,c917 int,c918 int,c919 int,c920 int,c921 int,c922 int,c923 int,c924 int,c925 int,c926 int,c927 int,c928 int,c929 int,c930 int,c931 int,c932 int,c933 int,c934 int,c935 int,c936 int,c937 int,c938 int,c939 int,c940 int,c941 int,c942 int,c943 int,c944 int,c945 int,c946 int,c947 int,c948 int,c949 int,c950 int,c951 int,c952 int,c953 int,c954 int,c955 int,c956 int,c957 int,c958 int,c959 int,c960 int,c961 int,c962 int,c963 int,c964 int,c965 int,c966 int,c967 int,c968 int,c969 int,c970 int,c971 int,c972 int,c973 int,c974 int,c975 int,c976 int,c977 int,c978 int,c979 int,c980 int,c981 int,c982 int,c983 int,c984 int,c985 int,c986 int,c987 int,c988 int,c989 int,c990 int,c991 int,c992 int,c993 int,c994 int,c995 int,c996 int,c997 int,c998 int,c999 int,c1000 int,c1001 int,c1002 int,c1003 int,c1004 int,c1005 int,c1006 int,c1007 int,c1008 int,c1009 int,c1010 int,c1011 int,c1012 int,c1013 int,c1014 int,c1015 int,c1016 int,c1017 int,c1018 int,c1019 int,c1020 int,c1021 int,c1022 int,c1023 int,c1024 int,c1025 int,c1026 int,c1027 int,c1028 int,c1029 int,c1030 int,c1031 int,c1032 int,c1033 int,c1034 int,c1035 int,c1036 int,c1037 int,c1038 int,c1039 int,c1040 int,c1041 int,c1042 int,c1043 int,c1044 int,c1045 int,c1046 int,c1047 int,c1048 int,c1049 int,c1050 int,c1051 int,c1052 int,c1053 int,c1054 int,c1055 int,c1056 int,c1057 int,c1058 int,c1059 int,c1060 int,c1061 int,c1062 int,c1063 int,c1064 int,c1065 int,c1066 int,c1067 int,c1068 int,c1069 int,c1070 int,c1071 int,c1072 int,c1073 int,c1074 int,c1075 int,c1076 int,c1077 int,c1078 int,c1079 int,c1080 int,c1081 int,c1082 int,c1083 int,c1084 int,c1085 int,c1086 int,c1087 int,c1088 int,c1089 int,c1090 int,c1091 int,c1092 int,c1093 int,c1094 int,c1095 int,c1096 int,c1097 int,c1098 int,c1099 int,c1100 int,c1101 int,c1102 int,c1103 int,c1104 int,c1105 int,c1106 int,c1107 int,c1108 int,c1109 int,c1110 int,c1111 int,c1112 int,c1113 int,c1114 int,c1115 int,c1116 int,c1117 int,c1118 int,c1119 int,c1120 int,c1121 int,c1122 int,c1123 int,c1124 int,c1125 int,c1126 int,c1127 int,c1128 int,c1129 int,c1130 int,c1131 int,c1132 int,c1133 int,c1134 int,c1135 int,c1136 int,c1137 int,c1138 int,c1139 int,c1140 int,c1141 int,c1142 int,c1143 int,c1144 int,c1145 int,c1146 int,c1147 int,c1148 int,c1149 int,c1150 int,c1151 int,c1152 int,c1153 int,c1154 int,c1155 int,c1156 int,c1157 int,c1158 int,c1159 int,c1160 int,c1161 int,c1162 int,c1163 int,c1164 int,c1165 int,c1166 int,c1167 int,c1168 int,c1169 int,c1170 int,c1171 int,c1172 int,c1173 int,c1174 int,c1175 int,c1176 int,c1177 int,c1178 int,c1179 int,c1180 int,c1181 int,c1182 int,c1183 int,c1184 int,c1185 int,c1186 int,c1187 int,c1188 int,c1189 int,c1190 int,c1191 int,c1192 int,c1193 int,c1194 int,c1195 int,c1196 int,c1197 int,c1198 int,c1199 int,c1200 int,c1201 int,c1202 int,c1203 int,c1204 int,c1205 int,c1206 int,c1207 int,c1208 int,c1209 int,c1210 int,c1211 int,c1212 int,c1213 int,c1214 int,c1215 int,c1216 int,c1217 int,c1218 int,c1219 int,c1220 int,c1221 int,c1222 int,c1223 int,c1224 int,c1225 int,c1226 int,c1227 int,c1228 int,c1229 int,c1230 int,c1231 int,c1232 int,c1233 int,c1234 int,c1235 int,c1236 int,c1237 int,c1238 int,c1239 int,c1240 int,c1241 int,c1242 int,c1243 int,c1244 int,c1245 int,c1246 int,c1247 int,c1248 int,c1249 int,c1250 int,c1251 int,c1252 int,c1253 int,c1254 int,c1255 int,c1256 int,c1257 int,c1258 int,c1259 int,c1260 int,c1261 int,c1262 int,c1263 int,c1264 int,c1265 int,c1266 int,c1267 int,c1268 int,c1269 int,c1270 int,c1271 int,c1272 int,c1273 int,c1274 int,c1275 int,c1276 int,c1277 int,c1278 int,c1279 int,c1280 int,c1281 int,c1282 int,c1283 int,c1284 int,c1285 int,c1286 int,c1287 int,c1288 int,c1289 int,c1290 int,c1291 int,c1292 int,c1293 int,c1294 int,c1295 int,c1296 int,c1297 int,c1298 int,c1299 int,c1300 int,c1301 int,c1302 int,c1303 int,c1304 int,c1305 int,c1306 int,c1307 int,c1308 int,c1309 int,c1310 int,c1311 int,c1312 int,c1313 int,c1314 int,c1315 int,c1316 int,c1317 int,c1318 int,c1319 int,c1320 int,c1321 int,c1322 int,c1323 int,c1324 int,c1325 int,c1326 int,c1327 int,c1328 int,c1329 int,c1330 int,c1331 int,c1332 int,c1333 int,c1334 int,c1335 int,c1336 int,c1337 int,c1338 int,c1339 int,c1340 int,c1341 int,c1342 int,c1343 int,c1344 int,c1345 int,c1346 int,c1347 int,c1348 int,c1349 int,c1350 int,c1351 int,c1352 int,c1353 int,c1354 int,c1355 int,c1356 int,c1357 int,c1358 int,c1359 int,c1360 int,c1361 int,c1362 int,c1363 int,c1364 int,c1365 int,c1366 int,c1367 int,c1368 int,c1369 int,c1370 int,c1371 int,c1372 int,c1373 int,c1374 int,c1375 int,c1376 int,c1377 int,c1378 int,c1379 int,c1380 int,c1381 int,c1382 int,c1383 int,c1384 int,c1385 int,c1386 int,c1387 int,c1388 int,c1389 int,c1390 int,c1391 int,c1392 int,c1393 int,c1394 int,c1395 int,c1396 int,c1397 int,c1398 int,c1399 int,c1400 int,c1401 int,c1402 int,c1403 int,c1404 int,c1405 int,c1406 int,c1407 int,c1408 int,c1409 int,c1410 int,c1411 int,c1412 int,c1413 int,c1414 int,c1415 int,c1416 int,c1417 int,c1418 int,c1419 int,c1420 int,c1421 int,c1422 int,c1423 int,c1424 int,c1425 int,c1426 int,c1427 int,c1428 int,c1429 int,c1430 int,c1431 int,c1432 int,c1433 int,c1434 int,c1435 int,c1436 int,c1437 int,c1438 int,c1439 int,c1440 int,c1441 int,c1442 int,c1443 int,c1444 int,c1445 int,c1446 int,c1447 int,c1448 int,c1449 int,c1450 int,c1451 int,c1452 int,c1453 int,c1454 int,c1455 int,c1456 int,c1457 int,c1458 int,c1459 int,c1460 int,c1461 int,c1462 int,c1463 int,c1464 int,c1465 int,c1466 int,c1467 int,c1468 int,c1469 int,c1470 int,c1471 int,c1472 int,c1473 int,c1474 int,c1475 int,c1476 int,c1477 int,c1478 int,c1479 int,c1480 int,c1481 int,c1482 int,c1483 int,c1484 int,c1485 int,c1486 int,c1487 int,c1488 int,c1489 int,c1490 int,c1491 int,c1492 int,c1493 int,c1494 int,c1495 int,c1496 int,c1497 int,c1498 int,c1499 int,c1500 int,c1501 int,c1502 int,c1503 int,c1504 int,c1505 int,c1506 int,c1507 int,c1508 int,c1509 int,c1510 int,c1511 int,c1512 int,c1513 int,c1514 int,c1515 int,c1516 int,c1517 int,c1518 int,c1519 int,c1520 int,c1521 int,c1522 int,c1523 int,c1524 int,c1525 int,c1526 int,c1527 int,c1528 int,c1529 int,c1530 int,c1531 int,c1532 int,c1533 int,c1534 int,c1535 int,c1536 int,c1537 int,c1538 int,c1539 int,c1540 int,c1541 int,c1542 int,c1543 int,c1544 int,c1545 int,c1546 int,c1547 int,c1548 int,c1549 int,c1550 int,c1551 int,c1552 int,c1553 int,c1554 int,c1555 int,c1556 int,c1557 int,c1558 int,c1559 int,c1560 int,c1561 int,c1562 int,c1563 int,c1564 int,c1565 int,c1566 int,c1567 int,c1568 int,c1569 int,c1570 int,c1571 int,c1572 int,c1573 int,c1574 int,c1575 int,c1576 int,c1577 int,c1578 int,c1579 int,c1580 int,c1581 int,c1582 int,c1583 int,c1584 int,c1585 int,c1586 int,c1587 int,c1588 int,c1589 int,c1590 int,c1591 int,c1592 int,c1593 int,c1594 int,c1595 int,c1596 int,c1597 int,c1598 int,c1599 int,c1600 int, c1601 int
+c1 int,c2 int,c3 int,c4 int,c5 int,c6 int,c7 int,c8 int,c9 int,c10 int,c11 int,c12 int,c13 int,c14 int,c15 int,c16 int,c17 int,c18 int,c19 int,c20 int,c21 int,c22 int,c23 int,c24 int,c25 int,c26 int,c27 int,c28 int,c29 int,c30 int,c31 int,c32 int,c33 int,c34 int,c35 int,c36 int,c37 int,c38 int,c39 int,c40 int,c41 int,c42 int,c43 int,c44 int,c45 int,c46 int,c47 int,c48 int,c49 int,c50 int,c51 int,c52 int,c53 int,c54 int,c55 int,c56 int,c57 int,c58 int,c59 int,c60 int,c61 int,c62 int,c63 int,c64 int,c65 int,c66 int,c67 int,c68 int,c69 int,c70 int,c71 int,c72 int,c73 int,c74 int,c75 int,c76 int,c77 int,c78 int,c79 int,c80 int,c81 int,c82 int,c83 int,c84 int,c85 int,c86 int,c87 int,c88 int,c89 int,c90 int,c91 int,c92 int,c93 int,c94 int,c95 int,c96 int,c97 int,c98 int,c99 int,c100 int,c101 int,c102 int,c103 int,c104 int,c105 int,c106 int,c107 int,c108 int,c109 int,c110 int,c111 int,c112 int,c113 int,c114 int,c115 int,c116 int,c117 int,c118 int,c119 int,c120 int,c121 int,c122 int,c123 int,c124 int,c125 int,c126 int,c127 int,c128 int,c129 int,c130 int,c131 int,c132 int,c133 int,c134 int,c135 int,c136 int,c137 int,c138 int,c139 int,c140 int,c141 int,c142 int,c143 int,c144 int,c145 int,c146 int,c147 int,c148 int,c149 int,c150 int,c151 int,c152 int,c153 int,c154 int,c155 int,c156 int,c157 int,c158 int,c159 int,c160 int,c161 int,c162 int,c163 int,c164 int,c165 int,c166 int,c167 int,c168 int,c169 int,c170 int,c171 int,c172 int,c173 int,c174 int,c175 int,c176 int,c177 int,c178 int,c179 int,c180 int,c181 int,c182 int,c183 int,c184 int,c185 int,c186 int,c187 int,c188 int,c189 int,c190 int,c191 int,c192 int,c193 int,c194 int,c195 int,c196 int,c197 int,c198 int,c199 int,c200 int,c201 int,c202 int,c203 int,c204 int,c205 int,c206 int,c207 int,c208 int,c209 int,c210 int,c211 int,c212 int,c213 int,c214 int,c215 int,c216 int,c217 int,c218 int,c219 int,c220 int,c221 int,c222 int,c223 int,c224 int,c225 int,c226 int,c227 int,c228 int,c229 int,c230 int,c231 int,c232 int,c233 int,c234 int,c235 int,c236 int,c237 int,c238 int,c239 int,c240 int,c241 int,c242 int,c243 int,c244 int,c245 int,c246 int,c247 int,c248 int,c249 int,c250 int,c251 int,c252 int,c253 int,c254 int,c255 int,c256 int,c257 int,c258 int,c259 int,c260 int,c261 int,c262 int,c263 int,c264 int,c265 int,c266 int,c267 int,c268 int,c269 int,c270 int,c271 int,c272 int,c273 int,c274 int,c275 int,c276 int,c277 int,c278 int,c279 int,c280 int,c281 int,c282 int,c283 int,c284 int,c285 int,c286 int,c287 int,c288 int,c289 int,c290 int,c291 int,c292 int,c293 int,c294 int,c295 int,c296 int,c297 int,c298 int,c299 int,c300 int,c301 int,c302 int,c303 int,c304 int,c305 int,c306 int,c307 int,c308 int,c309 int,c310 int,c311 int,c312 int,c313 int,c314 int,c315 int,c316 int,c317 int,c318 int,c319 int,c320 int,c321 int,c322 int,c323 int,c324 int,c325 int,c326 int,c327 int,c328 int,c329 int,c330 int,c331 int,c332 int,c333 int,c334 int,c335 int,c336 int,c337 int,c338 int,c339 int,c340 int,c341 int,c342 int,c343 int,c344 int,c345 int,c346 int,c347 int,c348 int,c349 int,c350 int,c351 int,c352 int,c353 int,c354 int,c355 int,c356 int,c357 int,c358 int,c359 int,c360 int,c361 int,c362 int,c363 int,c364 int,c365 int,c366 int,c367 int,c368 int,c369 int,c370 int,c371 int,c372 int,c373 int,c374 int,c375 int,c376 int,c377 int,c378 int,c379 int,c380 int,c381 int,c382 int,c383 int,c384 int,c385 int,c386 int,c387 int,c388 int,c389 int,c390 int,c391 int,c392 int,c393 int,c394 int,c395 int,c396 int,c397 int,c398 int,c399 int,c400 int,c401 int,c402 int,c403 int,c404 int,c405 int,c406 int,c407 int,c408 int,c409 int,c410 int,c411 int,c412 int,c413 int,c414 int,c415 int,c416 int,c417 int,c418 int,c419 int,c420 int,c421 int,c422 int,c423 int,c424 int,c425 int,c426 int,c427 int,c428 int,c429 int,c430 int,c431 int,c432 int,c433 int,c434 int,c435 int,c436 int,c437 int,c438 int,c439 int,c440 int,c441 int,c442 int,c443 int,c444 int,c445 int,c446 int,c447 int,c448 int,c449 int,c450 int,c451 int,c452 int,c453 int,c454 int,c455 int,c456 int,c457 int,c458 int,c459 int,c460 int,c461 int,c462 int,c463 int,c464 int,c465 int,c466 int,c467 int,c468 int,c469 int,c470 int,c471 int,c472 int,c473 int,c474 int,c475 int,c476 int,c477 int,c478 int,c479 int,c480 int,c481 int,c482 int,c483 int,c484 int,c485 int,c486 int,c487 int,c488 int,c489 int,c490 int,c491 int,c492 int,c493 int,c494 int,c495 int,c496 int,c497 int,c498 int,c499 int,c500 int,c501 int,c502 int,c503 int,c504 int,c505 int,c506 int,c507 int,c508 int,c509 int,c510 int,c511 int,c512 int,c513 int,c514 int,c515 int,c516 int,c517 int,c518 int,c519 int,c520 int,c521 int,c522 int,c523 int,c524 int,c525 int,c526 int,c527 int,c528 int,c529 int,c530 int,c531 int,c532 int,c533 int,c534 int,c535 int,c536 int,c537 int,c538 int,c539 int,c540 int,c541 int,c542 int,c543 int,c544 int,c545 int,c546 int,c547 int,c548 int,c549 int,c550 int,c551 int,c552 int,c553 int,c554 int,c555 int,c556 int,c557 int,c558 int,c559 int,c560 int,c561 int,c562 int,c563 int,c564 int,c565 int,c566 int,c567 int,c568 int,c569 int,c570 int,c571 int,c572 int,c573 int,c574 int,c575 int,c576 int,c577 int,c578 int,c579 int,c580 int,c581 int,c582 int,c583 int,c584 int,c585 int,c586 int,c587 int,c588 int,c589 int,c590 int,c591 int,c592 int,c593 int,c594 int,c595 int,c596 int,c597 int,c598 int,c599 int,c600 int,c601 int,c602 int,c603 int,c604 int,c605 int,c606 int,c607 int,c608 int,c609 int,c610 int,c611 int,c612 int,c613 int,c614 int,c615 int,c616 int,c617 int,c618 int,c619 int,c620 int,c621 int,c622 int,c623 int,c624 int,c625 int,c626 int,c627 int,c628 int,c629 int,c630 int,c631 int,c632 int,c633 int,c634 int,c635 int,c636 int,c637 int,c638 int,c639 int,c640 int,c641 int,c642 int,c643 int,c644 int,c645 int,c646 int,c647 int,c648 int,c649 int,c650 int,c651 int,c652 int,c653 int,c654 int,c655 int,c656 int,c657 int,c658 int,c659 int,c660 int,c661 int,c662 int,c663 int,c664 int,c665 int,c666 int,c667 int,c668 int,c669 int,c670 int,c671 int,c672 int,c673 int,c674 int,c675 int,c676 int,c677 int,c678 int,c679 int,c680 int,c681 int,c682 int,c683 int,c684 int,c685 int,c686 int,c687 int,c688 int,c689 int,c690 int,c691 int,c692 int,c693 int,c694 int,c695 int,c696 int,c697 int,c698 int,c699 int,c700 int,c701 int,c702 int,c703 int,c704 int,c705 int,c706 int,c707 int,c708 int,c709 int,c710 int,c711 int,c712 int,c713 int,c714 int,c715 int,c716 int,c717 int,c718 int,c719 int,c720 int,c721 int,c722 int,c723 int,c724 int,c725 int,c726 int,c727 int,c728 int,c729 int,c730 int,c731 int,c732 int,c733 int,c734 int,c735 int,c736 int,c737 int,c738 int,c739 int,c740 int,c741 int,c742 int,c743 int,c744 int,c745 int,c746 int,c747 int,c748 int,c749 int,c750 int,c751 int,c752 int,c753 int,c754 int,c755 int,c756 int,c757 int,c758 int,c759 int,c760 int,c761 int,c762 int,c763 int,c764 int,c765 int,c766 int,c767 int,c768 int,c769 int,c770 int,c771 int,c772 int,c773 int,c774 int,c775 int,c776 int,c777 int,c778 int,c779 int,c780 int,c781 int,c782 int,c783 int,c784 int,c785 int,c786 int,c787 int,c788 int,c789 int,c790 int,c791 int,c792 int,c793 int,c794 int,c795 int,c796 int,c797 int,c798 int,c799 int,c800 int,c801 int,c802 int,c803 int,c804 int,c805 int,c806 int,c807 int,c808 int,c809 int,c810 int,c811 int,c812 int,c813 int,c814 int,c815 int,c816 int,c817 int,c818 int,c819 int,c820 int,c821 int,c822 int,c823 int,c824 int,c825 int,c826 int,c827 int,c828 int,c829 int,c830 int,c831 int,c832 int,c833 int,c834 int,c835 int,c836 int,c837 int,c838 int,c839 int,c840 int,c841 int,c842 int,c843 int,c844 int,c845 int,c846 int,c847 int,c848 int,c849 int,c850 int,c851 int,c852 int,c853 int,c854 int,c855 int,c856 int,c857 int,c858 int,c859 int,c860 int,c861 int,c862 int,c863 int,c864 int,c865 int,c866 int,c867 int,c868 int,c869 int,c870 int,c871 int,c872 int,c873 int,c874 int,c875 int,c876 int,c877 int,c878 int,c879 int,c880 int,c881 int,c882 int,c883 int,c884 int,c885 int,c886 int,c887 int,c888 int,c889 int,c890 int,c891 int,c892 int,c893 int,c894 int,c895 int,c896 int,c897 int,c898 int,c899 int,c900 int,c901 int,c902 int,c903 int,c904 int,c905 int,c906 int,c907 int,c908 int,c909 int,c910 int,c911 int,c912 int,c913 int,c914 int,c915 int,c916 int,c917 int,c918 int,c919 int,c920 int,c921 int,c922 int,c923 int,c924 int,c925 int,c926 int,c927 int,c928 int,c929 int,c930 int,c931 int,c932 int,c933 int,c934 int,c935 int,c936 int,c937 int,c938 int,c939 int,c940 int,c941 int,c942 int,c943 int,c944 int,c945 int,c946 int,c947 int,c948 int,c949 int,c950 int,c951 int,c952 int,c953 int,c954 int,c955 int,c956 int,c957 int,c958 int,c959 int,c960 int,c961 int,c962 int,c963 int,c964 int,c965 int,c966 int,c967 int,c968 int,c969 int,c970 int,c971 int,c972 int,c973 int,c974 int,c975 int,c976 int,c977 int,c978 int,c979 int,c980 int,c981 int,c982 int,c983 int,c984 int,c985 int,c986 int,c987 int,c988 int,c989 int,c990 int,c991 int,c992 int,c993 int,c994 int,c995 int,c996 int,c997 int,c998 int,c999 int,c1000 int,c1001 int,c1002 int,c1003 int,c1004 int,c1005 int,c1006 int,c1007 int,c1008 int,c1009 int,c1010 int,c1011 int,c1012 int,c1013 int,c1014 int,c1015 int,c1016 int,c1017 int,c1018 int,c1019 int,c1020 int,c1021 int,c1022 int,c1023 int,c1024 int,c1025 int,c1026 int,c1027 int,c1028 int,c1029 int,c1030 int,c1031 int,c1032 int,c1033 int,c1034 int,c1035 int,c1036 int,c1037 int,c1038 int,c1039 int,c1040 int,c1041 int,c1042 int,c1043 int,c1044 int,c1045 int,c1046 int,c1047 int,c1048 int,c1049 int,c1050 int,c1051 int,c1052 int,c1053 int,c1054 int,c1055 int,c1056 int,c1057 int,c1058 int,c1059 int,c1060 int,c1061 int,c1062 int,c1063 int,c1064 int,c1065 int,c1066 int,c1067 int,c1068 int,c1069 int,c1070 int,c1071 int,c1072 int,c1073 int,c1074 int,c1075 int,c1076 int,c1077 int,c1078 int,c1079 int,c1080 int,c1081 int,c1082 int,c1083 int,c1084 int,c1085 int,c1086 int,c1087 int,c1088 int,c1089 int,c1090 int,c1091 int,c1092 int,c1093 int,c1094 int,c1095 int,c1096 int,c1097 int,c1098 int,c1099 int,c1100 int,c1101 int,c1102 int,c1103 int,c1104 int,c1105 int,c1106 int,c1107 int,c1108 int,c1109 int,c1110 int,c1111 int,c1112 int,c1113 int,c1114 int,c1115 int,c1116 int,c1117 int,c1118 int,c1119 int,c1120 int,c1121 int,c1122 int,c1123 int,c1124 int,c1125 int,c1126 int,c1127 int,c1128 int,c1129 int,c1130 int,c1131 int,c1132 int,c1133 int,c1134 int,c1135 int,c1136 int,c1137 int,c1138 int,c1139 int,c1140 int,c1141 int,c1142 int,c1143 int,c1144 int,c1145 int,c1146 int,c1147 int,c1148 int,c1149 int,c1150 int,c1151 int,c1152 int,c1153 int,c1154 int,c1155 int,c1156 int,c1157 int,c1158 int,c1159 int,c1160 int,c1161 int,c1162 int,c1163 int,c1164 int,c1165 int,c1166 int,c1167 int,c1168 int,c1169 int,c1170 int,c1171 int,c1172 int,c1173 int,c1174 int,c1175 int,c1176 int,c1177 int,c1178 int,c1179 int,c1180 int,c1181 int,c1182 int,c1183 int,c1184 int,c1185 int,c1186 int,c1187 int,c1188 int,c1189 int,c1190 int,c1191 int,c1192 int,c1193 int,c1194 int,c1195 int,c1196 int,c1197 int,c1198 int,c1199 int,c1200 int,c1201 int,c1202 int,c1203 int,c1204 int,c1205 int,c1206 int,c1207 int,c1208 int,c1209 int,c1210 int,c1211 int,c1212 int,c1213 int,c1214 int,c1215 int,c1216 int,c1217 int,c1218 int,c1219 int,c1220 int,c1221 int,c1222 int,c1223 int,c1224 int,c1225 int,c1226 int,c1227 int,c1228 int,c1229 int,c1230 int,c1231 int,c1232 int,c1233 int,c1234 int,c1235 int,c1236 int,c1237 int,c1238 int,c1239 int,c1240 int,c1241 int,c1242 int,c1243 int,c1244 int,c1245 int,c1246 int,c1247 int,c1248 int,c1249 int,c1250 int,c1251 int,c1252 int,c1253 int,c1254 int,c1255 int,c1256 int,c1257 int,c1258 int,c1259 int,c1260 int,c1261 int,c1262 int,c1263 int,c1264 int,c1265 int,c1266 int,c1267 int,c1268 int,c1269 int,c1270 int,c1271 int,c1272 int,c1273 int,c1274 int,c1275 int,c1276 int,c1277 int,c1278 int,c1279 int,c1280 int,c1281 int,c1282 int,c1283 int,c1284 int,c1285 int,c1286 int,c1287 int,c1288 int,c1289 int,c1290 int,c1291 int,c1292 int,c1293 int,c1294 int,c1295 int,c1296 int,c1297 int,c1298 int,c1299 int,c1300 int,c1301 int,c1302 int,c1303 int,c1304 int,c1305 int,c1306 int,c1307 int,c1308 int,c1309 int,c1310 int,c1311 int,c1312 int,c1313 int,c1314 int,c1315 int,c1316 int,c1317 int,c1318 int,c1319 int,c1320 int,c1321 int,c1322 int,c1323 int,c1324 int,c1325 int,c1326 int,c1327 int,c1328 int,c1329 int,c1330 int,c1331 int,c1332 int,c1333 int,c1334 int,c1335 int,c1336 int,c1337 int,c1338 int,c1339 int,c1340 int,c1341 int,c1342 int,c1343 int,c1344 int,c1345 int,c1346 int,c1347 int,c1348 int,c1349 int,c1350 int,c1351 int,c1352 int,c1353 int,c1354 int,c1355 int,c1356 int,c1357 int,c1358 int,c1359 int,c1360 int,c1361 int,c1362 int,c1363 int,c1364 int,c1365 int,c1366 int,c1367 int,c1368 int,c1369 int,c1370 int,c1371 int,c1372 int,c1373 int,c1374 int,c1375 int,c1376 int,c1377 int,c1378 int,c1379 int,c1380 int,c1381 int,c1382 int,c1383 int,c1384 int,c1385 int,c1386 int,c1387 int,c1388 int,c1389 int,c1390 int,c1391 int,c1392 int,c1393 int,c1394 int,c1395 int,c1396 int,c1397 int,c1398 int,c1399 int,c1400 int,c1401 int,c1402 int,c1403 int,c1404 int,c1405 int,c1406 int,c1407 int,c1408 int,c1409 int,c1410 int,c1411 int,c1412 int,c1413 int,c1414 int,c1415 int,c1416 int,c1417 int,c1418 int,c1419 int,c1420 int,c1421 int,c1422 int,c1423 int,c1424 int,c1425 int,c1426 int,c1427 int,c1428 int,c1429 int,c1430 int,c1431 int,c1432 int,c1433 int,c1434 int,c1435 int,c1436 int,c1437 int,c1438 int,c1439 int,c1440 int,c1441 int,c1442 int,c1443 int,c1444 int,c1445 int,c1446 int,c1447 int,c1448 int,c1449 int,c1450 int,c1451 int,c1452 int,c1453 int,c1454 int,c1455 int,c1456 int,c1457 int,c1458 int,c1459 int,c1460 int,c1461 int,c1462 int,c1463 int,c1464 int,c1465 int,c1466 int,c1467 int,c1468 int,c1469 int,c1470 int,c1471 int,c1472 int,c1473 int,c1474 int,c1475 int,c1476 int,c1477 int,c1478 int,c1479 int,c1480 int,c1481 int,c1482 int,c1483 int,c1484 int,c1485 int,c1486 int,c1487 int,c1488 int,c1489 int,c1490 int,c1491 int,c1492 int,c1493 int,c1494 int,c1495 int,c1496 int,c1497 int,c1498 int,c1499 int,c1500 int,c1501 int,c1502 int,c1503 int,c1504 int,c1505 int,c1506 int,c1507 int,c1508 int,c1509 int,c1510 int,c1511 int,c1512 int,c1513 int,c1514 int,c1515 int,c1516 int,c1517 int,c1518 int,c1519 int,c1520 int,c1521 int,c1522 int,c1523 int,c1524 int,c1525 int,c1526 int,c1527 int,c1528 int,c1529 int,c1530 int,c1531 int,c1532 int,c1533 int,c1534 int,c1535 int,c1536 int,c1537 int,c1538 int,c1539 int,c1540 int,c1541 int,c1542 int,c1543 int,c1544 int,c1545 int,c1546 int,c1547 int,c1548 int,c1549 int,c1550 int,c1551 int,c1552 int,c1553 int,c1554 int,c1555 int,c1556 int,c1557 int,c1558 int,c1559 int,c1560 int,c1561 int,c1562 int,c1563 int,c1564 int,c1565 int,c1566 int,c1567 int,c1568 int,c1569 int,c1570 int,c1571 int,c1572 int,c1573 int,c1574 int,c1575 int,c1576 int,c1577 int,c1578 int,c1579 int,c1580 int,c1581 int,c1582 int,c1583 int,c1584 int,c1585 int,c1586 int,c1587 int,c1588 int,c1589 int,c1590 int,c1591 int,c1592 int,c1593 int,c1594 int,c1595 int,c1596 int,c1597 int,c1598 int,c1599 int,c1600 int,c1601 int
 ) distributed by
 (
 c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,c54,c55,c56,c57,c58,c59,c60,c61,c62,c63,c64,c65,c66,c67,c68,c69,c70,c71,c72,c73,c74,c75,c76,c77,c78,c79,c80,c81,c82,c83,c84,c85,c86,c87,c88,c89,c90,c91,c92,c93,c94,c95,c96,c97,c98,c99,c100,c101,c102,c103,c104,c105,c106,c107,c108,c109,c110,c111,c112,c113,c114,c115,c116,c117,c118,c119,c120,c121,c122,c123,c124,c125,c126,c127,c128,c129,c130,c131,c132,c133,c134,c135,c136,c137,c138,c139,c140,c141,c142,c143,c144,c145,c146,c147,c148,c149,c150,c151,c152,c153,c154,c155,c156,c157,c158,c159,c160,c161,c162,c163,c164,c165,c166,c167,c168,c169,c170,c171,c172,c173,c174,c175,c176,c177,c178,c179,c180,c181,c182,c183,c184,c185,c186,c187,c188,c189,c190,c191,c192,c193,c194,c195,c196,c197,c198,c199,c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,c240,c241,c242,c243,c244,c245,c246,c247,c248,c249,c250,c251,c252,c253,c254,c255,c256,c257,c258,c259,c260,c261,c262,c263,c264,c265,c266,c267,c268,c269,c270,c271,c272,c273,c274,c275,c276,c277,c278,c279,c280,c281,c282,c283,c284,c285,c286,c287,c288,c289,c290,c291,c292,c293,c294,c295,c296,c297,c298,c299,c300,c301,c302,c303,c304,c305,c306,c307,c308,c309,c310,c311,c312,c313,c314,c315,c316,c317,c318,c319,c320,c321,c322,c323,c324,c325,c326,c327,c328,c329,c330,c331,c332,c333,c334,c335,c336,c337,c338,c339,c340,c341,c342,c343,c344,c345,c346,c347,c348,c349,c350,c351,c352,c353,c354,c355,c356,c357,c358,c359,c360,c361,c362,c363,c364,c365,c366,c367,c368,c369,c370,c371,c372,c373,c374,c375,c376,c377,c378,c379,c380,c381,c382,c383,c384,c385,c386,c387,c388,c389,c390,c391,c392,c393,c394,c395,c396,c397,c398,c399,c400,c401,c402,c403,c404,c405,c406,c407,c408,c409,c410,c411,c412,c413,c414,c415,c416,c417,c418,c419,c420,c421,c422,c423,c424,c425,c426,c427,c428,c429,c430,c431,c432,c433,c434,c435,c436,c437,c438,c439,c440,c441,c442,c443,c444,c445,c446,c447,c448,c449,c450,c451,c452,c453,c454,c455,c456,c457,c458,c459,c460,c461,c462,c463,c464,c465,c466,c467,c468,c469,c470,c471,c472,c473,c474,c475,c476,c477,c478,c479,c480,c481,c482,c483,c484,c485,c486,c487,c488,c489,c490,c491,c492,c493,c494,c495,c496,c497,c498,c499,c500,c501,c502,c503,c504,c505,c506,c507,c508,c509,c510,c511,c512,c513,c514,c515,c516,c517,c518,c519,c520,c521,c522,c523,c524,c525,c526,c527,c528,c529,c530,c531,c532,c533,c534,c535,c536,c537,c538,c539,c540,c541,c542,c543,c544,c545,c546,c547,c548,c549,c550,c551,c552,c553,c554,c555,c556,c557,c558,c559,c560,c561,c562,c563,c564,c565,c566,c567,c568,c569,c570,c571,c572,c573,c574,c575,c576,c577,c578,c579,c580,c581,c582,c583,c584,c585,c586,c587,c588,c589,c590,c591,c592,c593,c594,c595,c596,c597,c598,c599,c600,c601,c602,c603,c604,c605,c606,c607,c608,c609,c610,c611,c612,c613,c614,c615,c616,c617,c618,c619,c620,c621,c622,c623,c624,c625,c626,c627,c628,c629,c630,c631,c632,c633,c634,c635,c636,c637,c638,c639,c640,c641,c642,c643,c644,c645,c646,c647,c648,c649,c650,c651,c652,c653,c654,c655,c656,c657,c658,c659,c660,c661,c662,c663,c664,c665,c666,c667,c668,c669,c670,c671,c672,c673,c674,c675,c676,c677,c678,c679,c680,c681,c682,c683,c684,c685,c686,c687,c688,c689,c690,c691,c692,c693,c694,c695,c696,c697,c698,c699,c700,c701,c702,c703,c704,c705,c706,c707,c708,c709,c710,c711,c712,c713,c714,c715,c716,c717,c718,c719,c720,c721,c722,c723,c724,c725,c726,c727,c728,c729,c730,c731,c732,c733,c734,c735,c736,c737,c738,c739,c740,c741,c742,c743,c744,c745,c746,c747,c748,c749,c750,c751,c752,c753,c754,c755,c756,c757,c758,c759,c760,c761,c762,c763,c764,c765,c766,c767,c768,c769,c770,c771,c772,c773,c774,c775,c776,c777,c778,c779,c780,c781,c782,c783,c784,c785,c786,c787,c788,c789,c790,c791,c792,c793,c794,c795,c796,c797,c798,c799,c800,c801,c802,c803,c804,c805,c806,c807,c808,c809,c810,c811,c812,c813,c814,c815,c816,c817,c818,c819,c820,c821,c822,c823,c824,c825,c826,c827,c828,c829,c830,c831,c832,c833,c834,c835,c836,c837,c838,c839,c840,c841,c842,c843,c844,c845,c846,c847,c848,c849,c850,c851,c852,c853,c854,c855,c856,c857,c858,c859,c860,c861,c862,c863,c864,c865,c866,c867,c868,c869,c870,c871,c872,c873,c874,c875,c876,c877,c878,c879,c880,c881,c882,c883,c884,c885,c886,c887,c888,c889,c890,c891,c892,c893,c894,c895,c896,c897,c898,c899,c900,c901,c902,c903,c904,c905,c906,c907,c908,c909,c910,c911,c912,c913,c914,c915,c916,c917,c918,c919,c920,c921,c922,c923,c924,c925,c926,c927,c928,c929,c930,c931,c932,c933,c934,c935,c936,c937,c938,c939,c940,c941,c942,c943,c944,c945,c946,c947,c948,c949,c950,c951,c952,c953,c954,c955,c956,c957,c958,c959,c960,c961,c962,c963,c964,c965,c966,c967,c968,c969,c970,c971,c972,c973,c974,c975,c976,c977,c978,c979,c980,c981,c982,c983,c984,c985,c986,c987,c988,c989,c990,c991,c992,c993,c994,c995,c996,c997,c998,c999,c1000,c1001,c1002,c1003,c1004,c1005,c1006,c1007,c1008,c1009,c1010,c1011,c1012,c1013,c1014,c1015,c1016,c1017,c1018,c1019,c1020,c1021,c1022,c1023,c1024,c1025,c1026,c1027,c1028,c1029,c1030,c1031,c1032,c1033,c1034,c1035,c1036,c1037,c1038,c1039,c1040,c1041,c1042,c1043,c1044,c1045,c1046,c1047,c1048,c1049,c1050,c1051,c1052,c1053,c1054,c1055,c1056,c1057,c1058,c1059,c1060,c1061,c1062,c1063,c1064,c1065,c1066,c1067,c1068,c1069,c1070,c1071,c1072,c1073,c1074,c1075,c1076,c1077,c1078,c1079,c1080,c1081,c1082,c1083,c1084,c1085,c1086,c1087,c1088,c1089,c1090,c1091,c1092,c1093,c1094,c1095,c1096,c1097,c1098,c1099,c1100,c1101,c1102,c1103,c1104,c1105,c1106,c1107,c1108,c1109,c1110,c1111,c1112,c1113,c1114,c1115,c1116,c1117,c1118,c1119,c1120,c1121,c1122,c1123,c1124,c1125,c1126,c1127,c1128,c1129,c1130,c1131,c1132,c1133,c1134,c1135,c1136,c1137,c1138,c1139,c1140,c1141,c1142,c1143,c1144,c1145,c1146,c1147,c1148,c1149,c1150,c1151,c1152,c1153,c1154,c1155,c1156,c1157,c1158,c1159,c1160,c1161,c1162,c1163,c1164,c1165,c1166,c1167,c1168,c1169,c1170,c1171,c1172,c1173,c1174,c1175,c1176,c1177,c1178,c1179,c1180,c1181,c1182,c1183,c1184,c1185,c1186,c1187,c1188,c1189,c1190,c1191,c1192,c1193,c1194,c1195,c1196,c1197,c1198,c1199,c1200,c1201,c1202,c1203,c1204,c1205,c1206,c1207,c1208,c1209,c1210,c1211,c1212,c1213,c1214,c1215,c1216,c1217,c1218,c1219,c1220,c1221,c1222,c1223,c1224,c1225,c1226,c1227,c1228,c1229,c1230,c1231,c1232,c1233,c1234,c1235,c1236,c1237,c1238,c1239,c1240,c1241,c1242,c1243,c1244,c1245,c1246,c1247,c1248,c1249,c1250,c1251,c1252,c1253,c1254,c1255,c1256,c1257,c1258,c1259,c1260,c1261,c1262,c1263,c1264,c1265,c1266,c1267,c1268,c1269,c1270,c1271,c1272,c1273,c1274,c1275,c1276,c1277,c1278,c1279,c1280,c1281,c1282,c1283,c1284,c1285,c1286,c1287,c1288,c1289,c1290,c1291,c1292,c1293,c1294,c1295,c1296,c1297,c1298,c1299,c1300,c1301,c1302,c1303,c1304,c1305,c1306,c1307,c1308,c1309,c1310,c1311,c1312,c1313,c1314,c1315,c1316,c1317,c1318,c1319,c1320,c1321,c1322,c1323,c1324,c1325,c1326,c1327,c1328,c1329,c1330,c1331,c1332,c1333,c1334,c1335,c1336,c1337,c1338,c1339,c1340,c1341,c1342,c1343,c1344,c1345,c1346,c1347,c1348,c1349,c1350,c1351,c1352,c1353,c1354,c1355,c1356,c1357,c1358,c1359,c1360,c1361,c1362,c1363,c1364,c1365,c1366,c1367,c1368,c1369,c1370,c1371,c1372,c1373,c1374,c1375,c1376,c1377,c1378,c1379,c1380,c1381,c1382,c1383,c1384,c1385,c1386,c1387,c1388,c1389,c1390,c1391,c1392,c1393,c1394,c1395,c1396,c1397,c1398,c1399,c1400,c1401,c1402,c1403,c1404,c1405,c1406,c1407,c1408,c1409,c1410,c1411,c1412,c1413,c1414,c1415,c1416,c1417,c1418,c1419,c1420,c1421,c1422,c1423,c1424,c1425,c1426,c1427,c1428,c1429,c1430,c1431,c1432,c1433,c1434,c1435,c1436,c1437,c1438,c1439,c1440,c1441,c1442,c1443,c1444,c1445,c1446,c1447,c1448,c1449,c1450,c1451,c1452,c1453,c1454,c1455,c1456,c1457,c1458,c1459,c1460,c1461,c1462,c1463,c1464,c1465,c1466,c1467,c1468,c1469,c1470,c1471,c1472,c1473,c1474,c1475,c1476,c1477,c1478,c1479,c1480,c1481,c1482,c1483,c1484,c1485,c1486,c1487,c1488,c1489,c1490,c1491,c1492,c1493,c1494,c1495,c1496,c1497,c1498,c1499,c1500,c1501,c1502,c1503,c1504,c1505,c1506,c1507,c1508,c1509,c1510,c1511,c1512,c1513,c1514,c1515,c1516,c1517,c1518,c1519,c1520,c1521,c1522,c1523,c1524,c1525,c1526,c1527,c1528,c1529,c1530,c1531,c1532,c1533,c1534,c1535,c1536,c1537,c1538,c1539,c1540,c1541,c1542,c1543,c1544,c1545,c1546,c1547,c1548,c1549,c1550,c1551,c1552,c1553,c1554,c1555,c1556,c1557,c1558,c1559,c1560,c1561,c1562,c1563,c1564,c1565,c1566,c1567,c1568,c1569,c1570,c1571,c1572,c1573,c1574,c1575,c1576,c1577,c1578,c1579,c1580,c1581,c1582,c1583,c1584,c1585,c1586,c1587,c1588,c1589,c1590,c1591,c1592,c1593,c1594,c1595,c1596,c1597,c1598,c1599,c1600,c1601
diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql
index 16380599bd60..d6515818e4f5 100644
--- a/src/test/regress/sql/guc.sql
+++ b/src/test/regress/sql/guc.sql
@@ -99,6 +99,26 @@ SHOW vacuum_cost_delay;
 SHOW datestyle;
 SELECT '2006-08-13 12:34:56'::timestamptz;
 
+-- SET LOCAL persists through RELEASE (which was not true in 8.0-8.2)
+BEGIN;
+SHOW vacuum_cost_delay;
+SHOW datestyle;
+SELECT '2006-08-13 12:34:56'::timestamptz;
+SAVEPOINT sp;
+SET LOCAL vacuum_cost_delay TO 300;
+SHOW vacuum_cost_delay;
+SET LOCAL datestyle = 'Postgres, MDY';
+SHOW datestyle;
+SELECT '2006-08-13 12:34:56'::timestamptz;
+RELEASE SAVEPOINT sp;
+SHOW vacuum_cost_delay;
+SHOW datestyle;
+SELECT '2006-08-13 12:34:56'::timestamptz;
+ROLLBACK;
+SHOW vacuum_cost_delay;
+SHOW datestyle;
+SELECT '2006-08-13 12:34:56'::timestamptz;
+
 -- SET followed by SET LOCAL
 BEGIN;
 SET vacuum_cost_delay TO 400;
@@ -124,6 +144,121 @@ RESET datestyle;
 SHOW datestyle;
 SELECT '2006-08-13 12:34:56'::timestamptz;
 
+--
+-- Test DISCARD TEMP
+--
+CREATE TEMP TABLE reset_test ( data text ) ON COMMIT DELETE ROWS;
+SELECT relname FROM pg_class WHERE relname = 'reset_test';
+DISCARD TEMP;
+SELECT relname FROM pg_class WHERE relname = 'reset_test';
+
+--
+-- Test DISCARD ALL
+--
+
+-- do changes
+DECLARE foo CURSOR WITH HOLD FOR SELECT 1;
+PREPARE foo AS SELECT 1;
+LISTEN foo_event;
+SET vacuum_cost_delay = 13;
+CREATE TEMP TABLE tmp_foo (data text) ON COMMIT DELETE ROWS;
+CREATE ROLE temp_reset_user;
+SET SESSION AUTHORIZATION temp_reset_user;
+-- look changes
+SELECT relname FROM pg_listener;
+SELECT name FROM pg_prepared_statements;
+SELECT name FROM pg_cursors;
+SHOW vacuum_cost_delay;
+SELECT relname from pg_class where relname = 'tmp_foo';
+SELECT current_user = 'temp_reset_user';
+-- discard everything
+DISCARD ALL;
+-- look again
+SELECT relname FROM pg_listener;
+SELECT name FROM pg_prepared_statements;
+SELECT name FROM pg_cursors;
+SHOW vacuum_cost_delay;
+SELECT relname from pg_class where relname = 'tmp_foo';
+SELECT current_user = 'temp_reset_user';
+DROP ROLE temp_reset_user;
+
+--
+-- Tests for function-local GUC settings
+--
+
+set regex_flavor = advanced;
+
+create function report_guc(text) returns text as
+$$ select current_setting($1) $$ language sql
+set regex_flavor = basic;
+
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+
+-- this should draw only a warning
+alter function report_guc(text) set search_path = no_such_schema;
+
+-- with error occurring here
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+
+alter function report_guc(text) reset search_path set regex_flavor = extended;
+
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+
+alter function report_guc(text) reset all;
+
+select report_guc('regex_flavor'), current_setting('regex_flavor');
+
+-- SET LOCAL is restricted by a function SET option
+create or replace function myfunc(int) returns text as $$
+begin
+  set local regex_flavor = extended;
+  return current_setting('regex_flavor');
+end $$
+language plpgsql
+set regex_flavor = basic;
+
+select myfunc(0), current_setting('regex_flavor');
+
+alter function myfunc(int) reset all;
+
+select myfunc(0), current_setting('regex_flavor');
+
+set regex_flavor = advanced;
+
+-- but SET isn't
+create or replace function myfunc(int) returns text as $$
+begin
+  set regex_flavor = extended;
+  return current_setting('regex_flavor');
+end $$
+language plpgsql
+set regex_flavor = basic;
+
+select myfunc(0), current_setting('regex_flavor');
+
+-- In GPDB, the plan looks somewhat different from what you get on
+-- PostgreSQL, so that the current_setting() in previous query is
+-- evaluated before myfunc(0), and therefore it shows 'advanced'.
+-- Query again to show that the myfunc(0) call actually changed
+-- the setting.
+select current_setting('regex_flavor');
+
+set regex_flavor = advanced;
+
+-- it should roll back on error, though
+create or replace function myfunc(int) returns text as $$
+begin
+  set regex_flavor = extended;
+  perform 1/$1;
+  return current_setting('regex_flavor');
+end $$
+language plpgsql
+set regex_flavor = basic;
+
+select myfunc(0);
+select current_setting('regex_flavor');
+select myfunc(1), current_setting('regex_flavor');
+
 SELECT min_val, max_val FROM pg_settings WHERE name = 'gp_resqueue_priority_cpucores_per_segment';
 
 --
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index 01193b06453b..6b588fcc9589 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -356,19 +356,19 @@ SELECT CAST(CAST(date 'today' + time with time zone '05:30'
 SELECT CAST(cast(date 'today' + time with time zone '03:30'
   + interval '1 month 04:01' as timestamp without time zone) AS time) AS "07:31:00";
 
-SELECT t.d1 + i.f1 AS "102" FROM TIMESTAMP_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
+SELECT t.d1 AS t, i.f1 AS i, t.d1 + i.f1 AS "add", t.d1 - i.f1 AS "subtract"
+  FROM TIMESTAMP_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
   WHERE t.d1 BETWEEN '1990-01-01' AND '2001-01-01'
-    AND i.f1 BETWEEN '00:00' AND '23:00' ORDER BY 1;
+    AND i.f1 BETWEEN '00:00' AND '23:00'
+  ORDER BY 1,2;
 
-SELECT t.d1 - i.f1 AS "102" FROM TIMESTAMP_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
-  WHERE t.d1 BETWEEN '1990-01-01' AND '2001-01-01'
-    AND i.f1 BETWEEN '00:00' AND '23:00' ORDER BY 1;
-
-SELECT t.f1 + i.f1 AS "80" FROM TIME_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
-SELECT t.f1 - i.f1 AS "80" FROM TIME_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
+SELECT t.f1 AS t, i.f1 AS i, t.f1 + i.f1 AS "add", t.f1 - i.f1 AS "subtract"
+  FROM TIME_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
+  ORDER BY 1,2;
 
-SELECT t.f1 + i.f1 AS "100" FROM TIMETZ_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
-SELECT t.f1 - i.f1 AS "100" FROM TIMETZ_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i ORDER BY 1;
+SELECT t.f1 AS t, i.f1 AS i, t.f1 + i.f1 AS "add", t.f1 - i.f1 AS "subtract"
+  FROM TIMETZ_HOROLOGY_TBL t, INTERVAL_HOROLOGY_TBL i
+  ORDER BY 1,2;
 
 -- SQL9x OVERLAPS operator
 -- test with time zone
diff --git a/src/test/regress/sql/int2.sql b/src/test/regress/sql/int2.sql
index 082bb5cb9673..d0bf487d6404 100644
--- a/src/test/regress/sql/int2.sql
+++ b/src/test/regress/sql/int2.sql
@@ -86,3 +86,7 @@ SELECT '' AS five, i.f1, i.f1 / int2 '2' AS x FROM INT2_TBL i order by f1;
 
 SELECT '' AS five, i.f1, i.f1 / int4 '2' AS x FROM INT2_TBL i order by f1;
 
+-- check sane handling of INT16_MIN overflow cases
+SELECT (-32768)::int2 * (-1)::int2;
+SELECT (-32768)::int2 / (-1)::int2;
+SELECT (-32768)::int2 % (-1)::int2;
diff --git a/src/test/regress/sql/int4.sql b/src/test/regress/sql/int4.sql
index d1b42253cc4d..71c3e3c42a3f 100644
--- a/src/test/regress/sql/int4.sql
+++ b/src/test/regress/sql/int4.sql
@@ -125,3 +125,11 @@ SELECT 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 AS ten;
 SELECT 2 + 2 / 2 AS three;
 
 SELECT (2 + 2) / 2 AS two;
+
+-- check sane handling of INT_MIN overflow cases
+SELECT (-2147483648)::int4 * (-1)::int4;
+SELECT (-2147483648)::int4 / (-1)::int4;
+SELECT (-2147483648)::int4 % (-1)::int4;
+SELECT (-2147483648)::int4 * (-1)::int2;
+SELECT (-2147483648)::int4 / (-1)::int2;
+SELECT (-2147483648)::int4 % (-1)::int2;
diff --git a/src/test/regress/sql/int8.sql b/src/test/regress/sql/int8.sql
index a545f54203b9..193bacd5b1c4 100644
--- a/src/test/regress/sql/int8.sql
+++ b/src/test/regress/sql/int8.sql
@@ -69,3 +69,11 @@ select '-9223372036854775808'::int8;
 select '-9223372036854775809'::int8;
 select '9223372036854775807'::int8;
 select '9223372036854775808'::int8;
+
+-- check sane handling of INT64_MIN overflow cases
+SELECT (-9223372036854775808)::int8 * (-1)::int8;
+SELECT (-9223372036854775808)::int8 / (-1)::int8;
+SELECT (-9223372036854775808)::int8 % (-1)::int8;
+SELECT (-9223372036854775808)::int8 * (-1)::int4;
+SELECT (-9223372036854775808)::int8 / (-1)::int4;
+SELECT (-9223372036854775808)::int8 % (-1)::int4;
diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql
index 7374353dc828..11020514460d 100644
--- a/src/test/regress/sql/interval.sql
+++ b/src/test/regress/sql/interval.sql
@@ -131,4 +131,8 @@ SELECT '3 days 5 milliseconds'::interval;
 SELECT '1 second 2 seconds'::interval;              -- error
 SELECT '10 milliseconds 20 milliseconds'::interval; -- error
 SELECT '5.5 seconds 3 milliseconds'::interval;      -- error
-SELECT '1:20:05 5 microseconds'::interval;          -- error
\ No newline at end of file
+SELECT '1:20:05 5 microseconds'::interval;          -- error
+
+-- check that '30 days' equals '1 month' according to the hash function
+select '30 days'::interval = '1 month'::interval as t;
+select interval_hash('30 days'::interval) = interval_hash('1 month'::interval) as t;
diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index 8f974e43bee8..1fa7efcf4230 100644
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -330,6 +330,8 @@ on (x1 = xx1) where (xx2 is not null);
 -- regression test: check for bug with propagation of implied equality
 -- to outside an IN
 --
+analyze tenk1;		-- ensure we get consistent plans here
+
 select count(*) from tenk1 a where unique1 in
   (select unique1 from tenk1 b join tenk1 c using (unique1)
    where b.unique2 = 42);
@@ -487,3 +489,42 @@ select * from
   zt2 left join zt3 on (f2 = f3)
       left join zv1 on (f3 = f1)
 where f2 = 53;
+
+--
+-- regression test for improper extraction of OR indexqual conditions
+-- (as seen in early 8.3.x releases)
+--
+
+select a.unique2, a.ten, b.tenthous, b.unique2, b.hundred
+from tenk1 a left join tenk1 b on a.unique2 = b.tenthous
+where a.unique1 = 42 and
+      ((b.unique2 is null and a.ten = 2) or b.hundred = 3);
+
+--
+-- test for sane behavior with noncanonical merge clauses, per bug #4926
+--
+
+begin;
+
+set enable_mergejoin = 1;
+set enable_hashjoin = 0;
+set enable_nestloop = 0;
+
+create temp table a (i integer);
+create temp table b (x integer, y integer);
+
+select * from a left join b on i = x and i = y and x = i;
+
+rollback;
+
+--
+-- test handling of potential equivalence clauses above outer joins
+--
+
+select q1, unique2, thousand, hundred
+  from int8_tbl a left join tenk1 b on q1 = unique2
+  where coalesce(thousand,123) = q1 and q1 = coalesce(hundred,123);
+
+select f1, unique2, case when unique2 is null then f1 else 0 end
+  from int4_tbl a left join tenk1 b on f1 = unique2
+  where (case when unique2 is null then f1 else 0 end) = 0;
diff --git a/src/test/regress/sql/limit.sql b/src/test/regress/sql/limit.sql
index c15a486aff9c..3004550b6584 100644
--- a/src/test/regress/sql/limit.sql
+++ b/src/test/regress/sql/limit.sql
@@ -30,3 +30,12 @@ SELECT ''::text AS five, unique1, unique2, stringu1
 SELECT ''::text AS five, unique1, unique2, stringu1 
 		FROM onek
 		ORDER BY unique1 LIMIT 5 OFFSET 900;
+
+-- Stress test for variable LIMIT in conjunction with bounded-heap sorting
+
+SELECT
+  (SELECT n
+     FROM (VALUES (1)) AS x,
+          (SELECT n FROM generate_series(1,10) AS n
+             ORDER BY n LIMIT 1 OFFSET s-1) AS y) AS z
+  FROM generate_series(1,10) AS s;
diff --git a/src/test/regress/sql/money.sql b/src/test/regress/sql/money.sql
new file mode 100644
index 000000000000..40bc0e1b41a7
--- /dev/null
+++ b/src/test/regress/sql/money.sql
@@ -0,0 +1,59 @@
+--
+-- MONEY
+--
+
+CREATE TABLE money_data (m money);
+
+INSERT INTO money_data VALUES ('123');
+SELECT * FROM money_data;
+SELECT m + '123' FROM money_data;
+SELECT m + '123.45' FROM money_data;
+SELECT m - '123.45' FROM money_data;
+SELECT m * 2 FROM money_data;
+SELECT m / 2 FROM money_data;
+
+-- All true
+SELECT m = '$123.00' FROM money_data;
+SELECT m != '$124.00' FROM money_data;
+SELECT m <= '$123.00' FROM money_data;
+SELECT m >= '$123.00' FROM money_data;
+SELECT m < '$124.00' FROM money_data;
+SELECT m > '$122.00' FROM money_data;
+
+-- All false
+SELECT m = '$123.01' FROM money_data;
+SELECT m != '$123.00' FROM money_data;
+SELECT m <= '$122.99' FROM money_data;
+SELECT m >= '$123.01' FROM money_data;
+SELECT m > '$124.00' FROM money_data;
+SELECT m < '$122.00' FROM money_data;
+
+SELECT cashlarger(m, '$124.00') FROM money_data;
+SELECT cashsmaller(m, '$124.00') FROM money_data;
+SELECT cash_words(m) FROM money_data;
+SELECT cash_words(m + '1.23') FROM money_data;
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.45');
+SELECT * FROM money_data;
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.451');
+SELECT * FROM money_data;
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.454');
+SELECT * FROM money_data;
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.455');
+SELECT * FROM money_data;
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.456');
+SELECT * FROM money_data;
+
+DELETE FROM money_data;
+INSERT INTO money_data VALUES ('$123.459');
+SELECT * FROM money_data;
+
diff --git a/src/test/regress/sql/oidjoins.sql b/src/test/regress/sql/oidjoins.sql
index 0f875079c454..773c2afe7faf 100644
--- a/src/test/regress/sql/oidjoins.sql
+++ b/src/test/regress/sql/oidjoins.sql
@@ -205,6 +205,10 @@ SELECT	ctid, indrelid
 FROM	pg_catalog.pg_index fk 
 WHERE	indrelid != 0 AND 
 	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indrelid);
+SELECT	ctid, lanowner 
+FROM	pg_catalog.pg_language fk 
+WHERE	lanowner != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.lanowner);
 SELECT	ctid, lanvalidator 
 FROM	pg_catalog.pg_language fk 
 WHERE	lanvalidator != 0 AND 
@@ -345,6 +349,74 @@ SELECT	ctid, tgfoid
 FROM	pg_catalog.pg_trigger fk 
 WHERE	tgfoid != 0 AND 
 	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tgfoid);
+SELECT	ctid, cfgnamespace 
+FROM	pg_catalog.pg_ts_config fk 
+WHERE	cfgnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.cfgnamespace);
+SELECT	ctid, cfgowner 
+FROM	pg_catalog.pg_ts_config fk 
+WHERE	cfgowner != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.cfgowner);
+SELECT	ctid, cfgparser 
+FROM	pg_catalog.pg_ts_config fk 
+WHERE	cfgparser != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_parser pk WHERE pk.oid = fk.cfgparser);
+SELECT	ctid, mapcfg 
+FROM	pg_catalog.pg_ts_config_map fk 
+WHERE	mapcfg != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_config pk WHERE pk.oid = fk.mapcfg);
+SELECT	ctid, mapdict 
+FROM	pg_catalog.pg_ts_config_map fk 
+WHERE	mapdict != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_dict pk WHERE pk.oid = fk.mapdict);
+SELECT	ctid, dictnamespace 
+FROM	pg_catalog.pg_ts_dict fk 
+WHERE	dictnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.dictnamespace);
+SELECT	ctid, dictowner 
+FROM	pg_catalog.pg_ts_dict fk 
+WHERE	dictowner != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.dictowner);
+SELECT	ctid, dicttemplate 
+FROM	pg_catalog.pg_ts_dict fk 
+WHERE	dicttemplate != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_template pk WHERE pk.oid = fk.dicttemplate);
+SELECT	ctid, prsnamespace 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.prsnamespace);
+SELECT	ctid, prsstart 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsstart != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsstart);
+SELECT	ctid, prstoken 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prstoken != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prstoken);
+SELECT	ctid, prsend 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsend != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsend);
+SELECT	ctid, prsheadline 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prsheadline != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsheadline);
+SELECT	ctid, prslextype 
+FROM	pg_catalog.pg_ts_parser fk 
+WHERE	prslextype != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prslextype);
+SELECT	ctid, tmplnamespace 
+FROM	pg_catalog.pg_ts_template fk 
+WHERE	tmplnamespace != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.tmplnamespace);
+SELECT	ctid, tmplinit 
+FROM	pg_catalog.pg_ts_template fk 
+WHERE	tmplinit != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmplinit);
+SELECT	ctid, tmpllexize 
+FROM	pg_catalog.pg_ts_template fk 
+WHERE	tmpllexize != 0 AND 
+	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmpllexize);
 SELECT	ctid, typnamespace 
 FROM	pg_catalog.pg_type fk 
 WHERE	typnamespace != 0 AND 
@@ -361,9 +433,9 @@ SELECT	ctid, typelem
 FROM	pg_catalog.pg_type fk 
 WHERE	typelem != 0 AND 
 	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typelem);
-SELECT  ctid, typarray 
-FROM    pg_catalog.pg_type fk 
-WHERE   typarray != 0 AND 
+SELECT	ctid, typarray 
+FROM	pg_catalog.pg_type fk 
+WHERE	typarray != 0 AND 
 	NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typarray);
 SELECT	ctid, typinput 
 FROM	pg_catalog.pg_type fk 
diff --git a/src/test/regress/sql/opr_sanity.sql b/src/test/regress/sql/opr_sanity.sql
index 135c91c8e208..ea831420c3b9 100644
--- a/src/test/regress/sql/opr_sanity.sql
+++ b/src/test/regress/sql/opr_sanity.sql
@@ -294,6 +294,10 @@ WHERE c.castfunc = p.oid AND
 -- As of 8.2, this finds the cast from cidr to inet, because that is a
 -- trivial binary coercion while the other way goes through inet_to_cidr().
 
+-- As of 8.3, this finds the casts from xml to text, varchar, and bpchar,
+-- because those are binary-compatible while the reverse goes through
+-- texttoxml(), which does an XML syntax check.
+
 SELECT *
 FROM pg_cast c
 WHERE c.castfunc = 0 AND
@@ -807,6 +811,16 @@ WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND
                            p4.amproclefttype = p3.amproclefttype AND
                            p4.amprocrighttype = p3.amprocrighttype);
 
+-- Also, check if there are any pg_opclass entries that don't seem to have
+-- pg_amproc support.
+
+SELECT amname, opcname, count(*)
+FROM pg_am am JOIN pg_opclass op ON opcmethod = am.oid
+     LEFT JOIN pg_amproc p ON amprocfamily = opcfamily AND
+         amproclefttype = amprocrighttype AND amproclefttype = opcintype
+GROUP BY amname, amsupport, opcname, amprocfamily
+HAVING count(*) != amsupport OR amprocfamily IS NULL;
+
 -- Unfortunately, we can't check the amproc link very well because the
 -- signature of the function may be different for different support routines
 -- or different base data types.
@@ -846,11 +860,10 @@ WHERE p3.opfmethod = (SELECT oid FROM pg_am WHERE amname = 'btree')
 -- For hash we can also do a little better: the support routines must be
 -- of the form hash(lefttype) returns int4.  There are several cases where
 -- we cheat and use a hash function that is physically compatible with the
--- datatype even though there's no cast, so for now we can't check that.
+-- datatype even though there's no cast, so this check does find a small
+-- number of entries.
 
-SELECT p1.amprocfamily, p1.amprocnum,
-	p2.oid, p2.proname,
-	p3.opfname
+SELECT p1.amprocfamily, p1.amprocnum, p2.proname, p3.opfname
 FROM pg_amproc AS p1, pg_proc AS p2, pg_opfamily AS p3
 WHERE p3.opfmethod = (SELECT oid FROM pg_am WHERE amname = 'hash')
     AND p1.amprocfamily = p3.oid AND p1.amproc = p2.oid AND
@@ -858,8 +871,9 @@ WHERE p3.opfmethod = (SELECT oid FROM pg_am WHERE amname = 'hash')
      OR proretset
      OR prorettype != 'int4'::regtype
      OR pronargs != 1
---   OR NOT physically_coercible(amproclefttype, proargtypes[0])
-     OR amproclefttype != amprocrighttype);
+     OR NOT physically_coercible(amproclefttype, proargtypes[0])
+     OR amproclefttype != amprocrighttype)
+ORDER BY 1;
 
 -- Support routines that are primary members of opfamilies must be immutable
 -- (else it suggests that the index ordering isn't fixed).  But cross-type
diff --git a/src/test/regress/sql/partition.sql b/src/test/regress/sql/partition.sql
index 8d10b57845f6..2a2f540fc13c 100644
--- a/src/test/regress/sql/partition.sql
+++ b/src/test/regress/sql/partition.sql
@@ -2852,7 +2852,7 @@ create table child_r
  -- issue MPP-7898.
 insert into child_r values
     (0, 'from r', 0, 0);
-    
+
 drop table if exists parent_s cascade; --ignore
 drop table if exists child_r cascade; --ignore
 
diff --git a/src/test/regress/sql/plancache.sql b/src/test/regress/sql/plancache.sql
new file mode 100644
index 000000000000..c2e8aedbfac0
--- /dev/null
+++ b/src/test/regress/sql/plancache.sql
@@ -0,0 +1,164 @@
+--
+-- Tests to exercise the plan caching/invalidation mechanism
+--
+
+CREATE TEMP TABLE pcachetest AS SELECT * FROM int8_tbl;
+
+-- create and use a cached plan
+PREPARE prepstmt AS SELECT * FROM pcachetest;
+
+EXECUTE prepstmt;
+
+-- and one with parameters
+PREPARE prepstmt2(bigint) AS SELECT * FROM pcachetest WHERE q1 = $1;
+
+EXECUTE prepstmt2(123);
+
+-- invalidate the plans and see what happens
+DROP TABLE pcachetest;
+
+EXECUTE prepstmt;
+EXECUTE prepstmt2(123);
+
+-- recreate the temp table (this demonstrates that the raw plan is
+-- purely textual and doesn't depend on OIDs, for instance)
+CREATE TEMP TABLE pcachetest AS SELECT * FROM int8_tbl;
+
+EXECUTE prepstmt;
+EXECUTE prepstmt2(123);
+
+-- prepared statements should prevent change in output tupdesc,
+-- since clients probably aren't expecting that to change on the fly
+ALTER TABLE pcachetest ADD COLUMN q3 bigint;
+
+EXECUTE prepstmt;
+EXECUTE prepstmt2(123);
+
+-- but we're nice guys and will let you undo your mistake
+ALTER TABLE pcachetest DROP COLUMN q3;
+
+EXECUTE prepstmt;
+EXECUTE prepstmt2(123);
+
+-- Try it with a view, which isn't directly used in the resulting plan
+-- but should trigger invalidation anyway
+CREATE TEMP VIEW pcacheview AS
+  SELECT * FROM pcachetest;
+
+PREPARE vprep AS SELECT * FROM pcacheview;
+
+EXECUTE vprep;
+
+CREATE OR REPLACE TEMP VIEW pcacheview AS
+  SELECT q1, q2/2 AS q2 FROM pcachetest;
+
+EXECUTE vprep;
+
+-- Check basic SPI plan invalidation
+
+create function cache_test(int) returns int as $$
+declare total int;
+begin
+	create temp table t1(f1 int) distributed by (f1);
+	insert into t1 values($1);
+	insert into t1 values(11);
+	insert into t1 values(12);
+	insert into t1 values(13);
+	select sum(f1) into total from t1;
+	drop table t1;
+	return total;
+end
+$$ language plpgsql;
+
+select cache_test(1);
+select cache_test(2);
+select cache_test(3);
+
+-- Check invalidation of plpgsql "simple expression"
+
+create temp view v1 as
+  select 2+2 as f1;
+
+create function cache_test_2() returns int as $$
+begin
+	return f1 from v1;
+end$$ language plpgsql;
+
+select cache_test_2();
+
+create or replace temp view v1 as
+  select 2+2+4 as f1;
+select cache_test_2();
+
+create or replace temp view v1 as
+  select 2+2+4+(select max(unique1) from tenk1) as f1;
+select cache_test_2();
+
+--- Check that change of search_path is ignored by replans
+
+create schema s1
+  create table abc (f1 int);
+
+create schema s2
+  create table abc (f1 int);
+
+insert into s1.abc values(123);
+insert into s2.abc values(456);
+
+set search_path = s1;
+
+prepare p1 as select f1 from abc;
+
+execute p1;
+
+set search_path = s2;
+
+select f1 from abc;
+
+execute p1;
+
+alter table s1.abc add column f2 float8;   -- force replan
+
+execute p1;
+
+drop schema s1 cascade;
+drop schema s2 cascade;
+
+reset search_path;
+
+-- Check that invalidation deals with regclass constants
+
+create temp sequence seq;
+
+prepare p2 as select nextval('seq');
+
+execute p2;
+
+drop sequence seq;
+
+create temp sequence seq;
+
+execute p2;
+
+-- Check DDL via SPI, immediately followed by SPI plan re-use
+-- (bug in original coding)
+
+create function cachebug() returns void as $$
+declare r int;
+begin
+  drop table if exists temptable cascade;
+  -- Ignore NOTICE about missing DISTRIBUTED BY. It was annoying here, as
+  -- usually you would only see it on the first invocation, but sometimes
+  -- you'd also get it on the second invocation, if the plan cache
+  -- got invalidated in between the invocations.
+  set client_min_messages=warning;
+  create temp table temptable as select * from generate_series(1,3) as f1;
+  reset client_min_messages;
+  create temp view vv as select * from temptable;
+  for r in select * from vv order by f1 loop
+    raise notice '%', r;
+  end loop;
+end$$ language plpgsql;
+
+select cachebug();
+select cachebug();
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index 1d75f43377e3..178d96f93409 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -1917,8 +1917,8 @@ $$ language plpgsql CONTAINS SQL;
 
 begin;
 
---select refcursor_test1('test1');
---fetch next from test1;
+select refcursor_test1('test1');
+fetch next in test1;
 
 --select refcursor_test1('test2');
 --fetch all from test2;
@@ -2441,6 +2441,229 @@ select footest();
 
 drop function footest();
 
+-- test scrollable cursor support
+
+create function sc_test() returns setof integer as $$
+declare 
+  c scroll cursor for select f1 from int4_tbl;
+  x integer;
+begin
+  open c;
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch prior from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+
+select * from sc_test();
+
+create or replace function sc_test() returns setof integer as $$
+declare 
+  c no scroll cursor for select f1 from int4_tbl;
+  x integer;
+begin
+  open c;
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch prior from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+
+select * from sc_test();  -- fails because of NO SCROLL specification
+
+create or replace function sc_test() returns setof integer as $$
+declare 
+  c refcursor;
+  x integer;
+begin
+  open c scroll for select f1 from int4_tbl;
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch prior from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+
+select * from sc_test();
+
+create or replace function sc_test() returns setof integer as $$
+declare 
+  c refcursor;
+  x integer;
+begin
+  open c scroll for execute 'select f1 from int4_tbl';
+  fetch last from c into x;
+  while found loop
+    return next x;
+    fetch relative -2 from c into x;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+
+select * from sc_test();
+
+create or replace function sc_test() returns setof integer as $$
+declare
+  c cursor for select * from generate_series(1, 10);
+  x integer;
+begin
+  open c;
+  loop
+      move relative 2 in c;
+      if not found then
+          exit;
+      end if;
+      fetch next from c into x;
+      if found then
+          return next x;
+      end if;
+  end loop;
+  close c;
+end;
+$$ language plpgsql;
+
+select * from sc_test();
+
+drop function sc_test();
+
+-- test qualified variable names
+
+create function pl_qual_names (param1 int) returns void as $$
+<<outerblock>>
+declare
+  param1 int := 1;
+begin
+  <<innerblock>>
+  declare
+    param1 int := 2;
+  begin
+    raise notice 'param1 = %', param1;
+    raise notice 'pl_qual_names.param1 = %', pl_qual_names.param1;
+    raise notice 'outerblock.param1 = %', outerblock.param1;
+    raise notice 'innerblock.param1 = %', innerblock.param1;
+  end;
+end;
+$$ language plpgsql;
+
+select pl_qual_names(42);
+
+drop function pl_qual_names(int);
+
+-- tests for RETURN QUERY
+create function ret_query1(out int, out int) returns setof record as $$
+begin
+    $1 := -1;
+    $2 := -2;
+    return next;
+    return query select x + 1, x * 10 from generate_series(0, 10) s (x);
+    return next;
+end;
+$$ language plpgsql;
+
+select * from ret_query1();
+
+create type record_type as (x text, y int, z boolean);
+
+create or replace function ret_query2(lim int) returns setof record_type as $$
+begin
+    return query select md5(s.x::text), s.x, s.x > 0
+                 from generate_series(-8, lim) s (x) where s.x % 2 = 0;
+end;
+$$ language plpgsql;
+
+select * from ret_query2(8);
+
+-- Test for appropriate cleanup of non-simple expression evaluations
+-- (bug in all versions prior to August 2010)
+
+CREATE FUNCTION nonsimple_expr_test() RETURNS text[] AS $$
+DECLARE
+  arr text[];
+  lr text;
+  i integer;
+BEGIN
+  arr := array[array['foo','bar'], array['baz', 'quux']];
+  lr := 'fool';
+  i := 1;
+  -- use sub-SELECTs to make expressions non-simple
+  arr[(SELECT i)][(SELECT i+1)] := (SELECT lr);
+  RETURN arr;
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT nonsimple_expr_test();
+
+DROP FUNCTION nonsimple_expr_test();
+
+CREATE FUNCTION nonsimple_expr_test() RETURNS integer AS $$
+declare
+   i integer NOT NULL := 0;
+begin
+  begin
+    i := (SELECT NULL::integer);  -- should throw error
+  exception
+    WHEN OTHERS THEN
+      i := (SELECT 1::integer);
+  end;
+  return i;
+end;
+$$ LANGUAGE plpgsql;
+
+SELECT nonsimple_expr_test();
+
+DROP FUNCTION nonsimple_expr_test();
+
+--
+-- Test cases involving recursion and error recovery in simple expressions
+-- (bugs in all versions before October 2010).  The problems are most
+-- easily exposed by mutual recursion between plpgsql and sql functions.
+--
+
+create function recurse(float8) returns float8 as
+$$
+begin
+  if ($1 > 0) then
+    return sql_recurse($1 - 1);
+  else
+    return $1;
+  end if;
+end;
+$$ language plpgsql;
+
+-- "limit" is to prevent this from being inlined
+create function sql_recurse(float8) returns float8 as
+$$ select recurse($1) limit 1; $$ language sql;
+
+select recurse(5);
+
+create function error1(text) returns text language sql as
+$$ SELECT relname::text FROM pg_class c WHERE c.oid = $1::regclass $$;
+
+create function error2(p_name_table text) returns text language plpgsql as $$
+begin
+  return error1(p_name_table);
+end$$;
+
+BEGIN;
+create table public.stuffs (stuff text);
+SAVEPOINT a;
+select error2('nonexistent.stuffs');
+ROLLBACK TO a;
+select error2('public.stuffs');
+rollback;
+
+drop function error2(p_name_table text);
+drop function error1(text);
+
 -- Test anonymous code blocks.
 
 DO $$
diff --git a/src/test/regress/sql/plpgsql_cache.sql b/src/test/regress/sql/plpgsql_cache.sql
index 9369d33bd1e9..50328717f05b 100644
--- a/src/test/regress/sql/plpgsql_cache.sql
+++ b/src/test/regress/sql/plpgsql_cache.sql
@@ -5,16 +5,18 @@
 -- Testing various scenarios where plans will not be cached. 
 -- MPP-16204
 
+set client_min_messages = 'warning';
+drop table if exists cache_tab cascade;
+drop function if exists cache_test();
+drop function if exists cache_test(int);
+reset client_min_messages;
+
 --
 -- ************************************************************
 -- * Repro with drop table inside a function
 -- *    - Multiple executions should not raise an error 
 -- ************************************************************
 --
-drop table if exists cache_tab cascade;
-
-drop function if exists cache_test();
-
 create function cache_test() returns void as
 $$
 begin
@@ -56,17 +58,20 @@ create function cache_test(id int) returns int as $$
 declare 
 	v_int int;
 begin 
-	select c1 from cache_tab where c2 = id INTO v_int; 
+	select c1 from cache_tab where c2 = id::text INTO v_int;
 	return v_int;
 end;
 $$ language plpgsql READS SQL DATA;
 
 select * from cache_test(1);
 
+-- ALTER TABLE prints a NOTICE with unpredictable temp table's name
+set client_min_messages='warning';
 alter table cache_tab split default partition 
 start (11) inclusive
 end (20) exclusive 
 into (partition part2, partition def);
+reset client_min_messages;
 
 -- following should not fail. 
 select * from cache_test(2);
@@ -96,7 +101,7 @@ create function cache_test(var int) returns varchar as $$
 declare 
 	v_name varchar(20) DEFAULT 'zzzz';
 begin 
-	select name from cache_tab into v_name where id = var; 
+	select name from cache_tab into v_name where id = var;
 	return v_name;
 end;
 $$ language plpgsql READS SQL DATA;
@@ -299,10 +304,13 @@ $$ language plpgsql READS SQL DATA;
 
 select cache_test(100); 
 
+-- ALTER TABLE prints a NOTICE with unpredictable temp table's name
+set client_min_messages='warning';
 alter table cache_tab split default partition 
 start (11) inclusive
 end (20) exclusive 
 into (partition part2, partition def);
+reset client_min_messages;
 
 select cache_test(100); 
 
@@ -458,14 +466,6 @@ drop table cache_temp;
 -- ************************************************************
 --
 
--- start_matchsubs
---
--- m|ERROR:\s+relation with OID \d+ does not exist|
--- s|ERROR:\s+relation with OID \d+ does not exist|ERROR: relation with OID DUMMY does not exist|
---
--- end_matchsubs
-
-
 create table cache_tab(c1 int, c2 int) distributed randomly; 
 
 drop function if exists cache_test(count int); 
@@ -481,12 +481,16 @@ end;
 $$ language plpgsql MODIFIES SQL DATA;
 
 select cache_test(5);
+-- should return 5 rows
+select * from cache_tab;
 
 drop table if exists cache_tab;
 
 create table cache_tab(c1 int, c2 int) distributed randomly; 
 
 select cache_test(5);
+-- should return 5 rows
+select * from cache_tab;
 
 drop function cache_test(count int); 
 
@@ -504,111 +508,183 @@ begin
 end; 
 $$ language plpgsql MODIFIES SQL DATA;
 
--- this will fail
-select cache_test(5);
-
-set gp_plpgsql_clear_cache_always = on;
-
--- this will pass
 select cache_test(5);
+-- should return 1 row
+select * from cache_tab;
 
 drop table if exists cache_tab;
 
 drop function cache_test(count int) cascade;
 
---
 -- ************************************************************
--- * testing guc
+-- * A function that queries a table that's dropped and recreated
 -- ************************************************************
 --
+-- This used to fail on GPDB 4.3, but works after the PostgreSQL 8.3 merge,
+-- thanks to upstream plan cache invalidation. (The old GPDB code didn't
+-- force plans to be recomputed in the same transaction, only across
+-- transactions. There was a GUC called gp_plpgsql_clear_cache_always that
+-- you could set, and made this work, though. But that's no longer needed).
 
-drop table if exists cache_tab cascade;
-
-drop function if exists cache_test();
+create table cache_tab (t text);
+insert into cache_tab values ('b');
 
-create function cache_test() returns void as
+create function cache_test(p text) returns integer as
 $$
 begin
-	drop table if exists cache_tab;
-	create table cache_tab (id int) distributed randomly;
-	insert into cache_tab values (1);
+  return (select count(*) from cache_tab where t = p);
 end;
-$$ language plpgsql MODIFIES SQL DATA;
-
+$$ language plpgsql;
 
 BEGIN;
 
-select cache_test();
-
--- this will fail
-select cache_test();
+-- Run the function. This caches the plan for the select inside the
+-- function.
+select cache_test('b');
 
-COMMIT; 
+-- Drop and re-create the table
+drop table cache_tab;
+create table cache_tab (t text);
+insert into cache_tab values ('b');
 
-set gp_plpgsql_clear_cache_always = on;
-
-select cache_test();
+-- Re-run the function.
+select cache_test('b');
 
+COMMIT;
 
 drop table cache_tab;
+drop function cache_test(text);
 
-drop function cache_test();
-
---
 -- ************************************************************
--- * testing guc
+-- * A function that calls another function, and the other function is
+-- * dropped and recreated.
 -- ************************************************************
 --
-drop table if exists cache_tab cascade;
+-- This depends on plan cache invalidation support added in PostgreSQL 8.4.
 
-drop function if exists cache_test(); 
+-- Create a function, and another function that calls the first one.
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'foo ' || t;
+end;
+$$ language plpgsql;
 
-set gp_plpgsql_clear_cache_always = off;
-create function cache_test() returns void as
+create or replace function cache_test(t text) returns text as
 $$
-declare count int; 
 begin
-	count := 3;
-	while count > 0 
-	loop
-		drop table if exists cache_tab;
-		create table cache_tab (id int) distributed randomly;
-		insert into cache_tab values (1);
-		count := count - 1;
-	end loop;
+  return get_dummy_string(t);
 end;
-$$ language plpgsql MODIFIES SQL DATA;
+$$ language plpgsql;
 
--- this will fail
-select cache_test();
+-- Run the function, to warm the plan cache with the function
+-- call to get_dummy_string().
+select cache_test('');
 
-set gp_plpgsql_clear_cache_always = on;
+-- Drop and re-create get_dummy_string() function.
+drop function get_dummy_string(text);
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'bar ' || t;
+end;
+$$ language plpgsql;
 
--- this will pass
-select cache_test();
+-- Re-run the function
+select cache_test('');
 
-set gp_plpgsql_clear_cache_always = off;
+drop function get_dummy_string(text);
+drop function cache_test(text);
 
-drop function cache_test();
+-- ************************************************************
+-- * A function that calls another function, and the other function is
+-- * dropped and recreated.
+-- ************************************************************
 
-create function cache_test() returns void as
+-- Create a function, and another function that calls the first one.
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'foo ' || t;
+end;
+$$ language plpgsql;
+
+create or replace function cache_test(t text) returns text as
 $$
-declare count int; 
 begin
-	count := 3;
-	while count > 0 
-	loop
-		set gp_plpgsql_clear_cache_always = on;
-		drop table if exists cache_tab;
-		create table cache_tab (id int) distributed randomly;
-		insert into cache_tab values (1);
-		count := count - 1;
-	end loop;
+  return get_dummy_string(t);
 end;
-$$ language plpgsql MODIFIES SQL DATA;
+$$ language plpgsql;
 
-select cache_test();
 
+-- Run the function, to warm the plan cache with the function
+-- call to get_dummy_string().
+select cache_test('');
+
+-- Also run the function as part of a query so that the function
+-- is executed in segments rather than the master. (Without ORCA.
+-- With ORCA, the query is planned differently and runs on the
+-- master anyway).
+create temporary table cache_tab (t text);
+insert into cache_tab values ('b');
+
+select cache_test(t) from cache_tab;
+
+-- Drop and re-create get_dummy_string() function.
+drop function get_dummy_string(text);
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'bar' || t;
+end;
+$$ language plpgsql;
+
+-- Re-run the function
+select cache_test('');
+select cache_test(t) from cache_tab;
+
+drop function get_dummy_string(text);
+drop function cache_test(text);
 drop table cache_tab;
 
-drop function cache_test();
+-- ************************************************************
+-- * A function that calls another function, and the other function
+-- * is dropped and recreated. Same as previous tests, but the
+-- * function is executed IMMUTABLE, to test that plan cache
+-- * invalidation also works when the function is inlined.
+-- ************************************************************
+--
+-- To make sure that plan invalidation works also when the function
+-- is inlined.
+
+-- Create a function, and another function that calls the first one.
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'foo ' || t;
+end;
+$$ language plpgsql IMMUTABLE;
+
+create or replace function cache_test(t text) returns text as
+$$
+begin
+  return get_dummy_string(t);
+end;
+$$ language plpgsql IMMUTABLE;
+
+create temporary table cache_tab (t text);
+insert into cache_tab values ('b');
+
+-- Run the function, to warm the plan cache.
+select cache_test('');
+select cache_test(t) from cache_tab;
+
+-- Drop and re-create get_dummy_string() function.
+drop function get_dummy_string(text);
+create or replace function get_dummy_string(t text) returns text as $$
+begin
+  return 'bar' || t;
+end;
+$$ language plpgsql;
+
+-- Re-run the function
+select cache_test('');
+select cache_test(t) from cache_tab;
+
+drop function get_dummy_string(text);
+drop function cache_test(text);
diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql
index ad965573c032..108a5fb6a911 100644
--- a/src/test/regress/sql/point.sql
+++ b/src/test/regress/sql/point.sql
@@ -53,7 +53,7 @@ SELECT '' AS two, p.* FROM POINT_TBL p
 
 SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist
    FROM POINT_TBL p
-   ORDER BY dist ;
+   ORDER BY dist;
 
 SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist
    FROM POINT_TBL p1, POINT_TBL p2
diff --git a/src/test/regress/sql/polymorphism.sql b/src/test/regress/sql/polymorphism.sql
index c5da7eb71007..ac4b51d95102 100644
--- a/src/test/regress/sql/polymorphism.sql
+++ b/src/test/regress/sql/polymorphism.sql
@@ -402,11 +402,47 @@ select case when $1 then $2 else $3 end $$ language sql;
 -- by having the same value for the distributed column for multiple rows.
 -- We need this to ensure that the NOTICE raised by bleat function gets returned
 -- in the same order.
-create table int4_tbl_new(f1 int, f2 int) distributed by(f1);
-insert into int4_tbl_new values(1, 123456), (1, -2147483647), (1, 0), (1, -123456), (1, 2147483647);
+create table int4_tbl_new(f0 int, f1 int) distributed by(f0);
+insert into int4_tbl_new values(1, 0), (1, 123456), (1, -123456), (1, 2147483647), (1, -2147483647);
 
 -- Note this would fail with integer overflow, never mind wrong bleat() output,
 -- if the CASE expression were not successfully inlined
-select f2, sql_if(f2 > 0, bleat(f2), bleat(f2 + 1)) from int4_tbl_new;
+select f1, sql_if(f1 > 0, bleat(f1), bleat(f1 + 1)) from int4_tbl_new;
 
 select q2, sql_if(q2 > 0, q2, q2 + 1) from int8_tbl;
+
+-- another kind of polymorphic aggregate
+
+create function add_group(grp anyarray, ad anyelement, size integer)
+  returns anyarray
+  as $$
+begin
+  if grp is null then
+    return array[ad];
+  end if;
+  if array_upper(grp, 1) < size then
+    return grp || ad;
+  end if;
+  return grp;
+end;
+$$
+  language plpgsql immutable;
+
+create aggregate build_group(anyelement, integer) (
+  SFUNC = add_group,
+  STYPE = anyarray
+);
+
+select build_group(q1,3) from (select q1 from int8_tbl order by q1) as t;
+
+-- this should fail because stype isn't compatible with arg
+create aggregate build_group(int8, integer) (
+  SFUNC = add_group,
+  STYPE = int2[]
+);
+
+-- but we can make a non-poly agg from a poly sfunc if types are OK
+create aggregate build_group(int8, integer) (
+  SFUNC = add_group,
+  STYPE = int8[]
+);
diff --git a/src/test/regress/sql/portals.sql b/src/test/regress/sql/portals.sql
index 6ac4b33f139d..3b17b1fa8a28 100644
--- a/src/test/regress/sql/portals.sql
+++ b/src/test/regress/sql/portals.sql
@@ -4,51 +4,51 @@
 SET optimizer_disable_missing_stats_collection=true;
 BEGIN;
 
-DECLARE foo1 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo1 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo2 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo3 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo3 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo4 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo5 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo5 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo6 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo7 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo7 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo8 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo9 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo9 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo10 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo11 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo11 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo12 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo13 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo13 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo14 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo15 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo15 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo16 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo17 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo17 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo18 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo19 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo19 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo20 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo21 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo21 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 DECLARE foo22 CURSOR FOR SELECT * FROM tenk2 ORDER BY 1,2,3,4;
 
-DECLARE foo23 CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo23 SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 FETCH 1 in foo1;
 
@@ -125,11 +125,11 @@ CLOSE foo12;
 
 -- record this in the system view as well (don't query the time field there
 -- however)
-SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors ORDER BY name;
+SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors;
 
 END;
 
-SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors ORDER BY name;
+SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors;
 
 --
 -- NO SCROLL disallows backward fetching
@@ -137,7 +137,7 @@ SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors OR
 
 BEGIN;
 
-DECLARE foo24 NO SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo24 NO SCROLL CURSOR FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 FETCH 1 FROM foo24;
 
@@ -178,7 +178,7 @@ CLOSE foo25;
 
 BEGIN;
 
-DECLARE foo26 CURSOR WITH HOLD FOR SELECT * FROM tenk1 ORDER BY 1,2,3,4;
+DECLARE foo26 CURSOR WITH HOLD FOR SELECT * FROM tenk1 ORDER BY unique2;
 
 ROLLBACK;
 
@@ -257,3 +257,139 @@ ROLLBACK;
 PREPARE cprep AS
   SELECT name, statement, is_holdable, is_binary, is_scrollable FROM pg_cursors ORDER BY name;
 EXECUTE cprep;
+
+-- test CLOSE ALL;
+SELECT name FROM pg_cursors ORDER BY 1;
+CLOSE ALL;
+SELECT name FROM pg_cursors ORDER BY 1;
+BEGIN;
+DECLARE foo1 CURSOR WITH HOLD FOR SELECT 1;
+DECLARE foo2 CURSOR WITHOUT HOLD FOR SELECT 1;
+SELECT name FROM pg_cursors ORDER BY 1;
+CLOSE ALL;
+SELECT name FROM pg_cursors ORDER BY 1;
+COMMIT;
+
+--
+-- Tests for updatable cursors
+--
+
+-- In GPDB, we use a dummy column as distribution key, so that all the
+-- rows land on the same segment. Otherwise the order the cursor returns
+-- the rows is unstable.
+CREATE TEMP TABLE uctest(f1 int, f2 text, distkey text) distributed by (distkey);
+INSERT INTO uctest VALUES (1, 'one'), (2, 'two'), (3, 'three');
+SELECT f1, f2 FROM uctest;
+
+-- Check DELETE WHERE CURRENT
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest;
+FETCH 2 FROM c1;
+DELETE FROM uctest WHERE CURRENT OF c1;
+-- should show deletion
+SELECT f1, f2 FROM uctest;
+-- cursor did not move
+FETCH ALL FROM c1;
+-- cursor is insensitive
+--MOVE BACKWARD ALL IN c1; -- backwards scans not supported in GPDB
+--FETCH ALL FROM c1;
+COMMIT;
+-- should still see deletion
+SELECT f1, f2 FROM uctest;
+
+-- Check UPDATE WHERE CURRENT; this time use FOR UPDATE
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest FOR UPDATE;
+FETCH c1;
+UPDATE uctest SET f1 = 8 WHERE CURRENT OF c1;
+SELECT f1, f2 FROM uctest;
+COMMIT;
+SELECT f1, f2 FROM uctest;
+
+-- Check repeated-update and update-then-delete cases
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest;
+FETCH c1;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+SELECT f1, f2 FROM uctest;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+-- insensitive cursor should not show effects of updates or deletes
+--FETCH RELATIVE 0 FROM c1;
+DELETE FROM uctest WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+DELETE FROM uctest WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+--FETCH RELATIVE 0 FROM c1;
+ROLLBACK;
+SELECT f1, f2 FROM uctest;
+
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest FOR UPDATE;
+FETCH c1;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+SELECT f1, f2 FROM uctest;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+DELETE FROM uctest WHERE CURRENT OF c1; -- currently broken on GPDB! (does nothing)
+SELECT f1, f2 FROM uctest;
+DELETE FROM uctest WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1; -- no-op
+SELECT f1, f2 FROM uctest;
+--- sensitive cursors can't currently scroll back, so this is an error:
+FETCH RELATIVE 0 FROM c1;
+ROLLBACK;
+SELECT f1, f2 FROM uctest;
+
+-- Check inheritance cases
+CREATE TEMP TABLE ucchild () inherits (uctest);
+INSERT INTO ucchild values(100, 'hundred');
+SELECT f1, f2 FROM uctest;
+
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT f1, f2 FROM uctest;
+FETCH 1 FROM c1;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+FETCH 1 FROM c1;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+FETCH 1 FROM c1;
+UPDATE uctest SET f1 = f1 + 10 WHERE CURRENT OF c1;
+FETCH 1 FROM c1;
+COMMIT;
+SELECT f1, f2 FROM uctest;
+
+-- Check various error cases
+
+DELETE FROM uctest WHERE CURRENT OF c1;  -- fail, no such cursor
+DECLARE cx CURSOR WITH HOLD FOR SELECT * FROM uctest;
+DELETE FROM uctest WHERE CURRENT OF cx;  -- fail, can't use held cursor
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM tenk2;
+DELETE FROM uctest WHERE CURRENT OF c;  -- fail, cursor on wrong table
+ROLLBACK;
+BEGIN;
+DECLARE c CURSOR FOR SELECT * FROM tenk1 JOIN tenk2 USING (unique1);
+DELETE FROM tenk1 WHERE CURRENT OF c;  -- fail, cursor is on a join
+ROLLBACK;
+BEGIN;
+DECLARE c CURSOR FOR SELECT f1,count(*) FROM uctest GROUP BY f1;
+DELETE FROM uctest WHERE CURRENT OF c;  -- fail, cursor is on aggregation
+ROLLBACK;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM uctest;
+DELETE FROM uctest WHERE CURRENT OF c1; -- fail, no current row
+ROLLBACK;
+
+-- WHERE CURRENT OF may someday work with views, but today is not that day.
+-- For now, just make sure it errors out cleanly.
+CREATE TEMP VIEW ucview AS SELECT f1, f2 FROM uctest;
+CREATE RULE ucrule AS ON DELETE TO ucview DO INSTEAD
+  DELETE FROM uctest WHERE f1 = OLD.f1;
+BEGIN;
+DECLARE c1 CURSOR FOR SELECT * FROM ucview;
+FETCH FROM c1;
+DELETE FROM ucview WHERE CURRENT OF c1; -- fail, views not supported
+ROLLBACK;
diff --git a/src/test/regress/sql/prepare.sql b/src/test/regress/sql/prepare.sql
index 9a53d6883dbc..1b5d12f5f33a 100644
--- a/src/test/regress/sql/prepare.sql
+++ b/src/test/regress/sql/prepare.sql
@@ -38,7 +38,8 @@ EXECUTE q2('regression');
 
 PREPARE q3(text, int, float, boolean, oid, smallint) AS
 	SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR
-	ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int) ORDER BY 1,2,3,4;
+	ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int)
+	ORDER BY unique1;
 
 EXECUTE q3('AAAAxx', 5::smallint, 10.5::float, false, 500::oid, 4::bigint);
 
@@ -56,7 +57,8 @@ PREPARE q4(nonexistenttype) AS SELECT $1;
 
 -- create table as execute
 PREPARE q5(int, text) AS
-	SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2;
+	SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2
+	ORDER BY unique1;
 CREATE TEMPORARY TABLE q5_prep_results AS EXECUTE q5(200, 'DTAAAA');
 SELECT * FROM q5_prep_results ORDER BY 1,2,3,4;
 
@@ -68,3 +70,9 @@ PREPARE q7(unknown) AS
 
 SELECT name, statement, parameter_types FROM pg_prepared_statements
     ORDER BY name;
+
+-- test DEALLOCATE ALL;
+DEALLOCATE ALL;
+SELECT name, statement, parameter_types FROM pg_prepared_statements
+    ORDER BY name;
+
diff --git a/src/test/regress/sql/qp_misc_jiras.sql b/src/test/regress/sql/qp_misc_jiras.sql
index 0f3a17ad517f..51ad9f39fc52 100644
--- a/src/test/regress/sql/qp_misc_jiras.sql
+++ b/src/test/regress/sql/qp_misc_jiras.sql
@@ -20,7 +20,7 @@ create table qp_misc_jiras.tbl1318(dummy integer, aa text not null);
 create index concurrently a_daa on qp_misc_jiras.tbl1318(dummy,aa);
 alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa);
 drop index qp_misc_jiras.tbl1318_daa;
-alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa);
+alter table qp_misc_jiras.tbl1318 alter column aa type integer using  bit_length(aa::text);
 drop table qp_misc_jiras.tbl1318;
 
 create table qp_misc_jiras.tbl1318(dummy integer, aa text not null);
@@ -847,8 +847,8 @@ END ('2009-06-30 00:00:00'::timestamp without time zone) EVERY ('1 day'::interva
 );
 
 insert into qp_misc_jiras.tbl6419_test values( 123, '2009-06-01', 12, '2009-06-01 01:01:01', 'aaaaaa');
-select * from qp_misc_jiras.tbl6419_test where icedt = (select partitionrangestart FROM pg_partitions where tablename='test1' and schemaname='public' and partitionrank=1);
-select * from qp_misc_jiras.tbl6419_test where '2009-12-12'::date = (select 'test'::text);
+select * from qp_misc_jiras.tbl6419_test where icedt::text = (select partitionrangestart FROM pg_partitions where tablename='test1' and schemaname='public' and partitionrank=1);
+select * from qp_misc_jiras.tbl6419_test where '2009-12-12'::date::text = (select 'test'::text);
 drop table qp_misc_jiras.tbl6419_test;
 
 -- start_matchsubs
diff --git a/src/test/regress/sql/qp_query_execution.sql b/src/test/regress/sql/qp_query_execution.sql
index 791e373e310d..9288b4c96cc3 100644
--- a/src/test/regress/sql/qp_query_execution.sql
+++ b/src/test/regress/sql/qp_query_execution.sql
@@ -155,7 +155,7 @@ analyze foo_p;
 
 analyze bar;
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6;', 'Hash Left Join', 'Hash Left Join');
 select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6 order by 1, 2 desc limit 10;
 
 select qx_count_operator('explain select foo_p.k, foo_p.t from foo_p left outer join bar on foo_p.k = bar.k  where foo_p.t is not null and foo_p.p = 6;', 'Hash Left Join', 'Hash Left Join');
@@ -211,7 +211,7 @@ analyze b;
 select qx_count_operator('explain select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k  where abbp.t is not null and abbp.p = 6;', 'Hash Left Join', 'Hash Left Join');
 select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k  where abbp.t is not null and abbp.p = 6 order by 1, 2 desc limit 10;
 
-select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Hash Left Join', 'Hash Left Join');
 select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = '6SOME NUMBER' order by 1, 2 desc limit 10;
 
 -- Varchar in the select list with a broadcast on top of an append with flow node
@@ -252,7 +252,7 @@ analyze b;
 select qx_count_operator('explain select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k where abbp.t is not null and abbp.p = 6;', 'Hash Left Join', 'Hash Left Join');
 select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k where abbp.t is not null and abbp.p = 6 order by 1, 2 desc limit 10;
 
-select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k where abbp.t is not null and abbp.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k where abbp.t is not null and abbp.a = 6;', 'Hash Left Join', 'Hash Left Join');
 select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k where abbp.t is not null and abbp.a = 6 order by 1, 2 asc limit 10;
 
 -- Partitioned tables with decimal type distribution keys
@@ -276,7 +276,7 @@ analyze bar;
 select qx_count_operator('explain select foo_p.k, foo_p.t from foo_p left outer join bar on foo_p.k = bar.k  where foo_p.t is not null and foo_p.p = 6;', 'Hash Left Join', 'Hash Left Join');
 select foo_p.k, foo_p.t from foo_p left outer join bar on foo_p.k = bar.k  where foo_p.t is not null and foo_p.p = 6 order by 1, 2 desc limit 10;
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6.00;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6.00;', 'Hash Left Join', 'Hash Left Join');
 select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = 6.00 order by 1, 2 desc limit 10;
 
 -- Partitioned tables with character type distribution keys used in predicates
@@ -300,7 +300,7 @@ analyze b;
 select qx_count_operator('explain select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k  where abbp.t is not null and abbp.p = 6;', 'Hash Left Join', 'Hash Left Join');
 select abbp.k, abbp.t from abbp left outer join b on abbp.k = b.k  where abbp.t is not null and abbp.p = 6 order by 1, 2 asc limit 10;
 
-select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = E''6SOME NUMBER''', 'Hash Left Join', 'Hash Left Join');
 select abbp.b, abbp.t from abbp left outer join b on abbp.a = b.k  where abbp.t is not null and abbp.a = '6SOME NUMBER' order by 1, 2 asc limit 10;
 
 -- Partitioned tables on both sides of a join
@@ -324,7 +324,7 @@ analyze bar_p;
 select qx_count_operator('explain select foo_p.k, foo_p.t from foo_p left outer join bar_p on foo_p.k = bar_p.k  where foo_p.t is not null and foo_p.p = 6;', 'Hash Left Join', 'Hash Left Join');
 select foo_p.k, foo_p.t from foo_p left outer join bar_p on foo_p.k = bar_p.k  where foo_p.t is not null and foo_p.p = 6 order by 1, 2 desc limit 10;
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k  where foo_p.t is not null and foo_p.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k  where foo_p.t is not null and foo_p.a = 6;', 'Hash Left Join', 'Hash Left Join');
 select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k  where foo_p.t is not null and foo_p.a = 6 order by 1, 2 asc limit 10;
 
 select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k and foo_p.k = bar_p.k where foo_p.t is not null and foo_p.a = 6 and bar_p.a = 14;', 'Nested Loop', 'Hash Join');
@@ -342,7 +342,7 @@ select  foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k a
 select qx_count_operator('explain select  foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k and foo_p.b = bar_p.b where foo_p.t is not null and foo_p.a = 6;', 'Hash Left Join', 'Hash Left Join');
 select  foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.k and foo_p.b = bar_p.b where foo_p.t is not null and foo_p.a = 6 order by 1, 2 desc limit 10;
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.a  where foo_p.t is not null and foo_p.a = 6;', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.a  where foo_p.t is not null and foo_p.a = 6;', 'Hash Left Join', 'Hash Left Join');
 select foo_p.b, foo_p.t from foo_p left outer join bar_p on foo_p.a = bar_p.a  where foo_p.t is not null and foo_p.a = 6 order by 1, 2 asc limit 10;
 
 -- Queries where equality predicate is not an immediate constant
@@ -362,11 +362,11 @@ insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from gener
 analyze foo_p;
 analyze bar;
 
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1];', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1];', 'Hash Left Join', 'Hash Left Join');
 select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1] order by 1, 2 desc limit 10;
 
 create function mytest(integer) returns integer as 'select $1/100' language sql;
-select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = mytest(100);', 'Nested Loop', 'Hash Left Join');
+select qx_count_operator('explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = mytest(100);', 'Hash Left Join', 'Hash Left Join');
 select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = mytest(100) order by 1, 2 asc limit 10;
 
 drop function if exists mytest(integer);
diff --git a/src/test/regress/sql/rangefuncs.sql b/src/test/regress/sql/rangefuncs.sql
index de9c51b0ce10..138a87c2d747 100644
--- a/src/test/regress/sql/rangefuncs.sql
+++ b/src/test/regress/sql/rangefuncs.sql
@@ -261,3 +261,35 @@ DROP FUNCTION dup(anyelement);
 -- fails, no way to deduce outputs
 CREATE FUNCTION bad (f1 int, out f2 anyelement, out f3 anyarray)
 AS 'select $1, array[$1,$1]' LANGUAGE sql;
+
+-- test case for a whole-row-variable bug
+create function foo1(n integer, out a text, out b text)
+  returns setof record
+  language sql
+  as $$ select 'foo ' || i, 'bar ' || i from generate_series(1,$1) i $$;
+
+set work_mem='64kB';
+select t.a, t, t.a from foo1(10000) t limit 1;
+reset work_mem;
+select t.a, t, t.a from foo1(10000) t limit 1;
+
+drop function foo1(n integer);
+
+-- check handling of a SQL function with multiple OUT params (bug #5777)
+
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2.1) $$ language sql;
+
+select * from foobar();
+
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2) $$ language sql;
+
+select * from foobar();  -- fail
+
+create or replace function foobar(out integer, out numeric) as
+$$ select (1, 2.1, 3) $$ language sql;
+
+select * from foobar();  -- fail
+
+drop function foobar();
diff --git a/src/test/regress/sql/rowtypes.sql b/src/test/regress/sql/rowtypes.sql
index dd5dfc0e3122..2f5ac2223a85 100644
--- a/src/test/regress/sql/rowtypes.sql
+++ b/src/test/regress/sql/rowtypes.sql
@@ -109,5 +109,7 @@ select thousand, tenthous from tenk1
 where (thousand, tenthous) >= (997, 5000)
 order by thousand, tenthous;
 
--- empty row constructor is valid
+-- Check some corner cases involving empty rowtypes
 select ROW();
+select ROW() IS NULL;
+select ROW() = ROW();
diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql
index 7584a0fc93b6..df0baac0a9b2 100644
--- a/src/test/regress/sql/rules.sql
+++ b/src/test/regress/sql/rules.sql
@@ -851,6 +851,21 @@ create rule rule_and_refint_t3_ins as on insert to rule_and_refint_t3
 insert into rule_and_refint_t3 values (1, 11, 13, 'row7');
 insert into rule_and_refint_t3 values (1, 13, 11, 'row8');
 
+--
+-- test conversion of table to view (needed to load some pg_dump files)
+--
+
+create table fooview (x int, y text);
+select xmin, * from fooview;
+
+create rule "_RETURN" as on select to fooview do instead
+  select 1 as x, 'aaa'::text as y;
+
+select * from fooview;
+select xmin, * from fooview;  -- fail, views don't have such a column
+
+drop view fooview;
+
 --
 -- check for planner problems with complex inherited UPDATES
 --
@@ -881,3 +896,41 @@ select * from id_ordered ORDER BY 1;
 
 set client_min_messages to warning; -- suppress cascade notices
 drop table id cascade;
+reset client_min_messages;
+
+--
+-- check corner case where an entirely-dummy subplan is created by
+-- constraint exclusion
+--
+
+create temp table t1 (a integer primary key);
+
+create temp table t1_1 (check (a >= 0 and a < 10)) inherits (t1);
+create temp table t1_2 (check (a >= 10 and a < 20)) inherits (t1);
+
+create rule t1_ins_1 as on insert to t1 
+	where new.a >= 0 and new.a < 10
+	do instead
+	insert into t1_1 values (new.a);
+create rule t1_ins_2 as on insert to t1 
+	where new.a >= 10 and new.a < 20
+	do instead
+	insert into t1_2 values (new.a);
+
+create rule t1_upd_1 as on update to t1
+	where old.a >= 0 and old.a < 10
+	do instead
+	update t1_1 set a = new.a where a = old.a;
+create rule t1_upd_2 as on update to t1
+	where old.a >= 10 and old.a < 20
+	do instead
+	update t1_2 set a = new.a where a = old.a;
+
+set constraint_exclusion = on;
+
+insert into t1 select * from generate_series(5,19,1) g;
+update t1 set a = 4 where a = 5;
+
+select * from only t1;
+select * from only t1_1;
+select * from only t1_2;
diff --git a/src/test/regress/sql/select.sql b/src/test/regress/sql/select.sql
index 4e3b0a540cd3..6673ccbc1922 100644
--- a/src/test/regress/sql/select.sql
+++ b/src/test/regress/sql/select.sql
@@ -59,10 +59,15 @@ SELECT onek.unique1, onek.string4 FROM onek
 -- test partial btree indexes
 --
 -- As of 7.2, planner probably won't pick an indexscan without stats,
--- so ANALYZE first.
+-- so ANALYZE first.  Also, we want to prevent it from picking a bitmapscan
+-- followed by sort, because that could hide index ordering problems.
 --
 ANALYZE onek2;
 
+SET enable_seqscan TO off;
+SET enable_bitmapscan TO off;
+SET enable_sort TO off;
+
 --
 -- awk '{if($1<10){print $0;}else{next;}}' onek.data | sort +0n -1
 --
@@ -81,6 +86,10 @@ SELECT onek2.unique1, onek2.stringu1 FROM onek2
 SELECT onek2.unique1, onek2.stringu1 FROM onek2
    WHERE onek2.unique1 > 980 ORDER BY 1;
 
+RESET enable_seqscan;
+RESET enable_bitmapscan;
+RESET enable_sort;
+
 
 SELECT two, stringu1, ten, string4
    INTO TABLE tmp
@@ -195,6 +204,11 @@ select sillysrf(-1) order by 1;
 
 drop function sillysrf(int);
 
+-- X = X isn't a no-op, it's effectively X IS NOT NULL assuming = is strict
+-- (see bug #5084)
+select * from (values (2),(null),(1)) v(k) where k = k order by k;
+select * from (values (2),(null),(1)) v(k) where k = k;
+
 -- Test unsupported sorting operators
 CREATE TABLE nosort (i int);
 INSERT INTO nosort VALUES(1), (2);
diff --git a/src/test/regress/sql/sirv_functions.sql b/src/test/regress/sql/sirv_functions.sql
index 69701955c4ed..41e806b4979d 100644
--- a/src/test/regress/sql/sirv_functions.sql
+++ b/src/test/regress/sql/sirv_functions.sql
@@ -5519,7 +5519,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -5577,7 +5577,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -5771,7 +5771,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -5978,7 +5978,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -6213,7 +6213,7 @@ BEGIN
   EXECUTE 'SELECT max(lang_count - ' || min_languages || '), max(area - ' || min_area || '), max(gnp - ' || min_gnp || ') FROM countries_results' into lang_delta,area_delta,gnp_delta;
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -6385,7 +6385,7 @@ BEGIN
   EXECUTE 'SELECT max(lang_count - ' || min_languages || '), max(area - ' || min_area || '), max(gnp - ' || min_gnp || ') FROM countries_results' into lang_delta,area_delta,gnp_delta;
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -6703,7 +6703,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
@@ -6752,7 +6752,7 @@ BEGIN
   
   EXECUTE 'DROP TABLE countries_results';
 
-  RETURN lang_delta || area_delta || gnp_delta ;
+  RETURN lang_delta::text || area_delta::text || gnp_delta::text ;
 
 END;
 $$
diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql
index cde38b3a379e..4a72a949f298 100644
--- a/src/test/regress/sql/stats.sql
+++ b/src/test/regress/sql/stats.sql
@@ -6,7 +6,7 @@
 --
 
 -- conditio sine qua non
-SHOW stats_start_collector;  -- must be on
+SHOW track_counts;  -- must be on
 
 -- wait to let any prior tests finish dumping out stats;
 -- else our messages might get lost due to contention
@@ -51,15 +51,15 @@ begin
 end
 $$ language plpgsql;
 
--- enable statistics
-SET stats_block_level = on;
-SET stats_row_level = on;
-
 -- do a seqscan
 SELECT count(*) FROM tenk2;
 -- do an indexscan
 SELECT count(*) FROM tenk2 WHERE unique1 = 1;
 
+-- force the rate-limiting logic in pgstat_report_tabstat() to time out
+-- and send a message
+SELECT pg_sleep(1.0);
+
 -- wait for stats collector to update
 SELECT wait_for_stats();
 
diff --git a/src/test/regress/sql/strings.sql b/src/test/regress/sql/strings.sql
index 9b436c38c3a2..bf44f64d46ce 100644
--- a/src/test/regress/sql/strings.sql
+++ b/src/test/regress/sql/strings.sql
@@ -128,7 +128,7 @@ SELECT regexp_matches('foobarbequebaz', $re$(bar)(.+)?(beque)$re$);
 SELECT regexp_matches('foobarbequebaz', $re$barbeque$re$);
 
 -- give me errors
-SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque)$re$, 'zipper');
+SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque)$re$, 'gz');
 SELECT regexp_matches('foobarbequebaz', $re$(barbeque$re$);
 SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$);
 
@@ -146,9 +146,13 @@ SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e'
 -- no match of pattern
 SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', 'nomatch') AS foo;
 SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', 'nomatch');
+-- some corner cases
+SELECT regexp_split_to_array('123456','1');
+SELECT regexp_split_to_array('123456','6');
+SELECT regexp_split_to_array('123456','.');
 -- errors
 SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'zippy') AS foo;
-SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'zippy');
+SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'iz');
 -- global option meaningless for regexp_split
 SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'g') AS foo;
 SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'g');
@@ -159,7 +163,7 @@ SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e'
 -- E021-11 position expression
 SELECT POSITION('4' IN '1234567890') = '4' AS "4";
 
-SELECT POSITION(5 IN '1234567890') = '5' AS "5";
+SELECT POSITION('5' IN '1234567890') = '5' AS "5";
 
 -- T312 character overlay function
 SELECT OVERLAY('abcdef' PLACING '45' FROM 4) AS "abc45f";
@@ -265,6 +269,19 @@ SELECT 'hawkeye' NOT ILIKE 'H%Eye' AS "false";
 SELECT 'Hawkeye' ILIKE 'h%' AS "true";
 SELECT 'Hawkeye' NOT ILIKE 'h%' AS "false";
 
+--
+-- test %/_ combination cases, cf bugs #4821 and #5478
+--
+
+SELECT 'foo' LIKE '_%' as t, 'f' LIKE '_%' as t, '' LIKE '_%' as f;
+SELECT 'foo' LIKE '%_' as t, 'f' LIKE '%_' as t, '' LIKE '%_' as f;
+
+SELECT 'foo' LIKE '__%' as t, 'foo' LIKE '___%' as t, 'foo' LIKE '____%' as f;
+SELECT 'foo' LIKE '%__' as t, 'foo' LIKE '%___' as t, 'foo' LIKE '%____' as f;
+
+SELECT 'jack' LIKE '%____%' AS t;
+
+
 --
 -- test implicit type conversion
 --
@@ -382,12 +399,12 @@ DROP TABLE toasttest;
 
 -- test internally compressing datums
 
--- note this tests compressing a datum to a very small size which tests a
--- particular case in the packed varlena where very small compressed datums
--- must be given a 4-byte header because there are no bits to indicate
+-- this tests compressing a datum to a very small size which exercises a
+-- corner case in packed-varlena handling: even though small, the compressed
+-- datum must be given a 4-byte header because there are no bits to indicate
 -- compression in a 1-byte header
 
-CREATE TABLE toasttest (c char(2048));
+CREATE TABLE toasttest (c char(4096));
 INSERT INTO toasttest VALUES('x');
 SELECT length(c), c::text FROM toasttest;
 SELECT c FROM toasttest;
diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql
index f9ca6e01ec03..5c13ffbdf786 100644
--- a/src/test/regress/sql/subselect.sql
+++ b/src/test/regress/sql/subselect.sql
@@ -8,6 +8,21 @@ SELECT 1 AS zero WHERE 1 NOT IN (SELECT 1);
 
 SELECT 1 AS zero WHERE 1 IN (SELECT 2);
 
+-- Check grammar's handling of extra parens in assorted contexts
+
+SELECT * FROM (SELECT 1 AS x) ss;
+SELECT * FROM ((SELECT 1 AS x)) ss;
+
+(SELECT 2) UNION SELECT 2;
+((SELECT 2)) UNION SELECT 2;
+
+SELECT ((SELECT 2) UNION SELECT 2);
+SELECT (((SELECT 2)) UNION SELECT 2);
+
+SELECT (SELECT ARRAY[1,2,3])[1];
+SELECT ((SELECT ARRAY[1,2,3]))[2];
+SELECT (((SELECT ARRAY[1,2,3])))[3];
+
 -- Set up some simple test tables
 
 CREATE TABLE SUBSELECT_TBL (
@@ -218,9 +233,9 @@ create rule shipped_view_insert as on insert to shipped_view do instead
 insert into parts (partnum, cost) values (1, 1234.56);
 
 insert into shipped_view (ordnum, partnum, value)
-    values (0, 1, (select cost from parts where partnum = 1));
+    values (0, 1, (select cost from parts where partnum = '1'));
 
-select * from shipped_view ORDER BY 1,2;
+select * from shipped_view;
 
 create rule shipped_view_update as on update to shipped_view do instead
     update shipped set partnum = new.partnum, value = new.value
@@ -246,3 +261,107 @@ select * from (
   select min(unique1) from tenk1 as a
   where not exists (select 1 from tenk1 as b where b.unique2 = 10000)
 ) ss;
+
+--
+-- Test that an IN implemented using a UniquePath does unique-ification
+-- with the right semantics, as per bug #4113.  (Unfortunately we have
+-- no simple way to ensure that this test case actually chooses that type
+-- of plan, but it does in releases 7.4-8.3.  Note that an ordering difference
+-- here might mean that some other plan type is being used, rendering the test
+-- pointless.)
+--
+
+create temp table numeric_table (num_col numeric);
+insert into numeric_table values (1), (1.000000000000000000001), (2), (3);
+
+create temp table float_table (float_col float8);
+insert into float_table values (1), (2), (3);
+
+select * from float_table
+  where float_col in (select num_col from numeric_table);
+
+select * from numeric_table
+  where num_col in (select float_col from float_table);
+
+--
+-- Test case for bug #4290: bogus calculation of subplan param sets
+--
+
+create temp table ta (id int primary key, val int);
+
+insert into ta values(1,1);
+insert into ta values(2,2);
+
+create temp table tb (id int primary key, aval int);
+
+insert into tb values(1,1);
+insert into tb values(2,1);
+insert into tb values(3,2);
+insert into tb values(4,2);
+
+create temp table tc (id int primary key, aid int);
+
+insert into tc values(1,1);
+insert into tc values(2,2);
+
+select
+  ( select min(tb.id) from tb
+    where tb.aval = (select ta.val from ta where ta.id = tc.aid) ) as min_tb_id
+from tc;
+
+--
+-- Test case for 8.3 "failed to locate grouping columns" bug
+--
+
+create temp table t1 (f1 numeric(14,0), f2 varchar(30));
+
+select * from
+  (select distinct f1, f2, (select f2 from t1 x where x.f1 = up.f1) as fs
+   from t1 up) ss
+group by f1,f2,fs;
+
+--
+-- Check that whole-row Vars reading the result of a subselect don't include
+-- any junk columns therein
+--
+-- This test works in upstream PostgreSQL but triggers a problem in GPDB; in
+-- Greenplum the typmods must be the same between all segments and the master
+-- but PostgreSQL executor defers typmod assignment to ExecEvalWholeRowVar()
+-- which is too late for Greenplum since the plan has already been dispatched.
+-- This should be fixed but requires new infrastructure.
+--
+
+select q from (select max(f1) from int4_tbl group by f1 order by f1) q;
+
+--
+-- Test case for sublinks pushed down into subselects via join alias expansion
+--
+
+select
+  (select sq1) as qq1
+from
+  (select exists(select 1 from int4_tbl where f1 = q2) as sq1, 42 as dummy
+   from int8_tbl) sq0
+  join
+  int4_tbl i4 on dummy = i4.f1;
+
+--
+-- Test case for cross-type partial matching in hashed subplan (bug #7597)
+--
+
+create temp table outer_7597 (f1 int4, f2 int4);
+insert into outer_7597 values (0, 0);
+insert into outer_7597 values (1, 0);
+insert into outer_7597 values (0, null);
+insert into outer_7597 values (1, null);
+
+create temp table inner_7597(c1 int8, c2 int8);
+insert into inner_7597 values(0, null);
+
+select * from outer_7597 where (f1, f2) not in (select * from inner_7597);
+
+--
+-- Test case for premature memory release during hashing of subplan output
+--
+
+select '1'::text in (select '1'::name union all select '1'::name);
diff --git a/src/test/regress/sql/temp.sql b/src/test/regress/sql/temp.sql
index 2372c87474fd..b13475faceb7 100644
--- a/src/test/regress/sql/temp.sql
+++ b/src/test/regress/sql/temp.sql
@@ -128,10 +128,10 @@ create temp table whereami (f1 text);
 insert into whereami values ('temp');
 
 create function public.whoami() returns text
-  as $$select 'public'::text$$ language sql CONTAINS SQL;
+  as $$select 'public'::text$$ language sql;
 
 create function pg_temp.whoami() returns text
-  as $$select 'temp'::text$$ language sql CONTAINS SQL;
+  as $$select 'temp'::text$$ language sql;
 
 -- default should have pg_temp implicitly first, but only for tables
 select * from whereami;
diff --git a/src/test/regress/sql/text.sql b/src/test/regress/sql/text.sql
index 18d2258df140..2fe2131290be 100644
--- a/src/test/regress/sql/text.sql
+++ b/src/test/regress/sql/text.sql
@@ -13,6 +13,22 @@ INSERT INTO TEXT_TBL VALUES ('hi de ho neighbor');
 
 SELECT '' AS two, * FROM TEXT_TBL order by f1;
 
+-- As of 8.3 we have removed most implicit casts to text, so that for example
+-- this no longer works:
+
+select length(42);
+
+-- But as a special exception for usability's sake, we still allow implicit
+-- casting to text in concatenations, so long as the other input is text or
+-- an unknown literal.  So these work:
+
+select 'four: '::text || 2+2;
+select 'four: ' || 2+2;
+
+-- but not this:
+
+select 3 || 4.0;
+
 --
 -- TEXT CASTING TO/FROM ANY TYPE
 --
diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
index 4e1d6881942f..03a4945206a3 100644
--- a/src/test/regress/sql/timestamptz.sql
+++ b/src/test/regress/sql/timestamptz.sql
@@ -144,7 +144,7 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Jan 01 17:32:01 2001');
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 -0097');
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 5097 BC');
 
--- Alternate field order that we've historically supported (sort of)
+-- Alternative field order that we've historically supported (sort of)
 -- with regular and POSIXy timezone specs
 SELECT 'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz;
 SELECT 'Wed Jul 11 10:51:14 GMT-4 2001'::timestamptz;
diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql
index b97b6b68993e..ef3375841d85 100644
--- a/src/test/regress/sql/transactions.sql
+++ b/src/test/regress/sql/transactions.sql
@@ -212,7 +212,7 @@ SELECT 1;			-- this should work
 
 -- check non-transactional behavior of cursors
 BEGIN;
-	DECLARE c CURSOR FOR SELECT unique2 FROM tenk1 ORDER BY 1;
+	DECLARE c CURSOR FOR SELECT unique2 FROM tenk1 ORDER BY unique2;
 	SAVEPOINT one;
 		FETCH 10 FROM c;
 	ROLLBACK TO SAVEPOINT one;
@@ -220,7 +220,7 @@ BEGIN;
 	RELEASE SAVEPOINT one;
 	FETCH 10 FROM c;
 	CLOSE c;
-	DECLARE c CURSOR FOR SELECT unique2/0 FROM tenk1 ORDER BY 1;
+	DECLARE c CURSOR FOR SELECT unique2/0 FROM tenk1 ORDER BY unique2;
 	SAVEPOINT two;
 		FETCH 10 FROM c;
 	ROLLBACK TO SAVEPOINT two;
diff --git a/src/test/regress/sql/tsdicts.sql b/src/test/regress/sql/tsdicts.sql
new file mode 100644
index 000000000000..f36e63a31107
--- /dev/null
+++ b/src/test/regress/sql/tsdicts.sql
@@ -0,0 +1,120 @@
+--Test text search dictionaries and configurations
+
+-- Test ISpell dictionary with ispell affix file
+CREATE TEXT SEARCH DICTIONARY ispell (
+                        Template=ispell,
+                        DictFile=ispell_sample,
+                        AffFile=ispell_sample
+);
+
+SELECT ts_lexize('ispell', 'skies');
+SELECT ts_lexize('ispell', 'bookings');
+SELECT ts_lexize('ispell', 'booking');
+SELECT ts_lexize('ispell', 'foot');
+SELECT ts_lexize('ispell', 'foots');
+SELECT ts_lexize('ispell', 'rebookings');
+SELECT ts_lexize('ispell', 'rebooking');
+SELECT ts_lexize('ispell', 'rebook');
+SELECT ts_lexize('ispell', 'unbookings');
+SELECT ts_lexize('ispell', 'unbooking');
+SELECT ts_lexize('ispell', 'unbook');
+
+SELECT ts_lexize('ispell', 'footklubber');
+SELECT ts_lexize('ispell', 'footballklubber');
+SELECT ts_lexize('ispell', 'ballyklubber');
+SELECT ts_lexize('ispell', 'footballyklubber');
+
+-- Test ISpell dictionary with hunspell affix file
+CREATE TEXT SEARCH DICTIONARY hunspell (
+                        Template=ispell,
+                        DictFile=ispell_sample,
+                        AffFile=hunspell_sample
+);
+
+SELECT ts_lexize('hunspell', 'skies');
+SELECT ts_lexize('hunspell', 'bookings');
+SELECT ts_lexize('hunspell', 'booking');
+SELECT ts_lexize('hunspell', 'foot');
+SELECT ts_lexize('hunspell', 'foots');
+SELECT ts_lexize('hunspell', 'rebookings');
+SELECT ts_lexize('hunspell', 'rebooking');
+SELECT ts_lexize('hunspell', 'rebook');
+SELECT ts_lexize('hunspell', 'unbookings');
+SELECT ts_lexize('hunspell', 'unbooking');
+SELECT ts_lexize('hunspell', 'unbook');
+
+SELECT ts_lexize('hunspell', 'footklubber');
+SELECT ts_lexize('hunspell', 'footballklubber');
+SELECT ts_lexize('hunspell', 'ballyklubber');
+SELECT ts_lexize('hunspell', 'footballyklubber');
+
+-- Synonim dictionary
+CREATE TEXT SEARCH DICTIONARY synonym (
+						Template=synonym, 
+						Synonyms=synonym_sample
+);
+
+SELECT ts_lexize('synonym', 'PoStGrEs');
+SELECT ts_lexize('synonym', 'Gogle');
+
+-- Create and simple test thesaurus dictionary
+-- More tests in configuration checks because ts_lexize()
+-- cannot pass more than one word to thesaurus.
+CREATE TEXT SEARCH DICTIONARY thesaurus (
+                        Template=thesaurus,
+						DictFile=thesaurus_sample, 
+						Dictionary=english_stem
+);
+
+SELECT ts_lexize('thesaurus', 'one');
+
+-- Test ispell dictionary in configuration
+CREATE TEXT SEARCH CONFIGURATION ispell_tst (
+						COPY=english
+);
+
+ALTER TEXT SEARCH CONFIGURATION ispell_tst ALTER MAPPING FOR
+	word, numword, asciiword, hword, numhword, asciihword, hword_part, hword_numpart, hword_asciipart
+	WITH ispell, english_stem;
+
+SELECT to_tsvector('ispell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
+SELECT to_tsquery('ispell_tst', 'footballklubber');
+SELECT to_tsquery('ispell_tst', 'footballyklubber:b & rebookings:A & sky');
+
+-- Test ispell dictionary with hunspell affix in configuration
+CREATE TEXT SEARCH CONFIGURATION hunspell_tst (
+						COPY=ispell_tst
+);
+
+ALTER TEXT SEARCH CONFIGURATION hunspell_tst ALTER MAPPING
+	REPLACE ispell WITH hunspell;
+
+SELECT to_tsvector('hunspell_tst', 'Booking the skies after rebookings for footballklubber from a foot');
+SELECT to_tsquery('hunspell_tst', 'footballklubber');
+SELECT to_tsquery('hunspell_tst', 'footballyklubber:b & rebookings:A & sky');
+
+-- Test synonym dictionary in configuration
+CREATE TEXT SEARCH CONFIGURATION synonym_tst (
+						COPY=english
+);
+
+ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR 
+	asciiword, hword_asciipart, asciihword 
+	WITH synonym, english_stem;
+
+SELECT to_tsvector('synonym_tst', 'Postgresql is often called as postgres or pgsql and pronounced as postgre');
+SELECT to_tsvector('synonym_tst', 'Most common mistake is to write Gogle instead of Google');
+
+-- test thesaurus in configuration
+-- see thesaurus_sample.ths to understand 'odd' resulting tsvector
+CREATE TEXT SEARCH CONFIGURATION thesaurus_tst (
+						COPY=synonym_tst
+);
+
+ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR 
+	asciiword, hword_asciipart, asciihword 
+	WITH synonym, thesaurus, english_stem;
+
+SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one');
+SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbrevation SN)');
+SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a tickets');
diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql
new file mode 100644
index 000000000000..e437e1686519
--- /dev/null
+++ b/src/test/regress/sql/tsearch.sql
@@ -0,0 +1,315 @@
+set optimizer_disable_missing_stats_collection = on;
+--
+-- Sanity checks for text search catalogs
+--
+-- NB: we assume the oidjoins test will have caught any dangling links,
+-- that is OID or REGPROC fields that are not zero and do not match some
+-- row in the linked-to table.  However, if we want to enforce that a link
+-- field can't be 0, we have to check it here.
+
+-- Find unexpected zero link entries
+
+SELECT oid, prsname
+FROM pg_ts_parser
+WHERE prsnamespace = 0 OR prsstart = 0 OR prstoken = 0 OR prsend = 0 OR
+      -- prsheadline is optional
+      prslextype = 0;
+
+SELECT oid, dictname
+FROM pg_ts_dict
+WHERE dictnamespace = 0 OR dictowner = 0 OR dicttemplate = 0;
+
+SELECT oid, tmplname
+FROM pg_ts_template
+WHERE tmplnamespace = 0 OR tmpllexize = 0;  -- tmplinit is optional
+
+SELECT oid, cfgname
+FROM pg_ts_config
+WHERE cfgnamespace = 0 OR cfgowner = 0 OR cfgparser = 0;
+
+SELECT mapcfg, maptokentype, mapseqno
+FROM pg_ts_config_map
+WHERE mapcfg = 0 OR mapdict = 0;
+
+-- Look for pg_ts_config_map entries that aren't one of parser's token types
+SELECT * FROM
+  ( SELECT oid AS cfgid, (ts_token_type(cfgparser)).tokid AS tokid
+    FROM pg_ts_config ) AS tt 
+RIGHT JOIN pg_ts_config_map AS m
+    ON (tt.cfgid=m.mapcfg AND tt.tokid=m.maptokentype)
+WHERE
+    tt.cfgid IS NULL OR tt.tokid IS NULL;
+
+-- test basic text search behavior without indexes, then with
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+
+create index wowidx on test_tsvector using gist (a);
+
+SET enable_seqscan=OFF;
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+
+RESET enable_seqscan;
+
+DROP INDEX wowidx;
+
+--CREATE INDEX wowidx ON test_tsvector USING gin (a);
+
+--SET enable_seqscan=OFF;
+
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr|qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'wr&qh';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq&yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)';
+SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)';
+  
+RESET enable_seqscan;
+INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH');
+SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10;
+SELECT * FROM ts_stat('SELECT a FROM test_tsvector', 'AB') ORDER BY ndoc DESC, nentry DESC, word;
+
+--dictionaries and to_tsvector
+
+SELECT ts_lexize('english_stem', 'skies');
+SELECT ts_lexize('english_stem', 'identity');
+
+SELECT * FROM ts_token_type('default');
+
+SELECT * FROM ts_parse('default', '345 qwe@efd.r '' 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 teodor@stack.net 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');
+
+SELECT to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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');
+
+SELECT length(to_tsvector('english', '345 qwe@efd.r '' 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 teodor@stack.net 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'));
+
+-- ts_debug
+
+SELECT * from ts_debug('english', '<myns:foo-bar_baz.blurfl>abc&nm1;def&#xa9;ghi&#245;jkl</myns:foo-bar_baz.blurfl>');
+
+-- to_tsquery
+
+SELECT to_tsquery('english', 'qwe & sKies ');
+SELECT to_tsquery('simple', 'qwe & sKies ');
+SELECT to_tsquery('english', '''the wether'':dc & ''           sKies '':BC ');
+SELECT to_tsquery('english', 'asd&(and|fghj)');
+SELECT to_tsquery('english', '(asd&and)|fghj');
+SELECT to_tsquery('english', '(asd&!and)|fghj');
+SELECT to_tsquery('english', '(the|and&(i&1))&fghj');
+
+SELECT plainto_tsquery('english', 'the and z 1))& fghj');
+SELECT plainto_tsquery('english', 'foo bar') && plainto_tsquery('english', 'asd');
+SELECT plainto_tsquery('english', 'foo bar') || plainto_tsquery('english', 'asd fg');
+SELECT plainto_tsquery('english', 'foo bar') || !!plainto_tsquery('english', 'asd fg');
+SELECT plainto_tsquery('english', 'foo bar') && 'asd | fg';
+
+SELECT ts_rank_cd(to_tsvector('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+'), to_tsquery('english', 'paint&water'));
+
+SELECT ts_rank_cd(to_tsvector('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+'), to_tsquery('english', 'breath&motion&water'));
+
+SELECT ts_rank_cd(to_tsvector('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+'), to_tsquery('english', 'ocean'));
+
+--headline tests
+SELECT ts_headline('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+', to_tsquery('english', 'paint&water'));
+
+SELECT ts_headline('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+', to_tsquery('english', 'breath&motion&water'));
+
+SELECT ts_headline('english', '
+Day after day, day after day,
+  We stuck, nor breath nor motion,
+As idle as a painted Ship
+  Upon a painted Ocean.
+Water, water, every where
+  And all the boards did shrink;
+Water, water, every where,
+  Nor any drop to drink.
+S. T. Coleridge (1772-1834)
+', to_tsquery('english', 'ocean'));
+
+SELECT ts_headline('english', '
+<html>
+<!-- some comment -->
+<body>
+Sea view wow <u>foo 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>',
+to_tsquery('english', 'sea&foo'), 'HighlightAll=true');
+
+--Rewrite sub system
+
+CREATE TABLE test_tsquery (txtkeyword TEXT, txtsample TEXT);
+\set ECHO none
+\copy test_tsquery from stdin
+'New York'	new & york | big & apple | nyc
+Moscow	moskva | moscow
+'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'
+'foo bar qq'	foo & (bar | qq) & city
+\.
+\set ECHO all
+
+ALTER TABLE test_tsquery ADD COLUMN keyword tsquery;
+UPDATE test_tsquery SET keyword = to_tsquery('english', txtkeyword);
+ALTER TABLE test_tsquery ADD COLUMN sample tsquery;
+UPDATE test_tsquery SET sample = to_tsquery('english', txtsample::text);
+
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <  'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <= 'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword = 'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >= 'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >  'new & york';
+
+CREATE INDEX bt_tsq ON test_tsquery (keyword);
+
+SET enable_seqscan=OFF;
+
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <  'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword <= 'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword = 'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >= 'new & york';
+SELECT COUNT(*) FROM test_tsquery WHERE keyword >  'new & york';
+
+RESET enable_seqscan;
+
+SELECT ts_rewrite('foo & bar & qq & new & york',  'new & york'::tsquery, 'big & apple | nyc | new & york & city');
+
+SELECT ts_rewrite('moscow', 'SELECT keyword, sample FROM test_tsquery'::text );
+SELECT ts_rewrite('moscow & hotel', 'SELECT keyword, sample FROM test_tsquery'::text );
+SELECT ts_rewrite('bar & new & qq & foo & york', 'SELECT keyword, sample FROM test_tsquery'::text );
+
+SELECT ts_rewrite( 'moscow', 'SELECT keyword, sample FROM test_tsquery');
+SELECT ts_rewrite( 'moscow & hotel', 'SELECT keyword, sample FROM test_tsquery');
+SELECT ts_rewrite( 'bar & new & qq & foo & york', 'SELECT keyword, sample FROM test_tsquery');
+
+
+SELECT keyword FROM test_tsquery WHERE keyword @> 'new';
+SELECT keyword FROM test_tsquery WHERE keyword @> 'moscow';
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'new';
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'moscow';
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar &  new & qq & foo & york') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar & new & qq & foo & york') AS query;
+
+CREATE INDEX qq ON test_tsquery USING gist (keyword tsquery_ops);
+SET enable_seqscan=OFF;
+
+SELECT keyword FROM test_tsquery WHERE keyword @> 'new';
+SELECT keyword FROM test_tsquery WHERE keyword @> 'moscow';
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'new';
+SELECT keyword FROM test_tsquery WHERE keyword <@ 'moscow';
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar & new & qq & foo & york') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'moscow & hotel') AS query;
+SELECT ts_rewrite( query, 'SELECT keyword, sample FROM test_tsquery' ) FROM to_tsquery('english', 'bar &  new & qq & foo & york') AS query;
+
+RESET enable_seqscan;
+
+--test GUC
+SET default_text_search_config=simple;
+
+SELECT to_tsvector('SKIES My booKs');
+SELECT plainto_tsquery('SKIES My booKs');
+SELECT to_tsquery('SKIES & My | booKs');
+
+SET default_text_search_config=english;
+
+SELECT to_tsvector('SKIES My booKs');
+SELECT plainto_tsquery('SKIES My booKs');
+SELECT to_tsquery('SKIES & My | booKs');
+
+--trigger
+
+-- GPDB doesn't allow updating the distribution key, so create a synthetic
+-- distribution key column.
+alter table test_tsvector add column distkey int4;
+alter table test_tsvector set distributed by (distkey);
+
+CREATE TRIGGER tsvectorupdate
+BEFORE UPDATE OR INSERT ON test_tsvector
+FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger(a, 'pg_catalog.english', t);
+
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
+INSERT INTO test_tsvector (t) VALUES ('345 qwerty');
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
+UPDATE test_tsvector SET t = null WHERE t = '345 qwerty';
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
+
+INSERT INTO test_tsvector (t) VALUES ('345 qwerty');
+
+SELECT count(*) FROM test_tsvector WHERE a @@ to_tsquery('345&qwerty');
diff --git a/src/test/regress/sql/tstypes.sql b/src/test/regress/sql/tstypes.sql
new file mode 100644
index 000000000000..49afc3b23a28
--- /dev/null
+++ b/src/test/regress/sql/tstypes.sql
@@ -0,0 +1,97 @@
+--Base tsvector test
+
+SELECT '1'::tsvector;
+SELECT '1 '::tsvector;
+SELECT ' 1'::tsvector;
+SELECT ' 1 '::tsvector;
+SELECT '1 2'::tsvector;
+SELECT '''1 2'''::tsvector;
+SELECT E'''1 \\''2'''::tsvector;
+SELECT E'''1 \\''2''3'::tsvector;
+SELECT E'''1 \\''2'' 3'::tsvector;
+SELECT E'''1 \\''2'' '' 3'' 4 '::tsvector;
+SELECT $$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector;
+SELECT tsvectorin(tsvectorout($$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector));
+SELECT '''w'':4A,3B,2C,1D,5 a:8';
+SELECT 'a:3A b:2a'::tsvector || 'ba:1234 a:1B';
+SELECT setweight('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd zxc:81,567,222A'::tsvector, 'c');
+SELECT strip('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd'::tsvector);
+
+--Base tsquery test
+SELECT '1'::tsquery;
+SELECT '1 '::tsquery;
+SELECT ' 1'::tsquery;
+SELECT ' 1 '::tsquery;
+SELECT '''1 2'''::tsquery;
+SELECT E'''1 \\''2'''::tsquery;
+SELECT '!1'::tsquery;
+SELECT '1|2'::tsquery;
+SELECT '1|!2'::tsquery;
+SELECT '!1|2'::tsquery;
+SELECT '!1|!2'::tsquery;
+SELECT '!(!1|!2)'::tsquery;
+SELECT '!(!1|2)'::tsquery;
+SELECT '!(1|!2)'::tsquery;
+SELECT '!(1|2)'::tsquery;
+SELECT '1&2'::tsquery;
+SELECT '!1&2'::tsquery;
+SELECT '1&!2'::tsquery;
+SELECT '!1&!2'::tsquery;
+SELECT '(1&2)'::tsquery;
+SELECT '1&(2)'::tsquery;
+SELECT '!(1)&2'::tsquery;
+SELECT '!(1&2)'::tsquery;
+SELECT '1|2&3'::tsquery;
+SELECT '1|(2&3)'::tsquery;
+SELECT '(1|2)&3'::tsquery;
+SELECT '1|2&!3'::tsquery;
+SELECT '1|!2&3'::tsquery;
+SELECT '!1|2&3'::tsquery;
+SELECT '!1|(2&3)'::tsquery;
+SELECT '!(1|2)&3'::tsquery;
+SELECT '(!1|2)&3'::tsquery;
+SELECT '1|(2|(4|(5|6)))'::tsquery;
+SELECT '1|2|4|5|6'::tsquery;
+SELECT '1&(2&(4&(5&6)))'::tsquery;
+SELECT '1&2&4&5&6'::tsquery;
+SELECT '1&(2&(4&(5|6)))'::tsquery;
+SELECT '1&(2&(4&(5|!6)))'::tsquery;
+SELECT E'1&(''2''&('' 4''&(\\|5 | ''6 \\'' !|&'')))'::tsquery;
+SELECT $$'\\as'$$::tsquery;
+
+SELECT 'a' < 'b & c'::tsquery as "true";
+SELECT 'a' > 'b & c'::tsquery as "false";
+SELECT 'a | f' < 'b & c'::tsquery as "true";
+SELECT 'a | ff' < 'b & c'::tsquery as "false";
+SELECT 'a | f | g' < 'b & c'::tsquery as "false";
+
+SELECT numnode( 'new'::tsquery );
+SELECT numnode( 'new & york'::tsquery );
+SELECT numnode( 'new & york | qwery'::tsquery );
+
+SELECT 'foo & bar'::tsquery && 'asd';
+SELECT 'foo & bar'::tsquery || 'asd & fg';
+SELECT 'foo & bar'::tsquery || !!'asd & fg'::tsquery;
+SELECT 'foo & bar'::tsquery && 'asd | fg';
+
+-- tsvector-tsquery operations
+
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca' as "true";
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:B' as "true";
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:A' as "true";
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:C' as "false";
+SELECT 'a b:89  ca:23A,64b d:34c'::tsvector @@ 'd:AC & ca:CB' as "true";
+
+SELECT ts_rank(' a:1 s:2C d g'::tsvector, 'a | s');
+SELECT ts_rank(' a:1 s:2B d g'::tsvector, 'a | s');
+SELECT ts_rank(' a:1 s:2 d g'::tsvector, 'a | s');
+SELECT ts_rank(' a:1 s:2C d g'::tsvector, 'a & s');
+SELECT ts_rank(' a:1 s:2B d g'::tsvector, 'a & s');
+SELECT ts_rank(' a:1 s:2 d g'::tsvector, 'a & s');
+
+SELECT ts_rank_cd(' a:1 s:2C d g'::tsvector, 'a | s');
+SELECT ts_rank_cd(' a:1 s:2B d g'::tsvector, 'a | s');
+SELECT ts_rank_cd(' a:1 s:2 d g'::tsvector, 'a | s');
+SELECT ts_rank_cd(' a:1 s:2C d g'::tsvector, 'a & s');
+SELECT ts_rank_cd(' a:1 s:2B d g'::tsvector, 'a & s');
+SELECT ts_rank_cd(' a:1 s:2 d g'::tsvector, 'a & s');
diff --git a/src/test/regress/sql/txid.sql b/src/test/regress/sql/txid.sql
new file mode 100644
index 000000000000..12090e1f28b1
--- /dev/null
+++ b/src/test/regress/sql/txid.sql
@@ -0,0 +1,54 @@
+-- txid_snapshot data type and related functions
+
+-- i/o
+select '12:13:'::txid_snapshot;
+select '12:18:14,16'::txid_snapshot;
+
+-- errors
+select '31:12:'::txid_snapshot;
+select '0:1:'::txid_snapshot;
+select '12:13:0'::txid_snapshot;
+select '12:16:14,13'::txid_snapshot;
+select '12:16:14,14'::txid_snapshot;
+
+create temp table snapshot_test (
+	nr	integer,
+	snap	txid_snapshot
+);
+
+insert into snapshot_test values (1, '12:13:');
+insert into snapshot_test values (2, '12:20:13,15,18');
+insert into snapshot_test values (3, '100001:100009:100005,100007,100008');
+insert into snapshot_test values (4, '100:150:101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131');
+select snap from snapshot_test order by nr;
+
+select  txid_snapshot_xmin(snap),
+	txid_snapshot_xmax(snap),
+	txid_snapshot_xip(snap)
+from snapshot_test order by nr, 1, 2, 3;
+
+select id, txid_visible_in_snapshot(id, snap)
+from snapshot_test, generate_series(11, 21) id
+where nr = 2;
+
+-- test bsearch
+select id, txid_visible_in_snapshot(id, snap)
+from snapshot_test, generate_series(90, 160) id
+where nr = 4;
+
+-- test current values also
+select txid_current() >= txid_snapshot_xmin(txid_current_snapshot());
+
+-- we can't assume current is always less than xmax, however
+
+select txid_visible_in_snapshot(txid_current(), txid_current_snapshot());
+
+-- test 64bitness
+
+select txid_snapshot '1000100010001000:1000100010001100:1000100010001012,1000100010001013';
+select txid_visible_in_snapshot('1000100010001012', '1000100010001000:1000100010001100:1000100010001012,1000100010001013');
+select txid_visible_in_snapshot('1000100010001015', '1000100010001000:1000100010001100:1000100010001012,1000100010001013');
+
+-- test 64bit overflow
+SELECT txid_snapshot '1:9223372036854775807:3';
+SELECT txid_snapshot '1:9223372036854775808:3';
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 1b6eaab9ded7..7202a2fb0738 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -20,7 +20,7 @@ SELECT p1.oid, p1.typname
 FROM pg_type as p1
 WHERE p1.typnamespace = 0 OR
     (p1.typlen <= 0 AND p1.typlen != -1 AND p1.typlen != -2) OR
-    (p1.typtype not in ('b', 'c', 'd', 'p')) OR
+    (p1.typtype not in ('b', 'c', 'd', 'e', 'p')) OR
     NOT p1.typisdefined OR
     (p1.typalign not in ('c', 's', 'i', 'd')) OR
     (p1.typstorage not in ('p', 'x', 'e', 'm'));
@@ -50,15 +50,22 @@ FROM pg_type as p1
 WHERE (p1.typtype = 'c' AND p1.typrelid = 0) OR
     (p1.typtype != 'c' AND p1.typrelid != 0);
 
--- Look for basic types that don't have an array type.
+-- Look for basic or enum types that don't have an array type.
 -- NOTE: as of 8.0, this check finds smgr and unknown.
 
 SELECT p1.oid, p1.typname
 FROM pg_type as p1
-WHERE p1.typtype in ('b') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS
+WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS
     (SELECT 1 FROM pg_type as p2
      WHERE p2.typname = ('_' || p1.typname)::name AND
-           p2.typelem = p1.oid);
+           p2.typelem = p1.oid and p1.typarray = p2.oid);
+
+-- Make sure typarray points to a varlena array type of our own base
+SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, 
+       p2.typelem, p2.typlen
+FROM   pg_type p1 LEFT JOIN pg_type p2 ON (p1.typarray = p2.oid)
+WHERE  p1.typarray <> 0 AND
+       (p2.oid IS NULL OR p2.typelem <> p1.oid OR p2.typlen <> -1);
 
 -- Text conversion routines must be provided.
 
diff --git a/src/test/regress/sql/union_gp.sql b/src/test/regress/sql/union_gp.sql
index 10aee97b1ef9..c26c82ef3882 100644
--- a/src/test/regress/sql/union_gp.sql
+++ b/src/test/regress/sql/union_gp.sql
@@ -15,8 +15,7 @@ select ARRAY[1, 2, 3] union select distinct null::integer[];
 select 1 intersect (select 1, 2 union all select 3, 4);
 select 1 a, row_number() over (partition by 'a') union all (select 1 a , 2 b);
 
--- This can preserve domain types, but we keep compatibility for now
--- See MPP-7509
+-- This should preserve domain types
 select pg_typeof(a) from (select 'a'::information_schema.sql_identifier a union all
 select 'b'::information_schema.sql_identifier)a;
 
diff --git a/src/timezone/README b/src/timezone/README
index 4db3148e0cd3..201b2938814d 100644
--- a/src/timezone/README
+++ b/src/timezone/README
@@ -3,9 +3,12 @@ src/timezone/README
 Timezone
 ========
 
-This is a PostgreSQL adapted version of the timezone library from:
+This is a PostgreSQL adapted version of the timezone library from
+http://www.iana.org/time-zones
 
-	ftp://elsie.nci.nih.gov/pub/tzcode*.tar.gz
+The source code can be found at:
+
+	ftp://ftp.iana.org/tz/releases/tzcode*.tar.gz
 
 The code is currently synced with release 2010c.  There are many cosmetic
 (and not so cosmetic) differences from the original tzcode library, but
@@ -13,7 +16,7 @@ diffs in the upstream version should usually be propagated to our version.
 
 The data files under data/ are an exact copy of the latest data set from:
 
-	ftp://elsie.nci.nih.gov/pub/tzdata*.tar.gz
+	ftp://ftp.iana.org/tz/releases/tzdata*.tar.gz
 
 Since time zone rules change frequently in some parts of the world,
 we should endeavor to update the data files before each PostgreSQL
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index 44d2298e0d3a..41614c8fca5e 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -387,15 +387,15 @@ identify_system_timezone(void)
 	 * enough to identify DST transition rules, since everybody switches on
 	 * Sundays.)  This is sufficient to cover most of the Unix time_t range,
 	 * and we don't want to look further than that since many systems won't
-	 * have sane TZ behavior further back anyway.  The further back the zone
-	 * matches, the better we score it.  This may seem like a rather random
-	 * way of doing things, but experience has shown that system-supplied
-	 * timezone definitions are likely to have DST behavior that is right for
-	 * the recent past and not so accurate further back. Scoring in this way
-	 * allows us to recognize zones that have some commonality with the zic
-	 * database, without insisting on exact match. (Note: we probe Thursdays,
-	 * not Sundays, to avoid triggering DST-transition bugs in localtime
-	 * itself.)
+	 * have sane TZ behavior further back anyway.  The further
+	 * back the zone matches, the better we score it.  This may seem like a
+	 * rather random way of doing things, but experience has shown that
+	 * system-supplied timezone definitions are likely to have DST behavior
+	 * that is right for the recent past and not so accurate further back.
+	 * Scoring in this way allows us to recognize zones that have some
+	 * commonality with the zic database, without insisting on exact match.
+	 * (Note: we probe Thursdays, not Sundays, to avoid triggering
+	 * DST-transition bugs in localtime itself.)
 	 */
 	tnow = time(NULL);
 	tm = localtime(&tnow);
@@ -404,7 +404,6 @@ identify_system_timezone(void)
 	thisyear = tm->tm_year + 1900;
 
 	t = build_time_t(thisyear, 1, 15);
-
 	/*
 	 * Round back to GMT midnight Thursday.  This depends on the knowledge
 	 * that the time_t origin is Thu Jan 01 1970.  (With a different origin
@@ -644,7 +643,7 @@ static const struct
 	/*
 	 * This list was built from the contents of the registry at
 	 * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time
-	 * Zones on Windows XP Professional SP2
+	 * Zones on Windows 2003 R2.
 	 *
 	 * The zones have been matched to zic timezones by looking at the cities
 	 * listed in the win32 display name (in the comment here) in most cases.
@@ -669,6 +668,10 @@ static const struct
 		"Arabic Standard Time", "Arabic Daylight Time",
 		"Asia/Baghdad"
 	},							/* (GMT+03:00) Baghdad */
+	{
+		"Argentina Standard Time", "Argentina Daylight Time",
+		"America/Buenos_Aires"
+	},							/* (GMT-03:00) Buenos Aires */
 	{
 		"Armenian Standard Time", "Armenian Daylight Time",
 		"Asia/Yerevan"
@@ -685,10 +688,18 @@ static const struct
 		"AUS Eastern Standard Time", "AUS Eastern Daylight Time",
 		"Australia/Canberra"
 	},							/* (GMT+10:00) Canberra, Melbourne, Sydney */
+	{
+		"Azerbaijan Standard Time", "Azerbaijan Daylight Time",
+		"Asia/Baku"
+	},							/* (GMT+04:00) Baku */
 	{
 		"Azores Standard Time", "Azores Daylight Time",
 		"Atlantic/Azores"
 	},							/* (GMT-01:00) Azores */
+	{
+		"Bangladesh Standard Time", "Bangladesh Daylight Time",
+		"Asia/Dhaka"
+	},							/* (GMT+06:00) Dhaka */
 	{
 		"Canada Central Standard Time", "Canada Central Daylight Time",
 		"Canada/Saskatchewan"
@@ -705,14 +716,19 @@ static const struct
 		"Cen. Australia Standard Time", "Cen. Australia Daylight Time",
 		"Australia/Adelaide"
 	},							/* (GMT+09:30) Adelaide */
+	/* Central America (other than Mexico) generally does not observe DST */
 	{
 		"Central America Standard Time", "Central America Daylight Time",
-		"CST6CDT"
+		"CST6"
 	},							/* (GMT-06:00) Central America */
 	{
 		"Central Asia Standard Time", "Central Asia Daylight Time",
 		"Asia/Dhaka"
 	},							/* (GMT+06:00) Astana, Dhaka */
+	{
+		"Central Brazilian Standard Time", "Central Brazilian Daylight Time",
+		"America/Cuiaba"
+	},							/* (GMT-04:00) Cuiaba */
 	{
 		"Central Europe Standard Time", "Central Europe Daylight Time",
 		"Europe/Belgrade"
@@ -825,10 +841,18 @@ static const struct
 		"Jordan Standard Time", "Jordan Daylight Time",
 		"Asia/Amman"
 	},							/* (GMT+02:00) Amman */
+	{
+		"Kamchatka Standard Time", "Kamchatka Daylight Time",
+		"Asia/Kamchatka"
+	},							/* (GMT+12:00) Petropavlovsk-Kamchatsky */
 	{
 		"Korea Standard Time", "Korea Daylight Time",
 		"Asia/Seoul"
 	},							/* (GMT+09:00) Seoul */
+	{
+		"Mauritius Standard Time", "Mauritius Daylight Time",
+		"Indian/Mauritius"
+	},							/* (GMT+04:00) Port Louis */
 	{
 		"Mexico Standard Time", "Mexico Daylight Time",
 		"America/Mexico_City"
@@ -850,6 +874,10 @@ static const struct
 		"Montevideo Standard Time", "Montevideo Daylight Time",
 		"America/Montevideo"
 	},							/* (GMT-03:00) Montevideo */
+	{
+		"Morocco Standard Time", "Morocco Daylight Time",
+		"Africa/Casablanca"
+	},							/* (GMT) Casablanca */
 	{
 		"Mountain Standard Time", "Mountain Daylight Time",
 		"US/Mountain"
@@ -865,8 +893,12 @@ static const struct
 	},							/* (GMT+06:30) Rangoon */
 	{
 		"N. Central Asia Standard Time", "N. Central Asia Daylight Time",
-		"Asia/Almaty"
-	},							/* (GMT+06:00) Almaty, Novosibirsk */
+		"Asia/Novosibirsk"
+	},							/* (GMT+06:00) Novosibirsk */
+	{
+		"Namibia Standard Time", "Namibia Daylight Time",
+		"Africa/Windhoek"
+	},							/* (GMT+02:00) Windhoek */
 	{
 		"Namibia Standard Time", "Namibia Daylight Time",
 		"Africa/Windhoek"
@@ -904,6 +936,14 @@ static const struct
 		"Pacific Standard Time (Mexico)", "Pacific Daylight Time (Mexico)",
 		"America/Tijuana"
 	},							/* (GMT-08:00) Tijuana, Baja California */
+	{
+		"Pakistan Standard Time", "Pakistan Daylight Time",
+		"Asia/Karachi"
+	},							/* (GMT+05:00) Islamabad, Karachi */
+	{
+		"Paraguay Standard Time", "Paraguay Daylight Time",
+		"America/Asuncion"
+	},							/* (GMT-04:00) Asuncion */
 	{
 		"Romance Standard Time", "Romance Daylight Time",
 		"Europe/Brussels"
@@ -962,6 +1002,10 @@ static const struct
 		"Tonga Standard Time", "Tonga Daylight Time",
 		"Pacific/Tongatapu"
 	},							/* (GMT+13:00) Nuku'alofa */
+	{
+		"Ulaanbaatar Standard Time", "Ulaanbaatar Daylight Time",
+		"Asia/Ulaanbaatar",
+	},							/* (GMT+08:00) Ulaanbaatar */
 	{
 		"US Eastern Standard Time", "US Eastern Daylight Time",
 		"US/Eastern"
@@ -970,6 +1014,26 @@ static const struct
 		"US Mountain Standard Time", "US Mountain Daylight Time",
 		"US/Arizona"
 	},							/* (GMT-07:00) Arizona */
+	{
+		"Coordinated Universal Time", "Coordinated Universal Time",
+		"UTC"
+	},							/* (GMT) Coordinated Universal Time */
+	{
+		"UTC+12", "UTC+12",
+		"Etc/GMT+12"
+	},							/* (GMT+12:00) Coordinated Universal Time+12 */
+	{
+		"UTC-02", "UTC-02",
+		"Etc/GMT-02"
+	},							/* (GMT-02:00) Coordinated Universal Time-02 */
+	{
+		"UTC-11", "UTC-11",
+		"Etc/GMT-11"
+	},							/* (GMT-11:00) Coordinated Universal Time-11 */
+	{
+		"Venezuela Standard Time", "Venezuela Daylight Time",
+		"America/Caracas",
+	},							/* (GMT-04:30) Caracas */
 	{
 		"Vladivostok Standard Time", "Vladivostok Daylight Time",
 		"Asia/Vladivostok"
@@ -1091,9 +1155,10 @@ identify_system_timezone(void)
 		if ((r = RegQueryValueEx(key, "Std", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
 		{
 			ereport(WARNING,
-					(errmsg_internal("could not query value for 'std' to identify Windows timezone: %i", (int) r)));
+					(errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i",
+									 keyname, (int) r)));
 			RegCloseKey(key);
-			break;
+			continue; /* Proceed to look at the next timezone */
 		}
 		if (strcmp(tzname, zonename) == 0)
 		{
@@ -1107,9 +1172,10 @@ identify_system_timezone(void)
 		if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
 		{
 			ereport(WARNING,
-					(errmsg_internal("could not query value for 'dlt' to identify Windows timezone: %i", (int) r)));
+					(errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i",
+									 keyname, (int) r)));
 			RegCloseKey(key);
-			break;
+			continue; /* Proceed to look at the next timezone */
 		}
 		if (strcmp(tzname, zonename) == 0)
 		{
diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index 5b3291833cfe..a84a0f5029d2 100644
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -4,7 +4,7 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
-# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3 2006/12/15 16:54:43 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3.2.2 2010/05/11 22:37:05 tgl Exp $
 #
 
 # CONFLICT! ADT is not unique
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index dc2edb1f822b..a0204dacf320 100755
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -4,7 +4,7 @@
 # timezone_abbreviations to 'Default'.  See the `Date/Time Support'
 # appendix in the PostgreSQL documentation for more information.
 #
-# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.3 2006/12/15 16:54:43 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.4.2.5 2010/08/26 19:59:08 tgl Exp $
 
 
 #################### AFRICA ####################
diff --git a/src/tools/major_release_split b/src/tools/major_release_split
new file mode 100755
index 000000000000..37f8111ca33a
--- /dev/null
+++ b/src/tools/major_release_split
@@ -0,0 +1,30 @@
+:
+
+# This program takes release.sgml and breaks it up into
+# per-major-release files that can be copied to the proper
+# CVS tree.
+
+[ "$#" -ne 1 ] && echo "Usage: $0 release_sgml_file" 1>&2 && exit 1
+
+FILE="$1"
+
+trap "rm -f /tmp/preamble" 0 1 2 3 15
+
+# Create the SGML preamble file
+# Copy from the start of the file to the first "sect1" heading
+grep -B 1000000 "`sed -n '/<sect1/p;/<sect1/q' \"$FILE\"`" "$FILE" | 
+# exclude last line
+sed -n '$q;p' > /tmp/preamble
+
+# Create per-major-release files
+# spin over all "sect1" releases to find major release numbers
+sed -n 's/^ *<sect1 id="release-\([^-]-[^-]\).*/\1/p' "$FILE" |
+uniq |
+while read RELEASE
+do
+	# copy preamble
+	cp /tmp/preamble "$RELEASE"-"`basename $FILE`"
+	# grab remainder of file for major release
+	grep -A 10000000 "<sect1 id=\"release-$RELEASE" "$FILE" >> "$RELEASE"-"`basename $FILE`"
+done
+
diff --git a/src/tools/msvc/Genbki.pm b/src/tools/msvc/Genbki.pm
index 5c1e7ec55095..07f36e1b32ef 100755
--- a/src/tools/msvc/Genbki.pm
+++ b/src/tools/msvc/Genbki.pm
@@ -33,27 +33,21 @@ sub genbki
     $version =~ /^(\d+\.\d+)/ || die "Bad format verison $version\n";
     my $majorversion = $1;
 
-	# In PG 8.2, NAMEDATALEN is in postgres_ext.h.  it moves
-	# to pg_config_manual.h in PG 8.3
     my $pgext = read_file("src/include/pg_config_manual.h");
     $pgext =~ /^#define\s+NAMEDATALEN\s+(\d+)$/mg
       || die "Could not read NAMEDATALEN from pg_config_manual.h\n";
     my $namedatalen = $1;
 
     my $pgauthid = read_file("src/include/catalog/pg_authid.h");
-    $pgauthid =~ /^#define\s+BOOTSTRAP_SUPERUSERID\s+(\d+)\s*$/mg
+    $pgauthid =~ /^#define\s+BOOTSTRAP_SUPERUSERID\s+(\d+)$/mg
       || die "Could not read BOOTSTRAUP_SUPERUSERID from pg_authid.h\n";
     my $bootstrapsuperuserid = $1;
 
     my $pgnamespace = read_file("src/include/catalog/pg_namespace.h");
-    $pgnamespace =~ /^#define\s+PG_CATALOG_NAMESPACE\s+(\d+)\s*$/mg
+    $pgnamespace =~ /^#define\s+PG_CATALOG_NAMESPACE\s+(\d+)$/mg
       || die "Could not read PG_CATALOG_NAMESPACE from pg_namespace.h\n";
     my $pgcatalognamespace = $1;
 
-    $pgnamespace =~ /^#define\s+PG_TOAST_NAMESPACE\s+(\d+)\s*$/mg
-      || die "Could not read PG_TOAST_NAMESPACE from pg_namespace.h\n";
-	my $pgtoastnamespace = $1;
-
     my $indata = "";
 
     while (@_)
@@ -78,9 +72,6 @@ sub genbki
     $indata =~ s{PGUID}{$bootstrapsuperuserid}g;
     $indata =~ s{NAMEDATALEN}{$namedatalen}g;
     $indata =~ s{PGNSP}{$pgcatalognamespace}g;
-    $indata =~ s{TOASTNSP}{$pgtoastnamespace}g;
-
-    #print $indata;
 
     my $bki = "";
     my $desc = "";
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index fd5c80622354..fd94985450d2 100755
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -93,10 +93,17 @@ sub Install
     );
     GenerateConversionScript($target);
     GenerateTimezoneFiles($target,$conf);
+    GenerateTsearchFiles($target);
+    CopySetOfFiles('Stopword files', 
+				   [ glob ("src\\backend\\snowball\\stopwords\\*.stop") ], 
+				   $target . '/share/tsearch_data/');
+    CopySetOfFiles('Dictionaries sample files', 
+				   [ glob ("src\\backend\\tsearch\\*_sample.*" ) ], 
+				   $target . '/share/tsearch_data/');
     CopyContribFiles($config,$target);
     CopyIncludeFiles($target);
 
-    GenerateNLSFiles($target,$config->{nls},$majorver) if ($config->{nls});
+    GenerateNLSFiles($target,$config->{nls}) if ($config->{nls});
 
     print "Installation complete.\n";
 }
@@ -182,8 +189,8 @@ sub CopySolutionOutput
             # Static lib, such as libpgport, only used internally during build, don't install
             next;
         }
-        lcopy("$conf\\$pf\\$pf.$ext","$target\\$dir\\$pf.$ext") || carp "Could not copy $conf\\$pf\\$pf.$ext to $target\\$dir\\$pf.$ext\n";
-        lcopy("$conf\\$pf\\$pf.pdb","$target\\symbols\\$pf.pdb") || carp "Could not copy $pf.pdb\n";
+        lcopy("$conf\\$pf\\$pf.$ext","$target\\$dir\\$pf.$ext") || croak "Could not copy $pf.$ext\n";
+        lcopy("$conf\\$pf\\$pf.pdb","$target\\symbols\\$pf.pdb") || croak "Could not copy $pf.pdb\n";
         print ".";
     }
     print "\n";
@@ -311,7 +318,21 @@ sub CopyContribFiles
             foreach my $f (split /\s+/,$flist)
             {
                 lcopy('contrib/' . $d . '/' . $f,$target . '/share/contrib/' . basename($f))
-                  || carp("Could not copy file $f in contrib $d");
+                  || croak("Could not copy file $f in contrib $d");
+                print '.';
+            }
+        }
+
+        $flist = '';
+        if ($mf =~ /^DATA_TSEARCH\s*=\s*(.*)$/m) {$flist .= $1}
+        if ($flist ne '')
+        {
+            $flist = ParseAndCleanRule($flist, $mf);
+
+            foreach my $f (split /\s+/,$flist)
+            {
+                lcopy('contrib/' . $d . '/' . $f,$target . '/share/tsearch_data/' . basename($f))
+                  || croak("Could not copy file $f in contrib $d");
                 print '.';
             }
         }
@@ -329,7 +350,7 @@ sub CopyContribFiles
             foreach my $f (split /\s+/,$flist)
             {
                 lcopy('contrib/' . $d . '/' . $f, $target . '/doc/contrib/' . $f)
-                  || carp("Could not copy file $f in contrib $d");
+                  || croak("Could not copy file $f in contrib $d");
                 print '.';
             }
         }
@@ -373,7 +394,7 @@ sub CopyIncludeFiles
         'src/include/', 'postgres_ext.h', 'pg_config.h', 'pg_config_os.h', 'pg_config_manual.h'
     );
     lcopy('src/include/libpq/libpq-fs.h', $target . '/include/libpq/')
-      || carp 'Could not copy libpq-fs.h';
+      || croak 'Could not copy libpq-fs.h';
 
     CopyFiles('Libpq headers',
 	      $target . '/include/', 'src/interfaces/libpq/',
@@ -389,8 +410,8 @@ sub CopyIncludeFiles
         $target . '/include/internal/',
         'src/include/', 'c.h', 'port.h', 'postgres_fe.h'
     );
-	lcopy('src/include/libpq/pqcomm.h', $target . '/include/internal/libpq/')
-      || carp 'Could not copy pqcomm.h';
+    lcopy('src/include/libpq/pqcomm.h', $target . '/include/internal/libpq/')
+      || croak 'Could not copy pqcomm.h';
 
     CopyFiles(
         'Server headers',
@@ -403,15 +424,16 @@ sub CopyIncludeFiles
     my $D;
     opendir($D, 'src/include') || croak "Could not opendir on src/include!\n";
 
-    while (my $d = readdir($D))
+	# some xcopy progs don't like mixed slash style paths
+	(my $ctarget = $target) =~ s!/!\\!g;
+	while (my $d = readdir($D))
     {
         next if ($d =~ /^\./);
         next if ($d eq 'CVS');
-        next unless (-d 'src/include/' . $d);
+        next unless (-d "src/include/$d");
 
-        EnsureDirectories($target . '/include/server', $d);
-        system(
-            "xcopy /s /i /q /r /y src\\include\\$d\\*.h \"$target\\include\\server\\$d\\\"")
+        EnsureDirectories("$target/include/server/$d");
+        system(qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h "$ctarget\\include\\server\\$d\\"})
           && croak("Failed to copy include directory $d\n");
     }
     closedir($D);
@@ -444,17 +466,18 @@ sub GenerateNLSFiles
     print "Installing NLS files...";
     EnsureDirectories($target, "share/locale");
 	my @flist;
-	File::Find::find({wanted => 
-						  sub { /^nls\.mk\z/s && 
-									!                                                                       push(@flist, $File::Find::name); 	
-							} 
+	File::Find::find({wanted =>
+						  sub { /^nls\.mk\z/s &&
+									!push(@flist, $File::Find::name);
+							}
 				  }, "src");
     foreach (@flist)
     {
-        my $prgm = DetermineCatalogName($_);
         s/nls.mk/po/;
         my $dir = $_;
         next unless ($dir =~ /([^\/]+)\/po$/);
+        my $prgm = $1;
+        $prgm = 'postgres' if ($prgm eq 'backend');
         foreach (glob("$dir/*.po"))
         {
             my $lang;
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 81658ce2e456..3ef70ba60ecc 100755
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -13,6 +13,8 @@ use Project;
 use Solution;
 use Cwd;
 use File::Copy;
+use Config;
+use List::Util qw(first);
 
 use Exporter;
 our (@ISA, @EXPORT_OK);
@@ -47,7 +49,7 @@ sub mkvcbuild
 
     our @pgportfiles = qw(
       chklocale.c crypt.c fseeko.c getrusage.c inet_aton.c random.c srandom.c
-      getaddrinfo.c gettimeofday.c kill.c open.c rand.c
+      unsetenv.c getaddrinfo.c gettimeofday.c kill.c open.c rand.c
       snprintf.c strlcat.c strlcpy.c copydir.c dirmod.c exec.c noblock.c path.c pipe.c
       pgsleep.c pgstrcasecmp.c qsort.c qsort_arg.c sprompt.c thread.c
       getopt.c getopt_long.c dirent.c rint.c win32env.c win32error.c glob.c);
@@ -81,6 +83,13 @@ sub mkvcbuild
     
     $postgres->FullExportDLL('postgres.lib');
 
+    my $snowball = $solution->AddProject('dict_snowball','dll','','src\backend\snowball');
+    $snowball->RelocateFiles('src\backend\snowball\libstemmer', sub {
+        return shift !~ /dict_snowball.c$/;
+    });
+    $snowball->AddIncludeDir('src\include\snowball');
+    $snowball->AddReference($postgres);
+
     my $plpgsql = $solution->AddProject('plpgsql','dll','PLs','src\pl\plpgsql\src');
     $plpgsql->AddFiles('src\pl\plpgsql\src','scan.l','gram.y');
     $plpgsql->AddReference($postgres);
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
index a9323941995d..9519d508e923 100755
--- a/src/tools/msvc/Project.pm
+++ b/src/tools/msvc/Project.pm
@@ -306,7 +306,7 @@ sub AddResourceFile
     my ($self, $dir, $desc, $ico) = @_;
 
     my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-    my $d = ($year - 100) . "$yday";
+    my $d = sprintf("%02d%03d", ($year - 100), $yday);
 
     if (Solution::IsNewer("$dir\\win32ver.rc",'src\port\win32ver.rc'))
     {
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 282987e7db17..11db734b2704 100755
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -100,6 +100,7 @@ sub DetermineToolVersions
     print "Detected hardware platform: $self->{platform}\n";
 }
 
+
 # Return 1 if $oldfile is newer than $newfile, or if $newfile doesn't exist.
 # Special case - if config.pl has changed, always return 1
 sub IsNewer
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index 66b5c4c59baf..eb19a380ec00 100755
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -28,7 +28,6 @@ BEGIN
     require "./buildenv.pl";
 }
 
-# set up the project
 our $config;
 require "config_default.pl";
 require "config.pl" if (-f "src/tools/msvc/config.pl");
diff --git a/src/tools/msvc/builddoc.bat b/src/tools/msvc/builddoc.bat
index 7268ae207f4c..2bd9cc65f208 100755
--- a/src/tools/msvc/builddoc.bat
+++ b/src/tools/msvc/builddoc.bat
@@ -12,7 +12,7 @@ IF EXIST ..\msvc IF EXIST ..\..\..\src cd ..\..\..
 IF NOT EXIST doc\src\sgml\version.sgml goto noversion
 
 IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
-perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv 
diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
index 7995a19630e5..c001a07489c7 100755
--- a/src/tools/msvc/clean.bat
+++ b/src/tools/msvc/clean.bat
@@ -9,21 +9,8 @@ if exist ..\msvc if exist ..\..\..\src cd ..\..\..
 
 if exist debug rd /s /q debug
 if exist release rd /s /q release
-if exist _UpgradeReport_Files rd /s /q _UpgradeReport_Files
-if exist backup rd /s /q backup
-if exist ipch rd /s /q ipch
 for %%f in (*.vcproj) do del %%f
-REM Also clean Visual Studio 2010 files
-for %%f in (*.vcxproj) do del %%f
-for %%f in (*.vcxproj.filters) do del %%f
-for %%f in (*.user) do del %%f
-for %%f in (UpgradeLog*.XML) do del %%f
 if exist pgsql.sln del /q pgsql.sln
-if exist pgsql.sln.cache del /q pgsql.sln.cache
-if exist pgsql.ncb del /q pgsql.ncb
-if exist pgsql.sdf del /q pgsql.sdf
-if exist pgsql.vssscc del /q pgsql.vssscc
-if exist MSSCCPRJ.SCC del /q MSSCCPRJ.SCC
 del /s /q src\bin\win32ver.rc 2> NUL
 del /s /q src\interfaces\win32ver.rc 2> NUL
 if exist src\backend\win32ver.rc del /q src\backend\win32ver.rc
@@ -31,21 +18,18 @@ if exist src\backend\win32ver.rc del /q src\backend\win32ver.rc
 REM Delete files created with GenerateFiles() in Solution.pm
 if exist src\include\pg_config.h del /q src\include\pg_config.h
 if exist src\include\pg_config_os.h del /q src\include\pg_config_os.h
-if %DIST%==1 if exist src\backend\parser\gram.h del /q src\backend\parser\gram.h
+if %DIST%==1 if exist src\backend\parser\parse.h del /q src\backend\parser\parse.h
 if exist src\include\utils\fmgroids.h del /q src\include\utils\fmgroids.h
-if exist src\include\utils\probes.h del /q src\include\utils\probes.h
 
-if exist src\backend\utils\fmgroids.h del /q src\backend\utils\fmgroids.h
 if exist src\backend\utils\fmgrtab.c del /q src\backend\utils\fmgrtab.c
 if exist src\backend\catalog\postgres.bki del /q src\backend\catalog\postgres.bki
-if %DIST%==1 if exist src\backend\catalog\postgres.description del /q src\backend\catalog\postgres.description
 if exist src\backend\catalog\postgres.description del /q src\backend\catalog\postgres.description
 if exist src\backend\catalog\postgres.shdescription del /q src\backend\catalog\postgres.shdescription
-if %DIST%==1 if exist src\backend\catalog\schemapg.h del /q src\backend\catalog\schemapg.h
 if %DIST%==1 if exist src\backend\parser\scan.c del /q src\backend\parser\scan.c
 if %DIST%==1 if exist src\backend\parser\gram.c del /q src\backend\parser\gram.c
 if %DIST%==1 if exist src\backend\bootstrap\bootscanner.c del /q src\backend\bootstrap\bootscanner.c
 if %DIST%==1 if exist src\backend\bootstrap\bootparse.c del /q src\backend\bootstrap\bootparse.c
+if %DIST%==1 if exist src\backend\bootstrap\bootstrap_tokens.h del /q src\backend\bootstrap\bootstrap_tokens.h
 if %DIST%==1 if exist src\backend\utils\misc\guc-file.c del /q src\backend\utils\misc\guc-file.c
 
 
@@ -67,13 +51,16 @@ if exist src\pl\plperl\spi.c del /q src\pl\plperl\spi.c
 if %DIST%==1 if exist src\pl\plpgsql\src\pl_scan.c del /q src\pl\plpgsql\src\pl_scan.c
 if %DIST%==1 if exist src\pl\plpgsql\src\pl_gram.c del /q src\pl\plpgsql\src\pl_gram.c
 if %DIST%==1 if exist src\pl\plpgsql\src\pl_gram.h del /q src\pl\plpgsql\src\pl_gram.h
+if %DIST%==1 if exist src\pl\plpgsql\src\pl.tab.h del /q src\pl\plpgsql\src\pl.tab.h
 
 if %DIST%==1 if exist src\bin\psql\psqlscan.c del /q src\bin\psql\psqlscan.c
 
 if %DIST%==1 if exist contrib\cube\cubescan.c del /q contrib\cube\cubescan.c
 if %DIST%==1 if exist contrib\cube\cubeparse.c del /q contrib\cube\cubeparse.c
+if %DIST%==1 if exist contrib\cube\cubeparse.h del /q contrib\cube\cubeparse.h
 if %DIST%==1 if exist contrib\seg\segscan.c del /q contrib\seg\segscan.c
 if %DIST%==1 if exist contrib\seg\segparse.c del /q contrib\seg\segparse.c
+if %DIST%==1 if exist contrib\seg\segparse.h del /q contrib\seg\segparse.h
 
 if exist src\test\regress\tmp_check rd /s /q src\test\regress\tmp_check
 if exist contrib\spi\refint.dll del /q contrib\spi\refint.dll
diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl
index b8538dd79b8b..db24468fe556 100755
--- a/src/tools/msvc/gendef.pl
+++ b/src/tools/msvc/gendef.pl
@@ -1,4 +1,9 @@
 my @def;
+#
+# Script that generates a .DEF file for all objects in a directory
+# 
+# $PostgreSQL: pgsql/src/tools/msvc/gendef.pl,v 1.8 2008/01/31 16:30:24 adunstan Exp $
+#
 
 #
 # Script that generates a .DEF file for all objects in a directory
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 3cf331bfe5cf..813b80c77ade 100755
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -180,6 +180,7 @@ sub contribcheck
     my $mstat = 0;
     foreach my $module (glob("*"))
     {
+		next if ($module eq 'xml2' && ! $config->{xml});
         next unless -d "$module/sql" && 
 			-d "$module/expected" && 
 			(-f "$module/Makefile" || -f "$module/GNUmakefile");
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 05f69ef1f3a8..22ea5d51f484 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -26,6 +26,14 @@ then
 	INDENT=indent
 fi
 
+if [ "$#" -lt 2 ]
+then	echo "Usage:  `basename $0` typedefs file [...]" 1>&2
+	exit 1
+fi
+
+TYPEDEFS="$1"
+shift
+
 trap "rm -f /tmp/$$ /tmp/$$a" 0 1 2 3 15
 entab </dev/null >/dev/null
 if [ "$?" -ne 0 ]
diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl
index dd50a43fda45..b9be30f63b16 100644
--- a/src/tools/version_stamp.pl
+++ b/src/tools/version_stamp.pl
@@ -23,7 +23,7 @@
 # Major version is hard-wired into the script.  We update it when we branch
 # a new development version.
 $major1 = 8;
-$major2 = 4;
+$major2 = 3;
 
 # Validate argument and compute derived variables
 $minor = shift;
diff --git a/src/tutorial/syscat.source b/src/tutorial/syscat.source
index f093adda8edc..65617d4a45f9 100755
--- a/src/tutorial/syscat.source
+++ b/src/tutorial/syscat.source
@@ -4,10 +4,10 @@
 --    sample queries to the system catalogs
 --
 --
--- Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+-- Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
 -- Portions Copyright (c) 1994, Regents of the University of California
 --
--- $PostgreSQL: pgsql/src/tutorial/syscat.source,v 1.18 2007/01/05 22:20:05 momjian Exp $
+-- $PostgreSQL: pgsql/src/tutorial/syscat.source,v 1.19 2008/01/01 19:46:01 momjian Exp $
 --
 ---------------------------------------------------------------------------